From fedora-cvs-commits at redhat.com  Wed Feb  1 00:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:07:04 -0500
Subject: rpms/gmime/devel gmime.spec,1.6,1.7
Message-ID: <200602010007.k1107462029881@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29857

Modified Files:
	gmime.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-2
- Rebuild



Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gmime.spec	22 Jan 2006 14:29:30 -0000	1.6
+++ gmime.spec	1 Feb 2006 00:06:52 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.19
-Release:        1
+Release:        2
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@
 %endif
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-2
+- Rebuild
+
 * Sun Jan 22 2006 Alexander Larsson <alexl at redhat.com> - 2.1.19-1
 - Update to 2.1.19 (needed by beagle 0.2.0)
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:07:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:07:24 -0500
Subject: rpms/kernel/FC-4 patch-2.6.15.2.bz2.sign, NONE, 1.1 .cvsignore,
	1.171, 1.172 kernel-2.6.spec, 1.1587, 1.1588 sources, 1.155,
	1.156 upstream, 1.96,
	1.97 linux-2.6-kill-blk_attempt_merge.patch, 1.1,
	NONE patch-2.6.15.1.bz2.sign, 1.1, NONE
Message-ID: <200602010007.k1107O9O030011@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.15.2.bz2.sign 
Removed Files:
	linux-2.6-kill-blk_attempt_merge.patch patch-2.6.15.1.bz2.sign 
Log Message:
2.6.15.2



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

iD8DBQBD3w92yGugalF9Dw4RAudmAJ4irzcOzLHsRDq3xmpb+lytuZFo0QCfQsNS
hkT6dmCLiTVDHYdCpbNETuU=
=NKLn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- .cvsignore	16 Jan 2006 04:15:31 -0000	1.171
+++ .cvsignore	1 Feb 2006 00:07:22 -0000	1.172
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.15.1.bz2
+patch-2.6.15.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1587
retrieving revision 1.1588
diff -u -r1.1587 -r1.1588
--- kernel-2.6.spec	27 Jan 2006 03:26:55 -0000	1.1587
+++ kernel-2.6.spec	1 Feb 2006 00:07:22 -0000	1.1588
@@ -206,7 +206,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.15.1.bz2
+Patch1: patch-2.6.15.2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -352,7 +352,6 @@
 Patch1820: linux-2.6-net-acenic-use-after-free.patch
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
-Patch1870: linux-2.6-kill-blk_attempt_merge.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
 Patch1890: linux-2.6-dcache-inode-leak.patch
 
@@ -793,8 +792,6 @@
 %patch1830 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
-# kill blk_attempt_merge
-%patch1870 -p1
 # Some it87 probing causes reboots on some systems.
 %patch1880 -p1
 # Fix inode leak in d_instantiate_unique
@@ -1275,6 +1272,9 @@
 %endif
 
 %changelog
+* Tue Jan 31 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1829_FC4]
+- 2.6.15.2
+
 * Thu Jan 26 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1828_FC4]
 - Bump default number of serial ports registered.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- sources	16 Jan 2006 04:15:31 -0000	1.155
+++ sources	1 Feb 2006 00:07:22 -0000	1.156
@@ -1,2 +1,2 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-b1cddab58d9ab34cca4742e9b050478f  patch-2.6.15.1.bz2
+f5dea6c02ad6f943f5a711df694e2120  patch-2.6.15.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- upstream	16 Jan 2006 04:15:31 -0000	1.96
+++ upstream	1 Feb 2006 00:07:22 -0000	1.97
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.15.1.bz2
+patch-2.6.15.2.bz2
 


--- linux-2.6-kill-blk_attempt_merge.patch DELETED ---


--- patch-2.6.15.1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:28:54 -0500
Subject: rpms/kernel/FC-4 linux-2.6-scsi-barrier-leak.patch, NONE,
	1.1 kernel-2.6.spec, 1.1588, 1.1589
Message-ID: <200602010028.k110Ss75019487@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-scsi-barrier-leak.patch 
Log Message:
Fix scsi_cmd_cache leak.



linux-2.6-scsi-barrier-leak.patch:
 scsi_lib.c |    5 -----
 1 files changed, 5 deletions(-)

--- NEW FILE linux-2.6-scsi-barrier-leak.patch ---

Turn off ordered flush barriers for SCSI driver, since the SCSI barrier
code has a command leak.

Signed-off-by: Jens Axboe <axboe at suse.de>

--- linux-2.6.15/drivers/scsi/scsi_lib.c~	2006-01-31 19:09:02.000000000 -0500
+++ linux-2.6.15/drivers/scsi/scsi_lib.c	2006-01-31 19:09:10.000000000 -0500
@@ -1534,11 +1534,6 @@ struct request_queue *scsi_alloc_queue(s
 	 */
 	if (shost->ordered_tag)
 		blk_queue_ordered(q, QUEUE_ORDERED_TAG);
-	else if (shost->ordered_flush) {
-		blk_queue_ordered(q, QUEUE_ORDERED_FLUSH);
-		q->prepare_flush_fn = scsi_prepare_flush_fn;
-		q->end_flush_fn = scsi_end_flush_fn;
-	}
 
 	if (!shost->use_clustering)
 		clear_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1588
retrieving revision 1.1589
diff -u -r1.1588 -r1.1589
--- kernel-2.6.spec	1 Feb 2006 00:07:22 -0000	1.1588
+++ kernel-2.6.spec	1 Feb 2006 00:28:52 -0000	1.1589
@@ -304,6 +304,7 @@
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-megaraid-legacy.patch
 Patch1103: linux-2.6-scsi-advansys-pcitable.patch
+Patch1104: linux-2.6-scsi-barrier-leak.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -708,6 +709,8 @@
 %patch1102 -p1
 # Add a pci table to advansys driver.
 %patch1103 -p1
+# Fix scsi_cmd_cache leak.
+%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -1274,6 +1277,7 @@
 %changelog
 * Tue Jan 31 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1829_FC4]
 - 2.6.15.2
+- Fix scsi_cmd_cache leak.
 
 * Thu Jan 26 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1828_FC4]
 - Bump default number of serial ports registered.



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:29:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:29:20 -0500
Subject: rpms/f-spot/devel .cvsignore, 1.3, 1.4 f-spot.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200602010029.k110TK7R019701@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19663

Modified Files:
	.cvsignore f-spot.spec sources 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-1
- Update to 0.1.8
- Use sqlite3 instead of sqlite2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Jan 2006 18:02:08 -0000	1.3
+++ .cvsignore	1 Feb 2006 00:29:18 -0000	1.4
@@ -1 +1,2 @@
 f-spot-0.1.5.tar.bz2
+f-spot-0.1.8.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- f-spot.spec	31 Jan 2006 19:30:39 -0000	1.10
+++ f-spot.spec	1 Feb 2006 00:29:18 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           f-spot
-Version:        0.1.5
-Release:        3
+Version:        0.1.8
+Release:        1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -10,9 +10,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
-BuildRequires:  libexif-devel gtk-sharp2 gphoto2-devel >= 2.1.4 dbus-sharp
-
-Requires:       sqlite2 lcms
+BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 dbus-sharp
+BuildRequires:  gtk-sharp2 >= 2.7
+Requires:       sqlite >= 3.3.1
+Requires:       lcms
 
 # Mono only availible on these: (s390x disabled for now)
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x 
@@ -65,6 +66,10 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-1
+- Update to 0.1.8
+- Use sqlite3 instead of sqlite2
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 0.1.5-3
 - don't blindly run f-spot from current working directory
   (bug 177407)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Jan 2006 18:02:13 -0000	1.3
+++ sources	1 Feb 2006 00:29:18 -0000	1.4
@@ -1 +1 @@
-9166398a4f2381182714f00f1730ef12  f-spot-0.1.5.tar.bz2
+280ed570a2ed816084434408b8a8cc16  f-spot-0.1.8.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:41:29 -0500
Subject: rpms/tomboy/devel tomboy.spec,1.10,1.11
Message-ID: <200602010041.k110fTWp023112@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23078

Modified Files:
	tomboy.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.3.4-2
- Rebuild



Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tomboy.spec	30 Jan 2006 09:13:39 -0000	1.10
+++ tomboy.spec	1 Feb 2006 00:41:27 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.4
-Release:        1
+Release:        2
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.3.4-2
+- Rebuild
+
 * Mon Jan 30 2006 Alexander Larsson <alexl at redhat.com> - 0.3.4-1
 - update to 0.3.4
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:45:14 -0500
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.9,1.10
Message-ID: <200602010045.k110jEfP024861@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24830

Modified Files:
	evolution-sharp.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-6
- Rebuild



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- evolution-sharp.spec	28 Jan 2006 05:50:54 -0000	1.9
+++ evolution-sharp.spec	1 Feb 2006 00:45:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release: 	5
+Release:        6
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -57,6 +57,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-6
+- Rebuild
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 0.10.2-5
 - rebuild
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 00:57:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 19:57:03 -0500
Subject: rpms/libXvMC/devel libXvMC.spec,1.8,1.9
Message-ID: <200602010057.k110v3lK001285@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1272

Modified Files:
	libXvMC.spec 
Log Message:
* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added "Requires: libXv-devel, xorg-x11-proto-devel" to fix (#176862)



Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXvMC.spec	23 Jan 2006 22:33:24 -0000	1.8
+++ libXvMC.spec	1 Feb 2006 00:57:00 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -24,6 +24,8 @@
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
+Requires: libXv-devel, xorg-x11-proto-devel
+
 Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
@@ -83,6 +85,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added "Requires: libXv-devel, xorg-x11-proto-devel" to fix (#176862)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Updated libXvMC to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:14:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:14:25 -0500
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.8,1.9
Message-ID: <200602010114.k111EPnm001503@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1488

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.11-4
- Rebuild



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gecko-sharp2.spec	9 Jan 2006 17:10:43 -0000	1.8
+++ gecko-sharp2.spec	1 Feb 2006 01:14:23 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        3
+Release:        4
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -47,6 +47,9 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.11-4
+- Rebuild
+
 * Mon Jan  9 2006 Alexander Larsson <alexl at redhat.com> - 0.11-3
 - Add s390
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:18:08 -0500
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.6,1.7
Message-ID: <200602010118.k111I82o013897@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13881

Modified Files:
	gsf-sharp.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.6-6
- Rebuild



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gsf-sharp.spec	22 Jan 2006 14:38:43 -0000	1.6
+++ gsf-sharp.spec	1 Feb 2006 01:18:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.6
-Release: 	5
+Release:        6
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.6-6
+- Rebuild
+
 * Sun Jan 22 2006 Alexander Larsson <alexl at redhat.com> 0.6-5
 - Build on s390x
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:20:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:20:59 -0500
Subject: rpms/perl/devel perl-5.8.8-incpush.patch,NONE,1.1.2.1
Message-ID: <200602010120.k111Kx3S014009@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
      Tag: perl-5_8_8-0_RC1
	perl-5.8.8-incpush.patch 
Log Message:
remove use of hard-coded version string from 5.8.7 patch

perl-5.8.8-incpush.patch:
 perl.c |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+)

--- NEW FILE perl-5.8.8-incpush.patch ---
--- perl-5.8.7/perl.c.orig	2005-04-22 17:14:27.000000000 +0300
+++ perl-5.8.7/perl.c	2005-06-17 22:31:31.000000000 +0300
@@ -109,6 +109,7 @@
 #endif
 
 static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen);
+STATIC void incpush_oldversion(pTHX_ char *dir);
 
 #ifdef IAMSUID
 #ifndef DOSUID
@@ -4435,6 +4436,7 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
+    incpush_oldversion(aTHX_ SITEARCH_EXP);
 #  endif
 #endif
 
@@ -4456,6 +4458,7 @@
      * DLL-based path intuition to work correctly */
 #  if !defined(WIN32)
     incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
+    incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
 #  endif
 #endif
 
@@ -4497,6 +4500,36 @@
 #  define PERLLIB_MANGLE(s,n) (s)
 #endif
 
+#define VERSION_DIRECTORY_STRING  "/" STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION) "." STRINGIFY(PERL_SUBVERSION)
+STATIC void
+incpush_oldversion(pTHX_ char *dir)
+{
+#ifdef PERL_INC_VERSION_LIST
+  const char *incverlist[] = { PERL_INC_VERSION_LIST };
+  const char **incver;
+  const char *verdir;
+
+  verdir = strstr(dir, VERSION_DIRECTORY_STRING);
+  if (!verdir)
+    return;
+
+  for (incver = incverlist; *incver; incver++) {
+    char *new_dir = malloc(strlen(dir) + strlen(*incver) + 2);
+    char *p = new_dir;
+
+    strcpy(new_dir, dir);
+    p += verdir - dir + 1; /* advance to char following '/' in VERSION_DIRECTORY_STRING */
+    memcpy(p, *incver, strlen(*incver)); /* copy incver there instead */
+    p += strlen(*incver);	/* advance past version we just copied */
+    strcpy(p, verdir + strlen(VERSION_DIRECTORY_STRING)); /* and copy the rest of the original dir */
+
+    incpush(new_dir, FALSE, FALSE, FALSE);
+    free(new_dir);
+  }
+#endif
+}
+
+
 /* Push a directory onto @INC if it exists.
    Generate a new SV if we do this, to save needing to copy the SV we push
    onto @INC  */



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:21:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:21:18 -0500
Subject: rpms/perl/devel perl.spec,1.79.2.1,1.79.2.2
Message-ID: <200602010121.k111LIBt014033@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
      Tag: perl-5_8_8-0_RC1
	perl.spec 
Log Message:
Soon to be 5.8.8-1 !



Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.79.2.1
retrieving revision 1.79.2.2
diff -u -r1.79.2.1 -r1.79.2.2
--- perl.spec	20 Jan 2006 22:21:45 -0000	1.79.2.1
+++ perl.spec	1 Feb 2006 01:21:15 -0000	1.79.2.2
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    0
+%define perlrel    0.1
 %define perlepoch  3
 %define perlsrcrel RC1
 
@@ -37,6 +37,7 @@
 Provides: perl(:MODULE_COMPAT_5.8.5)
 Provides: perl(:MODULE_COMPAT_5.8.6)
 Provides: perl(:MODULE_COMPAT_5.8.7)
+Provides: perl(:MODULE_COMPAT_5.8.8)
 
 %if %{largefiles}
 Provides: perl(:WITH_LARGEFILES)
@@ -65,7 +66,7 @@
 # Patch9:         perl-5.7.3-syslog.patch
 # Patch10:        perl-5.8.0-notty.patch
 # Patch11:        perl-5.8.3-fullinc.patch
-Patch12:        perl-5.8.7-incpush.patch
+Patch12:        perl-5.8.8-incpush.patch
 Patch13:        perl-5.8.8-perlbug-tag.patch
 Patch14:        perl-5.8.8-dashI.patch
 Patch15:        perl-5.8.5-incorder.patch
@@ -146,6 +147,7 @@
 
 # module updatesd
 # Patch202:       perl-5.8.0-Safe2.09.patch
+Patch178343:	perl-5.8.8-bz178343.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
@@ -315,6 +317,8 @@
 
 %patch1360090 -p1
 
+%patch178343 -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()
@@ -522,9 +526,13 @@
 %{_bindir}/sperl%{perlver}
 %endif
 
-
 %changelog
-* Fri Dec 20 2006 Jason Vas Dias <jvdias at redhat.com> - 3.5.8.8-0_RC1
+* Tue Jan 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.8-0.1_RC1
+- fix bug 178343: h2ph must include cpp "predefined macros" in _h2ph_pre.ph
+- Add perl(:MODULE_COMPAT_5.8.8) to Provides
+- Fix perlbug patch
+
+* Fri Jan 20 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.8-0_RC1
 - Upgrade to new upstream release candidate 5.8.8-RC1
 
 * Wed Dec 14 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-8.1



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:36:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:36:38 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.207, 1.208 anaconda.spec, 1.326,
	1.327 sources, 1.326, 1.327
Message-ID: <200602010136.k111acvf025761@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25700/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.11-1 on branch devel from anaconda-10.91.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- .cvsignore	31 Jan 2006 04:10:31 -0000	1.207
+++ .cvsignore	1 Feb 2006 01:36:36 -0000	1.208
@@ -1 +1 @@
-anaconda-10.91.9.tar.bz2
+anaconda-10.91.11.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- anaconda.spec	31 Jan 2006 04:10:31 -0000	1.326
+++ anaconda.spec	1 Feb 2006 01:36:36 -0000	1.327
@@ -1,12 +1,12 @@
 Name: anaconda
-Version: 10.91.9
+Version: 10.91.11
 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, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.4.0
+Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.5.1-3
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
@@ -78,6 +78,17 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 31 2006 Paul Nasrat <pnasrat at redhat.com> - 10.91.11-1
+- Factor some yum stuff into yum
+- Text Clarification (#178105)
+- Don't use install only pkgs (#179381)
+- Various dmraid and bootloader fixes (pjones)
+
+* Tue Jan 31 2006 Peter Jones <pjones at redhat.com> - 10.91.10-1
+- add dmraid device renaming support for kickstart (pjones)
+- fix paths for expat (clumens)
+- remove unused functions (clumens)
+
 * Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 10.91.9-1
 - Skip partition and bootloader screens if requested for textmode 
   (dcantrel, #178739)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- sources	31 Jan 2006 04:10:32 -0000	1.326
+++ sources	1 Feb 2006 01:36:36 -0000	1.327
@@ -1 +1 @@
-fb576db5d139565a5ce1bae7fe938203  anaconda-10.91.9.tar.bz2
+c0ab01fab8a7a76787d6c778ee5a9443  anaconda-10.91.11.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 01:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 20:51:21 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1886,1.1887
Message-ID: <200602010151.k111pLfg012272@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Further improvements to the 'dont want to hardlink' case.
Now checks for HARDLINK="no" in /etc/sysconfig/kernel




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1886
retrieving revision 1.1887
diff -u -r1.1886 -r1.1887
--- kernel-2.6.spec	31 Jan 2006 23:49:57 -0000	1.1886
+++ kernel-2.6.spec	1 Feb 2006 01:51:19 -0000	1.1887
@@ -1200,7 +1200,8 @@
 /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
@@ -1211,7 +1212,8 @@
 /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
@@ -1223,7 +1225,8 @@
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen0-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}-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
@@ -1234,7 +1237,8 @@
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xenU-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}-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
@@ -1245,7 +1249,8 @@
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
 
 %post kdump-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}-kdump-%{_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
@@ -1380,6 +1385,8 @@
 %changelog
 * Tue Jan 31 2006 Dave Jones <<davej at redhat.com>
 - Remove prereq on hardlink, making hardlinking of -devel packages optional
+- Further improvements to the 'dont want to hardlink' case.
+  Now checks for HARDLINK="no" in /etc/sysconfig/kernel
 
 * Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
 - Enable x86-64 kdumping, and kdump related specfile cleanup.



From fedora-cvs-commits at redhat.com  Wed Feb  1 03:02:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 31 Jan 2006 22:02:58 -0500
Subject: rpms/xorg-x11-xfs/devel xfs.init, 1.2, 1.3 xorg-x11-xfs.spec, 1.12,
	1.13
Message-ID: <200602010302.k1132wFD020478@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20464

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
Removed invocation of fc-cache from xfs initscript for bug (#179362)


Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfs.init	15 Nov 2005 21:11:50 -0000	1.2
+++ xfs.init	1 Feb 2006 03:02:56 -0000	1.3
@@ -54,7 +54,13 @@
    # Now we run fc-cache, assuming fonts may have been added, without
    # explicitly checking, as it is rather fast anyway.  Some older versions
    # of fc-cache will SEGV, which is prevented by invoking it with HOME=/
-   [ -x "$FC_CACHE" ] && HOME=/ "$FC_CACHE"
+   #
+   # Update:  We no longer run fc-cache, upon request of fontconfig rpm
+   # maintainer.  Later, if it is decided that fc-cache should be ran at
+   # system startup time, the fontconfig package should provide its own
+   # initscript, as fc-cache has nothing to do with xfs nor core fonts, so
+   # doesn't really belong in here anyway.  (Bug #179362)   
+   #[ -x "$FC_CACHE" ] && HOME=/ "$FC_CACHE"
    popd &> /dev/null
 }
 


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-xfs.spec	31 Jan 2006 15:25:16 -0000	1.12
+++ xorg-x11-xfs.spec	1 Feb 2006 03:02:56 -0000	1.13
@@ -15,11 +15,11 @@
 Group: System Environment/Daemons
 URL: http://www.x.org
 #Source0: %{pkgname}-%{version}.tar.bz2
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfs-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfsinfo-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fslsfonts-1.0.1.tar.bz2
-Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fstobdf-1.0.1.tar.bz2
-Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/showfont-1.0.1.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
 Source10:  xfs.init
 # NOTE: xfs config input file, processed via sed below.
 Source11:  xfs.config.in
@@ -288,6 +288,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com>
+- Removed invocation of fc-cache from xfs initscript for bug (#179362)
+
 * Wed Jan 16 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated all tarballs to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 05:26:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 00:26:35 -0500
Subject: rpms/kernel/devel linux-2.6-stradis-oops.patch, NONE,
	1.1 kernel-2.6.spec, 1.1887, 1.1888
Message-ID: <200602010526.k115QZLJ026828@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-stradis-oops.patch 
Log Message:
Fix an oops on stradis startup.



linux-2.6-stradis-oops.patch:
 stradis.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-stradis-oops.patch ---

media video stradis memory fix

memset clears once set structure, there is actually no need for memset,
because configure function do it for us. Next, vfree(NULL) is legal, so
avoid useless labels.

Thanks Dave Jones for reporting this.

Signed-off-by: Jiri Slaby <jirislaby at gmail.com>

---
commit 6bf69f737175c593ae5dbccf1c836e86e60e80d4
tree 06984cc9874957c93276ad546f9e0756ebc2a11f
parent 34f0900e27681dd7bea568f6c593b9b216e7ce78
author <ku at bellona.(none)> Tue, 24 Jan 2006 12:18:56 +0100
committer <ku at bellona.(none)> Tue, 24 Jan 2006 12:18:56 +0100

 drivers/media/video/stradis.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 54fc330..9d76926 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -2012,7 +2012,6 @@ static int __devinit init_saa7146(struct
 {
 	struct saa7146 *saa = pci_get_drvdata(pdev);
 
-	memset(saa, 0, sizeof(*saa));
 	saa->user = 0;
 	/* reset the saa7146 */
 	saawrite(0xffff0000, SAA7146_MC1);
@@ -2062,16 +2061,16 @@ static int __devinit init_saa7146(struct
 	}
 	if (saa->audbuf == NULL && (saa->audbuf = vmalloc(65536)) == NULL) {
 		dev_err(&pdev->dev, "%d: malloc failed\n", saa->nr);
-		goto errvid;
+		goto errfree;
 	}
 	if (saa->osdbuf == NULL && (saa->osdbuf = vmalloc(131072)) == NULL) {
 		dev_err(&pdev->dev, "%d: malloc failed\n", saa->nr);
-		goto erraud;
+		goto errfree;
 	}
 	/* allocate 81920 byte buffer for clipping */
 	if ((saa->dmavid2 = kzalloc(VIDEO_CLIPMAP_SIZE, GFP_KERNEL)) == NULL) {
 		dev_err(&pdev->dev, "%d: clip kmalloc failed\n", saa->nr);
-		goto errosd;
+		goto errfree;
 	}
 	/* setup clipping registers */
 	saawrite(virt_to_bus(saa->dmavid2), SAA7146_BASE_EVEN2);
@@ -2085,15 +2084,11 @@ static int __devinit init_saa7146(struct
 	I2CBusScan(saa);
 
 	return 0;
-errosd:
+errfree:
 	vfree(saa->osdbuf);
-	saa->osdbuf = NULL;
-erraud:
 	vfree(saa->audbuf);
-	saa->audbuf = NULL;
-errvid:
 	vfree(saa->vidbuf);
-	saa->vidbuf = NULL;
+	saa->audbuf = saa->osdbuf = saa->vidbuf = NULL;
 err:
 	return -ENOMEM;
 }



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -r1.1887 -r1.1888
--- kernel-2.6.spec	1 Feb 2006 01:51:19 -0000	1.1887
+++ kernel-2.6.spec	1 Feb 2006 05:26:31 -0000	1.1888
@@ -362,6 +362,7 @@
 Patch1860: linux-2.6-net-fix-iptables.patch
 Patch1870: linux-2.6-net-slab-corruption.patch
 Patch1880: linux-2.6-suspend-memhotplug-oops.patch
+Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -857,6 +858,8 @@
 %patch1870 -p1
 # Fix software suspend on kernels without memory hotplug.
 %patch1880 -p1
+# Fix oops in stradis on init
+%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1383,6 +1386,10 @@
 %endif
 
 %changelog
+* Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
+- Fixed an oops in the stradis driver initialisation.
+- Happy Birthday to "The Yellow Dart".
+
 * Tue Jan 31 2006 Dave Jones <<davej at redhat.com>
 - Remove prereq on hardlink, making hardlinking of -devel packages optional
 - Further improvements to the 'dont want to hardlink' case.



From fedora-cvs-commits at redhat.com  Wed Feb  1 05:45:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 00:45:24 -0500
Subject: rpms/evolution-sharp/devel evolution-sharp-evo26.patch, 1.2,
	1.3 evolution-sharp.spec, 1.10, 1.11
Message-ID: <200602010545.k115jOBP000669@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv640

Modified Files:
	evolution-sharp-evo26.patch evolution-sharp.spec 
Log Message:
* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-7
- Update evolution-sharp-evo26.patch look for a SO_NUM of 7 for edataserver
- BuildRequire evolution-devel


evolution-sharp-evo26.patch:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: evolution-sharp-evo26.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-evo26.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-sharp-evo26.patch	11 Jan 2006 08:51:39 -0000	1.2
+++ evolution-sharp-evo26.patch	1 Feb 2006 05:45:21 -0000	1.3
@@ -5,7 +5,7 @@
  if test "x$eds13" = "xyes"; then
  	EDS_VERSION=-1.2
 -	EDS_SOVERSION=4
-+	EDS_SOVERSION=6
++	EDS_SOVERSION=7
  	EBOOK_SOVERSION=5
  	ECAL_SOVERSION=3
  else


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- evolution-sharp.spec	1 Feb 2006 00:45:11 -0000	1.10
+++ evolution-sharp.spec	1 Feb 2006 05:45:21 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        6
+Release:        7
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -12,7 +12,8 @@
 Patch3:		evolution-sharp-0.10.2-evolibdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  evolution-data-server-devel mono-devel gtk-sharp2-gapi
+BuildRequires:  evolution-data-server-devel evolution-devel
+BuildRequires:  mono-devel gtk-sharp2-gapi
 BuildRequires:  automake, libtool
 Requires:       evolution-data-server
 
@@ -57,6 +58,10 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-7
+- Update evolution-sharp-evo26.patch look for a SO_NUM of 7 for edataserver
+- BuildRequire evolution-devel
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 07:45:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 02:45:17 -0500
Subject: rpms/libXv/devel .cvsignore, 1.5, 1.6 libXv.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200602010745.k117jH0g020449@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20411/devel

Modified Files:
	.cvsignore libXv.spec sources 
Log Message:
auto-import libXv-1.0.1-1 on branch devel from libXv-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2005 11:10:23 -0000	1.5
+++ .cvsignore	1 Feb 2006 07:45:14 -0000	1.6
@@ -1 +1 @@
-libXv-1.0.0.tar.bz2
+libXv-1.0.1.tar.bz2


Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXv.spec	16 Dec 2005 11:10:23 -0000	1.8
+++ libXv.spec	1 Feb 2006 07:45:14 -0000	1.9
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXv runtime library
 Name: libXv
-Version: 1.0.0
+Version: 1.0.1
 Release: 1
 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
+Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
@@ -79,8 +79,8 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
-* Fri Dec 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
-- Updated libXv to version 1.0.0 from X11R7 RC4
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
+- Updated libXv to version 1.0.1 from X11R7.0
 
 * Tue Dec 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-1
 - Updated libXv to version 0.99.2 from X11R7 RC3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Dec 2005 11:10:23 -0000	1.5
+++ sources	1 Feb 2006 07:45:14 -0000	1.6
@@ -1 +1 @@
-f8946f0e90b27f35af7e49cec32f8e4f  libXv-1.0.0.tar.bz2
+148ef85597a152009109fb3b06680dde  libXv-1.0.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 08:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 03:17:10 -0500
Subject: rpms/system-config-soundcard/devel
	system-config-soundcard-1.2.14-alsa-ver.patch, NONE,
	1.1 system-config-soundcard.spec, 1.26, 1.27
Message-ID: <200602010817.k118HAAm024121@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	system-config-soundcard.spec 
Added Files:
	system-config-soundcard-1.2.14-alsa-ver.patch 
Log Message:
alsa log

system-config-soundcard-1.2.14-alsa-ver.patch:
 system-config-soundcard |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE system-config-soundcard-1.2.14-alsa-ver.patch ---
--- system-config-soundcard-1.2.14/src/system-config-soundcard.old	2006-02-01 09:10:51.000000000 +0100
+++ system-config-soundcard-1.2.14/src/system-config-soundcard	2006-02-01 09:11:44.000000000 +0100
@@ -10,6 +10,8 @@
 echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1
 echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1
+echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1
+echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
 


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- system-config-soundcard.spec	30 Jan 2006 10:15:50 -0000	1.26
+++ system-config-soundcard.spec	1 Feb 2006 08:17:07 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 1.2.14
-Release: 5
+Release: 6
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -13,6 +13,7 @@
 Patch2: system-config-soundcard-1.2.14-dyn-keys.patch
 Patch3: system-config-soundcard-1.2.14-text.patch
 Patch4: system-config-soundcard-1.2.14-kudzu-log.patch
+Patch5: system-config-soundcard-1.2.14-alsa-ver.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 ExcludeArch: s390 s390x
@@ -36,6 +37,7 @@
 %patch2 -p1 -b .dyn
 %patch3 -p1 -b .text
 %patch4 -p1 -b .log
+%patch5 -p1 -b .alsa
 
 %build
 make
@@ -89,6 +91,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Wed Feb 01 2006 Martin Stransky <stransky at redhat.com> 1.2.14-6
+- added alsa-lib/utils log
+
 * Mon Jan 30 2006 Martin Stransky <stransky at redhat.com> 1.2.14-5
 - added kudzu-log
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 08:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 03:17:13 -0500
Subject: rpms/freeglut/devel freeglut.spec,1.13,1.14
Message-ID: <200602010817.k118HDiV024151@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/freeglut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24115

Modified Files:
	freeglut.spec 
Log Message:
* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-3
- Added "Requires: libGL-devel libGLU-devel" to fix bug (#179464)
- Change file based GL header build dep to BuildRequires: libGL-devel



Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freeglut.spec	9 Dec 2005 22:40:29 -0000	1.13
+++ freeglut.spec	1 Feb 2006 08:17:09 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release: 2.1
+Release:   3
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -10,13 +10,8 @@
 
 BuildRequires: /sbin/ldconfig
 BuildRequires: pkgconfig
-# We BuildRequires the gl.h header here, because any GL implementation will
-# suffice, and there is no widespread accepted "standard" for a OpenGL
-# virtual Provides.
-BuildRequires: /usr/include/GL/gl.h
-# We can use this at some point in the future instead of requiring the
-# GL header above.
-#BuildRequires: libGL-devel
+
+BuildRequires: libGL-devel
 
 # FIXME: freeglut does not require glib itself, but something included with
 # it presumeably does. Need to investigate further.
@@ -46,6 +41,9 @@
 Summary: freeglut developmental libraries and header files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+
+Requires: libGL-devel libGLU-devel
+
 Provides: glut-devel = 3.7
 Obsoletes: glut-devel <= 3.7
 
@@ -89,7 +87,11 @@
 %{_libdir}/libglut.so
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-3
+- Added "Requires: libGL-devel libGLU-devel" to fix bug (#179464)
+- Change file based GL header build dep to BuildRequires: libGL-devel
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 2.4.0-2.1
 - rebuilt
 
 * Fri Nov 18 2005 Bill Nottingham <notting at redhat.com> 2.4.0-2



From fedora-cvs-commits at redhat.com  Wed Feb  1 10:20:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 05:20:20 -0500
Subject: rpms/glibc/devel .cvsignore, 1.133, 1.134 glibc-fedora.patch, 1.126,
	1.127 glibc.spec, 1.214, 1.215 sources, 1.155,
	1.156 glibc-ldbl-include.patch, 1.1, NONE glibc-ppc-fpu.patch,
	1.1, NONE glibc-ppc-ulps.patch, 1.1,
	NONE glibc-s390-ldbl.patch, 1.1, NONE
Message-ID: <200602011020.k11AKKAm011927@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Removed Files:
	glibc-ldbl-include.patch glibc-ppc-fpu.patch 
	glibc-ppc-ulps.patch glibc-s390-ldbl.patch 
Log Message:
auto-import glibc-2.3.90-32 on branch devel from glibc-2.3.90-32.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- .cvsignore	30 Jan 2006 10:11:25 -0000	1.133
+++ .cvsignore	1 Feb 2006 10:20:18 -0000	1.134
@@ -1,2 +1,2 @@
-glibc-20060130T0922.tar.bz2
-glibc-fedora-20060130T0922.tar.bz2
+glibc-20060201T0846.tar.bz2
+glibc-fedora-20060201T0846.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   68 ++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   38 ++
 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 +
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/ieee754/ldbl-128/s_llrintl.c           |    4 
 sysdeps/s390/fpu/libm-test-ulps                |   56 ----
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 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 ++
 51 files changed, 783 insertions(+), 506 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- glibc-fedora.patch	30 Jan 2006 10:11:25 -0000	1.126
+++ glibc-fedora.patch	1 Feb 2006 10:20:18 -0000	1.127
@@ -1,6 +1,20 @@
---- glibc-20060130T0922/ChangeLog	28 Jan 2006 00:15:15 -0000	1.9958
-+++ glibc-20060130T0922-fedora/ChangeLog	30 Jan 2006 09:29:44 -0000	1.8782.2.151
-@@ -2275,6 +2275,10 @@
+--- glibc-20060201T0846/ChangeLog	1 Feb 2006 03:14:01 -0000	1.9968
++++ glibc-20060201T0846-fedora/ChangeLog	1 Feb 2006 09:30:43 -0000	1.8782.2.154
+@@ -1,3 +1,13 @@
++2006-01-30  Jakub Jelinek  <jakub at redhat.com>
++
++	* include/bits/stdlib-ldbl.h: New file.
++	* include/bits/wchar-ldbl.h: New file.
++
++2006-02-01  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
++	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
++
+ 2006-01-31  Jakub Jelinek  <jakub at redhat.com>
+ 
+ 	* sysdeps/unix/sysv/linux/alpha/fpu/Implies: New file.
+@@ -2414,6 +2424,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -11,7 +25,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2558,6 +2562,26 @@
+@@ -2697,6 +2711,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -38,7 +52,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5676,6 +5700,11 @@
+@@ -5815,6 +5849,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -50,7 +64,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6670,6 +6699,12 @@
+@@ -6809,6 +6848,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -63,7 +77,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -6794,6 +6829,17 @@
+@@ -6933,6 +6978,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -81,7 +95,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -9854,6 +9900,18 @@
+@@ -9993,6 +10049,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -100,8 +114,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060130T0922/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060130T0922-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060201T0846/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060201T0846-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.
@@ -151,8 +165,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-20060130T0922/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060130T0922-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060201T0846/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060201T0846-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.
@@ -179,8 +193,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060130T0922/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060130T0922-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060201T0846/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060201T0846-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>
@@ -261,8 +275,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060130T0922/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060130T0922-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060201T0846/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060201T0846-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;
@@ -287,8 +301,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060130T0922/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060130T0922-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060201T0846/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060201T0846-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -317,8 +331,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060130T0922/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060130T0922-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060201T0846/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060201T0846-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -420,8 +434,8 @@
      }
  
    search_dirs ();
---- glibc-20060130T0922/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060130T0922-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060201T0846/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060201T0846-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;
@@ -446,8 +460,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060130T0922/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060130T0922-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060201T0846/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060201T0846-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)
@@ -524,8 +538,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060130T0922/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060130T0922-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060201T0846/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060201T0846-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -541,8 +555,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060130T0922/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060130T0922-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060201T0846/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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-20060201T0846/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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-20060201T0846/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060201T0846-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
@@ -552,8 +574,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060130T0922/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060130T0922-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060201T0846/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060201T0846-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.  */
@@ -567,8 +589,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060130T0922/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060130T0922-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060201T0846/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060201T0846-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);
@@ -599,8 +621,8 @@
  
  #endif
  
---- glibc-20060130T0922/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060130T0922-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060201T0846/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060201T0846-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -692,8 +714,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060130T0922/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060130T0922-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060201T0846/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060201T0846-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,
  	}
      }
@@ -737,8 +759,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060130T0922/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060130T0922-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060201T0846/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060201T0846-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -747,8 +769,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060130T0922/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060130T0922-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060201T0846/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060201T0846-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -790,8 +812,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060130T0922/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060130T0922-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060201T0846/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060201T0846-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>"
@@ -806,8 +828,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060130T0922/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060130T0922-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060201T0846/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060201T0846-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>"
@@ -819,8 +841,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-20060130T0922/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060201T0846/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -891,8 +913,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060130T0922/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060130T0922-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060201T0846/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060201T0846-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -920,8 +942,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060130T0922/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060130T0922-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060201T0846/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060201T0846-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>
@@ -997,8 +1019,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060130T0922/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060130T0922-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060201T0846/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060201T0846-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)
@@ -1054,8 +1076,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060130T0922/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
-+++ glibc-20060130T0922-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
+--- glibc-20060201T0846/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
++++ glibc-20060201T0846-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
 @@ -497,6 +497,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1096,8 +1118,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060130T0922/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060130T0922-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060201T0846/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
++++ glibc-20060201T0846-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1120,8 +1142,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060130T0922/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060130T0922-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060201T0846/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060201T0846-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;
@@ -1146,8 +1168,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060130T0922/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060201T0846/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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>
 +
@@ -1155,8 +1177,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060130T0922/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060130T0922-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+--- glibc-20060201T0846/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060201T0846-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1176,8 +1198,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060130T0922/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060130T0922-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060201T0846/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060201T0846-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1196,8 +1218,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060130T0922/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060130T0922-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060201T0846/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060201T0846-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1209,8 +1231,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060130T0922/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060130T0922-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060201T0846/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060201T0846-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
@@ -1251,8 +1273,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060130T0922/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060130T0922-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060201T0846/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060201T0846-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1262,8 +1284,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060130T0922/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060130T0922-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060201T0846/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060201T0846-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1297,8 +1319,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060130T0922/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060201T0846/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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 =
@@ -1315,8 +1337,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060130T0922/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060130T0922-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060201T0846/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060201T0846-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
@@ -1332,8 +1354,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060130T0922/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060130T0922-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060201T0846/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060201T0846-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))
@@ -1345,8 +1367,8 @@
  endif
  endif
  
---- glibc-20060130T0922/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060130T0922-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060201T0846/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060201T0846-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.  */
@@ -1698,8 +1720,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060130T0922/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060201T0846/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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.
@@ -1785,8 +1807,92 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060130T0922/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060130T0922-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060201T0846/sysdeps/ieee754/ldbl-128/s_llrintl.c	6 Jul 2001 04:55:55 -0000	1.2
++++ glibc-20060201T0846-fedora/sysdeps/ieee754/ldbl-128/s_llrintl.c	1 Feb 2006 09:28:53 -0000	1.2.4.1
+@@ -1,6 +1,6 @@
+ /* Round argument to nearest integral value according to current rounding
+    direction.
+-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
++   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper at cygnus.com>, 1997 and
+    		  Jakub Jelinek <jj at ultra.linux.cz>, 1999.
+@@ -52,7 +52,7 @@ __llrintl (long double x)
+ 	return 0;
+       w = two112[sx] + x;
+       t = w - two112[sx];
+-      GET_LDOUBLE_WORDS64 (i0, i1, x);
++      GET_LDOUBLE_WORDS64 (i0, i1, t);
+       j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
+       i0 &= 0x0000ffffffffffffLL;
+       i0 |= 0x0001000000000000LL;
+--- glibc-20060201T0846/sysdeps/s390/fpu/libm-test-ulps	1 Feb 2006 03:00:23 -0000	1.15
++++ glibc-20060201T0846-fedora/sysdeps/s390/fpu/libm-test-ulps	1 Feb 2006 09:28:52 -0000	1.11.2.5
+@@ -691,62 +691,6 @@ ifloat: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-# llrint
+-Test "llrint (-4503599627370495.5) == -4503599627370496LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-4503599627370496.75) == -4503599627370497LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-4503599627370497.5) == -4503599627370498LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-72057594037927935.5) == -72057594037927936LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-72057594037927936.75) == -72057594037927937LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-72057594037927937.5) == -72057594037927938LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-9007199254740991.5) == -9007199254740992LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-9007199254740992.75) == -9007199254740993LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (-9007199254740993.5) == -9007199254740994LL":
+-ildouble: 1
+-ldouble: 1
+-Test "llrint (4503599627370495.5) == 4503599627370496LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (4503599627370496.75) == 4503599627370497LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (4503599627370497.5) == 4503599627370498LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (72057594037927935.5) == 72057594037927936LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (72057594037927936.75) == 72057594037927937LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (72057594037927937.5) == 72057594037927938LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (9007199254740991.5) == 9007199254740992LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (9007199254740992.75) == 9007199254740993LL":
+-ildouble: -1
+-ldouble: -1
+-Test "llrint (9007199254740993.5) == 9007199254740994LL":
+-ildouble: -1
+-ldouble: -1
+-
+ # log10
+ Test "log10 (0.75) == -0.124938736608299953132449886193870744":
+ double: 1
+--- glibc-20060201T0846/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060201T0846-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);
      }
@@ -1801,8 +1907,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060201T0846-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.  */
  
@@ -1851,8 +1957,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060201T0846-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"
@@ -1862,8 +1968,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060201T0846-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;
@@ -1909,8 +2015,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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.
@@ -1971,8 +2077,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060201T0846-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)
@@ -2005,24 +2111,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060201T0846-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-20060130T0922/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060201T0846-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"_


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- glibc.spec	30 Jan 2006 11:39:52 -0000	1.214
+++ glibc.spec	1 Feb 2006 10:20:18 -0000	1.215
@@ -1,9 +1,9 @@
-%define glibcdate 20060130T0922
+%define glibcdate 20060201T0846
 %define glibcname glibc
-%define glibcsrcdir glibc-20060130T0922
+%define glibcsrcdir glibc-20060201T0846
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 31
+%define glibcrelease 32
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -32,10 +32,6 @@
 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
-Patch2: glibc-ppc-fpu.patch
-Patch3: glibc-ppc-ulps.patch
-Patch4: glibc-s390-ldbl.patch
-Patch5: glibc-ldbl-include.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -245,10 +241,6 @@
 %patch1 -p1
 %endif
 %endif
-%patch2 -p1 -E
-%patch3 -p1 -E
-%patch4 -p1 -E
-%patch5 -p1 -E
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir -p override_headers/linux
@@ -278,6 +270,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid			438
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init		444
+#define __NR_inotify_add_watch		445
+#define __NR_inotify_rm_watch		446
+#endif
 %endif
 %ifarch %{ix86}
 #ifndef __NR_mq_open
@@ -291,6 +288,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		284
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	291
+#define __NR_inotify_add_watch	292
+#define __NR_inotify_rm_watch	293
+#endif
 #ifndef __NR_openat
 #define __NR_openat		295
 #define __NR_mkdirat		296
@@ -334,6 +336,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid			1270
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init		1277
+#define __NR_inotify_add_watch		1278
+#define __NR_inotify_rm_watch		1279
+#endif
 %endif
 %ifarch ppc
 #ifndef __NR_utimes
@@ -357,6 +364,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		272
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	275
+#define __NR_inotify_add_watch	276
+#define __NR_inotify_rm_watch	277
+#endif
 #ifndef __NR_pselect6
 #define __NR_pselect6		280
 #define __NR_ppoll		281
@@ -377,6 +389,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		272
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	275
+#define __NR_inotify_add_watch	276
+#define __NR_inotify_rm_watch	277
+#endif
 #ifndef __NR_pselect6
 #define __NR_pselect6		280
 #define __NR_ppoll		281
@@ -412,6 +429,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		281
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	284
+#define __NR_inotify_add_watch	285
+#define __NR_inotify_rm_watch	286
+#endif
 %endif
 %ifarch s390x
 #ifndef __NR_timer_create
@@ -436,6 +458,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		281
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	284
+#define __NR_inotify_add_watch	285
+#define __NR_inotify_rm_watch	286
+#endif
 %endif
 %ifarch sparc sparcv9 sparc64
 #ifndef __NR_mq_open
@@ -454,6 +481,11 @@
 #define __NR_lstat64		132
 #define __NR_stat64		139
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	151
+#define __NR_inotify_add_watch	152
+#define __NR_inotify_rm_watch	156
+#endif
 #ifndef __NR_openat
 #define __NR_openat		284
 #define __NR_mkdirat		285
@@ -486,6 +518,11 @@
 #ifndef __NR_waitid
 #define __NR_waitid		247
 #endif
+#ifndef __NR_inotify_init
+#define __NR_inotify_init	253
+#define __NR_inotify_add_watch	254
+#define __NR_inotify_rm_watch	255
+#endif
 #ifndef __NR_openat
 #define __NR_openat		257
 #define __NR_mkdirat		258
@@ -1208,6 +1245,13 @@
 %endif
 
 %changelog
+* Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-32
+- update from CVS
+  - 128-bit long double fixes for ppc{,64}, s390{,x} and sparc{,v9},
+    alpha 128-bit long double support
+- add inotify syscall numbers to the override <asm/unistd.h> headers
+  (#179366)
+
 * Mon Jan 30 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-31
 - update from CVS
   - 128-bit long double on ppc, ppc64, s390, s390x and sparc{,v9}


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- sources	30 Jan 2006 10:11:25 -0000	1.155
+++ sources	1 Feb 2006 10:20:18 -0000	1.156
@@ -1,2 +1,2 @@
-e7d2de8446c4af2083f06feb45c0c7dd  glibc-20060130T0922.tar.bz2
-a628fbf8559d8a4d710b336422430f9a  glibc-fedora-20060130T0922.tar.bz2
+4262afa05ced2d49fda5fca68f89b54a  glibc-20060201T0846.tar.bz2
+891beceb0be78922e860434e34cd828f  glibc-fedora-20060201T0846.tar.bz2


--- glibc-ldbl-include.patch DELETED ---


--- glibc-ppc-fpu.patch DELETED ---


--- glibc-ppc-ulps.patch DELETED ---


--- glibc-s390-ldbl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 10:31:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 05:31:22 -0500
Subject: rpms/arts/devel .cvsignore, 1.23, 1.24 arts.spec, 1.53, 1.54 sources,
	1.25, 1.26
Message-ID: <200602011031.k11AVMZ9016468@cvs.devel.redhat.com>

Author: than

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	14 Nov 2005 13:49:12 -0000	1.23
+++ .cvsignore	1 Feb 2006 10:31:17 -0000	1.24
@@ -7,3 +7,4 @@
 arts-1.4.91.tar.bz2
 arts-1.4.92.tar.bz2
 arts-1.5.0.tar.bz2
+arts-1.5.1.tar.bz2


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- arts.spec	18 Jan 2006 16:32:53 -0000	1.53
+++ arts.spec	1 Feb 2006 10:31:17 -0000	1.54
@@ -9,8 +9,8 @@
 %define make_cvs 1
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 1.5.0
-Release: 2
+Version: 1.5.1
+Release: 1
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -172,10 +172,13 @@
 %{_bindir}/artsc-config
 
 %changelog
-* Wed Jan 18 2006 Than Ngo <than at redhat.com> 1.5.0-2
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 8:1.5.1-1
+- 1.5.1
+
+* Wed Jan 18 2006 Than Ngo <than at redhat.com> 8:1.5.0-2
 - rebuilt with --enable-new-ldflags
 
-* Mon Dec 19 2005 Than Ngo <than at redhat.com> 1.5.0-1
+* Mon Dec 19 2005 Than Ngo <than at redhat.com> 8:1.5.0-1
 - apply patch to fix #169631 
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	24 Nov 2005 14:14:00 -0000	1.25
+++ sources	1 Feb 2006 10:31:17 -0000	1.26
@@ -1 +1 @@
-e90a32ee47d5cdc51fe1b7f6f6c0df63  arts-1.5.0.tar.bz2
+71c4996de36aa7f8726e54bb3d5bf059  arts-1.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 11:08:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 06:08:05 -0500
Subject: rpms/kdelibs/devel .cvsignore, 1.33, 1.34 kdelibs.spec, 1.121,
	1.122 sources, 1.44, 1.45 kdelibs-3.2.0-icon.patch, 1.1,
	NONE kdelibs-3.4.0-fonts.patch, 1.1,
	NONE kdelibs-3.5.0-kio-kdirlister.patch, 1.1,
	NONE kdelibs-3.5.0-printing.patch, 1.1, NONE
Message-ID: <200602011108.k11B85AL029372@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdelibs.spec sources 
Removed Files:
	kdelibs-3.2.0-icon.patch kdelibs-3.4.0-fonts.patch 
	kdelibs-3.5.0-kio-kdirlister.patch 
	kdelibs-3.5.0-printing.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	14 Nov 2005 13:54:14 -0000	1.33
+++ .cvsignore	1 Feb 2006 11:08:03 -0000	1.34
@@ -8,3 +8,4 @@
 kdelibs-3.4.91.tar.bz2
 kdelibs-3.4.92.tar.bz2
 kdelibs-3.5.0.tar.bz2
+kdelibs-3.5.1.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdelibs.spec	19 Jan 2006 15:11:20 -0000	1.121
+++ kdelibs.spec	1 Feb 2006 11:08:03 -0000	1.122
@@ -8,12 +8,12 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.0
+%define arts_version 1.5.1
 %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
@@ -23,8 +23,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 6
+Version: 3.5.1
+Release: 1
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -40,7 +40,6 @@
 Source4: devices.protocol
 
 Patch2: kdelibs-3.0.0-ndebug.patch
-Patch3: kdelibs-3.2.0-icon.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.5.0-openssl0.9.8a.patch
 Patch7: kdelibs-3.4.0-menu.patch
@@ -53,8 +52,6 @@
 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.0-kio-kdirlister.patch
-Patch38: kdelibs-3.5.0-printing.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -113,7 +110,7 @@
 BuildRequires: pkgconfig
 BuildRequires: autoconf automake
 BuildRequires: libacl-devel
-
+BuildRequires: libattr-devel
 Obsoletes: %{name}2
 Obsoletes: kdesupport
 Obsoletes: kdoc
@@ -181,8 +178,6 @@
 %patch34 -p1 -b .qtdoc
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .modular-x
-%patch37 -p1 -b .kicker_crash
-%patch38 -p1 -b .printing
 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
@@ -362,9 +357,21 @@
 fi
 exit 0
 
-%post -p /sbin/ldconfig
+%post
+/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 || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
-%postun -p /sbin/ldconfig
+%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 || :
+fi
+%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -403,6 +410,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
+- 3.5.1
+
 * Thu Jan 19 2006 Than Ngo <than at redhat.com> 6:3.5.0-6
 - rename subpackage to -apidocs
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	28 Nov 2005 10:42:42 -0000	1.44
+++ sources	1 Feb 2006 11:08:03 -0000	1.45
@@ -1 +1 @@
-2b11d654e2ea1a3cd16dcfdcbb7d1915  kdelibs-3.5.0.tar.bz2
+2a22193ae7c23f3759b02723dab02d30  kdelibs-3.5.1.tar.bz2


--- kdelibs-3.2.0-icon.patch DELETED ---


--- kdelibs-3.4.0-fonts.patch DELETED ---


--- kdelibs-3.5.0-kio-kdirlister.patch DELETED ---


--- kdelibs-3.5.0-printing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 11:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 06:10:59 -0500
Subject: rpms/kdelibs/devel kdelibs.spec,1.122,1.123
Message-ID: <200602011110.k11BAxVw029425@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
add Requires(post,postun): /sbin/ldconfig Requires(post,postun): desktop-file-utils




Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdelibs.spec	1 Feb 2006 11:08:03 -0000	1.122
+++ kdelibs.spec	1 Feb 2006 11:10:47 -0000	1.123
@@ -67,9 +67,10 @@
 Requires: redhat-menus >= 5.0.4
 %endif
 
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): desktop-file-utils
 Requires: fileutils
 Requires: shadow-utils
-Requires: /sbin/ldconfig
 Requires: dev
 
 %if %{fam}



From fedora-cvs-commits at redhat.com  Wed Feb  1 12:07:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 07:07:23 -0500
Subject: rpms/autofs/devel autofs-4.1.4-underscore_to_dot.patch, NONE,
	1.1 autofs.spec, 1.73, 1.74
Message-ID: <200602011207.k11C7NEQ012105@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-underscore_to_dot.patch 
Log Message:
* Tue Feb 1 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-16.2
- Add more general patch to translate "_" to "." in map names. (bz #147765)


autofs-4.1.4-underscore_to_dot.patch:
 rc.autofs.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE autofs-4.1.4-underscore_to_dot.patch ---
--- autofs-4.1.4/samples/rc.autofs.in.underscore_to_dot	2006-02-01 06:56:11.000000000 -0500
+++ autofs-4.1.4/samples/rc.autofs.in	2006-02-01 06:58:21.000000000 -0500
@@ -344,7 +344,7 @@
 		    else
 			maptype=yp
 			if [ "$UNDERSCORETODOT" = "1" ] ; then
-			    map=`basename $map | sed -e s/^auto_home/auto.home/ -e s/^auto_mnt/auto.mnt/`
+			    map=`basename $map | sed -e s/^auto_/auto./`
 			else
 			    map=`basename $map | sed 's^//^/^g'`
 			fi


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- autofs.spec	25 Jan 2006 05:43:21 -0000	1.73
+++ autofs.spec	1 Feb 2006 12:07:20 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.1
+%define release 16.2
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -34,6 +34,7 @@
 Patch21: autofs-4.1.4-sockopt-len-type.patch
 Patch22: autofs-4.1.4-yp_order-order-type.patch
 Patch23: autofs-4.1.4-ldap-depricated.patch
+Patch24: autofs-4.1.4-underscore_to_dot.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -96,6 +97,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 
 %build
@@ -150,6 +152,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Feb 1 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-16.2
+- Add more general patch to translate "_" to "." in map names. (bz #147765)
+
 * Mon Jan 25 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-16.1
 - Add patch to use LDAP_DEPRICATED compile option. (bz #173833)
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 13:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 08:21:39 -0500
Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.28,
	1.29 selinux-policy.spec, 1.97, 1.98
Message-ID: <200602011321.k11DLdHZ027382@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27367

Modified Files:
	policy-20060104.patch selinux-policy.spec 
Log Message:


policy-20060104.patch:
 admin/usermanage.te        |    3 +++
 apps/mono.te               |    2 +-
 apps/wine.te               |    2 +-
 kernel/filesystem.if       |   20 ++++++++++----------
 kernel/filesystem.te       |    1 +
 kernel/mls.te              |    3 ++-
 services/apache.fc         |    2 ++
 services/apache.te         |    1 +
 services/automount.te      |    1 +
 services/hal.te            |    1 +
 services/irqbalance.te     |    3 +++
 services/networkmanager.fc |    4 +++-
 services/networkmanager.te |    2 +-
 services/procmail.te       |    1 +
 services/sendmail.if       |   15 +++++++++++++++
 services/spamassassin.te   |    1 +
 services/xserver.fc        |    9 ++++++---
 services/xserver.if        |   21 +++++++++++++++++++++
 services/xserver.te        |    9 +++++----
 system/init.fc             |    3 ++-
 system/unconfined.if       |    8 ++++++--
 system/unconfined.te       |    4 ++++
 22 files changed, 91 insertions(+), 25 deletions(-)

Index: policy-20060104.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policy-20060104.patch	31 Jan 2006 00:35:32 -0000	1.28
+++ policy-20060104.patch	1 Feb 2006 13:21:35 -0000	1.29
@@ -11,6 +11,30 @@
  seutil_dontaudit_search_config(passwd_t)
  
  userdom_use_unpriv_users_fd(passwd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.9/policy/modules/apps/mono.te
+--- nsaserefpolicy/policy/modules/apps/mono.te	2006-01-27 21:35:04.000000000 -0500
++++ serefpolicy-2.2.9/policy/modules/apps/mono.te	2006-01-31 17:07:25.000000000 -0500
+@@ -19,7 +19,7 @@
+ 
+ ifdef(`targeted_policy',`
+ 	allow mono_t self:process { execheap execmem };
+-	unconfined_domain_template(mono_t)
++	unconfined_domain_template(mono_t, noaudit)
+ 	role system_r types mono_t;
+ ')
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.9/policy/modules/apps/wine.te
+--- nsaserefpolicy/policy/modules/apps/wine.te	2006-01-19 18:02:04.000000000 -0500
++++ serefpolicy-2.2.9/policy/modules/apps/wine.te	2006-01-31 17:10:24.000000000 -0500
+@@ -19,7 +19,7 @@
+ 
+ ifdef(`targeted_policy',`
+ 	allow wine_t self:process { execstack execmem };
+-	unconfined_domain_template(wine_t)
++	unconfined_domain_template(wine_t, noaudit)
+ 	role system_r types wine_t;
+ 	allow wine_t file_type:file execmod;
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.9/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-01-30 18:40:35.000000000 -0500
 +++ serefpolicy-2.2.9/policy/modules/kernel/filesystem.if	2006-01-30 19:01:01.000000000 -0500
@@ -188,11 +212,13 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.9/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2005-11-14 18:24:07.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/networkmanager.fc	2006-01-30 19:01:01.000000000 -0500
-@@ -1,2 +1,2 @@
++++ serefpolicy-2.2.9/policy/modules/services/networkmanager.fc	2006-01-31 08:05:24.000000000 -0500
+@@ -1,2 +1,4 @@
  
 -/usr/bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/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)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.9/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-01-19 10:00:41.000000000 -0500
 +++ serefpolicy-2.2.9/policy/modules/services/networkmanager.te	2006-01-30 19:01:01.000000000 -0500
@@ -241,6 +267,17 @@
  
  ########################################
  ## <summary>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.9/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-01-19 10:00:41.000000000 -0500
++++ serefpolicy-2.2.9/policy/modules/services/spamassassin.te	2006-02-01 08:17:33.000000000 -0500
+@@ -77,6 +77,7 @@
+ # DnsResolver.pm module which binds to
+ # random ports >= 1024.
+ corenet_udp_bind_generic_port(spamd_t)
++sysnet_use_ldap(spamd_t)
+ 
+ dev_read_sysfs(spamd_t)
+ dev_read_urand(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.9/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2006-01-30 18:40:36.000000000 -0500
 +++ serefpolicy-2.2.9/policy/modules/services/xserver.fc	2006-01-30 19:01:01.000000000 -0500
@@ -335,9 +372,33 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.9/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-01-30 18:40:37.000000000 -0500
++++ serefpolicy-2.2.9/policy/modules/system/unconfined.if	2006-01-31 17:12:23.000000000 -0500
+@@ -41,14 +41,18 @@
+ 	tunable_policy(`allow_execheap',`
+ 		# Allow making the stack executable via mprotect.
+ 		allow $1 self:process execheap;
+-		auditallow $1 self:process execheap;
++		ifelse($2, `', `
++			auditallow $1 self:process execheap;
++		')
+ 	')
+ 
+ 	tunable_policy(`allow_execmem',`
+ 		# Allow making anonymous memory executable, e.g. 
+ 		# for runtime-code generation or executable stack.
+ 		allow $1 self:process execmem;
+-		auditallow $1 self:process execmem;
++		ifelse($2, `', `
++			auditallow $1 self:process execmem;
++		')
+ 	')
+ 
+ 	tunable_policy(`allow_execmem && allow_execstack',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.9/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-01-27 21:35:05.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/system/unconfined.te	2006-01-30 19:01:01.000000000 -0500
++++ serefpolicy-2.2.9/policy/modules/system/unconfined.te	2006-01-31 17:01:37.000000000 -0500
 @@ -148,4 +148,8 @@
  	optional_policy(`wine',`
  		wine_domtrans(unconfined_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- selinux-policy.spec	31 Jan 2006 00:35:32 -0000	1.97
+++ selinux-policy.spec	1 Feb 2006 13:21:35 -0000	1.98
@@ -1,12 +1,12 @@
 %define distro redhat
 %define monolithic n
 %define POLICYVER 20
-%define POLICYCOREUTILSVER 1.29.5-1
+%define POLICYCOREUTILSVER 1.29.17-1
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.9
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -282,6 +282,13 @@
 %{_usr}/share/selinux/refpolicy/include/*
 
 %changelog
+
+* Wed Feb 1 2006 Dan Walsh <dwalsh at redhat.com> 2.2.9-2
+- Fix for spamd to use ldap
+
+* Fri Jan 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.9-1
+- Update to upstream
+
 * Fri Jan 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.8-2
 - Update to upstream
 - Fix rhgb, and other Xorg startups



From fedora-cvs-commits at redhat.com  Wed Feb  1 13:25:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 08:25:18 -0500
Subject: rpms/indent/devel indent-2.2.9-lcall.patch, NONE, 1.1 indent.spec,
	1.17, 1.18
Message-ID: <200602011325.k11DPInc003487@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3340

Modified Files:
	indent.spec 
Added Files:
	indent-2.2.9-lcall.patch 
Log Message:
- Setting LC_ALL instead of LC_MESSAGES in order to fix output of
  KOI8-R characters.  (#134044)



indent-2.2.9-lcall.patch:
 indent.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE indent-2.2.9-lcall.patch ---
diff -burp indent-2.2.9/src/indent.c indent-2.2.9-lcall/src/indent.c
--- indent-2.2.9/src/indent.c	2006-02-01 14:20:25.000000000 +0100
+++ indent-2.2.9-lcall/src/indent.c	2006-02-01 14:08:52.000000000 +0100
@@ -3070,7 +3070,7 @@ int main (
     exit_values_ty exit_status;
 
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-    setlocale (LC_MESSAGES, "");
+    setlocale (LC_ALL, "");
 #endif
     bindtextdomain (PACKAGE, LOCALEDIR);
     textdomain (PACKAGE);


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- indent.spec	27 Jan 2006 16:42:29 -0000	1.17
+++ indent.spec	1 Feb 2006 13:25:16 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 10
+Release: 11
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -10,6 +10,7 @@
 Patch2: indent-2.2.9-gcc4.patch
 Patch3: indent-2.2.9-explicits.patch
 Patch4: indent-2.2.9-cdw.patch
+Patch5: indent-2.2.9-lcall.patch
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -28,6 +29,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -66,6 +68,10 @@
 
 
 %changelog
+* Wed Feb 1 2006 Petr Machata <pmachata at redhat.com> 2.2.9-11
+- Setting LC_ALL instead of LC_MESSAGES in order to fix output of
+  KOI8-R characters.  (#134044)
+
 * Wed Jan 27 2006 Petr Machata <pmachata at redhat.com> 2.2.9-10
 - Changed the placement of closing `while' of `do {} while' command
   under a -cdw option.  It's now cuddled up to the brace. (#67781)



From fedora-cvs-commits at redhat.com  Wed Feb  1 13:36:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 08:36:59 -0500
Subject: rpms/kdebase/devel kdebase-3.5.1-dbus.patch, NONE,
	1.1 kdebase-3.5.1-redhat.patch, NONE, 1.1 .cvsignore, 1.45,
	1.46 kdebase.spec, 1.143, 1.144 sources, 1.64,
	1.65 kdebase-3.0.4-kdesukonsole.patch, 1.1,
	NONE kdebase-3.1.1-usb.patch, 1.1,
	NONE kdebase-3.3.0-altf2.patch, 1.1,
	NONE kdebase-3.5.0-dbus.patch, 1.2,
	NONE kdebase-3.5.0-redhat.patch, 1.1, NONE
Message-ID: <200602011336.k11Dax9j006890@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.1-dbus.patch kdebase-3.5.1-redhat.patch 
Removed Files:
	kdebase-3.0.4-kdesukonsole.patch kdebase-3.1.1-usb.patch 
	kdebase-3.3.0-altf2.patch kdebase-3.5.0-dbus.patch 
	kdebase-3.5.0-redhat.patch 
Log Message:
- 3.5.1
- apply patch to fix kded segfaults for audio/blank cd's
- get rid some of unneeded patches
- add buildrequires on libxkbfile-devel



kdebase-3.5.1-dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |   73 ---
 kcmodule/managermodule.cpp                  |    4 
 kfile-plugin/kfile_media.desktop            |    2 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.h                     |   16 
 mediaimpl.cpp                               |   15 
 mediamanager/Makefile.am                    |   11 
 mediamanager/connection.cpp                 |  168 ++++++++
 mediamanager/connection.h                   |   86 ++++
 mediamanager/halbackend.cpp                 |  479 +++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   12 
 mediamanager/integrator.cpp                 |  244 ++++++++++++
 mediamanager/integrator.h                   |   95 ++++
 mediamanager/mediamanager.cpp               |   73 +++
 mediamanager/mediamanager.h                 |    8 
 mediamanager/message.cpp                    |  551 ++++++++++++++++++++++++++++
 mediamanager/message.h                      |  132 ++++++
 medianotifier/medianotifier.cpp             |   16 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   55 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  213 ++++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 +
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 +++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 ++
 29 files changed, 2766 insertions(+), 124 deletions(-)

--- NEW FILE kdebase-3.5.1-dbus.patch ---
diff -Nur kdebase-3.5.1/kioslave/media.orig/configure.in.in kdebase-3.5.1/kioslave/media/configure.in.in
--- kdebase-3.5.1/kioslave/media.orig/configure.in.in	2005-10-10 17:04:01.000000000 +0200
+++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 00:00:02.000000000 +0100
@@ -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.1/kioslave/media.orig/kcmodule/managermodule.cpp kdebase-3.5.1/kioslave/media/kcmodule/managermodule.cpp
--- kdebase-3.5.1/kioslave/media.orig/kcmodule/managermodule.cpp	2005-11-20 20:14:21.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/kcmodule/managermodule.cpp	2006-01-26 00:00:00.000000000 +0100
@@ -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.1/kioslave/media.orig/kfile-plugin/kfile_media.desktop kdebase-3.5.1/kioslave/media/kfile-plugin/kfile_media.desktop
--- kdebase-3.5.1/kioslave/media.orig/kfile-plugin/kfile_media.desktop	2005-11-08 23:36:07.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/kfile-plugin/kfile_media.desktop	2006-01-25 23:59:59.000000000 +0100
@@ -52,8 +53,8 @@
 Name[tt]=Media Tur??nda
 Name[uk]=???????????????????? ?????? ?????????? ????????????????????
 Name[uz]=???????????? ???????????? ???????????? ????????????????
 Name[zh_CN]=????????????
 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.1/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.1/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
--- kdebase-3.5.1/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp	2005-11-08 23:36:07.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-01-25 23:59:59.000000000 +0100
@@ -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.1/kioslave/media.orig/libmediacommon/medium.h kdebase-3.5.1/kioslave/media/libmediacommon/medium.h
--- kdebase-3.5.1/kioslave/media.orig/libmediacommon/medium.h	2005-10-10 17:04:00.000000000 +0200
+++ kdebase-3.5.1/kioslave/media/libmediacommon/medium.h	2006-01-25 23:59:58.000000000 +0100
@@ -22,6 +22,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <kurl.h>
+#include <qmap.h>
 
 class Medium
 {
@@ -88,4 +89,19 @@
 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.1/kioslave/media.orig/Makefile.am kdebase-3.5.1/kioslave/media/Makefile.am
--- kdebase-3.5.1/kioslave/media.orig/Makefile.am	2005-09-10 10:25:36.000000000 +0200
+++ kdebase-3.5.1/kioslave/media/Makefile.am	2006-01-26 00:00:02.000000000 +0100
@@ -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
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot
+	$(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp
+	$(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot
--- kdebase-3.5.1/kioslave/media/mediaimpl.cpp.old	2006-01-22 09:53:59.000000000 -0600
+++ kdebase-3.5.1/kioslave/media/mediaimpl.cpp	2006-01-31 14:53:10.000000000 -0600
@@ -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;
 		
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"
[...2988 lines suppressed...]
+#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.1/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.h kdebase-3.5.1/kioslave/media/propsdlgplugin/propsdlgshareplugin.h
--- kdebase-3.5.1/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.h	1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.5.1/kioslave/media/propsdlgplugin/propsdlgshareplugin.h	2006-01-26 00:00:00.000000000 +0100
@@ -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
+
+
--- 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.1-redhat.patch:
 kde.pamd |   16 ++++++++++------
 startkde |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.5.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.4.91/startkde.redhat	2005-09-10 15:03:40.000000000 +0200
+++ kdebase-3.4.91/startkde	2005-09-29 16:16:19.000000000 +0200
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.1 )
+#  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=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`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]


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	25 Jan 2006 16:55:15 -0000	1.45
+++ .cvsignore	1 Feb 2006 13:36:56 -0000	1.46
@@ -19,3 +19,4 @@
 kdebase-3.4.92.tar.bz2
 kdebase-3.5.0.tar.bz2
 kde-redhat-config-3.5-fc5-0.1.tar.bz2
+kdebase-3.5.1.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- kdebase.spec	30 Jan 2006 18:56:41 -0000	1.143
+++ kdebase.spec	1 Feb 2006 13:36:56 -0000	1.144
@@ -10,18 +10,18 @@
 %define gdmsession KDE
 
 %define qt_version 3.3.5
-%define arts_version 1.5.0
-%define kde_version 3.5.0
+%define arts_version 1.5.1
+%define kde_version 3.5.1
 
-%define make_cvs 1
+%define make_cvs 0
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.5.0
-Release: 3
+Version: 3.5.1
+Release: 1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -40,18 +40,15 @@
 Patch3: kdebase-3.3.92-vroot.patch
 Patch4: kdebase-3.0-shortcuts.patch
 Patch40: kdebase-3.2.0-keymap.patch
-Patch48: kdebase-3.0.4-kdesukonsole.patch
 Patch56: kde-libtool.patch
 Patch57: kdebase-3.1-startpage.patch
-Patch65: kdebase-3.1.1-usb.patch
 Patch71: kdebase-3.1.3-konsole-double-esc.patch
 Patch74: kdebase-3.3.92-kpersonalizer.patch
 Patch80: kdebase-3.2.92-logo.patch 
 Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
-Patch83: kdebase-3.3.0-altf2.patch
 Patch91: kdebase-3.4.2-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
-Patch93: kdebase-3.5.0-dbus.patch
+Patch93: kdebase-3.5.1-dbus.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -124,15 +121,12 @@
 %patch3 -p1 -b .vroot
 %patch4 -p1 -b .shortcuts
 %patch40 -p1 -b .keymap
-%patch48 -p1 -b .kdesukonsole
 %patch56 -p1 -b .libtool
 %patch57 -p1
-%patch65 -p1 -b .usb
 %patch71 -p1 -b .konsole
 %patch74 -p1 -b .kper
 %patch80 -p1 -b .logo
 %patch81 -p1 -b .im
-%patch83 -p1 -b .altf2
 %patch91 -p1 -b .kdestop-konsole
 %patch92 -p1 -b .xdg
 %patch93 -p1 -b .dbus
@@ -430,6 +424,12 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
+- 3.5.1
+- apply patch to fix kded segfaults for audio/blank cd's
+- get rid some of unneeded patches
+- add buildrequires on libxkbfile-devel
+
 * Thu Jan 26 2006 Than Ngo <than at redhat.com> 6:3.5.0-3
 - add BuildPrereq on dbus-devel >= 0.60, hal-devel >= 0.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	25 Jan 2006 16:55:15 -0000	1.64
+++ sources	1 Feb 2006 13:36:56 -0000	1.65
@@ -1,2 +1,2 @@
-b86622c029ee8ab656a67c6467fff887  kdebase-3.5.0.tar.bz2
 d351ffd0919753c89302401a862bf501  kde-redhat-config-3.5-fc5-0.1.tar.bz2
+484c7b3895ce4f95173f4789571eb1cc  kdebase-3.5.1.tar.bz2


--- kdebase-3.0.4-kdesukonsole.patch DELETED ---


--- kdebase-3.1.1-usb.patch DELETED ---


--- kdebase-3.3.0-altf2.patch DELETED ---


--- kdebase-3.5.0-dbus.patch DELETED ---


--- kdebase-3.5.0-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 13:41:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 08:41:55 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.144,1.145
Message-ID: <200602011341.k11DftGN009241@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
typo fix



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kdebase.spec	1 Feb 2006 13:36:56 -0000	1.144
+++ kdebase.spec	1 Feb 2006 13:41:53 -0000	1.145
@@ -36,7 +36,7 @@
 Source5: kde-np
 Source7: mailsettings.cc
 
-Patch0: kdebase-3.5.0-redhat.patch
+Patch0: kdebase-3.5.1-redhat.patch
 Patch3: kdebase-3.3.92-vroot.patch
 Patch4: kdebase-3.0-shortcuts.patch
 Patch40: kdebase-3.2.0-keymap.patch



From fedora-cvs-commits at redhat.com  Wed Feb  1 14:10:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 09:10:25 -0500
Subject: rpms/passwd/devel passwd.spec,1.21,1.22
Message-ID: <200602011410.k11EAPCL032098@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/passwd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31878

Modified Files:
	passwd.spec 
Log Message:
audit package requirements were wrong



Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- passwd.spec	31 Jan 2006 21:19:53 -0000	1.21
+++ passwd.spec	1 Feb 2006 14:10:22 -0000	1.22
@@ -21,8 +21,8 @@
 BuildPrereq: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
 %endif
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 1.0.8
-Requires: audit-libs >= 1.0.8
+BuildPrereq: audit-libs-devel >= 1.1.2
+Requires: audit-libs >= 1.1.2
 %endif
 
 %description



From fedora-cvs-commits at redhat.com  Wed Feb  1 14:53:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 09:53:41 -0500
Subject: rpms/kdepim/FC-4 kdepim-3.4.92-libz.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 kdepim.spec, 1.55, 1.56 sources, 1.28,
	1.29 admin-visibility.patch, 1.3, NONE kdepim-3.4.0-gcc4.patch,
	1.1, NONE kdepim-3.4.0-kandy-lockdev.patch, 1.1,
	NONE kdepim-kpilot-fix.diff, 1.1, NONE korganizerrc, 1.1, NONE
Message-ID: <200602011453.k11Erffk001133@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdepim.spec sources 
Added Files:
	kdepim-3.4.92-libz.patch 
Removed Files:
	admin-visibility.patch kdepim-3.4.0-gcc4.patch 
	kdepim-3.4.0-kandy-lockdev.patch kdepim-kpilot-fix.diff 
	korganizerrc 
Log Message:
3.5.1


kdepim-3.4.92-libz.patch:
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE kdepim-3.4.92-libz.patch ---
--- kdepim-3.4.92/indexlib/Makefile.am.orig	2005-10-26 11:19:59.000000000 +0200
+++ kdepim-3.4.92/indexlib/Makefile.am	2005-10-26 11:17:33.000000000 +0200
@@ -5,6 +5,8 @@
 
 libindex_la_SOURCES = bitstream.cpp compressed.cpp create.cpp exception.cpp ifile.cpp leafdata.cpp leafdatavector.cpp lockfile.cpp logfile.cpp match.cpp mmap_manager.cpp quotes.cpp slow.cpp stringarray.cpp stringset.cpp tokenizer.cpp
 
+libindex_la_LIBADD = $(LIBZ)
+
 indexlibincludedir=$(includedir)/index
 indexlibinclude_HEADERS = create.h index.h lockfile.h
 bin_SCRIPTS = indexlib-config


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	14 Jun 2005 12:14:34 -0000	1.25
+++ .cvsignore	1 Feb 2006 14:53:39 -0000	1.26
@@ -4,3 +4,4 @@
 kdepim-3.4.0-rc1.tar.bz2
 kdepim-3.4.0.tar.bz2
 kdepim-3.4.1.tar.bz2
+kdepim-3.5.1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/kdepim.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdepim.spec	17 Jun 2005 08:52:31 -0000	1.55
+++ kdepim.spec	1 Feb 2006 14:53:39 -0000	1.56
@@ -2,13 +2,14 @@
 %define final 0
 
 %define qt_version 1:3.3.4
-%define arts_version 8:1.4.1
+%define arts_version 8:1.5.1
 
 %define arts 1
 %define make_cvs 1
+%define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.4.1
-Release: 0.fc4.2
+Version: 3.5.1
+Release: 0.1.fc4
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: /usr
@@ -17,24 +18,19 @@
 License: GPL
 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
-Source1: korganizerrc
 Source2: cr48-app-kandy.png
 Source3: cr32-app-kandy.png
 Source4: cr16-app-kandy.png
 
 Patch1: kde-libtool.patch
 Patch3: kdepim-3.4.0-s390.patch
-Patch5: kdepim-3.4.0-gcc4.patch
-Patch6: kdepim-3.4.0-kandy-lockdev.patch
 Patch7: kdepim-3.4.0-kandy-icons.patch
-Patch8: kdepim-kpilot-fix.diff
-# gcc4 workaround
-Patch100: admin-visibility.patch
+Patch8: kdepim-3.4.92-libz.patch
 
 Requires: kdebase >= 6:%{version}
 
+BuildRequires: perl
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: desktop-file-utils
@@ -42,6 +38,7 @@
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: zlib-devel
 BuildRequires: libart_lgpl-devel
+BuildRequires: audiofile-devel
 %if %{arts}
 BuildRequires: arts-devel >= %{arts_version}
 %endif
@@ -102,18 +99,14 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
+
 %ifarch s390 s390x
 %patch3 -p1 -b .s390
 rm -rf kpilot
-%else
-pushd kpilot
-%patch8 -p0 -b .kpilot
-popd
 %endif
-%patch5 -p1 -b .gcc4
-%patch6 -p1 -b .lockdev
+
 %patch7 -p1 -b .kandy-icons
-%patch100 -p1 -b .gcc4_workaround
+%patch8 -p1 -b .libz
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -129,10 +122,19 @@
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -170,8 +172,6 @@
    ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
    ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
 
-cp %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/config/
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -189,7 +189,6 @@
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
 %{_datadir}/applnk/Applications
-%{_datadir}/applnk/Internet
 %{_datadir}/applnk/Utilities
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
@@ -206,10 +205,26 @@
 %{_includedir}/kde/*
 
 %changelog
-* Fri Jun 17 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.2
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.2.fc4
+- apply patch to fix crash when applying pipe through filters
+
+* Mon Aug 15 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.4
+- apply patch to fix kpilot crash
+
+* Tue Aug 02 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.3
+- apply patch to fix kmail bug, kde#109003
+
+* Wed Jul 27 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.2
+- update to 3.4.2
+- drop some patches which are included in upstream
+
+* Fri Jun 17 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.2
 - add kdepim-kpilot-fix.diff
   
-* Tue Jun 14 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
+* Tue Jun 14 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.1
 - update to 3.4.1
 - remove kdepim-3.4.0-long.patch, it's included in new upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 Jun 2005 12:14:34 -0000	1.28
+++ sources	1 Feb 2006 14:53:39 -0000	1.29
@@ -1 +1 @@
-e5515aa230558bac8651e9cd9f8f9673  kdepim-3.4.1.tar.bz2
+8e87c9cbe1f0c0f983f94d804a5bc8f9  kdepim-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdepim-3.4.0-gcc4.patch DELETED ---


--- kdepim-3.4.0-kandy-lockdev.patch DELETED ---


--- kdepim-kpilot-fix.diff DELETED ---


--- korganizerrc DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:07:32 -0500
Subject: rpms/gnome-applets/devel gnome-applets-2.13.3-bad-weather.patch,
	NONE, 1.1 gnome-applets.spec, 1.106, 1.107
Message-ID: <200602011507.k11F7WSO001592@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.13.3-bad-weather.patch 
Log Message:
Bad weather


gnome-applets-2.13.3-bad-weather.patch:
 weather.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE gnome-applets-2.13.3-bad-weather.patch ---
--- gnome-applets-2.13.3/libgweather/weather.c.overflow	2006-02-01 09:26:37.000000000 -0500
+++ gnome-applets-2.13.3/libgweather/weather.c	2006-02-01 09:29:55.000000000 -0500
@@ -113,8 +113,7 @@
         location->zone_valid = TRUE;
     }
 
-    /* XXX: warning: big bad buffer overflow */
-    if (coordinates && sscanf(coordinates, "%s %s", lat, lon) == 2) {
+    if (coordinates && sscanf(coordinates, "%12s %12s", lat, lon) == 2) {
         location->coordinates = g_strdup(coordinates);
         location->latitude = dmsh2rad (lat);
 	location->longitude = dmsh2rad (lon);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- gnome-applets.spec	31 Jan 2006 20:16:26 -0000	1.106
+++ gnome-applets.spec	1 Feb 2006 15:07:29 -0000	1.107
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.3
-Release:  	3
+Release:  	4
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -28,6 +28,7 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
+Patch5:		gnome-applets-2.13.3-bad-weather.patch
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -80,6 +81,7 @@
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .bad-weather
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -172,6 +174,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Feb 01 2006 Matthias Clasen <mclasen at redhat.com> 2.13.3-4
+- Fix an overflow in the weather applet
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 2.13.3-3
 - Update gstreamer requires
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:10:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:10:28 -0500
Subject: rpms/mc/devel mc-bracket.patch, NONE, 1.1 mc-cedit.patch, NONE,
	1.1 mc-delcheck.patch, NONE, 1.1 mc-extensions.patch, 1.5,
	1.6 mc-showfree.patch, 1.3, 1.4 mc-utf8.patch, 1.17,
	1.18 mc.spec, 1.76, 1.77 mc-phpfix.patch, 1.1, NONE
Message-ID: <200602011510.k11FASVx001726@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1674

Modified Files:
	mc-extensions.patch mc-showfree.patch mc-utf8.patch mc.spec 
Added Files:
	mc-bracket.patch mc-cedit.patch mc-delcheck.patch 
Removed Files:
	mc-phpfix.patch 
Log Message:
* Wed Feb  1 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-7
- update from CVS - fixes syntax file for PHP
- make displaying of free space configurable
- fix permission highlighting (#177100)
- redirect stdout and stderr of several apps run on background
  to /dev/null to not to mess up mc interface (#178833)
- refresh directories to avoid errors caused by copying
  files to non-existent directories (#177111)
- add an option to insert changelog entry in mcedit,
  thanks to Radek Vokal


mc-bracket.patch:
 view.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mc-bracket.patch ---
--- mc-4.6.1a/src/view.c.bracket	2006-01-31 15:39:30.000000000 +0100
+++ mc-4.6.1a/src/view.c	2006-02-01 14:52:39.000000000 +0100
@@ -1744,7 +1744,7 @@ view_display_hex (WView *view)
     const screen_dimen width = view->data_area.width;
     const int ngroups = view->bytes_per_line / 4;
     const screen_dimen text_start =
-	8 + 13 * ngroups + ((width < 80) ? 0 : (ngroups - 1 + 1);
+	8 + 13 * ngroups + ((width < 80) ? 0 : (ngroups - 1 + 1));
     /* 8 characters are used for the file offset, and every hex group
      * takes 13 characters. On ``big'' screens, the groups are separated
      * by an extra vertical line, and there is an extra space before the

mc-cedit.patch:
 cedit.menu |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE mc-cedit.patch ---
--- mc-4.6.1a/lib/cedit.menu.changelog	2005-05-27 05:35:12.000000000 +0200
+++ mc-4.6.1a/lib/cedit.menu	2006-01-30 10:46:11.000000000 +0100
@@ -449,6 +449,13 @@
         EMAIL="<$REPLYTO>"
         echo "$DATE  $AUTHOR  $EMAIL" >%b
 
+S       Insert `Spec-file Changelog' string
+        DATE="`date +\"%%a %%b %%e %%Y\"`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
+        EMAIL="<$REPLYTO>"
+        echo "* $DATE $AUTHOR $EMAIL" >%b
+
 s       Invoke `shell'
 	sh
 

mc-delcheck.patch:
 file.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE mc-delcheck.patch ---
--- mc-4.6.1a/src/file.c.delcheck	2006-01-11 20:02:10.000000000 +0100
+++ mc-4.6.1a/src/file.c	2006-01-11 21:38:45.000000000 +0100
@@ -1758,6 +1758,10 @@ panel_operate (void *source_panel, FileO
     free_linklist (&linklist);
     free_linklist (&dest_dirs);
 
+    /* Update panel contents to avoid actions on deleted files */
+    update_panels (UP_RELOAD, UP_KEEPSEL);
+    repaint_screen ();
+
     if (single_entry) {
 	if (force_single) {
 	    source = selection (panel)->fname;

mc-extensions.patch:
 mc.ext.in |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-extensions.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mc-extensions.patch	6 Dec 2005 12:47:50 -0000	1.5
+++ mc-extensions.patch	1 Feb 2006 15:10:24 -0000	1.6
@@ -121,14 +121,14 @@
  # Postscript
  type/^PostScript
 -	Open=(gv %f &)
-+	Open=(evince %f &)
++	Open=(evince %f >/dev/null 2>&1 &)
  	View=%view{ascii} ps2ascii %f
  
  # PDF
  type/^PDF
 -	Open=(xpdf %f &)
-+	Open=(evince %f &)
-+	#Open=(xpdf %f &)
++	Open=(evince %f >/dev/null 2>&1 &)
++	#Open=(xpdf %f >/dev/null 2>&1 &)
  	#Open=(acroread %f &)
  	#Open=(ghostview %f &)
  	View=%view{ascii} pdftotext %f -

mc-showfree.patch:
 layout.c |   49 ++++++++++++++++++++++++++++---------------------
 layout.h |    1 +
 screen.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 21 deletions(-)

Index: mc-showfree.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-showfree.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mc-showfree.patch	2 Jan 2006 13:22:35 -0000	1.3
+++ mc-showfree.patch	1 Feb 2006 15:10:24 -0000	1.4
@@ -1,5 +1,5 @@
---- mc-4.6.1a/src/screen.c.showfree	2006-01-02 12:22:51.000000000 +0100
-+++ mc-4.6.1a/src/screen.c	2006-01-02 13:44:05.000000000 +0100
+--- mc-4.6.1a/src/screen.c.showfree	2006-02-01 15:47:58.000000000 +0100
++++ mc-4.6.1a/src/screen.c	2006-02-01 15:47:58.000000000 +0100
 @@ -49,6 +49,7 @@
  #define WANT_WIDGETS
  #include "main.h"		/* the_menubar */
@@ -67,7 +67,7 @@
      hline ((slow_terminal ? '-' : ACS_HLINE) | NORMAL_COLOR,
  	   panel->widget.cols - 2);
  #endif				/* !HAVE_SLANG */
-+    show_free_space (panel);
++    if (free_space) show_free_space (panel);
  }
  
  static void
@@ -80,3 +80,150 @@
      if (panel->active)
  	standend ();
  }
+--- mc-4.6.1a/src/layout.c.showfree	2006-02-01 15:47:58.000000000 +0100
++++ mc-4.6.1a/src/layout.c	2006-02-01 15:48:27.000000000 +0100
+@@ -99,6 +99,9 @@ int message_visible = 1;
+ /* Set to show current working dir in xterm window title */
+ int xterm_title = 1;
+ 
++/* Set to show free space on device assigned to current directory */
++int free_space = 1;
++
+ /* The starting line for the output of the subprogram */
+ int output_start_y = 0;
+ 
+@@ -128,6 +131,7 @@ static int _command_prompt;
+ static int _keybar_visible;
+ static int _message_visible;
+ static int _xterm_title;
++static int _free_space;
+ static int _permission_mode;
+ static int _filetype_mode;
+ 
+@@ -158,6 +162,7 @@ static struct {
+     int    *variable;
+     WCheck *widget;
+ } check_options [] = {
++    { N_("show free &Space"),  &free_space,      0 },
+     { N_("&Xterm window title"), &xterm_title,   0 },
+     { N_("h&Intbar visible"),  &message_visible, 0 },
+     { N_("&Keybar visible"),   &keybar_visible,  0 },
+@@ -229,8 +234,8 @@ static int b2left_cback (int action)
+     if (_equal_split){
+ 	/* Turn equal split off */
+ 	_equal_split = 0;
+-	check_options [6].widget->state = check_options [6].widget->state & ~C_BOOL;
+-	dlg_select_widget (check_options [6].widget);
++	check_options [7].widget->state = check_options [7].widget->state & ~C_BOOL;
++	dlg_select_widget (check_options [7].widget);
+ 	dlg_select_widget (bleft_widget);
+     }
+     _first_panel_size++;
+@@ -244,8 +249,8 @@ static int b2right_cback (int action)
+     if (_equal_split){
+ 	/* Turn equal split off */
+ 	_equal_split = 0;
+-	check_options [6].widget->state = check_options [6].widget->state & ~C_BOOL;
+-	dlg_select_widget (check_options [6].widget);
++	check_options [7].widget->state = check_options [7].widget->state & ~C_BOOL;
++	dlg_select_widget (check_options [7].widget);
+ 	dlg_select_widget (bright_widget);
+     }
+     _first_panel_size--;
+@@ -300,14 +305,15 @@ layout_callback (struct Dlg_head *h, dlg
+ 	return MSG_HANDLED;
+ 
+     case DLG_POST_KEY:
+-	_filetype_mode = check_options [8].widget->state & C_BOOL;
+-	_permission_mode = check_options [7].widget->state & C_BOOL;
+-	_equal_split = check_options [6].widget->state & C_BOOL;
+-	_menubar_visible = check_options [5].widget->state & C_BOOL;
+-	_command_prompt = check_options [4].widget->state & C_BOOL;
+-	_keybar_visible = check_options [2].widget->state & C_BOOL;
+-	_message_visible = check_options [1].widget->state & C_BOOL;
+-	_xterm_title = check_options [0].widget->state & C_BOOL;
++	_filetype_mode = check_options [9].widget->state & C_BOOL;
++	_permission_mode = check_options [8].widget->state & C_BOOL;
++	_equal_split = check_options [7].widget->state & C_BOOL;
++	_menubar_visible = check_options [6].widget->state & C_BOOL;
++	_command_prompt = check_options [5].widget->state & C_BOOL;
++	_keybar_visible = check_options [3].widget->state & C_BOOL;
++	_message_visible = check_options [2].widget->state & C_BOOL;
++	_xterm_title = check_options [1].widget->state & C_BOOL;
++	_free_space = check_options [0].widget->state & C_BOOL;
+ 	if (console_flag){
+ 	    int minimum;
+ 	    if (_output_lines < 0)
+@@ -374,7 +380,7 @@ init_layout (void)
+ 		first_width = l1;
+ 	}
+ 
+-	for (i = 0; i <= 8; i++) {
++	for (i = 0; i <= 9; i++) {
+ 	    check_options[i].text = _(check_options[i].text);
+ 	    l1 = mbstrlen (check_options[i].text) + 7;
+ 	    if (l1 > first_width)
+@@ -391,7 +397,7 @@ init_layout (void)
+ 
+ 
+ 	second_width = mbstrlen (title3) + 1;
+-	for (i = 0; i < 6; i++) {
++	for (i = 0; i < 7; i++) {
+ 	    check_options[i].text = _(check_options[i].text);
+ 	    l1 = mbstrlen (check_options[i].text) + 7;
+ 	    if (l1 > second_width)
+@@ -454,15 +460,15 @@ init_layout (void)
+     }
+ #define XTRACT(i) *check_options[i].variable, check_options[i].text
+ 
+-    for (i = 0; i < 6; i++) {
++    for (i = 0; i < 7; i++) {
+ 	check_options[i].widget =
+-	    check_new (8 - i, 7 + first_width, XTRACT (i));
++	    check_new (9 - i, 7 + first_width, XTRACT (i));
+ 	add_widget (layout_dlg, check_options[i].widget);
+     }
+-    check_options[8].widget = check_new (10, 6, XTRACT (8));
++    check_options[9].widget = check_new (10, 6, XTRACT (9));
++    add_widget (layout_dlg, check_options[9].widget);
++    check_options[8].widget = check_new (9, 6, XTRACT (8));
+     add_widget (layout_dlg, check_options[8].widget);
+-    check_options[7].widget = check_new (9, 6, XTRACT (7));
+-    add_widget (layout_dlg, check_options[7].widget);
+ 
+     _filetype_mode = filetype_mode;
+     _permission_mode = permission_mode;
+@@ -472,20 +478,21 @@ init_layout (void)
+     _keybar_visible = keybar_visible;
+     _message_visible = message_visible;
+     _xterm_title = xterm_title;
++    _free_space = free_space;
+     bright_widget =
+ 	button_new (6, 15, B_2RIGHT, NARROW_BUTTON, "&>", b2right_cback);
+     add_widget (layout_dlg, bright_widget);
+     bleft_widget =
+ 	button_new (6, 9, B_2LEFT, NARROW_BUTTON, "&<", b2left_cback);
+     add_widget (layout_dlg, bleft_widget);
+-    check_options[6].widget = check_new (5, 6, XTRACT (6));
++    check_options[7].widget = check_new (5, 6, XTRACT (7));
+     old_first_panel_size = -1;
+     old_horizontal_split = -1;
+     old_output_lines = -1;
+ 
+     _first_panel_size = first_panel_size;
+     _output_lines = output_lines;
+-    add_widget (layout_dlg, check_options[6].widget);
++    add_widget (layout_dlg, check_options[7].widget);
+     radio_widget = radio_new (3, 6, 2, s_split_direction, 1);
+     add_widget (layout_dlg, radio_widget);
+     radio_widget->sel = horizontal_split;
+--- mc-4.6.1a/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
++++ mc-4.6.1a/src/layout.h	2006-02-01 15:47:58.000000000 +0100
+@@ -39,6 +39,7 @@ extern int keybar_visible;
+ extern int output_start_y;
+ extern int message_visible;
+ extern int xterm_title;
++extern int free_space;
+ 
+ extern int horizontal_split;
+ extern int nice_rotating_dash;

mc-utf8.patch:
 acinclude.m4       |   16 -
 edit/edit-widget.h |   16 +
 edit/edit.c        |  267 +++++++++++++++++++--------
 edit/edit.h        |   39 +++
 edit/editcmd.c     |  523 +++++++++++++++++++++++++++++++++++++++++++++--------
 edit/editdraw.c    |  113 +++++++----
 edit/editkeys.c    |   29 ++
 edit/editwidget.c  |    3 
 edit/wordproc.c    |   79 ++++++--
 src/achown.c       |    6 
 src/boxes.c        |   50 ++---
 src/dialog.c       |    2 
 src/file.c         |    9 
 src/filegui.c      |   47 ++--
 src/find.c         |   12 -
 src/help.c         |   24 ++
 src/hotlist.c      |   14 -
 src/layout.c       |   26 +-
 src/learn.c        |    2 
 src/main.c         |    6 
 src/menu.c         |  122 +++++++++++-
 src/menu.h         |    2 
 src/myslang.h      |   10 +
 src/option.c       |   20 +-
 src/panelize.c     |    8 
 src/screen.c       |  269 ++++++++++++++++++++-------
 src/slint.c        |    4 
 src/tty.c          |   10 -
 src/tty.h          |    2 
 src/util.c         |  331 ++++++++++++++++++++++++++++++---
 src/util.h         |    7 
 src/view.c         |   50 ++++-
 src/widget.c       |  371 ++++++++++++++++++++++++++++++-------
 src/widget.h       |   16 +
 src/wtools.c       |   14 -
 35 files changed, 2024 insertions(+), 495 deletions(-)

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mc-utf8.patch	28 Dec 2005 14:21:04 -0000	1.17
+++ mc-utf8.patch	1 Feb 2006 15:10:24 -0000	1.18
@@ -1,5 +1,5 @@
 --- mc-4.6.1a/acinclude.m4.utf8	2005-11-16 00:27:27.000000000 +0100
-+++ mc-4.6.1a/acinclude.m4	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/acinclude.m4	2006-02-01 14:25:01.000000000 +0100
 @@ -768,14 +768,14 @@ AC_DEFUN([MC_WITH_SLANG], [
      fi
  
@@ -24,7 +24,7 @@
      if test x$with_screen = xslang; then
  	AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
 --- mc-4.6.1a/src/layout.c.utf8	2005-09-05 03:40:45.000000000 +0200
-+++ mc-4.6.1a/src/layout.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/layout.c	2006-02-01 14:25:01.000000000 +0100
 @@ -369,36 +369,36 @@ init_layout (void)
  
  	while (i--) {
@@ -98,8 +98,8 @@
  
      widget_set_size (&the_menubar->widget, 0, 0, 1, COLS);
  
---- mc-4.6.1a/src/tty.c.utf8	2005-09-05 05:05:39.000000000 +0200
-+++ mc-4.6.1a/src/tty.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/src/tty.c.utf8	2006-01-07 13:17:07.000000000 +0100
++++ mc-4.6.1a/src/tty.c	2006-02-01 14:25:01.000000000 +0100
 @@ -123,10 +123,12 @@ tty_print_char(int c)
       * defined or not. Congratulations! At least, they left the API call
       * for SLsmg_write_nchars as it has always been.
@@ -118,7 +118,7 @@
      addch(c);
  #endif
 --- mc-4.6.1a/src/option.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/option.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/option.c	2006-02-01 14:25:01.000000000 +0100
 @@ -123,12 +123,12 @@ init_configure (void)
  	title2 = _(" Pause after run... ");
  	title3 = _(" Other options ");
@@ -167,7 +167,7 @@
  	i18n_config_flag = 1;
      }
 --- mc-4.6.1a/src/menu.h.utf8	2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.1a/src/menu.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/menu.h	2006-02-01 14:25:01.000000000 +0100
 @@ -21,6 +21,8 @@ typedef struct Menu {
      menu_entry *entries;
      int    start_x;		/* position relative to menubar start */
@@ -178,7 +178,7 @@
  
  extern int menubar_visible;
 --- mc-4.6.1a/src/menu.c.utf8	2005-09-05 04:12:09.000000000 +0200
-+++ mc-4.6.1a/src/menu.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/menu.c	2006-02-01 14:25:01.000000000 +0100
 @@ -22,6 +22,7 @@
  #include <string.h>
  
@@ -380,8 +380,8 @@
      g_free (menu->name);
      g_free (menu->help_node);
      g_free (menu);
---- mc-4.6.1a/src/filegui.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/filegui.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/src/filegui.c.utf8	2006-01-30 10:22:33.000000000 +0100
++++ mc-4.6.1a/src/filegui.c	2006-02-01 14:25:01.000000000 +0100
 @@ -65,6 +65,7 @@
  #include "filegui.h"
  #include "key.h"		/* get_event */
@@ -528,7 +528,7 @@
      return dest_dir;
  }
 --- mc-4.6.1a/src/panelize.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/panelize.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/panelize.c	2006-02-01 14:25:01.000000000 +0100
 @@ -127,7 +127,7 @@ init_panelize (void)
  	i = sizeof (panelize_but) / sizeof (panelize_but[0]);
  	while (i--) {
@@ -554,7 +554,7 @@
  #endif				/* ENABLE_NLS */
  
 --- mc-4.6.1a/src/slint.c.utf8	2005-09-05 04:14:29.000000000 +0200
-+++ mc-4.6.1a/src/slint.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/slint.c	2006-02-01 14:25:01.000000000 +0100
 @@ -141,7 +141,9 @@ void
  slang_init (void)
  {
@@ -566,9 +566,9 @@
     /*
      * If the terminal in not in terminfo but begins with a well-known
      * string such as "linux" or "xterm" S-Lang will go on, but the
---- mc-4.6.1a/src/main.c.utf8	2005-11-02 12:50:52.000000000 +0100
-+++ mc-4.6.1a/src/main.c	2005-11-16 14:03:46.000000000 +0100
-@@ -698,7 +698,7 @@ load_prompt (int fd, void *unused)
+--- mc-4.6.1a/src/main.c.utf8	2006-01-29 21:26:05.000000000 +0100
++++ mc-4.6.1a/src/main.c	2006-02-01 14:25:01.000000000 +0100
+@@ -704,7 +704,7 @@ load_prompt (int fd, void *unused)
  	int prompt_len;
  
  	tmp_prompt = strip_ctrl_codes (subshell_prompt);
@@ -577,7 +577,7 @@
  
  	/* Check for prompts too big */
  	if (COLS > 8 && prompt_len > COLS - 8) {
-@@ -1611,7 +1611,11 @@ update_xterm_title_path (void)
+@@ -1617,7 +1617,11 @@ update_xterm_title_path (void)
      if (xterm_flag && xterm_title) {
  	p = s = g_strdup (strip_home_and_password (current_panel->cwd));
  	do {
@@ -589,8 +589,8 @@
  		*s = '?';
  	} while (*++s);
  	fprintf (stdout, "\33]0;mc - %s\7", p);
---- mc-4.6.1a/src/view.c.utf8	2005-10-04 23:07:20.000000000 +0200
-+++ mc-4.6.1a/src/view.c	2005-11-16 14:04:27.000000000 +0100
+--- mc-4.6.1a/src/view.c.utf8	2006-01-31 15:39:30.000000000 +0100
++++ mc-4.6.1a/src/view.c	2006-02-01 14:25:01.000000000 +0100
 @@ -43,6 +43,10 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -602,7 +602,7 @@
  #include "global.h"
  #include "tty.h"
  #include "cmd.h"		/* For view_other_cmd */
-@@ -1631,7 +1635,7 @@ view_display_status (WView *view)
+@@ -1627,7 +1631,7 @@ view_display_status (WView *view)
      hline (' ', width);
  
      file_label = _("File: %s");
@@ -611,7 +611,7 @@
      file_name = view->filename ? view->filename
  	: view->command ? view->command
  	: "";
-@@ -1884,6 +1888,12 @@ view_display_text (WView * view)
+@@ -1895,6 +1899,12 @@ view_display_text (WView * view)
      offset_type from;
      int c;
      struct hexedit_change_node *curr = view->change_list;
@@ -624,7 +624,7 @@
  
      view_display_clean (view);
      view_display_ruler (view);
-@@ -1896,8 +1906,37 @@ view_display_text (WView * view)
+@@ -1907,8 +1917,37 @@ view_display_text (WView * view)
  
      attrset (NORMAL_COLOR);
      for (row = 0, col = 0; row < height && (c = get_byte (view, from)) != -1; from++) {
@@ -663,7 +663,7 @@
  	    int c_prev;
  	    int c_next;
  
-@@ -1956,10 +1995,17 @@ view_display_text (WView * view)
+@@ -1967,10 +2006,17 @@ view_display_text (WView * view)
  	if (col >= view->dpy_text_column
  	    && col - view->dpy_text_column < width) {
  	    widget_move (view, top + row, left + (col - view->dpy_text_column));
@@ -682,7 +682,7 @@
  	col++;
  	attrset (NORMAL_COLOR);
 --- mc-4.6.1a/src/screen.c.utf8	2005-11-11 04:32:40.000000000 +0100
-+++ mc-4.6.1a/src/screen.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/screen.c	2006-02-01 14:25:01.000000000 +0100
 @@ -171,21 +171,56 @@ add_permission_string (char *dest, int w
  static const char *
  string_file_name (file_entry *fe, int len)
@@ -1048,7 +1048,7 @@
  		attrset (NORMAL_COLOR);
  		one_vline ();
 --- mc-4.6.1a/src/widget.h.utf8	2005-06-14 15:02:31.000000000 +0200
-+++ mc-4.6.1a/src/widget.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/widget.h	2006-02-01 14:25:01.000000000 +0100
 @@ -22,6 +22,7 @@ typedef struct WButton {
      char *text;			/* text of button */
      int hotkey;			/* hot KEY */
@@ -1092,7 +1092,7 @@
      int  need_push;		/* need to push the current Input on hist? */
      char **completions;		/* Possible completions array */
 --- mc-4.6.1a/src/tty.h.utf8	2005-09-05 04:14:29.000000000 +0200
-+++ mc-4.6.1a/src/tty.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/tty.h	2006-02-01 14:25:01.000000000 +0100
 @@ -8,6 +8,8 @@
      of ifdefs in the other files small.
   */
@@ -1102,8 +1102,8 @@
  #ifdef HAVE_SLANG
  #   include "myslang.h"
  #endif
---- mc-4.6.1a/src/hotlist.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/hotlist.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/src/hotlist.c.utf8	2006-01-30 10:22:33.000000000 +0100
++++ mc-4.6.1a/src/hotlist.c	2006-02-01 14:25:01.000000000 +0100
 @@ -555,7 +555,7 @@ init_i18n_stuff(int list_type, int cols)
  
  			row = hotlist_but [i].y;
@@ -1165,7 +1165,7 @@
  
      strip_password (label_string, 1);
 --- mc-4.6.1a/src/help.c.utf8	2005-07-22 11:29:50.000000000 +0200
-+++ mc-4.6.1a/src/help.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/help.c	2006-02-01 14:25:01.000000000 +0100
 @@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons
  #ifndef HAVE_SLANG
  			addch (acs_map [c]);
@@ -1209,7 +1209,7 @@
      if (!filename)
  	g_free (hlpfile);
 --- mc-4.6.1a/src/wtools.c.utf8	2005-09-05 05:21:32.000000000 +0200
-+++ mc-4.6.1a/src/wtools.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/wtools.c	2006-02-01 14:25:01.000000000 +0100
 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin
      /* Adjust sizes */
      lines = (lines > LINES - 6) ? LINES - 6 : lines;
@@ -1270,7 +1270,7 @@
  #endif				/* ENABLE_NLS */
  
 --- mc-4.6.1a/src/util.h.utf8	2005-11-03 03:18:38.000000000 +0100
-+++ mc-4.6.1a/src/util.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/util.h	2006-02-01 14:25:01.000000000 +0100
 @@ -111,6 +111,13 @@ void init_uid_gid_cache (void);
  char *get_group (int);
  char *get_owner (int);
@@ -1286,7 +1286,7 @@
  #define MIN_I18NTIMELENGTH 10
  #define STD_I18NTIMELENGTH 12
 --- mc-4.6.1a/src/widget.c.utf8	2005-10-08 06:52:42.000000000 +0200
-+++ mc-4.6.1a/src/widget.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/widget.c	2006-02-01 14:25:01.000000000 +0100
 @@ -35,6 +35,9 @@
  
  #include "global.h"
@@ -2003,7 +2003,7 @@
  }
  
 --- mc-4.6.1a/src/util.c.utf8	2005-11-03 03:18:38.000000000 +0100
-+++ mc-4.6.1a/src/util.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/util.c	2006-02-01 14:25:01.000000000 +0100
 @@ -33,7 +33,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -2455,9 +2455,9 @@
      }
      *w = 0;
      return s;
---- mc-4.6.1a/src/file.c.utf8	2005-09-17 13:45:13.000000000 +0200
-+++ mc-4.6.1a/src/file.c	2005-11-16 14:03:46.000000000 +0100
-@@ -164,15 +164,20 @@ static const char *
+--- mc-4.6.1a/src/file.c.utf8	2006-01-29 21:26:05.000000000 +0100
++++ mc-4.6.1a/src/file.c	2006-02-01 14:25:01.000000000 +0100
+@@ -161,15 +161,20 @@ static const char *
  do_transform_source (FileOpContext *ctx, const char *source)
  {
      size_t j, k, l, len;
@@ -2479,7 +2479,7 @@
  	return NULL;
      }
      for (next_reg = 1, j = 0, k = 0; j < strlen (ctx->dest_mask); j++) {
-@@ -216,6 +221,7 @@ do_transform_source (FileOpContext *ctx,
+@@ -213,6 +218,7 @@ do_transform_source (FileOpContext *ctx,
  		|| ctx->regs.start[next_reg] < 0) {
  		message (1, MSG_ERROR, _(" Invalid target mask "));
  		transform_error = FILE_ABORT;
@@ -2487,7 +2487,7 @@
  		return NULL;
  	    }
  	    for (l = (size_t) ctx->regs.start[next_reg];
-@@ -230,6 +236,7 @@ do_transform_source (FileOpContext *ctx,
+@@ -227,6 +233,7 @@ do_transform_source (FileOpContext *ctx,
  	}
      }
      fntarget[k] = 0;
@@ -2496,7 +2496,7 @@
  }
  
 --- mc-4.6.1a/src/find.c.utf8	2005-07-07 21:34:56.000000000 +0200
-+++ mc-4.6.1a/src/find.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/find.c	2006-02-01 14:25:01.000000000 +0100
 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char 
  	int l1, maxlen = 0;
  
@@ -2545,7 +2545,7 @@
  	    list->list[next_free].f.marked = 0;
  	    list->list[next_free].f.link_to_dir = link_to_dir;
 --- mc-4.6.1a/src/myslang.h.utf8	2005-09-05 05:22:04.000000000 +0200
-+++ mc-4.6.1a/src/myslang.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/myslang.h	2006-02-01 14:25:01.000000000 +0100
 @@ -11,6 +11,16 @@
  #endif	/* HAVE_SLANG_SLANG_H */
  #endif
@@ -2564,7 +2564,7 @@
      KEY_BACKSPACE = 400,
      KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
 --- mc-4.6.1a/src/achown.c.utf8	2005-09-05 03:36:58.000000000 +0200
-+++ mc-4.6.1a/src/achown.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/achown.c	2006-02-01 14:25:01.000000000 +0100
 @@ -584,6 +584,12 @@ init_chown_advanced (void)
      b_att[2] = button_new (XTRACT (6));
      b_user = button_new (XTRACT (5));
@@ -2579,7 +2579,7 @@
      add_widget (ch_dlg, b_group);
      add_widget (ch_dlg, b_user);
 --- mc-4.6.1a/src/dialog.c.utf8	2005-09-05 05:20:27.000000000 +0200
-+++ mc-4.6.1a/src/dialog.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/dialog.c	2006-02-01 14:25:01.000000000 +0100
 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head *
  
      if (h->title) {
@@ -2589,8 +2589,8 @@
  	addstr (h->title);
      }
  }
---- mc-4.6.1a/src/boxes.c.utf8	2005-06-14 15:02:31.000000000 +0200
-+++ mc-4.6.1a/src/boxes.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/src/boxes.c.utf8	2006-01-30 10:22:33.000000000 +0100
++++ mc-4.6.1a/src/boxes.c	2006-02-01 14:25:01.000000000 +0100
 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_
  	display_title = _(display_title);
  	for (i = 0; i < LIST_TYPES; i++) {
@@ -2655,7 +2655,7 @@
  	if (i > SORT_X)
  	    SORT_X = i;
  
-@@ -405,7 +405,7 @@ confirm_box (void)
+@@ -408,7 +408,7 @@ confirm_box (void)
  		while (i--)
  		{
  			conf_widgets [i].text = _(conf_widgets [i].text);
@@ -2664,7 +2664,7 @@
  			if (l1 > maxlen)
  				maxlen = l1;
  		}
-@@ -420,8 +420,8 @@ confirm_box (void)
+@@ -423,8 +423,8 @@ confirm_box (void)
  		 * And this for the case when buttons with some space to the right
  		 * do not fit within 2/6
  		 */
@@ -2675,7 +2675,7 @@
  		if (i > l1)
  			l1 = i;
  
-@@ -492,11 +492,11 @@ display_bits_box (void)
+@@ -497,11 +497,11 @@ display_bits_box (void)
  		{
  			display_widgets [i].text = _(display_widgets[i].text);
  			display_bits_str [i] = _(display_bits_str [i]);
@@ -2689,7 +2689,7 @@
  		if (l1 > maxlen)
  			maxlen = l1;
  		
-@@ -504,8 +504,8 @@ display_bits_box (void)
+@@ -509,8 +509,8 @@ display_bits_box (void)
  		display_bits.xlen = (maxlen + 5) * 6 / 4;
  
  		/* See above confirm_box */
@@ -2700,7 +2700,7 @@
  		if (i > l1)
  			l1 = i;
  
-@@ -600,7 +600,7 @@ init_disp_bits_box (void)
+@@ -605,7 +605,7 @@ init_disp_bits_box (void)
  
      cpname = _("&Select");
      add_widget (dbits_dlg,
@@ -2709,7 +2709,7 @@
  			    NORMAL_BUTTON, cpname, sel_charset_button));
  
      return dbits_dlg;
-@@ -811,7 +811,7 @@ cd_dialog (void)
+@@ -816,7 +816,7 @@ cd_dialog (void)
      quick_widgets [1].y_divisions =
  	quick_widgets [0].y_divisions = Quick_input.ylen = 5;
  
@@ -2718,7 +2718,7 @@
  
      quick_widgets [0].relative_x =
  	quick_widgets [1].relative_x + len + 1;
-@@ -970,7 +970,7 @@ jobs_cmd (void)
+@@ -975,7 +975,7 @@ jobs_cmd (void)
  		{
  			job_buttons [i].name = _(job_buttons [i].name);
  
@@ -2727,7 +2727,7 @@
  			JOBS_X = max (JOBS_X, startx + len + 3);
  
  			job_buttons [i].xpos = startx;
-@@ -979,7 +979,7 @@ jobs_cmd (void)
+@@ -984,7 +984,7 @@ jobs_cmd (void)
  
  		/* Last button - Ok a.k.a. Cancel :) */
  		job_buttons [n_buttons - 1].xpos =
@@ -2736,7 +2736,7 @@
  
  		i18n_flag = 1;
  	}
-@@ -1037,7 +1037,7 @@ vfs_smb_get_authinfo (const char *host, 
+@@ -1042,7 +1042,7 @@ vfs_smb_get_authinfo (const char *host, 
          
          while (i--)
          {
@@ -2745,7 +2745,7 @@
              if (l1 > maxlen)
                  maxlen = l1;
          }
-@@ -1047,7 +1047,7 @@ vfs_smb_get_authinfo (const char *host, 
+@@ -1052,7 +1052,7 @@ vfs_smb_get_authinfo (const char *host, 
          
          for (i = sizeof(buts)/sizeof(buts[0]), l1 = 0; i--; )
          {
@@ -2754,7 +2754,7 @@
          }
          l1 += 15;
          if (l1 > dialog_x)
-@@ -1056,7 +1056,7 @@ vfs_smb_get_authinfo (const char *host, 
+@@ -1061,7 +1061,7 @@ vfs_smb_get_authinfo (const char *host, 
          ilen = dialog_x - 7 - maxlen; /* for the case of very long buttons :) */
          istart = dialog_x - 3 - ilen;
          
@@ -2764,7 +2764,7 @@
          i18n_flag = 1;
      }
 --- mc-4.6.1a/src/learn.c.utf8	2005-05-27 05:35:15.000000000 +0200
-+++ mc-4.6.1a/src/learn.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/src/learn.c	2006-02-01 14:25:01.000000000 +0100
 @@ -237,7 +237,7 @@ init_learn (void)
  	learn_but[0].x = 78 / 2 + 4;
  
@@ -2775,7 +2775,7 @@
  	learn_title = _(learn_title);
  	i18n_flag = 1;
 --- mc-4.6.1a/edit/edit-widget.h.utf8	2005-08-15 22:34:26.000000000 +0200
-+++ mc-4.6.1a/edit/edit-widget.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/edit-widget.h	2006-02-01 14:25:01.000000000 +0100
 @@ -30,6 +30,11 @@ typedef struct edit_key_map_type {
      long command;
  } edit_key_map_type;
@@ -2816,7 +2816,7 @@
      unsigned long stack_size_mask;
      unsigned long stack_bottom;
 --- mc-4.6.1a/edit/editkeys.c.utf8	2005-08-10 18:47:44.000000000 +0200
-+++ mc-4.6.1a/edit/editkeys.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/editkeys.c	2006-02-01 14:25:01.000000000 +0100
 @@ -181,10 +181,10 @@ static const edit_key_map_type common_ke
   * 'command' is one of the editor commands from editcmddef.h.
   */
@@ -2872,7 +2872,7 @@
  	return 0;
      }
 --- mc-4.6.1a/edit/editwidget.c.utf8	2005-09-07 10:54:12.000000000 +0200
-+++ mc-4.6.1a/edit/editwidget.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/editwidget.c	2006-02-01 14:25:01.000000000 +0100
 @@ -344,7 +344,8 @@ edit_callback (Widget *w, widget_msg_t m
  
      case WIDGET_KEY:
@@ -2883,8 +2883,8 @@
  
  	    /* The user may override the access-keys for the menu bar. */
  	    if (edit_translate_key (e, parm, &cmd, &ch)) {
---- mc-4.6.1a/edit/editcmd.c.utf8	2005-10-04 23:15:06.000000000 +0200
-+++ mc-4.6.1a/edit/editcmd.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/edit/editcmd.c.utf8	2006-01-30 10:22:33.000000000 +0100
++++ mc-4.6.1a/edit/editcmd.c	2006-02-01 14:29:55.000000000 +0100
 @@ -61,7 +61,7 @@
  #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f)
  
@@ -3094,13 +3094,13 @@
 @@ -945,7 +1027,7 @@ edit_block_copy_cmd (WEdit *edit)
  {
      long start_mark, end_mark, current = edit->curs1;
-     int size, x;
+     int size;
 -    unsigned char *copy_buf;
 +    mc_wchar_t *copy_buf;
  
      edit_update_curs_col (edit);
-     x = edit->curs_col;
-@@ -990,7 +1072,7 @@ edit_block_move_cmd (WEdit *edit)
+     if (eval_marks (edit, &start_mark, &end_mark))
+@@ -985,7 +1067,7 @@ edit_block_move_cmd (WEdit *edit)
  {
      long count;
      long current;
@@ -3109,7 +3109,7 @@
      long start_mark, end_mark;
      int deleted = 0;
      int x = 0;
-@@ -1051,7 +1133,7 @@ edit_block_move_cmd (WEdit *edit)
+@@ -1046,7 +1128,7 @@ edit_block_move_cmd (WEdit *edit)
  	edit_push_action (edit, COLUMN_ON);
  	column_highlighting = 0;
      } else {
@@ -3118,7 +3118,7 @@
  	edit_cursor_move (edit, start_mark - edit->curs1);
  	edit_scroll_screen_over_cursor (edit);
  	count = start_mark;
-@@ -1389,7 +1471,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
+@@ -1385,7 +1467,11 @@ static long sargs[NUM_REPL_ARGS][256 / s
  /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */
  /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */
  static int
@@ -3130,7 +3130,7 @@
  		      int match_bol, int icase, int *found_len, void *d)
  {
      static regex_t r;
-@@ -1398,6 +1484,11 @@ string_regexp_search (char *pattern, cha
+@@ -1394,6 +1480,11 @@ string_regexp_search (char *pattern, cha
      regmatch_t *pmatch;
      static regmatch_t s[1];
  
@@ -3142,7 +3142,7 @@
      pmatch = (regmatch_t *) d;
      if (!pmatch)
  	pmatch = s;
-@@ -1417,13 +1508,51 @@ string_regexp_search (char *pattern, cha
+@@ -1413,13 +1504,51 @@ string_regexp_search (char *pattern, cha
  	old_type = match_type;
  	old_icase = icase;
      }
@@ -3194,7 +3194,7 @@
      *found_len = pmatch[0].rm_eo - pmatch[0].rm_so;
      return (pmatch[0].rm_so);
  }
-@@ -1431,13 +1560,29 @@ string_regexp_search (char *pattern, cha
+@@ -1427,13 +1556,29 @@ string_regexp_search (char *pattern, cha
  /* thanks to  Liviu Daia <daia at stoilow.imar.ro>  for getting this
     (and the above) routines to work properly - paul */
  
@@ -3225,7 +3225,7 @@
      int n = 0;
  
      for (p = 0; p < l; p++)	/* count conversions... */
-@@ -1446,19 +1591,22 @@ edit_find_string (long start, unsigned c
+@@ -1442,19 +1587,22 @@ edit_find_string (long start, unsigned c
  		n++;
  
      if (replace_scanf || replace_regexp) {
@@ -3255,7 +3255,7 @@
  	    if (replace_case) {
  		for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++)
  		    buf[p - start] = (*get_byte) (data, p);
-@@ -1472,20 +1620,36 @@ edit_find_string (long start, unsigned c
+@@ -1468,20 +1616,36 @@ edit_find_string (long start, unsigned c
  	    }
  
  	    buf[(q = p - start)] = 0;
@@ -3293,7 +3293,7 @@
  		if (q + start < last_byte) {
  		    if (replace_case) {
  			buf[q] = (*get_byte) (data, q + start);
-@@ -1499,7 +1663,11 @@ edit_find_string (long start, unsigned c
+@@ -1495,7 +1659,11 @@ edit_find_string (long start, unsigned c
  		start++;
  		buf++;		/* move the window along */
  		if (buf == mbuf + MAX_REPL_LEN) {	/* the window is about to go past the end of array, so... */
@@ -3305,7 +3305,7 @@
  		    buf = mbuf;
  		}
  		q--;
-@@ -1525,10 +1693,16 @@ edit_find_string (long start, unsigned c
+@@ -1521,10 +1689,16 @@ edit_find_string (long start, unsigned c
  
  		buf = mbuf;
  		while (q) {
@@ -3323,7 +3323,7 @@
  			return -3;
  		    }
  		    else if (found_start == -1)	/* not found: try next line */
-@@ -1539,15 +1713,27 @@ edit_find_string (long start, unsigned c
+@@ -1535,15 +1709,27 @@ edit_find_string (long start, unsigned c
  			match_bol = 0;
  			continue;
  		    }
@@ -3353,7 +3353,7 @@
  		    memmove (mbuf, buf, q);
  		    p = start + q;
  		    move_win = 1;
-@@ -1557,36 +1743,59 @@ edit_find_string (long start, unsigned c
+@@ -1553,36 +1739,59 @@ edit_find_string (long start, unsigned c
  	    }
  	}
      } else {
@@ -3421,7 +3421,7 @@
      return -2;
  }
  
-@@ -1600,9 +1809,14 @@ edit_find_forwards (long search_start, u
+@@ -1596,9 +1805,14 @@ edit_find_forwards (long search_start, u
  
      while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) {
  	if (replace_whole) {
@@ -3436,7 +3436,7 @@
  		return p;
  	    if (once_only)
  		return -2;
-@@ -1634,6 +1848,7 @@ edit_find (long search_start, unsigned c
+@@ -1630,6 +1844,7 @@ edit_find (long search_start, unsigned c
  
  #define is_digit(x) ((x) >= '0' && (x) <= '9')
  
@@ -3444,7 +3444,7 @@
  #define snprint(v) { \
  		*p1++ = *p++; \
  		*p1 = '\0'; \
-@@ -1641,33 +1856,48 @@ edit_find (long search_start, unsigned c
+@@ -1637,33 +1852,48 @@ edit_find (long search_start, unsigned c
  		if (n >= (size_t) (e - s)) goto nospc; \
  		s += n; \
  	    }
@@ -3501,7 +3501,7 @@
  	s += n;
  	q = p;
  	p1 = q1;
-@@ -1695,45 +1925,78 @@ static int snprintf_p (char *str, size_t
+@@ -1691,45 +1921,78 @@ static int snprintf_p (char *str, size_t
  	    *p1++ = *p++;
  	if (*p == '*') {
  	    p++;
@@ -3590,7 +3590,7 @@
  	    snprint (*va_arg (ap, long *));
  	} else if (*p == 'p') {
  	    snprint (*va_arg (ap, void **));
-@@ -1742,10 +2005,17 @@ static int snprintf_p (char *str, size_t
+@@ -1738,10 +2001,17 @@ static int snprintf_p (char *str, size_t
  	q = p;
      }
      va_end (ap);
@@ -3608,7 +3608,7 @@
      return s + n - str;
  nospc:
      va_end (ap);
-@@ -1924,8 +2194,11 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1920,8 +2190,11 @@ edit_replace_cmd (WEdit *edit, int again
  		}
  	    }
  	    if (replace_yes) {	/* delete then insert new */
@@ -3621,7 +3621,7 @@
  		    int ret = 0;
  
  		    /* we need to fill in sargs just like with scanf */
-@@ -1934,17 +2207,25 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1930,17 +2203,25 @@ edit_replace_cmd (WEdit *edit, int again
  			for (k = 1;
  			     k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0;
  			     k++) {
@@ -3648,7 +3648,7 @@
  								    edit->
  								    search_start
  								    -
-@@ -1962,14 +2243,23 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1958,14 +2239,23 @@ edit_replace_cmd (WEdit *edit, int again
  		    }
  		    if (!ret)
  			ret =
@@ -3672,7 +3672,7 @@
  		    } else {
  			edit_error_dialog (_(" Replace "),
  					   ret ==
-@@ -1983,10 +2273,18 @@ edit_replace_cmd (WEdit *edit, int again
+@@ -1979,10 +2269,18 @@ edit_replace_cmd (WEdit *edit, int again
  		    times_replaced++;
  		    while (i--)
  			edit_delete (edit);
@@ -3691,7 +3691,7 @@
  	    }
  	    /* so that we don't find the same string again */
  	    if (replace_backwards) {
-@@ -2161,16 +2459,17 @@ edit_ok_to_exit (WEdit *edit)
+@@ -2157,16 +2455,17 @@ edit_ok_to_exit (WEdit *edit)
  #define TEMP_BUF_LEN 1024
  
  /* Return a null terminated length of text. Result must be g_free'd */
@@ -3713,7 +3713,7 @@
  	    x = edit_move_forward3 (edit, edit_bol (edit, start), 0,
  				    start);
  	    c = edit_get_byte (edit, start);
-@@ -2203,11 +2502,15 @@ edit_save_block (WEdit * edit, const cha
+@@ -2199,11 +2498,15 @@ edit_save_block (WEdit * edit, const cha
  	return 0;
  
      if (column_highlighting) {
@@ -3730,7 +3730,7 @@
  	    if (r < 0)
  		break;
  	    p += r;
-@@ -2215,15 +2518,19 @@ edit_save_block (WEdit * edit, const cha
+@@ -2211,15 +2514,19 @@ edit_save_block (WEdit * edit, const cha
  	}
  	g_free (block);
      } else {
@@ -3752,7 +3752,7 @@
  	    start = end;
  	}
  	g_free (buf);
-@@ -2561,17 +2868,20 @@ edit_block_process_cmd (WEdit *edit, con
+@@ -2557,17 +2864,20 @@ edit_block_process_cmd (WEdit *edit, con
  
  /* prints at the cursor */
  /* returns the number of chars printed */
@@ -3775,7 +3775,7 @@
  static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc)
  {
      FILE *p = 0;
-@@ -2665,15 +2975,20 @@ void edit_mail_dialog (WEdit * edit)
+@@ -2661,15 +2971,20 @@ void edit_mail_dialog (WEdit * edit)
  /* find first character of current word */
  static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len)
  {
@@ -3798,7 +3798,7 @@
  	return 0;
  
  /* search start of word to be completed */
-@@ -2683,11 +2998,19 @@ static int edit_find_word_start (WEdit *
+@@ -2679,11 +2994,19 @@ static int edit_find_word_start (WEdit *
  	    return 0;
  
  	last = c;
@@ -3819,7 +3819,7 @@
  		return 0;
  
  	    *word_start = edit->curs1 - (i - 1); /* start found */
-@@ -2720,7 +3043,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2716,7 +3039,7 @@ edit_collect_completions (WEdit *edit, l
  			  int *num)
  {
      int len, max_len = 0, i, skip;
@@ -3828,7 +3828,7 @@
  
      /* collect max MAX_WORD_COMPLETIONS completions */
      while (*num < MAX_WORD_COMPLETIONS) {
-@@ -2739,11 +3062,16 @@ edit_collect_completions (WEdit *edit, l
+@@ -2735,11 +3058,16 @@ edit_collect_completions (WEdit *edit, l
  	    buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE];
  	skip = 0;
  	for (i = 0; i < *num; i++) {
@@ -3848,7 +3848,7 @@
  		skip = 1;
  		break;		/* skip it, already added */
  	    }
-@@ -2751,7 +3079,7 @@ edit_collect_completions (WEdit *edit, l
+@@ -2747,7 +3075,7 @@ edit_collect_completions (WEdit *edit, l
  	if (skip)
  	    continue;
  
@@ -3857,7 +3857,7 @@
  	compl[*num].len = len;
  	for (i = 0; i < len; i++)
  	    compl[*num].text[i] = *(bufpos + i);
-@@ -2765,6 +3093,18 @@ edit_collect_completions (WEdit *edit, l
+@@ -2761,6 +3089,18 @@ edit_collect_completions (WEdit *edit, l
      return max_len;
  }
  
@@ -3876,7 +3876,7 @@
  
  /* let the user select its preferred completion */
  static void
-@@ -2777,6 +3117,9 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2773,6 +3113,9 @@ edit_completion_dialog (WEdit * edit, in
      WListbox *compl_list;
      int compl_dlg_h;		/* completion dialog height */
      int compl_dlg_w;		/* completion dialog width */
@@ -3886,7 +3886,7 @@
  
      /* calculate the dialog metrics */
      compl_dlg_h = num_compl + 2;
-@@ -2812,9 +3155,18 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2808,9 +3151,18 @@ edit_completion_dialog (WEdit * edit, in
      add_widget (compl_dlg, compl_list);
  
      /* fill the listbox with the completions */
@@ -3905,7 +3905,7 @@
  
      /* pop up the dialog */
      run_dlg (compl_dlg);
-@@ -2822,9 +3174,17 @@ edit_completion_dialog (WEdit * edit, in
+@@ -2818,9 +3170,17 @@ edit_completion_dialog (WEdit * edit, in
      /* apply the choosen completion */
      if (compl_dlg->ret_value == B_ENTER) {
  	listbox_get_current (compl_list, &curr, NULL);
@@ -3924,7 +3924,7 @@
      }
  
      /* destroy dialog before return */
-@@ -2841,8 +3201,9 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2837,8 +3197,9 @@ edit_complete_word_cmd (WEdit *edit)
  {
      int word_len = 0, i, num_compl = 0, max_len;
      long word_start = 0;
@@ -3936,7 +3936,7 @@
      struct selection compl[MAX_WORD_COMPLETIONS];	/* completions */
  
      /* don't want to disturb another search */
-@@ -2859,16 +3220,32 @@ edit_complete_word_cmd (WEdit *edit)
+@@ -2855,16 +3216,32 @@ edit_complete_word_cmd (WEdit *edit)
      /* prepare match expression */
      bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE]
  	[word_start & M_EDIT_BUF_SIZE];
@@ -3970,7 +3970,7 @@
      if (num_compl > 0) {
  	/* insert completed word if there is only one match */
 --- mc-4.6.1a/edit/wordproc.c.utf8	2005-05-27 05:35:12.000000000 +0200
-+++ mc-4.6.1a/edit/wordproc.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/wordproc.c	2006-02-01 14:25:01.000000000 +0100
 @@ -40,7 +40,12 @@
  
  #define tab_width option_tab_spacing
@@ -4191,7 +4191,7 @@
  		    return;
  		}
 --- mc-4.6.1a/edit/edit.h.utf8	2005-09-07 10:54:12.000000000 +0200
-+++ mc-4.6.1a/edit/edit.h	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/edit.h	2006-02-01 14:25:01.000000000 +0100
 @@ -25,6 +25,27 @@
  
  #include <stdio.h>
@@ -4285,7 +4285,7 @@
  #define get_sys_error(s) (s)
  
 --- mc-4.6.1a/edit/editdraw.c.utf8	2005-09-05 04:14:29.000000000 +0200
-+++ mc-4.6.1a/edit/editdraw.c	2005-11-16 14:03:46.000000000 +0100
++++ mc-4.6.1a/edit/editdraw.c	2006-02-01 14:25:01.000000000 +0100
 @@ -69,11 +69,16 @@ static void status_string (WEdit * edit,
       * as decimal and as hex.
       */
@@ -4504,8 +4504,8 @@
  
      print_to_widget (edit, row, start_col, start_col_real, end_col, line);
  }
---- mc-4.6.1a/edit/edit.c.utf8	2005-09-07 10:54:11.000000000 +0200
-+++ mc-4.6.1a/edit/edit.c	2005-11-16 14:03:46.000000000 +0100
+--- mc-4.6.1a/edit/edit.c.utf8	2006-01-26 16:42:56.000000000 +0100
++++ mc-4.6.1a/edit/edit.c	2006-02-01 14:25:01.000000000 +0100
 @@ -103,7 +103,11 @@ char *option_backup_ext = NULL;
  static void edit_move_to_prev_col (WEdit *edit, long p);
  static void user_menu (WEdit *edit);
@@ -5082,7 +5082,7 @@
      edit_update_curs_row (edit);
  
    done_undo:;
-@@ -2098,7 +2223,7 @@ static void edit_goto_matching_bracket (
+@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket (
   * passed as -1.  Commands are executed, and char_for_insertion is
   * inserted at the cursor.
   */
@@ -5091,7 +5091,7 @@
  {
      if (command == CK_Begin_Record_Macro) {
  	edit->macro_i = 0;
-@@ -2133,7 +2258,7 @@ static const char * const shell_cmd[] = 
+@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] = 
     all of them. It also does not check for the Undo command.
   */
  void
@@ -5100,7 +5100,7 @@
  {
      edit->force |= REDRAW_LINE;
  
-@@ -2166,7 +2291,7 @@ edit_execute_cmd (WEdit *edit, int comma
+@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma
      }
  
      /* An ordinary key press */


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mc.spec	30 Dec 2005 20:08:50 -0000	1.76
+++ mc.spec	1 Feb 2006 15:10:24 -0000	1.77
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	6
+Release:	7
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -19,10 +19,11 @@
 Patch5:		mc-userhost.patch
 Patch6:		mc-64bit.patch
 Patch7:		mc-utf8-look-and-feel.patch
-Patch8:         mc-phpfix.patch
-Patch9:         mc-concat.patch
-Patch10:        mc-ministatus.patch
-Patch11:	mc-showfree.patch
+Patch8:		mc-concat.patch
+Patch9:		mc-showfree.patch
+Patch10:	mc-cedit.patch
+Patch11:	mc-delcheck.patch
+Patch12:	mc-bracket.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -42,10 +43,11 @@
 %patch5 -p1 -b .userhost
 %patch6 -p1 -b .64bit
 %patch7 -p1 -b .laf
-%patch8 -p1 -b .phpfix
-%patch9 -p1 -b .concat
-%patch10 -p1 -b .ministatus
-%patch11 -p1 -b .showfree
+%patch8 -p1 -b .concat
+%patch9 -p1 -b .showfree
+%patch10 -p1 -b .cedit
+%patch11 -p1 -b .delcheck
+%patch12 -p1 -b .bracket
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -170,7 +172,7 @@
 %{_bindir}/mcmfmt
 %{_bindir}/mcview
 %{_datadir}/mc/*
-%attr(4711, vcsa, root) %{_libdir}/mc/cons.saver
+%attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
 %{_mandir}/man1/*
 %lang(es) %{_mandir}/es/man1/mc.1.gz
 %lang(hu) %{_mandir}/hu/man1/mc.1.gz
@@ -179,10 +181,20 @@
 %lang(ru) %{_mandir}/ru/man1/mc.1.gz
 %lang(sr) %{_mandir}/sr/man1/mc.1.gz
 %config %{_sysconfdir}/profile.d/*
-%dir %{_libdir}/mc
 %dir %{_datadir}/mc
 
 %changelog
+* Wed Feb  1 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-7
+- update from CVS - fixes syntax file for PHP
+- make displaying of free space configurable
+- fix permission highlighting (#177100)
+- redirect stdout and stderr of several apps run on background
+  to /dev/null to not to mess up mc interface (#178833)
+- refresh directories to avoid errors caused by copying
+  files to non-existent directories (#177111)
+- add an option to insert changelog entry in mcedit,
+  thanks to Radek Vokal
+
 * Wed Dec 28 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-6
 - display free space on a device assigned to current directory in
   main panels


--- mc-phpfix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:29:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:29:52 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.107,1.108
Message-ID: <200602011529.k11FTq5F024678@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
add bug ref



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-applets.spec	1 Feb 2006 15:07:29 -0000	1.107
+++ gnome-applets.spec	1 Feb 2006 15:29:50 -0000	1.108
@@ -28,6 +28,7 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=329476
 Patch5:		gnome-applets-2.13.3-bad-weather.patch
 URL:		http://www.gnome.org/
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:31:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:31:05 -0500
Subject: rpms/dejagnu/devel dejagnu-1.4.4-smp-1.patch, NONE,
	1.1 dejagnu-rh.spec, 1.12, 1.13
Message-ID: <200602011531.k11FV5EA024830@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/dejagnu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24802

Modified Files:
	dejagnu-rh.spec 
Added Files:
	dejagnu-1.4.4-smp-1.patch 
Log Message:
- Applying H.J. Lu's race condition patch. (#166000)


dejagnu-1.4.4-smp-1.patch:
 remote.exp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE dejagnu-1.4.4-smp-1.patch ---
--- dejagnu-1.4.4/lib/remote.exp.smp	2003-10-10 23:42:46.000000000 -0700
+++ dejagnu-1.4.4/lib/remote.exp	2005-08-05 12:32:10.107161990 -0700
@@ -91,9 +91,13 @@ proc local_exec { commandline inp outp t
     # programs that bear children. We can't use tcl's exec because it has
     # no way to timeout programs that hang. *sigh*
     #
+    # The expect command will close the connection when it sees EOF. On
+    # SMP machine, close the connection may send SIGHUP to the child
+    # and cause it to exit before it can exit normally.  We should make
+    # the child to ignore SIGHUP.
     if { "$inp" == "" && "$outp" == "" } {
 	set id -1
-	set result [catch "eval spawn \{${commandline}\}" pid]
+	set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}" pid]
 	if { $result == 0 } {
 	    set result2 0
 	} else {
@@ -134,7 +138,7 @@ proc local_exec { commandline inp outp t
 	    return [list -1 "open of $commandline $inp $outp failed: $errorInfo"]
 	}
 	set pid [pid $id]
-	set result [catch "spawn -leaveopen $id" result2]
+	set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2]
     }
     # Prepend "-" to each pid, to generate the "process group IDs" needed by
     # kill.


Index: dejagnu-rh.spec
===================================================================
RCS file: /cvs/dist/rpms/dejagnu/devel/dejagnu-rh.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dejagnu-rh.spec	9 Dec 2005 22:40:10 -0000	1.12
+++ dejagnu-rh.spec	1 Feb 2006 15:30:37 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs.
 Name: dejagnu
 Version: 1.4.4
-Release: 4.1
+Release: 5
 Epoch: 1
 License: GPL
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArchitectures: noarch
 BuildRequires: jadetex docbook-utils-pdf tetex-dvips
+Patch1: dejagnu-1.4.4-smp-1.patch
 
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
@@ -23,6 +24,7 @@
 %prep
 %setup -q -n dejagnu-%{version}
 find . -name \*.rej -exec rm {} \;
+%patch1 -p1
 
 %build
 %configure -v
@@ -57,6 +59,9 @@
 
  
 %changelog
+* Wed Feb 2 2006 Petr Machata <pmachata at redhat.com> 1:1.4.4-5
+- Applying H.J. Lu's race condition patch. (#166000)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:32:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:32:54 -0500
Subject: rpms/eclipse/devel .cvsignore, 1.19,
	1.20 eclipse-tomcat5-build.2.patch, 1.4, 1.5 eclipse.spec,
	1.233, 1.234 sources, 1.31, 1.32 eclipse-e.o111299.patch, 1.1,
	NONE eclipse-find.patch, 1.2,
	NONE eclipse-usebuiltlauncher.patch, 1.1, NONE
Message-ID: <200602011532.k11FWsQ1024945@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24882

Modified Files:
	.cvsignore eclipse-tomcat5-build.2.patch eclipse.spec sources 
Removed Files:
	eclipse-e.o111299.patch eclipse-find.patch 
	eclipse-usebuiltlauncher.patch 
Log Message:
* Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
- 3.1.2.
- Remove unnecessary patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Dec 2005 04:57:49 -0000	1.19
+++ .cvsignore	1 Feb 2006 15:32:49 -0000	1.20
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1.1.zip
-eclipse-fedora-splash-3.1.1.png
+eclipse-sourceBuild-srcIncluded-3.1.2.zip
+eclipse-fedora-splash-3.1.2.png

eclipse-tomcat5-build.2.patch:
 assemble.org.eclipse.sdk.aix.motif.ppc.xml       |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml  |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.ia64.xml     |    2 +-
 assemble.org.eclipse.sdk.solaris.gtk.sparc.xml   |    2 +-
 assemble.org.eclipse.sdk.solaris.motif.sparc.xml |    2 +-
 assemble.org.eclipse.sdk.win32.win32.x86.xml     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Index: eclipse-tomcat5-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat5-build.2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-tomcat5-build.2.patch	11 Oct 2005 21:49:42 -0000	1.4
+++ eclipse-tomcat5-build.2.patch	1 Feb 2006 15:32:50 -0000	1.5
@@ -1,84 +1,72 @@
 diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
---- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/aix.motif.ppc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:29:08.000000000 -0500
+@@ -608,7 +608,7 @@
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
---- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -580,7 +580,7 @@
- 		</antcall>
- 		<eclipse.brand root="${eclipse.base}/hpux.motif.ia64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<zip destfile="${archiveFullPath}" filesonly="false" whenempty="skip" update="true">
+--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:30:34.000000000 -0500
+@@ -597,7 +597,7 @@
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.expressions_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.pde.doc.user_3.1.2" prefix="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"			/>
 -			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
-+			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.ui_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.ui_3.1.1.jar"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.pde.runtime_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.1.1.jar"			/>
++			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.1" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"			/>
 diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
---- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -594,7 +594,7 @@
- 		<eclipse.brand root="${eclipse.base}/hpux.motif.PA_RISC/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:31:47.000000000 -0500
+@@ -618,7 +618,7 @@
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
---- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/solaris.gtk.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:32:20.000000000 -0500
+@@ -607,7 +607,7 @@
  		<exec executable="zip" dir="${assemblyTempDir}">
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
---- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/solaris.motif.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:32:38.000000000 -0500
+@@ -609,7 +609,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.motif.sparc_3.1.2"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
---- assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -608,7 +608,7 @@
- 		<eclipse.brand root="${eclipse.base}/win32.win32.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:32:52.000000000 -0500
+@@ -634,7 +634,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.win32.win32.x86_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml	2005-10-11 10:56:12.000000000 -0400
-+++ features/org.eclipse.platform/build.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -346,7 +346,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- eclipse.spec	31 Jan 2006 11:48:09 -0000	1.233
+++ eclipse.spec	1 Feb 2006 15:32:50 -0000	1.234
@@ -9,9 +9,8 @@
 %define eclipse_major   3
 %define eclipse_minor   1
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   1
+%define eclipse_micro   2
 %define libname         libswt3
-%define build_id        M20050929-0840
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -23,11 +22,11 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_16fc
+Release:        1jpp_1fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-sourceBuild-srcIncluded-3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-sourceBuild-srcIncluded-3.1.2.zip
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
@@ -35,7 +34,7 @@
 Source8:        %{name}-pde.install     
 Source9:        %{name}-platform.install
 Source10:       %{libname}-gtk2.install
-Source11:	%{name}-fedora-splash-3.1.1.png
+Source11:	%{name}-fedora-splash-3.1.2.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
 Source19:       %{name}-filenamepatterns.txt
@@ -62,9 +61,6 @@
 Patch13:	%{name}-s390ands390x.patch
 # Stupid spaces in directories ...
 Patch14:	%{name}-s390ands390x2.patch
-# Make find work.  See
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
-#Patch16:	%{name}-find.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
@@ -97,9 +93,6 @@
 Patch37:	%{name}-gre64.conf.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
-Patch39:	%{name}-e.o111299.patch
-Patch40:	%{name}-usebuiltlauncher.patch
 # Build cairo libs
 # Again, I hate patches with spaces in the filenames
 Patch41:	%{name}-libswt-cairo1.0-1.patch
@@ -328,17 +321,14 @@
 %patch0 -p0
 %patch11 -p0
 %if %{gcj_support}
-%patch14 -p0
+#%patch14 -p0
 %endif
 popd
 %patch2 -p0
 %patch4 -p0
 %patch5 -p0
 %if %{gcj_support}
-%patch13 -p0
-%endif
-%if %{gcj_support}
-#%patch16 -p0
+#%patch13 -p0
 %endif
 pushd plugins/org.eclipse.swt.gtk.linux.x86_64
 %patch18 -p0
@@ -384,10 +374,6 @@
 %patch35 -p0
 %patch36 -p1
 %patch38 -p0
-pushd plugins
-%patch39 -p0
-popd
-%patch40 -p0
 # Again, I hate spaces in patches
 pushd plugins/org.eclipse.swt/Eclipse\ SWT/
 %patch41 -p0
@@ -1032,8 +1018,8 @@
 %if %{gcj_support}
 # Native bits
 %dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
 %{_bindir}/ecj
 %endif
 
@@ -1054,8 +1040,8 @@
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.so
 %endif
@@ -1064,12 +1050,12 @@
 %{_bindir}/efj
 %if %{gcj_support}
 # Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/junitruntime.jar.db
 %{_libdir}/gcj/%{name}/junitruntime.jar.so
 %{_libdir}/gcj/%{name}/junitsupport.jar.db
@@ -1097,8 +1083,8 @@
 %{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
 %endif
@@ -1153,14 +1139,14 @@
 %{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
@@ -1181,14 +1167,14 @@
 %{_libdir}/gcj/%{name}/webapp.jar.so
 %{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
 %{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.db
@@ -1203,36 +1189,36 @@
 %{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/compatibility.jar.db
 %{_libdir}/gcj/%{name}/compatibility.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
@@ -1253,8 +1239,8 @@
 %{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
 %endif
@@ -1262,9 +1248,13 @@
 %files platform-devel
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
 %{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
+- 3.1.2.
+- Remove unnecessary patches.
+
 * Tue Jan 31 2006 Karsten Hopp <karsten at redhat.de>
 - BuildRequire: unzip
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Dec 2005 04:57:49 -0000	1.31
+++ sources	1 Feb 2006 15:32:50 -0000	1.32
@@ -1,2 +1,2 @@
-0d78d5f8afe767014a1cc69ee8c20869  eclipse-sourceBuild-srcIncluded-3.1.1.zip
-0c2a9c7c9f8c6cd1e7264dd0be801d66  eclipse-fedora-splash-3.1.1.png
+f2c8066151de14c5ccdf420266ce9f39  eclipse-sourceBuild-srcIncluded-3.1.2.zip
+1ee1e19362e3ee4d3b67a6dea18961de  eclipse-fedora-splash-3.1.2.png


--- eclipse-e.o111299.patch DELETED ---


--- eclipse-find.patch DELETED ---


--- eclipse-usebuiltlauncher.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:43:30 -0500
Subject: rpms/mc/devel sources,1.27,1.28
Message-ID: <200602011543.k11FhU8a029117@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28993

Modified Files:
	sources 
Log Message:
- upload new source tarball



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Dec 2005 12:56:23 -0000	1.27
+++ sources	1 Feb 2006 15:43:27 -0000	1.28
@@ -1 +1 @@
-1ed536a7b1c8ed5ce9081a2124f7dcdb  mc-4.6.1a.tar.bz2
+137731f23c8aee7d76d80eaedde45914  mc-4.6.1a.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:56:01 -0500
Subject: rpms/perl/devel perl-5.8.8-CAN-2004-0976.patch, 1.1,
	1.2 perl-5.8.8-dashI.patch, 1.1, 1.2 perl-5.8.8-incpush.patch,
	1.1, 1.2 perl-5.8.8-links.patch, 1.1,
	1.2 perl-5.8.8-perlbug-tag-A.patch, NONE,
	1.1 perl-5.8.8-perlbug-tag.patch, 1.1,
	1.2 perl-5.8.8-rpath-make.patch, 1.1,
	1.2 perl-5.8.8-USE_MM_LD_RUN_PATH.patch, 1.1, 1.2
Message-ID: <200602011556.k11Fu1SV014294@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-CAN-2004-0976.patch perl-5.8.8-dashI.patch 
	perl-5.8.8-incpush.patch perl-5.8.8-links.patch 
	perl-5.8.8-perlbug-tag-A.patch perl-5.8.8-perlbug-tag.patch 
	perl-5.8.8-rpath-make.patch 
	perl-5.8.8-USE_MM_LD_RUN_PATH.patch 
Log Message:
re-base old patch to new 5.8.8 source

perl-5.8.8-CAN-2004-0976.patch:
 lib/CGI/Cookie.pm            |    2 +-
 lib/Memoize/t/tie.t          |    9 +--------
 lib/Memoize/t/tie_gdbm.t     |    8 +-------
 lib/Memoize/t/tie_ndbm.t     |    9 +--------
 lib/Memoize/t/tie_sdbm.t     |    9 +--------
 lib/Memoize/t/tie_storable.t |    9 +--------
 lib/Shell.pm                 |    2 +-
 utils/c2ph.PL                |    2 +-
 8 files changed, 8 insertions(+), 42 deletions(-)

Index: perl-5.8.8-CAN-2004-0976.patch
===================================================================
RCS file: perl-5.8.8-CAN-2004-0976.patch
diff -N perl-5.8.8-CAN-2004-0976.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-CAN-2004-0976.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,122 @@
+--- perl-5.8.8-RC1/utils/c2ph.PL.CAN-2004-0976	2004-10-19 15:45:42.000000000 -0400
++++ perl-5.8.8-RC1/utils/c2ph.PL	2006-01-20 15:51:09.000000000 -0500
+@@ -1320,7 +1320,7 @@
+ 	$intrinsics{$_[1]} = $template{$_[0]};
+     }
+     close(PIPE) || die "couldn't read intrinsics!";
+-    unlink($TMP, '$SAFEDIR/a.out');
++    unlink($TMP, "$SAFEDIR/a.out");
+     print STDERR "done\n" if $trace;
+ }
+ 
+--- perl-5.8.8-RC1/lib/CGI/Cookie.pm.CAN-2004-0976	2006-01-08 11:39:14.000000000 -0500
++++ perl-5.8.8-RC1/lib/CGI/Cookie.pm	2006-01-20 15:51:09.000000000 -0500
+@@ -407,7 +407,7 @@
+ You may also retrieve cookies that were stored in some external
+ form using the parse() class method:
+ 
+-       $COOKIES = `cat /usr/tmp/Cookie_stash`;
++       $COOKIES = `cat /var/run/www/Cookie_stash`;
+        %cookies = parse CGI::Cookie($COOKIES);
+ 
+ If you are in a mod_perl environment, you can save some overhead by
+--- perl-5.8.8-RC1/lib/Memoize/t/tie_storable.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
++++ perl-5.8.8-RC1/lib/Memoize/t/tie_storable.t	2006-01-20 15:51:09.000000000 -0500
+@@ -33,14 +33,7 @@
+ 
+ print "1..4\n";
+ 
+-
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "storable$$");
++$file = "storable$$";
+ 1 while unlink $file;
+ tryout('Memoize::Storable', $file, 1);  # Test 1..4
+ 1 while unlink $file;
+--- perl-5.8.8-RC1/lib/Memoize/t/tie_ndbm.t.CAN-2004-0976	2005-04-22 07:36:58.000000000 -0400
++++ perl-5.8.8-RC1/lib/Memoize/t/tie_ndbm.t	2006-01-20 15:51:09.000000000 -0500
+@@ -28,14 +28,7 @@
+ 
+ print "1..4\n";
+ 
+-
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
+ tryout('Memoize::NDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
+--- perl-5.8.8-RC1/lib/Memoize/t/tie.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
++++ perl-5.8.8-RC1/lib/Memoize/t/tie.t	2006-01-20 15:51:09.000000000 -0500
+@@ -29,14 +29,7 @@
+   $_[0]+1;
+ }
+ 
+-if (eval {require File::Spec::Functions}) {
+-  File::Spec::Functions->import('tmpdir', 'catfile');
+-  $tmpdir = tmpdir();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
+-}
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ @files = ($file, "$file.db", "$file.dir", "$file.pag");
+ 1 while unlink @files;
+ 
+--- perl-5.8.8-RC1/lib/Memoize/t/tie_sdbm.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
++++ perl-5.8.8-RC1/lib/Memoize/t/tie_sdbm.t	2006-01-20 15:51:09.000000000 -0500
+@@ -28,14 +28,7 @@
+ 
+ print "1..4\n";
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import('tmpdir', 'catfile');
+- $tmpdir = tmpdir();
+-} else {
+- *catfile = sub { join '/', @_ };
+-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
+-}
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag";
+ tryout('Memoize::SDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag";
+--- perl-5.8.8-RC1/lib/Memoize/t/tie_gdbm.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
++++ perl-5.8.8-RC1/lib/Memoize/t/tie_gdbm.t	2006-01-20 15:51:09.000000000 -0500
+@@ -26,13 +26,7 @@
+ 
+ print "1..4\n";
+ 
+-if (eval {require File::Spec::Functions}) {
+- File::Spec::Functions->import();
+-} else {
+-  *catfile = sub { join '/', @_ };
+-}
+-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
+-$file = catfile($tmpdir, "md$$");
++$file = "md$$";
+ 1 while unlink $file, "$file.dir", "$file.pag";
+ tryout('GDBM_File', $file, 1);  # Test 1..4
+ 1 while unlink $file, "$file.dir", "$file.pag";
+--- perl-5.8.8-RC1/lib/Shell.pm.CAN-2004-0976	2004-06-01 05:42:17.000000000 -0400
++++ perl-5.8.8-RC1/lib/Shell.pm	2006-01-20 15:51:09.000000000 -0500
+@@ -127,7 +127,7 @@
+    use Shell qw(cat ps cp);
+    $passwd = cat('</etc/passwd');
+    @pslines = ps('-ww'),
+-   cp("/etc/passwd", "/tmp/passwd");
++   cp("/etc/passwd", "/etc/passwd.orig");
+ 
+    # object oriented 
+    my $sh = Shell->new;

perl-5.8.8-dashI.patch:
 perl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: perl-5.8.8-dashI.patch
===================================================================
RCS file: perl-5.8.8-dashI.patch
diff -N perl-5.8.8-dashI.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-dashI.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,11 @@
+--- perl-5.8.8-RC1/perl.c.dashI	2006-01-08 09:36:17.000000000 -0500
++++ perl-5.8.8-RC1/perl.c	2006-01-20 14:42:43.000000000 -0500
+@@ -1755,7 +1755,7 @@
+ 	    if (s && *s) {
+ 		STRLEN len = strlen(s);
+ 		const char * const p = savepvn(s, len);
+-		incpush(p, TRUE, TRUE, FALSE);
++		incpush(p, FALSE, FALSE, FALSE);
+ 		sv_catpvn(sv, "-I", 2);
+ 		sv_catpvn(sv, p, len);
+ 		sv_catpvn(sv, " ", 1);

perl-5.8.8-incpush.patch:
 perl.c |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+)

Index: perl-5.8.8-incpush.patch
===================================================================
RCS file: perl-5.8.8-incpush.patch
diff -N perl-5.8.8-incpush.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-incpush.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,63 @@
+--- perl-5.8.7/perl.c.orig	2005-04-22 17:14:27.000000000 +0300
++++ perl-5.8.7/perl.c	2005-06-17 22:31:31.000000000 +0300
+@@ -109,6 +109,7 @@
+ #endif
+ 
+ static I32 read_e_script(pTHX_ int idx, SV *buf_sv, int maxlen);
++STATIC void incpush_oldversion(pTHX_ char *dir);
+ 
+ #ifdef IAMSUID
+ #ifndef DOSUID
+@@ -4435,6 +4436,7 @@
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+     incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
++    incpush_oldversion(aTHX_ SITEARCH_EXP);
+ #  endif
+ #endif
+ 
+@@ -4456,6 +4458,7 @@
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+     incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
++    incpush_oldversion(aTHX_ PERL_VENDORARCH_EXP);
+ #  endif
+ #endif
+ 
+@@ -4497,6 +4500,36 @@
+ #  define PERLLIB_MANGLE(s,n) (s)
+ #endif
+ 
++#define VERSION_DIRECTORY_STRING  "/" STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION) "." STRINGIFY(PERL_SUBVERSION)
++STATIC void
++incpush_oldversion(pTHX_ char *dir)
++{
++#ifdef PERL_INC_VERSION_LIST
++  const char *incverlist[] = { PERL_INC_VERSION_LIST };
++  const char **incver;
++  const char *verdir;
++
++  verdir = strstr(dir, VERSION_DIRECTORY_STRING);
++  if (!verdir)
++    return;
++
++  for (incver = incverlist; *incver; incver++) {
++    char *new_dir = malloc(strlen(dir) + strlen(*incver) + 2);
++    char *p = new_dir;
++
++    strcpy(new_dir, dir);
++    p += verdir - dir + 1; /* advance to char following '/' in VERSION_DIRECTORY_STRING */
++    memcpy(p, *incver, strlen(*incver)); /* copy incver there instead */
++    p += strlen(*incver);	/* advance past version we just copied */
++    strcpy(p, verdir + strlen(VERSION_DIRECTORY_STRING)); /* and copy the rest of the original dir */
++
++    incpush(new_dir, FALSE, FALSE, FALSE);
++    free(new_dir);
++  }
++#endif
++}
++
++
+ /* Push a directory onto @INC if it exists.
+    Generate a new SV if we do this, to save needing to copy the SV we push
+    onto @INC  */

perl-5.8.8-links.patch:
 CPAN.pm           |    2 +-
 CPAN/FirstTime.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: perl-5.8.8-links.patch
===================================================================
RCS file: perl-5.8.8-links.patch
diff -N perl-5.8.8-links.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-links.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,22 @@
+--- perl-5.8.8-RC1/lib/CPAN/FirstTime.pm.links	2006-01-05 12:37:39.000000000 -0500
++++ perl-5.8.8-RC1/lib/CPAN/FirstTime.pm	2006-01-20 14:57:13.000000000 -0500
+@@ -326,7 +326,7 @@
+     local $^W = $old_warn;
+     my $progname;
+     for $progname (qw/bzip2 gzip tar unzip make
+-                      curl lynx wget ncftpget ncftp ftp
++                      curl links wget ncftpget ncftp ftp
+                       gpg/)
+     {
+       if ($^O eq 'MacOS') {
+--- perl-5.8.8-RC1/lib/CPAN.pm.links	2006-01-05 12:37:39.000000000 -0500
++++ perl-5.8.8-RC1/lib/CPAN.pm	2006-01-20 14:55:51.000000000 -0500
+@@ -2607,7 +2607,7 @@
+ 	  my($wstatus);
+ 	  if (($wstatus = system($system)) == 0
+ 	      &&
+-	      ($f eq "lynx" ?
++	      ($f eq "links" ?
+ 	       -s $asl_ungz # lynx returns 0 when it fails somewhere
+ 	       : 1
+ 	      )

perl-5.8.8-perlbug-tag-A.patch:
 perlbug.PL |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

--- NEW FILE perl-5.8.8-perlbug-tag-A.patch ---
--- perl-5.8.8-RC1/utils/perlbug.PL.perlbug	2006-01-03 14:07:41.000000000 -0500
+++ perl-5.8.8-RC1/utils/perlbug.PL	2006-01-20 14:33:26.000000000 -0500
@@ -71,7 +71,7 @@
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
 	if \$running_under_some_shell;
 
-my \$config_tag1 = '$extract_version - $Config{cf_time}';
+my \$config_tag1 = '$extract_version';
 
 my \$patchlevel_date = $patchlevel_date;
 my \$patch_tags = '$patch_tags';
@@ -287,18 +287,9 @@
     # OK - send "OK" report for build on this system
     $ok = 0;
     if ($::opt_o) {
-	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
-	    my $age = time - $patchlevel_date;
-	    if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
-		my $date = localtime $patchlevel_date;
-		print <<"EOF";
-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
-are more than 60 days old.  This Perl version was constructed on
-$date.  If you really want to report this, use
-"perlbug -okay" or "perlbug -nokay".
-EOF
-		exit();
-	    }
+	#
+	# Red Hat modification: remove -ok / -nok refusal to report due to age
+	#
 	    # force these options
 	    unless ($::opt_n) {
 		$::opt_S = 1; # don't prompt for send
@@ -605,7 +596,7 @@
     print OUT <<EFF;
 ---
 EFF
-    print OUT "This perlbug was built using Perl $config_tag1\n",
+    print OUT "This perlbug was built using Perl $config_tag1 in the Red Hat build system.\n",
 	    "It is being executed now by  Perl $config_tag2.\n\n"
 	if $config_tag2 ne $config_tag1;
 

perl-5.8.8-perlbug-tag.patch:
 perlbug.PL |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

Index: perl-5.8.8-perlbug-tag.patch
===================================================================
RCS file: perl-5.8.8-perlbug-tag.patch
diff -N perl-5.8.8-perlbug-tag.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-perlbug-tag.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,50 @@
+--- perl-5.8.8-RC1/utils/perlbug.PL.perlbug	2006-01-03 14:07:41.000000000 -0500
++++ perl-5.8.8-RC1/utils/perlbug.PL	2006-01-31 14:33:47.000000000 -0500
+@@ -27,7 +27,6 @@
+ open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
+     or die "Can't open patchlevel.h: $!";
+ 
+-my $patchlevel_date = (stat PATCH_LEVEL)[9];
+ my $patchnum = "";
+ 
+ while (<PATCH_LEVEL>) {
+@@ -71,9 +70,8 @@
+     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+ 	if \$running_under_some_shell;
+ 
+-my \$config_tag1 = '$extract_version - $Config{cf_time}';
++my \$config_tag1 = '$extract_version';
+ 
+-my \$patchlevel_date = $patchlevel_date;
+ my \$patch_tags = '$patch_tags';
+ my \@patches = (
+     $patch_desc
+@@ -288,17 +286,6 @@
+     $ok = 0;
+     if ($::opt_o) {
+ 	if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
+-	    my $age = time - $patchlevel_date;
+-	    if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
+-		my $date = localtime $patchlevel_date;
+-		print <<"EOF";
+-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
+-are more than 60 days old.  This Perl version was constructed on
+-$date.  If you really want to report this, use
+-"perlbug -okay" or "perlbug -nokay".
+-EOF
+-		exit();
+-	    }
+ 	    # force these options
+ 	    unless ($::opt_n) {
+ 		$::opt_S = 1; # don't prompt for send
+@@ -605,8 +592,8 @@
+     print OUT <<EFF;
+ ---
+ EFF
+-    print OUT "This perlbug was built using Perl $config_tag1\n",
+-	    "It is being executed now by  Perl $config_tag2.\n\n"
++    print OUT "This perlbug was built using Perl $config_tag1 in the Red Hat build system.\n",
++	    "It is being executed now by Perl $config_tag2.\n\n"
+ 	if $config_tag2 ne $config_tag1;
+ 
+     print OUT <<EOF;

perl-5.8.8-rpath-make.patch:
 Makefile.SH |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

Index: perl-5.8.8-rpath-make.patch
===================================================================
RCS file: perl-5.8.8-rpath-make.patch
diff -N perl-5.8.8-rpath-make.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-rpath-make.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,32 @@
+--- perl-5.8.8-RC1/Makefile.SH.makerpath	2006-01-20 16:41:26.000000000 -0500
++++ perl-5.8.8-RC1/Makefile.SH	2006-01-20 16:41:57.000000000 -0500
+@@ -125,26 +125,10 @@
+ 	esac
+ 
+ 	case "$osname" in
+-	linux)
+-	    # If there is a pre-existing $libperl from a previous
+-	    # installation, Linux needs to use LD_PRELOAD to
+-	    # override the LD_LIBRARY_PATH setting.  See the
+-	    # INSTALL file, under "Building a shared perl library".
+-	    # If there is no pre-existing $libperl, we don't need
+-	    # to do anything further.
+-	    if test -f $archlib/CORE/$libperl; then
+-		rm -f preload
+-		cat <<'EOT' > preload
+-#! /bin/sh
+-lib=$1
+-shift
+-test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+-exec "$@"
+-EOT
+-		chmod 755 preload
+-		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
+-	    fi
++	linux*)
++	    ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth"
+ 	    ;;
++
+ 	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
+ 		;;
+ 	esac

perl-5.8.8-USE_MM_LD_RUN_PATH.patch:
 Liblist.pm   |    5 ++++
 MM_Unix.pm   |    2 -
 MakeMaker.pm |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 65 insertions(+), 6 deletions(-)

Index: perl-5.8.8-USE_MM_LD_RUN_PATH.patch
===================================================================
RCS file: perl-5.8.8-USE_MM_LD_RUN_PATH.patch
diff -N perl-5.8.8-USE_MM_LD_RUN_PATH.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-USE_MM_LD_RUN_PATH.patch	1 Feb 2006 15:55:58 -0000	1.2
@@ -0,0 +1,123 @@
+--- perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm.USE_MM_LD_RUN_PATH	2006-01-20 15:51:09.000000000 -0500
++++ perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm	2006-01-20 16:25:43.000000000 -0500
+@@ -233,7 +233,7 @@
+     PERL_SRC PERM_RW PERM_RWX
+     PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
+     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
++    SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
+     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
+     tool_autosplit
+ 
+@@ -369,7 +369,27 @@
+         print join(" ", map { "perl($_)>=$self->{PREREQ_PM}->{$_} " } 
+                         sort keys %{$self->{PREREQ_PM}}), "\n";
+         exit 0;
+-   }
++    }
++   
++    # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation
++    if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
++       &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
++	 ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) 
++           &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
++	    )
++	 )
++       )
++    {
++	my $v = $1;
++	if( $v )
++	{
++	    $v = ($v=~/=([01])$/)[0];
++	}else
++	{
++	    $v = 1;
++	};
++	$self->{USE_MM_LD_RUN_PATH}=$v;
++    };
+ 
+     print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
+     if (-f "MANIFEST" && ! -f "Makefile"){
+@@ -1373,13 +1393,13 @@
+ 
+ This is the root directory into which the code will be installed.  It
+ I<prepends itself to the normal prefix>.  For example, if your code
+-would normally go into F</usr/local/lib/perl> you could set DESTDIR=~/tmp/
+-and installation would go into F<~/tmp/usr/local/lib/perl>.
++would normally go into /usr/local/lib/perl you could set DESTDIR=~/myperl/
++and installation would go into ~/myperl/usr/local/lib/perl.
+ 
+ This is primarily of use for people who repackage Perl modules.
+ 
+ NOTE: Due to the nature of make, it is important that you put the trailing
+-slash on your DESTDIR.  F<~/tmp/> not F<~/tmp>.
++slash on your DESTDIR.  F<"~/myperl/"> not F<"~/myperl">.
+ 
+ =item DIR
+ 
+@@ -2057,6 +2077,40 @@
+ precedence, even if it isn't listed in TYPEMAPS.  The default system
+ typemap has lowest precedence.
+ 
++=item USE_MM_LD_RUN_PATH
++
++boolean
++The Red Hat perl MakeMaker distribution differs from the standard 
++upstream release in that it disables use of the MakeMaker generated
++LD_RUN_PATH by default, UNLESS this attribute is specified , or the
++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
++
++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH 
++to the concatenation of every -L ld(1) option directory in which a -l ld(1)
++option library is found, which is used as the ld(1) -rpath option if none 
++is specified. This means that, if your application builds shared libraries 
++and your MakeMaker application links to them, that the absolute paths of the
++libraries in the build tree will be inserted into the RPATH header of all 
++MakeMaker generated binaries, and that such binaries will be unable to link 
++to these libraries if they do not still reside in the build tree directories 
++(unlikely) or in the system library directories (/lib or /usr/lib), regardless 
++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
++ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
++ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH 
++is set to include /some_directory_other_than_usr_lib, because RPATH overrides
++LD_LIBRARY_PATH.
++
++So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for
++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
++environment variable during the build to generate an RPATH for the binaries.
++ 
++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
++for every link command. 
++
++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the 
++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. 
++
+ =item VENDORPREFIX
+ 
+ Like PERLPREFIX, but only for the vendor install locations.
+--- perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm.USE_MM_LD_RUN_PATH	2005-10-21 10:11:03.000000000 -0400
++++ perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm	2006-01-20 16:20:25.000000000 -0500
+@@ -941,7 +941,7 @@
+     }
+ 
+     my $ld_run_path_shell = "";
+-    if ($self->{LD_RUN_PATH} ne "") {
++    if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
+ 	$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
+     }
+ 
+--- perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm.USE_MM_LD_RUN_PATH	2003-04-07 14:58:17.000000000 -0400
++++ perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm	2006-01-20 16:21:57.000000000 -0500
+@@ -87,6 +87,11 @@
+ in LDLOADLIBS. It is passed as an environment variable to the process
+ that links the shared library.
+ 
++Red Hat extension: This generation of LD_RUN_PATH is disabled by default.
++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
++environment variable). 
++
+ =head2 BSLOADLIBS
+ 
+ List of those libraries that are needed but can be linked in



From fedora-cvs-commits at redhat.com  Wed Feb  1 15:57:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 10:57:52 -0500
Subject: rpms/perl/devel perl-5.8.8-bz178343.patch,1.1,1.2
Message-ID: <200602011557.k11Fvqwp015155@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-bz178343.patch 
Log Message:
fix bug 178343 / perl bug 38385: include gcc 3.4+ internal "prefined macros" in _h2ph_pre.ph

perl-5.8.8-bz178343.patch:
 Configure     |   11 +++++++++++
 utils/h2ph.PL |   17 ++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

Index: perl-5.8.8-bz178343.patch
===================================================================
RCS file: perl-5.8.8-bz178343.patch
diff -N perl-5.8.8-bz178343.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ perl-5.8.8-bz178343.patch	1 Feb 2006 15:57:48 -0000	1.2
@@ -0,0 +1,53 @@
+--- perl-5.8.8-RC1/Configure.bz178343	2006-01-30 19:42:47.000000000 -0500
++++ perl-5.8.8-RC1/Configure	2006-01-30 20:04:53.000000000 -0500
+@@ -20279,6 +20279,17 @@
+ chmod +x Cppsym.try
+ $eunicefix Cppsym.try
+ ./Cppsym < Cppsym.know > Cppsym.true
++: Add in any cpp "predefined macros" :
++tHdrH=`mktemp ./XXXXXX`
++rm -f $tHdrH'.h' $tHdrH
++touch $tHdrH'.h' 
++if cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ] ; then
++   sed 's/#define[\ \	]*//;s/[\ \	].*$//' < $tHdrH'_cppsym.h' > $tHdrH'_cppsym.real';
++   if [ -s $tHdrH'_cppsym.real' ]; then
++      cat $tHdrH'_cppsym.real' Cppsym.know  | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
++   fi
++fi
++rm -f $tHdrH'.h' $tHdrH'_cppsym.h' $tHdrH'_cppsym.real'
+ : now check the C compiler for additional symbols
+ postprocess_cc_v=''
+ case "$osname" in
+--- perl-5.8.8-RC1/utils/h2ph.PL.bz178343	2006-01-13 12:56:47.000000000 -0500
++++ perl-5.8.8-RC1/utils/h2ph.PL	2006-01-30 20:01:15.000000000 -0500
+@@ -778,8 +778,16 @@
+             if ($opt_D) {
+                 print PREAMBLE "# $_=$define{$_}\n";
+             }
+-
+-            if ($define{$_} =~ /^(\d+)U?L{0,2}$/i) {
++	    if ($define{$_} =~ /^\((.*)\)$/) {
++	      # parenthesized value:  d=(v)
++		$define{$_} = $1;
++	    };
++	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/ ) {
++	      # float:
++		print PREAMBLE
++                    "unless (defined &$_) { sub $_() { $1 } }\n\n";
++	    } elsif ($define{$_} =~ /^([+-]?\d+)U?L{0,2}$/i) {
++	      # integer:
+                 print PREAMBLE
+                     "unless (defined &$_) { sub $_() { $1 } }\n\n";
+             } elsif ($define{$_} =~ /^\w+$/) {
+@@ -805,9 +813,8 @@
+         @Config{'ccsymbols', 'cppsymbols', 'cppccsymbols'};
+ 
+     # Split compiler pre-definitions into `key=value' pairs:
+-    foreach (split /\s+/, $allsymbols) {
+-        /(.+?)=(.+)/ and $define{$1} = $2;
+-
++    while( $allsymbols=~/([^\s]+)=((\\\s|[^\s])+)/g ) {
++        $define{$1} = $2;	
+         if ($opt_D) {
+             print STDERR "$_:  $1 -> $2\n";
+         }



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:19:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:19:57 -0500
Subject: rpms/openssh/devel openssh-4.3p1-audit.patch, NONE,
	1.1 openssh-4.3p1-fromto-remote.patch, NONE,
	1.1 openssh-4.3p1-redhat.patch, NONE,
	1.1 openssh-4.3p1-vendor.patch, NONE, 1.1 openssh.spec, 1.83,
	1.84 openssh-3.9p1-fromto-remote.patch, 1.1,
	NONE openssh-4.0p1-krb5-valid.patch, 1.1,
	NONE openssh-4.0p1-redhat.patch, 1.2,
	NONE openssh-4.0p1-vendor.patch, 1.1,
	NONE openssh-4.1p1-nologin.patch, 1.3,
	NONE openssh-4.2p1-audit.patch, 1.2,
	NONE openssh-4.2p1-gnu-source.patch, 1.1,
	NONE openssh-4.2p1-pam-auth-fail-info.patch, 1.1,
	NONE openssh-4.2p1-scp-no-system.patch, 1.1, NONE
Message-ID: <200602011619.k11GJv9M002388@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2340

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p1-audit.patch openssh-4.3p1-fromto-remote.patch 
	openssh-4.3p1-redhat.patch openssh-4.3p1-vendor.patch 
Removed Files:
	openssh-3.9p1-fromto-remote.patch 
	openssh-4.0p1-krb5-valid.patch openssh-4.0p1-redhat.patch 
	openssh-4.0p1-vendor.patch openssh-4.1p1-nologin.patch 
	openssh-4.2p1-audit.patch openssh-4.2p1-gnu-source.patch 
	openssh-4.2p1-pam-auth-fail-info.patch 
	openssh-4.2p1-scp-no-system.patch 
Log Message:
* Wed Feb  1 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-1
- new version, dropped obsolete patches


openssh-4.3p1-audit.patch:
 Makefile.in  |    3 ++-
 auth.c       |   10 ++++++++++
 config.h.in  |    3 +++
 configure.ac |   15 +++++++++++++++
 loginrec.c   |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++++
 6 files changed, 90 insertions(+), 1 deletion(-)

--- NEW FILE openssh-4.3p1-audit.patch ---
--- openssh-4.3p1/loginrec.c.audit	2005-11-22 09:55:13.000000000 +0100
+++ openssh-4.3p1/loginrec.c	2006-02-01 16:54:40.000000000 +0100
@@ -157,6 +157,10 @@
 #include "auth.h"
 #include "buffer.h"
 
+#ifdef HAVE_LINUX_AUDIT
+# include <libaudit.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif
@@ -185,6 +189,9 @@
 int utmpx_write_entry(struct logininfo *li);
 int wtmp_write_entry(struct logininfo *li);
 int wtmpx_write_entry(struct logininfo *li);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_write_entry(struct logininfo *li);
+#endif
 int lastlog_write_entry(struct logininfo *li);
 int syslogin_write_entry(struct logininfo *li);
 
@@ -423,6 +430,10 @@
 
 	/* set the timestamp */
 	login_set_current_time(li);
+#ifdef HAVE_LINUX_AUDIT
+	if (linux_audit_write_entry(li) == 0)
+		return 0;
+#endif
 #ifdef USE_LOGIN
 	syslogin_write_entry(li);
 #endif
@@ -1377,6 +1388,51 @@
 }
 #endif /* USE_WTMPX */
 
+#ifdef HAVE_LINUX_AUDIT
+int
+linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success)
+{
+	char buf[64];
+	int audit_fd, rc;
+
+	audit_fd = audit_open();
+	if (audit_fd < 0) {
+	 	if (errno == EINVAL || errno == EPROTONOSUPPORT ||
+					errno == EAFNOSUPPORT)
+			return 1; /* No audit support in kernel */
+		else
+			return 0; /* Must prevent login */
+	}
+	if (username == NULL)
+		snprintf(buf, sizeof(buf), "uid=%d", uid);
+	else
+		snprintf(buf, sizeof(buf), "acct=%s", username);
+	rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN,
+		buf, hostname, ip, ttyn, success);
+	close(audit_fd);
+	if (rc > 0)
+		return 1;
+	else
+		return 0;
+}
+
+int
+linux_audit_write_entry(struct logininfo *li)
+{
+	switch(li->type) {
+	case LTYPE_LOGIN:
+		return (linux_audit_record_event(li->uid, NULL, li->hostname,
+			NULL, li->line, 1));
+	case LTYPE_LOGOUT:
+		return (1);	/* We only care about logins */
+	default:
+		logit("%s: invalid type field", __func__);
+		return (0);
+	}
+}
+#endif /* HAVE_LINUX_AUDIT */
+
 /**
  ** Low-level libutil login() functions
  **/
--- openssh-4.3p1/loginrec.h.audit	2005-06-19 02:19:44.000000000 +0200
+++ openssh-4.3p1/loginrec.h	2006-02-01 16:53:47.000000000 +0100
@@ -133,5 +133,9 @@
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 
 void record_failed_login(const char *, const char *, const char *);
+#ifdef HAVE_LINUX_AUDIT
+int linux_audit_record_event(int uid, const char *username,
+	const char *hostname, const char *ip, const char *ttyn, int success);
+#endif /* HAVE_LINUX_AUDIT */
 
 #endif /* _HAVE_LOGINREC_H_ */
--- openssh-4.3p1/Makefile.in.audit	2006-02-01 16:53:47.000000000 +0100
+++ openssh-4.3p1/Makefile.in	2006-02-01 16:53:47.000000000 +0100
@@ -44,6 +44,7 @@
 CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
 LIBS=@LIBS@
 LIBSELINUX=@LIBSELINUX@
+LIBAUDIT=@LIBAUDIT@
 LIBEDIT=@LIBEDIT@
 LIBPAM=@LIBPAM@
 LIBWRAP=@LIBWRAP@
@@ -137,7 +138,7 @@
 	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)
-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(LIBS)
+	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBSELINUX) $(LIBAUDIT) $(LIBS)
 
 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
--- openssh-4.3p1/config.h.in.audit	2006-02-01 12:33:49.000000000 +0100
+++ openssh-4.3p1/config.h.in	2006-02-01 16:53:47.000000000 +0100
@@ -1253,6 +1253,9 @@
 /* Define if you want IRIX project management */
 #undef WITH_IRIX_PROJECT
 
+/* Define if you want Linux audit support. */
+#undef HAVE_LINUX_AUDIT
+
 /* 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
--- openssh-4.3p1/configure.ac.audit	2006-02-01 16:53:47.000000000 +0100
+++ openssh-4.3p1/configure.ac	2006-02-01 16:53:47.000000000 +0100
@@ -2959,6 +2959,20 @@
 	])
 AC_SUBST(LIBSELINUX)
 
+# Check whether user wants Linux audit support
+LINUX_AUDIT_MSG="no"
+LIBAUDIT=""
+AC_ARG_WITH(linux-audit,
+	[  --with-linux-audit   Enable Linux audit support],
+	[ if test "x$withval" != "xno" ; then
+		AC_DEFINE(HAVE_LINUX_AUDIT,1,[Define if you want Linux audit support.])
+		LINUX_AUDIT_MSG="yes"
+		AC_CHECK_HEADERS(libaudit.h)
+		LIBAUDIT="-laudit"
+	fi
+	])
+AC_SUBST(LIBAUDIT)
+
 # Check whether user wants Kerberos 5 support
 KRB5_MSG="no"
 AC_ARG_WITH(kerberos5,
@@ -3786,6 +3800,7 @@
 echo "                       PAM support: $PAM_MSG"
 echo "                 KerberosV support: $KRB5_MSG"
 echo "                   SELinux support: $SELINUX_MSG"
+echo "               Linux audit support: $LINUX_AUDIT_MSG"
 echo "                 Smartcard support: $SCARD_MSG"
 echo "                     S/KEY support: $SKEY_MSG"
 echo "              TCP Wrappers support: $TCPW_MSG"
--- openssh-4.3p1/auth.c.audit	2005-08-31 18:59:49.000000000 +0200
+++ openssh-4.3p1/auth.c	2006-02-01 16:53:47.000000000 +0100
@@ -260,6 +260,12 @@
 		record_failed_login(authctxt->user,
 		    get_canonical_hostname(options.use_dns), "ssh");
 #endif
+#if HAVE_LINUX_AUDIT
+	if (authenticated == 0 && !authctxt->postponed) {
+		linux_audit_record_event(-1, authctxt->user, NULL,
+			get_remote_ipaddr(), "sshd", 0);
+	}
+#endif
 #ifdef SSH_AUDIT_EVENTS
 	if (authenticated == 0 && !authctxt->postponed) {
 		ssh_audit_event_t event;
@@ -500,6 +506,10 @@
 		record_failed_login(user,
 		    get_canonical_hostname(options.use_dns), "ssh");
 #endif
+#ifdef HAVE_LINUX_AUDIT
+		linux_audit_record_event(-1, user, NULL, get_remote_ipaddr(),
+			"sshd", 0);
+#endif
 #ifdef SSH_AUDIT_EVENTS
 		audit_event(SSH_INVALID_USER);
 #endif /* SSH_AUDIT_EVENTS */

openssh-4.3p1-fromto-remote.patch:
 scp.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssh-4.3p1-fromto-remote.patch ---
--- openssh-4.3p1/scp.c.fromto-remote	2006-01-31 12:11:38.000000000 +0100
+++ openssh-4.3p1/scp.c	2006-02-01 16:59:46.000000000 +0100
@@ -446,7 +446,7 @@
 				addargs(&alist, "-v");
 			addargs(&alist, "-x");
 			addargs(&alist, "-oClearAllForwardings yes");
-			addargs(&alist, "-n");
+			addargs(&alist, "-t");
 
 			*src++ = 0;
 			if (*src == 0)

openssh-4.3p1-redhat.patch:
 ssh_config    |    6 ++++++
 sshd_config   |    8 ++++++++
 sshd_config.0 |    6 +++---
 sshd_config.5 |    2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE openssh-4.3p1-redhat.patch ---
--- openssh-4.3p1/sshd_config.0.redhat	2006-02-01 12:33:53.000000000 +0100
+++ openssh-4.3p1/sshd_config.0	2006-02-01 16:24:43.000000000 +0100
@@ -371,9 +371,9 @@
 
      SyslogFacility
              Gives the facility code that is used when logging messages from
-             sshd.  The possible values are: DAEMON, USER, AUTH, LOCAL0, LO-
-             CAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
-             fault is AUTH.
+             sshd.  The possible values are: DAEMON, USER, AUTH, AUTHPRIV,
+             LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+             The default is AUTH.
 
      TCPKeepAlive
              Specifies whether the system should send TCP keepalive messages
--- openssh-4.3p1/sshd_config.redhat	2005-12-13 09:29:03.000000000 +0100
+++ openssh-4.3p1/sshd_config	2006-02-01 16:24:43.000000000 +0100
@@ -12,6 +12,7 @@
 
 #Port 22
 #Protocol 2,1
+Protocol 2
 #AddressFamily any
 #ListenAddress 0.0.0.0
 #ListenAddress ::
@@ -29,6 +30,7 @@
 # Logging
 # obsoletes QuietMode and FascistLogging
 #SyslogFacility AUTH
+SyslogFacility AUTHPRIV
 #LogLevel INFO
 
 # Authentication:
@@ -55,9 +57,11 @@
 # To disable tunneled clear text passwords, change to no here!
 #PasswordAuthentication yes
 #PermitEmptyPasswords no
+PasswordAuthentication yes
 
 # Change to no to disable s/key passwords
 #ChallengeResponseAuthentication yes
+ChallengeResponseAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -67,7 +71,9 @@
 
 # GSSAPI options
 #GSSAPIAuthentication no
+GSSAPIAuthentication yes
 #GSSAPICleanupCredentials yes
+GSSAPICleanupCredentials yes
 
 # Set this to 'yes' to enable PAM authentication, account processing, 
 # and session processing. If this is enabled, PAM authentication will 
@@ -78,10 +84,12 @@
 # session checks to run without PAM authentication, then enable this but set 
 # ChallengeResponseAuthentication=no
 #UsePAM no
+UsePAM yes
 
 #AllowTcpForwarding yes
 #GatewayPorts no
 #X11Forwarding no
+X11Forwarding yes
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PrintMotd yes
--- openssh-4.3p1/ssh_config.redhat	2005-12-13 09:29:03.000000000 +0100
+++ openssh-4.3p1/ssh_config	2006-02-01 16:26:37.000000000 +0100
@@ -40,3 +40,9 @@
 #   Tunnel no
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+Host *
+	GSSAPIAuthentication yes
+# If this option is set to yes then remote X11 clients will have full access
+# to the original X11 display. As virtually no X11 client supports the untrusted
+# mode correctly we set this to yes.
+	ForwardX11Trusted yes
--- openssh-4.3p1/sshd_config.5.redhat	2006-01-03 08:47:31.000000000 +0100
+++ openssh-4.3p1/sshd_config.5	2006-02-01 16:24:43.000000000 +0100
@@ -620,7 +620,7 @@
 .It Cm SyslogFacility
 Gives the facility code that is used when logging messages from
 .Nm sshd .
-The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
+The possible values are: DAEMON, USER, AUTH, AUTHPRIV, LOCAL0, LOCAL1, LOCAL2,
 LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
 The default is AUTH.
 .It Cm TCPKeepAlive

openssh-4.3p1-vendor.patch:
 configure.ac  |    7 +++++++
 servconf.c    |   10 ++++++++++
 servconf.h    |    1 +
 sshd.c        |    6 ++++--
 sshd_config   |    1 +
 sshd_config.0 |    5 +++++
 sshd_config.5 |    8 ++++++++
 7 files changed, 36 insertions(+), 2 deletions(-)

--- NEW FILE openssh-4.3p1-vendor.patch ---
Add a --enable-vendor-patchlevel option which, if the
new-but-disabled-by-default ShowPatchLevel option is enabled,
will append a build-time-specified string to the SSH version
string.  Based heavily on a patch by Frank Hirtz, modified to
trigger through configure.
--- openssh-4.3p1/servconf.h.vendor	2005-12-13 09:29:03.000000000 +0100
+++ openssh-4.3p1/servconf.h	2006-02-01 16:51:56.000000000 +0100
@@ -120,6 +120,7 @@
 	int	max_startups;
 	int	max_authtries;
 	char   *banner;			/* SSH-2 banner message */
+	int	show_patchlevel;	/* Show vendor patch level to clients */
 	int	use_dns;
 	int	client_alive_interval;	/*
 					 * poke the client this often to
--- openssh-4.3p1/sshd_config.vendor	2006-02-01 16:29:52.000000000 +0100
+++ openssh-4.3p1/sshd_config	2006-02-01 16:42:01.000000000 +0100
@@ -101,6 +101,7 @@
 #Compression delayed
 #ClientAliveInterval 0
 #ClientAliveCountMax 3
+#ShowPatchLevel no
 #UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
--- openssh-4.3p1/sshd.c.vendor	2005-12-24 04:59:12.000000000 +0100
+++ openssh-4.3p1/sshd.c	2006-02-01 16:29:52.000000000 +0100
@@ -377,7 +377,8 @@
 		major = PROTOCOL_MAJOR_1;
 		minor = PROTOCOL_MINOR_1;
 	}
-	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_VERSION);
+	snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor,
+		 (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_VERSION);
 	server_version_string = xstrdup(buf);
 
 	/* Send our protocol version identification. */
@@ -1089,7 +1090,8 @@
 		exit(1);
 	}
 
-	debug("sshd version %.100s", SSH_RELEASE);
+	debug("sshd version %.100s",
+	      (options.show_patchlevel == 1) ? SSH_VENDOR_PATCHLEVEL : SSH_RELEASE);
 
 	/* load private host keys */
 	sensitive_data.host_keys = xmalloc(options.num_host_key_files *
--- openssh-4.3p1/configure.ac.vendor	2006-02-01 16:29:52.000000000 +0100
+++ openssh-4.3p1/configure.ac	2006-02-01 16:29:52.000000000 +0100
@@ -3521,6 +3521,12 @@
 		fi
 	]
 )
+AC_ARG_ENABLE(vendor-patchlevel,
+  [  --enable-vendor-patchlevel=TAG  specify a vendor patch level],
+  [AC_DEFINE_UNQUOTED(SSH_VENDOR_PATCHLEVEL,[SSH_RELEASE "-" "$enableval"],[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL="$enableval"],
+  [AC_DEFINE(SSH_VENDOR_PATCHLEVEL,SSH_RELEASE,[Define to your vendor patch level, if it has been modified from the upstream source release.])
+   SSH_VENDOR_PATCHLEVEL=none])
 
 dnl lastlog, [uw]tmpx? detection
 dnl  NOTE: set the paths in the platform section to avoid the
@@ -3774,6 +3780,7 @@
 echo "           Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
 echo "                  BSD Auth support: $BSD_AUTH_MSG"
 echo "              Random number source: $RAND_MSG"
+echo "                Vendor patch level: $SSH_VENDOR_PATCHLEVEL"
 if test ! -z "$USE_RAND_HELPER" ; then
 echo "     ssh-rand-helper collects from: $RAND_HELPER_MSG"
 fi
--- openssh-4.3p1/sshd_config.0.vendor	2006-02-01 16:29:52.000000000 +0100
+++ openssh-4.3p1/sshd_config.0	2006-02-01 16:29:52.000000000 +0100
@@ -354,6 +354,11 @@
              Defines the number of bits in the ephemeral protocol version 1
              server key.  The minimum value is 512, and the default is 768.
 
+     ShowPatchLevel
+	     Specifies whether sshd will display the specific patch level of
+	     the binary in the server identification string.  The patch level
+	     is set at compile-time.  The default is M-bM-^@M-^\noM-bM-^@M-^].
+
      StrictModes
              Specifies whether sshd should check file modes and ownership of
              the user's files and home directory before accepting login.  This
--- openssh-4.3p1/servconf.c.vendor	2005-12-13 09:33:20.000000000 +0100
+++ openssh-4.3p1/servconf.c	2006-02-01 16:51:16.000000000 +0100
@@ -95,6 +95,7 @@
 	options->max_startups = -1;
 	options->max_authtries = -1;
 	options->banner = NULL;
+	options->show_patchlevel = -1;
 	options->use_dns = -1;
 	options->client_alive_interval = -1;
 	options->client_alive_count_max = -1;
@@ -233,6 +234,9 @@
 	if (options->permit_tun == -1)
 		options->permit_tun = SSH_TUNMODE_NO;
 
+	if (options->show_patchlevel == -1)
+		options->show_patchlevel = 0;
+
 	/* Turn privilege separation on by default */
 	if (use_privsep == -1)
 		use_privsep = 1;
@@ -275,6 +279,7 @@
 	sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
 	sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
 	sUsePrivilegeSeparation,
+	sShowPatchLevel,
 	sDeprecated, sUnsupported
 } ServerOpCodes;
 
@@ -367,6 +372,7 @@
 	{ "maxstartups", sMaxStartups },
 	{ "maxauthtries", sMaxAuthTries },
 	{ "banner", sBanner },
+	{ "showpatchlevel", sShowPatchLevel},
 	{ "usedns", sUseDNS },
 	{ "verifyreversemapping", sDeprecated },
 	{ "reversemappingcheck", sDeprecated },
@@ -807,6 +813,10 @@
 		intptr = &use_privsep;
 		goto parse_flag;
 
+	case sShowPatchLevel:
+		intptr = &options->show_patchlevel;
+		goto parse_flag;
+
 	case sAllowUsers:
 		while ((arg = strdelim(&cp)) && *arg != '\0') {
 			if (options->num_allow_users >= MAX_ALLOW_USERS)
--- openssh-4.3p1/sshd_config.5.vendor	2006-02-01 16:29:52.000000000 +0100
+++ openssh-4.3p1/sshd_config.5	2006-02-01 16:29:52.000000000 +0100
@@ -597,6 +597,14 @@
 .It Cm ServerKeyBits
 Defines the number of bits in the ephemeral protocol version 1 server key.
 The minimum value is 512, and the default is 768.
+.It Cm ShowPatchLevel
+Specifies whether
+.Nm sshd
+will display the patch level of the binary in the identification string.
+The patch level is set at compile-time.
+The default is
+.Dq no .
+This option applies to protocol version 1 only.
 .It Cm StrictModes
 Specifies whether
 .Nm sshd


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- openssh.spec	20 Dec 2005 14:50:27 -0000	1.83
+++ openssh.spec	1 Feb 2006 16:19:54 -0000	1.84
@@ -57,8 +57,8 @@
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
-Version: 4.2p1
-%define rel 10
+Version: 4.3p1
+%define rel 1
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -71,26 +71,21 @@
 # removes the ACSS cipher.
 Source0: openssh-%{version}-noacss.tar.bz2
 Source1: openssh-nukeacss.sh
-Patch0: openssh-4.0p1-redhat.patch
+Patch0: openssh-4.3p1-redhat.patch
 Patch2: openssh-3.8.1p1-skip-initial.patch
 Patch3: openssh-3.8.1p1-krb5-config.patch
-Patch4: openssh-4.0p1-vendor.patch
+Patch4: openssh-4.3p1-vendor.patch
 Patch5: openssh-3.9p1-noinitlog.patch
 Patch12: openssh-selinux.patch
-Patch16: openssh-4.2p1-audit.patch
+Patch16: openssh-4.3p1-audit.patch
 Patch20: openssh-3.9p1-gssapimitm.patch
 Patch21: openssh-3.9p1-safe-stop.patch
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch23: openssh-3.9p1-no-log-signal.patch
-Patch24: openssh-3.9p1-fromto-remote.patch
-Patch26: openssh-4.0p1-krb5-valid.patch
+Patch24: openssh-4.3p1-fromto-remote.patch
 Patch27: openssh-4.2p1-pam-no-stack.patch
-Patch28: openssh-4.1p1-nologin.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
-Patch32: openssh-4.2p1-pam-auth-fail-info.patch
-Patch33: openssh-4.2p1-scp-no-system.patch
-Patch34: openssh-4.2p1-gnu-source.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
 License: BSD
 Group: Applications/Internet
@@ -210,24 +205,15 @@
 %patch22 -p1 -b .keep-above
 %patch23 -p1 -b .signal
 %patch24 -p1 -b .fromto-remote
-%patch26 -p0 -b .krb5-valid
 %patch27 -p1 -b .stack
-%patch28 -p1 -b .nologin
 %patch30 -p1 -b .exit-deadlock
 %patch31 -p1 -b .skip-used
-%patch32 -p0 -b .auth-fail-info
-%patch33 -p1 -b .no-system
-%patch34 -p1 -b .gnu-source
 %patch35 -p1 -b .progress
 
 autoreconf
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
-# Ugly hack to workaround openssh defining __USE_GNU which is 
-# not allowed and causes problems according to Ulrich Drepper
-# fix this the correct way after FC5test1
-#CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"; export CFLAGS
 %if %{rescue}
 CFLAGS="$CFLAGS -Os"
 %endif
@@ -464,6 +450,9 @@
 %endif
 
 %changelog
+* Wed Feb  1 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-1
+- new version, dropped obsolete patches
+
 * Tue Dec 20 2005 Tomas Mraz <tmraz at redhat.com> - 4.2p1-10
 - hopefully make the askpass dialog less confusing (#174765)
 
@@ -507,7 +496,7 @@
 
 * Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com> 4.2p1-2
 - use include instead of pam_stack in pam config
-- use fork+exec instead of system in scp (#168167)
+- use fork+exec instead of system in scp - CVE-2006-0225 (#168167)
 - upstream patch for displaying authentication errors
 
 * Tue Sep 06 2005 Tomas Mraz <tmraz at redhat.com> 4.2p1-1


--- openssh-3.9p1-fromto-remote.patch DELETED ---


--- openssh-4.0p1-krb5-valid.patch DELETED ---


--- openssh-4.0p1-redhat.patch DELETED ---


--- openssh-4.0p1-vendor.patch DELETED ---


--- openssh-4.1p1-nologin.patch DELETED ---


--- openssh-4.2p1-audit.patch DELETED ---


--- openssh-4.2p1-gnu-source.patch DELETED ---


--- openssh-4.2p1-pam-auth-fail-info.patch DELETED ---


--- openssh-4.2p1-scp-no-system.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:22:08 -0500
Subject: rpms/kdeaccessibility/FC-4 .cvsignore, 1.5,
	1.6 kdeaccessibility.spec, 1.6, 1.7 sources, 1.5,
	1.6 admin-visibility.patch, 1.3, NONE
Message-ID: <200602011622.k11GM88Y003473@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jun 2005 18:47:46 -0000	1.5
+++ .cvsignore	1 Feb 2006 16:22:05 -0000	1.6
@@ -2,3 +2,4 @@
 kdeaccessibility-3.4.0-rc1.tar.bz2
 kdeaccessibility-3.4.0.tar.bz2
 kdeaccessibility-3.4.1.tar.bz2
+kdeaccessibility-3.5.1.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/kdeaccessibility.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdeaccessibility.spec	16 Jun 2005 18:55:38 -0000	1.6
+++ kdeaccessibility.spec	1 Feb 2006 16:22:05 -0000	1.7
@@ -1,10 +1,11 @@
 %define debug 0
 %define final 1
+%define disable_gcc_check_and_hidden_visibility 1
 
 %define qt_version 3.3.4
 
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -12,11 +13,9 @@
 License: GPL
 Group: Amusements/Games
 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
-# gcc4 workaround
-Patch200: admin-visibility.patch
 
 Requires: kdebase >= 6:%{version}
 
@@ -43,7 +42,6 @@
 %prep
 %setup -q
 %patch -p1 -b .libtool
-%patch200 -p1 -b .gcc
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -51,7 +49,16 @@
 make -f admin/Makefile.common cvs
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -98,7 +105,16 @@
 
 
 %changelog
-* Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 1:3.5.1-0.1.fc4
+- 3.5.1
+
+* Thu Dec 08 2005 Than Ngo <than at redhat.com> 1:3.5.0-0.1.fc4
+- 3.5
+
+* Wed Jul 27 2005 Than Ngo <than at redhat.com> 1:3.4.2-0.fc4.1
+- update to 3.4.2
+
+* Thu Jun 16 2005 Than Ngo <than at redhat.com> 1:3.4.1-0.fc4.1
 - 3.4.1
 
 * Wed Mar 16 2005 Than Ngo <than at redhat.com> 1:3.4.0-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Jun 2005 18:47:46 -0000	1.5
+++ sources	1 Feb 2006 16:22:05 -0000	1.6
@@ -1 +1 @@
-a8f51420c214bbf36efa54c99e24fdd9  kdeaccessibility-3.4.1.tar.bz2
+cc0773103053a6800b3d35e6021b6719  kdeaccessibility-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:26:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:26:16 -0500
Subject: rpms/openssh/devel .cvsignore,1.16,1.17 sources,1.16,1.17
Message-ID: <200602011626.k11GQGEg005341@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5306

Modified Files:
	.cvsignore sources 
Log Message:
* Wed Feb  1 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-1
- new version, dropped obsolete patches



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	6 Sep 2005 19:55:17 -0000	1.16
+++ .cvsignore	1 Feb 2006 16:26:13 -0000	1.17
@@ -1,2 +1 @@
-x11-ssh-askpass-1.2.4.1.tar.gz
-openssh-4.2p1-noacss.tar.bz2
+openssh-4.3p1-noacss.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	6 Sep 2005 19:55:17 -0000	1.16
+++ sources	1 Feb 2006 16:26:13 -0000	1.17
@@ -1,2 +1 @@
-8f2e41f3f7eaa8543a2440454637f3c3  x11-ssh-askpass-1.2.4.1.tar.gz
-62375456bbf60f29b4d003cbde22c147  openssh-4.2p1-noacss.tar.bz2
+4c2ae8fbf9d4a58f910aec1af1ac19f2  openssh-4.3p1-noacss.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:28:12 -0500
Subject: rpms/openssh/devel x11-ssh-askpass.csh, 1.1, NONE x11-ssh-askpass.sh,
	1.1, NONE
Message-ID: <200602011628.k11GSC5J006290@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6055

Removed Files:
	x11-ssh-askpass.csh x11-ssh-askpass.sh 
Log Message:
- x11-ssh-askpass is no longer part of openssh package



--- x11-ssh-askpass.csh DELETED ---


--- x11-ssh-askpass.sh DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:39:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:39:20 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.2,1.3
Message-ID: <200602011639.k11GdK1A009689@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	python-sqlite.spec 
Log Message:
bump


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-sqlite.spec	9 Dec 2005 22:42:54 -0000	1.2
+++ python-sqlite.spec	1 Feb 2006 16:39:18 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Python bindings for sqlite.
 Name: python-sqlite
 Version: 1.1.6
-Release: 1.1
+Release: 2
 License: GPL
 Group: Development/Libraries
 URL: http://pysqlite.sf.net/
@@ -39,6 +39,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Feb 01 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.6-2
+- Rebuild
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 16:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 11:55:49 -0500
Subject: rpms/f-spot/devel f-spot.spec,1.11,1.12
Message-ID: <200602011655.k11GtnmE021365@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21352

Modified Files:
	f-spot.spec 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-2
- Add sqlite3.patch to ensure that sqlite3 is used if both
  sqlite2 and sqlite3 are installed.



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- f-spot.spec	1 Feb 2006 00:29:18 -0000	1.11
+++ f-spot.spec	1 Feb 2006 16:55:47 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.8
-Release:        1
+Release:        2
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -25,6 +25,7 @@
 ExcludeArch: s390
 
 Patch0: f-spot-0.1.5-security-fix.patch
+Patch1: f-spot-0.1.3-sqlite3.patch
 
 %description
 F-Spot is an application designed to provide personal photo management
@@ -34,6 +35,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .security-fix
+%patch1 -p1 -b .sqlite3
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -66,6 +68,10 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-2
+- Add sqlite3.patch to ensure that sqlite3 is used if both
+  sqlite2 and sqlite3 are installed.
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-1
 - Update to 0.1.8
 - Use sqlite3 instead of sqlite2



From fedora-cvs-commits at redhat.com  Wed Feb  1 17:19:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 12:19:38 -0500
Subject: rpms/kde-i18n/FC-4 .cvsignore, 1.25, 1.26 kde-i18n.spec, 1.40,
	1.41 sources, 1.26, 1.27 subdirs-kde-i18n, 1.6, 1.7
Message-ID: <200602011719.k11HJc9L001638@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kde-i18n.spec sources subdirs-kde-i18n 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Jun 2005 21:37:44 -0000	1.25
+++ .cvsignore	1 Feb 2006 17:19:36 -0000	1.26
@@ -38,3 +38,39 @@
 kde-i18n-tr-3.4.1.tar.bz2
 kde-i18n-uk-3.4.1.tar.bz2
 kde-i18n-zh_CN-3.4.1.tar.bz2
+kde-i18n-ar-3.5.1.tar.bz2
+kde-i18n-bg-3.5.1.tar.bz2
+kde-i18n-bn-3.5.1.tar.bz2
+kde-i18n-ca-3.5.1.tar.bz2
+kde-i18n-cs-3.5.1.tar.bz2
+kde-i18n-da-3.5.1.tar.bz2
+kde-i18n-de-3.5.1.tar.bz2
+kde-i18n-el-3.5.1.tar.bz2
+kde-i18n-en_GB-3.5.1.tar.bz2
+kde-i18n-es-3.5.1.tar.bz2
+kde-i18n-et-3.5.1.tar.bz2
+kde-i18n-fi-3.5.1.tar.bz2
+kde-i18n-fr-3.5.1.tar.bz2
+kde-i18n-he-3.5.1.tar.bz2
+kde-i18n-hi-3.5.1.tar.bz2
+kde-i18n-hu-3.5.1.tar.bz2
+kde-i18n-is-3.5.1.tar.bz2
+kde-i18n-it-3.5.1.tar.bz2
+kde-i18n-ja-3.5.1.tar.bz2
+kde-i18n-nb-3.5.1.tar.bz2
+kde-i18n-nl-3.5.1.tar.bz2
+kde-i18n-nn-3.5.1.tar.bz2
+kde-i18n-pa-3.5.1.tar.bz2
+kde-i18n-pl-3.5.1.tar.bz2
+kde-i18n-pt-3.5.1.tar.bz2
+kde-i18n-pt_BR-3.5.1.tar.bz2
+kde-i18n-ro-3.5.1.tar.bz2
+kde-i18n-ru-3.5.1.tar.bz2
+kde-i18n-sk-3.5.1.tar.bz2
+kde-i18n-sl-3.5.1.tar.bz2
+kde-i18n-sr-3.5.1.tar.bz2
+kde-i18n-sv-3.5.1.tar.bz2
+kde-i18n-ta-3.5.1.tar.bz2
+kde-i18n-tr-3.5.1.tar.bz2
+kde-i18n-uk-3.5.1.tar.bz2
+kde-i18n-zh_CN-3.5.1.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/kde-i18n.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kde-i18n.spec	17 Jun 2005 06:25:08 -0000	1.40
+++ kde-i18n.spec	1 Feb 2006 17:19:36 -0000	1.41
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -12,41 +12,42 @@
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bn-%{version}.tar.bz2
-Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
-Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
-Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
-Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
-Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
-Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
-Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
-Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
-Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
-Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
-Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-he-%{version}.tar.bz2
-Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2
-Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2
-Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-is-%{version}.tar.bz2
-Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2
-Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
-Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
-Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
-Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
-Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
-Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
-Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
-Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
-Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ro-%{version}.tar.bz2
-Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
-Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
-Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
-Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
-Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
-Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
-Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
-Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2
-Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ar-%{version}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bg-%{version}.tar.bz2
+Source2: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-bn-%{version}.tar.bz2
+Source3: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ca-%{version}.tar.bz2
+Source4: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-cs-%{version}.tar.bz2
+Source5: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-da-%{version}.tar.bz2
+Source6: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-de-%{version}.tar.bz2
+Source7: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-el-%{version}.tar.bz2
+Source8: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-en_GB-%{version}.tar.bz2
+Source9: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-es-%{version}.tar.bz2
+Source10: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-et-%{version}.tar.bz2
+Source11: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fi-%{version}.tar.bz2
+Source12: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-fr-%{version}.tar.bz2
+Source13: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-he-%{version}.tar.bz2
+Source14: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hi-%{version}.tar.bz2
+Source15: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-hu-%{version}.tar.bz2
+Source16: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-is-%{version}.tar.bz2
+Source17: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-it-%{version}.tar.bz2
+Source18: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ja-%{version}.tar.bz2
+Source19: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nb-%{version}.tar.bz2
+Source20: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nl-%{version}.tar.bz2
+Source21: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-nn-%{version}.tar.bz2
+Source22: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pa-%{version}.tar.bz2
+Source23: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pl-%{version}.tar.bz2
+Source24: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt-%{version}.tar.bz2
+Source25: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-pt_BR-%{version}.tar.bz2
+Source26: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ro-%{version}.tar.bz2
+Source27: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ru-%{version}.tar.bz2
+Source28: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sk-%{version}.tar.bz2
+Source29: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sl-%{version}.tar.bz2
+Source30: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sr-%{version}.tar.bz2
+Source31: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-sv-%{version}.tar.bz2
+Source32: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-ta-%{version}.tar.bz2
+Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2
+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
 Source1000: subdirs-kde-i18n
 
 Requires: kdelibs >= 6:%{version}
@@ -612,13 +613,11 @@
 
 %prep
 %setup -q -n %{name}-%{version} -c
-
-%build
 for i in $(cat %{SOURCE1000}) ; do
   tar jxf $RPM_SOURCE_DIR/%{name}-$i-%{version}.tar.bz2
-done 
-rm -rf pt_BR/docs/kdewebdev/kommander/index.docbook */data/koffice
+done
 
+%build
 for i in $(cat %{SOURCE1000}) ; do
   pushd %{name}-$i-%{version}
 %configure
@@ -670,7 +669,7 @@
 rm -rf $RPM_BUILD_ROOT%{_docdir}/kinfocenter
 
 # workaround for rpm conflict
-for l in ca en_GB lt nb nn pt_BR ; do
+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
 
@@ -695,11 +694,9 @@
 %lang(af) %doc %{_docdir}/HTML/af
 %endif
 
-%if %{buildall}
 %files Arabic 
 %defattr(-,root,root)
 %lang(ar) %{_datadir}/locale/ar/*
-%endif
 
 %if %{buildall}
 %files Azerbaijani
@@ -743,7 +740,7 @@
 %files Catalan
 %defattr(-,root,root)
 %lang(ca) %{_datadir}/locale/ca/*
-#%lang(ca) %doc %{_docdir}/HTML/ca
+%lang(ca) %doc %{_docdir}/HTML/ca
 %lang(ca) %{_datadir}/apps/khangman/ca.txt
 %lang(ca) %{_datadir}/apps/khangman/data/ca
 %lang(ca) %{_datadir}/apps/katepart/syntax/logohighlightstyle.ca.xml
@@ -812,6 +809,7 @@
 %lang(es) %{_datadir}/apps/katepart/syntax/logohighlightstyle.es.xml
 %lang(es) %{_datadir}/apps/kturtle/data/*.es.xml
 %lang(es) %{_datadir}/apps/kturtle/examples/es
+%lang(es) %{_datadir}/apps/klettres/es
 
 %files Estonian
 %defattr(-,root,root)
@@ -908,6 +906,7 @@
 %defattr(-,root,root)
 %lang(it) %{_datadir}/locale/it/*
 %lang(it) %doc %{_docdir}/HTML/it
+%lang(it) %{_datadir}/apps/kanagram/data/it/*
 %lang(it) %{_datadir}/apps/ktuberling/sounds/it/*
 %lang(it) %{_datadir}/apps/khangman/data/it
 %lang(it) %{_datadir}/apps/klettres/it
@@ -1010,7 +1009,7 @@
 %files Polish
 %defattr(-,root,root)
 %lang(pl) %{_datadir}/locale/pl/*
-#%lang(pl) %doc %{_docdir}/HTML/pl
+%lang(pl) %doc %{_docdir}/HTML/pl
 
 %files Portuguese
 %defattr(-,root,root)
@@ -1071,6 +1070,7 @@
 %lang(sr) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sr.xml
 %lang(sr) %{_datadir}/apps/kturtle/data/*.sr.xml
 %lang(sr) %{_datadir}/apps/kturtle/examples/sr
+%lang(sr) %{_datadir}/apps/ktuberling/sounds/sr
 
 %files Swedish
 %defattr(-,root,root)
@@ -1149,7 +1149,16 @@
 %endif
 
 %changelog
-* Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 1:3.5.1-0.1.fc4
+- 3.5.1
+
+* Tue Dec 06 2005 Than Ngo <than at redhat.com> 1:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 1:3.4.2-0.fc4.1
+- update to 3.4.2
+
+* Wed Jun 29 2005 Than Ngo <than at redhat.com> 1:3.4.1-1 
 - 3.4.1
 
 * Thu Mar 03 2005 Than Ngo <than at redhat.com> 1:3.4.0-0.rc1.2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	16 Jun 2005 21:37:44 -0000	1.26
+++ sources	1 Feb 2006 17:19:36 -0000	1.27
@@ -1,35 +1,36 @@
-747a0acec5deed97bd46b07dceaa6993  kde-i18n-bg-3.4.1.tar.bz2
-a1263b43f67af53cde0272100d6af2fd  kde-i18n-bn-3.4.1.tar.bz2
-b1d17cf7923363176d55140c8b77c3db  kde-i18n-ca-3.4.1.tar.bz2
-519e1bebbe770ad45ae11987a94dc4e4  kde-i18n-cs-3.4.1.tar.bz2
-3cf62f4594e22dabfc2378277d5d8845  kde-i18n-da-3.4.1.tar.bz2
-a0d20e378e8dc759ca6ab4fbb78a1ba0  kde-i18n-de-3.4.1.tar.bz2
-69a9076cc809b1e5d6543255c7850b80  kde-i18n-el-3.4.1.tar.bz2
-201bf4e7ab75f6e111c023788ffa1fe4  kde-i18n-en_GB-3.4.1.tar.bz2
-a53442acc363a69aeab9b4d3d8e39084  kde-i18n-es-3.4.1.tar.bz2
-2b04f8bf15bb82524da21160651d390e  kde-i18n-et-3.4.1.tar.bz2
-9ad1a28e6222745ee3b216141a674224  kde-i18n-fi-3.4.1.tar.bz2
-0bd260de66a391196b9c5588ddeb4381  kde-i18n-fr-3.4.1.tar.bz2
-30fd8cd41be58e8e4ee4645a5343ac6f  kde-i18n-he-3.4.1.tar.bz2
-3def89639222c9eda85b21706342536b  kde-i18n-hi-3.4.1.tar.bz2
-6834f452fa47bd79594e63f559b44bbf  kde-i18n-hu-3.4.1.tar.bz2
-0fee39dca84f5ad2cae3cd7b36d2baea  kde-i18n-is-3.4.1.tar.bz2
-4f6069a269d0633bfe9f4a67672d9e8b  kde-i18n-it-3.4.1.tar.bz2
-2d7d1357ffd1948a0bb72835e81159a3  kde-i18n-ja-3.4.1.tar.bz2
-71a09ae88bf0b396528d0fe92c684f21  kde-i18n-nb-3.4.1.tar.bz2
-7d0d2c8253ab61bd2ff3ec3ac3bf4b0a  kde-i18n-nl-3.4.1.tar.bz2
-f94b30928746f56decf014aba4dd0a62  kde-i18n-nn-3.4.1.tar.bz2
-b8447164534f6eb640914df73b67d435  kde-i18n-pa-3.4.1.tar.bz2
-a8a4274f098cca840aff4815ed0f2dc7  kde-i18n-pl-3.4.1.tar.bz2
-ca86da0bf48c0b1ac0299a72ef6a8673  kde-i18n-pt-3.4.1.tar.bz2
-2fc5154c299e992745bfbdb7423bb4f9  kde-i18n-pt_BR-3.4.1.tar.bz2
-59b9771ea148a16987ffa219c5bf8012  kde-i18n-ro-3.4.1.tar.bz2
-5a8716e4247369411dbd60f1f193ea3c  kde-i18n-ru-3.4.1.tar.bz2
-cf9b958ea6d8963f92f0dbe3a894e586  kde-i18n-sk-3.4.1.tar.bz2
-24c1dd518c1644bbf0410dac7175cdf2  kde-i18n-sl-3.4.1.tar.bz2
-ef481313fbdf6f5fffc52f2bc4af09c6  kde-i18n-sr-3.4.1.tar.bz2
-048b29d333d8f6d49817e9701e7a1bed  kde-i18n-sv-3.4.1.tar.bz2
-017f11bcbd89ea376d901bfeae2b653b  kde-i18n-ta-3.4.1.tar.bz2
-1b884f33806a6f32e6b539bb2a4d7c96  kde-i18n-tr-3.4.1.tar.bz2
-59eef6b0563f4fb31e04f2576213a069  kde-i18n-uk-3.4.1.tar.bz2
-f933849ce2271402caf57c41e94fc0f3  kde-i18n-zh_CN-3.4.1.tar.bz2
+7914d80d0ab41709b61674a679a591aa  kde-i18n-ar-3.5.1.tar.bz2
+ef385a222ae6ed99f2715add155ffd14  kde-i18n-bg-3.5.1.tar.bz2
+c260d39e9c81045979614ab1efa71647  kde-i18n-bn-3.5.1.tar.bz2
+dac29cc60e4d39faec8f232097c7c3f6  kde-i18n-ca-3.5.1.tar.bz2
+1bd6e2b120b674e492d60990223b084f  kde-i18n-cs-3.5.1.tar.bz2
+424fb6ac034a1df1298689033093b3f2  kde-i18n-da-3.5.1.tar.bz2
+32a095984a17bcfa6ede3dd2c7013863  kde-i18n-de-3.5.1.tar.bz2
+684fa286f3541eab5b55ee141180e2af  kde-i18n-el-3.5.1.tar.bz2
+0f4f0bf3a7d0501bd7211687e11fdcaa  kde-i18n-en_GB-3.5.1.tar.bz2
+ad5ced34f31804701a68d2d64bccefd5  kde-i18n-es-3.5.1.tar.bz2
+8b23d4585f1621dd8184709bc2f3d2ab  kde-i18n-et-3.5.1.tar.bz2
+a94da3fb9427b410cd6a61731317d458  kde-i18n-fi-3.5.1.tar.bz2
+8ce740f45eebca8f87bdd6faf2d61d44  kde-i18n-fr-3.5.1.tar.bz2
+8578ada5131d1a4da7f714a52c6972c0  kde-i18n-he-3.5.1.tar.bz2
+2e7f52f02ea4a97986e0a78e26b7eafc  kde-i18n-hi-3.5.1.tar.bz2
+3911e1c525b6411c30b3848ec6d95503  kde-i18n-hu-3.5.1.tar.bz2
+381d659a746dd70eea9ea23c5fb80464  kde-i18n-is-3.5.1.tar.bz2
+1c637c5cebac6d61c13be2c56215e321  kde-i18n-it-3.5.1.tar.bz2
+30e060d0bd29cfae1d9cd85d4ea91d7f  kde-i18n-ja-3.5.1.tar.bz2
+8fef7b3f29ba8eb68ebd23f228af26ce  kde-i18n-nb-3.5.1.tar.bz2
+2cc0069ac1c8b5fde1dbc87df90329a7  kde-i18n-nl-3.5.1.tar.bz2
+303be4ff9cfb38617e4d30534c3b570b  kde-i18n-nn-3.5.1.tar.bz2
+ec6c5fd0ef940497993b5b6913445412  kde-i18n-pa-3.5.1.tar.bz2
+e058a3964abce47d8cd98c8edb49d6f2  kde-i18n-pl-3.5.1.tar.bz2
+e12cbd70fd6f95309f03ace2a7d3eb41  kde-i18n-pt-3.5.1.tar.bz2
+24fa0b4c146fce9cc7a0046865a9fd94  kde-i18n-pt_BR-3.5.1.tar.bz2
+b903996011ae71248f14ed20c55dce80  kde-i18n-ro-3.5.1.tar.bz2
+a134f766c77f2bbe72761c8d06aa19f1  kde-i18n-ru-3.5.1.tar.bz2
+567a3062c6b7b7cf69fac54a8c255c91  kde-i18n-sk-3.5.1.tar.bz2
+4df423236ce7410bc9108d9208beafaa  kde-i18n-sl-3.5.1.tar.bz2
+8ef952cac32b9b1f97575e3ace02bfc0  kde-i18n-sr-3.5.1.tar.bz2
+d3d71739a1ffcdaa20a35371cbac48ee  kde-i18n-sv-3.5.1.tar.bz2
+05d4060272ef4768292cc556505296cf  kde-i18n-ta-3.5.1.tar.bz2
+d60ba5802f565cd7568bd4359fe01f06  kde-i18n-tr-3.5.1.tar.bz2
+8c4a0a6a1779f09d84b6ddfe55df7ba9  kde-i18n-uk-3.5.1.tar.bz2
+809fc565769b2dffed4098d4a3230296  kde-i18n-zh_CN-3.5.1.tar.bz2


Index: subdirs-kde-i18n
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/subdirs-kde-i18n,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subdirs-kde-i18n	16 Jun 2005 21:37:44 -0000	1.6
+++ subdirs-kde-i18n	1 Feb 2006 17:19:36 -0000	1.7
@@ -1,3 +1,4 @@
+ar
 bg
 bn
 ca



From fedora-cvs-commits at redhat.com  Wed Feb  1 17:30:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 12:30:39 -0500
Subject: rpms/kde-i18n/devel .cvsignore, 1.30, 1.31 kde-i18n.spec, 1.50,
	1.51 sources, 1.32, 1.33
Message-ID: <200602011730.k11HUdTP012442@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kde-i18n.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Nov 2005 16:34:41 -0000	1.30
+++ .cvsignore	1 Feb 2006 17:30:31 -0000	1.31
@@ -183,3 +183,39 @@
 kde-i18n-tr-3.5.0.tar.bz2
 kde-i18n-uk-3.5.0.tar.bz2
 kde-i18n-zh_CN-3.5.0.tar.bz2
+kde-i18n-ar-3.5.1.tar.bz2
+kde-i18n-bg-3.5.1.tar.bz2
+kde-i18n-bn-3.5.1.tar.bz2
+kde-i18n-ca-3.5.1.tar.bz2
+kde-i18n-cs-3.5.1.tar.bz2
+kde-i18n-da-3.5.1.tar.bz2
+kde-i18n-de-3.5.1.tar.bz2
+kde-i18n-el-3.5.1.tar.bz2
+kde-i18n-en_GB-3.5.1.tar.bz2
+kde-i18n-es-3.5.1.tar.bz2
+kde-i18n-et-3.5.1.tar.bz2
+kde-i18n-fi-3.5.1.tar.bz2
+kde-i18n-fr-3.5.1.tar.bz2
+kde-i18n-he-3.5.1.tar.bz2
+kde-i18n-hi-3.5.1.tar.bz2
+kde-i18n-hu-3.5.1.tar.bz2
+kde-i18n-is-3.5.1.tar.bz2
+kde-i18n-it-3.5.1.tar.bz2
+kde-i18n-ja-3.5.1.tar.bz2
+kde-i18n-nb-3.5.1.tar.bz2
+kde-i18n-nl-3.5.1.tar.bz2
+kde-i18n-nn-3.5.1.tar.bz2
+kde-i18n-pa-3.5.1.tar.bz2
+kde-i18n-pl-3.5.1.tar.bz2
+kde-i18n-pt-3.5.1.tar.bz2
+kde-i18n-pt_BR-3.5.1.tar.bz2
+kde-i18n-ro-3.5.1.tar.bz2
+kde-i18n-ru-3.5.1.tar.bz2
+kde-i18n-sk-3.5.1.tar.bz2
+kde-i18n-sl-3.5.1.tar.bz2
+kde-i18n-sr-3.5.1.tar.bz2
+kde-i18n-sv-3.5.1.tar.bz2
+kde-i18n-ta-3.5.1.tar.bz2
+kde-i18n-tr-3.5.1.tar.bz2
+kde-i18n-uk-3.5.1.tar.bz2
+kde-i18n-zh_CN-3.5.1.tar.bz2


Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kde-i18n.spec	9 Dec 2005 22:41:08 -0000	1.50
+++ kde-i18n.spec	1 Feb 2006 17:30:31 -0000	1.51
@@ -3,8 +3,8 @@
 %define redhatify 1
 
 Name: kde-i18n
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Url: http://www.kde.org
 Summary: Internationalization support for KDE
 Epoch: 1
@@ -1151,6 +1151,9 @@
 %endif
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 1:3.5.1-1
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Nov 2005 16:34:41 -0000	1.32
+++ sources	1 Feb 2006 17:30:35 -0000	1.33
@@ -1,37 +1,36 @@
-8d27ddfb94a35c9483a354c74a8bc625  admin-3.4.91.tar.bz2
-ddae126b0e6f157c7ab216886da9a9cc  kde-i18n-ar-3.5.0.tar.bz2
-14a1c0ffca9b70befd62aac08a76ce26  kde-i18n-bg-3.5.0.tar.bz2
-76eb28c1ace6f2279657d8574f9f0814  kde-i18n-bn-3.5.0.tar.bz2
-1757ccb438e4cc2edb9c5af7c0ffc736  kde-i18n-ca-3.5.0.tar.bz2
-d7ccfd209c90ddb92e60476481bd20e3  kde-i18n-cs-3.5.0.tar.bz2
-2fabb8a20a0c197b4749b93359d25fc1  kde-i18n-da-3.5.0.tar.bz2
-71e66fbc6d497808364ff2ae02e2f9a3  kde-i18n-de-3.5.0.tar.bz2
-bd70e25fc9ad9ac7c09584bab498cf4c  kde-i18n-el-3.5.0.tar.bz2
-bb505653bdd061665b48dd1438a7373d  kde-i18n-en_GB-3.5.0.tar.bz2
-8bf984ce3aaaa7d58156458d4eafd5bd  kde-i18n-es-3.5.0.tar.bz2
-4c6be2284f34897fffa4cdce85f51fb4  kde-i18n-et-3.5.0.tar.bz2
-f4b68d979d9181561e04e0ec3cb6c5f2  kde-i18n-fi-3.5.0.tar.bz2
-aec9d5ab04f9dc5a3cc4a8093bd9f7d4  kde-i18n-fr-3.5.0.tar.bz2
-3a5c77420709d437521c2a9b7d4183a5  kde-i18n-he-3.5.0.tar.bz2
-afdc78d57f13e7999178d5784222e0be  kde-i18n-hi-3.5.0.tar.bz2
-9e4108754b8b9d84157f8a139749f96e  kde-i18n-hu-3.5.0.tar.bz2
-9ecfc0c82796bca3f7cbb621b2535b51  kde-i18n-is-3.5.0.tar.bz2
-1d2c594bf5c6f853822ae869ae101373  kde-i18n-it-3.5.0.tar.bz2
-404c4ad98acc237eb4ea36b1b637f708  kde-i18n-ja-3.5.0.tar.bz2
-a9d408cb53d33d9ad2a27b7e75878ff2  kde-i18n-nb-3.5.0.tar.bz2
-5253d78852e4692abbfaf422eb13612f  kde-i18n-nl-3.5.0.tar.bz2
-e8f4d8fc6600f34667c2426908e9e87c  kde-i18n-nn-3.5.0.tar.bz2
-c62a690a4e8e2f20da3e69ad9459168b  kde-i18n-pa-3.5.0.tar.bz2
-dd1a8db5e7ac7fb7fbf88fc89c6248d6  kde-i18n-pl-3.5.0.tar.bz2
-14e6a97e5f03902449ef7f79a8c6ca3f  kde-i18n-pt-3.5.0.tar.bz2
-94bf46c3b6b3f2f3d315c17b7b0df496  kde-i18n-pt_BR-3.5.0.tar.bz2
-5dcaf0e47bc367bbc8a93b8325e95007  kde-i18n-ro-3.5.0.tar.bz2
-8f6c9961e3df806d1bb2ecab073436fe  kde-i18n-ru-3.5.0.tar.bz2
-64289a8a8d2ffd4de136faca3b901453  kde-i18n-sk-3.5.0.tar.bz2
-29618443a77a8b657f6003ce28db8471  kde-i18n-sl-3.5.0.tar.bz2
-305e7594a705c1ffaf566f0adb543dc8  kde-i18n-sr-3.5.0.tar.bz2
-34837afb8eb7c808ffeecdb7dff66a98  kde-i18n-sv-3.5.0.tar.bz2
-4776430c0e6d5aa4455ebc8406e8a373  kde-i18n-ta-3.5.0.tar.bz2
-0fd7a1e932ec5bf1bfe494ee00b3cd09  kde-i18n-tr-3.5.0.tar.bz2
-039bf39e0b7df0906358667f2bbefe46  kde-i18n-uk-3.5.0.tar.bz2
-aba75e252510e999a17650994934065c  kde-i18n-zh_CN-3.5.0.tar.bz2
+7914d80d0ab41709b61674a679a591aa  kde-i18n-ar-3.5.1.tar.bz2
+ef385a222ae6ed99f2715add155ffd14  kde-i18n-bg-3.5.1.tar.bz2
+c260d39e9c81045979614ab1efa71647  kde-i18n-bn-3.5.1.tar.bz2
+dac29cc60e4d39faec8f232097c7c3f6  kde-i18n-ca-3.5.1.tar.bz2
+1bd6e2b120b674e492d60990223b084f  kde-i18n-cs-3.5.1.tar.bz2
+424fb6ac034a1df1298689033093b3f2  kde-i18n-da-3.5.1.tar.bz2
+32a095984a17bcfa6ede3dd2c7013863  kde-i18n-de-3.5.1.tar.bz2
+684fa286f3541eab5b55ee141180e2af  kde-i18n-el-3.5.1.tar.bz2
+0f4f0bf3a7d0501bd7211687e11fdcaa  kde-i18n-en_GB-3.5.1.tar.bz2
+ad5ced34f31804701a68d2d64bccefd5  kde-i18n-es-3.5.1.tar.bz2
+8b23d4585f1621dd8184709bc2f3d2ab  kde-i18n-et-3.5.1.tar.bz2
+a94da3fb9427b410cd6a61731317d458  kde-i18n-fi-3.5.1.tar.bz2
+8ce740f45eebca8f87bdd6faf2d61d44  kde-i18n-fr-3.5.1.tar.bz2
+8578ada5131d1a4da7f714a52c6972c0  kde-i18n-he-3.5.1.tar.bz2
+2e7f52f02ea4a97986e0a78e26b7eafc  kde-i18n-hi-3.5.1.tar.bz2
+3911e1c525b6411c30b3848ec6d95503  kde-i18n-hu-3.5.1.tar.bz2
+381d659a746dd70eea9ea23c5fb80464  kde-i18n-is-3.5.1.tar.bz2
+1c637c5cebac6d61c13be2c56215e321  kde-i18n-it-3.5.1.tar.bz2
+30e060d0bd29cfae1d9cd85d4ea91d7f  kde-i18n-ja-3.5.1.tar.bz2
+8fef7b3f29ba8eb68ebd23f228af26ce  kde-i18n-nb-3.5.1.tar.bz2
+2cc0069ac1c8b5fde1dbc87df90329a7  kde-i18n-nl-3.5.1.tar.bz2
+303be4ff9cfb38617e4d30534c3b570b  kde-i18n-nn-3.5.1.tar.bz2
+ec6c5fd0ef940497993b5b6913445412  kde-i18n-pa-3.5.1.tar.bz2
+e058a3964abce47d8cd98c8edb49d6f2  kde-i18n-pl-3.5.1.tar.bz2
+e12cbd70fd6f95309f03ace2a7d3eb41  kde-i18n-pt-3.5.1.tar.bz2
+24fa0b4c146fce9cc7a0046865a9fd94  kde-i18n-pt_BR-3.5.1.tar.bz2
+b903996011ae71248f14ed20c55dce80  kde-i18n-ro-3.5.1.tar.bz2
+a134f766c77f2bbe72761c8d06aa19f1  kde-i18n-ru-3.5.1.tar.bz2
+567a3062c6b7b7cf69fac54a8c255c91  kde-i18n-sk-3.5.1.tar.bz2
+4df423236ce7410bc9108d9208beafaa  kde-i18n-sl-3.5.1.tar.bz2
+8ef952cac32b9b1f97575e3ace02bfc0  kde-i18n-sr-3.5.1.tar.bz2
+d3d71739a1ffcdaa20a35371cbac48ee  kde-i18n-sv-3.5.1.tar.bz2
+05d4060272ef4768292cc556505296cf  kde-i18n-ta-3.5.1.tar.bz2
+d60ba5802f565cd7568bd4359fe01f06  kde-i18n-tr-3.5.1.tar.bz2
+8c4a0a6a1779f09d84b6ddfe55df7ba9  kde-i18n-uk-3.5.1.tar.bz2
+809fc565769b2dffed4098d4a3230296  kde-i18n-zh_CN-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 17:41:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 12:41:41 -0500
Subject: rpms/kdeadmin/FC-4 .cvsignore, 1.29, 1.30 kdeadmin.spec, 1.44,
	1.45 sources, 1.30, 1.31
Message-ID: <200602011741.k11HffVQ015730@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeadmin.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	8 Dec 2005 11:36:42 -0000	1.29
+++ .cvsignore	1 Feb 2006 17:41:38 -0000	1.30
@@ -5,3 +5,4 @@
 kdeadmin-3.4.0.tar.bz2
 kdeadmin-3.4.1.tar.bz2
 kdeadmin-3.5.0.tar.bz2
+kdeadmin-3.5.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/kdeadmin.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeadmin.spec	8 Dec 2005 11:36:42 -0000	1.44
+++ kdeadmin.spec	1 Feb 2006 17:41:38 -0000	1.45
@@ -20,7 +20,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
+Version: 3.5.1
 Release: 0.1.fc4
 Name: kdeadmin
 Summary: Administrative tools for KDE.
@@ -180,13 +180,6 @@
 
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" ksysv/Makefile* lilo-config/qt/Makefile.*
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -205,18 +198,24 @@
 export CXXFLAGS="$FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
-%if %{debug}
-   --enable-debug \
-%endif
    --with-private-groups
 
 make %{?_smp_mflags}
@@ -412,6 +411,9 @@
 %endif
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
+- 3.5.1
+
 * Thu Dec 08 2005 Than Ngo <than at redhat.com> 7:3.5.0-0.1.fc4
 - 3.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	8 Dec 2005 11:36:42 -0000	1.30
+++ sources	1 Feb 2006 17:41:38 -0000	1.31
@@ -1 +1 @@
-9d0f914d2d0d3fbef8ed51cfdab36d40  kdeadmin-3.5.0.tar.bz2
+08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:04:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:04:00 -0500
Subject: rpms/kdeadmin/FC-4 kdeadmin.spec, 1.45,
	1.46 kdeadmin-3.4.2-kcron.patch, 1.1, NONE
Message-ID: <200602011804.k11I40v0004068@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdeadmin.spec 
Removed Files:
	kdeadmin-3.4.2-kcron.patch 
Log Message:
remove kdeadmin-3.4.2-kcron.patch, it's included in upstream



Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-4/kdeadmin.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdeadmin.spec	1 Feb 2006 17:41:38 -0000	1.45
+++ kdeadmin.spec	1 Feb 2006 18:03:47 -0000	1.46
@@ -37,7 +37,6 @@
 Source10: kpackagerc
 
 Patch1: kde-libtool.patch
-Patch2: kdeadmin-3.4.2-kcron.patch
 
 Prereq: /sbin/ldconfig
 Requires: kdelibs >= 6:%{version}
@@ -152,7 +151,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .kcron_bz168770
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in


--- kdeadmin-3.4.2-kcron.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:11:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:11:27 -0500
Subject: rpms/kde-i18n/FC-4 kde-i18n.spec,1.41,1.42
Message-ID: <200602011811.k11IBRlB006247@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-i18n.spec 
Log Message:
fix rpm file list



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/FC-4/kde-i18n.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kde-i18n.spec	1 Feb 2006 17:19:36 -0000	1.41
+++ kde-i18n.spec	1 Feb 2006 18:11:24 -0000	1.42
@@ -1010,6 +1010,11 @@
 %defattr(-,root,root)
 %lang(pl) %{_datadir}/locale/pl/*
 %lang(pl) %doc %{_docdir}/HTML/pl
+%lang(pl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pl.xml
+%lang(pl) %{_datadir}/apps/khangman/data/pl
+%lang(pl) %{_datadir}/apps/khangman/pl.txt
+%lang(pl) %{_datadir}/apps/kturtle/data/logokeywords.pl.xml
+%lang(pl) %{_datadir}/apps/kturtle/examples/pl
 
 %files Portuguese
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:38:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:38:21 -0500
Subject: rpms/gcc/devel gcc41-s390-ldbl.patch,1.3,1.4 gcc41.spec,1.20,1.21
Message-ID: <200602011838.k11IcL6d028499@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28428

Modified Files:
	gcc41-s390-ldbl.patch gcc41.spec 
Log Message:
4.1.0-0.19


gcc41-s390-ldbl.patch:
 config/s390/2084.md          |   44 +++
 config/s390/fixdfdi.h        |  151 ++++++++++++
 config/s390/libgcc-glibc.ver |   33 ++
 config/s390/s390.c           |   56 ++++
 config/s390/s390.h           |   48 ++-
 config/s390/s390.md          |  529 +++++++++++++++++++++++++++++++++----------
 config/s390/s390.opt         |   10 
 config/s390/t-crtstuff       |    1 
 doc/invoke.texi              |   10 
 9 files changed, 736 insertions(+), 146 deletions(-)

Index: gcc41-s390-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-s390-ldbl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-s390-ldbl.patch	31 Jan 2006 14:29:33 -0000	1.3
+++ gcc41-s390-ldbl.patch	1 Feb 2006 18:38:16 -0000	1.4
@@ -1,10 +1,10 @@
-2006-01-31  Andreas Krebbel  <krebbel1 at de.ibm.com>
+2006-02-01  Andreas Krebbel  <krebbel1 at de.ibm.com>
 	    Ulrich Weigand  <uweigand at de.ibm.com>
 
 	* config/s390/2084.md ("x_fsimptf", "x_fmultf", "x_fdivtf",
 	"x_floadtf", "x_ftrunctf", "x_ftruncdf"): New insn reservations.
 	* config/s390/fixdfdi.h (__fixunstfdi, __fixtfdi): New functions.
-	* config/s390/s390.c (struct processor_costs): Add mxbr, sqxbr, dxbr
+	* config/s390/s390.c (struct processor_costs): Add mxbr, sqxbr, dxbr 
 	and dxr fields.
 	(z900_cost, z990_cost, z9_109_cost): Values for the new fields added.
 	(s390_rtx_costs): Use the new fields to calculate rtx costs.
@@ -16,48 +16,48 @@
 	builtin define.
 	(LONG_DOUBLE_TYPE_SIZE): Set to 128 or 64.
 	(LIBGCC2_LONG_DOUBLE_TYPE_SIZE, WIDEST_HARDWARE_FP_SIZE): Define.
-	(HARD_REGNO_NREGS, HARD_REGNO_MODE_OK, CLASS_MAX_NREGS,
+	(HARD_REGNO_NREGS, HARD_REGNO_MODE_OK, CLASS_MAX_NREGS, 
 	CANNOT_CHANGE_MODE_CLASS): Consider TFmode.
-	* config/s390/s390.md ("type" attribute): Add fsimptf, floadtf, fmultf,
+	* config/s390/s390.md ("type" attribute): Add fsimptf, floadtf, fmultf, 
 	fdivtf, fsqrttf, ftrunctf, ftruncdf as possible values.
 	(FPR mode macro): Add TFmode.
 	(DSF mode macro): New.
 	(<de>, <dee> mode attributes): Removed.
 	(<xde>, <xdee>, <RRe>, <RXe>, <Rf> mode attributes): New.
-	("*cmp<mode>_ccs_0", "*cmp<mode>_ccs_0_ibm", "*cmp<mode>_ccs",
-	"*cmp<mode>_ccs_ibm", "fix_trunc<FPR:mode><GPR:mode>2_ieee",
-	"floatdi<mode>2", "floatsi<mode>2_ieee", "*add<mode>3",
-	"*add<mode>3_cc", "*add<mode>3_cconly", "*add<mode>3_ibm",
-	"*sub<mode>3", "*sub<mode>3_cc", "*sub<mode>3_cconly",
+	("*cmp<mode>_ccs_0", "*cmp<mode>_ccs_0_ibm", "*cmp<mode>_ccs", 
+	"*cmp<mode>_ccs_ibm", "fix_trunc<FPR:mode><GPR:mode>2_ieee", 
+	"floatdi<mode>2", "floatsi<mode>2_ieee", "*add<mode>3", 
+	"*add<mode>3_cc", "*add<mode>3_cconly", "*add<mode>3_ibm", 
+	"*sub<mode>3", "*sub<mode>3_cc", "*sub<mode>3_cconly", 
 	"*sub<mode>3_ibm", "*mul<mode>3_ibm", "*fmadd<mode>", "*fmsub<mode>",
-	"*div<mode>3", "*div<mode>3_ibm", "*neg<mode>2_cc",
-	"*neg<mode>2_cconly", "*neg<mode>2", "*neg<mode>2_ibm",
+	"*div<mode>3", "*div<mode>3_ibm", "*neg<mode>2_cc", 
+	"*neg<mode>2_cconly", "*neg<mode>2", "*neg<mode>2_ibm", 
 	"*abs<mode>2_cc", "*abs<mode>2_cconly", "*abs<mode>2",
-	"*abs<mode>2_ibm", "*negabs<mode>2_cc", "*negabs<mode>2_cconly",
+	"*abs<mode>2_ibm", "*negabs<mode>2_cc", "*negabs<mode>2_cconly", 
 	"*negabs<mode>2", "sqrt<mode>2"):
 	Changed <de> to <xde>. R constraint replaced by <Rf>.
-	("*mul<mode>3"): Changed <dee> to <xdee>. R constraint replaced by
+	("*mul<mode>3"): Changed <dee> to <xdee>. R constraint replaced by 
 	<Rf>.
 	("fix_trunc<FPR:mode>di2"): 'FPR:' removed.
 	("*fmadd<mode>", "*fmsub<mode>"): FPR mode replaced by DSF.
-	("*movtf_64", "*movtf_31"): New insn definitions followed by 5
+	("*movtf_64", "*movtf_31"): New insn definitions followed by 5 
 	splitters.
-	("movtf", "reload_outtf", "reload_intf", "trunctfdf2", "trunctfsf2",
+	("movtf", "reload_outtf", "reload_intf", "trunctfdf2", "trunctfsf2", 
 	"extenddftf2", "extendsftf2"): New expanders.
-	("*trunctfdf2_ieee", "*trunctfdf2_ibm", "*trunctfsf2_ieee",
+	("*trunctfdf2_ieee", "*trunctfdf2_ibm", "*trunctfsf2_ieee", 
 	"*trunctfsf2_ibm", "*extenddftf2_ieee", "*extenddftf2_ibm",
 	"*extendsftf2_ieee", "*extendsftf2_ibm"): New insn patterns.
 	* config/s390/s390.opt (mlong-double-128, mlong-double-64):
 	New options.
 	* config/s390/t-crtstuff (TARGET_LIBGCC2_CFLAGS): Macro defined.
-	* config/s390/libgcc-glibc.ver (__divtc3, __multc3, __powitf2,
+	* config/s390/libgcc-glibc.ver (__divtc3, __multc3, __powitf2, 
 	__fixtfti, __fixunstfti, __floattitf, __fixtfdi, __fixunstfdi,
 	__floatditf): Add a GCC_4.1.0 symbol version tag.
 	* doc/invoke.texi (-mlong-double-128, -mlong-double-64): Document
 	the new options.
 
 --- gcc/config/s390/libgcc-glibc.ver.jj	2006-01-31 14:38:38.000000000 +0100
-+++ gcc/config/s390/libgcc-glibc.ver	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/libgcc-glibc.ver	2006-02-01 19:30:31.000000000 +0100
 @@ -39,3 +39,36 @@ GLIBC_2.2 {
  }
  %endif
@@ -96,7 +96,7 @@
 +%endif
 +}
 --- gcc/config/s390/s390.c.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/s390.c	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/s390.c	2006-02-01 19:30:31.000000000 +0100
 @@ -1,5 +1,5 @@
  /* Subroutines used for code generation on IBM S/390 and zSeries
 -   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
@@ -201,26 +201,23 @@
        return false;
  
      case SIGN_EXTEND:
-@@ -2570,6 +2598,18 @@ s390_secondary_input_reload_class (enum 
+@@ -2570,6 +2598,15 @@ s390_secondary_input_reload_class (enum 
    if (s390_plus_operand (in, mode))
      return ADDR_REGS;
  
 +  if (reg_classes_intersect_p (FP_REGS, class)
 +      && mode == TFmode
-+      && GET_CODE (in) == MEM)
-+    {
-+      rtx disp = const0_rtx;
-+
-+      eliminate_constant_term (XEXP (in, 0), &disp);
-+
-+      if (!DISP_IN_RANGE (INTVAL (disp) + GET_MODE_SIZE (mode) - 1))
-+	return ADDR_REGS;
-+    }
++      && GET_CODE (in) == MEM
++      && GET_CODE (XEXP (in, 0)) == PLUS
++      && GET_CODE (XEXP (XEXP (in, 0), 1)) == CONST_INT
++      && !DISP_IN_RANGE (INTVAL (XEXP (XEXP (in, 0), 1))
++			 + GET_MODE_SIZE (mode) - 1))
++    return ADDR_REGS;
 +
    if (reg_classes_intersect_p (CC_REGS, class))
      return GENERAL_REGS;
  
-@@ -2586,7 +2626,7 @@ enum reg_class
+@@ -2586,7 +2623,7 @@ enum reg_class
  s390_secondary_output_reload_class (enum reg_class class,
  				    enum machine_mode mode, rtx out)
  {
@@ -229,26 +226,23 @@
                      : (mode == DImode || mode == DFmode))
        && reg_classes_intersect_p (GENERAL_REGS, class)
        && GET_CODE (out) == MEM
-@@ -2597,6 +2637,18 @@ s390_secondary_output_reload_class (enum
+@@ -2597,6 +2634,15 @@ s390_secondary_output_reload_class (enum
  			 + GET_MODE_SIZE (mode) - 1))
      return ADDR_REGS;
  
 +  if (reg_classes_intersect_p (FP_REGS, class)
 +      && mode == TFmode
-+      && GET_CODE (out) == MEM)
-+    {
-+      rtx disp = const0_rtx;
-+
-+      eliminate_constant_term (XEXP (out, 0), &disp);
-+
-+      if (!DISP_IN_RANGE (INTVAL (disp) + GET_MODE_SIZE (mode) - 1))
-+	return ADDR_REGS;
-+    }
++      && GET_CODE (out) == MEM
++      && GET_CODE (XEXP (out, 0)) == PLUS
++      && GET_CODE (XEXP (XEXP (out, 0), 1)) == CONST_INT
++      && !DISP_IN_RANGE (INTVAL (XEXP (XEXP (out, 0), 1))
++			 + GET_MODE_SIZE (mode) - 1))
++    return ADDR_REGS;
 +
    if (reg_classes_intersect_p (CC_REGS, class))
      return GENERAL_REGS;
  
-@@ -5168,10 +5220,10 @@ replace_ltrel_base (rtx *x)
+@@ -5168,10 +5214,10 @@ replace_ltrel_base (rtx *x)
  /* We keep a list of constants which we have to add to internal
     constant tables in the middle of large functions.  */
  
@@ -262,7 +256,7 @@
    SFmode, SImode,
    HImode,
 --- gcc/config/s390/s390.opt.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/s390.opt	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/s390.opt	2006-02-01 19:30:31.000000000 +0100
 @@ -1,6 +1,6 @@
  ; Options for the S/390 / zSeries port of the compiler.
  
@@ -287,7 +281,7 @@
  Target Report Mask(PACKED_STACK)
  Use packed stack layout
 --- gcc/config/s390/2084.md.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/2084.md	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/2084.md	2006-02-01 19:30:31.000000000 +0100
 @@ -1,5 +1,5 @@
  ;; Scheduling description for z990 (cpu 2084).
 -;;   Copyright (C) 2003,2004, 2005 Free Software Foundation, Inc.
@@ -394,14 +388,14 @@
  	         "s390_agen_dep_p")
  
 --- gcc/config/s390/t-crtstuff.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/t-crtstuff	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/t-crtstuff	2006-02-01 19:30:31.000000000 +0100
 @@ -2,3 +2,4 @@
  # because then __FRAME_END__ might not be the last thing in .eh_frame
  # section.
  CRTSTUFF_T_CFLAGS = -fno-asynchronous-unwind-tables
 +TARGET_LIBGCC2_CFLAGS += -mlong-double-128
 --- gcc/config/s390/s390.md.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/s390.md	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/s390.md	2006-02-01 19:30:31.000000000 +0100
 @@ -1,5 +1,5 @@
  ;;- Machine description for GNU compiler -- S/390 / zSeries version.
 -;;  Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
@@ -1307,7 +1301,7 @@
     (set_attr "type" "fsqrt<mode>")])
  
 --- gcc/config/s390/fixdfdi.h.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/fixdfdi.h	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/fixdfdi.h	2006-02-01 19:30:31.000000000 +0100
 @@ -20,6 +20,156 @@ along with GCC; see the file COPYING.  I
  Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
  02110-1301, USA.  */
@@ -1471,7 +1465,7 @@
  #undef L_fixsfdi
 -
 --- gcc/config/s390/s390.h.jj	2006-01-31 14:38:39.000000000 +0100
-+++ gcc/config/s390/s390.h	2006-01-31 15:07:03.000000000 +0100
++++ gcc/config/s390/s390.h	2006-02-01 19:30:31.000000000 +0100
 @@ -1,5 +1,5 @@
  /* Definitions of target machine for GNU compiler, for IBM S/390
 -   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
@@ -1577,7 +1571,7 @@
  /* Register classes.  */
  
 --- gcc/doc/invoke.texi.jj	2006-01-31 14:38:56.000000000 +0100
-+++ gcc/doc/invoke.texi	2006-01-31 15:07:03.000000000 +0100
++++ gcc/doc/invoke.texi	2006-02-01 19:30:31.000000000 +0100
 @@ -666,8 +666,8 @@ See RS/6000 and PowerPC Options.
  
  @emph{S/390 and zSeries Options}


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcc41.spec	31 Jan 2006 14:29:33 -0000	1.20
+++ gcc41.spec	1 Feb 2006 18:38:16 -0000	1.21
@@ -1,6 +1,6 @@
 %define DATE 20060131
 %define gcc_version 4.1.0
-%define gcc_release 0.18
+%define gcc_release 0.19
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -1537,6 +1537,10 @@
 %endif
 
 %changelog
+* Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.19
+- s390{,x} long double patch fix for s390x ICEs on test-ldouble
+  and tst-align2 (Andreas Krebbel)
+
 * Tue Jan 31 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.18
 - update from gcc-4_1-branch (-r110317:110433)
   - PRs c++/25855, c++/25999, fortran/17911, fortran/18578, fortran/18579,



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:45:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:45:19 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc1-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.333, 1.334 kernel-2.6.spec, 1.1888,
	1.1889 sources, 1.275, 1.276 upstream, 1.250,
	1.251 linux-2.6-net-fix-iptables.patch, 1.1,
	NONE linux-2.6-net-slab-corruption.patch, 1.1,
	NONE patch-2.6.16-rc1-git4.bz2.sign, 1.1, NONE
Message-ID: <200602011845.k11IjJFG031733@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc1-git5.bz2.sign 
Removed Files:
	linux-2.6-net-fix-iptables.patch 
	linux-2.6-net-slab-corruption.patch 
	patch-2.6.16-rc1-git4.bz2.sign 
Log Message:
git5



--- NEW FILE patch-2.6.16-rc1-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD4GuzyGugalF9Dw4RAsLkAJ4h3+3v3iJxJT9naRD5r7MRwESrVQCfUknE
iwqTsgBCvn2WOrSZN9OwRig=
=t7rA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- .cvsignore	26 Jan 2006 20:45:32 -0000	1.333
+++ .cvsignore	1 Feb 2006 18:45:17 -0000	1.334
@@ -4,5 +4,5 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc1.bz2
 bcm43xx-20060114.tar.bz2
-patch-2.6.16-rc1-git4.bz2
 acpi-release-20060113-2.6.16-rc1.diff.bz2
+patch-2.6.16-rc1-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1888
retrieving revision 1.1889
diff -u -r1.1888 -r1.1889
--- kernel-2.6.spec	1 Feb 2006 05:26:31 -0000	1.1888
+++ kernel-2.6.spec	1 Feb 2006 18:45:17 -0000	1.1889
@@ -209,7 +209,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc1.bz2
-Patch2: patch-2.6.16-rc1-git4.bz2
+Patch2: patch-2.6.16-rc1-git5.bz2
 Patch3: drm.patch
 Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2
 
@@ -359,8 +359,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-net-fix-iptables.patch
-Patch1870: linux-2.6-net-slab-corruption.patch
 Patch1880: linux-2.6-suspend-memhotplug-oops.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
@@ -852,10 +850,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Make iptables work again
-%patch1860 -p1
-# Fix netlayer slab corruption
-%patch1870 -p1
 # Fix software suspend on kernels without memory hotplug.
 %patch1880 -p1
 # Fix oops in stradis on init
@@ -1387,6 +1381,7 @@
 
 %changelog
 * Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
+- Woo, 2.6.16rc1-git5 (at last)
 - Fixed an oops in the stradis driver initialisation.
 - Happy Birthday to "The Yellow Dart".
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- sources	26 Jan 2006 20:45:32 -0000	1.275
+++ sources	1 Feb 2006 18:45:17 -0000	1.276
@@ -1,5 +1,5 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
-a247c21e1202f514283ba928d9382353  patch-2.6.16-rc1-git4.bz2
 3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2
+38954e4fe6dbf902e854f456b675f60f  patch-2.6.16-rc1-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- upstream	21 Jan 2006 22:32:12 -0000	1.250
+++ upstream	1 Feb 2006 18:45:17 -0000	1.251
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc1.bz2
-patch-2.6.16-rc1-git4.bz2
+patch-2.6.16-rc1-git5.bz2


--- linux-2.6-net-fix-iptables.patch DELETED ---


--- linux-2.6-net-slab-corruption.patch DELETED ---


--- patch-2.6.16-rc1-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:45:20 -0500
Subject: rpms/gnome-python2-extras/FC-4
	gnome-python-extras-2.10.0-focus.patch, NONE,
	1.1 gnome-python-extras.spec, 1.7, 1.8
Message-ID: <200602011845.k11IjKvd031743@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31678

Modified Files:
	gnome-python-extras.spec 
Added Files:
	gnome-python-extras-2.10.0-focus.patch 
Log Message:
- Add focus patch to fix bug #162419


gnome-python-extras-2.10.0-focus.patch:
 applet.defs |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE gnome-python-extras-2.10.0-focus.patch ---
--- gnome-python-extras-2.10.0/gnomeapplet/applet.defs.focus	2005-10-31 17:40:14.000000000 -0500
+++ gnome-python-extras-2.10.0/gnomeapplet/applet.defs	2005-10-31 17:41:51.000000000 -0500
@@ -110,6 +110,13 @@
   (return-type "BonoboUIComponent*")
 )
 
+(define-method request_focus
+  (of-object "PanelApplet")
+  (c-name "panel_applet_request_focus")
+  (return-type "none")
+  (parameters
+    '("guint32" "timestamp")))
+
 (define-method setup_menu
   (of-object "PanelApplet")
   (c-name "panel_applet_setup_menu")


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-python-extras.spec	28 Mar 2005 22:08:58 -0000	1.7
+++ gnome-python-extras.spec	1 Feb 2006 18:45:17 -0000	1.8
@@ -13,11 +13,13 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.10.0
-Release: 2.1 
+Release: 3 
 License: GPL/LGPL
 Group: Development/Languages
 Source0: gnome-python-extras-%{version}.tar.bz2
 Patch0: gnome-python-extras-2.10.0-gtkspell-static.patch
+Patch1: gnome-python-extras-2.10.0-focus.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: gnome-python2 >= %{gnome_python_version}
@@ -157,6 +159,7 @@
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch0 -p1 -b .gtkspell-static
+%patch1 -p1 -b .focus
 
 %build
 %configure
@@ -241,6 +244,9 @@
 
 
 %changelog
+* Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-3
+- Add focus patch to fix bug #162419
+
 * Mon Mar 28 2005 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-2.1
 - Retag and rebuild
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:45:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:45:21 -0500
Subject: rpms/kernel/devel/configs config-generic,1.139,1.140
Message-ID: <200602011845.k11IjLxY031747@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
git5



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- config-generic	22 Jan 2006 22:40:42 -0000	1.139
+++ config-generic	1 Feb 2006 18:45:17 -0000	1.140
@@ -2076,6 +2076,7 @@
 CONFIG_USB_DABUSB=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
+CONFIG_USB_ET61X251=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:57:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:57:25 -0500
Subject: rpms/perl/devel sources,1.13,1.14 .cvsignore,1.13,1.14
Message-ID: <200602011857.k11IvP1A009494@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	sources .cvsignore 
Log Message:
Upgrade to upstream version 5.8.8


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Aug 2005 22:56:18 -0000	1.13
+++ sources	1 Feb 2006 18:57:23 -0000	1.14
@@ -1 +1 @@
-9a175d6ccbb5d9b41ffac5073ff9cc3c  perl-5.8.7.tar.bz2
+a377c0c67ab43fd96eeec29ce19e8382  perl-5.8.8.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	28 Aug 2005 22:56:18 -0000	1.13
+++ .cvsignore	1 Feb 2006 18:57:23 -0000	1.14
@@ -1 +1,2 @@
 perl-5.8.7.tar.bz2
+perl-5.8.8.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:58:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:58:45 -0500
Subject: rpms/perl/devel perl.spec,1.79,1.80
Message-ID: <200602011858.k11IwjsG009532@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
Upgrade to upstream version 5.8.8; fix bug 178343;


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- perl.spec	14 Dec 2005 18:00:31 -0000	1.79
+++ perl.spec	1 Feb 2006 18:58:43 -0000	1.80
@@ -4,9 +4,9 @@
 
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
-%define perlver 5.8.7
-%define perlrel 8.1
-%define perlepoch 3
+%define perlver    5.8.8
+%define perlrel    1
+%define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
 %if %{perl_debugging}
@@ -26,12 +26,13 @@
 Provides: perl(:WITHOUT_THREADS)
 %endif
 
-%define perlmodcompat 5.8.6 5.8.5 5.8.4 5.8.3
+%define perlmodcompat 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3
 Provides: perl(:MODULE_COMPAT_5.8.3)
 Provides: perl(:MODULE_COMPAT_5.8.4)
 Provides: perl(:MODULE_COMPAT_5.8.5)
 Provides: perl(:MODULE_COMPAT_5.8.6)
 Provides: perl(:MODULE_COMPAT_5.8.7)
+Provides: perl(:MODULE_COMPAT_5.8.8)
 
 %if %{largefiles}
 Provides: perl(:WITH_LARGEFILES)
@@ -50,25 +51,25 @@
 License:        Artistic or GPL
 Url:            http://www.perl.org/
 
-Source0:        http://www.cpan.org/authors/id/N/NW/NWCLARK/perl-5.8.7.tar.bz2
+Source0:        http://www.cpan.org/authors/id/N/NW/NWCLARK/%{name}-%{version}.tar.bz2
 Source11:       filter-depends.sh
 Source12:       perl-5.8.0-libnet.cfg
 
 Patch5:         perl-5.8.0-root.patch
 # Patch6:         perl-5.8.0-fhs.patch
-Patch7:         perl-5.6.0-buildroot.patch
+# Patch7:         perl-5.6.0-buildroot.patch
 # Patch8:         perl-5.8.0-errno.patch
-Patch9:         perl-5.7.3-syslog.patch
+# Patch9:         perl-5.7.3-syslog.patch
 # Patch10:        perl-5.8.0-notty.patch
-Patch11:        perl-5.8.3-fullinc.patch
-Patch12:        perl-5.8.7-incpush.patch
-Patch13:        perl-5.8.3-perlbug-tag.patch
-Patch14:        perl-5.8.5-dashI.patch
+# Patch11:        perl-5.8.3-fullinc.patch
+Patch12:        perl-5.8.8-incpush.patch
+Patch13:        perl-5.8.8-perlbug-tag.patch
+Patch14:        perl-5.8.8-dashI.patch
 Patch15:        perl-5.8.5-incorder.patch
 
 # Configure doesn't listen well when we say no ndbm.  When it links in,
 # it then conflicts with berkeley db.  oops.
-Patch16:        perl-5.8.0-nondbm.patch
+# Patch16:        perl-5.8.0-nondbm.patch
 
 # make sure we get the proper ldflags on libperl.so
 Patch17:        perl-5.8.0-sharedlinker.patch
@@ -76,35 +77,37 @@
 # perl 5.8.0 likes to use man3ext for BOTH directories AND files.  not kosher.
 # Patch18:        perl-5.8.0-manext.patch
 
-# lynx is depracated, use links instead
-Patch19:        perl-5.8.0-links.patch
+# lynx is deprecated, use links instead
+Patch19:        perl-5.8.8-links.patch
 
 # work around annoying rpath issue
-Patch21:        perl-5.8.0-rpath-make.patch
+Patch21:        perl-5.8.8-rpath-make.patch
 
 # bugzilla 101767, make sure threads.so links directly to -lpthread
-Patch22:        perl-5.8.1-lpthread-link.patch
+# Patch22:        perl-5.8.1-lpthread-link.patch
 
-# fix empty RPATH security issue
-Patch24:        perl-5.8.3-empty-rpath.patch
+# fix empty RPATH security issue      (now fixed with USE_MM_LD_RUN_PATH patch )
+# Patch24:        perl-5.8.3-empty-rpath.patch
 
 # CAN-2004-0452 fix                   (now in 5.8.7!)
-Patch26:        perl-5.8.0-rmtree.patch
+# Patch26:        perl-5.8.0-rmtree.patch
 
 # CAN-2005-0155 and CAN-2005-0156 fix (now in 5.8.7!)
-Patch27:        perl-5.8.5-CAN-2005-0155+0156.patch
+# Patch27:        perl-5.8.5-CAN-2005-0155+0156.patch
 
-# bugzilla 118877, 127023
-Patch28:        perl-5.8.6-findbin-selinux.patch
+# bugzilla 118877, 127023             (now in 5.8.8!)
+# Patch28:        perl-5.8.6-findbin-selinux.patch
 
 # Update the core module version (matching the external package perl-Filter-Simple)
-Patch30:        perl-5.8.6-filter-simple-update.patch
+# (now 0.82 in 5.8.8)
+# Patch30:        perl-5.8.6-filter-simple-update.patch
 
 # Disable -DDEBUGGING and allow -g to do its job (#156113)
 Patch31:        perl-5.8.7-no-debugging.patch
 
 # Fix for bug 171111: missing IOCPARM_LEN
-Patch32:        perl-5.8.7-IOC_SIZE.patch
+# (now in 5.8.8!)
+# Patch32:        perl-5.8.7-IOC_SIZE.patch
 
 # arch-specific patches
 Patch100:       perl-5.8.1-fpic.patch
@@ -114,28 +117,33 @@
 
 Patch32003:     perl-5.8.6-libresolv.patch
 
-Patch172236:    perl-5.8.7-bz172236.patch
+# now in 5.8.8:
+# Patch172236:    perl-5.8.7-bz172236.patch
 
 # fix for bug 163958 / upstream bug 37056 :
-# backport of perl-5.9's patch 25084 :
+# backport of perl-5.9's patch 25084 (bug still in 5.8.8!):
 Patch25084:     perl-5.8.7-25084.patch
 
 Patch172396:	perl-5.8.7-172396.patch
 
-Patch172587:    perl-5.8.7-bz172587.patch
+# now in 5.8.8:
+# Patch172587:    perl-5.8.7-bz172587.patch
 
-Patch040976:	perl-5.8.7-CAN-2004-0976.patch
+Patch040976:	perl-5.8.8-CAN-2004-0976.patch
 
-Patch172739:    perl-5.8.7-bz172739_obz36521.patch
+# now in 5.8.8:
+# Patch172739:    perl-5.8.7-bz172739_obz36521.patch
 
-Patch136009:    perl-5.8.7-MM_Unix-rpath-136009.patch
+#Patch136009:     perl-5.8.7-MM_Unix-rpath-136009.patch
 
-Patch174684:	perl-5.8.7-CVE-2005-3962-bz174684.patch
+# now in 5.8.8:
+#Patch174684:	perl-5.8.7-CVE-2005-3962-bz174684.patch
 
-Patch1360090:  	perl-5.8.7-USE_MM_LD_RUN_PATH.patch
+Patch1360090:    perl-5.8.8-USE_MM_LD_RUN_PATH.patch
 
 # module updatesd
 # Patch202:       perl-5.8.0-Safe2.09.patch
+Patch178343:	perl-5.8.8-bz178343.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
@@ -213,6 +221,7 @@
 Obsoletes: perl-Filter
 Obsoletes: perl-Filter-Simple
 Obsoletes: perl-Time-HiRes
+Obsoletes: perl-Test-Builder-Tester
 
 %define __perl_requires %{SOURCE11}
 
@@ -259,49 +268,54 @@
 %patch17 -p1
 
 %patch19 -p1
+
 %patch21 -p1
-%patch24 -p1
+# %patch24 -p1
 
 # perl 5.8.7: reject
 # %patch26 -p1
 # perl 5.8.7: Already in ?
 # %patch27 -p0
-%patch28 -p1
+# %patch28 -p1
 
-%patch30 -p1
+# %patch30 -p1
 
 %if !%{perl_debugging}
 %patch31 -p1
 %endif
 
-%patch32 -p1
+# %patch32 -p1
 
 %patch100 -p1
+
 %ifarch %{multilib_64_archs}
 %patch101 -p1
 %endif
 
 %patch32002 -p1
+
 %patch32003 -p1
 
-%patch172236 -p1
+# %patch172236 -p1
 
 %patch25084 -p1
 
 %patch172396 -p1
 
-%patch172587 -p1
+# %patch172587 -p1
 
 %patch040976 -p1
 
-%patch172739 -p1
+# %patch172739 -p1
 
-%patch136009 -p1
+# %patch136009 -p1
 
-%patch174684 -p1
+# %patch174684 -p1
 
 %patch1360090 -p1
 
+%patch178343 -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()
@@ -509,9 +523,19 @@
 %{_bindir}/sperl%{perlver}
 %endif
 
-
 %changelog
-* Wed Dec 14 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.6.7-8.1
+* Wed Feb 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1
+- Upgrade to new upstream release 5.8.8, officially released today
+
+* Tue Jan 31 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.8-0.1_RC1
+- fix bug 178343: h2ph must include cpp "predefined macros" in _h2ph_pre.ph
+- Add perl(:MODULE_COMPAT_5.8.8) to Provides
+- Fix perlbug patch
+
+* Fri Jan 20 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.8-0_RC1
+- Upgrade to new upstream release candidate 5.8.8-RC1
+
+* Wed Dec 14 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-8.1
 - Updated upstream patches for CVE-2005-3962: 26322 , 26331, 26333
 
 * Thu Dec 08 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.7-8



From fedora-cvs-commits at redhat.com  Wed Feb  1 18:59:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 13:59:27 -0500
Subject: rpms/perl/devel perl-5.8.8-links.patch,1.2,1.3
Message-ID: <200602011859.k11IxRU8009595@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-5.8.8-links.patch 
Log Message:
re-base to 5.8.8

perl-5.8.8-links.patch:
 CPAN.pm           |   22 +++++++++++-----------
 CPAN/FirstTime.pm |    2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

Index: perl-5.8.8-links.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl-5.8.8-links.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-5.8.8-links.patch	1 Feb 2006 15:55:58 -0000	1.2
+++ perl-5.8.8-links.patch	1 Feb 2006 18:59:24 -0000	1.3
@@ -1,22 +1,90 @@
---- perl-5.8.8-RC1/lib/CPAN/FirstTime.pm.links	2006-01-05 12:37:39.000000000 -0500
-+++ perl-5.8.8-RC1/lib/CPAN/FirstTime.pm	2006-01-20 14:57:13.000000000 -0500
-@@ -326,7 +326,7 @@
+--- perl-5.8.8/lib/CPAN/FirstTime.pm.links	2006-01-30 16:08:57.000000000 -0500
++++ perl-5.8.8/lib/CPAN/FirstTime.pm	2006-02-01 11:08:12.000000000 -0500
+@@ -292,7 +292,7 @@
+     my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'};
      local $^W = $old_warn;
      my $progname;
-     for $progname (qw/bzip2 gzip tar unzip make
--                      curl lynx wget ncftpget ncftp ftp
-+                      curl links wget ncftpget ncftp ftp
-                       gpg/)
-     {
+-    for $progname (qw/gzip tar unzip make lynx wget ncftpget ncftp ftp gpg/){
++    for $progname (qw/gzip tar unzip make links wget ncftpget ncftp ftp gpg/){
        if ($^O eq 'MacOS') {
---- perl-5.8.8-RC1/lib/CPAN.pm.links	2006-01-05 12:37:39.000000000 -0500
-+++ perl-5.8.8-RC1/lib/CPAN.pm	2006-01-20 14:55:51.000000000 -0500
-@@ -2607,7 +2607,7 @@
+           $CPAN::Config->{$progname} = 'not_here';
+           next;
+--- perl-5.8.8/lib/CPAN.pm.links	2006-01-31 09:11:22.000000000 -0500
++++ perl-5.8.8/lib/CPAN.pm	2006-02-01 11:06:01.000000000 -0500
+@@ -2604,7 +2604,7 @@
+ 
+ 	$self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG;
+ 	my($f,$funkyftp);
+-	for $f ('lynx','ncftpget','ncftp','wget') {
++	for $f ('links','ncftpget','ncftp','wget') {
+ 	  next unless exists $CPAN::Config->{$f};
+ 	  $funkyftp = $CPAN::Config->{$f};
+ 	  next unless defined $funkyftp;
+@@ -2613,7 +2613,7 @@
+ 	  ($asl_ungz = $aslocal) =~ s/\.gz//;
+           $asl_gz = "$asl_ungz.gz";
+ 	  my($src_switch) = "";
+-	  if ($f eq "lynx"){
++	  if ($f eq "links"){
+ 	    $src_switch = " -source";
+ 	  } elsif ($f eq "ncftp"){
+ 	    $src_switch = " -c";
+@@ -2637,8 +2637,8 @@
  	  my($wstatus);
  	  if (($wstatus = system($system)) == 0
  	      &&
 -	      ($f eq "lynx" ?
+-	       -s $asl_ungz # lynx returns 0 when it fails somewhere
 +	      ($f eq "links" ?
- 	       -s $asl_ungz # lynx returns 0 when it fails somewhere
++	       -s $asl_ungz # links returns 0 when it fails somewhere
  	       : 1
  	      )
+ 	     ) {
+@@ -2695,7 +2695,7 @@
+ });
+ 	  }
+           return if $CPAN::Signal;
+-	} # lynx,ncftpget,ncftp
++	} # links,ncftpget,ncftp
+     } # host
+ }
+ 
+@@ -6022,7 +6022,7 @@
+ 
+ The CPAN module is designed to automate the make and install of perl
+ modules and extensions. It includes some primitive searching capabilities and
+-knows how to use Net::FTP or LWP (or lynx or an external ftp client)
++knows how to use Net::FTP or LWP (or links or an external ftp client)
+ to fetch the raw data from the net.
+ 
+ Modules are fetched from one or more of the mirrored CPAN
+@@ -6683,7 +6683,7 @@
+ associated with a URL that is not C<ftp:>.
+ 
+ If you have neither Net::FTP nor LWP, there is a fallback mechanism
+-implemented for an external ftp command or for an external lynx
++implemented for an external ftp command or for an external links
+ command.
+ 
+ =head2 Finding packages and VERSION
+@@ -6975,16 +6975,16 @@
+ 
+ =back
+ 
+-=head2 Configuring lynx or ncftp for going through a firewall
++=head2 Configuring links or ncftp for going through a firewall
+ 
+-If you can go through your firewall with e.g. lynx, presumably with a
++If you can go through your firewall with e.g. links, presumably with a
+ command such as
+ 
+-    /usr/local/bin/lynx -pscott:tiger
++    /usr/local/bin/links -pscott:tiger
+ 
+ then you would configure CPAN.pm with the command
+ 
+-    o conf lynx "/usr/local/bin/lynx -pscott:tiger"
++    o conf links "/usr/local/bin/links -pscott:tiger"
+ 
+ That's all. Similarly for ncftp or ftp, you would configure something
+ like



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:00:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:00:54 -0500
Subject: rpms/gnome-python2-extras/FC-4 gnome-python-extras.spec,1.8,1.9
Message-ID: <200602011900.k11J0scm009672@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9656

Modified Files:
	gnome-python-extras.spec 
Log Message:
- exclude the build requires for nautilus cd burner on s390 and s390x



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-python-extras.spec	1 Feb 2006 18:45:17 -0000	1.8
+++ gnome-python-extras.spec	1 Feb 2006 19:00:52 -0000	1.9
@@ -33,7 +33,11 @@
 BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
 BuildRequires: libwnck-devel >= %{libwnck_version}
 BuildRequires: libgtop2-devel >= %{libgtop_version}
+
+%ifnarch s390 s390x
 BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
+%endif
+
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
 %ifnarch ppc64
 BuildRequires: mozilla-devel >= %{mozilla_version}
@@ -246,6 +250,7 @@
 %changelog
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-3
 - Add focus patch to fix bug #162419
+- exclude the build requires for nautilus cd burner on s390 and s390x
 
 * Mon Mar 28 2005 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-2.1
 - Retag and rebuild



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:06:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:06:49 -0500
Subject: rpms/gnome-python2-extras/FC-4 gnome-python-extras.spec,1.9,1.10
Message-ID: <200602011906.k11J6nQd009872@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9862

Modified Files:
	gnome-python-extras.spec 
Log Message:
- Bump and rebuild



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-python-extras.spec	1 Feb 2006 19:00:52 -0000	1.9
+++ gnome-python-extras.spec	1 Feb 2006 19:06:46 -0000	1.10
@@ -13,7 +13,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.10.0
-Release: 3 
+Release: 4 
 License: GPL/LGPL
 Group: Development/Languages
 Source0: gnome-python-extras-%{version}.tar.bz2
@@ -248,6 +248,9 @@
 
 
 %changelog
+* Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-4
+- Bump and rebuild
+
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-3
 - Add focus patch to fix bug #162419
 - exclude the build requires for nautilus cd burner on s390 and s390x



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:16:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:16:19 -0500
Subject: rpms/gnome-python2-extras/FC-4 gnome-python-extras.spec,1.10,1.11
Message-ID: <200602011916.k11JGJx3012087@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10299

Modified Files:
	gnome-python-extras.spec 
Log Message:
- Remove the totem playlist parser since we didn't build them
  in previous releases



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-python-extras.spec	1 Feb 2006 19:06:46 -0000	1.10
+++ gnome-python-extras.spec	1 Feb 2006 19:16:16 -0000	1.11
@@ -13,7 +13,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.10.0
-Release: 4 
+Release: 5 
 License: GPL/LGPL
 Group: Development/Languages
 Source0: gnome-python-extras-%{version}.tar.bz2
@@ -173,6 +173,7 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/gtk-2.0/totem
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -248,6 +249,10 @@
 
 
 %changelog
+* Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-5
+- Remove the totem playlist parser since we didn't build them
+  in previous releases
+
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-4
 - Bump and rebuild
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:23:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:23:56 -0500
Subject: rpms/gnome-python2-extras/FC-4 gnome-python-extras.spec,1.11,1.12
Message-ID: <200602011923.k11JNumK023068@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23055

Modified Files:
	gnome-python-extras.spec 
Log Message:
- remove nautilus cd burner subpackages from the s390 and s390x archs
  since we don't build ncd on those archs



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-python-extras.spec	1 Feb 2006 19:16:16 -0000	1.11
+++ gnome-python-extras.spec	1 Feb 2006 19:23:54 -0000	1.12
@@ -125,7 +125,7 @@
 This module contains a wrapper that allows the use of recent files
 and tray icons 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
@@ -135,7 +135,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-gtkspell
 Requires: %{name} = %{version}-%{release}
@@ -228,13 +228,13 @@
 %defattr(644,root,root,755)
 %doc examples/egg/*
 
-
+%ifnarch s390 s390x
 %files -n gnome-python2-nautilus-cd-burner
 %defattr(-,root,root,-)
 %{_libdir}/python?.?/site-packages/gtk-2.0/nautilusburn.so
 %defattr(644,root,root,755)
 %doc examples/nautilusburn/*
-
+%endif
 
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)
@@ -252,6 +252,8 @@
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-5
 - Remove the totem playlist parser since we didn't build them
   in previous releases
+- remove nautilus cd burner subpackages from the s390 and s390x archs
+  since we don't build ncd on those archs
 
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-4
 - Bump and rebuild



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:24:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:24:03 -0500
Subject: rpms/python-sqlite/devel pysqlite-sqlite-prepare-nbytes.patch, NONE,
	1.1 python-sqlite.spec, 1.3, 1.4
Message-ID: <200602011924.k11JO3bN023139@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	python-sqlite.spec 
Added Files:
	pysqlite-sqlite-prepare-nbytes.patch 
Log Message:
Fix pysqlite for nbytes implementation

pysqlite-sqlite-prepare-nbytes.patch:
 _sqlite.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pysqlite-sqlite-prepare-nbytes.patch ---
--- ./_sqlite.c.nbytes	2006-02-01 14:09:47.000000000 -0500
+++ ./_sqlite.c	2006-02-01 14:09:55.000000000 -0500
@@ -1063,7 +1063,7 @@
     {
         db = con->p_db;
         MY_BEGIN_ALLOW_THREADS(con->tstate)
-        rc = sqlite3_prepare(db, tail, 0, &statement, &tail);
+        rc = sqlite3_prepare(db, tail, -1, &statement, &tail);
         MY_END_ALLOW_THREADS(con->tstate)
 
         if (rc != SQLITE_OK)


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-sqlite.spec	1 Feb 2006 16:39:18 -0000	1.3
+++ python-sqlite.spec	1 Feb 2006 19:24:01 -0000	1.4
@@ -3,11 +3,12 @@
 Summary: Python bindings for sqlite.
 Name: python-sqlite
 Version: 1.1.6
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Libraries
 URL: http://pysqlite.sf.net/
 Source: http://dl.sf.net/pysqlite/pysqlite-%{version}.tar.gz
+Patch0: pysqlite-sqlite-prepare-nbytes.patch
 Obsoletes: python-sqlite3
 BuildRequires: python-devel, sqlite-devel 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q -n pysqlite
+%patch0 -p0 -b .nbytes
 rm -f doc/rest/.*swp
 
 %build
@@ -26,10 +28,6 @@
 rm -rf ${RPM_BUILD_ROOT}
 python ./setup.py install --prefix="${RPM_BUILD_ROOT}/%{_prefix}"
 
-%check
-cd test
-python all_tests.py || :
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -39,6 +37,10 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Feb 01 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.6-3
+- Pass valid parameter to prepare (#179547)
+- Temporarily remove %%check
+
 * Wed Feb 01 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.6-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:27:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:27:02 -0500
Subject: rpms/gnome-python2-extras/FC-4 gnome-python-extras.spec,1.12,1.13
Message-ID: <200602011927.k11JR2fe032408@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32346

Modified Files:
	gnome-python-extras.spec 
Log Message:
- something is wrong with force-tag so we need to bump the release
  and retag



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-4/gnome-python-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-python-extras.spec	1 Feb 2006 19:23:54 -0000	1.12
+++ gnome-python-extras.spec	1 Feb 2006 19:27:00 -0000	1.13
@@ -13,7 +13,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.10.0
-Release: 5 
+Release: 6 
 License: GPL/LGPL
 Group: Development/Languages
 Source0: gnome-python-extras-%{version}.tar.bz2
@@ -249,6 +249,10 @@
 
 
 %changelog
+* Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-6
+- something is wrong with force-tag so we need to bump the release
+  and retag
+
 * Wed Feb 01 2006 John (J5) Palmieri <johnp at redhat.com> - 2.10.0-5
 - Remove the totem playlist parser since we didn't build them
   in previous releases



From fedora-cvs-commits at redhat.com  Wed Feb  1 19:32:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 14:32:33 -0500
Subject: rpms/kdegraphics/FC-4 kdegraphics-3.5.1-kpdf.patch, NONE,
	1.1 .cvsignore, 1.26, 1.27 kdegraphics.spec, 1.52,
	1.53 sources, 1.28,
	1.29 post-3.5.0-kdegraphics-CAN-2005-3193.diff, 1.1, NONE
Message-ID: <200602011932.k11JWXHQ001399@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.1-kpdf.patch 
Removed Files:
	post-3.5.0-kdegraphics-CAN-2005-3193.diff 
Log Message:
- apply kdegraphics-3.5.1-kpdf.patch to fix (kde #120674)
- update to 3.5.1
- ger rid of post-3.5.0-kdegraphics-CAN-2005-3193.diff which already included in new upstream


kdegraphics-3.5.1-kpdf.patch:
 part.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdegraphics-3.5.1-kpdf.patch ---
--- kdegraphics-3.5.1/kpdf/part.cpp.orig	2006-02-01 20:15:41.000000000 +0100
+++ kdegraphics-3.5.1/kpdf/part.cpp	2006-02-01 20:17:38.000000000 +0100
@@ -697,6 +697,11 @@
     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
     if ( saveURL.isValid() && !saveURL.isEmpty() )
     {
+        if (saveURL == url())
+  	         {
+  	             KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
+  	             return;
+  	         }
         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
         {
             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	16 Jun 2005 09:11:47 -0000	1.26
+++ .cvsignore	1 Feb 2006 19:32:00 -0000	1.27
@@ -5,3 +5,4 @@
 kdegraphics-3.4.0-rc1.tar.bz2
 kdegraphics-3.4.0.tar.bz2
 kdegraphics-3.4.1.tar.bz2
+kdegraphics-3.5.1.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdegraphics.spec	16 Jan 2006 15:53:20 -0000	1.52
+++ kdegraphics.spec	1 Feb 2006 19:32:17 -0000	1.53
@@ -12,8 +12,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 0.2.fc4
+Version: 3.5.1
+Release: 0.1.fc4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -27,8 +27,8 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 
-# securitiy fixes
-Patch100: post-3.5.0-kdegraphics-CAN-2005-3193.diff
+# upstream fixes
+Patch50: kdegraphics-3.5.1-kpdf.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -265,8 +265,7 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 
-# security fixes
-%patch100 -p0 -b .CAN-2005-3193
+%patch50 -p1 -b .kpdf
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -278,13 +277,6 @@
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -297,14 +289,23 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
    --includedir=/usr/include/kde \
    --with-xinerama \
 %ifnarch %{no_scanner_archs}
@@ -363,6 +364,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
+- 3.5.1
+
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 7:3.5.0-0.2.fc4
 - final fix for CAN-2005-3193
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	16 Jan 2006 16:10:41 -0000	1.28
+++ sources	1 Feb 2006 19:32:17 -0000	1.29
@@ -1 +1 @@
-389a00d4387e621d4dd325a59c7657c4  kdegraphics-3.5.0.tar.bz2
+2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2


--- post-3.5.0-kdegraphics-CAN-2005-3193.diff DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:01:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:01:29 -0500
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.116,1.117
Message-ID: <200602012001.k11K1Toj025813@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25716

Modified Files:
	redhat-artwork.spec 
Log Message:
- create symlinks from redhat artwork to gnome overrides



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- redhat-artwork.spec	24 Jan 2006 20:35:12 -0000	1.116
+++ redhat-artwork.spec	1 Feb 2006 20:01:15 -0000	1.117
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.235
-Release: 1
+Release: 2
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -22,6 +22,7 @@
 Conflicts: gnome-session <= 2.0.1-3
 Conflicts: kdebase <= 6:3.0.3-1
 Conflicts: gdm <= 2.6.0.8-5
+Conflicts: redhat-menus < 5.5.5
 # we don't want to require gtk/qt
 Autoreq: 0
 
@@ -95,7 +96,8 @@
 #this should be added to our upstream sources
 cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/apps
 
-#link open office icons to the redhat ones in bluecurve
+# link upstream icon names to the redhat ones in bluecurve
+# FIXME: the ones with -sf need to be removed upstream
 for d in 48x48 32x32 24x24 16x16; do
   cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/$d/apps
   ln -s icon-db-user.png openofficeorg-base.png
@@ -104,11 +106,21 @@
   ln -s redhat-presentations.png openofficeorg-impress.png
   ln -s icon-calculator.png openofficeorg-math.png
   ln -s redhat-word-processor.png openofficeorg-writer.png
+  ln -s redhat-accessories.png gnome-util.png
+  ln -sf redhat-programming.png gnome-devel.png
+  ln -sf redhat-games.png gnome-joystick.png
+  ln -s redhat-graphics.png gnome-graphics.png
+  ln -sf redhat-internet.png gnome-globe.png
+  ln -sf redhat-sound_video.png gnome-multimedia.png
+  ln -sf redhat-office.png gnome-applications.png
+  ln -sf redhat-preferences.png gnome-settings.png
+  ln -sf redhat-system_settings.png gnome-system.png
 done
 
 cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems
 ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -142,6 +154,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Mon Jan 30 2006 Ray Strode <rstrode at redhat.com> 0.235-2
+- create symlinks from redhat artwork to gnome overrides
+
 * Tue Jan 24 2006 Christopher Aillon <caillon at redhat.com> 0.235-1
 - Update to 0.235 to get new language icon in GDM/KDM
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:16:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:16:27 -0500
Subject: rpms/kernel/devel/configs config-generic,1.140,1.141
Message-ID: <200602012016.k11KGRNb004558@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
test build




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- config-generic	1 Feb 2006 18:45:17 -0000	1.140
+++ config-generic	1 Feb 2006 20:16:25 -0000	1.141
@@ -2449,9 +2449,9 @@
 # CONFIG_DEBUG_RODATA is not set
 
 # Turn off these debug options for production kernels.
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_VM is not set
 CONFIG_KMALLOC_ACCOUNTING=y
 
 # CONFIG_WAKEUP_TIMING is not set



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:16:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:16:27 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1889,1.1890
Message-ID: <200602012016.k11KGRc2004553@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
test build




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1889
retrieving revision 1.1890
diff -u -r1.1889 -r1.1890
--- kernel-2.6.spec	1 Feb 2006 18:45:17 -0000	1.1889
+++ kernel-2.6.spec	1 Feb 2006 20:16:24 -0000	1.1890
@@ -156,7 +156,8 @@
 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
+ExclusiveArch: noarch %{all_x86}
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:17:10 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1890,1.1891
Message-ID: <200602012017.k11KHAIC010765@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
undo



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1890
retrieving revision 1.1891
diff -u -r1.1890 -r1.1891
--- kernel-2.6.spec	1 Feb 2006 20:16:24 -0000	1.1890
+++ kernel-2.6.spec	1 Feb 2006 20:17:07 -0000	1.1891
@@ -156,8 +156,7 @@
 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}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:17:11 -0500
Subject: rpms/kernel/devel/configs config-generic,1.141,1.142
Message-ID: <200602012017.k11KHBmM010781@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
undo



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- config-generic	1 Feb 2006 20:16:25 -0000	1.141
+++ config-generic	1 Feb 2006 20:17:08 -0000	1.142
@@ -2449,9 +2449,9 @@
 # CONFIG_DEBUG_RODATA 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
 CONFIG_KMALLOC_ACCOUNTING=y
 
 # CONFIG_WAKEUP_TIMING is not set



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:28:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:28:37 -0500
Subject: rpms/kdemultimedia/FC-4 .cvsignore, 1.28, 1.29 kdemultimedia.spec,
	1.45, 1.46 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE
Message-ID: <200602012028.k11KSbX0016060@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Jun 2005 18:24:41 -0000	1.28
+++ .cvsignore	1 Feb 2006 20:28:33 -0000	1.29
@@ -4,3 +4,4 @@
 kdemultimedia-3.4.0-patched-rc1.tar.bz2
 kdemultimedia-3.4.0-patched.tar.bz2
 kdemultimedia-3.4.1-patched.tar.bz2
+kdemultimedia-3.5.1-patched.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdemultimedia.spec	16 Jun 2005 19:40:51 -0000	1.45
+++ kdemultimedia.spec	1 Feb 2006 20:28:33 -0000	1.46
@@ -1,6 +1,7 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
+%define disable_gcc_check_and_hidden_visibility 1
 
 # support mp3
 %define build_mpeglib 0
@@ -26,8 +27,8 @@
 %define patch_name -patched
 %endif
 
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -39,8 +40,7 @@
 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
-Patch3: admin-visibility.patch
-Patch4: kdemultimedia-3.4.0-xdg.patch
+Patch3: kdemultimedia-3.4.0-xdg.patch
 
 Prereq: /sbin/ldconfig
 
@@ -49,7 +49,7 @@
 
 BuildRequires: zlib-devel
 BuildRequires: XFree86-devel
-BuildRequires: kdebase-devel
+BuildRequires: kdebase-devel >= %{version}
 BuildRequires: libjpeg-devel
 BuildRequires: gcc-c++
 BuildRequires: glibc-devel
@@ -104,8 +104,7 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch1 -p1
 %patch2 -p1 -b .config
-%patch3 -p1 -b .gcc
-%patch4 -p1 -b .xdg
+%patch3 -p1 -b .xdg
 
 # remove aktion, we don't ship xanim (license problems)
 %if %{redhatify}
@@ -127,10 +126,6 @@
 export CFLAGS="$FLAGS"
 export CXXFLAGS="$FLAGS -fno-use-cxa-atexit"
 
-%if ! %{build_mpeglib}
-   export DO_NOT_COMPILE="mpeglib mpeglib_artsplug mpg123_artsplugin"
-%endif
-
 %if %{arts}
 export CFLAGS="$CFLAGS `artsc-config --cflags`"
 export CXXFLAGS="$CXXFLAGS `artsc-config --cflags`"
@@ -138,49 +133,55 @@
 export LDFLAGS="$LDFLAGS `artsc-config --libs`"
 %endif
 
-%configure --with-qt-libraries=$QTDIR/lib \
-           --disable-motif \
-           --with-motif-includes=none \
-           --with-motif-libraries=none \
-           --disable-debug \
-           --without-debug \
+%configure  \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+   --with-qt-libraries=$QTDIR/lib \
+   --disable-motif \
+   --with-motif-includes=none \
+   --with-motif-libraries=none \
+%if %{debug} == 0
+   --disable-debug \
+   --without-debug \
+   --disable-warnings \
+%endif
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{cdparanoia} == 0
-           --disable-cdparanoia \
+   --disable-cdparanoia \
 %endif
 %if %{arts} == 0
-           --without-arts \
+   --without-arts \
 %endif
 %if %{alsa}
-           --with-alsa \
-           --with-arts-alsa \
+   --with-alsa \
+   --with-arts-alsa \
 %endif
-           --disable-rpath \
-           --includedir=%{_includedir}/kde \
-           --with-xinerama \
+   --disable-rpath \
+   --includedir=%{_includedir}/kde \
+   --with-xinerama \
 %if %{final}
-           --enable-final \
+   --enable-final \
 %endif
-           --disable-xaw
+   --disable-xaw
 
-#SMP_MFLAGS=%{?_smp_mflags}
+SMP_MFLAGS=%{?_smp_mflags}
 
 make $SMP_MFLAGS
-make $SMP_MFLAGS -C doc
-make $SMP_MFLAGS -C kioslave/audiocd/kcmaudiocd
 make $SMP_MFLAGS -C kaudiocreator
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-
-make -C doc DESTDIR=$RPM_BUILD_ROOT install
-make -C kioslave/audiocd/kcmaudiocd DESTDIR=$RPM_BUILD_ROOT install
 make -C kaudiocreator DESTDIR=$RPM_BUILD_ROOT install
 
 %if %{redhatify}
   for f in $RPM_BUILD_ROOT%{appdir}/*.desktop ; do
-    echo "OnlyShowIn=KDE;" >> $f
+    if [ -f $RPM_BUILD_ROOT%{appdir}/*.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> $f
+    fi
   done
 %endif
 
@@ -224,8 +225,8 @@
 %doc %{_docdir}/HTML/en/juk
 %endif
 %doc %{_docdir}/HTML/en/kaboodle
-%doc %{_docdir}/HTML/en/kcontrol
-%doc %{_docdir}/HTML/en/kio_audiocd
+%doc %{_docdir}/HTML/en/kdemultimedia-patched-apidocs
+%doc %{_docdir}/HTML/en/kioslave
 %doc %{_docdir}/HTML/en/kmid
 %doc %{_docdir}/HTML/en/kmix
 %doc %{_docdir}/HTML/en/krec
@@ -251,6 +252,19 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Thu Dec 08 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.1.fc4
+- 3.5
+
+* Tue Aug 23 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.2
+- apply patch to fix security issue in kaudiocreator
+- apply patch to fix a bug in kio_audiocd #143810
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	16 Jun 2005 18:24:41 -0000	1.29
+++ sources	1 Feb 2006 20:28:33 -0000	1.30
@@ -1 +1 @@
-3778e9e8d727092a89e84a4ba21d7e7b  kdemultimedia-3.4.1-patched.tar.bz2
+31630864143d052b8f4342da0fa098fd  kdemultimedia-3.5.1-patched.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:53:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:53:17 -0500
Subject: rpms/expect/devel sources,1.4,1.5
Message-ID: <200602012053.k11KrHMp031031@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/expect/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31018

Modified Files:
	sources 
Log Message:
Upgraded source.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/expect/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Mar 2005 04:31:01 -0000	1.4
+++ sources	1 Feb 2006 20:53:15 -0000	1.5
@@ -1 +1 @@
-230400129630335b3060a42f66fec11d  expect-5.43.0.tar.gz
+0fe7adab383f2d9598c9cd0e790dac64  expect-5.44.1.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  1 20:57:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 15:57:07 -0500
Subject: rpms/kdeutils/FC-4 .cvsignore, 1.27, 1.28 kdeutils.spec, 1.35,
	1.36 sources, 1.27, 1.28 admin-visibility.patch, 1.3, NONE
Message-ID: <200602012057.k11Kv76L031083@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
- 3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	16 Jun 2005 08:31:59 -0000	1.27
+++ .cvsignore	1 Feb 2006 20:57:04 -0000	1.28
@@ -4,3 +4,4 @@
 kdeutils-3.4.0-rc1.tar.bz2
 kdeutils-3.4.0.tar.bz2
 kdeutils-3.4.1.tar.bz2
+kdeutils-3.5.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/kdeutils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdeutils.spec	16 Jun 2005 08:31:59 -0000	1.35
+++ kdeutils.spec	1 Feb 2006 20:57:04 -0000	1.36
@@ -1,13 +1,16 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
+%define arts 1
 
 %define redhatify 1
 
 %define qt_version 3.3.4
 
-Version: 3.4.1
-Release: 0.fc4.1
+%define disable_gcc_check_and_hidden_visibility 1
+
+Version: 3.5.1
+Release: 0.1.fc4
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -15,12 +18,11 @@
 License: GPL
 Group: Applications/System
 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
 
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
-Patch3: admin-visibility.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
@@ -237,25 +239,39 @@
 %setup -q
 %patch1 -p1 -b .label
 %patch2 -p1 -b .libtool
-%patch3 -p1 -b .gcc
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-use-cxa-atexit -fno-check-new"
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
+%if %{final}
+   --enable-final \
+%endif
+%if %{arts} == 0
+   --without-arts \
+%endif
    --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
@@ -269,7 +285,9 @@
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
          irkick kcmlirc laptop pcmcia kvaio thinkpad ; do
-   echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+   if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop ] ; then
+      echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/$i.desktop
+   fi
 done
 
 # Make symlinks relative
@@ -300,6 +318,8 @@
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/applications/kde/*
+%{_datadir}/applnk/Utilities/*
+%{_datadir}/mimelnk/application/*
 %{_datadir}/autostart/*
 
 %files devel
@@ -307,6 +327,15 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Tue Dec 13 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	16 Jun 2005 08:31:59 -0000	1.27
+++ sources	1 Feb 2006 20:57:04 -0000	1.28
@@ -1 +1 @@
-0c3ef37a96ce9f5b0b3ee5d0b31ef4e4  kdeutils-3.4.1.tar.bz2
+1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 21:04:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 16:04:23 -0500
Subject: rpms/rhythmbox/devel .cvsignore, 1.18, 1.19 rhythmbox.spec, 1.45,
	1.46 sources, 1.20, 1.21
Message-ID: <200602012104.k11L4NO5031344@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31327

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.2.cvs20060201-1
- Newer CVS snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	24 Jan 2006 05:40:01 -0000	1.18
+++ .cvsignore	1 Feb 2006 21:04:19 -0000	1.19
@@ -3,3 +3,4 @@
 rhythmbox-0.9.1.tar.bz2
 rhythmbox-0.9.2.tar.bz2
 rhythmbox-0.9.2.cvs20060123.tar.bz2
+rhythmbox-0.9.2.cvs20060201.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- rhythmbox.spec	24 Jan 2006 05:40:01 -0000	1.45
+++ rhythmbox.spec	1 Feb 2006 21:04:19 -0000	1.46
@@ -2,7 +2,7 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.2.cvs20060123
+Version: 0.9.2.cvs20060201
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -99,6 +99,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.2.cvs20060201-1
+- Newer CVS snapshot
+
 * Sun Jan 22 2006 Christopher Aillon <caillon at redhat.com> 0.9.2.cvs20060123-1
 - Update to latest CVS
 - Add hack to workaround bug #173869


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jan 2006 05:40:01 -0000	1.20
+++ sources	1 Feb 2006 21:04:19 -0000	1.21
@@ -1 +1 @@
-77cd7af2df9ef1def1fbed8aaf40ae97  rhythmbox-0.9.2.cvs20060123.tar.bz2
+86ebd183d0e635a77556b7af1a2bdab9  rhythmbox-0.9.2.cvs20060201.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  1 21:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 16:35:58 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1891,
	1.1892 linux-2.6-selinux-mprotect-checks.patch, 1.1, 1.2
Message-ID: <200602012135.k11LZwKE022980@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-selinux-mprotect-checks.patch 
Log Message:
Enable exec* checking except for execmod for ppc32 and ia64 (#178747)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1891
retrieving revision 1.1892
diff -u -r1.1891 -r1.1892
--- kernel-2.6.spec	1 Feb 2006 20:17:07 -0000	1.1891
+++ kernel-2.6.spec	1 Feb 2006 21:35:54 -0000	1.1892
@@ -1382,6 +1382,7 @@
 %changelog
 * Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
 - Woo, 2.6.16rc1-git5 (at last)
+- Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
 - Fixed an oops in the stradis driver initialisation.
 - Happy Birthday to "The Yellow Dart".
 

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-selinux-mprotect-checks.patch	27 Jan 2006 02:11:30 -0000	1.1
+++ linux-2.6-selinux-mprotect-checks.patch	1 Feb 2006 21:35:54 -0000	1.2
@@ -1,103 +1,31 @@
 
-From: Stephen Smalley <sds at tycho.nsa.gov>
 
-Fix the SELinux mprotect checks on executable mappings so that they are not
-re-applied when the mapping is already executable as well as cleaning up
-the code.  This avoids a situation where e.g.  an application is prevented
-from removing PROT_WRITE on an already executable mapping previously
-authorized via execmem permission due to an execmod denial.
-
-Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
-Acked-by: James Morris <jmorris at namei.org>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- security/selinux/hooks.c |   50 +++++++++++++++----------------------
- 1 files changed, 21 insertions(+), 29 deletions(-)
-
-diff -puN security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks security/selinux/hooks.c
---- devel/security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks	2006-01-23 16:41:27.000000000 -0800
-+++ devel-akpm/security/selinux/hooks.c	2006-01-23 16:41:27.000000000 -0800
-@@ -2452,35 +2452,27 @@ static int selinux_file_mprotect(struct 
+--- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
++++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
+@@ -2451,7 +2451,6 @@ static int selinux_file_mprotect(struct 
+ 	if (selinux_checkreqprot)
  		prot = reqprot;
  
- #ifndef CONFIG_PPC32
--	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
--	   (vma->vm_start >= vma->vm_mm->start_brk &&
--	    vma->vm_end <= vma->vm_mm->brk)) {
--	    	/*
--		 * We are making an executable mapping in the brk region.
--		 * This has an additional execheap check.
--		 */
--		rc = task_has_perm(current, current, PROCESS__EXECHEAP);
--		if (rc)
--			return rc;
--	}
--	if (vma->vm_file != NULL && vma->anon_vma != NULL && (prot & PROT_EXEC)) {
--		/*
--		 * We are making executable a file mapping that has
--		 * had some COW done. Since pages might have been written,
--		 * check ability to execute the possibly modified content.
--		 * This typically should only occur for text relocations.
--		 */
+-#ifndef CONFIG_PPC32
+ 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
+ 	   (vma->vm_start >= vma->vm_mm->start_brk &&
+ 	    vma->vm_end <= vma->vm_mm->brk)) {
+@@ -2470,7 +2469,9 @@ static int selinux_file_mprotect(struct 
+ 		 * check ability to execute the possibly modified content.
+ 		 * This typically should only occur for text relocations.
+ 		 */
 -		int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
--		if (rc)
--			return rc;
--	}
--	if (!vma->vm_file && (prot & PROT_EXEC) &&
--		vma->vm_start <= vma->vm_mm->start_stack &&
--		vma->vm_end >= vma->vm_mm->start_stack) {
--		/* Attempt to make the process stack executable.
--		 * This has an additional execstack check.
--		 */
--		rc = task_has_perm(current, current, PROCESS__EXECSTACK);
-+	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
-+		rc = 0;
-+		if (vma->vm_start >= vma->vm_mm->start_brk &&
-+		    vma->vm_end <= vma->vm_mm->brk) {
-+			rc = task_has_perm(current, current,
-+					   PROCESS__EXECHEAP);
-+		} else if (!vma->vm_file &&
-+			   vma->vm_start <= vma->vm_mm->start_stack &&
-+			   vma->vm_end >= vma->vm_mm->start_stack) {
-+			rc = task_has_perm(current, current, PROCESS__EXECSTACK);
-+		} else if (vma->vm_file && vma->anon_vma) {
-+			/*
-+			 * We are making executable a file mapping that has
-+			 * had some COW done. Since pages might have been
-+			 * written, check ability to execute the possibly
-+			 * modified content.  This typically should only
-+			 * occur for text relocations.
-+			 */
-+			rc = file_has_perm(current, vma->vm_file,
-+					   FILE__EXECMOD);
-+		}
++#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
++		rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
++#endif
  		if (rc)
  			return rc;
  	}
-_
-Index: linux-2.6/security/selinux/hooks.c
-===================================================================
-RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/hooks.c,v
-retrieving revision 1.178
-diff -u -p -r1.178 hooks.c
---- linux-2.6/security/selinux/hooks.c	19 Jan 2006 21:04:27 -0000	1.178
-+++ linux-2.6/security/selinux/hooks.c	26 Jan 2006 19:16:22 -0000
-@@ -2366,7 +2366,7 @@ static int selinux_file_ioctl(struct fil
- 
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
--#ifndef CONFIG_PPC32
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
- 	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
- 		/*
- 		 * We are making executable an anonymous mapping or a
-@@ -2424,7 +2424,7 @@ static int selinux_file_mprotect(struct 
- 	if (selinux_checkreqprot)
- 		prot = reqprot;
+@@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
+ 		if (rc)
+ 			return rc;
+ 	}
+-#endif
  
--#ifndef CONFIG_PPC32
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
- 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
- 		rc = 0;
- 		if (vma->vm_start >= vma->vm_mm->start_brk &&
+ 	return file_map_prot_check(vma->vm_file, prot, vma->vm_flags&VM_SHARED);
+ }



From fedora-cvs-commits at redhat.com  Wed Feb  1 21:51:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 16:51:09 -0500
Subject: rpms/redhat-menus/devel .cvsignore, 1.33, 1.34 redhat-menus.spec,
	1.53, 1.54 sources, 1.35, 1.36
Message-ID: <200602012151.k11Lp96e009791@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9718

Modified Files:
	.cvsignore redhat-menus.spec sources 
Log Message:
- merge /usr/local/share/applications
- ship separate directory file for System menu



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	30 Jan 2006 19:08:30 -0000	1.33
+++ .cvsignore	1 Feb 2006 21:51:06 -0000	1.34
@@ -1 +1 @@
-redhat-menus-5.5.5.tar.gz
+redhat-menus-6.5.4.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- redhat-menus.spec	30 Jan 2006 21:39:19 -0000	1.53
+++ redhat-menus.spec	1 Feb 2006 21:51:06 -0000	1.54
@@ -3,8 +3,8 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 5.5.5
-Release: 2
+Version: 6.5.4
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -67,6 +67,10 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Wed Feb 1 2006 Ray Strode <rstrode at redhat.com> - 6.5.4-1
+- merge /usr/local/share/applications
+- ship separate directory file for System menu
+
 * Mon Jan 30 2006 Ray Strode <rstrode at redhat.com> - 5.5.5-2
 - a few more tweaks needed to get pirut in toplevel applications
   menu


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	30 Jan 2006 21:47:08 -0000	1.35
+++ sources	1 Feb 2006 21:51:06 -0000	1.36
@@ -1 +1 @@
-040fb7bf0833727035c9b7c17dbf2ac8  redhat-menus-5.5.5.tar.gz
+056674603636e82e218bc713c8153bb2  redhat-menus-6.5.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:03:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:03:34 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.17, 1.18 pykickstart.spec, 1.17,
	1.18 sources, 1.18, 1.19
Message-ID: <200602012203.k11M3YLd014267@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14236

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	31 Jan 2006 21:44:01 -0000	1.17
+++ .cvsignore	1 Feb 2006 22:03:30 -0000	1.18
@@ -6,3 +6,4 @@
 pykickstart-0.14.tar.gz
 pykickstart-0.15.tar.gz
 pykickstart-0.16.tar.gz
+pykickstart-0.17.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pykickstart.spec	31 Jan 2006 21:44:01 -0000	1.17
+++ pykickstart.spec	1 Feb 2006 22:03:30 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.16
+Version: 0.17
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,9 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Wed Feb 01 2006 Chris Lumens <clumens at redhat.com> 0.17-1
+- Don't set a default port for vnc.
+
 * Tue Jan 31 2006 Chris Lumens <clumens at redhat.com> 0.16-1
 - Give dmraid string an initial value.
 - Handle None on partition size.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Jan 2006 21:44:01 -0000	1.18
+++ sources	1 Feb 2006 22:03:30 -0000	1.19
@@ -1 +1 @@
-3b7a878e4c9a62849f6fc0e51ee8db51  pykickstart-0.16.tar.gz
+4003f52868ed737bddc1f38bfbada767  pykickstart-0.17.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:09:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:09:57 -0500
Subject: rpms/kdesdk/FC-4 kdesdk-3.4.92-misc.patch, NONE, 1.1 .cvsignore,
	1.25, 1.26 kdesdk.spec, 1.38, 1.39 sources, 1.25,
	1.26 admin-visibility.patch, 1.3, NONE kdesdk-3.4.0-cast.patch,
	1.1, NONE
Message-ID: <200602012209.k11M9vZ0015948@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdesdk.spec sources 
Added Files:
	kdesdk-3.4.92-misc.patch 
Removed Files:
	admin-visibility.patch kdesdk-3.4.0-cast.patch 
Log Message:
3.5.1


kdesdk-3.4.92-misc.patch:
 ktrace.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdesdk-3.4.92-misc.patch ---
--- kdesdk-3.4.92/kmtrace/ktrace.c.orig	2005-11-11 09:33:56.000000000 +0100
+++ kdesdk-3.4.92/kmtrace/ktrace.c	2005-11-11 10:47:38.000000000 +0100
@@ -344,7 +344,7 @@
 		tr_cache[i].bt = (void**) malloc(TR_BT_SIZE * sizeof(void*));
 		tr_cache[i].bt_size = backtrace(
 			tr_cache[i].bt, TR_BT_SIZE);
-		realloc(tr_cache[i].bt, tr_cache[i].bt_size * sizeof(void*));
+		tr_cache[i].bt= (void**) realloc(tr_cache[i].bt, tr_cache[i].bt_size * sizeof(void*));
 		tr_cache_level++;
 
 		return;
@@ -469,6 +469,9 @@
 	__malloc_hook = tr_mallochook;
 	__realloc_hook = tr_reallochook;
 
+	if (hdr == NULL)
+    return NULL;
+
 #ifdef PROFILE
 	/* If ptr is 0 there was no previos malloc of this location */
 	if (ptr == NULL)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	16 Jun 2005 13:31:58 -0000	1.25
+++ .cvsignore	1 Feb 2006 22:09:53 -0000	1.26
@@ -4,3 +4,4 @@
 kdesdk-3.4.0-rc1.tar.bz2
 kdesdk-3.4.0.tar.bz2
 kdesdk-3.4.1.tar.bz2
+kdesdk-3.5.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/kdesdk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdesdk.spec	16 Jun 2005 13:31:58 -0000	1.38
+++ kdesdk.spec	1 Feb 2006 22:09:53 -0000	1.39
@@ -8,20 +8,21 @@
 
 %define appdir %{_datadir}/applications/kde
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Name: kdesdk
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
 Group: User Interface/Desktops
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 Patch2: kdesdk-3.4.0-db4.patch
-Patch3: admin-visibility.patch
+Patch3: kdesdk-3.4.92-misc.patch
 
 Prereq: /sbin/ldconfig
 
@@ -40,7 +41,7 @@
 Summary: Development files for kdesdk
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel => %{version}
+Requires: kdelibs-devel => 6:%{version}
 Requires: xorg-x11-devel
 
 %description devel
@@ -85,7 +86,12 @@
 Group: Applications/Multimedia
 
 %description gimp
-The standard KDE palette in GIMP format. This allows you to create/edit
+The standard K
+
+
+
+
+DE palette in GIMP format. This allows you to create/edit
 low-color KDE icons using the GIMP.
 
 %package kapptemplate
@@ -131,7 +137,7 @@
 %setup -q
 %patch1 -p1 -b .libtool
 %patch2 -p1 -b .db4
-%patch3 -p1 -b .gcc
+%patch3 -p1 -b .misc
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -146,7 +152,16 @@
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -206,6 +221,7 @@
 %{_libdir}/kde3/*
 %{_libdir}/*.so*
 %{_libdir}/*.la
+%{_libdir}/*.a
 %{_datadir}/apps/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
@@ -223,6 +239,15 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 2:3.5.1-0.1.fc4
+- 3.5.1
+
+* Thu Dec 08 2005 Than Ngo <than at redhat.com> 2:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Jun 2005 13:31:58 -0000	1.25
+++ sources	1 Feb 2006 22:09:53 -0000	1.26
@@ -1 +1 @@
-b7073f0f4ac7efe4d6ff33c1ba527668  kdesdk-3.4.1.tar.bz2
+93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdesdk-3.4.0-cast.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:10:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:10:41 -0500
Subject: rpms/rhpxl/devel .cvsignore, 1.15, 1.16 rhpxl.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <200602012210.k11MAfmS016353@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16202

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Jan 2006 21:35:49 -0000	1.15
+++ .cvsignore	1 Feb 2006 22:10:38 -0000	1.16
@@ -1,3 +1,4 @@
 rhpxl-0.10.tar.gz
 rhpxl-0.11.tar.gz
 rhpxl-0.12.tar.gz
+rhpxl-0.13.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rhpxl.spec	24 Jan 2006 21:35:49 -0000	1.17
+++ rhpxl.spec	1 Feb 2006 22:10:38 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.12
+Version: 0.13
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Feb 01 2006 Chris Lumens <clumens at redhat.com> 0.13-1
+- Add aspect ratio patch from Jef Spaleta <jspaleta AT gmail.com> (#158143).
+
 * Tue Jan 24 2006 Chris Lumens <clumens at redhat.com> 0.12-1
 - Protect against an empty list of probed mice (#178515).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	24 Jan 2006 21:35:49 -0000	1.17
+++ sources	1 Feb 2006 22:10:38 -0000	1.18
@@ -1 +1 @@
-43a6ecee0b88a15cc85cf3f70e507784  rhpxl-0.12.tar.gz
+34d8b74f9cf4ee9fdd978e69d5b6a4af  rhpxl-0.13.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:21:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:21:13 -0500
Subject: rpms/expect/devel sources,1.5,1.6
Message-ID: <200602012221.k11MLDFl000979@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/expect/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv863

Modified Files:
	sources 
Log Message:
Make sure we reference the 5.43.0 source until 5.44.x is building.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/expect/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Feb 2006 20:53:15 -0000	1.5
+++ sources	1 Feb 2006 22:21:11 -0000	1.6
@@ -1 +1 @@
-0fe7adab383f2d9598c9cd0e790dac64  expect-5.44.1.tar.gz
+230400129630335b3060a42f66fec11d  expect-5.43.0.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:21:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:21:17 -0500
Subject: rpms/kernel-xen/devel linux-2.6-net-fix-iptables.patch, NONE,
	1.1.2.1 linux-2.6-net-slab-corruption.patch, NONE,
	1.1.2.1 kernel-xen.spec, 1.33, 1.33.2.1
Message-ID: <200602012221.k11MLHNx001010@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
      Tag: private-sct-2_6_15-1_33_FC5-branch
	kernel-xen.spec 
Added Files:
      Tag: private-sct-2_6_15-1_33_FC5-branch
	linux-2.6-net-fix-iptables.patch 
	linux-2.6-net-slab-corruption.patch 
Log Message:
Subject: [PATCH] two must-have networking fixes.
From: davej <davej>



linux-2.6-net-fix-iptables.patch:
 x_tables.h |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-net-fix-iptables.patch ---
[NETFILTER] x_tables: Fix XT_ALIGN() macro on [at least] ppc32

To keep backwards compatibility with old iptables userspace programs,
the new XT_ALIGN macro always has to return the same value as IPT_ALIGN,
IP6T_ALIGN or ARPT_ALIGN in previous kernels.

However, in those kernels the macro was defined in dependency to the
respective layer3 specifi data structures, which we can no longer do with
x_tables.

The fix is an ugly kludge, but it has been tested to solve the problem. Yet
another reason to move away from the current {ip,ip6,arp,eb}tables like
data structures.

Signed-off-by: Harald Welte <laforge at netfilter.org>

---
commit 470faeb379560fe877b685ca69be6a7e4f0e91ed
tree 5732ecd9bcab28469805752514e5c57ba26189a1
parent 44718bbfa186d58477163418d37df173aa2dd079
author Harald Welte <laforge at netfilter.org> Fri, 20 Jan 2006 01:44:24 +0100
committer Harald Welte <laforge at netfilter.org> Fri, 20 Jan 2006 01:44:24 +0100

 include/linux/netfilter/x_tables.h |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 472f048..65f9cd8 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -19,8 +19,22 @@ struct xt_get_revision
 /* For standard target */
 #define XT_RETURN (-NF_REPEAT - 1)
 
-#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1))
 
+/* this is a dummy structure to find out the alignment requirement for a struct
+ * containing all the fundamental data types that are used in ipt_entry, ip6t_entry
+ * and arpt_entry.  This sucks, and it is a hack.  It will be my personal pleasure
+ * to remove it -HW */
+struct _xt_align
+{
+	u_int8_t u8;
+	u_int16_t u16;
+	u_int32_t u32;
+	u_int64_t u64;
+};
+
+#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) 	\
+			& ~(__alignof__(struct _xt_align)-1))
+ 
 /* Standard return verdict, or do jump. */
 #define XT_STANDARD_TARGET ""
 /* Error verdict. */

linux-2.6-net-slab-corruption.patch:
 skbuff.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-net-slab-corruption.patch ---
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -135,13 +135,15 @@ void skb_under_panic(struct sk_buff *skb
 struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
 			    int fclone)
 {
+	kmem_cache_t *cache;
 	struct skb_shared_info *shinfo;
 	struct sk_buff *skb;
 	u8 *data;
 
+	cache = fclone ? skbuff_fclone_cache : skbuff_head_cache;
+
 	/* Get the HEAD */
-	skb = kmem_cache_alloc(fclone ? skbuff_fclone_cache : skbuff_head_cache,
-				gfp_mask & ~__GFP_DMA);
+	skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA);
 	if (!skb)
 		goto out;
 
@@ -180,7 +182,7 @@ struct sk_buff *__alloc_skb(unsigned int
 out:
 	return skb;
 nodata:
-	kmem_cache_free(skbuff_head_cache, skb);
+	kmem_cache_free(cache, skb);
 	skb = NULL;
 	goto out;
 }


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- kernel-xen.spec	28 Jan 2006 00:13:50 -0000	1.33
+++ kernel-xen.spec	1 Feb 2006 22:21:14 -0000	1.33.2.1
@@ -362,6 +362,8 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
+Patch1860: linux-2.6-net-fix-iptables.patch
+Patch1870: linux-2.6-net-slab-corruption.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -839,6 +841,11 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
+# Make iptables work again
+%patch1860 -p1
+# Fix netlayer slab corruption
+%patch1870 -p1
+
 # Warn about obsolete functionality usage.
 %patch1900 -p1
 %patch1901 -p1
@@ -1381,6 +1388,10 @@
 * Thu Jan 26 2006 Juan Quintela <quintela at redhat.com>
 - "don't edit patches by hand" release.
 
+* Thu Jan 26 2006 Dave Jones <davej at redhat.com>
+- Fix slab corruption in network layer.
+- Make iptables work again.
+
 * Wed Jan 25 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide kernel 1.1869.
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:26:09 -0500
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.23,1.24
Message-ID: <200602012226.k11MQ9AR003220@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-menus.spec 
Log Message:
- don't ship upstream Desktop.directory files



Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-menus.spec	30 Jan 2006 19:10:17 -0000	1.23
+++ gnome-menus.spec	1 Feb 2006 22:26:06 -0000	1.24
@@ -7,13 +7,13 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.13.5
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:  redhat-menus >= 5.5.5
+Requires:  redhat-menus >= 6.5.4
 Requires: python-abi = %{pyver}
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: %{python}-devel >= 2.3.0
@@ -57,7 +57,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus
-#rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories
+rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories/Desktop.directory
 
 %find_lang %{po_package}
 
@@ -89,6 +89,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Wed Feb  1 2006 Ray Strode <rstrode at redhat.com> 2.13.5-4
+- don't ship upstream Desktop.directory files
+
 * Fri Jan 27 2006 Ray Strode <rstrode at redhat.com> 2.13.5-3
 - ship upstream .directory files
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:30:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:30:23 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.33.2.1,
	1.33.2.2 linux-2.6-net-slab-corruption.patch, 1.1.2.1, NONE
Message-ID: <200602012230.k11MUMPI005080@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
      Tag: private-sct-2_6_15-1_33_FC5-branch
	kernel-xen.spec 
Removed Files:
      Tag: private-sct-2_6_15-1_33_FC5-branch
	linux-2.6-net-slab-corruption.patch 
Log Message:
Backout slab corruption patch, it's for a different baseline


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -r1.33.2.1 -r1.33.2.2
--- kernel-xen.spec	1 Feb 2006 22:21:14 -0000	1.33.2.1
+++ kernel-xen.spec	1 Feb 2006 22:30:10 -0000	1.33.2.2
@@ -363,7 +363,6 @@
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-net-fix-iptables.patch
-Patch1870: linux-2.6-net-slab-corruption.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -843,8 +842,6 @@
 %patch1850 -p1
 # Make iptables work again
 %patch1860 -p1
-# Fix netlayer slab corruption
-%patch1870 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1389,7 +1386,6 @@
 - "don't edit patches by hand" release.
 
 * Thu Jan 26 2006 Dave Jones <davej at redhat.com>
-- Fix slab corruption in network layer.
 - Make iptables work again.
 
 * Wed Jan 25 2006 Juan Quintela <quintela at redhat.com>


--- linux-2.6-net-slab-corruption.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:46:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:46:12 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1892,1.1893
Message-ID: <200602012246.k11MkCOq017708@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable a bunch of SBC drivers



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1892
retrieving revision 1.1893
diff -u -r1.1892 -r1.1893
--- kernel-2.6.spec	1 Feb 2006 21:35:54 -0000	1.1892
+++ kernel-2.6.spec	1 Feb 2006 22:46:10 -0000	1.1893
@@ -1383,6 +1383,7 @@
 * Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
 - Woo, 2.6.16rc1-git5 (at last)
 - Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
+- Disable a bunch of drivers for SBC's that won't run Fedora.
 - Fixed an oops in the stradis driver initialisation.
 - Happy Birthday to "The Yellow Dart".
 



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:46:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:46:13 -0500
Subject: rpms/kernel/devel/configs config-generic,1.142,1.143
Message-ID: <200602012246.k11MkDQ1017789@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable a bunch of SBC drivers



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- config-generic	1 Feb 2006 20:17:08 -0000	1.142
+++ config-generic	1 Feb 2006 22:46:11 -0000	1.143
@@ -161,7 +161,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
@@ -1610,7 +1610,7 @@
 CONFIG_WAFER_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_I6300ESB_WDT=m
-CONFIG_SBC8360_WDT=m
+# CONFIG_SBC8360_WDT is not set
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
 CONFIG_USBPCWATCHDOG=m



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:52:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:52:35 -0500
Subject: rpms/kdegames/FC-4 .cvsignore, 1.28, 1.29 kdegames.spec, 1.38,
	1.39 sources, 1.29, 1.30 admin-visibility.patch, 1.3, NONE
Message-ID: <200602012252.k11MqZkN025628@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdegames.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	16 Jun 2005 17:10:40 -0000	1.28
+++ .cvsignore	1 Feb 2006 22:52:32 -0000	1.29
@@ -5,3 +5,4 @@
 kdegames-3.4.0-patched-rc1.tar.bz2
 kdegames-3.4.0-patched.tar.bz2
 kdegames-3.4.1-patched.tar.bz2
+kdegames-3.5.1-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/kdegames.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdegames.spec	16 Jun 2005 17:10:40 -0000	1.38
+++ kdegames.spec	1 Feb 2006 22:52:32 -0000	1.39
@@ -12,9 +12,10 @@
 %endif
 
 %define qt_version 3.3.4
+%define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -23,10 +24,10 @@
 Group: Amusements/Games
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}%{patch_name}.tar.bz2
-
+Url: http://www.kde.org
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
-Patch2: admin-visibility.patch
+Patch2: kdegames-3.5.0-s390x.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
@@ -50,7 +51,7 @@
 %description
 Games and gaming libraries for the K Desktop Environment.
 Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg,
-kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksokoban, ksmiletris,
+kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris,
 ksnake, ksirtet, katomic, kjumpingcube, ktuberling.
 
 %package devel
@@ -68,7 +69,9 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
-%patch2 -p1 -b .gcc
+%ifarch s390x s390
+%patch2 -p1 -b .s390x
+%endif
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -84,10 +87,19 @@
 CFLAGS="$FLAGS" \
 CXXFLAGS="$FLAGS -fno-check-new" \
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endi
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -140,6 +152,18 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.1.fc4
+- 3.5
+
+* Tue Aug 02 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.2
+- don't setgid as default
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	16 Jun 2005 17:10:40 -0000	1.29
+++ sources	1 Feb 2006 22:52:32 -0000	1.30
@@ -1 +1 @@
-2d48fc3c9d06584c7cfebafad8f2aaa3  kdegames-3.4.1-patched.tar.bz2
+fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  1 22:56:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 17:56:40 -0500
Subject: rpms/gcc/devel gcc41-gomp-20060128-merge1.patch, NONE,
	1.1 gcc41-gomp-20060128-merge2.patch, NONE,
	1.1 gcc41-gomp-20060128-merge3.patch, NONE,
	1.1 gcc41-gomp-20060128-merge4.patch, NONE,
	1.1 gcc41-gomp-20060128-merge5.patch, NONE,
	1.1 gcc41-gomp-20060128-merge6.patch, NONE, 1.1 gcc41.spec,
	1.21, 1.22
Message-ID: <200602012256.k11MueXF019825@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19810

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-gomp-20060128-merge1.patch 
	gcc41-gomp-20060128-merge2.patch 
	gcc41-gomp-20060128-merge3.patch 
	gcc41-gomp-20060128-merge4.patch 
	gcc41-gomp-20060128-merge5.patch 
	gcc41-gomp-20060128-merge6.patch 
Log Message:
4.1.0-0.20


gcc41-gomp-20060128-merge1.patch:
 0 files changed

--- NEW FILE gcc41-gomp-20060128-merge1.patch ---
2006-01-19  Diego Novillo  <dnovillo at redhat.com>

	* tree-pretty-print.c (dump_generic_node): Handle
	OMP_PARALLEL_FN, OMP_PARALLEL_DATA_ARG and OMP_RETURN_EXPR.
	* cgraph.c (cgraph_expand_queue): Rename from
	cgraph_analyze_queue.  Update all users.
	* cgraphunit.c (cgraph_assemble_pending_functions): Process
	cgraph_expand_queue.
	(cgraph_expand_all_functions): Likewise.
	(cgraph_finalize_pending_functions): Remove.  Update callers.

	* tree.h (OMP_DIRECTIVE_P): Define.
	(OMP_PARALLEL_FN): Define.
	(OMP_PARALLEL_DATA_ARG): Define.
	(OMP_SECTIONS_SECTIONS): Define.
	* tree-pass.h (pass_expand_omp): Declare.
	* omp-low.c (struct omp_region): Declare.
	(struct omp_context): Remove fields 'parallel_type',
	'parallel_start_ix' and 'parallel_start_additional_args'.
	Update all users.
	(struct omp_for_data): Rename from struct expand_omp_for_data.
	(omp_regions): New static variable.
	(root_omp_region): New static variable.
	(find_omp_clause): Make static.
	(is_in_combined_parallel_ctx): Remove.
	(is_combined_parallel): New.
	(extract_omp_for_data): Move earlier in the file.
	(workshare_safe_to_combine_p): New.
	(get_ws_args_for): New.
	(determine_parallel_type): Move earlier in the file.
	(omp_copy_decl_2): Do not set DECL_CONTEXT of new local to the
	child function.
	(omp_copy_decl): Likewise.
	(create_omp_child_function): Likewise.
	(lookup_omp_region): New.
	(dump_omp_region): New.
	(debug_omp_region): New.
	(debug_all_omp_regions): New.
	(new_omp_region): New.
	(scan_omp_parallel): If parallel_nesting_level > 1, the
	directive is nested within another parallel directive.
	Set OMP_PARALLEL_FN.
	(scan_omp_for): Do not try to handle combined parallel+for
	cases.
	Remove FIXME comment.
	(scan_omp_nested): Remove.
	(scan_omp_1): Do not call scan_omp_nested when
	parallel_nesting_level is > 1.
	Do not change the DECL_CONTEXT of local variables found.
	(lookup_decl_in_outer_ctx): New.
	(lower_rec_input_clauses): Rename from expand_rec_input_clauses.
	(lower_lastprivate_clauses): Rename from expand_lastprivate_clauses.
	(lower_reduction_clauses): Rename from expand_reduction_clauses.
	(lower_copyprivate_clauses): Rename from expand_copyprivate_clauses.
	If CTX is nested, lookup VAR in the outer context when
	building copy assignment.
	(lower_send_clauses): Rename from expand_send_clauses.
	If CTX is nested, lookup VAR in the outer context when
	building copy assignments.
	(lower_send_shared_vars): Rename from expand_send_shared_vars.
	If CTX is nested, lookup VAR in the outer context when
	building copy assignments.
	(expand_parallel_call): Rename from build_parallel_call.
	Handle combined parallel+workshare cases.
	Re-implement to emit code into the CFG.
	(list2chain): New.
	(expand_omp_parallel): Re-implement to emit code into the CFG.
	Call move_sese_region_to_fn to outline the sub-graph
	containing the parallel region.
	(expand_omp_for_1): Remove.
	(expand_omp_for_generic): Re-implement to emit code into the
	CFG.
	(expand_omp_for_static_nochunk): Likewise.
	(expand_omp_for_static_chunk): Likewise.
	(expand_omp_for): Likewise.
	(expand_omp_sections): Likewise.
	(remove_exit_barriers): New.
	(expand_omp_synch): New.
	(expand_omp): New.
	(build_omp_regions_1): New.
	(build_omp_regions): New.
	(execute_expand_omp): New.
	(gate_expand_omp): New.
	(pass_expand_omp): Define.
	(lower_omp_sections): Rename from expand_omp_sections.
	Set OMP_SECTIONS_SECTIONS.
	(lower_omp_single_simple): Rename from expand_omp_single_simple.
	(lower_omp_single_copy): Rename from expand_omp_single_copy.
	(lower_omp_single): Rename from expand_omp_simple.
	(lower_omp_master): Rename from expand_omp_master.
	(lower_omp_ordered): Rename from expand_omp_ordered.
	(lower_omp_critical): Rename from expand_omp_critical.
	(lower_omp_for_lastprivate): Rename from expand_omp_for_lastprivate.
	(lower_omp_for): Re-implement.
	(lower_omp_parallel): Re-implement.
	(lower_regimplify): Rename from expand_regimplify.
	(lower_omp_1): Rename from expand_omp_1.
	If there are syntax errors in the program, replace every
	OpenMP directive with NOP.
	Call lower_omp_* instead of expand_omp_*.
	(lower_omp): Rename from expand_omp.

	* tree-gimple.c (is_gimple_stmt): Handle OMP_RETURN_EXPR.
	* tree-gimple.h (enum omp_parallel_type): Remove.
	(gimple_boolify): Declare extern.
	(find_omp_clause, determine_parallel_type): Remove.

	* gimple-low.c (lower_omp_directive): New.
	(lower_stmt): Call it.
	(record_vars_into): Move from ...
	(record_vars): ... here.
	Call record_vars_into with current_function_decl.

	* gimplify.c (struct gimplify_ctx): Remove fields
	combined_pre_p and combined_ctxp.  Update users.
	(get_formal_tmp_var): Add documentation.
	(gimple_boolify): Make extern.
	(gimplify_expr_in_ctx): Remove.  Update callers.
	(gimplify_omp_parallel): Do not assume that OMP_PARALLEL_BODY
	will always be a BIND_EXPR.
	(gimplify_expr): Handle OMP_RETURN_EXPR.
	* tree.def (BLOCK): Remove documentation about BLOCK_TYPE_TAGS.
	(OMP_PARALLEL): Add 3 operands.
	(OMP_SECTIONS): Add 1 operand.
	(OMP_RETURN_EXPR): Define.

	* tree-inline.c (estimate_num_insns_1): Handle OpenMP directives.
	(copy_tree_r): Restore TREE_CHAIN in OMP_CLAUSE_*.
	* tree-iterator.c (alloc_stmt_list): Assert that we are not
	creating a circular free list.
	(free_stmt_list): Assert that we are not freeing stmt_list_cache.

	* tree-flow.h (move_sese_region_to_fn): Declare.
	(record_vars_into): Declare.
	* tree-cfg.c (make_omp_sections_edges): New.
	(make_exit_edges): Handle OMP_PARALLEL, OMP_FOR, OMP_SINGLE,
	OMP_MASTER, OMP_ORDERED, OMP_CRITICAL, OMP_RETURN_EXPR,
	OMP_SECTIONS and OMP_SECTION.
	(is_ctrl_altering_stmt): Return true for OMP_DIRECTIVE_P.
	(verify_stmt): Do not handle OMP_DIRECTIVE_P.
	(gather_blocks_in_sese_region): New.
	(struct move_stmt_d): Declare.
	(move_stmt_r): New.
	(move_block_to_fn): New.
	(move_sese_region_to_fn): New.

	* passes.c (init_optimization_passes): Schedule
	pass_expand_omp after pass_init_datastructures.

	* tree-ssa-operands.c (get_expr_operands): Handle
	OMP_PARALLEL, OMP_SECTIONS, OMP_FOR, OMP_RETURN_EXPR,
	OMP_SINGLE, OMP_MASTER, OMP_ORDERED, OMP_CRITICAL.

testsuite/
	* testsuite/gcc.dg/gomp/for-13.c: Use -fdump-tree-ompexp.
	* testsuite/gcc.dg/gomp/critical-1.c: Likewise.
	* testsuite/gcc.dg/gomp/critical-3.c: Likewise.
	* testsuite/gcc.dg/gomp/empty.c: Likewise.
	* testsuite/gcc.dg/gomp/ordered-1.c: Likewise.
	* testsuite/gcc.dg/gomp/for-4.c: Likewise.
	* testsuite/gcc.dg/gomp/for-6.c: Likewise.
	* testsuite/gcc.dg/gomp/master-3.c: Likewise.
	* testsuite/gcc.dg/gomp/for-8.c: Likewise.
	* testsuite/gcc.dg/gomp/for-10.c: Likewise.
	* testsuite/gcc.dg/gomp/for-18.c: Likewise.
	* testsuite/gcc.dg/gomp/for-5.c: Likewise.
	* testsuite/gcc.dg/gomp/for-7.c: Likewise.
	* testsuite/gcc.dg/gomp/for-9.c: Likewise.

--- gcc/tree-pretty-print.c	(revision 109968)
+++ gcc/tree-pretty-print.c	(revision 109969)
@@ -1663,6 +1663,21 @@ dump_generic_node (pretty_printer *buffe
     case OMP_PARALLEL:
       pp_string (buffer, "#pragma omp parallel");
       dump_omp_clauses (buffer, OMP_PARALLEL_CLAUSES (node), spc, flags);
+      if (OMP_PARALLEL_FN (node))
+	{
+	  pp_string (buffer, " [child fn: ");
+	  dump_generic_node (buffer, OMP_PARALLEL_FN (node), spc, flags, false);
+
+	  pp_string (buffer, " (");
+
+	  if (OMP_PARALLEL_DATA_ARG (node))
+	    dump_generic_node (buffer, OMP_PARALLEL_DATA_ARG (node), spc, flags,
+			       false);
+	  else
+	    pp_string (buffer, "???");
+
+	  pp_string (buffer, ")]");
+	}
     dump_omp_body:
       newline_and_indent (buffer, spc + 2);
       pp_character (buffer, '{');
@@ -1752,6 +1767,11 @@ dump_generic_node (pretty_printer *buffe
       dump_omp_clauses (buffer, OMP_SINGLE_CLAUSES (node), spc, flags);
       goto dump_omp_body;
 
+    case OMP_RETURN_EXPR:
+      pp_string (buffer, "OMP_RETURN");
[...4695 lines suppressed...]
+
+	  gcc_assert (uid > -1);
+
+	  old_len = VEC_length (basic_block, cfg->x_label_to_block_map);
+	  if (old_len <= (unsigned) uid)
+	    {
+	      basic_block *addr;
+	      unsigned new_len = 3 * uid / 2;
+	      VEC_safe_grow (basic_block, gc, cfg->x_label_to_block_map,
+			     new_len);
+	      addr = VEC_address (basic_block, cfg->x_label_to_block_map);
+	      memset (&addr[old_len], 0,
+		      sizeof (basic_block) * (new_len - old_len));
+	    }
+
+	  VEC_replace (basic_block, cfg->x_label_to_block_map, uid, bb);
+	  VEC_replace (basic_block, cfun->cfg->x_label_to_block_map, uid, NULL);
+
+	  gcc_assert (DECL_CONTEXT (label) == dest_cfun->decl);
+
+	  if (uid >= dest_cfun->last_label_uid)
+	    dest_cfun->last_label_uid = uid + 1;
+	}
+    }
+}
+
+
+/* Move a single-entry, single-exit region delimited by ENTRY_BB and
+   EXIT_BB to function DEST_CFUN.  The whole region is replaced by a
+   single basic block in the original CFG and the new basic block is
+   returned.  DEST_CFUN must not have a CFG yet.
+
+   Note that the region need not be a pure SESE region.  Blocks inside
+   the region may contain calls to abort/exit.  The only restriction
+   is that ENTRY_BB should be the only entry point and it must
+   dominate EXIT_BB.
+
+   All local variables referenced in the region are assumed to be in
+   the corresponding BLOCK_VARS and unexpanded variable lists
+   associated with DEST_CFUN.  */
+
+basic_block
+move_sese_region_to_fn (struct function *dest_cfun, basic_block entry_bb,
+		        basic_block exit_bb)
+{
+  VEC(basic_block,heap) *bbs;
+  basic_block after, bb, *entry_pred, *exit_succ;
+  struct function *saved_cfun;
+  int *entry_flag, *exit_flag;
+  unsigned i, num_entry_edges, num_exit_edges;
+  edge e;
+  edge_iterator ei;
+  bitmap vars_to_remove;
+
+  saved_cfun = cfun;
+
+  /* Collect all the blocks in the region.  Manually add ENTRY_BB
+     because it won't be added by dfs_enumerate_from.  */
+  calculate_dominance_info (CDI_DOMINATORS);
+
+  /* If ENTRY does not strictly dominate EXIT, this cannot be an SESE
+     region.  */
+  gcc_assert (entry_bb != exit_bb
+              && dominated_by_p (CDI_DOMINATORS, exit_bb, entry_bb));
+
+  bbs = NULL;
+  VEC_safe_push (basic_block, heap, bbs, entry_bb);
+  gather_blocks_in_sese_region (entry_bb, exit_bb, &bbs);
+
+  /* Detach ENTRY_BB and EXIT_BB from CFUN->CFG.  We need to remember
+     the predecessor edges to ENTRY_BB and the successor edges to
+     EXIT_BB so that we can re-attach them to the new basic block that
+     will replace the region.  */
+  num_entry_edges = EDGE_COUNT (entry_bb->preds);
+  entry_pred = (basic_block *) xcalloc (num_entry_edges, sizeof (basic_block));
+  entry_flag = (int *) xcalloc (num_entry_edges, sizeof (int));
+  i = 0;
+  for (ei = ei_start (entry_bb->preds); (e = ei_safe_edge (ei)) != NULL;)
+    {
+      entry_flag[i] = e->flags;
+      entry_pred[i++] = e->src;
+      remove_edge (e);
+    }
+
+  num_exit_edges = EDGE_COUNT (exit_bb->succs);
+  exit_succ = (basic_block *) xcalloc (num_exit_edges, sizeof (basic_block));
+  exit_flag = (int *) xcalloc (num_exit_edges, sizeof (int));
+  i = 0;
+  for (ei = ei_start (exit_bb->succs); (e = ei_safe_edge (ei)) != NULL;)
+    {
+      exit_flag[i] = e->flags;
+      exit_succ[i++] = e->dest;
+      remove_edge (e);
+    }
+
+  /* Switch context to the child function to initialize DEST_FN's CFG.  */
+  gcc_assert (dest_cfun->cfg == NULL);
+  cfun = dest_cfun;
+  init_empty_tree_cfg ();
+  cfun = saved_cfun;
+
+  /* Move blocks from BBS into DEST_CFUN.  */
+  gcc_assert (VEC_length (basic_block, bbs) >= 2);
+  after = dest_cfun->cfg->x_entry_block_ptr;
+  vars_to_remove = BITMAP_ALLOC (NULL);
+  for (i = 0; VEC_iterate (basic_block, bbs, i, bb); i++)
+    {
+      /* No need to update edge counts on the last block.  It has
+	 already been updated earlier when we detached the region from
+	 the original CFG.  */
+      move_block_to_fn (dest_cfun, bb, after, bb != exit_bb, vars_to_remove);
+      after = bb;
+    }
+
+  /* Remove the variables marked in VARS_TO_REMOVE from
+     CFUN->UNEXPANDED_VAR_LIST.  Otherwise, they will be given a
+     DECL_RTL in the context of CFUN.  */
+  if (!bitmap_empty_p (vars_to_remove))
+    {
+      tree *p;
+
+      for (p = &cfun->unexpanded_var_list; *p; )
+	{
+	  tree var = TREE_VALUE (*p);
+	  if (bitmap_bit_p (vars_to_remove, DECL_UID (var)))
+	    {
+	      *p = TREE_CHAIN (*p);
+	      continue;
+	    }
+
+	  p = &TREE_CHAIN (*p);
+	}
+    }
+
+  BITMAP_FREE (vars_to_remove);
+
+  /* Rewire the entry and exit blocks.  The successor to the entry
+     block turns into the successor of DEST_FN's ENTRY_BLOCK_PTR in
+     the child function.  Similarly, the predecessor of DEST_FN's
+     EXIT_BLOCK_PTR turns into the predecessor of EXIT_BLOCK_PTR.  We
+     need to switch CFUN between DEST_CFUN and SAVED_CFUN so that the
+     various CFG manipulation function get to the right CFG.
+
+     FIXME, this is silly.  The CFG ought to become a parameter to
+     these helpers.  */
+  cfun = dest_cfun;
+  make_edge (ENTRY_BLOCK_PTR, entry_bb, EDGE_FALLTHRU);
+  make_edge (exit_bb,  EXIT_BLOCK_PTR, 0);
+  cfun = saved_cfun;
+
+  /* Back in the original function, the SESE region has disappeared,
+     create a new basic block in its place.  */
+  bb = create_empty_bb (entry_pred[0]);
+  for (i = 0; i < num_entry_edges; i++)
+    make_edge (entry_pred[i], bb, entry_flag[i]);
+
+  for (i = 0; i < num_exit_edges; i++)
+    make_edge (bb, exit_succ[i], exit_flag[i]);
+
+  free (exit_flag);
+  free (entry_flag);
+  free (entry_pred);
+  free (exit_succ);
+  free_dominance_info (CDI_DOMINATORS);
+  free_dominance_info (CDI_POST_DOMINATORS);
+  VEC_free (basic_block, heap, bbs);
+
+  return bb;
+}
+
 
 /* Dump FUNCTION_DECL FN to file FILE using FLAGS (see TDF_* in tree.h)  */
 
--- gcc/passes.c	(revision 109968)
+++ gcc/passes.c	(revision 109969)
@@ -481,6 +481,7 @@ init_optimization_passes (void)
   p = &all_passes;
   NEXT_PASS (pass_fixup_cfg);
   NEXT_PASS (pass_init_datastructures);
+  NEXT_PASS (pass_expand_omp);
   NEXT_PASS (pass_all_optimizations);
   NEXT_PASS (pass_warn_function_noreturn);
   NEXT_PASS (pass_mudflap_2);
--- gcc/tree-ssa-operands.c	(revision 109968)
+++ gcc/tree-ssa-operands.c	(revision 109969)
@@ -1308,6 +1308,14 @@ get_expr_operands (tree stmt, tree *expr
     case EXC_PTR_EXPR:
     case FILTER_EXPR:
     case LABEL_DECL:
+    case OMP_PARALLEL:
+    case OMP_SECTIONS:
+    case OMP_FOR:
+    case OMP_RETURN_EXPR:
+    case OMP_SINGLE:
+    case OMP_MASTER:
+    case OMP_ORDERED:
+    case OMP_CRITICAL:
       /* Expressions that make no memory references.  */
       return;
 

gcc41-gomp-20060128-merge2.patch:
 0 files changed

--- NEW FILE gcc41-gomp-20060128-merge2.patch ---
2006-01-19  Diego Novillo  <dnovillo at redhat.com>

gcc/fortran/ -> ChangeLog.gomp
	* trans.h (build4_v): Define.
	* trans-openmp.c: Call build4_v to create OMP_PARALLEL nodes.
	Call build3_v to create OMP_SECTIONS nodes.

gcc/testsuite/ -> ChangeLog.gomp
	* g++.dg/gomp/for-4.C: Use -fdump-tree-ompexp.
	* g++.dg/gomp/for-6.C: Likewise.
	* g++.dg/gomp/for-8.C: Likewise.
	* g++.dg/gomp/for-10.C: Likewise.
	* g++.dg/gomp/for-5.C: Likewise.
	* g++.dg/gomp/for-7.C: Likewise.
	* g++.dg/gomp/for-9.C: Likewise.

--- gcc/testsuite/g++.dg/gomp/for-4.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-4.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_dynamic_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-6.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-6.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_runtime_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-8.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-8.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_dynamic_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-10.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-10.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_runtime_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-5.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-5.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_guided_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_guided_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_guided_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_guided_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-7.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-7.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_static_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/testsuite/g++.dg/gomp/for-9.C	(revision 109983)
+++ gcc/testsuite/g++.dg/gomp/for-9.C	(revision 109984)
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -fdump-tree-lower" } */
+/* { dg-options "-fopenmp -fdump-tree-ompexp" } */
 
 extern void bar(int);
 
@@ -12,6 +12,6 @@ void foo (int n)
     bar(i);
 }
 
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_start" 1 "lower" } } */
-/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_next" 1 "lower" } } */
-/* { dg-final { cleanup-tree-dump "lower" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_start" 1 "ompexp" } } */
+/* { dg-final { scan-tree-dump-times "GOMP_loop_ordered_guided_next" 1 "ompexp" } } */
+/* { dg-final { cleanup-tree-dump "ompexp" } } */
--- gcc/fortran/trans-openmp.c	(revision 109983)
+++ gcc/fortran/trans-openmp.c	(revision 109984)
@@ -1027,7 +1027,7 @@ gfc_trans_omp_parallel (gfc_code *code)
   omp_clauses = gfc_trans_omp_clauses (&block, code->ext.omp_clauses,
 				       code->loc);
   stmt = gfc_trans_omp_code (code->block->next, true);
-  stmt = build2_v (OMP_PARALLEL, stmt, omp_clauses);
+  stmt = build4_v (OMP_PARALLEL, stmt, omp_clauses, NULL, NULL);
   gfc_add_expr_to_block (&block, stmt);
   return gfc_finish_block (&block);
 }
@@ -1065,7 +1065,7 @@ gfc_trans_omp_parallel_do (gfc_code *cod
     stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0, 0));
   else
     poplevel (0, 0, 0);
-  stmt = build2_v (OMP_PARALLEL, stmt, omp_clauses);
+  stmt = build4_v (OMP_PARALLEL, stmt, omp_clauses, NULL, NULL);
   gfc_add_expr_to_block (&block, stmt);
   return gfc_finish_block (&block);
 }
@@ -1089,7 +1089,7 @@ gfc_trans_omp_parallel_sections (gfc_cod
     stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0, 0));
   else
     poplevel (0, 0, 0);
-  stmt = build2_v (OMP_PARALLEL, stmt, omp_clauses);
+  stmt = build4_v (OMP_PARALLEL, stmt, omp_clauses, NULL, NULL);
   gfc_add_expr_to_block (&block, stmt);
   return gfc_finish_block (&block);
 }
@@ -1113,7 +1113,7 @@ gfc_trans_omp_parallel_workshare (gfc_co
     stmt = build3_v (BIND_EXPR, NULL, stmt, poplevel (1, 0, 0));
   else
     poplevel (0, 0, 0);
-  stmt = build2_v (OMP_PARALLEL, stmt, omp_clauses);
+  stmt = build4_v (OMP_PARALLEL, stmt, omp_clauses, NULL, NULL);
   gfc_add_expr_to_block (&block, stmt);
   return gfc_finish_block (&block);
 }
@@ -1144,7 +1144,7 @@ gfc_trans_omp_sections (gfc_code *code, 
     }
   stmt = gfc_finish_block (&body);
 
-  stmt = build2_v (OMP_SECTIONS, stmt, omp_clauses);
+  stmt = build3_v (OMP_SECTIONS, stmt, omp_clauses, NULL);
   gfc_add_expr_to_block (&block, stmt);
 
   return gfc_finish_block (&block);
--- gcc/fortran/trans.h	(revision 109983)
+++ gcc/fortran/trans.h	(revision 109984)
@@ -591,6 +591,8 @@ struct lang_decl		GTY(())
                                           arg1, arg2)
 #define build3_v(code, arg1, arg2, arg3) build3(code, void_type_node, \
                                                 arg1, arg2, arg3)
+#define build4_v(code, arg1, arg2, arg3, arg4) build4(code, void_type_node, \
+						      arg1, arg2, arg3, arg4)
 
 /* This group of functions allows a caller to evaluate an expression from
    the callee's interface.  It establishes a mapping between the interface's

gcc41-gomp-20060128-merge3.patch:
 0 files changed

--- NEW FILE gcc41-gomp-20060128-merge3.patch ---
gcc/
2006-01-26  Shantonu Sen  <ssen at opendarwin.org>

	* tree.h (OMP_CLAUSE_SUBCODE_CHECK): Add definition for
	--disable-checking.

2006-01-25  Diego Novillo  <dnovillo at redhat.com>

	* tree.h (TREE_RANGE_CHECK): Fix range predicate.
	(TREE_BLOCK): Add call to EXPR_CHECK.

2006-01-25  Diego Novillo  <dnovillo at redhat.com>

	PR 25886
	* tree-dump.c (dequeue_and_dump): Handle OMP_CLAUSE.
	* tree-pretty-print.c (dump_omp_clause): Extract from ...
	(dump_omp_clauses): ... here.
	(dump_generic_node): Handle OMP_CLAUSE.
	* tree.c (omp_clause_num_ops): New.
	(omp_clause_code_name): New.
	(tree_code_size): Handle OMP_CLAUSE.
	(tree_size): Likewise.
	(make_node): Document handling of OMP_CLAUSE.
	(tree_node_structure): Handle OMP_CLAUSE.
	(omp_clause_check_failed): New.
	(omp_clause_range_check_failed): New.
	(omp_clause_operand_check_failed): New.
	(build_omp_clause): New.
	(walk_tree): Adjust handling of OMP_CLAUSE_* nodes.
	* tree.h (enum omp_clause_code): Declare.
	(OMP_CLAUSE_SUBCODE_CHECK): Define.
	(OMP_CLAUSE_RANGE_CHECK): Define.
	(OMP_CLAUSE_ELT_CHECK): Define.
	(omp_clause_check_failed): Declare.
	(omp_clause_operand_check_failed): Declare.
	(omp_clause_range_check_failed): Declare.
	(OMP_CLAUSE_CHAIN): Do not use TREE_RANGE_CHECK.
	(OMP_CLAUSE_OPERAND): Use OMP_CLAUSE_RANGE_CHECK.
	(OMP_CLAUSE_PRIVATE_DEBUG): Use OMP_CLAUSE_SUBCODE_CHECK.
	(OMP_CLAUSE_LASTPRIVATE): Likewise.
	(OMP_CLAUSE_IF_EXPR): Likewise.
	(OMP_CLAUSE_NUM_THREADS_EXPR): Likewise.
	(OMP_CLAUSE_SCHEDULE_CHUNK_EXPR): Likewise.
	(OMP_CLAUSE_REDUCTION_CODE): Likewise.
	(OMP_CLAUSE_REDUCTION_INIT): Likewise.
	(OMP_CLAUSE_REDUCTION_MERGE): Likewise.
	(OMP_CLAUSE_REDUCTION_PLACEHOLDER): Likewise.
	Use tree_node.omp_clause.subcode instead of TREE_COMPLEXITY.
	(OMP_CLAUSE_SCHEDULE_KIND): Likewise.
	(OMP_CLAUSE_DEFAULT_KIND): Likewise.
	(OMP_CLAUSE_CODE): Define.
	(OMP_CLAUSE_SET_CODE): Define.
	(OMP_CLAUSE_CODE): Define.
	(OMP_CLAUSE_OPERAND): Define.
	(struct tree_omp_clause): Declare.
	(union tree_node): Add field 'omp_clause'.
	* treestruct.def (TS_OMP_CLAUSE): Define.
	* tree.def (OMP_CLAUSE_PRIVATE, OMP_CLAUSE_SHARED
	OMP_CLAUSE_FIRSTPRIVATE, OMP_CLAUSE_LASTPRIVATE,
	OMP_CLAUSE_REDUCTION, OMP_CLAUSE_COPYIN,
	OMP_CLAUSE_COPYPRIVATE, OMP_CLAUSE_IF,
	OMP_CLAUSE_NUM_THREADS, OMP_CLAUSE_SCHEDULE,
	OMP_CLAUSE_NOWAIT, OMP_CLAUSE_ORDERED, OMP_CLAUSE_DEFAULT): Remove.
	(OMP_CLAUSE): Define.
	* print-tree.c (print_node): Handle OMP_CLAUSE.
	* omp-low.c: Adapt all uses of OMP_CLAUSE_* nodes.
	* c-typeck.c: Likewise.
	* gimplify.c: Likewise.
	* c-omp.c: Likewise.
	* tree-nested.c: Likewise.
	* tree-inline.c: Likewise.
	* c-parser.c: Likewise.
	* gimple-low.c (lower_omp_directive): Do not set TREE_BLOCK on
	clauses.

2006-01-23  Diego Novillo  <dnovillo at redhat.com>

	* omp-low.c: Update documentation.

gcc/testsuite/
2006-01-24  Hans-Peter Nilsson  <hp at axis.com>

	PR testsuite/25891
	* lib/target-supports.exp (check_effective_target_fopenmp): New proc.
	* gcc.dg/gomp/gomp.exp: Return without testing anything if
	check_effective_target_fopenmp returns 0.

contrib/
2006-01-24  Diego Novillo  <dnovillo at redhat.com>

	* gcc_update (files_and_dependencies): Handle
	libgomp/testsuite/Makefile.in.

gcc/cp/ -> ChangeLog.gomp
2006-01-26  Diego Novillo  <dnovillo at redhat.com>

	* cp-tree.h (CP_OMP_CLAUSE_INFO): Use TREE_TYPE instead
	of TREE_BLOCK.
	* pt.c: Use OMP_CLAUSE_CODE and OMP_CLAUSE_OPERAND
	instead of TREE_CODE/TREE_OPERAND.
	* semantics.c: Likewise.
	* parser.c: Likewise.

gcc/fortran/ -> ChangeLog.gomp
2006-01-26  Diego Novillo  <dnovillo at redhat.com>

	* trans-openmp.c: Call build_omp_clause instead of
	make_node when creating OMP_CLAUSE_* trees.
	(gfc_trans_omp_reduction_list): Remove argument 'code'.
	Adjust all callers.

--- gcc/tree-dump.c	(revision 110285)
+++ gcc/tree-dump.c	(revision 110286)
@@ -653,6 +653,14 @@ dequeue_and_dump (dump_info_p di)
       	  dump_child ("labl", TREE_OPERAND (t,2));
         }
       break;
+    case OMP_CLAUSE:
+      {
+	int i;
+	fprintf (di->stream, "%s\n", omp_clause_code_name[OMP_CLAUSE_CODE (t)]);
+	for (i = 0; i < omp_clause_num_ops[OMP_CLAUSE_CODE (t)]; i++)
+	  dump_child ("op: ", OMP_CLAUSE_OPERAND (t, i));
+      }
+      break;
     default:
       /* There are no additional fields to print.  */
       break;
--- gcc/tree-pretty-print.c	(revision 110285)
+++ gcc/tree-pretty-print.c	(revision 110286)
@@ -263,133 +263,144 @@ dump_array_domain (pretty_printer *buffe
   pp_character (buffer, ']');
 }
 
-/* Dump the list of OpenMP clauses.  */
+
+/* Dump OpenMP clause CLAUSE.  BUFFER, CLAUSE, SPC and FLAGS are as in
+   dump_generic_node.  */
 
 static void
-dump_omp_clauses (pretty_printer *buffer, tree clause, int spc, int flags)
+dump_omp_clause (pretty_printer *buffer, tree clause, int spc, int flags)
 {
   const char *name;
 
-  if (clause == NULL)
-    return;
-
-  pp_space (buffer);
-  while (1)
+  switch (OMP_CLAUSE_CODE (clause))
     {
-      switch (TREE_CODE (clause))
-	{
-	case OMP_CLAUSE_PRIVATE:
-	  name = "private";
-	  goto print_remap;
-	case OMP_CLAUSE_SHARED:
-	  name = "shared";
-	  goto print_remap;
-	case OMP_CLAUSE_FIRSTPRIVATE:
-	  name = "firstprivate";
-	  goto print_remap;
-	case OMP_CLAUSE_LASTPRIVATE:
-	  name = "lastprivate";
-	  goto print_remap;
-	case OMP_CLAUSE_COPYIN:
-	  name = "copyin";
-	  goto print_remap;
-	case OMP_CLAUSE_COPYPRIVATE:
-	  name = "copyprivate";
-	  goto print_remap;
-	print_remap:
-	  pp_string (buffer, name);
-	  pp_character (buffer, '(');
-	  dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
-			     spc, flags, false);
-	  pp_character (buffer, ')');
-	  break;
-
-	case OMP_CLAUSE_REDUCTION:
-	  pp_string (buffer, "reduction(");
-	  pp_string (buffer, op_symbol_1 (OMP_CLAUSE_REDUCTION_CODE (clause)));
-	  pp_character (buffer, ':');
-	  dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
-			     spc, flags, false);
-	  pp_character (buffer, ')');
-	  break;
+    case OMP_CLAUSE_PRIVATE:
+      name = "private";
+      goto print_remap;
+    case OMP_CLAUSE_SHARED:
+      name = "shared";
+      goto print_remap;
+    case OMP_CLAUSE_FIRSTPRIVATE:
+      name = "firstprivate";
+      goto print_remap;
+    case OMP_CLAUSE_LASTPRIVATE:
+      name = "lastprivate";
+      goto print_remap;
+    case OMP_CLAUSE_COPYIN:
+      name = "copyin";
+      goto print_remap;
+    case OMP_CLAUSE_COPYPRIVATE:
+      name = "copyprivate";
+      goto print_remap;
+  print_remap:
+      pp_string (buffer, name);
+      pp_character (buffer, '(');
+      dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
+	  spc, flags, false);
+      pp_character (buffer, ')');
+      break;
 
-	case OMP_CLAUSE_IF:
-	  pp_string (buffer, "if(");
-	  dump_generic_node (buffer, OMP_CLAUSE_IF_EXPR (clause),
-			     spc, flags, false);
-	  pp_character (buffer, ')');
-	  break;
+    case OMP_CLAUSE_REDUCTION:
+      pp_string (buffer, "reduction(");
+      pp_string (buffer, op_symbol_1 (OMP_CLAUSE_REDUCTION_CODE (clause)));
+      pp_character (buffer, ':');
+      dump_generic_node (buffer, OMP_CLAUSE_DECL (clause),
+	  spc, flags, false);
+      pp_character (buffer, ')');
+      break;
 
-	case OMP_CLAUSE_NUM_THREADS:
-	  pp_string (buffer, "num_threads(");
-	  dump_generic_node (buffer, OMP_CLAUSE_NUM_THREADS_EXPR (clause),
-			     spc, flags, false);
-	  pp_character (buffer, ')');
-	  break;
+    case OMP_CLAUSE_IF:
+      pp_string (buffer, "if(");
+      dump_generic_node (buffer, OMP_CLAUSE_IF_EXPR (clause),
+	  spc, flags, false);
+      pp_character (buffer, ')');
+      break;
 
-	case OMP_CLAUSE_NOWAIT:
-	  pp_string (buffer, "nowait");
-	  break;
-	case OMP_CLAUSE_ORDERED:
-	  pp_string (buffer, "ordered");
-	  break;
+    case OMP_CLAUSE_NUM_THREADS:
+      pp_string (buffer, "num_threads(");
+      dump_generic_node (buffer, OMP_CLAUSE_NUM_THREADS_EXPR (clause),
+	  spc, flags, false);
+      pp_character (buffer, ')');
+      break;
 
-	case OMP_CLAUSE_DEFAULT:
-	  pp_string (buffer, "default(");
-	  switch (OMP_CLAUSE_DEFAULT_KIND (clause))
-	    {
-	    case OMP_CLAUSE_DEFAULT_UNSPECIFIED:
-	      break;
-	    case OMP_CLAUSE_DEFAULT_SHARED:
-	      pp_string (buffer, "shared");
-	      break;
-	    case OMP_CLAUSE_DEFAULT_NONE:
-	      pp_string (buffer, "none");
-	      break;
-	    case OMP_CLAUSE_DEFAULT_PRIVATE:
-	      pp_string (buffer, "private");
-	      break;
-	    default:
-	      gcc_unreachable ();
-	    }
-	  pp_character (buffer, ')');
-	  break;
+    case OMP_CLAUSE_NOWAIT:
+      pp_string (buffer, "nowait");
+      break;
+    case OMP_CLAUSE_ORDERED:
+      pp_string (buffer, "ordered");
+      break;
 
-	case OMP_CLAUSE_SCHEDULE:
-	  pp_string (buffer, "schedule(");
-	  switch (OMP_CLAUSE_SCHEDULE_KIND (clause))
-	    {
-	    case OMP_CLAUSE_SCHEDULE_STATIC:
-	      pp_string (buffer, "static");
-	      break;
-	    case OMP_CLAUSE_SCHEDULE_DYNAMIC:
-	      pp_string (buffer, "dynamic");
-	      break;
-	    case OMP_CLAUSE_SCHEDULE_GUIDED:
-	      pp_string (buffer, "guided");
-	      break;
-	    case OMP_CLAUSE_SCHEDULE_RUNTIME:
-	      pp_string (buffer, "runtime");
-	      break;
-	    default:
-	      gcc_unreachable ();
-	    }
-	  if (OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (clause))
-	    {
-	      pp_character (buffer, ',');
-	      dump_generic_node (buffer,
-				 OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (clause),
-				 spc, flags, false);
-	    }
-	  pp_character (buffer, ')');
-	  break;
+    case OMP_CLAUSE_DEFAULT:
+      pp_string (buffer, "default(");
+      switch (OMP_CLAUSE_DEFAULT_KIND (clause))
+	{
+      case OMP_CLAUSE_DEFAULT_UNSPECIFIED:
+	break;
+      case OMP_CLAUSE_DEFAULT_SHARED:
+	pp_string (buffer, "shared");
+	break;
+      case OMP_CLAUSE_DEFAULT_NONE:
+	pp_string (buffer, "none");
+	break;
+      case OMP_CLAUSE_DEFAULT_PRIVATE:
+	pp_string (buffer, "private");
+	break;
+      default:
+	gcc_unreachable ();
+	}
+      pp_character (buffer, ')');
+      break;
 
-	default:
-	  /* Should never happen.  */
-	  dump_generic_node (buffer, clause, spc, flags, false);
-	  break;
+    case OMP_CLAUSE_SCHEDULE:
+      pp_string (buffer, "schedule(");
+      switch (OMP_CLAUSE_SCHEDULE_KIND (clause))
+	{
+      case OMP_CLAUSE_SCHEDULE_STATIC:
+	pp_string (buffer, "static");
+	break;
+      case OMP_CLAUSE_SCHEDULE_DYNAMIC:
+	pp_string (buffer, "dynamic");
+	break;
+      case OMP_CLAUSE_SCHEDULE_GUIDED:
+	pp_string (buffer, "guided");
+	break;
+      case OMP_CLAUSE_SCHEDULE_RUNTIME:
+	pp_string (buffer, "runtime");
+	break;
+      default:
+	gcc_unreachable ();
+	}
+      if (OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (clause))
+	{
+	  pp_character (buffer, ',');
+	  dump_generic_node (buffer,
+	      OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (clause),
+	      spc, flags, false);
 	}
+      pp_character (buffer, ')');
+      break;
+
+    default:
+      /* Should never happen.  */
+      dump_generic_node (buffer, clause, spc, flags, false);
+      break;
+    }
+}
+
+
+/* Dump the list of OpenMP clauses.  BUFFER, SPC and FLAGS are as in
+   dump_generic_node.  */
+
+static void
+dump_omp_clauses (pretty_printer *buffer, tree clause, int spc, int flags)
+{
+  if (clause == NULL)
+    return;
 
+  pp_space (buffer);
+  while (1)
+    {
+      dump_omp_clause (buffer, clause, spc, flags);
       clause = OMP_CLAUSE_CHAIN (clause);
       if (clause == NULL)
 	return;
@@ -397,6 +408,7 @@ dump_omp_clauses (pretty_printer *buffer
     }
 }
 
+
 /* Dump the node NODE on the pretty_printer BUFFER, SPC spaces of indent.
    FLAGS specifies details to show in the dump (see TDF_* in tree.h).  If
    IS_STMT is true, the object printed is considered to be a statement
@@ -1823,6 +1835,11 @@ dump_generic_node (pretty_printer *buffe
       is_expr = false;
       break;
 
+    case OMP_CLAUSE:
+      dump_omp_clause (buffer, node, spc, flags);
+      is_expr = false;
+      break;
+
     case REDUC_MAX_EXPR:
       pp_string (buffer, " REDUC_MAX_EXPR < ");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
--- gcc/tree.c	(revision 110285)
+++ gcc/tree.c	(revision 110286)
@@ -96,7 +96,8 @@ static const char * const tree_node_kind
   "constructors",
   "random kinds",
   "lang_decl kinds",
-  "lang_type kinds"
+  "lang_type kinds",
+  "omp clauses"
 };
 #endif /* GATHER_STATISTICS */
 
@@ -172,13 +173,49 @@ tree global_trees[TI_MAX];
 tree integer_types[itk_none];
 
 unsigned char tree_contains_struct[256][64];
+
+/* Number of operands for each OpenMP clause.  */
+unsigned const char omp_clause_num_ops[] =
+{
+  0, /* OMP_CLAUSE_ERROR  */
+  1, /* OMP_CLAUSE_PRIVATE  */
+  1, /* OMP_CLAUSE_SHARED  */
+  1, /* OMP_CLAUSE_FIRSTPRIVATE  */
+  1, /* OMP_CLAUSE_LASTPRIVATE  */
+  4, /* OMP_CLAUSE_REDUCTION  */
+  1, /* OMP_CLAUSE_COPYIN  */
+  1, /* OMP_CLAUSE_COPYPRIVATE  */
+  1, /* OMP_CLAUSE_IF  */
+  1, /* OMP_CLAUSE_NUM_THREADS  */
+  1, /* OMP_CLAUSE_SCHEDULE  */
+  0, /* OMP_CLAUSE_NOWAIT  */
+  0, /* OMP_CLAUSE_ORDERED  */
+  0  /* OMP_CLAUSE_DEFAULT  */
+};
+
+const char * const omp_clause_code_name[] =
+{
+  "error_clause",
+  "private",
+  "shared",
+  "firstprivate",
+  "lastprivate",
+  "reduction",
+  "copyin",
+  "copyprivate",
+  "if",
+  "num_threads",
+  "schedule",
+  "nowait",
+  "ordered",
+  "default"
+};
 
 /* Init tree.c.  */
 
 void
 init_ttree (void)
 {
-
   /* Initialize the hash table of types.  */
   type_hash_table = htab_create_ggc (TYPE_HASH_INITIAL_SIZE, type_hash_hash,
 				     type_hash_eq, 0);
@@ -338,6 +375,7 @@ tree_code_size (enum tree_code code)
 	case PLACEHOLDER_EXPR:	return sizeof (struct tree_common);
 
 	case TREE_VEC:
+	case OMP_CLAUSE:
 	case PHI_NODE:		gcc_unreachable ();
 
 	case SSA_NAME:		return sizeof (struct tree_ssa_name);
@@ -379,6 +417,11 @@ tree_size (tree node)
     case STRING_CST:
       return sizeof (struct tree_string) + TREE_STRING_LENGTH (node) - 1;
 
+    case OMP_CLAUSE:
+      return (sizeof (struct tree_omp_clause)
+	      + (omp_clause_num_ops[OMP_CLAUSE_CODE (node)] - 1)
+	        * sizeof (tree));
+
     default:
       return tree_code_size (code);
     }
@@ -386,8 +429,9 @@ tree_size (tree node)
 
 /* Return a newly allocated node of code CODE.  For decl and type
    nodes, some other fields are initialized.  The rest of the node is
-   initialized to zero.  This function cannot be used for PHI_NODE or
-   TREE_VEC nodes, which is enforced by asserts in tree_code_size.
+   initialized to zero.  This function cannot be used for PHI_NODE,
+   TREE_VEC or OMP_CLAUSE nodes, which is enforced by asserts in
+   tree_code_size.
 
    Achoo!  I got a code in the node.  */
 
@@ -2036,6 +2080,7 @@ tree_node_structure (tree t)
     case CONSTRUCTOR:		return TS_CONSTRUCTOR;
     case TREE_BINFO:		return TS_BINFO;
     case VALUE_HANDLE:		return TS_VALUE_HANDLE;
+    case OMP_CLAUSE:		return TS_OMP_CLAUSE;
 
     default:
       gcc_unreachable ();
@@ -6109,6 +6154,53 @@ tree_not_class_check_failed (const tree 
      tree_code_name[TREE_CODE (node)], function, trim_filename (file), line);
 }
 
+
+/* Similar to tree_check_failed but applied to OMP_CLAUSE codes.  */
+
+void
+omp_clause_check_failed (const tree node, const char *file, int line,
+                         const char *function, enum omp_clause_code code)
+{
+  internal_error ("tree check: expected omp_clause %s, have %s in %s, at %s:%d",
+		  omp_clause_code_name[code], tree_code_name[TREE_CODE (node)],
+		  function, trim_filename (file), line);
+}
+
+
+/* Similar to tree_range_check_failed but applied to OMP_CLAUSE codes.  */
+
+void
+omp_clause_range_check_failed (const tree node, const char *file, int line,
+			       const char *function, enum omp_clause_code c1,
+			       enum omp_clause_code c2)
+{
+  char *buffer;
+  unsigned length = 0;
+  enum omp_clause_code c;
+
+  for (c = c1; c <= c2; ++c)
+    length += 4 + strlen (omp_clause_code_name[c]);
+
+  length += strlen ("expected ");
+  buffer = alloca (length);
+  length = 0;
+
+  for (c = c1; c <= c2; ++c)
+    {
+      const char *prefix = length ? " or " : "expected ";
+
+      strcpy (buffer + length, prefix);
+      length += strlen (prefix);
+      strcpy (buffer + length, omp_clause_code_name[c]);
+      length += strlen (omp_clause_code_name[c]);
+    }
+
+  internal_error ("tree check: %s, have %s in %s, at %s:%d",
+		  buffer, omp_clause_code_name[TREE_CODE (node)],
+		  function, trim_filename (file), line);
+}
+
+
 #undef DEFTREESTRUCT
 #define DEFTREESTRUCT(VAL, NAME) NAME,
 
@@ -6171,6 +6263,20 @@ tree_operand_check_failed (int idx, enum
      idx + 1, tree_code_name[code], TREE_CODE_LENGTH (code),
      function, trim_filename (file), line);
 }
+
+/* Similar to above, except that the check is for the number of
+   operands of an OMP_CLAUSE node.  */
+
+void
+omp_clause_operand_check_failed (int idx, tree t, const char *file,
+			         int line, const char *function)
+{
+  internal_error
+    ("tree check: accessed operand %d of omp_clause %s with %d operands "
+     "in %s, at %s:%d", idx + 1, omp_clause_code_name[OMP_CLAUSE_CODE (t)],
+     omp_clause_num_ops [OMP_CLAUSE_CODE (t)], function,
+     trim_filename (file), line);
+}
 #endif /* ENABLE_TREE_CHECKING */
 
 /* Create a new vector type node holding SUBPARTS units of type INNERTYPE,
@@ -6733,6 +6839,31 @@ build_empty_stmt (void)
 }
 
 
+/* Build an OpenMP clause with code CODE.  */
+
+tree
+build_omp_clause (enum omp_clause_code code)
+{
+  tree t;
+  int size, length;
+
+  length = omp_clause_num_ops[code];
+  size = (sizeof (struct tree_omp_clause) + (length - 1) * sizeof (tree));
+
+  t = ggc_alloc (size);
+  memset (t, 0, size);
+  TREE_SET_CODE (t, OMP_CLAUSE);
+  OMP_CLAUSE_SET_CODE (t, code);
+
+#ifdef GATHER_STATISTICS
+  tree_node_counts[(int) omp_clause_kind]++;
+  tree_node_sizes[(int) omp_clause_kind] += size;
+#endif
+  
+  return t;
+}
+
+
 /* Returns true if it is possible to prove that the index of
    an array access REF (an ARRAY_REF expression) falls into the
    array bounds.  */
@@ -7211,7 +7342,7 @@ walk_tree (tree *tp, walk_tree_fn func, 
       /* But we still need to check our siblings.  */
       if (code == TREE_LIST)
 	WALK_SUBTREE_TAIL (TREE_CHAIN (*tp));
-      else if (code >= OMP_CLAUSE_PRIVATE && code <= OMP_CLAUSE_DEFAULT)
+      else if (code == OMP_CLAUSE)
 	WALK_SUBTREE_TAIL (OMP_CLAUSE_CHAIN (*tp));
       else
 	return NULL_TREE;
@@ -7303,30 +7434,38 @@ walk_tree (tree *tp, walk_tree_fn func, 
       }
       break;
 
-    case OMP_CLAUSE_PRIVATE:
-    case OMP_CLAUSE_SHARED:
-    case OMP_CLAUSE_FIRSTPRIVATE:
-    case OMP_CLAUSE_LASTPRIVATE:
-    case OMP_CLAUSE_COPYIN:
-    case OMP_CLAUSE_COPYPRIVATE:
-    case OMP_CLAUSE_IF:
-    case OMP_CLAUSE_NUM_THREADS:
-    case OMP_CLAUSE_SCHEDULE:
-      WALK_SUBTREE (TREE_OPERAND (*tp, 0));
-      /* FALLTHRU */
+    case OMP_CLAUSE:
+      switch (OMP_CLAUSE_CODE (*tp))
+	{
+	case OMP_CLAUSE_PRIVATE:
+	case OMP_CLAUSE_SHARED:
+	case OMP_CLAUSE_FIRSTPRIVATE:
+	case OMP_CLAUSE_LASTPRIVATE:
+	case OMP_CLAUSE_COPYIN:
+	case OMP_CLAUSE_COPYPRIVATE:
+	case OMP_CLAUSE_IF:
+	case OMP_CLAUSE_NUM_THREADS:
+	case OMP_CLAUSE_SCHEDULE:
+	  WALK_SUBTREE (OMP_CLAUSE_OPERAND (*tp, 0));
+	  /* FALLTHRU */
+
+	case OMP_CLAUSE_NOWAIT:
+	case OMP_CLAUSE_ORDERED:
+	case OMP_CLAUSE_DEFAULT:
+	  WALK_SUBTREE_TAIL (OMP_CLAUSE_CHAIN (*tp));
 
-    case OMP_CLAUSE_NOWAIT:
-    case OMP_CLAUSE_ORDERED:
-    case OMP_CLAUSE_DEFAULT:
-      WALK_SUBTREE_TAIL (OMP_CLAUSE_CHAIN (*tp));
+	case OMP_CLAUSE_REDUCTION:
+	  {
+	    int i;
+	    for (i = 0; i < 4; i++)
+	      WALK_SUBTREE (OMP_CLAUSE_OPERAND (*tp, i));
+	    WALK_SUBTREE_TAIL (OMP_CLAUSE_CHAIN (*tp));
+	  }
 
-    case OMP_CLAUSE_REDUCTION:
-      {
-	int i;
-	for (i = 0; i < 4; i++)
-	  WALK_SUBTREE (TREE_OPERAND (*tp, i));
-	WALK_SUBTREE_TAIL (OMP_CLAUSE_CHAIN (*tp));
-      }
+	default:
+	  gcc_unreachable ();
+	}
+      break;
 
     case TARGET_EXPR:
       {
--- gcc/tree.h	(revision 110285)
+++ gcc/tree.h	(revision 110286)
@@ -251,6 +251,66 @@ extern const char * built_in_names[(int)
 extern GTY(()) tree built_in_decls[(int) END_BUILTINS];
 extern GTY(()) tree implicit_built_in_decls[(int) END_BUILTINS];
 
+/* In an OMP_CLAUSE node.  */
+
+/* Number of operands and names for each clause.  */
+extern unsigned const char omp_clause_num_ops[];
+extern const char * const omp_clause_code_name[];
+
+/* Clause codes.  Do not reorder, as this is used to index into the tables
+   omp_clause_num_ops and omp_clause_code_name.  */
+enum omp_clause_code
+{
+  /* Clause zero is special-cased inside the parser
+     (c_parser_omp_variable_list).  */
+  OMP_CLAUSE_ERROR = 0,
+
+  /* OpenMP clause: private (variable_list).  */
+  OMP_CLAUSE_PRIVATE,
+
+  /* OpenMP clause: shared (variable_list).  */
+  OMP_CLAUSE_SHARED,
+
+  /* OpenMP clause: firstprivate (variable_list).  */
+  OMP_CLAUSE_FIRSTPRIVATE,
+
+  /* OpenMP clause: lastprivate (variable_list).  */
+  OMP_CLAUSE_LASTPRIVATE,
+
+  /* OpenMP clause: reduction (operator:variable_list).
+     OMP_CLAUSE_REDUCTION_CODE: The tree_code of the operator.
+     Operand 1: OMP_CLAUSE_REDUCTION_INIT: Stmt-list to initialize the var.
+     Operand 2: OMP_CLAUSE_REDUCTION_MERGE: Stmt-list to merge private var 
+                into the shared one.
+     Operand 3: OMP_CLAUSE_REDUCTION_PLACEHOLDER: A dummy VAR_DECL
+                placeholder used in OMP_CLAUSE_REDUCTION_MERGE.  */
+  OMP_CLAUSE_REDUCTION,
+
+  /* OpenMP clause: copyin (variable_list).  */
+  OMP_CLAUSE_COPYIN,
+
+  /* OpenMP clause: copyprivate (variable_list).  */
+  OMP_CLAUSE_COPYPRIVATE,
+
+  /* OpenMP clause: if (scalar-expression).  */
+  OMP_CLAUSE_IF,
+
+  /* OpenMP clause: num_threads (integer-expression).  */
+  OMP_CLAUSE_NUM_THREADS,
+
+  /* OpenMP clause: schedule.  */
+  OMP_CLAUSE_SCHEDULE,
+
+  /* OpenMP clause: nowait.  */
+  OMP_CLAUSE_NOWAIT,
+
+  /* OpenMP clause: ordered.  */
+  OMP_CLAUSE_ORDERED,
+
+  /* OpenMP clause: default.  */
+  OMP_CLAUSE_DEFAULT
+};
+
 /* The definition of tree nodes fills the next several pages.  */
 
 /* A tree node can represent a data type, a variable, an expression
@@ -588,11 +648,32 @@ enum tree_node_structure_enum {
 
 #define TREE_RANGE_CHECK(T, CODE1, CODE2) __extension__			\
 ({  const tree __t = (T);						\
-    if (TREE_CODE (__t) < (CODE1) && TREE_CODE (__t) > (CODE2))		\
+    if (TREE_CODE (__t) < (CODE1) || TREE_CODE (__t) > (CODE2))		\
       tree_range_check_failed (__t, __FILE__, __LINE__, __FUNCTION__,	\
 			       (CODE1), (CODE2));			\
     __t; })
 
+#define OMP_CLAUSE_SUBCODE_CHECK(T, CODE) __extension__			\
+({  const tree __t = (T);						\
+    if (TREE_CODE (__t) != OMP_CLAUSE)					\
+      tree_check_failed (__t, __FILE__, __LINE__, __FUNCTION__,  	\
+			 OMP_CLAUSE, 0);				\
+    if (__t->omp_clause.code != (CODE))					\
+      omp_clause_check_failed (__t, __FILE__, __LINE__, __FUNCTION__, 	\
+			       (CODE));					\
+    __t; })
+
+#define OMP_CLAUSE_RANGE_CHECK(T, CODE1, CODE2) __extension__		\
+({  const tree __t = (T);						\
+    if (TREE_CODE (__t) != OMP_CLAUSE)					\
+      tree_check_failed (__t, __FILE__, __LINE__, __FUNCTION__,  	\
+			 OMP_CLAUSE, 0);				\
+    if ((int) __t->omp_clause.code < (int) (CODE1)			\
+        || (int) __t->omp_clause.code > (int) (CODE2))			\
+      omp_clause_range_check_failed (__t, __FILE__, __LINE__,		\
+				     __FUNCTION__, (CODE1), (CODE2));	\
+    __t; })
+
 /* These checks have to be special cased.  */
 #define EXPR_CHECK(T) __extension__					\
 ({  const tree __t = (T);						\
@@ -632,6 +713,17 @@ enum tree_node_structure_enum {
 				 __FILE__, __LINE__, __FUNCTION__);	\
     &__t->phi.a[__i]; }))
 
+#define OMP_CLAUSE_ELT_CHECK(t, i) __extension__			\
+(*({const tree __t = t;							\
+    const int __i = (i);						\
+    if (TREE_CODE (__t) != OMP_CLAUSE)					\
+      tree_check_failed (__t, __FILE__, __LINE__, __FUNCTION__,  	\
+			 OMP_CLAUSE, 0);				\
+    if (__i < 0 || __i >= omp_clause_num_ops [__t->omp_clause.code])	\
+      omp_clause_operand_check_failed (__i, __t, __FILE__, __LINE__,	\
+	                               __FUNCTION__);			\
+    &__t->omp_clause.ops[__i]; }))
+
 /* Special checks for TREE_OPERANDs.  */
 #define TREE_OPERAND_CHECK(T, I) __extension__				\
 (*({const tree __t = EXPR_CHECK (T);					\
@@ -686,6 +778,16 @@ extern void phi_node_elt_check_failed (i
 extern void tree_operand_check_failed (int, enum tree_code,
 				       const char *, int, const char *)
     ATTRIBUTE_NORETURN;
+extern void omp_clause_check_failed (const tree, const char *, int,
+				     const char *, enum omp_clause_code)
+    ATTRIBUTE_NORETURN;
+extern void omp_clause_operand_check_failed (int, tree, const char *,
+				             int, const char *)
+    ATTRIBUTE_NORETURN;
+extern void omp_clause_range_check_failed (const tree, const char *, int,
+			       const char *, enum omp_clause_code,
+			       enum omp_clause_code)
+    ATTRIBUTE_NORETURN;
 
 #else /* not ENABLE_TREE_CHECKING, or not gcc */
 
@@ -709,10 +811,13 @@ extern void tree_operand_check_failed (i
 #define TREE_OPERAND_CHECK_CODE(T, CODE, I)	((T)->exp.operands[I])
 #define TREE_RTL_OPERAND_CHECK(T, CODE, I)  (*(rtx *) &((T)->exp.operands[I]))
 #define PHI_NODE_ELT_CHECK(T, i)	((T)->phi.a[i])
+#define OMP_CLAUSE_ELT_CHECK(T, i)	        ((T)->omp_clause.ops[i])
+#define OMP_CLAUSE_RANGE_CHECK(T, CODE1, CODE2)	(T)
+#define OMP_CLAUSE_SUBCODE_CHECK(T, CODE)	(T)
 
 #endif
 
-#define TREE_BLOCK(NODE)		((NODE)->exp.block)
+#define TREE_BLOCK(NODE)		(EXPR_CHECK (NODE)->exp.block)
 
 #include "tree-check.h"
 
@@ -1450,38 +1555,38 @@ struct tree_constructor GTY(())
 #define OMP_CRITICAL_BODY(NODE)    TREE_OPERAND (OMP_CRITICAL_CHECK (NODE), 0)
 #define OMP_CRITICAL_NAME(NODE)    TREE_OPERAND (OMP_CRITICAL_CHECK (NODE), 1)
 
-#define OMP_CLAUSE_CHAIN(NODE) \
-  TREE_CHAIN (TREE_RANGE_CHECK (NODE, OMP_CLAUSE_PRIVATE, OMP_CLAUSE_DEFAULT))
-#define OMP_CLAUSE_DECL(NODE) \
-  TREE_OPERAND (TREE_RANGE_CHECK (NODE, OMP_CLAUSE_PRIVATE, \
-				  OMP_CLAUSE_COPYPRIVATE), 0)
+#define OMP_CLAUSE_CHAIN(NODE)     TREE_CHAIN (OMP_CLAUSE_CHECK (NODE))
+#define OMP_CLAUSE_DECL(NODE)      					\
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_RANGE_CHECK (OMP_CLAUSE_CHECK (NODE),	\
+					      OMP_CLAUSE_PRIVATE,	\
+	                                      OMP_CLAUSE_COPYPRIVATE), 0)
 
 /* True on a PRIVATE clause if its decl is kept around for debugging
    information only and its DECL_VALUE_EXPR is supposed to point
    to what it has been remapped to.  */
 #define OMP_CLAUSE_PRIVATE_DEBUG(NODE) \
-  TREE_PUBLIC (OMP_CLAUSE_PRIVATE_CHECK (NODE))
+  TREE_PUBLIC (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_PRIVATE))
 
 /* True on a LASTPRIVATE clause if a FIRSTPRIVATE clause for the same
    decl is present in the chain.  */
 #define OMP_CLAUSE_LASTPRIVATE_FIRSTPRIVATE(NODE) \
-  TREE_PUBLIC (OMP_CLAUSE_LASTPRIVATE_CHECK (NODE))
+  TREE_PUBLIC (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_LASTPRIVATE))
 
 #define OMP_CLAUSE_IF_EXPR(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_IF_CHECK (NODE), 0)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_IF), 0)
 #define OMP_CLAUSE_NUM_THREADS_EXPR(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_NUM_THREADS_CHECK (NODE), 0)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_NUM_THREADS),0)
 #define OMP_CLAUSE_SCHEDULE_CHUNK_EXPR(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_SCHEDULE_CHECK (NODE), 0)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_SCHEDULE), 0)
 
 #define OMP_CLAUSE_REDUCTION_CODE(NODE)	\
-  (OMP_CLAUSE_REDUCTION_CHECK (NODE)->exp.complexity)
+  (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_REDUCTION)->omp_clause.subcode.reduction_code)
 #define OMP_CLAUSE_REDUCTION_INIT(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_REDUCTION_CHECK (NODE), 1)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_REDUCTION), 1)
 #define OMP_CLAUSE_REDUCTION_MERGE(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_REDUCTION_CHECK (NODE), 2)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_REDUCTION), 2)
 #define OMP_CLAUSE_REDUCTION_PLACEHOLDER(NODE) \
-  TREE_OPERAND (OMP_CLAUSE_REDUCTION_CHECK (NODE), 3)
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_REDUCTION), 3)
 
 enum omp_clause_schedule_kind
 {
@@ -1492,7 +1597,7 @@ enum omp_clause_schedule_kind
 };
 
 #define OMP_CLAUSE_SCHEDULE_KIND(NODE) \
-  (OMP_CLAUSE_SCHEDULE_CHECK (NODE)->exp.complexity)
+  (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_SCHEDULE)->omp_clause.subcode.schedule_kind)
 
 enum omp_clause_default_kind
 {
@@ -1503,7 +1608,7 @@ enum omp_clause_default_kind
 };
 
 #define OMP_CLAUSE_DEFAULT_KIND(NODE) \
-  (OMP_CLAUSE_DEFAULT_CHECK (NODE)->exp.complexity)
+  (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_DEFAULT)->omp_clause.subcode.default_kind)
 
 struct tree_exp GTY(())
 {
@@ -1649,6 +1754,30 @@ struct tree_phi_node GTY(())
   struct phi_arg_d GTY ((length ("((tree)&%h)->phi.num_args"))) a[1];
 };
 
+#define OMP_CLAUSE_CODE(NODE)					\
+	(OMP_CLAUSE_CHECK (NODE))->omp_clause.code
+
+#define OMP_CLAUSE_SET_CODE(NODE, CODE)				\
+	((OMP_CLAUSE_CHECK (NODE))->omp_clause.code = (CODE))
+
+#define OMP_CLAUSE_CODE(NODE)					\
+	(OMP_CLAUSE_CHECK (NODE))->omp_clause.code
+
+#define OMP_CLAUSE_OPERAND(NODE, I)				\
+	OMP_CLAUSE_ELT_CHECK (NODE, I)
+
+struct tree_omp_clause GTY(())
+{
+  struct tree_common common;
+  enum omp_clause_code code;
+  union omp_clause_subcode {
+    enum omp_clause_default_kind  default_kind;
+    enum omp_clause_schedule_kind schedule_kind;
+    enum tree_code                reduction_code;
+  } GTY ((skip)) subcode;
+  tree GTY ((length ("omp_clause_num_ops[TREE_CODE ((tree)&%h)]"))) ops[1];
+};
+
 
 struct varray_head_tag;
 
@@ -2952,6 +3081,7 @@ union tree_node GTY ((ptr_alias (union l
   struct tree_statement_list GTY ((tag ("TS_STATEMENT_LIST"))) stmt_list;
   struct tree_value_handle GTY ((tag ("TS_VALUE_HANDLE"))) value_handle;
   struct tree_constructor GTY ((tag ("TS_CONSTRUCTOR"))) constructor;
+  struct tree_omp_clause GTY ((tag ("TS_OMP_CLAUSE"))) omp_clause;
 };
 
 /* Standard named or nameless data types of the C compiler.  */
@@ -3312,6 +3442,7 @@ extern void annotate_with_file_line (tre
 extern void annotate_with_locus (tree, location_t);
 #endif
 extern tree build_empty_stmt (void);
+extern tree build_omp_clause (enum omp_clause_code);
 
 /* Construct various nodes representing data types.  */
 
@@ -4294,6 +4425,7 @@ typedef enum
   x_kind,
   lang_decl,
   lang_type,
+  omp_clause_kind,
   all_kinds
 } tree_node_kind;
 
--- gcc/omp-low.c	(revision 110285)
+++ gcc/omp-low.c	(revision 110286)
@@ -50,14 +50,9 @@ Software Foundation, 51 Franklin Street,
    re-gimplifing things when variables have been replaced with complex
    expressions.
 
-   Lowering of a parallel statement results in the contents of the 
-   parallel being moved to a new function, to be invoked by the thread
-   library.  The variable remapping process is complex enough that only
-   one level of parallel statement is handled at one time.  If there are
-   nested parallel statements, those nested statements are handled when
-   the new function is lowered and optimized.  The result is not 100%
-   optimal, but lexically nested parallels effectively only happens in
-   test suites.  */
+   Final code generation is done by pass_expand_omp.  The flowgraph is
+   scanned for parallel regions which are then moved to a new
+   function, to be invoked by the thread library.  */
 
 /* Parallel region information.  Every parallel and workshare
    directive is enclosed between two markers, the OMP_* directive
@@ -159,7 +154,7 @@ static tree
 find_omp_clause (tree clauses, enum tree_code kind)
 {
   for (; clauses ; clauses = OMP_CLAUSE_CHAIN (clauses))
-    if (TREE_CODE (clauses) == kind)
+    if (OMP_CLAUSE_CODE (clauses) == kind)
       return clauses;
 
   return NULL_TREE;
@@ -247,7 +242,7 @@ extract_omp_for_data (tree for_stmt, str
   fd->chunk_size = NULL_TREE;
 
   for (t = OMP_FOR_CLAUSES (for_stmt); t ; t = OMP_CLAUSE_CHAIN (t))
-    switch (TREE_CODE (t))
+    switch (OMP_CLAUSE_CODE (t))
       {
       case OMP_CLAUSE_NOWAIT:
 	fd->have_nowait = true;
@@ -948,7 +943,7 @@ scan_sharing_clauses (tree clauses, omp_
     {
       bool by_ref;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	  decl = OMP_CLAUSE_DECL (c);
@@ -971,7 +966,7 @@ scan_sharing_clauses (tree clauses, omp_
 	      break;
 	    }
 	  /* We don't need to copy const scalar vars back.  */
-	  TREE_SET_CODE (c, OMP_CLAUSE_FIRSTPRIVATE);
+	  OMP_CLAUSE_SET_CODE (c, OMP_CLAUSE_FIRSTPRIVATE);
 	  goto do_private;
 
 	case OMP_CLAUSE_LASTPRIVATE:
@@ -1014,7 +1009,7 @@ scan_sharing_clauses (tree clauses, omp_
 	case OMP_CLAUSE_NUM_THREADS:
 	case OMP_CLAUSE_SCHEDULE:
 	  if (ctx->outer)
-	    scan_omp (&TREE_OPERAND (c, 0), ctx->outer);
+	    scan_omp (&OMP_CLAUSE_OPERAND (c, 0), ctx->outer);
 	  break;
 
 	case OMP_CLAUSE_NOWAIT:
@@ -1028,7 +1023,7 @@ scan_sharing_clauses (tree clauses, omp_
 
   for (c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
     {
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_LASTPRIVATE:
 	  /* Let the corresponding firstprivate clause create
@@ -1044,9 +1039,9 @@ scan_sharing_clauses (tree clauses, omp_
 	  if (is_variable_sized (decl))
 	    install_var_local (decl, ctx);
 	  fixup_remapped_decl (decl, ctx,
-			       TREE_CODE (c) == OMP_CLAUSE_PRIVATE
+			       OMP_CLAUSE_CODE (c) == OMP_CLAUSE_PRIVATE
 			       && OMP_CLAUSE_PRIVATE_DEBUG (c));
-	  if (TREE_CODE (c) == OMP_CLAUSE_REDUCTION
+	  if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION
 	      && OMP_CLAUSE_REDUCTION_PLACEHOLDER (c))
 	    scan_array_reductions = true;
 	  break;
@@ -1073,7 +1068,7 @@ scan_sharing_clauses (tree clauses, omp_
 
   if (scan_array_reductions)
     for (c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
-      if (TREE_CODE (c) == OMP_CLAUSE_REDUCTION
+      if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION
 	  && OMP_CLAUSE_REDUCTION_PLACEHOLDER (c))
 	{
 	  scan_omp (&OMP_CLAUSE_REDUCTION_INIT (c), ctx);
@@ -1530,7 +1525,7 @@ lower_rec_input_clauses (tree clauses, t
     {
       for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c))
 	{
-	  enum tree_code c_kind = TREE_CODE (c);
+	  enum omp_clause_code c_kind = OMP_CLAUSE_CODE (c);
 	  tree var, new_var;
 	  bool by_ref;
 
@@ -1624,7 +1619,7 @@ lower_rec_input_clauses (tree clauses, t
 	  else if (pass != 0)
 	    continue;
 
-	  switch (TREE_CODE (c))
+	  switch (OMP_CLAUSE_CODE (c))
 	    {
 	    case OMP_CLAUSE_SHARED:
 	      /* Set up the DECL_VALUE_EXPR for shared variables now.  This
@@ -1758,7 +1753,7 @@ lower_lastprivate_clauses (tree clauses,
     {
       tree var, new_var;
 
-      if (TREE_CODE (c) != OMP_CLAUSE_LASTPRIVATE)
+      if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_LASTPRIVATE)
 	continue;
 
       var = OMP_CLAUSE_DECL (c);
@@ -1791,7 +1786,7 @@ lower_reduction_clauses (tree clauses, t
   /* First see if there is exactly one reduction clause.  Use OMP_ATOMIC
      update in that case, otherwise use a lock.  */
   for (c = clauses; c && count < 2; c = OMP_CLAUSE_CHAIN (c))
-    if (TREE_CODE (c) == OMP_CLAUSE_REDUCTION)
+    if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_REDUCTION)
       {
 	if (OMP_CLAUSE_REDUCTION_PLACEHOLDER (c))
 	  {
@@ -1810,7 +1805,7 @@ lower_reduction_clauses (tree clauses, t
       tree var, ref, new_var;
       enum tree_code code;
 
-      if (TREE_CODE (c) != OMP_CLAUSE_REDUCTION)
+      if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_REDUCTION)
 	continue;
 
       var = OMP_CLAUSE_DECL (c);
@@ -1883,7 +1878,7 @@ lower_copyprivate_clauses (tree clauses,
       tree var, ref, x;
       bool by_ref;
 
-      if (TREE_CODE (c) != OMP_CLAUSE_COPYPRIVATE)
+      if (OMP_CLAUSE_CODE (c) != OMP_CLAUSE_COPYPRIVATE)
 	continue;
 
       var = OMP_CLAUSE_DECL (c);
@@ -1920,7 +1915,7 @@ lower_send_clauses (tree clauses, tree *
       tree val, ref, x, var;
       bool by_ref, do_in = false, do_out = false;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_FIRSTPRIVATE:
 	case OMP_CLAUSE_COPYIN:
@@ -1939,7 +1934,7 @@ lower_send_clauses (tree clauses, tree *
 	continue;
       by_ref = use_pointer_for_field (val, false);
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_FIRSTPRIVATE:
 	case OMP_CLAUSE_COPYIN:
--- gcc/testsuite/gcc.dg/gomp/gomp.exp	(revision 110285)
+++ gcc/testsuite/gcc.dg/gomp/gomp.exp	(revision 110286)
@@ -3,6 +3,10 @@
 # Load support procs.
 load_lib gcc-dg.exp
 
+if ![check_effective_target_fopenmp] {
+  return
+}
+
 # Initialize `dg'.
 dg-init
 
--- gcc/testsuite/lib/target-supports.exp	(revision 110285)
+++ gcc/testsuite/lib/target-supports.exp	(revision 110286)
@@ -468,6 +468,41 @@ proc check_effective_target_tls_runtime 
     return $et_tls_runtime_saved
 }
 
+# Return 1 if compilation with -fopenmp is error-free for trivial
+# code, 0 otherwise.
+
+proc check_effective_target_fopenmp {} {
+    global et_fopenmp_saved
+    global et_fopenmp_target_name
+
+    if { ![info exists et_fopenmp_target_name] } {
+	set et_fopenmp_target_name ""
+    }
+
+    # If the target has changed since we set the cached value, clear it.
+    set current_target [current_target_name]
+    if { $current_target != $et_fopenmp_target_name } {
+	verbose "check_effective_target_fopenmp: `$et_fopenmp_target_name'" 2
+	set et_fopenmp_target_name $current_target
+	if [info exists et_fopenmp_saved] {
+	    verbose "check_effective_target_fopenmp: removing cached result" 2
+	    unset et_fopenmp_saved
+	}
+    }
+
+    if [info exists et_fopenmp_saved] {
+	verbose "check_effective_target_fopenmp: using cached result" 2
+    } else {
+	verbose "check_effective_target_fopenmp: compiling source" 2
+
+	set et_fopenmp_saved [string match "" [get_compiler_messages fopenmp object {
+	    void foo (void) { }
+	} "-fopenmp"]]
+    }
+    verbose "check_effective_target_fopenmp: returning $et_fopenmp_saved" 2
+    return $et_fopenmp_saved
+}
+
 # Return 1 if -fpic and -fPIC are supported, as in no warnings or errors
 # emitted, 0 otherwise.  Whether a shared library can actually be built is
 # out of scope for this test.
--- gcc/cp/cp-tree.h	(revision 110285)
+++ gcc/cp/cp-tree.h	(revision 110286)
@@ -2972,8 +2972,8 @@ extern void decl_shadowed_for_var_insert
    hold code (or code fragments) related to ctors, dtors, and op=.
    See semantics.c for details.  */
 #define CP_OMP_CLAUSE_INFO(NODE) \
-  TREE_BLOCK (TREE_RANGE_CHECK (NODE, OMP_CLAUSE_PRIVATE, \
-				OMP_CLAUSE_COPYPRIVATE))
+  TREE_TYPE (OMP_CLAUSE_RANGE_CHECK (NODE, OMP_CLAUSE_PRIVATE, \
+			             OMP_CLAUSE_COPYPRIVATE))
 
 /* These macros provide convenient access to the various _STMT nodes
    created when parsing template declarations.  */
--- gcc/cp/pt.c	(revision 110285)
+++ gcc/cp/pt.c	(revision 110286)
@@ -8113,7 +8113,7 @@ tsubst_omp_clauses (tree clauses, tree a
       OMP_CLAUSE_CHAIN (nc) = new_clauses;
       new_clauses = nc;
 
-      switch (TREE_CODE (nc))
+      switch (OMP_CLAUSE_CODE (nc))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	case OMP_CLAUSE_SHARED:
@@ -8125,8 +8125,8 @@ tsubst_omp_clauses (tree clauses, tree a
 	case OMP_CLAUSE_IF:
 	case OMP_CLAUSE_NUM_THREADS:
 	case OMP_CLAUSE_SCHEDULE:
-	  TREE_OPERAND (nc, 0)
-	    = tsubst_expr (TREE_OPERAND (oc, 0), args, complain, in_decl);
+	  OMP_CLAUSE_OPERAND (nc, 0)
+	    = tsubst_expr (OMP_CLAUSE_OPERAND (oc, 0), args, complain, in_decl);
 	  break;
 	case OMP_CLAUSE_NOWAIT:
 	case OMP_CLAUSE_ORDERED:
--- gcc/cp/semantics.c	(revision 110285)
+++ gcc/cp/semantics.c	(revision 110286)
@@ -3245,7 +3242,7 @@ finish_omp_clauses (tree clauses)
     {
       bool remove = false;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_SHARED:
 	  name = "shared";
@@ -3371,7 +3368,7 @@ finish_omp_clauses (tree clauses)
 
   for (pc = &clauses, c = clauses; c ; c = *pc)
     {
-      enum tree_code c_kind = TREE_CODE (c);
+      enum tree_code c_kind = OMP_CLAUSE_CODE (c);
       bool remove = false;
       bool need_complete_non_reference = false;
       bool need_default_ctor = false;
--- gcc/cp/parser.c	(revision 110285)
+++ gcc/cp/parser.c	(revision 110286)
@@ -17688,7 +17691,7 @@ check_no_duplicate_clause (tree clauses,
   tree c;
 
   for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c))
-    if (TREE_CODE (c) == code)
+    if (OMP_CLAUSE_CODE (c) == code)
       {
 	error ("too many %qs clauses", name);
 	break;
@@ -17710,7 +17713,7 @@ check_no_duplicate_clause (tree clauses,
    return the list created.  */
 
 static tree
-cp_parser_omp_var_list_no_open (cp_parser *parser, enum tree_code kind,
+cp_parser_omp_var_list_no_open (cp_parser *parser, enum omp_clause_code kind,
 				tree list)
 {
   while (1)
@@ -17729,7 +17732,7 @@ cp_parser_omp_var_list_no_open (cp_parse
 	cp_parser_name_lookup_error (parser, name, decl, NULL);
       else if (kind != 0)
 	{
-	  tree u = make_node (kind);
+	  tree u = build_omp_clause (kind);
 	  OMP_CLAUSE_DECL (u) = decl;
 	  OMP_CLAUSE_CHAIN (u) = list;
 	  list = u;
@@ -17765,7 +17768,7 @@ cp_parser_omp_var_list_no_open (cp_parse
    common case for omp clauses.  */
 
 static tree
-cp_parser_omp_var_list (cp_parser *parser, enum tree_code kind, tree list)
+cp_parser_omp_var_list (cp_parser *parser, enum omp_clause_code kind, tree list)
 {
   if (cp_parser_require (parser, CPP_OPEN_PAREN, "`('"))
     return cp_parser_omp_var_list_no_open (parser, kind, list);
@@ -17823,7 +17826,7 @@ cp_parser_omp_clause_default (cp_parser 
     return list;
 
   check_no_duplicate_clause (list, OMP_CLAUSE_DEFAULT, "default");
-  c = make_node (OMP_CLAUSE_DEFAULT);
+  c = build_omp_clause (OMP_CLAUSE_DEFAULT);
   OMP_CLAUSE_CHAIN (c) = list;
   OMP_CLAUSE_DEFAULT_KIND (c) = kind;
 
@@ -17851,7 +17854,7 @@ cp_parser_omp_clause_if (cp_parser *pars
 
   check_no_duplicate_clause (list, OMP_CLAUSE_IF, "if");
 
-  c = make_node (OMP_CLAUSE_IF);
+  c = build_omp_clause (OMP_CLAUSE_IF);
   OMP_CLAUSE_IF_EXPR (c) = t;
   OMP_CLAUSE_CHAIN (c) = list;
 
@@ -17868,7 +17871,7 @@ cp_parser_omp_clause_nowait (cp_parser *
 
   check_no_duplicate_clause (list, OMP_CLAUSE_NOWAIT, "nowait");
 
-  c = make_node (OMP_CLAUSE_NOWAIT);
+  c = build_omp_clause (OMP_CLAUSE_NOWAIT);
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -17894,7 +17897,7 @@ cp_parser_omp_clause_num_threads (cp_par
 
   check_no_duplicate_clause (list, OMP_CLAUSE_NUM_THREADS, "num_threads");
 
-  c = make_node (OMP_CLAUSE_NUM_THREADS);
+  c = build_omp_clause (OMP_CLAUSE_NUM_THREADS);
   OMP_CLAUSE_NUM_THREADS_EXPR (c) = t;
   OMP_CLAUSE_CHAIN (c) = list;
 
@@ -17911,7 +17914,7 @@ cp_parser_omp_clause_ordered (cp_parser 
 
   check_no_duplicate_clause (list, OMP_CLAUSE_ORDERED, "ordered");
 
-  c = make_node (OMP_CLAUSE_ORDERED);
+  c = build_omp_clause (OMP_CLAUSE_ORDERED);
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -17993,7 +17996,7 @@ cp_parser_omp_clause_schedule (cp_parser
   if (!cp_parser_require (parser, CPP_OPEN_PAREN, "expected %<(%>"))
     return list;
 
-  c = make_node (OMP_CLAUSE_SCHEDULE);
+  c = build_omp_clause (OMP_CLAUSE_SCHEDULE);
 
   if (cp_lexer_next_token_is (parser->lexer, CPP_NAME))
     {
@@ -18082,8 +18085,7 @@ cp_parser_omp_all_clauses (cp_parser *pa
       switch (c_kind)
 	{
 	case PRAGMA_OMP_CLAUSE_COPYIN:
-	  clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_COPYIN,
-					    clauses);
+	  clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_COPYIN, clauses);
 	  c_name = "copyin";
 	  break;
 	case PRAGMA_OMP_CLAUSE_COPYPRIVATE:
--- gcc/gimple-low.c	(revision 110285)
+++ gcc/gimple-low.c	(revision 110286)
@@ -166,9 +166,6 @@ lower_omp_directive (tree_stmt_iterator 
 	   ? OMP_CLAUSES (stmt)
 	   : NULL_TREE;
 
-  for (; clause; clause = OMP_CLAUSE_CHAIN (clause))
-    TREE_BLOCK (clause) = TREE_BLOCK (stmt);
-
   lower_stmt_body (OMP_BODY (stmt), data);
   tsi_link_before (tsi, stmt, TSI_SAME_STMT);
   tsi_link_before (tsi, OMP_BODY (stmt), TSI_SAME_STMT);
--- gcc/fortran/trans-openmp.c	(revision 110285)
+++ gcc/fortran/trans-openmp.c	(revision 110286)
@@ -218,7 +218,7 @@ gfc_trans_omp_variable (gfc_symbol *sym)
 }
 
 static tree
-gfc_trans_omp_variable_list (enum tree_code code, gfc_namelist *namelist,
+gfc_trans_omp_variable_list (enum omp_clause_code code, gfc_namelist *namelist,
 			     tree list)
 {
   for (; namelist != NULL; namelist = namelist->next)
@@ -227,7 +227,7 @@ gfc_trans_omp_variable_list (enum tree_c
 	tree t = gfc_trans_omp_variable (namelist->sym);
 	if (t != error_mark_node)
 	  {
-	    tree node = make_node (code);
+	    tree node = build_omp_clause (code);
 	    OMP_CLAUSE_DECL (node) = t;
 	    list = gfc_trans_add_clause (node, list);
 	  }
@@ -404,9 +404,8 @@ gfc_trans_omp_array_reduction (tree c, g
 }
 
 static tree
-gfc_trans_omp_reduction_list (enum tree_code code, gfc_namelist *namelist,
-			      tree list, enum tree_code reduction_code,
-			      locus where)
+gfc_trans_omp_reduction_list (gfc_namelist *namelist, tree list, 
+                              enum tree_code reduction_code, locus where)
 {
   for (; namelist != NULL; namelist = namelist->next)
     if (namelist->sym->attr.referenced)
@@ -414,7 +413,7 @@ gfc_trans_omp_reduction_list (enum tree_
 	tree t = gfc_trans_omp_variable (namelist->sym);
 	if (t != error_mark_node)
 	  {
-	    tree node = make_node (code);
+	    tree node = build_omp_clause (OMP_CLAUSE_REDUCTION);
 	    OMP_CLAUSE_DECL (node) = t;
 	    OMP_CLAUSE_REDUCTION_CODE (node) = reduction_code;
 	    if (namelist->sym->attr.dimension)
@@ -431,7 +430,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
 {
   tree omp_clauses = NULL_TREE, chunk_size, c, old_clauses;
   int list;
-  enum tree_code clause_code;
+  enum omp_clause_code clause_code;
   gfc_se se;
 
   if (clauses == NULL)
@@ -490,8 +489,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
 	    }
 	  old_clauses = omp_clauses;
 	  omp_clauses
-	    = gfc_trans_omp_reduction_list (OMP_CLAUSE_REDUCTION, n,
-					    omp_clauses, reduction_code,
+	    = gfc_trans_omp_reduction_list (n, omp_clauses, reduction_code,
 					    where);
 	  continue;
 	}
@@ -534,7 +532,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
       if_var = gfc_evaluate_now (se.expr, block);
       gfc_add_block_to_block (block, &se.post);
 
-      c = make_node (OMP_CLAUSE_IF);
+      c = build_omp_clause (OMP_CLAUSE_IF);
       OMP_CLAUSE_IF_EXPR (c) = if_var;
       omp_clauses = gfc_trans_add_clause (c, omp_clauses);
     }
@@ -549,7 +547,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
       num_threads = gfc_evaluate_now (se.expr, block);
       gfc_add_block_to_block (block, &se.post);
 
-      c = make_node (OMP_CLAUSE_NUM_THREADS);
+      c = build_omp_clause (OMP_CLAUSE_NUM_THREADS);
       OMP_CLAUSE_NUM_THREADS_EXPR (c) = num_threads;
       omp_clauses = gfc_trans_add_clause (c, omp_clauses);
     }
@@ -566,7 +564,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
 
   if (clauses->sched_kind != OMP_SCHED_NONE)
     {
-      c = make_node (OMP_CLAUSE_SCHEDULE);
+      c = build_omp_clause (OMP_CLAUSE_SCHEDULE);
       OMP_CLAUSE_SCHEDULE_CHUNK_EXPR (c) = chunk_size;
       switch (clauses->sched_kind)
 	{
@@ -590,7 +588,7 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
 
   if (clauses->default_sharing != OMP_DEFAULT_UNKNOWN)
     {
-      c = make_node (OMP_CLAUSE_DEFAULT);
+      c = build_omp_clause (OMP_CLAUSE_DEFAULT);
       switch (clauses->default_sharing)
 	{
 	case OMP_DEFAULT_NONE:
@@ -610,13 +608,13 @@ gfc_trans_omp_clauses (stmtblock_t *bloc
 
   if (clauses->nowait)
     {
-      c = make_node (OMP_CLAUSE_NOWAIT);
+      c = build_omp_clause (OMP_CLAUSE_NOWAIT);
       omp_clauses = gfc_trans_add_clause (c, omp_clauses);
     }
 
   if (clauses->ordered)
     {
-      c = make_node (OMP_CLAUSE_ORDERED);
+      c = build_omp_clause (OMP_CLAUSE_ORDERED);
       omp_clauses = gfc_trans_add_clause (c, omp_clauses);
     }
 
@@ -948,13 +946,13 @@ gfc_trans_omp_do (gfc_code *code, stmtbl
 
   if (!dovar_found)
     {
-      tmp = make_node (OMP_CLAUSE_PRIVATE);
+      tmp = build_omp_clause (OMP_CLAUSE_PRIVATE);
       OMP_CLAUSE_DECL (tmp) = dovar;
       omp_clauses = gfc_trans_add_clause (tmp, omp_clauses);
     }
   if (!simple)
     {
-      tmp = make_node (OMP_CLAUSE_PRIVATE);
+      tmp = build_omp_clause (OMP_CLAUSE_PRIVATE);
       OMP_CLAUSE_DECL (tmp) = count;
       omp_clauses = gfc_trans_add_clause (tmp, omp_clauses);
     }
--- gcc/c-typeck.c	(revision 110285)
+++ gcc/c-typeck.c	(revision 110286)
@@ -8511,7 +8482,7 @@ c_finish_omp_clauses (tree clauses)
       bool need_complete = false;
       bool need_implicitly_determined = false;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_SHARED:
 	  name = "shared";
--- gcc/gimplify.c	(revision 110285)
+++ gcc/gimplify.c	(revision 110286)
@@ -4443,7 +4443,7 @@ gimplify_scan_omp_clauses (tree *list_p,
       unsigned int flags;
       tree decl;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	  flags = GOVD_PRIVATE | GOVD_EXPLICIT;
@@ -4504,7 +4504,7 @@ gimplify_scan_omp_clauses (tree *list_p,
 	case OMP_CLAUSE_SCHEDULE:
 	case OMP_CLAUSE_IF:
 	case OMP_CLAUSE_NUM_THREADS:
-	  gs = gimplify_expr (&TREE_OPERAND (c, 0), pre_p, NULL,
+	  gs = gimplify_expr (&OMP_CLAUSE_OPERAND (c, 0), pre_p, NULL,
 			      is_gimple_val, fb_rvalue);
 	  if (gs == GS_ERROR)
 	    remove = true;
@@ -4540,7 +4540,7 @@ gimplify_adjust_omp_clauses_1 (splay_tre
   tree *list_p = (tree *) data;
   tree decl = (tree) n->key;
   unsigned flags = n->value;
-  enum tree_code code;
+  enum omp_clause_code code;
   tree clause;
   bool private_debug;
 
@@ -4572,7 +4572,8 @@ gimplify_adjust_omp_clauses_1 (splay_tre
   else
     gcc_unreachable ();
 
-  clause = build1 (code, void_type_node, decl);
+  clause = build_omp_clause (code);
+  OMP_CLAUSE_DECL (clause) = decl;
   OMP_CLAUSE_CHAIN (clause) = *list_p;
   if (private_debug)
     OMP_CLAUSE_PRIVATE_DEBUG (clause) = 1;
@@ -4592,7 +4593,7 @@ gimplify_adjust_omp_clauses (tree *list_
       splay_tree_node n;
       bool remove = false;
 
-      switch (TREE_CODE (c))
+      switch (OMP_CLAUSE_CODE (c))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	case OMP_CLAUSE_SHARED:
@@ -4602,14 +4603,14 @@ gimplify_adjust_omp_clauses (tree *list_
 	  remove = !(n->value & GOVD_SEEN);
 	  if (! remove)
 	    {
-	      bool shared = TREE_CODE (c) == OMP_CLAUSE_SHARED;
+	      bool shared = OMP_CLAUSE_CODE (c) == OMP_CLAUSE_SHARED;
 	      if ((n->value & GOVD_DEBUG_PRIVATE)
 		  || lang_hooks.decls.omp_private_debug_clause (decl, shared))
 		{
 		  gcc_assert ((n->value & GOVD_DEBUG_PRIVATE) == 0
 			      || ((n->value & GOVD_DATA_SHARE_CLASS)
 				  == GOVD_PRIVATE));
-		  TREE_SET_CODE (c, OMP_CLAUSE_PRIVATE);
+		  OMP_CLAUSE_SET_CODE (c, OMP_CLAUSE_PRIVATE);
 		  OMP_CLAUSE_PRIVATE_DEBUG (c) = 1;
 		}
 	    }
--- gcc/tree.def	(revision 110285)
+++ gcc/tree.def	(revision 110286)
@@ -1025,52 +1025,8 @@ DEFTREECODE (OMP_CRITICAL, "omp_critical
 	build_fold_indirect_ref of the address.  */
 DEFTREECODE (OMP_ATOMIC, "omp_atomic", tcc_statement, 2)
 
-/* The ordering of the codes between OMP_CLAUSE_PRIVATE and
-   OMP_CLAUSE_DEFAULT is exposed to TREE_RANGE_CHECK.  */
-/* OpenMP clause: private (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_PRIVATE, "private", tcc_expression, 1)
-
-/* OpenMP clause: shared (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_SHARED, "shared", tcc_expression, 1)
-
-/* OpenMP clause: firstprivate (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_FIRSTPRIVATE, "firstprivate", tcc_expression, 1)
-
-/* OpenMP clause: lastprivate (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_LASTPRIVATE, "lastprivate", tcc_expression, 1)
-
-/* OpenMP clause: reduction (operator:variable_list).
-   OMP_CLAUSE_REDUCTION_CODE: The tree_code of the operator.
-   Operand 1: OMP_CLAUSE_REDUCTION_INIT: Stmt-list to initialize the var.
-   Operand 2: OMP_CLAUSE_REDUCTION_MERGE:
-     Stmt-list to merge private var into the shared one.
-   Operand 3: OMP_CLAUSE_REDUCTION_PLACEHOLDER:
-     A dummy VAR_DECL placeholder used in OMP_CLAUSE_REDUCTION_MERGE.  */
-DEFTREECODE (OMP_CLAUSE_REDUCTION, "reduction", tcc_expression, 4)
-
-/* OpenMP clause: copyin (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_COPYIN, "copyin", tcc_expression, 1)
-
-/* OpenMP clause: copyprivate (variable_list).  */
-DEFTREECODE (OMP_CLAUSE_COPYPRIVATE, "copyprivate", tcc_expression, 1)
-
-/* OpenMP clause: if (scalar-expression).  */
-DEFTREECODE (OMP_CLAUSE_IF, "if", tcc_expression, 1)
-
-/* OpenMP clause: num_threads (integer-expression).  */
-DEFTREECODE (OMP_CLAUSE_NUM_THREADS, "num_threads", tcc_expression, 1)
-
-/* OpenMP clause: schedule.  */
-DEFTREECODE (OMP_CLAUSE_SCHEDULE, "schedule", tcc_expression, 1)
-
-/* OpenMP clause: nowait.  */
-DEFTREECODE (OMP_CLAUSE_NOWAIT, "nowait", tcc_expression, 0)
-
-/* OpenMP clause: ordered.  */
-DEFTREECODE (OMP_CLAUSE_ORDERED, "ordered", tcc_expression, 0)
-
-/* OpenMP clause: default.  */
-DEFTREECODE (OMP_CLAUSE_DEFAULT, "default", tcc_expression, 0)
+/* OpenMP clauses.  */
+DEFTREECODE (OMP_CLAUSE, "omp_clause", tcc_exceptional, 0)
 
 /* Return from an OpenMP directive.  */
 DEFTREECODE (OMP_RETURN_EXPR, "omp_return", tcc_statement, 0)
--- gcc/print-tree.c	(revision 110285)
+++ gcc/print-tree.c	(revision 110286)
@@ -825,6 +825,20 @@ print_node (FILE *file, const char *pref
 	    }
 	  break;
 
+	case OMP_CLAUSE:
+	    {
+	      int i;
+	      fprintf (file, " %s",
+		       omp_clause_code_name[OMP_CLAUSE_CODE (node)]);
+	      for (i = 0; i < omp_clause_num_ops[OMP_CLAUSE_CODE (node)]; i++)
+		{
+		  indent_to (file, indent + 4);
+		  fprintf (file, "op %d:", i);
+		  print_node_brief (file, "", OMP_CLAUSE_OPERAND (node, i), 0);
+		}
+	    }
+	  break;
+
 	default:
 	  if (EXCEPTIONAL_CLASS_P (node))
 	    lang_hooks.print_xnode (file, node, indent);
--- gcc/c-omp.c	(revision 110285)
+++ gcc/c-omp.c	(revision 110286)
@@ -382,13 +382,13 @@ c_split_parallel_clauses (tree clauses, 
   tree next;
 
   *par_clauses = NULL;
-  *ws_clauses = make_node (OMP_CLAUSE_NOWAIT);
+  *ws_clauses = build_omp_clause (OMP_CLAUSE_NOWAIT);
 
   for (; clauses ; clauses = next)
     {
       next = OMP_CLAUSE_CHAIN (clauses);
 
-      switch (TREE_CODE (clauses))
+      switch (OMP_CLAUSE_CODE (clauses))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	case OMP_CLAUSE_SHARED:
--- gcc/tree-nested.c	(revision 110285)
+++ gcc/tree-nested.c	(revision 110286)
@@ -1034,9 +1034,10 @@ convert_nonlocal_reference (tree *tp, in
       save_suppress = info->suppress_expansion;
       if (convert_nonlocal_omp_clauses (&OMP_PARALLEL_CLAUSES (t), wi))
 	{
-	  tree c;
-	  c = get_chain_decl (info);
-	  c = build1 (OMP_CLAUSE_FIRSTPRIVATE, void_type_node, c);
+	  tree c, decl;
+	  decl = get_chain_decl (info);
+	  c = build_omp_clause (OMP_CLAUSE_FIRSTPRIVATE);
+	  OMP_CLAUSE_DECL (c) = decl;
 	  OMP_CLAUSE_CHAIN (c) = OMP_PARALLEL_CLAUSES (t);
 	  OMP_PARALLEL_CLAUSES (t) = c;
 	}
@@ -1094,7 +1095,7 @@ convert_nonlocal_omp_clauses (tree *pcla
 
   for (clause = *pclauses; clause ; clause = OMP_CLAUSE_CHAIN (clause))
     {
-      switch (TREE_CODE (clause))
+      switch (OMP_CLAUSE_CODE (clause))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	case OMP_CLAUSE_FIRSTPRIVATE:
@@ -1119,7 +1120,8 @@ convert_nonlocal_omp_clauses (tree *pcla
 	case OMP_CLAUSE_NUM_THREADS:
 	  wi->val_only = true;
 	  wi->is_lhs = false;
-	  convert_nonlocal_reference (&TREE_OPERAND (clause, 0), &dummy, wi);
+	  convert_nonlocal_reference (&OMP_CLAUSE_OPERAND (clause, 0), &dummy,
+	                              wi);
 	  break;
 
 	case OMP_CLAUSE_NOWAIT:
@@ -1317,7 +1319,8 @@ convert_local_reference (tree *tp, int *
 	{
 	  tree c;
 	  (void) get_frame_type (info);
-	  c = build1 (OMP_CLAUSE_SHARED, void_type_node, info->frame_decl);
+	  c = build_omp_clause (OMP_CLAUSE_SHARED);
+	  OMP_CLAUSE_DECL (c) = info->frame_decl;
 	  OMP_CLAUSE_CHAIN (c) = OMP_PARALLEL_CLAUSES (t);
 	  OMP_PARALLEL_CLAUSES (t) = c;
 	}
@@ -1375,7 +1378,7 @@ convert_local_omp_clauses (tree *pclause
 
   for (clause = *pclauses; clause ; clause = OMP_CLAUSE_CHAIN (clause))
     {
-      switch (TREE_CODE (clause))
+      switch (OMP_CLAUSE_CODE (clause))
 	{
 	case OMP_CLAUSE_PRIVATE:
 	case OMP_CLAUSE_FIRSTPRIVATE:
@@ -1406,7 +1409,7 @@ convert_local_omp_clauses (tree *pclause
 	case OMP_CLAUSE_NUM_THREADS:
 	  wi->val_only = true;
 	  wi->is_lhs = false;
-	  convert_local_reference (&TREE_OPERAND (clause, 0), &dummy, wi);
+	  convert_local_reference (&OMP_CLAUSE_OPERAND (clause, 0), &dummy, wi);
 	  break;
 
 	case OMP_CLAUSE_NOWAIT:
--- gcc/tree-inline.c	(revision 110285)
+++ gcc/tree-inline.c	(revision 110286)
@@ -1607,19 +1607,7 @@ estimate_num_insns_1 (tree *tp, int *wal
     case OMP_ORDERED:
     case OMP_CRITICAL:
     case OMP_ATOMIC:
-    case OMP_CLAUSE_PRIVATE:
-    case OMP_CLAUSE_SHARED:
-    case OMP_CLAUSE_FIRSTPRIVATE:
-    case OMP_CLAUSE_LASTPRIVATE:
-    case OMP_CLAUSE_REDUCTION:
-    case OMP_CLAUSE_COPYIN:
-    case OMP_CLAUSE_COPYPRIVATE:
-    case OMP_CLAUSE_IF:
-    case OMP_CLAUSE_NUM_THREADS:
-    case OMP_CLAUSE_SCHEDULE:
-    case OMP_CLAUSE_NOWAIT:
-    case OMP_CLAUSE_ORDERED:
-    case OMP_CLAUSE_DEFAULT:
+    case OMP_CLAUSE:
     case OMP_RETURN_EXPR:
       break;
 
@@ -2310,20 +2298,7 @@ copy_tree_r (tree *tp, int *walk_subtree
 	 walk_tree to walk into the chain as well.  */
       if (code == PARM_DECL
 	  || code == TREE_LIST
-	  /* OpenMP clauses are linked through TREE_CHAIN.  */
-	  || code == OMP_CLAUSE_PRIVATE
-	  || code == OMP_CLAUSE_SHARED
-	  || code == OMP_CLAUSE_FIRSTPRIVATE
-	  || code == OMP_CLAUSE_LASTPRIVATE
-	  || code == OMP_CLAUSE_REDUCTION
-	  || code == OMP_CLAUSE_COPYIN
-	  || code == OMP_CLAUSE_COPYPRIVATE
-	  || code == OMP_CLAUSE_IF
-	  || code == OMP_CLAUSE_NUM_THREADS
-	  || code == OMP_CLAUSE_SCHEDULE
-	  || code == OMP_CLAUSE_NOWAIT
-	  || code == OMP_CLAUSE_ORDERED
-	  || code == OMP_CLAUSE_DEFAULT)
+	  || code == OMP_CLAUSE)
 	TREE_CHAIN (*tp) = chain;
 
       /* For now, we don't update BLOCKs when we make copies.  So, we
--- gcc/c-parser.c	(revision 110285)
+++ gcc/c-parser.c	(revision 110286)
@@ -6625,7 +6625,7 @@ check_no_duplicate_clause (tree clauses,
   tree c;
 
   for (c = clauses; c ; c = OMP_CLAUSE_CHAIN (c))
-    if (TREE_CODE (c) == code)
+    if (OMP_CLAUSE_CODE (c) == code)
       {
 	error ("too many %qs clauses", name);
 	break;
@@ -6644,7 +6644,8 @@ check_no_duplicate_clause (tree clauses,
    return the list created.  */
 
 static tree
-c_parser_omp_variable_list (c_parser *parser, enum tree_code kind, tree list)
+c_parser_omp_variable_list (c_parser *parser, enum omp_clause_code kind,
+                            tree list)
 {
   if (c_parser_next_token_is_not (parser, CPP_NAME)
       || c_parser_peek_token (parser)->id_kind != C_ID_ID)
@@ -6662,7 +6663,7 @@ c_parser_omp_variable_list (c_parser *pa
 	;
       else if (kind != 0)
 	{
-	  tree u = make_node (kind);
+	  tree u = build_omp_clause (kind);
 	  OMP_CLAUSE_DECL (u) = t;
 	  OMP_CLAUSE_CHAIN (u) = list;
 	  list = u;
@@ -6759,7 +6760,7 @@ c_parser_omp_clause_default (c_parser *p
     return list;
 
   check_no_duplicate_clause (list, OMP_CLAUSE_DEFAULT, "default");
-  c = make_node (OMP_CLAUSE_DEFAULT);
+  c = build_omp_clause (OMP_CLAUSE_DEFAULT);
   OMP_CLAUSE_CHAIN (c) = list;
   OMP_CLAUSE_DEFAULT_KIND (c) = kind;
 
@@ -6788,7 +6789,7 @@ c_parser_omp_clause_if (c_parser *parser
 
       check_no_duplicate_clause (list, OMP_CLAUSE_IF, "if");
 
-      c = make_node (OMP_CLAUSE_IF);
+      c = build_omp_clause (OMP_CLAUSE_IF);
       OMP_CLAUSE_IF_EXPR (c) = t;
       OMP_CLAUSE_CHAIN (c) = list;
       list = c;
@@ -6818,7 +6819,7 @@ c_parser_omp_clause_nowait (c_parser *pa
 
   check_no_duplicate_clause (list, OMP_CLAUSE_NOWAIT, "nowait");
 
-  c = make_node (OMP_CLAUSE_NOWAIT);
+  c = build_omp_clause (OMP_CLAUSE_NOWAIT);
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -6852,7 +6853,7 @@ c_parser_omp_clause_num_threads (c_parse
 
       check_no_duplicate_clause (list, OMP_CLAUSE_NUM_THREADS, "num_threads");
 
-      c = make_node (OMP_CLAUSE_NUM_THREADS);
+      c = build_omp_clause (OMP_CLAUSE_NUM_THREADS);
       OMP_CLAUSE_NUM_THREADS_EXPR (c) = t;
       OMP_CLAUSE_CHAIN (c) = list;
       list = c;
@@ -6871,7 +6872,7 @@ c_parser_omp_clause_ordered (c_parser *p
 
   check_no_duplicate_clause (list, OMP_CLAUSE_ORDERED, "ordered");
 
-  c = make_node (OMP_CLAUSE_ORDERED);
+  c = build_omp_clause (OMP_CLAUSE_ORDERED);
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -6963,7 +6964,7 @@ c_parser_omp_clause_schedule (c_parser *
   if (!c_parser_require (parser, CPP_OPEN_PAREN, "expected %<(%>"))
     return list;
 
-  c = make_node (OMP_CLAUSE_SCHEDULE);
+  c = build_omp_clause (OMP_CLAUSE_SCHEDULE);
 
   if (c_parser_next_token_is (parser, CPP_NAME))
     {
--- contrib/gcc_update	(revision 110285)
+++ contrib/gcc_update	(revision 110286)
@@ -114,6 +114,7 @@ libcpp/Makefile.in: libcpp/configure.ac 
 libcpp/configure: libcpp/configure.ac libcpp/aclocal.m4
 libgomp/aclocal.m4: libgomp/configure.ac libgomp/acinclude.m4
 libgomp/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4
+libgomp/testsuite/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4
 libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4
 libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4
 # Top level
--- gcc/treestruct.def	(revision 110285)
+++ gcc/treestruct.def	(revision 110286)
@@ -59,3 +59,4 @@ DEFTREESTRUCT(TS_BINFO, "binfo")
 DEFTREESTRUCT(TS_STATEMENT_LIST, "statement list")
 DEFTREESTRUCT(TS_VALUE_HANDLE, "value handle")
 DEFTREESTRUCT(TS_CONSTRUCTOR, "constructor")
+DEFTREESTRUCT(TS_OMP_CLAUSE, "omp clause")

gcc41-gomp-20060128-merge4.patch:
 0 files changed

--- NEW FILE gcc41-gomp-20060128-merge4.patch ---
2005-01-25  Paolo Bonzini  <bonzini at gnu.org>

	PR libgomp/25884
        * Makefile.am (omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Remove.
        * configure.ac (PERL): Don't set.
        (gstdint.h, omp.h, omp_lib.h, omp_lib.f90, libgomp_f.h): Create here.
        (OMP_LOCK_SIZE, OMP_LOCK_ALIGN, OMP_LOCK_KIND, OMP_NEST_LOCK_SIZE,
        OMP_NEST_LOCK_ALIGN, OMP_NEST_LOCK_KIND): New substitutions.
        * omp.h.in: Wrap the new configure substitutions with @ characters.
        * omp_lib.h.in, omp_lib.f90.in, libgomp_f.h.in: Likewise.
        * aclocal.m4, configure, Makefile.in: Regenerate.
        * mkomp_h.pl: Delete.

2005-01-24  Paolo Bonzini  <bonzini at gnu.org>

	PR libgomp/25259
	* configure.ac: Use GCC_HEADER_STDINT.
	* libgomp.h: Include gstdint.h.
	* libgomp_f.h.in: Don't include stdint.h or inttypes.h.
	* configure, Makefile.in, testsuite/Makefile.in, aclocal.m4: Rebuild.

2006-01-24  Richard Henderson  <rth at redhat.com>

	PR libgomp/25942
	* configure.ac: Add AM_MAINTAINER_MODE.
	* Makefile.in, aclocal.m4, configure, testsuite/Makefile.in: Rebuild.

2006-01-24  Diego Novillo  <dnovillo at redhat.com>

	* Makefile.in: Regenerate.
	* testsuite/Makefile.in: Regenerate.
	* aclocal.m4: Regenerate.

2006-01-23  Andreas Tobler  <a.tobler at schweiz.ch>

	* config/posix/proc.c: Conditional include of sys/loadavg.h for
	Solaris.
	* configure.ac: Add check for loadavg.h.
	(link_gomp): Adjust comment.
	* configure: Regenerate.
	* config.h.in: Regenerate.

2006-01-21  Steve Ellcey  <sje at cup.hp.com>

	PR libgomp/25877
	* configure.ac: Remove check for alloca.h.
	* configure: Regenerate.
	* config.h.in: Regenerate.
	* libgomp.h: define gomp_alloca to be __builtin_alloca.
	* team.c: Remove use of alloca.h.
	Call gomp_alloca instead of alloca.

2006-01-20  Steve Ellcey  <sje at cup.hp.com>

	PR libgomp/25877
	* team.c: Add include of alloca.h.
	* configure.ac: Add check for alloca.h.
	* configure: Regenerate.
	* config.h.in: Regenerate.

--- libgomp/mkomp_h.pl	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/mkomp_h.pl	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -1,122 +0,0 @@
-#!/usr/bin/perl -w
-#  Copyright (C) 2005 Free Software Foundation, Inc.
-#  Contributed by Richard Henderson <rth at redhat.com>.
-#
-#  This file is part of the GNU OpenMP Library (libgomp).
-#
-#  Libgomp is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-#  Libgomp 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 Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License 
-#  along with libgomp; see the file COPYING.LIB.  If not, write to the
-#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  MA 02110-1301, USA.
-#
-#  As a special exception, if you link this library with other files, some
-#  of which are compiled with GCC, to produce an executable, this library
-#  does not by itself cause the resulting executable to be covered by the
-#  GNU General Public License.  This exception does not however invalidate
-#  any other reasons why the executable file might be covered by the GNU
-#  General Public License.
-
-# This file fills in the blanks for omp.h.in, computing the size and
-# alignment of the lock types that we export.  We do this to avoid
-# polluting the namespace with e.g. pthreads declarations.
-
-$COMPILE = $ARGV[0];
-$INFILE = $ARGV[1];
-$OUTFILE = $ARGV[2];
-
-$HEADER = "#include \"omp-lock.h\"\n";
-
-# configure might put libtool specific options into $COMPILE.
-$COMPILE =~ s/ -Wc,/ /g;
-
-# Close stderr in order to discard compiler errors.  Which we expect apleanty.
-close STDERR;
-
-# Return true if the boolean expression evaluates true at compile-time.
-sub compile_test {
-	my $expr = shift;
-
-	open GCC, "|$COMPILE -fsyntax-only -xc -";
-	print GCC $HEADER;
-	print GCC "char test[($expr) ? 1 : -1];\n";
-	return close GCC;
-}
-
-# Return a number guaranteed to be larger than the integer epression.
-sub upper_bound {
-	use integer;
-	my $expr = shift;
-	my $max = 9;
-
-	while (compile_test("($expr) >= $max")) {
-		$max = $max * 2;
-	}
-
-	return $max;
-}
-
-# Return an exact number for the integer expression.
-sub binary_search {
-	use integer;
-	my $expr = shift;
-	my $low = 1;
-	my $high = upper_bound($expr);
-
-	while ($low < $high) {
-		my $mid = ($high + $low + 1) / 2;
-		if (compile_test("($expr) >= $mid")) {
-			$low = $mid;
-		} else {
-			$high = $mid - 1;
-		}
-	}
-
-	return $low;
-}
-
-# Apply OP to TYPE, where OP is either sizeof or __alignof.
-sub resolve {
-	my $op = shift;
-	my $type = shift;
-
-	return binary_search("$op($type)");
-}
-
-# Find all the constants we need.
-$sizeof_omp_lock_t = resolve ("sizeof", "omp_lock_t");
-$alignof_omp_lock_t = resolve ("__alignof", "omp_lock_t");
-$sizeof_omp_nest_lock_t = resolve ("sizeof", "omp_nest_lock_t");
-$alignof_omp_nest_lock_t = resolve ("__alignof", "omp_nest_lock_t");
-$omp_lock_kind = $sizeof_omp_lock_t;
-$omp_nest_lock_kind = $sizeof_omp_nest_lock_t;
-if ($sizeof_omp_lock_t >= 8 || $alignof_omp_lock_t > $sizeof_omp_lock_t) {
-	$omp_lock_kind = 8;
-}
-if ($sizeof_omp_nest_lock_t >= 8 || $alignof_omp_nest_lock_t > $sizeof_omp_nest_lock_t) {
-	$omp_nest_lock_kind = 8;
-}
-
-# Edit the input template into the output.
-open IN, "<", $INFILE;
-open OUT, ">", $OUTFILE;
-while (<IN>) {
-	s/OMP_LOCK_SIZE/$sizeof_omp_lock_t/o;
-	s/OMP_LOCK_ALIGN/$alignof_omp_lock_t/o;
-	s/OMP_NEST_LOCK_SIZE/$sizeof_omp_nest_lock_t/o;
-	s/OMP_NEST_LOCK_ALIGN/$alignof_omp_nest_lock_t/o;
-	s/OMP_LOCK_KIND/$omp_lock_kind/o;
-	s/OMP_NEST_LOCK_KIND/$omp_nest_lock_kind/o;
-	print OUT;
-}
-
-close OUT;
--- libgomp/configure	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/configure	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -308,7 +308,7 @@ ac_includes_default="\
 # 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS AR ac_ct_AR RANLIB ac_ct_RANLIB PERL LN_S LIBTOOL enable_shared enable_static FC FCFLAGS LDFLAGS ac_ct_FC libtoo!
l_VERSION CPP CPPFLAGS EGREP SECTION_LDFLAGS OPT_LDFLAGS LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE LIBGOMP_BUILD_VERSIONED_SHLIB_FALSE config_path XCFLAGS XLDFLAGS link_gomp USE_FORTRAN_TRUE USE_FORTRAN_FALSE 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar multi_basedir toolexecdir toolexeclibdir CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CFLAGS AR ac_ct_AR RANLIB ac_ct_RANLIB PERL LN_S LIBTOOL enable_shared enable_static MAINTAINER_MODE_TRUE MAINTAINER_MO!
DE_FALSE MAINT FC FCFLAGS LDFLAGS ac_ct_FC libtool_VERSION CPP CPPFLAGS EGREP SECTION_LDFLAGS OPT_LDFLAGS LIBGOMP_BUILD_VERSIONED_SHLIB_TRUE LIBGOMP_BUILD_VERSIONED_SHLIB_FALSE config_path XCFLAGS XLDFLAGS link_gomp USE_FORTRAN_TRUE USE_FORTRAN_FALSE OMP_LOCK_SIZE OMP_LOCK_ALIGN OMP_NEST_LOCK_SIZE OMP_NEST_LOCK_ALIGN OMP_LOCK_KIND OMP_NEST_LOCK_KIND LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -863,6 +863,8 @@ Optional Features:
   --enable-static=PKGS  build static libraries default=yes
   --enable-fast-install=PKGS  optimize for fast installation default=yes
[...6321 lines suppressed...]
 
+/* Avoid conflicting prototypes of alloca() in system headers by using
+   GCC's builtin alloca().  */
+#define gomp_alloca(x)  __builtin_alloca(x)
+
 /* error.c */
 
 extern void gomp_error (const char *, ...)
--- libgomp/omp_lib.f90.in	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/omp_lib.f90.in	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -28,8 +28,8 @@
       module omp_lib_kinds
         integer, parameter :: omp_integer_kind = 4
         integer, parameter :: omp_logical_kind = 4
-        integer, parameter :: omp_lock_kind = OMP_LOCK_KIND
-        integer, parameter :: omp_nest_lock_kind = OMP_NEST_LOCK_KIND
+        integer, parameter :: omp_lock_kind = @OMP_LOCK_KIND@
+        integer, parameter :: omp_nest_lock_kind = @OMP_NEST_LOCK_KIND@
       end module
 
       module omp_lib
--- libgomp/omp.h.in	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/omp.h.in	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -36,12 +36,14 @@
 
 typedef struct
 {
-  unsigned char _x[OMP_LOCK_SIZE] __attribute__((__aligned__(OMP_LOCK_ALIGN)));
+  unsigned char _x[@OMP_LOCK_SIZE@] 
+    __attribute__((__aligned__(@OMP_LOCK_ALIGN@)));
 } omp_lock_t;
 
 typedef struct
 {
-  unsigned char _x[OMP_NEST_LOCK_SIZE] __attribute__((__aligned__(OMP_NEST_LOCK_ALIGN)));
+  unsigned char _x[@OMP_NEST_LOCK_SIZE@] 
+    __attribute__((__aligned__(@OMP_NEST_LOCK_ALIGN@)));
 } omp_nest_lock_t;
 #endif
 
--- libgomp/testsuite/Makefile.in	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/testsuite/Makefile.in	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -40,7 +40,8 @@ subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
-	$(top_srcdir)/../config/lead-dot.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/stdint.m4 $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -88,8 +89,17 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
+OMP_LOCK_ALIGN = @OMP_LOCK_ALIGN@
+OMP_LOCK_KIND = @OMP_LOCK_KIND@
+OMP_LOCK_SIZE = @OMP_LOCK_SIZE@
+OMP_NEST_LOCK_ALIGN = @OMP_NEST_LOCK_ALIGN@
+OMP_NEST_LOCK_KIND = @OMP_NEST_LOCK_KIND@
+OMP_NEST_LOCK_SIZE = @OMP_NEST_LOCK_SIZE@
 OPT_LDFLAGS = @OPT_LDFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -175,7 +185,7 @@ RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -200,9 +210,9 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
--- libgomp/config.h.in	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/config.h.in	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -39,6 +39,9 @@
 /* Define to 1 if the target supports __sync_*_compare_and_swap */
 #undef HAVE_SYNC_BUILTINS
 
+/* Define to 1 if you have the <sys/loadavg.h> header file. */
+#undef HAVE_SYS_LOADAVG_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
--- libgomp/config/posix/proc.c	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/config/posix/proc.c	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth at redhat.com>.
 
    This file is part of the GNU OpenMP Library (libgomp).
@@ -34,6 +34,11 @@
 #include "libgomp.h"
 #include <unistd.h>
 #include <stdlib.h>
+#ifdef HAVE_GETLOADAVG
+# ifdef HAVE_SYS_LOADAVG_H
+#  include <sys/loadavg.h>
+# endif
+#endif
 
 
 /* At startup, determine the default number of threads.  It would seem
--- libgomp/Makefile.am	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/Makefile.am	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -38,17 +38,6 @@ if USE_FORTRAN
 nodist_include_HEADERS += omp_lib.mod omp_lib_kinds.mod
 endif
 
-omp.h: omp.h.in mkomp_h.pl
-	$(PERL) -w $(srcdir)/mkomp_h.pl "$(COMPILE)" $(srcdir)/omp.h.in omp.h
-omp_lib.h: omp_lib.h.in mkomp_h.pl
-	$(PERL) -w $(srcdir)/mkomp_h.pl "$(COMPILE)" $(srcdir)/omp_lib.h.in \
-	omp_lib.h
-omp_lib.f90: omp_lib.f90.in mkomp_h.pl
-	$(PERL) -w $(srcdir)/mkomp_h.pl "$(COMPILE)" $(srcdir)/omp_lib.f90.in \
-	omp_lib.f90
-libgomp_f.h: libgomp_f.h.in mkomp_h.pl
-	$(PERL) -w $(srcdir)/mkomp_h.pl "$(COMPILE)" $(srcdir)/libgomp_f.h.in \
-	libgomp_f.h
 omp_lib_kinds.mod: omp_lib.mod
 	:
 omp_lib.mod: omp_lib.f90
--- libgomp/omp_lib.h.in	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/omp_lib.h.in	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -26,8 +26,8 @@
 !  General Public License.
 
       integer omp_lock_kind, omp_nest_lock_kind, openmp_version
-      parameter (omp_lock_kind = OMP_LOCK_KIND)
-      parameter (omp_nest_lock_kind = OMP_NEST_LOCK_KIND)
+      parameter (omp_lock_kind = @OMP_LOCK_KIND@)
+      parameter (omp_nest_lock_kind = @OMP_NEST_LOCK_KIND@)
       parameter (openmp_version = 200505)
 
       external omp_init_lock, omp_init_nest_lock
--- libgomp/aclocal.m4	(.../redhat/gcc-4_1-branch/libgomp)	(revision 110322)
+++ libgomp/aclocal.m4	(.../gomp-20050608-branch/libgomp)	(revision 110322)
@@ -468,6 +468,35 @@ AC_DEFUN([AM_PROG_INSTALL_SH],
 install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 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.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
@@ -887,4 +916,5 @@ AC_SUBST([am__untar])
 
 m4_include([../config/depstand.m4])
 m4_include([../config/lead-dot.m4])
+m4_include([../config/stdint.m4])
 m4_include([acinclude.m4])

gcc41-gomp-20060128-merge5.patch:
 tree-cfg.c    |   24 ++++++++----------------
 tree-inline.c |    3 ++-
 2 files changed, 10 insertions(+), 17 deletions(-)

--- NEW FILE gcc41-gomp-20060128-merge5.patch ---
2006-02-01  Diego Novillo  <dnovillo at redhat.com>

	* tree-inline.c (copy_tree_r): Also copy OMP_CLAUSE nodes.
	* tree-cfg.c (move_block_to_fn): Use VARRAY for
	cfun->cfg->x_basic_block_info and cfun->cfg->x_label_to_block_map.

--- gcc/tree-inline.c.jj	2006-02-01 17:16:35.000000000 -0500
+++ gcc/tree-inline.c	2006-02-01 17:16:38.000000000 -0500
@@ -2381,7 +2381,8 @@ copy_tree_r (tree *tp, int *walk_subtree
   if (IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (code))
       || code == TREE_LIST
       || code == TREE_VEC
-      || code == TYPE_DECL)
+      || code == TYPE_DECL
+      || code == OMP_CLAUSE)
     {
       /* Because the chain gets clobbered when we make a copy, we save it
 	 here.  */
--- gcc/tree-cfg.c.jj	2006-02-01 11:07:08.000000000 -0500
+++ gcc/tree-cfg.c	2006-02-01 13:41:56.000000000 -0500
@@ -4515,10 +4515,8 @@ tree_duplicate_sese_region (edge entry, 
   return true;
 }
 
-/*
 DEF_VEC_P(basic_block);
 DEF_VEC_ALLOC_P(basic_block,heap);
-*/
 
 /* Add all the blocks dominated by ENTRY to the array BBS_P.  Stop
    adding blocks when the dominator traversal reaches EXIT.  This
@@ -4627,7 +4625,7 @@ move_block_to_fn (struct function *dest_
       }
 
   /* Remove BB from the original basic block array.  */
-  VEC_replace (basic_block, cfun->cfg->x_basic_block_info, bb->index, NULL);
+  VARRAY_BB (cfun->cfg->x_basic_block_info, bb->index) = NULL;
   cfun->cfg->x_n_basic_blocks--;
 
   /* Grow DEST_CFUN's basic block array if needed.  */
@@ -4636,15 +4634,14 @@ move_block_to_fn (struct function *dest_
   if (bb->index > cfg->x_last_basic_block)
     cfg->x_last_basic_block = bb->index;
 
-  sz = VEC_length (basic_block, cfg->x_basic_block_info);
+  sz = VARRAY_ACTIVE_SIZE (cfg->x_basic_block_info);
   if ((unsigned) cfg->x_last_basic_block >= sz)
     {
       sz = cfg->x_last_basic_block + (cfg->x_last_basic_block + 3) / 4;
-      VEC_safe_grow (basic_block, gc, cfg->x_basic_block_info, sz);
+      VARRAY_GROW (cfg->x_basic_block_info, sz);
     }
 
-  VEC_replace (basic_block, cfg->x_basic_block_info,
-               cfg->x_last_basic_block, bb);
+  VARRAY_BB (cfg->x_basic_block_info, cfg->x_last_basic_block) = bb;
 
   /* The statements in BB need to be associated with a new TREE_BLOCK.
      Labels need to be associated with a new label-to-block map.  */
@@ -4671,20 +4668,15 @@ move_block_to_fn (struct function *dest_
 
 	  gcc_assert (uid > -1);
 
-	  old_len = VEC_length (basic_block, cfg->x_label_to_block_map);
+	  old_len = VARRAY_SIZE (cfg->x_label_to_block_map);
 	  if (old_len <= (unsigned) uid)
 	    {
-	      basic_block *addr;
 	      unsigned new_len = 3 * uid / 2;
-	      VEC_safe_grow (basic_block, gc, cfg->x_label_to_block_map,
-			     new_len);
-	      addr = VEC_address (basic_block, cfg->x_label_to_block_map);
-	      memset (&addr[old_len], 0,
-		      sizeof (basic_block) * (new_len - old_len));
+	      VARRAY_GROW (cfg->x_label_to_block_map, new_len);
 	    }
 
-	  VEC_replace (basic_block, cfg->x_label_to_block_map, uid, bb);
-	  VEC_replace (basic_block, cfun->cfg->x_label_to_block_map, uid, NULL);
+	  VARRAY_BB (cfg->x_label_to_block_map, uid) = bb;
+	  VARRAY_BB (cfun->cfg->x_label_to_block_map, uid) = NULL;
 
 	  gcc_assert (DECL_CONTEXT (label) == dest_cfun->decl);
 

gcc41-gomp-20060128-merge6.patch:
 0 files changed

--- NEW FILE gcc41-gomp-20060128-merge6.patch ---
2006-01-29  Diego Novillo  <dnovillo at redhat.com>

	PR 25874
	* omp-low.c (execute_expand_omp): Move CFG cleanup code ...
	(expand_omp): ... here.
	(expand_omp_parallel): Only remove barriers for combined
	parallel+workshare constructs.

	* g++.dg/gomp/pr25874.C: New test.
	* gcc.dg/gomp/pr25874.c: New test.

--- gcc/omp-low.c	(revision 110391)
+++ gcc/omp-low.c	(revision 110392)
@@ -2279,13 +2279,16 @@ expand_omp_parallel (struct omp_region *
   entry_bb = bb_for_stmt (region->entry);
   exit_bb = bb_for_stmt (region->exit);
 
-  /* Barriers at the end of the function are not necessary and can be
-     removed.  Since the caller will have a barrier of its own, this
-     one is superfluous.  */
-  remove_exit_barrier (region);
-
   if (is_combined_parallel (region))
-    ws_args = region->ws_args;
+    {
+      ws_args = region->ws_args;
+
+      /* For combined parallel+workshare calls, barriers at the end of
+	 the function are not necessary and can be removed.  Since the
+	 caller will have a barrier of its own, the workshare barrier is
+	 superfluous.  */
+      remove_exit_barrier (region);
+    }
   else
     ws_args = NULL_TREE;
 
@@ -3244,6 +3247,13 @@ expand_omp (struct omp_region *region)
 	    gcc_unreachable ();
 	}
 
+      /* Expansion adds and removes basic block, edges, creates
+	 and exposes unreachable regions that need to be cleaned up
+	 before proceeding.  */
+      free_dominance_info (CDI_DOMINATORS);
+      free_dominance_info (CDI_POST_DOMINATORS);
+      cleanup_tree_cfg ();
+
       region = region->next;
     }
 }
@@ -3339,12 +3349,7 @@ execute_expand_omp (void)
       splay_tree_delete (omp_regions);
       root_omp_region = NULL;
       omp_regions = NULL;
-      free_dominance_info (CDI_DOMINATORS);
-      free_dominance_info (CDI_POST_DOMINATORS);
     }
-
-  /* Expansion adds basic blocks that may be merged.  */
-  cleanup_tree_cfg ();
 }
 
 static bool
--- gcc/testsuite/gcc.dg/gomp/pr25874.c	(revision 0)
+++ gcc/testsuite/gcc.dg/gomp/pr25874.c	(revision 110392)
@@ -0,0 +1,15 @@
+void foo();
+
+inline void bar()
+{
+  int i;
+  for ( i=0; i<1; ++i )
+#pragma omp parallel
+    foo();
+}
+
+void baz()
+{
+#pragma omp parallel
+  bar();
+}
--- gcc/testsuite/g++.dg/gomp/pr25874.C	(revision 0)
+++ gcc/testsuite/g++.dg/gomp/pr25874.C	(revision 110392)
@@ -0,0 +1,23 @@
+int foo();
+
+struct wigner_d
+  {
+  void recurse () {
+    int dd;
+    for (int j=0; j<=1; ++j) {
+#pragma omp parallel
+      dd=5;
+      }
+    }
+  };
+
+template<typename T> void rotate_alm(T arg)
+  {
+  wigner_d rec;
+  rec.recurse();
+#pragma omp parallel
+    foo();
+  }
+
+template void rotate_alm(float arg);
+template void rotate_alm(double arg);


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gcc41.spec	1 Feb 2006 18:38:16 -0000	1.21
+++ gcc41.spec	1 Feb 2006 22:56:36 -0000	1.22
@@ -1,6 +1,6 @@
 %define DATE 20060131
 %define gcc_version 4.1.0
-%define gcc_release 0.19
+%define gcc_release 0.20
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -99,6 +99,12 @@
 Patch18: gcc41-x86-mtune-generic1.patch
 Patch19: gcc41-x86-mtune-generic2.patch
 Patch20: gcc41-x86-mtune-generic3.patch
+Patch21: gcc41-gomp-20060128-merge1.patch
+Patch22: gcc41-gomp-20060128-merge2.patch
+Patch23: gcc41-gomp-20060128-merge3.patch
+Patch24: gcc41-gomp-20060128-merge4.patch
+Patch25: gcc41-gomp-20060128-merge5.patch
+Patch26: gcc41-gomp-20060128-merge6.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -449,6 +455,12 @@
 %patch18 -p0 -b .x86-mtune-generic1~
 %patch19 -p0 -b .x86-mtune-generic2~
 %patch20 -p0 -b .x86-mtune-generic3~
+%patch21 -p0 -b .gomp-20060128-merge1~
+%patch22 -p0 -b .gomp-20060128-merge2~
+%patch23 -p0 -b .gomp-20060128-merge3~
+%patch24 -p0 -b .gomp-20060128-merge4~
+%patch25 -p0 -b .gomp-20060128-merge5~
+%patch26 -p0 -b .gomp-20060128-merge6~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1537,6 +1549,10 @@
 %endif
 
 %changelog
+* Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.20
+- merge from gomp-20050808-branch (up to -r110392)
+  - fix PR c++/25874 (Diego Novillo)
+
 * Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.19
 - s390{,x} long double patch fix for s390x ICEs on test-ldouble
   and tst-align2 (Andreas Krebbel)



From fedora-cvs-commits at redhat.com  Wed Feb  1 23:01:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:01:11 -0500
Subject: rpms/kdegames/FC-4 kdegames-3.5.0-s390x.patch,NONE,1.1
Message-ID: <200602012301.k11N1BJv019976@cvs.devel.redhat.com>

Author: than

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

Added Files:
	kdegames-3.5.0-s390x.patch 
Log Message:
fix build problem on s390/s390x


kdegames-3.5.0-s390x.patch:
 acinclude.m4.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdegames-3.5.0-s390x.patch ---
--- kdegames-3.5.0-patched/admin/acinclude.m4.in.orig	2005-12-13 13:52:08.000000000 -0500
+++ kdegames-3.5.0-patched/admin/acinclude.m4.in	2005-12-13 13:53:08.000000000 -0500
@@ -5882,7 +5882,7 @@
     AC_LANG_CPLUSPLUS
     safe_CXXFLAGS=$CXXFLAGS
     safe_LDFLAGS=$LDFLAGS
-    CXXFLAGS="$CXXFLAGS -fpie"
+    CXXFLAGS="$CXXFLAGS -fPIE"
     LDFLAGS="$LDFLAGS -pie"
 
     AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
@@ -5912,7 +5912,7 @@
   AC_SUBST([KDE_USE_PIE])
 
   if test "$kde_has_pie_support" = "yes"; then
-    KDE_USE_FPIE="-fpie"
+    KDE_USE_FPIE="-fPIE"
     KDE_USE_PIE="-pie"
   fi
 ])



From fedora-cvs-commits at redhat.com  Wed Feb  1 23:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:03:40 -0500
Subject: rpms/kdegames/FC-4 kdegames.spec,1.39,1.40
Message-ID: <200602012303.k11N3elJ020055@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegames.spec 
Log Message:
fix typo



Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/FC-4/kdegames.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdegames.spec	1 Feb 2006 22:52:32 -0000	1.39
+++ kdegames.spec	1 Feb 2006 23:03:37 -0000	1.40
@@ -92,7 +92,7 @@
    --disable-rpath \
 %if %{disable_gcc_check_and_hidden_visibility}
    --disable-gcc-hidden-visibility \
-%endi
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif



From fedora-cvs-commits at redhat.com  Wed Feb  1 23:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:04:56 -0500
Subject: rpms/avahi/devel avahi-0.6.5-bz179448.patch,1.1,1.2
Message-ID: <200602012304.k11N4us7020133@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20121

Modified Files:
	avahi-0.6.5-bz179448.patch 
Log Message:
fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64

avahi-0.6.5-bz179448.patch:
 socket.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)




From fedora-cvs-commits at redhat.com  Wed Feb  1 23:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:13:52 -0500
Subject: rpms/avahi/devel avahi.spec,1.34,1.35
Message-ID: <200602012313.k11NDqII020217@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20203

Modified Files:
	avahi.spec 
Log Message:
Upgrade to 0.6.6; fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- avahi.spec	1 Feb 2006 23:04:20 -0000	1.34
+++ avahi.spec	1 Feb 2006 23:13:49 -0000	1.35
@@ -302,6 +302,10 @@
 %endif
 
 %changelog
+* Wed Feb 01 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-1
+- fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64
+- Upgrade to 0.6.6
+
 * Thu Jan 26 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.5-1
 - Upgrade to upstream version 0.6.5
 - Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi



From fedora-cvs-commits at redhat.com  Wed Feb  1 23:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:13:57 -0500
Subject: rpms/avahi/devel avahi.spec,1.35,1.36
Message-ID: <200602012313.k11NDvUd020239@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20225

Modified Files:
	avahi.spec 
Log Message:
Upgrade to 0.6.6; fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64





From fedora-cvs-commits at redhat.com  Wed Feb  1 23:29:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 18:29:49 -0500
Subject: rpms/kdebindings/FC-4 .cvsignore, 1.26, 1.27 kdebindings.spec, 1.36,
	1.37 sources, 1.26, 1.27
Message-ID: <200602012329.k11NTnfu010762@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Dec 2005 12:06:07 -0000	1.26
+++ .cvsignore	1 Feb 2006 23:29:46 -0000	1.27
@@ -6,3 +6,4 @@
 kdebindings-3.4.1.tar.bz2
 kdebindings-3.4.2.tar.bz2
 kdebindings-3.5.0.tar.bz2
+kdebindings-3.5.1.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/kdebindings.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kdebindings.spec	13 Dec 2005 12:06:08 -0000	1.36
+++ kdebindings.spec	1 Feb 2006 23:29:46 -0000	1.37
@@ -1,5 +1,6 @@
 %define debug 0
 %define final 0
+%define disable_gcc_check_and_hidden_visibility 1
 
 ## stil need fix to build java -> disable java at the moment
 ##define support_arch %{ix86} alpha ia64 ppc
@@ -9,7 +10,7 @@
 
 %define mozilla_version 1.6.0
 %define qt_version 3.3.4
-%define arts_version 1.5.0
+%define arts_version 1.5.1
 %define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
@@ -21,9 +22,7 @@
 %define ruby 1
 %define pyqt 0
 
-%define disable_gcc_check_and_hidden_visibility 1
-
-Version: 3.5.0
+Version: 3.5.1
 Release: 0.1.fc4
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -194,13 +193,6 @@
 export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -209,16 +201,25 @@
 fi
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --enable-libsuffix="$suffix" \
    --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %ifarch %{support_arch}
    --with-java=%{prefix}
 %else
@@ -279,6 +280,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
+- 3.5.1
+
 * Tue Dec 13 2005 Than Ngo <than at redhat.com> 3.5.0-0.1.fc4
 - 3.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Dec 2005 12:06:08 -0000	1.26
+++ sources	1 Feb 2006 23:29:46 -0000	1.27
@@ -1 +1 @@
-137924318ff5fc49cee3c82ee0ce5cf5  kdebindings-3.5.0.tar.bz2
+302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 02:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 21:52:01 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1893,1.1894
Message-ID: <200602020252.k122q1X4031400@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Make QLA HBAs work again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1893
retrieving revision 1.1894
diff -u -r1.1893 -r1.1894
--- kernel-2.6.spec	1 Feb 2006 22:46:10 -0000	1.1893
+++ kernel-2.6.spec	2 Feb 2006 02:51:58 -0000	1.1894
@@ -1384,6 +1384,7 @@
 - Woo, 2.6.16rc1-git5 (at last)
 - Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
 - Disable a bunch of drivers for SBC's that won't run Fedora.
+- Reenable building of firmware for QLogic HBA's.
 - Fixed an oops in the stradis driver initialisation.
 - Happy Birthday to "The Yellow Dart".
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 02:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 21:52:01 -0500
Subject: rpms/kernel/devel/configs config-generic,1.143,1.144
Message-ID: <200602020252.k122q1Rh031414@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
Make QLA HBAs work again



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- config-generic	1 Feb 2006 22:46:11 -0000	1.143
+++ config-generic	2 Feb 2006 02:51:59 -0000	1.144
@@ -464,7 +464,8 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
+# FIXME: Turn off for FC6 - Move to external firmware loader.
+CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m



From fedora-cvs-commits at redhat.com  Thu Feb  2 03:05:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 22:05:29 -0500
Subject: rpms/GConf2/devel GConf2-2.8.1-reload.patch, NONE, 1.1 GConf2.spec,
	1.32, 1.33
Message-ID: <200602020305.k1235S6q026088@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26074

Modified Files:
	GConf2.spec 
Added Files:
	GConf2-2.8.1-reload.patch 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-2
- Add patch from Mandriva to reload GConf2 every time a schema is
  added or removed (solves bug 173869)


GConf2-2.8.1-reload.patch:
 gconftool.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE GConf2-2.8.1-reload.patch ---
--- GConf-2.8.1/gconf/gconftool.c.reload	2005-01-07 15:08:10.552350838 +0100
+++ GConf-2.8.1/gconf/gconftool.c	2005-01-07 15:12:04.869990535 +0100
@@ -896,6 +896,8 @@
       
       gconf_engine_unref (conf);
 
+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+
       return retval;
     }
 
@@ -909,6 +911,8 @@
       
       gconf_engine_unref (conf);
 
+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+
       return retval;
     }
 


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- GConf2.spec	17 Jan 2006 03:35:51 -0000	1.32
+++ GConf2.spec	2 Feb 2006 03:05:26 -0000	1.33
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -36,12 +36,16 @@
 Requires: ORBit2-devel >= %{orbit2_version}
 Requires: glib2-devel >= %{glib2_version}
 
+Patch1: GConf2-2.8.1-reload.patch
+
+
 %description devel
 GConf development package. Contains files needed for doing
 development using GConf.
 
 %prep
 %setup -q -n GConf-%{version}
+%patch1 -p1 -b .reload
 
 %build
 %configure
@@ -97,6 +101,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-2
+- Add patch from Mandriva to reload GConf2 every time a schema is
+  added or removed (solves bug 173869)
+
 * Mon Jan 16 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-1
 - Update to 2.13.5
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 03:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 22:12:14 -0500
Subject: rpms/firefox/devel .cvsignore, 1.19, 1.20 firefox.spec, 1.97,
	1.98 sources, 1.21,
	1.22 firefox-0.7.3-default-plugin-less-annoying.patch, 1.1,
	NONE firefox-bug305970.patch, 1.1, NONE
Message-ID: <200602020312.k123CEil026219@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26206

Modified Files:
	.cvsignore firefox.spec sources 
Removed Files:
	firefox-0.7.3-default-plugin-less-annoying.patch 
	firefox-bug305970.patch 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
- Update to 1.5.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	27 Jan 2006 03:35:21 -0000	1.19
+++ .cvsignore	2 Feb 2006 03:12:12 -0000	1.20
@@ -16,3 +16,4 @@
 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


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- firefox.spec	27 Jan 2006 03:35:21 -0000	1.97
+++ firefox.spec	2 Feb 2006 03:12:12 -0000	1.98
@@ -8,8 +8,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        1.5
-Release:        5
+Version:        1.5.0.1
+Release:        1
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -42,14 +42,13 @@
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
-Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
-Patch22:        firefox-0.7.3-psfonts.patch
-Patch24:        firefox-1.1-default-applications.patch
-Patch25:        firefox-1.1-software-update.patch
-Patch26:        firefox-RC1-stock-icons-be.patch
-Patch27:        firefox-RC1-stock-icons-fe.patch
-Patch28:        firefox-RC1-stock-icons-gnomestripe.patch
-Patch29:        firefox-gnomestripe-0.1-livemarks.patch
+Patch21:        firefox-0.7.3-psfonts.patch
+Patch22:        firefox-1.1-default-applications.patch
+Patch23:        firefox-1.1-software-update.patch
+Patch24:        firefox-RC1-stock-icons-be.patch
+Patch25:        firefox-RC1-stock-icons-fe.patch
+Patch26:        firefox-RC1-stock-icons-gnomestripe.patch
+Patch27:        firefox-gnomestripe-0.1-livemarks.patch
 
 # local bugfixes
 Patch42:        firefox-1.1-uriloader.patch
@@ -58,7 +57,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-bug305970.patch
 
 
 # ---------------------------------------------------
@@ -111,17 +109,15 @@
 
 %patch20 -p0
 %patch21 -p1
-%patch22 -p1
-%patch24 -p0
+%patch22 -p0
+#%patch23 -p0
+#%patch24 -p0
 #%patch25 -p0
 #%patch26 -p0
-#%patch27 -p0
-#%patch28 -p0
-#%patch29 -p1
+#%patch27 -p1
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p1
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -263,6 +259,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
+- Update to 1.5.0.1
+
 * Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
 - Ship langpacks again from upstream
 - Stop providing MozillaFirebird and mozilla-firebird


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 Jan 2006 03:35:21 -0000	1.21
+++ sources	2 Feb 2006 03:12:12 -0000	1.22
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-fa915ddcadecda30ed3e13694f26a779  firefox-1.5-source.tar.bz2
 1f39da3a36cb722973e21b724eb59d0b  firefox-langpacks-20060125.tar.bz2
+c76f02956645bc823241379e27f76bb5  firefox-1.5.0.1-source.tar.bz2


--- firefox-0.7.3-default-plugin-less-annoying.patch DELETED ---


--- firefox-bug305970.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 03:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 22:29:40 -0500
Subject: rpms/kernel/devel/configs config-generic,1.144,1.145
Message-ID: <200602020329.k123TeHl016767@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
more sbc crud



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- config-generic	2 Feb 2006 02:51:59 -0000	1.144
+++ config-generic	2 Feb 2006 03:29:37 -0000	1.145
@@ -1593,10 +1593,10 @@
 # CONFIG_WDT_501 is not set
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
-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
@@ -1604,12 +1604,12 @@
 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 is not set
 CONFIG_W83977F_WDT=m



From fedora-cvs-commits at redhat.com  Thu Feb  2 03:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 22:51:49 -0500
Subject: rpms/kernel/devel linux-2.6-random-patches.patch, NONE,
	1.1 kernel-2.6.spec, 1.1894, 1.1895
Message-ID: <200602020351.k123pnKO004676@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-random-patches.patch 
Log Message:
random silly printk patches


linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 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.15.noarch/drivers/media/video/cpia.c             |    2 +-
 linux-2.6.15.noarch/drivers/media/video/hexium_orion.c     |    2 +-
 linux-2.6.15.noarch/drivers/scsi/megaraid.c                |    2 +-
 linux-2.6.15/kernel/power/snapshot.c                       |    3 ++-
 11 files changed, 12 insertions(+), 15 deletions(-)

--- NEW FILE linux-2.6-random-patches.patch ---

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;
 }
 

kobject_register failed for hexium HV-PCI6/Orion (-13)
 [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
 [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c7700a>] hexium_init_module+0xa/0x47 [hexium_orion]
 [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
 [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
 [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/media/video/hexium_orion.c~	2006-02-01 22:37:07.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/video/hexium_orion.c	2006-02-01 22:37:24.000000000 -0500
@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = {
 };
 
 static struct saa7146_extension extension = {
-	.name = "hexium HV-PCI6/Orion",
+	.name = "hexium HV-PCI6 Orion",
 	.flags = 0,		// SAA7146_USE_I2C_IRQ,
 
 	.pci_tbl = &pci_tbl[0],
--- 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;
 	}

Fix printk output.

sc1200wdt: build 20020303<3>sc1200wdt: io parameter must be specified

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);
megaraid.ko and megaraid_mbox.ko both have the same pci_driver kobject
name, which means this happens..

kobject_register failed for megaraid (-17)
 [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
 [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c77069>] megaraid_init+0x69/0xa9 [megaraid]
 [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
 [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
 [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/scsi/megaraid.c~	2006-02-01 22:13:23.000000000 -0500
+++ linux-2.6.15.noarch/drivers/scsi/megaraid.c	2006-02-01 22:13:30.000000000 -0500
@@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci
 MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
 
 static struct pci_driver megaraid_pci_driver = {
-	.name		= "megaraid",
+	.name		= "megaraid_legacy",
 	.id_table	= megaraid_pci_tbl,
 	.probe		= megaraid_probe_one,
 	.remove		= __devexit_p(megaraid_remove_one),

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);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -r1.1894 -r1.1895
--- kernel-2.6.spec	2 Feb 2006 02:51:58 -0000	1.1894
+++ kernel-2.6.spec	2 Feb 2006 03:51:46 -0000	1.1895
@@ -386,6 +386,10 @@
 
 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
@@ -896,6 +900,9 @@
 #
 %patch10000 -p1
 
+# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
+%patch10001 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1385,6 +1392,8 @@
 - Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
 - Disable a bunch of drivers for SBC's that won't run Fedora.
 - Reenable building of firmware for QLogic HBA's.
+- Add a bunch of missing newlines & the like to module init's.
+- Fix up broken DVB kobject use.
 - Fixed an oops in the stradis driver initialisation.
 - Happy Birthday to "The Yellow Dart".
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:04:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:04:29 -0500
Subject: rpms/rhythmbox/devel .cvsignore, 1.19, 1.20 rhythmbox.spec, 1.46,
	1.47 sources, 1.21, 1.22
Message-ID: <200602020404.k1244Th3008775@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8753

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-1
- 0.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	1 Feb 2006 21:04:19 -0000	1.19
+++ .cvsignore	2 Feb 2006 04:04:15 -0000	1.20
@@ -4,3 +4,4 @@
 rhythmbox-0.9.2.tar.bz2
 rhythmbox-0.9.2.cvs20060123.tar.bz2
 rhythmbox-0.9.2.cvs20060201.tar.bz2
+rhythmbox-0.9.3.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- rhythmbox.spec	1 Feb 2006 21:04:19 -0000	1.46
+++ rhythmbox.spec	2 Feb 2006 04:04:15 -0000	1.47
@@ -2,7 +2,7 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.2.cvs20060201
+Version: 0.9.3
 Release: 1
 License: GPL
 Group: Applications/Multimedia
@@ -99,6 +99,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-1
+- 0.9.3
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.2.cvs20060201-1
 - Newer CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	1 Feb 2006 21:04:19 -0000	1.21
+++ sources	2 Feb 2006 04:04:15 -0000	1.22
@@ -1 +1 @@
-86ebd183d0e635a77556b7af1a2bdab9  rhythmbox-0.9.2.cvs20060201.tar.bz2
+3ad98939192d44e64982588b15827ffe  rhythmbox-0.9.3.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:08:21 -0500
Subject: rpms/gjdoc/devel gjdoc.spec,1.30,1.31
Message-ID: <200602020408.k1248LPh009684@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9596

Modified Files:
	gjdoc.spec 
Log Message:
* Wed Feb 01 2006 Andrew Overholt <overholt at redhat.com> 0.7.7-2
- Don't package .la files (rh#172634).
- Install un-versioned symlinks in /usr/share/java (rh#177139).



Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gjdoc.spec	19 Dec 2005 14:26:51 -0000	1.30
+++ gjdoc.spec	2 Feb 2006 04:08:18 -0000	1.31
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 1
+Release: 2
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -30,15 +30,29 @@
 
 %makeinstall
 
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -sf com-sun-javadoc-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/com-sun-javadoc.jar
+ln -sf com-sun-tools-doclets-Taglet-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/com-sun-tools-doclets-Taglet.jar
+ln -sf gnu-classpath-tools-gjdoc-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/gnu-classpath-tools-gjdoc.jar
+popd
+
 if [ -e $RPM_BUILD_ROOT%{_datadir}/info/dir ]
 then
   rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir
 fi
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 01 2006 Andrew Overholt <overholt at redhat.com> 0.7.7-2
+- Don't package .la files (rh#172634).
+- Install un-versioned symlinks in /usr/share/java (rh#177139).
+
 * Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 0.7.7-1
 - 0.7.7.
 
@@ -122,12 +136,12 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/gjdoc
-%{_libdir}/lib-com-sun-javadoc.*
+%{_libdir}/lib-com-sun-javadoc.so*
 %{_libdir}/lib-com-sun-tools-doclets-Taglet.*
-%{_libdir}/lib-gnu-classpath-tools-gjdoc.*
-%{_javadir}/com-sun-javadoc-%{version}.jar
-%{_javadir}/com-sun-tools-doclets-Taglet-%{version}.jar
-%{_javadir}/gnu-classpath-tools-gjdoc-%{version}.jar
+%{_libdir}/lib-gnu-classpath-tools-gjdoc.so*
+%{_javadir}/com-sun-javadoc*.jar
+%{_javadir}/com-sun-tools-doclets-Taglet*.jar
+%{_javadir}/gnu-classpath-tools-gjdoc*.jar
 %doc %{_infodir}/gjdoc.info.gz
 %doc %{_mandir}/man1/gjdoc.1.gz
 %doc README



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:14:36 -0500
Subject: rpms/redhat-menus/devel redhat-menus-6.5.4-fix-applications.patch,
	NONE, 1.1 redhat-menus.spec, 1.54, 1.55
Message-ID: <200602020414.k124EaKw012501@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12408

Modified Files:
	redhat-menus.spec 
Added Files:
	redhat-menus-6.5.4-fix-applications.patch 
Log Message:
- fix applications menu


redhat-menus-6.5.4-fix-applications.patch:
 applications.menu |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE redhat-menus-6.5.4-fix-applications.patch ---
--- redhat-menus-6.5.4/menus/applications.menu.fix-applications	2006-02-01 23:13:17.000000000 -0500
+++ redhat-menus-6.5.4/menus/applications.menu	2006-02-01 23:13:22.000000000 -0500
@@ -16,8 +16,6 @@
 
   <!-- Add stock tarball installs to menus -->
   <AppDir>/usr/local/share/applications</AppDir>
-  <DirectoryDir>/usr/local/share/desktop-directories</Directory>
-  <MergeDir>/usr/local/share/menus</MergeDir>
 
   <!-- Read in overrides and child menus from applications.d -->
   <DefaultMergeDirs/>


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- redhat-menus.spec	1 Feb 2006 21:51:06 -0000	1.54
+++ redhat-menus.spec	2 Feb 2006 04:14:34 -0000	1.55
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 6.5.4
-Release: 1
+Release: 2
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -23,6 +23,7 @@
 Conflicts: evolution <= 2.4.1-5
 
 Patch0: redhat-menus-5.5.5-fix-pirut.patch
+Patch1: redhat-menus-6.5.4-fix-applications.patch
 
 %description
 
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fix-pirut
+%patch1 -p1 -b .fix-applications
 
 %build
 
@@ -67,6 +69,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Wed Feb 1 2006 Ray Strode <rstrode at redhat.com> - 6.5.4-2
+- fix applications menu
+
 * Wed Feb 1 2006 Ray Strode <rstrode at redhat.com> - 6.5.4-1
 - merge /usr/local/share/applications
 - ship separate directory file for System menu



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:25:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:25:49 -0500
Subject: rpms/firefox/devel .cvsignore, 1.20, 1.21 firefox.spec, 1.98,
	1.99 sources, 1.22, 1.23
Message-ID: <200602020425.k124PnkP029869@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29836

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
- Update language packs to 1.5.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Feb 2006 03:12:12 -0000	1.20
+++ .cvsignore	2 Feb 2006 04:25:46 -0000	1.21
@@ -17,3 +17,4 @@
 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


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- firefox.spec	2 Feb 2006 03:12:12 -0000	1.98
+++ firefox.spec	2 Feb 2006 04:25:46 -0000	1.99
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        1
+Release:        2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,8 +20,7 @@
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-langpacks-20060125.tar.bz2
-
+Source2:        firefox-langpacks-%{version}-20060201.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-bookmarks.html
@@ -260,6 +259,9 @@
 
 %changelog
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
+- Update language packs to 1.5.0.1
+
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
 - Update to 1.5.0.1
 
 * Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	2 Feb 2006 03:12:12 -0000	1.22
+++ sources	2 Feb 2006 04:25:46 -0000	1.23
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-1f39da3a36cb722973e21b724eb59d0b  firefox-langpacks-20060125.tar.bz2
 c76f02956645bc823241379e27f76bb5  firefox-1.5.0.1-source.tar.bz2
+963584af1fd5d8b7551c7e92f44f2242  firefox-langpacks-1.5.0.1-20060201.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:27:42 -0500
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.47,1.48
Message-ID: <200602020427.k124RgvN030816@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30776

Modified Files:
	rhythmbox.spec 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-2
- Remove hack for 173869, as its no longer needed.



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- rhythmbox.spec	2 Feb 2006 04:04:15 -0000	1.47
+++ rhythmbox.spec	2 Feb 2006 04:27:38 -0000	1.48
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.3
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -73,9 +73,6 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 update-desktop-database %{_datadir}/applications
-# Hack to workaround bug 173869
-gconftool-2 --shutdown
-gconftool-2 --spawn
 
 %postun
 /sbin/ldconfig
@@ -99,6 +96,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-2
+- Remove hack for 173869, as its no longer needed.
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-1
 - 0.9.3
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:50:40 -0500
Subject: rpms/tomcat5/devel tomcat5-examples-cal-xss.patch, NONE,
	1.1 tomcat5-examples-xss.patch, NONE, 1.1 tomcat5.spec, 1.55, 1.56
Message-ID: <200602020450.k124oeeh019177@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19146

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-examples-cal-xss.patch tomcat5-examples-xss.patch 
Log Message:
Fixed XSS vulnerabilities in the example apps.

tomcat5-examples-cal-xss.patch:
 cal2.jsp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tomcat5-examples-cal-xss.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/cal/cal2.jsp.sav	2006-02-01 22:46:55.103662000 -0500
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/cal/cal2.jsp	2006-02-01 22:47:03.361395000 -0500
@@ -24,7 +24,7 @@
 <jsp:useBean id="table" scope="session" class="cal.TableBean" />
 
 <% 
-	String time = request.getParameter ("time");
+	String time = util.HTMLFilter.filter(request.getParameter ("time"));
 %>
 
 <FONT SIZE=5> Please add the following event:

tomcat5-examples-xss.patch:
 jsr152/examples/jsp2/el/functions.jsp                                                                      |    0 
 jsr152/examples/jsp2/el/implicit-objects.jsp                                                               |    0 
 jsr152/examples/jsp2/jspx/textRotate.jspx                                                                  |    0 
 jsr152/examples/snp/snoop.jsp                                                                              |    0 
 tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp        |   11 +++++-----
 tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp |    8 ++++---
 tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx    |    3 +-
 tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/snp/snoop.jsp                |    4 +--
 8 files changed, 15 insertions(+), 11 deletions(-)

--- NEW FILE tomcat5-examples-xss.patch ---
Index: jsr152/examples/jsp2/el/functions.jsp
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp,v
retrieving revision 1.4
diff -u -r1.4 functions.jsp
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp	18 Mar 2004 16:40:30 -0000	1.4
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp	20 Nov 2004 19:02:46 -0000
@@ -13,6 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
 
 <html>
@@ -30,7 +31,7 @@
     <blockquote>
       <u><b>Change Parameter</b></u>
       <form action="functions.jsp" method="GET">
-	  foo = <input type="text" name="foo" value="${param['foo']}">
+	  foo = <input type="text" name="foo" value="${fn:escapeXml(param["foo"])}">
           <input type="submit">
       </form>
       <br>
@@ -42,19 +43,19 @@
 	  </thead>
 	  <tr>
 	    <td>\${param["foo"]}</td>
-	    <td>${param["foo"]}&nbsp;</td>
+	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${my:reverse(param["foo"])}</td>
-	    <td>${my:reverse(param["foo"])}&nbsp;</td>
+	    <td>${my:reverse(fn:escapeXml(param["foo"]))}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${my:reverse(my:reverse(param["foo"]))}</td>
-	    <td>${my:reverse(my:reverse(param["foo"]))}&nbsp;</td>
+	    <td>${my:reverse(my:reverse(fn:escapeXml(param["foo"])))}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${my:countVowels(param["foo"])}</td>
-	    <td>${my:countVowels(param["foo"])}&nbsp;</td>
+	    <td>${my:countVowels(fn:escapeXml(param["foo"]))}&nbsp;</td>
 	  </tr>
 	</table>
       </code>
Index: jsr152/examples/jsp2/el/implicit-objects.jsp
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp,v
retrieving revision 1.3
diff -u -r1.3 implicit-objects.jsp
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	18 Mar 2004 16:40:30 -0000	1.3
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp	20 Nov 2004 19:04:08 -0000
@@ -13,6 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
 <html>
   <head>
     <title>JSP 2.0 Expression Language - Implicit Objects</title>
@@ -49,7 +51,7 @@
     <blockquote>
       <u><b>Change Parameter</b></u>
       <form action="implicit-objects.jsp" method="GET">
-	  foo = <input type="text" name="foo" value="${param["foo"]}">
+	  foo = <input type="text" name="foo" value="${fn:escapeXml(param["foo"])}">
           <input type="submit">
       </form>
       <br>
@@ -61,11 +63,11 @@
 	  </thead>
 	  <tr>
 	    <td>\${param.foo}</td>
-	    <td>${param.foo}&nbsp;</td>
+	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${param["foo"]}</td>
-	    <td>${param["foo"]}&nbsp;</td>
+	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
 	  </tr>
 	  <tr>
 	    <td>\${header["host"]}</td>
Index: jsr152/examples/jsp2/jspx/textRotate.jspx
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx,v
retrieving revision 1.3
diff -u -r1.3 textRotate.jspx
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx	21 Nov 2003 22:06:02 -0000	1.3
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx	20 Nov 2004 19:54:12 -0000
@@ -6,11 +6,12 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      width="450" height="500" viewBox="0 0 450 500"
      xmlns:c="http://java.sun.com/jsp/jstl/core"
+     xmlns:fn="http://java.sun.com/jsp/jstl/functions"
      xmlns:jsp="http://java.sun.com/JSP/Page">
   <jsp:directive.page contentType="image/svg+xml" />
   <title>JSP 2.0 JSPX</title>
   <!-- select name parameter, or default to JSPX -->
-  <c:set var="name" value='${empty param["name"] ? "JSPX" : param["name"]}'/>
+  <c:set var="name" value='${empty fn:escapeXml(param["name"]) ? "JSPX" : fn:escapeXml(param["name"])}'/>
   <g id="testContent">
     <text class="title" x="50%" y="10%" font-size="15" text-anchor="middle" >
             JSP 2.0 XML Syntax (.jspx) Demo</text>
Index: jsr152/examples/snp/snoop.jsp
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/examples/snp/snoop.jsp,v
retrieving revision 1.2
diff -u -r1.2 snoop.jsp
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/snp/snoop.jsp	18 Mar 2004 16:40:31 -0000	1.2
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/jsr152/examples/snp/snoop.jsp	5 Jan 2005 11:15:06 -0000
@@ -18,7 +18,7 @@
 <body bgcolor="white">
 <h1> Request Information </h1>
 <font size="4">
-JSP Request Method: <%= request.getMethod() %>
+JSP Request Method: <% out.print(util.HTMLFilter.filter(request.getMethod())); %>
 <br>
 Request URI: <%= request.getRequestURI() %>
 <br>
@@ -32,7 +32,7 @@
 <br>
 Content length: <%= request.getContentLength() %>
 <br>
-Content type: <%= request.getContentType() %>
+Content type: <% out.print(util.HTMLFilter.filter(request.getContentType())); %>
 <br>
 Server name: <%= request.getServerName() %>
 <br>


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tomcat5.spec	3 Jan 2006 21:14:42 -0000	1.55
+++ tomcat5.spec	2 Feb 2006 04:50:38 -0000	1.56
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release 	8jpp_8fc
+%define release 	8jpp_9fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -58,6 +58,8 @@
 Patch12:		%{name}-%{version}-bz163249.patch
 Patch13:		%{name}-%{version}-bz164985.patch
 Patch14:		%{name}-%{version}-notarget.patch
+Patch15:                %{name}-examples-cal-xss.patch
+Patch16:                %{name}-examples-xss.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
 
 Requires:		jpackage-utils >= 0:1.6.0
@@ -232,6 +234,8 @@
 %patch13 -p2 -b .orig
 %endif
 %patch14 -p0
+%patch15 -p2
+%patch16 -p2
 
 %build
 
@@ -845,6 +849,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager.jar.*
 
 %changelog
+* Wed Feb  1 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_9fc
+- Fixed XSS vulnerabilities in the example apps.
+
 * Tue Jan  3 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_7fc
 - Fixed typos in the init script.
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 04:54:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 1 Feb 2006 23:54:10 -0500
Subject: rpms/firefox/devel firefox-1.5.0.1-dumpstack.patch, NONE,
	1.1 firefox.spec, 1.99, 1.100
Message-ID: <200602020454.k124sARs013527@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13512

Modified Files:
	firefox.spec 
Added Files:
	firefox-1.5.0.1-dumpstack.patch 
Log Message:
* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2
- Update language packs to 1.5.0.1
- Add dumpstack.patch


firefox-1.5.0.1-dumpstack.patch:
 xpcom/base/nsStackFrameUnix.cpp  |   20 +++++++++++++++++++-
 xpcom/base/nsTraceRefcntImpl.cpp |    4 ++--
 xpfe/bootstrap/nsSigHandlers.cpp |    2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE firefox-1.5.0.1-dumpstack.patch ---
Index: xpcom/base/nsStackFrameUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
retrieving revision 1.12
diff -u -p -8 -r1.12 nsStackFrameUnix.cpp
--- xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
+++ xpcom/base/nsStackFrameUnix.cpp	23 Jan 2006 09:23:04 -0000
@@ -77,19 +77,30 @@ void DemangleSymbol(const char * aSymbol
     if (demangled)
     {
         strncpy(aBuffer,demangled,aBufLen);
         free(demangled);
     }
 #endif // MOZ_DEMANGLE_SYMBOLS
 }
 
+#if defined(linux) // Linux
+#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use glibc backtrace()
+#include <execinfo.h>
+void DumpStackToFile(FILE* aStream)
+{
+  void *array[20];
+  size_t size;
 
-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+  fflush(aStream);
+  size = backtrace (array, 20);
+  backtrace_symbols_fd (array, size, fileno(aStream));
+}
 
+#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style i386 or PPC Linux stackwalking code
 #include <setjmp.h>
 //
 
 void DumpStackToFile(FILE* aStream)
 {
   jmp_buf jb;
   setjmp(jb);
 
@@ -135,16 +146,23 @@ void DumpStackToFile(FILE* aStream)
 
       PRUint32 off = (char*)pc - (char*)info.dli_saddr;
       fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
               symbol, off, info.dli_fname, foff);
     }
   }
 }
 
+#else // not implemented
+void DumpStackToFile(FILE* aStream)
+{
+  fprintf(aStream, "Info: Stacktrace not implemented for this Linux platform\n");
+}
+#endif // Linux
+
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
 
 /*
  * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak".
  */
 
 #include <synch.h>
 #include <ucontext.h>
Index: xpfe/bootstrap/nsSigHandlers.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsSigHandlers.cpp,v
retrieving revision 1.42
diff -u -p -8 -r1.42 nsSigHandlers.cpp
--- xpfe/bootstrap/nsSigHandlers.cpp	22 Dec 2005 17:57:13 -0000	1.42
+++ xpfe/bootstrap/nsSigHandlers.cpp	23 Jan 2006 09:23:47 -0000
@@ -70,17 +70,17 @@
 
 #ifdef MOZ_WIDGET_PHOTON
 #include <photon/PhProto.h>
 #include <string.h>
 #endif
 
 static char _progname[1024] = "huh?";
 
-#if defined(LINUX) && defined(DEBUG) && (defined(__i386) || defined(PPC))
+#if defined(LINUX) && defined(DEBUG) && defined(__GLIBC__)
 #define CRAWL_STACK_ON_SIGSEGV
 #endif
 
 #ifdef MOZ_WIDGET_PHOTON
 void abnormal_exit_handler(int signum)
 {
   /* Free any shared memory that has been allocated */
   PgShmemCleanup();
Index: xpcom/base/nsTraceRefcntImpl.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/base/nsTraceRefcntImpl.cpp,v
retrieving revision 1.96
diff -u -p -8 -r1.96 nsTraceRefcntImpl.cpp
--- xpcom/base/nsTraceRefcntImpl.cpp	24 Jun 2005 00:24:41 -0000	1.96
+++ xpcom/base/nsTraceRefcntImpl.cpp	23 Jan 2006 09:24:05 -0000
@@ -823,18 +823,18 @@ static void InitTraceLog(void)
 #include "nsStackFrameWin.h"
 void
 nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
 {
   DumpStackToFile(aStream);
 }
 
 // WIN32 x86 stack walking code
-// i386 or PPC Linux stackwalking code or Solaris
-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+// Linux stackwalking code or Solaris
+#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
 #include "nsStackFrameUnix.h"
 void
 nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
 {
   DumpStackToFile(aStream);
 }
 
 #else // unsupported platform.


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- firefox.spec	2 Feb 2006 04:25:46 -0000	1.99
+++ firefox.spec	2 Feb 2006 04:54:08 -0000	1.100
@@ -56,7 +56,7 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-
+Patch100:       firefox-1.5.0.1-dumpstack.patch
 
 # ---------------------------------------------------
 
@@ -116,7 +116,7 @@
 #%patch27 -p1
 %patch42 -p0
 %patch81 -p1
-
+%patch100 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -258,8 +258,9 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
+* Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2
 - Update language packs to 1.5.0.1
+- Add dumpstack.patch
 
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-1
 - Update to 1.5.0.1



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:26:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:26:03 -0500
Subject: rpms/pirut/devel .cvsignore, 1.7, 1.8 pirut.spec, 1.8, 1.9 sources,
	1.8, 1.9
Message-ID: <200602020526.k125Q3t5001948@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1897/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.8-1 on branch devel from pirut-0.9.8-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Jan 2006 00:53:36 -0000	1.7
+++ .cvsignore	2 Feb 2006 05:26:00 -0000	1.8
@@ -1 +1 @@
-pirut-0.9.7.tar.gz
+pirut-0.9.8.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pirut.spec	25 Jan 2006 00:53:36 -0000	1.8
+++ pirut.spec	2 Feb 2006 05:26:00 -0000	1.9
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.7
+Version: 0.9.8
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 0.9.8-1
+- Some fixes to single-install-packages from Tim Lauridsen (#178908)
+- Tweaks to the optional packages installed label (#178088, #179205)
+
 * Tue Jan 24 2006 Jeremy Katz <katzj at redhat.com> - 0.9.7-1
 - Make the single package installer only read the repo data if we need 
   to resolve a dep


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Jan 2006 00:53:36 -0000	1.8
+++ sources	2 Feb 2006 05:26:00 -0000	1.9
@@ -1 +1 @@
-16e130e94adb16cf04431ec138718d78  pirut-0.9.7.tar.gz
+3658c7c1d457e077f7addbe63056c4b6  pirut-0.9.8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:30:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:30:27 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.208, 1.209 anaconda.spec, 1.327,
	1.328 sources, 1.327, 1.328
Message-ID: <200602020530.k125URrm003886@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3826/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.12-1 on branch devel from anaconda-10.91.12-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- .cvsignore	1 Feb 2006 01:36:36 -0000	1.208
+++ .cvsignore	2 Feb 2006 05:30:25 -0000	1.209
@@ -1 +1 @@
-anaconda-10.91.11.tar.bz2
+anaconda-10.91.12.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- anaconda.spec	1 Feb 2006 01:36:36 -0000	1.327
+++ anaconda.spec	2 Feb 2006 05:30:25 -0000	1.328
@@ -1,12 +1,12 @@
 Name: anaconda
-Version: 10.91.11
+Version: 10.91.12
 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, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.5.1-3
+BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel,pirut
+Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, 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
@@ -78,6 +78,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 10.91.12-1
+- improves %%packages section some more (clumens)
+- give a better error on kickstart lvm syntax errors (clumens)
+- display vncconnect error messages (clumens)
+- make swap labels shorter for cciss (dcantrel, #176074)
+- Make /dev/root for mkinitrd (#171662)
+- Use pirut stuff for graphical group selection
+
 * Tue Jan 31 2006 Paul Nasrat <pnasrat at redhat.com> - 10.91.11-1
 - Factor some yum stuff into yum
 - Text Clarification (#178105)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- sources	1 Feb 2006 01:36:36 -0000	1.327
+++ sources	2 Feb 2006 05:30:25 -0000	1.328
@@ -1 +1 @@
-c0ab01fab8a7a76787d6c778ee5a9443  anaconda-10.91.11.tar.bz2
+5e227e4e21f30182188661124a4200f8  anaconda-10.91.12.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:32:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:32:10 -0500
Subject: rpms/firefox/devel firefox-1.5.0.1-dumpstack.patch,1.1,1.2
Message-ID: <200602020532.k125WAo4004164@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4123

Modified Files:
	firefox-1.5.0.1-dumpstack.patch 
Log Message:
tweak this for now to apply.  this is just a temporary hack


firefox-1.5.0.1-dumpstack.patch:
 nsStackFrameUnix.cpp |    4 ++++
 1 files changed, 4 insertions(+)

Index: firefox-1.5.0.1-dumpstack.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.5.0.1-dumpstack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-1.5.0.1-dumpstack.patch	2 Feb 2006 04:54:08 -0000	1.1
+++ firefox-1.5.0.1-dumpstack.patch	2 Feb 2006 05:32:06 -0000	1.2
@@ -1,117 +1,25 @@
-Index: xpcom/base/nsStackFrameUnix.cpp
+Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
 retrieving revision 1.12
-diff -u -p -8 -r1.12 nsStackFrameUnix.cpp
---- xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
-+++ xpcom/base/nsStackFrameUnix.cpp	23 Jan 2006 09:23:04 -0000
-@@ -77,19 +77,30 @@ void DemangleSymbol(const char * aSymbol
-     if (demangled)
-     {
-         strncpy(aBuffer,demangled,aBufLen);
-         free(demangled);
-     }
- #endif // MOZ_DEMANGLE_SYMBOLS
- }
- 
-+#if defined(linux) // Linux
-+#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use glibc backtrace()
-+#include <execinfo.h>
-+void DumpStackToFile(FILE* aStream)
-+{
-+  void *array[20];
-+  size_t size;
- 
--#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
-+  fflush(aStream);
-+  size = backtrace (array, 20);
-+  backtrace_symbols_fd (array, size, fileno(aStream));
-+}
- 
-+#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style i386 or PPC Linux stackwalking code
- #include <setjmp.h>
- //
+diff -d -u -p -r1.12 nsStackFrameUnix.cpp
+--- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
++++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
+@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
  
  void DumpStackToFile(FILE* aStream)
  {
++  fprintf(aStream, "Stacktrace disabled for now.\n"
++                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
++#if 0
    jmp_buf jb;
    setjmp(jb);
  
-@@ -135,16 +146,23 @@ void DumpStackToFile(FILE* aStream)
- 
-       PRUint32 off = (char*)pc - (char*)info.dli_saddr;
-       fprintf(aStream, "%s+0x%08X [%s +0x%08X]\n",
+@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
                symbol, off, info.dli_fname, foff);
      }
    }
++#endif
  }
  
-+#else // not implemented
-+void DumpStackToFile(FILE* aStream)
-+{
-+  fprintf(aStream, "Info: Stacktrace not implemented for this Linux platform\n");
-+}
-+#endif // Linux
-+
  #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
- 
- /*
-  * Stack walking code for Solaris courtesy of Bart Smaalder's "memtrak".
-  */
- 
- #include <synch.h>
- #include <ucontext.h>
-Index: xpfe/bootstrap/nsSigHandlers.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsSigHandlers.cpp,v
-retrieving revision 1.42
-diff -u -p -8 -r1.42 nsSigHandlers.cpp
---- xpfe/bootstrap/nsSigHandlers.cpp	22 Dec 2005 17:57:13 -0000	1.42
-+++ xpfe/bootstrap/nsSigHandlers.cpp	23 Jan 2006 09:23:47 -0000
-@@ -70,17 +70,17 @@
- 
- #ifdef MOZ_WIDGET_PHOTON
- #include <photon/PhProto.h>
- #include <string.h>
- #endif
- 
- static char _progname[1024] = "huh?";
- 
--#if defined(LINUX) && defined(DEBUG) && (defined(__i386) || defined(PPC))
-+#if defined(LINUX) && defined(DEBUG) && defined(__GLIBC__)
- #define CRAWL_STACK_ON_SIGSEGV
- #endif
- 
- #ifdef MOZ_WIDGET_PHOTON
- void abnormal_exit_handler(int signum)
- {
-   /* Free any shared memory that has been allocated */
-   PgShmemCleanup();
-Index: xpcom/base/nsTraceRefcntImpl.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/xpcom/base/nsTraceRefcntImpl.cpp,v
-retrieving revision 1.96
-diff -u -p -8 -r1.96 nsTraceRefcntImpl.cpp
---- xpcom/base/nsTraceRefcntImpl.cpp	24 Jun 2005 00:24:41 -0000	1.96
-+++ xpcom/base/nsTraceRefcntImpl.cpp	23 Jan 2006 09:24:05 -0000
-@@ -823,18 +823,18 @@ static void InitTraceLog(void)
- #include "nsStackFrameWin.h"
- void
- nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
- {
-   DumpStackToFile(aStream);
- }
- 
- // WIN32 x86 stack walking code
--// i386 or PPC Linux stackwalking code or Solaris
--#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
-+// Linux stackwalking code or Solaris
-+#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
- #include "nsStackFrameUnix.h"
- void
- nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
- {
-   DumpStackToFile(aStream);
- }
- 
- #else // unsupported platform.



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:35:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:35:03 -0500
Subject: rpms/ant/devel ant.spec,1.67,1.68
Message-ID: <200602020535.k125Z3WO004735@cvs.devel.redhat.com>

Author: ashah

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

Modified Files:
	ant.spec 
Log Message:
- build ant without using native code



Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ant.spec	9 Jan 2006 17:07:15 -0000	1.67
+++ ant.spec	2 Feb 2006 05:35:00 -0000	1.68
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_3fc
+Release: 	%{jpprelease}_4fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -390,7 +390,9 @@
 [ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
 export JAVA_HOME
+export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/tmp"
 sh build.sh --noconfig jars javadocs
+unset GCJ_PROPERTIES
 
 # -----------------------------------------------------------------------------
 
@@ -749,6 +751,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Feb  2 2006 Archit Shah <ashah at redhat.com> - 0:1.6.5-1jpp_4fc
+- build ant without using native code
+
 * Mon Jan  9 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_3fc
 - bump again for another gcj fix
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:39:10 -0500
Subject: rpms/firefox/devel firefox.spec,1.100,1.101
Message-ID: <200602020539.k125dA3b005798@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5771

Modified Files:
	firefox.spec 
Log Message:
patchlevel 1, move the patch around


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- firefox.spec	2 Feb 2006 04:54:08 -0000	1.100
+++ firefox.spec	2 Feb 2006 05:39:07 -0000	1.101
@@ -38,6 +38,7 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
+Patch6:         firefox-1.5.0.1-dumpstack.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -56,7 +57,6 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
-Patch100:       firefox-1.5.0.1-dumpstack.patch
 
 # ---------------------------------------------------
 
@@ -105,6 +105,7 @@
 %ifnarch i386
 %patch5  -p0
 %endif
+%patch6 -p1
 
 %patch20 -p0
 %patch21 -p1
@@ -116,7 +117,6 @@
 #%patch27 -p1
 %patch42 -p0
 %patch81 -p1
-%patch100 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig



From fedora-cvs-commits at redhat.com  Thu Feb  2 05:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 00:43:30 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.89, 1.90 initscripts.spec,
	1.102, 1.103 sources, 1.97, 1.98
Message-ID: <200602020543.k125hU9B007666@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7624

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	31 Jan 2006 23:16:42 -0000	1.89
+++ .cvsignore	2 Feb 2006 05:43:27 -0000	1.90
@@ -1 +1 @@
-initscripts-8.23.tar.bz2
+initscripts-8.24.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- initscripts.spec	31 Jan 2006 23:16:42 -0000	1.102
+++ initscripts.spec	2 Feb 2006 05:43:27 -0000	1.103
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.23
+Version: 8.24
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,10 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Wed Feb  1 2006 Bill Nottingham <notting at redhat.com> 8.24-1
+- init.d/functions: fix sendmail startup
+- sysconfig.txt: fix typos (<mitr at redhat.com>)
+
 * Tue Jan 31 2006 Peter Jones <pjones at redhat.com> 8.23-1
 - rc.sysinit: do a better job of not activating already active dmraids
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	31 Jan 2006 23:16:42 -0000	1.97
+++ sources	2 Feb 2006 05:43:27 -0000	1.98
@@ -1 +1 @@
-f5a0e74044d2da1ee947a3f1c6b9b279  initscripts-8.23.tar.bz2
+8c570996aa845259b4cac034fae7790f  initscripts-8.24.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 06:03:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 01:03:59 -0500
Subject: rpms/m17n-db/devel .cvsignore, 1.2, 1.3 m17n-db.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200602020603.k1263xfH027687@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
- update to 1.3.1 release
  - add new icons to language subpackages
  - new cjk subpackage for CJK common files
  - new Swedish subpackage
  - exclude new pkgconfig file



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 03:37:27 -0000	1.2
+++ .cvsignore	2 Feb 2006 06:03:25 -0000	1.3
@@ -1 +1 @@
-m17n-db-1.2.0.tar.gz
+m17n-db-1.3.1.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- m17n-db.spec	16 Dec 2005 03:42:30 -0000	1.2
+++ m17n-db.spec	2 Feb 2006 06:03:25 -0000	1.3
@@ -1,7 +1,7 @@
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
-Version:	1.2.0
-Release:	2%{?dist}
+Version:	1.3.1
+Release:	1%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
@@ -23,6 +23,14 @@
 m17n-db datafiles not needed for using the input maps.
 
 
+%package common-cjk
+Summary:	m17n-db common files for CJK input
+Group:		System Environment/Libraries
+
+%description common-cjk
+m17n-db common files for Chinese, Japanese and Korean input maps.
+
+
 %package amharic
 Summary:	m17n-db input table for Amharic
 Group:		System Environment/Libraries
@@ -74,6 +82,7 @@
 %package chinese
 Summary:	m17n-db input table for Chinese
 Group:		System Environment/Libraries
+Requires:	%{name}-common-cjk
 
 %description chinese
 m17n-db Chinese input map.
@@ -186,6 +195,7 @@
 %package korean
 Summary:	m17n-db input table for Korean
 Group:		System Environment/Libraries
+Requires:	%{name}-common-cjk
 
 %description korean
 m17n-db Korean input map.
@@ -271,6 +281,14 @@
 m17n-db Slovak input map.
 
 
+%package swedish
+Summary:	m17n-db input table for Swedish
+Group:		System Environment/Libraries
+
+%description swedish
+m17n-db Swedish input map.
+
+
 %package syriac
 Summary:	m17n-db input table for Syriac
 Group:		System Environment/Libraries
@@ -333,8 +351,10 @@
 %makeinstall
 
 # don't need ispell
-rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
 
+# drop pkgconfig file for now
+rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -347,6 +367,7 @@
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
+%{_datadir}/m17n/command.mim
 
 %files datafiles
 %defattr(-,root,root)
@@ -357,231 +378,289 @@
 %{_datadir}/m17n/*.tab
 %{_datadir}/m17n/LOCALE.*
 
+%files cjk
+%defattr(-,root,root)
+%dir %{_datadir}/m17n
+%{_datadir}/m17n/cjk-*.mim
+%{_datadir}/m17n/variable.mim
+
 
 %files amharic
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/am-*.mim
+%{_datadir}/m17n/icons/am-*.png
 
 
 %files arabic
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ar-*.mim
+%{_datadir}/m17n/icons/ar-*.png
 
 
 %files armenian
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/hy-*.mim
+%{_datadir}/m17n/icons/hy-*.png
 
 
 %files assamese
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/as-*.mim
+%{_datadir}/m17n/icons/as-*.png
 
 
 %files bengali
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/bn-*.mim
+%{_datadir}/m17n/icons/bn-*.png
 
 
 %files bopomofo
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/bopo-*.mim
+%{_datadir}/m17n/icons/bopo-*.png
 
 
 %files chinese
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/zh-*.mim
+%{_datadir}/m17n/icons/zh-*.png
 
 
 %files croatian
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/hr-*.mim
+%{_datadir}/m17n/icons/hr-*.png
 
 
 %files dhivehi
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/dv-*.mim
+%{_datadir}/m17n/icons/dv-*.png
 
 
 %files farsi
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/fa-*.mim
+%{_datadir}/m17n/icons/fa-*.png
 
 
 %files generic
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/rfc1345.mim
+%{_datadir}/m17n/icons/rfc1345.png
 %{_datadir}/m17n/unicode.mim
+%{_datadir}/m17n/icons/unicode.png
 
 
 %files georgian
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ka-*.mim
+%{_datadir}/m17n/icons/ka-*.png
 
 
 %files greek
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/el-*.mim
+%{_datadir}/m17n/icons/el-*.png
 
 
 %files gujarati
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/gu-*.mim
+%{_datadir}/m17n/icons/gu-*.png
 
 
 %files hebrew
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/he-*.mim
+%{_datadir}/m17n/icons/he-*.png
 
 
 %files hindi
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/hi-*.mim
+%{_datadir}/m17n/icons/hi-*.png
 
 
 %files japanese
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ja-*.mim
+%{_datadir}/m17n/icons/ja-*.png
 
 
 %files kazakh
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/kk-*.mim
+%{_datadir}/m17n/icons/kk-*.png
 
 
 %files khmer
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/km-*.mim
+%{_datadir}/m17n/icons/km-*.png
 
 
 %files kannada
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/kn-*.mim
+%{_datadir}/m17n/icons/kn-*.png
 
 
 %files korean
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ko-*.mim
+%{_datadir}/m17n/icons/ko-*.png
 
 
 %files lao
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/lo-*.mim
+%{_datadir}/m17n/icons/lo-*.png
 
 
 %files latin
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/latn-*.mim
+%{_datadir}/m17n/icons/latn-*.png
 
 
 %files malayalam
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ml-*.mim
+%{_datadir}/m17n/icons/ml-*.png
 
 
 %files myanmar
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/my-*.mim
+%{_datadir}/m17n/icons/my-*.png
 
 
 %files oriya
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/or-*.mim
+%{_datadir}/m17n/icons/or-*.png
 
 
 %files punjabi
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/pa-*.mim
+%{_datadir}/m17n/icons/pa-*.png
 
 
 %files russian
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ru-*.mim
+%{_datadir}/m17n/icons/ru-*.png
 
 
 %files serbian
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/sr-*.mim
+%{_datadir}/m17n/icons/sr-*.png
 
 
 %files sinhala
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/si-*.mim
+%{_datadir}/m17n/icons/si-*.png
 
 
 %files slovak
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/sk-*.mim
+%{_datadir}/m17n/icons/sk-*.png
+
+
+%files swedish
+%defattr(-,root,root)
+%dir %{_datadir}/m17n
+%{_datadir}/m17n/sv-*.mim
+%{_datadir}/m17n/icons/sv-*.png
 
 
 %files syriac
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/syrc-*.mim
+%{_datadir}/m17n/icons/syrc-*.png
 
 
 %files tamil
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/ta-*.mim
+%{_datadir}/m17n/icons/ta-*.png
 
 
 %files telugu
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/te-*.mim
+%{_datadir}/m17n/icons/te-*.png
 
 
 %files thai
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/th-*.mim
+%{_datadir}/m17n/icons/th-*.png
 
 
 %files tibetan
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/bo-*.mim
+%{_datadir}/m17n/icons/bo-*.png
 
 
 %files vietnamese
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/vi-*.mim
+%{_datadir}/m17n/icons/vi-*.png
 
 
 %changelog
+* Thu Feb  2 2006 Jens Petersen <petersen at redhat.com> - 1.3.1-1
+- update to 1.3.1 release
+  - add new icons to language subpackages
+  - new cjk subpackage for CJK common files
+  - new Swedish subpackage
+  - exclude new pkgconfig file
+
 * Fri Dec 16 2005 Jens Petersen <petersen at redhat.com> - 1.2.0-2
 - import to Fedora Core
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 03:37:27 -0000	1.2
+++ sources	2 Feb 2006 06:03:25 -0000	1.3
@@ -1 +1 @@
-de2a5ded6800a3744e8df0d665d1ffe5  m17n-db-1.2.0.tar.gz
+5f17f94b3ea2973e947ac0024bcbe939  m17n-db-1.3.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 06:06:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 01:06:29 -0500
Subject: rpms/m17n-db/devel m17n-db.spec,1.3,1.4
Message-ID: <200602020606.k1266T6X028042@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	m17n-db.spec 
Log Message:
subpackage is common-cjk not cjk



Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- m17n-db.spec	2 Feb 2006 06:03:25 -0000	1.3
+++ m17n-db.spec	2 Feb 2006 06:06:26 -0000	1.4
@@ -378,7 +378,7 @@
 %{_datadir}/m17n/*.tab
 %{_datadir}/m17n/LOCALE.*
 
-%files cjk
+%files common-cjk
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/cjk-*.mim
@@ -657,7 +657,7 @@
 * Thu Feb  2 2006 Jens Petersen <petersen at redhat.com> - 1.3.1-1
 - update to 1.3.1 release
   - add new icons to language subpackages
-  - new cjk subpackage for CJK common files
+  - new common-cjk subpackage for CJK common files
   - new Swedish subpackage
   - exclude new pkgconfig file
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 08:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 03:07:04 -0500
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.38,1.39
Message-ID: <200602020807.k12874vp015991@cvs.devel.redhat.com>

Author: ashah

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15840

Modified Files:
	xerces-j2.spec 
Log Message:
- build xerces without using native code



Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xerces-j2.spec	9 Jan 2006 22:07:06 -0000	1.38
+++ xerces-j2.spec	2 Feb 2006 08:07:02 -0000	1.39
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.2
 %define cvs_version	2_6_2
-%define release 	6jpp_2fc
+%define release 	6jpp_3fc
 %define section		free
 
 Name:		%{name}
@@ -123,6 +123,7 @@
 
 %build
 pushd tools
+export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=/tmp"
 javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
 mkdir bin && jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
 popd
@@ -134,7 +135,7 @@
 	-Djar.apis=xml-commons-apis.jar \
 	-Djar.resolver=xml-commons-resolver.jar \
 	clean jars javadocs
-
+unset GCJ_PROPERTIES
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -280,6 +281,9 @@
 
 
 %changelog
+* Thu Feb  2 2006 Archit Shah <ashah at redhat.com> 0:2.6.2-6jpp_3fc
+- build xerces without using native code
+
 * Mon Jan  9 2006 Archit Shah <ashah at redhat.com> 0:2.6.2-6jpp_2fc
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 08:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 03:17:58 -0500
Subject: rpms/net-snmp/devel net-snmp-5.3-size_t.patch, NONE,
	1.1 net-snmp.spec, 1.63, 1.64
Message-ID: <200602020817.k128Hwmh000707@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.3-size_t.patch 
Log Message:
 - fix crash on s390x and ppc64

net-snmp-5.3-size_t.patch:
 agent/agent_registry.c   |    2 +-
 include/net-snmp/types.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE net-snmp-5.3-size_t.patch ---
--- net-snmp-5.3/include/net-snmp/types.h.old	2005-11-07 04:34:48.000000000 +0100
+++ net-snmp-5.3/include/net-snmp/types.h	2006-02-02 08:30:56.000000000 +0100
@@ -144,7 +144,7 @@
  */
 
     typedef struct netsnmp_index_s {
-       int          len;
+       size_t      len;
        oid         *oids;
     } netsnmp_index;
 
--- net-snmp-5.3/agent/agent_registry.c.old	2006-02-02 08:20:02.000000000 +0100
+++ net-snmp-5.3/agent/agent_registry.c	2006-02-02 08:29:56.000000000 +0100
@@ -1451,7 +1451,7 @@
     lookup_cache *lookup_cache = NULL;
     netsnmp_subtree *myptr = NULL, *previous = NULL;
     int cmp = 1;
-    int ll_off = 0;
+    size_t ll_off = 0;
 
     if (subtree) {
         myptr = subtree;


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- net-snmp.spec	30 Jan 2006 10:49:03 -0000	1.63
+++ net-snmp.spec	2 Feb 2006 08:17:55 -0000	1.64
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3
-Release: 3
+Release: 4
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -29,6 +29,7 @@
 Patch21: net-snmp-5.3.0.1-maxsensors.patch
 Patch22: net-snmp-5.3-agent-registry-unregister-free.patch
 Patch23: net-snmp-5.3-proc_if_inet6.patch
+Patch24: net-snmp-5.3-size_t.patch
 
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -132,6 +133,7 @@
 %patch21 -p1 -b .maxsensors
 %patch22 -p0
 %patch23 -p1 -b .proc_if
+%patch24 -p1 -b .size_t
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -315,6 +317,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Thu Feb  2 2006 Radek Vok??l <rvokal at redhat.com> 5.3-4
+- fix crash on s390x and ppc64
+
 * Mon Jan 30 2006 Radek Vok??l <rvokal at redhat.com> 5.3-3
 - fix for lm_Senors, the max is no longer a fixed value
 - parsing fixed for /proc/net/if_inet6



From fedora-cvs-commits at redhat.com  Thu Feb  2 08:59:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 03:59:47 -0500
Subject: rpms/junit/devel junit.spec,1.15,1.16
Message-ID: <200602020859.k128xlEk019877@cvs.devel.redhat.com>

Author: ashah

Update of /cvs/dist/rpms/junit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19857

Modified Files:
	junit.spec 
Log Message:
- added dependencies on coreutils



Index: junit.spec
===================================================================
RCS file: /cvs/dist/rpms/junit/devel/junit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- junit.spec	22 Dec 2005 02:01:42 -0000	1.15
+++ junit.spec	2 Feb 2006 08:59:45 -0000	1.16
@@ -1,6 +1,6 @@
 %define	name		junit
 %define	version		3.8.1
-%define release 	3jpp_6fc
+%define release 	3jpp_7fc
 %define	section		free
 
 Name:		%{name}
@@ -15,6 +15,7 @@
 BuildRequires:	ant
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:  coreutils
+Requires(pre): coreutils
 Buildarch:	noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
 
@@ -34,6 +35,7 @@
 %package javadoc
 Group:		Development/Documentation
 Summary:	Javadoc for %{name}
+Requires(post,postun): coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -104,6 +106,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Feb  2 2006 Archit Shah <ashah at redhat.com> 0:3.8.1-3jpp_7fc
+- added dependencies on coreutils
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.8.1-3jpp_6fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:35:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:35:22 -0500
Subject: rpms/glibc/devel .cvsignore, 1.134, 1.135 glibc-fedora.patch, 1.127,
	1.128 glibc.spec, 1.215, 1.216 sources, 1.156, 1.157
Message-ID: <200602020935.k129ZMVk011979@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.3.90-33 on branch devel from glibc-2.3.90-33.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- .cvsignore	1 Feb 2006 10:20:18 -0000	1.134
+++ .cvsignore	2 Feb 2006 09:35:11 -0000	1.135
@@ -1,2 +1,2 @@
-glibc-20060201T0846.tar.bz2
-glibc-fedora-20060201T0846.tar.bz2
+glibc-20060202T0507.tar.bz2
+glibc-fedora-20060202T0507.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   83 +++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   38 ++
 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 +
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/ieee754/ldbl-opt/Makefile              |    2 
 sysdeps/powerpc/powerpc64/Makefile             |   14 -
 sysdeps/powerpc/powerpc64/elf/Makefile         |   14 -
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 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 ++
 timezone/asia                                  |   14 -
 timezone/northamerica                          |  222 +++++++++++----
 timezone/private.h                             |    2 
 timezone/scheck.c                              |   11 
 timezone/zone.tab                              |   17 -
 57 files changed, 1002 insertions(+), 538 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- glibc-fedora.patch	1 Feb 2006 10:20:18 -0000	1.127
+++ glibc-fedora.patch	2 Feb 2006 09:35:11 -0000	1.128
@@ -1,20 +1,42 @@
---- glibc-20060201T0846/ChangeLog	1 Feb 2006 03:14:01 -0000	1.9968
-+++ glibc-20060201T0846-fedora/ChangeLog	1 Feb 2006 09:30:43 -0000	1.8782.2.154
-@@ -1,3 +1,13 @@
+--- glibc-20060202T0507/ChangeLog	1 Feb 2006 22:44:44 -0000	1.9974
++++ glibc-20060202T0507-fedora/ChangeLog	2 Feb 2006 09:24:43 -0000	1.8782.2.156
+@@ -1,3 +1,23 @@
++2006-02-02  Roland McGrath  <roland at redhat.com>
++
++	* timezone/private.h: Update from tzcode2006a.
++	* timezone/scheck.c: Likewise.
++	* timezone/asia: Update from tzdata2006a.
++	* timezone/northamerica: Likewise.
++	* timezone/zone.tab: Likewise.
++
++	* sysdeps/powerpc/powerpc64/Makefile (no-special-regs): New variable.
++	(CFLAGS-mcount.c): Use it instead of -msoft-float.
++	* sysdeps/powerpc/powerpc64/elf/Makefile
++	(CFLAGS-dl-runtime.os, CFLAGS-dl-lookup.os, CFLAGS-dl-misc.os,
++	CFLAGS-rtld-mempcpy.os, CFLAGS-rtld-memmove.os, CFLAGS-rtld-memchr.os,
++	CFLAGS-rtld-strnlen.os): LIkewise
++
++2006-02-01  Roland McGrath  <roland at redhat.com>
++
++	* sysdeps/ieee754/ldbl-opt/Makefile (sysdep-CFLAGS): Avoid adding
++	-mlong-double-128 when it's already there.
++
+ 2006-02-01  Roland McGrath  <roland at frob.com>
+ 
+ 	* mach/Machrules ($(objpfx)%.uh, $(objpfx)%.__h): Use static pattern
+@@ -20,6 +40,11 @@
+ 	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
+ 	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
+ 
 +2006-01-30  Jakub Jelinek  <jakub at redhat.com>
 +
 +	* include/bits/stdlib-ldbl.h: New file.
 +	* include/bits/wchar-ldbl.h: New file.
 +
-+2006-02-01  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
-+	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
-+
- 2006-01-31  Jakub Jelinek  <jakub at redhat.com>
+ 2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
- 	* sysdeps/unix/sysv/linux/alpha/fpu/Implies: New file.
-@@ -2414,6 +2424,10 @@
+ 	* libio/genops.c: Include <stdbool.h>.
+@@ -2445,6 +2470,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -25,7 +47,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2697,6 +2711,26 @@
+@@ -2728,6 +2757,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -52,7 +74,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5815,6 +5849,11 @@
+@@ -5846,6 +5895,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -64,7 +86,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6809,6 +6848,12 @@
+@@ -6840,6 +6894,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -77,7 +99,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -6933,6 +6978,17 @@
+@@ -6964,6 +7024,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -95,7 +117,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -9993,6 +10049,18 @@
+@@ -10024,6 +10095,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -114,8 +136,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060201T0846/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060201T0846-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060202T0507/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060202T0507-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.
@@ -165,8 +187,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-20060201T0846/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060201T0846-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060202T0507/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060202T0507-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.
@@ -193,8 +215,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060201T0846/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060201T0846-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060202T0507/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060202T0507-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>
@@ -275,8 +297,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060201T0846/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060201T0846-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060202T0507/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060202T0507-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;
@@ -301,8 +323,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060201T0846/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060201T0846-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060202T0507/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060202T0507-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -331,8 +353,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060201T0846/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060201T0846-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060202T0507/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060202T0507-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -434,8 +456,8 @@
      }
  
    search_dirs ();
---- glibc-20060201T0846/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060201T0846-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060202T0507/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060202T0507-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;
@@ -460,8 +482,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060201T0846/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060201T0846-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060202T0507/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060202T0507-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)
@@ -538,8 +560,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060201T0846/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060201T0846-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060202T0507/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060202T0507-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -555,16 +577,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060201T0846/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060202T0507/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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-20060201T0846/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060202T0507/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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-20060201T0846/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060201T0846-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060202T0507/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060202T0507-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
@@ -574,8 +596,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060201T0846/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060201T0846-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060202T0507/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060202T0507-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.  */
@@ -589,8 +611,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060201T0846/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060201T0846-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060202T0507/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060202T0507-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);
@@ -621,8 +643,8 @@
  
  #endif
  
---- glibc-20060201T0846/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060201T0846-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060202T0507/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060202T0507-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -714,8 +736,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060201T0846/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060201T0846-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060202T0507/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060202T0507-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,
  	}
      }
@@ -759,8 +781,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060201T0846/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060201T0846-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060202T0507/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060202T0507-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -769,8 +791,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060201T0846/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060201T0846-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060202T0507/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060202T0507-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -812,8 +834,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060201T0846/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060201T0846-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060202T0507/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060202T0507-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>"
@@ -828,8 +850,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060201T0846/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060201T0846-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060202T0507/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060202T0507-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>"
@@ -841,8 +863,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-20060201T0846/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060202T0507/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -913,8 +935,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060201T0846/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060201T0846-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060202T0507/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060202T0507-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -942,8 +964,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060201T0846/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060201T0846-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060202T0507/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060202T0507-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>
@@ -1019,8 +1041,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060201T0846/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060201T0846-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060202T0507/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060202T0507-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)
@@ -1076,8 +1098,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060201T0846/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
-+++ glibc-20060201T0846-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
+--- glibc-20060202T0507/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
++++ glibc-20060202T0507-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
 @@ -497,6 +497,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1118,8 +1140,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060201T0846/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060201T0846-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060202T0507/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
++++ glibc-20060202T0507-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1142,8 +1164,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060201T0846/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060201T0846-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060202T0507/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060202T0507-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;
@@ -1168,8 +1190,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060201T0846/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060202T0507/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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>
 +
@@ -1177,8 +1199,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060201T0846/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060201T0846-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+--- glibc-20060202T0507/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060202T0507-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1198,8 +1220,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060201T0846/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060201T0846-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060202T0507/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060202T0507-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1218,8 +1240,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060201T0846/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060201T0846-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060202T0507/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060202T0507-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1231,8 +1253,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060201T0846/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060201T0846-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060202T0507/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060202T0507-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
@@ -1273,8 +1295,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060201T0846/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060201T0846-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060202T0507/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060202T0507-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1284,8 +1306,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060201T0846/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060201T0846-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060202T0507/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060202T0507-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1319,8 +1341,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060201T0846/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060202T0507/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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 =
@@ -1337,8 +1359,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060201T0846/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060201T0846-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060202T0507/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060202T0507-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
@@ -1354,8 +1376,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060201T0846/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060201T0846-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060202T0507/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060202T0507-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))
@@ -1367,8 +1389,8 @@
  endif
  endif
  
---- glibc-20060201T0846/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060201T0846-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060202T0507/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060202T0507-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.  */
@@ -1720,8 +1742,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060201T0846/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060202T0507/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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.
@@ -1807,92 +1829,68 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060201T0846/sysdeps/ieee754/ldbl-128/s_llrintl.c	6 Jul 2001 04:55:55 -0000	1.2
-+++ glibc-20060201T0846-fedora/sysdeps/ieee754/ldbl-128/s_llrintl.c	1 Feb 2006 09:28:53 -0000	1.2.4.1
-@@ -1,6 +1,6 @@
- /* Round argument to nearest integral value according to current rounding
-    direction.
--   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper at cygnus.com>, 1997 and
-    		  Jakub Jelinek <jj at ultra.linux.cz>, 1999.
-@@ -52,7 +52,7 @@ __llrintl (long double x)
- 	return 0;
-       w = two112[sx] + x;
-       t = w - two112[sx];
--      GET_LDOUBLE_WORDS64 (i0, i1, x);
-+      GET_LDOUBLE_WORDS64 (i0, i1, t);
-       j0 = ((i0 >> 48) & 0x7fff) - 0x3fff;
-       i0 &= 0x0000ffffffffffffLL;
-       i0 |= 0x0001000000000000LL;
---- glibc-20060201T0846/sysdeps/s390/fpu/libm-test-ulps	1 Feb 2006 03:00:23 -0000	1.15
-+++ glibc-20060201T0846-fedora/sysdeps/s390/fpu/libm-test-ulps	1 Feb 2006 09:28:52 -0000	1.11.2.5
-@@ -691,62 +691,6 @@ ifloat: 2
- ildouble: 1
- ldouble: 1
- 
--# llrint
--Test "llrint (-4503599627370495.5) == -4503599627370496LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-4503599627370496.75) == -4503599627370497LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-4503599627370497.5) == -4503599627370498LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-72057594037927935.5) == -72057594037927936LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-72057594037927936.75) == -72057594037927937LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-72057594037927937.5) == -72057594037927938LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-9007199254740991.5) == -9007199254740992LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-9007199254740992.75) == -9007199254740993LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (-9007199254740993.5) == -9007199254740994LL":
--ildouble: 1
--ldouble: 1
--Test "llrint (4503599627370495.5) == 4503599627370496LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (4503599627370496.75) == 4503599627370497LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (4503599627370497.5) == 4503599627370498LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (72057594037927935.5) == 72057594037927936LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (72057594037927936.75) == 72057594037927937LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (72057594037927937.5) == 72057594037927938LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (9007199254740991.5) == 9007199254740992LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (9007199254740992.75) == 9007199254740993LL":
--ildouble: -1
--ldouble: -1
--Test "llrint (9007199254740993.5) == 9007199254740994LL":
--ildouble: -1
--ldouble: -1
--
- # log10
- Test "log10 (0.75) == -0.124938736608299953132449886193870744":
- double: 1
---- glibc-20060201T0846/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060201T0846-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060202T0507/sysdeps/ieee754/ldbl-opt/Makefile	14 Jan 2006 12:08:46 -0000	1.1
++++ glibc-20060202T0507-fedora/sysdeps/ieee754/ldbl-opt/Makefile	2 Feb 2006 09:24:43 -0000	1.1.2.2
+@@ -2,7 +2,9 @@
+ # -mlong-double-128 option is used (or when it becomes a default
+ # when -mlong-double-64 is not used).
+ long-double-fcts = yes
++ifeq (,$(filter -mlong-double-128,$(sysdep-CFLAGS)))
+ sysdep-CFLAGS += -mlong-double-128
++endif
+ 
+ ifeq ($(subdir),math)
+ libm-routines += s_nexttowardfd
+--- glibc-20060202T0507/sysdeps/powerpc/powerpc64/Makefile	1 Nov 2005 02:12:56 -0000	1.7
++++ glibc-20060202T0507-fedora/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 09:24:43 -0000	1.4.2.4
+@@ -10,6 +10,18 @@ ifeq (yes,$(build-shared))
+ pic-ccflag = -fpic
+ endif
+ 
++# These flags prevent FPU or Altivec registers from being used,
++# for code called in contexts that is not allowed to touch those registers.
++# Stupid GCC requires us to pass all these ridiculous switches.
++no-special-regs := $(sort $(foreach n,40 41 50 51 60 61 62 63 \
++				      $(foreach m,2 3 4 5 6 7 8 9, \
++						  3$m 4$m 5$m),\
++				    -ffixed-$n)) \
++		   $(sort $(foreach n,$(foreach m,0 1 2 3 4 5 6 7 8 9,\
++						$m 1$m 2$m) 30 31,\
++				    -ffixed-v$n)) \
++		   -ffixed-vrsave -ffixed-vscr
++
+ ifeq ($(subdir),csu)
+ sysdep_routines += hp-timing
+ elide-routines.os += hp-timing
+@@ -29,5 +41,5 @@ ifeq ($(subdir),gmon)
+ # The assembly functions assume that fp arg regs are not trashed.
+ # Compiling with -msoft-float ensures that fp regs are not used
+ # for moving memory around.
+-CFLAGS-mcount.c += -msoft-float
++CFLAGS-mcount.c += $(no-special-regs)
+ endif
+--- glibc-20060202T0507/sysdeps/powerpc/powerpc64/elf/Makefile	27 Aug 2003 04:35:46 -0000	1.1
++++ glibc-20060202T0507-fedora/sysdeps/powerpc/powerpc64/elf/Makefile	2 Feb 2006 09:24:43 -0000	1.1.2.1
+@@ -2,10 +2,10 @@
+ 
+ # Need to prevent gcc from using fprs in code used during dynamic linking.
+ 
+-CFLAGS-dl-runtime.os := -msoft-float
+-CFLAGS-dl-lookup.os := -msoft-float
+-CFLAGS-dl-misc.os := -msoft-float
+-CFLAGS-rtld-mempcpy.os := -msoft-float
+-CFLAGS-rtld-memmove.os := -msoft-float
+-CFLAGS-rtld-memchr.os := -msoft-float
+-CFLAGS-rtld-strnlen.os := -msoft-float
++CFLAGS-dl-runtime.os = $(no-special-regs)
++CFLAGS-dl-lookup.os = $(no-special-regs)
++CFLAGS-dl-misc.os = $(no-special-regs)
++CFLAGS-rtld-mempcpy.os = $(no-special-regs)
++CFLAGS-rtld-memmove.os = $(no-special-regs)
++CFLAGS-rtld-memchr.os = $(no-special-regs)
++CFLAGS-rtld-strnlen.os = $(no-special-regs)
+--- glibc-20060202T0507/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060202T0507-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);
      }
@@ -1907,8 +1905,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060202T0507-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.  */
  
@@ -1957,8 +1955,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060202T0507-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"
@@ -1968,8 +1966,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060202T0507-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;
@@ -2015,8 +2013,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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.
@@ -2077,8 +2075,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060202T0507-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)
@@ -2111,24 +2109,467 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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-20060201T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060202T0507-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-20060201T0846/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060201T0846-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060202T0507-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"_
+--- glibc-20060202T0507/timezone/asia	10 Jan 2006 07:55:37 -0000	1.35
++++ glibc-20060202T0507-fedora/timezone/asia	2 Feb 2006 09:24:43 -0000	1.28.2.8
+@@ -1,4 +1,4 @@
+-# @(#)asia	7.90
++# @(#)asia	7.91
+ # <pre>
+ 
+ # This data is by no means authoritative; if you think you know better,
+@@ -934,6 +934,10 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 3
+ # From Paul Eggert (2005-11-22):
+ # Starting 2003 transitions are from Steffen Thorsen's web site timeanddate.com.
+ #
++# From Steffen Thorsen (2005-11-23):
++# For Jordan I have received multiple independent user reports every year
++# about DST end dates, as the end-rule is different every year.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
+ Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
+@@ -1433,6 +1437,12 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+ # From Paul Eggert (2005-11-22):
+ # Starting 2004 transitions are from Steffen Thorsen's web site timeanddate.com.
+ 
++# From Steffen Thorsen (2005-11-23):
++# A user from Gaza reported that Gaza made the change early because of
++# the Ramadan.  Next year Ramadan will be even earlier, so I think
++# there is a good chance next year's end date will be around two weeks
++# earlier--the same goes for Jordan.
++
+ # The rules for Egypt are stolen from the `africa' file.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
+@@ -1445,7 +1455,7 @@ Rule EgyptAsia	1966	only	-	Oct	 1	3:00	0
+ Rule Palestine	1999	max	-	Apr	Fri>=15	0:00	1:00	S
+ Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
+ Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
+-Rule Palestine	2005	max	-	Oct	 4	1:00	0	-
++Rule Palestine	2005	max	-	Oct	 4	2:00	0	-
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
+--- glibc-20060202T0507/timezone/northamerica	10 Jan 2006 07:55:37 -0000	1.29
++++ glibc-20060202T0507-fedora/timezone/northamerica	2 Feb 2006 09:24:43 -0000	1.23.2.7
+@@ -1,4 +1,4 @@
+-# @(#)northamerica	7.87
++# @(#)northamerica	7.88
+ # <pre>
+ 
+ # also includes Central America and the Caribbean
+@@ -321,6 +321,14 @@ Zone America/Chicago	-5:50:36 -	LMT	1883
+ Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
+ 			-7:00	US	M%sT	1992 Oct 25 02:00
+ 			-6:00	US	C%sT
++# From Paul Eggert (2006-01-20):
++# The following is not implemented yet.
++# What is the most populous city in that area?
++# From http://www.statoids.com/tus.html (2006-01-20):
++# 2003-10-26 02:00: All of Morton County, ND, and the part of Sioux
++# County, ND east of ND route 31 moved from MT to CT.  (The area
++# around Fort Yates in Sioux County and the area around Mandan in
++# Morton County were already in CT.)
+ 
+ # US mountain time, represented by Denver
+ #
+@@ -519,9 +527,9 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
+ # For a map of Indiana's time zone regions, see:
+ # <a href="http://www.mccsc.edu/time.html">
+ # What time is it in Indiana?
+-# </a> (2005-05-03)
++# </a> (2005-10-30)
+ #
+-# From Paul Eggert (2005-08-22):
++# From Paul Eggert (2006-01-20):
+ # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
+ # with the following exceptions:
+ #
+@@ -533,11 +541,14 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
+ # - Clark, Floyd, and Harrison counties have been like
+ #   America/Kentucky/Louisville.
+ #
+-# - Crawford, Starke, and Switzerland counties have their own time zone
++# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
++#   have been like America/Indiana/Vincennes.
++#
++# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
+ #   histories as noted below.
+ #
+-# Shanks partitions Indiana into 345 regions, each with its own time history,
+-# and writes ``Even newspaper reports present contradictory information.''
++# Shanks partitioned Indiana into 345 regions, each with its own time history,
++# and wrote ``Even newspaper reports present contradictory information.''
+ # Fortunately, most of the complexity occurred before our cutoff date of 1970.
+ #
+ # Other than Indianapolis, the Indiana place names are so nondescript
+@@ -545,11 +556,19 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
+ # So we reluctantly put them all in a subdirectory `America/Indiana'.
+ 
+ # From Paul Eggert (2005-08-16):
+-# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006,
+-# and that many counties may switch either to Central or to Eastern time.
+-# The county-by-county decisions have not been made yet, so for now assume
+-# that no counties will switch: this assumption is most likely wrong,
+-# but it's the best we can do for now.
++# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
++
++# From Deborah Goldsmith (2006-01-18):
++# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf
++# From Paul Eggert (2006-01-20):
++# It says "DOT is relocating the time zone boundary in Indiana to move Starke,
++# Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
++# Eastern Time Zone to the Central Time Zone.... The effective date of
++# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the
++# changeover date from standard time to Daylight Saving Time."
++# Strictly speaking, this means the affected counties will change their
++# clocks twice that night, but this obviously is in error.  The intent
++# is that 01:59:59 EST be followed by 02:00:00 CDT.
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
+@@ -568,8 +587,8 @@ Zone America/Indiana/Indianapolis -5:44:
+ 			-5:00	-	EST	2006
+ 			-5:00	US	E%sT
+ #
+-# Part of Crawford County, Indiana, last observed DST in 1975,
+-# and left its clocks alone in 1974.
++# Eastern Crawford County, Indiana, left its clocks alone in 1974,
++# as well as from 1976 through 2005.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Marengo	1951	only	-	Apr	lastSun	2:00	1:00	D
+ Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
+@@ -586,7 +605,45 @@ Zone America/Indiana/Marengo -5:45:23 -	
+ 			-5:00	-	EST	2006
+ 			-5:00	US	E%sT
+ #
+-# Starke County, Indiana
++# Daviess, Dubois, Knox, Martin, Perry, and Pulaski Counties, Indiana,
++# switched from eastern to central time in April 2006.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
++Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1955	only	-	May	 1	0:00	1:00	D
++Rule Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
++Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
++			-6:00	US	C%sT	1946
++			-6:00 Vincennes	C%sT	1964 Apr 26 2:00
++			-5:00	-	EST	1969
++			-5:00	US	E%sT	1971
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
++# 
++# Pike County, Indiana moved from central to eastern time in 1977,
++# then switched back in 2006.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
++Rule	Pike	1955	only	-	May	 1	0:00	1:00	D
++Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
++Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
++Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
++			-6:00	US	C%sT	1955
++			-6:00	Pike	C%sT	1965 Apr 25 2:00
++			-5:00	-	EST	1966 Oct 30 2:00
++			-6:00	US	C%sT	1977 Oct 30 2:00
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
++#
++# Starke County, Indiana moved from central to eastern time in 1991,
++# then switched back in 2006.
+ # From Arthur David Olson (1991-10-28):
+ # An article on page A3 of the Sunday, 1991-10-27 Washington Post
+ # notes that Starke County switched from Central time to Eastern time as of
+@@ -603,10 +660,10 @@ Zone America/Indiana/Knox -5:46:30 -	LMT
+ 			-6:00	Starke	C%sT	1962 Apr 29 2:00
+ 			-5:00	-	EST	1963 Oct 27 2:00
+ 			-6:00	US	C%sT	1991 Oct 27 2:00
+-			-5:00	-	EST	2006
+-			-5:00	US	E%sT
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
+ #
+-# Switzerland County, Indiana, last observed DST in 1972.
++# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
+ 			-6:00	US	C%sT	1954 Apr 25 2:00
+@@ -636,7 +693,7 @@ Zone America/Kentucky/Louisville -5:43:0
+ 			-6:00	1:00	CDT	1974 Oct 27 2:00
+ 			-5:00	US	E%sT
+ #
+-# Wayne, Clinton, and Russell Counties, Kentucky
++# Wayne County, Kentucky
+ #
+ # From
+ # <a href="http://www.lake-cumberland.com/life/archive/news990129time.shtml">
+@@ -733,7 +790,8 @@ Zone America/Detroit	-5:32:11 -	LMT	1905
+ 			-5:00	-	EST	1975 Apr 27 2:00
+ 			-5:00	US	E%sT
+ #
+-# The Michigan border with Wisconsin switched from EST to CST/CDT in 1973.
++# Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
++# switched from EST to CST/CDT in 1973.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
+ Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
+@@ -929,7 +987,7 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	18
+ 			-4:00	StJohns	A%sT
+ 
+ 
+-# west Labrador, New Brunswick, Nova Scotia, Prince Edward I
++# west Labrador, Nova Scotia, Prince Edward I
+ 
+ # From Paul Eggert (1996-06-12):
+ # Shanks writes that since 1970 most of this region has been like Halifax.
+@@ -938,53 +996,48 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	18
+ # Shanks also writes that Liverpool, NS was the only town in Canada to observe
+ # DST in 1971 but not 1970; for now we'll assume this is a typo.
+ 
+-# From Paul Eggert (2000-10-02):
+-# INMS (2000-09-12) says that, since 1988 at least, New Brunswick switches
+-# at 00:01 local time.  FIXME: verify and create a new Zone for this.
+-
+-
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
+-Rule Halifax	1916	only	-	Oct	 1	0:00	0	S
+-Rule Halifax	1920	only	-	May	 9	0:00	1:00	D
+-Rule Halifax	1920	only	-	Aug	29	0:00	0	S
+-Rule Halifax	1921	only	-	May	 6	0:00	1:00	D
+-Rule Halifax	1921	1922	-	Sep	 5	0:00	0	S
+-Rule Halifax	1922	only	-	Apr	30	0:00	1:00	D
+-Rule Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1923	only	-	Sep	 4	0:00	0	S
+-Rule Halifax	1924	only	-	Sep	15	0:00	0	S
+-Rule Halifax	1925	only	-	Sep	28	0:00	0	S
+-Rule Halifax	1926	only	-	May	16	0:00	1:00	D
+-Rule Halifax	1926	only	-	Sep	13	0:00	0	S
+-Rule Halifax	1927	only	-	May	 1	0:00	1:00	D
+-Rule Halifax	1927	only	-	Sep	26	0:00	0	S
+-Rule Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
+-Rule Halifax	1928	only	-	Sep	 9	0:00	0	S
+-Rule Halifax	1929	only	-	Sep	 3	0:00	0	S
+-Rule Halifax	1930	only	-	Sep	15	0:00	0	S
+-Rule Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
+-Rule Halifax	1932	only	-	May	 1	0:00	1:00	D
+-Rule Halifax	1933	only	-	Apr	30	0:00	1:00	D
+-Rule Halifax	1933	only	-	Oct	 2	0:00	0	S
+-Rule Halifax	1934	only	-	May	20	0:00	1:00	D
+-Rule Halifax	1934	only	-	Sep	16	0:00	0	S
+-Rule Halifax	1935	only	-	Jun	 2	0:00	1:00	D
+-Rule Halifax	1935	only	-	Sep	30	0:00	0	S
+-Rule Halifax	1936	only	-	Jun	 1	0:00	1:00	D
+-Rule Halifax	1936	only	-	Sep	14	0:00	0	S
+-Rule Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
+-Rule Halifax	1939	only	-	May	28	0:00	1:00	D
+-Rule Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
++Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
++Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
++Rule	Halifax	1920	only	-	May	 9	0:00	1:00	D
++Rule	Halifax	1920	only	-	Aug	29	0:00	0	S
++Rule	Halifax	1921	only	-	May	 6	0:00	1:00	D
++Rule	Halifax	1921	1922	-	Sep	 5	0:00	0	S
++Rule	Halifax	1922	only	-	Apr	30	0:00	1:00	D
++Rule	Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1923	only	-	Sep	 4	0:00	0	S
++Rule	Halifax	1924	only	-	Sep	15	0:00	0	S
++Rule	Halifax	1925	only	-	Sep	28	0:00	0	S
++Rule	Halifax	1926	only	-	May	16	0:00	1:00	D
++Rule	Halifax	1926	only	-	Sep	13	0:00	0	S
++Rule	Halifax	1927	only	-	May	 1	0:00	1:00	D
++Rule	Halifax	1927	only	-	Sep	26	0:00	0	S
++Rule	Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
++Rule	Halifax	1928	only	-	Sep	 9	0:00	0	S
++Rule	Halifax	1929	only	-	Sep	 3	0:00	0	S
++Rule	Halifax	1930	only	-	Sep	15	0:00	0	S
++Rule	Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
++Rule	Halifax	1932	only	-	May	 1	0:00	1:00	D
++Rule	Halifax	1933	only	-	Apr	30	0:00	1:00	D
++Rule	Halifax	1933	only	-	Oct	 2	0:00	0	S
++Rule	Halifax	1934	only	-	May	20	0:00	1:00	D
++Rule	Halifax	1934	only	-	Sep	16	0:00	0	S
++Rule	Halifax	1935	only	-	Jun	 2	0:00	1:00	D
++Rule	Halifax	1935	only	-	Sep	30	0:00	0	S
++Rule	Halifax	1936	only	-	Jun	 1	0:00	1:00	D
++Rule	Halifax	1936	only	-	Sep	14	0:00	0	S
++Rule	Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
++Rule	Halifax	1939	only	-	May	28	0:00	1:00	D
++Rule	Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
+ 			-4:00	Halifax	A%sT	1918
+@@ -1000,6 +1053,43 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	19
+ 			-4:00	Halifax	A%sT	1974
+ 			-4:00	Canada	A%sT
+ 
++# New Brunswick
++
++# From Paul Eggert (2006-01-20):
++# New Brunswick's Time Definition Act
++# <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> says they change at 00:01, and
++# <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it
++# clear that this has been the case since at least 1993.
++# For now, assume it started in 1993.  The Office of the Premier announced
++# <http://www.gnb.ca/cnb/news/pre/2005e1737pr.htm> (2005-12-23)
++# that they will bring forward proposed amendments to harmonize with the US;
++# for now assume that this will happen, but they'll still switch at 00:01.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Moncton	1933	1935	-	Jun	Sun>=8	1:00	1:00	D
++Rule	Moncton	1933	1935	-	Sep	Sun>=8	1:00	0	S
++Rule	Moncton	1936	1938	-	Jun	Sun>=1	1:00	1:00	D
++Rule	Moncton	1936	1938	-	Sep	Sun>=1	1:00	0	S
++Rule	Moncton	1939	only	-	May	27	1:00	1:00	D
++Rule	Moncton	1939	1941	-	Sep	Sat>=21	1:00	0	S
++Rule	Moncton	1940	only	-	May	19	1:00	1:00	D
++Rule	Moncton	1941	only	-	May	 4	1:00	1:00	D
++Rule	Moncton	1946	1972	-	Apr	lastSun	2:00	1:00	D
++Rule	Moncton	1946	1956	-	Sep	lastSun	2:00	0	S
++Rule	Moncton	1956	1972	-	Oct	lastSun	2:00	0	S
++Rule	Moncton	1993	2006	-	Apr	Sun>=1	0:01	1:00	D
++Rule	Moncton	1993	2006	-	Oct	lastSun	0:01	0	S
++Rule	Moncton	2007	max	-	Mar	Sun>=8	0:01	1:00	D
++Rule	Moncton	2007	max	-	Nov	Sun>=1	0:01	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
++			-5:00	-	EST	1902 Jun 15
++			-4:00	Canada	A%sT	1933
++			-4:00	Moncton	A%sT	1942
++			-4:00	Canada	A%sT	1946
++			-4:00	Moncton	A%sT	1973
++			-4:00	Canada	A%sT	1993
++			-4:00	Moncton	A%sT
+ 
+ # Ontario, Quebec
+ 
+--- glibc-20060202T0507/timezone/private.h	10 Jan 2006 07:55:37 -0000	1.11
++++ glibc-20060202T0507-fedora/timezone/private.h	2 Feb 2006 09:24:43 -0000	1.7.2.5
+@@ -218,7 +218,7 @@ char *	imalloc P((int n));
+ void *	irealloc P((void * pointer, int size));
+ void	icfree P((char * pointer));
+ void	ifree P((char * pointer));
+-char *	scheck P((const char *string, char *format));
++const char *scheck P((const char *string, const char *format));
+ 
+ /*
+ ** Finally, some convenience items.
+--- glibc-20060202T0507/timezone/scheck.c	6 Aug 2005 05:40:57 -0000	1.3
++++ glibc-20060202T0507-fedora/timezone/scheck.c	2 Feb 2006 09:24:43 -0000	1.1.6.3
+@@ -1,6 +1,6 @@
+ #ifndef lint
+ #ifndef NOID
+-static char	elsieid[] = "@(#)scheck.c	8.16";
++static char	elsieid[] = "@(#)scheck.c	8.17";
+ #endif /* !defined lint */
+ #endif /* !defined NOID */
+ 
+@@ -8,20 +8,19 @@ static char	elsieid[] = "@(#)scheck.c	8.
+ 
+ #include "private.h"
+ 
+-char *
++const char *
+ scheck(string, format)
+ const char * const	string;
+-char * const		format;
++const char * const	format;
+ {
+ 	register char *		fbuf;
+ 	register const char *	fp;
+ 	register char *		tp;
+ 	register int		c;
+-	register char *		result;
++	register const char *	result;
+ 	char			dummy;
+-	static char		nada;
+ 
+-	result = &nada;
++	result = "";
+ 	if (string == NULL || format == NULL)
+ 		return result;
+ 	fbuf = imalloc((int) (2 * strlen(format) + 4));
+--- glibc-20060202T0507/timezone/zone.tab	7 Sep 2005 07:00:55 -0000	1.23
++++ glibc-20060202T0507-fedora/timezone/zone.tab	2 Feb 2006 09:24:43 -0000	1.21.2.3
+@@ -1,4 +1,4 @@
+-# @(#)zone.tab	1.32
++# @(#)zone.tab	1.33
+ #
+ # TZ zone descriptions
+ #
+@@ -100,8 +100,9 @@ BW	-2545+02555	Africa/Gaborone
+ BY	+5354+02734	Europe/Minsk
+ BZ	+1730-08812	America/Belize
+ CA	+4734-05243	America/St_Johns	Newfoundland Island
+-CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
++CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), W Labrador, E Quebec & PEI
+ CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
++CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+ CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
+ CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
+ CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
+@@ -370,12 +371,14 @@ US	+404251-0740023	America/New_York	East
+ US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+ US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+ US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+-US	+394606-0860929	America/Indiana/Indianapolis	Eastern Standard Time - Indiana - most locations
+-US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
+-US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
+-US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
++US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
++US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
++US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
++US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+ US	+415100-0873900	America/Chicago	Central Time
+-US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
++US	+384038-0873143	America/Indiana/Vincennes	Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski
++US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
++US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+ US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+ US	+394421-1045903	America/Denver	Mountain Time
+ US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- glibc.spec	1 Feb 2006 10:20:18 -0000	1.215
+++ glibc.spec	2 Feb 2006 09:35:12 -0000	1.216
@@ -1,9 +1,9 @@
-%define glibcdate 20060201T0846
+%define glibcdate 20060202T0507
 %define glibcname glibc
-%define glibcsrcdir glibc-20060201T0846
+%define glibcsrcdir glibc-20060202T0507
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 32
+%define glibcrelease 33
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1245,6 +1245,10 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-33
+- update from CVS
+  - long double support fixes
+
 * Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-32
 - update from CVS
   - 128-bit long double fixes for ppc{,64}, s390{,x} and sparc{,v9},


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- sources	1 Feb 2006 10:20:18 -0000	1.156
+++ sources	2 Feb 2006 09:35:12 -0000	1.157
@@ -1,2 +1,2 @@
-4262afa05ced2d49fda5fca68f89b54a  glibc-20060201T0846.tar.bz2
-891beceb0be78922e860434e34cd828f  glibc-fedora-20060201T0846.tar.bz2
+da6754150cd9d19f4c01c6e800f7acac  glibc-20060202T0507.tar.bz2
+0cbf64874957d6598397331681b07b8e  glibc-fedora-20060202T0507.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:37:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:37:27 -0500
Subject: rpms/xorg-x11-drv-acecad/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-acecad.spec, 1.5, 1.6
Message-ID: <200602020937.k129bRPm012520@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-acecad/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12482/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-acecad.spec 
Log Message:
auto-import xorg-x11-drv-acecad-1.0.0.5-1 on branch devel from xorg-x11-drv-acecad-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:36:29 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:37:25 -0000	1.6
@@ -1 +1 @@
-xf86-input-acecad-1.0.0.4.tar.bz2
+xf86-input-acecad-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-acecad/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:36:29 -0000	1.5
+++ sources	2 Feb 2006 09:37:25 -0000	1.6
@@ -1 +1 @@
-2ce14b1cebfa826e157a4c03f5e82230  xf86-input-acecad-1.0.0.4.tar.bz2
+5e4aede1013d13f6f79dfc44b350a022  xf86-input-acecad-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-acecad.spec	24 Dec 2005 03:36:29 -0000	1.5
+++ xorg-x11-drv-acecad.spec	2 Feb 2006 09:37:25 -0000	1.6
@@ -1,39 +1,20 @@
 %define tarball xf86-input-acecad
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
@@ -55,7 +36,7 @@
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -64,19 +45,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/acecad_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/acecad.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-acecad to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-acecad to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -87,6 +63,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-acecad 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
 - Initial spec file for acecad input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:38:09 -0500
Subject: rpms/xorg-x11-drv-aiptek/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-aiptek.spec, 1.5, 1.6
Message-ID: <200602020938.k129c95B012743@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-aiptek/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12699/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-aiptek.spec 
Log Message:
auto-import xorg-x11-drv-aiptek-1.0.0.5-1 on branch devel from xorg-x11-drv-aiptek-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:36:55 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:38:06 -0000	1.6
@@ -1 +1 @@
-xf86-input-aiptek-1.0.0.4.tar.bz2
+xf86-input-aiptek-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-aiptek/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:36:55 -0000	1.5
+++ sources	2 Feb 2006 09:38:06 -0000	1.6
@@ -1 +1 @@
-b4f4bbb875d48986e9a7e52ad0ec6aac  xf86-input-aiptek-1.0.0.4.tar.bz2
+96c171eb8531cc51c22c8f8568a96db5  xf86-input-aiptek-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-aiptek.spec	24 Dec 2005 03:36:55 -0000	1.5
+++ xorg-x11-drv-aiptek.spec	2 Feb 2006 09:38:06 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-aiptek
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/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:   http://xorg.freedesktop.org/X11R7.0/src/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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 aiptek input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/aiptek_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/aiptek.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-aiptek to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-aiptek to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:38:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:38:37 -0500
Subject: rpms/xorg-x11-drv-calcomp/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-calcomp.spec, 1.5, 1.6
Message-ID: <200602020938.k129cbIn013018@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-calcomp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12982/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-calcomp.spec 
Log Message:
auto-import xorg-x11-drv-calcomp-1.0.0.5-1 on branch devel from xorg-x11-drv-calcomp-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:38:04 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:38:34 -0000	1.6
@@ -1 +1 @@
-xf86-input-calcomp-1.0.0.4.tar.bz2
+xf86-input-calcomp-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-calcomp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:38:04 -0000	1.5
+++ sources	2 Feb 2006 09:38:34 -0000	1.6
@@ -1 +1 @@
-777e2acf605671e7401464945e5ddd70  xf86-input-calcomp-1.0.0.4.tar.bz2
+4f44ae58177728ee9943cdd4ba92f018  xf86-input-calcomp-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-calcomp.spec	24 Dec 2005 03:38:04 -0000	1.5
+++ xorg-x11-drv-calcomp.spec	2 Feb 2006 09:38:34 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-calcomp
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 calcomp input driver
 Name:      xorg-x11-drv-calcomp
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 calcomp input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/calcomp_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/calcomp.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-calcomp to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-calcomp to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-calcomp 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
 - Initial spec file for calcomp input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:38:59 -0500
Subject: rpms/xorg-x11-drv-citron/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-citron.spec, 1.5, 1.6
Message-ID: <200602020938.k129cxXx013260@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13221/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-citron.spec 
Log Message:
auto-import xorg-x11-drv-citron-2.1.1.5-1 on branch devel from xorg-x11-drv-citron-2.1.1.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:38:54 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:38:57 -0000	1.6
@@ -1 +1 @@
-xf86-input-citron-2.1.1.4.tar.bz2
+xf86-input-citron-2.1.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:38:54 -0000	1.5
+++ sources	2 Feb 2006 09:38:57 -0000	1.6
@@ -1 +1 @@
-e22209cb5bc55041415de1b2956f8ac3  xf86-input-citron-2.1.1.4.tar.bz2
+6416d38ff38e05882991b29608ffe56d  xf86-input-citron-2.1.1.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-citron.spec	24 Dec 2005 03:38:54 -0000	1.5
+++ xorg-x11-drv-citron.spec	2 Feb 2006 09:38:57 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-citron
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 citron input driver
 Name:      xorg-x11-drv-citron
-Version: 2.1.1.4
+Version: 2.1.1.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 citron input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/citron_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/citron.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.1.1.5-1
+- Updated xorg-x11-drv-citron to version 2.1.1.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 2.1.1.4-1
 - Updated xorg-x11-drv-citron to version 2.1.1.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 2.1.1.1-1
 - Updated xorg-x11-drv-citron to version 2.1.1.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 2.1.1-0
 - Initial spec file for citron input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:39:25 -0500
Subject: rpms/xorg-x11-drv-digitaledge/devel .cvsignore, 1.5, 1.6 sources,
	1.5, 1.6 xorg-x11-drv-digitaledge.spec, 1.5, 1.6
Message-ID: <200602020939.k129dPlS013513@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13468/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-digitaledge.spec 
Log Message:
auto-import xorg-x11-drv-digitaledge-1.0.1.3-1 on branch devel from xorg-x11-drv-digitaledge-1.0.1.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:39:32 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:39:22 -0000	1.6
@@ -1 +1 @@
-xf86-input-digitaledge-1.0.1.2.tar.bz2
+xf86-input-digitaledge-1.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:39:32 -0000	1.5
+++ sources	2 Feb 2006 09:39:22 -0000	1.6
@@ -1 +1 @@
-959cd17d6b74761c82201b02afca6075  xf86-input-digitaledge-1.0.1.2.tar.bz2
+5fd6fff3d2c415a100b5677842b04bc2  xf86-input-digitaledge-1.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-digitaledge.spec	24 Dec 2005 03:39:32 -0000	1.5
+++ xorg-x11-drv-digitaledge.spec	2 Feb 2006 09:39:22 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-digitaledge
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 digitaledge input driver
 Name:      xorg-x11-drv-digitaledge
-Version: 1.0.1.2
+Version: 1.0.1.3
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 digitaledge input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/digitaledge_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-1
+- Updated xorg-x11-drv-digitaledge to version 1.0.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-digitaledge to version 1.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-digitaledge 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
 - Initial spec file for digitaledge input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:39:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:39:50 -0500
Subject: rpms/xorg-x11-drv-dmc/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-dmc.spec, 1.5, 1.6
Message-ID: <200602020939.k129do9s013767@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dmc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13732/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-dmc.spec 
Log Message:
auto-import xorg-x11-drv-dmc-1.0.0.5-1 on branch devel from xorg-x11-drv-dmc-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:39:46 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:39:47 -0000	1.6
@@ -1 +1 @@
-xf86-input-dmc-1.0.0.4.tar.bz2
+xf86-input-dmc-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dmc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:39:46 -0000	1.5
+++ sources	2 Feb 2006 09:39:47 -0000	1.6
@@ -1 +1 @@
-372d171cb5441bdafd6e32fa12235ca1  xf86-input-dmc-1.0.0.4.tar.bz2
+28ae73cf0f9ff90fd000fc7507d0745e  xf86-input-dmc-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-dmc.spec	24 Dec 2005 03:39:46 -0000	1.5
+++ xorg-x11-drv-dmc.spec	2 Feb 2006 09:39:47 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-dmc
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 dmc input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/dmc_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/dmc.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-dmc to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-dmc to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-dmc 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
 - Initial spec file for dmc input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:41:25 -0500
Subject: rpms/xorg-x11-drv-dynapro/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-dynapro.spec, 1.5, 1.6
Message-ID: <200602020941.k129fP31014342@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dynapro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14298/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-dynapro.spec 
Log Message:
auto-import xorg-x11-drv-dynapro-1.0.0.5-1 on branch devel from xorg-x11-drv-dynapro-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:40:21 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:41:22 -0000	1.6
@@ -1 +1 @@
-xf86-input-dynapro-1.0.0.4.tar.bz2
+xf86-input-dynapro-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dynapro/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:40:21 -0000	1.5
+++ sources	2 Feb 2006 09:41:22 -0000	1.6
@@ -1 +1 @@
-0148a64bb074c460e97e716c951fb4ad  xf86-input-dynapro-1.0.0.4.tar.bz2
+e035a3b8561860236e32012ab26dda15  xf86-input-dynapro-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-dynapro.spec	24 Dec 2005 03:40:21 -0000	1.5
+++ xorg-x11-drv-dynapro.spec	2 Feb 2006 09:41:22 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-dynapro
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 dynapro input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/dynapro_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/dynapro.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-dynapro to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-dynapro to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-dynapro 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
 - Initial spec file for dynapro input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:42:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:42:15 -0500
Subject: rpms/xorg-x11-drv-elo2300/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-elo2300.spec, 1.5, 1.6
Message-ID: <200602020942.k129gFFj014807@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-elo2300/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14757/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-elo2300.spec 
Log Message:
auto-import xorg-x11-drv-elo2300-1.0.0.5-1 on branch devel from xorg-x11-drv-elo2300-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:40:44 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:42:12 -0000	1.6
@@ -1 +1 @@
-xf86-input-elo2300-1.0.0.4.tar.bz2
+xf86-input-elo2300-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elo2300/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:40:44 -0000	1.5
+++ sources	2 Feb 2006 09:42:12 -0000	1.6
@@ -1 +1 @@
-fcaeb0eb045848ea113a5fd52c714820  xf86-input-elo2300-1.0.0.4.tar.bz2
+664af07018e07207358a73b4e93e7a91  xf86-input-elo2300-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-elo2300.spec	24 Dec 2005 03:40:44 -0000	1.5
+++ xorg-x11-drv-elo2300.spec	2 Feb 2006 09:42:12 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-elo2300
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 elo2300 input driver
 Name:      xorg-x11-drv-elo2300
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 elo2300 input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/elo2300_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/elo2300.4x*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-elo2300 to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-elo2300 to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-elo2300 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
 - Initial spec file for elo2300 input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:43:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:43:02 -0500
Subject: rpms/xorg-x11-drv-elographics/devel .cvsignore, 1.5, 1.6 sources,
	1.5, 1.6 xorg-x11-drv-elographics.spec, 1.5, 1.6
Message-ID: <200602020943.k129h2FC015227@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-elographics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15190/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-elographics.spec 
Log Message:
auto-import xorg-x11-drv-elographics-1.0.0.5-1 on branch devel from xorg-x11-drv-elographics-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:40:57 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:42:59 -0000	1.6
@@ -1 +1 @@
-xf86-input-elographics-1.0.0.4.tar.bz2
+xf86-input-elographics-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-elographics/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:40:57 -0000	1.5
+++ sources	2 Feb 2006 09:42:59 -0000	1.6
@@ -1 +1 @@
-dd80a58ef33e62ad47b7ac302661f0f2  xf86-input-elographics-1.0.0.4.tar.bz2
+5eeec9c02f62cc7bb966109ea7c87f34  xf86-input-elographics-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-elographics.spec	24 Dec 2005 03:40:57 -0000	1.5
+++ xorg-x11-drv-elographics.spec	2 Feb 2006 09:42:59 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-elographics
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 elographics input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/elographics_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/elographics.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-elographics to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-elographics to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-elographics 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
 - Initial spec file for elographics input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:43:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:43:32 -0500
Subject: rpms/xorg-x11-drv-evdev/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-evdev.spec, 1.5, 1.6
Message-ID: <200602020943.k129hWes015529@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15489/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-evdev.spec 
Log Message:
auto-import xorg-x11-drv-evdev-1.0.0.5-1 on branch devel from xorg-x11-drv-evdev-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:41:08 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:43:29 -0000	1.6
@@ -1 +1 @@
-xf86-input-evdev-1.0.0.4.tar.bz2
+xf86-input-evdev-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:41:08 -0000	1.5
+++ sources	2 Feb 2006 09:43:29 -0000	1.6
@@ -1 +1 @@
-04d1a574210d71d2bc9c09a287cca340  xf86-input-evdev-1.0.0.4.tar.bz2
+70a3b3e8416e3fd536c8894511f13a67  xf86-input-evdev-1.0.0.5.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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-evdev.spec	24 Dec 2005 03:41:08 -0000	1.5
+++ xorg-x11-drv-evdev.spec	2 Feb 2006 09:43:29 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-evdev
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 evdev input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/evdev_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-evdev to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-evdev to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-evdev 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
 - Initial spec file for evdev input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:43:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:43:58 -0500
Subject: rpms/xorg-x11-drv-fpit/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-fpit.spec, 1.5, 1.6
Message-ID: <200602020943.k129hwDx015804@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-fpit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15762/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-fpit.spec 
Log Message:
auto-import xorg-x11-drv-fpit-1.0.0.5-1 on branch devel from xorg-x11-drv-fpit-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:41:34 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:43:55 -0000	1.6
@@ -1 +1 @@
-xf86-input-fpit-1.0.0.4.tar.bz2
+xf86-input-fpit-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fpit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:41:34 -0000	1.5
+++ sources	2 Feb 2006 09:43:56 -0000	1.6
@@ -1 +1 @@
-29da598e892fd7393430e6b87d33255a  xf86-input-fpit-1.0.0.4.tar.bz2
+1f75120f61948dd0773a3b479d176348  xf86-input-fpit-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-fpit.spec	24 Dec 2005 03:41:34 -0000	1.5
+++ xorg-x11-drv-fpit.spec	2 Feb 2006 09:43:56 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-fpit
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 fpit input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/fpit_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/fpit.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-fpit to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-fpit to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-fpit 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
 - Initial spec file for fpit input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:44:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:44:21 -0500
Subject: rpms/xorg-x11-drv-hyperpen/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-hyperpen.spec, 1.5, 1.6
Message-ID: <200602020944.k129iL31016046@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16007/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-hyperpen.spec 
Log Message:
auto-import xorg-x11-drv-hyperpen-1.0.0.5-1 on branch devel from xorg-x11-drv-hyperpen-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:41:58 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:44:19 -0000	1.6
@@ -1 +1 @@
-xf86-input-hyperpen-1.0.0.4.tar.bz2
+xf86-input-hyperpen-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:41:58 -0000	1.5
+++ sources	2 Feb 2006 09:44:19 -0000	1.6
@@ -1 +1 @@
-1722f9ef1a84f82f31f5a4a1daa09c81  xf86-input-hyperpen-1.0.0.4.tar.bz2
+578d0720c274973292f5b9adea5959bf  xf86-input-hyperpen-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-hyperpen.spec	24 Dec 2005 03:41:58 -0000	1.5
+++ xorg-x11-drv-hyperpen.spec	2 Feb 2006 09:44:19 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-hyperpen
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 hyperpen input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/hyperpen_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-hyperpen to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-hyperpen to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-hyperpen 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
 - Initial spec file for hyperpen input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:45:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:45:08 -0500
Subject: rpms/xorg-x11-drv-jamstudio/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-jamstudio.spec, 1.5, 1.6
Message-ID: <200602020945.k129j8pN016468@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16422/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-jamstudio.spec 
Log Message:
auto-import xorg-x11-drv-jamstudio-1.0.0.5-1 on branch devel from xorg-x11-drv-jamstudio-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:42:47 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:45:05 -0000	1.6
@@ -1 +1 @@
-xf86-input-jamstudio-1.0.0.4.tar.bz2
+xf86-input-jamstudio-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:42:47 -0000	1.5
+++ sources	2 Feb 2006 09:45:05 -0000	1.6
@@ -1 +1 @@
-efcc785779c1ad6e3feff89159f59479  xf86-input-jamstudio-1.0.0.4.tar.bz2
+4ea7a20133f637750f72a34b8f7b1b21  xf86-input-jamstudio-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-jamstudio.spec	24 Dec 2005 03:42:47 -0000	1.5
+++ xorg-x11-drv-jamstudio.spec	2 Feb 2006 09:45:05 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-jamstudio
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 jamstudio input driver
 Name:      xorg-x11-drv-jamstudio
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 jamstudio input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,16 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+# FIXME: These are really crappy driver filenames.  They should match the
+# name of the package, however that's something that should be done upstream.
+%{driverdir}/js_x_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/js_x.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-jamstudio to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-jamstudio to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +67,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-jamstudio 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
 - Initial spec file for jamstudio input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:45:34 -0500
Subject: rpms/xorg-x11-drv-joystick/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-joystick.spec, 1.5, 1.6
Message-ID: <200602020945.k129jYpL017659@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17181/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-joystick.spec 
Log Message:
auto-import xorg-x11-drv-joystick-1.0.0.5-1 on branch devel from xorg-x11-drv-joystick-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:00 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:45:31 -0000	1.6
@@ -1 +1 @@
-xf86-input-joystick-1.0.0.4.tar.bz2
+xf86-input-joystick-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-joystick/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:00 -0000	1.5
+++ sources	2 Feb 2006 09:45:31 -0000	1.6
@@ -1 +1 @@
-2a288017b0c58bdf57bcb5b65310ac4c  xf86-input-joystick-1.0.0.4.tar.bz2
+4dd96fe292f775d6f289c09fd8e8faf6  xf86-input-joystick-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-joystick.spec	24 Dec 2005 03:43:00 -0000	1.5
+++ xorg-x11-drv-joystick.spec	2 Feb 2006 09:45:31 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-joystick
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 joystick input driver
 Name:      xorg-x11-drv-joystick
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 joystick input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/joystick_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-joystick to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-joystick to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-joystick 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
 - Initial spec file for joystick input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:46:54 -0500
Subject: rpms/xorg-x11-drv-keyboard/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-keyboard.spec, 1.5, 1.6
Message-ID: <200602020946.k129ksbL029643@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28738/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-keyboard.spec 
Log Message:
auto-import xorg-x11-drv-keyboard-1.0.1.3-1 on branch devel from xorg-x11-drv-keyboard-1.0.1.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:11 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:46:52 -0000	1.6
@@ -1 +1 @@
-xf86-input-keyboard-1.0.1.2.tar.bz2
+xf86-input-keyboard-1.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-keyboard/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:11 -0000	1.5
+++ sources	2 Feb 2006 09:46:52 -0000	1.6
@@ -1 +1 @@
-bb82202de1a2b0553af6f3900b037931  xf86-input-keyboard-1.0.1.2.tar.bz2
+b501e354c7f160d09ea1ca8f5db9404b  xf86-input-keyboard-1.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-keyboard.spec	24 Dec 2005 03:43:11 -0000	1.5
+++ xorg-x11-drv-keyboard.spec	2 Feb 2006 09:46:52 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-keyboard
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
-Version: 1.0.1.2
+Version: 1.0.1.3
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 keyboard input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,17 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/kbd_drv.so
+%{driverdir}/keyboard_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/kbd.4*
+%{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-1
+- Updated xorg-x11-drv-keyboard to version 1.0.1.3 from X11R7.0
+- Added alpha/sparc/sparc64 to ExclusiveArch list (#176590)
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-keyboard to version 1.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +68,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-keyboard 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
 - Initial spec file for keyboard input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:48:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:48:41 -0500
Subject: rpms/xorg-x11-drv-magellan/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-magellan.spec, 1.5, 1.6
Message-ID: <200602020948.k129mfWi030504@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magellan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30461/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-magellan.spec 
Log Message:
auto-import xorg-x11-drv-magellan-1.0.0.5-1 on branch devel from xorg-x11-drv-magellan-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:23 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:48:39 -0000	1.6
@@ -1 +1 @@
-xf86-input-magellan-1.0.0.4.tar.bz2
+xf86-input-magellan-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magellan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:23 -0000	1.5
+++ sources	2 Feb 2006 09:48:39 -0000	1.6
@@ -1 +1 @@
-b5d2a46e7900408961167de4b7e57856  xf86-input-magellan-1.0.0.4.tar.bz2
+5f46f47c130f5c756167caf4c975cc73  xf86-input-magellan-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-magellan.spec	24 Dec 2005 03:43:23 -0000	1.5
+++ xorg-x11-drv-magellan.spec	2 Feb 2006 09:48:39 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-magellan
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 magellan input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/magellan_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/magellan.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-magellan to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-magellan to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-magellan 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
 - Initial spec file for magellan input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:49:13 -0500
Subject: rpms/xorg-x11-drv-magictouch/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-magictouch.spec, 1.5, 1.6
Message-ID: <200602020949.k129nDVR030821@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30776/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-magictouch.spec 
Log Message:
auto-import xorg-x11-drv-magictouch-1.0.0.5-1 on branch devel from xorg-x11-drv-magictouch-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magictouch/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:36 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:49:11 -0000	1.6
@@ -1 +1 @@
-xf86-input-magictouch-1.0.0.4.tar.bz2
+xf86-input-magictouch-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-magictouch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:36 -0000	1.5
+++ sources	2 Feb 2006 09:49:11 -0000	1.6
@@ -1 +1 @@
-c48bfd5d10cea4255714a568416450a8  xf86-input-magictouch-1.0.0.4.tar.bz2
+d23f2791cd634ef85b7cc5e9da8f8407  xf86-input-magictouch-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-magictouch.spec	24 Dec 2005 03:43:36 -0000	1.5
+++ xorg-x11-drv-magictouch.spec	2 Feb 2006 09:49:11 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-magictouch
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 magictouch input driver
 Name:      xorg-x11-drv-magictouch
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 magictouch input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,15 @@
 %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}/magictouch_drv.so
 %dir %{_mandir}
 %dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_mandir}/man4/magictouch.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-magictouch to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-magictouch to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +66,7 @@
 * Fri Nov 4 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
 - Initial spec file for magictouch input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:49:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:49:32 -0500
Subject: rpms/xorg-x11-drv-microtouch/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-microtouch.spec, 1.5, 1.6
Message-ID: <200602020949.k129nWZ8031032@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-microtouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30992/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-microtouch.spec 
Log Message:
auto-import xorg-x11-drv-microtouch-1.0.0.5-1 on branch devel from xorg-x11-drv-microtouch-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:44:02 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:49:29 -0000	1.6
@@ -1 +1 @@
-xf86-input-microtouch-1.0.0.4.tar.bz2
+xf86-input-microtouch-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-microtouch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:44:02 -0000	1.5
+++ sources	2 Feb 2006 09:49:29 -0000	1.6
@@ -1 +1 @@
-3f8071d3e07247ed129153eb0f9f5c44  xf86-input-microtouch-1.0.0.4.tar.bz2
+53ef317435ca278ea1fff0902f93d74b  xf86-input-microtouch-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-microtouch.spec	24 Dec 2005 03:44:02 -0000	1.5
+++ xorg-x11-drv-microtouch.spec	2 Feb 2006 09:49:29 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-microtouch
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 microtouch input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/microtouch_drv.so
+#%dir %{_mandir}/man4
+%{_mandir}/man4/microtouch.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-microtouch to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-microtouch to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-microtouch 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
 - Initial spec file for microtouch input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:50:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:50:04 -0500
Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-mouse.spec, 1.6, 1.7
Message-ID: <200602020950.k129o4hb031337@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31299/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mouse.spec 
Log Message:
auto-import xorg-x11-drv-mouse-1.0.3.1-1 on branch devel from xorg-x11-drv-mouse-1.0.3.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:44:20 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:50:00 -0000	1.6
@@ -1 +1 @@
-xf86-input-mouse-1.0.3.tar.bz2
+xf86-input-mouse-1.0.3.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:44:20 -0000	1.5
+++ sources	2 Feb 2006 09:50:00 -0000	1.6
@@ -1 +1 @@
-8f997a23732f090be2ae1c06bd944702  xf86-input-mouse-1.0.3.tar.bz2
+c1235259ee9ecdcfe28e1365ef73f570  xf86-input-mouse-1.0.3.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-mouse.spec	24 Dec 2005 03:44:20 -0000	1.6
+++ xorg-x11-drv-mouse.spec	2 Feb 2006 09:50:00 -0000	1.7
@@ -1,22 +1,15 @@
 %define tarball xf86-input-mouse
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
-Version: 1.0.3
+Version: 1.0.3.1
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC4/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -44,10 +37,10 @@
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 # FIXME: Work around mouse manpage issue.
-mv $RPM_BUILD_ROOT%{_mandir}/man4/mouse.4 $RPM_BUILD_ROOT%{_mandir}/man4/mouse-manpage-from-xorg-which-conflicts-with-system-manpage-thankyou.4
+mv $RPM_BUILD_ROOT%{_mandir}/man4/mouse.4 $RPM_BUILD_ROOT%{_mandir}/man4/mouse-driver.4
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,11 +50,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/mouse_drv.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/mouse-manpage-from-xorg-which-conflicts-with-system-manpage-thankyou.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.3.1-1
+- Updated xorg-x11-drv-mouse to version 1.0.3.1 from X11R7.0
+- Rename temporary name of mouse manpage, to close (#178744)
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.3-1
 - Updated xorg-x11-drv-mouse to version 1.0.3 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:50:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:50:38 -0500
Subject: rpms/xorg-x11-drv-mutouch/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-mutouch.spec, 1.5, 1.6
Message-ID: <200602020950.k129ocPA031690@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mutouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31642/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mutouch.spec 
Log Message:
auto-import xorg-x11-drv-mutouch-1.0.0.5-1 on branch devel from xorg-x11-drv-mutouch-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:44:31 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:50:36 -0000	1.6
@@ -1 +1 @@
-xf86-input-mutouch-1.0.0.4.tar.bz2
+xf86-input-mutouch-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mutouch/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:44:31 -0000	1.5
+++ sources	2 Feb 2006 09:50:36 -0000	1.6
@@ -1 +1 @@
-b2233fd889dd3d42ba4404d3464eb686  xf86-input-mutouch-1.0.0.4.tar.bz2
+eab7395f4a507ddd1bf5bf9f9e5a78a6  xf86-input-mutouch-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-mutouch.spec	24 Dec 2005 03:44:31 -0000	1.5
+++ xorg-x11-drv-mutouch.spec	2 Feb 2006 09:50:36 -0000	1.6
@@ -1,39 +1,20 @@
 %define tarball xf86-input-mutouch
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
@@ -51,14 +32,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +46,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/mutouch_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/mutouch.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-mutouch to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-mutouch to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +64,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-mutouch 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
 - Initial spec file for mutouch input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:51:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:51:26 -0500
Subject: rpms/xorg-x11-drv-palmax/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-palmax.spec, 1.5, 1.6
Message-ID: <200602020951.k129pQYQ032085@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-palmax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32042/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-palmax.spec 
Log Message:
auto-import xorg-x11-drv-palmax-1.0.0.5-1 on branch devel from xorg-x11-drv-palmax-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:45:24 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:51:23 -0000	1.6
@@ -1 +1 @@
-xf86-input-palmax-1.0.0.4.tar.bz2
+xf86-input-palmax-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-palmax/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:45:24 -0000	1.5
+++ sources	2 Feb 2006 09:51:23 -0000	1.6
@@ -1 +1 @@
-447f8d46dec1c211405c66eedb13ed4d  xf86-input-palmax-1.0.0.4.tar.bz2
+87bc39528fd3a63a989ba853f681ef6a  xf86-input-palmax-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-palmax.spec	24 Dec 2005 03:45:24 -0000	1.5
+++ xorg-x11-drv-palmax.spec	2 Feb 2006 09:51:23 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-palmax
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 palmax input driver
 Name:      xorg-x11-drv-palmax
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 palmax input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/palmax_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/palmax.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-palmax to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-palmax to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-palmax 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
 - Initial spec file for palmax input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:52:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:52:04 -0500
Subject: rpms/xorg-x11-drv-penmount/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-penmount.spec, 1.5, 1.6
Message-ID: <200602020952.k129q4dl032441@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-penmount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32401/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-penmount.spec 
Log Message:
auto-import xorg-x11-drv-penmount-1.0.0.5-1 on branch devel from xorg-x11-drv-penmount-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:45:38 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:52:01 -0000	1.6
@@ -1 +1 @@
-xf86-input-penmount-1.0.0.4.tar.bz2
+xf86-input-penmount-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-penmount/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:45:38 -0000	1.5
+++ sources	2 Feb 2006 09:52:01 -0000	1.6
@@ -1 +1 @@
-63997f986dd3753a2b11827945edb878  xf86-input-penmount-1.0.0.4.tar.bz2
+d381dddde517ea47f9e313d004ffc3e5  xf86-input-penmount-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-penmount.spec	24 Dec 2005 03:45:38 -0000	1.5
+++ xorg-x11-drv-penmount.spec	2 Feb 2006 09:52:01 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-penmount
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
-Requires:  xorg-x11-server-Xorg
+Requires: xorg-x11-server-Xorg
+
 %description 
 X.Org X11 penmount input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,16 @@
 %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}/penmount_drv.so
 %dir %{_mandir}
 %dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_mandir}/man4/penmount.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-penmount to version 1.0.0.5 from X11R7.0
+- Removed 'x' suffix from manpage dirs to match RC4 upstream.
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-penmount to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +67,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-penmount 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
 - Initial spec file for penmount input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:52:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:52:35 -0500
Subject: rpms/xorg-x11-drv-spaceorb/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-spaceorb.spec, 1.5, 1.6
Message-ID: <200602020952.k129qZJd032744@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32698/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-spaceorb.spec 
Log Message:
auto-import xorg-x11-drv-spaceorb-1.0.0.5-1 on branch devel from xorg-x11-drv-spaceorb-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:47:57 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:52:32 -0000	1.6
@@ -1 +1 @@
-xf86-input-spaceorb-1.0.0.4.tar.bz2
+xf86-input-spaceorb-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:47:57 -0000	1.5
+++ sources	2 Feb 2006 09:52:32 -0000	1.6
@@ -1 +1 @@
-776768b584ce06503a983d28596e21a1  xf86-input-spaceorb-1.0.0.4.tar.bz2
+961ede9c4087a6d5666a89d5713623a3  xf86-input-spaceorb-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-spaceorb.spec	24 Dec 2005 03:47:57 -0000	1.5
+++ xorg-x11-drv-spaceorb.spec	2 Feb 2006 09:52:32 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-spaceorb
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 spaceorb input driver
 Name:      xorg-x11-drv-spaceorb
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 spaceorb input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/spaceorb_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-spaceorb to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-spaceorb to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-spaceorb 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
 - Initial spec file for spaceorb input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:53:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:53:06 -0500
Subject: rpms/xorg-x11-drv-summa/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-summa.spec, 1.5, 1.6
Message-ID: <200602020953.k129r6fT000586@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-summa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv543/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-summa.spec 
Log Message:
auto-import xorg-x11-drv-summa-1.0.0.5-1 on branch devel from xorg-x11-drv-summa-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:48:09 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:53:03 -0000	1.6
@@ -1 +1 @@
-xf86-input-summa-1.0.0.4.tar.bz2
+xf86-input-summa-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-summa/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:48:09 -0000	1.5
+++ sources	2 Feb 2006 09:53:03 -0000	1.6
@@ -1 +1 @@
-1297076d2e7ecc083273f1bef7cbf919  xf86-input-summa-1.0.0.4.tar.bz2
+e30250970921db16880b1af9e1381de5  xf86-input-summa-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-summa.spec	24 Dec 2005 03:48:09 -0000	1.5
+++ xorg-x11-drv-summa.spec	2 Feb 2006 09:53:03 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-summa
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 summa input driver
 Name:      xorg-x11-drv-summa
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 summa input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,20 +47,14 @@
 %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
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+%{driverdir}/summa_drv.so
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-summa to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-summa to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -91,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-summa 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
 - Initial spec file for summa input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:53:57 -0500
Subject: rpms/xorg-x11-drv-ur98/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-ur98.spec, 1.4, 1.5
Message-ID: <200602020953.k129rvDR001043@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ur98/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1007/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-ur98.spec 
Log Message:
auto-import xorg-x11-drv-ur98-1.0.0.5-1 on branch devel from xorg-x11-drv-ur98-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Dec 2005 03:49:12 -0000	1.4
+++ .cvsignore	2 Feb 2006 09:53:53 -0000	1.5
@@ -1 +1 @@
-xf86-input-ur98-1.0.0.4.tar.bz2
+xf86-input-ur98-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ur98/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Dec 2005 03:49:12 -0000	1.4
+++ sources	2 Feb 2006 09:53:53 -0000	1.5
@@ -1 +1 @@
-db2e8c4d40a93e6e2f7e09ec6b5cd228  xf86-input-ur98-1.0.0.4.tar.bz2
+7cdfe15fdd8e04e3d440b7fdd96bf811  xf86-input-ur98-1.0.0.5.tar.bz2


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-ur98.spec	24 Dec 2005 03:49:12 -0000	1.4
+++ xorg-x11-drv-ur98.spec	2 Feb 2006 09:53:53 -0000	1.5
@@ -1,39 +1,20 @@
 %define tarball xf86-input-ur98
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 ur98 input driver
 Name:      xorg-x11-drv-ur98
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
@@ -52,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,19 +47,14 @@
 %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
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{driverdir}/ur98_drv.so
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/ur98.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-ur98 to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-ur98 to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:54:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:54:54 -0500
Subject: rpms/xorg-x11-drv-void/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-void.spec, 1.5, 1.6
Message-ID: <200602020954.k129ss2B001552@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1513/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-void.spec 
Log Message:
auto-import xorg-x11-drv-void-1.0.0.5-1 on branch devel from xorg-x11-drv-void-1.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:50:32 -0000	1.5
+++ .cvsignore	2 Feb 2006 09:54:51 -0000	1.6
@@ -1 +1 @@
-xf86-input-void-1.0.0.4.tar.bz2
+xf86-input-void-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-void/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:50:32 -0000	1.5
+++ sources	2 Feb 2006 09:54:51 -0000	1.6
@@ -1 +1 @@
-840150b9a0bba4abfc837fded686cb13  xf86-input-void-1.0.0.4.tar.bz2
+bfa5e6c582638837efd6b4fc7d77d35b  xf86-input-void-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-void.spec	24 Dec 2005 03:50:32 -0000	1.5
+++ xorg-x11-drv-void.spec	2 Feb 2006 09:54:51 -0000	1.6
@@ -1,44 +1,26 @@
 %define tarball xf86-input-void
-# 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}/input
 
 %define cvsdate xxxxxxx
 
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
-Version: 1.0.0.4
+Version: 1.0.0.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
 
-# 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 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 void input driver.
 
@@ -51,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,19 +47,15 @@
 %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}/void_drv.so
 %dir %{_mandir}
 %dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_mandir}/man4/void.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-void to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-void to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -90,6 +66,7 @@
 * Fri Nov 4 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
 - Initial spec file for void input driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb  2 09:55:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 04:55:49 -0500
Subject: rpms/kde-i18n/devel kde-i18n.spec,1.52,1.53
Message-ID: <200602020955.k129tn2W002050@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kde-i18n.spec 
Log Message:
fix rpm file list



Index: kde-i18n.spec
===================================================================
RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kde-i18n.spec	2 Feb 2006 08:54:23 -0000	1.52
+++ kde-i18n.spec	2 Feb 2006 09:55:46 -0000	1.53
@@ -1011,6 +1011,11 @@
 %defattr(-,root,root)
 %lang(pl) %{_datadir}/locale/pl/*
 %lang(pl) %doc %{_docdir}/HTML/pl
+%lang(pl) %{_datadir}/apps/katepart/syntax/logohighlightstyle.pl.xml
+%lang(pl) %{_datadir}/apps/khangman/data/pl
+%lang(pl) %{_datadir}/apps/khangman/pl.txt
+%lang(pl) %{_datadir}/apps/kturtle/data/logokeywords.pl.xml
+%lang(pl) %{_datadir}/apps/kturtle/examples/pl
 
 %files Portuguese
 %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Feb  2 10:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 05:13:31 -0500
Subject: rpms/kexec-tools/devel kexec-tools-1.101-kdump.patch, 1.2,
	1.3 kexec-tools.spec, 1.6, 1.7
Message-ID: <200602021013.k12ADVgD007485@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7251

Modified Files:
	kexec-tools-1.101-kdump.patch kexec-tools.spec 
Log Message:
- New kdump patch to support s390 arch + various fixes
- Include kdump in x86_64 builds


kexec-tools-1.101-kdump.patch:
 configure                                |   14 
 configure.ac                             |   14 
 kexec/Makefile                           |    1 
 kexec/arch/i386/Makefile                 |    1 
 kexec/arch/i386/crashdump-x86.c          |  724 +++++++++++++++++++++++++++++
 kexec/arch/i386/crashdump-x86.h          |   21 
 kexec/arch/i386/include/arch/options.h   |    6 
 kexec/arch/i386/kexec-bzImage.c          |    2 
 kexec/arch/i386/kexec-elf-x86.c          |   48 +
 kexec/arch/i386/kexec-multiboot-x86.c    |    3 
 kexec/arch/i386/kexec-x86.c              |   52 +-
 kexec/arch/i386/kexec-x86.h              |   13 
 kexec/arch/i386/x86-linux-setup.c        |    7 
 kexec/arch/i386/x86-linux-setup.h        |    3 
 kexec/arch/ia64/kexec-ia64.c             |   12 
 kexec/arch/ppc/kexec-ppc.c               |    8 
 kexec/arch/ppc64/Makefile                |    6 
 kexec/arch/ppc64/crashdump-ppc64.c       |  511 ++++++++++++++++++++
 kexec/arch/ppc64/crashdump-ppc64.h       |   33 +
 kexec/arch/ppc64/fs2dt.c                 |  435 +++++++++++++++++
 kexec/arch/ppc64/include/arch/options.h  |    2 
 kexec/arch/ppc64/kexec-elf-ppc64.c       |  290 ++++++++++-
 kexec/arch/ppc64/kexec-elf-rel-ppc64.c   |   43 +
 kexec/arch/ppc64/kexec-ppc64.c           |  640 +++++++++++++++++++++++++
 kexec/arch/ppc64/kexec-ppc64.h           |   37 +
 kexec/arch/ppc64/kexec-zImage-ppc64.c    |    3 
 kexec/arch/s390/Makefile                 |    6 
 kexec/arch/s390/include/arch/options.h   |   11 
 kexec/arch/s390/kexec-elf-rel-s390.c     |   23 
 kexec/arch/s390/kexec-image.c            |  137 +++++
 kexec/arch/s390/kexec-s390.c             |  104 ++++
 kexec/arch/s390/kexec-s390.h             |   25 +
 kexec/arch/x86_64/Makefile               |    1 
 kexec/arch/x86_64/crashdump-x86_64.c     |  770 +++++++++++++++++++++++++++++++
 kexec/arch/x86_64/crashdump-x86_64.h     |   24 
 kexec/arch/x86_64/include/arch/options.h |    6 
 kexec/arch/x86_64/kexec-elf-x86_64.c     |   37 +
 kexec/arch/x86_64/kexec-x86_64.c         |   45 +
 kexec/crashdump.c                        |   65 ++
 kexec/crashdump.h                        |    9 
 kexec/kexec-elf-rel.c                    |   39 +
 kexec/kexec-elf.c                        |   88 +--
 kexec/kexec-syscall.h                    |    9 
 kexec/kexec.c                            |   24 
 kexec/kexec.h                            |   10 
 purgatory/Makefile                       |    9 
 purgatory/arch/i386/Makefile             |    1 
 purgatory/arch/i386/crashdump_backup.c   |   46 +
 purgatory/arch/i386/purgatory-x86.c      |    7 
 purgatory/arch/i386/purgatory-x86.h      |    1 
 purgatory/arch/ia64/purgatory-ia64.c     |    6 
 purgatory/arch/ppc/purgatory-ppc.c       |    6 
 purgatory/arch/ppc64/Makefile            |    7 
 purgatory/arch/ppc64/console-ppc64.c     |   27 +
 purgatory/arch/ppc64/crashdump_backup.c  |   41 +
 purgatory/arch/ppc64/purgatory-ppc64.c   |   41 +
 purgatory/arch/ppc64/purgatory-ppc64.h   |    6 
 purgatory/arch/ppc64/v2wrap.S            |  128 +++++
 purgatory/arch/s390/Makefile             |    7 
 purgatory/arch/s390/include/limits.h     |   54 ++
 purgatory/arch/s390/include/stdint.h     |   24 
 purgatory/arch/x86_64/Makefile           |    1 
 purgatory/arch/x86_64/purgatory-x86_64.c |    7 
 purgatory/include/purgatory.h            |    1 
 purgatory/purgatory.c                    |    1 
 65 files changed, 4609 insertions(+), 174 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 kexec-tools-1.101-kdump.patch
Index: kexec-tools-1.101-kdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-kdump.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kexec-tools-1.101-kdump.patch	30 Jan 2006 20:02:21 -0000	1.2
+++ kexec-tools-1.101-kdump.patch	2 Feb 2006 10:13:27 -0000	1.3
@@ -1,6 +1,6 @@
 diff -urNp -X dontdiff kexec-tools-1.101/configure kexec-tools-1.101-kdump/configure
 --- kexec-tools-1.101/configure	2005-02-16 18:07:44.000000000 +0530
-+++ kexec-tools-1.101-kdump/configure	2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/configure	2006-02-01 14:28:15.497259392 +0530
 @@ -1384,12 +1384,18 @@ case $host_cpu in
  	powerpc )
  		host_cpu="ppc"
@@ -21,20 +21,65 @@
  		;;
  	* )
  		{ { echo "$as_me:$LINENO: error:  unsupported architecture $host_cpu" >&5
-@@ -1421,6 +1427,10 @@ if test "${with_gamecube+set}" = set; th
-    EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1"
- fi;
+@@ -1406,6 +1412,11 @@ if test "${host_alias}" ; then
+ fi
+ EXTRA_CFLAGS=""
  
 +# Check whether ppc64. Add -m64 for building 64-bit binary
 +if test "$ARCH" = ppc64; then
 +  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
 +fi;
++
+ # Check whether --with-objdir or --without-objdir was given.
+ if test "${with_objdir+set}" = set; then
+   withval="$with_objdir"
+@@ -1421,7 +1432,6 @@ if test "${with_gamecube+set}" = set; th
+    EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1"
+ fi;
  
+-
  # Check whether --with-zlib or --without-zlib was given.
  if test "${with_zlib+set}" = set; then
+   withval="$with_zlib"
+diff -urNp -X dontdiff kexec-tools-1.101/configure.ac kexec-tools-1.101-kdump/configure.ac
+--- kexec-tools-1.101/configure.ac	2005-01-09 07:06:57.000000000 +0530
++++ kexec-tools-1.101-kdump/configure.ac	2006-02-01 14:28:15.498259240 +0530
+@@ -25,12 +25,18 @@ case $host_cpu in 
+ 	powerpc )
+ 		host_cpu="ppc"
+ 		;;
++	powerpc64 )
++		host_cpu="ppc64"
++		;;
++	s390x )
++		host_cpu="s390"
++		;;
+ 	* ) 
+ 		host_cpu="$host_cpu"
+ 		;;
+ esac
+ case $host_cpu in
+-	i386|ppc|x86_64|alpha|ppc64|ia64)
++	i386|ppc|x86_64|alpha|ppc64|ia64|s390)
+ 		;;
+ 	* )
+ 		AC_MSG_ERROR([ unsupported architecture $host_cpu])
+@@ -45,6 +51,12 @@ if test "${host_alias}" ; then
+ 	OBJDIR="$OBJDIR-${host_alias}"
+ fi 
+ EXTRA_CFLAGS=""
++
++# Check whether ppc64. Add -m64 for building 64-bit binary
++if test "$ARCH" = ppc64; then
++  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
++fi;
++
+ AC_ARG_WITH([objdir], AC_HELP_STRING([--with-objdir=<dir>],[select directory for object files]),
+ 	[ OBJDIR="$withval" ], [ OBJDIR="$OBJDIR" ])
+ 
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c
 --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c	2005-12-15 16:51:43.720392560 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c	2006-01-19 18:19:07.000000000 +0530
 @@ -0,0 +1,724 @@
 +/*
 + * kexec: Linux boots Linux
@@ -762,7 +807,7 @@
 +}
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.h kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h
 --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.h	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h	2005-12-14 15:57:17.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.h	2006-01-19 11:41:30.000000000 +0530
 @@ -0,0 +1,21 @@
 +#ifndef CRASHDUMP_X86_H
 +#define CRASHDUMP_X86_H
@@ -787,7 +832,7 @@
 +#endif /* CRASHDUMP_X86_H */
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/include/arch/options.h kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h
 --- kexec-tools-1.101/kexec/arch/i386/include/arch/options.h	2004-12-22 02:23:37.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h	2005-12-14 16:00:38.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/include/arch/options.h	2006-01-19 11:41:36.000000000 +0530
 @@ -6,7 +6,9 @@
  #define OPT_SERIAL_BAUD    (OPT_MAX+2)
  #define OPT_CONSOLE_VGA    (OPT_MAX+3)
@@ -810,7 +855,7 @@
  
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c
 --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c	2005-01-13 19:02:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-bzImage.c	2006-01-19 11:41:27.000000000 +0530
 @@ -214,7 +214,7 @@ int do_bzImage_load(struct kexec_info *i
  
  	/* Fill in the information BIOS calls would normally provide. */
@@ -822,7 +867,7 @@
  	return 0;
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c
 --- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c	2005-01-13 19:29:19.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c	2005-12-14 15:57:18.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-elf-x86.c	2006-01-19 11:41:32.000000000 +0530
 @@ -32,10 +32,12 @@
  #include <elf.h>
  #include <x86/x86-linux.h>
@@ -931,7 +976,7 @@
  		elf_rel_get_symbol(&info->rhdr, "entry32_regs", &regs, sizeof(regs));
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c
 --- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c	2005-01-25 01:28:04.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-multiboot-x86.c	2006-01-19 11:41:27.000000000 +0530
 @@ -246,7 +246,8 @@ int multiboot_x86_load(int argc, char **
  	mbi->boot_loader_name = sizeof(*mbi) + command_line_len; 
  
@@ -944,7 +989,7 @@
  	}
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c
 --- kexec-tools-1.101/kexec/arch/i386/kexec-x86.c	2005-02-06 04:54:35.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c	2005-12-15 11:55:22.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.c	2006-01-19 18:19:07.000000000 +0530
 @@ -30,14 +30,14 @@
  #include "../../kexec-elf.h"
  #include "../../kexec-syscall.h"
@@ -1069,7 +1114,7 @@
  }
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/kexec-x86.h kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h
 --- kexec-tools-1.101/kexec/arch/i386/kexec-x86.h	2005-02-06 04:41:32.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h	2005-12-14 15:57:16.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/kexec-x86.h	2006-01-19 11:41:29.000000000 +0530
 @@ -1,6 +1,10 @@
  #ifndef KEXEC_X86_H
  #define KEXEC_X86_H
@@ -1099,7 +1144,7 @@
  	struct kexec_info *info);
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/Makefile kexec-tools-1.101-kdump/kexec/arch/i386/Makefile
 --- kexec-tools-1.101/kexec/arch/i386/Makefile	2005-02-06 04:53:58.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/Makefile	2005-12-14 15:57:16.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/Makefile	2006-01-19 11:41:29.000000000 +0530
 @@ -9,3 +9,4 @@ KEXEC_C_SRCS+= kexec/arch/i386/kexec-mul
  KEXEC_C_SRCS+= kexec/arch/i386/kexec-beoboot-x86.c
  KEXEC_C_SRCS+= kexec/arch/i386/kexec-nbi.c
@@ -1107,7 +1152,7 @@
 +KEXEC_C_SRCS+= kexec/arch/i386/crashdump-x86.c
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c
 --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c	2005-01-13 18:40:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c	2006-02-01 14:41:09.489594672 +0530
 @@ -94,7 +94,8 @@ void setup_linux_bootloader_parameters(
  	cmdline_ptr[cmdline_len - 1] = '\0';
  }
@@ -1127,9 +1172,18 @@
  		die("Cannot get memory information\n");
  	}
  	if (ranges > E820MAX) {
+@@ -164,7 +165,7 @@ void setup_linux_system_parameters(struc
+ 		if (range[i].type != RANGE_RAM)
+ 			continue;
+ 		if ((range[i].start <= 0x100000) && range[i].end > 0x100000) {
+-			unsigned long long mem_k = (range[i].end >> 10) - 0x100000;
++			unsigned long long mem_k = (range[i].end >> 10) - 0x400;
+ 			real_mode->ext_mem_k = mem_k;
+ 			real_mode->alt_mem_k = mem_k;
+ 			if (mem_k > 0xfc00) {
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.h kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h
 --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.h	2004-12-20 17:50:22.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.h	2006-01-19 11:41:27.000000000 +0530
 @@ -7,7 +7,8 @@ void setup_linux_bootloader_parameters(
  	unsigned long real_mode_base, unsigned long cmdline_offset,
  	const char *cmdline, off_t cmdline_len,
@@ -1142,7 +1196,7 @@
  #define SETUP_BASE    0x90000
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c
 --- kexec-tools-1.101/kexec/arch/ia64/kexec-ia64.c	2005-01-11 11:58:36.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c	2005-12-15 11:55:22.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/ia64/kexec-ia64.c	2006-01-19 18:19:07.000000000 +0530
 @@ -34,11 +34,11 @@
  #include <arch/options.h>
  
@@ -1195,7 +1249,7 @@
  		fprintf(stderr, "Unsupported machine type: %s\n",
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c kexec-tools-1.101-kdump/kexec/arch/ppc/kexec-ppc.c
 --- kexec-tools-1.101/kexec/arch/ppc/kexec-ppc.c	2005-01-11 11:58:03.000000000 +0530
[...2725 lines suppressed...]
 +	isync
-+	mr	5,3		# save cpu id to r5
-+	addi	3,4,0x100	# r3 = boot param block
-+	lwz	6,20(3)		# fetch version number
-+	cmpwi	0,6,2		# v2 ?
-+	blt	80f
-+	stw	5,28(3)		# save my cpu number as boot_cpu_phys
-+80:	b	81f
-+
-+	.org 0x60		# ABI: slaves start at 60 with r3=phys
-+slave:	ld	4,secondary_hold at l(0);
-+	cmpdi	0,4,0
-+	beq	slave
-+
-+	# ahh, master told us where he is running from
-+	# jump into our copy of the code up there so this code can change
-+	addi	5,4,1f-start
-+	mtctr	5
-+	bctr
++	mr      17,3            # save cpu id to r17
++	mr      15,4            # save physical address in reg15
 +
-+	# ok, now wait for the master to tell is to go back to the new block
-+1:	ld	5,copied at l(4)
-+	cmpdi	0,5,0
-+	beq	1b
-+	ba	0x60
++	LOADADDR(6,my_toc)
++	ld      2,0(6)          #setup toc
 +
++	LOADADDR(6,stack)
++	ld      1,0(6)          #setup stack
 +
++	subi    1,1,112
++	bl      .purgatory
++	nop
++
++	b       81f
++	.org purgatory_start + 0x60     # ABI: slaves start at 60 with r3=phys
++slave:
++	# load slave spin code address and branch into that
++	LOADADDR(6,slave_spin)
++	ld      4,0(6)
++	mtctr 4
++	bctr
 +
-+	.long	0		# just an eye-catcher, delete if space needed
-+	.long	0		# just an eye-catcher, delete if space needed
++spin: .long 1
++slave_spin_code:
++	lis     5,spin at ha
++	lwz     5,spin at l(5)
++	cmpwi   0,5,0
++	bne     slave_spin_code
++	ba 0x60
 +
 +81:				# master continues here
 +	or	3,3,3		# ok back to high, lets boot
@@ -4297,7 +5789,17 @@
 +	mtctr	6		# delay a bit for slaves to catch up
 +83:	bdnz	83b		# before we overwrite 0-100 again
 +
-+	ld	4,-8(3)		# kernel pointer is at -8(bb) by loader
++	LOADADDR(16, dt_offset)
++	ld      3,0(16)         # load device-tree address
++	mr      16,3            # save dt address in reg16
++	lwz     6,20(3)         # fetch version number
++	cmpwi   0,6,2           # v2 ?
++	blt     80f
++	stw     17,28(3)        # save my cpu number as boot_cpu_phys
++80:
++	LOADADDR(6,kernel)
++	ld      4,0(6)          # load the kernel address
++
 +	addi	5,4,-8		# prepare copy with update form instructions
 +	li	6,0x100/8
 +	mtctr	6
@@ -4315,18 +5817,18 @@
 +	icbi	0,6
 +	sync
 +	isync
-+	std	6,-16(3)	# send slaves back down
++	lis     6,spin at ha
++	li      0,0
++	stw     0,spin at l(6)
++	mr      3,16            # restore dt address
++
 +	bctr			# start kernel
 +
-+	.org 0xf0
-+copied:	.llong 0
-+kernel:	.llong 0
-+	.org 0x100
-+__end_stub:
-+	.equ	boot_block,	. - start
++slave_spin: .llong  slave_spin_code
++
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/limits.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h
 --- kexec-tools-1.101/purgatory/arch/s390/include/limits.h	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h	2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h	2006-01-19 11:41:37.000000000 +0530
 @@ -0,0 +1,54 @@
 +#ifndef _LIMITS_H_
 +#define _LIMITS_H_
@@ -4384,7 +5886,7 @@
 +#endif	/* !_LIMITS_H_ */
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/stdint.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h
 --- kexec-tools-1.101/purgatory/arch/s390/include/stdint.h	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h	2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h	2006-01-19 11:41:37.000000000 +0530
 @@ -0,0 +1,24 @@
 +#ifndef _STDINT_H
 +#define _STDINT_H
@@ -4412,7 +5914,7 @@
 +#endif
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/Makefile kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile
 --- kexec-tools-1.101/purgatory/arch/s390/Makefile	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile	2005-12-14 16:00:40.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile	2006-01-19 11:41:37.000000000 +0530
 @@ -0,0 +1,7 @@
 +#
 +# Purgatory s390
@@ -4423,7 +5925,7 @@
 +
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/Makefile kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile
 --- kexec-tools-1.101/purgatory/arch/x86_64/Makefile	2004-12-21 12:43:53.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile	2005-12-14 16:00:56.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile	2006-01-19 11:41:41.000000000 +0530
 @@ -9,6 +9,7 @@ PURGATORY_S_SRCS+= purgatory/arch/x86_64
  PURGATORY_S_SRCS+= purgatory/arch/x86_64/setup-x86_64.S
  PURGATORY_S_SRCS+= purgatory/arch/x86_64/stack.S
@@ -4434,7 +5936,7 @@
  PURGATORY_C_SRCS+= purgatory/arch/i386/pic.c
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c
 --- kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c	2004-12-21 22:07:41.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c	2005-12-14 16:00:56.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c	2006-01-19 11:41:41.000000000 +0530
 @@ -4,9 +4,16 @@
  
  uint8_t reset_vga = 0;
@@ -4454,7 +5956,7 @@
 +}
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/include/purgatory.h kexec-tools-1.101-kdump/purgatory/include/purgatory.h
 --- kexec-tools-1.101/purgatory/include/purgatory.h	2004-12-18 18:42:15.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h	2006-01-19 11:41:27.000000000 +0530
 @@ -4,5 +4,6 @@
  void putchar(int ch);
  void printf(const char *fmt, ...);
@@ -4464,7 +5966,7 @@
  #endif /* PURGATORY_H */
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/Makefile kexec-tools-1.101-kdump/purgatory/Makefile
 --- kexec-tools-1.101/purgatory/Makefile	2005-01-09 04:06:32.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/Makefile	2005-12-14 15:57:19.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/Makefile	2006-01-19 18:20:08.000000000 +0530
 @@ -6,6 +6,11 @@
  # There is probably a cleaner way to do this but for now this
  # should keep us from accidentially include unsafe library functions
@@ -4477,34 +5979,23 @@
  PCFLAGS:=-Wall -Os  \
  	-I$(shell $(CC) -print-file-name=include) \
  	-Ipurgatory/include -Ipurgatory/arch/$(ARCH)/include \
-@@ -17,9 +22,11 @@ PCFLAGS += $(call cc-option, -fnostdinc)
+@@ -16,11 +21,11 @@ PCFLAGS += $(call cc-option, -fnobuiltin
+ PCFLAGS += $(call cc-option, -fnostdinc)
  PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss)
  
- PURGATORY_C_SRCS:= 
-+ifneq ($(ARCH),ppc64)
+-PURGATORY_C_SRCS:= 
++PURGATORY_C_SRCS:=
  PURGATORY_C_SRCS += purgatory/purgatory.c
  PURGATORY_C_SRCS += purgatory/printf.c
  PURGATORY_C_SRCS += purgatory/string.c
-+endif
- PURGATORY_S_OBJS:= 
+-PURGATORY_S_OBJS:= 
++PURGATORY_S_OBJS:=
  
  include purgatory/arch/$(ARCH)/Makefile
-@@ -54,7 +61,12 @@ $(PURGATORY_S_OBJS): $(OBJDIR)/%.o: %.S 
- 
- $(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB)
- 	$(MKDIR) -p $(@D)
-+ifneq ($(ARCH),ppc64)
- 	$(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
-+else
-+	$(LD) -Ttext=0 -e 0 -o $(OBJDIR)/purgatory/v2wrap.elf $(PURGATORY_OBJS)
-+	objcopy -O binary $(OBJDIR)/purgatory/v2wrap.elf $@
-+endif
  
- echo::
- 	@echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)"
 diff -urNp -X dontdiff kexec-tools-1.101/purgatory/purgatory.c kexec-tools-1.101-kdump/purgatory/purgatory.c
 --- kexec-tools-1.101/purgatory/purgatory.c	2004-12-22 00:21:03.000000000 +0530
-+++ kexec-tools-1.101-kdump/purgatory/purgatory.c	2005-12-14 15:57:15.000000000 +0530
++++ kexec-tools-1.101-kdump/purgatory/purgatory.c	2006-01-19 11:41:27.000000000 +0530
 @@ -44,4 +44,5 @@ void purgatory(void)
  	printf("I'm in purgatory\n");
  	setup_arch();


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kexec-tools.spec	30 Jan 2006 20:02:36 -0000	1.6
+++ kexec-tools.spec	2 Feb 2006 10:13:27 -0000	1.7
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -10,13 +10,6 @@
 Source2: kdump.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-%define kdump 0
-
-%ifarch %{ix86}
-%define kdump 1
-%endif
-
-
 #
 # Patches 0 through 100 are meant for x86 kexec-tools enablement
 #
@@ -48,10 +41,8 @@
 %patch1 -p1
 %patch101 -p1
 
-%if %{kdump}
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
-%endif
 
 %build
 %configure
@@ -63,18 +54,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
-%if %{kdump}
 install -m 644 kdump.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kdump
 install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%if %{kdump}
 chkconfig --add kdump
-%endif
 
 %postun
 
@@ -92,11 +79,9 @@
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/kexec
-%if %{kdump}
 %{_sbindir}/kdump
 %config(noreplace,missingok) /etc/sysconfig/kdump
 %config /etc/rc.d/init.d/kdump
-%endif
 
 %{_libdir}/kexec-tools/kexec_test
 %doc News
@@ -104,6 +89,9 @@
 %doc TODO
 
 %changelog
+* Wed Feb 01 2006 Thomas Graf <tgraf at redhat.com>
+- New kdump patch to support s390 arch + various fixes
+- Include kdump in x86_64 builds
 * Mon Jan 30 2006 Thomas Graf <tgraf at redhat.com>
 - New kdump patch to support x86_64 userspace
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 10:32:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 05:32:09 -0500
Subject: rpms/kdenetwork/FC-4 .cvsignore, 1.31, 1.32 kdenetwork.spec, 1.56,
	1.57 sources, 1.35, 1.36 admin-visibility.patch, 1.3,
	NONE kdenetwork-3.3.0-ksirc.patch, 1.1,
	NONE kdenetwork-3.4.0-xmms.patch, 1.1,
	NONE post-3.4.1-kdenetwork-libgadu.patch, 1.1, NONE
Message-ID: <200602021032.k12AW90B027580@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	admin-visibility.patch kdenetwork-3.3.0-ksirc.patch 
	kdenetwork-3.4.0-xmms.patch 
	post-3.4.1-kdenetwork-libgadu.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	14 Jun 2005 14:54:48 -0000	1.31
+++ .cvsignore	2 Feb 2006 10:31:57 -0000	1.32
@@ -4,3 +4,4 @@
 kdenetwork-3.4.0-rc1.tar.bz2
 kdenetwork-3.4.0.tar.bz2
 kdenetwork-3.4.1.tar.bz2
+kdenetwork-3.5.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/kdenetwork.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdenetwork.spec	21 Jul 2005 21:03:16 -0000	1.56
+++ kdenetwork.spec	2 Feb 2006 10:31:57 -0000	1.57
@@ -7,15 +7,17 @@
 
 %define qt_version 1:3.3.4
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Name: kdenetwork
-Version: 3.4.1
-Release: 0.fc4.2
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License: GPL
-
+Url: http://www.kde.org
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kppp.pamd
 Source2: ktalk
@@ -27,14 +29,8 @@
 Patch2: kde-libtool.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
-Patch5: kdenetwork-3.3.0-ksirc.patch
-Patch6: admin-visibility.patch
-Patch7: kdenetwork-3.4.0-xmms.patch
 Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-# CVE CAN-2005-1852, libgadu vulnerabilities
-Patch100: post-3.4.1-kdenetwork-libgadu.patch
-
 Requires: kdelibs >= 6:%{version}
 Requires: kdebase >= 6:%{version}
 Prereq: /sbin/chkconfig
@@ -85,16 +81,14 @@
 %patch2 -p1 -b .libtool
 %patch3 -p1 -b .kppp
 %patch4 -p1 -b .ppp
-%patch5 -p1 -b .ksirc
-%patch6 -p1 -b .gcc
-%if !%{xmms}
-%patch7 -p1 -b .xmms
-%endif
 %patch8 -p1 -b .libgadu-va_copy
-%patch100 -p0 -b .CAN-2005-1852
 
 find -name CVS | xargs rm -rf 
 
+%if !%{xmms}
+  echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
+%endif
+
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -109,10 +103,19 @@
 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
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -231,6 +234,18 @@
 %endif
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
+- 3.5.1
+
+* Tue Dec 13 2005 Than Ngo <than at redhat.com> 7:3.5.0-0.1.fc4
+- 3.5
+
+* Thu Nov 10 2005 Than Ngo <than at redhat.com> 7:3.4.2-0.fc4.2
+- rebuild against new wireless-tools #171497
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 7:3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jul 21 2005 Than Ngo <than at redhat.com> 7:3.4.1-0.fc4.2
 - fix crash in kopete
 - apply patch to fix libgadu vulnerabilities #163811, CVE CAN-2005-1852


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/FC-4/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	14 Jun 2005 14:54:48 -0000	1.35
+++ sources	2 Feb 2006 10:31:57 -0000	1.36
@@ -1 +1 @@
-cfdec84537bd20f032b9b27c74bc28ba  kdenetwork-3.4.1.tar.bz2
+02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdenetwork-3.3.0-ksirc.patch DELETED ---


--- kdenetwork-3.4.0-xmms.patch DELETED ---


--- post-3.4.1-kdenetwork-libgadu.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 10:38:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 05:38:58 -0500
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.7,1.8
Message-ID: <200602021038.k12Acwgo029646@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29555

Modified Files:
	kexec-tools.spec 
Log Message:
- Add patch to enable the kdump binary for x86_64



Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kexec-tools.spec	2 Feb 2006 10:13:27 -0000	1.7
+++ kexec-tools.spec	2 Feb 2006 10:38:55 -0000	1.8
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 7
+Release: 7.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -28,6 +28,8 @@
 # Patches 301 through 400 are meant for ppc64 kexec-tools enablement
 #
 
+Patch501: kexec-tools-1.101-Makefile.patch
+
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
 kernel to boot using the kernel's kexec feature either on a
@@ -40,6 +42,7 @@
 rm -f ../kexec-tools-1.101.spec
 %patch1 -p1
 %patch101 -p1
+%patch501 -p1
 
 cp $RPM_SOURCE_DIR/kdump.init .
 cp $RPM_SOURCE_DIR/kdump.sysconfig .
@@ -89,6 +92,8 @@
 %doc TODO
 
 %changelog
+* Thu Feb 02 2006 Thomas Graf <tgraf at redhat.com> - 1.101-7.1
+- Add patch to enable the kdump binary for x86_64
 * Wed Feb 01 2006 Thomas Graf <tgraf at redhat.com>
 - New kdump patch to support s390 arch + various fixes
 - Include kdump in x86_64 builds



From fedora-cvs-commits at redhat.com  Thu Feb  2 10:39:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 05:39:58 -0500
Subject: rpms/kexec-tools/devel kexec-tools-1.101-Makefile.patch,NONE,1.1
Message-ID: <200602021039.k12AdwDX030200@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30105

Added Files:
	kexec-tools-1.101-Makefile.patch 
Log Message:
Makefile patch to enable kdump binary


kexec-tools-1.101-Makefile.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kexec-tools-1.101-Makefile.patch ---
--- kexec-tools-1.101/Makefile~orig	2006-02-02 11:34:50.000000000 +0100
+++ kexec-tools-1.101/Makefile	2006-02-02 11:35:00.000000000 +0100
@@ -44,7 +44,7 @@
 
 MAN_PAGES:= kexec/kexec.8
 BINARIES_i386:=  $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
-BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test
+BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test $(SBINDIR)/kdump
 BINARIES:=$(SBINDIR)/kexec $(BINARIES_$(ARCH)) 
 
 TARGETS:=$(BINARIES) $(MAN_PAGES)



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:10:15 -0500
Subject: rpms/kdeartwork/FC-4 .cvsignore, 1.24, 1.25 kdeartwork.spec, 1.35,
	1.36 sources, 1.25, 1.26 admin-visibility.patch, 1.3,
	NONE kdeartwork-3.4.1-xscreensaver.patch, 1.1, NONE
Message-ID: <200602021110.k12BAFFr009854@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Removed Files:
	admin-visibility.patch kdeartwork-3.4.1-xscreensaver.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	16 Jun 2005 19:44:05 -0000	1.24
+++ .cvsignore	2 Feb 2006 11:10:13 -0000	1.25
@@ -4,3 +4,4 @@
 kdeartwork-3.4.0-rc1.tar.bz2
 kdeartwork-3.4.0.tar.bz2
 kdeartwork-3.4.1.tar.bz2
+kdeartwork-3.5.1.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/kdeartwork.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kdeartwork.spec	30 Jun 2005 10:17:40 -0000	1.35
+++ kdeartwork.spec	2 Feb 2006 11:10:13 -0000	1.36
@@ -4,12 +4,14 @@
 %define make_cvs 1
 
 %define qt_version 3.3.4
-%define arts_version 1.4.1
+%define arts_version 1.5.1
 %define arts 1
 
+%define disable_gcc_check_and_hidden_visibility 1
+
 Name: kdeartwork
-Version: 3.4.1
-Release: 0.fc4.2
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -18,8 +20,6 @@
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
-Patch1: admin-visibility.patch
-Patch2: kdeartwork-3.4.1-xscreensaver.patch
 
 BuildRequires: perl
 BuildRequires: kdebase-devel
@@ -55,8 +55,6 @@
 %prep
 %setup -q
 %patch -p1 -b .libtool
-%patch1 -p1 -b .gcc
-%patch2 -p1 -b .xscreensaver
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -70,10 +68,19 @@
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --enable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -96,12 +103,30 @@
       $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}/icons/locolor/*/apps/kbabel.png \
+      $RPM_BUILD_ROOT%{_datadir}/wallpapers/gear-flowers* \
+      $RPM_BUILD_ROOT%{_datadir}/wallpapers/fulmine.jpg*
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%post icons
+for i in locolor ikons kdeclassic kids slick ; do
+  touch --no-create %{_datadir}/icons/$i || :
+  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+  fi
+done
+
+%postun icons
+for i in locolor ikons kdeclassic kids slick ; do
+  touch --no-create %{_datadir}/icons/$i || :
+  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+  fi
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -128,6 +153,15 @@
 %{_datadir}/icons/*
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
+- 3.5.1
+
+* Tue Dec 13 2005 Than Ngo <than at redhat.com> 3.5.0-0.1.fc4
+- 3.5.0
+
+* Fri Jul 29 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 30 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.2
 - configure script does not look the right xscreensaver dirs
   apply patch to fix this problem, #161312, thanks to Rex Dieter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	16 Jun 2005 19:44:05 -0000	1.25
+++ sources	2 Feb 2006 11:10:13 -0000	1.26
@@ -1 +1 @@
-0f58245c2fa3c58dbe139da43037a203  kdeartwork-3.4.1.tar.bz2
+8053bb1a1b2a5844b29f5f96328b1d96  kdeartwork-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdeartwork-3.4.1-xscreensaver.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:23:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:23:10 -0500
Subject: rpms/ksh/devel ksh.spec,1.14,1.15
Message-ID: <200602021123.k12BNALR022365@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	ksh.spec 
Log Message:
 - fix uname -i output
 - fix loop (*-path.patch)
 - conflict pdksh instead of obsoleting it



Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ksh.spec	16 Dec 2005 23:20:54 -0000	1.14
+++ ksh.spec	2 Feb 2006 11:23:08 -0000	1.15
@@ -1,5 +1,5 @@
 %define       releasedate   2005-02-02
-ExcludeArch:  ia64
+#ExcludeArch:  ia64
 
 Name:         ksh
 Summary:      The Original ATT Korn Shell
@@ -7,19 +7,20 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20050202
-Release: 3.1
+Release:      2
 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
 Patch0:       ksh-2004-02-29-ppc64.patch
 Patch1:       ksh-20041225-gcc4.patch
+Patch2:       ksh-20050202-path.patch
+Patch3:       ksh-20050202-uname.patch
 
 #   build information
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 Provides:     ksh93
 Obsoletes:    ksh93
-Provides:     pdksh
-Obsoletes:    pdksh
+Conflicts:    pdksh
 
 %description
 KSH-93 is the most recent version of the KornShell by David Korn of 
@@ -33,9 +34,12 @@
 %setup -q -T -D -a 2
 #%patch0 -p1 -b .ppc64
 %patch1 -p1 -b .gcc4
+%patch2 -p1 -b .path
+%patch3 -p1 -b .uname
 
 %build
 ./bin/package "read" ||:
+#export CCFLAGS="-O0 -ggdb"
 ./bin/package "make"
 cp lib/package/LICENSES/ast LICENSE
 
@@ -88,6 +92,11 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Feb 02 2006 Karsten Hopp <karsten at redhat.de> 20050202-2
+- fix uname -i output
+- fix loop (*-path.patch)
+- conflict pdksh instead of obsoleting it
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:25:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:25:04 -0500
Subject: rpms/ksh/devel ksh.spec,1.15,1.16
Message-ID: <200602021125.k12BP4Rr030761@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	ksh.spec 
Log Message:
fix changelog and release


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ksh.spec	2 Feb 2006 11:23:08 -0000	1.15
+++ ksh.spec	2 Feb 2006 11:25:01 -0000	1.16
@@ -7,7 +7,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20050202
-Release:      2
+Release:      4
 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
@@ -92,12 +92,12 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Feb 02 2006 Karsten Hopp <karsten at redhat.de> 20050202-2
+* Thu Feb 02 2006 Karsten Hopp <karsten at redhat.de> 20050202-4
 - fix uname -i output
 - fix loop (*-path.patch)
 - conflict pdksh instead of obsoleting it
 
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
+* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com> 20050202-3.1
 - rebuilt for new gcj
 
 * Tue May 10 2005 Karsten Hopp <karsten at redhat.de> 20050202-3



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:27:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:27:31 -0500
Subject: rpms/ksh/devel ksh-20050202-path.patch, NONE,
	1.1 ksh-20050202-uname.patch, NONE, 1.1
Message-ID: <200602021127.k12BRVVB031948@cvs.devel.redhat.com>

Author: karsten

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

Added Files:
	ksh-20050202-path.patch ksh-20050202-uname.patch 
Log Message:
commit patches

ksh-20050202-path.patch:
 path.c |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

--- NEW FILE ksh-20050202-path.patch ---
diff -urN ksh-20050202/src/cmd/ksh93/sh/path.c ksh-20060124/src/cmd/ksh93/sh/path.c
--- ksh-20050202/src/cmd/ksh93/sh/path.c	2005-01-18 01:42:00.000000000 +0100
+++ ksh-20060124/src/cmd/ksh93/sh/path.c	2005-10-17 17:31:52.000000000 +0200
@@ -1,7 +1,7 @@
 /***********************************************************************
 *                                                                      *
 *               This software is part of the ast package               *
-*                  Copyright (c) 1982-2005 AT&T Corp.                  *
+*                  Copyright (c) 1982-2006 AT&T Corp.                  *
 *                      and is licensed under the                       *
 *                  Common Public License, Version 1.0                  *
 *                            by AT&T Corp.                             *
@@ -41,6 +41,9 @@
 #	include	<exec_attr.h>
 #   endif
 #endif
+#ifndef ARG_MAX
+#   define ARG_MAX	4096
+#endif
 
 #define RW_ALL	(S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH)
 
@@ -106,8 +109,8 @@
 	long size, left;
 	int nlast=1,n,exitval=0;
 	pid_t pid;
-	if(!argmax)
-		argmax = sysconf(_SC_ARG_MAX);
+	if(!argmax && (argmax = sysconf(_SC_ARG_MAX)) < 0)
+		argmax = ARG_MAX;
 	if(sh.xargmin < 0)
 		return((pid_t)-1);
 	size = argmax-1024;
@@ -515,6 +518,7 @@
 	sh_onstate(SH_NOALIAS);
 	shp->readscript = (char*)name;
 	shp->st.filename = path_fullname(stakptr(PATH_OFFSET));
+	error_info.line = 0;
 	sh_eval(sfnew(NIL(Sfio_t*),buff,IOBSIZE,fno,SF_READ),0);
 	shp->readscript = 0;
 	free((void*)shp->st.filename);
@@ -624,14 +628,17 @@
 			if(oldpp->bltin_lib)
 			{
 				typedef int (*Fptr_t)(int, char*[], void*);
+				Namval_t *np;
 				Fptr_t addr;
 				int n = staktell();
 				stakputs("b_");
 				stakputs(name);
 				stakputc(0);
-				if(addr=(Fptr_t)dlllook(oldpp->bltin_lib,stakptr(n)))
+				if((addr=(Fptr_t)dlllook(oldpp->bltin_lib,stakptr(n))) &&
+				   (!(np = sh_addbuiltin(stakptr(PATH_OFFSET),NiL,NiL)) || np->nvalue.bfp!=addr) &&
+				   (np = sh_addbuiltin(stakptr(PATH_OFFSET),addr,NiL)))
 				{
-					sh_addbuiltin(stakptr(PATH_OFFSET),addr,(void*)0)->nvenv = oldpp->bltin_lib;
+					np->nvenv = oldpp->bltin_lib;
 					return(oldpp);
 				}
 			}
@@ -770,11 +777,10 @@
 	sfsync(NIL(Sfio_t*));
 	timerdel(NIL(void*));
 	/* find first path that has a library component */
-	for(libpath=pp; libpath && !libpath->lib ; libpath=libpath->next);
 	if(pp || slash) do
 	{
 		sh_sigcheck();
-		if(pp)
+		if(libpath=pp)
 		{
 			pp = path_nextcomp(pp,arg0,0);
 			opath = stakfreeze(1)+PATH_OFFSET;
@@ -811,7 +817,9 @@
 	stakputs(opath);
 	opath = stakfreeze(1)+PATH_OFFSET;
 	np=nv_search(argv[0],shp->track_tree,0);
-	if(!np || nv_size(np)>0)
+	while(libpath && !libpath->lib)
+		libpath=libpath->next;
+	if(libpath && (!np || nv_size(np)>0))
 	{
 		/* check for symlink and use symlink name */
 		char buff[PATH_MAX+1];
@@ -1269,6 +1277,8 @@
 	int k,m,n,fd;
 	char *sp,*cp,*ep;
 	stakseek(offset+pp->len);
+	if(pp->len==1 && *stakptr(offset)=='/')
+		stakseek(offset);
 	stakputs("/.paths");
 	if((fd=open(stakptr(offset),O_RDONLY))>=0)
 	{

ksh-20050202-uname.patch:
 uname.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE ksh-20050202-uname.patch ---
--- ksh-20050202_new/src/lib/libcmd/uname.c.uname	2006-02-01 15:32:32.000000000 +0100
+++ ksh-20050202_new/src/lib/libcmd/uname.c	2006-02-01 15:48:37.000000000 +0100
@@ -394,6 +394,16 @@
 		{
 			if (!*(s = astconf("PLATFORM", NiL, NiL)))
 				s = astconf("HW_NAME", NiL, NiL);
+            if (! *s && !*(s = astconf("ARCHITECTURE", NiL, NiL))) 
+            {
+                if (t = strchr(hosttype, '.'))
+                    t++;
+                else
+                    t = hosttype;
+                strncpy(s = buf, t, sizeof(buf) - 1);
+            }
+            if(strlen(s)==4 && s[0]=='i' && s[2]=='8' && s[3]=='6')
+                s[1]='3';
 			output(OPT_implementation, s, "implementation");
 		}
 		if (flags & OPT_extended_release)



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:38:24 -0500
Subject: rpms/kdeaddons/FC-4 .cvsignore, 1.26, 1.27 kdeaddons.spec, 1.38,
	1.39 sources, 1.27, 1.28
Message-ID: <200602021138.k12BcOWq002506@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	8 Dec 2005 13:33:38 -0000	1.26
+++ .cvsignore	2 Feb 2006 11:38:21 -0000	1.27
@@ -6,3 +6,4 @@
 kdeaddons-3.4.1.tar.bz2
 kdeaddons-3.4.2.tar.bz2
 kdeaddons-3.5.0.tar.bz2
+kdeaddons-3.5.1.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/kdeaddons.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdeaddons.spec	8 Dec 2005 13:50:21 -0000	1.38
+++ kdeaddons.spec	2 Feb 2006 11:38:21 -0000	1.39
@@ -2,15 +2,14 @@
 %define debug 0
 %define final 1
 %define make_cvs 1
-%define vimpart 1
 
 %define qt_version 3.3.4
-%define arts_version 1.5.0
+%define arts_version 1.5.1
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
+Version: 3.5.1
 Release: 0.1.fc4
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
@@ -72,13 +71,6 @@
 %setup -q
 %patch1 -p1 -b .libtool
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -91,9 +83,14 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --includedir=%{_includedir}/kde \
    --disable-rpath \
    --with-berkeley-db \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{xmms}
   --with-xmms \
 %else
@@ -102,6 +99,10 @@
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
    --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
@@ -164,6 +165,9 @@
 %endif
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
+- 3.5.1
+
 * Thu Dec 08 2005 Than Ngo <than at redhat.com> 3.5.0-0.1.fc4
 - 3.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	8 Dec 2005 13:33:41 -0000	1.27
+++ sources	2 Feb 2006 11:38:21 -0000	1.28
@@ -1 +1 @@
-a61bcb10580208c3abb8c47aed198597  kdeaddons-3.5.0.tar.bz2
+cbd2a6f65ae7338736d93b72bfdf5ae3  kdeaddons-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 11:51:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 06:51:15 -0500
Subject: rpms/nmap/devel .cvsignore, 1.13, 1.14 nmap.spec, 1.25, 1.26 sources,
	1.13, 1.14 nmap-3.93-attr.patch, 1.1, NONE
Message-ID: <200602021151.k12BpF9e020700@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/nmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20655

Modified Files:
	.cvsignore nmap.spec sources 
Removed Files:
	nmap-3.93-attr.patch 
Log Message:
-version 4.00


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	19 Dec 2005 10:52:00 -0000	1.13
+++ .cvsignore	2 Feb 2006 11:51:12 -0000	1.14
@@ -1 +1 @@
-nmap-3.95.tgz
+nmap-4.00.tar.bz2


Index: nmap.spec
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nmap.spec	19 Dec 2005 10:50:46 -0000	1.25
+++ nmap.spec	2 Feb 2006 11:51:12 -0000	1.26
@@ -1,17 +1,16 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 3.95
+Version: 4.00
 Release: 1
 License: GPL
 Group: Applications/System
-Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tgz
+Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
 Source1: nmapfe.desktop
 Source2: nmapfe-32.png
 Source3: nmapfe-48.png
 Patch0: inet_aton.patch
 Patch1: makefile.patch
 Patch3: nmap-3.81-noms.patch
-Patch4: nmap-3.93-attr.patch
 URL: http://www.insecure.org/nmap/
 BuildRoot: %{_tmppath}/%{name}-root
 Epoch: 2
@@ -37,7 +36,6 @@
 %prep
 %setup -q
 %patch3 -p1 -b .noms
-%patch4 -p1 -b .attr
 
 %build
 %configure  --with-libpcap=/usr
@@ -68,8 +66,10 @@
 %files 
 %defattr(-,root,root)
 %doc COPYING*
-%doc docs/README docs/nmap-fingerprinting-article.txt
-%doc docs/nmap.deprecated.txt docs/nmap.usage.txt 
+%doc docs/README 
+#%doc docs/nmap-fingerprinting-article.txt
+#%doc docs/nmap.deprecated.txt 
+%doc docs/nmap.usage.txt 
 %{_bindir}/nmap
 %{_datadir}/nmap
 %{_mandir}/man1/nmap.1.gz
@@ -84,6 +84,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> - 2:4.00-1
+- version 4.00
+
 * Mon Dec 19 2005 Harald Hoyer <harald at redhat.com> - 2:3.95-1
 - version 3.95
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	19 Dec 2005 10:52:00 -0000	1.13
+++ sources	2 Feb 2006 11:51:12 -0000	1.14
@@ -1 +1 @@
-8aab9467378cb71ed767a863ecde58c4  nmap-3.95.tgz
+b409d632d753588f5691562209b83eed  nmap-4.00.tar.bz2


--- nmap-3.93-attr.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:21:38 -0500
Subject: rpms/kdevelop/FC-4 .cvsignore, 1.22, 1.23 kdevelop.spec, 1.32,
	1.33 sources, 1.23, 1.24 admin-visibility.patch, 1.3,
	NONE kdevelop, 1.5, NONE kdevelop-3.1.92-fpic.patch, 1.2,
	NONE kdevelop-3.2.1-gcc4.patch, 1.1,
	NONE kdevelop-3.2.1-symbol.patch, 1.1, NONE
Message-ID: <200602021321.k12DLc7X009165@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdevelop.spec sources 
Removed Files:
	admin-visibility.patch kdevelop kdevelop-3.1.92-fpic.patch 
	kdevelop-3.2.1-gcc4.patch kdevelop-3.2.1-symbol.patch 
Log Message:
update to 3.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	16 Jun 2005 10:06:21 -0000	1.22
+++ .cvsignore	2 Feb 2006 13:21:35 -0000	1.23
@@ -5,3 +5,4 @@
 kdevelop-3.2.0-rc1.tar.bz2
 kdevelop-3.2.0.tar.bz2
 kdevelop-3.2.1.tar.bz2
+kdevelop-3.3.1.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/kdevelop.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- kdevelop.spec	30 Jun 2005 16:22:18 -0000	1.32
+++ kdevelop.spec	2 Feb 2006 13:21:35 -0000	1.33
@@ -1,15 +1,17 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.4.1
+%define kde_version 3.5.1
 %define qt_version 3.3.4
+%define qt_epoch 1
 
 %define make_cvs 1
+%define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.2.1
-Release: 0.fc4.2
+Version: 3.3.1
+Release: 0.1.fc4
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -18,15 +20,10 @@
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-Source2: kdevelop
 
 Patch1: c_cpp_reference-2.0.2-config.patch
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
-Patch4: kdevelop-3.1.92-fpic.patch
-Patch5: admin-visibility.patch
-Patch6: kdevelop-3.2.1-gcc4.patch
-Patch7: kdevelop-3.2.1-symbol.patch
 
 Prereq: /sbin/ldconfig
 
@@ -35,7 +32,7 @@
 Requires: perl >= 0:5.004
 Requires: libtool
 Requires: flex >= 2.5.4
-Requires: qt-designer >= 1:%{qt_version}
+Requires: qt-designer >= %{qt_epoch}:%{qt_version}
 
 BuildPrereq: autoconf
 BuildPrereq: automake
@@ -73,10 +70,6 @@
 %patch1 -p0 -b .config
 %patch2 -p1 -b .libtool
 %patch3 -p1 -b .doc
-%patch4 -p1
-%patch5 -p1 -b .gcc
-%patch6 -p1 -b .gcc4
-%patch7 -p1 -b .symbol
 
 %build
 export KDEDIR=%{_prefix}
@@ -93,10 +86,27 @@
   make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 %endif
 
-export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE"
+export FLAGS="$RPM_OPT_FLAGS"
 
+# c references
+pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
+  --with-qt-libraries=$QTDIR/lib \
+  --with-qt-includes=$QTDIR/include \
+  --with-extra-libs=%{_libdir}
+popd
+
+%configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
   --enable-final \
 %endif
@@ -108,23 +118,12 @@
 make %{?_smp_mflags} -C lib/util
 make %{?_smp_mflags}
 
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
-  --with-qt-libraries=$QTDIR/lib \
-  --with-qt-includes=$QTDIR/include \
-  --with-extra-libs=%{_libdir}
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
 
-# remove duplicat, konflict with kdelibs
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/text/x-pascal.desktop
-
 # remove useless files
 rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
 
@@ -141,6 +140,7 @@
 %{_bindir}/*
 %{_libdir}/kde3/*
 %{_libdir}/lib*
+%{_libdir}/kconf_update_bin/
 %{_includedir}/*
 %{_datadir}/applications/kde/*
 %{_datadir}/apps/*
@@ -153,6 +153,15 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 9:3.3.1-0.1.fc4
+- 3.3.1
+
+* Mon Dec 12 2005 Than Ngo <than at redhat.com> 9:3.3.0-0.1.fc4
+- update to 3.3.0 
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 9:3.2.2-0.fc4.1
+- update to 3.2.2
+
 * Thu Jun 30 2005 Than Ngo <than at redhat.com> 9:3.2.1-0.fc4.2
 - apply patch to fix undefined symbol issue #162146
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	16 Jun 2005 10:06:21 -0000	1.23
+++ sources	2 Feb 2006 13:21:35 -0000	1.24
@@ -1,2 +1,2 @@
 5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-7a5e9f2fb8a9539a41541dba566a234a  kdevelop-3.2.1.tar.bz2
+e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2


--- admin-visibility.patch DELETED ---


--- kdevelop DELETED ---


--- kdevelop-3.1.92-fpic.patch DELETED ---


--- kdevelop-3.2.1-gcc4.patch DELETED ---


--- kdevelop-3.2.1-symbol.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:24:02 -0500
Subject: rpms/iptables/devel .cvsignore, 1.17, 1.18 iptables.init, 1.10,
	1.11 iptables.spec, 1.38, 1.39 sources, 1.17, 1.18
Message-ID: <200602021324.k12DO2GZ009275@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9240

Modified Files:
	.cvsignore iptables.init iptables.spec sources 
Log Message:
[tw]
- new version 1.3.5
- fixed init script to set policy for raw tables, too (#179094)




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	18 Nov 2005 12:26:15 -0000	1.17
+++ .cvsignore	2 Feb 2006 13:24:00 -0000	1.18
@@ -3,3 +3,4 @@
 iptables-1.3.1.tar.bz2
 iptables-1.3.2.tar.bz2
 iptables-1.3.4.tar.bz2
+iptables-1.3.5.tar.bz2


Index: iptables.init
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- iptables.init	18 Nov 2005 12:34:33 -0000	1.10
+++ iptables.init	2 Feb 2006 13:24:00 -0000	1.11
@@ -120,6 +120,11 @@
     for i in $tables; do
 	echo -n "$i "
 	case "$i" in
+	    raw)
+		$IPTABLES -t raw -P PREROUTING $policy \
+		    && $IPTABLES -t raw -P OUTPUT $policy \
+		    || let ret+=1
+		;;
 	    filter)
                 $IPTABLES -t filter -P INPUT $policy \
 		    && $IPTABLES -t filter -P OUTPUT $policy \


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- iptables.spec	24 Jan 2006 14:18:57 -0000	1.38
+++ iptables.spec	2 Feb 2006 13:24:00 -0000	1.39
@@ -2,8 +2,8 @@
 
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
-Version: 1.3.4
-Release: 3
+Version: 1.3.5
+Release: 1
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -151,6 +151,10 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Thomas Woerner <twoerner at redhat.com> 1.3.5-1
+- new version 1.3.5
+- fixed init script to set policy for raw tables, too (#179094)
+
 * Tue Jan 24 2006 Thomas Woerner <twoerner at redhat.com> 1.3.4-3
 - added important iptables header files to devel package
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Nov 2005 12:26:15 -0000	1.17
+++ sources	2 Feb 2006 13:24:00 -0000	1.18
@@ -1 +1 @@
-fdff8abe890807968226b0c374335305  iptables-1.3.4.tar.bz2
+00fb916fa8040ca992a5ace56d905ea5  iptables-1.3.5.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:31:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:31:23 -0500
Subject: rpms/kernel-xen/devel/configs config-xen-xen0-PAE, NONE,
	1.1 config-xen-xenU-PAE, NONE, 1.1
Message-ID: <200602021331.k12DVNUh019960@cvs.devel.redhat.com>

Author: quintela

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

Added Files:
	config-xen-xen0-PAE config-xen-xenU-PAE 
Log Message:
add PAE kernel support


--- NEW FILE config-xen-xen0-PAE ---
#
# 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=m
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set

# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HIGHMEM=y

#
# 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

# 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

#
# 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


--- NEW FILE config-xen-xenU-PAE ---
#
# XEN
#
# CONFIG_XEN_PRIVILEGED_GUEST is not set
# CONFIG_XEN_PHYSDEV_ACCESS is not set
# CONFIG_XEN_BLKDEV_BACKEND is not set
# CONFIG_XEN_NETDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
CONFIG_XEN_DISABLE_SERIAL=y

# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HIGHMEM=y

#
# Disable the non-xen drivers, since unprivileged guests
# do not get hardware access

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
# CONFIG_PCI is not set
# CONFIG_ISA is not set
# CONFIG_HOTPLUG is not set

#
# PCMCIA/CardBus support
#
# CONFIG_PCMCIA is not set
# CONFIG_YENTA is not set
# CONFIG_CARDBUS is not set

#
# Generic Driver Options
#
# CONFIG_FW_LOADER is not set

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
# CONFIG_PARPORT is not set

#
# Plug and Play support
#
# CONFIG_PNP is not set
# CONFIG_ISAPNP is not set

#
# Dongle support
#
# CONFIG_DONGLE is not set

#
# File systems
#
CONFIG_EXT3_FS=y
CONFIG_JBD=y

#
# FIR device drivers
#
# CONFIG_BT is not set

#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_ATMEL is not set
# CONFIG_IEEE80211 is not set

# 
# TPM
# 
# CONFIG_XEN_TPMDEV_FRONTEND is not set

# CONFIG_TOSHIBA is not set



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:30:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:30:52 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.35, 1.36 Makefile.config,
	1.2, 1.3
Message-ID: <200602021330.k12DUq7s019935@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec Makefile.config 
Log Message:
add PAE kernel support


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kernel-xen.spec	31 Jan 2006 22:20:23 -0000	1.35
+++ kernel-xen.spec	2 Feb 2006 13:30:48 -0000	1.36
@@ -6,6 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -48,9 +49,11 @@
 
 %ifarch i686
 %define buildxen %{includexen}
+%define buildxenPAE %{includexenPAE}
 %define buildkdump 0
 %else
 %define buildxen 0
+%define buildxenPAE 0
 %define buildkdump 0
 %endif
 
@@ -211,6 +214,8 @@
 #Source34: kernel-%{kversion}-sparc.config
 #Source35: kernel-%{kversion}-sparc64.config
 #Source36: kernel-%{kversion}-sparc64-smp.config
+Source37: kernel-%{kversion}-i686-hypervisor-PAE.config
+Source38: kernel-%{kversion}-i686-guest-PAE.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -514,6 +519,46 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
+
+%package hypervisor-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}hypervisor
+Prereq: %{kernel_prereq}
+Requires: xen
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the xen0 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 hypervisor-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 hypervisor-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description hypervisor-PAE-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
 %package guest
 Summary: The Linux kernel compiled for unprivileged Xen guest VMs
 
@@ -548,6 +593,40 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
+%package guest-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}guest
+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 guest-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 guest-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
+Provides: kernel-devel = %{rpmversion}-%{release}guest
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description guest-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.
 
@@ -961,16 +1040,6 @@
 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
 
-%if %{buildxen}
-  cd xen
-  make CC=gcc32
-  cd ..
-%endif
-
-cd linux-%{kversion}.%{_target_cpu}
-
-
-
 BuildKernel() {
 
     # Pick the right config file for the kernel we're building
@@ -1144,6 +1213,23 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot
 
+%if %{buildxen}
+  cd xen
+  mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
+%if %{buildxenPAE}
+  make CC=gcc32 pae=y
+  install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE
+  install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
+  make clean
+%endif
+  make CC=gcc32
+  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 ..
+%endif
+
+cd linux-%{kversion}.%{_target_cpu}
+
 %if %{buildup}
 BuildKernel
 %endif
@@ -1152,6 +1238,11 @@
 BuildKernel smp
 %endif
 
+%if %{buildxenPAE}
+BuildKernel hypervisor-PAE
+BuildKernel guest-PAE
+%endif
+
 %if %{buildxen}
 BuildKernel hypervisor
 BuildKernel guest
@@ -1167,13 +1258,6 @@
 
 %install
 
-%if %{buildxen}
-  cd xen
-  mkdir -p $RPM_BUILD_ROOT/boot
-  cp xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
-  cd ..
-%endif
-
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{buildxen}
@@ -1342,6 +1426,7 @@
 /boot/System.map-%{KVERREL}hypervisor
 /boot/config-%{KVERREL}hypervisor
 /boot/xen.gz-%{KVERREL}
+/boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}hypervisor
 /lib/modules/%{KVERREL}hypervisor/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
@@ -1374,6 +1459,46 @@
 /usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
 %endif
 
+%if %{buildxenPAE}
+%files hypervisor-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
+/boot/System.map-%{KVERREL}hypervisor-PAE
+/boot/config-%{KVERREL}hypervisor-PAE
+/boot/xen.gz-%{KVERREL}-PAE
+/boot/xen-syms-%{KVERREL}-PAE
+%dir /lib/modules/%{KVERREL}hypervisor-PAE
+/lib/modules/%{KVERREL}hypervisor-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build
+/lib/modules/%{KVERREL}hypervisor-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}hypervisor-PAE/extra
+/lib/modules/%{KVERREL}hypervisor-PAE/updates
+
+%files hypervisor-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu}
+
+%files guest-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}guest-PAE
+/boot/System.map-%{KVERREL}guest-PAE
+/boot/config-%{KVERREL}guest-PAE
+%dir /lib/modules/%{KVERREL}guest-PAE
+/lib/modules/%{KVERREL}guest-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}guest-PAE/build
+/lib/modules/%{KVERREL}guest-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}guest-PAE/extra
+/lib/modules/%{KVERREL}guest-PAE/updates
+
+%files guest-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu}
+%endif
+
 %if %{buildkdump}
 
 %files kdump
@@ -1405,7 +1530,10 @@
 %endif
 
 %changelog
-* Tue Jan 31 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+* Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
+- Add PAE hypervisor & guest kernel, disabled by default.
+
+* Tue Jan 31 2006 Juan Quintela <quintela at redhat.com>
 - Merge with rawhide 1884.
 - kdump don't work yet at xen.
 


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/Makefile.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.config	21 Dec 2005 11:24:50 -0000	1.2
+++ Makefile.config	2 Feb 2006 13:30:49 -0000	1.3
@@ -13,6 +13,7 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ia64.config \
 	$(CFG)-i686-hypervisor.config $(CFG)-i686-guest.config \
+	$(CFG)-i686-hypervisor-PAE.config $(CFG)-i686-guest-PAE.config \
 	$(CFG)-x86_64-hypervisor.config $(CFG)-x86_64-guest.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -118,9 +119,15 @@
 kernel-$(VERSION)-i686-hypervisor.config: configs/config-xen-xen0 temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
+kernel-$(VERSION)-i686-hypervisor-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
 kernel-$(VERSION)-i686-guest.config: configs/config-xen-xenU temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
+kernel-$(VERSION)-i686-guest-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
 kernel-$(VERSION)-x86_64-hypervisor.config: configs/config-xen-xen0 temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:43:17 -0500
Subject: rpms/kdewebdev/FC-4 .cvsignore, 1.7, 1.8 kdewebdev.spec, 1.14,
	1.15 sources, 1.7, 1.8 admin-visibility.patch, 1.3, NONE
Message-ID: <200602021343.k12DhHmj024052@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdewebdev.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Jun 2005 16:34:08 -0000	1.7
+++ .cvsignore	2 Feb 2006 13:43:14 -0000	1.8
@@ -9,3 +9,4 @@
 kdewebdev-3.4.0-rc1.tar.bz2
 kdewebdev-3.4.0.tar.bz2
 kdewebdev-3.4.1.tar.bz2
+kdewebdev-3.5.1.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/kdewebdev.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdewebdev.spec	16 Jun 2005 16:34:08 -0000	1.14
+++ kdewebdev.spec	2 Feb 2006 13:43:14 -0000	1.15
@@ -5,10 +5,11 @@
 %define arts 1
 
 %define qt_version 3.3.4
-%define kde_version 3.4.1
+%define kde_version 3.5.1
+%define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -26,13 +27,13 @@
 Source5: http://tidy.sourceforge.net/src/tidy_src_041026.tgz
 
 Patch0: javascript.patch
-Patch1: admin-visibility.patch
 
 Prereq: /sbin/ldconfig
-Requires: kdelibs >= %{kde_version}
+Requires: kdelibs >= 6:%{kde_version}
 
 BuildPrereq: qt-devel >= %{qt_version}
 BuildPrereq: kdesdk-devel >= %{kde_version}
+BuildPrereq: perl
 
 Obsoletes: WebMaker
 Obsoletes: quanta
@@ -57,7 +58,6 @@
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4 -a 5
 %patch0 -p0 -b .javascript
-%patch1 -p1 -b .gcc
 
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -70,13 +70,22 @@
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
    --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
@@ -145,7 +154,16 @@
 %{_includedir}/*
 
 %changelog
-* Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
+- 3.5.1
+
+* Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-0.1.fc4
+- 3.5.0 
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc4.1
+- update to 3.4.2
+
+* Thu Jun 16 2005 Than Ngo <than at redhat.com> 6:3.4.1-0.fc4.1
 - 3.4.1
 
 * Wed May 04 2005 Than Ngo <than at redhat.com> 6:3.4.0-3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Jun 2005 16:34:08 -0000	1.7
+++ sources	2 Feb 2006 13:43:14 -0000	1.8
@@ -3,4 +3,4 @@
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
 98076a205e30873dad43d384b2366d23  tidy_src_041026.tgz
-d5c9e5c72731aead950ab29a4d620af8  kdewebdev-3.4.1.tar.bz2
+0faea4e8088005ae60f58b21c60b32ea  kdewebdev-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:45:34 -0500
Subject: rpms/make/devel make-3.80-memory-2.patch, NONE, 1.1 make.spec, 1.23,
	1.24
Message-ID: <200602021345.k12DjYLD025717@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/make/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25133

Modified Files:
	make.spec 
Added Files:
	make-3.80-memory-2.patch 
Log Message:
- H.J. Lu caught a typo in the patch and provided a new one. (#175376)


make-3.80-memory-2.patch:
 file.c     |    2 
 implicit.c |    2 
 main.c     |    1 
 make.h     |    5 +
 misc.c     |  155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 read.c     |    6 +-
 6 files changed, 165 insertions(+), 6 deletions(-)

--- NEW FILE make-3.80-memory-2.patch ---
--- make-3.80/file.c.memory	2002-10-03 19:13:42.000000000 -0700
+++ make-3.80/file.c	2006-02-01 10:45:32.000000000 -0800
@@ -434,7 +434,7 @@ snap_deps ()
 	    if (d->file == 0)
 	      d->file = enter_file (d->name);
 	    else
-	      free (d->name);
+	      hash_strfree (d->name);
 	    d->name = 0;
 	  }
   free (file_slot_0);
--- make-3.80/implicit.c.memory	2002-09-04 00:26:19.000000000 -0700
+++ make-3.80/implicit.c	2006-02-01 10:45:32.000000000 -0800
@@ -539,7 +539,7 @@ pattern_search (file, archive, depth, re
 	      dep->file = enter_file (dep->name);
               /* enter_file uses dep->name _if_ we created a new file.  */
               if (dep->name != dep->file->name)
-                free (dep->name);
+                hash_strfree (dep->name);
 	      dep->name = 0;
 	      dep->file->tried_implicit |= dep->changed;
 	    }
--- make-3.80/main.c.memory	2002-08-09 18:27:17.000000000 -0700
+++ make-3.80/main.c	2006-02-01 10:45:32.000000000 -0800
@@ -501,6 +501,7 @@ initialize_global_hash_tables ()
   init_hash_files ();
   hash_init_directories ();
   hash_init_function_table ();
+  init_hash_strings ();
 }
 
 static struct file *
--- make-3.80/make.h.memory	2002-09-11 09:55:44.000000000 -0700
+++ make-3.80/make.h	2006-02-01 10:45:32.000000000 -0800
@@ -427,6 +427,11 @@ extern char *find_char_unquote PARAMS ((
 extern char *find_percent PARAMS ((char *));
 extern FILE *open_tmpfile PARAMS ((char **, const char *));
 
+extern void init_hash_strings PARAMS ((void));
+extern char *hash_strdup PARAMS ((const char *));
+extern char *hash_savestring PARAMS ((const char *, unsigned int));
+extern void hash_strfree PARAMS ((char *));
+
 #ifndef NO_ARCHIVES
 extern int ar_name PARAMS ((char *));
 extern void ar_parse_name PARAMS ((char *, char **, char **));
--- make-3.80/misc.c.memory	2002-09-12 15:15:58.000000000 -0700
+++ make-3.80/misc.c	2006-02-01 11:05:44.000000000 -0800
@@ -18,8 +18,10 @@ along with GNU Make; see the file COPYIN
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <assert.h>
 #include "make.h"
 #include "dep.h"
+#include "hash.h"
 #include "debug.h"
 
 /* Variadic functions.  We go through contortions to allow proper function
@@ -564,7 +566,7 @@ copy_dep_chain (d)
       c = (struct dep *) xmalloc (sizeof (struct dep));
       bcopy ((char *) d, (char *) c, sizeof (struct dep));
       if (c->name != 0)
-	c->name = xstrdup (c->name);
+	c->name = hash_strdup (c->name);
       c->next = 0;
       if (firstnew == 0)
 	firstnew = lastnew = c;
@@ -891,3 +893,154 @@ atomic_readdir(dir)
 }
 
 #endif  /* HAVE_BROKEN_RESTART */
+
+/* Hash table of duplicated strings.  */
+
+struct hash_string
+{
+  char *string;
+  unsigned int count;
+};
+
+static unsigned long
+string_hash_1 (key)
+    const void *key;
+{
+  return_ISTRING_HASH_1 (((const struct hash_string *) key)->string);
+}
+
+static unsigned long
+string_hash_2 (key)
+    const void *key;
+{
+  return_ISTRING_HASH_2 (((const struct hash_string *) key)->string);
+}
+
+static int
+string_hash_cmp (x, y)
+    const void *x;
+    const void *y;
+{
+  return_ISTRING_COMPARE (((const struct hash_string *) x)->string,
+			  ((const struct hash_string *) y)->string);
+}
+
+static struct hash_table strings;
+
+void
+init_hash_strings ()
+{
+  hash_init (&strings, 1000, string_hash_1, string_hash_2,
+	     string_hash_cmp);
+}
+
+/* Keep track duplicated string and return the old one if exists.  */
+
+char *
+hash_strdup (ptr)
+     const char *ptr;
+{
+  struct hash_string *h, key;
+  
+  if (*ptr == '\0')
+    return "";
+
+  key.string = (char *) ptr;
+  key.count = 0;
+  h = (struct hash_string *) hash_find_item (&strings, &key);
+  if (h == NULL)
+    {
+      char *result = (char *) malloc (strlen (ptr) + 1);
+
+      if (result == NULL)
+	fatal (NILF, _("virtual memory exhausted"));
+
+      strcpy (result, ptr);
+
+      h = (struct hash_string *) malloc (sizeof (struct hash_string));
+      if (h == NULL)
+	fatal (NILF, _("virtual memory exhausted"));
+
+      h->string = result;
+      h->count = 1;
+      hash_insert (&strings, h);
+    }
+  else
+    {
+      h->count++;
+      assert (h->count != 0);
+    }
+  
+  return h->string;
+}
+
+char *
+hash_savestring (str, length)
+     const char *str;
+     unsigned int length;
+{
+  struct hash_string *h, key;
+  
+  if (length == 0 || *str == '\0')
+    return "";
+
+  key.string = alloca (length + 1);
+  key.count = 0;
+  bcopy (str, key.string, length);
+  key.string [length] = '\0';
+
+  h = (struct hash_string *) hash_find_item (&strings, &key);
+  if (h == NULL)
+    {
+      char *out = (char *) xmalloc (length + 1);
+      bcopy (str, out, length);
+      out[length] = '\0';
+
+      h = (struct hash_string *) malloc (sizeof (struct hash_string));
+      if (h == NULL)
+	fatal (NILF, _("virtual memory exhausted"));
+
+      h->string = out;
+      h->count = 1;
+      hash_insert (&strings, h);
+    }
+  else
+    {
+      h->count++;
+      assert (h->count != 0);
+    }
+  
+  return h->string;
+}
+
+void
+hash_strfree (ptr)
+     char *ptr;
+{
+  struct hash_string *h, key;
+  
+  if (*ptr == '\0')
+    return;
+
+  key.string = ptr;
+  key.count = 0;
+  h = (struct hash_string *) hash_find_item (&strings, &key);
+
+  /* Check if string comes from hash_strdup or hash_savestring.  */
+  if (h == NULL || h->string != ptr)
+    {
+      free (ptr);
+      return;
+    }
+
+  h->count--;
+  if (h->count == 0)
+    {
+      struct hash_string *d;
+
+      d = hash_delete (&strings, h);
+      assert (d == h);
+      free (h->string);
+      free (h);
+    }
+}
--- make-3.80/read.c.memory	2006-02-01 10:45:32.000000000 -0800
+++ make-3.80/read.c	2006-02-01 10:45:32.000000000 -0800
@@ -1871,8 +1871,8 @@ record_files (filenames, pattern, patter
                     fatal (flocp,
                            _("target `%s' leaves prerequisite pattern empty"),
                            name);
-		  free (d->name);
-		  d->name = savestring (buffer, o - buffer);
+		  hash_strfree (d->name);
+		  d->name = hash_savestring (buffer, o - buffer);
 		}
 	    }
 	}
@@ -2017,7 +2017,7 @@ record_files (filenames, pattern, patter
 	      while (d != 0)
 		{
 		  struct dep *nextd = d->next;
- 		  free (d->name);
+ 		  hash_strfree (d->name);
  		  free ((char *)d);
 		  d = nextd;
 		}


Index: make.spec
===================================================================
RCS file: /cvs/dist/rpms/make/devel/make.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- make.spec	9 Jan 2006 18:40:17 -0000	1.23
+++ make.spec	2 Feb 2006 13:45:32 -0000	1.24
@@ -2,7 +2,7 @@
 Name: make
 Epoch: 1
 Version: 3.80
-Release: 9
+Release: 10
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -13,7 +13,8 @@
 Patch4: make-3.80-j8k.patch
 Patch5: make-3.80-getcwd.patch
 Patch6: make-3.80-err-reporting.patch
-Patch7: make-3.80-memory-1.patch
+#Patch7: make-3.80-memory-1.patch #buggy, fixed in memory-2.patch
+Patch7: make-3.80-memory-2.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
@@ -85,9 +86,12 @@
 %{_infodir}/*.info*
 
 %changelog
+* Mon Feb 02 2006 Petr Machata <pmachata at redhat.com> 3.80-10
+- H.J. Lu caught a typo in the patch and provided a new one. (#175376)
+
 * Mon Jan 09 2006 Petr Machata <pmachata at redhat.com> 3.80-9
-- Applied patch from hongjiu.lu at intel.com.  Somehow reduces make's
-  enormous memory consumption. (#175376)
+- Applied patch from H.J. Lu.  Somehow reduces make's enormous memory
+  consumption. (#175376)
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt



From fedora-cvs-commits at redhat.com  Thu Feb  2 13:54:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 08:54:17 -0500
Subject: rpms/kdeedu/FC-4 .cvsignore, 1.21, 1.22 kdeedu.spec, 1.26,
	1.27 sources, 1.23, 1.24 admin-visibility.patch, 1.3, NONE
Message-ID: <200602021354.k12DsHU2009088@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeedu.spec sources 
Removed Files:
	admin-visibility.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	16 Jun 2005 20:11:40 -0000	1.21
+++ .cvsignore	2 Feb 2006 13:54:14 -0000	1.22
@@ -5,3 +5,4 @@
 kdeedu-3.4.0-rc1.tar.bz2
 kdeedu-3.4.0.tar.bz2
 kdeedu-3.4.1.tar.bz2
+kdeedu-3.5.1.tar.bz2


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/kdeedu.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kdeedu.spec	16 Jun 2005 20:11:40 -0000	1.26
+++ kdeedu.spec	2 Feb 2006 13:54:15 -0000	1.27
@@ -5,10 +5,13 @@
 %define arts 1
 
 %define qt_version 3.3.4
+%define qt_epoch 1
+
+%define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeedu
-Version: 3.4.1
-Release: 0.fc4.1
+Version: 3.5.1
+Release: 0.1.fc4
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -18,10 +21,9 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
 Patch1: kde-libtool.patch
-Patch2: admin-visibility.patch
 
 Requires: kdebase >= 6:%{version}
-Requires: qt >= 1:%{qt_version}
+Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: kdebase-devel
@@ -107,7 +109,14 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .gcc
+
+%ifarch s390 s390x ppc ppc64
+  rm -rf doc/kstars kstars
+  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
@@ -117,11 +126,20 @@
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
-   --disable-kig-python-scripting \
+   --enable-kig-python-scripting \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -164,6 +182,21 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
+- 3.5.1
+
+* Tue Dec 13 2005 Than Ngo <than at redhat.com> 3.5.0-0.1.fc4
+- 3.5
+
+* Fri Nov 11 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.3 
+- rebuilt against new boost-1.33
+
+* Tue Aug 09 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.2
+- apply patch to fix tempfile vulnerability, CAN-2005-2101, #165606
+
+* Thu Jul 28 2005 Than Ngo <than at redhat.com> 3.4.2-0.fc4.1
+- update to 3.4.2
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	16 Jun 2005 20:11:40 -0000	1.23
+++ sources	2 Feb 2006 13:54:15 -0000	1.24
@@ -1 +1 @@
-9fa1db1cf500c0fc594b0f5d291bbf69  kdeedu-3.4.1.tar.bz2
+fe31b9a2ec4e299531c6b7beeab09534  kdeedu-3.5.1.tar.bz2


--- admin-visibility.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:00:41 -0500
Subject: rpms/system-config-samba/devel .cvsignore, 1.26, 1.27 sources, 1.26,
	1.27 system-config-samba.spec, 1.29, 1.30
Message-ID: <200602021400.k12E0fu8011934@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
add sr at Latn.po to enable Serbian Latin translation
don't use pam_stack (#170642)
fix format string bug that broke lines with trailing comments in smb.conf (#160166)
make desktop file rebuild consistently



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	6 May 2005 12:06:38 -0000	1.26
+++ .cvsignore	2 Feb 2006 14:00:29 -0000	1.27
@@ -1 +1 @@
-system-config-samba-1.2.31.tar.bz2
+system-config-samba-1.2.32.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	6 May 2005 12:06:38 -0000	1.26
+++ sources	2 Feb 2006 14:00:29 -0000	1.27
@@ -1 +1 @@
-fa734630f0086b5e9fdcace350419f16  system-config-samba-1.2.31.tar.bz2
+2b0ce31077ac26489cbbf18237f7a3ce  system-config-samba-1.2.32.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-samba.spec	9 Dec 2005 22:43:28 -0000	1.29
+++ system-config-samba.spec	2 Feb 2006 14:00:30 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.31
-Release: 1.1
+Version: 1.2.32
+Release: 1
 URL: http://www.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -75,8 +75,21 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.32
+- bump version
+
+* Thu Dec 22 2005 Nils Philippsen <nphilipp at redhat.com>
+- add sr at Latn.po to enable Serbian Latin translation
+
+* Fri Oct 14 2005 Nils Philippsen <nphilipp at redhat.com>
+- don't use pam_stack (#170642)
+
+* Tue Jun 14 2005 Nils Philippsen <nphilipp at redhat.com>
+- fix format string bug that broke lines with trailing comments in smb.conf
+  (#160166)
+
+* Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com>
+- make desktop file rebuild consistently
 
 * Fri May 06 2005 Nils Philippsen <nphilipp at redhat.com> - 1.2.31
 - use DESTDIR consistently



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:00:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:00:57 -0500
Subject: rpms/audit/FC-4 .cvsignore, 1.33, 1.34 audit.spec, 1.51,
	1.52 sources, 1.34, 1.35 audit-1.0.12-sendmail.patch, 1.1, NONE
Message-ID: <200602021400.k12E0vQr011973@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore audit.spec sources 
Removed Files:
	audit-1.0.12-sendmail.patch 
Log Message:
* Thu Feb 2 2006 Steve Grubb <sgrubb at redhat.com> 1.0.13-1.fc4
- Fix bug in autrace where it didn't run on kernels without file watch support
- Add timestamp to daemon_config messages (#174865)
- Add error checking of year for aureport & ausearch
- Treat af_unix sockets as files for searching and reporting
- Update capp & lspp rules to combine syscalls for higher performance
- Apply patch from Ulrich Drepper that optimizes resource utilization
- Change ausearch and aureport to unlocked IO
- Add more message types
- Add support for alpha processors
- Add locale code in ausearch and aureport
- Cleanup make files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	7 Nov 2005 23:06:21 -0000	1.33
+++ .cvsignore	2 Feb 2006 14:00:31 -0000	1.34
@@ -30,3 +30,4 @@
 audit-1.0.4.tar.gz
 audit-1.0.8.tar.gz
 audit-1.0.12.tar.gz
+audit-1.0.13.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/audit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- audit.spec	8 Nov 2005 22:22:10 -0000	1.51
+++ audit.spec	2 Feb 2006 14:00:41 -0000	1.52
@@ -1,13 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.0.12
-Release: 2.fc4
+Version: 1.0.13
+Release: 1.fc4
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch0: audit-0.9.14-header.patch
-Patch1: audit-1.0.12-sendmail.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool
 BuildRequires: glibc-kernheaders = 2.4-9.1.94
@@ -45,12 +44,11 @@
 %prep
 %setup -q
 %patch -p1
-%patch1 -p1
 
 %build
 autoreconf -fv --install
 export CFLAGS="$RPM_OPT_FLAGS"
-./configure --sbindir=/sbin --mandir=%{_mandir} --libdir=/%{_lib}
+%configure --sbindir=/sbin --libdir=/%{_lib}
 make
 
 %install
@@ -126,6 +124,19 @@
 
 
 %changelog
+* Thu Feb 2 2006 Steve Grubb <sgrubb at redhat.com> 1.0.13-1.fc4
+- Fix bug in autrace where it didn't run on kernels without file watch support
+- Add timestamp to daemon_config messages (#174865)
+- Add error checking of year for aureport & ausearch
+- Treat af_unix sockets as files for searching and reporting
+- Update capp & lspp rules to combine syscalls for higher performance
+- Apply patch from Ulrich Drepper that optimizes resource utilization
+- Change ausearch and aureport to unlocked IO
+- Add more message types
+- Add support for alpha processors
+- Add locale code in ausearch and aureport
+- Cleanup make files
+
 * Tue Nov 8 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-2
 - Fix sendmail error handler. Bug report from Dustin Kirkland of IBM.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	7 Nov 2005 23:06:21 -0000	1.34
+++ sources	2 Feb 2006 14:00:41 -0000	1.35
@@ -1,2 +1,2 @@
 3060e7e99fc090bc2cc13597db2a8d29  audit-0.9.14-header.patch
-32bd16841b3f2308a8a44b62a35b4abe  audit-1.0.12.tar.gz
+ec6178b0773b5c127d984b0d95bf5b89  audit-1.0.13.tar.gz


--- audit-1.0.12-sendmail.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:05:00 -0500
Subject: rpms/kernel-xen/devel/configs config-x86_64-kdump, NONE,
	1.1 config-generic, 1.4, 1.5
Message-ID: <200602021405.k12E50kd012338@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-generic 
Added Files:
	config-x86_64-kdump 
Log Message:
merge with rawhide 1985


--- NEW FILE config-x86_64-kdump ---
# CONFIG_SMP is not set
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_PROC_VMCORE=y


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-generic	2 Feb 2006 14:04:31 -0000	1.5
@@ -161,7 +161,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
@@ -464,7 +464,8 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA_FC=m
-# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
+# FIXME: Turn off for FC6 - Move to external firmware loader.
+CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
@@ -1592,10 +1593,10 @@
 # CONFIG_WDT_501 is not set
 CONFIG_WDTPCI=m
 CONFIG_WDT_501_PCI=y
-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
@@ -1603,14 +1604,14 @@
 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
@@ -2076,6 +2077,7 @@
 CONFIG_USB_DABUSB=m
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
+CONFIG_USB_ET61X251=m
 CONFIG_USB_IBMCAM=m
 CONFIG_USB_KONICAWC=m
 CONFIG_USB_OV511=m



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:04:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:04:44 -0500
Subject: rpms/kernel-xen/devel linux-2.6-random-patches.patch, NONE,
	1.1 linux-2.6-stradis-oops.patch, NONE,
	1.1 patch-2.6.16-rc1-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.11,
	1.12 Makefile.config, 1.3, 1.4 kernel-xen.spec, 1.36,
	1.37 linux-2.6-selinux-mprotect-checks.patch, 1.1, 1.2 sources,
	1.11, 1.12 upstream, 1.5, 1.6 linux-2.6-net-fix-iptables.patch,
	1.1, NONE linux-2.6-net-slab-corruption.patch, 1.1,
	NONE patch-2.6.16-rc1-git4.bz2.sign, 1.1, NONE
Message-ID: <200602021404.k12E4itY012310@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore Makefile.config kernel-xen.spec 
	linux-2.6-selinux-mprotect-checks.patch sources upstream 
Added Files:
	linux-2.6-random-patches.patch linux-2.6-stradis-oops.patch 
	patch-2.6.16-rc1-git5.bz2.sign 
Removed Files:
	linux-2.6-net-fix-iptables.patch 
	linux-2.6-net-slab-corruption.patch 
	patch-2.6.16-rc1-git4.bz2.sign 
Log Message:
merge with rawhide 1985

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 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.15.noarch/drivers/media/video/cpia.c             |    2 +-
 linux-2.6.15.noarch/drivers/media/video/hexium_orion.c     |    2 +-
 linux-2.6.15.noarch/drivers/scsi/megaraid.c                |    2 +-
 linux-2.6.15/kernel/power/snapshot.c                       |    3 ++-
 11 files changed, 12 insertions(+), 15 deletions(-)

--- NEW FILE linux-2.6-random-patches.patch ---

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;
 }
 

kobject_register failed for hexium HV-PCI6/Orion (-13)
 [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
 [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c7700a>] hexium_init_module+0xa/0x47 [hexium_orion]
 [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
 [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
 [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/media/video/hexium_orion.c~	2006-02-01 22:37:07.000000000 -0500
+++ linux-2.6.15.noarch/drivers/media/video/hexium_orion.c	2006-02-01 22:37:24.000000000 -0500
@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = {
 };
 
 static struct saa7146_extension extension = {
-	.name = "hexium HV-PCI6/Orion",
+	.name = "hexium HV-PCI6 Orion",
 	.flags = 0,		// SAA7146_USE_I2C_IRQ,
 
 	.pci_tbl = &pci_tbl[0],
--- 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;
 	}

Fix printk output.

sc1200wdt: build 20020303<3>sc1200wdt: io parameter must be specified

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);
megaraid.ko and megaraid_mbox.ko both have the same pci_driver kobject
name, which means this happens..

kobject_register failed for megaraid (-17)
 [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
 [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c77069>] megaraid_init+0x69/0xa9 [megaraid]
 [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
 [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
 [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/scsi/megaraid.c~	2006-02-01 22:13:23.000000000 -0500
+++ linux-2.6.15.noarch/drivers/scsi/megaraid.c	2006-02-01 22:13:30.000000000 -0500
@@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci
 MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
 
 static struct pci_driver megaraid_pci_driver = {
-	.name		= "megaraid",
+	.name		= "megaraid_legacy",
 	.id_table	= megaraid_pci_tbl,
 	.probe		= megaraid_probe_one,
 	.remove		= __devexit_p(megaraid_remove_one),

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-stradis-oops.patch:
 stradis.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-stradis-oops.patch ---

media video stradis memory fix

memset clears once set structure, there is actually no need for memset,
because configure function do it for us. Next, vfree(NULL) is legal, so
avoid useless labels.

Thanks Dave Jones for reporting this.

Signed-off-by: Jiri Slaby <jirislaby at gmail.com>

---
commit 6bf69f737175c593ae5dbccf1c836e86e60e80d4
tree 06984cc9874957c93276ad546f9e0756ebc2a11f
parent 34f0900e27681dd7bea568f6c593b9b216e7ce78
author <ku at bellona.(none)> Tue, 24 Jan 2006 12:18:56 +0100
committer <ku at bellona.(none)> Tue, 24 Jan 2006 12:18:56 +0100

 drivers/media/video/stradis.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 54fc330..9d76926 100644
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -2012,7 +2012,6 @@ static int __devinit init_saa7146(struct
 {
 	struct saa7146 *saa = pci_get_drvdata(pdev);
 
-	memset(saa, 0, sizeof(*saa));
 	saa->user = 0;
 	/* reset the saa7146 */
 	saawrite(0xffff0000, SAA7146_MC1);
@@ -2062,16 +2061,16 @@ static int __devinit init_saa7146(struct
 	}
 	if (saa->audbuf == NULL && (saa->audbuf = vmalloc(65536)) == NULL) {
 		dev_err(&pdev->dev, "%d: malloc failed\n", saa->nr);
-		goto errvid;
+		goto errfree;
 	}
 	if (saa->osdbuf == NULL && (saa->osdbuf = vmalloc(131072)) == NULL) {
 		dev_err(&pdev->dev, "%d: malloc failed\n", saa->nr);
-		goto erraud;
+		goto errfree;
 	}
 	/* allocate 81920 byte buffer for clipping */
 	if ((saa->dmavid2 = kzalloc(VIDEO_CLIPMAP_SIZE, GFP_KERNEL)) == NULL) {
 		dev_err(&pdev->dev, "%d: clip kmalloc failed\n", saa->nr);
-		goto errosd;
+		goto errfree;
 	}
 	/* setup clipping registers */
 	saawrite(virt_to_bus(saa->dmavid2), SAA7146_BASE_EVEN2);
@@ -2085,15 +2084,11 @@ static int __devinit init_saa7146(struct
 	I2CBusScan(saa);
 
 	return 0;
-errosd:
+errfree:
 	vfree(saa->osdbuf);
-	saa->osdbuf = NULL;
-erraud:
 	vfree(saa->audbuf);
-	saa->audbuf = NULL;
-errvid:
 	vfree(saa->vidbuf);
-	saa->vidbuf = NULL;
+	saa->audbuf = saa->osdbuf = saa->vidbuf = NULL;
 err:
 	return -ENOMEM;
 }



--- NEW FILE patch-2.6.16-rc1-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD4GuzyGugalF9Dw4RAsLkAJ4h3+3v3iJxJT9naRD5r7MRwESrVQCfUknE
iwqTsgBCvn2WOrSZN9OwRig=
=t7rA
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	31 Jan 2006 21:26:16 -0000	1.11
+++ .cvsignore	2 Feb 2006 14:04:14 -0000	1.12
@@ -2,9 +2,8 @@
 temp-*
 kernel-xen-2.6.15
 linux-2.6.15.tar.bz2
-bcm43xx-20060114.tar.bz2
 patch-2.6.16-rc1.bz2
-patch-2.6.16-rc1-git4.bz2
-xen-20060127a.tar.bz2
-
+bcm43xx-20060114.tar.bz2
 acpi-release-20060113-2.6.16-rc1.diff.bz2
+xen-20060127a.tar.bz2
+patch-2.6.16-rc1-git5.bz2


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/Makefile.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.config	2 Feb 2006 13:30:49 -0000	1.3
+++ Makefile.config	2 Feb 2006 14:04:14 -0000	1.4
@@ -7,7 +7,7 @@
 CONFIGFILES	= \
 	$(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \
 	$(CFG)-i586.config \
-	$(CFG)-x86_64.config \
+	$(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \
 	$(CFG)-ppc64iseries.config \
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
@@ -83,6 +83,9 @@
 kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic 
 	perl scripts/merge.pl $^ x86_64 > $@
 
+kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic 
+	perl scripts/merge.pl $^ x86_64 > $@
+
 kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic 
 	perl scripts/merge.pl $^ sparc > $@
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kernel-xen.spec	2 Feb 2006 13:30:48 -0000	1.36
+++ kernel-xen.spec	2 Feb 2006 14:04:14 -0000	1.37
@@ -70,6 +70,7 @@
 
 %ifarch x86_64
 %define buildsmp 0
+%define buildkdump 1
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -211,6 +212,7 @@
 Source31: kernel-%{kversion}-i686-hypervisor.config
 Source32: kernel-%{kversion}-i686-guest.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
@@ -221,7 +223,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc1.bz2
-Patch2: patch-2.6.16-rc1-git4.bz2
+Patch2: patch-2.6.16-rc1-git5.bz2
 Patch3: drm.patch
 Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2
 
@@ -375,9 +377,8 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-net-fix-iptables.patch
-Patch1870: linux-2.6-net-slab-corruption.patch
 Patch1880: linux-2.6-suspend-memhotplug-oops.patch
+Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -403,6 +404,10 @@
 
 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
@@ -422,7 +427,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
@@ -944,12 +949,10 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Make iptables work again
-%patch1860 -p1
-# Fix netlayer slab corruption
-%patch1870 -p1
 # Fix software suspend on kernels without memory hotplug.
 %patch1880 -p1
+# Fix oops in stradis on init
+%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -992,6 +995,9 @@
 #
 %patch10000 -p1
 
+# Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
+%patch10001 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1086,12 +1092,11 @@
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
-%if "%{buildkdump}" == "1"
-    if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then
+
+    if [ "$1" == "kdump" ]; then
         cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
         rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     fi
-%endif
 
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
@@ -1309,7 +1314,8 @@
 /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
@@ -1320,7 +1326,8 @@
 /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
@@ -1332,30 +1339,59 @@
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-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}-hypervisor-%{_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 hypervisor-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor-PAE
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post hypervisor-PAE-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-hypervisor-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 guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-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}-guest-%{_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 guest-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post guest-PAE-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-guest-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
 
 %post kdump-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}-kdump-%{_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
@@ -1373,10 +1409,18 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
 
+%preun hypervisor-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
+
 %preun guest
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
 
+%preun guest-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
+
 
 ###
 ### file lists
@@ -1531,8 +1575,29 @@
 
 %changelog
 * Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
+- merged with rawhide 1985.
+
+* Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
 - Add PAE hypervisor & guest kernel, disabled by default.
 
+* Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
+- Woo, 2.6.16rc1-git5 (at last)
+- Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
+- Disable a bunch of drivers for SBC's that won't run Fedora.
+- Reenable building of firmware for QLogic HBA's.
+- Add a bunch of missing newlines & the like to module init's.
+- Fix up broken DVB kobject use.
+- Fixed an oops in the stradis driver initialisation.
+- Happy Birthday to "The Yellow Dart".
+
+* Tue Jan 31 2006 Dave Jones <<davej at redhat.com>
+- Remove prereq on hardlink, making hardlinking of -devel packages optional
+- Further improvements to the 'dont want to hardlink' case.
+  Now checks for HARDLINK="no" in /etc/sysconfig/kernel
+
+* Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
+- Enable x86-64 kdumping, and kdump related specfile cleanup.
+
 * Tue Jan 31 2006 Juan Quintela <quintela at redhat.com>
 - Merge with rawhide 1884.
 - kdump don't work yet at xen.

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-selinux-mprotect-checks.patch	31 Jan 2006 21:26:16 -0000	1.1
+++ linux-2.6-selinux-mprotect-checks.patch	2 Feb 2006 14:04:16 -0000	1.2
@@ -1,103 +1,31 @@
 
-From: Stephen Smalley <sds at tycho.nsa.gov>
 
-Fix the SELinux mprotect checks on executable mappings so that they are not
-re-applied when the mapping is already executable as well as cleaning up
-the code.  This avoids a situation where e.g.  an application is prevented
-from removing PROT_WRITE on an already executable mapping previously
-authorized via execmem permission due to an execmod denial.
-
-Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
-Acked-by: James Morris <jmorris at namei.org>
-Signed-off-by: Andrew Morton <akpm at osdl.org>
----
-
- security/selinux/hooks.c |   50 +++++++++++++++----------------------
- 1 files changed, 21 insertions(+), 29 deletions(-)
-
-diff -puN security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks security/selinux/hooks.c
---- devel/security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks	2006-01-23 16:41:27.000000000 -0800
-+++ devel-akpm/security/selinux/hooks.c	2006-01-23 16:41:27.000000000 -0800
-@@ -2452,35 +2452,27 @@ static int selinux_file_mprotect(struct 
+--- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
++++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
+@@ -2451,7 +2451,6 @@ static int selinux_file_mprotect(struct 
+ 	if (selinux_checkreqprot)
  		prot = reqprot;
  
- #ifndef CONFIG_PPC32
--	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
--	   (vma->vm_start >= vma->vm_mm->start_brk &&
--	    vma->vm_end <= vma->vm_mm->brk)) {
--	    	/*
--		 * We are making an executable mapping in the brk region.
--		 * This has an additional execheap check.
--		 */
--		rc = task_has_perm(current, current, PROCESS__EXECHEAP);
--		if (rc)
--			return rc;
--	}
--	if (vma->vm_file != NULL && vma->anon_vma != NULL && (prot & PROT_EXEC)) {
--		/*
--		 * We are making executable a file mapping that has
--		 * had some COW done. Since pages might have been written,
--		 * check ability to execute the possibly modified content.
--		 * This typically should only occur for text relocations.
--		 */
+-#ifndef CONFIG_PPC32
+ 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
+ 	   (vma->vm_start >= vma->vm_mm->start_brk &&
+ 	    vma->vm_end <= vma->vm_mm->brk)) {
+@@ -2470,7 +2469,9 @@ static int selinux_file_mprotect(struct 
+ 		 * check ability to execute the possibly modified content.
+ 		 * This typically should only occur for text relocations.
+ 		 */
 -		int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
--		if (rc)
--			return rc;
--	}
--	if (!vma->vm_file && (prot & PROT_EXEC) &&
--		vma->vm_start <= vma->vm_mm->start_stack &&
--		vma->vm_end >= vma->vm_mm->start_stack) {
--		/* Attempt to make the process stack executable.
--		 * This has an additional execstack check.
--		 */
--		rc = task_has_perm(current, current, PROCESS__EXECSTACK);
-+	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
-+		rc = 0;
-+		if (vma->vm_start >= vma->vm_mm->start_brk &&
-+		    vma->vm_end <= vma->vm_mm->brk) {
-+			rc = task_has_perm(current, current,
-+					   PROCESS__EXECHEAP);
-+		} else if (!vma->vm_file &&
-+			   vma->vm_start <= vma->vm_mm->start_stack &&
-+			   vma->vm_end >= vma->vm_mm->start_stack) {
-+			rc = task_has_perm(current, current, PROCESS__EXECSTACK);
-+		} else if (vma->vm_file && vma->anon_vma) {
-+			/*
-+			 * We are making executable a file mapping that has
-+			 * had some COW done. Since pages might have been
-+			 * written, check ability to execute the possibly
-+			 * modified content.  This typically should only
-+			 * occur for text relocations.
-+			 */
-+			rc = file_has_perm(current, vma->vm_file,
-+					   FILE__EXECMOD);
-+		}
++#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
++		rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
++#endif
  		if (rc)
  			return rc;
  	}
-_
-Index: linux-2.6/security/selinux/hooks.c
-===================================================================
-RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/hooks.c,v
-retrieving revision 1.178
-diff -u -p -r1.178 hooks.c
---- linux-2.6/security/selinux/hooks.c	19 Jan 2006 21:04:27 -0000	1.178
-+++ linux-2.6/security/selinux/hooks.c	26 Jan 2006 19:16:22 -0000
-@@ -2366,7 +2366,7 @@ static int selinux_file_ioctl(struct fil
- 
- static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
- {
--#ifndef CONFIG_PPC32
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
- 	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
- 		/*
- 		 * We are making executable an anonymous mapping or a
-@@ -2424,7 +2424,7 @@ static int selinux_file_mprotect(struct 
- 	if (selinux_checkreqprot)
- 		prot = reqprot;
+@@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
+ 		if (rc)
+ 			return rc;
+ 	}
+-#endif
  
--#ifndef CONFIG_PPC32
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
- 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
- 		rc = 0;
- 		if (vma->vm_start >= vma->vm_mm->start_brk &&
+ 	return file_map_prot_check(vma->vm_file, prot, vma->vm_flags&VM_SHARED);
+ }


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	31 Jan 2006 21:26:17 -0000	1.11
+++ sources	2 Feb 2006 14:04:16 -0000	1.12
@@ -1,8 +1,6 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
 fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
-a247c21e1202f514283ba928d9382353  patch-2.6.16-rc1-git4.bz2
 07de3270c9a5c63915a209cd36def02e  xen-20060127a.tar.bz2
-
-
 3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2
+38954e4fe6dbf902e854f456b675f60f  patch-2.6.16-rc1-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upstream	26 Jan 2006 22:14:35 -0000	1.5
+++ upstream	2 Feb 2006 14:04:28 -0000	1.6
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc1.bz2
-patch-2.6.16-rc1-git4.bz2
+patch-2.6.16-rc1-git5.bz2


--- linux-2.6-net-fix-iptables.patch DELETED ---


--- linux-2.6-net-slab-corruption.patch DELETED ---


--- patch-2.6.16-rc1-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:08:28 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.37,1.38
Message-ID: <200602021408.k12E8Ske013319@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
enable PAE


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kernel-xen.spec	2 Feb 2006 14:04:14 -0000	1.37
+++ kernel-xen.spec	2 Feb 2006 14:08:25 -0000	1.38
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 0
+%define includexenPAE 1
 %define builddoc 0
 %define buildkdump 0
 
@@ -1576,6 +1576,7 @@
 %changelog
 * Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
 - merged with rawhide 1985.
+- enable PAE for this run.
 
 * Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
 - Add PAE hypervisor & guest kernel, disabled by default.



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:14:18 -0500
Subject: rpms/hplip/devel hplip-0.9.8-1.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 hplip.spec, 1.41, 1.42 sources, 1.6,
	1.7 hplip-0.9.7-2.patch, 1.1, NONE hplip-initscript.patch, 1.1, NONE
Message-ID: <200602021414.k12EEImh016023@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15975

Modified Files:
	.cvsignore hplip.spec sources 
Added Files:
	hplip-0.9.8-1.patch 
Removed Files:
	hplip-0.9.7-2.patch hplip-initscript.patch 
Log Message:
* Thu Feb  2 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-1
- 0.9.8.
- No longer need initscript patch.
- Don't package hpfax yet.


hplip-0.9.8-1.patch:
 Makefile.am |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE hplip-0.9.8-1.patch ---
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am	2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am	2006-02-01 14:36:59.257837400 -0800
@@ -265,6 +265,9 @@
 	if [ "$(rpm_install)" = "no" ]; then \
 	   $(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
 	fi
+	if [ -f prnt/hpijs/ppd/HP-Fax-hplip.ppd ]; then \
+	   rm -f prnt/hpijs/ppd/HP-Fax-hplip.ppd; \
+	fi
 	cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
 
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Nov 2005 14:23:34 -0000	1.6
+++ .cvsignore	2 Feb 2006 14:14:15 -0000	1.7
@@ -3,3 +3,4 @@
 hplip-0.9.5.tar.gz
 hplip-0.9.6.tar.gz
 hplip-0.9.7.tar.gz
+hplip-0.9.8.tar.gz


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- hplip.spec	18 Jan 2006 11:50:42 -0000	1.41
+++ hplip.spec	2 Feb 2006 14:14:15 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.7
-Release: 8
+Version: 0.9.8
+Release: 1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -11,8 +11,7 @@
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-0.9.7-2.patch
-Patch5: hplip-initscript.patch
+Patch4: hplip-0.9.8-1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -65,11 +64,8 @@
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply patch 0.9.7-2
-%patch4 -p1 -b .0.9.7-2
-
-# Fix initscript (bug #176966).
-%patch5 -p1 -b .initscript
+# Apply patch 0.9.8-1
+%patch4 -p1 -b .0.9.8-1
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -109,6 +105,9 @@
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
+# Don't package hpfax yet.
+rm -f %{buildroot}%{_libdir}/cups/backend/hpfax
+
 %clean
 rm -rf %{buildroot}
 
@@ -156,6 +155,11 @@
 fi
 
 %changelog
+* Thu Feb  2 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-1
+- 0.9.8.
+- No longer need initscript patch.
+- Don't package hpfax yet.
+
 * Wed Jan 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.7-8
 - Don't package PPD files.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Nov 2005 14:23:34 -0000	1.6
+++ sources	2 Feb 2006 14:14:15 -0000	1.7
@@ -1 +1 @@
-d2ee27d7c347f549306a880561c5030a  hplip-0.9.7.tar.gz
+3eae08ec7dbecdc03e7972b132dfdde6  hplip-0.9.8.tar.gz


--- hplip-0.9.7-2.patch DELETED ---


--- hplip-initscript.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:16:58 -0500
Subject: rpms/audit/FC-4 audit.spec,1.52,1.53
Message-ID: <200602021416.k12EGwe8021166@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
	audit.spec 
Log Message:
Minor edit of spec file



Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/audit.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- audit.spec	2 Feb 2006 14:00:41 -0000	1.52
+++ audit.spec	2 Feb 2006 14:16:54 -0000	1.53
@@ -129,7 +129,7 @@
 - Add timestamp to daemon_config messages (#174865)
 - Add error checking of year for aureport & ausearch
 - Treat af_unix sockets as files for searching and reporting
-- Update capp & lspp rules to combine syscalls for higher performance
+- Update capp rules to combine syscalls for higher performance
 - Apply patch from Ulrich Drepper that optimizes resource utilization
 - Change ausearch and aureport to unlocked IO
 - Add more message types
@@ -137,21 +137,21 @@
 - Add locale code in ausearch and aureport
 - Cleanup make files
 
-* Tue Nov 8 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-2
+* Tue Nov 8 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-2.fc4
 - Fix sendmail error handler. Bug report from Dustin Kirkland of IBM.
 
-* Mon Nov 7 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-1
+* Mon Nov 7 2005 Steve Grubb <sgrubb at redhat.com> 1.0.12-1.fc4
 - Add 2 more summary reports
 - Add 2 more message types
 
-* Sun Nov 6 2005 Steve Grubb <sgrubb at redhat.com> 1.0.11-1
+* Sun Nov 6 2005 Steve Grubb <sgrubb at redhat.com> 1.0.11-1.fc4
 - Fix memory leaks in aureport & ausearch
 - Fix auditd reconfig to change mail accts, too
 - Fix stray pointer in sorting of aureport
 - Added new message type
 - Add results to all DAEMON messages
 
-* Fri Nov 4 2005 Steve Grubb <sgrubb at redhat.com> 1.0.10-1
+* Fri Nov 4 2005 Steve Grubb <sgrubb at redhat.com> 1.0.10-1.fc4
 - Add --failed/success flags to aureport to select specific events for reports
 - Add --summary to get totals of reported objects
 - Add ability to force log rotation by sending sigusr1 to auditd
@@ -159,7 +159,7 @@
 - Reformat aureports so date & time are always given
 - Add cron script for log rotation to docs
 
-* Wed Nov 2 2005 Steve Grubb <sgrubb at redhat.com> 1.0.9-1
+* Wed Nov 2 2005 Steve Grubb <sgrubb at redhat.com> 1.0.9-1.fc4
 - Updated message types that auditd recognizes
 - Added a couple more message types
 - Added new standard logging format function



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:46:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:46:35 -0500
Subject: rpms/fontconfig/devel fontconfig-2.3.91-crosscheck.patch, 1.1,
	NONE fontconfig-2.3.93-defaultconfig.patch, 1.2,
	NONE fontconfig-2.3.93-globaldir.patch, 1.1,
	NONE fontconfig-2.3.93-normalize.patch, 1.1,
	NONE fontconfig-nodocs.patch, 1.1, NONE
Message-ID: <200602021446.k12EkZxV017269@cvs.devel.redhat.com>

Author: mclasen

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

Removed Files:
	fontconfig-2.3.91-crosscheck.patch 
	fontconfig-2.3.93-defaultconfig.patch 
	fontconfig-2.3.93-globaldir.patch 
	fontconfig-2.3.93-normalize.patch fontconfig-nodocs.patch 
Log Message:
Remove old patches to make room for new ones...



--- fontconfig-2.3.91-crosscheck.patch DELETED ---


--- fontconfig-2.3.93-defaultconfig.patch DELETED ---


--- fontconfig-2.3.93-globaldir.patch DELETED ---


--- fontconfig-2.3.93-normalize.patch DELETED ---


--- fontconfig-nodocs.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:47:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:47:05 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.120.ooo52428.execshield.bridges.patch, 1.2,
	1.3 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.10,
	1.11 openoffice.org.spec, 1.614, 1.615
Message-ID: <200602021447.k12El55K020147@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20116

Modified Files:
	openoffice.org-1.9.120.ooo52428.execshield.bridges.patch 
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org.spec 
Log Message:
rejig problematic patches

openoffice.org-1.9.120.ooo52428.execshield.bridges.patch:
 bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx  |   20 ++++++-
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   14 ++---
 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |   17 ++----
 bridges/source/cpp_uno/shared/vtablefactory.cxx       |   50 +++++++++++++++---
 inc/bridges/cpp_uno/shared/vtablefactory.hxx          |    0 
 sal/rtl/source/alloc.c                                |    2 
 source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx           |    0 
 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx         |    0 
 source/cpp_uno/shared/vtablefactory.cxx               |    0 
 9 files changed, 76 insertions(+), 27 deletions(-)

Index: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.120.ooo52428.execshield.bridges.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.120.ooo52428.execshield.bridges.patch	26 Jan 2006 08:49:35 -0000	1.2
+++ openoffice.org-1.9.120.ooo52428.execshield.bridges.patch	2 Feb 2006 14:47:01 -0000	1.3
@@ -1,95 +1,244 @@
-Index: source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+--- openoffice.org.orig/sal/rtl/source/alloc.c	2006-01-24 09:07:22.000000000 +0000
++++ openoffice.org/sal/rtl/source/alloc.c	2006-01-24 09:07:37.000000000 +0000
+@@ -104,7 +104,7 @@
+ #endif /* FREEBSD || NETBSD || MACOSX || IRIX || LINUX || SOLARIS */
+ 
+ #ifndef PROT_HEAP
+-#define PROT_HEAP (PROT_READ | PROT_WRITE | PROT_EXEC)
++#define PROT_HEAP (PROT_READ | PROT_WRITE)
+ #endif
+ 
+ /* #95880# building on Solaris 8 provides MAP_ANON, but it
+Index: inc/bridges/cpp_uno/shared/vtablefactory.hxx
 ===================================================================
-RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 cpp2uno.cxx
---- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	17 Jun 2005 09:51:58 -0000	1.8
-+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	23 Jul 2005 14:19:14 -0000
-@@ -71,6 +71,12 @@
+RCS file: /cvs/udk/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 vtablefactory.hxx
+--- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	7 Sep 2005 22:10:27 -0000	1.4
++++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	2 Feb 2006 10:19:28 -0000
+@@ -45,6 +45,20 @@
  
- #include "share.hxx"
+ namespace bridges { namespace cpp_uno { namespace shared {
  
-+#include <sys/mman.h>
-+#include <limits.h>    /* for PAGESIZE */
-+#ifndef PAGESIZE
-+#define PAGESIZE 4096
-+#endif
++class ExecBlock
++{
++private:
++    size_t mnOSSize;
++    void *mpBlock;
++public:
++    ExecBlock(size_t nSize);
++    ExecBlock() : mpBlock(0) {}
++    ~ExecBlock();
++    void AllowExec();
++    void* contents() { return mpBlock; }
++};
++
 +
- using namespace ::com::sun::star::uno;
+ /** Hand out vtable structures for interface type descriptions.
+  */
+ class VtableFactory {
+@@ -65,7 +79,7 @@ public:
+             mapBlockToVtable).  Also, the block contains any generated code
+             snippets, after the vtable itself.</p>
+          */
+-        char ** blocks;
++        ExecBlock ** blocks;
+     };
+ 
+     VtableFactory();
+@@ -81,7 +95,7 @@ public:
+     // defined individually for each CPP--UNO bridge:
+     /** Given a pointer to a block, turn it into a vtable pointer.
+      */
+-    static void ** mapBlockToVtable(char * block);
++    static void ** mapBlockToVtable(ExecBlock * block);
+ 
+ private:
+     class GuardedBlocks;
+@@ -107,7 +121,7 @@ private:
+         destructor) within the returned vtable block
+         @return  the start address of the raw vtable block
+      */
+-    static char * createBlock(sal_Int32 slotCount, void *** slots);
++    static ExecBlock *createBlock(sal_Int32 slotCount, void *** slots);
+ 
+     // This function is not defined in the generic part, but instead has to be
+     // defined individually for each CPP--UNO bridge:
+Index: source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 cpp2uno.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	7 Sep 2005 22:21:19 -0000	1.9
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2 Feb 2006 10:19:28 -0000
+@@ -415,20 +415,20 @@ unsigned char * codeSnippet(
  
- namespace
-@@ -446,11 +452,19 @@ void ** bridges::cpp_uno::shared::Vtable
-     return reinterpret_cast< void ** >(block) + 2;
  }
  
-+static char *create_executable_block(size_t nSize)
-+{
-+    char * block = new char[nSize];
-+    char *p = (char *)(((int) block + PAGESIZE-1) & ~(PAGESIZE-1));
-+    mprotect(p, nSize, PROT_READ | PROT_WRITE | PROT_EXEC);
-+    return block;
-+}
-+
- char * bridges::cpp_uno::shared::VtableFactory::createBlock(
+-void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(char * block)
++void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(bridges::cpp_uno::shared::ExecBlock * block)
+ {
+-    return reinterpret_cast< void ** >(block) + 2;
++    return reinterpret_cast< void ** >(block->contents()) + 2;
+ }
+ 
+-char * bridges::cpp_uno::shared::VtableFactory::createBlock(
++bridges::cpp_uno::shared::ExecBlock* bridges::cpp_uno::shared::VtableFactory::createBlock(
      sal_Int32 slotCount, void *** slots)
  {
 -    char * block = new char[
 -        (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize];
+-    *slots = mapBlockToVtable(block);
 +    size_t nSize = (slotCount + 2) * sizeof(void *) + slotCount * codeSnippetSize;
-+    char * block = create_executable_block(nSize);
-     *slots = mapBlockToVtable(block);
++    bridges::cpp_uno::shared::ExecBlock *pBlock = new bridges::cpp_uno::shared::ExecBlock(nSize);
++    *slots = mapBlockToVtable(pBlock);
      (*slots)[-2] = 0;
      (*slots)[-1] = 0;
+-    return block;
++    return pBlock;
+ }
+ 
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 Index: source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx,v
 retrieving revision 1.7
 diff -u -p -u -r1.7 cpp2uno.cxx
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	7 Sep 2005 22:22:31 -0000	1.7
-+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	26 Jan 2006 09:11:47 -0000
-@@ -44,7 +44,11 @@
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	2 Feb 2006 10:19:28 -0000
+@@ -655,23 +655,20 @@ void bridges::cpp_uno::shared::VtableFac
+   __asm__ volatile ( "sync;" "isync;" : : : "memory");
+ }
  
- #include "share.hxx"
- // #include <stdio.h>
 -
-+#include <sys/mman.h>
-+#include <limits.h>    /* for PAGESIZE */
-+#ifndef PAGESIZE
-+#define PAGESIZE 4096
-+#endif
- 
- using namespace ::com::sun::star::uno;
- 
-@@ -662,12 +666,19 @@ void ** bridges::cpp_uno::shared::Vtable
-     return reinterpret_cast< void ** >(block) + 2;
+-
+-void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(char * block)
++void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(bridges::cpp_uno::shared::ExecBlock * block)
+ {
+-    return reinterpret_cast< void ** >(block) + 2;
++    return reinterpret_cast< void ** >(block->contents()) + 2;
  }
  
-+static char *create_executable_block(size_t nSize)
-+{
-+    char * block = new char[nSize];
-+    char *p = (char *)(((int) block + PAGESIZE-1) & ~(PAGESIZE-1));
-+    mprotect(p, nSize, PROT_READ | PROT_WRITE | PROT_EXEC);
-+    return block;
-+}
- 
- char * bridges::cpp_uno::shared::VtableFactory::createBlock(
+-
+-char * bridges::cpp_uno::shared::VtableFactory::createBlock(
++bridges::cpp_uno::shared::ExecBlock* bridges::cpp_uno::shared::VtableFactory::createBlock(
      sal_Int32 slotCount, void *** slots)
  {
 -    char * block = new char[
 -        (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize];
+-    *slots = mapBlockToVtable(block);
 +    size_t nSize = (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize;
-+    char * block = create_executable_block(nSize);
-     *slots = mapBlockToVtable(block);
++    bridges::cpp_uno::shared::ExecBlock *pBlock = new bridges::cpp_uno::shared::ExecBlock(nSize);
++    *slots = mapBlockToVtable(pBlock);
      (*slots)[-2] = 0;
      (*slots)[-1] = 0;
---- openoffice.org.orig/sal/rtl/source/alloc.c	2006-01-24 09:07:22.000000000 +0000
-+++ openoffice.org/sal/rtl/source/alloc.c	2006-01-24 09:07:37.000000000 +0000
-@@ -104,7 +104,7 @@
- #endif /* FREEBSD || NETBSD || MACOSX || IRIX || LINUX || SOLARIS */
+-    return block;
++    return pBlock;
+ }
  
- #ifndef PROT_HEAP
--#define PROT_HEAP (PROT_READ | PROT_WRITE | PROT_EXEC)
-+#define PROT_HEAP (PROT_READ | PROT_WRITE)
- #endif
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+Index: source/cpp_uno/shared/vtablefactory.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/shared/vtablefactory.cxx,v
+retrieving revision 1.4
+diff -u -p -u -r1.4 vtablefactory.cxx
+--- openoffice.org.orig/bridges/source/cpp_uno/shared/vtablefactory.cxx	7 Sep 2005 22:35:41 -0000	1.4
++++ openoffice.org/bridges/source/cpp_uno/shared/vtablefactory.cxx	2 Feb 2006 10:19:28 -0000
+@@ -45,12 +45,48 @@
+ #include "sal/types.h"
+ #include "typelib/typedescription.hxx"
  
- /* #95880# building on Solaris 8 provides MAP_ANON, but it
++#include <sys/mman.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
+ #include <hash_map>
+ #include <vector>
+ 
+ using bridges::cpp_uno::shared::VtableFactory;
++using bridges::cpp_uno::shared::ExecBlock;
++
++ExecBlock::~ExecBlock()
++{
++//    fprintf(stderr, "unmapping %x\n", mpBlock);
++    if (mpBlock) munmap(mpBlock, mnOSSize);
++}
++
++ExecBlock::ExecBlock(size_t nSize) : mnOSSize(nSize)
++{
++    size_t nPAGESIZE = sysconf(_SC_PAGESIZE);
++//    fprintf(stderr, "PAGESIZE is %d\n", nPAGESIZE);
++    if (mnOSSize % nPAGESIZE)
++    {
++        /* round up to the next page sized boundary one */
++        mnOSSize &= ~(nPAGESIZE-1);
++        mnOSSize += nPAGESIZE;
++    }
++    mpBlock = mmap(NULL, mnOSSize, PROT_READ|PROT_WRITE, 
++        MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
++    if (mpBlock == (void*)-1)
++        perror("mmap for executable block failed\n");
++//    fprintf(stderr, "mapping %x\n", mpBlock);
++}
++
++void ExecBlock::AllowExec()
++{
++//    fprintf(stderr, "making %x executable\n", mpBlock);
++    if (mprotect(mpBlock, mnOSSize, PROT_READ | PROT_EXEC))
++        perror("damn your black heart selinux!");
++}
+ 
+-class VtableFactory::GuardedBlocks: public std::vector< char * > {
++class VtableFactory::GuardedBlocks: public std::vector< ExecBlock * > {
+ public:
+     GuardedBlocks(): m_guarded(true) {}
+ 
+@@ -68,7 +104,7 @@ private:
+ VtableFactory::GuardedBlocks::~GuardedBlocks() {
+     if (m_guarded) {
+         for (iterator i(begin()); i != end(); ++i) {
+-            delete[] *i;
++            delete *i;
+         }
+     }
+ }
+@@ -111,7 +147,7 @@ VtableFactory::~VtableFactory() {
+     osl::MutexGuard guard(m_mutex);
+     for (Map::iterator i(m_map.begin()); i != m_map.end(); ++i) {
+         for (sal_Int32 j = 0; j < i->second.count; ++j) {
+-            delete[] i->second.blocks[j];
++            delete i->second.blocks[j];
+         }
+         delete[] i->second.blocks;
+     }
+@@ -129,8 +165,8 @@ VtableFactory::Vtables VtableFactory::ge
+         Vtables vtables;
+         OSL_ASSERT(blocks.size() <= SAL_MAX_INT32);
+         vtables.count = static_cast< sal_Int32 >(blocks.size());
+-        bridges::cpp_uno::shared::GuardedArray< char * > guardedBlocks(
+-            new char *[vtables.count]);
++        bridges::cpp_uno::shared::GuardedArray< ExecBlock * > guardedBlocks(
++            new ExecBlock *[vtables.count]);
+         vtables.blocks = guardedBlocks.get();
+         for (sal_Int32 j = 0; j < vtables.count; ++j) {
+             vtables.blocks[j] = blocks[j];
+@@ -150,8 +186,9 @@ void VtableFactory::createVtables(
+         sal_Int32 slotCount
+             = bridges::cpp_uno::shared::getPrimaryFunctions(type);
+         void ** slots;
+-        bridges::cpp_uno::shared::GuardedArray< char > block(
++        bridges::cpp_uno::shared::GuardedArray< bridges::cpp_uno::shared::ExecBlock > block(
+             createBlock(slotCount, &slots));
++//	fprintf(stderr, "createBlock of %x\n", block.get()->contents());
+         slots += slotCount;
+         unsigned char * codeBegin = reinterpret_cast< unsigned char * >(slots);
+         unsigned char * code = codeBegin;
+@@ -168,6 +205,7 @@ void VtableFactory::createVtables(
+                 functionCount, vtableOffset);
+         }
+         flushCode(codeBegin, code);
++        block.get()->AllowExec();
+         blocks.push_back(block.get());
+         block.release();
+     }

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   15 
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 
 framework/source/services/substitutepathvars.cxx                     |   93 +++
 framework/util/makefile.mk                                           |    1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs           |    8 
 registry/schema/org/openoffice/Office/Common.xcs                     |    0 
 sfx2/source/appl/sfxhelp.cxx                                         |   66 ++
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  244 +++++-----
 svx/source/dialog/optgdlg.hxx                                        |    4 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 
 tools/source/rc/resmgr.cxx                                           |   19 
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   24 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    8 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    4 
 30 files changed, 350 insertions(+), 185 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Dec 2005 10:34:55 -0000	1.10
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Feb 2006 14:47:01 -0000	1.11
@@ -553,14 +553,104 @@
  	url = url + ret;
  	
  	// first of all, try do determine whether there are any *.tree files present
-Index: source/dialog/optgdlg.cxx
+Index: optgdlg.cxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/dialog/optgdlg.cxx,v
-retrieving revision 1.24
-diff -u -p -u -r1.24 optgdlg.cxx
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	8 Sep 2005 21:42:52 -0000	1.24
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx	26 Oct 2005 09:45:33 -0000
-@@ -1573,53 +1573,17 @@ BOOL OfaLanguagesTabPage::FillItemSet( S
+retrieving revision 1.28
+diff -u -r1.28 optgdlg.cxx
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	5 Jan 2006 17:58:40 -0000	1.28
++++ openoffice.org/svx/source/dialog/optgdlg.cxx	1 Feb 2006 11:04:37 -0000
+@@ -1183,8 +1183,6 @@
+ /* -----------------------------23.11.00 13:06--------------------------------
+ 
+  ---------------------------------------------------------------------------*/
+-static sal_Bool bLanguageCurrentDoc_Impl = sal_False;
+-
+ // some things we'll need...
+ static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
+ static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+@@ -1545,70 +1543,27 @@
+     BOOL bRet = FALSE;
+ 	SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
+ 	Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
+-	BOOL bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
+-    if(aCurrentDocCB.IsEnabled())
+-        bLanguageCurrentDoc_Impl = bCurrentDocCBChecked;
+-	BOOL bCurrentDocCBChanged = bCurrentDocCBChecked != aCurrentDocCB.GetSavedValue();
+ 
+-	BOOL bValChanged = aWesternLanguageLB.GetSavedValue() != aWesternLanguageLB.GetSelectEntryPos();
+-	if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
++	BOOL bValChanged = pCurrentDocShell && (aWesternLanguageLB.GetSavedValue() != aWesternLanguageLB.GetSelectEntryPos());
++	if(bValChanged)
+ 	{
+ 		LanguageType eSelectLang = aWesternLanguageLB.GetSelectLanguage();
+-		if(!bCurrentDocCBChecked)
+-		{
+-			Any aValue;
+-			Locale aLocale = SvxCreateLocale( eSelectLang );
+-			aValue <<= aLocale;
+-			OUString aPropName( C2U("DefaultLocale") );
+-            pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
+-            if (xLinguProp.is())
+-				xLinguProp->setPropertyValue( aPropName, aValue );
+-		}
+-		if(pCurrentDocShell)
+-		{
+-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_LANGUAGE));
+-			bRet = TRUE;
+-		}
++		rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_LANGUAGE));
++		bRet = TRUE;
+ 	}
+ 	bValChanged = aAsianLanguageLB.GetSavedValue() != aAsianLanguageLB.GetSelectEntryPos();
+-	if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
++	if(bValChanged)
+ 	{
+ 		LanguageType eSelectLang = aAsianLanguageLB.GetSelectLanguage();
+-		if(!bCurrentDocCBChecked)
+-		{
+-			Any aValue;
+-			Locale aLocale = SvxCreateLocale( eSelectLang );
+-			aValue <<= aLocale;
+-			OUString aPropName( C2U("DefaultLocale_CJK") );
+-            pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
+-            if (xLinguProp.is())
+-				xLinguProp->setPropertyValue( aPropName, aValue );
+-		}
+-		if(pCurrentDocShell)
+-		{
+-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CJK_LANGUAGE));
+-			bRet = TRUE;
+-		}
++		rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CJK_LANGUAGE));
++		bRet = TRUE;
+ 	}
+ 	bValChanged = aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos();
+-	if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
++	if(bValChanged)
+ 	{
+ 		LanguageType eSelectLang = aComplexLanguageLB.GetSelectLanguage();
+-		if(!bCurrentDocCBChecked)
+-		{
+-			Any aValue;
+-			Locale aLocale = SvxCreateLocale( eSelectLang );
+-			aValue <<= aLocale;
+-			OUString aPropName( C2U("DefaultLocale_CTL") );
+-            pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
+-            if (xLinguProp.is())
+-				xLinguProp->setPropertyValue( aPropName, aValue );
+-		}
+-		if(pCurrentDocShell)
+-		{
+-			rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CTL_LANGUAGE));
+-			bRet = TRUE;
+-		}
++		rSet.Put(SvxLanguageItem(eSelectLang, SID_ATTR_CHAR_CTL_LANGUAGE));
++		bRet = TRUE;
+ 	}
+ 
+     if(aAsianSupportCB.GetSavedValue() != aAsianSupportCB.IsChecked() )
+@@ -1650,51 +1605,32 @@
  
  	return FALSE;
  }
@@ -580,12 +670,22 @@
 -    //
 -    aDecimalSeparatorCB.Check( pLangConfig->aSysLocaleOptions.IsDecimalSeparatorAsLocale());
 -    aDecimalSeparatorCB.SaveValue();
--
++void OfaLanguagesTabPage::LangToUI(LanguageType eCurLang, LanguageType eCurLangCJK, LanguageType eCurLangCTL)
++{
++    if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
++        aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
++	else
++		aWesternLanguageLB.SelectLanguage(eCurLang);
+ 
 -    // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
 -    // #i15812# must be done *before* the configured currency is set
 -    // and update the decimal separator used for the given locale
 -    LocaleSettingHdl(&aLocaleSettingLB);
--
++    if(LANGUAGE_NONE == eCurLangCJK || LANGUAGE_DONTKNOW == eCurLangCJK)
++        aAsianLanguageLB.SelectLanguage(LANGUAGE_NONE);
++	else
++		aAsianLanguageLB.SelectLanguage(eCurLangCJK);
+ 
 -    // configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default
 -    String aAbbrev;
 -    LanguageType eLang;
@@ -603,7 +703,12 @@
 -    aCurrencyLB.Enable(!bReadonly);
 -    aCurrencyFT.Enable(!bReadonly);
 -    aCurrencyFI.Show(bReadonly);
--
++    if(LANGUAGE_NONE == eCurLangCTL || LANGUAGE_DONTKNOW == eCurLangCTL)
++        aComplexLanguageLB.SelectLanguage(LANGUAGE_NONE);
++	else
++		aComplexLanguageLB.SelectLanguage(eCurLangCTL);
++}
+ 
 -	//western/CJK/CLK language
 -	LanguageType eCurLang = LANGUAGE_NONE;
 -	LanguageType eCurLangCJK = LANGUAGE_NONE;
@@ -618,26 +723,66 @@
 +    SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
      //collect the configuration values first
      aCurrentDocCB.Enable(FALSE);
-+    aCurrentDocCB.Hide();
      //
-     Any aWestLang;
-     Any aCJKLang;
-@@ -1643,8 +1607,12 @@ void OfaLanguagesTabPage::Reset( const S
+@@ -1717,45 +1653,89 @@
+     catch(Exception&)
+     {
+     }
++
++	LangToUI(eCurLang, eCurLangCJK, eCurLangCTL);
++
++	aWesternLanguageLB.SaveValue();
++	aAsianLanguageLB.SaveValue();
++	aComplexLanguageLB.SaveValue();
++
      //overwrite them by the values provided by the DocShell
      if(pCurrentDocShell)
  	{
+-        aCurrentDocCB.Enable(TRUE);
+-        aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
 +	    Link aLink( LINK( this, OfaLanguagesTabPage, RegisterModify ) );
 +	    aCurrentDocCB.SetClickHdl( aLink );
-+
-         aCurrentDocCB.Enable(TRUE);
-         aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
-+        aCurrentDocCB.Show();
++		sal_Bool bLanguageCurrentDoc_Impl=sal_False;
  		const SfxPoolItem* pLang;
  		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
++		{
  			eCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
-@@ -1674,11 +1642,51 @@ void OfaLanguagesTabPage::Reset( const S
- 	aAsianLanguageLB.SaveValue();
- 	aComplexLanguageLB.SaveValue();
++			bLanguageCurrentDoc_Impl = true;
++		}
+ 
+ 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pLang))
++		{
+ 			eCurLangCJK = ((const SvxLanguageItem*)pLang)->GetValue();
++			bLanguageCurrentDoc_Impl = true;
++		}
+ 
+ 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pLang))
++		{
+ 			eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue();
++			bLanguageCurrentDoc_Impl = true;
++		}
++        aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
++      	aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl);
+ 	}
+-    if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
+-        aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
+-	else
+-		aWesternLanguageLB.SelectLanguage(eCurLang);
+-
+-    if(LANGUAGE_NONE == eCurLangCJK || LANGUAGE_DONTKNOW == eCurLangCJK)
+-        aAsianLanguageLB.SelectLanguage(LANGUAGE_NONE);
+-	else
+-		aAsianLanguageLB.SelectLanguage(eCurLangCJK);
+ 
+-    if(LANGUAGE_NONE == eCurLangCTL || LANGUAGE_DONTKNOW == eCurLangCTL)
+-        aComplexLanguageLB.SelectLanguage(LANGUAGE_NONE);
+-	else
+-		aComplexLanguageLB.SelectLanguage(eCurLangCTL);
++	LangToUI(eCurLang, eCurLangCJK, eCurLangCTL);
+ 
+-	aWesternLanguageLB.SaveValue();
+-	aAsianLanguageLB.SaveValue();
+-	aComplexLanguageLB.SaveValue();
  	aCurrentDocCB.SaveValue();
 +}
  
@@ -691,7 +836,7 @@
  
      // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl
  #if 0
-@@ -1694,6 +1702,26 @@ void OfaLanguagesTabPage::Reset( const S
+@@ -1771,6 +1751,26 @@
  /* -----------------------------20.04.01 15:09--------------------------------
  
   ---------------------------------------------------------------------------*/
@@ -718,7 +863,7 @@
  IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
  {
  	DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-@@ -1701,7 +1729,9 @@ IMPL_LINK(  OfaLanguagesTabPage, Support
+@@ -1778,7 +1778,9 @@
      sal_Bool bCheck = pBox->IsChecked();
  	if ( &aAsianSupportCB == pBox )
  	{
@@ -729,7 +874,7 @@
          bCheck = ( bCheck && !bReadonly );
          aAsianLanguageFT.Enable( bCheck );
      	aAsianLanguageLB.Enable( bCheck );
-@@ -1711,7 +1741,9 @@ IMPL_LINK(  OfaLanguagesTabPage, Support
+@@ -1788,7 +1790,9 @@
  	}
  	else if ( &aCTLSupportCB == pBox )
  	{
@@ -740,20 +885,21 @@
          bCheck = ( bCheck && !bReadonly  );
          aComplexLanguageFT.Enable( bCheck );
      	aComplexLanguageLB.Enable( bCheck );
-Index: source/dialog/optgdlg.hxx
+Index: optgdlg.hxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/dialog/optgdlg.hxx,v
-retrieving revision 1.14
-diff -u -p -u -r1.14 optgdlg.hxx
---- openoffice.org.orig/svx/source/dialog/optgdlg.hxx	8 Sep 2005 21:43:23 -0000	1.14
-+++ openoffice.org/svx/source/dialog/optgdlg.hxx	26 Oct 2005 09:45:44 -0000
-@@ -209,6 +209,9 @@ class OfaLanguagesTabPage : public SfxTa
+retrieving revision 1.16
+diff -u -r1.16 optgdlg.hxx
+--- openoffice.org.orig/svx/source/dialog/optgdlg.hxx	5 Jan 2006 17:59:05 -0000	1.16
++++ openoffice.org/svx/source/dialog/optgdlg.hxx	1 Feb 2006 11:04:41 -0000
+@@ -212,6 +212,10 @@
  
      DECL_LINK(  SupportHdl, CheckBox* ) ;
      DECL_LINK(  LocaleSettingHdl, SvxLanguageBox* ) ;
 +    DECL_LINK(  RegisterModify, CheckBox* );
 +
 +    void ResetLang( const SfxItemSet& rSet );
++    void LangToUI(LanguageType eCurLang, LanguageType eCurLangCJK, LanguageType eCurLangCTL);
  
  public:
  	OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -r1.614 -r1.615
--- openoffice.org.spec	31 Jan 2006 12:10:40 -0000	1.614
+++ openoffice.org.spec	2 Feb 2006 14:47:01 -0000	1.615
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 %define build_fc5 1
 %define build_fc4 0
@@ -3383,6 +3383,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Feb 02 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-10
+- reshuffle bridge patch
+- reimplement lang from locale patch
+
 * Fri Jan 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-9
 - add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for neon 0.25.X
 - missing %defattr(-,root,root)



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:49:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:49:25 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.615,1.616
Message-ID: <200602021449.k12EnPBu021287@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21255

Modified Files:
	openoffice.org.spec 
Log Message:
don't like those corrupt zip file warning


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- openoffice.org.spec	2 Feb 2006 14:47:01 -0000	1.615
+++ openoffice.org.spec	2 Feb 2006 14:49:21 -0000	1.616
@@ -1020,26 +1020,21 @@
 fi
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 #getting an unpackaged install
+unset MAXPROCESS
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 echo start en-US install time is `date`
 if ! dmake openoffice_en-US; then
-    if [ $MAXPROCESS -a $MAXPROCESS -gt 1 ]; then
-	echo parallel en_US langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting unparallel dmake...
-        unset MAXPROCESS
-    fi
-    echo - ---dump log start---
-    cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
-    echo - ---dump log end---
+    echo en_US langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting dmake...
     dmake openoffice_en-US
 fi
+echo - ---dump log start---
+cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+echo - ---dump log end---
 echo end en-US install time is `date`
 %if %{langpacks}
 echo start langpack install time is `date`
 if ! dmake ooolanguagepack; then
-    if [ $MAXPROCESS -a $MAXPROCESS -gt 1 ]; then
-    	echo parallel langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting unparallel dmake...
-    	unset MAXPROCESS
-    fi
+    echo langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting dmake...
     dmake ooolanguagepack
 fi
 echo end langpack install time is `date`, diskspace: `df -h . | tail -n 1`



From fedora-cvs-commits at redhat.com  Thu Feb  2 14:51:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 09:51:24 -0500
Subject: rpms/fontconfig/devel fontconfig-2.3.93-defaultconfig.patch, 1.3,
	1.4
Message-ID: <200602021451.k12EpOx3022315@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	fontconfig-2.3.93-defaultconfig.patch 
Log Message:
this ones still good


fontconfig-2.3.93-defaultconfig.patch:
 fonts.conf.in |  103 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 82 insertions(+), 21 deletions(-)

Index: fontconfig-2.3.93-defaultconfig.patch
===================================================================
RCS file: fontconfig-2.3.93-defaultconfig.patch
diff -N fontconfig-2.3.93-defaultconfig.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fontconfig-2.3.93-defaultconfig.patch	2 Feb 2006 14:51:22 -0000	1.4
@@ -0,0 +1,185 @@
+--- fontconfig-2.3.93/fonts.conf.in.defaultconfig	2005-11-02 23:48:59.000000000 -0500
++++ fontconfig-2.3.93/fonts.conf.in	2006-01-17 20:33:53.000000000 -0500
+@@ -78,7 +78,9 @@
+ 		<family>Times</family>
+ 		<family>Nimbus Roman No9 L</family>
+ 		<family>Luxi Serif</family>
++		<family>Sazanami Mincho</family>
+ 		<family>Kochi Mincho</family>
++		<family>AR PL ZenKai Uni</family>
+ 		<family>AR PL SungtiL GB</family>
+ 		<family>AR PL Mingti2L Big5</family>
+ 		<family>?????? ??????</family>
+@@ -98,7 +100,9 @@
+ 		<family>Albany AMT</family>
+ 		<family>Nimbus Sans L</family>
+ 		<family>Luxi Sans</family>
++		<family>Sazanami Gothic</family>
+ 		<family>Kochi Gothic</family>
++		<family>AR PL ShanHeiSun Uni</family>
+ 		<family>AR PL KaitiM GB</family>
+ 		<family>AR PL KaitiM Big5</family>
+ 		<family>?????? ????????????</family>
+@@ -146,15 +150,37 @@
+   -->
+         <alias>
+ 	  <family>Times</family>
+-	  <accept><family>Nimbus Roman No9 L</family></accept>
++	  <accept>
++	    <family>Nimbus Roman No9 L</family>
++	    <family>Thorndale AMT</family>
++	    <family>Times New Roman</family>
++	  </accept>
+ 	</alias>
+         <alias>
+ 	  <family>Helvetica</family>
+-	  <accept><family>Nimbus Sans L</family></accept>
++	  <accept>
++	    <family>Nimbus Sans L</family>
++	    <family>Albany AMT</family>
++	    <family>Arial</family>
++	  </accept>
+ 	</alias>
+         <alias>
+ 	  <family>Courier</family>
+-	  <accept><family>Nimbus Mono L</family></accept>
++	  <accept>
++	    <family>Cumberland AMT</family>
++	    <family>Courier New</family>
++	    <family>Nimbus Mono L</family>
++	  </accept>
++	</alias>
++
++	<alias>
++	  <family>ZapfDingbats</family>
++	  <accept><family>Dingbats</family></accept>
++	</alias>
++
++	<alias>
++	  <family>Symbol</family>
++	  <accept><family>Open Symbols L</family></accept>
+ 	</alias>
+ 
+ <!--
+@@ -163,11 +189,18 @@
+  -->
+  	<alias>
+ 		<family>Times New Roman</family>
+-		<accept><family>Thorndale AMT</family></accept>
++		<accept>
++			<family>Thorndale AMT</family>
++			<family>Nimbus Roman No9 L</family>
++		</accept>
+ 	</alias>
+  	<alias>
+ 		<family>Arial</family>
+-		<accept><family>Albany AMT</family></accept>
++		<accept>
++			<family>Albany AMT</family>
++			<family>Nimbus Sans L</family>
++			<family>Arial</family>
++		</accept>
+ 	</alias>
+  	<alias>
+ 		<family>Courier New</family>
+@@ -260,16 +293,25 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
++			<family>Nimbus Roman No9 L</family>
++			<family>Thorndale AMT</family>
+ 			<family>Bitstream Vera Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+-			<family>Nimbus Roman No9 L</family>
+ 			<family>Times</family>
+-			<family>Frank Ruehl</family>
++			<family>KacstQura</family>
++			<family>Frank Ruehl CLM</family>
++                        <family>Lohit Bengali</family>
++			<family>Lohit Gujarati</family>
++			<family>Lohit Hindi</family>
++			<family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
++			<family>Sazanami Mincho</family>
++			<family>Kochi Mincho</family>
++			<family>ZYSong18030</family>
+ 			<family>MgOpen Canonica</family>
+ 			<family>FreeSerif</family>
+-			<family>Kochi Mincho</family>
++			<family>AR PL Zenkai Uni</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
+ 			<family>?????? ??????</family>
+@@ -279,39 +321,58 @@
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
++			<family>Luxi Sans</family>
++			<family>Albany AMT</family>
+ 			<family>Bitstream Vera Sans</family>
+ 			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+-			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Helvetica</family>
++  			<family>KacstQura</family>
+ 			<family>Nachlieli</family>
+-			<family>MgOpen Modata</family>
+-			<family>FreeSans</family>
++                        <family>Lohit Bengali</family>
++			<family>Lohit Gujarati</family>
++			<family>Lohit Hindi</family>
++			<family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
++			<family>Sazanami Gothic</family>
+ 			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>AR PL KaitiM Big5</family>
+ 			<family>?????? ????????????</family>
+-			<family>Baekmuk Dotum</family>
++			<family>MgOpen Modata</family>
++			<family>FreeSans</family>
++                        <family>ZYSong18030</family>
++			<family>AR PL ShanHeiSun Uni</family>
++			<family>AR PL SungtiL GB</family>
++			<family>AR PL Mingti2L Big5</family>
++			<family>Baekmuk Gulim</family>
+ 			<family>SimSun</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Luxi Mono</family>
+ 			<family>Bitstream Vera Sans Mono</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+ 			<family>Cumberland AMT</family>
+-			<family>Luxi Mono</family>
++                        <family>KacstQura</family>
++                        <family>Miriam Mono CLM</family>
++                        <family>Lohit Bengali</family>
++                        <family>Lohit Gujarati</family>
++                        <family>Lohit Hindi</family>
++                        <family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Courier</family>
+-			<family>Miriam Mono</family>
++                        <family>Sazanami Gothic</family>
++                        <family>Kochi Gothic</family>
++                        <family>ZYSong18030</family>
++			<family>AR PL ShanHeiSun Uni</family>
++                        <family>AR PL SungtiL GB</family>
++                        <family>AR PL Mingti2L Big5</family>
++                        <family>Baekmuk Gulim</family>
+ 			<family>FreeMono</family>
+-			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>Baekmuk Dotum</family>
+ 		</prefer>
+ 	</alias>
+ 



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:07:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:07:29 -0500
Subject: rpms/fontconfig/devel fontconfig-fontsubdir-parse-fix.patch, NONE,
	1.1 fontconfig-memleak-fix.patch, NONE,
	1.1 fontconfig-misc-warning-fixes.patch, NONE,
	1.1 fontconfig-seife-crash.patch, NONE, 1.1 fontconfig.spec,
	1.61, 1.62
Message-ID: <200602021507.k12F7TFv017179@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-fontsubdir-parse-fix.patch 
	fontconfig-memleak-fix.patch 
	fontconfig-misc-warning-fixes.patch 
	fontconfig-seife-crash.patch 
Log Message:
Accumulated fixes


fontconfig-fontsubdir-parse-fix.patch:
 fccfg.c |   82 ++++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 54 insertions(+), 28 deletions(-)

--- NEW FILE fontconfig-fontsubdir-parse-fix.patch ---
--- src/fccfg.c-dist	2006-01-31 16:19:48.000000000 +0100
+++ src/fccfg.c	2006-01-31 16:42:41.000000000 +0100
@@ -383,10 +383,46 @@ FcConfigGetConfigDirs (FcConfig   *confi
     return FcStrListCreate (config->configDirs);
 }
 
+static FcChar8 *
+FcConfigLookupAllDirs (FcConfig *config, const FcChar8 *d)
+{
+    int n;
+    ino_t	di;
+    dev_t	dd;
+    struct stat s;
+
+    /* first we do string matches rather than file accesses */
+    for (n = 0; n < config->fontDirs->num; n++)
+    {
+	if (config->fontDirs->strs[n] == d ||
+	    strcmp ((char *)config->fontDirs->strs[n], (char *)d) == 0)
+	    return config->fontDirs->strs[n];
+    }
+
+    /* If this is a bottleneck, we can cache the fontDir inodes. */
+    if (stat ((char *)d, &s) == -1)
+	return 0;
+    di = s.st_ino; dd = s.st_dev;
+
+    for (n = 0; n < config->fontDirs->num; n++)
+    {
+	if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
+	    continue;
+	if (di == s.st_ino && dd == s.st_dev)
+	    return config->fontDirs->strs[n];
+    }
+    return NULL;
+}
+
 FcBool
 FcConfigAddFontDir (FcConfig	    *config,
 		    const FcChar8   *d)
 {
+#if 1 /* to be sure */
+    /* already exists? */
+    if (FcConfigLookupAllDirs(config, d))
+	return FcTrue;
+#endif
     return FcStrSetAddFilename (config->fontDirs, d);
 }
 
@@ -397,6 +433,7 @@ FcConfigAddFontDirSubdirs (FcConfig     
     DIR *dir;
     struct dirent *e;
     FcChar8 *subdir;
+    FcBool added = FcFalse;
     
     if (!(dir = opendir ((char *) d)))
 	return FcFalse;
@@ -415,53 +452,42 @@ FcConfigAddFontDirSubdirs (FcConfig     
 	    strcat ((char *)subdir, e->d_name);
 	    if (FcFileIsDir (subdir))
 	    {
-		FcConfigAddFontDir (config, subdir);
+		if (FcConfigLookupAllDirs(config, subdir))
+		    continue; /* already added */
+		FcStrSetAddFilename (config->fontDirs, subdir);
 		FcConfigAddFontDirSubdirs (config, subdir);
+		added = FcTrue;
 	    }
 	}
     }
     free (subdir);
     closedir (dir);
-    return FcTrue;
+    return added;
 }
 
 const FcChar8 *
 FcConfigNormalizeFontDir (FcConfig  	*config, 
 			  const FcChar8 *d)
 {
-    /* If this is a bottleneck, we can cache the fontDir inodes. */
-    ino_t	di;
-    dev_t	dd;
+    FcChar8 *res;
     int		n, n0;
-    struct stat s;
+    FcBool added = FcFalse;
 
-    if (stat ((char *)d, &s) == -1)
-	return 0;
-    di = s.st_ino; dd = s.st_dev;
-
-    for (n = 0; n < config->fontDirs->num; n++)
-    {
-	if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
-	    continue;
-	if (di == s.st_ino && dd == s.st_dev)
-	    return config->fontDirs->strs[n];
-    }
+    res = FcConfigLookupAllDirs(config, d);
+    if (res)
+	return res;
 
     /* Ok, we didn't find it in fontDirs; let's add subdirs.... */
-    for (n = 0, n0 = config->fontDirs->num; n < n0; n++)
-	FcConfigAddFontDirSubdirs (config, config->fontDirs->strs[n]);
+    for (n = 0, n0 = config->fontDirs->num; n < n0; n++) {
+	if (FcConfigAddFontDirSubdirs (config, config->fontDirs->strs[n]))
+	    added = FcTrue;
+    }
 
     /* ... and try again. */
-    for (n = 0; n < config->fontDirs->num; n++)
-    {
-	if (stat ((char *)config->fontDirs->strs[n], &s) == -1)
-	    continue;
-	if (di == s.st_ino && dd == s.st_dev)
-	    return config->fontDirs->strs[n];
-    }
+    if (added)
+	return FcConfigLookupAllDirs(config, d);
 
-    /* if it fails, then really give up. */
-    return 0;
+    return NULL;
 }
 
 FcBool

fontconfig-memleak-fix.patch:
 fccfg.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE fontconfig-memleak-fix.patch ---
--- src/fccfg.c-dist	2006-01-31 19:41:12.000000000 +0100
+++ src/fccfg.c	2006-01-31 19:41:37.000000000 +0100
@@ -1849,6 +1849,7 @@ FcConfigAppFontAddFile (FcConfig    *con
 	}
 	FcStrListDone (sublist);
     }
+    FcStrSetDestroy (subdirs);
     return FcTrue;
 }
 
@@ -1896,6 +1897,7 @@ FcConfigAppFontAddDir (FcConfig	    *con
 	}
 	FcStrListDone (sublist);
     }
+    FcStrSetDestroy (subdirs);
     return FcTrue;
 }
 

fontconfig-misc-warning-fixes.patch:
 fc-cat/fc-cat.c |    5 ++---
 src/fccache.c   |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 src/fcxml.c     |    4 ++--
 3 files changed, 49 insertions(+), 15 deletions(-)

--- NEW FILE fontconfig-misc-warning-fixes.patch ---
diff -ru fontconfig-2.3.93.20060131.orig/fc-cat/fc-cat.c fontconfig-2.3.93.20060131/fc-cat/fc-cat.c
--- fontconfig-2.3.93.20060131.orig/fc-cat/fc-cat.c	2006-01-30 17:54:22.000000000 +0100
+++ fontconfig-2.3.93.20060131/fc-cat/fc-cat.c	2006-01-31 19:23:11.000000000 +0100
@@ -196,7 +196,7 @@
 
     while (1) 
     {
-	char * dir, * ls;
+	char * dir;
 	FcCacheReadString (fd, name_buf, sizeof (name_buf));
 	if (!strlen(name_buf))
 	    break;
@@ -241,7 +241,6 @@
 {
     int fd;
     char * current_arch_machine_name;
-    char candidate_arch_machine_name[9+MACHINE_SIGNATURE_SIZE];
     off_t current_arch_start = 0;
     char subdirName[FC_MAX_FILE_LEN + 1 + 12 + 1];
     static char name_buf[8192], *dir;
@@ -411,7 +410,7 @@
     if (i >= argc)
         usage (argv[0]);
 
-    if (name_buf = FcCacheFileRead (fs, dirs, argv[i]))
+    if ((name_buf = FcCacheFileRead (fs, dirs, argv[i])) != 0)
 	FcCachePrintSet (fs, dirs, name_buf);
     else
     {
fontconfig-2.3.93.20060131/fc-cat???????????????: fc-cat.c.orig
diff -ru fontconfig-2.3.93.20060131.orig/src/fccache.c fontconfig-2.3.93.20060131/src/fccache.c
--- fontconfig-2.3.93.20060131.orig/src/fccache.c	2006-01-31 11:25:37.000000000 +0100
+++ fontconfig-2.3.93.20060131/src/fccache.c	2006-01-31 19:31:07.000000000 +0100
@@ -251,10 +251,18 @@
 	    (config_time.set && cache_stat.st_mtime < config_time.time))
         {
             FcCache md;
+	    off_t off;
 
             FcStrSetAdd (staleDirs, FcStrCopy ((FcChar8 *)name_buf));
-            read (cache->fd, &md, sizeof (FcCache));
-            lseek (cache->fd, FcCacheNextOffset (lseek(cache->fd, 0, SEEK_CUR)) + md.count, SEEK_SET);
+            if (read (cache->fd, &md, sizeof (FcCache)) != sizeof(FcCache)) {
+		perror ("read metadata");
+		goto bail1;
+	    }
+	    off = FcCacheNextOffset (lseek(cache->fd, 0, SEEK_CUR)) + md.count;
+            if (lseek (cache->fd, off, SEEK_SET) != off) {
+		perror ("lseek");
+		goto bail1;
+	    }
             continue;
         }
 
@@ -468,16 +476,33 @@
         if (dir->name)
         {
 	    const char * d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name);
-
+	    off_t off;
+	    
             FcCacheWriteString (fd, d);
 
 	    for (i = 0; i < dir->subdirs->size; i++)
 		FcCacheWriteString (fd, (char *)dir->subdirs->strs[i]);
 	    FcCacheWriteString (fd, "");
 	    
-            write (fd, &dir->metadata, sizeof(FcCache));
-            lseek (fd, FcCacheNextOffset (lseek(fd, 0, SEEK_CUR)), SEEK_SET);
-            write (fd, dir->ent, dir->metadata.count);
+            if (write (fd, &dir->metadata, sizeof(FcCache)) != sizeof(FcCache))
+	    {
+	        perror ("write metadata");
+		free (dir->ent);
+		continue;
+	    }
+	    off = FcCacheNextOffset (lseek(fd, 0, SEEK_CUR));
+            if (lseek (fd, off, SEEK_SET) != off)
+	    {
+		perror ("lseek");
+		free (dir->ent);
+		continue;
+	    }
+            if (write (fd, dir->ent, dir->metadata.count) != dir->metadata.count)
+	    {
+                perror ("write dirent");
+		free (dir->ent);
+		continue;
+	    }
             free (dir->ent);
         }
     }
@@ -1025,7 +1050,8 @@
     void * current_dir_block;
     off_t pos;
 
-    read(fd, &metadata, sizeof(FcCache));
+    if (read(fd, &metadata, sizeof(FcCache)) != sizeof(FcCache))
+	return FcFalse;
     if (metadata.magic != FC_CACHE_MAGIC)
         return FcFalse;
 
@@ -1238,11 +1264,20 @@
         FcCacheWriteString (fd, (char *)dirs->strs[i]);
     FcCacheWriteString (fd, "");
 
-    write (fd, &metadata, sizeof(FcCache));
+    if (write (fd, &metadata, sizeof(FcCache)) != sizeof(FcCache)) {
+	perror("write metadata");
+	goto bail5;
+    }
     if (metadata.count)
     {
-	lseek (fd, FcCacheNextOffset (lseek(fd, 0, SEEK_END)), SEEK_SET);
-	write (fd, current_dir_block, metadata.count);
+	off_t off = FcCacheNextOffset (lseek(fd, 0, SEEK_END)); 
+	if (lseek (fd, off, SEEK_SET) != off)
+	    perror("lseek");
+	else {
+	    if (write (fd, current_dir_block, metadata.count) != 
+		metadata.count)
+		perror("write current_dir_block");
+	}
 	free (current_dir_block);
     }
 
fontconfig-2.3.93.20060131/src???????????????: fccache.c.orig
diff -ru fontconfig-2.3.93.20060131.orig/src/fcxml.c fontconfig-2.3.93.20060131/src/fcxml.c
--- fontconfig-2.3.93.20060131.orig/src/fcxml.c	2006-01-26 17:14:29.000000000 +0100
+++ fontconfig-2.3.93.20060131/src/fcxml.c	2006-01-31 19:23:11.000000000 +0100
@@ -493,10 +493,10 @@
     {
 	if (parse->name)
 	    fprintf (stderr, "Fontconfig %s: \"%s\", line %d: ", s,
-		     parse->name, XML_GetCurrentLineNumber (parse->parser));
+		     parse->name, (int)XML_GetCurrentLineNumber (parse->parser));
 	else
 	    fprintf (stderr, "Fontconfig %s: line %d: ", s,
-		     XML_GetCurrentLineNumber (parse->parser));
+		     (int)XML_GetCurrentLineNumber (parse->parser));
 	if (severe >= FcSevereError)
 	    parse->error = FcTrue;
     }

fontconfig-seife-crash.patch:
 fcfs.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE fontconfig-seife-crash.patch ---
Index: src/fcfs.c
===================================================================
RCS file: /cvs/fontconfig/fontconfig/src/fcfs.c,v
retrieving revision 1.4.4.8
diff -u -3 -d -p -r1.4.4.8 fcfs.c
--- src/fcfs.c	25 Nov 2005 15:50:33 -0000	1.4.4.8
+++ src/fcfs.c	1 Feb 2006 19:04:23 -0000
@@ -159,23 +159,23 @@ FcFontSetUnserialize(FcCache * metadata,
     nfont = *(int *)block_ptr;
     block_ptr = (int *)block_ptr + 1;
 
-    if (s->sfont < s->nfont + nfont)
-    {
-	int sfont = s->nfont + nfont;
-	FcPattern ** pp;
-	pp = realloc (s->fonts, sfont * sizeof (FcPattern));
-	if (!pp)
-	    return FcFalse;
-	s->fonts = pp;
-	s->sfont = sfont;
-    }
-    n = s->nfont;
-    s->nfont += nfont;
-
-    if (nfont > 0)
+    if (nfont > 0 && s->nfont < s->nfont + nfont)
     {
 	FcPattern * p = (FcPattern *)block_ptr;
 
+	if (s->sfont < s->nfont + nfont)
+	{
+	    int sfont = s->nfont + nfont;
+	    FcPattern ** pp;
+	    pp = realloc (s->fonts, sfont * sizeof (FcPattern));
+	    if (!pp)
+		return FcFalse;
+	    s->fonts = pp;
+	    s->sfont = sfont;
+	}
+	n = s->nfont;
+	s->nfont += nfont;
+
         /* The following line is a bit counterintuitive.  The usual
          * convention is that FcPatternUnserialize is responsible for
          * aligning the FcPattern.  However, the FontSet also stores
@@ -187,7 +187,7 @@ FcFontSetUnserialize(FcCache * metadata,
 
 	block_ptr = FcPatternUnserialize (metadata, block_ptr);
 	block_ptr = FcObjectUnserialize (metadata, block_ptr);
+        return block_ptr != 0;
     }
-
-    return block_ptr != 0;
+    return FcFalse;
 }


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- fontconfig.spec	31 Jan 2006 13:44:03 -0000	1.61
+++ fontconfig.spec	2 Feb 2006 15:07:23 -0000	1.62
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.93.cvs20060131
-Release: 1
+Release: 2
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -13,6 +13,11 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
+Patch2: fontconfig-fontsubdir-parse-fix.patch
+Patch3: fontconfig-memleak-fix.patch
+Patch4: fontconfig-misc-warning-fixes.patch
+Patch5: fontconfig-fccache-update-check.patch
+Patch6: fontconfig-seife-crash.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -49,6 +54,11 @@
 %setup -q
 
 %patch1 -p1 -b .defaultconfig
+%patch2 -p0 -b .fontsubdir-parse-fix
+%patch3 -p0 -b .fontconfig-memleak-fix
+%patch4 -p1 -b .fontconfig-misc-warning-fixes
+%patch5 -p0 -b .fontconfig-fccache-update-check
+%patch6 -p0 -b .fontconfig-seife-crash
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -133,6 +143,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060131-2
+- Accumulated patches
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060131-1
 - Newer cvs snapshot
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:13:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:13:29 -0500
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.6,
	1.7
Message-ID: <200602021513.k12FDTYE017321@cvs.devel.redhat.com>

Author: wtogami

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

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
buildreq cdparanoia-devel (#179034 thias)



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer-plugins-base.spec	18 Jan 2006 17:01:34 -0000	1.6
+++ gstreamer-plugins-base.spec	2 Feb 2006 15:13:27 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.2
-Release: 	1
+Release: 	2
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -187,6 +187,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Thu Feb 02 2006 Warren Togami <wtogami at redhat.com> - 0.10.2-2
+- buildreq cdparanoia-devel (#179034 thias)
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.2-1
 - Upgrade to 0.10.2
 - Require gstreamer-0.10.2



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:14:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:14:21 -0500
Subject: rpms/systemtap/FC-4 .cvsignore, 1.14,
	1.15 elfutils-portability.patch, 1.9, 1.10 sources, 1.15,
	1.16 systemtap.spec, 1.17, 1.18
Message-ID: <200602021514.k12FELwL017404@cvs.devel.redhat.com>

Author: fche

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

Modified Files:
	.cvsignore elfutils-portability.patch sources systemtap.spec 
Log Message:
* snapshot refresh



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Jan 2006 07:51:29 -0000	1.14
+++ .cvsignore	2 Feb 2006 15:14:17 -0000	1.15
@@ -1,2 +1,2 @@
-systemtap-0.5.3.tar.gz
+systemtap-0.5.4.tar.gz
 elfutils-0.119.tar.gz

elfutils-portability.patch:
 ChangeLog           |   11 ++++++++++
 Makefile.in         |    1 
 config/Makefile.in  |    1 
 configure           |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac        |    9 ++++++++
 lib/ChangeLog       |    5 ++++
 lib/Makefile.am     |    3 +-
 lib/Makefile.in     |    5 ++--
 libasm/ChangeLog    |    5 ++++
 libasm/Makefile.am  |    3 +-
 libasm/Makefile.in  |    5 ++--
 libcpu/ChangeLog    |    5 ++++
 libcpu/Makefile.am  |    3 +-
 libcpu/Makefile.in  |    3 +-
 libdw/ChangeLog     |    5 ++++
 libdw/Makefile.am   |    3 +-
 libdw/Makefile.in   |    5 ++--
 libdwfl/ChangeLog   |    5 ++++
 libdwfl/Makefile.am |    3 +-
 libdwfl/Makefile.in |    5 ++--
 libebl/ChangeLog    |    5 ++++
 libebl/Makefile.am  |    3 +-
 libebl/Makefile.in  |    5 ++--
 libelf/ChangeLog    |    5 ++++
 libelf/Makefile.am  |    6 ++++-
 libelf/Makefile.in  |    7 +++---
 libelf/common.h     |    4 +--
 m4/Makefile.in      |    1 
 src/ChangeLog       |    5 ++++
 src/Makefile.am     |    3 +-
 src/Makefile.in     |    5 ++--
 src/findtextrel.c   |    6 ++++-
 src/strip.c         |   20 +++++++++++++++++-
 tests/ChangeLog     |    5 ++++
 tests/Makefile.am   |    5 ++--
 tests/Makefile.in   |    5 ++--
 36 files changed, 196 insertions(+), 34 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/elfutils-portability.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- elfutils-portability.patch	17 Jan 2006 07:51:29 -0000	1.9
+++ elfutils-portability.patch	2 Feb 2006 15:14:17 -0000	1.10
@@ -1,104 +1,6 @@
---- elfutils/backends/ChangeLog
-+++ elfutils/backends/ChangeLog
-@@ -38,6 +38,11 @@
- 	* sparc_init.c: Likewise.
- 	* x86_64_init.c: Likewise.
- 
-+2005-11-22  Roland McGrath  <roland at redhat.com>
-+
-+	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
-+	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
-+
- 2005-11-19  Roland McGrath  <roland at redhat.com>
- 
- 	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -60,6 +65,9 @@
- 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
- 	(CLEANFILES): Add libebl_$(m).so.
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 	* ppc_reloc.def: Update bits per Alan Modra <amodra at bigpond.net.au>.
- 	* ppc64_reloc.def: Likewise.
- 
---- elfutils/backends/Makefile.am
-+++ elfutils/backends/Makefile.am
-@@ -13,12 +13,14 @@
- ## 3001 King Ranch Road, Ukiah, CA 95482.
- ##
- DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
-+WEXTRA = @WEXTRA@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- if MUDFLAP
- AM_CFLAGS = -fmudflap
- else
- AM_CFLAGS =
- endif
--AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
-+AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
- 	     -std=gnu99
- INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
- 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
-@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep
- libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
- 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- 		-Wl,--version-script,$(word 2,$^) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
- 	$(textrel_check)
- 
- libebl_%.map: Makefile
---- elfutils/backends/Makefile.in
-+++ elfutils/backends/Makefile.in
-@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+WEXTRA = @WEXTRA@
- XGETTEXT = @XGETTEXT@
- YACC = @YACC@
- ac_ct_CC = @ac_ct_CC@
-@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
-- at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
-+ at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
- @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
-- at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2 -std=gnu99
-+ at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99
- 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
- libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
- 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
- 		-Wl,--version-script,$(word 2,$^) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
- 	$(textrel_check)
- 
- libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -1,3 +1,7 @@
-+2005-11-22  Roland McGrath  <roland at redhat.com>
-+
-+	* configure.ac: Check for --as-needed linker option.
-+
- 2005-11-18  Roland McGrath  <roland at redhat.com>
- 
- 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -45,6 +49,17 @@
+@@ -29,6 +29,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -118,16 +20,8 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -84,6 +84,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -113,6 +113,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -136,16 +30,16 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.115'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
--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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GC!
OV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF!
_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GC!
OV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_F!
ALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -3385,6 +3385,92 @@ echo "$as_me: error: gcc with C99 suppor
+@@ -3384,6 +3384,58 @@ echo "$as_me: error: gcc with C99 suppor
  fi
  
  
@@ -201,55 +95,20 @@
 +fi
 +
 +
-+echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
-+echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6
-+if test "${ac_cv_as_needed+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&5'
-+  { (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); }; }
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
-+echo "${ECHO_T}$ac_cv_as_needed" >&6
-+if test "x$ac_cv_as_needed" = xyes; then
-+  LD_AS_NEEDED=-Wl,--as-needed
-+else
-+  LD_AS_NEEDED=
-+fi
-+
-+
-+
-+
  LOCALEDIR=$datadir
  
  cat >>confdefs.h <<_ACEOF
-@@ -4987,6 +5073,8 @@ s, at YACC@,$YACC,;t t
+@@ -4925,6 +4977,7 @@ s, at YACC@,$YACC,;t t
  s, at LEX@,$LEX,;t t
  s, at LEXLIB@,$LEXLIB,;t t
  s, at LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 +s, at WEXTRA@,$WEXTRA,;t t
-+s, at LD_AS_NEEDED@,$LD_AS_NEEDED,;t t
  s, at LOCALEDIR@,$LOCALEDIR,;t t
  s, at DATADIRNAME@,$DATADIRNAME,;t t
  s, at NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -69,6 +69,34 @@ CFLAGS="$old_CFLAGS"])
+@@ -69,6 +69,15 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
@@ -262,25 +121,6 @@
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
 +
-+AC_CACHE_CHECK([for --as-needed linker option],
-+	       ac_cv_as_needed, [dnl
-+cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-+			    -fPIC -shared -o conftest.so conftest.c
-+			    -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
-+then
-+  ac_cv_as_needed=yes
-+else
-+  ac_cv_as_needed=no
-+fi
-+rm -f conftest*])
-+AS_IF([test "x$ac_cv_as_needed" = xyes],
-+      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
-+AC_SUBST(LD_AS_NEEDED)
-+
-+
  LOCALEDIR=$datadir
  AC_SUBST(LOCALEDIR)
  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
@@ -317,23 +157,15 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -135,6 +135,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -183,9 +185,9 @@ sharedstatedir = @sharedstatedir@
+@@ -177,9 +178,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -347,7 +179,7 @@
  libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -28,6 +28,11 @@
+@@ -24,6 +24,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -373,28 +205,20 @@
  endif
 -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
 +AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
- INCLUDES = -I. -I$(srcdir) -I.. \
- 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/lib
+ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -138,6 +138,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -167,6 +167,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
+@@ -209,9 +210,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
@@ -403,9 +227,9 @@
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
 - at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2
- INCLUDES = -I. -I$(srcdir) -I.. \
- 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
+ INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
  	   -I$(top_srcdir)/lib
+ 
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
 @@ -1,3 +1,8 @@
@@ -431,23 +255,15 @@
  noinst_LIBRARIES = libcpu_i386.a
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -101,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -130,6 +130,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -177,7 +179,7 @@ sbindir = @sbindir@
+@@ -171,7 +172,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -458,7 +274,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -266,6 +266,11 @@
+@@ -239,6 +239,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -472,7 +288,7 @@
  
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
-@@ -13,6 +13,7 @@
+@@ -13,12 +13,13 @@
  ## 3001 King Ranch Road, Ukiah, CA 95482.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
@@ -480,9 +296,7 @@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
-@@ -21,7 +22,7 @@ endif
- if BUILD_STATIC
- AM_CFLAGS += -fpic
+ AM_CFLAGS =
  endif
 -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
 +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@@ -491,38 +305,29 @@
  
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -178,6 +178,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -206,6 +206,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
+@@ -248,9 +249,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
-- at MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99
-+ at MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99
- @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \
-- at MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
-+ at MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 $(WEXTRA) \
-+ at MUDFLAP_TRUE@	-std=gnu99
+ @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
+- at MUDFLAP_FALSE@	-Wextra -std=gnu99
++ at MUDFLAP_FALSE@	$(WEXTRA) -std=gnu99
+ @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
+- at MUDFLAP_TRUE@	-Wformat=2 -Wextra -std=gnu99
++ at MUDFLAP_TRUE@	-Wformat=2 $(WEXTRA) -std=gnu99
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -259,6 +259,11 @@
+@@ -210,6 +210,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -553,23 +358,15 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -163,6 +163,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
+@@ -205,9 +206,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -583,7 +380,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -400,6 +400,11 @@
+@@ -152,6 +152,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -611,26 +408,18 @@
 +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
  	     -std=gnu99
  
- INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -258,6 +258,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@
+@@ -300,9 +301,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -639,12 +428,12 @@
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
 - at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99
- INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
- 	   -I$(top_srcdir)/lib -I..
- 
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
+ lib_LIBRARIES = libebl.a
+ modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -113,6 +113,11 @@
+@@ -91,6 +91,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.
  
@@ -709,23 +498,15 @@
  @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@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -210,6 +210,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@
+@@ -252,10 +253,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
@@ -740,16 +521,8 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -82,6 +82,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -111,6 +111,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -758,16 +531,8 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -135,6 +135,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -776,7 +541,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -236,6 +236,11 @@
+@@ -220,6 +220,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -824,23 +589,15 @@
  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@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -221,6 +221,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -271,12 +273,12 @@ target_alias = @target_alias@
+@@ -265,12 +266,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 \
@@ -909,7 +666,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -349,6 +349,11 @@
+@@ -181,6 +181,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -932,32 +689,24 @@
 -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
 +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
- BUILD_RPATH = \$$ORIGIN/../backends
+ AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libebl
  else
 -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
- BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
+ AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -283,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LD_AS_NEEDED = @LD_AS_NEEDED@
- LEX = @LEX@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -318,6 +319,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
- TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+@@ -291,6 +291,7 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -359,10 +361,10 @@ sbindir = @sbindir@
+@@ -332,10 +333,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -969,4 +718,4 @@
 + at MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
  @MUDFLAP_TRUE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
  
- @MUDFLAP_TRUE at BUILD_RPATH = \$$ORIGIN/../backends
+ @MUDFLAP_FALSE at AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	17 Jan 2006 07:51:29 -0000	1.15
+++ sources	2 Feb 2006 15:14:17 -0000	1.16
@@ -1,2 +1,2 @@
-5aef2312e7e767902e398811ed9388c9  systemtap-0.5.3.tar.gz
+f39bcf7e1c380e8eaa768e1230dc2fad  systemtap-0.5.4.tar.gz
 57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/systemtap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- systemtap.spec	17 Jan 2006 07:51:29 -0000	1.17
+++ systemtap.spec	2 Feb 2006 15:14:17 -0000	1.18
@@ -2,7 +2,7 @@
 %define elfutils_version 0.119
 
 Name: systemtap
-Version: 0.5.3
+Version: 0.5.4
 Release: 1
 Summary: Instrumentation System
 Group: Development/System
@@ -13,8 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
-Requires: kernel-devel
-# or is that kernel-smp-devel?
+# Requires: kernel-devel
+# or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
 # Suggest: kernel-debuginfo
 
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Wed Feb  1 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.4-1
+- PRs 1916, 2205, 2142, 2060, 1379
+
 * Mon Jan 16 2006 Roland McGrath <roland at redhat.com> - 0.5.3-1
 - Many changes, affected PRs include: 2056, 1144, 1379, 2057,
   2060, 1972, 2140, 2148



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:19:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:19:05 -0500
Subject: rpms/fontconfig/devel fontconfig-fccache-update-check.patch, NONE,
	1.1
Message-ID: <200602021519.k12FJ5rq029999@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	fontconfig-fccache-update-check.patch 
Log Message:
add last patch


fontconfig-fccache-update-check.patch:
 fccache.c |  157 ++++++++++++++++++++++++++++++++++++++++++++------------------
 fcdir.c   |   11 +---
 fcint.h   |    4 +
 3 files changed, 121 insertions(+), 51 deletions(-)

--- NEW FILE fontconfig-fccache-update-check.patch ---
--- src/fcint.h-dist	2006-01-30 12:15:19.000000000 +0100
+++ src/fcint.h	2006-02-01 19:20:35.000000000 +0100
@@ -328,6 +328,9 @@ typedef struct _FcCaseFold {
 
 typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
 
+enum FcGCDirState {
+	FcGCDirDisabled, FcGCDirFileRead, FcGCDirConsumed, FcGCDirUpdated
+};
 struct _FcGlobalCacheDir {
     struct _FcGlobalCacheDir	*next;
     char			*name;
@@ -335,6 +338,7 @@ struct _FcGlobalCacheDir {
     off_t			offset;
     FcStrSet			*subdirs;
     void			*ent;
+    enum FcGCDirState		state;
 };
 
 typedef struct _FcGlobalCache {
--- src/fccache.c-dist	2006-02-01 12:28:09.000000000 +0100
+++ src/fccache.c	2006-02-01 19:48:28.000000000 +0100
@@ -254,6 +254,12 @@ FcGlobalCacheLoad (FcGlobalCache    *cac
 	    off_t off;
 
             FcStrSetAdd (staleDirs, FcStrCopy ((FcChar8 *)name_buf));
+
+	    /* skip subdirs */
+	    while (FcCacheReadString (cache->fd, subdirName, 
+				      sizeof (subdirName)) &&
+		   strlen (subdirName))
+		;
             if (read (cache->fd, &md, sizeof (FcCache)) != sizeof(FcCache)) {
 		perror ("read metadata");
 		goto bail1;
@@ -275,6 +281,7 @@ FcGlobalCacheLoad (FcGlobalCache    *cac
 
 	d->name = (char *)FcStrCopy ((FcChar8 *)name_buf);
 	d->ent = 0;
+	d->state = FcGCDirFileRead;
 
 	d->subdirs = FcStrSetCreate();
 	do
@@ -322,7 +329,6 @@ FcBool
 FcGlobalCacheReadDir (FcFontSet *set, FcStrSet *dirs, FcGlobalCache * cache, const char *dir, FcConfig *config)
 {
     FcGlobalCacheDir 	*d;
-    FcBool 		ret = FcFalse;
     int			i;
 
     if (cache->fd == -1)
@@ -333,42 +339,62 @@ FcGlobalCacheReadDir (FcFontSet *set, Fc
 
     for (d = cache->dirs; d; d = d->next)
     {
-	if (strncmp (d->name, dir, strlen(dir)) == 0)
+	if (strcmp (d->name, dir) == 0)
 	{
-	    lseek (cache->fd, d->offset, SEEK_SET);
-	    if (!FcDirCacheConsume (cache->fd, d->name, set, config))
+	    if (d->state == FcGCDirDisabled)
 		return FcFalse;
 
-            if (strcmp (d->name, dir) == 0)
-            {
+	    if (d->state == FcGCDirFileRead) {
+		lseek (cache->fd, d->offset, SEEK_SET);
+		if (! FcDirCacheConsume (cache->fd, d->name, set, config))
+		    return FcFalse;
+
 		for (i = 0; i < d->subdirs->num; i++)
 		    FcStrSetAdd (dirs, (FcChar8 *)d->subdirs->strs[i]);
 
-		ret = FcTrue;
-            }
+		d->state = FcGCDirConsumed;
+	    }
+	    return FcTrue;
 	}
     }
 
-    return ret;
+    return FcFalse;
 }
 
+static FcGlobalCacheDir *
+FcGlobalCacheDirFind (FcGlobalCache *cache, const char *name)
+{
+    FcGlobalCacheDir * d;
+
+    if (! cache || ! name)
+	return NULL;
+
+    for (d = cache->dirs; d; d = d->next)
+	if (strcmp((const char *)d->name, (const char *)name) == 0)
+	    return d;
+
+    return NULL;
+ }
+
 FcBool
 FcGlobalCacheUpdate (FcGlobalCache  *cache,
 		     FcStrSet	    *dirs,
-		     const char     *name,
+		     const char     *orig_name,
 		     FcFontSet	    *set,
 		     FcConfig	    *config)
 {
     FcGlobalCacheDir    *d;
     int		       	i;
+    const char *name;
 
-    name = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)name);
-    for (d = cache->dirs; d; d = d->next)
-    {
-	if (strcmp(d->name, name) == 0)
-	    break;
+    name = (char *)FcConfigNormalizeFontDir (config, (FcChar8 *)orig_name);
+    if (! name) {
+	fprintf(stderr, "Invalid font name %s\n", orig_name);
+	return FcFalse;
     }
 
+    d = FcGlobalCacheDirFind (cache, name);
+
     if (!d)
     {
 	d = malloc (sizeof (FcGlobalCacheDir));
@@ -376,6 +402,11 @@ FcGlobalCacheUpdate (FcGlobalCache  *cac
 	    return FcFalse;
 	d->next = cache->dirs;
 	cache->dirs = d;
+    } else {
+	/* free old resources */
+	FcStrFree ((FcChar8 *)d->name);
+	free (d->ent);
+	FcStrSetDestroy (d->subdirs);
     }
 
     cache->updated = FcTrue;
@@ -384,6 +415,7 @@ FcGlobalCacheUpdate (FcGlobalCache  *cac
     d->ent = FcDirCacheProduce (set, &d->metadata);
     d->offset = 0;
     d->subdirs = FcStrSetCreate();
+    d->state = FcGCDirUpdated;
     for (i = 0; i < dirs->num; i++)
 	FcStrSetAdd (d->subdirs, dirs->strs[i]);
     return FcTrue;
@@ -441,9 +473,6 @@ FcGlobalCacheSave (FcGlobalCache    *cac
     if (!FcCacheCopyOld(fd, fd_orig, current_arch_start))
 	goto bail3;
 
-    close (fd_orig);
-    fd_orig = -1;
-
     current_arch_start = lseek(fd, 0, SEEK_CUR);
     if (ftruncate (fd, current_arch_start) == -1)
 	goto bail3;
@@ -455,6 +484,8 @@ FcGlobalCacheSave (FcGlobalCache    *cac
     truncate_to = current_arch_start + strlen(current_arch_machine_name) + 11;
     for (dir = cache->dirs; dir; dir = dir->next)
     {
+	if (dir->state == FcGCDirDisabled)
+	    continue;
 	truncate_to += strlen(dir->name) + 1;
 	truncate_to += sizeof (FcCache);
 	truncate_to = FcCacheNextOffset (truncate_to);
@@ -473,11 +504,39 @@ FcGlobalCacheSave (FcGlobalCache    *cac
 
     for (dir = cache->dirs; dir; dir = dir->next)
     {
-        if (dir->name)
-        {
-	    const char * d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name);
+	const char * d;
+
+        if (! dir->name || dir->state == FcGCDirDisabled)
+	    continue;
+	d = (const char *)FcConfigNormalizeFontDir (config, (const FcChar8 *)dir->name);
+	if (d) {
 	    off_t off;
 	    
+	    if (dir->metadata.count && ! dir->ent) {
+		if (dir->state == FcGCDirUpdated || fd_orig < 0) {
+		    fprintf(stderr, "Invalid metadata entry for %s, skipping...\n", d);
+		    continue;
+		}
+		/* copy the old content */
+		dir->ent = malloc(dir->metadata.count);
+		if (! dir->ent) {
+		    perror("malloc error");
+		    continue;
+		}
+		off = FcCacheNextOffset (dir->offset + sizeof(FcCache));
+		if (lseek(fd_orig, off, SEEK_SET) != off) {
+		    perror("lseek");
+		    free(dir->ent);
+		    continue;
+		}
+		if (read(fd_orig, dir->ent, dir->metadata.count)
+		    != dir->metadata.count) {
+		    perror("read");
+		    free(dir->ent);
+		    continue;
+		}
+	    }
+
             FcCacheWriteString (fd, d);
 
 	    for (i = 0; i < dir->subdirs->size; i++)
@@ -497,20 +556,25 @@ FcGlobalCacheSave (FcGlobalCache    *cac
 		free (dir->ent);
 		continue;
 	    }
-            if (write (fd, dir->ent, dir->metadata.count) != dir->metadata.count)
-	    {
-                perror ("write dirent");
-		free (dir->ent);
-		continue;
+	    if (dir->metadata.count) {
+		if (write (fd, dir->ent, dir->metadata.count) != dir->metadata.count)
+		{
+		     perror ("write dirent");
+		     free (dir->ent);
+		     continue;
+		}
 	    }
-            free (dir->ent);
-        }
+	    free (dir->ent);
+	}
     }
     FcCacheWriteString (fd, "");
 
     if (close (fd) == -1)
 	goto bail25;
     
+    close (fd_orig);
+    fd_orig = -1;
+
     if (!FcAtomicReplaceOrig (atomic))
 	goto bail25;
     
@@ -792,10 +856,11 @@ FcCacheReadDirs (FcConfig * config, FcGl
 {
     int			ret = 0;
     FcChar8		*dir;
-    FcChar8		*file, *base;
+    const FcChar8	*name;
     FcStrSet		*subdirs;
     FcStrList		*sublist;
     struct stat		statb;
+    FcGlobalCacheDir * d;
 
     /*
      * Read in the results from 'list'.
@@ -805,21 +870,21 @@ FcCacheReadDirs (FcConfig * config, FcGl
 	if (!FcConfigAcceptFilename (config, dir))
 	    continue;
 
-	/* freed below */
-	file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
-	if (!file)
-	    return FcFalse;
-
-	strcpy ((char *) file, (char *) dir);
-	strcat ((char *) file, "/");
-	base = file + strlen ((char *) file);
+	/* Skip this directory if already updated
+	 * to avoid the looped directories via symlinks
+	 */
+	name = FcConfigNormalizeFontDir (config, dir);
+	if (name) {
+	    if ((d = FcGlobalCacheDirFind (cache, (const char *)name)) != NULL &&
+		d->state == FcGCDirUpdated)
+		continue;
+	}
 
 	subdirs = FcStrSetCreate ();
 	if (!subdirs)
 	{
 	    fprintf (stderr, "Can't create directory set\n");
 	    ret++;
-	    free (file);
 	    continue;
 	}
 	
@@ -836,7 +901,6 @@ FcCacheReadDirs (FcConfig * config, FcGl
 		ret++;
 	    }
 	    FcStrSetDestroy (subdirs);
-	    free (file);
 	    continue;
 	}
 	if (stat ((char *) dir, &statb) == -1)
@@ -845,17 +909,24 @@ FcCacheReadDirs (FcConfig * config, FcGl
 	    perror ("");
 	    FcStrSetDestroy (subdirs);
 	    ret++;
-	    free (file);
 	    continue;
 	}
 	if (!S_ISDIR (statb.st_mode))
 	{
 	    fprintf (stderr, "\"%s\": not a directory, skipping\n", dir);
 	    FcStrSetDestroy (subdirs);
-	    free (file);
 	    continue;
 	}
-	if (!FcDirCacheValid (dir) || !FcDirCacheRead (set, subdirs, dir, config))
+	if (FcDirCacheValid (dir) && FcDirCacheRead (set, subdirs, dir, config))
+	{
+	    /* if an old entry is found in the global cache, disable it */
+	    if ((d = FcGlobalCacheDirFind (cache, (const char *)name)) != NULL) {
+		d->state = FcGCDirDisabled;
+		/* save the updated config later without this entry */
+		cache->updated = FcTrue;
+	    }
+	}
+	else
 	{
 	    if (FcDebug () & FC_DBG_FONTSET)
 		printf ("cache scan dir %s\n", dir);
@@ -869,11 +940,9 @@ FcCacheReadDirs (FcConfig * config, FcGl
 	{
 	    fprintf (stderr, "Can't create subdir list in \"%s\"\n", dir);
 	    ret++;
-	    free (file);
 	    continue;
 	}
 	ret += FcCacheReadDirs (config, cache, sublist, set);
-	free (file);
     }
     FcStrListDone (list);
     return ret;
--- src/fcdir.c-dist	2006-01-30 12:15:19.000000000 +0100
+++ src/fcdir.c	2006-02-01 17:05:50.000000000 +0100
@@ -47,14 +47,17 @@ FcFileScanConfig (FcFontSet	*set,
     int			id;
     FcPattern		*font;
     FcBool		ret = FcTrue;
-    FcBool		isDir;
     int			count = 0;
     
     if (config && !FcConfigAcceptFilename (config, file))
 	return FcTrue;
 
+    if (FcFileIsDir (file))
+	return FcStrSetAdd (dirs, file);
+
     if (force)
 	cache = 0;
+
     id = 0;
     do
     {
@@ -70,12 +73,6 @@ FcFileScanConfig (FcFontSet	*set,
 	font = FcFreeTypeQuery (file, id, blanks, &count);
 	if (FcDebug () & FC_DBG_SCAN)
 	    printf ("done\n");
-	isDir = FcFalse;
-	if (!font && FcFileIsDir (file))
-	{
-	    isDir = FcTrue;
-	    ret = FcStrSetAdd (dirs, file);
-	}
 	/*
 	 * Add the font
 	 */



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:20:32 -0500
Subject: rpms/systemtap/FC-4 .cvsignore, 1.15,
	1.16 elfutils-portability.patch, 1.10, 1.11 sources, 1.16, 1.17
Message-ID: <200602021520.k12FKWn6030122@cvs.devel.redhat.com>

Author: fche

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

Modified Files:
	.cvsignore elfutils-portability.patch sources 
Log Message:
* proper elfutils compat patch



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Feb 2006 15:14:17 -0000	1.15
+++ .cvsignore	2 Feb 2006 15:20:28 -0000	1.16
@@ -1,2 +1,3 @@
 systemtap-0.5.4.tar.gz
 elfutils-0.119.tar.gz
+elfutils-portability.patch

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        |    5 ++
 src/Makefile.am      |    3 +
 src/Makefile.in      |    6 ++-
 src/findtextrel.c    |    6 ++-
 src/strip.c          |   20 ++++++++++-
 tests/ChangeLog      |    5 ++
 tests/Makefile.am    |    5 +-
 tests/Makefile.in    |    6 ++-
 39 files changed, 284 insertions(+), 39 deletions(-)

Index: elfutils-portability.patch
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/elfutils-portability.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- elfutils-portability.patch	2 Feb 2006 15:14:17 -0000	1.10
+++ elfutils-portability.patch	2 Feb 2006 15:20:28 -0000	1.11
@@ -1,6 +1,104 @@
+--- elfutils/backends/ChangeLog
++++ elfutils/backends/ChangeLog
+@@ -38,6 +38,11 @@
+ 	* sparc_init.c: Likewise.
+ 	* x86_64_init.c: Likewise.
+ 
++2005-11-22  Roland McGrath  <roland at redhat.com>
++
++	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
++	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
++
+ 2005-11-19  Roland McGrath  <roland at redhat.com>
+ 
+ 	* ppc64_reloc.def: REL30 -> ADDR30.
+@@ -60,6 +65,9 @@
+ 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
+ 	(CLEANFILES): Add libebl_$(m).so.
+ 
++	* Makefile.am (WEXTRA): New variable, substituted by configure.
++	(AM_CFLAGS): Use it in place of -Wextra.
++
+ 	* ppc_reloc.def: Update bits per Alan Modra <amodra at bigpond.net.au>.
+ 	* ppc64_reloc.def: Likewise.
+ 
+--- elfutils/backends/Makefile.am
++++ elfutils/backends/Makefile.am
+@@ -13,12 +13,14 @@
+ ## 3001 King Ranch Road, Ukiah, CA 95482.
+ ##
+ DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DOBJDIR=\"$(shell pwd)\"
++WEXTRA = @WEXTRA@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ if MUDFLAP
+ AM_CFLAGS = -fmudflap
+ else
+ AM_CFLAGS =
+ endif
+-AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
++AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
+ 	     -std=gnu99
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
+ 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+@@ -51,7 +53,7 @@ textrel_check = if readelf -d $@ | fgrep
+ libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ libebl_%.map: Makefile
+--- elfutils/backends/Makefile.in
++++ elfutils/backends/Makefile.in
+@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++WEXTRA = @WEXTRA@
+ XGETTEXT = @XGETTEXT@
+ YACC = @YACC@
+ ac_ct_CC = @ac_ct_CC@
+@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
+- at MUDFLAP_FALSE@	-Wextra -Wformat=2 -std=gnu99
++ at MUDFLAP_FALSE@	$(WEXTRA) -Wformat=2 -std=gnu99
+ @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
+- at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2 -std=gnu99
++ at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99
+ 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
+ libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ 		-Wl,--version-script,$(word 2,$^) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw) $(libmudflap)
+ 	$(textrel_check)
+ 
+ libebl_%.map: Makefile
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -29,6 +29,17 @@
+@@ -1,3 +1,7 @@
++2005-11-22  Roland McGrath  <roland at redhat.com>
++
++	* configure.ac: Check for --as-needed linker option.
++
+ 2005-11-18  Roland McGrath  <roland at redhat.com>
+ 
+ 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
+@@ -45,6 +49,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -20,8 +118,16 @@
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -113,6 +113,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -84,6 +84,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -119,6 +120,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -30,16 +136,16 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/configure
 +++ elfutils/configure
-@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.115'
+@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119'
  PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/'
  
  ac_unique_file="libelf/libelf.h"
--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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GC!
OV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_F!
ALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE LIBEBL_SUBDIR USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF_TRUE GPROF_FALSE GC!
OV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MODVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB YACC LEX LEXLIB LEX_OUTPUT_ROOT WEXTRA LD_AS_NEEDED LOCALEDIR DATADIRNAME NATIVE_LD_TRUE NATIVE_LD_FALSE base_cpu MUDFLAP_TRUE MUDFLAP_FALSE GPROF!
_TRUE GPROF_FALSE GCOV_TRUE GCOV_FALSE BUILD_STATIC_TRUE BUILD_STATIC_FALSE TESTS_RPATH_TRUE TESTS_RPATH_FALSE LIBEBL_SUBDIR HAVE_LIBASM_TRUE HAVE_LIBASM_FALSE STANDALONE_TRUE STANDALONE_FALSE USE_NLS MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -3384,6 +3384,58 @@ echo "$as_me: error: gcc with C99 suppor
+@@ -3385,6 +3385,92 @@ echo "$as_me: error: gcc with C99 suppor
  fi
  
  
@@ -95,20 +201,55 @@
 +fi
 +
 +
++echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
++echo $ECHO_N "checking for --as-needed linker option... $ECHO_C" >&6
++if test "${ac_cv_as_needed+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat > conftest.c <<EOF
++int main (void) { return 0; }
++EOF
++if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
++			    -fPIC -shared -o conftest.so conftest.c
++			    -Wl,--as-needed 1>&5'
++  { (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); }; }
++then
++  ac_cv_as_needed=yes
++else
++  ac_cv_as_needed=no
++fi
++rm -f conftest*
++fi
++echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
++echo "${ECHO_T}$ac_cv_as_needed" >&6
++if test "x$ac_cv_as_needed" = xyes; then
++  LD_AS_NEEDED=-Wl,--as-needed
++else
++  LD_AS_NEEDED=
++fi
++
++
++
++
  LOCALEDIR=$datadir
  
  cat >>confdefs.h <<_ACEOF
-@@ -4925,6 +4977,7 @@ s, at YACC@,$YACC,;t t
+@@ -4987,6 +5073,8 @@ s, at YACC@,$YACC,;t t
  s, at LEX@,$LEX,;t t
  s, at LEXLIB@,$LEXLIB,;t t
  s, at LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 +s, at WEXTRA@,$WEXTRA,;t t
++s, at LD_AS_NEEDED@,$LD_AS_NEEDED,;t t
  s, at LOCALEDIR@,$LOCALEDIR,;t t
  s, at DATADIRNAME@,$DATADIRNAME,;t t
  s, at NATIVE_LD_TRUE@,$NATIVE_LD_TRUE,;t t
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -69,6 +69,15 @@ CFLAGS="$old_CFLAGS"])
+@@ -69,6 +69,34 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
  
@@ -121,6 +262,25 @@
 +AC_SUBST(WEXTRA)
 +AS_IF([test "x$ac_cv_cc_wextra" = xyes], [WEXTRA=-Wextra], [WEXTRA=-W])
 +
++AC_CACHE_CHECK([for --as-needed linker option],
++	       ac_cv_as_needed, [dnl
++cat > conftest.c <<EOF
++int main (void) { return 0; }
++EOF
++if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
++			    -fPIC -shared -o conftest.so conftest.c
++			    -Wl,--as-needed 1>&AS_MESSAGE_LOG_FD])
++then
++  ac_cv_as_needed=yes
++else
++  ac_cv_as_needed=no
++fi
++rm -f conftest*])
++AS_IF([test "x$ac_cv_as_needed" = xyes],
++      [LD_AS_NEEDED=-Wl,--as-needed], [LD_AS_NEEDED=])
++AC_SUBST(LD_AS_NEEDED)
++
++
  LOCALEDIR=$datadir
  AC_SUBST(LOCALEDIR)
  AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
@@ -157,15 +317,23 @@
  noinst_LIBRARIES = libeu.a
 --- elfutils/lib/Makefile.in
 +++ elfutils/lib/Makefile.in
-@@ -135,6 +135,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -177,9 +178,9 @@ sharedstatedir = @sharedstatedir@
+@@ -183,9 +185,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -179,7 +347,7 @@
  libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \
 --- elfutils/libasm/ChangeLog
 +++ elfutils/libasm/ChangeLog
-@@ -24,6 +24,11 @@
+@@ -28,6 +28,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -205,20 +373,28 @@
  endif
 -AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2
 +AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2
- INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
+ INCLUDES = -I. -I$(srcdir) -I.. \
+ 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
  	   -I$(top_srcdir)/lib
- GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/libasm/Makefile.in
 +++ elfutils/libasm/Makefile.in
-@@ -167,6 +167,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -138,6 +138,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -173,6 +174,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -209,9 +210,9 @@ sharedstatedir = @sharedstatedir@
+@@ -215,9 +217,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Werror -Wunused \
@@ -227,9 +403,9 @@
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -std=gnu99 -Wall -Wshadow -Werror \
 - at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2
- INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
+ INCLUDES = -I. -I$(srcdir) -I.. \
+ 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\
  	   -I$(top_srcdir)/lib
- 
 --- elfutils/libcpu/ChangeLog
 +++ elfutils/libcpu/ChangeLog
 @@ -1,3 +1,8 @@
@@ -255,15 +431,23 @@
  noinst_LIBRARIES = libcpu_i386.a
 --- elfutils/libcpu/Makefile.in
 +++ elfutils/libcpu/Makefile.in
-@@ -130,6 +130,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -101,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -136,6 +137,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -171,7 +172,7 @@ sbindir = @sbindir@
+@@ -177,7 +179,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -274,7 +458,7 @@
  libcpu_i386_a_SOURCES = i386_dis.c
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -239,6 +239,11 @@
+@@ -266,6 +266,11 @@
  
  2005-05-31  Roland McGrath  <roland at redhat.com>
  
@@ -288,7 +472,7 @@
  
 --- elfutils/libdw/Makefile.am
 +++ elfutils/libdw/Makefile.am
-@@ -13,12 +13,13 @@
+@@ -13,6 +13,7 @@
  ## 3001 King Ranch Road, Ukiah, CA 95482.
  ##
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DIS_LIBDW
@@ -296,7 +480,9 @@
  if MUDFLAP
  AM_CFLAGS = -fmudflap
  else
- AM_CFLAGS =
+@@ -21,7 +22,7 @@ endif
+ if BUILD_STATIC
+ AM_CFLAGS += -fpic
  endif
 -AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
 +AM_CFLAGS += -Wall -Werror -Wshadow -Wunused -Wformat=2 $(WEXTRA) -std=gnu99
@@ -305,29 +491,38 @@
  
 --- elfutils/libdw/Makefile.in
 +++ elfutils/libdw/Makefile.in
-@@ -206,6 +206,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -178,6 +178,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -213,6 +214,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -248,9 +249,9 @@ sharedstatedir = @sharedstatedir@
+@@ -255,9 +257,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
-- at MUDFLAP_FALSE@	-Wextra -std=gnu99
-+ at MUDFLAP_FALSE@	$(WEXTRA) -std=gnu99
- @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -Wall -Werror -Wshadow -Wunused \
-- at MUDFLAP_TRUE@	-Wformat=2 -Wextra -std=gnu99
-+ at MUDFLAP_TRUE@	-Wformat=2 $(WEXTRA) -std=gnu99
+ @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Werror -Wshadow \
+- at MUDFLAP_FALSE@	-Wunused -Wformat=2 -Wextra -std=gnu99
++ at MUDFLAP_FALSE@	-Wunused -Wformat=2 $(WEXTRA) -std=gnu99
+ @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap $(am__append_1) -Wall -Werror \
+- at MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
++ at MUDFLAP_TRUE@	-Wshadow -Wunused -Wformat=2 $(WEXTRA) \
++ at MUDFLAP_TRUE@	-std=gnu99
  INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../libelf -I.. -I$(srcdir)/../lib
  COMPILE.os = $(filter-out -fprofile-arcs, $(filter-out -ftest-coverage, \
  						       $(COMPILE)))
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -210,6 +210,11 @@
+@@ -259,6 +259,11 @@
  
  2005-07-21  Roland McGrath  <roland at redhat.com>
  
@@ -358,15 +553,23 @@
  VERSION = 1
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
-@@ -163,6 +163,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -136,6 +136,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -171,6 +172,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -205,9 +206,9 @@ sharedstatedir = @sharedstatedir@
+@@ -213,9 +215,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -Wall -Werror -Wshadow -Wunused -Wformat=2 \
@@ -380,7 +583,7 @@
  
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -152,6 +152,11 @@
+@@ -400,6 +400,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -408,18 +611,26 @@
 +AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused $(WEXTRA) -Wformat=2 \
  	     -std=gnu99
  
- INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 --- elfutils/libebl/Makefile.in
 +++ elfutils/libebl/Makefile.in
-@@ -258,6 +258,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -131,6 +131,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -166,6 +167,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -300,9 +301,9 @@ sharedstatedir = @sharedstatedir@
+@@ -208,9 +210,9 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \
@@ -428,12 +639,12 @@
  @MUDFLAP_TRUE at AM_CFLAGS = -fmudflap -fpic -Wall -Wshadow -Werror \
 - at MUDFLAP_TRUE@	-Wunused -Wextra -Wformat=2 -std=gnu99
 + at MUDFLAP_TRUE@	-Wunused $(WEXTRA) -Wformat=2 -std=gnu99
- INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/lib -I..
- lib_LIBRARIES = libebl.a
- modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64
+ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
+ 	   -I$(top_srcdir)/lib -I..
+ 
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -91,6 +91,11 @@
+@@ -113,6 +113,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.
  
@@ -498,15 +709,23 @@
  @MUDFLAP_FALSE at noinst_PROGRAMS = $(am__EXEEXT_1)
  @MUDFLAP_TRUE at am_libelf_pic_a_OBJECTS =
  subdir = libelf
-@@ -210,6 +210,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -181,6 +181,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -216,6 +217,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = 1
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -252,10 +253,10 @@ sharedstatedir = @sharedstatedir@
+@@ -258,10 +260,10 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  @MUDFLAP_FALSE at AM_CFLAGS = $(am__append_1) -Wall -Wshadow -Werror \
@@ -521,8 +740,16 @@
  GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include)
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -111,6 +111,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -82,6 +82,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -117,6 +118,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -531,8 +758,16 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -135,6 +135,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -106,6 +106,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -141,6 +142,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
@@ -541,7 +776,7 @@
  ac_ct_CC = @ac_ct_CC@
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -220,6 +220,11 @@
+@@ -236,6 +236,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -589,15 +824,23 @@
  INCLUDES = -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
 --- elfutils/src/Makefile.in
 +++ elfutils/src/Makefile.in
-@@ -221,6 +221,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -192,6 +192,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -227,6 +228,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@ -d
  ac_ct_CC = @ac_ct_CC@
-@@ -265,12 +266,12 @@ target_alias = @target_alias@
+@@ -271,12 +273,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 \
@@ -666,7 +909,7 @@
  cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -181,6 +181,11 @@
+@@ -349,6 +349,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -689,24 +932,32 @@
 -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
 +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
- AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libebl
+ BUILD_RPATH = \$$ORIGIN/../backends
  else
 -AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
 +AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 \
  	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
- AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
+ BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
  endif
 --- elfutils/tests/Makefile.in
 +++ elfutils/tests/Makefile.in
-@@ -291,6 +291,7 @@ SHELL = @SHELL@
- STRIP = @STRIP@
+@@ -283,6 +283,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LD_AS_NEEDED = @LD_AS_NEEDED@
+ LEX = @LEX@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+@@ -318,6 +319,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@
+ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
 +WEXTRA = @WEXTRA@
  XGETTEXT = @XGETTEXT@
  YACC = @YACC@
  ac_ct_CC = @ac_ct_CC@
-@@ -332,10 +333,10 @@ sbindir = @sbindir@
+@@ -359,10 +361,10 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -718,4 +969,4 @@
 + at MUDFLAP_TRUE@AM_CFLAGS = -Wall -Werror $(WEXTRA) -std=gnu99 -fmudflap\
  @MUDFLAP_TRUE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
  
- @MUDFLAP_FALSE at AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf
+ @MUDFLAP_TRUE at BUILD_RPATH = \$$ORIGIN/../backends


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	2 Feb 2006 15:14:17 -0000	1.16
+++ sources	2 Feb 2006 15:20:28 -0000	1.17
@@ -1,2 +1,3 @@
 f39bcf7e1c380e8eaa768e1230dc2fad  systemtap-0.5.4.tar.gz
 57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz
+6e30f194fc5daae3bfd92385e41f64c7  elfutils-portability.patch



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:25:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:25:21 -0500
Subject: rpms/module-init-tools/FC-4 module-init-tools-allconf.patch, NONE,
	1.1 module-init-tools-noescape.patch, NONE,
	1.1 module-init-tools.spec, 1.12, 1.13 sources, 1.4,
	1.5 module-init-tools-3.1-pre5.tar.bz2.sign, 1.1,
	NONE module-init-tools-badmodule.patch, 1.1,
	NONE module-init-tools-defconfig.patch, 1.3, NONE
Message-ID: <200602021525.k12FPLVF006250@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6209

Modified Files:
	module-init-tools.spec sources 
Added Files:
	module-init-tools-allconf.patch 
	module-init-tools-noescape.patch 
Removed Files:
	module-init-tools-3.1-pre5.tar.bz2.sign 
	module-init-tools-badmodule.patch 
	module-init-tools-defconfig.patch 
Log Message:
- FC4 version with fb modules blacklisted

module-init-tools-allconf.patch:
 modprobe.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE module-init-tools-allconf.patch ---
--- module-init-tools-3.2-pre7/modprobe.c.dist	2005-06-01 07:26:28.000000000 -0400
+++ module-init-tools-3.2-pre7/modprobe.c	2005-07-08 15:30:55.000000000 -0400
@@ -1189,8 +1189,8 @@
 
 static const char *default_configs[] = 
 {
-	"/etc/modprobe.conf",
 	"/etc/modprobe.d",
+	"/etc/modprobe.conf",
 };
 
 static void read_toplevel_config(const char *filename,
@@ -1214,9 +1214,8 @@
 
 	/* Try defaults. */
 	for (i = 0; i < ARRAY_SIZE(default_configs); i++) {
-		if (read_config(default_configs[i], name, dump_only, removing,
-				options, commands, aliases, blacklist))
-			return;
+		read_config(default_configs[i], name, dump_only, removing,
+			    options, commands, aliases, blacklist);
 	}
 }
 

module-init-tools-noescape.patch:
 depmod.c |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

--- NEW FILE module-init-tools-noescape.patch ---
diff -ru depmod.c.old depmod.c
--- depmod.c	2005-04-30 08:38:46.000000000 -0400
+++ depmod.c	2005-09-08 15:52:26.000000000 -0400
@@ -607,13 +607,8 @@
 	else
 		afterslash++;
 
-	/* Convert to underscores, stop at first . */
-	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
-		if (afterslash[i] == '-')
-			modname[i] = '_';
-		else
+	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++)
 			modname[i] = afterslash[i];
-	}
 	modname[i] = '\0';
 }
 


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- module-init-tools.spec	22 Jul 2005 21:07:58 -0000	1.12
+++ module-init-tools.spec	2 Feb 2006 15:25:18 -0000	1.13
@@ -1,14 +1,16 @@
+%define preversion pre9
 Summary: Kernel module management utilities.
 Name: module-init-tools
-Version: 3.1
-Release: 4
+Version: 3.2
+Release: 0.%{preversion}.0.FC4.1
 License: GPL
 Group: System Environment/Kernel
-Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2
-Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}.tar.bz2.sign
+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
-Patch1: module-init-tools-defconfig.patch
-Patch2: module-init-tools-badmodule.patch
+Source3: blacklist-compat
+Patch1: module-init-tools-allconf.patch
+Patch2: module-init-tools-noescape.patch
 Exclusiveos: Linux
 Prereq: /sbin/chkconfig sh-utils
 Obsoletes: modules modutils-devel modutils
@@ -23,9 +25,9 @@
 are two examples of loaded and unloaded modules.
 
 %prep
-%setup -q -n module-init-tools-%{version}
+%setup -q -n module-init-tools-%{version}-%{preversion}
 %patch1 -p1 -b .dist
-%patch2 -p1 -b .boom
+%patch2 -p0 -b .noescape
 
 %build
 export CFLAGS="-Os -g -DCONFIG_NO_BACKWARDS_COMPAT=1"
@@ -49,14 +51,20 @@
 install -m 755 generate-modprobe.conf \
  $RPM_BUILD_ROOT/sbin
 
+install -m 644 modprobe.conf.5 \
+ $RPM_BUILD_ROOT/%{_mandir}/man5/modprobe.d.5
+
 mkdir -p $RPM_BUILD_ROOT/etc
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.conf.dist
+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
 
 find $RPM_BUILD_ROOT/sbin/ -name '*.static' -exec rm {} \;
 
 mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin
 
 install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static
+touch $RPM_BUILD_ROOT/etc/modprobe.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,14 +86,34 @@
 
 %files
 %defattr(-,root,root)
-/etc/modprobe.conf.dist
+/etc/modprobe.d
 /sbin/*
 %{_mandir}/*/*
+%ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
-* Fri Jul 22 2005 Bill Nottingham <notting at redhat.com> 3.1-4
+* Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.1
+- FC4 version with fb modules blacklisted
+
+* Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.2
+- ghost /etc/modprobe.conf (#130603)
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Sun Nov 06 2005 Florian La Roche <laroche at redhat.com>
+- update to 3.2pre9
+
+* Fri Sep  9 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.3
+- don't escape '-' in module names for module.alias
+
+* Fri Jul 22 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.2
 - fix depmod segfault on bad modules (#162716)
 
+* Fri Jul  8 2005 Bill Nottingham <notting at redhat.com> 3.2-0.pre7.1
+- update to 3.2-pre7
+- put modprobe.conf.dist in /etc/modprobe.d
+
 * Mon Apr 25 2005 Bill Nottingham <notting at redhat.com> 3.1-3
 - load snd-seq-device/snd-seq-oss on load of pcm devices (part of #147637)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Mar 2005 23:37:32 -0000	1.4
+++ sources	2 Feb 2006 15:25:18 -0000	1.5
@@ -1,2 +1,2 @@
-8ddecbcf0e56aef8617f67a3906faf3e  module-init-tools-3.1.tar.bz2
-d352d8f0d981baae7990efc2f8659494  module-init-tools-3.1.tar.bz2.sign
+f0ede5936c52e3d59411bd9594ad364f  module-init-tools-3.2-pre9.tar.bz2
+eb9afce36c140208a7245e1ae4337aeb  module-init-tools-3.2-pre9.tar.bz2.sign


--- module-init-tools-3.1-pre5.tar.bz2.sign DELETED ---


--- module-init-tools-badmodule.patch DELETED ---


--- module-init-tools-defconfig.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:26:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:26:33 -0500
Subject: rpms/module-init-tools/FC-4 blacklist-compat,NONE,1.1
Message-ID: <200602021526.k12FQXgn006863@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6829

Added Files:
	blacklist-compat 
Log Message:
- FC4 version with fb modules blacklisted


--- NEW FILE blacklist-compat ---
#
# Listing a module here prevents the hotplug scripts from loading it.
# Usually that'd be so that some other driver will bind it instead,
# no matter which driver happens to get probed first.  Sometimes user
# mode tools can also control driver binding.
#
# Syntax:  driver name alone (without any spaces) on a line. Other
# lines are ignored.
#

# watchdog drivers
blacklist i8xx_tco

# framebuffer drivers
blacklist aty128fb
blacklist atyfb
blacklist radeonfb
blacklist i810fb
blacklist cirrusfb
blacklist intelfb
blacklist kyrofb
blacklist i2c-matroxfb
blacklist hgafb
blacklist nvidiafb
blacklist rivafb
blacklist savagefb
blacklist sstfb
blacklist neofb
blacklist tridentfb
blacklist tdfxfb
blacklist virgefb
blacklist vga16fb

# ISDN - see bugs 154799, 159068
blacklist hisax
blacklist hisax_fcpcipnp



From fedora-cvs-commits at redhat.com  Thu Feb  2 15:59:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 10:59:38 -0500
Subject: rpms/systemtap/devel sources,1.13,1.14 systemtap.spec,1.19,1.20
Message-ID: <200602021559.k12FxcAT031880@cvs.devel.redhat.com>

Author: fche

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31848

Modified Files:
	sources systemtap.spec 
Log Message:
Automatic update to 0.5.4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Jan 2006 07:52:34 -0000	1.13
+++ sources	2 Feb 2006 15:59:35 -0000	1.14
@@ -1,2 +1,3 @@
-5aef2312e7e767902e398811ed9388c9  systemtap-0.5.3.tar.gz
+f39bcf7e1c380e8eaa768e1230dc2fad  systemtap-0.5.4.tar.gz
 57b9e4ab3b9fb597a72badf26f7f9bdc  elfutils-0.119.tar.gz
+6e30f194fc5daae3bfd92385e41f64c7  elfutils-portability.patch


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- systemtap.spec	17 Jan 2006 07:52:34 -0000	1.19
+++ systemtap.spec	2 Feb 2006 15:59:35 -0000	1.20
@@ -2,7 +2,7 @@
 %define elfutils_version 0.119
 
 Name: systemtap
-Version: 0.5.3
+Version: 0.5.4
 Release: 2
 Summary: Instrumentation System
 Group: Development/System
@@ -13,8 +13,8 @@
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
-Requires: kernel-devel
-# or is that kernel-smp-devel?
+# Requires: kernel-devel
+# or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
 # Suggest: kernel-debuginfo
 
@@ -100,9 +100,12 @@
 
 
 %changelog
-* Mon Jan 16 2006 Roland McGrath <roland at redhat.com> - 0.5.3-2
+* Thu Feb  2 2006 Frank Eigler <fche at redhat.com> - 0.5.4-2
 - Rebuilt for devel
 
+* Wed Feb  1 2006 Frank Ch. Eigler <fche at redhat.com> - 0.5.4-1
+- PRs 1916, 2205, 2142, 2060, 1379
+
 * Mon Jan 16 2006 Roland McGrath <roland at redhat.com> - 0.5.3-1
 - Many changes, affected PRs include: 2056, 1144, 1379, 2057,
   2060, 1972, 2140, 2148



From fedora-cvs-commits at redhat.com  Thu Feb  2 16:37:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 11:37:27 -0500
Subject: rpms/tcl/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200602021637.k12GbRJg024488@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	.cvsignore sources 
Log Message:
Update sources list to tcl8.4.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jul 2005 06:39:26 -0000	1.7
+++ .cvsignore	2 Feb 2006 16:37:24 -0000	1.8
@@ -1,2 +1,3 @@
 tcl8.4.11-src.tar.gz
 tcl8.4.11-html.tar.gz
+tcl8.4.12-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jul 2005 06:39:26 -0000	1.7
+++ sources	2 Feb 2006 16:37:24 -0000	1.8
@@ -1,2 +1 @@
-629dfea34e4087eb4683f834060abb63  tcl8.4.11-src.tar.gz
-0287d3e83be1223ab5784e8abc70be2b  tcl8.4.11-html.tar.gz
+7480432d8730263f267952788eb4839b  tcl8.4.12-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 16:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 11:45:10 -0500
Subject: rpms/system-config-nfs/devel .cvsignore, 1.24, 1.25 sources, 1.27,
	1.28 system-config-nfs.spec, 1.30, 1.31
Message-ID: <200602021645.k12GjAuB028025@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
don't complain when trying to edit a share (#179687)
handle wildcards in warning messages for duplicates
reset properties dialog before being shown for the first time



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	30 Jan 2006 16:45:11 -0000	1.24
+++ .cvsignore	2 Feb 2006 16:45:07 -0000	1.25
@@ -1 +1 @@
-system-config-nfs-1.3.16.tar.bz2
+system-config-nfs-1.3.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	30 Jan 2006 16:45:11 -0000	1.27
+++ sources	2 Feb 2006 16:45:07 -0000	1.28
@@ -1 +1 @@
-d27c00819e8bb8e5376f8c9c8207e8ef  system-config-nfs-1.3.16.tar.bz2
+f76dbc29f2f713f7a5fd806821036a32  system-config-nfs-1.3.18.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-nfs.spec	30 Jan 2006 16:45:11 -0000	1.30
+++ system-config-nfs.spec	2 Feb 2006 16:45:07 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.16
+Version: 1.3.18
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -70,6 +70,13 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-nfs
 
 %changelog
+* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.18
+- don't complain when trying to edit a share (#179687)
+- handle wildcards in warning messages for duplicates
+
+* Wed Feb 01 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.17
+- reset properties dialog before being shown for the first time
+
 * Mon Jan 30 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.16
 - avoid exporting a share more than once to a specific client
 - allow exporting a share with different settings for different clients



From fedora-cvs-commits at redhat.com  Thu Feb  2 16:48:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 11:48:27 -0500
Subject: rpms/system-config-nfs/FC-4 .cvsignore, 1.20, 1.21 sources, 1.23,
	1.24 system-config-nfs.spec, 1.29, 1.30
Message-ID: <200602021648.k12GmRuc009456@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/system-config-nfs/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9304

Modified Files:
	.cvsignore sources system-config-nfs.spec 
Log Message:
don't complain when trying to edit a share (#179687)
handle wildcards in warning messages for duplicates
reset properties dialog before being shown for the first time



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	30 Jan 2006 16:47:39 -0000	1.20
+++ .cvsignore	2 Feb 2006 16:48:24 -0000	1.21
@@ -1 +1 @@
-system-config-nfs-1.3.16.tar.bz2
+system-config-nfs-1.3.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Jan 2006 16:47:39 -0000	1.23
+++ sources	2 Feb 2006 16:48:24 -0000	1.24
@@ -1 +1 @@
-d27c00819e8bb8e5376f8c9c8207e8ef  system-config-nfs-1.3.16.tar.bz2
+f76dbc29f2f713f7a5fd806821036a32  system-config-nfs-1.3.18.tar.bz2


Index: system-config-nfs.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- system-config-nfs.spec	30 Jan 2006 17:08:19 -0000	1.29
+++ system-config-nfs.spec	2 Feb 2006 16:48:24 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: NFS server configuration tool
 Name: system-config-nfs
-Version: 1.3.16
-Release: 0.fc4.2
+Version: 1.3.18
+Release: 0.fc4.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -72,6 +72,13 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-nfs
 
 %changelog
+* Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.18
+- don't complain when trying to edit a share (#179687)
+- handle wildcards in warning messages for duplicates
+
+* Wed Feb 01 2006 Nils Philippsen <nphilipp at redhat.com> 1.3.17
+- reset properties dialog before being shown for the first time
+
 * Mon Jan 30 2006 Nils Philippsen <nphilipp at redhat.com>
 - use pam_stack on FC-4
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 16:57:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 11:57:36 -0500
Subject: rpms/openmotif/devel openMotif-2.2.3-CVE-2005-3964.patch, NONE,
	1.1 openMotif-2.2.3-overrun.patch, NONE,
	1.1 openMotif-2.2.3-text_paste.patch, NONE,
	1.1 openmotif-2.3.0-CVS-2006-02-02.patch, NONE,
	1.1 openmotif.spec, 1.40, 1.41
Message-ID: <200602021657.k12Gvaa3005306@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5286

Modified Files:
	openmotif.spec 
Added Files:
	openMotif-2.2.3-CVE-2005-3964.patch 
	openMotif-2.2.3-overrun.patch openMotif-2.2.3-text_paste.patch 
	openmotif-2.3.0-CVS-2006-02-02.patch 
Log Message:
[tw]
- new CVS version 2006-02-02
- fixed CVE-2005-3964: libUil buffer overflows (#174814)
- fixed XmList out of bound accesses (#167701)
- fixed pasting into TextField (#179549)



openMotif-2.2.3-CVE-2005-3964.patch:
 UilDiags.c  |    4 ++--
 UilSrcSrc.c |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE openMotif-2.2.3-CVE-2005-3964.patch ---
--- openMotif-2.2.3/clients/uil/UilSrcSrc.c.CVE-2005-3964	2002-01-10 21:55:47.000000000 +0100
+++ openMotif-2.2.3/clients/uil/UilSrcSrc.c	2005-12-22 18:21:04.000000000 +0100
@@ -631,7 +631,8 @@
 
     /* place the file name in the expanded_name buffer */
 
-    strcpy(buffer, c_file_name);
+    strncpy(buffer, c_file_name, 256);
+    buffer[255] = '\0';
 
 /*    Determine if this is the main file or an include file.  */
 
--- openMotif-2.2.3/clients/uil/UilDiags.c.CVE-2005-3964	2005-12-22 18:17:10.000000000 +0100
+++ openMotif-2.2.3/clients/uil/UilDiags.c	2005-12-22 18:17:14.000000000 +0100
@@ -293,12 +293,12 @@
     va_start(ap, l_start_column);
 
 #ifndef NO_MESSAGE_CATALOG
-    vsprintf( msg_buffer, 
+    vsnprintf( msg_buffer, 132,
 	      catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ],
 		      diag_rz_msg_table[ message_number ].ac_text), 
 	     ap );
 #else
-    vsprintf( msg_buffer, 
+    vsnprintf( msg_buffer, 132,
 	      diag_rz_msg_table[ message_number ].ac_text, 
 	      ap );
 #endif

openMotif-2.2.3-overrun.patch:
 List.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE openMotif-2.2.3-overrun.patch ---
--- openMotif-2.2.3/lib/Xm/List.c.overrun	2006-01-30 17:31:22.000000000 +0100
+++ openMotif-2.2.3/lib/Xm/List.c	2006-02-01 17:11:10.000000000 +0100
@@ -4111,6 +4111,11 @@
       end = first;
     }
 
+  if (start < 0)
+    start = 0;
+  if (end >= lw->list.itemCount)
+    end = lw->list.itemCount - 1;
+
   for (; start <= end; start++)
     {
       lw->list.InternalList[start]->selected = select;
@@ -4140,6 +4145,11 @@
       end = tmp;
     }
 
+  if (start < 0)
+    start = 0;
+  if (end >= lw->list.itemCount)
+    end = lw->list.itemCount - 1;
+
   tmp = lw->list.StartItem;
   for (; start <= end; start++)
     if ((start != tmp) || dostart)
@@ -4236,6 +4246,9 @@
   if (lw->list.LastHLItem == item)
     return;
 
+  if (item < 0 || item >= lw->list.itemCount)
+    return;
+
   switch(lw->list.SelectionPolicy)
     {
     case XmBROWSE_SELECT:
@@ -4269,7 +4282,10 @@
     case XmEXTENDED_SELECT:
       /* BEGIN OSF Fix CR 5954 */
       dir = (lw->list.LastHLItem < item) ? 1 : -1;
-      while (lw->list.LastHLItem != item)
+      while (lw->list.LastHLItem != item && 
+	     lw->list.StartItem >= 0 && lw->list.EndItem >= 0 && 
+	     lw->list.StartItem < lw->list.itemCount && 
+	     lw->list.EndItem < lw->list.itemCount)
 	{
 	  lw->list.LastHLItem += dir;
 
@@ -4308,6 +4324,9 @@
 
   if (lw->list.LastHLItem == item) return;
 
+  if (item < 0 || item >= lw->list.itemCount)
+    return;
+
   /* First the non-addmode case */
   if (lw->list.SelectionMode == XmNORMAL_MODE)
     {
@@ -5609,6 +5628,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)
     {

openMotif-2.2.3-text_paste.patch:
 TextF.c    |   14 +++++++++-----
 TextFSel.c |    4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

--- NEW FILE openMotif-2.2.3-text_paste.patch ---
--- 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 @@
 	wchar_t * wc_value;
 	
 	wc_value = (wchar_t*)XtMalloc ((unsigned)
-				       (ds->length * sizeof(wchar_t)));
+				       ((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);
 	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
@@ -2886,7 +2886,8 @@
   int free_insert = (int)False;
   char *insert_orig;
   int insert_length_orig;
-  
+  int size = 0;
+
   VerifyBounds(tf, &replace_prev, &replace_next);
   
   if (!TextF_Editable(tf)) {
@@ -2931,8 +2932,12 @@
      */
     insert_length_orig = insert_length;
     if (insert_length > 0) {
-    	insert_orig = XtMalloc(insert_length * tf->text.max_char_size);
-    	bcopy(insert, insert_orig, insert_length * tf->text.max_char_size);
+        if (tf->text.max_char_size == 1)
+	    size = sizeof(char);
+	else
+	    size = sizeof(wchar_t);
+	insert_orig = XtMalloc(insert_length * size);
+	bcopy(insert, insert_orig, insert_length * size);
     } else
 	insert_orig = NULL;
     if (!ModifyVerify(tf, event, &replace_prev, &replace_next,
@@ -2947,8 +2952,7 @@
     } else {
       if (FUnderVerifyPreedit(tf))
 	if (insert_length != insert_length_orig ||
-          memcmp(insert, insert_orig, 
-		  insert_length * tf->text.max_char_size) != 0) {
+          memcmp(insert, insert_orig, insert_length * size) != 0) {
 	  FVerifyCommitNeeded(tf) = True;
 	  PreEnd(tf) += insert_length - insert_length_orig;
 	}

openmotif-2.3.0-CVS-2006-02-02.patch:
 Makefile.am                          |    3 
 Makefile.in                          |    3 
 RELEASE                              |    2 
 RELNOTES                             |   20 
 bitmaps/Makefile.am                  |    2 
 bitmaps/Makefile.in                  |    2 
 config/imake/imake.c                 |   19 
 config/util/mkshadow/CVS/Root        |    2 
 configure                            |    2 
 configure.ac                         |    2 
 demos/programs/getsubres/getsubres.c |    3 
 lib/Mrm/MrmIheader.c                 |    3 
 lib/Mrm/MrmItop.c                    |    4 
 lib/Xm/BitmapsI.h                    |    2 
 lib/Xm/ColorP.h                      |    2 
 lib/Xm/ColorS.c                      |    4 
 lib/Xm/DataF.c                       |   44 +-
 lib/Xm/DataFP.h                      |    5 
 lib/Xm/DragOverSP.h                  |    2 
 lib/Xm/DropDown.h                    |    2 
 lib/Xm/Ext18ListP.h                  |    2 
 lib/Xm/FileSB.c                      |   31 +
 lib/Xm/FontS.c                       |    4 
 lib/Xm/Hierarchy.c                   |    2 
 lib/Xm/I18List.c                     |    7 
 lib/Xm/IconGI.h                      |    2 
 lib/Xm/Imakefile                     |    6 
 lib/Xm/Label.c                       |    8 
 lib/Xm/LabelG.c                      |    2 
 lib/Xm/LabelGI.h                     |    2 
 lib/Xm/List.c                        |    7 
 lib/Xm/Makefile.am                   |    4 
 lib/Xm/Makefile.in                   |   31 -
 lib/Xm/MessagesI.h                   |    2 
 lib/Xm/MultiList.c                   |    2 
 lib/Xm/MultiList.h                   |    2 
 lib/Xm/MwmUtil.h                     |    1 
 lib/Xm/RCHookI.h                     |    2 
 lib/Xm/ResEncod.c                    |    2 
 lib/Xm/RowColumn.c                   |    2 
 lib/Xm/TabList.h                     |    2 
 lib/Xm/Text.c                        |    2 
 lib/Xm/TextF.c                       |   52 +-
 lib/Xm/TextFP.h                      |    2 
 lib/Xm/TextOut.c                     |   60 ++
 lib/Xm/ToolTipI.h                    |    5 
 lib/Xm/TxtPropCv.h                   |    2 
 lib/Xm/Xm.c                          |   63 ++
 lib/Xm/XmI.h                         |    6 
 lib/Xm/XmStrDefs.h                   |    2 
 lib/Xm/XmStrDefs.ht                  |    2 
 lib/Xm/XmStrDefs22.h                 |    2 
 lib/Xm/XmStrDefs22.ht                |    2 
 lib/Xm/XmStrDefs23.h                 |    2 
 lib/Xm/XmStrDefs23.ht                |    2 
 lib/Xm/XmString.c                    |   98 +++-
 lib/Xm/XpmAttrib.c                   |   14 
 lib/Xm/XpmCrBufFrI.c                 |   96 +++-
 lib/Xm/XpmCrDatFrI.c                 |   85 +++
 lib/Xm/XpmI.h                        |   14 
 lib/Xm/XpmRdFToBuf.c                 |    7 
 lib/Xm/XpmRdFToI.c                   |   36 +
 lib/Xm/XpmWrFFrBuf.c                 |    4 
 lib/Xm/XpmWrFFrI.c                   |   33 +
 lib/Xm/Xpmcreate.c                   |   92 ++--
 lib/Xm/Xpmdata.c                     |   11 
 lib/Xm/Xpmhashtab.c                  |    6 
 lib/Xm/Xpmmisc.c                     |    2 
 lib/Xm/Xpmparse.c                    |   70 +--
 lib/Xm/Xpms_popen.c                  |  181 ++++++++
 lib/Xm/Xpmscan.c                     |   33 -
 ltmain.sh                            |  769 +++++++++++++++++++++++++----------
 72 files changed, 1520 insertions(+), 486 deletions(-)

--- NEW FILE openmotif-2.3.0-CVS-2006-02-02.patch ---
diff -urN openmotif-2.3.0/bitmaps/Makefile.am /tmp/openmotif-2.3.0/bitmaps/Makefile.am
--- openmotif-2.3.0/bitmaps/Makefile.am	2002-02-23 14:05:43.000000000 +0100
+++ /tmp/openmotif-2.3.0/bitmaps/Makefile.am	2005-12-19 14:21:20.000000000 +0100
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = $(bm_HEADERS) Imakefile
+EXTRA_DIST = Imakefile
 
 bmdir = @INCDIR@/bitmaps
 
diff -urN openmotif-2.3.0/bitmaps/Makefile.in /tmp/openmotif-2.3.0/bitmaps/Makefile.in
--- openmotif-2.3.0/bitmaps/Makefile.in	2005-11-30 17:41:14.000000000 +0100
+++ /tmp/openmotif-2.3.0/bitmaps/Makefile.in	2005-12-19 14:45:56.000000000 +0100
@@ -207,7 +207,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(bm_HEADERS) Imakefile
+EXTRA_DIST = Imakefile
 bmdir = @INCDIR@/bitmaps
 bm_HEADERS = \
 	xm_error \
diff -urN openmotif-2.3.0/config/imake/imake.c /tmp/openmotif-2.3.0/config/imake/imake.c
--- openmotif-2.3.0/config/imake/imake.c	2002-01-05 16:20:55.000000000 +0100
+++ /tmp/openmotif-2.3.0/config/imake/imake.c	2005-12-16 16:04:49.000000000 +0100
@@ -961,23 +961,38 @@
 static void get_libc_version(inFile)
   FILE* inFile;
 {
-  char *aout = tmpnam (NULL);
+  char aout[PATH_MAX];
   FILE *fp;
   const char *format = "%s -o %s -x c -";
   char *cc;
   int len;
   char *command;
+  char *tmpdir;
+  int tmpfd;
+  
+  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13))
+    strcpy(aout, tmpdir);
+  else
+    strcpy(aout, "/tmp");
+  strcat(aout, "/imakeXXXXXX");
+  
+  if((tmpfd = mkstemp(aout)) == -1) {
+    perror("mkstemp");
+    abort();
+  }
 
   cc = getenv ("CC");
   if (cc == NULL)
     cc = "gcc";
   len = strlen (aout) + strlen (format) + strlen (cc);
   if (len < 128) len = 128;
-  command = alloca (len);
+  if((command = alloca (len)) == NULL)
+    abort();
 
   if (snprintf (command , len, format, cc, aout) == len)
     abort ();
 
+  close(tmpfd);
   fp = popen (command, "w");
   if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
       || pclose (fp) != 0)
diff -urN openmotif-2.3.0/config/util/mkshadow/CVS/Root /tmp/openmotif-2.3.0/config/util/mkshadow/CVS/Root
--- openmotif-2.3.0/config/util/mkshadow/CVS/Root	2005-11-30 17:08:17.000000000 +0100
+++ /tmp/openmotif-2.3.0/config/util/mkshadow/CVS/Root	2005-12-01 17:08:50.000000000 +0100
@@ -1 +1 @@
-:pserver:yura at cvs.motifzone.net:/cvs
+:pserver:anonymous at cvs.motifzone.net:/cvs
diff -urN openmotif-2.3.0/configure /tmp/openmotif-2.3.0/configure
--- openmotif-2.3.0/configure	2005-11-30 17:41:08.000000000 +0100
+++ /tmp/openmotif-2.3.0/configure	2005-12-19 14:45:54.000000000 +0100
@@ -27243,7 +27243,7 @@
 
 if test x$GCC = xyes
 then
-    CFLAGS="$CFLAGS -Wall -g -Wno-unused -Wno-comment"
+    CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
 fi
 
 cat >>confdefs.h <<\_ACEOF
diff -urN openmotif-2.3.0/configure.ac /tmp/openmotif-2.3.0/configure.ac
--- openmotif-2.3.0/configure.ac	2005-11-30 12:52:10.000000000 +0100
+++ /tmp/openmotif-2.3.0/configure.ac	2005-12-19 14:21:20.000000000 +0100
@@ -150,7 +150,7 @@
 
 if test x$GCC = xyes
 then
-    CFLAGS="$CFLAGS -Wall -g -Wno-unused -Wno-comment"
+    CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
 fi
 AC_DEFINE(NO_OL_COMPAT, 1, "No OL Compatability")
 
diff -urN openmotif-2.3.0/demos/programs/getsubres/getsubres.c /tmp/openmotif-2.3.0/demos/programs/getsubres/getsubres.c
--- openmotif-2.3.0/demos/programs/getsubres/getsubres.c	2002-02-14 16:50:18.000000000 +0100
+++ /tmp/openmotif-2.3.0/demos/programs/getsubres/getsubres.c	2005-12-16 16:04:58.000000000 +0100
@@ -384,7 +384,8 @@
 }
 
 static String fallbacks[] = {
-    "*help_manager.helpFile: getsubres"
+    "*help_manager.helpFile: getsubres",
+    NULL
 };
 
 #define APP_CLASS "XmdGetsubres"
diff -urN openmotif-2.3.0/lib/Mrm/MrmIheader.c /tmp/openmotif-2.3.0/lib/Mrm/MrmIheader.c
--- openmotif-2.3.0/lib/Mrm/MrmIheader.c	2002-03-04 22:40:11.000000000 +0100
+++ /tmp/openmotif-2.3.0/lib/Mrm/MrmIheader.c	2005-12-16 16:05:03.000000000 +0100
@@ -228,9 +228,10 @@
 
   {
     /* sscanf() may call ungetc(), which would write the XmConst string. */
-    char buf[XtNumber(idb__database_version) + 1];
+    char *buf = XtMalloc(strlen(idb__database_version) + 1);
     strcpy(buf, idb__database_version);
     sscanf(buf, "URM %d.%d", &db_major, &db_minor);
+    XtFree(buf);
   }
     
   if ((file_major > db_major) ||
diff -urN openmotif-2.3.0/lib/Mrm/MrmItop.c /tmp/openmotif-2.3.0/lib/Mrm/MrmItop.c
--- openmotif-2.3.0/lib/Mrm/MrmItop.c	2002-01-11 14:56:23.000000000 +0100
+++ /tmp/openmotif-2.3.0/lib/Mrm/MrmItop.c	2005-12-16 16:05:03.000000000 +0100
@@ -642,10 +642,12 @@
    *  Local variables
    */
   Cardinal	result ;		/* function results */
+  IDBResource resource_id;
 
   if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ;
   result = Idb__RID_NextRID ((IDBFile)file_id, 
-			     (IDBResource *)resource_id_return) ;
+                             &resource_id) ;
+  *resource_id_return = resource_id;
   return result ;
 
 }
diff -urN openmotif-2.3.0/lib/Xm/BitmapsI.h /tmp/openmotif-2.3.0/lib/Xm/BitmapsI.h
--- openmotif-2.3.0/lib/Xm/BitmapsI.h	2002-01-04 22:21:54.000000000 +0100
+++ /tmp/openmotif-2.3.0/lib/Xm/BitmapsI.h	2005-12-19 14:21:30.000000000 +0100
@@ -53,7 +53,7 @@
 #ifndef _XmBitmapsI_h
 #define _XmBitmapsI_h
 
-#include <Xm/Xm.h>
+#include <Xm/XmP.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -urN openmotif-2.3.0/lib/Xm/ColorP.h /tmp/openmotif-2.3.0/lib/Xm/ColorP.h
--- openmotif-2.3.0/lib/Xm/ColorP.h	2002-07-23 19:46:44.000000000 +0200
+++ /tmp/openmotif-2.3.0/lib/Xm/ColorP.h	2005-12-19 14:21:31.000000000 +0100
@@ -41,6 +41,8 @@
 #ifndef _XmColorP_h
 #define _XmColorP_h
 
+#include <X11/Intrinsic.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -urN openmotif-2.3.0/lib/Xm/ColorS.c /tmp/openmotif-2.3.0/lib/Xm/ColorS.c
--- openmotif-2.3.0/lib/Xm/ColorS.c	2004-07-07 14:24:07.000000000 +0200
+++ /tmp/openmotif-2.3.0/lib/Xm/ColorS.c	2005-12-19 14:21:31.000000000 +0100
@@ -92,7 +92,7 @@
 static void CreateTypes(XmColorSelectorWidget, Widget, ArgList, Cardinal);
 #endif
 
-static int CmpColors(void *, void *);
+static int CmpColors(const void *, const void *);
 static char *find_name(char *);
 static int GetVisual(XmColorSelectorWidget);
 
@@ -1410,7 +1410,7 @@
  */
 
 static int
-CmpColors(void * ptr_1, void * ptr_2) 
+CmpColors(const void * ptr_1, const void * ptr_2) 
 {
     ColorInfo *color1, *color2;
 
diff -urN openmotif-2.3.0/lib/Xm/DataF.c /tmp/openmotif-2.3.0/lib/Xm/DataF.c
--- openmotif-2.3.0/lib/Xm/DataF.c	2005-09-07 11:06:09.000000000 +0200
+++ /tmp/openmotif-2.3.0/lib/Xm/DataF.c	2005-12-19 14:21:31.000000000 +0100
@@ -14,7 +14,7 @@
  
 #ifdef REV_INFO
 #ifndef lint
-static char rcsid[] = "$RCSfile: DataF.c,v $ $Revision: 1.23 $ $Date: 2005/09/07 09:06:09 $"
+static char rcsid[] = "$RCSfile: DataF.c,v $ $Revision: 1.25 $ $Date: 2005/12/19 10:32:35 $"
 #endif
 #endif
 /**  (c) Copyright 1989, 1990, 1991, 1992 HEWLETT-PACKARD COMPANY */
[...4417 lines suppressed...]
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  # Check the variables that should have been set.
@@ -5747,34 +6119,21 @@
 	  done
 
 	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  outputname=
 	  if test "$fast_install" = no && test -n "$relink_command"; then
 	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
+	      tmpdir=`func_mktempdir`
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
@@ -5798,7 +6157,7 @@
 	fi
 
 	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
+	# one anyway 
 	case $install_prog,$host in
 	*/usr/bin/install*,*cygwin*)
 	  case $file:$destfile in
@@ -5898,7 +6257,7 @@
     # Exit here if they wanted silent mode.
     test "$show" = : && exit $EXIT_SUCCESS
 
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     $echo "Libraries have been installed in:"
     for libdir in $libdirs; do
       $echo "   $libdir"
@@ -5931,7 +6290,7 @@
     $echo
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
+    $echo "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
     ;;
 
@@ -6148,9 +6507,17 @@
 	    rmfiles="$rmfiles $objdir/$n"
 	  done
 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 
-	  if test "$mode" = uninstall; then
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
 	      cmds=$postuninstall_cmds
@@ -6183,7 +6550,8 @@
 	      IFS="$save_ifs"
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
-	  fi
+	    ;;
+	  esac
 	fi
 	;;
 
@@ -6482,12 +6850,11 @@
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
+disable_libs=shared
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+disable_libs=static
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
diff -urN openmotif-2.3.0/Makefile.am /tmp/openmotif-2.3.0/Makefile.am
--- openmotif-2.3.0/Makefile.am	2004-03-23 11:28:57.000000000 +0100
+++ /tmp/openmotif-2.3.0/Makefile.am	2005-12-19 14:21:20.000000000 +0100
@@ -19,7 +19,8 @@
              aclocal.m4 \
              config.h.in \
              install-sh \
-             missing mkinstalldirs
+             missing mkinstalldirs \
+             compile
 
 SUBDIRS	= bindings bitmaps \
              config \
diff -urN openmotif-2.3.0/Makefile.in /tmp/openmotif-2.3.0/Makefile.in
--- openmotif-2.3.0/Makefile.in	2005-11-30 17:41:42.000000000 +0100
+++ /tmp/openmotif-2.3.0/Makefile.in	2005-12-19 14:46:20.000000000 +0100
@@ -237,7 +237,8 @@
              aclocal.m4 \
              config.h.in \
              install-sh \
-             missing mkinstalldirs
+             missing mkinstalldirs \
+             compile
 
 SUBDIRS = bindings bitmaps \
              config \
diff -urN openmotif-2.3.0/RELEASE /tmp/openmotif-2.3.0/RELEASE
--- openmotif-2.3.0/RELEASE	2005-06-29 09:42:28.000000000 +0200
+++ /tmp/openmotif-2.3.0/RELEASE	2006-01-11 18:39:50.000000000 +0100
@@ -1 +1 @@
-OpenMotif 2.3.0 beta 29 Jun 2005 10:02:00 AM EET
+OpenMotif 2.3.0 beta 2, 5 Jan 2006 13:06:00 EET
diff -urN openmotif-2.3.0/RELNOTES /tmp/openmotif-2.3.0/RELNOTES
--- openmotif-2.3.0/RELNOTES	2005-06-29 14:41:48.000000000 +0200
+++ /tmp/openmotif-2.3.0/RELNOTES	2006-02-02 15:31:13.000000000 +0100
@@ -82,6 +82,26 @@
  * 26 bugs fixes
 
 The following bugs were fixed:
+
+  2.3.0 Beta 2 January 2006 (This release) 
+
+ * Fixed vulnerabilities in the libXpm code [CAN-2004-0914 (multiple vulnerabilities) 
+   and CAN-2005-0605 (buffer overflow)] 
+ * Got rid of the obsolete tmpnam() call in imake 
+ * Fixed bug #1315 (Division by zero in List widget) 
+ * Fixed bug #1314 (Buffer overflow in MrmItop.c on 64-bit systems) 
+ * Fixed bug #1313 (getsubres.c has fallback resources defined that aren't
+   terminated with NULL.) 
+ * Fixed bug #1304 (Buffer overflow in MrmOpenHierarchy...()) 
+ * Fixed bug #1297 (Insensitive XmPIXMAP XmPushButtons are stippled with the
+   wrong color) 
+ * Fixed bug #1294 (XmFileSelectionBox's XmNdirSpec resource misbehaves when
+   pathMode is PATH_MODE_RELATIVE) 
+ * Fixed bug #1294 (XmFileSelectionBox's XmNdirSpec resource misbehaves when
+   pathMode is PATH_MODE_RELATIVE) 
+
+  2.3.0 Beta 1 November 2005 
+
  * #1121 (TabBox translation error) - removed locking of he clipboard from
           XmClipboardRetrieveStart()
  * #1283 (TabBox translation error)
@@ -134,7 +154,6 @@
 - Linux 2.6 (Redhat Enterprise 3.0)
 - Linux 2.6 (SuSe 9.1)
 - Linux 2.4 (Redhat Fedora Core 2)
-- Linux 2.6 (Madrake 10.1)
 
 4 Filing Bug Reports
 


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openmotif.spec	3 Jan 2006 19:19:10 -0000	1.40
+++ openmotif.spec	2 Feb 2006 16:57:34 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.1.2
+Release: 0.1.9
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
@@ -21,6 +21,7 @@
 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
@@ -37,6 +38,9 @@
 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
+Patch50: openMotif-2.2.3-text_paste.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -61,22 +65,26 @@
 
 %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
+#%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}_"
@@ -148,6 +156,12 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* Thu Feb  2 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.9
+- new CVS version 2006-02-02
+- fixed CVE-2005-3964: libUil buffer overflows (#174814)
+- fixed XmList out of bound accesses (#167701)
+- fixed pasting into TextField (#179549)
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.coM> 2.3.0-0.1.2
 - Rebuilt on new gcc
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:02:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:02:25 -0500
Subject: rpms/tcl/devel sources,1.8,1.9 .cvsignore,1.8,1.9
Message-ID: <200602021702.k12H2Pht005557@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	sources .cvsignore 
Log Message:
Need tk source to generate HTML docs (which were forgotten for the 8.4.12
release).



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 16:37:24 -0000	1.8
+++ sources	2 Feb 2006 17:02:11 -0000	1.9
@@ -1 +1,2 @@
 7480432d8730263f267952788eb4839b  tcl8.4.12-src.tar.gz
+316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Feb 2006 16:37:24 -0000	1.8
+++ .cvsignore	2 Feb 2006 17:02:11 -0000	1.9
@@ -1,3 +1,4 @@
 tcl8.4.11-src.tar.gz
 tcl8.4.11-html.tar.gz
 tcl8.4.12-src.tar.gz
+tk8.4.12-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:08:30 -0500
Subject: rpms/libsepol/devel .cvsignore, 1.82, 1.83 libsepol.spec, 1.105,
	1.106 sources, 1.83, 1.84
Message-ID: <200602021708.k12H8UPm005640@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5627

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
- Upgrade to latest from NSA
	* Merged assertion copying bugfix from Joshua Brindle.
	* Merged sepol_av_to_string patch from Joshua Brindle.
	* Merged clone record on set_con patch from Ivan Gyurdiev.	



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore	30 Jan 2006 23:34:33 -0000	1.82
+++ .cvsignore	2 Feb 2006 17:08:27 -0000	1.83
@@ -79,3 +79,5 @@
 libsepol-1.11.8.tgz
 libsepol-1.11.9.tgz
 libsepol-1.11.10.tgz
+libsepol-1.11.11.tgz
+libsepol-1.11.12.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- libsepol.spec	30 Jan 2006 23:34:34 -0000	1.105
+++ libsepol.spec	2 Feb 2006 17:08:27 -0000	1.106
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.11.10
+Version: 1.11.12
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,12 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
+- Upgrade to latest from NSA
+	* Merged assertion copying bugfix from Joshua Brindle.
+	* Merged sepol_av_to_string patch from Joshua Brindle.
+	* Merged clone record on set_con patch from Ivan Gyurdiev.	
+
 * Mon Jan 30 2006 Dan Walsh <dwalsh at redhat.com> 1.11.10-1
 - Upgrade to latest from NSA
 	* Merged cond_expr mapping and package section count bug fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- sources	30 Jan 2006 23:34:34 -0000	1.83
+++ sources	2 Feb 2006 17:08:27 -0000	1.84
@@ -1 +1 @@
-dbb6a5f3604e718d17a2b764df75f261  libsepol-1.11.10.tgz
+29d310647a425b1e5e3d380799001282  libsepol-1.11.12.tgz



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:11:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:11:09 -0500
Subject: rpms/libsemanage/devel .cvsignore, 1.49, 1.50 libsemanage.spec, 1.69,
	1.70 sources, 1.51, 1.52
Message-ID: <200602021711.k12HB93P005744@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5727

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	31 Jan 2006 00:02:55 -0000	1.49
+++ .cvsignore	2 Feb 2006 17:11:07 -0000	1.50
@@ -52,3 +52,4 @@
 libsemanage-1.5.16.tgz
 libsemanage-1.5.18.tgz
 libsemanage-1.5.19.tgz
+libsemanage-1.5.20.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- libsemanage.spec	31 Jan 2006 00:02:55 -0000	1.69
+++ libsemanage.spec	2 Feb 2006 17:11:07 -0000	1.70
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.10-1
+%define libsepolver 1.11.12-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.19
+Version: 1.5.20
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -76,6 +76,10 @@
 
 %changelog
 
+* Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.5.20-1
+- Upgrade to latest from NSA
+	* Merged clone record on set_con patch from Ivan Gyurdiev.	
+
 * Mon Jan 30 2006 Dan Walsh <dwalsh at redhat.com> 1.5.19-1
 - Upgrade to latest from NSA
 	* Merged fname parameter patch from Ivan Gyurdiev.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	31 Jan 2006 00:02:55 -0000	1.51
+++ sources	2 Feb 2006 17:11:07 -0000	1.52
@@ -1 +1 @@
-96eaeb9e2b7079ba84fb30fb8941e5ef  libsemanage-1.5.19.tgz
+30451c12207597488fa7df8589fd1120  libsemanage-1.5.20.tgz



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:23:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:23:03 -0500
Subject: rpms/policycoreutils/devel .cvsignore, 1.99,
	1.100 policycoreutils.spec, 1.229, 1.230 sources, 1.103, 1.104
Message-ID: <200602021723.k12HN3Qk018350@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18333

Modified Files:
	.cvsignore policycoreutils.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	31 Jan 2006 00:21:56 -0000	1.99
+++ .cvsignore	2 Feb 2006 17:23:00 -0000	1.100
@@ -87,3 +87,4 @@
 policycoreutils-1.29.12.tgz
 policycoreutils-1.29.15.tgz
 policycoreutils-1.29.17.tgz
+policycoreutils-1.29.18.tgz


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- policycoreutils.spec	31 Jan 2006 00:21:56 -0000	1.229
+++ policycoreutils.spec	2 Feb 2006 17:23:00 -0000	1.230
@@ -1,9 +1,9 @@
-%define libsepolver 1.11.10-1
-%define libsemanagever 1.5.19-1
+%define libsepolver 1.11.12-1
+%define libsemanagever 1.5.20-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.17
+Version: 1.29.18
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -98,6 +98,10 @@
 
 %changelog
 
+* Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.29.18-1
+- Update from upstream
+	* Merged clone record on set_con patch from Ivan Gyurdiev.
+
 * Mon Jan 30 2006 Dan Walsh <dwalsh at redhat.com> 1.29.17-1
 - Update from upstream
 	* Merged genhomedircon fix from Dan Walsh.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	31 Jan 2006 00:21:56 -0000	1.103
+++ sources	2 Feb 2006 17:23:01 -0000	1.104
@@ -1 +1 @@
-a89902ab7e9d4feadc48f06c5fb9be30  policycoreutils-1.29.17.tgz
+6980bea91969631d694dda89e8401105  policycoreutils-1.29.18.tgz



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:29:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:29:00 -0500
Subject: rpms/kdepim/devel .cvsignore, 1.29, 1.30 kdepim.spec, 1.73,
	1.74 sources, 1.32, 1.33 kdepim-3.4.2-uic.patch, 1.2,
	NONE kdepim-3.5.0-kmail-113730.patch, 1.1, NONE korganizerrc,
	1.1, NONE
Message-ID: <200602021729.k12HT0JT028506@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28153

Modified Files:
	.cvsignore kdepim.spec sources 
Removed Files:
	kdepim-3.4.2-uic.patch kdepim-3.5.0-kmail-113730.patch 
	korganizerrc 
Log Message:
- update to 3.5.1
- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	29 Nov 2005 14:26:00 -0000	1.29
+++ .cvsignore	2 Feb 2006 17:28:58 -0000	1.30
@@ -8,3 +8,4 @@
 kdepim-3.4.91.tar.bz2
 kdepim-3.4.92.tar.bz2
 kdepim-3.5.0.tar.bz2
+kdepim-3.5.1.tar.bz2


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdepim.spec	12 Dec 2005 11:37:40 -0000	1.73
+++ kdepim.spec	2 Feb 2006 17:28:58 -0000	1.74
@@ -2,13 +2,13 @@
 %define final 0
 
 %define qt_version 1:3.3.5
-%define arts_version 8:1.5.0
+%define arts_version 8:1.5.1
 %define arts 1
 %define make_cvs 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
+Version: 3.5.1
 Release: 1
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
@@ -20,18 +20,17 @@
 URL: http://www.kde.org
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: korganizerrc
-Source2: cr48-app-kandy.png
-Source3: cr32-app-kandy.png
-Source4: cr16-app-kandy.png
+Source1: cr48-app-kandy.png
+Source2: cr32-app-kandy.png
+Source3: cr16-app-kandy.png
 
 Patch1: kde-libtool.patch
-Patch3: kdepim-3.4.0-s390.patch
-Patch7: kdepim-3.4.0-kandy-icons.patch
-Patch8: kdepim-3.4.92-libz.patch
-Patch9: kdepim-3.5.0-kmail-113730.patch
+Patch2: kdepim-3.4.0-s390.patch
+Patch3: kdepim-3.4.0-kandy-icons.patch
+Patch4: kdepim-3.4.92-libz.patch
 
 Requires: kdebase >= 6:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: perl
 BuildRequires: bison
@@ -104,13 +103,12 @@
 %patch1 -p1 -b .libtool
 
 %ifarch s390 s390x
-%patch3 -p1 -b .s390
+%patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
-%patch7 -p1 -b .kandy-icons
-%patch8 -p1 -b .libz
-%patch9 -p1 -b .kmail
+%patch3 -p1 -b .kandy-icons
+%patch4 -p1 -b .libz
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -119,24 +117,26 @@
 export CFLAGS="$FLAGS "
 export CXXFLAGS="$FLAGS "
 
-cp -f %{SOURCE2} %{SOURCE3} %{SOURCE4} kandy/src
-
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
+cp -f %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -174,8 +174,6 @@
    ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/Kontact.desktop \
    ${RPM_BUILD_ROOT}%{_datadir}/applications/kde/KOrn.desktop
 
-cp %{SOURCE1} $RPM_BUILD_ROOT%{prefix}/share/config/
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -209,6 +207,10 @@
 %{_includedir}/kde/*
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
+- update to 3.5.1
+- get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream 
+
 * Mon Dec 12 2005 Than Ngo <than at redhat.com> 6:3.5.0-1
 - apply patch to fix crash when applying pipe through filters
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	29 Nov 2005 14:26:00 -0000	1.32
+++ sources	2 Feb 2006 17:28:58 -0000	1.33
@@ -1 +1 @@
-e19a2a40e422ecd483884ce6e9ac8925  kdepim-3.5.0.tar.bz2
+8e87c9cbe1f0c0f983f94d804a5bc8f9  kdepim-3.5.1.tar.bz2


--- kdepim-3.4.2-uic.patch DELETED ---


--- kdepim-3.5.0-kmail-113730.patch DELETED ---


--- korganizerrc DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 17:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 12:39:56 -0500
Subject: rpms/GConf2/devel GConf2-2.8.1-reload.patch, 1.1, 1.2 GConf2.spec,
	1.33, 1.34
Message-ID: <200602021739.k12Hdu06031579@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31550

Modified Files:
	GConf2-2.8.1-reload.patch GConf2.spec 
Log Message:
* Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3
- Use the correct patch ;-)


GConf2-2.8.1-reload.patch:
 gconftool.c |    4 ++++
 1 files changed, 4 insertions(+)

Index: GConf2-2.8.1-reload.patch
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2-2.8.1-reload.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GConf2-2.8.1-reload.patch	2 Feb 2006 03:05:26 -0000	1.1
+++ GConf2-2.8.1-reload.patch	2 Feb 2006 17:39:51 -0000	1.2
@@ -1,6 +1,18 @@
---- GConf-2.8.1/gconf/gconftool.c.reload	2005-01-07 15:08:10.552350838 +0100
-+++ GConf-2.8.1/gconf/gconftool.c	2005-01-07 15:12:04.869990535 +0100
-@@ -896,6 +896,8 @@
+Index: gconf/gconf/gconftool.c
+===================================================================
+RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
+retrieving revision 1.102
+diff -d -u -p -U10 -r1.102 gconftool.c
+--- gconf/gconf/gconftool.c	3 Jan 2006 17:05:28 -0000	1.102
++++ gconf/gconf/gconftool.c	1 Feb 2006 18:34:36 -0000
+@@ -881,32 +881,36 @@ main (int argc, char** argv)
+   if (makefile_install_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, FALSE);
        
        gconf_engine_unref (conf);
  
@@ -9,12 +21,24 @@
        return retval;
      }
  
-@@ -909,6 +911,8 @@
+   if (makefile_uninstall_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, TRUE);
        
        gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
 +
++      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+ 
        return retval;
      }
  
+   if (break_key_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval = do_break_key(conf, args);
+ 
+       gconf_engine_unref(conf);


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- GConf2.spec	2 Feb 2006 03:05:26 -0000	1.33
+++ GConf2.spec	2 Feb 2006 17:39:51 -0000	1.34
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3
+- Use the correct patch ;-)
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-2
 - Add patch from Mandriva to reload GConf2 every time a schema is
   added or removed (solves bug 173869)



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:08:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:08:17 -0500
Subject: rpms/tk/devel sources,1.7,1.8 .cvsignore,1.7,1.8
Message-ID: <200602021808.k12I8Ho0021356@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21303

Modified Files:
	sources .cvsignore 
Log Message:
Updated to tk-8.4.12.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jul 2005 06:59:10 -0000	1.7
+++ sources	2 Feb 2006 18:08:10 -0000	1.8
@@ -1 +1,2 @@
 408e34fe8a1cec497f98f05bbe89b348  tk8.4.11-src.tar.gz
+316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jul 2005 06:59:10 -0000	1.7
+++ .cvsignore	2 Feb 2006 18:08:10 -0000	1.8
@@ -1 +1,2 @@
 tk8.4.11-src.tar.gz
+tk8.4.12-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:10:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:10:22 -0500
Subject: rpms/tk/devel sources,1.8,1.9
Message-ID: <200602021810.k12IAMRn022289@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22207

Modified Files:
	sources 
Log Message:
Forgot to remove 8.4.11 source.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Feb 2006 18:08:10 -0000	1.8
+++ sources	2 Feb 2006 18:10:20 -0000	1.9
@@ -1,2 +1 @@
-408e34fe8a1cec497f98f05bbe89b348  tk8.4.11-src.tar.gz
 316491cb82d898b434842353aed1f0d6  tk8.4.12-src.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:16:14 -0500
Subject: rpms/flex/devel flex-2.5.4a2-iniscan.patch, NONE, 1.1 flex.spec,
	1.19, 1.20
Message-ID: <200602021816.k12IGEoO031909@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26435

Modified Files:
	flex.spec 
Added Files:
	flex-2.5.4a2-iniscan.patch 
Log Message:
- adding `make bigcheck' into build process.  Refreshing initscan.c to
  make this possible.


flex-2.5.4a2-iniscan.patch:
 initscan.c |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

--- NEW FILE flex-2.5.4a2-iniscan.patch ---
diff -burp flex-2.5.4/initscan.c flex-2.5.4-iniscan/initscan.c
--- flex-2.5.4/initscan.c	2006-01-13 16:16:52.000000000 +0100
+++ flex-2.5.4-iniscan/initscan.c	2006-02-02 18:15:26.000000000 +0100
@@ -1,5 +1,5 @@
 #line 2 "scan.c"
-/* A lexical scanner generated by flex */
+/* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
  * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
 #ifdef c_plusplus
 #ifndef __cplusplus
@@ -134,6 +135,15 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, yytext_ptr )
 
+/* Some routines like yy_flex_realloc() are emitted as static but are
+   not called by all lexers. This generates warnings in some compilers,
+   notably GCC. Arrange to suppress these. */
+#ifdef __GNUC__
+#define YY_MAY_BE_UNUSED __attribute__((unused))
+#else
+#define YY_MAY_BE_UNUSED
+#endif
+
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
@@ -240,7 +250,7 @@ YY_BUFFER_STATE yy_scan_string YY_PROTO(
 YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
 
 static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
 static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -1328,7 +1338,7 @@ char *yytext;
 #define OPTION 17
 #define LINEDIR 18
 
-#line 1333 "scan.c"
+#line 1342 "scan.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1479,7 +1489,7 @@ YY_MALLOC_DECL
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
+	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
 #line 94 "scan.l"
@@ -1493,7 +1503,7 @@ YY_DECL
 	Char nmdef[MAXLINE], myesc();
 
 
-#line 1498 "scan.c"
+#line 1507 "scan.c"
 
 	if ( yy_init )
 		{
@@ -2731,7 +2741,7 @@ YY_RULE_SETUP
 #line 650 "scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2736 "scan.c"
+#line 2745 "scan.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(SECT2):
 case YY_STATE_EOF(CODEBLOCK):
@@ -3200,8 +3210,7 @@ static int input()
 
 	return c;
 	}
-#endif	/* ifndef YY_NO_INPUT */
-
+#endif /* YY_NO_INPUT */
 
 #ifdef YY_USE_PROTOS
 void yyrestart( FILE *input_file )
@@ -3312,6 +3321,7 @@ YY_BUFFER_STATE b;
 	}
 
 
+
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
 #else


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- flex.spec	18 Jan 2006 10:40:44 -0000	1.19
+++ flex.spec	2 Feb 2006 18:16:10 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 36
+Release: 37
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -16,6 +16,7 @@
 Patch6: flex-2.5.4a2-std.patch
 Patch7: flex-2.5.4a2-warn.patch
 Patch8: flex-2.5.4a2-shapwarn.patch
+Patch9: flex-2.5.4a2-iniscan.patch
 BuildRequires: autoconf, byacc
 
 %description
@@ -43,11 +44,13 @@
 %patch6 -p1 -b .std
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .shapwarn
+%patch9 -p1 -b .iniscan
 
 %build
 autoconf
 %configure
 make
+make bigcheck
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +79,10 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Wed Feb 02 2006 Petr Machata <pmachata at redhat.com> 2.5.4a-37
+- adding `make bigcheck' into build process.  Refreshing initscan.c to
+  make this possible.
+
 * Wed Jan 18 2006 Petr Machata <pmachata at redhat.com> 2.5.4a-36
 - Applying Jonathan S. Shapiro's bugfix-fixing patch. More std:: fixes
   and better way to silent warnings under gcc.



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:16:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:16:32 -0500
Subject: rpms/tcl/devel tcl.spec,1.13,1.14
Message-ID: <200602021816.k12IGWcV001885@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	tcl.spec 
Log Message:
- Upgraded to tcl-8.4.12
- Use ksh rather than bash for the configure script (known bug w/ bash-3.1)
- Generate HTML docs from source
- Add in the Tk source for HTML doc generation



Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tcl.spec	9 Dec 2005 22:43:31 -0000	1.13
+++ tcl.spec	2 Feb 2006 18:16:28 -0000	1.14
@@ -2,15 +2,15 @@
 
 Summary: Tcl scripting language development environment
 Name: tcl
-Version: %{majorver}.11
-Release: 1.1
+Version: %{majorver}.12
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
 Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-Source1: http://download.sourceforge.net/tcl/%{name}%{version}-html.tar.gz
+Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: autoconf sed
+Buildrequires: autoconf, sed, ksh
 Patch1: tcl-8.3.5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
@@ -56,7 +56,9 @@
 This package contains the html manual.
 
 %prep
-%setup -n %{name}%{version} -q -b1
+%setup -T -D -c %{name}-%{version} -q -a 0 -a 1
+
+cd %{name}%{version}
 
 # define DT SONAME in shared lib
 %patch1 -p1 -b .1-soname
@@ -69,8 +71,13 @@
 cd unix
 autoconf
 
+# use ksh instead of bash (upstream knows bash-3.1 breaks, they are working
+# on a fix for 8.4.13 or a later release)
+sed -i -e 's,#! /bin/sh,#! /bin/ksh,g' configure
+sed -i -e 's,#! /bin/bash -norc,#! /bin/ksh,g' configure.in
+
 %build
-cd unix
+cd %{name}%{version}/unix
 %configure
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
@@ -84,8 +91,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd %{name}%{version}
 make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
+# generate HTML doc set
+make -C unix html HTML_DIR=`pwd`/html
+
 ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
 
 # for linking with -l%{name}
@@ -125,7 +136,8 @@
 %{_mandir}/man1/*
 # this should be prefix/lib
 %{_prefix}/lib/%{name}%{majorver}
-%doc README changes license.terms
+%doc %{name}%{version}/README %{name}%{version}/changes
+%doc %{name}%{version}/license.terms
 
 %files devel
 %defattr(-,root,root)
@@ -138,9 +150,15 @@
 
 %files html
 %defattr(-,root,root)
-%doc html/*
+%doc %{name}%{version}/html/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-1
+- Upgraded to tcl-8.4.12
+- Use ksh rather than bash for the configure script (known bug w/ bash-3.1)
+- Generate HTML docs from source
+- Add in the Tk source for HTML doc generation
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:29:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:29:25 -0500
Subject: rpms/tcl/devel tcl.spec,1.14,1.15
Message-ID: <200602021829.k12ITPXU010863@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	tcl.spec 
Log Message:
Don't use ksh on ia64.



Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tcl.spec	2 Feb 2006 18:16:28 -0000	1.14
+++ tcl.spec	2 Feb 2006 18:29:21 -0000	1.15
@@ -3,14 +3,17 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
 Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: autoconf, sed, ksh
+Buildrequires: autoconf, sed
+%ifnarch ia64
+Buildrequires: ksh
+%endif
 Patch1: tcl-8.3.5-tclm4-soname.patch
 Patch2: tcl-8.4.5-lib-perm.patch
 Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
@@ -71,10 +74,12 @@
 cd unix
 autoconf
 
+%ifnarch ia64
 # use ksh instead of bash (upstream knows bash-3.1 breaks, they are working
 # on a fix for 8.4.13 or a later release)
 sed -i -e 's,#! /bin/sh,#! /bin/ksh,g' configure
 sed -i -e 's,#! /bin/bash -norc,#! /bin/ksh,g' configure.in
+%endif
 
 %build
 cd %{name}%{version}/unix
@@ -153,6 +158,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-2
+- Don't use ksh on ia64
+
 * Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-1
 - Upgraded to tcl-8.4.12
 - Use ksh rather than bash for the configure script (known bug w/ bash-3.1)



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:42:38 -0500
Subject: rpms/tcl/devel tcl-8.4.12-relid.patch,NONE,1.1 tcl.spec,1.15,1.16
Message-ID: <200602021842.k12IgcmE014736@cvs.devel.redhat.com>

Author: dcantrel

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

Modified Files:
	tcl.spec 
Added Files:
	tcl-8.4.12-relid.patch 
Log Message:
Patched syntax errors in configure and tcl.m4 so it works with bash


tcl-8.4.12-relid.patch:
 configure |    2 +-
 tcl.m4    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcl-8.4.12-relid.patch ---
--- tcl8.4.12/unix/tcl.m4.relid	2005-12-06 11:03:34.000000000 -0500
+++ tcl8.4.12/unix/tcl.m4	2006-02-02 13:41:02.000000000 -0500
@@ -879,7 +879,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2317,7 +2317,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- tcl8.4.12/unix/configure.relid	2005-12-06 11:03:33.000000000 -0500
+++ tcl8.4.12/unix/configure	2006-02-02 13:38:47.000000000 -0500
@@ -2481,7 +2481,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tcl.spec	2 Feb 2006 18:29:21 -0000	1.15
+++ tcl.spec	2 Feb 2006 18:42:35 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 2
+Release: 3
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -11,14 +11,12 @@
 Source1: http://download.sourceforge.net/tcl/tk%{version}-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires: autoconf, sed
-%ifnarch ia64
-Buildrequires: ksh
-%endif
 Patch1: tcl-8.3.5-tclm4-soname.patch
 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
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -69,18 +67,12 @@
 %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
 autoconf
 
-%ifnarch ia64
-# use ksh instead of bash (upstream knows bash-3.1 breaks, they are working
-# on a fix for 8.4.13 or a later release)
-sed -i -e 's,#! /bin/sh,#! /bin/ksh,g' configure
-sed -i -e 's,#! /bin/bash -norc,#! /bin/ksh,g' configure.in
-%endif
-
 %build
 cd %{name}%{version}/unix
 %configure
@@ -158,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-3
+- Patched syntax errors in configure and tcl.m4 so it works with bash
+
 * Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-2
 - Don't use ksh on ia64
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:53:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:53:15 -0500
Subject: rpms/firefox/FC-4
	firefox-1.0.7-CVE-2005-4134-long-history-dos.patch, NONE,
	1.1 firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch, NONE,
	1.1 firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch,
	NONE, 1.1 firefox.spec, 1.77, 1.78
Message-ID: <200602021853.k12IrFPb031985@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	firefox.spec 
Added Files:
	firefox-1.0.7-CVE-2005-4134-long-history-dos.patch 
	firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch 
	firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch 
Log Message:
* Sun Jan 29 2006 Christopher Aillon <caillon at redhat.com> 0:1.0.7-1.2.fc4
- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296


firefox-1.0.7-CVE-2005-4134-long-history-dos.patch:
 toolkit/components/history/src/nsGlobalHistory.cpp |   16 +++++++++++++++-
 xpfe/components/history/src/nsGlobalHistory.cpp    |   16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

--- NEW FILE firefox-1.0.7-CVE-2005-4134-long-history-dos.patch ---
Index: xpfe/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.195.6.3
diff -u -d -p -r1.195.6.3 nsGlobalHistory.cpp
--- xpfe/components/history/src/nsGlobalHistory.cpp	26 Aug 2004 02:03:23 -0000	1.195.6.3
+++ xpfe/components/history/src/nsGlobalHistory.cpp	29 Jan 2006 23:12:59 -0000
@@ -111,6 +111,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
 
 #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
 
+// see bug #319004 -- clamp title and URL to generously-large but not too large
+// length
+#define HISTORY_URI_LENGTH_MAX 65536
+#define HISTORY_TITLE_LENGTH_MAX 4096
+
 // sync history every 10 seconds
 #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
 //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
@@ -635,6 +640,9 @@ nsGlobalHistory::AddURI(nsIURI *aURI, PR
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   PRInt64 now = GetNow();
 
   // For notifying observers, later...
@@ -1049,7 +1057,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
   nsresult rv;
   NS_ENSURE_ARG_POINTER(aURI);
 
-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
+  nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
 
   // skip about: URIs to avoid reading in the db (about:blank, especially)
   PRBool isAbout;
@@ -1341,6 +1349,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
   
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
 
   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
@@ -1374,6 +1385,9 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI 
   nsresult rv = aURI->GetSpec(spec);
   if (NS_FAILED(rv)) return rv;
 
+  if (spec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
   rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
   if (NS_FAILED(rv)) {
Index: toolkit/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.33.2.1.2.10
diff -u -d -p -r1.33.2.1.2.10 nsGlobalHistory.cpp
--- toolkit/components/history/src/nsGlobalHistory.cpp	25 Oct 2004 08:34:37 -0000	1.33.2.1.2.10
+++ toolkit/components/history/src/nsGlobalHistory.cpp	29 Jan 2006 23:12:59 -0000
@@ -113,6 +113,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
 
 #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
 
+// see bug #319004 -- clamp title and URL to generously-large but not too large
+// length
+#define HISTORY_URI_LENGTH_MAX 65536
+#define HISTORY_TITLE_LENGTH_MAX 4096
+
 // sync history every 10 seconds
 #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
 //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
@@ -663,6 +668,9 @@ nsGlobalHistory::AddPageToDatabase(nsIUR
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
 #ifdef DEBUG_bsmedberg
   printf("AddURI: %s%s%s",
          URISpec.get(),
@@ -1083,7 +1091,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
   nsresult rv;
   NS_ENSURE_ARG_POINTER(aURI);
 
-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
+  nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
 
   // skip about: URIs to avoid reading in the db (about:blank, especially)
   PRBool isAbout;
@@ -1335,6 +1343,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
 #ifdef DEBUG_bsmedberg
   printf("nsGlobalHistory::HidePage: %s\n", URISpec.get());
 #endif
@@ -1372,6 +1383,9 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI 
   nsresult rv = aURI->GetSpec(spec);
   if (NS_FAILED(rv)) return rv;
   
+  if (spec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
   rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
   if (NS_FAILED(rv)) {

firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch:
 jsemit.c   |   13 +++++++++++++
 jsinterp.c |   42 ++++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 10 deletions(-)

--- NEW FILE firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch ---
Index: js/src/jsinterp.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsinterp.c,v
retrieving revision 3.136.2.1.2.5.2.7
diff -u -d -p -U8 -r3.136.2.1.2.5.2.7 jsinterp.c
--- js/src/jsinterp.c	22 Apr 2005 00:25:15 -0000	3.136.2.1.2.5.2.7
+++ js/src/jsinterp.c	29 Jan 2006 22:31:53 -0000
@@ -2237,16 +2237,17 @@ js_Interpret(JSContext *cx, jsval *resul
                 cond = JSVAL_TO_INT(lval) OP JSVAL_TO_INT(rval);              \
             } else {                                                          \
                 d  = ltmp ? JSVAL_TO_INT(lval) : *rt->jsNaN;                  \
                 d2 = rtmp ? JSVAL_TO_INT(rval) : *rt->jsNaN;                  \
                 cond = COMPARE_DOUBLES(d, OP, d2, JS_FALSE);                  \
             }                                                                 \
         } else {                                                              \
             VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_NUMBER, &lval);               \
+            sp[-2] = lval;                                                    \
             VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_NUMBER, &rval);               \
             if (JSVAL_IS_STRING(lval) && JSVAL_IS_STRING(rval)) {             \
                 str  = JSVAL_TO_STRING(lval);                                 \
                 str2 = JSVAL_TO_STRING(rval);                                 \
                 cond = js_CompareStrings(str, str2) OP 0;                     \
             } else {                                                          \
                 VALUE_TO_NUMBER(cx, lval, d);                                 \
                 VALUE_TO_NUMBER(cx, rval, d2);                                \
@@ -2278,20 +2279,22 @@ js_Interpret(JSContext *cx, jsval *resul
             }                                                                 \
         } else {                                                              \
             if (JSVAL_IS_NULL(lval) || JSVAL_IS_VOID(lval)) {                 \
                 cond = (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) OP 1;     \
             } else if (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) {          \
                 cond = 1 OP 0;                                                \
             } else {                                                          \
                 if (ltmp == JSVAL_OBJECT) {                                   \
-                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &lval);         \
+                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);       \
+                    lval = sp[-2];                                            \
                     ltmp = JSVAL_TAG(lval);                                   \
                 } else if (rtmp == JSVAL_OBJECT) {                            \
-                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rval);         \
+                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);       \
+                    rval = sp[-1];                                            \
                     rtmp = JSVAL_TAG(rval);                                   \
                 }                                                             \
                 if (ltmp == JSVAL_STRING && rtmp == JSVAL_STRING) {           \
                     str  = JSVAL_TO_STRING(lval);                             \
                     str2 = JSVAL_TO_STRING(rval);                             \
                     cond = js_CompareStrings(str, str2) OP 0;                 \
                 } else {                                                      \
                     VALUE_TO_NUMBER(cx, lval, d);                             \
@@ -2424,26 +2427,28 @@ js_Interpret(JSContext *cx, jsval *resul
 
 #undef INTEGER_OP
 #undef BITWISE_OP
 #undef SIGNED_SHIFT_OP
 
           case JSOP_ADD:
             rval = FETCH_OPND(-1);
             lval = FETCH_OPND(-2);
-            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &ltmp);
-            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rtmp);
-            if ((cond = JSVAL_IS_STRING(ltmp)) || JSVAL_IS_STRING(rtmp)) {
+            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);
+            lval = sp[-2];
+            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);
+            rval = sp[-1];
+            if ((cond = JSVAL_IS_STRING(lval)) || JSVAL_IS_STRING(rval)) {
                 SAVE_SP(fp);
                 if (cond) {
-                    str = JSVAL_TO_STRING(ltmp);
-                    ok = (str2 = js_ValueToString(cx, rtmp)) != NULL;
+                    str = JSVAL_TO_STRING(lval);
+                    ok = (str2 = js_ValueToString(cx, rval)) != NULL;
                 } else {
-                    str2 = JSVAL_TO_STRING(rtmp);
-                    ok = (str = js_ValueToString(cx, ltmp)) != NULL;
+                    str2 = JSVAL_TO_STRING(rval);
+                    ok = (str = js_ValueToString(cx, lval)) != NULL;
                 }
                 if (!ok)
                     goto out;
                 str = js_ConcatStrings(cx, str, str2);
                 if (!str) {
                     ok = JS_FALSE;
                     goto out;
                 }
@@ -2736,39 +2741,56 @@ js_Interpret(JSContext *cx, jsval *resul
                     (cs->format & JOF_INC) ? (rval += 2) : (rval -= 2);
                     rtmp = rval;
                 }
             } else {
 
 /*
  * Initially, rval contains the value to increment or decrement, which is not
  * yet converted.  As above, the expression result goes in rtmp, the updated
- * value goes in rval.
+ * value goes in rval.  Our caller must set vp to point at a GC-rooted jsval
+ * in which we home rtmp, to protect it from GC in case the unconverted rval
+ * is not a number.
  */
 #define NONINT_INCREMENT_OP()                                                 \
     JS_BEGIN_MACRO                                                            \
         VALUE_TO_NUMBER(cx, rval, d);                                         \
         if (cs->format & JOF_POST) {                                          \
             rtmp = rval;                                                      \
             if (!JSVAL_IS_NUMBER(rtmp)) {                                     \
                 ok = js_NewNumberValue(cx, d, &rtmp);                         \
                 if (!ok)                                                      \
                     goto out;                                                 \
+                *vp = rtmp;                                                   \
             }                                                                 \
             (cs->format & JOF_INC) ? d++ : d--;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
         } else {                                                              \
             (cs->format & JOF_INC) ? ++d : --d;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
             rtmp = rval;                                                      \
         }                                                                     \
         if (!ok)                                                              \
             goto out;                                                         \
     JS_END_MACRO
 
+                if (cs->format & JOF_POST) {
+                    /*
+                     * We must push early to protect the postfix increment
+                     * or decrement result, if converted to a jsdouble from
+                     * a non-number value, from GC nesting in the setter.
+                     */
+                    vp = sp++;
+                    SAVE_SP(fp);
+                    --i;
+                }
+#ifdef __GNUC__
+                else vp = NULL; /* suppress bogus gcc warnings */
+#endif
+
                 NONINT_INCREMENT_OP();
             }
 
             fp->flags |= JSFRAME_ASSIGNING;
             CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
             fp->flags &= ~JSFRAME_ASSIGNING;
             if (!ok)
                 goto out;
Index: js/src/jsemit.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsemit.c,v
retrieving revision 3.96.6.4.2.1
diff -u -d -p -U8 -r3.96.6.4.2.1 jsemit.c
--- js/src/jsemit.c	9 Jul 2005 01:48:08 -0000	3.96.6.4.2.1
+++ js/src/jsemit.c	29 Jan 2006 22:31:53 -0000
@@ -3935,16 +3935,29 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
             }
             if (js_Emit1(cx, cg, op) < 0)
                 return JS_FALSE;
             break;
 #endif
           default:
             JS_ASSERT(0);
         }
+
+        /*
+         * Allocate another stack slot for GC protection in case the initial
+         * value being post-incremented or -decremented is not a number, but
+         * converts to a jsdouble.  In the TOK_NAME cases, op has 0 operand
+         * uses and 1 definition, so we don't need an extra stack slot -- we
+         * can use the one allocated for the def.
+         */
+        if (pn2->pn_type != TOK_NAME &&
+            (js_CodeSpec[op].format & JOF_POST) &&
+            (uintN)cg->stackDepth == cg->maxStackDepth) {
+            ++cg->maxStackDepth;
+        }
         break;
 
       case TOK_DELETE:
         /*
          * Under ECMA 3, deleting a non-reference returns true -- but alas we
          * must evaluate the operand if it appears it might have side effects.
          */
         pn2 = pn->pn_kid;

firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch:
 nsXULDocument.cpp |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch ---
Index: content/xul/document/src/nsXULDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULDocument.cpp,v
retrieving revision 1.611.2.1.14.2
diff -u -d -p -U8 -r1.611.2.1.14.2 nsXULDocument.cpp
--- content/xul/document/src/nsXULDocument.cpp	22 Jun 2005 01:52:31 -0000	1.611.2.1.14.2
+++ content/xul/document/src/nsXULDocument.cpp	29 Jan 2006 20:52:50 -0000
@@ -112,16 +112,17 @@
 #include "nsIObjectOutputStream.h"
 #include "nsIFocusController.h"
 #include "nsContentList.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentUtils.h"
 #include "nsIParser.h"
+#include "nsIParserService.h"
 #include "nsICSSStyleSheet.h"
 
 //----------------------------------------------------------------------
 //
 // CIDs
 //
 
 static NS_DEFINE_CID(kHTMLElementFactoryCID,     NS_HTML_ELEMENT_FACTORY_CID);
@@ -1485,16 +1486,32 @@ nsXULDocument::Persist(const nsAString& 
     PRInt32 nameSpaceID;
 
     nsCOMPtr<nsINodeInfo> ni = element->GetExistingAttrNameFromQName(aAttr);
     if (ni) {
         tag = ni->NameAtom();
         nameSpaceID = ni->NamespaceID();
     }
     else {
+        // Make sure that this QName is going to be valid.
+        nsIParserService *parserService = nsContentUtils::GetParserServiceWeakRef();
+        NS_ASSERTION(parserService, "Running scripts during shutdown?");
+
+        const PRUnichar *colon;
+        rv = parserService->CheckQName(PromiseFlatString(aAttr), PR_TRUE, &colon);
+        if (NS_FAILED(rv)) {
+            // There was an invalid character or it was malformed.
+            return NS_ERROR_INVALID_ARG;
+        }
+
+        if (colon) {
+            // We don't really handle namespace qualifiers in attribute names.
+            return NS_ERROR_NOT_IMPLEMENTED;
+        }
+
         tag = do_GetAtom(aAttr);
         NS_ENSURE_TRUE(tag, NS_ERROR_OUT_OF_MEMORY);
 
         nameSpaceID = kNameSpaceID_None;
     }
 
     rv = Persist(element, nameSpaceID, tag);
     if (NS_FAILED(rv)) return rv;


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-4/firefox.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- firefox.spec	22 Sep 2005 19:20:49 -0000	1.77
+++ firefox.spec	2 Feb 2006 18:53:12 -0000	1.78
@@ -6,11 +6,12 @@
 %define indexhtml file:///usr/share/doc/HTML/index.html
 
 ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x
+#ExclusiveArch: i386
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.0.7
-Release:        1.1.fc4
+Release:        1.2.fc4
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -74,6 +75,10 @@
 Patch106:       firefox-1.0-candidate-window.patch
 Patch107:       firefox-1.0-imgloader-comarray.patch
 
+Patch110:       firefox-1.0.7-CVE-2006-0296-XULDocument.persist.patch
+Patch111:       firefox-1.0.7-CVE-2006-0292-javascript-unrooted.patch
+Patch112:       firefox-1.0.7-CVE-2005-4134-long-history-dos.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libpng-devel, libjpeg-devel
 BuildRequires:  zlib-devel, zip
@@ -148,6 +153,9 @@
 %patch106 -p1
 %patch107 -p0
 
+%patch110 -p0
+%patch111 -p0
+%patch112 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -326,6 +334,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Jan 29 2006 Christopher Aillon <caillon at redhat.com> 0:1.0.7-1.2.fc4
+- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296
+
 * Thu Sep 22 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.7-1.1.fc4
 - Update to 1.0.7, containing fixes for:
   CAN-2005-2701 CAN-2005-2702 CAN-2005-2703 CAN-2005-2704



From fedora-cvs-commits at redhat.com  Thu Feb  2 18:55:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 13:55:30 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.22,
	1.23 selinux-policy-targeted.spec, 1.355, 1.356
Message-ID: <200602021855.k12ItUsG026156@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24559

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.20
- Add ldap support to spamd
- Auditing changes 


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   27 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    2 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   13 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   13 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1675 insertions(+), 689 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20050916.patch	18 Jan 2006 16:29:57 -0000	1.22
+++ policy-20050916.patch	2 Feb 2006 18:55:26 -0000	1.23
@@ -945,7 +945,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.27.1/domains/program/unused/apache.te
 --- nsapolicy/domains/program/unused/apache.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/apache.te	2006-01-02 14:02:37.000000000 -0500
++++ policy-1.27.1/domains/program/unused/apache.te	2006-01-30 13:44:40.000000000 -0500
 @@ -66,7 +66,7 @@
  
  # httpd_exec_t is the type give to the httpd executable.
@@ -999,6 +999,15 @@
  } else {
  dontaudit httpd_t admin_tty_type:chr_file rw_file_perms;
  }
+@@ -352,7 +356,7 @@
+ allow httpd_suexec_t urandom_device_t:chr_file { getattr read };
+ 
+ # for shell scripts
+-allow httpd_suexec_t bin_t:dir search;
++allow httpd_suexec_t bin_t:dir r_dir_perms;
+ allow httpd_suexec_t bin_t:lnk_file read;
+ can_exec(httpd_suexec_t, { bin_t shell_exec_t })
+ 
 @@ -367,13 +371,13 @@
  allow httpd_suexec_t autofs_t:dir { search getattr };
  tmp_domain(httpd_suexec)
@@ -1078,7 +1087,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.27.1/domains/program/unused/auditd.te
 --- nsapolicy/domains/program/unused/auditd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/auditd.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/domains/program/unused/auditd.te	2006-02-02 13:55:10.000000000 -0500
 @@ -12,6 +12,12 @@
  
  daemon_domain(auditd)
@@ -1092,7 +1101,17 @@
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
  allow auditd_t self:unix_dgram_socket create_socket_perms;
  allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
-@@ -65,3 +71,6 @@
+@@ -58,10 +64,16 @@
+ 
+ dontaudit auditctl_t local_login_t:fd use;
+ allow auditctl_t proc_t:dir search;
++allow auditctl_t proc_t:lnk_file { getattr read };
+ allow auditctl_t sysctl_kernel_t:dir search;
+ allow auditctl_t sysctl_kernel_t:file { getattr read };
+ dontaudit auditctl_t init_t:fd use; 
++allow auditctl_t device_t:dir r_dir_perms;
++allow auditctl_t devpts_t:dir r_dir_perms;
+ allow auditctl_t initrc_devpts_t:chr_file { read write };
  allow auditctl_t privfd:fd use;
  
  
@@ -2866,8 +2885,8 @@
  dontaudit snmpd_t selinux_config_t:dir search;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/spamd.te policy-1.27.1/domains/program/unused/spamd.te
 --- nsapolicy/domains/program/unused/spamd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/spamd.te	2005-11-30 16:42:28.000000000 -0500
-@@ -9,20 +9,22 @@
++++ policy-1.27.1/domains/program/unused/spamd.te	2006-02-02 13:45:05.000000000 -0500
+@@ -9,20 +9,21 @@
  
  tmp_domain(spamd)
  
@@ -2886,15 +2905,14 @@
 +dontaudit spamd_t sysadm_home_dir_t:dir { getattr search };
  
  can_network_server(spamd_t)
++nsswitch_domain(spamd_t)
 +allow spamd_t spamd_port_t:tcp_socket name_bind;
 +allow spamd_t port_type:udp_socket name_bind;
 +dontaudit spamd_t reserved_port_type:udp_socket name_bind;
-+can_ypbind(spamd_t)
-+can_resolve(spamd_t)
  allow spamd_t self:capability net_bind_service;
  
  allow spamd_t proc_t:file { getattr read };
-@@ -52,20 +54,4 @@
+@@ -52,20 +53,4 @@
  allow spamd_t urandom_device_t:chr_file { getattr read };
  
  system_crond_entry(spamd_exec_t, spamd_t)


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- selinux-policy-targeted.spec	18 Jan 2006 16:29:57 -0000	1.355
+++ selinux-policy-targeted.spec	2 Feb 2006 18:55:26 -0000	1.356
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.19
+Release: 2.20
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,6 +234,10 @@
 exit 0
 
 %changelog
+* Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.20
+- Add ldap support to spamd
+- Auditing changes 
+
 * Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.19
 - Add support for labeled networking in upcoming kernel
 - Fix man page and booleans file



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:01:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:01:00 -0500
Subject: rpms/tk/devel tk-8.4.12-relid.patch,NONE,1.1 tk.spec,1.16,1.17
Message-ID: <200602021901.k12J10iL026929@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26913

Modified Files:
	tk.spec 
Added Files:
	tk-8.4.12-relid.patch 
Log Message:
Upgraded to tk-8.4.12


tk-8.4.12-relid.patch:
 configure |    2 +-
 tcl.m4    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tk-8.4.12-relid.patch ---
--- tk8.4.12/unix/tcl.m4.relid	2005-12-05 21:42:37.000000000 -0500
+++ tk8.4.12/unix/tcl.m4	2006-02-02 13:57:33.000000000 -0500
@@ -879,7 +879,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2317,7 +2317,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- tk8.4.12/unix/configure.relid	2005-12-05 21:42:37.000000000 -0500
+++ tk8.4.12/unix/configure	2006-02-02 13:57:42.000000000 -0500
@@ -1946,7 +1946,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tk.spec	9 Dec 2005 22:43:36 -0000	1.16
+++ tk.spec	2 Feb 2006 19:00:54 -0000	1.17
@@ -2,8 +2,8 @@
 
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
-Version: %{majorver}.11
-Release: 2.1
+Version: %{majorver}.12
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -19,6 +19,7 @@
 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
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -45,6 +46,7 @@
 %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
@@ -115,6 +117,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-1
+- Upgraded to tk-8.4.12
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:02:08 -0500
Subject: rpms/avahi/devel avahi-0.6.5-bz179448.patch,1.2,1.3
Message-ID: <200602021902.k12J28qf026991@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26975

Modified Files:
	avahi-0.6.5-bz179448.patch 
Log Message:
fix bug 179448: prevent unaligned accesses on ia64

avahi-0.6.5-bz179448.patch:
 socket.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.5-bz179448.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.5-bz179448.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avahi-0.6.5-bz179448.patch	1 Feb 2006 23:04:43 -0000	1.2
+++ avahi-0.6.5-bz179448.patch	2 Feb 2006 19:01:49 -0000	1.3
@@ -1,11 +1,11 @@
---- avahi-0.6.5/avahi-core/socket.c.bz179448	2005-11-09 13:45:51.000000000 -0500
-+++ avahi-0.6.5/avahi-core/socket.c	2006-02-01 17:54:22.000000000 -0500
+--- avahi-0.6.6/avahi-core/socket.c.bz179448	2005-11-09 13:45:51.000000000 -0500
++++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 13:48:37.000000000 -0500
 @@ -456,10 +456,10 @@
      struct iovec io;
  #ifdef IP_PKTINFO
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(struct cmsghdr)) + 1];
++    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(struct cmsghdr)) + 1];
  #elif defined(IP_SENDSRCADDR)
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
@@ -18,7 +18,7 @@
      struct iovec io;
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+    struct cmsghdr cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(struct msghdr)) + 1];
++    struct cmsghdr cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(struct cmsghdr)) + 1];
  
      assert(fd >= 0);
      assert(p);



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:03:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:03:23 -0500
Subject: rpms/mozilla/FC-4
	mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch, NONE,
	1.1 mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch, NONE,
	1.1 mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch,
	NONE, 1.1 mozilla.spec, 1.67, 1.68
Message-ID: <200602021903.k12J3NUH027061@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	mozilla.spec 
Added Files:
	mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch 
	mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch 
	mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch 
Log Message:
* Sun Jan 29 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-1.5.2
- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296


mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch:
 nsGlobalHistory.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch ---
Index: xpfe/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.195.6.3
diff -u -d -p -r1.195.6.3 nsGlobalHistory.cpp
--- xpfe/components/history/src/nsGlobalHistory.cpp	26 Aug 2004 02:03:23 -0000	1.195.6.3
+++ xpfe/components/history/src/nsGlobalHistory.cpp	29 Jan 2006 23:12:59 -0000
@@ -111,6 +111,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
 
 #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
 
+// see bug #319004 -- clamp title and URL to generously-large but not too large
+// length
+#define HISTORY_URI_LENGTH_MAX 65536
+#define HISTORY_TITLE_LENGTH_MAX 4096
+
 // sync history every 10 seconds
 #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
 //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
@@ -635,6 +640,9 @@ nsGlobalHistory::AddURI(nsIURI *aURI, PR
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   PRInt64 now = GetNow();
 
   // For notifying observers, later...
@@ -1049,7 +1057,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
   nsresult rv;
   NS_ENSURE_ARG_POINTER(aURI);
 
-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
+  nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
 
   // skip about: URIs to avoid reading in the db (about:blank, especially)
   PRBool isAbout;
@@ -1341,6 +1349,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
   
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
 
   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
@@ -1374,6 +1385,9 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI 
   nsresult rv = aURI->GetSpec(spec);
   if (NS_FAILED(rv)) return rv;
 
+  if (spec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
   rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
   if (NS_FAILED(rv)) {

mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch:
 jsemit.c   |   13 +++++++++++++
 jsinterp.c |   42 ++++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 10 deletions(-)

--- NEW FILE mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch ---
Index: js/src/jsinterp.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsinterp.c,v
retrieving revision 3.136.2.1.2.5.2.7
diff -u -d -p -U8 -r3.136.2.1.2.5.2.7 jsinterp.c
--- js/src/jsinterp.c	22 Apr 2005 00:25:15 -0000	3.136.2.1.2.5.2.7
+++ js/src/jsinterp.c	29 Jan 2006 22:31:53 -0000
@@ -2237,16 +2237,17 @@ js_Interpret(JSContext *cx, jsval *resul
                 cond = JSVAL_TO_INT(lval) OP JSVAL_TO_INT(rval);              \
             } else {                                                          \
                 d  = ltmp ? JSVAL_TO_INT(lval) : *rt->jsNaN;                  \
                 d2 = rtmp ? JSVAL_TO_INT(rval) : *rt->jsNaN;                  \
                 cond = COMPARE_DOUBLES(d, OP, d2, JS_FALSE);                  \
             }                                                                 \
         } else {                                                              \
             VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_NUMBER, &lval);               \
+            sp[-2] = lval;                                                    \
             VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_NUMBER, &rval);               \
             if (JSVAL_IS_STRING(lval) && JSVAL_IS_STRING(rval)) {             \
                 str  = JSVAL_TO_STRING(lval);                                 \
                 str2 = JSVAL_TO_STRING(rval);                                 \
                 cond = js_CompareStrings(str, str2) OP 0;                     \
             } else {                                                          \
                 VALUE_TO_NUMBER(cx, lval, d);                                 \
                 VALUE_TO_NUMBER(cx, rval, d2);                                \
@@ -2278,20 +2279,22 @@ js_Interpret(JSContext *cx, jsval *resul
             }                                                                 \
         } else {                                                              \
             if (JSVAL_IS_NULL(lval) || JSVAL_IS_VOID(lval)) {                 \
                 cond = (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) OP 1;     \
             } else if (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) {          \
                 cond = 1 OP 0;                                                \
             } else {                                                          \
                 if (ltmp == JSVAL_OBJECT) {                                   \
-                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &lval);         \
+                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);       \
+                    lval = sp[-2];                                            \
                     ltmp = JSVAL_TAG(lval);                                   \
                 } else if (rtmp == JSVAL_OBJECT) {                            \
-                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rval);         \
+                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);       \
+                    rval = sp[-1];                                            \
                     rtmp = JSVAL_TAG(rval);                                   \
                 }                                                             \
                 if (ltmp == JSVAL_STRING && rtmp == JSVAL_STRING) {           \
                     str  = JSVAL_TO_STRING(lval);                             \
                     str2 = JSVAL_TO_STRING(rval);                             \
                     cond = js_CompareStrings(str, str2) OP 0;                 \
                 } else {                                                      \
                     VALUE_TO_NUMBER(cx, lval, d);                             \
@@ -2424,26 +2427,28 @@ js_Interpret(JSContext *cx, jsval *resul
 
 #undef INTEGER_OP
 #undef BITWISE_OP
 #undef SIGNED_SHIFT_OP
 
           case JSOP_ADD:
             rval = FETCH_OPND(-1);
             lval = FETCH_OPND(-2);
-            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &ltmp);
-            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rtmp);
-            if ((cond = JSVAL_IS_STRING(ltmp)) || JSVAL_IS_STRING(rtmp)) {
+            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);
+            lval = sp[-2];
+            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);
+            rval = sp[-1];
+            if ((cond = JSVAL_IS_STRING(lval)) || JSVAL_IS_STRING(rval)) {
                 SAVE_SP(fp);
                 if (cond) {
-                    str = JSVAL_TO_STRING(ltmp);
-                    ok = (str2 = js_ValueToString(cx, rtmp)) != NULL;
+                    str = JSVAL_TO_STRING(lval);
+                    ok = (str2 = js_ValueToString(cx, rval)) != NULL;
                 } else {
-                    str2 = JSVAL_TO_STRING(rtmp);
-                    ok = (str = js_ValueToString(cx, ltmp)) != NULL;
+                    str2 = JSVAL_TO_STRING(rval);
+                    ok = (str = js_ValueToString(cx, lval)) != NULL;
                 }
                 if (!ok)
                     goto out;
                 str = js_ConcatStrings(cx, str, str2);
                 if (!str) {
                     ok = JS_FALSE;
                     goto out;
                 }
@@ -2736,39 +2741,56 @@ js_Interpret(JSContext *cx, jsval *resul
                     (cs->format & JOF_INC) ? (rval += 2) : (rval -= 2);
                     rtmp = rval;
                 }
             } else {
 
 /*
  * Initially, rval contains the value to increment or decrement, which is not
  * yet converted.  As above, the expression result goes in rtmp, the updated
- * value goes in rval.
+ * value goes in rval.  Our caller must set vp to point at a GC-rooted jsval
+ * in which we home rtmp, to protect it from GC in case the unconverted rval
+ * is not a number.
  */
 #define NONINT_INCREMENT_OP()                                                 \
     JS_BEGIN_MACRO                                                            \
         VALUE_TO_NUMBER(cx, rval, d);                                         \
         if (cs->format & JOF_POST) {                                          \
             rtmp = rval;                                                      \
             if (!JSVAL_IS_NUMBER(rtmp)) {                                     \
                 ok = js_NewNumberValue(cx, d, &rtmp);                         \
                 if (!ok)                                                      \
                     goto out;                                                 \
+                *vp = rtmp;                                                   \
             }                                                                 \
             (cs->format & JOF_INC) ? d++ : d--;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
         } else {                                                              \
             (cs->format & JOF_INC) ? ++d : --d;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
             rtmp = rval;                                                      \
         }                                                                     \
         if (!ok)                                                              \
             goto out;                                                         \
     JS_END_MACRO
 
+                if (cs->format & JOF_POST) {
+                    /*
+                     * We must push early to protect the postfix increment
+                     * or decrement result, if converted to a jsdouble from
+                     * a non-number value, from GC nesting in the setter.
+                     */
+                    vp = sp++;
+                    SAVE_SP(fp);
+                    --i;
+                }
+#ifdef __GNUC__
+                else vp = NULL; /* suppress bogus gcc warnings */
+#endif
+
                 NONINT_INCREMENT_OP();
             }
 
             fp->flags |= JSFRAME_ASSIGNING;
             CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
             fp->flags &= ~JSFRAME_ASSIGNING;
             if (!ok)
                 goto out;
Index: js/src/jsemit.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsemit.c,v
retrieving revision 3.96.6.4.2.1
diff -u -d -p -U8 -r3.96.6.4.2.1 jsemit.c
--- js/src/jsemit.c	9 Jul 2005 01:48:08 -0000	3.96.6.4.2.1
+++ js/src/jsemit.c	29 Jan 2006 22:31:53 -0000
@@ -3935,16 +3935,29 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
             }
             if (js_Emit1(cx, cg, op) < 0)
                 return JS_FALSE;
             break;
 #endif
           default:
             JS_ASSERT(0);
         }
+
+        /*
+         * Allocate another stack slot for GC protection in case the initial
+         * value being post-incremented or -decremented is not a number, but
+         * converts to a jsdouble.  In the TOK_NAME cases, op has 0 operand
+         * uses and 1 definition, so we don't need an extra stack slot -- we
+         * can use the one allocated for the def.
+         */
+        if (pn2->pn_type != TOK_NAME &&
+            (js_CodeSpec[op].format & JOF_POST) &&
+            (uintN)cg->stackDepth == cg->maxStackDepth) {
+            ++cg->maxStackDepth;
+        }
         break;
 
       case TOK_DELETE:
         /*
          * Under ECMA 3, deleting a non-reference returns true -- but alas we
          * must evaluate the operand if it appears it might have side effects.
          */
         pn2 = pn->pn_kid;

mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch:
 nsXULDocument.cpp |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch ---
Index: content/xul/document/src/nsXULDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULDocument.cpp,v
retrieving revision 1.611.2.1.14.2
diff -u -d -p -U8 -r1.611.2.1.14.2 nsXULDocument.cpp
--- content/xul/document/src/nsXULDocument.cpp	22 Jun 2005 01:52:31 -0000	1.611.2.1.14.2
+++ content/xul/document/src/nsXULDocument.cpp	29 Jan 2006 20:52:50 -0000
@@ -112,16 +112,17 @@
 #include "nsIObjectOutputStream.h"
 #include "nsIFocusController.h"
 #include "nsContentList.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentUtils.h"
 #include "nsIParser.h"
+#include "nsIParserService.h"
 #include "nsICSSStyleSheet.h"
 
 //----------------------------------------------------------------------
 //
 // CIDs
 //
 
 static NS_DEFINE_CID(kHTMLElementFactoryCID,     NS_HTML_ELEMENT_FACTORY_CID);
@@ -1485,16 +1486,32 @@ nsXULDocument::Persist(const nsAString& 
     PRInt32 nameSpaceID;
 
     nsCOMPtr<nsINodeInfo> ni = element->GetExistingAttrNameFromQName(aAttr);
     if (ni) {
         tag = ni->NameAtom();
         nameSpaceID = ni->NamespaceID();
     }
     else {
+        // Make sure that this QName is going to be valid.
+        nsIParserService *parserService = nsContentUtils::GetParserServiceWeakRef();
+        NS_ASSERTION(parserService, "Running scripts during shutdown?");
+
+        const PRUnichar *colon;
+        rv = parserService->CheckQName(PromiseFlatString(aAttr), PR_TRUE, &colon);
+        if (NS_FAILED(rv)) {
+            // There was an invalid character or it was malformed.
+            return NS_ERROR_INVALID_ARG;
+        }
+
+        if (colon) {
+            // We don't really handle namespace qualifiers in attribute names.
+            return NS_ERROR_NOT_IMPLEMENTED;
+        }
+
         tag = do_GetAtom(aAttr);
         NS_ENSURE_TRUE(tag, NS_ERROR_OUT_OF_MEMORY);
 
         nameSpaceID = kNameSpaceID_None;
     }
 
     rv = Persist(element, nameSpaceID, tag);
     if (NS_FAILED(rv)) return rv;


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/FC-4/mozilla.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mozilla.spec	22 Sep 2005 19:48:37 -0000	1.67
+++ mozilla.spec	2 Feb 2006 19:03:09 -0000	1.68
@@ -9,7 +9,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.12
-Release:     1.5.1
+Release:     1.5.2
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -65,6 +65,10 @@
 Patch106:    firefox-1.0-uriloader.patch
 Patch107:    mozilla-1.7.8-imgloader-comarray.patch
 
+Patch110:    mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch
+Patch111:    mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch
+Patch112:    mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch
+
 Buildroot:   %{_tmppath}/%{name}-root
 Prefix:      /usr
 Group:       Applications/Internet
@@ -217,6 +221,11 @@
 %patch106 -p0
 %patch107 -p0
 
+%patch110 -p0
+%patch111 -p0
+%patch112 -p0
+
+
 
 # set up our default bookmarks
 /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
@@ -830,6 +839,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Sun Jan 29 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-1.5.2
+- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296
+
 * Thu Sep 22 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.12-1.5.1
 - Update to 1.7.12, containing fixes for:
   CAN-2005-2701 CAN-2005-2702 CAN-2005-2703 CAN-2005-2704



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:06:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:06:22 -0500
Subject: rpms/glibc/devel glibc-math_h.patch, NONE, 1.1 glibc.spec, 1.216,
	1.217
Message-ID: <200602021906.k12J6M45027179@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Added Files:
	glibc-math_h.patch 
Log Message:
2.3.90-34


glibc-math_h.patch:
 math.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE glibc-math_h.patch ---
2006-02-02  Jakub Jelinek  <jakub at redhat.com>

	* math/math.h (__nldbl_nexttowardf): Put __THROW before
	__attribute__ ((__const__)).
	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
	followed by __THROW.

	* math/math.h [__LDBL_COMPAT && __USE_ISOC99] (nexttowardl): New
	prototype.

--- libc/math/math.h.jj	2006-01-18 09:28:38.000000000 +0100
+++ libc/math/math.h	2006-02-02 20:02:26.000000000 +0100
@@ -103,13 +103,16 @@ __BEGIN_DECLS
 
 #   ifdef __USE_ISOC99 
 extern float __nldbl_nexttowardf (float __x, long double __y)
-				  __attribute__ ((__const__)) __THROW;
+				  __THROW __attribute__ ((__const__));
 #    ifdef __REDIRECT_NTH
 extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y),
 			     __nldbl_nexttowardf)
      __attribute__ ((__const__));
 extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y),
 			      nextafter) __attribute__ ((__const__));
+extern long double __REDIRECT_NTH (nexttowardl,
+				   (long double __x, long double __y),
+				   nextafter) __attribute__ ((__const__));
 #    endif
 #   endif
 
@@ -118,8 +121,8 @@ extern double __REDIRECT_NTH (nexttoward
 
 #   undef __MATHDECL_1
 #   define __MATHDECL_2(type, function,suffix, args, alias) \
-  extern type __REDIRECT(__MATH_PRECNAME(function,suffix), \
-			 args, alias) __THROW
+  extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix), \
+			     args, alias)
 #   define __MATHDECL_1(type, function,suffix, args) \
   __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
 #  endif


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- glibc.spec	2 Feb 2006 09:35:12 -0000	1.216
+++ glibc.spec	2 Feb 2006 19:06:19 -0000	1.217
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20060202T0507
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 33
+%define glibcrelease 34
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -32,6 +32,7 @@
 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
+Patch2: glibc-math_h.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -241,6 +242,7 @@
 %patch1 -p1
 %endif
 %endif
+%patch2 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir -p override_headers/linux
@@ -1245,6 +1247,10 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-34
+- fix <math.h> with C++ and -mlong-double-64 (#179742)
+- add nexttowardl redirect for -mlong-double-64
+
 * Thu Feb  2 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-33
 - update from CVS
   - long double support fixes



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:28:54 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.46,
	1.47 java-1.4.2-gcj-compat.spec, 1.121, 1.122 sources, 1.50, 1.51
Message-ID: <200602021928.k12JSsWj017697@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-serv17610

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
- Import BouncyCastle 1.3.1.
- Re-enable BouncyCastle provider.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	25 Jan 2006 19:01:53 -0000	1.46
+++ .cvsignore	2 Feb 2006 19:28:51 -0000	1.47
@@ -1,3 +1,3 @@
-bcprov-jdk14-127.tar.gz
+bcprov-jdk14-131.tar.gz
 eclipse-ecj-3.1.0_fc-12.jar
 java-gcj-compat-1.0.52.tar.gz


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.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- java-1.4.2-gcj-compat.spec	25 Jan 2006 19:02:07 -0000	1.121
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 19:28:51 -0000	1.122
@@ -21,9 +21,9 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_63rh
+%define release 	40jpp_64rh
 %define cname           java-%{javaver}-%{origin}
-#%define bcarchivever	127
+%define bcarchivever	131
 
 %define	sdklnk		java-%{javaver}-%{origin}
 %define	jrelnk		jre-%{javaver}-%{origin}
@@ -43,13 +43,13 @@
 License:	GPL
 URL:		ftp://sources.redhat.com/pub/rhug/java-gcj-compat
 Source0:        java-gcj-compat-%{jgcver}.tar.gz
-#Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
+Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
 Source2:	eclipse-ecj-3.1.0_fc-12.jar
 Source3:	ecj.sh.in
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
-#BuildRequires:	eclipse-ecj
+BuildRequires:	eclipse-ecj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -131,16 +131,16 @@
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
 
-# gzip -dc %{SOURCE1} | tar -xf -
-# # build bouncy castle provider
-# pushd bcprov-jdk14-%{bcarchivever}/src
-#   find -type d -name test | xargs rm -rf
-#   ecj `find . -type f -name "*.java"`
-#   jar2="bcprov-%{bcarchivever}.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
-# popd
+gzip -dc %{SOURCE1} | tar -xf -
+# build bouncy castle provider
+pushd bcprov-jdk14-%{bcarchivever}/src
+  find -type d -name test | xargs rm -rf
+  ecj `find . -type f -name "*.java"`
+  jar2="bcprov-%{bcarchivever}.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
+popd
 
 %if %{custom}
 cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
@@ -205,7 +205,7 @@
 %if ! %{custom}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
 %endif
-# touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 
 # versionless symlinks
 pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -230,10 +230,10 @@
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin -type f -o -type l \
   | sed "s|^$RPM_BUILD_ROOT||"      > %{name}-%{version}-sdk-bin.files
 
-# # install bouncy castle provider
-# install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
-# install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
-#   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+# install bouncy castle provider
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
+  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
 
 # classmap database directory
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
@@ -513,12 +513,12 @@
 %{jvmjardir}/*.jar
 %{_jvmdir}/%{jrelnk}
 %{_jvmjardir}/%{jrelnk}
-#%{_jvmprivdir}/*
+# %{_jvmprivdir}/*
 %if ! %{custom}
 %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
 %endif
-# %{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
-# %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -547,6 +547,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
+- Import BouncyCastle 1.3.1.
+- Re-enable BouncyCastle provider.
+
 * Wed Jan 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_63rh
 - Import java-gcj-compat 1.0.52.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources	25 Jan 2006 19:02:08 -0000	1.50
+++ sources	2 Feb 2006 19:28:51 -0000	1.51
@@ -1,3 +1,3 @@
-d17b7fa532fc87fdf14d42c2d293ec3f  bcprov-jdk14-127.tar.gz
+830237b359ad7245ec67a972e58ac098  bcprov-jdk14-131.tar.gz
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
 40635fcbe7183ce72fdd45b8a3fc373e  java-gcj-compat-1.0.52.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:37:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:37:53 -0500
Subject: rpms/bsf/devel bsf.spec,1.7,1.8
Message-ID: <200602021937.k12JbrrU020109@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/bsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20007

Modified Files:
	bsf.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.3.0-6jpp_2fc.2
- Bump release number.




Index: bsf.spec
===================================================================
RCS file: /cvs/dist/rpms/bsf/devel/bsf.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bsf.spec	9 Dec 2005 22:39:49 -0000	1.7
+++ bsf.spec	2 Feb 2006 19:37:50 -0000	1.8
@@ -1,11 +1,11 @@
 %define name		bsf
 %define version		2.3.0
-%define release 6jpp_2fc.1
+%define release 6jpp_2fc.2
 %define section		free
 
 Name:		%{name}
 Version:	%{version}
-Release: %{release}.1
+Release: %{release}
 Epoch:		0
 Summary:        Bean Scripting Framework
 License:        Apache License
@@ -112,6 +112,9 @@
 %ghost %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.3.0-6jpp_2fc.2
+- Bump release number.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:43:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:43:43 -0500
Subject: rpms/avahi/devel avahi-0.6.5-bz179448.patch,1.3,1.4
Message-ID: <200602021943.k12Jhhgx022799@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22759

Modified Files:
	avahi-0.6.5-bz179448.patch 
Log Message:
fix bug 179448: prevent unaligned accesses on ia64

avahi-0.6.5-bz179448.patch:
 socket.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.5-bz179448.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.5-bz179448.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avahi-0.6.5-bz179448.patch	2 Feb 2006 19:01:49 -0000	1.3
+++ avahi-0.6.5-bz179448.patch	2 Feb 2006 19:43:40 -0000	1.4
@@ -1,15 +1,15 @@
 --- avahi-0.6.6/avahi-core/socket.c.bz179448	2005-11-09 13:45:51.000000000 -0500
-+++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 13:48:37.000000000 -0500
++++ avahi-0.6.6/avahi-core/socket.c	2006-02-02 14:40:29.000000000 -0500
 @@ -456,10 +456,10 @@
      struct iovec io;
  #ifdef IP_PKTINFO
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))];
-+    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1];
  #elif defined(IP_SENDSRCADDR)
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))];
-+    struct cmsghdr cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1];
  #endif
  
      assert(fd >= 0);
@@ -18,7 +18,7 @@
      struct iovec io;
      struct cmsghdr *cmsg;
 -    uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))];
-+    struct cmsghdr cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(struct cmsghdr)) + 1];
++    size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1];
  
      assert(fd >= 0);
      assert(p);
@@ -27,7 +27,7 @@
      struct msghdr msg;
      struct iovec io;
 -    uint8_t aux[1024];
-+    struct cmsghdr aux[1024 / sizeof(struct cmsghdr)]; /* for alignment on ia64 ! */
++    size_t aux[1024 / sizeof(size_t)]; /* for alignment on ia64 ! */
      ssize_t l;
      struct cmsghdr *cmsg;
      int found_addr = 0;
@@ -36,7 +36,7 @@
      struct msghdr msg;
      struct iovec io;
 -    uint8_t aux[64];
-+    struct cmsghdr aux[1024 / sizeof(struct cmsghdr)];
++    size_t aux[1024 / sizeof(size_t)];
      ssize_t l;
      int ms;
      struct cmsghdr *cmsg;



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:55:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:55:46 -0500
Subject: rpms/tzdata/devel .cvsignore, 1.18, 1.19 sources, 1.20,
	1.21 tzdata.spec, 1.24, 1.25
Message-ID: <200602021955.k12JtkOg008375@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8140

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006a:
  - private.h(scheck): changing char* to char const*
  - Rule changes for Palestine, zone changes for Indiana/US, both
    changes for Canada.
  - Many related doc changes.
- Naming scheme in spec file doesn't use %%{name}, but tzdata.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Jan 2006 16:12:07 -0000	1.18
+++ .cvsignore	2 Feb 2006 19:55:43 -0000	1.19
@@ -1,3 +1,3 @@
-tzdata2005r-base.tar.bz2
-tzdata2005r.tar.gz
-tzcode2005r.tar.gz
+tzdata2006a-base.tar.bz2
+tzdata2006a.tar.gz
+tzcode2006a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	12 Jan 2006 16:12:07 -0000	1.20
+++ sources	2 Feb 2006 19:55:43 -0000	1.21
@@ -1,3 +1,3 @@
-325dba39b9741b63b94e4c05a3fefd5c  tzdata2005r-base.tar.bz2
-b692c04a6a41080e214add0d3f58c700  tzdata2005r.tar.gz
-063ea36d9257eb6779b1df847b04d8ab  tzcode2005r.tar.gz
+325dba39b9741b63b94e4c05a3fefd5c  tzdata2006a-base.tar.bz2
+69e6b498bf4b8d66568fa9a7816b6321  tzdata2006a.tar.gz
+00c545c57ce1bbfbc550eb21244cf57b  tzcode2006a.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tzdata.spec	12 Jan 2006 16:12:07 -0000	1.24
+++ tzdata.spec	2 Feb 2006 19:55:43 -0000	1.25
@@ -1,11 +1,11 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2005r
-Release: 3
+Version: 2006a
+Release: 1
 License: GPL
 Group: System Environment/Base
-Source0: %{name}%{version}-base.tar.bz2
-Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz
+Source0: tzdata%{version}-base.tar.bz2
+Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 Buildroot: /var/tmp/tzdata-root
 BuildRequires: gawk, glibc, glibc-common, perl
@@ -46,7 +46,15 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
-* Mon Jan 12 2006 Petr Machata <pmachata at redhat.com> 2005r-3
+* Thu Feb 02 2006 Petr Machata <pmachata at redhat.com> 2006a-1
+- Upstream 2006a:
+  - private.h(scheck): changing char* to char const*
+  - Rule changes for Palestine, zone changes for Indiana/US, both
+    changes for Canada.
+  - Many related doc changes.
+- Naming scheme in spec file doesn't use %%{name}, but tzdata.
+
+* Thu Jan 12 2006 Petr Machata <pmachata at redhat.com> 2005r-3
 - 2005r-3
   - Meta changes.  Renaming tzdata.tar.bz2 file to tzdata$ver-base,
     so that it won't clash across updates.



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:55:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:55:51 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.122,
	1.123
Message-ID: <200602021955.k12JtpL5008429@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-serv8299

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
- Do not BuildRequires eclipse-ecj in bootstrap mode.
- Build BouncyCastle with bootstrap ecj script in bootstrap mode.




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.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 19:28:51 -0000	1.122
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 19:55:48 -0000	1.123
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_64rh
+%define release 	40jpp_65rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -49,7 +49,9 @@
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
+%if ! %{bootstrap}
 BuildRequires:	eclipse-ecj
+%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -131,17 +133,6 @@
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
 
-gzip -dc %{SOURCE1} | tar -xf -
-# build bouncy castle provider
-pushd bcprov-jdk14-%{bcarchivever}/src
-  find -type d -name test | xargs rm -rf
-  ecj `find . -type f -name "*.java"`
-  jar2="bcprov-%{bcarchivever}.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
-popd
-
 %if %{custom}
 cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj-1
@@ -163,6 +154,21 @@
 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-%{bcarchivever}.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
+popd
+
 %install
 %if %{custom}
 export PATH=%{gcj_prefix}/bin:$PATH
@@ -547,6 +553,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
+- Do not BuildRequires eclipse-ecj in bootstrap mode.
+- Build BouncyCastle with bootstrap ecj script in bootstrap mode.
+
 * Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
 - Import BouncyCastle 1.3.1.
 - Re-enable BouncyCastle provider.



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:57:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:57:57 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.123,
	1.124
Message-ID: <200602021957.k12JvvMe009501@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-serv9405

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Fix ecj script location when building BouncyCastle in bootstrap mode.




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.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 19:55:48 -0000	1.123
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 19:57:54 -0000	1.124
@@ -159,7 +159,7 @@
 pushd bcprov-jdk14-%{bcarchivever}/src
   find -type d -name test | xargs rm -rf
 %if %{bootstrap}
-  sh ecj `find . -type f -name "*.java"`
+  sh ../../ecj `find . -type f -name "*.java"`
 %else
   ecj `find . -type f -name "*.java"`
 %endif
@@ -554,6 +554,7 @@
 
 %changelog
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
+- Fix ecj script location when building BouncyCastle in bootstrap mode.
 - Do not BuildRequires eclipse-ecj in bootstrap mode.
 - Build BouncyCastle with bootstrap ecj script in bootstrap mode.
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 19:59:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 14:59:07 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.124,
	1.125
Message-ID: <200602021959.k12Jx717010087@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-serv9994

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Bump release number.




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.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 19:57:54 -0000	1.124
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 19:59:04 -0000	1.125
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_65rh
+%define release 	40jpp_66rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -553,7 +553,7 @@
 %defattr(-,root,root)
 
 %changelog
-* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_66rh
 - Fix ecj script location when building BouncyCastle in bootstrap mode.
 - Do not BuildRequires eclipse-ecj in bootstrap mode.
 - Build BouncyCastle with bootstrap ecj script in bootstrap mode.



From fedora-cvs-commits at redhat.com  Thu Feb  2 20:19:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 15:19:31 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1589,
	1.1590 linux-2.6-debug-r8169.patch, 1.2, NONE
Message-ID: <200602022019.k12KJV2X029170@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-r8169.patch 
Log Message:
remove debugging patch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1589
retrieving revision 1.1590
diff -u -r1.1589 -r1.1590
--- kernel-2.6.spec	1 Feb 2006 00:28:52 -0000	1.1589
+++ kernel-2.6.spec	2 Feb 2006 20:19:29 -0000	1.1590
@@ -285,7 +285,6 @@
 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-r8169.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -673,7 +672,6 @@
 %patch1026 -p1
 %patch1027 -p1
 %patch1028 -p1
-%patch1029 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -1275,6 +1273,9 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1830_FC4]
+- Remove r8169 debugging.
+
 * Tue Jan 31 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1829_FC4]
 - 2.6.15.2
 - Fix scsi_cmd_cache leak.


--- linux-2.6-debug-r8169.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 20:19:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 15:19:50 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.125,
	1.126
Message-ID: <200602022019.k12KJo6I029366@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-serv29224

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_67rh
- Remove conditional BuildRequires, which isn't supported by beehive.




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.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 19:59:04 -0000	1.125
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 20:19:46 -0000	1.126
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_66rh
+%define release 	40jpp_67rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -49,9 +49,6 @@
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
-%if ! %{bootstrap}
-BuildRequires:	eclipse-ecj
-%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -553,6 +550,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_67rh
+- Remove conditional BuildRequires, which isn't supported by beehive.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_66rh
 - Fix ecj script location when building BouncyCastle in bootstrap mode.
 - Do not BuildRequires eclipse-ecj in bootstrap mode.



From fedora-cvs-commits at redhat.com  Thu Feb  2 21:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:20:39 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc1-git6.bz2.sign, NONE,
	1.1 .cvsignore, 1.334, 1.335 kernel-2.6.spec, 1.1895,
	1.1896 linux-2.6-debug-singlebiterror.patch, 1.2,
	1.3 linux-2.6-random-patches.patch, 1.1,
	1.2 linux-2.6-selinux-mprotect-checks.patch, 1.2, 1.3 sources,
	1.276, 1.277 upstream, 1.251,
	1.252 linux-2.6-suspend-memhotplug-oops.patch, 1.1,
	NONE patch-2.6.16-rc1-git5.bz2.sign, 1.1, NONE
Message-ID: <200602022120.k12LKdks029095@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec 
	linux-2.6-debug-singlebiterror.patch 
	linux-2.6-random-patches.patch 
	linux-2.6-selinux-mprotect-checks.patch sources upstream 
Added Files:
	patch-2.6.16-rc1-git6.bz2.sign 
Removed Files:
	linux-2.6-suspend-memhotplug-oops.patch 
	patch-2.6.16-rc1-git5.bz2.sign 
Log Message:
git6



--- NEW FILE patch-2.6.16-rc1-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD4cDHyGugalF9Dw4RAmrRAJ9wCdcq1VVVA6JrunPVW0rdW9k1jACdFMku
Ym153w1XS8BDJdQGftkX3vc=
=jhrM
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- .cvsignore	1 Feb 2006 18:45:17 -0000	1.334
+++ .cvsignore	2 Feb 2006 21:20:36 -0000	1.335
@@ -6,3 +6,4 @@
 bcm43xx-20060114.tar.bz2
 acpi-release-20060113-2.6.16-rc1.diff.bz2
 patch-2.6.16-rc1-git5.bz2
+patch-2.6.16-rc1-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1895
retrieving revision 1.1896
diff -u -r1.1895 -r1.1896
--- kernel-2.6.spec	2 Feb 2006 03:51:46 -0000	1.1895
+++ kernel-2.6.spec	2 Feb 2006 21:20:36 -0000	1.1896
@@ -209,9 +209,8 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc1.bz2
-Patch2: patch-2.6.16-rc1-git5.bz2
+Patch2: patch-2.6.16-rc1-git6.bz2
 Patch3: drm.patch
-Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -359,7 +358,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1880: linux-2.6-suspend-memhotplug-oops.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -596,8 +594,6 @@
 %patch2 -p1
 # Backout broken DRM changes.
 %patch3 -p1 -R
-# Update ACPI
-%patch4 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -854,8 +850,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Fix software suspend on kernels without memory hotplug.
-%patch1880 -p1
 # Fix oops in stradis on init
 %patch1890 -p1
 
@@ -1387,7 +1381,10 @@
 %endif
 
 %changelog
-* Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
+* Thu Feb  2 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc1-git6
+
+* Wed Feb  1 2006 Dave Jones <davej at redhat.com>
 - Woo, 2.6.16rc1-git5 (at last)
 - Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
 - Disable a bunch of drivers for SBC's that won't run Fedora.

linux-2.6-debug-singlebiterror.patch:
 slab.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-singlebiterror.patch	9 Jan 2006 18:55:15 -0000	1.2
+++ linux-2.6-debug-singlebiterror.patch	2 Feb 2006 21:20:36 -0000	1.3
@@ -1,3 +1,18 @@
+
+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.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

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 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.15.noarch/drivers/media/video/cpia.c             |    2 +-
 linux-2.6.15.noarch/drivers/scsi/megaraid.c                |    2 +-
 linux-2.6.15/kernel/power/snapshot.c                       |    3 ++-
 10 files changed, 11 insertions(+), 14 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-random-patches.patch	2 Feb 2006 03:51:47 -0000	1.1
+++ linux-2.6-random-patches.patch	2 Feb 2006 21:20:36 -0000	1.2
@@ -31,26 +31,6 @@
  }
  
 
-kobject_register failed for hexium HV-PCI6/Orion (-13)
- [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
- [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c7700a>] hexium_init_module+0xa/0x47 [hexium_orion]
- [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
- [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
- [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/media/video/hexium_orion.c~	2006-02-01 22:37:07.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/media/video/hexium_orion.c	2006-02-01 22:37:24.000000000 -0500
-@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = {
- };
- 
- static struct saa7146_extension extension = {
--	.name = "hexium HV-PCI6/Orion",
-+	.name = "hexium HV-PCI6 Orion",
- 	.flags = 0,		// SAA7146_USE_I2C_IRQ,
- 
- 	.pci_tbl = &pci_tbl[0],
 --- 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);

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-selinux-mprotect-checks.patch	1 Feb 2006 21:35:54 -0000	1.2
+++ linux-2.6-selinux-mprotect-checks.patch	2 Feb 2006 21:20:36 -0000	1.3
@@ -2,25 +2,25 @@
 
 --- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
 +++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
-@@ -2451,7 +2451,6 @@ static int selinux_file_mprotect(struct 
+@@ -2425,7 +2425,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
 -#ifndef CONFIG_PPC32
- 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
- 	   (vma->vm_start >= vma->vm_mm->start_brk &&
- 	    vma->vm_end <= vma->vm_mm->brk)) {
-@@ -2470,7 +2469,9 @@ static int selinux_file_mprotect(struct 
- 		 * check ability to execute the possibly modified content.
- 		 * This typically should only occur for text relocations.
- 		 */
--		int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
+ 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
+ 		rc = 0;
+ 		if (vma->vm_start >= vma->vm_mm->start_brk &&
+@@ -2444,8 +2444,10 @@ static int selinux_file_mprotect(struct 
+ 			 * modified content.  This typically should only
+ 			 * occur for text relocations.
+ 			 */
 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
-+		rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
+ 			rc = file_has_perm(current, vma->vm_file,
+ 					   FILE__EXECMOD);
 +#endif
+ 		}
  		if (rc)
  			return rc;
- 	}
 @@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- sources	1 Feb 2006 18:45:17 -0000	1.276
+++ sources	2 Feb 2006 21:20:36 -0000	1.277
@@ -1,5 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
-3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2
-38954e4fe6dbf902e854f456b675f60f  patch-2.6.16-rc1-git5.bz2
+4bb74f4fb52bda3d1912960acc017861  patch-2.6.16-rc1-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- upstream	1 Feb 2006 18:45:17 -0000	1.251
+++ upstream	2 Feb 2006 21:20:36 -0000	1.252
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc1.bz2
-patch-2.6.16-rc1-git5.bz2
+patch-2.6.16-rc1-git6.bz2


--- linux-2.6-suspend-memhotplug-oops.patch DELETED ---


--- patch-2.6.16-rc1-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  2 21:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:29:10 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.46,1.47
Message-ID: <200602022129.k12LTAVa007044@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
build fix



linux-2.6-compile-fixes.patch:
 linux-2.6.15.noarch/include/linux/suspend.h |    4 ----
 linux-2.6.15/arch/s390/kernel/setup.c       |    2 ++
 linux-2.6.15/drivers/net/spider_net.c       |    1 +
 linux-2.6.15/include/asm-generic/signal.h   |    1 +
 linux-2.6/arch/ia64/Kconfig                 |    3 +++
 linux-2.6/drivers/Makefile                  |    2 +-
 6 files changed, 8 insertions(+), 5 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- linux-2.6-compile-fixes.patch	20 Jan 2006 00:07:07 -0000	1.46
+++ linux-2.6-compile-fixes.patch	2 Feb 2006 21:29:07 -0000	1.47
@@ -69,3 +69,16 @@
  obj-$(CONFIG_CRYPTO)		+= crypto/
  obj-$(CONFIG_SUPERH)		+= sh/
 
+--- linux-2.6.15.noarch/include/linux/suspend.h~	2006-02-02 16:27:38.000000000 -0500
++++ linux-2.6.15.noarch/include/linux/suspend.h	2006-02-02 16:28:07.000000000 -0500
+@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone 
+ #ifdef CONFIG_PM
+ /* kernel/power/swsusp.c */
+ extern int software_suspend(void);
+-
+-extern int pm_prepare_console(void);
+-extern void pm_restore_console(void);
+-
+ #else
+ static inline int software_suspend(void)
+ {



From fedora-cvs-commits at redhat.com  Thu Feb  2 21:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:30:48 -0500
Subject: rpms/kdemultimedia/devel .cvsignore, 1.32, 1.33 kdemultimedia.spec,
	1.52, 1.53 sources, 1.33, 1.34
Message-ID: <200602022130.k12LUm2Y007656@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7609

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
3.5.1










From fedora-cvs-commits at redhat.com  Thu Feb  2 21:33:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:33:42 -0500
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.53,1.54
Message-ID: <200602022133.k12LXgu4007781@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7751

Modified Files:
	kdemultimedia.spec 
Log Message:
typo fix



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdemultimedia.spec	2 Feb 2006 21:30:17 -0000	1.53
+++ kdemultimedia.spec	2 Feb 2006 21:33:39 -0000	1.54
@@ -103,7 +103,7 @@
 %setup -q -n %{name}-%{version}%{patch_name}
 %patch1 -p1
 %patch2 -p1 -b .config
-%patch4 -p1 -b .xdg
+%patch3 -p1 -b .xdg
 
 perl -pi -e "s/-fomit-frame-pointer//g" admin/acinclude.m4.in
 perl -pi -e "s,examples,,g" kmid/Make*



From fedora-cvs-commits at redhat.com  Thu Feb  2 21:40:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:40:25 -0500
Subject: rpms/kdelibs/devel kdelibs.spec,1.123,1.124
Message-ID: <200602022140.k12LePbW010217@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdelibs.spec 
Log Message:
add Obsolete: kdelibs-docs



Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kdelibs.spec	1 Feb 2006 11:10:47 -0000	1.123
+++ kdelibs.spec	2 Feb 2006 21:40:22 -0000	1.124
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 2
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -156,6 +156,7 @@
 Group: Development/Documentation
 Summary: KDE API documentation.
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: kdelibs-docs
 
 %description apidocs
 This package includes the KDE API documentation in HTML
@@ -411,6 +412,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-2 
+- add Obsolete: kdelibs-docs
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 21:43:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 16:43:59 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.87, 1.88 mkinitrd.spec, 1.95,
	1.96 sources, 1.92, 1.93
Message-ID: <200602022143.k12LhxTv011902@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11829

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.19-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- .cvsignore	31 Jan 2006 19:52:13 -0000	1.87
+++ .cvsignore	2 Feb 2006 21:43:56 -0000	1.88
@@ -1 +1 @@
-mkinitrd-5.0.18.tar.bz2
+mkinitrd-5.0.19.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- mkinitrd.spec	31 Jan 2006 19:52:13 -0000	1.95
+++ mkinitrd.spec	2 Feb 2006 21:43:56 -0000	1.96
@@ -1,14 +1,16 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.18
+Version: 5.0.19
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
 ExclusiveOs: Linux
 Prereq: dev
-Requires: e2fsprogs, /bin/sh, fileutils, grep, mount, gzip, tar, /sbin/insmod.static, /sbin/losetup, mktemp >= 1.5-5, findutils, lvm2
-Requires: filesystem >= 2.1.0, cpio, device-mapper
+Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
+Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
+Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
+Requires: e2fsprogs, e2fsprogs-devel
 BuildRequires: popt
 BuildRequires: e2fsprogs-devel parted-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
@@ -62,6 +64,23 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.19-1
+- mkinitrd: get resolve_dm_name() and get_numeric_dev() from initscripts
+  instead of a private copy
+- add block.[ch]:
+  - move parse_sysfs_devnum(), sysfs_blkdev_probe(), and
+    mkpathbyspec() from nash.c
+  - add label/uuid/name lookups for block devices using libblkid
+- add lib.[ch]:
+  - move makeFdCoe(), coeOpen(), coeFopen(), coeOpendir(), readFD(),
+    nashLoggerV(), nashLogger(), qprintf(), eprintf(), smartmknod(),
+    testing, quiet, reallyquiet from nash.c
+  - move nashDefaultLogger(), from dm.c
+  - move log enums and declarations from dm.h
+- dm.c: add dm_finish(), which does dm_task_destroy() and then library cleanup
+  (solves an fd leak)
+- remove linux_fs.h, mount_by_label.[ch], name_to_dev_t.[ch]
+
 * Tue Jan 31 2006 Peter Jones <pjones at redhat.com> - 5.0.18-1
 - make mkinitrd discover dm uuids
 - add uuid support to nash's "dm create" and "dm partadd"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- sources	31 Jan 2006 19:52:13 -0000	1.92
+++ sources	2 Feb 2006 21:43:56 -0000	1.93
@@ -1 +1 @@
-397cce6e62f1da203c6fe8d7ed6c2f27  mkinitrd-5.0.18.tar.bz2
+950efbcafaeb285062616ddb584759e7  mkinitrd-5.0.19.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 22:01:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 17:01:09 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.90, 1.91 initscripts.spec,
	1.103, 1.104 sources, 1.98, 1.99
Message-ID: <200602022201.k12M19nm031572@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31351

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	2 Feb 2006 05:43:27 -0000	1.90
+++ .cvsignore	2 Feb 2006 22:00:35 -0000	1.91
@@ -1 +1 @@
-initscripts-8.24.tar.bz2
+initscripts-8.25.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- initscripts.spec	2 Feb 2006 05:43:27 -0000	1.103
+++ initscripts.spec	2 Feb 2006 22:00:45 -0000	1.104
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.24
+Version: 8.25
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 8.25-1
+- ifup: don't run the arping check if the address is already on the device
+
 * Wed Feb  1 2006 Bill Nottingham <notting at redhat.com> 8.24-1
 - init.d/functions: fix sendmail startup
 - sysconfig.txt: fix typos (<mitr at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	2 Feb 2006 05:43:27 -0000	1.98
+++ sources	2 Feb 2006 22:00:45 -0000	1.99
@@ -1 +1 @@
-8c570996aa845259b4cac034fae7790f  initscripts-8.24.tar.bz2
+a862433b57df1b86d257d1a1d364c11d  initscripts-8.25.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 22:06:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 17:06:20 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1590,1.1591
Message-ID: <200602022206.k12M6KLQ031894@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump






From fedora-cvs-commits at redhat.com  Thu Feb  2 22:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 17:24:20 -0500
Subject: rpms/xen/devel xen-network-iptables-bridge.patch, NONE, 1.1 xen.spec,
	1.80, 1.81
Message-ID: <200602022224.k12MOJ86019187@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18554

Modified Files:
	xen.spec 
Added Files:
	xen-network-iptables-bridge.patch 
Log Message:
*docs* Disable iptables/ip6tables/arptables for bridged packets when
we bring up a xen bridge. (#177794)

You can still restrict access to dom0 from domU via
the normal IP-based mechanisms, and all packets are passed to domU for
domU to filter.

Now, if you want to have dom0 firewalling domU, or you want to actually
do filtering on the bridge based on specific bridge ports (with the
physdev module), you'll have to turn this back on. But in those
cases, you're almost certainly writing your own firewall rules by
hand anyways.



xen-network-iptables-bridge.patch:
 network-bridge |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xen-network-iptables-bridge.patch ---
--- xen-3.0.0/tools/examples/network-bridge.foo	2006-02-02 17:18:41.000000000 -0500
+++ xen-3.0.0/tools/examples/network-bridge	2006-02-02 17:18:56.000000000 -0500
@@ -158,6 +158,9 @@
 
     # Don't create the bridge if it already exists.
     if ! brctl show | grep -q ${bridge} ; then
+	sysctl -w "net.bridge.bridge-nf-call-arptables=0"
+	sysctl -w "net.bridge.bridge-nf-call-ip6tables=0"
+	sysctl -w "net.bridge.bridge-nf-call-iptables=0"
 	brctl addbr ${bridge}
 	brctl stp ${bridge} off
 	brctl setfd ${bridge} 0


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- xen.spec	31 Jan 2006 17:34:40 -0000	1.80
+++ xen.spec	2 Feb 2006 22:24:14 -0000	1.81
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0
-Release: 0.20060130.fc5.2
+Release: 0.20060130.fc5.3
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -17,6 +17,7 @@
 Patch3: xen-dom0-minmem.patch
 Patch4: xen-compile-fixes.patch
 Patch5: xen-default-network.patch
+Patch6: xen-network-iptables-bridge.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 
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .mem-min
 %patch4 -p1 -b .compile
 %patch5 -p1
+%patch6 -p1
 
 cp %{SOURCE2} .
 
@@ -142,7 +144,12 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
-* Tue Jan 31 2006 Bill Nottinghham <notting at redhat.com> 3.0-0.20060130.fc5.2
+* Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 3.0-0.20060130.fc5.3
+- disable iptables/ip6tables/arptables on bridging when bringing up a
+  Xen bridge. If complicated filtering is needed that uses this, custom
+  firewalls will be needed. (#177794)
+
+* Tue Jan 31 2006 Bill Nottingham <notting at redhat.com> 3.0-0.20060130.fc5.2
 - use the default network device, don't hardcode eth0
 
 * Tue Jan 31 2006  <sct at redhat.com> - 3.0-0.20060130.fc5.1



From fedora-cvs-commits at redhat.com  Thu Feb  2 22:43:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 17:43:39 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.88, 1.89 mkinitrd.spec, 1.96,
	1.97 sources, 1.93, 1.94
Message-ID: <200602022243.k12MhdN7024919@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24857

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.20-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	2 Feb 2006 21:43:56 -0000	1.88
+++ .cvsignore	2 Feb 2006 22:43:35 -0000	1.89
@@ -1 +1 @@
-mkinitrd-5.0.19.tar.bz2
+mkinitrd-5.0.20.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mkinitrd.spec	2 Feb 2006 21:43:56 -0000	1.96
+++ mkinitrd.spec	2 Feb 2006 22:43:35 -0000	1.97
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.19
+Version: 5.0.20
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -10,9 +10,8 @@
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
-Requires: e2fsprogs, e2fsprogs-devel
-BuildRequires: popt
-BuildRequires: e2fsprogs-devel parted-devel
+Requires: e2fsprogs
+BuildRequires: popt e2fsprogs-devel parted-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
@@ -64,6 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.20-1
+- fix really dumb spec file mistake
+
 * Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.19-1
 - mkinitrd: get resolve_dm_name() and get_numeric_dev() from initscripts
   instead of a private copy


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- sources	2 Feb 2006 21:43:56 -0000	1.93
+++ sources	2 Feb 2006 22:43:35 -0000	1.94
@@ -1 +1 @@
-950efbcafaeb285062616ddb584759e7  mkinitrd-5.0.19.tar.bz2
+750b0875be802c082fe95a7519f35a9b  mkinitrd-5.0.20.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  2 23:13:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 18:13:54 -0500
Subject: rpms/fontconfig/devel
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch, NONE,
	1.1 fontconfig.spec, 1.62, 1.63
Message-ID: <200602022313.k12NDseo004486@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch 
Log Message:
Commit start of fontconfig move-global-cache patch


fontconfig-2.3.93.cvs20060131-move-user-cache.patch:
 fontconfig/fontconfig.h |    1 +
 src/fccache.c           |   18 ++++++++++++++++++
 src/fccfg.c             |   40 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)

--- NEW FILE fontconfig-2.3.93.cvs20060131-move-user-cache.patch ---
--- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-02 16:06:27.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-02 16:06:27.000000000 -0500
@@ -1755,14 +1755,50 @@
 {
     if (_FcConfigHomeEnabled)
     {
-        char *home = getenv ("HOME");
+        static FcChar8 *fc_home = NULL;
+
+        const char *home = getenv ("HOME");
+
+	if (home != NULL)
+	{
+            FcBool appended_ok;
+            FcStrBuf buf;
+            FcStrBufInit (&buf, 0, 0);
+	    appended_ok = FcStrBufString (&buf, (const FcChar8 *) home);
+
+            if (appended_ok)
+		appended_ok = FcStrBufChar (&buf, '/');
+
+	    if (appended_ok)
+	        appended_ok = FcStrBufString (&buf, (const FcChar8 *) FC_USER_CACHE_DIR);
+                
+            if (appended_ok)
+		fc_home = FcStrBufDone (&buf);
+	}
 
 #ifdef _WIN32
 	if (home == NULL)
 	    home = getenv ("USERPROFILE");
+
+	if (home != NULL)
+	{
+            FcBool appended_ok;
+            FcStrBuf buf;
+            FcStrBufInit (&buf, 0, 0);
+	    appended_ok = FcStrBufString (&buf, (const FcChar8 *) home);
+
+            if (appended_ok)
+		appended_ok = FcStrBufChar (&buf, '/');
+
+	    if (appended_ok)
+	        appended_ok = FcStrBufString (&buf, (const FcChar8 *) FC_USER_CACHE_DIR);
+                
+            if (appended_ok)
+		fc_home = FcStrBufDone (&buf);
+	}
 #endif
 
-	return (FcChar8 *) home;
+	return (FcChar8 *) fc_home;
     }
     return 0;
 }
--- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-02 16:06:27.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-02 16:15:30.000000000 -0500
@@ -449,6 +449,24 @@
 	goto bail1;
     fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
 	       S_IRUSR | S_IWUSR);
+    if (fd == -1 && errno == ENOENT)
+    {
+	FcChar8 *cache_dir;
+          
+        cache_dir = FcStrDirname (cache_file);
+
+        /* quick last ditch effort to try to make the
+         * dir if it doesn't exist.  This doesn't support
+         * making more than one component of the path
+         * and is broken in the WIN32 case.
+         */
+	mkdir ((char *) cache_dir, 0777);
+        FcStrFree (cache_dir);
+
+        fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
+	           S_IRUSR | S_IWUSR);
+    }
+
     if (fd == -1)
 	goto bail2;
     FcCacheWriteString (fd, FC_GLOBAL_MAGIC_COOKIE);
--- fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-02 16:06:27.000000000 -0500
@@ -106,6 +106,7 @@
 
 #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
 #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
+#define FC_USER_CACHE_DIR	    ".rh-fontconfig/"
 #define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
 
 /* Adjust outline rasterizer */


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- fontconfig.spec	2 Feb 2006 15:07:23 -0000	1.62
+++ fontconfig.spec	2 Feb 2006 23:13:50 -0000	1.63
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.93.cvs20060131
-Release: 2
+Release: 3
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -18,6 +18,7 @@
 Patch4: fontconfig-misc-warning-fixes.patch
 Patch5: fontconfig-fccache-update-check.patch
 Patch6: fontconfig-seife-crash.patch
+Patch7: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -59,6 +60,7 @@
 %patch4 -p1 -b .fontconfig-misc-warning-fixes
 %patch5 -p0 -b .fontconfig-fccache-update-check
 %patch6 -p0 -b .fontconfig-seife-crash
+#%patch7 -p1 -b .move-user-cache
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -143,6 +145,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb  2 2006 Ray Strode <rstrode at redhat.com> - 2.3.93.cvs20060131-3
+- Move user cache to a subdirectory (bug 160275)
+
 * Thu Feb  2 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060131-2
 - Accumulated patches
 



From fedora-cvs-commits at redhat.com  Thu Feb  2 23:36:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 18:36:27 -0500
Subject: rpms/kernel/devel linux-2.6-debug-periodic-slab-check.patch, 1.2,
	1.3 kernel-2.6.spec, 1.1896, 1.1897
Message-ID: <200602022336.k12NaR6j017068@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-periodic-slab-check.patch 
Log Message:
periodic slab checking again


linux-2.6-debug-periodic-slab-check.patch:
 slab.c |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 131 insertions(+), 3 deletions(-)

Index: linux-2.6-debug-periodic-slab-check.patch
===================================================================
RCS file: linux-2.6-debug-periodic-slab-check.patch
diff -N linux-2.6-debug-periodic-slab-check.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-debug-periodic-slab-check.patch	2 Feb 2006 23:36:23 -0000	1.3
@@ -0,0 +1,199 @@
+
+ mm/slab.c |  134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 131 insertions(+), 3 deletions(-)
+
+Index: 2.6-git/mm/slab.c
+===================================================================
+--- 2.6-git.orig/mm/slab.c
++++ 2.6-git/mm/slab.c
+@@ -202,7 +202,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)
+ 
+ /* Max number of objs-per-slab for caches which use off-slab slabs.
+@@ -430,6 +430,11 @@ struct kmem_cache {
+ 	 */
+ 	int obj_offset;
+ 	int obj_size;
++
++	/*
++	 * Time for next cache verification.
++	 */
++	unsigned long next_verify;
+ #endif
+ };
+ 
+@@ -445,6 +450,7 @@ struct kmem_cache {
+  */
+ #define REAPTIMEOUT_CPUC	(2*HZ)
+ #define REAPTIMEOUT_LIST3	(4*HZ)
++#define REDZONETIMEOUT		(300*HZ)
+ 
+ #if STATS
+ #define	STATS_INC_ACTIVE(x)	((x)->num_active++)
+@@ -1923,6 +1929,11 @@ kmem_cache_create (const char *name, siz
+ 		cachep->limit = BOOT_CPUCACHE_ENTRIES;
+ 	}
+ 
++#if DEBUG
++	cachep->next_verify = jiffies + REDZONETIMEOUT +
++		((unsigned long)cachep/L1_CACHE_BYTES)%REDZONETIMEOUT;
++#endif
++
+ 	/* cache setup completed, link it into the list */
+ 	list_add(&cachep->next, &cache_chain);
+ 	unlock_cpu_hotplug();
+@@ -2251,7 +2262,7 @@ static void *slab_get_obj(struct kmem_ca
+ 	slabp->inuse++;
+ 	next = slab_bufctl(slabp)[slabp->free];
+ #if DEBUG
+-	slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE;
++	slab_bufctl(slabp)[slabp->free] = BUFCTL_ALLOC;
+ 	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();
+@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca
+ 	return err;
+ }
+ 
++#if DEBUG
++
++static void verify_slab_redzone(struct kmem_cache *cache, struct slab *slab)
++{
++	int i;
++
++	if (!(cache->flags & SLAB_RED_ZONE))
++		return;
++
++#ifdef CONFIG_DEBUG_PAGEALLOC
++	/* Page alloc debugging on for this cache. Mapping & Unmapping happens
++	 * without any locking, thus parallel checks are impossible.
++	 */
++	if ((cache->buffer_size % PAGE_SIZE) == 0 && OFF_SLAB(cache))
++		return;
++#endif
++
++	for (i = 0; i < cache->num; i++) {
++		unsigned long red1, red2;
++		void *obj = slab->s_mem + cache->buffer_size * i;
++
++		red1 = *dbg_redzone1(cache, obj);
++		red2 = *dbg_redzone2(cache, obj);
++
++		/* Simplest case: redzones marked as inactive.  */
++		if (red1 == RED_INACTIVE && red2 == RED_INACTIVE)
++			continue;
++
++		/*
++		 * Tricky case: if the bufctl value is BUFCTL_ALLOC, then
++		 * the object is either allocated or somewhere in a cpu
++		 * cache. The cpu caches are lockless and there might be
++		 * a concurrent alloc/free call, thus we must accept random
++		 * combinations of RED_ACTIVE and _INACTIVE
++		 */
++		if (slab_bufctl(slab)[i] == BUFCTL_ALLOC &&
++				(red1 == RED_INACTIVE || red1 == RED_ACTIVE) &&
++				(red2 == RED_INACTIVE || red2 == RED_ACTIVE))
++			continue;
++
++		printk(KERN_ERR "slab %s: redzone mismatch in slab %p,"
++		       " obj %p, bufctl 0x%lx\n", cache->name, slab, obj,
++		       slab_bufctl(slab)[i]);
++
++		print_objinfo(cache, obj, 2);
++	}
++}
++
++static void print_invalid_slab(const char *list_name, struct kmem_cache *cache,
++			       struct slab *slab)
++{
++	printk(KERN_ERR "slab %s: invalid slab found in %s list at %p (%d/%d).\n",
++	       cache->name, list_name, slab, slab->inuse, cache->num);
++}
++
++static void verify_nodelists(struct kmem_cache *cache,
++			     struct kmem_list3 *lists)
++{
++	struct list_head *q;
++	struct slab *slab;
++
++	list_for_each(q, &lists->slabs_full) {
++		slab = list_entry(q, struct slab, list);
++
++		if (slab->inuse != cache->num)
++			print_invalid_slab("full", cache, slab);
++
++		check_slabp(cache, slab);
++		verify_slab_redzone(cache, slab);
++	}
++	list_for_each(q, &lists->slabs_partial) {
++		slab = list_entry(q, struct slab, list);
++
++		if (slab->inuse == cache->num || slab->inuse == 0)
++			print_invalid_slab("partial", cache, slab);
++
++		check_slabp(cache, slab);
++		verify_slab_redzone(cache, slab);
++	}
++	list_for_each(q, &lists->slabs_free) {
++		slab = list_entry(q, struct slab, list);
++
++		if (slab->inuse != 0)
++			print_invalid_slab("free", cache, slab);
++
++		check_slabp(cache, slab);
++		verify_slab_redzone(cache, slab);
++	}
++}
++
++/*
++ * Perform a self test on all slabs from a cache
++ */
++static void verify_cache(struct kmem_cache *cache)
++{
++	int node;
++
++	check_spinlock_acquired(cache);
++
++	for_each_online_node(node) {
++		struct kmem_list3 *lists = cache->nodelists[node];
++
++		if (!lists)
++			continue;
++		verify_nodelists(cache, lists);
++	}
++}
++
++#endif
++
+ 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());
+ 
++#if DEBUG
++		if (time_before(searchp->next_verify, jiffies)) {
++			searchp->next_verify = jiffies + REDZONETIMEOUT;
++			verify_cache(searchp);
++		}
++#endif
++
+ 		if (time_after(l3->next_reap, jiffies))
+ 			goto next_unlock;
+ 
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1896
retrieving revision 1.1897
diff -u -r1.1896 -r1.1897
--- kernel-2.6.spec	2 Feb 2006 21:20:36 -0000	1.1896
+++ kernel-2.6.spec	2 Feb 2006 23:36:22 -0000	1.1897
@@ -295,6 +295,7 @@
 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
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -738,6 +739,7 @@
 %patch1028 -p1
 #%patch1029 -p1
 #%patch1030 -p1
+%patch1031 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -1383,6 +1385,7 @@
 %changelog
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6
+- enable the periodic slab debugger again.
 
 * Wed Feb  1 2006 Dave Jones <davej at redhat.com>
 - Woo, 2.6.16rc1-git5 (at last)



From fedora-cvs-commits at redhat.com  Thu Feb  2 23:41:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 18:41:42 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1897,1.1898
Message-ID: <200602022341.k12Nfgfn017196@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
ia64 borked in buildsys



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1897
retrieving revision 1.1898
diff -u -r1.1897 -r1.1898
--- kernel-2.6.spec	2 Feb 2006 23:36:22 -0000	1.1897
+++ kernel-2.6.spec	2 Feb 2006 23:41:38 -0000	1.1898
@@ -156,7 +156,7 @@
 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 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Feb  2 23:51:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 18:51:51 -0500
Subject: rpms/perl/FC-4 perl-5.8.6-bz178343.patch,NONE,1.1
Message-ID: <200602022351.k12NppPb029891@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.6-bz178343.patch 
Log Message:
fix bug 178343: add cpp built-in macros to $Config{cppsymbols}

perl-5.8.6-bz178343.patch:
 Configure     |   11 +++++++++++
 utils/h2ph.PL |   17 ++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE perl-5.8.6-bz178343.patch ---
--- perl-5.8.6/Configure.bz178343	2005-12-14 13:25:11.000000000 -0500
+++ perl-5.8.6/Configure	2006-02-02 18:46:23.000000000 -0500
@@ -19727,6 +19727,17 @@
 chmod +x Cppsym.try
 $eunicefix Cppsym.try
 ./Cppsym < Cppsym.know > Cppsym.true
+: Add in any cpp "predefined macros" :
+tHdrH=`mktemp ./XXXXXX`
+rm -f $tHdrH'.h' $tHdrH
+touch $tHdrH'.h' 
+if cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ] ; then
+   sed 's/#define[\ \	]*//;s/[\ \	].*$//' < $tHdrH'_cppsym.h' > $tHdrH'_cppsym.real';
+   if [ -s $tHdrH'_cppsym.real' ]; then
+      cat $tHdrH'_cppsym.real' Cppsym.know  | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true
+   fi
+fi
+rm -f $tHdrH'.h' $tHdrH'_cppsym.h' $tHdrH'_cppsym.real'
 : now check the C compiler for additional symbols
 postprocess_cc_v=''
 case "$osname" in
--- perl-5.8.6/utils/h2ph.PL.bz178343	2005-12-14 13:25:11.000000000 -0500
+++ perl-5.8.6/utils/h2ph.PL	2006-02-02 18:46:23.000000000 -0500
@@ -776,8 +776,16 @@
             if ($opt_D) {
                 print PREAMBLE "# $_=$define{$_}\n";
             }
-
-            if ($define{$_} =~ /^(\d+)U?L{0,2}$/i) {
+	    if ($define{$_} =~ /^\((.*)\)$/) {
+	      # parenthesized value:  d=(v)
+		$define{$_} = $1;
+	    };
+	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/ ) {
+	      # float:
+		print PREAMBLE
+                    "unless (defined &$_) { sub $_() { $1 } }\n\n";
+	    } elsif ($define{$_} =~ /^([+-]?\d+)U?L{0,2}$/i) {
+	      # integer:
                 print PREAMBLE
                     "unless (defined &$_) { sub $_() { $1 } }\n\n";
             } elsif ($define{$_} =~ /^\w+$/) {
@@ -803,9 +811,8 @@
         @Config{'ccsymbols', 'cppsymbols', 'cppccsymbols'};
 
     # Split compiler pre-definitions into `key=value' pairs:
-    foreach (split /\s+/, $allsymbols) {
-        /(.+?)=(.+)/ and $define{$1} = $2;
-
+    while( $allsymbols=~/([^\s]+)=((\\\s|[^\s])+)/g ) {
+        $define{$1} = $2;	
         if ($opt_D) {
             print STDERR "$_:  $1 -> $2\n";
         }



From fedora-cvs-commits at redhat.com  Fri Feb  3 00:53:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 19:53:32 -0500
Subject: rpms/perl/FC-4 perl.spec,1.69,1.70
Message-ID: <200602030053.k130rWX5016649@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
fix bug 178343: _h2ph_pre.ph must include definitions for all cpp internal macros


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/FC-4/perl.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- perl.spec	14 Dec 2005 19:04:58 -0000	1.69
+++ perl.spec	3 Feb 2006 00:53:24 -0000	1.70
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver 5.8.6
-%define perlrel 22
+%define perlrel 24
 %define perlepoch 3
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -144,6 +144,8 @@
 
 Patch175467: perl-5.8.6-CVE-2004-0976-2.patch
 
+Patch178343: perl-5.8.6-bz178343.patch
+
 # module updatesd
 # Patch202: perl-5.8.0-Safe2.09.patch
 
@@ -287,6 +289,8 @@
 
 %patch175467 -p1
 
+%patch178343 -p1
+
 find . -name \*.orig -exec rm -fv {} \;
 
 %build
@@ -478,6 +482,9 @@
 %endif
 
 %changelog
+* Thu Feb 02 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-24
+- fix bug 178343: include cpp built-in macros in $Config{cppsymbols}
+
 * Wed Dec 14 2005 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-22
 - Updated upstream patches for CVE-2005-3962: 26322 , 26331, 26333
 - fix bug 175467: perl5db.pl's perldbtty now defaults to $HOME/.perldbtty$$ .



From fedora-cvs-commits at redhat.com  Fri Feb  3 01:53:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 20:53:04 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.126,
	1.127
Message-ID: <200602030153.k131r32j016920@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-serv16908

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_68rh
- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4.
- Provide java-sasl and jce.




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.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 20:19:46 -0000	1.126
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 01:52:59 -0000	1.127
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_67rh
+%define release 	40jpp_68rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -53,8 +53,9 @@
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-sasl-jdk1.4 >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc
+# SASL and JCE are provided by libgcj.
+Obsoletes:	gnu-crypto-sasl-jdk1.4 <= 0:2.0.1-1jpp_11fc
+Obsoletes:	gnu-crypto-jce-jdk1.4 <= 0:2.0.1-1jpp_11fc
 Requires(post): jpackage-utils >= 0:1.6.3-1jpp_1rh
 Requires(postun): jpackage-utils >= 0:1.6.3-1jpp_1rh
 Requires(post): libgcj%{gccsuffix} >= %{gccver}
@@ -67,6 +68,9 @@
 Provides:	jaxp_parser_impl
 Provides:	jndi, jdbc-stdext, jaas, jsse
 Provides:	java-gcj-compat = %{jgcver}
+# SASL and JCE are provided by libgcj.
+Provides:	java-sasl
+Provides:	jce
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
 %if %{custom}
 # prevent autogeneration of libjawt.so dependencies
@@ -550,6 +554,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_68rh
+- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4.
+- Provide java-sasl and jce.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_67rh
 - Remove conditional BuildRequires, which isn't supported by beehive.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 01:55:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 20:55:47 -0500
Subject: rpms/jessie/devel jessie.spec,1.15,1.16
Message-ID: <200602030155.k131tlIN016964@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16952

Modified Files:
	jessie.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
- Import Jessie 1.0.1.
- Require java-sasl instead of gnu-crypto-sasl-jdk1.4 and jce instead
  of gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jessie.spec	23 Dec 2005 01:14:44 -0000	1.15
+++ jessie.spec	3 Feb 2006 01:55:44 -0000	1.16
@@ -1,8 +1,8 @@
 %define gcj_support 1
 
 Name:		jessie
-Version:	1.0.0
-Release:	11
+Version:	1.0.1
+Release:	1
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
@@ -18,8 +18,8 @@
 BuildArch:      noarch
 Requires:	%{_bindir}/perl
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-sasl-jdk1.4 >= 0:2.0.1-1jpp_2fc
-Requires:	gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc
+Requires:	java-sasl
+Requires:	jce
 BuildRequires:	gnu-crypto >= 0:2.0, jpackage-utils > 0:1.5
 BuildRequires:  java-devel >= 0:1.4
 Requires:	java >= 0:1.4
@@ -91,6 +91,11 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
+- Import Jessie 1.0.1.
+- Require java-sasl instead of gnu-crypto-sasl-jdk1.4 and jce instead
+  of gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc.
+
 * Thu Dec 22 2005 Jesse Keating <fitzsim at redhat.com> 0:1.0.0-11
 - Bump for gcc/gcj
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 01:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 20:56:18 -0500
Subject: rpms/jessie/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602030156.k131uINV016993@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16978

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
- Import Jessie 1.0.1.
- Require java-sasl instead of gnu-crypto-sasl-jdk1.4 and jce instead
  of gnu-crypto-jce-jdk1.4 >= 0:2.0.1-1jpp_2fc.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Mar 2005 23:28:26 -0000	1.2
+++ .cvsignore	3 Feb 2006 01:56:16 -0000	1.3
@@ -1 +1 @@
-jessie-1.0.0.tar.gz
+jessie-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Mar 2005 23:28:26 -0000	1.2
+++ sources	3 Feb 2006 01:56:16 -0000	1.3
@@ -1 +1 @@
-eba2838a9ae10f581ed7f8514242a1c5  jessie-1.0.0.tar.gz
+c14db8483ca9fae428b8497659861ef0  jessie-1.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 02:02:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 21:02:28 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.209, 1.210 anaconda.spec, 1.328,
	1.329 sources, 1.328, 1.329
Message-ID: <200602030202.k1322SRF017178@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17154/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.13-1 on branch devel from anaconda-10.91.13-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- .cvsignore	2 Feb 2006 05:30:25 -0000	1.209
+++ .cvsignore	3 Feb 2006 02:02:24 -0000	1.210
@@ -1 +1 @@
-anaconda-10.91.12.tar.bz2
+anaconda-10.91.13.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- anaconda.spec	2 Feb 2006 05:30:25 -0000	1.328
+++ anaconda.spec	3 Feb 2006 02:02:24 -0000	1.329
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.12
+Version: 10.91.13
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -78,6 +78,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 10.91.13-1
+- Speed up timezone screen (clumens)
+- Make kickstart interactive mode work (clumens)
+- Fix package selection screen (clumens)
+- Add sqlite to traceonly to help http/ftp memory usage
+- Write out repo config (pnasrat)
+- Fix colors on boot splashes (#178033)
+- Select lang groups before going to the screen (#178673)
+- Clean up handling of grub vs no boot loader (#159658)
+
 * Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 10.91.12-1
 - improves %%packages section some more (clumens)
 - give a better error on kickstart lvm syntax errors (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- sources	2 Feb 2006 05:30:25 -0000	1.328
+++ sources	3 Feb 2006 02:02:25 -0000	1.329
@@ -1 +1 @@
-5e227e4e21f30182188661124a4200f8  anaconda-10.91.12.tar.bz2
+d1fb6f2951cf99c628d3bf0191d7cf45  anaconda-10.91.13.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 02:23:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 21:23:19 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.127,
	1.128
Message-ID: <200602030223.k132NJfo029779@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-serv29765

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_69rh
- Don't call aot-compile-rpm on bootstrap architectures.




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.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 01:52:59 -0000	1.127
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 02:23:13 -0000	1.128
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_68rh
+%define release 	40jpp_69rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -145,13 +145,13 @@
 %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
+# %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
 
@@ -554,6 +554,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_69rh
+- Don't call aot-compile-rpm on bootstrap architectures.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_68rh
 - Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4.
 - Provide java-sasl and jce.



From fedora-cvs-commits at redhat.com  Fri Feb  3 02:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 21:30:02 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.128,
	1.129
Message-ID: <200602030230.k132U2qV006885@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-serv6814

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_70rh
- Remove all ifnarch ia64 sections.




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.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 02:23:13 -0000	1.128
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 02:29:52 -0000	1.129
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_69rh
+%define release 	40jpp_70rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -255,11 +255,11 @@
 %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
+# %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
@@ -544,9 +544,9 @@
 %endif
 %if %{bootstrap}
 %{_bindir}/ecj
-%ifnarch ia64
-%{_libdir}/gcj/%{name}
-%endif
+# %ifnarch ia64
+# %{_libdir}/gcj/%{name}
+# %endif
 %{_javadir}/eclipse-ecj.jar
 %endif
 
@@ -554,6 +554,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_70rh
+- Remove all ifnarch ia64 sections.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_69rh
 - Don't call aot-compile-rpm on bootstrap architectures.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 02:35:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 21:35:11 -0500
Subject: rpms/gnu-crypto/devel .cvsignore, 1.4, 1.5 gnu-crypto.spec, 1.22,
	1.23 sources, 1.2, 1.3
Message-ID: <200602030235.k132ZB6K007915@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7810

Modified Files:
	.cvsignore gnu-crypto.spec sources 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.1.0-1jpp_1fc
- Import GNU Crypto 2.1.0.
- Remove gnu-crypto-jce-jdk1.4 and gnu-crypto-sasl-jdk1.4 packages.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jun 2005 10:27:36 -0000	1.4
+++ .cvsignore	3 Feb 2006 02:34:56 -0000	1.5
@@ -1,4 +1 @@
-gnu-crypto-2.0.1.tar.bz2
-gnu-crypto-2.0.1
-i386
-*.src.rpm
+gnu-crypto-2.1.0.tar.bz2


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnu-crypto.spec	22 Dec 2005 06:10:59 -0000	1.22
+++ gnu-crypto.spec	3 Feb 2006 02:34:56 -0000	1.23
@@ -1,19 +1,19 @@
 %define gcj_support 1
 
 Name:           gnu-crypto
-Version:        2.0.1
-Release: 	1jpp_11fc
+Version:        2.1.0
+Release:        1jpp_1fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
 Group:          Security/Cryptography
 License:        GPL with library exception
 URL:            http://www.gnu.org/software/gnu-crypto/
-Source0:        http://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-Patch0:         %{name}-crosslink.patch
+Source0:        http://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.1.0.tar.bz2
+# Patch0:         %{name}-crosslink.patch
 # javax.security.auth.* is already in J2SE >= 1.4.
 Patch1:         %{name}-noauth.patch
-Patch2:         %{name}-gcc41.patch
+# Patch2:         %{name}-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, java-devel >= 0:1.4
@@ -41,32 +41,6 @@
 implementations of cryptographic primitives and tools in the Java
 programming language for use by programmers and end-users.
 
-%package        sasl-jdk1.4
-Summary:        Gnu Crypto SASL API
-Group:          Security/Cryptography
-Provides:       java-sasl
-%if %{gcj_support}
-Requires:	libgcj >= 4.0.0-0.42
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
-
-%description    sasl-jdk1.4
-%{summary}.
-
-%if %{gcj_support}
-%package        jce-jdk1.4
-Summary:        Gnu Crypto JCE API
-Group:          Security/Cryptography
-Provides:       jce
-Requires:	libgcj >= 4.0.0-0.42
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description    jce-jdk1.4
-%{summary}.
-%endif
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
@@ -78,15 +52,16 @@
 
 %prep
 %setup -q
-%patch0 -p0
+# %patch0 -p0
 %if !%{gcj_support}
 %patch1 -p0
 %endif
-%patch2 -p1 -b .orig
+# %patch2 -p1 -b .orig
 
 
 %build
-ant -Djdk2=true -Dj2se.apidoc=%{_javadocdir}/java jar javadoc2
+%configure
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -97,7 +72,7 @@
 %endif
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 lib/gnu-crypto.jar \
+install -pm 644 source/gnu-crypto.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 %if %{gcj_support}
@@ -106,34 +81,8 @@
   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-%{version}.jar
 %endif
 
-install -dm 755 \
-  $RPM_BUILD_ROOT%{_javadir}-{ext,1.4.0,1.4.1,1.4.2}
-install -pm 644 lib/javax-security.jar \
-  $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
-for javaver in 1.4.0 1.4.1 1.4.2 ; do
-  ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
-    $RPM_BUILD_ROOT%{_javadir}-$javaver/sasl.jar
-done
-%if %{gcj_support}
-ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
-%endif
-
-# The jce subpackage is required for libgcj which does not contain
-# JCE.
-%if %{gcj_support}
-install -pm 644 lib/javax-crypto.jar \
-  $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-jce-jdk1.4.jar
-for javaver in 1.4.0 1.4.1 1.4.2 ; do
-  ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
-    $RPM_BUILD_ROOT%{_javadir}-$javaver/jce.jar
-done
-ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
-%endif
-
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pR docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR source/overview.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %if %{gcj_support}
@@ -168,30 +117,6 @@
 then
   %{_bindir}/rebuild-gcj-db
 fi
-
-%post sasl-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun sasl-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post jce-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun jce-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
 %endif
 
 %post javadoc
@@ -210,30 +135,6 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
 %endif
 
-%files sasl-jdk1.4
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README THANKS
-%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
-%{_javadir}-1.4.0/sasl.jar
-%{_javadir}-1.4.1/sasl.jar
-%{_javadir}-1.4.2/sasl.jar
-%if %{gcj_support}
-%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sasl-jdk1.4.jar.*
-%endif
-
-%if %{gcj_support}
-%files jce-jdk1.4
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README THANKS
-%{_javadir}-ext/%{name}-jce-jdk1.4.jar
-%{_javadir}-1.4.0/jce.jar
-%{_javadir}-1.4.1/jce.jar
-%{_javadir}-1.4.2/jce.jar
-%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jce-jdk1.4.jar.*
-%endif
-
 %files javadoc
 %defattr(644,root,root,755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -241,6 +142,10 @@
 
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.1.0-1jpp_1fc
+- Import GNU Crypto 2.1.0.
+- Remove gnu-crypto-jce-jdk1.4 and gnu-crypto-sasl-jdk1.4 packages.
+
 * Wed Dec 21 2005 Gary Benson <gbenson at redhat.com> - 0:2.0.1-1jpp_11fc
 - Rebuild again
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2004 16:22:17 -0000	1.2
+++ sources	3 Feb 2006 02:34:56 -0000	1.3
@@ -1 +1 @@
-39ac686b8f7ecfb95de7d58c85b8935b  gnu-crypto-2.0.1.tar.bz2
+f1ecdf394d3324c52bde35c134d7b098  gnu-crypto-2.1.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 02:55:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 21:55:00 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.129,
	1.130
Message-ID: <200602030255.k132t0Ff026728@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-serv26647

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_71rh
- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4 regardless of versions.




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.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 02:29:52 -0000	1.129
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 02:54:54 -0000	1.130
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_70rh
+%define release 	40jpp_71rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -54,8 +54,8 @@
 Requires:	jessie >= 1.0.0-5
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
 # SASL and JCE are provided by libgcj.
-Obsoletes:	gnu-crypto-sasl-jdk1.4 <= 0:2.0.1-1jpp_11fc
-Obsoletes:	gnu-crypto-jce-jdk1.4 <= 0:2.0.1-1jpp_11fc
+Obsoletes:	gnu-crypto-sasl-jdk1.4
+Obsoletes:	gnu-crypto-jce-jdk1.4
 Requires(post): jpackage-utils >= 0:1.6.3-1jpp_1rh
 Requires(postun): jpackage-utils >= 0:1.6.3-1jpp_1rh
 Requires(post): libgcj%{gccsuffix} >= %{gccver}
@@ -554,6 +554,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_71rh
+- Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4 regardless of versions.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_70rh
 - Remove all ifnarch ia64 sections.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 03:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 22:44:03 -0500
Subject: rpms/chkconfig/devel .cvsignore, 1.27, 1.28 chkconfig.spec, 1.32,
	1.33 sources, 1.28, 1.29
Message-ID: <200602030344.k133i3j8024317@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24271

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	30 Nov 2005 20:15:30 -0000	1.27
+++ .cvsignore	3 Feb 2006 03:44:00 -0000	1.28
@@ -1 +1 @@
-chkconfig-1.3.25.tar.gz
+chkconfig-1.3.26.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- chkconfig.spec	9 Dec 2005 22:40:02 -0000	1.32
+++ chkconfig.spec	3 Feb 2006 03:44:00 -0000	1.33
@@ -1,10 +1,10 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
-Version: 1.3.25
-Release: 1.1
+Version: 1.3.26
+Release: 1
 License: GPL
 Group: System Environment/Base
-Source: ftp://ftp.redhat.com/pub/redhat/code/chkconfig/%{name}-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: newt newt-devel gettext
 Conflicts: initscripts <= 5.30-1
@@ -75,8 +75,8 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 1.3.26-1
+- add support for resetting priorities without on/off status (#178864)
 
 * Wed Nov 30 2005 Bill Nottingham <notting at redhat.com> 1.3.25-1
 - return an error if changing services fails (#150235)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 Nov 2005 20:15:30 -0000	1.28
+++ sources	3 Feb 2006 03:44:00 -0000	1.29
@@ -1 +1 @@
-684aedbd88bcbd0e618a1304fea37ce1  chkconfig-1.3.25.tar.gz
+f0ac338e17fbddd1eb06f73dba9c1341  chkconfig-1.3.26.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:01:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:01:33 -0500
Subject: rpms/jessie/devel jessie.spec,1.16,1.17 sources,1.3,1.4
Message-ID: <200602030401.k1341XXE004469@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4429

Modified Files:
	jessie.spec sources 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-2
- Revert to 1.0.0 sources.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- jessie.spec	3 Feb 2006 01:55:44 -0000	1.16
+++ jessie.spec	3 Feb 2006 04:01:12 -0000	1.17
@@ -2,14 +2,14 @@
 
 Name:		jessie
 Version:	1.0.1
-Release:	1
+Release:	2
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
 Group:		Security/Cryptography
 License:	GPL
 URL:		http://www.nongnu.org/jessie/
-Source0:	%{name}-%{version}.tar.gz
+Source0:	%{name}-1.0.0.tar.gz
 # workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19870
 Patch0:		jessie-1.0.0-gcj-workaround.patch
 Patch1:		jessie-1.0.0-dont-print-name.patch
@@ -20,7 +20,7 @@
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
 Requires:	java-sasl
 Requires:	jce
-BuildRequires:	gnu-crypto >= 0:2.0, jpackage-utils > 0:1.5
+BuildRequires:	gnu-crypto >= 0:2.1, jpackage-utils > 0:1.5
 BuildRequires:  java-devel >= 0:1.4
 Requires:	java >= 0:1.4
 %if %{gcj_support}
@@ -91,6 +91,9 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-2
+- Revert to 1.0.0 sources.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
 - Import Jessie 1.0.1.
 - Require java-sasl instead of gnu-crypto-sasl-jdk1.4 and jce instead


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Feb 2006 01:56:16 -0000	1.3
+++ sources	3 Feb 2006 04:01:12 -0000	1.4
@@ -1 +1 @@
-c14db8483ca9fae428b8497659861ef0  jessie-1.0.1.tar.gz
+eba2838a9ae10f581ed7f8514242a1c5  jessie-1.0.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:04:17 -0500
Subject: rpms/jessie/devel jessie.spec,1.17,1.18
Message-ID: <200602030404.k1344H3M004514@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4500

Modified Files:
	jessie.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-2
- Revert to 1.0.0 sources.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jessie.spec	3 Feb 2006 04:01:12 -0000	1.17
+++ jessie.spec	3 Feb 2006 04:03:59 -0000	1.18
@@ -9,6 +9,7 @@
 Group:		Security/Cryptography
 License:	GPL
 URL:		http://www.nongnu.org/jessie/
+# FIXME: change to %{version}
 Source0:	%{name}-1.0.0.tar.gz
 # workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19870
 Patch0:		jessie-1.0.0-gcj-workaround.patch
@@ -18,8 +19,9 @@
 BuildArch:      noarch
 Requires:	%{_bindir}/perl
 Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
-Requires:	java-sasl
-Requires:	jce
+# FIXME: uncomment
+# Requires:	java-sasl
+# Requires:	jce
 BuildRequires:	gnu-crypto >= 0:2.1, jpackage-utils > 0:1.5
 BuildRequires:  java-devel >= 0:1.4
 Requires:	java >= 0:1.4



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:13:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:13:54 -0500
Subject: rpms/jessie/devel jessie.spec,1.18,1.19
Message-ID: <200602030413.k134Dsk2004632@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4619

Modified Files:
	jessie.spec 
Log Message:
- Bump gnu-crypto requirement back down to 2.0.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jessie.spec	3 Feb 2006 04:03:59 -0000	1.18
+++ jessie.spec	3 Feb 2006 04:13:51 -0000	1.19
@@ -22,7 +22,7 @@
 # FIXME: uncomment
 # Requires:	java-sasl
 # Requires:	jce
-BuildRequires:	gnu-crypto >= 0:2.1, jpackage-utils > 0:1.5
+BuildRequires:	gnu-crypto >= 0:2.0, jpackage-utils > 0:1.5
 BuildRequires:  java-devel >= 0:1.4
 Requires:	java >= 0:1.4
 %if %{gcj_support}



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:18:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:18:47 -0500
Subject: rpms/jessie/devel jessie.spec,1.19,1.20
Message-ID: <200602030418.k134IlGS017121@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17108

Modified Files:
	jessie.spec 
Log Message:
- Bump version back down to 1.0.0.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jessie.spec	3 Feb 2006 04:13:51 -0000	1.19
+++ jessie.spec	3 Feb 2006 04:18:45 -0000	1.20
@@ -1,16 +1,15 @@
 %define gcj_support 1
 
 Name:		jessie
-Version:	1.0.1
-Release:	2
+Version:	1.0.0
+Release:	12
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
 Group:		Security/Cryptography
 License:	GPL
 URL:		http://www.nongnu.org/jessie/
-# FIXME: change to %{version}
-Source0:	%{name}-1.0.0.tar.gz
+Source0:	%{name}-%{version}.tar.gz
 # workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19870
 Patch0:		jessie-1.0.0-gcj-workaround.patch
 Patch1:		jessie-1.0.0-dont-print-name.patch



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:20:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:20:22 -0500
Subject: rpms/kernel/devel linux-2.6-debug-singlebiterror.patch,1.3,1.4
Message-ID: <200602030420.k134KMbB017200@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-singlebiterror.patch 
Log Message:
fix values used in single bit error detector


linux-2.6-debug-singlebiterror.patch:
 slab.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-singlebiterror.patch	2 Feb 2006 21:20:36 -0000	1.3
+++ linux-2.6-debug-singlebiterror.patch	3 Feb 2006 04:20:20 -0000	1.4
@@ -27,20 +27,24 @@
  		printk(" %02x", (unsigned char)data[offset + i]);
  	}
  	printk("\n");
-@@ -1019,6 +1023,18 @@ static void dump_line(char *data, int of
+@@ -1019,6 +1023,22 @@ 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");
++					/* 01101011 (0x6b - SLAB_POISON) */
++		case 0x6a:	/* 01101010 bit 0 flipped */
++		case 0x69:	/* 01101001 bit 1 flipped */
++		case 0x6f:	/* 01101111 bit 2 flipped */
++		case 0x63:	/* 01100011 bit 3 flipped */
++		case 0x7b:	/* 01111011 bit 4 flipped */
++		case 0x4b:	/* 01001011 bit 5 flipped */
++		case 0x2b:	/* 00101011 bit 6 flipped */
++		case 0xeb:	/* 11101011 bit 7 flipped */
++			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;
 +	}
  }



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:26:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:26:20 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.130,
	1.131
Message-ID: <200602030426.k134QKm6026222@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-serv26156

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Bump release number.




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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 02:54:54 -0000	1.130
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 04:26:17 -0000	1.131
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_71rh
+%define release 	40jpp_72rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:48:19 -0500
Subject: rpms/jessie/devel jessie.spec,1.20,1.21
Message-ID: <200602030448.k134mJWq014116@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13999

Modified Files:
	jessie.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
- Revert back to 1.0.1 sources.




Index: jessie.spec
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jessie.spec	3 Feb 2006 04:18:45 -0000	1.20
+++ jessie.spec	3 Feb 2006 04:48:16 -0000	1.21
@@ -1,8 +1,8 @@
 %define gcj_support 1
 
 Name:		jessie
-Version:	1.0.0
-Release:	12
+Version:	1.0.1
+Release:	1
 Epoch:		0
 Summary:	A free implementation of the Java Secure Sockets Extension
 
@@ -17,11 +17,10 @@
 
 BuildArch:      noarch
 Requires:	%{_bindir}/perl
-Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
-# FIXME: uncomment
-# Requires:	java-sasl
-# Requires:	jce
-BuildRequires:	gnu-crypto >= 0:2.0, jpackage-utils > 0:1.5
+Requires:	gnu-crypto >= 0:2.1.0
+Requires:	java-sasl
+Requires:	jce
+BuildRequires:	gnu-crypto >= 0:2.1, jpackage-utils > 0:1.5
 BuildRequires:  java-devel >= 0:1.4
 Requires:	java >= 0:1.4
 %if %{gcj_support}
@@ -92,6 +91,9 @@
 %endif
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-1
+- Revert back to 1.0.1 sources.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.0.1-2
 - Revert to 1.0.0 sources.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:49:40 -0500
Subject: rpms/jessie/devel sources,1.4,1.5
Message-ID: <200602030449.k134neWZ014760@cvs.devel.redhat.com>

Author: fitzsim

Update of /cvs/dist/rpms/jessie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14644

Modified Files:
	sources 
Log Message:
- Revert back to Jessie 1.0.1.




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jessie/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 04:01:12 -0000	1.4
+++ sources	3 Feb 2006 04:49:37 -0000	1.5
@@ -1 +1 @@
-eba2838a9ae10f581ed7f8514242a1c5  jessie-1.0.0.tar.gz
+c14db8483ca9fae428b8497659861ef0  jessie-1.0.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 04:54:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 2 Feb 2006 23:54:24 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.131,
	1.132
Message-ID: <200602030454.k134sNQK017041@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-serv16959

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_73rh
- Adjust Jessie and GNU Crypto version requirements.
- Uncomment ifnarch ia64 sections.




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.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 04:26:17 -0000	1.131
+++ java-1.4.2-gcj-compat.spec	3 Feb 2006 04:54:20 -0000	1.132
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_72rh
+%define release 	40jpp_73rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -51,8 +51,8 @@
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
-Requires:	jessie >= 1.0.0-5
-Requires:	gnu-crypto >= 0:2.0.1-1jpp_2fc
+Requires:	jessie >= 1.0.1
+Requires:	gnu-crypto >= 0:2.1.0
 # SASL and JCE are provided by libgcj.
 Obsoletes:	gnu-crypto-sasl-jdk1.4
 Obsoletes:	gnu-crypto-jce-jdk1.4
@@ -145,13 +145,13 @@
 %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
+%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
 
@@ -255,11 +255,11 @@
 %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
+%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
@@ -544,9 +544,9 @@
 %endif
 %if %{bootstrap}
 %{_bindir}/ecj
-# %ifnarch ia64
-# %{_libdir}/gcj/%{name}
-# %endif
+%ifnarch ia64
+%{_libdir}/gcj/%{name}
+%endif
 %{_javadir}/eclipse-ecj.jar
 %endif
 
@@ -554,6 +554,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_73rh
+- Adjust Jessie and GNU Crypto version requirements.
+- Uncomment ifnarch ia64 sections.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_71rh
 - Obsolete gnu-crypto-sasl-jdk1.4 and gnu-crypto-jce-jdk1.4 regardless of versions.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 05:07:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 00:07:41 -0500
Subject: rpms/kernel/devel linux-2.6-debug-singlebiterror.patch,1.4,1.5
Message-ID: <200602030507.k1357fwA020944@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-singlebiterror.patch 
Log Message:
more improvements to single bit error detector


linux-2.6-debug-singlebiterror.patch:
 slab.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	3 Feb 2006 04:20:20 -0000	1.4
+++ linux-2.6-debug-singlebiterror.patch	3 Feb 2006 05:07:37 -0000	1.5
@@ -15,23 +15,26 @@
 
 --- 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
+@@ -1313,8 +1313,13 @@ static void poison_obj(kmem_cache_t *cac
  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)
++		if (data[offset+i] != POISON_FREE) {
 +			total += data[offset+i];
++			++bad_count;
++		}
  		printk(" %02x", (unsigned char)data[offset + i]);
  	}
  	printk("\n");
-@@ -1019,6 +1023,22 @@ static void dump_line(char *data, int of
+@@ -1019,6 +1023,24 @@ static void dump_line(char *data, int of
  		}
  	}
  	printk("\n");
-+	switch (total) {
++	if (bad_count == 1)
++		switch (total) {
 +					/* 01101011 (0x6b - SLAB_POISON) */
 +		case 0x6a:	/* 01101010 bit 0 flipped */
 +		case 0x69:	/* 01101001 bit 1 flipped */
@@ -46,6 +49,7 @@
 +			printk (KERN_ERR "Run memtest86 or other memory test tool.\n");
 +#endif
 +			return;
++		}
 +	}
  }
  #endif



From fedora-cvs-commits at redhat.com  Fri Feb  3 05:22:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 00:22:08 -0500
Subject: rpms/gtk2/devel render-avoid-repeat.patch, NONE, 1.1 gtk2.spec,
	1.113, 1.114
Message-ID: <200602030522.k135M8Ai030976@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	render-avoid-repeat.patch 
Log Message:
Avoid render slowness


render-avoid-repeat.patch:
 gdkwindow.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE render-avoid-repeat.patch ---
Index: gdk/gdkwindow.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
retrieving revision 1.180
diff -u -p -r1.180 gdkwindow.c
--- gdk/gdkwindow.c	10 Nov 2005 12:09:40 -0000	1.180
+++ gdk/gdkwindow.c	3 Feb 2006 05:13:28 -0000
@@ -1751,6 +1751,10 @@ gdk_window_set_bg_pattern (GdkWindow    
     {
       cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
       cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
+
+      gint pixmap_width, pixmap_height;
+      gint window_width, window_height;
+ 
       cairo_surface_destroy (surface);
 
       if (x_offset != 0 || y_offset != 0)
@@ -1760,7 +1764,25 @@ gdk_window_set_bg_pattern (GdkWindow    
 	  cairo_pattern_set_matrix (pattern, &matrix);
 	}
 
-      cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+      /* Workaround for a bug in Cairo and/or XRENDER: https://bugs.freedesktop.org/show_bug.cgi?id=4320
+       *
+       * Repeat fills with a pixmap pattern and a pixmap destination surface are
+       * slow.  So, we do a lame test for "do we actually need to repeat".
+       */
+      gdk_drawable_get_size (GDK_DRAWABLE (private->bg_pixmap), 
+			     &pixmap_width, &pixmap_height);
+      gdk_drawable_get_size (GDK_DRAWABLE (window), 
+			     &window_width, &window_height);
+      if (x_offset != 0 || y_offset != 0 ||
+	  pixmap_width < window_width || pixmap_height < window_height)
+	{
+	  g_print ("%d %d %d %d %d %d, repeating\n",
+		   x_offset, y_offset,
+		   pixmap_width, pixmap_height,
+		   window_width, window_height);
+	  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+	}
+
       cairo_set_source (cr, pattern);
       cairo_pattern_destroy (pattern);
     }


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gtk2.spec	27 Jan 2006 18:29:00 -0000	1.113
+++ gtk2.spec	3 Feb 2006 05:21:58 -0000	1.114
@@ -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
@@ -27,6 +27,8 @@
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
 Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
+# Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320
+Patch4: render-avoid-repeat.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -90,6 +92,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
 %patch3 -p1 -b .set-invisible-char-to-bullet
+%patch4 -p0 -b .render-avoid-repeat
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -259,6 +262,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-2
+- Avoid a slowpath in XRender
+
 * Fri Jan 27 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-1
 - Update to 2.8.11
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 05:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 00:28:16 -0500
Subject: rpms/gtk2/devel gtk2.spec, 1.114, 1.115 render-avoid-repeat.patch,
	1.1, 1.2
Message-ID: <200602030528.k135SGKF005116@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec render-avoid-repeat.patch 
Log Message:
Remove debug spew



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gtk2.spec	3 Feb 2006 05:21:58 -0000	1.114
+++ gtk2.spec	3 Feb 2006 05:28:12 -0000	1.115
@@ -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
@@ -92,7 +92,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
 %patch3 -p1 -b .set-invisible-char-to-bullet
-%patch4 -p0 -b .render-avoid-repeat
+%patch4 -p1 -b .render-avoid-repeat
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -262,7 +262,7 @@
 %doc tmpdocs/examples
 
 %changelog
-* Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-2
+* Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-3
 - Avoid a slowpath in XRender
 
 * Fri Jan 27 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-1

render-avoid-repeat.patch:
 gdkwindow.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletion(-)

Index: render-avoid-repeat.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/render-avoid-repeat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- render-avoid-repeat.patch	3 Feb 2006 05:21:59 -0000	1.1
+++ render-avoid-repeat.patch	3 Feb 2006 05:28:12 -0000	1.2
@@ -1,11 +1,6 @@
-Index: gdk/gdkwindow.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
-retrieving revision 1.180
-diff -u -p -r1.180 gdkwindow.c
---- gdk/gdkwindow.c	10 Nov 2005 12:09:40 -0000	1.180
-+++ gdk/gdkwindow.c	3 Feb 2006 05:13:28 -0000
-@@ -1751,6 +1751,10 @@ gdk_window_set_bg_pattern (GdkWindow    
+--- gtk+-2.8.11/gdk/gdkwindow.c.render-avoid-repeat	2005-09-26 16:28:34.000000000 -0400
++++ gtk+-2.8.11/gdk/gdkwindow.c	2006-02-03 00:27:26.000000000 -0500
+@@ -1746,6 +1746,10 @@
      {
        cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
        cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
@@ -16,7 +11,7 @@
        cairo_surface_destroy (surface);
  
        if (x_offset != 0 || y_offset != 0)
-@@ -1760,7 +1764,25 @@ gdk_window_set_bg_pattern (GdkWindow    
+@@ -1755,7 +1759,19 @@
  	  cairo_pattern_set_matrix (pattern, &matrix);
  	}
  
@@ -32,13 +27,7 @@
 +			     &window_width, &window_height);
 +      if (x_offset != 0 || y_offset != 0 ||
 +	  pixmap_width < window_width || pixmap_height < window_height)
-+	{
-+	  g_print ("%d %d %d %d %d %d, repeating\n",
-+		   x_offset, y_offset,
-+		   pixmap_width, pixmap_height,
-+		   window_width, window_height);
-+	  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-+	}
++        cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
 +
        cairo_set_source (cr, pattern);
        cairo_pattern_destroy (pattern);



From fedora-cvs-commits at redhat.com  Fri Feb  3 08:26:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 03:26:11 -0500
Subject: rpms/emacs/devel mule-cmd.el-X11-locale.alias-173781.patch, NONE,
	1.1 emacs.spec, 1.61, 1.62 php-mode-init.el, 1.3, 1.4
Message-ID: <200602030826.k138QBQm032441@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32317

Modified Files:
	emacs.spec php-mode-init.el 
Added Files:
	mule-cmd.el-X11-locale.alias-173781.patch 
Log Message:
- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11
  locale.alias file (Paul Dickson, #173781)
- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484)


mule-cmd.el-X11-locale.alias-173781.patch:
 mule-cmds.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mule-cmd.el-X11-locale.alias-173781.patch ---
diff -u emacs-21.4/lisp/international/mule-cmds.el~ emacs-21.4/lisp/international/mule-cmds.el
--- emacs-21.4/lisp/international/mule-cmds.el~	2006-02-03 15:00:06.000000000 +0900
+++ emacs-21.4/lisp/international/mule-cmds.el	2006-02-03 15:00:06.000000000 +0900
@@ -1889,7 +1889,8 @@
   ;; to a system without X.
   (setq locale-translation-file-name
 	(let ((files
-	       '("/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
+	       '("/usr/share/X11/locale/locale.alias" ; e.g. X11R7
+		 "/usr/lib/X11/locale/locale.alias" ; e.g. X11R6.4
 		 "/usr/X11R6/lib/X11/locale/locale.alias" ; e.g. RedHat 4.2
 		 "/usr/openwin/lib/locale/locale.alias" ; e.g. Solaris 2.6
 		 ;;


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- emacs.spec	14 Dec 2005 08:23:54 -0000	1.61
+++ emacs.spec	3 Feb 2006 08:26:08 -0000	1.62
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 11
+Release: 12
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -125,6 +125,7 @@
 Patch122: save-buffer.dpatch
 Patch123: smtpmail-cvs-update.patch
 %endif
+Patch124: mule-cmd.el-X11-locale.alias-173781.patch
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -261,6 +262,8 @@
 # smtpmail update
 %patch123 -p1
 %endif
+# locale.alias path
+%patch124 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -535,6 +538,11 @@
 %endif
 
 %changelog
+* Fri Feb  3 2006 Jens Petersen <petersen at redhat.com> - 21.4-12
+- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11
+  locale.alias file (Paul Dickson, #173781)
+- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484)
+
 * Wed Dec 14 2005 Jens Petersen <petersen at redhat.com> - 21.4-11
 - avoid building with -fstack-protector on i386 to prevent crashing
   (Jonathan Kamens, #174730)


Index: php-mode-init.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/php-mode-init.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-mode-init.el	9 Sep 2004 04:35:28 -0000	1.3
+++ php-mode-init.el	3 Feb 2006 08:26:08 -0000	1.4
@@ -1,6 +1,7 @@
 ;; Use php-mode for .php,.php3,.php4 and .phtml files
 
-(autoload 'php-mode "php-mode")
+(autoload 'php-mode "php-mode" "Major mode for editing PHP code." t)
+
 (add-to-list 'auto-mode-alist
 	     '("\\.php[34]\\'\\|\\.php\\'\\|\\.phtml\\'" . php-mode))
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 09:07:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 04:07:18 -0500
Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.13,1.14
Message-ID: <200602030907.k1397IXL027003@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/man-pages-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26926

Modified Files:
	man-pages-fr.spec 
Log Message:
rebuilt



Index: man-pages-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- man-pages-fr.spec	10 Jan 2006 09:12:33 -0000	1.13
+++ man-pages-fr.spec	3 Feb 2006 09:07:15 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: French man pages from the Linux Documentation Project.
 Name: man-pages-fr
 Version: 0.9.7
-Release: 12
+Release: 13
 License: Distributable
 Group: Documentation
 Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz
@@ -68,6 +68,9 @@
 %{_mandir}/fr/*
 
 %changelog
+* Fri Feb 03 2006 Peter Vrabec <pvrabec at redhat.com>
+- rebuilt
+
 * Tue Jan 10 2006 Bernd Groh <bgroh at redhat.com>
 - remove pages that conflict with shadow-utils
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 09:58:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 04:58:03 -0500
Subject: rpms/glibc/devel .cvsignore, 1.135, 1.136 glibc-fedora.patch, 1.128,
	1.129 glibc.spec, 1.217, 1.218 sources, 1.157,
	1.158 glibc-math_h.patch, 1.1, NONE
Message-ID: <200602030958.k139w2cT030559@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Removed Files:
	glibc-math_h.patch 
Log Message:
auto-import glibc-2.3.90-35 on branch devel from glibc-2.3.90-35.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- .cvsignore	2 Feb 2006 09:35:11 -0000	1.135
+++ .cvsignore	3 Feb 2006 09:58:00 -0000	1.136
@@ -1,2 +1,2 @@
-glibc-20060202T0507.tar.bz2
-glibc-fedora-20060202T0507.tar.bz2
+glibc-20060203T0932.tar.bz2
+glibc-fedora-20060203T0932.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   84 ++++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   38 ++
 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 +
 manual/filesys.texi                            |    2 
 math/math.h                                    |    9 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 stdlib/bits/stdlib-ldbl.h                      |    4 
 sysdeps/generic/dl-cache.h                     |    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 ++
 53 files changed, 811 insertions(+), 472 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- glibc-fedora.patch	2 Feb 2006 09:35:11 -0000	1.128
+++ glibc-fedora.patch	3 Feb 2006 09:58:00 -0000	1.129
@@ -1,30 +1,31 @@
---- glibc-20060202T0507/ChangeLog	1 Feb 2006 22:44:44 -0000	1.9974
-+++ glibc-20060202T0507-fedora/ChangeLog	2 Feb 2006 09:24:43 -0000	1.8782.2.156
-@@ -1,3 +1,23 @@
-+2006-02-02  Roland McGrath  <roland at redhat.com>
-+
-+	* timezone/private.h: Update from tzcode2006a.
-+	* timezone/scheck.c: Likewise.
-+	* timezone/asia: Update from tzdata2006a.
-+	* timezone/northamerica: Likewise.
-+	* timezone/zone.tab: Likewise.
-+
-+	* sysdeps/powerpc/powerpc64/Makefile (no-special-regs): New variable.
-+	(CFLAGS-mcount.c): Use it instead of -msoft-float.
-+	* sysdeps/powerpc/powerpc64/elf/Makefile
-+	(CFLAGS-dl-runtime.os, CFLAGS-dl-lookup.os, CFLAGS-dl-misc.os,
-+	CFLAGS-rtld-mempcpy.os, CFLAGS-rtld-memmove.os, CFLAGS-rtld-memchr.os,
-+	CFLAGS-rtld-strnlen.os): LIkewise
-+
-+2006-02-01  Roland McGrath  <roland at redhat.com>
+--- glibc-20060203T0932/ChangeLog	3 Feb 2006 05:28:06 -0000	1.9983
++++ glibc-20060203T0932-fedora/ChangeLog	3 Feb 2006 09:47:53 -0000	1.8782.2.160
+@@ -1,3 +1,24 @@
++2006-02-03  Jakub Jelinek  <jakub at redhat.com>
 +
-+	* sysdeps/ieee754/ldbl-opt/Makefile (sysdep-CFLAGS): Avoid adding
-+	-mlong-double-128 when it's already there.
++	* stdlib/bits/stdlib-ldbl.h (qecvt, qfcvt, qgcvt, qecvt_r,
++	qfcvt_r): Guard with #if defined __USE_SVID || defined
++	__USE_XOPEN_EXTENDED.
 +
- 2006-02-01  Roland McGrath  <roland at frob.com>
++	* sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
++	file == NULL, use __futimes unconditionally.
++
++	* manual/filesys.texi (futimes): Fix prototype.
++
++2006-02-02  Jakub Jelinek  <jakub at redhat.com>
++
++	* math/math.h (__nldbl_nexttowardf): Put __THROW before
++	__attribute__ ((__const__)).
++	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
++	followed by __THROW.
++
++	* math/math.h [__LDBL_COMPAT && __USE_ISOC99] (nexttowardl): New
++	prototype.
++
+ 2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
- 	* mach/Machrules ($(objpfx)%.uh, $(objpfx)%.__h): Use static pattern
-@@ -20,6 +40,11 @@
+ 	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
+@@ -57,6 +78,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -36,7 +37,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -2445,6 +2470,10 @@
+@@ -2483,6 +2509,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -47,7 +48,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2728,6 +2757,26 @@
+@@ -2766,6 +2796,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -74,7 +75,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5846,6 +5895,11 @@
+@@ -5884,6 +5934,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -86,7 +87,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6840,6 +6894,12 @@
+@@ -6878,6 +6933,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -99,7 +100,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -6964,6 +7024,17 @@
+@@ -7002,6 +7063,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -117,7 +118,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -10024,6 +10095,18 @@
+@@ -10062,6 +10134,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -136,8 +137,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060202T0507/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060202T0507-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060203T0932/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060203T0932-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.
@@ -187,8 +188,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-20060202T0507/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060202T0507-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060203T0932/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060203T0932-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.
@@ -215,8 +216,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060202T0507/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060202T0507-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060203T0932/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060203T0932-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>
@@ -297,8 +298,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060202T0507/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060202T0507-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060203T0932/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060203T0932-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;
@@ -323,8 +324,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060202T0507/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060202T0507-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060203T0932/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060203T0932-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -353,8 +354,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060202T0507/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060202T0507-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060203T0932/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060203T0932-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -456,8 +457,8 @@
      }
  
    search_dirs ();
---- glibc-20060202T0507/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060202T0507-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060203T0932/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060203T0932-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;
@@ -482,8 +483,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060202T0507/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060202T0507-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060203T0932/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060203T0932-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)
@@ -560,8 +561,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060202T0507/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060202T0507-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060203T0932/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060203T0932-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -577,16 +578,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060202T0507/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060203T0932/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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-20060202T0507/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060203T0932/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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-20060202T0507/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060202T0507-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060203T0932/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060203T0932-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
@@ -596,8 +597,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060202T0507/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060202T0507-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060203T0932/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060203T0932-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.  */
@@ -611,8 +612,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060202T0507/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060202T0507-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060203T0932/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060203T0932-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);
@@ -643,8 +644,8 @@
  
  #endif
  
---- glibc-20060202T0507/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060202T0507-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060203T0932/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060203T0932-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -736,8 +737,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060202T0507/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060202T0507-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060203T0932/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060203T0932-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,
  	}
      }
@@ -781,8 +782,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060202T0507/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060202T0507-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060203T0932/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060203T0932-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -791,8 +792,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060202T0507/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060202T0507-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060203T0932/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060203T0932-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -834,8 +835,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060202T0507/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060202T0507-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060203T0932/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060203T0932-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>"
@@ -850,8 +851,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060202T0507/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060202T0507-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060203T0932/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060203T0932-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>"
@@ -863,8 +864,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-20060202T0507/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060203T0932/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -935,8 +936,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060202T0507/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060202T0507-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060203T0932/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060203T0932-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -964,8 +965,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060202T0507/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060202T0507-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060203T0932/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060203T0932-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>
@@ -1041,8 +1042,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060202T0507/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060202T0507-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060203T0932/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060203T0932-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)
@@ -1098,8 +1099,50 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060202T0507/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
-+++ glibc-20060202T0507-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
+--- glibc-20060203T0932/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
++++ glibc-20060203T0932-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
+@@ -2806,7 +2806,7 @@ function.
+ 
+ @comment sys/time.h
+ @comment BSD
+- at deftypefun int futimes (int *@var{fd}, struct timeval @var{tvp}@t{[2]})
++ at deftypefun int futimes (int @var{fd}, struct timeval @var{tvp}@t{[2]})
+ This function is like @code{utimes}, except that it takes an open file
+ descriptor as an argument instead of a file name.  @xref{Low-Level
+ I/O}.  This function comes from FreeBSD, and is not available on all
+--- glibc-20060203T0932/math/math.h	14 Jan 2006 12:09:22 -0000	1.70
++++ glibc-20060203T0932-fedora/math/math.h	3 Feb 2006 09:40:56 -0000	1.68.2.3
+@@ -103,13 +103,16 @@ __BEGIN_DECLS
+ 
+ #   ifdef __USE_ISOC99 
+ extern float __nldbl_nexttowardf (float __x, long double __y)
+-				  __attribute__ ((__const__)) __THROW;
++				  __THROW __attribute__ ((__const__));
+ #    ifdef __REDIRECT_NTH
+ extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y),
+ 			     __nldbl_nexttowardf)
+      __attribute__ ((__const__));
+ extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y),
+ 			      nextafter) __attribute__ ((__const__));
++extern long double __REDIRECT_NTH (nexttowardl,
++				   (long double __x, long double __y),
++				   nextafter) __attribute__ ((__const__));
+ #    endif
+ #   endif
+ 
+@@ -118,8 +121,8 @@ extern double __REDIRECT_NTH (nexttoward
+ 
+ #   undef __MATHDECL_1
+ #   define __MATHDECL_2(type, function,suffix, args, alias) \
+-  extern type __REDIRECT(__MATH_PRECNAME(function,suffix), \
+-			 args, alias) __THROW
++  extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix), \
++			     args, alias)
+ #   define __MATHDECL_1(type, function,suffix, args) \
+   __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
+ #  endif
+--- glibc-20060203T0932/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
++++ glibc-20060203T0932-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
 @@ -497,6 +497,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1140,8 +1183,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060202T0507/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060202T0507-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060203T0932/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
++++ glibc-20060203T0932-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1164,8 +1207,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060202T0507/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060202T0507-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060203T0932/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060203T0932-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;
@@ -1190,8 +1233,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060202T0507/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060203T0932/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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>
 +
@@ -1199,8 +1242,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060202T0507/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060202T0507-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+--- glibc-20060203T0932/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060203T0932-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1220,8 +1263,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060202T0507/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060202T0507-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060203T0932/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060203T0932-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1240,8 +1283,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060202T0507/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060202T0507-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060203T0932/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060203T0932-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1253,8 +1296,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060202T0507/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060202T0507-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060203T0932/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060203T0932-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
@@ -1295,8 +1338,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060202T0507/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060202T0507-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060203T0932/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060203T0932-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1306,8 +1349,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060202T0507/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060202T0507-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060203T0932/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060203T0932-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1341,8 +1384,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060202T0507/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060203T0932/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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 =
@@ -1359,8 +1402,24 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060202T0507/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060202T0507-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060203T0932/stdlib/bits/stdlib-ldbl.h	14 Jan 2006 20:14:36 -0000	1.2
++++ glibc-20060203T0932-fedora/stdlib/bits/stdlib-ldbl.h	3 Feb 2006 09:47:53 -0000	1.2.2.2
+@@ -33,10 +33,12 @@ __LDBL_REDIR1_DECL (strtold_l, strtod_l)
+ 
+ __LDBL_REDIR1_DECL (__strtold_internal, __strtod_internal)
+ 
+-#ifdef __USE_MISC
++#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
++# ifdef __USE_MISC
+ __LDBL_REDIR1_DECL (qecvt, ecvt)
+ __LDBL_REDIR1_DECL (qfcvt, fcvt)
+ __LDBL_REDIR1_DECL (qgcvt, gcvt)
+ __LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
+ __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
++# endif
+ #endif
+--- glibc-20060203T0932/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060203T0932-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
@@ -1376,8 +1435,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060202T0507/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060202T0507-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060203T0932/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060203T0932-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))
@@ -1389,8 +1448,8 @@
  endif
  endif
  
---- glibc-20060202T0507/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060202T0507-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060203T0932/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060203T0932-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.  */
@@ -1742,8 +1801,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060202T0507/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060203T0932/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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.
@@ -1829,68 +1888,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060202T0507/sysdeps/ieee754/ldbl-opt/Makefile	14 Jan 2006 12:08:46 -0000	1.1
-+++ glibc-20060202T0507-fedora/sysdeps/ieee754/ldbl-opt/Makefile	2 Feb 2006 09:24:43 -0000	1.1.2.2
-@@ -2,7 +2,9 @@
- # -mlong-double-128 option is used (or when it becomes a default
- # when -mlong-double-64 is not used).
- long-double-fcts = yes
-+ifeq (,$(filter -mlong-double-128,$(sysdep-CFLAGS)))
- sysdep-CFLAGS += -mlong-double-128
-+endif
- 
- ifeq ($(subdir),math)
- libm-routines += s_nexttowardfd
---- glibc-20060202T0507/sysdeps/powerpc/powerpc64/Makefile	1 Nov 2005 02:12:56 -0000	1.7
-+++ glibc-20060202T0507-fedora/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 09:24:43 -0000	1.4.2.4
-@@ -10,6 +10,18 @@ ifeq (yes,$(build-shared))
- pic-ccflag = -fpic
- endif
- 
-+# These flags prevent FPU or Altivec registers from being used,
-+# for code called in contexts that is not allowed to touch those registers.
-+# Stupid GCC requires us to pass all these ridiculous switches.
-+no-special-regs := $(sort $(foreach n,40 41 50 51 60 61 62 63 \
-+				      $(foreach m,2 3 4 5 6 7 8 9, \
-+						  3$m 4$m 5$m),\
-+				    -ffixed-$n)) \
-+		   $(sort $(foreach n,$(foreach m,0 1 2 3 4 5 6 7 8 9,\
-+						$m 1$m 2$m) 30 31,\
-+				    -ffixed-v$n)) \
-+		   -ffixed-vrsave -ffixed-vscr
-+
- ifeq ($(subdir),csu)
- sysdep_routines += hp-timing
- elide-routines.os += hp-timing
-@@ -29,5 +41,5 @@ ifeq ($(subdir),gmon)
- # The assembly functions assume that fp arg regs are not trashed.
- # Compiling with -msoft-float ensures that fp regs are not used
- # for moving memory around.
--CFLAGS-mcount.c += -msoft-float
-+CFLAGS-mcount.c += $(no-special-regs)
- endif
---- glibc-20060202T0507/sysdeps/powerpc/powerpc64/elf/Makefile	27 Aug 2003 04:35:46 -0000	1.1
-+++ glibc-20060202T0507-fedora/sysdeps/powerpc/powerpc64/elf/Makefile	2 Feb 2006 09:24:43 -0000	1.1.2.1
-@@ -2,10 +2,10 @@
- 
- # Need to prevent gcc from using fprs in code used during dynamic linking.
- 
--CFLAGS-dl-runtime.os := -msoft-float
--CFLAGS-dl-lookup.os := -msoft-float
--CFLAGS-dl-misc.os := -msoft-float
--CFLAGS-rtld-mempcpy.os := -msoft-float
--CFLAGS-rtld-memmove.os := -msoft-float
--CFLAGS-rtld-memchr.os := -msoft-float
--CFLAGS-rtld-strnlen.os := -msoft-float
-+CFLAGS-dl-runtime.os = $(no-special-regs)
-+CFLAGS-dl-lookup.os = $(no-special-regs)
-+CFLAGS-dl-misc.os = $(no-special-regs)
-+CFLAGS-rtld-mempcpy.os = $(no-special-regs)
-+CFLAGS-rtld-memmove.os = $(no-special-regs)
-+CFLAGS-rtld-memchr.os = $(no-special-regs)
-+CFLAGS-rtld-strnlen.os = $(no-special-regs)
---- glibc-20060202T0507/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060202T0507-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060203T0932/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060203T0932-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);
      }
@@ -1905,8 +1904,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060203T0932-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.  */
  
@@ -1955,8 +1954,52 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060203T0932-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;
+ 
++  if (file == NULL)
++    return __futimes (fd, tvp);
++
+ #ifdef __NR_futimesat
+ # ifndef __ASSUME_ATFCTS
+   if (__have_atfcts >= 0)
+ # endif
+     {
+-      if (file == NULL)
+-	return __futimes (fd, tvp);
+-
+       result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp);
+ # ifndef __ASSUME_ATFCTS
+       if (result == -1 && errno == ENOSYS)
+@@ -58,22 +58,7 @@ futimesat (fd, file, tvp)
+ #ifndef __ASSUME_ATFCTS
+   char *buf = NULL;
+ 
+-  if (file == NULL)
+-    {
+-      static const char procfd[] = "/proc/self/fd/%d";
+-      /* Buffer for the path name we are going to use.  It consists of
+-	 - the string /proc/self/fd/
+-	 - the file descriptor number.
+-	 The final NUL is included in the sizeof.   A bit of overhead
+-	 due to the format elements compensates for possible negative
+-	 numbers.  */
+-      size_t buflen = sizeof (procfd) + sizeof (int) * 3;
+-      buf = alloca (buflen);
+-
+-      __snprintf (buf, buflen, procfd, fd);
+-      file = buf;
+-    }
+-  else if (fd != AT_FDCWD && file[0] != '/')
++  if (fd != AT_FDCWD && file[0] != '/')
+     {
+       size_t filelen = strlen (file);
+       static const char procfd[] = "/proc/self/fd/%d/%s";
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060203T0932-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"
@@ -1966,8 +2009,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060203T0932-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;
@@ -2013,8 +2056,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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.
@@ -2075,8 +2118,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060203T0932-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)
@@ -2109,467 +2152,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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-20060202T0507/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060203T0932-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-20060202T0507/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060202T0507-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060203T0932-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"_
---- glibc-20060202T0507/timezone/asia	10 Jan 2006 07:55:37 -0000	1.35
-+++ glibc-20060202T0507-fedora/timezone/asia	2 Feb 2006 09:24:43 -0000	1.28.2.8
-@@ -1,4 +1,4 @@
--# @(#)asia	7.90
-+# @(#)asia	7.91
- # <pre>
- 
- # This data is by no means authoritative; if you think you know better,
-@@ -934,6 +934,10 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 3
- # From Paul Eggert (2005-11-22):
- # Starting 2003 transitions are from Steffen Thorsen's web site timeanddate.com.
- #
-+# From Steffen Thorsen (2005-11-23):
-+# For Jordan I have received multiple independent user reports every year
-+# about DST end dates, as the end-rule is different every year.
-+#
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
- Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
-@@ -1433,6 +1437,12 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # From Paul Eggert (2005-11-22):
- # Starting 2004 transitions are from Steffen Thorsen's web site timeanddate.com.
- 
-+# From Steffen Thorsen (2005-11-23):
-+# A user from Gaza reported that Gaza made the change early because of
-+# the Ramadan.  Next year Ramadan will be even earlier, so I think
-+# there is a good chance next year's end date will be around two weeks
-+# earlier--the same goes for Jordan.
-+
- # The rules for Egypt are stolen from the `africa' file.
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
- Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-@@ -1445,7 +1455,7 @@ Rule EgyptAsia	1966	only	-	Oct	 1	3:00	0
- Rule Palestine	1999	max	-	Apr	Fri>=15	0:00	1:00	S
- Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
- Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
--Rule Palestine	2005	max	-	Oct	 4	1:00	0	-
-+Rule Palestine	2005	max	-	Oct	 4	2:00	0	-
- 
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
---- glibc-20060202T0507/timezone/northamerica	10 Jan 2006 07:55:37 -0000	1.29
-+++ glibc-20060202T0507-fedora/timezone/northamerica	2 Feb 2006 09:24:43 -0000	1.23.2.7
-@@ -1,4 +1,4 @@
--# @(#)northamerica	7.87
-+# @(#)northamerica	7.88
- # <pre>
- 
- # also includes Central America and the Caribbean
-@@ -321,6 +321,14 @@ Zone America/Chicago	-5:50:36 -	LMT	1883
- Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
- 			-7:00	US	M%sT	1992 Oct 25 02:00
- 			-6:00	US	C%sT
-+# From Paul Eggert (2006-01-20):
-+# The following is not implemented yet.
-+# What is the most populous city in that area?
-+# From http://www.statoids.com/tus.html (2006-01-20):
-+# 2003-10-26 02:00: All of Morton County, ND, and the part of Sioux
-+# County, ND east of ND route 31 moved from MT to CT.  (The area
-+# around Fort Yates in Sioux County and the area around Mandan in
-+# Morton County were already in CT.)
- 
- # US mountain time, represented by Denver
- #
-@@ -519,9 +527,9 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
- # For a map of Indiana's time zone regions, see:
- # <a href="http://www.mccsc.edu/time.html">
- # What time is it in Indiana?
--# </a> (2005-05-03)
-+# </a> (2005-10-30)
- #
--# From Paul Eggert (2005-08-22):
-+# From Paul Eggert (2006-01-20):
- # Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
- # with the following exceptions:
- #
-@@ -533,11 +541,14 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
- # - Clark, Floyd, and Harrison counties have been like
- #   America/Kentucky/Louisville.
- #
--# - Crawford, Starke, and Switzerland counties have their own time zone
-+# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
-+#   have been like America/Indiana/Vincennes.
-+#
-+# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
- #   histories as noted below.
- #
--# Shanks partitions Indiana into 345 regions, each with its own time history,
--# and writes ``Even newspaper reports present contradictory information.''
-+# Shanks partitioned Indiana into 345 regions, each with its own time history,
-+# and wrote ``Even newspaper reports present contradictory information.''
- # Fortunately, most of the complexity occurred before our cutoff date of 1970.
- #
- # Other than Indianapolis, the Indiana place names are so nondescript
-@@ -545,11 +556,19 @@ Zone America/Boise	-7:44:49 -	LMT	1883 N
- # So we reluctantly put them all in a subdirectory `America/Indiana'.
- 
- # From Paul Eggert (2005-08-16):
--# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006,
--# and that many counties may switch either to Central or to Eastern time.
--# The county-by-county decisions have not been made yet, so for now assume
--# that no counties will switch: this assumption is most likely wrong,
--# but it's the best we can do for now.
-+# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
-+
-+# From Deborah Goldsmith (2006-01-18):
-+# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf
-+# From Paul Eggert (2006-01-20):
-+# It says "DOT is relocating the time zone boundary in Indiana to move Starke,
-+# Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
-+# Eastern Time Zone to the Central Time Zone.... The effective date of
-+# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the
-+# changeover date from standard time to Daylight Saving Time."
-+# Strictly speaking, this means the affected counties will change their
-+# clocks twice that night, but this obviously is in error.  The intent
-+# is that 01:59:59 EST be followed by 02:00:00 CDT.
- 
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
- Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
-@@ -568,8 +587,8 @@ Zone America/Indiana/Indianapolis -5:44:
- 			-5:00	-	EST	2006
- 			-5:00	US	E%sT
- #
--# Part of Crawford County, Indiana, last observed DST in 1975,
--# and left its clocks alone in 1974.
-+# Eastern Crawford County, Indiana, left its clocks alone in 1974,
-+# as well as from 1976 through 2005.
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
- Rule	Marengo	1951	only	-	Apr	lastSun	2:00	1:00	D
- Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
-@@ -586,7 +605,45 @@ Zone America/Indiana/Marengo -5:45:23 -	
- 			-5:00	-	EST	2006
- 			-5:00	US	E%sT
- #
--# Starke County, Indiana
-+# Daviess, Dubois, Knox, Martin, Perry, and Pulaski Counties, Indiana,
-+# switched from eastern to central time in April 2006.
-+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-+Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
-+Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
-+Rule Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
-+Rule Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
-+Rule Vincennes	1955	only	-	May	 1	0:00	1:00	D
-+Rule Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
-+Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
-+Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
-+Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
-+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-+Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
-+			-6:00	US	C%sT	1946
-+			-6:00 Vincennes	C%sT	1964 Apr 26 2:00
-+			-5:00	-	EST	1969
-+			-5:00	US	E%sT	1971
-+			-5:00	-	EST	2006 Apr  2 2:00
-+			-6:00	US	C%sT
-+# 
-+# Pike County, Indiana moved from central to eastern time in 1977,
-+# then switched back in 2006.
-+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-+Rule	Pike	1955	only	-	May	 1	0:00	1:00	D
-+Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
-+Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
-+Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
-+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-+Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
-+			-6:00	US	C%sT	1955
-+			-6:00	Pike	C%sT	1965 Apr 25 2:00
-+			-5:00	-	EST	1966 Oct 30 2:00
-+			-6:00	US	C%sT	1977 Oct 30 2:00
-+			-5:00	-	EST	2006 Apr  2 2:00
-+			-6:00	US	C%sT
-+#
-+# Starke County, Indiana moved from central to eastern time in 1991,
-+# then switched back in 2006.
- # From Arthur David Olson (1991-10-28):
- # An article on page A3 of the Sunday, 1991-10-27 Washington Post
- # notes that Starke County switched from Central time to Eastern time as of
-@@ -603,10 +660,10 @@ Zone America/Indiana/Knox -5:46:30 -	LMT
- 			-6:00	Starke	C%sT	1962 Apr 29 2:00
- 			-5:00	-	EST	1963 Oct 27 2:00
- 			-6:00	US	C%sT	1991 Oct 27 2:00
--			-5:00	-	EST	2006
--			-5:00	US	E%sT
-+			-5:00	-	EST	2006 Apr  2 2:00
-+			-6:00	US	C%sT
- #
--# Switzerland County, Indiana, last observed DST in 1972.
-+# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
- 			-6:00	US	C%sT	1954 Apr 25 2:00
-@@ -636,7 +693,7 @@ Zone America/Kentucky/Louisville -5:43:0
- 			-6:00	1:00	CDT	1974 Oct 27 2:00
- 			-5:00	US	E%sT
- #
--# Wayne, Clinton, and Russell Counties, Kentucky
-+# Wayne County, Kentucky
- #
- # From
- # <a href="http://www.lake-cumberland.com/life/archive/news990129time.shtml">
-@@ -733,7 +790,8 @@ Zone America/Detroit	-5:32:11 -	LMT	1905
- 			-5:00	-	EST	1975 Apr 27 2:00
- 			-5:00	US	E%sT
- #
--# The Michigan border with Wisconsin switched from EST to CST/CDT in 1973.
-+# Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
-+# switched from EST to CST/CDT in 1973.
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
- Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
- Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
-@@ -929,7 +987,7 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	18
- 			-4:00	StJohns	A%sT
- 
- 
--# west Labrador, New Brunswick, Nova Scotia, Prince Edward I
-+# west Labrador, Nova Scotia, Prince Edward I
- 
- # From Paul Eggert (1996-06-12):
- # Shanks writes that since 1970 most of this region has been like Halifax.
-@@ -938,53 +996,48 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	18
- # Shanks also writes that Liverpool, NS was the only town in Canada to observe
- # DST in 1971 but not 1970; for now we'll assume this is a typo.
- 
--# From Paul Eggert (2000-10-02):
--# INMS (2000-09-12) says that, since 1988 at least, New Brunswick switches
--# at 00:01 local time.  FIXME: verify and create a new Zone for this.
--
--
- # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
--Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
--Rule Halifax	1916	only	-	Oct	 1	0:00	0	S
--Rule Halifax	1920	only	-	May	 9	0:00	1:00	D
--Rule Halifax	1920	only	-	Aug	29	0:00	0	S
--Rule Halifax	1921	only	-	May	 6	0:00	1:00	D
--Rule Halifax	1921	1922	-	Sep	 5	0:00	0	S
--Rule Halifax	1922	only	-	Apr	30	0:00	1:00	D
--Rule Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
--Rule Halifax	1923	only	-	Sep	 4	0:00	0	S
--Rule Halifax	1924	only	-	Sep	15	0:00	0	S
--Rule Halifax	1925	only	-	Sep	28	0:00	0	S
--Rule Halifax	1926	only	-	May	16	0:00	1:00	D
--Rule Halifax	1926	only	-	Sep	13	0:00	0	S
--Rule Halifax	1927	only	-	May	 1	0:00	1:00	D
--Rule Halifax	1927	only	-	Sep	26	0:00	0	S
--Rule Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
--Rule Halifax	1928	only	-	Sep	 9	0:00	0	S
--Rule Halifax	1929	only	-	Sep	 3	0:00	0	S
--Rule Halifax	1930	only	-	Sep	15	0:00	0	S
--Rule Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
--Rule Halifax	1932	only	-	May	 1	0:00	1:00	D
--Rule Halifax	1933	only	-	Apr	30	0:00	1:00	D
--Rule Halifax	1933	only	-	Oct	 2	0:00	0	S
--Rule Halifax	1934	only	-	May	20	0:00	1:00	D
--Rule Halifax	1934	only	-	Sep	16	0:00	0	S
--Rule Halifax	1935	only	-	Jun	 2	0:00	1:00	D
--Rule Halifax	1935	only	-	Sep	30	0:00	0	S
--Rule Halifax	1936	only	-	Jun	 1	0:00	1:00	D
--Rule Halifax	1936	only	-	Sep	14	0:00	0	S
--Rule Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
--Rule Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
--Rule Halifax	1939	only	-	May	28	0:00	1:00	D
--Rule Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
--Rule Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
--Rule Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
--Rule Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
--Rule Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
--Rule Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
--Rule Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
--Rule Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
--Rule Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
-+Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
-+Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
-+Rule	Halifax	1920	only	-	May	 9	0:00	1:00	D
-+Rule	Halifax	1920	only	-	Aug	29	0:00	0	S
-+Rule	Halifax	1921	only	-	May	 6	0:00	1:00	D
-+Rule	Halifax	1921	1922	-	Sep	 5	0:00	0	S
-+Rule	Halifax	1922	only	-	Apr	30	0:00	1:00	D
-+Rule	Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
-+Rule	Halifax	1923	only	-	Sep	 4	0:00	0	S
-+Rule	Halifax	1924	only	-	Sep	15	0:00	0	S
-+Rule	Halifax	1925	only	-	Sep	28	0:00	0	S
-+Rule	Halifax	1926	only	-	May	16	0:00	1:00	D
-+Rule	Halifax	1926	only	-	Sep	13	0:00	0	S
-+Rule	Halifax	1927	only	-	May	 1	0:00	1:00	D
-+Rule	Halifax	1927	only	-	Sep	26	0:00	0	S
-+Rule	Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
-+Rule	Halifax	1928	only	-	Sep	 9	0:00	0	S
-+Rule	Halifax	1929	only	-	Sep	 3	0:00	0	S
-+Rule	Halifax	1930	only	-	Sep	15	0:00	0	S
-+Rule	Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
-+Rule	Halifax	1932	only	-	May	 1	0:00	1:00	D
-+Rule	Halifax	1933	only	-	Apr	30	0:00	1:00	D
-+Rule	Halifax	1933	only	-	Oct	 2	0:00	0	S
-+Rule	Halifax	1934	only	-	May	20	0:00	1:00	D
-+Rule	Halifax	1934	only	-	Sep	16	0:00	0	S
-+Rule	Halifax	1935	only	-	Jun	 2	0:00	1:00	D
-+Rule	Halifax	1935	only	-	Sep	30	0:00	0	S
-+Rule	Halifax	1936	only	-	Jun	 1	0:00	1:00	D
-+Rule	Halifax	1936	only	-	Sep	14	0:00	0	S
-+Rule	Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
-+Rule	Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
-+Rule	Halifax	1939	only	-	May	28	0:00	1:00	D
-+Rule	Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
-+Rule	Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
-+Rule	Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
-+Rule	Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
-+Rule	Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
-+Rule	Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
-+Rule	Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
-+Rule	Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
-+Rule	Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
- 			-4:00	Halifax	A%sT	1918
-@@ -1000,6 +1053,43 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	19
- 			-4:00	Halifax	A%sT	1974
- 			-4:00	Canada	A%sT
- 
-+# New Brunswick
-+
-+# From Paul Eggert (2006-01-20):
-+# New Brunswick's Time Definition Act
-+# <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> says they change at 00:01, and
-+# <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it
-+# clear that this has been the case since at least 1993.
-+# For now, assume it started in 1993.  The Office of the Premier announced
-+# <http://www.gnb.ca/cnb/news/pre/2005e1737pr.htm> (2005-12-23)
-+# that they will bring forward proposed amendments to harmonize with the US;
-+# for now assume that this will happen, but they'll still switch at 00:01.
-+
-+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-+Rule	Moncton	1933	1935	-	Jun	Sun>=8	1:00	1:00	D
-+Rule	Moncton	1933	1935	-	Sep	Sun>=8	1:00	0	S
-+Rule	Moncton	1936	1938	-	Jun	Sun>=1	1:00	1:00	D
-+Rule	Moncton	1936	1938	-	Sep	Sun>=1	1:00	0	S
-+Rule	Moncton	1939	only	-	May	27	1:00	1:00	D
-+Rule	Moncton	1939	1941	-	Sep	Sat>=21	1:00	0	S
-+Rule	Moncton	1940	only	-	May	19	1:00	1:00	D
-+Rule	Moncton	1941	only	-	May	 4	1:00	1:00	D
-+Rule	Moncton	1946	1972	-	Apr	lastSun	2:00	1:00	D
-+Rule	Moncton	1946	1956	-	Sep	lastSun	2:00	0	S
-+Rule	Moncton	1956	1972	-	Oct	lastSun	2:00	0	S
-+Rule	Moncton	1993	2006	-	Apr	Sun>=1	0:01	1:00	D
-+Rule	Moncton	1993	2006	-	Oct	lastSun	0:01	0	S
-+Rule	Moncton	2007	max	-	Mar	Sun>=8	0:01	1:00	D
-+Rule	Moncton	2007	max	-	Nov	Sun>=1	0:01	0	S
-+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-+Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
-+			-5:00	-	EST	1902 Jun 15
-+			-4:00	Canada	A%sT	1933
-+			-4:00	Moncton	A%sT	1942
-+			-4:00	Canada	A%sT	1946
-+			-4:00	Moncton	A%sT	1973
-+			-4:00	Canada	A%sT	1993
-+			-4:00	Moncton	A%sT
- 
- # Ontario, Quebec
- 
---- glibc-20060202T0507/timezone/private.h	10 Jan 2006 07:55:37 -0000	1.11
-+++ glibc-20060202T0507-fedora/timezone/private.h	2 Feb 2006 09:24:43 -0000	1.7.2.5
-@@ -218,7 +218,7 @@ char *	imalloc P((int n));
- void *	irealloc P((void * pointer, int size));
- void	icfree P((char * pointer));
- void	ifree P((char * pointer));
--char *	scheck P((const char *string, char *format));
-+const char *scheck P((const char *string, const char *format));
- 
- /*
- ** Finally, some convenience items.
---- glibc-20060202T0507/timezone/scheck.c	6 Aug 2005 05:40:57 -0000	1.3
-+++ glibc-20060202T0507-fedora/timezone/scheck.c	2 Feb 2006 09:24:43 -0000	1.1.6.3
-@@ -1,6 +1,6 @@
- #ifndef lint
- #ifndef NOID
--static char	elsieid[] = "@(#)scheck.c	8.16";
-+static char	elsieid[] = "@(#)scheck.c	8.17";
- #endif /* !defined lint */
- #endif /* !defined NOID */
- 
-@@ -8,20 +8,19 @@ static char	elsieid[] = "@(#)scheck.c	8.
- 
- #include "private.h"
- 
--char *
-+const char *
- scheck(string, format)
- const char * const	string;
--char * const		format;
-+const char * const	format;
- {
- 	register char *		fbuf;
- 	register const char *	fp;
- 	register char *		tp;
- 	register int		c;
--	register char *		result;
-+	register const char *	result;
- 	char			dummy;
--	static char		nada;
- 
--	result = &nada;
-+	result = "";
- 	if (string == NULL || format == NULL)
- 		return result;
- 	fbuf = imalloc((int) (2 * strlen(format) + 4));
---- glibc-20060202T0507/timezone/zone.tab	7 Sep 2005 07:00:55 -0000	1.23
-+++ glibc-20060202T0507-fedora/timezone/zone.tab	2 Feb 2006 09:24:43 -0000	1.21.2.3
-@@ -1,4 +1,4 @@
--# @(#)zone.tab	1.32
-+# @(#)zone.tab	1.33
- #
- # TZ zone descriptions
- #
-@@ -100,8 +100,9 @@ BW	-2545+02555	Africa/Gaborone
- BY	+5354+02734	Europe/Minsk
- BZ	+1730-08812	America/Belize
- CA	+4734-05243	America/St_Johns	Newfoundland Island
--CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
-+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), W Labrador, E Quebec & PEI
- CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
-+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
- CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
- CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
- CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
-@@ -370,12 +371,14 @@ US	+404251-0740023	America/New_York	East
- US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
- US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
- US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
--US	+394606-0860929	America/Indiana/Indianapolis	Eastern Standard Time - Indiana - most locations
--US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
--US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
--US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
-+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
-+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
-+US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
-+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
- US	+415100-0873900	America/Chicago	Central Time
--US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
-+US	+384038-0873143	America/Indiana/Vincennes	Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski
-+US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
-+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
- US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
- US	+394421-1045903	America/Denver	Mountain Time
- US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- glibc.spec	2 Feb 2006 19:06:19 -0000	1.217
+++ glibc.spec	3 Feb 2006 09:58:00 -0000	1.218
@@ -1,9 +1,9 @@
-%define glibcdate 20060202T0507
+%define glibcdate 20060203T0932
 %define glibcname glibc
-%define glibcsrcdir glibc-20060202T0507
+%define glibcsrcdir glibc-20060203T0932
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 34
+%define glibcrelease 35
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -32,7 +32,6 @@
 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
-Patch2: glibc-math_h.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -242,7 +241,6 @@
 %patch1 -p1
 %endif
 %endif
-%patch2 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir -p override_headers/linux
@@ -1247,6 +1245,11 @@
 %endif
 
 %changelog
+* Fri Feb  3 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-35
+- update from CVS
+  - handle futimesat (fd, NULL, tvp) as futimes (fd, tvp)
+- fix <stdlib.h> q{e,f,g}cvt{,_r} for -mlong-double-64
+
 * Thu Feb  2 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-34
 - fix <math.h> with C++ and -mlong-double-64 (#179742)
 - add nexttowardl redirect for -mlong-double-64


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources	2 Feb 2006 09:35:12 -0000	1.157
+++ sources	3 Feb 2006 09:58:00 -0000	1.158
@@ -1,2 +1,2 @@
-da6754150cd9d19f4c01c6e800f7acac  glibc-20060202T0507.tar.bz2
-0cbf64874957d6598397331681b07b8e  glibc-fedora-20060202T0507.tar.bz2
+c51476629db3e3937ad16b4ddb106c5a  glibc-20060203T0932.tar.bz2
+c3652b41d08772d9b4778a40ca1f32d0  glibc-fedora-20060203T0932.tar.bz2


--- glibc-math_h.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 10:06:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 05:06:10 -0500
Subject: rpms/httpd/devel httpd-2.2.0-CVE-2005-3352.patch, NONE,
	1.1 httpd-2.2.0-CVE-2005-3357.patch, NONE,
	1.1 httpd-2.2.0-cppheader.patch, NONE, 1.1 httpd.conf, 1.23,
	1.24 httpd.spec, 1.83, 1.84
Message-ID: <200602031006.k13A6AjU030713@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.conf httpd.spec 
Added Files:
	httpd-2.2.0-CVE-2005-3352.patch 
	httpd-2.2.0-CVE-2005-3357.patch httpd-2.2.0-cppheader.patch 
Log Message:
* Fri Feb  3 2006 Joe Orton <jorton at redhat.com> 2.2.0-5
- mod_ssl: add security fix for CVE-2005-3357 (#177914)
- mod_imagemap: add security fix for CVE-2005-3352 (#177913)
- add fix for AP_INIT_* designated initializers with C++ compilers
- httpd.conf: enable HTMLTable in default IndexOptions
- httpd.conf: add more "redirect-carefully" matches for DAV clients


httpd-2.2.0-CVE-2005-3352.patch:
 modules/mappers/mod_imagemap.c |    2 +-
 server/util.c                  |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE httpd-2.2.0-CVE-2005-3352.patch ---

Author: mjc
Date: Mon Dec 12 09:27:59 2005
New Revision: 356291

URL: http://svn.apache.org/viewcvs?rev=356291&view=rev
Log:
Fix moderate security issue CVE-2005-3352 mod_imap cross-site scripting flaw

Submitted by: Mark Cox <mjc apache.org>
Reviewed by: jorton, mjc, fielding
PR: 37874

--- httpd-2.2.0/modules/mappers/mod_imagemap.c.cve3352
+++ httpd-2.2.0/modules/mappers/mod_imagemap.c
@@ -342,7 +342,7 @@
     if (!strcasecmp(value, "referer")) {
         referer = apr_table_get(r->headers_in, "Referer");
         if (referer && *referer) {
-            return apr_pstrdup(r->pool, referer);
+            return ap_escape_html(r->pool, referer);
         }
         else {
             /* XXX:  This used to do *value = '\0'; ... which is totally bogus
--- httpd-2.2.0/server/util.c.cve3352
+++ httpd-2.2.0/server/util.c
@@ -1748,6 +1748,8 @@
             j += 3;
         else if (s[i] == '&')
             j += 4;
+        else if (s[i] == '"')
+            j += 5;
 
     if (j == 0)
         return apr_pstrmemdup(p, s, i);
@@ -1766,6 +1768,10 @@
             memcpy(&x[j], "&amp;", 5);
             j += 4;
         }
+        else if (s[i] == '"') {
+            memcpy(&x[j], "&quot;", 6);
+            j += 5;
+        }
         else
             x[j] = s[i];
 

httpd-2.2.0-CVE-2005-3357.patch:
 ssl_engine_kernel.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE httpd-2.2.0-CVE-2005-3357.patch ---

Author: jorton
Date: Fri Jan 13 06:21:42 2006
New Revision: 368730

URL: http://svn.apache.org/viewcvs?rev=368730&view=rev
Log:
Merge r354394 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Omit further
access control checks if SSL is not in use regardless of vhost
settings.

Submitted by: R??diger Pl??m, Joe Orton
Reviewed by: rpluem, jorton, jim
PR: 37791

--- httpd-2.2.0/modules/ssl/ssl_engine_kernel.c.cve3357
+++ httpd-2.2.0/modules/ssl/ssl_engine_kernel.c
@@ -202,11 +202,14 @@
     }
 
     /*
-     * Check to see if SSL protocol is on
+     * Check to see whether SSL is in use; if it's not, then no
+     * further access control checks are relevant.  (the test for
+     * sc->enabled is probably strictly unnecessary)
      */
-    if (!((sc->enabled == SSL_ENABLED_TRUE) || (sc->enabled == SSL_ENABLED_OPTIONAL) || ssl)) {
+    if (sc->enabled == SSL_ENABLED_FALSE || !ssl) {
         return DECLINED;
     }
+
     /*
      * Support for per-directory reconfigured SSL connection parameters.
      *

httpd-2.2.0-cppheader.patch:
 configure.in        |    4 ----
 include/ap_config.h |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE httpd-2.2.0-cppheader.patch ---
--- httpd-2.2.0/include/ap_config.h.cppheader
+++ httpd-2.2.0/include/ap_config.h
@@ -252,4 +252,12 @@
 #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
 #endif
 
+/* Presume that the compiler supports C99-style designated
+ * initializers if using GCC (but not G++), or for any other compiler
+ * which claims C99 support. */
+#if (defined(__GNUC__) && !defined(__cplusplus))                \
+     || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#define AP_HAVE_DESIGNATED_INITIALIZER
+#endif
+
 #endif /* AP_CONFIG_H */
--- httpd-2.2.0/configure.in.cppheader
+++ httpd-2.2.0/configure.in
@@ -360,10 +360,6 @@
 dnl ## Check for typedefs, structures, and compiler characteristics.
 
 AC_C_CONST
-if test "x$GCC" = "xyes"; then
-  AC_DEFINE([AP_HAVE_DESIGNATED_INITIALIZER], 1,
-            [Define if the compiler supports designated initializers])
-fi
 
 dnl ## Check for library functions
 AC_SEARCH_LIBS(sqrt, m)


Index: httpd.conf
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- httpd.conf	5 Dec 2005 17:26:03 -0000	1.23
+++ httpd.conf	3 Feb 2006 10:06:08 -0000	1.24
@@ -588,7 +588,7 @@
 # IndexOptions: Controls the appearance of server-generated directory
 # listings.
 #
-IndexOptions FancyIndexing VersionSort NameWidth=*
+IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
 
 #
 # AddIcon* directives tell the server which icon to show for different
@@ -887,9 +887,12 @@
 # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
 #
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+BrowserMatch "MS FrontPage" redirect-carefully
 BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
-BrowserMatch "^gnome-vfs" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+BrowserMatch "^gnome-vfs/1.0" redirect-carefully
+BrowserMatch "^XML Spy" redirect-carefully
+BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 
 #
 # Allow server status reports generated by mod_status,


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- httpd.spec	5 Jan 2006 11:49:42 -0000	1.83
+++ httpd.spec	3 Feb 2006 10:06:08 -0000	1.84
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 4
+Release: 5
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -41,7 +41,11 @@
 # Bug fixes
 Patch50: httpd-2.0.45-encode.patch
 Patch51: httpd-2.2.0-headclength.patch
-patch52: httpd-2.2.0-ajpcookie.patch
+Patch52: httpd-2.2.0-ajpcookie.patch
+Patch53: httpd-2.2.0-cppheader.patch
+# Security fixes
+Patch200: httpd-2.2.0-CVE-2005-3352.patch
+Patch201: httpd-2.2.0-CVE-2005-3357.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
@@ -121,6 +125,10 @@
 %patch50 -p1
 %patch51 -p1 -b .headclength
 %patch52 -p1 -b .ajpcookie
+%patch53 -p1 -b .cppheader
+
+%patch200 -p1 -b .cve3352
+%patch201 -p1 -b .cve3352
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -481,6 +489,13 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Feb  3 2006 Joe Orton <jorton at redhat.com> 2.2.0-5
+- mod_ssl: add security fix for CVE-2005-3357 (#177914)
+- mod_imagemap: add security fix for CVE-2005-3352 (#177913)
+- add fix for AP_INIT_* designated initializers with C++ compilers
+- httpd.conf: enable HTMLTable in default IndexOptions
+- httpd.conf: add more "redirect-carefully" matches for DAV clients
+
 * Thu Jan  5 2006 Joe Orton <jorton at redhat.com> 2.2.0-4
 - mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769)
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 10:36:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 05:36:43 -0500
Subject: rpms/hplip/devel hplip-0.9.8-2.patch, NONE, 1.1 hplip.spec, 1.42,
	1.43 hplip-0.9.8-1.patch, 1.1, NONE
Message-ID: <200602031036.k13AahjO022365@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22322

Modified Files:
	hplip.spec 
Added Files:
	hplip-0.9.8-2.patch 
Removed Files:
	hplip-0.9.8-1.patch 
Log Message:
* Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-2
- Patchlevel 2.


hplip-0.9.8-2.patch:
 Makefile.am            |   13 +++++++++----
 prnt/hpijs/Makefile.am |    4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

--- NEW FILE hplip-0.9.8-2.patch ---
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am	2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am	2006-02-02 15:32:35.644818088 -0800
@@ -20,8 +20,10 @@
 dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
     sendfax.py setup.py
 
-# hp backend.
 cupsdir = $(CUPS_BACKEND_PATH)
+cupsppddir = $(CUPS_PPD_PATH)
+
+# hp backend.
 cups_PROGRAMS = hp
 hp_SOURCES = backend/hp/hp.c 
 hp_LDADD = libhplip-api.la
@@ -232,7 +234,7 @@
 #
 #       Edit hpiod.conf in destdir.
 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(CUPS_PPD_PATH)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(cupsppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
 #
 #       Edit hpiod.sh in destdir.
 	sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
@@ -260,12 +262,15 @@
 	   cp -f data/xml/unreleased/*.xml $(DESTDIR)$(hplipdir)/data/xml/; \
 	fi
 #
-#       Install fax support, let hpijs install ppd for now.
+#       Install fax support.
 	mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax 
 	if [ "$(rpm_install)" = "no" ]; then \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsdir); \
 	   $(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsppddir)/model; \
+	   $(INSTALL_SCRIPT) $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd $(DESTDIR)$(cupsppddir)/model; \
+	   gzip -f $(DESTDIR)$(cupsppddir)/model/HP-Fax-hplip.ppd; \
 	fi
-	cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
 
 #
 # Add prerequisites for testing (or building?) "make install DESTDIR=/build".
diff -uNr hplip-0.9.8.old/prnt/hpijs/Makefile.am hplip-0.9.8.new/prnt/hpijs/Makefile.am
--- hplip-0.9.8.old/prnt/hpijs/Makefile.am	2006-01-24 12:19:06.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/Makefile.am	2006-02-02 15:20:15.000000000 -0800
@@ -80,8 +80,8 @@
 	rm -f $(DESTDIR)$(ppddir)/hp*.ppd*
 
 install-cups:
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
 	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
 	$(mkinstalldirs) $(DESTDIR)$(CUPS_PPD_PATH)
 	ln -s $(datadir)/ppd $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- hplip.spec	2 Feb 2006 14:14:15 -0000	1.42
+++ hplip.spec	3 Feb 2006 10:36:40 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.8
-Release: 1
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -11,7 +11,7 @@
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-0.9.8-1.patch
+Patch4: hplip-0.9.8-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -64,8 +64,8 @@
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply patch 0.9.8-1
-%patch4 -p1 -b .0.9.8-1
+# Apply patch 0.9.8-2
+%patch4 -p1 -b .0.9.8-2
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -155,6 +155,9 @@
 fi
 
 %changelog
+* Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-2
+- Patchlevel 2.
+
 * Thu Feb  2 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-1
 - 0.9.8.
 - No longer need initscript patch.


--- hplip-0.9.8-1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 10:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 05:46:17 -0500
Subject: rpms/hplip/devel hplip.spec,1.43,1.44
Message-ID: <200602031046.k13AkHXu001784@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1251

Modified Files:
	hplip.spec 
Log Message:
Remove other fax file.


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- hplip.spec	3 Feb 2006 10:36:40 -0000	1.43
+++ hplip.spec	3 Feb 2006 10:46:13 -0000	1.44
@@ -107,6 +107,7 @@
 
 # Don't package hpfax yet.
 rm -f %{buildroot}%{_libdir}/cups/backend/hpfax
+rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax*
 
 %clean
 rm -rf %{buildroot}



From fedora-cvs-commits at redhat.com  Fri Feb  3 10:50:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 05:50:11 -0500
Subject: rpms/libXft/devel libXft.spec,1.10,1.11
Message-ID: <200602031050.k13AoBuC008445@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8421

Modified Files:
	libXft.spec 
Log Message:
* Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 2.1.8.2-3
- Added missing dependencies to devel subpackage to fix (#176744)



Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXft.spec	23 Jan 2006 22:26:53 -0000	1.10
+++ libXft.spec	3 Feb 2006 10:50:08 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.8.2
-Release: 2
+Release: 3
 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
+Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -28,7 +28,10 @@
 Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
+Requires: xorg-x11-proto-devel
 Requires: libXrender-devel
+Requires: fontconfig-devel
+Requires: freetype-devel
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -71,13 +74,11 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXft.so.2
 %{_libdir}/libXft.so.2.1.2
 
 %files devel
 %defattr(-,root,root,-)
-%defattr(-,root,root,-)
 #%{_bindir}/xft-config
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xft
@@ -88,12 +89,14 @@
 %endif
 %{_libdir}/libXft.so
 %{_libdir}/pkgconfig/xft.pc
-%dir %{_mandir}
 #%{_mandir}/man1/xft-config.1.gz
-%dir %{_mandir}/man3
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* Thu Feb  2 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 10:51:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 05:51:01 -0500
Subject: rpms/kdebase/devel kdebase-3.5.1-keyboardlayout.patch, NONE,
	1.1 kdebase.spec, 1.146, 1.147
Message-ID: <200602031051.k13Ap1so008856@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-keyboardlayout.patch 
Log Message:
- apply patch to fix broken xx_XX layouts in kxkb
- cleanup spec file


kdebase-3.5.1-keyboardlayout.patch:
 rules.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.1-keyboardlayout.patch ---
--- kdebase-3.5.1/kxkb/rules.cpp.orig	2006-02-03 11:14:24.000000000 +0100
+++ kdebase-3.5.1/kxkb/rules.cpp	2006-02-03 11:05:24.000000000 +0100
@@ -300,7 +300,7 @@
  */
 const QString KeyRules::getLayout(const QString &layvar) const
 {
-  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
+  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
   QString varLine = layvar.stripWhiteSpace();
   QRegExp rx(LAYOUT_PATTERN);
   int pos = rx.search(varLine, 0);
@@ -318,7 +318,7 @@
  */
 const QString KeyRules::getVariant(const QString &layvar) const
 {
-  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
+  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
   QString varLine = layvar.stripWhiteSpace();
   QRegExp rx(VARIANT_PATTERN);
   int pos = rx.search(varLine, 0);


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdebase.spec	1 Feb 2006 14:14:05 -0000	1.146
+++ kdebase.spec	3 Feb 2006 10:50:59 -0000	1.147
@@ -12,8 +12,10 @@
 %define qt_version 3.3.5
 %define arts_version 1.5.1
 %define kde_version 3.5.1
-
+%define kdelibs_epoch 6
+%define arts_epoch 8
 %define make_cvs 1
+
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
@@ -21,7 +23,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 1
+Release: 2
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -36,21 +38,24 @@
 Source5: kde-np
 Source7: mailsettings.cc
 
-Patch0: kdebase-3.5.1-redhat.patch
-Patch3: kdebase-3.3.92-vroot.patch
-Patch4: kdebase-3.0-shortcuts.patch
-Patch40: kdebase-3.2.0-keymap.patch
-Patch56: kde-libtool.patch
-Patch57: kdebase-3.1-startpage.patch
-Patch71: kdebase-3.1.3-konsole-double-esc.patch
-Patch74: kdebase-3.3.92-kpersonalizer.patch
-Patch80: kdebase-3.2.92-logo.patch 
-Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
-Patch91: kdebase-3.4.2-kdesktop-konsole.patch
-Patch92: kdebase-3.4.0-xdg.patch
-Patch93: kdebase-3.5.1-dbus.patch
+Patch0: kde-libtool.patch
+Patch1: kdebase-3.5.1-redhat.patch
+Patch2: kdebase-3.3.92-vroot.patch
+Patch3: kdebase-3.0-shortcuts.patch
+Patch4: kdebase-3.2.0-keymap.patch
+Patch5: kdebase-3.1-startpage.patch
+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.4.0-xdg.patch
+Patch12: kdebase-3.5.1-dbus.patch
+
+# upstream patches
+Patch100: kdebase-3.5.1-keyboardlayout.patch
 
-Requires: kdelibs >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
 Requires: /etc/X11/xdm/Xservers
@@ -73,7 +78,7 @@
 BuildPrereq: qt-devel >= %{qt_version}
 BuildPrereq: kdelibs-devel >= %{kde_version}
 %if %{arts}
-BuildPrereq: arts-devel >= 7:%{arts_version}
+BuildPrereq: arts-devel >= %{arts_epoch}:%{arts_version}
 %endif
 BuildPrereq: libxml2-devel >= 2.6.5
 BuildPrereq: openmotif-devel
@@ -117,19 +122,22 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .redhat
-%patch3 -p1 -b .vroot
-%patch4 -p1 -b .shortcuts
-%patch40 -p1 -b .keymap
-%patch56 -p1 -b .libtool
-%patch57 -p1
-%patch71 -p1 -b .konsole
-%patch74 -p1 -b .kper
-%patch80 -p1 -b .logo
-%patch81 -p1 -b .im
-%patch91 -p1 -b .kdestop-konsole
-%patch92 -p1 -b .xdg
-%patch93 -p1 -b .dbus
+%patch0 -p1 -b .libtool
+%patch1 -p1 -b .redhat
+%patch2 -p1 -b .vroot
+%patch3 -p1 -b .shortcuts
+%patch4 -p1 -b .keymap
+%patch5 -p1
+%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 .dbus
+
+# upstream patches
+%patch100 -p1 -b .keyboardlayout
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -242,20 +250,6 @@
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 
-# move to bitmap fonts package
-%if %{redhatify}
-   rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts
-%else
-   mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts
-   mv $RPM_BUILD_ROOT%{_datadir}/fonts/*pcf* \
-      $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/
-
-   rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts/fonts.dir \
-          $RPM_BUILD_ROOT%{_datadir}/fonts/override
-
-   gunzip $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/*.gz
-%endif
-
 # install gdm session support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/
@@ -424,6 +418,10 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-2
+- apply patch to fix broken xx_XX layouts in kxkb
+- cleanup spec file
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 - apply patch to fix kded segfaults for audio/blank cd's



From fedora-cvs-commits at redhat.com  Fri Feb  3 11:25:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 06:25:33 -0500
Subject: rpms/autofs/FC-4 autofs-4.1.4-ldap-depricated.patch, NONE,
	1.1 autofs.spec, 1.65, 1.66
Message-ID: <200602031125.k13BPXOM002083@cvs.devel.redhat.com>

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-4.1.4-ldap-depricated.patch 
Log Message:
* Fri Feb 3 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15.1
- Add patch to use LDAP_DEPRICATED compile option. (bz #173833)


autofs-4.1.4-ldap-depricated.patch:
 aclocal.m4          |    6 +--
 configure           |   34 ++++++++++++++------
 configure.in        |    5 +--
 include/config.h.in |   85 +++++++++++++++++++++++++++++++++++++++++-----------
 4 files changed, 97 insertions(+), 33 deletions(-)

--- NEW FILE autofs-4.1.4-ldap-depricated.patch ---

This patch defines the LDAP_DEPRICATED macro to the compile flags.

This prevents a SIGSEGV when using the depricated LDAP calls on x86_64
archictecture. A word of warning - as far as I know this should function
ok with recent versions of openldap but I don't know if it will behave
as expected on older versions, so use with caution.

diff -Nurp autofs-4.1.4.orig/aclocal.m4 autofs-4.1.4/aclocal.m4
--- autofs-4.1.4.orig/aclocal.m4	2003-09-29 16:22:35.000000000 +0800
+++ autofs-4.1.4/aclocal.m4	2006-01-25 11:06:23.000000000 +0800
@@ -9,8 +9,8 @@ dnl ------------------------------------
 AC_DEFUN(AF_PATH_INCLUDE,
 [AC_PATH_PROGS($1,$2,$3,$4)
 if test -n "$$1"; then
-  AC_DEFINE(HAVE_$1)
-  AC_DEFINE_UNQUOTED(PATH_$1, "$$1")
+  AC_DEFINE(HAVE_$1,1,[define if you have $1])
+  AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1])
   HAVE_$1=1
 else
   HAVE_$1=0
@@ -28,7 +28,7 @@ AC_DEFUN(AF_SLOPPY_MOUNT,
 [if test -n "$MOUNT" ; then
   AC_MSG_CHECKING([if mount accepts the -s option])
   if "$MOUNT" -s > /dev/null 2>&1 ; then
-    AC_DEFINE(HAVE_SLOPPY_MOUNT)
+    AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)
diff -Nurp autofs-4.1.4.orig/configure autofs-4.1.4/configure
--- autofs-4.1.4.orig/configure	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/configure	2006-01-25 11:06:41.000000000 +0800
@@ -1359,11 +1359,13 @@ done
 test -n "$MOUNT" || MOUNT="/bin/mount"
 
 if test -n "$MOUNT"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_MOUNT 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_MOUNT "$MOUNT"
 _ACEOF
 
@@ -1418,11 +1420,13 @@ done
 test -n "$UMOUNT" || UMOUNT="/bin/umount"
 
 if test -n "$UMOUNT"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_UMOUNT 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_UMOUNT "$UMOUNT"
 _ACEOF
 
@@ -1476,11 +1480,13 @@ fi
 done
 
 if test -n "$E2FSCK"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_E2FSCK 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_E2FSCK "$E2FSCK"
 _ACEOF
 
@@ -1534,11 +1540,13 @@ fi
 done
 
 if test -n "$E3FSCK"; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_E3FSCK 1
 _ACEOF
 
-  cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define PATH_E3FSCK "$E3FSCK"
 _ACEOF
 
@@ -1556,7 +1564,8 @@ if test -n "$MOUNT" ; then
   echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
 echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6
   if "$MOUNT" -s > /dev/null 2>&1 ; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SLOPPY_MOUNT 1
 _ACEOF
 
@@ -3403,6 +3412,7 @@ if test "${with_openldap+set}" = set; th
 fi;
 if test -z "$HAVE_LDAP"; then
 	HAVE_LDAP=0
+	LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
 	echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
 echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6
 if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then
@@ -4302,7 +4312,8 @@ else
   enableval=yes
 fi;
 if test x$enable_ext_env = xyes; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ENABLE_EXT_ENV 1
 _ACEOF
 
@@ -4319,7 +4330,8 @@ else
   enableval=yes
 fi;
 if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ENABLE_MOUNT_LOCKING 1
 _ACEOF
 
diff -Nurp autofs-4.1.4.orig/configure.in autofs-4.1.4/configure.in
--- autofs-4.1.4.orig/configure.in	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/configure.in	2006-01-25 11:06:23.000000000 +0800
@@ -118,6 +118,7 @@ AC_ARG_WITH(openldap,
 )
 if test -z "$HAVE_LDAP"; then
 	HAVE_LDAP=0
+	LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
 	AC_CHECK_LIB(ldap, ldap_init, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv", ,
 		     -llber -lresolv $LIBS)
 fi
@@ -163,7 +164,7 @@ AC_ARG_ENABLE(ext-env,
 --disable-ext-env          disable search in environment for substitution variable,,
 	enableval=yes)
 if test x$enable_ext_env = xyes; then
-	AC_DEFINE(ENABLE_EXT_ENV, 1)
+	AC_DEFINE(ENABLE_EXT_ENV, 1, [leave this alone])
 fi
 
 #
@@ -173,7 +174,7 @@ AC_ARG_ENABLE(mount-locking,
 --disable-mount-locking          disable use of locking when spawning mount command,,
 	enableval=yes)
 if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
-	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1)
+	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1, [disable mount table locking -- use this if your maps contain recursive mounts -- EXPERIMENTAL])
 fi
 
 #
diff -Nurp autofs-4.1.4.orig/include/config.h.in autofs-4.1.4/include/config.h.in
--- autofs-4.1.4.orig/include/config.h.in	2006-01-25 11:04:56.000000000 +0800
+++ autofs-4.1.4/include/config.h.in	2006-01-25 11:06:43.000000000 +0800
@@ -1,29 +1,80 @@
-#ident "$Id: config.h.in,v 1.4 2004/02/03 15:23:21 raven Exp $"
-/* -*- c -*-
- *
- * config.h.in: Pattern file for autofs to be filled in by configure
- *
- */
+/* include/config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Program paths */
+/* leave this alone */
+#undef ENABLE_EXT_ENV
+
+/* disable mount table locking -- use this if your maps contain recursive
+   mounts -- EXPERIMENTAL */
+#undef ENABLE_MOUNT_LOCKING
+
+/* define if you have E2FSCK */
+#undef HAVE_E2FSCK
+
+/* define if you have E3FSCK */
+#undef HAVE_E3FSCK
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* define if you have MOUNT */
 #undef HAVE_MOUNT
-#undef PATH_MOUNT
 
+/* define if the mount command supports the -s option */
+#undef HAVE_SLOPPY_MOUNT
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* define if you have UMOUNT */
 #undef HAVE_UMOUNT
-#undef PATH_UMOUNT
 
-#undef HAVE_SMBMOUNT
-#undef PATH_SMBMOUNT
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
 
-#undef HAVE_E2FSCK
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* define if you have E2FSCK */
 #undef PATH_E2FSCK
 
-#undef HAVE_E3FSCK
+/* define if you have E3FSCK */
 #undef PATH_E3FSCK
 
-/* Define this option if mount(8) supports the -s (sloppy) option */
-#undef HAVE_SLOPPY_MOUNT
+/* define if you have MOUNT */
+#undef PATH_MOUNT
 
-#undef ENABLE_EXT_ENV
+/* define if you have UMOUNT */
+#undef PATH_UMOUNT
 
-#undef ENABLE_MOUNT_LOCKING
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-4/autofs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- autofs.spec	19 Jan 2006 01:23:50 -0000	1.65
+++ autofs.spec	3 Feb 2006 11:25:30 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 15
+%define release 15.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -33,6 +33,7 @@
 Patch20: autofs-4.1.4-sol10-schema.patch
 Patch21: autofs-4.1.4-sockopt-len-type.patch
 Patch22: autofs-4.1.4-yp_order-order-type.patch
+Patch23: autofs-4.1.4-ldap-depricated.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -94,6 +95,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -147,6 +149,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Feb 3 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15.1
+- Add patch to use LDAP_DEPRICATED compile option. (bz #173833)
+
 * Tue Jan 17 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-15
 - Sync patches with rawhide.
 - Replace deferred syslog patch with reentrant syslog patch.



From fedora-cvs-commits at redhat.com  Fri Feb  3 12:01:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 07:01:31 -0500
Subject: rpms/acl/devel .cvsignore, 1.7, 1.8 acl.spec, 1.22, 1.23 sources,
	1.7, 1.8
Message-ID: <200602031201.k13C1V8J017695@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17670

Modified Files:
	.cvsignore acl.spec sources 
Log Message:
[tw] - new version 2.2.34



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2005 08:31:14 -0000	1.7
+++ .cvsignore	3 Feb 2006 12:01:17 -0000	1.8
@@ -1,3 +1,4 @@
 acl-2.2.23.src.tar.gz
 acl-2.2.31.src.tar.gz
 acl-2.2.32.src.tar.gz
+acl-2.2.34.src.tar.gz


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- acl.spec	9 Dec 2005 22:39:32 -0000	1.22
+++ acl.spec	3 Feb 2006 12:01:17 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Access control list utilities.
 Name: acl
-Version: 2.2.32
-Release: 2.1.1
+Version: 2.2.34
+Release: 1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl-%{version}.src.tar.gz
@@ -10,7 +10,7 @@
 BuildRequires: autoconf, libtool >= 1.5, gettext
 License: GPL
 Group: System Environment/Base
-URL: http://acl.bestbits.at/
+URL: http://oss.sgi.com/projects/xfs/
 
 %description
 This package contains the getfacl and setfacl utilities needed for
@@ -97,6 +97,9 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri Feb  3 2006 Thomas Woerner <twoerner at redhat.com> 2.2.34-1
+- new version 2.2.34
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2005 08:31:14 -0000	1.7
+++ sources	3 Feb 2006 12:01:17 -0000	1.8
@@ -1 +1 @@
-85d2e73c5a3175b96d1d956c52835fe4  acl-2.2.32.src.tar.gz
+50f1c271071048539d25ad67f1e8b375  acl-2.2.34.src.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 12:04:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 07:04:52 -0500
Subject: rpms/attr/devel .cvsignore, 1.7, 1.8 attr.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <200602031204.k13C4qwa017788@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17771

Modified Files:
	.cvsignore attr.spec sources 
Log Message:
[tw] - new version 2.4.28



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Nov 2005 08:33:54 -0000	1.7
+++ .cvsignore	3 Feb 2006 12:04:50 -0000	1.8
@@ -1,3 +1,4 @@
 attr-2.4.16.src.tar.gz
 attr-2.4.23.src.tar.gz
 attr-2.4.24.src.tar.gz
+attr-2.4.28.src.tar.gz


Index: attr.spec
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/attr.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- attr.spec	9 Dec 2005 22:39:41 -0000	1.17
+++ attr.spec	3 Feb 2006 12:04:50 -0000	1.18
@@ -1,16 +1,16 @@
 Summary: Utilities for managing filesystem extended attributes.
 Name: attr
-Version: 2.4.24
-Release: 2.1
+Version: 2.4.28
+Release: 1
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 2.0.0
 BuildRoot: %{_tmppath}/%{name}-root
-Source: http://acl.bestbits.at/current/tar/attr-%{version}.src.tar.gz
+Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/attr-%{version}.src.tar.gz
 Patch1: attr-2.0.8-docperms.patch
 Patch2: attr-2.2.0-multilib.patch
 Patch3: attr-2.4.24-build.patch
 License: GPL
-URL: http://acl.bestbits.at/
+URL: http://oss.sgi.com/projects/xfs/
 Group: System Environment/Base
 BuildRequires: autoconf, libtool >= 1.5, gettext
 
@@ -114,6 +114,9 @@
 /%{_lib}/libattr.so.*
 
 %changelog
+* Fri Feb  3 2006 Thomas Woerner <twoerner at redhat.com> 2.4.28-1
+- new version 2.4.28
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Nov 2005 08:33:54 -0000	1.7
+++ sources	3 Feb 2006 12:04:50 -0000	1.8
@@ -1 +1 @@
-f696ab041e2981183cc507f7b0429207  attr-2.4.24.src.tar.gz
+4fe11d4221199e51f6eeeee37d5dd84c  attr-2.4.28.src.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 12:41:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 07:41:34 -0500
Subject: rpms/pam/devel Linux-PAM-0.99.3.0.tar.bz2.sign, NONE,
	1.1 config-util.5, NONE, 1.1 pam-0.99.3.0-pie.patch, NONE,
	1.1 system-auth.5, NONE, 1.1 .cvsignore, 1.32,
	1.33 pam-0.99.2.1-redhat-modules.patch, 1.1, 1.2 pam.spec,
	1.101, 1.102 sources, 1.34,
	1.35 Linux-PAM-0.99.2.1.tar.bz2.sign, 1.1,
	NONE pam-0.77-succif-netgroup.patch, 1.1,
	NONE pam-0.99.2.1-audit.patch, 1.3,
	NONE pam-0.99.2.1-lastlog-fixes.patch, 1.1,
	NONE pam-0.99.2.1-pie.patch, 1.1, NONE
Message-ID: <200602031241.k13CfYrC011716@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11665

Modified Files:
	.cvsignore pam-0.99.2.1-redhat-modules.patch pam.spec sources 
Added Files:
	Linux-PAM-0.99.3.0.tar.bz2.sign config-util.5 
	pam-0.99.3.0-pie.patch system-auth.5 
Removed Files:
	Linux-PAM-0.99.2.1.tar.bz2.sign pam-0.77-succif-netgroup.patch 
	pam-0.99.2.1-audit.patch pam-0.99.2.1-lastlog-fixes.patch 
	pam-0.99.2.1-pie.patch 
Log Message:
* Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-1
- new upstream version
- updated db4 to 4.3.29
- added module pam_tally2 with auditing support
- added manual pages for system-auth and config-util (#179584)



--- NEW FILE Linux-PAM-0.99.3.0.tar.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDyPSsyGugalF9Dw4RAoc/AJ4rXku5zUxCIfHcy4QObqqVRdHNeQCfZCaB
3nMwvnZwvOBZhKKQ/JuOZM0=
=35pk
-----END PGP SIGNATURE-----


--- NEW FILE config-util.5 ---
.TH SYSTEM-AUTH 5 "2006 Feb 3" "Red Hat" "Linux-PAM Manual"
.SH NAME

config-util \- Common PAM configuration file for configuration utilities

.SH SYNOPSIS
.B /etc/pam.d/config-util
.sp 2
.SH DESCRIPTION

The purpose of this configuration file is to provide common 
configuration file for all configuration utilities which must be run
from the supervisor account and use the userhelper wrapper application.

.sp
The
.BR config-util
configuration file is included from all individual configuration
files of such utilities with the help of the
.BR include
directive.
There are not usually any other modules in the individual configuration
files of these utilities.

.sp
It is possible for example to modify duration of the validity of the 
authentication timestamp there. See
.BR pam_timestamp(8)
for details.

.SH BUGS
.sp 2
None known.

.SH "SEE ALSO"
pam(8), config-util(5), pam_timestamp(8)

pam-0.99.3.0-pie.patch:
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE pam-0.99.3.0-pie.patch ---
--- Linux-PAM-0.99.2.1/modules/pam_timestamp/Makefile.am.pie	2005-12-15 13:16:14.000000000 +0100
+++ Linux-PAM-0.99.2.1/modules/pam_timestamp/Makefile.am	2005-12-15 14:20:52.000000000 +0100
@@ -29,6 +29,8 @@
 pam_timestamp_la_CFLAGS = $(AM_CFLAGS)
 
 pam_timestamp_check_SOURCES = pam_timestamp_check.c hmacsha1.c sha1.c hmacsha1.h
+pam_timestamp_check_CFLAGS = $(AM_CFLAGS) -fPIE
+pam_timestamp_check_LDFLAGS = -pie
 
 hmacfile_SOURCES = hmacfile.c hmacsha1.c sha1.c hmacsha1.h
 


--- NEW FILE system-auth.5 ---
.TH SYSTEM-AUTH 5 "2006 Feb 3" "Red Hat" "Linux-PAM Manual"
.SH NAME

system-auth \- Common configuration file for PAMified services

.SH SYNOPSIS
.B /etc/pam.d/system-auth
.sp 2
.SH DESCRIPTION

The purpose of this configuration file is to provide common 
configuration file for all applications and service daemons
calling PAM library.

.sp
The
.BR system-auth
configuration file is included from all individual service configuration
files with the help of the
.BR include
directive.

.SH NOTES
There should be no
.BR sufficient
modules in the
.BR session
part of
.BR system-auth
file because individual services may add session modules after
.BR include
of the
.BR system-auth
file. Execution of these modules would be skipped if there were sufficient
modules in
.BR system-auth
file.

.sp
Conversely there should not be any modules after
.BR include
directive in the individual service files in
.BR auth account
and
.BR password
sections otherwise they could be bypassed.

.SH BUGS
.sp 2
None known.

.SH "SEE ALSO"
pam(8), config-util(5)

The three
.BR Linux-PAM
Guides, for
.BR "system administrators" ", "
.BR "module developers" ", "
and
.BR "application developers" ". "


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	3 Jan 2006 16:23:10 -0000	1.32
+++ .cvsignore	3 Feb 2006 12:41:29 -0000	1.33
@@ -1,3 +1,3 @@
-db-4.3.27.tar.gz
-Linux-PAM-0.99.2.1.tar.bz2
-pam-redhat-0.99.2-1.tar.bz2
+Linux-PAM-0.99.3.0.tar.bz2
+db-4.3.29.tar.gz
+pam-redhat-0.99.3-1.tar.bz2

pam-0.99.2.1-redhat-modules.patch:
 configure.in        |    4 ++++
 libpam/libpam.map   |   11 +++++++++++
 modules/Makefile.am |    4 +++-
 3 files changed, 18 insertions(+), 1 deletion(-)

Index: pam-0.99.2.1-redhat-modules.patch
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam-0.99.2.1-redhat-modules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.2.1-redhat-modules.patch	15 Dec 2005 23:47:42 -0000	1.1
+++ pam-0.99.2.1-redhat-modules.patch	3 Feb 2006 12:41:29 -0000	1.2
@@ -12,7 +12,7 @@
 +	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_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 \
@@ -30,7 +30,7 @@
 -	pam_wheel pam_xauth
 +	pam_wheel pam_xauth \
 +	pam_chroot pam_console pam_loginuid pam_postgresok pam_rps \
-+	pam_stack pam_timestamp
++	pam_stack pam_timestamp pam_tally2
  
  
  CLEANFILES = *~


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- pam.spec	3 Jan 2006 16:23:10 -0000	1.101
+++ pam.spec	3 Feb 2006 12:41:29 -0000	1.102
@@ -4,14 +4,14 @@
 %define _sysconfdir /etc
 
 %define pwdb_version 0.62
-%define db_version 4.3.27
+%define db_version 4.3.29
 %define db_conflicting_version 4.4.0
-%define pam_redhat_version 0.99.2-1
+%define pam_redhat_version 0.99.3-1
 
 Summary: A security tool which provides authentication for applications.
 Name: pam
-Version: 0.99.2.1
-Release: 3
+Version: 0.99.3.0
+Release: 1
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -22,16 +22,15 @@
 Source6: system-auth.pamd
 Source7: config-util.pamd
 Source8: dlopen.sh
+Source9: system-auth.5
+Source10: config-util.5
 Patch1: pam-0.99.2.1-redhat-modules.patch
 Patch21: pam-0.78-unix-hpux-aging.patch
 Patch28: pam-0.75-sgml2latex.patch
 Patch34: pam-0.99.2.1-dbpam.patch
-Patch65: pam-0.99.2.1-audit.patch
 Patch70: pam-0.99.2.1-selinux-nofail.patch
-Patch72: pam-0.99.2.1-pie.patch
+Patch72: pam-0.99.3.0-pie.patch
 Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
-Patch83: pam-0.77-succif-netgroup.patch
-Patch84: pam-0.99.2.1-lastlog-fixes.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -84,14 +83,9 @@
 %patch21 -p1 -b .unix-hpux-aging
 %patch28 -p1 -b .doc
 %patch34 -p1 -b .dbpam
-%if %{WITH_AUDIT}
-%patch65 -p1 -b .audit
-%endif
 %patch70 -p1 -b .nofail
 %patch72 -p1 -b .pie
 %patch80 -p1 -b .drop-multiple
-%patch83 -p1 -b .succif-netgroup
-%patch84 -p0 -b .lastlog-fixes
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -155,9 +149,7 @@
 rm doc/*/*pam_pwdb*
 
 # Install man pages.
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man{3,5,8}
-install -m 644 doc/man/*.3 $RPM_BUILD_ROOT%{_mandir}/man3/
-install -m 644 doc/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -m 644 %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man5/
 
 # Remove pam_pwdb so it won't error out
 rm -rf modules/pam_pwdb
@@ -279,6 +271,7 @@
 /%{_lib}/libpam_misc.so.*
 %{_sbindir}/pam_console_apply
 %{_sbindir}/pam_tally
+%{_sbindir}/pam_tally2
 %attr(4755,root,root) %{_sbindir}/pam_timestamp_check
 %attr(4755,root,root) %{_sbindir}/unix_chkpwd
 %if %{_lib} != lib
@@ -318,6 +311,7 @@
 /%{_lib}/security/pam_stress.so
 /%{_lib}/security/pam_succeed_if.so
 /%{_lib}/security/pam_tally.so
+/%{_lib}/security/pam_tally2.so
 /%{_lib}/security/pam_time.so
 /%{_lib}/security/pam_timestamp.so
 /%{_lib}/security/pam_umask.so
@@ -357,6 +351,12 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-1
+- new upstream version
+- updated db4 to 4.3.29
+- added module pam_tally2 with auditing support
+- added manual pages for system-auth and config-util (#179584)
+
 * Tue Jan  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.2.1-3
 - remove 'initscripts' dependency (#176508)
 - update pam-redhat modules, merged patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	3 Jan 2006 16:23:10 -0000	1.34
+++ sources	3 Feb 2006 12:41:29 -0000	1.35
@@ -1,3 +1,3 @@
-fcc481d52c3b80e20a328f8c0cb042bd  db-4.3.27.tar.gz
-9e564161c3a5f36bf0678ef227b2a897  Linux-PAM-0.99.2.1.tar.bz2
-6feaf6d9f735ced6372c892db71e27a1  pam-redhat-0.99.2-1.tar.bz2
+aabed0543f57dc3e4eebbb0779daf898  Linux-PAM-0.99.3.0.tar.bz2
+13585a20ce32f113b8e8cdb57f52e3bb  db-4.3.29.tar.gz
+d1a3f1190c8c9b7ce3cf27660f59a2ab  pam-redhat-0.99.3-1.tar.bz2


--- Linux-PAM-0.99.2.1.tar.bz2.sign DELETED ---


--- pam-0.77-succif-netgroup.patch DELETED ---


--- pam-0.99.2.1-audit.patch DELETED ---


--- pam-0.99.2.1-lastlog-fixes.patch DELETED ---


--- pam-0.99.2.1-pie.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 12:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 07:50:37 -0500
Subject: rpms/alsa-lib/devel alsa-lib-1.0.11-ainit-start.patch, NONE,
	1.1 alsa-lib.spec, 1.40, 1.41
Message-ID: <200602031250.k13CobNu028188@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.11-ainit-start.patch 
Log Message:
fix for #179446 - don't remove old SHM memory/keys during login

alsa-lib-1.0.11-ainit-start.patch:
 ainit.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE alsa-lib-1.0.11-ainit-start.patch ---
--- alsa-lib-1.0.11rc2/ainit/src/ainit.c.old	2006-01-13 16:36:37.000000000 +0100
+++ alsa-lib-1.0.11rc2/ainit/src/ainit.c	2006-02-03 10:56:56.000000000 +0100
@@ -354,7 +354,7 @@
 
 /* Parse a target file, free mem/semaphores and delete it
 */
-static int process_template_back(CNF * p_cnf, FILE * file_config, int num)
+static int process_template_back(CNF * p_cnf, FILE * file_config, int num, int start)
 {
   char target_back[FILE_LEN];
   char target[FILE_LEN];
@@ -402,7 +402,8 @@
   /* Removing target file
    */
   if ((f_in = fopen(target, "r")) != NULL) {
-    parse_file_back(f_in);
+    if(!start)
+      parse_file_back(f_in);
     fclose(f_in);
     remove(target);
   }
@@ -426,7 +427,7 @@
 /* Remove a config files (if ainit is runnig with the 'stop' 
    command line parameter)
 */
-static void remove_alsa_config(CNF * p_cnf)
+static void remove_alsa_config(CNF * p_cnf, int start)
 {
   FILE *f;
   int i;
@@ -439,7 +440,7 @@
   }
 
   for (i = 0; i < TEMPLATENUM; i++) {
-    process_template_back(p_cnf, f, i);
+    process_template_back(p_cnf, f, i, start);
   }
 
   fclose(f);
@@ -483,12 +484,12 @@
   load_and_set_config(&cnf, argv[1]);
 
   if (is_token(argv[2], PARAM_START)) {
-    remove_alsa_config(&cnf);
+    remove_alsa_config(&cnf, TRUE);
     if(cnf.enable)
       create_alsa_config(&cnf);
   }
   else if (is_token(argv[2], PARAM_STOP)) {
-    remove_alsa_config(&cnf);
+    remove_alsa_config(&cnf, FALSE);
   }
   else {
     bad_param(argv[0], argv[2]);


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- alsa-lib.spec	13 Jan 2006 15:52:56 -0000	1.40
+++ alsa-lib.spec	3 Feb 2006 12:50:35 -0000	1.41
@@ -5,13 +5,14 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 2.rc2
+Release: 3.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
 Patch1:  alsa-lib-1.0.11-group.patch
+Patch2:  alsa-lib-1.0.11-ainit-start.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -41,6 +42,7 @@
 %setup -q -n %{name}-%{version_main}%{?prever} -a 1
 %patch0 -p1 -b .ainit
 %patch1 -p1 -b .group
+%patch2 -p1 -b .start
 
 %build
 %configure \
@@ -147,6 +149,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri Feb 3 2006 Martin Stransky <stransky at redhat.com> 1.0.11-3.rc2
+- fix for #179446 - don't remove old SHM memory/keys during login
+
 * Fri Jan 13 2006 Martin Stransky <stransky at redhat.com> 1.0.11-2.rc2
 - fix for #169729 - Kernel update makes snd-atiixp-modem & slmodemd fail
 - new ainit (0.7) should fix some problems with root users



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:18:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:18:06 -0500
Subject: rpms/mc/devel mc.spec, 1.77, 1.78 sources, 1.28,
	1.29 mc-bracket.patch, 1.1, NONE
Message-ID: <200602031318.k13DI6pH018087@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17699

Modified Files:
	mc.spec sources 
Removed Files:
	mc-bracket.patch 
Log Message:
- new upstream tarball to fix trivial source bug in the former one



Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- mc.spec	1 Feb 2006 15:10:24 -0000	1.77
+++ mc.spec	3 Feb 2006 13:18:04 -0000	1.78
@@ -23,7 +23,6 @@
 Patch9:		mc-showfree.patch
 Patch10:	mc-cedit.patch
 Patch11:	mc-delcheck.patch
-Patch12:	mc-bracket.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -47,7 +46,6 @@
 %patch9 -p1 -b .showfree
 %patch10 -p1 -b .cedit
 %patch11 -p1 -b .delcheck
-%patch12 -p1 -b .bracket
 
 # convert files in /lib to UTF-8
 pushd lib


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Feb 2006 15:43:27 -0000	1.28
+++ sources	3 Feb 2006 13:18:04 -0000	1.29
@@ -1 +1 @@
-137731f23c8aee7d76d80eaedde45914  mc-4.6.1a.tar.bz2
+137ebb38714a6810bae5f33209e31a67  mc-4.6.1a.tar.bz2


--- mc-bracket.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:28:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:28:25 -0500
Subject: rpms/xorg-x11-drv-apm/devel apm.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-apm.spec, 1.7, 1.8
Message-ID: <200602031328.k13DSPcQ022877@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-apm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22832/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-apm.spec 
Added Files:
	apm.xinf 
Log Message:
auto-import xorg-x11-drv-apm-1.0.1.5-1 on branch devel from xorg-x11-drv-apm-1.0.1.5-1.src.rpm


--- NEW FILE apm.xinf ---
alias pcivideo:v00001142d0000643Dsv*sd*bc*sc*i* apm
alias pcivideo:v00005301d00000001sv*sd*bc*sc*i* apm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:37:08 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:28:23 -0000	1.6
@@ -1 +1 @@
-xf86-video-apm-1.0.1.4.tar.bz2
+xf86-video-apm-1.0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-apm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:37:08 -0000	1.5
+++ sources	3 Feb 2006 13:28:23 -0000	1.6
@@ -1 +1 @@
-4ce3f58af02971505c975b2920a17a26  xf86-video-apm-1.0.1.4.tar.bz2
+98ad4f6eeb934255bb9ff06ba459484d  xf86-video-apm-1.0.1.5.tar.bz2


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-apm.spec	24 Dec 2005 03:37:08 -0000	1.7
+++ xorg-x11-drv-apm.spec	3 Feb 2006 13:28:23 -0000	1.8
@@ -1,22 +1,16 @@
 %define tarball xf86-video-apm
-# 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 apm video driver
 Name:      xorg-x11-drv-apm
-Version: 1.0.1.4
+Version: 1.0.1.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 apm video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,15 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/apm_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/apm.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/apm.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-1
+- Updated xorg-x11-drv-apm to version 1.0.1.5 from X11R7.0
+- Added apm.xinf videoalias file.
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.4-1
 - Updated xorg-x11-drv-apm to version 1.0.1.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +71,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
 - Updated xorg-x11-drv-apm to version 1.0.1.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Set "ExclusiveArch: %%{ix86}" to match what was shipped in previous OS
   releases.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:28:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:28:39 -0500
Subject: rpms/xorg-x11-drv-ark/devel ark.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-ark.spec, 1.6, 1.7
Message-ID: <200602031328.k13DSdtF023055@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23014/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-ark.spec 
Added Files:
	ark.xinf 
Log Message:
auto-import xorg-x11-drv-ark-0.5.0.5-1 on branch devel from xorg-x11-drv-ark-0.5.0.5-1.src.rpm


--- NEW FILE ark.xinf ---


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:37:21 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:28:37 -0000	1.6
@@ -1 +1 @@
-xf86-video-ark-0.5.0.4.tar.bz2
+xf86-video-ark-0.5.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ark/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:37:21 -0000	1.5
+++ sources	3 Feb 2006 13:28:37 -0000	1.6
@@ -1 +1 @@
-2db4668622eb3f1f639140dbeef5ca79  xf86-video-ark-0.5.0.4.tar.bz2
+474d41eea807a863c0cde045313af27f  xf86-video-ark-0.5.0.5.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-ark.spec	24 Dec 2005 03:37:21 -0000	1.6
+++ xorg-x11-drv-ark.spec	3 Feb 2006 13:28:37 -0000	1.7
@@ -1,22 +1,16 @@
 %define tarball xf86-video-ark
-# 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 ark video driver
 Name:      xorg-x11-drv-ark
-Version: 0.5.0.4
-Release: 1
+Version:   0.5.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 ark video driver.
 
@@ -39,14 +34,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,15 +51,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/ark_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
+%{_datadir}/hwdata/videoaliases/ark.xinf
+#%dir %{_mandir}/man4x
 #%{_mandir}/man4/*.4x*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.5.0.5-1
+- Updated xorg-x11-drv-ark to version 0.5.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.5.0.4-1
 - Updated xorg-x11-drv-ark to version 0.5.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -75,6 +69,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.5.0.1-1
 - Updated xorg-x11-drv-ark to version 0.5.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 0.5.0-1
 - Set "ExclusiveArch: %{ix86}" to limit drivers to what is sensible on each
   architecture.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:28:54 -0500
Subject: rpms/xorg-x11-drv-ati/devel ati.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-ati.spec, 1.7, 1.8
Message-ID: <200602031328.k13DSsii023232@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23194/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Added Files:
	ati.xinf 
Log Message:
auto-import xorg-x11-drv-ati-6.5.7.3-1 on branch devel from xorg-x11-drv-ati-6.5.7.3-1.src.rpm


--- NEW FILE ati.xinf ---
alias pcivideo:v00001002d00004158sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004354sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004358sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004554sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004654sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004742sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004744sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004747sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004749sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d0000474Csv*sd*bc*sc*i* ati
alias pcivideo:v00001002d0000474Dsv*sd*bc*sc*i* ati
alias pcivideo:v00001002d0000474Esv*sd*bc*sc*i* ati
alias pcivideo:v00001002d0000474Fsv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004750sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004751sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004752sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004753sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004754sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004755sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004756sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004757sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004758sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004759sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d0000475Asv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C42sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C44sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C47sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C49sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C4Dsv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C4Esv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C50sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C51sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C52sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C53sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00004C54sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00005354sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00005654sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00005655sv*sd*bc*sc*i* ati
alias pcivideo:v00001002d00005656sv*sd*bc*sc*i* ati


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:37:47 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:28:51 -0000	1.6
@@ -1 +1 @@
-xf86-video-ati-6.5.7.2.tar.bz2
+xf86-video-ati-6.5.7.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:37:47 -0000	1.5
+++ sources	3 Feb 2006 13:28:51 -0000	1.6
@@ -1 +1 @@
-df8bc10377781fce78274fc58fbf8367  xf86-video-ati-6.5.7.2.tar.bz2
+a87420414681c53681a330b55ffb04ea  xf86-video-ati-6.5.7.3.tar.bz2


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-ati.spec	24 Dec 2005 03:37:47 -0000	1.7
+++ xorg-x11-drv-ati.spec	3 Feb 2006 13:28:51 -0000	1.8
@@ -1,14 +1,10 @@
 %define tarball xf86-video-ati
-# 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
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha
 %define with_dri	1
 %else
 %define with_dri	0
@@ -16,13 +12,11 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version: 6.5.7.2
-Release: 1
+Version:   6.5.7.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
 Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source1:   ati.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +30,7 @@
 %endif
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 ati video driver.
 
@@ -48,14 +43,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # INFO: We don't want to ship the libtool archives (*.la) from modules
 # directory, as they serve no useful purpose.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,15 +64,21 @@
 %{driverdir}/atimisc_drv.so
 %{driverdir}/r128_drv.so
 %{driverdir}/radeon_drv.so
+%{_datadir}/hwdata/videoaliases/ati.xinf
 %dir %{moduledir}/multimedia
 %{moduledir}/multimedia/theatre200_drv.so
 %{moduledir}/multimedia/theatre_detect_drv.so
 %{moduledir}/multimedia/theatre_drv.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/ati.4*
+%{_mandir}/man4/r128.4*
+%{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-1
+- Updated xorg-x11-drv-ati to version 6.5.7.3 from X11R7.0
+- Added ati.xinf videoalias file for hardware autodetection.
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 6.5.7.2-1
 - Updated xorg-x11-drv-ati to version 6.5.7.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:29:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:29:10 -0500
Subject: rpms/xorg-x11-drv-chips/devel chips.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-chips.spec, 1.5, 1.6
Message-ID: <200602031329.k13DTAG6023430@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-chips/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23379/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-chips.spec 
Added Files:
	chips.xinf 
Log Message:
auto-import xorg-x11-drv-chips-1.0.1.3-1 on branch devel from xorg-x11-drv-chips-1.0.1.3-1.src.rpm


--- NEW FILE chips.xinf ---
alias pcivideo:v0000102Cd000000B8sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000C0sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000D0sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000D8sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000DCsv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000E0sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000E4sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000E5sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000F0sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd000000F4sv*sd*bc*sc*i* chips
alias pcivideo:v0000102Cd00000C30sv*sd*bc*sc*i* chips


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:38:19 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:29:06 -0000	1.6
@@ -1 +1 @@
-xf86-video-chips-1.0.1.2.tar.bz2
+xf86-video-chips-1.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-chips/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:38:19 -0000	1.5
+++ sources	3 Feb 2006 13:29:06 -0000	1.6
@@ -1 +1 @@
-e8780634c0a7ea6a9ae3a60175c41e7d  xf86-video-chips-1.0.1.2.tar.bz2
+61c5d3fcc170788a6b95473c532e55db  xf86-video-chips-1.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-chips.spec	24 Dec 2005 03:38:19 -0000	1.5
+++ xorg-x11-drv-chips.spec	3 Feb 2006 13:29:06 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-chips
-# 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 chips video driver
 Name:      xorg-x11-drv-chips
-Version: 1.0.1.2
+Version: 1.0.1.3
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/everything/%{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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 chips video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/chips_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/chips.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/chips.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-1
+- Updated xorg-x11-drv-chips to version 1.0.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-chips to version 1.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-chips to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:29:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:29:24 -0500
Subject: rpms/xorg-x11-drv-cirrus/devel cirrus.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-cirrus.spec, 1.6, 1.7
Message-ID: <200602031329.k13DTO3c023609@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-cirrus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23571/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-cirrus.spec 
Added Files:
	cirrus.xinf 
Log Message:
auto-import xorg-x11-drv-cirrus-1.0.0.5-1 on branch devel from xorg-x11-drv-cirrus-1.0.0.5-1.src.rpm


--- NEW FILE cirrus.xinf ---
alias pcivideo:v00001013d000000A0sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000A2sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000A4sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000A8sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000ACsv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000B0sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000B8sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000BCsv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000D0sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000D2sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000D4sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000D5sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000D6sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001013d000000E8sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001092d000000A0sv*sd*bc*sc*i* cirrus
alias pcivideo:v00001092d000000A8sv*sd*bc*sc*i* cirrus
alias pcivideo:v000010A8d00000000sv*sd*bc*sc*i* cirrus


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:38:41 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:29:22 -0000	1.6
@@ -1 +1 @@
-xf86-video-cirrus-1.0.0.4.tar.bz2
+xf86-video-cirrus-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cirrus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:38:41 -0000	1.5
+++ sources	3 Feb 2006 13:29:22 -0000	1.6
@@ -1 +1 @@
-b1d8b637c7847bd6cd05f1c5161e39aa  xf86-video-cirrus-1.0.0.4.tar.bz2
+fba6807fb95b5f1a397429b5e3e3276e  xf86-video-cirrus-1.0.0.5.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-cirrus.spec	24 Dec 2005 03:38:41 -0000	1.6
+++ xorg-x11-drv-cirrus.spec	3 Feb 2006 13:29:22 -0000	1.7
@@ -1,22 +1,16 @@
 %define tarball xf86-video-cirrus
-# 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 cirrus video driver
 Name:      xorg-x11-drv-cirrus
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 cirrus video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,14 +54,14 @@
 %{driverdir}/cirrus_drv.so
 %{driverdir}/cirrus_alpine.so
 %{driverdir}/cirrus_laguna.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/cirrus.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/cirrus.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-cirrus to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-cirrus to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -77,6 +73,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-cirrus to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:29:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:29:40 -0500
Subject: rpms/xorg-x11-drv-cyrix/devel cyrix.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-cyrix.spec, 1.5, 1.6
Message-ID: <200602031329.k13DTdxx023783@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-cyrix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23744/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-cyrix.spec 
Added Files:
	cyrix.xinf 
Log Message:
auto-import xorg-x11-drv-cyrix-1.0.0.5-1 on branch devel from xorg-x11-drv-cyrix-1.0.0.5-1.src.rpm


--- NEW FILE cyrix.xinf ---
alias pcivideo:v00001078d00000000sv*sd*bc*sc*i* cyrix
alias pcivideo:v00001078d00000104sv*sd*bc*sc*i* cyrix


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:39:14 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:29:36 -0000	1.6
@@ -1 +1 @@
-xf86-video-cyrix-1.0.0.4.tar.bz2
+xf86-video-cyrix-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-cyrix/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:39:14 -0000	1.5
+++ sources	3 Feb 2006 13:29:36 -0000	1.6
@@ -1 +1 @@
-1788557a2a2f00ab7f3a320b715d784c  xf86-video-cyrix-1.0.0.4.tar.bz2
+edfe947eef0d1d18b66372b3ae5cfad0  xf86-video-cyrix-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-cyrix.spec	24 Dec 2005 03:39:14 -0000	1.5
+++ xorg-x11-drv-cyrix.spec	3 Feb 2006 13:29:36 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-cyrix
-# 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 cyrix video driver
 Name:      xorg-x11-drv-cyrix
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 cyrix video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/cyrix_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/cyrix.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/cyrix.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-cyrix to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-cyrix to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-cyrix to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:29:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:29:52 -0500
Subject: rpms/xorg-x11-drv-dummy/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-dummy.spec, 1.5, 1.6
Message-ID: <200602031329.k13DTqM1023954@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-dummy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23915/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-dummy.spec 
Log Message:
auto-import xorg-x11-drv-dummy-0.1.0.5-1 on branch devel from xorg-x11-drv-dummy-0.1.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:40:01 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:29:49 -0000	1.6
@@ -1 +1 @@
-xf86-video-dummy-0.1.0.4.tar.bz2
+xf86-video-dummy-0.1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-dummy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:40:01 -0000	1.5
+++ sources	3 Feb 2006 13:29:49 -0000	1.6
@@ -1 +1 @@
-8910ad7b1c90a0a01f4f0a0ef8c19a87  xf86-video-dummy-0.1.0.4.tar.bz2
+d0f573e3dfc844b6c8ed658ce892a194  xf86-video-dummy-0.1.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-dummy.spec	24 Dec 2005 03:40:01 -0000	1.5
+++ xorg-x11-drv-dummy.spec	3 Feb 2006 13:29:49 -0000	1.6
@@ -1,22 +1,15 @@
 %define tarball xf86-video-dummy
-# 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 dummy video driver
 Name:      xorg-x11-drv-dummy
-Version: 0.1.0.4
-Release: 1
+Version:   0.1.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -27,6 +20,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 dummy video driver.
 
@@ -39,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,15 +48,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/dummy_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/dummy.4x*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.0.5-1
+- Updated xorg-x11-drv-dummy to version 0.1.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.1.0.4-1
 - Updated xorg-x11-drv-dummy to version 0.1.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -75,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.1.0.1-1
 - Updated xorg-x11-drv-dummy to version 0.1.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:30:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:30:18 -0500
Subject: rpms/xorg-x11-drv-fbdev/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-fbdev.spec, 1.5, 1.6
Message-ID: <200602031330.k13DUI1S024143@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-fbdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24102/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-fbdev.spec 
Log Message:
auto-import xorg-x11-drv-fbdev-0.1.0.5-1 on branch devel from xorg-x11-drv-fbdev-0.1.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:41:24 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:30:16 -0000	1.6
@@ -1 +1 @@
-xf86-video-fbdev-0.1.0.4.tar.bz2
+xf86-video-fbdev-0.1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:41:24 -0000	1.5
+++ sources	3 Feb 2006 13:30:16 -0000	1.6
@@ -1 +1 @@
-daa7c6fd54aa10ae781a2390f2970d2a  xf86-video-fbdev-0.1.0.4.tar.bz2
+cb02495cfdb84b8c4f4dbbd0702890eb  xf86-video-fbdev-0.1.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-fbdev.spec	24 Dec 2005 03:41:24 -0000	1.5
+++ xorg-x11-drv-fbdev.spec	3 Feb 2006 13:30:16 -0000	1.6
@@ -1,22 +1,15 @@
 %define tarball xf86-video-fbdev
-# 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 fbdev video driver
 Name:      xorg-x11-drv-fbdev
-Version: 0.1.0.4
-Release: 1
+Version:   0.1.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -27,6 +20,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 fbdev video driver.
 
@@ -39,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +48,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/fbdev_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/fbdev.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.0.5-1
+- Updated xorg-x11-drv-fbdev to version 0.1.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.1.0.4-1
 - Updated xorg-x11-drv-fbdev to version 0.1.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.1.0.1-1
 - Updated xorg-x11-drv-fbdev to version 0.1.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 0.1.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:31:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:31:09 -0500
Subject: rpms/xorg-x11-drv-glint/devel glint.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-glint.spec, 1.5, 1.6
Message-ID: <200602031331.k13DV9AA024292@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-glint/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24268/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-glint.spec 
Added Files:
	glint.xinf 
Log Message:
auto-import xorg-x11-drv-glint-1.0.1.3-1 on branch devel from xorg-x11-drv-glint-1.0.1.3-1.src.rpm


--- NEW FILE glint.xinf ---
alias pcivideo:v0000104Cd00003D07sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000002sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000004sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000005sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000006sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000009sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd0000000Asv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00000100sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00001004sv*sd*bc*sc*i* glint
alias pcivideo:v00003D3Dd00003D04sv*sd*bc*sc*i* glint


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:41:46 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:31:03 -0000	1.6
@@ -1 +1 @@
-xf86-video-glint-1.0.1.2.tar.bz2
+xf86-video-glint-1.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-glint/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:41:46 -0000	1.5
+++ sources	3 Feb 2006 13:31:03 -0000	1.6
@@ -1 +1 @@
-7b67cd69ab5b826c660763f150f3ccde  xf86-video-glint-1.0.1.2.tar.bz2
+f819ae656c217929c46f2ac994aac4b2  xf86-video-glint-1.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-glint.spec	24 Dec 2005 03:41:46 -0000	1.5
+++ xorg-x11-drv-glint.spec	3 Feb 2006 13:31:03 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-glint
-# 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 glint video driver
 Name:      xorg-x11-drv-glint
-Version: 1.0.1.2
-Release: 1
+Version:   1.0.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 glint video driver.
 
@@ -39,14 +34,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +49,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/glint_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/glint.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-1
+- Updated xorg-x11-drv-glint to version 1.0.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-glint to version 1.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +66,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-glint to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:32:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:32:16 -0500
Subject: rpms/xorg-x11-drv-i128/devel i128.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-i128.spec, 1.5, 1.6
Message-ID: <200602031332.k13DWGDm024486@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i128/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24453/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-i128.spec 
Added Files:
	i128.xinf 
Log Message:
auto-import xorg-x11-drv-i128-1.1.0.5-1 on branch devel from xorg-x11-drv-i128-1.1.0.5-1.src.rpm


--- NEW FILE i128.xinf ---
alias pcivideo:v0000105Dd00002309sv*sd*bc*sc*i* i128
alias pcivideo:v0000105Dd00002339sv*sd*bc*sc*i* i128
alias pcivideo:v0000105Dd0000493Dsv*sd*bc*sc*i* i128
alias pcivideo:v0000105Dd00005348sv*sd*bc*sc*i* i128


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:42:10 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:32:13 -0000	1.6
@@ -1 +1 @@
-xf86-video-i128-1.1.0.4.tar.bz2
+xf86-video-i128-1.1.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i128/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:42:10 -0000	1.5
+++ sources	3 Feb 2006 13:32:13 -0000	1.6
@@ -1 +1 @@
-19a610393de28d0ad0f7058552b1e0f4  xf86-video-i128-1.1.0.4.tar.bz2
+6e0d3e09fc99d6f0a0e969613ddf58cc  xf86-video-i128-1.1.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-i128.spec	24 Dec 2005 03:42:10 -0000	1.5
+++ xorg-x11-drv-i128.spec	3 Feb 2006 13:32:13 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-i128
-# 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 i128 video driver
 Name:      xorg-x11-drv-i128
-Version: 1.1.0.4
-Release: 1
+Version:   1.1.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -40,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i128_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/i128.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/i128.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.1.0.5-1
+- Updated xorg-x11-drv-i128 to version 1.1.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.1.0.4-1
 - Updated xorg-x11-drv-i128 to version 1.1.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -75,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.1.0.1-1
 - Updated xorg-x11-drv-i128 to version 1.1.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:33:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:33:20 -0500
Subject: rpms/xorg-x11-drv-i740/devel i740.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-i740.spec, 1.5, 1.6
Message-ID: <200602031333.k13DXKUk024673@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i740/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24643/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-i740.spec 
Added Files:
	i740.xinf 
Log Message:
auto-import xorg-x11-drv-i740-1.0.0.5-1 on branch devel from xorg-x11-drv-i740-1.0.0.5-1.src.rpm


--- NEW FILE i740.xinf ---
alias pcivideo:v00008086d00007800sv*sd*bc*sc*i* i740


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:42:23 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:33:05 -0000	1.6
@@ -1 +1 @@
-xf86-video-i740-1.0.0.4.tar.bz2
+xf86-video-i740-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i740/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:42:23 -0000	1.5
+++ sources	3 Feb 2006 13:33:05 -0000	1.6
@@ -1 +1 @@
-1b6658e8f95f55651f8fe67d924162a0  xf86-video-i740-1.0.0.4.tar.bz2
+f8d150297da26db8011b3e3ba86667b0  xf86-video-i740-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-i740.spec	24 Dec 2005 03:42:23 -0000	1.5
+++ xorg-x11-drv-i740.spec	3 Feb 2006 13:33:05 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-i740
-# 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 i740 video driver
 Name:      xorg-x11-drv-i740
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 i740 video driver.
 
@@ -39,14 +34,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +49,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i740_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/i740.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-i740 to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-i740 to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +66,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-i740 to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:33:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:33:59 -0500
Subject: rpms/xorg-x11-drv-ati/devel r128.xinf, NONE, 1.1 radeon.xinf, NONE,
	1.1 xorg-x11-drv-ati.spec, 1.8, 1.9
Message-ID: <200602031333.k13DXxLq024838@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24812

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	r128.xinf radeon.xinf 
Log Message:
* Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-2
- Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).
- Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)



--- NEW FILE r128.xinf ---
alias pcivideo:v00001002d00004C45sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00004C46sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00004D46sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00004D4Csv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005041sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005042sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005043sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005044sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005045sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005046sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005047sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005048sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005049sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Asv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Bsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Csv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Dsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Esv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000504Fsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005050sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005051sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005052sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005053sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005054sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005055sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005056sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005057sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005058sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005245sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005246sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005247sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000524Bsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000524Csv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005345sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005346sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005347sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005348sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000534Bsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000534Csv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000534Dsv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000534Esv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005446sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d0000544Csv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005452sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005453sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005454sv*sd*bc*sc*i* r128
alias pcivideo:v00001002d00005455sv*sd*bc*sc*i* r128


--- NEW FILE radeon.xinf ---
alias pcivideo:v00001002d00003150sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00003154sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00003E50sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00003E54sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004136sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004137sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004144sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004145sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004146sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004147sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004148sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004149sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000414Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000414Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004150sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004151sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004152sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004153sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004154sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004155sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004156sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004157sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004237sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004242sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004243sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004336sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004337sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004437sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004964sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004965sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004966sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004967sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A48sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A49sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A4Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A4Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A4Csv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A4Dsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A4Esv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004A50sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C57sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C58sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C59sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C5Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C64sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C65sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C66sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004C67sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E44sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E45sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E46sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E47sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E48sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E49sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E4Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E4Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E50sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E51sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E52sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E53sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E54sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00004E56sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005144sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005145sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005146sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005147sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005148sv00001002sd0000010Abc*sc*i* radeon
alias pcivideo:v00001002d00005148sv00001002sd00000152bc*sc*i* radeon
alias pcivideo:v00001002d00005148sv00001002sd00000162bc*sc*i* radeon
alias pcivideo:v00001002d00005148sv00001002sd00000172bc*sc*i* radeon
alias pcivideo:v00001002d00005148sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005149sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Csv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Dsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Esv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000514Fsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005157sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005158sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005159sv00001002sd0000000Bbc*sc*i* radeon
alias pcivideo:v00001002d00005159sv00001002sd0000013Abc*sc*i* radeon
alias pcivideo:v00001002d00005159sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000515Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000515Esv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005168sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005169sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000516Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000516Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000516Csv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005460sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005464sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005548sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005549sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000554Asv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d0000554Bsv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005551sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005552sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005554sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005834sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005835sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005960sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005961sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005962sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005964sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005969sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005B60sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005B62sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005B64sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005B65sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005C61sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005C63sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00005D57sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00007834sv*sd*bc*sc*i* radeon
alias pcivideo:v00001002d00007835sv*sd*bc*sc*i* radeon


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-ati.spec	3 Feb 2006 13:28:51 -0000	1.8
+++ xorg-x11-drv-ati.spec	3 Feb 2006 13:33:56 -0000	1.9
@@ -13,10 +13,12 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   1
+Release:   2
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
+Source2:   r128.xinf
+Source3:   radeon.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +29,7 @@
 BuildRequires: xorg-x11-server-sdk
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
+BuildRequires: libdrm-devel >= 2.0-1
 %endif
 
 Requires:  xorg-x11-server-Xorg
@@ -48,6 +51,8 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 # INFO: We don't want to ship the libtool archives (*.la) from modules
 # directory, as they serve no useful purpose.
@@ -65,6 +70,8 @@
 %{driverdir}/r128_drv.so
 %{driverdir}/radeon_drv.so
 %{_datadir}/hwdata/videoaliases/ati.xinf
+%{_datadir}/hwdata/videoaliases/r128.xinf
+%{_datadir}/hwdata/videoaliases/radeon.xinf
 %dir %{moduledir}/multimedia
 %{moduledir}/multimedia/theatre200_drv.so
 %{moduledir}/multimedia/theatre_detect_drv.so
@@ -75,6 +82,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-2
+- Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).
+- Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-1
 - Updated xorg-x11-drv-ati to version 6.5.7.3 from X11R7.0
 - Added ati.xinf videoalias file for hardware autodetection.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:34:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:34:18 -0500
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-i810.spec, 1.6, 1.7
Message-ID: <200602031334.k13DYHw6024903@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24862/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Added Files:
	i810.xinf 
Log Message:
auto-import xorg-x11-drv-i810-1.4.1.3-1 on branch devel from xorg-x11-drv-i810-1.4.1.3-1.src.rpm


--- NEW FILE i810.xinf ---
alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* i810
alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* i810


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:42:36 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:34:13 -0000	1.6
@@ -1 +1 @@
-xf86-video-i810-1.4.1.2.tar.bz2
+xf86-video-i810-1.4.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:42:36 -0000	1.5
+++ sources	3 Feb 2006 13:34:14 -0000	1.6
@@ -1 +1 @@
-cf9f599b8853ac3d01e185e7423babd0  xf86-video-i810-1.4.1.2.tar.bz2
+aebee9cc7608b02962e01d12ffd764e2  xf86-video-i810-1.4.1.3.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-i810.spec	24 Dec 2005 03:42:36 -0000	1.6
+++ xorg-x11-drv-i810.spec	3 Feb 2006 13:34:14 -0000	1.7
@@ -1,22 +1,16 @@
 %define tarball xf86-video-i810
-# 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 i810 video driver
 Name:      xorg-x11-drv-i810
-Version: 1.4.1.2
-Release: 1
+Version:   1.4.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -28,6 +22,7 @@
 BuildRequires: libXvMC-devel
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 i810 video driver.
 
@@ -48,14 +43,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,15 +61,12 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i810_drv.so
+%{_datadir}/hwdata/videoaliases/i810.xinf
 %dir %{_libdir}
 %{_libdir}/libI810XvMC.so.1
 %{_libdir}/libI810XvMC.so.1.0.0
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/i810.4*
 
 %files devel
 %defattr(-,root,root,-)
@@ -81,6 +74,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-1
+- Updated xorg-x11-drv-i810 to version 1.4.1.3 from X11R7.0
+- Removed 'x' suffix from manpage dirs to match RC4 upstream.
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.4.1.2-1
 - Updated xorg-x11-drv-i810 to version 1.4.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:35:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:35:03 -0500
Subject: rpms/xorg-x11-drv-mga/devel mga.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-mga.spec, 1.5, 1.6
Message-ID: <200602031335.k13DZ3G8025137@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25094/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-mga.spec 
Added Files:
	mga.xinf 
Log Message:
auto-import xorg-x11-drv-mga-1.2.1.3-1 on branch devel from xorg-x11-drv-mga-1.2.1.3-1.src.rpm


--- NEW FILE mga.xinf ---
alias pcivideo:v0000102Bd00000010sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000518sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000519sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Asv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Bsv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Esv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd0000051Fsv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000520sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000521sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000541bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000542bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000641bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000642bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd000007C0bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd000007C1bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000D41bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000D42bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E00bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E01bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E02bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000E03bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F80bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F81bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F82bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv0000102Bsd00000F83bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv00001705sd00000001bc*sc*i* mga
alias pcivideo:v0000102Bd00000525sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00001000sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00001001sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00002007sv*sd*bc*sc*i* mga
alias pcivideo:v0000102Bd00002527sv*sd*bc*sc*i* mga


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:43:49 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:35:00 -0000	1.6
@@ -1 +1 @@
-xf86-video-mga-1.2.1.2.tar.bz2
+xf86-video-mga-1.2.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:43:49 -0000	1.5
+++ sources	3 Feb 2006 13:35:00 -0000	1.6
@@ -1 +1 @@
-9581f3bcf814bcf27378225833c7ff82  xf86-video-mga-1.2.1.2.tar.bz2
+9895de01c57354c7aa80907dc05b7e66  xf86-video-mga-1.2.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-mga.spec	24 Dec 2005 03:43:49 -0000	1.5
+++ xorg-x11-drv-mga.spec	3 Feb 2006 13:35:00 -0000	1.6
@@ -1,32 +1,27 @@
 %define tarball xf86-video-mga
-# 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 mga video driver
 Name:      xorg-x11-drv-mga
-Version: 1.2.1.2
-Release: 1
+Version:   1.2.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 mga video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 # NOTE: Intentionally remove hardware specific utilities, we generally do not
 # supply these in the core OS.
@@ -60,14 +56,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/mga_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/mga.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.2.1.3-1
+- Updated xorg-x11-drv-mga to version 1.2.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.2.1.2-1
 - Updated xorg-x11-drv-mga to version 1.2.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:35:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:35:33 -0500
Subject: rpms/xorg-x11-drv-neomagic/devel neomagic.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-neomagic.spec, 1.5, 1.6
Message-ID: <200602031335.k13DZXPL025323@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-neomagic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25283/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-neomagic.spec 
Added Files:
	neomagic.xinf 
Log Message:
auto-import xorg-x11-drv-neomagic-1.0.0.5-1 on branch devel from xorg-x11-drv-neomagic-1.0.0.5-1.src.rpm


--- NEW FILE neomagic.xinf ---
alias pcivideo:v000010C8d00000001sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000002sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000003sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000004sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000005sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000006sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000016sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000025sv*sd*bc*sc*i* neomagic
alias pcivideo:v000010C8d00000083sv*sd*bc*sc*i* neomagic


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:44:43 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:35:31 -0000	1.6
@@ -1 +1 @@
-xf86-video-neomagic-1.0.0.4.tar.bz2
+xf86-video-neomagic-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-neomagic/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:44:43 -0000	1.5
+++ sources	3 Feb 2006 13:35:31 -0000	1.6
@@ -1 +1 @@
-be981fec604eb1f23f25662fcbd045b4  xf86-video-neomagic-1.0.0.4.tar.bz2
+d2d44f1f2eb5c239a779a9dd0e983a2a  xf86-video-neomagic-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-neomagic.spec	24 Dec 2005 03:44:43 -0000	1.5
+++ xorg-x11-drv-neomagic.spec	3 Feb 2006 13:35:31 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-neomagic
-# 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 neomagic video driver
 Name:      xorg-x11-drv-neomagic
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 neomagic video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/neomagic_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/neomagic.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/neomagic.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-neomagic to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-neomagic to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-neomagic to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:36:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:36:11 -0500
Subject: rpms/xorg-x11-drv-nsc/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-nsc.spec, 1.5, 1.6
Message-ID: <200602031336.k13DaBRb025528@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25501/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-nsc.spec 
Log Message:
auto-import xorg-x11-drv-nsc-2.7.6.5-1 on branch devel from xorg-x11-drv-nsc-2.7.6.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:44:55 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:36:08 -0000	1.6
@@ -1 +1 @@
-xf86-video-nsc-2.7.6.4.tar.bz2
+xf86-video-nsc-2.7.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:44:55 -0000	1.5
+++ sources	3 Feb 2006 13:36:08 -0000	1.6
@@ -1 +1 @@
-4e50f9b6dd3ab2c2cd985c921fa0824f  xf86-video-nsc-2.7.6.4.tar.bz2
+ae4357182de369dbc1e60f287179c9c3  xf86-video-nsc-2.7.6.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-nsc.spec	24 Dec 2005 03:44:55 -0000	1.5
+++ xorg-x11-drv-nsc.spec	3 Feb 2006 13:36:08 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-nsc
-# 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 nsc video driver
 Name:      xorg-x11-drv-nsc
-Version: 2.7.6.4
-Release: 1
+Version:   2.7.6.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 nsc video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/nsc_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%{_datadir}/hwdata/videoaliases/nsc.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/nsc.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.7.6.5-1
+- Updated xorg-x11-drv-nsc to version 2.7.6.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 2.7.6.4-1
 - Updated xorg-x11-drv-nsc to version 2.7.6.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 2.7.6.1-1
 - Updated xorg-x11-drv-nsc to version 2.7.6.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Mon Oct 3 2005 Mike A. Harris <mharris at redhat.com> 2.7.6-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:36:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:36:15 -0500
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.1,
	1.2 xorg-x11-drv-i810.spec, 1.7, 1.8
Message-ID: <200602031336.k13DaFu6025542@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25512

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Fri Feb  3 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-2
- Added 8086:2592 mapping to i810.xinf for bug (#172884)



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i810.xinf	3 Feb 2006 13:34:14 -0000	1.1
+++ i810.xinf	3 Feb 2006 13:36:11 -0000	1.2
@@ -2,6 +2,7 @@
 alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810
+alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-i810.spec	3 Feb 2006 13:34:14 -0000	1.7
+++ xorg-x11-drv-i810.spec	3 Feb 2006 13:36:11 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.4.1.3
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
@@ -74,9 +74,11 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Feb  3 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
 - Updated xorg-x11-drv-i810 to version 1.4.1.3 from X11R7.0
-- Removed 'x' suffix from manpage dirs to match RC4 upstream.
 
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.4.1.2-1
 - Updated xorg-x11-drv-i810 to version 1.4.1.2 from X11R7 RC4



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:36:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:36:42 -0500
Subject: rpms/xorg-x11-drv-nv/devel nv.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-nv.spec, 1.6, 1.7
Message-ID: <200602031336.k13Dagfk025804@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25764/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-nv.spec 
Added Files:
	nv.xinf 
Log Message:
auto-import xorg-x11-drv-nv-1.0.1.5-1 on branch devel from xorg-x11-drv-nv-1.0.1.5-1.src.rpm


--- NEW FILE nv.xinf ---
alias pcivideo:v00001092d00000550sv*sd*bc*sc*i* nv
alias pcivideo:v00001092d00001092sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000020sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000028sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000029sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Asv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000002Fsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000040sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000041sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000042sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000004Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000A0sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000C0sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000C1sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000C2sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000C8sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000C9sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000CCsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000000CEsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000100sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000101sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000103sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000110sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000111sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000112sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000113sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000140sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000141sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000142sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000143sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000144sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000145sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000146sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000147sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000148sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000149sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000014Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000014Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000014Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000014Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000014Fsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000150sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000151sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000152sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000153sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000160sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000166sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000170sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000171sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000172sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000173sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000174sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000175sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000176sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000177sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000178sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000179sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000017Asv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000017Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000017Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000017Dsv*sd*bc*sc*i* nv
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:v000010DEd00000185sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000188sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000018Asv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000018Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd000001F0sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000200sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000201sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000202sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000203sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000210sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000252sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000253sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000258sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000259sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000025Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000280sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000281sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000282sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000286sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000288sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000289sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000028Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000300sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000301sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000302sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000308sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000309sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000311sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000312sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000313sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000314sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000316sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000317sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Asv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000031Fsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000320sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000321sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000322sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000323sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000324sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000325sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000326sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000327sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000328sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000329sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000032Asv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000032Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000032Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000032Dsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000032Fsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000330sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000331sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000332sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000333sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000334sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000338sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000033Fsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000341sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000342sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000343sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000344sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000345sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000347sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000348sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd00000349sv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000034Bsv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000034Csv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000034Esv*sd*bc*sc*i* nv
alias pcivideo:v000010DEd0000034Fsv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d00000018sv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d00000019sv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d00000020sv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d00000028sv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d00000029sv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d0000002Csv*sd*bc*sc*i* nv
alias pcivideo:v000012D2d000000A0sv*sd*bc*sc*i* nv


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:45:07 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:36:40 -0000	1.6
@@ -1 +1 @@
-xf86-video-nv-1.0.1.4.tar.bz2
+xf86-video-nv-1.0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:45:07 -0000	1.5
+++ sources	3 Feb 2006 13:36:40 -0000	1.6
@@ -1 +1 @@
-117f93df1d5b37bd1461b1091f58d1e7  xf86-video-nv-1.0.1.4.tar.bz2
+4ba5f719e5a62dabe485f0c5a564d7eb  xf86-video-nv-1.0.1.5.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nv.spec	24 Dec 2005 03:45:07 -0000	1.6
+++ xorg-x11-drv-nv.spec	3 Feb 2006 13:36:40 -0000	1.7
@@ -1,32 +1,27 @@
 %define tarball xf86-video-nv
-# 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 nv video driver
 Name:      xorg-x11-drv-nv
-Version: 1.0.1.4
-Release: 1
+Version:   1.0.1.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
 
-ExclusiveArch: %{ix86} x86_64 ia64 ppc
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 nv video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,14 +53,14 @@
 %dir %{driverdir}
 %{driverdir}/nv_drv.so
 %{driverdir}/riva128.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/nv.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-1
+- Updated xorg-x11-drv-nv to version 1.0.1.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.4-1
 - Updated xorg-x11-drv-nv to version 1.0.1.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:37:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:37:09 -0500
Subject: rpms/xorg-x11-drv-rendition/devel rendition.xinf, NONE,
	1.1 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-rendition.spec, 1.5, 1.6
Message-ID: <200602031337.k13Db9J8026074@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26033/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-rendition.spec 
Added Files:
	rendition.xinf 
Log Message:
auto-import xorg-x11-drv-rendition-4.0.1.3-1 on branch devel from xorg-x11-drv-rendition-4.0.1.3-1.src.rpm


--- NEW FILE rendition.xinf ---


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:45:50 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:37:06 -0000	1.6
@@ -1 +1 @@
-xf86-video-rendition-4.0.1.2.tar.bz2
+xf86-video-rendition-4.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:45:50 -0000	1.5
+++ sources	3 Feb 2006 13:37:06 -0000	1.6
@@ -1 +1 @@
-0f17b7972510a9f10954cb30a0e91109  xf86-video-rendition-4.0.1.2.tar.bz2
+b69d578591f3ece72e844a5bb22674f7  xf86-video-rendition-4.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-rendition.spec	24 Dec 2005 03:45:50 -0000	1.5
+++ xorg-x11-drv-rendition.spec	3 Feb 2006 13:37:06 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-rendition
-# 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 rendition video driver
 Name:      xorg-x11-drv-rendition
-Version: 4.0.1.2
-Release: 1
+Version:   4.0.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 rendition video driver.
 
@@ -39,14 +34,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,14 +53,13 @@
 # code and included in the driver directly.
 %{moduledir}/v10002d.uc
 %{moduledir}/v20002d.uc
-# NOTE: Uncomment when multimedia modules are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/rendition.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 4.0.1.3-1
+- Updated xorg-x11-drv-rendition to version 4.0.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 4.0.1.2-1
 - Updated xorg-x11-drv-rendition to version 4.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:37:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:37:23 -0500
Subject: rpms/xorg-x11-drv-s3/devel s3.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-s3.spec, 1.6, 1.7
Message-ID: <200602031337.k13DbN4H026253@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26215/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-s3.spec 
Added Files:
	s3.xinf 
Log Message:
auto-import xorg-x11-drv-s3-0.3.5.5-1 on branch devel from xorg-x11-drv-s3-0.3.5.5-1.src.rpm


--- NEW FILE s3.xinf ---
alias pcivideo:v00001092d00008811sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008801sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008810sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008811sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008812sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008813sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008814sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008815sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D0sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D1sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D2sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088D3sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F0sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F1sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F2sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d000088F3sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008905sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008906sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008907sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008908sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d00008909sv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Asv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Bsv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Csv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Dsv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Esv*sd*bc*sc*i* s3
alias pcivideo:v00005333d0000890Fsv*sd*bc*sc*i* s3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:46:06 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:37:20 -0000	1.6
@@ -1 +1 @@
-xf86-video-s3-0.3.5.4.tar.bz2
+xf86-video-s3-0.3.5.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:06 -0000	1.5
+++ sources	3 Feb 2006 13:37:20 -0000	1.6
@@ -1 +1 @@
-ebc8bd3f52666e0e9c9d52e01ed88ec1  xf86-video-s3-0.3.5.4.tar.bz2
+fa2c90793e895c0b144445e998661aa4  xf86-video-s3-0.3.5.5.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-s3.spec	24 Dec 2005 03:46:06 -0000	1.6
+++ xorg-x11-drv-s3.spec	3 Feb 2006 13:37:20 -0000	1.7
@@ -1,22 +1,16 @@
 %define tarball xf86-video-s3
-# 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 s3 video driver
 Name:      xorg-x11-drv-s3
-Version: 0.3.5.4
-Release: 1
+Version:   0.3.5.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 s3 video driver.
 
@@ -39,14 +34,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,15 +49,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/s3_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-# NOTE: Uncomment these if someone ever writes manpages for this driver
-#%dir %{_mandir}
-#%dir %{_mandir}/man4
-#%{_mandir}/man4/*.4x*
+#%dir %{_mandir}/man4x
+#%{_mandir}/man4/s3.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-1
+- Updated xorg-x11-drv-s3 to version 0.3.5.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.4-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -75,6 +66,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.1-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:37:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:37:38 -0500
Subject: rpms/xorg-x11-drv-s3virge/devel s3virge.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-s3virge.spec, 1.5, 1.6
Message-ID: <200602031337.k13DbcvP026437@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3virge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26396/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-s3virge.spec 
Added Files:
	s3virge.xinf 
Log Message:
auto-import xorg-x11-drv-s3virge-1.8.6.5-1 on branch devel from xorg-x11-drv-s3virge-1.8.6.5-1.src.rpm


--- NEW FILE s3virge.xinf ---
alias pcivideo:v000010B4d00001B1Dsv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00005631sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d0000883Dsv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008903sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008904sv00001014sd000000DBbc*sc*i* s3virge
alias pcivideo:v00005333d00008904sv00001014sd0000305Cbc*sc*i* s3virge
alias pcivideo:v00005333d00008904sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008A01sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008A10sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008A13sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008C01sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008C02sv*sd*bc*sc*i* s3virge
alias pcivideo:v00005333d00008C03sv*sd*bc*sc*i* s3virge


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:46:23 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:37:36 -0000	1.6
@@ -1 +1 @@
-xf86-video-s3virge-1.8.6.4.tar.bz2
+xf86-video-s3virge-1.8.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-s3virge/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:23 -0000	1.5
+++ sources	3 Feb 2006 13:37:36 -0000	1.6
@@ -1 +1 @@
-1b2017a70d075a878763673457c671fe  xf86-video-s3virge-1.8.6.4.tar.bz2
+5ac819a238e90e3f07d77928d8a600cc  xf86-video-s3virge-1.8.6.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-s3virge.spec	24 Dec 2005 03:46:23 -0000	1.5
+++ xorg-x11-drv-s3virge.spec	3 Feb 2006 13:37:36 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-s3virge
-# 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 s3virge video driver
 Name:      xorg-x11-drv-s3virge
-Version: 1.8.6.4
-Release: 1
+Version:   1.8.6.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 s3virge video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/s3virge_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/s3virge.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/s3virge.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.8.6.5-1
+- Updated xorg-x11-drv-s3virge to version 1.8.6.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.8.6.4-1
 - Updated xorg-x11-drv-s3virge to version 1.8.6.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.8.6.1-1
 - Updated xorg-x11-drv-s3virge to version 1.8.6.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.8.6-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:38:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:38:01 -0500
Subject: rpms/xorg-x11-drv-savage/devel savage.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-savage.spec, 1.6, 1.7
Message-ID: <200602031338.k13Dc166026675@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26637/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-savage.spec 
Added Files:
	savage.xinf 
Log Message:
auto-import xorg-x11-drv-savage-2.0.2.3-1 on branch devel from xorg-x11-drv-savage-2.0.2.3-1.src.rpm


--- NEW FILE savage.xinf ---
alias pcivideo:v00005333d00008A20sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A21sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A22sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A23sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A25sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008A26sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C10sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C11sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C12sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C13sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C22sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C24sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C26sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Asv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Bsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Csv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Dsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Esv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008C2Fsv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D01sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D02sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D03sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00008D04sv*sd*bc*sc*i* savage
alias pcivideo:v00005333d00009102sv*sd*bc*sc*i* savage


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:46:38 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:37:58 -0000	1.6
@@ -1 +1 @@
-xf86-video-savage-2.0.2.2.tar.bz2
+xf86-video-savage-2.0.2.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:38 -0000	1.5
+++ sources	3 Feb 2006 13:37:58 -0000	1.6
@@ -1 +1 @@
-417de585f4e84f70414436054b580a3f  xf86-video-savage-2.0.2.2.tar.bz2
+28ec4e07bda55ab8b35b4735405ac5a3  xf86-video-savage-2.0.2.3.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-savage.spec	24 Dec 2005 03:46:38 -0000	1.6
+++ xorg-x11-drv-savage.spec	3 Feb 2006 13:37:58 -0000	1.7
@@ -1,9 +1,5 @@
 %define tarball xf86-video-savage
-# 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
@@ -16,13 +12,11 @@
 
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
-Version: 2.0.2.2
-Release: 1
+Version:   2.0.2.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -36,6 +30,7 @@
 %endif
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 savage video driver.
 
@@ -48,11 +43,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
@@ -65,14 +61,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/savage_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/savage.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/savage.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.0.2.3-1
+- Updated xorg-x11-drv-savage to version 2.0.2.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 2.0.2.2-1
 - Updated xorg-x11-drv-savage to version 2.0.2.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:38:16 -0500
Subject: rpms/xorg-x11-drv-siliconmotion/devel siliconmotion.xinf, NONE,
	1.1 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-siliconmotion.spec, 1.5, 1.6
Message-ID: <200602031338.k13DcGij026879@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26835/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-siliconmotion.spec 
Added Files:
	siliconmotion.xinf 
Log Message:
auto-import xorg-x11-drv-siliconmotion-1.3.1.5-1 on branch devel from xorg-x11-drv-siliconmotion-1.3.1.5-1.src.rpm


--- NEW FILE siliconmotion.xinf ---
alias pcivideo:v0000126Fd00000710sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000712sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000720sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000730sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000810sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000811sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000820sv*sd*bc*sc*i* siliconmotion
alias pcivideo:v0000126Fd00000910sv*sd*bc*sc*i* siliconmotion


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:46:52 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:38:14 -0000	1.6
@@ -1 +1 @@
-xf86-video-siliconmotion-1.3.1.4.tar.bz2
+xf86-video-siliconmotion-1.3.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:46:52 -0000	1.5
+++ sources	3 Feb 2006 13:38:14 -0000	1.6
@@ -1 +1 @@
-a6b0636c6a5f3ab7c9e0268583de3e95  xf86-video-siliconmotion-1.3.1.4.tar.bz2
+b9db248697e37352f60dfa2305bd696d  xf86-video-siliconmotion-1.3.1.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-siliconmotion.spec	24 Dec 2005 03:46:52 -0000	1.5
+++ xorg-x11-drv-siliconmotion.spec	3 Feb 2006 13:38:14 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-siliconmotion
-# 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 siliconmotion video driver
 Name:      xorg-x11-drv-siliconmotion
-Version: 1.3.1.4
+Version: 1.3.1.5
 Release: 1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 siliconmotion video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/siliconmotion_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/siliconmotion.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.3.1.5-1
+- Updated xorg-x11-drv-siliconmotion to version 1.3.1.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.3.1.4-1
 - Updated xorg-x11-drv-siliconmotion to version 1.3.1.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.3.1.1-1
 - Updated xorg-x11-drv-siliconmotion to version 1.3.1.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.3.1-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:38:34 -0500
Subject: rpms/xorg-x11-drv-sis/devel sis.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-sis.spec, 1.6, 1.7
Message-ID: <200602031338.k13DcYE2027080@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27027/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-sis.spec 
Added Files:
	sis.xinf 
Log Message:
auto-import xorg-x11-drv-sis-0.8.1.3-1 on branch devel from xorg-x11-drv-sis-0.8.1.3-1.src.rpm


--- NEW FILE sis.xinf ---
alias pcivideo:v00001039d00000200sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000205sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000300sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000310sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000315sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000325sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000330sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00000340sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00005300sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00005315sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00005597sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006236sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006300sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006306sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006325sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006326sv*sd*bc*sc*i* sis
alias pcivideo:v00001039d00006330sv*sd*bc*sc*i* sis


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:47:23 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:38:30 -0000	1.6
@@ -1 +1 @@
-xf86-video-sis-0.8.1.2.tar.bz2
+xf86-video-sis-0.8.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sis/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:47:23 -0000	1.5
+++ sources	3 Feb 2006 13:38:30 -0000	1.6
@@ -1 +1 @@
-d5d4a2da480bbd25d40de075c09b8f0e  xf86-video-sis-0.8.1.2.tar.bz2
+f239adbee34db5340a2e634fe9134c1f  xf86-video-sis-0.8.1.3.tar.bz2


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-sis.spec	24 Dec 2005 03:47:23 -0000	1.6
+++ xorg-x11-drv-sis.spec	3 Feb 2006 13:38:31 -0000	1.7
@@ -1,9 +1,5 @@
 %define tarball xf86-video-sis
-# 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
@@ -12,13 +8,11 @@
 
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
-Version: 0.8.1.2
-Release: 1
+Version:   0.8.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -33,6 +27,7 @@
 %endif
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 sis video driver.
 
@@ -45,14 +40,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,14 +58,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/sis_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/sis.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/sis.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.8.1.3-1
+- Updated xorg-x11-drv-sis to version 0.8.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.8.1.2-1
 - Updated xorg-x11-drv-sis to version 0.8.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -81,6 +77,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.8.0.1-1
 - Updated xorg-x11-drv-sis to version 0.8.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 0.7.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:38:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:38:53 -0500
Subject: rpms/xorg-x11-drv-sisusb/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-sisusb.spec, 1.5, 1.6
Message-ID: <200602031338.k13Dcrw5027294@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27254/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-sisusb.spec 
Log Message:
auto-import xorg-x11-drv-sisusb-0.7.1.3-1 on branch devel from xorg-x11-drv-sisusb-0.7.1.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:47:47 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:38:50 -0000	1.6
@@ -1 +1 @@
-xf86-video-sisusb-0.7.1.2.tar.bz2
+xf86-video-sisusb-0.7.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-sisusb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:47:47 -0000	1.5
+++ sources	3 Feb 2006 13:38:50 -0000	1.6
@@ -1 +1 @@
-4c64307931fa4e3c17d97298ce2ceeae  xf86-video-sisusb-0.7.1.2.tar.bz2
+c78b9c140ea318790b77c7b53c193735  xf86-video-sisusb-0.7.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-sisusb.spec	24 Dec 2005 03:47:47 -0000	1.5
+++ xorg-x11-drv-sisusb.spec	3 Feb 2006 13:38:50 -0000	1.6
@@ -10,7 +10,7 @@
 
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
-Version: 0.7.1.2
+Version: 0.7.1.3
 Release: 1
 URL:       http://www.x.org
 # FIXME: If using a CVS version, uncomment the second Source0 line and use
@@ -83,6 +83,10 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.7.1.3-1
+- Updated xorg-x11-drv-sisusb to version 0.7.1.3 from X11R7.0
+- Removed 'x' suffix from manpage dirs to match RC4 upstream.
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.7.1.2-1
 - Updated xorg-x11-drv-sisusb to version 0.7.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:39:06 -0500
Subject: rpms/xorg-x11-drv-tdfx/devel tdfx.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-tdfx.spec, 1.5, 1.6
Message-ID: <200602031339.k13Dd6P4027463@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-tdfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27425/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-tdfx.spec 
Added Files:
	tdfx.xinf 
Log Message:
auto-import xorg-x11-drv-tdfx-1.1.1.3-1 on branch devel from xorg-x11-drv-tdfx-1.1.1.3-1.src.rpm


--- NEW FILE tdfx.xinf ---
alias pcivideo:v0000121Ad00000003sv*sd*bc*sc*i* tdfx
alias pcivideo:v0000121Ad00000004sv*sd*bc*sc*i* tdfx
alias pcivideo:v0000121Ad00000005sv*sd*bc*sc*i* tdfx
alias pcivideo:v0000121Ad00000009sv*sd*bc*sc*i* tdfx


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:48:25 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:39:04 -0000	1.6
@@ -1 +1 @@
-xf86-video-tdfx-1.1.1.2.tar.bz2
+xf86-video-tdfx-1.1.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tdfx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:48:25 -0000	1.5
+++ sources	3 Feb 2006 13:39:04 -0000	1.6
@@ -1 +1 @@
-de052641897ea9dc159f6149cf98fa35  xf86-video-tdfx-1.1.1.2.tar.bz2
+e193816d45960d62937deb99d1b9986a  xf86-video-tdfx-1.1.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-tdfx.spec	24 Dec 2005 03:48:25 -0000	1.5
+++ xorg-x11-drv-tdfx.spec	3 Feb 2006 13:39:04 -0000	1.6
@@ -1,32 +1,27 @@
 %define tarball xf86-video-tdfx
-# 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 tdfx video driver
 Name:      xorg-x11-drv-tdfx
-Version: 1.1.1.2
-Release: 1
+Version:   1.1.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
 
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 tdfx video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/tdfx_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/tdfx.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/tdfx.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.1.1.3-1
+- Updated xorg-x11-drv-tdfx to version 1.1.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.1.1.2-1
 - Updated xorg-x11-drv-tdfx to version 1.1.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.1.0.1-1
 - Updated xorg-x11-drv-tdfx to version 1.1.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:39:23 -0500
Subject: rpms/xorg-x11-drv-trident/devel trident.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-trident.spec, 1.5, 1.6
Message-ID: <200602031339.k13DdNLN027663@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27622/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-trident.spec 
Added Files:
	trident.xinf 
Log Message:
auto-import xorg-x11-drv-trident-1.0.1.2-1 on branch devel from xorg-x11-drv-trident-1.0.1.2-1.src.rpm


--- NEW FILE trident.xinf ---
alias pcivideo:v00001023d00002100sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008400sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008420sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008500sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008520sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008600sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008620sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00008820sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009320sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009382sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009385sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009388sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009397sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d0000939Asv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009420sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009430sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009440sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009520sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009525sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009540sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009660sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009680sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009682sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009685sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009750sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009759sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009850sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009880sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009910sv*sd*bc*sc*i* trident
alias pcivideo:v00001023d00009930sv*sd*bc*sc*i* trident


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:48:41 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:39:20 -0000	1.6
@@ -1 +1 @@
-xf86-video-trident-1.0.1.1.tar.bz2
+xf86-video-trident-1.0.1.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:48:41 -0000	1.5
+++ sources	3 Feb 2006 13:39:20 -0000	1.6
@@ -1 +1 @@
-4964018cbe7c65bd9d8f14583ce49143  xf86-video-trident-1.0.1.1.tar.bz2
+c1ace6bcc9946a474df7d2af5b75b5d9  xf86-video-trident-1.0.1.2.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-trident.spec	24 Dec 2005 03:48:41 -0000	1.5
+++ xorg-x11-drv-trident.spec	3 Feb 2006 13:39:20 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-trident
-# 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 trident video driver
 Name:      xorg-x11-drv-trident
-Version: 1.0.1.1
-Release: 1
+Version:   1.0.1.2
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 trident video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/trident_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/trident.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/trident.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
+- Updated xorg-x11-drv-trident to version 1.0.1.2 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.1-1
 - Updated xorg-x11-drv-trident to version 1.0.1.1 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-trident to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:39:37 -0500
Subject: rpms/xorg-x11-drv-tseng/devel tseng.xinf, NONE, 1.1 .cvsignore, 1.5,
	1.6 sources, 1.5, 1.6 xorg-x11-drv-tseng.spec, 1.5, 1.6
Message-ID: <200602031339.k13Ddbao027844@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-tseng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27803/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-tseng.spec 
Added Files:
	tseng.xinf 
Log Message:
auto-import xorg-x11-drv-tseng-1.0.0.5-1 on branch devel from xorg-x11-drv-tseng-1.0.0.5-1.src.rpm


--- NEW FILE tseng.xinf ---
alias pcivideo:v0000100Cd00003202sv*sd*bc*sc*i* tseng
alias pcivideo:v0000100Cd00003205sv*sd*bc*sc*i* tseng
alias pcivideo:v0000100Cd00003206sv*sd*bc*sc*i* tseng
alias pcivideo:v0000100Cd00003207sv*sd*bc*sc*i* tseng
alias pcivideo:v0000100Cd00003208sv*sd*bc*sc*i* tseng
alias pcivideo:v0000100Cd00004702sv*sd*bc*sc*i* tseng


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:48:57 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:39:34 -0000	1.6
@@ -1 +1 @@
-xf86-video-tseng-1.0.0.4.tar.bz2
+xf86-video-tseng-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tseng/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:48:57 -0000	1.5
+++ sources	3 Feb 2006 13:39:34 -0000	1.6
@@ -1 +1 @@
-a59633b9a6c96ae504b798809d41ea54  xf86-video-tseng-1.0.0.4.tar.bz2
+de41dc67999ee49903d40d5d67f652c9  xf86-video-tseng-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-tseng.spec	24 Dec 2005 03:48:57 -0000	1.5
+++ xorg-x11-drv-tseng.spec	3 Feb 2006 13:39:34 -0000	1.6
@@ -1,32 +1,27 @@
 %define tarball xf86-video-tseng
-# 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 tseng video driver
 Name:      xorg-x11-drv-tseng
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} alpha
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 tseng video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/tseng_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/tseng.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/tseng.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-tseng to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-tseng to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-tseng to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:39:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:39:50 -0500
Subject: rpms/xorg-x11-drv-v4l/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 xorg-x11-drv-v4l.spec, 1.4, 1.5
Message-ID: <200602031339.k13DdoVj028008@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-v4l/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27969/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-v4l.spec 
Log Message:
auto-import xorg-x11-drv-v4l-0.0.1.5-1 on branch devel from xorg-x11-drv-v4l-0.0.1.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Dec 2005 03:49:24 -0000	1.4
+++ .cvsignore	3 Feb 2006 13:39:47 -0000	1.5
@@ -1 +1 @@
-xf86-video-v4l-0.0.1.4.tar.bz2
+xf86-video-v4l-0.0.1.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-v4l/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Dec 2005 03:49:24 -0000	1.4
+++ sources	3 Feb 2006 13:39:47 -0000	1.5
@@ -1 +1 @@
-defdaf55f09059dcad2ccddd3477e3b4  xf86-video-v4l-0.0.1.4.tar.bz2
+bcf73093c563f1ec0f8eeb3a4f649677  xf86-video-v4l-0.0.1.5.tar.bz2


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-v4l.spec	24 Dec 2005 03:49:24 -0000	1.4
+++ xorg-x11-drv-v4l.spec	3 Feb 2006 13:39:47 -0000	1.5
@@ -1,22 +1,15 @@
 %define tarball xf86-video-v4l
-# 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 v4l video driver
 Name:      xorg-x11-drv-v4l
-Version: 0.0.1.4
-Release: 1
+Version:   0.0.1.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -27,6 +20,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 v4l video driver.
 
@@ -39,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,11 +48,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/v4l_drv.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/v4l.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.0.1.5-1
+- Updated xorg-x11-drv-v4l to version 0.0.1.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.0.1.4-1
 - Updated xorg-x11-drv-v4l to version 0.0.1.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:40:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:40:22 -0500
Subject: rpms/xorg-x11-drv-vesa/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-vesa.spec, 1.5, 1.6
Message-ID: <200602031340.k13DeMSB028328@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28292/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vesa.spec 
Log Message:
auto-import xorg-x11-drv-vesa-1.0.1.3-1 on branch devel from xorg-x11-drv-vesa-1.0.1.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:49:35 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:40:20 -0000	1.6
@@ -1 +1 @@
-xf86-video-vesa-1.0.1.2.tar.bz2
+xf86-video-vesa-1.0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:49:35 -0000	1.5
+++ sources	3 Feb 2006 13:40:20 -0000	1.6
@@ -1 +1 @@
-90cbad7eb266eb64562d54f6d48b3d9b  xf86-video-vesa-1.0.1.2.tar.bz2
+38e8bc1a630a4b83cb602bfd2fe90b7c  xf86-video-vesa-1.0.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-vesa.spec	24 Dec 2005 03:49:35 -0000	1.5
+++ xorg-x11-drv-vesa.spec	3 Feb 2006 13:40:20 -0000	1.6
@@ -1,22 +1,15 @@
 %define tarball xf86-video-vesa
-# 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 vesa video driver
 Name:      xorg-x11-drv-vesa
-Version: 1.0.1.2
-Release: 1
+Version:   1.0.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -27,6 +20,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 vesa video driver.
 
@@ -39,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +48,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/vesa_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/vesa.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-1
+- Updated xorg-x11-drv-vesa to version 1.0.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.1.2-1
 - Updated xorg-x11-drv-vesa to version 1.0.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-vesa to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:40:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:40:41 -0500
Subject: rpms/xorg-x11-drv-vga/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 xorg-x11-drv-vga.spec, 1.5, 1.6
Message-ID: <200602031340.k13DefNt028523@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28483/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vga.spec 
Log Message:
auto-import xorg-x11-drv-vga-4.0.0.5-1 on branch devel from xorg-x11-drv-vga-4.0.0.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:49:48 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:40:38 -0000	1.6
@@ -1 +1 @@
-xf86-video-vga-4.0.0.4.tar.bz2
+xf86-video-vga-4.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vga/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:49:48 -0000	1.5
+++ sources	3 Feb 2006 13:40:38 -0000	1.6
@@ -1 +1 @@
-3d4480cf589ddf968f6bd8d5688afd28  xf86-video-vga-4.0.0.4.tar.bz2
+6800ea6f26be1b975365a31c8b353bcd  xf86-video-vga-4.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-vga.spec	24 Dec 2005 03:49:48 -0000	1.5
+++ xorg-x11-drv-vga.spec	3 Feb 2006 13:40:38 -0000	1.6
@@ -1,22 +1,15 @@
 %define tarball xf86-video-vga
-# 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 vga video driver
 Name:      xorg-x11-drv-vga
-Version: 4.0.0.4
-Release: 1
+Version:   4.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+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)
@@ -27,6 +20,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 vga video driver.
 
@@ -39,14 +33,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +48,13 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/vga_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/vga.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 4.0.0.5-1
+- Updated xorg-x11-drv-vga to version 4.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 4.0.0.4-1
 - Updated xorg-x11-drv-vga to version 4.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +65,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 4.0.0.1-1
 - Updated xorg-x11-drv-vga to version 4.0.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 4.0.0-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:40:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:40:55 -0500
Subject: rpms/xorg-x11-drv-via/devel via.xinf, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.5, 1.6 xorg-x11-drv-via.spec, 1.8, 1.9
Message-ID: <200602031340.k13Detff028689@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28654/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-via.spec 
Added Files:
	via.xinf 
Log Message:
auto-import xorg-x11-drv-via-0.1.33.2-1 on branch devel from xorg-x11-drv-via-0.1.33.2-1.src.rpm


--- NEW FILE via.xinf ---
alias pcivideo:v00001106d00003022sv*sd*bc*sc*i* via
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
alias pcivideo:v00001106d00007205sv*sd*bc*sc*i* via


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Dec 2005 03:50:04 -0000	1.6
+++ .cvsignore	3 Feb 2006 13:40:52 -0000	1.7
@@ -1 +1 @@
-xf86-video-via-0.1.33.1.tar.bz2
+xf86-video-via-0.1.33.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-via/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:50:04 -0000	1.5
+++ sources	3 Feb 2006 13:40:52 -0000	1.6
@@ -1 +1 @@
-4149ee2f052e0861f0fe3748a7f6c02c  xf86-video-via-0.1.33.1.tar.bz2
+b003e299f15e3f62850c40e941afe0ec  xf86-video-via-0.1.33.2.tar.bz2


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-via.spec	24 Dec 2005 03:50:04 -0000	1.8
+++ xorg-x11-drv-via.spec	3 Feb 2006 13:40:52 -0000	1.9
@@ -1,9 +1,5 @@
 %define tarball xf86-video-via
-# 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
@@ -12,16 +8,15 @@
 
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
-Version: 0.1.33.1
-Release: 1
+Version:   0.1.33.2
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source1:   via.xinf
 
 ExclusiveArch: %{ix86} x86_64
 
@@ -56,14 +51,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,12 +73,8 @@
 %{_libdir}/libviaXvMCPro.so.1
 %{_libdir}/libviaXvMCPro.so.1.0.0
 %endif
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/via.4*
 
 %if %{with_xvmc}
 %files devel
@@ -96,6 +85,9 @@
 %endif
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-1
+- Updated xorg-x11-drv-via to version 0.1.33.2 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 0.1.33.1-1
 - Updated xorg-x11-drv-via to version 0.1.33.1 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:41:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:41:12 -0500
Subject: rpms/xorg-x11-drv-vmware/devel vmware.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-vmware.spec, 1.5, 1.6
Message-ID: <200602031341.k13DfCSo028913@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vmware/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28870/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-vmware.spec 
Added Files:
	vmware.xinf 
Log Message:
auto-import xorg-x11-drv-vmware-10.11.1.3-1 on branch devel from xorg-x11-drv-vmware-10.11.1.3-1.src.rpm


--- NEW FILE vmware.xinf ---
alias pcivideo:v000015ADd00000405sv*sd*bc*sc*i* vmware
alias pcivideo:v000015ADd00000710sv*sd*bc*sc*i* vmware


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:50:16 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:41:09 -0000	1.6
@@ -1 +1 @@
-xf86-video-vmware-10.11.1.2.tar.bz2
+xf86-video-vmware-10.11.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:50:16 -0000	1.5
+++ sources	3 Feb 2006 13:41:09 -0000	1.6
@@ -1 +1 @@
-ad489317b9a088fb6b0b91b56cab183d  xf86-video-vmware-10.11.1.2.tar.bz2
+539b77e045a1767fdb64eee7c21d05d1  xf86-video-vmware-10.11.1.3.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-vmware.spec	24 Dec 2005 03:50:16 -0000	1.5
+++ xorg-x11-drv-vmware.spec	3 Feb 2006 13:41:09 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-vmware
-# 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 vmware video driver
 Name:      xorg-x11-drv-vmware
-Version: 10.11.1.2
-Release: 1
+Version:   10.11.1.3
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 vmware video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/vmware_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/vmware.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/vmware.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 10.11.1.3-1
+- Updated xorg-x11-drv-vmware to version 10.11.1.3 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 10.11.1.2-1
 - Updated xorg-x11-drv-vmware to version 10.11.1.2 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.
@@ -74,6 +70,7 @@
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 10.11.0.1-1
 - Updated xorg-x11-drv-vmware to version 10.11.0.1 from X11R7 RC1
 - Fix *.la file removal.
+
 * Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 10.10.2-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:41:25 -0500
Subject: rpms/xorg-x11-drv-voodoo/devel voodoo.xinf, NONE, 1.1 .cvsignore,
	1.5, 1.6 sources, 1.5, 1.6 xorg-x11-drv-voodoo.spec, 1.5, 1.6
Message-ID: <200602031341.k13DfPHu029084@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-voodoo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29046/devel

Modified Files:
	.cvsignore sources xorg-x11-drv-voodoo.spec 
Added Files:
	voodoo.xinf 
Log Message:
auto-import xorg-x11-drv-voodoo-1.0.0.5-1 on branch devel from xorg-x11-drv-voodoo-1.0.0.5-1.src.rpm


--- NEW FILE voodoo.xinf ---
alias pcivideo:v0000121Ad00000001sv*sd*bc*sc*i* voodoo
alias pcivideo:v0000121Ad00000002sv*sd*bc*sc*i* voodoo


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Dec 2005 03:50:46 -0000	1.5
+++ .cvsignore	3 Feb 2006 13:41:23 -0000	1.6
@@ -1 +1 @@
-xf86-video-voodoo-1.0.0.4.tar.bz2
+xf86-video-voodoo-1.0.0.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-voodoo/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Dec 2005 03:50:46 -0000	1.5
+++ sources	3 Feb 2006 13:41:23 -0000	1.6
@@ -1 +1 @@
-0d033b5f3b63c0a89ee72e51c6e87059  xf86-video-voodoo-1.0.0.4.tar.bz2
+2c5e21f7f7b564a69fd343f329b2b899  xf86-video-voodoo-1.0.0.5.tar.bz2


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-voodoo.spec	24 Dec 2005 03:50:46 -0000	1.5
+++ xorg-x11-drv-voodoo.spec	3 Feb 2006 13:41:23 -0000	1.6
@@ -1,22 +1,16 @@
 %define tarball xf86-video-voodoo
-# 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 voodoo video driver
 Name:      xorg-x11-drv-voodoo
-Version: 1.0.0.4
-Release: 1
+Version:   1.0.0.5
+Release:   1
 URL:       http://www.x.org
-# FIXME: If using a CVS version, uncomment the second Source0 line and use
-# it instead.
-Source0:   http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2
-#Source0:   %{tarball}-%{version}-%{cvsdate}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -27,6 +21,7 @@
 BuildRequires: xorg-x11-server-sdk
 
 Requires:  xorg-x11-server-Xorg
+
 %description 
 X.Org X11 voodoo video driver.
 
@@ -39,14 +34,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# FIXME: This should be using makeinstall macro instead.  Please test
-# makeinstall with this driver, and if it works, check it into CVS. If
-# it fails, fix it in upstream sources and file a patch upstream.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
-find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f --
+find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/voodoo_drv.so
-# NOTE: Uncomment when multimedia drivers are avail
-#%dir %{moduledir}/multimedia
-#%{moduledir}/multimedia/*.so
-%dir %{_mandir}
-%dir %{_mandir}/man4
-%{_mandir}/man4/*.4*
+%{_datadir}/hwdata/videoaliases/voodoo.xinf
+#%dir %{_mandir}/man4x
+%{_mandir}/man4/voodoo.4*
 
 %changelog
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-1
+- Updated xorg-x11-drv-voodoo to version 1.0.0.5 from X11R7.0
+
 * Tue Dec 20 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.4-1
 - Updated xorg-x11-drv-voodoo to version 1.0.0.4 from X11R7 RC4
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Fri Feb  3 13:45:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 08:45:07 -0500
Subject: rpms/xorg-x11-drv-nsc/devel nsc.xinf, NONE,
	1.1 xorg-x11-drv-nsc.spec, 1.6, 1.7
Message-ID: <200602031345.k13Dj7i9030838@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30807

Modified Files:
	xorg-x11-drv-nsc.spec 
Added Files:
	nsc.xinf 
Log Message:
* Fri Feb  3 2006 Mike A. Harris <mharris at redhat.com> 2.7.6.5-2
- Added nsc.xinf driver mapping file.



--- NEW FILE nsc.xinf ---
alias pcivideo:v00001078d00000002sv*sd*bc*sc*i* geode


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nsc.spec	3 Feb 2006 13:36:08 -0000	1.6
+++ xorg-x11-drv-nsc.spec	3 Feb 2006 13:45:04 -0000	1.7
@@ -7,10 +7,10 @@
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
 Version:   2.7.6.5
-Release:   1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
-#Source1:   nsc.xinf
+Source1:   nsc.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,8 +37,8 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
@@ -52,11 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/nsc_drv.so
-#%{_datadir}/hwdata/videoaliases/nsc.xinf
+%{_datadir}/hwdata/videoaliases/nsc.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Fri Feb  3 2006 Mike A. Harris <mharris at redhat.com> 2.7.6.5-2
+- Added nsc.xinf driver mapping file.
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.7.6.5-1
 - Updated xorg-x11-drv-nsc to version 2.7.6.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 14:12:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 09:12:35 -0500
Subject: rpms/grep/devel grep-P.patch,NONE,1.1 grep.spec,1.56,1.57
Message-ID: <200602031412.k13ECZSe007785@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7770

Modified Files:
	grep.spec 
Added Files:
	grep-P.patch 
Log Message:
* Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-52
- Prevent 'grep -P' from segfaulting (bug #171379).


grep-P.patch:
 search.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE grep-P.patch ---
--- grep-2.5.1a/src/search.c.P	2006-02-03 14:08:00.000000000 +0000
+++ grep-2.5.1a/src/search.c	2006-02-03 14:11:20.000000000 +0000
@@ -1234,8 +1234,9 @@
       char eol = eolbyte;
       if (!exact)
 	{
-	  end = memchr (end, eol, buflim - end);
-	  end++;
+	  while (end < buflim)
+	    if (*end++ == eol)
+	      break;
 	  while (buf < beg && beg[-1] != eol)
 	    --beg;
 	}


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- grep.spec	9 Dec 2005 22:40:48 -0000	1.56
+++ grep.spec	3 Feb 2006 14:12:33 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 51.1
+Release: 52
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -16,6 +16,7 @@
 Patch11: grep-2.5.1-dfa-optional.patch
 Patch12: grep-2.5.1-tests.patch
 Patch13: grep-2.5.1-w.patch
+Patch14: grep-P.patch
 URL: http://www.gnu.org/software/grep/
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -43,6 +44,7 @@
 %patch11 -p1 -b .dfa-optional
 %patch12 -p1 -b .tests
 %patch13 -p1 -b .w
+%patch14 -p1 -b .P
 chmod a+x tests/fmbtest.sh
 
 %build
@@ -92,6 +94,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-52
+- Prevent 'grep -P' from segfaulting (bug #171379).
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 14:45:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 09:45:56 -0500
Subject: rpms/gnome-user-share/devel gnome-user-share-httpd-2.2.patch, NONE,
	1.1 gnome-user-share.spec, 1.5, 1.6
Message-ID: <200602031445.k13EjuKC007622@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6393

Modified Files:
	gnome-user-share.spec 
Added Files:
	gnome-user-share-httpd-2.2.patch 
Log Message:
* Fri Feb  3 2006 Alexander Larsson <alexl at redhat.com> 0.9-2
- Patch config for apache 2.2



gnome-user-share-httpd-2.2.patch:
 dav_user.conf |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE gnome-user-share-httpd-2.2.patch ---
Migrate to httpd 2.2 configuration.

--- dav_user.conf	2005-12-11 05:01:41.000000000 -0500
+++ dav_user.conf	2006-01-27 17:49:27.000000000 -0500
@@ -10,6 +10,7 @@
 
 LoadModule dav_module /etc/httpd/modules/mod_dav.so
 LoadModule dav_fs_module /etc/httpd/modules/mod_dav_fs.so
+LoadModule authn_file_module /etc/httpd/modules/mod_authn_file.so
 LoadModule auth_digest_module /etc/httpd/modules/mod_auth_digest.so
 
 DocumentRoot ${HOME}/Public
@@ -20,7 +21,9 @@
   AuthType Digest
   AuthName "Please log in as the user guest"
   AuthDigestDomain /
-  AuthDigestFile ${HOME}/.gnome2/user-share/passwd
+
+  AuthDigestProvider file
+  AuthUserFile ${HOME}/.gnome2/user-share/passwd
 
 
   <IfDefine RequirePasswordAlways>


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-user-share.spec	9 Dec 2005 22:40:44 -0000	1.5
+++ gnome-user-share.spec	3 Feb 2006 14:45:53 -0000	1.6
@@ -1,22 +1,27 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.gz
+Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: httpd
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: desktop-file-utils
 Prereq: GConf2
 
+# Config file format changed for 2.2.0 (patch1)
+Conflicts: httpd < 2.2.0
+
 %description
 gnome-user-share 
 
 %prep
 %setup -q
+%patch1 -p0  -b .httpd-2.2
 
 %build
 %configure
@@ -57,6 +62,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb  3 2006 Alexander Larsson <alexl at redhat.com> 0.9-2
+- Patch config for apache 2.2
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 14:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 09:54:26 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.33, 1.34 modules-strict.conf,
	1.2, 1.3 policy-20060104.patch, 1.29, 1.30 selinux-policy.spec,
	1.98, 1.99 sources, 1.37, 1.38
Message-ID: <200602031454.k13EsQu0019720@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19675

Modified Files:
	.cvsignore modules-strict.conf policy-20060104.patch 
	selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	31 Jan 2006 00:35:32 -0000	1.33
+++ .cvsignore	3 Feb 2006 14:54:23 -0000	1.34
@@ -34,3 +34,4 @@
 serefpolicy-2.2.7.tgz
 serefpolicy-2.2.8.tgz
 serefpolicy-2.2.9.tgz
+serefpolicy-2.2.10.tgz


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- modules-strict.conf	31 Jan 2006 00:35:32 -0000	1.2
+++ modules-strict.conf	3 Feb 2006 14:54:23 -0000	1.3
@@ -1127,3 +1127,10 @@
 # 
 ipsec = module
 
+# Layer: admin
+# Module: mrtg
+#
+# System log analyzer and reporter
+# 
+mrtg = module
+

policy-20060104.patch:
 build.conf                                |    6 +++---
 policy/mcs                                |   17 +++++++++++++++--
 policy/modules/admin/kudzu.te             |    1 -
 policy/modules/admin/readahead.te         |    2 +-
 policy/modules/admin/usermanage.te        |    3 +++
 policy/modules/apps/mono.te               |    2 +-
 policy/modules/apps/wine.te               |    2 +-
 policy/modules/kernel/devices.fc          |    1 +
 policy/modules/kernel/devices.te          |    5 +++++
 policy/modules/kernel/filesystem.if       |   20 ++++++++++----------
 policy/modules/kernel/filesystem.te       |    1 +
 policy/modules/kernel/mls.te              |    3 ++-
 policy/modules/services/apache.fc         |    2 ++
 policy/modules/services/apache.te         |    1 +
 policy/modules/services/automount.te      |    1 +
 policy/modules/services/hal.te            |    1 +
 policy/modules/services/irqbalance.te     |    3 +++
 policy/modules/services/networkmanager.fc |    4 +++-
 policy/modules/services/networkmanager.te |    2 +-
 policy/modules/services/procmail.te       |    1 +
 policy/modules/services/sendmail.if       |   15 +++++++++++++++
 policy/modules/services/spamassassin.te   |    1 +
 policy/modules/services/xserver.fc        |    9 ++++++---
 policy/modules/services/xserver.if        |   21 +++++++++++++++++++++
 policy/modules/services/xserver.te        |    9 +++++----
 policy/modules/system/init.fc             |    3 ++-
 policy/modules/system/libraries.fc        |    2 +-
 policy/modules/system/unconfined.if       |    8 ++++++--
 policy/modules/system/unconfined.te       |    4 ++++
 policy/modules/system/userdomain.te       |    2 ++
 30 files changed, 119 insertions(+), 33 deletions(-)

Index: policy-20060104.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policy-20060104.patch	1 Feb 2006 13:21:35 -0000	1.29
+++ policy-20060104.patch	3 Feb 2006 14:54:23 -0000	1.30
@@ -1,6 +1,91 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.9/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-01-19 10:00:40.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/admin/usermanage.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.10/build.conf
+--- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
++++ serefpolicy-2.2.10/build.conf	2006-02-03 09:00:31.000000000 -0500
+@@ -8,13 +8,13 @@
+ # version policy it supports.  Setting this will
+ # override the version.  This only has an
+ # effect for monolithic policies.
+-#OUTPUT_POLICY = 18
++#OUTPUT_POLICY = 20
+ 
+ # Policy Type
+ # strict, targeted,
+ # strict-mls, targeted-mls,
+ # strict-mcs, targeted-mcs
+-TYPE = strict
++TYPE = strict-mcs
+ 
+ # Policy Name
+ # If set, this will be used as the policy
+@@ -40,7 +40,7 @@
+ 
+ # Build monolithic policy.  Putting n here
+ # will build a loadable module policy.
+-MONOLITHIC=y
++MONOLITHIC=n
+ 
+ # Polyinstantiation
+ # Enable polyinstantiated directory support.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.10/policy/mcs
+--- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
++++ serefpolicy-2.2.10/policy/mcs	2006-02-03 09:28:41.000000000 -0500
+@@ -137,15 +137,28 @@
+ # Only files are constrained by MCS at this stage.
+ #
+ mlsconstrain file { write setattr append unlink link rename
+-		    create ioctl lock execute } (h1 dom h2);
++		    ioctl lock execute relabelfrom } (h1 dom h2);
++
++mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2));
+ 
+ mlsconstrain file { read } ((h1 dom h2) or 
+ 			    ( t1 == mlsfileread ));
+ 
+ 
+ # new file labels must be dominated by the relabeling subject clearance
+-mlsconstrain { dir file lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom relabelto }
++mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom }
+ 	( h1 dom h2 );
++mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { create relabelto }
++	(( h1 dom h2 ) and ( l2 eq h2 ));
++
++mlsconstrain process { ptrace } ( h1 dom h2 );
++
++mlsconstrain process { transition dyntransition } (( h1 dom h2 ) or
++		( t1 == getty_t ) or ( t1 == init_t ) or ( t1 == initrc_t ) or
++		( t1 == kernel_t ));
++
++mlsconstrain process { sigkill sigstop signal } ( h1 dom h2 ) or
++		( t1 == init_t ) or ( t1 == initrc_t );
+ 
+ define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
+ link unlink rename relabelfrom relabelto }')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.10/policy/modules/admin/kudzu.te
+--- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-03 08:55:51.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/admin/kudzu.te	2006-02-03 09:28:41.000000000 -0500
+@@ -24,7 +24,6 @@
+ allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
+ dontaudit kudzu_t self:capability sys_tty_config;
+ allow kudzu_t self:process { signal_perms execmem };
+-auditallow kudzu_t self:process execmem; 
+ allow kudzu_t self:fifo_file rw_file_perms;
+ allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
+ allow kudzu_t self:unix_dgram_socket create_socket_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.10/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/admin/readahead.te	2006-02-03 09:17:06.000000000 -0500
+@@ -47,7 +47,7 @@
+ fs_search_auto_mountpoints(readahead_t)
+ fs_getattr_all_pipes(readahead_t)
+ fs_getattr_all_files(readahead_t)
+-fs_search_ramfs(readahead_t)
++fs_dontaudit_search_ramfs(readahead_t)
+ fs_read_tmpfs_symlinks(readahead_t)
+ 
+ term_dontaudit_use_console(readahead_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.10/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-02-03 08:55:52.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/admin/usermanage.te	2006-02-03 09:00:31.000000000 -0500
 @@ -328,6 +328,9 @@
  
  miscfiles_read_localization(passwd_t)
@@ -11,9 +96,9 @@
  seutil_dontaudit_search_config(passwd_t)
  
  userdom_use_unpriv_users_fd(passwd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.9/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.10/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-01-27 21:35:04.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/apps/mono.te	2006-01-31 17:07:25.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/apps/mono.te	2006-02-03 09:00:31.000000000 -0500
 @@ -19,7 +19,7 @@
  
  ifdef(`targeted_policy',`
@@ -23,9 +108,9 @@
  	role system_r types mono_t;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.9/policy/modules/apps/wine.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.10/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-01-19 18:02:04.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/apps/wine.te	2006-01-31 17:10:24.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/apps/wine.te	2006-02-03 09:00:38.000000000 -0500
 @@ -19,7 +19,7 @@
  
  ifdef(`targeted_policy',`
@@ -35,9 +120,35 @@
  	role system_r types wine_t;
  	allow wine_t file_type:file execmod;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.9/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-01-30 18:40:35.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/kernel/filesystem.if	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.10/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/kernel/devices.fc	2006-02-03 09:28:41.000000000 -0500
+@@ -78,6 +78,7 @@
+ /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
+ /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+ /dev/usb/scanner.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
++/dev/bus/usb/.*/[0-9]+	-c	gen_context(system_u:object_r:usb_device_t,s0)
+ 
+ ifdef(`distro_redhat',`
+ # originally from named.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.10/policy/modules/kernel/devices.te
+--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/kernel/devices.te	2006-02-03 09:28:41.000000000 -0500
+@@ -159,6 +159,11 @@
+ genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
+ genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
+ 
++#
++# usb_device_t is the type for /dev/bus/usb/[0-9]+/[0-9]+
++type usb_device_t;
++dev_node(usb_device_t)
++
+ type v4l_device_t;
+ dev_node(v4l_device_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.10/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-01 08:23:28.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/kernel/filesystem.if	2006-02-03 09:00:38.000000000 -0500
 @@ -149,7 +149,7 @@
  		type fs_t;
  	')
@@ -47,7 +158,7 @@
  ')
  
  ########################################
-@@ -307,7 +307,7 @@
+@@ -289,7 +289,7 @@
  		type autofs_t;
  	')
  
@@ -56,7 +167,7 @@
  ')
  
  ########################################
-@@ -874,7 +874,7 @@
+@@ -856,7 +856,7 @@
  		type dosfs_t;
  	')
  
@@ -65,7 +176,7 @@
  ')
  
  ########################################
-@@ -994,7 +994,7 @@
+@@ -976,7 +976,7 @@
  		type iso9660_t;
  	')
  
@@ -74,7 +185,7 @@
  ')
  
  ########################################
-@@ -1061,7 +1061,7 @@
+@@ -1043,7 +1043,7 @@
  		type nfs_t;
  	')
  
@@ -83,7 +194,7 @@
  ')
  
  ########################################
-@@ -1626,7 +1626,7 @@
+@@ -1608,7 +1608,7 @@
  		type nfsd_fs_t;
  	')
  
@@ -92,7 +203,7 @@
  ')
  
  ########################################
-@@ -1727,7 +1727,7 @@
+@@ -1709,7 +1709,7 @@
  		type ramfs_t;
  	')
  
@@ -101,7 +212,7 @@
  ')
  
  ########################################
-@@ -1873,7 +1873,7 @@
+@@ -1855,7 +1855,7 @@
  		type romfs_t;
  	')
  
@@ -110,7 +221,7 @@
  ')
  
  ########################################
-@@ -1940,7 +1940,7 @@
+@@ -1922,7 +1922,7 @@
  		type rpc_pipefs_t;
  	')
  
@@ -119,7 +230,7 @@
  ')
  
  ########################################
-@@ -2006,7 +2006,7 @@
+@@ -1988,7 +1988,7 @@
  		type tmpfs_t;
  	')
  
@@ -128,9 +239,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.9/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.10/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-01-17 17:08:52.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/kernel/filesystem.te	2006-01-30 19:01:01.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/kernel/filesystem.te	2006-02-03 09:00:38.000000000 -0500
 @@ -134,6 +134,7 @@
  #
  type dosfs_t, noxattrfs;
@@ -139,9 +250,9 @@
  genfscon fat / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.9/policy/modules/kernel/mls.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.10/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-01-17 17:08:52.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/kernel/mls.te	2006-01-30 19:01:01.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/kernel/mls.te	2006-02-03 09:00:38.000000000 -0500
 @@ -86,7 +86,8 @@
  ')
  
@@ -152,9 +263,9 @@
  range_transition initrc_t auditd_exec_t s15:c0.c255;
 +range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.9/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.10/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2005-11-15 09:13:36.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/apache.fc	2006-01-30 19:01:01.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/apache.fc	2006-02-03 09:00:38.000000000 -0500
 @@ -42,6 +42,8 @@
  /var/cache/php-eaccelerator(/.*)?	gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/php-mmcache(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -164,9 +275,9 @@
  
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.9/policy/modules/services/apache.te
---- nsaserefpolicy/policy/modules/services/apache.te	2006-01-17 17:08:52.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/apache.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.10/policy/modules/services/apache.te
+--- nsaserefpolicy/policy/modules/services/apache.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/apache.te	2006-02-03 09:00:38.000000000 -0500
 @@ -347,6 +347,7 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
@@ -175,31 +286,31 @@
  	allow httpd_t httpd_sys_script_t:fd use;
  	allow httpd_sys_script_t httpd_t:fd use;
  	allow httpd_sys_script_t httpd_t:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.9/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-01-17 17:08:53.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/automount.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.10/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/automount.te	2006-02-03 09:04:33.000000000 -0500
 @@ -64,6 +64,7 @@
  kernel_list_proc(automount_t)
  
- bootloader_getattr_boot_dir(automount_t)
+ bootloader_getattr_boot_dirs(automount_t)
 +bootloader_search_boot(automount_t)
  
  corecmd_exec_sbin(automount_t)
  corecmd_exec_bin(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.9/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-01-27 21:35:04.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/hal.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.10/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/hal.te	2006-02-03 09:03:37.000000000 -0500
 @@ -51,6 +51,7 @@
- kernel_write_proc_file(hald_t)
+ kernel_write_proc_files(hald_t)
  
- bootloader_getattr_boot_dir(hald_t)
+ bootloader_getattr_boot_dirs(hald_t)
 +bootloader_search_boot(hald_t)
  
  corecmd_exec_bin(hald_t)
  corecmd_exec_sbin(hald_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.9/policy/modules/services/irqbalance.te
---- nsaserefpolicy/policy/modules/services/irqbalance.te	2006-01-13 17:06:07.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/irqbalance.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.10/policy/modules/services/irqbalance.te
+--- nsaserefpolicy/policy/modules/services/irqbalance.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/irqbalance.te	2006-02-03 09:00:38.000000000 -0500
 @@ -31,6 +31,9 @@
  
  dev_read_sysfs(irqbalance_t)
@@ -210,18 +321,18 @@
  fs_getattr_all_fs(irqbalance_t)
  fs_search_auto_mountpoints(irqbalance_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.9/policy/modules/services/networkmanager.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.10/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2005-11-14 18:24:07.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/networkmanager.fc	2006-01-31 08:05:24.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/networkmanager.fc	2006-02-03 09:00:38.000000000 -0500
 @@ -1,2 +1,4 @@
  
 -/usr/bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/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)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.9/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-01-19 10:00:41.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/networkmanager.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.10/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-03 08:55:54.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/networkmanager.te	2006-02-03 09:00:38.000000000 -0500
 @@ -24,7 +24,7 @@
  allow NetworkManager_t self:fifo_file rw_file_perms;
  allow NetworkManager_t self:unix_dgram_socket create_socket_perms;
@@ -231,20 +342,20 @@
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
  allow NetworkManager_t self:udp_socket create_socket_perms;
  allow NetworkManager_t self:packet_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.9/policy/modules/services/procmail.te
---- nsaserefpolicy/policy/modules/services/procmail.te	2006-01-25 15:59:00.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/procmail.te	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.10/policy/modules/services/procmail.te
+--- nsaserefpolicy/policy/modules/services/procmail.te	2006-02-03 08:55:54.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/procmail.te	2006-02-03 09:06:03.000000000 -0500
 @@ -96,6 +96,7 @@
  optional_policy(`sendmail',`
  	mta_read_config(procmail_t)
- 	sendmail_rw_tcp_socket(procmail_t)
-+	sendmail_rw_unix_stream_socket(procmail_t)
+ 	sendmail_rw_tcp_sockets(procmail_t)
++ 	sendmail_rw_unix_stream_sockets(procmail_t)
  ')
  
  optional_policy(`spamassassin',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.2.9/policy/modules/services/sendmail.if
---- nsaserefpolicy/policy/modules/services/sendmail.if	2006-01-13 17:06:07.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/sendmail.if	2006-01-30 19:01:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.2.10/policy/modules/services/sendmail.if
+--- nsaserefpolicy/policy/modules/services/sendmail.if	2006-02-03 08:55:54.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/sendmail.if	2006-02-03 09:06:14.000000000 -0500
 @@ -52,6 +52,21 @@
  
  	allow $1 sendmail_t:tcp_socket { read write };
@@ -257,7 +368,7 @@
 +##	Domain allowed access.
 +## </param>
 +#
-+interface(`sendmail_rw_unix_stream_socket',`
++interface(`sendmail_rw_unix_stream_sockets',`
 +	gen_require(`
 +		type sendmail_t;
 +	')
@@ -267,9 +378,9 @@
  
  ########################################
  ## <summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.9/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-01-19 10:00:41.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/spamassassin.te	2006-02-01 08:17:33.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.10/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/spamassassin.te	2006-02-03 09:00:38.000000000 -0500
 @@ -77,6 +77,7 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -278,10 +389,10 @@
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.9/policy/modules/services/xserver.fc
---- nsaserefpolicy/policy/modules/services/xserver.fc	2006-01-30 18:40:36.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/xserver.fc	2006-01-30 19:01:01.000000000 -0500
-@@ -55,16 +55,19 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.10/policy/modules/services/xserver.fc
+--- nsaserefpolicy/policy/modules/services/xserver.fc	2006-02-01 08:23:32.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/xserver.fc	2006-02-03 09:00:38.000000000 -0500
+@@ -58,16 +58,19 @@
  
  /usr/X11R6/bin/[xgkw]dm	--	gen_context(system_u:object_r:xdm_exec_t,s0)
  /usr/X11R6/bin/iceauth	--	gen_context(system_u:object_r:iceauth_exec_t,s0)
@@ -304,9 +415,9 @@
  #
  # /var
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.9/policy/modules/services/xserver.if
---- nsaserefpolicy/policy/modules/services/xserver.if	2006-01-30 18:40:36.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/xserver.if	2006-01-30 19:02:46.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.10/policy/modules/services/xserver.if
+--- nsaserefpolicy/policy/modules/services/xserver.if	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/xserver.if	2006-02-03 09:00:38.000000000 -0500
 @@ -1,4 +1,25 @@
  ## <summary>X Windows Server</summary>
 +########################################
@@ -333,9 +444,9 @@
  
  template(`xserver_common_domain_template',`
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.9/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2006-01-30 18:40:36.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/services/xserver.te	2006-01-30 19:06:27.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.10/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/services/xserver.te	2006-02-03 09:00:38.000000000 -0500
 @@ -57,10 +57,8 @@
  type xserver_log_t;
  logging_log_file(xserver_log_t)
@@ -359,9 +470,9 @@
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.9/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.10/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/system/init.fc	2006-01-30 19:01:01.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/system/init.fc	2006-02-03 09:00:38.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -372,9 +483,21 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.9/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-01-30 18:40:37.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/system/unconfined.if	2006-01-31 17:12:23.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.10/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/system/libraries.fc	2006-02-03 09:15:07.000000000 -0500
+@@ -62,7 +62,7 @@
+ /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr/lib(64)?/libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?(/.*)?/libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.10/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/system/unconfined.if	2006-02-03 09:00:38.000000000 -0500
 @@ -41,14 +41,18 @@
  	tunable_policy(`allow_execheap',`
  		# Allow making the stack executable via mprotect.
@@ -396,9 +519,9 @@
  	')
  
  	tunable_policy(`allow_execmem && allow_execstack',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.9/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.10/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-01-27 21:35:05.000000000 -0500
-+++ serefpolicy-2.2.9/policy/modules/system/unconfined.te	2006-01-31 17:01:37.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/system/unconfined.te	2006-02-03 09:00:38.000000000 -0500
 @@ -148,4 +148,8 @@
  	optional_policy(`wine',`
  		wine_domtrans(unconfined_t)
@@ -408,3 +531,15 @@
 +		xserver_domtrans(unconfined_t)
 +	')
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.10/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.10/policy/modules/system/userdomain.te	2006-02-03 09:00:38.000000000 -0500
+@@ -162,6 +162,8 @@
+ 		')
+ 	')
+ 
++	init_exec(sysadm_t)
++
+ 	ifdef(`enable_mls',`
+ 		logging_read_audit_log(secadm_t)
+ 		logging_domtrans_auditctl(secadm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- selinux-policy.spec	1 Feb 2006 13:21:35 -0000	1.98
+++ selinux-policy.spec	3 Feb 2006 14:54:23 -0000	1.99
@@ -1,12 +1,12 @@
 %define distro redhat
 %define monolithic n
 %define POLICYVER 20
-%define POLICYCOREUTILSVER 1.29.17-1
+%define POLICYCOREUTILSVER 1.29.18-1
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.9
-Release: 2
+Version: 2.2.10
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -23,6 +23,8 @@
 Source10: booleans-strict.conf
 Source11: seusers-strict
 Source12: setrans-strict.conf
+Source13: policygentool
+Source14: Makefile.devel
 
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/serefpolicy-buildroot
@@ -36,6 +38,7 @@
 
 %files 
 %{_mandir}/man8/*
+%doc /usr/share/doc/%{name}-%{version}
 
 %package targeted
 Summary: SELinux targeted base policy
@@ -49,10 +52,12 @@
 %description targeted
 SELinux Reference policy targeted base module.
 
-%define installCmds() \
+%define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
+
+%define installCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} modules \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
@@ -115,11 +120,11 @@
 fi
 
 %define rebuildpolicy() \
-semodule -b /usr/share/selinux/%1/base.pp -s %1 \
-for file in $(ls /usr/share/selinux/%1 | grep -v -e base.pp -e enableaudit.pp ) \
-do \
-	semodule -i /usr/share/selinux/%1/$file -s %1;\
-done; \
+( cd /usr/share/selinux/%1; \
+semodule -b base.pp -s %1; \
+x=`ls | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
+[ -z "$x" ] || semodule $x -s %1; \
+);\
 rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
 
 %define relabel() \
@@ -150,23 +155,29 @@
 # Commented out because only targeted ref policy currently builds
 make clean
 make conf
+%setupCmds targeted targeted-mcs y
 %installCmds targeted targeted-mcs y
 
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
 make clean
 make conf
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} bare 
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} conf
 %installCmds strict strict-mcs y
 
 # Build mls policy
 make clean
 make conf
+%setupCmds mls strict-mls n
 %installCmds mls strict-mls n
 
-# Install sources
+# Install devel
 make clean
 make 
-make DESTDIR=$RPM_BUILD_ROOT install-headers
+make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
+install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
+install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -280,9 +291,14 @@
 %dir %{_usr}/share/selinux/refpolicy
 %dir %{_usr}/share/selinux/refpolicy/include
 %{_usr}/share/selinux/refpolicy/include/*
+%{_usr}/share/selinux/refpolicy/Makefile
+%{_usr}/share/selinux/refpolicy/policygentool
 
 %changelog
 
+* Wed Feb 1 2006 Dan Walsh <dwalsh at redhat.com> 2.2.10-1
+- Fixes for the -devel package
+
 * Wed Feb 1 2006 Dan Walsh <dwalsh at redhat.com> 2.2.9-2
 - Fix for spamd to use ldap
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Jan 2006 00:35:32 -0000	1.37
+++ sources	3 Feb 2006 14:54:23 -0000	1.38
@@ -1 +1 @@
-a795741d83a3bc84cc508236316ff80b  serefpolicy-2.2.9.tgz
+b89cd3e61692bd15973e4f74ac3f2bec  serefpolicy-2.2.10.tgz



From fedora-cvs-commits at redhat.com  Fri Feb  3 14:58:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 09:58:41 -0500
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.159,
	1.160 policycoreutils.spec, 1.230, 1.231
Message-ID: <200602031458.k13Ewf2u021709@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21673

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:


policycoreutils-rhat.patch:
 seobject.py |  400 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 225 insertions(+), 175 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- policycoreutils-rhat.patch	31 Jan 2006 00:21:56 -0000	1.159
+++ policycoreutils-rhat.patch	3 Feb 2006 14:58:37 -0000	1.160
@@ -1,55 +1,485 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.15/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	2006-01-27 20:35:37.000000000 -0500
-+++ policycoreutils-1.29.15/scripts/genhomedircon	2006-01-30 11:49:16.000000000 -0500
-@@ -38,6 +38,17 @@
- 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']
- 
-+def grep(file, var):
-+	ret=""
-+	fd=open(file, 'r')
-+
-+	for i in  fd.read().split('\n'):
-+	    if re.search(var, i, 0) != None:
-+	        ret=i
-+                break
-+	fd.close()
-+	return ret
-+
- def findval(file, var, delim=""):
- 	val=""
- 	try:
-@@ -87,6 +98,12 @@
- 	
- 	if ret == []:
- 		ret.append("/home")
-+
-+	# Add /export/home if it exists
-+	# Some customers use this for automounted homedirs
-+	if os.path.exists("/export/home"):
-+		ret.append("/export/home")
-+
- 	return ret
- 
- def getSELinuxType(directory):
-@@ -168,9 +185,9 @@
- 					return "user_r"
- 		return name
- 	def getOldRole(self, role):
--		rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=")
-+		rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % role)
- 		if rc == "":					    
--			rc=findval(self.selinuxdir+self.type+"/users/local.users", 'grep "^user %s"' % role, "=")
-+			rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % role)
- 		if rc != "":
- 			user=rc.split()
- 			role = user[3]
-@@ -259,7 +276,7 @@
- 		return ret
- 
- 	def genHomeDirContext(self):
--		if self.semanaged and findval(self.getHomeDirTemplate(), "ROLE", "=") != "":
-+		if self.semanaged and grep(self.getHomeDirTemplate(), "ROLE") != "":
- 			warning("genhomedircon:  Warning!  No support yet for expanding ROLE macros in the %s file when using libsemanage." % self.getHomeDirTemplate());
- 			warning("genhomedircon:  You must manually update file_contexts.homedirs for any non-user_r users (including root).");
- 		users = self.getUsers()
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.18/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
++++ policycoreutils-1.29.18/semanage/seobject.py	2006-02-03 09:57:03.000000000 -0500
+@@ -21,8 +21,11 @@
+ #
+ #  
+ 
+-import pwd, string, selinux, tempfile, os, re
++import pwd, string, selinux, tempfile, os, re, sys
+ from semanage import *;
++import audit
++
++audit_fd=audit.audit_open()
+ 
+ def validate_level(raw):
+ 	sensitivity="s([0-9]|1[0-5])"
+@@ -170,119 +173,143 @@
+ 		if sename == "":
+ 			sename = "user_u"
+ 			
+-		(rc,k) = semanage_seuser_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
+-
+-		(rc,exists) = semanage_seuser_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if login mapping for %s is defined" % name)
+-		if exists:
+-			raise ValueError("Login mapping for %s is already defined" % name)
+ 		try:
+-			pwd.getpwnam(name)
+-		except:
+-			raise ValueError("Linux User %s does not exist" % name)
+-			
+-		(rc,u) = semanage_seuser_create(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not create login mapping for %s" % name)
++			(rc,k) = semanage_seuser_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
+ 
+-		rc = semanage_seuser_set_name(self.sh, u, name)
+-		if rc < 0:
+-			raise ValueError("Could not set name for %s" % name)
++			(rc,exists) = semanage_seuser_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if login mapping for %s is defined" % name)
++			if exists:
++				raise ValueError("Login mapping for %s is already defined" % name)
++			try:
++				pwd.getpwnam(name)
++			except:
++				raise ValueError("Linux User %s does not exist" % name)
+ 
+-		rc = semanage_seuser_set_mlsrange(self.sh, u, serange)
+-		if rc < 0:
+-			raise ValueError("Could not set MLS range for %s" % name)
++			(rc,u) = semanage_seuser_create(self.sh)
++			if rc < 0:
++				raise ValueError("Could not create login mapping for %s" % name)
+ 
+-		rc = semanage_seuser_set_sename(self.sh, u, sename)
+-		if rc < 0:
+-			raise ValueError("Could not set SELinux user for %s" % name)
++			rc = semanage_seuser_set_name(self.sh, u, name)
++			if rc < 0:
++				raise ValueError("Could not set name for %s" % name)
+ 
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not start semanage transaction")
++			rc = semanage_seuser_set_mlsrange(self.sh, u, serange)
++			if rc < 0:
++				raise ValueError("Could not set MLS range for %s" % name)
+ 
+-		rc = semanage_seuser_modify_local(self.sh, k, u)
+-		if rc < 0:
+-			raise ValueError("Could not add login mapping for %s" % name)
++			rc = semanage_seuser_set_sename(self.sh, u, sename)
++			if rc < 0:
++				raise ValueError("Could not set SELinux user for %s" % name)
+ 
+-		rc = semanage_commit(self.sh) 
+-		if rc < 0:
+-			raise ValueError("Could not add login mapping for %s" % name)
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not start semanage transaction")
+ 
++			rc = semanage_seuser_modify_local(self.sh, k, u)
++			if rc < 0:
++				raise ValueError("Could not add login mapping for %s" % name)
++
++			rc = semanage_commit(self.sh) 
++			if rc < 0:
++				raise ValueError("Could not add login mapping for %s" % name)
++
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
++		
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"adding selinux user mapping",
++					     name, 0, "", "", "", 1);
+ 		semanage_seuser_key_free(k)
+ 		semanage_seuser_free(u)
+ 
+ 	def modify(self, name, sename = "", serange = ""):
+-		if sename == "" and serange == "":
+-			raise ValueError("Requires seuser or serange")
++		try:
++			if sename == "" and serange == "":
++				raise ValueError("Requires seuser or serange")
+ 
+-		(rc,k) = semanage_seuser_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
++			(rc,k) = semanage_seuser_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
+ 
+-		(rc,exists) = semanage_seuser_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if login mapping for %s is defined" % name)
+-		if not exists:
+-			raise ValueError("Login mapping for %s is not defined" % name)
++			(rc,exists) = semanage_seuser_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if login mapping for %s is defined" % name)
++			if not exists:
++				raise ValueError("Login mapping for %s is not defined" % name)
+ 
+-		(rc,u) = semanage_seuser_query(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not query seuser for %s" % name)
++			(rc,u) = semanage_seuser_query(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not query seuser for %s" % name)
+ 
+-		if serange != "":
+-			semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
+-		if sename != "":
+-			semanage_seuser_set_sename(self.sh, u, sename)
++			if serange != "":
++				semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
++			if sename != "":
++				semanage_seuser_set_sename(self.sh, u, sename)
+ 
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not srart semanage transaction")
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not srart semanage transaction")
+ 
+-		rc = semanage_seuser_modify_local(self.sh, k, u)
+-		if rc < 0:
+-			raise ValueError("Could not modify login mapping for %s" % name)
+-	
+-		rc = semanage_commit(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not modify login mapping for %s" % name)
++			rc = semanage_seuser_modify_local(self.sh, k, u)
++			if rc < 0:
++				raise ValueError("Could not modify login mapping for %s" % name)
+ 
++			rc = semanage_commit(self.sh)
++			if rc < 0:
++				raise ValueError("Could not modify login mapping for %s" % name)
++
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
++
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping",
++					     name, 0, "", "", "", 1);
+ 		semanage_seuser_key_free(k)
+ 		semanage_seuser_free(u)
+ 
+ 	def delete(self, name):
+-		(rc,k) = semanage_seuser_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
++		try:
++			(rc,k) = semanage_seuser_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
+ 
+-		(rc,exists) = semanage_seuser_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if login mapping for %s is defined" % name)
+-		if not exists:
+-			raise ValueError("Login mapping for %s is not defined" % name)
++			(rc,exists) = semanage_seuser_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if login mapping for %s is defined" % name)
++			if not exists:
++				raise ValueError("Login mapping for %s is not defined" % name)
+ 
+-		(rc,exists) = semanage_seuser_exists_local(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if login mapping for %s is defined" % name)
+-		if not exists:
+-			raise ValueError("Login mapping for %s is defined in policy, cannot be deleted" % name)
++			(rc,exists) = semanage_seuser_exists_local(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if login mapping for %s is defined" % name)
++			if not exists:
++				raise ValueError("Login mapping for %s is defined in policy, cannot be deleted" % name)
+ 
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not start semanage transaction")
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not start semanage transaction")
+ 
+-		rc = semanage_seuser_del_local(self.sh, k)
++			rc = semanage_seuser_del_local(self.sh, k)
+ 
+-		if rc < 0:
+-			raise ValueError("Could not delete login mapping for %s" % name)
++			if rc < 0:
++				raise ValueError("Could not delete login mapping for %s" % name)
+ 
+-		rc = semanage_commit(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not delete login mapping for %s" % name)
+-	
++			rc = semanage_commit(self.sh)
++			if rc < 0:
++				raise ValueError("Could not delete login mapping for %s" % name)
++
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
++
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete selinux user mapping",
++					     name, 0, "", "", "", 1);
+ 		semanage_seuser_key_free(k)
+ 
+ 		
+@@ -322,127 +349,150 @@
+ 		else:
+ 			selevel = untranslate(selevel)
+ 
+-		(rc,k) = semanage_user_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
++		try:
++			(rc,k) = semanage_user_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
+ 
+-		(rc,exists) = semanage_user_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if SELinux user %s is defined" % name)
+-		if exists:
+-			raise ValueError("SELinux user %s is already defined" % name)
++			(rc,exists) = semanage_user_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if SELinux user %s is defined" % name)
++			if exists:
++				raise ValueError("SELinux user %s is already defined" % name)
+ 
+-		(rc,u) = semanage_user_create(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not create SELinux user for %s" % name)
++			(rc,u) = semanage_user_create(self.sh)
++			if rc < 0:
++				raise ValueError("Could not create SELinux user for %s" % name)
+ 
+-		rc = semanage_user_set_name(self.sh, u, name)
+-		if rc < 0:
+-			raise ValueError("Could not set name for %s" % name)
++			rc = semanage_user_set_name(self.sh, u, name)
++			if rc < 0:
++				raise ValueError("Could not set name for %s" % name)
+ 
+-		for r in roles:
+-			rc = semanage_user_add_role(self.sh, u, r)
++			for r in roles:
++				rc = semanage_user_add_role(self.sh, u, r)
++				if rc < 0:
++					raise ValueError("Could not add role %s for %s" % (r, name))
++
++			rc = semanage_user_set_mlsrange(self.sh, u, serange)
+ 			if rc < 0:
+-				raise ValueError("Could not add role %s for %s" % (r, name))
++				raise ValueError("Could not set MLS range for %s" % name)
+ 
+-		rc = semanage_user_set_mlsrange(self.sh, u, serange)
+-		if rc < 0:
+-			raise ValueError("Could not set MLS range for %s" % name)
++			rc = semanage_user_set_mlslevel(self.sh, u, selevel)
++			if rc < 0:
++				raise ValueError("Could not set MLS level for %s" % name)
+ 
+-		rc = semanage_user_set_mlslevel(self.sh, u, selevel)
+-		if rc < 0:
+-			raise ValueError("Could not set MLS level for %s" % name)
++			(rc,key) = semanage_user_key_extract(self.sh,u)
++			if rc < 0:
++				raise ValueError("Could not extract key for %s" % name)
+ 
+-		(rc,key) = semanage_user_key_extract(self.sh,u)
+-		if rc < 0:
+-			raise ValueError("Could not extract key for %s" % name)
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not start semanage transaction")
+ 
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not start semanage transaction")
++			rc = semanage_user_modify_local(self.sh, k, u)
++			if rc < 0:
++				raise ValueError("Could not add SELinux user %s" % name)
+ 
+-		rc = semanage_user_modify_local(self.sh, k, u)
+-		if rc < 0:
+-			raise ValueError("Could not add SELinux user %s" % name)
++			rc = semanage_commit(self.sh)
++			if rc < 0:
++				raise ValueError("Could not add SELinux user %s" % name)
+ 
+-		rc = semanage_commit(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not add SELinux user %s" % name)
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
+ 
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add Selinux User Record",
++					     name, 0, "", "", "", 1);
+ 		semanage_user_key_free(k)
+ 		semanage_user_free(u)
+ 
+ 	def modify(self, name, roles = [], selevel = "", serange = ""):
+-		if len(roles) == 0  and serange == "" and selevel == "":
+-			raise ValueError("Requires roles, level or range")
++		try:
++			if len(roles) == 0  and serange == "" and selevel == "":
++				raise ValueError("Requires roles, level or range")
+ 
+-		(rc,k) = semanage_user_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
++			(rc,k) = semanage_user_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
+ 
+-		(rc,exists) = semanage_user_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if SELinux user %s is defined" % name)
+-		if not exists:
+-			raise ValueError("SELinux user %s is not defined" % name)
+-		
+-		(rc,u) = semanage_user_query(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not query user for %s" % name)
++			(rc,exists) = semanage_user_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if SELinux user %s is defined" % name)
++			if not exists:
++				raise ValueError("SELinux user %s is not defined" % name)
+ 
+-		if serange != "":
+-			semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
+-		if selevel != "":
+-			semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
+-			
+-		if len(roles) != 0:
+-			for r in roles:
+-				semanage_user_add_role(self.sh, u, r)
++			(rc,u) = semanage_user_query(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not query user for %s" % name)
+ 
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not start semanage transaction")
++			if serange != "":
++				semanage_user_set_mlsrange(self.sh, u, untranslate(serange))
++			if selevel != "":
++				semanage_user_set_mlslevel(self.sh, u, untranslate(selevel))
++
++			if len(roles) != 0:
++				for r in roles:
++					semanage_user_add_role(self.sh, u, r)
+ 
+-		rc = semanage_user_modify_local(self.sh, k, u)
+-		if rc < 0:
+-			raise ValueError("Could not modify SELinux user %s" % name)
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not start semanage transaction")
+ 
+-		rc = semanage_commit(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not modify SELinux user %s" % name)
+-		
++			rc = semanage_user_modify_local(self.sh, k, u)
++			if rc < 0:
++				raise ValueError("Could not modify SELinux user %s" % name)
++
++			rc = semanage_commit(self.sh)
++			if rc < 0:
++				raise ValueError("Could not modify SELinux user %s" % name)
++
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
++
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify Selinux User Record",
++					     name, 0, "", "", "", 1);
+ 		semanage_user_key_free(k)
+ 		semanage_user_free(u)
+ 
+ 	def delete(self, name):
+-		(rc,k) = semanage_user_key_create(self.sh, name)
+-		if rc < 0:
+-			raise ValueError("Could not create a key for %s" % name)
+-
+-		(rc,exists) = semanage_user_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if SELinux user %s is defined" % name)		
+-		if not exists:
+-			raise ValueError("SELinux user %s is not defined" % name)
++		try:
++			(rc,k) = semanage_user_key_create(self.sh, name)
++			if rc < 0:
++				raise ValueError("Could not create a key for %s" % name)
++			
++			(rc,exists) = semanage_user_exists(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if SELinux user %s is defined" % name)		
++			if not exists:
++				raise ValueError("SELinux user %s is not defined" % name)
+ 
+-		(rc,exists) = semanage_user_exists_local(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if SELinux user %s is defined" % name)
+-		if not exists:
+-			raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name)
++			(rc,exists) = semanage_user_exists_local(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not check if SELinux user %s is defined" % name)
++			if not exists:
++				raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name)
+ 			
+-		rc = semanage_begin_transaction(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not start semanage transaction")
++			rc = semanage_begin_transaction(self.sh)
++			if rc < 0:
++				raise ValueError("Could not start semanage transaction")
+ 
+-		rc = semanage_user_del_local(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not delete SELinux user %s" % name)
++			rc = semanage_user_del_local(self.sh, k)
++			if rc < 0:
++				raise ValueError("Could not delete SELinux user %s" % name)
+ 
+-		rc = semanage_commit(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not delete SELinux user %s" % name)
++			rc = semanage_commit(self.sh)
++			if rc < 0:
++				raise ValueError("Could not delete SELinux user %s" % name)
++		except ValueError, error:
++			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
++						     name, 0, "", "", "", 0);
++			raise error
+ 		
++		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"Delete Selinux User Record",
++					     name, 0, "", "", "", 1);
+ 		semanage_user_key_free(k)		
+ 
+ 	def get_all(self):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- policycoreutils.spec	2 Feb 2006 17:23:00 -0000	1.230
+++ policycoreutils.spec	3 Feb 2006 14:58:37 -0000	1.231
@@ -4,15 +4,15 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.18
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
-#Patch: policycoreutils-rhat.patch
+Patch: policycoreutils-rhat.patch
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} 
 PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
-Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils
+Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
@@ -34,7 +34,7 @@
 
 %prep
 %setup -q
-#%patch -p1 -b .rhat
+%patch -p1 -b .rhat
 
 %build
 make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all 
@@ -98,6 +98,9 @@
 
 %changelog
 
+* Fri Feb 3 2006 Dan Walsh <dwalsh at redhat.com> 1.29.18-2
+- Add auditing to semanage
+
 * Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.29.18-1
 - Update from upstream
 	* Merged clone record on set_con patch from Ivan Gyurdiev.



From fedora-cvs-commits at redhat.com  Fri Feb  3 14:59:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 09:59:09 -0500
Subject: rpms/selinux-policy/devel Makefile.devel, NONE, 1.1 policygentool,
	NONE, 1.1
Message-ID: <200602031459.k13Ex9Um021993@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21964

Added Files:
	Makefile.devel policygentool 
Log Message:



--- NEW FILE Makefile.devel ---

-include build.conf

# executables
PREFIX := /usr
BINDIR := $(PREFIX)/bin
SBINDIR := $(PREFIX)/sbin
CHECKMODULE := $(BINDIR)/checkmodule
SEMODULE := $(SBINDIR)/semodule
SEMOD_PKG := $(BINDIR)/semodule_package

# helper tools
AWK ?= gawk
INSTALL ?= install
M4 ?= m4
SED ?= sed
EINFO ?= echo

# set default build options
NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
MLSENABLED := $(shell cat /selinux/mls)

ifeq ($(MLSENABLED),1)
MCSFLAG=-mcs
endif

TYPE ?= $(NAME)${MCSFLAG}
DIRECT_INITRC ?= n
POLY ?= n

# installation paths
SHAREDIR := $(PREFIX)/share/selinux
MODPKGDIR := $(SHAREDIR)/$(NAME)
HEADERDIR := $(SHAREDIR)/refpolicy/include

# compile strict policy if requested.
ifneq ($(findstring strict,$(TYPE)),)
	M4PARAM += -D strict_policy
endif

# compile targeted policy if requested.
ifneq ($(findstring targeted,$(TYPE)),)
	M4PARAM += -D targeted_policy
endif

# enable MLS if requested.
ifneq ($(findstring -mls,$(TYPE)),)
	M4PARAM += -D enable_mls
	CHECKPOLICY += -M
	CHECKMODULE += -M
endif

# enable MLS if MCS requested.
ifneq ($(findstring -mcs,$(TYPE)),)
	M4PARAM += -D enable_mcs
	CHECKPOLICY += -M
	CHECKMODULE += -M
endif

# enable distribution-specific policy
ifneq ($(DISTRO),)
	M4PARAM += -D distro_$(DISTRO)
endif

# enable polyinstantiation
ifeq ($(POLY),y)
	M4PARAM += -D enable_polyinstantiation
endif

ifeq ($(DIRECT_INITRC),y)
	M4PARAM += -D direct_sysadm_daemon
endif

ifneq ($(VERBOSE),y)
	quiet := @
endif

M4PARAM += -D hide_broken_symptoms

# policy headers
m4support := $(wildcard $(HEADERDIR)/*.spt)
all_interfaces := $(wildcard $(HEADERDIR)/*.if)
rolemap := $(HEADERDIR)/rolemap

detected_mods := $(wildcard *.te)
detected_ifs := $(detected_mods:.te=.if)
all_packages := $(detected_mods:.te=.pp)
install_mods := $(MODPKGDIR)/$(all_packages)

########################################
#
# Functions
#

# parse-rolemap modulename,outputfile
define parse-rolemap
	$(verbose) $(M4) $(M4PARAM) $(rolemap) | \
		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
endef

# peruser-expansion modulename,outputfile
define peruser-expansion
	$(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" > $2
	$(call parse-rolemap,$1,$2)
	$(verbose) echo "')" >> $2
endef

########################################
#
# Main targets
#

all: $(all_packages)

########################################
#
# Build module packages
#
tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
	@$(EINFO) "Compliling $(NAME) $(basename $(@F)) module"
	@test -d tmp || mkdir -p tmp
	$(call peruser-expansion,$(basename $(@F)),$@.role)
	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@

tmp/%.mod.fc: $(m4support) %.fc
	$(verbose) $(M4) $(M4PARAM) $^ > $@

%.pp: tmp/%.mod tmp/%.mod.fc
	@echo "Creating $(NAME) $(@F) policy package"
	$(verbose) $(SEMOD_PKG) -o $@ -m $< -f $<.fc

tmp/all_interfaces.conf: $(m4support) $(all_interfaces) $(detected_ifs)
	@test -d tmp || mkdir -p tmp
	$(verbose) m4 $^ | sed -e s/dollarsstar/\$$\*/g > $@

########################################
#
# Clean the environment
#

clean:
	rm -fR tmp
	rm -f *.pp

.PHONY: clean install all default


--- NEW FILE policygentool ---
#! /usr/bin/env python
# Copyright (C) 2006 Red Hat 
# see file 'COPYING' for use and warranty information
#
# policygentool is a tool for the initial generation of SELinux policy
#
#    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
#
#  
import os, sys, getopt
import seobject
import re

########################### Interface File #############################
interface="\n\
## <summary>TEMPLATETYPE policy</summary>\n\
## <desc>\n\
##	<p>\n\
##		More descriptive text about TEMPLATETYPE.  The <desc>\n\
##		tag can also use <p>, <ul>, and <ol>\n\
##		html tags for formatting.\n\
##	</p>\n\
##	<p>\n\
##		This policy supports the following TEMPLATETYPE features:\n\
##		<ul>\n\
##		<li>Feature A</li>\n\
##		<li>Feature B</li>\n\
##		<li>Feature C</li>\n\
##		</ul>\n\
##	</p>\n\
## </desc>\n\
#\n\
\n\
########################################\n\
## <summary>\n\
##	Execute a domain transition to run TEMPLATETYPE.\n\
## </summary>\n\
## <param name=\"domain\">\n\
##	Domain allowed to transition.\n\
## </param>\n\
#\n\
interface(`TEMPLATETYPE_domtrans',`\n\
	gen_requires(`\n\
		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;\n\
	')\n\
\n\
	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)\n\
\n\
	allow $1 TEMPLATETYPE_t:fd use;\n\
	allow TEMPLATETYPE_t $1:fd use;\n\
	allow $1 TEMPLATETYPE_t:fifo_file rw_file_perms;\n\
	allow $1 TEMPLATETYPE_t:process sigchld;\n\
')\n\
"

########################### Type Enforcement File #############################
te="\n\
policy_module(TEMPLATE,1.0.0)\n\
\n\
########################################\n\
#\n\
# Declarations\n\
#\n\
\n\
type TEMPLATETYPE_t;\n\
type TEMPLATETYPE_exec_t;\n\
domain_type(TEMPLATETYPE_t)\n\
init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)\n\
\n\
########################################\n\
#\n\
# TEMPLATETYPE local policy\n\
#\n\
# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.\n"

########################### File Context ##################################
fc="\n\
# TEMPLATETYPE executable will have:\n\
# label: system_u:object_r:TEMPLATETYPE_exec_t\n\
# MLS sensitivity: s0\n\
# MCS categories: <none>\n\
\n\
EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)\n\
"
def errorExit(error):
	sys.stderr.write("%s: " % sys.argv[0])
	sys.stderr.write("%s\n" % error)
	sys.stderr.flush()
	sys.exit(1)


def write_te_file(module):
	file="%s.te" % module
	newte=re.sub("TEMPLATETYPE", module, te)
	if os.path.exists(file):
		errorExit("%s already exists" % file)
	fd = open(file, 'w')
	fd.write(newte)
	fd.close()

def write_if_file(module):
	file="%s.if" % module
	newif=re.sub("TEMPLATETYPE", module, interface)
	if os.path.exists(file):
		errorExit("%s already exists" % file)
	fd = open(file, 'w')
	fd.write(newif)
	fd.close()

def write_fc_file(module, executable):
	file="%s.fc" % module
	newfc=re.sub("TEMPLATETYPE", module, fc)
	newfc=re.sub("EXECUTABLE", executable, newfc)
	if os.path.exists(file):
		errorExit("%s already exists" % file)
	fd = open(file, 'w')
	fd.write(newfc)
	fd.close()

def gen_policy(module, executable):
	write_te_file(module)
	write_if_file(module)
	write_fc_file(module, executable)
	
if __name__ == '__main__':
	def usage(message = ""):
		print '%s ModuleName Executable' % sys.argv[0]
		sys.exit(1)
		
	if len(sys.argv) != 3:
		usage()

	gen_policy(sys.argv[1], sys.argv[2])

	



From fedora-cvs-commits at redhat.com  Fri Feb  3 15:06:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 10:06:47 -0500
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.6,1.7
Message-ID: <200602031506.k13F6lFM022956@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22890

Modified Files:
	gnome-user-share.spec 
Log Message:
require 2.2 instead of conflicting with < 2.2



Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-user-share.spec	3 Feb 2006 14:45:53 -0000	1.6
+++ gnome-user-share.spec	3 Feb 2006 15:06:45 -0000	1.7
@@ -8,14 +8,11 @@
 Source0: %{name}-%{version}.tar.gz
 Patch1: gnome-user-share-httpd-2.2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: httpd
+Requires: httpd >= 2.2.0
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: desktop-file-utils
 Prereq: GConf2
 
-# Config file format changed for 2.2.0 (patch1)
-Conflicts: httpd < 2.2.0
-
 %description
 gnome-user-share 
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 15:48:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 10:48:30 -0500
Subject: rpms/perl/devel perl.spec,1.80,1.81
Message-ID: <200602031548.k13FmUbc032029@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
5.8.8: rebuild for new gcc and glibc


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- perl.spec	1 Feb 2006 18:58:43 -0000	1.80
+++ perl.spec	3 Feb 2006 15:48:27 -0000	1.81
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    1
+%define perlrel    1.1
 %define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -524,6 +524,9 @@
 %endif
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1.1
+- Rebuild with new gcc and glibc
+
 * Wed Feb 01 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1
 - Upgrade to new upstream release 5.8.8, officially released today
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 15:55:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 10:55:06 -0500
Subject: rpms/hwdata/devel .cvsignore, 1.57, 1.58 hwdata.spec, 1.58,
	1.59 sources, 1.60, 1.61
Message-ID: <200602031555.k13Ft6Qa028103@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28086

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- Some cleanup and adds to the MonitorDB which closes several db related bugs.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	13 Dec 2005 22:28:28 -0000	1.57
+++ .cvsignore	3 Feb 2006 15:55:04 -0000	1.58
@@ -1 +1 @@
-hwdata-0.173.tar.gz
+hwdata-0.174.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- hwdata.spec	13 Dec 2005 22:28:28 -0000	1.58
+++ hwdata.spec	3 Feb 2006 15:55:04 -0000	1.59
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.173
+Version: 0.174
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,9 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	13 Dec 2005 22:28:28 -0000	1.60
+++ sources	3 Feb 2006 15:55:04 -0000	1.61
@@ -1 +1 @@
-f8381e2ba4e9b2384ce48bacb8f6e930  hwdata-0.173.tar.gz
+2e79f51fb50bdab3804689dc96e8be0e  hwdata-0.174.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:01:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:01:26 -0500
Subject: rpms/indent/devel indent-2.2.9-zh_TW.patch, NONE, 1.1 indent.spec,
	1.18, 1.19
Message-ID: <200602031601.k13G1QH6028225@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28179

Modified Files:
	indent.spec 
Added Files:
	indent-2.2.9-zh_TW.patch 
Log Message:
- Adding Wei-Lun Chao's zh_TW UTF-8 messages (#134044)


indent-2.2.9-zh_TW.patch:
 LINGUAS       |    2 
 zh_TW.Big5.po |  283 ----------------------------------------------------------
 zh_TW.po      |  283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 284 insertions(+), 284 deletions(-)

--- NEW FILE indent-2.2.9-zh_TW.patch ---
diff -burpN indent-2.2.9/po/LINGUAS indent-2.2.9-po/po/LINGUAS
--- indent-2.2.9/po/LINGUAS	2002-12-16 17:03:13.000000000 +0100
+++ indent-2.2.9-po/po/LINGUAS	2006-02-03 15:18:28.000000000 +0100
@@ -1 +1 @@
-ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
diff -burpN indent-2.2.9/po/zh_TW.Big5.po indent-2.2.9-po/po/zh_TW.Big5.po
--- indent-2.2.9/po/zh_TW.Big5.po	2002-12-16 17:14:37.000000000 +0100
+++ indent-2.2.9-po/po/zh_TW.Big5.po	1970-01-01 01:00:00.000000000 +0100
@@ -1,283 +0,0 @@
-# Language file for GNU indent (use indent.pot as template).
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Carlo Wood <indent at alinoe.com>, 2001.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: indent 2.2.7\n"
-"POT-Creation-Date: 2002-12-16 16:12+0000\n"
-"PO-Revision-Date: 2001-09-05 08:38+0800\n"
-"Last-Translator: Franklin W. <franklin at hyweb.com.tw>\n"
-"Language-Team: zh_TW.Big5 <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=big5\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/args.c:543
-msgid "usage: indent file [-o outfile ] [ options ]\n"
-msgstr "???k?Gindent <???J??> [-o ???X??] [????]\n"
-
-#: src/args.c:544
-msgid "       indent file1 file2 ... fileN [ options ]\n"
-msgstr "      indent <???J??1> <???J??2> ... [ ???? ]\n"
-
-#: src/args.c:609
-#, c-format
-msgid "indent: missing argument to parameter %s\n"
-msgstr "indent: ?????? %s ??????\n"
-
-#: src/args.c:717
-#, c-format
-msgid "indent: unknown option \"%s\"\n"
-msgstr "indent: ?????????? \"%s\"\n"
-
-#: src/args.c:728
-#, c-format
-msgid "option: %s\n"
-msgstr "?????G%s\n"
-
-#: src/args.c:744
-#, c-format
-msgid "GNU indent %s\n"
-msgstr ""
-
-#: src/args.c:827
-#, c-format
-msgid "indent: option ``%s'' requires a numeric parameter\n"
-msgstr "indent: ``%s'' ???????n?@?????r????????\n"
-
-#: src/args.c:836
-#, c-format
-msgid "indent: set_option: internal error: p_type %d\n"
-msgstr "indent: ???????~?Gset_option ???????X?{???~?? proto type %d\n"
-
-#: src/args.c:892
-#, fuzzy
-msgid "Profile contains an unterminated comment"
-msgstr "?]?w?????t?????~???r??"
-
-#: src/args.c:929
-msgid "Profile contains unpalatable characters"
-msgstr "?]?w?????t?????~???r??"
-
-#: src/backup.c:404
-msgid "indent:  Strange version-control value\n"
-msgstr "indent: ???????????T?????~\n"
-
-#: src/backup.c:405
-msgid "indent:  Using numbered-existing\n"
-msgstr "indent: ?N?????{?s????????\n"
-
-#: src/backup.c:434
-#, c-format
-msgid "indent: Can't make backup filename of %s\n"
-msgstr "indent: ?L?k???? %s ????????\n"
-
-#: src/backup.c:442
-#, c-format
-msgid "Can't open backup file %s"
-msgstr "?L?k?}???????? %s"
-
-#: src/backup.c:449
-#, c-format
-msgid "Can't write to backup file %s"
-msgstr "?L?k?g?J?????? %s"
-
-#: src/backup.c:463
-#, c-format
-msgid "Can't preserve modification time on backup file %s"
-msgstr "?L?k?b?????? %s ???O?d????????????"
-
-#: src/globs.c:41 src/globs.c:64
-msgid "indent: Virtual memory exhausted.\n"
-msgstr "indent: ?????O?????w????\n"
-
-#: src/globs.c:79
-#, c-format
-msgid "indent: %s:%d: %s:"
-msgstr ""
-
-#: src/globs.c:93
-msgid "indent: Fatal Error: "
-msgstr "indent: ?Y?????~?G"
-
-#: src/globs.c:103
-msgid "indent: System Error: "
-msgstr "indent: ?t?????~?G"
-
-#: src/globs.h:25
-msgid "Warning"
-msgstr ""
-
-#: src/globs.h:29
-msgid "Error"
-msgstr ""
-
-#: src/indent.c:156
-msgid "Ran out of memory"
-msgstr "?O?????w????"
-
-#: src/indent.c:588 src/indent.c:1248
-#, c-format
-msgid "Extra %c"
-msgstr "?h???r?? %c"
-
-#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438
-msgid "Line broken"
-msgstr "???@???????Q?????A???T?{"
-
-#: src/indent.c:1969
-msgid "Unmatched #else"
-msgstr "#else ???????????????????r"
-
-#: src/indent.c:1970
-msgid "Unmatched #elif"
-msgstr "#elif ???????????????????r"
-
-#: src/indent.c:1997
-msgid "Unmatched #endif"
-msgstr "#endif ???????????????????r"
-
-#: src/indent.c:2381
-msgid "EOF encountered in comment"
-msgstr "?b???????I??????????"
-
-#: src/indent.c:2610
-msgid "Unexpected end of file"
-msgstr "?????????????D"
-
-#: src/indent.c:2616
-#, c-format
-msgid "There were %d non-blank output lines and %d comments\n"
-msgstr "?w?s?? %d ???D???????P %d ??????\n"
-
-#: src/indent.c:2620
-#, c-format
-msgid "(Lines with comments)/(Lines with code): %6.3f\n"
-msgstr "???????P?{???X???????????G%6.3f\n"
-
-#: src/indent.c:2644
-#, fuzzy
-msgid "Line broken 2"
-msgstr "???@???????Q?????A???T?{"
-
-#: src/indent.c:2846
-#, c-format
-msgid "indent: only one output file (2nd was %s)\n"
-msgstr "indent: ?u?????@?????X?? (?z???w?F???G?????X???? %s)\n"
-
-#: src/indent.c:2855 src/indent.c:2881
-msgid "indent: only one input file when output file is specified\n"
-msgstr "indent: ???w???X?????A?u?????@?????J??\n"
-
-#: src/indent.c:2869 src/indent.c:2916
-msgid "indent: can't have filenames when specifying standard input\n"
-msgstr "indent: ???w???????????J???A???????a???J???W\n"
-
-#: src/indent.c:2889
-msgid "indent: only one input file when stdout is used\n"
-msgstr "indent: ???????????X???A?u?????@?????J??\n"
-
-#: src/indent.c:3103
-#, c-format
-msgid "Read profile %s\n"
-msgstr "?????]?w?? %s\n"
-
-#: src/io.c:187
-msgid "Internal buffering error"
-msgstr "???????s???X?{???~"
-
-#: src/io.c:349
-#, c-format
-msgid "Can't open input file %s"
-msgstr "?L?k?}?????J?? %s"
-
-#: src/io.c:354
-#, c-format
-msgid "Can't stat input file %s"
-msgstr "?L?k???????J?? %s ?????T"
-
-#: src/io.c:359
-#, c-format
-msgid "Warning: Zero-length file %s"
-msgstr "???i?G???? %s ?S?????e"
-
-#: src/io.c:367
-#, c-format
-msgid "File %s is too big to read"
-msgstr "???? %s ???j?A?L?k????"
-
-#: src/io.c:375
-#, c-format
-msgid "System problem reading file %s"
-msgstr "???????? %s ???o???t?????D"
-
-#: src/io.c:399
-#, c-format
-msgid "Error reading input file %s"
-msgstr "???????J?? %s ???o?????~"
-
-#: src/io.c:404
-#, c-format
-msgid "Error closeing input file %s"
-msgstr "???????J?? %s ???o?????D"
-
-#: src/io.c:588
-#, c-format
-msgid "Warning: File %s contains NULL-characters\n"
-msgstr "???i?G???? %s ?]?t???r???]NULL-char?^\n"
-
-#: src/lexi.c:756
-msgid "Unterminated character constant"
-msgstr "?i???????@???r????????"
-
-#: src/lexi.c:757
-msgid "Unterminated string constant"
-msgstr "?i???????@???r????????"
-
-#: src/lexi.c:999
-#, c-format
-msgid "old style assignment ambiguity in \"=%c\".  Assuming \"= %c\"\n"
-msgstr ""
-"?????q?????w???z \"=%c\"?A?i???????????g?k?Cindent ?N???]???? \"= %c\"\n"
-
-#: src/output.c:1148
-#, c-format
-msgid "indent: can't create %s\n"
-msgstr "indent: ?L?k???? %s\n"
-
-#: src/output.c:1187
-#, c-format
-msgid "Can't close output file %s"
-msgstr "?L?k???????X?? %s"
-
-#: src/output.c:1200
-#, c-format
-msgid "Can't preserve modification time on output file %s"
-msgstr "?L?k?b???X?? %s ?O?d????????????"
-
-#: src/parse.c:399
-msgid "Unmatched 'else'"
-msgstr "else ?????????????? if"
-
-#: src/parse.c:425
-msgid "Stmt nesting error."
-msgstr "?_?????z?????~?C"
-
-#: src/parse.c:467
-msgid "Unknown code to parser"
-msgstr "?L?k???R???{???X"
-
-#: src/parse.c:477
-#, c-format
-msgid "ParseStack [%d]:\n"
-msgstr ""
-
-#: src/parse.c:481
-#, c-format
-msgid "  stack[%d] =>   stack: %d   ind_level: %d\n"
-msgstr ""
-
-#: src/wildexp.c:90
-msgid "CANNOT FIND '@' FILE!"
-msgstr "?L?k???? '@' ?????C"
diff -burpN indent-2.2.9/po/zh_TW.po indent-2.2.9-po/po/zh_TW.po
--- indent-2.2.9/po/zh_TW.po	1970-01-01 01:00:00.000000000 +0100
+++ indent-2.2.9-po/po/zh_TW.po	2006-02-03 15:18:19.000000000 +0100
@@ -0,0 +1,283 @@
+# Language file for GNU indent (use indent.pot as template).
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Carlo Wood <indent at alinoe.com>, 2001.
+# Franklin W. <franklin at hyweb.com.tw>, 2002
+# Wei-Lun Chao <chaoweilun at pcmail.com.tw>, 2004
+msgid ""
+msgstr ""
+"Project-Id-Version: indent 2.2.9\n"
+"POT-Creation-Date: 2002-12-16 16:12+0000\n"
+"PO-Revision-Date: 2006-02-03 15:18+0100\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun at pcmail.com.tw>\n"
+"Language-Team: zh_TW <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/args.c:543
+msgid "usage: indent file [-o outfile ] [ options ]\n"
+msgstr "?????????indent <?????????> [-o ?????????] [??????]\n"
+
+#: src/args.c:544
+msgid "       indent file1 file2 ... fileN [ options ]\n"
+msgstr "      indent <?????????1> <?????????2> ... [ ?????? ]\n"
+
+#: src/args.c:609
+#, c-format
+msgid "indent: missing argument to parameter %s\n"
+msgstr "indent: ????????? %s ?????????\n"
+
+#: src/args.c:717
+#, c-format
+msgid "indent: unknown option \"%s\"\n"
+msgstr "indent: ??????????????? \"%s\"\n"
+
+#: src/args.c:728
+#, c-format
+msgid "option: %s\n"
+msgstr "?????????%s\n"
+
+#: src/args.c:744
+#, c-format
+msgid "GNU indent %s\n"
+msgstr "GNU indent %s\n"
+
+#: src/args.c:827
+#, c-format
+msgid "indent: option ``%s'' requires a numeric parameter\n"
+msgstr "indent: ``%s'' ????????????????????????????????????\n"
+
+#: src/args.c:836
+#, c-format
+msgid "indent: set_option: internal error: p_type %d\n"
+msgstr "indent: ???????????????set_option ???????????????????????? proto type %d\n"
+
+#: src/args.c:892
+#, fuzzy
+msgid "Profile contains an unterminated comment"
+msgstr "?????????????????????????????????"
+
+#: src/args.c:929
+msgid "Profile contains unpalatable characters"
+msgstr "?????????????????????????????????"
+
+#: src/backup.c:404
+msgid "indent:  Strange version-control value\n"
+msgstr "indent: ???????????????????????????\n"
+
+#: src/backup.c:405
+msgid "indent:  Using numbered-existing\n"
+msgstr "indent: ???????????????????????????\n"
+
+#: src/backup.c:434
+#, c-format
+msgid "indent: Can't make backup filename of %s\n"
+msgstr "indent: ???????????? %s ????????????\n"
+
+#: src/backup.c:442
+#, c-format
+msgid "Can't open backup file %s"
+msgstr "????????????????????? %s"
+
+#: src/backup.c:449
+#, c-format
+msgid "Can't write to backup file %s"
+msgstr "????????????????????? %s"
+
+#: src/backup.c:463
+#, c-format
+msgid "Can't preserve modification time on backup file %s"
+msgstr "?????????????????? %s ???????????????????????????"
+
+#: src/globs.c:41 src/globs.c:64
+msgid "indent: Virtual memory exhausted.\n"
+msgstr "indent: ????????????????????????\n"
+
+#: src/globs.c:79
+#, c-format
+msgid "indent: %s:%d: %s:"
+msgstr "indent: %s:%d: %s:"
+
+#: src/globs.c:93
+msgid "indent: Fatal Error: "
+msgstr "indent: ???????????????"
+
+#: src/globs.c:103
+msgid "indent: System Error: "
+msgstr "indent: ???????????????"
+
+#: src/globs.h:25
+msgid "Warning"
+msgstr "??????"
+
+#: src/globs.h:29
+msgid "Error"
+msgstr "??????"
+
+#: src/indent.c:156
+msgid "Ran out of memory"
+msgstr "??????????????????"
+
+#: src/indent.c:588 src/indent.c:1248
+#, c-format
+msgid "Extra %c"
+msgstr "???????????? %c"
+
+#: src/indent.c:1352 src/indent.c:1378 src/indent.c:2438
+msgid "Line broken"
+msgstr "????????????????????????????????????"
+
+#: src/indent.c:1969
+msgid "Unmatched #else"
+msgstr "#else ??????????????????????????????"
+
+#: src/indent.c:1970
+msgid "Unmatched #elif"
+msgstr "#elif ??????????????????????????????"
+
+#: src/indent.c:1997
+msgid "Unmatched #endif"
+msgstr "#endif ??????????????????????????????"
+
+#: src/indent.c:2381
+msgid "EOF encountered in comment"
+msgstr "??????????????????????????????"
+
+#: src/indent.c:2610
+msgid "Unexpected end of file"
+msgstr "?????????????????????"
+
+#: src/indent.c:2616
+#, c-format
+msgid "There were %d non-blank output lines and %d comments\n"
+msgstr "????????? %d ?????????????????? %d ?????????\n"
+
+#: src/indent.c:2620
+#, c-format
+msgid "(Lines with comments)/(Lines with code): %6.3f\n"
+msgstr "???????????????????????????????????????%6.3f\n"
+
+#: src/indent.c:2644
+#, fuzzy
+msgid "Line broken 2"
+msgstr "????????????????????????????????????"
+
+#: src/indent.c:2846
+#, c-format
+msgid "indent: only one output file (2nd was %s)\n"
+msgstr "indent: ???????????????????????? (????????????????????????????????? %s)\n"
+
+#: src/indent.c:2855 src/indent.c:2881
+msgid "indent: only one input file when output file is specified\n"
+msgstr "indent: ?????????????????????????????????????????????\n"
+
+#: src/indent.c:2869 src/indent.c:2916
+msgid "indent: can't have filenames when specifying standard input\n"
+msgstr "indent: ??????????????????????????????????????????????????????\n"
+
+#: src/indent.c:2889
+msgid "indent: only one input file when stdout is used\n"
+msgstr "indent: ????????????????????????????????????????????????\n"
+
+#: src/indent.c:3103
+#, c-format
+msgid "Read profile %s\n"
+msgstr "??????????????? %s\n"
+
+#: src/io.c:187
+msgid "Internal buffering error"
+msgstr "???????????????????????????"
+
+#: src/io.c:349
+#, c-format
+msgid "Can't open input file %s"
+msgstr "????????????????????? %s"
+
+#: src/io.c:354
+#, c-format
+msgid "Can't stat input file %s"
+msgstr "????????????????????? %s ?????????"
+
+#: src/io.c:359
+#, c-format
+msgid "Warning: Zero-length file %s"
+msgstr "??????????????? %s ????????????"
+
+#: src/io.c:367
+#, c-format
+msgid "File %s is too big to read"
+msgstr "?????? %s ?????????????????????"
+
+#: src/io.c:375
+#, c-format
+msgid "System problem reading file %s"
+msgstr "???????????? %s ?????????????????????"
+
+#: src/io.c:399
+#, c-format
+msgid "Error reading input file %s"
+msgstr "??????????????? %s ???????????????"
+
+#: src/io.c:404
+#, c-format
+msgid "Error closeing input file %s"
+msgstr "??????????????? %s ???????????????"
+
+#: src/io.c:588
+#, c-format
+msgid "Warning: File %s contains NULL-characters\n"
+msgstr "??????????????? %s ??????????????????NULL-char???\n"
+
+#: src/lexi.c:756
+msgid "Unterminated character constant"
+msgstr "?????????????????????????????????"
+
+#: src/lexi.c:757
+msgid "Unterminated string constant"
+msgstr "?????????????????????????????????"
+
+#: src/lexi.c:999
+#, c-format
+msgid "old style assignment ambiguity in \"=%c\".  Assuming \"= %c\"\n"
+msgstr "???????????????????????? \"=%c\"??????????????????????????????indent ??????????????? \"= %c\"\n"
+
+#: src/output.c:1148
+#, c-format
+msgid "indent: can't create %s\n"
+msgstr "indent: ???????????? %s\n"
+
+#: src/output.c:1187
+#, c-format
+msgid "Can't close output file %s"
+msgstr "????????????????????? %s"
+
+#: src/output.c:1200
+#, c-format
+msgid "Can't preserve modification time on output file %s"
+msgstr "?????????????????? %s ????????????????????????"
+
+#: src/parse.c:399
+msgid "Unmatched 'else'"
+msgstr "else ????????????????????? if"
+
+#: src/parse.c:425
+msgid "Stmt nesting error."
+msgstr "????????????????????????"
+
+#: src/parse.c:467
+msgid "Unknown code to parser"
+msgstr "????????????????????????"
+
+#: src/parse.c:477
+#, c-format
+msgid "ParseStack [%d]:\n"
+msgstr "???????????? [%d]:\n"
+
+#: src/parse.c:481
+#, c-format
+msgid "  stack[%d] =>   stack: %d   ind_level: %d\n"
+msgstr "  ??????[%d] =>   ??????: %d   ????????????: %d\n"
+
+#: src/wildexp.c:90
+msgid "CANNOT FIND '@' FILE!"
+msgstr "???????????? '@' ?????????"


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- indent.spec	1 Feb 2006 13:25:16 -0000	1.18
+++ indent.spec	3 Feb 2006 16:01:23 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 11
+Release: 12
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -11,6 +11,7 @@
 Patch3: indent-2.2.9-explicits.patch
 Patch4: indent-2.2.9-cdw.patch
 Patch5: indent-2.2.9-lcall.patch
+Patch6: indent-2.2.9-zh_TW.patch
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -30,6 +31,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 
@@ -68,7 +70,10 @@
 
 
 %changelog
-* Wed Feb 1 2006 Petr Machata <pmachata at redhat.com> 2.2.9-11
+* Wed Feb 02 2006 Petr Machata <pmachata at redhat.com> 2.2.9-12
+- Adding Wei-Lun Chao's zh_TW UTF-8 messages (#134044)
+
+* Wed Feb 01 2006 Petr Machata <pmachata at redhat.com> 2.2.9-11
 - Setting LC_ALL instead of LC_MESSAGES in order to fix output of
   KOI8-R characters.  (#134044)
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:20:21 -0500
Subject: rpms/kernel-xen/devel/configs config-xen-xen0,1.3,1.4
Message-ID: <200602031620.k13GKLow008427@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	config-xen-xen0 
Log Message:
Rebase to linux-2.6-merge.hg cset 19892
Disable PAE again
Rebase to chrisw's latest merge tree (fix skbuff conflicts)
Enable ACPI debugging for now as a workaround for the ACPI heisenbug




Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-xen0,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-xen0	9 Jan 2006 22:02:01 -0000	1.3
+++ config-xen-xen0	3 Feb 2006 16:20:18 -0000	1.4
@@ -71,3 +71,9 @@
 #
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
+
+#
+# Don't ask me why, but ACPI is currently broken unless debug is enabled.
+# We're working on it.
+#
+CONFIG_ACPI_DEBUG=y



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:20:21 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.38,
	1.39 linux-2.6-xen-merge.patch, 1.7, 1.8
Message-ID: <200602031620.k13GKLek008413@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	kernel-xen.spec linux-2.6-xen-merge.patch 
Log Message:
Rebase to linux-2.6-merge.hg cset 19892
Disable PAE again
Rebase to chrisw's latest merge tree (fix skbuff conflicts)
Enable ACPI debugging for now as a workaround for the ACPI heisenbug




Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kernel-xen.spec	2 Feb 2006 14:08:25 -0000	1.38
+++ kernel-xen.spec	3 Feb 2006 16:20:17 -0000	1.39
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -1574,6 +1574,14 @@
 %endif
 
 %changelog
+* Fri Feb  3 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to chrisw's latest merge tree (fix skbuff conflicts)
+- Enable ACPI debugging for now as a workaround for the ACPI heisenbug
+
+* Thu Feb  2 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19892
+- Disable PAE again
+
 * Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
 - merged with rawhide 1985.
 - enable PAE for this run.

linux-2.6-xen-merge.patch:
 arch/i386/Kconfig                                |   81 
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   43 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61909 insertions(+), 819 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.7 -r 1.8 linux-2.6-xen-merge.patch
Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen-merge.patch	31 Jan 2006 21:26:16 -0000	1.7
+++ linux-2.6-xen-merge.patch	3 Feb 2006 16:20:17 -0000	1.8
@@ -1,6 +1,6 @@
-diff -r df46ccb05adf -r 328a491adf0b arch/i386/Kconfig
---- a/arch/i386/Kconfig	Fri Jan 20 17:49:15 2006 +0800
-+++ b/arch/i386/Kconfig	Fri Jan 27 20:45:25 2006 +0100
+diff -r 52f446a807c8 -r 2905f31ca453 arch/i386/Kconfig
+--- a/arch/i386/Kconfig	Thu Feb  2 00:53:27 2006 +0800
++++ b/arch/i386/Kconfig	Wed Feb  1 20:21:42 2006 -0500
 @@ -50,6 +50,7 @@ config DOUBLEFAULT
  config DOUBLEFAULT
  	default y
@@ -9,7 +9,7 @@
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-@@ -66,6 +67,15 @@ config X86_PC
+@@ -57,6 +57,15 @@ config X86_PC
  	bool "PC-compatible"
  	help
  	  Choose this option if your computer is a standard PC or compatible.
@@ -25,7 +25,7 @@
  
  config X86_ELAN
  	bool "AMD Elan"
-@@ -168,6 +178,7 @@ source "arch/i386/Kconfig.cpu"
+@@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
  	bool "HPET Timer Support"
@@ -33,7 +33,7 @@
  	help
  	  This enables the use of the HPET for the kernel's internal timer.
  	  HPET is the next generation timer replacing legacy 8254s.
-@@ -211,6 +222,19 @@ config SMP
+@@ -202,6 +212,19 @@ config SMP
  
  	  If you don't know what to do here, say N.
  
@@ -53,7 +53,7 @@
  config NR_CPUS
  	int "Maximum number of CPUs (2-255)"
  	range 2 255
-@@ -227,7 +251,7 @@ config NR_CPUS
+@@ -218,7 +241,7 @@ config NR_CPUS
  
  config SCHED_SMT
  	bool "SMT (Hyperthreading) scheduler support"
@@ -62,7 +62,7 @@
  	default off
  	help
  	  SMT scheduler support improves the CPU scheduler's decision making
-@@ -239,7 +263,7 @@ source "kernel/Kconfig.preempt"
+@@ -230,7 +253,7 @@ source "kernel/Kconfig.preempt"
  
  config X86_UP_APIC
  	bool "Local APIC support on uniprocessors"
@@ -71,7 +71,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -264,22 +288,27 @@ config X86_UP_IOAPIC
+@@ -255,22 +278,27 @@ config X86_UP_IOAPIC
  
  config X86_LOCAL_APIC
  	bool
@@ -102,7 +102,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -369,6 +398,7 @@ config X86_REBOOTFIXUPS
+@@ -360,6 +388,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -110,7 +110,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
-@@ -386,6 +416,7 @@ config MICROCODE
+@@ -377,6 +406,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -118,7 +118,7 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -400,6 +431,10 @@ config X86_CPUID
+@@ -391,6 +421,10 @@ config X86_CPUID
  	  be executed on a specific processor.  It is a character device
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
@@ -129,7 +129,7 @@
  
  source "drivers/firmware/Kconfig"
  
-@@ -531,7 +566,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+@@ -559,7 +593,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -138,7 +138,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
-@@ -540,6 +575,7 @@ config HIGHPTE
+@@ -568,6 +602,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -146,7 +146,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -565,6 +601,8 @@ config MATH_EMULATION
+@@ -593,6 +628,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -155,7 +155,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -599,7 +637,7 @@ config MTRR
+@@ -627,7 +664,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -164,7 +164,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -617,7 +655,7 @@ config EFI
+@@ -645,7 +682,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -173,7 +173,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -660,7 +698,7 @@ source kernel/Kconfig.hz
+@@ -688,7 +725,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -182,7 +182,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
-@@ -715,18 +753,20 @@ endmenu
+@@ -752,18 +790,20 @@ endmenu
  
  
  menu "Power management options (ACPI, APM)"
@@ -207,7 +207,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -874,6 +914,7 @@ endmenu
+@@ -911,6 +951,7 @@ endmenu
  endmenu
  
  menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
@@ -215,7 +215,7 @@
  
  config PCI
  	bool "PCI support" if !X86_VISWS
-@@ -911,6 +952,7 @@ choice
+@@ -948,6 +989,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -223,7 +223,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -925,7 +967,7 @@ endchoice
+@@ -962,7 +1004,7 @@ endchoice
  
  config PCI_BIOS
  	bool
@@ -232,7 +232,7 @@
  	default y
  
  config PCI_DIRECT
-@@ -944,11 +986,12 @@ source "drivers/pci/Kconfig"
+@@ -981,11 +1023,12 @@ source "drivers/pci/Kconfig"
  
  config ISA_DMA_API
  	bool
@@ -246,7 +246,7 @@
  	help
[...5893 lines suppressed...]
 +/******************************************************************************
 + * Generic scheduler control interface.
@@ -65475,9 +65610,9 @@
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/interface/trace.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/interface/trace.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/interface/trace.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/interface/trace.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,90 @@
 +/******************************************************************************
 + * include/public/trace.h
@@ -65569,9 +65704,9 @@
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/interface/vcpu.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/interface/vcpu.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/interface/vcpu.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/interface/vcpu.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,64 @@
 +/******************************************************************************
 + * vcpu.h
@@ -65637,10 +65772,10 @@
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/interface/version.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/interface/version.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/interface/version.h	Fri Jan 27 20:45:25 2006 +0100
-@@ -0,0 +1,52 @@
++++ b/include/xen/interface/version.h	Wed Feb  1 20:21:42 2006 -0500
+@@ -0,0 +1,63 @@
 +/******************************************************************************
 + * version.h
 + * 
@@ -65682,6 +65817,17 @@
 +    unsigned long virt_start;
 +} xen_platform_parameters_t;
 +
++#define XENVER_get_features 6
++typedef struct xen_feature_info {
++    unsigned int submap_idx;    /* IN: which 32-bit submap to return */
++    uint32_t     submap;        /* OUT: 32-bit submap */
++} xen_feature_info_t;
++
++#define XENFEAT_writable_page_tables       0
++#define XENFEAT_writable_descriptor_tables 1
++
++#define XENFEAT_NR_SUBMAPS 1
++
 +#endif /* __XEN_PUBLIC_VERSION_H__ */
 +
 +/*
@@ -65693,10 +65839,10 @@
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/interface/xen.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/interface/xen.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/interface/xen.h	Fri Jan 27 20:45:25 2006 +0100
-@@ -0,0 +1,449 @@
++++ b/include/xen/interface/xen.h	Wed Feb  1 20:21:42 2006 -0500
+@@ -0,0 +1,447 @@
 +/******************************************************************************
 + * xen.h
 + * 
@@ -65938,8 +66084,7 @@
 + * Send an array of these to HYPERVISOR_mmu_update().
 + * NB. The fields are natural pointer/address size for this architecture.
 + */
-+typedef struct
-+{
++typedef struct mmu_update {
 +    uint64_t ptr;       /* Machine address of PTE. */
 +    uint64_t val;       /* New contents of PTE.    */
 +} mmu_update_t;
@@ -65948,8 +66093,7 @@
 + * Send an array of these to HYPERVISOR_multicall().
 + * NB. The fields are natural register size for this architecture.
 + */
-+typedef struct
-+{
++typedef struct multicall_entry {
 +    unsigned long op, result;
 +    unsigned long args[6];
 +} multicall_entry_t;
@@ -66146,9 +66290,9 @@
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/net_driver_util.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/net_driver_util.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/net_driver_util.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/net_driver_util.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,56 @@
 +/*****************************************************************************
 + *
@@ -66206,9 +66350,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/public/evtchn.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/public/evtchn.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/public/evtchn.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/public/evtchn.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,98 @@
 +/******************************************************************************
 + * evtchn.h
@@ -66308,9 +66452,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/public/privcmd.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/public/privcmd.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/public/privcmd.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/public/privcmd.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,91 @@
 +/******************************************************************************
 + * privcmd.h
@@ -66403,9 +66547,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/public/xenstored.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/public/xenstored.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/public/xenstored.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/public/xenstored.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,89 @@
 +/*
 + * Simple prototyle Xen Store Daemon providing simple tree-like database.
@@ -66496,9 +66640,9 @@
 +};
 +
 +#endif /* _XENSTORED_H */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/tpmfe.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/tpmfe.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/tpmfe.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/tpmfe.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,33 @@
 +#ifndef TPM_FE_H
 +#define TPM_FE_H
@@ -66533,9 +66677,9 @@
 +void tpm_fe_unregister_receiver(void);
 +
 +#endif
-diff -r df46ccb05adf -r 328a491adf0b include/xen/xen_proc.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/xen_proc.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/xen_proc.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/xen_proc.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,23 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -66560,9 +66704,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/xenbus.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/xenbus.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/xenbus.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/xenbus.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,254 @@
 +/******************************************************************************
 + * xenbus.h
@@ -66818,9 +66962,9 @@
 + *  tab-width: 8
 + * End:
 + */
-diff -r df46ccb05adf -r 328a491adf0b include/xen/xencons.h
+diff -r 52f446a807c8 -r 2905f31ca453 include/xen/xencons.h
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/include/xen/xencons.h	Fri Jan 27 20:45:25 2006 +0100
++++ b/include/xen/xencons.h	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,14 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -66836,9 +66980,9 @@
 +int xencons_ring_send(const char *data, unsigned len);
 +
 +#endif /* __ASM_XENCONS_H__ */
-diff -r df46ccb05adf -r 328a491adf0b scripts/Makefile.xen
+diff -r 52f446a807c8 -r 2905f31ca453 scripts/Makefile.xen
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
-+++ b/scripts/Makefile.xen	Fri Jan 27 20:45:25 2006 +0100
++++ b/scripts/Makefile.xen	Wed Feb  1 20:21:42 2006 -0500
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:34:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:34:01 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1591,1.1592
Message-ID: <200602031634.k13GY15l019451@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
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.1591
retrieving revision 1.1592
diff -u -r1.1591 -r1.1592
--- kernel-2.6.spec	2 Feb 2006 22:05:57 -0000	1.1591
+++ kernel-2.6.spec	3 Feb 2006 16:33:25 -0000	1.1592
@@ -669,7 +669,7 @@
 %patch1023 -p1
 %patch1024 -p1
 %patch1025 -p1
-%patch1026 -p1
+#%patch1026 -p1
 %patch1027 -p1
 %patch1028 -p1
 
@@ -1273,6 +1273,9 @@
 %endif
 
 %changelog
+* Fri Feb  3 2006 Dave Jones <davej at redhat.com>
+- Make 'quiet' work again.
+
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1830_FC4]
 - Remove r8169 debugging.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:35:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:35:08 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2.bz2.sign, NONE, 1.1 .cvsignore,
	1.335, 1.336 drm.patch, 1.1, 1.2 kernel-2.6.spec, 1.1898,
	1.1899 linux-2.6-debug-singlebiterror.patch, 1.5, 1.6 sources,
	1.277, 1.278 upstream, 1.252, 1.253
Message-ID: <200602031635.k13GZ8FM019585@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore drm.patch kernel-2.6.spec 
	linux-2.6-debug-singlebiterror.patch sources upstream 
Added Files:
	patch-2.6.16-rc2.bz2.sign 
Log Message:
rc2



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

iD8DBQBD4vu4yGugalF9Dw4RAj/kAJ97++ivhc2RkFmeAvATGmP1vDApYwCaAumq
CYzywIPTcbHSKwTCXrxekX0=
=ppHJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- .cvsignore	2 Feb 2006 21:20:36 -0000	1.335
+++ .cvsignore	3 Feb 2006 16:34:55 -0000	1.336
@@ -2,8 +2,6 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
 bcm43xx-20060114.tar.bz2
-acpi-release-20060113-2.6.16-rc1.diff.bz2
-patch-2.6.16-rc1-git5.bz2
+patch-2.6.16-rc2.bz2
 patch-2.6.16-rc1-git6.bz2

drm.patch:
 b/drivers/char/drm/Makefile           |    4 
 b/drivers/char/drm/ati_pcigart.c      |   40 -
 b/drivers/char/drm/drm.h              |    4 
 b/drivers/char/drm/drmP.h             |  127 +++--
 b/drivers/char/drm/drm_agpsupport.c   |  133 +++--
 b/drivers/char/drm/drm_auth.c         |   20 
 b/drivers/char/drm/drm_bufs.c         |  129 +++--
 b/drivers/char/drm/drm_context.c      |   54 +-
 b/drivers/char/drm/drm_core.h         |    4 
 b/drivers/char/drm/drm_drv.c          |  156 +++---
 b/drivers/char/drm/drm_fops.c         |  325 +++++++------
 b/drivers/char/drm/drm_ioc32.c        |    1 
 b/drivers/char/drm/drm_ioctl.c        |   45 -
 b/drivers/char/drm/drm_irq.c          |   16 
 b/drivers/char/drm/drm_lock.c         |    1 
 b/drivers/char/drm/drm_memory.c       |    8 
 b/drivers/char/drm/drm_memory_debug.h |  269 +++++------
 b/drivers/char/drm/drm_os_linux.h     |    1 
 b/drivers/char/drm/drm_pciids.h       |   14 
 b/drivers/char/drm/drm_proc.c         |   44 -
 b/drivers/char/drm/drm_stub.c         |   67 --
 b/drivers/char/drm/drm_sysfs.c        |   66 +-
 b/drivers/char/drm/drm_vm.c           |   12 
 b/drivers/char/drm/i810_dma.c         |   51 +-
 b/drivers/char/drm/i810_drv.c         |   60 --
 b/drivers/char/drm/i810_drv.h         |   12 
 b/drivers/char/drm/i830_dma.c         |   49 +-
 b/drivers/char/drm/i830_drv.c         |   59 --
 b/drivers/char/drm/i830_drv.h         |   11 
 b/drivers/char/drm/i915_dma.c         |   92 ++-
 b/drivers/char/drm/i915_drm.h         |   39 +
 b/drivers/char/drm/i915_drv.c         |   66 --
 b/drivers/char/drm/i915_drv.h         |   46 +
 b/drivers/char/drm/i915_ioc32.c       |    1 
 b/drivers/char/drm/i915_irq.c         |   48 +-
 b/drivers/char/drm/i915_mem.c         |   36 +
 b/drivers/char/drm/mga_dma.c          |  160 ++++--
 b/drivers/char/drm/mga_drv.c          |   58 --
 b/drivers/char/drm/mga_drv.h          |   14 
 b/drivers/char/drm/mga_ioc32.c        |    1 
 b/drivers/char/drm/mga_state.c        |   26 -
 b/drivers/char/drm/r128_cce.c         |   15 
 b/drivers/char/drm/r128_drm.h         |    4 
 b/drivers/char/drm/r128_drv.c         |   48 --
 b/drivers/char/drm/r128_drv.h         |    8 
 b/drivers/char/drm/r128_ioc32.c       |    1 
 b/drivers/char/drm/r128_irq.c         |    4 
 b/drivers/char/drm/r128_state.c       |   44 -
 b/drivers/char/drm/r300_cmdbuf.c      |   38 -
 b/drivers/char/drm/r300_reg.h         |    1 
 b/drivers/char/drm/radeon_cp.c        |  108 ++--
 b/drivers/char/drm/radeon_drm.h       |    6 
 b/drivers/char/drm/radeon_drv.c       |   62 +-
 b/drivers/char/drm/radeon_drv.h       |   41 -
 b/drivers/char/drm/radeon_ioc32.c     |    1 
 b/drivers/char/drm/radeon_state.c     |  246 ++++------
 b/drivers/char/drm/savage_bci.c       |   85 ++-
 b/drivers/char/drm/savage_drv.c       |   50 --
 b/drivers/char/drm/savage_drv.h       |   30 -
 b/drivers/char/drm/savage_state.c     |  324 ++++++-------
 b/drivers/char/drm/sis_drm.h          |   25 +
 b/drivers/char/drm/sis_drv.c          |   42 -
 b/drivers/char/drm/sis_drv.h          |    4 
 b/drivers/char/drm/sis_ds.h           |    7 
 b/drivers/char/drm/sis_mm.c           |   30 -
 b/drivers/char/drm/tdfx_drv.c         |   42 -
 b/drivers/char/drm/tdfx_drv.h         |    7 
 b/drivers/char/drm/via_dma.c          |   48 +-
 b/drivers/char/drm/via_dmablit.c      |  805 ++++++++++++++++++++++++++++++++++
 b/drivers/char/drm/via_dmablit.h      |  140 +++++
 b/drivers/char/drm/via_drm.h          |   58 +-
 b/drivers/char/drm/via_drv.c          |   63 --
 b/drivers/char/drm/via_drv.h          |   49 +-
 b/drivers/char/drm/via_ds.c           |    9 
 b/drivers/char/drm/via_irq.c          |   51 +-
 b/drivers/char/drm/via_map.c          |   47 +
 b/drivers/char/drm/via_mm.c           |   20 
 b/drivers/char/drm/via_verifier.c     |    6 
 b/drivers/char/drm/via_verifier.h     |    4 
 b/drivers/char/drm/via_video.c        |    7 
 drivers/char/drm/drm_init.c           |   53 --
 81 files changed, 3026 insertions(+), 1976 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 drm.patch
Index: drm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/drm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm.patch	16 Jan 2006 04:30:01 -0000	1.1
+++ drm.patch	3 Feb 2006 16:34:55 -0000	1.2
@@ -21,10 +21,10 @@
  ifeq ($(CONFIG_COMPAT),y)
  drm-objs    += drm_ioc32.o
 diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
-index efff0ee..5485382 100644
+index efff0ee..bd7be09 100644
 --- a/drivers/char/drm/ati_pcigart.c
 +++ b/drivers/char/drm/ati_pcigart.c
-@@ -52,7 +52,7 @@
+@@ -52,47 +52,43 @@
  # define ATI_MAX_PCIGART_PAGES		8192	/**< 32 MB aperture, 4K pages */
  # define ATI_PCIGART_PAGE_SIZE		4096	/**< PCI GART page size */
  
@@ -33,9 +33,25 @@
  {
  	unsigned long address;
  	struct page *page;
-@@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pciga
+ 	int i;
+ 	DRM_DEBUG("%s\n", __FUNCTION__);
+ 
+-	address = __get_free_pages(GFP_KERNEL, ATI_PCIGART_TABLE_ORDER);
++	address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
++				   ATI_PCIGART_TABLE_ORDER);
+ 	if (address == 0UL) {
+-		return 0;
++		return NULL;
  	}
  
+ 	page = virt_to_page(address);
+ 
+-	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+-		get_page(page);
++	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
+ 		SetPageReserved(page);
+-	}
+ 
  	DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);
 -	return address;
 +	return (void *)address;
@@ -51,10 +67,11 @@
 -	page = virt_to_page(address);
 +	page = virt_to_page((unsigned long)address);
  
- 	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
- 		__put_page(page);
+-	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+-		__put_page(page);
++	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
  		ClearPageReserved(page);
- 	}
+-	}
  
 -	free_pages(address, ATI_PCIGART_TABLE_ORDER);
 +	free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);
@@ -66,7 +83,16 @@
  {
  	drm_sg_mem_t *entry = dev->sg;
  	unsigned long pages;
-@@ -136,10 +135,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
+@@ -128,7 +124,7 @@ int drm_ati_pcigart_cleanup(drm_device_t
+ 	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
+ 	    && gart_info->addr) {
+ 		drm_ati_free_pcigart_table(gart_info->addr);
+-		gart_info->addr = 0;
++		gart_info->addr = NULL;
+ 	}
+ 
+ 	return 1;
+@@ -136,10 +132,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
  
  EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
  
@@ -79,7 +105,7 @@
  	unsigned long pages;
  	u32 *pci_gart, page_base, bus_address = 0;
  	int i, j, ret = 0;
-@@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+@@ -163,20 +159,20 @@ int drm_ati_pcigart_init(drm_device_t * 
  			goto done;
  		}
  
@@ -88,7 +114,13 @@
  					     ATI_PCIGART_TABLE_PAGES *
  					     PAGE_SIZE, PCI_DMA_TODEVICE);
  		if (bus_address == 0) {
-@@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+ 			DRM_ERROR("unable to map PCIGART pages!\n");
+ 			drm_ati_free_pcigart_table(address);
+-			address = 0;
++			address = NULL;
+ 			goto done;
+ 		}
+ 	} else {
  		address = gart_info->addr;
  		bus_address = gart_info->bus_addr;
  		DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
@@ -97,7 +129,7 @@
  	}
  
  	pci_gart = (u32 *) address;
-@@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+@@ -195,7 +191,7 @@ int drm_ati_pcigart_init(drm_device_t * 
  		if (entry->busaddr[i] == 0) {
  			DRM_ERROR("unable to map PCIGART pages!\n");
  			drm_ati_pcigart_cleanup(dev, gart_info);
@@ -122,10 +154,18 @@
  #define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
  #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
 diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
-index 3dc3c9d..54b561e 100644
+index 3dc3c9d..71b8b32 100644
 --- a/drivers/char/drm/drmP.h
 +++ b/drivers/char/drm/drmP.h
-@@ -144,20 +144,6 @@
+@@ -57,6 +57,7 @@
+ #include <linux/smp_lock.h>	/* For (un)lock_kernel */
+ #include <linux/mm.h>
+ #include <linux/cdev.h>
++#include <linux/mutex.h>
+ #if defined(__alpha__) || defined(__powerpc__)
+ #include <asm/pgtable.h>	/* For pte_wrprotect */
+ #endif
+@@ -144,20 +145,6 @@
  /** \name Backward compatibility section */
  /*@{*/
  
@@ -146,7 +186,7 @@
  #define DRM_RPR_ARG(vma) vma,
  
  #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
-@@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *in
+@@ -286,10 +273,13 @@ typedef int drm_ioctl_t(struct inode *in
  typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
  			       unsigned long arg);
  
@@ -162,7 +202,7 @@
  } drm_ioctl_desc_t;
  
  typedef struct drm_devstate {
-@@ -384,6 +373,7 @@ typedef struct drm_buf_entry {
+@@ -384,6 +374,7 @@ typedef struct drm_buf_entry {
  /** File private data */
  typedef struct drm_file {
  	int authenticated;
@@ -170,7 +210,7 @@
  	int minor;
  	pid_t pid;
  	uid_t uid;
-@@ -532,8 +522,9 @@ typedef struct drm_vbl_sig {
+@@ -532,8 +523,9 @@ typedef struct drm_vbl_sig {
  typedef struct ati_pcigart_info {
  	int gart_table_location;
  	int is_pcie;
@@ -181,7 +221,7 @@
  } drm_ati_pcigart_info;
  
  /**
-@@ -544,16 +535,14 @@ typedef struct ati_pcigart_info {
+@@ -544,16 +536,14 @@ typedef struct ati_pcigart_info {
  struct drm_device;
  
  struct drm_driver {
@@ -205,7 +245,7 @@
  	void (*dma_ready) (struct drm_device *);
  	int (*dma_quiescent) (struct drm_device *);
  	int (*context_ctor) (struct drm_device * dev, int context);
-@@ -561,8 +550,9 @@ struct drm_driver {
+@@ -561,8 +551,9 @@ struct drm_driver {
  	int (*kernel_context_switch) (struct drm_device * dev, int old,
  				      int new);
  	void (*kernel_context_switch_unlock) (struct drm_device * dev,
@@ -216,7 +256,7 @@
  
  	/**
  	 * Called by \c drm_device_is_agp.  Typically used to determine if a
-@@ -579,16 +569,24 @@ struct drm_driver {
+@@ -579,16 +570,24 @@ struct drm_driver {
  
  	/* these have to be filled in */
  
@@ -244,7 +284,25 @@
  	u32 driver_features;
  	int dev_priv_size;
  	drm_ioctl_desc_t *ioctls;
-@@ -752,19 +750,43 @@ static inline int drm_core_has_MTRR(stru
+@@ -625,7 +624,7 @@ typedef struct drm_device {
+ 	/** \name Locks */
+ 	/*@{ */
+ 	spinlock_t count_lock;		/**< For inuse, drm_device::open_count, drm_device::buf_use */
+-	struct semaphore struct_sem;	/**< For others */
++	struct mutex struct_mutex;	/**< For others */
[...1905 lines suppressed...]
  
@@ -5808,7 +7014,7 @@
  /*
   * command DMA support
   */
-@@ -534,8 +527,8 @@ extern void savage_emit_clip_rect_s4(drm
+@@ -534,8 +526,8 @@ extern void savage_emit_clip_rect_s4(drm
  
  #define DMA_WRITE( val ) *dma_ptr++ = (uint32_t)(val)
  
@@ -6806,10 +8012,10 @@
   */
  
 diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
-index d4b1766..593c0b8 100644
+index d4b1766..a691ae7 100644
 --- a/drivers/char/drm/via_dma.c
 +++ b/drivers/char/drm/via_dma.c
-@@ -213,7 +213,9 @@ static int via_initialize(drm_device_t *
+@@ -213,14 +213,16 @@ static int via_initialize(drm_device_t *
  	dev_priv->dma_wrap = init->size;
  	dev_priv->dma_offset = init->offset;
  	dev_priv->last_pause_ptr = NULL;
@@ -6820,6 +8026,14 @@
  
  	via_cmdbuf_start(dev_priv);
  
+ 	return 0;
+ }
+ 
+-int via_dma_init(DRM_IOCTL_ARGS)
++static int via_dma_init(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 @@ -232,13 +234,13 @@ int via_dma_init(DRM_IOCTL_ARGS)
  
  	switch (init.func) {
@@ -6836,6 +8050,24 @@
  			retcode = DRM_ERR(EPERM);
  		else
  			retcode = via_dma_cleanup(dev);
+@@ -319,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_
+ 	return 0;
+ }
+ 
+-int via_flush_ioctl(DRM_IOCTL_ARGS)
++static int via_flush_ioctl(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 
+@@ -328,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
+ 	return via_driver_dma_quiescent(dev);
+ }
+ 
+-int via_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuffer_t cmdbuf;
 @@ -349,9 +351,6 @@ int via_cmdbuffer(DRM_IOCTL_ARGS)
  	return 0;
  }
@@ -6846,6 +8078,15 @@
  static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
  				      drm_via_cmdbuffer_t * cmd)
  {
+@@ -376,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(dr
+ 	return ret;
+ }
+ 
+-int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuffer_t cmdbuf;
 @@ -450,9 +449,9 @@ static int via_hook_segment(drm_via_priv
  	if ((count <= 8) && (count >= 0)) {
  		uint32_t rgtr, ptr;
@@ -6868,6 +8109,15 @@
  		    dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
  
  		ptr_low = (ptr > 3 * CMDBUF_ALIGNMENT_SIZE) ?
+@@ -666,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_pri
+  * User interface to the space and lag functions.
+  */
+ 
+-int via_cmdbuf_size(DRM_IOCTL_ARGS)
++static int via_cmdbuf_size(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuf_size_t d_siz;
 @@ -724,3 +723,22 @@ int via_cmdbuf_size(DRM_IOCTL_ARGS)
  			       sizeof(d_siz));
  	return ret;
@@ -6893,7 +8143,7 @@
 +int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls);
 diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
 new file mode 100644
-index 0000000..9d5e027
+index 0000000..b7f1745
 --- /dev/null
 +++ b/drivers/char/drm/via_dmablit.c
 @@ -0,0 +1,805 @@
@@ -7007,7 +8257,7 @@
 +	int num_desc = 0;
 +	int cur_line;
 +	dma_addr_t next = 0 | VIA_DMA_DPR_EC;
-+	drm_via_descriptor_t *desc_ptr = 0;
++	drm_via_descriptor_t *desc_ptr = NULL;
 +
 +	if (mode == 1) 
 +		desc_ptr = vsg->desc_pages[cur_descriptor_page];
@@ -7066,7 +8316,7 @@
 + */
 +
 +
-+void
++static void
 +via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 
 +{
 +	struct page *page;
@@ -7480,7 +8730,7 @@
 +	int ret = 0;
 +	
 +	vsg->direction = (draw) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-+	vsg->bounce_buffer = 0;
++	vsg->bounce_buffer = NULL;
 +
 +	vsg->state = dr_via_sg_init;
 +
@@ -8060,7 +9310,7 @@
  	return drm_init(&driver);
  }
 diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
-index 7d5daf4..aad4f99 100644
+index 7d5daf4..52bcc7b 100644
 --- a/drivers/char/drm/via_drv.h
 +++ b/drivers/char/drm/via_drv.h
 @@ -24,24 +24,26 @@
@@ -8125,7 +9375,7 @@
  /* VIA MMIO register access */
  #define VIA_BASE ((dev_priv->mmio))
  
-@@ -92,12 +101,31 @@ typedef struct drm_via_private {
+@@ -92,12 +101,26 @@ typedef struct drm_via_private {
  #define VIA_READ8(reg)		DRM_READ8(VIA_BASE, reg)
  #define VIA_WRITE8(reg,val)	DRM_WRITE8(VIA_BASE, reg, val)
  
@@ -8138,11 +9388,6 @@
 +extern int via_agp_init(DRM_IOCTL_ARGS);
 +extern int via_map_init(DRM_IOCTL_ARGS);
 +extern int via_decoder_futex(DRM_IOCTL_ARGS);
-+extern int via_dma_init(DRM_IOCTL_ARGS);
-+extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-+extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
 +extern int via_wait_irq(DRM_IOCTL_ARGS);
 +extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
 +extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -8159,12 +9404,9 @@
  extern int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence);
  
  extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
-@@ -111,8 +139,10 @@ extern int via_driver_dma_quiescent(drm_
- extern void via_init_futex(drm_via_private_t * dev_priv);
+@@ -112,7 +135,7 @@ extern void via_init_futex(drm_via_priva
  extern void via_cleanup_futex(drm_via_private_t * dev_priv);
  extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-+extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
-+			       int force_sequence, unsigned int *sequence);
  
 -extern int via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,
 -				    unsigned int size);
@@ -8193,7 +9435,7 @@
  #include "via_ds.h"
  extern unsigned int VIA_DEBUG;
 diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
-index d023add..56d7e3d 100644
+index d023add..6152415 100644
 --- a/drivers/char/drm/via_irq.c
 +++ b/drivers/char/drm/via_irq.c
 @@ -50,6 +50,15 @@
@@ -8251,15 +9493,6 @@
  		}
  		cur_irq++;
  	}
-@@ -165,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t 
- 	return ret;
- }
- 
--static int
-+int
- via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
- 		    unsigned int *sequence)
- {
 @@ -174,6 +199,7 @@ via_driver_irq_wait(drm_device_t * dev, 
  	drm_via_irq_t *cur_irq = dev_priv->via_irqs;
  	int ret = 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1898
retrieving revision 1.1899
diff -u -r1.1898 -r1.1899
--- kernel-2.6.spec	2 Feb 2006 23:41:38 -0000	1.1898
+++ kernel-2.6.spec	3 Feb 2006 16:34:55 -0000	1.1899
@@ -208,7 +208,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc1.bz2
+Patch1: patch-2.6.16-rc2.bz2
 Patch2: patch-2.6.16-rc1-git6.bz2
 Patch3: drm.patch
 
@@ -592,7 +592,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 # Backout broken DRM changes.
 %patch3 -p1 -R
 
@@ -1383,6 +1383,9 @@
 %endif
 
 %changelog
+* Fri Feb  3 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2
+
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6
 - enable the periodic slab debugger again.

linux-2.6-debug-singlebiterror.patch:
 slab.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-singlebiterror.patch	3 Feb 2006 05:07:37 -0000	1.5
+++ linux-2.6-debug-singlebiterror.patch	3 Feb 2006 16:34:55 -0000	1.6
@@ -29,21 +29,20 @@
  		printk(" %02x", (unsigned char)data[offset + i]);
  	}
  	printk("\n");
-@@ -1019,6 +1023,24 @@ static void dump_line(char *data, int of
+@@ -1019,6 +1023,23 @@ static void dump_line(char *data, int of
  		}
  	}
  	printk("\n");
 +	if (bad_count == 1)
 +		switch (total) {
-+					/* 01101011 (0x6b - SLAB_POISON) */
-+		case 0x6a:	/* 01101010 bit 0 flipped */
-+		case 0x69:	/* 01101001 bit 1 flipped */
-+		case 0x6f:	/* 01101111 bit 2 flipped */
-+		case 0x63:	/* 01100011 bit 3 flipped */
-+		case 0x7b:	/* 01111011 bit 4 flipped */
-+		case 0x4b:	/* 01001011 bit 5 flipped */
-+		case 0x2b:	/* 00101011 bit 6 flipped */
-+		case 0xeb:	/* 11101011 bit 7 flipped */
++		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");


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- sources	2 Feb 2006 21:20:36 -0000	1.277
+++ sources	3 Feb 2006 16:34:55 -0000	1.278
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
 4bb74f4fb52bda3d1912960acc017861  patch-2.6.16-rc1-git6.bz2
+7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- upstream	2 Feb 2006 21:20:36 -0000	1.252
+++ upstream	3 Feb 2006 16:34:55 -0000	1.253
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
+patch-2.6.16-rc2.bz2
 patch-2.6.16-rc1-git6.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:36:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:36:02 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc1.bz2.sign,1.1,NONE
Message-ID: <200602031636.k13Ga2gO019993@cvs.devel.redhat.com>

Author: davej

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

Removed Files:
	patch-2.6.16-rc1.bz2.sign 
Log Message:
dead sign



--- patch-2.6.16-rc1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:38:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:38:29 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1899,1.1900
Message-ID: <200602031638.k13GcT0v021187@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
try all archs again



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1899
retrieving revision 1.1900
diff -u -r1.1899 -r1.1900
--- kernel-2.6.spec	3 Feb 2006 16:34:55 -0000	1.1899
+++ kernel-2.6.spec	3 Feb 2006 16:38:26 -0000	1.1900
@@ -155,8 +155,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 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  Fri Feb  3 16:49:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:49:14 -0500
Subject: rpms/postfix/FC-4 .cvsignore, 1.14, 1.15 postfix.spec, 1.29,
	1.30 sources, 1.14, 1.15
Message-ID: <200602031649.k13GnEqY005921@cvs.devel.redhat.com>

Author: twoerner

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

Modified Files:
	.cvsignore postfix.spec sources 
Log Message:
[tw]
- FC-4 update package with old pam_stack in pam config (mostly identical with
  devel package)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postfix/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	12 May 2005 10:23:49 -0000	1.14
+++ .cvsignore	3 Feb 2006 16:49:12 -0000	1.15
@@ -11,3 +11,4 @@
 postfix-2.2.1.tar.gz
 postfix-2.2.2.tar.gz
 postfix-2.2.3.tar.gz
+postfix-2.2.8.tar.gz


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/FC-4/postfix.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- postfix.spec	12 May 2005 10:23:49 -0000	1.29
+++ postfix.spec	3 Feb 2006 16:49:12 -0000	1.30
@@ -42,8 +42,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.2.3
-Release: 1
+Version: 2.2.8
+Release: 0.FC4.1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -78,6 +78,7 @@
 Patch6: postfix-2.1.1-obsolete.patch
 Patch7: postfix-2.1.5-aliases.patch
 Patch8: postfix-large-fs.patch
+Patch9: postfix-2.2.5-cyrus.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -132,6 +133,7 @@
 %patch6 -p1 -b .obsolete
 %patch7 -p1 -b .aliases
 %patch8 -p1 -b .large-fs
+%patch9 -p1 -b .cyrus
 
 %if %{PFLOGSUMM}
 gzip -dc %{SOURCE53} | tar xf -
@@ -267,6 +269,7 @@
 perl -i -pe 's:/cyrus/bin/deliver:/usr/lib/cyrus-imapd/deliver:' $RPM_BUILD_ROOT%{postfix_config_dir}/master.cf
 
 cat $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files
+%if %{SASL}
 # Install the smtpd.conf file for SASL support.
 # See README-Postfix-SASL-RedHat.txt for why we need to set saslauthd_version
 # in the v1 version of smtpd.conf
@@ -276,6 +279,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{sasl_v2_lib_dir}
 install -m 644 %{SOURCE100} $RPM_BUILD_ROOT%{sasl_v2_lib_dir}/smtpd.conf
+%endif
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/smtp.postfix
@@ -374,8 +378,10 @@
 
 # Config files not part of upstream
 
+%if %{SASL}
 %config(noreplace) %{sasl_v1_lib_dir}/smtpd.conf
 %config(noreplace) %{sasl_v2_lib_dir}/smtpd.conf
+%endif
 %config(noreplace) %{_sysconfdir}/pam.d/smtp.postfix
 %attr(0755, root, root) %config /etc/rc.d/init.d/postfix
 
@@ -461,6 +467,33 @@
 
 
 %changelog
+* Fri Feb  3 2006 Thomas Woerner <twoerner at redhat.com> 2:2.2.8-0.FC4.1
+- FC-4 update package with old pam_stack in pam config
+
+* Tue Jan 24 2006 Thomas Woerner <twoerner at redhat.com> 2:2.2.8-1
+- new version 2.2.8
+
+* Tue Dec 13 2005 Thomas Woerner <twoerner at redhat.com> 2:2.2.7-1
+- new version 2.2.7
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Nov 11 2005 Thomas Woerner <twoerner at redhat.com> 2:2.2.5-2.1
+- replaced postconf and postalias call in initscript with newaliases (#156358)
+- fixed initscripts messages (#155774)
+- fixed build problems when sasl is disabled (#164773)
+- fixed pre-definition of mailbox_transport lmtp socket path (#122910)
+
+* Thu Nov 10 2005 Tomas Mraz <tmraz at redhat.com> 2:2.2.5-2
+- rebuilt against new openssl
+
+* Fri Oct  7 2005 Tomas Mraz <tmraz at redhat.com>
+- use include instead of pam_stack in pam config
+
+* Thu Sep  8 2005 Thomas Woerner <twoerner at redhat.com> 2:2.2.5-1
+- new version 2.2.5
+
 * Thu May 12 2005 Thomas Woerner <twoerner at redhat.com> 2:2.2.3-1
 - new version 2.2.3
 - compiling all binaries PIE, dropped old pie patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postfix/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	12 May 2005 10:23:49 -0000	1.14
+++ sources	3 Feb 2006 16:49:12 -0000	1.15
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-f164b701c3e97b950d4cc64aff4de3c0  postfix-2.2.3.tar.gz
+971bf94de3e8433c8965c27b42d56b9a  postfix-2.2.8.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 16:51:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 11:51:17 -0500
Subject: rpms/postfix/FC-4 postfix-2.2.5-cyrus.patch,NONE,1.1
Message-ID: <200602031651.k13GpHJh006788@cvs.devel.redhat.com>

Author: twoerner

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

Added Files:
	postfix-2.2.5-cyrus.patch 
Log Message:
[tw] - added cyrus patch


postfix-2.2.5-cyrus.patch:
 main.cf   |   27 ++++++++++++++++++++++++---
 master.cf |    2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

--- NEW FILE postfix-2.2.5-cyrus.patch ---
--- postfix-2.2.5/conf/main.cf.cyrus	2005-11-11 14:57:34.000000000 +0100
+++ postfix-2.2.5/conf/main.cf	2005-11-11 14:58:09.000000000 +0100
@@ -452,7 +452,29 @@
 # the main.cf file, otherwise the SMTP server will reject mail for    
 # non-UNIX accounts with "User unknown in local recipient table".
 #
-#mailbox_transport = lmtp:unix:/file/name
+#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
+
+# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
+# server using LMTP (Local Mail Transport Protocol), this is prefered
+# over the older cyrus deliver program by setting the
+# mailbox_transport as below:
+#
+# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
+#
+# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
+# these settings.
+#
+# local_destination_recipient_limit = 300
+# local_destination_concurrency_limit = 5
+#
+# Of course you should adjust these settings as appropriate for the
+# capacity of the hardware you are using. The recipient limit setting
+# can be used to take advantage of the single instance message store
+# capability of Cyrus. The concurrency limit can be used to control
+# how many simultaneous LMTP sessions will be permitted to the Cyrus
+# message store. 
+#
+# To use the old cyrus deliver program you have to set:
 #mailbox_transport = cyrus
 
 # The fallback_transport specifies the optional transport in master.cf
@@ -469,8 +491,7 @@
 # the main.cf file, otherwise the SMTP server will reject mail for    
 # non-UNIX accounts with "User unknown in local recipient table".
 #
-#fallback_transport = lmtp:unix:/file/name
-#fallback_transport = cyrus
+#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
 #fallback_transport =
 
 # The luser_relay parameter specifies an optional destination address
--- postfix-2.2.5/conf/master.cf.cyrus	2005-11-11 14:57:46.000000000 +0100
+++ postfix-2.2.5/conf/master.cf	2005-11-11 14:58:07.000000000 +0100
@@ -64,7 +64,7 @@
 # Cyrus 2.1.5 (Amos Gouaux)
 # Also specify in main.cf: cyrus_destination_recipient_limit=1
 cyrus     unix  -       n       n       -       -       pipe
-  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
+  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
 #
 # See the Postfix UUCP_README file for configuration details.
 #



From fedora-cvs-commits at redhat.com  Fri Feb  3 17:10:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 12:10:03 -0500
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.97,1.98 sources,1.94,1.95
Message-ID: <200602031710.k13HA3dc012657@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12558

Modified Files:
	mkinitrd.spec sources 
Log Message:
- update to 5.0.20-1



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mkinitrd.spec	2 Feb 2006 22:43:35 -0000	1.97
+++ mkinitrd.spec	3 Feb 2006 17:10:00 -0000	1.98
@@ -65,6 +65,8 @@
 %changelog
 * Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.20-1
 - fix really dumb spec file mistake
+- fix devno detection for /dev/root
+- fix testdm check
 
 * Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.19-1
 - mkinitrd: get resolve_dm_name() and get_numeric_dev() from initscripts


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sources	2 Feb 2006 22:43:35 -0000	1.94
+++ sources	3 Feb 2006 17:10:00 -0000	1.95
@@ -1 +1 @@
-750b0875be802c082fe95a7519f35a9b  mkinitrd-5.0.20.tar.bz2
+1c53a18f59e12b1e7295b4607d7e08ed  mkinitrd-5.0.20.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 17:19:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 12:19:45 -0500
Subject: rpms/eclipse/FC-4 eclipse-launcher-link.patch,1.3,1.4
Message-ID: <200602031719.k13HJj6e029326@cvs.devel.redhat.com>

Author: ifoox

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

Modified Files:
	eclipse-launcher-link.patch 
Log Message:
Updated link patch, taking out all memory management parts.

eclipse-launcher-link.patch:
 eclipseGtk.c |  161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 160 insertions(+), 1 deletion(-)

Index: eclipse-launcher-link.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-launcher-link.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-launcher-link.patch	13 Dec 2005 21:06:07 -0000	1.3
+++ eclipse-launcher-link.patch	3 Feb 2006 17:19:43 -0000	1.4
@@ -4,7 +4,7 @@
 retrieving revision 1.25
 diff -u -r1.25 eclipseGtk.c
 --- platform-launcher/library/gtk/eclipseGtk.c	17 Sep 2005 03:39:24 -0000	1.25
-+++ platform-launcher/library/gtk/eclipseGtk.c	13 Dec 2005 20:55:34 -0000
++++ platform-launcher/library/gtk/eclipseGtk.c	3 Feb 2006 17:05:29 -0000
 @@ -28,6 +28,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -13,18 +13,10 @@
  
  #include <gtk/gtk.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
-@@ -291,6 +292,194 @@
-     return result;
+@@ -292,6 +293,159 @@
  }
  
-+/* represents a linked list of used memory blocks, used for the arguments 
-+ * swapping below, so that we don't leak memory */
-+struct llist 
-+{
-+	char * data;
-+	struct llist * next;	
-+};
-+
+ 
 +/* We check to see if the launcher was run from a symlink, if it was
 + * we need to change some paths to point at the actual launcher path, 
 + * not the symlink-relative path.
@@ -34,13 +26,13 @@
 + * The symlink is usually something in /usr/bin (i.e. /usr/bin/eclipse) and 
 + * links to something in /usr/share/<eclipse-install-dir> 
 + * (i.e. /usr/share/eclipse/eclipse). However since the share dir should not 
-+ * have a compiled code in it, we store the actual launcher in 
++ * have compiled code in it, we store the actual launcher in 
 + * /usr/lib/<eclipse-install-dir>/ (i.e. /usr/lib/eclipse/eclipse).
 + * 
 + * But startup.jar is in /usr/share/<eclipse-install-dir> so we need to make
 + * the launcher resolve one link deep and get the startup.jar at that path.
 + */
-+int changeArgPaths(char *args[], struct llist ** toFree) 
++int changeArgPaths(char *args[]) 
 +{
 +  	int		ret, pathlen, jarlen;
 +	struct 	stat st;
@@ -49,17 +41,10 @@
 +	int		launcherPos = 0;		
 +  	int		foundLauncher = 0;	/* is the next arg supposed to be -launcher */
 +  	int		prevWasJar = 0;		/* is the next arg supposed to be -jar */
-+	struct llist * curMemblock;
 +
-+	*toFree = (struct llist *) malloc(sizeof (struct llist));
 +	link = (char *) malloc(sizeof(char) * PATH_MAX);
-+	(*toFree)->data = link;
-+
-+	(*toFree)->next = (struct llist *) malloc(sizeof (struct llist));
-+	curMemblock = (*toFree)->next;
 +
 +	linkpath = (char *) malloc(sizeof(char) * PATH_MAX);
-+	curMemblock->data = linkpath;
 +
 +	/* first find the path of the launcher, this is after the -launcher
 +	 * command line option */
@@ -164,13 +149,7 @@
 +							printf("Could not allocate a jar path, die...\n");
 +							return ENOMEM;
 +						}
-+	
-+						/* add this malloced memory to the list */
-+						curMemblock->next = (struct llist *) malloc 
-+							(sizeof (struct llist));
-+						curMemblock = curMemblock->next;
-+						curMemblock->data = jarPath; 
-+	
++		
 +						strncpy(jarPath, linkpath, pathlen + 1);
 +						strncat(jarPath, *opt, jarlen);
 +	
@@ -187,33 +166,18 @@
 +				}
 +			}
 +		}
-+		curMemblock->next = NULL;
-+
 +	}
 +}
 +
-+/* frees a linked list and it's data */
-+void freeMem(struct llist * toFree)
-+{
-+	struct llist * next;
-+	while (toFree != NULL)
-+	{
-+		next  = toFree->next;
-+		if (toFree->data != NULL)
-+			free(toFree->data);
-+		free(toFree);
-+		toFree = next;
-+	}
-+}
- 
++
  /* Start the Java VM 
   *
-@@ -302,11 +491,17 @@
+  * This method is called to start the Java virtual machine and to wait until it
+@@ -302,11 +456,16 @@
  	int     jvmExitCode = 1;
    	pid_t   jvmProcess;
    	int     exitCode;
 -
-+	struct llist * toFree; /* memory used for symlink path changing */
 +	
  #ifdef MOZILLA_FIX
  	fixEnvForMozilla();
@@ -221,23 +185,9 @@
  
 +
 +	/* Change the paths if we are running through a symlink */
-+	changeArgPaths(args, &toFree);
++	changeArgPaths(args);
 +
 +
  	jvmProcess = fork();
    	if (jvmProcess == 0) 
      {
-@@ -325,6 +520,13 @@
- 			jvmExitCode = WEXITSTATUS(exitCode);
-     }
- 
-+	/* We currently don't free the memory we allocated because it might be
-+	 * reused if the workspace is restarted (i.e. after an Update Manager 
-+	 * installation). So we leave the memory alone, it will be freed when
-+	 * this process completely exits, this is OK because it needs to stay
-+	 * around for the lifetime of the process in any case. */
-+	/* freeMem(toFree); */
-+
-   return jvmExitCode;
- }
- 



From fedora-cvs-commits at redhat.com  Fri Feb  3 17:20:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 12:20:22 -0500
Subject: rpms/eclipse/devel eclipse-launcher-link.patch,1.3,1.4
Message-ID: <200602031720.k13HKMYm029609@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29579

Modified Files:
	eclipse-launcher-link.patch 
Log Message:
Updated link patch, taking out all memory management parts.

eclipse-launcher-link.patch:
 eclipseGtk.c |  161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 160 insertions(+), 1 deletion(-)

Index: eclipse-launcher-link.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-launcher-link.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-launcher-link.patch	19 Dec 2005 22:06:53 -0000	1.3
+++ eclipse-launcher-link.patch	3 Feb 2006 17:20:19 -0000	1.4
@@ -4,7 +4,7 @@
 retrieving revision 1.25
 diff -u -r1.25 eclipseGtk.c
 --- platform-launcher/library/gtk/eclipseGtk.c	17 Sep 2005 03:39:24 -0000	1.25
-+++ platform-launcher/library/gtk/eclipseGtk.c	13 Dec 2005 20:55:34 -0000
++++ platform-launcher/library/gtk/eclipseGtk.c	3 Feb 2006 17:05:29 -0000
 @@ -28,6 +28,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -13,18 +13,10 @@
  
  #include <gtk/gtk.h>
  #include <gdk-pixbuf/gdk-pixbuf.h>
-@@ -291,6 +292,194 @@
-     return result;
+@@ -292,6 +293,159 @@
  }
  
-+/* represents a linked list of used memory blocks, used for the arguments 
-+ * swapping below, so that we don't leak memory */
-+struct llist 
-+{
-+	char * data;
-+	struct llist * next;	
-+};
-+
+ 
 +/* We check to see if the launcher was run from a symlink, if it was
 + * we need to change some paths to point at the actual launcher path, 
 + * not the symlink-relative path.
@@ -34,13 +26,13 @@
 + * The symlink is usually something in /usr/bin (i.e. /usr/bin/eclipse) and 
 + * links to something in /usr/share/<eclipse-install-dir> 
 + * (i.e. /usr/share/eclipse/eclipse). However since the share dir should not 
-+ * have a compiled code in it, we store the actual launcher in 
++ * have compiled code in it, we store the actual launcher in 
 + * /usr/lib/<eclipse-install-dir>/ (i.e. /usr/lib/eclipse/eclipse).
 + * 
 + * But startup.jar is in /usr/share/<eclipse-install-dir> so we need to make
 + * the launcher resolve one link deep and get the startup.jar at that path.
 + */
-+int changeArgPaths(char *args[], struct llist ** toFree) 
++int changeArgPaths(char *args[]) 
 +{
 +  	int		ret, pathlen, jarlen;
 +	struct 	stat st;
@@ -49,17 +41,10 @@
 +	int		launcherPos = 0;		
 +  	int		foundLauncher = 0;	/* is the next arg supposed to be -launcher */
 +  	int		prevWasJar = 0;		/* is the next arg supposed to be -jar */
-+	struct llist * curMemblock;
 +
-+	*toFree = (struct llist *) malloc(sizeof (struct llist));
 +	link = (char *) malloc(sizeof(char) * PATH_MAX);
-+	(*toFree)->data = link;
-+
-+	(*toFree)->next = (struct llist *) malloc(sizeof (struct llist));
-+	curMemblock = (*toFree)->next;
 +
 +	linkpath = (char *) malloc(sizeof(char) * PATH_MAX);
-+	curMemblock->data = linkpath;
 +
 +	/* first find the path of the launcher, this is after the -launcher
 +	 * command line option */
@@ -164,13 +149,7 @@
 +							printf("Could not allocate a jar path, die...\n");
 +							return ENOMEM;
 +						}
-+	
-+						/* add this malloced memory to the list */
-+						curMemblock->next = (struct llist *) malloc 
-+							(sizeof (struct llist));
-+						curMemblock = curMemblock->next;
-+						curMemblock->data = jarPath; 
-+	
++		
 +						strncpy(jarPath, linkpath, pathlen + 1);
 +						strncat(jarPath, *opt, jarlen);
 +	
@@ -187,33 +166,18 @@
 +				}
 +			}
 +		}
-+		curMemblock->next = NULL;
-+
 +	}
 +}
 +
-+/* frees a linked list and it's data */
-+void freeMem(struct llist * toFree)
-+{
-+	struct llist * next;
-+	while (toFree != NULL)
-+	{
-+		next  = toFree->next;
-+		if (toFree->data != NULL)
-+			free(toFree->data);
-+		free(toFree);
-+		toFree = next;
-+	}
-+}
- 
++
  /* Start the Java VM 
   *
-@@ -302,11 +491,17 @@
+  * This method is called to start the Java virtual machine and to wait until it
+@@ -302,11 +456,16 @@
  	int     jvmExitCode = 1;
    	pid_t   jvmProcess;
    	int     exitCode;
 -
-+	struct llist * toFree; /* memory used for symlink path changing */
 +	
  #ifdef MOZILLA_FIX
  	fixEnvForMozilla();
@@ -221,23 +185,9 @@
  
 +
 +	/* Change the paths if we are running through a symlink */
-+	changeArgPaths(args, &toFree);
++	changeArgPaths(args);
 +
 +
  	jvmProcess = fork();
    	if (jvmProcess == 0) 
      {
-@@ -325,6 +520,13 @@
- 			jvmExitCode = WEXITSTATUS(exitCode);
-     }
- 
-+	/* We currently don't free the memory we allocated because it might be
-+	 * reused if the workspace is restarted (i.e. after an Update Manager 
-+	 * installation). So we leave the memory alone, it will be freed when
-+	 * this process completely exits, this is OK because it needs to stay
-+	 * around for the lifetime of the process in any case. */
-+	/* freeMem(toFree); */
-+
-   return jvmExitCode;
- }
- 



From fedora-cvs-commits at redhat.com  Fri Feb  3 17:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 12:57:41 -0500
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.6,
	1.7
Message-ID: <200602031757.k13Hvfgt016651@cvs.devel.redhat.com>

Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16637

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
rm 'Requires kernel' from spec. I thought it was needed becuase this is a daemon for some kernel functionality but dm-multipath's tools do not have this requirement and it causes build problems


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- iscsi-initiator-utils.spec	23 Jan 2006 21:06:25 -0000	1.6
+++ iscsi-initiator-utils.spec	3 Feb 2006 17:57:39 -0000	1.7
@@ -9,7 +9,6 @@
 License: GPL
 URL: http://www.open-iscsi.org
 Buildroot: %{_tmppath}/%{name}-root
-Requires: kernel
 BuildRequires: openssl-devel db4-devel
 Prereq: /sbin/chkconfig
 ExcludeArch: s390 s390x



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:07:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:07:15 -0500
Subject: rpms/perl-Archive-Tar/devel .cvsignore, 1.5,
	1.6 perl-Archive-Tar.spec, 1.15, 1.16 sources, 1.5, 1.6
Message-ID: <200602031807.k13I7Fb7017038@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-Archive-Tar.spec sources 
Log Message:
Upgrade to upstream version 1.28


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Nov 2005 10:08:11 -0000	1.5
+++ .cvsignore	3 Feb 2006 18:07:13 -0000	1.6
@@ -1,2 +1,3 @@
 Archive-Tar-1.23.tar.gz
 Archive-Tar-1.26.tar.gz
+Archive-Tar-1.28.tar.gz


Index: perl-Archive-Tar.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/perl-Archive-Tar.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Archive-Tar.spec	17 Dec 2005 02:08:47 -0000	1.15
+++ perl-Archive-Tar.spec	3 Feb 2006 18:07:13 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Tar
-Version:        1.26
-Release: 1.1
+Version:        1.28
+Release: 	1
 Summary:        A module for Perl manipulation of .tar files
 
 Group:          Development/Libraries
@@ -50,9 +50,14 @@
 %{_bindir}/*
 %{perl_vendorlib}/Archive/
 %{_mandir}/man3/*.3*
+%{_mandir}/man1/*.1*
 
 
 %changelog
+* Fri Feb 02 2006 Jason Vas Dias <jvdias at redhat.com> - 1.28-1
+- Upgrade to upstream version 1.28
+- Rebuild for perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Nov 2005 10:08:11 -0000	1.5
+++ sources	3 Feb 2006 18:07:13 -0000	1.6
@@ -1 +1 @@
-f649c69d89fdc56b2c5985a672cd941a  Archive-Tar-1.26.tar.gz
+6056f238b3d2ea706470b46ef8eac555  Archive-Tar-1.28.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:14:32 -0500
Subject: rpms/perl-Archive-Zip/devel perl-Archive-Zip.spec,1.5,1.6
Message-ID: <200602031814.k13IEWkf017165@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Archive-Zip.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Archive-Zip.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Archive-Zip/devel/perl-Archive-Zip.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Archive-Zip.spec	17 Dec 2005 02:09:00 -0000	1.5
+++ perl-Archive-Zip.spec	3 Feb 2006 18:14:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Zip
 Version:        1.16
-Release: 1.1
+Release:        1.2
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias<jvdias at redhat.com> - 1.16-1.2
+- rebuilt for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:18:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:18:32 -0500
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.16,1.17
Message-ID: <200602031818.k13IIWOv029867@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-BSD-Resource.spec	17 Dec 2005 02:09:23 -0000	1.16
+++ perl-BSD-Resource.spec	3 Feb 2006 18:18:30 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.24
-Release: 3.1.1
+Release: 	3.2
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Feb 03 2005 Jason Vas Dias <jvdias at redhat.com> - 1.24-3.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:19:41 -0500
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.17,1.18
Message-ID: <200602031819.k13IJfn3029922@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-BSD-Resource.spec	3 Feb 2006 18:18:30 -0000	1.17
+++ perl-BSD-Resource.spec	3 Feb 2006 18:19:39 -0000	1.18
@@ -48,7 +48,7 @@
 
 
 %changelog
-* Fri Feb 03 2005 Jason Vas Dias <jvdias at redhat.com> - 1.24-3.2
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.24-3.2
 - rebuild for new perl-5.8.8
 
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:24:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:24:53 -0500
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.16,1.17
Message-ID: <200602031824.k13IOr3A005868@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Bit-Vector.spec	17 Dec 2005 02:09:11 -0000	1.16
+++ perl-Bit-Vector.spec	3 Feb 2006 18:24:50 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
 Version:        6.4
-Release: 2.1.1
+Release: 	2.2
 Summary:        A module for high-performance Perl manipulation of bit vectors
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 6.4-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:28:34 -0500
Subject: rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.2,1.3
Message-ID: <200602031828.k13ISYDj007570@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Carp-Clan.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Carp-Clan.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Carp-Clan.spec	17 Dec 2005 02:09:37 -0000	1.2
+++ perl-Carp-Clan.spec	3 Feb 2006 18:28:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Carp-Clan
 Version:        5.3
-Release: 1.1
+Release: 	1.2
 Summary:        Report errors from perspective of caller of a "clan" of modules
 
 Group:          Development/Libraries
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.3-2
+- rebuild for perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:33:13 -0500
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.20,1.21
Message-ID: <200602031833.k13IXDVf008416@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-Compress-Zlib.spec	17 Dec 2005 02:09:46 -0000	1.20
+++ perl-Compress-Zlib.spec	3 Feb 2006 18:32:59 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name: perl-Compress-Zlib
 Version: 1.41
-Release: 1.1
+Release: 1.2
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: distributable
 Group: Development/Libraries
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.41-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:37:37 -0500
Subject: rpms/perl-Convert-ASN1/devel perl-Convert-ASN1.spec,1.5,1.6
Message-ID: <200602031837.k13Ibbj1009809@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Convert-ASN1.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Convert-ASN1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Convert-ASN1/devel/perl-Convert-ASN1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Convert-ASN1.spec	17 Dec 2005 02:09:57 -0000	1.5
+++ perl-Convert-ASN1.spec	3 Feb 2006 18:37:34 -0000	1.6
@@ -1,17 +1,17 @@
 Summary:        Convert-ASN1 Perl module
 Name:           perl-Convert-ASN1
 Version:        0.19
-Release: 1.1
+Release: 	1.2
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Convert-ASN1/
-Source0:     http://www.cpan.org/authors/id/G/GB/GBARR/Convert-ASN1-0.19.tar.gz
+Source0:     	http://www.cpan.org/authors/id/G/GB/GBARR/Convert-ASN1-0.19.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 %{summary}.
@@ -46,6 +46,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.19-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:41:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:41:27 -0500
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.14,1.15
Message-ID: <200602031841.k13IfRMS011611@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Crypt-SSLeay.spec	17 Dec 2005 02:10:10 -0000	1.14
+++ perl-Crypt-SSLeay.spec	3 Feb 2006 18:41:25 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Name: perl-Crypt-SSLeay
 Version: 0.51
-Release: 9.1.1
+Release: 9.2
 License: GPL or Artistic
 Group: Development/Libraries
 Source0: http://www.cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.51-9.2
+- rebuild for new perl-5.8.8 / gcc / glibc
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:42:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:42:28 -0500
Subject: rpms/kernel/devel linux-2.6-debug-singlebiterror.patch,1.6,1.7
Message-ID: <200602031842.k13IgSvD012136@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-singlebiterror.patch 
Log Message:
compile fix


linux-2.6-debug-singlebiterror.patch:
 slab.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-debug-singlebiterror.patch	3 Feb 2006 16:34:55 -0000	1.6
+++ linux-2.6-debug-singlebiterror.patch	3 Feb 2006 18:42:24 -0000	1.7
@@ -33,7 +33,7 @@
  		}
  	}
  	printk("\n");
-+	if (bad_count == 1)
++	if (bad_count == 1) {
 +		switch (total) {
 +		case POISON_FREE ^ 0x01:
 +		case POISON_FREE ^ 0x02:



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:49:05 -0500
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.22,1.23
Message-ID: <200602031849.k13In5IV027624@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-DBD-MySQL.spec	17 Dec 2005 02:10:41 -0000	1.22
+++ perl-DBD-MySQL.spec	3 Feb 2006 18:49:03 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0002
-Release: 2.1.1
+Release: 	2.2
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0002-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:51:25 -0500
Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.23,1.24
Message-ID: <200602031851.k13IpPnd028710@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-DBD-Pg.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-DBD-Pg.spec	17 Dec 2005 02:10:51 -0000	1.23
+++ perl-DBD-Pg.spec	3 Feb 2006 18:51:21 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
 Version:        1.43
-Release: 2.1.1
+Release: 	2.2
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.43-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:51:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:51:34 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.47,1.48
Message-ID: <200602031851.k13IpYWR028828@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
unneeded


linux-2.6-compile-fixes.patch:
 linux-2.6.15.noarch/include/linux/suspend.h |    4 ----
 linux-2.6.15/drivers/net/spider_net.c       |    1 +
 linux-2.6.15/include/asm-generic/signal.h   |    1 +
 linux-2.6/arch/ia64/Kconfig                 |    3 +++
 linux-2.6/drivers/Makefile                  |    2 +-
 5 files changed, 6 insertions(+), 5 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- linux-2.6-compile-fixes.patch	2 Feb 2006 21:29:07 -0000	1.47
+++ linux-2.6-compile-fixes.patch	3 Feb 2006 18:51:30 -0000	1.48
@@ -18,19 +18,6 @@
  
  #include "spider_net.h"
  
---- linux-2.6.15/arch/s390/kernel/setup.c~	2006-01-10 23:43:32.000000000 +0000
-+++ linux-2.6.15/arch/s390/kernel/setup.c	2006-01-11 00:34:18.000000000 +0000
-@@ -319,6 +319,8 @@ void machine_power_off(void)
- 	_machine_power_off();
- }
- 
-+void (*pm_power_off)(void) = machine_power_off;
-+
- static void __init
- add_memory_hole(unsigned long start, unsigned long end)
- {
-
-
 Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
 is enabled.
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:54:30 -0500
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.21,1.22
Message-ID: <200602031854.k13IsU0Q030289@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-DBI.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-DBI.spec	19 Dec 2005 18:48:12 -0000	1.21
+++ perl-DBI.spec	3 Feb 2006 18:54:26 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.50
-Release: 	1
+Release: 	2
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.50-2
+- rebuild for new perl-5.8.8 / gcc / glibc
+
 * Mon Dec 19 2005 Jason Vas Dias<jvdias at redhat.com> - 1.50-1
 - upgrade to 1.50
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:57:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:57:06 -0500
Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.13,1.14
Message-ID: <200602031857.k13Iv6KF031519@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Date-Calc.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Date-Calc.spec	17 Dec 2005 02:10:20 -0000	1.13
+++ perl-Date-Calc.spec	3 Feb 2006 18:57:03 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
 Version:        5.4
-Release: 1.1
+Release: 	1.2
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
@@ -56,8 +56,10 @@
 %{perl_vendorarch}/auto/Date/
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.4-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:58:01 -0500
Subject: rpms/kernel/FC-4 linux-2.6-dm-crypt-zero-key-before-free.patch, NONE,
	1.1 kernel-2.6.spec, 1.1592, 1.1593
Message-ID: <200602031858.k13Iw17D031996@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-dm-crypt-zero-key-before-free.patch 
Log Message:
dm-crypt: zero key before freeing it


linux-2.6-dm-crypt-zero-key-before-free.patch:
 dm-crypt.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE linux-2.6-dm-crypt-zero-key-before-free.patch ---

tree 622374ba69e8430ec2ec8d7b00a3d28990659d45
parent 0b56306e56784d0513e1193d58c05a6bd97bd1a9
author Stefan Rompf <stefan at loplof.de> Fri, 06 Jan 2006 16:20:08 -0800
committer Linus Torvalds <torvalds at g5.osdl.org> Sat, 07 Jan 2006 00:34:01 -0800

[PATCH] dm-crypt: zero key before freeing it

Zap the memory before freeing it so we don't leave crypto information
around in memory.

Signed-off-by: Stefan Rompf <stefan at loplof.de>
Acked-by: Clemens Fruhwirth <clemens at endorphin.org>
Acked-by: Alasdair G Kergon <agk at redhat.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

 drivers/md/dm-crypt.c |    5 +++++
 1 files changed, 5 insertions(+)

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index cf66310..a601a42 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -690,6 +690,8 @@ bad3:
 bad2:
 	crypto_free_tfm(tfm);
 bad1:
+	/* Must zero key material before freeing */
+	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
 	kfree(cc);
 	return -EINVAL;
 }
@@ -706,6 +708,9 @@ static void crypt_dtr(struct dm_target *
 		cc->iv_gen_ops->dtr(cc);
 	crypto_free_tfm(cc->tfm);
 	dm_put_device(ti, cc->dev);
+
+	/* Must zero key material before freeing */
+	memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
 	kfree(cc);
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1592
retrieving revision 1.1593
diff -u -r1.1592 -r1.1593
--- kernel-2.6.spec	3 Feb 2006 16:33:25 -0000	1.1592
+++ kernel-2.6.spec	3 Feb 2006 18:57:58 -0000	1.1593
@@ -351,6 +351,7 @@
 Patch1810: linux-2.6-pwc-powerup-by-default.patch
 Patch1820: linux-2.6-net-acenic-use-after-free.patch
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
+Patch1840: linux-2.6-dm-crypt-zero-key-before-free.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
 Patch1890: linux-2.6-dcache-inode-leak.patch
@@ -791,6 +792,8 @@
 %patch1820 -p1
 # PNP support for smsc-ircc2
 %patch1830 -p1
+# dm-crypt: zero key before freeing it
+%patch1840 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
 # Some it87 probing causes reboots on some systems.
@@ -1275,6 +1278,7 @@
 %changelog
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - Make 'quiet' work again.
+- dm-crypt: zero key before freeing it
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1830_FC4]
 - Remove r8169 debugging.



From fedora-cvs-commits at redhat.com  Fri Feb  3 18:59:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 13:59:14 -0500
Subject: rpms/perl-DateManip/devel perl-DateManip.spec,1.11,1.12
Message-ID: <200602031859.k13IxEbP032594@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-DateManip.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-DateManip.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DateManip/devel/perl-DateManip.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-DateManip.spec	17 Dec 2005 02:10:31 -0000	1.11
+++ perl-DateManip.spec	3 Feb 2006 18:59:11 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-DateManip
 Version:        5.44
-Release: 1.1
+Release: 	1.2
 Summary:        A Perl module containing a wide variety of date manipulation routines
 
 Group:          Development/Libraries
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.44-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:01:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:01:48 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1900,1.1901
Message-ID: <200602031901.k13J1mEi000662@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
shocking, s390 doesn't build




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1900
retrieving revision 1.1901
diff -u -r1.1900 -r1.1901
--- kernel-2.6.spec	3 Feb 2006 16:38:26 -0000	1.1900
+++ kernel-2.6.spec	3 Feb 2006 19:01:14 -0000	1.1901
@@ -155,7 +155,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:03:16 -0500
Subject: rpms/perl-Devel-Symdump/devel .cvsignore, 1.4,
	1.5 perl-Devel-Symdump.spec, 1.12, 1.13 sources, 1.4, 1.5
Message-ID: <200602031903.k13J3GUp000835@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-Devel-Symdump.spec sources 
Log Message:
Upgrade to 2.0.6; rebuild for new perl-5.8.8


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Jan 2006 17:18:59 -0000	1.4
+++ .cvsignore	3 Feb 2006 19:03:03 -0000	1.5
@@ -1,2 +1,3 @@
 Devel-Symdump-2.03.tar.gz
 Devel-Symdump-2.05.tar.gz
+Devel-Symdump-2.06.tar.gz


Index: perl-Devel-Symdump.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Devel-Symdump.spec	17 Jan 2006 22:36:46 -0000	1.12
+++ perl-Devel-Symdump.spec	3 Feb 2006 19:03:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Devel-Symdump
-Version:        2.05
-Release: 	2
+Version:        2.06
+Release: 	1
 Summary:        A Perl module for inspecting Perl's symbol table
 
 Group:          Development/Libraries
@@ -47,6 +47,10 @@
 
 
 %changelog
+* 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
+
 * Tue Jan 10 2006 Jason Vas Dias <jvdias at redhat.com> - 2.05-1
 - fix bug 176718: Upgrade to 2.05
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Jan 2006 17:18:59 -0000	1.4
+++ sources	3 Feb 2006 19:03:03 -0000	1.5
@@ -1 +1 @@
-ac5602fd74cb4c8f749e97f51933b7d3  Devel-Symdump-2.05.tar.gz
+a6564fdfc737e2f221602c8ed713c417  Devel-Symdump-2.06.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:07:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:07:08 -0500
Subject: rpms/perl-Digest-HMAC/devel perl-Digest-HMAC.spec,1.9,1.10
Message-ID: <200602031907.k13J78Qf001231@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Digest-HMAC.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Digest-HMAC.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-HMAC/devel/perl-Digest-HMAC.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Digest-HMAC.spec	17 Dec 2005 02:11:21 -0000	1.9
+++ perl-Digest-HMAC.spec	3 Feb 2006 19:07:04 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Digest-HMAC
 Version:        1.01
-Release: 14.1.1
+Release: 	14.2
 Summary:        Digest-HMAC Perl module
 
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.01-14.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:11:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:11:27 -0500
Subject: rpms/perl-Digest-SHA1/devel .cvsignore, 1.4,
	1.5 perl-Digest-SHA1.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200602031911.k13JBRG0003120@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-Digest-SHA1.spec sources 
Log Message:
Upgrade to 2.11; rebuild for new perl-5.8.8


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Apr 2005 22:50:14 -0000	1.4
+++ .cvsignore	3 Feb 2006 19:11:24 -0000	1.5
@@ -1 +1,2 @@
 Digest-SHA1-2.10.tar.gz
+Digest-SHA1-2.11.tar.gz


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Digest-SHA1.spec	17 Dec 2005 02:11:32 -0000	1.10
+++ perl-Digest-SHA1.spec	3 Feb 2006 19:11:24 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
-Version:        2.10
-Release: 1.1
+Version:        2.11
+Release: 	1
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.11-1
+- Upgrade to 2.11
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Apr 2005 22:50:14 -0000	1.4
+++ sources	3 Feb 2006 19:11:24 -0000	1.5
@@ -1 +1 @@
-4497a499b7c28ddd540a8caab412c6d7  Digest-SHA1-2.10.tar.gz
+2449bfe21d6589c96eebf94dae24df6b  Digest-SHA1-2.11.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:15:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:15:42 -0500
Subject: rpms/control-center/devel
	control-center-2.13.90-about-me-faces.patch, NONE,
	1.1 control-center.spec, 1.117, 1.118
Message-ID: <200602031915.k13JFgXD005413@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5180

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.13.90-about-me-faces.patch 
Log Message:
* Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> 1:2.13.90-2
- Patch gnome-about-me's file chooser dialog to default to the
  system faces directory


control-center-2.13.90-about-me-faces.patch:
 gnome-about-me.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE control-center-2.13.90-about-me-faces.patch ---
Index: gnome-control-center/capplets/about-me/gnome-about-me.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/about-me/gnome-about-me.c,v
retrieving revision 1.16
diff -d -u -p -r1.16 gnome-about-me.c
--- gnome-control-center/capplets/about-me/gnome-about-me.c	21 Jan 2006 16:59:38 -0000	1.16
+++ gnome-control-center/capplets/about-me/gnome-about-me.c	3 Feb 2006 16:17:15 -0000
@@ -609,7 +609,8 @@ about_me_image_clicked_cb (GtkWidget *bu
 							NULL);
 	gtk_window_set_modal (GTK_WINDOW (chooser_dialog), TRUE);
 	gtk_dialog_set_default_response (GTK_DIALOG (chooser_dialog), GTK_RESPONSE_ACCEPT);
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser_dialog), g_get_home_dir ());
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser_dialog),
+	                                     "/usr/share/pixmaps/faces");
 
 	gtk_file_chooser_set_use_preview_label (GTK_FILE_CHOOSER (chooser_dialog),
 						FALSE);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- control-center.spec	30 Jan 2006 19:37:40 -0000	1.117
+++ control-center.spec	3 Feb 2006 19:15:38 -0000	1.118
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.90
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -30,6 +30,7 @@
 Patch1: control-center-2.13.90-fedora-apps.patch
 Patch2: control-center-2.9.4-filesel.patch
 Patch3: control-center-2.10.1-mark-tool-buttons-important.patch
+Patch4: control-center-2.13.90-about-me-faces.patch
 Patch5: control-center-2.12.0-run-power-manager.patch
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.13.3-gecos.patch
@@ -95,6 +96,7 @@
 %patch1 -p1 -b .fedora-apps
 %patch2 -p1 -b .filesel
 %patch3 -p1 -b .mark-tool-buttons-important
+%patch4 -p1 -b .about-me-faces
 %patch5 -p1 -b .run-power-manager
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
@@ -221,6 +223,10 @@
 # (also its headers)
 
 %changelog
+* Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> 1:2.13.90-2
+- Patch gnome-about-me's file chooser dialog to default to the
+  system faces directory
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:16:02 -0500
Subject: rpms/perl-File-MMagic/devel .cvsignore, 1.8,
	1.9 perl-File-MMagic.spec, 1.13, 1.14 sources, 1.8, 1.9
Message-ID: <200602031916.k13JG27X008240@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-File-MMagic.spec sources 
Log Message:
Upgrade to 1.26; rebuild for new perl-5.8.8


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Jan 2006 17:27:06 -0000	1.8
+++ .cvsignore	3 Feb 2006 19:16:00 -0000	1.9
@@ -1,3 +1,4 @@
 File-MMagic-1.21.tar.gz
 File-MMagic-1.22.tar.gz
 File-MMagic-1.25.tar.gz
+File-MMagic-1.26.tar.gz


Index: perl-File-MMagic.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/perl-File-MMagic.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-File-MMagic.spec	17 Jan 2006 22:42:34 -0000	1.13
+++ perl-File-MMagic.spec	3 Feb 2006 19:16:00 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-File-MMagic
-Version:        1.25
-Release: 	2
+Version:        1.26
+Release: 	1
 Summary:        A Perl module emulating the file(1) command
 
 Group:          Development/Libraries
@@ -47,6 +47,10 @@
 
 
 %changelog
+* 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
+
 * Tue Jan 10 2006 Jason Vas Dias <jvdias at redhat.com> - 1.25-1
 - fix bug 176717: upgrade to 1.25
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Jan 2006 17:27:06 -0000	1.8
+++ sources	3 Feb 2006 19:16:00 -0000	1.9
@@ -1 +1 @@
-519e9668cff76e3debe34be0f0909f9f  File-MMagic-1.25.tar.gz
+d78658177edec26d75f3694c7f079326  File-MMagic-1.26.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:20:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:20:16 -0500
Subject: rpms/perl-Frontier-RPC/devel perl-Frontier-RPC.spec,1.8,1.9
Message-ID: <200602031920.k13JKG1J019605@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Frontier-RPC.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Frontier-RPC.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Frontier-RPC/devel/perl-Frontier-RPC.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Frontier-RPC.spec	17 Dec 2005 02:12:03 -0000	1.8
+++ perl-Frontier-RPC.spec	3 Feb 2006 19:20:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:        A Perl interface for making and serving XML-RPC calls
 Name:           perl-Frontier-RPC
 Version:        0.06
-Release: 39.1.1
+Release: 	39.2
 
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.06-39.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:26:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:26:06 -0500
Subject: rpms/kernel-xen/devel linux-2.6-xen-acpi.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 kernel-xen.spec, 1.39, 1.40 sources, 1.12, 1.13
Message-ID: <200602031926.k13JQ6QE022362@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	.cvsignore kernel-xen.spec sources 
Added Files:
	linux-2.6-xen-acpi.patch 
Log Message:
Undo ACPI_DEBUG config option for Xen
Rebase to xen-unstable hypervisor cset 8737
Fix merge of davej's acpi changes to xen


linux-2.6-xen-acpi.patch:
 acpi/boot-xen.c |    6 +++---
 mpparse-xen.c   |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-xen-acpi.patch ---
--- a/arch/i386/kernel/acpi/boot-xen.c~	2006-02-02 15:24:54.000000000 -0500
+++ b/arch/i386/kernel/acpi/boot-xen.c	2006-02-02 18:07:39.000000000 -0500
@@ -466,7 +466,7 @@
  * success: return IRQ number (>=0)
  * failure: return < 0
  */
-int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
+int acpi_register_gsi(u32 gsi, int triggering, int polarity)
 {
 	unsigned int irq;
 	unsigned int plat_gsi = gsi;
@@ -478,14 +478,14 @@
 	if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
 		extern void eisa_set_level_irq(unsigned int irq);
 
-		if (edge_level == ACPI_LEVEL_SENSITIVE)
+		if (triggering == ACPI_LEVEL_SENSITIVE)
 			eisa_set_level_irq(gsi);
 	}
 #endif
 
 #ifdef CONFIG_X86_IO_APIC
 	if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
-		plat_gsi = mp_register_gsi(gsi, edge_level, active_high_low);
+		plat_gsi = mp_register_gsi(gsi, triggering, polarity);
 	}
 #endif
 	acpi_gsi_to_irq(plat_gsi, &irq);
--- a/arch/i386/kernel/mpparse-xen.c~	2006-02-02 18:08:53.000000000 -0500
+++ b/arch/i386/kernel/mpparse-xen.c	2006-02-02 18:08:58.000000000 -0500
@@ -1097,7 +1097,7 @@
 
 #define MAX_GSI_NUM	4096
 
-int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
+int mp_register_gsi (u32 gsi, int triggering, int polarity)
 {
 	int			ioapic = -1;
 	int			ioapic_pin = 0;
@@ -1146,7 +1146,7 @@
 
 	mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
 
-	if (edge_level) {
+	if (triggering == ACPI_LEVEL_SENSITIVE) {
 		/*
 		 * For PCI devices assign IRQs in order, avoiding gaps
 		 * due to unused I/O APIC pins.
@@ -1168,8 +1168,8 @@
 	}
 
 	io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
-		    edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
-		    active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
+		    triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
+		    polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
 	return gsi;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	2 Feb 2006 14:04:14 -0000	1.12
+++ .cvsignore	3 Feb 2006 19:26:03 -0000	1.13
@@ -5,5 +5,5 @@
 patch-2.6.16-rc1.bz2
 bcm43xx-20060114.tar.bz2
 acpi-release-20060113-2.6.16-rc1.diff.bz2
-xen-20060127a.tar.bz2
 patch-2.6.16-rc1-git5.bz2
+xen-20060202.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kernel-xen.spec	3 Feb 2006 16:20:17 -0000	1.39
+++ kernel-xen.spec	3 Feb 2006 19:26:03 -0000	1.40
@@ -189,7 +189,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060127a.tar.bz2
+Source1: xen-20060202.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -265,6 +265,7 @@
 Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch
 Patch705: linux-2.6.14-xen_net_read_mac_export.patch
 Patch706: linux-2.6.14-xen_remap_vma_flags.patch
+Patch707: linux-2.6-xen-acpi.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -766,6 +767,7 @@
 %patch704 -p1
 %patch705 -p1
 %patch706 -p1
+%patch707 -p1
 %endif
 
 #
@@ -1576,7 +1578,8 @@
 %changelog
 * Fri Feb  3 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase to chrisw's latest merge tree (fix skbuff conflicts)
-- Enable ACPI debugging for now as a workaround for the ACPI heisenbug
+- Rebase to xen-unstable hypervisor cset 8737
+- Fix merge of davej's acpi changes to xen
 
 * Thu Feb  2 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase to linux-2.6-merge.hg cset 19892


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	2 Feb 2006 14:04:16 -0000	1.12
+++ sources	3 Feb 2006 19:26:04 -0000	1.13
@@ -1,6 +1,6 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
 fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
-07de3270c9a5c63915a209cd36def02e  xen-20060127a.tar.bz2
 3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2
 38954e4fe6dbf902e854f456b675f60f  patch-2.6.16-rc1-git5.bz2
+9a0a0e3c3ad5d049fcd29fb913d6c3a6  xen-20060202.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:26:07 -0500
Subject: rpms/kernel-xen/devel/configs config-xen-xen0,1.4,1.5
Message-ID: <200602031926.k13JQ77k022375@cvs.devel.redhat.com>

Author: sct

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

Modified Files:
	config-xen-xen0 
Log Message:
Undo ACPI_DEBUG config option for Xen
Rebase to xen-unstable hypervisor cset 8737
Fix merge of davej's acpi changes to xen



Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-xen0,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-xen-xen0	3 Feb 2006 16:20:18 -0000	1.4
+++ config-xen-xen0	3 Feb 2006 19:26:04 -0000	1.5
@@ -71,9 +71,3 @@
 #
 # CONFIG_X86_POWERNOW_K7 is not set
 # CONFIG_X86_P4_CLOCKMOD is not set
-
-#
-# Don't ask me why, but ACPI is currently broken unless debug is enabled.
-# We're working on it.
-#
-CONFIG_ACPI_DEBUG=y



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:30:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:30:53 -0500
Subject: rpms/perl-HTML-Tagset/devel perl-HTML-Tagset.spec,1.12,1.13
Message-ID: <200602031930.k13JUroV024232@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-HTML-Tagset.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-HTML-Tagset.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/perl-HTML-Tagset.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-HTML-Tagset.spec	17 Jan 2006 22:32:47 -0000	1.12
+++ perl-HTML-Tagset.spec	3 Feb 2006 19:30:50 -0000	1.13
@@ -1,6 +1,6 @@
 Name: 		perl-HTML-Tagset
 Version: 	3.10
-Release: 	2
+Release: 	2.1
 Summary: 	HTML::Tagset - data tables useful in parsing HTML
 
 Group: 		Development/Libraries
@@ -44,6 +44,9 @@
 %{_mandir}/man?/HTML::Tagset.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.10-2.1
+- rebuild for new perl-5.8.8
+
 * Tue Jan 10 2006 Jason Vas Dias <jvdias at redhat.com> - 3.10-1
 - fix bug 176720: upgrade to 3.10
 - make .spec file conform to fedora-rpmdevtools spectemplate-perl.spec



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:33:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:33:38 -0500
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.15,1.16
Message-ID: <200602031933.k13JXcRp024486@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-HTML-Parser.spec	19 Dec 2005 19:43:27 -0000	1.15
+++ perl-HTML-Parser.spec	3 Feb 2006 19:33:34 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.48
-Release: 1
+Release: 1.1
 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
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.48-1
+- rebuild for new perl-5.8.8
+
 * Mon Dec 19 2005 Jason Vas Dias<jvdias at redhat.com> - 3.48-1
 - upgrade to 3.48
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:36:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:36:07 -0500
Subject: rpms/perl-IO-String/devel perl-IO-String.spec,1.4,1.5
Message-ID: <200602031936.k13Ja7qB025036@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-IO-String.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-IO-String.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-String/devel/perl-IO-String.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IO-String.spec	17 Dec 2005 02:09:54 -0000	1.4
+++ perl-IO-String.spec	3 Feb 2006 19:36:04 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           perl-IO-String
 Version:        1.08
-Release:        1
+Release:        1.1
 
 Summary:        Emulate file interface for in-core strings
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0:1.08-1.1
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jason Vas Dias <jvdias at redhat.com> - 0:1.08-1
 - 1.08
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:38:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:38:46 -0500
Subject: rpms/perl-IO-Zlib/devel perl-IO-Zlib.spec,1.4,1.5
Message-ID: <200602031938.k13Jck2w026289@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-IO-Zlib.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-IO-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-IO-Zlib/devel/perl-IO-Zlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-IO-Zlib.spec	17 Dec 2005 02:12:58 -0000	1.4
+++ perl-IO-Zlib.spec	3 Feb 2006 19:38:44 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-IO-Zlib
 Version:        1.04
-Release: 4.1.1
+Release: 	4.2
 Summary:        Perl IO:: style interface to Compress::Zlib
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.04-4.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:41:10 -0500
Subject: rpms/perl-Inline/devel perl-Inline.spec,1.11,1.12
Message-ID: <200602031941.k13JfAi6027408@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Inline.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Inline.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Inline/devel/perl-Inline.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Inline.spec	17 Dec 2005 02:12:44 -0000	1.11
+++ perl-Inline.spec	3 Feb 2006 19:41:07 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Inline
 Version:        0.44
-Release: 15.1.1
+Release: 	15.2
 Summary:        Inline Perl module
 
 Group:          Development/Libraries
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.44-15.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:43:30 -0500
Subject: rpms/perl-Parse-RecDescent/devel perl-Parse-RecDescent.spec, 1.9,
	1.10
Message-ID: <200602031943.k13JhUv5028508@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Parse-RecDescent.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Parse-RecDescent.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Parse-RecDescent/devel/perl-Parse-RecDescent.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Parse-RecDescent.spec	17 Dec 2005 02:14:12 -0000	1.9
+++ perl-Parse-RecDescent.spec	3 Feb 2006 19:43:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-Parse-RecDescent
 Version:        1.94
-Release: 5.1.1
+Release: 	5.2
 Summary:        Parse-RecDescent Perl module
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.94-5.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:48:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:48:10 -0500
Subject: rpms/perl-LDAP/devel perl-LDAP.spec,1.6,1.7
Message-ID: <200602031948.k13JmAh6010504@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-LDAP.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-LDAP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-LDAP/devel/perl-LDAP.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-LDAP.spec	17 Dec 2005 02:13:08 -0000	1.6
+++ perl-LDAP.spec	3 Feb 2006 19:48:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-LDAP
 Version:        0.33
-Release: 1.1
+Release: 	1.2
 Epoch:          1
 Summary:        LDAP Perl module
 
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.33-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:52:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:52:37 -0500
Subject: rpms/perl-Net-IP/devel perl-Net-IP.spec,1.3,1.4
Message-ID: <200602031952.k13JqbfQ012645@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Net-IP.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Net-IP.spec	17 Dec 2005 02:13:49 -0000	1.3
+++ perl-Net-IP.spec	3 Feb 2006 19:52:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Net-IP
 Version:        1.24
-Release: 2%{?dist}.1.1
+Release: 	2%{?dist}.2
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.24-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:54:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:54:42 -0500
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.19,1.20
Message-ID: <200602031954.k13JsgPN007228@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Net-DNS.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-Net-DNS.spec	19 Dec 2005 18:15:10 -0000	1.19
+++ perl-Net-DNS.spec	3 Feb 2006 19:54:40 -0000	1.20
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.55
-Release: 1
+Release: 1.1
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries
@@ -52,6 +52,9 @@
 %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.55-1.1
+- rebuild for new perl-5.8.8
+
 * Mon Dec 19 2005 Jason Vas Dias <jvdias at redhat.com> - 0.55-1
 - Upgrade to upstream version 0.55
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 19:57:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 14:57:51 -0500
Subject: rpms/yum/devel yum-2.5.1-remove.patch,1.1,1.2
Message-ID: <200602031957.k13Jvp8q007464@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7451

Modified Files:
	yum-2.5.1-remove.patch 
Log Message:
Fix second occurence

yum-2.5.1-remove.patch:
 __init__.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: yum-2.5.1-remove.patch
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum-2.5.1-remove.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yum-2.5.1-remove.patch	15 Jan 2006 12:45:53 -0000	1.1
+++ yum-2.5.1-remove.patch	3 Feb 2006 19:57:48 -0000	1.2
@@ -1,5 +1,5 @@
---- yum-2.5.1/yum/__init__.py.remove	2006-01-15 12:43:10.000000000 +0000
-+++ yum-2.5.1/yum/__init__.py	2006-01-15 12:43:23.000000000 +0000
+--- yum-2.5.1/yum/__init__.py.remove	2006-01-08 18:59:01.000000000 -0500
++++ yum-2.5.1/yum/__init__.py	2006-02-03 14:56:56.000000000 -0500
 @@ -1278,7 +1278,7 @@
                      try:
                          txmbr.groups.remove(grpid)
@@ -9,3 +9,12 @@
                          continue
                      
                      # if there aren't any other groups mentioned then remove the pkg
+@@ -1343,7 +1343,7 @@
+                     try: 
+                         txmbr.groups.remove(grpid)
+                     except ValueError:
+-                        self.log(4, "package %s was not marked in group %s" % (po, grpid))
++                        self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid))
+                         continue
+                     
+                     # if there aren't any other groups mentioned then remove the pkg



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:00:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:00:25 -0500
Subject: rpms/yum/devel yum.spec,1.77,1.78
Message-ID: <200602032000.k13K0PHm007526@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7512

Modified Files:
	yum.spec 
Log Message:
bump


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- yum.spec	31 Jan 2006 23:21:09 -0000	1.77
+++ yum.spec	3 Feb 2006 20:00:22 -0000	1.78
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.5.1
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz
@@ -102,6 +102,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Fri Feb 03 2006 Paul Nasrat <pnasrat at redhat.com> - 2.5.1-4
+- Fix group unselect traceback (cf #177737)
+
 * Tue Jan 31 2006 Paul Nasrat <pnasrat at redhat.com> - 2.5.1-3
 - Merge upstream patches (sortabletransactiondata, grouplists)
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:04:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:04:03 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1901,1.1902
Message-ID: <200602032004.k13K43KT007651@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1901
retrieving revision 1.1902
diff -u -r1.1901 -r1.1902
--- kernel-2.6.spec	3 Feb 2006 19:01:14 -0000	1.1901
+++ kernel-2.6.spec	3 Feb 2006 20:04:01 -0000	1.1902
@@ -1196,6 +1196,9 @@
 exit 0
 
 %post 
+if [ `uname -i` == "x86_64" ]; then
+  sed -e -i 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
+fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
 
@@ -1385,6 +1388,7 @@
 %changelog
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2
+- Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:05:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:05:40 -0500
Subject: rpms/fontconfig/devel
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch, 1.1,
	1.2 fontconfig.spec, 1.63, 1.64
Message-ID: <200602032005.k13K5ewj007703@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch 
	fontconfig.spec 
Log Message:
- Move user cache to a subdirectory (bug 160275)


fontconfig-2.3.93.cvs20060131-move-user-cache.patch:
 fontconfig/fontconfig.h |    1 +
 src/fccache.c           |   18 +++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

Index: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.93.cvs20060131-move-user-cache.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig-2.3.93.cvs20060131-move-user-cache.patch	2 Feb 2006 23:13:50 -0000	1.1
+++ fontconfig-2.3.93.cvs20060131-move-user-cache.patch	3 Feb 2006 20:05:35 -0000	1.2
@@ -1,92 +1,48 @@
---- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-02 16:06:27.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-02 16:06:27.000000000 -0500
-@@ -1755,14 +1755,50 @@
- {
-     if (_FcConfigHomeEnabled)
-     {
--        char *home = getenv ("HOME");
-+        static FcChar8 *fc_home = NULL;
-+
-+        const char *home = getenv ("HOME");
-+
-+	if (home != NULL)
-+	{
-+            FcBool appended_ok;
-+            FcStrBuf buf;
-+            FcStrBufInit (&buf, 0, 0);
-+	    appended_ok = FcStrBufString (&buf, (const FcChar8 *) home);
-+
-+            if (appended_ok)
-+		appended_ok = FcStrBufChar (&buf, '/');
-+
-+	    if (appended_ok)
-+	        appended_ok = FcStrBufString (&buf, (const FcChar8 *) FC_USER_CACHE_DIR);
-+                
-+            if (appended_ok)
-+		fc_home = FcStrBufDone (&buf);
-+	}
- 
- #ifdef _WIN32
- 	if (home == NULL)
- 	    home = getenv ("USERPROFILE");
-+
-+	if (home != NULL)
-+	{
-+            FcBool appended_ok;
-+            FcStrBuf buf;
-+            FcStrBufInit (&buf, 0, 0);
-+	    appended_ok = FcStrBufString (&buf, (const FcChar8 *) home);
-+
-+            if (appended_ok)
-+		appended_ok = FcStrBufChar (&buf, '/');
-+
-+	    if (appended_ok)
-+	        appended_ok = FcStrBufString (&buf, (const FcChar8 *) FC_USER_CACHE_DIR);
-+                
-+            if (appended_ok)
-+		fc_home = FcStrBufDone (&buf);
-+	}
- #endif
+--- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-03 14:26:31.000000000 -0500
++++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-03 14:26:31.000000000 -0500
+@@ -446,7 +446,23 @@
+ 	return FcFalse;
  
--	return (FcChar8 *) home;
-+	return (FcChar8 *) fc_home;
-     }
-     return 0;
- }
---- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-02 16:06:27.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-02 16:15:30.000000000 -0500
-@@ -449,6 +449,24 @@
- 	goto bail1;
-     fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
- 	       S_IRUSR | S_IWUSR);
-+    if (fd == -1 && errno == ENOENT)
+     if (!FcAtomicLock (atomic))
+-	goto bail1;
 +    {
-+	FcChar8 *cache_dir;
-+          
-+        cache_dir = FcStrDirname (cache_file);
++      FcChar8 *cache_dir;
 +
-+        /* quick last ditch effort to try to make the
-+         * dir if it doesn't exist.  This doesn't support
-+         * making more than one component of the path
-+         * and is broken in the WIN32 case.
-+         */
-+	mkdir ((char *) cache_dir, 0777);
-+        FcStrFree (cache_dir);
++      cache_dir = FcStrDirname (cache_file);
 +
-+        fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
-+	           S_IRUSR | S_IWUSR);
++      /* quick last ditch effort to try to make the dir in the
++       * off chance it doesn't exist.  This doesn't support
++       * making more than one component of the path and is
++       * broken in the WIN32 case.
++       */
++      mkdir ((char *) cache_dir, 0777);
++      FcStrFree (cache_dir);
++
++      if (!FcAtomicLock (atomic))
++        goto bail1;
 +    }
 +
+     fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
+ 	       S_IRUSR | S_IWUSR);
      if (fd == -1)
- 	goto bail2;
-     FcCacheWriteString (fd, FC_GLOBAL_MAGIC_COOKIE);
+--- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-03 14:26:31.000000000 -0500
++++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-03 14:50:05.000000000 -0500
+@@ -79,7 +79,7 @@
+ 
+     config->cache = 0;
+     if (FcConfigHome())
+-	if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_FILE)))
++	if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_DIR "/" FC_USER_CACHE_FILE)))
+ 	    goto bail8;
+ 
+ #ifdef _WIN32
 --- fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-02 16:06:27.000000000 -0500
++++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-03 14:26:31.000000000 -0500
 @@ -106,6 +106,7 @@
  
  #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
  #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
-+#define FC_USER_CACHE_DIR	    ".rh-fontconfig/"
++#define FC_USER_CACHE_DIR	    ".rh-fontconfig"
  #define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
  
  /* Adjust outline rasterizer */


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- fontconfig.spec	2 Feb 2006 23:13:50 -0000	1.63
+++ fontconfig.spec	3 Feb 2006 20:05:35 -0000	1.64
@@ -60,7 +60,7 @@
 %patch4 -p1 -b .fontconfig-misc-warning-fixes
 %patch5 -p0 -b .fontconfig-fccache-update-check
 %patch6 -p0 -b .fontconfig-seife-crash
-#%patch7 -p1 -b .move-user-cache
+%patch7 -p1 -b .move-user-cache
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:14:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:14:01 -0500
Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.4,1.5
Message-ID: <200602032014.k13KE1nM007873@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-Net-Telnet.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-Net-Telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Net-Telnet.spec	17 Dec 2005 02:14:02 -0000	1.4
+++ perl-Net-Telnet.spec	3 Feb 2006 20:13:59 -0000	1.5
@@ -1,17 +1,18 @@
-%define _use_internal_dependency_generator 0
-
-Name: perl-Net-Telnet
-Version: 3.03
-Release: 4.1.1
-Summary: Net-Telnet Perl module
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/~jrogers/Net-Telnet-3.03/lib/Net/Telnet.pm
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: Net-Telnet-%{version}.tar.gz
-BuildArch: noarch
-BuildRequires: perl-Digest-HMAC
+Name: 		perl-Net-Telnet
+Version: 	3.03
+Release: 	4.2
+Summary: 	Net-Telnet Perl module
+
+Group: 	 	Development/Libraries
+License: 	distributable
+URL: 		http://www.cpan.org/~jrogers/Net-Telnet-3.03/lib/Net/Telnet.pm
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: 	noarch
+BuildRequires: 	perl >= 0:5.00503
+Source0: 	ftp://ftp.cpan.org/pub/CPAN/authors/id/J/JR/JROGERS/Net-Telnet-%{version}.tar.gz
+BuildRequires:	perl-Digest-HMAC
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Net::Telnet allows you to make client connections to a TCP port and do network I/O,
@@ -27,36 +28,33 @@
 %setup -q -n Net-Telnet-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make
-make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 %install
+rm -rf $RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
 
+%check
+make test
+
+%clean
 rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-make install
-
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
-
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
-
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > Net-Telnet-%{version}-filelist
-if [ "$(cat Net-Telnet-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
 
-%files -f Net-Telnet-%{version}-filelist
-%defattr(-,root,root)
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog MANIFEST README
+%{perl_vendorlib}/*
+%{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.03-4.2
+- rebuild for new perl-5.8.8
+- modify .spec file to conform to Fedora spectemplate-perl.spec
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:16:56 -0500
Subject: rpms/fontconfig/devel
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch, 1.2, 1.3
Message-ID: <200602032016.k13KGuKG020369@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch 
Log Message:
remove leading . from user font cache


fontconfig-2.3.93.cvs20060131-move-user-cache.patch:
 fontconfig/fontconfig.h |    3 ++-
 src/fccache.c           |   18 +++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

Index: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.93.cvs20060131-move-user-cache.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fontconfig-2.3.93.cvs20060131-move-user-cache.patch	3 Feb 2006 20:05:35 -0000	1.2
+++ fontconfig-2.3.93.cvs20060131-move-user-cache.patch	3 Feb 2006 20:16:52 -0000	1.3
@@ -1,5 +1,5 @@
---- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-03 14:26:31.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-03 14:26:31.000000000 -0500
+--- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-03 15:15:29.000000000 -0500
++++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-03 15:15:29.000000000 -0500
 @@ -446,7 +446,23 @@
  	return FcFalse;
  
@@ -25,8 +25,8 @@
      fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
  	       S_IRUSR | S_IWUSR);
      if (fd == -1)
---- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-03 14:26:31.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-03 14:50:05.000000000 -0500
+--- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-03 15:15:29.000000000 -0500
++++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-03 15:15:29.000000000 -0500
 @@ -79,7 +79,7 @@
  
      config->cache = 0;
@@ -37,12 +37,14 @@
  
  #ifdef _WIN32
 --- fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-03 14:26:31.000000000 -0500
-@@ -106,6 +106,7 @@
++++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-03 15:16:10.000000000 -0500
+@@ -106,7 +106,8 @@
  
  #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
  #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
+-#define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
 +#define FC_USER_CACHE_DIR	    ".rh-fontconfig"
- #define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
++#define FC_USER_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
  
  /* Adjust outline rasterizer */
+ #define FC_CHAR_WIDTH	    "charwidth"	/* Int */



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:17:48 -0500
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.20,1.21
Message-ID: <200602032017.k13KHm26020462@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-PDL.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-PDL.spec	17 Dec 2005 02:14:22 -0000	1.20
+++ perl-PDL.spec	3 Feb 2006 20:17:45 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.2
-Release: 2.fc5.1.1
+Release: 	2.fc5.1.2 
 Summary:        PDL Perl module
 
 Group:          Development/Libraries
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.2-2.fc5.1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:21:40 -0500
Subject: rpms/perl-RPM-Specfile/devel perl-RPM-Specfile.spec,1.10,1.11
Message-ID: <200602032021.k13KLeSd020601@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-RPM-Specfile.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-RPM-Specfile.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-RPM-Specfile.spec	17 Jan 2006 22:26:35 -0000	1.10
+++ perl-RPM-Specfile.spec	3 Feb 2006 20:21:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-RPM-Specfile
 Version:        1.19
-Release:        2
+Release:        2.1
 Summary:        Perl extension for creating RPM specfiles
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.19-2.1
+- rebuild for new perl-5.8.8
+
 * Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.19-1
 - 1.19 (#176721).
 - Rewrite specfile using fedora-rpmdevtools' spec template, fixes #176888.



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:36:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:36:45 -0500
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.21, 1.22 sources,
	1.27, 1.28 system-config-kickstart.spec, 1.31, 1.32
Message-ID: <200602032036.k13Kaj1X032714@cvs.devel.redhat.com>

Author: clumens

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

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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	4 Jan 2006 20:11:30 -0000	1.21
+++ .cvsignore	3 Feb 2006 20:36:42 -0000	1.22
@@ -14,3 +14,4 @@
 system-config-kickstart-2.6.1.tar.bz2
 system-config-kickstart-2.6.2.tar.bz2
 system-config-kickstart-2.6.3.tar.bz2
+system-config-kickstart-2.6.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Jan 2006 20:11:30 -0000	1.27
+++ sources	3 Feb 2006 20:36:42 -0000	1.28
@@ -1 +1 @@
-29a56e984b47b9016f4026cc4aa54834  system-config-kickstart-2.6.3.tar.bz2
+ccbe17a8cbac0e87ee6105697d68852d  system-config-kickstart-2.6.4.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-kickstart.spec	4 Jan 2006 20:11:30 -0000	1.31
+++ system-config-kickstart.spec	3 Feb 2006 20:36:42 -0000	1.32
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.3
+Version: 2.6.4
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -20,6 +20,8 @@
 Requires: rhpl
 Requires: system-config-language
 Requires: pykickstart
+Requires: yum
+Requires: pirut
 Prereq: gtk2 >= 2.6
 
 %description
@@ -29,6 +31,7 @@
 %setup -q
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make INSTROOT=$RPM_BUILD_ROOT install
 desktop-file-install --vendor system --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -63,17 +66,22 @@
 %defattr(-,root,root)
 %doc COPYING
 %doc doc/*
-/usr/sbin/%{name}
-/usr/sbin/ksconfig
+/etc/pam.d/system-config-kickstart
+/etc/security/console.apps/system-config-kickstart
+/usr/bin/%{name}
 %dir /usr/share/%{name}
 /usr/share/%{name}/*
-/usr/share/%{name}/pixmaps/%{name}.png
 %{_mandir}/man8/%{name}*
 %lang(ja) %{_mandir}/ja/man8/%{name}*
 %attr(0644,root,root) %{_datadir}/applications/%{name}.desktop
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Fri Feb 03 2006 Chris Lumens <clumens at redhat.com> 2.6.4-1
+- Convert package selection to using pirut (#178759).
+- Partitioning screen fixes for cciss.
+- Use consolehelper.
+
 * Wed Jan 04 2006 Chris Lumens <clumens at redhat.com> 2.6.3-1
 - Remove references to monitor in xconfig (#176537).
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:42:37 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1902,1.1903
Message-ID: <200602032042.k13Kgbiu003083@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
hush edac



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1902
retrieving revision 1.1903
diff -u -r1.1902 -r1.1903
--- kernel-2.6.spec	3 Feb 2006 20:04:01 -0000	1.1902
+++ kernel-2.6.spec	3 Feb 2006 20:42:34 -0000	1.1903
@@ -1389,6 +1389,7 @@
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2
 - Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
+- Silence noisy edac drivers.
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6



From fedora-cvs-commits at redhat.com  Fri Feb  3 20:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 15:42:37 -0500
Subject: rpms/kernel/devel/configs config-x86-generic, 1.32,
	1.33 config-x86_64-generic, 1.28, 1.29
Message-ID: <200602032042.k13KgbBN003091@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
hush edac



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config-x86-generic	26 Jan 2006 03:40:32 -0000	1.32
+++ config-x86-generic	3 Feb 2006 20:42:35 -0000	1.33
@@ -276,7 +276,7 @@
 CONFIG_CS5535_GPIO=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- config-x86_64-generic	19 Jan 2006 22:08:21 -0000	1.28
+++ config-x86_64-generic	3 Feb 2006 20:42:35 -0000	1.29
@@ -149,7 +149,7 @@
 CONFIG_NVRAM=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:06:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:06:47 -0500
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.21,1.22
Message-ID: <200602032106.k13L6l0e023930@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-PDL.spec 
Log Message:
rebuild for new perl-5.8.8; enable build to succeed without perl-PDL being installed


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-PDL.spec	3 Feb 2006 20:17:45 -0000	1.21
+++ perl-PDL.spec	3 Feb 2006 21:06:42 -0000	1.22
@@ -50,6 +50,9 @@
 chmod +x %{__perl_requires}
 
 %build
+export PERL5LIB=`pwd`/blib/lib
+#^- can no longer build if perl-PDL is not installed without above
+#
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make OPTIMIZE="$RPM_OPT_FLAGS"
 # smp flags blows up spectacularly (2.4.1-10 May 7th 2005)
@@ -91,6 +94,7 @@
 %changelog
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.2-2.fc5.1.2
 - rebuild for new perl-5.8.8
+- enable build to succeed without perl-PDL being installed :-)
 
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:10:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:10:29 -0500
Subject: rpms/perl-SGMLSpm/devel perl-SGMLSpm.spec,1.11,1.12
Message-ID: <200602032110.k13LATNT025085@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-SGMLSpm.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-SGMLSpm.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-SGMLSpm/devel/perl-SGMLSpm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-SGMLSpm.spec	17 Dec 2005 02:14:44 -0000	1.11
+++ perl-SGMLSpm.spec	3 Feb 2006 21:10:26 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           perl-SGMLSpm
 Version:        1.03ii
-Release: 16.1.1
+Release: 	16.2
 Summary:        Perl library for parsing the output of nsgmls
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://search.cpan.org/dist/SGMLSpm/
-Source0:    http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-%{version}.tar.gz
+Source0:    	http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.03ii-16.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:12:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:12:38 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.3,1.4
Message-ID: <200602032112.k13LCcuo026098@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-String-CRC32.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-String-CRC32.spec	19 Jan 2006 20:00:15 -0000	1.3
+++ perl-String-CRC32.spec	3 Feb 2006 21:12:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.3
-Release:        2.FC5
+Release:        3.FC5
 
 Summary:        Perl interface for cyclic redundency check generation
 
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0:1.03-3.FC5
+- rebuild for new perl-5.8.8
+
 * Thu Jan 19 2006 Jason Vas Dias <jvdias at redhat.com> - 0:1.03-2.FC5
 - bug 176175 addendum: license should be 'Public Domain'
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:15:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:15:03 -0500
Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.12,1.13
Message-ID: <200602032115.k13LF3D7027242@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-TermReadKey.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-TermReadKey.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-TermReadKey.spec	17 Dec 2005 02:14:54 -0000	1.12
+++ perl-TermReadKey.spec	3 Feb 2006 21:15:00 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-TermReadKey
 Version:        2.30
-Release: 1.1
+Release: 	1.2
 Summary:        A perl module for simple terminal control
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.30-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:18:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:18:00 -0500
Subject: rpms/perl-TimeDate/devel perl-TimeDate.spec,1.8,1.9
Message-ID: <200602032118.k13LI0x7008153@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-TimeDate.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-TimeDate.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TimeDate/devel/perl-TimeDate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-TimeDate.spec	17 Dec 2005 02:15:09 -0000	1.8
+++ perl-TimeDate.spec	3 Feb 2006 21:17:57 -0000	1.9
@@ -1,7 +1,7 @@
 Name:           perl-TimeDate
 Version:        1.16
 Epoch:          1
-Release: 3.1.1
+Release: 	3.2
 Summary:        A Perl module for time and date manipulation
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1:1.16-3.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:21:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:21:15 -0500
Subject: rpms/perl-URI/devel perl-URI.spec,1.13,1.14
Message-ID: <200602032121.k13LLFEC009723@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-URI.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-URI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-URI/devel/perl-URI.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-URI.spec	17 Dec 2005 02:15:40 -0000	1.13
+++ perl-URI.spec	3 Feb 2006 21:21:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-URI
 Version:        1.35
-Release: 2.1.1
+Release: 	2.2
 Summary:        A Perl module implementing URI parsing and manipulation
 
 Group:          Development/Libraries
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.35-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:24:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:24:16 -0500
Subject: rpms/perl-XML-Dumper/devel perl-XML-Dumper.spec,1.10,1.11
Message-ID: <200602032124.k13LOGmH011185@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-Dumper.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-Dumper.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Dumper/devel/perl-XML-Dumper.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-XML-Dumper.spec	17 Dec 2005 02:16:01 -0000	1.10
+++ perl-XML-Dumper.spec	3 Feb 2006 21:24:14 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-XML-Dumper
 Version:        0.79
-Release: 1.1
+Release: 	1.2
 Summary:        Perl module for dumping Perl objects from/to XML
 
 Group:          Development/Libraries
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.79-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:28:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:28:07 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.234,1.235
Message-ID: <200602032128.k13LS7uZ012929@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12901

Modified Files:
	eclipse.spec 
Log Message:
Updated spec file for launcher script update.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- eclipse.spec	1 Feb 2006 15:32:50 -0000	1.234
+++ eclipse.spec	3 Feb 2006 21:28:03 -0000	1.235
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_1fc
+Release:        1jpp_2fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1251,6 +1251,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 3 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_2fc
+- Updated launcher script.
+
 * Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
 - 3.1.2.
 - Remove unnecessary patches.



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:29:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:29:17 -0500
Subject: rpms/perl-libwww-perl/devel perl-libwww-perl.spec,1.16,1.17
Message-ID: <200602032129.k13LTHNm013514@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-libwww-perl.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-libwww-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-libwww-perl/devel/perl-libwww-perl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-libwww-perl.spec	19 Dec 2005 18:27:19 -0000	1.16
+++ perl-libwww-perl.spec	3 Feb 2006 21:29:14 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-libwww-perl
 Version:        5.805
-Release: 	1
+Release: 	1.1
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
@@ -13,7 +13,7 @@
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(HTML::Entities), perl(URI)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Compress::Zlib)
 Requires:       perl-HTML-Parser >= 3.33
 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.805-1.1
+- rebuild for new perl-5.8.8
+
 * Mon Dec 18 2005 Jason Vas Dias<jvdias at redhat.com> - 5.805-1
 - Upgrade to 5.805-1
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:35:17 -0500
Subject: rpms/perl-libxml-perl/devel perl-libxml-perl.spec,1.9,1.10
Message-ID: <200602032135.k13LZHlS014294@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-libxml-perl.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-libxml-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-libxml-perl/devel/perl-libxml-perl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-libxml-perl.spec	17 Dec 2005 02:13:28 -0000	1.9
+++ perl-libxml-perl.spec	3 Feb 2006 21:35:13 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-libxml-perl
 Version:        0.08
-Release: 1.1
+Release: 	1.2
 Summary:        A collection of Perl modules for working with XML
 
 Group:          Development/Libraries
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.08-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:39:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:39:44 -0500
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.15,1.16
Message-ID: <200602032139.k13LdinI016395@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-Parser.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-XML-Parser.spec	17 Dec 2005 02:17:59 -0000	1.15
+++ perl-XML-Parser.spec	3 Feb 2006 21:39:41 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.34
-Release: 6.1.1
+Release:	6.1.2
 Summary:        A low level Perl module for parsing XML either via trees or streaming
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.34-6-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:45:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:45:02 -0500
Subject: rpms/perl-XML-NamespaceSupport/devel perl-XML-NamespaceSupport.spec,
	1.6, 1.7
Message-ID: <200602032145.k13Lj2Il018808@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-NamespaceSupport.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-NamespaceSupport.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-NamespaceSupport/devel/perl-XML-NamespaceSupport.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-XML-NamespaceSupport.spec	17 Dec 2005 02:17:33 -0000	1.6
+++ perl-XML-NamespaceSupport.spec	3 Feb 2006 21:44:59 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-XML-NamespaceSupport
 Version:        1.09
-Release: 1.1
+Release:	1.2
 Summary:        XML-NamespaceSupport Perl module
 
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.09-1.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:48:19 -0500
Subject: rpms/perl-XML-LibXML-Common/devel perl-XML-LibXML-Common.spec, 1.8,
	1.9
Message-ID: <200602032148.k13LmJXQ032648@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-XML-LibXML-Common/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32618

Modified Files:
	perl-XML-LibXML-Common.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-LibXML-Common.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML-Common/devel/perl-XML-LibXML-Common.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-XML-LibXML-Common.spec	17 Dec 2005 02:17:13 -0000	1.8
+++ perl-XML-LibXML-Common.spec	3 Feb 2006 21:48:16 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-XML-LibXML-Common
 Version:        0.13
-Release: 8.1.1
+Release: 	8.2
 Summary:        XML-LibXML-Common Perl module
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.13-8.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:52:05 -0500
Subject: rpms/kdegames/devel .cvsignore, 1.32, 1.33 kdegames.spec, 1.45,
	1.46 sources, 1.33, 1.34
Message-ID: <200602032152.k13Lq5SJ002355@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegames/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2171

Modified Files:
	.cvsignore kdegames.spec sources 
Log Message:
- 3.5.1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	5 Dec 2005 13:08:51 -0000	1.32
+++ .cvsignore	3 Feb 2006 21:52:02 -0000	1.33
@@ -10,3 +10,4 @@
 kdegames-3.4.91-patched.tar.bz2
 kdegames-3.4.92-patched.tar.bz2
 kdegames-3.5.0-patched.tar.bz2
+kdegames-3.5.1-patched.tar.bz2


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdegames.spec	9 Dec 2005 22:41:09 -0000	1.45
+++ kdegames.spec	3 Feb 2006 21:52:02 -0000	1.46
@@ -3,20 +3,23 @@
 %define make_cvs 1
 
 %define arts 1
-%define ksok 0
+%define redhatify 1
 
-%if %{ksok}
-%define patch_name %{nil}
-%else
+%if %{redhatify}
 %define patch_name -patched
+%else
+%define patch_name %{nil}
 %endif
 
 %define qt_version 3.3.5
+%define qt_epoch 1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -30,10 +33,9 @@
 Patch: kde-libtool.patch
 Patch1: kdegames-3.1.1-konquest.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -46,6 +48,7 @@
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
+BuildRequires: qt-devel >= %{qt_epoch}:%{qt_version}
 BuildRequires: perl
 
 %description
@@ -58,7 +61,7 @@
 Summary: Development files for kdegames
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdebase-devel >= 6:%{version}
+Requires: kdebase-devel >= %{kdebase_epoch}:%{version}
 
 %description devel
 Development files for the KDE gaming libraries.
@@ -70,13 +73,6 @@
 %patch -p1 -b .libtool
 %patch1 -p1 -b .konquest
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -91,16 +87,25 @@
 CFLAGS="$FLAGS" \
 CXXFLAGS="$FLAGS -fno-check-new" \
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
-%%ifarch s390 s390x
+%ifarch s390 s390x
    --disable-pie \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
    --includedir=%{prefix}/include/kde \
    --with-qt-libraries=$QTDIR/lib
 
@@ -111,8 +116,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-make -C klickety install DESTDIR=$RPM_BUILD_ROOT
-  
 # Make symlinks relative
 pushd $RPM_BUILD_ROOT/usr/share/doc/HTML/en
 for i in *; do
@@ -150,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	5 Dec 2005 13:08:51 -0000	1.33
+++ sources	3 Feb 2006 21:52:02 -0000	1.34
@@ -1 +1 @@
-cba7f49b36b74954c6bc3226d3912201  kdegames-3.5.0-patched.tar.bz2
+fb44a24d646801989a4e7e837e628c00  kdegames-3.5.1-patched.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:52:32 -0500
Subject: rpms/perl-XML-SAX/devel perl-XML-SAX.spec,1.8,1.9
Message-ID: <200602032152.k13LqWRE002679@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-SAX.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-SAX.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-SAX/devel/perl-XML-SAX.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-XML-SAX.spec	19 Dec 2005 20:04:01 -0000	1.8
+++ perl-XML-SAX.spec	3 Feb 2006 21:52:29 -0000	1.9
@@ -4,7 +4,7 @@
 Summary: XML-SAX Perl module
 Name: perl-XML-SAX
 Version: 0.13
-Release: 1
+Release: 1.1
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-SAX/
@@ -76,7 +76,10 @@
 %exclude %{perl_vendorlib}/XML/SAX/placeholder.pl
 
 %changelog
-* Mon Dec 19 2005 Jason Vas Dias <jvdias at redhat.com>
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.13-1.1
+- rebuild for new perl-5.8.8
+
+* Mon Dec 19 2005 Jason Vas Dias <jvdias at redhat.com> - 0.13-1
 - upgrade to 0.13
 
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Feb  3 21:55:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 16:55:44 -0500
Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.9,1.10
Message-ID: <200602032155.k13LtioE030194@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-LibXML.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-LibXML.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-XML-LibXML.spec	17 Dec 2005 02:16:48 -0000	1.9
+++ perl-XML-LibXML.spec	3 Feb 2006 21:55:42 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: XML-LibXML Perl module
 Name: perl-XML-LibXML
 Version: 1.58
-Release: 2.1.1
+Release: 2.2
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-LibXML/
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.58-2.2
+- rebuild for new perl-5.8.8
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:07:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:07:21 -0500
Subject: rpms/kdeaccessibility/devel .cvsignore, 1.9,
	1.10 kdeaccessibility.spec, 1.11, 1.12 sources, 1.9, 1.10
Message-ID: <200602032207.k13M7LkB031185@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31170

Modified Files:
	.cvsignore kdeaccessibility.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	1 Dec 2005 10:03:45 -0000	1.9
+++ .cvsignore	3 Feb 2006 22:07:18 -0000	1.10
@@ -6,3 +6,4 @@
 kdeaccessibility-3.4.91.tar.bz2
 kdeaccessibility-3.4.92.tar.bz2
 kdeaccessibility-3.5.0.tar.bz2
+kdeaccessibility-3.5.1.tar.bz2


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kdeaccessibility.spec	9 Dec 2005 22:41:08 -0000	1.11
+++ kdeaccessibility.spec	3 Feb 2006 22:07:18 -0000	1.12
@@ -2,11 +2,12 @@
 %define final 1
 
 %define qt_version 3.3.5
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -18,12 +19,12 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch: kde-libtool.patch
 
-Requires: kdebase >= 6:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
-BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: kdebase-devel >= %{kdebase_epoch}:%{version}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -37,7 +38,7 @@
 Included with this package are:
 kmag, a screen magnifier,
 kmousetool, a program for people whom it hurts to click the mouse,
-KMouth, program that allows people who have lost their voice
+kmouth, program that allows people who have lost their voice
 to let their computer speak for them.
 
 %prep
@@ -47,17 +48,19 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 make -f admin/Makefile.common cvs
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -104,6 +107,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Dec 2005 10:03:45 -0000	1.9
+++ sources	3 Feb 2006 22:07:18 -0000	1.10
@@ -1 +1 @@
-f88f3340acdd219050759df86e3d97d0  kdeaccessibility-3.5.0.tar.bz2
+cc0773103053a6800b3d35e6021b6719  kdeaccessibility-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:12:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:12:35 -0500
Subject: rpms/perl-XML-Grove/devel perl-XML-Grove.spec,1.13,1.14
Message-ID: <200602032212.k13MCZFx031394@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-Grove.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-Grove.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-XML-Grove.spec	10 Jan 2006 16:24:15 -0000	1.13
+++ perl-XML-Grove.spec	3 Feb 2006 22:12:32 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-XML-Grove
 Version:        0.46alpha
-Release:        29
+Release:        29.1
 Summary:        Simple access to infoset of parsed XML, HTML, or SGML instances
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.46alpha-29.1
+- rebuild for new perl-5.8.8
+
 * Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.46alpha-29
 - Rewrite specfile using fedora-rpmdevtools' spec template, fixes #176889.
 - Fix License, include docs.



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:15:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:15:13 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.53.2.1 config-x86-generic, 1.19,
	1.19.2.1 config-x86_64-generic, 1.16, 1.16.4.1
Message-ID: <200602032215.k13MFD62031497@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv31468/configs

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -u -r1.53 -r1.53.2.1
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	3 Feb 2006 22:15:11 -0000	1.53.2.1
@@ -588,6 +588,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NETDEBUG=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -645,6 +646,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
@@ -655,6 +658,7 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -693,6 +697,7 @@
 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_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -754,6 +759,7 @@
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -789,6 +795,36 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=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_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=n
+CONFIG_TIPC_DEBUG=y
+
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
@@ -1040,6 +1076,7 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_SKGE=m
+CONFIG_SKY2=m
 CONFIG_TIGON3=m
 
 #
@@ -1098,11 +1135,14 @@
 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_IPW_DEBUG is not set
+# CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100_PROMISC is not set
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1112,6 +1152,8 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
+CONFIG_BCM43XX=m
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1127,6 +1169,7 @@
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
 #
@@ -2526,6 +2569,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	3 Feb 2006 22:15:11 -0000	1.19.2.1
@@ -241,12 +241,14 @@
 CONFIG_IEEE80211_WPA=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2100_PROMISC=y
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_DEBUG=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- config-x86_64-generic	6 Jan 2006 23:35:07 -0000	1.16
+++ config-x86_64-generic	3 Feb 2006 22:15:11 -0000	1.16.4.1
@@ -103,10 +103,12 @@
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_DEBUG=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:15:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:15:44 -0500
Subject: rpms/postgresql-odbc/devel .cvsignore, 1.7, 1.8 postgresql-odbc.spec,
	1.10, 1.11 sources, 1.7, 1.8
Message-ID: <200602032215.k13MFiqj031552@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31530

Modified Files:
	.cvsignore postgresql-odbc.spec sources 
Log Message:
Update to version 08.01.0200.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Dec 2005 03:50:51 -0000	1.7
+++ .cvsignore	3 Feb 2006 22:15:42 -0000	1.8
@@ -1 +1 @@
-psqlodbc-08.01.0102.tar.gz
+psqlodbc-08.01.0200.tar.gz


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- postgresql-odbc.spec	15 Dec 2005 03:50:51 -0000	1.10
+++ postgresql-odbc.spec	3 Feb 2006 22:15:42 -0000	1.11
@@ -1,6 +1,6 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
-Version: 08.01.0102
+Version: 08.01.0200
 Release: 1
 License: LGPL
 Group: Applications/Databases
@@ -37,6 +37,11 @@
 autoconf
 
 %build
+
+# Note: the package's build infrastructure does not seem to provide a sane
+# way to build or install both the ANSI and Unicode versions of the driver.
+# Ideally we should install both, but for now, Unicode only.
+
 %configure --with-unixodbc --with-odbcinst=%{_sysconfdir}
 make
 
@@ -45,6 +50,9 @@
 
 %makeinstall
 
+# Create a symlink to avoid breaking existing odbcinst.ini scripts.
+ln -s psqlodbcw.so ${RPM_BUILD_ROOT}%{_libdir}/psqlodbc.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,10 +61,16 @@
 
 %files
 %defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/psqlodbc.so
-%{_libdir}/psqlodbc.la
+%attr(755,root,root) %{_libdir}/psqlodbcw.so
+%{_libdir}/psqlodbcw.la
+%{_libdir}/psqlodbc.so
 
 %changelog
+* Fri Feb  3 2006 Tom Lane <tgl at redhat.com> 08.01.0200-1
+- Update to version 08.01.0200.
+- Upstream now calls the library psqlodbcw.so ... add a symlink to avoid
+  breaking existing odbc configuration files.
+
 * Wed Dec 14 2005 Tom Lane <tgl at redhat.com> 08.01.0102-1
 - Update to version 08.01.0102.
 - Add buildrequires postgresql-devel (bz #174505)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Dec 2005 03:50:51 -0000	1.7
+++ sources	3 Feb 2006 22:15:42 -0000	1.8
@@ -1 +1 @@
-7c1e77fa8c4b30980ad0bc258af175ef  psqlodbc-08.01.0102.tar.gz
+61206229b5d8dfe5e7a4cf81a7a218da  psqlodbc-08.01.0200.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:15:55 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1591.2.1,1.1591.2.2
Message-ID: <200602032215.k13MFtO0031604@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.2.1
retrieving revision 1.1591.2.2
diff -u -r1.1591.2.1 -r1.1591.2.2
--- kernel-2.6.spec	3 Feb 2006 22:15:09 -0000	1.1591.2.1
+++ kernel-2.6.spec	3 Feb 2006 22:15:53 -0000	1.1591.2.2
@@ -19,7 +19,7 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .netdev.9
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
 %define signmodules 0
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:16:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:16:04 -0500
Subject: rpms/perl-XML-Simple/devel perl-XML-Simple.spec,1.2,1.3
Message-ID: <200602032216.k13MG4hp032674@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-Simple.spec 
Log Message:
rebuild for new perl-5.8.8


Index: perl-XML-Simple.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Simple/devel/perl-XML-Simple.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-XML-Simple.spec	18 Jan 2006 04:07:08 -0000	1.2
+++ perl-XML-Simple.spec	3 Feb 2006 22:16:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-XML-Simple
 Version:        2.14
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        Easy API to maintain XML in Perl
 
 Group:          Development/Libraries
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.14-2.1
+- rebuild for new perl-5.8.8
+
 * Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.14-2
 - Pull perl-XML-Simple from Extras into Core 
   for dependency reasons



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:19:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:19:15 -0500
Subject: rpms/perl-XML-Twig/devel .cvsignore, 1.7, 1.8 perl-XML-Twig.spec,
	1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200602032219.k13MJFkq011736@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore perl-XML-Twig.spec sources 
Log Message:
Upgrade to 3.23; rebuild for new perl-5.8.8


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Dec 2005 19:52:49 -0000	1.7
+++ .cvsignore	3 Feb 2006 22:19:13 -0000	1.8
@@ -1,2 +1,3 @@
 XML-Twig-3.17.tar.gz
 XML-Twig-3.22.tar.gz
+XML-Twig-3.23.tar.gz


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-XML-Twig.spec	19 Dec 2005 19:52:06 -0000	1.11
+++ perl-XML-Twig.spec	3 Feb 2006 22:19:13 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-XML-Twig
-Version:        3.22
+Version:        3.23
 Release: 	1
 Summary:        A perl module for processing huge XML documents in tree mode
 
@@ -58,6 +58,10 @@
 
 
 %changelog
+* 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
+
 * Mon Dec 19 2005 Jason Vas Dias<jvdias at redhat.com> - 3.22-1
 - Update to 3.22 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Dec 2005 19:52:49 -0000	1.7
+++ sources	3 Feb 2006 22:19:13 -0000	1.8
@@ -1 +1 @@
-c9da83a67bf900edb3cb8b62cb1cdd15  XML-Twig-3.22.tar.gz
+5393b96c6dbfcafbc45481e936b97c03  XML-Twig-3.23.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:21:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:21:09 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec, 1.4,
	1.5 pysqlite-sqlite-prepare-nbytes.patch, 1.1, NONE
Message-ID: <200602032221.k13ML93l011818@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	python-sqlite.spec 
Removed Files:
	pysqlite-sqlite-prepare-nbytes.patch 
Log Message:
update


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-sqlite.spec	1 Feb 2006 19:24:01 -0000	1.4
+++ python-sqlite.spec	3 Feb 2006 22:21:07 -0000	1.5
@@ -2,13 +2,12 @@
 
 Summary: Python bindings for sqlite.
 Name: python-sqlite
-Version: 1.1.6
-Release: 3
+Version: 1.1.7
+Release: 1
 License: GPL
 Group: Development/Libraries
-URL: http://pysqlite.sf.net/
-Source: http://dl.sf.net/pysqlite/pysqlite-%{version}.tar.gz
-Patch0: pysqlite-sqlite-prepare-nbytes.patch
+URL: http://pysqlite.org/
+Source: http://initd.org/pub/software/pysqlite/releases/1.1/%{version}/pysqlite-%{version}.tar.gz
 Obsoletes: python-sqlite3
 BuildRequires: python-devel, sqlite-devel 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -19,10 +18,10 @@
 
 %prep
 %setup -q -n pysqlite
-%patch0 -p0 -b .nbytes
 rm -f doc/rest/.*swp
 
 %build
+python ./setup.py build 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -37,6 +36,11 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Fri Feb 03 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.7-1
+- Upgrade to latest upstream 1.1.x series
+- sqlite_prepare fix now upstream
+- Update url information
+
 * Wed Feb 01 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.6-3
 - Pass valid parameter to prepare (#179547)
 - Temporarily remove %%check


--- pysqlite-sqlite-prepare-nbytes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:21:16 -0500
Subject: rpms/kdeaddons/devel .cvsignore, 1.28, 1.29 kdeaddons.spec, 1.41,
	1.42 sources, 1.29, 1.30
Message-ID: <200602032221.k13MLGFc011840@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11811

Modified Files:
	.cvsignore kdeaddons.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	29 Nov 2005 19:40:40 -0000	1.28
+++ .cvsignore	3 Feb 2006 22:21:14 -0000	1.29
@@ -8,3 +8,4 @@
 kdeaddons-3.4.91.tar.bz2
 kdeaddons-3.4.92.tar.bz2
 kdeaddons-3.5.0.tar.bz2
+kdeaddons-3.5.1.tar.bz2


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdeaddons.spec	9 Dec 2005 22:41:08 -0000	1.41
+++ kdeaddons.spec	3 Feb 2006 22:21:14 -0000	1.42
@@ -4,13 +4,16 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.0
+%define arts_version 1.5.1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+%define arts_epoch 8
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -20,11 +23,10 @@
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch1: kde-libtool.patch
 
-Prereq: /sbin/ldconfig
-
-Requires: kdebase >= 6:%{version}
-Requires: kdelibs >= 6:%{version}
-Requires: arts >= 8:%{arts_version}
+Requires(post,postun): /sbin/ldconfig
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: arts >= %{arts_epoch}:%{arts_version}
 Requires: SDL >= 1.2.0
 
 BuildPrereq: kdegames-devel
@@ -71,13 +73,6 @@
 %setup -q
 %patch1 -p1 -b .libtool
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -90,11 +85,22 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --includedir=%{_includedir}/kde \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{final}
    --enable-final \
 %endif
+%%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%else
+   --enable-debug \
+%endif
 %if %{xmms}
   --with-xmms \
 %else
@@ -162,6 +168,9 @@
 %endif
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	29 Nov 2005 19:40:40 -0000	1.29
+++ sources	3 Feb 2006 22:21:14 -0000	1.30
@@ -1 +1 @@
-a61bcb10580208c3abb8c47aed198597  kdeaddons-3.5.0.tar.bz2
+cbd2a6f65ae7338736d93b72bfdf5ae3  kdeaddons-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:29:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:29:43 -0500
Subject: rpms/notify-daemon/devel notify-daemon-0.3.1-xselection.patch, NONE,
	1.1 notify-daemon.spec, 1.6, 1.7
Message-ID: <200602032229.k13MThq7022014@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21972

Modified Files:
	notify-daemon.spec 
Added Files:
	notify-daemon-0.3.1-xselection.patch 
Log Message:
* Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-6
- Add patch to determine whether a compositing manager is running
  when drawing a new notification bubble, as long as the CM grabs
  the appropriate XSelection.


notify-daemon-0.3.1-xselection.patch:
 eggnotificationbubblewidget.c |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

--- NEW FILE notify-daemon-0.3.1-xselection.patch ---
--- notify-daemon-0.3.1/src/eggnotificationbubblewidget.c.xselection	2006-02-03 17:25:46.000000000 -0500
+++ notify-daemon-0.3.1/src/eggnotificationbubblewidget.c	2006-02-03 17:27:18.000000000 -0500
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 #include "eggnotificationbubblewidget.h"
 
 #define BORDER_SIZE 30 
@@ -186,6 +187,23 @@
     G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
+static gboolean
+xcomp_manager_running (EggNotificationBubbleWidget *w)
+{
+  GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (w));
+  GdkDisplay *display = gdk_screen_get_display (screen);
+  gint number = gdk_screen_get_number (screen);
+  char buf[128];
+  GdkWindow *owner = NULL;
+
+  snprintf (buf, sizeof (buf), "CM_S%d", number);
+
+  GdkAtom clipboard_atom = gdk_atom_intern (buf, FALSE);
+
+  owner = gdk_selection_owner_get_for_display (display, clipboard_atom);
+  return (owner != NULL);
+}
+
 static void
 _layout_window (EggNotificationBubbleWidget *bubble_widget,
                 int alignment)
@@ -1010,7 +1028,7 @@
   GtkWidget *widget;
   cairo_t *cairo_context;
   cairo_t *mask_cr;
-  gboolean can_composite;
+  gboolean do_composite;
 
   mask_cr = NULL;
   mask = NULL;
@@ -1020,8 +1038,8 @@
 
   widget = GTK_WIDGET(bubble_widget);
   cairo_context = gdk_cairo_create (widget->window);
-  
-  can_composite = bubble_widget->can_composite;
+
+  do_composite = bubble_widget->can_composite && xcomp_manager_running (bubble_widget);
 
   _calculate_colors_from_style (bubble_widget);
 
@@ -1029,17 +1047,17 @@
   w = requisition.width;
   h = requisition.height;
 
-  if (!can_composite)
+  if (!do_composite)
     {
       mask = gdk_pixmap_new (NULL, w, h, 1);
       mask_cr = gdk_cairo_create ((GdkDrawable *) mask);
     }
 
   g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, cairo_context);
-  if (!can_composite)
+  if (!do_composite)
     g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, mask_cr);
 
-  if (can_composite)
+  if (do_composite)
     cairo_set_source_rgba (cairo_context, 1, 1, 1, 0);
   else
     cairo_set_source_rgba (cairo_context, 
@@ -1078,7 +1096,7 @@
   cairo_set_source_rgba (cairo_context, 0.43, 0.49, 0.55, 1);
   cairo_stroke (cairo_context);
 
-  if (!can_composite)
+  if (!do_composite)
     {
       cairo_set_operator (mask_cr, CAIRO_OPERATOR_CLEAR);
       cairo_paint (mask_cr);


Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notify-daemon.spec	20 Jan 2006 21:58:23 -0000	1.6
+++ notify-daemon.spec	3 Feb 2006 22:29:40 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 5
+Release: 6
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -19,6 +19,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch0: notify-daemon-0.3.1-position.patch
 Patch1: notify-daemon-0.3.1-message-markup.patch
+Patch2: notify-daemon-0.3.1-xselection.patch
 
 %description
 
@@ -27,8 +28,9 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p0 -b .position
+%patch1 -p1 -b .message-markup
+%patch2 -p1 -b .xselection
 
 %build
 
@@ -55,6 +57,11 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-6
+- Add patch to determine whether a compositing manager is running
+  when drawing a new notification bubble, as long as the CM grabs
+  the appropriate XSelection.
+
 * Fri Jan 20 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-5
 - Make it so that marked-up messages appear with markup
 



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:39:25 -0500
Subject: rpms/authconfig/devel .cvsignore, 1.39, 1.40 authconfig.spec, 1.51,
	1.52 sources, 1.45, 1.46
Message-ID: <200602032239.k13MdPMv024256@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24219

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.0-1
- redesigned GUI (#178112)
- added man page for system-config-ac (#179584)
- disable authentication of system accounts by network services
  by default, added option for changing that (#179009)
- updated translations, new languages



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	9 Jan 2006 10:14:16 -0000	1.39
+++ .cvsignore	3 Feb 2006 22:39:22 -0000	1.40
@@ -1 +1 @@
-authconfig-5.1.2.tar.bz2
+authconfig-5.2.0.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- authconfig.spec	9 Jan 2006 10:14:16 -0000	1.51
+++ authconfig.spec	3 Feb 2006 22:39:22 -0000	1.52
@@ -1,6 +1,6 @@
 Summary: Text-mode tool for setting up NIS and shadow passwords.
 Name: authconfig
-Version: 5.1.2
+Version: 5.2.0
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -65,6 +65,7 @@
 %{_sbindir}/authconfig
 %{_sbindir}/authconfig-tui
 %{_mandir}/man8/*
+%{_mandir}/man5/*
 %{_libdir}/python*/site-packages/acutilmodule.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/authconfig.py*
@@ -93,6 +94,13 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.0-1
+- redesigned GUI (#178112)
+- added man page for system-config-ac (#179584)
+- disable authentication of system accounts by network services
+  by default, added option for changing that (#179009)
+- updated translations, new languages
+
 * Mon Jan  9 2006 Tomas Mraz <tmraz at redhat.com> - 5.1.2-1
 - fixed regression when saving nsswitch.conf
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	9 Jan 2006 10:14:16 -0000	1.45
+++ sources	3 Feb 2006 22:39:22 -0000	1.46
@@ -1 +1 @@
-ce3f3a51997d90420c0adee88f4413aa  authconfig-5.1.2.tar.bz2
+d539479c0408f6f811a3c0a06946b8e1  authconfig-5.2.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:54:00 -0500
Subject: rpms/perl-XML-Twig/devel
	perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch, NONE, 1.1
Message-ID: <200602032254.k13Ms0VB010164@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch 
Log Message:
skip html parse tests when HTML::TreeBuilder is not installed

perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch:
 test_bugs_3.22.t |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch ---
--- XML-Twig-3.23/t/test_bugs_3.22.t.tests_no_HTML_TreeBuilder	2006-01-23 05:42:58.000000000 -0500
+++ XML-Twig-3.23/t/test_bugs_3.22.t	2006-02-03 17:52:14.000000000 -0500
@@ -193,7 +193,9 @@
   ok( XML::Twig->nparse( twig_handlers => { level => sub {} }, '<level/>'), " bug on tag names similar to internal names RT #16540");
 }
 
+if( _use 'HTML::TreeBuilder')
 { # test parsing of an html string
+
   ok( XML::Twig->nparse( '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
  <head>
@@ -205,7 +207,10 @@
     &eacute;t&eacute;
   </body>
   </html>'), "parsing an html string");
-}
+} else
+{  
+    skip( 1 => 'need  HTML::TreeBuilder to test parse_html');
+};
 
 { # testing print_to_file
   my $tmp= "print_to_file.xml";



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:54:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:54:21 -0500
Subject: rpms/perl-XML-Twig/devel perl-XML-Twig.spec,1.12,1.13
Message-ID: <200602032254.k13MsLma010343@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl-XML-Twig.spec 
Log Message:
Upgrade to 3.23; rebuild for new perl-5.8.8


Index: perl-XML-Twig.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Twig/devel/perl-XML-Twig.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-XML-Twig.spec	3 Feb 2006 22:19:13 -0000	1.12
+++ perl-XML-Twig.spec	3 Feb 2006 22:54:18 -0000	1.13
@@ -14,6 +14,7 @@
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(XML::Parser)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Patch0:    perl-XML-Twig-3.23-no-HTML_TreeBuilder.patch
 
 %define __perl_requires %{SOURCE1}
 
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q -n XML-Twig-%{version} 
+%patch0 -p1 -b .tests_no_HTML_TreeBuilder
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:55:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:55:12 -0500
Subject: rpms/kdeadmin/devel .cvsignore, 1.32, 1.33 kdeadmin.spec, 1.53,
	1.54 sources, 1.32, 1.33 kdeadmin-3.4.2-kcron.patch, 1.1, NONE
Message-ID: <200602032255.k13MtCsD010727@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10672

Modified Files:
	.cvsignore kdeadmin.spec sources 
Removed Files:
	kdeadmin-3.4.2-kcron.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	29 Nov 2005 19:42:02 -0000	1.32
+++ .cvsignore	3 Feb 2006 22:55:09 -0000	1.33
@@ -8,3 +8,4 @@
 kdeadmin-3.4.91.tar.bz2
 kdeadmin-3.4.92.tar.bz2
 kdeadmin-3.5.0.tar.bz2
+kdeadmin-3.5.1.tar.bz2


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeadmin.spec	9 Dec 2005 22:41:08 -0000	1.53
+++ kdeadmin.spec	3 Feb 2006 22:55:09 -0000	1.54
@@ -16,12 +16,14 @@
 %endif
 
 %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.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -30,18 +32,17 @@
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source6: kuser.pam
-Source7: kuser.pamd
-Source8: kpackage.pam
-Source9: kpackage.pamd
-Source10: kpackagerc
+Source1: kuser.pam
+Source2: kuser.pamd
+Source3: kpackage.pam
+Source4: kpackage.pamd
+Source5: kpackagerc
 
 Patch1: kde-libtool.patch
-Patch2: kdeadmin-3.4.2-kcron.patch
 
-Prereq: /sbin/ldconfig
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
+Requires(post,postun): /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires: usermode
 
 BuildPrereq: zlib-devel
@@ -150,7 +151,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .libtool
-%patch2 -p1 -b .kcron_bz168770
 
 %if ! %{kpackage}
   echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -178,13 +178,6 @@
 
 perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" ksysv/Makefile* lilo-config/qt/Makefile.*
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -203,9 +196,14 @@
 export CXXFLAGS="$FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-rpm \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
@@ -214,6 +212,7 @@
 %endif
 %if %{debug}
    --enable-debug \
+   --disable-warnings \
 %endif
    --with-private-groups
 
@@ -275,16 +274,16 @@
 # Runkuser through consolehelper
 %if %{kuser}
   mv $RPM_BUILD_ROOT/usr/bin/kuser $RPM_BUILD_ROOT/usr/sbin
-  install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/security/console.apps/kuser
-  install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/kuser
+  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
 %endif
 
 %if %{kpackage}
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-  install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/security/console.apps/kpackage
-  install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/kpackage
-  install -c -m 644 %{SOURCE10} $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
 %endif
@@ -410,6 +409,9 @@
 %endif
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	29 Nov 2005 19:42:02 -0000	1.32
+++ sources	3 Feb 2006 22:55:09 -0000	1.33
@@ -1 +1 @@
-9d0f914d2d0d3fbef8ed51cfdab36d40  kdeadmin-3.5.0.tar.bz2
+08e9bddd2b42e0783d7f79d08cdb031b  kdeadmin-3.5.1.tar.bz2


--- kdeadmin-3.4.2-kcron.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:58:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:58:03 -0500
Subject: rpms/authconfig/devel sources,1.46,1.47
Message-ID: <200602032258.k13Mw30O012110@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11790

Modified Files:
	sources 
Log Message:
- updated source package, it was broken



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	3 Feb 2006 22:39:22 -0000	1.46
+++ sources	3 Feb 2006 22:58:00 -0000	1.47
@@ -1 +1 @@
-d539479c0408f6f811a3c0a06946b8e1  authconfig-5.2.0.tar.bz2
+c4764dfe173cd9d29e00a85d871e414a  authconfig-5.2.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb  3 22:59:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 17:59:52 -0500
Subject: rpms/system-config-lvm/devel .cvsignore, 1.17, 1.18 sources, 1.17,
	1.18 system-config-lvm.spec, 1.18, 1.19
Message-ID: <200602032259.k13Mxq5K012934@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.11-1.0 on branch devel from system-config-lvm-1.0.11-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Jan 2006 14:56:26 -0000	1.17
+++ .cvsignore	3 Feb 2006 22:59:49 -0000	1.18
@@ -1,16 +1 @@
-system-config-lvm-0.9.1.tar.gz
-system-config-lvm-0.9.2.tar.gz
-system-config-lvm-0.9.17.tar.gz
-system-config-lvm-0.9.18.tar.gz
-system-config-lvm-0.9.19.tar.gz
-system-config-lvm-0.9.21.tar.gz
-system-config-lvm-0.9.22.tar.gz
-system-config-lvm-0.9.25.tar.gz
-system-config-lvm-0.9.26.tar.gz
-system-config-lvm-0.9.27.tar.gz
-system-config-lvm-0.9.30.tar.gz
-system-config-lvm-0.9.32.tar.gz
-system-config-lvm-1.0.6.tar.gz
-system-config-lvm-1.0.7.tar.gz
-system-config-lvm-1.0.8.tar.gz
-system-config-lvm-1.0.10.tar.gz
+system-config-lvm-1.0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Jan 2006 14:56:26 -0000	1.17
+++ sources	3 Feb 2006 22:59:49 -0000	1.18
@@ -1 +1 @@
-e2f3db44bf8e96fbc23be4a4d4368106  system-config-lvm-1.0.10.tar.gz
+a4817d73a685cde6ac16037c433d1c70  system-config-lvm-1.0.11.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- system-config-lvm.spec	9 Jan 2006 14:58:37 -0000	1.18
+++ system-config-lvm.spec	3 Feb 2006 22:59:49 -0000	1.19
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
-Version: 1.0.10
+Version: 1.0.11
 Release: 1.0
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -30,14 +30,14 @@
 %makeinstall
 
 #Uncomment this when translations are done
-#%find_lang %name
+%find_lang %name
 
 %clean
 rm -rf %{buildroot}
 
 #Replace the files line with the one commented out when translations are done
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
+#%files
 
 %defattr(-,root,root)
 %doc COPYING
@@ -51,10 +51,10 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Fri Feb 03 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.11-1.0
+  - Fixes for bz175077,169860,178128,161917,171117,175131,178195 
 * Thu Jan 05 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.10-1.0
   - Fix for bz176967
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-  - rebuilt
 * Fri Dec 2 2005 Jim Parsons <jparsons at redhat.com> 1.0.9-1.0
   - Removed cLVM test. 
 * Mon Nov 14 2005 Jim Parsons <jparsons at redhat.com> 1.0.8-1.0



From fedora-cvs-commits at redhat.com  Fri Feb  3 23:08:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 18:08:02 -0500
Subject: rpms/pirut/devel .cvsignore, 1.8, 1.9 pirut.spec, 1.9, 1.10 sources,
	1.9, 1.10
Message-ID: <200602032308.k13N82j3014558@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14525/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.9-1 on branch devel from pirut-0.9.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Feb 2006 05:26:00 -0000	1.8
+++ .cvsignore	3 Feb 2006 23:07:59 -0000	1.9
@@ -1 +1 @@
-pirut-0.9.8.tar.gz
+pirut-0.9.9.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pirut.spec	2 Feb 2006 05:26:00 -0000	1.9
+++ pirut.spec	3 Feb 2006 23:07:59 -0000	1.10
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.8
+Version: 0.9.9
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,16 @@
 
 
 %changelog
+* Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 0.9.9-1
+- Just use the group name when we don't have a description (#178089)
+- Require actually clicking on the checkboxes, not the text (#178090)
+- Make browse view a little bit more obvious (#178091)
+- Fix selection in list filters (#179210)
+- Fix searching in list view (#179839)
+- Fix searching in optional packages list
+- Allow unsigned packages with a suitably scary warning on installing 
+  single packages (#178908)
+
 * Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 0.9.8-1
 - Some fixes to single-install-packages from Tim Lauridsen (#178908)
 - Tweaks to the optional packages installed label (#178088, #179205)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Feb 2006 05:26:00 -0000	1.9
+++ sources	3 Feb 2006 23:07:59 -0000	1.10
@@ -1 +1 @@
-3658c7c1d457e077f7addbe63056c4b6  pirut-0.9.8.tar.gz
+2d9a9c0c9e71753628d9aa22669463eb  pirut-0.9.9.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 23:13:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 18:13:24 -0500
Subject: rpms/redhat-rpm-config/devel .cvsignore, 1.17,
	1.18 redhat-rpm-config.spec, 1.26, 1.27 sources, 1.17, 1.18
Message-ID: <200602032313.k13NDOF4016334@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/redhat-rpm-config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16294/devel

Modified Files:
	.cvsignore redhat-rpm-config.spec sources 
Log Message:
auto-import redhat-rpm-config-8.0.40-1 on branch devel from redhat-rpm-config-8.0.40-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	17 Aug 2005 00:33:08 -0000	1.17
+++ .cvsignore	3 Feb 2006 23:13:22 -0000	1.18
@@ -1 +1 @@
-redhat-rpm-config-8.0.39.tar.gz
+redhat-rpm-config-8.0.40.tar.gz


Index: redhat-rpm-config.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/redhat-rpm-config.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- redhat-rpm-config.spec	9 Dec 2005 22:42:59 -0000	1.26
+++ redhat-rpm-config.spec	3 Feb 2006 23:13:22 -0000	1.27
@@ -1,11 +1,13 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.39
-Release: 1.1
+Version: 8.0.40
+Release: 1
 License: GPL
 Group: Development/System
 Source: redhat-rpm-config-%{version}.tar.gz
 BuildArch: noarch
+#Requires: rpmbuild(VendorConfig) <= 4.1
+#Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
 # rpmrc passes -mtune which first appeared in gcc 3.4
 %ifarch i386 i686 sparc
@@ -33,8 +35,8 @@
 %{_prefix}/lib/rpm/redhat
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 8.0.40-1
+- use -mtune=generic for x86 and x86_64
 
 * Tue Aug 16 2005 Elliot Lee <sopwith at redhat.com> - 8.0.39-1
 - Fix #165416


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-rpm-config/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	17 Aug 2005 00:33:09 -0000	1.17
+++ sources	3 Feb 2006 23:13:22 -0000	1.18
@@ -1 +1 @@
-3b2efb53bfb26967868a21268ce6a8a2  redhat-rpm-config-8.0.39.tar.gz
+2ac1416b5232864d0233841b348afe34  redhat-rpm-config-8.0.40.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb  3 23:21:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 18:21:33 -0500
Subject: rpms/kdeartwork/devel .cvsignore, 1.28, 1.29 kdeartwork.spec, 1.43,
	1.44 sources, 1.29, 1.30
Message-ID: <200602032321.k13NLXIK032334@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeartwork.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	29 Nov 2005 19:44:30 -0000	1.28
+++ .cvsignore	3 Feb 2006 23:21:30 -0000	1.29
@@ -8,3 +8,4 @@
 kdeartwork-3.4.91.tar.bz2
 kdeartwork-3.4.92.tar.bz2
 kdeartwork-3.5.0.tar.bz2
+kdeartwork-3.5.1.tar.bz2


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdeartwork.spec	17 Dec 2005 19:33:26 -0000	1.43
+++ kdeartwork.spec	3 Feb 2006 23:21:30 -0000	1.44
@@ -4,14 +4,17 @@
 %define make_cvs 1
 
 %define qt_version 3.3.5
-%define arts_version 1.5.0
+%define arts_version 1.5.1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+%define qt_epoch 1
 %define arts 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdeartwork
-Version: 3.5.0
-Release: 2
+Version: 3.5.1
+Release: 1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -35,9 +38,9 @@
 
 Prereq: /sbin/ldconfig
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-Requires: qt >= 1:%{qt_version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: xscreensaver-extras
 
 %description
@@ -63,22 +66,24 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --enable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -109,6 +114,22 @@
 
 %postun -p /sbin/ldconfig
 
+%post icons
+for i in locolor ikons kdeclassic kids slick ; do
+  touch --no-create %{_datadir}/icons/$i || :
+  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+  fi
+done
+
+%postun icons
+for i in locolor ikons kdeclassic kids slick ; do
+  touch --no-create %{_datadir}/icons/$i || :
+  if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i || :
+  fi
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -135,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+- 3.5.1
+
 * Sat Dec 17 2005 Than Ngo <than at redhat.com> 3.5.0-2 
 - requires on xscreensaver-extras
   


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	29 Nov 2005 19:44:30 -0000	1.29
+++ sources	3 Feb 2006 23:21:30 -0000	1.30
@@ -1 +1 @@
-052c736c9c12defbb2e7de04ff0b2ae6  kdeartwork-3.5.0.tar.bz2
+8053bb1a1b2a5844b29f5f96328b1d96  kdeartwork-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 00:11:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 19:11:06 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.89, 1.90 mkinitrd.spec, 1.98,
	1.99 sources, 1.95, 1.96
Message-ID: <200602040011.k140B6UV019912@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19897

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- bump to 5.0.21-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	2 Feb 2006 22:43:35 -0000	1.89
+++ .cvsignore	4 Feb 2006 00:11:03 -0000	1.90
@@ -1 +1 @@
-mkinitrd-5.0.20.tar.bz2
+mkinitrd-5.0.21.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mkinitrd.spec	3 Feb 2006 17:10:00 -0000	1.98
+++ mkinitrd.spec	4 Feb 2006 00:11:03 -0000	1.99
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.20
+Version: 5.0.21
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,15 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Tue Feb  3 2006 Peter Jones <pjones at redhat.com> - 5.0.21-1
+- add "mount -o bind" support and "mount --move" support (#109366, patch
+  from Kasper Dupont)
+- add resolveDevice command, which cases down device labels.
+- remove "findlodev" from the documentation (#178587)
+- fix nash command name parsing bug (#178587)
+- fix "find" argument parsing (#178587)
+- add "find" handling for "-type d"
+
 * Thu Feb  2 2006 Peter Jones <pjones at redhat.com> - 5.0.20-1
 - fix really dumb spec file mistake
 - fix devno detection for /dev/root


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	3 Feb 2006 17:10:00 -0000	1.95
+++ sources	4 Feb 2006 00:11:03 -0000	1.96
@@ -1 +1 @@
-1c53a18f59e12b1e7295b4607d7e08ed  mkinitrd-5.0.20.tar.bz2
+ea9ac86cc1ad5828e41df0c76a420265  mkinitrd-5.0.21.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 00:17:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 19:17:01 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.210, 1.211 anaconda.spec, 1.329,
	1.330 sources, 1.329, 1.330
Message-ID: <200602040017.k140H1K3027749@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26992/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.14-1 on branch devel from anaconda-10.91.14-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- .cvsignore	3 Feb 2006 02:02:24 -0000	1.210
+++ .cvsignore	4 Feb 2006 00:16:58 -0000	1.211
@@ -1 +1 @@
-anaconda-10.91.13.tar.bz2
+anaconda-10.91.14.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- anaconda.spec	3 Feb 2006 02:02:24 -0000	1.329
+++ anaconda.spec	4 Feb 2006 00:16:58 -0000	1.330
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.13
+Version: 10.91.14
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -78,6 +78,19 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 10.91.14-1
+- Handle reiserfs labels (dcantrel, #125939)
+- Skip more steps in root mode (Jasper Hartline)
+- Update driver list for current kernels
+- Don't put mapper/ in the swap label (pjones)
+- Set file contexts on blkid.tab* (pjones)
+- Increase logical volume label field to 32 chars (dcantrel, #174661)
+- More exception trimming (clumens)
+- Fix args to writeConfiguration (clumens, #179928)
+- Fix format strings in label device, proper max for swap labels (pjones)
+- Make task definition more dynamic
+- Add a hack to remove the xen group if we're running on xen (#179387)
+
 * Thu Feb  2 2006 Jeremy Katz <katzj at redhat.com> - 10.91.13-1
 - Speed up timezone screen (clumens)
 - Make kickstart interactive mode work (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- sources	3 Feb 2006 02:02:25 -0000	1.329
+++ sources	4 Feb 2006 00:16:58 -0000	1.330
@@ -1 +1 @@
-d1fb6f2951cf99c628d3bf0191d7cf45  anaconda-10.91.13.tar.bz2
+63880e04892f2d21b62b5ed0726af2e4  anaconda-10.91.14.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 00:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 19:42:05 -0500
Subject: rpms/kernel/devel linux-2.6-cpufreq-git.patch, NONE,
	1.1 kernel-2.6.spec, 1.1903, 1.1904
Message-ID: <200602040042.k140g5fv032681@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-cpufreq-git.patch 
Log Message:
cpufreq fixes


linux-2.6-cpufreq-git.patch:
 arch/i386/kernel/timers/timer_tsc.c |    5 +
 drivers/cpufreq/cpufreq.c           |  110 ++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-cpufreq-git.patch ---
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 7c86e3c..a7f5a2a 100644
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
@@ -282,6 +282,10 @@ time_cpufreq_notifier(struct notifier_bl
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_seqlock_irq(&xtime_lock);
 	if (!ref_freq) {
+		if (!freq->old){
+			ref_freq = freq->new;
+			goto end;
+		}
 		ref_freq = freq->old;
 		loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy;
 #ifndef CONFIG_SMP
@@ -307,6 +311,7 @@ time_cpufreq_notifier(struct notifier_bl
 #endif
 	}
 
+end:
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_sequnlock_irq(&xtime_lock);
 
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 7a51147..9582de1 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -35,8 +35,8 @@
  * level driver of CPUFreq support, and its spinlock. This lock
  * also protects the cpufreq_cpu_data array.
  */
-static struct cpufreq_driver   	*cpufreq_driver;
-static struct cpufreq_policy	*cpufreq_cpu_data[NR_CPUS];
+static struct cpufreq_driver *cpufreq_driver;
+static struct cpufreq_policy *cpufreq_cpu_data[NR_CPUS];
 static DEFINE_SPINLOCK(cpufreq_driver_lock);
 
 /* internal prototypes */
@@ -50,15 +50,15 @@ static void handle_update(void *data);
  * changes to devices when the CPU clock speed changes.
  * The mutex locks both lists.
  */
-static struct notifier_block    *cpufreq_policy_notifier_list;
-static struct notifier_block    *cpufreq_transition_notifier_list;
-static DECLARE_RWSEM		(cpufreq_notifier_rwsem);
+static struct notifier_block *cpufreq_policy_notifier_list;
+static struct notifier_block *cpufreq_transition_notifier_list;
+static DECLARE_RWSEM (cpufreq_notifier_rwsem);
 
 
 static LIST_HEAD(cpufreq_governor_list);
-static DEFINE_MUTEX		(cpufreq_governor_mutex);
+static DEFINE_MUTEX (cpufreq_governor_mutex);
 
-struct cpufreq_policy * cpufreq_cpu_get(unsigned int cpu)
+struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
 {
 	struct cpufreq_policy *data;
 	unsigned long flags;
@@ -85,20 +85,19 @@ struct cpufreq_policy * cpufreq_cpu_get(
 	if (!kobject_get(&data->kobj))
 		goto err_out_put_module;
 
-
 	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
-
 	return data;
 
- err_out_put_module:
+err_out_put_module:
 	module_put(cpufreq_driver->owner);
- err_out_unlock:
+err_out_unlock:
 	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
- err_out:
+err_out:
 	return NULL;
 }
 EXPORT_SYMBOL_GPL(cpufreq_cpu_get);
 
+
 void cpufreq_cpu_put(struct cpufreq_policy *data)
 {
 	kobject_put(&data->kobj);
@@ -229,44 +228,53 @@ static inline void adjust_jiffies(unsign
 
 
 /**
- * cpufreq_notify_transition - call notifier chain and adjust_jiffies on frequency transition
+ * cpufreq_notify_transition - call notifier chain and adjust_jiffies
+ * on frequency transition.
  *
- * This function calls the transition notifiers and the "adjust_jiffies" function. It is called
- * twice on all CPU frequency changes that have external effects. 
+ * This function calls the transition notifiers and the "adjust_jiffies"
+ * function. It is called twice on all CPU frequency changes that have
+ * external effects. 
  */
 void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
 {
+	struct cpufreq_policy *policy;
+
 	BUG_ON(irqs_disabled());
 
 	freqs->flags = cpufreq_driver->flags;
-	dprintk("notification %u of frequency transition to %u kHz\n", state, freqs->new);
+	dprintk("notification %u of frequency transition to %u kHz\n",
+		state, freqs->new);
 
 	down_read(&cpufreq_notifier_rwsem);
+
+	policy = cpufreq_cpu_data[freqs->cpu];
 	switch (state) {
+
 	case CPUFREQ_PRECHANGE:
-		/* detect if the driver reported a value as "old frequency" which
-		 * is not equal to what the cpufreq core thinks is "old frequency".
+		/* detect if the driver reported a value as "old frequency" 
+		 * which is not equal to what the cpufreq core thinks is
+		 * "old frequency".
 		 */
 		if (!(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
-			if ((likely(cpufreq_cpu_data[freqs->cpu])) &&
-			    (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu)) &&
-			    (likely(cpufreq_cpu_data[freqs->cpu]->cur)) &&
-			    (unlikely(freqs->old != cpufreq_cpu_data[freqs->cpu]->cur)))
-			{
-				dprintk(KERN_WARNING "Warning: CPU frequency is %u, "
-				       "cpufreq assumed %u kHz.\n", freqs->old, cpufreq_cpu_data[freqs->cpu]->cur);
-				freqs->old = cpufreq_cpu_data[freqs->cpu]->cur;
+			if ((policy) && (policy->cpu == freqs->cpu) &&
+			    (policy->cur) && (policy->cur != freqs->old)) {
+				dprintk(KERN_WARNING "Warning: CPU frequency is"
+					" %u, cpufreq assumed %u kHz.\n",
+					freqs->old, policy->cur);
+				freqs->old = policy->cur;
 			}
 		}
-		notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_PRECHANGE, freqs);
+		notifier_call_chain(&cpufreq_transition_notifier_list,
+					CPUFREQ_PRECHANGE, freqs);
 		adjust_jiffies(CPUFREQ_PRECHANGE, freqs);
 		break;
+
 	case CPUFREQ_POSTCHANGE:
 		adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
-		notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_POSTCHANGE, freqs);
-		if ((likely(cpufreq_cpu_data[freqs->cpu])) && 
-		    (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu)))
-			cpufreq_cpu_data[freqs->cpu]->cur = freqs->new;
+		notifier_call_chain(&cpufreq_transition_notifier_list,
+					CPUFREQ_POSTCHANGE, freqs);
+		if (likely(policy) && likely(policy->cpu == freqs->cpu))
+			policy->cur = freqs->new;
 		break;
 	}
 	up_read(&cpufreq_notifier_rwsem);
@@ -308,7 +316,7 @@ static int cpufreq_parse_governor (char 
 				return 0;
 			}
 		}
-	out:
+out:
 		mutex_unlock(&cpufreq_governor_mutex);
 	}
 	return -EINVAL;
@@ -415,7 +423,6 @@ static ssize_t store_scaling_governor (s
 		return -EINVAL;
 
 	ret = cpufreq_set_policy(&new_policy);
-
 	return ret ? ret : count;
 }
 
@@ -446,7 +453,7 @@ static ssize_t show_scaling_available_go
 			goto out;
 		i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name);
 	}
- out:
+out:
 	i += sprintf(&buf[i], "\n");
 	return i;
 }
@@ -789,7 +796,6 @@ static int cpufreq_remove_dev (struct sy
 	kfree(data);
 
 	cpufreq_debug_enable_ratelimit();
-
 	return 0;
 }
 
@@ -870,8 +876,7 @@ unsigned int cpufreq_get(unsigned int cp
 
 	ret = cpufreq_driver->get(cpu);
 
-	if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) 
-	{
+	if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
 		/* verify no discrepancy between actual and saved value exists */
 		if (unlikely(ret != policy->cur)) {
 			cpufreq_out_of_sync(cpu, policy->cur, ret);
@@ -881,7 +886,7 @@ unsigned int cpufreq_get(unsigned int cp
 
 	mutex_unlock(&policy->lock);
 
- out:
+out:
 	cpufreq_cpu_put(policy);
 
 	return (ret);
@@ -962,7 +967,7 @@ static int cpufreq_suspend(struct sys_de
 		cpu_policy->cur = cur_freq;
 	}
 
- out:
+out:
 	cpufreq_cpu_put(cpu_policy);
 	return 0;
 }
@@ -1169,7 +1174,6 @@ int cpufreq_driver_target(struct cpufreq
 	mutex_unlock(&policy->lock);
 
 	cpufreq_cpu_put(policy);
-
 	return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_driver_target);
@@ -1208,7 +1212,6 @@ int cpufreq_governor(unsigned int cpu, u
 	mutex_unlock(&policy->lock);
 
 	cpufreq_cpu_put(policy);
-
 	return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_governor);
@@ -1232,7 +1235,6 @@ int cpufreq_register_governor(struct cpu
 	list_add(&governor->governor_list, &cpufreq_governor_list);
 
  	mutex_unlock(&cpufreq_governor_mutex);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_governor);
@@ -1277,7 +1279,6 @@ int cpufreq_get_policy(struct cpufreq_po
 	mutex_unlock(&cpu_policy->lock);
 
 	cpufreq_cpu_put(cpu_policy);
-
 	return 0;
 }
 EXPORT_SYMBOL(cpufreq_get_policy);
@@ -1291,9 +1292,7 @@ static int __cpufreq_set_policy(struct c
 	dprintk("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu,
 		policy->min, policy->max);
 
-	memcpy(&policy->cpuinfo, 
-	       &data->cpuinfo, 
-	       sizeof(struct cpufreq_cpuinfo));
+	memcpy(&policy->cpuinfo, &data->cpuinfo, sizeof(struct cpufreq_cpuinfo));
 
 	/* verify the cpu speed can be set within this limit */
 	ret = cpufreq_driver->verify(policy);
@@ -1324,8 +1323,8 @@ static int __cpufreq_set_policy(struct c
 
 	up_read(&cpufreq_notifier_rwsem);
 
-	data->min    = policy->min;
-	data->max    = policy->max;
+	data->min = policy->min;
+	data->max = policy->max;
 
 	dprintk("new min and max freqs are %u - %u kHz\n", data->min, data->max);
 
@@ -1362,7 +1361,7 @@ static int __cpufreq_set_policy(struct c
 		__cpufreq_governor(data, CPUFREQ_GOV_LIMITS);
 	}
 
- error_out:
+error_out:
 	cpufreq_debug_enable_ratelimit();
 	return ret;
 }
@@ -1421,9 +1420,7 @@ int cpufreq_update_policy(unsigned int c
 	mutex_lock(&data->lock);
 
 	dprintk("updating policy for CPU %u\n", cpu);
-	memcpy(&policy, 
-	       data,
-	       sizeof(struct cpufreq_policy));
+	memcpy(&policy, data, sizeof(struct cpufreq_policy));
 	policy.min = data->user_policy.min;
 	policy.max = data->user_policy.max;
 	policy.policy = data->user_policy.policy;
@@ -1433,8 +1430,13 @@ int cpufreq_update_policy(unsigned int c
 	  -> ask driver for current freq and notify governors about a change */
 	if (cpufreq_driver->get) {
 		policy.cur = cpufreq_driver->get(cpu);
-		if (data->cur != policy.cur)
-			cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+		if (!data->cur) {
+			dprintk("Driver did not initialize current freq");
+			data->cur = policy.cur;
+		} else {
+			if (data->cur != policy.cur)
+				cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+		}
 	}
 
 	ret = __cpufreq_set_policy(data, &policy);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1903
retrieving revision 1.1904
diff -u -r1.1903 -r1.1904
--- kernel-2.6.spec	3 Feb 2006 20:42:34 -0000	1.1903
+++ kernel-2.6.spec	4 Feb 2006 00:42:02 -0000	1.1904
@@ -211,6 +211,7 @@
 Patch1: patch-2.6.16-rc2.bz2
 Patch2: patch-2.6.16-rc1-git6.bz2
 Patch3: drm.patch
+Patch4: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -595,6 +596,7 @@
 #%patch2 -p1
 # Backout broken DRM changes.
 %patch3 -p1 -R
+%patch4 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1390,6 +1392,7 @@
 - 2.6.16rc2
 - Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
 - Silence noisy edac drivers.
+- Merge some patches from cpufreq git tree.
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6



From fedora-cvs-commits at redhat.com  Sat Feb  4 01:01:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 20:01:05 -0500
Subject: rpms/kernel/devel linux-2.6-percpu-NR_CPUS.patch, NONE,
	1.1 kernel-2.6.spec, 1.1904, 1.1905
Message-ID: <200602040101.k14115Y8023431@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-percpu-NR_CPUS.patch 
Log Message:
Fix some bogus percpu data accesses.



linux-2.6-percpu-NR_CPUS.patch:
 25-akpm/arch/i386/kernel/nmi.c |    2 +-
 25-akpm/block/ll_rw_blk.c      |    2 +-
 25-akpm/drivers/scsi/scsi.c    |    2 +-
 25-akpm/fs/file.c              |    3 +--
 25-akpm/kernel/sched.c         |    2 +-
 25-akpm/mm/page_alloc.c        |   10 ++++++----
 25-akpm/net/core/dev.c         |    2 +-
 25-akpm/net/core/utils.c       |    4 ++--
 25-akpm/net/ipv4/proc.c        |    2 +-
 25-akpm/net/ipv6/proc.c        |    2 +-
 25-akpm/net/socket.c           |    2 +-
 init/main.c                    |    0 
 12 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE linux-2.6-percpu-NR_CPUS.patch ---

From: Eric Dumazet <dada1 at cosmosbay.com>

percpu_data blindly allocates bootmem memory to store NR_CPUS instances of
cpudata, instead of allocating memory only for possible cpus.

As a preparation for changing that, we need to convert various 0 -> NR_CPUS
loops to use for_each_cpu().

(The above only applies to users of asm-generic/percpu.h.  powerpc has gone it
alone and is presently only allocating memory for present CPUs, so it's
currently corrupting memory).

Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: James Bottomley <James.Bottomley at steeleye.com>
Cc: Jens Axboe <axboe at suse.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Jens Axboe <axboe at suse.de>
Cc: Anton Blanchard <anton at samba.org>
Acked-by: William Irwin <wli at holomorphy.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/nmi.c |    2 +-
 block/ll_rw_blk.c      |    2 +-
 drivers/scsi/scsi.c    |    2 +-
 fs/file.c              |    3 +--
 kernel/sched.c         |    2 +-
 mm/page_alloc.c        |   10 ++++++----
 net/core/dev.c         |    2 +-
 net/core/utils.c       |    4 ++--
 net/ipv4/proc.c        |    2 +-
 net/ipv6/proc.c        |    2 +-
 net/socket.c           |    2 +-
 main.c                 |    0 
 12 files changed, 17 insertions(+), 16 deletions(-)

diff -puN arch/i386/kernel/nmi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject arch/i386/kernel/nmi.c
--- 25/arch/i386/kernel/nmi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/arch/i386/kernel/nmi.c	Fri Feb  3 13:17:06 2006
@@ -138,7 +138,7 @@ static int __init check_nmi_watchdog(voi
 	if (nmi_watchdog == NMI_LOCAL_APIC)
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
 	local_irq_enable();
 	mdelay((10*1000)/nmi_hz); // wait 10 ticks
diff -puN block/ll_rw_blk.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject block/ll_rw_blk.c
--- 25/block/ll_rw_blk.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/block/ll_rw_blk.c	Fri Feb  3 13:17:06 2006
@@ -3453,7 +3453,7 @@ int __init blk_dev_init(void)
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
 
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
 
 	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
diff -puN drivers/scsi/scsi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject drivers/scsi/scsi.c
--- 25/drivers/scsi/scsi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/drivers/scsi/scsi.c	Fri Feb  3 13:17:06 2006
@@ -1245,7 +1245,7 @@ static int __init init_scsi(void)
 	if (error)
 		goto cleanup_sysctl;
 
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
 	devfs_mk_dir("scsi");
diff -puN fs/file.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject fs/file.c
--- 25/fs/file.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/fs/file.c	Fri Feb  3 13:17:06 2006
@@ -379,7 +379,6 @@ static void __devinit fdtable_defer_list
 void __init files_defer_init(void)
 {
 	int i;
-	/* Really early - can't use for_each_cpu */
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		fdtable_defer_list_init(i);
 }
diff -puN init/main.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject init/main.c
diff -puN kernel/sched.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject kernel/sched.c
--- 25/kernel/sched.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/kernel/sched.c	Fri Feb  3 13:17:06 2006
@@ -6109,7 +6109,7 @@ void __init sched_init(void)
 	runqueue_t *rq;
 	int i, j, k;
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		prio_array_t *array;
 
 		rq = cpu_rq(i);
diff -puN net/core/utils.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/core/utils.c
--- 25/net/core/utils.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/core/utils.c	Fri Feb  3 13:17:13 2006
@@ -121,7 +121,7 @@ void __init net_random_init(void)
 {
 	int i;
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct nrnd_state *state = &per_cpu(net_rand_state,i);
 		__net_srandom(state, i+jiffies);
 	}
@@ -133,7 +133,7 @@ static int net_random_reseed(void)
 	unsigned long seed[NR_CPUS];
 
 	get_random_bytes(seed, sizeof(seed));
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct nrnd_state *state = &per_cpu(net_rand_state,i);
 		__net_srandom(state, seed[i]);
 	}
diff -puN net/ipv4/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/ipv4/proc.c
--- 25/net/ipv4/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/ipv4/proc.c	Fri Feb  3 13:17:06 2006
@@ -49,7 +49,7 @@ static int fold_prot_inuse(struct proto 
 	int res = 0;
 	int cpu;
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		res += proto->stats[cpu].inuse;
 
 	return res;
diff -puN net/ipv6/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/ipv6/proc.c
--- 25/net/ipv6/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/ipv6/proc.c	Fri Feb  3 13:17:06 2006
@@ -38,7 +38,7 @@ static int fold_prot_inuse(struct proto 
 	int res = 0;
 	int cpu;
 
-	for (cpu=0; cpu<NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		res += proto->stats[cpu].inuse;
 
 	return res;
diff -puN net/socket.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/socket.c
--- 25/net/socket.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/socket.c	Fri Feb  3 13:17:06 2006
@@ -2078,7 +2078,7 @@ void socket_seq_show(struct seq_file *se
 	int cpu;
 	int counter = 0;
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		counter += per_cpu(sockets_in_use, cpu);
 
 	/* It can be negative, by the way. 8) */
diff -puN net/core/dev.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/core/dev.c
--- 25/net/core/dev.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:13 2006
+++ 25-akpm/net/core/dev.c	Fri Feb  3 13:17:13 2006
@@ -3237,7 +3237,7 @@ static int __init net_dev_init(void)
 	 *	Initialise the packet receive queues.
 	 */
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct softnet_data *queue;
 
 		queue = &per_cpu(softnet_data, i);
diff -puN mm/page_alloc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject mm/page_alloc.c
--- 25/mm/page_alloc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:17 2006
+++ 25-akpm/mm/page_alloc.c	Fri Feb  3 13:17:17 2006
@@ -1213,18 +1213,21 @@ static void __get_page_state(struct page
 {
 	int cpu = 0;
 
-	memset(ret, 0, sizeof(*ret));
+	memset(ret, 0, nr * sizeof(unsigned long));
 	cpus_and(*cpumask, *cpumask, cpu_online_map);
 
 	cpu = first_cpu(*cpumask);
 	while (cpu < NR_CPUS) {
 		unsigned long *in, *out, off;
 
+		if (!cpu_isset(cpu, *cpumask))
+			continue;
+
 		in = (unsigned long *)&per_cpu(page_states, cpu);
 
 		cpu = next_cpu(cpu, *cpumask);
 
-		if (cpu < NR_CPUS)
+		if (likely(cpu < NR_CPUS))
 			prefetch(&per_cpu(page_states, cpu));
 
 		out = (unsigned long *)ret;
@@ -1886,8 +1889,7 @@ static void setup_pagelist_highmark(stru
  * not check if the processor is online before following the pageset pointer.
  * Other parts of the kernel may not check if the zone is available.
  */
-static struct per_cpu_pageset
-	boot_pageset[NR_CPUS];
+static struct per_cpu_pageset boot_pageset[NR_CPUS];
 
 /*
  * Dynamically allocate memory for the
_



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1904
retrieving revision 1.1905
diff -u -r1.1904 -r1.1905
--- kernel-2.6.spec	4 Feb 2006 00:42:02 -0000	1.1904
+++ kernel-2.6.spec	4 Feb 2006 01:00:45 -0000	1.1905
@@ -360,6 +360,7 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
+Patch1860: linux-2.6-percpu-NR_CPUS.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -854,6 +855,8 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
+# Fix percpu data accesses
+%patch1860 -p1
 # Fix oops in stradis on init
 %patch1890 -p1
 
@@ -1393,6 +1396,7 @@
 - Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
 - Silence noisy edac drivers.
 - Merge some patches from cpufreq git tree.
+- Fix some bogus percpu data accesses.
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6



From fedora-cvs-commits at redhat.com  Sat Feb  4 01:04:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 20:04:42 -0500
Subject: rpms/kernel/FC-4 linux-2.6-debug-oops-pause.patch,1.1,1.2
Message-ID: <200602040104.k1414gxK023895@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
build fix


linux-2.6-debug-oops-pause.patch:
 traps.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-oops-pause.patch	6 Jan 2006 05:42:17 -0000	1.1
+++ linux-2.6-debug-oops-pause.patch	4 Feb 2006 01:04:37 -0000	1.2
@@ -6,9 +6,17 @@
 
 (Wow, I'm really getting desperate for better debug data).
 
---- linux-2.6.14/arch/i386/kernel/traps.c~	2005-12-16 03:00:16.000000000 -0500
-+++ linux-2.6.14/arch/i386/kernel/traps.c	2005-12-16 03:07:12.000000000 -0500
-@@ -271,6 +271,15 @@ void show_registers(struct pt_regs *regs
+--- 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 @@
+ #include <linux/utsname.h>
+ #include <linux/kprobes.h>
+ #include <linux/kexec.h>
++#include <linux/nmi.h> 
+ 
+ #ifdef CONFIG_EISA
+ #include <linux/ioport.h>
+@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs
  		}
  	}
  	printk("\n");



From fedora-cvs-commits at redhat.com  Sat Feb  4 01:09:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 20:09:54 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1591.2.2,
	1.1591.2.3 0127-sk98lin-remove-proc-interface.txt, 1.1.2.1, NONE
	2897-NETFILTER-x_tables-Abstraction-layer-for-ip-ip6-arp-_tables.txt,
	1.1.2.1,
	NONE 3003-NETFILTER-x-tables-Missing-linux-ipv6.h-includes.txt,
	1.1.2.1, NONE 3313-NETFILTER-Makefile-cleanup.txt, 1.1.2.1, NONE
	3315-NETFILTER-ip6tables-whitespace-and-indent-cosmetic-cleanup.txt,
	1.1.2.1, NONE
Message-ID: <200602040109.k1419sDR025015@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc4-9-branch
	0127-sk98lin-remove-proc-interface.txt 
	2897-NETFILTER-x_tables-Abstraction-layer-for-ip-ip6-arp-_tables.txt 
	3003-NETFILTER-x-tables-Missing-linux-ipv6.h-includes.txt 
	3313-NETFILTER-Makefile-cleanup.txt 
	3315-NETFILTER-ip6tables-whitespace-and-indent-cosmetic-cleanup.txt 
Log Message:



View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1591.2.2 -r 1.1591.2.3 kernel-2.6.spec
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.2.2
retrieving revision 1.1591.2.3
diff -u -r1.1591.2.2 -r1.1591.2.3
--- kernel-2.6.spec	3 Feb 2006 22:15:53 -0000	1.1591.2.2
+++ kernel-2.6.spec	4 Feb 2006 01:09:51 -0000	1.1591.2.3
@@ -445,592 +445,587 @@
 Patch20063: 0123-sky2-use-pci_register_driver.txt
 Patch20064: 0124-sky2-update-version-number.txt
 Patch20065: 0126-sk98lin-remove-redundant-fields-in-device-info.txt
-Patch20066: 0127-sk98lin-remove-proc-interface.txt
-Patch20067: 0128-ixp2000-register-netdevices-last.txt
-Patch20068: 0129-pm3386-zero-stats-properly.txt
-Patch20069: 0130-pm3386-remove-unnecessary-udelays.txt
-Patch20070: 0131-caleb-pm3386-include-proper-header-files.txt
-Patch20071: 0132-ixp2000-use-netif_rx_schedule_test.txt
-Patch20072: 0133-enp2611-don-t-check-netif_running-in-link-status-timer.txt
-Patch20073: 0134-enp2611-use-dev-in-link-status-timer.txt
-Patch20074: 0135-enp2611-report-link-up-down-events.txt
-Patch20075: 0136-ixp2000-report-MAC-addresses-for-each-port-on-init.txt
-Patch20076: 0137-pm3386-add-hook-for-setting-MAC-address.txt
-Patch20077: 0138-pm3386-add-hook-for-setting-carrier.txt
-Patch20078: 0139-pm3386-implement-reset.txt
-Patch20079: 0140-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt
-Patch20080: 0141-ixp2000-add-netpoll-support.txt
-Patch20081: 0142-ixp2000-add-driver-version-bump-version-to-0.2.txt
-Patch20082: 0144-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt
-Patch20083: 0148-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt
-Patch20084: 0149-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt
-Patch20085: 0161-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt
-Patch20086: 0162-sky2-interrupt-not-cleared.txt
-Patch20087: 0193-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt
-Patch20088: 0194-sky2-device-structure-alignment.txt
-Patch20089: 0195-sky2-copy-threshold-as-module-parameter.txt
-Patch20090: 0196-sky2-ethtool-get-set-interrupt-coalescing.txt
-Patch20091: 0197-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt
-Patch20092: 0198-sky2-no-irq-disable-needed-during-tx.txt
-Patch20093: 0199-sky2-ring-distance-optimization.txt
-Patch20094: 0200-sky2-map-length-optimization.txt
-Patch20095: 0201-sky2-tx-rx-ring-data-structure-split.txt
-Patch20096: 0202-sky2-transmit-logic-fixes.txt
-Patch20097: 0203-sky2-transmit-complete-index-optimization.txt
-Patch20098: 0204-sky2-transmit-complete-routine-optimization.txt
-Patch20099: 0205-sky2-interrupt-poll-optimization.txt
-Patch20100: 0206-sky2-interrupt-coalescing-tuning.txt
-Patch20101: 0207-sky2-handle-tx-timeout.txt
-Patch20102: 0208-sky2-quiet-ring-full-message-in-case-of-race.txt
-Patch20103: 0209-sky2-prefetch-tuning.txt
-Patch20104: 0210-sky2-turn-on-tx-flow-control.txt
-Patch20105: 0211-sky2-disable-rx-checksum-on-Yukon-XL.txt
-Patch20106: 0212-sky2-version-0.10.txt
-Patch20107: 0219-e1000-Fixes-for-8357x.txt
-Patch20108: 0320-chelsio-transmit-routine-return-values.txt
-Patch20109: 0324-skge-get-rid-of-Yukon2-defines.txt
-Patch20110: 0327-git-netdev-all-s2io-warning-fix.txt
-Patch20111: 0328-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt
-Patch20112: 0330-sky2-handle-out-of-memory-on-admin-changes.txt
-Patch20113: 0331-sky2-don-t-lose-multicast-addresses.txt
-Patch20114: 0332-sky2-handle-hardware-packet-overrun.txt
-Patch20115: 0333-sky2-version-0.11.txt
-Patch20116: 0656-s-retreiv-retriev-g.txt
-Patch20117: 0681-LSM-IPSec-Security-association-restriction.txt
-Patch20118: 0683-TCP-BIC-remove-low-utilization-code.txt
-Patch20119: 0684-TCP-BIC-spelling-and-whitespace.txt
-Patch20120: 0685-TCP-BIC-CUBIC-window-growth-2.0.txt
-Patch20121: 0686-NETFILTER-ip_tables-NUMA-aware-allocation.txt
-Patch20122: 0687-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt
-Patch20123: 0688-IPV4-Safer-reassembly.txt
-Patch20124: 0689-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt
-Patch20125: 0690-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt
-Patch20126: 0691-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt
-Patch20127: 0692-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt
-Patch20128: 0693-IPV6-Introduce-inet6_rsk.txt
-Patch20129: 0694-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt
-Patch20130: 0695-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt
-Patch20131: 0696-DCCP-Introduce-dccp_ipv4_af_ops.txt
-Patch20132: 0697-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt
-Patch20133: 0698-UDP-udp_checksum_init-return-value.txt
-Patch20134: 0699-IPVS-remove-dead-code.txt
-Patch20135: 0700-NET-Avoid-atomic-xchg-for-non-error-case.txt
-Patch20136: 0701-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt
-Patch20137: 0702-IPV6-Generalise-some-functions.txt
-Patch20138: 0703-IPV6-Introduce-inet6_timewait_sock.txt
-Patch20139: 0704-IPV6-Export-some-symbols-for-DCCPv6.txt
-Patch20140: 0705-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt
-Patch20141: 0706-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt
-Patch20142: 0707-IPV6-Export-ipv6_opt_accepted.txt
-Patch20143: 0708-DCCP-Introduce-DCCPv6.txt
-Patch20144: 0709-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt
-Patch20145: 0710-TWSK-Introduce-struct-timewait_sock_ops.txt
-Patch20146: 0711-INET-Generalise-tcp_v4_hash_connect.txt
-Patch20147: 0712-INET6-Generalise-tcp_v6_hash_connect.txt
-Patch20148: 0713-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt
-Patch20149: 0714-IP_SOCKGLUE-Remove-most-of-the-tcp-specific-calls.txt
-Patch20150: 0715-AF_UNIX-Use-spinlock-for-unix_table_lock.txt
-Patch20151: 0716-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt
-Patch20152: 0717-BRIDGE-handle-speed-detection-after-carrier-changes.txt
-Patch20153: 0718-BRIDGE-filter-packets-in-learning-state.txt
-Patch20154: 0719-BRIDGE-limited-ethtool-support.txt
-Patch20155: 0720-BRIDGE-add-version-number.txt
-Patch20156: 0721-PKT_SCHED-netem-packet-corruption-option.txt
-Patch20157: 0724-TCP-cubic-precompute-constants.txt
-Patch20158: 0725-TCP-cubic-use-Newton-Raphson.txt
-Patch20159: 0726-IPV4-fib_trie-Add-credits.txt
-Patch20160: 0727-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt
-Patch20161: 0728-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt
-Patch20162: 0730-NET-move-struct-proto_ops-to-const.txt
-Patch20163: 0731-PKTGEN-Deinitialise-static-variables.txt
-Patch20164: 0732-NET-Fix-sock_init-return-value.txt
-Patch20165: 0733-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt
-Patch20166: 0734-SOCK-Introduce-sk_receive_skb.txt
-Patch20167: 0735-INET_SOCK-Move-struct-inet_sock-helper-functions-to-net-inet_sock.h.txt
-Patch20168: 0736-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt
-Patch20169: 0737-PPPOX-Fix-assignment-into-const-proto_ops.txt
-Patch20170: 0739-NET-Speed-up-__alloc_skb.txt
-Patch20171: 0740-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt
-Patch20172: 0741-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt
-Patch20173: 0742-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt
-Patch20174: 0743-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt
-Patch20175: 0744-TG3-fixup-tot_len-calculation.txt
-Patch20176: 0745-IPVS-Cleanup-IP_VS_DBG-statements.txt
-Patch20177: 0746-DECNET-Only-use-local-routers.txt
-Patch20178: 0747-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt
-Patch20179: 0748-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt
-Patch20180: 0749-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt
-Patch20181: 0751-IPV4-fib_trie-build-fix.txt
-Patch20182: 0756-IEEE80211-ipw2200-Simplify-multicast-checks.txt
-Patch20183: 0757-TCP-less-inline-s.txt
-Patch20184: 0758-DCCP-ackvec-Fix-spelling-of-throw.txt
-Patch20185: 0759-DCCP-ackvec-use-u8-for-the-buf-offsets.txt
-Patch20186: 0760-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt
-Patch20187: 0761-IPVS-Add-missing-include-linux-net.h.txt
-Patch20188: 0775-Add-softmac-layer-to-the-kernel-including-Kconfig-addition.txt
-Patch20189: 0777-The-comments-in-ieee80211.h-claim-that-one-doesn-t-need-to-set-the-len.txt
-Patch20190: 0778-This-patch-fixes-some-of-the-ieee80211-crypto-related-code-so-that.txt
-Patch20191: 0779-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt
-Patch20192: 0798-This-change-fixes-an-endianness-problem-in-the-debug-code-in-ieee80211_rx.c.txt
-Patch20193: 0799-This-patch-adds-a-missing-static-on-a-variable-sparse-complaint.txt
-Patch20194: 0800-fix-some-sparse-warnings.txt
-Patch20195: 0880-ECONET-Use-macro-for-spinlock_t-definition.txt
-Patch20196: 0881-IPV6-Use-macro-for-rwlock_t-initialization.txt
-Patch20197: 0882-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt
-Patch20198: 0883-NET-More-instruction-checks-fornet-core-filter.c.txt
-Patch20199: 0884-TCP-tcp_vegas-Fix-slow-start.txt
-Patch20200: 0885-remove-deprecated-code-from-ipw2100-and-ipw2200-for-wireless-extensions-18.txt
-Patch20201: 0915-fix-Makefiles.txt
-Patch20202: 0916-IPVS-Fix-compilation.txt
-Patch20203: 0917-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt
-Patch20204: 0918-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt
-Patch20205: 0919-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt
-Patch20206: 0920-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt
-Patch20207: 0921-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt
-Patch20208: 0922-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt
-Patch20209: 0923-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt
-Patch20210: 0924-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt
-Patch20211: 0925-NETFILTER-ctnetlink-remove-unused-variable.txt
-Patch20212: 0926-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt
-Patch20213: 0927-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt
-Patch20214: 0928-NETFILTER-Fix-module_param-types-and-permissions.txt
-Patch20215: 0929-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt
-Patch20216: 0930-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt
-Patch20217: 0931-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt
-Patch20218: 0932-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt
-Patch20219: 0933-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt
-Patch20220: 0934-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt
-Patch20221: 0935-NETFILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt
-Patch20222: 0953-pcmcia-new-suspend-core.txt
-Patch20223: 0955-pcmcia-unify-detach-REMOVAL_EVENT-handlers-into-one-remove-callback.txt
-Patch20224: 0957-pcmcia-remove-dev_list-from-drivers.txt
-Patch20225: 0972-revert-that-large-cleanup-patch-there-s-no-way-I-can-test-if-it-really-works-and-there-are-patches-out-there-that-do-similar-things.txt
-Patch20226: 0973-convert-to-use-global-workqueue-instead-of-private-one.txt
-Patch20227: 0974-IPVS-Another-file-needs-linux-interrupt.h.txt
-Patch20228: 0975-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt
-Patch20229: 1043-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt
-Patch20230: 1255-parport-include-fixes.txt
-Patch20231: 1262-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt
-Patch20232: 1328-correctly-use-netif_carrier_-on-off-TODO-add-callbacks-for-ifup-ifdown-see-mailing-list.txt
-Patch20233: 1334-SUNRPC-Yet-more-RPC-cleanups.txt
-Patch20234: 1335-RPC-Clean-up-RPC-task-structure.txt
-Patch20235: 1336-SUNRPC-Further-cleanups.txt
-Patch20236: 1337-NFSv4-stateful-NFSv4-RPC-call-interface.txt
-Patch20237: 1340-SUNRPC-Get-rid-of-some-unused-exports.txt
-Patch20238: 1341-SUNRPC-rpc_execute-should-not-return-task-tk_status.txt
-Patch20239: 1349-SUNRPC-Ensure-that-SIGKILL-will-always-terminate-a-synchronous-RPC-call.txt
-Patch20240: 1365-SUNRPC-Fix-a-potential-race-in-rpc_pipefs.txt
-Patch20241: 1370-SUNRPC-net-sunrpc-xdr.c-remove-xdr_decode_string.txt
-Patch20242: 1377-SUNRPC-switchable-buffer-allocation.txt
-Patch20243: 1378-SUNRPC-new-interface-to-force-an-RPC-rebind.txt
-Patch20244: 1379-SUNRPC-transport-switch-API-for-setting-port-number.txt
-Patch20245: 1383-SUNRPC-Ensure-client-closes-the-socket-when-server-initiates-a-close.txt
-Patch20246: 1384-SUNRPC-Clean-up-xprt_destroy.txt
-Patch20247: 1387-SUNRPC-Update-the-spkm3-code-to-use-the-make_checksum-interface.txt
-Patch20248: 1388-SUNRPC-Make-spkm3-report-unsupported-encryption-types.txt
-Patch20249: 1389-SUNRPC-Make-krb5-report-unsupported-encryption-types.txt
-Patch20250: 1395-NET-Use-newer-is_multicast_ether_addr-in-some-files.txt
-Patch20251: 1396-NET-Change-sk_run_filter-s-return-type-in-net-core-filter.c.txt
-Patch20252: 1398-X25-Fix-for-broken-x25-module.txt
-Patch20253: 1399-BRIDGE-netfilter-vlan-hw-checksum-bug.txt
[...2573 lines suppressed...]
+%patch20591 -p1
 # ipw2200: Fix a variable referenced after kfree() bug
-%patch20597 -p1
+%patch20592 -p1
 # Typo corrections for ieee80211
-%patch20598 -p1
+%patch20593 -p1
 # PCMCIA=m, HOSTAP_CS=y is not a legal configuration
-%patch20599 -p1
+%patch20594 -p1
 # [NETFILTER] nfnetlink_log: add sequence numbers for log events
-%patch20600 -p1
+%patch20595 -p1
 # [SCTP]: correct the number of INIT retransmissions
-%patch20601 -p1
+%patch20596 -p1
 # [SCTP]: heartbeats exceed maximum retransmssion limit
-%patch20602 -p1
+%patch20597 -p1
 # AIRO{,_CS} <-> CRYPTO fixes
-%patch20603 -p1
+%patch20598 -p1
 # drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
-%patch20604 -p1
+%patch20599 -p1
 # drivers/net/wireless/ipw2200: possible cleanups
-%patch20605 -p1
+%patch20600 -p1
 # ieee80211: trivial fix for misplaced ()'s
-%patch20606 -p1
+%patch20601 -p1
 # ipw2100: Add LEAP authentication algorithm support
-%patch20607 -p1
+%patch20602 -p1
 # ipw2100: Make iwconfig txpower setting consistent with user input
-%patch20608 -p1
+%patch20603 -p1
 # ipw2100: Add generic geo information
-%patch20609 -p1
+%patch20604 -p1
 # ipw2100: remove white space and better format the code
-%patch20610 -p1
+%patch20605 -p1
 # increase ipw2100 driver version to git-1.1.4
-%patch20611 -p1
+%patch20606 -p1
 # ipw2200: Fix indirect SRAM/register 8/16-bit write routines
-%patch20612 -p1
+%patch20607 -p1
 # ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
-%patch20613 -p1
+%patch20608 -p1
 # ipw2200: Add LEAP authentication algorithm support
-%patch20614 -p1
+%patch20609 -p1
 # ipw2200: Bluetooth coexistence support
-%patch20615 -p1
+%patch20610 -p1
 # ipw2200: Make LED blinking frequency independent of HZ
-%patch20616 -p1
+%patch20611 -p1
 # ipw2200: add module parameter to enable/disable roaming
-%patch20617 -p1
+%patch20612 -p1
 # ipw2200: Scale firmware loading watchdog with the firmware size
-%patch20618 -p1
+%patch20613 -p1
 # ipw2200: stack reduction
-%patch20619 -p1
+%patch20614 -p1
 # ipw2200: Fix qos_cmd param switch bug
-%patch20620 -p1
+%patch20615 -p1
 # ipw2200: increase ipw2200 driver version
-%patch20621 -p1
+%patch20616 -p1
 # ipw2200: Disable hwcrypto by default
-%patch20622 -p1
+%patch20617 -p1
 # wireless/airo: add IWENCODEEXT and IWAUTH support
-%patch20623 -p1
+%patch20618 -p1
 # wireless/ipw2200: support WE-18 WPA enc_capa
-%patch20624 -p1
+%patch20619 -p1
 # [IPV4] igmp: remove pointless printk
-%patch20625 -p1
+%patch20620 -p1
 # [TCP] H-TCP: Fix accounting
-%patch20626 -p1
+%patch20621 -p1
 # ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt
-%patch20627 -p1
+%patch20622 -p1
 # Add two management functions to ieee80211_rx.c
-%patch20628 -p1
+%patch20623 -p1
 # Clarify help text of SKGE/SK98LIN/SKY2
-%patch20629 -p1
+%patch20624 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
-%patch20630 -p1
+%patch20625 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
-%patch20631 -p1
+%patch20626 -p1
 # [IPV4]: Always set fl.proto in ip_route_newports
-%patch20632 -p1
+%patch20627 -p1
 # [BRIDGE]: Fix device delete race.
-%patch20633 -p1
+%patch20628 -p1
 # [NET]: Do not export inet_bind_bucket_create twice.
-%patch20634 -p1
+%patch20629 -p1
 # [IPV6] tcp_v6_send_synack: release the destination
-%patch20635 -p1
+%patch20630 -p1
 # [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
-%patch20636 -p1
+%patch20631 -p1
 # lp486e: remove SLOW_DOWN_IO
-%patch20637 -p1
+%patch20632 -p1
 # ipw2200: fix ->eeprom[EEPROM_VERSION] check
-%patch20638 -p1
+%patch20633 -p1
 # DocBook: fix some kernel-doc comments in net/sunrpc
-%patch20639 -p1
+%patch20634 -p1
 # SUNRPC: Fix a lock recursion in the auth_gss downcall
-%patch20640 -p1
+%patch20635 -p1
 # SUNRPC: Move upcall out of auth->au_ops->crcreate()
-%patch20641 -p1
+%patch20636 -p1
 # [NET] snap: needs hardware checksum fix
-%patch20642 -p1
+%patch20637 -p1
 # [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
-%patch20643 -p1
+%patch20638 -p1
 # [SCTP]: Fix 'fast retransmit' to send a TSN only once.
-%patch20644 -p1
+%patch20639 -p1
 # [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
-%patch20645 -p1
+%patch20640 -p1
 # [IPV6]: Fix illegal dst locking in softirq context.
-%patch20646 -p1
+%patch20641 -p1
 # [IPV4]: Remove suprious use of goto out: in icmp_reply
-%patch20647 -p1
+%patch20642 -p1
 # [TG3]: Flush tg3_reset_task()
-%patch20648 -p1
+%patch20643 -p1
 # [TG3]: Update driver version and release date.
-%patch20649 -p1
+%patch20644 -p1
 # [IPV4]: Use RCU locking in fib_rules.
-%patch20650 -p1
+%patch20645 -p1
 # [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
-%patch20651 -p1
+%patch20646 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3297,7 +3282,6 @@
 - sky2: use pci_register_driver
 - sky2: update version number
 - sk98lin: remove redundant fields in device info
-- sk98lin: remove /proc interface
 - ixp2000: register netdevices last
 - pm3386: zero stats properly
 - pm3386: remove unnecessary udelays
@@ -3636,13 +3620,11 @@
 - [TIPC] Update of file headers
 - [TIPC] More updates of file headers
 - [TIPC]: Fix 64-bit build warnings.
-- [NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
 - genetlink: don't touch module ref count
 - [NET]: Use NIP6_FMT in kernel.h
 - [NET]: Clean up comments for sk_chk_filter()
 - [XFRM]: IPsec tunnel wildcard address support
 - [PKT_SCHED]: Change default clock source to gettimeofday
-- [NETFILTER] x-tables: Missing linux/ipv6.h includes.
 - Spelling fix in IPW2100 and IPW2200 Kconfig entries
 - drivers/net/{,wireless/}Kconfig: remove dead URL
 - cs89x0: credit Dmitry Pervushin
@@ -3662,8 +3644,6 @@
 - [PKT_SCHED] sch_prio: fix qdisc bands init
 - [NET]: Fix whitespace issues in net/core/filter.c
 - [NETFILTER] ip[6]t_policy: Fix compilation warnings
-- [NETFILTER] Makefile cleanup
-- [NETFILTER] ip6tables: whitespace and indent cosmetic cleanup
 - [TG3]: Refine nvram locking
 - [NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.h
 - [IPV4]: rt_cache_stat can be statically defined


--- 0127-sk98lin-remove-proc-interface.txt DELETED ---


--- 2897-NETFILTER-x_tables-Abstraction-layer-for-ip-ip6-arp-_tables.txt DELETED ---


--- 3003-NETFILTER-x-tables-Missing-linux-ipv6.h-includes.txt DELETED ---


--- 3313-NETFILTER-Makefile-cleanup.txt DELETED ---


--- 3315-NETFILTER-ip6tables-whitespace-and-indent-cosmetic-cleanup.txt DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 03:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 22:02:49 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1905,1.1906
Message-ID: <200602040302.k1432nA5010321@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
doh.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1905
retrieving revision 1.1906
diff -u -r1.1905 -r1.1906
--- kernel-2.6.spec	4 Feb 2006 01:00:45 -0000	1.1905
+++ kernel-2.6.spec	4 Feb 2006 03:02:19 -0000	1.1906
@@ -1202,7 +1202,7 @@
 
 %post 
 if [ `uname -i` == "x86_64" ]; then
-  sed -e -i 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
+  /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
 fi
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
 /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}



From fedora-cvs-commits at redhat.com  Sat Feb  4 03:03:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 22:03:47 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.34,
	1.35 policy-20060104.patch, 1.30, 1.31 selinux-policy.spec,
	1.99, 1.100 sources, 1.38, 1.39
Message-ID: <200602040303.k1433lmD010397@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10369

Modified Files:
	.cvsignore policy-20060104.patch selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	3 Feb 2006 14:54:23 -0000	1.34
+++ .cvsignore	4 Feb 2006 03:03:20 -0000	1.35
@@ -35,3 +35,4 @@
 serefpolicy-2.2.8.tgz
 serefpolicy-2.2.9.tgz
 serefpolicy-2.2.10.tgz
+serefpolicy-2.2.11.tgz

policy-20060104.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/kudzu.te             |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/usermanage.te        |    3 +
 policy/modules/apps/mono.te               |    2 -
 policy/modules/apps/wine.te               |    2 -
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/filesystem.if       |   52 ++++++++++++++++++++++++------
 policy/modules/kernel/filesystem.te       |    1 
 policy/modules/kernel/mls.te              |    3 +
 policy/modules/services/apache.fc         |    2 +
 policy/modules/services/apache.te         |    1 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/hal.te            |    1 
 policy/modules/services/irqbalance.te     |    3 +
 policy/modules/services/networkmanager.fc |    4 +-
 policy/modules/services/networkmanager.te |    9 +++--
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/sendmail.if       |   15 ++++++++
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/services/xserver.fc        |    9 +++--
 policy/modules/services/xserver.if        |   21 ++++++++++++
 policy/modules/services/xserver.te        |    9 ++---
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/logging.te          |    2 -
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/unconfined.if       |    8 +++-
 policy/modules/system/unconfined.te       |   10 +++++
 policy/modules/system/userdomain.te       |    2 +
 33 files changed, 165 insertions(+), 36 deletions(-)

Index: policy-20060104.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policy-20060104.patch	3 Feb 2006 14:54:23 -0000	1.30
+++ policy-20060104.patch	4 Feb 2006 03:03:32 -0000	1.31
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.10/build.conf
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.11/build.conf
 --- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.10/build.conf	2006-02-03 09:00:31.000000000 -0500
++++ serefpolicy-2.2.11/build.conf	2006-02-03 21:18:32.000000000 -0500
 @@ -8,13 +8,13 @@
  # version policy it supports.  Setting this will
  # override the version.  This only has an
@@ -26,10 +26,10 @@
  
  # Polyinstantiation
  # Enable polyinstantiated directory support.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.10/policy/mcs
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.11/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.10/policy/mcs	2006-02-03 09:28:41.000000000 -0500
-@@ -137,15 +137,28 @@
++++ serefpolicy-2.2.11/policy/mcs	2006-02-03 21:18:32.000000000 -0500
+@@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
  mlsconstrain file { write setattr append unlink link rename
@@ -51,18 +51,14 @@
 +
 +mlsconstrain process { ptrace } ( h1 dom h2 );
 +
-+mlsconstrain process { transition dyntransition } (( h1 dom h2 ) or
-+		( t1 == getty_t ) or ( t1 == init_t ) or ( t1 == initrc_t ) or
-+		( t1 == kernel_t ));
-+
-+mlsconstrain process { sigkill sigstop signal } ( h1 dom h2 ) or
++mlsconstrain process { sigkill sigstop } ( h1 dom h2 ) or
 +		( t1 == init_t ) or ( t1 == initrc_t );
  
  define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
  link unlink rename relabelfrom relabelto }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.10/policy/modules/admin/kudzu.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.11/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-03 08:55:51.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/admin/kudzu.te	2006-02-03 09:28:41.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/admin/kudzu.te	2006-02-03 21:18:32.000000000 -0500
 @@ -24,7 +24,6 @@
  allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
  dontaudit kudzu_t self:capability sys_tty_config;
@@ -71,21 +67,23 @@
  allow kudzu_t self:fifo_file rw_file_perms;
  allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow kudzu_t self:unix_dgram_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.10/policy/modules/admin/readahead.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.11/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/admin/readahead.te	2006-02-03 09:17:06.000000000 -0500
-@@ -47,7 +47,7 @@
++++ serefpolicy-2.2.11/policy/modules/admin/readahead.te	2006-02-03 21:18:32.000000000 -0500
+@@ -47,7 +47,9 @@
  fs_search_auto_mountpoints(readahead_t)
  fs_getattr_all_pipes(readahead_t)
  fs_getattr_all_files(readahead_t)
 -fs_search_ramfs(readahead_t)
 +fs_dontaudit_search_ramfs(readahead_t)
++fs_dontaudit_read_ramfs_fifo_file(readahead_t)
++fs_dontaudit_read_ramfs_file(readahead_t)
  fs_read_tmpfs_symlinks(readahead_t)
  
  term_dontaudit_use_console(readahead_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.10/policy/modules/admin/usermanage.te
---- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/admin/usermanage.te	2006-02-03 09:00:31.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.11/policy/modules/admin/usermanage.te
+--- nsaserefpolicy/policy/modules/admin/usermanage.te	2006-02-03 15:45:54.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/admin/usermanage.te	2006-02-03 21:18:32.000000000 -0500
 @@ -328,6 +328,9 @@
  
  miscfiles_read_localization(passwd_t)
@@ -96,9 +94,9 @@
  seutil_dontaudit_search_config(passwd_t)
  
  userdom_use_unpriv_users_fd(passwd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.10/policy/modules/apps/mono.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.11/policy/modules/apps/mono.te
 --- nsaserefpolicy/policy/modules/apps/mono.te	2006-01-27 21:35:04.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/apps/mono.te	2006-02-03 09:00:31.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/apps/mono.te	2006-02-03 21:18:32.000000000 -0500
 @@ -19,7 +19,7 @@
  
  ifdef(`targeted_policy',`
@@ -108,9 +106,9 @@
  	role system_r types mono_t;
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.10/policy/modules/apps/wine.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.11/policy/modules/apps/wine.te
 --- nsaserefpolicy/policy/modules/apps/wine.te	2006-01-19 18:02:04.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/apps/wine.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/apps/wine.te	2006-02-03 21:18:32.000000000 -0500
 @@ -19,7 +19,7 @@
  
  ifdef(`targeted_policy',`
@@ -120,9 +118,9 @@
  	role system_r types wine_t;
  	allow wine_t file_type:file execmod;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.10/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.11/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/kernel/devices.fc	2006-02-03 09:28:41.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/devices.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -78,6 +78,7 @@
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
@@ -131,9 +129,9 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.10/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.11/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/kernel/devices.te	2006-02-03 09:28:41.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/devices.te	2006-02-03 21:18:32.000000000 -0500
 @@ -159,6 +159,11 @@
  genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
  genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
@@ -146,9 +144,21 @@
  type v4l_device_t;
  dev_node(v4l_device_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.10/policy/modules/kernel/filesystem.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.11/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/files.fc	2006-02-03 21:18:32.000000000 -0500
+@@ -192,6 +192,8 @@
+ /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
++/usr/doc(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
++/usr/src(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+ 
+ /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
+ /usr/tmp/.*			<<none>>
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.11/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/kernel/filesystem.if	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/filesystem.if	2006-02-03 21:18:32.000000000 -0500
 @@ -149,7 +149,7 @@
  		type fs_t;
  	')
@@ -212,7 +222,46 @@
  ')
  
  ########################################
-@@ -1855,7 +1855,7 @@
+@@ -1763,6 +1763,38 @@
+ 
+ ########################################
+ ## <summary>
++##	Dontaudit read on a ramfs file/fifo_file
++## </summary>
++## <param name="domain">
++##	Domain allowed access.
++## </param>
++#
++interface(`fs_dontaudit_read_ramfs_file',`
++	gen_require(`
++		type ramfs_t;
++	')
++
++	dontaudit $1 ramfs_t:file read;
++')
++
++########################################
++## <summary>
++##	Dontaudit read on a ramfs fifo_file
++## </summary>
++## <param name="domain">
++##	Domain allowed access.
++## </param>
++#
++interface(`fs_dontaudit_read_ramfs_fifo_file',`
++	gen_require(`
++		type ramfs_t;
++	')
++
++	dontaudit $1 ramfs_t:fifo_file read;
++')
++
++########################################
++## <summary>
+ ##	Write to named pipe on a ramfs filesystem.
+ ## </summary>
+ ## <param name="domain">
+@@ -1855,7 +1887,7 @@
  		type romfs_t;
  	')
  
@@ -221,7 +270,7 @@
  ')
  
  ########################################
-@@ -1922,7 +1922,7 @@
+@@ -1922,7 +1954,7 @@
  		type rpc_pipefs_t;
  	')
  
@@ -230,7 +279,7 @@
  ')
  
  ########################################
-@@ -1988,7 +1988,7 @@
+@@ -1988,7 +2020,7 @@
  		type tmpfs_t;
  	')
  
@@ -239,9 +288,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.10/policy/modules/kernel/filesystem.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.11/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2006-01-17 17:08:52.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/kernel/filesystem.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/filesystem.te	2006-02-03 21:18:32.000000000 -0500
 @@ -134,6 +134,7 @@
  #
  type dosfs_t, noxattrfs;
@@ -250,9 +299,9 @@
  genfscon fat / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0)
  genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.10/policy/modules/kernel/mls.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.11/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-01-17 17:08:52.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/kernel/mls.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/mls.te	2006-02-03 21:18:32.000000000 -0500
 @@ -86,7 +86,8 @@
  ')
  
@@ -263,9 +312,9 @@
  range_transition initrc_t auditd_exec_t s15:c0.c255;
 +range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.10/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.11/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2005-11-15 09:13:36.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/apache.fc	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/apache.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -42,6 +42,8 @@
  /var/cache/php-eaccelerator(/.*)?	gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/php-mmcache(/.*)?		gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -275,9 +324,9 @@
  
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.10/policy/modules/services/apache.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.11/policy/modules/services/apache.te
 --- nsaserefpolicy/policy/modules/services/apache.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/apache.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/apache.te	2006-02-03 21:18:32.000000000 -0500
 @@ -347,6 +347,7 @@
  
  tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',`
@@ -286,9 +335,9 @@
  	allow httpd_t httpd_sys_script_t:fd use;
  	allow httpd_sys_script_t httpd_t:fd use;
  	allow httpd_sys_script_t httpd_t:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.10/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.11/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/automount.te	2006-02-03 09:04:33.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/automount.te	2006-02-03 21:18:32.000000000 -0500
 @@ -64,6 +64,7 @@
  kernel_list_proc(automount_t)
  
@@ -297,9 +346,9 @@
  
  corecmd_exec_sbin(automount_t)
  corecmd_exec_bin(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.10/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.11/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/hal.te	2006-02-03 09:03:37.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/hal.te	2006-02-03 21:18:32.000000000 -0500
 @@ -51,6 +51,7 @@
  kernel_write_proc_files(hald_t)
  
@@ -308,9 +357,9 @@
  
  corecmd_exec_bin(hald_t)
  corecmd_exec_sbin(hald_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.10/policy/modules/services/irqbalance.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.11/policy/modules/services/irqbalance.te
 --- nsaserefpolicy/policy/modules/services/irqbalance.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/irqbalance.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/irqbalance.te	2006-02-03 21:18:32.000000000 -0500
 @@ -31,6 +31,9 @@
  
  dev_read_sysfs(irqbalance_t)
@@ -321,30 +370,44 @@
  fs_getattr_all_fs(irqbalance_t)
  fs_search_auto_mountpoints(irqbalance_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.10/policy/modules/services/networkmanager.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.11/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2005-11-14 18:24:07.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/networkmanager.fc	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/networkmanager.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -1,2 +1,4 @@
  
 -/usr/bin/NetworkManager	--	gen_context(system_u:object_r:NetworkManager_exec_t,s0)
 +/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)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.10/policy/modules/services/networkmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.11/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/networkmanager.te	2006-02-03 09:00:38.000000000 -0500
-@@ -24,7 +24,7 @@
++++ serefpolicy-2.2.11/policy/modules/services/networkmanager.te	2006-02-03 21:37:05.000000000 -0500
+@@ -22,16 +22,19 @@
+ dontaudit NetworkManager_t self:capability sys_tty_config;
+ allow NetworkManager_t self:process { setcap getsched signal_perms };
  allow NetworkManager_t self:fifo_file rw_file_perms;
- allow NetworkManager_t self:unix_dgram_socket create_socket_perms;
+-allow NetworkManager_t self:unix_dgram_socket create_socket_perms;
++allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
  allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
 -allow NetworkManager_t self:netlink_route_socket r_netlink_socket_perms;
 +allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms;
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
  allow NetworkManager_t self:udp_socket create_socket_perms;
  allow NetworkManager_t self:packet_socket create_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.10/policy/modules/services/procmail.te
+ 
+ allow NetworkManager_t NetworkManager_var_run_t:file create_file_perms;
+ allow NetworkManager_t NetworkManager_var_run_t:dir rw_dir_perms;
+-files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t)
++files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
++
++allow NetworkManager_t NetworkManager_var_run_t:sock_file create_file_perms;
++allow NetworkManager_t NetworkManager_var_run_t:dir create_dir_perms;
+ 
+ kernel_read_system_state(NetworkManager_t)
+ kernel_read_network_state(NetworkManager_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.11/policy/modules/services/procmail.te
 --- nsaserefpolicy/policy/modules/services/procmail.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/procmail.te	2006-02-03 09:06:03.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/procmail.te	2006-02-03 21:18:32.000000000 -0500
 @@ -96,6 +96,7 @@
  optional_policy(`sendmail',`
  	mta_read_config(procmail_t)
@@ -353,9 +416,9 @@
  ')
  
  optional_policy(`spamassassin',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.2.10/policy/modules/services/sendmail.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.2.11/policy/modules/services/sendmail.if
 --- nsaserefpolicy/policy/modules/services/sendmail.if	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/sendmail.if	2006-02-03 09:06:14.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/sendmail.if	2006-02-03 21:18:32.000000000 -0500
 @@ -52,6 +52,21 @@
  
  	allow $1 sendmail_t:tcp_socket { read write };
@@ -378,9 +441,9 @@
  
  ########################################
  ## <summary>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.10/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.11/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/spamassassin.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/spamassassin.te	2006-02-03 21:18:32.000000000 -0500
 @@ -77,6 +77,7 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -389,9 +452,9 @@
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.10/policy/modules/services/xserver.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.11/policy/modules/services/xserver.fc
 --- nsaserefpolicy/policy/modules/services/xserver.fc	2006-02-01 08:23:32.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/xserver.fc	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/xserver.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -58,16 +58,19 @@
  
  /usr/X11R6/bin/[xgkw]dm	--	gen_context(system_u:object_r:xdm_exec_t,s0)
@@ -415,9 +478,9 @@
  #
  # /var
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.10/policy/modules/services/xserver.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.11/policy/modules/services/xserver.if
 --- nsaserefpolicy/policy/modules/services/xserver.if	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/xserver.if	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/xserver.if	2006-02-03 21:18:32.000000000 -0500
 @@ -1,4 +1,25 @@
  ## <summary>X Windows Server</summary>
 +########################################
@@ -444,9 +507,9 @@
  
  template(`xserver_common_domain_template',`
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.10/policy/modules/services/xserver.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.11/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/services/xserver.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/xserver.te	2006-02-03 21:18:32.000000000 -0500
 @@ -57,10 +57,8 @@
  type xserver_log_t;
  logging_log_file(xserver_log_t)
@@ -470,9 +533,9 @@
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.10/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.11/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/system/init.fc	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/init.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -483,9 +546,9 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.10/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.11/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/system/libraries.fc	2006-02-03 09:15:07.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/libraries.fc	2006-02-03 21:18:32.000000000 -0500
 @@ -62,7 +62,7 @@
  /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
@@ -495,9 +558,33 @@
  /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.10/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.11/policy/modules/system/logging.te
+--- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/logging.te	2006-02-03 21:18:32.000000000 -0500
+@@ -114,7 +114,7 @@
+ 
+ allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
+ dontaudit auditd_t self:capability sys_tty_config;
+-allow auditd_t self:process { signal_perms setsched };
++allow auditd_t self:process { signal_perms setpgid setsched };
+ allow auditd_t self:file { getattr read write };
+ allow auditd_t self:unix_dgram_socket create_socket_perms;
+ allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.11/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/mount.te	2006-02-03 21:18:32.000000000 -0500
+@@ -33,6 +33,8 @@
+ dev_getattr_all_blk_files(mount_t)
+ dev_list_all_dev_nodes(mount_t)
+ dev_rw_lvm_control(mount_t)
++dev_dontaudit_getattr_memory_dev(mount_t)
++dev_getattr_sound_dev(mount_t)
+ 
+ storage_raw_read_fixed_disk(mount_t)
+ storage_raw_write_fixed_disk(mount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.11/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/system/unconfined.if	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/unconfined.if	2006-02-03 21:18:32.000000000 -0500
 @@ -41,14 +41,18 @@
  	tunable_policy(`allow_execheap',`
  		# Allow making the stack executable via mprotect.
@@ -519,10 +606,10 @@
  	')
  
  	tunable_policy(`allow_execmem && allow_execstack',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.10/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.11/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-01-27 21:35:05.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/system/unconfined.te	2006-02-03 09:00:38.000000000 -0500
-@@ -148,4 +148,8 @@
++++ serefpolicy-2.2.11/policy/modules/system/unconfined.te	2006-02-03 21:18:32.000000000 -0500
+@@ -148,4 +148,14 @@
  	optional_policy(`wine',`
  		wine_domtrans(unconfined_t)
  	')
@@ -530,10 +617,16 @@
 +	optional_policy(`xserver',`
 +		xserver_domtrans(unconfined_t)
 +	')
++	optional_policy(`fstools',`
++		fstools_domtrans(unconfined_t)
++	')
++	optional_policy(`mount',`
++		mount_domtrans(unconfined_t)
++	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.10/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.11/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.10/policy/modules/system/userdomain.te	2006-02-03 09:00:38.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/system/userdomain.te	2006-02-03 21:18:32.000000000 -0500
 @@ -162,6 +162,8 @@
  		')
  	')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- selinux-policy.spec	3 Feb 2006 14:54:23 -0000	1.99
+++ selinux-policy.spec	4 Feb 2006 03:03:32 -0000	1.100
@@ -5,7 +5,7 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.10
+Version: 2.2.11
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -121,9 +121,8 @@
 
 %define rebuildpolicy() \
 ( cd /usr/share/selinux/%1; \
-semodule -b base.pp -s %1; \
 x=`ls | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
-[ -z "$x" ] || semodule $x -s %1; \
+semodule -b base.pp $x -s %1; \
 );\
 rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
 
@@ -296,6 +295,10 @@
 
 %changelog
 
+* Fri Feb 3 2006 Dan Walsh <dwalsh at redhat.com> 2.2.11-1
+- Fixes for mcs
+- Turn on mount and fsadm for unconfined_t
+
 * Wed Feb 1 2006 Dan Walsh <dwalsh at redhat.com> 2.2.10-1
 - Fixes for the -devel package
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	3 Feb 2006 14:54:23 -0000	1.38
+++ sources	4 Feb 2006 03:03:32 -0000	1.39
@@ -1 +1 @@
-b89cd3e61692bd15973e4f74ac3f2bec  serefpolicy-2.2.10.tgz
+5ebd15e9870ac40f8be45b5a999750cb  serefpolicy-2.2.11.tgz



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:09:27 -0500
Subject: rpms/pychecker/devel pychecker-0.8.17-root.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 pychecker.spec, 1.17, 1.18 sources,
	1.10, 1.11 pychecker-0.8.16-root.patch, 1.1, NONE
Message-ID: <200602040409.k1449RUR026584@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/pychecker/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26515

Modified Files:
	.cvsignore pychecker.spec sources 
Added Files:
	pychecker-0.8.17-root.patch 
Removed Files:
	pychecker-0.8.16-root.patch 
Log Message:
* Sat Feb  4 2006 Miloslav Trmac <mitr at redhat.com> - 0.8.17-1
- Update to pychecker-0.8.17


pychecker-0.8.17-root.patch:
 setup.py |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE pychecker-0.8.17-root.patch ---
--- pychecker-0.8.17/setup.py.root	2006-02-04 04:57:49.000000000 +0100
+++ pychecker-0.8.17/setup.py	2006-02-04 04:59:00.000000000 +0100
@@ -134,6 +134,9 @@
          script_path = get_script_path(self.build_dir)
          if script_path in scripts:
             package_path = os.path.join(install_lib, "pychecker")
+            root = self.distribution.get_command_obj("install").root
+            if root:
+               package_path = package_path[len(root):]
             self.execute(func=create_script, 
                          args=[script_path, package_path], 
                          msg="filling in script %s" % script_path)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pychecker/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Sep 2005 02:32:22 -0000	1.10
+++ .cvsignore	4 Feb 2006 04:09:24 -0000	1.11
@@ -1 +1 @@
-pychecker-0.8.16.tar.gz
+pychecker-0.8.17.tar.gz


Index: pychecker.spec
===================================================================
RCS file: /cvs/dist/rpms/pychecker/devel/pychecker.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pychecker.spec	9 Dec 2005 22:42:51 -0000	1.17
+++ pychecker.spec	4 Feb 2006 04:09:24 -0000	1.18
@@ -1,10 +1,10 @@
 Summary:  A python source code checking tool.
 Name: pychecker
-Version: 0.8.16
-Release: 1.1
+Version: 0.8.17
+Release: 1
 URL: http://pychecker.sourceforge.net
 Source0: http://dl.sourceforge.net/pychecker/pychecker-%{version}.tar.gz
-Patch0: pychecker-0.8.16-root.patch
+Patch0: pychecker-0.8.17-root.patch
 License: BSDish
 Group: Development/Tools
 Requires: python
@@ -45,6 +45,9 @@
 %exclude /usr/lib/python*/site-packages/pychecker/VERSION
 
 %changelog
+* Sat Feb  4 2006 Miloslav Trmac <mitr at redhat.com> - 0.8.17-1
+- Update to pychecker-0.8.17
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pychecker/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Sep 2005 02:32:23 -0000	1.10
+++ sources	4 Feb 2006 04:09:24 -0000	1.11
@@ -1 +1 @@
-74b65d9c8a0dd24d76fc3127769f2ad2  pychecker-0.8.16.tar.gz
+9d2a2d62b368ce503830f830a89bd230  pychecker-0.8.17.tar.gz


--- pychecker-0.8.16-root.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:13:52 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1591.2.3,
	1.1591.2.4 3646-wireless-add-prism54usb-driver.txt, 1.1.2.1,
	NONE 3663-prism54usb-fix-build-break-in-islusb_init.c.txt,
	1.1.2.1, NONE
Message-ID: <200602040413.k144DqT7028591@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc4-9-branch
	3646-wireless-add-prism54usb-driver.txt 
	3663-prism54usb-fix-build-break-in-islusb_init.c.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.2.3
retrieving revision 1.1591.2.4
diff -u -r1.1591.2.3 -r1.1591.2.4
--- kernel-2.6.spec	4 Feb 2006 01:09:51 -0000	1.1591.2.3
+++ kernel-2.6.spec	4 Feb 2006 04:13:49 -0000	1.1591.2.4
@@ -933,99 +933,97 @@
 Patch20551: 3643-NET-Fix-some-whitespace-issues-in-af_packet.c.txt
 Patch20552: 3644-SUNGEM-Make-PM-of-PHYs-more-reliable-2.txt
 Patch20553: 3645-NET-Fix-skb-fclone-error-path-handling.txt
-Patch20554: 3646-wireless-add-prism54usb-driver.txt
-Patch20555: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
-Patch20556: 3656-AF_KEY-no-message-type-set.txt
-Patch20557: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
-Patch20558: 3663-prism54usb-fix-build-break-in-islusb_init.c.txt
-Patch20559: 3688-sundance-Really-read-addr-0.txt
-Patch20560: 3689-bonding-fix-get_settings-error-checking.txt
-Patch20561: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
-Patch20562: 3691-b44-fix-laptop-carrier-detect.txt
-Patch20563: 3692-s2io-scatter-gather-fix.txt
-Patch20564: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
-Patch20565: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
-Patch20566: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
-Patch20567: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
-Patch20568: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
-Patch20569: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
-Patch20570: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
-Patch20571: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
-Patch20572: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
-Patch20573: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
-Patch20574: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
-Patch20575: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
-Patch20576: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
-Patch20577: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
-Patch20578: 3717-ieee80211-Add-LEAP-authentication-type.txt
-Patch20579: 3718-ieee80211-add-flags-for-all-geo-channels.txt
-Patch20580: 3719-ieee80211-Add-spectrum-management-information.txt
-Patch20581: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
-Patch20582: 3721-ieee80211-TIM-information-element-parsing.txt
-Patch20583: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
-Patch20584: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
-Patch20585: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
-Patch20586: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
-Patch20587: 3753-sync-with-svn.berlios.de.txt
-Patch20588: 3754-remove-linux-version-compatibility-code.txt
-Patch20589: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
-Patch20590: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
-Patch20591: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
-Patch20592: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
-Patch20593: 3762-Typo-corrections-for-ieee80211.txt
-Patch20594: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
-Patch20595: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
-Patch20596: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
-Patch20597: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
-Patch20598: 3774-AIRO-_CS-CRYPTO-fixes.txt
-Patch20599: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
-Patch20600: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
-Patch20601: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
-Patch20602: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
-Patch20603: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
-Patch20604: 3780-ipw2100-Add-generic-geo-information.txt
-Patch20605: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
-Patch20606: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
-Patch20607: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
-Patch20608: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
-Patch20609: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
-Patch20610: 3786-ipw2200-Bluetooth-coexistence-support.txt
-Patch20611: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
-Patch20612: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
-Patch20613: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
-Patch20614: 3791-ipw2200-stack-reduction.txt
-Patch20615: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
-Patch20616: 3793-ipw2200-increase-ipw2200-driver-version.txt
-Patch20617: 3796-ipw2200-Disable-hwcrypto-by-default.txt
-Patch20618: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
-Patch20619: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
-Patch20620: 3800-IPV4-igmp-remove-pointless-printk.txt
-Patch20621: 3801-TCP-H-TCP-Fix-accounting.txt
-Patch20622: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
-Patch20623: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
-Patch20624: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
-Patch20625: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
-Patch20626: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
-Patch20627: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
-Patch20628: 3904-BRIDGE-Fix-device-delete-race.txt
-Patch20629: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
-Patch20630: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
-Patch20631: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
-Patch20632: 3962-lp486e-remove-SLOW_DOWN_IO.txt
-Patch20633: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
-Patch20634: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
-Patch20635: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
-Patch20636: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
-Patch20637: 4128-NET-snap-needs-hardware-checksum-fix.txt
-Patch20638: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
-Patch20639: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
-Patch20640: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
-Patch20641: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
-Patch20642: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
-Patch20643: 4136-TG3-Flush-tg3_reset_task.txt
-Patch20644: 4137-TG3-Update-driver-version-and-release-date.txt
-Patch20645: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
-Patch20646: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
+Patch20554: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
+Patch20555: 3656-AF_KEY-no-message-type-set.txt
+Patch20556: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
+Patch20557: 3688-sundance-Really-read-addr-0.txt
+Patch20558: 3689-bonding-fix-get_settings-error-checking.txt
+Patch20559: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
+Patch20560: 3691-b44-fix-laptop-carrier-detect.txt
+Patch20561: 3692-s2io-scatter-gather-fix.txt
+Patch20562: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
+Patch20563: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
+Patch20564: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
+Patch20565: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
+Patch20566: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
+Patch20567: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
+Patch20568: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
+Patch20569: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
+Patch20570: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
+Patch20571: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
+Patch20572: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
+Patch20573: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
+Patch20574: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
+Patch20575: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
+Patch20576: 3717-ieee80211-Add-LEAP-authentication-type.txt
+Patch20577: 3718-ieee80211-add-flags-for-all-geo-channels.txt
+Patch20578: 3719-ieee80211-Add-spectrum-management-information.txt
+Patch20579: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
+Patch20580: 3721-ieee80211-TIM-information-element-parsing.txt
+Patch20581: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
+Patch20582: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
+Patch20583: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
+Patch20584: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
+Patch20585: 3753-sync-with-svn.berlios.de.txt
+Patch20586: 3754-remove-linux-version-compatibility-code.txt
+Patch20587: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
+Patch20588: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
+Patch20589: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
+Patch20590: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
+Patch20591: 3762-Typo-corrections-for-ieee80211.txt
+Patch20592: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
+Patch20593: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
+Patch20594: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
+Patch20595: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
+Patch20596: 3774-AIRO-_CS-CRYPTO-fixes.txt
+Patch20597: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
+Patch20598: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
+Patch20599: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
+Patch20600: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
+Patch20601: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
+Patch20602: 3780-ipw2100-Add-generic-geo-information.txt
+Patch20603: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
+Patch20604: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
+Patch20605: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
+Patch20606: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
+Patch20607: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
+Patch20608: 3786-ipw2200-Bluetooth-coexistence-support.txt
+Patch20609: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
+Patch20610: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
+Patch20611: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
+Patch20612: 3791-ipw2200-stack-reduction.txt
+Patch20613: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
+Patch20614: 3793-ipw2200-increase-ipw2200-driver-version.txt
+Patch20615: 3796-ipw2200-Disable-hwcrypto-by-default.txt
+Patch20616: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
+Patch20617: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
+Patch20618: 3800-IPV4-igmp-remove-pointless-printk.txt
+Patch20619: 3801-TCP-H-TCP-Fix-accounting.txt
+Patch20620: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
+Patch20621: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
+Patch20622: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
+Patch20623: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
+Patch20624: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
+Patch20625: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
+Patch20626: 3904-BRIDGE-Fix-device-delete-race.txt
+Patch20627: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
+Patch20628: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
+Patch20629: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
+Patch20630: 3962-lp486e-remove-SLOW_DOWN_IO.txt
+Patch20631: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
+Patch20632: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
+Patch20633: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
+Patch20634: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
+Patch20635: 4128-NET-snap-needs-hardware-checksum-fix.txt
+Patch20636: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
+Patch20637: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
+Patch20638: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
+Patch20639: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
+Patch20640: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
+Patch20641: 4136-TG3-Flush-tg3_reset_task.txt
+Patch20642: 4137-TG3-Update-driver-version-and-release-date.txt
+Patch20643: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
+Patch20644: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2591,192 +2589,188 @@
 %patch20552 -p1
 # [NET]: Fix skb fclone error path handling.
 %patch20553 -p1
-# wireless: add prism54usb driver
-%patch20554 -p1
 # [BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
-%patch20555 -p1
+%patch20554 -p1
 # [AF_KEY]: no message type set
-%patch20556 -p1
+%patch20555 -p1
 # [IPV6] MLDv2: fix change records when transitioning to/from inactive
-%patch20557 -p1
-# prism54usb: fix build break in islusb_init.c
-%patch20558 -p1
+%patch20556 -p1
 # sundance: Really read addr 0
-%patch20559 -p1
+%patch20557 -p1
 # bonding: fix ->get_settings error checking
-%patch20560 -p1
+%patch20558 -p1
 # acenic: fix checking of read_eeprom_byte() return values
-%patch20561 -p1
+%patch20559 -p1
 # b44: fix laptop carrier detect
-%patch20562 -p1
+%patch20560 -p1
 # s2io: scatter-gather fix
-%patch20563 -p1
+%patch20561 -p1
 # BUG_ON() Conversion in net/tulip/xircom_cb.c
-%patch20564 -p1
+%patch20562 -p1
 # BUG_ON() Conversion in net/tulip/de2104x.c
-%patch20565 -p1
+%patch20563 -p1
 # BUG_ON() Conversion in net/tulip/winbond-840.c
-%patch20566 -p1
+%patch20564 -p1
 # mv643xx_eth: Fix spinlock recursion bug
-%patch20567 -p1
+%patch20565 -p1
 # mv643xx_eth: Update dev->last_rx on packet receive
-%patch20568 -p1
+%patch20566 -p1
 # mv643xx_eth: Remove needless mp->port_mac_addr
-%patch20569 -p1
+%patch20567 -p1
 # mv643xx_eth: Make port queue enable/disable code consistent
-%patch20570 -p1
+%patch20568 -p1
 # mv643xx_eth: use MII library for PHY management
-%patch20571 -p1
+%patch20569 -p1
 # orinoco_cs: tweak Vcc debugging messages
-%patch20572 -p1
+%patch20570 -p1
 # ieee80211: Fix problem with not decrypting broadcast packets
-%patch20573 -p1
+%patch20571 -p1
 # ieee80211: Fix iwlist scan can only show about 20 APs
-%patch20574 -p1
+%patch20572 -p1
 # ieee80211: Fix A band min and max channel definitions
-%patch20575 -p1
+%patch20573 -p1
 # WEP fields are incorrectly shown to be INSIDE snap in the doc
-%patch20576 -p1
+%patch20574 -p1
 # ieee80211: Log if netif_rx() drops the packet
-%patch20577 -p1
+%patch20575 -p1
 # ieee80211: Add LEAP authentication type
-%patch20578 -p1
+%patch20576 -p1
 # ieee80211: add flags for all geo channels
-%patch20579 -p1
+%patch20577 -p1
 # ieee80211: Add spectrum management information
-%patch20580 -p1
+%patch20578 -p1
 # ieee80211: kmalloc+memset -> kzalloc cleanups
-%patch20581 -p1
+%patch20579 -p1
 # ieee80211: TIM information element parsing
-%patch20582 -p1
+%patch20580 -p1
 # ieee80211: Add TKIP crypt->build_iv
-%patch20583 -p1
+%patch20581 -p1
 # ieee80211: Add 802.11h data type and structures
-%patch20584 -p1
+%patch20582 -p1
 # ieee80211: Add helpers for IBSS DFS handling
-%patch20585 -p1
+%patch20583 -p1
 # ieee80211: Add 802.11h information element parsing
-%patch20586 -p1
+%patch20584 -p1
 # sync with svn.berlios.de
-%patch20587 -p1
+%patch20585 -p1
 # remove linux version compatibility code.
-%patch20588 -p1
+%patch20586 -p1
 # ipw2100: Fix setting txpower failed problem
-%patch20589 -p1
+%patch20587 -p1
 # ipw2200: Fix "iwspy ethx off" causes kernel panic
-%patch20590 -p1
+%patch20588 -p1
 # ipw2200: Fix sw_reset doesn't clear the static essid problem
-%patch20591 -p1
+%patch20589 -p1
 # ipw2200: Fix a variable referenced after kfree() bug
-%patch20592 -p1
+%patch20590 -p1
 # Typo corrections for ieee80211
-%patch20593 -p1
+%patch20591 -p1
 # PCMCIA=m, HOSTAP_CS=y is not a legal configuration
-%patch20594 -p1
+%patch20592 -p1
 # [NETFILTER] nfnetlink_log: add sequence numbers for log events
-%patch20595 -p1
+%patch20593 -p1
 # [SCTP]: correct the number of INIT retransmissions
-%patch20596 -p1
+%patch20594 -p1
 # [SCTP]: heartbeats exceed maximum retransmssion limit
-%patch20597 -p1
+%patch20595 -p1
 # AIRO{,_CS} <-> CRYPTO fixes
-%patch20598 -p1
+%patch20596 -p1
 # drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
-%patch20599 -p1
+%patch20597 -p1
 # drivers/net/wireless/ipw2200: possible cleanups
-%patch20600 -p1
+%patch20598 -p1
 # ieee80211: trivial fix for misplaced ()'s
-%patch20601 -p1
+%patch20599 -p1
 # ipw2100: Add LEAP authentication algorithm support
-%patch20602 -p1
+%patch20600 -p1
 # ipw2100: Make iwconfig txpower setting consistent with user input
-%patch20603 -p1
+%patch20601 -p1
 # ipw2100: Add generic geo information
-%patch20604 -p1
+%patch20602 -p1
 # ipw2100: remove white space and better format the code
-%patch20605 -p1
+%patch20603 -p1
 # increase ipw2100 driver version to git-1.1.4
-%patch20606 -p1
+%patch20604 -p1
 # ipw2200: Fix indirect SRAM/register 8/16-bit write routines
-%patch20607 -p1
+%patch20605 -p1
 # ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
-%patch20608 -p1
+%patch20606 -p1
 # ipw2200: Add LEAP authentication algorithm support
-%patch20609 -p1
+%patch20607 -p1
 # ipw2200: Bluetooth coexistence support
-%patch20610 -p1
+%patch20608 -p1
 # ipw2200: Make LED blinking frequency independent of HZ
-%patch20611 -p1
+%patch20609 -p1
 # ipw2200: add module parameter to enable/disable roaming
-%patch20612 -p1
+%patch20610 -p1
 # ipw2200: Scale firmware loading watchdog with the firmware size
-%patch20613 -p1
+%patch20611 -p1
 # ipw2200: stack reduction
-%patch20614 -p1
+%patch20612 -p1
 # ipw2200: Fix qos_cmd param switch bug
-%patch20615 -p1
+%patch20613 -p1
 # ipw2200: increase ipw2200 driver version
-%patch20616 -p1
+%patch20614 -p1
 # ipw2200: Disable hwcrypto by default
-%patch20617 -p1
+%patch20615 -p1
 # wireless/airo: add IWENCODEEXT and IWAUTH support
-%patch20618 -p1
+%patch20616 -p1
 # wireless/ipw2200: support WE-18 WPA enc_capa
-%patch20619 -p1
+%patch20617 -p1
 # [IPV4] igmp: remove pointless printk
-%patch20620 -p1
+%patch20618 -p1
 # [TCP] H-TCP: Fix accounting
-%patch20621 -p1
+%patch20619 -p1
 # ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt
-%patch20622 -p1
+%patch20620 -p1
 # Add two management functions to ieee80211_rx.c
-%patch20623 -p1
+%patch20621 -p1
 # Clarify help text of SKGE/SK98LIN/SKY2
-%patch20624 -p1
+%patch20622 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
-%patch20625 -p1
+%patch20623 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
-%patch20626 -p1
+%patch20624 -p1
 # [IPV4]: Always set fl.proto in ip_route_newports
-%patch20627 -p1
+%patch20625 -p1
 # [BRIDGE]: Fix device delete race.
-%patch20628 -p1
+%patch20626 -p1
 # [NET]: Do not export inet_bind_bucket_create twice.
-%patch20629 -p1
+%patch20627 -p1
 # [IPV6] tcp_v6_send_synack: release the destination
-%patch20630 -p1
+%patch20628 -p1
 # [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
-%patch20631 -p1
+%patch20629 -p1
 # lp486e: remove SLOW_DOWN_IO
-%patch20632 -p1
+%patch20630 -p1
 # ipw2200: fix ->eeprom[EEPROM_VERSION] check
-%patch20633 -p1
+%patch20631 -p1
 # DocBook: fix some kernel-doc comments in net/sunrpc
-%patch20634 -p1
+%patch20632 -p1
 # SUNRPC: Fix a lock recursion in the auth_gss downcall
-%patch20635 -p1
+%patch20633 -p1
 # SUNRPC: Move upcall out of auth->au_ops->crcreate()
-%patch20636 -p1
+%patch20634 -p1
 # [NET] snap: needs hardware checksum fix
-%patch20637 -p1
+%patch20635 -p1
 # [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
-%patch20638 -p1
+%patch20636 -p1
 # [SCTP]: Fix 'fast retransmit' to send a TSN only once.
-%patch20639 -p1
+%patch20637 -p1
 # [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
-%patch20640 -p1
+%patch20638 -p1
 # [IPV6]: Fix illegal dst locking in softirq context.
-%patch20641 -p1
+%patch20639 -p1
 # [IPV4]: Remove suprious use of goto out: in icmp_reply
-%patch20642 -p1
+%patch20640 -p1
 # [TG3]: Flush tg3_reset_task()
-%patch20643 -p1
+%patch20641 -p1
 # [TG3]: Update driver version and release date.
-%patch20644 -p1
+%patch20642 -p1
 # [IPV4]: Use RCU locking in fib_rules.
-%patch20645 -p1
+%patch20643 -p1
 # [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
-%patch20646 -p1
+%patch20644 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3770,11 +3764,9 @@
 - [NET]: Fix some whitespace issues in af_packet.c
 - [SUNGEM]: Make PM of PHYs more reliable (#2)
 - [NET]: Fix skb fclone error path handling.
-- wireless: add prism54usb driver
 - [BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
 - [AF_KEY]: no message type set
 - [IPV6] MLDv2: fix change records when transitioning to/from inactive
-- prism54usb: fix build break in islusb_init.c
 - sundance: Really read addr 0
 - bonding: fix ->get_settings error checking
 - acenic: fix checking of read_eeprom_byte() return values


--- 3646-wireless-add-prism54usb-driver.txt DELETED ---


--- 3663-prism54usb-fix-build-break-in-islusb_init.c.txt DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:14:38 -0500
Subject: rpms/kernel/devel/configs config-generic,1.145,1.146
Message-ID: <200602040414.k144Ecpj028975@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
hush some net layer msgs



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- config-generic	2 Feb 2006 03:29:37 -0000	1.145
+++ config-generic	4 Feb 2006 04:14:36 -0000	1.146
@@ -559,6 +559,7 @@
 # Networking support
 #
 CONFIG_NET=y
+# CONFIG_NETDEBUG is not set
 
 # CONFIG_TCP_CONG_ADVANCED is not set
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:14:38 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1906,1.1907
Message-ID: <200602040414.k144Ec4E028966@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
hush some net layer msgs



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1906
retrieving revision 1.1907
diff -u -r1.1906 -r1.1907
--- kernel-2.6.spec	4 Feb 2006 03:02:19 -0000	1.1906
+++ kernel-2.6.spec	4 Feb 2006 04:14:35 -0000	1.1907
@@ -361,6 +361,7 @@
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-percpu-NR_CPUS.patch
+Patch1870: linux-2.6-net-suppress-msgs.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -857,6 +858,8 @@
 %patch1850 -p1
 # Fix percpu data accesses
 %patch1860 -p1
+# Suppress some network layer msgs
+%patch1870 -p1
 # Fix oops in stradis on init
 %patch1890 -p1
 
@@ -1397,6 +1400,7 @@
 - Silence noisy edac drivers.
 - Merge some patches from cpufreq git tree.
 - Fix some bogus percpu data accesses.
+- Suppress some network layer msgs
 
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:16:58 -0500
Subject: rpms/kernel/devel linux-2.6-net-suppress-msgs.patch,NONE,1.1
Message-ID: <200602040416.k144GwDl009937@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	linux-2.6-net-suppress-msgs.patch 
Log Message:
hush net layer msgs


linux-2.6-net-suppress-msgs.patch:
 include/net/sock.h |    8 ++++----
 net/Kconfig        |    7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-suppress-msgs.patch ---

If you are on a hostile network, or are running protocol tests, you can
easily get the logged swamped by messages about bad UDP and ICMP packets.
This turns those messages off unless a config option is enabled.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>

--- br-2.6.orig/include/net/sock.h
+++ br-2.6/include/net/sock.h
@@ -1354,12 +1354,12 @@ extern int sock_get_timestamp(struct soc
  *	Enable debug/info messages 
  */
 
-#if 0
-#define NETDEBUG(fmt, args...)	do { } while (0)
-#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
-#else
+#ifdef CONFIG_NETDEBUG
 #define NETDEBUG(fmt, args...)	printk(fmt,##args)
 #define LIMIT_NETDEBUG(fmt, args...) do { if (net_ratelimit()) printk(fmt,##args); } while(0)
+#else
+#define NETDEBUG(fmt, args...)	do { } while (0)
+#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
 #endif
 
 /*
--- br-2.6.orig/net/Kconfig
+++ br-2.6/net/Kconfig
@@ -27,6 +27,13 @@ if NET
 
 menu "Networking options"
 
+config NETDEBUG
+	bool "Network packet debugging"
+	help
+	  You can say Y here if you want to get additional messages useful in
+	  debugging bad packets, but can overwhelm logs under denial of service
+	  attacks.
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"




From fedora-cvs-commits at redhat.com  Sat Feb  4 04:17:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:17:31 -0500
Subject: rpms/kernel/FC-4/configs config-generic,1.53.2.1,1.53.2.2
Message-ID: <200602040417.k144HVGh010270@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv10240/configs

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -r1.53.2.1 -r1.53.2.2
--- config-generic	3 Feb 2006 22:15:11 -0000	1.53.2.1
+++ config-generic	4 Feb 2006 04:17:29 -0000	1.53.2.2
@@ -1152,7 +1152,6 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
-CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 
 #



From fedora-cvs-commits at redhat.com  Sat Feb  4 04:39:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 3 Feb 2006 23:39:54 -0500
Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.5,1.6
Message-ID: <200602040439.k144dsqJ006428@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
pause when we get long stack traces too


linux-2.6-debug-oops-pause.patch:
 traps.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-oops-pause.patch	7 Jan 2006 03:46:01 -0000	1.5
+++ linux-2.6-debug-oops-pause.patch	4 Feb 2006 04:39:51 -0000	1.6
@@ -6,8 +6,9 @@
 
 (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
+diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.15.noarch/arch/i386/kernel/traps.c oops-pause/arch/i386/kernel/traps.c
+--- linux-2.6.15.noarch/arch/i386/kernel/traps.c	2006-02-03 23:31:55.000000000 -0500
++++ oops-pause/arch/i386/kernel/traps.c	2006-02-03 23:35:44.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <linux/utsname.h>
  #include <linux/kprobes.h>
@@ -16,19 +17,39 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs
+@@ -151,6 +152,17 @@ static inline unsigned long print_contex
+ 	return ebp;
+ }
+ 
++void pause_for_two_minutes(void)
++{
++	int i;
++	for (i=120;i>0;i--) {
++		mdelay(1000);
++		touch_nmi_watchdog();
++		printk("Continuing in %d seconds. \r", i);
++	}
++	printk("\n");
++}	
++
+ static void show_trace_log_lvl(struct task_struct *task,
+ 			       unsigned long *stack, char *log_lvl)
+ {
+@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
+ 			break;
+ 		printk(KERN_EMERG " =======================\n");
++		pause_for_two_minutes();
+ 	}
+ }
+ 
+@@ -287,7 +300,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)
+ {



From fedora-cvs-commits at redhat.com  Sat Feb  4 05:11:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 00:11:56 -0500
Subject: rpms/gnome-games/devel gnome-games-2.13.6-gstreamer.patch, NONE,
	1.1 gnome-games.spec, 1.61, 1.62
Message-ID: <200602040511.k145BuYj031426@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Added Files:
	gnome-games-2.13.6-gstreamer.patch 
Log Message:
Remove dependency


gnome-games-2.13.6-gstreamer.patch:
 Makefile.am |    5 ++---
 Makefile.in |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

--- NEW FILE gnome-games-2.13.6-gstreamer.patch ---
--- gnome-games-2.13.6/gnomine/Makefile.in.gstreamer	2006-02-04 00:08:59.000000000 -0500
+++ gnome-games-2.13.6/gnomine/Makefile.in	2006-02-04 00:09:11.000000000 -0500
@@ -226,8 +226,7 @@
 	$(WARN_CFLAGS)					\
 	$(GNOME_GAMES_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\" \
-	`pkg-config --cflags gstreamer-0.8`
+	-DDATADIR=\""$(datadir)"\" 
 
 
 bin_PROGRAMS = gnomine
@@ -243,7 +242,7 @@
 	$(GNOME_GAMES_LIBS)
 
 
-gnomine_LDFLAGS = `pkg-config --libs gstreamer-0.8`
+gnomine_LDFLAGS = 
 
 schemadir = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnomine.schemas.in
--- gnome-games-2.13.6/gnomine/Makefile.am.gstreamer	2006-02-04 00:08:25.000000000 -0500
+++ gnome-games-2.13.6/gnomine/Makefile.am	2006-02-04 00:08:46.000000000 -0500
@@ -10,8 +10,7 @@
 	$(WARN_CFLAGS)					\
 	$(GNOME_GAMES_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\" \
-	`pkg-config --cflags gstreamer-0.8`
+	-DDATADIR=\""$(datadir)"\"
 
 bin_PROGRAMS = gnomine
 
@@ -24,7 +23,7 @@
 	../libgames-support/libgames-support.la \
 	$(GNOME_GAMES_LIBS)
 
-gnomine_LDFLAGS = `pkg-config --libs gstreamer-0.8`
+gnomine_LDFLAGS =
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnomine.schemas.in


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-games.spec	31 Jan 2006 03:29:31 -0000	1.61
+++ gnome-games.spec	4 Feb 2006 05:11:49 -0000	1.62
@@ -11,12 +11,14 @@
 Summary: GNOME games.
 Name: gnome-games
 Version: 2.13.6
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
 Source: gnome-games-%{version}.tar.bz2
 Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2
+Patch1: gnome-games-2.13.6-gstreamer.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome-games-devel
 URL: http://www.gnome.org
@@ -48,6 +50,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .gstreamer
+
 tar xjf %{SOURCE2}
 
 cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav
@@ -176,6 +180,9 @@
 
 
 %changelog
+* Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com> 1:2.13.6-3
+- Remove unneeded gstreamer dependency
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 1:2.13.6-1
 - Update to 2.13.6
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 05:12:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 00:12:57 -0500
Subject: rpms/gnome-games/devel gnome-games.spec,1.62,1.63
Message-ID: <200602040512.k145CvHN031616@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
try again



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnome-games.spec	4 Feb 2006 05:11:49 -0000	1.62
+++ gnome-games.spec	4 Feb 2006 05:12:52 -0000	1.63
@@ -17,7 +17,7 @@
 Group: Amusements/Games
 Source: gnome-games-%{version}.tar.bz2
 Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2
-Patch1: gnome-games-2.13.6-gstreamer.patch
+Patch0: gnome-games-2.13.6-gstreamer.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome-games-devel



From fedora-cvs-commits at redhat.com  Sat Feb  4 05:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 00:23:13 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.91,1.92
Message-ID: <200602040523.k145NDBj011033@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
Fix requires



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-vfs2.spec	19 Jan 2006 20:50:28 -0000	1.91
+++ gnome-vfs2.spec	4 Feb 2006 05:23:07 -0000	1.92
@@ -6,11 +6,12 @@
 %define perl_XML_Parser_version 2.31-16
 %define po_package gnome-vfs-2.0
 %define gnome_mount_version 0.4
+%define glib2_version 2.9.3
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.4
-Release: 6
+Release: 7
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -19,11 +20,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
-Requires:      gnome-mount >= %{gnome_mount_verion}
+Requires:      gnome-mount >= %{gnome_mount_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
-BuildRequires: bonobo-activation-devel, glib2-devel, libxml2-devel, zlib-devel
+BuildRequires: bonobo-activation-devel, libxml2-devel, zlib-devel
+BuildRequires: glib2-devel >= %(glib2_version}
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: /usr/bin/automake-1.9
@@ -34,7 +36,7 @@
 BuildRequires: krb5-devel
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= 0.5.0
-BuildRequires: gnome-mount-devel >= %{gnome_mount_verion} 
+BuildRequires: gnome-mount-devel >= %{gnome_mount_version} 
 Prereq: GConf2 >= %{gconf2_version}
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
@@ -180,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-7
+- Fix requires
+
 * Thu Jan 19 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-6
 - Test build
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 05:25:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 00:25:34 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.92,1.93
Message-ID: <200602040525.k145PYJT013451@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
Fix typo



Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-vfs2.spec	4 Feb 2006 05:23:07 -0000	1.92
+++ gnome-vfs2.spec	4 Feb 2006 05:25:31 -0000	1.93
@@ -25,7 +25,7 @@
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
 BuildRequires: bonobo-activation-devel, libxml2-devel, zlib-devel
-BuildRequires: glib2-devel >= %(glib2_version}
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: popt, bzip2-devel, ORBit2-devel, openjade
 BuildRequires: pkgconfig
 BuildRequires: /usr/bin/automake-1.9



From fedora-cvs-commits at redhat.com  Sat Feb  4 05:54:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 00:54:42 -0500
Subject: rpms/pirut/devel .cvsignore, 1.9, 1.10 pirut.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200602040554.k145sgHP004181@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4138/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.10-1 on branch devel from pirut-0.9.10-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	3 Feb 2006 23:07:59 -0000	1.9
+++ .cvsignore	4 Feb 2006 05:54:40 -0000	1.10
@@ -1 +1 @@
-pirut-0.9.9.tar.gz
+pirut-0.9.10.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pirut.spec	3 Feb 2006 23:07:59 -0000	1.10
+++ pirut.spec	4 Feb 2006 05:54:40 -0000	1.11
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.9
+Version: 0.9.10
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,10 @@
 
 
 %changelog
+* Sat Feb  4 2006 Jeremy Katz <katzj at redhat.com> - 0.9.10-1
+- Add a popup menu for selecting all/none of the optional packages in a group
+- Speed up pirut startup and list mode a bit
+
 * Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 0.9.9-1
 - Just use the group name when we don't have a description (#178089)
 - Require actually clicking on the checkboxes, not the text (#178090)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Feb 2006 23:07:59 -0000	1.10
+++ sources	4 Feb 2006 05:54:40 -0000	1.11
@@ -1 +1 @@
-2d9a9c0c9e71753628d9aa22669463eb  pirut-0.9.9.tar.gz
+cc222957792ac3f5bc1d32d4c5f1b6db  pirut-0.9.10.tar.gz



From fedora-cvs-commits at redhat.com  Sat Feb  4 08:44:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 03:44:54 -0500
Subject: rpms/glibc/devel .cvsignore, 1.136, 1.137 glibc-fedora.patch, 1.129,
	1.130 glibc.spec, 1.218, 1.219 sources, 1.158, 1.159
Message-ID: <200602040844.k148isto012265@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.3.90-36 on branch devel from glibc-2.3.90-36.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- .cvsignore	3 Feb 2006 09:58:00 -0000	1.136
+++ .cvsignore	4 Feb 2006 08:44:52 -0000	1.137
@@ -1,2 +1,2 @@
-glibc-20060203T0932.tar.bz2
-glibc-fedora-20060203T0932.tar.bz2
+glibc-20060204T0758.tar.bz2
+glibc-fedora-20060204T0758.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   68 ++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   38 ++
 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 +
 manual/filesys.texi                            |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 sysdeps/generic/dl-cache.h                     |    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 ++
 51 files changed, 786 insertions(+), 468 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- glibc-fedora.patch	3 Feb 2006 09:58:00 -0000	1.129
+++ glibc-fedora.patch	4 Feb 2006 08:44:52 -0000	1.130
@@ -1,31 +1,18 @@
---- glibc-20060203T0932/ChangeLog	3 Feb 2006 05:28:06 -0000	1.9983
-+++ glibc-20060203T0932-fedora/ChangeLog	3 Feb 2006 09:47:53 -0000	1.8782.2.160
-@@ -1,3 +1,24 @@
-+2006-02-03  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* stdlib/bits/stdlib-ldbl.h (qecvt, qfcvt, qgcvt, qecvt_r,
-+	qfcvt_r): Guard with #if defined __USE_SVID || defined
-+	__USE_XOPEN_EXTENDED.
-+
+--- glibc-20060204T0758/ChangeLog	4 Feb 2006 07:14:42 -0000	1.9986
++++ glibc-20060204T0758-fedora/ChangeLog	4 Feb 2006 08:21:09 -0000	1.8782.2.161
+@@ -25,6 +25,11 @@
+ 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
+ 	followed by __THROW.
+ 
 +	* sysdeps/unix/sysv/linux/futimesat.c (futimesat): If
 +	file == NULL, use __futimes unconditionally.
 +
 +	* manual/filesys.texi (futimes): Fix prototype.
 +
-+2006-02-02  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* math/math.h (__nldbl_nexttowardf): Put __THROW before
-+	__attribute__ ((__const__)).
-+	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
-+	followed by __THROW.
-+
-+	* math/math.h [__LDBL_COMPAT && __USE_ISOC99] (nexttowardl): New
-+	prototype.
-+
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -57,6 +78,11 @@
+@@ -84,6 +89,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -37,7 +24,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -2483,6 +2509,10 @@
+@@ -2510,6 +2520,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -48,7 +35,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2766,6 +2796,26 @@
+@@ -2793,6 +2807,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -75,7 +62,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5884,6 +5934,11 @@
+@@ -5911,6 +5945,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -87,7 +74,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6878,6 +6933,12 @@
+@@ -6905,6 +6944,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -100,7 +87,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -7002,6 +7063,17 @@
+@@ -7029,6 +7074,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -118,7 +105,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -10062,6 +10134,18 @@
+@@ -10089,6 +10145,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -137,8 +124,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060203T0932/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060203T0932-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060204T0758/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060204T0758-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.
@@ -188,8 +175,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-20060203T0932/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060203T0932-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060204T0758/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060204T0758-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.
@@ -216,8 +203,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060203T0932/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060203T0932-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060204T0758/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060204T0758-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>
@@ -298,8 +285,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060203T0932/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060203T0932-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060204T0758/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060204T0758-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;
@@ -324,8 +311,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060203T0932/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060203T0932-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060204T0758/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060204T0758-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -354,8 +341,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060203T0932/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060203T0932-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060204T0758/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060204T0758-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -457,8 +444,8 @@
      }
  
    search_dirs ();
---- glibc-20060203T0932/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060203T0932-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060204T0758/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060204T0758-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;
@@ -483,8 +470,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060203T0932/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060203T0932-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060204T0758/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060204T0758-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)
@@ -561,8 +548,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060203T0932/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060203T0932-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060204T0758/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060204T0758-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -578,16 +565,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060203T0932/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060204T0758/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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-20060203T0932/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060204T0758/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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-20060203T0932/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060203T0932-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060204T0758/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060204T0758-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
@@ -597,8 +584,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060203T0932/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060203T0932-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060204T0758/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060204T0758-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.  */
@@ -612,8 +599,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060203T0932/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060203T0932-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060204T0758/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060204T0758-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);
@@ -644,8 +631,8 @@
  
  #endif
  
---- glibc-20060203T0932/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060203T0932-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060204T0758/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060204T0758-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -737,8 +724,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060203T0932/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060203T0932-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060204T0758/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060204T0758-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,
  	}
      }
@@ -782,8 +769,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060203T0932/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060203T0932-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060204T0758/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060204T0758-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -792,8 +779,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060203T0932/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060203T0932-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060204T0758/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060204T0758-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -835,8 +822,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060203T0932/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060203T0932-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060204T0758/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060204T0758-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>"
@@ -851,8 +838,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060203T0932/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060203T0932-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060204T0758/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060204T0758-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>"
@@ -864,8 +851,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-20060203T0932/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060204T0758/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -936,8 +923,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060203T0932/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060203T0932-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060204T0758/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060204T0758-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -965,8 +952,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060203T0932/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060203T0932-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060204T0758/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060204T0758-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>
@@ -1042,8 +1029,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060203T0932/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060203T0932-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060204T0758/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060204T0758-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)
@@ -1099,8 +1086,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060203T0932/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
-+++ glibc-20060203T0932-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
+--- glibc-20060204T0758/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
++++ glibc-20060204T0758-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
 @@ -2806,7 +2806,7 @@ function.
  
  @comment sys/time.h
@@ -1110,39 +1097,8 @@
  This function is like @code{utimes}, except that it takes an open file
  descriptor as an argument instead of a file name.  @xref{Low-Level
  I/O}.  This function comes from FreeBSD, and is not available on all
---- glibc-20060203T0932/math/math.h	14 Jan 2006 12:09:22 -0000	1.70
-+++ glibc-20060203T0932-fedora/math/math.h	3 Feb 2006 09:40:56 -0000	1.68.2.3
-@@ -103,13 +103,16 @@ __BEGIN_DECLS
- 
- #   ifdef __USE_ISOC99 
- extern float __nldbl_nexttowardf (float __x, long double __y)
--				  __attribute__ ((__const__)) __THROW;
-+				  __THROW __attribute__ ((__const__));
- #    ifdef __REDIRECT_NTH
- extern float __REDIRECT_NTH (nexttowardf, (float __x, long double __y),
- 			     __nldbl_nexttowardf)
-      __attribute__ ((__const__));
- extern double __REDIRECT_NTH (nexttoward, (double __x, long double __y),
- 			      nextafter) __attribute__ ((__const__));
-+extern long double __REDIRECT_NTH (nexttowardl,
-+				   (long double __x, long double __y),
-+				   nextafter) __attribute__ ((__const__));
- #    endif
- #   endif
- 
-@@ -118,8 +121,8 @@ extern double __REDIRECT_NTH (nexttoward
- 
- #   undef __MATHDECL_1
- #   define __MATHDECL_2(type, function,suffix, args, alias) \
--  extern type __REDIRECT(__MATH_PRECNAME(function,suffix), \
--			 args, alias) __THROW
-+  extern type __REDIRECT_NTH(__MATH_PRECNAME(function,suffix), \
-+			     args, alias)
- #   define __MATHDECL_1(type, function,suffix, args) \
-   __MATHDECL_2(type, function,suffix, args, __CONCAT(function,suffix))
- #  endif
---- glibc-20060203T0932/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
-+++ glibc-20060203T0932-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
+--- glibc-20060204T0758/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
++++ glibc-20060204T0758-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
 @@ -497,6 +497,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
@@ -1183,8 +1139,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060203T0932/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060203T0932-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060204T0758/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
++++ glibc-20060204T0758-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1207,8 +1163,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060203T0932/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060203T0932-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060204T0758/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060204T0758-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;
@@ -1233,8 +1189,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060203T0932/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060204T0758/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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>
 +
@@ -1242,8 +1198,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060203T0932/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060203T0932-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+--- glibc-20060204T0758/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060204T0758-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1263,8 +1219,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060203T0932/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060203T0932-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060204T0758/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060204T0758-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1283,8 +1239,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060203T0932/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060203T0932-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060204T0758/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060204T0758-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1296,8 +1252,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060203T0932/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060203T0932-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060204T0758/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060204T0758-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
@@ -1338,8 +1294,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060203T0932/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060203T0932-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060204T0758/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060204T0758-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1349,8 +1305,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060203T0932/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060203T0932-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060204T0758/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060204T0758-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1384,8 +1340,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060203T0932/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060204T0758/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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 =
@@ -1402,24 +1358,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060203T0932/stdlib/bits/stdlib-ldbl.h	14 Jan 2006 20:14:36 -0000	1.2
-+++ glibc-20060203T0932-fedora/stdlib/bits/stdlib-ldbl.h	3 Feb 2006 09:47:53 -0000	1.2.2.2
-@@ -33,10 +33,12 @@ __LDBL_REDIR1_DECL (strtold_l, strtod_l)
- 
- __LDBL_REDIR1_DECL (__strtold_internal, __strtod_internal)
- 
--#ifdef __USE_MISC
-+#if defined __USE_SVID || defined __USE_XOPEN_EXTENDED
-+# ifdef __USE_MISC
- __LDBL_REDIR1_DECL (qecvt, ecvt)
- __LDBL_REDIR1_DECL (qfcvt, fcvt)
- __LDBL_REDIR1_DECL (qgcvt, gcvt)
- __LDBL_REDIR1_DECL (qecvt_r, ecvt_r)
- __LDBL_REDIR1_DECL (qfcvt_r, fcvt_r)
-+# endif
- #endif
---- glibc-20060203T0932/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060203T0932-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060204T0758/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060204T0758-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
@@ -1435,8 +1375,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060203T0932/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060203T0932-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060204T0758/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060204T0758-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))
@@ -1448,8 +1388,8 @@
  endif
  endif
  
---- glibc-20060203T0932/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060203T0932-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060204T0758/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060204T0758-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.  */
@@ -1801,8 +1741,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060203T0932/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060204T0758/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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.
@@ -1888,8 +1828,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060203T0932/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060203T0932-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060204T0758/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060204T0758-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);
      }
@@ -1904,8 +1844,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060204T0758-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.  */
  
@@ -1954,8 +1894,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060204T0758-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;
@@ -1998,8 +1938,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060204T0758-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"
@@ -2009,8 +1949,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060204T0758-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;
@@ -2056,8 +1996,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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.
@@ -2118,8 +2058,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060204T0758-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)
@@ -2152,24 +2092,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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-20060203T0932/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060204T0758-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-20060203T0932/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060203T0932-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060204T0758-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"_


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- glibc.spec	3 Feb 2006 09:58:00 -0000	1.218
+++ glibc.spec	4 Feb 2006 08:44:52 -0000	1.219
@@ -1,9 +1,9 @@
-%define glibcdate 20060203T0932
+%define glibcdate 20060204T0758
 %define glibcname glibc
-%define glibcsrcdir glibc-20060203T0932
+%define glibcsrcdir glibc-20060204T0758
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 35
+%define glibcrelease 36
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1245,6 +1245,12 @@
 %endif
 
 %changelog
+* Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-36
+- update from CVS
+  - fix frequency setting for ITIMER_PROF (#179938, BZ#2268)
+  - fix powerpc inline fegetround ()
+  - fix nptl_db (#179946)
+
 * Fri Feb  3 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-35
 - update from CVS
   - handle futimesat (fd, NULL, tvp) as futimes (fd, tvp)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- sources	3 Feb 2006 09:58:00 -0000	1.158
+++ sources	4 Feb 2006 08:44:52 -0000	1.159
@@ -1,2 +1,2 @@
-c51476629db3e3937ad16b4ddb106c5a  glibc-20060203T0932.tar.bz2
-c3652b41d08772d9b4778a40ca1f32d0  glibc-fedora-20060203T0932.tar.bz2
+f68a984eb9c60bfc2fb747da61739d52  glibc-20060204T0758.tar.bz2
+387c111f50df07a1ba0ec9fc58454fb5  glibc-fedora-20060204T0758.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 10:45:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 05:45:00 -0500
Subject: rpms/kdebindings/devel .cvsignore, 1.28, 1.29 kdebindings.spec, 1.38,
	1.39 sources, 1.28, 1.29
Message-ID: <200602041045.k14Aj0LM031735@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31721

Modified Files:
	.cvsignore kdebindings.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	29 Nov 2005 19:46:19 -0000	1.28
+++ .cvsignore	4 Feb 2006 10:44:58 -0000	1.29
@@ -8,3 +8,4 @@
 kdebindings-3.4.91.tar.bz2
 kdebindings-3.4.92.tar.bz2
 kdebindings-3.5.0.tar.bz2
+kdebindings-3.5.1.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdebindings.spec	9 Dec 2005 22:41:09 -0000	1.38
+++ kdebindings.spec	4 Feb 2006 10:44:58 -0000	1.39
@@ -9,7 +9,9 @@
 
 %define mozilla_version 1.7.10
 %define qt_version 3.3.5
-%define arts_version 1.4.92
+%define arts_version 1.5.1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 %define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
@@ -23,8 +25,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -65,10 +67,9 @@
 Requires: ruby >= %{rubyver}
 %endif
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires(post,postun): /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 %description
 KDE/DCOP bindings to non-C++ languages
@@ -77,7 +78,7 @@
 Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel >= 6:%{version}
+Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 
 %description devel
 Development files for the KDE bindings.
@@ -90,7 +91,7 @@
 Summary: KDE bindings to mozilla
 Group: User Interface/Desktops
 Requires: mozilla
-Requires: kdebase >= 6:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
 
 %description kmozilla
 KDE bindings to mozilla - embed Mozilla in Konqueror
@@ -99,7 +100,7 @@
 %package perl
 Summary: Perl bindings to DCOP
 Group: Development/Libraries
-Requires: kdelibs >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: perl >= 5.6.0
 
 %description perl
@@ -108,7 +109,7 @@
 %package python
 Summary: Python bindings to DCOP
 Group: Development/Libraries
-Requires: kdelibs >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: python-abi = %{pythonver}
 
 %description python
@@ -154,7 +155,7 @@
 %package kdejava
 Summary: Java bindings to KDE
 Group: Development/Libraries
-Requires: kdelibs >= 6:%{version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebindings-qtjava = %{version}-%{release}
 Requires: libgcj
 
@@ -194,13 +195,6 @@
 export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -209,16 +203,25 @@
 fi
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --enable-libsuffix="$suffix" \
    --includedir=%{_includedir}/kde \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
 %if %{final}
    --enable-final \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %ifarch %{support_arch}
    --with-java=%{prefix}
 %else


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Nov 2005 19:46:19 -0000	1.28
+++ sources	4 Feb 2006 10:44:58 -0000	1.29
@@ -1 +1 @@
-137924318ff5fc49cee3c82ee0ce5cf5  kdebindings-3.5.0.tar.bz2
+302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 11:58:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 06:58:13 -0500
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.35,1.36
Message-ID: <200602041158.k14BwDKl003919@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3885

Modified Files:
	sound-juicer.spec 
Log Message:
* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-2
- Update to use gstreamer (0.10)



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sound-juicer.spec	31 Jan 2006 04:11:03 -0000	1.35
+++ sound-juicer.spec	4 Feb 2006 11:58:10 -0000	1.36
@@ -2,7 +2,7 @@
 %define gtk_version 2.6.0
 %define libgnomeui_version 2.0.0
 %define libmusicbrainz_version 2.1.0
-%define gstreamer_version 0.8
+%define gstreamer_version 0.10.2
 %define gconf_version 2.0.0
 %define gnome_media_version 2.9.90
 %define gnome_vfs_version 2.9.90
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.13.4
-Release:        1
+Release:	2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -23,9 +23,9 @@
 Requires:	libgnomeui >= %{libgnomeui_version}
 Requires:	glib2 >= %{glib_version}
 Requires:	gtk2 >= %{gtk_version}
-Requires:	gstreamer08 >= %{gstreamer_version}
+Requires:	gstreamer >= %{gstreamer_version}
 Requires:	GConf2 >= %{gconf_version}
-Requires:	gstreamer08-plugins
+Requires:	gstreamer-plugins
 Requires:	cdparanoia
 Requires:	nautilus-cd-burner >= %{nautilus_cd_burner_version}
 Requires:	gnome-media >= %{gnome_media_version}
@@ -34,8 +34,8 @@
 BuildRequires:	libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires:	glib2-devel >= %{glib_version}
 BuildRequires:	gtk2-devel >= %{gtk_version}
-BuildRequires:	gstreamer08-devel >= %{gstreamer_version}
-BuildRequires:  gstreamer08-plugins-devel 
+BuildRequires:	gstreamer-devel >= %{gstreamer_version}
+BuildRequires:	gstreamer-plugins-good-devel
 BuildRequires:	GConf2-devel >= %{gconf_version}
 BuildRequires:  hal-devel >= %{hal_version}
 BuildRequires:  gnome-vfs2-devel >= %{gnome_vfs_version}
@@ -93,6 +93,9 @@
 %{_datadir}/omf/sound-juicer
 
 %changelog
+* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-2
+- Update to use gstreamer (0.10)
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-1
 - Update to 2.13.4
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 12:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 07:09:09 -0500
Subject: rpms/gnome-media/devel gnome-media.spec,1.56,1.57
Message-ID: <200602041209.k14C99sY006263@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gnome-media.spec 
Log Message:
* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> - 2.13.91-2
- Use gstreamer (0.10)



Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-media.spec	31 Jan 2006 03:24:49 -0000	1.56
+++ gnome-media.spec	4 Feb 2006 12:09:06 -0000	1.57
@@ -4,14 +4,14 @@
 %define libgnomeui_version 2.6.0
 %define gail_version 1.2
 %define desktop_file_utils_version 0.2.90
-%define gstreamer_version 0.8.1
+%define gstreamer_version 0.10.2
 
 %define gettext_package gnome-media-2.0
 
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.13.91
-Release:        1
+Release:        2
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -31,8 +31,8 @@
 BuildRequires:  gail-devel >= %{gail_version}
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  /usr/bin/automake-1.4
-BuildRequires:  gstreamer08-devel >= %{gstreamer_version}
-BuildRequires:  gstreamer08-plugins-devel
+BuildRequires:  gstreamer-devel >= %{gstreamer_version}
+BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  scrollkeeper
 
 %description
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> - 2.13.91-2
+- Use gstreamer (0.10)
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 12:35:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 07:35:08 -0500
Subject: rpms/xorg-x11-drv-i810/devel i810.xinf, 1.2,
	1.3 xorg-x11-drv-i810.spec, 1.8, 1.9
Message-ID: <200602041235.k14CZ8gk018598@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18583

Modified Files:
	i810.xinf xorg-x11-drv-i810.spec 
Log Message:
* Sat Feb  4 2006 Mike A. Harris <mharris at redhat.com> 1.4.1.3-3
- Added 8086:2772 mapping to i810.xinf for bug (#178451)



Index: i810.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/i810.xinf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- i810.xinf	3 Feb 2006 13:36:11 -0000	1.2
+++ i810.xinf	4 Feb 2006 12:35:06 -0000	1.3
@@ -3,6 +3,7 @@
 alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* i810
+alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* i810
 alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* i810


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-i810.spec	3 Feb 2006 13:36:11 -0000	1.8
+++ xorg-x11-drv-i810.spec	4 Feb 2006 12:35:06 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.4.1.3
-Release:   2
+Release:   3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
@@ -74,6 +74,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Sat Feb  4 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
 - Added 8086:2592 mapping to i810.xinf for bug (#172884)
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 12:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 07:42:11 -0500
Subject: rpms/gcc/devel gcc41-gc-pthread_create.patch, NONE,
	1.1 gcc41-ia64-frame-base-loclist.patch, NONE,
	1.1 gcc41-ldbl-default-libstdc++.patch, NONE,
	1.1 gcc41-ldbl-default.patch, NONE,
	1.1 gcc41-ldbl-mangle-as-g.patch, NONE, 1.1 gcc41.spec, 1.22,
	1.23 gcc41-atomic-builtins.patch, 1.2,
	NONE gcc41-gomp-20060128-merge1.patch, 1.1,
	NONE gcc41-gomp-20060128-merge2.patch, 1.1,
	NONE gcc41-gomp-20060128-merge3.patch, 1.1,
	NONE gcc41-gomp-20060128-merge4.patch, 1.1,
	NONE gcc41-gomp-20060128-merge5.patch, 1.1,
	NONE gcc41-gomp-20060128-merge6.patch, 1.1,
	NONE gcc41-ia64-stack-protector.patch, 1.1,
	NONE gcc41-java-rmic.patch, 1.1,
	NONE gcc41-libjava-libltdl.patch, 1.1,
	NONE gcc41-s390-ldbl.patch, 1.4,
	NONE gcc41-x86-mtune-generic1.patch, 1.1,
	NONE gcc41-x86-mtune-generic2.patch, 1.1,
	NONE gcc41-x86-mtune-generic3.patch, 1.1, NONE
Message-ID: <200602041242.k14CgBxm018692@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18668

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-gc-pthread_create.patch 
	gcc41-ia64-frame-base-loclist.patch 
	gcc41-ldbl-default-libstdc++.patch gcc41-ldbl-default.patch 
	gcc41-ldbl-mangle-as-g.patch 
Removed Files:
	gcc41-atomic-builtins.patch gcc41-gomp-20060128-merge1.patch 
	gcc41-gomp-20060128-merge2.patch 
	gcc41-gomp-20060128-merge3.patch 
	gcc41-gomp-20060128-merge4.patch 
	gcc41-gomp-20060128-merge5.patch 
	gcc41-gomp-20060128-merge6.patch 
	gcc41-ia64-stack-protector.patch gcc41-java-rmic.patch 
	gcc41-libjava-libltdl.patch gcc41-s390-ldbl.patch 
	gcc41-x86-mtune-generic1.patch gcc41-x86-mtune-generic2.patch 
	gcc41-x86-mtune-generic3.patch 
Log Message:
4.1.0-0.21


gcc41-gc-pthread_create.patch:
 0 files changed

--- NEW FILE gcc41-gc-pthread_create.patch ---
2006-01-31  Jakub Jelinek  <jakub at redhat.com>
	    Anthony Green  <green at redhat.com>
	    Tom Tromey  <tromey at redhat.com>

	* include/gc_ext_config.h.in: Added GC_PTHREAD_SYM_VERSION.
	* include/gc_config.h.in: Rebuilt.
	* include/gc_pthread_redirects.h (pthread_create): Conditionally
	define.
	* pthread_support.c (pthread_create_): New global.
	(constr): New function.
	(pthread_create): Conditionally renamed.
	* configure: Rebuilt.
	* configure.ac (GC_PTHREAD_SYM_VERSION): Define.

--- boehm-gc/configure.ac	(revision 110408)
+++ boehm-gc/configure.ac	(working copy)
@@ -450,6 +450,29 @@
   AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory])
 fi
 
+is_64bit=no
+test `$CC $CFLAGS -print-multi-os-directory` = "../lib64" && is_64bit=yesb
+symver=GLIBC_2.1
+case "$target" in
+  sparc*-*-linux* | s390*-*-linux*) 
+    test $is_64bit = yes && symver=GLIBC_2.2
+    ;;
+  mips*-*-linux* | sh*-*-linux* | ia64*-*-linux* | hppa*-*-linux* | \
+  cris*-*-linux*)
+    symver=GLIBC_2.2
+    ;;
+  x86_64*-*-linux*)
+    test $is_64bit = yes && symver=GLIBC_2.2.5
+    ;;
+  powerpc*-*-linux*)
+    test $is_64bit = yes && symver=GLIBC_2.3
+    ;;
+esac
+if test -n "$symver"; then
+  AC_DEFINE_UNQUOTED(GC_PTHREAD_SYM_VERSION, "$symver", [symbol version of pthread_create])
+fi
+
+
 if test -n "$with_cross_host" &&
    test x"$with_cross_host" != x"no"; then
   toolexecdir='$(exec_prefix)/$(target_noncanonical)'
--- boehm-gc/include/gc_ext_config.h.in	(revision 110408)
+++ boehm-gc/include/gc_ext_config.h.in	(working copy)
@@ -3,3 +3,5 @@
 is used by libjava/include/boehm-gc.h. */
 
 #undef THREAD_LOCAL_ALLOC
+
+#undef GC_PTHREAD_SYM_VERSION
--- boehm-gc/include/gc_pthread_redirects.h	(revision 110408)
+++ boehm-gc/include/gc_pthread_redirects.h	(working copy)
@@ -68,7 +68,9 @@
 # undef pthread_detach
 #endif
 
+#ifndef GC_PTHREAD_SYM_VERSION
 # define pthread_create GC_pthread_create
+#endif
 # define pthread_join GC_pthread_join
 # define pthread_detach GC_pthread_detach
 
--- boehm-gc/include/gc_config.h.in	(revision 110408)
+++ boehm-gc/include/gc_config.h.in	(working copy)
@@ -45,6 +45,9 @@
 /* support for Tru64 pthreads */
 #undef GC_OSF1_THREADS
 
+/* symbol version of pthread_create */
+#undef GC_PTHREAD_SYM_VERSION
+
 /* support for Solaris pthreads */
 #undef GC_SOLARIS_PTHREADS
 
--- boehm-gc/configure	(revision 110408)
+++ boehm-gc/configure	(working copy)
@@ -6627,6 +6627,33 @@
 
 fi
 
+is_64bit=no
+test `$CC $CFLAGS -print-multi-os-directory` = "../lib64" && is_64bit=yesb
+symver=GLIBC_2.1
+case "$target" in
+  sparc*-*-linux* | s390*-*-linux*)
+    test $is_64bit = yes && symver=GLIBC_2.2
+    ;;
+  mips*-*-linux* | sh*-*-linux* | ia64*-*-linux* | hppa*-*-linux* | \
+  cris*-*-linux*)
+    symver=GLIBC_2.2
+    ;;
+  x86_64*-*-linux*)
+    test $is_64bit = yes && symver=GLIBC_2.2.5
+    ;;
+  powerpc*-*-linux*)
+    test $is_64bit = yes && symver=GLIBC_2.3
+    ;;
+esac
+if test -n "$symver"; then
+
+cat >>confdefs.h <<_ACEOF
+#define GC_PTHREAD_SYM_VERSION "$symver"
+_ACEOF
+
+fi
+
+
 if test -n "$with_cross_host" &&
    test x"$with_cross_host" != x"no"; then
   toolexecdir='$(exec_prefix)/$(target_noncanonical)'
--- boehm-gc/pthread_support.c	(revision 110408)
+++ boehm-gc/pthread_support.c	(working copy)
@@ -47,6 +47,9 @@
 /*#define DEBUG_THREADS 1*/
 /*#define GC_ASSERTIONS*/
 
+#define _GNU_SOURCE
+#include <dlfcn.h>
+
 # include "gc.h"
 # include "private/pthread_support.h"
 
@@ -1193,8 +1196,35 @@
     return(result);
 }
 
+#ifdef GC_PTHREAD_SYM_VERSION
+
+/* Force constr to execute prior to main().  */
+static void constr (void) __attribute__ ((constructor));
+
+static int
+(*pthread_create_)(pthread_t *new_thread,
+		   const pthread_attr_t *attr_in,
+		   void * (*thread_execp)(void *), void *arg);
+
+static void
+constr (void)
+{
+  /* Get a pointer to the real pthread_create.  */
+  pthread_create_ = dlvsym (RTLD_NEXT, "pthread_create",
+			    GC_PTHREAD_SYM_VERSION);
+}
+
+#define GC_PTHREAD_CREATE_NAME pthread_create
+
+#else
+
+#define GC_PTHREAD_CREATE_NAME WRAP_FUNC(pthread_create)
+
+#endif
+
+
 int
-WRAP_FUNC(pthread_create)(pthread_t *new_thread,
+GC_PTHREAD_CREATE_NAME(pthread_t *new_thread,
 		  const pthread_attr_t *attr,
                   void *(*start_routine)(void *), void *arg)
 {
@@ -1255,7 +1285,7 @@
 		   pthread_self());
 #   endif
 
-    result = REAL_FUNC(pthread_create)(new_thread, attr, GC_start_routine, si);
+    result = (*pthread_create_)(new_thread, attr, GC_start_routine, si);
 
 #   ifdef DEBUG_THREADS
         GC_printf1("Started thread 0x%X\n", *new_thread);

gcc41-ia64-frame-base-loclist.patch:
 config/ia64/ia64.c |  180 +++++++++++++++++++++++++++++++++++++++--------------
 config/ia64/ia64.h |   12 +++
 config/ia64/t-ia64 |    2 
 dwarf2out.c        |   46 +++++--------
 toplev.c           |    4 -
 5 files changed, 171 insertions(+), 73 deletions(-)

--- NEW FILE gcc41-ia64-frame-base-loclist.patch ---
2006-02-03  Alexandre Oliva  <aoliva at redhat.com>

	PR debug/24444
	* config/ia64/ia64.c: Include debug.h.
	(MAX_ARTIFICIAL_LABEL_BYTES): New.
	(ia64_label_after_insn, ia64_dwarf2out_def_steady_cfa): New.
	(IA64_CHANGE_CFA_IN_EPILOGUE): Define to 0.
	(process_epilogue, process_set, process_for_unwind_directive):
	Output unwind info only if requested.  Add CFA info if requested.
	Add new arguments as needed.  Adjust callers.
	* config/ia64/ia64.h (ARG_POINTER_CFA_OFFSET): Override
	incorrect default.
	(DWARF2_FRAME_INFO): Define to zero.
	* config/ia64/t-ia64 (ia64.o): Depend on debug.h.
	* dwarf2out.c (DWARF2_FRAME_INFO): Define default.
	(dwarf2out_do_frame): Require nonzero DWARF2_UNWIND_INFO for
	-funwind-tables and -fexceptions to enable frame info.
	(dwarf2out_frame_init): Define initial CFA even if
	DWARF2_UNWIND_INFO is disabled.  Call initial_return_save if
	DWARF2_UNWIND_INFO is nonzero, not just defined.
	(dwarf2out_frame_finish): Output non-EH call frame info only
	if DWARF2_FRAME_INFO is nonzero.
	(convert_cfa_to_loc_list,
	compute_frame_pointer_to_cfa_displacement): Define even if
	unwind info is not supported.
	(gen_subprogram_die): Use the above unconditionally.  Remove
	legacy alternate code.
	* toplev.c (compile_file): Compile in call to
	dwarf2out_frame_finish if DWARF2_DEBUGGING_INFO is defined.
	(lang_dependent_init): Ditto for dwarf2out_frame_init.

--- gcc/config/ia64/ia64.c.orig	2005-12-02 18:13:36.000000000 -0200
+++ gcc/config/ia64/ia64.c	2006-02-03 04:35:36.000000000 -0200
@@ -53,6 +53,7 @@ Boston, MA 02110-1301, USA.  */
 #include "cfglayout.h"
 #include "tree-gimple.h"
 #include "intl.h"
+#include "debug.h"
 
 /* This is used for communication between ASM_OUTPUT_LABEL and
    ASM_OUTPUT_LABELREF.  */
@@ -190,8 +191,8 @@ static void final_emit_insn_group_barrie
 static void emit_predicate_relation_info (void);
 static void ia64_reorg (void);
 static bool ia64_in_small_data_p (tree);
-static void process_epilogue (void);
-static int process_set (FILE *, rtx);
+static void process_epilogue (FILE *, rtx, bool, bool);
+static int process_set (FILE *, rtx, rtx, bool, bool);
 
 static bool ia64_assemble_integer (rtx, unsigned int, int);
 static void ia64_output_function_prologue (FILE *, HOST_WIDE_INT);
@@ -7971,29 +7972,84 @@ static bool last_block;
 
 static bool need_copy_state;
 
+#ifndef MAX_ARTIFICIAL_LABEL_BYTES
+# define MAX_ARTIFICIAL_LABEL_BYTES 30
+#endif
+
+/* Emit a debugging label after a call-frame-related insn.  We'd
+   rather output the label right away, but we'd have to output it
+   after, not before, the instruction, and the instruction has not
+   been output yet.  So we emit the label after the insn, delete it to
+   avoid introducing basic blocks, and mark it as preserved, such that
+   it is still output, given that it is referenced in debug info.  */
+
+static const char *
+ia64_emit_deleted_label_after_insn (rtx insn)
+{
+  char label[MAX_ARTIFICIAL_LABEL_BYTES];
+  rtx lb = gen_label_rtx ();
+  rtx label_insn = emit_label_after (lb, insn);
+
+  LABEL_PRESERVE_P (lb) = 1;
+
+  delete_insn (label_insn);
+
+  ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (label_insn));
+
+  return xstrdup (label);
+}
+
+/* Define the CFA after INSN with the steady-state definition.  */
+
+static void
+ia64_dwarf2out_def_steady_cfa (rtx insn)
+{
+  rtx fp = frame_pointer_needed
+    ? hard_frame_pointer_rtx
+    : stack_pointer_rtx;
+
+  dwarf2out_def_cfa
+    (ia64_emit_deleted_label_after_insn (insn),
+     REGNO (fp),
+     ia64_initial_elimination_offset
+     (REGNO (arg_pointer_rtx), REGNO (fp))
+     + ARG_POINTER_CFA_OFFSET (current_function_decl));
+}
+
+/* The generic dwarf2 frame debug info generator does not define a
+   separate region for the very end of the epilogue, so refrain from
+   doing so in the IA64-specific code as well.  */
+
+#define IA64_CHANGE_CFA_IN_EPILOGUE 0
+
 /* The function emits unwind directives for the start of an epilogue.  */
 
 static void
-process_epilogue (void)
+process_epilogue (FILE *asm_out_file, rtx insn, bool unwind, bool frame)
 {
   /* If this isn't the last block of the function, then we need to label the
      current state, and copy it back in at the start of the next block.  */
 
   if (!last_block)
     {
-      fprintf (asm_out_file, "\t.label_state %d\n",
-	       ++cfun->machine->state_num);
+      if (unwind)
+	fprintf (asm_out_file, "\t.label_state %d\n",
+		 ++cfun->machine->state_num);
       need_copy_state = true;
     }
 
-  fprintf (asm_out_file, "\t.restore sp\n");
+  if (unwind)
+    fprintf (asm_out_file, "\t.restore sp\n");
+  if (IA64_CHANGE_CFA_IN_EPILOGUE && frame)
+    dwarf2out_def_cfa (ia64_emit_deleted_label_after_insn (insn),
+		       STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET);
 }
 
 /* This function processes a SET pattern looking for specific patterns
    which result in emitting an assembly directive required for unwinding.  */
 
 static int
-process_set (FILE *asm_out_file, rtx pat)
+process_set (FILE *asm_out_file, rtx pat, rtx insn, bool unwind, bool frame)
 {
   rtx src = SET_SRC (pat);
   rtx dest = SET_DEST (pat);
@@ -8009,8 +8065,11 @@ process_set (FILE *asm_out_file, rtx pat
       /* If this is the final destination for ar.pfs, then this must
 	 be the alloc in the prologue.  */
       if (dest_regno == current_frame_info.reg_save_ar_pfs)
-	fprintf (asm_out_file, "\t.save ar.pfs, r%d\n",
-		 ia64_dbx_register_number (dest_regno));
+	{
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save ar.pfs, r%d\n",
+		     ia64_dbx_register_number (dest_regno));
+	}
       else
 	{
 	  /* This must be an alloc before a sibcall.  We must drop the
@@ -8021,8 +8080,9 @@ process_set (FILE *asm_out_file, rtx pat
 	     sp" now.  */
 	  if (current_frame_info.total_size == 0 && !frame_pointer_needed)
 	    /* if haven't done process_epilogue() yet, do it now */
-	    process_epilogue ();
-	  fprintf (asm_out_file, "\t.prologue\n");
+	    process_epilogue (asm_out_file, insn, unwind, frame);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.prologue\n");
 	}
       return 1;
     }
@@ -8038,16 +8098,22 @@ process_set (FILE *asm_out_file, rtx pat
 	  gcc_assert (op0 == dest && GET_CODE (op1) == CONST_INT);
 	  
 	  if (INTVAL (op1) < 0)
-	    fprintf (asm_out_file, "\t.fframe "HOST_WIDE_INT_PRINT_DEC"\n",
-		     -INTVAL (op1));
+	    {
+	      gcc_assert (!frame_pointer_needed);
+	      if (unwind)
+		fprintf (asm_out_file, "\t.fframe "HOST_WIDE_INT_PRINT_DEC"\n",
+			 -INTVAL (op1));
+	      if (frame)
+		ia64_dwarf2out_def_steady_cfa (insn);
+	    }
 	  else
-	    process_epilogue ();
+	    process_epilogue (asm_out_file, insn, unwind, frame);
 	}
       else
 	{
 	  gcc_assert (GET_CODE (src) == REG
 		      && REGNO (src) == HARD_FRAME_POINTER_REGNUM);
-	  process_epilogue ();
+	  process_epilogue (asm_out_file, insn, unwind, frame);
 	}
 
       return 1;
@@ -8064,33 +8130,40 @@ process_set (FILE *asm_out_file, rtx pat
 	case BR_REG (0):
 	  /* Saving return address pointer.  */
 	  gcc_assert (dest_regno == current_frame_info.reg_save_b0);
-	  fprintf (asm_out_file, "\t.save rp, r%d\n",
-		   ia64_dbx_register_number (dest_regno));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save rp, r%d\n",
+		     ia64_dbx_register_number (dest_regno));
 	  return 1;
 
 	case PR_REG (0):
 	  gcc_assert (dest_regno == current_frame_info.reg_save_pr);
-	  fprintf (asm_out_file, "\t.save pr, r%d\n",
-		   ia64_dbx_register_number (dest_regno));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save pr, r%d\n",
+		     ia64_dbx_register_number (dest_regno));
 	  return 1;
 
 	case AR_UNAT_REGNUM:
 	  gcc_assert (dest_regno == current_frame_info.reg_save_ar_unat);
-	  fprintf (asm_out_file, "\t.save ar.unat, r%d\n",
-		   ia64_dbx_register_number (dest_regno));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save ar.unat, r%d\n",
+		     ia64_dbx_register_number (dest_regno));
 	  return 1;
 
 	case AR_LC_REGNUM:
 	  gcc_assert (dest_regno == current_frame_info.reg_save_ar_lc);
-	  fprintf (asm_out_file, "\t.save ar.lc, r%d\n",
-		   ia64_dbx_register_number (dest_regno));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save ar.lc, r%d\n",
+		     ia64_dbx_register_number (dest_regno));
 	  return 1;
 
 	case STACK_POINTER_REGNUM:
 	  gcc_assert (dest_regno == HARD_FRAME_POINTER_REGNUM
 		      && frame_pointer_needed);
-	  fprintf (asm_out_file, "\t.vframe r%d\n",
-		   ia64_dbx_register_number (dest_regno));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.vframe r%d\n",
+		     ia64_dbx_register_number (dest_regno));
+	  if (frame)
+	    ia64_dwarf2out_def_steady_cfa (insn);
 	  return 1;
 
 	default:
@@ -8135,35 +8208,41 @@ process_set (FILE *asm_out_file, rtx pat
 	{
 	case BR_REG (0):
 	  gcc_assert (!current_frame_info.reg_save_b0);
-	  fprintf (asm_out_file, "\t%s rp, %ld\n", saveop, off);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t%s rp, %ld\n", saveop, off);
 	  return 1;
 
 	case PR_REG (0):
 	  gcc_assert (!current_frame_info.reg_save_pr);
-	  fprintf (asm_out_file, "\t%s pr, %ld\n", saveop, off);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t%s pr, %ld\n", saveop, off);
 	  return 1;
 
 	case AR_LC_REGNUM:
 	  gcc_assert (!current_frame_info.reg_save_ar_lc);
-	  fprintf (asm_out_file, "\t%s ar.lc, %ld\n", saveop, off);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t%s ar.lc, %ld\n", saveop, off);
 	  return 1;
 
 	case AR_PFS_REGNUM:
 	  gcc_assert (!current_frame_info.reg_save_ar_pfs);
-	  fprintf (asm_out_file, "\t%s ar.pfs, %ld\n", saveop, off);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t%s ar.pfs, %ld\n", saveop, off);
 	  return 1;
 
 	case AR_UNAT_REGNUM:
 	  gcc_assert (!current_frame_info.reg_save_ar_unat);
-	  fprintf (asm_out_file, "\t%s ar.unat, %ld\n", saveop, off);
+	  if (unwind)
+	    fprintf (asm_out_file, "\t%s ar.unat, %ld\n", saveop, off);
 	  return 1;
 
 	case GR_REG (4):
 	case GR_REG (5):
 	case GR_REG (6):
 	case GR_REG (7):
-	  fprintf (asm_out_file, "\t.save.g 0x%x\n",
-		   1 << (src_regno - GR_REG (4)));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save.g 0x%x\n",
+		     1 << (src_regno - GR_REG (4)));
 	  return 1;
 
 	case BR_REG (1):
@@ -8171,24 +8250,27 @@ process_set (FILE *asm_out_file, rtx pat
 	case BR_REG (3):
 	case BR_REG (4):
 	case BR_REG (5):
-	  fprintf (asm_out_file, "\t.save.b 0x%x\n",
-		   1 << (src_regno - BR_REG (1)));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save.b 0x%x\n",
+		     1 << (src_regno - BR_REG (1)));
 	  return 1;
 
 	case FR_REG (2):
 	case FR_REG (3):
 	case FR_REG (4):
 	case FR_REG (5):
-	  fprintf (asm_out_file, "\t.save.f 0x%x\n",
-		   1 << (src_regno - FR_REG (2)));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save.f 0x%x\n",
+		     1 << (src_regno - FR_REG (2)));
 	  return 1;
 
 	case FR_REG (16): case FR_REG (17): case FR_REG (18): case FR_REG (19):
 	case FR_REG (20): case FR_REG (21): case FR_REG (22): case FR_REG (23):
 	case FR_REG (24): case FR_REG (25): case FR_REG (26): case FR_REG (27):
 	case FR_REG (28): case FR_REG (29): case FR_REG (30): case FR_REG (31):
-	  fprintf (asm_out_file, "\t.save.gf 0x0, 0x%x\n",
-		   1 << (src_regno - FR_REG (12)));
+	  if (unwind)
+	    fprintf (asm_out_file, "\t.save.gf 0x0, 0x%x\n",
+		     1 << (src_regno - FR_REG (12)));
 	  return 1;
 
 	default:
@@ -8205,8 +8287,11 @@ process_set (FILE *asm_out_file, rtx pat
 void
 process_for_unwind_directive (FILE *asm_out_file, rtx insn)
 {
-  if (flag_unwind_tables
-      || (flag_exceptions && !USING_SJLJ_EXCEPTIONS))
+  bool unwind = (flag_unwind_tables
+		 || (flag_exceptions && !USING_SJLJ_EXCEPTIONS));
+  bool frame = dwarf2out_do_frame ();
+
+  if (unwind || frame)
     {
       rtx pat;
 
@@ -8218,9 +8303,14 @@ process_for_unwind_directive (FILE *asm_
 	  /* Restore unwind state from immediately before the epilogue.  */
 	  if (need_copy_state)
 	    {
-	      fprintf (asm_out_file, "\t.body\n");
-	      fprintf (asm_out_file, "\t.copy_state %d\n",
-		       cfun->machine->state_num);
+	      if (unwind)
+		{
+		  fprintf (asm_out_file, "\t.body\n");
+		  fprintf (asm_out_file, "\t.copy_state %d\n",
+			   cfun->machine->state_num);
+		}
+	      if (IA64_CHANGE_CFA_IN_EPILOGUE && frame)
+		ia64_dwarf2out_def_steady_cfa (insn);
 	      need_copy_state = false;
 	    }
 	}
@@ -8237,7 +8327,7 @@ process_for_unwind_directive (FILE *asm_
       switch (GET_CODE (pat))
         {
 	case SET:
-	  process_set (asm_out_file, pat);
+	  process_set (asm_out_file, pat, insn, unwind, frame);
 	  break;
 
 	case PARALLEL:
@@ -8248,7 +8338,7 @@ process_for_unwind_directive (FILE *asm_
 	      {
 		rtx x = XVECEXP (pat, 0, par_index);
 		if (GET_CODE (x) == SET)
-		  process_set (asm_out_file, x);
+		  process_set (asm_out_file, x, insn, unwind, frame);
 	      }
 	    break;
 	  }
--- gcc/config/ia64/ia64.h.orig	2006-02-03 03:09:18.000000000 -0200
+++ gcc/config/ia64/ia64.h	2006-02-03 04:18:50.000000000 -0200
@@ -981,6 +981,12 @@ enum reg_class
    On some machines it may depend on the data type of the function.  */
 #define FIRST_PARM_OFFSET(FUNDECL) 0
 
+/* The CFA is defined as the SP at the call site, so we have to take
+   into account that the first argument pointer is
+   STACK_POINTER_OFFSET bytes off the stack pointer.  */
+#define ARG_POINTER_CFA_OFFSET(FNDECL) \
+  (FIRST_PARM_OFFSET (FNDECL) - STACK_POINTER_OFFSET)
+
 /* A C expression whose value is RTL representing the value of the return
    address for the frame COUNT steps up from the current frame, after the
    prologue.  */
@@ -1867,6 +1873,12 @@ do {									\
 
 #define DWARF2_DEBUGGING_INFO 1
 
+/* We do not want call-frame info to be output, since debuggers are
+   supposed to use the target unwind info.  Leave this undefined it
+   TARGET_UNWIND_INFO might ever be false.  */
+
+#define DWARF2_FRAME_INFO 0
+
 #define DWARF2_ASM_LINE_DEBUG_INFO (TARGET_DWARF2_ASM)
 
 /* Use tags for debug info labels, so that they don't break instruction
--- gcc/config/ia64/t-ia64.orig	2006-02-03 03:09:18.000000000 -0200
+++ gcc/config/ia64/t-ia64	2006-02-03 04:18:50.000000000 -0200
@@ -50,3 +50,5 @@ ia64-c.o: $(srcdir)/config/ia64/ia64-c.c
 
 # genattrtab generates very long string literals.
 insn-attrtab.o-warn = -Wno-error
+
+ia64.o: debug.h
--- gcc/dwarf2out.c.orig	2006-01-25 15:04:42.000000000 -0200
+++ gcc/dwarf2out.c	2006-02-03 05:41:57.000000000 -0200
@@ -90,20 +90,31 @@ static void dwarf2out_source_line (unsig
    DW_CFA_... = DWARF2 CFA call frame instruction
    DW_TAG_... = DWARF2 DIE tag */
 
+#ifndef DWARF2_FRAME_INFO
+# ifdef DWARF2_DEBUGGING_INFO
+#  define DWARF2_FRAME_INFO \
+  (write_symbols == DWARF2_DEBUG || write_symbols == VMS_AND_DWARF2_DEBUG)
+# else
+#  define DWARF2_FRAME_INFO 0
+# endif
+#endif
+
 /* Decide whether we want to emit frame unwind information for the current
    translation unit.  */
 
 int
 dwarf2out_do_frame (void)
 {
+  /* We want to emit correct CFA location expressions or lists, so we
+     have to return true if we're going to output debug info, even if
+     we're not going to output frame or unwind info.  */
   return (write_symbols == DWARF2_DEBUG
 	  || write_symbols == VMS_AND_DWARF2_DEBUG
-#ifdef DWARF2_FRAME_INFO
 	  || DWARF2_FRAME_INFO
-#endif
 #ifdef DWARF2_UNWIND_INFO
-	  || flag_unwind_tables
-	  || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS)
+	  || (DWARF2_UNWIND_INFO
+	      && (flag_unwind_tables
+		  || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS)))
 #endif
 	  );
 }
@@ -2575,10 +2586,12 @@ dwarf2out_frame_init (void)
   /* Generate the CFA instructions common to all FDE's.  Do it now for the
      sake of lookup_cfa.  */
 
-#ifdef DWARF2_UNWIND_INFO
   /* On entry, the Canonical Frame Address is at SP.  */
   dwarf2out_def_cfa (NULL, STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET);
-  initial_return_save (INCOMING_RETURN_ADDR_RTX);
+
+#ifdef DWARF2_UNWIND_INFO
+  if (DWARF2_UNWIND_INFO)
+    initial_return_save (INCOMING_RETURN_ADDR_RTX);
 #endif
 }
 
@@ -2586,12 +2599,7 @@ void
 dwarf2out_frame_finish (void)
 {
   /* Output call frame information.  */
-  if (write_symbols == DWARF2_DEBUG
-      || write_symbols == VMS_AND_DWARF2_DEBUG
-#ifdef DWARF2_FRAME_INFO
-      || DWARF2_FRAME_INFO
-#endif
-      )
+  if (DWARF2_FRAME_INFO)
     output_call_frame_info (0);
 
 #ifndef TARGET_UNWIND_INFO
@@ -10332,7 +10340,6 @@ tree_add_const_value_attribute (dw_die_r
     add_const_value_attribute (var_die, rtl);
 }
 
-#ifdef DWARF2_UNWIND_INFO
 /* Convert the CFI instructions for the current function into a location
    list.  This is used for DW_AT_frame_base when we targeting a dwarf2
    consumer that does not support the dwarf3 DW_OP_call_frame_cfa.  */
@@ -10439,7 +10446,6 @@ compute_frame_pointer_to_cfa_displacemen
 
   frame_pointer_cfa_offset = -offset;
 }
-#endif
 
 /* Generate a DW_AT_name attribute given some string value to be included as
    the value of the attribute.  */
@@ -11674,7 +11680,6 @@ gen_subprogram_die (tree decl, dw_die_re
       add_AT_fde_ref (subr_die, DW_AT_MIPS_fde, current_funcdef_fde);
 #endif
 
-#ifdef DWARF2_UNWIND_INFO
       /* We define the "frame base" as the function's CFA.  This is more
 	 convenient for several reasons: (1) It's stable across the prologue
 	 and epilogue, which makes it better than just a frame pointer,
@@ -11701,17 +11706,6 @@ gen_subprogram_die (tree decl, dw_die_re
 	 debugger about.  We'll need to adjust all frame_base references
 	 by this displacement.  */
       compute_frame_pointer_to_cfa_displacement ();
-#else
-      /* For targets which support DWARF2, but not DWARF2 call-frame info,
-	 we just use the stack pointer or frame pointer.  */
-      /* ??? Should investigate getting better info via callbacks, or else
-	 by interpreting the IA-64 unwind info.  */
-      {
-	rtx fp_reg
-	  = frame_pointer_needed ? hard_frame_pointer_rtx : stack_pointer_rtx;
-	add_AT_loc (subr_die, DW_AT_frame_base, reg_loc_descriptor (fp_reg));
-      }
-#endif
 
       if (cfun->static_chain_decl)
 	add_AT_location_description (subr_die, DW_AT_static_link,
--- gcc/toplev.c.orig	2006-01-26 16:20:39.000000000 -0200
+++ gcc/toplev.c	2006-02-03 04:18:51.000000000 -0200
@@ -1020,7 +1020,7 @@ compile_file (void)
   /* Do dbx symbols.  */
   timevar_push (TV_SYMOUT);
 
-#ifdef DWARF2_UNWIND_INFO
+#if defined DWARF2_DEBUGGING_INFO || defined DWARF2_UNWIND_INFO
   if (dwarf2out_do_frame ())
     dwarf2out_frame_finish ();
 #endif
@@ -1860,7 +1860,7 @@ lang_dependent_init (const char *name)
      predefined types.  */
   timevar_push (TV_SYMOUT);
 
-#ifdef DWARF2_UNWIND_INFO
+#if defined DWARF2_DEBUGGING_INFO || defined DWARF2_UNWIND_INFO
   if (dwarf2out_do_frame ())
     dwarf2out_frame_init ();
 #endif

gcc41-ldbl-default-libstdc++.patch:
 config.h.in                        |    3 +
 config/linker-map.gnu              |   79 +++++++++++++++++++++++-----
 config/locale/generic/c_locale.cc  |    9 ++-
 config/locale/gnu/c_locale.cc      |    9 ++-
 config/os/gnu-linux/ldbl-extra.ver |   19 ++++++
 configure                          |   88 ++++++++++++++++++++++++++++++-
 configure.ac                       |   19 ++++++
 include/bits/locale_facets.h       |   61 +++++++++++++++++++++
 include/bits/locale_facets.tcc     |   82 +++++++++++++++++++++++++----
 include/bits/localefwd.h           |   23 ++++++++
 src/Makefile.am                    |   31 +++++++++--
 src/Makefile.in                    |   52 +++++++++++++++---
 src/compatibility-ldbl.cc          |   73 +++++++++++++++++++++++++
 src/compatibility.cc               |  104 ++++++++++++++++++++++++++++++++++++-
 src/complex_io.cc                  |   19 ++++++
 src/istream-inst.cc                |   18 ++++++
 src/limits.cc                      |   33 +++++++++++
 src/locale-inst.cc                 |   50 +++++++++++++++++
 src/locale-misc-inst.cc            |   14 ++++
 src/locale.cc                      |   41 +++++++++++++-
 src/ostream-inst.cc                |   18 ++++++
 src/wlocale-inst.cc                |   44 +++++++++++++++
 22 files changed, 834 insertions(+), 55 deletions(-)

--- NEW FILE gcc41-ldbl-default-libstdc++.patch ---
2006-02-04  Jakub Jelinek  <jakub at redhat.com>
	    Benjamin Kosnik  <bkoz at redhat.com>

	* configure.ac (_GLIBCXX_LONG_DOUBLE_COMPAT): New check.
	If true, set also port_specific_symbol_files and create
	as_symver_specs.
	(GLIBCXX_LDBL_COMPAT): New GLIBCXX_CONDITIONAL.
	* configure: Rebuilt.
	* config.h.in: Rebuilt.
	* config/os/gnu-linux/ldbl-extra.ver: New file.
	* src/Makefile.am (libstdc++-symbol.ver): Append instead of
	insert in the middle if port specific symbol file requests it.
	(ldbl_compat_sources): New variable.
	(sources): Use it.
	(compatibility-ldbl.lo, compatibility-ldbl.o): New rules.
	* src/Makefile.in: Rebuilt.
	* config/linker-map.gnu: Make sure no __float128 symbols are
	exported.
	* include/bits/localefwd.h: Surround std::{money,num}_{get,put}
	with _GLIBCXX_BEGIN_LDBL_NAMESPACE and _GLIBCXX_END_LDBL_NAMESPACE.
	(_GLIBCXX_LDBL_NAMESPACE, _GLIBCXX_BEGIN_LDBL_NAMESPACE,
	_GLIBCXX_END_LDBL_NAMESPACE): Define.
	* include/bits/locale_facets.h: Surround std::{money,num}_{get,put}
	with _GLIBCXX_BEGIN_LDBL_NAMESPACE and _GLIBCXX_END_LDBL_NAMESPACE.
	[_GLIBCXX_LONG_DOUBLE_COMPAT] (std::money_get): Add __do_get method.
	[_GLIBCXX_LONG_DOUBLE_COMPAT] (std::money_put): Add __do_put method.
	[_GLIBCXX_LONG_DOUBLE_COMPAT] (std::num_get): Add __do_get method.
	[_GLIBCXX_LONG_DOUBLE_COMPAT] (std::num_put): Add __do_put method.
	* include/bits/locale_facets.tcc: Surround std::{money,num}_{get,put}
	with _GLIBCXX_BEGIN_LDBL_NAMESPACE and _GLIBCXX_END_LDBL_NAMESPACE.
	(std::money_get::__do_get, std::money_put::__do_put,
	std::num_get::__do_get, std::num_put::__do_put): New
	specializations.
	* src/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT] (_GLIBCXX_LOC_ID,
	_GLIBCXX_SYNC_ID): Define, use them.
	* src/compatibility-ldbl.cc: New file.
	* src/complex_io.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Add compatibility
	symbols.
	* src/istream-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/limits.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/locale-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/ostream-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/wlocale-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/compatibility.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* src/locale-misc-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
	* config/locale/generic/c_locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]:
	Likewise.
	* config/locale/gnu/c_locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.

--- libstdc++-v3/include/bits/locale_facets.h.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/include/bits/locale_facets.h	2006-02-04 10:44:51.000000000 +0100
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -1910,6 +1910,7 @@ namespace std
       ~numpunct_byname() { }
     };
 
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   /**
    *  @brief  Facet for parsing number strings.
    *
@@ -2176,13 +2177,27 @@ namespace std
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
 	     double&) const;
 
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      __do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
+	       double&) const;
+#else
       virtual iter_type
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
 	     long double&) const;
+#endif
 
       virtual iter_type
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
 	     void*&) const;
+
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
+	     long double&) const;
+#endif
       //@}
     };
 
@@ -2438,17 +2453,30 @@ namespace std
       virtual iter_type
       do_put(iter_type, ios_base&, char_type __fill, double __v) const;
 
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      __do_put(iter_type, ios_base&, char_type __fill, double __v) const;
+#else
       virtual iter_type
       do_put(iter_type, ios_base&, char_type __fill, long double __v) const;
+#endif
 
       virtual iter_type
       do_put(iter_type, ios_base&, char_type __fill, const void* __v) const;
+
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      do_put(iter_type, ios_base&, char_type __fill, long double __v) const;
+#endif
       //@}
     };
 
   template <typename _CharT, typename _OutIter>
     locale::id num_put<_CharT, _OutIter>::id;
 
+_GLIBCXX_END_LDBL_NAMESPACE
 
   /**
    *  @brief  Facet for localized string comparison.
@@ -3953,6 +3981,7 @@ namespace std
   template<typename _CharT, bool _Intl>
     const bool moneypunct_byname<_CharT, _Intl>::intl;
 
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   /**
    *  @brief  Facet for parsing monetary amounts.
    *
@@ -4064,9 +4093,16 @@ namespace std
        *  value.  This function is a hook for derived classes to change the
        *  value returned.  @see get() for details.
        */
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      __do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
+	       ios_base::iostate& __err, double& __units) const;
+#else
       virtual iter_type
       do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
 	     ios_base::iostate& __err, long double& __units) const;
+#endif
 
       /**
        *  @brief  Read and parse a monetary value.
@@ -4079,6 +4115,13 @@ namespace std
       do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
 	     ios_base::iostate& __err, string_type& __digits) const;
 
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
+	     ios_base::iostate& __err, long double& __units) const;
+#endif
+
       template<bool _Intl>
         iter_type
         _M_extract(iter_type __s, iter_type __end, ios_base& __io,
@@ -4191,9 +4234,16 @@ namespace std
        *  @param  units  Place to store result of parsing.
        *  @return  Iterator after writing.
        */
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      __do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
+	       double __units) const;
+#else
       virtual iter_type
       do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
 	     long double __units) const;
+#endif
 
       /**
        *  @brief  Format and output a monetary value.
@@ -4217,6 +4267,13 @@ namespace std
       do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
 	     const string_type& __digits) const;
 
+      // XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+      virtual iter_type
+      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
+	     long double __units) const;
+#endif
+
       template<bool _Intl>
         iter_type
         _M_insert(iter_type __s, ios_base& __io, char_type __fill,
@@ -4226,6 +4283,8 @@ namespace std
   template<typename _CharT, typename _OutIter>
     locale::id money_put<_CharT, _OutIter>::id;
 
+_GLIBCXX_END_LDBL_NAMESPACE
+
   /**
    *  @brief  Messages facet base class providing catalog typedef.
    */
--- libstdc++-v3/include/bits/locale_facets.tcc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/include/bits/locale_facets.tcc	2006-02-04 10:44:51.000000000 +0100
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -272,6 +272,8 @@ namespace std
   __verify_grouping(const char* __grouping, size_t __grouping_size,
 		    const string& __grouping_tmp);
 
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
+
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
@@ -446,6 +448,8 @@ namespace std
       return __beg;
     }
 
+_GLIBCXX_END_LDBL_NAMESPACE
+
   template<typename _ValueT>
     struct __to_unsigned_type
     { typedef _ValueT __type; };
@@ -460,6 +464,8 @@ namespace std
     { typedef unsigned long long __type; };
 #endif
 
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
+
   template<typename _CharT, typename _InIter>
     template<typename _ValueT>
       _InIter
@@ -772,6 +778,21 @@ namespace std
       return __beg;
     }
 
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+  template<typename _CharT, typename _InIter>
+    _InIter
+    num_get<_CharT, _InIter>::
+    __do_get(iter_type __beg, iter_type __end, ios_base& __io,
+	     ios_base::iostate& __err, double& __v) const
+    {
+      string __xtrc;
+      __xtrc.reserve(32);
+      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
+      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
+      return __beg;
+    }
+#endif
+
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
@@ -822,6 +843,8 @@ namespace std
       __len = static_cast<int>(__w);
     }
 
+_GLIBCXX_END_LDBL_NAMESPACE
+
   // Forwarding functions to peel signed from unsigned integer types and
   // either cast or compute the absolute value for the former, depending
   // on __basefield.
@@ -911,6 +934,8 @@ namespace std
       return __bufend - __buf;
     }
 
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
+
   template<typename _CharT, typename _OutIter>
     void
     num_put<_CharT, _OutIter>::
@@ -1233,6 +1258,14 @@ namespace std
     do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
     { return _M_insert_float(__s, __io, __fill, char(), __v); }
 
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+  template<typename _CharT, typename _OutIter>
+    _OutIter
+    num_put<_CharT, _OutIter>::
+    __do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
+    { return _M_insert_float(__s, __io, __fill, char(), __v); }
+#endif
+
   template<typename _CharT, typename _OutIter>
     _OutIter
     num_put<_CharT, _OutIter>::
@@ -1474,6 +1507,23 @@ namespace std
 	return __beg;
       }
 
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+  template<typename _CharT, typename _InIter>
+    _InIter
+    money_get<_CharT, _InIter>::
+    __do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
+	     ios_base::iostate& __err, double& __units) const
+    {
+      string __str;
+      if (__intl)
+	__beg = _M_extract<true>(__beg, __end, __io, __err, __str);
+      else
+	__beg = _M_extract<false>(__beg, __end, __io, __err, __str);
+      std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
+      return __beg;
+    }
+#endif
+
   template<typename _CharT, typename _InIter>
     _InIter
     money_get<_CharT, _InIter>::
@@ -1678,7 +1728,18 @@ namespace std
 	__io.width(0);
 	return __s;    
       }
-  
+
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+  template<typename _CharT, typename _OutIter>
+    _OutIter
+    money_put<_CharT, _OutIter>::
+    __do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
+	     double __units) const
+    {
+      return this->do_put(__s, __intl, __io, __fill, (long double) __units);
+    }
+#endif
+
   template<typename _CharT, typename _OutIter>
     _OutIter
     money_put<_CharT, _OutIter>::
@@ -1726,6 +1787,7 @@ namespace std
     { return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
 	            : _M_insert<false>(__s, __io, __fill, __digits); }
 
+_GLIBCXX_END_LDBL_NAMESPACE
 
   // NB: Not especially useful. Without an ios_base object or some
   // kind of locale reference, we are left clawing at the air where
@@ -2511,12 +2573,12 @@ namespace std
   extern template class moneypunct<char, true>;
   extern template class moneypunct_byname<char, false>;
   extern template class moneypunct_byname<char, true>;
-  extern template class money_get<char>;
-  extern template class money_put<char>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE money_get<char>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE money_put<char>;
   extern template class numpunct<char>;
   extern template class numpunct_byname<char>;
-  extern template class num_get<char>;
-  extern template class num_put<char>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE num_get<char>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE num_put<char>;
   extern template class __timepunct<char>;
   extern template class time_put<char>;
   extern template class time_put_byname<char>;
@@ -2638,12 +2700,12 @@ namespace std
   extern template class moneypunct<wchar_t, true>;
   extern template class moneypunct_byname<wchar_t, false>;
   extern template class moneypunct_byname<wchar_t, true>;
-  extern template class money_get<wchar_t>;
-  extern template class money_put<wchar_t>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE money_get<wchar_t>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE money_put<wchar_t>;
   extern template class numpunct<wchar_t>;
   extern template class numpunct_byname<wchar_t>;
-  extern template class num_get<wchar_t>;
-  extern template class num_put<wchar_t>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE num_get<wchar_t>;
+  extern template class _GLIBCXX_LDBL_NAMESPACE num_put<wchar_t>;
   extern template class __timepunct<wchar_t>;
   extern template class time_put<wchar_t>;
   extern template class time_put_byname<wchar_t>;
--- libstdc++-v3/include/bits/localefwd.h.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/include/bits/localefwd.h	2006-02-04 10:50:30.000000000 +0100
@@ -49,6 +49,25 @@
 
 namespace std
 {
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
+# define _GLIBCXX_LDBL_NAMESPACE __gnu_cxx_ldbl128::
+# define _GLIBCXX_BEGIN_LDBL_NAMESPACE namespace __gnu_cxx_ldbl128 {
+# define _GLIBCXX_END_LDBL_NAMESPACE }
+  namespace __gnu_cxx_ldbl128
+    {
+      using namespace ::std;
+    }
+  using namespace __gnu_cxx_ldbl128 __attribute__((__strong__));
+#else
+# define _GLIBCXX_LDBL_NAMESPACE
+# define _GLIBCXX_BEGIN_LDBL_NAMESPACE
+# define _GLIBCXX_END_LDBL_NAMESPACE
+#endif
+
+    // 22.1.1 Locale
+    class locale;
+  
+
   // 22.1.1 Locale
   class locale;
 
@@ -129,10 +148,12 @@ namespace std
     class codecvt_byname;
 
   // 22.2.2 and 22.2.3 numeric
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   template<typename _CharT, typename _InIter = istreambuf_iterator<_CharT> >
     class num_get;
   template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
     class num_put;
+_GLIBCXX_END_LDBL_NAMESPACE
   template<typename _CharT> class numpunct;
   template<typename _CharT> class numpunct_byname;
 
@@ -155,10 +176,12 @@ namespace std
 
   // 22.2.6 money
   class money_base;
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
     class money_get;
   template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
     class money_put;
+_GLIBCXX_END_LDBL_NAMESPACE
   template<typename _CharT, bool _Intl = false>
     class moneypunct;
   template<typename _CharT, bool _Intl = false>
--- libstdc++-v3/src/complex_io.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/complex_io.cc	2006-02-04 10:59:33.000000000 +0100
@@ -1,6 +1,6 @@
 // The template and inlines for the -*- C++ -*- complex number classes.
 
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -91,3 +91,20 @@ namespace std
                const complex<long double>&);
 #endif //_GLIBCXX_USE_WCHAR_T
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+
+_GLIBCXX_LDBL_COMPAT (_ZStlsIdcSt11char_traitsIcEERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E,
+		      _ZStlsIecSt11char_traitsIcEERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E);
+_GLIBCXX_LDBL_COMPAT (_ZStlsIdwSt11char_traitsIwEERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E,
+		      _ZStlsIewSt11char_traitsIwEERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E);
+_GLIBCXX_LDBL_COMPAT (_ZStrsIdcSt11char_traitsIcEERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E,
+		      _ZStrsIecSt11char_traitsIcEERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E);
+_GLIBCXX_LDBL_COMPAT (_ZStrsIdwSt11char_traitsIwEERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E,
+		      _ZStrsIewSt11char_traitsIwEERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/src/locale.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/locale.cc	2006-02-04 11:11:16.000000000 +0100
@@ -1,4 +1,4 @@
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -41,6 +41,20 @@ namespace __gnu_internal
   static __glibcxx_mutex_define_initialized(locale_cache_mutex);
 }
 
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+# define _GLIBCXX_LOC_ID(mangled) extern std::locale::id mangled
+_GLIBCXX_LOC_ID (_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+# ifdef _GLIBCXX_USE_WCHAR_T
+_GLIBCXX_LOC_ID (_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+_GLIBCXX_LOC_ID (_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+# endif
+#endif
+
 namespace std 
 {
   // Definitions for static const data members of locale.
@@ -398,9 +412,28 @@ namespace std 
   locale::id::_M_id() const
   {
     if (!_M_index)
-      _M_index = 1 + __gnu_cxx::__exchange_and_add(&_S_refcount, 1);
+      {
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+	locale::id *f = 0;
+# define _GLIBCXX_SYNC_ID(facet, mangled) \
+	if (this == &::mangled)				\
+	  f = &facet::id
+	_GLIBCXX_SYNC_ID (num_get<char>, _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+	_GLIBCXX_SYNC_ID (num_put<char>, _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+	_GLIBCXX_SYNC_ID (money_get<char>, _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+	_GLIBCXX_SYNC_ID (money_put<char>, _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
+# ifdef _GLIBCXX_USE_WCHAR_T
+	_GLIBCXX_SYNC_ID (num_get<wchar_t>, _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+	_GLIBCXX_SYNC_ID (num_put<wchar_t>, _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+	_GLIBCXX_SYNC_ID (money_get<wchar_t>, _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+	_GLIBCXX_SYNC_ID (money_put<wchar_t>, _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
+# endif
+	if (f)
+	  _M_index = 1 + f->_M_id();
+	else
+#endif
+	  _M_index = 1 + __gnu_cxx::__exchange_and_add(&_S_refcount, 1);
+      }
     return _M_index - 1;
   }
 } // namespace std
-
-
--- libstdc++-v3/src/limits.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/limits.cc	2006-02-04 11:07:20.000000000 +0100
@@ -1,6 +1,6 @@
 // Static data members of -*- C++ -*- numeric_limits classes
 
-// Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -447,3 +447,34 @@ namespace std 
   const bool numeric_limits<long double>::tinyness_before;
   const float_round_style numeric_limits<long double>::round_style;
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_NUM_LIM_COMPAT(type, member, len) \
+  extern "C" type _ZNSt14numeric_limitsIeE ## len ## member ## E \
+  __attribute__ ((alias ("_ZNSt14numeric_limitsIdE" #len #member "E")))
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_specialized, 14);
+_GLIBCXX_NUM_LIM_COMPAT (int, digits, 6);
+_GLIBCXX_NUM_LIM_COMPAT (int, digits10, 8);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_signed, 9);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_integer, 10);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_exact, 8);
+_GLIBCXX_NUM_LIM_COMPAT (int, radix, 5);
+_GLIBCXX_NUM_LIM_COMPAT (int, min_exponent, 12);
+_GLIBCXX_NUM_LIM_COMPAT (int, min_exponent10, 14);
+_GLIBCXX_NUM_LIM_COMPAT (int, max_exponent, 12);
+_GLIBCXX_NUM_LIM_COMPAT (int, max_exponent10, 14);
+_GLIBCXX_NUM_LIM_COMPAT (bool, has_infinity, 12);
+_GLIBCXX_NUM_LIM_COMPAT (bool, has_quiet_NaN, 13);
+_GLIBCXX_NUM_LIM_COMPAT (bool, has_signaling_NaN, 17);
+_GLIBCXX_NUM_LIM_COMPAT (std::float_denorm_style, has_denorm, 10);
+_GLIBCXX_NUM_LIM_COMPAT (bool, has_denorm_loss, 15);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_iec559, 9);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_bounded, 10);
+_GLIBCXX_NUM_LIM_COMPAT (bool, is_modulo, 9);
+_GLIBCXX_NUM_LIM_COMPAT (bool, traps, 5);
+_GLIBCXX_NUM_LIM_COMPAT (bool, tinyness_before, 15);
+_GLIBCXX_NUM_LIM_COMPAT (std::float_round_style, round_style, 11);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/src/Makefile.am.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/Makefile.am	2006-02-04 10:44:51.000000000 +0100
@@ -35,10 +35,15 @@ libstdc++-symbol.ver:  ${glibcxx_srcdir}
 		$(port_specific_symbol_files)
 	cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
 	if test "x$(port_specific_symbol_files)" != x; then \
-	  sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
-	  sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
-	  cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
-	  rm tmp.top tmp.bottom; \
+	  if grep '^# Appended to version file.' \
+	       $(port_specific_symbol_files) /dev/null > /dev/null 2>&1; then \
+	    cat $(port_specific_symbol_files) >> $@; \
+	  else \
+	    sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
+	    sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
+	    cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
+	    rm tmp.top tmp.bottom; \
+	  fi; \
 	fi
 
 if ENABLE_SYMVERS_GNU
@@ -113,6 +118,12 @@ c++locale.cc: ${glibcxx_srcdir}/$(CLOCAL
 basic_file.cc: ${glibcxx_srcdir}/$(BASIC_FILE_CC)
 	$(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_CC) ./$@ || true
 
+if GLIBCXX_LDBL_COMPAT
+ldbl_compat_sources = compatibility-ldbl.cc
+else
+ldbl_compat_sources =
+endif
+
 # Sources present in the src directory.
 sources = \
 	bitmap_allocator.cc \
@@ -160,7 +171,8 @@ sources = \
 	wlocale-inst.cc \
 	wstring-inst.cc \
 	${host_sources} \
-	${host_sources_extra}
+	${host_sources_extra} \
+	${ldbl_compat_sources}
 
 VPATH = $(top_srcdir)/src:$(top_srcdir)
 
@@ -191,6 +203,15 @@ concept-inst.lo: concept-inst.cc
 concept-inst.o: concept-inst.cc
 	$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
+if GLIBCXX_LDBL_COMPAT
+# Use special rules for compatibility-ldbl.cc compilation, as we need to
+# pass -mlong-double-64.
+compatibility-ldbl.lo: compatibility-ldbl.cc
+	$(LTCXXCOMPILE) -mlong-double-64 -c $<
+compatibility-ldbl.o: compatibility-ldbl.cc
+	$(CXXCOMPILE) -mlong-double-64 -c $<
+endif
+
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
 # set this option because CONFIG_CXXFLAGS has to be after
--- libstdc++-v3/src/Makefile.in.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/Makefile.in	2006-02-04 10:52:41.000000000 +0100
@@ -59,11 +59,27 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
 toolexeclibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+am__libstdc___la_SOURCES_DIST = bitmap_allocator.cc pool_allocator.cc \
+	mt_allocator.cc codecvt.cc compatibility.cc complex_io.cc \
+	ctype.cc debug.cc debug_list.cc functexcept.cc \
+	globals_locale.cc globals_io.cc ios.cc ios_failure.cc \
+	ios_init.cc ios_locale.cc limits.cc list.cc locale.cc \
+	locale_init.cc locale_facets.cc localename.cc stdexcept.cc \
+	strstream.cc tree.cc allocator-inst.cc concept-inst.cc \
+	fstream-inst.cc ext-inst.cc ios-inst.cc iostream-inst.cc \
+	istream-inst.cc istream.cc locale-inst.cc locale-misc-inst.cc \
+	misc-inst.cc ostream-inst.cc sstream-inst.cc streambuf-inst.cc \
+	streambuf.cc string-inst.cc valarray-inst.cc wlocale-inst.cc \
+	wstring-inst.cc atomicity.cc codecvt_members.cc \
+	collate_members.cc ctype_members.cc messages_members.cc \
+	monetary_members.cc numeric_members.cc time_members.cc \
+	basic_file.cc c++locale.cc compatibility-ldbl.cc
 am__objects_1 = atomicity.lo codecvt_members.lo collate_members.lo \
 	ctype_members.lo messages_members.lo monetary_members.lo \
 	numeric_members.lo time_members.lo
 am__objects_2 = basic_file.lo c++locale.lo
-am__objects_3 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
+ at GLIBCXX_LDBL_COMPAT_TRUE@am__objects_3 = compatibility-ldbl.lo
+am__objects_4 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
 	codecvt.lo compatibility.lo complex_io.lo ctype.lo debug.lo \
 	debug_list.lo functexcept.lo globals_locale.lo globals_io.lo \
 	ios.lo ios_failure.lo ios_init.lo ios_locale.lo limits.lo \
@@ -74,8 +90,9 @@ am__objects_3 = bitmap_allocator.lo pool
 	locale-inst.lo locale-misc-inst.lo misc-inst.lo \
 	ostream-inst.lo sstream-inst.lo streambuf-inst.lo streambuf.lo \
 	string-inst.lo valarray-inst.lo wlocale-inst.lo \
-	wstring-inst.lo $(am__objects_1) $(am__objects_2)
-am_libstdc___la_OBJECTS = $(am__objects_3)
+	wstring-inst.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3)
+am_libstdc___la_OBJECTS = $(am__objects_4)
 libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
@@ -84,7 +101,7 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 SOURCES = $(libstdc___la_SOURCES)
-DIST_SOURCES = $(libstdc___la_SOURCES)
+DIST_SOURCES = $(am__libstdc___la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -152,6 +169,8 @@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HE
 GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@
 GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@
 GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
+GLIBCXX_LDBL_COMPAT_FALSE = @GLIBCXX_LDBL_COMPAT_FALSE@
+GLIBCXX_LDBL_COMPAT_TRUE = @GLIBCXX_LDBL_COMPAT_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -302,6 +321,8 @@ host_sources_extra = \
 	basic_file.cc \
 	c++locale.cc
 
+ at GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 
+ at GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
 
 # Sources present in the src directory.
 sources = \
@@ -350,7 +371,8 @@ sources = \
 	wlocale-inst.cc \
 	wstring-inst.cc \
 	${host_sources} \
-	${host_sources_extra}
+	${host_sources_extra} \
+	${ldbl_compat_sources}
 
 libstdc___la_SOURCES = $(sources)
 libstdc___la_LIBADD = \
@@ -677,10 +699,15 @@ libstdc++-symbol.ver:  ${glibcxx_srcdir}
 		$(port_specific_symbol_files)
 	cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
 	if test "x$(port_specific_symbol_files)" != x; then \
-	  sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
-	  sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
-	  cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
-	  rm tmp.top tmp.bottom; \
+	  if grep '^# Appended to version file.' \
+	       $(port_specific_symbol_files) /dev/null > /dev/null 2>&1; then \
+	    cat $(port_specific_symbol_files) >> $@; \
+	  else \
+	    sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \
+	    sed -n '/DO NOT DELETE/,$$p' $@ > tmp.bottom; \
+	    cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \
+	    rm tmp.top tmp.bottom; \
+	  fi; \
 	fi
 @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE at libstdc++-symbol.explist : libstdc++-symbol.ver \
 @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@		${glibcxx_srcdir}/scripts/make_exports.pl \
@@ -733,6 +760,13 @@ concept-inst.lo: concept-inst.cc
 concept-inst.o: concept-inst.cc
 	$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
+# Use special rules for compatibility-ldbl.cc compilation, as we need to
+# pass -mlong-double-64.
+ at GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.lo: compatibility-ldbl.cc
+ at GLIBCXX_LDBL_COMPAT_TRUE@	$(LTCXXCOMPILE) -mlong-double-64 -c $<
+ at GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.o: compatibility-ldbl.cc
+ at GLIBCXX_LDBL_COMPAT_TRUE@	$(CXXCOMPILE) -mlong-double-64 -c $<
+
 # Added bits to build debug library.
 @GLIBCXX_BUILD_DEBUG_TRUE at all-local: build_debug
 @GLIBCXX_BUILD_DEBUG_TRUE at install-data-local: install_debug
--- libstdc++-v3/src/istream-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/istream-inst.cc	2006-02-04 11:02:40.000000000 +0100
@@ -1,6 +1,6 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -68,3 +68,19 @@ namespace std
   template wistream& operator>>(wistream&, _Setw);
 #endif
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+_GLIBCXX_LDBL_COMPAT (_ZNSirsERd, _ZNSirsERe);
+_GLIBCXX_LDBL_COMPAT (_ZNSt13basic_istreamIwSt11char_traitsIwEErsERd,
+		      _ZNSt13basic_istreamIwSt11char_traitsIwEErsERe);
+// These 2 are in GCC 4.2+ only so far
+// _GLIBCXX_LDBL_COMPAT (_ZNSi10_M_extractIdEERSiRT_,
+//			 _ZNSi10_M_extractIeEERSiRT_);
+// _GLIBCXX_LDBL_COMPAT (_ZNSt13basic_istreamIwSt11char_traitsIwEE10_M_extractIdEERS2_RT_,
+//			 _ZNSt13basic_istreamIwSt11char_traitsIwEE10_M_extractIeEERS2_RT_);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/src/locale-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/locale-inst.cc	2006-02-04 11:08:05.000000000 +0100
@@ -1,6 +1,6 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -37,6 +37,7 @@
 // Instantiation configuration.
 #ifndef C
 # define C char
+# define C_is_char
 #endif
 
 namespace std
@@ -48,6 +49,7 @@ namespace std
   template struct __moneypunct_cache<C, true>;
   template class moneypunct_byname<C, false>;
   template class moneypunct_byname<C, true>;
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   template class money_get<C, istreambuf_iterator<C> >;
   template class money_put<C, ostreambuf_iterator<C> >;
   template
@@ -73,11 +75,13 @@ namespace std
     money_put<C, ostreambuf_iterator<C> >::
     _M_insert<false>(ostreambuf_iterator<C>, ios_base&, C, 
 		     const string_type&) const;
+_GLIBCXX_END_LDBL_NAMESPACE
 
   // numpunct, numpunct_byname, num_get, and num_put
   template class numpunct<C>;
   template struct __numpunct_cache<C>;
   template class numpunct_byname<C>;
+_GLIBCXX_BEGIN_LDBL_NAMESPACE
   template class num_get<C, istreambuf_iterator<C> >;
   template class num_put<C, ostreambuf_iterator<C> >; 
   template
@@ -161,7 +165,8 @@ namespace std
     num_put<C, ostreambuf_iterator<C> >::
     _M_insert_float(ostreambuf_iterator<C>, ios_base&, C, char, 
 		    long double) const;
-  
+_GLIBCXX_END_LDBL_NAMESPACE
+
   // time_get and time_put
   template class __timepunct<C>;
   template struct __timepunct_cache<C>;
@@ -314,3 +319,44 @@ namespace std
 		  ios_base::fmtflags, bool);
 #endif
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined C_is_char
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES4_S4_RSt8ios_basecT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES3_S3_RSt8ios_basecT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES4_S4_RSt8ios_basecT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES3_S3_RSt8ios_basecT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES4_S4_RSt8ios_basecT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES3_S3_RSt8ios_basecT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES4_S4_RSt8ios_basecT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES3_S3_RSt8ios_basecT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES4_S4_RSt8ios_baseccT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_,
+		     _ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE10_M_extractILb0EEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRSs,
+		     _ZNKSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE10_M_extractILb0EEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRSs);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE10_M_extractILb1EEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRSs,
+		     _ZNKSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE10_M_extractILb1EEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRSs);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES4_S4_RSt8ios_basecRKSs,
+		     _ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES3_S3_RSt8ios_basecRKSs);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES4_S4_RSt8ios_basecRKSs,
+		     _ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES3_S3_RSt8ios_basecRKSs);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/src/compatibility.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/compatibility.cc	2006-02-04 10:57:50.000000000 +0100
@@ -1,6 +1,6 @@
 // Compatibility symbols for previous versions -*- C++ -*-
 
-// Copyright (C) 2005
+// Copyright (C) 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -49,6 +49,7 @@
 #include <istream>
 #include <fstream>
 #include <sstream>
+#include <cmath>
 
 namespace std
 {
@@ -362,6 +363,107 @@ namespace std
 
 #endif
 
+// gcc-4.1.0
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+#define _GLIBCXX_MATHL_WRAPPER(name, argdecl, args, ver) \
+extern "C" double						\
+__ ## name ## l_wrapper argdecl					\
+{								\
+  return name args;						\
+}								\
+asm (".symver __" #name "l_wrapper, " #name "l@" #ver)
+
+#define _GLIBCXX_MATHL_WRAPPER1(name, ver) \
+  _GLIBCXX_MATHL_WRAPPER (name, (double x), (x), ver)
+
+#define _GLIBCXX_MATHL_WRAPPER2(name, ver) \
+  _GLIBCXX_MATHL_WRAPPER (name, (double x, double y), (x, y), ver)
+
+#ifdef _GLIBCXX_HAVE_ACOSL
+_GLIBCXX_MATHL_WRAPPER1 (acos, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_ASINL
+_GLIBCXX_MATHL_WRAPPER1 (asin, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_ATAN2L
+_GLIBCXX_MATHL_WRAPPER2 (atan2, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_ATANL
+_GLIBCXX_MATHL_WRAPPER1 (atan, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_CEILL
+_GLIBCXX_MATHL_WRAPPER1 (ceil, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_COSHL
+_GLIBCXX_MATHL_WRAPPER1 (cosh, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_COSL
+_GLIBCXX_MATHL_WRAPPER1 (cos, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_EXPL
+_GLIBCXX_MATHL_WRAPPER1 (exp, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_FLOORL
+_GLIBCXX_MATHL_WRAPPER1 (floor, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_FMODL
+_GLIBCXX_MATHL_WRAPPER2 (fmod, GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_FREXPL
+_GLIBCXX_MATHL_WRAPPER (frexp, (double x, int *y), (x, y), GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_HYPOTL
+_GLIBCXX_MATHL_WRAPPER2 (hypot, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_LDEXPL
+_GLIBCXX_MATHL_WRAPPER (ldexp, (double x, int y), (x, y), GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_LOG10L
+_GLIBCXX_MATHL_WRAPPER1 (log10, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_LOGL
+_GLIBCXX_MATHL_WRAPPER1 (log, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_MODFL
+_GLIBCXX_MATHL_WRAPPER (modf, (double x, double *y), (x, y), GLIBCXX_3.4.3);
+#endif
+#ifdef _GLIBCXX_HAVE_POWL
+_GLIBCXX_MATHL_WRAPPER2 (pow, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_SINHL
+_GLIBCXX_MATHL_WRAPPER1 (sinh, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_SINL
+_GLIBCXX_MATHL_WRAPPER1 (sin, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_SQRTL
+_GLIBCXX_MATHL_WRAPPER1 (sqrt, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_TANHL
+_GLIBCXX_MATHL_WRAPPER1 (tanh, GLIBCXX_3.4);
+#endif
+#ifdef _GLIBCXX_HAVE_TANL
+_GLIBCXX_MATHL_WRAPPER1 (tan, GLIBCXX_3.4);
+#endif
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+extern void *_ZTVN10__cxxabiv123__fundamental_type_infoE[];
+extern void *_ZTVN10__cxxabiv119__pointer_type_infoE[];
+extern __attribute__((used, weak)) const char _ZTSe[2] = "e";
+extern __attribute__((used, weak)) const char _ZTSPe[3] = "Pe";
+extern __attribute__((used, weak)) const char _ZTSPKe[4] = "PKe";
+extern __attribute__((used, weak)) const void *_ZTIe[2]
+  = { (void *) &_ZTVN10__cxxabiv123__fundamental_type_infoE[2],
+      (void *) _ZTSe };
+extern __attribute__((used, weak)) const void *_ZTIPe[4]
+  = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
+      (void *) _ZTSPe, (void *) 0L, (void *) _ZTIe };
+extern __attribute__((used, weak)) const void *_ZTIPKe[4]
+  = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
+      (void *) _ZTSPKe, (void *) 1L, (void *) _ZTIe };
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
+
 #ifdef __APPLE__
 #if (defined(__ppc__) || defined (__ppc64__)) && defined (PIC)
 /* __eprintf shouldn't have been made visible from libstdc++, or
--- libstdc++-v3/src/ostream-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/ostream-inst.cc	2006-02-04 11:13:41.000000000 +0100
@@ -1,6 +1,6 @@
 // Explicit instantiation file.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -74,3 +74,19 @@ namespace std
   template wostream& operator<<(wostream&, _Setw);
 #endif
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+_GLIBCXX_LDBL_COMPAT (_ZNSolsEd, _ZNSolsEe);
+_GLIBCXX_LDBL_COMPAT (_ZNSt13basic_ostreamIwSt11char_traitsIwEElsEd,
+		      _ZNSt13basic_ostreamIwSt11char_traitsIwEElsEe);
+// These 2 are in GCC 4.2+ only so far
+// _GLIBCXX_LDBL_COMPAT (_ZNSo9_M_insertIdEERSoT_,
+//			 _ZNSo9_M_insertIeEERSoT_);
+// _GLIBCXX_LDBL_COMPAT (_ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIdEERS2_T_,
+//			 _ZNSt13basic_ostreamIwSt11char_traitsIwEE9_M_insertIeEERS2_T_);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/src/wlocale-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/wlocale-inst.cc	2006-02-04 10:44:51.000000000 +0100
@@ -1,6 +1,7 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -36,4 +37,45 @@
 #ifdef _GLIBCXX_USE_WCHAR_T
 #define C wchar_t
 #include "locale-inst.cc"
+
+// XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRT_,
+		     _ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES4_S4_RSt8ios_basewT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES3_S3_RSt8ios_basewT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES4_S4_RSt8ios_basewT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES3_S3_RSt8ios_basewT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES4_S4_RSt8ios_basewT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES3_S3_RSt8ios_basewT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES4_S4_RSt8ios_basewT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES3_S3_RSt8ios_basewT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1287num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES4_S4_RSt8ios_basewcT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_,
+		     _ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIeEES3_S3_RSt8ios_basewcT_);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE10_M_extractILb0EEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRSs,
+		     _ZNKSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE10_M_extractILb0EEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRSs);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE10_M_extractILb1EEES4_S4_S4_RSt8ios_baseRSt12_Ios_IostateRSs,
+		     _ZNKSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE10_M_extractILb1EEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRSs);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES4_S4_RSt8ios_basewRKSbIwS3_SaIwEE,
+		     _ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE);
+_GLIBCXX_LDBL_COMPAT(_ZNKSt17__gnu_cxx_ldbl1289money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES4_S4_RSt8ios_basewRKSbIwS3_SaIwEE,
+		     _ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
 #endif
--- libstdc++-v3/src/compatibility-ldbl.cc.jj	2006-02-04 10:44:51.000000000 +0100
+++ libstdc++-v3/src/compatibility-ldbl.cc	2006-02-04 10:44:51.000000000 +0100
@@ -0,0 +1,73 @@
+// Compatibility symbols for -mlong-double-64 compatibility -*- C++ -*-
+
+// Copyright (C) 2006
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library 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 library 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 library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#include <locale>
+
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#ifdef __LONG_DOUBLE_128__
+#error "compatibility-ldbl.cc must be compiled with -mlong-double-64"
+#endif
+
+namespace std
+{
+#define C char
+  template class num_get<C, istreambuf_iterator<C> >;
+  template class num_put<C, ostreambuf_iterator<C> >;
+  template class money_get<C, istreambuf_iterator<C> >;
+  template class money_put<C, ostreambuf_iterator<C> >;
+  template const num_put<C>& use_facet<num_put<C> >(const locale&);
+  template const num_get<C>& use_facet<num_get<C> >(const locale&);
+  template const money_put<C>& use_facet<money_put<C> >(const locale&);
+  template const money_get<C>& use_facet<money_get<C> >(const locale&);
+  template bool has_facet<num_put<C> >(const locale&);
+  template bool has_facet<num_get<C> >(const locale&);
+  template bool has_facet<money_put<C> >(const locale&);
+  template bool has_facet<money_get<C> >(const locale&);
+#undef C
+#ifdef _GLIBCXX_USE_WCHAR_T
+#define C wchar_t
+  template class num_get<C, istreambuf_iterator<C> >;
+  template class num_put<C, ostreambuf_iterator<C> >;
+  template class money_get<C, istreambuf_iterator<C> >;
+  template class money_put<C, ostreambuf_iterator<C> >;
+  template const num_put<C>& use_facet<num_put<C> >(const locale&);
+  template const num_get<C>& use_facet<num_get<C> >(const locale&);
+  template const money_put<C>& use_facet<money_put<C> >(const locale&);
+  template const money_get<C>& use_facet<money_get<C> >(const locale&);
+  template bool has_facet<num_put<C> >(const locale&);
+  template bool has_facet<num_get<C> >(const locale&);
+  template bool has_facet<money_put<C> >(const locale&);
+  template bool has_facet<money_get<C> >(const locale&);
+#undef C
+#endif
+}
+
+#endif
--- libstdc++-v3/src/locale-misc-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
+++ libstdc++-v3/src/locale-misc-inst.cc	2006-02-04 11:09:18.000000000 +0100
@@ -1,6 +1,7 @@
 // Locale support -*- C++ -*-
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2006
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -45,3 +46,14 @@ namespace std
     __convert_from_v(char*, const int, const char*, long double, 
 		     const __c_locale&, int);
 } // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT
+
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
+
+_GLIBCXX_LDBL_COMPAT(_ZSt16__convert_from_vIdEiPciPKcT_RKP15__locale_structi,
+		     _ZSt16__convert_from_vIeEiPciPKcT_RKP15__locale_structi);
+
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/config/locale/gnu/c_locale.cc.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/config/locale/gnu/c_locale.cc	2006-02-04 11:15:05.000000000 +0100
@@ -1,6 +1,6 @@
 // Wrapper for underlying C-language localization -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -132,3 +132,10 @@ namespace std
 {
   const char* const* const locale::_S_categories = __gnu_cxx::category_names;
 }  // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct);
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/config/locale/generic/c_locale.cc.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/config/locale/generic/c_locale.cc	2006-02-04 11:14:41.000000000 +0100
@@ -1,6 +1,6 @@
 // Wrapper for underlying C-language localization -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -168,3 +168,10 @@ namespace std
 {
   const char* const* const locale::_S_categories = __gnu_cxx::category_names;
 }  // namespace std
+
+// XXX GLIBCXX_ABI Deprecated
+#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
+#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
+  extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct);
+#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
--- libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver.jj	2006-02-04 10:44:51.000000000 +0100
+++ libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver	2006-02-04 11:15:33.000000000 +0100
@@ -0,0 +1,19 @@
+# Appended to version file.
+
+GLIBCXX_LDBL_3.4 {
+  _ZNSt14numeric_limitsIg*;
+  _ZNSirsERg;
+  _ZNSolsEg;
+  _ZNSt13basic_istreamIwSt11char_traitsIwEErsERg;
+  _ZNSt13basic_ostreamIwSt11char_traitsIwEElsEg;
+  _ZSt14__convert_to_vIgEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct;
+  _ZStlsIg[cw]St11char_traitsI[cw]EERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E;
+  _ZStrsIg[cw]St11char_traitsI[cw]EERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E;
+  *__gnu_cxx_ldbl128*;
+};
+
+CXXABI_LDBL_1.3 {
+  _ZT[IS]g;
+  _ZT[IS]Pg;
+  _ZT[IS]PKg;
+};
--- libstdc++-v3/config/linker-map.gnu.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/config/linker-map.gnu	2006-02-04 12:15:12.000000000 +0100
@@ -1,6 +1,6 @@
 ## Linker script for GNU ld 2.13.91+ only.
 ##
-## Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+## Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ##
@@ -44,7 +44,10 @@ GLIBCXX_3.4 {
       std::basic_[j-n]*;
       std::basic_o[a-e]*;
 #     std::basic_ofstream;
-      std::basic_o[g-z]*;
+#     std::basic_o[g-z]*;
+      std::basic_o[g-r]*;
+      std::basic_ostr[a-d]*;
+      std::basic_ostr[f-z]*;
       std::basic_[p-r]*;
       std::basic_streambuf*;
 #     std::basic_string
@@ -88,7 +91,14 @@ GLIBCXX_3.4 {
       std::locale::_[J-Ra-z]*;
       std::locale::_S_normalize_category*;
       std::locale::_[T-Za-z]*;
-      std::[A-Zm-r]*;
+#     std::[A-Zm-r]*;
+      std::[A-Zmp-r]*;
+      std::n[^u]*;
+      std::nu[^m]*;
+      std::num[^e]*;
+      std::ostrstream*;
+      std::out_of_range*;
+      std::overflow_error*;
       std::set_new_handler*;
       std::set_terminate*;
       std::set_unexpected*;
@@ -256,7 +266,7 @@ GLIBCXX_3.4 {
     _ZNSi[0-9][a-h]*;
     _ZNSi[0-9][j-z]*;
     _ZNSi6ignoreE[il][il];
-    _ZNSirsE*;
+    _ZNSirsE*[^g];
 
     # std::basic_istream<wchar_t>
     _ZNSt13basic_istreamIwSt11char_traitsIwEEC*;
@@ -265,7 +275,7 @@ GLIBCXX_3.4 {
     _ZNSt13basic_istreamIwSt11char_traitsIwEE[0-9][a-h]*;
     _ZNSt13basic_istreamIwSt11char_traitsIwEE[0-9][j-z]*;
     _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[il][ijlm];
-    _ZNSt13basic_istreamIwSt11char_traitsIwEErsE*;
+    _ZNSt13basic_istreamIwSt11char_traitsIwEErsE*[^g];
 
     # std::istream operators and inserters
     _ZSt7getlineI[cw]St11char_traitsI[cw]ESaI[cw]EERSt13basic_istream*;
@@ -277,6 +287,37 @@ GLIBCXX_3.4 {
     _ZStrsIe[cw]St11char_traitsI[cw]EERSt13basic_istream*;
     _ZStrsIf[cw]St11char_traitsI[cw]EERSt13basic_istream*;
 
+    # std::basic_ostream<char>
+    _ZNSoC*;
+    _ZNSoD*;
+    _ZNKSo6sentrycvbEv;
+    _ZNSo8_M_write*;
+    _ZNSo[0-9][a-z]*;
+    _ZNSolsE*[^g];
+
+    # std::basic_ostream<wchar_t>
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEEC*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEED*;
+    _ZNKSt13basic_ostreamIwSt11char_traitsIwEE[0-9][a-z]*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE3putEw;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE5flushEv;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE5seekpE*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE5tellpEv;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE5writeEPKw*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE6sentry*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEE8_M_write*;
+    _ZNSt13basic_ostreamIwSt11char_traitsIwEElsE*[^g];
+
+    # std::ostream operators and inserters
+    _ZSt4end[ls]I[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZSt5flushI[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZStlsI[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZStlsI[cw]St11char_traitsI[cw]ESaI[cw]EERSt13basic_ostream*;
+    _ZStlsISt11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZStlsId[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZStlsIe[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+    _ZStlsIf[cw]St11char_traitsI[cw]EERSt13basic_ostream*;
+
     # std::locale destructors
     _ZNSt6localeD*;
 	
@@ -292,14 +333,23 @@ GLIBCXX_3.4 {
     _ZNSt8ios_base4InitD*;
 
     # bool std::has_facet 
-    _ZSt9has_facet*;
+    _ZSt9has_facetIS*;
 
     # std::num_get
     _ZNKSt7num_getI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEE*;
 
+    # std::num_put
+    _ZNKSt7num_putI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEE*;
+
     # std::money_get
     _ZNKSt9money_getI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEE*;
 
+    # std::money_put
+    _ZNKSt9money_putI[cw]St19ostreambuf_iteratorI[cw]St11char_traitsI[cw]EEE*;
+
+    # std::numeric_limits
+    _ZNSt14numeric_limitsI[^g]*;
+
     # std::_Rb_tree
     _ZSt18_Rb_tree_decrementPKSt18_Rb_tree_node_base;
     _ZSt18_Rb_tree_decrementPSt18_Rb_tree_node_base;
@@ -327,7 +377,7 @@ GLIBCXX_3.4 {
     _ZNSt12__basic_fileIcED*;
 
     # std::__convert_to_v
-    _ZSt14__convert_to_v*;
+    _ZSt14__convert_to_vI[^g]*;
 
     # __gnu_cxx::stdio_sync_filebuf
     _ZTVN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EEE;
@@ -399,7 +449,8 @@ GLIBCXX_3.4 {
     _ZTSN9__gnu_cxx13stdio_filebufI[cw]St11char_traitsI[cw]EEE;
 
     # function-scope static objects requires a guard variable.
-    _ZGVNSt*;
+    _ZGVNSt[^1]*;
+    _ZGVNSt1[^7]*;
 
     # virtual function thunks
     _ZThn8_NS*;
@@ -659,9 +710,9 @@ CXXABI_1.3 {
     _ZTVN10__cxxabiv121__vmi_class_type_infoE;
 
     # typeinfo structure (and some names)
-    _ZTI[a-z];
-    _ZTIP[a-z];
-    _ZTIPK[a-z];
+    _ZTI[a-fh-z];
+    _ZTIP[a-fh-z];
+    _ZTIPK[a-fh-z];
     _ZTIN10__cxxabiv117__array_type_infoE;
     _ZTIN10__cxxabiv117__class_type_infoE;
     _ZTIN10__cxxabiv116__enum_type_infoE;
@@ -674,9 +725,9 @@ CXXABI_1.3 {
     _ZTIN10__cxxabiv121__vmi_class_type_infoE;
 
     # typeinfo name
-    _ZTS[a-z];
-    _ZTSP[a-z];
-    _ZTSPK[a-z];
+    _ZTS[a-fh-z];
+    _ZTSP[a-fh-z];
+    _ZTSPK[a-fh-z];
     _ZTSN10__cxxabiv117__array_type_infoE;
     _ZTSN10__cxxabiv117__class_type_infoE;
     _ZTSN10__cxxabiv116__enum_type_infoE;
--- libstdc++-v3/configure.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/configure	2006-02-04 10:48:27.000000000 +0100
@@ -309,7 +309,7 @@ ac_includes_default="\
 # 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 libtool_VERSION multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar glibcxx_builddir glibcxx_srcdir toplevel_srcdir CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LN_S AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOL CXXCPP CPPFLAGS enable_shared enable_static GLIBCXX_HOSTED_TRU!
E GLIBCXX_HOSTED_FALSE GLIBCXX_BUILD_PCH_TRUE GLIBCXX_BUILD_PCH_FALSE glibcxx_PCHFLAGS CSTDIO_H BASIC_FILE_H BASIC_FILE_CC CPP EGREP check_msgfmt glibcxx_MOFILES glibcxx_POFILES glibcxx_localedir USE_NLS CLOCALE_H CMESSAGES_H CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_H CTIME_CC CLOCALE_CC CLOCALE_INTERNAL_H ALLOCATOR_H ALLOCATOR_NAME C_INCLUDE_DIR GLIBCXX_C_HEADERS_C_TRUE GLIBCXX_C_HEADERS_C_FALSE GLIBCXX_C_HEADERS_C_STD_TRUE GLIBCXX_C_HEADERS_C_STD_FALSE GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE DEBUG_FLAGS GLIBCXX_BUILD_DEBUG_TRUE GLIBCXX_BUILD_DEBUG_FALSE EXTRA_CXX_FLAGS glibcxx_thread_h WERROR SECTION_FLAGS SECTION_LDFLAGS OPT_LDFLAGS LIBMATHOBJS LIBICONV SYMVER_MAP port_specific_symbol_files ENABLE_SYMVERS_GNU_TRUE ENABLE_SYMVERS_GNU_FALSE ENABLE_SYMVERS_DARWIN_EXPORT_TRUE ENABLE_SYMVERS_DARWIN_EXPORT_FALSE baseline_dir ATOMICITY_SRCDIR ATOMIC_WORD_SRCDIR CPU_DEFINES_SRCDIR ABI_TWEAKS_SRCDIR OS_INC_SRCDIR!
 glibcxx_prefixdir gxx_include_dir glibcxx_toolexecdir glibcx!
 x_toolex
eclibdir GLIBCXX_INCLUDES TOPLEVEL_INCLUDES OPTIMIZE_CXXFLAGS WARN_FLAGS LIBSUPCXX_PICFLAGS 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 libtool_VERSION multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar glibcxx_builddir glibcxx_srcdir toplevel_srcdir CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LN_S AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOL CXXCPP CPPFLAGS enable_shared enable_static GLIBCXX_HOSTED_TRU!
E GLIBCXX_HOSTED_FALSE GLIBCXX_BUILD_PCH_TRUE GLIBCXX_BUILD_PCH_FALSE glibcxx_PCHFLAGS CSTDIO_H BASIC_FILE_H BASIC_FILE_CC CPP EGREP check_msgfmt glibcxx_MOFILES glibcxx_POFILES glibcxx_localedir USE_NLS CLOCALE_H CMESSAGES_H CCODECVT_CC CCOLLATE_CC CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_H CTIME_CC CLOCALE_CC CLOCALE_INTERNAL_H ALLOCATOR_H ALLOCATOR_NAME C_INCLUDE_DIR GLIBCXX_C_HEADERS_C_TRUE GLIBCXX_C_HEADERS_C_FALSE GLIBCXX_C_HEADERS_C_STD_TRUE GLIBCXX_C_HEADERS_C_STD_FALSE GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE DEBUG_FLAGS GLIBCXX_BUILD_DEBUG_TRUE GLIBCXX_BUILD_DEBUG_FALSE EXTRA_CXX_FLAGS glibcxx_thread_h WERROR SECTION_FLAGS SECTION_LDFLAGS OPT_LDFLAGS LIBMATHOBJS LIBICONV SYMVER_MAP port_specific_symbol_files ENABLE_SYMVERS_GNU_TRUE ENABLE_SYMVERS_GNU_FALSE ENABLE_SYMVERS_DARWIN_EXPORT_TRUE ENABLE_SYMVERS_DARWIN_EXPORT_FALSE GLIBCXX_LDBL_COMPAT_TRUE GLIBCXX_LDBL_COMPAT_FALSE baseline_dir ATOMICITY_SRCDIR ATOMIC_WORD_SRCDIR!
 CPU_DEFINES_SRCDIR ABI_TWEAKS_SRCDIR OS_INC_SRCDIR glibcxx_p!
 refixdir
 gxx_include_dir glibcxx_toolexecdir glibcxx_toolexeclibdir GLIBCXX_INCLUDES TOPLEVEL_INCLUDES OPTIMIZE_CXXFLAGS WARN_FLAGS LIBSUPCXX_PICFLAGS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -87881,6 +87881,72 @@ echo "${ECHO_T}$glibcxx_ptrdiff_t_is_i" 
 echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;}
 
 
+ac_ldbl_compat=no
+case "$target" in
+  powerpc*-*-*gnu* | \
+  sparc*-*-linux* | \
+  s390*-*-linux* | \
+  alpha*-*-linux*)
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#if !defined __LONG_DOUBLE_128__ || (defined(__sparc__) && defined(__arch64__))
+#error no need for long double compatibility
+#endif
+
+  ;
+  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
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_ldbl_compat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_ldbl_compat=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test "$ac_ldbl_compat" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _GLIBCXX_LONG_DOUBLE_COMPAT 1
+_ACEOF
+
+    port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver"
+  fi
+esac
+
+
 # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE.
 
   if $GLIBCXX_IS_NATIVE ; then
@@ -88733,6 +88799,17 @@ fi
 
 
 
+if test $ac_ldbl_compat = yes; then
+  GLIBCXX_LDBL_COMPAT_TRUE=
+  GLIBCXX_LDBL_COMPAT_FALSE='#'
+else
+  GLIBCXX_LDBL_COMPAT_TRUE='#'
+  GLIBCXX_LDBL_COMPAT_FALSE=
+fi
+
+
+
+
 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
@@ -89088,6 +89165,13 @@ echo "$as_me: error: conditional \"ENABL
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${GLIBCXX_LDBL_COMPAT_TRUE}" && test -z "${GLIBCXX_LDBL_COMPAT_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"GLIBCXX_LDBL_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"GLIBCXX_LDBL_COMPAT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -89758,6 +89842,8 @@ s, at ENABLE_SYMVERS_GNU_TRUE@,$ENABLE_SYMV
 s, at ENABLE_SYMVERS_GNU_FALSE@,$ENABLE_SYMVERS_GNU_FALSE,;t t
 s, at ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@,$ENABLE_SYMVERS_DARWIN_EXPORT_TRUE,;t t
 s, at ENABLE_SYMVERS_DARWIN_EXPORT_FALSE@,$ENABLE_SYMVERS_DARWIN_EXPORT_FALSE,;t t
+s, at GLIBCXX_LDBL_COMPAT_TRUE@,$GLIBCXX_LDBL_COMPAT_TRUE,;t t
+s, at GLIBCXX_LDBL_COMPAT_FALSE@,$GLIBCXX_LDBL_COMPAT_FALSE,;t t
 s, at baseline_dir@,$baseline_dir,;t t
 s, at ATOMICITY_SRCDIR@,$ATOMICITY_SRCDIR,;t t
 s, at ATOMIC_WORD_SRCDIR@,$ATOMIC_WORD_SRCDIR,;t t
--- libstdc++-v3/configure.ac.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/configure.ac	2006-02-04 10:44:55.000000000 +0100
@@ -281,6 +281,25 @@ fi
 # This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no.
 GLIBCXX_ENABLE_SYMVERS([yes])
 
+ac_ldbl_compat=no
+case "$target" in
+  powerpc*-*-*gnu* | \
+  sparc*-*-linux* | \
+  s390*-*-linux* | \
+  alpha*-*-linux*)
+  AC_TRY_COMPILE(, [
+#if !defined __LONG_DOUBLE_128__ || (defined(__sparc__) && defined(__arch64__))
+#error no need for long double compatibility
+#endif
+  ], [ac_ldbl_compat=yes], [ac_ldbl_compat=no])
+  if test "$ac_ldbl_compat" = yes; then
+    AC_DEFINE([_GLIBCXX_LONG_DOUBLE_COMPAT],1,
+	      [Define if compatibility should be provided for -mlong-double-64.])
+    port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver"
+  fi
+esac
+GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes)
+
 # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE.
 GLIBCXX_CONFIGURE_TESTSUITE
 
--- libstdc++-v3/config.h.in.jj	2006-02-04 10:42:45.000000000 +0100
+++ libstdc++-v3/config.h.in	2006-02-04 10:44:55.000000000 +0100
@@ -658,6 +658,9 @@
 /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
 #undef _GLIBCXX_HOSTED
 
+/* Define if compatibility should be provided for -mlong-double-64. */
+#undef _GLIBCXX_LONG_DOUBLE_COMPAT
+
 /* Define if ptrdiff_t is int. */
 #undef _GLIBCXX_PTRDIFF_T_IS_INT
 

gcc41-ldbl-default.patch:
 config.in               |    6 ++++++
 config/alpha/alpha.c    |    5 +++++
 config/rs6000/linux.h   |    5 +++++
 config/rs6000/linux64.h |    5 +++++
 config/s390/s390.c      |    5 +++++
 config/sparc/linux.h    |   27 ++++++++++++++-------------
 config/sparc/linux64.h  |   41 ++++++++++++++++++-----------------------
 config/sparc/sparc.c    |    5 +++++
 configure               |   43 ++++++++++++++++++++++++++++++++++++++++++-
 configure.ac            |   33 +++++++++++++++++++++++++++++++++
 10 files changed, 138 insertions(+), 37 deletions(-)

--- NEW FILE gcc41-ldbl-default.patch ---
2006-02-04  Jakub Jelinek  <jakub at redhat.com>

	* config/sparc/linux.h (TARGET_OS_CPP_BUILTINS): Define
	__LONG_DOUBLE_128__ if TARGET_LONG_DOUBLE_128.
	(CPP_SUBTARGET_SPEC): Don't add -D__LONG_DOUBLE_128__ here.
	* config/sparc/linux64.h (TARGET_OS_CPP_BUILTINS): Define
	__LONG_DOUBLE_128__ if TARGET_LONG_DOUBLE_128 and TARGET_ARCH32.
	(CPP_ARCH32_SPEC): Remove.

2006-02-03  Aldy Hernandez  <aldyh at redhat.com>

	* config/s390/s390.c (override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

	* config/alpha/alpha.c (override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

	* config/sparc/sparc.c (sparc_override_options): Handle
	TARGET_DEFAULT_LONG_DOUBLE_128.

2006-02-04  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/linux.h [TARGET_DEFAULT_LONG_DOUBLE_128]
	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.
	* config/rs6000/linux64.h [TARGET_DEFAULT_LONG_DOUBLE_128]
	(RS6000_DEFAULT_LONG_DOUBLE_SIZE): Define to 128.

	* configure.ac: Add --with{out}-long-double-128 configure option.
	(TARGET_DEFAULT_LONG_DOUBLE_128): New test.
	* configure: Rebuilt.
	* config.in: Rebuilt.

--- gcc/config/rs6000/linux.h.jj	2006-02-04 11:46:38.000000000 +0100
+++ gcc/config/rs6000/linux.h	2006-02-04 11:47:18.000000000 +0100
@@ -120,3 +120,8 @@
 #endif
 
 #define POWERPC_LINUX
+
+/* ppc linux has 128-bit long double support in glibc 2.4 and later.  */
+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
+#endif
--- gcc/config/rs6000/linux64.h.jj	2006-02-04 11:46:38.000000000 +0100
+++ gcc/config/rs6000/linux64.h	2006-02-04 11:47:37.000000000 +0100
@@ -570,3 +570,8 @@ while (0)
 #endif
 
 #define POWERPC_LINUX
+
+/* ppc{32,64} linux has 128-bit long double support in glibc 2.4 and later.  */
+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
+#endif
--- gcc/configure.ac.jj	2006-02-04 10:42:42.000000000 +0100
+++ gcc/configure.ac	2006-02-04 10:44:51.000000000 +0100
@@ -3135,6 +3135,39 @@ if test x$gcc_cv_libc_provides_ssp = xye
 	    [Define if your target C library provides stack protector support])
 fi
 
+# Check if TFmode long double should be used by default or not.
+# Some glibc targets used DFmode long double, but with glibc 2.4
+# and later they can use TFmode.
+case "$target" in
+  powerpc*-*-*gnu* | \
+  sparc*-*-linux* | \
+  s390*-*-linux* | \
+  alpha*-*-linux*)
+    AC_ARG_WITH(long-double-128,
+[  --with-long-double-128  Use 128-bit long double by default.],
+      gcc_cv_target_ldbl128="$with_long_double_128",
+      [gcc_cv_target_ldbl128=no
+      if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
+	if test "x$with_sysroot" = x; then
+	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+	elif test "x$with_sysroot" = xyes; then
+	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
+	else
+	  glibc_header_dir="${with_sysroot}/usr/include"
+	fi
+      else
+	glibc_header_dir=/usr/include
+      fi
+      grep '^[ 	]*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
+        $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+      && gcc_cv_target_ldbl128=yes])
+    ;;
+esac
+if test x$gcc_cv_target_ldbl128 = xyes; then
+  AC_DEFINE(TARGET_DEFAULT_LONG_DOUBLE_128, 1,
+	    [Define if TFmode long double should be the default])
+fi
+
 # Find out what GC implementation we want, or may, use.
 AC_ARG_WITH(gc,
 [  --with-gc={page,zone}   choose the garbage collection mechanism to use
--- gcc/configure.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/configure	2006-02-04 10:46:54.000000000 +0100
@@ -931,6 +931,7 @@ Optional Packages:
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-system-libunwind use installed libunwind
+  --with-long-double-128  Use 128-bit long double by default.
   --with-gc={page,zone}   choose the garbage collection mechanism to use
                           with the compiler
   --with-system-zlib      use installed libz
@@ -7492,7 +7493,7 @@ if test "${gcc_cv_prog_makeinfo_modern+s
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:7495: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:7496: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[2-9]*)
@@ -16227,6 +16228,46 @@ _ACEOF
 
 fi
 
+# Check if TFmode long double should be used by default or not.
+# Some glibc targets used DFmode long double, but with glibc 2.4
+# and later they can use TFmode.
+case "$target" in
+  powerpc*-*-*gnu* | \
+  sparc*-*-linux* | \
+  s390*-*-linux* | \
+  alpha*-*-linux*)
+
+# Check whether --with-long-double-128 or --without-long-double-128 was given.
+if test "${with_long_double_128+set}" = set; then
+  withval="$with_long_double_128"
+  gcc_cv_target_ldbl128="$with_long_double_128"
+else
+  gcc_cv_target_ldbl128=no
+      if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
+	if test "x$with_sysroot" = x; then
+	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
+	elif test "x$with_sysroot" = xyes; then
+	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-root/usr/include"
+	else
+	  glibc_header_dir="${with_sysroot}/usr/include"
+	fi
+      else
+	glibc_header_dir=/usr/include
+      fi
+      grep '^ 	*#[ 	]*define[ 	][ 	]*__LONG_DOUBLE_MATH_OPTIONAL' \
+        $glibc_header_dir/bits/wordsize.h > /dev/null 2>&1 \
+      && gcc_cv_target_ldbl128=yes
+fi;
+    ;;
+esac
+if test x$gcc_cv_target_ldbl128 = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TARGET_DEFAULT_LONG_DOUBLE_128 1
+_ACEOF
+
+fi
+
 # Find out what GC implementation we want, or may, use.
 
 # Check whether --with-gc or --without-gc was given.
--- gcc/config.in.jj	2006-02-04 10:42:42.000000000 +0100
+++ gcc/config.in	2006-02-04 10:44:51.000000000 +0100
@@ -1283,6 +1283,12 @@
 #endif
 
 
+/* Define if TFmode long double should be the default */
+#ifndef USED_FOR_TARGET
+#undef TARGET_DEFAULT_LONG_DOUBLE_128
+#endif
+
+
 /* Define if your target C library provides stack protector support */
 #ifndef USED_FOR_TARGET
 #undef TARGET_LIBC_PROVIDES_SSP
--- gcc/config/alpha/alpha.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/alpha/alpha.c	2006-02-04 12:36:09.000000000 +0100
@@ -501,6 +516,11 @@ override_options (void)
       REAL_MODE_FORMAT (DFmode) = &vax_g_format;
       REAL_MODE_FORMAT (TFmode) = NULL;
     }
+
+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
+    target_flags |= MASK_LONG_DOUBLE_128;
+#endif
 }
 
 /* Returns 1 if VALUE is a mask that contains full bytes of zero or ones.  */
--- gcc/config/s390/s390.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/s390/s390.c	2006-02-04 12:36:09.000000000 +0100
@@ -1415,6 +1415,11 @@ override_options (void)
     }
   else if (s390_stack_guard)
     error ("-mstack-guard implies use of -mstack-size"); 
+
+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
+    target_flags |= MASK_LONG_DOUBLE_128;
+#endif
 }
 
 /* Map for smallest class containing reg regno.  */
--- gcc/config/sparc/linux.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/linux.h	2006-02-04 12:39:31.000000000 +0100
@@ -23,17 +23,19 @@ Boston, MA 02110-1301, USA.  */
 #define TARGET_OS_CPP_BUILTINS()		\
   do						\
     {						\
-	builtin_define_std ("unix");		\
-	builtin_define_std ("linux");		\
-	builtin_define ("__gnu_linux__");	\
-	builtin_assert ("system=linux");	\
-	builtin_assert ("system=unix");		\
-	builtin_assert ("system=posix");	\
-	if (flag_pic)				\
-	  {					\
-		builtin_define ("__PIC__");	\
-		builtin_define ("__pic__");	\
-	  }					\
+      builtin_define_std ("unix");		\
+      builtin_define_std ("linux");		\
+      builtin_define ("__gnu_linux__");		\
+      builtin_assert ("system=linux");		\
+      builtin_assert ("system=unix");		\
+      builtin_assert ("system=posix");		\
+      if (flag_pic)				\
+	{					\
+	  builtin_define ("__PIC__");		\
+	  builtin_define ("__pic__");		\
+	}					\
+      if (TARGET_LONG_DOUBLE_128)		\
+	builtin_define ("__LONG_DOUBLE_128__");	\
     }						\
   while (0)
 
@@ -100,8 +102,7 @@ Boston, MA 02110-1301, USA.  */
 
 #undef CPP_SUBTARGET_SPEC
 #define CPP_SUBTARGET_SPEC \
-"%{posix:-D_POSIX_SOURCE} \
-%{pthread:-D_REENTRANT} %{mlong-double-128:-D__LONG_DOUBLE_128__}"
+"%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
 
 #undef LIB_SPEC
 #define LIB_SPEC \
--- gcc/config/sparc/sparc.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/sparc.c	2006-02-04 12:36:09.000000000 +0100
@@ -782,6 +790,11 @@ sparc_override_options (void)
       sparc_costs = &ultrasparc3_costs;
       break;
     };
+
+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
+  if (!(target_flags_explicit & MASK_LONG_DOUBLE_128))
+    target_flags |= MASK_LONG_DOUBLE_128;
+#endif
 }
 
 #ifdef SUBTARGET_ATTRIBUTE_TABLE
--- gcc/config/sparc/linux64.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/linux64.h	2006-02-04 12:39:31.000000000 +0100
@@ -20,22 +20,24 @@ along with GCC; see the file COPYING.  I
 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-#define TARGET_OS_CPP_BUILTINS()		\
-  do						\
-    {						\
-	builtin_define_std ("unix");		\
-	builtin_define_std ("linux");		\
-	builtin_define ("_LONGLONG");		\
-	builtin_define ("__gnu_linux__");	\
-	builtin_assert ("system=linux");	\
-	builtin_assert ("system=unix");		\
-	builtin_assert ("system=posix");	\
-	if (flag_pic)				\
-	  {					\
-		builtin_define ("__PIC__");	\
-		builtin_define ("__pic__");	\
-	  }					\
-    }						\
+#define TARGET_OS_CPP_BUILTINS()			\
+  do							\
+    {							\
+      builtin_define_std ("unix");			\
+      builtin_define_std ("linux");			\
+      builtin_define ("_LONGLONG");			\
+      builtin_define ("__gnu_linux__");			\
+      builtin_assert ("system=linux");			\
+      builtin_assert ("system=unix");			\
+      builtin_assert ("system=posix");			\
+      if (flag_pic)					\
+	{						\
+	  builtin_define ("__PIC__");			\
+	  builtin_define ("__pic__");			\
+	}						\
+      if (TARGET_ARCH32 && TARGET_LONG_DOUBLE_128)	\
+	builtin_define ("__LONG_DOUBLE_128__");		\
+    }							\
   while (0)
 
 /* Don't assume anything about the header files.  */
@@ -59,13 +61,6 @@ Boston, MA 02110-1301, USA.  */
 #undef ASM_CPU_DEFAULT_SPEC
 #define ASM_CPU_DEFAULT_SPEC "-Av9a"
 
-#ifdef SPARC_BI_ARCH
-
-#undef CPP_ARCH32_SPEC
-#define CPP_ARCH32_SPEC "%{mlong-double-128:-D__LONG_DOUBLE_128__}"
-
-#endif
-
 /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
    provides part of the support for getting C++ file-scope static

gcc41-ldbl-mangle-as-g.patch:
 alpha/alpha.c   |   20 ++++++++++++++++++++
 alpha/linux.h   |    3 +++
 rs6000/rs6000.c |    9 +++++++++
 s390/linux.h    |    3 +++
 s390/s390.c     |   20 ++++++++++++++++++++
 sparc/linux.h   |    3 +++
 sparc/linux64.h |    3 +++
 sparc/sparc.c   |   24 ++++++++++++++++++++++++
 8 files changed, 85 insertions(+)

--- NEW FILE gcc41-ldbl-mangle-as-g.patch ---
2006-02-04  Jakub Jelinek  <jakub at redhat.com>

	* config/rs6000/rs6000.c (rs6000_mangle_fundamental_type): Mangle
	long double as "g" on linux with -mlong-double-128.

2006-02-03  Aldy Hernandez  <aldyh at redhat.com>

	* config/s390/s390.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
	(s390_mangle_fundamental_type): New.
	* config/s390/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
	Define.

	* config/alpha/alpha.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
	(alpha_mangle_fundamental_type): New.
	* config/alpha/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
	Define.

	* config/sparc/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
	Define.
	* config/sparc/linux64.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
	Define.
	* config/sparc/sparc.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
	(sparc_mangle_fundamental_type): New.

--- gcc/config/rs6000/rs6000.c.jj	2006-02-04 11:46:38.000000000 +0100
+++ gcc/config/rs6000/rs6000.c	2006-02-04 11:46:59.000000000 +0100
@@ -17353,6 +17353,15 @@ rs6000_mangle_fundamental_type (tree typ
   if (type == pixel_type_node) return "u7__pixel";
   if (type == bool_int_type_node) return "U6__booli";
 
+#ifdef POWERPC_LINUX
+  /* On powerpc*-*-linux* where -mlong-double-64 used to be
+     the default, mangle DFmode long double as 'e' and
+     TFmode long double as 'g' (__float128 in Itanium ABI).  */
+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+#endif
+
   /* For all other types, use normal C++ mangling.  */
   return NULL;
 }
--- gcc/config/alpha/linux.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/alpha/linux.h	2006-02-04 12:36:09.000000000 +0100
@@ -82,3 +82,6 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #define MD_UNWIND_SUPPORT "config/alpha/linux-unwind.h"
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
--- gcc/config/alpha/alpha.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/alpha/alpha.c	2006-02-04 12:36:09.000000000 +0100
@@ -235,6 +235,21 @@ alpha_handle_option (size_t code, const 
   return true;
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+alpha_mangle_fundamental_type (tree type)
+{
+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* Parse target option strings.  */
 
 void
@@ -10690,6 +10710,11 @@ alpha_init_libfuncs (void)
 #undef TARGET_HANDLE_OPTION
 #define TARGET_HANDLE_OPTION alpha_handle_option
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE alpha_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 
--- gcc/config/s390/s390.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/s390/s390.c	2006-02-04 12:36:09.000000000 +0100
@@ -4293,6 +4298,21 @@ s390_output_dwarf_dtprel (FILE *file, in
   fputs ("@DTPOFF", file);
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+s390_mangle_fundamental_type (tree type)
+{
+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* In the name of slightly smaller debug output, and to cater to
    general assembler lossage, recognize various UNSPEC sequences
    and turn them back into a direct symbol reference.  */
@@ -9185,6 +9205,11 @@ s390_reorg (void)
 #define TARGET_ASM_OUTPUT_DWARF_DTPREL s390_output_dwarf_dtprel
 #endif
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE s390_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-s390.h"
--- gcc/config/s390/linux.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/s390/linux.h	2006-02-04 12:36:09.000000000 +0100
@@ -100,4 +100,7 @@ Software Foundation, 51 Franklin Street,
 #define TARGET_THREAD_SSP_OFFSET        (TARGET_64BIT ? 0x28 : 0x14)
 #endif
 
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+
 #endif
--- gcc/config/sparc/linux.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/linux.h	2006-02-04 12:39:31.000000000 +0100
@@ -234,3 +235,6 @@ do {									\
 /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14].  */
 #define TARGET_THREAD_SSP_OFFSET	0x14
 #endif
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
--- gcc/config/sparc/sparc.c.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/sparc.c	2006-02-04 12:36:09.000000000 +0100
@@ -368,6 +368,9 @@ static int sparc_arg_partial_bytes (CUMU
 static void sparc_dwarf_handle_frame_unspec (const char *, rtx, int);
 static void sparc_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
 static void sparc_file_end (void);
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+static const char *sparc_mangle_fundamental_type (tree);
+#endif
 #ifdef SUBTARGET_ATTRIBUTE_TABLE
 const struct attribute_spec sparc_attribute_table[];
 #endif
@@ -527,6 +530,11 @@ static bool fpu_option_set = false;
 #undef TARGET_ASM_FILE_END
 #define TARGET_ASM_FILE_END sparc_file_end
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE sparc_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 /* Implement TARGET_HANDLE_OPTION.  */
@@ -8708,6 +8721,22 @@ sparc_file_end (void)
     file_end_indicate_exec_stack ();
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+sparc_mangle_fundamental_type (tree type)
+{
+  if (!TARGET_64BIT
+      && TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* Expand code to perform a 8 or 16-bit compare and swap by doing 32-bit
    compare and swap on the word containing the byte or half-word.  */
 
--- gcc/config/sparc/linux64.h.jj	2006-02-04 10:42:41.000000000 +0100
+++ gcc/config/sparc/linux64.h	2006-02-04 12:39:31.000000000 +0100
@@ -369,3 +364,6 @@ do {									\
    sparc64 glibc provides it at [%g7 + 0x28].  */
 #define TARGET_THREAD_SSP_OFFSET	(TARGET_ARCH64 ? 0x28 : 0x14)
 #endif
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gcc41.spec	1 Feb 2006 22:56:36 -0000	1.22
+++ gcc41.spec	4 Feb 2006 12:42:09 -0000	1.23
@@ -1,6 +1,6 @@
-%define DATE 20060131
+%define DATE 20060204
 %define gcc_version 4.1.0
-%define gcc_release 0.20
+%define gcc_release 0.21
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -85,26 +85,17 @@
 Patch4: gcc41-gnuc-rh-release.patch
 Patch5: gcc41-java-nomulti.patch
 Patch6: gcc41-multi32-hack.patch
-Patch7: gcc41-ia64-stack-protector.patch
+Patch7: gcc41-gc-pthread_create.patch
 Patch8: gcc41-ada-pr18302.patch
 Patch9: gcc41-ada-tweaks.patch
-Patch10: gcc41-java-rmic.patch
+Patch10: gcc41-ia64-frame-base-loclist.patch
 Patch11: gcc41-java-slow_pthread_self.patch
-Patch12: gcc41-libjava-libltdl.patch
-Patch13: gcc41-fortran-finclude.patch
-Patch14: gcc41-atomic-builtins.patch
-Patch15: gcc41-ppc32-retaddr.patch
-Patch16: gcc41-ppc32-ldbl.patch
-Patch17: gcc41-s390-ldbl.patch
-Patch18: gcc41-x86-mtune-generic1.patch
-Patch19: gcc41-x86-mtune-generic2.patch
-Patch20: gcc41-x86-mtune-generic3.patch
-Patch21: gcc41-gomp-20060128-merge1.patch
-Patch22: gcc41-gomp-20060128-merge2.patch
-Patch23: gcc41-gomp-20060128-merge3.patch
-Patch24: gcc41-gomp-20060128-merge4.patch
-Patch25: gcc41-gomp-20060128-merge5.patch
-Patch26: gcc41-gomp-20060128-merge6.patch
+Patch12: gcc41-fortran-finclude.patch
+Patch13: gcc41-ppc32-retaddr.patch
+Patch14: gcc41-ppc32-ldbl.patch
+Patch15: gcc41-ldbl-mangle-as-g.patch
+Patch16: gcc41-ldbl-default.patch
+Patch17: gcc41-ldbl-default-libstdc++.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -441,26 +432,17 @@
 %ifarch ppc sparc
 %patch6 -p0 -b .multi32-hack~
 %endif
-%patch7 -p0 -b .ia64-stack-protector~
+%patch7 -p0 -b .gc-pthread_create~
 %patch8 -p0 -b .ada-pr18302~
 %patch9 -p0 -b .ada-tweaks~
-%patch10 -p0 -b .java-rmic~
+%patch10 -p0 -b .ia64-frame-base-loclist~
 %patch11 -p0 -b .java-slow_pthread_self~
-%patch12 -p0 -b .libjava-libltdl~
-%patch13 -p0 -b .fortran-finclude~
-%patch14 -p0 -b .atomic-builtins~
-%patch15 -p0 -b .ppc32-retaddr~
-%patch16 -p0 -b .ppc32-ldbl~
-%patch17 -p0 -b .s390-ldbl~
-%patch18 -p0 -b .x86-mtune-generic1~
-%patch19 -p0 -b .x86-mtune-generic2~
-%patch20 -p0 -b .x86-mtune-generic3~
-%patch21 -p0 -b .gomp-20060128-merge1~
-%patch22 -p0 -b .gomp-20060128-merge2~
-%patch23 -p0 -b .gomp-20060128-merge3~
-%patch24 -p0 -b .gomp-20060128-merge4~
-%patch25 -p0 -b .gomp-20060128-merge5~
-%patch26 -p0 -b .gomp-20060128-merge6~
+%patch12 -p0 -b .fortran-finclude~
+%patch13 -p0 -b .ppc32-retaddr~
+%patch14 -p0 -b .ppc32-ldbl~
+%patch15 -p0 -b .ldbl-mangle-as-g~
+%patch16 -p0 -b .ldbl-default~
+%patch17 -p0 -b .ldbl-default-libstdc++~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -565,6 +547,9 @@
 %ifarch ppc
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
+%ifarch sparc ppc ppc64 s390 s390x alpha
+	--with-long-double-128 \
+%endif
 %ifarch %{ix86} x86_64
 	--with-cpu=generic \
 %endif
@@ -1549,6 +1534,24 @@
 %endif
 
 %changelog
+* Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.21
+- update from gcc-4_1-branch (-r110433:110582)
+  - PRs c++/25342, c++/25979, fortran/20845, fortran/24266,
+	fortran/24958, fortran/25072, libstdc++/21554, middle-end/24901,
+	middle-end/25977, middle-end/26001, target/25864, target/25926,
+	target/25960
+  - put ia64 read-only sections that require runtime relocations
+    even in -fno-pic code into .data.rel.ro etc. sections
+    rather than .rodata to avoid DT_TEXTREL binaries
+    (Richard Henderson, PR target/26090)
+- merge gomp changes from trunk (-r110511:110512 and -r110549:110552)
+- fix ia64 debug info coverage of epilogues (Alexandre Oliva, PR debug/24444)
+- export pthread_create from libgcj.so.7 as a wrapper around
+  libpthread.so.0's pthread_create that handles GC (Anthony Green, Tom Tromey)
+- switch to IBM extended format long double by default on ppc and ppc64
+- switch to IEEE 754 quad format long double by default on s390, s390x,
+  sparc32 and alpha
+
 * Wed Feb  1 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.20
 - merge from gomp-20050808-branch (up to -r110392)
   - fix PR c++/25874 (Diego Novillo)


--- gcc41-atomic-builtins.patch DELETED ---


--- gcc41-gomp-20060128-merge1.patch DELETED ---


--- gcc41-gomp-20060128-merge2.patch DELETED ---


--- gcc41-gomp-20060128-merge3.patch DELETED ---


--- gcc41-gomp-20060128-merge4.patch DELETED ---


--- gcc41-gomp-20060128-merge5.patch DELETED ---


--- gcc41-gomp-20060128-merge6.patch DELETED ---


--- gcc41-ia64-stack-protector.patch DELETED ---


--- gcc41-java-rmic.patch DELETED ---


--- gcc41-libjava-libltdl.patch DELETED ---


--- gcc41-s390-ldbl.patch DELETED ---


--- gcc41-x86-mtune-generic1.patch DELETED ---


--- gcc41-x86-mtune-generic2.patch DELETED ---


--- gcc41-x86-mtune-generic3.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 12:45:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 07:45:45 -0500
Subject: rpms/gcc/devel gcc41-sparc64-g7.patch, NONE, 1.1 gcc41.spec, 1.23,
	1.24
Message-ID: <200602041245.k14Cjjmg022781@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21241

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-sparc64-g7.patch 
Log Message:
4.1.0-0.21


gcc41-sparc64-g7.patch:
 sparc.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE gcc41-sparc64-g7.patch ---
2006-02-02  Jakub Jelinek  <jakub at redhat.com>

	* config/sparc/sparc.c (sparc_output_scratch_registers): Use
	#ignore instead of #scratch for %g7 .register directive.

--- gcc/config/sparc/sparc.c.jj	2006-01-31 23:32:07.000000000 +0100
+++ gcc/config/sparc/sparc.c	2006-02-02 00:23:25.000000000 +0100
@@ -3693,7 +3693,10 @@ sparc_output_scratch_registers (FILE *fi
 	  && ! sparc_hard_reg_printed [i])
 	{
 	  sparc_hard_reg_printed [i] = 1;
-	  fprintf (file, "\t.register\t%%g%d, #scratch\n", i);
+	  /* %g7 is used as TLS base register, use #ignore
+	     for it instead of #scratch.  */
+	  fprintf (file, "\t.register\t%%g%d, #%s\n", i,
+		   i == 7 ? "ignore" : "scratch");
 	}
       if (i == 3) i = 5;
     }

	Jakub


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gcc41.spec	4 Feb 2006 12:42:09 -0000	1.23
+++ gcc41.spec	4 Feb 2006 12:45:43 -0000	1.24
@@ -1548,6 +1548,8 @@
 - fix ia64 debug info coverage of epilogues (Alexandre Oliva, PR debug/24444)
 - export pthread_create from libgcj.so.7 as a wrapper around
   libpthread.so.0's pthread_create that handles GC (Anthony Green, Tom Tromey)
+- on sparc64 emit .register %g7,#ignore instead of .register %g7,#scratch
+  to avoid problems with TLS or -fstack-protector
 - switch to IBM extended format long double by default on ppc and ppc64
 - switch to IEEE 754 quad format long double by default on s390, s390x,
   sparc32 and alpha



From fedora-cvs-commits at redhat.com  Sat Feb  4 12:46:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 07:46:46 -0500
Subject: rpms/gcc/devel gcc41.spec,1.24,1.25
Message-ID: <200602041246.k14CkkYo031180@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31166

Modified Files:
	gcc41.spec 
Log Message:
4.1.0-0.21



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gcc41.spec	4 Feb 2006 12:45:43 -0000	1.24
+++ gcc41.spec	4 Feb 2006 12:46:44 -0000	1.25
@@ -96,6 +96,7 @@
 Patch15: gcc41-ldbl-mangle-as-g.patch
 Patch16: gcc41-ldbl-default.patch
 Patch17: gcc41-ldbl-default-libstdc++.patch
+Patch18: gcc41-sparc64-g7.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -443,6 +444,7 @@
 %patch15 -p0 -b .ldbl-mangle-as-g~
 %patch16 -p0 -b .ldbl-default~
 %patch17 -p0 -b .ldbl-default-libstdc++~
+%patch18 -p0 -b .sparc64-g7~
 
 sed -i -e 's/4\.1\.0/4.1.0/' 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  Sat Feb  4 13:10:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 08:10:06 -0500
Subject: rpms/gcc/devel gcc41-java-rh179070.patch, NONE, 1.1 gcc41.spec, 1.25,
	1.26
Message-ID: <200602041310.k14DA6xc011272@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11187

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-java-rh179070.patch 
Log Message:
4.1.0-0.21


gcc41-java-rh179070.patch:
 expr.c |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE gcc41-java-rh179070.patch ---
2006-02-04  Andrew Haley  <aph at redhat.com>

	* java/expr.c (expand_invoke): For BC-ABI, if we find a method
	declared in the class other than the one we're looking for,
	ignore it in a class other.

--- gcc/java/expr.c~    2005-12-12 12:14:45.000000000 -0500
+++ gcc/java/expr.c     2006-02-04 05:26:17.000000000 -0500
@@ -2280,6 +2280,14 @@
   else
     method = lookup_java_method (self_type, method_name, method_signature);
 
+  /* We've found a method in a class other than the one in which it
+     was wanted.  This can happen if, for instance, we're trying to
+     compile invokespecial super.equals().  */
+  if (! flag_verify_invocations
+      && method
+      && self_type != DECL_CONTEXT (method))
+    method = NULL_TREE;
+
   /* We've found a method in an interface, but this isn't an interface
      call.  */
   if (opcode != OPCODE_invokeinterface


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gcc41.spec	4 Feb 2006 12:46:44 -0000	1.25
+++ gcc41.spec	4 Feb 2006 13:10:03 -0000	1.26
@@ -97,6 +97,7 @@
 Patch16: gcc41-ldbl-default.patch
 Patch17: gcc41-ldbl-default-libstdc++.patch
 Patch18: gcc41-sparc64-g7.patch
+Patch19: gcc41-java-rh179070.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -445,6 +446,7 @@
 %patch16 -p0 -b .ldbl-default~
 %patch17 -p0 -b .ldbl-default-libstdc++~
 %patch18 -p0 -b .sparc64-g7~
+%patch19 -p0 -b .java-rh179070~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1550,6 +1552,7 @@
 - fix ia64 debug info coverage of epilogues (Alexandre Oliva, PR debug/24444)
 - export pthread_create from libgcj.so.7 as a wrapper around
   libpthread.so.0's pthread_create that handles GC (Anthony Green, Tom Tromey)
+- BC-ABI java lookup fix (Andrew Haley, #179070, #178156)
 - on sparc64 emit .register %g7,#ignore instead of .register %g7,#scratch
   to avoid problems with TLS or -fstack-protector
 - switch to IBM extended format long double by default on ppc and ppc64



From fedora-cvs-commits at redhat.com  Sat Feb  4 13:20:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 08:20:08 -0500
Subject: rpms/gcc/devel .cvsignore,1.129,1.130 sources,1.131,1.132
Message-ID: <200602041320.k14DK8jM028197@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28128

Modified Files:
	.cvsignore sources 
Log Message:
4.1.0-0.21



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- .cvsignore	31 Jan 2006 14:29:33 -0000	1.129
+++ .cvsignore	4 Feb 2006 13:20:06 -0000	1.130
@@ -1 +1 @@
-gcc-4.1.0-20060131.tar.bz2
+gcc-4.1.0-20060204.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- sources	31 Jan 2006 14:29:33 -0000	1.131
+++ sources	4 Feb 2006 13:20:06 -0000	1.132
@@ -1 +1 @@
-7a1b6cd7661918ede937ff3b157f2788  gcc-4.1.0-20060131.tar.bz2
+2e427016398ab59b9966cd7acb4fcc31  gcc-4.1.0-20060204.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 13:22:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 08:22:12 -0500
Subject: rpms/mesa/devel .cvsignore, 1.4, 1.5 mesa.spec, 1.37, 1.38 sources,
	1.4, 1.5 mesa-6.4.1-amd64-assyntax-fix.patch, 1.1, NONE
Message-ID: <200602041322.k14DMC9C029209@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29167/devel

Modified Files:
	.cvsignore mesa.spec sources 
Removed Files:
	mesa-6.4.1-amd64-assyntax-fix.patch 
Log Message:
auto-import mesa-6.4.2-1 on branch devel from mesa-6.4.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 06:55:42 -0000	1.4
+++ .cvsignore	4 Feb 2006 13:22:10 -0000	1.5
@@ -1 +1 @@
-MesaLib-6.4.1.tar.bz2
+MesaLib-6.4.2.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mesa.spec	25 Jan 2006 02:01:36 -0000	1.37
+++ mesa.spec	4 Feb 2006 13:22:10 -0000	1.38
@@ -1,6 +1,10 @@
 #!/bin/bash
-# NOTE: /bin/bash shebang on first line to get shell script syntax
-# highlighting in mcedit.  (temporary hack)
+# NOTE: Yes, this spec file is a horrible mess.  Mesa's buildsystem
+# currently leaves a lot to be desired, so we hack around it in the rpm
+# spec file with various hacks and kludges, which are further complicated
+# by needing it to build on all 7 RHEL/Fedora architectures, with and
+# without DRI enabled via conditional.  Lots of fun.  Patches to improve
+# either Mesa, or the spec file are welcome bugzilla submissions however.
 
 # NOTE: Build target macros:  For now, we will just use build_fc and
 # build_rhel to simplify things, until there is a reason to break it
@@ -48,13 +52,13 @@
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 6.4.1
-Release: 5
+Version: 6.4.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source0: MesaLib-%{version}.tar.bz2
+Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
 Source1: redhat-mesa-target
 Source2: redhat-mesa-driver-install
 Source3: redhat-mesa-source-filelist-generator
@@ -65,11 +69,10 @@
 Patch3: mesa-modular-dri-dir.patch
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
 #Patch4: mesa-6.4.1-enable-osmesa.patch
+
 # General patches from upstream go here:
-# FIXME: mesa-6.4.1-amd64-assyntax-fix.patch is backported from Mesa 6.4
-# branch and can be dropped when we update to 6.4.2.
-Patch100: mesa-6.4.1-amd64-assyntax-fix.patch
 
+# Red Hat custom patches, feature development
 Patch200: mesa-6.4.1-texture-from-drawable.patch
 
 BuildRequires: pkgconfig
@@ -218,7 +221,7 @@
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
 
-%patch100 -p1 -b .amd64-assyntax-fix
+# NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
 
 #%patch200 -p0 -b .texture-from-drawable
 
@@ -262,7 +265,6 @@
 export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
 bin/installmesa $RPM_BUILD_ROOT/usr
-install -m 644 src/glw/GLw{,M}DrawA{,P}.h $RPM_BUILD_ROOT%{_includedir}/GL/
 
 %if %{with_dri}
 #pushd src/mesa/drivers/dri
@@ -352,6 +354,7 @@
 %{_includedir}/GL/gl.h
 %{_includedir}/GL/gl_mangle.h
 %{_includedir}/GL/glext.h
+%{_includedir}/GL/glfbdev.h
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glx_mangle.h
 %{_includedir}/GL/glxext.h
@@ -374,7 +377,7 @@
 %files libGLU
 %defattr(-,root,root,-)
 %{_libdir}/libGLU.so.1
-%{_libdir}/libGLU.so.1.3.060401
+%{_libdir}/libGLU.so.1.3.0604*
 
 %files libGLU-devel
 %defattr(-,root,root,-)
@@ -399,6 +402,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Feb  4 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-1
+- Updated to Mesa 6.4.2
+- Use "libGLU.so.1.3.0604*" glob in file manifest, to avoid having to update it
+  each upstream release.
+
 * Tue Jan 24 2006 Mike A. Harris <mharris at redhat.com> 6.4.1-5
 - Added missing "BuildRequires: expat-devel" for bug (#178525)
 - Temporarily disabled mesa-6.4.1-texture-from-drawable.patch, as it fails


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Dec 2005 06:55:42 -0000	1.4
+++ sources	4 Feb 2006 13:22:10 -0000	1.5
@@ -1 +1 @@
-ea148c828ec6f645526451db1b8556f1  MesaLib-6.4.1.tar.bz2
+7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2


--- mesa-6.4.1-amd64-assyntax-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 13:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 08:25:25 -0500
Subject: rpms/gcc/devel gcc41.spec,1.26,1.27
Message-ID: <200602041325.k14DPPwg030765@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30707

Modified Files:
	gcc41.spec 
Log Message:
4.1.0-0.21



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gcc41.spec	4 Feb 2006 13:10:03 -0000	1.26
+++ gcc41.spec	4 Feb 2006 13:25:21 -0000	1.27
@@ -545,15 +545,15 @@
 %ifarch ppc ppc64
 	--enable-secureplt \
 %endif
+%ifarch sparc ppc ppc64 s390 s390x alpha
+	--with-long-double-128 \
+%endif
 %ifarch sparc
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
 %ifarch ppc
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
 %endif
-%ifarch sparc ppc ppc64 s390 s390x alpha
-	--with-long-double-128 \
-%endif
 %ifarch %{ix86} x86_64
 	--with-cpu=generic \
 %endif



From fedora-cvs-commits at redhat.com  Sat Feb  4 14:55:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 09:55:00 -0500
Subject: rpms/gcc/devel gcc41-ldbl-default-libstdc++.patch,1.1,1.2
Message-ID: <200602041455.k14Et0mN026444@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26365

Modified Files:
	gcc41-ldbl-default-libstdc++.patch 
Log Message:
4.1.0-0.21


gcc41-ldbl-default-libstdc++.patch:
 config.h.in                        |    3 +
 config/linker-map.gnu              |   79 +++++++++++++++++++++++-----
 config/locale/generic/c_locale.cc  |    9 ++-
 config/locale/gnu/c_locale.cc      |    9 ++-
 config/os/gnu-linux/ldbl-extra.ver |   19 ++++++
 configure                          |   88 ++++++++++++++++++++++++++++++-
 configure.ac                       |   19 ++++++
 include/bits/locale_facets.h       |   61 +++++++++++++++++++++
 include/bits/locale_facets.tcc     |   82 +++++++++++++++++++++++++----
 include/bits/localefwd.h           |   23 ++++++++
 src/Makefile.am                    |   31 +++++++++--
 src/Makefile.in                    |   52 +++++++++++++++---
 src/compatibility-ldbl.cc          |   73 +++++++++++++++++++++++++
 src/compatibility.cc               |  104 ++++++++++++++++++++++++++++++++++++-
 src/complex_io.cc                  |   19 ++++++
 src/istream-inst.cc                |   18 ++++++
 src/limits.cc                      |   33 +++++++++++
 src/locale-inst.cc                 |   50 +++++++++++++++++
 src/locale-misc-inst.cc            |   19 ++++++
 src/locale.cc                      |   41 +++++++++++++-
 src/ostream-inst.cc                |   18 ++++++
 src/wlocale-inst.cc                |   44 +++++++++++++++
 22 files changed, 839 insertions(+), 55 deletions(-)

Index: gcc41-ldbl-default-libstdc++.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-default-libstdc++.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ldbl-default-libstdc++.patch	4 Feb 2006 12:42:09 -0000	1.1
+++ gcc41-ldbl-default-libstdc++.patch	4 Feb 2006 14:54:56 -0000	1.2
@@ -1161,8 +1161,8 @@
 +}
 +
 +#endif
---- libstdc++-v3/src/locale-misc-inst.cc.jj	2006-02-04 10:42:42.000000000 +0100
-+++ libstdc++-v3/src/locale-misc-inst.cc	2006-02-04 11:09:18.000000000 +0100
+--- libstdc++-v3/src/locale-misc-inst.cc	2006-02-04 11:09:18.000000000 +0100
++++ libstdc++-v3/src/locale-misc-inst.cc	2006-02-04 15:32:41.000000000 +0100
 @@ -1,6 +1,7 @@
  // Locale support -*- C++ -*-
  
@@ -1172,10 +1172,7 @@
  //
  // This file is part of the GNU ISO C++ Library.  This library is free
  // software; you can redistribute it and/or modify it under the
-@@ -45,3 +46,14 @@ namespace std
-     __convert_from_v(char*, const int, const char*, long double, 
- 		     const __c_locale&, int);
- } // namespace std
+@@ -47,0 +49,16 @@
 +
 +// XXX GLIBCXX_ABI Deprecated
 +#if defined _GLIBCXX_LONG_DOUBLE_COMPAT
@@ -1183,8 +1180,13 @@
 +#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
 +  extern "C" void ldbl (void) __attribute__ ((alias (#dbl), weak))
 +
++# if _GLIBCXX_C_LOCALE_GNU
 +_GLIBCXX_LDBL_COMPAT(_ZSt16__convert_from_vIdEiPciPKcT_RKP15__locale_structi,
 +		     _ZSt16__convert_from_vIeEiPciPKcT_RKP15__locale_structi);
++# else
++_GLIBCXX_LDBL_COMPAT(_ZSt16__convert_from_vIdEiPciPKcT_RKPii,
++		     _ZSt16__convert_from_vIeEiPciPKcT_RKPii);
++# endif
 +
 +#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
 --- libstdc++-v3/config/locale/gnu/c_locale.cc.jj	2006-02-04 10:42:45.000000000 +0100
@@ -1208,8 +1210,8 @@
 +  extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
 +_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct);
 +#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
---- libstdc++-v3/config/locale/generic/c_locale.cc.jj	2006-02-04 10:42:45.000000000 +0100
-+++ libstdc++-v3/config/locale/generic/c_locale.cc	2006-02-04 11:14:41.000000000 +0100
+--- libstdc++-v3/config/locale/generic/c_locale.cc	2006-02-04 11:14:41.000000000 +0100
++++ libstdc++-v3/config/locale/generic/c_locale.cc	2006-02-04 15:32:41.000000000 +0100
 @@ -1,6 +1,6 @@
  // Wrapper for underlying C-language localization -*- C++ -*-
  
@@ -1218,16 +1220,13 @@
  // Free Software Foundation, Inc.
  //
  // This file is part of the GNU ISO C++ Library.  This library is free
-@@ -168,3 +168,10 @@ namespace std
- {
-   const char* const* const locale::_S_categories = __gnu_cxx::category_names;
- }  // namespace std
+@@ -170,0 +171,7 @@
 +
 +// XXX GLIBCXX_ABI Deprecated
 +#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
 +#define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
 +  extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
-+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct);
++_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
 +#endif // _GLIBCXX_LONG_DOUBLE_COMPAT
 --- libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver.jj	2006-02-04 10:44:51.000000000 +0100
 +++ libstdc++-v3/config/os/gnu-linux/ldbl-extra.ver	2006-02-04 11:15:33.000000000 +0100
@@ -1240,7 +1239,7 @@
 +  _ZNSolsEg;
 +  _ZNSt13basic_istreamIwSt11char_traitsIwEErsERg;
 +  _ZNSt13basic_ostreamIwSt11char_traitsIwEElsEg;
-+  _ZSt14__convert_to_vIgEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct;
++  _ZSt14__convert_to_vIgEvPKcRT_RSt12_Ios_IostateRKP*;
 +  _ZStlsIg[cw]St11char_traitsI[cw]EERSt13basic_ostreamIT0_T1_ES6_RKSt7complexIT_E;
 +  _ZStrsIg[cw]St11char_traitsI[cw]EERSt13basic_istreamIT0_T1_ES6_RSt7complexIT_E;
 +  *__gnu_cxx_ldbl128*;



From fedora-cvs-commits at redhat.com  Sat Feb  4 14:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 09:59:23 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1591.2.4,
 1.1591.2.5 1603-cs89x0-make-read-write-word-take-base_addr.txt, 1.1.2.1,
 NONE 1604-cs89x0-convert-inw-outw-calls-to-read-write-word.txt, 1.1.2.1,
 NONE 1605-cs89x0-swap-read-write-reg-and-read-write-word.txt, 1.1.2.1,
 NONE 1606-cs89x0-make-read-write-reg-use-read-write-word.txt, 1.1.2.1,
 NONE 1607-cs89x0-cleanly-implement-ixdp2x01-and-pnx0501-support.txt, 1.1.2.1,
 NONE 1608-cs89x0-switch-in-out-sw-to-read-write-words.txt, 1.1.2.1,
 NONE 1609-fix-Kconfig-depends-for-cs89x0-PNX010X-support.txt, 1.1.2.1,
 NONE 1610-cs89x0-fix-up-after-pnx0105-Kconfig-symbol-renaming.txt, 1.1.2.1,
 NONE 2604-cs89x0-fix-setting-of-ALLOW_DMA.txt, 1.1.2.1,
 NONE 2605-cs89x0-Fix-the-Kconfig-help-text.txt, 1.1.2.1,
 NONE 3146-cs89x0-credit-Dmitry-Pervushin.txt, 1.1.2.1,
 NONE 3147-cs89x0-use-elif-instead-of-else-if-endif.txt, 1.1.2.1,
 NONE 3148-cs89x0-use-u16-for-device-register-data.txt, 1.1.2.1,
 NONE 3149-cs89x0-add-ixdp2351-support.txt, 1.1.2.1,
 NONE 3266-cs89x0-credit-Dmitry-Per! vushin.txt,1.1.2.1,NONE
Message-ID: <200602041459.k14ExNAg028522@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-netdev-fc4-9-branch
	kernel-2.6.spec 
Removed Files:
      Tag: private-linville-netdev-fc4-9-branch
	1603-cs89x0-make-read-write-word-take-base_addr.txt 
	1604-cs89x0-convert-inw-outw-calls-to-read-write-word.txt 
	1605-cs89x0-swap-read-write-reg-and-read-write-word.txt 
	1606-cs89x0-make-read-write-reg-use-read-write-word.txt 
	1607-cs89x0-cleanly-implement-ixdp2x01-and-pnx0501-support.txt 
	1608-cs89x0-switch-in-out-sw-to-read-write-words.txt 
	1609-fix-Kconfig-depends-for-cs89x0-PNX010X-support.txt 
	1610-cs89x0-fix-up-after-pnx0105-Kconfig-symbol-renaming.txt 
	2604-cs89x0-fix-setting-of-ALLOW_DMA.txt 
	2605-cs89x0-Fix-the-Kconfig-help-text.txt 
	3146-cs89x0-credit-Dmitry-Pervushin.txt 
	3147-cs89x0-use-elif-instead-of-else-if-endif.txt 
	3148-cs89x0-use-u16-for-device-register-data.txt 
	3149-cs89x0-add-ixdp2351-support.txt 
	3266-cs89x0-credit-Dmitry-Pervushin.txt 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.2.4
retrieving revision 1.1591.2.5
diff -u -r1.1591.2.4 -r1.1591.2.5
--- kernel-2.6.spec	4 Feb 2006 04:13:49 -0000	1.1591.2.4
+++ kernel-2.6.spec	4 Feb 2006 14:59:20 -0000	1.1591.2.5
@@ -652,378 +652,363 @@
 Patch20270: 1450-IPV4-make-ip_fragment-static.txt
 Patch20271: 1451-IPV6-small-cleanups.txt
 Patch20272: 1571-slab-remove-unused-align-parameter-from-alloc_percpu.txt
-Patch20273: 1603-cs89x0-make-read-write-word-take-base_addr.txt
-Patch20274: 1604-cs89x0-convert-inw-outw-calls-to-read-write-word.txt
-Patch20275: 1605-cs89x0-swap-read-write-reg-and-read-write-word.txt
-Patch20276: 1606-cs89x0-make-read-write-reg-use-read-write-word.txt
-Patch20277: 1607-cs89x0-cleanly-implement-ixdp2x01-and-pnx0501-support.txt
-Patch20278: 1608-cs89x0-switch-in-out-sw-to-read-write-words.txt
-Patch20279: 1609-fix-Kconfig-depends-for-cs89x0-PNX010X-support.txt
-Patch20280: 1610-cs89x0-fix-up-after-pnx0105-Kconfig-symbol-renaming.txt
-Patch20281: 1666-IRQ-type-flags.txt
-Patch20282: 1778-Eliminate-__attribute__-packed-warnings-for-gcc-4.1.txt
-Patch20283: 1796-tiny-Trim-non-IPX-builds.txt
-Patch20284: 1844-ARM-Update-am79c961-to-use-struct-platform_driver.txt
-Patch20285: 1851-sk98lin-routine-called-from-probe-marked-__init.txt
-Patch20286: 1854-sk98lin-use-kzalloc.txt
-Patch20287: 1856-sk98lin-error-handling-of-pci-setup.txt
-Patch20288: 1858-PPC44x-EMAC-driver-disable-TX-status-deferral-in-half-duplex-mode.txt
-Patch20289: 1860-tulip-enable-multiport-NIC-BIOS-fixups-for-x86_64.txt
-Patch20290: 1862-Add-MIPS-dependency-for-dm9000-driver.txt
-Patch20291: 1863-drivers-net-Kconfig-indentation-fix.txt
-Patch20292: 1864-drivers-net-bonding-bonding.h-extern-inline-static-inline.txt
-Patch20293: 1865-drivers-net-gianfar.h-extern-inline-static-inline.txt
-Patch20294: 1866-e1000-Fix-invalid-memory-reference.txt
-Patch20295: 1867-remove-bouncing-mail-address-of-mv643xx_eth-maintainer.txt
-Patch20296: 1868-forcedeth-TSO-fix-for-large-buffers.txt
-Patch20297: 1869-fix-a-few-warning-cleanup_card-defined-but-not-used.txt
-Patch20298: 1870-patch-ipw2100-support-WEXT-18-enc_capa-v3.txt
-Patch20299: 1871-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt
-Patch20300: 1872-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt
-Patch20301: 1873-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt
-Patch20302: 1874-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt
-Patch20303: 1875-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt
-Patch20304: 1876-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt
-Patch20305: 1877-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt
-Patch20306: 1878-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt
-Patch20307: 1879-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt
-Patch20308: 1880-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt
-Patch20309: 1881-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt
-Patch20310: 1882-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt
-Patch20311: 1883-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt
-Patch20312: 1884-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt
-Patch20313: 1885-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt
-Patch20314: 1886-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt
-Patch20315: 1887-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt
-Patch20316: 1888-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt
-Patch20317: 1889-IPV6-ROUTE-Try-finding-the-next-best-route.txt
-Patch20318: 1890-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt
-Patch20319: 1891-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt
-Patch20320: 1892-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt
-Patch20321: 1893-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt
-Patch20322: 1894-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt
-Patch20323: 1895-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt
-Patch20324: 1896-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt
-Patch20325: 1897-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt
-Patch20326: 1898-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt
-Patch20327: 2117-NET-Convert-net-ipv4-ipv6-sched-to-netdev_priv.txt
-Patch20328: 2118-PKT_SCHED-Use-USEC_PER_SEC.txt
-Patch20329: 2119-PKT_SCHED-Convert-tc-action-functions-to-single-skb-pointers.txt
-Patch20330: 2120-PKT_SCHED-Remove-some-obsolete-policer-exports.txt
-Patch20331: 2121-PKT_SCHED-Fix-memory-leak-when-dumping-in-pedit-action.txt
-Patch20332: 2122-PKT_SCHED-Prefix-tc-actions-with-act_.txt
-Patch20333: 2123-NET-Change-some-if-x-BUG-to-BUG_ON-x.txt
-Patch20334: 2125-NET-Add-IFB-Intermediate-Functional-Block-network-device.txt
-Patch20335: 2126-PKT_SCHED-Fix-qdisc-return-code.txt
-Patch20336: 2127-IPV4-ip_output.c-needs-xfrm.h.txt
-Patch20337: 2128-IPV6-Set-skb-priority-in-ip6_output.c.txt
-Patch20338: 2132-INET_DIAG-Use-inet_twsk-with-TIME_WAIT-sockets.txt
-Patch20339: 2133-INET_DIAG-whitespace-simple-cleanups.txt
-Patch20340: 2134-INET_DIAG-Introduce-inet_twsk_diag_dump-inet_twsk_diag_fill.txt
-Patch20341: 2135-INET_DIAG-Introduce-sk_diag_fill.txt
-Patch20342: 2136-spelling-s-usefull-useful.txt
-Patch20343: 2138-spelling-s-retreive-retrieve.txt
-Patch20344: 2139-spelling-s-trough-through.txt
-Patch20345: 2218-try-to-reassociate-when-being-disassociated-from-the-AP.txt
-Patch20346: 2222-add-fixme-for-disassoc.txt
-Patch20347: 2373-drivers-net-irda-irport.c-cleanups.txt
-Patch20348: 2374-turn-const-static-into-static-const.txt
-Patch20349: 2420-m68knommu-allow-configure-of-FEC-for-M520x-CPU-family.txt
-Patch20350: 2426-select-best-network-based-on-rssi.txt
-Patch20351: 2427-check-if-disassociation-is-for-us-before-processing-it.txt
-Patch20352: 2429-INET-congestion-and-af_ops-can-be-const.txt
-Patch20353: 2430-NET-Change-memcmp-ETH_ALEN-to-compare_ether_addr.txt
-Patch20354: 2431-NETFILTER-net-ipv-46-netfilter.c-cleanups.txt
-Patch20355: 2434-NETFILTER-Fix-return-value-confusion-in-PPTP-NAT-helper.txt
-Patch20356: 2435-NETFILTER-Remove-unused-function-from-NAT-protocol-helpers.txt
-Patch20357: 2436-NETFILTER-Fix-timeout-sysctls-on-big-endian-64bit-architectures.txt
-Patch20358: 2438-RXRPC-Decrease-number-of-pointer-derefs-in-connection.c.txt
-Patch20359: 2439-NET-Remove-unneeded-kmalloc-return-value-casts.txt
-Patch20360: 2441-IRDA-kill-drivers-net-irda-sir_core.c.txt
-Patch20361: 2442-IRDA-DONGLE_OLD-remove-dependency-on-non-existing-symbol.txt
-Patch20362: 2454-drivers-net-gianfar_sysfs.c-update-email-address-of-Kumar-Gala.txt
-Patch20363: 2456-netfilter-headers-included-twice.txt
-Patch20364: 2482-Fix-net-core-wireless.c-link-failure.txt
-Patch20365: 2529-IPV6-Fix-modular-build-with-netfilter-enabled.txt
-Patch20366: 2535-scan-at-least-once-before-selecting-a-network-by-essid.txt
-Patch20367: 2548-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt
-Patch20368: 2555-ieee80211_wx_set_auth-ieee80211_wx_get_auth-based-on-patch-by-Larry-Finger.txt
-Patch20369: 2556-some-comment-stuff.txt
-Patch20370: 2577-NET-Some-more-missing-include-etherdevice.h-includes.txt
-Patch20371: 2578-NETFILTER-ip_ct_proto_gre_fini-cannot-be-__exit.txt
-Patch20372: 2579-IPV6-Avoid-calling-ip6_xmit-with-NULL-sk.txt
-Patch20373: 2580-NET-Remove-more-unneeded-typecasts-on-malloc.txt
-Patch20374: 2581-NET-Fix-diverter-build.txt
-Patch20375: 2582-PKT_SCHED-ematch-Remove-bogus-include.txt
-Patch20376: 2583-PKT_SCHED-net-sched-Kconfig-fix-typo-in-NET_EMATCH_META-description.txt
-Patch20377: 2604-cs89x0-fix-setting-of-ALLOW_DMA.txt
-Patch20378: 2605-cs89x0-Fix-the-Kconfig-help-text.txt
-Patch20379: 2618-capable-capability.h-net.txt
-Patch20380: 2822-m68k-lvalues-abuse-in-mac8390.txt
-Patch20381: 2839-m68k-NULL-noise-removal.txt
-Patch20382: 2872-add-copyright-and-license-headers-to-all-softmac-files.txt
-Patch20383: 2873-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt
-Patch20384: 2874-move-EXPORT_SYMBOL_GPL-right-after-functions.txt
-Patch20385: 2876-corruption-during-e100-MDI-register-access.txt
-Patch20386: 2877-CONFIG_AIRO-needs-CONFIG_CRYPTO.txt
-Patch20387: 2878-gfar-fix-compile-error.txt
-Patch20388: 2879-gianfar-mii-Use-proper-resource-for-MII-memory-region.txt
-Patch20389: 2880-phy-Added-a-macro-to-represent-the-string-format-used-to-match-a-phy-device.txt
-Patch20390: 2881-gianfar-Use-new-PHY_ID_FMT-macro.txt
-Patch20391: 2882-replace-MODULE_PARM-in-tulip-uli526x.c.txt
-Patch20392: 2883-wireless-atmel-add-IWENCODEEXT-IWAUTH-and-association-event-support.txt
-Patch20393: 2884-bonding-UPDATED-hash-table-corruption-in-bond_alb.c.txt
-Patch20394: 2886-via-velocity-use-NETIF_F_IP_CSUM-hardware-only-support-IPv4.txt
-Patch20395: 2887-TIPC-Initial-merge.txt
-Patch20396: 2888-TIPC-Use-dynamically-allocated-family-id-with-NETLINK_GENERIC.txt
-Patch20397: 2889-TIPC-Fixed-bug-in-disc_timeout.txt
-Patch20398: 2890-TIPC-Moved-configuration-interface-into-tipc_config.h.txt
-Patch20399: 2891-TIPC-License-header-update.txt
-Patch20400: 2892-TIPC-Cleaned-up-info-warn-err-macros.txt
-Patch20401: 2893-TIPC-Update-of-file-headers.txt
-Patch20402: 2894-TIPC-More-updates-of-file-headers.txt
-Patch20403: 2896-TIPC-Fix-64-bit-build-warnings.txt
-Patch20404: 2977-genetlink-don-t-touch-module-ref-count.txt
-Patch20405: 2990-NET-Use-NIP6_FMT-in-kernel.h.txt
-Patch20406: 2991-NET-Clean-up-comments-for-sk_chk_filter.txt
-Patch20407: 2992-XFRM-IPsec-tunnel-wildcard-address-support.txt
-Patch20408: 2993-PKT_SCHED-Change-default-clock-source-to-gettimeofday.txt
-Patch20409: 3094-Spelling-fix-in-IPW2100-and-IPW2200-Kconfig-entries.txt
-Patch20410: 3096-drivers-net-wireless-Kconfig-remove-dead-URL.txt
-Patch20411: 3146-cs89x0-credit-Dmitry-Pervushin.txt
-Patch20412: 3147-cs89x0-use-elif-instead-of-else-if-endif.txt
-Patch20413: 3148-cs89x0-use-u16-for-device-register-data.txt
-Patch20414: 3149-cs89x0-add-ixdp2351-support.txt
-Patch20415: 3165-x86-Work-around-compiler-code-generation-bug-with-Os.txt
-Patch20416: 3211-prism54-islpci_eth.c-dev_kfree_skb-used-with-interrupts-disabled.txt
-Patch20417: 3212-iw_handler.h-SIOCSIWNAME-SIOCSIWCOMMIT-in-comment.txt
-Patch20418: 3213-ipw2200-do-not-sleep-in-ipw_request_direct_scan.txt
-Patch20419: 3214-hostap-allow-flashing-firmware.txt
-Patch20420: 3215-drivers-net-wireless-correct-reported-ssid-lengths.txt
-Patch20421: 3216-ipw2100-remove-code-for-WIRELESS_EXT-18.txt
-Patch20422: 3217-hostap-don-t-include-C-files-in-hostap_main.c.txt
-Patch20423: 3266-cs89x0-credit-Dmitry-Pervushin.txt
-Patch20424: 3309-IPV6-Preserve-procfs-IPV6-address-output-format.txt
-Patch20425: 3310-PKT_SCHED-sch_prio-fix-qdisc-bands-init.txt
-Patch20426: 3311-NET-Fix-whitespace-issues-in-net-core-filter.c.txt
-Patch20427: 3312-NETFILTER-ip-6-t_policy-Fix-compilation-warnings.txt
-Patch20428: 3316-TG3-Refine-nvram-locking.txt
-Patch20429: 3317-NETFILTER-ip_conntrack_proto_gre.c-needs-linux-interrupt.h.txt
-Patch20430: 3319-IPV4-rt_cache_stat-can-be-statically-defined.txt
-Patch20431: 3321-mv643xx_eth-2.6.16-needs-ip.h-and-in.h.txt
-Patch20432: 3322-mv643xx_eth-Fix-dma_map-dma_unmap-relations.txt
-Patch20433: 3323-mv643xx_eth-Fix-a-NULL-pointer-dereference.txt
-Patch20434: 3326-mv643xx_eth-Fix-handling-of-small-unaligned-fragments.txt
-Patch20435: 3327-mv643xx_eth-iounmap-the-correct-SRAM-buffer.txt
-Patch20436: 3328-mv643xx_eth-Hold-spinlocks-only-where-needed.txt
-Patch20437: 3329-mv643xx_eth-Request-HW-checksum-generation-only-for-IPv4.txt
-Patch20438: 3330-mv643xx_eth-Fix-transmit-skb-accounting.txt
-Patch20439: 3331-mv643xx_eth-Merge-open-and-stop-helper-functions.txt
-Patch20440: 3332-mv643xx_eth-Remove-needless-mask-of-extended-intr-register.txt
-Patch20441: 3333-spidernet-check-if-firmware-was-loaded-correctly.txt
-Patch20442: 3334-spidernet-read-firmware-from-the-OF-device-tree.txt
-Patch20443: 3335-spidernet-fix-HW-structures-for-64-bit-dma_addr_t.txt
-Patch20444: 3336-spidernet-performance-optimizations.txt
-Patch20445: 3337-spidernet-fix-missing-include.txt
-Patch20446: 3338-e1000-Fix-jumbo-frame-performance.txt
-Patch20447: 3339-e1000-Fix-TSO.txt
-Patch20448: 3340-e1000-General-Fixes.txt
-Patch20449: 3341-e1000-Fix-SoL-IDER-link-and-loopback.txt
-Patch20450: 3342-e1000-Fix-ASF-AMT-for-8257-1-2-3-controllers.txt
-Patch20451: 3343-e1000-Fix-PHY-config-for-82573-controller.txt
-Patch20452: 3344-Fix-e1000-stats.txt
-Patch20453: 3345-e1000-Fix-LED-functionality-for-82573.txt
-Patch20454: 3346-e1000-Fix-adapter-structure-and-prepare-for-multique-fix.txt
-Patch20455: 3347-e1000-Fix-mulitple-queues.txt
-Patch20456: 3348-e1000-Fix-loopback-logic.txt
-Patch20457: 3349-e1000-Fix-PHY-reset-when-blocked.txt
-Patch20458: 3350-e1000-Fix-EEPROM-read-logic.txt
-Patch20459: 3351-e1000-Fix-flow-control-water-marks.txt
-Patch20460: 3352-e1000-Fix-TX-queue-length-based-on-link-speed.txt
-Patch20461: 3353-e1000-Fix-Desc.-Rings-and-Jumbo-Frames.txt
-Patch20462: 3354-e1000-Fix-TX-timeout-logic.txt
-Patch20463: 3355-e1000-Fix-desc.-clean-up.txt
-Patch20464: 3356-e1000-Fix-bit-22-TXDCTL-for-82571-82572-controllers.txt
-Patch20465: 3357-e1000-Fix-collision-distance.txt
-Patch20466: 3358-drivers-net-sk98lin-possible-cleanups.txt
-Patch20467: 3359-e1000-Fix-__pskb_pull_tail.txt
-Patch20468: 3360-e1000-Fix-VLAN-support.txt
-Patch20469: 3361-e1000-Fixed-frame-size-logic.txt
-Patch20470: 3362-e1000-Fix-Netpoll-issue.txt
-Patch20471: 3363-e1000-Added-interrupt-auto-mask-support.txt
-Patch20472: 3364-e1000-Added-cleaned_count-to-RX-buffer-allocation.txt
-Patch20473: 3365-e1000-Added-hardware-support-for-PCI-express-82546GB-and-82571-Fiber.txt
-Patch20474: 3366-e1000-Added-firmware-version-reporting-for-8257-1-2-3-controllers.txt
-Patch20475: 3367-e1000-Added-PCIe-bus-information.txt
-Patch20476: 3368-e1000-Added-variable-to-handle-return-values-for-pci_enable_-functions.txt
-Patch20477: 3369-e1000-Added-copy-break-code.txt
-Patch20478: 3370-e1000-Cleaned-up-code-and-removed-hard-coded-numbers.txt
-Patch20479: 3371-e1000-Removed-unused-variables-and-initialized-variables.txt
-Patch20480: 3374-drivers-net-use-time_after-and-friends.txt
-Patch20481: 3375-airo-Off-by-one-channel-fix.txt
-Patch20482: 3379-drivers-net-arcnet-possible-cleanups.txt
-Patch20483: 3380-drivers-net-s2io.c-make-code-static.txt
-Patch20484: 3386-SCTP-Fix-potential-race-condition-between-sctp_close-and-sctp_rcv.txt
-Patch20485: 3387-SCTP-Fix-sctp_cookie-alignment-in-the-packet.txt
-Patch20486: 3388-SCTP-sctp-doesn-t-show-all-associations-endpoints-in-proc.txt
-Patch20487: 3389-SCTP-Fix-sctp_assoc_seq_show-panics-on-big-endian-systems.txt
-Patch20488: 3390-SCTP-Fix-bad-sysctl-formatting-of-SCTP-timeout-values-on-64-bit-m-cs.txt
-Patch20489: 3391-SCTP-Fix-machine-check-connection-hang-on-IA64.txt
-Patch20490: 3392-SCTP-Fix-couple-of-races-between-sctp_peeloff-and-sctp_rcv.txt
-Patch20491: 3393-SCTP-Fix-sctp_rcv_ootb-to-handle-the-last-chunk-of-a-packet-correctly.txt
-Patch20492: 3395-PKT_SCHED-Handle-SCTP-DCCP-in-sfq_hash.txt
-Patch20493: 3396-EBTABLES-Handle-SCTP-DCCP-in-ebt_-ip-log.txt
-Patch20494: 3397-NET-signed-long-long.txt
-Patch20495: 3398-PKTGEN-Replacing-with-compare-is_zero-_ether_addr-and-ETH_ALEN.txt
-Patch20496: 3403-CASSINI-Fix-printk-warning.txt
-Patch20497: 3404-NET-Use-is_zero_ether_addr-in-net-core-netpoll.c.txt
-Patch20498: 3411-TIPC-Minor-changes-to-includes.txt
-Patch20499: 3412-TIPC-Updated-link-priority-macros.txt
-Patch20500: 3414-TIPC-Move-ethernet-protocol-id-to-linux-if_ether.h.txt
-Patch20501: 3415-TIPC-Remove-unused-includes.txt
-Patch20502: 3416-TIPC-Add-help-text-for-TIPC-configuration-option.txt
-Patch20503: 3417-TIPC-Group-protocols-with-sub-options-in-Kconfig.txt
-Patch20504: 3418-TIPC-Avoid-polluting-the-global-namespace.txt
-Patch20505: 3421-e100-Fix-TX-hang-and-RMCP-Ping-issue-due-to-a-microcode-loading-issue.txt
-Patch20506: 3422-e100-Handle-the-return-values-from-pci_-functions.txt
-Patch20507: 3423-e100-e100-whitespace-fixes.txt
-Patch20508: 3424-starfire-Implement-suspend-resume.txt
-Patch20509: 3425-sky2-receive-buffer-alignment.txt
-Patch20510: 3426-sky2-call-pci_set_consistent_dma_mask.txt
-Patch20511: 3427-sky2-version-0.12.txt
-Patch20512: 3428-sky2-fix-ram-buffer-for-Yukon-FE-rev-2.txt
-Patch20513: 3429-sky2-write-barrier-s.txt
-Patch20514: 3430-sky2-don-t-bother-clearing-status-ring-elements.txt
-Patch20515: 3431-sky2-optimize-for-32-bit-dma.txt
-Patch20516: 3432-sky2-ratelimit-error-messages.txt
-Patch20517: 3433-sky2-use-kzalloc.txt
-Patch20518: 3434-sky2-don-t-inline-so-much.txt
-Patch20519: 3435-sky2-more-conservative-transmit-locking.txt
-Patch20520: 3436-sky2-0.13-version.txt
-Patch20521: 3437-Fix-warning-with-b44.c-on-64bit-boxes.txt
-Patch20522: 3442-skge-fix-dma-mask-setup.txt
-Patch20523: 3446-IPV4-RT_CACHE_STAT_INC-warning-fix.txt
-Patch20524: 3450-e1000-Added-RX-buffer-enhancements.txt
-Patch20525: 3451-e1000-Added-functions-to-save-and-restore-config.txt
-Patch20526: 3452-e1000-Added-functions-declarations.txt
-Patch20527: 3453-e1000-Fix-whitespace.txt
-Patch20528: 3454-e1000-Added-driver-comments.txt
-Patch20529: 3455-e1000-fix-receive-breakage.txt
-Patch20530: 3456-e1000-fix-compile-warning.txt
-Patch20531: 3461-CASSINI-dont-touch-page_count.txt
-Patch20532: 3463-PKTGEN-Respect-hard_header_len-of-device.txt
-Patch20533: 3465-IPV4-Fix-multiple-bugs-in-IGMPv3.txt
-Patch20534: 3509-uml-arch-Kconfig-menu-cleanups.txt
-Patch20535: 3523-svcrpc-save-and-restore-the-daddr-field-when-request-deferred.txt
-Patch20536: 3530-svcrpc-gss-handle-the-GSS_S_CONTINUE.txt
-Patch20537: 3531-svcrpc-gss-server-context-init-failure-handling.txt
-Patch20538: 3532-svcrpc-gss-svc-context-creation-error-handling.txt
-Patch20539: 3631-wireless-import-bcm43xx-sources.txt
-Patch20540: 3632-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt
-Patch20541: 3633-BNX2-Fix-VLAN-on-ASF.txt
-Patch20542: 3634-BNX2-Improve-handshake-with-firmware.txt
-Patch20543: 3635-BNX2-Misc.-fixes.txt
-Patch20544: 3636-BNX2-Fix-UDP-checksum-verification.txt
-Patch20545: 3637-BNX2-Workaround-hw-interrupt-bug.txt
-Patch20546: 3638-BNX2-Fix-nvram-sizing.txt
-Patch20547: 3639-BNX2-Use-netdev_priv.txt
-Patch20548: 3640-BNX2-Add-PHY-loopback-test.txt
-Patch20549: 3641-BNX2-Update-version-and-copyright-year.txt
-Patch20550: 3642-NET-more-whitespace-issues-in-net-core-filter.c.txt
-Patch20551: 3643-NET-Fix-some-whitespace-issues-in-af_packet.c.txt
-Patch20552: 3644-SUNGEM-Make-PM-of-PHYs-more-reliable-2.txt
-Patch20553: 3645-NET-Fix-skb-fclone-error-path-handling.txt
-Patch20554: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
-Patch20555: 3656-AF_KEY-no-message-type-set.txt
-Patch20556: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
-Patch20557: 3688-sundance-Really-read-addr-0.txt
-Patch20558: 3689-bonding-fix-get_settings-error-checking.txt
-Patch20559: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
-Patch20560: 3691-b44-fix-laptop-carrier-detect.txt
-Patch20561: 3692-s2io-scatter-gather-fix.txt
-Patch20562: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
-Patch20563: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
-Patch20564: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
-Patch20565: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
-Patch20566: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
-Patch20567: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
-Patch20568: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
-Patch20569: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
-Patch20570: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
-Patch20571: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
-Patch20572: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
-Patch20573: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
-Patch20574: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
-Patch20575: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
-Patch20576: 3717-ieee80211-Add-LEAP-authentication-type.txt
-Patch20577: 3718-ieee80211-add-flags-for-all-geo-channels.txt
-Patch20578: 3719-ieee80211-Add-spectrum-management-information.txt
-Patch20579: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
-Patch20580: 3721-ieee80211-TIM-information-element-parsing.txt
-Patch20581: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
-Patch20582: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
-Patch20583: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
-Patch20584: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
-Patch20585: 3753-sync-with-svn.berlios.de.txt
-Patch20586: 3754-remove-linux-version-compatibility-code.txt
-Patch20587: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
-Patch20588: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
-Patch20589: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
-Patch20590: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
-Patch20591: 3762-Typo-corrections-for-ieee80211.txt
-Patch20592: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
-Patch20593: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
-Patch20594: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
-Patch20595: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
-Patch20596: 3774-AIRO-_CS-CRYPTO-fixes.txt
-Patch20597: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
-Patch20598: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
-Patch20599: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
-Patch20600: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
-Patch20601: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
-Patch20602: 3780-ipw2100-Add-generic-geo-information.txt
-Patch20603: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
-Patch20604: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
-Patch20605: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
-Patch20606: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
-Patch20607: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
-Patch20608: 3786-ipw2200-Bluetooth-coexistence-support.txt
-Patch20609: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
-Patch20610: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
-Patch20611: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
-Patch20612: 3791-ipw2200-stack-reduction.txt
-Patch20613: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
-Patch20614: 3793-ipw2200-increase-ipw2200-driver-version.txt
-Patch20615: 3796-ipw2200-Disable-hwcrypto-by-default.txt
-Patch20616: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
-Patch20617: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
-Patch20618: 3800-IPV4-igmp-remove-pointless-printk.txt
-Patch20619: 3801-TCP-H-TCP-Fix-accounting.txt
-Patch20620: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
-Patch20621: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
-Patch20622: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
-Patch20623: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
-Patch20624: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
-Patch20625: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
-Patch20626: 3904-BRIDGE-Fix-device-delete-race.txt
-Patch20627: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
-Patch20628: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
-Patch20629: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
-Patch20630: 3962-lp486e-remove-SLOW_DOWN_IO.txt
-Patch20631: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
-Patch20632: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
-Patch20633: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
-Patch20634: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
-Patch20635: 4128-NET-snap-needs-hardware-checksum-fix.txt
-Patch20636: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
-Patch20637: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
-Patch20638: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
-Patch20639: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
-Patch20640: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
-Patch20641: 4136-TG3-Flush-tg3_reset_task.txt
-Patch20642: 4137-TG3-Update-driver-version-and-release-date.txt
-Patch20643: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
-Patch20644: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
+Patch20273: 1666-IRQ-type-flags.txt
+Patch20274: 1778-Eliminate-__attribute__-packed-warnings-for-gcc-4.1.txt
+Patch20275: 1796-tiny-Trim-non-IPX-builds.txt
+Patch20276: 1844-ARM-Update-am79c961-to-use-struct-platform_driver.txt
+Patch20277: 1851-sk98lin-routine-called-from-probe-marked-__init.txt
+Patch20278: 1854-sk98lin-use-kzalloc.txt
+Patch20279: 1856-sk98lin-error-handling-of-pci-setup.txt
+Patch20280: 1858-PPC44x-EMAC-driver-disable-TX-status-deferral-in-half-duplex-mode.txt
+Patch20281: 1860-tulip-enable-multiport-NIC-BIOS-fixups-for-x86_64.txt
+Patch20282: 1862-Add-MIPS-dependency-for-dm9000-driver.txt
+Patch20283: 1863-drivers-net-Kconfig-indentation-fix.txt
+Patch20284: 1864-drivers-net-bonding-bonding.h-extern-inline-static-inline.txt
+Patch20285: 1865-drivers-net-gianfar.h-extern-inline-static-inline.txt
+Patch20286: 1866-e1000-Fix-invalid-memory-reference.txt
+Patch20287: 1867-remove-bouncing-mail-address-of-mv643xx_eth-maintainer.txt
+Patch20288: 1868-forcedeth-TSO-fix-for-large-buffers.txt
+Patch20289: 1869-fix-a-few-warning-cleanup_card-defined-but-not-used.txt
+Patch20290: 1870-patch-ipw2100-support-WEXT-18-enc_capa-v3.txt
+Patch20291: 1871-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt
+Patch20292: 1872-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt
+Patch20293: 1873-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt
+Patch20294: 1874-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt
+Patch20295: 1875-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt
+Patch20296: 1876-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt
+Patch20297: 1877-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt
+Patch20298: 1878-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt
+Patch20299: 1879-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt
+Patch20300: 1880-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt
+Patch20301: 1881-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt
+Patch20302: 1882-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt
+Patch20303: 1883-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt
+Patch20304: 1884-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt
+Patch20305: 1885-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt
+Patch20306: 1886-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt
+Patch20307: 1887-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt
+Patch20308: 1888-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt
+Patch20309: 1889-IPV6-ROUTE-Try-finding-the-next-best-route.txt
+Patch20310: 1890-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt
+Patch20311: 1891-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt
+Patch20312: 1892-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt
+Patch20313: 1893-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt
+Patch20314: 1894-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt
+Patch20315: 1895-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt
+Patch20316: 1896-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt
+Patch20317: 1897-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt
+Patch20318: 1898-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt
+Patch20319: 2117-NET-Convert-net-ipv4-ipv6-sched-to-netdev_priv.txt
+Patch20320: 2118-PKT_SCHED-Use-USEC_PER_SEC.txt
+Patch20321: 2119-PKT_SCHED-Convert-tc-action-functions-to-single-skb-pointers.txt
+Patch20322: 2120-PKT_SCHED-Remove-some-obsolete-policer-exports.txt
+Patch20323: 2121-PKT_SCHED-Fix-memory-leak-when-dumping-in-pedit-action.txt
+Patch20324: 2122-PKT_SCHED-Prefix-tc-actions-with-act_.txt
+Patch20325: 2123-NET-Change-some-if-x-BUG-to-BUG_ON-x.txt
+Patch20326: 2125-NET-Add-IFB-Intermediate-Functional-Block-network-device.txt
+Patch20327: 2126-PKT_SCHED-Fix-qdisc-return-code.txt
+Patch20328: 2127-IPV4-ip_output.c-needs-xfrm.h.txt
+Patch20329: 2128-IPV6-Set-skb-priority-in-ip6_output.c.txt
+Patch20330: 2132-INET_DIAG-Use-inet_twsk-with-TIME_WAIT-sockets.txt
+Patch20331: 2133-INET_DIAG-whitespace-simple-cleanups.txt
+Patch20332: 2134-INET_DIAG-Introduce-inet_twsk_diag_dump-inet_twsk_diag_fill.txt
+Patch20333: 2135-INET_DIAG-Introduce-sk_diag_fill.txt
+Patch20334: 2136-spelling-s-usefull-useful.txt
+Patch20335: 2138-spelling-s-retreive-retrieve.txt
+Patch20336: 2139-spelling-s-trough-through.txt
+Patch20337: 2218-try-to-reassociate-when-being-disassociated-from-the-AP.txt
+Patch20338: 2222-add-fixme-for-disassoc.txt
+Patch20339: 2373-drivers-net-irda-irport.c-cleanups.txt
+Patch20340: 2374-turn-const-static-into-static-const.txt
+Patch20341: 2420-m68knommu-allow-configure-of-FEC-for-M520x-CPU-family.txt
+Patch20342: 2426-select-best-network-based-on-rssi.txt
+Patch20343: 2427-check-if-disassociation-is-for-us-before-processing-it.txt
+Patch20344: 2429-INET-congestion-and-af_ops-can-be-const.txt
+Patch20345: 2430-NET-Change-memcmp-ETH_ALEN-to-compare_ether_addr.txt
+Patch20346: 2431-NETFILTER-net-ipv-46-netfilter.c-cleanups.txt
+Patch20347: 2434-NETFILTER-Fix-return-value-confusion-in-PPTP-NAT-helper.txt
+Patch20348: 2435-NETFILTER-Remove-unused-function-from-NAT-protocol-helpers.txt
+Patch20349: 2436-NETFILTER-Fix-timeout-sysctls-on-big-endian-64bit-architectures.txt
+Patch20350: 2438-RXRPC-Decrease-number-of-pointer-derefs-in-connection.c.txt
+Patch20351: 2439-NET-Remove-unneeded-kmalloc-return-value-casts.txt
+Patch20352: 2441-IRDA-kill-drivers-net-irda-sir_core.c.txt
+Patch20353: 2442-IRDA-DONGLE_OLD-remove-dependency-on-non-existing-symbol.txt
+Patch20354: 2454-drivers-net-gianfar_sysfs.c-update-email-address-of-Kumar-Gala.txt
+Patch20355: 2456-netfilter-headers-included-twice.txt
+Patch20356: 2482-Fix-net-core-wireless.c-link-failure.txt
+Patch20357: 2529-IPV6-Fix-modular-build-with-netfilter-enabled.txt
+Patch20358: 2535-scan-at-least-once-before-selecting-a-network-by-essid.txt
+Patch20359: 2548-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt
+Patch20360: 2555-ieee80211_wx_set_auth-ieee80211_wx_get_auth-based-on-patch-by-Larry-Finger.txt
+Patch20361: 2556-some-comment-stuff.txt
+Patch20362: 2577-NET-Some-more-missing-include-etherdevice.h-includes.txt
+Patch20363: 2578-NETFILTER-ip_ct_proto_gre_fini-cannot-be-__exit.txt
+Patch20364: 2579-IPV6-Avoid-calling-ip6_xmit-with-NULL-sk.txt
+Patch20365: 2580-NET-Remove-more-unneeded-typecasts-on-malloc.txt
+Patch20366: 2581-NET-Fix-diverter-build.txt
+Patch20367: 2582-PKT_SCHED-ematch-Remove-bogus-include.txt
+Patch20368: 2583-PKT_SCHED-net-sched-Kconfig-fix-typo-in-NET_EMATCH_META-description.txt
+Patch20369: 2618-capable-capability.h-net.txt
+Patch20370: 2822-m68k-lvalues-abuse-in-mac8390.txt
+Patch20371: 2839-m68k-NULL-noise-removal.txt
+Patch20372: 2872-add-copyright-and-license-headers-to-all-softmac-files.txt
+Patch20373: 2873-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt
+Patch20374: 2874-move-EXPORT_SYMBOL_GPL-right-after-functions.txt
+Patch20375: 2876-corruption-during-e100-MDI-register-access.txt
+Patch20376: 2877-CONFIG_AIRO-needs-CONFIG_CRYPTO.txt
+Patch20377: 2878-gfar-fix-compile-error.txt
+Patch20378: 2879-gianfar-mii-Use-proper-resource-for-MII-memory-region.txt
+Patch20379: 2880-phy-Added-a-macro-to-represent-the-string-format-used-to-match-a-phy-device.txt
+Patch20380: 2881-gianfar-Use-new-PHY_ID_FMT-macro.txt
+Patch20381: 2882-replace-MODULE_PARM-in-tulip-uli526x.c.txt
+Patch20382: 2883-wireless-atmel-add-IWENCODEEXT-IWAUTH-and-association-event-support.txt
+Patch20383: 2884-bonding-UPDATED-hash-table-corruption-in-bond_alb.c.txt
+Patch20384: 2886-via-velocity-use-NETIF_F_IP_CSUM-hardware-only-support-IPv4.txt
+Patch20385: 2887-TIPC-Initial-merge.txt
+Patch20386: 2888-TIPC-Use-dynamically-allocated-family-id-with-NETLINK_GENERIC.txt
+Patch20387: 2889-TIPC-Fixed-bug-in-disc_timeout.txt
+Patch20388: 2890-TIPC-Moved-configuration-interface-into-tipc_config.h.txt
+Patch20389: 2891-TIPC-License-header-update.txt
+Patch20390: 2892-TIPC-Cleaned-up-info-warn-err-macros.txt
+Patch20391: 2893-TIPC-Update-of-file-headers.txt
+Patch20392: 2894-TIPC-More-updates-of-file-headers.txt
+Patch20393: 2896-TIPC-Fix-64-bit-build-warnings.txt
+Patch20394: 2977-genetlink-don-t-touch-module-ref-count.txt
+Patch20395: 2990-NET-Use-NIP6_FMT-in-kernel.h.txt
+Patch20396: 2991-NET-Clean-up-comments-for-sk_chk_filter.txt
+Patch20397: 2992-XFRM-IPsec-tunnel-wildcard-address-support.txt
+Patch20398: 2993-PKT_SCHED-Change-default-clock-source-to-gettimeofday.txt
+Patch20399: 3094-Spelling-fix-in-IPW2100-and-IPW2200-Kconfig-entries.txt
+Patch20400: 3096-drivers-net-wireless-Kconfig-remove-dead-URL.txt
+Patch20401: 3165-x86-Work-around-compiler-code-generation-bug-with-Os.txt
+Patch20402: 3211-prism54-islpci_eth.c-dev_kfree_skb-used-with-interrupts-disabled.txt
+Patch20403: 3212-iw_handler.h-SIOCSIWNAME-SIOCSIWCOMMIT-in-comment.txt
+Patch20404: 3213-ipw2200-do-not-sleep-in-ipw_request_direct_scan.txt
+Patch20405: 3214-hostap-allow-flashing-firmware.txt
+Patch20406: 3215-drivers-net-wireless-correct-reported-ssid-lengths.txt
+Patch20407: 3216-ipw2100-remove-code-for-WIRELESS_EXT-18.txt
+Patch20408: 3217-hostap-don-t-include-C-files-in-hostap_main.c.txt
+Patch20409: 3309-IPV6-Preserve-procfs-IPV6-address-output-format.txt
+Patch20410: 3310-PKT_SCHED-sch_prio-fix-qdisc-bands-init.txt
+Patch20411: 3311-NET-Fix-whitespace-issues-in-net-core-filter.c.txt
+Patch20412: 3312-NETFILTER-ip-6-t_policy-Fix-compilation-warnings.txt
+Patch20413: 3316-TG3-Refine-nvram-locking.txt
+Patch20414: 3317-NETFILTER-ip_conntrack_proto_gre.c-needs-linux-interrupt.h.txt
+Patch20415: 3319-IPV4-rt_cache_stat-can-be-statically-defined.txt
+Patch20416: 3321-mv643xx_eth-2.6.16-needs-ip.h-and-in.h.txt
+Patch20417: 3322-mv643xx_eth-Fix-dma_map-dma_unmap-relations.txt
+Patch20418: 3323-mv643xx_eth-Fix-a-NULL-pointer-dereference.txt
+Patch20419: 3326-mv643xx_eth-Fix-handling-of-small-unaligned-fragments.txt
+Patch20420: 3327-mv643xx_eth-iounmap-the-correct-SRAM-buffer.txt
+Patch20421: 3328-mv643xx_eth-Hold-spinlocks-only-where-needed.txt
+Patch20422: 3329-mv643xx_eth-Request-HW-checksum-generation-only-for-IPv4.txt
+Patch20423: 3330-mv643xx_eth-Fix-transmit-skb-accounting.txt
+Patch20424: 3331-mv643xx_eth-Merge-open-and-stop-helper-functions.txt
+Patch20425: 3332-mv643xx_eth-Remove-needless-mask-of-extended-intr-register.txt
+Patch20426: 3333-spidernet-check-if-firmware-was-loaded-correctly.txt
+Patch20427: 3334-spidernet-read-firmware-from-the-OF-device-tree.txt
+Patch20428: 3335-spidernet-fix-HW-structures-for-64-bit-dma_addr_t.txt
+Patch20429: 3336-spidernet-performance-optimizations.txt
+Patch20430: 3337-spidernet-fix-missing-include.txt
+Patch20431: 3338-e1000-Fix-jumbo-frame-performance.txt
+Patch20432: 3339-e1000-Fix-TSO.txt
+Patch20433: 3340-e1000-General-Fixes.txt
+Patch20434: 3341-e1000-Fix-SoL-IDER-link-and-loopback.txt
+Patch20435: 3342-e1000-Fix-ASF-AMT-for-8257-1-2-3-controllers.txt
+Patch20436: 3343-e1000-Fix-PHY-config-for-82573-controller.txt
+Patch20437: 3344-Fix-e1000-stats.txt
+Patch20438: 3345-e1000-Fix-LED-functionality-for-82573.txt
+Patch20439: 3346-e1000-Fix-adapter-structure-and-prepare-for-multique-fix.txt
+Patch20440: 3347-e1000-Fix-mulitple-queues.txt
+Patch20441: 3348-e1000-Fix-loopback-logic.txt
+Patch20442: 3349-e1000-Fix-PHY-reset-when-blocked.txt
+Patch20443: 3350-e1000-Fix-EEPROM-read-logic.txt
+Patch20444: 3351-e1000-Fix-flow-control-water-marks.txt
+Patch20445: 3352-e1000-Fix-TX-queue-length-based-on-link-speed.txt
+Patch20446: 3353-e1000-Fix-Desc.-Rings-and-Jumbo-Frames.txt
+Patch20447: 3354-e1000-Fix-TX-timeout-logic.txt
+Patch20448: 3355-e1000-Fix-desc.-clean-up.txt
+Patch20449: 3356-e1000-Fix-bit-22-TXDCTL-for-82571-82572-controllers.txt
+Patch20450: 3357-e1000-Fix-collision-distance.txt
+Patch20451: 3358-drivers-net-sk98lin-possible-cleanups.txt
+Patch20452: 3359-e1000-Fix-__pskb_pull_tail.txt
+Patch20453: 3360-e1000-Fix-VLAN-support.txt
+Patch20454: 3361-e1000-Fixed-frame-size-logic.txt
+Patch20455: 3362-e1000-Fix-Netpoll-issue.txt
+Patch20456: 3363-e1000-Added-interrupt-auto-mask-support.txt
+Patch20457: 3364-e1000-Added-cleaned_count-to-RX-buffer-allocation.txt
+Patch20458: 3365-e1000-Added-hardware-support-for-PCI-express-82546GB-and-82571-Fiber.txt
+Patch20459: 3366-e1000-Added-firmware-version-reporting-for-8257-1-2-3-controllers.txt
+Patch20460: 3367-e1000-Added-PCIe-bus-information.txt
+Patch20461: 3368-e1000-Added-variable-to-handle-return-values-for-pci_enable_-functions.txt
+Patch20462: 3369-e1000-Added-copy-break-code.txt
+Patch20463: 3370-e1000-Cleaned-up-code-and-removed-hard-coded-numbers.txt
+Patch20464: 3371-e1000-Removed-unused-variables-and-initialized-variables.txt
+Patch20465: 3374-drivers-net-use-time_after-and-friends.txt
+Patch20466: 3375-airo-Off-by-one-channel-fix.txt
+Patch20467: 3379-drivers-net-arcnet-possible-cleanups.txt
+Patch20468: 3380-drivers-net-s2io.c-make-code-static.txt
+Patch20469: 3386-SCTP-Fix-potential-race-condition-between-sctp_close-and-sctp_rcv.txt
+Patch20470: 3387-SCTP-Fix-sctp_cookie-alignment-in-the-packet.txt
+Patch20471: 3388-SCTP-sctp-doesn-t-show-all-associations-endpoints-in-proc.txt
+Patch20472: 3389-SCTP-Fix-sctp_assoc_seq_show-panics-on-big-endian-systems.txt
+Patch20473: 3390-SCTP-Fix-bad-sysctl-formatting-of-SCTP-timeout-values-on-64-bit-m-cs.txt
+Patch20474: 3391-SCTP-Fix-machine-check-connection-hang-on-IA64.txt
+Patch20475: 3392-SCTP-Fix-couple-of-races-between-sctp_peeloff-and-sctp_rcv.txt
+Patch20476: 3393-SCTP-Fix-sctp_rcv_ootb-to-handle-the-last-chunk-of-a-packet-correctly.txt
+Patch20477: 3395-PKT_SCHED-Handle-SCTP-DCCP-in-sfq_hash.txt
+Patch20478: 3396-EBTABLES-Handle-SCTP-DCCP-in-ebt_-ip-log.txt
+Patch20479: 3397-NET-signed-long-long.txt
+Patch20480: 3398-PKTGEN-Replacing-with-compare-is_zero-_ether_addr-and-ETH_ALEN.txt
+Patch20481: 3403-CASSINI-Fix-printk-warning.txt
+Patch20482: 3404-NET-Use-is_zero_ether_addr-in-net-core-netpoll.c.txt
+Patch20483: 3411-TIPC-Minor-changes-to-includes.txt
+Patch20484: 3412-TIPC-Updated-link-priority-macros.txt
+Patch20485: 3414-TIPC-Move-ethernet-protocol-id-to-linux-if_ether.h.txt
+Patch20486: 3415-TIPC-Remove-unused-includes.txt
+Patch20487: 3416-TIPC-Add-help-text-for-TIPC-configuration-option.txt
+Patch20488: 3417-TIPC-Group-protocols-with-sub-options-in-Kconfig.txt
+Patch20489: 3418-TIPC-Avoid-polluting-the-global-namespace.txt
+Patch20490: 3421-e100-Fix-TX-hang-and-RMCP-Ping-issue-due-to-a-microcode-loading-issue.txt
+Patch20491: 3422-e100-Handle-the-return-values-from-pci_-functions.txt
+Patch20492: 3423-e100-e100-whitespace-fixes.txt
+Patch20493: 3424-starfire-Implement-suspend-resume.txt
+Patch20494: 3425-sky2-receive-buffer-alignment.txt
+Patch20495: 3426-sky2-call-pci_set_consistent_dma_mask.txt
+Patch20496: 3427-sky2-version-0.12.txt
+Patch20497: 3428-sky2-fix-ram-buffer-for-Yukon-FE-rev-2.txt
+Patch20498: 3429-sky2-write-barrier-s.txt
+Patch20499: 3430-sky2-don-t-bother-clearing-status-ring-elements.txt
+Patch20500: 3431-sky2-optimize-for-32-bit-dma.txt
+Patch20501: 3432-sky2-ratelimit-error-messages.txt
+Patch20502: 3433-sky2-use-kzalloc.txt
+Patch20503: 3434-sky2-don-t-inline-so-much.txt
+Patch20504: 3435-sky2-more-conservative-transmit-locking.txt
+Patch20505: 3436-sky2-0.13-version.txt
+Patch20506: 3437-Fix-warning-with-b44.c-on-64bit-boxes.txt
+Patch20507: 3442-skge-fix-dma-mask-setup.txt
+Patch20508: 3446-IPV4-RT_CACHE_STAT_INC-warning-fix.txt
+Patch20509: 3450-e1000-Added-RX-buffer-enhancements.txt
+Patch20510: 3451-e1000-Added-functions-to-save-and-restore-config.txt
+Patch20511: 3452-e1000-Added-functions-declarations.txt
+Patch20512: 3453-e1000-Fix-whitespace.txt
+Patch20513: 3454-e1000-Added-driver-comments.txt
+Patch20514: 3455-e1000-fix-receive-breakage.txt
+Patch20515: 3456-e1000-fix-compile-warning.txt
+Patch20516: 3461-CASSINI-dont-touch-page_count.txt
+Patch20517: 3463-PKTGEN-Respect-hard_header_len-of-device.txt
+Patch20518: 3465-IPV4-Fix-multiple-bugs-in-IGMPv3.txt
+Patch20519: 3509-uml-arch-Kconfig-menu-cleanups.txt
+Patch20520: 3523-svcrpc-save-and-restore-the-daddr-field-when-request-deferred.txt
+Patch20521: 3530-svcrpc-gss-handle-the-GSS_S_CONTINUE.txt
+Patch20522: 3531-svcrpc-gss-server-context-init-failure-handling.txt
+Patch20523: 3532-svcrpc-gss-svc-context-creation-error-handling.txt
+Patch20524: 3631-wireless-import-bcm43xx-sources.txt
+Patch20525: 3632-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt
+Patch20526: 3633-BNX2-Fix-VLAN-on-ASF.txt
+Patch20527: 3634-BNX2-Improve-handshake-with-firmware.txt
+Patch20528: 3635-BNX2-Misc.-fixes.txt
+Patch20529: 3636-BNX2-Fix-UDP-checksum-verification.txt
+Patch20530: 3637-BNX2-Workaround-hw-interrupt-bug.txt
+Patch20531: 3638-BNX2-Fix-nvram-sizing.txt
+Patch20532: 3639-BNX2-Use-netdev_priv.txt
+Patch20533: 3640-BNX2-Add-PHY-loopback-test.txt
+Patch20534: 3641-BNX2-Update-version-and-copyright-year.txt
+Patch20535: 3642-NET-more-whitespace-issues-in-net-core-filter.c.txt
+Patch20536: 3643-NET-Fix-some-whitespace-issues-in-af_packet.c.txt
+Patch20537: 3644-SUNGEM-Make-PM-of-PHYs-more-reliable-2.txt
+Patch20538: 3645-NET-Fix-skb-fclone-error-path-handling.txt
+Patch20539: 3655-BONDING-Remove-CAP_NET_ADMIN-requirement-for-INFOQUERY-ioctl.txt
+Patch20540: 3656-AF_KEY-no-message-type-set.txt
+Patch20541: 3657-IPV6-MLDv2-fix-change-records-when-transitioning-to-from-inactive.txt
+Patch20542: 3688-sundance-Really-read-addr-0.txt
+Patch20543: 3689-bonding-fix-get_settings-error-checking.txt
+Patch20544: 3690-acenic-fix-checking-of-read_eeprom_byte-return-values.txt
+Patch20545: 3691-b44-fix-laptop-carrier-detect.txt
+Patch20546: 3692-s2io-scatter-gather-fix.txt
+Patch20547: 3695-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt
+Patch20548: 3696-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt
+Patch20549: 3697-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt
+Patch20550: 3699-mv643xx_eth-Fix-spinlock-recursion-bug.txt
+Patch20551: 3700-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt
+Patch20552: 3703-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt
+Patch20553: 3706-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt
+Patch20554: 3707-mv643xx_eth-use-MII-library-for-PHY-management.txt
+Patch20555: 3711-orinoco_cs-tweak-Vcc-debugging-messages.txt
+Patch20556: 3712-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt
+Patch20557: 3713-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt
+Patch20558: 3714-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt
+Patch20559: 3715-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt
+Patch20560: 3716-ieee80211-Log-if-netif_rx-drops-the-packet.txt
+Patch20561: 3717-ieee80211-Add-LEAP-authentication-type.txt
+Patch20562: 3718-ieee80211-add-flags-for-all-geo-channels.txt
+Patch20563: 3719-ieee80211-Add-spectrum-management-information.txt
+Patch20564: 3720-ieee80211-kmalloc-memset-kzalloc-cleanups.txt
+Patch20565: 3721-ieee80211-TIM-information-element-parsing.txt
+Patch20566: 3722-ieee80211-Add-TKIP-crypt-build_iv.txt
+Patch20567: 3723-ieee80211-Add-802.11h-data-type-and-structures.txt
+Patch20568: 3724-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt
+Patch20569: 3725-ieee80211-Add-802.11h-information-element-parsing.txt
+Patch20570: 3753-sync-with-svn.berlios.de.txt
+Patch20571: 3754-remove-linux-version-compatibility-code.txt
+Patch20572: 3758-ipw2100-Fix-setting-txpower-failed-problem.txt
+Patch20573: 3759-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt
+Patch20574: 3760-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt
+Patch20575: 3761-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt
+Patch20576: 3762-Typo-corrections-for-ieee80211.txt
+Patch20577: 3763-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt
+Patch20578: 3767-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
+Patch20579: 3768-SCTP-correct-the-number-of-INIT-retransmissions.txt
+Patch20580: 3769-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt
+Patch20581: 3774-AIRO-_CS-CRYPTO-fixes.txt
+Patch20582: 3775-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt
+Patch20583: 3776-drivers-net-wireless-ipw2200-possible-cleanups.txt
+Patch20584: 3777-ieee80211-trivial-fix-for-misplaced-s.txt
+Patch20585: 3778-ipw2100-Add-LEAP-authentication-algorithm-support.txt
+Patch20586: 3779-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt
+Patch20587: 3780-ipw2100-Add-generic-geo-information.txt
+Patch20588: 3781-ipw2100-remove-white-space-and-better-format-the-code.txt
+Patch20589: 3782-increase-ipw2100-driver-version-to-git-1.1.4.txt
+Patch20590: 3783-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt
+Patch20591: 3784-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt
+Patch20592: 3785-ipw2200-Add-LEAP-authentication-algorithm-support.txt
+Patch20593: 3786-ipw2200-Bluetooth-coexistence-support.txt
+Patch20594: 3788-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt
+Patch20595: 3789-ipw2200-add-module-parameter-to-enable-disable-roaming.txt
+Patch20596: 3790-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt
+Patch20597: 3791-ipw2200-stack-reduction.txt
+Patch20598: 3792-ipw2200-Fix-qos_cmd-param-switch-bug.txt
+Patch20599: 3793-ipw2200-increase-ipw2200-driver-version.txt
+Patch20600: 3796-ipw2200-Disable-hwcrypto-by-default.txt
+Patch20601: 3798-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt
+Patch20602: 3799-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt
+Patch20603: 3800-IPV4-igmp-remove-pointless-printk.txt
+Patch20604: 3801-TCP-H-TCP-Fix-accounting.txt
+Patch20605: 3806-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt
+Patch20606: 3807-Add-two-management-functions-to-ieee80211_rx.c.txt
+Patch20607: 3808-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
+Patch20608: 3839-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
+Patch20609: 3841-SUNGEM-Unbreak-Sun-GEM-chips.txt
+Patch20610: 3903-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
+Patch20611: 3904-BRIDGE-Fix-device-delete-race.txt
+Patch20612: 3905-NET-Do-not-export-inet_bind_bucket_create-twice.txt
+Patch20613: 3906-IPV6-tcp_v6_send_synack-release-the-destination.txt
+Patch20614: 3907-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
+Patch20615: 3962-lp486e-remove-SLOW_DOWN_IO.txt
+Patch20616: 3972-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
+Patch20617: 4105-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
+Patch20618: 4111-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
+Patch20619: 4114-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
+Patch20620: 4128-NET-snap-needs-hardware-checksum-fix.txt
+Patch20621: 4129-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
+Patch20622: 4130-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
+Patch20623: 4131-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
+Patch20624: 4132-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
+Patch20625: 4134-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
+Patch20626: 4136-TG3-Flush-tg3_reset_task.txt
+Patch20627: 4137-TG3-Update-driver-version-and-release-date.txt
+Patch20628: 4138-IPV4-Use-RCU-locking-in-fib_rules.txt
+Patch20629: 4139-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2027,750 +2012,720 @@
 %patch20271 -p1
 # slab: remove unused align parameter from alloc_percpu
 %patch20272 -p1
-# cs89x0: make {read,write}word take base_addr
-%patch20273 -p1
-# cs89x0: convert {inw,outw} calls to {read,write}word
-%patch20274 -p1
-# cs89x0: swap {read,write}reg and {read,write}word
-%patch20275 -p1
-# cs89x0: make {read,write}reg use {read,write}word
-%patch20276 -p1
-# cs89x0: cleanly implement ixdp2x01 and pnx0501 support
-%patch20277 -p1
-# cs89x0: switch {in,out}sw to {read,write}words
-%patch20278 -p1
-# fix Kconfig depends for cs89x0 (PNX010X support)
-%patch20279 -p1
-# cs89x0: fix up after pnx0105 Kconfig symbol renaming
-%patch20280 -p1
 # IRQ type flags
-%patch20281 -p1
+%patch20273 -p1
 # Eliminate __attribute__ ((packed)) warnings for gcc-4.1
-%patch20282 -p1
+%patch20274 -p1
 # tiny: Trim non-IPX builds
-%patch20283 -p1
+%patch20275 -p1
 # [ARM] Update am79c961 to use struct platform_driver
-%patch20284 -p1
+%patch20276 -p1
 # sk98lin: routine called from probe marked __init
-%patch20285 -p1
+%patch20277 -p1
 # sk98lin: use kzalloc
-%patch20286 -p1
+%patch20278 -p1
 # sk98lin: error handling of pci setup
-%patch20287 -p1
+%patch20279 -p1
 # PPC44x EMAC driver: disable TX status deferral in half-duplex mode
-%patch20288 -p1
+%patch20280 -p1
 # tulip: enable multiport NIC BIOS fixups for x86_64
-%patch20289 -p1
+%patch20281 -p1
 # Add MIPS dependency for dm9000 driver
-%patch20290 -p1
+%patch20282 -p1
 # drivers/net/Kconfig: indentation fix
-%patch20291 -p1
+%patch20283 -p1
 # drivers/net/bonding/bonding.h: "extern inline" -> "static inline"
-%patch20292 -p1
+%patch20284 -p1
 # drivers/net/gianfar.h: "extern inline" -> "static inline"
-%patch20293 -p1
+%patch20285 -p1
 # e1000: Fix invalid memory reference
-%patch20294 -p1
+%patch20286 -p1
 # remove bouncing mail address of mv643xx_eth maintainer
-%patch20295 -p1
+%patch20287 -p1
 # forcedeth: TSO fix for large buffers
-%patch20296 -p1
+%patch20288 -p1
 # fix a few "warning: 'cleanup_card' defined but not used"
-%patch20297 -p1
+%patch20289 -p1
 # [patch] ipw2100: support WEXT-18 enc_capa v3
-%patch20298 -p1
+%patch20290 -p1
 # [IPV6]: TUNNEL6: Don't try to add multicast route twice.
-%patch20299 -p1
+%patch20291 -p1
 # [NET]: NEIGHBOUR: Ensure to record time to neigh->updated when neighbour's state changed.
-%patch20300 -p1
+%patch20292 -p1
 # [IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.
-%patch20301 -p1
+%patch20293 -p1
 # [IPV6]: ADDRCONF: Split up ipv6_generate_eui64() by device type.
-%patch20302 -p1
+%patch20294 -p1
 # [IPV6]: ROUTE: Add accept_ra_defrtr sysctl.
-%patch20303 -p1
+%patch20295 -p1
 # [IPV6]: ADDRCONF: Add accept_ra_pinfo sysctl.
-%patch20304 -p1
+%patch20296 -p1
 # [IPV6]: ROUTE: Split up rt6_cow() for future changes.
-%patch20305 -p1
+%patch20297 -p1
 # [IPV6]: ROUTE: Set appropriate information before inserting a route.
-%patch20306 -p1
+%patch20298 -p1
 # [IPV6]: ROUTE: Copy u.dst.error for RTF_REJECT routes when cloning.
-%patch20307 -p1
+%patch20299 -p1
 # [IPV6]: ROUTE: Add rt6_alloc_clone() for cloning route allocation.
-%patch20308 -p1
+%patch20300 -p1
 # [IPV6]: ROUTE: Unify two code paths for pmtu disc.
-%patch20309 -p1
+%patch20301 -p1
 # [IPV6]: ROUTE: Clean up reference counting / unlocking for returning object.
-%patch20310 -p1
+%patch20302 -p1
 # [IPV6]: ROUTE: Convert rt6_cow() to rt6_alloc_cow().
-%patch20311 -p1
+%patch20303 -p1
 # [IPV6]: ROUTE: Clean-up cow'ing in ip6_route_{intput,output}().
-%patch20312 -p1
+%patch20304 -p1
 # [IPV6]: ROUTE: Eliminate lock for default route pointer.
-%patch20313 -p1
+%patch20305 -p1
 # [IPV6]: ROUTE: More strict check for default routers in rt6_get_dflt_router().
-%patch20314 -p1
+%patch20306 -p1
 # [IPV6]: ROUTE: Try selecting better route for non-default routes as well.
-%patch20315 -p1
+%patch20307 -p1
 # [IPV6]: ROUTE: Clean up rt6_select() code path in ip6_route_{intput,output}().
-%patch20316 -p1
+%patch20308 -p1
 # [IPV6]: ROUTE: Try finding the next best route.
-%patch20317 -p1
+%patch20309 -p1
 # [IPV6]: ROUTE: Handle finding the next best route in reachability in BACKTRACK().
-%patch20318 -p1
+%patch20310 -p1
 # [IPV6]: ROUTE: Add support for Router Preference (RFC4191).
-%patch20319 -p1
+%patch20311 -p1
 # [IPV6]: ROUTE: Add Router Reachability Probing (RFC4191).
-%patch20320 -p1
+%patch20312 -p1
 # [IPV6]: ROUTE: Add accept_ra_rtr_pref sysctl.
-%patch20321 -p1
+%patch20313 -p1
 # [IPV6]: ROUTE: Add router_probe_interval sysctl.
-%patch20322 -p1
+%patch20314 -p1
 # [IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).
-%patch20323 -p1
+%patch20315 -p1
 # [IPV6]: ROUTE: Flag RTF_DEFAULT for Route Infomation for ::/0.
-%patch20324 -p1
+%patch20316 -p1
 # [IPV6]: ROUTE: Add accept_ra_rt_info_max_plen sysctl.
-%patch20325 -p1
+%patch20317 -p1
 # [IPV6]: ROUTE: Ensure to accept redirects from nexthop for the target.
-%patch20326 -p1
+%patch20318 -p1
 # [NET]: Convert net/{ipv4,ipv6,sched} to netdev_priv
-%patch20327 -p1
+%patch20319 -p1
 # [PKT_SCHED]: Use USEC_PER_SEC
-%patch20328 -p1
+%patch20320 -p1
 # [PKT_SCHED]: Convert tc action functions to single skb pointers
-%patch20329 -p1
+%patch20321 -p1
 # [PKT_SCHED]: Remove some obsolete policer exports
-%patch20330 -p1
+%patch20322 -p1
 # [PKT_SCHED]: Fix memory leak when dumping in pedit action
-%patch20331 -p1
+%patch20323 -p1
 # [PKT_SCHED]: Prefix tc actions with act_
-%patch20332 -p1
+%patch20324 -p1
 # [NET]: Change some "if (x) BUG();" to "BUG_ON(x);"
-%patch20333 -p1
+%patch20325 -p1
 # [NET]: Add IFB (Intermediate Functional Block) network device.
-%patch20334 -p1
+%patch20326 -p1
 # [PKT_SCHED]: Fix qdisc return code.
-%patch20335 -p1
+%patch20327 -p1
 # [IPV4]: ip_output.c needs xfrm.h
-%patch20336 -p1
+%patch20328 -p1
 # [IPV6]: Set skb->priority in ip6_output.c
-%patch20337 -p1
+%patch20329 -p1
 # [INET_DIAG]: Use inet_twsk() with TIME_WAIT sockets
-%patch20338 -p1
+%patch20330 -p1
 # [INET_DIAG]: whitespace/simple cleanups
-%patch20339 -p1
+%patch20331 -p1
 # [INET_DIAG]: Introduce inet_twsk_diag_dump & inet_twsk_diag_fill
-%patch20340 -p1
+%patch20332 -p1
 # [INET_DIAG]: Introduce sk_diag_fill
-%patch20341 -p1
+%patch20333 -p1
 # spelling: s/usefull/useful/
-%patch20342 -p1
+%patch20334 -p1
 # spelling: s/retreive/retrieve/
-%patch20343 -p1
+%patch20335 -p1
 # spelling: s/trough/through/
-%patch20344 -p1
+%patch20336 -p1
 # try to reassociate when being disassociated from the AP
-%patch20345 -p1
+%patch20337 -p1
 # add fixme for disassoc
-%patch20346 -p1
+%patch20338 -p1
 # drivers/net/irda/irport.c: cleanups
-%patch20347 -p1
+%patch20339 -p1
 # turn "const static" into "static const"
-%patch20348 -p1
+%patch20340 -p1
 # m68knommu: allow configure of FEC for M520x CPU family
-%patch20349 -p1
+%patch20341 -p1
 # select "best" network based on rssi
-%patch20350 -p1
+%patch20342 -p1
 # check if disassociation is for us before processing it
-%patch20351 -p1
+%patch20343 -p1
 # [INET]: congestion and af_ops can be const
-%patch20352 -p1
+%patch20344 -p1
 # [NET]: Change memcmp(,,ETH_ALEN) to compare_ether_addr()
-%patch20353 -p1
+%patch20345 -p1
 # [NETFILTER]: net/ipv[46]/netfilter.c cleanups
-%patch20354 -p1
+%patch20346 -p1
 # [NETFILTER]: Fix return value confusion in PPTP NAT helper
-%patch20355 -p1
+%patch20347 -p1
 # [NETFILTER]: Remove unused function from NAT protocol helpers
-%patch20356 -p1
+%patch20348 -p1
 # [NETFILTER]: Fix timeout sysctls on big-endian 64bit architectures
-%patch20357 -p1
+%patch20349 -p1
 # [RXRPC]: Decrease number of pointer derefs in connection.c
-%patch20358 -p1
+%patch20350 -p1
 # [NET]: Remove unneeded kmalloc() return value casts
-%patch20359 -p1
+%patch20351 -p1
 # [IRDA]: kill drivers/net/irda/sir_core.c
-%patch20360 -p1
+%patch20352 -p1
 # [IRDA] DONGLE_OLD: remove dependency on non-existing symbol
-%patch20361 -p1
+%patch20353 -p1
 # drivers/net/gianfar_sysfs.c: update email address of Kumar Gala
-%patch20362 -p1
+%patch20354 -p1
 # netfilter: headers included twice
-%patch20363 -p1
+%patch20355 -p1
 # Fix net/core/wireless.c link failure
-%patch20364 -p1
+%patch20356 -p1
 # [IPV6]: Fix modular build with netfilter enabled.
-%patch20365 -p1
+%patch20357 -p1
 # scan at least once before selecting a network by essid
-%patch20366 -p1
+%patch20358 -p1
 # properly check return value of ieee80211softmac_alloc_mgt
-%patch20367 -p1
+%patch20359 -p1
 # ieee80211_wx_set_auth,ieee80211_wx_get_auth based on patch by Larry Finger
-%patch20368 -p1
+%patch20360 -p1
 # some comment stuff
-%patch20369 -p1
+%patch20361 -p1
 # [NET]: Some more missing include/etherdevice.h includes
-%patch20370 -p1
+%patch20362 -p1
 # [NETFILTER]: ip_ct_proto_gre_fini() cannot be __exit
-%patch20371 -p1
+%patch20363 -p1
 # [IPV6]: Avoid calling ip6_xmit() with NULL sk
-%patch20372 -p1
+%patch20364 -p1
 # [NET]: Remove more unneeded typecasts on \*malloc()
-%patch20373 -p1
+%patch20365 -p1
 # [NET]: Fix diverter build.
-%patch20374 -p1
+%patch20366 -p1
 # [PKT_SCHED] ematch: Remove bogus include.
-%patch20375 -p1
+%patch20367 -p1
 # [PKT_SCHED] net/sched/Kconfig: fix typo in NET_EMATCH_META description
-%patch20376 -p1
-# cs89x0: fix setting of ALLOW_DMA
-%patch20377 -p1
-# cs89x0: Fix the Kconfig help text
-%patch20378 -p1
+%patch20368 -p1
 # capable/capability.h (net/)
-%patch20379 -p1
+%patch20369 -p1
 # m68k: lvalues abuse in mac8390
-%patch20380 -p1
+%patch20370 -p1
 # m68k: NULL noise removal
-%patch20381 -p1
+%patch20371 -p1
 # add copyright and license headers to all softmac files
-%patch20382 -p1
+%patch20372 -p1
 # add MODULE_DESCRIPTION and MODULE_AUTHORs
-%patch20383 -p1
+%patch20373 -p1
 # move EXPORT_SYMBOL_GPL right after functions
-%patch20384 -p1
+%patch20374 -p1
 # corruption during e100 MDI register access
-%patch20385 -p1
+%patch20375 -p1
 # CONFIG_AIRO needs CONFIG_CRYPTO
-%patch20386 -p1
+%patch20376 -p1
 # gfar: fix compile error
-%patch20387 -p1
+%patch20377 -p1
 # gianfar mii: Use proper resource for MII memory region
-%patch20388 -p1
+%patch20378 -p1
 # phy: Added a macro to represent the string format used to match a phy device
-%patch20389 -p1
+%patch20379 -p1
 # gianfar: Use new PHY_ID_FMT macro
-%patch20390 -p1
+%patch20380 -p1
 # replace MODULE_PARM in tulip/uli526x.c
-%patch20391 -p1
+%patch20381 -p1
 # wireless/atmel: add IWENCODEEXT, IWAUTH, and association event support
-%patch20392 -p1
+%patch20382 -p1
 # bonding: UPDATED hash-table corruption in bond_alb.c
-%patch20393 -p1
+%patch20383 -p1
 # via-velocity: use NETIF_F_IP_CSUM (hardware only support IPv4)
-%patch20394 -p1
+%patch20384 -p1
 # [TIPC] Initial merge
-%patch20395 -p1
+%patch20385 -p1
 # [TIPC] Use dynamically allocated family id with NETLINK_GENERIC
-%patch20396 -p1
+%patch20386 -p1
 # [TIPC} Fixed bug in disc_timeout()
-%patch20397 -p1
+%patch20387 -p1
 # [TIPC] Moved configuration interface into tipc_config.h
-%patch20398 -p1
+%patch20388 -p1
 # [TIPC] License header update
-%patch20399 -p1
+%patch20389 -p1
 # [TIPC] Cleaned up info/warn/err macros
-%patch20400 -p1
+%patch20390 -p1
 # [TIPC] Update of file headers
-%patch20401 -p1
+%patch20391 -p1
 # [TIPC] More updates of file headers
-%patch20402 -p1
+%patch20392 -p1
 # [TIPC]: Fix 64-bit build warnings.
-%patch20403 -p1
+%patch20393 -p1
 # genetlink: don't touch module ref count
-%patch20404 -p1
+%patch20394 -p1
 # [NET]: Use NIP6_FMT in kernel.h
-%patch20405 -p1
+%patch20395 -p1
 # [NET]: Clean up comments for sk_chk_filter()
-%patch20406 -p1
+%patch20396 -p1
 # [XFRM]: IPsec tunnel wildcard address support
-%patch20407 -p1
+%patch20397 -p1
 # [PKT_SCHED]: Change default clock source to gettimeofday
-%patch20408 -p1
+%patch20398 -p1
 # Spelling fix in IPW2100 and IPW2200 Kconfig entries
-%patch20409 -p1
+%patch20399 -p1
 # drivers/net/{,wireless/}Kconfig: remove dead URL
-%patch20410 -p1
-# cs89x0: credit Dmitry Pervushin
-%patch20411 -p1
-# cs89x0: use #elif instead of #else/#if/#endif
-%patch20412 -p1
-# cs89x0: use u16 for device register data
-%patch20413 -p1
-# cs89x0: add ixdp2351 support
-%patch20414 -p1
+%patch20400 -p1
 # x86: Work around compiler code generation bug with -Os
-%patch20415 -p1
+%patch20401 -p1
 # prism54/islpci_eth.c: dev_kfree_skb used with interrupts disabled
-%patch20416 -p1
+%patch20402 -p1
 # iw_handler.h: SIOCSIWNAME -> SIOCSIWCOMMIT in comment
-%patch20417 -p1
+%patch20403 -p1
 # ipw2200: do not sleep in ipw_request_direct_scan
-%patch20418 -p1
+%patch20404 -p1
 # hostap: allow flashing firmware
-%patch20419 -p1
+%patch20405 -p1
 # drivers/net/wireless: correct reported ssid lengths
-%patch20420 -p1
+%patch20406 -p1
 # ipw2100: remove code for WIRELESS_EXT < 18
-%patch20421 -p1
+%patch20407 -p1
 # hostap: don't #include C files in hostap_main.c
-%patch20422 -p1
-# cs89x0: credit Dmitry Pervushin
-%patch20423 -p1
+%patch20408 -p1
 # [IPV6]: Preserve procfs IPV6 address output format
-%patch20424 -p1
+%patch20409 -p1
 # [PKT_SCHED] sch_prio: fix qdisc bands init
-%patch20425 -p1
+%patch20410 -p1
 # [NET]: Fix whitespace issues in net/core/filter.c
-%patch20426 -p1
+%patch20411 -p1
 # [NETFILTER] ip[6]t_policy: Fix compilation warnings
-%patch20427 -p1
+%patch20412 -p1
 # [TG3]: Refine nvram locking
-%patch20428 -p1
+%patch20413 -p1
 # [NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.h
-%patch20429 -p1
+%patch20414 -p1
 # [IPV4]: rt_cache_stat can be statically defined
-%patch20430 -p1
+%patch20415 -p1
 # mv643xx_eth: 2.6.16 needs ip.h and in.h
-%patch20431 -p1
+%patch20416 -p1
 # mv643xx_eth: Fix dma_map/dma_unmap relations
-%patch20432 -p1
+%patch20417 -p1
 # mv643xx_eth: Fix a NULL pointer dereference
-%patch20433 -p1
+%patch20418 -p1
 # mv643xx_eth: Fix handling of small, unaligned fragments
-%patch20434 -p1
+%patch20419 -p1
 # mv643xx_eth: iounmap the correct SRAM buffer
-%patch20435 -p1
+%patch20420 -p1
 # mv643xx_eth: Hold spinlocks only where needed
-%patch20436 -p1
+%patch20421 -p1
 # mv643xx_eth: Request HW checksum generation only for IPv4
-%patch20437 -p1
+%patch20422 -p1
 # mv643xx_eth: Fix transmit skb accounting
-%patch20438 -p1
+%patch20423 -p1
 # mv643xx_eth: Merge open and stop helper functions
-%patch20439 -p1
+%patch20424 -p1
 # mv643xx_eth: Remove needless mask of extended intr register
-%patch20440 -p1
+%patch20425 -p1
 # spidernet: check if firmware was loaded correctly
-%patch20441 -p1
+%patch20426 -p1
 # spidernet: read firmware from the OF device tree
-%patch20442 -p1
+%patch20427 -p1
 # spidernet: fix HW structures for 64 bit dma_addr_t
-%patch20443 -p1
+%patch20428 -p1
 # spidernet: performance optimizations
-%patch20444 -p1
+%patch20429 -p1
 # spidernet: fix missing include
-%patch20445 -p1
+%patch20430 -p1
 # e1000: Fix jumbo frame performance
-%patch20446 -p1
+%patch20431 -p1
 # e1000: Fix TSO
-%patch20447 -p1
+%patch20432 -p1
 # e1000: General Fixes
-%patch20448 -p1
+%patch20433 -p1
 # e1000: Fix SoL/IDER link and loopback
-%patch20449 -p1
+%patch20434 -p1
 # e1000: Fix ASF/AMT for 8257{1|2|3} controllers
-%patch20450 -p1
+%patch20435 -p1
 # e1000: Fix PHY config for 82573 controller
-%patch20451 -p1
+%patch20436 -p1
 # Fix e1000 stats
-%patch20452 -p1
+%patch20437 -p1
 # e1000: Fix LED functionality for 82573
-%patch20453 -p1
+%patch20438 -p1
 # e1000: Fix adapter structure and prepare for multique fix
-%patch20454 -p1
+%patch20439 -p1
 # e1000: Fix mulitple queues
-%patch20455 -p1
+%patch20440 -p1
 # e1000: Fix loopback logic
-%patch20456 -p1
+%patch20441 -p1
 # e1000: Fix PHY reset when blocked
-%patch20457 -p1
+%patch20442 -p1
 # e1000: Fix EEPROM read logic
-%patch20458 -p1
+%patch20443 -p1
 # e1000: Fix flow control water marks
-%patch20459 -p1
+%patch20444 -p1
 # e1000: Fix TX queue length based on link speed
-%patch20460 -p1
+%patch20445 -p1
 # e1000: Fix Desc. Rings and Jumbo Frames
-%patch20461 -p1
+%patch20446 -p1
 # e1000: Fix TX timeout logic
-%patch20462 -p1
+%patch20447 -p1
 # e1000: Fix desc. clean up
-%patch20463 -p1
+%patch20448 -p1
 # e1000: Fix bit 22 (TXDCTL) for 82571 & 82572 controllers
-%patch20464 -p1
+%patch20449 -p1
 # e1000: Fix collision distance
-%patch20465 -p1
+%patch20450 -p1
 # drivers/net/sk98lin/: possible cleanups
-%patch20466 -p1
+%patch20451 -p1
 # e1000: Fix __pskb_pull_tail
-%patch20467 -p1
+%patch20452 -p1
 # e1000: Fix VLAN support
-%patch20468 -p1
+%patch20453 -p1
 # e1000: Fixed frame size logic
-%patch20469 -p1
+%patch20454 -p1
 # e1000: Fix Netpoll issue
-%patch20470 -p1
+%patch20455 -p1
 # e1000: Added interrupt auto mask support
-%patch20471 -p1
+%patch20456 -p1
 # e1000: Added cleaned_count to RX buffer allocation
-%patch20472 -p1
+%patch20457 -p1
 # e1000: Added hardware support for PCI express, 82546GB, and 82571 Fiber
-%patch20473 -p1
+%patch20458 -p1
 # e1000: Added firmware version reporting for 8257{1|2|3} controllers
-%patch20474 -p1
+%patch20459 -p1
 # e1000: Added PCIe bus information
-%patch20475 -p1
+%patch20460 -p1
 # e1000: Added variable to handle return values for pci_enable_\* functions
-%patch20476 -p1
+%patch20461 -p1
 # e1000: Added copy break code
-%patch20477 -p1
+%patch20462 -p1
 # e1000: Cleaned up code and removed hard coded numbers
-%patch20478 -p1
+%patch20463 -p1
 # e1000: Removed unused variables and initialized variables
-%patch20479 -p1
+%patch20464 -p1
 # drivers/net/\*: use time_after() and friends
-%patch20480 -p1
+%patch20465 -p1
 # airo: Off-by-one channel fix
-%patch20481 -p1
+%patch20466 -p1
 # drivers/net/arcnet/: possible cleanups
-%patch20482 -p1
+%patch20467 -p1
 # drivers/net/s2io.c: make code static
-%patch20483 -p1
+%patch20468 -p1
 # [SCTP]: Fix potential race condition between sctp_close() and sctp_rcv().
-%patch20484 -p1
+%patch20469 -p1
 # [SCTP]: Fix sctp_cookie alignment in the packet.
-%patch20485 -p1
+%patch20470 -p1
 # [SCTP]: sctp doesn't show all associations/endpoints in /proc
-%patch20486 -p1
+%patch20471 -p1
 # [SCTP]: Fix sctp_assoc_seq_show() panics on big-endian systems.
-%patch20487 -p1
+%patch20472 -p1
 # [SCTP]: Fix bad sysctl formatting of SCTP timeout values on 64-bit m/cs.
-%patch20488 -p1
+%patch20473 -p1
 # [SCTP]: Fix machine check/connection hang on IA64.
-%patch20489 -p1
+%patch20474 -p1
 # [SCTP]: Fix couple of races between sctp_peeloff() and sctp_rcv().
-%patch20490 -p1
+%patch20475 -p1
 # [SCTP]: Fix sctp_rcv_ootb() to handle the last chunk of a packet correctly.
-%patch20491 -p1
+%patch20476 -p1
 # [PKT_SCHED]: Handle SCTP/DCCP in sfq_hash
-%patch20492 -p1
+%patch20477 -p1
 # [EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log}
-%patch20493 -p1
+%patch20478 -p1
 # [NET]: "signed long" -> "long"
-%patch20494 -p1
+%patch20479 -p1
 # [PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALEN
-%patch20495 -p1
+%patch20480 -p1
 # [CASSINI]: Fix printk warning.
-%patch20496 -p1
+%patch20481 -p1
 # [NET]: Use is_zero_ether_addr() in net/core/netpoll.c
-%patch20497 -p1
+%patch20482 -p1
 # [TIPC] Minor changes to #includes
-%patch20498 -p1
+%patch20483 -p1
 # [TIPC] Updated link priority macros
-%patch20499 -p1
+%patch20484 -p1
 # [TIPC] Move ethernet protocol id to linux/if_ether.h
-%patch20500 -p1
+%patch20485 -p1
 # [TIPC] Remove unused #includes
-%patch20501 -p1
+%patch20486 -p1
 # [TIPC] Add help text for TIPC configuration option
-%patch20502 -p1
+%patch20487 -p1
 # [TIPC] Group protocols with sub-options in Kconfig
-%patch20503 -p1
+%patch20488 -p1
 # [TIPC] Avoid polluting the global namespace
-%patch20504 -p1
+%patch20489 -p1
 # e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue)
-%patch20505 -p1
+%patch20490 -p1
 # e100: Handle the return values from pci_\* functions
-%patch20506 -p1
+%patch20491 -p1
 # e100: e100 whitespace fixes
-%patch20507 -p1
+%patch20492 -p1
 # starfire: Implement suspend/resume
-%patch20508 -p1
+%patch20493 -p1
 # sky2: receive buffer alignment
-%patch20509 -p1
+%patch20494 -p1
 # sky2: call pci_set_consistent_dma_mask
-%patch20510 -p1
+%patch20495 -p1
 # sky2: version 0.12
-%patch20511 -p1
+%patch20496 -p1
 # sky2: fix ram buffer for Yukon FE rev 2
-%patch20512 -p1
+%patch20497 -p1
 # sky2: write barrier's
-%patch20513 -p1
+%patch20498 -p1
 # sky2: don't bother clearing status ring elements
-%patch20514 -p1
+%patch20499 -p1
 # sky2: optimize for 32 bit dma
-%patch20515 -p1
+%patch20500 -p1
 # sky2: ratelimit error messages
-%patch20516 -p1
+%patch20501 -p1
 # sky2: use kzalloc
-%patch20517 -p1
+%patch20502 -p1
 # sky2: don't inline so much
-%patch20518 -p1
+%patch20503 -p1
 # sky2: more conservative transmit locking
-%patch20519 -p1
+%patch20504 -p1
 # sky2: 0.13 version
-%patch20520 -p1
+%patch20505 -p1
 # Fix warning with b44.c on 64bit boxes
-%patch20521 -p1
+%patch20506 -p1
 # skge: fix dma mask setup.
-%patch20522 -p1
+%patch20507 -p1
 # [IPV4]: RT_CACHE_STAT_INC() warning fix
-%patch20523 -p1
+%patch20508 -p1
 # e1000: Added RX buffer enhancements
-%patch20524 -p1
+%patch20509 -p1
 # e1000: Added functions to save and restore config
-%patch20525 -p1
+%patch20510 -p1
 # e1000: Added functions declarations
-%patch20526 -p1
+%patch20511 -p1
 # e1000: Fix whitespace
-%patch20527 -p1
+%patch20512 -p1
 # e1000: Added driver comments
-%patch20528 -p1
+%patch20513 -p1
 # e1000: fix receive breakage
-%patch20529 -p1
+%patch20514 -p1
 # e1000: fix compile warning
-%patch20530 -p1
+%patch20515 -p1
 # [CASSINI]: dont touch page_count
-%patch20531 -p1
+%patch20516 -p1
 # [PKTGEN]: Respect hard_header_len of device.
-%patch20532 -p1
+%patch20517 -p1
 # [IPV4]: Fix multiple bugs in IGMPv3
-%patch20533 -p1
+%patch20518 -p1
 # uml: arch Kconfig menu cleanups
-%patch20534 -p1
+%patch20519 -p1
 # svcrpc: save and restore the daddr field when request deferred
-%patch20535 -p1
+%patch20520 -p1
 # svcrpc: gss: handle the GSS_S_CONTINUE
-%patch20536 -p1
+%patch20521 -p1
 # svcrpc: gss: server context init failure handling
-%patch20537 -p1
+%patch20522 -p1
 # svcrpc: gss: svc context creation error handling
-%patch20538 -p1
+%patch20523 -p1
 # wireless: import bcm43xx sources
-%patch20539 -p1
+%patch20524 -p1
 # bcm43xx: patch Kconfig and wireless/Makefile for import
-%patch20540 -p1
+%patch20525 -p1
 # [BNX2]: Fix VLAN on ASF
-%patch20541 -p1
+%patch20526 -p1
 # [BNX2]: Improve handshake with firmware
-%patch20542 -p1
+%patch20527 -p1
 # [BNX2]: Misc. fixes
-%patch20543 -p1
+%patch20528 -p1
 # [BNX2]: Fix UDP checksum verification
-%patch20544 -p1
+%patch20529 -p1
 # [BNX2]: Workaround hw interrupt bug
-%patch20545 -p1
+%patch20530 -p1
 # [BNX2]: Fix nvram sizing
-%patch20546 -p1
+%patch20531 -p1
 # [BNX2]: Use netdev_priv()
-%patch20547 -p1
+%patch20532 -p1
 # [BNX2]: Add PHY loopback test
-%patch20548 -p1
+%patch20533 -p1
 # [BNX2]: Update version and copyright year
-%patch20549 -p1
+%patch20534 -p1
 # [NET]: more whitespace issues in net/core/filter.c
-%patch20550 -p1
+%patch20535 -p1
 # [NET]: Fix some whitespace issues in af_packet.c
-%patch20551 -p1
+%patch20536 -p1
 # [SUNGEM]: Make PM of PHYs more reliable (#2)
-%patch20552 -p1
+%patch20537 -p1
 # [NET]: Fix skb fclone error path handling.
-%patch20553 -p1
+%patch20538 -p1
 # [BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
-%patch20554 -p1
+%patch20539 -p1
 # [AF_KEY]: no message type set
-%patch20555 -p1
+%patch20540 -p1
 # [IPV6] MLDv2: fix change records when transitioning to/from inactive
-%patch20556 -p1
+%patch20541 -p1
 # sundance: Really read addr 0
-%patch20557 -p1
+%patch20542 -p1
 # bonding: fix ->get_settings error checking
-%patch20558 -p1
+%patch20543 -p1
 # acenic: fix checking of read_eeprom_byte() return values
-%patch20559 -p1
+%patch20544 -p1
 # b44: fix laptop carrier detect
-%patch20560 -p1
+%patch20545 -p1
 # s2io: scatter-gather fix
-%patch20561 -p1
+%patch20546 -p1
 # BUG_ON() Conversion in net/tulip/xircom_cb.c
-%patch20562 -p1
+%patch20547 -p1
 # BUG_ON() Conversion in net/tulip/de2104x.c
-%patch20563 -p1
+%patch20548 -p1
 # BUG_ON() Conversion in net/tulip/winbond-840.c
-%patch20564 -p1
+%patch20549 -p1
 # mv643xx_eth: Fix spinlock recursion bug
-%patch20565 -p1
+%patch20550 -p1
 # mv643xx_eth: Update dev->last_rx on packet receive
-%patch20566 -p1
+%patch20551 -p1
 # mv643xx_eth: Remove needless mp->port_mac_addr
-%patch20567 -p1
+%patch20552 -p1
 # mv643xx_eth: Make port queue enable/disable code consistent
-%patch20568 -p1
+%patch20553 -p1
 # mv643xx_eth: use MII library for PHY management
-%patch20569 -p1
+%patch20554 -p1
 # orinoco_cs: tweak Vcc debugging messages
-%patch20570 -p1
+%patch20555 -p1
 # ieee80211: Fix problem with not decrypting broadcast packets
-%patch20571 -p1
+%patch20556 -p1
 # ieee80211: Fix iwlist scan can only show about 20 APs
-%patch20572 -p1
+%patch20557 -p1
 # ieee80211: Fix A band min and max channel definitions
-%patch20573 -p1
+%patch20558 -p1
 # WEP fields are incorrectly shown to be INSIDE snap in the doc
-%patch20574 -p1
+%patch20559 -p1
 # ieee80211: Log if netif_rx() drops the packet
-%patch20575 -p1
+%patch20560 -p1
 # ieee80211: Add LEAP authentication type
-%patch20576 -p1
+%patch20561 -p1
 # ieee80211: add flags for all geo channels
-%patch20577 -p1
+%patch20562 -p1
 # ieee80211: Add spectrum management information
-%patch20578 -p1
+%patch20563 -p1
 # ieee80211: kmalloc+memset -> kzalloc cleanups
-%patch20579 -p1
+%patch20564 -p1
 # ieee80211: TIM information element parsing
-%patch20580 -p1
+%patch20565 -p1
 # ieee80211: Add TKIP crypt->build_iv
-%patch20581 -p1
+%patch20566 -p1
 # ieee80211: Add 802.11h data type and structures
-%patch20582 -p1
+%patch20567 -p1
 # ieee80211: Add helpers for IBSS DFS handling
-%patch20583 -p1
+%patch20568 -p1
 # ieee80211: Add 802.11h information element parsing
-%patch20584 -p1
+%patch20569 -p1
 # sync with svn.berlios.de
-%patch20585 -p1
+%patch20570 -p1
 # remove linux version compatibility code.
-%patch20586 -p1
+%patch20571 -p1
 # ipw2100: Fix setting txpower failed problem
-%patch20587 -p1
+%patch20572 -p1
 # ipw2200: Fix "iwspy ethx off" causes kernel panic
-%patch20588 -p1
+%patch20573 -p1
 # ipw2200: Fix sw_reset doesn't clear the static essid problem
-%patch20589 -p1
+%patch20574 -p1
 # ipw2200: Fix a variable referenced after kfree() bug
-%patch20590 -p1
+%patch20575 -p1
 # Typo corrections for ieee80211
-%patch20591 -p1
+%patch20576 -p1
 # PCMCIA=m, HOSTAP_CS=y is not a legal configuration
-%patch20592 -p1
+%patch20577 -p1
 # [NETFILTER] nfnetlink_log: add sequence numbers for log events
-%patch20593 -p1
+%patch20578 -p1
 # [SCTP]: correct the number of INIT retransmissions
-%patch20594 -p1
+%patch20579 -p1
 # [SCTP]: heartbeats exceed maximum retransmssion limit
-%patch20595 -p1
+%patch20580 -p1
 # AIRO{,_CS} <-> CRYPTO fixes
-%patch20596 -p1
+%patch20581 -p1
 # drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
-%patch20597 -p1
+%patch20582 -p1
 # drivers/net/wireless/ipw2200: possible cleanups
-%patch20598 -p1
+%patch20583 -p1
 # ieee80211: trivial fix for misplaced ()'s
-%patch20599 -p1
+%patch20584 -p1
 # ipw2100: Add LEAP authentication algorithm support
-%patch20600 -p1
+%patch20585 -p1
 # ipw2100: Make iwconfig txpower setting consistent with user input
-%patch20601 -p1
+%patch20586 -p1
 # ipw2100: Add generic geo information
-%patch20602 -p1
+%patch20587 -p1
 # ipw2100: remove white space and better format the code
-%patch20603 -p1
+%patch20588 -p1
 # increase ipw2100 driver version to git-1.1.4
-%patch20604 -p1
+%patch20589 -p1
 # ipw2200: Fix indirect SRAM/register 8/16-bit write routines
-%patch20605 -p1
+%patch20590 -p1
 # ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
-%patch20606 -p1
+%patch20591 -p1
 # ipw2200: Add LEAP authentication algorithm support
-%patch20607 -p1
+%patch20592 -p1
 # ipw2200: Bluetooth coexistence support
-%patch20608 -p1
+%patch20593 -p1
 # ipw2200: Make LED blinking frequency independent of HZ
-%patch20609 -p1
+%patch20594 -p1
 # ipw2200: add module parameter to enable/disable roaming
-%patch20610 -p1
+%patch20595 -p1
 # ipw2200: Scale firmware loading watchdog with the firmware size
-%patch20611 -p1
+%patch20596 -p1
 # ipw2200: stack reduction
-%patch20612 -p1
+%patch20597 -p1
 # ipw2200: Fix qos_cmd param switch bug
-%patch20613 -p1
+%patch20598 -p1
 # ipw2200: increase ipw2200 driver version
-%patch20614 -p1
+%patch20599 -p1
 # ipw2200: Disable hwcrypto by default
-%patch20615 -p1
+%patch20600 -p1
 # wireless/airo: add IWENCODEEXT and IWAUTH support
-%patch20616 -p1
+%patch20601 -p1
 # wireless/ipw2200: support WE-18 WPA enc_capa
-%patch20617 -p1
+%patch20602 -p1
 # [IPV4] igmp: remove pointless printk
-%patch20618 -p1
+%patch20603 -p1
 # [TCP] H-TCP: Fix accounting
-%patch20619 -p1
+%patch20604 -p1
 # ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt
-%patch20620 -p1
+%patch20605 -p1
 # Add two management functions to ieee80211_rx.c
-%patch20621 -p1
+%patch20606 -p1
 # Clarify help text of SKGE/SK98LIN/SKY2
-%patch20622 -p1
+%patch20607 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
-%patch20623 -p1
+%patch20608 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
-%patch20624 -p1
+%patch20609 -p1
 # [IPV4]: Always set fl.proto in ip_route_newports
-%patch20625 -p1
+%patch20610 -p1
 # [BRIDGE]: Fix device delete race.
-%patch20626 -p1
+%patch20611 -p1
 # [NET]: Do not export inet_bind_bucket_create twice.
-%patch20627 -p1
+%patch20612 -p1
 # [IPV6] tcp_v6_send_synack: release the destination
-%patch20628 -p1
+%patch20613 -p1
 # [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
-%patch20629 -p1
+%patch20614 -p1
 # lp486e: remove SLOW_DOWN_IO
-%patch20630 -p1
+%patch20615 -p1
 # ipw2200: fix ->eeprom[EEPROM_VERSION] check
-%patch20631 -p1
+%patch20616 -p1
 # DocBook: fix some kernel-doc comments in net/sunrpc
-%patch20632 -p1
+%patch20617 -p1
 # SUNRPC: Fix a lock recursion in the auth_gss downcall
-%patch20633 -p1
+%patch20618 -p1
 # SUNRPC: Move upcall out of auth->au_ops->crcreate()
-%patch20634 -p1
+%patch20619 -p1
 # [NET] snap: needs hardware checksum fix
-%patch20635 -p1
+%patch20620 -p1
 # [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
-%patch20636 -p1
+%patch20621 -p1
 # [SCTP]: Fix 'fast retransmit' to send a TSN only once.
-%patch20637 -p1
+%patch20622 -p1
 # [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
-%patch20638 -p1
+%patch20623 -p1
 # [IPV6]: Fix illegal dst locking in softirq context.
-%patch20639 -p1
+%patch20624 -p1
 # [IPV4]: Remove suprious use of goto out: in icmp_reply
-%patch20640 -p1
+%patch20625 -p1
 # [TG3]: Flush tg3_reset_task()
-%patch20641 -p1
+%patch20626 -p1
 # [TG3]: Update driver version and release date.
-%patch20642 -p1
+%patch20627 -p1
 # [IPV4]: Use RCU locking in fib_rules.
-%patch20643 -p1
+%patch20628 -p1
 # [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
-%patch20644 -p1
+%patch20629 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -3483,14 +3438,6 @@
 - [IPV4]: make ip_fragment() static
 - [IPV6]: small cleanups
 - slab: remove unused align parameter from alloc_percpu
-- cs89x0: make {read,write}word take base_addr
-- cs89x0: convert {inw,outw} calls to {read,write}word
-- cs89x0: swap {read,write}reg and {read,write}word
-- cs89x0: make {read,write}reg use {read,write}word
-- cs89x0: cleanly implement ixdp2x01 and pnx0501 support
-- cs89x0: switch {in,out}sw to {read,write}words
-- fix Kconfig depends for cs89x0 (PNX010X support)
-- cs89x0: fix up after pnx0105 Kconfig symbol renaming
 - IRQ type flags
 - Eliminate __attribute__ ((packed)) warnings for gcc-4.1
 - tiny: Trim non-IPX builds
@@ -3587,8 +3534,6 @@
 - [NET]: Fix diverter build.
 - [PKT_SCHED] ematch: Remove bogus include.
 - [PKT_SCHED] net/sched/Kconfig: fix typo in NET_EMATCH_META description
-- cs89x0: fix setting of ALLOW_DMA
-- cs89x0: Fix the Kconfig help text
 - capable/capability.h (net/)
 - m68k: lvalues abuse in mac8390
 - m68k: NULL noise removal
@@ -3621,10 +3566,6 @@
 - [PKT_SCHED]: Change default clock source to gettimeofday
 - Spelling fix in IPW2100 and IPW2200 Kconfig entries
 - drivers/net/{,wireless/}Kconfig: remove dead URL
-- cs89x0: credit Dmitry Pervushin
-- cs89x0: use #elif instead of #else/#if/#endif
-- cs89x0: use u16 for device register data
-- cs89x0: add ixdp2351 support
 - x86: Work around compiler code generation bug with -Os
 - prism54/islpci_eth.c: dev_kfree_skb used with interrupts disabled
 - iw_handler.h: SIOCSIWNAME -> SIOCSIWCOMMIT in comment
@@ -3633,7 +3574,6 @@
 - drivers/net/wireless: correct reported ssid lengths
 - ipw2100: remove code for WIRELESS_EXT < 18
 - hostap: don't #include C files in hostap_main.c
-- cs89x0: credit Dmitry Pervushin
 - [IPV6]: Preserve procfs IPV6 address output format
 - [PKT_SCHED] sch_prio: fix qdisc bands init
 - [NET]: Fix whitespace issues in net/core/filter.c


--- 1603-cs89x0-make-read-write-word-take-base_addr.txt DELETED ---


--- 1604-cs89x0-convert-inw-outw-calls-to-read-write-word.txt DELETED ---


--- 1605-cs89x0-swap-read-write-reg-and-read-write-word.txt DELETED ---


--- 1606-cs89x0-make-read-write-reg-use-read-write-word.txt DELETED ---


--- 1607-cs89x0-cleanly-implement-ixdp2x01-and-pnx0501-support.txt DELETED ---


--- 1608-cs89x0-switch-in-out-sw-to-read-write-words.txt DELETED ---


--- 1609-fix-Kconfig-depends-for-cs89x0-PNX010X-support.txt DELETED ---


--- 1610-cs89x0-fix-up-after-pnx0105-Kconfig-symbol-renaming.txt DELETED ---


--- 2604-cs89x0-fix-setting-of-ALLOW_DMA.txt DELETED ---


--- 2605-cs89x0-Fix-the-Kconfig-help-text.txt DELETED ---


--- 3146-cs89x0-credit-Dmitry-Pervushin.txt DELETED ---


--- 3147-cs89x0-use-elif-instead-of-else-if-endif.txt DELETED ---


--- 3148-cs89x0-use-u16-for-device-register-data.txt DELETED ---


--- 3149-cs89x0-add-ixdp2351-support.txt DELETED ---


--- 3266-cs89x0-credit-Dmitry-Pervushin.txt DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 17:41:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 12:41:36 -0500
Subject: rpms/kernel/devel .cvsignore, 1.336, 1.337 kernel-2.6.spec, 1.1907,
	1.1908 sources, 1.278, 1.279 upstream, 1.253, 1.254
Message-ID: <200602041741.k14Hfacq009632@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
rc2-git1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- .cvsignore	3 Feb 2006 16:34:55 -0000	1.336
+++ .cvsignore	4 Feb 2006 17:41:33 -0000	1.337
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 bcm43xx-20060114.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc1-git6.bz2
+patch-2.6.16-rc2-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1907
retrieving revision 1.1908
diff -u -r1.1907 -r1.1908
--- kernel-2.6.spec	4 Feb 2006 04:14:35 -0000	1.1907
+++ kernel-2.6.spec	4 Feb 2006 17:41:33 -0000	1.1908
@@ -209,7 +209,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc1-git6.bz2
+Patch2: patch-2.6.16-rc2-git1.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1394,6 +1394,9 @@
 %endif
 
 %changelog
+* Sat Feb  4 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git1
+
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2
 - Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- sources	3 Feb 2006 16:34:55 -0000	1.278
+++ sources	4 Feb 2006 17:41:33 -0000	1.279
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
-4bb74f4fb52bda3d1912960acc017861  patch-2.6.16-rc1-git6.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
+67eb75e5a9286f992efb84348ae371f1  patch-2.6.16-rc2-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- upstream	3 Feb 2006 16:34:55 -0000	1.253
+++ upstream	4 Feb 2006 17:41:33 -0000	1.254
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc1-git6.bz2
+patch-2.6.16-rc2-git1.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 17:45:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 12:45:31 -0500
Subject: rpms/kernel/devel linux-2.6-fs-namei-deadlock.patch, NONE,
	1.1 kernel-2.6.spec, 1.1908, 1.1909
Message-ID: <200602041745.k14HjVfs011530@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-fs-namei-deadlock.patch 
Log Message:
fix deadlock in do_path_lookup()


linux-2.6-fs-namei-deadlock.patch:
 namei.c-new |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-fs-namei-deadlock.patch ---

This patch is needed to in addition to the other unlocking fix which is
already applied.  It should be obvious that the system will deadlock in
case this isn't done.

(Andrew, I once again used a goto in the third error case because the
common code is again larger.)

Signed-Off-By: Ulrich Drepper <drepper at redhat.com>

--- 1/fs/namei.c	2006-02-01 09:29:49.000000000 -0800
+++ 2/fs/namei.c-new	2006-02-04 09:18:02.000000000 -0800
@@ -1096,6 +1096,7 @@

 		file = fget_light(dfd, &fput_needed);
 		if (!file) {
+			read_unlock(&current->fs->lock);
 			retval = -EBADF;
 			goto out_fail;
 		}
@@ -1104,15 +1105,15 @@

 		if (!S_ISDIR(dentry->d_inode->i_mode)) {
 			retval = -ENOTDIR;
+		unlock_fail:
 			fput_light(file, fput_needed);
+			read_unlock(&current->fs->lock);
 			goto out_fail;
 		}

 		retval = file_permission(file, MAY_EXEC);
-		if (retval) {
-			fput_light(file, fput_needed);
-			goto out_fail;
-		}
+		if (retval)
+			goto unlock_fail;

 		nd->mnt = mntget(file->f_vfsmnt);
 		nd->dentry = dget(dentry);




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1908
retrieving revision 1.1909
diff -u -r1.1908 -r1.1909
--- kernel-2.6.spec	4 Feb 2006 17:41:33 -0000	1.1908
+++ kernel-2.6.spec	4 Feb 2006 17:45:27 -0000	1.1909
@@ -362,6 +362,7 @@
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-percpu-NR_CPUS.patch
 Patch1870: linux-2.6-net-suppress-msgs.patch
+Patch1880: linux-2.6-fs-namei-deadlock.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -860,6 +861,8 @@
 %patch1860 -p1
 # Suppress some network layer msgs
 %patch1870 -p1
+# Fix deadlock in do_path_lookup()
+%patch1880 -p1
 # Fix oops in stradis on init
 %patch1890 -p1
 
@@ -1396,6 +1399,7 @@
 %changelog
 * Sat Feb  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git1
+- Fix deadlock in do_path_lookup()
 
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2



From fedora-cvs-commits at redhat.com  Sat Feb  4 18:44:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 13:44:14 -0500
Subject: rpms/eclipse/devel eclipse-efj-doc.patch, NONE,
	1.1 eclipse-efj.patch, 1.2, 1.3 eclipse.spec, 1.235, 1.236
Message-ID: <200602041844.k14IiEPa011397@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11380

Modified Files:
	eclipse-efj.patch eclipse.spec 
Added Files:
	eclipse-efj-doc.patch 
Log Message:
- Update efj patches to match what has been committed to HEAD.


eclipse-efj-doc.patch:
 tasks/tasks-230.htm |   36 ++++++++++++++++++++++++
 tasks/tasks-231.htm |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tasks/tasks-232.htm |   58 ++++++++++++++++++++++++++++++++++++++
 tasks/tasks-68.htm  |    3 +-
 topics_Tasks.xml    |    7 ++++
 5 files changed, 180 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-efj-doc.patch ---
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-230.htm org.eclipse.jdt.doc.user/tasks/tasks-230.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-230.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-230.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Using the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Using the Formatter Application
+    </h1>
+    <p>
+ 	The JDT has a commandline Eclipse Application that allows users to format Java source code either with 
+ 	the Eclipse default code formatter options or with custom options.
+    </p>
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-66.htm">Formatting Java Code</a><br>
+      <a href="tasks-231.htm">Running the Formatter Application</a>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">CodeFormatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-231.htm org.eclipse.jdt.doc.user/tasks/tasks-231.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-231.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-231.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Running the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Running the Formatter Application
+    </h1>
+    <p>
+    Running the Formatter Application is as simple as running the org.eclipse.jdt.core.JavaCodeFormatter application from the commandline:
+    <pre>
+    eclipse -vm &lt;path to virtual machine&gt; -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] &lt;files&gt;
+    </pre>
+    <table border="1" cellspacing="0" cellpadding="5" width="600">
+      <tr>
+        <td width="25%">&lt;files&gt;</td> 
+        <td>Java source files and/or directories to format. Only files ending with .java will be formatted in the given directory.</td>
+      </tr>
+    </table>
+    </p>
+    <p>
+    <table border="1" cellspacing="0" cellpadding="5" width="600">
+    	<thead>
+		<tr>
+			<th><p>OPTIONS</p></th>
+			<th><p>Description</p></th>
+		</tr>
+	    </thead>
+	    <tbody>
+		<tr>
+			<td valign="top" width="25%"><p>-config &lt;file&gt;</p></td>
+			<td valign="top"><p>Use the formatting style from the specified properties file. 
+			                    Refer to <a href="tasks-232.htm">Generating a config file for the Formatter Application</a>
+			                    for details.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-help</p></td>
+			<td valign="top"><p>Display the help message.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-quiet</p></td>
+			<td valign="top"><p>Only print error messages.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-verbose</p></td>
+			<td valign="top"><p>Be verbose about the formatting job.</p>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+    </p>
+    
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-66.htm">Formatting Java Code</a><br>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">CodeFormatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-232.htm org.eclipse.jdt.doc.user/tasks/tasks-232.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-232.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-232.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Generating a config file for the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Generating a config file for the Formatter Application
+    </h1>
+    <p>
+    Generating a config file for the Formatter Application involves modifying the code formatter settings
+    for a Java Project and copying org.eclipse.jdt.core.prefs out of the .settings directory for that project.
+    </p>
+    <ol>
+      <li>
+        Select a java project, open the pop-up menu and choose <strong>Properties</strong>.
+      </li>
+
+      <li>
+        Select the <strong>Code Style &gt; Formatter</strong> page and check <strong>Enable project specific sttings</strong>.
+      </li>
+      <li>
+        Select or edit a profile as explained above.
+      </li>
+
+      <li>
+        Click <strong>OK</strong> when you are done.
+      </li>
+      
+      <li>
+        Use either a file manager or the command line to copy <b><code>workspace/YourJavaProject/.settings/org.eclipse.jdt.core.prefs</code></b>
+        to a new location.
+      </li>
+      
+    </ol>
+    </p>
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-68.htm">Setting code formatting preferences</a><br>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">Code Formatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-68.htm org.eclipse.jdt.doc.user/tasks/tasks-68.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-68.htm	2005-06-23 06:30:40.000000000 -0400
+++ org.eclipse.jdt.doc.user/tasks/tasks-68.htm	2006-02-04 12:50:06.000000000 -0500
@@ -63,7 +63,8 @@
     </p>
     <p>
       <a href="tasks-66.htm">Formatting Java code</a><br>
-       <a href="tasks-67.htm">Formatting files or portions of code</a>
+      <a href="tasks-67.htm">Formatting files or portions of code</a><br>
+      <a href="tasks-230.htm">Using the Formatter Application</a>
     </p>
     <p>
       <img border="0"  src="../images/ngrelr.png" alt="Related reference">
diff -ruN org.eclipse.jdt.doc.user.orig/topics_Tasks.xml org.eclipse.jdt.doc.user/topics_Tasks.xml
--- org.eclipse.jdt.doc.user.orig/topics_Tasks.xml	2005-06-23 10:55:16.000000000 -0400
+++ org.eclipse.jdt.doc.user/topics_Tasks.xml	2006-02-04 12:50:03.000000000 -0500
@@ -310,4 +310,9 @@
 		</topic>
 	</topic>
 	<anchor id="t_scrapbook" />
-</toc>
\ No newline at end of file
+	<topic label="Using the Formatter Application" href="tasks/tasks-230.htm">
+			<topic label="Running the Formatter Application" href="tasks/tasks-231.htm"></topic>
+			<topic label="Generating a config file for the Formatter Application" href="tasks/tasks-232.htm"></topic>
+	</topic>
+	
+</toc>

eclipse-efj.patch:
 formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java |  389 ++++++++++
 formatter/org/eclipse/jdt/core/formatter/messages.properties           |   41 +
 plugin.xml                                                             |   12 
 3 files changed, 441 insertions(+), 1 deletion(-)

Index: eclipse-efj.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-efj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-efj.patch	6 Dec 2005 20:05:39 -0000	1.2
+++ eclipse-efj.patch	4 Feb 2006 18:44:11 -0000	1.3
@@ -1,51 +1,10 @@
-Index: plugin.xml
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/plugin.xml,v
-retrieving revision 1.76
-diff -u -r1.76 plugin.xml
---- plugin.xml	4 Jan 2005 10:43:40 -0000	1.76
-+++ plugin.xml	25 Jan 2005 05:04:57 -0000
-@@ -209,4 +209,15 @@
-    <initializer class="org.eclipse.jdt.internal.core.JavaCorePreferenceInitializer"/>
- </extension>
- 
-+<!-- =================================================================================== -->
-+<!-- Extension: Java Code Formatter                                                      -->
-+<!-- =================================================================================== -->
-+<extension
-+      id="JavaCodeFormatter"
-+      point="org.eclipse.core.runtime.applications">
-+      	<application>
-+      		<run class="org.eclipse.jdt.core.formatter.CodeFormatterApplication" />
-+		</application>
-+</extension>
-+
- </plugin>
-Index: formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java,v
-retrieving revision 1.8
-diff -u -r1.8 CodeFormatter.java
---- formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java	7 Jun 2004 15:46:28 -0000	1.8
-+++ formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java	25 Jan 2005 05:04:58 -0000
-@@ -62,7 +62,7 @@
- 	 *      level of zero or below has no effect.
- 	 * @param lineSeparator the line separator to use in formatted source,
- 	 *     if set to <code>null</code>, then the platform default one will be used.
--	 * @return the text edit
-+	 * @return the text edit or <code>null</code> if the given string cannot be formatted.
- 	 * @throws IllegalArgumentException if offset is lower than 0, length is lower than 0 or
- 	 * length is greater than source length.
- 	 */
-Index: formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
-===================================================================
-RCS file: formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
-diff -N formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,427 @@
+diff -ruN org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
+--- org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	1969-12-31 19:00:00.000000000 -0500
++++ org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	2006-02-03 22:02:39.000000000 -0500
+@@ -0,0 +1,389 @@
 +/*******************************************************************************
 + * Copyright (c) 2004 Ben Konrath <ben at bagu.org>
++ * Copyright (c) 2006 Red Hat Incorporated
 + * All rights reserved. This program and the accompanying materials 
 + * are made available under the terms of the Eclipse Public License v1.0
 + * which accompanies this distribution, and is available at
@@ -53,477 +12,450 @@
 + * 
 + * Contributors:
 + *     Ben Konrath <ben at bagu.org> - initial implementation
++ *     Red Hat Incorporated - improvements based on comments from JDT developers
++ *     IBM Corporation - Code review and integration
 + *******************************************************************************/
-+
 +package org.eclipse.jdt.core.formatter;
 +
-+import java.io.BufferedReader;
++import java.io.BufferedInputStream;
 +import java.io.BufferedWriter;
 +import java.io.File;
 +import java.io.FileInputStream;
-+import java.io.FileReader;
 +import java.io.FileWriter;
 +import java.io.IOException;
-+import java.io.Writer;
 +import java.text.MessageFormat;
 +import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-+
-+import javax.xml.parsers.ParserConfigurationException;
-+import javax.xml.parsers.SAXParser;
-+import javax.xml.parsers.SAXParserFactory;
++import java.util.Properties;
 +
 +import org.eclipse.core.runtime.IPlatformRunnable;
-+import org.eclipse.core.runtime.Platform;
 +import org.eclipse.jdt.core.ToolFactory;
 +import org.eclipse.jdt.internal.core.util.Util;
 +import org.eclipse.jface.text.BadLocationException;
 +import org.eclipse.jface.text.Document;
 +import org.eclipse.jface.text.IDocument;
++import org.eclipse.osgi.util.NLS;
 +import org.eclipse.text.edits.TextEdit;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.InputSource;
-+import org.xml.sax.SAXException;
-+import org.xml.sax.helpers.DefaultHandler;
 +
 +/**
-+ * Class that handles the org.eclipse.jdt.core.JavaCodeFormatter the
-+ * application. The map file reading code is based on code in ProfileStore.java
-+ * (org.eclipse.jdf.ui).
++ * Implements an Eclipse Application for org.eclipse.jdt.core.JavaCodeFormatter.
 + * 
-+ * There are a couple improvments that could be made:
-+ * 1. Add an import clean up option (requires stuff from org.eclipse.jdt.ui).
-+ * 2. Make a list of all the files first and then format. You could then 
-+ *    remove duplicate files. 
++ * There are a couple improvments that could be made: 1. Make a list of all the
++ * files first so that a file does not get formatted twice. 2. Use a text based
++ * progress monitor for output.
 + * 
-+ * @author Ben Konrath <ben at bagu.org>
++ * @author Ben Konrath <bkonrath at redhat.com>
++ * @since 3.2
 + */
 +public class CodeFormatterApplication implements IPlatformRunnable {
 +
-+    /**
-+     * A SAX event handler to parse the config xml.
-+     */
-+    private final static class ConfigHandler extends DefaultHandler {
-+
-+        /**
-+         * Identifiers for the XML file.
-+         */
-+        private final String XML_NODE_ROOT = "profiles"; //$NON-NLS-1$
-+
-+        private final String XML_NODE_PROFILE = "profile"; //$NON-NLS-1$
-+
-+        private final String XML_NODE_SETTING = "setting"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_VERSION = "version"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
-+
-+        private int fVersion;
-+
-+        private String fName;
-+
-+        private Map fSettings;
-+
-+        public void startElement(String uri, String localName, String qName,
-+                Attributes attributes) throws SAXException {
-+
-+            if (qName.equals(XML_NODE_SETTING)) {
-+
-+                final String key = attributes.getValue(XML_ATTRIBUTE_ID);
-+                final String value = attributes.getValue(XML_ATTRIBUTE_VALUE);
-+                fSettings.put(key, value);
-+
-+            } else if (qName.equals(XML_NODE_PROFILE)) {
-+
-+                fName = attributes.getValue(XML_ATTRIBUTE_NAME);
-+                fSettings = new HashMap(200);
-+
-+            } else if (qName.equals(XML_NODE_ROOT)) {
-+
-+                try {
-+                    fVersion = Integer.parseInt(attributes
-+                            .getValue(XML_ATTRIBUTE_VERSION));
-+                } catch (NumberFormatException ex) {
-+                    throw new SAXException(ex);
-+                }
-+
-+            }
-+        }
-+
-+        public Map getSettings() {
-+            return fSettings;
-+        }
-+
-+        public int getVersion() {
-+            return fVersion;
-+        }
-+
-+        public String getName() {
-+            return fName;
-+        }
-+
-+    }
-+
-+    /**
-+     * Deals with the messages in the properties file (cut n' pasted from a
-+     * generated class).
-+     */
-+    private final static class FormatterAppMessages {
-+        private static final String BUNDLE_NAME = "org.eclipse.jdt.core.formatter.FormatterAppMessages";//$NON-NLS-1$
-+
-+        private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-+                .getBundle(BUNDLE_NAME);
-+
-+        public static String getString(String key) {
-+            try {
-+                return RESOURCE_BUNDLE.getString(key);
-+            } catch (MissingResourceException e) {
-+                return '!' + key + '!';
-+            }
-+        }
-+
-+        public static String getFormattedString(String key, String arg) {
-+            return getFormattedString(key, new String[] { arg });
-+        }
-+
-+        public static String getFormattedString(String key, String[] args) {
-+            return MessageFormat.format(getString(key), args);
-+        }
-+    }
-+    
-+    /*
-+     * FIXME This value should come from ProfileVersioner.CURRENT_VERSION, however
-+     * this class cannot be included here because it is internal to
-+     * org.eclipse.jdt.ui and becuase this plugin (org.eclipse.jdt.core) does
-+     * not require org.eclipse.jdt.ui (nor should it). Refactoring this to make
-+     * it an external class of org.eclipse.jdt.core would solve these problems.
-+     */
-+    int CURRENT_VERSION = 8;
-+
-+    /**
-+     * Read the xml config file and return a Map representing the options that
-+     * are in the specified config file.
-+     */
-+    public Map readConfig(String filename) {
-+
-+        try {
-+            final FileInputStream reader = new FileInputStream(new File(
-+                    filename));
-+            final ConfigHandler handler = new ConfigHandler();
-+
-+            try {
-+                InputSource inputSource = new InputSource(reader);
-+                final SAXParserFactory factory = SAXParserFactory.newInstance();
-+                final SAXParser parser = factory.newSAXParser();
-+                parser.parse(inputSource, handler);
-+                if (handler.getVersion() != CURRENT_VERSION)
-+                    return null;
-+                configName = handler.getName();
-+                return handler.getSettings();
-+
-+            } finally {
-+                try { reader.close(); } catch (IOException e) { /* ignore */ }
-+            }
-+
-+        } catch (IOException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        } catch (SAXException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        } catch (ParserConfigurationException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        }
-+        return null;
-+    }
-+    
-+    /**
-+     * Runs the Java code formatter application
-+     */
-+    public Object run(Object args) throws Exception {
-+        
-+        ArrayList fileList = processCommandLine((String[]) args);
-+        
-+        // nothing to do
-+        if (fileList == null || fileList.isEmpty())
-+        	return EXIT_OK;
-+       
-+        if (!quiet) {
-+        	if (configName != null)
-+        		System.out.println(FormatterAppMessages.getFormattedString("CommandLine.config.file", configName)); //$NON-NLS-1$
-+            System.out.println(FormatterAppMessages.getString("CommandLine.start")); //$NON-NLS-1$
-+        }
-+        
-+        // format the list of files and/or directories
-+        while (!fileList.isEmpty()) {
-+        	File file = (File) fileList.remove(0);
-+        		
-+            if (file.isDirectory())
-+                formatDirTree(file);
-+            else
-+                formatFile(file);    
-+        }
-+        
-+        if (!quiet) {
-+            System.out.println(FormatterAppMessages.getString("CommandLine.done")); //$NON-NLS-1$
-+        }
-+        
-+        return EXIT_OK;
-+    }
-+
-+    private void displayHelp(String message) {
-+        System.err.println(message);
-+        System.out.println(""); //$NON-NLS-1$
-+        displayHelp();
-+    }
-+
-+    private String configName;
-+    
-+    /*
-+     * The output will look like this:
-+     * 
-+     * "Usage: eclipse -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] <files>
-+     *     <files>		Java source files and/or directories to format.
-+     *					Only files ending with .java will be formatted in the given directory.
-+     *  OPTIONS:
-+     *	   -config <file>		Use the formatting style from the specified config file.
-+     *							This file must be an xml file that has been exported by Eclipse 3.0.
-+     *     -help				Display this message.
-+     *     -quiet				Only print error messages.
-+     *	   -verbose				Be verbose about the formatting job.   
-+     */
-+    private void displayHelp() {
-+        String binaryName = Platform.getOS().equals(Platform.OS_WIN32) ? "eclipse.exe" : "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
-+
-+        // this is UG-LY. is there a way to make this look nicer?
-+        System.out.println(FormatterAppMessages.getFormattedString("CommandLine.usage", //$NON-NLS-1$
-+        		binaryName + " -application org.eclipse.jdt.core.JavaCodeFormatter")); //$NON-NLS-1$
-+        System.out.println(""); //$NON-NLS-1$
-+        
-+        System.out.println("   " + FormatterAppMessages.getString("CommandLine.files") //$NON-NLS-1$ //$NON-NLS-2$
-+                + "\t" + FormatterAppMessages.getString("CommandLine.files.msg1")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("\t\t" //$NON-NLS-1$
-+        		+ FormatterAppMessages.getFormattedString("CommandLine.files.msg2", ".java")); //$NON-NLS-1$ //$NON-NLS-2$ 
-+        
-+        System.out.println(FormatterAppMessages.getString("CommandLine.options")); //$NON-NLS-1$
-+        System.out.println("   " + FormatterAppMessages.getFormattedString("CommandLine.config", ARG_CONFIG) //$NON-NLS-1$ //$NON-NLS-2$ 
-+        		+ "\t" + FormatterAppMessages.getString("CommandLine.config.msg1")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("\t\t\t" + FormatterAppMessages.getString("CommandLine.config.msg2")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("   " + ARG_HELP + "\t\t" + FormatterAppMessages.getString("CommandLine.help")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-+        System.out.println("   " + ARG_QUIET + "\t\t" + FormatterAppMessages.getString("CommandLine.quiet")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-+        System.out.println("   " + ARG_VERBOSE +"\t\t" + FormatterAppMessages.getString("CommandLine.verbose")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-+    }
-+    
-+    private final String ARG_HELP =    "-help"; //$NON-NLS-1$
-+    private final String ARG_CONFIG =  "-config"; //$NON-NLS-1$
-+    private final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
-+    private final String ARG_QUIET = "-quiet"; //$NON-NLS-1$
-+    private boolean verbose = false;
-+    private boolean quiet = false;
-+    
-+    private ArrayList processCommandLine(String[] argsArray) {
++	/**
++	 * Deals with the messages in the properties file (cut n' pasted from a
++	 * generated class).
++	 */
++	private final static class Messages extends NLS {
++		private static final String BUNDLE_NAME = "org.eclipse.jdt.core.formatter.messages";//$NON-NLS-1$
 +
-+        ArrayList args = new ArrayList();
-+        for (int i = 0; i < argsArray.length; i++) {
-+			args.add(argsArray[i]);
++		public static String CommandLineConfigFile;
++
++		public static String CommandLineDone;
++
++		public static String CommandLineErrorConfig;
++
++		public static String CommandLineErrorFile;
++
++		public static String CommandLineErrorFileDir;
++
++		public static String CommandLineErrorQuietVerbose;
++		
++		public static String CommandLineErrorNoConfigFile;
++
++		public static String CommandLineFormatting;
++
++		public static String CommandLineStart;
++
++		public static String CommandLineUsage;
++
++		public static String ConfigFileReadingError;
++
++		public static String FormatProblem;
++
++		public static String CaughtException;
++
++		public static String ExceptionSkip;
++
++		static {
++			NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 +		}
-+        
-+        // look for flag-like args
-+        if (args.remove(ARG_HELP)) {
-+            displayHelp();
-+            return null;
-+        }
-+        if (args.remove(ARG_VERBOSE))
-+            verbose = true;
-+        if (args.remove(ARG_QUIET)) 
-+        	quiet = true;
-+        
-+        if (quiet && verbose) {
-+        	displayHelp(FormatterAppMessages.getFormattedString
-+        			("CommandLineError.quiet.verbose", new String[] {ARG_QUIET, ARG_VERBOSE})); //$NON-NLS-1$
-+        	return null;
-+        }
-+        args.remove("-pdelaunch"); //$NON-NLS-1$
-+
-+        // look for flag/param args
-+        int index = args.indexOf(ARG_CONFIG);
-+        if (index >= 0) {
-+            args.remove(index);
-+            String configFile = (String) args.remove(index);
-+            options = readConfig(configFile);
-+            if (options == null) {
-+                displayHelp(FormatterAppMessages
-+                        .getFormattedString("CommandLineError.config", configFile)); //$NON-NLS-1$
-+                return null;
-+            }
-+        }
-+
-+        // only the files and directories should remain
-+        ArrayList fileList = new ArrayList();
-+        while (!args.isEmpty()) {
-+			String fileName = (String) args.remove(0);
-+			File file = new File(fileName);
-+			if (file.exists()) {
-+				fileList.add(file);
-+			} else {
-+				displayHelp(FormatterAppMessages
-+					.getFormattedString("CommandLineError.file", fileName)); //$NON-NLS-1$
-+				return null;
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @return the manipulated String
++		 */
++		public static String bind(String message) {
++			return bind(message, null);
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param binding
++		 *            the object to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object binding) {
++			return bind(message, new Object[] {
++				binding
++			});
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param binding1
++		 *            An object to be inserted into the message
++		 * @param binding2
++		 *            A second object to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object binding1, Object binding2) {
++			return bind(message, new Object[] {
++					binding1, binding2
++			});
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param bindings
++		 *            An array of objects to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object[] bindings) {
++			return MessageFormat.format(message, bindings);
++		}
++	}
++
++	private final String ARG_CONFIG = "-config"; //$NON-NLS-1$
++
++	private final String ARG_HELP = "-help"; //$NON-NLS-1$
++
++	private final String ARG_QUIET = "-quiet"; //$NON-NLS-1$
++
++	private final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
++
++	private String configName;
++
++	private Properties options = null;
++
++	private final String PDE_LAUNCH = "-pdelaunch"; //$NON-NLS-1$
++
++	private boolean quiet = false;
++
++	private boolean verbose = false;
++
++	/** 
++	 * Display the command line usage message.
++	 */
++	private void displayHelp() {
++		System.out.println(Messages.bind(Messages.CommandLineUsage));
++	}
++
++	private void displayHelp(String message) {
++		System.err.println(message);
++		System.out.println();
++		displayHelp();
++	}
++
++	/**
++	 * Recursively format the Java source code that is contained in the
++	 * directory rooted at dir.
++	 */
++	private void formatDirTree(File dir, CodeFormatter codeFormatter) {
++
++		File[] files = dir.listFiles();
++		if (files == null)
++			return;
++
++		for (int i = 0; i < files.length; i++) {
++			File file = files[i];
++			if (file.isDirectory()) {
++				formatDirTree(file, codeFormatter);
++			} else if (Util.isJavaLikeFileName(file.getPath())) {
++				formatFile(file, codeFormatter);
 +			}
 +		}
-+        
-+        if (fileList.isEmpty())
-+        	displayHelp(FormatterAppMessages.getString("CommandLineError.file.dir")); //$NON-NLS-1$
-+        	
-+        return fileList;
-+    }
-+
-+    /**
-+     * Recursively format the Java source code that is contained in the
-+     * directory rooted at dir.
-+     */
-+    private void formatDirTree(File dir) {
-+
-+        File[] files = dir.listFiles();
-+        if (files == null)
-+            return;
-+
-+        for (int i = 0; i < files.length; i++) {
-+            File file = files[i];
-+            if (file.isDirectory()) {
-+                formatDirTree(file);
-+            } else if (file.getPath().endsWith(".java")) { //$NON-NLS-1$
-+                formatFile(file);
-+            }
-+        }
-+    }
-+
-+    // internal representation of configuration options in the xml file
-+    private Map options = null;
-+
-+    /**
-+     * Format the given Java source file.
-+     */
-+    private void formatFile(File file) {
-+        
-+        IDocument doc = new Document();
-+        try {
-+            // read the file
-+            final BufferedReader in = new BufferedReader(new FileReader(file));
-+            if (verbose) {           
-+                System.out.println(FormatterAppMessages.getFormattedString
-+                		("CommandLine.formatting", file.getName())); //$NON-NLS-1$
-+            }
-+            String line;
-+            String contents = ""; //$NON-NLS-1$
-+            try {
-+                while ((line = in.readLine()) != null)
-+                    contents = contents
-+                            + System.getProperty("line.separator") + line; //$NON-NLS-1$
-+            } finally {
-+                try { in.close(); } catch (IOException e) { /* ignore */  }
-+            }
-+          
-+            // format the file (the meat and potatoes)
-+            doc.set(contents);
-+            TextEdit edit = ToolFactory.createCodeFormatter(options).format(
-+                    CodeFormatter.K_COMPILATION_UNIT, doc.get(), 0,
-+                    doc.getLength(), 0, null);
-+            if (edit != null) {
-+                edit.apply(doc);
-+            } else {            	
-+                System.err.println
-+                	(FormatterAppMessages.getFormattedString("Edit.problem", file.getName())); //$NON-NLS-1$
-+                return;
-+            }
-+        
-+            // write the file
-+            final Writer out = new BufferedWriter(new FileWriter(file, false));
-+            try {
-+                out.write(doc.get());
-+                out.flush();
-+            } finally {
-+                try { out.close(); } catch (IOException e) { /* ignore */ }
-+            }
-+            
-+        } catch (IOException e) {
-+            String errorMessage = FormatterAppMessages.getString("Exception.io") + " " //$NON-NLS-1$ //$NON-NLS-2$
-+            	+ e.getLocalizedMessage();
-+            Util.log(e, errorMessage);
-+            System.err.println(errorMessage); 
-+            System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$
-+            
-+        }  catch (BadLocationException e) {
-+            String errorMessage = FormatterAppMessages.getString("Exception.bad.location") + " " //$NON-NLS-1$ //$NON-NLS-2$
-+    			+ e.getLocalizedMessage();
-+            Util.log(e, errorMessage);
-+            System.err.println(errorMessage); 
-+            System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$
-+        }
-+    }
++	}
 +
-+}
-Index: formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
-===================================================================
-RCS file: formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
-diff -N formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,47 @@
-+/*******************************************************************************
-+ * Copyright (c) 2004 Ben Konrath <ben at bagu.org>
-+ * All rights reserved. This program and the accompanying materials 
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     Ben Konrath <ben at bagu.org> - initial implementation
-+ *******************************************************************************/
++	/**
++	 * Format the given Java source file.
++	 */
++	private void formatFile(File file, CodeFormatter codeFormatter) {
++		IDocument doc = new Document();
++		try {
++			// read the file
++			if (this.verbose) {
++				System.out.println(Messages.bind(Messages.CommandLineFormatting, file.getAbsolutePath()));
++			}
++			String contents = new String(org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(file, null));
++			// format the file (the meat and potatoes)
++			doc.set(contents);
++			TextEdit edit = codeFormatter.format(CodeFormatter.K_COMPILATION_UNIT, contents, 0, contents.length(), 0, null);
++			if (edit != null) {
++				edit.apply(doc);
++			} else {
++				System.err.println(Messages.bind(Messages.FormatProblem, file.getAbsolutePath()));
++				return;
++			}
 +
-+CommandLine.start=Starting format job ...
-+CommandLine.done=Done.
-+CommandLine.config.file=Configuration Name: {0}
-+CommandLine.formatting=Formatting: {0}
++			// write the file
++			final BufferedWriter out = new BufferedWriter(new FileWriter(file));
++			try {
++				out.write(doc.get());
++				out.flush();
++			} finally {
++				try {
++					out.close();
++				} catch (IOException e) {
++					/* ignore */
++				}
++			}
++		} catch (IOException e) {
++			String errorMessage = Messages.bind(Messages.CaughtException, "IOException", e.getLocalizedMessage()); //$NON-NLS-1$
++			Util.log(e, errorMessage);
++			System.err.println(Messages.bind(Messages.ExceptionSkip ,errorMessage));
++		} catch (BadLocationException e) {
++			String errorMessage = Messages.bind(Messages.CaughtException, "BadLocationException", e.getLocalizedMessage()); //$NON-NLS-1$
++			Util.log(e, errorMessage);
++			System.err.println(Messages.bind(Messages.ExceptionSkip ,errorMessage));
++		}
++	}
 +
-+CommandLine.usage=Usage: {0} [ OPTIONS ] <files>
++	private File[] processCommandLine(String[] argsArray) {
 +
-+CommandLine.files=<files>
-+CommandLine.files.msg1=Java source files and/or directories to format.
-+CommandLine.files.msg2=Only files ending with {0} will be formatted in the given directory.
++		ArrayList args = new ArrayList();
++		for (int i = 0; i < argsArray.length; i++) {
++			args.add(argsArray[i]);
++		}
++		int index = 0;
++		final int argCount = argsArray.length;
 +
-+CommandLine.options=OPTIONS:
-+CommandLine.config={0} <file>
-+CommandLine.config.msg1=Use the formatting style from the specified config file.
-+CommandLine.config.msg2=This file must be an xml file that has been exported by Eclipse 3.0.
-+CommandLine.help=Display this message.
-+CommandLine.quiet=Only print error messages.
-+CommandLine.verbose=Be verbose about the formatting job.
++		final int DEFAULT_MODE = 0;
++		final int CONFIG_MODE = 1;
++		
++		int mode = DEFAULT_MODE;
++		final int INITIAL_SIZE = 1;
++		int fileCounter = 0;
++		
++		File[] filesToFormat = new File[INITIAL_SIZE];
++
++		loop: while (index < argCount) {
++			String currentArg = argsArray[index++];
++
++			switch(mode) {
++				case DEFAULT_MODE :
++					if (PDE_LAUNCH.equals(currentArg)) {
++						continue loop;
++					}			
++					if (ARG_HELP.equals(currentArg)) {
++						displayHelp();
++						return null;				
++					}
++					if (ARG_VERBOSE.equals(currentArg)) {
++						this.verbose = true;
++						continue loop;
++					}
++					if (ARG_QUIET.equals(currentArg)) {
++						this.quiet = true;
++						continue loop;
++					}
++					if (ARG_CONFIG.equals(currentArg)) {
++						mode = CONFIG_MODE;
++						continue loop;
++					}
++					// the current arg should be a file or a directory name
++					File file = new File(currentArg);
++					if (file.exists()) {
++						if (filesToFormat.length == fileCounter) {
++							System.arraycopy(filesToFormat, 0, (filesToFormat = new File[fileCounter * 2]), 0, fileCounter);
++						}
++						filesToFormat[fileCounter++] = file;
++					} else {
++						displayHelp(Messages.bind(Messages.CommandLineErrorFile, currentArg));
++						return null;
++					}	
++					break;
++				case CONFIG_MODE :
++					this.configName = currentArg;
++					this.options = readConfig(currentArg);
++					if (this.options == null) {
++						displayHelp(Messages.bind(Messages.CommandLineErrorConfig, currentArg));
++						return null;
++					}
++					mode = DEFAULT_MODE;
++					continue loop;
++			}			
++		}
 +
++		if (mode == CONFIG_MODE) {
++			displayHelp(Messages.bind(Messages.CommandLineErrorNoConfigFile));
++			return null;			
++		}
++		if (this.quiet && this.verbose) {
++			displayHelp(
++				Messages.bind(
++					Messages.CommandLineErrorQuietVerbose,
++					new String[] { ARG_QUIET, ARG_VERBOSE }
++				));
++			return null;
++		}
++		if (fileCounter == 0) {
++			displayHelp(Messages.bind(Messages.CommandLineErrorFileDir));
++			return null;
++		}
++		if (filesToFormat.length != fileCounter) {
++			System.arraycopy(filesToFormat, 0, (filesToFormat = new File[fileCounter]), 0, fileCounter);
++		}
++		return filesToFormat;
++	}
 +
-+CommandLineError.file={0} does not exsit. Please specify only valid Java Source files.
-+CommandLineError.config=There was problem reading the config file, {0}.
-+CommandLineError.file.dir=You must specify at least one file or dirctory to format.
-+CommandLineError.quiet.verbose=You cannot use the options {0} and {1} together.
++	/**
++	 * Return a Java Properties file representing the options that are in the
++	 * specified config file.
++	 */
++	private Properties readConfig(String filename) {
++		BufferedInputStream stream = null;
++		try {
++			stream = new BufferedInputStream(new FileInputStream(new File(filename)));
++			final Properties formatterOptions = new Properties();
++			formatterOptions.load(stream);
++			return formatterOptions;
++		} catch (IOException e) {
++			Util.log(e, Messages.bind(Messages.ConfigFileReadingError));
++		} finally {
++			if (stream != null) {
++				try {
++					stream.close();
++				} catch (IOException e) {
++					/* ignore */
++				}
++			}
++		}
++		return null;
++	}
 +
++	/**
++	 * Runs the Java code formatter application
++	 */
++	public Object run(Object args) throws Exception {
++		File[] filesToFormat = processCommandLine((String[]) args);
 +
-+Exception.io=Caught IOExecption:
-+Exception.bad.location=Caught BadLocationException:  
-+Exception.skip=Skipping File.
++		if (filesToFormat == null) {
++			return EXIT_OK;
++		}
 +
++		if (!this.quiet) {
++			if (this.configName != null) {
++				System.out.println(Messages.bind(Messages.CommandLineConfigFile, this.configName));
++			}
++			System.out.println(Messages.bind(Messages.CommandLineStart));
++		}
 +
-+ConfigFile.reading.error=Error Reading config file.
++		// format the list of files and/or directories
++		final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(this.options);
++		for (int i = 0, max = filesToFormat.length; i < max; i++) {
++			final File file = filesToFormat[i];
++			if (file.isDirectory()) {
++				formatDirTree(file, codeFormatter);
++			} else if (Util.isJavaLikeFileName(file.getPath())) {
++				formatFile(file, codeFormatter);
++			}			
++		}
++		if (!this.quiet) {
++			System.out.println(Messages.bind(Messages.CommandLineDone));
++		}
 +
++		return EXIT_OK;
++	}
 +
-+Edit.problem=The Eclipse formatter had a problem {0}, Skipping.
++}
+diff -ruN org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/messages.properties org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/messages.properties
+--- org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/messages.properties	1969-12-31 19:00:00.000000000 -0500
++++ org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/messages.properties	2006-02-03 22:02:36.000000000 -0500
+@@ -0,0 +1,41 @@
++###############################################################################
++# Copyright (c) 2006 Ben Konrath <ben at bagu.org>
++# All rights reserved. This program and the accompanying materials
++# are made available under the terms of the Eclipse Public License v1.0
++# which accompanies this distribution, and is available at
++# http://www.eclipse.org/legal/epl-v10.html
++#
++# Contributors:
++#     Ben Konrath <ben at bagu.org> - initial implementation
++#     IBM Corporation - Code review and integration
++###############################################################################
++CommandLineStart=Starting format job ...
++CommandLineDone=Done.
++CommandLineConfigFile=Configuration Name: {0}
++CommandLineFormatting=Formatting: {0}
++
++CommandLineUsage=Usage: eclipse -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] <files>\n\
++\n\
++\   <files>   Java source files and/or directories to format.\n\
++\             Only files ending with .java will be formatted in the given directory.\n\
++\n\
++\OPTIONS:\n\
++\   -config <configFile> Use the formatting style from the specified properties file.\n\
++\                        Refer to the help documentation to find out how to generate this file.\n\
++\n\
++\   -help                Display this message.\n\
++\   -quiet               Only print error messages.\n\
++\   -verbose             Be verbose about the formatting job.
++
++CommandLineErrorFile={0} does not exist. Please specify only valid Java Source files.
++CommandLineErrorConfig=A problem occured while reading the config file {0}.
++CommandLineErrorFileDir=You must specify at least one file or directory to format.
++CommandLineErrorQuietVerbose=You cannot use the options {0} and {1} together.
++CommandLineErrorNoConfigFile=No configuration file specified.
++
++CaughtException=Caught {0} : {1}
++ExceptionSkip= {0}\nSkipping File.
++
++ConfigFileReadingError=Error Reading config file.
++
++FormatProblem=The Eclipse formatter failed to format {0}. Skip the file.
+\ No newline at end of file
+diff -ruN org.eclipse.jdt.core.orig/plugin.xml org.eclipse.jdt.core/plugin.xml
+--- org.eclipse.jdt.core.orig/plugin.xml	2005-05-09 07:29:30.000000000 -0400
++++ org.eclipse.jdt.core/plugin.xml	2006-02-04 13:17:09.000000000 -0500
+@@ -155,7 +155,17 @@
+ 	<fileTypes extension="jardesc" type="text"/>
+ 	<fileTypes extension="zip" type="binary"/>
+ </extension>
+-      
++<!-- =================================================================================== -->
++<!-- Extension: Java Code Formatter                                                      -->
++<!-- =================================================================================== -->
++<extension
++      id="JavaCodeFormatter"
++      point="org.eclipse.core.runtime.applications">
++      	<application>
++      		<run class="org.eclipse.jdt.core.formatter.CodeFormatterApplication" />
++		</application>
++</extension>
 +
-Content-Type: text/plain
-
+ <!-- =================================================================================== -->
+ <!-- Extension: Java Content Types                                                       -->
+ <!-- =================================================================================== -->


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- eclipse.spec	3 Feb 2006 21:28:03 -0000	1.235
+++ eclipse.spec	4 Feb 2006 18:44:11 -0000	1.236
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_2fc
+Release:        1jpp_3fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -67,6 +67,7 @@
 # Add command-line source code formatter
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=75333
 Patch19: 	%{name}-efj.patch
+Patch25: 	%{name}-efj-doc.patch
 # GNU-style JDT formatter
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770
 #Patch20: 	%{name}-gnuformatterjdt.patch
@@ -334,9 +335,12 @@
 %patch18 -p0
 popd
 pushd plugins/org.eclipse.jdt.core
-%patch19 -p0
+%patch19 -p1
 #%patch20 -p0
 popd
+pushd plugins/org.eclipse.jdt.doc.user
+%patch25 -p1
+popd
 #pushd plugins/org.eclipse.jdt.ui
 #%patch21 -p0
 #popd
@@ -1251,6 +1255,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Sat Feb 4 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_3fc
+- Update efj patches to match what has been committed to HEAD.
+
 * Fri Feb 3 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_2fc
 - Updated launcher script.
 



From fedora-cvs-commits at redhat.com  Sat Feb  4 20:10:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 15:10:53 -0500
Subject: rpms/rhythmbox/devel .cvsignore, 1.20, 1.21 rhythmbox.spec, 1.48,
	1.49 sources, 1.22, 1.23
Message-ID: <200602042010.k14KArK8019123@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19094

Modified Files:
	.cvsignore rhythmbox.spec sources 
Log Message:
* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 0.9.3.1-1
- Update to 0.9.3.1
- Use gstreamer (0.10)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	2 Feb 2006 04:04:15 -0000	1.20
+++ .cvsignore	4 Feb 2006 20:10:49 -0000	1.21
@@ -5,3 +5,4 @@
 rhythmbox-0.9.2.cvs20060123.tar.bz2
 rhythmbox-0.9.2.cvs20060201.tar.bz2
 rhythmbox-0.9.3.tar.bz2
+rhythmbox-0.9.3.1.tar.bz2


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rhythmbox.spec	2 Feb 2006 04:27:38 -0000	1.48
+++ rhythmbox.spec	4 Feb 2006 20:10:49 -0000	1.49
@@ -2,8 +2,8 @@
 
 Name: rhythmbox
 Summary: Music Management Application 
-Version: 0.9.3
-Release: 2
+Version: 0.9.3.1
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -16,7 +16,7 @@
 BuildRequires: libgpod-devel
 BuildRequires: libgnomeui-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel
-BuildRequires: gstreamer08-plugins-devel >= 0.8.1
+BuildRequires: gstreamer-plugins-base-devel >= 0.10
 BuildRequires: gettext, scrollkeeper
 BuildRequires: totem-devel >= 1.1.5
 BuildRequires: gnome-vfs2 >= 2.7.4
@@ -96,6 +96,10 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 0.9.3.1-1
+- Update to 0.9.3.1
+- Use gstreamer (0.10)
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> 0.9.3-2
 - Remove hack for 173869, as its no longer needed.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	2 Feb 2006 04:04:15 -0000	1.22
+++ sources	4 Feb 2006 20:10:49 -0000	1.23
@@ -1 +1 @@
-3ad98939192d44e64982588b15827ffe  rhythmbox-0.9.3.tar.bz2
+0b63402c35c10de5581d79f5157a0739  rhythmbox-0.9.3.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb  4 21:35:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 16:35:59 -0500
Subject: rpms/gcc/devel gcc41-gc-pthread_create.patch, 1.1,
	1.2 gcc41-ia64-frame-base-loclist.patch, 1.1, 1.2
Message-ID: <200602042135.k14LZxSY012507@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12396

Modified Files:
	gcc41-gc-pthread_create.patch 
	gcc41-ia64-frame-base-loclist.patch 
Log Message:
4.1.0-0.22


gcc41-gc-pthread_create.patch:
 configure                      |   23 +++++++++++++++++++++++
 configure.ac                   |   19 +++++++++++++++++++
 include/gc_config.h.in         |    3 +++
 include/gc_ext_config.h.in     |    2 ++
 include/gc_pthread_redirects.h |    2 ++
 pthread_support.c              |   36 ++++++++++++++++++++++++++++++++++--
 6 files changed, 83 insertions(+), 2 deletions(-)

Index: gcc41-gc-pthread_create.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-gc-pthread_create.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-gc-pthread_create.patch	4 Feb 2006 12:42:09 -0000	1.1
+++ gcc41-gc-pthread_create.patch	4 Feb 2006 21:35:57 -0000	1.2
@@ -1,4 +1,4 @@
-2006-01-31  Jakub Jelinek  <jakub at redhat.com>
+2006-02-04  Jakub Jelinek  <jakub at redhat.com>
 	    Anthony Green  <green at redhat.com>
 	    Tom Tromey  <tromey at redhat.com>
 
@@ -12,28 +12,24 @@
 	* configure: Rebuilt.
 	* configure.ac (GC_PTHREAD_SYM_VERSION): Define.
 
---- boehm-gc/configure.ac	(revision 110408)
-+++ boehm-gc/configure.ac	(working copy)
-@@ -450,6 +450,29 @@
+--- boehm-gc/configure.ac.jj	2006-01-27 18:44:05.000000000 -0500
++++ boehm-gc/configure.ac	2006-02-04 12:51:19.000000000 -0500
+@@ -450,6 +450,25 @@ if test "${gc_use_mmap}" = "yes"; then
    AC_DEFINE(USE_MMAP, 1, [use MMAP instead of sbrk to get new memory])
  fi
  
-+is_64bit=no
-+test `$CC $CFLAGS -print-multi-os-directory` = "../lib64" && is_64bit=yesb
-+symver=GLIBC_2.1
++symver=
 +case "$target" in
-+  sparc*-*-linux* | s390*-*-linux*) 
-+    test $is_64bit = yes && symver=GLIBC_2.2
-+    ;;
-+  mips*-*-linux* | sh*-*-linux* | ia64*-*-linux* | hppa*-*-linux* | \
-+  cris*-*-linux*)
-+    symver=GLIBC_2.2
-+    ;;
-+  x86_64*-*-linux*)
-+    test $is_64bit = yes && symver=GLIBC_2.2.5
-+    ;;
-+  powerpc*-*-linux*)
-+    test $is_64bit = yes && symver=GLIBC_2.3
++  *-*-linux* )
++    cat > conftest.c <<EOF
++#include <pthread.h>
++void *tf (void *arg) { (void) arg; return NULL; }
++int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; }
++EOF
++    if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then
++      symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'`
++    fi
++    rm -f conftest conftest.c
 +    ;;
 +esac
 +if test -n "$symver"; then
@@ -44,16 +40,8 @@
  if test -n "$with_cross_host" &&
     test x"$with_cross_host" != x"no"; then
    toolexecdir='$(exec_prefix)/$(target_noncanonical)'
---- boehm-gc/include/gc_ext_config.h.in	(revision 110408)
-+++ boehm-gc/include/gc_ext_config.h.in	(working copy)
-@@ -3,3 +3,5 @@
- is used by libjava/include/boehm-gc.h. */
- 
- #undef THREAD_LOCAL_ALLOC
-+
-+#undef GC_PTHREAD_SYM_VERSION
---- boehm-gc/include/gc_pthread_redirects.h	(revision 110408)
-+++ boehm-gc/include/gc_pthread_redirects.h	(working copy)
+--- boehm-gc/include/gc_pthread_redirects.h.jj	2006-01-27 18:44:03.000000000 -0500
++++ boehm-gc/include/gc_pthread_redirects.h	2006-02-04 12:46:31.000000000 -0500
 @@ -68,7 +68,9 @@
  # undef pthread_detach
  #endif
@@ -64,8 +52,16 @@
  # define pthread_join GC_pthread_join
  # define pthread_detach GC_pthread_detach
  
---- boehm-gc/include/gc_config.h.in	(revision 110408)
-+++ boehm-gc/include/gc_config.h.in	(working copy)
+--- boehm-gc/include/gc_ext_config.h.in.jj	2006-01-27 18:44:03.000000000 -0500
++++ boehm-gc/include/gc_ext_config.h.in	2006-02-04 12:46:31.000000000 -0500
+@@ -3,3 +3,5 @@ external clients that do not want to inc
+ is used by libjava/include/boehm-gc.h. */
+ 
+ #undef THREAD_LOCAL_ALLOC
++
++#undef GC_PTHREAD_SYM_VERSION
+--- boehm-gc/include/gc_config.h.in.jj	2006-01-27 18:44:03.000000000 -0500
++++ boehm-gc/include/gc_config.h.in	2006-02-04 12:46:31.000000000 -0500
 @@ -45,6 +45,9 @@
  /* support for Tru64 pthreads */
  #undef GC_OSF1_THREADS
@@ -76,28 +72,24 @@
  /* support for Solaris pthreads */
  #undef GC_SOLARIS_PTHREADS
  
---- boehm-gc/configure	(revision 110408)
-+++ boehm-gc/configure	(working copy)
-@@ -6627,6 +6627,33 @@
+--- boehm-gc/configure.jj	2006-01-27 18:44:05.000000000 -0500
++++ boehm-gc/configure	2006-02-04 12:51:31.000000000 -0500
+@@ -6627,6 +6627,29 @@ _ACEOF
  
  fi
  
-+is_64bit=no
-+test `$CC $CFLAGS -print-multi-os-directory` = "../lib64" && is_64bit=yesb
-+symver=GLIBC_2.1
++symver=
 +case "$target" in
-+  sparc*-*-linux* | s390*-*-linux*)
-+    test $is_64bit = yes && symver=GLIBC_2.2
-+    ;;
-+  mips*-*-linux* | sh*-*-linux* | ia64*-*-linux* | hppa*-*-linux* | \
-+  cris*-*-linux*)
-+    symver=GLIBC_2.2
-+    ;;
-+  x86_64*-*-linux*)
-+    test $is_64bit = yes && symver=GLIBC_2.2.5
-+    ;;
-+  powerpc*-*-linux*)
-+    test $is_64bit = yes && symver=GLIBC_2.3
++  *-*-linux* )
++    cat > conftest.c <<EOF
++#include <pthread.h>
++void *tf (void *arg) { (void) arg; return NULL; }
++int main (void) { pthread_t th; pthread_create (&th, NULL, tf, NULL); return 0; }
++EOF
++    if $CC $CFLAGS -pthread -o conftest conftest.c > /dev/null 2>&1; then
++      symver=`readelf -s conftest 2> /dev/null | sed -n '/UND pthread_create@/{s/^.*@//;s/ .*$//;p;q}'`
++    fi
++    rm -f conftest conftest.c
 +    ;;
 +esac
 +if test -n "$symver"; then
@@ -112,8 +104,8 @@
  if test -n "$with_cross_host" &&
     test x"$with_cross_host" != x"no"; then
    toolexecdir='$(exec_prefix)/$(target_noncanonical)'
---- boehm-gc/pthread_support.c	(revision 110408)
-+++ boehm-gc/pthread_support.c	(working copy)
+--- boehm-gc/pthread_support.c.jj	2006-01-27 18:44:05.000000000 -0500
++++ boehm-gc/pthread_support.c	2006-02-04 12:46:31.000000000 -0500
 @@ -47,6 +47,9 @@
  /*#define DEBUG_THREADS 1*/
  /*#define GC_ASSERTIONS*/
@@ -124,7 +116,7 @@
  # include "gc.h"
  # include "private/pthread_support.h"
  
-@@ -1193,8 +1196,35 @@
+@@ -1194,8 +1197,37 @@ void * GC_start_routine(void * arg)
      return(result);
  }
  
@@ -147,10 +139,12 @@
 +}
 +
 +#define GC_PTHREAD_CREATE_NAME pthread_create
++#define GC_PTHREAD_REAL_NAME (*pthread_create_)
 +
 +#else
 +
 +#define GC_PTHREAD_CREATE_NAME WRAP_FUNC(pthread_create)
++#define GC_PTHREAD_REAL_NAME REAL_FUNC(pthread_create)
 +
 +#endif
 +
@@ -161,12 +155,12 @@
  		  const pthread_attr_t *attr,
                    void *(*start_routine)(void *), void *arg)
  {
-@@ -1255,7 +1285,7 @@
+@@ -1250,7 +1282,7 @@ WRAP_FUNC(pthread_create)(pthread_t *new
  		   pthread_self());
  #   endif
  
 -    result = REAL_FUNC(pthread_create)(new_thread, attr, GC_start_routine, si);
-+    result = (*pthread_create_)(new_thread, attr, GC_start_routine, si);
++    result = GC_PTHREAD_REAL_NAME(new_thread, attr, GC_start_routine, si);
  
  #   ifdef DEBUG_THREADS
          GC_printf1("Started thread 0x%X\n", *new_thread);

gcc41-ia64-frame-base-loclist.patch:
 config/ia64/ia64.c        |  180 ++++++++++++++++++++++++++++++++++------------
 config/ia64/ia64.h        |   12 +++
 config/ia64/t-ia64        |    2 
 config/ia64/unwind-ia64.c |    4 -
 dwarf2out.c               |   46 +++++------
 toplev.c                  |    4 -
 6 files changed, 173 insertions(+), 75 deletions(-)

Index: gcc41-ia64-frame-base-loclist.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ia64-frame-base-loclist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ia64-frame-base-loclist.patch	4 Feb 2006 12:42:09 -0000	1.1
+++ gcc41-ia64-frame-base-loclist.patch	4 Feb 2006 21:35:57 -0000	1.2
@@ -1,4 +1,4 @@
-2006-02-03  Alexandre Oliva  <aoliva at redhat.com>
+2006-02-04  Alexandre Oliva  <aoliva at redhat.com>
 
 	PR debug/24444
 	* config/ia64/ia64.c: Include debug.h.
@@ -11,6 +11,8 @@
 	* config/ia64/ia64.h (ARG_POINTER_CFA_OFFSET): Override
 	incorrect default.
 	(DWARF2_FRAME_INFO): Define to zero.
+	* config/ia64/unwind-ia64.c: Remove code that compensated for
+	the CFA offset error fixed above.
 	* config/ia64/t-ia64 (ia64.o): Depend on debug.h.
 	* dwarf2out.c (DWARF2_FRAME_INFO): Define default.
 	(dwarf2out_do_frame): Require nonzero DWARF2_UNWIND_INFO for
@@ -29,8 +31,8 @@
 	dwarf2out_frame_finish if DWARF2_DEBUGGING_INFO is defined.
 	(lang_dependent_init): Ditto for dwarf2out_frame_init.
 
---- gcc/config/ia64/ia64.c.orig	2005-12-02 18:13:36.000000000 -0200
-+++ gcc/config/ia64/ia64.c	2006-02-03 04:35:36.000000000 -0200
+--- gcc/config/ia64/ia64.c.orig	2006-02-03 20:31:57.000000000 -0200
++++ gcc/config/ia64/ia64.c	2006-02-04 07:41:58.000000000 -0200
 @@ -53,6 +53,7 @@ Boston, MA 02110-1301, USA.  */
  #include "cfglayout.h"
  #include "tree-gimple.h"
@@ -377,8 +379,8 @@
  	      }
  	    break;
  	  }
---- gcc/config/ia64/ia64.h.orig	2006-02-03 03:09:18.000000000 -0200
-+++ gcc/config/ia64/ia64.h	2006-02-03 04:18:50.000000000 -0200
+--- gcc/config/ia64/ia64.h.orig	2006-02-03 20:32:11.000000000 -0200
++++ gcc/config/ia64/ia64.h	2006-02-04 07:41:58.000000000 -0200
 @@ -981,6 +981,12 @@ enum reg_class
     On some machines it may depend on the data type of the function.  */
  #define FIRST_PARM_OFFSET(FUNDECL) 0
@@ -405,16 +407,16 @@
  #define DWARF2_ASM_LINE_DEBUG_INFO (TARGET_DWARF2_ASM)
  
  /* Use tags for debug info labels, so that they don't break instruction
---- gcc/config/ia64/t-ia64.orig	2006-02-03 03:09:18.000000000 -0200
-+++ gcc/config/ia64/t-ia64	2006-02-03 04:18:50.000000000 -0200
+--- gcc/config/ia64/t-ia64.orig	2006-02-03 20:32:11.000000000 -0200
++++ gcc/config/ia64/t-ia64	2006-02-04 07:41:58.000000000 -0200
 @@ -50,3 +50,5 @@ ia64-c.o: $(srcdir)/config/ia64/ia64-c.c
  
  # genattrtab generates very long string literals.
  insn-attrtab.o-warn = -Wno-error
 +
 +ia64.o: debug.h
---- gcc/dwarf2out.c.orig	2006-01-25 15:04:42.000000000 -0200
-+++ gcc/dwarf2out.c	2006-02-03 05:41:57.000000000 -0200
+--- gcc/dwarf2out.c.orig	2006-02-03 20:31:57.000000000 -0200
++++ gcc/dwarf2out.c	2006-02-04 07:41:59.000000000 -0200
 @@ -90,20 +90,31 @@ static void dwarf2out_source_line (unsig
     DW_CFA_... = DWARF2 CFA call frame instruction
     DW_TAG_... = DWARF2 DIE tag */
@@ -451,7 +453,7 @@
  #endif
  	  );
  }
-@@ -2575,10 +2586,12 @@ dwarf2out_frame_init (void)
+@@ -2586,10 +2597,12 @@ dwarf2out_frame_init (void)
    /* Generate the CFA instructions common to all FDE's.  Do it now for the
       sake of lookup_cfa.  */
  
@@ -466,7 +468,7 @@
  #endif
  }
  
-@@ -2586,12 +2599,7 @@ void
+@@ -2597,12 +2610,7 @@ void
  dwarf2out_frame_finish (void)
  {
    /* Output call frame information.  */
@@ -480,7 +482,7 @@
      output_call_frame_info (0);
  
  #ifndef TARGET_UNWIND_INFO
-@@ -10332,7 +10340,6 @@ tree_add_const_value_attribute (dw_die_r
+@@ -10326,7 +10334,6 @@ tree_add_const_value_attribute (dw_die_r
      add_const_value_attribute (var_die, rtl);
  }
  
@@ -488,7 +490,7 @@
  /* Convert the CFI instructions for the current function into a location
     list.  This is used for DW_AT_frame_base when we targeting a dwarf2
     consumer that does not support the dwarf3 DW_OP_call_frame_cfa.  */
-@@ -10439,7 +10446,6 @@ compute_frame_pointer_to_cfa_displacemen
+@@ -10433,7 +10440,6 @@ compute_frame_pointer_to_cfa_displacemen
  
    frame_pointer_cfa_offset = -offset;
  }
@@ -496,7 +498,7 @@
  
  /* Generate a DW_AT_name attribute given some string value to be included as
     the value of the attribute.  */
-@@ -11674,7 +11680,6 @@ gen_subprogram_die (tree decl, dw_die_re
+@@ -11668,7 +11674,6 @@ gen_subprogram_die (tree decl, dw_die_re
        add_AT_fde_ref (subr_die, DW_AT_MIPS_fde, current_funcdef_fde);
  #endif
  
@@ -504,7 +506,7 @@
        /* We define the "frame base" as the function's CFA.  This is more
  	 convenient for several reasons: (1) It's stable across the prologue
  	 and epilogue, which makes it better than just a frame pointer,
-@@ -11701,17 +11706,6 @@ gen_subprogram_die (tree decl, dw_die_re
+@@ -11695,17 +11700,6 @@ gen_subprogram_die (tree decl, dw_die_re
  	 debugger about.  We'll need to adjust all frame_base references
  	 by this displacement.  */
        compute_frame_pointer_to_cfa_displacement ();
@@ -522,9 +524,9 @@
  
        if (cfun->static_chain_decl)
  	add_AT_location_description (subr_die, DW_AT_static_link,
---- gcc/toplev.c.orig	2006-01-26 16:20:39.000000000 -0200
-+++ gcc/toplev.c	2006-02-03 04:18:51.000000000 -0200
-@@ -1020,7 +1020,7 @@ compile_file (void)
+--- gcc/toplev.c.orig	2006-02-03 20:31:57.000000000 -0200
++++ gcc/toplev.c	2006-02-04 07:41:59.000000000 -0200
+@@ -1028,7 +1028,7 @@ compile_file (void)
    /* Do dbx symbols.  */
    timevar_push (TV_SYMOUT);
  
@@ -533,7 +535,7 @@
    if (dwarf2out_do_frame ())
      dwarf2out_frame_finish ();
  #endif
-@@ -1860,7 +1860,7 @@ lang_dependent_init (const char *name)
+@@ -1868,7 +1868,7 @@ lang_dependent_init (const char *name)
       predefined types.  */
    timevar_push (TV_SYMOUT);
  
@@ -542,3 +544,23 @@
    if (dwarf2out_do_frame ())
      dwarf2out_frame_init ();
  #endif
+--- gcc/config/ia64/unwind-ia64.c.orig	2005-11-17 23:51:49.000000000 -0200
++++ gcc/config/ia64/unwind-ia64.c	2006-02-04 15:57:42.000000000 -0200
+@@ -2067,7 +2067,7 @@ uw_advance_context (struct _Unwind_Conte
+ }
+ 
+ /* Fill in CONTEXT for top-of-stack.  The only valid registers at this
+-   level will be the return address and the CFA.  Note that CFA = SP+16.  */
++   level will be the return address and the CFA.  */
+    
+ #define uw_init_context(CONTEXT)					\
+   do {									\
+@@ -2083,7 +2083,7 @@ uw_init_context_1 (struct _Unwind_Contex
+ {
+   void *rp = __builtin_extract_return_addr (__builtin_return_address (0));
+   /* Set psp to the caller's stack pointer.  */
+-  void *psp = __builtin_dwarf_cfa () - 16;
++  void *psp = __builtin_dwarf_cfa ();
+   _Unwind_FrameState fs;
+   unsigned long rnat, tmp1, tmp2;
+ 



From fedora-cvs-commits at redhat.com  Sat Feb  4 21:37:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 16:37:14 -0500
Subject: rpms/gcc/devel gcc41.spec,1.27,1.28
Message-ID: <200602042137.k14LbEN4013097@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13024

Modified Files:
	gcc41.spec 
Log Message:
4.1.0-0.22



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gcc41.spec	4 Feb 2006 13:25:21 -0000	1.27
+++ gcc41.spec	4 Feb 2006 21:37:11 -0000	1.28
@@ -1,6 +1,6 @@
 %define DATE 20060204
 %define gcc_version 4.1.0
-%define gcc_release 0.21
+%define gcc_release 0.22
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -1538,6 +1538,10 @@
 %endif
 
 %changelog
+* Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.22
+- fix ia64 debug info patch
+- fix libjava pthread_create wrapper patch
+
 * Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.21
 - update from gcc-4_1-branch (-r110433:110582)
   - PRs c++/25342, c++/25979, fortran/20845, fortran/24266,



From fedora-cvs-commits at redhat.com  Sat Feb  4 23:16:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 18:16:57 -0500
Subject: rpms/kdegraphics/devel kdegraphics-3.5.1-kpdf.patch, NONE,
	1.1 .cvsignore, 1.30, 1.31 kdegraphics.spec, 1.69,
	1.70 sources, 1.31, 1.32 kdegraphics-3.5.0-xft.patch, 1.1,
	NONE post-3.5.0-kdegraphics-CAN-2005-3193.diff, 1.1, NONE
Message-ID: <200602042316.k14NGvRB024885@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22961

Modified Files:
	.cvsignore kdegraphics.spec sources 
Added Files:
	kdegraphics-3.5.1-kpdf.patch 
Removed Files:
	kdegraphics-3.5.0-xft.patch 
	post-3.5.0-kdegraphics-CAN-2005-3193.diff 
Log Message:
3.5.1


kdegraphics-3.5.1-kpdf.patch:
 part.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdegraphics-3.5.1-kpdf.patch ---
--- kdegraphics-3.5.1/kpdf/part.cpp.orig	2006-02-01 20:15:41.000000000 +0100
+++ kdegraphics-3.5.1/kpdf/part.cpp	2006-02-01 20:17:38.000000000 +0100
@@ -697,6 +697,11 @@
     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
     if ( saveURL.isValid() && !saveURL.isEmpty() )
     {
+        if (saveURL == url())
+  	         {
+  	             KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
+  	             return;
+  	         }
         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
         {
             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Nov 2005 14:15:40 -0000	1.30
+++ .cvsignore	4 Feb 2006 23:16:53 -0000	1.31
@@ -9,3 +9,4 @@
 kdegraphics-3.4.91.tar.bz2
 kdegraphics-3.4.92.tar.bz2
 kdegraphics-3.5.0.tar.bz2
+kdegraphics-3.5.1.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdegraphics.spec	16 Jan 2006 16:06:25 -0000	1.69
+++ kdegraphics.spec	4 Feb 2006 23:16:53 -0000	1.70
@@ -3,6 +3,9 @@
 %define debug 0
 %define final 0
 
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
 %define kpovmodeler 0
 %define kfract 0
 %define arts 1
@@ -12,8 +15,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 3
+Version: 3.5.1
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -26,10 +29,9 @@
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-Patch3: kdegraphics-3.5.0-xft.patch
 
-# security fixes
-Patch100: post-3.5.0-kdegraphics-CAN-2005-3193.diff
+# upstream patches
+Patch50; kdegraphics-3.5.1-kpdf.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -49,10 +51,9 @@
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 %description
 Graphics applications for the K Desktop Environment.
@@ -265,10 +266,9 @@
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-%patch3 -p1 -b .modular-x
 
-# security fixes
-%patch100 -p0 -b .CAN-2005-3193
+# u??stream patches
+%patch50 -p1 -b .kpdf
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -280,13 +280,6 @@
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -299,18 +292,27 @@
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif%
 %if %{final}
    --enable-final \
 %endif
    --includedir=/usr/include/kde \
    --with-xinerama \
 %ifnarch %{no_scanner_archs}
---with-kamera \
+   --with-kamera \
 %else
    --without-kamera
 %endif
@@ -365,6 +367,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Sat Feb 04 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 7:3.5.0-3
 - apply patch to fix CAN-2005-3193, #177908
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Nov 2005 14:15:40 -0000	1.31
+++ sources	4 Feb 2006 23:16:53 -0000	1.32
@@ -1 +1 @@
-389a00d4387e621d4dd325a59c7657c4  kdegraphics-3.5.0.tar.bz2
+2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2


--- kdegraphics-3.5.0-xft.patch DELETED ---


--- post-3.5.0-kdegraphics-CAN-2005-3193.diff DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb  4 23:17:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 18:17:38 -0500
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.70,1.71
Message-ID: <200602042317.k14NHcLN025229@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25151

Modified Files:
	kdegraphics.spec 
Log Message:
typo



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdegraphics.spec	4 Feb 2006 23:16:53 -0000	1.70
+++ kdegraphics.spec	4 Feb 2006 23:17:35 -0000	1.71
@@ -31,7 +31,7 @@
 Patch2: kdegraphics-3.3.1-xorg.patch
 
 # upstream patches
-Patch50; kdegraphics-3.5.1-kpdf.patch
+Patch50: kdegraphics-3.5.1-kpdf.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10



From fedora-cvs-commits at redhat.com  Sun Feb  5 04:10:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 23:10:18 -0500
Subject: rpms/gtksourceview/devel gtksourceview.spec,1.25,1.26
Message-ID: <200602050410.k154AIN6029606@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29542

Modified Files:
	gtksourceview.spec 
Log Message:
Update url



Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtksourceview.spec	31 Jan 2006 03:12:36 -0000	1.25
+++ gtksourceview.spec	5 Feb 2006 04:10:15 -0000	1.26
@@ -4,10 +4,10 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.5.7
-Release: 1
+Release: 2 
 License: LGPL
 Group: System Environment/Libraries
-URL: http://www.gnome.org/softwaremap/projects/gtksourceview/ 
+URL: http://gtksourceview.sourceforge.net/ 
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: gnome-vfs2-devel
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com>
+- Update URL
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 1.5.7
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 04:50:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 4 Feb 2006 23:50:15 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.236,1.237
Message-ID: <200602050450.k154oFXF021143@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21129

Modified Files:
	eclipse.spec 
Log Message:



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- eclipse.spec	4 Feb 2006 18:44:11 -0000	1.236
+++ eclipse.spec	5 Feb 2006 04:50:13 -0000	1.237
@@ -1258,7 +1258,7 @@
 * Sat Feb 4 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_3fc
 - Update efj patches to match what has been committed to HEAD.
 
-* Fri Feb 3 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_2fc
+* Fri Feb 3 2006 Igor Foox <ifoox at redhat.com> 3.1.2-1jpp_2fc
 - Updated launcher script.
 
 * Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc



From fedora-cvs-commits at redhat.com  Sun Feb  5 05:29:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 00:29:31 -0500
Subject: rpms/redhat-menus/devel redhat-menus.spec,1.55,1.56
Message-ID: <200602050529.k155TV6r017607@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17536

Modified Files:
	redhat-menus.spec 
Log Message:
Add missing requires



Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- redhat-menus.spec	2 Feb 2006 04:14:34 -0000	1.55
+++ redhat-menus.spec	5 Feb 2006 05:29:26 -0000	1.56
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 6.5.4
-Release: 2
+Release: 3
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -14,6 +14,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): /usr/bin/update-desktop-database
+Requires(postun): /usr/bin/update-desktop-database
 
 ## old nautilus contained start-here stuff
 Conflicts: nautilus <= 2.0.3-1
@@ -69,6 +71,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Sun Feb 5 2006 Matthias Clasen <mclasen at redhat.com> - 6.5.4-3
+- Add missing requires
+
 * Wed Feb 1 2006 Ray Strode <rstrode at redhat.com> - 6.5.4-2
 - fix applications menu
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 06:41:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 01:41:45 -0500
Subject: rpms/redhat-artwork/devel .cvsignore, 1.66, 1.67 redhat-artwork.spec,
	1.117, 1.118 sources, 1.67, 1.68
Message-ID: <200602050641.k156fjGS027795@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27780

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
0.236



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- .cvsignore	24 Jan 2006 20:35:12 -0000	1.66
+++ .cvsignore	5 Feb 2006 06:41:43 -0000	1.67
@@ -3,3 +3,4 @@
 RHEL-gdm-theme-0.2.tar.gz
 throbbers.tar.bz2
 redhat-artwork-0.235.tar.gz
+redhat-artwork-0.236.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- redhat-artwork.spec	1 Feb 2006 20:01:15 -0000	1.117
+++ redhat-artwork.spec	5 Feb 2006 06:41:43 -0000	1.118
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.235
-Release: 2
+Version: 0.236
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -154,6 +154,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 0.236-1
+- Fix Bluecurve-inverse wait cursor
+
 * Mon Jan 30 2006 Ray Strode <rstrode at redhat.com> 0.235-2
 - create symlinks from redhat artwork to gnome overrides
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	24 Jan 2006 20:35:12 -0000	1.67
+++ sources	5 Feb 2006 06:41:43 -0000	1.68
@@ -1,4 +1,4 @@
-71749b169ac5e8ec2c06a38b65804fd3  redhat-artwork-0.235.tar.gz
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
+a62302ace5f3f870fd9e3d95da195364  redhat-artwork-0.236.tar.gz



From fedora-cvs-commits at redhat.com  Sun Feb  5 07:03:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 02:03:52 -0500
Subject: rpms/redhat-artwork/devel .cvsignore, 1.67, 1.68 redhat-artwork.spec,
	1.118, 1.119 sources, 1.68, 1.69
Message-ID: <200602050703.k1573qck018886@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18841

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
Fix stuff



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- .cvsignore	5 Feb 2006 06:41:43 -0000	1.67
+++ .cvsignore	5 Feb 2006 07:03:41 -0000	1.68
@@ -4,3 +4,4 @@
 throbbers.tar.bz2
 redhat-artwork-0.235.tar.gz
 redhat-artwork-0.236.tar.gz
+redhat-artwork-0.237.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- redhat-artwork.spec	5 Feb 2006 06:41:43 -0000	1.118
+++ redhat-artwork.spec	5 Feb 2006 07:03:41 -0000	1.119
@@ -3,7 +3,7 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.236
+Version: 0.237
 Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -154,7 +154,7 @@
 %config /root/.gtkrc
 
 %changelog
-* Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 0.236-1
+* Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 0.237-1
 - Fix Bluecurve-inverse wait cursor
 
 * Mon Jan 30 2006 Ray Strode <rstrode at redhat.com> 0.235-2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- sources	5 Feb 2006 06:41:43 -0000	1.68
+++ sources	5 Feb 2006 07:03:41 -0000	1.69
@@ -1,4 +1,4 @@
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-a62302ace5f3f870fd9e3d95da195364  redhat-artwork-0.236.tar.gz
+bed7216a1b18c2138b0505205f5d795f  redhat-artwork-0.237.tar.gz



From fedora-cvs-commits at redhat.com  Sun Feb  5 07:19:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 02:19:46 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.82,1.83
Message-ID: <200602050719.k157JkYw005208@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5139

Modified Files:
	epiphany.spec 
Log Message:
Tighten requires



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- epiphany.spec	31 Jan 2006 05:17:39 -0000	1.82
+++ epiphany.spec	5 Feb 2006 07:19:44 -0000	1.83
@@ -2,7 +2,8 @@
 %define desktop_file_utils_version 0.9
 %define epiphany_mainver 1.9
 %define mozilla_devel_ver 1.7
-%define gtk2_devel_ver 2.4
+%define glib2_devel_ver 2.8.0
+%define gtk2_devel_ver 2.8.3
 %define libbonoboui_devel_ver 2.1.1
 %define scrollkeeper_ver 0.1.4
 %define gnome_doc_utils_ver 0.3.2
@@ -10,7 +11,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 1.9.6
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -22,17 +23,19 @@
 Requires: mozilla = %mozver
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
-BuildRequires: glib2-devel >= 2.7.0
+BuildRequires: glib2-devel >= %{glib2_devel_ver}
+BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
 BuildRequires: mozilla-devel >= %{mozilla_devel_ver}
 BuildRequires: mozilla
-BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
-BuildRequires: libbonoboui-devel >= %{libbonoboui_devel_ver}
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
-BuildRequires: libxml2-devel, libgnomeui-devel, libglade2-devel
-BuildRequires: gnome-vfs2-devel, GConf2-devel, ORBit2-devel
-BuildRequires: eel2-devel
+BuildRequires: libxml2-devel, libxslt-devel
+BuildRequires: libgnomeui-devel, libglade2-devel
+BuildRequires: libgnomeprint22-devel, libgnomeprintui22-devel
+BuildRequires: gnome-vfs2-devel, GConf2-devel
 BuildRequires: iso-codes-devel
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
+BuildRequires: gnome-desktop-devel
+BuildRequires: startup-notification-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
@@ -46,14 +49,17 @@
 Group: Development/Libraries
 Requires: epiphany = %{version}
 Requires: mozilla-devel >= %{mozilla_devel_ver}
+Requires: glib2-devel >= %{glib2_devel_ver}
 Requires: gtk2-devel >= %{gtk2_devel_ver}
-Requires: libbonoboui-devel >= %{libbonoboui_devel_ver}
 Requires: scrollkeeper >= %{scrollkeeper_ver}
-Requires: libxml2-devel, libgnomeui-devel, libglade2-devel
-Requires: gnome-vfs2-devel, GConf2-devel, ORBit2-devel
-Requires: eel2-devel
+Requires: libxml2-devel, libxslt-devel
+Requires: libgnomeui-devel, libglade2-devel
+Requires: libgnomeprint22-devel, libgnomeprintui22-devel
+Requires: gnome-vfs2-devel, GConf2-devel
 Requires: iso-codes-devel
 Requires: gnome-doc-utils >= %{gnome_doc_utils_ver}
+Requires: gnome-desktop-devel
+Requires: startup-notification-devel
 
 %description devel
 epiphany is a web browser based on the Mozilla rendering engine.
@@ -124,6 +130,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Son Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-2
+- Update requires
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-1
 - Update to 1.9.6
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 07:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 02:20:43 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.83,1.84
Message-ID: <200602050720.k157Kheh005655@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5601

Modified Files:
	epiphany.spec 
Log Message:
Fix changelog



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- epiphany.spec	5 Feb 2006 07:19:44 -0000	1.83
+++ epiphany.spec	5 Feb 2006 07:20:39 -0000	1.84
@@ -130,7 +130,7 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
-* Son Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-2
+* Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-2
 - Update requires
 
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-1



From fedora-cvs-commits at redhat.com  Sun Feb  5 07:27:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 02:27:05 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.46,1.47
Message-ID: <200602050727.k157R5Z5008683@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8589

Modified Files:
	libgnome.spec 
Log Message:
Fix requires



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libgnome.spec	19 Jan 2006 14:10:39 -0000	1.46
+++ libgnome.spec	5 Feb 2006 07:27:01 -0000	1.47
@@ -1,5 +1,5 @@
 %define glib2_version 2.6.0
-%define libbonobo_version 2.2.0
+%define libbonobo_version 2.13.0
 %define libxml2_version 2.5
 %define libxslt_version 1.0.19
 %define gconf2_version 2.2.0
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.13.7
-Release: 3
+Release: 4
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -157,6 +157,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-4
+- Update requires
+
 * Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> - 2.13.7-3
 - s/sed -ie/sed -i -e/
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 07:40:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 02:40:58 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1909,1.1910
Message-ID: <200602050740.k157ewx4013154@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix sed failure if /etc/sysconfig/kernel doesn't exist. (#180025)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1909
retrieving revision 1.1910
diff -u -r1.1909 -r1.1910
--- kernel-2.6.spec	4 Feb 2006 17:45:27 -0000	1.1909
+++ kernel-2.6.spec	5 Feb 2006 07:40:56 -0000	1.1910
@@ -1208,7 +1208,9 @@
 
 %post 
 if [ `uname -i` == "x86_64" ]; then
-  /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel
+  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}
@@ -1397,6 +1399,9 @@
 %endif
 
 %changelog
+* Sun Feb  5 2006 Dave Jones <davej at redhat.com>
+- Fix sed failure if /etc/sysconfig/kernel doesn't exist. (#180025)
+
 * Sat Feb  4 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git1
 - Fix deadlock in do_path_lookup()



From fedora-cvs-commits at redhat.com  Sun Feb  5 09:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 04:15:56 -0500
Subject: rpms/mozilla/devel
	mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch, NONE,
	1.1 mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch, NONE,
	1.1 mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch,
	NONE, 1.1 mozilla.spec, 1.82, 1.83
Message-ID: <200602050915.k159FulR010075@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10043

Modified Files:
	mozilla.spec 
Added Files:
	mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch 
	mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch 
	mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch 
Log Message:
* Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-4
- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296


mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch:
 nsGlobalHistory.cpp |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch ---
Index: xpfe/components/history/src/nsGlobalHistory.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v
retrieving revision 1.195.6.3
diff -u -d -p -r1.195.6.3 nsGlobalHistory.cpp
--- xpfe/components/history/src/nsGlobalHistory.cpp	26 Aug 2004 02:03:23 -0000	1.195.6.3
+++ xpfe/components/history/src/nsGlobalHistory.cpp	29 Jan 2006 23:12:59 -0000
@@ -111,6 +111,11 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
 
 #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
 
+// see bug #319004 -- clamp title and URL to generously-large but not too large
+// length
+#define HISTORY_URI_LENGTH_MAX 65536
+#define HISTORY_TITLE_LENGTH_MAX 4096
+
 // sync history every 10 seconds
 #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
 //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
@@ -635,6 +640,9 @@ nsGlobalHistory::AddURI(nsIURI *aURI, PR
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   PRInt64 now = GetNow();
 
   // For notifying observers, later...
@@ -1049,7 +1057,7 @@ nsGlobalHistory::SetPageTitle(nsIURI *aU
   nsresult rv;
   NS_ENSURE_ARG_POINTER(aURI);
 
-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
+  nsAutoString titleString(StringHead(aTitle, HISTORY_TITLE_LENGTH_MAX));
 
   // skip about: URIs to avoid reading in the db (about:blank, especially)
   PRBool isAbout;
@@ -1341,6 +1349,9 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
   rv = aURI->GetSpec(URISpec);
   NS_ENSURE_SUCCESS(rv, rv);
   
+  if (URISpec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
 
   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
@@ -1374,6 +1385,9 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI 
   nsresult rv = aURI->GetSpec(spec);
   if (NS_FAILED(rv)) return rv;
 
+  if (spec.Length() > HISTORY_URI_LENGTH_MAX)
+     return NS_OK;
+
   nsCOMPtr<nsIMdbRow> row;
   rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
   if (NS_FAILED(rv)) {

mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch:
 jsemit.c   |   13 +++++++++++++
 jsinterp.c |   42 ++++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 10 deletions(-)

--- NEW FILE mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch ---
Index: js/src/jsinterp.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsinterp.c,v
retrieving revision 3.136.2.1.2.5.2.7
diff -u -d -p -U8 -r3.136.2.1.2.5.2.7 jsinterp.c
--- js/src/jsinterp.c	22 Apr 2005 00:25:15 -0000	3.136.2.1.2.5.2.7
+++ js/src/jsinterp.c	29 Jan 2006 22:31:53 -0000
@@ -2237,16 +2237,17 @@ js_Interpret(JSContext *cx, jsval *resul
                 cond = JSVAL_TO_INT(lval) OP JSVAL_TO_INT(rval);              \
             } else {                                                          \
                 d  = ltmp ? JSVAL_TO_INT(lval) : *rt->jsNaN;                  \
                 d2 = rtmp ? JSVAL_TO_INT(rval) : *rt->jsNaN;                  \
                 cond = COMPARE_DOUBLES(d, OP, d2, JS_FALSE);                  \
             }                                                                 \
         } else {                                                              \
             VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_NUMBER, &lval);               \
+            sp[-2] = lval;                                                    \
             VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_NUMBER, &rval);               \
             if (JSVAL_IS_STRING(lval) && JSVAL_IS_STRING(rval)) {             \
                 str  = JSVAL_TO_STRING(lval);                                 \
                 str2 = JSVAL_TO_STRING(rval);                                 \
                 cond = js_CompareStrings(str, str2) OP 0;                     \
             } else {                                                          \
                 VALUE_TO_NUMBER(cx, lval, d);                                 \
                 VALUE_TO_NUMBER(cx, rval, d2);                                \
@@ -2278,20 +2279,22 @@ js_Interpret(JSContext *cx, jsval *resul
             }                                                                 \
         } else {                                                              \
             if (JSVAL_IS_NULL(lval) || JSVAL_IS_VOID(lval)) {                 \
                 cond = (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) OP 1;     \
             } else if (JSVAL_IS_NULL(rval) || JSVAL_IS_VOID(rval)) {          \
                 cond = 1 OP 0;                                                \
             } else {                                                          \
                 if (ltmp == JSVAL_OBJECT) {                                   \
-                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &lval);         \
+                    VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);       \
+                    lval = sp[-2];                                            \
                     ltmp = JSVAL_TAG(lval);                                   \
                 } else if (rtmp == JSVAL_OBJECT) {                            \
-                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rval);         \
+                    VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);       \
+                    rval = sp[-1];                                            \
                     rtmp = JSVAL_TAG(rval);                                   \
                 }                                                             \
                 if (ltmp == JSVAL_STRING && rtmp == JSVAL_STRING) {           \
                     str  = JSVAL_TO_STRING(lval);                             \
                     str2 = JSVAL_TO_STRING(rval);                             \
                     cond = js_CompareStrings(str, str2) OP 0;                 \
                 } else {                                                      \
                     VALUE_TO_NUMBER(cx, lval, d);                             \
@@ -2424,26 +2427,28 @@ js_Interpret(JSContext *cx, jsval *resul
 
 #undef INTEGER_OP
 #undef BITWISE_OP
 #undef SIGNED_SHIFT_OP
 
           case JSOP_ADD:
             rval = FETCH_OPND(-1);
             lval = FETCH_OPND(-2);
-            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &ltmp);
-            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &rtmp);
-            if ((cond = JSVAL_IS_STRING(ltmp)) || JSVAL_IS_STRING(rtmp)) {
+            VALUE_TO_PRIMITIVE(cx, lval, JSTYPE_VOID, &sp[-2]);
+            lval = sp[-2];
+            VALUE_TO_PRIMITIVE(cx, rval, JSTYPE_VOID, &sp[-1]);
+            rval = sp[-1];
+            if ((cond = JSVAL_IS_STRING(lval)) || JSVAL_IS_STRING(rval)) {
                 SAVE_SP(fp);
                 if (cond) {
-                    str = JSVAL_TO_STRING(ltmp);
-                    ok = (str2 = js_ValueToString(cx, rtmp)) != NULL;
+                    str = JSVAL_TO_STRING(lval);
+                    ok = (str2 = js_ValueToString(cx, rval)) != NULL;
                 } else {
-                    str2 = JSVAL_TO_STRING(rtmp);
-                    ok = (str = js_ValueToString(cx, ltmp)) != NULL;
+                    str2 = JSVAL_TO_STRING(rval);
+                    ok = (str = js_ValueToString(cx, lval)) != NULL;
                 }
                 if (!ok)
                     goto out;
                 str = js_ConcatStrings(cx, str, str2);
                 if (!str) {
                     ok = JS_FALSE;
                     goto out;
                 }
@@ -2736,39 +2741,56 @@ js_Interpret(JSContext *cx, jsval *resul
                     (cs->format & JOF_INC) ? (rval += 2) : (rval -= 2);
                     rtmp = rval;
                 }
             } else {
 
 /*
  * Initially, rval contains the value to increment or decrement, which is not
  * yet converted.  As above, the expression result goes in rtmp, the updated
- * value goes in rval.
+ * value goes in rval.  Our caller must set vp to point at a GC-rooted jsval
+ * in which we home rtmp, to protect it from GC in case the unconverted rval
+ * is not a number.
  */
 #define NONINT_INCREMENT_OP()                                                 \
     JS_BEGIN_MACRO                                                            \
         VALUE_TO_NUMBER(cx, rval, d);                                         \
         if (cs->format & JOF_POST) {                                          \
             rtmp = rval;                                                      \
             if (!JSVAL_IS_NUMBER(rtmp)) {                                     \
                 ok = js_NewNumberValue(cx, d, &rtmp);                         \
                 if (!ok)                                                      \
                     goto out;                                                 \
+                *vp = rtmp;                                                   \
             }                                                                 \
             (cs->format & JOF_INC) ? d++ : d--;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
         } else {                                                              \
             (cs->format & JOF_INC) ? ++d : --d;                               \
             ok = js_NewNumberValue(cx, d, &rval);                             \
             rtmp = rval;                                                      \
         }                                                                     \
         if (!ok)                                                              \
             goto out;                                                         \
     JS_END_MACRO
 
+                if (cs->format & JOF_POST) {
+                    /*
+                     * We must push early to protect the postfix increment
+                     * or decrement result, if converted to a jsdouble from
+                     * a non-number value, from GC nesting in the setter.
+                     */
+                    vp = sp++;
+                    SAVE_SP(fp);
+                    --i;
+                }
+#ifdef __GNUC__
+                else vp = NULL; /* suppress bogus gcc warnings */
+#endif
+
                 NONINT_INCREMENT_OP();
             }
 
             fp->flags |= JSFRAME_ASSIGNING;
             CACHED_SET(OBJ_SET_PROPERTY(cx, obj, id, &rval));
             fp->flags &= ~JSFRAME_ASSIGNING;
             if (!ok)
                 goto out;
Index: js/src/jsemit.c
===================================================================
RCS file: /cvsroot/mozilla/js/src/jsemit.c,v
retrieving revision 3.96.6.4.2.1
diff -u -d -p -U8 -r3.96.6.4.2.1 jsemit.c
--- js/src/jsemit.c	9 Jul 2005 01:48:08 -0000	3.96.6.4.2.1
+++ js/src/jsemit.c	29 Jan 2006 22:31:53 -0000
@@ -3935,16 +3935,29 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
             }
             if (js_Emit1(cx, cg, op) < 0)
                 return JS_FALSE;
             break;
 #endif
           default:
             JS_ASSERT(0);
         }
+
+        /*
+         * Allocate another stack slot for GC protection in case the initial
+         * value being post-incremented or -decremented is not a number, but
+         * converts to a jsdouble.  In the TOK_NAME cases, op has 0 operand
+         * uses and 1 definition, so we don't need an extra stack slot -- we
+         * can use the one allocated for the def.
+         */
+        if (pn2->pn_type != TOK_NAME &&
+            (js_CodeSpec[op].format & JOF_POST) &&
+            (uintN)cg->stackDepth == cg->maxStackDepth) {
+            ++cg->maxStackDepth;
+        }
         break;
 
       case TOK_DELETE:
         /*
          * Under ECMA 3, deleting a non-reference returns true -- but alas we
          * must evaluate the operand if it appears it might have side effects.
          */
         pn2 = pn->pn_kid;

mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch:
 nsXULDocument.cpp |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch ---
Index: content/xul/document/src/nsXULDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/xul/document/src/nsXULDocument.cpp,v
retrieving revision 1.611.2.1.14.2
diff -u -d -p -U8 -r1.611.2.1.14.2 nsXULDocument.cpp
--- content/xul/document/src/nsXULDocument.cpp	22 Jun 2005 01:52:31 -0000	1.611.2.1.14.2
+++ content/xul/document/src/nsXULDocument.cpp	29 Jan 2006 20:52:50 -0000
@@ -112,16 +112,17 @@
 #include "nsIObjectOutputStream.h"
 #include "nsIFocusController.h"
 #include "nsContentList.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsIScriptGlobalObjectOwner.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentUtils.h"
 #include "nsIParser.h"
+#include "nsIParserService.h"
 #include "nsICSSStyleSheet.h"
 
 //----------------------------------------------------------------------
 //
 // CIDs
 //
 
 static NS_DEFINE_CID(kHTMLElementFactoryCID,     NS_HTML_ELEMENT_FACTORY_CID);
@@ -1485,16 +1486,32 @@ nsXULDocument::Persist(const nsAString& 
     PRInt32 nameSpaceID;
 
     nsCOMPtr<nsINodeInfo> ni = element->GetExistingAttrNameFromQName(aAttr);
     if (ni) {
         tag = ni->NameAtom();
         nameSpaceID = ni->NamespaceID();
     }
     else {
+        // Make sure that this QName is going to be valid.
+        nsIParserService *parserService = nsContentUtils::GetParserServiceWeakRef();
+        NS_ASSERTION(parserService, "Running scripts during shutdown?");
+
+        const PRUnichar *colon;
+        rv = parserService->CheckQName(PromiseFlatString(aAttr), PR_TRUE, &colon);
+        if (NS_FAILED(rv)) {
+            // There was an invalid character or it was malformed.
+            return NS_ERROR_INVALID_ARG;
+        }
+
+        if (colon) {
+            // We don't really handle namespace qualifiers in attribute names.
+            return NS_ERROR_NOT_IMPLEMENTED;
+        }
+
         tag = do_GetAtom(aAttr);
         NS_ENSURE_TRUE(tag, NS_ERROR_OUT_OF_MEMORY);
 
         nameSpaceID = kNameSpaceID_None;
     }
 
     rv = Persist(element, nameSpaceID, tag);
     if (NS_FAILED(rv)) return rv;


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mozilla.spec	16 Dec 2005 02:11:51 -0000	1.82
+++ mozilla.spec	5 Feb 2006 09:15:53 -0000	1.83
@@ -11,7 +11,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.12
-Release:     3
+Release:     4
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -78,6 +78,9 @@
 Patch111:    mozilla-1.7.11-gtkembed-prompt-crash.patch
 Patch112:    mozilla-1.7.11-tooltip-borders.patch
 
+Patch120:    mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch
+Patch121:    mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch
+Patch122:    mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch
 
 Buildroot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Prefix:      /usr
@@ -210,6 +213,10 @@
 %patch111 -p0
 %patch112 -p0
 
+%patch120 -p0
+%patch121 -p0
+%patch122 -p0
+
 # set up our default bookmarks
 %{__cp} %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
 
@@ -734,6 +741,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-4
+- Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296
+
 * Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> 37:1.7.12-3
 - Use system NSS
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 13:37:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 08:37:03 -0500
Subject: rpms/bash/devel bash31-006, NONE, 1.1 bash31-007, NONE,
	1.1 bash.spec, 1.105, 1.106
Message-ID: <200602051337.k15Db3fp005628@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5559

Modified Files:
	bash.spec 
Added Files:
	bash31-006 bash31-007 
Log Message:
* Sun Feb  5 2006 Tim Waugh <twaugh at redhat.com> 3.1-6
- Patchlevel 7.



--- NEW FILE bash31-006 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-006

Bug-Reported-by: Mike Frysinger <vapier at gentoo.org>
Bug-Reference-ID: <200601120613.11907.vapier at gentoo.org>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html

Bug-Description:

Under some circumstances, Bash can use an incorrect setting for the flag
that indicates whether or not the terminal can auto-wrap, resulting in line-
wrapping errors.

Patch:

*** ../bash-3.1/lib/readline/terminal.c	Sat Nov 12 20:46:54 2005
--- lib/readline/terminal.c	Tue Jan 31 10:57:54 2006
***************
*** 123,127 ****
  
  /* Non-zero means the terminal can auto-wrap lines. */
! int _rl_term_autowrap;
  
  /* Non-zero means that this terminal has a meta key. */
--- 126,130 ----
  
  /* Non-zero means the terminal can auto-wrap lines. */
! int _rl_term_autowrap = -1;
  
  /* Non-zero means that this terminal has a meta key. */
***************
*** 275,278 ****
--- 278,284 ----
       int rows, cols;
  {
+   if (_rl_term_autowrap == -1)
+     _rl_init_terminal_io (rl_terminal_name);
+ 
    if (rows > 0)
      _rl_screenheight = rows;
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 5
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 6
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-007 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-007

Bug-Reported-by: Tim Waugh <twaugh at redhat.com>, Laird Breyer <laird at lbreyer.com>
Bug-Reference-ID: <20060105174434.GY16000 at redhat.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00009.html
		   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347695

Bug-Description:

When the number of saved jobs exceeds the initial size of the jobs array
(4096 slots), the array must be compacted and reallocated.  An error in
the code to do that could cause a segmentation fault.

Patch:

*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
--- jobs.c	Wed Feb  1 13:55:38 2006
***************
*** 845,851 ****
  {
    sigset_t set, oset;
!   int nsize, i, j;
    JOB **nlist;
  
    nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS);
    nsize *= JOB_SLOTS;
--- 888,895 ----
  {
    sigset_t set, oset;
!   int nsize, i, j, ncur, nprev;
    JOB **nlist;
  
+   ncur = nprev = NO_JOB;
    nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS);
    nsize *= JOB_SLOTS;
***************
*** 855,869 ****
  
    BLOCK_CHILD (set, oset);
!   nlist = (JOB **) xmalloc (nsize * sizeof (JOB *));
    for (i = j = 0; i < js.j_jobslots; i++)
      if (jobs[i])
!       nlist[j++] = jobs[i];
  
    js.j_firstj = 0;
!   js.j_lastj = (j > 0) ? j - 1: 0;
    js.j_jobslots = nsize;
  
!   free (jobs);
!   jobs = nlist;
  
    UNBLOCK_CHILD (oset);
--- 899,947 ----
  
    BLOCK_CHILD (set, oset);
!   nlist = (js.j_jobslots == nsize) ? jobs : (JOB **) xmalloc (nsize * sizeof (JOB *));
! 
    for (i = j = 0; i < js.j_jobslots; i++)
      if (jobs[i])
!       {
! 	if (i == js.j_current)
! 	  ncur = j;
! 	if (i == js.j_previous)
! 	  nprev = j;
! 	nlist[j++] = jobs[i];
!       }
! 
! #if defined (DEBUG)
!   itrace ("realloc_jobs_list: resize jobs list from %d to %d", js.j_jobslots, nsize);
!   itrace ("realloc_jobs_list: j_lastj changed from %d to %d", js.j_lastj, (j > 0) ? j - 1 : 0);
!   itrace ("realloc_jobs_list: j_njobs changed from %d to %d", js.j_njobs, (j > 0) ? j - 1 : 0);
! #endif
  
    js.j_firstj = 0;
!   js.j_lastj = (j > 0) ? j - 1 : 0;
!   js.j_njobs = j;
    js.j_jobslots = nsize;
  
!   /* Zero out remaining slots in new jobs list */
!   for ( ; j < nsize; j++)
!     nlist[j] = (JOB *)NULL;
! 
!   if (jobs != nlist)
!     {
!       free (jobs);
!       jobs = nlist;
!     }
! 
!   if (ncur != NO_JOB)
!     js.j_current = ncur;
!   if (nprev != NO_JOB)
!     js.j_previous = nprev;
! 
!   /* Need to reset these */
!   if (js.j_current == NO_JOB || js.j_previous == NO_JOB || js.j_current > js.j_lastj || js.j_previous > js.j_lastj)
!     reset_current ();
! 
! #ifdef DEBUG
!   itrace ("realloc_jobs_list: reset js.j_current (%d) and js.j_previous (%d)", js.j_current, js.j_previous);
! #endif
  
    UNBLOCK_CHILD (oset);
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 6
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 7
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- bash.spec	18 Jan 2006 15:23:09 -0000	1.105
+++ bash.spec	5 Feb 2006 13:37:00 -0000	1.106
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 5
+Release: 6
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -16,6 +16,8 @@
 Patch3: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-003
 Patch4: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-004
 Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-005
+Patch6: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-006
+Patch7: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-007
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -59,6 +61,8 @@
 %patch3 -p0 -b .003
 %patch4 -p0 -b .004
 %patch5 -p0 -b .005
+%patch6 -p0 -b .006
+%patch7 -p0 -b .007
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -210,6 +214,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Sun Feb  5 2006 Tim Waugh <twaugh at redhat.com> 3.1-6
+- Patchlevel 7.
+
 * Wed Jan 18 2006 Tim Waugh <twaugh at redhat.com>
 - Removed inaccuracies from %%description (bug #178189).
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 16:12:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 11:12:49 -0500
Subject: rpms/mozilla/devel mozilla-1.7.12-dumpstack.patch, NONE,
	1.1 mozilla.spec, 1.83, 1.84
Message-ID: <200602051612.k15GCnTB018060@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18021

Modified Files:
	mozilla.spec 
Added Files:
	mozilla-1.7.12-dumpstack.patch 
Log Message:
* Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-4
- Add dumpstack.patch


mozilla-1.7.12-dumpstack.patch:
 nsStackFrameUnix.cpp |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE mozilla-1.7.12-dumpstack.patch ---
Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
retrieving revision 1.12
diff -d -u -p -r1.12 nsStackFrameUnix.cpp
--- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   jmp_buf jb;
   setjmp(jb);
 
@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mozilla.spec	5 Feb 2006 09:15:53 -0000	1.83
+++ mozilla.spec	5 Feb 2006 16:12:46 -0000	1.84
@@ -38,7 +38,7 @@
 Patch6:      mozilla-1.7.12-with-system-nss.patch
 Patch7:      firefox-1.0-system-nspr-ldap.patch
 Patch8:      mozilla-1.7.8-nspr-pkgconfig.patch
-
+Patch9:      mozilla-1.7.12-dumpstack.patch
 
 # customization patches
 Patch20:     mozilla-redhat-home-page.patch
@@ -171,6 +171,7 @@
 %patch6 -p1
 %patch7 -p0
 %patch8 -p0
+%patch9 -p0
 
 # customization patches
 %patch20 -p1



From fedora-cvs-commits at redhat.com  Sun Feb  5 16:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 11:13:37 -0500
Subject: rpms/mozilla/devel mozilla.spec,1.84,1.85
Message-ID: <200602051613.k15GDb51018449@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18416

Modified Files:
	mozilla.spec 
Log Message:
p1


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mozilla.spec	5 Feb 2006 16:12:46 -0000	1.84
+++ mozilla.spec	5 Feb 2006 16:13:35 -0000	1.85
@@ -171,7 +171,7 @@
 %patch6 -p1
 %patch7 -p0
 %patch8 -p0
-%patch9 -p0
+%patch9 -p1
 
 # customization patches
 %patch20 -p1



From fedora-cvs-commits at redhat.com  Sun Feb  5 17:05:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 12:05:28 -0500
Subject: rpms/xorg-x11-drv-ati/devel radeon.xinf, 1.1,
	1.2 xorg-x11-drv-ati.spec, 1.9, 1.10
Message-ID: <200602051705.k15H5S6x018911@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18876

Modified Files:
	radeon.xinf xorg-x11-drv-ati.spec 
Log Message:
* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-3
- Updated radeon.xinf to be up to date with the xf86PciInfo.h from the Xorg
  X server 1.0.1-1 source.  This should account for all supported Radeon
  models now modulo errors/omissions.



Index: radeon.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/radeon.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon.xinf	3 Feb 2006 13:33:56 -0000	1.1
+++ radeon.xinf	5 Feb 2006 17:05:09 -0000	1.2
@@ -1,7 +1,15 @@
 alias pcivideo:v00001002d00003150sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003151sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003152sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003153sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00003154sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003156sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00003E50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E51sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E52sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E53sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00003E54sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00003E56sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004136sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004137sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004144sv*sd*bc*sc*i* radeon
@@ -38,6 +46,10 @@
 alias pcivideo:v00001002d00004A4Dsv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004A4Esv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004A50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004B49sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004B4Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004B4Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004B4Csv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004C57sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004C58sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004C59sv*sd*bc*sc*i* radeon
@@ -46,6 +58,7 @@
 alias pcivideo:v00001002d00004C65sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004C66sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004C67sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00004C6Esv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004E44sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004E45sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00004E46sv*sd*bc*sc*i* radeon
@@ -89,27 +102,72 @@
 alias pcivideo:v00001002d0000516Bsv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d0000516Csv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005460sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005461sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005462sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005463sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005464sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005465sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005466sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005467sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005548sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005549sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d0000554Asv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d0000554Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Dsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Esv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000554Fsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005550sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005551sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005552sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005554sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000564Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d0000564Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005652sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005653sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005834sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005835sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005836sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005837sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005954sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005955sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005960sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005961sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005962sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005964sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005965sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005969sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005974sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005975sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005A41sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005A41sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005A61sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005A62sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005B60sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B61sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005B62sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B63sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005B64sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005B65sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B66sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005B67sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005C61sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005C63sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D48sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D49sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D4Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D4Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D4Dsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D4Esv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D4Fsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D50sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005D52sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00005D57sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E48sv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E4Asv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E4Bsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E4Csv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E4Dsv*sd*bc*sc*i* radeon
+alias pcivideo:v00001002d00005E4Fsv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00007834sv*sd*bc*sc*i* radeon
 alias pcivideo:v00001002d00007835sv*sd*bc*sc*i* radeon


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-ati.spec	3 Feb 2006 13:33:56 -0000	1.9
+++ xorg-x11-drv-ati.spec	5 Feb 2006 17:05:18 -0000	1.10
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   2
+Release:   3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
@@ -82,6 +82,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-3
+- Updated radeon.xinf to be up to date with the xf86PciInfo.h from the Xorg
+  X server 1.0.1-1 source.  This should account for all supported Radeon
+  models now modulo errors/omissions.
+
 * Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-2
 - Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).
 - Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)



From fedora-cvs-commits at redhat.com  Sun Feb  5 19:06:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 14:06:26 -0500
Subject: rpms/file/devel file-4.16-xen.patch,NONE,1.1 file.spec,1.43,1.44
Message-ID: <200602051906.k15J6QjB005759@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5706

Modified Files:
	file.spec 
Added Files:
	file-4.16-xen.patch 
Log Message:
 - xen patch, recognizes Xen saved domain

file-4.16-xen.patch:
 Localstuff |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE file-4.16-xen.patch ---
--- file-4.16/magic/Localstuff.xen	2003-03-23 05:17:27.000000000 +0100
+++ file-4.16/magic/Localstuff	2006-02-02 14:17:25.000000000 +0100
@@ -5,3 +5,9 @@
 # $Id: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
+
+# File magic for Xen, the virtual machine monitor for x86
+0	string		LinuxGuestRecord	Xen saved domain
+#>2	regex		\(name\ [^)]*\)		%s
+>20	search/256	(name			(name
+>>&1	string		x			%s...)


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- file.spec	13 Jan 2006 08:42:03 -0000	1.43
+++ file.spec	5 Feb 2006 19:06:23 -0000	1.44
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.16
-Release: 5
+Release: 6
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Patch9: file-4.16-readelf.patch
 Patch10: file-4.16-dont_use_isprint.patch
 Patch11: file-4.16-fix-array-64bit.patch
+Patch12: file-4.16-xen.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 
@@ -40,6 +41,7 @@
 %patch9 -p1 -b .corefile
 %patch10 -p1 -b .isprint
 %patch11 -p0 -b .64bit
+%patch12 -p1 -b .xen
 
 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
 mv doc/libmagic.man_ doc/libmagic.man
@@ -85,6 +87,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Sun Feb 04 2006 Radek Vok??l <rvokal at redhat.com> 4.16-6
+- xen patch, recognizes Xen saved domain
+
 * Fri Jan 13 2006 Radek Vokal <rvokal at redhat.com> 4.16-5
 - fix for 64bit arrays
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 19:29:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 14:29:58 -0500
Subject: rpms/kdenetwork/devel .cvsignore, 1.35, 1.36 kdenetwork.spec, 1.68,
	1.69 sources, 1.39, 1.40 kdenetwork-3.4.92-gcc4.patch, 1.1, NONE
Message-ID: <200602051929.k15JTwpm028801@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-3.4.92-gcc4.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	30 Nov 2005 15:39:03 -0000	1.35
+++ .cvsignore	5 Feb 2006 19:29:54 -0000	1.36
@@ -8,3 +8,4 @@
 kdenetwork-3.4.91.tar.bz2
 kdenetwork-3.4.92.tar.bz2
 kdenetwork-3.5.0.tar.bz2
+kdenetwork-3.5.1.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kdenetwork.spec	9 Dec 2005 22:41:10 -0000	1.68
+++ kdenetwork.spec	5 Feb 2006 19:29:54 -0000	1.69
@@ -5,13 +5,16 @@
 %define make_cvs 1
 %define xmms 0
 
-%define qt_version 1:3.3.5
+%define qt_version 3.3.5
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+%define qt_epoch 1
 
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdenetwork
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -30,11 +33,12 @@
 Patch2: kde-libtool.patch
 Patch3: kdenetwork-3.3.92-kppp.patch
 Patch4: kdenetwork-3.2.3-resolv.patch
-Patch8: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
+Patch5: kdenetwork-3.4.1-kopete-libgadu-va_copy.patch
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-Prereq: /sbin/chkconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): /sbin/chkconfig
 
 BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: kdebase-devel
@@ -49,7 +53,6 @@
 %else
 Obsoletes: kdenetwork-nowlistening
 %endif
-Requires(post,postun): /sbin/ldconfig
 
 %description
 Networking applications for the K Desktop Environment.
@@ -81,7 +84,7 @@
 %patch2 -p1 -b .libtool
 %patch3 -p1 -b .kppp
 %patch4 -p1 -b .ppp
-%patch8 -p1 -b .libgadu-va_copy
+%patch5 -p1 -b .libgadu-va_copy
 
 find -name CVS | xargs rm -rf 
 
@@ -89,13 +92,6 @@
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -103,17 +99,26 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
-FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DNDEBUG -DNO_DEBUG"
+FLAGS="$RPM_OPT_FLAGS"
 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
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -232,6 +237,9 @@
 %endif
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	30 Nov 2005 15:39:03 -0000	1.39
+++ sources	5 Feb 2006 19:29:54 -0000	1.40
@@ -1 +1 @@
-c83dce8cc496b6ec8773483df1c85119  kdenetwork-3.5.0.tar.bz2
+02ced8c14c80f28635056488949d56d7  kdenetwork-3.5.1.tar.bz2


--- kdenetwork-3.4.92-gcc4.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb  5 19:52:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 14:52:41 -0500
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.36,1.37
Message-ID: <200602051952.k15Jqfe9016959@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16924

Modified Files:
	sound-juicer.spec 
Log Message:
* Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-3
- Fix broken Requires



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sound-juicer.spec	4 Feb 2006 11:58:10 -0000	1.36
+++ sound-juicer.spec	5 Feb 2006 19:52:39 -0000	1.37
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.13.4
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -25,7 +25,6 @@
 Requires:	gtk2 >= %{gtk_version}
 Requires:	gstreamer >= %{gstreamer_version}
 Requires:	GConf2 >= %{gconf_version}
-Requires:	gstreamer-plugins
 Requires:	cdparanoia
 Requires:	nautilus-cd-burner >= %{nautilus_cd_burner_version}
 Requires:	gnome-media >= %{gnome_media_version}
@@ -93,6 +92,9 @@
 %{_datadir}/omf/sound-juicer
 
 %changelog
+* Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-3
+- Fix broken Requires
+
 * Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-2
 - Update to use gstreamer (0.10)
 



From fedora-cvs-commits at redhat.com  Sun Feb  5 20:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 15:45:20 -0500
Subject: rpms/kdeutils/devel .cvsignore, 1.31, 1.32 kdeutils.spec, 1.51,
	1.52 sources, 1.31, 1.32 kdeutils-3.5.0-kcalc.patch, 1.1, NONE
Message-ID: <200602052045.k15KjKGe001267@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	.cvsignore kdeutils.spec sources 
Removed Files:
	kdeutils-3.5.0-kcalc.patch 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	30 Nov 2005 14:47:12 -0000	1.31
+++ .cvsignore	5 Feb 2006 20:45:17 -0000	1.32
@@ -8,3 +8,4 @@
 kdeutils-3.4.91.tar.bz2
 kdeutils-3.4.92.tar.bz2
 kdeutils-3.5.0.tar.bz2
+kdeutils-3.5.1.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kdeutils.spec	16 Jan 2006 18:58:06 -0000	1.51
+++ kdeutils.spec	5 Feb 2006 20:45:17 -0000	1.52
@@ -1,15 +1,17 @@
 %define debug 0
 %define final 0
 %define make_cvs 1
-
+%define arts 1
 %define redhatify 1
 
 %define qt_version 3.3.5
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 4
+Version: 3.5.1
+Release: 1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -23,13 +25,9 @@
 Patch1: kdf-3.0.2-label.patch
 Patch2: kde-libtool.patch
 
-# upstream fixes
-Patch50: kdeutils-3.5.0-kcalc.patch
-
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 BuildRequires: kdebase-devel
 BuildRequires: automake
@@ -243,32 +241,36 @@
 %setup -q
 %patch1 -p1 -b .label
 %patch2 -p1 -b .libtool
-%patch50 -p1 -b .kcalc
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 export KDEDIR=%{prefix}
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -fno-use-cxa-atexit -fno-check-new"
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG"
-
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
- # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
    --with-qt-libraries=$QTDIR/lib \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
+%if %{arts} == 0
+   --without-arts \
+%endif
    --includedir=%{_includedir}/kde
 
 make %{?_smp_mflags}
@@ -324,6 +326,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+- 3.5.1
+
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 6:3.5.0-4
 - apply patch to fix #176463
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	30 Nov 2005 14:47:12 -0000	1.31
+++ sources	5 Feb 2006 20:45:17 -0000	1.32
@@ -1 +1 @@
-d6b2cbe8b7d15166eff261f20ece2718  kdeutils-3.5.0.tar.bz2
+1286c6a09b04452adfe492de2fad79bd  kdeutils-3.5.1.tar.bz2


--- kdeutils-3.5.0-kcalc.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb  5 21:13:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 16:13:10 -0500
Subject: rpms/kdesdk/devel .cvsignore, 1.29, 1.30 kdesdk.spec, 1.48,
	1.49 sources, 1.29, 1.30
Message-ID: <200602052113.k15LDADQ027877@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27808

Modified Files:
	.cvsignore kdesdk.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	2 Dec 2005 10:32:27 -0000	1.29
+++ .cvsignore	5 Feb 2006 21:13:07 -0000	1.30
@@ -8,3 +8,4 @@
 kdesdk-3.4.91.tar.bz2
 kdesdk-3.4.92.tar.bz2
 kdesdk-3.5.0.tar.bz2
+kdesdk-3.5.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kdesdk.spec	9 Dec 2005 22:41:11 -0000	1.48
+++ kdesdk.spec	5 Feb 2006 21:13:07 -0000	1.49
@@ -2,6 +2,9 @@
 %define final 0
 
 %define qt_version 3.3.5
+%define qt_epoch 1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 %define arts 1
 
 %define make_cvs 1
@@ -11,8 +14,8 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Name: kdesdk
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -25,10 +28,10 @@
 Patch2: kdesdk-3.4.0-db4.patch
 Patch3: kdesdk-3.4.92-misc.patch
 
-Prereq: /sbin/ldconfig
+Requires(post,postun): /sbin/ldconfig
 
-BuildPrereq: qt-devel >= 1:%{qt_version}
-BuildPrereq: kdelibs-devel >= %{version}
+BuildPrereq: qt-devel >= %{qt_epoch}:%{qt_version}
+BuildPrereq: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildPrereq: db4-devel
 BuildPrereq: /usr/bin/desktop-file-install
 
@@ -41,7 +44,7 @@
 Summary: Development files for kdesdk
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel => 6:%{version}
+Requires: kdelibs-devel => %{kdelibs_epoch}:%{version}
 
 %description devel
 Development files for kdesdk. Install kdesdk-devel if you wish
@@ -141,22 +144,24 @@
 
 perl -pi -e "d/kbugbuster//g" subdirs && rm -rf kbugbuster
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -231,6 +236,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	2 Dec 2005 10:32:28 -0000	1.29
+++ sources	5 Feb 2006 21:13:07 -0000	1.30
@@ -1 +1 @@
-dc91ffcfa8114cf4f9d40bc9ffe47d97  kdesdk-3.5.0.tar.bz2
+93199b8bf5793681fdb2e5cbcfcfbd93  kdesdk-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb  5 21:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 16:22:00 -0500
Subject: rpms/kdevelop/devel .cvsignore, 1.26, 1.27 kdevelop.spec, 1.42,
	1.43 sources, 1.27, 1.28
Message-ID: <200602052122.k15LM0ti011796@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11646

Modified Files:
	.cvsignore kdevelop.spec sources 
Log Message:
3.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Dec 2005 20:36:38 -0000	1.26
+++ .cvsignore	5 Feb 2006 21:21:57 -0000	1.27
@@ -9,3 +9,4 @@
 kdevelop-3.2.91.tar.bz2
 kdevelop-3.2.92.tar.bz2
 kdevelop-3.3.0.tar.bz2
+kdevelop-3.3.1.tar.bz2


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdevelop.spec	9 Dec 2005 22:41:12 -0000	1.42
+++ kdevelop.spec	5 Feb 2006 21:21:57 -0000	1.43
@@ -1,8 +1,10 @@
 %define debug 0
 %define final 0
 
-%define kde_version 3.5.0
+%define kde_version 3.5.1
 %define qt_version 3.3.5
+%define qt_epoch 1
+%define kdelibs_epoch 6
 
 %define make_cvs 1
 
@@ -10,8 +12,8 @@
 
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: 3.3.0
-Release: 1.1
+Version: 3.3.1
+Release: 1
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -25,14 +27,13 @@
 Patch2: kde-libtool.patch
 Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch
 
-Prereq: /sbin/ldconfig
-
-Requires: kdelibs-devel >= 6:%{kde_version}
+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 >= 1:%{qt_version}
+Requires: qt-designer >= %{qt_epoch}:%{qt_version}
 
 BuildPrereq: autoconf
 BuildPrereq: automake
@@ -75,13 +76,6 @@
 export KDEDIR=%{_prefix}
 QTDIR="" && source /etc/profile.d/qt.sh
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 # Workaround for legacy auto* tools
 %if %{make_cvs}
   [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
@@ -93,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 -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE"
+export FLAGS="$RPM_OPT_FLAGS"
 
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
@@ -104,7 +98,16 @@
 popd
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
    --disable-rpath \
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
   --enable-final \
 %endif
@@ -122,9 +125,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 make -C c_cpp_reference-2.0.2_for_KDE_3.0 DESTDIR=$RPM_BUILD_ROOT install
 
-# remove duplicat, konflict with kdelibs
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/text/x-pascal.desktop
-
 # remove useless files
 rm -rf $RPM_BUILD_ROOT%{_prefix}/kdevbdb
 
@@ -154,6 +154,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1 
+- 3.3.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	4 Dec 2005 20:36:38 -0000	1.27
+++ sources	5 Feb 2006 21:21:57 -0000	1.28
@@ -1,2 +1 @@
-5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
-1048c89c1aad0daf6581bb04e15206c4  kdevelop-3.3.0.tar.bz2
+e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb  5 21:25:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 16:25:30 -0500
Subject: rpms/kdevelop/devel sources,1.28,1.29
Message-ID: <200602052125.k15LPUUM013525@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13453

Modified Files:
	sources 
Log Message:
add missing c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Feb 2006 21:21:57 -0000	1.28
+++ sources	5 Feb 2006 21:25:27 -0000	1.29
@@ -1 +1,2 @@
+5777e4d2dbfc3e6c2ba9f0ed6ea457f9  c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 e5e3d3ce60a0dcafb99721f6304f87ef  kdevelop-3.3.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb  5 21:34:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 16:34:13 -0500
Subject: rpms/kdewebdev/devel .cvsignore, 1.11, 1.12 kdewebdev.spec, 1.25,
	1.26 sources, 1.11, 1.12
Message-ID: <200602052134.k15LYDjK015874@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15855

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
3.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Dec 2005 22:20:45 -0000	1.11
+++ .cvsignore	5 Feb 2006 21:34:07 -0000	1.12
@@ -14,3 +14,4 @@
 kdewebdev-3.4.91.tar.bz2
 kdewebdev-3.4.92.tar.bz2
 kdewebdev-3.5.0.tar.bz2
+kdewebdev-3.5.1.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdewebdev.spec	9 Dec 2005 22:41:13 -0000	1.25
+++ kdewebdev.spec	5 Feb 2006 21:34:07 -0000	1.26
@@ -5,12 +5,14 @@
 %define arts 1
 
 %define qt_version 3.3.5
-%define kde_version 3.5.0
+%define kde_version 3.5.1
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 1.1
+Version: 3.5.1
+Release: 1
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -28,7 +30,7 @@
 
 Patch0: javascript.patch
 Prereq: /sbin/ldconfig
-Requires: kdelibs >= 6:%{kde_version}
+Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
 
 BuildPrereq: qt-devel >= %{qt_version}
 BuildPrereq: kdesdk-devel >= %{kde_version}
@@ -61,13 +63,6 @@
 %build
 QTDIR="" && . /etc/profile.d/qt.sh
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
@@ -76,10 +71,19 @@
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif
 %if %{final}
    --enable-final \
 %endif
@@ -143,6 +147,9 @@
 %{_includedir}/*
 
 %changelog
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+- 3.5.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Dec 2005 22:20:45 -0000	1.11
+++ sources	5 Feb 2006 21:34:07 -0000	1.12
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-58bb4d025fa125c5ad0dc43769ba9786  kdewebdev-3.5.0.tar.bz2
+0faea4e8088005ae60f58b21c60b32ea  kdewebdev-3.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb  5 22:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 17:17:29 -0500
Subject: rpms/xorg-x11-xfs/devel xfs.init, 1.3, 1.4 xorg-x11-xfs.spec, 1.13,
	1.14
Message-ID: <200602052217.k15MHToK024696@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24663

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)


Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfs.init	1 Feb 2006 03:02:56 -0000	1.3
+++ xfs.init	5 Feb 2006 22:17:26 -0000	1.4
@@ -36,7 +36,7 @@
          # If fonts.dir does not exist, or if there are files in the
          # directory with a newer change time, regenerate fonts.dir, etc.
          # Using "-cnewer" here fixes bug #53737
-         if [ ! -e fonts.dir ] || [ -n "$(find . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*')" ]; then
+         if [ ! -e fonts.dir ] || [ -n "$(find . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*' 2>/dev/null)" ]; then
             rm -f fonts.dir
             if ls | grep -iqs '\.ot[cf]$' ; then
                # Opentype fonts found, generate fonts.scale and fonts.dir


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xfs.spec	1 Feb 2006 03:02:56 -0000	1.13
+++ xorg-x11-xfs.spec	5 Feb 2006 22:17:26 -0000	1.14
@@ -288,8 +288,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
-* Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com>
+* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com>
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
+- Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)
 
 * Wed Jan 16 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated all tarballs to version 1.0.1 from X11R7.0



From fedora-cvs-commits at redhat.com  Mon Feb  6 00:07:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 19:07:18 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant-auth-fallback-v3.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wpa_supplicant.spec, 1.2,
	1.3 wpa_supplicant-ctrl-iface-ap-scan.patch, 1.1, NONE
Message-ID: <200602060007.k1607IlV027454@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27375

Modified Files:
	.cvsignore sources wpa_supplicant.spec 
Added Files:
	wpa_supplicant-auth-fallback-v3.patch 
Removed Files:
	wpa_supplicant-ctrl-iface-ap-scan.patch 
Log Message:
* Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-1
- Update to 0.5.1
- Add WE auth fallback to actually work with older drivers



wpa_supplicant-auth-fallback-v3.patch:
 driver.h         |   14 ++++++++++++++
 driver_wext.c    |   42 +++++++++++++++++++++++++++++++++++++++++-
 wpa_supplicant.c |    6 +++++-
 3 files changed, 60 insertions(+), 2 deletions(-)

--- NEW FILE wpa_supplicant-auth-fallback-v3.patch ---
Index: driver.h
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver.h,v
retrieving revision 1.45
diff -u -r1.45 driver.h
--- driver.h	15 Oct 2005 15:36:32 -0000	1.45
+++ driver.h	3 Feb 2006 01:45:37 -0000
@@ -128,6 +128,20 @@
 	 * mode - Operation mode (infra/ibss) IEEE80211_MODE_*
 	 */
 	int mode;
+
+	/**
+	 * auth_alg_fallback - If setting the authentication
+	 * algorithm failed because SIOCSIWAUTH was not supported,
+	 * this indicates that the association function should perform
+	 * fallback auth_alg setting.
+	 */
+	int auth_alg_fallback;
+
+	/**
+	 * use_crypt - Indicates the connection will require some
+	 * form of encryption.
+	 */
+	int use_crypt;
 };
 
 /**
Index: driver_wext.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/driver_wext.c,v
retrieving revision 1.52
diff -u -r1.52 driver_wext.c
--- driver_wext.c	30 Jan 2006 04:11:48 -0000	1.52
+++ driver_wext.c	3 Feb 2006 01:45:39 -0000
@@ -69,7 +69,7 @@
 		perror("ioctl[SIOCSIWAUTH]");
 		fprintf(stderr, "WEXT auth param %d value 0x%x - ",
 			idx, value);
-		ret = -1;
+		ret = errno == EOPNOTSUPP ? -2 : -1;
 	}
 
 	return ret;
@@ -1557,6 +1557,39 @@
 	}
 }
 
+static int
+wpa_driver_wext_auth_alg_fallback (struct wpa_driver_wext_data *drv,
+				  struct wpa_driver_associate_params *params)
+{
+	struct iwreq iwr;
+	int ret = 0;
+
+	wpa_printf(MSG_DEBUG, "Driver did not support "
+		   "SIOCSIWAUTH for AUTH_ALG, trying SIOCSIWENCODE");
+
+	memset(&iwr, 0, sizeof(iwr));
+	strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
+	/* Just changing mode, not actual keys */
+	iwr.u.encoding.flags = 0;
+	iwr.u.encoding.pointer = (caddr_t) NULL;
+	iwr.u.encoding.length = 0;
+
+	if (!params->use_crypt) {
+		iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
+	} else {
+		if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM)
+			iwr.u.encoding.flags |= IW_ENCODE_OPEN;
+		if (params->auth_alg & AUTH_ALG_SHARED_KEY)
+			iwr.u.encoding.flags |= IW_ENCODE_RESTRICTED;
+	}
+
+	if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
+		perror("ioctl[SIOCSIWENCODE]");
+		ret = -1;
+	}
+
+	return ret;
+}
 
 static int
 wpa_driver_wext_associate(void *priv,
@@ -1568,6 +1601,13 @@
 	int value;
 
 	wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
+
+	/* If the driver didn't support SIOCSIWAUTH, fallback to
+	 * SIOCSIWENCODE here.
+	 */
+	if (params->auth_alg_fallback &&
+	    wpa_driver_wext_auth_alg_fallback (drv, params) < 0)
+			ret = -1;
 
 	if (!params->bssid &&
 	    wpa_driver_wext_set_bssid(drv, NULL) < 0)
Index: wpa_supplicant.c
===================================================================
RCS file: /cvs/hostap/wpa_supplicant/wpa_supplicant.c,v
retrieving revision 1.315
diff -u -r1.315 wpa_supplicant.c
--- wpa_supplicant.c	30 Jan 2006 04:24:58 -0000	1.315
+++ wpa_supplicant.c	3 Feb 2006 01:46:02 -0000
@@ -1104,6 +1104,7 @@
 	int wep_keys_set = 0;
 	struct wpa_driver_capa capa;
 	int assoc_failed = 0;
+	int auth_alg_fallback = 0;
 
 	wpa_s->reassociate = 0;
 	if (bss) {
@@ -1141,7 +1142,8 @@
 		wpa_printf(MSG_DEBUG, "Overriding auth_alg selection: 0x%x",
 			   algs);
 	}
-	wpa_drv_set_auth_alg(wpa_s, algs);
+	if (wpa_drv_set_auth_alg(wpa_s, algs) == -2)
+		auth_alg_fallback = 1;
 
 	if (bss && (bss->wpa_ie_len || bss->rsn_ie_len) &&
 	    (ssid->key_mgmt & (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK))) {
@@ -1234,6 +1236,8 @@
 	params.key_mgmt_suite = key_mgmt2driver(wpa_s->key_mgmt);
 	params.auth_alg = algs;
 	params.mode = ssid->mode;
+	params.auth_alg_fallback = auth_alg_fallback;
+	params.use_crypt = use_crypt;
 	if (wpa_drv_associate(wpa_s, &params) < 0) {
 		wpa_msg(wpa_s, MSG_INFO, "Association request to the driver "
 			"failed");


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Jan 2006 06:08:29 -0000	1.2
+++ .cvsignore	6 Feb 2006 00:07:16 -0000	1.3
@@ -1,2 +1,3 @@
 madwifi-headers.tar.bz2
 wpa_supplicant-0.4.7.tar.gz
+wpa_supplicant-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Jan 2006 06:08:29 -0000	1.2
+++ sources	6 Feb 2006 00:07:16 -0000	1.3
@@ -1,2 +1,2 @@
 3be286e0d0f5ab5223ccfdecd3b74546  madwifi-headers.tar.bz2
-1345730f15d5f93f2f083096ddc903eb  wpa_supplicant-0.4.7.tar.gz
+d99349503945c4534c6f46d21dfe0ca3  wpa_supplicant-0.5.1.tar.gz


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wpa_supplicant.spec	27 Jan 2006 06:28:35 -0000	1.2
+++ wpa_supplicant.spec	6 Feb 2006 00:07:16 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
-Version: 0.4.7
-Release: 2
+Version: 0.5.1
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers.tar.bz2
-Patch0: wpa_supplicant-ctrl-iface-ap-scan.patch
+Patch0: wpa_supplicant-auth-fallback-v3.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ctrl-iface-ap-scan
+%patch0 -p0 -b .we-auth-fallback
 
 %build
 cp %{SOURCE1} ./.config
@@ -95,6 +95,10 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-1
+- Update to 0.5.1
+- Add WE auth fallback to actually work with older drivers
+
 * Thu Jan 26 2006 Dan Williams <dcbw at redhat.com> 0.4.7-2
 - Bring package into Fedora Core
 - Add ap_scan control interface patch


--- wpa_supplicant-ctrl-iface-ap-scan.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb  6 03:18:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 22:18:13 -0500
Subject: rpms/NetworkManager/devel special-case-madwifi.patch, NONE,
	1.1 .cvsignore, 1.27, 1.28 NetworkManager.spec, 1.85,
	1.86 sources, 1.43, 1.44
Message-ID: <200602060318.k163IDD2003070@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2979

Modified Files:
	.cvsignore NetworkManager.spec sources 
Added Files:
	special-case-madwifi.patch 
Log Message:
* Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205
- Workarounds for madwifi/Atheros cards
- Do better with non-SSID-broadcasting access points
- Fix hangs when access points change settings



special-case-madwifi.patch:
 nm-device-802-11-wireless.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE special-case-madwifi.patch ---
? nl-route.patch
? src/madwifi.diff
? src/nm-coddle-madwifi.diff
Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
retrieving revision 1.45
diff -u -p -r1.45 nm-device-802-11-wireless.c
--- src/nm-device-802-11-wireless.c	5 Feb 2006 23:54:47 -0000	1.45
+++ src/nm-device-802-11-wireless.c	6 Feb 2006 03:00:46 -0000
@@ -2277,13 +2277,22 @@ supplicant_interface_init (NMDevice80211
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
 	int				tries = 0;
+	const char *		dev_driver;
+	char *			wpa_driver = "wext";
 
 	if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_RUN_DIR)))
 		goto exit;
 
+	/* Special-case madwifi for now.  madwifi needs to get their
+	 * act in gear and support WEXT too.
+	 */
+	dev_driver = nm_device_get_driver (NM_DEVICE (self));
+	if (dev_driver && !strcmp (dev_driver, "ath_pci"))
+		wpa_driver = "madwifi";
+
 	/* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */
 	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
-			"INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface))
+			"INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, wpa_driver))
 		goto exit;
 	wpa_ctrl_close (ctrl);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	31 Jan 2006 16:21:12 -0000	1.27
+++ .cvsignore	6 Feb 2006 03:18:10 -0000	1.28
@@ -6,3 +6,4 @@
 NetworkManager-0.5.1.tar.gz
 NetworkManager-0.5.1.cvs20060127.tar.gz
 NetworkManager-0.5.1.cvs20060131.tar.gz
+NetworkManager-0.5.1.cvs20060205.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- NetworkManager.spec	31 Jan 2006 19:51:02 -0000	1.85
+++ NetworkManager.spec	6 Feb 2006 03:18:10 -0000	1.86
@@ -9,19 +9,21 @@
 %define bind_version 24:9.3.1-20
 
 %if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060131
+%define nm_cvs_version	.cvs20060205
 %endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 8%{?nm_cvs_version}
+Release: 10%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+Patch0: special-case-madwifi.patch
+
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
@@ -111,6 +113,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .madwifi
 
 %build
 %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named
@@ -130,6 +133,7 @@
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
 %{__cp} nm-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
+%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/autostart
 
 
 %clean
@@ -175,6 +179,8 @@
 %{_libdir}/libnm-util.so*
 %{_mandir}/man1/NetworkManager.1.gz
 %{_mandir}/man1/NetworkManagerDispatcher.1.gz
+%{_mandir}/man1/nm-tool.1.gz
+%{_localstatedir}/run/%{name}
 
 %files gnome
 %defattr(-,root,root,0755)
@@ -203,6 +209,14 @@
 
 
 %changelog
+* Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205
+- Workarounds for madwifi/Atheros cards
+- Do better with non-SSID-broadcasting access points
+- Fix hangs when access points change settings
+
+* Thu Feb  2 2006 Dan Williams <dcbw at redhat.com> 0.5.1-9.cvs20060202
+- Own /var/run/NetworkManager, fix SELinux issues
+
 * Tue Jan 31 2006 Dan Williams <dcbw at redhat.com> 0.5.1-8.cvs20060131
 - Switch to autostarting the applet instead of having it be session-managed
 - Work better with non-broadcasting access points


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	31 Jan 2006 19:51:02 -0000	1.43
+++ sources	6 Feb 2006 03:18:10 -0000	1.44
@@ -1 +1 @@
-51458600276d94aaf228ea3053d21c52  NetworkManager-0.5.1.cvs20060131.tar.gz
+0c4a79e5e950dd62d465ca3c4d179a8c  NetworkManager-0.5.1.cvs20060205.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb  6 04:21:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 5 Feb 2006 23:21:52 -0500
Subject: rpms/ruby/devel ruby-1.8.4-no-eaccess.patch, NONE, 1.1 ruby.spec,
	1.52, 1.53
Message-ID: <200602060421.k164LqaX013478@cvs.devel.redhat.com>

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13457

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.4-no-eaccess.patch 
Log Message:
* Mon Feb  6 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
- ruby-1.8.4-no-eaccess.patch: backported from ruby CVS to avoid conflict
  between newer glibc. (#179835)

ruby-1.8.4-no-eaccess.patch:
 configure.in |    2 +-
 file.c       |    2 ++
 intern.h     |    1 -
 missing.h    |    4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE ruby-1.8.4-no-eaccess.patch ---
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in	2005-11-24 21:07:18.000000000 +0900
+++ ruby-1.8.4/configure.in	2006-02-06 12:51:58.000000000 +0900
@@ -437,7 +437,7 @@
 AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul crypt flock vsnprintf\
 		 isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd\
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
 	      truncate chsize times utimes fcntl lockf lstat symlink link\
 	      readlink setitimer setruid seteuid setreuid setresuid\
 	      setproctitle setrgid setegid setregid setresgid issetugid pause\
diff -ruN ruby-1.8.4.orig/file.c ruby-1.8.4/file.c
--- ruby-1.8.4.orig/file.c	2005-12-21 18:20:15.000000000 +0900
+++ ruby-1.8.4/file.c	2006-02-06 12:52:48.000000000 +0900
@@ -849,6 +849,7 @@
 #  define S_IXUGO		(S_IXUSR | S_IXGRP | S_IXOTH)
 #endif
 
+#ifndef HAVE_EACCESS
 int
 eaccess(path, mode)
      const char *path;
@@ -887,6 +888,7 @@
     return access(path, mode);
 #endif
 }
+#endif
 
 
 /*
diff -ruN ruby-1.8.4.orig/intern.h ruby-1.8.4/intern.h
--- ruby-1.8.4.orig/intern.h	2005-11-23 11:06:00.000000000 +0900
+++ ruby-1.8.4/intern.h	2006-02-06 12:52:54.000000000 +0900
@@ -221,7 +221,6 @@
 void rb_thread_atfork _((void));
 VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
 /* file.c */
-int eaccess _((const char*, int));
 VALUE rb_file_s_expand_path _((int, VALUE *));
 VALUE rb_file_expand_path _((VALUE, VALUE));
 void rb_file_const _((const char*, VALUE));
diff -ruN ruby-1.8.4.orig/missing.h ruby-1.8.4/missing.h
--- ruby-1.8.4.orig/missing.h	2005-06-13 01:58:41.000000000 +0900
+++ ruby-1.8.4/missing.h	2006-02-06 12:53:29.000000000 +0900
@@ -39,6 +39,10 @@
 extern int dup2 _((int, int));
 #endif
 
+#ifndef HAVE_EACCESS
+extern int eaccess(const char*, int);
+#endif
+
 #ifndef HAVE_FINITE
 extern int finite _((double));
 #endif


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ruby.spec	4 Jan 2006 09:18:52 -0000	1.52
+++ ruby.spec	6 Feb 2006 04:21:50 -0000	1.53
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	2
+Release:	3
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -24,6 +24,7 @@
 Patch1:		ruby-multilib.patch
 Patch3:		ruby-1.8.2-deadcode.patch
 Patch4:		ruby-tcltk-multilib.patch
+Patch5:		ruby-1.8.4-no-eaccess.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -137,6 +138,7 @@
 %ifarch ppc64 s390x sparc64 x86_64
 %patch4 -p1
 %endif
+%patch5 -p1
 popd
 
 %build
@@ -418,6 +420,10 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Mon Feb  6 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
+- ruby-1.8.4-no-eaccess.patch: backported from ruby CVS to avoid conflict
+  between newer glibc. (#179835)
+
 * Wed Jan  4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2
 - ruby-tcltk-multilib.patch: fixed a typo.
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 07:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 02:42:59 -0500
Subject: rpms/net-tools/devel net-tools-1.60-mii-tool-obsolete.patch, 1.1,
	1.2 net-tools.spec, 1.53, 1.54
Message-ID: <200602060742.k167gxPh019218@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools-1.60-mii-tool-obsolete.patch net-tools.spec 
Log Message:
- mii-tool manpage fixed (#180055)

net-tools-1.60-mii-tool-obsolete.patch:
 mii-tool.8 |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: net-tools-1.60-mii-tool-obsolete.patch
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools-1.60-mii-tool-obsolete.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- net-tools-1.60-mii-tool-obsolete.patch	11 Nov 2004 08:53:41 -0000	1.1
+++ net-tools-1.60-mii-tool-obsolete.patch	6 Feb 2006 07:42:55 -0000	1.2
@@ -8,7 +8,7 @@
 +.P 
 +This program is obsolete. Valid media are only \fB100baseT4\fR, 
 +\fB100baseTx-FD\fR,\fB100baseTx-HD\fR, \fB10baseT-FD\fR and 
-+\fB10baseT-HD\fR ethernet cards. For replacement check \fBeth-tool\fB.
++\fB10baseT-HD\fR ethernet cards. For replacement check \fBethtool\fB.
 +
  .SH DESCRIPTION
  This utility checks or sets the status of a network interface's Media


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- net-tools.spec	17 Jan 2006 12:01:20 -0000	1.53
+++ net-tools.spec	6 Feb 2006 07:42:55 -0000	1.54
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 60
+Release: 61
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -223,6 +223,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Mon Feb 06 2006 Radek Vok??l <rvokal at redhat.com> 1.60-61
+- mii-tool manpage fixed (#180055)
+
 * Tue Jan 17 2006 Radek Vokal <rvokal at redhat.com> 1.60-60
 - forget to enable the new selinux option :( - config.make changed
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 08:10:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 03:10:12 -0500
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.0.1-SEGV-on-null-interface.patch, NONE,
	1.1 xorg-x11-server-1.0.1-fbpict-fix-rounding.patch, NONE,
	1.1 xorg-x11-server.spec, 1.35, 1.36
Message-ID: <200602060810.k168ACRD009118@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9090

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.0.1-SEGV-on-null-interface.patch 
	xorg-x11-server-1.0.1-fbpict-fix-rounding.patch 
Log Message:
* Sun Feb  5 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)


xorg-x11-server-1.0.1-SEGV-on-null-interface.patch:
 access.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-server-1.0.1-SEGV-on-null-interface.patch ---
Patch taken from xserver/xorg CVS HEAD, originally submitted to X.Org by
Andrei Barbu:

In theory, it should fix all 4 of these bug reports, however that is
currently unconfirmed:
https://bugs.freedesktop.org/show_bug.cgi?id=5218
https://bugs.freedesktop.org/show_bug.cgi?id=5068
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178986
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174279

Since it is in CVS HEAD, we can drop this patch when we update to the next
xserver/xorg release that comes from HEAD.  -- mharris


Index: xserver/xorg/os/access.c
diff -u xserver/xorg/os/access.c:1.13 xserver/xorg/os/access.c:1.14
--- xserver/xorg/os/access.c:1.13	Mon Nov  7 22:33:30 2005
+++ xserver/xorg/os/access.c	Fri Jan  6 16:45:17 2006
@@ -975,6 +975,8 @@
 	return;
     }
     for (ifr = ifap; ifr != NULL; ifr = ifr->ifa_next) {
+        if (!ifr->ifa_addr)
+            continue;
 #ifdef DNETCONN
 	if (ifr->ifa_addr.sa_family == AF_DECnet) 
 	    continue;

xorg-x11-server-1.0.1-fbpict-fix-rounding.patch:
 fbpict.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.0.1-fbpict-fix-rounding.patch ---
Patch should be added to 7.0 stable branch, and once checked in, we can
drop this patch when we update to 7.0.1 or later.  -- mharris


CVSROOT:	/cvs/xorg
Module name:	xserver
Changes by:	anholt at gabe.freedesktop.org	05/12/28 02:43:02

Log message:
  Fix a copy'n'paste-o that would result in mis-rounding of the results of
  several composite operators in A and G channels.


Index: xserver/xorg/fb/fbpict.h
diff -u xserver/xorg/fb/fbpict.h:1.18 xserver/xorg/fb/fbpict.h:1.19
--- xserver/xorg/fb/fbpict.h:1.18	Sun Oct  2 01:28:26 2005
+++ xserver/xorg/fb/fbpict.h	Wed Dec 28 02:43:02 2005
@@ -173,7 +173,7 @@
         x = (x + ((x >> 8) & 0xff00ff)) >> 8;                       \
         x &= 0xff00ff;                                              \
         x += (y >> 8) & 0xff00ff;                                   \
-        x |= 0x1000100 - ((t >> 8) & 0xff00ff);                     \
+        x |= 0x1000100 - ((x >> 8) & 0xff00ff);                     \
         x &= 0xff00ff;                                              \
         x <<= 8;                                                    \
         x += t;                                                     \


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xorg-x11-server.spec	30 Jan 2006 02:03:29 -0000	1.35
+++ xorg-x11-server.spec	6 Feb 2006 08:10:10 -0000	1.36
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -18,7 +18,12 @@
 # xorg-server-0.99.3-rgb.txt-dix-config-fix.patch is from post-RC2 CVS
 Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
-Patch100:  xorg-redhat-die-ugly-pattern-die-die-die.patch
+
+# Patches taken from xserver/xorg CVS HEAD, post-1.0.1
+Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
+Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
+
+Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
 
 # INFO: We don't ship the X server on s390/s390x/ppc64
 ExcludeArch: s390 s390x ppc64
@@ -226,7 +231,10 @@
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 
-%patch100 -p0 -b .redhat-die-ugly-pattern-die-die-die
+%patch100 -p2 -b .fbpict-fix-rounding
+%patch101 -p2 -b .SEGV-on-null-interface
+
+%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -526,6 +534,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sun Feb  5 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)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Updated to xserver 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 09:05:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 04:05:43 -0500
Subject: rpms/libtool/devel libtool.spec,1.36,1.37
Message-ID: <200602060905.k1695hrN011940@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11914

Modified Files:
	libtool.spec 
Log Message:
- libtool-ltdl-devel is LGPL (#168075)


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libtool.spec	20 Dec 2005 13:17:00 -0000	1.36
+++ libtool.spec	6 Feb 2006 09:05:32 -0000	1.37
@@ -4,7 +4,7 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:    1
+Release:    2
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -62,6 +62,7 @@
 Summary:	Tools needed for development using the GNU Libtool Dynamic Module Loader
 Group:		Development/Libraries
 Requires:	libtool-ltdl = %{version}-%{release}
+License:    LGPL
 
 %description ltdl-devel
 Static libraries and header files for development with ltdl.
@@ -140,6 +141,9 @@
 
 
 %changelog
+* Mon Feb 06 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-2
+- libtool-ltdl-devel is LGPL (#168075)
+
 * Tue Dec 20 2005 Karsten Hopp <karsten at redhat.de> 1.5.22-1
 - update to 1.5.22, most prominent fixes are:
   - Fix 1.5 regression that caused linking a program `-static' to also



From fedora-cvs-commits at redhat.com  Mon Feb  6 09:30:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 04:30:00 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.616,1.617
Message-ID: <200602060930.k169U0nT001475@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1446

Modified Files:
	openoffice.org.spec 
Log Message:
rh#180125# unnecessary gnome mime files


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- openoffice.org.spec	2 Feb 2006 14:49:21 -0000	1.616
+++ openoffice.org.spec	6 Feb 2006 09:29:57 -0000	1.617
@@ -1,6 +1,6 @@
 %define oootag OOA680
 %define ooomilestone 1
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 %define build_fc5 1
 %define build_fc4 0
@@ -1220,7 +1220,6 @@
 %endif
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
 
@@ -2876,8 +2875,6 @@
 #icons and mime
 #%{_datadir}/application-registry
 %{_datadir}/icons
-%dir %{_datadir}/mime-info
-%{_datadir}/mime-info/*
 %if ! %{fc5langpack}
 %{instdir}/share/dict/ooo/*ga_IE*
 %endif
@@ -3378,6 +3375,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Feb 06 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-11
+- rh#180125# unnecessary gnome mime files
+
 * Thu Feb 02 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-10
 - reshuffle bridge patch
 - reimplement lang from locale patch



From fedora-cvs-commits at redhat.com  Mon Feb  6 10:02:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 05:02:28 -0500
Subject: rpms/iputils/devel iputils-ping_cleanup.patch, NONE,
	1.1 iputils-gcc41.patch, 1.1, 1.2 iputils.spec, 1.32, 1.33
Message-ID: <200602061002.k16A2Rc2025889@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25851

Modified Files:
	iputils-gcc41.patch iputils.spec 
Added Files:
	iputils-ping_cleanup.patch 
Log Message:
- ping clean-up, added new ICMP warning messages

iputils-ping_cleanup.patch:
 ping.c        |   29 ++++++++++++++++++++++++++++-
 ping6.c       |    2 +-
 ping_common.c |    8 ++++----
 3 files changed, 33 insertions(+), 6 deletions(-)

--- NEW FILE iputils-ping_cleanup.patch ---
--- iputils/ping6.c.OLD	2006-02-06 10:34:35.000000000 +0100
+++ iputils/ping6.c	2006-02-06 10:35:38.000000000 +0100
@@ -353,7 +353,7 @@
 	hostname = target;
 
 	if (ipv6_addr_any(&source.sin6_addr)) {
-		int alen;
+		socklen_t alen;
 		int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0);
 
 		if (probe_fd < 0) {
--- iputils/ping.c.OLD	2006-02-06 10:34:35.000000000 +0100
+++ iputils/ping.c	2006-02-06 10:34:35.000000000 +0100
@@ -253,7 +253,7 @@
 	}
 
 	if (source.sin_addr.s_addr == 0) {
-		int alen;
+		socklen_t alen;
 		struct sockaddr_in dst = whereto;
 		int probe_fd = socket(AF_INET, SOCK_DGRAM, 0);
 
@@ -855,9 +855,36 @@
 		case ICMP_SR_FAILED:
 			printf("Source Route Failed\n");
 			break;
+		case ICMP_NET_UNKNOWN:
+			printf("Destination Net Unknown\n");
+			break;
+		case ICMP_HOST_UNKNOWN:
+			printf("Destination Host Unknown\n");
+			break;
+		case ICMP_HOST_ISOLATED:
+			printf("Source Host Isolated\n");
+			break;
+		case ICMP_NET_ANO:
+			printf("Destination Net Prohibited\n");
+			break;
+		case ICMP_HOST_ANO:
+			printf("Destination Host Prohibited\n");
+			break;
+		case ICMP_NET_UNR_TOS:
+			printf("Destination Net Unreachable for Type of Service\n");
+			break;
+		case ICMP_HOST_UNR_TOS:
+			printf("Destination Host Unreachable for Type of Service\n");
+			break;
 		case ICMP_PKT_FILTERED:
 			printf("Packet filtered\n");
 			break;
+		case ICMP_PREC_VIOLATION:
+			printf("Precedence Violation\n");
+			break;
+		case ICMP_PREC_CUTOFF:
+			printf("Precedence Cutoff\n");
+			break;
 		default:
 			printf("Dest Unreachable, Bad Code: %d\n", code);
 			break;
--- iputils/ping_common.c.OLD	2006-02-06 10:34:35.000000000 +0100
+++ iputils/ping_common.c	2006-02-06 10:34:35.000000000 +0100
@@ -67,7 +67,7 @@
 	int ii, jj, kk;
 	int pat[16];
 	char *cp;
-	char *bp = outpack+8;
+	unsigned char *bp = outpack+8;
 
 	for (cp = patp; *cp; cp++) {
 		if (!isxdigit(*cp)) {
@@ -393,7 +393,7 @@
 void sock_setbufs(int icmp_sock, int alloc)
 {
 	int rcvbuf, hold;
-	int tmplen = sizeof(hold);
+	socklen_t tmplen = sizeof(hold);
 
 	if (!sndbuf)
 		sndbuf = alloc;
@@ -464,7 +464,7 @@
 
 	if (!(options & F_PINGFILLED)) {
 		int i;
-		char *p = outpack+8;
+		unsigned char *p = outpack+8;
 
 		/* Do not forget about case of small datalen,
 		 * fill timestamp area too!
@@ -819,7 +819,7 @@
 	}
 	if (pipesize > 1)
 		printf(", pipe %d", pipesize);
-	if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
+	if (ntransmitted > 1 && nreceived && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
 		int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
 		printf(", ipg/ewma %d.%03d/%d.%03d ms",
 		       ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);

iputils-gcc41.patch:
 arping.c      |    8 ++++----
 clockdiff.c   |   20 +++++++++++++-------
 ifenslave.c   |    2 +-
 ping.c        |   14 ++++++++------
 ping6.c       |   10 ++++++----
 ping_common.c |   16 +++++++++-------
 rarpd.c       |   17 ++++++++++++-----
 rdisc.c       |    2 +-
 tftpd.c       |    6 +++---
 traceroute6.c |    4 ++--
 10 files changed, 59 insertions(+), 40 deletions(-)

Index: iputils-gcc41.patch
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils-gcc41.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iputils-gcc41.patch	25 Jan 2006 15:38:23 -0000	1.1
+++ iputils-gcc41.patch	6 Feb 2006 10:02:24 -0000	1.2
@@ -1,11 +1,5 @@
 --- iputils/ping6.c.gcc41	2006-01-25 16:21:47.000000000 +0100
 +++ iputils/ping6.c	2006-01-25 16:21:47.000000000 +0100
-@@ -1,4 +1,4 @@
--/*
-+/*[21~
-  *
-  *	Modified for AF_INET6 by Pedro Roque
-  *
 @@ -383,7 +383,7 @@
  			exit(2);
  		}
@@ -273,15 +267,6 @@
  			dup2(fd, 0);
 --- iputils/ping_common.c.gcc41	2006-01-25 16:21:47.000000000 +0100
 +++ iputils/ping_common.c	2006-01-25 16:21:47.000000000 +0100
-@@ -67,7 +67,7 @@
- 	int ii, jj, kk;
- 	int pat[16];
- 	char *cp;
--	char *bp = outpack+8;
-+	char *bp = (char*)(outpack+8);
- 
- 	for (cp = patp; *cp; cp++) {
- 		if (!isxdigit(*cp)) {
 @@ -284,6 +284,7 @@
  	static int oom_count;
  	static int tokens;
@@ -319,15 +304,6 @@
  		if (hold < rcvbuf)
  			fprintf(stderr, "WARNING: probably, rcvbuf is not enough to hold preload.\n");
  	}
-@@ -464,7 +465,7 @@
- 
- 	if (!(options & F_PINGFILLED)) {
- 		int i;
--		char *p = outpack+8;
-+		char *p = (char*)(outpack+8);
- 
- 		/* Do not forget about case of small datalen,
- 		 * fill timestamp area too!
 @@ -650,7 +651,8 @@
  {
  	int dupflag = 0;


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iputils.spec	25 Jan 2006 15:38:23 -0000	1.32
+++ iputils.spec	6 Feb 2006 10:02:24 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 33
+Release: 34
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -28,6 +28,7 @@
 Patch18: iputils-ping-168166.patch
 Patch19: iputils-ipv6-hoplimit.patch
 Patch20: iputils-gcc41.patch
+Patch21: iputils-ping_cleanup.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
@@ -63,6 +64,7 @@
 %patch18 -p1 -b .memset
 %patch19 -p1 -b .hoplimit
 %patch20 -p1 -b .gcc41
+%patch21 -p1 -b .cleanup
 
 %build
 %ifarch s390 s390x
@@ -162,7 +164,10 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
-* Wed Jan 25 2006 Radek Vok??l <rvokal at redhat.com> -33
+* Mon Feb 06 2006 Radek Vok??l <rvokal at redhat.com> 20020927-34
+- ping clean-up, added new ICMP warning messages
+
+* Wed Jan 25 2006 Radek Vok??l <rvokal at redhat.com> 20020927-33
 - gcc patch, warnings cleaned-up
 
 * Tue Dec 13 2005 Radek Vokal <rvokal at redhat.com> 20020927-32



From fedora-cvs-commits at redhat.com  Mon Feb  6 10:04:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 05:04:26 -0500
Subject: rpms/gcc/devel gcc41-fortran-where.patch, NONE, 1.1 .cvsignore,
	1.130, 1.131 gcc41-ia64-frame-base-loclist.patch, 1.2,
	1.3 gcc41-ldbl-default-libstdc++.patch, 1.2,
	1.3 gcc41-ldbl-default.patch, 1.1, 1.2 gcc41.spec, 1.28,
	1.29 sources, 1.132, 1.133
Message-ID: <200602061004.k16A4QIo026206@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26159

Modified Files:
	.cvsignore gcc41-ia64-frame-base-loclist.patch 
	gcc41-ldbl-default-libstdc++.patch gcc41-ldbl-default.patch 
	gcc41.spec sources 
Added Files:
	gcc41-fortran-where.patch 
Log Message:
4.1.0-0.23


gcc41-fortran-where.patch:
 trans-stmt.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE gcc41-fortran-where.patch ---
2006-02-05  Roger Sayle  <roger at eyesopen.com>

	* trans-stmt.c (gfc_evaluate_where_mask): Use LOGICAL*1 for WHERE
	masks instead of LOGICAL*4.

--- gcc/fortran/trans-stmt.c.jj	2006-01-28 00:42:26.000000000 +0100
+++ gcc/fortran/trans-stmt.c	2006-02-06 10:29:59.000000000 +0100
@@ -2628,6 +2628,7 @@ gfc_evaluate_where_mask (gfc_expr * me, 
   tree inner_size, size;
   stmtblock_t body, body1, inner_size_body;
   gfc_se lse, rse;
+  tree mask_type;
   tree count;
   tree tmpexpr;
 
@@ -2641,9 +2642,12 @@ gfc_evaluate_where_mask (gfc_expr * me, 
   size = compute_overall_iter_number (nested_forall_info, inner_size,
 				      &inner_size_body, block);
 
+  /* As the mask array can be very big, prefer compact boolean types.  */
+  mask_type = gfc_get_logical_type (gfc_logical_kinds[0].kind);
+
   /* Allocate temporary for where mask.  */
-  tmp = allocate_temp_for_forall_nest_1 (boolean_type_node, size, block,
-					 &ptemp1);
+  tmp = allocate_temp_for_forall_nest_1 (mask_type, size, block, &ptemp1);
+
   /* Record the temporary address in order to free it later.  */
   if (ptemp1)
     {
@@ -2655,8 +2659,8 @@ gfc_evaluate_where_mask (gfc_expr * me, 
     }
 
   /* Allocate temporary for !mask.  */
-  ntmp = allocate_temp_for_forall_nest_1 (boolean_type_node, size, block,
-					  &ptemp2);
+  ntmp = allocate_temp_for_forall_nest_1 (mask_type, size, block, &ptemp2);
+
   /* Record the temporary  in order to free it later.  */
   if (ptemp2)
     {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- .cvsignore	4 Feb 2006 13:20:06 -0000	1.130
+++ .cvsignore	6 Feb 2006 10:04:18 -0000	1.131
@@ -1 +1 @@
-gcc-4.1.0-20060204.tar.bz2
+gcc-4.1.0-20060206.tar.bz2

gcc41-ia64-frame-base-loclist.patch:
 0 files changed

Index: gcc41-ia64-frame-base-loclist.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ia64-frame-base-loclist.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-ia64-frame-base-loclist.patch	4 Feb 2006 21:35:57 -0000	1.2
+++ gcc41-ia64-frame-base-loclist.patch	6 Feb 2006 10:04:21 -0000	1.3
@@ -1,566 +1,44 @@
-2006-02-04  Alexandre Oliva  <aoliva at redhat.com>
+2006-02-06  Alexandre Oliva  <aoliva at redhat.com>
 
 	PR debug/24444
-	* config/ia64/ia64.c: Include debug.h.
-	(MAX_ARTIFICIAL_LABEL_BYTES): New.
-	(ia64_label_after_insn, ia64_dwarf2out_def_steady_cfa): New.
-	(IA64_CHANGE_CFA_IN_EPILOGUE): Define to 0.
-	(process_epilogue, process_set, process_for_unwind_directive):
-	Output unwind info only if requested.  Add CFA info if requested.
-	Add new arguments as needed.  Adjust callers.
-	* config/ia64/ia64.h (ARG_POINTER_CFA_OFFSET): Override
-	incorrect default.
-	(DWARF2_FRAME_INFO): Define to zero.
-	* config/ia64/unwind-ia64.c: Remove code that compensated for
-	the CFA offset error fixed above.
-	* config/ia64/t-ia64 (ia64.o): Depend on debug.h.
-	* dwarf2out.c (DWARF2_FRAME_INFO): Define default.
-	(dwarf2out_do_frame): Require nonzero DWARF2_UNWIND_INFO for
-	-funwind-tables and -fexceptions to enable frame info.
-	(dwarf2out_frame_init): Define initial CFA even if
-	DWARF2_UNWIND_INFO is disabled.  Call initial_return_save if
-	DWARF2_UNWIND_INFO is nonzero, not just defined.
-	(dwarf2out_frame_finish): Output non-EH call frame info only
-	if DWARF2_FRAME_INFO is nonzero.
-	(convert_cfa_to_loc_list,
-	compute_frame_pointer_to_cfa_displacement): Define even if
-	unwind info is not supported.
-	(gen_subprogram_die): Use the above unconditionally.  Remove
-	legacy alternate code.
-	* toplev.c (compile_file): Compile in call to
-	dwarf2out_frame_finish if DWARF2_DEBUGGING_INFO is defined.
-	(lang_dependent_init): Ditto for dwarf2out_frame_init.
+	* config/ia64/unwind-ia64.c: Revert last change.
+	* config/ia64/ia64.h (ARG_POINTER_CFA_OFFSET): Removed.
+	(INCOMING_FRAME_SP_OFFSET): Define.
 
---- gcc/config/ia64/ia64.c.orig	2006-02-03 20:31:57.000000000 -0200
-+++ gcc/config/ia64/ia64.c	2006-02-04 07:41:58.000000000 -0200
-@@ -53,6 +53,7 @@ Boston, MA 02110-1301, USA.  */
- #include "cfglayout.h"
- #include "tree-gimple.h"
- #include "intl.h"
-+#include "debug.h"
- 
- /* This is used for communication between ASM_OUTPUT_LABEL and
-    ASM_OUTPUT_LABELREF.  */
-@@ -190,8 +191,8 @@ static void final_emit_insn_group_barrie
- static void emit_predicate_relation_info (void);
- static void ia64_reorg (void);
- static bool ia64_in_small_data_p (tree);
--static void process_epilogue (void);
--static int process_set (FILE *, rtx);
-+static void process_epilogue (FILE *, rtx, bool, bool);
-+static int process_set (FILE *, rtx, rtx, bool, bool);
- 
- static bool ia64_assemble_integer (rtx, unsigned int, int);
- static void ia64_output_function_prologue (FILE *, HOST_WIDE_INT);
-@@ -7971,29 +7972,84 @@ static bool last_block;
- 
- static bool need_copy_state;
- 
-+#ifndef MAX_ARTIFICIAL_LABEL_BYTES
-+# define MAX_ARTIFICIAL_LABEL_BYTES 30
-+#endif
-+
-+/* Emit a debugging label after a call-frame-related insn.  We'd
-+   rather output the label right away, but we'd have to output it
-+   after, not before, the instruction, and the instruction has not
-+   been output yet.  So we emit the label after the insn, delete it to
-+   avoid introducing basic blocks, and mark it as preserved, such that
-+   it is still output, given that it is referenced in debug info.  */
-+
-+static const char *
-+ia64_emit_deleted_label_after_insn (rtx insn)
-+{
-+  char label[MAX_ARTIFICIAL_LABEL_BYTES];
-+  rtx lb = gen_label_rtx ();
-+  rtx label_insn = emit_label_after (lb, insn);
-+
-+  LABEL_PRESERVE_P (lb) = 1;
-+
-+  delete_insn (label_insn);
-+
-+  ASM_GENERATE_INTERNAL_LABEL (label, "L", CODE_LABEL_NUMBER (label_insn));
-+
-+  return xstrdup (label);
-+}
-+
-+/* Define the CFA after INSN with the steady-state definition.  */
-+
-+static void
-+ia64_dwarf2out_def_steady_cfa (rtx insn)
-+{
-+  rtx fp = frame_pointer_needed
-+    ? hard_frame_pointer_rtx
-+    : stack_pointer_rtx;
-+
-+  dwarf2out_def_cfa
-+    (ia64_emit_deleted_label_after_insn (insn),
-+     REGNO (fp),
-+     ia64_initial_elimination_offset
-+     (REGNO (arg_pointer_rtx), REGNO (fp))
-+     + ARG_POINTER_CFA_OFFSET (current_function_decl));
-+}
-+
-+/* The generic dwarf2 frame debug info generator does not define a
-+   separate region for the very end of the epilogue, so refrain from
-+   doing so in the IA64-specific code as well.  */
-+
-+#define IA64_CHANGE_CFA_IN_EPILOGUE 0
-+
- /* The function emits unwind directives for the start of an epilogue.  */
- 
- static void
--process_epilogue (void)
-+process_epilogue (FILE *asm_out_file, rtx insn, bool unwind, bool frame)
- {
-   /* If this isn't the last block of the function, then we need to label the
-      current state, and copy it back in at the start of the next block.  */
- 
-   if (!last_block)
-     {
--      fprintf (asm_out_file, "\t.label_state %d\n",
--	       ++cfun->machine->state_num);
-+      if (unwind)
-+	fprintf (asm_out_file, "\t.label_state %d\n",
-+		 ++cfun->machine->state_num);
-       need_copy_state = true;
-     }
- 
--  fprintf (asm_out_file, "\t.restore sp\n");
-+  if (unwind)
-+    fprintf (asm_out_file, "\t.restore sp\n");
-+  if (IA64_CHANGE_CFA_IN_EPILOGUE && frame)
-+    dwarf2out_def_cfa (ia64_emit_deleted_label_after_insn (insn),
-+		       STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET);
- }
- 
- /* This function processes a SET pattern looking for specific patterns
-    which result in emitting an assembly directive required for unwinding.  */
- 
- static int
--process_set (FILE *asm_out_file, rtx pat)
-+process_set (FILE *asm_out_file, rtx pat, rtx insn, bool unwind, bool frame)
- {
-   rtx src = SET_SRC (pat);
-   rtx dest = SET_DEST (pat);
-@@ -8009,8 +8065,11 @@ process_set (FILE *asm_out_file, rtx pat
-       /* If this is the final destination for ar.pfs, then this must
- 	 be the alloc in the prologue.  */
-       if (dest_regno == current_frame_info.reg_save_ar_pfs)
--	fprintf (asm_out_file, "\t.save ar.pfs, r%d\n",
--		 ia64_dbx_register_number (dest_regno));
-+	{
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save ar.pfs, r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
-+	}
-       else
- 	{
- 	  /* This must be an alloc before a sibcall.  We must drop the
-@@ -8021,8 +8080,9 @@ process_set (FILE *asm_out_file, rtx pat
- 	     sp" now.  */
- 	  if (current_frame_info.total_size == 0 && !frame_pointer_needed)
- 	    /* if haven't done process_epilogue() yet, do it now */
--	    process_epilogue ();
--	  fprintf (asm_out_file, "\t.prologue\n");
-+	    process_epilogue (asm_out_file, insn, unwind, frame);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.prologue\n");
- 	}
-       return 1;
-     }
-@@ -8038,16 +8098,22 @@ process_set (FILE *asm_out_file, rtx pat
- 	  gcc_assert (op0 == dest && GET_CODE (op1) == CONST_INT);
- 	  
- 	  if (INTVAL (op1) < 0)
--	    fprintf (asm_out_file, "\t.fframe "HOST_WIDE_INT_PRINT_DEC"\n",
--		     -INTVAL (op1));
-+	    {
-+	      gcc_assert (!frame_pointer_needed);
-+	      if (unwind)
-+		fprintf (asm_out_file, "\t.fframe "HOST_WIDE_INT_PRINT_DEC"\n",
-+			 -INTVAL (op1));
-+	      if (frame)
-+		ia64_dwarf2out_def_steady_cfa (insn);
-+	    }
- 	  else
--	    process_epilogue ();
-+	    process_epilogue (asm_out_file, insn, unwind, frame);
- 	}
-       else
- 	{
- 	  gcc_assert (GET_CODE (src) == REG
- 		      && REGNO (src) == HARD_FRAME_POINTER_REGNUM);
--	  process_epilogue ();
-+	  process_epilogue (asm_out_file, insn, unwind, frame);
- 	}
- 
-       return 1;
-@@ -8064,33 +8130,40 @@ process_set (FILE *asm_out_file, rtx pat
- 	case BR_REG (0):
- 	  /* Saving return address pointer.  */
- 	  gcc_assert (dest_regno == current_frame_info.reg_save_b0);
--	  fprintf (asm_out_file, "\t.save rp, r%d\n",
--		   ia64_dbx_register_number (dest_regno));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save rp, r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
- 	  return 1;
- 
- 	case PR_REG (0):
- 	  gcc_assert (dest_regno == current_frame_info.reg_save_pr);
--	  fprintf (asm_out_file, "\t.save pr, r%d\n",
--		   ia64_dbx_register_number (dest_regno));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save pr, r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
- 	  return 1;
- 
- 	case AR_UNAT_REGNUM:
- 	  gcc_assert (dest_regno == current_frame_info.reg_save_ar_unat);
--	  fprintf (asm_out_file, "\t.save ar.unat, r%d\n",
--		   ia64_dbx_register_number (dest_regno));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save ar.unat, r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
- 	  return 1;
- 
- 	case AR_LC_REGNUM:
- 	  gcc_assert (dest_regno == current_frame_info.reg_save_ar_lc);
--	  fprintf (asm_out_file, "\t.save ar.lc, r%d\n",
--		   ia64_dbx_register_number (dest_regno));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save ar.lc, r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
- 	  return 1;
- 
- 	case STACK_POINTER_REGNUM:
- 	  gcc_assert (dest_regno == HARD_FRAME_POINTER_REGNUM
- 		      && frame_pointer_needed);
--	  fprintf (asm_out_file, "\t.vframe r%d\n",
--		   ia64_dbx_register_number (dest_regno));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.vframe r%d\n",
-+		     ia64_dbx_register_number (dest_regno));
-+	  if (frame)
-+	    ia64_dwarf2out_def_steady_cfa (insn);
- 	  return 1;
- 
- 	default:
-@@ -8135,35 +8208,41 @@ process_set (FILE *asm_out_file, rtx pat
- 	{
- 	case BR_REG (0):
- 	  gcc_assert (!current_frame_info.reg_save_b0);
--	  fprintf (asm_out_file, "\t%s rp, %ld\n", saveop, off);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t%s rp, %ld\n", saveop, off);
- 	  return 1;
- 
- 	case PR_REG (0):
- 	  gcc_assert (!current_frame_info.reg_save_pr);
--	  fprintf (asm_out_file, "\t%s pr, %ld\n", saveop, off);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t%s pr, %ld\n", saveop, off);
- 	  return 1;
- 
- 	case AR_LC_REGNUM:
- 	  gcc_assert (!current_frame_info.reg_save_ar_lc);
--	  fprintf (asm_out_file, "\t%s ar.lc, %ld\n", saveop, off);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t%s ar.lc, %ld\n", saveop, off);
- 	  return 1;
- 
- 	case AR_PFS_REGNUM:
- 	  gcc_assert (!current_frame_info.reg_save_ar_pfs);
--	  fprintf (asm_out_file, "\t%s ar.pfs, %ld\n", saveop, off);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t%s ar.pfs, %ld\n", saveop, off);
- 	  return 1;
- 
- 	case AR_UNAT_REGNUM:
- 	  gcc_assert (!current_frame_info.reg_save_ar_unat);
--	  fprintf (asm_out_file, "\t%s ar.unat, %ld\n", saveop, off);
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t%s ar.unat, %ld\n", saveop, off);
- 	  return 1;
- 
- 	case GR_REG (4):
- 	case GR_REG (5):
- 	case GR_REG (6):
- 	case GR_REG (7):
--	  fprintf (asm_out_file, "\t.save.g 0x%x\n",
--		   1 << (src_regno - GR_REG (4)));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save.g 0x%x\n",
-+		     1 << (src_regno - GR_REG (4)));
- 	  return 1;
- 
- 	case BR_REG (1):
-@@ -8171,24 +8250,27 @@ process_set (FILE *asm_out_file, rtx pat
- 	case BR_REG (3):
- 	case BR_REG (4):
- 	case BR_REG (5):
--	  fprintf (asm_out_file, "\t.save.b 0x%x\n",
--		   1 << (src_regno - BR_REG (1)));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save.b 0x%x\n",
-+		     1 << (src_regno - BR_REG (1)));
- 	  return 1;
- 
- 	case FR_REG (2):
- 	case FR_REG (3):
- 	case FR_REG (4):
- 	case FR_REG (5):
--	  fprintf (asm_out_file, "\t.save.f 0x%x\n",
--		   1 << (src_regno - FR_REG (2)));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save.f 0x%x\n",
-+		     1 << (src_regno - FR_REG (2)));
- 	  return 1;
- 
- 	case FR_REG (16): case FR_REG (17): case FR_REG (18): case FR_REG (19):
- 	case FR_REG (20): case FR_REG (21): case FR_REG (22): case FR_REG (23):
- 	case FR_REG (24): case FR_REG (25): case FR_REG (26): case FR_REG (27):
- 	case FR_REG (28): case FR_REG (29): case FR_REG (30): case FR_REG (31):
--	  fprintf (asm_out_file, "\t.save.gf 0x0, 0x%x\n",
--		   1 << (src_regno - FR_REG (12)));
-+	  if (unwind)
-+	    fprintf (asm_out_file, "\t.save.gf 0x0, 0x%x\n",
-+		     1 << (src_regno - FR_REG (12)));
- 	  return 1;
- 
- 	default:
-@@ -8205,8 +8287,11 @@ process_set (FILE *asm_out_file, rtx pat
- void
- process_for_unwind_directive (FILE *asm_out_file, rtx insn)
- {
--  if (flag_unwind_tables
--      || (flag_exceptions && !USING_SJLJ_EXCEPTIONS))
-+  bool unwind = (flag_unwind_tables
-+		 || (flag_exceptions && !USING_SJLJ_EXCEPTIONS));
-+  bool frame = dwarf2out_do_frame ();
-+
-+  if (unwind || frame)
-     {
-       rtx pat;
- 
-@@ -8218,9 +8303,14 @@ process_for_unwind_directive (FILE *asm_
- 	  /* Restore unwind state from immediately before the epilogue.  */
- 	  if (need_copy_state)
- 	    {
--	      fprintf (asm_out_file, "\t.body\n");
--	      fprintf (asm_out_file, "\t.copy_state %d\n",
--		       cfun->machine->state_num);
-+	      if (unwind)
-+		{
-+		  fprintf (asm_out_file, "\t.body\n");
-+		  fprintf (asm_out_file, "\t.copy_state %d\n",
-+			   cfun->machine->state_num);
-+		}
-+	      if (IA64_CHANGE_CFA_IN_EPILOGUE && frame)
-+		ia64_dwarf2out_def_steady_cfa (insn);
- 	      need_copy_state = false;
- 	    }
- 	}
-@@ -8237,7 +8327,7 @@ process_for_unwind_directive (FILE *asm_
-       switch (GET_CODE (pat))
-         {
- 	case SET:
--	  process_set (asm_out_file, pat);
-+	  process_set (asm_out_file, pat, insn, unwind, frame);
- 	  break;
- 
- 	case PARALLEL:
-@@ -8248,7 +8338,7 @@ process_for_unwind_directive (FILE *asm_
- 	      {
- 		rtx x = XVECEXP (pat, 0, par_index);
- 		if (GET_CODE (x) == SET)
--		  process_set (asm_out_file, x);
-+		  process_set (asm_out_file, x, insn, unwind, frame);
- 	      }
- 	    break;
- 	  }
---- gcc/config/ia64/ia64.h.orig	2006-02-03 20:32:11.000000000 -0200
-+++ gcc/config/ia64/ia64.h	2006-02-04 07:41:58.000000000 -0200
-@@ -981,6 +981,12 @@ enum reg_class
-    On some machines it may depend on the data type of the function.  */
- #define FIRST_PARM_OFFSET(FUNDECL) 0
- 
-+/* The CFA is defined as the SP at the call site, so we have to take
-+   into account that the first argument pointer is
-+   STACK_POINTER_OFFSET bytes off the stack pointer.  */
-+#define ARG_POINTER_CFA_OFFSET(FNDECL) \
-+  (FIRST_PARM_OFFSET (FNDECL) - STACK_POINTER_OFFSET)
-+
- /* A C expression whose value is RTL representing the value of the return
-    address for the frame COUNT steps up from the current frame, after the
-    prologue.  */
-@@ -1867,6 +1873,12 @@ do {									\
- 
- #define DWARF2_DEBUGGING_INFO 1
- 
-+/* We do not want call-frame info to be output, since debuggers are
-+   supposed to use the target unwind info.  Leave this undefined it
-+   TARGET_UNWIND_INFO might ever be false.  */
-+
-+#define DWARF2_FRAME_INFO 0
-+
- #define DWARF2_ASM_LINE_DEBUG_INFO (TARGET_DWARF2_ASM)
- 
- /* Use tags for debug info labels, so that they don't break instruction
---- gcc/config/ia64/t-ia64.orig	2006-02-03 20:32:11.000000000 -0200
-+++ gcc/config/ia64/t-ia64	2006-02-04 07:41:58.000000000 -0200
-@@ -50,3 +50,5 @@ ia64-c.o: $(srcdir)/config/ia64/ia64-c.c
- 
- # genattrtab generates very long string literals.
- insn-attrtab.o-warn = -Wno-error
-+
-+ia64.o: debug.h
---- gcc/dwarf2out.c.orig	2006-02-03 20:31:57.000000000 -0200
-+++ gcc/dwarf2out.c	2006-02-04 07:41:59.000000000 -0200
-@@ -90,20 +90,31 @@ static void dwarf2out_source_line (unsig
-    DW_CFA_... = DWARF2 CFA call frame instruction
-    DW_TAG_... = DWARF2 DIE tag */
- 
-+#ifndef DWARF2_FRAME_INFO
-+# ifdef DWARF2_DEBUGGING_INFO
-+#  define DWARF2_FRAME_INFO \
-+  (write_symbols == DWARF2_DEBUG || write_symbols == VMS_AND_DWARF2_DEBUG)
-+# else
-+#  define DWARF2_FRAME_INFO 0
-+# endif
-+#endif
-+
- /* Decide whether we want to emit frame unwind information for the current
-    translation unit.  */
- 
- int
- dwarf2out_do_frame (void)
- {
-+  /* We want to emit correct CFA location expressions or lists, so we
-+     have to return true if we're going to output debug info, even if
-+     we're not going to output frame or unwind info.  */
-   return (write_symbols == DWARF2_DEBUG
- 	  || write_symbols == VMS_AND_DWARF2_DEBUG
--#ifdef DWARF2_FRAME_INFO
- 	  || DWARF2_FRAME_INFO
--#endif
- #ifdef DWARF2_UNWIND_INFO
--	  || flag_unwind_tables
--	  || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS)
-+	  || (DWARF2_UNWIND_INFO
-+	      && (flag_unwind_tables
-+		  || (flag_exceptions && ! USING_SJLJ_EXCEPTIONS)))
- #endif
- 	  );
- }
-@@ -2586,10 +2597,12 @@ dwarf2out_frame_init (void)
-   /* Generate the CFA instructions common to all FDE's.  Do it now for the
-      sake of lookup_cfa.  */
- 
--#ifdef DWARF2_UNWIND_INFO
-   /* On entry, the Canonical Frame Address is at SP.  */
-   dwarf2out_def_cfa (NULL, STACK_POINTER_REGNUM, INCOMING_FRAME_SP_OFFSET);
--  initial_return_save (INCOMING_RETURN_ADDR_RTX);
-+
-+#ifdef DWARF2_UNWIND_INFO
-+  if (DWARF2_UNWIND_INFO)
-+    initial_return_save (INCOMING_RETURN_ADDR_RTX);
- #endif
- }
- 
-@@ -2597,12 +2610,7 @@ void
- dwarf2out_frame_finish (void)
- {
-   /* Output call frame information.  */
--  if (write_symbols == DWARF2_DEBUG
--      || write_symbols == VMS_AND_DWARF2_DEBUG
--#ifdef DWARF2_FRAME_INFO
--      || DWARF2_FRAME_INFO
--#endif
--      )
-+  if (DWARF2_FRAME_INFO)
-     output_call_frame_info (0);
- 
- #ifndef TARGET_UNWIND_INFO
-@@ -10326,7 +10334,6 @@ tree_add_const_value_attribute (dw_die_r
-     add_const_value_attribute (var_die, rtl);
- }
- 
--#ifdef DWARF2_UNWIND_INFO
- /* Convert the CFI instructions for the current function into a location
-    list.  This is used for DW_AT_frame_base when we targeting a dwarf2
-    consumer that does not support the dwarf3 DW_OP_call_frame_cfa.  */
-@@ -10433,7 +10440,6 @@ compute_frame_pointer_to_cfa_displacemen
- 
-   frame_pointer_cfa_offset = -offset;
- }
--#endif
- 
- /* Generate a DW_AT_name attribute given some string value to be included as
-    the value of the attribute.  */
-@@ -11668,7 +11674,6 @@ gen_subprogram_die (tree decl, dw_die_re
-       add_AT_fde_ref (subr_die, DW_AT_MIPS_fde, current_funcdef_fde);
- #endif
- 
--#ifdef DWARF2_UNWIND_INFO
-       /* We define the "frame base" as the function's CFA.  This is more
- 	 convenient for several reasons: (1) It's stable across the prologue
- 	 and epilogue, which makes it better than just a frame pointer,
-@@ -11695,17 +11700,6 @@ gen_subprogram_die (tree decl, dw_die_re
- 	 debugger about.  We'll need to adjust all frame_base references
- 	 by this displacement.  */
-       compute_frame_pointer_to_cfa_displacement ();
--#else
--      /* For targets which support DWARF2, but not DWARF2 call-frame info,
--	 we just use the stack pointer or frame pointer.  */
--      /* ??? Should investigate getting better info via callbacks, or else
--	 by interpreting the IA-64 unwind info.  */
--      {
--	rtx fp_reg
--	  = frame_pointer_needed ? hard_frame_pointer_rtx : stack_pointer_rtx;
--	add_AT_loc (subr_die, DW_AT_frame_base, reg_loc_descriptor (fp_reg));
--      }
--#endif
- 
-       if (cfun->static_chain_decl)
- 	add_AT_location_description (subr_die, DW_AT_static_link,
---- gcc/toplev.c.orig	2006-02-03 20:31:57.000000000 -0200
-+++ gcc/toplev.c	2006-02-04 07:41:59.000000000 -0200
-@@ -1028,7 +1028,7 @@ compile_file (void)
-   /* Do dbx symbols.  */
-   timevar_push (TV_SYMOUT);
- 
--#ifdef DWARF2_UNWIND_INFO
-+#if defined DWARF2_DEBUGGING_INFO || defined DWARF2_UNWIND_INFO
-   if (dwarf2out_do_frame ())
-     dwarf2out_frame_finish ();
- #endif
-@@ -1868,7 +1868,7 @@ lang_dependent_init (const char *name)
-      predefined types.  */
-   timevar_push (TV_SYMOUT);
- 
--#ifdef DWARF2_UNWIND_INFO
-+#if defined DWARF2_DEBUGGING_INFO || defined DWARF2_UNWIND_INFO
-   if (dwarf2out_do_frame ())
-     dwarf2out_frame_init ();
- #endif
---- gcc/config/ia64/unwind-ia64.c.orig	2005-11-17 23:51:49.000000000 -0200
-+++ gcc/config/ia64/unwind-ia64.c	2006-02-04 15:57:42.000000000 -0200
-@@ -2067,7 +2067,7 @@ uw_advance_context (struct _Unwind_Conte
+--- gcc/config/ia64/unwind-ia64.c	(revision 110597)
++++ gcc/config/ia64/unwind-ia64.c	(working copy)
+@@ -2067,7 +2067,7 @@
  }
  
  /* Fill in CONTEXT for top-of-stack.  The only valid registers at this
--   level will be the return address and the CFA.  Note that CFA = SP+16.  */
-+   level will be the return address and the CFA.  */
+-   level will be the return address and the CFA.  */
++   level will be the return address and the CFA.  Note that CFA = SP+16.  */
     
  #define uw_init_context(CONTEXT)					\
    do {									\
-@@ -2083,7 +2083,7 @@ uw_init_context_1 (struct _Unwind_Contex
+@@ -2083,7 +2083,7 @@
  {
    void *rp = __builtin_extract_return_addr (__builtin_return_address (0));
    /* Set psp to the caller's stack pointer.  */
--  void *psp = __builtin_dwarf_cfa () - 16;
-+  void *psp = __builtin_dwarf_cfa ();
+-  void *psp = __builtin_dwarf_cfa ();
++  void *psp = __builtin_dwarf_cfa () - 16;
    _Unwind_FrameState fs;
    unsigned long rnat, tmp1, tmp2;
  
+--- gcc/config/ia64/ia64.h	(revision 110597)
++++ gcc/config/ia64/ia64.h	(working copy)
+@@ -981,11 +981,9 @@
+    On some machines it may depend on the data type of the function.  */
+ #define FIRST_PARM_OFFSET(FUNDECL) 0
+ 
+-/* The CFA is defined as the SP at the call site, so we have to take
+-   into account that the first argument pointer is
+-   STACK_POINTER_OFFSET bytes off the stack pointer.  */
+-#define ARG_POINTER_CFA_OFFSET(FNDECL) \
+-  (FIRST_PARM_OFFSET (FNDECL) - STACK_POINTER_OFFSET)
++/* The CFA is past the red zone, not at the entry-point stack
++   pointer.  */
++#define INCOMING_FRAME_SP_OFFSET STACK_POINTER_OFFSET
+ 
+ /* A C expression whose value is RTL representing the value of the return
+    address for the frame COUNT steps up from the current frame, after the

gcc41-ldbl-default-libstdc++.patch:
 config.h.in                        |    3 +
 config/linker-map.gnu              |   79 +++++++++++++++++++++++-----
 config/locale/generic/c_locale.cc  |    9 ++-
 config/locale/gnu/c_locale.cc      |    9 ++-
 config/os/gnu-linux/ldbl-extra.ver |   19 ++++++
 configure                          |   88 ++++++++++++++++++++++++++++++-
 configure.ac                       |   19 ++++++
 include/bits/locale_facets.h       |   61 +++++++++++++++++++++
 include/bits/locale_facets.tcc     |   82 +++++++++++++++++++++++++----
 include/bits/localefwd.h           |   19 ++++++
 src/Makefile.am                    |   31 +++++++++--
 src/Makefile.in                    |   52 +++++++++++++++---
 src/compatibility-ldbl.cc          |   73 +++++++++++++++++++++++++
 src/compatibility.cc               |  104 ++++++++++++++++++++++++++++++++++++-
 src/complex_io.cc                  |   19 ++++++
 src/istream-inst.cc                |   18 ++++++
 src/limits.cc                      |   33 +++++++++++
 src/locale-inst.cc                 |   50 +++++++++++++++++
 src/locale-misc-inst.cc            |   19 ++++++
 src/locale.cc                      |   41 +++++++++++++-
 src/ostream-inst.cc                |   18 ++++++
 src/wlocale-inst.cc                |   44 +++++++++++++++
 22 files changed, 835 insertions(+), 55 deletions(-)

Index: gcc41-ldbl-default-libstdc++.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-default-libstdc++.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-ldbl-default-libstdc++.patch	4 Feb 2006 14:54:56 -0000	1.2
+++ gcc41-ldbl-default-libstdc++.patch	6 Feb 2006 10:04:21 -0000	1.3
@@ -383,7 +383,7 @@
    extern template class time_put_byname<wchar_t>;
 --- libstdc++-v3/include/bits/localefwd.h.jj	2006-02-04 10:42:42.000000000 +0100
 +++ libstdc++-v3/include/bits/localefwd.h	2006-02-04 10:50:30.000000000 +0100
-@@ -49,6 +49,25 @@
+@@ -49,6 +49,21 @@
  
  namespace std
  {
@@ -402,10 +402,6 @@
 +# define _GLIBCXX_END_LDBL_NAMESPACE
 +#endif
 +
-+    // 22.1.1 Locale
-+    class locale;
-+  
-+
    // 22.1.1 Locale
    class locale;
  

gcc41-ldbl-default.patch:
 config.gcc                          |   10 ++++----
 config.in                           |    6 +++++
 config/alpha/alpha.c                |    5 ++++
 config/alpha/libgcc-alpha-ldbl.ver  |   32 ++++++++++++++++++++++++++
 config/alpha/t-linux                |    1 
 config/rs6000/linux.h               |    5 ++++
 config/rs6000/linux64.h             |    5 ++++
 config/s390/s390.c                  |    5 ++++
 config/s390/t-linux                 |    3 ++
 config/s390/t-linux64               |    4 ---
 config/sparc/libgcc-sparc-glibc.ver |   33 +++++++++++++++++++++++++++
 config/sparc/linux.h                |   27 +++++++++++-----------
 config/sparc/linux64.h              |   41 +++++++++++++++-------------------
 config/sparc/sparc.c                |    5 ++++
 config/sparc/t-linux                |    5 ++++
 config/sparc/t-linux64              |    6 -----
 configure                           |   43 +++++++++++++++++++++++++++++++++++-
 configure.ac                        |   33 +++++++++++++++++++++++++++
 18 files changed, 217 insertions(+), 52 deletions(-)

Index: gcc41-ldbl-default.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ldbl-default.patch	4 Feb 2006 12:42:09 -0000	1.1
+++ gcc41-ldbl-default.patch	6 Feb 2006 10:04:21 -0000	1.2
@@ -1,3 +1,23 @@
+2006-02-05  Jakub Jelinek  <jakub at redhat.com>
+
+	* config.gcc (s390-*-linux*): Add s390/t-linux to tmake_file.
+	(s390x-*-linux*): Likewise.
+	* config/s390/t-linux64 (SHLIB_MAPFILES): Removed.
+	* config/s390/t-linux: New file.
+
+	* config.gcc (sparc-*-linux*): Add sparc/t-linux to tmake_file.
+	(sparc64-*-linux*): Likewise.
+	* config/sparc/t-linux64 (SHLIB_MAPFILES): Removed.
+	* config/sparc/t-linux: New file.
+	* config/sparc/libgcc-sparc-glibc.ver (__fixtfdi, __fixunstfdi,
+	__floatditf): Export at GCC_LDBL_3.0 if -m32 -mlong-double-128.
+	(__divtc3, __multc3, __powitf2): Export at GCC_LDBL_4.0.0 if
+	-m32 -mlong-double-128.
+
+	* config.gcc (alpha*-*-linux*): Add alpha/t-linux to tmake_file.
+	* config/alpha/t-linux: New file.
+	* config/alpha/libgcc-alpha-ldbl.ver: New file.
+
 2006-02-04  Jakub Jelinek  <jakub at redhat.com>
 
 	* config/sparc/linux.h (TARGET_OS_CPP_BUILTINS): Define
@@ -317,3 +337,167 @@
  /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
     the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
     provides part of the support for getting C++ file-scope static
+--- gcc/config.gcc.jj	2006-02-04 09:38:33.000000000 +0100
++++ gcc/config.gcc	2006-02-05 22:00:25.000000000 +0100
+@@ -568,7 +568,7 @@ alpha*-*-unicosmk*)
+ alpha*-*-linux*)
+ 	tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
+ 	target_cpu_default="MASK_GAS"
+-	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
++	tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
+ 	;;
+ alpha*-*-gnu*)
+ 	target_cpu_default="MASK_GAS"
+@@ -1864,7 +1864,7 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-ai
+ 	;;
+ s390-*-linux*)
+ 	tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
+-	tmake_file="${tmake_file} s390/t-crtstuff"
++	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux"
+ 	;;
+ s390x-*-linux*)
+ 	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
+@@ -1872,7 +1872,7 @@ s390x-*-linux*)
+ 	md_file=s390/s390.md
+ 	extra_modes=s390/s390-modes.def
+ 	out_file=s390/s390.c
+-	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux64"
++	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux s390/t-linux64"
+ 	;;
+ s390x-ibm-tpf*)
+         tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+@@ -2059,7 +2059,7 @@ sparc-*-elf*)
+ sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+-	tmake_file="${tmake_file} sparc/t-crtfm"
++	tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
+ 	;;
+ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
+@@ -2178,7 +2178,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
+ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+-	tmake_file="${tmake_file} sparc/t-linux64 sparc/t-crtfm"
++	tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
+ 	;;
+ sparc64-*-netbsd*)
+ 	tm_file="sparc/biarch64.h ${tm_file}"
+--- gcc/config/alpha/libgcc-alpha-ldbl.ver.jj	2006-02-05 21:57:55.000000000 +0100
++++ gcc/config/alpha/libgcc-alpha-ldbl.ver	2006-02-05 21:58:59.000000000 +0100
+@@ -0,0 +1,32 @@
++%ifdef __LONG_DOUBLE_128__
++
++# long double 128 bit support in libgcc_s.so.1 is only available
++# when configured with --with-long-double-128.  Make sure all the
++# symbols are available at @@GCC_LDBL_* versions to make it clear
++# there is a configurable symbol set.
++
++%exclude {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%inherit GCC_LDBL_3.0 GCC_3.0
++GCC_LDBL_3.0 {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++}
++
++%inherit GCC_LDBL_4.0.0 GCC_4.0.0
++GCC_LDBL_4.0.0 {
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%endif
+--- gcc/config/alpha/t-linux.jj	2006-02-05 21:57:01.000000000 +0100
++++ gcc/config/alpha/t-linux	2006-02-05 21:59:40.000000000 +0100
+@@ -0,0 +1 @@
++SHLIB_MAPFILES += $(srcdir)/config/alpha/libgcc-alpha-ldbl.ver
+--- gcc/config/sparc/t-linux64.jj	2006-01-28 00:43:01.000000000 +0100
++++ gcc/config/sparc/t-linux64	2006-02-05 20:40:45.000000000 +0100
+@@ -8,12 +8,6 @@ INSTALL_LIBGCC = install-multilib
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
+ 	crtfastmath.o
+ 
+-# Override t-slibgcc-elf-ver to export some libgcc symbols with
+-# the symbol versions that glibc used.
+-# Avoid the t-linux version file.
+-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
+-		 $(srcdir)/config/sparc/libgcc-sparc-glibc.ver
+-
+ CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
+ 				 -print-multi-os-directory) \
+ 			= x../lib64; then echo -mcmodel=medany; fi`
+--- gcc/config/sparc/libgcc-sparc-glibc.ver.jj	2006-01-28 00:43:01.000000000 +0100
++++ gcc/config/sparc/libgcc-sparc-glibc.ver	2006-02-05 21:03:43.000000000 +0100
+@@ -26,3 +26,36 @@ GLIBC_VER {
+   __frame_state_for
+   __register_frame_info_table
+ }
++
++%if !defined (__arch64__) && defined (__LONG_DOUBLE_128__)
++
++# long double 128 bit support from 32-bit libgcc_s.so.1 is only available
++# when configured with --with-long-double-128.  Make sure all the
++# symbols are available at @@GCC_LDBL_* versions to make it clear
++# there is a configurable symbol set.
++
++%exclude {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%inherit GCC_LDBL_3.0 GCC_3.0
++GCC_LDBL_3.0 {
++  __fixtfdi
++  __fixunstfdi
++  __floatditf
++}
++
++%inherit GCC_LDBL_4.0.0 GCC_4.0.0
++GCC_LDBL_4.0.0 {
++  __divtc3
++  __multc3
++  __powitf2
++}
++
++%endif
+--- gcc/config/sparc/t-linux.jj	2006-02-05 20:40:20.000000000 +0100
++++ gcc/config/sparc/t-linux	2006-02-05 20:40:55.000000000 +0100
+@@ -0,0 +1,5 @@
++# Override t-slibgcc-elf-ver to export some libgcc symbols with
++# the symbol versions that glibc used.
++# Avoid the t-linux version file.
++SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
++		 $(srcdir)/config/sparc/libgcc-sparc-glibc.ver
+--- gcc/config/s390/t-linux64.jj	2006-01-28 00:42:59.000000000 +0100
++++ gcc/config/s390/t-linux64	2006-02-05 20:51:34.000000000 +0100
+@@ -6,7 +6,3 @@ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+-
+-# Override t-slibgcc-elf-ver to export some libgcc symbols with
+-# the symbol versions that glibc used.
+-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver
+--- gcc/config/s390/t-linux.jj	2006-02-05 20:51:18.000000000 +0100
++++ gcc/config/s390/t-linux	2006-02-05 20:51:25.000000000 +0100
+@@ -0,0 +1,3 @@
++# Override t-slibgcc-elf-ver to export some libgcc symbols with
++# the symbol versions that glibc used.
++SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gcc41.spec	4 Feb 2006 21:37:11 -0000	1.28
+++ gcc41.spec	6 Feb 2006 10:04:21 -0000	1.29
@@ -1,6 +1,6 @@
-%define DATE 20060204
+%define DATE 20060206
 %define gcc_version 4.1.0
-%define gcc_release 0.22
+%define gcc_release 0.23
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -40,6 +40,10 @@
 # Make sure pthread.h doesn't contain __thread tokens
 # Make sure glibc supports stack protector
 BuildRequires: glibc-devel >= 2.3.90-2
+%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
+# Make sure glibc supports TFmode long double
+BuildRequires: glibc >= 2.3.90-35
+%endif
 %ifarch %{multilib_64_archs} sparc ppc
 # 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
@@ -60,6 +64,10 @@
 # Make sure gdb will understand DW_FORM_strp
 Conflicts: gdb < 5.1-2
 Requires: glibc-devel >= 2.2.90-12
+%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha
+# Make sure glibc supports TFmode long double
+Requires: glibc >= 2.3.90-35
+%endif
 Requires: libgcc >= %{version}-%{release}
 Requires: libgomp = %{version}-%{release}
 Obsoletes: gcc3
@@ -98,6 +106,7 @@
 Patch17: gcc41-ldbl-default-libstdc++.patch
 Patch18: gcc41-sparc64-g7.patch
 Patch19: gcc41-java-rh179070.patch
+Patch20: gcc41-fortran-where.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -285,6 +294,7 @@
 BuildRequires: libart_lgpl-devel >= 2.1.0
 BuildRequires: alsa-lib-devel
 BuildRequires: libXtst-devel
+BuildRequires: libXt-devel
 Obsoletes: gcc-libgcj
 Obsoletes: libgcj3
 Obsoletes: libgcj34
@@ -447,6 +457,7 @@
 %patch17 -p0 -b .ldbl-default-libstdc++~
 %patch18 -p0 -b .sparc64-g7~
 %patch19 -p0 -b .java-rh179070~
+%patch20 -p0 -b .fortran-where~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1538,6 +1549,18 @@
 %endif
 
 %changelog
+* Mon Feb  6 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.23
+- update from gcc-4_1-branch (-r110582:110632)
+  - PRs classpath/24618, classpath/25141, classpath/25727, fortran/25046,
+	fortran/26039
+- use LOGICAL*1 instead of LOGICAL*4 for Fortran where temporary masks
+  (Roger Sayle)
+- fix symbol versions in s390 libgcc_s.so.1
+- sparc32 and alpha long double fixes
+- BuildRequires libXt-devel
+- BuildRequires and Requires glibc-devel >= 2.3.90-35 on arches
+  that are switching long double
+
 * Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.22
 - fix ia64 debug info patch
 - fix libjava pthread_create wrapper patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- sources	4 Feb 2006 13:20:06 -0000	1.132
+++ sources	6 Feb 2006 10:04:21 -0000	1.133
@@ -1 +1 @@
-2e427016398ab59b9966cd7acb4fcc31  gcc-4.1.0-20060204.tar.bz2
+2411c297b2de7b306228701906031c10  gcc-4.1.0-20060206.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 10:28:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 05:28:00 -0500
Subject: rpms/autoconf/devel autoconf-2.59-intrinsic.patch, NONE,
	1.1 autoconf.spec, 1.18, 1.19
Message-ID: <200602061028.k16AS04j007762@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7745

Modified Files:
	autoconf.spec 
Added Files:
	autoconf-2.59-intrinsic.patch 
Log Message:
- check for Xlib.h instead of Intrinsic.h to find X11 headers
  (#176379)


autoconf-2.59-intrinsic.patch:
 libs.m4 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE autoconf-2.59-intrinsic.patch ---
diff -urN autoconf-2.59/lib/autoconf/libs.m4 autoconf-2.59_new/lib/autoconf/libs.m4
--- autoconf-2.59/lib/autoconf/libs.m4	2003-05-22 14:05:13.000000000 +0200
+++ autoconf-2.59_new/lib/autoconf/libs.m4	2006-02-06 10:17:56.000000000 +0100
@@ -259,13 +259,13 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Xlib.h>])],
 [# We can compile using X headers with no special include directory.
 ac_x_includes=],
 [for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -278,8 +278,8 @@
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
-				  [XtMalloc (0)])],
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
+				  [XrmInitialize (0)])],
 		 [LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=],


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- autoconf.spec	9 Dec 2005 22:39:42 -0000	1.18
+++ autoconf.spec	6 Feb 2006 10:27:58 -0000	1.19
@@ -1,10 +1,11 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release: 5.1
+Release:    6
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
+Patch0:     autoconf-2.59-intrinsic.patch
 URL:		http://www.gnu.org/software/autoconf/
 BuildRequires:	sed, m4, emacs
 Prereq(post,preun):	/sbin/install-info
@@ -30,10 +31,13 @@
 
 %prep
 %setup -q -n autoconf-%{version}
+%patch0 -p1
 
 %build
 %configure
 make
+
+%check
 make check || make check VERBOSE=yes
 
 %install
@@ -65,6 +69,10 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Mon Feb 06 2006 Karsten Hopp <karsten at redhat.de> 2.59-6
+- check for Xlib.h instead of Intrinsic.h to find X11 headers
+  (#176379)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 10:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 05:45:50 -0500
Subject: rpms/gcc/devel gcc41-ia64-frame-base-loclist.patch,1.3,1.4
Message-ID: <200602061045.k16Ajox3012355@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10861

Modified Files:
	gcc41-ia64-frame-base-loclist.patch 
Log Message:
4.1.0-0.23


gcc41-ia64-frame-base-loclist.patch:
 0 files changed

Index: gcc41-ia64-frame-base-loclist.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ia64-frame-base-loclist.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-ia64-frame-base-loclist.patch	6 Feb 2006 10:04:21 -0000	1.3
+++ gcc41-ia64-frame-base-loclist.patch	6 Feb 2006 10:45:47 -0000	1.4
@@ -27,7 +27,7 @@
  
 --- gcc/config/ia64/ia64.h	(revision 110597)
 +++ gcc/config/ia64/ia64.h	(working copy)
-@@ -981,11 +981,9 @@
+@@ -981,12 +981,6 @@ enum reg_class
     On some machines it may depend on the data type of the function.  */
  #define FIRST_PARM_OFFSET(FUNDECL) 0
  
@@ -36,9 +36,18 @@
 -   STACK_POINTER_OFFSET bytes off the stack pointer.  */
 -#define ARG_POINTER_CFA_OFFSET(FNDECL) \
 -  (FIRST_PARM_OFFSET (FNDECL) - STACK_POINTER_OFFSET)
+-
+ /* A C expression whose value is RTL representing the value of the return
+    address for the frame COUNT steps up from the current frame, after the
+    prologue.  */
+@@ -1022,7 +1016,9 @@ enum reg_class
+    beginning of any function, before the prologue.  The top of the frame is
+    defined to be the value of the stack pointer in the previous frame, just
+    before the call instruction.  */
+-#define INCOMING_FRAME_SP_OFFSET 0
 +/* The CFA is past the red zone, not at the entry-point stack
 +   pointer.  */
 +#define INCOMING_FRAME_SP_OFFSET STACK_POINTER_OFFSET
  
- /* A C expression whose value is RTL representing the value of the return
-    address for the frame COUNT steps up from the current frame, after the
+ 
+ /* Register That Address the Stack Frame.  */



From fedora-cvs-commits at redhat.com  Mon Feb  6 11:17:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 06:17:49 -0500
Subject: rpms/tar/devel tar-1.15.1-vfatTruncate.patch, NONE, 1.1 tar.spec,
	1.28, 1.29
Message-ID: <200602061117.k16BHnvg016158@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16053

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.1-vfatTruncate.patch 
Log Message:
fix extracting sparse files to a filesystem like vfat,
when ftruncate may fail to grow the size of a file.(#179507)


tar-1.15.1-vfatTruncate.patch:
 system.c |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletion(-)

--- NEW FILE tar-1.15.1-vfatTruncate.patch ---
--- tar-1.15.1/src/system.c.vfatTruncate	2004-09-06 07:31:00.000000000 -0400
+++ tar-1.15.1/src/system.c	2006-02-03 14:40:51.000000000 -0500
@@ -272,8 +272,25 @@
 int
 sys_truncate (int fd)
 {
+  struct stat st;
   off_t pos = lseek (fd, (off_t) 0, SEEK_CUR);
-  return pos < 0 ? -1 : ftruncate (fd, pos);
+
+  if ( pos < 0) 
+    return -1;
+
+  if ( ftruncate(fd, pos) && errno == EPERM ) {
+    /* wrapper around ftruncate:
+     * ftruncate may fail to grow the size of a file with some OS and filesystem
+     * combinations. Linux and vfat/fat is one example. If this is the case do
+     * a write to grow the file to the desired length.
+     */
+    if( (fstat( fd, &st ) == -1) || 
+        (st.st_size >= pos)  ||
+        (lseek( fd, pos - 1, SEEK_SET) == (off_t)-1) ||
+        (write( fd, "\0", 1) == -1) )
+	return -1;
+  }
+  return 0;
 }
 
 /* Return nonzero if NAME is the name of a regular file, or if the file


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tar.spec	9 Dec 2005 22:43:31 -0000	1.28
+++ tar.spec	6 Feb 2006 11:17:45 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 11.1
+Release: 12
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -16,6 +16,7 @@
 Patch12: tar-1.15.1-sparseTotals.patch
 Patch13: tar-1.15.1-newerOption.patch
 Patch14: tar-1.15.1-padCorrectly.patch
+Patch15: tar-1.15.1-vfatTruncate.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -43,6 +44,7 @@
 %patch12 -p1 -b .sparseTotals
 %patch13 -p1 -b .newerOption
 %patch14 -p1 -b .padCorrectly
+%patch15 -p1 -b .vfatTruncate
 
 %build
 
@@ -113,6 +115,10 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Feb 06 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-12
+- fix extracting sparse files to a filesystem like vfat,
+  when ftruncate may fail to grow the size of a file.(#179507)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 11:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 06:43:03 -0500
Subject: rpms/unzip/devel unzip-5.52-long-filename.patch, NONE,
	1.1 unzip-5.52-near-4GB2.patch, NONE, 1.1 unzip.spec, 1.28, 1.29
Message-ID: <200602061143.k16Bh3Gc025787@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/unzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25585

Modified Files:
	unzip.spec 
Added Files:
	unzip-5.52-long-filename.patch unzip-5.52-near-4GB2.patch 
Log Message:
- fix bug 180078 - unzip -l causing error
- fix CVE-2005-4667 - unzip long file name buffer overflow



unzip-5.52-long-filename.patch:
 fileio.c  |    8 +++++++-
 process.c |    8 ++++----
 unzpriv.h |   18 ++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

--- NEW FILE unzip-5.52-long-filename.patch ---
--- unzip-5.52/process.c.pom3	2006-02-06 10:29:02.630237064 +0100
+++ unzip-5.52/process.c	2006-02-06 10:29:02.650234024 +0100
@@ -576,16 +576,16 @@
         if (lastchance && (uO.qflag < 3)) {
 #if defined(UNIX) || defined(QDOS)
             if (G.no_ecrec)
-                Info(slide, 1, ((char *)slide,
+                Info2(slide, 1, ((char *)slide, WSIZE, 
                   LoadFarString(CannotFindZipfileDirMsg), uO.zipinfo_mode?
                   LoadFarStringSmall(Zipnfo) : LoadFarStringSmall(Unzip),
                   G.wildzipfn, uO.zipinfo_mode? "  " : "", G.wildzipfn,
-                  G.zipfn));
+                  G.zipfn),WSIZE);
             else
-                Info(slide, 1, ((char *)slide,
+                Info2(slide, 1, ((char *)slide, WSIZE, 
                   LoadFarString(CannotFindEitherZipfile), uO.zipinfo_mode?
                   LoadFarStringSmall(Zipnfo) : LoadFarStringSmall(Unzip),
-                  G.wildzipfn, G.wildzipfn, G.zipfn));
+                  G.wildzipfn, G.wildzipfn, G.zipfn), WSIZE);
 #else /* !(UNIX || QDOS) */
             if (G.no_ecrec)
                 Info(slide, 0x401, ((char *)slide,
--- unzip-5.52/fileio.c.pom3	2006-02-06 10:29:02.000000000 +0100
+++ unzip-5.52/fileio.c	2006-02-06 10:30:59.755431328 +0100
@@ -1188,8 +1188,14 @@
 
 #endif /* !VMS */
 
+/****************/
+/* Function min */
+/****************/
 
-
+int min (int val_i, int val_j)
+{
+  return (val_i>val_j?val_j:val_i);
+}
 
 
 /*****************************/
--- unzip-5.52/unzpriv.h.pom3	2006-02-06 10:29:02.625237824 +0100
+++ unzip-5.52/unzpriv.h	2006-02-06 10:31:45.538471248 +0100
@@ -2286,6 +2286,24 @@
 #  endif
 #endif /* !Info */
 
+#ifndef Info2   /* may already have been defined for redirection */
+#  ifdef FUNZIP
+#    define Info2(buf,flag,sprf_arg,size) \
+     fprintf((flag)&1? stderr : stdout, (char *)(sprintf sprf_arg, (buf)))
+#  else
+#    ifdef INT_SPRINTF  /* optimized version for "int sprintf()" flavour */
+#      define Info2(buf,flag,sprf_arg,size) \
+       (*G.message)((zvoid *)&G, (uch *)(buf), (ulg) min(snprintf sprf_arg, (int) size), (flag))
+#    else          /* generic version, does not use sprintf() return value */
+#      define Info2(buf,flag,sprf_arg,size) \
+       (*G.message)((zvoid *)&G, (uch *)(buf), \
+            (ulg)(sprintf sprf_arg, strlen((char *)(buf))), (flag))
+#    endif
+#  endif
+#endif /* !Info */
+
+
+
 /*  The following macro wrappers around the fnfilter function are used many
  *  times to prepare archive entry names or name components for displaying
  *  listings and (warning/error) messages. They use sections in the upper half

unzip-5.52-near-4GB2.patch:
 list.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE unzip-5.52-near-4GB2.patch ---
--- unzip-5.52/list.c.pom	2006-02-06 09:39:47.622466528 +0100
+++ unzip-5.52/list.c	2006-02-06 09:57:00.813397632 +0100
@@ -76,7 +76,7 @@
    static ZCONST char Far ShortHdrStats[] =
      "%9lu  %02u%c%02u%c%02u %02u:%02u  %c";
    static ZCONST char Far ShortFileTrailer[] = " --------       \
-            -------\n%9lu                   %lu file%s\n";
+            -------\n%9ju                   %lu file%s\n";
 #endif /* ?OS2_EAS */
 #endif /* !WINDLL */
 


Index: unzip.spec
===================================================================
RCS file: /cvs/dist/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- unzip.spec	22 Dec 2005 13:58:12 -0000	1.28
+++ unzip.spec	6 Feb 2006 11:43:00 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files.
 Name: unzip
 Version: 5.52
-Release: 1
+Release: 2
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz
@@ -10,6 +10,8 @@
 Patch3: unzip-5.51-link-segv2.patch
 Patch6: unzip-5.52-toctou.patch
 Patch7: unzip-5.52-near-4GB.patch
+Patch8: unzip-5.52-near-4GB2.patch
+Patch9: unzip-5.52-long-filename.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -31,6 +33,8 @@
 %patch3 -p1 -b .morn
 %patch6 -p1 -b .toctou
 %patch7 -p1 -b .4GB
+%patch8 -p1 -b .4GB2
+%patch9 -p1 -b .lfn
 ln -s unix/Makefile Makefile
 
 %build
@@ -51,7 +55,11 @@
 %{_mandir}/*/*
 
 %changelog
-* Thu Dec 22 2005 Ivana Varekova <vraekova at redhat.com> 5.52-1
+* Mon Feb  6 2006 Ivana Varekova <varekova at redhat.com> 5.52-2
+- fix bug 180078 - unzip -l causing error
+- fix CVE-2005-4667 - unzip long file name buffer overflow
+
+* Thu Dec 22 2005 Ivana Varekova <varekova at redhat.com> 5.52-1
 - update to 5.52
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Feb  6 12:07:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 07:07:09 -0500
Subject: rpms/planner/devel planner-0.13-enableeds.patch, NONE,
	1.1 planner.spec, 1.17, 1.18
Message-ID: <200602061207.k16C79Eq014468@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14438

Modified Files:
	planner.spec 
Added Files:
	planner-0.13-enableeds.patch 
Log Message:
rh#179781# enable eds plugins

planner-0.13-enableeds.patch:
 configure.in |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE planner-0.13-enableeds.patch ---
--- planner-0.13/configure.in.eds	2006-02-06 09:50:51.000000000 +0000
+++ planner-0.13/configure.in	2006-02-06 09:51:11.000000000 +0000
@@ -258,7 +258,7 @@
 if test "x$enable_eds_backend" = "xyes" ; then
     EDS_REQUIRED=1.1.0 
     EDS_PACKAGE=1.2
-    EVOLUTION_PACKAGE=2.2
+    EVOLUTION_PACKAGE=2.6
     EVOLUTION_REQUIRED=2.1.3
     PKG_CHECK_MODULES(EDS_BACKEND, 
     [
@@ -267,9 +267,11 @@
     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
     		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
     ])
-    extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
+    extensiondir="\${libdir}/evolution-data-server-$EDS_PACKAGE/extensions"
+#    extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
     AC_SUBST(extensiondir)
-    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
+    plugindir="\${libdir}/evolution/$EVOLUTION_PACKAGE/plugins"
+#    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
     AC_SUBST(plugindir)
     use_eds_backend=yes
 else


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- planner.spec	9 Dec 2005 22:42:44 -0000	1.17
+++ planner.spec	6 Feb 2006 12:06:59 -0000	1.18
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release: 2.1
+Release:   3
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -28,7 +28,7 @@
 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
+BuildRequires: scrollkeeper, glib2-devel, evolution-data-server
 
 
 ##################################
@@ -39,6 +39,7 @@
 Source0: %{name}-%{version}.tar.bz2
 
 Patch0: planner-0.12-desktop-fix.patch
+Patch1: planner-0.13-enableeds.patch
 
 
 ##################################
@@ -62,6 +63,15 @@
 This package provides the necessary development libraries and include
 files to allow you to develop with planner.
 
+%package eds
+Summary: planner integration with evolution
+Group: Applications/Productivity
+Requires: %{name} = %{version}
+
+%description eds
+This package provides a plugin to integration planner and evolution
+
+
 ##################################
 # Prep/Setup
 ##################################
@@ -69,6 +79,7 @@
 %setup0 -q
 
 %patch0 -p1 -b .desktop-fix
+%patch1 -p1 -b .enableeds
 
 ##################################
 # Build
@@ -80,7 +91,7 @@
 intltoolize --force
 libtoolize --force
 autoconf
-%configure --enable-python --enable-gtk-doc --disable-dotnet --disable-update-mimedb
+%configure --enable-python --enable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend
 
 make
 
@@ -104,9 +115,12 @@
 /bin/rm -f %{buildroot}/%{_libdir}/%{name}/storage-modules/*.la
 /bin/rm -f %{buildroot}/%{_libdir}/%{name}/plugins/*.la
 /bin/rm -f %{buildroot}/%{_libdir}/%{name}/views/*.la
+/bin/rm -f %{buildroot}/%{_libdir}/%{name}/*.la
 /bin/rm -f %{buildroot}/%{_libdir}/python*/site-packages/gtk-2.0/*.la
 /bin/rm -f %{buildroot}/%{_libdir}/%{name}/storage-modules/libstorage-sql*
 /bin/rm -f %{buildroot}/%{_libdir}/%{name}/plugins/libsql-plugin*
+/bin/rm -f %{buildroot}/%{_libdir}/evolution-data-server-1.2/extensions/*.la
+/bin/rm -f %{buildroot}/%{_libdir}/evolution/2.6/plugins/*.la
 
 /bin/rm -f %{buildroot}/%{_datadir}/mime/XMLnamespaces
 /bin/rm -f %{buildroot}/%{_datadir}/mime/globs
@@ -152,7 +166,15 @@
 %defattr(-,root,root)
 %doc ChangeLog NEWS README COPYING
 %{_bindir}/%{name}
-%{_libdir}/%{name}
+%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/*
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
@@ -167,7 +189,19 @@
 %{_datadir}/gtk-doc/html/lib%{name}
 %{_datadir}/gnome/help/%{name}/*
 %{_datadir}/omf/%{name}/%{name}-C.omf
-%{_datadir}/doc/%{name}/sample-*.%{name}
+
+%files eds
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/libeds-plugin.so
+%dir %{_libdir}/evolution-data-server-1.2
+%dir %{_libdir}/evolution-data-server-1.2/extensions
+%{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.*
+%dir %{_libdir}/evolution
+%dir %{_libdir}/evolution/2.6
+%dir %{_libdir}/evolution/2.6/plugins
+%{_libdir}/evolution/2.6/plugins/liborg-gnome-planner-source.so
+%{_libdir}/evolution/2.6/plugins/org-gnome-planner-source.eplug
 
 %files devel
 %defattr(-,root,root)
@@ -178,6 +212,9 @@
 # Changelog
 ##################################
 %changelog
+* Mon Feb 06 2006 Caolan McNamara <caolanm at redhat.com> - 0.13-3
+- rh#179781# add evolution data server plugin
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 12:45:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 07:45:34 -0500
Subject: rpms/unzip/FC-4 unzip-5.51-long-filename.patch, NONE, 1.1 unzip.spec,
	1.27, 1.28
Message-ID: <200602061245.k16CjYdH028921@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	unzip.spec 
Added Files:
	unzip-5.51-long-filename.patch 
Log Message:
- fix bug 178961 - CVE-2005-4667 - unzip long file name buffer overflow


unzip-5.51-long-filename.patch:
 fileio.c    |    8 +++++++-
 process.c   |    8 ++++----
 unix/unix.c |    2 +-
 unzpriv.h   |   18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

--- NEW FILE unzip-5.51-long-filename.patch ---
--- unzip-5.51/unix/unix.c.lfn	2006-02-06 13:26:43.000000000 +0100
+++ unzip-5.51/unix/unix.c	2006-02-06 13:26:43.187291080 +0100
@@ -186,7 +186,7 @@
         G.notfirstcall = TRUE;
 
         if (!iswild(wildspec)) {
-            strcpy(G.matchname, wildspec);
+            strncpy(G.matchname, wildspec,FILNAMSIZ);
             G.have_dirname = FALSE;
             G.wild_dir = NULL;
             return G.matchname;
--- unzip-5.51/fileio.c.lfn	2006-02-06 13:26:43.156295792 +0100
+++ unzip-5.51/fileio.c	2006-02-06 13:26:43.176292752 +0100
@@ -1188,8 +1188,14 @@
 
 #endif /* !VMS */
 
+/****************/
+/* Function min */
+/****************/
 
-
+int min (int val_i, int val_j)
+{
+  return (val_i>val_j?val_j:val_i);
+}
 
 
 /*****************************/
--- unzip-5.51/unzpriv.h.lfn	2006-02-06 13:26:43.128300048 +0100
+++ unzip-5.51/unzpriv.h	2006-02-06 13:26:43.178292448 +0100
@@ -2243,6 +2243,24 @@
 #  endif
 #endif /* !Info */
 
+#ifndef Info2   /* may already have been defined for redirection */
+#  ifdef FUNZIP
+#    define Info2(buf,flag,sprf_arg,size) \
+     fprintf((flag)&1? stderr : stdout, (char *)(sprintf sprf_arg, (buf)))
+#  else
+#    ifdef INT_SPRINTF  /* optimized version for "int sprintf()" flavour */
+#      define Info2(buf,flag,sprf_arg,size) \
+       (*G.message)((zvoid *)&G, (uch *)(buf), (ulg) min(snprintf sprf_arg, (int) size), (flag))
+#    else          /* generic version, does not use sprintf() return value */
+#      define Info2(buf,flag,sprf_arg,size) \
+       (*G.message)((zvoid *)&G, (uch *)(buf), \
+            (ulg)(sprintf sprf_arg, strlen((char *)(buf))), (flag))
+#    endif
+#  endif
+#endif /* !Info */
+
+
+
 /*  The following macro wrappers around the fnfilter function are used many
  *  times to prepare archive entry names or name components for displaying
  *  listings and (warning/error) messages. They use sections in the upper half
--- unzip-5.51/process.c.lfn	2006-02-06 13:26:43.126300352 +0100
+++ unzip-5.51/process.c	2006-02-06 13:26:43.175292904 +0100
@@ -576,16 +576,16 @@
         if (lastchance && (uO.qflag < 3)) {
 #if defined(UNIX) || defined(QDOS)
             if (G.no_ecrec)
-                Info(slide, 1, ((char *)slide,
+                Info2(slide, 1, ((char *)slide, WSIZE, 
                   LoadFarString(CannotFindZipfileDirMsg), uO.zipinfo_mode?
                   LoadFarStringSmall(Zipnfo) : LoadFarStringSmall(Unzip),
                   G.wildzipfn, uO.zipinfo_mode? "  " : "", G.wildzipfn,
-                  G.zipfn));
+                  G.zipfn),WSIZE);
             else
-                Info(slide, 1, ((char *)slide,
+                Info2(slide, 1, ((char *)slide, WSIZE, 
                   LoadFarString(CannotFindEitherZipfile), uO.zipinfo_mode?
                   LoadFarStringSmall(Zipnfo) : LoadFarStringSmall(Unzip),
-                  G.wildzipfn, G.wildzipfn, G.zipfn));
+                  G.wildzipfn, G.wildzipfn, G.zipfn), WSIZE);
 #else /* !(UNIX || QDOS) */
             if (G.no_ecrec)
                 Info(slide, 0x401, ((char *)slide,


Index: unzip.spec
===================================================================
RCS file: /cvs/dist/rpms/unzip/FC-4/unzip.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- unzip.spec	3 Aug 2005 14:04:59 -0000	1.27
+++ unzip.spec	6 Feb 2006 12:45:30 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files.
 Name: unzip
 Version: 5.51
-Release: 12.fc4
+Release: 13.fc4
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip551.tar.gz
@@ -11,6 +11,7 @@
 Patch3: unzip-5.51-link-segv2.patch
 Patch4: unzip-5.51-link-segv3.patch
 Patch5: unzip-5.51-toctou.patch
+Patch6: unzip-5.51-long-filename.patch
 URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -33,6 +34,7 @@
 %patch3 -p1 -b .morn
 %patch4 -p1 -b .morn2
 %patch5 -p1 -b .toctou
+%patch6 -p1 -b .lfn
 ln -s unix/Makefile Makefile
 
 %build
@@ -53,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Feb  6 2006 Ivana Varekova <varekova at redhat.com> 5.51-13.fc4
+- fix bug 178961 - CVE-2005-4667 - unzip long file name buffer overflow
+
 * Wed Aug  3 2005 Ivana Varekova <varekova at redhat.com> 5.51-12.fc4
 - fix bug 164928 - TOCTOU issue in unzip
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 13:47:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 08:47:27 -0500
Subject: rpms/OpenIPMI/devel .cvsignore, 1.4,
	1.5 OpenIPMI-1.4.14-warnings.patch, 1.1, 1.2 OpenIPMI.spec,
	1.24, 1.25 sources, 1.4, 1.5
Message-ID: <200602061347.k16DlRsD027417@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27325

Modified Files:
	.cvsignore OpenIPMI-1.4.14-warnings.patch OpenIPMI.spec 
	sources 
Log Message:
- Updated ipmitool to latest upstream version.
- Removed 3 patches for already fixed bugs in latest ipmitool.
- Adapted warning message fix for ipmitool for latest version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Jun 2005 14:57:04 -0000	1.4
+++ .cvsignore	6 Feb 2006 13:47:24 -0000	1.5
@@ -1,2 +1,2 @@
-OpenIPMI-1.4.11.tar.gz
-ipmitool-1.8.2.tar.gz
+ipmitool-1.8.6.tar.gz
+OpenIPMI-1.4.14.tar.gz

OpenIPMI-1.4.14-warnings.patch:
 ipmi_chassis.c |    1 +
 ipmi_event.c   |    1 +
 2 files changed, 2 insertions(+)

Index: OpenIPMI-1.4.14-warnings.patch
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI-1.4.14-warnings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenIPMI-1.4.14-warnings.patch	11 Oct 2005 12:47:09 -0000	1.1
+++ OpenIPMI-1.4.14-warnings.patch	6 Feb 2006 13:47:24 -0000	1.2
@@ -1,5 +1,5 @@
---- OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_chassis.c.warnings	2005-05-11 07:47:53.000000000 +0200
-+++ OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_chassis.c	2005-09-08 11:22:38.000000000 +0200
+--- OpenIPMI-1.4.14/ipmitool-1.8.6/lib/ipmi_chassis.c.warnings	2005-05-11 07:47:53.000000000 +0200
++++ OpenIPMI-1.4.14/ipmitool-1.8.6/lib/ipmi_chassis.c	2005-09-08 11:22:38.000000000 +0200
 @@ -430,6 +430,7 @@
  	printf("Boot parameter %d is %s\n", rsp->data[1] & 0x7f,
  	       (rsp->data[1] & 0x80) ? "invalid/locked" : "valid/unlocked");
@@ -8,8 +8,8 @@
  }
  
  static int
---- OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_event.c.warnings	2005-05-17 22:57:38.000000000 +0200
-+++ OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_event.c	2005-09-08 11:23:37.000000000 +0200
+--- OpenIPMI-1.4.14/ipmitool-1.8.6/lib/ipmi_event.c.warnings	2005-05-17 22:57:38.000000000 +0200
++++ OpenIPMI-1.4.14/ipmitool-1.8.6/lib/ipmi_event.c	2005-09-08 11:23:37.000000000 +0200
 @@ -80,6 +80,7 @@
  		ipmi_sel_print_extended_entry_verbose(intf, &sel_event);
  	else


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- OpenIPMI.spec	24 Jan 2006 13:56:18 -0000	1.24
+++ OpenIPMI.spec	6 Feb 2006 13:47:24 -0000	1.25
@@ -1,8 +1,8 @@
-%define ipmitoolver 1.8.2
+%define ipmitoolver 1.8.6
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 1.4.14
-Release: 17
+Release: 18
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -13,9 +13,6 @@
 Patch1: OpenIPMI-1.4.11-gcc4.patch
 Patch2: OpenIPMI-1.4.14-oob.patch
 Patch3: OpenIPMI-1.4.14-warnings.patch
-Patch4: OpenIPMI-1.4.14-lanplus-session-privset.patch
-Patch20: ipmitool-1.8.2-fru.patch
-Patch21: ipmitool-1.8.2-kgkey.patch
 BuildRoot: /var/tmp/%{name}-%{version}-root
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel openssl-devel
 
@@ -54,9 +51,6 @@
 %patch1 -p1 -b .gcc4
 %patch2 -p1 -b .oob
 %patch3 -p1 -b .warnings
-%patch4 -p1 -b .lanplus-session-privset
-%patch20 -p1 -b .fru
-%patch21 -p1 -b .kgkey
 
 %build
 %configure
@@ -137,6 +131,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Feb 06 2006 Phil Knirsch <pknirsch at redhat.com> 1.4.14-18
+- Updated ipmitool to latest upstream version.
+- Removed 3 patches for already fixed bugs in latest ipmitool.
+- Adapted warning message fix for ipmitool for latest version.
+
 * Tue Jan 24 2006 Phil Knirsch <pknirsch at redhat.com> 1.4.14-17
 - Fixed some minor things in initscripts.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Jun 2005 14:57:04 -0000	1.4
+++ sources	6 Feb 2006 13:47:24 -0000	1.5
@@ -1,2 +1,2 @@
+ee4196ccea99898c31b16099ac905260  ipmitool-1.8.6.tar.gz
 06fc4b2c8d758f4f9187f0065188542b  OpenIPMI-1.4.14.tar.gz
-d249ddd2176385fcea93753f5e103160  ipmitool-1.8.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb  6 14:38:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 09:38:23 -0500
Subject: rpms/gedit/devel gedit.spec,1.66,1.67
Message-ID: <200602061438.k16EcNpR014139@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14126

Modified Files:
	gedit.spec 
Log Message:
Enable python again



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gedit.spec	30 Jan 2006 21:14:24 -0000	1.66
+++ gedit.spec	6 Feb 2006 14:38:21 -0000	1.67
@@ -16,7 +16,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.13.90
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -82,7 +82,7 @@
 %patch0 -p1 -b .filesel
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --enable-python
 make
 
 %install
@@ -148,6 +148,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-2
+- Enable python again
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 14:47:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 09:47:33 -0500
Subject: rpms/gedit/devel gedit.spec,1.67,1.68
Message-ID: <200602061447.k16ElX8F026700@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26687

Modified Files:
	gedit.spec 
Log Message:
Add requires



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gedit.spec	6 Feb 2006 14:38:21 -0000	1.67
+++ gedit.spec	6 Feb 2006 14:47:30 -0000	1.68
@@ -44,6 +44,7 @@
 BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
 BuildRequires: scrollkeeper gettext
 BuildRequires: pygtk2-devel >= %{pygtk_version}
+BuildRequires: python-devel
 BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_extras_version}
 
 Requires: libgnomeui >= %{libgnomeui_version}



From fedora-cvs-commits at redhat.com  Mon Feb  6 14:57:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 09:57:03 -0500
Subject: rpms/system-config-samba/devel .cvsignore, 1.27, 1.28 sources, 1.27,
	1.28 system-config-samba.spec, 1.30, 1.31
Message-ID: <200602061457.k16Ev3TG003782@cvs.devel.redhat.com>

Author: nphilipp

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

Modified Files:
	.cvsignore sources system-config-samba.spec 
Log Message:
fix typo in PAM file (#179937)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	2 Feb 2006 14:00:29 -0000	1.27
+++ .cvsignore	6 Feb 2006 14:57:00 -0000	1.28
@@ -1 +1 @@
-system-config-samba-1.2.32.tar.bz2
+system-config-samba-1.2.33.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	2 Feb 2006 14:00:29 -0000	1.27
+++ sources	6 Feb 2006 14:57:00 -0000	1.28
@@ -1 +1 @@
-2b0ce31077ac26489cbbf18237f7a3ce  system-config-samba-1.2.32.tar.bz2
+4e1a0603fbf3f27e6c7222f02a47987e  system-config-samba-1.2.33.tar.bz2


Index: system-config-samba.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- system-config-samba.spec	2 Feb 2006 14:00:30 -0000	1.30
+++ system-config-samba.spec	6 Feb 2006 14:57:00 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: Samba server configuration tool
 Name: system-config-samba
-Version: 1.2.32
+Version: 1.2.33
 Release: 1
 URL: http://www.redhat.com/
 License: GPL
@@ -75,6 +75,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-samba
 
 %changelog
+* Mon Feb 06 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.33
+- fix typo in PAM file (#179937)
+
 * Thu Feb 02 2006 Nils Philippsen <nphilipp at redhat.com> - 1.2.32
 - bump version
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 14:58:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 09:58:14 -0500
Subject: rpms/httpd/devel httpd-2.2.0-authnoprov.patch, NONE, 1.1 httpd.spec,
	1.84, 1.85
Message-ID: <200602061458.k16EwEVT004378@cvs.devel.redhat.com>

Author: jorton

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

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.2.0-authnoprov.patch 
Log Message:
* Mon Feb  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-5.1
- mod_auth_basic/mod_authn_file: if no provider is configured,
  and AuthUserFile is not configured, decline to handle authn
  silently rather than failing noisily.


httpd-2.2.0-authnoprov.patch:
 mod_auth_basic.c |    8 ++++++++
 mod_authn_file.c |    4 ++++
 2 files changed, 12 insertions(+)

--- NEW FILE httpd-2.2.0-authnoprov.patch ---
--- httpd-2.2.0/modules/aaa/mod_authn_file.c.authnoprov
+++ httpd-2.2.0/modules/aaa/mod_authn_file.c
@@ -70,6 +70,10 @@
     apr_status_t status;
     char *file_password = NULL;
 
+    if (!conf->pwfile) {
+        return AUTH_GENERAL_ERROR;
+    }
+
     status = ap_pcfg_openfile(&f, r->pool, conf->pwfile);
 
     if (status != APR_SUCCESS) {
--- httpd-2.2.0/modules/aaa/mod_auth_basic.c.authnoprov
+++ httpd-2.2.0/modules/aaa/mod_auth_basic.c
@@ -252,6 +252,14 @@
             return DECLINED;
         }
 
+        /* If no providers were configured, and the default file
+         * provider gave a general error (which will happen only if
+         * has not been configured), presume that a non-provider-based
+         * authn module is configured, and get out of the way. */
+        if (!conf->providers && auth_result == AUTH_GENERAL_ERROR) {
+            return DECLINED;
+        }
+
         switch (auth_result) {
         case AUTH_DENIED:
             ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- httpd.spec	3 Feb 2006 10:06:08 -0000	1.84
+++ httpd.spec	6 Feb 2006 14:58:12 -0000	1.85
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 5
+Release: 5.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -43,6 +43,7 @@
 Patch51: httpd-2.2.0-headclength.patch
 Patch52: httpd-2.2.0-ajpcookie.patch
 Patch53: httpd-2.2.0-cppheader.patch
+Patch54: httpd-2.2.0-authnoprov.patch
 # Security fixes
 Patch200: httpd-2.2.0-CVE-2005-3352.patch
 Patch201: httpd-2.2.0-CVE-2005-3357.patch
@@ -126,6 +127,7 @@
 %patch51 -p1 -b .headclength
 %patch52 -p1 -b .ajpcookie
 %patch53 -p1 -b .cppheader
+%patch54 -p1 -b .authnoprov
 
 %patch200 -p1 -b .cve3352
 %patch201 -p1 -b .cve3352
@@ -489,6 +491,11 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Feb  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-5.1
+- mod_auth_basic/mod_authn_file: if no provider is configured,
+  and AuthUserFile is not configured, decline to handle authn
+  silently rather than failing noisily.
+
 * Fri Feb  3 2006 Joe Orton <jorton at redhat.com> 2.2.0-5
 - mod_ssl: add security fix for CVE-2005-3357 (#177914)
 - mod_imagemap: add security fix for CVE-2005-3352 (#177913)



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:10:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:10:07 -0500
Subject: rpms/gedit/devel gedit-2.13.90-libdir.patch, NONE, 1.1 gedit.spec,
	1.68, 1.69
Message-ID: <200602061510.k16FA7LE007074@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7005

Modified Files:
	gedit.spec 
Added Files:
	gedit-2.13.90-libdir.patch 
Log Message:
Fix multiarch problem


gedit-2.13.90-libdir.patch:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gedit-2.13.90-libdir.patch ---
--- gedit-2.13.90/configure.ac.libdir	2006-02-06 10:06:16.000000000 -0500
+++ gedit-2.13.90/configure.ac	2006-02-06 10:06:26.000000000 -0500
@@ -148,9 +148,9 @@
 	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
 	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
 	PYTHON_LIBS="-lpython$PYTHON_VERSION"
-	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
+	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config"
 	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
-	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
+	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config/Makefile"
 	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
 	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
 	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gedit.spec	6 Feb 2006 14:47:30 -0000	1.68
+++ gedit.spec	6 Feb 2006 15:10:05 -0000	1.69
@@ -30,6 +30,9 @@
 
 # Make the file selector remember last window size
 Patch0: gedit-2.13.2-filesel.patch
+%ifarch ppc64,x86_64,ia64,s390x
+Patch1: gedit-2.13.90-libdir.patch
+%endif
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -81,6 +84,9 @@
 %setup -n gedit-%{version} -q
 
 %patch0 -p1 -b .filesel
+%ifarch ppc64,x86_64,ia64,s390x
+%patch1 -p1 -b .libdir
+%endif
 
 %build
 %configure --disable-scrollkeeper --enable-python
@@ -151,6 +157,7 @@
 %changelog
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-2
 - Enable python again
+- Fix multiarch problem
 
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-1
 - Update to 2.13.90



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:23:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:23:55 -0500
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders-2.4-errno.patch, NONE,
	1.1 glibc-kernheaders-2.4-keyctl.patch, 1.1,
	1.2 glibc-kernheaders.spec, 1.101, 1.102
Message-ID: <200602061523.k16FNt6q025658@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	glibc-kernheaders-2.4-keyctl.patch glibc-kernheaders.spec 
Added Files:
	glibc-kernheaders-2.4-errno.patch 
Log Message:
 Add EOWNERDEAD and ENOTRECOVERABLE error codes

glibc-kernheaders-2.4-errno.patch:
 asm-alpha/errno.h  |    9 +++++++++
 asm-i386/errno.h   |    9 +++++++++
 asm-ia64/errno.h   |    9 +++++++++
 asm-ppc/errno.h    |    9 +++++++++
 asm-ppc64/errno.h  |    9 +++++++++
 asm-s390/errno.h   |    9 +++++++++
 asm-s390x/errno.h  |    9 +++++++++
 asm-x86_64/errno.h |    9 +++++++++
 8 files changed, 72 insertions(+)

--- NEW FILE glibc-kernheaders-2.4-errno.patch ---
--- glibc-kernheaders-2.4/usr/include/asm-alpha/errno.h~	2001-10-29 15:36:25.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-alpha/errno.h	2005-04-15 17:02:08.000000000 +0100
@@ -138,5 +138,14 @@
 
 #define ENOMEDIUM	129	/* No medium found */
 #define EMEDIUMTYPE	130	/* Wrong medium type */
+#define ECANCELED	131	/* Operation Cancelled */
+#define ENOKEY		132	/* Required key not available */
+#define EKEYEXPIRED	133	/* Key has expired */
+#define EKEYREVOKED	134	/* Key has been revoked */
+#define EKEYREJECTED	135	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	136	/* Owner died */
+#define EKEYREJECTED	137	/* State not recoverable */
 
 #endif
--- glibc-kernheaders-2.4/usr/include/asm-i386/errno.h~	2003-12-09 17:51:55.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-i386/errno.h	2005-04-15 17:03:12.000000000 +0100
@@ -128,5 +128,14 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 #endif
--- glibc-kernheaders-2.4/usr/include/asm-ia64/errno.h~	2001-10-29 15:36:26.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-ia64/errno.h	2005-04-15 17:03:21.000000000 +0100
@@ -135,5 +135,14 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 #endif /* _ASM_IA64_ERRNO_H */
--- glibc-kernheaders-2.4/usr/include/asm-ppc/errno.h~	2001-12-05 22:01:14.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-ppc/errno.h	2005-04-15 17:03:34.000000000 +0100
@@ -129,6 +129,15 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 /* Should never be seen by user programs */
 #define ERESTARTSYS	512
--- glibc-kernheaders-2.4/usr/include/asm-ppc64/errno.h~	2001-12-05 22:01:15.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-ppc64/errno.h	2005-04-15 17:03:27.000000000 +0100
@@ -133,6 +133,15 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 /* Should never be seen by user programs */
 #define ERESTARTSYS	512
--- glibc-kernheaders-2.4/usr/include/asm-s390/errno.h~	2001-10-29 15:36:26.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-s390/errno.h	2005-04-15 17:03:40.000000000 +0100
@@ -136,5 +136,14 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 #endif
--- glibc-kernheaders-2.4/usr/include/asm-s390x/errno.h~	2003-01-16 13:15:37.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-s390x/errno.h	2005-04-15 17:03:45.000000000 +0100
@@ -136,5 +136,14 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 #endif
--- glibc-kernheaders-2.4/usr/include/asm-x86_64/errno.h~	2001-10-29 15:36:26.000000000 +0000
+++ glibc-kernheaders-2.4/usr/include/asm-x86_64/errno.h	2005-04-15 17:03:57.000000000 +0100
@@ -128,5 +128,14 @@
 
 #define	ENOMEDIUM	123	/* No medium found */
 #define	EMEDIUMTYPE	124	/* Wrong medium type */
+#define ECANCELED	125	/* Operation Cancelled */
+#define ENOKEY		126	/* Required key not available */
+#define EKEYEXPIRED	127	/* Key has expired */
+#define EKEYREVOKED	128	/* Key has been revoked */
+#define EKEYREJECTED	129	/* Key was rejected by service */
+
+/* for robust mutexes */
+#define EOWNERDEAD	130	/* Owner died */
+#define EKEYREJECTED	131	/* State not recoverable */
 
 #endif

glibc-kernheaders-2.4-keyctl.patch:
 keyctl.h |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+)

Index: glibc-kernheaders-2.4-keyctl.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders-2.4-keyctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-kernheaders-2.4-keyctl.patch	15 Apr 2005 16:21:57 -0000	1.1
+++ glibc-kernheaders-2.4-keyctl.patch	6 Feb 2006 15:23:52 -0000	1.2
@@ -1,109 +1,3 @@
---- glibc-kernheaders-2.4/usr/include/asm-alpha/errno.h~	2001-10-29 15:36:25.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-alpha/errno.h	2005-04-15 17:02:08.000000000 +0100
-@@ -138,5 +138,10 @@
- 
- #define ENOMEDIUM	129	/* No medium found */
- #define EMEDIUMTYPE	130	/* Wrong medium type */
-+#define ECANCELED	131	/* Operation Cancelled */
-+#define ENOKEY		132	/* Required key not available */
-+#define EKEYEXPIRED	133	/* Key has expired */
-+#define EKEYREVOKED	134	/* Key has been revoked */
-+#define EKEYREJECTED	135	/* Key was rejected by service */
- 
- #endif
---- glibc-kernheaders-2.4/usr/include/asm-i386/errno.h~	2003-12-09 17:51:55.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-i386/errno.h	2005-04-15 17:03:12.000000000 +0100
-@@ -128,5 +128,10 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- #endif
---- glibc-kernheaders-2.4/usr/include/asm-ia64/errno.h~	2001-10-29 15:36:26.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-ia64/errno.h	2005-04-15 17:03:21.000000000 +0100
-@@ -135,5 +135,10 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- #endif /* _ASM_IA64_ERRNO_H */
---- glibc-kernheaders-2.4/usr/include/asm-ppc/errno.h~	2001-12-05 22:01:14.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-ppc/errno.h	2005-04-15 17:03:34.000000000 +0100
-@@ -129,6 +129,11 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- /* Should never be seen by user programs */
- #define ERESTARTSYS	512
---- glibc-kernheaders-2.4/usr/include/asm-ppc64/errno.h~	2001-12-05 22:01:15.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-ppc64/errno.h	2005-04-15 17:03:27.000000000 +0100
-@@ -133,6 +133,11 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- /* Should never be seen by user programs */
- #define ERESTARTSYS	512
---- glibc-kernheaders-2.4/usr/include/asm-s390/errno.h~	2001-10-29 15:36:26.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-s390/errno.h	2005-04-15 17:03:40.000000000 +0100
-@@ -136,5 +136,10 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- #endif
---- glibc-kernheaders-2.4/usr/include/asm-s390x/errno.h~	2003-01-16 13:15:37.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-s390x/errno.h	2005-04-15 17:03:45.000000000 +0100
-@@ -136,5 +136,10 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- #endif
---- glibc-kernheaders-2.4/usr/include/asm-x86_64/errno.h~	2001-10-29 15:36:26.000000000 +0000
-+++ glibc-kernheaders-2.4/usr/include/asm-x86_64/errno.h	2005-04-15 17:03:57.000000000 +0100
-@@ -128,5 +128,10 @@
- 
- #define	ENOMEDIUM	123	/* No medium found */
- #define	EMEDIUMTYPE	124	/* Wrong medium type */
-+#define ECANCELED	125	/* Operation Cancelled */
-+#define ENOKEY		126	/* Required key not available */
-+#define EKEYEXPIRED	127	/* Key has expired */
-+#define EKEYREVOKED	128	/* Key has been revoked */
-+#define EKEYREJECTED	129	/* Key was rejected by service */
- 
- #endif
 --- glibc-kernheaders-2.4/usr/include/linux/keyctl.h~	2005-04-15 17:04:26.000000000 +0100
 +++ glibc-kernheaders-2.4/usr/include/linux/keyctl.h	2005-04-15 17:04:18.000000000 +0100
 @@ -0,0 +1,39 @@


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- glibc-kernheaders.spec	23 Jan 2006 20:45:03 -0000	1.101
+++ glibc-kernheaders.spec	6 Feb 2006 15:23:52 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 4
+Release: 5
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -43,6 +43,7 @@
 Patch23: glibc-kernheaders-2.4-unistd.patch
 Patch24: glibc-kernheaders-2.4-watchdog.patch
 Patch25: glibc-kernheaders-2.4-iphdr.patch
+Patch26: glibc-kernheaders-2.4-errno.patch
 
 %description
 Kernel-headers includes the C header files that specify the interface
@@ -175,6 +176,9 @@
 
 
 %changelog
+* Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
+- Add EOWNERDEAD and ENOTRECOVERABLE error codes
+
 * Tue Jan 24 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-4
 - Add pselect/ppoll on x86_64
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:30:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:30:32 -0500
Subject: rpms/udev/devel udev-078-udevstart-greylist.patch, 1.1,
	1.2 udev.spec, 1.142, 1.143
Message-ID: <200602061530.k16FUVOX028654@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28623

Modified Files:
	udev-078-udevstart-greylist.patch udev.spec 
Log Message:
closed fd leak

udev-078-udevstart-greylist.patch:
 udevstart.c |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 insertions(+), 2 deletions(-)

Index: udev-078-udevstart-greylist.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-078-udevstart-greylist.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-078-udevstart-greylist.patch	21 Dec 2005 22:43:32 -0000	1.1
+++ udev-078-udevstart-greylist.patch	6 Feb 2006 15:30:26 -0000	1.2
@@ -1,6 +1,5 @@
-diff -ru udev-078/udevstart.c udev-078-new/udevstart.c
---- udev-078/udevstart.c	2005-12-21 16:50:18.000000000 -0500
-+++ udev-078-new/udevstart.c	2005-12-21 16:46:26.000000000 -0500
+--- udev-078/udevstart.c.greylist	2006-01-26 08:39:21.000000000 +0100
++++ udev-078/udevstart.c	2006-02-06 15:34:44.000000000 +0100
 @@ -38,6 +38,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -25,7 +24,7 @@
  static int add_device(const char *devpath, const char *subsystem)
  {
    char filename[PATH_SIZE];
-@@ -130,7 +138,30 @@
+@@ -130,7 +138,34 @@
    
    return 0;
  }
@@ -49,15 +48,19 @@
 +	alias[strlen(alias)-1] = '\0';
 +	
 +	for (i = 0; last_modalias_list[i] != NULL; i++)
-+		if (!fnmatch(last_modalias_list[i], alias, 0))
++		if (!fnmatch(last_modalias_list[i], alias, 0)) {
++			close(fd);
 +			return 1;
++		}
++
++	close(fd);
 +	return 0;
 +}
 +
  static void exec_list(struct list_head *device_list)
  {
  	struct device *loop_device;
-@@ -141,6 +172,8 @@
+@@ -141,6 +176,8 @@
  	list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
  		for (i = 0; first_list[i] != NULL; i++) {
  			if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) {
@@ -66,7 +69,7 @@
  				add_device(loop_device->path, loop_device->subsys);
  				list_del(&loop_device->node);
  				free(loop_device);
-@@ -160,6 +193,8 @@
+@@ -160,6 +197,8 @@
  		}
  		if (found)
  			continue;


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- udev.spec	26 Jan 2006 08:12:17 -0000	1.142
+++ udev.spec	6 Feb 2006 15:30:27 -0000	1.143
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 078
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -282,6 +282,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Mon Feb 06 2006 Harald Hoyer <harald at redhat.com> - 078-9
+- closed fd leak (bug #179980)
+
 * Thu Jan 26 2006 Harald Hoyer <harald at redhat.com> - 078-8
 - changed usb device naming
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:33:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:33:11 -0500
Subject: rpms/kernel/devel linux-2.6-bcm43xx-git.patch, NONE, 1.1 .cvsignore,
	1.337, 1.338 kernel-2.6.spec, 1.1910,
	1.1911 linux-2.6-softmac-git.patch, 1.4, 1.5 sources, 1.279,
	1.280 linux-2.6-bcm43xx.patch, 1.2, NONE
Message-ID: <200602061533.k16FXBKd029030@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-softmac-git.patch sources 
Added Files:
	linux-2.6-bcm43xx-git.patch 
Removed Files:
	linux-2.6-bcm43xx.patch 
Log Message:
Update bcm43xx

linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |    8 
 drivers/net/wireless/Makefile                  |    1 
 drivers/net/wireless/bcm43xx/Makefile          |   87 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  938 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  175 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 +
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  261 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4596 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2122 +++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  592 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |   88 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 +
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 +++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   93 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1099 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 25 files changed, 14717 insertions(+)

--- NEW FILE linux-2.6-bcm43xx-git.patch ---
diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
new file mode 100644
index 0000000..64d9022
--- /dev/null
+++ b/Documentation/networking/bcm43xx.txt
@@ -0,0 +1,36 @@
+
+			BCM43xx Linux Driver Project
+			============================
+
+About this software
+-------------------
+
+The goal of this project is to develop a linux driver for Broadcom
+BCM43xx chips, based on the specification at 
+http://bcm-specs.sipsolutions.net/
+
+The project page is http://bcm43xx.berlios.de/
+
+
+Requirements
+------------
+
+1)	Linux Kernel 2.6.15 or later
+	http://www.kernel.org/
+
+	You may want to configure your kernel with:
+
+	CONFIG_DEBUG_FS (optional):
+		-> Kernel hacking
+		  -> Debug Filesystem
+
+2)	SoftMAC IEEE 802.11 Networking Stack extension and patched ieee80211
+	modules:
+	http://softmac.sipsolutions.net/
+
+3)	Firmware Files
+
+	Please try fwcutter. Fwcutter can extract the firmware from various 
+	binary driver files. It supports driver files from Windows, MacOS and 
+	Linux. You can get fwcutter from http://bcm43xx.berlios.de/.
+	Also, fwcutter comes with a README file for further instructions.
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 233a4f6..32744ea 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -473,6 +473,14 @@ config PRISM54
 
 source "drivers/net/wireless/hostap/Kconfig"
 
+config BCM43XX
+       tristate "Broadcom BCM43xx wireless support"
+       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
+	select FW_LOADER
+       ---help---
+	This is an experimental driver for the Broadcom 43xx wireless chip,
+	found in the Apple Airport Extreme and various other devices.
+
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
 	bool
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3a6f7ba..c867798 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
new file mode 100644
index 0000000..98d4efb
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -0,0 +1,87 @@
+# Makefile for bcm43xx driver
+
+VERSION		:= 0.0.1
+RELEASE_NAME	:= bcm43xx-$(VERSION)
+
+# Optional path, where the SoftMAC subsystem is located.
+# You may set SOFTMAC_DIR in your bashrc, for example.
+SOFTMAC_DIR	?= 
+
+KVER		:= $(shell uname -r)
+KDIR		?= /lib/modules/$(KVER)/build
+PWD		:= $(shell pwd)
+MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
+
+# Comment/uncomment to enable/disable debugging
+DEBUG = y
+
+
+ifeq ($(DEBUG),y)
+DEBUGFS_OBJ = bcm43xx_debugfs.o
+CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
+else
+DEBUGFS_OBJ =
+CFLAGS += -O2
+endif
+
+CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
+ifneq ($(SOFTMAC_DIR),)
+CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
+endif
+
+ifneq ($(KERNELRELEASE),)
+# call from kernel build system
+
+obj-m := bcm43xx.o
+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
+		bcm43xx_radio.o bcm43xx_phy.o \
+		bcm43xx_power.o bcm43xx_wx.o \
+		bcm43xx_pio.o bcm43xx_ilt.o \
+		bcm43xx_leds.o
+
+else
+
+default: modules
+
+modules:
+	$(MAKE) -C $(KDIR) M=$(PWD) modules
+
+install: bcm43xx.ko
+	install -d $(MODPATH)
+	install -m 644 -c bcm43xx.ko $(MODPATH)
+	/sbin/depmod -a
+
+uninstall:
+	rm -rf $(MODPATH)
+	/sbin/depmod -a
+
+endif
+
+clean:
+	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
+		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
+		-print | xargs rm -Rf
+
+depend .depend dep:
+	$(CC) $(CFLAGS) -M *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
+
+DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
+DISTDIR = $(RELEASE_NAME)
+
+release: clean
+	@rm -rf $(DISTDIR)
+	@mkdir $(DISTDIR)
+	@chmod 777 $(DISTDIR)
+	@for file in $(DISTFILES); do                   \
+                if test -d $$file; then                 \
+                        mkdir $(DISTDIR)/$$file;        \
+                else                                    \
+                        cp -p $$file $(DISTDIR)/$$file; \
+                fi;                                     \
+        done
+	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
+	@rm -rf $(DISTDIR)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
new file mode 100644
index 0000000..38e75ed
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -0,0 +1,938 @@
+#ifndef BCM43xx_H_
+#define BCM43xx_H_
+
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/stringify.h>
+#include <linux/pci.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211softmac.h>
+#include <asm/atomic.h>
+#include <asm/io.h>
+
+
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_leds.h"
+
+
+#define DRV_NAME			__stringify(KBUILD_MODNAME)
+#define DRV_VERSION			__stringify(BCM43xx_VERSION)
+#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
+#define PFX				DRV_NAME ": "
+
+#define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
+#define BCM43xx_IRQWAIT_MAX_RETRIES	50
+#define BCM43xx_TX_TIMEOUT		(10 * HZ)
[...14478 lines suppressed...]
+		mdelay(20);
+	}
+	spromctl &= ~0x10; /* SPROM WRITE enable. */
+	bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
+	if (err) {
+		printk(KERN_ERR PFX "Could not access SPROM control register.\n");
+		goto out_unlock;
+	}
+	mdelay(500);
+	printk("100%% ]\n");
+	printk(KERN_INFO PFX "SPROM written.\n");
+	err = 0;
+out_unlock:
+	spin_unlock_irqrestore(&bcm->lock, flags);
+out_kfree:
+	kfree(sprom);
+out:
+	return err;
+}
+
+
+#ifdef WX
+# undef WX
+#endif
+#define WX(ioctl)  [(ioctl) - SIOCSIWCOMMIT]
+static const iw_handler bcm43xx_wx_handlers[] = {
+	/* Wireless Identification */
+	WX(SIOCGIWNAME)		= bcm43xx_wx_get_name,
+	/* Basic operations */
+	WX(SIOCSIWFREQ)		= bcm43xx_wx_set_channelfreq,
+	WX(SIOCGIWFREQ)		= bcm43xx_wx_get_channelfreq,
+	WX(SIOCSIWMODE)		= bcm43xx_wx_set_mode,
+	WX(SIOCGIWMODE)		= bcm43xx_wx_get_mode,
+	/* Informative stuff */
+	WX(SIOCGIWRANGE)	= bcm43xx_wx_get_rangeparams,
+	/* Access Point manipulation */
+	WX(SIOCSIWAP)           = ieee80211softmac_wx_set_wap,
+	WX(SIOCGIWAP)           = ieee80211softmac_wx_get_wap,
+	WX(SIOCSIWSCAN)		= ieee80211softmac_wx_trigger_scan,
+	WX(SIOCGIWSCAN)		= ieee80211softmac_wx_get_scan_results,
+	/* 802.11 specific support */
+	WX(SIOCSIWESSID)	= ieee80211softmac_wx_set_essid,
+	WX(SIOCGIWESSID)	= ieee80211softmac_wx_get_essid,
+	WX(SIOCSIWNICKN)	= bcm43xx_wx_set_nick,
+	WX(SIOCGIWNICKN)	= bcm43xx_wx_get_nick,
+	/* Other parameters */
+	WX(SIOCSIWRATE)		= ieee80211softmac_wx_set_rate,
+	WX(SIOCGIWRATE)		= ieee80211softmac_wx_get_rate,
+	WX(SIOCSIWRTS)		= bcm43xx_wx_set_rts,
+	WX(SIOCGIWRTS)		= bcm43xx_wx_get_rts,
+	WX(SIOCSIWFRAG)		= bcm43xx_wx_set_frag,
+	WX(SIOCGIWFRAG)		= bcm43xx_wx_get_frag,
+	WX(SIOCSIWTXPOW)	= bcm43xx_wx_set_xmitpower,
+	WX(SIOCGIWTXPOW)	= bcm43xx_wx_get_xmitpower,
+//TODO	WX(SIOCSIWRETRY)	= bcm43xx_wx_set_retry,
+//TODO	WX(SIOCGIWRETRY)	= bcm43xx_wx_get_retry,
+	/* Encoding */
+	WX(SIOCSIWENCODE)	= bcm43xx_wx_set_encoding,
+	WX(SIOCGIWENCODE)	= bcm43xx_wx_get_encoding,
+	WX(SIOCSIWENCODEEXT)	= bcm43xx_wx_set_encodingext,
+	WX(SIOCGIWENCODEEXT)	= bcm43xx_wx_get_encodingext,
+	/* Power saving */
+//TODO	WX(SIOCSIWPOWER)	= bcm43xx_wx_set_power,
+//TODO	WX(SIOCGIWPOWER)	= bcm43xx_wx_get_power,
+	WX(SIOCSIWGENIE)	= ieee80211softmac_wx_set_genie,
+	WX(SIOCGIWGENIE)	= ieee80211softmac_wx_get_genie,
+	WX(SIOCSIWAUTH)		= ieee80211_wx_set_auth,
+	WX(SIOCGIWAUTH)		= ieee80211_wx_get_auth,
+};
+#undef WX
+
+static const iw_handler bcm43xx_priv_wx_handlers[] = {
+	/* Set Interference Mitigation Mode. */
+	bcm43xx_wx_set_interfmode,
+	/* Get Interference Mitigation Mode. */
+	bcm43xx_wx_get_interfmode,
+	/* Enable/Disable Short Preamble mode. */
+	bcm43xx_wx_set_shortpreamble,
+	/* Get Short Preamble mode. */
+	bcm43xx_wx_get_shortpreamble,
+	/* Enable/Disable Software Encryption mode */
+	bcm43xx_wx_set_swencryption,
+	/* Get Software Encryption mode */
+	bcm43xx_wx_get_swencryption,
+	/* Write SRPROM data. */
+	bcm43xx_wx_sprom_write,
+	/* Read SPROM data. */
+	bcm43xx_wx_sprom_read,
+};
+
+#define PRIV_WX_SET_INTERFMODE		(SIOCIWFIRSTPRIV + 0)
+#define PRIV_WX_GET_INTERFMODE		(SIOCIWFIRSTPRIV + 1)
+#define PRIV_WX_SET_SHORTPREAMBLE	(SIOCIWFIRSTPRIV + 2)
+#define PRIV_WX_GET_SHORTPREAMBLE	(SIOCIWFIRSTPRIV + 3)
+#define PRIV_WX_SET_SWENCRYPTION	(SIOCIWFIRSTPRIV + 4)
+#define PRIV_WX_GET_SWENCRYPTION	(SIOCIWFIRSTPRIV + 5)
+#define PRIV_WX_SPROM_WRITE		(SIOCIWFIRSTPRIV + 6)
+#define PRIV_WX_SPROM_READ		(SIOCIWFIRSTPRIV + 7)
+
+#define PRIV_WX_DUMMY(ioctl)	\
+	{					\
+		.cmd		= (ioctl),	\
+		.name		= "__unused"	\
+	}
+
+static const struct iw_priv_args bcm43xx_priv_wx_args[] = {
+	{
+		.cmd		= PRIV_WX_SET_INTERFMODE,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_interfmode",
+	},
+	{
+		.cmd		= PRIV_WX_GET_INTERFMODE,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_interfmode",
+	},
+	{
+		.cmd		= PRIV_WX_SET_SHORTPREAMBLE,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_shortpreambl",
+	},
+	{
+		.cmd		= PRIV_WX_GET_SHORTPREAMBLE,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_shortpreambl",
+	},
+	{
+		.cmd		= PRIV_WX_SET_SWENCRYPTION,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_swencryption",
+	},
+	{
+		.cmd		= PRIV_WX_GET_SWENCRYPTION,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_swencryption",
+	},
+	{
+		.cmd		= PRIV_WX_SPROM_WRITE,
+		.set_args	= IW_PRIV_TYPE_CHAR | SPROM_BUFFERSIZE,
+		.name		= "write_sprom",
+	},
+	{
+		.cmd		= PRIV_WX_SPROM_READ,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | SPROM_BUFFERSIZE,
+		.name		= "read_sprom",
+	},
+};
+
+const struct iw_handler_def bcm43xx_wx_handlers_def = {
+	.standard		= bcm43xx_wx_handlers,
+	.num_standard		= ARRAY_SIZE(bcm43xx_wx_handlers),
+	.num_private		= ARRAY_SIZE(bcm43xx_priv_wx_handlers),
+	.num_private_args	= ARRAY_SIZE(bcm43xx_priv_wx_args),
+	.private		= bcm43xx_priv_wx_handlers,
+	.private_args		= bcm43xx_priv_wx_args,
+};
+
+/* vim: set ts=8 sw=8 sts=8: */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.h b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
new file mode 100644
index 0000000..1f29ff3
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
@@ -0,0 +1,36 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
+                     Stefano Brivio <st3 at riseup.net>
+                     Michael Buesch <mbuesch at freenet.de>
+                     Danny van Dyk <kugelfang at gentoo.org>
+                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_WX_H_
+#define BCM43xx_WX_H_
+
+extern const struct iw_handler_def bcm43xx_wx_handlers_def;
+
+#endif /* BCM43xx_WX_H_ */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- .cvsignore	4 Feb 2006 17:41:33 -0000	1.337
+++ .cvsignore	6 Feb 2006 15:33:08 -0000	1.338
@@ -2,6 +2,5 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-bcm43xx-20060114.tar.bz2
 patch-2.6.16-rc2.bz2
 patch-2.6.16-rc2-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1910
retrieving revision 1.1911
diff -u -r1.1910 -r1.1911
--- kernel-2.6.spec	5 Feb 2006 07:40:56 -0000	1.1910
+++ kernel-2.6.spec	6 Feb 2006 15:33:08 -0000	1.1911
@@ -183,9 +183,6 @@
 Source10: COPYING.modules
 Source11: genkey
 
-%define BCMVER 20060114
-Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2
-
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-smp.config
@@ -379,7 +376,7 @@
 
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
-Patch5001: linux-2.6-bcm43xx.patch
+Patch5001: linux-2.6-bcm43xx-git.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -887,15 +884,9 @@
 # be merged upstream
 #
 
-# Broadcom BCM43xx wireless driver.
-
-# Extract snapshot tarballs and move them into place.
-tar xvfj %{SOURCE13}
-mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx
-
 # Import softmac code from git tree
 %patch5000 -p1
-# Patch Kconfig and Makefiles to merge bcm43xx 'properly'
+# ... and bcm43xx driver too
 %patch5001 -p1
 
 #
@@ -1399,6 +1390,9 @@
 %endif
 
 %changelog
+* Mon Feb  6 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update to current softmac/bcm43xx code.
+
 * Sun Feb  5 2006 Dave Jones <davej at redhat.com>
 - Fix sed failure if /etc/sysconfig/kernel doesn't exist. (#180025)
 

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |   78 +++
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  392 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  456 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3324 insertions(+), 3 deletions(-)

Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-softmac-git.patch	13 Jan 2006 15:50:35 -0000	1.4
+++ linux-2.6-softmac-git.patch	6 Feb 2006 15:33:08 -0000	1.5
@@ -434,7 +434,7 @@
  
 +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
 diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
-index 321287b..22abfca 100644
+index 90d18b7..2ebb16f 100644
 --- a/net/ieee80211/ieee80211_module.c
 +++ b/net/ieee80211/ieee80211_module.c
 @@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d
@@ -447,10 +447,91 @@
  static int show_debug_level(char *page, char **start, off_t offset,
  			    int count, int *eof, void *data)
 diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
-index 5e33803..64eceb7 100644
+index 7a12180..c31ae23 100644
 --- a/net/ieee80211/ieee80211_rx.c
 +++ b/net/ieee80211/ieee80211_rx.c
-@@ -1289,9 +1289,9 @@ static inline void update_network(struct
+@@ -761,6 +761,80 @@ int ieee80211_rx(struct ieee80211_device
+ 	return 0;
+ }
+ 
++/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
++int ieee80211_rx_any(struct ieee80211_device *ieee,
++		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
++{
++	struct ieee80211_hdr_4addr *hdr;
++	int is_packet_for_us;
++	u16 fc;
++
++	if (ieee->iw_mode == IW_MODE_MONITOR)
++		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
++
++	hdr = (struct ieee80211_hdr_4addr *)skb->data;
++	fc = le16_to_cpu(hdr->frame_ctl);
++
++	if ((fc & IEEE80211_FCTL_VERS) != 0)
++		return -EINVAL;
++		
++	switch (fc & IEEE80211_FCTL_FTYPE) {
++	case IEEE80211_FTYPE_MGMT:
++		ieee80211_rx_mgt(ieee, hdr, stats);
++		return 0;
++	case IEEE80211_FTYPE_DATA:
++		break;
++	case IEEE80211_FTYPE_CTL:
++		return 0;
++	default:
++		return -EINVAL;
++	}
++
++	is_packet_for_us = 0;
++	switch (ieee->iw_mode) {
++	case IW_MODE_ADHOC:
++		/* our BSS and not from/to DS */
++		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1))
++				is_packet_for_us = 1;
++		}
++		break;
++	case IW_MODE_INFRA:
++		/* our BSS (== from our AP) and from DS */
++		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1)) {
++				/* not our own packet bcasted from AP */
++				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
++					is_packet_for_us = 1;
++			}
++		}
++		break;
++	default:
++		/* ? */
++		break;
++	}
++
++	if (is_packet_for_us)
++		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
++	return 0;
++}
++
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+ static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
+@@ -1289,9 +1363,9 @@ static void update_network(struct ieee80
  	/* dst->last_associate is not overwritten */
  }
  
@@ -461,9 +542,9 @@
 +	return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON);
  }
  
- static inline void ieee80211_process_probe_response(struct ieee80211_device
+ static void ieee80211_process_probe_response(struct ieee80211_device
 diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
-index 406d5b9..2f16cbe 100644
+index 23e1630..e52ebd3 100644
 --- a/net/ieee80211/ieee80211_wx.c
 +++ b/net/ieee80211/ieee80211_wx.c
 @@ -726,9 +726,98 @@ int ieee80211_wx_get_encodeext(struct ie


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- sources	4 Feb 2006 17:41:33 -0000	1.279
+++ sources	6 Feb 2006 15:33:08 -0000	1.280
@@ -1,4 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 67eb75e5a9286f992efb84348ae371f1  patch-2.6.16-rc2-git1.bz2


--- linux-2.6-bcm43xx.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:40:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:40:03 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git2.bz2.sign, NONE,
	1.1 .cvsignore, 1.338, 1.339 kernel-2.6.spec, 1.1911,
	1.1912 sources, 1.280, 1.281 upstream, 1.254, 1.255
Message-ID: <200602061540.k16Fe3i4031565@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git2.bz2.sign 
Log Message:
git2



--- NEW FILE patch-2.6.16-rc2-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD5pH8yGugalF9Dw4RAuBzAJkBFHUde3rSugrOqOAUVm4GkVmPbQCeJJ3L
zv5Qy+Nps841iisXDTe12Jw=
=Ozbg
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- .cvsignore	6 Feb 2006 15:33:08 -0000	1.338
+++ .cvsignore	6 Feb 2006 15:39:59 -0000	1.339
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git1.bz2
+patch-2.6.16-rc2-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1911
retrieving revision 1.1912
diff -u -r1.1911 -r1.1912
--- kernel-2.6.spec	6 Feb 2006 15:33:08 -0000	1.1911
+++ kernel-2.6.spec	6 Feb 2006 15:39:59 -0000	1.1912
@@ -206,7 +206,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git1.bz2
+Patch2: patch-2.6.16-rc2-git2.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1390,6 +1390,9 @@
 %endif
 
 %changelog
+* Mon Feb  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git2
+
 * Mon Feb  6 2006 David Woodhouse <dwmw2 at redhat.com>
 - Update to current softmac/bcm43xx code.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- sources	6 Feb 2006 15:33:08 -0000	1.280
+++ sources	6 Feb 2006 15:40:00 -0000	1.281
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-67eb75e5a9286f992efb84348ae371f1  patch-2.6.16-rc2-git1.bz2
+b5306d5c471ef0a301ced2acb475d361  patch-2.6.16-rc2-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- upstream	4 Feb 2006 17:41:33 -0000	1.254
+++ upstream	6 Feb 2006 15:40:00 -0000	1.255
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git1.bz2
+patch-2.6.16-rc2-git2.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 15:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 10:54:44 -0500
Subject: rpms/gnome-utils/devel gnome-utils-2.13.91-logview-crash.patch, NONE,
	1.1 gnome-utils.spec, 1.87, 1.88
Message-ID: <200602061554.k16FsiFH018624@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Added Files:
	gnome-utils-2.13.91-logview-crash.patch 
Log Message:
Fix gnome-system-log crash


gnome-utils-2.13.91-logview-crash.patch:
 misc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-utils-2.13.91-logview-crash.patch ---
--- gnome-utils-2.13.91/logview/misc.c.logview-crash	2006-02-06 10:51:07.000000000 -0500
+++ gnome-utils-2.13.91/logview/misc.c	2006-02-06 10:52:07.000000000 -0500
@@ -182,5 +182,5 @@
    fontdesc = pango_font_description_from_string (font_name);
    if (pango_font_description_get_family (fontdesc) != NULL)
        gtk_widget_modify_font (widget, fontdesc);
-   g_free (fontdesc);
+   pango_font_description_free (fontdesc);
 }


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gnome-utils.spec	30 Jan 2006 20:20:13 -0000	1.87
+++ gnome-utils.spec	6 Feb 2006 15:54:41 -0000	1.88
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.91
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -33,6 +33,8 @@
 
 Patch0: gnome-utils-2.11.90-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
+# fixed in 2.13.92
+Patch2: gnome-utils-2.13.91-logview-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome
@@ -69,6 +71,7 @@
 
 %prep
 %setup -q
+%patch2 -p1 -b .logview-crash
 
 # Hide from menus
 pushd gsearchtool
@@ -211,6 +214,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.91-2
+- Fix a gnome-system-log crash
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.91-1
 - Update to gnome-utils 2.13.91
 - Update to zenity 2.13.90



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:04:39 -0500
Subject: rpms/frysk/devel frysk.spec,1.21,1.22
Message-ID: <200602061604.k16G4d6p021367@cvs.devel.redhat.com>

Author: ajocksch

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21342

Modified Files:
	frysk.spec 
Log Message:
- Bumped version, rebuilt



Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- frysk.spec	23 Jan 2006 21:29:01 -0000	1.21
+++ frysk.spec	6 Feb 2006 16:04:36 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.01.22
-Release:	0.FC5.0
+Release:	0.FC5.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -86,6 +86,9 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Mon Feb 06 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.01.22-0.FC5.1
+- Bumped version, rebuilt.
+
 * Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.FC4.0
 - Simplify .spec file (remove unused macro definitions).
 - Import frysk 0.0.1.2006.01.22.



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:04:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:04:43 -0500
Subject: rpms/kernel/devel linux-2.6-bcm43xx-git-mb.patch, NONE,
	1.1 kernel-2.6.spec, 1.1912, 1.1913
Message-ID: <200602061604.k16G4gt2021378@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-bcm43xx-git-mb.patch 
Log Message:
more bcm43xx updates

linux-2.6-bcm43xx-git-mb.patch:
 drivers/net/wireless/Kconfig                   |   19 +
 drivers/net/wireless/bcm43xx/Makefile          |   88 --------
 drivers/net/wireless/bcm43xx/bcm43xx.h         |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    |  245 +++++--------------------
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     |    9 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      |   56 ++++-
 net/ieee80211/ieee80211_rx.c                   |   74 -------
 10 files changed, 188 insertions(+), 377 deletions(-)

--- NEW FILE linux-2.6-bcm43xx-git-mb.patch ---
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 2aa891f..1b751ac 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -491,12 +491,21 @@ source "drivers/net/wireless/hostap/Kcon
 source "drivers/net/wireless/tiacx/Kconfig"
 
 config BCM43XX
-       tristate "Broadcom BCM43xx wireless support"
-       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
+	tristate "Broadcom BCM43xx wireless support"
+	depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
 	select FW_LOADER
-       ---help---
-	This is an experimental driver for the Broadcom 43xx wireless chip,
-	found in the Apple Airport Extreme and various other devices.
+	---help---
+	  This is an experimental driver for the Broadcom 43xx wireless chip,
+	  found in the Apple Airport Extreme and various other devices.
+
+config BCM43XX_DEBUG
+	bool "Broadcom BCM43xx debugging (RECOMMENDED)"
+	depends on BCM43XX
+	default y
+	---help---
+	  Broadcom 43xx debugging messages.
+	  Say Y, because the driver is still very experimental and
+	  this will help you get it running.
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
index 98d4efb..e025e9f 100644
--- a/drivers/net/wireless/bcm43xx/Makefile
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -1,87 +1,9 @@
-# Makefile for bcm43xx driver
+obj-$(CONFIG_BCM43XX) += bcm43xx.o
+bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o
 
-VERSION		:= 0.0.1
-RELEASE_NAME	:= bcm43xx-$(VERSION)
-
-# Optional path, where the SoftMAC subsystem is located.
-# You may set SOFTMAC_DIR in your bashrc, for example.
-SOFTMAC_DIR	?= 
-
-KVER		:= $(shell uname -r)
-KDIR		?= /lib/modules/$(KVER)/build
-PWD		:= $(shell pwd)
-MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
-
-# Comment/uncomment to enable/disable debugging
-DEBUG = y
-
-
-ifeq ($(DEBUG),y)
-DEBUGFS_OBJ = bcm43xx_debugfs.o
-CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
-else
-DEBUGFS_OBJ =
-CFLAGS += -O2
-endif
-
-CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
-ifneq ($(SOFTMAC_DIR),)
-CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
-endif
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-obj-m := bcm43xx.o
-bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o \
 		bcm43xx_radio.o bcm43xx_phy.o \
 		bcm43xx_power.o bcm43xx_wx.o \
 		bcm43xx_pio.o bcm43xx_ilt.o \
-		bcm43xx_leds.o
-
-else
-
-default: modules
-
-modules:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-install: bcm43xx.ko
-	install -d $(MODPATH)
-	install -m 644 -c bcm43xx.ko $(MODPATH)
-	/sbin/depmod -a
-
-uninstall:
-	rm -rf $(MODPATH)
-	/sbin/depmod -a
-
-endif
-
-clean:
-	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
-		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
-		-print | xargs rm -Rf
-
-depend .depend dep:
-	$(CC) $(CFLAGS) -M *.c > .depend
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
-
-DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
-DISTDIR = $(RELEASE_NAME)
-
-release: clean
-	@rm -rf $(DISTDIR)
-	@mkdir $(DISTDIR)
-	@chmod 777 $(DISTDIR)
-	@for file in $(DISTFILES); do                   \
-                if test -d $$file; then                 \
-                        mkdir $(DISTDIR)/$$file;        \
-                else                                    \
-                        cp -p $$file $(DISTDIR)/$$file; \
-                fi;                                     \
-        done
-	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
-	@rm -rf $(DISTDIR)
+		bcm43xx_leds.o bcm43xx_ethtool.o \
+		$(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 38e75ed..981d563 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -17,14 +17,10 @@
 #include "bcm43xx_leds.h"
 
 
-#define DRV_NAME			__stringify(KBUILD_MODNAME)
-#define DRV_VERSION			__stringify(BCM43xx_VERSION)
-#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
-#define PFX				DRV_NAME ": "
+#define PFX				KBUILD_MODNAME ": "
 
 #define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
 #define BCM43xx_IRQWAIT_MAX_RETRIES	50
-#define BCM43xx_TX_TIMEOUT		(10 * HZ)
 
 #define BCM43xx_IO_SIZE			8192
 #define BCM43xx_REG_ACTIVE_CORE		0x80
@@ -529,6 +525,8 @@ struct bcm43xx_radioinfo {
 	 * 3: tx_CTL2
 	 */
 	u16 txpower[4];
+	/* Desired TX power in dBm Q5.2 */
+	u16 txpower_desired;
 	/* Current Interference Mitigation mode */
 	int interfmode;
 	/* Stack of saved values from the Interference Mitigation code */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index f8cfc84..5a7dc43 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -141,7 +141,7 @@ static ssize_t drvinfo_read_file(struct 
 	down(&big_buffer_sem);
 
 	/* This is where the information is written to the "driver" file */
-	fappend(BCM43xx_DRIVER_NAME "\n");
+	fappend(KBUILD_MODNAME " driver\n");
 	fappend("Compiled at: %s %s\n", __DATE__, __TIME__);
 
 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
@@ -433,12 +433,12 @@ void bcm43xx_debugfs_log_txstat(struct b
 void bcm43xx_debugfs_init(void)
 {
 	memset(&fs, 0, sizeof(fs));
-	fs.root = debugfs_create_dir(DRV_NAME, NULL);
+	fs.root = debugfs_create_dir(KBUILD_MODNAME, NULL);
 	if (!fs.root)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "\" subdir failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "\" subdir failed!\n");
 	fs.dentry_driverinfo = debugfs_create_file("driver", 0444, fs.root, NULL, &drvinfo_fops);
 	if (!fs.dentry_driverinfo)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "/driver\" failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "/driver\" failed!\n");
 }
 
 void bcm43xx_debugfs_exit(void)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
new file mode 100644
index 0000000..b3ffcf5
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -0,0 +1,50 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  ethtool support
+
+  Copyright (c) 2006 Jason Lunz <lunz at falooley.org>
+
+  Some code in this file is derived from the 8139too.c driver
+  Copyright (C) 2002 Jeff Garzik
+
+  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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_ethtool.h"
+
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/version.h>
+
+
+static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+	struct bcm43xx_private *bcm = bcm43xx_priv(dev);
+
+	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+	strncpy(info->version, UTS_RELEASE, sizeof(info->version));
+	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
+}
+
+struct ethtool_ops bcm43xx_ethtool_ops = {
+	.get_drvinfo = bcm43xx_get_drvinfo,
+	.get_link = ethtool_op_get_link,
+};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
new file mode 100644
index 0000000..8137049
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
@@ -0,0 +1,8 @@
+#ifndef BCM43xx_ETHTOOL_H_
+#define BCM43xx_ETHTOOL_H_
+
+#include <linux/ethtool.h>
+
+extern struct ethtool_ops bcm43xx_ethtool_ops;
+
+#endif /* BCM43xx_ETHTOOL_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 4b4e60a..8e08c41 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -49,6 +49,7 @@
 #include "bcm43xx_pio.h"
 #include "bcm43xx_power.h"
 #include "bcm43xx_wx.h"
+#include "bcm43xx_ethtool.h"
 
 
 MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
@@ -82,10 +83,6 @@ static int modparam_locale = -1;
 module_param_named(locale, modparam_locale, int, 0444);
 MODULE_PARM_DESC(country, "Select LocaleCode 0-11 (For travelers)");
 
-static int modparam_outdoor;
-module_param_named(outdoor, modparam_outdoor, int, 0444);
-MODULE_PARM_DESC(outdoor, "Set to 1, if you are using the device outdoor, 0 otherwise.");
-
 static int modparam_noleds;
 module_param_named(noleds, modparam_noleds, int, 0444);
 MODULE_PARM_DESC(noleds, "Turn off all LED activity");
@@ -796,6 +793,10 @@ static int bcm43xx_read_radioinfo(struct
 		bcm->current_core->radio->txpower[2] = 3;
 	else
 		bcm->current_core->radio->txpower[2] = 0;
+	if (bcm->current_core->phy->type == BCM43xx_PHYTYPE_A)
+		bcm->current_core->radio->txpower_desired = bcm->sprom.maxpower_aphy;
+	else
+		bcm->current_core->radio->txpower_desired = bcm->sprom.maxpower_bgphy;
 
 	/* Initialize the in-memory nrssi Lookup Table. */
 	for (i = 0; i < 64; i++)
@@ -1088,163 +1089,13 @@ static int bcm43xx_read_sprom(struct bcm
 	return 0;
 }
 
-static int bcm43xx_channel_is_allowed(struct bcm43xx_private *bcm, u8 channel,
-				      u8 *max_power, u8 *flags)
-{
-	/* THIS FUNCTION DOES _NOT_ ENFORCE REGULATORY DOMAIN COMPLIANCE.
-	 * It is only a helper function to make life easier to
-	 * select legal channels and transmission powers.
-	 */
-
-	u8 phytype = bcm->current_core->phy->type;
-	int allowed = 0;
-
-	*max_power = 0;
-	*flags = 0;
-
-	//FIXME: Set max_power and maybe flags
-	/*FIXME: Allowed channels are sometimes different for outdoor
-	 *       or indoor use. See modparam_outdoor.
-	 */
-	/* From b specs Max Power BPHY:
-	 *	USA:	1000mW
-	 *	Europe:	100mW
-	 *	Japan:	10mW/MHz
-	 */
-
-	switch (bcm->sprom.locale) {
-	case BCM43xx_LOCALE_WORLD:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_THAILAND:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ISRAEL:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		} else {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JORDAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_CHINA:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_CANADA_ANZ:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_EUROPE:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_LOW:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN_HIGH:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME?
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ALL:
-		allowed = 1;
-		break;
-	case BCM43xx_LOCALE_NONE:
-		break;
-	default:
-		assert(0);
-	}
-
-	return allowed;
-}
-
 static void bcm43xx_geo_init(struct bcm43xx_private *bcm)
 {
 	struct ieee80211_geo geo;
 	struct ieee80211_channel *chan;
 	int have_a = 0, have_bg = 0;
 	int i, num80211;
-	u8 channel, flags, max_power;
+	u8 channel;
 	struct bcm43xx_phyinfo *phy;
 	const char *iso_country;
 
@@ -1268,27 +1119,17 @@ static void bcm43xx_geo_init(struct bcm4
 
  	if (have_a) {
 		for (i = 0, channel = 0; channel < 201; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.a[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.a_channels = i;
 	}
 	if (have_bg) {
 		for (i = 0, channel = 1; channel < 15; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.bg[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.bg_channels = i;
 	}
@@ -2229,9 +2070,9 @@ static irqreturn_t bcm43xx_interrupt_han
 	return IRQ_HANDLED;
 }
 
-static void bcm43xx_release_firmware(struct bcm43xx_private *bcm)
+static void bcm43xx_release_firmware(struct bcm43xx_private *bcm, int force)
 {
-	if (bcm->firmware_norelease)
+	if (bcm->firmware_norelease && !force)
 		return; /* Suspending or controller reset. */
 	release_firmware(bcm->ucode);
 	bcm->ucode = NULL;
@@ -2361,7 +2202,7 @@ static int bcm43xx_request_firmware(stru
 out:
 	return err;
 error:
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 err_noinitval:
 	printk(KERN_ERR PFX "Error: No InitVals available!\n");
@@ -2409,9 +2250,9 @@ static void bcm43xx_upload_microcode(str
 #endif
 }
 
-static void bcm43xx_write_initvals(struct bcm43xx_private *bcm,
-				   const struct bcm43xx_initval *data,
-				   const unsigned int len)
+static int bcm43xx_write_initvals(struct bcm43xx_private *bcm,
+				  const struct bcm43xx_initval *data,
+				  const unsigned int len)
 {
 	u16 offset, size;
 	u32 value;
@@ -2422,35 +2263,54 @@ static void bcm43xx_write_initvals(struc
 		size = be16_to_cpu(data[i].size);
 		value = be32_to_cpu(data[i].value);
 
-		if (size == 2)
-			bcm43xx_write16(bcm, offset, value);
-		else if (size == 4)
+		if (unlikely(offset >= 0x1000))
+			goto err_format;
+		if (size == 2) {
+			if (unlikely(value & 0xFFFF0000))
+				goto err_format;
+			bcm43xx_write16(bcm, offset, (u16)value);
+		} else if (size == 4) {
 			bcm43xx_write32(bcm, offset, value);
-		else
-			printk(KERN_ERR PFX "InitVals fileformat error.\n");
+		} else
+			goto err_format;
 	}
+
+	return 0;
+
+err_format:
+	printk(KERN_ERR PFX "InitVals (bcm43xx_initvalXX.fw) file-format error. "
+			    "Please fix your bcm43xx firmware files.\n");
+	return -EPROTO;
 }
 
-static void bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
+static int bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
 {
+	int err;
+
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_enable(bcm);
 #else
 	bcm43xx_mmioprint_disable(bcm);
 #endif
 
-	bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
-			       bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
+				     bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	if (err)
+		goto out;
 	if (bcm->initvals1) {
-		bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
-				       bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
+					     bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		if (err)
+			goto out;
 	}
 
+out:
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_disable(bcm);
 #else
 	bcm43xx_mmioprint_enable(bcm);
 #endif
+	return err;
 }
 
 static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
@@ -2471,7 +2331,7 @@ static int bcm43xx_initialize_irq(struct
 	}
 #endif
 	res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-			  SA_SHIRQ, DRV_NAME, bcm);
+			  SA_SHIRQ, KBUILD_MODNAME, bcm);
 	if (res) {
 		printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
 		return -EFAULT;
@@ -2683,7 +2543,7 @@ static void bcm43xx_chip_cleanup(struct 
 		bcm43xx_leds_exit(bcm);
 	bcm43xx_gpio_cleanup(bcm);
 	free_irq(bcm->irq, bcm);
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 0);
 }
 
 /* Initialize the chip
@@ -2708,13 +2568,15 @@ static int bcm43xx_chip_init(struct bcm4
 
 	err = bcm43xx_initialize_irq(bcm);
 	if (err)
-		goto out;
+		goto err_release_fw;
 
 	err = bcm43xx_gpio_init(bcm);
 	if (err)
 		goto err_free_irq;
 
-	bcm43xx_upload_initvals(bcm);
+	err = bcm43xx_upload_initvals(bcm);
+	if (err)
+		goto err_gpio_cleanup;
 	bcm43xx_radio_turn_on(bcm);
 
 	if (modparam_noleds)
@@ -2813,9 +2675,12 @@ out:
 
 err_radio_off:
 	bcm43xx_radio_turn_off(bcm);
+err_gpio_cleanup:
 	bcm43xx_gpio_cleanup(bcm);
 err_free_irq:
 	free_irq(bcm->irq, bcm);
+err_release_fw:
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 }
 	
@@ -3809,7 +3674,7 @@ static int bcm43xx_attach_board(struct b
 	}
 #endif
 
-	err = pci_request_regions(pci_dev, DRV_NAME);
+	err = pci_request_regions(pci_dev, KBUILD_MODNAME);
 	if (err) {
 		printk(KERN_ERR PFX
 		       "could not access PCI resources (%i)\n", err);
@@ -4389,12 +4254,12 @@ static int __devinit bcm43xx_init_one(st
 #endif
 	net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
 	net_dev->irq = pdev->irq;
-	net_dev->watchdog_timeo = BCM43xx_TX_TIMEOUT;
+	SET_ETHTOOL_OPS(net_dev, &bcm43xx_ethtool_ops);
 
 	/* initialize the bcm43xx_private struct */
 	bcm = bcm43xx_priv(net_dev);
 	memset(bcm, 0, sizeof(*bcm));
-	wq = create_workqueue(DRV_NAME "_wq");
+	wq = create_workqueue(KBUILD_MODNAME "_wq");
 	if (!wq) {
 		err = -ENOMEM;
 		goto err_free_netdev;
@@ -4567,7 +4432,7 @@ static int bcm43xx_resume(struct pci_dev
 #endif				/* CONFIG_PM */
 
 static struct pci_driver bcm43xx_pci_driver = {
-	.name = BCM43xx_DRIVER_NAME,
+	.name = KBUILD_MODNAME,
 	.id_table = bcm43xx_pci_tbl,
 	.probe = bcm43xx_init_one,
 	.remove = __devexit_p(bcm43xx_remove_one),
@@ -4579,7 +4444,7 @@ static struct pci_driver bcm43xx_pci_dri
 
 static int __init bcm43xx_init(void)
 {
-	printk(KERN_INFO BCM43xx_DRIVER_NAME "\n");
+	printk(KERN_INFO KBUILD_MODNAME " driver\n");
 	bcm43xx_debugfs_init();
 	return pci_register_driver(&bcm43xx_pci_driver);
 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index f5e7a6a..79c1c71 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -1763,14 +1763,9 @@ void bcm43xx_phy_xmitpower(struct bcm43x
 			where REG is the max power as per the regulatory domain
 		*/
 
-		/*TODO: Get desired_pwr from wx_handlers or the stack
-		limit_value(desired_pwr, 0, max_pwr);
-		*/
-
-		desired_pwr = max_pwr; /* remove this when we have a real desired_pwr */
-
+		desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
+		/* Check if we need to adjust the current power. */
 		pwr_adjust = desired_pwr - estimated_pwr;
-
 		radio_att_delta = -(pwr_adjust + 7) >> 3;
 		baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
 		if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index fe6409a..bed7cfb 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -41,6 +41,11 @@
 #include "bcm43xx_main.h"
 #include "bcm43xx_radio.h"
 
+
+/* The WIRELESS_EXT version, which is implemented by this driver. */
+#define BCM43xx_WX_VERSION	18
+
+
 /* Define to enable a printk on each wx handler function invocation */
 //#define BCM43xx_WX_DEBUG
 
@@ -282,7 +287,12 @@ static int bcm43xx_wx_get_rangeparams(st
 	range->max_encoding_tokens = WEP_KEYS;
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 16;
+	range->we_version_source = BCM43xx_WX_VERSION;
+
+	range->enc_capa = IW_ENC_CAPA_WPA |
+			  IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP |
+			  IW_ENC_CAPA_CIPHER_CCMP;
 
 	spin_lock_irqsave(&bcm->lock, flags);
 
@@ -474,21 +484,40 @@ static int bcm43xx_wx_set_xmitpower(stru
 				    char *extra)
 {
 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+	struct bcm43xx_radioinfo *radio;
+	struct bcm43xx_phyinfo *phy;
 	unsigned long flags;
 	int err = -ENODEV;
+	u16 maxpower;
 
 	wx_enter();
 
+	if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
+		printk(PFX KERN_ERR "TX power not in dBm.\n");
+		return -EOPNOTSUPP;
+	}
+
 	spin_lock_irqsave(&bcm->lock, flags);
 	if (!bcm->initialized)
 		goto out_unlock;
-	if (data->power.disabled != (!(bcm->current_core->radio->enabled))) {
-		if (data->power.disabled)
+	radio = bcm->current_core->radio;
+	phy = bcm->current_core->phy;
+	if (data->txpower.disabled != (!(radio->enabled))) {
+		if (data->txpower.disabled)
 			bcm43xx_radio_turn_off(bcm);
 		else
 			bcm43xx_radio_turn_on(bcm);
 	}
-	//TODO: set txpower.
+	if (data->txpower.value > 0) {
+		/* desired and maxpower dBm values are in Q5.2 */
+		if (phy->type == BCM43xx_PHYTYPE_A)
+			maxpower = bcm->sprom.maxpower_aphy;
+		else
+			maxpower = bcm->sprom.maxpower_bgphy;
+		radio->txpower_desired = limit_value(data->txpower.value << 2,
+						     0, maxpower);
+		bcm43xx_phy_xmitpower(bcm);
+	}
 	err = 0;
 
 out_unlock:
@@ -503,18 +532,27 @@ static int bcm43xx_wx_get_xmitpower(stru
 				    char *extra)
 {
 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+	struct bcm43xx_radioinfo *radio;
 	unsigned long flags;
+	int err = -ENODEV;
 
 	wx_enter();
 
 	spin_lock_irqsave(&bcm->lock, flags);
-//TODO	data->power.value = ???
-	data->power.fixed = 1;
-	data->power.flags = IW_TXPOW_DBM;
-	data->power.disabled = !(bcm->current_core->radio->enabled);
+	if (!bcm->initialized)
+		goto out_unlock;
+	radio = bcm->current_core->radio;
+	/* desired dBm value is in Q5.2 */
+	data->txpower.value = radio->txpower_desired >> 2;
+	data->txpower.fixed = 1;
+	data->txpower.flags = IW_TXPOW_DBM;
+	data->txpower.disabled = !(radio->enabled);
+
+	err = 0;
+out_unlock:
 	spin_unlock_irqrestore(&bcm->lock, flags);
 
-	return 0;
+	return err;
 }
 
 static int bcm43xx_wx_set_retry(struct net_device *net_dev,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index e9b5072..5dcfb1b 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -780,80 +780,6 @@ int ieee80211_rx(struct ieee80211_device
 	return 0;
 }
 
-/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
-int ieee80211_rx_any(struct ieee80211_device *ieee,
-		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
-{
-	struct ieee80211_hdr_4addr *hdr;
-	int is_packet_for_us;
-	u16 fc;
-
-	if (ieee->iw_mode == IW_MODE_MONITOR)
-		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
-
-	hdr = (struct ieee80211_hdr_4addr *)skb->data;
-	fc = le16_to_cpu(hdr->frame_ctl);
-
-	if ((fc & IEEE80211_FCTL_VERS) != 0)
-		return -EINVAL;
-		
-	switch (fc & IEEE80211_FCTL_FTYPE) {
-	case IEEE80211_FTYPE_MGMT:
-		ieee80211_rx_mgt(ieee, hdr, stats);
-		return 0;
-	case IEEE80211_FTYPE_DATA:
-		break;
-	case IEEE80211_FTYPE_CTL:
-		return 0;
-	default:
-		return -EINVAL;
-	}
-
-	is_packet_for_us = 0;
-	switch (ieee->iw_mode) {
-	case IW_MODE_ADHOC:
-		/* our BSS and not from/to DS */
-		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
-		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
-			/* promisc: get all */
-			if (ieee->dev->flags & IFF_PROMISC)
-				is_packet_for_us = 1;
-			/* to us */
-			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-				is_packet_for_us = 1;
-			/* mcast */
-			else if (is_multicast_ether_addr(hdr->addr1))
-				is_packet_for_us = 1;
-		}
-		break;
-	case IW_MODE_INFRA:
-		/* our BSS (== from our AP) and from DS */
-		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
-		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
-			/* promisc: get all */
-			if (ieee->dev->flags & IFF_PROMISC)
-				is_packet_for_us = 1;
-			/* to us */
-			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-				is_packet_for_us = 1;
-			/* mcast */
-			else if (is_multicast_ether_addr(hdr->addr1)) {
-				/* not our own packet bcasted from AP */
-				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
-					is_packet_for_us = 1;
-			}
-		}
-		break;
-	default:
-		/* ? */
-		break;
-	}
-
-	if (is_packet_for_us)
-		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
-	return 0;
-}
-
 #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
 
 static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1912
retrieving revision 1.1913
diff -u -r1.1912 -r1.1913
--- kernel-2.6.spec	6 Feb 2006 15:39:59 -0000	1.1912
+++ kernel-2.6.spec	6 Feb 2006 16:04:19 -0000	1.1913
@@ -377,6 +377,7 @@
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
+Patch5002: linux-2.6-bcm43xx-git-mb.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -886,8 +887,10 @@
 
 # Import softmac code from git tree
 %patch5000 -p1
-# ... and bcm43xx driver too
+# ... and bcm43xx driver too from jwl's tree
 %patch5001 -p1
+# ... and Michael Buesch's updates (2006-02-03)
+%patch5002 -p1
 
 #
 # final stuff



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:04:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:04:56 -0500
Subject: rpms/kernel/devel/configs config-generic,1.146,1.147
Message-ID: <200602061604.k16G4tW2021400@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	config-generic 
Log Message:
more bcm43xx updates


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- config-generic	4 Feb 2006 04:14:36 -0000	1.146
+++ config-generic	6 Feb 2006 16:04:42 -0000	1.147
@@ -1095,6 +1095,7 @@
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:06:56 -0500
Subject: rpms/hwbrowser/devel .cvsignore, 1.22, 1.23 hwbrowser.spec, 1.29,
	1.30 sources, 1.25, 1.26
Message-ID: <200602061606.k16G6uxZ021856@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/hwbrowser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21784

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
build and distribute Slovakian translation (#180089)
add sr at Latn translation, distribute Serbian translations (#176134)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	22 Nov 2005 06:22:18 -0000	1.22
+++ .cvsignore	6 Feb 2006 16:06:52 -0000	1.23
@@ -1,2 +1 @@
-hwbrowser-0.23.tar.gz
-hwbrowser-0.24.tar.gz
+hwbrowser-0.25.tar.gz


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- hwbrowser.spec	9 Dec 2005 22:40:56 -0000	1.29
+++ hwbrowser.spec	6 Feb 2006 16:06:52 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A hardware browser.
 Name: hwbrowser
-Version: 0.24
-Release: 1.1
+Version: 0.25
+Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -61,13 +61,19 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Mon Feb 06 2006 Nils Philippsen <nphilipp at redhat.com> 0.25
+- build and distribute Slovakian translation (#180089)
+
+* Thu Dec 22 2005 Nils Philippsen <nphilipp at redhat.com>
+- add sr at Latn translation, distribute Serbian translations (#176134)
 
 * Tue Nov 22 2005 Matthias Clasen <mclasen at redhat.com> 0.24
 - Remove "Browser" from name, classify as monitor for
   better menus
 
+* Mon Oct 10 2005 Nils Philippsen <nphilipp at redhat.com>
+- make disk layout scrollable (#167819, patch by Glen Johnson)
+
 * Fri Oct 07 2005 Nils Philippsen <nphilipp at redhat.com> 0.23
 - don't use pam_stack in PAM hwbrowser.pam (#169649)
 - appease "make distcheck"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	22 Nov 2005 06:22:19 -0000	1.25
+++ sources	6 Feb 2006 16:06:52 -0000	1.26
@@ -1 +1 @@
-4a105c6877192d79d8d37ae4d50a4517  hwbrowser-0.24.tar.gz
+99e00d542958e950b0ee8ef71cff0d27  hwbrowser-0.25.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:12:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:12:29 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.23,
	1.24 selinux-policy-targeted.spec, 1.356, 1.357
Message-ID: <200602061612.k16GCT2v024144@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24108

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
- Allow zebra to use bgp
- Allow spamd to connect to razor


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    4 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   13 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1678 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- policy-20050916.patch	2 Feb 2006 18:55:26 -0000	1.23
+++ policy-20050916.patch	6 Feb 2006 16:12:27 -0000	1.24
@@ -2885,8 +2885,8 @@
  dontaudit snmpd_t selinux_config_t:dir search;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/spamd.te policy-1.27.1/domains/program/unused/spamd.te
 --- nsapolicy/domains/program/unused/spamd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/spamd.te	2006-02-02 13:45:05.000000000 -0500
-@@ -9,20 +9,21 @@
++++ policy-1.27.1/domains/program/unused/spamd.te	2006-02-06 10:36:59.000000000 -0500
+@@ -9,21 +9,23 @@
  
  tmp_domain(spamd)
  
@@ -2910,9 +2910,11 @@
 +allow spamd_t port_type:udp_socket name_bind;
 +dontaudit spamd_t reserved_port_type:udp_socket name_bind;
  allow spamd_t self:capability net_bind_service;
++allow spamd_t razor_port_t:tcp_socket name_connect;
  
  allow spamd_t proc_t:file { getattr read };
-@@ -52,20 +53,4 @@
+ 
+@@ -52,20 +54,4 @@
  allow spamd_t urandom_device_t:chr_file { getattr read };
  
  system_crond_entry(spamd_exec_t, spamd_t)
@@ -3097,7 +3099,16 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-06 11:10:45.000000000 -0500
+@@ -8,7 +8,7 @@
+ type zebra_conf_t, file_type, sysadmfile;
+ r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
+ 
+-can_network_server(zebra_t)
++can_network(zebra_t)
+ can_ypbind(zebra_t)
+ allow zebra_t { etc_t etc_runtime_t }:file { getattr read };
+ 
 @@ -24,7 +24,7 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -4935,7 +4946,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts
 --- nsapolicy/net_contexts	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/net_contexts	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/net_contexts	2006-02-06 11:09:39.000000000 -0500
 @@ -50,6 +50,10 @@
  portcon tcp 53 system_u:object_r:dns_port_t
  
@@ -4964,15 +4975,17 @@
  portcon tcp 783 system_u:object_r:spamd_port_t
  portcon tcp 540 system_u:object_r:uucpd_port_t
  portcon tcp 2401 system_u:object_r:cvs_port_t
-@@ -146,6 +149,7 @@
+@@ -145,7 +148,9 @@
+ portcon udp 4569 system_u:object_r:asterisk_port_t
  portcon udp 5060 system_u:object_r:asterisk_port_t
  portcon tcp 2000 system_u:object_r:mail_port_t
++portcon tcp 179  system_u:object_r:zebra_port_t
  portcon tcp 2601 system_u:object_r:zebra_port_t
 +portcon tcp 2605 system_u:object_r:zebra_port_t
  portcon tcp 2628 system_u:object_r:dict_port_t
  portcon tcp 3306 system_u:object_r:mysqld_port_t
  portcon tcp 3632 system_u:object_r:distccd_port_t
-@@ -161,9 +165,14 @@
+@@ -161,9 +166,14 @@
  portcon tcp 5432 system_u:object_r:postgresql_port_t
  portcon tcp 5666 system_u:object_r:inetd_child_port_t
  portcon tcp 5703 system_u:object_r:ptal_port_t


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- selinux-policy-targeted.spec	2 Feb 2006 18:55:26 -0000	1.356
+++ selinux-policy-targeted.spec	6 Feb 2006 16:12:27 -0000	1.357
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.20
+Release: 2.21
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,6 +234,10 @@
 exit 0
 
 %changelog
+* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
+- Allow zebra to use bgp
+- Allow spamd to connect to razor
+
 * Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.20
 - Add ldap support to spamd
 - Auditing changes 



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:20:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:20:45 -0500
Subject: rpms/tclx/devel tclx-8.4-relid.patch, NONE,
	1.1 tclx-8.4-varinit.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 tclx.spec, 1.8,
	1.9 tclx-8.3-nonstrip.patch, 1.1, NONE tclx-8.3-varinit.patch,
	1.1, NONE tclx-8.3.5-clock_t-gcc4.patch, 1.1,
	NONE tclx-8.3.5-tcl-mk-skiptest.patch, 1.1,
	NONE tclx-8.3.5-tcltk-man-help.patch, 1.1,
	NONE tclx-8.3.5-tclxConfig-ld-search-flags.patch, 1.1, NONE
Message-ID: <200602061620.k16GKjwm007890@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7803

Modified Files:
	.cvsignore sources tclx.spec 
Added Files:
	tclx-8.4-relid.patch tclx-8.4-varinit.patch 
Removed Files:
	tclx-8.3-nonstrip.patch tclx-8.3-varinit.patch 
	tclx-8.3.5-clock_t-gcc4.patch tclx-8.3.5-tcl-mk-skiptest.patch 
	tclx-8.3.5-tcltk-man-help.patch 
	tclx-8.3.5-tclxConfig-ld-search-flags.patch 
Log Message:
Upgraded to tclx-8.4.0.


tclx-8.4-relid.patch:
 configure        |    2 +-
 tclconfig/tcl.m4 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tclx-8.4-relid.patch ---
--- tclx8.4/configure.relid	2006-02-03 16:13:25.000000000 -0500
+++ tclx8.4/configure	2006-02-03 16:13:33.000000000 -0500
@@ -6999,7 +6999,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- tclx8.4/tclconfig/tcl.m4.relid	2006-02-03 16:13:43.000000000 -0500
+++ tclx8.4/tclconfig/tcl.m4	2006-02-03 16:13:57.000000000 -0500
@@ -859,7 +859,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2302,7 +2302,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`

tclx-8.4-varinit.patch:
 tclXdup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tclx-8.4-varinit.patch ---
--- tclx8.4/generic/tclXdup.c.varinit	2006-02-03 15:54:38.000000000 -0500
+++ tclx8.4/generic/tclXdup.c	2006-02-03 15:54:53.000000000 -0500
@@ -202,7 +202,7 @@
 {
     Tcl_Channel newChannel;
     int bindFnum, fnum;
-    char *srcChannelId, *targetChannelId;
+    char *srcChannelId = NULL, *targetChannelId;
 
     if ((objc < 2) || (objc > 3)) {
         return TclX_WrongArgs (interp, objv [0],


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 13:06:01 -0000	1.2
+++ .cvsignore	6 Feb 2006 16:20:42 -0000	1.3
@@ -1,3 +1,4 @@
 tcl-8.4.5-doc.tar.bz2
 tclx8.3.5-src.tar.gz
 tk-8.4.5-doc.tar.bz2
+tclx8.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 13:06:01 -0000	1.2
+++ sources	6 Feb 2006 16:20:42 -0000	1.3
@@ -1,3 +1 @@
-00571b241f2ec2dee6af1f6b1c0a6ffc  tcl-8.4.5-doc.tar.bz2
-2cdd06d29f6dfbf31bf4ce192cf46918  tclx8.3.5-src.tar.gz
-fd5f4b897c45543d99b69e0610b70420  tk-8.4.5-doc.tar.bz2
+395c2fbe35e1723570b005161b9fc8f8  tclx8.4.tar.bz2


Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tclx.spec	9 Dec 2005 22:43:31 -0000	1.8
+++ tclx.spec	6 Feb 2006 16:20:42 -0000	1.9
@@ -1,26 +1,20 @@
-%define major_ver 8.3
-%define tcltk_ver 8.4.5
+%define major_ver 8.4
+%define tcltk_ver 8.4.12
 
 Summary: Extensions for Tcl and Tk
 Name: tclx
-Version: 8.3.5
-Release: 6.1
+Version: %{major_ver}.0
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
-Source: http://prdownloads.sourceforge.net/tclx/tclx%{version}-src.tar.gz
-Source1: tcl-%{tcltk_ver}-doc.tar.bz2
-Source2: tk-%{tcltk_ver}-doc.tar.bz2
+Source: http://prdownloads.sourceforge.net/tclx/tclx%{major_ver}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: tcl tk
-Buildrequires: tcl-devel tk-devel groff autoconf213
-Patch1: tclx-8.3-varinit.patch
-Patch2: tclx-8.3-nonstrip.patch
-# avoid tclXtest target which requires .c files from tcl to build
-Patch3: tclx-8.3.5-tcl-mk-skiptest.patch
-Patch4: tclx-8.3.5-tclxConfig-ld-search-flags.patch
-Patch5: tclx-8.3.5-tcltk-man-help.patch
-Patch6: tclx-8.3.5-clock_t-gcc4.patch
+Requires: tcl >= %{tcltk_ver}, tk >= %{tcltk_ver}
+BuildRequires: tcl-devel >= %{tcltk_ver}, tk-devel >= %{tcltk_ver}
+BuildRequires: groff, autoconf
+Patch1: tclx-%{major_ver}-varinit.patch
+Patch2: tclx-%{major_ver}-relid.patch
 
 %description
 Extended Tcl (TclX) is a set of extensions to the Tcl programming language.
@@ -58,43 +52,38 @@
 This package contains the tclx documentation
 
 %prep
-%setup -q -n tclx%{version} -a 1 -a 2
-%patch1 -p1 -b .1.orig
-%patch2 -p1 -b .2.orig
-%patch3 -p1 -b .3.test
-%patch4 -p1 -b .4.orig
-%patch5 -p1 -b .5.man
-%patch6 -p1 -b .6.clock_t
+%setup -q -n tclx%{major_ver}
+%patch1 -p1 -b .1.varinit
+%patch2 -p1 -b .2.relid
 
-%build
-cd unix
-# setup T(CL|K)X_LIB_SPEC correctly in t(cl|k)xConfig.sh
-export TCLX_INST_LIB=%{_libdir}
-
-# patch6 touches configure.in
-autoconf-2.13
+# patch2 touches tcl.m4
+autoconf
 
-%configure --enable-tk=YES --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir} --enable-gcc --enable-64bit
+%build
+%configure \
+   --enable-tk=YES \
+   --with-tclconfig=%{_libdir} \
+   --with-tkconfig=%{_libdir} \
+   --with-tclinclude=%{_includedir} \
+   --with-tkinclude=%{_includedir} \
+   --enable-gcc \
+   --enable-64bit
 # smp building doesn't work
 make all
 
+# run "make test" by default
+%{?_without_check: %define _without_check 1}
+%{!?_without_check: %define _without_check 0}
+
+%if ! %{_without_check}
+   make test
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # utf-8 locale needed to avoid truncating help files
-LANG=en_US.UTF-8 make install -C unix INSTALL_ROOT=%{buildroot} TCLX_INST_LIB=%{_libdir} TKX_INST_LIB=%{_libdir} TCLX_INST_RUNTIME=%{_datadir}/tclX%{major_ver} TKX_INST_RUNTIME=%{_datadir}/tkX%{major_ver} TCLX_EXEC_RUNTIME=%{_libdir}/tclX%{major_ver} TKX_EXEC_RUNTIME=%{_libdir}/tkX%{major_ver} TCLX_INST_MAN=%{_mandir}
-
-# for linking with -ltclx and -ltkx
-ln -s libtclx%{major_ver}.so %{buildroot}%{_libdir}/libtclx.so
-ln -s libtkx%{major_ver}.so %{buildroot}%{_libdir}/libtkx.so
-ln -s libtclx%{major_ver}.a %{buildroot}%{_libdir}/libtclx.a
-ln -s libtkx%{major_ver}.a %{buildroot}%{_libdir}/libtkx.a
-
-# remove buildroot traces
-perl -pi -e "s!$PWD/t(cl|k)/unix!%{_libdir}!" %buildroot/%{_libdir}/t{cl,k}xConfig.sh
-
-# rename memory.n since tcl-devel also provides it
-mv $RPM_BUILD_ROOT%{_mandir}/mann/{m,M}emory.n
+LANG=en_US.UTF-8 make install DESTDIR=%{buildroot}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,36 +94,23 @@
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/tcl
-%{_bindir}/wishx
-%{_datadir}/tclX%{major_ver}
-%{_datadir}/tkX%{major_ver}
-%exclude %{_datadir}/tclX%{major_ver}/help
-%exclude %{_datadir}/tkX%{major_ver}/help
-%{_libdir}/libtclx%{major_ver}.so
-%{_libdir}/libtkx%{major_ver}.so
-%{_libdir}/tclX%{major_ver}
-%{_libdir}/tkX%{major_ver}
-%{_libdir}/tclxConfig.sh
-%{_libdir}/tkxConfig.sh
+%{_libdir}/%{name}%{major_ver}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/libtclx.so
-%{_libdir}/libtkx.so
-%{_libdir}/libtclx*.a
-%{_libdir}/libtkx*.a
 
 %files doc
 %defattr(-,root,root,-)
-%doc CHANGES ChangeLog README TO-DO doc/CONVERSION-NOTES
-%{_bindir}/tclhelp
-%{_datadir}/tclX%{major_ver}/help
-%{_datadir}/tkX%{major_ver}/help
+%doc ChangeLog README
 %{_mandir}/man*
 
 %changelog
+* Fri Feb 03 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-1
+- Upgraded to tclx-8.4.0
+- Removed patches that applied to the old build method for tclx
+- Removed Tcl and Tk doc archives
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


--- tclx-8.3-nonstrip.patch DELETED ---


--- tclx-8.3-varinit.patch DELETED ---


--- tclx-8.3.5-clock_t-gcc4.patch DELETED ---


--- tclx-8.3.5-tcl-mk-skiptest.patch DELETED ---


--- tclx-8.3.5-tcltk-man-help.patch DELETED ---


--- tclx-8.3.5-tclxConfig-ld-search-flags.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:23:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:23:22 -0500
Subject: rpms/pango/devel .cvsignore, 1.26, 1.27 pango.spec, 1.54,
	1.55 sources, 1.26, 1.27
Message-ID: <200602061623.k16GNMSg009169@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9100

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.11.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 Jan 2006 02:44:02 -0000	1.26
+++ .cvsignore	6 Feb 2006 16:23:18 -0000	1.27
@@ -10,3 +10,4 @@
 pango-1.11.1.tar.bz2
 pango-1.11.2.tar.bz2
 pango-1.11.3.tar.bz2
+pango-1.11.4.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pango.spec	31 Jan 2006 02:47:31 -0000	1.54
+++ pango.spec	6 Feb 2006 16:23:18 -0000	1.55
@@ -5,9 +5,9 @@
 %define fontconfig_version 2.0
 %define cairo_version 0.9.2
 
-Summary: System for layout and rendering of internationalized text.
+Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.11.3
+Version: 1.11.4
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -18,7 +18,7 @@
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
 Prereq: freetype >= %{freetype_version}
-Prereq: libXrender, libX11, libXext, libXft
+Requires(pre): libXrender, libX11, libXext, libXft
 Requires: freetype >= %{freetype_version}
 Requires: cairo >= %{cairo_version}
 BuildRequires: libtool >= 1.4.2-10
@@ -187,6 +187,9 @@
 
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-1
+- Update to 1.11.4
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.3-1
 - Update to 1.11.3
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	31 Jan 2006 02:44:02 -0000	1.26
+++ sources	6 Feb 2006 16:23:18 -0000	1.27
@@ -1 +1 @@
-2a73f535c07b187503e4610bb1b5a972  pango-1.11.3.tar.bz2
+eb605a207bcc44ad7554c56c073aa17b  pango-1.11.4.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 16:37:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 11:37:07 -0500
Subject: rpms/pango/devel pango.spec,1.55,1.56
Message-ID: <200602061637.k16Gb7Ke003663@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3647

Modified Files:
	pango.spec 
Log Message:
Fix paths



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pango.spec	6 Feb 2006 16:23:18 -0000	1.55
+++ pango.spec	6 Feb 2006 16:37:05 -0000	1.56
@@ -103,7 +103,7 @@
 
 # Remove files that should not be packaged
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/pango/1.4.0/modules/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/pango/*/modules/*.la
 
 PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
 if ! test -e $PANGOXFT_SO; then



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:03:13 -0500
Subject: rpms/firstboot/devel .cvsignore, 1.45, 1.46 firstboot.spec, 1.64,
	1.65 sources, 1.61, 1.62
Message-ID: <200602061703.k16H3DcQ027174@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27140

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	27 Jan 2006 19:36:14 -0000	1.45
+++ .cvsignore	6 Feb 2006 17:03:06 -0000	1.46
@@ -17,3 +17,4 @@
 firstboot-1.4.0.tar.bz2
 firstboot-1.4.1.tar.bz2
 firstboot-1.4.2.tar.bz2
+firstboot-1.4.3.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- firstboot.spec	27 Jan 2006 19:36:14 -0000	1.64
+++ firstboot.spec	6 Feb 2006 17:03:07 -0000	1.65
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.2
+Version: 1.4.3
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -21,6 +21,8 @@
 Requires: system-config-securitylevel
 Requires: system-config-network
 Requires: system-config-users
+Requires: system-config-date >= 1.7.9
+Requires: system-config-keyboard
 Requires: authconfig-gtk
 Requires: libuser
 Requires: redhat-logos
@@ -41,12 +43,8 @@
 Requires: python
 Requires: usermode >= 1.36
 Requires: rhpl
-Requires: system-config-date >= 1.7.9
-Requires: system-config-keyboard
 Requires: system-config-securitylevel-tui
-Requires: system-config-rootpassword
 Requires: netconfig
-Requires: system-config-printer
 Requires: ntsysv
 Requires: authconfig
 
@@ -72,7 +70,7 @@
 then
   chkconfig --add firstboot
 fi
-		
+
 %preun
 if [ $1 = 0 ]; then
   rm -rf /usr/share/firstboot/*.pyc
@@ -110,6 +108,13 @@
 
 
 %changelog
+* Mon Feb 06 2006 Chris Lumens <clumens at redhat.com> 1.4.3-1
+- Tweak firstboot-tui requires to not require X (#180046).
+- Wrap left side labels if they're too long.
+- Remove "Click to Finish" module (#178109).
+- Try to prevent running in runlevel 3 if we failed in runlevel 5
+  (#145169).
+
 * Fri Jan 27 2006 Chris Lumens <clumens at redhat.com> 1.4.2-1
 - Layout cleanups and simplification.
 - Use GTK styles to display the new artwork in non-debug mode.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	27 Jan 2006 19:36:14 -0000	1.61
+++ sources	6 Feb 2006 17:03:07 -0000	1.62
@@ -1 +1 @@
-89721b1abb09412819c2355ab98e34be  firstboot-1.4.2.tar.bz2
+dd30d0d5563c3549adbba86db6134a5d  firstboot-1.4.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:14:43 -0500
Subject: rpms/pango/devel pango.spec,1.56,1.57
Message-ID: <200602061714.k16HEh01030900@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30834

Modified Files:
	pango.spec 
Log Message:
1.11.4



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pango.spec	6 Feb 2006 16:37:05 -0000	1.56
+++ pango.spec	6 Feb 2006 17:14:40 -0000	1.57
@@ -183,6 +183,7 @@
 %{_libdir}/libpango*.so
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
+%{_bindir}/pango-view
 %{_datadir}/gtk-doc/*
 
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:19:41 -0500
Subject: rpms/control-center/devel .cvsignore, 1.34, 1.35 control-center.spec,
	1.118, 1.119 sources, 1.37, 1.38
Message-ID: <200602061719.k16HJfV8013065@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12932

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
backgroundcappletectomy



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	30 Jan 2006 19:11:08 -0000	1.34
+++ .cvsignore	6 Feb 2006 17:19:37 -0000	1.35
@@ -7,3 +7,4 @@
 control-center-2.13.5.tar.bz2
 control-center-2.13.5.1.tar.bz2
 control-center-2.13.90.tar.bz2
+control-center-2.12.3.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- control-center.spec	3 Feb 2006 19:15:38 -0000	1.118
+++ control-center.spec	6 Feb 2006 17:19:37 -0000	1.119
@@ -25,7 +25,8 @@
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2
+Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.13/control-center-%{version}.tar.bz2
+Source2: ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.12/control-center-2.12.3.tar.bz2
 
 Patch1: control-center-2.13.90-fedora-apps.patch
 Patch2: control-center-2.9.4-filesel.patch
@@ -93,6 +94,10 @@
 %prep
 %setup -q
 
+tar xjf ../control-center-2.12.3.tar.bz2
+rm -rf capplets/background
+cp -R control-center-2.12.3/capplets/background capplets
+
 %patch1 -p1 -b .fedora-apps
 %patch2 -p1 -b .filesel
 %patch3 -p1 -b .mark-tool-buttons-important


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	30 Jan 2006 19:11:08 -0000	1.37
+++ sources	6 Feb 2006 17:19:37 -0000	1.38
@@ -1 +1,2 @@
 bdf783600f3774e1bf0b0ed1f6fd6ba7  control-center-2.13.90.tar.bz2
+e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:20:43 -0500
Subject: rpms/control-center/devel control-center.spec,1.119,1.120
Message-ID: <200602061720.k16HKhZW013579@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13460

Modified Files:
	control-center.spec 
Log Message:
Go back to the 2.12 background capplet



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- control-center.spec	6 Feb 2006 17:19:37 -0000	1.119
+++ control-center.spec	6 Feb 2006 17:20:41 -0000	1.120
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.90
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -228,6 +228,9 @@
 # (also its headers)
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-3
+- Use the 2.12 background capplet
+
 * Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> 1:2.13.90-2
 - Patch gnome-about-me's file chooser dialog to default to the
   system faces directory



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:22:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:22:40 -0500
Subject: rpms/gnome-menus/devel gnome-menus-2.13.5-break-loop.patch, NONE,
	1.1 gnome-menus.spec, 1.24, 1.25
Message-ID: <200602061722.k16HMe9w014576@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-menus.spec 
Added Files:
	gnome-menus-2.13.5-break-loop.patch 
Log Message:
- break infinite loop 


gnome-menus-2.13.5-break-loop.patch:
 gmenu-tree.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE gnome-menus-2.13.5-break-loop.patch ---
--- gnome-menus-2.13.5/libmenu/gmenu-tree.c.break-loop	2006-02-06 12:16:09.000000000 -0500
+++ gnome-menus-2.13.5/libmenu/gmenu-tree.c	2006-02-06 12:16:25.000000000 -0500
@@ -764,8 +764,7 @@
       path = NULL;
     }
 
-  tmp = directory->contents;
-  while (tmp != NULL)
+  for (tmp = directory->contents; tmp != NULL; tmp = tmp->next)
     {
       GMenuTreeItem *item = tmp->data;
 
@@ -781,8 +780,6 @@
 	  else
 	    return GMENU_TREE_DIRECTORY (item);
 	}
-
-      tmp = tmp->next;
     }
 
   g_free (freeme);


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-menus.spec	1 Feb 2006 22:26:06 -0000	1.24
+++ gnome-menus.spec	6 Feb 2006 17:22:38 -0000	1.25
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.13.5
-Release: 4
+Release: 5
 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
+Patch0: gnome-menus-2.13.5-break-loop.patch
 
 %description
 gnome-menus is an implementation of the draft "Desktop
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .break-loop
 
 %build
 %configure \
@@ -89,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Mon Feb  6 2006 Ray Strode <rstrode at redhat.com> 2.13.5-5
+- break infinite loop 
+
 * Wed Feb  1 2006 Ray Strode <rstrode at redhat.com> 2.13.5-4
 - don't ship upstream Desktop.directory files
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:25:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:25:48 -0500
Subject: rpms/control-center/devel control-center.spec,1.120,1.121
Message-ID: <200602061725.k16HPmqh016130@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16045

Modified Files:
	control-center.spec 
Log Message:
Fix spec



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- control-center.spec	6 Feb 2006 17:20:41 -0000	1.120
+++ control-center.spec	6 Feb 2006 17:25:45 -0000	1.121
@@ -94,7 +94,7 @@
 %prep
 %setup -q
 
-tar xjf ../control-center-2.12.3.tar.bz2
+tar xjf %{SOURCE2}
 rm -rf capplets/background
 cp -R control-center-2.12.3/capplets/background capplets
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:34:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:34:05 -0500
Subject: rpms/gtk2/devel gtk2.spec, 1.115, 1.116 render-avoid-repeat.patch,
	1.2, 1.3
Message-ID: <200602061734.k16HY4RR018507@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec render-avoid-repeat.patch 
Log Message:
Sync render fix



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gtk2.spec	3 Feb 2006 05:28:12 -0000	1.115
+++ gtk2.spec	6 Feb 2006 17:34:01 -0000	1.116
@@ -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,7 @@
 Patch1: gtk+-2.8.6-inputmethod.patch
 Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 # Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320
+# fixed in 2.8.12
 Patch4: render-avoid-repeat.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
@@ -262,6 +263,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-4
+- Sync render fix with upstream
+
 * Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-3
 - Avoid a slowpath in XRender
 

render-avoid-repeat.patch:
 gdkwindow.c |  127 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 102 insertions(+), 25 deletions(-)

Index: render-avoid-repeat.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/render-avoid-repeat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- render-avoid-repeat.patch	3 Feb 2006 05:28:12 -0000	1.2
+++ render-avoid-repeat.patch	6 Feb 2006 17:34:01 -0000	1.3
@@ -1,34 +1,171 @@
 --- gtk+-2.8.11/gdk/gdkwindow.c.render-avoid-repeat	2005-09-26 16:28:34.000000000 -0400
-+++ gtk+-2.8.11/gdk/gdkwindow.c	2006-02-03 00:27:26.000000000 -0500
-@@ -1746,6 +1746,10 @@
++++ gtk+-2.8.11/gdk/gdkwindow.c	2006-02-06 12:32:27.000000000 -0500
+@@ -1725,43 +1725,86 @@
+   RESTORE_GC (gc);
+ }
+ 
++typedef struct {
++  cairo_t *cr; /* if non-null, it means use this cairo context */
++  GdkGC *gc;   /* if non-null, it means use this GC instead */
++} BackingRectMethod;
++
+ static void
+-gdk_window_set_bg_pattern (GdkWindow      *window,
+-			   cairo_t        *cr,
+-			   int             x_offset,
+-			   int             y_offset)
++setup_backing_rect_method (BackingRectMethod *method, GdkWindow *window, GdkWindowPaint *paint, int x_offset_cairo, int y_offset_cairo)
+ {
+   GdkWindowObject *private = (GdkWindowObject *)window;
+ 
+   if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
      {
+-      x_offset += private->x;
+-      y_offset += private->y;
+-      gdk_window_set_bg_pattern (GDK_WINDOW (private->parent), cr,
+-				 x_offset, y_offset);
+-    }
+-  else if (private->bg_pixmap && 
+-           private->bg_pixmap != GDK_PARENT_RELATIVE_BG && 
+-           private->bg_pixmap != GDK_NO_BG)
+-    {
++      GdkWindowPaint tmp_paint;
++
++      tmp_paint = *paint;
++      tmp_paint.x_offset += private->x;
++      tmp_paint.y_offset += private->y;
++
++      x_offset_cairo += private->x;
++      y_offset_cairo += private->y;
++
++      setup_backing_rect_method (method, GDK_WINDOW (private->parent), &tmp_paint, x_offset_cairo, y_offset_cairo);
++    }
++  else if (private->bg_pixmap &&
++	   private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
++	   private->bg_pixmap != GDK_NO_BG)
++    {
++/* This is a workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320.
++ * In it, using a pixmap as a repeating pattern in Cairo, and painting it to a
++ * pixmap destination surface, can be very slow (on the order of seconds for a
++ * whole-screen copy).  The workaround is to use pretty much the same code that
++ * we used in GTK+ 2.6 (pre-Cairo), which clears the double-buffer pixmap with
++ * a tiled GC XFillRectangle().
++ */
++
++/* Actually computing this flag is left as an exercise for the reader */
++#if defined (G_OS_UNIX)
++#  define GDK_CAIRO_REPEAT_IS_FAST 0
++#else
++#  define GDK_CAIRO_REPEAT_IS_FAST 1
++#endif
++
++#if GDK_CAIRO_REPEAT_IS_FAST
        cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
        cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
-+
-+      gint pixmap_width, pixmap_height;
-+      gint window_width, window_height;
-+ 
        cairo_surface_destroy (surface);
  
-       if (x_offset != 0 || y_offset != 0)
-@@ -1755,7 +1759,19 @@
+-      if (x_offset != 0 || y_offset != 0)
++      if (x_offset_cairo != 0 || y_offset_cairo != 0)
+ 	{
+ 	  cairo_matrix_t matrix;
+-	  cairo_matrix_init_translate (&matrix, x_offset, y_offset);
++	  cairo_matrix_init_translate (&matrix, x_offset_cairo, y_offset_cairo);
  	  cairo_pattern_set_matrix (pattern, &matrix);
  	}
  
--      cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-+      /* Workaround for a bug in Cairo and/or XRENDER: https://bugs.freedesktop.org/show_bug.cgi?id=4320
-+       *
-+       * Repeat fills with a pixmap pattern and a pixmap destination surface are
-+       * slow.  So, we do a lame test for "do we actually need to repeat".
-+       */
-+      gdk_drawable_get_size (GDK_DRAWABLE (private->bg_pixmap), 
-+			     &pixmap_width, &pixmap_height);
-+      gdk_drawable_get_size (GDK_DRAWABLE (window), 
-+			     &window_width, &window_height);
-+      if (x_offset != 0 || y_offset != 0 ||
-+	  pixmap_width < window_width || pixmap_height < window_height)
-+        cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+       cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
+-      cairo_set_source (cr, pattern);
 +
-       cairo_set_source (cr, pattern);
++      method->cr = cairo_create (paint->surface);
++      method->gc = NULL;
++
++      cairo_set_source (method->cr, pattern);
        cairo_pattern_destroy (pattern);
++#else
++      guint gc_mask;
++      GdkGCValues gc_values;
++
++      gc_values.fill = GDK_TILED;
++      gc_values.tile = private->bg_pixmap;
++      gc_values.ts_x_origin = -x_offset_cairo;
++      gc_values.ts_y_origin = -y_offset_cairo;
++
++      gc_mask = GDK_GC_FILL | GDK_GC_TILE | GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN;
++
++      method->gc = gdk_gc_new_with_values (paint->pixmap, &gc_values, gc_mask);
++#endif
+     }
+   else
+     {
+-      gdk_cairo_set_source_color (cr, &private->bg_color);
++      method->cr = cairo_create (paint->surface);
++
++      gdk_cairo_set_source_color (method->cr, &private->bg_color);
      }
+ }
+ 
+@@ -1774,22 +1817,56 @@
+ {
+   GdkWindowObject *private = (GdkWindowObject *)window;
+   GdkWindowPaint *paint = private->paint_stack->data;
+-  cairo_t *cr;
++  BackingRectMethod method;
++#if 0
++  GTimer *timer;
++  double elapsed;
++#endif
+ 
+   if (GDK_WINDOW_DESTROYED (window))
+     return;
+ 
+-  cr = cairo_create (paint->surface);
++#if 0
++  timer = g_timer_new ();
++#endif
++
++  method.cr = NULL;
++  method.gc = NULL;
++  setup_backing_rect_method (&method, window, paint, 0, 0);
++
++  if (method.cr)
++    {
++      g_assert (method.gc == NULL);
++
++      cairo_rectangle (method.cr, x, y, width, height);
++      cairo_clip (method.cr);
+ 
+-  gdk_window_set_bg_pattern (window, cr, 0, 0);
++      gdk_cairo_region (method.cr, paint->region);
++      cairo_fill (method.cr);
+ 
+-  cairo_rectangle (cr, x, y, width, height);
+-  cairo_clip (cr);
++      cairo_destroy (method.cr);
++#if 0
++      elapsed = g_timer_elapsed (timer, NULL);
++      g_print ("Draw the background with Cairo: %fs\n", elapsed);
++#endif
++    }
++  else
++    {
++      g_assert (method.gc != NULL);
+ 
+-  gdk_cairo_region (cr, paint->region);
+-  cairo_fill (cr);
++      gdk_gc_set_clip_region (method.gc, paint->region);
++      gdk_draw_rectangle (window, method.gc, TRUE, x, y, width, height);
++      g_object_unref (method.gc);
++
++#if 0
++      elapsed = g_timer_elapsed (timer, NULL);
++      g_print ("Draw the background with GDK: %fs\n", elapsed);
++#endif
++    }
+ 
+-  cairo_destroy (cr);
++#if 0
++  g_timer_destroy (timer);
++#endif
+ }
+ 
+ /**



From fedora-cvs-commits at redhat.com  Mon Feb  6 17:36:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 12:36:37 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.116,1.117
Message-ID: <200602061736.k16HabJl019279@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Log Message:
bump rev



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gtk2.spec	6 Feb 2006 17:34:01 -0000	1.116
+++ gtk2.spec	6 Feb 2006 17:36:35 -0000	1.117
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -263,7 +263,7 @@
 %doc tmpdocs/examples
 
 %changelog
-* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-4
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-5
 - Sync render fix with upstream
 
 * Fri Feb  3 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-3



From fedora-cvs-commits at redhat.com  Mon Feb  6 19:12:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 14:12:16 -0500
Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.31,
	1.32 policygentool, 1.1, 1.2 selinux-policy.spec, 1.100, 1.101
Message-ID: <200602061912.k16JCGaU017612@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17575

Modified Files:
	policy-20060104.patch policygentool selinux-policy.spec 
Log Message:


policy-20060104.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/kudzu.te             |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/usermanage.te        |    3 +
 policy/modules/apps/mono.te               |    2 -
 policy/modules/apps/wine.te               |    2 -
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/filesystem.if       |   52 ++++++++++++++++++++++++------
 policy/modules/kernel/filesystem.te       |    1 
 policy/modules/kernel/mls.te              |    3 +
 policy/modules/services/apache.fc         |    2 +
 policy/modules/services/apache.te         |    1 
 policy/modules/services/automount.te      |    1 
 policy/modules/services/hal.te            |    4 ++
 policy/modules/services/irqbalance.te     |    3 +
 policy/modules/services/mta.if            |    1 
 policy/modules/services/networkmanager.fc |    4 +-
 policy/modules/services/networkmanager.te |    9 +++--
 policy/modules/services/procmail.te       |    1 
 policy/modules/services/sendmail.if       |   15 ++++++++
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/xserver.fc        |    9 +++--
 policy/modules/services/xserver.if        |   21 ++++++++++++
 policy/modules/services/xserver.te        |    9 ++---
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/logging.te          |    2 -
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/unconfined.if       |    8 +++-
 policy/modules/system/unconfined.te       |   10 +++++
 policy/modules/system/userdomain.te       |    2 +
 36 files changed, 172 insertions(+), 37 deletions(-)

Index: policy-20060104.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- policy-20060104.patch	4 Feb 2006 03:03:32 -0000	1.31
+++ policy-20060104.patch	6 Feb 2006 19:12:13 -0000	1.32
@@ -118,6 +118,17 @@
  	role system_r types wine_t;
  	allow wine_t file_type:file execmod;
  ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.11/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/kernel/corenetwork.te.in	2006-02-06 11:05:26.000000000 -0500
+@@ -124,6 +124,7 @@
+ network_port(uucpd, tcp,540,s0)
+ network_port(vnc, tcp,5900,s0)
+ network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
++network_port(bgp, tcp,179,s0, udp,179,s0)
+ network_port(zebra, tcp,2601,s0)
+ network_port(zope, tcp,8021,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.11/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
 +++ serefpolicy-2.2.11/policy/modules/kernel/devices.fc	2006-02-03 21:18:32.000000000 -0500
@@ -348,8 +359,16 @@
  corecmd_exec_bin(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.11/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.11/policy/modules/services/hal.te	2006-02-03 21:18:32.000000000 -0500
-@@ -51,6 +51,7 @@
++++ serefpolicy-2.2.11/policy/modules/services/hal.te	2006-02-05 14:36:21.000000000 -0500
+@@ -21,6 +21,7 @@
+ # Local policy
+ #
+ 
++
+ # execute openvt which needs setuid
+ allow hald_t self:capability { setuid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio };
+ dontaudit hald_t self:capability sys_tty_config;
+@@ -51,6 +52,7 @@
  kernel_write_proc_files(hald_t)
  
  bootloader_getattr_boot_dirs(hald_t)
@@ -357,6 +376,15 @@
  
  corecmd_exec_bin(hald_t)
  corecmd_exec_sbin(hald_t)
+@@ -97,6 +99,8 @@
+ 
+ mls_file_read_up(hald_t)
+ 
++modutils_domtrans_insmod_uncond(hald_t)
++
+ selinux_get_fs_mount(hald_t)
+ selinux_validate_context(hald_t)
+ selinux_compute_access_vector(hald_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.11/policy/modules/services/irqbalance.te
 --- nsaserefpolicy/policy/modules/services/irqbalance.te	2006-02-03 08:55:53.000000000 -0500
 +++ serefpolicy-2.2.11/policy/modules/services/irqbalance.te	2006-02-03 21:18:32.000000000 -0500
@@ -370,6 +398,17 @@
  fs_getattr_all_fs(irqbalance_t)
  fs_search_auto_mountpoints(irqbalance_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.11/policy/modules/services/mta.if
+--- nsaserefpolicy/policy/modules/services/mta.if	2006-02-03 15:45:55.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/mta.if	2006-02-06 09:35:12.000000000 -0500
+@@ -434,6 +434,7 @@
+ 
+ 	allow $1 sendmail_exec_t:lnk_file r_file_perms;
+ 	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
++	domain_entry_file($1,sendmail_exec_t)
+ 
+ 	allow $1 system_mail_t:fd use;
+ 	allow system_mail_t $1:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.11/policy/modules/services/networkmanager.fc
 --- nsaserefpolicy/policy/modules/services/networkmanager.fc	2005-11-14 18:24:07.000000000 -0500
 +++ serefpolicy-2.2.11/policy/modules/services/networkmanager.fc	2006-02-03 21:18:32.000000000 -0500
@@ -443,11 +482,12 @@
  ## <summary>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.11/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.11/policy/modules/services/spamassassin.te	2006-02-03 21:18:32.000000000 -0500
-@@ -77,6 +77,7 @@
++++ serefpolicy-2.2.11/policy/modules/services/spamassassin.te	2006-02-06 10:36:10.000000000 -0500
+@@ -77,6 +77,8 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
  corenet_udp_bind_generic_port(spamd_t)
++corenet_tcp_connect_razor_port(spamd_t)
 +sysnet_use_ldap(spamd_t)
  
  dev_read_sysfs(spamd_t)
@@ -533,6 +573,18 @@
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.11/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.11/policy/modules/services/zebra.te	2006-02-06 11:01:37.000000000 -0500
+@@ -34,7 +34,7 @@
+ allow zebra_t self:unix_dgram_socket create_socket_perms;
+ allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
+ allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
+-allow zebra_t self:tcp_socket connected_stream_socket_perms;
++allow zebra_t self:tcp_socket { connect connected_stream_socket_perms };
+ allow zebra_t self:udp_socket create_socket_perms;
+ allow zebra_t self:rawip_socket create_socket_perms;
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.11/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
 +++ serefpolicy-2.2.11/policy/modules/system/init.fc	2006-02-03 21:18:32.000000000 -0500


Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policygentool	3 Feb 2006 14:59:07 -0000	1.1
+++ policygentool	6 Feb 2006 19:12:13 -0000	1.2
@@ -68,7 +68,7 @@
 
 ########################### Type Enforcement File #############################
 te="\n\
-policy_module(TEMPLATE,1.0.0)\n\
+policy_module(TEMPLATETYPE,1.0.0)\n\
 \n\
 ########################################\n\
 #\n\


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- selinux-policy.spec	4 Feb 2006 03:03:32 -0000	1.100
+++ selinux-policy.spec	6 Feb 2006 19:12:13 -0000	1.101
@@ -6,7 +6,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.11
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -295,6 +295,9 @@
 
 %changelog
 
+* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.11-2
+- Fix for spamd to use razor port
+
 * Fri Feb 3 2006 Dan Walsh <dwalsh at redhat.com> 2.2.11-1
 - Fixes for mcs
 - Turn on mount and fsadm for unconfined_t



From fedora-cvs-commits at redhat.com  Mon Feb  6 19:17:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 14:17:14 -0500
Subject: rpms/audit/FC-4 .cvsignore, 1.34, 1.35 audit.spec, 1.53,
	1.54 sources, 1.35, 1.36
Message-ID: <200602061917.k16JHEX4029801@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Mon Feb 6 2006 Steve Grubb <sgrubb at redhat.com> 1.0.14-1.fc4
- Change auditd to use custom daemonize to avoid race in init scripts
- Update error message when deleting a rule that doesn't exist (#176239)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	2 Feb 2006 14:00:31 -0000	1.34
+++ .cvsignore	6 Feb 2006 19:17:11 -0000	1.35
@@ -31,3 +31,4 @@
 audit-1.0.8.tar.gz
 audit-1.0.12.tar.gz
 audit-1.0.13.tar.gz
+audit-1.0.14.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/audit.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- audit.spec	2 Feb 2006 14:16:54 -0000	1.53
+++ audit.spec	6 Feb 2006 19:17:11 -0000	1.54
@@ -1,6 +1,6 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.0.13
+Version: 1.0.14
 Release: 1.fc4
 License: GPL
 Group: System Environment/Daemons
@@ -124,6 +124,10 @@
 
 
 %changelog
+* Mon Feb 6 2006 Steve Grubb <sgrubb at redhat.com> 1.0.14-1.fc4
+- Change auditd to use custom daemonize to avoid race in init scripts
+- Update error message when deleting a rule that doesn't exist (#176239)
+
 * Thu Feb 2 2006 Steve Grubb <sgrubb at redhat.com> 1.0.13-1.fc4
 - Fix bug in autrace where it didn't run on kernels without file watch support
 - Add timestamp to daemon_config messages (#174865)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	2 Feb 2006 14:00:41 -0000	1.35
+++ sources	6 Feb 2006 19:17:12 -0000	1.36
@@ -1,2 +1,2 @@
 3060e7e99fc090bc2cc13597db2a8d29  audit-0.9.14-header.patch
-ec6178b0773b5c127d984b0d95bf5b89  audit-1.0.13.tar.gz
+8ab2207193ef2d388c984ef70b8c2bb5  audit-1.0.14.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb  6 19:27:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 14:27:46 -0500
Subject: rpms/audit/FC-4 sources,1.36,1.37
Message-ID: <200602061927.k16JRkNF004093@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
	sources 
Log Message:
small cleanup in tar file



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-4/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	6 Feb 2006 19:17:12 -0000	1.36
+++ sources	6 Feb 2006 19:27:44 -0000	1.37
@@ -1,2 +1,2 @@
 3060e7e99fc090bc2cc13597db2a8d29  audit-0.9.14-header.patch
-8ab2207193ef2d388c984ef70b8c2bb5  audit-1.0.14.tar.gz
+674c5dc0d6d3646b380e270b984af94f  audit-1.0.14.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb  6 19:48:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 14:48:47 -0500
Subject: rpms/gnome-python2/devel gnome-python.spec,1.32,1.33
Message-ID: <200602061948.k16JmlM4023620@cvs.devel.redhat.com>

Author: johnp

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

Modified Files:
	gnome-python.spec 
Log Message:
- Update to 2.12.3




Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-python.spec	20 Dec 2005 18:55:48 -0000	1.32
+++ gnome-python.spec	6 Feb 2006 19:48:44 -0000	1.33
@@ -6,8 +6,8 @@
 
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
-Version: 2.12.1
-Release: 1.2
+Version: 2.12.3
+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
+* Wed Feb 06 2006 John (J5) Palmieri <johnp at redhat.com> - 2.12.3-1
+- Update to 2.12.3
+
 * Tue Dec 20 2005 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2
 - rebuilt for new libgtop
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 19:53:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 14:53:14 -0500
Subject: rpms/gnome-python2/devel .cvsignore,1.13,1.14 sources,1.13,1.14
Message-ID: <200602061953.k16JrEfd025728@cvs.devel.redhat.com>

Author: johnp

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

Modified Files:
	.cvsignore sources 
Log Message:
 - add the source file



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Nov 2005 20:25:24 -0000	1.13
+++ .cvsignore	6 Feb 2006 19:53:12 -0000	1.14
@@ -2,3 +2,4 @@
 gnome-python-2.10.0.tar.bz2
 gnome-python-2.11.3.tar.bz2
 gnome-python-2.12.1.tar.bz2
+gnome-python-2.12.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Nov 2005 20:25:24 -0000	1.13
+++ sources	6 Feb 2006 19:53:12 -0000	1.14
@@ -1 +1 @@
-7f772bd8a209c1f1f42d9e52e12aed5b  gnome-python-2.12.1.tar.bz2
+20c4414a837d0c6efc2f324f9142974c  gnome-python-2.12.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:11:08 -0500
Subject: rpms/jpackage-utils/devel .cvsignore, 1.6, 1.7 jpackage-utils.spec,
	1.24, 1.25 sources, 1.6, 1.7
Message-ID: <200602062011.k16KB8wc030768@cvs.devel.redhat.com>

Author: fitzsim

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

Modified Files:
	.cvsignore jpackage-utils.spec sources 
Log Message:
* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_1rh
- Import jpackage-utils 0:1.6.6-1jpp from jpackage.org.
- Add rebuild-security-providers script.
- Install security directory in /etc.
- Do not provide java-javadoc.
- Do not install a dummy package-list file.
- Do not take ownership of %{_javadocdir}/java.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	27 Apr 2005 18:16:52 -0000	1.6
+++ .cvsignore	6 Feb 2006 20:11:05 -0000	1.7
@@ -1 +1 @@
-jpackage-utils-1.6.3.tar.bz2
+jpackage-utils-1.6.6.tar.bz2


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jpackage-utils.spec	21 Dec 2005 19:15:49 -0000	1.24
+++ jpackage-utils.spec	6 Feb 2006 20:11:05 -0000	1.25
@@ -4,8 +4,8 @@
 %define section free
 
 Name:           jpackage-utils
-Version:        1.6.3
-Release:        1jpp_3rh
+Version:        1.6.6
+Release:        1jpp_1rh
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -20,7 +20,6 @@
 AutoReqProv:    no
 BuildRequires:  %{__awk}, %{__grep}
 Requires:       /bin/egrep, /bin/sed, /usr/bin/perl
-Provides:       java-javadoc = %{epoch}:%{version}-%{release}
 
 %description
 Utilities for the JPackage Project <http://www.jpackage.org/>:
@@ -67,7 +66,11 @@
 
 # Pull macros out of macros.jpackage and emulate them during install for
 # smooth bootstrapping experience.
-for dir in jvmdir jvmjardir jvmprivdir javadir jnidir javadocdir ; do
+for dir in \
+    jvmdir jvmjardir jvmprivdir \
+    jvmlibdir jvmdatadir jvmsysconfdir \
+    jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
+    javadir jnidir javadocdir ; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }'))
 done
 
@@ -80,6 +83,12 @@
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmjardir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmprivdir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmlibdir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmdatadir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmsysconfdir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonlibdir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommondatadir}
+install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0}
@@ -127,7 +136,7 @@
 JVM_ROOT=${_jvmdir}
 
 # You can define a system-wide JVM root here if you're not using the default one
-#JAVA_HOME=\$JVM_ROOT/java-gcj
+#JAVA_HOME=\$JVM_ROOT/java
 
 # Options to pass to the java interpreter
 JAVACMD_OPTS=
@@ -144,6 +153,12 @@
 %dir ${_jvmdir}
 %dir ${_jvmjardir}
 %dir ${_jvmprivdir}
+# %dir ${_jvmlibdir}
+%dir ${_jvmdatadir}
+%dir ${_jvmsysconfdir}
+%dir ${_jvmcommonlibdir}
+%dir ${_jvmcommondatadir}
+%dir ${_jvmcommonsysconfdir}
 %dir ${_javadir}
 %dir ${_javadir}-*
 %dir ${_jnidir}
@@ -156,8 +171,6 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.jpackage
 EOF
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
-touch $RPM_BUILD_ROOT%{_javadocdir}/java/package-list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,8 +199,7 @@
 
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
-%doc doc/* etc/httpd-javadoc.conf
-%{_javadocdir}/java
+%doc LICENSE.txt doc/* etc/httpd-javadoc.conf
 %if %{gcj_support}
 %{_sysconfdir}/java/security
 %{_sysconfdir}/java/security/security.d
@@ -195,41 +207,68 @@
 
 
 %changelog
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.6.3-1jpp_3rh
-- Bump release number and rebuild for yet another new gcc
-
-* Mon Dec 12 2005 Jesse Keating <jkeating at redhat.com> 0:1.6.3-1jpp_2rh.1
-- Bump release number.
-
-* Wed Nov 30 2005 Thomas Fitzsimmons <fitzsim at redhat.com> 0:1.6.3-1jpp_2rh
-- Bump release number.
-
-* Wed Apr 27 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.3-1jpp_1rh
-- Import jpackage-utils 0:1.6.3-1jpp from jpackage.org.
+* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_1rh
+- Import jpackage-utils 0:1.6.6-1jpp from jpackage.org.
 - Add rebuild-security-providers script.
 - Install security directory in /etc.
-- Remove homedir patch.
-- Don't look for LICENSE.txt.
+- Do not provide java-javadoc.
+- Do not install a dummy package-list file.
+- Do not take ownership of %{_javadocdir}/java.
+
+* Sun Sep 18 2005 David Walluck <david at jpackage.org> 0:1.6.6-1jpp
+- always define macros
+
+* Sat Sep 17 2005 David Walluck <david at jpackage.org> 0:1.6.5-2jpp
+- clean tarball
+
+* Sat Sep 17 2005 David Walluck <david at jpackage.org> 0:1.6.5-1jpp
+- fix conditional macros
+- merge nim's and robert's changes
+
+* Mon Aug 22 2005 David Walluck <david at jpackage.org> 0:1.6.4-1jpp
+- long needed s/All/Some in error messages
 
 * Fri Jan 28 2005 Nicolas Mailhot <nim at jpackage.org> - 0:1.6.3-1jpp
 - prefer full JVM to JRE when not specified (my bad, sorry)
 - remove LICENSE.txt as it does not seem to exist in the jpp16 branch anymore
 
 * Sat Jan 15 2005 Nicolas Mailhot <nim at jpackage.org> - 0:1.6.2-1jpp
-  Happy new year jpackagers!
+- Happy new year jpackagers!
 - No longer define JAVA_HOME in default shipped java.conf (me)
 - Search if $JVM_ROOT/jre or $JVM_ROOT/java exist in functions if JAVA_HOME is
   not defined in java.conf (me)
-- Source ~/.java/java.conf in addition to /etc/java/java.conf in functions 
+- Source ~/.java/java.conf in addition to /etc/java/java.conf in functions
   (me)
 - Make find-jar use the same error code as build-classpath (Joe Wortmann)
   (note however find-jar was never intended to use directly in scripts, it's
    a low-level way to test the search engine)
 - Change macros slightly so they no longer wreak havoc on x86_64 systems
   (Thomas Fitzsimmons for Red Hat)
-  This is probably only a short-term fix since we've yet to decide how to 
+  This is probably only a short-term fix since we've yet to decide how to
   handle real x86_64 JVMs cleanly.
 
+* Thu Dec 16 2004 Robert Ottenhag <support at bea.com> -  0:1.6.3-1jpp
+- Move the systemPrefs stuff into a separate new package java-systemprefs
+
+* Wed Dec 15 2004 Robert Ottenhag <support at bea.com> -  0:1.6.2-1jpp
+- Reapply all updates from 1.5.40-1jpp o 1.5.42-1jpp
+  + Add support for splitting the installation of Java VMs/SDK/JREs 
+    according to FHS 2.3 in its architecture dependent, architecture
+    independent, and configuration parts. Added new macros and dirs
+    - %%{_jvmlibdir}, defined as %%{_libdir}/jvm, equal to %%{_jvmdir},
+    - %%{_jvmdatadir}, defined as %%{_datadir}/jvm
+    - %%{_jvmsysconfdir}, defined as %%{_sysconfdir}/jvm
+  + Add support for splitting the installation of Java VMs/SDK/JREs 
+    in its common architecture dependent, architecture
+    independent, and configuration parts. Added new macros and dirs
+    - %%{_jvmcommonlibdir}, defined as %%{_libdir}/jvm-commmon
+    - %%{_jvmcommondatadir}, defined as %%{_datadir}/jvm-commmon
+    - %%{_jvmcommonsysconfdir}, defined as %%{_sysconfdir}/jvm-commmon
+  + Ensure that a global systemPrefs database used by
+    java.util.prefs.FileSystemPreferences exists at
+    /etc/.java/.systemPrefs, or create an empty one if not, and
+    symlink to it from %%{_jvmcommonsysconfdir}/java/jre/systemprefs.
+
 * Sat Dec  4 2004 Ville Skytt?? <scop at jpackage.org> - 0:1.6.1-1jpp
 - java-functions (set_jvm_dirs): try "java -fullversion" before
   "java -version" for performance, improve regexps, use sed from $PATH.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	27 Apr 2005 18:16:52 -0000	1.6
+++ sources	6 Feb 2006 20:11:05 -0000	1.7
@@ -1 +1 @@
-07f046d3cc16cd2154684380451877cd  jpackage-utils-1.6.3.tar.bz2
+85336e72018ecefa2f9999fc4e6f3eb8  jpackage-utils-1.6.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:11:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:11:12 -0500
Subject: rpms/control-center/devel background-no-delay.patch, NONE,
	1.1 control-center.spec, 1.121, 1.122
Message-ID: <200602062011.k16KBCIY030797@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30702

Modified Files:
	control-center.spec 
Added Files:
	background-no-delay.patch 
Log Message:
fix background switching some more


background-no-delay.patch:
 capplets/background/gnome-wp-capplet.c            |   25 +++++-----------------
 gnome-settings-daemon/gnome-settings-background.c |    6 ++++-
 2 files changed, 11 insertions(+), 20 deletions(-)

--- NEW FILE background-no-delay.patch ---
--- control-center-2.13.90/gnome-settings-daemon/gnome-settings-background.c.no-delay	2005-05-22 11:46:43.000000000 -0400
+++ control-center-2.13.90/gnome-settings-daemon/gnome-settings-background.c	2006-02-06 14:35:56.000000000 -0500
@@ -59,9 +59,13 @@
 
 	if (applier_idle_id != 0) {
 		g_source_remove (applier_idle_id);
+		applier_idle_id = 0;
 	}
 
-	applier_idle_id = g_timeout_add (100, applier_idle, NULL);
+	if (strcmp (entry->key, "/desktop/gnome/background/stamp") == 0)
+		applier_idle (NULL);
+	else
+		applier_idle_id = g_timeout_add (100, applier_idle, NULL);
 }
 
 void
--- control-center-2.13.90/capplets/background/gnome-wp-capplet.c.no-delay	2006-02-06 14:35:56.000000000 -0500
+++ control-center-2.13.90/capplets/background/gnome-wp-capplet.c	2006-02-06 14:43:02.000000000 -0500
@@ -274,6 +274,7 @@
   GConfChangeSet * cs;
   gchar * wpfile;
   GdkPixbuf * pixbuf;
+  gint stamp;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (capplet->treeview));
   if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
@@ -311,6 +312,10 @@
 
     gconf_change_set_unref (cs);
 
+    /* signal settings daemon */
+    stamp = gconf_client_get_int (capplet->client, WP_PATH_KEY "stamp", NULL);
+    gconf_client_set_int (capplet->client, WP_PATH_KEY "stamp", stamp + 1, NULL);
+    
     gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->pc_picker), item->pcolor);
     gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->scolor);
 
@@ -338,12 +343,7 @@
 
 static void gnome_wp_props_wp_selected (GtkTreeSelection * selection,
 					GnomeWPCapplet * capplet) {
-  if (capplet->idleid > 0) {
-    g_source_remove (capplet->idleid);
-  }
-  capplet->idleid = g_timeout_add (capplet->delay + 100,
-				   (GSourceFunc) gnome_wp_props_wp_set,
-				   capplet);
+  gnome_wp_props_wp_set (capplet);
 }
 
 static void gnome_wp_remove_wp (gchar * key, GnomeWPItem * item,
@@ -798,12 +798,6 @@
   gnome_wp_color_changed (capplet, FALSE);
 }
 
-static void gnome_wp_delay_changed (GConfClient * client, guint id,
-				       GConfEntry * entry,
-				       GnomeWPCapplet * capplet) {
-  capplet->delay = gconf_value_get_int (entry->value);
-}
-
 static void gnome_wp_icon_theme_changed (GtkIconTheme * theme,
 					 GnomeWPCapplet * capplet) {
   GdkPixbuf * pixbuf;
@@ -948,19 +942,12 @@
     capplet->client = gconf_client_get_default ();
   }
 
-  capplet->delay = gconf_client_get_int (capplet->client,
-					 WP_DELAY_KEY,
-					 NULL);
   gconf_client_add_dir (capplet->client, WP_KEYBOARD_PATH,
 			GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
   gconf_client_add_dir (capplet->client, WP_PATH_KEY,
 			GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
   gconf_client_notify_add (capplet->client,
-			   WP_DELAY_KEY,
-			   (GConfClientNotifyFunc) gnome_wp_delay_changed,
-			   capplet, NULL, NULL);
-  gconf_client_notify_add (capplet->client,
 			   WP_FILE_KEY,
 			   (GConfClientNotifyFunc) gnome_wp_file_changed,
 			   capplet, NULL, NULL);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- control-center.spec	6 Feb 2006 17:25:45 -0000	1.121
+++ control-center.spec	6 Feb 2006 20:11:08 -0000	1.122
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.90
-Release: 3
+Release: 5
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -37,6 +37,7 @@
 Patch7: control-center-2.13.3-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
 Patch9: control-center-2.13.90-broken-es-help.patch
+Patch10: background-no-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -107,6 +108,7 @@
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
 %patch9 -p1 -b .broken-es-help
+%patch10 -p1 -b .no-delay
 
 %build
 
@@ -228,6 +230,9 @@
 # (also its headers)
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-4
+- Avoid delays when switching backgrounds
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-3
 - Use the 2.12 background capplet
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:16:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:16:06 -0500
Subject: rpms/openssh/devel openssh-3.9p1-no-log-signal.patch, 1.1,
	1.2 openssh-4.3p1-redhat.patch, 1.1, 1.2 openssh.spec, 1.84, 1.85
Message-ID: <200602062016.k16KG6tG002658@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2124

Modified Files:
	openssh-3.9p1-no-log-signal.patch openssh-4.3p1-redhat.patch 
	openssh.spec 
Log Message:
* Mon Feb  6 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-2
- fixed another place where syslog was called in signal handler
- pass locale environment variables to server, accept them there (#179851)


openssh-3.9p1-no-log-signal.patch:
 serverloop.c |    2 +-
 sshd.c       |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: openssh-3.9p1-no-log-signal.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-3.9p1-no-log-signal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-3.9p1-no-log-signal.patch	21 Feb 2005 17:07:55 -0000	1.1
+++ openssh-3.9p1-no-log-signal.patch	6 Feb 2006 20:16:03 -0000	1.2
@@ -1,8 +1,26 @@
 Don't use syslog in signal handler as syslog is not signal handler safe. It
 can for example deadlock if another syslog call is interrupted.
---- openssh-3.9p1/sshd.c.alrm-handler	2005-01-28 11:14:13.000000000 +0100
-+++ openssh-3.9p1/sshd.c	2005-02-18 16:45:49.748787978 +0100
-@@ -317,8 +317,7 @@
+--- openssh-4.3p1/serverloop.c.signal	2005-12-31 06:33:37.000000000 +0100
++++ openssh-4.3p1/serverloop.c	2006-02-06 20:01:27.000000000 +0100
+@@ -146,7 +146,6 @@
+ sigchld_handler(int sig)
+ {
+ 	int save_errno = errno;
+-	debug("Received SIGCHLD.");
+ 	child_terminated = 1;
+ #ifndef _UNICOS
+ 	mysignal(SIGCHLD, sigchld_handler);
+@@ -749,6 +748,7 @@
+ 	sigaddset(&nset, SIGCHLD);
+ 	sigprocmask(SIG_BLOCK, &nset, &oset);
+ 	if (child_terminated) {
++		debug("Received SIGCHLD.");
+ 		while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
+ 		    (pid < 0 && errno == EINTR))
+ 			if (pid > 0)
+--- openssh-4.3p1/sshd.c.signal	2006-02-01 17:08:17.000000000 +0100
++++ openssh-4.3p1/sshd.c	2006-02-01 17:08:17.000000000 +0100
+@@ -311,8 +311,7 @@
  	if (use_privsep && pmonitor != NULL && pmonitor->m_pid > 0)
  		kill(pmonitor->m_pid, SIGALRM);
  

openssh-4.3p1-redhat.patch:
 ssh_config    |   10 ++++++++++
 sshd_config   |   12 ++++++++++++
 sshd_config.0 |    6 +++---
 sshd_config.5 |    2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

Index: openssh-4.3p1-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.3p1-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.3p1-redhat.patch	1 Feb 2006 16:19:54 -0000	1.1
+++ openssh-4.3p1-redhat.patch	6 Feb 2006 20:16:03 -0000	1.2
@@ -53,12 +53,16 @@
  
  # Set this to 'yes' to enable PAM authentication, account processing, 
  # and session processing. If this is enabled, PAM authentication will 
-@@ -78,10 +84,12 @@
+@@ -78,10 +84,16 @@
  # session checks to run without PAM authentication, then enable this but set 
  # ChallengeResponseAuthentication=no
  #UsePAM no
 +UsePAM yes
  
++# Accept locale-related environment variables
++AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
++AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
++AcceptEnv LC_IDENTIFICATION LC_ALL
  #AllowTcpForwarding yes
  #GatewayPorts no
  #X11Forwarding no
@@ -68,7 +72,7 @@
  #PrintMotd yes
 --- openssh-4.3p1/ssh_config.redhat	2005-12-13 09:29:03.000000000 +0100
 +++ openssh-4.3p1/ssh_config	2006-02-01 16:26:37.000000000 +0100
-@@ -40,3 +40,9 @@
+@@ -40,3 +40,13 @@
  #   Tunnel no
  #   TunnelDevice any:any
  #   PermitLocalCommand no
@@ -78,6 +82,10 @@
 +# to the original X11 display. As virtually no X11 client supports the untrusted
 +# mode correctly we set this to yes.
 +	ForwardX11Trusted yes
++# Send locale-related environment variables
++	SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
++	SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
++	SendEnv LC_IDENTIFICATION LC_ALL
 --- openssh-4.3p1/sshd_config.5.redhat	2006-01-03 08:47:31.000000000 +0100
 +++ openssh-4.3p1/sshd_config.5	2006-02-01 16:24:43.000000000 +0100
 @@ -620,7 +620,7 @@


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- openssh.spec	1 Feb 2006 16:19:54 -0000	1.84
+++ openssh.spec	6 Feb 2006 20:16:03 -0000	1.85
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p1
-%define rel 1
+%define rel 2
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -450,6 +450,10 @@
 %endif
 
 %changelog
+* Mon Feb  6 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-2
+- fixed another place where syslog was called in signal handler
+- pass locale environment variables to server, accept them there (#179851)
+
 * Wed Feb  1 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-1
 - new version, dropped obsolete patches
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:22:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:22:39 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.132,
	1.133
Message-ID: <200602062022.k16KMd41015980@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-serv15812

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_74rh
- Require gjdoc and libgcj-src packages for build.
- Build API documentation.
- Add -javadoc package.




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.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- java-1.4.2-gcj-compat.spec	3 Feb 2006 04:54:20 -0000	1.132
+++ java-1.4.2-gcj-compat.spec	6 Feb 2006 20:22:37 -0000	1.133
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_73rh
+%define release 	40jpp_74rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -49,6 +49,8 @@
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
+BuildRequires:	gjdoc
+BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.1
@@ -56,8 +58,9 @@
 # SASL and JCE are provided by libgcj.
 Obsoletes:	gnu-crypto-sasl-jdk1.4
 Obsoletes:	gnu-crypto-jce-jdk1.4
-Requires(post): jpackage-utils >= 0:1.6.3-1jpp_1rh
-Requires(postun): jpackage-utils >= 0:1.6.3-1jpp_1rh
+Requires:	jpackage-utils >= 0:1.6.6-1jpp_1rh
+Requires(post): jpackage-utils >= 0:1.6.6-1jpp_1rh
+Requires(postun): jpackage-utils >= 0:1.6.6-1jpp_1rh
 Requires(post): libgcj%{gccsuffix} >= %{gccver}
 Requires(postun): libgcj%{gccsuffix} >= %{gccver}
 Provides:	jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
@@ -118,6 +121,15 @@
 This package installs a versionless src.zip symlink that points to a
 specific version of the libgcj sources.
 
+%package javadoc
+Summary:	API documentation for libgcj
+Group:		Development/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	java-javadoc = %{epoch}:%{version}-%{release}
+
+%description javadoc
+This package installs Javadoc API documentation for libgcj.
+
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
 
@@ -264,6 +276,19 @@
 install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
 %endif
 
+# build api documentation
+mkdir docsbuild
+pushd docsbuild
+  unzip /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+  rm -rf gnu
+  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
+  find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
+    sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
+    xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/java -encoding UTF-8 -breakiterator -licensetext \
+      -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
+      -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
+popd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -553,7 +578,16 @@
 %files src
 %defattr(-,root,root)
 
+%files javadoc
+%defattr(-,root,root)
+%{_javadocdir}/java
+
 %changelog
+* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_74rh
+- Require gjdoc and libgcj-src packages for build.
+- Build API documentation.
+- Add -javadoc package.
+
 * Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_73rh
 - Adjust Jessie and GNU Crypto version requirements.
 - Uncomment ifnarch ia64 sections.



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:27:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:27:55 -0500
Subject: rpms/tomboy/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tomboy.spec,
	1.11, 1.12
Message-ID: <200602062027.k16KRttc018437@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18408

Modified Files:
	.cvsignore sources tomboy.spec 
Log Message:
* Mon Feb  6 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-1
- Tomboy 0.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Jan 2006 09:13:38 -0000	1.3
+++ .cvsignore	6 Feb 2006 20:27:53 -0000	1.4
@@ -1 +1,2 @@
 tomboy-0.3.4.tar.gz
+tomboy-0.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Jan 2006 09:13:39 -0000	1.3
+++ sources	6 Feb 2006 20:27:53 -0000	1.4
@@ -1 +1 @@
-3828ef72f215b25db342afbff42a5742  tomboy-0.3.4.tar.gz
+57e9829d80d8452f002e0a3856bd2c48  tomboy-0.3.5.tar.gz


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tomboy.spec	1 Feb 2006 00:41:27 -0000	1.11
+++ tomboy.spec	6 Feb 2006 20:27:53 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           tomboy
-Version:        0.3.4
-Release:        2
+Version:        0.3.5
+Release:        1
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Mon Feb  6 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-1
+- Tomboy 0.3.5
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 0.3.4-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:29:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:29:21 -0500
Subject: rpms/jpackage-utils/devel jpackage-utils.spec,1.25,1.26
Message-ID: <200602062029.k16KTLCh026824@cvs.devel.redhat.com>

Author: fitzsim

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

Modified Files:
	jpackage-utils.spec 
Log Message:
* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_2rh
- Add /usr/share/java-1.3.1 and /usr/lib/java-1.3.1
  directories. (160327)




Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jpackage-utils.spec	6 Feb 2006 20:11:05 -0000	1.25
+++ jpackage-utils.spec	6 Feb 2006 20:29:18 -0000	1.26
@@ -5,7 +5,7 @@
 
 Name:           jpackage-utils
 Version:        1.6.6
-Release:        1jpp_1rh
+Release:        1jpp_2rh
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -91,8 +91,8 @@
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
-install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0}
-install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
 
 %if %{gcj_support}
@@ -207,6 +207,10 @@
 
 
 %changelog
+* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_2rh
+- Add /usr/share/java-1.3.1 and /usr/lib/java-1.3.1
+  directories. (160327)
+
 * Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_1rh
 - Import jpackage-utils 0:1.6.6-1jpp from jpackage.org.
 - Add rebuild-security-providers script.



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:36:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:36:26 -0500
Subject: rpms/tomboy/devel tomboy-0.3.3-trie.patch,1.1,NONE
Message-ID: <200602062036.k16KaQRb013180@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13167

Removed Files:
	tomboy-0.3.3-trie.patch 
Log Message:
old patch, no longer needed


--- tomboy-0.3.3-trie.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:50:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:50:04 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.237,1.238
Message-ID: <200602062050.k16Ko41C026132@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26106

Modified Files:
	eclipse.spec 
Log Message:
* Mon Feb 06 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc
- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
- Link against generic libjawt.so (rh#158755).
- Re-add patch to use built launcher.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- eclipse.spec	5 Feb 2006 04:50:13 -0000	1.237
+++ eclipse.spec	6 Feb 2006 20:50:01 -0000	1.238
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_3fc
+Release:        1jpp_4fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -94,6 +94,7 @@
 Patch37:	%{name}-gre64.conf.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
+Patch40:	%{name}-usebuiltlauncher.patch
 # Build cairo libs
 # Again, I hate patches with spaces in the filenames
 Patch41:	%{name}-libswt-cairo1.0-1.patch
@@ -378,6 +379,7 @@
 %patch35 -p0
 %patch36 -p1
 %patch38 -p0
+%patch40 -p0
 # Again, I hate spaces in patches
 pushd plugins/org.eclipse.swt/Eclipse\ SWT/
 %patch41 -p0
@@ -514,10 +516,7 @@
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
-%if %{gcj_support}
-  # link against gcj's jawt implementation.
-  sed --in-place "s/-ljawt/-lgcjawt/" make_linux.mak
-%endif
+sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
 
@@ -715,7 +714,11 @@
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk.jar
+# SWT is still a 3.1.1 jar ... (rh#180000)
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar swt-gtk-3.1.1.jar
+ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -1255,6 +1258,11 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Mon Feb 06 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc
+- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
+- Link against generic libjawt.so (rh#158755).
+- Re-add patch to use built launcher.
+
 * Sat Feb 4 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_3fc
 - Update efj patches to match what has been committed to HEAD.
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 20:50:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 15:50:52 -0500
Subject: rpms/eclipse/devel eclipse-usebuiltlauncher.patch,1.2,1.3
Message-ID: <200602062050.k16KoqNc026188@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26171

Added Files:
	eclipse-usebuiltlauncher.patch 
Log Message:
Re-add eclipse-usebuiltlauncher.patch.

eclipse-usebuiltlauncher.patch:
 build.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+)

Index: eclipse-usebuiltlauncher.patch
===================================================================
RCS file: eclipse-usebuiltlauncher.patch
diff -N eclipse-usebuiltlauncher.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ eclipse-usebuiltlauncher.patch	6 Feb 2006 20:50:48 -0000	1.3
@@ -0,0 +1,142 @@
+diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
+--- features/org.eclipse.platform/build.xml	2006-02-06 13:49:43.000000000 -0500
++++ features/org.eclipse.platform/build.xml	2006-02-06 13:58:52.000000000 -0500
+@@ -349,6 +349,12 @@
+ 		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+ 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
+ 	</target>
++	<target name="copybuiltlauncher" if="libsconfig">
++		<copy todir="${feature.base}/${os}.${ws}.${arch}/${collectingFolder}" failonerror="true" overwrite="true">
++			<fileset dir="${basedir}/../../launchertmp" includes="**"			/>
++		</copy>
++	</target>
++
+ 	<target name="rootFileswin32_win32_x86">
+ 		<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
+ 		<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
+@@ -357,6 +363,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFileslinux_gtk_x86">
+@@ -369,6 +377,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
+ 	</target>
+@@ -380,6 +390,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" /> 
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+@@ -391,6 +403,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" /> 
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+@@ -404,6 +418,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> 
+ 	</target>
+@@ -415,6 +431,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFileslinux_motif_x86">
+@@ -429,6 +447,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> 
+ 	</target>
+@@ -440,6 +460,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFilessolaris_gtk_sparc">
+@@ -450,6 +472,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFilesaix_motif_ppc">
+@@ -460,6 +484,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFileshpux_motif_PA_RISC">
+@@ -470,6 +496,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFileshpux_motif_ia64">
+@@ -480,6 +508,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFileshpux_motif_ia64_32">
+@@ -490,6 +520,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFilesmacosx_carbon_ppc">
+@@ -516,6 +548,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 



From fedora-cvs-commits at redhat.com  Mon Feb  6 21:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 16:24:29 -0500
Subject: rpms/control-center/devel background-no-delay.patch, 1.1,
	1.2 control-center.spec, 1.122, 1.123
Message-ID: <200602062124.k16LOT6e024633@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24560

Modified Files:
	background-no-delay.patch control-center.spec 
Log Message:
Fix the patch 


background-no-delay.patch:
 capplets/background/gnome-wp-capplet.c            |   25 +++++-----------------
 gnome-settings-daemon/gnome-settings-background.c |    6 ++++-
 2 files changed, 11 insertions(+), 20 deletions(-)

Index: background-no-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/background-no-delay.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- background-no-delay.patch	6 Feb 2006 20:11:08 -0000	1.1
+++ background-no-delay.patch	6 Feb 2006 21:24:24 -0000	1.2
@@ -30,8 +30,8 @@
      gconf_change_set_unref (cs);
  
 +    /* signal settings daemon */
-+    stamp = gconf_client_get_int (capplet->client, WP_PATH_KEY "stamp", NULL);
-+    gconf_client_set_int (capplet->client, WP_PATH_KEY "stamp", stamp + 1, NULL);
++    stamp = gconf_client_get_int (capplet->client, WP_PATH_KEY "/stamp", NULL);
++    gconf_client_set_int (capplet->client, WP_PATH_KEY "/stamp", stamp + 1, NULL);
 +    
      gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->pc_picker), item->pcolor);
      gtk_color_button_set_color (GTK_COLOR_BUTTON (capplet->sc_picker), item->scolor);


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- control-center.spec	6 Feb 2006 20:11:08 -0000	1.122
+++ control-center.spec	6 Feb 2006 21:24:24 -0000	1.123
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.90
-Release: 5
+Release: 6
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -230,7 +230,7 @@
 # (also its headers)
 
 %changelog
-* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-4
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-6
 - Avoid delays when switching backgrounds
 
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-3



From fedora-cvs-commits at redhat.com  Mon Feb  6 21:27:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 16:27:50 -0500
Subject: rpms/nautilus/devel background-no-delay.patch, NONE,
	1.1 nautilus.spec, 1.89, 1.90
Message-ID: <200602062127.k16LRoF7026185@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26060

Modified Files:
	nautilus.spec 
Added Files:
	background-no-delay.patch 
Log Message:
avoid delays in background switching


background-no-delay.patch:
 nautilus-directory-background.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE background-no-delay.patch ---
--- nautilus-2.13.4/libnautilus-private/nautilus-directory-background.c.no-delays	2006-02-06 15:44:27.000000000 -0500
+++ nautilus-2.13.4/libnautilus-private/nautilus-directory-background.c	2006-02-06 15:52:58.000000000 -0500
@@ -319,15 +319,20 @@
 	guint notification_timeout_id;
 	
 	background = EEL_BACKGROUND (data);
-	/* 
-	 * Wallpaper capplet changes picture, background color and placement with
-	 * gconf_change_set API, but unfortunately, this operation is not atomic in
-	 * GConf as it should be. So we update background after small timeout to
-	 * let GConf change all values.
-	 */
-	notification_timeout_id = g_timeout_add (300, (GSourceFunc) call_settings_changed, background);
 
-	g_object_set_data (G_OBJECT (background), "desktop_gconf_notification_timeout", GUINT_TO_POINTER (notification_timeout_id));
+	notification_timeout_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (background), "desktop_gconf_notification_timeout"));
+
+        if (strcmp (entry->key, "/desktop/gnome/background/stamp") == 0) {
+                if (notification_timeout_id != 0) 
+                        g_source_remove (notification_timeout_id);
+                
+                call_settings_changed (background);
+        }
+        else if (notification_timeout_id == 0) {
+                notification_timeout_id = g_timeout_add (300, (GSourceFunc) call_settings_changed, background);
+                
+                g_object_set_data (G_OBJECT (background), "desktop_gconf_notification_timeout", GUINT_TO_POINTER (notification_timeout_id));
+        }
 }
 
 static void


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- nautilus.spec	31 Jan 2006 05:29:38 -0000	1.89
+++ nautilus.spec	6 Feb 2006 21:27:46 -0000	1.90
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.13.90
-Release:	1
+Release:	2
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -82,6 +82,7 @@
 # Some changes to default config
 Patch1:         nautilus-2.5.7-rhconfig.patch
 Patch2:         nautilus-2.13-format.patch
+Patch3:		background-no-delay.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -95,6 +96,7 @@
 
 %patch1 -p1 -b .rhconfig
 %patch2 -p0 -b .format
+%patch3 -p1 -b .no-delay
 
 %build
 
@@ -173,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
+- Avoid delays in rendering the background
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 21:36:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 16:36:24 -0500
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.38,1.39
Message-ID: <200602062136.k16LaOo7028192@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28045

Modified Files:
	gnome-python-extras.spec 
Log Message:
- Update to 2.13.3
- Move the gnome-python2-applet gnome-python2-gnomeprint 
  gnome-python2-gtksourceview gnome-python2-libwnck 
  gnome-python2-libgtop2 gnome-python2-nautilus-cd-burner 
  gnome-python2-metacity and gnome-python2-totem subpackages 
  to gnome-python2-desktop because gnome-python-extras was split upstream



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-python-extras.spec	23 Jan 2006 19:51:47 -0000	1.38
+++ gnome-python-extras.spec	6 Feb 2006 21:36:20 -0000	1.39
@@ -5,21 +5,17 @@
 %define gnome_panel_version 2.2.0
 %define gnome_python_version 2.9.0
 %define gtkhtml2_version 2.3.1
-%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 mozilla_version 1.7.3
 %define gtkspell_version 2.0.7
-%define gnome_media_version 2.12.0
 
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
-Version: 2.12.1
-Release: 10
+Version: 2.13.3
+Release: 1
 License: GPL/LGPL
 Group: Development/Languages
-Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.12/gnome-python-extras-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.13/gnome-python-extras-%{version}.tar.bz2
+
 Patch0: gnome-python-extras-2.10.0-gtkspell-static.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -30,36 +26,13 @@
 BuildRequires: gnome-python2 >= %{gnome_python_version}
 BuildRequires: gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version}
-BuildRequires: libgnomeprintui22-devel
-BuildRequires: gtksourceview-devel >= %{gtksourceview_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
-BuildRequires: libgtop2-devel >= %{libgtop_version}
-BuildRequires: totem-devel
-BuildRequires: gnome-media-devel >= %{gnome_media_version}
-%ifnarch s390 s390x
-BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
-%endif
-
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
 BuildRequires: mozilla-devel >= %{mozilla_version}
-
 %description
 The gnome-python-extra package contains the source packages for additional 
 Python bindings for GNOME. It should be used together with gnome-python.
 
 
-%package -n gnome-python2-applet
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for GNOME Panel applets.
-Group: Development/Languages
-# applets from GNOME 1.4 are no longer supported - we only have 1 panel
-Obsoletes: pygnome-applet
-
-%description -n gnome-python2-applet
-This module contains a wrapper that allows GNOME Panel applets to be
-written in Python.
-
-
 %package -n gnome-python2-gtkhtml2
 Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for interacting with gtkhtml2
@@ -71,52 +44,6 @@
 This module contains a wrapper that allows the use of gtkhtml2 via
 Python.
 
-
-%package -n gnome-python2-gnomeprint
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for interacting with libgnomeprint
-Group: Development/Languages
-Requires: libgnomeprint22, libgnomeprintui22
-
-%description -n gnome-python2-gnomeprint
-This module contains a wrapper that allows the use of libgnomeprint via
-Python.
-
-
-%package -n gnome-python2-gtksourceview
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for interacting with the gtksourceview library 
-Group: Development/Languages
-Requires:  gtksourceview >= %{gtksourceview_version}
-Requires: gnome-python2-gnomeprint
-
-%description -n gnome-python2-gtksourceview
-This module contains a wrapper that allows the use of gtksourceview via
-Python.
-
-
-%package -n gnome-python2-libwnck
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for interacting with libwnck
-Group: Development/Languages
-Requires:  libwnck >= %{libwnck_version}
-
-%description -n gnome-python2-libwnck
-This module contains a wrapper that allows the use of libwnck via
-Python.
-
-
-%package -n gnome-python2-libgtop2
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for interacting with libgtop
-Group: Development/Languages
-Requires:  libgtop2 >= %{libgtop_version}
-
-%description -n gnome-python2-libgtop2
-This module contains a wrapper that allows the use of libgtop via
-Python.
-
-
 %package -n gnome-python2-libegg
 Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for recent files and tray icons
@@ -126,18 +53,6 @@
 This module contains a wrapper that allows the use of recent files
 and tray icons 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
-Group: Development/Languages
-Requires:  nautilus-cd-burner >= %{nautilus_cd_burner_version}
-
-%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-gtkspell
 Requires: %{name} = %{version}-%{release}
 Summary: Python bindings for interacting with gtkspell
@@ -158,15 +73,6 @@
 This module contains a wrapper that allows the use of gtkmozembed
 via Python.
 
-%package -n gnome-python2-totem
-Requires: %{name} = %{version}-%{release}
-Summary: Python bindings for interacting with totem
-Group: Development/Languages
-
-%description -n gnome-python2-totem
-This module contains a wrapper that allows the use of totem
-via Python.
-
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch0 -p1 -b .gtkspell-static
@@ -178,6 +84,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gksu
@@ -192,46 +99,12 @@
 %{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
 %{_datadir}/pygtk
 
-%files -n gnome-python2-applet
-%defattr(-,root,root,-)
-%dir %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnome/applet.*
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomeapplet.so
-
-
 %files -n gnome-python2-gtkhtml2
 %defattr(-,root,root,-)
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtkhtml*
 %defattr(644,root,root,755)
 %doc examples/gtkhtml2/*
 
-
-%files -n gnome-python2-gnomeprint
-%defattr(-,root,root,-)
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gnomeprint/
-%{_datadir}/gtk-doc/html/pygnomeprint
-%{_datadir}/gtk-doc/html/pygnomeprintui
-%defattr(644,root,root,755)
-%doc examples/gnomeprint/*
-
-
-%files -n gnome-python2-gtksourceview
-%defattr(-,root,root,-)
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtksourceview.so
-%{_datadir}/gtk-doc/html/pygtksourceview
-%defattr(644,root,root,755)
-%doc examples/gtksourceview/*
-
-
-%files -n gnome-python2-libwnck
-%defattr(-,root,root,-)
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/wnck.so
-
-
-%files -n gnome-python2-libgtop2
-%defattr(-,root,root,-)
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtop.so
-
-
 %files -n gnome-python2-libegg
 %defattr(-,root,root,-)
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/egg
@@ -239,15 +112,6 @@
 %doc examples/egg/*
 
 
-%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 examples/nautilusburn/*
-%endif
-
-
 %files -n gnome-python2-gtkspell
 %defattr(-,root,root,-)
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtkspell.so
@@ -259,15 +123,15 @@
 %{_libdir}/python%{pyver}/site-packages/gtk-2.0/gtkmozembed.so
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
-%files -n gnome-python2-totem
-%defattr(-,root,root,-)
-%ifnarch s390 s390x
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/mediaprofiles.so
-%endif
-%{_libdir}/python%{pyver}/site-packages/gtk-2.0/totem
-
-
 %changelog
+* Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-1
+- Update to 2.13.3
+- Move the gnome-python2-applet gnome-python2-gnomeprint 
+  gnome-python2-gtksourceview gnome-python2-libwnck 
+  gnome-python2-libgtop2 gnome-python2-nautilus-cd-burner 
+  gnome-python2-metacity and gnome-python2-totem subpackages 
+  to gnome-python2-desktop because gnome-python-extras was split upstream
+
 * Mon Jan 23 2006 Ray Strode <rstrode at redhat.com> - 2.12.1-10
 - rebuild
 



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:04:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:04:12 -0500
Subject: rpms/booty/devel .cvsignore, 1.36, 1.37 booty.spec, 1.39,
	1.40 sources, 1.38, 1.39
Message-ID: <200602062204.k16M4ChF019463@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19420

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
- bump to 0.66-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	31 Jan 2006 16:32:20 -0000	1.36
+++ .cvsignore	6 Feb 2006 22:03:51 -0000	1.37
@@ -1 +1 @@
-booty-0.65.tar.bz2
+booty-0.66.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- booty.spec	31 Jan 2006 16:31:48 -0000	1.39
+++ booty.spec	6 Feb 2006 22:03:52 -0000	1.40
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.65
+Version: 0.66
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -34,6 +34,9 @@
 
 
 %changelog
+* Mon Feb  6 2006 Peter Jones <pjones at redhat.com> - 0.66-1
+- use "mapper/raidnamep0" for partition names instead of "mapper/raidname0"
+
 * Tue Jan 31 2006 Peter Jones <pjones at redhat.com> - 0.65-1
 - add support for reprobing device bootloaderInfo.drivelist
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	31 Jan 2006 16:32:20 -0000	1.38
+++ sources	6 Feb 2006 22:03:52 -0000	1.39
@@ -1 +1 @@
-3189eac2b69b30686a24f1e4bd3e404f  booty-0.65.tar.bz2
+67d7b260e6687138c0bf397884290e61  booty-0.66.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:07:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:07:52 -0500
Subject: rpms/python-pyblock/devel .cvsignore, 1.10, 1.11 python-pyblock.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200602062207.k16M7q75020002@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.13-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	31 Jan 2006 16:35:02 -0000	1.10
+++ .cvsignore	6 Feb 2006 22:07:49 -0000	1.11
@@ -1 +1 @@
-pyblock-0.12.tar.bz2
+pyblock-0.13.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-pyblock.spec	31 Jan 2006 18:14:39 -0000	1.16
+++ python-pyblock.spec	6 Feb 2006 22:07:49 -0000	1.17
@@ -4,7 +4,7 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.12
+Version: 0.13
 Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
@@ -38,6 +38,10 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Mon Feb  6 2006 Peter Jones <pjones at redhat.com> - 0.13-1
+- partition naming/creation/detection fixes
+- fixes for isw (ICH[4567]R) "groups"
+
 * Tue Jan 31 2006 Peter Jones <pjones at redhat.com> - 0.12-1
 - split __init__.py into separate files according to function
 - disable "nosync" hack for now


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	31 Jan 2006 18:14:39 -0000	1.14
+++ sources	6 Feb 2006 22:07:49 -0000	1.15
@@ -1 +1 @@
-d5fb9ca0dc28e28e6f9cd23710e19a01  pyblock-0.12.tar.bz2
+bb05f208de1459ee10b324ea988fd543  pyblock-0.13.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:08:28 -0500
Subject: rpms/kernel/devel linux-2.6-debug-boot-delay.patch, NONE,
	1.1 kernel-2.6.spec, 1.1913, 1.1914
Message-ID: <200602062208.k16M8Sdv020155@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-boot-delay.patch 
Log Message:
add printk pauser, and pray that it's useful.



linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-debug-boot-delay.patch ---

This one delays each printk() during boot by a variable time
(from kernel command line), while system_state == SYSTEM_BOOTING.
Caveat:  it's not terribly SMP safe or SMP nice.
Any ideas for improvements (esp. in the SMP area) are appreciated.

---

From: Randy Dunlap <rdunlap at xenotime.net>

Optionally add a boot delay after each kernel printk() call,
crudely measured in milliseconds, with a maximum delay of
10 seconds per printk.

Enable CONFIG_BOOT_DELAY=y and then add (e.g.):
"lpj=loops_per_jiffy boot_delay=100"
to the kernel command line.

Signed-off-by: Randy Dunlap <rdunlap at xenotime.net>
---

 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

--- linux-2615-work.orig/init/main.c
+++ linux-2615-work/init/main.c
@@ -557,6 +557,31 @@ static int __init initcall_debug_setup(c
 }
 __setup("initcall_debug", initcall_debug_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+unsigned int boot_delay = 0; /* msecs delay after each printk during bootup */
+extern long preset_lpj;
+unsigned long long printk_delay_msec = 0; /* per msec, based on boot_delay */
+
+static int __init boot_delay_setup(char *str)
+{
+	unsigned long lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */
+	unsigned long long loops_per_msec = lpj / 1000 * CONFIG_HZ;
+
+	get_option(&str, &boot_delay);
+	if (boot_delay > 10 * 1000)
+		boot_delay = 0;
+
+	printk_delay_msec = loops_per_msec;
+	printk("boot_delay: %u, preset_lpj: %ld, lpj: %lu, CONFIG_HZ: %d, printk_delay_msec: %llu\n",
+		boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
+
+	return 1;
+}
+__setup("boot_delay=", boot_delay_setup);
+
+#endif
+
 struct task_struct *child_reaper = &init_task;
 
 extern initcall_t __initcall_start[], __initcall_end[];
--- linux-2615-work.orig/init/calibrate.c
+++ linux-2615-work/init/calibrate.c
@@ -10,7 +10,7 @@
 
 #include <asm/timex.h>
 
-static unsigned long preset_lpj;
+unsigned long preset_lpj;
 static int __init lpj_setup(char *str)
 {
 	preset_lpj = simple_strtoul(str,NULL,0);
--- linux-2615-work.orig/kernel/printk.c
+++ linux-2615-work/kernel/printk.c
@@ -23,6 +23,7 @@
 #include <linux/smp_lock.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>			/* For in_interrupt() */
 #include <linux/config.h>
@@ -201,6 +202,33 @@ out:
 
 __setup("log_buf_len=", log_buf_len_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+extern unsigned int boot_delay; /* msecs to delay after each printk during bootup */
+extern long preset_lpj;
+extern unsigned long long printk_delay_msec;
+
+static void boot_delay_msec(int millisecs)
+{
+	unsigned long long k = printk_delay_msec * millisecs;
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(millisecs);
+	while (k) {
+		k--;
+		rep_nop();
+		/*
+		 * use (volatile) jiffies to prevent
+		 * compiler reduction; loop termination via jiffies
+		 * is secondary and may or may not happen.
+		 */
+		if (time_after(jiffies, timeout))
+			break;
+	}
+}
+
+#endif
+
 /*
  * Commands to do_syslog:
  *
@@ -520,6 +548,11 @@ asmlinkage int printk(const char *fmt, .
 	r = vprintk(fmt, args);
 	va_end(args);
 
+#ifdef CONFIG_BOOT_DELAY
+	if (boot_delay && system_state == SYSTEM_BOOTING)
+		boot_delay_msec(boot_delay);
+#endif
+
 	return r;
 }
 
--- linux-2615-work.orig/lib/Kconfig.debug
+++ linux-2615-work/lib/Kconfig.debug
@@ -186,6 +186,24 @@ config FRAME_POINTER
 	  some architectures or if you use external debuggers.
 	  If you don't debug the kernel, you can say N.
 
+config BOOT_DELAY
+	bool "Delay each boot message by N milliseconds"
+	depends on DEBUG_KERNEL
+	help
+	  This build option allows you to read kernel boot messages
+	  by inserting a short delay after each one.  The delay is
+	  specified in milliseconds on the kernel command line,
+	  using "boot_delay=N".
+
+	  It is likely that you would also need to use "lpj=M" to preset
+	  the "loops per jiffie" value.
+	  See a previous boot log for the "lpj" value to use for your
+	  system, and then set "lpj=M" before setting "boot_delay=N".
+	  NOTE:  Using this option may adversely affect SMP systems.
+	  I.e., processors other than the first one may not boot up.
+	  BOOT_DELAY also may cause DETECT_SOFTLOCKUP to detect
+	  what it believes to be lockup conditions.
+
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1913
retrieving revision 1.1914
diff -u -r1.1913 -r1.1914
--- kernel-2.6.spec	6 Feb 2006 16:04:19 -0000	1.1913
+++ kernel-2.6.spec	6 Feb 2006 22:08:24 -0000	1.1914
@@ -294,6 +294,7 @@
 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
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -743,6 +744,7 @@
 #%patch1029 -p1
 #%patch1030 -p1
 %patch1031 -p1
+%patch1032 -p1
 
 #
 # Make /dev/mem a need-to-know function 



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:08:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:08:29 -0500
Subject: rpms/kernel/devel/configs config-generic,1.147,1.148
Message-ID: <200602062208.k16M8Tfr020164@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
add printk pauser, and pray that it's useful.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- config-generic	6 Feb 2006 16:04:42 -0000	1.147
+++ config-generic	6 Feb 2006 22:08:25 -0000	1.148
@@ -2450,6 +2450,7 @@
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_RODATA is not set
+CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:18:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:18:19 -0500
Subject: rpms/booty/devel sources,1.39,1.40
Message-ID: <200602062218.k16MIJ0M003514@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3426

Modified Files:
	sources 
Log Message:
- don't be quite so retarded



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	6 Feb 2006 22:03:52 -0000	1.39
+++ sources	6 Feb 2006 22:18:16 -0000	1.40
@@ -1 +1 @@
-67d7b260e6687138c0bf397884290e61  booty-0.66.tar.bz2
+4df77e8d430fedc7378cb01339fad752  booty-0.66.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:18:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:18:43 -0500
Subject: rpms/xorg-x11-server/devel
	xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch, NONE, 1.1
Message-ID: <200602062218.k16MIhEn003707@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3681

Added Files:
	xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch 
Log Message:
Adding xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch

xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch:
 xaaPict.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch ---
Patch is based on comment #11 in fdo bug #4320, but taking into account
anholt's comment #25.  Adam Jackson suggested modifying the patch with:

<ajax> so basically s/ || pDst->format==PICT_a8.*)/)/g

So I've modified the patch, commenting out the code suggested bya ajax.

  -- mharris


Index: hw/xfree86/xaa/xaaPict.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xaa/xaaPict.c,v
retrieving revision 1.10
diff -u -p -u -r1.10 xaaPict.c
--- hw/xfree86/xaa/xaaPict.c	3 Jul 2005 08:53:49 -0000	1.10
+++ hw/xfree86/xaa/xaaPict.c	2 Feb 2006 17:33:58 -0000
@@ -506,12 +506,21 @@ XAAComposite (CARD8      op,
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAA_RENDER_PROLOGUE(pScreen, Composite);
 
-    if((op == PictOpSrc) && !pMask && infoRec->pScrn->vtSema &&
-	infoRec->ScreenToScreenBitBlt &&
-        pSrc->pDrawable &&
-	DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
-	DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
-	!pSrc->transform && !pSrc->repeat && (pSrc->format == pDst->format))
+    if(!pMask && infoRec->pScrn->vtSema &&
+       infoRec->ScreenToScreenBitBlt &&
+       pSrc->pDrawable &&
+       DRAWABLE_IS_ON_CARD(pSrc->pDrawable) &&
+       DRAWABLE_IS_ON_CARD(pDst->pDrawable) &&
+       !pSrc->transform &&
+       (!pSrc->repeat || (xSrc >= 0 && ySrc >= 0 &&
+			  xSrc+width<=pSrc->pDrawable->width &&
+			  ySrc+height<=pSrc->pDrawable->height)) &&
+       ((op == PictOpSrc && pSrc->format == pDst->format) ||
+	(op == PictOpOver && !pSrc->alphaMap && !pDst->alphaMap &&
+	 ((pSrc->format==PICT_x8r8g8b8 &&
+	   (pDst->format==PICT_x8r8g8b8 /* || pDst->format==PICT_a8r8g8b8 */ )) ||
+	  (pSrc->format==PICT_x8b8g8r8 &&
+	   (pDst->format==PICT_x8b8g8r8 /* || pDst->format==PICT_a8b8g8r8 */ ))))))
     {
 	XAACompositeSrcCopy(pSrc, pDst, xSrc, ySrc, xDst, yDst, width, height);
     } else if(!pSrc->pDrawable || (pMask && !pMask->pDrawable) ||



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:20:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:20:07 -0500
Subject: rpms/xorg-x11-server/devel .cvsignore,1.8,1.9
Message-ID: <200602062220.k16MK7kr004305@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Jan 2006 02:03:29 -0000	1.8
+++ .cvsignore	6 Feb 2006 22:20:05 -0000	1.9
@@ -1 +1,3 @@
-xorg-server-1.0.1.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:39:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:39:16 -0500
Subject: rpms/gnome-python2-extras/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200602062239.k16MdGGq001182@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20294

Modified Files:
	.cvsignore sources 
Log Message:
- upload source



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Nov 2005 20:29:04 -0000	1.7
+++ .cvsignore	6 Feb 2006 22:39:14 -0000	1.8
@@ -1,2 +1,3 @@
 gnome-python-extras-2.12.0.tar.bz2
 gnome-python-extras-2.12.1.tar.bz2
+gnome-python-desktop-2.13.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Nov 2005 20:29:04 -0000	1.7
+++ sources	6 Feb 2006 22:39:14 -0000	1.8
@@ -1 +1 @@
-62a3d8bb5bd5c1696c7200c001ea34f2  gnome-python-extras-2.12.1.tar.bz2
+98118c8d5ad5480768fa52d4497cf3e3  gnome-python-desktop-2.13.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:41:13 -0500
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.39,1.40
Message-ID: <200602062241.k16MfD9Z005566@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5553

Modified Files:
	gnome-python-extras.spec 
Log Message:
- bump and rebuild (force-tag fails for this module)



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-python-extras.spec	6 Feb 2006 21:36:20 -0000	1.39
+++ gnome-python-extras.spec	6 Feb 2006 22:41:11 -0000	1.40
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.13.3
-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
@@ -124,6 +124,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-2
+- Bump and rebuild (force-tag fails for this module)
+
 * Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-1
 - Update to 2.13.3
 - Move the gnome-python2-applet gnome-python2-gnomeprint 



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:47:34 -0500
Subject: rpms/gnome-python2-extras/devel .cvsignore, 1.8,
	1.9 gnome-python-extras.spec, 1.40, 1.41 sources, 1.8, 1.9
Message-ID: <200602062247.k16MlYCf018129@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18094

Modified Files:
	.cvsignore gnome-python-extras.spec sources 
Log Message:
 - upload the extras tarball, not the desktop tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Feb 2006 22:39:14 -0000	1.8
+++ .cvsignore	6 Feb 2006 22:47:31 -0000	1.9
@@ -1,3 +1,4 @@
 gnome-python-extras-2.12.0.tar.bz2
 gnome-python-extras-2.12.1.tar.bz2
 gnome-python-desktop-2.13.3.tar.bz2
+gnome-python-extras-2.13.3.tar.bz2


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-python-extras.spec	6 Feb 2006 22:41:11 -0000	1.40
+++ gnome-python-extras.spec	6 Feb 2006 22:47:31 -0000	1.41
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.13.3
-Release: 2
+Release: 3 
 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
@@ -124,6 +124,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-3
+- Upload correct tar ball and try again
+
 * Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-2
 - Bump and rebuild (force-tag fails for this module)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Feb 2006 22:39:14 -0000	1.8
+++ sources	6 Feb 2006 22:47:31 -0000	1.9
@@ -1 +1 @@
-98118c8d5ad5480768fa52d4497cf3e3  gnome-python-desktop-2.13.3.tar.bz2
+c42377091096da3f4d0fa42a52c235bf  gnome-python-extras-2.13.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:47:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:47:48 -0500
Subject: rpms/kernel/devel linux-2.6-debug-boot-delay.patch,1.1,1.2
Message-ID: <200602062247.k16MlmXI018233@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-boot-delay.patch 
Log Message:
build fix


linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-boot-delay.patch	6 Feb 2006 22:08:25 -0000	1.1
+++ linux-2.6-debug-boot-delay.patch	6 Feb 2006 22:47:46 -0000	1.2
@@ -98,7 +98,7 @@
 +	timeout = jiffies + msecs_to_jiffies(millisecs);
 +	while (k) {
 +		k--;
-+		rep_nop();
++		cpu_relax();
 +		/*
 +		 * use (volatile) jiffies to prevent
 +		 * compiler reduction; loop termination via jiffies



From fedora-cvs-commits at redhat.com  Mon Feb  6 22:51:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 17:51:12 -0500
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.36,1.37
Message-ID: <200602062251.k16MpC52018487@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18474

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Feb  6 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.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-server.spec	6 Feb 2006 08:10:10 -0000	1.36
+++ xorg-x11-server.spec	6 Feb 2006 22:51:10 -0000	1.37
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   2
+Release:   3
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -18,6 +18,7 @@
 # xorg-server-0.99.3-rgb.txt-dix-config-fix.patch is from post-RC2 CVS
 Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
+Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -230,6 +231,7 @@
 #%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
+%patch4 -p0 -b .composite-fastpath-fdo4320
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -264,15 +266,11 @@
 	--enable-install-libxf86config \
 	--with-fontdir=%(pkg-config --variable=fontdir fontutil)
 
-
-#	sdkdir=%{sdkdir}
-
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
-# sdkdir=%{sdkdir}
 
 # Remove all libtool archives (*.la)
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
@@ -301,26 +299,9 @@
 %endif
 }
 
-# FIXME: Move/rename manpages to correct location (still broke in RC2)
-%if 0
-{
-    WRONG_DIR=$RPM_BUILD_ROOT%{_mandir}/man1
-    MAN1X_DIR=$RPM_BUILD_ROOT%{_mandir}/man1x
-
-    [ ! -d $MAN1X_DIR ] && mkdir -p $MAN1X_DIR
-    mv ${WRONG_DIR}/* ${MAN1X_DIR}/
-    for each in ${MAN1X_DIR}/* ; do
-        mv $each ${each/.1/.1x}
-    done
-    rmdir $WRONG_DIR
-}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-
 %pre Xorg
 {
   pushd /etc/X11
@@ -367,26 +348,12 @@
 #  done
   popd
 
-# FIXME: I don't think this is needed anymore.  We'll block it for now and see what breaks.
-%if 0
-  # Do this for upgrades or installs
-  XKB_DIR=%{_x11datadir}/X11/xkb/compiled
-  if [ ! -L $XKB_DIR -a -d $XKB_DIR ]; then
-    mkdir -p /var/lib/xkb
-    mv -f $XKB_DIR /var/lib/xkb/
-    ln -sf ../../../../../var/lib/xkb $XKB_DIR
-  fi
-%endif
-} &> /dev/null || :
-
-
 # ----- Xorg --------------------------------------------------------
 
 %files Xorg
 %defattr(-,root,root,-)
 # FIXME: The build fails to find the Changelog for some reason.
 #%doc ChangeLog
-%dir %{_bindir}
 %{_bindir}/X
 %attr(4711, root, root) %{_bindir}/Xorg
 %{_bindir}/getconfig
@@ -458,18 +425,17 @@
 %{_libdir}/xorg/modules/libxf8_32wid.so
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/getconfig.1x*
 %{_mandir}/man1/gtf.1x*
 %{_mandir}/man1/pcitweak.1x*
 %{_mandir}/man1/scanpci.1x*
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
-%dir %{_mandir}/man4
+#%dir %{_mandir}/man4x
 #%{_mandir}/man4/fbdevhw.4x*
 %{_mandir}/man4/fbdevhw.4*
-%dir %{_mandir}/man5
+#%dir %{_mandir}/man5x
 %{_mandir}/man5/getconfig.5x*
 %{_mandir}/man5/xorg.conf.5x*
 %dir %{_localstatedir}/lib/xkb
@@ -479,17 +445,14 @@
 
 %files Xnest
 %defattr(-,root,root,-)
-%dir %{_bindir}
 %{_bindir}/Xnest
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/Xnest.1x*
 
 # ----- Xdmx --------------------------------------------------------
 
 %files Xdmx
 %defattr(-,root,root,-)
-%dir %{_bindir}
 %{_bindir}/Xdmx
 %{_bindir}/dmxaddinput
 %{_bindir}/dmxaddscreen
@@ -502,8 +465,7 @@
 %{_bindir}/vdltodmx
 %{_bindir}/xdmx
 %{_bindir}/xdmxconfig
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/Xdmx.1x*
 %{_mandir}/man1/dmxtodmx.1x*
 %{_mandir}/man1/vdltodmx.1x*
@@ -513,10 +475,8 @@
 
 %files Xvfb
 %defattr(-,root,root,-)
-%dir %{_bindir}
 %{_bindir}/Xvfb
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/Xvfb.1x*
 
 # ----- sdk ---------------------------------------------------------
@@ -534,6 +494,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Feb  6 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
 - 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



From fedora-cvs-commits at redhat.com  Mon Feb  6 23:52:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 18:52:46 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.133,
	1.134
Message-ID: <200602062352.k16Nqktr007325@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-serv7255

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_75rh
- Use fastjar to extract libgcj sources instead of unzip.




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.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- java-1.4.2-gcj-compat.spec	6 Feb 2006 20:22:37 -0000	1.133
+++ java-1.4.2-gcj-compat.spec	6 Feb 2006 23:52:42 -0000	1.134
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_74rh
+%define release 	40jpp_75rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -276,12 +276,12 @@
 install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
 %endif
 
-# build api documentation
+# build and install api documentation
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
 mkdir docsbuild
 pushd docsbuild
-  unzip /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+  fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
   rm -rf gnu
-  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
   find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
     sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
     xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/java -encoding UTF-8 -breakiterator -licensetext \
@@ -583,6 +583,9 @@
 %{_javadocdir}/java
 
 %changelog
+* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_75rh
+- Use fastjar to extract libgcj sources instead of unzip.
+
 * Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_74rh
 - Require gjdoc and libgcj-src packages for build.
 - Build API documentation.



From fedora-cvs-commits at redhat.com  Mon Feb  6 23:53:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 18:53:52 -0500
Subject: rpms/bind/devel bind.spec,1.87,1.88
Message-ID: <200602062353.k16NrqC5007827@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7800

Modified Files:
	bind.spec 
Log Message:
Rebuild for new gcc, glibc, glibc-kernheaders


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- bind.spec	16 Jan 2006 23:34:34 -0000	1.87
+++ bind.spec	6 Feb 2006 23:53:50 -0000	1.88
@@ -9,7 +9,7 @@
 Name: bind
 License: BSD-like
 Version: 9.3.2
-Release: 2
+Release: 2.1
 Epoch:   30
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -752,7 +752,10 @@
 :;
 
 %changelog
-* Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 30.9.3.2-2
+* Mon Feb 06 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-2.1
+- Rebuild for new gcc, glibc, glibc-kernheaders
+
+* Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-2
 - fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ 
   /proc/net/if_inet6 format
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:09:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:09:49 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.211, 1.212 anaconda.spec, 1.330,
	1.331 sources, 1.330, 1.331
Message-ID: <200602070009.k1709nVI012038@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11998/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.15-1 on branch devel from anaconda-10.91.15-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- .cvsignore	4 Feb 2006 00:16:58 -0000	1.211
+++ .cvsignore	7 Feb 2006 00:09:46 -0000	1.212
@@ -1 +1 @@
-anaconda-10.91.14.tar.bz2
+anaconda-10.91.15.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- anaconda.spec	4 Feb 2006 00:16:58 -0000	1.330
+++ anaconda.spec	7 Feb 2006 00:09:46 -0000	1.331
@@ -1,11 +1,11 @@
 Name: anaconda
-Version: 10.91.14
+Version: 10.91.15
 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, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel,pirut
+BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel, pirut, libXt-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.5.1-3, pirut
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
@@ -78,6 +78,19 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb  6 2006 Jeremy Katz <katzj at redhat.com> - 10.91.15-1
+- Remove debugging code that broke showing the Xen option on the task screen
+- More sqlite files (#171232)
+- Fix traceback for new method pirut depends on
+- Ensure /dev/root exists (Patrick Mansfield)
+- Force buttonbar on main screen active in congrats (dcantrel, #179924)
+- Always pass loglevel (dcantrel)
+- BR libXt-devel (dcantrel)
+- Don't try to make /dev/mapper devs (pjones)
+- More consistency in dev naming for dmraid (pjones)
+- Start of iscsi patches (Patrick Mansfield)
+- Fix pre-existing RAID chunksize reading (#178291)
+
 * Fri Feb  3 2006 Jeremy Katz <katzj at redhat.com> - 10.91.14-1
 - Handle reiserfs labels (dcantrel, #125939)
 - Skip more steps in root mode (Jasper Hartline)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- sources	4 Feb 2006 00:16:58 -0000	1.330
+++ sources	7 Feb 2006 00:09:46 -0000	1.331
@@ -1 +1 @@
-63880e04892f2d21b62b5ed0726af2e4  anaconda-10.91.14.tar.bz2
+bb78297e9e37abad272923b1f4eeddfa  anaconda-10.91.15.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:16:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:16:37 -0500
Subject: rpms/perl/devel perl.spec,1.81,1.82
Message-ID: <200602070016.k170GbgV014990@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
Rebuild with new gcc, glibc, and glibc-kernheaders


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- perl.spec	3 Feb 2006 15:48:27 -0000	1.81
+++ perl.spec	7 Feb 2006 00:16:34 -0000	1.82
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    1.1
+%define perlrel    1.2
 %define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -524,6 +524,9 @@
 %endif
 
 %changelog
+* Mon Feb 06 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1.2
+- Rebuild with new gcc, glibc, and glibc-kernheaders
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1.1
 - Rebuild with new gcc and glibc
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:28:03 -0500
Subject: rpms/dhcp/devel dhcp.spec,1.83,1.84
Message-ID: <200602070028.k170S3hm032260@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32234

Modified Files:
	dhcp.spec 
Log Message:
Rebuild for new gcc, glibc, glibc-kernheaders


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- dhcp.spec	22 Jan 2006 20:49:50 -0000	1.83
+++ dhcp.spec	7 Feb 2006 00:28:01 -0000	1.84
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 21
+Release: 21.1
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -325,6 +325,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 06 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-21.1
+- Rebuild for new gcc, glibc and glibc-kernheaders
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> - 11:3.0.3-21
 - Fix dhclient-script to use /bin/dbus-send now that all dbus related
     binaries are in /bin rather than /usr/bin



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:37:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:37:10 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.134,
	1.135
Message-ID: <200602070037.k170bARA025447@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-serv17785

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_76rh
- Test src.zip before extracting its contents.




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.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- java-1.4.2-gcj-compat.spec	6 Feb 2006 23:52:42 -0000	1.134
+++ java-1.4.2-gcj-compat.spec	7 Feb 2006 00:37:08 -0000	1.135
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_75rh
+%define release 	40jpp_76rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -280,13 +280,19 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
 mkdir docsbuild
 pushd docsbuild
-  fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
-  rm -rf gnu
-  find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
-    sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
-    xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/java -encoding UTF-8 -breakiterator -licensetext \
-      -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
-      -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
+# work around ppc64 file system corruption
+  if unzip -tq /usr/share/java/src-4.1.0.zip
+  then
+    fastjar xvf /usr/share/java/src-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.zip
+    rm -rf gnu
+    find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
+      sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
+      xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/java -encoding UTF-8 -breakiterator -licensetext \
+        -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
+        -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
+  else
+    touch $RPM_BUILD_ROOT%{_javadocdir}/java/package-list
+  fi
 popd
 
 %clean
@@ -583,6 +589,9 @@
 %{_javadocdir}/java
 
 %changelog
+* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_76rh
+- Test src.zip before extracting its contents.
+
 * Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_75rh
 - Use fastjar to extract libgcj sources instead of unzip.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:45:20 -0500
Subject: rpms/kernel-xen/devel/configs config-generic, 1.5,
	1.6 config-x86-generic, 1.6, 1.7 config-x86_64-generic, 1.5, 1.6
Message-ID: <200602070045.k170jKBM028712@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-generic config-x86-generic config-x86_64-generic 
Log Message:
merge with rawhide 1.914


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-generic	2 Feb 2006 14:04:31 -0000	1.5
+++ config-generic	7 Feb 2006 00:45:16 -0000	1.6
@@ -559,6 +559,7 @@
 # Networking support
 #
 CONFIG_NET=y
+# CONFIG_NETDEBUG is not set
 
 # CONFIG_TCP_CONG_ADVANCED is not set
 
@@ -1094,6 +1095,7 @@
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
 CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -2448,6 +2450,7 @@
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_DEBUG_RODATA is not set
+CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-x86-generic	31 Jan 2006 21:26:17 -0000	1.6
+++ config-x86-generic	7 Feb 2006 00:45:16 -0000	1.7
@@ -276,7 +276,7 @@
 CONFIG_CS5535_GPIO=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-x86_64-generic	26 Jan 2006 22:14:35 -0000	1.5
+++ config-x86_64-generic	7 Feb 2006 00:45:16 -0000	1.6
@@ -149,7 +149,7 @@
 CONFIG_NVRAM=m
 
 CONFIG_EDAC=y
-CONFIG_EDAC_DEBUG=y
+# CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m



From fedora-cvs-commits at redhat.com  Tue Feb  7 00:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 19:45:18 -0500
Subject: rpms/kernel-xen/devel linux-2.6-bcm43xx-git-mb.patch, NONE,
 1.1 linux-2.6-bcm43xx-git.patch, NONE, 1.1 linux-2.6-cpufreq-git.patch, NONE,
 1.1 linux-2.6-debug-boot-delay.patch, NONE,
 1.1 linux-2.6-debug-periodic-slab-check.patch, NONE,
 1.1 linux-2.6-fs-namei-deadlock.patch, NONE,
 1.1 linux-2.6-net-suppress-msgs.patch, NONE,
 1.1 linux-2.6-percpu-NR_CPUS.patch, NONE, 1.1 patch-2.6.16-rc2-git2.bz2.sign,
 NONE, 1.1 patch-2.6.16-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.13,
 1.14 drm.patch, 1.1, 1.2 kernel-xen.spec, 1.40,
 1.41 linux-2.6-compile-fixes.patch, 1.3,
 1.4 linux-2.6-debug-oops-pause.patch, 1.4,
 1.5 linux-2.6-debug-singlebiterror.patch, 1.3,
 1.4 linux-2.6-random-patches.patch, 1.1,
 1.2 linux-2.6-selinux-mprotect-checks.patch, 1.2,
 1.3 linux-2.6-softmac-git.patch, 1.2, 1.3 linux-2.6-xen-merge.patch, 1.8,
 1.9 sources, 1.13, 1.14 upstream, 1.6, 1.7 linux-2.6-bcm43xx-resume.patch,
 1.1, NONE linux-2.6-bcm43xx.patch, 1.1,
 NONE linux-2.6-suspend-memhotplug-oops.patch, 1.1,
 NONE patch-2.6.16-rc1-git5.bz2.sign, 1.1, NONE patch-2!
 .6.16-rc1.bz2.sign,1.1,NONE
Message-ID: <200602070045.k170jIET028684@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore drm.patch kernel-xen.spec 
	linux-2.6-compile-fixes.patch linux-2.6-debug-oops-pause.patch 
	linux-2.6-debug-singlebiterror.patch 
	linux-2.6-random-patches.patch 
	linux-2.6-selinux-mprotect-checks.patch 
	linux-2.6-softmac-git.patch linux-2.6-xen-merge.patch sources 
	upstream 
Added Files:
	linux-2.6-bcm43xx-git-mb.patch linux-2.6-bcm43xx-git.patch 
	linux-2.6-cpufreq-git.patch linux-2.6-debug-boot-delay.patch 
	linux-2.6-debug-periodic-slab-check.patch 
	linux-2.6-fs-namei-deadlock.patch 
	linux-2.6-net-suppress-msgs.patch 
	linux-2.6-percpu-NR_CPUS.patch patch-2.6.16-rc2-git2.bz2.sign 
	patch-2.6.16-rc2.bz2.sign 
Removed Files:
	linux-2.6-bcm43xx-resume.patch linux-2.6-bcm43xx.patch 
	linux-2.6-suspend-memhotplug-oops.patch 
	patch-2.6.16-rc1-git5.bz2.sign patch-2.6.16-rc1.bz2.sign 
Log Message:
merge with rawhide 1.914

linux-2.6-bcm43xx-git-mb.patch:
 drivers/net/wireless/Kconfig                   |   19 +
 drivers/net/wireless/bcm43xx/Makefile          |   88 --------
 drivers/net/wireless/bcm43xx/bcm43xx.h         |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    |  245 +++++--------------------
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     |    9 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      |   56 ++++-
 net/ieee80211/ieee80211_rx.c                   |   74 -------
 10 files changed, 188 insertions(+), 377 deletions(-)

--- NEW FILE linux-2.6-bcm43xx-git-mb.patch ---
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 2aa891f..1b751ac 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -491,12 +491,21 @@ source "drivers/net/wireless/hostap/Kcon
 source "drivers/net/wireless/tiacx/Kconfig"
 
 config BCM43XX
-       tristate "Broadcom BCM43xx wireless support"
-       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
+	tristate "Broadcom BCM43xx wireless support"
+	depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
 	select FW_LOADER
-       ---help---
-	This is an experimental driver for the Broadcom 43xx wireless chip,
-	found in the Apple Airport Extreme and various other devices.
+	---help---
+	  This is an experimental driver for the Broadcom 43xx wireless chip,
+	  found in the Apple Airport Extreme and various other devices.
+
+config BCM43XX_DEBUG
+	bool "Broadcom BCM43xx debugging (RECOMMENDED)"
+	depends on BCM43XX
+	default y
+	---help---
+	  Broadcom 43xx debugging messages.
+	  Say Y, because the driver is still very experimental and
+	  this will help you get it running.
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
index 98d4efb..e025e9f 100644
--- a/drivers/net/wireless/bcm43xx/Makefile
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -1,87 +1,9 @@
-# Makefile for bcm43xx driver
+obj-$(CONFIG_BCM43XX) += bcm43xx.o
+bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o
 
-VERSION		:= 0.0.1
-RELEASE_NAME	:= bcm43xx-$(VERSION)
-
-# Optional path, where the SoftMAC subsystem is located.
-# You may set SOFTMAC_DIR in your bashrc, for example.
-SOFTMAC_DIR	?= 
-
-KVER		:= $(shell uname -r)
-KDIR		?= /lib/modules/$(KVER)/build
-PWD		:= $(shell pwd)
-MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
-
-# Comment/uncomment to enable/disable debugging
-DEBUG = y
-
-
-ifeq ($(DEBUG),y)
-DEBUGFS_OBJ = bcm43xx_debugfs.o
-CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
-else
-DEBUGFS_OBJ =
-CFLAGS += -O2
-endif
-
-CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
-ifneq ($(SOFTMAC_DIR),)
-CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
-endif
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-obj-m := bcm43xx.o
-bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o \
 		bcm43xx_radio.o bcm43xx_phy.o \
 		bcm43xx_power.o bcm43xx_wx.o \
 		bcm43xx_pio.o bcm43xx_ilt.o \
-		bcm43xx_leds.o
-
-else
-
-default: modules
-
-modules:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-install: bcm43xx.ko
-	install -d $(MODPATH)
-	install -m 644 -c bcm43xx.ko $(MODPATH)
-	/sbin/depmod -a
-
-uninstall:
-	rm -rf $(MODPATH)
-	/sbin/depmod -a
-
-endif
-
-clean:
-	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
-		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
-		-print | xargs rm -Rf
-
-depend .depend dep:
-	$(CC) $(CFLAGS) -M *.c > .depend
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
-
-DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
-DISTDIR = $(RELEASE_NAME)
-
-release: clean
-	@rm -rf $(DISTDIR)
-	@mkdir $(DISTDIR)
-	@chmod 777 $(DISTDIR)
-	@for file in $(DISTFILES); do                   \
-                if test -d $$file; then                 \
-                        mkdir $(DISTDIR)/$$file;        \
-                else                                    \
-                        cp -p $$file $(DISTDIR)/$$file; \
-                fi;                                     \
-        done
-	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
-	@rm -rf $(DISTDIR)
+		bcm43xx_leds.o bcm43xx_ethtool.o \
+		$(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 38e75ed..981d563 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -17,14 +17,10 @@
 #include "bcm43xx_leds.h"
 
 
-#define DRV_NAME			__stringify(KBUILD_MODNAME)
-#define DRV_VERSION			__stringify(BCM43xx_VERSION)
-#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
-#define PFX				DRV_NAME ": "
+#define PFX				KBUILD_MODNAME ": "
 
 #define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
 #define BCM43xx_IRQWAIT_MAX_RETRIES	50
-#define BCM43xx_TX_TIMEOUT		(10 * HZ)
 
 #define BCM43xx_IO_SIZE			8192
 #define BCM43xx_REG_ACTIVE_CORE		0x80
@@ -529,6 +525,8 @@ struct bcm43xx_radioinfo {
 	 * 3: tx_CTL2
 	 */
 	u16 txpower[4];
+	/* Desired TX power in dBm Q5.2 */
+	u16 txpower_desired;
 	/* Current Interference Mitigation mode */
 	int interfmode;
 	/* Stack of saved values from the Interference Mitigation code */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index f8cfc84..5a7dc43 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -141,7 +141,7 @@ static ssize_t drvinfo_read_file(struct 
 	down(&big_buffer_sem);
 
 	/* This is where the information is written to the "driver" file */
-	fappend(BCM43xx_DRIVER_NAME "\n");
+	fappend(KBUILD_MODNAME " driver\n");
 	fappend("Compiled at: %s %s\n", __DATE__, __TIME__);
 
 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
@@ -433,12 +433,12 @@ void bcm43xx_debugfs_log_txstat(struct b
 void bcm43xx_debugfs_init(void)
 {
 	memset(&fs, 0, sizeof(fs));
-	fs.root = debugfs_create_dir(DRV_NAME, NULL);
+	fs.root = debugfs_create_dir(KBUILD_MODNAME, NULL);
 	if (!fs.root)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "\" subdir failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "\" subdir failed!\n");
 	fs.dentry_driverinfo = debugfs_create_file("driver", 0444, fs.root, NULL, &drvinfo_fops);
 	if (!fs.dentry_driverinfo)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "/driver\" failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "/driver\" failed!\n");
 }
 
 void bcm43xx_debugfs_exit(void)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
new file mode 100644
index 0000000..b3ffcf5
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -0,0 +1,50 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  ethtool support
+
+  Copyright (c) 2006 Jason Lunz <lunz at falooley.org>
+
+  Some code in this file is derived from the 8139too.c driver
+  Copyright (C) 2002 Jeff Garzik
+
+  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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_ethtool.h"
+
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/version.h>
+
+
+static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+	struct bcm43xx_private *bcm = bcm43xx_priv(dev);
+
+	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+	strncpy(info->version, UTS_RELEASE, sizeof(info->version));
+	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
+}
+
+struct ethtool_ops bcm43xx_ethtool_ops = {
+	.get_drvinfo = bcm43xx_get_drvinfo,
+	.get_link = ethtool_op_get_link,
+};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
new file mode 100644
index 0000000..8137049
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
@@ -0,0 +1,8 @@
+#ifndef BCM43xx_ETHTOOL_H_
+#define BCM43xx_ETHTOOL_H_
+
+#include <linux/ethtool.h>
+
+extern struct ethtool_ops bcm43xx_ethtool_ops;
+
+#endif /* BCM43xx_ETHTOOL_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 4b4e60a..8e08c41 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -49,6 +49,7 @@
 #include "bcm43xx_pio.h"
 #include "bcm43xx_power.h"
 #include "bcm43xx_wx.h"
+#include "bcm43xx_ethtool.h"
 
 
 MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
@@ -82,10 +83,6 @@ static int modparam_locale = -1;
 module_param_named(locale, modparam_locale, int, 0444);
 MODULE_PARM_DESC(country, "Select LocaleCode 0-11 (For travelers)");
 
-static int modparam_outdoor;
-module_param_named(outdoor, modparam_outdoor, int, 0444);
-MODULE_PARM_DESC(outdoor, "Set to 1, if you are using the device outdoor, 0 otherwise.");
-
 static int modparam_noleds;
 module_param_named(noleds, modparam_noleds, int, 0444);
 MODULE_PARM_DESC(noleds, "Turn off all LED activity");
@@ -796,6 +793,10 @@ static int bcm43xx_read_radioinfo(struct
 		bcm->current_core->radio->txpower[2] = 3;
 	else
 		bcm->current_core->radio->txpower[2] = 0;
+	if (bcm->current_core->phy->type == BCM43xx_PHYTYPE_A)
+		bcm->current_core->radio->txpower_desired = bcm->sprom.maxpower_aphy;
+	else
+		bcm->current_core->radio->txpower_desired = bcm->sprom.maxpower_bgphy;
 
 	/* Initialize the in-memory nrssi Lookup Table. */
 	for (i = 0; i < 64; i++)
@@ -1088,163 +1089,13 @@ static int bcm43xx_read_sprom(struct bcm
 	return 0;
 }
 
-static int bcm43xx_channel_is_allowed(struct bcm43xx_private *bcm, u8 channel,
-				      u8 *max_power, u8 *flags)
-{
-	/* THIS FUNCTION DOES _NOT_ ENFORCE REGULATORY DOMAIN COMPLIANCE.
-	 * It is only a helper function to make life easier to
-	 * select legal channels and transmission powers.
-	 */
-
-	u8 phytype = bcm->current_core->phy->type;
-	int allowed = 0;
-
-	*max_power = 0;
-	*flags = 0;
-
-	//FIXME: Set max_power and maybe flags
-	/*FIXME: Allowed channels are sometimes different for outdoor
-	 *       or indoor use. See modparam_outdoor.
-	 */
-	/* From b specs Max Power BPHY:
-	 *	USA:	1000mW
-	 *	Europe:	100mW
-	 *	Japan:	10mW/MHz
-	 */
-
-	switch (bcm->sprom.locale) {
-	case BCM43xx_LOCALE_WORLD:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_THAILAND:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ISRAEL:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		} else {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JORDAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_CHINA:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_CANADA_ANZ:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_EUROPE:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_LOW:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN_HIGH:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME?
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ALL:
-		allowed = 1;
-		break;
-	case BCM43xx_LOCALE_NONE:
-		break;
-	default:
-		assert(0);
-	}
-
-	return allowed;
-}
-
 static void bcm43xx_geo_init(struct bcm43xx_private *bcm)
 {
 	struct ieee80211_geo geo;
 	struct ieee80211_channel *chan;
 	int have_a = 0, have_bg = 0;
 	int i, num80211;
-	u8 channel, flags, max_power;
+	u8 channel;
 	struct bcm43xx_phyinfo *phy;
 	const char *iso_country;
 
@@ -1268,27 +1119,17 @@ static void bcm43xx_geo_init(struct bcm4
 
  	if (have_a) {
 		for (i = 0, channel = 0; channel < 201; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.a[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.a_channels = i;
 	}
 	if (have_bg) {
 		for (i = 0, channel = 1; channel < 15; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.bg[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.bg_channels = i;
 	}
@@ -2229,9 +2070,9 @@ static irqreturn_t bcm43xx_interrupt_han
 	return IRQ_HANDLED;
 }
 
-static void bcm43xx_release_firmware(struct bcm43xx_private *bcm)
+static void bcm43xx_release_firmware(struct bcm43xx_private *bcm, int force)
 {
-	if (bcm->firmware_norelease)
+	if (bcm->firmware_norelease && !force)
 		return; /* Suspending or controller reset. */
 	release_firmware(bcm->ucode);
 	bcm->ucode = NULL;
@@ -2361,7 +2202,7 @@ static int bcm43xx_request_firmware(stru
 out:
 	return err;
 error:
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 err_noinitval:
 	printk(KERN_ERR PFX "Error: No InitVals available!\n");
@@ -2409,9 +2250,9 @@ static void bcm43xx_upload_microcode(str
 #endif
 }
 
-static void bcm43xx_write_initvals(struct bcm43xx_private *bcm,
-				   const struct bcm43xx_initval *data,
-				   const unsigned int len)
+static int bcm43xx_write_initvals(struct bcm43xx_private *bcm,
+				  const struct bcm43xx_initval *data,
+				  const unsigned int len)
 {
 	u16 offset, size;
 	u32 value;
@@ -2422,35 +2263,54 @@ static void bcm43xx_write_initvals(struc
 		size = be16_to_cpu(data[i].size);
 		value = be32_to_cpu(data[i].value);
 
-		if (size == 2)
-			bcm43xx_write16(bcm, offset, value);
-		else if (size == 4)
+		if (unlikely(offset >= 0x1000))
+			goto err_format;
+		if (size == 2) {
+			if (unlikely(value & 0xFFFF0000))
+				goto err_format;
+			bcm43xx_write16(bcm, offset, (u16)value);
+		} else if (size == 4) {
 			bcm43xx_write32(bcm, offset, value);
-		else
-			printk(KERN_ERR PFX "InitVals fileformat error.\n");
+		} else
+			goto err_format;
 	}
+
+	return 0;
+
+err_format:
+	printk(KERN_ERR PFX "InitVals (bcm43xx_initvalXX.fw) file-format error. "
+			    "Please fix your bcm43xx firmware files.\n");
+	return -EPROTO;
 }
 
-static void bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
+static int bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
 {
+	int err;
+
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_enable(bcm);
 #else
 	bcm43xx_mmioprint_disable(bcm);
 #endif
 
-	bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
-			       bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
+				     bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	if (err)
+		goto out;
 	if (bcm->initvals1) {
-		bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
-				       bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
+					     bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		if (err)
+			goto out;
 	}
 
+out:
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_disable(bcm);
 #else
 	bcm43xx_mmioprint_enable(bcm);
 #endif
+	return err;
 }
 
 static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
@@ -2471,7 +2331,7 @@ static int bcm43xx_initialize_irq(struct
 	}
 #endif
 	res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-			  SA_SHIRQ, DRV_NAME, bcm);
+			  SA_SHIRQ, KBUILD_MODNAME, bcm);
 	if (res) {
 		printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
 		return -EFAULT;
@@ -2683,7 +2543,7 @@ static void bcm43xx_chip_cleanup(struct 
 		bcm43xx_leds_exit(bcm);
 	bcm43xx_gpio_cleanup(bcm);
 	free_irq(bcm->irq, bcm);
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 0);
 }
 
 /* Initialize the chip
@@ -2708,13 +2568,15 @@ static int bcm43xx_chip_init(struct bcm4
 
 	err = bcm43xx_initialize_irq(bcm);
 	if (err)
-		goto out;
+		goto err_release_fw;
 
 	err = bcm43xx_gpio_init(bcm);
 	if (err)
 		goto err_free_irq;
 
-	bcm43xx_upload_initvals(bcm);
+	err = bcm43xx_upload_initvals(bcm);
+	if (err)
+		goto err_gpio_cleanup;
 	bcm43xx_radio_turn_on(bcm);
 
 	if (modparam_noleds)
@@ -2813,9 +2675,12 @@ out:
 
 err_radio_off:
 	bcm43xx_radio_turn_off(bcm);
+err_gpio_cleanup:
 	bcm43xx_gpio_cleanup(bcm);
 err_free_irq:
 	free_irq(bcm->irq, bcm);
+err_release_fw:
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 }
 	
@@ -3809,7 +3674,7 @@ static int bcm43xx_attach_board(struct b
 	}
 #endif
 
-	err = pci_request_regions(pci_dev, DRV_NAME);
+	err = pci_request_regions(pci_dev, KBUILD_MODNAME);
 	if (err) {
 		printk(KERN_ERR PFX
 		       "could not access PCI resources (%i)\n", err);
@@ -4389,12 +4254,12 @@ static int __devinit bcm43xx_init_one(st
 #endif
 	net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
 	net_dev->irq = pdev->irq;
-	net_dev->watchdog_timeo = BCM43xx_TX_TIMEOUT;
+	SET_ETHTOOL_OPS(net_dev, &bcm43xx_ethtool_ops);
 
 	/* initialize the bcm43xx_private struct */
 	bcm = bcm43xx_priv(net_dev);
 	memset(bcm, 0, sizeof(*bcm));
-	wq = create_workqueue(DRV_NAME "_wq");
+	wq = create_workqueue(KBUILD_MODNAME "_wq");
 	if (!wq) {
 		err = -ENOMEM;
 		goto err_free_netdev;
@@ -4567,7 +4432,7 @@ static int bcm43xx_resume(struct pci_dev
 #endif				/* CONFIG_PM */
 
 static struct pci_driver bcm43xx_pci_driver = {
-	.name = BCM43xx_DRIVER_NAME,
+	.name = KBUILD_MODNAME,
 	.id_table = bcm43xx_pci_tbl,
 	.probe = bcm43xx_init_one,
 	.remove = __devexit_p(bcm43xx_remove_one),
@@ -4579,7 +4444,7 @@ static struct pci_driver bcm43xx_pci_dri
 
 static int __init bcm43xx_init(void)
 {
-	printk(KERN_INFO BCM43xx_DRIVER_NAME "\n");
+	printk(KERN_INFO KBUILD_MODNAME " driver\n");
 	bcm43xx_debugfs_init();
 	return pci_register_driver(&bcm43xx_pci_driver);
 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index f5e7a6a..79c1c71 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -1763,14 +1763,9 @@ void bcm43xx_phy_xmitpower(struct bcm43x
 			where REG is the max power as per the regulatory domain
 		*/
 
-		/*TODO: Get desired_pwr from wx_handlers or the stack
-		limit_value(desired_pwr, 0, max_pwr);
-		*/
-
-		desired_pwr = max_pwr; /* remove this when we have a real desired_pwr */
-
+		desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
+		/* Check if we need to adjust the current power. */
 		pwr_adjust = desired_pwr - estimated_pwr;
-
 		radio_att_delta = -(pwr_adjust + 7) >> 3;
 		baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
 		if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index fe6409a..bed7cfb 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -41,6 +41,11 @@
 #include "bcm43xx_main.h"
 #include "bcm43xx_radio.h"
 
+
+/* The WIRELESS_EXT version, which is implemented by this driver. */
+#define BCM43xx_WX_VERSION	18
+
+
 /* Define to enable a printk on each wx handler function invocation */
 //#define BCM43xx_WX_DEBUG
 
@@ -282,7 +287,12 @@ static int bcm43xx_wx_get_rangeparams(st
 	range->max_encoding_tokens = WEP_KEYS;
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 16;
+	range->we_version_source = BCM43xx_WX_VERSION;
+
+	range->enc_capa = IW_ENC_CAPA_WPA |
+			  IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP |
+			  IW_ENC_CAPA_CIPHER_CCMP;
 
 	spin_lock_irqsave(&bcm->lock, flags);
 
@@ -474,21 +484,40 @@ static int bcm43xx_wx_set_xmitpower(stru
 				    char *extra)
 {
 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+	struct bcm43xx_radioinfo *radio;
+	struct bcm43xx_phyinfo *phy;
 	unsigned long flags;
 	int err = -ENODEV;
+	u16 maxpower;
 
 	wx_enter();
 
+	if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
+		printk(PFX KERN_ERR "TX power not in dBm.\n");
+		return -EOPNOTSUPP;
+	}
+
 	spin_lock_irqsave(&bcm->lock, flags);
 	if (!bcm->initialized)
 		goto out_unlock;
-	if (data->power.disabled != (!(bcm->current_core->radio->enabled))) {
-		if (data->power.disabled)
+	radio = bcm->current_core->radio;
+	phy = bcm->current_core->phy;
+	if (data->txpower.disabled != (!(radio->enabled))) {
+		if (data->txpower.disabled)
 			bcm43xx_radio_turn_off(bcm);
 		else
 			bcm43xx_radio_turn_on(bcm);
 	}
-	//TODO: set txpower.
+	if (data->txpower.value > 0) {
+		/* desired and maxpower dBm values are in Q5.2 */
+		if (phy->type == BCM43xx_PHYTYPE_A)
+			maxpower = bcm->sprom.maxpower_aphy;
+		else
+			maxpower = bcm->sprom.maxpower_bgphy;
+		radio->txpower_desired = limit_value(data->txpower.value << 2,
+						     0, maxpower);
+		bcm43xx_phy_xmitpower(bcm);
+	}
 	err = 0;
 
 out_unlock:
@@ -503,18 +532,27 @@ static int bcm43xx_wx_get_xmitpower(stru
 				    char *extra)
 {
 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+	struct bcm43xx_radioinfo *radio;
 	unsigned long flags;
+	int err = -ENODEV;
 
 	wx_enter();
 
 	spin_lock_irqsave(&bcm->lock, flags);
-//TODO	data->power.value = ???
-	data->power.fixed = 1;
-	data->power.flags = IW_TXPOW_DBM;
-	data->power.disabled = !(bcm->current_core->radio->enabled);
+	if (!bcm->initialized)
+		goto out_unlock;
+	radio = bcm->current_core->radio;
+	/* desired dBm value is in Q5.2 */
+	data->txpower.value = radio->txpower_desired >> 2;
+	data->txpower.fixed = 1;
+	data->txpower.flags = IW_TXPOW_DBM;
+	data->txpower.disabled = !(radio->enabled);
+
+	err = 0;
+out_unlock:
 	spin_unlock_irqrestore(&bcm->lock, flags);
 
-	return 0;
+	return err;
 }
 
 static int bcm43xx_wx_set_retry(struct net_device *net_dev,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index e9b5072..5dcfb1b 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -780,80 +780,6 @@ int ieee80211_rx(struct ieee80211_device
 	return 0;
 }
 
-/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
-int ieee80211_rx_any(struct ieee80211_device *ieee,
-		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
-{
-	struct ieee80211_hdr_4addr *hdr;
-	int is_packet_for_us;
-	u16 fc;
-
-	if (ieee->iw_mode == IW_MODE_MONITOR)
-		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
-
-	hdr = (struct ieee80211_hdr_4addr *)skb->data;
-	fc = le16_to_cpu(hdr->frame_ctl);
-
-	if ((fc & IEEE80211_FCTL_VERS) != 0)
-		return -EINVAL;
-		
-	switch (fc & IEEE80211_FCTL_FTYPE) {
-	case IEEE80211_FTYPE_MGMT:
-		ieee80211_rx_mgt(ieee, hdr, stats);
-		return 0;
-	case IEEE80211_FTYPE_DATA:
-		break;
-	case IEEE80211_FTYPE_CTL:
-		return 0;
-	default:
-		return -EINVAL;
-	}
-
-	is_packet_for_us = 0;
-	switch (ieee->iw_mode) {
-	case IW_MODE_ADHOC:
-		/* our BSS and not from/to DS */
-		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
-		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
-			/* promisc: get all */
-			if (ieee->dev->flags & IFF_PROMISC)
-				is_packet_for_us = 1;
-			/* to us */
-			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-				is_packet_for_us = 1;
-			/* mcast */
-			else if (is_multicast_ether_addr(hdr->addr1))
-				is_packet_for_us = 1;
-		}
-		break;
-	case IW_MODE_INFRA:
-		/* our BSS (== from our AP) and from DS */
-		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
-		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
-			/* promisc: get all */
-			if (ieee->dev->flags & IFF_PROMISC)
-				is_packet_for_us = 1;
-			/* to us */
-			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
-				is_packet_for_us = 1;
-			/* mcast */
-			else if (is_multicast_ether_addr(hdr->addr1)) {
-				/* not our own packet bcasted from AP */
-				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
-					is_packet_for_us = 1;
-			}
-		}
-		break;
-	default:
-		/* ? */
-		break;
-	}
-
-	if (is_packet_for_us)
-		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
-	return 0;
-}
-
 #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
 
 static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };

linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |    8 
 drivers/net/wireless/Makefile                  |    1 
 drivers/net/wireless/bcm43xx/Makefile          |   87 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  938 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  175 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 +
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  261 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4596 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2122 +++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  592 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |   88 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 +
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 +++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   93 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1099 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 25 files changed, 14717 insertions(+)

--- NEW FILE linux-2.6-bcm43xx-git.patch ---
diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
new file mode 100644
index 0000000..64d9022
--- /dev/null
+++ b/Documentation/networking/bcm43xx.txt
@@ -0,0 +1,36 @@
+
+			BCM43xx Linux Driver Project
+			============================
+
+About this software
+-------------------
+
+The goal of this project is to develop a linux driver for Broadcom
+BCM43xx chips, based on the specification at 
+http://bcm-specs.sipsolutions.net/
+
+The project page is http://bcm43xx.berlios.de/
+
+
+Requirements
+------------
+
+1)	Linux Kernel 2.6.15 or later
+	http://www.kernel.org/
+
+	You may want to configure your kernel with:
+
+	CONFIG_DEBUG_FS (optional):
+		-> Kernel hacking
+		  -> Debug Filesystem
+
+2)	SoftMAC IEEE 802.11 Networking Stack extension and patched ieee80211
+	modules:
+	http://softmac.sipsolutions.net/
+
+3)	Firmware Files
+
+	Please try fwcutter. Fwcutter can extract the firmware from various 
+	binary driver files. It supports driver files from Windows, MacOS and 
+	Linux. You can get fwcutter from http://bcm43xx.berlios.de/.
+	Also, fwcutter comes with a README file for further instructions.
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 233a4f6..32744ea 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -473,6 +473,14 @@ config PRISM54
 
 source "drivers/net/wireless/hostap/Kconfig"
 
+config BCM43XX
+       tristate "Broadcom BCM43xx wireless support"
+       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
+	select FW_LOADER
+       ---help---
+	This is an experimental driver for the Broadcom 43xx wireless chip,
+	found in the Apple Airport Extreme and various other devices.
+
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
 	bool
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index 3a6f7ba..c867798 100644
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_BCM43XX)		+= bcm43xx/
 
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
new file mode 100644
index 0000000..98d4efb
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -0,0 +1,87 @@
+# Makefile for bcm43xx driver
+
+VERSION		:= 0.0.1
+RELEASE_NAME	:= bcm43xx-$(VERSION)
+
+# Optional path, where the SoftMAC subsystem is located.
+# You may set SOFTMAC_DIR in your bashrc, for example.
+SOFTMAC_DIR	?= 
+
+KVER		:= $(shell uname -r)
+KDIR		?= /lib/modules/$(KVER)/build
+PWD		:= $(shell pwd)
+MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
+
+# Comment/uncomment to enable/disable debugging
+DEBUG = y
+
+
+ifeq ($(DEBUG),y)
+DEBUGFS_OBJ = bcm43xx_debugfs.o
+CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
+else
+DEBUGFS_OBJ =
+CFLAGS += -O2
+endif
+
+CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
+ifneq ($(SOFTMAC_DIR),)
+CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
+endif
+
+ifneq ($(KERNELRELEASE),)
+# call from kernel build system
+
+obj-m := bcm43xx.o
+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
+		bcm43xx_radio.o bcm43xx_phy.o \
+		bcm43xx_power.o bcm43xx_wx.o \
+		bcm43xx_pio.o bcm43xx_ilt.o \
+		bcm43xx_leds.o
+
+else
+
+default: modules
+
+modules:
+	$(MAKE) -C $(KDIR) M=$(PWD) modules
+
+install: bcm43xx.ko
+	install -d $(MODPATH)
+	install -m 644 -c bcm43xx.ko $(MODPATH)
+	/sbin/depmod -a
+
+uninstall:
+	rm -rf $(MODPATH)
+	/sbin/depmod -a
+
+endif
+
+clean:
+	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
+		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
+		-print | xargs rm -Rf
+
+depend .depend dep:
+	$(CC) $(CFLAGS) -M *.c > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
+
+DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
+DISTDIR = $(RELEASE_NAME)
+
+release: clean
+	@rm -rf $(DISTDIR)
+	@mkdir $(DISTDIR)
+	@chmod 777 $(DISTDIR)
+	@for file in $(DISTFILES); do                   \
+                if test -d $$file; then                 \
+                        mkdir $(DISTDIR)/$$file;        \
+                else                                    \
+                        cp -p $$file $(DISTDIR)/$$file; \
+                fi;                                     \
+        done
+	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
+	@rm -rf $(DISTDIR)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
new file mode 100644
index 0000000..38e75ed
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -0,0 +1,938 @@
+#ifndef BCM43xx_H_
+#define BCM43xx_H_
+
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/interrupt.h>
+#include <linux/stringify.h>
+#include <linux/pci.h>
+#include <net/ieee80211.h>
+#include <net/ieee80211softmac.h>
+#include <asm/atomic.h>
+#include <asm/io.h>
+
+
+#include "bcm43xx_debugfs.h"
+#include "bcm43xx_leds.h"
+
+
+#define DRV_NAME			__stringify(KBUILD_MODNAME)
+#define DRV_VERSION			__stringify(BCM43xx_VERSION)
+#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
+#define PFX				DRV_NAME ": "
+
+#define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
+#define BCM43xx_IRQWAIT_MAX_RETRIES	50
+#define BCM43xx_TX_TIMEOUT		(10 * HZ)
[...14478 lines suppressed...]
+		mdelay(20);
+	}
+	spromctl &= ~0x10; /* SPROM WRITE enable. */
+	bcm43xx_pci_write_config32(bcm, BCM43xx_PCICFG_SPROMCTL, spromctl);
+	if (err) {
+		printk(KERN_ERR PFX "Could not access SPROM control register.\n");
+		goto out_unlock;
+	}
+	mdelay(500);
+	printk("100%% ]\n");
+	printk(KERN_INFO PFX "SPROM written.\n");
+	err = 0;
+out_unlock:
+	spin_unlock_irqrestore(&bcm->lock, flags);
+out_kfree:
+	kfree(sprom);
+out:
+	return err;
+}
+
+
+#ifdef WX
+# undef WX
+#endif
+#define WX(ioctl)  [(ioctl) - SIOCSIWCOMMIT]
+static const iw_handler bcm43xx_wx_handlers[] = {
+	/* Wireless Identification */
+	WX(SIOCGIWNAME)		= bcm43xx_wx_get_name,
+	/* Basic operations */
+	WX(SIOCSIWFREQ)		= bcm43xx_wx_set_channelfreq,
+	WX(SIOCGIWFREQ)		= bcm43xx_wx_get_channelfreq,
+	WX(SIOCSIWMODE)		= bcm43xx_wx_set_mode,
+	WX(SIOCGIWMODE)		= bcm43xx_wx_get_mode,
+	/* Informative stuff */
+	WX(SIOCGIWRANGE)	= bcm43xx_wx_get_rangeparams,
+	/* Access Point manipulation */
+	WX(SIOCSIWAP)           = ieee80211softmac_wx_set_wap,
+	WX(SIOCGIWAP)           = ieee80211softmac_wx_get_wap,
+	WX(SIOCSIWSCAN)		= ieee80211softmac_wx_trigger_scan,
+	WX(SIOCGIWSCAN)		= ieee80211softmac_wx_get_scan_results,
+	/* 802.11 specific support */
+	WX(SIOCSIWESSID)	= ieee80211softmac_wx_set_essid,
+	WX(SIOCGIWESSID)	= ieee80211softmac_wx_get_essid,
+	WX(SIOCSIWNICKN)	= bcm43xx_wx_set_nick,
+	WX(SIOCGIWNICKN)	= bcm43xx_wx_get_nick,
+	/* Other parameters */
+	WX(SIOCSIWRATE)		= ieee80211softmac_wx_set_rate,
+	WX(SIOCGIWRATE)		= ieee80211softmac_wx_get_rate,
+	WX(SIOCSIWRTS)		= bcm43xx_wx_set_rts,
+	WX(SIOCGIWRTS)		= bcm43xx_wx_get_rts,
+	WX(SIOCSIWFRAG)		= bcm43xx_wx_set_frag,
+	WX(SIOCGIWFRAG)		= bcm43xx_wx_get_frag,
+	WX(SIOCSIWTXPOW)	= bcm43xx_wx_set_xmitpower,
+	WX(SIOCGIWTXPOW)	= bcm43xx_wx_get_xmitpower,
+//TODO	WX(SIOCSIWRETRY)	= bcm43xx_wx_set_retry,
+//TODO	WX(SIOCGIWRETRY)	= bcm43xx_wx_get_retry,
+	/* Encoding */
+	WX(SIOCSIWENCODE)	= bcm43xx_wx_set_encoding,
+	WX(SIOCGIWENCODE)	= bcm43xx_wx_get_encoding,
+	WX(SIOCSIWENCODEEXT)	= bcm43xx_wx_set_encodingext,
+	WX(SIOCGIWENCODEEXT)	= bcm43xx_wx_get_encodingext,
+	/* Power saving */
+//TODO	WX(SIOCSIWPOWER)	= bcm43xx_wx_set_power,
+//TODO	WX(SIOCGIWPOWER)	= bcm43xx_wx_get_power,
+	WX(SIOCSIWGENIE)	= ieee80211softmac_wx_set_genie,
+	WX(SIOCGIWGENIE)	= ieee80211softmac_wx_get_genie,
+	WX(SIOCSIWAUTH)		= ieee80211_wx_set_auth,
+	WX(SIOCGIWAUTH)		= ieee80211_wx_get_auth,
+};
+#undef WX
+
+static const iw_handler bcm43xx_priv_wx_handlers[] = {
+	/* Set Interference Mitigation Mode. */
+	bcm43xx_wx_set_interfmode,
+	/* Get Interference Mitigation Mode. */
+	bcm43xx_wx_get_interfmode,
+	/* Enable/Disable Short Preamble mode. */
+	bcm43xx_wx_set_shortpreamble,
+	/* Get Short Preamble mode. */
+	bcm43xx_wx_get_shortpreamble,
+	/* Enable/Disable Software Encryption mode */
+	bcm43xx_wx_set_swencryption,
+	/* Get Software Encryption mode */
+	bcm43xx_wx_get_swencryption,
+	/* Write SRPROM data. */
+	bcm43xx_wx_sprom_write,
+	/* Read SPROM data. */
+	bcm43xx_wx_sprom_read,
+};
+
+#define PRIV_WX_SET_INTERFMODE		(SIOCIWFIRSTPRIV + 0)
+#define PRIV_WX_GET_INTERFMODE		(SIOCIWFIRSTPRIV + 1)
+#define PRIV_WX_SET_SHORTPREAMBLE	(SIOCIWFIRSTPRIV + 2)
+#define PRIV_WX_GET_SHORTPREAMBLE	(SIOCIWFIRSTPRIV + 3)
+#define PRIV_WX_SET_SWENCRYPTION	(SIOCIWFIRSTPRIV + 4)
+#define PRIV_WX_GET_SWENCRYPTION	(SIOCIWFIRSTPRIV + 5)
+#define PRIV_WX_SPROM_WRITE		(SIOCIWFIRSTPRIV + 6)
+#define PRIV_WX_SPROM_READ		(SIOCIWFIRSTPRIV + 7)
+
+#define PRIV_WX_DUMMY(ioctl)	\
+	{					\
+		.cmd		= (ioctl),	\
+		.name		= "__unused"	\
+	}
+
+static const struct iw_priv_args bcm43xx_priv_wx_args[] = {
+	{
+		.cmd		= PRIV_WX_SET_INTERFMODE,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_interfmode",
+	},
+	{
+		.cmd		= PRIV_WX_GET_INTERFMODE,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_interfmode",
+	},
+	{
+		.cmd		= PRIV_WX_SET_SHORTPREAMBLE,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_shortpreambl",
+	},
+	{
+		.cmd		= PRIV_WX_GET_SHORTPREAMBLE,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_shortpreambl",
+	},
+	{
+		.cmd		= PRIV_WX_SET_SWENCRYPTION,
+		.set_args	= IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+		.name		= "set_swencryption",
+	},
+	{
+		.cmd		= PRIV_WX_GET_SWENCRYPTION,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING,
+		.name		= "get_swencryption",
+	},
+	{
+		.cmd		= PRIV_WX_SPROM_WRITE,
+		.set_args	= IW_PRIV_TYPE_CHAR | SPROM_BUFFERSIZE,
+		.name		= "write_sprom",
+	},
+	{
+		.cmd		= PRIV_WX_SPROM_READ,
+		.get_args	= IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | SPROM_BUFFERSIZE,
+		.name		= "read_sprom",
+	},
+};
+
+const struct iw_handler_def bcm43xx_wx_handlers_def = {
+	.standard		= bcm43xx_wx_handlers,
+	.num_standard		= ARRAY_SIZE(bcm43xx_wx_handlers),
+	.num_private		= ARRAY_SIZE(bcm43xx_priv_wx_handlers),
+	.num_private_args	= ARRAY_SIZE(bcm43xx_priv_wx_args),
+	.private		= bcm43xx_priv_wx_handlers,
+	.private_args		= bcm43xx_priv_wx_args,
+};
+
+/* vim: set ts=8 sw=8 sts=8: */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.h b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
new file mode 100644
index 0000000..1f29ff3
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.h
@@ -0,0 +1,36 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
+                     Stefano Brivio <st3 at riseup.net>
+                     Michael Buesch <mbuesch at freenet.de>
+                     Danny van Dyk <kugelfang at gentoo.org>
+                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
+
+  Some parts of the code in this file are derived from the ipw2200
+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
+
+  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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef BCM43xx_WX_H_
+#define BCM43xx_WX_H_
+
+extern const struct iw_handler_def bcm43xx_wx_handlers_def;
+
+#endif /* BCM43xx_WX_H_ */

linux-2.6-cpufreq-git.patch:
 arch/i386/kernel/timers/timer_tsc.c |    5 +
 drivers/cpufreq/cpufreq.c           |  110 ++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 54 deletions(-)

--- NEW FILE linux-2.6-cpufreq-git.patch ---
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
index 7c86e3c..a7f5a2a 100644
--- a/arch/i386/kernel/timers/timer_tsc.c
+++ b/arch/i386/kernel/timers/timer_tsc.c
@@ -282,6 +282,10 @@ time_cpufreq_notifier(struct notifier_bl
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_seqlock_irq(&xtime_lock);
 	if (!ref_freq) {
+		if (!freq->old){
+			ref_freq = freq->new;
+			goto end;
+		}
 		ref_freq = freq->old;
 		loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy;
 #ifndef CONFIG_SMP
@@ -307,6 +311,7 @@ time_cpufreq_notifier(struct notifier_bl
 #endif
 	}
 
+end:
 	if (val != CPUFREQ_RESUMECHANGE)
 		write_sequnlock_irq(&xtime_lock);
 
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 7a51147..9582de1 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -35,8 +35,8 @@
  * level driver of CPUFreq support, and its spinlock. This lock
  * also protects the cpufreq_cpu_data array.
  */
-static struct cpufreq_driver   	*cpufreq_driver;
-static struct cpufreq_policy	*cpufreq_cpu_data[NR_CPUS];
+static struct cpufreq_driver *cpufreq_driver;
+static struct cpufreq_policy *cpufreq_cpu_data[NR_CPUS];
 static DEFINE_SPINLOCK(cpufreq_driver_lock);
 
 /* internal prototypes */
@@ -50,15 +50,15 @@ static void handle_update(void *data);
  * changes to devices when the CPU clock speed changes.
  * The mutex locks both lists.
  */
-static struct notifier_block    *cpufreq_policy_notifier_list;
-static struct notifier_block    *cpufreq_transition_notifier_list;
-static DECLARE_RWSEM		(cpufreq_notifier_rwsem);
+static struct notifier_block *cpufreq_policy_notifier_list;
+static struct notifier_block *cpufreq_transition_notifier_list;
+static DECLARE_RWSEM (cpufreq_notifier_rwsem);
 
 
 static LIST_HEAD(cpufreq_governor_list);
-static DEFINE_MUTEX		(cpufreq_governor_mutex);
+static DEFINE_MUTEX (cpufreq_governor_mutex);
 
-struct cpufreq_policy * cpufreq_cpu_get(unsigned int cpu)
+struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu)
 {
 	struct cpufreq_policy *data;
 	unsigned long flags;
@@ -85,20 +85,19 @@ struct cpufreq_policy * cpufreq_cpu_get(
 	if (!kobject_get(&data->kobj))
 		goto err_out_put_module;
 
-
 	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
-
 	return data;
 
- err_out_put_module:
+err_out_put_module:
 	module_put(cpufreq_driver->owner);
- err_out_unlock:
+err_out_unlock:
 	spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
- err_out:
+err_out:
 	return NULL;
 }
 EXPORT_SYMBOL_GPL(cpufreq_cpu_get);
 
+
 void cpufreq_cpu_put(struct cpufreq_policy *data)
 {
 	kobject_put(&data->kobj);
@@ -229,44 +228,53 @@ static inline void adjust_jiffies(unsign
 
 
 /**
- * cpufreq_notify_transition - call notifier chain and adjust_jiffies on frequency transition
+ * cpufreq_notify_transition - call notifier chain and adjust_jiffies
+ * on frequency transition.
  *
- * This function calls the transition notifiers and the "adjust_jiffies" function. It is called
- * twice on all CPU frequency changes that have external effects. 
+ * This function calls the transition notifiers and the "adjust_jiffies"
+ * function. It is called twice on all CPU frequency changes that have
+ * external effects. 
  */
 void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state)
 {
+	struct cpufreq_policy *policy;
+
 	BUG_ON(irqs_disabled());
 
 	freqs->flags = cpufreq_driver->flags;
-	dprintk("notification %u of frequency transition to %u kHz\n", state, freqs->new);
+	dprintk("notification %u of frequency transition to %u kHz\n",
+		state, freqs->new);
 
 	down_read(&cpufreq_notifier_rwsem);
+
+	policy = cpufreq_cpu_data[freqs->cpu];
 	switch (state) {
+
 	case CPUFREQ_PRECHANGE:
-		/* detect if the driver reported a value as "old frequency" which
-		 * is not equal to what the cpufreq core thinks is "old frequency".
+		/* detect if the driver reported a value as "old frequency" 
+		 * which is not equal to what the cpufreq core thinks is
+		 * "old frequency".
 		 */
 		if (!(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
-			if ((likely(cpufreq_cpu_data[freqs->cpu])) &&
-			    (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu)) &&
-			    (likely(cpufreq_cpu_data[freqs->cpu]->cur)) &&
-			    (unlikely(freqs->old != cpufreq_cpu_data[freqs->cpu]->cur)))
-			{
-				dprintk(KERN_WARNING "Warning: CPU frequency is %u, "
-				       "cpufreq assumed %u kHz.\n", freqs->old, cpufreq_cpu_data[freqs->cpu]->cur);
-				freqs->old = cpufreq_cpu_data[freqs->cpu]->cur;
+			if ((policy) && (policy->cpu == freqs->cpu) &&
+			    (policy->cur) && (policy->cur != freqs->old)) {
+				dprintk(KERN_WARNING "Warning: CPU frequency is"
+					" %u, cpufreq assumed %u kHz.\n",
+					freqs->old, policy->cur);
+				freqs->old = policy->cur;
 			}
 		}
-		notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_PRECHANGE, freqs);
+		notifier_call_chain(&cpufreq_transition_notifier_list,
+					CPUFREQ_PRECHANGE, freqs);
 		adjust_jiffies(CPUFREQ_PRECHANGE, freqs);
 		break;
+
 	case CPUFREQ_POSTCHANGE:
 		adjust_jiffies(CPUFREQ_POSTCHANGE, freqs);
-		notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_POSTCHANGE, freqs);
-		if ((likely(cpufreq_cpu_data[freqs->cpu])) && 
-		    (likely(cpufreq_cpu_data[freqs->cpu]->cpu == freqs->cpu)))
-			cpufreq_cpu_data[freqs->cpu]->cur = freqs->new;
+		notifier_call_chain(&cpufreq_transition_notifier_list,
+					CPUFREQ_POSTCHANGE, freqs);
+		if (likely(policy) && likely(policy->cpu == freqs->cpu))
+			policy->cur = freqs->new;
 		break;
 	}
 	up_read(&cpufreq_notifier_rwsem);
@@ -308,7 +316,7 @@ static int cpufreq_parse_governor (char 
 				return 0;
 			}
 		}
-	out:
+out:
 		mutex_unlock(&cpufreq_governor_mutex);
 	}
 	return -EINVAL;
@@ -415,7 +423,6 @@ static ssize_t store_scaling_governor (s
 		return -EINVAL;
 
 	ret = cpufreq_set_policy(&new_policy);
-
 	return ret ? ret : count;
 }
 
@@ -446,7 +453,7 @@ static ssize_t show_scaling_available_go
 			goto out;
 		i += scnprintf(&buf[i], CPUFREQ_NAME_LEN, "%s ", t->name);
 	}
- out:
+out:
 	i += sprintf(&buf[i], "\n");
 	return i;
 }
@@ -789,7 +796,6 @@ static int cpufreq_remove_dev (struct sy
 	kfree(data);
 
 	cpufreq_debug_enable_ratelimit();
-
 	return 0;
 }
 
@@ -870,8 +876,7 @@ unsigned int cpufreq_get(unsigned int cp
 
 	ret = cpufreq_driver->get(cpu);
 
-	if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) 
-	{
+	if (ret && policy->cur && !(cpufreq_driver->flags & CPUFREQ_CONST_LOOPS)) {
 		/* verify no discrepancy between actual and saved value exists */
 		if (unlikely(ret != policy->cur)) {
 			cpufreq_out_of_sync(cpu, policy->cur, ret);
@@ -881,7 +886,7 @@ unsigned int cpufreq_get(unsigned int cp
 
 	mutex_unlock(&policy->lock);
 
- out:
+out:
 	cpufreq_cpu_put(policy);
 
 	return (ret);
@@ -962,7 +967,7 @@ static int cpufreq_suspend(struct sys_de
 		cpu_policy->cur = cur_freq;
 	}
 
- out:
+out:
 	cpufreq_cpu_put(cpu_policy);
 	return 0;
 }
@@ -1169,7 +1174,6 @@ int cpufreq_driver_target(struct cpufreq
 	mutex_unlock(&policy->lock);
 
 	cpufreq_cpu_put(policy);
-
 	return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_driver_target);
@@ -1208,7 +1212,6 @@ int cpufreq_governor(unsigned int cpu, u
 	mutex_unlock(&policy->lock);
 
 	cpufreq_cpu_put(policy);
-
 	return ret;
 }
 EXPORT_SYMBOL_GPL(cpufreq_governor);
@@ -1232,7 +1235,6 @@ int cpufreq_register_governor(struct cpu
 	list_add(&governor->governor_list, &cpufreq_governor_list);
 
  	mutex_unlock(&cpufreq_governor_mutex);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(cpufreq_register_governor);
@@ -1277,7 +1279,6 @@ int cpufreq_get_policy(struct cpufreq_po
 	mutex_unlock(&cpu_policy->lock);
 
 	cpufreq_cpu_put(cpu_policy);
-
 	return 0;
 }
 EXPORT_SYMBOL(cpufreq_get_policy);
@@ -1291,9 +1292,7 @@ static int __cpufreq_set_policy(struct c
 	dprintk("setting new policy for CPU %u: %u - %u kHz\n", policy->cpu,
 		policy->min, policy->max);
 
-	memcpy(&policy->cpuinfo, 
-	       &data->cpuinfo, 
-	       sizeof(struct cpufreq_cpuinfo));
+	memcpy(&policy->cpuinfo, &data->cpuinfo, sizeof(struct cpufreq_cpuinfo));
 
 	/* verify the cpu speed can be set within this limit */
 	ret = cpufreq_driver->verify(policy);
@@ -1324,8 +1323,8 @@ static int __cpufreq_set_policy(struct c
 
 	up_read(&cpufreq_notifier_rwsem);
 
-	data->min    = policy->min;
-	data->max    = policy->max;
+	data->min = policy->min;
+	data->max = policy->max;
 
 	dprintk("new min and max freqs are %u - %u kHz\n", data->min, data->max);
 
@@ -1362,7 +1361,7 @@ static int __cpufreq_set_policy(struct c
 		__cpufreq_governor(data, CPUFREQ_GOV_LIMITS);
 	}
 
- error_out:
+error_out:
 	cpufreq_debug_enable_ratelimit();
 	return ret;
 }
@@ -1421,9 +1420,7 @@ int cpufreq_update_policy(unsigned int c
 	mutex_lock(&data->lock);
 
 	dprintk("updating policy for CPU %u\n", cpu);
-	memcpy(&policy, 
-	       data,
-	       sizeof(struct cpufreq_policy));
+	memcpy(&policy, data, sizeof(struct cpufreq_policy));
 	policy.min = data->user_policy.min;
 	policy.max = data->user_policy.max;
 	policy.policy = data->user_policy.policy;
@@ -1433,8 +1430,13 @@ int cpufreq_update_policy(unsigned int c
 	  -> ask driver for current freq and notify governors about a change */
 	if (cpufreq_driver->get) {
 		policy.cur = cpufreq_driver->get(cpu);
-		if (data->cur != policy.cur)
-			cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+		if (!data->cur) {
+			dprintk("Driver did not initialize current freq");
+			data->cur = policy.cur;
+		} else {
+			if (data->cur != policy.cur)
+				cpufreq_out_of_sync(cpu, data->cur, policy.cur);
+		}
 	}
 
 	ret = __cpufreq_set_policy(data, &policy);

linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-debug-boot-delay.patch ---

This one delays each printk() during boot by a variable time
(from kernel command line), while system_state == SYSTEM_BOOTING.
Caveat:  it's not terribly SMP safe or SMP nice.
Any ideas for improvements (esp. in the SMP area) are appreciated.

---

From: Randy Dunlap <rdunlap at xenotime.net>

Optionally add a boot delay after each kernel printk() call,
crudely measured in milliseconds, with a maximum delay of
10 seconds per printk.

Enable CONFIG_BOOT_DELAY=y and then add (e.g.):
"lpj=loops_per_jiffy boot_delay=100"
to the kernel command line.

Signed-off-by: Randy Dunlap <rdunlap at xenotime.net>
---

 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

--- linux-2615-work.orig/init/main.c
+++ linux-2615-work/init/main.c
@@ -557,6 +557,31 @@ static int __init initcall_debug_setup(c
 }
 __setup("initcall_debug", initcall_debug_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+unsigned int boot_delay = 0; /* msecs delay after each printk during bootup */
+extern long preset_lpj;
+unsigned long long printk_delay_msec = 0; /* per msec, based on boot_delay */
+
+static int __init boot_delay_setup(char *str)
+{
+	unsigned long lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */
+	unsigned long long loops_per_msec = lpj / 1000 * CONFIG_HZ;
+
+	get_option(&str, &boot_delay);
+	if (boot_delay > 10 * 1000)
+		boot_delay = 0;
+
+	printk_delay_msec = loops_per_msec;
+	printk("boot_delay: %u, preset_lpj: %ld, lpj: %lu, CONFIG_HZ: %d, printk_delay_msec: %llu\n",
+		boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
+
+	return 1;
+}
+__setup("boot_delay=", boot_delay_setup);
+
+#endif
+
 struct task_struct *child_reaper = &init_task;
 
 extern initcall_t __initcall_start[], __initcall_end[];
--- linux-2615-work.orig/init/calibrate.c
+++ linux-2615-work/init/calibrate.c
@@ -10,7 +10,7 @@
 
 #include <asm/timex.h>
 
-static unsigned long preset_lpj;
+unsigned long preset_lpj;
 static int __init lpj_setup(char *str)
 {
 	preset_lpj = simple_strtoul(str,NULL,0);
--- linux-2615-work.orig/kernel/printk.c
+++ linux-2615-work/kernel/printk.c
@@ -23,6 +23,7 @@
 #include <linux/smp_lock.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>			/* For in_interrupt() */
 #include <linux/config.h>
@@ -201,6 +202,33 @@ out:
 
 __setup("log_buf_len=", log_buf_len_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+extern unsigned int boot_delay; /* msecs to delay after each printk during bootup */
+extern long preset_lpj;
+extern unsigned long long printk_delay_msec;
+
+static void boot_delay_msec(int millisecs)
+{
+	unsigned long long k = printk_delay_msec * millisecs;
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(millisecs);
+	while (k) {
+		k--;
+		rep_nop();
+		/*
+		 * use (volatile) jiffies to prevent
+		 * compiler reduction; loop termination via jiffies
+		 * is secondary and may or may not happen.
+		 */
+		if (time_after(jiffies, timeout))
+			break;
+	}
+}
+
+#endif
+
 /*
  * Commands to do_syslog:
  *
@@ -520,6 +548,11 @@ asmlinkage int printk(const char *fmt, .
 	r = vprintk(fmt, args);
 	va_end(args);
 
+#ifdef CONFIG_BOOT_DELAY
+	if (boot_delay && system_state == SYSTEM_BOOTING)
+		boot_delay_msec(boot_delay);
+#endif
+
 	return r;
 }
 
--- linux-2615-work.orig/lib/Kconfig.debug
+++ linux-2615-work/lib/Kconfig.debug
@@ -186,6 +186,24 @@ config FRAME_POINTER
 	  some architectures or if you use external debuggers.
 	  If you don't debug the kernel, you can say N.
 
+config BOOT_DELAY
+	bool "Delay each boot message by N milliseconds"
+	depends on DEBUG_KERNEL
+	help
+	  This build option allows you to read kernel boot messages
+	  by inserting a short delay after each one.  The delay is
+	  specified in milliseconds on the kernel command line,
+	  using "boot_delay=N".
+
+	  It is likely that you would also need to use "lpj=M" to preset
+	  the "loops per jiffie" value.
+	  See a previous boot log for the "lpj" value to use for your
+	  system, and then set "lpj=M" before setting "boot_delay=N".
+	  NOTE:  Using this option may adversely affect SMP systems.
+	  I.e., processors other than the first one may not boot up.
+	  BOOT_DELAY also may cause DETECT_SOFTLOCKUP to detect
+	  what it believes to be lockup conditions.
+
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL


linux-2.6-debug-periodic-slab-check.patch:
 slab.c |  134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 131 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-debug-periodic-slab-check.patch ---

 mm/slab.c |  134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 131 insertions(+), 3 deletions(-)

Index: 2.6-git/mm/slab.c
===================================================================
--- 2.6-git.orig/mm/slab.c
+++ 2.6-git/mm/slab.c
@@ -202,7 +202,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)
 
 /* Max number of objs-per-slab for caches which use off-slab slabs.
@@ -430,6 +430,11 @@ struct kmem_cache {
 	 */
 	int obj_offset;
 	int obj_size;
+
+	/*
+	 * Time for next cache verification.
+	 */
+	unsigned long next_verify;
 #endif
 };
 
@@ -445,6 +450,7 @@ struct kmem_cache {
  */
 #define REAPTIMEOUT_CPUC	(2*HZ)
 #define REAPTIMEOUT_LIST3	(4*HZ)
+#define REDZONETIMEOUT		(300*HZ)
 
 #if STATS
 #define	STATS_INC_ACTIVE(x)	((x)->num_active++)
@@ -1923,6 +1929,11 @@ kmem_cache_create (const char *name, siz
 		cachep->limit = BOOT_CPUCACHE_ENTRIES;
 	}
 
+#if DEBUG
+	cachep->next_verify = jiffies + REDZONETIMEOUT +
+		((unsigned long)cachep/L1_CACHE_BYTES)%REDZONETIMEOUT;
+#endif
+
 	/* cache setup completed, link it into the list */
 	list_add(&cachep->next, &cache_chain);
 	unlock_cpu_hotplug();
@@ -2251,7 +2262,7 @@ static void *slab_get_obj(struct kmem_ca
 	slabp->inuse++;
 	next = slab_bufctl(slabp)[slabp->free];
 #if DEBUG
-	slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE;
+	slab_bufctl(slabp)[slabp->free] = BUFCTL_ALLOC;
 	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();
@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca
 	return err;
 }
 
+#if DEBUG
+
+static void verify_slab_redzone(struct kmem_cache *cache, struct slab *slab)
+{
+	int i;
+
+	if (!(cache->flags & SLAB_RED_ZONE))
+		return;
+
+#ifdef CONFIG_DEBUG_PAGEALLOC
+	/* Page alloc debugging on for this cache. Mapping & Unmapping happens
+	 * without any locking, thus parallel checks are impossible.
+	 */
+	if ((cache->buffer_size % PAGE_SIZE) == 0 && OFF_SLAB(cache))
+		return;
+#endif
+
+	for (i = 0; i < cache->num; i++) {
+		unsigned long red1, red2;
+		void *obj = slab->s_mem + cache->buffer_size * i;
+
+		red1 = *dbg_redzone1(cache, obj);
+		red2 = *dbg_redzone2(cache, obj);
+
+		/* Simplest case: redzones marked as inactive.  */
+		if (red1 == RED_INACTIVE && red2 == RED_INACTIVE)
+			continue;
+
+		/*
+		 * Tricky case: if the bufctl value is BUFCTL_ALLOC, then
+		 * the object is either allocated or somewhere in a cpu
+		 * cache. The cpu caches are lockless and there might be
+		 * a concurrent alloc/free call, thus we must accept random
+		 * combinations of RED_ACTIVE and _INACTIVE
+		 */
+		if (slab_bufctl(slab)[i] == BUFCTL_ALLOC &&
+				(red1 == RED_INACTIVE || red1 == RED_ACTIVE) &&
+				(red2 == RED_INACTIVE || red2 == RED_ACTIVE))
+			continue;
+
+		printk(KERN_ERR "slab %s: redzone mismatch in slab %p,"
+		       " obj %p, bufctl 0x%lx\n", cache->name, slab, obj,
+		       slab_bufctl(slab)[i]);
+
+		print_objinfo(cache, obj, 2);
+	}
+}
+
+static void print_invalid_slab(const char *list_name, struct kmem_cache *cache,
+			       struct slab *slab)
+{
+	printk(KERN_ERR "slab %s: invalid slab found in %s list at %p (%d/%d).\n",
+	       cache->name, list_name, slab, slab->inuse, cache->num);
+}
+
+static void verify_nodelists(struct kmem_cache *cache,
+			     struct kmem_list3 *lists)
+{
+	struct list_head *q;
+	struct slab *slab;
+
+	list_for_each(q, &lists->slabs_full) {
+		slab = list_entry(q, struct slab, list);
+
+		if (slab->inuse != cache->num)
+			print_invalid_slab("full", cache, slab);
+
+		check_slabp(cache, slab);
+		verify_slab_redzone(cache, slab);
+	}
+	list_for_each(q, &lists->slabs_partial) {
+		slab = list_entry(q, struct slab, list);
+
+		if (slab->inuse == cache->num || slab->inuse == 0)
+			print_invalid_slab("partial", cache, slab);
+
+		check_slabp(cache, slab);
+		verify_slab_redzone(cache, slab);
+	}
+	list_for_each(q, &lists->slabs_free) {
+		slab = list_entry(q, struct slab, list);
+
+		if (slab->inuse != 0)
+			print_invalid_slab("free", cache, slab);
+
+		check_slabp(cache, slab);
+		verify_slab_redzone(cache, slab);
+	}
+}
+
+/*
+ * Perform a self test on all slabs from a cache
+ */
+static void verify_cache(struct kmem_cache *cache)
+{
+	int node;
+
+	check_spinlock_acquired(cache);
+
+	for_each_online_node(node) {
+		struct kmem_list3 *lists = cache->nodelists[node];
+
+		if (!lists)
+			continue;
+		verify_nodelists(cache, lists);
+	}
+}
+
+#endif
+
 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());
 
+#if DEBUG
+		if (time_before(searchp->next_verify, jiffies)) {
+			searchp->next_verify = jiffies + REDZONETIMEOUT;
+			verify_cache(searchp);
+		}
+#endif
+
 		if (time_after(l3->next_reap, jiffies))
 			goto next_unlock;
 


linux-2.6-fs-namei-deadlock.patch:
 namei.c-new |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-fs-namei-deadlock.patch ---

This patch is needed to in addition to the other unlocking fix which is
already applied.  It should be obvious that the system will deadlock in
case this isn't done.

(Andrew, I once again used a goto in the third error case because the
common code is again larger.)

Signed-Off-By: Ulrich Drepper <drepper at redhat.com>

--- 1/fs/namei.c	2006-02-01 09:29:49.000000000 -0800
+++ 2/fs/namei.c-new	2006-02-04 09:18:02.000000000 -0800
@@ -1096,6 +1096,7 @@

 		file = fget_light(dfd, &fput_needed);
 		if (!file) {
+			read_unlock(&current->fs->lock);
 			retval = -EBADF;
 			goto out_fail;
 		}
@@ -1104,15 +1105,15 @@

 		if (!S_ISDIR(dentry->d_inode->i_mode)) {
 			retval = -ENOTDIR;
+		unlock_fail:
 			fput_light(file, fput_needed);
+			read_unlock(&current->fs->lock);
 			goto out_fail;
 		}

 		retval = file_permission(file, MAY_EXEC);
-		if (retval) {
-			fput_light(file, fput_needed);
-			goto out_fail;
-		}
+		if (retval)
+			goto unlock_fail;

 		nd->mnt = mntget(file->f_vfsmnt);
 		nd->dentry = dget(dentry);



linux-2.6-net-suppress-msgs.patch:
 include/net/sock.h |    8 ++++----
 net/Kconfig        |    7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-suppress-msgs.patch ---

If you are on a hostile network, or are running protocol tests, you can
easily get the logged swamped by messages about bad UDP and ICMP packets.
This turns those messages off unless a config option is enabled.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>

--- br-2.6.orig/include/net/sock.h
+++ br-2.6/include/net/sock.h
@@ -1354,12 +1354,12 @@ extern int sock_get_timestamp(struct soc
  *	Enable debug/info messages 
  */
 
-#if 0
-#define NETDEBUG(fmt, args...)	do { } while (0)
-#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
-#else
+#ifdef CONFIG_NETDEBUG
 #define NETDEBUG(fmt, args...)	printk(fmt,##args)
 #define LIMIT_NETDEBUG(fmt, args...) do { if (net_ratelimit()) printk(fmt,##args); } while(0)
+#else
+#define NETDEBUG(fmt, args...)	do { } while (0)
+#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
 #endif
 
 /*
--- br-2.6.orig/net/Kconfig
+++ br-2.6/net/Kconfig
@@ -27,6 +27,13 @@ if NET
 
 menu "Networking options"
 
+config NETDEBUG
+	bool "Network packet debugging"
+	help
+	  You can say Y here if you want to get additional messages useful in
+	  debugging bad packets, but can overwhelm logs under denial of service
+	  attacks.
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"


linux-2.6-percpu-NR_CPUS.patch:
 25-akpm/arch/i386/kernel/nmi.c |    2 +-
 25-akpm/block/ll_rw_blk.c      |    2 +-
 25-akpm/drivers/scsi/scsi.c    |    2 +-
 25-akpm/fs/file.c              |    3 +--
 25-akpm/kernel/sched.c         |    2 +-
 25-akpm/mm/page_alloc.c        |   10 ++++++----
 25-akpm/net/core/dev.c         |    2 +-
 25-akpm/net/core/utils.c       |    4 ++--
 25-akpm/net/ipv4/proc.c        |    2 +-
 25-akpm/net/ipv6/proc.c        |    2 +-
 25-akpm/net/socket.c           |    2 +-
 init/main.c                    |    0 
 12 files changed, 17 insertions(+), 16 deletions(-)

--- NEW FILE linux-2.6-percpu-NR_CPUS.patch ---

From: Eric Dumazet <dada1 at cosmosbay.com>

percpu_data blindly allocates bootmem memory to store NR_CPUS instances of
cpudata, instead of allocating memory only for possible cpus.

As a preparation for changing that, we need to convert various 0 -> NR_CPUS
loops to use for_each_cpu().

(The above only applies to users of asm-generic/percpu.h.  powerpc has gone it
alone and is presently only allocating memory for present CPUs, so it's
currently corrupting memory).

Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: James Bottomley <James.Bottomley at steeleye.com>
Cc: Jens Axboe <axboe at suse.de>
Acked-by: Ingo Molnar <mingo at elte.hu>
Cc: Jens Axboe <axboe at suse.de>
Cc: Anton Blanchard <anton at samba.org>
Acked-by: William Irwin <wli at holomorphy.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 arch/i386/kernel/nmi.c |    2 +-
 block/ll_rw_blk.c      |    2 +-
 drivers/scsi/scsi.c    |    2 +-
 fs/file.c              |    3 +--
 kernel/sched.c         |    2 +-
 mm/page_alloc.c        |   10 ++++++----
 net/core/dev.c         |    2 +-
 net/core/utils.c       |    4 ++--
 net/ipv4/proc.c        |    2 +-
 net/ipv6/proc.c        |    2 +-
 net/socket.c           |    2 +-
 main.c                 |    0 
 12 files changed, 17 insertions(+), 16 deletions(-)

diff -puN arch/i386/kernel/nmi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject arch/i386/kernel/nmi.c
--- 25/arch/i386/kernel/nmi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/arch/i386/kernel/nmi.c	Fri Feb  3 13:17:06 2006
@@ -138,7 +138,7 @@ static int __init check_nmi_watchdog(voi
 	if (nmi_watchdog == NMI_LOCAL_APIC)
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		prev_nmi_count[cpu] = per_cpu(irq_stat, cpu).__nmi_count;
 	local_irq_enable();
 	mdelay((10*1000)/nmi_hz); // wait 10 ticks
diff -puN block/ll_rw_blk.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject block/ll_rw_blk.c
--- 25/block/ll_rw_blk.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/block/ll_rw_blk.c	Fri Feb  3 13:17:06 2006
@@ -3453,7 +3453,7 @@ int __init blk_dev_init(void)
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
 
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
 
 	open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
diff -puN drivers/scsi/scsi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject drivers/scsi/scsi.c
--- 25/drivers/scsi/scsi.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/drivers/scsi/scsi.c	Fri Feb  3 13:17:06 2006
@@ -1245,7 +1245,7 @@ static int __init init_scsi(void)
 	if (error)
 		goto cleanup_sysctl;
 
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
 	devfs_mk_dir("scsi");
diff -puN fs/file.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject fs/file.c
--- 25/fs/file.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/fs/file.c	Fri Feb  3 13:17:06 2006
@@ -379,7 +379,6 @@ static void __devinit fdtable_defer_list
 void __init files_defer_init(void)
 {
 	int i;
-	/* Really early - can't use for_each_cpu */
-	for (i = 0; i < NR_CPUS; i++)
+	for_each_cpu(i)
 		fdtable_defer_list_init(i);
 }
diff -puN init/main.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject init/main.c
diff -puN kernel/sched.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject kernel/sched.c
--- 25/kernel/sched.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/kernel/sched.c	Fri Feb  3 13:17:06 2006
@@ -6109,7 +6109,7 @@ void __init sched_init(void)
 	runqueue_t *rq;
 	int i, j, k;
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		prio_array_t *array;
 
 		rq = cpu_rq(i);
diff -puN net/core/utils.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/core/utils.c
--- 25/net/core/utils.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/core/utils.c	Fri Feb  3 13:17:13 2006
@@ -121,7 +121,7 @@ void __init net_random_init(void)
 {
 	int i;
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct nrnd_state *state = &per_cpu(net_rand_state,i);
 		__net_srandom(state, i+jiffies);
 	}
@@ -133,7 +133,7 @@ static int net_random_reseed(void)
 	unsigned long seed[NR_CPUS];
 
 	get_random_bytes(seed, sizeof(seed));
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct nrnd_state *state = &per_cpu(net_rand_state,i);
 		__net_srandom(state, seed[i]);
 	}
diff -puN net/ipv4/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/ipv4/proc.c
--- 25/net/ipv4/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/ipv4/proc.c	Fri Feb  3 13:17:06 2006
@@ -49,7 +49,7 @@ static int fold_prot_inuse(struct proto 
 	int res = 0;
 	int cpu;
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		res += proto->stats[cpu].inuse;
 
 	return res;
diff -puN net/ipv6/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/ipv6/proc.c
--- 25/net/ipv6/proc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/ipv6/proc.c	Fri Feb  3 13:17:06 2006
@@ -38,7 +38,7 @@ static int fold_prot_inuse(struct proto 
 	int res = 0;
 	int cpu;
 
-	for (cpu=0; cpu<NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		res += proto->stats[cpu].inuse;
 
 	return res;
diff -puN net/socket.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/socket.c
--- 25/net/socket.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:06 2006
+++ 25-akpm/net/socket.c	Fri Feb  3 13:17:06 2006
@@ -2078,7 +2078,7 @@ void socket_seq_show(struct seq_file *se
 	int cpu;
 	int counter = 0;
 
-	for (cpu = 0; cpu < NR_CPUS; cpu++)
+	for_each_cpu(cpu)
 		counter += per_cpu(sockets_in_use, cpu);
 
 	/* It can be negative, by the way. 8) */
diff -puN net/core/dev.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject net/core/dev.c
--- 25/net/core/dev.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:13 2006
+++ 25-akpm/net/core/dev.c	Fri Feb  3 13:17:13 2006
@@ -3237,7 +3237,7 @@ static int __init net_dev_init(void)
 	 *	Initialise the packet receive queues.
 	 */
 
-	for (i = 0; i < NR_CPUS; i++) {
+	for_each_cpu(i) {
 		struct softnet_data *queue;
 
 		queue = &per_cpu(softnet_data, i);
diff -puN mm/page_alloc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject mm/page_alloc.c
--- 25/mm/page_alloc.c~reduce-size-of-percpudata-and-make-sure-per_cpuobject	Fri Feb  3 13:17:17 2006
+++ 25-akpm/mm/page_alloc.c	Fri Feb  3 13:17:17 2006
@@ -1213,18 +1213,21 @@ static void __get_page_state(struct page
 {
 	int cpu = 0;
 
-	memset(ret, 0, sizeof(*ret));
+	memset(ret, 0, nr * sizeof(unsigned long));
 	cpus_and(*cpumask, *cpumask, cpu_online_map);
 
 	cpu = first_cpu(*cpumask);
 	while (cpu < NR_CPUS) {
 		unsigned long *in, *out, off;
 
+		if (!cpu_isset(cpu, *cpumask))
+			continue;
+
 		in = (unsigned long *)&per_cpu(page_states, cpu);
 
 		cpu = next_cpu(cpu, *cpumask);
 
-		if (cpu < NR_CPUS)
+		if (likely(cpu < NR_CPUS))
 			prefetch(&per_cpu(page_states, cpu));
 
 		out = (unsigned long *)ret;
@@ -1886,8 +1889,7 @@ static void setup_pagelist_highmark(stru
  * not check if the processor is online before following the pageset pointer.
  * Other parts of the kernel may not check if the zone is available.
  */
-static struct per_cpu_pageset
-	boot_pageset[NR_CPUS];
+static struct per_cpu_pageset boot_pageset[NR_CPUS];
 
 /*
  * Dynamically allocate memory for the
_



--- NEW FILE patch-2.6.16-rc2-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD5pH8yGugalF9Dw4RAuBzAJkBFHUde3rSugrOqOAUVm4GkVmPbQCeJJ3L
zv5Qy+Nps841iisXDTe12Jw=
=Ozbg
-----END PGP SIGNATURE-----


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

iD8DBQBD4vu4yGugalF9Dw4RAj/kAJ97++ivhc2RkFmeAvATGmP1vDApYwCaAumq
CYzywIPTcbHSKwTCXrxekX0=
=ppHJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Feb 2006 19:26:03 -0000	1.13
+++ .cvsignore	7 Feb 2006 00:45:15 -0000	1.14
@@ -2,8 +2,6 @@
 temp-*
 kernel-xen-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
-bcm43xx-20060114.tar.bz2
-acpi-release-20060113-2.6.16-rc1.diff.bz2
-patch-2.6.16-rc1-git5.bz2
 xen-20060202.tar.bz2
+patch-2.6.16-rc2.bz2
+patch-2.6.16-rc2-git2.bz2

drm.patch:
 b/drivers/char/drm/Makefile           |    4 
 b/drivers/char/drm/ati_pcigart.c      |   40 -
 b/drivers/char/drm/drm.h              |    4 
 b/drivers/char/drm/drmP.h             |  127 +++--
 b/drivers/char/drm/drm_agpsupport.c   |  133 +++--
 b/drivers/char/drm/drm_auth.c         |   20 
 b/drivers/char/drm/drm_bufs.c         |  129 +++--
 b/drivers/char/drm/drm_context.c      |   54 +-
 b/drivers/char/drm/drm_core.h         |    4 
 b/drivers/char/drm/drm_drv.c          |  156 +++---
 b/drivers/char/drm/drm_fops.c         |  325 +++++++------
 b/drivers/char/drm/drm_ioc32.c        |    1 
 b/drivers/char/drm/drm_ioctl.c        |   45 -
 b/drivers/char/drm/drm_irq.c          |   16 
 b/drivers/char/drm/drm_lock.c         |    1 
 b/drivers/char/drm/drm_memory.c       |    8 
 b/drivers/char/drm/drm_memory_debug.h |  269 +++++------
 b/drivers/char/drm/drm_os_linux.h     |    1 
 b/drivers/char/drm/drm_pciids.h       |   14 
 b/drivers/char/drm/drm_proc.c         |   44 -
 b/drivers/char/drm/drm_stub.c         |   67 --
 b/drivers/char/drm/drm_sysfs.c        |   66 +-
 b/drivers/char/drm/drm_vm.c           |   12 
 b/drivers/char/drm/i810_dma.c         |   51 +-
 b/drivers/char/drm/i810_drv.c         |   60 --
 b/drivers/char/drm/i810_drv.h         |   12 
 b/drivers/char/drm/i830_dma.c         |   49 +-
 b/drivers/char/drm/i830_drv.c         |   59 --
 b/drivers/char/drm/i830_drv.h         |   11 
 b/drivers/char/drm/i915_dma.c         |   92 ++-
 b/drivers/char/drm/i915_drm.h         |   39 +
 b/drivers/char/drm/i915_drv.c         |   66 --
 b/drivers/char/drm/i915_drv.h         |   46 +
 b/drivers/char/drm/i915_ioc32.c       |    1 
 b/drivers/char/drm/i915_irq.c         |   48 +-
 b/drivers/char/drm/i915_mem.c         |   36 +
 b/drivers/char/drm/mga_dma.c          |  160 ++++--
 b/drivers/char/drm/mga_drv.c          |   58 --
 b/drivers/char/drm/mga_drv.h          |   14 
 b/drivers/char/drm/mga_ioc32.c        |    1 
 b/drivers/char/drm/mga_state.c        |   26 -
 b/drivers/char/drm/r128_cce.c         |   15 
 b/drivers/char/drm/r128_drm.h         |    4 
 b/drivers/char/drm/r128_drv.c         |   48 --
 b/drivers/char/drm/r128_drv.h         |    8 
 b/drivers/char/drm/r128_ioc32.c       |    1 
 b/drivers/char/drm/r128_irq.c         |    4 
 b/drivers/char/drm/r128_state.c       |   44 -
 b/drivers/char/drm/r300_cmdbuf.c      |   38 -
 b/drivers/char/drm/r300_reg.h         |    1 
 b/drivers/char/drm/radeon_cp.c        |  108 ++--
 b/drivers/char/drm/radeon_drm.h       |    6 
 b/drivers/char/drm/radeon_drv.c       |   62 +-
 b/drivers/char/drm/radeon_drv.h       |   41 -
 b/drivers/char/drm/radeon_ioc32.c     |    1 
 b/drivers/char/drm/radeon_state.c     |  246 ++++------
 b/drivers/char/drm/savage_bci.c       |   85 ++-
 b/drivers/char/drm/savage_drv.c       |   50 --
 b/drivers/char/drm/savage_drv.h       |   30 -
 b/drivers/char/drm/savage_state.c     |  324 ++++++-------
 b/drivers/char/drm/sis_drm.h          |   25 +
 b/drivers/char/drm/sis_drv.c          |   42 -
 b/drivers/char/drm/sis_drv.h          |    4 
 b/drivers/char/drm/sis_ds.h           |    7 
 b/drivers/char/drm/sis_mm.c           |   30 -
 b/drivers/char/drm/tdfx_drv.c         |   42 -
 b/drivers/char/drm/tdfx_drv.h         |    7 
 b/drivers/char/drm/via_dma.c          |   48 +-
 b/drivers/char/drm/via_dmablit.c      |  805 ++++++++++++++++++++++++++++++++++
 b/drivers/char/drm/via_dmablit.h      |  140 +++++
 b/drivers/char/drm/via_drm.h          |   58 +-
 b/drivers/char/drm/via_drv.c          |   63 --
 b/drivers/char/drm/via_drv.h          |   49 +-
 b/drivers/char/drm/via_ds.c           |    9 
 b/drivers/char/drm/via_irq.c          |   51 +-
 b/drivers/char/drm/via_map.c          |   47 +
 b/drivers/char/drm/via_mm.c           |   20 
 b/drivers/char/drm/via_verifier.c     |    6 
 b/drivers/char/drm/via_verifier.h     |    4 
 b/drivers/char/drm/via_video.c        |    7 
 drivers/char/drm/drm_init.c           |   53 --
 81 files changed, 3026 insertions(+), 1976 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 drm.patch
Index: drm.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/drm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm.patch	26 Jan 2006 22:14:33 -0000	1.1
+++ drm.patch	7 Feb 2006 00:45:15 -0000	1.2
@@ -21,10 +21,10 @@
  ifeq ($(CONFIG_COMPAT),y)
  drm-objs    += drm_ioc32.o
 diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
-index efff0ee..5485382 100644
+index efff0ee..bd7be09 100644
 --- a/drivers/char/drm/ati_pcigart.c
 +++ b/drivers/char/drm/ati_pcigart.c
-@@ -52,7 +52,7 @@
+@@ -52,47 +52,43 @@
  # define ATI_MAX_PCIGART_PAGES		8192	/**< 32 MB aperture, 4K pages */
  # define ATI_PCIGART_PAGE_SIZE		4096	/**< PCI GART page size */
  
@@ -33,9 +33,25 @@
  {
  	unsigned long address;
  	struct page *page;
-@@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pciga
+ 	int i;
+ 	DRM_DEBUG("%s\n", __FUNCTION__);
+ 
+-	address = __get_free_pages(GFP_KERNEL, ATI_PCIGART_TABLE_ORDER);
++	address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
++				   ATI_PCIGART_TABLE_ORDER);
+ 	if (address == 0UL) {
+-		return 0;
++		return NULL;
  	}
  
+ 	page = virt_to_page(address);
+ 
+-	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+-		get_page(page);
++	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
+ 		SetPageReserved(page);
+-	}
+ 
  	DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address);
 -	return address;
 +	return (void *)address;
@@ -51,10 +67,11 @@
 -	page = virt_to_page(address);
 +	page = virt_to_page((unsigned long)address);
  
- 	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
- 		__put_page(page);
+-	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) {
+-		__put_page(page);
++	for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++)
  		ClearPageReserved(page);
- 	}
+-	}
  
 -	free_pages(address, ATI_PCIGART_TABLE_ORDER);
 +	free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER);
@@ -66,7 +83,16 @@
  {
  	drm_sg_mem_t *entry = dev->sg;
  	unsigned long pages;
-@@ -136,10 +135,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
+@@ -128,7 +124,7 @@ int drm_ati_pcigart_cleanup(drm_device_t
+ 	if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
+ 	    && gart_info->addr) {
+ 		drm_ati_free_pcigart_table(gart_info->addr);
+-		gart_info->addr = 0;
++		gart_info->addr = NULL;
+ 	}
+ 
+ 	return 1;
+@@ -136,10 +132,10 @@ int drm_ati_pcigart_cleanup(drm_device_t
  
  EXPORT_SYMBOL(drm_ati_pcigart_cleanup);
  
@@ -79,7 +105,7 @@
  	unsigned long pages;
  	u32 *pci_gart, page_base, bus_address = 0;
  	int i, j, ret = 0;
-@@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+@@ -163,20 +159,20 @@ int drm_ati_pcigart_init(drm_device_t * 
  			goto done;
  		}
  
@@ -88,7 +114,13 @@
  					     ATI_PCIGART_TABLE_PAGES *
  					     PAGE_SIZE, PCI_DMA_TODEVICE);
  		if (bus_address == 0) {
-@@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+ 			DRM_ERROR("unable to map PCIGART pages!\n");
+ 			drm_ati_free_pcigart_table(address);
+-			address = 0;
++			address = NULL;
+ 			goto done;
+ 		}
+ 	} else {
  		address = gart_info->addr;
  		bus_address = gart_info->bus_addr;
  		DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
@@ -97,7 +129,7 @@
  	}
  
  	pci_gart = (u32 *) address;
-@@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t * 
+@@ -195,7 +191,7 @@ int drm_ati_pcigart_init(drm_device_t * 
  		if (entry->busaddr[i] == 0) {
  			DRM_ERROR("unable to map PCIGART pages!\n");
  			drm_ati_pcigart_cleanup(dev, gart_info);
@@ -122,10 +154,18 @@
  #define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
  #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
 diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
-index 3dc3c9d..54b561e 100644
+index 3dc3c9d..71b8b32 100644
 --- a/drivers/char/drm/drmP.h
 +++ b/drivers/char/drm/drmP.h
-@@ -144,20 +144,6 @@
+@@ -57,6 +57,7 @@
+ #include <linux/smp_lock.h>	/* For (un)lock_kernel */
+ #include <linux/mm.h>
+ #include <linux/cdev.h>
++#include <linux/mutex.h>
+ #if defined(__alpha__) || defined(__powerpc__)
+ #include <asm/pgtable.h>	/* For pte_wrprotect */
+ #endif
+@@ -144,20 +145,6 @@
  /** \name Backward compatibility section */
  /*@{*/
  
@@ -146,7 +186,7 @@
  #define DRM_RPR_ARG(vma) vma,
  
  #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
-@@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *in
+@@ -286,10 +273,13 @@ typedef int drm_ioctl_t(struct inode *in
  typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
  			       unsigned long arg);
  
@@ -162,7 +202,7 @@
  } drm_ioctl_desc_t;
  
  typedef struct drm_devstate {
-@@ -384,6 +373,7 @@ typedef struct drm_buf_entry {
+@@ -384,6 +374,7 @@ typedef struct drm_buf_entry {
  /** File private data */
  typedef struct drm_file {
  	int authenticated;
@@ -170,7 +210,7 @@
  	int minor;
  	pid_t pid;
  	uid_t uid;
-@@ -532,8 +522,9 @@ typedef struct drm_vbl_sig {
+@@ -532,8 +523,9 @@ typedef struct drm_vbl_sig {
  typedef struct ati_pcigart_info {
  	int gart_table_location;
  	int is_pcie;
@@ -181,7 +221,7 @@
  } drm_ati_pcigart_info;
  
  /**
-@@ -544,16 +535,14 @@ typedef struct ati_pcigart_info {
+@@ -544,16 +536,14 @@ typedef struct ati_pcigart_info {
  struct drm_device;
  
  struct drm_driver {
@@ -205,7 +245,7 @@
  	void (*dma_ready) (struct drm_device *);
  	int (*dma_quiescent) (struct drm_device *);
  	int (*context_ctor) (struct drm_device * dev, int context);
-@@ -561,8 +550,9 @@ struct drm_driver {
+@@ -561,8 +551,9 @@ struct drm_driver {
  	int (*kernel_context_switch) (struct drm_device * dev, int old,
  				      int new);
  	void (*kernel_context_switch_unlock) (struct drm_device * dev,
@@ -216,7 +256,7 @@
  
  	/**
  	 * Called by \c drm_device_is_agp.  Typically used to determine if a
-@@ -579,16 +569,24 @@ struct drm_driver {
+@@ -579,16 +570,24 @@ struct drm_driver {
  
  	/* these have to be filled in */
  
@@ -244,7 +284,25 @@
  	u32 driver_features;
  	int dev_priv_size;
  	drm_ioctl_desc_t *ioctls;
-@@ -752,19 +750,43 @@ static inline int drm_core_has_MTRR(stru
+@@ -625,7 +624,7 @@ typedef struct drm_device {
+ 	/** \name Locks */
+ 	/*@{ */
+ 	spinlock_t count_lock;		/**< For inuse, drm_device::open_count, drm_device::buf_use */
+-	struct semaphore struct_sem;	/**< For others */
++	struct mutex struct_mutex;	/**< For others */
[...1905 lines suppressed...]
  
@@ -5808,7 +7014,7 @@
  /*
   * command DMA support
   */
-@@ -534,8 +527,8 @@ extern void savage_emit_clip_rect_s4(drm
+@@ -534,8 +526,8 @@ extern void savage_emit_clip_rect_s4(drm
  
  #define DMA_WRITE( val ) *dma_ptr++ = (uint32_t)(val)
  
@@ -6806,10 +8012,10 @@
   */
  
 diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
-index d4b1766..593c0b8 100644
+index d4b1766..a691ae7 100644
 --- a/drivers/char/drm/via_dma.c
 +++ b/drivers/char/drm/via_dma.c
-@@ -213,7 +213,9 @@ static int via_initialize(drm_device_t *
+@@ -213,14 +213,16 @@ static int via_initialize(drm_device_t *
  	dev_priv->dma_wrap = init->size;
  	dev_priv->dma_offset = init->offset;
  	dev_priv->last_pause_ptr = NULL;
@@ -6820,6 +8026,14 @@
  
  	via_cmdbuf_start(dev_priv);
  
+ 	return 0;
+ }
+ 
+-int via_dma_init(DRM_IOCTL_ARGS)
++static int via_dma_init(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
 @@ -232,13 +234,13 @@ int via_dma_init(DRM_IOCTL_ARGS)
  
  	switch (init.func) {
@@ -6836,6 +8050,24 @@
  			retcode = DRM_ERR(EPERM);
  		else
  			retcode = via_dma_cleanup(dev);
+@@ -319,7 +321,7 @@ int via_driver_dma_quiescent(drm_device_
+ 	return 0;
+ }
+ 
+-int via_flush_ioctl(DRM_IOCTL_ARGS)
++static int via_flush_ioctl(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 
+@@ -328,7 +330,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS)
+ 	return via_driver_dma_quiescent(dev);
+ }
+ 
+-int via_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuffer_t cmdbuf;
 @@ -349,9 +351,6 @@ int via_cmdbuffer(DRM_IOCTL_ARGS)
  	return 0;
  }
@@ -6846,6 +8078,15 @@
  static int via_dispatch_pci_cmdbuffer(drm_device_t * dev,
  				      drm_via_cmdbuffer_t * cmd)
  {
+@@ -376,7 +375,7 @@ static int via_dispatch_pci_cmdbuffer(dr
+ 	return ret;
+ }
+ 
+-int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
++static int via_pci_cmdbuffer(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuffer_t cmdbuf;
 @@ -450,9 +449,9 @@ static int via_hook_segment(drm_via_priv
  	if ((count <= 8) && (count >= 0)) {
  		uint32_t rgtr, ptr;
@@ -6868,6 +8109,15 @@
  		    dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
  
  		ptr_low = (ptr > 3 * CMDBUF_ALIGNMENT_SIZE) ?
+@@ -666,7 +665,7 @@ static void via_cmdbuf_reset(drm_via_pri
+  * User interface to the space and lag functions.
+  */
+ 
+-int via_cmdbuf_size(DRM_IOCTL_ARGS)
++static int via_cmdbuf_size(DRM_IOCTL_ARGS)
+ {
+ 	DRM_DEVICE;
+ 	drm_via_cmdbuf_size_t d_siz;
 @@ -724,3 +723,22 @@ int via_cmdbuf_size(DRM_IOCTL_ARGS)
  			       sizeof(d_siz));
  	return ret;
@@ -6893,7 +8143,7 @@
 +int via_max_ioctl = DRM_ARRAY_SIZE(via_ioctls);
 diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
 new file mode 100644
-index 0000000..9d5e027
+index 0000000..b7f1745
 --- /dev/null
 +++ b/drivers/char/drm/via_dmablit.c
 @@ -0,0 +1,805 @@
@@ -7007,7 +8257,7 @@
 +	int num_desc = 0;
 +	int cur_line;
 +	dma_addr_t next = 0 | VIA_DMA_DPR_EC;
-+	drm_via_descriptor_t *desc_ptr = 0;
++	drm_via_descriptor_t *desc_ptr = NULL;
 +
 +	if (mode == 1) 
 +		desc_ptr = vsg->desc_pages[cur_descriptor_page];
@@ -7066,7 +8316,7 @@
 + */
 +
 +
-+void
++static void
 +via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) 
 +{
 +	struct page *page;
@@ -7480,7 +8730,7 @@
 +	int ret = 0;
 +	
 +	vsg->direction = (draw) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
-+	vsg->bounce_buffer = 0;
++	vsg->bounce_buffer = NULL;
 +
 +	vsg->state = dr_via_sg_init;
 +
@@ -8060,7 +9310,7 @@
  	return drm_init(&driver);
  }
 diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
-index 7d5daf4..aad4f99 100644
+index 7d5daf4..52bcc7b 100644
 --- a/drivers/char/drm/via_drv.h
 +++ b/drivers/char/drm/via_drv.h
 @@ -24,24 +24,26 @@
@@ -8125,7 +9375,7 @@
  /* VIA MMIO register access */
  #define VIA_BASE ((dev_priv->mmio))
  
-@@ -92,12 +101,31 @@ typedef struct drm_via_private {
+@@ -92,12 +101,26 @@ typedef struct drm_via_private {
  #define VIA_READ8(reg)		DRM_READ8(VIA_BASE, reg)
  #define VIA_WRITE8(reg,val)	DRM_WRITE8(VIA_BASE, reg, val)
  
@@ -8138,11 +9388,6 @@
 +extern int via_agp_init(DRM_IOCTL_ARGS);
 +extern int via_map_init(DRM_IOCTL_ARGS);
 +extern int via_decoder_futex(DRM_IOCTL_ARGS);
-+extern int via_dma_init(DRM_IOCTL_ARGS);
-+extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-+extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-+extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
 +extern int via_wait_irq(DRM_IOCTL_ARGS);
 +extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
 +extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -8159,12 +9404,9 @@
  extern int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence);
  
  extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
-@@ -111,8 +139,10 @@ extern int via_driver_dma_quiescent(drm_
- extern void via_init_futex(drm_via_private_t * dev_priv);
+@@ -112,7 +135,7 @@ extern void via_init_futex(drm_via_priva
  extern void via_cleanup_futex(drm_via_private_t * dev_priv);
  extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-+extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
-+			       int force_sequence, unsigned int *sequence);
  
 -extern int via_parse_command_stream(drm_device_t * dev, const uint32_t * buf,
 -				    unsigned int size);
@@ -8193,7 +9435,7 @@
  #include "via_ds.h"
  extern unsigned int VIA_DEBUG;
 diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
-index d023add..56d7e3d 100644
+index d023add..6152415 100644
 --- a/drivers/char/drm/via_irq.c
 +++ b/drivers/char/drm/via_irq.c
 @@ -50,6 +50,15 @@
@@ -8251,15 +9493,6 @@
  		}
  		cur_irq++;
  	}
-@@ -165,7 +190,7 @@ int via_driver_vblank_wait(drm_device_t 
- 	return ret;
- }
- 
--static int
-+int
- via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence,
- 		    unsigned int *sequence)
- {
 @@ -174,6 +199,7 @@ via_driver_irq_wait(drm_device_t * dev, 
  	drm_via_irq_t *cur_irq = dev_priv->via_irqs;
  	int ret = 0;


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kernel-xen.spec	3 Feb 2006 19:26:03 -0000	1.40
+++ kernel-xen.spec	7 Feb 2006 00:45:15 -0000	1.41
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 0
+%define includexenPAE 1
 %define builddoc 0
 %define buildkdump 0
 
@@ -165,7 +165,7 @@
 Version: %{rpmversion}
 Release: %{release}
 ExclusiveArch: noarch i686
-#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 s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -195,9 +195,6 @@
 Source10: COPYING.modules
 Source11: genkey
 
-%define BCMVER 20060114
-Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2
-
 Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-smp.config
@@ -222,10 +219,10 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc1.bz2
-Patch2: patch-2.6.16-rc1-git5.bz2
+Patch1: patch-2.6.16-rc2.bz2
+Patch2: patch-2.6.16-rc2-git2.bz2
 Patch3: drm.patch
-Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2
+Patch4: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -315,6 +312,8 @@
 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
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -378,7 +377,9 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1880: linux-2.6-suspend-memhotplug-oops.patch
+Patch1860: linux-2.6-percpu-NR_CPUS.patch
+Patch1870: linux-2.6-net-suppress-msgs.patch
+Patch1880: linux-2.6-fs-namei-deadlock.patch
 Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -395,7 +396,8 @@
 
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
-Patch5001: linux-2.6-bcm43xx.patch
+Patch5001: linux-2.6-bcm43xx-git.patch
+Patch5002: linux-2.6-bcm43xx-git-mb.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -687,10 +689,9 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 # Backout broken DRM changes.
 %patch3 -p1 -R
-# Update ACPI
 %patch4 -p1
 
 #
@@ -838,6 +839,8 @@
 %patch1028 -p1
 #%patch1029 -p1
 #%patch1030 -p1
+%patch1031 -p1
+%patch1032 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -951,7 +954,11 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Fix software suspend on kernels without memory hotplug.
+# Fix percpu data accesses
+%patch1860 -p1
+# Suppress some network layer msgs
+%patch1870 -p1
+# Fix deadlock in do_path_lookup()
 %patch1880 -p1
 # Fix oops in stradis on init
 %patch1890 -p1
@@ -977,16 +984,12 @@
 # be merged upstream
 #
 
-# Broadcom BCM43xx wireless driver.
-
-# Extract snapshot tarballs and move them into place.
-tar xvfj %{SOURCE13}
-mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx
-
 # Import softmac code from git tree
 %patch5000 -p1
-# Patch Kconfig and Makefiles to merge bcm43xx 'properly'
+# ... and bcm43xx driver too from jwl's tree
 %patch5001 -p1
+# ... and Michael Buesch's updates (2006-02-03)
+%patch5002 -p1
 
 #
 # final stuff
@@ -1312,6 +1315,11 @@
 exit 0
 
 %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}
 
@@ -1576,11 +1584,35 @@
 %endif
 
 %changelog
+* Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1914.
+
+* Mon Feb  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git2
+
+* Mon Feb  6 2006 David Woodhouse <dwmw2 at redhat.com>
+- Update to current softmac/bcm43xx code.
+
+* Sun Feb  5 2006 Dave Jones <davej at redhat.com>
+- Fix sed failure if /etc/sysconfig/kernel doesn't exist. (#180025)
+
+* Sat Feb  4 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git1
+- Fix deadlock in do_path_lookup()
+
 * Fri Feb  3 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase to chrisw's latest merge tree (fix skbuff conflicts)
 - Rebase to xen-unstable hypervisor cset 8737
 - Fix merge of davej's acpi changes to xen
 
+* Fri Feb  3 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2
+- Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
+- Silence noisy edac drivers.
+- Merge some patches from cpufreq git tree.
+- Fix some bogus percpu data accesses.
+- Suppress some network layer msgs
+
 * Thu Feb  2 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase to linux-2.6-merge.hg cset 19892
 - Disable PAE again
@@ -1592,7 +1624,11 @@
 * Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
 - Add PAE hypervisor & guest kernel, disabled by default.
 
-* Wed Feb  1 2006 Dave Jones <<davej at redhat.com>
+* Thu Feb  2 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc1-git6
+- enable the periodic slab debugger again.
+
+* Wed Feb  1 2006 Dave Jones <davej at redhat.com>
 - Woo, 2.6.16rc1-git5 (at last)
 - Enable exec* checking except for execmod for ppc32 and ia64 (#178747)
 - Disable a bunch of drivers for SBC's that won't run Fedora.

linux-2.6-compile-fixes.patch:
 linux-2.6.15.noarch/include/linux/suspend.h |    4 ----
 linux-2.6.15/drivers/net/spider_net.c       |    1 +
 linux-2.6.15/include/asm-generic/signal.h   |    1 +
 linux-2.6/arch/ia64/Kconfig                 |    3 +++
 linux-2.6/drivers/Makefile                  |    2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-compile-fixes.patch	26 Jan 2006 22:14:33 -0000	1.3
+++ linux-2.6-compile-fixes.patch	7 Feb 2006 00:45:15 -0000	1.4
@@ -18,19 +18,6 @@
  
  #include "spider_net.h"
  
---- linux-2.6.15/arch/s390/kernel/setup.c~	2006-01-10 23:43:32.000000000 +0000
-+++ linux-2.6.15/arch/s390/kernel/setup.c	2006-01-11 00:34:18.000000000 +0000
-@@ -319,6 +319,8 @@ void machine_power_off(void)
- 	_machine_power_off();
- }
- 
-+void (*pm_power_off)(void) = machine_power_off;
-+
- static void __init
- add_memory_hole(unsigned long start, unsigned long end)
- {
-
-
 Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
 is enabled.
 
@@ -69,3 +56,16 @@
  obj-$(CONFIG_CRYPTO)		+= crypto/
  obj-$(CONFIG_SUPERH)		+= sh/
 
+--- linux-2.6.15.noarch/include/linux/suspend.h~	2006-02-02 16:27:38.000000000 -0500
++++ linux-2.6.15.noarch/include/linux/suspend.h	2006-02-02 16:28:07.000000000 -0500
+@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone 
+ #ifdef CONFIG_PM
+ /* kernel/power/swsusp.c */
+ extern int software_suspend(void);
+-
+-extern int pm_prepare_console(void);
+-extern void pm_restore_console(void);
+-
+ #else
+ static inline int software_suspend(void)
+ {

linux-2.6-debug-oops-pause.patch:
 traps.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-oops-pause.patch	26 Jan 2006 22:14:33 -0000	1.4
+++ linux-2.6-debug-oops-pause.patch	7 Feb 2006 00:45:15 -0000	1.5
@@ -6,8 +6,9 @@
 
 (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
+diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.15.noarch/arch/i386/kernel/traps.c oops-pause/arch/i386/kernel/traps.c
+--- linux-2.6.15.noarch/arch/i386/kernel/traps.c	2006-02-03 23:31:55.000000000 -0500
++++ oops-pause/arch/i386/kernel/traps.c	2006-02-03 23:35:44.000000000 -0500
 @@ -28,6 +28,7 @@
  #include <linux/utsname.h>
  #include <linux/kprobes.h>
@@ -16,19 +17,39 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs
+@@ -151,6 +152,17 @@ static inline unsigned long print_contex
+ 	return ebp;
+ }
+ 
++void pause_for_two_minutes(void)
++{
++	int i;
++	for (i=120;i>0;i--) {
++		mdelay(1000);
++		touch_nmi_watchdog();
++		printk("Continuing in %d seconds. \r", i);
++	}
++	printk("\n");
++}	
++
+ static void show_trace_log_lvl(struct task_struct *task,
+ 			       unsigned long *stack, char *log_lvl)
+ {
+@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
+ 		if (!stack)
+ 			break;
+ 		printk(KERN_EMERG " =======================\n");
++		pause_for_two_minutes();
+ 	}
+ }
+ 
+@@ -287,7 +300,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-singlebiterror.patch:
 slab.c |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

Index: linux-2.6-debug-singlebiterror.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-singlebiterror.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-debug-singlebiterror.patch	26 Jan 2006 22:14:33 -0000	1.3
+++ linux-2.6-debug-singlebiterror.patch	7 Feb 2006 00:45:15 -0000	1.4
@@ -1,32 +1,54 @@
+
+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.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
+@@ -1313,8 +1313,13 @@ static void poison_obj(kmem_cache_t *cac
  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)
++		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
+@@ -1019,6 +1023,23 @@ 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-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 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.15.noarch/drivers/media/video/cpia.c             |    2 +-
 linux-2.6.15.noarch/drivers/scsi/megaraid.c                |    2 +-
 linux-2.6.15/kernel/power/snapshot.c                       |    3 ++-
 10 files changed, 11 insertions(+), 14 deletions(-)

Index: linux-2.6-random-patches.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-random-patches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-random-patches.patch	2 Feb 2006 14:04:16 -0000	1.1
+++ linux-2.6-random-patches.patch	7 Feb 2006 00:45:15 -0000	1.2
@@ -31,26 +31,6 @@
  }
  
 
-kobject_register failed for hexium HV-PCI6/Orion (-13)
- [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
- [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c7700a>] hexium_init_module+0xa/0x47 [hexium_orion]
- [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
- [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
- [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/media/video/hexium_orion.c~	2006-02-01 22:37:07.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/media/video/hexium_orion.c	2006-02-01 22:37:24.000000000 -0500
-@@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = {
- };
- 
- static struct saa7146_extension extension = {
--	.name = "hexium HV-PCI6/Orion",
-+	.name = "hexium HV-PCI6 Orion",
- 	.flags = 0,		// SAA7146_USE_I2C_IRQ,
- 
- 	.pci_tbl = &pci_tbl[0],
 --- 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);

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-selinux-mprotect-checks.patch	2 Feb 2006 14:04:16 -0000	1.2
+++ linux-2.6-selinux-mprotect-checks.patch	7 Feb 2006 00:45:15 -0000	1.3
@@ -2,25 +2,25 @@
 
 --- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
 +++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
-@@ -2451,7 +2451,6 @@ static int selinux_file_mprotect(struct 
+@@ -2425,7 +2425,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
 -#ifndef CONFIG_PPC32
- 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) &&
- 	   (vma->vm_start >= vma->vm_mm->start_brk &&
- 	    vma->vm_end <= vma->vm_mm->brk)) {
-@@ -2470,7 +2469,9 @@ static int selinux_file_mprotect(struct 
- 		 * check ability to execute the possibly modified content.
- 		 * This typically should only occur for text relocations.
- 		 */
--		int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
+ 	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
+ 		rc = 0;
+ 		if (vma->vm_start >= vma->vm_mm->start_brk &&
+@@ -2444,8 +2444,10 @@ static int selinux_file_mprotect(struct 
+ 			 * modified content.  This typically should only
+ 			 * occur for text relocations.
+ 			 */
 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
-+		rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD);
+ 			rc = file_has_perm(current, vma->vm_file,
+ 					   FILE__EXECMOD);
 +#endif
+ 		}
  		if (rc)
  			return rc;
- 	}
 @@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |   78 +++
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  392 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  456 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3324 insertions(+), 3 deletions(-)

Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-softmac-git.patch	26 Jan 2006 22:14:34 -0000	1.2
+++ linux-2.6-softmac-git.patch	7 Feb 2006 00:45:15 -0000	1.3
@@ -434,7 +434,7 @@
  
 +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
 diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
-index 321287b..22abfca 100644
+index 90d18b7..2ebb16f 100644
 --- a/net/ieee80211/ieee80211_module.c
 +++ b/net/ieee80211/ieee80211_module.c
 @@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d
@@ -447,10 +447,91 @@
  static int show_debug_level(char *page, char **start, off_t offset,
  			    int count, int *eof, void *data)
 diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
-index 5e33803..64eceb7 100644
+index 7a12180..c31ae23 100644
 --- a/net/ieee80211/ieee80211_rx.c
 +++ b/net/ieee80211/ieee80211_rx.c
-@@ -1289,9 +1289,9 @@ static inline void update_network(struct
+@@ -761,6 +761,80 @@ int ieee80211_rx(struct ieee80211_device
+ 	return 0;
+ }
+ 
++/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
++int ieee80211_rx_any(struct ieee80211_device *ieee,
++		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
++{
++	struct ieee80211_hdr_4addr *hdr;
++	int is_packet_for_us;
++	u16 fc;
++
++	if (ieee->iw_mode == IW_MODE_MONITOR)
++		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
++
++	hdr = (struct ieee80211_hdr_4addr *)skb->data;
++	fc = le16_to_cpu(hdr->frame_ctl);
++
++	if ((fc & IEEE80211_FCTL_VERS) != 0)
++		return -EINVAL;
++		
++	switch (fc & IEEE80211_FCTL_FTYPE) {
++	case IEEE80211_FTYPE_MGMT:
++		ieee80211_rx_mgt(ieee, hdr, stats);
++		return 0;
++	case IEEE80211_FTYPE_DATA:
++		break;
++	case IEEE80211_FTYPE_CTL:
++		return 0;
++	default:
++		return -EINVAL;
++	}
++
++	is_packet_for_us = 0;
++	switch (ieee->iw_mode) {
++	case IW_MODE_ADHOC:
++		/* our BSS and not from/to DS */
++		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1))
++				is_packet_for_us = 1;
++		}
++		break;
++	case IW_MODE_INFRA:
++		/* our BSS (== from our AP) and from DS */
++		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1)) {
++				/* not our own packet bcasted from AP */
++				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
++					is_packet_for_us = 1;
++			}
++		}
++		break;
++	default:
++		/* ? */
++		break;
++	}
++
++	if (is_packet_for_us)
++		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
++	return 0;
++}
++
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+ static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
+@@ -1289,9 +1363,9 @@ static void update_network(struct ieee80
  	/* dst->last_associate is not overwritten */
  }
  
@@ -461,9 +542,9 @@
 +	return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON);
  }
  
- static inline void ieee80211_process_probe_response(struct ieee80211_device
+ static void ieee80211_process_probe_response(struct ieee80211_device
 diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
-index 406d5b9..2f16cbe 100644
+index 23e1630..e52ebd3 100644
 --- a/net/ieee80211/ieee80211_wx.c
 +++ b/net/ieee80211/ieee80211_wx.c
 @@ -726,9 +726,98 @@ int ieee80211_wx_get_encodeext(struct ie

linux-2.6-xen-merge.patch:
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   43 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 linux-2.6.15.i686/arch/i386/Kconfig              |   79 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61908 insertions(+), 818 deletions(-)

Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-xen-merge.patch	3 Feb 2006 16:20:17 -0000	1.8
+++ linux-2.6-xen-merge.patch	7 Feb 2006 00:45:15 -0000	1.9
@@ -1,19 +1,10 @@
-diff -r 52f446a807c8 -r 2905f31ca453 arch/i386/Kconfig
---- a/arch/i386/Kconfig	Thu Feb  2 00:53:27 2006 +0800
-+++ b/arch/i386/Kconfig	Wed Feb  1 20:21:42 2006 -0500
-@@ -50,6 +50,7 @@ config DOUBLEFAULT
- config DOUBLEFAULT
- 	default y
- 	bool "Enable doublefault exception handler" if EMBEDDED
-+	depends on !XEN
- 	help
-           This option allows trapping of rare doublefault exceptions that
-           would otherwise cause a system to silently reboot. Disabling this
-@@ -57,6 +57,15 @@ config X86_PC
- 	bool "PC-compatible"
+diff -uNp linux-2.6.15.i686/arch/i386/Kconfig.orig linux-2.6.15.i686/arch/i386/Kconfig
+--- linux-2.6.15.i686/arch/i386/Kconfig.orig	2006-02-07 00:15:08.000000000 +0100
++++ linux-2.6.15.i686/arch/i386/Kconfig	2006-02-07 00:28:15.000000000 +0100
+@@ -58,6 +58,15 @@ config X86_PC
  	help
  	  Choose this option if your computer is a standard PC or compatible.
-+
+ 
 +config X86_XEN
 +	bool "Xen-compatible"
 +	select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
@@ -22,9 +13,10 @@
 +	help
 +	  Choose this option is you plan to run this kernel on top of Xen
 +	  Hypervisor.
- 
++
  config X86_ELAN
  	bool "AMD Elan"
+ 	help
 @@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu"
  
  config HPET_TIMER
@@ -48,8 +40,8 @@
 +	  running SMP kernels on UP machines, and have negligible impact
 +	  when running on an true SMP host.
 +
-+          If unsure, say N.
-+	  
++	    If unsure, say N.
++
  config NR_CPUS
  	int "Maximum number of CPUs (2-255)"
  	range 2 255
@@ -71,7 +63,7 @@
  	help
  	  A local APIC (Advanced Programmable Interrupt Controller) is an
  	  integrated interrupt controller in the CPU. If you have a single-CPU
-@@ -255,22 +278,27 @@ config X86_UP_IOAPIC
+@@ -267,12 +290,12 @@ config X86_UP_APIC_DEFAULT_OFF
  
  config X86_LOCAL_APIC
  	bool
@@ -86,15 +78,15 @@
  	default y
  
  config X86_VISWS_APIC
- 	bool
+@@ -280,9 +303,14 @@ config X86_VISWS_APIC
  	depends on X86_VISWS
-+	default y
-+
+ 	default y
+ 
 +config X86_TSC
 +	bool
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN
- 	default y
- 
++	default y
++
  config X86_MCE
  	bool "Machine Check Exception"
 -	depends on !X86_VOYAGER
@@ -102,7 +94,7 @@
  	---help---
  	  Machine Check Exception support allows the processor to notify the
  	  kernel if it detects a problem (e.g. overheating, component failure).
-@@ -360,6 +388,7 @@ config X86_REBOOTFIXUPS
+@@ -372,6 +400,7 @@ config X86_REBOOTFIXUPS
  
  config MICROCODE
  	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
@@ -110,7 +102,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
-@@ -377,6 +406,7 @@ config MICROCODE
+@@ -389,6 +418,7 @@ config MICROCODE
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -118,18 +110,18 @@
  	help
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -391,6 +421,10 @@ config X86_CPUID
- 	  be executed on a specific processor.  It is a character device
+@@ -404,6 +434,10 @@ config X86_CPUID
  	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
  	  /dev/cpu/31/cpuid.
-+
+ 
 +config SWIOTLB
 +	bool
 +	default n
- 
++
  source "drivers/firmware/Kconfig"
  
-@@ -559,7 +593,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+ choice
+@@ -571,7 +605,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
  
  config HIGHPTE
  	bool "Allocate 3rd-level pagetables from highmem"
@@ -138,7 +130,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
-@@ -568,6 +602,7 @@ config HIGHPTE
+@@ -580,6 +614,7 @@ config HIGHPTE
  
  config MATH_EMULATION
  	bool "Math emulation"
@@ -146,7 +138,7 @@
  	---help---
  	  Linux can emulate a math coprocessor (used for floating point
  	  operations) if you don't have one. 486DX and Pentium processors have
-@@ -593,6 +628,8 @@ config MATH_EMULATION
+@@ -605,6 +640,8 @@ config MATH_EMULATION
  
  config MTRR
  	bool "MTRR (Memory Type Range Register) support"
@@ -155,7 +147,7 @@
  	---help---
  	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
  	  the Memory Type Range Registers (MTRRs) may be used to control
-@@ -627,7 +664,7 @@ config MTRR
+@@ -639,7 +676,7 @@ config MTRR
  
  config EFI
  	bool "Boot from EFI support (EXPERIMENTAL)"
@@ -164,7 +156,7 @@
  	default n
  	---help---
  	This enables the the kernel to boot on EFI platforms using
-@@ -645,7 +682,7 @@ config EFI
+@@ -657,7 +694,7 @@ config EFI
  
  config IRQBALANCE
   	bool "Enable kernel irq balancing"
@@ -173,7 +165,7 @@
  	default y
  	help
   	  The default yes will allow the kernel to do irq load balancing.
-@@ -688,7 +725,7 @@ source kernel/Kconfig.hz
+@@ -700,7 +737,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call (EXPERIMENTAL)"
@@ -182,14 +174,21 @@
  	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
-@@ -752,18 +790,20 @@ endmenu
+@@ -754,6 +791,7 @@ config HOTPLUG_CPU
+ config DOUBLEFAULT
+ 	default y
+ 	bool "Enable doublefault exception handler" if EMBEDDED
++	depends on !XEN
+ 	help
+           This option allows trapping of rare doublefault exceptions that
+           would otherwise cause a system to silently reboot. Disabling this
+@@ -764,18 +802,20 @@ endmenu
  
  
  menu "Power management options (ACPI, APM)"
 -	depends on !X86_VOYAGER
--
 +	depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
-+
+ 
 +if !X86_XEN
  source kernel/power/Kconfig
 +endif
@@ -207,7 +206,7 @@
  	---help---
  	  APM is a BIOS specification for saving power using several different
  	  techniques. This is mostly useful for battery powered laptops with
-@@ -911,6 +951,7 @@ endmenu
+@@ -923,6 +963,7 @@ source "arch/i386/kernel/cpu/cpufreq/Kco
  endmenu
  
  menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
@@ -215,7 +214,7 @@
  
  config PCI
  	bool "PCI support" if !X86_VISWS
-@@ -948,6 +989,7 @@ choice
+@@ -960,6 +1001,7 @@ choice
  
  config PCI_GOBIOS
  	bool "BIOS"
@@ -223,7 +222,7 @@
  
  config PCI_GOMMCONFIG
  	bool "MMConfig"
-@@ -962,7 +1004,7 @@ endchoice
+@@ -974,7 +1016,7 @@ endchoice
  
  config PCI_BIOS
  	bool
@@ -232,7 +231,7 @@
  	default y
  
  config PCI_DIRECT
-@@ -981,11 +1023,12 @@ source "drivers/pci/Kconfig"
+@@ -993,11 +1035,12 @@ source "drivers/pci/Kconfig"
  
  config ISA_DMA_API
  	bool
@@ -246,7 +245,7 @@
  	help
  	  Find out whether you have ISA slots on your motherboard.  ISA is the
  	  name of a bus system, i.e. the way the CPU talks to the other stuff
-@@ -1012,7 +1055,7 @@ source "drivers/eisa/Kconfig"
+@@ -1024,7 +1067,7 @@ config EISA
  source "drivers/eisa/Kconfig"
  
  config MCA
@@ -255,7 +254,7 @@
  	default y if X86_VOYAGER
  	help
  	  MicroChannel Architecture is found in some IBM PS/2 machines and
-@@ -1055,7 +1098,9 @@ menu "Instrumentation Support"
+@@ -1067,7 +1110,9 @@ source "fs/Kconfig"
  menu "Instrumentation Support"
  	depends on EXPERIMENTAL
  
@@ -265,7 +264,7 @@
  
  config KPROBES
  	bool "Kprobes (EXPERIMENTAL)"
-@@ -1073,6 +1118,8 @@ source "security/Kconfig"
+@@ -1085,6 +1130,8 @@ source "security/Kconfig"
  
  source "crypto/Kconfig"
  
@@ -274,7 +273,7 @@
  source "lib/Kconfig"
  
  #
-@@ -1098,7 +1145,7 @@ config X86_SMP
+@@ -1110,7 +1157,7 @@ config X86_SMP
  
  config X86_HT
  	bool


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Feb 2006 19:26:04 -0000	1.13
+++ sources	7 Feb 2006 00:45:16 -0000	1.14
@@ -1,6 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-ce5867f7e98d39c0e0e1ee102213b4c9  bcm43xx-20060114.tar.bz2
-fbc343e7737654226fd4b5b205378393  patch-2.6.16-rc1.bz2
-3c236ca700ac76f28c2c4e25682541a4  acpi-release-20060113-2.6.16-rc1.diff.bz2
-38954e4fe6dbf902e854f456b675f60f  patch-2.6.16-rc1-git5.bz2
 9a0a0e3c3ad5d049fcd29fb913d6c3a6  xen-20060202.tar.bz2
+7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
+b5306d5c471ef0a301ced2acb475d361  patch-2.6.16-rc2-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- upstream	2 Feb 2006 14:04:28 -0000	1.6
+++ upstream	7 Feb 2006 00:45:16 -0000	1.7
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc1.bz2
-patch-2.6.16-rc1-git5.bz2
+patch-2.6.16-rc2.bz2
+patch-2.6.16-rc2-git2.bz2


--- linux-2.6-bcm43xx-resume.patch DELETED ---


--- linux-2.6-bcm43xx.patch DELETED ---


--- linux-2.6-suspend-memhotplug-oops.patch DELETED ---


--- patch-2.6.16-rc1-git5.bz2.sign DELETED ---


--- patch-2.6.16-rc1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 01:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 20:58:01 -0500
Subject: rpms/gedit/devel gedit.spec,1.69,1.70
Message-ID: <200602070158.k171w1VN032149@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32021

Modified Files:
	gedit.spec 
Log Message:
- Add dependency on new gnome-python2-desktop package



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- gedit.spec	6 Feb 2006 15:10:05 -0000	1.69
+++ gedit.spec	7 Feb 2006 01:57:58 -0000	1.70
@@ -9,14 +9,14 @@
 %define gail_version 1.2.0
 %define gtksourceview_version 1.1.91
 %define pygtk_version 2.7.1
-%define gnome_python_extras_version 2.11.4
+%define gnome_python_desktop_version 2.13.3
 
 %define po_package gedit
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.13.90
-Release: 	2
+Release: 	2	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -48,13 +48,14 @@
 BuildRequires: scrollkeeper gettext
 BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: python-devel
-BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_extras_version}
+BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
+BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop_version}
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgnomeprintui22 >= %{libgnomeprintui_version}
 Requires: gtksourceview >= %{gtksourceview_version}
 Requires: pygtk2 >= %{pygtk_version}
-Requires: gnome-python2-gtksourceview >= %{gnome_python_extras_version}
+Requires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
 
 %description
 gEdit is a small but powerful text editor designed specifically for



From fedora-cvs-commits at redhat.com  Tue Feb  7 02:00:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 21:00:58 -0500
Subject: rpms/gedit/devel gedit.spec,1.70,1.71
Message-ID: <200602070200.k1720w6J000794@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv732

Modified Files:
	gedit.spec 
Log Message:
- Bump and rebuild



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- gedit.spec	7 Feb 2006 01:57:58 -0000	1.70
+++ gedit.spec	7 Feb 2006 02:00:55 -0000	1.71
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 1:2.13.90-3
+- Add dependancy on gnome-python2-desktop
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-2
 - Enable python again
 - Fix multiarch problem



From fedora-cvs-commits at redhat.com  Tue Feb  7 02:03:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 21:03:33 -0500
Subject: rpms/gedit/devel gedit.spec,1.71,1.72
Message-ID: <200602070203.k1723Xph001225@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1179

Modified Files:
	gedit.spec 
Log Message:
- Really bump this time



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- gedit.spec	7 Feb 2006 02:00:55 -0000	1.71
+++ gedit.spec	7 Feb 2006 02:03:30 -0000	1.72
@@ -16,7 +16,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.13.90
-Release: 	2	
+Release: 	3	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors



From fedora-cvs-commits at redhat.com  Tue Feb  7 02:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 21:39:26 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.212, 1.213 anaconda.spec, 1.331,
	1.332 sources, 1.331, 1.332
Message-ID: <200602070239.k172dQmM017239@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17214/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.16-1 on branch devel from anaconda-10.91.16-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- .cvsignore	7 Feb 2006 00:09:46 -0000	1.212
+++ .cvsignore	7 Feb 2006 02:39:24 -0000	1.213
@@ -1 +1 @@
-anaconda-10.91.15.tar.bz2
+anaconda-10.91.16.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- anaconda.spec	7 Feb 2006 00:09:46 -0000	1.331
+++ anaconda.spec	7 Feb 2006 02:39:24 -0000	1.332
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.15
+Version: 10.91.16
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -78,6 +78,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb  6 2006 Jeremy Katz <katzj at redhat.com> - 10.91.16-1
+- fix writing out instdata for root password, etc (#180310)
+
 * Mon Feb  6 2006 Jeremy Katz <katzj at redhat.com> - 10.91.15-1
 - Remove debugging code that broke showing the Xen option on the task screen
 - More sqlite files (#171232)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- sources	7 Feb 2006 00:09:46 -0000	1.331
+++ sources	7 Feb 2006 02:39:24 -0000	1.332
@@ -1 +1 @@
-bb78297e9e37abad272923b1f4eeddfa  anaconda-10.91.15.tar.bz2
+4aeec18281f7fbf3bcd63729714105f8  anaconda-10.91.16.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 03:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 22:16:23 -0500
Subject: rpms/intltool/devel .cvsignore, 1.12, 1.13 intltool.spec, 1.19,
	1.20 sources, 1.12, 1.13
Message-ID: <200602070316.k173GNa7016708@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/intltool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16360

Modified Files:
	.cvsignore intltool.spec sources 
Log Message:
0.34.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	4 Aug 2005 18:48:57 -0000	1.12
+++ .cvsignore	7 Feb 2006 03:16:19 -0000	1.13
@@ -2,3 +2,4 @@
 intltool-0.31.2.tar.bz2
 intltool-0.33.tar.bz2
 intltool-0.34.1.tar.bz2
+intltool-0.34.2.tar.bz2


Index: intltool.spec
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- intltool.spec	9 Dec 2005 22:41:00 -0000	1.19
+++ intltool.spec	7 Feb 2006 03:16:19 -0000	1.20
@@ -1,7 +1,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files.
-Version: 0.34.1
-Release: 1.1
+Version: 0.34.2
+Release: 1
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.bz2
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 0.34.2-1
+- Update to 0.34.2
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	4 Aug 2005 18:48:57 -0000	1.12
+++ sources	7 Feb 2006 03:16:19 -0000	1.13
@@ -1 +1 @@
-1a6007b4890e2801b7a8ba47f9ea6292  intltool-0.34.1.tar.bz2
+83914f744d927579cc47c52f8b08bf60  intltool-0.34.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 03:35:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 22:35:37 -0500
Subject: rpms/librsvg2/devel .cvsignore, 1.19, 1.20 librsvg2.spec, 1.35,
	1.36 sources, 1.19, 1.20
Message-ID: <200602070335.k173Zbap031595@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31550

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Jan 2006 19:07:19 -0000	1.19
+++ .cvsignore	7 Feb 2006 03:35:34 -0000	1.20
@@ -8,3 +8,4 @@
 librsvg-2.12.7.tar.bz2
 librsvg-2.13.3.tar.bz2
 librsvg-2.13.5.tar.bz2
+librsvg-2.13.92.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- librsvg2.spec	13 Jan 2006 19:17:09 -0000	1.35
+++ librsvg2.spec	7 Feb 2006 03:35:34 -0000	1.36
@@ -8,10 +8,11 @@
 %define libcroco_version 0.6
 %define libgnomeui_version 2.5.0
 %define libgsf_version 1.6.0
+%define gnome_vfs_version 1.9.16
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
-Version: 2.13.5
+Version: 2.13.92
 Release: 1
 
 License: 	LGPL
@@ -24,8 +25,9 @@
 Requires:	freetype >= %{freetype_version}
 Requires:       cairo >= %{cairo_version}
 Requires:	libpng
-Requires:	libcroco >= 0.6.0
+Requires:	libcroco >= %(libcroco_version}
 Requires:	libgsf >= %{libgsf_version}
+Requires: 	gnome-vfs2 >= %{gnome_vfs_version}
 Requires(post,postun): %{_bindir}/update-gdk-pixbuf-loaders
 BuildRequires: libpng-devel
 BuildRequires:	gtk2-devel >= %{gtk2_version}
@@ -40,6 +42,7 @@
 BuildRequires:  libtool
 BuildRequires:  libgnomeui-devel
 BuildRequires:  libgsf-devel >= %{libgsf_version}
+BuildRequires: 	gnome-vfs2-devel >= %{gnome_vfs_version}
 
 %description
 An SVG library based on cairo.
@@ -64,7 +67,12 @@
 %setup -q -n librsvg-%{version}
 
 %build
-%configure --with-svgz
+%configure --with-svgz \
+	--disable-gtk-doc \
+	--enable-gtk-theme \
+	--enable-gnome-vfs \
+	--with-croco \
+	
 make
 
 %install
@@ -113,6 +121,9 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.92-1
+- Update to 2.13.92
+
 * Fri Jan 13 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-1
 - Update to 2.13.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Jan 2006 19:07:19 -0000	1.19
+++ sources	7 Feb 2006 03:35:34 -0000	1.20
@@ -1 +1 @@
-ed74fe02d3a624956dd3bde0909d8516  librsvg-2.13.5.tar.bz2
+abcf456c439613fa46b07aa14ce7ccc9  librsvg-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 03:38:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 22:38:09 -0500
Subject: rpms/librsvg2/devel librsvg2.spec,1.36,1.37
Message-ID: <200602070338.k173c9UL032596@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32542

Modified Files:
	librsvg2.spec 
Log Message:
2.13.92



Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- librsvg2.spec	7 Feb 2006 03:35:34 -0000	1.36
+++ librsvg2.spec	7 Feb 2006 03:38:06 -0000	1.37
@@ -25,7 +25,7 @@
 Requires:	freetype >= %{freetype_version}
 Requires:       cairo >= %{cairo_version}
 Requires:	libpng
-Requires:	libcroco >= %(libcroco_version}
+Requires:	libcroco >= %{libcroco_version}
 Requires:	libgsf >= %{libgsf_version}
 Requires: 	gnome-vfs2 >= %{gnome_vfs_version}
 Requires(post,postun): %{_bindir}/update-gdk-pixbuf-loaders



From fedora-cvs-commits at redhat.com  Tue Feb  7 03:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 22:41:37 -0500
Subject: rpms/ORBit2/devel .cvsignore, 1.15, 1.16 ORBit2.spec, 1.30,
	1.31 sources, 1.15, 1.16
Message-ID: <200602070341.k173fbLg001825@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1754

Modified Files:
	.cvsignore ORBit2.spec sources 
Log Message:
2.13.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Nov 2005 17:21:04 -0000	1.15
+++ .cvsignore	7 Feb 2006 03:41:33 -0000	1.16
@@ -3,3 +3,4 @@
 ORBit2-2.12.2.tar.bz2
 ORBit2-2.12.4.tar.bz2
 ORBit2-2.13.2.tar.bz2
+ORBit2-2.13.3.tar.bz2


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ORBit2.spec	19 Dec 2005 18:20:40 -0000	1.30
+++ ORBit2.spec	7 Feb 2006 03:41:33 -0000	1.31
@@ -3,8 +3,8 @@
 
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
-Version: 2.13.2
-Release: 2
+Version: 2.13.3
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -94,6 +94,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.3-1
+- Update to 2.13.3
+
 * Mon Dec 19 2005 Matthias Clasen <mclasen at redhat.com> 2.13.2-2
 - Fix multilib issues
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Nov 2005 17:21:04 -0000	1.15
+++ sources	7 Feb 2006 03:41:33 -0000	1.16
@@ -1 +1 @@
-8d1e654f9b7e1399dc98da3bb4b96762  ORBit2-2.13.2.tar.bz2
+f879b3b77880df9a15ffdea171bb2e82  ORBit2-2.13.3.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 04:17:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 23:17:08 -0500
Subject: rpms/icon-naming-utils/devel icon-naming-utils-0.6.7-paths.patch,
	NONE, 1.1 icon-naming-utils.spec, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200602070417.k174H819007382@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/icon-naming-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7337

Modified Files:
	icon-naming-utils.spec sources 
Added Files:
	icon-naming-utils-0.6.7-paths.patch 
Log Message:
0.6.7


icon-naming-utils-0.6.7-paths.patch:
 Makefile.am             |   13 ++++++-------
 icon-naming-utils.pc.in |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

--- NEW FILE icon-naming-utils-0.6.7-paths.patch ---
--- icon-naming-utils-0.6.7/Makefile.am.paths	2006-02-06 23:13:56.000000000 -0500
+++ icon-naming-utils-0.6.7/Makefile.am	2006-02-06 23:15:29.000000000 -0500
@@ -1,5 +1,5 @@
 
-libexec_SCRIPTS = icon-name-mapping
+bin_SCRIPTS = icon-name-mapping
 
 %: %.pl.in
 	sed -e "s#\@PERL\@#$(PERL)#g"		\
@@ -8,12 +8,11 @@
 
 pkgconfig_in_files = icon-naming-utils.pc.in
 pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
+pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc) 
 
-dtddir = $(datadir)/dtds
-dtd_DATA = legacy-icon-mapping.dtd
-
-pkgdata_DATA = legacy-icon-mapping.xml
+pkgdata_DATA = 				\
+	legacy-icon-mapping.xml		\
+	legacy-icon-mapping.dtd
 
 EXTRA_DIST =				\
 	icon-name-mapping.pl.in		\
@@ -22,7 +21,7 @@
 	$(pkgdata_DATA)
 
 CLEANFILES =				\
-	$(libexec_SCRIPTS)
+	$(bin_SCRIPTS)
 
 DISTCLEANFILES =			\
 	$(pkgconfig_DATA)
--- icon-naming-utils-0.6.7/icon-naming-utils.pc.in.paths	2006-02-06 23:15:37.000000000 -0500
+++ icon-naming-utils-0.6.7/icon-naming-utils.pc.in	2006-02-06 23:16:01.000000000 -0500
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-program_path=@libexecdir@
+program_path=/usr/bin
 
 Name: icon-naming-utils
 Description: Utilities for mapping legacy GNOME and KDE icon names to the new Icon Naming Specification


Index: icon-naming-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/icon-naming-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icon-naming-utils.spec	17 Jan 2006 19:02:20 -0000	1.1
+++ icon-naming-utils.spec	7 Feb 2006 04:17:04 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           icon-naming-utils
-Version:        0.6.5
+Version:        0.6.7
 Release:        1
 Summary: 	A script to handle icon names in desktop icon themes
 
@@ -13,7 +13,7 @@
 BuildRequires:  perl-XML-Simple
 Requires:       perl-XML-Simple
 
-Patch0:		icon-naming-utils-0.6.5-paths.patch
+Patch0:		icon-naming-utils-0.6.7-paths.patch
 
 %description
 A script for creating a symlink mapping for deprecated icon names to
@@ -47,5 +47,8 @@
 %{_datadir}/pkgconfig/icon-naming-utils.pc
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.7-1
+- Update to 0.6.7
+
 * Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.6.5-1
 - Initial import


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/icon-naming-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 19:02:20 -0000	1.1
+++ sources	7 Feb 2006 04:17:04 -0000	1.2
@@ -1 +1 @@
-d3a82e7a8a096ca25dfdce3221fe5714  icon-naming-utils-0.6.5.tar.gz
+46443ee6ac3ee85b1a72b2abc55a770a  icon-naming-utils-0.6.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb  7 04:21:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 6 Feb 2006 23:21:42 -0500
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.22,
	1.23 gnome-icon-theme.spec, 1.34, 1.35 sources, 1.22, 1.23
Message-ID: <200602070421.k174LgBO009599@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9531

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.13.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Jan 2006 04:21:08 -0000	1.22
+++ .cvsignore	7 Feb 2006 04:21:40 -0000	1.23
@@ -13,3 +13,4 @@
 gnome-icon-theme-2.13.4.tar.bz2
 gnome-icon-theme-2.13.5.tar.bz2
 gnome-icon-theme-2.13.5.1.tar.bz2
+gnome-icon-theme-2.13.7.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-icon-theme.spec	23 Jan 2006 21:31:15 -0000	1.34
+++ gnome-icon-theme.spec	7 Feb 2006 04:21:40 -0000	1.35
@@ -1,15 +1,14 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.13.5.1
-Release: 2
+Version: 2.13.7
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 Source1: external-icons-2.10.1-2.tar.gz
-Patch0: gnome-icon-theme-2.13.5.1-missing-comma.patch
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: icon-naming-utils
+BuildRequires: icon-naming-utils >= 0.6.7
 Requires: hicolor-icon-theme
 Prereq: gtk2 >= 2.6.2
 
@@ -18,7 +17,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .missing-comma
 
 %build
 %configure --disable-hicolor-check
@@ -93,6 +91,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-1
+- Update to 2.13.7
+
 * Mon Jan 23 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5.1-2
 - Fix a typo in index.theme
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	18 Jan 2006 04:21:08 -0000	1.22
+++ sources	7 Feb 2006 04:21:40 -0000	1.23
@@ -1,2 +1,2 @@
 e6c3328995f2ce73ee91d1a654198f3f  external-icons-2.10.1-2.tar.gz
-2cf2407a9c964a84129853a133d38086  gnome-icon-theme-2.13.5.1.tar.bz2
+65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 05:07:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 00:07:40 -0500
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.37,1.38
Message-ID: <200602070507.k1757eIe030376@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30347

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Feb  6 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.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xorg-x11-server.spec	6 Feb 2006 22:51:10 -0000	1.37
+++ xorg-x11-server.spec	7 Feb 2006 05:07:36 -0000	1.38
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   3
+Release:   4
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -347,6 +347,7 @@
     fi
 #  done
   popd
+} &> /dev/null || :
 
 # ----- Xorg --------------------------------------------------------
 
@@ -494,6 +495,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Feb  6 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
 - Added xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch with changes
   suggested by ajax to fix (fdo#4320).



From fedora-cvs-commits at redhat.com  Tue Feb  7 05:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 00:16:15 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.91, 1.92 initscripts.spec,
	1.104, 1.105 sources, 1.99, 1.100
Message-ID: <200602070516.k175GFBl031880@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31836

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	2 Feb 2006 22:00:35 -0000	1.91
+++ .cvsignore	7 Feb 2006 05:16:10 -0000	1.92
@@ -1 +1 @@
-initscripts-8.25.tar.bz2
+initscripts-8.26.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- initscripts.spec	2 Feb 2006 22:00:45 -0000	1.104
+++ initscripts.spec	7 Feb 2006 05:16:10 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.25
+Version: 8.26
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,15 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> 8.26-1
+- revert "rc.sysinit: don't mount usbfs, libusb no longer uses it" change
+- add some ugly hacks to make sure net hotplug doesn't run after unclean
+  shutdown (#177795)
+- don't mount /sys and /proc in rc.sysinit - the initrd already does
+  (<pjones at redhat.com>)
+- halt: try to unmount tmpfs filesystems before swapoff (#174000,
+  <mitr at redhat.com>)
+
 * Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 8.25-1
 - ifup: don't run the arping check if the address is already on the device
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	2 Feb 2006 22:00:45 -0000	1.99
+++ sources	7 Feb 2006 05:16:10 -0000	1.100
@@ -1 +1 @@
-a862433b57df1b86d257d1a1d364c11d  initscripts-8.25.tar.bz2
+5b24e91873235fd81f89ca69b1098a9e  initscripts-8.26.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 06:39:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 01:39:35 -0500
Subject: rpms/zsh/devel zsh.spec,1.23,1.24
Message-ID: <200602070639.k176dZPe025412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25399

Modified Files:
	zsh.spec 
Log Message:
bump for gcc; testing bumpscript


Index: zsh.spec
===================================================================
RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- zsh.spec	4 Jan 2006 18:32:09 -0000	1.23
+++ zsh.spec	7 Feb 2006 06:39:33 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.5
-Release: 1.2
+Release: 1.2.1
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -140,6 +140,9 @@
 %doc Doc/zsh/*.html
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - %{version}-%{release}
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan  4 2006 Jesse Keating <jkeating at redhat.com> 0 4.2.5-1.2
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:14:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:14:28 -0500
Subject: rpms/kdebase/FC-4 kdebase-3.5.1-keyboardlayout.patch, NONE,
	1.1 kdebase.spec, 1.115, 1.116
Message-ID: <200602071014.k17AESra022336@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-keyboardlayout.patch 
Log Message:
apply patch to fix broken xx_XX layouts in kxkb


kdebase-3.5.1-keyboardlayout.patch:
 rules.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.1-keyboardlayout.patch ---
--- kdebase-3.5.1/kxkb/rules.cpp.orig	2006-02-03 11:14:24.000000000 +0100
+++ kdebase-3.5.1/kxkb/rules.cpp	2006-02-03 11:05:24.000000000 +0100
@@ -300,7 +300,7 @@
  */
 const QString KeyRules::getLayout(const QString &layvar) const
 {
-  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
+  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
   QString varLine = layvar.stripWhiteSpace();
   QRegExp rx(LAYOUT_PATTERN);
   int pos = rx.search(varLine, 0);
@@ -318,7 +318,7 @@
  */
 const QString KeyRules::getVariant(const QString &layvar) const
 {
-  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
+  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
   QString varLine = layvar.stripWhiteSpace();
   QRegExp rx(VARIANT_PATTERN);
   int pos = rx.search(varLine, 0);


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kdebase.spec	28 Jan 2006 09:41:17 -0000	1.115
+++ kdebase.spec	7 Feb 2006 10:14:25 -0000	1.116
@@ -21,7 +21,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 0.1.fc4
+Release: 0.2.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -51,6 +51,9 @@
 Patch92: kdebase-3.4.0-xdg.patch
 Patch93: kdebase-3.4.1-pam.patch
 
+# upstream patches
+Patch100: kdebase-3.5.1-keyboardlayout.patch
+
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -128,6 +131,9 @@
 %patch92 -p1 -b .xdg
 %patch93 -p1 -b .loginuid
 
+# upstream patches
+%patch100 -p1 -b .keyboardlayout
+
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
    perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -402,6 +408,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
+- apply patch to fix broken xx_XX layouts in kxkb
+
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:49:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:49:16 -0500
Subject: rpms/a2ps/devel a2ps.spec,1.28,1.29
Message-ID: <200602071049.k17AnG5U014629@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14616/devel

Modified Files:
	a2ps.spec 
Log Message:
bump for new gcc/glibc


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- a2ps.spec	9 Dec 2005 22:39:31 -0000	1.28
+++ a2ps.spec	7 Feb 2006 10:49:14 -0000	1.29
@@ -1,10 +1,10 @@
 %define	ver	4.13b
-%define rel 48.1
+%define rel 48.2
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: %{ver}
-Release: %{rel}.1
+Release: %{rel}.2
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -226,6 +226,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:49:20 -0500
Subject: rpms/acl/devel acl.spec,1.23,1.24
Message-ID: <200602071049.k17AnK6f014651@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14638/devel

Modified Files:
	acl.spec 
Log Message:
bump for new gcc/glibc


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- acl.spec	3 Feb 2006 12:01:17 -0000	1.23
+++ acl.spec	7 Feb 2006 10:49:17 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Access control list utilities.
 Name: acl
 Version: 2.2.34
-Release: 1
+Release: 1.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl-%{version}.src.tar.gz
@@ -97,6 +97,9 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.34-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Thomas Woerner <twoerner at redhat.com> 2.2.34-1
 - new version 2.2.34
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:51:50 -0500
Subject: rpms/acpid/devel acpid.spec,1.9,1.10
Message-ID: <200602071051.k17ApoqV014843@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/acpid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14829

Modified Files:
	acpid.spec 
Log Message:
bump for new gcc/glibc


Index: acpid.spec
===================================================================
RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- acpid.spec	9 Dec 2005 22:39:32 -0000	1.9
+++ acpid.spec	7 Feb 2006 10:51:48 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -85,6 +85,9 @@
 fi
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:51:57 -0500
Subject: rpms/adjtimex/devel adjtimex.spec,1.16,1.17
Message-ID: <200602071051.k17ApvYO014898@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/adjtimex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14884

Modified Files:
	adjtimex.spec 
Log Message:
bump for new gcc/glibc


Index: adjtimex.spec
===================================================================
RCS file: /cvs/dist/rpms/adjtimex/devel/adjtimex.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- adjtimex.spec	9 Dec 2005 22:39:32 -0000	1.16
+++ adjtimex.spec	7 Feb 2006 10:51:55 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A utility for adjusting kernel time variables.
 Name: adjtimex
 Version: 1.20
-Release: 1.1
+Release: 1.2
 ExclusiveOS: Linux
 License: distributable
 Group: System Environment/Base
@@ -43,6 +43,9 @@
 %{_mandir}/man8/adjtimex.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.20-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:05 -0500
Subject: rpms/agg/devel agg.spec,1.4,1.5
Message-ID: <200602071052.k17Aq5im014952@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14939

Modified Files:
	agg.spec 
Log Message:
bump for new gcc/glibc


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- agg.spec	13 Dec 2005 12:06:08 -0000	1.4
+++ agg.spec	7 Feb 2006 10:52:03 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.3
-Release: 1
+Release: 1.1
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
@@ -56,5 +56,8 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Nov 23 2005 Caolan McNamara <caolanm at redhat.com> 2.3-1
 - initial import



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:08 -0500
Subject: rpms/alchemist/devel alchemist.spec,1.17,1.18
Message-ID: <200602071052.k17Aq8x3015004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/alchemist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14991

Modified Files:
	alchemist.spec 
Log Message:
bump for new gcc/glibc


Index: alchemist.spec
===================================================================
RCS file: /cvs/dist/rpms/alchemist/devel/alchemist.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- alchemist.spec	9 Dec 2005 22:39:33 -0000	1.17
+++ alchemist.spec	7 Feb 2006 10:52:06 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A multi-sourced configuration back-end.
 Name: alchemist
 Version: 1.0.36
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %doc src/doc/html
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.36-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:16 -0500
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.41,1.42
Message-ID: <200602071052.k17AqGgF015062@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-lib.spec 
Log Message:
bump for new gcc/glibc


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- alsa-lib.spec	3 Feb 2006 12:50:35 -0000	1.41
+++ alsa-lib.spec	7 Feb 2006 10:52:14 -0000	1.42
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3.rc2
+Release: 3.rc2.1
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -149,6 +149,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 3 2006 Martin Stransky <stransky at redhat.com> 1.0.11-3.rc2
 - fix for #179446 - don't remove old SHM memory/keys during login
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:24 -0500
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.30,1.31
Message-ID: <200602071052.k17AqOKq015118@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-utils.spec 
Log Message:
bump for new gcc/glibc


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- alsa-utils.spec	25 Jan 2006 09:53:26 -0000	1.30
+++ alsa-utils.spec	7 Feb 2006 10:52:22 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	2.rc2
+Release: 	2.rc2.1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -69,6 +69,9 @@
 /usr/share/locale/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-2.rc2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Martin Stransky <stransky at redhat.com> 1.0.11-2.rc2
 - added volume option to alsaunmute utility (for s-c-s)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:28 -0500
Subject: rpms/hplip/devel hplip-0.9.8-3.patch, NONE, 1.1 hplip.spec, 1.44,
	1.45 hplip-0.9.8-2.patch, 1.1, NONE
Message-ID: <200602071052.k17AqSsp015172@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15104

Modified Files:
	hplip.spec 
Added Files:
	hplip-0.9.8-3.patch 
Removed Files:
	hplip-0.9.8-2.patch 
Log Message:
* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-3
- Patchlevel 3.


hplip-0.9.8-3.patch:
 ChangeLog                    |   13 ++
 Makefile.am                  |   13 +-
 base/device.py               |  248 +++++++++++++++++++++----------------------
 base/status.py               |  113 +++++++++----------
 data/xml/HPLIP-02-2006.xml   |   83 --------------
 hplip_readme.html            |   15 --
 prnt/hpijs/Makefile.am       |    4 
 prnt/hpijs/hpijs_readme.html |    3 
 8 files changed, 206 insertions(+), 286 deletions(-)

--- NEW FILE hplip-0.9.8-3.patch ---
diff -uNr hplip-0.9.8.old/base/device.py hplip-0.9.8.new/base/device.py
--- hplip-0.9.8.old/base/device.py	2006-01-27 14:14:45.000000000 -0800
+++ hplip-0.9.8.new/base/device.py	2006-02-06 13:49:33.000000000 -0800
@@ -438,8 +438,6 @@
         self.panel_check = True
         self.io_state = IO_STATE_HP_READY
         self.is_local = isLocal(self.bus)
-        self.dev_file = ''
-        self.serial = ''
 
         self.supported = False
 
@@ -829,11 +827,12 @@
                 log.error("Error getting 3-bit status.")
                 raise Error(ERROR_DEVICE_IO_ERROR)
 
-            try:
-                self.getDeviceID()
-            except Error, e:
-                log.error("Error getting device ID.")
-                raise Error(ERROR_DEVICE_IO_ERROR)
+            if self.tech_type in (TECH_TYPE_MONO_INK, TECH_TYPE_COLOR_INK):
+                try:
+                    self.getDeviceID()
+                except Error, e:
+                    log.error("Error getting device ID.")
+                    raise Error(ERROR_DEVICE_IO_ERROR)
 
             try:
                 self.getDevFile()
@@ -868,102 +867,101 @@
 
             status_block = {}
 
+            if status_type == STATUS_TYPE_NONE:
+                log.warn("No status available for device.")
+                status_block = {'status-code' : STATUS_PRINTER_IDLE}
+
+            elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
+                log.debug("Type 1/2 (S: or VSTATUS:) status")
+                status_block = status.parseStatus(self.deviceID)
+
+            elif status_type == STATUS_TYPE_LJ:
+                log.debug("Type 3 LaserJet status")
+                status_block = status.StatusType3(self, self.deviceID)
+
+            elif status_type == STATUS_TYPE_S_W_BATTERY:
+                log.debug("Type 4 S: status with battery check")
+                status_block = status.parseStatus(self.deviceID)
+                status.BatteryCheck(self, status_block)
+
+            else:
+                log.error("Unimplemented status type: %d" % status_type)
+
+            if status_block:
+                log.debug(status_block)
+                self.dq.update(status_block)
+                try:
+                    status_block['agents']
+                except KeyError:
+                    pass
+                else:
+                    agents = status_block['agents']
+                    del self.dq['agents']
+
+            
+            status_code = self.dq.get('status-code', STATUS_UNKNOWN)
+            
+            if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
+                tx_active, rx_active = status.getFaxStatus(self)
+                
+                if tx_active:
+                    status_code = STATUS_FAX_TX_ACTIVE
+                elif rx_active:
+                    status_code = STATUS_FAX_RX_ACTIVE
+                    
+    
             try:
-                if status_type == STATUS_TYPE_NONE:
-                    log.warn("No status available for device.")
-                    status_block = {'status-code' : STATUS_PRINTER_IDLE}
-    
-                elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
-                    log.debug("Type 1/2 (S: or VSTATUS:) status")
-                    status_block = status.parseStatus(self.deviceID)
-    
-                elif status_type == STATUS_TYPE_LJ:
-                    log.debug("Type 3 LaserJet status")
-                    status_block = status.StatusType3(self, self.deviceID)
-    
-                elif status_type == STATUS_TYPE_S_W_BATTERY:
-                    log.debug("Type 4 S: status with battery check")
-                    status_block = status.parseStatus(self.deviceID)
-                    status.BatteryCheck(self, status_block)
+                self.dq.update({'status-desc' : self.queryString(status_code),
+                                'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
+                                })
+
+            except (KeyError, Error):
+                self.dq.update({'status-desc' : '',
+                                'error-state' : ERROR_STATE_CLEAR,
+                                })
     
-                else:
-                    log.error("Unimplemented status type: %d" % status_type)
+            self.sendEvent(status_code)
+
+            if not quick:
+                r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
     
-                if status_block:
-                    log.debug(status_block)
-                    self.dq.update(status_block)
-                    try:
-                        status_block['agents']
-                    except KeyError:
-                        pass
-                    else:
-                        agents = status_block['agents']
-                        del self.dq['agents']
+                if status_type != STATUS_TYPE_NONE:
     
-                
-                status_code = self.dq.get('status-code', STATUS_UNKNOWN)
-                
-                if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
-                    tx_active, rx_active = status.getFaxStatus(self)
-                    
-                    if tx_active:
-                        status_code = STATUS_FAX_TX_ACTIVE
-                    elif rx_active:
-                        status_code = STATUS_FAX_RX_ACTIVE
-                        
-        
-                try:
-                    self.dq.update({'status-desc' : self.queryString(status_code),
-                                    'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
-                                    })
-    
-                except (KeyError, Error):
-                    self.dq.update({'status-desc' : '',
-                                    'error-state' : ERROR_STATE_CLEAR,
-                                    })
-        
-                self.sendEvent(status_code)
+                    if self.panel_check:
+                        self.panel_check = bool(self.mq.get('panel-check-type', 0))
     
-                if not quick:
-                    r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
-        
-                    if status_type != STATUS_TYPE_NONE:
-        
-                        if self.panel_check:
-                            self.panel_check = bool(self.mq.get('panel-check-type', 0))
-        
-                        if self.panel_check and status_type != STATUS_TYPE_NONE:
-                            #try:
+                    if self.panel_check and status_type != STATUS_TYPE_NONE:
+                        try:
                             self.panel_check, line1, line2 = status.PanelCheck(self)
-                            #finally:
-                            #    self.closePML()
-        
-                            self.dq.update({'panel': int(self.panel_check),
-                                              'panel-line1': line1,
-                                              'panel-line2': line2,})
-        
-        
-                        if r_type > 0:
+                        finally:
+                            self.closePML()
+    
+                        self.dq.update({'panel': int(self.panel_check),
+                                          'panel-line1': line1,
+                                          'panel-line2': line2,})
+    
+    
+                    if r_type > 0:
+                        if self.r_values is None:
+                            fields, data, result_code = \
+                                self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
+                            
+                            if result_code == ERROR_SUCCESS and data:
+                                try:
+                                    r_value = int(data.strip())
+                                except:
+                                    pass
+                                else:
+                                    log.debug("r_value=%d" % r_value)
+                                    r_value_str = str(r_value)
+                                    r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                    rg, rr = r_value_str[:3], r_value_str[3:]
+                                    r_value = int(rr)
+                                    self.r_values = r_value, r_value_str, rg, rr
+                                    
                             if self.r_values is None:
-                                fields, data, result_code = \
-                                    self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
-                                
-                                if result_code == ERROR_SUCCESS and data:
+                                if status_type ==  STATUS_TYPE_S and self.is_local:
                                     try:
-                                        r_value = int(data.strip())
-                                    except:
-                                        pass
-                                    else:
-                                        log.debug("r_value=%d" % r_value)
-                                        r_value_str = str(r_value)
-                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                        rg, rr = r_value_str[:3], r_value_str[3:]
-                                        r_value = int(rr)
-                                        self.r_values = r_value, r_value_str, rg, rr
-                                        
-                                if self.r_values is None:
-                                    if status_type ==  STATUS_TYPE_S:
-                                        #try:
                                         try:
                                             r_value = self.getDynamicCounter(140)
             
@@ -984,42 +982,40 @@
                                         except Error:
                                             log.error("Error attempting to read r-value (1).")
                                             r_value = 0
-                
-                                        #finally:
-                                        #    self.closePrint()
-                                    
-                                    elif status_type == STATUS_TYPE_S_SNMP:
+            
+                                    finally:
+                                        self.closePrint()
+                                
+                                elif status_type == STATUS_TYPE_S_SNMP:
+                                    try:
                                         result_code, r_value = self.getPML(pml.OID_R_SETTING)
-                                        #self.closePML()
+                                    finally:
+                                        self.closePML()
+                                    
+                                    if r_value is not None:
+                                        log.debug("r_value=%d" % r_value)
+                                        r_value_str = str(r_value)
+                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                        rg, rr = r_value_str[:3], r_value_str[3:]
+                                        r_value = int(rr)
+                                        self.r_values = r_value, r_value_str, rg, rr
                                         
-                                        if r_value is not None:
-                                            log.debug("r_value=%d" % r_value)
-                                            r_value_str = str(r_value)
-                                            r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                            rg, rr = r_value_str[:3], r_value_str[3:]
-                                            r_value = int(rr)
-                                            self.r_values = r_value, r_value_str, rg, rr
-                                            
-                                            fields, data, result_code = \
-                                                self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
-                                        else:
-                                            r_value = 0
-                                            
+                                        fields, data, result_code = \
+                                            self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
+                                    else:
+                                        r_value = 0
                                         
-                            else:
-                                r_value, r_value_str, rg, rr = self.r_values
-        
-                    self.dq.update({'r'  : r_value,
-                                    'rs' : r_value_str,
-                                    'rg' : rg,
-                                    'rr' : rr,
-                                  })
-            finally:
-                self.closePML()
-                self.closePrint()
+                                    
+                        else:
+                            r_value, r_value_str, rg, rr = self.r_values
+    
+                self.dq.update({'r'  : r_value,
+                                'rs' : r_value_str,
+                                'rg' : rg,
+                                'rr' : rr,
+                              })
             
             if not quick:
-                
                 a = 1
                 while True:
                     mq_agent_kind = self.mq.get('r%d-agent%d-kind' % (r_value, a), 0)
diff -uNr hplip-0.9.8.old/base/status.py hplip-0.9.8.new/base/status.py
--- hplip-0.9.8.old/base/status.py	2006-01-24 10:35:53.000000000 -0800
+++ hplip-0.9.8.new/base/status.py	2006-02-06 13:49:35.000000000 -0800
@@ -668,64 +668,64 @@
     # Assumes dev is already open (i.e., dev.io_state==IO_STATE_HP_OPEN)
     try_dynamic_counters = False
     try:
-        #channel = dev.openChannel( 'HP-MESSAGE' )
-        dev.openPML()
-    except Error:
-        log.error("PML channel open failed.")
-        try_dynamic_counters = True
-    else:
-        result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
-        result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
-
-        if battery_level is not None and \
-            power_mode is not None:
-
-            if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
-                battery_level >= 0:
-
-                for x in BATTERY_PML_TRIGGER_MAP:
-                    if x[0] >= battery_level > x[1]:
-                        battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
-                        break
-
-                if power_mode & pml.POWER_MODE_CHARGING:
-                    agent_health = AGENT_HEALTH_CHARGING
-
-                elif power_mode & pml.POWER_MODE_DISCHARGING:
-                    agent_health = AGENT_HEALTH_DISCHARGING
-
+        try:
+            dev.openPML()
+        except Error:
+            log.error("PML channel open failed.")
+            try_dynamic_counters = True
+        else:
+            result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
+            result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
+    
+            if battery_level is not None and \
+                power_mode is not None:
+    
+                if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
+                    battery_level >= 0:
+    
+                    for x in BATTERY_PML_TRIGGER_MAP:
+                        if x[0] >= battery_level > x[1]:
+                            battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
+                            break
+    
+                    if power_mode & pml.POWER_MODE_CHARGING:
+                        agent_health = AGENT_HEALTH_CHARGING
+    
+                    elif power_mode & pml.POWER_MODE_DISCHARGING:
+                        agent_health = AGENT_HEALTH_DISCHARGING
+    
+                    else:
+                        agent_health = AGENT_HEALTH_OK
+    
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : agent_health,
+                                                    'level'  : battery_level,
+                                                    'level-trigger' : battery_trigger_level,
+                                                    })
                 else:
-                    agent_health = AGENT_HEALTH_OK
-
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : agent_health,
-                                                'level'  : battery_level,
-                                                'level-trigger' : battery_trigger_level,
-                                                })
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : AGENT_HEALTH_UNKNOWN,
+                                                    'level'  : 0,
+                                                    'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
+                                                    })
+    
             else:
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : AGENT_HEALTH_UNKNOWN,
-                                                'level'  : 0,
-                                                'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
-                                                })
-
-        else:
-            try_dynamic_counters = True
-
-        #dev.closeChannel( 'HP-MESSAGE' )
-        #dev.closePML()
-
-        if try_dynamic_counters:
+                try_dynamic_counters = True
+    
+    finally:
+        dev.closePML()
 
+    if try_dynamic_counters:
+        try:
             try:
                 battery_health = dev.getDynamicCounter(200)
                 battery_trigger_level = dev.getDynamicCounter(201)
                 battery_level = dev.getDynamicCounter(202)
-
+    
                 status_block['agents'].append({
                                                 'kind'   : AGENT_KIND_INT_BATTERY,
                                                 'type'   : AGENT_TYPE_UNSPECIFIED,
@@ -741,7 +741,8 @@
                                                 'level'  : 0,
                                                 'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
                                                 })
-
+        finally:
+            dev.closePrint()
 
 # this works for 2 pen products that allow 1 or 2 pens inserted
 # from: k, kcm, cmy, ggk
@@ -785,8 +786,8 @@
             
 def getFaxStatus(dev):
     tx_active, rx_active = False, False
-    #try:
-    if 1:
+
+    try:
         dev.openPML()
     
         result_code, tx_state = dev.getPML(pml.OID_FAXJOB_TX_STATUS)
@@ -801,7 +802,7 @@
             if rx_state not in (pml.FAXJOB_RX_STATUS_IDLE, pml.FAXJOB_RX_STATUS_DONE):
                 rx_active = True
     
-    #finally:
-    #    dev.closePML()
+    finally:
+        dev.closePML()
         
     return tx_active, rx_active
diff -uNr hplip-0.9.8.old/ChangeLog hplip-0.9.8.new/ChangeLog
--- hplip-0.9.8.old/ChangeLog	2006-01-31 12:00:08.000000000 -0800
+++ hplip-0.9.8.new/ChangeLog	2006-02-06 13:54:33.000000000 -0800
@@ -1,3 +1,16 @@
+2006-02-06 dsuffield
+    * Created hplip-0.9.8-3.patch
+	
+2006-02-06 syie
+    * Remove Jedi from models.xml
+
+2006-02-06 dwelch
+    * Fixed defect 832 (An r-value (1) error occurs while launching toolbox.) [aka, the RAW mode defect as reported by Henrique de Moraes Holschuh (Debian)]
+
+2006-02-06 dsuffield
+    * Applied hplip-0.9.8-2.patch.
+    * Removed Jedi for readme files.
+
 2006-01-30 dsuffield
     * Release 0.9.8.22 (public release 0.9.8)
 	
diff -uNr hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml
--- hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml	2006-01-31 11:57:04.000000000 -0800
+++ hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml	2006-02-06 13:07:03.000000000 -0800
@@ -24,7 +24,7 @@
 This file automatically generated by model_editor.py.
 Please do not hand edit this file.
 
-Last written on Tue, 31 Jan 2006 12:02:06 by syie
+Last written on Mon, 06 Feb 2006 13:07:03 by dsuffiel
 using model_editor version 6.2.
 -->
 
@@ -168,87 +168,6 @@
     <r type="1"/>
 </model>
 
-<model name="HP_Color_LaserJet_2605">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dtn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
 <model name="HP_LaserJet_3050">
     <id></id>
     <icon>hp_LaserJet_3015.png</icon>
diff -uNr hplip-0.9.8.old/hplip_readme.html hplip-0.9.8.new/hplip_readme.html
--- hplip-0.9.8.old/hplip_readme.html	2006-01-31 12:02:53.000000000 -0800
+++ hplip-0.9.8.new/hplip_readme.html	2006-02-06 13:57:14.000000000 -0800
@@ -890,18 +890,6 @@
 <td class=xl19 width=144 style='width:108pt'><b>Services/Status</b></td>
 </tr>
 <tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dtn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
 <td height=17 style='height:12.75pt'>Color_LaserJet_3000</td>
 <td>No</td><td>Yes</td><td>Yes</td><td>LJColor</td>
 <td>No</td><td>No</td><td>No</td>
@@ -1793,7 +1781,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -2563,7 +2550,7 @@
 &#169 2004-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPLIP 0.9.8, last updated January 27, 2006
+HPLIP 0.9.8, last updated February 6, 2006
 </font>
 </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am	2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -20,8 +20,10 @@
 dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
     sendfax.py setup.py
 
-# hp backend.
 cupsdir = $(CUPS_BACKEND_PATH)
+cupsppddir = $(CUPS_PPD_PATH)
+
+# hp backend.
 cups_PROGRAMS = hp
 hp_SOURCES = backend/hp/hp.c 
 hp_LDADD = libhplip-api.la
@@ -232,7 +234,7 @@
 #
 #       Edit hpiod.conf in destdir.
 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(CUPS_PPD_PATH)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(cupsppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
 #
 #       Edit hpiod.sh in destdir.
 	sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
@@ -260,12 +262,15 @@
 	   cp -f data/xml/unreleased/*.xml $(DESTDIR)$(hplipdir)/data/xml/; \
 	fi
 #
-#       Install fax support, let hpijs install ppd for now.
+#       Install fax support.
 	mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax 
 	if [ "$(rpm_install)" = "no" ]; then \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsdir); \
 	   $(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsppddir)/model; \
+	   $(INSTALL_SCRIPT) $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd $(DESTDIR)$(cupsppddir)/model; \
+	   gzip -f $(DESTDIR)$(cupsppddir)/model/HP-Fax-hplip.ppd; \
 	fi
-	cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
 
 #
 # Add prerequisites for testing (or building?) "make install DESTDIR=/build".
diff -uNr hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html
--- hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html	2006-01-27 16:19:10.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html	2006-02-06 13:45:38.000000000 -0800
@@ -3279,7 +3279,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -4141,7 +4140,7 @@
 &#169 2001-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPIJS 2.1.8, last updated January 27, 2006
+HPIJS 2.1.8, last updated February 6, 2006
 </font>
  </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/prnt/hpijs/Makefile.am hplip-0.9.8.new/prnt/hpijs/Makefile.am
--- hplip-0.9.8.old/prnt/hpijs/Makefile.am	2006-01-24 12:19:06.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -80,8 +80,8 @@
 	rm -f $(DESTDIR)$(ppddir)/hp*.ppd*
 
 install-cups:
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
 	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
 	$(mkinstalldirs) $(DESTDIR)$(CUPS_PPD_PATH)
 	ln -s $(datadir)/ppd $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hplip.spec	3 Feb 2006 10:46:13 -0000	1.44
+++ hplip.spec	7 Feb 2006 10:52:25 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.8
-Release: 2
+Release: 3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -11,7 +11,7 @@
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-0.9.8-2.patch
+Patch4: hplip-0.9.8-3.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -65,7 +65,7 @@
 %patch3 -p1 -b .config
 
 # Apply patch 0.9.8-2
-%patch4 -p1 -b .0.9.8-2
+%patch4 -p1 -b .0.9.8-3
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -156,6 +156,9 @@
 fi
 
 %changelog
+* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-3
+- Patchlevel 3.
+
 * Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-2
 - Patchlevel 2.
 


--- hplip-0.9.8-2.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:32 -0500
Subject: rpms/amanda/devel amanda.spec,1.26,1.27
Message-ID: <200602071052.k17AqWsL015229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15186

Modified Files:
	amanda.spec 
Log Message:
bump for new gcc/glibc


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amanda.spec	18 Jan 2006 19:08:08 -0000	1.26
+++ amanda.spec	7 Feb 2006 10:52:30 -0000	1.27
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.4.5p1
-Release: 3
+Release: 3.1
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -322,6 +322,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5p1-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Jay Fenlason <fenlason at redhat.com> 2.4.5p1-3
 - Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib
 - Add amanda_user and amanda_group defines, to make changing the username



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:40 -0500
Subject: rpms/amtu/devel amtu.spec,1.11,1.12
Message-ID: <200602071052.k17AqeT4015285@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amtu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15271

Modified Files:
	amtu.spec 
Log Message:
bump for new gcc/glibc


Index: amtu.spec
===================================================================
RCS file: /cvs/dist/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amtu.spec	3 Jan 2006 20:16:01 -0000	1.11
+++ amtu.spec	7 Feb 2006 10:52:38 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.4
-Release: 2
+Release: 2.1
 License: Common Public License
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -60,6 +60,9 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1.0.4-2
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:52:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:52:52 -0500
Subject: rpms/am-utils/devel am-utils.spec,1.32,1.33
Message-ID: <200602071052.k17AqqAR015341@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	am-utils.spec 
Log Message:
bump for new gcc/glibc


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- am-utils.spec	9 Dec 2005 22:39:33 -0000	1.32
+++ am-utils.spec	7 Feb 2006 10:52:50 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.3
-Release: 1.1
+Release: 1.2
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -132,6 +132,9 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:01 -0500
Subject: rpms/ant/devel ant.spec,1.68,1.69
Message-ID: <200602071053.k17Ar1gS015402@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ant.spec 
Log Message:
bump for new gcc/glibc


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ant.spec	2 Feb 2006 05:35:00 -0000	1.68
+++ ant.spec	7 Feb 2006 10:52:58 -0000	1.69
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_4fc
+Release: 	%{jpprelease}_5fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -751,6 +751,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Archit Shah <ashah at redhat.com> - 0:1.6.5-1jpp_4fc
 - build ant without using native code
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:04 -0500
Subject: rpms/mesa/devel mesa.spec, 1.38, 1.39 redhat-mesa-driver-install,
	1.3, 1.4
Message-ID: <200602071053.k17Ar43T015458@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15411

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Log Message:
Update redhat-mesa-driver-install to include experimental r300 driver on x86/x86_64/ppc for bug (#179712)


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mesa.spec	4 Feb 2006 13:22:10 -0000	1.38
+++ mesa.spec	7 Feb 2006 10:53:01 -0000	1.39
@@ -53,21 +53,28 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Source0: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
-Source1: redhat-mesa-target
-Source2: redhat-mesa-driver-install
-Source3: redhat-mesa-source-filelist-generator
+# 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.
+# It would be in it's own separate package if there was a way of sanely building
+# it outside of Mesa.
+Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
+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
 Patch3: mesa-modular-dri-dir.patch
 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
 #Patch4: mesa-6.4.1-enable-osmesa.patch
 
 # General patches from upstream go here:
@@ -205,13 +212,21 @@
 The mesa-source package provides the minimal source code needed to
 build DRI enabled X servers, etc.
 
+#-- glx-utils --------------------------------------------------------
+%package -n glx-utils
+Summary: GLX utilities
+Group: Development/Libraries
+
+%description -n glx-utils
+The glx-utils package provides the glxinfo and glxgears utilities.
+
 #-- prep -------------------------------------------------------------
 %prep
-%setup -q -n Mesa-%{version}
+%setup -q -n Mesa-%{version} -b1
 # Copy Red Hat Mesa build/install simplificomplication scripts into build dir.
-install -m 755 %{SOURCE1} ./
-install -m 755 %{SOURCE2} ./
-install -m 755 %{SOURCE3} ./
+install -m 755 %{SOURCE10} ./
+install -m 755 %{SOURCE11} ./
+install -m 755 %{SOURCE12} ./
 
 #%patch0 -p0 -b .makedepend
 %patch1 -p0 -b .fix-installmesa
@@ -220,6 +235,8 @@
 %if %{with_motif}
 %patch4 -p0 -b .libGLw-enable-motif-support
 %endif
+%patch5 -p1 -b .dprintf-to-debugprintf-for-bug180122
+%patch6 -p0 -b .xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835
 
 # NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
 
@@ -245,7 +262,7 @@
 
 echo -e "********************\nMESATARGET=$MESATARGET\n********************\n"
 make ${MESATARGET} %{makeopts}
-
+make -C progs/xdemos glxgears glxinfo
 
 #-- Install ----------------------------------------------------------
 %install
@@ -266,6 +283,13 @@
 export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
 bin/installmesa $RPM_BUILD_ROOT/usr
 
+# Install glxgears/glxinfo
+{
+    mkdir -p $RPM_BUILD_ROOT%{_bindir}
+    install -m0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}/
+    install -m0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}/
+}
+
 %if %{with_dri}
 #pushd src/mesa/drivers/dri
 #    make install DESTDIR=$RPM_BUILD_ROOT/usr %{makeopts}
@@ -401,7 +425,24 @@
 %files source -f mesa-source-rpm-filelist.lst
 %defattr(-,root,root,-)
 
+%files -n glx-utils
+%defattr(-,root,root,-)
+%{_bindir}/glxgears
+%{_bindir}/glxinfo
+
 %changelog
+* Tue Feb  7 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-2
+- Added new "glx-utils" subpackage with glxgears and glxinfo (#173510)
+- Added mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch to workaround
+  a Mesa namespace conflict with GNU_SOURCE (#180122)
+- Added mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch
+  as an attempt to fix bugs (#176976,176414,fdo#5835)
+- Enabled inclusion of the *EXPERIMENTAL UNSUPPORTED* r300 DRI driver on
+  x86, x86_64, and ppc architectures, however the 2D Radeon driver will soon
+  be modified to require the user to manually turn experimental DRI support
+  on with Option "dri" in xorg.conf to test it out and report all X bugs that
+  occur while using it directly to X.Org bugzilla.  (#179712)
+
 * Sat Feb  4 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-1
 - Updated to Mesa 6.4.2
 - Use "libGLU.so.1.3.0604*" glob in file manifest, to avoid having to update it


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- redhat-mesa-driver-install	20 Nov 2005 20:49:23 -0000	1.3
+++ redhat-mesa-driver-install	7 Feb 2006 10:53:01 -0000	1.4
@@ -40,9 +40,9 @@
 
 # Define per arch list of DRI drivers we wish to build and ship for DRI
 # enabled builds on particular platforms.
-DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
-DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
-DRI_DRIVERS_ppc="mga r128 r200 radeon"
+DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
+DRI_DRIVERS_ppc="mga r128 r200 r300 radeon"
 DRI_DRIVERS_ia64="i810 i830 i915 mga r128 r200 radeon"
 DRI_DRIVERS_alpha="mga r128 r200 radeon"
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:12 -0500
Subject: rpms/anthy/devel anthy.spec,1.16,1.17
Message-ID: <200602071053.k17ArC8H015484@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	anthy.spec 
Log Message:
bump for new gcc/glibc


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anthy.spec	9 Dec 2005 22:39:34 -0000	1.16
+++ anthy.spec	7 Feb 2006 10:53:10 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:		anthy
 Version:	%{version}
-Release: 2.1
+Release: 2.2
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -117,6 +117,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7100b-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:21 -0500
Subject: rpms/apmd/devel apmd.spec,1.22,1.23
Message-ID: <200602071053.k17ArLSa015545@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apmd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15531

Modified Files:
	apmd.spec 
Log Message:
bump for new gcc/glibc


Index: apmd.spec
===================================================================
RCS file: /cvs/dist/rpms/apmd/devel/apmd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apmd.spec	9 Dec 2005 22:39:34 -0000	1.22
+++ apmd.spec	7 Feb 2006 10:53:19 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops.
 Name: apmd
 Version: 3.2.2
-Release: 3.1
+Release: 3.2
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -95,6 +95,9 @@
 %config /etc/sysconfig/apm-scripts/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:30 -0500
Subject: rpms/apr/devel apr.spec,1.46,1.47
Message-ID: <200602071053.k17ArUD6015600@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15587

Modified Files:
	apr.spec 
Log Message:
bump for new gcc/glibc


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apr.spec	4 Jan 2006 16:50:43 -0000	1.46
+++ apr.spec	7 Feb 2006 10:53:28 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.2
-Release: 7
+Release: 7.1
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -127,6 +127,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan  4 2006 Joe Orton <jorton at redhat.com> 1.2.2-7
 - fix namespace pollution (r354824, r355464)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:38 -0500
Subject: rpms/apr-util/devel apr-util.spec,1.22,1.23
Message-ID: <200602071053.k17Arcbj015655@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15642

Modified Files:
	apr-util.spec 
Log Message:
bump for new gcc/glibc


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apr-util.spec	30 Jan 2006 16:33:10 -0000	1.22
+++ apr-util.spec	7 Feb 2006 10:53:36 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.2
-Release: 4
+Release: 4.1
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -101,6 +101,9 @@
 %doc --parents html
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Joe Orton <jorton at redhat.com> 1.2.2-4
 - rebuild to drop reference to libexpat.la
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:46 -0500
Subject: rpms/aqbanking/devel aqbanking.spec,1.10,1.11
Message-ID: <200602071053.k17Ark9M015711@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15698

Modified Files:
	aqbanking.spec 
Log Message:
bump for new gcc/glibc


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aqbanking.spec	23 Jan 2006 04:54:07 -0000	1.10
+++ aqbanking.spec	7 Feb 2006 10:53:44 -0000	1.11
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 1.8.1beta
-Release: 2
+Release: 2.1
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Source1: aqbanking-%{version}-gladesrc.tar.gz
 Group: System Environment/Libraries
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.1beta-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 22 2006 Bill Nottingham <notting at redhat.com> 1.8.1beta-2
 - add an obsolete (#178554)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:53:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:53:57 -0500
Subject: rpms/arptables_jf/devel arptables_jf.spec,1.9,1.10
Message-ID: <200602071053.k17ArvFo015768@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/arptables_jf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15755

Modified Files:
	arptables_jf.spec 
Log Message:
bump for new gcc/glibc


Index: arptables_jf.spec
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/arptables_jf.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- arptables_jf.spec	9 Dec 2005 22:39:35 -0000	1.9
+++ arptables_jf.spec	7 Feb 2006 10:53:55 -0000	1.10
@@ -4,7 +4,7 @@
 
 Epoch: 0
 Version: 0.0.8
-Release: 6.1
+Release: 6.2
 Source: %{name}-%{version}.tbz
 #Source1: Makefile
 #Source2: arptables.h
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:54:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:54:05 -0500
Subject: rpms/arts/devel arts.spec,1.54,1.55
Message-ID: <200602071054.k17As5Vi015844@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	arts.spec 
Log Message:
bump for new gcc/glibc


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- arts.spec	1 Feb 2006 10:31:17 -0000	1.54
+++ arts.spec	7 Feb 2006 10:54:03 -0000	1.55
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 1.5.1
-Release: 1
+Release: 1.1
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -172,6 +172,9 @@
 %{_bindir}/artsc-config
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 8:1.5.1-1
 - 1.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:54:14 -0500
Subject: rpms/aspell/devel aspell.spec,1.26,1.27
Message-ID: <200602071054.k17AsEbN015927@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15886

Modified Files:
	aspell.spec 
Log Message:
bump for new gcc/glibc


Index: aspell.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- aspell.spec	19 Dec 2005 12:28:35 -0000	1.26
+++ aspell.spec	7 Feb 2006 10:54:11 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A spelling checker.
 Name: aspell
 Version: 0.60.3
-Release: 3
+Release: 3.1
 Epoch: 12
 License: LGPL
 Group: Applications/Text
@@ -119,6 +119,9 @@
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 12:0.60.3-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Ivana Varekova <varekova at redhat.com> 12:0.60.3-3
 - fix for gcc 4.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:54:25 -0500
Subject: rpms/aspell-af/devel aspell-af.spec,1.5,1.6
Message-ID: <200602071054.k17AsPLk024006@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-af/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23972

Modified Files:
	aspell-af.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-af.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-af/devel/aspell-af.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-af.spec	9 Dec 2005 22:39:36 -0000	1.5
+++ aspell-af.spec	7 Feb 2006 10:54:23 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:54:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:54:37 -0500
Subject: rpms/aspell-bg/devel aspell-bg.spec,1.9,1.10
Message-ID: <200602071054.k17AsbqK024149@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-bg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24117

Modified Files:
	aspell-bg.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-bg.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-bg/devel/aspell-bg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aspell-bg.spec	9 Dec 2005 22:39:36 -0000	1.9
+++ aspell-bg.spec	7 Feb 2006 10:54:35 -0000	1.10
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.1
+Release: 11.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -46,6 +46,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:54:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:54:51 -0500
Subject: rpms/aspell-br/devel aspell-br.spec,1.5,1.6
Message-ID: <200602071054.k17AsprH024290@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-br/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24258

Modified Files:
	aspell-br.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-br.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-br/devel/aspell-br.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-br.spec	9 Dec 2005 22:39:36 -0000	1.5
+++ aspell-br.spec	7 Feb 2006 10:54:47 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:01 -0500
Subject: rpms/aspell-ca/devel aspell-ca.spec,1.15,1.16
Message-ID: <200602071055.k17At1HK024419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24389

Modified Files:
	aspell-ca.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-ca.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ca/devel/aspell-ca.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-ca.spec	9 Dec 2005 22:39:36 -0000	1.15
+++ aspell-ca.spec	7 Feb 2006 10:54:58 -0000	1.16
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:11 -0500
Subject: rpms/aspell-cs/devel aspell-cs.spec,1.6,1.7
Message-ID: <200602071055.k17AtBS1024554@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24529

Modified Files:
	aspell-cs.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-cs.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cs/devel/aspell-cs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-cs.spec	16 Dec 2005 23:19:50 -0000	1.6
+++ aspell-cs.spec	7 Feb 2006 10:55:09 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:22 -0500
Subject: rpms/aspell-cy/devel aspell-cy.spec,1.5,1.6
Message-ID: <200602071055.k17AtMto024694@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24664

Modified Files:
	aspell-cy.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-cy.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cy/devel/aspell-cy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-cy.spec	9 Dec 2005 22:39:37 -0000	1.5
+++ aspell-cy.spec	7 Feb 2006 10:55:20 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:33 -0500
Subject: rpms/aspell-da/devel aspell-da.spec,1.16,1.17
Message-ID: <200602071055.k17AtXLr024823@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-da/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24795

Modified Files:
	aspell-da.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-da.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-da/devel/aspell-da.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-da.spec	9 Dec 2005 22:39:37 -0000	1.16
+++ aspell-da.spec	7 Feb 2006 10:55:31 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:44 -0500
Subject: rpms/aspell-de/devel aspell-de.spec,1.14,1.15
Message-ID: <200602071055.k17Atihc024947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-de/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24917

Modified Files:
	aspell-de.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-de.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-de/devel/aspell-de.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aspell-de.spec	9 Dec 2005 22:39:37 -0000	1.14
+++ aspell-de.spec	7 Feb 2006 10:55:40 -0000	1.15
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.1
+Release: 11.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:55:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:55:58 -0500
Subject: rpms/aspell-el/devel aspell-el.spec,1.5,1.6
Message-ID: <200602071055.k17Atw5X025114@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25081

Modified Files:
	aspell-el.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-el.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-el/devel/aspell-el.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-el.spec	9 Dec 2005 22:39:37 -0000	1.5
+++ aspell-el.spec	7 Feb 2006 10:55:55 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:56:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:56:07 -0500
Subject: rpms/aspell-en/devel aspell-en.spec,1.8,1.9
Message-ID: <200602071056.k17Au7Bh025241@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-en/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25212

Modified Files:
	aspell-en.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-en.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-en/devel/aspell-en.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aspell-en.spec	9 Dec 2005 22:39:38 -0000	1.8
+++ aspell-en.spec	7 Feb 2006 10:56:05 -0000	1.9
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 6.0
-Release: 1.1
+Release: 1.2
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -46,6 +46,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:6.0-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:56:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:56:18 -0500
Subject: rpms/aspell-es/devel aspell-es.spec,1.18,1.19
Message-ID: <200602071056.k17AuI10025380@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-es/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25347

Modified Files:
	aspell-es.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-es.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aspell-es.spec	9 Dec 2005 22:39:38 -0000	1.18
+++ aspell-es.spec	7 Feb 2006 10:56:16 -0000	1.19
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 13.1
+Release: 13.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-13.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:56:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:56:29 -0500
Subject: rpms/aspell-fo/devel aspell-fo.spec,1.5,1.6
Message-ID: <200602071056.k17AuTJp025511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25482

Modified Files:
	aspell-fo.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-fo.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-fo.spec	9 Dec 2005 22:39:38 -0000	1.5
+++ aspell-fo.spec	7 Feb 2006 10:56:27 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:56:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:56:40 -0500
Subject: rpms/aspell-fr/devel aspell-fr.spec,1.12,1.13
Message-ID: <200602071056.k17Auenj025637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25606

Modified Files:
	aspell-fr.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fr/devel/aspell-fr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aspell-fr.spec	9 Dec 2005 22:39:38 -0000	1.12
+++ aspell-fr.spec	7 Feb 2006 10:56:37 -0000	1.13
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 9.1
+Release: 9.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:56:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:56:51 -0500
Subject: rpms/aspell-ga/devel aspell-ga.spec,1.5,1.6
Message-ID: <200602071056.k17Aupcf025768@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25739

Modified Files:
	aspell-ga.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-ga.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ga/devel/aspell-ga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-ga.spec	9 Dec 2005 22:39:38 -0000	1.5
+++ aspell-ga.spec	7 Feb 2006 10:56:48 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:57:02 -0500
Subject: rpms/aspell-gd/devel aspell-gd.spec,1.5,1.6
Message-ID: <200602071057.k17Av2MF025895@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25865

Modified Files:
	aspell-gd.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-gd.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gd/devel/aspell-gd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-gd.spec	9 Dec 2005 22:39:39 -0000	1.5
+++ aspell-gd.spec	7 Feb 2006 10:56:58 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:57:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:57:12 -0500
Subject: rpms/aspell-gl/devel aspell-gl.spec,1.5,1.6
Message-ID: <200602071057.k17AvCsO026032@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26001

Modified Files:
	aspell-gl.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-gl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gl/devel/aspell-gl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-gl.spec	9 Dec 2005 22:39:39 -0000	1.5
+++ aspell-gl.spec	7 Feb 2006 10:57:10 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:57:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:57:25 -0500
Subject: rpms/aspell-hr/devel aspell-hr.spec,1.5,1.6
Message-ID: <200602071057.k17AvPNI026177@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-hr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26143

Modified Files:
	aspell-hr.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-hr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-hr/devel/aspell-hr.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-hr.spec	9 Dec 2005 22:39:39 -0000	1.5
+++ aspell-hr.spec	7 Feb 2006 10:57:22 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:57:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:57:45 -0500
Subject: rpms/aspell-id/devel aspell-id.spec,1.5,1.6
Message-ID: <200602071057.k17Avj1V026369@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-id/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26336

Modified Files:
	aspell-id.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-id.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-id/devel/aspell-id.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aspell-id.spec	9 Dec 2005 22:39:39 -0000	1.5
+++ aspell-id.spec	7 Feb 2006 10:57:42 -0000	1.6
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50.1
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:57:56 -0500
Subject: rpms/aspell-is/devel aspell-is.spec,1.3,1.4
Message-ID: <200602071057.k17Avutv026495@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-is/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26467

Modified Files:
	aspell-is.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-is.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-is/devel/aspell-is.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-is.spec	9 Dec 2005 22:39:39 -0000	1.3
+++ aspell-is.spec	7 Feb 2006 10:57:53 -0000	1.4
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51.1
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51.1-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:07 -0500
Subject: rpms/aspell-it/devel aspell-it.spec,1.14,1.15
Message-ID: <200602071058.k17Aw7Qo026622@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-it/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26593

Modified Files:
	aspell-it.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-it.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-it/devel/aspell-it.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aspell-it.spec	24 Jan 2006 10:40:38 -0000	1.14
+++ aspell-it.spec	7 Feb 2006 10:58:03 -0000	1.15
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.53
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Feb 24 2006 Ivana Varekova <varekova at redhat.com> 50:0.53-4
 - fix typo (bug 178755)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:12 -0500
Subject: rpms/aspell-nl/devel aspell-nl.spec,1.15,1.16
Message-ID: <200602071058.k17AwC4T026706@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26673

Modified Files:
	aspell-nl.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-nl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-nl.spec	16 Dec 2005 09:14:55 -0000	1.15
+++ aspell-nl.spec	7 Feb 2006 10:58:09 -0000	1.16
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 8
+Release: 8.1
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Ivana Varekova <varekova at redhat.com> 50:0.50-8
 - add nederlands alias (bug 175863)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:22 -0500
Subject: rpms/aspell-no/devel aspell-no.spec,1.17,1.18
Message-ID: <200602071058.k17AwM4g026835@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-no/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26805

Modified Files:
	aspell-no.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-no.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-no/devel/aspell-no.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-no.spec	9 Dec 2005 22:39:40 -0000	1.17
+++ aspell-no.spec	7 Feb 2006 10:58:20 -0000	1.18
@@ -5,7 +5,7 @@
 Name: aspell-no
 Epoch: 50
 Version: 0.50.1
-Release: 9.1
+Release: 9.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -49,6 +49,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:30 -0500
Subject: rpms/kdegraphics/FC-4 post-3.5.1-kdegraphics-CVE-2006-0301.diff,
	NONE, 1.1 kdegraphics.spec, 1.53, 1.54
Message-ID: <200602071058.k17AwU56026932@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdegraphics.spec 
Added Files:
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179056)



post-3.5.1-kdegraphics-CVE-2006-0301.diff:
 0 files changed

--- NEW FILE post-3.5.1-kdegraphics-CVE-2006-0301.diff ---
--- kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 505052)
+++ kpdf/xpdf/splash/SplashXPathScanner.cc	(Arbeitskopie)
@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
 }
 
 void SplashXPathScanner::computeIntersections(int y) {
-  SplashCoord ySegMin, ySegMax, xx0, xx1;
+  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
   SplashXPathSeg *seg;
   int i, j;
 
@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
     } else if (seg->flags & splashXPathVert) {
       xx0 = xx1 = seg->x0;
     } else {
-      if (ySegMin <= y) {
-	// intersection with top edge
-	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+      if (seg->x0 < seg->x1) {
+	xSegMin = seg->x0;
+	xSegMax = seg->x1;
       } else {
-	// x coord of segment endpoint with min y coord
-	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
+	xSegMin = seg->x1;
+	xSegMax = seg->x0;
       }
-      if (ySegMax >= y + 1) {
-	// intersection with bottom edge
-	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-      } else {
-	// x coord of segment endpoint with max y coord
-	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
+      // intersection with top edge
+      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+      // intersection with bottom edge
+      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+      // the segment may not actually extend to the top and/or bottom edges
+      if (xx0 < xSegMin) {
+	xx0 = xSegMin;
+      } else if (xx0 > xSegMax) {
+	xx0 = xSegMax;
+      }
+      if (xx1 < xSegMin) {
+	xx1 = xSegMin;
+      } else if (xx1 > xSegMax) {
+	xx1 = xSegMax;
       }
     }
     if (xx0 < xx1) {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdegraphics.spec	1 Feb 2006 19:32:17 -0000	1.53
+++ kdegraphics.spec	7 Feb 2006 10:58:27 -0000	1.54
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 0.1.fc4
+Release: 0.2.fc4
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -30,6 +30,9 @@
 # upstream fixes
 Patch50: kdegraphics-3.5.1-kpdf.patch
 
+# security fixes
+Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
+
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -265,8 +268,12 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 
+# upstream patches
 %patch50 -p1 -b .kpdf
 
+# security patches
+%patch100 -p0 -b .CVE-2006-0301
+
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
@@ -284,7 +291,7 @@
 %build
 export PATH=`pwd`:$PATH
 export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -364,6 +371,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.2.fc4
+- apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179056)
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 7:3.5.1-0.1.fc4
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:35 -0500
Subject: rpms/aspell-pl/devel aspell-pl.spec,1.8,1.9
Message-ID: <200602071058.k17AwYSF026979@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26943

Modified Files:
	aspell-pl.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-pl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pl/devel/aspell-pl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aspell-pl.spec	16 Dec 2005 23:20:02 -0000	1.8
+++ aspell-pl.spec	7 Feb 2006 10:58:31 -0000	1.9
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 5.1
+Release: 5.2
 License: Creative Commons ShareAlike
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:58:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:58:49 -0500
Subject: rpms/aspell-pt/devel aspell-pt.spec,1.13,1.14
Message-ID: <200602071058.k17AwnQ1027121@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27096

Modified Files:
	aspell-pt.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-pt.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pt/devel/aspell-pt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aspell-pt.spec	9 Dec 2005 22:39:40 -0000	1.13
+++ aspell-pt.spec	7 Feb 2006 10:58:46 -0000	1.14
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 10.1
+Release: 10.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-10.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:01 -0500
Subject: rpms/aspell-ru/devel aspell-ru.spec,1.3,1.4
Message-ID: <200602071059.k17Ax1Rf027260@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ru/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27226

Modified Files:
	aspell-ru.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-ru.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ru/devel/aspell-ru.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-ru.spec	9 Dec 2005 22:39:40 -0000	1.3
+++ aspell-ru.spec	7 Feb 2006 10:58:58 -0000	1.4
@@ -4,7 +4,7 @@
 Epoch: 50
 Name: aspell-%{lang}
 Version: 0.99f7
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.99f7-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:12 -0500
Subject: rpms/aspell-sl/devel aspell-sl.spec,1.1,1.2
Message-ID: <200602071059.k17AxCr3027411@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27383

Modified Files:
	aspell-sl.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sl/devel/aspell-sl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aspell-sl.spec	15 Dec 2005 09:23:15 -0000	1.1
+++ aspell-sl.spec	7 Feb 2006 10:59:09 -0000	1.2
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,5 +44,8 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jul 18 2005 Ivana Varekova <varekova at redhat.com> 50:0.50.0-1
 - initial release



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:23 -0500
Subject: rpms/aspell-sr/devel aspell-sl.spec,1.2,1.3
Message-ID: <200602071059.k17AxNpD027540@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27512

Modified Files:
	aspell-sl.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sr/devel/aspell-sl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-sl.spec	17 Jan 2006 09:50:39 -0000	1.2
+++ aspell-sl.spec	7 Feb 2006 10:59:20 -0000	1.3
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.02
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,5 +44,8 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.02-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Ivana Varekova <varekova at redhat.com> 50:0.50.0-1
 - initial release



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:37 -0500
Subject: rpms/aspell-sv/devel aspell-sv.spec,1.15,1.16
Message-ID: <200602071059.k17Axbj0027679@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27657

Modified Files:
	aspell-sv.spec 
Log Message:
bump for new gcc/glibc


Index: aspell-sv.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sv/devel/aspell-sv.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-sv.spec	6 Jan 2006 11:15:12 -0000	1.15
+++ aspell-sv.spec	7 Feb 2006 10:59:34 -0000	1.16
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan  6 2006 Ivana Varekova <varekova at redhat.com> 50:0.51-1
 - update to 0.51-0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:48 -0500
Subject: rpms/atk/devel atk.spec,1.27,1.28
Message-ID: <200602071059.k17AxmMJ027813@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	atk.spec 
Log Message:
bump for new gcc/glibc


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- atk.spec	18 Jan 2006 04:48:16 -0000	1.27
+++ atk.spec	7 Feb 2006 10:59:45 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.2
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.2-1
 - Update to 1.11.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 10:59:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 05:59:59 -0500
Subject: rpms/at-spi/devel at-spi.spec,1.26,1.27
Message-ID: <200602071059.k17AxxUF027982@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27949

Modified Files:
	at-spi.spec 
Log Message:
bump for new gcc/glibc


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- at-spi.spec	31 Jan 2006 12:57:52 -0000	1.26
+++ at-spi.spec	7 Feb 2006 10:59:57 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.4
-Release: 1
+Release: 1.1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_includedir}/* 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 1.7.4-1
 - Update to 1.7.4
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:01:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:01:03 -0500
Subject: rpms/attr/devel attr.spec,1.18,1.19
Message-ID: <200602071101.k17B13Kf028193@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28150

Modified Files:
	attr.spec 
Log Message:
bump for new gcc/glibc


Index: attr.spec
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/attr.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- attr.spec	3 Feb 2006 12:04:50 -0000	1.18
+++ attr.spec	7 Feb 2006 11:00:57 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Utilities for managing filesystem extended attributes.
 Name: attr
 Version: 2.4.28
-Release: 1
+Release: 1.1
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 2.0.0
 BuildRoot: %{_tmppath}/%{name}-root
@@ -114,6 +114,9 @@
 /%{_lib}/libattr.so.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.28-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Thomas Woerner <twoerner at redhat.com> 2.4.28-1
 - new version 2.4.28
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:02:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:02:08 -0500
Subject: rpms/audiofile/devel audiofile.spec,1.16,1.17
Message-ID: <200602071102.k17B28Be028398@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audiofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28370

Modified Files:
	audiofile.spec 
Log Message:
bump for new gcc/glibc


Index: audiofile.spec
===================================================================
RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audiofile.spec	10 Dec 2005 09:02:00 -0000	1.16
+++ audiofile.spec	7 Feb 2006 11:02:06 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
 Version: 0.2.6
-Release: 2.1
+Release: 2.2
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0.2.6-2.1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:03:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:03:00 -0500
Subject: rpms/audit/devel audit.spec,1.76,1.77
Message-ID: <200602071103.k17B30Mh028544@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28506

Modified Files:
	audit.spec 
Log Message:
bump for new gcc/glibc


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- audit.spec	5 Jan 2006 23:37:48 -0000	1.76
+++ audit.spec	7 Feb 2006 11:02:55 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.3
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -146,6 +146,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 5 2006 Steve Grubb <sgrubb at redhat.com> 1.1.3-1
 - Add timestamp to daemon_config messages (#174865)
 - Add error checking of year for aureport & ausearh



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:02:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:02:57 -0500
Subject: rpms/mesa/devel
	mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch, NONE, 1.1
	mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch,
	NONE, 1.1
Message-ID: <200602071102.k17B2v6P028521@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28485

Added Files:
	mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch 
	mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch 
Log Message:
added mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch

mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch:
 interface/mystdio.h        |    8 ++--
 internals/arc.cc           |   24 ++++++-------
 internals/arcsorter.cc     |    2 -
 internals/basiccrveval.cc  |   24 ++++++-------
 internals/basicsurfeval.cc |   44 ++++++++++++------------
 internals/bin.cc           |    4 +-
 internals/ccw.cc           |   80 ++++++++++++++++++++++-----------------------
 internals/knotvector.cc    |    6 +--
 internals/nurbsinterfac.cc |    8 ++--
 internals/nurbstess.cc     |    8 ++--
 internals/patch.cc         |    2 -
 internals/quilt.cc         |    8 ++--
 internals/sorter.cc        |    6 +--
 internals/splitarcs.cc     |    8 ++--
 internals/tobezier.cc      |    2 -
 nurbtess/mystdio.h         |    8 ++--
 16 files changed, 121 insertions(+), 121 deletions(-)

--- NEW FILE mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch ---
Patch by Mike A. Harris <mharris at redhat.com> to work around a problem that
occurs on PPC architecture with the most recent gcc 4.1 CVS snapshots.  The
problem is due to Mesa defining GNU_SOURCE and also defining it's own
dprintf() routine.  dprintf() is a GNU extension, so there is a namespace
conflict.  Oddly it only seems to show up on PPC.

The problem is detailed in the following Red Hat bug:

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180122


diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/interface/mystdio.h Mesa-6.4.2/src/glu/sgi/libnurbs/interface/mystdio.h
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/interface/mystdio.h	2001-03-19 12:52:02.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/interface/mystdio.h	2006-02-07 04:30:18.000000000 -0500
@@ -43,20 +43,20 @@
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define debugprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/arc.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/arc.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/arc.cc	2003-11-24 10:19:27.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/arc.cc	2006-02-07 04:30:18.000000000 -0500
@@ -156,9 +156,9 @@
 Arc::show()
 {
 #ifndef NDEBUG
-    dprintf( "\tPWLARC NP: %d FL: 1\n", pwlArc->npts );
+    debugprintf( "\tPWLARC NP: %d FL: 1\n", pwlArc->npts );
     for( int i = 0; i < pwlArc->npts; i++ ) {
-	 dprintf( "\t\tVERTEX %f %f\n", pwlArc->pts[i].param[0],
+	 debugprintf( "\t\tVERTEX %f %f\n", pwlArc->pts[i].param[0],
 			pwlArc->pts[i].param[1] );
     }
 #endif
@@ -175,14 +175,14 @@
     Arc_ptr jarc = this;
 
 #ifndef NDEBUG
-    dprintf( "BGNTRIM\n" );
+    debugprintf( "BGNTRIM\n" );
 #endif
     do {
 	jarc->show( );
 	jarc = jarc->next;
     } while (jarc != this);
 #ifndef NDEBUG
-    dprintf("ENDTRIM\n" );
+    debugprintf("ENDTRIM\n" );
 #endif
 }
 
@@ -203,8 +203,8 @@
     if( ((p0[0] - p1[0]) > ZERO) || ((p1[0] - p0[0]) > ZERO) ||
 	((p0[1] - p1[1]) > ZERO) || ((p1[1] - p0[1]) > ZERO)  ) {
 #ifndef NDEBUG
-	dprintf( "x coord = %f %f %f\n", p0[0], p1[0], p0[0] - p1[0] );
-	dprintf( "y coord = %f %f %f\n", p0[1], p1[1], p0[1] - p1[1] );
+	debugprintf( "x coord = %f %f %f\n", p0[0], p1[0], p0[0] - p1[0] );
+	debugprintf( "y coord = %f %f %f\n", p0[1], p1[1], p0[1] - p1[1] );
 #endif
 	return 1;
     } else {
@@ -244,7 +244,7 @@
 
 	if (jarc->prev == 0 || jarc->next == 0) {
 #ifndef NDEBUG
-	    dprintf( "checkjarc:null next/prev pointer\n");
+	    debugprintf( "checkjarc:null next/prev pointer\n");
 	    jarc->print( );
 #endif
 	    return 0;
@@ -252,7 +252,7 @@
 
 	if (jarc->next->prev != jarc) {
 #ifndef NDEBUG
-	    dprintf( "checkjarc: pointer linkage screwed up\n");
+	    debugprintf( "checkjarc: pointer linkage screwed up\n");
 	    jarc->print( );
 #endif
 	    return 0;
@@ -271,7 +271,7 @@
 	    if( jarc->prev->pwlArc ) {
 		if( jarc->tail()[1] != jarc->prev->rhead()[1] ) {
 #ifndef NDEBUG
-		    dprintf( "checkjarc: geometric linkage screwed up 1\n");
+		    debugprintf( "checkjarc: geometric linkage screwed up 1\n");
 		    jarc->prev->show();
 		    jarc->show();
 #endif
@@ -280,7 +280,7 @@
 		if( jarc->tail()[0] != jarc->prev->rhead()[0] ) {
 	        
 #ifndef NDEBUG
-		    dprintf( "checkjarc: geometric linkage screwed up 2\n");
+		    debugprintf( "checkjarc: geometric linkage screwed up 2\n");
 		    jarc->prev->show();
 		    jarc->show();
 #endif
@@ -290,7 +290,7 @@
 	    if( jarc->next->pwlArc ) {
 		if( jarc->next->tail()[0] != jarc->rhead()[0] ) {
 #ifndef NDEBUG
-			dprintf( "checkjarc: geometric linkage screwed up 3\n");
+			debugprintf( "checkjarc: geometric linkage screwed up 3\n");
 			jarc->show();
 			jarc->next->show();
 #endif
@@ -298,7 +298,7 @@
 		}
 		if( jarc->next->tail()[1] != jarc->rhead()[1] ) {
 #ifndef NDEBUG
-			dprintf( "checkjarc: geometric linkage screwed up 4\n");
+			debugprintf( "checkjarc: geometric linkage screwed up 4\n");
 			jarc->show();
 			jarc->next->show();
 #endif
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/arcsorter.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/arcsorter.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/arcsorter.cc	2001-03-16 19:25:40.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/arcsorter.cc	2006-02-07 04:30:18.000000000 -0500
@@ -54,7 +54,7 @@
 int
 ArcSorter::qscmp( char *, char * )
 {
-    dprintf( "ArcSorter::qscmp: pure virtual called\n" );
+    debugprintf( "ArcSorter::qscmp: pure virtual called\n" );
     return 0;
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/basiccrveval.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/basiccrveval.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/basiccrveval.cc	2003-11-24 10:19:28.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/basiccrveval.cc	2006-02-07 04:30:18.000000000 -0500
@@ -45,7 +45,7 @@
 BasicCurveEvaluator::domain1f( REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain1f\n" );
+    debugprintf( "domain1f\n" );
 #endif
 }
 
@@ -53,7 +53,7 @@
 BasicCurveEvaluator::range1f( long , REAL *, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "range1f\n" );
+    debugprintf( "range1f\n" );
 #endif
 }
 
@@ -61,7 +61,7 @@
 BasicCurveEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    debugprintf( "enable\n" );
 #endif
 }
 
@@ -69,7 +69,7 @@
 BasicCurveEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    debugprintf( "disable\n" );
 #endif
 }
 
@@ -77,7 +77,7 @@
 BasicCurveEvaluator::bgnmap1f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap1f\n" );
+    debugprintf( "bgnmap1f\n" );
 #endif
 }
 
@@ -85,7 +85,7 @@
 BasicCurveEvaluator::map1f( long, REAL, REAL, long, long, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map1f\n" );
+    debugprintf( "map1f\n" );
 #endif
 }
 
@@ -93,7 +93,7 @@
 BasicCurveEvaluator::mapgrid1f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid1f\n" );
+    debugprintf( "mapgrid1f\n" );
 #endif
 }
 
@@ -101,7 +101,7 @@
 BasicCurveEvaluator::mapmesh1f( long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh1f\n" );
+    debugprintf( "mapmesh1f\n" );
 #endif
 }
 
@@ -109,7 +109,7 @@
 BasicCurveEvaluator::evalcoord1f( long, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord1f\n" );
+    debugprintf( "evalcoord1f\n" );
 #endif
 }
 
@@ -117,7 +117,7 @@
 BasicCurveEvaluator::endmap1f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap1f\n" );
+    debugprintf( "endmap1f\n" );
 #endif
 }
 
@@ -125,7 +125,7 @@
 BasicCurveEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    debugprintf( "bgnline\n" );
 #endif
 }
 
@@ -133,6 +133,6 @@
 BasicCurveEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    debugprintf( "endline\n" );
 #endif
 }
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/basicsurfeval.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/basicsurfeval.cc	2003-11-24 10:19:28.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/basicsurfeval.cc	2006-02-07 04:30:18.000000000 -0500
@@ -49,7 +49,7 @@
 BasicSurfaceEvaluator::domain2f( REAL, REAL, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain2f\n" );
+    debugprintf( "domain2f\n" );
 #endif
 }
 
@@ -57,7 +57,7 @@
 BasicSurfaceEvaluator::polymode( long )
 {
 #ifndef NDEBUG
-    dprintf( "polymode\n" );
+    debugprintf( "polymode\n" );
 #endif
 }
 
@@ -65,7 +65,7 @@
 BasicSurfaceEvaluator::range2f( long type, REAL *from, REAL *to )
 {
 #ifndef NDEBUG
-    dprintf( "range2f type %ld, from (%g,%g), to (%g,%g)\n",
+    debugprintf( "range2f type %ld, from (%g,%g), to (%g,%g)\n",
 		type, from[0], from[1], to[0], to[1] );
 #endif
 }
@@ -74,7 +74,7 @@
 BasicSurfaceEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    debugprintf( "enable\n" );
 #endif
 }
 
@@ -82,7 +82,7 @@
 BasicSurfaceEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    debugprintf( "disable\n" );
 #endif
 }
 
@@ -90,7 +90,7 @@
 BasicSurfaceEvaluator::bgnmap2f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap2f\n" );
+    debugprintf( "bgnmap2f\n" );
 #endif
 }
 
@@ -98,7 +98,7 @@
 BasicSurfaceEvaluator::endmap2f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap2f\n" );
+    debugprintf( "endmap2f\n" );
 #endif
 }
 
@@ -108,7 +108,7 @@
 			      REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map2f\n" );
+    debugprintf( "map2f\n" );
 #endif
 }
 
@@ -116,7 +116,7 @@
 BasicSurfaceEvaluator::mapgrid2f( long, REAL, REAL, long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid2f\n" );
+    debugprintf( "mapgrid2f\n" );
 #endif
 }
 
@@ -124,7 +124,7 @@
 BasicSurfaceEvaluator::mapmesh2f( long, long, long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh2f\n" );
+    debugprintf( "mapmesh2f\n" );
 #endif
 }
 
@@ -132,7 +132,7 @@
 BasicSurfaceEvaluator::evalcoord2f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord2f\n" );
+    debugprintf( "evalcoord2f\n" );
 #endif
 }
 
@@ -140,7 +140,7 @@
 BasicSurfaceEvaluator::evalpoint2i( long, long )
 {
 #ifndef NDEBUG
-    dprintf( "evalpoint2i\n" );
+    debugprintf( "evalpoint2i\n" );
 #endif
 }
 
@@ -148,7 +148,7 @@
 BasicSurfaceEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    debugprintf( "bgnline\n" );
 #endif
 }
 
@@ -156,7 +156,7 @@
 BasicSurfaceEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    debugprintf( "endline\n" );
 #endif
 }
 
@@ -164,7 +164,7 @@
 BasicSurfaceEvaluator::bgnclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnclosedline\n" );
+    debugprintf( "bgnclosedline\n" );
 #endif
 }
 
@@ -172,7 +172,7 @@
 BasicSurfaceEvaluator::endclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endclosedline\n" );
+    debugprintf( "endclosedline\n" );
 #endif
 }
 
@@ -180,7 +180,7 @@
 BasicSurfaceEvaluator::bgntfan( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntfan\n" );
+    debugprintf( "bgntfan\n" );
 #endif
 }
 
@@ -194,7 +194,7 @@
 BasicSurfaceEvaluator::bgntmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntmesh\n" );
+    debugprintf( "bgntmesh\n" );
 #endif
 }
 
@@ -202,7 +202,7 @@
 BasicSurfaceEvaluator::swaptmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "swaptmesh\n" );
+    debugprintf( "swaptmesh\n" );
 #endif
 }
 
@@ -210,7 +210,7 @@
 BasicSurfaceEvaluator::endtmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "endtmesh\n" );
+    debugprintf( "endtmesh\n" );
 #endif
 }
 
@@ -218,7 +218,7 @@
 BasicSurfaceEvaluator::bgnqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnqstrip\n" );
+    debugprintf( "bgnqstrip\n" );
 #endif
 }
 
@@ -226,7 +226,7 @@
 BasicSurfaceEvaluator::endqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "endqstrip\n" );
+    debugprintf( "endqstrip\n" );
 #endif
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/bin.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/bin.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/bin.cc	2004-05-12 11:29:36.000000000 -0400
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/bin.cc	2006-02-07 04:30:18.000000000 -0500
@@ -123,7 +123,7 @@
 Bin::show( char *name )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", name );
+    debugprintf( "%s\n", name );
     for( Arc_ptr jarc = firstarc(); jarc; jarc = nextarc() )
         jarc->show( );
 #endif
@@ -160,7 +160,7 @@
     	    REAL t1 = pts[0].param[1];
     	    REAL s2 = pts[1].param[0];
     	    REAL t2 = pts[1].param[1];
-	   dprintf( "arc (%g,%g) (%g,%g)\n", s1, t1, s2, t2 );
+	   debugprintf( "arc (%g,%g) (%g,%g)\n", s1, t1, s2, t2 );
 #endif
 	}
     }
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/ccw.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/ccw.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/ccw.cc	2002-11-01 18:35:07.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/ccw.cc	2006-02-07 04:30:18.000000000 -0500
@@ -70,7 +70,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    debugprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -88,7 +88,7 @@
     while( 1 ) {
 	if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case a\n" );
+	    debugprintf( "case a\n" );
 #endif
 	    assert( v1->param[0] <= v1next->param[0] );
 	    assert( v2->param[0] <= v1next->param[0] );
@@ -101,12 +101,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			debugprintf( "decr\n" );
 #endif
 			v1 = v1next--;
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -117,7 +117,7 @@
 	    }
 	} else if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case b\n" );
+	    debugprintf( "case b\n" );
 #endif
 	    assert( v1->param[0] <= v2next->param[0] );
 	    assert( v2->param[0] <= v2next->param[0] );
@@ -130,12 +130,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			debugprintf( "incr\n" );
 #endif
 			v2 = v2next++;
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -146,7 +146,7 @@
 	    }
 	} else {
 #ifndef NDEBUG
-	    dprintf( "case ab\n" );
+	    debugprintf( "case ab\n" );
 #endif
 	    if( v1next->param[1] < v2next->param[1] )
 		return 0;
@@ -154,12 +154,12 @@
 		return 1;
 	    else {
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		debugprintf( "incr\n" );
 #endif
 		v2 = v2next++;
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    debugprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -183,7 +183,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    debugprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -201,7 +201,7 @@
     while( 1 ) {
 	if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case c\n" );
+	    debugprintf( "case c\n" );
 #endif
 	    assert( v1->param[0] >= v1next->param[0] );
 	    assert( v2->param[0] >= v1next->param[0] );
@@ -215,11 +215,11 @@
 		    else {
 			v1 = v1next--;
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			debugprintf( "decr\n" );
 #endif
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -230,7 +230,7 @@
 	    }
 	} else if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case d\n" );
+	    debugprintf( "case d\n" );
 #endif
 	    assert( v1->param[0] >= v2next->param[0] );
 	    assert( v2->param[0] >= v2next->param[0] );
@@ -244,11 +244,11 @@
 		    else {
 			v2 = v2next++;
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			debugprintf( "incr\n" );
 #endif
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -259,7 +259,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case cd\n" );
+	    debugprintf( "case cd\n" );
 #endif
 	    if( v1next->param[1] < v2next->param[1] )
 		return 1;
@@ -268,11 +268,11 @@
 	    else {
 		v2 = v2next++;
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		debugprintf( "incr\n" );
 #endif
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    debugprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -296,7 +296,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    debugprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -314,7 +314,7 @@
     while( 1 ) {
 	if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case a\n" );
+	    debugprintf( "case a\n" );
 #endif
 	    assert( v1->param[1] <= v1next->param[1] );
 	    assert( v2->param[1] <= v1next->param[1] );
@@ -327,12 +327,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			debugprintf( "decr\n" );
 #endif
 			v1 = v1next--;
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -343,7 +343,7 @@
 	    }
 	} else if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case b\n" );
+	    debugprintf( "case b\n" );
 #endif
 	    assert( v1->param[1] <= v2next->param[1] );
 	    assert( v2->param[1] <= v2next->param[1] );
@@ -356,12 +356,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			debugprintf( "incr\n" );
 #endif
 			v2 = v2next++;
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -372,7 +372,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case ab\n" );
+	    debugprintf( "case ab\n" );
 #endif
 	    if( v1next->param[0] < v2next->param[0] )
 		return 1;
@@ -380,12 +380,12 @@
 		return 0;
 	    else {
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		debugprintf( "incr\n" );
 #endif
 		v2 = v2next++;
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    debugprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -409,7 +409,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    debugprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -427,7 +427,7 @@
     while( 1 ) {
 	if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case c\n" );
+	    debugprintf( "case c\n" );
 #endif
 	    assert( v1->param[1] >= v1next->param[1] );
 	    assert( v2->param[1] >= v1next->param[1] );
@@ -441,11 +441,11 @@
 		    else {
 			v1 = v1next--;
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			debugprintf( "decr\n" );
 #endif
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -456,7 +456,7 @@
 	    }
 	} else if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case d\n" );
+	    debugprintf( "case d\n" );
 	    assert( v1->param[1] >= v2next->param[1] );
 	    assert( v2->param[1] >= v2next->param[1] );
 #endif
@@ -470,11 +470,11 @@
 		    else {
 			v2 = v2next++;
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			debugprintf( "incr\n" );
 #endif
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    debugprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -485,7 +485,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case cd\n" );
+	    debugprintf( "case cd\n" );
 #endif
 	    if( v1next->param[0] < v2next->param[0] )
 		return 0;
@@ -494,11 +494,11 @@
 	    else {
 		v2 = v2next++;
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		debugprintf( "incr\n" );
 #endif
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    debugprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/knotvector.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/knotvector.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/knotvector.cc	2003-11-24 10:19:28.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/knotvector.cc	2006-02-07 04:30:18.000000000 -0500
@@ -129,11 +129,11 @@
 void Knotvector::show( char *msg )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", msg );
-    dprintf( "order = %ld, count = %ld\n", order, knotcount );
+    debugprintf( "%s\n", msg );
+    debugprintf( "order = %ld, count = %ld\n", order, knotcount );
 
     for( int i=0; i<knotcount; i++ )
-	dprintf( "knot[%d] = %g\n", i, knotlist[i] );
+	debugprintf( "knot[%d] = %g\n", i, knotlist[i] );
 #endif
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc	2003-11-24 10:19:28.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc	2006-02-07 04:30:18.000000000 -0500
@@ -232,7 +232,7 @@
 	}
 	if( i != count ) {
 	    do_nurbserror( 37 );
-	    dprintf( "point %d (%f,%f)\n", i, x, y );
+	    debugprintf( "point %d (%f,%f)\n", i, x, y );
 	    isDataValid = 0;
 	    return;
 	}
@@ -247,7 +247,7 @@
 	}
 	if( i != count ) {
 	    do_nurbserror( 37 );
-	    dprintf( "point %d (%f,%f)\n", i, x, y );
+	    debugprintf( "point %d (%f,%f)\n", i, x, y );
 	    isDataValid = 0;
 	    return;
 	}
@@ -460,7 +460,7 @@
 	mapdesc->setBboxsize( mat );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        debugprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }
@@ -488,7 +488,7 @@
 	mapdesc->setBmat( mat, rstride, cstride );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        debugprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/nurbstess.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/nurbstess.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/nurbstess.cc	2001-03-16 19:25:41.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/nurbstess.cc	2006-02-07 04:30:18.000000000 -0500
@@ -79,7 +79,7 @@
 NurbsTessellator::makeobj( int )
 {
 #ifndef NDEBUG
-   dprintf( "makeobj\n" );
+   debugprintf( "makeobj\n" );
 #endif
 }
 
@@ -87,7 +87,7 @@
 NurbsTessellator::closeobj( void )
 {
 #ifndef NDEBUG
-   dprintf( "closeobj\n" );
+   debugprintf( "closeobj\n" );
 #endif
 }
 
@@ -95,7 +95,7 @@
 NurbsTessellator::bgnrender( void )
 {
 #ifndef NDEBUG
-   dprintf( "bgnrender\n" );
+   debugprintf( "bgnrender\n" );
 #endif
 }
 
@@ -103,7 +103,7 @@
 NurbsTessellator::endrender( void )
 {
 #ifndef NDEBUG
-    dprintf( "endrender\n" );
+    debugprintf( "endrender\n" );
 #endif
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/patch.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/patch.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/patch.cc	2002-11-01 18:35:07.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/patch.cc	2006-02-07 04:30:18.000000000 -0500
@@ -439,7 +439,7 @@
     }
 
 #ifdef DEBUG
-    dprintf( "sidesteps %g %g %g %g, stepsize %g %g\n",
+    debugprintf( "sidesteps %g %g %g %g, stepsize %g %g\n",
 	pspec[0].sidestep[0], pspec[0].sidestep[1],
 	pspec[1].sidestep[0], pspec[1].sidestep[1],
 	pspec[0].stepsize, pspec[1].stepsize );
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/quilt.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/quilt.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/quilt.cc	2002-11-01 18:35:07.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/quilt.cc	2006-02-07 04:30:18.000000000 -0500
@@ -91,12 +91,12 @@
     for( int i=0; i!= qspec[0].order * qspec[0].width; i++ ) {
 	for( int j = 0; j!= qspec[1].order * qspec[1].width; j++ ) {
 	    for( int k=0; k < nc; k++ )
-		dprintf(  "%g ", ps[i*qspec[0].stride + j*qspec[1].stride + k] );
-	    dprintf(  "\n" );
+		debugprintf(  "%g ", ps[i*qspec[0].stride + j*qspec[1].stride + k] );
+	    debugprintf(  "\n" );
 	}
-	dprintf(  "\n" );
+	debugprintf(  "\n" );
     }
-    dprintf( "\n" );
+    debugprintf( "\n" );
 #endif
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/sorter.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/sorter.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/sorter.cc	2001-11-29 11:16:55.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/sorter.cc	2006-02-07 04:30:18.000000000 -0500
@@ -57,7 +57,7 @@
 int
 Sorter::qscmp( char *, char * )
 {
-    dprintf( "Sorter::qscmp: pure virtual called\n" );
+    debugprintf( "Sorter::qscmp: pure virtual called\n" );
     return 0;
 }
 
@@ -65,14 +65,14 @@
 void
 Sorter::qsexc( char *, char * )
 {
-    dprintf( "Sorter::qsexc: pure virtual called\n" );
+    debugprintf( "Sorter::qsexc: pure virtual called\n" );
 }
 
 
 void
 Sorter::qstexc( char *, char *, char * )
 {
-    dprintf( "Sorter::qstexc: pure virtual called\n" );
+    debugprintf( "Sorter::qstexc: pure virtual called\n" );
 }
 
 void
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/splitarcs.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/splitarcs.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/splitarcs.cc	2001-03-16 19:25:41.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/splitarcs.cc	2006-02-07 04:30:18.000000000 -0500
@@ -133,14 +133,14 @@
 	     undersampling */
     if( ! ( jarc1->tail()[0] < (jarc1)->head()[0] ) ) {
 #ifndef NDEBUG
-	dprintf( "s difference %f\n",  (jarc1)->tail()[0] - (jarc1)->head()[0] );
+	debugprintf( "s difference %f\n",  (jarc1)->tail()[0] - (jarc1)->head()[0] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
 
     if( ! ( jarc2->tail()[0] > (jarc2)->head()[0] ) ) { 
 #ifndef NDEBUG
-	dprintf( "s difference %f\n",  (jarc2)->tail()[0] - (jarc2)->head()[0] );
+	debugprintf( "s difference %f\n",  (jarc2)->tail()[0] - (jarc2)->head()[0] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
@@ -232,14 +232,14 @@
 	     undersampling */
     if( ! ( jarc1->tail()[1] < (jarc1)->head()[1] ) ) {
 #ifndef NDEBUG
-	dprintf( "t difference %f\n",  jarc1->tail()[1] - (jarc1)->head()[1] );
+	debugprintf( "t difference %f\n",  jarc1->tail()[1] - (jarc1)->head()[1] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
 
     if( ! ( jarc2->tail()[1] > (jarc2)->head()[1] ) ) { 
 #ifndef NDEBUG
-	dprintf( "t difference %f\n",  jarc2->tail()[1] - (jarc2)->head()[1] );
+	debugprintf( "t difference %f\n",  jarc2->tail()[1] - (jarc2)->head()[1] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/tobezier.cc Mesa-6.4.2/src/glu/sgi/libnurbs/internals/tobezier.cc
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/internals/tobezier.cc	2001-03-16 19:25:41.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/internals/tobezier.cc	2006-02-07 04:30:18.000000000 -0500
@@ -360,7 +360,7 @@
 	    next->showpts( outpt );
     } else {
         for( REAL *lpt=outpt+prewidth; outpt != lpt; outpt += poststride )
-	    dprintf(  "show %g %g %g\n", outpt[0], outpt[1], outpt[2] );
+	    debugprintf(  "show %g %g %g\n", outpt[0], outpt[1], outpt[2] );
     }
 }
 
diff -Naur Mesa-6.4.2.orig/src/glu/sgi/libnurbs/nurbtess/mystdio.h Mesa-6.4.2/src/glu/sgi/libnurbs/nurbtess/mystdio.h
--- Mesa-6.4.2.orig/src/glu/sgi/libnurbs/nurbtess/mystdio.h	2001-03-19 12:52:03.000000000 -0500
+++ Mesa-6.4.2/src/glu/sgi/libnurbs/nurbtess/mystdio.h	2006-02-07 04:30:18.000000000 -0500
@@ -43,20 +43,20 @@
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define debugprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void debugprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL

mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch:
 glcontextmodes.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE mesa-6.4.2-xorg-server-uses-bad-datatypes-breaking-AMD64-fdo5835.patch ---
Patch by Igor V. Kovalenko, with suggested change from Daniel Stone, from
freedesktop.org xorg bug #5835.

Using this patch will require that the Xorg X server is recompiled against
the new version of Mesa which includes this patch in order to get the
benefit of it.

Theoretically fixes the following bugs (untested):

https://bugs.freedesktop.org/show_bug.cgi?id=5835
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176976
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176414


--- src/mesa/drivers/dri/common/glcontextmodes.c.old	2005-11-30 02:02:16.000000000 +0300
+++ src/mesa/drivers/dri/common/glcontextmodes.c	2006-02-07 10:38:46.000000000 +0300
@@ -39,6 +39,9 @@
 # include "imports.h"
 # define __glXMemset  memset
 #else
+# if defined (HAVE_DIX_CONFIG_H)
+#  include <dix-config.h>
+# endif
 # include <X11/X.h>
 # include <GL/glx.h>
 # include "GL/glxint.h"



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:03:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:03:37 -0500
Subject: rpms/authconfig/devel authconfig.spec,1.52,1.53
Message-ID: <200602071103.k17B3bcb028697@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28666

Modified Files:
	authconfig.spec 
Log Message:
bump for new gcc/glibc


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- authconfig.spec	3 Feb 2006 22:39:22 -0000	1.52
+++ authconfig.spec	7 Feb 2006 11:03:20 -0000	1.53
@@ -3,7 +3,7 @@
 Version: 5.2.0
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1
+Release: 1.1
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -94,6 +94,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.2.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.0-1
 - redesigned GUI (#178112)
 - added man page for system-config-ac (#179584)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:04:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:04:11 -0500
Subject: rpms/authd/devel authd.spec,1.33,1.34
Message-ID: <200602071104.k17B4B7X028822@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28797

Modified Files:
	authd.spec 
Log Message:
bump for new gcc/glibc


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- authd.spec	9 Dec 2005 22:39:42 -0000	1.33
+++ authd.spec	7 Feb 2006 11:03:59 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 6.devel.1
+Release: 6.devel.2
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -66,6 +66,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-6.devel.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:04:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:04:35 -0500
Subject: rpms/kdegraphics/devel post-3.5.1-kdegraphics-CVE-2006-0301.diff,
	NONE, 1.1 kdegraphics.spec, 1.71, 1.72
Message-ID: <200602071104.k17B4ZuS028952@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28882

Modified Files:
	kdegraphics.spec 
Added Files:
	post-3.5.1-kdegraphics-CVE-2006-0301.diff 
Log Message:
apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179425)


post-3.5.1-kdegraphics-CVE-2006-0301.diff:
 0 files changed

--- NEW FILE post-3.5.1-kdegraphics-CVE-2006-0301.diff ---
--- kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 505052)
+++ kpdf/xpdf/splash/SplashXPathScanner.cc	(Arbeitskopie)
@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
 }
 
 void SplashXPathScanner::computeIntersections(int y) {
-  SplashCoord ySegMin, ySegMax, xx0, xx1;
+  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
   SplashXPathSeg *seg;
   int i, j;
 
@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
     } else if (seg->flags & splashXPathVert) {
       xx0 = xx1 = seg->x0;
     } else {
-      if (ySegMin <= y) {
-	// intersection with top edge
-	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+      if (seg->x0 < seg->x1) {
+	xSegMin = seg->x0;
+	xSegMax = seg->x1;
       } else {
-	// x coord of segment endpoint with min y coord
-	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
+	xSegMin = seg->x1;
+	xSegMax = seg->x0;
       }
-      if (ySegMax >= y + 1) {
-	// intersection with bottom edge
-	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-      } else {
-	// x coord of segment endpoint with max y coord
-	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
+      // intersection with top edge
+      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
+      // intersection with bottom edge
+      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
+      // the segment may not actually extend to the top and/or bottom edges
+      if (xx0 < xSegMin) {
+	xx0 = xSegMin;
+      } else if (xx0 > xSegMax) {
+	xx0 = xSegMax;
+      }
+      if (xx1 < xSegMin) {
+	xx1 = xSegMin;
+      } else if (xx1 > xSegMax) {
+	xx1 = xSegMax;
       }
     }
     if (xx0 < xx1) {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- kdegraphics.spec	4 Feb 2006 23:17:35 -0000	1.71
+++ kdegraphics.spec	7 Feb 2006 11:04:29 -0000	1.72
@@ -16,7 +16,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 2
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -33,6 +33,9 @@
 # upstream patches
 Patch50: kdegraphics-3.5.1-kpdf.patch
 
+# security patches
+Patch100: post-3.5.1-kdegraphics-CVE-2006-0301.diff
+
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
 BuildRequires: gphoto2-devel
@@ -267,9 +270,12 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 
-# u??stream patches
+# upstream patches
 %patch50 -p1 -b .kpdf
 
+# security patches
+%patch100 -p0 -b .CVE-2006-0301
+
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
@@ -287,7 +293,7 @@
 %build
 export PATH=`pwd`:$PATH
 export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -367,6 +373,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 7:3.5.1-2
+- apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179425)
+
 * Sat Feb 04 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:04:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:04:48 -0500
Subject: rpms/autofs/devel autofs.spec,1.74,1.75
Message-ID: <200602071104.k17B4mT5029017@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	autofs.spec 
Log Message:
bump for new gcc/glibc


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- autofs.spec	1 Feb 2006 12:07:20 -0000	1.74
+++ autofs.spec	7 Feb 2006 11:04:43 -0000	1.75
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.2
+%define release 16.2.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -152,6 +152,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Feb 1 2006 Ian Kent <ikent at redhat.com> - 1:4.1.4-16.2
 - Add more general patch to translate "_" to "." in map names. (bz #147765)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:05:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:05:12 -0500
Subject: rpms/mesa/devel .cvsignore,1.5,1.6
Message-ID: <200602071105.k17B5CZC029177@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29139

Modified Files:
	.cvsignore 
Log Message:
update .cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Feb 2006 13:22:10 -0000	1.5
+++ .cvsignore	7 Feb 2006 11:05:09 -0000	1.6
@@ -1 +1,3 @@
-MesaLib-6.4.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:05:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:05:32 -0500
Subject: rpms/autorun/devel autorun.spec,1.24,1.25
Message-ID: <200602071105.k17B5WdO029228@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/autorun/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29198

Modified Files:
	autorun.spec 
Log Message:
bump for new gcc/glibc


Index: autorun.spec
===================================================================
RCS file: /cvs/dist/rpms/autorun/devel/autorun.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- autorun.spec	26 Jan 2006 09:03:44 -0000	1.24
+++ autorun.spec	7 Feb 2006 11:05:29 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: A CD-ROM mounting utility.
 Name: autorun
 Version: 3.18
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: %name-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.18-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Harald Hoyer <harald at redhat.com> - 3.18
 - translation update
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:06:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:06:11 -0500
Subject: rpms/awesfx/devel awesfx.spec,1.13,1.14
Message-ID: <200602071106.k17B6Bb1029361@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/awesfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29327

Modified Files:
	awesfx.spec 
Log Message:
bump for new gcc/glibc


Index: awesfx.spec
===================================================================
RCS file: /cvs/dist/rpms/awesfx/devel/awesfx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- awesfx.spec	9 Dec 2005 22:39:44 -0000	1.13
+++ awesfx.spec	7 Feb 2006 11:06:08 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utility programs for the AWE32/Emu10k1 sound driver.
 Name: awesfx
 Version: 0.5.0d
-Release: 3.1
+Release: 3.2
 Group: Applications/Multimedia
 URL: http://mitglied.lycos.de/iwai/awedrv.html
 Source: http://mitglied.lycos.de/iwai/awesfx-%{version}.tar.gz
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0d-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:06:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:06:30 -0500
Subject: rpms/udev/devel udev-084-floppy.patch, NONE, 1.1 udev-extras.patch,
	NONE, 1.1 udev-permconv.patch, NONE, 1.1 udev-rules.patch,
	NONE, 1.1 .cvsignore, 1.31, 1.32 sources, 1.31,
	1.32 start_udev, 1.49, 1.50 udev.spec, 1.143,
	1.144 udevstart2.patch, 1.5, 1.6 upstream, 1.3,
	1.4 udev-063.tar.bz2.sign, 1.1, NONE udev-075-daemon.patch,
	1.2, NONE udev-075-selinux.patch, 1.2,
	NONE udev-078-nodberr.patch, 1.1, NONE udev-078-redhat.patch,
	1.7, NONE udev-078-udevstart-greylist.patch, 1.2, NONE
Message-ID: <200602071106.k17B6Oai029395@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29348

Modified Files:
	.cvsignore sources start_udev udev.spec udevstart2.patch 
	upstream 
Added Files:
	udev-084-floppy.patch udev-extras.patch udev-permconv.patch 
	udev-rules.patch 
Removed Files:
	udev-063.tar.bz2.sign udev-075-daemon.patch 
	udev-075-selinux.patch udev-078-nodberr.patch 
	udev-078-redhat.patch udev-078-udevstart-greylist.patch 
Log Message:
version 084

udev-084-floppy.patch:
 create_floppy_devices.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE udev-084-floppy.patch ---
--- udev-084/extras/floppy/create_floppy_devices.c.redhat	2006-01-30 08:51:38.000000000 +0100
+++ udev-084/extras/floppy/create_floppy_devices.c	2006-02-07 10:58:51.000000000 +0100
@@ -111,15 +111,21 @@
 		return 0;
 
 	i = 0;
+
+	char buffer[2048]; buffer[0] = '\000'; buffer[2047]='\000';
+	char cmd[2048]; cmd[0] = '\000'; cmd[2047]='\000';
+
 	while (table_sup[type][i]) {
 		sprintf(node, "%s%s",dev, table[table_sup[type][i]]);
-		minor = (table_sup[type][i] << 2) + fdnum;
-		if (print_nodes)
-			printf("%s b %d %d %d\n", node, mode, major, minor);
-		if (create_nodes)
-			mknod(node, S_IFBLK | mode, makedev(major,minor));
+		strcat(buffer, node);
+		strcat(buffer, " ");
 		i++;
 	}
+	if(strlen(buffer)) {
+		if (snprintf(cmd, 2047, "/sbin/MAKEDEV -x %s;/sbin/restorecon %s; /sbin/pam_console_apply %s;", buffer, buffer, buffer) > 0) {
+			system(cmd);
+		}
+	}
 
 	return 0;
 }

udev-extras.patch:
 check-cdrom.sh            |   39 +++++++++++++++++++++++++++++++++++++++
 ide-media.sh              |    7 +++++++
 load_floppy_module.sh     |   35 +++++++++++++++++++++++++++++++++++
 run_directory/MAKEDEV.dev |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+)

--- NEW FILE udev-extras.patch ---
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/extras/check-cdrom.sh	2006-02-07 10:58:51.000000000 +0100
@@ -0,1 +1,40 @@
+#!/bin/bash
+
+pos=0
+n=0
+sp="$1"
+what="$2"
+found=0
+
+[ -e /proc/sys/dev/cdrom/info ] || exit 1
+
+/bin/cat /proc/sys/dev/cdrom/info | { 
+    while read line; do
+	if [ "$found" = "0" -a "${line/drive name:}" != "$line" ]; then
+	    set ${line/drive name:}	
+	    while [ $# -gt 0 ]; do
+		pos=$[$pos+1]
+		if [ "$1" == "$sp" ]; then
+		    found=1
+		    break
+		fi
+		shift
+	    done
+	    [ "$found" = "0" ] && exit 1
+	elif [ "${line/$what:}" != "$line" ]; then
+	    set ${line##*$what:}	
+	    while [ $# -gt 0 ]; do
+		n=$[$n+1]
+		if [ "$n" == "$pos" ]; then
+		    if [ "$1" = "1" ]; then
+			exit 0
+		    fi
+		    break
+		fi
+		shift
+	    done
+	fi    
+    done
+    exit 1
+}
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/extras/ide-media.sh	2006-02-07 10:58:51.000000000 +0100
@@ -0,1 +1,8 @@
+#!/bin/bash 
+i=0
+while [[ ! -a /proc/ide/$1/media && $i -lt 10 ]]; do 
+	/bin/usleep 100000; 
+	i=$[i+1];
+done
+/bin/cat /proc/ide/$1/media
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/extras/run_directory/MAKEDEV.dev	2006-02-07 10:58:51.000000000 +0100
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+if [ "$ACTION" = "add" -a -e "$DEVNAME" ]; then
+	if [ -x /usr/bin/logger ]; then
+	    LOGGER=/usr/bin/logger
+	elif [ -x /bin/logger ]; then
+	    LOGGER=/bin/logger
+	else
+	    unset LOGGER
+	fi
+	#
+	# for diagnostics
+	#
+	if [ -f /etc/udev/udev.conf ]; then
+        	. /etc/udev/udev.conf
+	fi
+
+
+	if [ -t 1 -o -z "$LOGGER" ]; then
+	    mesg () {
+	        echo "$@"
+	    }
+	else
+	    mesg () {
+	        $LOGGER -t $(basename $0)"[$$]" "$@"
+	    }
+	fi
+
+	debug_mesg () {
+	    test -z "$UDEV_LOG" -o "$UDEV_LOG" != "1" && return
+	    mesg "$@"
+	}
+
+	debug_mesg "/sbin/MAKEDEV ${DEVNAME#$udev_root}"
+	/sbin/MAKEDEV "${DEVNAME#$udev_root}"
+	debug_mesg "Restoring permissions for " $DEVNAME*
+	/sbin/pam_console_apply $DEVNAME*
+fi
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/extras/load_floppy_module.sh	2006-02-07 10:58:51.000000000 +0100
@@ -0,1 +1,36 @@
+#!/bin/sh
+########################################################################
+#
+# Description : load_floppy_module
+#
+# Authors     : Based on Open Suse Udev Rules
+#               kay.sievers at suse.de
+#
+# Notes       : Loads the floppy module based upon contents of the NVRAM
+# 
+########################################################################
+
+PROC=/proc/driver/nvram
+
+# wait for /proc file to appear
+loop=10
+while ! test -e $PROC; do
+    sleep 0.1;
+    test "$loop" -gt 0 || break
+    loop=$(($loop - 1))
+done
+
+if [ ! -r /proc/driver/nvram ]; then
+    exit 0;
+fi
+
+floppy_devices=$(cat $PROC | sed -n '/Floppy.*\..*/p')
+
+if [ -n "$floppy_devices" ]; then
+    /sbin/modprobe block-major-2-
+else
+    /bin/true
+fi
+
+exit $?

udev-permconv.patch:
 udevpermconv.sh |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 94 insertions(+)

--- NEW FILE udev-permconv.patch ---
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/extras/udevpermconv.sh	2006-02-07 10:58:51.000000000 +0100
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
+# convert old udev permissions.d file to the new rules.d format.
+# revision 2
+#
+# Written by Michael Buesch <mbuesch at freenet.de>
+# This is released into the Public Domain.
+#
+
+
+perm_file="$1"
+
+function processLine
+{
+	local line="$1"
+	if [ -z "$line" ]; then
+		echo
+		return 1
+	fi
+	if [ "`echo $line | cut -b1`" = "#" ]; then
+		# comment
+		echo "$line"
+		return 2
+	fi
+
+	local i=
+	local kern_name=
+	local owner=
+	local group=
+	local mode=
+	for ((i = 1; i <= 4; i++)); do
+		local tmp="`echo $line | cut -d: -f $i`"
+		if [ $i -eq 1 ]; then
+			kern_name="$tmp"
+		elif [ $i -eq 2 ]; then
+			owner="$tmp"
+		elif [ $i -eq 3 ]; then
+			group="$tmp"
+		elif [ $i -eq 4 ]; then
+			mode="$tmp"
+		fi
+	done
+	if [ -z "$kern_name" ]; then
+		echo "Malformed line:  \"$line\"" >&2
+		return 3
+	fi
+	local need_rule="no"
+	local out="KERNEL==\"$kern_name\""
+	local kern_name_len="`echo $kern_name | wc -c`"
+	kern_name_len="`expr $kern_name_len + 9`"
+	local num_tabs="`expr 32 - $kern_name_len`"
+	num_tabs="`expr $num_tabs / 8`"
+	while [ $num_tabs -gt 0 ]; do
+		out="${out}\t"
+		num_tabs="`expr $num_tabs - 1`"
+	done
+	if [ -n "$owner" ] && [ "$owner" != "root" ]; then
+		out="${out}, OWNER=\"$owner\""
+		need_rule="yes"
+	fi
+	if [ -n "$group" ] && [ "$group" != "root" ]; then
+		out="${out}, GROUP=\"$group\""
+		need_rule="yes"
+	fi
+	if [ -n "$mode" ] && [ "$mode" != "0600" ] && [ "$mode" != "600" ]; then
+		out="${out}, MODE=\"$mode\""
+		need_rule="yes"
+	fi
+	if [ "$need_rule" = "no" ]; then
+		echo "Do not need a rule for:  \"$line\"  (It's udev default permissions)" >&2
+		return 4
+	fi
+	echo -e "$out"
+	return 0
+}
+
+function processInput
+{
+	echo "Converting udev permissions file. This can take a while..." >&2
+	cat $perm_file | \
+	while read line; do
+		processLine "$line"
+	done
+	echo "done." >&2
+}
+
+if ! [ -r "$perm_file" ]; then
+	echo "Could not read input file" >&2
+	echo "Usage: $0 old_permission_file > new_rules_file" >&2
+	exit 1
+fi
+
+processInput
+exit 0

udev-rules.patch:
 05-udev-early.rules  |    9 +++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 ++++-
 udev.rules           |  118 ++++++++++++++++++++++++++-------------------------
 4 files changed, 82 insertions(+), 59 deletions(-)

--- NEW FILE udev-rules.patch ---
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-07 11:30:42.000000000 +0100
@@ -0,0 +1 @@
+ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
--- udev-084/etc/udev/redhat/hotplug.rules.redhat	2006-01-30 08:51:38.000000000 +0100
+++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-07 10:58:51.000000000 +0100
@@ -1,9 +1,16 @@
 # do not call hotplug.d and dev.d for "drivers" and "module" events
-SUBSYSTEM=="drivers",	OPTIONS="last_rule"
-SUBSYSTEM=="module",	OPTIONS="last_rule"
+SUBSYSTEM=="drivers",   GOTO="hotplug_end"
+SUBSYSTEM=="module",    GOTO="hotplug_end"
+ACTION="add",           GOTO="hotplug_comp"
+ACTION="remove",        GOTO="hotplug_comp"
 
+GOTO="hotplug_end"
+
+LABEL="hotplug_comp"
 # compatibility support for the obsolete hotplug.d and dev.d directories
-ENV{UDEVD_EVENT}=="1",	RUN+="/lib/udev/udev_run_hotplugd"
+ENV{UDEVD_EVENT}=="1",  RUN+="/lib/udev/udev_run_hotplugd"
 RUN+="/lib/udev/udev_run_devd"
 
+
+LABEL="hotplug_end"
--- /dev/null	2006-02-07 10:47:25.401206250 +0100
+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-07 11:30:42.000000000 +0100
@@ -0,1 +1,10 @@
+# sysfs is populated after the event is sent
+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+
+# ignore these events until someone needs them
+SUBSYSTEM=="drivers",		OPTIONS="ignore_device"
+SUBSYSTEM=="module",		OPTIONS="ignore_device"
+
+ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
--- udev-084/etc/udev/redhat/udev.rules.redhat	2006-01-30 08:51:38.000000000 +0100
+++ udev-084/etc/udev/redhat/udev.rules	2006-02-07 11:30:42.000000000 +0100
@@ -3,6 +3,7 @@
 #
 # default is OWNER="root" GROUP="root", MODE="0600"
 #
+
 KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
 
 # all block devices
@@ -10,40 +11,44 @@
 KERNEL=="root",			GROUP="disk", MODE="0640"
 
 # console devices
-KERNEL=="tty",			MODE="0666", OPTIONS="last_rule"
-KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
-KERNEL=="tty[0-9]",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="tty[0-9][0-9]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="vc/[0-9]*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="tty",			NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="console",              NAME="%k", MODE="0600", OPTIONS="last_rule"
+KERNEL=="tty[0-9]*",            NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="vc/[0-9]*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
 
 # pty devices
 #  Set this to 0660 if you only want users belonging to tty group
 #  to be able to allocate PTYs
-KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
-KERNEL=="pty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="tty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="pty/m*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
-KERNEL=="vc/s*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ptmx",                 NAME="%k", GROUP="tty", MODE="666", OPTIONS="last_rule"
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", MODE="660", OPTIONS="last_rule"
+KERNEL=="pty/m*",		NAME="%k", GROUP="tty", MODE="0660", OPTIONS="last_rule"
 
 # serial+dialup devices
-KERNEL=="ttyS*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ippp*",		MODE="0660"
-KERNEL=="isdn*",		MODE="0660"
-KERNEL=="isdnctrl*",		MODE="0660"
-KERNEL=="capi*",		MODE="0660"
-KERNEL=="dcbri*",		MODE="0660"
-KERNEL=="ircomm*",		GROUP="uucp", MODE="0660"
-KERNEL=="tts/[0-9]*",		GROUP="uucp", MODE="0660"
-KERNEL=="tts/USB[0-9]*",	GROUP="uucp", MODE="0660"
+KERNEL=="ippp*",		NAME="%k", MODE="0660"
+KERNEL=="isdn*",		NAME="%k", MODE="0660"
+KERNEL=="isdnctrl*",		NAME="%k", MODE="0660"
+KERNEL=="capi*",		NAME="%k", MODE="0660"
+KERNEL=="dcbri*",		NAME="%k", MODE="0660"
+KERNEL=="ircomm*",		NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="tts/[0-9]*",		NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="tts/USB[0-9]*",	NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="tty[A-Z]*",            NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="pppox*",               NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="ircomm*",              NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="modems/mwave*",        NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="hvc*",                 NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="hvsi*",                NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="iseries/vtty*",        NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
 
 # vc devices
-KERNEL=="vcs",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcs[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcsa",			OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcsa[0-9]*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcc/*",		OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcs",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcs[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcsa",			NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcsa[0-9]*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcc/*",		NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule"
 
 # memory devices
 KERNEL=="random",		MODE="0666", OPTIONS="last_rule"
@@ -54,6 +59,8 @@
 KERNEL=="full",			MODE="0666", OPTIONS="last_rule"
 KERNEL=="null",			MODE="0666", OPTIONS="last_rule"
 KERNEL=="zero",			MODE="0666", OPTIONS="last_rule"
+# 183 = /dev/hwrng        Generic random number generator
+KERNEL=="hw_random",            NAME="hwrng", SYMLINK+="%k"
 
 # misc devices
 KERNEL=="nvram",		MODE="0660"
@@ -61,6 +68,10 @@
 
 # floppy devices
 KERNEL=="fd[01]*",		GROUP="floppy", MODE="0660"
+# fix floppy devices
+KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
+KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k"
+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
 
 # audio devices
 KERNEL=="dsp*",			MODE="0660"
@@ -209,7 +220,7 @@
 KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
 KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
 KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
-KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660"
+KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="[36]", SYMLINK+="scanner%e", MODE="0660"
 
 KERNEL=="umad*", 		NAME="infiniband/%k"
 KERNEL=="issm*", 		NAME="infiniband/%k"
@@ -224,24 +235,25 @@
 BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
 
 # do not seperate the next 2 lines!!
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
 
 KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
 
 # rename sr* to scd*
 KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
 KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
 
-KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
+# dvb
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
 
 #######################################
 # Persistent block device stuff - begin
@@ -297,37 +309,31 @@
 # Persistent block device stuff - end
 #####################################
 
-ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
-
+ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
 
 # Perhaps this should just be for all subsystems?
+ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias"
 
-ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
-	RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
-	RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
-	RUN+="/sbin/modprobe $modalias"
 ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
         RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
 
-ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
-	RUN+="/sbin/modprobe $modalias"
+# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+# sr:           4 TYPE_WORM, 5 TYPE_ROM
+# st/osst:      1 TYPE_TAPE
+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'"
+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
 
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
 	RUN+="/sbin/modprobe sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
-	RUN+="/sbin/modprobe sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
 	RUN+="/sbin/modprobe sr_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
 	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
 	SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="On[sS]tream", \
+ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \
 	RUN+="/sbin/modprobe st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
-	RUN+="/sbin/modprobe sg"
+ACTION=="add", SUBSYSTEM=="scsi_device"	RUN+="/sbin/modprobe sg"
+
+RUN+="socket:/org/kernel/udev/monitor"
 
-ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
-        RUN+="/sbin/firmware_helper"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	21 Dec 2005 11:36:18 -0000	1.31
+++ .cvsignore	7 Feb 2006 11:06:12 -0000	1.32
@@ -1 +1 @@
-udev-078.tar.bz2
+udev-084.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	21 Dec 2005 11:36:19 -0000	1.31
+++ sources	7 Feb 2006 11:06:14 -0000	1.32
@@ -1 +1 @@
-afdacc5f3e6ced2923479b37da41fd0b  udev-078.tar.bz2
+143b3691ae5e6f96995e5749894f78e4  udev-084.tar.bz2


Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- start_udev	11 Jan 2006 12:11:24 -0000	1.49
+++ start_udev	7 Feb 2006 11:06:19 -0000	1.50
@@ -28,7 +28,7 @@
 
 [ -d $sysfs_dir/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
-[ -x /sbin/udev ] || exit 1
+[ -x /sbin/udevd ] || exit 1
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 udev_root=${udev_root-/dev}
 
@@ -119,7 +119,10 @@
 	loop=200
 	while test -d /dev/.udev/queue; do
 		usleep 100000;
-		test "$loop" -gt 0 || return 1
+		if [ "$loop" -le 0 ]; then
+			echo -n "Wait timeout. Will continue in the background."
+			return 1
+		fi
 		loop=$(($loop - 1))
 	done
 	return 0


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- udev.spec	6 Feb 2006 15:30:27 -0000	1.143
+++ udev.spec	7 Feb 2006 11:06:20 -0000	1.144
@@ -4,8 +4,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 078
-Release: 9
+Version: 084
+Release: 1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -17,11 +17,11 @@
 
 Source10: firmware_helper.c
 
-Patch1: udev-078-redhat.patch
-Patch2: udevstart2.patch
-Patch3: udev-075-selinux.patch
-Patch4: udev-078-udevstart-greylist.patch
-Patch5: udev-078-nodberr.patch
+Patch1: udev-permconv.patch
+Patch2: udev-rules.patch
+Patch3: udevstart2.patch
+Patch4: udev-084-floppy.patch
+Patch5: udev-extras.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -41,11 +41,11 @@
 
 %prep
 %setup -q  
-%patch1 -p1 -b .redhat
-%patch2 -p1 -b .udevstart2
-%patch3 -p1 -b .selinux
-%patch4 -p1 -b .greylist
-%patch5 -p1 -b .nodberr
+%patch1 -p1 -b .rhpermconv
+%patch2 -p1 -b .rhrules
+%patch3 -p1 -b .rhudevstart
+%patch4 -p1 -b .rhfloppy
+%patch5 -p1 -b .rhextras
 
 %build
 
@@ -68,7 +68,6 @@
 %endif
 	" all
 
-mv udev udev.static
 mv udevd udevd.static
 mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
 mv extras/ata_id/ata_id extras/ata_id/ata_id.static
@@ -145,7 +144,6 @@
 
 install -m 0644 etc/udev/udev.conf $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
 
-install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
 install -m 0755 udevd.static $RPM_BUILD_ROOT/sbin/udevd.static
 
 
@@ -153,9 +151,6 @@
 
 mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
 
-install -m 0644 extras/run_directory/dev.d/default/pam_console.dev $RPM_BUILD_ROOT%{udev_scriptdir}
-ln -s %{udev_scriptdir}/pam_console.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default/05-pam_console.dev
-
 for i in load_floppy_module.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do
 	install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir}
 done
@@ -166,6 +161,7 @@
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
 install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
+install -m 0755 udevstart $RPM_BUILD_ROOT/sbin
 install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 
@@ -216,11 +212,8 @@
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* 
 %doc etc/udev/redhat/udev.rules
-%attr(0755,root,root) /sbin/udev
-%attr(0755,root,root) /sbin/udev.static
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevcontrol
-%attr(0755,root,root) /sbin/udevsend
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevstart
 %attr(0755,root,root) /sbin/start_udev
@@ -251,8 +244,6 @@
 %ghost %dir %{_sysconfdir}/udev/scripts/
 %ghost %dir %{_sysconfdir}/udev/devices/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
-%attr(0755,root,root) %{udev_scriptdir}/pam_console.dev
-%config(missingok) %{_sysconfdir}/dev.d/default/05-pam_console.dev
 %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
 %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/
 %attr(0755,root,root) %{udev_scriptdir}/MAKEDEV.dev
@@ -276,12 +267,16 @@
 
 %dir %attr(0755,root,root) /lib/firmware
 %attr(0644,root,root) %{_mandir}/man8/udev*.8*
+%attr(0644,root,root) %{_mandir}/man7/udev*.7*
 %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/ata_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> - 084-1
+- version 084
+
 * Mon Feb 06 2006 Harald Hoyer <harald at redhat.com> - 078-9
 - closed fd leak (bug #179980)
 

udevstart2.patch:
 udevstart.c |  168 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 99 insertions(+), 69 deletions(-)

Index: udevstart2.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udevstart2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udevstart2.patch	21 Dec 2005 11:36:19 -0000	1.5
+++ udevstart2.patch	7 Feb 2006 11:06:20 -0000	1.6
@@ -1,16 +1,14 @@
---- udev-078/udevstart.c.udevstart2	2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/udevstart.c	2005-12-21 10:57:18.000000000 +0100
-@@ -37,6 +37,7 @@
+--- udev-084/udevstart.c.udevstart2	2006-01-30 08:51:38.000000000 +0100
++++ udev-084/udevstart.c	2006-02-07 10:11:31.000000000 +0100
+@@ -37,13 +37,13 @@
  #include <sys/wait.h>
  #include <sys/stat.h>
  #include <sys/types.h>
 +#include <fcntl.h>
++#include <fnmatch.h>
  
- #include "libsysfs/sysfs/libsysfs.h"
- #include "udev_libc_wrapper.h"
-@@ -47,9 +48,7 @@
+ #include "udev.h"
  #include "udev_rules.h"
- #include "list.h"
  
 -static const char *udev_run_str;
  static const char *udev_log_str;
@@ -18,75 +16,54 @@
  
  #ifdef USE_LOG
  void log_message(int priority, const char *format, ...)
-@@ -109,71 +108,29 @@
+@@ -101,76 +101,60 @@
  static char *first_list[] = {
  	"/class/mem",
  	"/class/tty",
 +	"/bus",
++	NULL,
++};
++
++/* list of devices whose modaliases we should run last */
++static char *last_modalias_list[] = {
++	"pci:v*d*sv*sd*bc0Csc03i*",	/* USB controller */
++	"pci:v*d*sv*sd*bc0Csc00i10*",	/* Firewire controller */
  	NULL,
  };
--
-+  
- static int add_device(const char *devpath, const char *subsystem)
+ 
+ static int add_device(const char *devpath)
  {
--	struct udevice udev;
--	struct sysfs_class_device *class_dev;
--	char path[PATH_SIZE];
+-	struct sysfs_device *dev;
+-	struct udevice *udev;
+-	int retval = 0;
 -
 -	/* clear and set environment for next event */
 -	clearenv();
 -	setenv("ACTION", "add", 1);
--	setenv("DEVPATH", devpath, 1);
--	setenv("SUBSYSTEM", subsystem, 1);
 -	setenv("UDEV_START", "1", 1);
 -	if (udev_log_str)
 -		setenv("UDEV_LOG", udev_log_str, 1);
 -	if (udev_run_str)
 -		setenv("UDEV_RUN", udev_run_str, 1);
--	dbg("add '%s'", devpath);
 -
--	snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
--	path[sizeof(path)-1] = '\0';
--	class_dev = sysfs_open_class_device_path(path);
--	if (class_dev == NULL) {
--		dbg("sysfs_open_class_device_path failed");
+-	dev = sysfs_device_get(devpath);
+-	if (dev == NULL)
 -		return -1;
--	}
 -
--	udev_init_device(&udev, &class_dev->path[strlen(sysfs_path)], subsystem, "add");
--	udev.devt = get_devt(class_dev);
--	if (!udev.devt && udev.type != DEV_NET) {
--		dbg("sysfs_open_class_device_path failed");
+-	udev = udev_device_init();
+-	if (udev == NULL)
 -		return -1;
--	}
--	udev_rules_get_name(&rules, &udev, class_dev);
--	if (udev.ignore_device) {
--		dbg("device event will be ignored");
--		goto exit;
--	}
--	if (udev.name[0] == '\0') {
--		dbg("device node creation supressed");
--		goto run;
--	}
 -
--	udev_add_device(&udev, class_dev);
--run:
--	if (udev_run && !list_empty(&udev.run_list)) {
--		struct name_entry *name_loop;
--
--		dbg("executing run list");
--		list_for_each_entry(name_loop, &udev.run_list, node) {
--			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
--				pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
--			else
--				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
--		}
+-	/* override built-in sysfs device */
+-	udev->dev = dev;
+-	strcpy(udev->action, "add");
+-	udev->devt = udev_device_get_devt(udev);
+-
+-	if (strcmp(udev->dev->subsystem, "net") != 0) {
+-		udev->devt = udev_device_get_devt(udev);
+-		if (major(udev->devt) == 0)
+-			return -1;
 -	}
--exit:
--	sysfs_close_class_device(class_dev);
--	udev_cleanup_device(&udev);
--
--	return 0;
 +  char filename[PATH_SIZE];
 +  int fd;
 +  
@@ -102,13 +79,85 @@
 +  else return 1;
 +  
 +  return 0;
- }
++}
+ 
+-	dbg("add '%s'", udev->dev->devpath);
+-	setenv("DEVPATH", udev->dev->devpath, 1);
+-	setenv("SUBSYSTEM", udev->dev->subsystem, 1);
 -
-+  
- static void exec_list(struct list_head *device_list)
- {
- 	struct device *loop_device;
-@@ -222,7 +179,7 @@
+-	udev_rules_get_name(&rules, udev);
+-	if (udev->ignore_device) {
+-		dbg("device event will be ignored");
+-		goto exit;
+-	}
+-	if (udev->name[0] != '\0')
+-		retval = udev_add_device(udev);
+-	else
+-		info("device node creation supressed");
+-
+-	if (retval == 0 && udev_run) {
+-		struct name_entry *name_loop;
+-
+-		dbg("executing run list");
+-		list_for_each_entry(name_loop, &udev->run_list, node) {
+-			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
+-				pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, "add");
+-			else {
+-				char program[PATH_SIZE];
+-
+-				strlcpy(program, name_loop->name, sizeof(program));
+-				udev_rules_apply_format(udev, program, sizeof(program));
+-				run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+-			}
++static int modalias_is_greylisted(struct device *dev)
++{
++
++	char filename[PATH_SIZE];
++	char alias[PATH_SIZE];
++	int fd, i;
++	
++	snprintf(filename,sizeof(filename),"%s/%s/modalias", sysfs_path, dev->path);
++	filename[sizeof(filename)-1] = '\0';
++	
++	fd = open(filename, O_RDONLY);
++	if (fd == -1)
++		return 0;
++	read(fd,alias,PATH_SIZE);
++	alias[sizeof(alias)-1] = '\0';
++	alias[strlen(alias)-1] = '\0';
++	
++	for (i = 0; last_modalias_list[i] != NULL; i++)
++		if (!fnmatch(last_modalias_list[i], alias, 0)) {
++			close(fd);
++			return 1;
+ 		}
+-	}
+ 
+-exit:
+-	udev_device_cleanup(udev);
++	close(fd);
+ 	return 0;
+ }
+ 
+@@ -184,6 +168,8 @@
+ 	list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
+ 		for (i = 0; first_list[i] != NULL; i++) {
+ 			if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) {
++				if (modalias_is_greylisted(loop_device))
++					continue;
+ 				add_device(loop_device->path);
+ 				list_del(&loop_device->node);
+ 				free(loop_device);
+@@ -203,6 +189,8 @@
+ 		}
+ 		if (found)
+ 			continue;
++		if (modalias_is_greylisted(loop_device))
++			continue;
+ 
+ 		add_device(loop_device->path);
+ 		list_del(&loop_device->node);
+@@ -222,7 +210,7 @@
  	char filename[PATH_SIZE];
  	struct stat statbuf;
  
@@ -117,7 +166,7 @@
  	filename[sizeof(filename)-1] = '\0';
  
  	if (stat(filename, &statbuf) == 0)
-@@ -279,6 +236,50 @@
+@@ -279,6 +267,50 @@
  	}
  }
  
@@ -155,7 +204,7 @@
 +					dirname2[sizeof(dirname2)-1] = '\0';
 +
 +					if (has_devt(dirname2))
-+						device_list_insert(dirname2, dent->d_name, device_list);
++						device_list_insert(dirname2, device_list);
 +				}
 +				closedir(dir2);
 +			}
@@ -168,35 +217,35 @@
  static void udev_scan_class(struct list_head *device_list)
  {
  	char base[PATH_SIZE];
-@@ -312,7 +313,7 @@
+@@ -312,7 +344,7 @@
  					snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
  					dirname2[sizeof(dirname2)-1] = '\0';
  
 -					if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0)
 +					if (has_devt(dirname2))
- 						device_list_insert(dirname2, dent->d_name, device_list);
+ 						device_list_insert(dirname2, device_list);
  				}
  				closedir(dir2);
-@@ -342,7 +343,6 @@
- 	udev_init_config();
+@@ -342,7 +374,6 @@
+ 	udev_config_init();
  	dbg("version %s", UDEV_VERSION);
  
 -	udev_run_str = getenv("UDEV_RUN");
  	udev_log_str = getenv("UDEV_LOG");
  
  	/* disable all logging if not explicitely requested */
-@@ -361,13 +361,11 @@
- 	/* trigger timeout to prevent hanging processes */
+@@ -362,13 +393,12 @@
  	alarm(UDEV_ALARM_TIMEOUT);
  
+ 	sysfs_init();
 -	udev_rules_init(&rules, 1);
--
+ 
 +	udev_scan_bus(&device_list);
  	udev_scan_class(&device_list);
  	udev_scan_block(&device_list);
  	exec_list(&device_list);
  
--	udev_rules_close(&rules);
+-	udev_rules_cleanup(&rules);
+ 	sysfs_cleanup();
  	logging_close();
  	return 0;
- }


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/upstream,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upstream	11 Jan 2005 10:53:53 -0000	1.3
+++ upstream	7 Feb 2006 11:06:20 -0000	1.4
@@ -1 +1 @@
-udev-050.tar.bz2
+udev-084.tar.bz2


--- udev-063.tar.bz2.sign DELETED ---


--- udev-075-daemon.patch DELETED ---


--- udev-075-selinux.patch DELETED ---


--- udev-078-nodberr.patch DELETED ---


--- udev-078-redhat.patch DELETED ---


--- udev-078-udevstart-greylist.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:06:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:06:46 -0500
Subject: rpms/mesa/devel sources,1.5,1.6
Message-ID: <200602071106.k17B6kxK029515@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29489

Modified Files:
	sources 
Log Message:
update sources


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	4 Feb 2006 13:22:10 -0000	1.5
+++ sources	7 Feb 2006 11:06:42 -0000	1.6
@@ -1 +1,2 @@
 7674d2c603b5834259e4e5a820cefd5b  MesaLib-6.4.2.tar.bz2
+9cae1ab874af533ce356bd7dfe2e0bb0  MesaDemos-6.4.2.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:07:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:07:04 -0500
Subject: rpms/bash/devel bash.spec,1.106,1.107
Message-ID: <200602071107.k17B740i029571@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29544

Modified Files:
	bash.spec 
Log Message:
bump for new gcc/glibc


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- bash.spec	5 Feb 2006 13:37:00 -0000	1.106
+++ bash.spec	7 Feb 2006 11:06:50 -0000	1.107
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 6
+Release: 6.1
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -214,6 +214,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Tim Waugh <twaugh at redhat.com> 3.1-6
 - Patchlevel 7.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:07:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:07:35 -0500
Subject: rpms/bc/devel bc.spec,1.15,1.16
Message-ID: <200602071107.k17B7Zur029807@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29776

Modified Files:
	bc.spec 
Log Message:
bump for new gcc/glibc


Index: bc.spec
===================================================================
RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bc.spec	9 Dec 2005 22:39:45 -0000	1.15
+++ bc.spec	7 Feb 2006 11:07:32 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 19.1
+Release: 19.2
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -69,6 +69,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.06-19.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:08:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:08:05 -0500
Subject: rpms/beagle/devel beagle.spec,1.21,1.22
Message-ID: <200602071108.k17B85vs029947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29916

Modified Files:
	beagle.spec 
Log Message:
bump for new gcc/glibc


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- beagle.spec	31 Jan 2006 20:27:01 -0000	1.21
+++ beagle.spec	7 Feb 2006 11:08:03 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        1
+Release:        1.1
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -148,6 +148,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.2.1-1
 - Update to beagle 0.2.1
 - Use sqlite3 instead of sqlite2



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:08:25 -0500
Subject: rpms/beecrypt/devel beecrypt.spec,1.23,1.24
Message-ID: <200602071108.k17B8P4Q030065@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30034

Modified Files:
	beecrypt.spec 
Log Message:
bump for new gcc/glibc


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- beecrypt.spec	9 Dec 2005 22:39:46 -0000	1.23
+++ beecrypt.spec	7 Feb 2006 11:08:22 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 9.1
+Release: 9.2
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -118,6 +118,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.2-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:08:48 -0500
Subject: rpms/bg5ps/devel bg5ps.spec,1.16,1.17
Message-ID: <200602071108.k17B8m0l030193@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bg5ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30158

Modified Files:
	bg5ps.spec 
Log Message:
bump for new gcc/glibc


Index: bg5ps.spec
===================================================================
RCS file: /cvs/dist/rpms/bg5ps/devel/bg5ps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bg5ps.spec	9 Dec 2005 22:39:46 -0000	1.16
+++ bg5ps.spec	7 Feb 2006 11:08:43 -0000	1.17
@@ -1,6 +1,6 @@
 Name: bg5ps
 Version: 1.3.0
-Release: 22.1
+Release: 22.2
 License: GPL
 Summary: Converts Big5 encoded Chinese into printable postscript.
 Group: Applications/Publishing
@@ -49,6 +49,9 @@
 %config %{_sysconfdir}/*.conf*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-22.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:09:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:09:03 -0500
Subject: rpms/binutils/devel binutils.spec,1.71,1.72
Message-ID: <200602071109.k17B93Ys030336@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	binutils.spec 
Log Message:
bump for new gcc/glibc


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- binutils.spec	2 Jan 2006 16:19:39 -0000	1.71
+++ binutils.spec	7 Feb 2006 11:09:00 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.16.91.0.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -159,6 +159,9 @@
 %{_infodir}/*info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16.91.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 02 2006 Jakub Jelinek <jakub at redhat.com> 2.16.91.0.5-1
 - update to 2.16.91.0.5
 - don't error about .toc1 references to discarded sectiosn on ppc64



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:09:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:09:31 -0500
Subject: rpms/bison/devel bison.spec,1.21,1.22
Message-ID: <200602071109.k17B9VtH030533@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30493

Modified Files:
	bison.spec 
Log Message:
bump for new gcc/glibc


Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bison.spec	9 Dec 2005 22:39:47 -0000	1.21
+++ bison.spec	7 Feb 2006 11:09:29 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
 Version: 2.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -98,6 +98,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:09:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:09:47 -0500
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.13,1.14
Message-ID: <200602071109.k17B9lqJ030691@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30659

Modified Files:
	bluez-hcidump.spec 
Log Message:
bump for new gcc/glibc


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bluez-hcidump.spec	9 Dec 2005 22:39:47 -0000	1.13
+++ bluez-hcidump.spec	7 Feb 2006 11:09:44 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.27
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -40,6 +40,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.27-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:10:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:10:00 -0500
Subject: rpms/bluez-libs/devel bluez-libs.spec,1.21,1.22
Message-ID: <200602071110.k17BA07S030835@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30806

Modified Files:
	bluez-libs.spec 
Log Message:
bump for new gcc/glibc


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bluez-libs.spec	9 Dec 2005 22:39:48 -0000	1.21
+++ bluez-libs.spec	7 Feb 2006 11:09:57 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
 Version: 2.22
-Release: 1.1
+Release: 1.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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.22-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:10:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:10:21 -0500
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.10,1.11
Message-ID: <200602071110.k17BALC4030960@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30926

Modified Files:
	bluez-pin.spec 
Log Message:
bump for new gcc/glibc


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bluez-pin.spec	10 Dec 2005 09:02:18 -0000	1.10
+++ bluez-pin.spec	7 Feb 2006 11:10:19 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.24
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 %{_prefix}/share/bluez-pin/bluez-pin.glade
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.24-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0.24-3.1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:10:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:10:30 -0500
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.31,1.32
Message-ID: <200602071110.k17BAUSb031078@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bluez-utils.spec 
Log Message:
bump for new gcc/glibc


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- bluez-utils.spec	10 Dec 2005 09:02:19 -0000	1.31
+++ bluez-utils.spec	7 Feb 2006 11:10:28 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.22
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -108,6 +108,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.22-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 2.22-2.1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:10:45 -0500
Subject: rpms/bogl/devel bogl.spec,1.18,1.19
Message-ID: <200602071110.k17BAjC3031184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bogl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31156

Modified Files:
	bogl.spec 
Log Message:
bump for new gcc/glibc


Index: bogl.spec
===================================================================
RCS file: /cvs/dist/rpms/bogl/devel/bogl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bogl.spec	9 Dec 2005 22:39:48 -0000	1.18
+++ bogl.spec	7 Feb 2006 11:10:41 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A terminal program for displaying Unicode on the console.
 Name: bogl
 Version: 0.1.18
-Release: 11.1
+Release: 11.2
 # URL: used to be http://www.stanford.edu/~blp/projects.html, now none
 Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.2.tar.gz
 Source1: wlite-0.8.1.tar.gz
@@ -98,6 +98,9 @@
 /usr/lib/bogl
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:10:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:10:55 -0500
Subject: rpms/boost/devel boost.spec,1.22,1.23
Message-ID: <200602071110.k17BAtdX031328@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/boost/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31299

Modified Files:
	boost.spec 
Log Message:
bump for new gcc/glibc


Index: boost.spec
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- boost.spec	5 Jan 2006 21:44:36 -0000	1.22
+++ boost.spec	7 Feb 2006 11:10:53 -0000	1.23
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.33.1
-Release: 4
+Release: 4.1
 License: Boost Software License
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -159,6 +159,9 @@
 %{_docdir}/boost-%{version}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.33.1-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 05 2006 Benjamin Kosnik <bkoz at redhat.com> 1.33.1-4
 - Fix symbolic links.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:11:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:11:15 -0500
Subject: rpms/bootparamd/devel bootparamd.spec,1.17,1.18
Message-ID: <200602071111.k17BBF71031543@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bootparamd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31506

Modified Files:
	bootparamd.spec 
Log Message:
bump for new gcc/glibc


Index: bootparamd.spec
===================================================================
RCS file: /cvs/dist/rpms/bootparamd/devel/bootparamd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bootparamd.spec	17 Jan 2006 06:36:32 -0000	1.17
+++ bootparamd.spec	7 Feb 2006 11:11:13 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A server process which provides boot information to diskless clients.
 Name: bootparamd
 Version: 0.17
-Release: 24.devel
+Release: 24.devel.1
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-bootparamd-%{version}%{_snapshot}.tar.gz
@@ -90,6 +90,9 @@
 %config /etc/rc.d/init.d/bootparamd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-24.devel.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Martin Stransky <stransky at redhat.com> 0.17-24.devel
 - fix for #177902 - Callbootd segfaults when connecting to 
   nonexistent server



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:11:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:11:31 -0500
Subject: rpms/bridge-utils/devel bridge-utils.spec,1.15,1.16
Message-ID: <200602071111.k17BBVAm031716@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bridge-utils.spec 
Log Message:
bump for new gcc/glibc


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bridge-utils.spec	21 Dec 2005 12:40:12 -0000	1.15
+++ bridge-utils.spec	7 Feb 2006 11:11:28 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
 Version: 1.0.6
-Release: 1
+Release: 1.1
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
@@ -63,6 +63,9 @@
 %{_libdir}/libbridge.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 David Woodhouse <dwmw2 at redhat.com> 1.0.6-1
 - Update to 1.0.6
 - Cleanups from Matthias Saou (#172774)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:11:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:11:42 -0500
Subject: rpms/brltty/devel brltty.spec,1.10,1.11
Message-ID: <200602071111.k17BBgkq031851@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31827

Modified Files:
	brltty.spec 
Log Message:
bump for new gcc/glibc


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- brltty.spec	9 Dec 2005 22:39:49 -0000	1.10
+++ brltty.spec	7 Feb 2006 11:11:40 -0000	1.11
@@ -1,6 +1,6 @@
 Name: brltty
 Version: 3.2
-Release: 10.1
+Release: 10.2
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -78,6 +78,9 @@
 /etc/brltty
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-10.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:11:53 -0500
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.44,1.45
Message-ID: <200602071111.k17BBrXd031977@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31948

Modified Files:
	bug-buddy.spec 
Log Message:
bump for new gcc/glibc


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- bug-buddy.spec	17 Jan 2006 17:22:28 -0000	1.44
+++ bug-buddy.spec	7 Feb 2006 11:11:51 -0000	1.45
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.13.0
-Release: 1
+Release: 1.1
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -107,6 +107,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.0-1
 - Update to 2.13.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:04 -0500
Subject: rpms/busybox/devel busybox.spec,1.29,1.30
Message-ID: <200602071112.k17BC4es032099@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32071

Modified Files:
	busybox.spec 
Log Message:
bump for new gcc/glibc


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- busybox.spec	9 Dec 2005 22:39:50 -0000	1.29
+++ busybox.spec	7 Feb 2006 11:12:01 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.01
-Release: 2.1
+Release: 2.2
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -74,6 +74,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:15 -0500
Subject: rpms/byacc/devel byacc-1.9.spec,1.11,1.12
Message-ID: <200602071112.k17BCFGv032236@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/byacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32206

Modified Files:
	byacc-1.9.spec 
Log Message:
bump for new gcc/glibc


Index: byacc-1.9.spec
===================================================================
RCS file: /cvs/dist/rpms/byacc/devel/byacc-1.9.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- byacc-1.9.spec	9 Dec 2005 22:39:50 -0000	1.11
+++ byacc-1.9.spec	7 Feb 2006 11:12:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A public domain Yacc parser generator.
 Name: byacc
 Version: 1.9
-Release: 29.1
+Release: 29.2
 License: public domain
 Group: Development/Tools
 # The source is taken from FreeBSD's CVS as of Thu Sep 28 2000
@@ -46,6 +46,9 @@
 %{_mandir}/man1/byacc.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9-29.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:25 -0500
Subject: rpms/bzip2/devel bzip2.spec,1.16,1.17
Message-ID: <200602071112.k17BCPNH032362@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32332

Modified Files:
	bzip2.spec 
Log Message:
bump for new gcc/glibc


Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzip2.spec	9 Dec 2005 22:39:51 -0000	1.16
+++ bzip2.spec	7 Feb 2006 11:12:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.3
-Release: 2.1
+Release: 2.2
 License: BSD
 Group: Applications/File
 URL: http://sources.redhat.com/bzip2/
@@ -109,6 +109,9 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:38 -0500
Subject: rpms/cadaver/devel cadaver.spec,1.20,1.21
Message-ID: <200602071112.k17BCca7032507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cadaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32480

Modified Files:
	cadaver.spec 
Log Message:
bump for new gcc/glibc


Index: cadaver.spec
===================================================================
RCS file: /cvs/dist/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cadaver.spec	31 Jan 2006 11:08:08 -0000	1.20
+++ cadaver.spec	7 Feb 2006 11:12:35 -0000	1.21
@@ -1,6 +1,6 @@
 Name: cadaver
 Version: 0.22.3
-Release: 2
+Release: 2.1
 Summary: Command-line WebDAV client
 License: GPL
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.22.3-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 0.22.3-2
 - rebuild for neon 0.25.x
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:48 -0500
Subject: rpms/cairo/devel cairo.spec,1.30,1.31
Message-ID: <200602071112.k17BCmU3032631@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32603

Modified Files:
	cairo.spec 
Log Message:
bump for new gcc/glibc


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cairo.spec	31 Jan 2006 16:17:08 -0000	1.30
+++ cairo.spec	7 Feb 2006 11:12:46 -0000	1.31
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.0.2
-Release:   4
+Release:   4.1
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> 1.0.2-4
 - add patch from Tim Mayberry to support embbedded bitmap
   fonts (bug 176910)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:12:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:12:59 -0500
Subject: rpms/cairo-java/devel cairo-java.spec,1.21,1.22
Message-ID: <200602071112.k17BCxCQ032766@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32734

Modified Files:
	cairo-java.spec 
Log Message:
bump for new gcc/glibc


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cairo-java.spec	22 Dec 2005 22:16:29 -0000	1.21
+++ cairo-java.spec	7 Feb 2006 11:12:56 -0000	1.22
@@ -12,7 +12,7 @@
 
 %define	name_base	cairo-java
 %define	version		1.0.2
-%define release 	0
+%define release 	0.1
 # exclude while s390x is borked on beehive
 #ExcludeArch: s390x
 
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-0.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Andrw Cagney <cagney at redhat.com> - 1.0.2-0
                   Adam Jocksch <ajocksch at redhat.com>
 - import cairo-java-1.0.2.tar.gz.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:10 -0500
Subject: rpms/ccs/devel ccs.spec,1.31,1.32
Message-ID: <200602071113.k17BDAIp000429@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ccs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv398

Modified Files:
	ccs.spec 
Log Message:
bump for new gcc/glibc


Index: ccs.spec
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ccs.spec	9 Dec 2005 22:39:51 -0000	1.31
+++ ccs.spec	7 Feb 2006 11:13:07 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: ccs
 Version: 1.0.2
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Base
 Summary: CCS - The Cluster Configuration System
@@ -85,6 +85,9 @@
 %{_includedir}/ccs.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:20 -0500
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.22,1.23
Message-ID: <200602071113.k17BDKq8000557@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdparanoia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv527

Modified Files:
	cdparanoia.spec 
Log Message:
bump for new gcc/glibc


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/dist/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cdparanoia.spec	9 Dec 2005 22:39:52 -0000	1.22
+++ cdparanoia.spec	7 Feb 2006 11:13:17 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name: cdparanoia
 Version: %{realver}
-Release: 26.1
+Release: 26.2
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
@@ -123,6 +123,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - alpha9.8-26.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:30 -0500
Subject: rpms/cdrdao/devel cdrdao.spec,1.30,1.31
Message-ID: <200602071113.k17BDUoV000689@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdrdao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv659

Modified Files:
	cdrdao.spec 
Log Message:
bump for new gcc/glibc


Index: cdrdao.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cdrdao.spec	17 Jan 2006 13:36:53 -0000	1.30
+++ cdrdao.spec	7 Feb 2006 11:13:28 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
 Name: cdrdao
 Version: 1.2.0
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://cdrdao.sourceforge.net/
@@ -54,6 +54,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Harald Hoyer <harald at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:41 -0500
Subject: rpms/cdrtools/devel cdrtools.spec,1.39,1.40
Message-ID: <200602071113.k17BDfa3000809@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cdrtools.spec 
Log Message:
bump for new gcc/glibc


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cdrtools.spec	17 Jan 2006 13:26:37 -0000	1.39
+++ cdrtools.spec	7 Feb 2006 11:13:37 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a03
-Release: 2
+Release: 2.1
 %define tarversion 2.01.01a03
 License: GPL
 Group: Applications/System
@@ -229,6 +229,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a03-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a03-2
 - removed rezero_unit, so that non-root users can burn CDs
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:46 -0500
Subject: rpms/udev/devel udev-extras.patch,1.1,1.2 udev-rules.patch,1.1,1.2
Message-ID: <200602071113.k17BDk5L000875@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv821

Modified Files:
	udev-extras.patch udev-rules.patch 
Log Message:
version 084

udev-extras.patch:
 check-cdrom.sh            |   39 +++++++++++++++++++++++++++++++++++++++
 ide-media.sh              |    7 +++++++
 load_floppy_module.sh     |   35 +++++++++++++++++++++++++++++++++++
 run_directory/MAKEDEV.dev |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+)

Index: udev-extras.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-extras.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-extras.patch	7 Feb 2006 11:06:19 -0000	1.1
+++ udev-extras.patch	7 Feb 2006 11:13:42 -0000	1.2
@@ -1,6 +1,6 @@
 --- /dev/null	2006-02-07 10:47:25.401206250 +0100
 +++ udev-084/extras/check-cdrom.sh	2006-02-07 10:58:51.000000000 +0100
-@@ -0,1 +1,40 @@
+@@ -0,0 +1,39 @@
 +#!/bin/bash
 +
 +pos=0
@@ -42,7 +42,7 @@
 +}
 --- /dev/null	2006-02-07 10:47:25.401206250 +0100
 +++ udev-084/extras/ide-media.sh	2006-02-07 10:58:51.000000000 +0100
-@@ -0,1 +1,8 @@
+@@ -0,0 +1,7 @@
 +#!/bin/bash 
 +i=0
 +while [[ ! -a /proc/ide/$1/media && $i -lt 10 ]]; do 
@@ -93,7 +93,7 @@
 +fi
 --- /dev/null	2006-02-07 10:47:25.401206250 +0100
 +++ udev-084/extras/load_floppy_module.sh	2006-02-07 10:58:51.000000000 +0100
-@@ -0,1 +1,36 @@
+@@ -0,0 +1,35 @@
 +#!/bin/sh
 +########################################################################
 +#

udev-rules.patch:
 05-udev-early.rules  |    9 +++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 ++++-
 udev.rules           |  118 ++++++++++++++++++++++++++-------------------------
 4 files changed, 82 insertions(+), 59 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-rules.patch	7 Feb 2006 11:06:20 -0000	1.1
+++ udev-rules.patch	7 Feb 2006 11:13:42 -0000	1.2
@@ -2,6 +2,7 @@
 +++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-07 11:30:42.000000000 +0100
 @@ -0,0 +1 @@
 +ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
+
 --- udev-084/etc/udev/redhat/hotplug.rules.redhat	2006-01-30 08:51:38.000000000 +0100
 +++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-07 10:58:51.000000000 +0100
 @@ -1,9 +1,16 @@
@@ -23,9 +24,10 @@
  
 +
 +LABEL="hotplug_end"
+
 --- /dev/null	2006-02-07 10:47:25.401206250 +0100
 +++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-07 11:30:42.000000000 +0100
-@@ -0,1 +1,10 @@
+@@ -0,0 +1,9 @@
 +# sysfs is populated after the event is sent
 +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:13:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:13:56 -0500
Subject: rpms/check/devel check.spec,1.2,1.3
Message-ID: <200602071113.k17BDuh6000989@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/check/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv960

Modified Files:
	check.spec 
Log Message:
bump for new gcc/glibc


Index: check.spec
===================================================================
RCS file: /cvs/dist/rpms/check/devel/check.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- check.spec	19 Dec 2005 19:41:15 -0000	1.2
+++ check.spec	7 Feb 2006 11:13:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	4.fc5
+Release:	4.fc5.1
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -54,6 +54,9 @@
 %{_datadir}/aclocal/check.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3-4.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Warren Togami <wtogami at redhat.com> 0.9.2-4
 - import into FC5 for gstreamer-0.10
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:14:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:14:06 -0500
Subject: rpms/checkpolicy/devel checkpolicy.spec,1.87,1.88
Message-ID: <200602071114.k17BE6V1001126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1093

Modified Files:
	checkpolicy.spec 
Log Message:
bump for new gcc/glibc


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- checkpolicy.spec	13 Jan 2006 22:33:16 -0000	1.87
+++ checkpolicy.spec	7 Feb 2006 11:14:04 -0000	1.88
@@ -2,7 +2,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 1.28
-Release: 5
+Release: 5.1
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,9 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.28-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Dan Walsh <dwalsh at redhat.com> 1.28-5
 - Rebuild to get latest libsepol
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:14:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:14:19 -0500
Subject: rpms/chkconfig/devel chkconfig.spec,1.33,1.34
Message-ID: <200602071114.k17BEJNB001266@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1235

Modified Files:
	chkconfig.spec 
Log Message:
bump for new gcc/glibc


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- chkconfig.spec	3 Feb 2006 03:44:00 -0000	1.33
+++ chkconfig.spec	7 Feb 2006 11:14:16 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
 Version: 1.3.26
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.26-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 1.3.26-1
 - add support for resetting priorities without on/off status (#178864)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:14:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:14:30 -0500
Subject: rpms/chkfontpath/devel chkfontpath.spec,1.12,1.13
Message-ID: <200602071114.k17BEUgi001401@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkfontpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1373

Modified Files:
	chkfontpath.spec 
Log Message:
bump for new gcc/glibc


Index: chkfontpath.spec
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/chkfontpath.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- chkfontpath.spec	9 Dec 2005 22:40:02 -0000	1.12
+++ chkfontpath.spec	7 Feb 2006 11:14:27 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Simple interface for editing the font path for the X font server.
 Name: chkfontpath
 Version: 1.10.0
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -41,6 +41,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:14:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:14:42 -0500
Subject: rpms/ckermit/devel ckermit.spec,1.17,1.18
Message-ID: <200602071114.k17BEgsC001560@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ckermit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1527

Modified Files:
	ckermit.spec 
Log Message:
bump for new gcc/glibc


Index: ckermit.spec
===================================================================
RCS file: /cvs/dist/rpms/ckermit/devel/ckermit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ckermit.spec	9 Dec 2005 22:40:02 -0000	1.17
+++ ckermit.spec	7 Feb 2006 11:14:40 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The quintessential all-purpose communications program
 Name: ckermit
 Version: 8.0.211
-Release: 4.1
+Release: 4.2
 License: Special (see COPYING.TXT.gz)
 Group: Applications/Communications
 Source0: ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
@@ -82,6 +82,9 @@
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.0.211-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:14:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:14:54 -0500
Subject: rpms/cman/devel cman.spec,1.23,1.24
Message-ID: <200602071114.k17BEskb001701@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1669

Modified Files:
	cman.spec 
Log Message:
bump for new gcc/glibc


Index: cman.spec
===================================================================
RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cman.spec	16 Dec 2005 22:23:24 -0000	1.23
+++ cman.spec	7 Feb 2006 11:14:51 -0000	1.24
@@ -12,7 +12,7 @@
 
 Name: cman
 Version: 1.0.4
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL
 Group: System Environment/Base
 Summary: cman - The Cluster Manager
@@ -81,6 +81,9 @@
 %{_libdir}/libcman.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:15:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:15:05 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.132,1.133
Message-ID: <200602071115.k17BF5GK001854@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cman-kernel.spec 
Log Message:
bump for new gcc/glibc


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- cman-kernel.spec	13 Jan 2006 22:16:10 -0000	1.132
+++ cman-kernel.spec	7 Feb 2006 11:15:02 -0000	1.133
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11
+Release: 20051219.162641.FC5.11.1
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules
@@ -225,6 +225,9 @@
 %{_includedir}/cluster/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051219.162641.FC5.11.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Chris Feist <cfeist at redhat.com>
 - Rebuilt and bumped version number to 2.6.15
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:15:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:15:24 -0500
Subject: rpms/compat-db/devel compat-db.spec,1.15,1.16
Message-ID: <200602071115.k17BFOQ3002031@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-db.spec 
Log Message:
bump for new gcc/glibc


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compat-db.spec	9 Dec 2005 22:40:04 -0000	1.15
+++ compat-db.spec	7 Feb 2006 11:15:20 -0000	1.16
@@ -16,7 +16,7 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
 Name: compat-db
 Version: 4.2.52
-Release: 3.1
+Release: 3.2
 # Tarball taken from glibc 2.1.3  
 #Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz  
 Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
@@ -168,6 +168,9 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:15:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:15:42 -0500
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.9,1.10
Message-ID: <200602071115.k17BFgYx002198@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2167

Modified Files:
	compat-gcc-296.spec 
Log Message:
bump for new gcc/glibc


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compat-gcc-296.spec	4 Jan 2006 13:15:15 -0000	1.9
+++ compat-gcc-296.spec	7 Feb 2006 11:15:39 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
-Release: %{gcc_release}
+Release: %{gcc_release}.1
 License: GPL
 Group: Development/Languages
 ExclusiveArch: %{ix86} ia64 ppc
@@ -1088,6 +1088,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.96-134.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan  4 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-134
 - rebuilt against glibc-2.3.90-26 to pick up a sanitized
   <bits/libc-lock.h> (#176745)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:16:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:16:10 -0500
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.17,1.18
Message-ID: <200602071116.k17BGAO5004630@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4364

Modified Files:
	compat-gcc-32.spec 
Log Message:
bump for new gcc/glibc


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compat-gcc-32.spec	4 Jan 2006 13:11:06 -0000	1.17
+++ compat-gcc-32.spec	7 Feb 2006 11:16:07 -0000	1.18
@@ -21,7 +21,7 @@
 Summary: The compatibility GNU Compiler Collection
 Name: compat-gcc-32
 Version: %{gcc_version}
-Release: %{gcc_release}
+Release: %{gcc_release}.1
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
@@ -634,6 +634,9 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-54.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan  4 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-54.fc5
 - rebuilt with new gcc, massage $RPM_OPT_FLAGS, as GCC 3.2.3-RH doesn't
   grok -fstack-protector etc.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:16:43 -0500
Subject: rpms/compat-slang/devel compat-slang.spec,1.11,1.12
Message-ID: <200602071116.k17BGhOp008339@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8244

Modified Files:
	compat-slang.spec 
Log Message:
bump for new gcc/glibc


Index: compat-slang.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-slang/devel/compat-slang.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat-slang.spec	9 Dec 2005 22:40:04 -0000	1.11
+++ compat-slang.spec	7 Feb 2006 11:16:40 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: compat-slang
 Version: 1.4.9
-Release: 27.1
+Release: 27.2
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 %{_libdir}/libslang*.so.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.9-27.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:17:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:17:03 -0500
Subject: rpms/control-center/devel control-center.spec,1.123,1.124
Message-ID: <200602071117.k17BH3WC009481@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9201

Modified Files:
	control-center.spec 
Log Message:
bump for new gcc/glibc


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- control-center.spec	6 Feb 2006 21:24:24 -0000	1.123
+++ control-center.spec	7 Feb 2006 11:17:00 -0000	1.124
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.90
-Release: 6
+Release: 6.1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -230,6 +230,9 @@
 # (also its headers)
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.90-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.13.90-6
 - Avoid delays when switching backgrounds
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:17:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:17:18 -0500
Subject: rpms/coreutils/devel coreutils.spec,1.106,1.107
Message-ID: <200602071117.k17BHI5k011173@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	coreutils.spec 
Log Message:
bump for new gcc/glibc


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- coreutils.spec	23 Jan 2006 13:26:36 -0000	1.106
+++ coreutils.spec	7 Feb 2006 11:17:15 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.93
-Release: 7
+Release: 7.1
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
 /sbin/runuser
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.93-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed chcon(1) bug reporting address (bug #178523).
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:17:36 -0500
Subject: rpms/cpio/devel cpio.spec,1.32,1.33
Message-ID: <200602071117.k17BHa7k012467@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12312

Modified Files:
	cpio.spec 
Log Message:
bump for new gcc/glibc


Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cpio.spec	9 Dec 2005 22:40:05 -0000	1.32
+++ cpio.spec	7 Feb 2006 11:17:33 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 11.1
+Release: 11.2
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -105,6 +105,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:17:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:17:58 -0500
Subject: rpms/cracklib/devel cracklib.spec,1.25,1.26
Message-ID: <200602071117.k17BHwBs014441@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cracklib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14290

Modified Files:
	cracklib.spec 
Log Message:
bump for new gcc/glibc


Index: cracklib.spec
===================================================================
RCS file: /cvs/dist/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cracklib.spec	9 Dec 2005 22:40:06 -0000	1.25
+++ cracklib.spec	7 Feb 2006 11:17:53 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.8.6
-Release: 1.1
+Release: 1.2
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
@@ -145,6 +145,9 @@
 %{_sbindir}/packer
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:18:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:18:17 -0500
Subject: rpms/crash/devel crash.spec,1.9,1.10
Message-ID: <200602071118.k17BIH6w015950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/crash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15919

Modified Files:
	crash.spec 
Log Message:
bump for new gcc/glibc


Index: crash.spec
===================================================================
RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- crash.spec	4 Jan 2006 19:34:12 -0000	1.9
+++ crash.spec	7 Feb 2006 11:18:14 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles
 Name: crash
 Version: 4.0
-Release: 2.18
+Release: 2.18.1
 License: GPL
 Group: Development/Debuggers
 Source: %{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 %doc README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0-2.18.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 04 2006 Dave Anderson <anderson at redhat.com> 4.0-2.18
 - Updated source package to crash-4.0.tar.gz, and crash.patch
   to bring it up to 4.0-2.18.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:18:33 -0500
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.22,1.23
Message-ID: <200602071118.k17BIXvl016128@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	crypto-utils.spec 
Log Message:
bump for new gcc/glibc


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- crypto-utils.spec	9 Dec 2005 22:40:07 -0000	1.22
+++ crypto-utils.spec	7 Feb 2006 11:18:30 -0000	1.23
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.2
-Release: 9.1
+Release: 9.2
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -101,6 +101,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:18:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:18:47 -0500
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.15,1.16
Message-ID: <200602071118.k17BIllC016274@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16238

Modified Files:
	cryptsetup-luks.spec 
Log Message:
bump for new gcc/glibc


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cryptsetup-luks.spec	9 Dec 2005 22:40:07 -0000	1.15
+++ cryptsetup-luks.spec	7 Feb 2006 11:18:44 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.1
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
@@ -66,6 +66,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:18:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:18:58 -0500
Subject: rpms/cscope/devel cscope.spec,1.19,1.20
Message-ID: <200602071118.k17BIwwW016406@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16382

Modified Files:
	cscope.spec 
Log Message:
bump for new gcc/glibc


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cscope.spec	23 Dec 2005 00:12:06 -0000	1.19
+++ cscope.spec	7 Feb 2006 11:18:55 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13 
+Release: 13.1 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -85,6 +85,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 15.5-13.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuild on new gcc
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:19:09 -0500
Subject: rpms/ctags/devel ctags.spec,1.16,1.17
Message-ID: <200602071119.k17BJ9RR016536@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ctags/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16509

Modified Files:
	ctags.spec 
Log Message:
bump for new gcc/glibc


Index: ctags.spec
===================================================================
RCS file: /cvs/dist/rpms/ctags/devel/ctags.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ctags.spec	9 Dec 2005 22:40:07 -0000	1.16
+++ ctags.spec	7 Feb 2006 11:19:06 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A C programming language indexing and/or cross-reference tool.
 Name: ctags
 Version: 5.5.4
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/ctags/ctags-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man1/ctags*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.5.4-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:19:21 -0500
Subject: rpms/cups/devel cups.spec,1.131,1.132
Message-ID: <200602071119.k17BJLZu016684@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cups.spec 
Log Message:
bump for new gcc/glibc


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- cups.spec	25 Jan 2006 17:09:53 -0000	1.131
+++ cups.spec	7 Feb 2006 11:19:19 -0000	1.132
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 30
+Release: 30.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
@@ -433,6 +433,9 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Tim Waugh <twaugh at redhat.com>
 - Fixed link patch.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:19:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:19:39 -0500
Subject: rpms/curl/devel curl.spec,1.31,1.32
Message-ID: <200602071119.k17BJdVp016864@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16832

Modified Files:
	curl.spec 
Log Message:
bump for new gcc/glibc


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- curl.spec	9 Dec 2005 22:40:08 -0000	1.31
+++ curl.spec	7 Feb 2006 11:19:36 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Name: curl 
 Version: 7.15.1
-Release: 1.1
+Release: 1.2
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -91,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.15.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:19:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:19:52 -0500
Subject: rpms/cvs/devel cvs.spec,1.40,1.41
Message-ID: <200602071119.k17BJqFH017009@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cvs.spec 
Log Message:
bump for new gcc/glibc


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cvs.spec	21 Dec 2005 15:06:52 -0000	1.40
+++ cvs.spec	7 Feb 2006 11:19:50 -0000	1.41
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.21
-Release: 3
+Release: 3.1
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -139,6 +139,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.21-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Martin Stransky <stransky at redhat.com> 1.11.21-3
 - fix for #150031 - cvs diff -kk -u fails
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:20:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:20:04 -0500
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.46,1.47
Message-ID: <200602071120.k17BK4KU017145@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cyrus-sasl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17114

Modified Files:
	cyrus-sasl.spec 
Log Message:
bump for new gcc/glibc


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/dist/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cyrus-sasl.spec	12 Jan 2006 01:32:46 -0000	1.46
+++ cyrus-sasl.spec	7 Feb 2006 11:20:01 -0000	1.47
@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.21
-Release: 9
+Release: 9.1
 License: Freely Distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -409,6 +409,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.21-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Nalin Dahyabhai <nalin at redhat.com> 2.1.21-9
 - use --as-needed to avoid linking dbconverter-2 with SQL libraries, which
   it doesn't use because it manipulates files directly (#173321)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:20:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:20:22 -0500
Subject: rpms/dasher/devel dasher.spec,1.27,1.28
Message-ID: <200602071120.k17BKMfS017306@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17277

Modified Files:
	dasher.spec 
Log Message:
bump for new gcc/glibc


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dasher.spec	31 Jan 2006 04:15:18 -0000	1.27
+++ dasher.spec	7 Feb 2006 11:20:18 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 3.99.2
-Release: 2
+Release: 2.1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -80,6 +80,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.99.2-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Ray Strode <rstrode at redhat.com> 3.99.2-2
 - make compile
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:20:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:20:35 -0500
Subject: rpms/db4/devel db4.spec,1.28,1.29
Message-ID: <200602071120.k17BKZVP017443@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17414

Modified Files:
	db4.spec 
Log Message:
bump for new gcc/glibc


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- db4.spec	9 Dec 2005 22:40:09 -0000	1.28
+++ db4.spec	7 Feb 2006 11:20:32 -0000	1.29
@@ -11,7 +11,7 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 1.1
+Release: 1.2
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
@@ -356,6 +356,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:20:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:20:54 -0500
Subject: rpms/dbus/devel dbus.spec,1.68,1.69
Message-ID: <200602071120.k17BKs00017637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17605

Modified Files:
	dbus.spec 
Log Message:
bump for new gcc/glibc


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- dbus.spec	23 Jan 2006 23:34:31 -0000	1.68
+++ dbus.spec	7 Feb 2006 11:20:51 -0000	1.69
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.60
-Release: 7 
+Release: 7.1 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.60-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 John (J5) Palmieri <johnp at redhat.com> 0.60-7
 - Add patch to fix the python callchain
 - Symlink dbus-send to /usr/bin because some applications



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:21:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:21:10 -0500
Subject: rpms/dcraw/devel dcraw.spec,1.5,1.6
Message-ID: <200602071121.k17BLAp5017806@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dcraw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17776

Modified Files:
	dcraw.spec 
Log Message:
bump for new gcc/glibc


Index: dcraw.spec
===================================================================
RCS file: /cvs/dist/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dcraw.spec	14 Dec 2005 16:52:07 -0000	1.5
+++ dcraw.spec	7 Feb 2006 11:21:07 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: A tool for decoding raw image data from digital cameras.
 Name: dcraw
 Version: 0.0.%dcrawdate
-Release: 1
+Release: 1.1
 Group: Applications/Multimedia
 License: freely distributable
 #The next file is actually http://www.cybercom.net/~dcoffin/dcraw/dcraw.c
@@ -41,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.20051211-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 14 2005 Nils Philippsen <nphilipp at redhat.com>
 - version of 2005-12-11
 - manpage of 2005-09-29



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:21:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:21:22 -0500
Subject: rpms/ddd/devel ddd.spec,1.23,1.24
Message-ID: <200602071121.k17BLMMP017954@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ddd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17924

Modified Files:
	ddd.spec 
Log Message:
bump for new gcc/glibc


Index: ddd.spec
===================================================================
RCS file: /cvs/dist/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ddd.spec	12 Dec 2005 11:44:35 -0000	1.23
+++ ddd.spec	7 Feb 2006 11:21:19 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.11
-Release: 5
+Release: 5.1
 License: GPL or BSD
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
@@ -85,6 +85,9 @@
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3.11-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 12 2005 Than Ngo <than at redhat.com> 3.3.11-5 
 - rebuilt against new openmotif-2.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:21:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:21:35 -0500
Subject: rpms/mesa/devel mesa.spec,1.39,1.40
Message-ID: <200602071121.k17BLZZV018108@cvs.devel.redhat.com>

Author: mharris

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

Modified Files:
	mesa.spec 
Log Message:
Use libOSMesa.so.6.4.0604* glob in file manifest, to avoid having to update it each upstream release.


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mesa.spec	7 Feb 2006 10:53:01 -0000	1.39
+++ mesa.spec	7 Feb 2006 11:21:32 -0000	1.40
@@ -365,7 +365,7 @@
 # to me currently, but it is a change from Xorg 6.8.2's Mesa.
 #%{_libdir}/libGL.so.1.5.060400
 %{_libdir}/libOSMesa.so.6
-%{_libdir}/libOSMesa.so.6.4.060401
+%{_libdir}/libOSMesa.so.6.4.0604*
 %endif
 
 %files libGL-devel
@@ -442,6 +442,8 @@
   be modified to require the user to manually turn experimental DRI support
   on with Option "dri" in xorg.conf to test it out and report all X bugs that
   occur while using it directly to X.Org bugzilla.  (#179712)
+- Use "libOSMesa.so.6.4.0604*" glob in file manifest, to avoid having to
+  update it each upstream release.
 
 * Sat Feb  4 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-1
 - Updated to Mesa 6.4.2



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:21:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:21:38 -0500
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.22,1.23
Message-ID: <200602071121.k17BLcV1018138@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18107

Modified Files:
	desktop-file-utils.spec 
Log Message:
bump for new gcc/glibc


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- desktop-file-utils.spec	22 Jan 2006 20:56:29 -0000	1.22
+++ desktop-file-utils.spec	7 Feb 2006 11:21:35 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 4
+Release: 4.1
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch
@@ -51,6 +51,9 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 22 2006 Ray Strode <rstrode at redhat.com> - 0.10-4
 - don't use uninitialized memory (bug 178591)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:22:00 -0500
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.49,1.50
Message-ID: <200602071122.k17BM0vU018368@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18335

Modified Files:
	desktop-printing.spec 
Log Message:
bump for new gcc/glibc


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- desktop-printing.spec	12 Jan 2006 00:58:11 -0000	1.49
+++ desktop-printing.spec	7 Feb 2006 11:21:57 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 5 
+Release: 5.1 
 License: GPL
 Group: Applications/File
 # total lie
@@ -87,6 +87,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.19-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 11 2006 John (J5) Palmieri <johnp at redhat.com> - 0.19-5
 - Add patch for fixing a crasher when plugging in a printer
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:22:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:22:24 -0500
Subject: rpms/dev86/devel dev86.spec,1.15,1.16
Message-ID: <200602071122.k17BMO86018586@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dev86/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18557

Modified Files:
	dev86.spec 
Log Message:
bump for new gcc/glibc


Index: dev86.spec
===================================================================
RCS file: /cvs/dist/rpms/dev86/devel/dev86.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dev86.spec	25 Jan 2006 22:56:46 -0000	1.15
+++ dev86.spec	7 Feb 2006 11:22:21 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A real mode 80x86 assembler and linker.
 Name: dev86
 Version: 0.16.17
-Release: 2
+Release: 2.1
 License: GPL
 Group: Development/Languages
 Source: http://www.cix.co.uk/~mayday/Dev86src-%{version}.tar.gz
@@ -65,6 +65,9 @@
 /%{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.17-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Jeremy Katz <katzj at redhat.com> - 0.16.17-2
 - build on x86_64
 - don't build elks (it's not happy on x86_64)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:22:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:22:35 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.32,1.33
Message-ID: <200602071122.k17BMZDF018717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18687

Modified Files:
	devhelp.spec 
Log Message:
bump for new gcc/glibc


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- devhelp.spec	18 Dec 2005 19:42:43 -0000	1.32
+++ devhelp.spec	7 Feb 2006 11:22:32 -0000	1.33
@@ -3,7 +3,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.11
-Release:             1
+Release:             1.1
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -100,6 +100,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Dec 18 2005 Ray Strode <rstrode at redhat.com> - 0.11-1
 - Update to 0.11
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:22:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:22:46 -0500
Subject: rpms/device-mapper/devel device-mapper.spec,1.26,1.27
Message-ID: <200602071122.k17BMkGo018855@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18823

Modified Files:
	device-mapper.spec 
Log Message:
bump for new gcc/glibc


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- device-mapper.spec	11 Jan 2006 15:34:57 -0000	1.26
+++ device-mapper.spec	7 Feb 2006 11:22:43 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.02
-Release: 3
+Release: 3.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.02.02-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 11 2006 Karel Zak <kzak at redhat.com> - 1.02.02-3
 - cleanup selinux patch
 - add pkg-config support



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:22:56 -0500
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.18, 1.19
Message-ID: <200602071122.k17BMuri018976@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18946

Modified Files:
	device-mapper-multipath.spec 
Log Message:
bump for new gcc/glibc


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- device-mapper-multipath.spec	19 Dec 2005 17:30:31 -0000	1.18
+++ device-mapper-multipath.spec	7 Feb 2006 11:22:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 9.1
+Release: 9.1.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -62,6 +62,9 @@
 /var/cache/multipath
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4.5-9.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Benjamin Marzinski <bmarzins at redhat.com> - 0.4.5-9.1
 - added patch for fedora changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:23:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:23:09 -0500
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.25,1.26
Message-ID: <200602071123.k17BN9Eh019104@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19075

Modified Files:
	dhcdbd.spec 
Log Message:
bump for new gcc/glibc


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- dhcdbd.spec	17 Jan 2006 21:40:34 -0000	1.25
+++ dhcdbd.spec	7 Feb 2006 11:23:05 -0000	1.26
@@ -9,7 +9,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
 Version:   1.12
-Release:   1.FC5
+Release:   1.FC5.1
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Jason Vas Dias <jvdias at redhat.com> 1.12-1
 - Cleanup un-exercised code in dbus_service.c, lines 381 & 391
   (pointed out by David Binderman<dcb314 at hotmail.com>)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:23:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:23:19 -0500
Subject: rpms/dialog/devel dialog.spec,1.21,1.22
Message-ID: <200602071123.k17BNJKV019237@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19206

Modified Files:
	dialog.spec 
Log Message:
bump for new gcc/glibc


Index: dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/dialog/devel/dialog.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dialog.spec	9 Dec 2005 22:40:12 -0000	1.21
+++ dialog.spec	7 Feb 2006 11:23:17 -0000	1.22
@@ -2,7 +2,7 @@
 Name: dialog
 %define SubVersion 20051107
 Version: 1.0.%{SubVersion}
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 URL: http://invisible-island.net/dialog/dialog.html
@@ -46,6 +46,9 @@
 #%{_datadir}/locale/*/LC_MESSAGES/dialog.mo
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.20051107-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:23:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:23:31 -0500
Subject: rpms/dictd/devel dictd.spec,1.19,1.20
Message-ID: <200602071123.k17BNVtX019373@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dictd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19342

Modified Files:
	dictd.spec 
Log Message:
bump for new gcc/glibc


Index: dictd.spec
===================================================================
RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dictd.spec	2 Jan 2006 14:43:49 -0000	1.19
+++ dictd.spec	7 Feb 2006 11:23:27 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: DICT protocol (RFC 2229) command-line client
 Name: dictd
 Version: 1.9.15
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/Internet
 Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.15-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 02 2006 Karsten Hopp <karsten at redhat.de> 1.9.15-5
 - add BuildRequires libtool-ltdl-devel (#176505)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:23:40 -0500
Subject: rpms/diffstat/devel diffstat.spec,1.15,1.16
Message-ID: <200602071123.k17BNeU6019500@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19473

Modified Files:
	diffstat.spec 
Log Message:
bump for new gcc/glibc


Index: diffstat.spec
===================================================================
RCS file: /cvs/dist/rpms/diffstat/devel/diffstat.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- diffstat.spec	9 Dec 2005 22:40:12 -0000	1.15
+++ diffstat.spec	7 Feb 2006 11:23:38 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A utility which provides statistics based on the output of diff.
 Name: diffstat
 Version: 1.41
-Release: 1.1
+Release: 1.2
 Group: Development/Tools
 License: distributable
 URL: http://invisible-island.net/diffstat
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:23:50 -0500
Subject: rpms/diffutils/devel diffutils.spec,1.17,1.18
Message-ID: <200602071123.k17BNo8p019621@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19591

Modified Files:
	diffutils.spec 
Log Message:
bump for new gcc/glibc


Index: diffutils.spec
===================================================================
RCS file: /cvs/dist/rpms/diffutils/devel/diffutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- diffutils.spec	9 Dec 2005 22:40:12 -0000	1.17
+++ diffutils.spec	7 Feb 2006 11:23:47 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities.
 Name: diffutils
 Version: 2.8.1
-Release: 15.1
+Release: 15.2
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_infodir}/diff.info*gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.1-15.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:02 -0500
Subject: rpms/diskdumputils/devel diskdumputils.spec,1.15,1.16
Message-ID: <200602071124.k17BO2jn019776@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diskdumputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19745

Modified Files:
	diskdumputils.spec 
Log Message:
bump for new gcc/glibc


Index: diskdumputils.spec
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/diskdumputils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- diskdumputils.spec	17 Dec 2005 01:29:29 -0000	1.15
+++ diskdumputils.spec	7 Feb 2006 11:24:00 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: diskdump utilities
 Name: diskdumputils
 Version: 1.0.1
-Release: 6.3
+Release: 6.3.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/System
@@ -61,6 +61,9 @@
 /usr/sbin/savecore
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-6.3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:13 -0500
Subject: rpms/distcache/devel distcache.spec,1.14,1.15
Message-ID: <200602071124.k17BODq4019898@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/distcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19874

Modified Files:
	distcache.spec 
Log Message:
bump for new gcc/glibc


Index: distcache.spec
===================================================================
RCS file: /cvs/dist/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- distcache.spec	9 Dec 2005 22:40:13 -0000	1.14
+++ distcache.spec	7 Feb 2006 11:24:10 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 12.1
+Release: 12.2
 License: LGPL
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
@@ -101,6 +101,9 @@
 %{_mandir}/man2/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:23 -0500
Subject: rpms/dlm/devel dlm.spec,1.23,1.24
Message-ID: <200602071124.k17BON8b020033@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dlm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20003

Modified Files:
	dlm.spec 
Log Message:
bump for new gcc/glibc


Index: dlm.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm/devel/dlm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dlm.spec	23 Dec 2005 00:41:45 -0000	1.23
+++ dlm.spec	7 Feb 2006 11:24:21 -0000	1.24
@@ -12,7 +12,7 @@
 
 Name: dlm
 Version: 1.0.0
-Release: 9.FC5
+Release: 9.FC5.1
 License: LGPL
 Group: System Environment/Kernel
 Summary: dlm - The Distributed Lock Manager
@@ -65,6 +65,9 @@
 %{_libdir}/libdlm_lt.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-9.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt again
 - don't build on ppc ppc64 since the dlm-kernel isnt built there either.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:35 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.107,1.108
Message-ID: <200602071124.k17BOZMX020167@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dlm-kernel.spec 
Log Message:
bump for new gcc/glibc


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- dlm-kernel.spec	13 Jan 2006 22:16:47 -0000	1.107
+++ dlm-kernel.spec	7 Feb 2006 11:24:32 -0000	1.108
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9
+Release: 20051219.162641.FC5.9.1
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.
@@ -233,6 +233,9 @@
 %{_includedir}/cluster/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051219.162641.FC5.9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Chris Feist <cfeist at redhat.com>
 - Rebuilt and bumped version number to 2.6.15
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:46 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.32,1.33
Message-ID: <200602071124.k17BOkBL020299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20268

Modified Files:
	dmraid.spec 
Log Message:
bump for new gcc/glibc


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dmraid.spec	22 Jan 2006 21:34:11 -0000	1.32
+++ dmraid.spec	7 Feb 2006 11:24:43 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc9
-Release: FC5_5
+Release: FC5_5.1
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -104,6 +104,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 22 2006 Peter Jones <pjones at redhat.com> 1.0.0.rc9-FC5_5
 - Add selinux build deps
 - Don't set owner during make install



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:24:59 -0500
Subject: rpms/dos2unix/devel dos2unix.spec,1.18,1.19
Message-ID: <200602071124.k17BOxjq020451@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dos2unix.spec 
Log Message:
bump for new gcc/glibc


Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dos2unix.spec	9 Dec 2005 22:40:15 -0000	1.18
+++ dos2unix.spec	7 Feb 2006 11:24:56 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 24.1
+Release: 24.2
 Group: Applications/Text
 License: Freely distributable
 Source: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:25:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:25:13 -0500
Subject: rpms/dosfstools/devel dosfstools.spec,1.22,1.23
Message-ID: <200602071125.k17BPDY0020601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dosfstools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20569

Modified Files:
	dosfstools.spec 
Log Message:
bump for new gcc/glibc


Index: dosfstools.spec
===================================================================
RCS file: /cvs/dist/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dosfstools.spec	18 Dec 2005 19:53:37 -0000	1.22
+++ dosfstools.spec	7 Feb 2006 11:25:09 -0000	1.23
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Version: 2.11
-Release: 4
+Release: 4.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.11-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Dec 16 2005 Jakub Jelinek <jakub at redhat.com> 2.11-4
 - rebuilt with GCC 4.1
 - make it build with -D_FORTIFY_SOURCE=2



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:25:24 -0500
Subject: rpms/dovecot/devel dovecot.spec,1.41,1.42
Message-ID: <200602071125.k17BPOCH020732@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dovecot.spec 
Log Message:
bump for new gcc/glibc


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dovecot.spec	2 Feb 2006 16:35:05 -0000	1.41
+++ dovecot.spec	7 Feb 2006 11:25:21 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta2.3
+Release: 0.beta2.3.1
 License: LGPL
 Group: System Environment/Daemons
 
@@ -202,6 +202,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.beta2.3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta2.3
 - change the compiled-in defaults and adjust the default's configfile
   commented-out example settings to match compiled-in defaults,



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:25:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:25:36 -0500
Subject: rpms/doxygen/devel doxygen.spec,1.34,1.35
Message-ID: <200602071125.k17BPaVZ020876@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20846

Modified Files:
	doxygen.spec 
Log Message:
bump for new gcc/glibc


Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- doxygen.spec	31 Jan 2006 18:10:47 -0000	1.34
+++ doxygen.spec	7 Feb 2006 11:25:34 -0000	1.35
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.4.6
-Release: 1
+Release: 1.1
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -102,6 +102,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.6-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Than Ngo <than at redhat.com> 1.4.6-1
 - 1.4.6
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:25:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:25:49 -0500
Subject: rpms/dtach/devel dtach.spec,1.9,1.10
Message-ID: <200602071125.k17BPnSs021014@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dtach/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20991

Modified Files:
	dtach.spec 
Log Message:
bump for new gcc/glibc


Index: dtach.spec
===================================================================
RCS file: /cvs/dist/rpms/dtach/devel/dtach.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dtach.spec	9 Dec 2005 22:40:16 -0000	1.9
+++ dtach.spec	7 Feb 2006 11:25:47 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A simple program that emulates the detach feature of screen.
 Name: dtach
 Version: 0.7
-Release: 1.1
+Release: 1.2
 License: GPL
 URL: http://dtach.sourceforge.net
 Group: Applications/System
@@ -42,6 +42,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:26:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:26:12 -0500
Subject: rpms/dump/devel dump.spec,1.33,1.34
Message-ID: <200602071126.k17BQCmQ021160@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21127

Modified Files:
	dump.spec 
Log Message:
bump for new gcc/glibc


Index: dump.spec
===================================================================
RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dump.spec	11 Jan 2006 13:24:44 -0000	1.33
+++ dump.spec	7 Feb 2006 11:26:10 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 1
+Release: 1.1
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -114,6 +114,9 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4b41-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 11 2006 Jindrich Novy <jnovy at redhat.com> 0.4b41-1
 - update to 0.4b41
 - drop .fixacl patch, now applied in the new upstream release



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:26:30 -0500
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.14,1.15
Message-ID: <200602071126.k17BQU84021312@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21284

Modified Files:
	dvd+rw-tools.spec 
Log Message:
bump for new gcc/glibc


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvd+rw-tools.spec	9 Dec 2005 22:40:16 -0000	1.14
+++ dvd+rw-tools.spec	7 Feb 2006 11:26:28 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	5.21.4.10.8
-Release: 6.1
+Release: 6.2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -54,6 +54,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:26:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:26:59 -0500
Subject: rpms/dvgrab/devel dvgrab.spec,1.13,1.14
Message-ID: <200602071126.k17BQxno021498@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvgrab/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21467

Modified Files:
	dvgrab.spec 
Log Message:
bump for new gcc/glibc


Index: dvgrab.spec
===================================================================
RCS file: /cvs/dist/rpms/dvgrab/devel/dvgrab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dvgrab.spec	9 Dec 2005 22:40:16 -0000	1.13
+++ dvgrab.spec	7 Feb 2006 11:26:56 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utility to capture video from a DV camera
 Name: dvgrab
 Version: 2.0
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Multimedia
 URL: http://kino.schirmacher.de/
@@ -36,6 +36,9 @@
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:27:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:27:13 -0500
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.44,1.45
Message-ID: <200602071127.k17BRDD7021638@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21607

Modified Files:
	e2fsprogs.spec 
Log Message:
bump for new gcc/glibc


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- e2fsprogs.spec	11 Jan 2006 15:41:36 -0000	1.44
+++ e2fsprogs.spec	7 Feb 2006 11:27:10 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 6
+Release: 6.1
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -296,6 +296,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.38-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 11 2006 Karel Zak <kzak at redhat.com> 1.38-6
 - cleanup device-mapper patch
 - use pkg-config for device-mapper



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:27:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:27:25 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.24,1.25
Message-ID: <200602071127.k17BRPTA021787@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21756

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
bump for new gcc/glibc


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- eclipse-bugzilla.spec	16 Dec 2005 23:15:50 -0000	1.24
+++ eclipse-bugzilla.spec	7 Feb 2006 11:27:22 -0000	1.25
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	6
+Release:	6.1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -128,6 +128,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.1.1_fc-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6
 - Build against gcc 4.1.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:27:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:27:36 -0500
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.31,1.32
Message-ID: <200602071127.k17BRaXs021918@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21887

Modified Files:
	eclipse-cdt.spec 
Log Message:
bump for new gcc/glibc


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- eclipse-cdt.spec	10 Jan 2006 05:29:37 -0000	1.31
+++ eclipse-cdt.spec	7 Feb 2006 11:27:33 -0000	1.32
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_4fc
+Release: 	1jpp_5fc
 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
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_4fc
 - Rebuild against latest gcc.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:27:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:27:52 -0500
Subject: rpms/ed/devel ed.spec,1.15,1.16
Message-ID: <200602071127.k17BRqiX022095@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22065

Modified Files:
	ed.spec 
Log Message:
bump for new gcc/glibc


Index: ed.spec
===================================================================
RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ed.spec	9 Dec 2005 22:40:17 -0000	1.15
+++ ed.spec	7 Feb 2006 11:27:49 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The GNU line editor.
 Name: ed
 Version: 0.2
-Release: 38.1
+Release: 38.2
 License: GPL
 Group:	Applications/Text
 Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2-38.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:28:02 -0500
Subject: rpms/eel2/devel eel2.spec,1.35,1.36
Message-ID: <200602071128.k17BS2fu022224@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22192

Modified Files:
	eel2.spec 
Log Message:
bump for new gcc/glibc


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eel2.spec	31 Jan 2006 05:23:47 -0000	1.35
+++ eel2.spec	7 Feb 2006 11:28:00 -0000	1.36
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library.
 Version: 	2.13.90
-Release: 1
+Release: 1.1
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:28:12 -0500
Subject: rpms/efax/devel efax.spec,1.18,1.19
Message-ID: <200602071128.k17BSCPk022342@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/efax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22315

Modified Files:
	efax.spec 
Log Message:
bump for new gcc/glibc


Index: efax.spec
===================================================================
RCS file: /cvs/dist/rpms/efax/devel/efax.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- efax.spec	17 Jan 2006 13:34:27 -0000	1.18
+++ efax.spec	7 Feb 2006 11:28:09 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem.
 Name: efax
 Version: 0.9
-Release: 27
+Release: 27.1
 License: GPL
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
@@ -62,6 +62,9 @@
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-27.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Than Ngo <than at redhat.com> 0.9-27
 - apply patch to fix #177892
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:28:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:28:24 -0500
Subject: rpms/eject/devel eject.spec,1.20,1.21
Message-ID: <200602071128.k17BSOaT022482@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22450

Modified Files:
	eject.spec 
Log Message:
bump for new gcc/glibc


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eject.spec	9 Dec 2005 22:40:18 -0000	1.20
+++ eject.spec	7 Feb 2006 11:28:21 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.2
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:28:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:28:35 -0500
Subject: rpms/ekiga/devel ekiga.spec,1.7,1.8
Message-ID: <200602071128.k17BSZ2G022619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22590

Modified Files:
	ekiga.spec 
Log Message:
bump for new gcc/glibc


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ekiga.spec	28 Jan 2006 09:20:52 -0000	1.7
+++ ekiga.spec	7 Feb 2006 11:28:32 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 1.99.0
-Release: 3
+Release: 3.1
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -84,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.99.0-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 Daniel Veillard <veillard at redhat.com> - 1.99.0-3
 - Rebuilt following a libedataserver revision
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:28:48 -0500
Subject: rpms/ElectricFence/devel ElectricFence.spec,1.13,1.14
Message-ID: <200602071128.k17BSmEM022774@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ElectricFence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22745

Modified Files:
	ElectricFence.spec 
Log Message:
bump for new gcc/glibc


Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/devel/ElectricFence.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElectricFence.spec	9 Dec 2005 22:39:27 -0000	1.13
+++ ElectricFence.spec	7 Feb 2006 11:28:45 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations.
 Name: ElectricFence
 Version: 2.2.2
-Release: 20.1
+Release: 20.2
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.perens.com/pub/ElectricFence/beta/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-20.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:29:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:29:00 -0500
Subject: rpms/elfutils/devel elfutils.spec,1.58,1.59
Message-ID: <200602071129.k17BT085022905@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22875

Modified Files:
	elfutils.spec 
Log Message:
bump for new gcc/glibc


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- elfutils.spec	14 Jan 2006 00:02:42 -0000	1.58
+++ elfutils.spec	7 Feb 2006 11:28:56 -0000	1.59
@@ -1,5 +1,5 @@
 %define version 0.119
-%define release 1
+%define release 1.1
 
 %define gpl 0
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -14,7 +14,7 @@
 %if !%{compat}
 Release: %{release}
 %else
-Release: 0.%{release}
+Release: 0.%{release}.1
 %endif
 %if %{gpl}
 License: GPL
@@ -247,6 +247,9 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Roland McGrath <roland at redhat.com> - 0.119-1
 - update to 0.119
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:29:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:29:05 -0500
Subject: rpms/elilo/devel elilo.spec,1.17,1.18
Message-ID: <200602071129.k17BT5jE023008@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elilo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22977

Modified Files:
	elilo.spec 
Log Message:
bump for new gcc/glibc


Index: elilo.spec
===================================================================
RCS file: /cvs/dist/rpms/elilo/devel/elilo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- elilo.spec	27 Jan 2006 16:27:36 -0000	1.17
+++ elilo.spec	7 Feb 2006 11:29:02 -0000	1.18
@@ -5,7 +5,7 @@
 Group: System Environment/Base
 Obsoletes: eli
 Version: 3.6
-Release: 1
+Release: 1.1
 License: GPL
 Source: elilo-%{version}.src.tgz
 Source1: http://domsch.com/linux/ia64/efibootmgr/efibootmgr-%{efibootmgr_ver}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.6-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Paul Nasrat <pnasrat at redhat.com>
 - Update elilo and efibootmgr
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:29:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:29:18 -0500
Subject: rpms/elinks/devel elinks.spec,1.30,1.31
Message-ID: <200602071129.k17BTIUv023145@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23116

Modified Files:
	elinks.spec 
Log Message:
bump for new gcc/glibc


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- elinks.spec	10 Jan 2006 16:37:38 -0000	1.30
+++ elinks.spec	7 Feb 2006 11:29:14 -0000	1.31
@@ -2,7 +2,7 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.0
-Release: 2
+Release: 2.1
 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
@@ -83,6 +83,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Karel Zak <kzak at redhat.com> 0.11.0-2
 - use upstream version of srcdir.patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:29:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:29:31 -0500
Subject: rpms/emacs/devel emacs.spec,1.62,1.63
Message-ID: <200602071129.k17BTVKw023293@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23264

Modified Files:
	emacs.spec 
Log Message:
bump for new gcc/glibc


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- emacs.spec	3 Feb 2006 08:26:08 -0000	1.62
+++ emacs.spec	7 Feb 2006 11:29:27 -0000	1.63
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 12
+Release: 12.1
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -538,6 +538,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 21.4-12.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Jens Petersen <petersen at redhat.com> - 21.4-12
 - add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11
   locale.alias file (Paul Dickson, #173781)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:29:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:29:54 -0500
Subject: rpms/enscript/devel enscript.spec,1.26,1.27
Message-ID: <200602071129.k17BTssT023522@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/enscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23491

Modified Files:
	enscript.spec 
Log Message:
bump for new gcc/glibc


Index: enscript.spec
===================================================================
RCS file: /cvs/dist/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- enscript.spec	3 Feb 2006 12:07:17 -0000	1.26
+++ enscript.spec	7 Feb 2006 11:29:51 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
 Version: 1.6.4
-Release: 1.1
+Release: 1.1.1
 License: GPL
 Group: Applications/Publishing
 Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.4-1.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Jitka Kudrnacova <jkudrnac at redhat.com> 1.6.4-1.1
 - fixed URL in the description (bug #178444)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:30:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:30:05 -0500
Subject: rpms/eog/devel eog.spec,1.37,1.38
Message-ID: <200602071130.k17BU5Sf023672@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23643

Modified Files:
	eog.spec 
Log Message:
bump for new gcc/glibc


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eog.spec	30 Jan 2006 20:33:19 -0000	1.37
+++ eog.spec	7 Feb 2006 11:30:02 -0000	1.38
@@ -13,7 +13,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -97,6 +97,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:31:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:31:00 -0500
Subject: rpms/epic/devel epic.spec,1.16,1.17
Message-ID: <200602071131.k17BV0D4023849@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23805

Modified Files:
	epic.spec 
Log Message:
bump for new gcc/glibc


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- epic.spec	9 Dec 2005 22:40:20 -0000	1.16
+++ epic.spec	7 Feb 2006 11:30:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 2.1
+Release: 2.2
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -78,6 +78,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:32:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:32:28 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.84,1.85
Message-ID: <200602071132.k17BWSC5023964@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23937

Modified Files:
	epiphany.spec 
Log Message:
bump for new gcc/glibc


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- epiphany.spec	5 Feb 2006 07:20:39 -0000	1.84
+++ epiphany.spec	7 Feb 2006 11:32:24 -0000	1.85
@@ -11,7 +11,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 1.9.6
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -130,6 +130,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 1.9.6-2
 - Update requires
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:33:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:33:31 -0500
Subject: rpms/eruby/devel eruby.spec,1.14,1.15
Message-ID: <200602071133.k17BXVuu024083@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24059

Modified Files:
	eruby.spec 
Log Message:
bump for new gcc/glibc


Index: eruby.spec
===================================================================
RCS file: /cvs/dist/rpms/eruby/devel/eruby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- eruby.spec	9 Dec 2005 22:40:20 -0000	1.14
+++ eruby.spec	7 Feb 2006 11:33:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		eruby
 Version:	1.0.5
-Release: 5.1
+Release: 5.2
 License:	distributable
 URL:		http://www.modruby.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:34:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:34:04 -0500
Subject: rpms/esound/devel esound.spec,1.26,1.27
Message-ID: <200602071134.k17BY4B0024213@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/esound/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24182

Modified Files:
	esound.spec 
Log Message:
bump for new gcc/glibc


Index: esound.spec
===================================================================
RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- esound.spec	9 Dec 2005 22:40:20 -0000	1.26
+++ esound.spec	7 Feb 2006 11:33:51 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device.
 Name:      esound
 Version:   0.2.36
-Release: 2.1
+Release: 2.2
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.36-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:34:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:34:53 -0500
Subject: rpms/ethereal/devel ethereal.spec,1.64,1.65
Message-ID: <200602071134.k17BYrJ2024412@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ethereal.spec 
Log Message:
bump for new gcc/glibc


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ethereal.spec	3 Jan 2006 11:47:27 -0000	1.64
+++ ethereal.spec	7 Feb 2006 11:34:42 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.14
-Release: 	3
+Release: 	3.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.14-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  2 2006 Steve Dickson <steved at redhat.com> 0.10.14-3
 - Added code to better show NFS V4 opts
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:35:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:35:24 -0500
Subject: rpms/ethtool/devel ethtool.spec,1.13,1.14
Message-ID: <200602071135.k17BZOmG024595@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ethtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24557

Modified Files:
	ethtool.spec 
Log Message:
bump for new gcc/glibc


Index: ethtool.spec
===================================================================
RCS file: /cvs/dist/rpms/ethtool/devel/ethtool.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ethtool.spec	9 Dec 2005 22:40:21 -0000	1.13
+++ ethtool.spec	7 Feb 2006 11:35:21 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Ethernet settings tool for PCI ethernet cards
 Name: ethtool
 Version: 3
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
@@ -39,6 +39,9 @@
 %{_mandir}/man8/ethtool.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:35:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:35:56 -0500
Subject: rpms/evince/devel evince.spec,1.39,1.40
Message-ID: <200602071135.k17BZuTB024727@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24706

Modified Files:
	evince.spec 
Log Message:
bump for new gcc/glibc


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- evince.spec	31 Jan 2006 04:51:17 -0000	1.39
+++ evince.spec	7 Feb 2006 11:35:47 -0000	1.40
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.0
-Release:	3
+Release:	3.1
 Summary:	Document viewer
 
 License: 	GPL
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Christopher Aillon <caillon at redhat.com> 0.5.0-3
 - Don't explicitly set the invisible char to '*'
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:36:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:36:10 -0500
Subject: rpms/evolution/devel evolution.spec,1.120,1.121
Message-ID: <200602071136.k17BaASg024855@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution.spec 
Log Message:
bump for new gcc/glibc


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- evolution.spec	31 Jan 2006 03:27:08 -0000	1.120
+++ evolution.spec	7 Feb 2006 11:36:05 -0000	1.121
@@ -38,7 +38,7 @@
 
 Name: evolution
 Version: 2.5.90
-Release: 1
+Release: 1.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -624,6 +624,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.90-1
 - 2.5.90
 - trimmed patches 805 and 808, as parts of these got merged upstream



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:36:28 -0500
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.49,1.50
Message-ID: <200602071136.k17BaShT025040@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24997

Modified Files:
	evolution-connector.spec 
Log Message:
bump for new gcc/glibc


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- evolution-connector.spec	31 Jan 2006 18:25:55 -0000	1.49
+++ evolution-connector.spec	7 Feb 2006 11:36:25 -0000	1.50
@@ -7,7 +7,7 @@
 
 Name: evolution-connector
 Version: 2.5.9.0
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -95,6 +95,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 2.5.9.0-2
 - add builddeps (bug 137879)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:36:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:36:41 -0500
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.82,
	1.83
Message-ID: <200602071136.k17BafNS025189@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-data-server.spec 
Log Message:
bump for new gcc/glibc


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- evolution-data-server.spec	31 Jan 2006 18:21:58 -0000	1.82
+++ evolution-data-server.spec	7 Feb 2006 11:36:38 -0000	1.83
@@ -25,7 +25,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.90
-Release: 2
+Release: 2.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.90-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 1.5.90-2
 - add build deps (bug 137553)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:36:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:36:56 -0500
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.11,1.12
Message-ID: <200602071136.k17BaukA025354@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25321

Modified Files:
	evolution-sharp.spec 
Log Message:
bump for new gcc/glibc


Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- evolution-sharp.spec	1 Feb 2006 05:45:21 -0000	1.11
+++ evolution-sharp.spec	7 Feb 2006 11:36:52 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        7
+Release:        7.1
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-7
 - Update evolution-sharp-evo26.patch look for a SO_NUM of 7 for edataserver
 - BuildRequire evolution-devel



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:37:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:37:31 -0500
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.20,1.21
Message-ID: <200602071137.k17BbVMd025679@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25648

Modified Files:
	evolution-webcal.spec 
Log Message:
bump for new gcc/glibc


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- evolution-webcal.spec	28 Jan 2006 05:49:53 -0000	1.20
+++ evolution-webcal.spec	7 Feb 2006 11:37:28 -0000	1.21
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.4.1
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> - 2.4.1-3
 - rebuild against new e-d-s
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:37:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:37:42 -0500
Subject: rpms/expat/devel expat.spec,1.20,1.21
Message-ID: <200602071137.k17BbgTu025810@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/expat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25781

Modified Files:
	expat.spec 
Log Message:
bump for new gcc/glibc


Index: expat.spec
===================================================================
RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- expat.spec	31 Jan 2006 10:45:41 -0000	1.20
+++ expat.spec	7 Feb 2006 11:37:39 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A library for parsing XML.
 Name: expat
 Version: 1.95.8
-Release: 8
+Release: 8.1
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
 URL: http://www.libexpat.org/
@@ -70,6 +70,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.95.8-8.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 1.95.8-8
 - restore .la file for apr-util
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:37:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:37:53 -0500
Subject: rpms/fbset/devel fbset.spec,1.14,1.15
Message-ID: <200602071137.k17BbrGb025940@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fbset/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25910

Modified Files:
	fbset.spec 
Log Message:
bump for new gcc/glibc


Index: fbset.spec
===================================================================
RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fbset.spec	9 Dec 2005 22:40:23 -0000	1.14
+++ fbset.spec	7 Feb 2006 11:37:50 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Tools for managing a frame buffer's video mode properties.
 Name: fbset
 Version: 2.1
-Release: 20.1
+Release: 20.2
 License: GPL
 Group: Applications/System
 URL: http://home.tvd.be/cr26864/Linux/fbdev/
@@ -41,6 +41,9 @@
 %config	%{_sysconfdir}/fb.modes
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-20.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:38:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:38:05 -0500
Subject: rpms/fence/devel fence.spec,1.21,1.22
Message-ID: <200602071138.k17Bc5t9026076@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26045

Modified Files:
	fence.spec 
Log Message:
bump for new gcc/glibc


Index: fence.spec
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fence.spec	16 Dec 2005 23:34:28 -0000	1.21
+++ fence.spec	7 Feb 2006 11:38:02 -0000	1.22
@@ -12,7 +12,7 @@
 
 Name: fence
 Version: 1.32.10
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL
 Group: System Environment/Base
 Summary: fence - The cluster I/O fencing system
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.32.10-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:38:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:38:16 -0500
Subject: rpms/festival/devel festival.spec,1.20,1.21
Message-ID: <200602071138.k17BcGXJ026216@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/festival/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26186

Modified Files:
	festival.spec 
Log Message:
bump for new gcc/glibc


Index: festival.spec
===================================================================
RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- festival.spec	31 Jan 2006 05:49:12 -0000	1.20
+++ festival.spec	7 Feb 2006 11:38:13 -0000	1.21
@@ -1,7 +1,7 @@
 Name: festival
 Summary: A free speech synthesizer
 Version: 1.95
-Release: 5
+Release: 5.1
 
 # we ship the 1.4.2 docs for now.
 %define docversion 1.4.2
@@ -292,6 +292,9 @@
 %{_includedir}/festival/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.95-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 22 2006 Ray Strode <rstrode at redhat.com> - 1.95-5
 - get gnopernicus working again. Patch from 
   Fernando Herrera <fherrera at gmail.com> (bug 178312)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:38:36 -0500
Subject: rpms/fetchmail/devel fetchmail.spec,1.38,1.39
Message-ID: <200602071138.k17Bcane026416@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26385

Modified Files:
	fetchmail.spec 
Log Message:
bump for new gcc/glibc


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fetchmail.spec	30 Jan 2006 21:45:05 -0000	1.38
+++ fetchmail.spec	7 Feb 2006 11:38:33 -0000	1.39
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.2.1
-Release: 1
+Release: 1.1
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2.asc
@@ -86,6 +86,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.2.1-1
 - Update to fetchmail-6.3.2.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:38:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:38:48 -0500
Subject: rpms/file/devel file.spec,1.44,1.45
Message-ID: <200602071138.k17BcmCM026552@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26522

Modified Files:
	file.spec 
Log Message:
bump for new gcc/glibc


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- file.spec	5 Feb 2006 19:06:23 -0000	1.44
+++ file.spec	7 Feb 2006 11:38:45 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.16
-Release: 6
+Release: 6.1
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.16-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 04 2006 Radek Vok??l <rvokal at redhat.com> 4.16-6
 - xen patch, recognizes Xen saved domain
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:38:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:38:58 -0500
Subject: rpms/file-roller/devel file-roller.spec,1.46,1.47
Message-ID: <200602071138.k17Bcwq5026688@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26658

Modified Files:
	file-roller.spec 
Log Message:
bump for new gcc/glibc


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- file-roller.spec	31 Jan 2006 05:08:40 -0000	1.46
+++ file-roller.spec	7 Feb 2006 11:38:56 -0000	1.47
@@ -10,7 +10,7 @@
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
 Version:	2.13.90
-Release: 	1
+Release: 	1.1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -105,6 +105,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:39:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:39:09 -0500
Subject: rpms/filesystem/devel filesystem.spec,1.25,1.26
Message-ID: <200602071139.k17Bd9CG026820@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26787

Modified Files:
	filesystem.spec 
Log Message:
bump for new gcc/glibc


Index: filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- filesystem.spec	9 Dec 2005 22:40:24 -0000	1.25
+++ filesystem.spec	7 Feb 2006 11:39:06 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
 Version: 2.3.7
-Release: 1.1
+Release: 1.2
 License: Public Domain
 Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -93,6 +93,9 @@
 /var/yp
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:39:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:39:21 -0500
Subject: rpms/findutils/devel findutils.spec,1.43,1.44
Message-ID: <200602071139.k17BdLLK026959@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/findutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26927

Modified Files:
	findutils.spec 
Log Message:
bump for new gcc/glibc


Index: findutils.spec
===================================================================
RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- findutils.spec	30 Jan 2006 21:28:09 -0000	1.43
+++ findutils.spec	7 Feb 2006 11:39:18 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs).
 Name: findutils
 Version: 4.2.27
-Release: 3
+Release: 3.1
 Epoch: 1
 License: GPL
 Group: Applications/File
@@ -71,6 +71,9 @@
 %{_infodir}/find.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.2.27-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Miloslav Trmac <mitr at redhat.com> - 1:4.2.27-3
 - Updated SELinux patch, --context is no longer valid (use -context)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:39:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:39:43 -0500
Subject: rpms/finger/devel finger.spec,1.19,1.20
Message-ID: <200602071139.k17Bdht0027184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/finger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27158

Modified Files:
	finger.spec 
Log Message:
bump for new gcc/glibc


Index: finger.spec
===================================================================
RCS file: /cvs/dist/rpms/finger/devel/finger.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- finger.spec	15 Dec 2005 09:24:25 -0000	1.19
+++ finger.spec	7 Feb 2006 11:39:41 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The finger client.
 Name: finger
 Version: 0.17
-Release: 32
+Release: 32.1
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %{_mandir}/man8/fingerd.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Radek Vokal <rvokal at redhat.com> 0.17-32
 - another UTF-8 fix
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:40:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:40:00 -0500
Subject: rpms/firefox/devel firefox.spec,1.101,1.102
Message-ID: <200602071140.k17Be0u3027362@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27331

Modified Files:
	firefox.spec 
Log Message:
bump for new gcc/glibc


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- firefox.spec	2 Feb 2006 05:39:07 -0000	1.101
+++ firefox.spec	7 Feb 2006 11:39:57 -0000	1.102
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        2
+Release:        2.1
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -258,6 +258,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2
 - Update language packs to 1.5.0.1
 - Add dumpstack.patch



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:40:32 -0500
Subject: rpms/flac/devel flac.spec,1.17,1.18
Message-ID: <200602071140.k17BeWGG027656@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27623

Modified Files:
	flac.spec 
Log Message:
bump for new gcc/glibc


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- flac.spec	9 Dec 2005 22:40:26 -0000	1.17
+++ flac.spec	7 Feb 2006 11:40:30 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
 Version: 1.1.2
-Release: 25.1
+Release: 25.2
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-25.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:40:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:40:42 -0500
Subject: rpms/flex/devel flex.spec,1.20,1.21
Message-ID: <200602071140.k17BegfZ027783@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27751

Modified Files:
	flex.spec 
Log Message:
bump for new gcc/glibc


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- flex.spec	2 Feb 2006 18:16:10 -0000	1.20
+++ flex.spec	7 Feb 2006 11:40:40 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 37
+Release: 37.1
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -79,6 +79,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4a-37.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 02 2006 Petr Machata <pmachata at redhat.com> 2.5.4a-37
 - adding `make bigcheck' into build process.  Refreshing initscan.c to
   make this possible.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:40:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:40:52 -0500
Subject: rpms/fontconfig/devel fontconfig.spec,1.64,1.65
Message-ID: <200602071140.k17Beqgt027904@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	fontconfig.spec 
Log Message:
bump for new gcc/glibc


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- fontconfig.spec	3 Feb 2006 20:05:35 -0000	1.64
+++ fontconfig.spec	7 Feb 2006 11:40:49 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.93.cvs20060131
-Release: 3
+Release: 3.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -145,6 +145,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.93.cvs20060131-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Ray Strode <rstrode at redhat.com> - 2.3.93.cvs20060131-3
 - Move user cache to a subdirectory (bug 160275)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:41:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:41:02 -0500
Subject: rpms/foomatic/devel foomatic.spec,1.130,1.131
Message-ID: <200602071141.k17Bf2AD028035@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28005

Modified Files:
	foomatic.spec 
Log Message:
bump for new gcc/glibc


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- foomatic.spec	18 Jan 2006 11:59:27 -0000	1.130
+++ foomatic.spec	7 Feb 2006 11:41:00 -0000	1.131
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 33
+Release: 33.1
 License:	GPL
 Group: System Environment/Libraries
 
@@ -275,6 +275,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-33.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-33
 - Make build self-hosting.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:41:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:41:19 -0500
Subject: rpms/freeglut/devel freeglut.spec,1.14,1.15
Message-ID: <200602071141.k17BfJnw028208@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freeglut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28177

Modified Files:
	freeglut.spec 
Log Message:
bump for new gcc/glibc


Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freeglut.spec	1 Feb 2006 08:17:09 -0000	1.14
+++ freeglut.spec	7 Feb 2006 11:41:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   3
+Release:   3.1
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -87,6 +87,9 @@
 %{_libdir}/libglut.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 2.4.0-3
 - Added "Requires: libGL-devel libGLU-devel" to fix bug (#179464)
 - Change file based GL header build dep to BuildRequires: libGL-devel



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:41:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:41:30 -0500
Subject: rpms/freeradius/devel freeradius.spec,1.27,1.28
Message-ID: <200602071141.k17BfUpr028338@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	freeradius.spec 
Log Message:
bump for new gcc/glibc


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freeradius.spec	13 Dec 2005 13:27:45 -0000	1.27
+++ freeradius.spec	7 Feb 2006 11:41:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
 Version: 1.0.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -263,6 +263,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Thomas Woerner <twoerner at redhat.com> 1.0.5-1
 - new version 1.0.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:41:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:41:41 -0500
Subject: rpms/freetype/devel freetype.spec,1.26,1.27
Message-ID: <200602071141.k17BffGQ028479@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28448

Modified Files:
	freetype.spec 
Log Message:
bump for new gcc/glibc


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- freetype.spec	9 Dec 2005 22:40:29 -0000	1.26
+++ freetype.spec	7 Feb 2006 11:41:38 -0000	1.27
@@ -11,7 +11,7 @@
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
 Version: 2.1.10
-Release: 5.1
+Release: 5.2
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -286,6 +286,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.10-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:41:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:41:52 -0500
Subject: rpms/fribidi/devel fribidi.spec,1.6,1.7
Message-ID: <200602071141.k17Bfqh3028623@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fribidi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28593

Modified Files:
	fribidi.spec 
Log Message:
bump for new gcc/glibc


Index: fribidi.spec
===================================================================
RCS file: /cvs/dist/rpms/fribidi/devel/fribidi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fribidi.spec	9 Dec 2005 22:40:29 -0000	1.6
+++ fribidi.spec	7 Feb 2006 11:41:50 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.10.4
-Release: 8.1
+Release: 8.2
 URL: http://freedesktop.org/Software/FriBidi
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.4-8.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:42:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:42:04 -0500
Subject: rpms/frysk/devel frysk.spec,1.22,1.23
Message-ID: <200602071142.k17Bg4dq028744@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28716

Modified Files:
	frysk.spec 
Log Message:
bump for new gcc/glibc


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- frysk.spec	6 Feb 2006 16:04:36 -0000	1.22
+++ frysk.spec	7 Feb 2006 11:42:01 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.01.22
-Release:	0.FC5.1
+Release:	0.FC5.1.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -86,6 +86,9 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.01.22-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.01.22-0.FC5.1
 - Bumped version, rebuilt.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:42:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:42:16 -0500
Subject: rpms/f-spot/devel f-spot.spec,1.12,1.13
Message-ID: <200602071142.k17BgGgu028878@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28847

Modified Files:
	f-spot.spec 
Log Message:
bump for new gcc/glibc


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- f-spot.spec	1 Feb 2006 16:55:47 -0000	1.12
+++ f-spot.spec	7 Feb 2006 11:42:12 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.8
-Release:        2
+Release:        2.1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -68,6 +68,9 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.8-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-2
 - Add sqlite3.patch to ensure that sqlite3 is used if both
   sqlite2 and sqlite3 are installed.



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:42:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:42:27 -0500
Subject: rpms/ftp/devel ftp.spec,1.24,1.25
Message-ID: <200602071142.k17BgRRG029015@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28988

Modified Files:
	ftp.spec 
Log Message:
bump for new gcc/glibc


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ftp.spec	12 Jan 2006 10:39:59 -0000	1.24
+++ ftp.spec	7 Feb 2006 11:42:24 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1
+Release: 32.1.1
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 12 2006 Petr Raszyk <praszyk at redhat.com> - 0.17-32
 - support for multi-homed clients
   See #171621, netkit-ftp-0.17-multihome.patch



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:42:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:42:47 -0500
Subject: rpms/gail/devel gail.spec,1.31,1.32
Message-ID: <200602071142.k17Bglo2029217@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29184

Modified Files:
	gail.spec 
Log Message:
bump for new gcc/glibc


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gail.spec	9 Dec 2005 22:40:30 -0000	1.31
+++ gail.spec	7 Feb 2006 11:42:45 -0000	1.32
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.8
-Release: 1.1
+Release: 1.2
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -83,6 +83,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.8-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:42:58 -0500
Subject: rpms/gaim/devel gaim.spec,1.111,1.112
Message-ID: <200602071142.k17Bgw5N029338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29310

Modified Files:
	gaim.spec 
Log Message:
bump for new gcc/glibc


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gaim.spec	28 Jan 2006 05:29:08 -0000	1.111
+++ gaim.spec	7 Feb 2006 11:42:55 -0000	1.112
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        14.fc5
+Release:        14.fc5.1
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -273,6 +273,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-14.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14.fc5
 - rebuild for new e-d-s
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:43:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:43:17 -0500
Subject: rpms/gal/devel gal.spec,1.17,1.18
Message-ID: <200602071143.k17BhHE3029531@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29500

Modified Files:
	gal.spec 
Log Message:
bump for new gcc/glibc


Index: gal.spec
===================================================================
RCS file: /cvs/dist/rpms/gal/devel/gal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gal.spec	9 Dec 2005 22:40:30 -0000	1.17
+++ gal.spec	7 Feb 2006 11:43:15 -0000	1.18
@@ -3,7 +3,7 @@
 
 Name: gal
 Version: 0.24
-Release: 6.1
+Release: 6.2
 Summary: The GNOME Application Library
 Group: System Environment/Libraries
 Epoch: 1
@@ -82,6 +82,9 @@
 %{_libdir}/libgal.so.*.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.24-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:43:28 -0500
Subject: rpms/gamin/devel gamin.spec,1.43,1.44
Message-ID: <200602071143.k17BhSZj029664@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29633

Modified Files:
	gamin.spec 
Log Message:
bump for new gcc/glibc


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gamin.spec	9 Dec 2005 22:40:31 -0000	1.43
+++ gamin.spec	7 Feb 2006 11:43:25 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %doc doc/python.html
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:43:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:43:38 -0500
Subject: rpms/gawk/devel gawk.spec,1.31,1.32
Message-ID: <200602071143.k17Bhc1Q029788@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29760

Modified Files:
	gawk.spec 
Log Message:
bump for new gcc/glibc


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gawk.spec	22 Dec 2005 18:48:39 -0000	1.31
+++ gawk.spec	7 Feb 2006 11:43:35 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 5
+Release: 5.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -79,6 +79,9 @@
 %{_datadir}/awk
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Karel Zak <kzak at redhat.com> 3.1.5-5
 - fix "gawk -v BINMODE=1" (patch by Aharon Robbins)
 - fix conversion from large number to string (patch by Aharon Robbins)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:43:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:43:48 -0500
Subject: rpms/GConf/devel GConf.spec,1.10,1.11
Message-ID: <200602071143.k17BhmTl029920@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29891

Modified Files:
	GConf.spec 
Log Message:
bump for new gcc/glibc


Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GConf.spec	15 Dec 2005 19:37:31 -0000	1.10
+++ GConf.spec	7 Feb 2006 11:43:46 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: The Gnome Config System.
 Name: GConf
 Version: 1.0.9
-Release: 18
+Release: 18.1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.gz
@@ -114,6 +114,9 @@
 %{_bindir}/gconf-config-1
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Ray Strode <rstrode at redhat.com> 1.0.9-18
 - take ownership of directories that belong to the package
   (bug 151360)



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:43:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:43:59 -0500
Subject: rpms/GConf2/devel GConf2.spec,1.34,1.35
Message-ID: <200602071143.k17Bhxig030056@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30023

Modified Files:
	GConf2.spec 
Log Message:
bump for new gcc/glibc


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- GConf2.spec	2 Feb 2006 17:39:51 -0000	1.34
+++ GConf2.spec	7 Feb 2006 11:43:57 -0000	1.35
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 3
+Release: 3.1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3
 - Use the correct patch ;-)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:44:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:44:09 -0500
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.28,1.29
Message-ID: <200602071144.k17Bi9x4030180@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30151

Modified Files:
	gconf-editor.spec 
Log Message:
bump for new gcc/glibc


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gconf-editor.spec	31 Jan 2006 03:21:26 -0000	1.28
+++ gconf-editor.spec	7 Feb 2006 11:44:07 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -94,6 +94,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:44:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:44:20 -0500
Subject: rpms/gd/devel gd.spec,1.28,1.29
Message-ID: <200602071144.k17BiKUp030312@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30282

Modified Files:
	gd.spec 
Log Message:
bump for new gcc/glibc


Index: gd.spec
===================================================================
RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gd.spec	20 Jan 2006 12:48:01 -0000	1.28
+++ gd.spec	7 Feb 2006 11:44:18 -0000	1.29
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.33
-Release:       6
+Release:       6.1
 Group:         System Environment/Libraries
 License:       BSD-style
 URL:           http://www.boutell.com/gd/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.33-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 20 2006 Phil Knirsch <pknirsch at redhat.com> 2.0.33-6
 - Included a few more overflow checks (#177907)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:44:32 -0500
Subject: rpms/gdb/devel gdb.spec,1.167,1.168
Message-ID: <200602071144.k17BiWq7030440@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30413

Modified Files:
	gdb.spec 
Log Message:
bump for new gcc/glibc


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gdb.spec	16 Jan 2006 16:27:08 -0000	1.167
+++ gdb.spec	7 Feb 2006 11:44:29 -0000	1.168
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.98
+Release: 1.98.1
 
 License: GPL
 Group: Development/Debuggers
@@ -536,6 +536,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Alexandre Oliva <aoliva at redhat.com>	6.3.0.0-1.98
 - Bump up release number.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:44:48 -0500
Subject: rpms/gdbm/devel gdbm.spec,1.17,1.18
Message-ID: <200602071144.k17BimAi030607@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30577

Modified Files:
	gdbm.spec 
Log Message:
bump for new gcc/glibc


Index: gdbm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdbm/devel/gdbm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdbm.spec	24 Jan 2006 07:20:15 -0000	1.17
+++ gdbm.spec	7 Feb 2006 11:44:46 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A GNU set of database routines which use extensible hashing.
 Name: gdbm
 Version: 1.8.0
-Release: 26
+Release: 26.1
 Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz
 Patch0: gdbm-1.8.0-jbj.patch
 Patch1: gdbm-1.8.0-fhs.patch
@@ -97,6 +97,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Warren Togami <wtogami at redhat.com> 1.8.0-26
 - remove .la (#171535)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:45:05 -0500
Subject: rpms/gdk-pixbuf/devel gdk-pixbuf.spec,1.35,1.36
Message-ID: <200602071145.k17Bj5wC030771@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdk-pixbuf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30746

Modified Files:
	gdk-pixbuf.spec 
Log Message:
bump for new gcc/glibc


Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/dist/rpms/gdk-pixbuf/devel/gdk-pixbuf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gdk-pixbuf.spec	9 Dec 2005 22:40:32 -0000	1.35
+++ gdk-pixbuf.spec	7 Feb 2006 11:45:01 -0000	1.36
@@ -1,6 +1,6 @@
 Name: gdk-pixbuf
 Version: 0.22.0
-Release: 21.1
+Release: 21.2
 Epoch: 1
 Summary: An image loading library used with GNOME.
 License: LGPL
@@ -197,6 +197,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.22.0-21.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:45:20 -0500
Subject: rpms/gdm/devel gdm.spec,1.123,1.124
Message-ID: <200602071145.k17BjK9S030932@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30903

Modified Files:
	gdm.spec 
Log Message:
bump for new gcc/glibc


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gdm.spec	31 Jan 2006 16:58:14 -0000	1.123
+++ gdm.spec	7 Feb 2006 11:45:18 -0000	1.124
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.7
-Release: 1
+Release: 1.1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -305,6 +305,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.7-1
 - update to 2.13.0.7
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:45:42 -0500
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.9,1.10
Message-ID: <200602071145.k17Bjg3Q032673@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32273

Modified Files:
	gecko-sharp2.spec 
Log Message:
bump for new gcc/glibc


Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gecko-sharp2.spec	1 Feb 2006 01:14:23 -0000	1.9
+++ gecko-sharp2.spec	7 Feb 2006 11:45:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        4
+Release:        4.1
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -47,6 +47,9 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.11-4
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:45:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:45:55 -0500
Subject: rpms/genromfs/devel genromfs.spec,1.13,1.14
Message-ID: <200602071145.k17BjtZr001692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/genromfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1483

Modified Files:
	genromfs.spec 
Log Message:
bump for new gcc/glibc


Index: genromfs.spec
===================================================================
RCS file: /cvs/dist/rpms/genromfs/devel/genromfs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- genromfs.spec	9 Dec 2005 22:40:32 -0000	1.13
+++ genromfs.spec	7 Feb 2006 11:45:52 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utility for creating romfs filesystems.
 Name: genromfs
 Version: 0.5.1
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Base
 Source: http://unc.dl.sourceforge.net/sourceforge/romfs/genromfs-0.5.1.tar.gz
@@ -38,6 +38,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:46:08 -0500
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.12,1.13
Message-ID: <200602071146.k17Bk8aZ002759@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2562

Modified Files:
	geronimo-specs.spec 
Log Message:
bump for new gcc/glibc


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- geronimo-specs.spec	22 Dec 2005 06:52:40 -0000	1.12
+++ geronimo-specs.spec	7 Feb 2006 11:46:06 -0000	1.13
@@ -2,7 +2,7 @@
 %define name            geronimo-specs
 %define version         1.0
 %define mstone		M2
-%define release 	0.%{mstone}.2jpp_5fc
+%define release 	0.%{mstone}.2jpp_6fc
 %define section         free
 
 Summary:        Geronimo J2EE server J2EE specifications
@@ -120,6 +120,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.M2.2jpp_6fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0-0.M2.2jpp_5fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:46:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:46:20 -0500
Subject: rpms/gettext/devel gettext.spec,1.48,1.49
Message-ID: <200602071146.k17BkKTV003818@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3530

Modified Files:
	gettext.spec 
Log Message:
bump for new gcc/glibc


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gettext.spec	3 Jan 2006 19:56:05 -0000	1.48
+++ gettext.spec	7 Feb 2006 11:46:18 -0000	1.49
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.5
-Release: 2.2
+Release: 2.2.1
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -218,6 +218,9 @@
 %{_libdir}/%{name}/gnu.gettext.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 0.14.5-2.2
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:46:36 -0500
Subject: rpms/GFS/devel GFS.spec,1.22,1.23
Message-ID: <200602071146.k17BkZsU005360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5046

Modified Files:
	GFS.spec 
Log Message:
bump for new gcc/glibc


Index: GFS.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS/devel/GFS.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- GFS.spec	16 Dec 2005 23:16:40 -0000	1.22
+++ GFS.spec	7 Feb 2006 11:46:32 -0000	1.23
@@ -12,7 +12,7 @@
 
 Name: GFS
 Version: 6.1.4
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS - The Global File System
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.1.4-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:46:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:46:48 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.123,1.124
Message-ID: <200602071146.k17BkmAO006515@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	GFS-kernel.spec 
Log Message:
bump for new gcc/glibc


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- GFS-kernel.spec	13 Jan 2006 22:17:06 -0000	1.123
+++ GFS-kernel.spec	7 Feb 2006 11:46:46 -0000	1.124
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.10
+Release: 20051219.162641.FC5.10.1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules
@@ -249,6 +249,9 @@
 %{_includedir}/linux/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051219.162641.FC5.10.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Chris Feist <cfeist at redhat.com>
 - Rebuilt and bumped version number to 2.6.15
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:47:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:47:03 -0500
Subject: rpms/gftp/devel gftp.spec,1.18,1.19
Message-ID: <200602071147.k17Bl3F2008272@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7825

Modified Files:
	gftp.spec 
Log Message:
bump for new gcc/glibc


Index: gftp.spec
===================================================================
RCS file: /cvs/dist/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gftp.spec	9 Dec 2005 22:40:33 -0000	1.18
+++ gftp.spec	7 Feb 2006 11:47:00 -0000	1.19
@@ -2,7 +2,7 @@
 Name: gftp
 Version: 2.0.18
 Epoch: 1
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Internet
 Url: http://gftp.seul.org/
@@ -73,6 +73,9 @@
 %{_mandir}/man*/gftp.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.18-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:47:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:47:18 -0500
Subject: rpms/ghostscript/devel ghostscript.spec,1.98,1.99
Message-ID: <200602071147.k17BlI86010202@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9769

Modified Files:
	ghostscript.spec 
Log Message:
bump for new gcc/glibc


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ghostscript.spec	30 Jan 2006 17:54:59 -0000	1.98
+++ ghostscript.spec	7 Feb 2006 11:47:15 -0000	1.99
@@ -6,7 +6,7 @@
 Version: %{gs_ver}
 BuildRequires: libjpeg-devel
 
-Release: 5
+Release: 5.1
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -263,6 +263,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.15.1-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Tim Waugh <twaugh at redhat.com> 8.15.1-5
 - Updated adobe-cmaps to 200406 (bug #173613).
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:47:34 -0500
Subject: rpms/giflib/devel giflib.spec,1.3,1.4
Message-ID: <200602071147.k17BlYS0012137@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/giflib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12108

Modified Files:
	giflib.spec 
Log Message:
bump for new gcc/glibc


Index: giflib.spec
===================================================================
RCS file: /cvs/dist/rpms/giflib/devel/giflib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- giflib.spec	9 Dec 2005 22:40:33 -0000	1.3
+++ giflib.spec	7 Feb 2006 11:47:31 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Library for manipulating GIF format image files
 Name: giflib
 Version: 4.1.3
-Release: 6.1
+Release: 6.2
 License: MIT
 URL: http://www.sf.net/projects/libungif/
 Source0: http://dl.sf.net/libungif/%{name}-%{version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.3-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:47:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:47:56 -0500
Subject: rpms/gimp/devel gimp.spec,1.86,1.87
Message-ID: <200602071147.k17Blucb012338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12308

Modified Files:
	gimp.spec 
Log Message:
bump for new gcc/glibc


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- gimp.spec	10 Jan 2006 14:51:34 -0000	1.86
+++ gimp.spec	7 Feb 2006 11:47:54 -0000	1.87
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}2
+Release: %{?prever:0.0.%{prever}.}2.1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -348,6 +348,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Nils Philippsen <nphilipp at redhat.com>
 - rebuild with lcms
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:48:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:48:11 -0500
Subject: rpms/gimp-print/devel gimp-print.spec,1.32,1.33
Message-ID: <200602071148.k17BmB8K012506@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12469

Modified Files:
	gimp-print.spec 
Log Message:
bump for new gcc/glibc


Index: gimp-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gimp-print.spec	21 Dec 2005 15:51:31 -0000	1.32
+++ gimp-print.spec	7 Feb 2006 11:48:08 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: A collection of high-quality printer drivers.
 Name: gimp-print
 Version: 4.2.7
-Release: 15
+Release: 15.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://gimp-print.sourceforge.net/
@@ -193,6 +193,9 @@
 exit 0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.7-15.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Tim Waugh <twaugh at redhat.com> 4.2.7-15
 - Fix PPD translations (bug #176086).
 - Fix Spanish po file (bug #176214).



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:48:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:48:29 -0500
Subject: rpms/gjdoc/devel gjdoc.spec,1.31,1.32
Message-ID: <200602071148.k17BmTcu012688@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12654

Modified Files:
	gjdoc.spec 
Log Message:
bump for new gcc/glibc


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gjdoc.spec	2 Feb 2006 04:08:18 -0000	1.31
+++ gjdoc.spec	7 Feb 2006 11:48:26 -0000	1.32
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 2
+Release: 2.1
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -49,6 +49,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 01 2006 Andrew Overholt <overholt at redhat.com> 0.7.7-2
 - Don't package .la files (rh#172634).
 - Install un-versioned symlinks in /usr/share/java (rh#177139).



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:48:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:48:41 -0500
Subject: rpms/gkrellm/devel gkrellm.spec,1.27,1.28
Message-ID: <200602071148.k17Bmf2i012822@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12797

Modified Files:
	gkrellm.spec 
Log Message:
bump for new gcc/glibc


Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gkrellm.spec	9 Dec 2005 22:40:34 -0000	1.27
+++ gkrellm.spec	7 Feb 2006 11:48:38 -0000	1.28
@@ -2,7 +2,7 @@
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
 Version:	2.2.7
-Release: 5.1
+Release: 5.2
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -183,6 +183,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:48:52 -0500
Subject: rpms/glade2/devel glade2.spec,1.18,1.19
Message-ID: <200602071148.k17BmqVT012961@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glade2.spec 
Log Message:
bump for new gcc/glibc


Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- glade2.spec	9 Dec 2005 22:40:35 -0000	1.18
+++ glade2.spec	7 Feb 2006 11:48:49 -0000	1.19
@@ -17,7 +17,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 1.1
+Release: 1.2
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:03 -0500
Subject: rpms/glib/devel glib.spec,1.16,1.17
Message-ID: <200602071149.k17Bn3L1013104@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13073

Modified Files:
	glib.spec 
Log Message:
bump for new gcc/glibc


Index: glib.spec
===================================================================
RCS file: /cvs/dist/rpms/glib/devel/glib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- glib.spec	3 Jan 2006 19:50:22 -0000	1.16
+++ glib.spec	7 Feb 2006 11:49:00 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions.
 Name: glib
 Version: 1.2.10
-Release: 18.2
+Release: 18.2.1
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1:1.2.10-18.2
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:13 -0500
Subject: rpms/glib2/devel glib2.spec,1.75,1.76
Message-ID: <200602071149.k17BnDVi013239@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glib2.spec 
Log Message:
bump for new gcc/glibc


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- glib2.spec	27 Jan 2006 14:53:27 -0000	1.75
+++ glib2.spec	7 Feb 2006 11:49:11 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.9.5
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.5-1
 - Update to 2.9.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:24 -0500
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.102,1.103
Message-ID: <200602071149.k17BnOMi013368@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glibc-kernheaders.spec 
Log Message:
bump for new gcc/glibc


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- glibc-kernheaders.spec	6 Feb 2006 15:23:52 -0000	1.102
+++ glibc-kernheaders.spec	7 Feb 2006 11:49:22 -0000	1.103
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 5
+Release: 5.1
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 6 2006 David Woodhouse <dwmw2 at redhat.com> 3.0-5
 - Add EOWNERDEAD and ENOTRECOVERABLE error codes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:35 -0500
Subject: rpms/glib-java/devel glib-java.spec,1.24,1.25
Message-ID: <200602071149.k17BnZf6013490@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13460

Modified Files:
	glib-java.spec 
Log Message:
bump for new gcc/glibc


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- glib-java.spec	31 Jan 2006 15:06:51 -0000	1.24
+++ glib-java.spec	7 Feb 2006 11:49:32 -0000	1.25
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.3
-Release:   1
+Release:   1.1
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL
@@ -117,6 +117,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Adam Jocksch <ajocksch at redhat.com>
 - bumped version to 0.2.3, updated tarball.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:49 -0500
Subject: rpms/gmime/devel gmime.spec,1.7,1.8
Message-ID: <200602071149.k17Bnnfe013644@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13620

Modified Files:
	gmime.spec 
Log Message:
bump for new gcc/glibc


Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gmime.spec	1 Feb 2006 00:06:52 -0000	1.7
+++ gmime.spec	7 Feb 2006 11:49:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.19
-Release:        2
+Release:        2.1
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -109,6 +109,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.19-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:49:59 -0500
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.38,1.39
Message-ID: <200602071149.k17Bnxk7013778@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13741

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Feb  7 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)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xorg-x11-server.spec	7 Feb 2006 05:07:36 -0000	1.38
+++ xorg-x11-server.spec	7 Feb 2006 11:49:56 -0000	1.39
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   4
+Release:   5
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -60,7 +60,6 @@
 # are using pre-rawhide modular X.
 BuildRequires: libXfont-devel >= 0.99.2-3
 BuildRequires: libXau-devel
-BuildRequires: mesa-libGL-devel >= 6.4.1-1
 BuildRequires: libxkbfile-devel
 # libdmx-devel needed for Xdmx
 BuildRequires: libdmx-devel
@@ -91,7 +90,9 @@
 BuildRequires: xorg-x11-font-utils >= 1.0.0-1
 # Needed at least for DRI enabled builds
 %if %{with_dri}
-BuildRequires: mesa-source >= 6.4.1-1
+BuildRequires: mesa-libGL-devel >= 6.4.1-1
+# "mesa-libGL-source >= 6.4.2-2" required for the solution for bug #176976
+BuildRequires: mesa-source >= 6.4.2-2
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description
@@ -495,6 +496,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Feb  7 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
 - Fix brown paper bag error introduced in rpm post script in 1.0.1-4.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:50:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:50:00 -0500
Subject: rpms/gmp/devel gmp.spec,1.23,1.24
Message-ID: <200602071150.k17Bo0uX013791@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13759

Modified Files:
	gmp.spec 
Log Message:
bump for new gcc/glibc


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gmp.spec	9 Dec 2005 22:40:35 -0000	1.23
+++ gmp.spec	7 Feb 2006 11:49:57 -0000	1.24
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library.
 Name: gmp
 Version: 4.1.4
-Release: 6.1
+Release: 6.2
 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
@@ -163,6 +163,9 @@
 %{_infodir}/mpfr.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.4-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:50:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:50:16 -0500
Subject: rpms/gnbd/devel gnbd.spec,1.16,1.17
Message-ID: <200602071150.k17BoGbX013960@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnbd.spec 
Log Message:
bump for new gcc/glibc


Index: gnbd.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd/devel/gnbd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnbd.spec	16 Dec 2005 21:16:13 -0000	1.16
+++ gnbd.spec	7 Feb 2006 11:50:12 -0000	1.17
@@ -12,7 +12,7 @@
 
 Name: gnbd
 Version: 1.0.2
-Release: 0.2
+Release: 0.2.1
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd - GFS's Network Block Device
@@ -57,6 +57,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* 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
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:50:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:50:31 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.116,1.117
Message-ID: <200602071150.k17BoV2n014111@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
bump for new gcc/glibc


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnbd-kernel.spec	13 Jan 2006 22:16:30 -0000	1.116
+++ gnbd-kernel.spec	7 Feb 2006 11:50:26 -0000	1.117
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15.0
-Release: 20051108.134753.FC5.18
+Release: 20051108.134753.FC5.18.1
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -217,6 +217,9 @@
 %{_includedir}/linux/gnbd.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051108.134753.FC5.18.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Chris Feist <cfeist at redhat.com>
 - Rebuilt, bumped version number to 2.6.15 and added xen build.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:50:43 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.108,1.109
Message-ID: <200602071150.k17BohTR014244@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-applets.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-applets.spec	1 Feb 2006 15:29:50 -0000	1.108
+++ gnome-applets.spec	7 Feb 2006 11:50:41 -0000	1.109
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.3
-Release:  	4
+Release:  	4.1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -175,6 +175,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.3-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 01 2006 Matthias Clasen <mclasen at redhat.com> 2.13.3-4
 - Fix an overflow in the weather applet
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:50:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:50:58 -0500
Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.3,1.4
Message-ID: <200602071150.k17Bowku014396@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14369

Modified Files:
	gnome-applet-vm.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applet-vm.spec	27 Jan 2006 19:45:57 -0000	1.3
+++ gnome-applet-vm.spec	7 Feb 2006 11:50:53 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
 Version: 0.0.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-applet-vm-%{version}.tar.gz
@@ -83,6 +83,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Karel Zak <kzak at redhat.com> 0.0.5-1
 - public release
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:51:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:51:10 -0500
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.25,1.26
Message-ID: <200602071151.k17BpAnP014538@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-bluetooth.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-bluetooth.spec	9 Dec 2005 22:40:36 -0000	1.25
+++ gnome-bluetooth.spec	7 Feb 2006 11:51:07 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.6.0
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -110,6 +110,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:51:21 -0500
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.46,1.47
Message-ID: <200602071151.k17BpLWl014674@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-desktop.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnome-desktop.spec	28 Jan 2006 05:08:51 -0000	1.46
+++ gnome-desktop.spec	7 Feb 2006 11:51:18 -0000	1.47
@@ -11,7 +11,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -132,6 +132,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:51:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:51:33 -0500
Subject: rpms/gnome-games/devel gnome-games.spec,1.63,1.64
Message-ID: <200602071151.k17BpXge014805@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-games.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- gnome-games.spec	4 Feb 2006 05:12:52 -0000	1.63
+++ gnome-games.spec	7 Feb 2006 11:51:30 -0000	1.64
@@ -11,7 +11,7 @@
 Summary: GNOME games.
 Name: gnome-games
 Version: 2.13.6
-Release: 3
+Release: 3.1
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.6-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com> 1:2.13.6-3
 - Remove unneeded gstreamer dependency
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:51:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:51:45 -0500
Subject: rpms/gnome-kerberos/devel gnome-kerberos.spec,1.15,1.16
Message-ID: <200602071151.k17Bpjl5014959@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-kerberos.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-kerberos.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-kerberos/devel/gnome-kerberos.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-kerberos.spec	9 Dec 2005 22:40:39 -0000	1.15
+++ gnome-kerberos.spec	7 Feb 2006 11:51:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name: gnome-kerberos
 Version: 0.3.3
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -34,6 +34,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.3-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:51:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:51:56 -0500
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.17,1.18
Message-ID: <200602071151.k17BpuqP015092@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-keyring.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-keyring.spec	9 Dec 2005 22:40:39 -0000	1.17
+++ gnome-keyring.spec	7 Feb 2006 11:51:53 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 0.4.6
-Release: 1.1
+Release: 1.2
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:52:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:52:08 -0500
Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.11,
	1.12
Message-ID: <200602071152.k17Bq8GA015227@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15195

Modified Files:
	gnome-keyring-manager.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-keyring-manager.spec	9 Dec 2005 22:40:39 -0000	1.11
+++ gnome-keyring-manager.spec	7 Feb 2006 11:52:04 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-keyring-manager
 Version: 2.12.0
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
@@ -58,6 +58,9 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:52:19 -0500
Subject: rpms/gnome-libs/devel gnome-libs.spec,1.40,1.41
Message-ID: <200602071152.k17BqJat015372@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-libs.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-libs.spec	19 Dec 2005 19:19:24 -0000	1.40
+++ gnome-libs.spec	7 Feb 2006 11:52:17 -0000	1.41
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 48
+Release: 48.1
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -350,6 +350,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Bill Nottingham <notting at redhat.com> - 1.1.4.1.2.90-48
 - #175669 is fixed, rebuild with normal flags
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:52:32 -0500
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.24,1.25
Message-ID: <200602071152.k17BqWTH015507@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mag.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-mag.spec	19 Jan 2006 18:20:05 -0000	1.24
+++ gnome-mag.spec	7 Feb 2006 11:52:29 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.3
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -75,6 +75,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 0.12.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:52:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:52:42 -0500
Subject: rpms/gnome-media/devel gnome-media.spec,1.57,1.58
Message-ID: <200602071152.k17Bqgkq015649@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-media.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-media.spec	4 Feb 2006 12:09:06 -0000	1.57
+++ gnome-media.spec	7 Feb 2006 11:52:40 -0000	1.58
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.13.91
-Release:        2
+Release:        2.1
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.91-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> - 2.13.91-2
 - Use gstreamer (0.10)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:52:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:52:54 -0500
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.25,1.26
Message-ID: <200602071152.k17Bqsg4015789@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-menus.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-menus.spec	6 Feb 2006 17:22:38 -0000	1.25
+++ gnome-menus.spec	7 Feb 2006 11:52:51 -0000	1.26
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.13.5
-Release: 5
+Release: 5.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Ray Strode <rstrode at redhat.com> 2.13.5-5
 - break infinite loop 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:53:13 -0500
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.15,1.16
Message-ID: <200602071153.k17BrD3g015985@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15959

Modified Files:
	gnome-mime-data.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-mime-data.spec	9 Dec 2005 22:40:40 -0000	1.15
+++ gnome-mime-data.spec	7 Feb 2006 11:53:11 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.4.2
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:53:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:53:26 -0500
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.4,1.5
Message-ID: <200602071153.k17BrQ18016132@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mount.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-mount.spec	17 Jan 2006 20:25:41 -0000	1.4
+++ gnome-mount.spec	7 Feb 2006 11:53:24 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060117
+Release: 0.cvs20060117.1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}-%{release}.tar.gz
@@ -58,6 +58,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4-0.cvs20060117.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-0.cvs20060117
 - CVS snapshot of gnome-mount
 - Added a devel sub package for apps that compile in gnome-mount support



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:53:38 -0500
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.26,1.27
Message-ID: <200602071153.k17Brcli016263@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-netstatus.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-netstatus.spec	9 Dec 2005 22:40:40 -0000	1.26
+++ gnome-netstatus.spec	7 Feb 2006 11:53:34 -0000	1.27
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 3.1
+Release: 3.2
 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 Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:53:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:53:48 -0500
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.6,1.7
Message-ID: <200602071153.k17Brm1v016403@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-nettool.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-nettool.spec	31 Jan 2006 03:33:57 -0000	1.6
+++ gnome-nettool.spec	7 Feb 2006 11:53:46 -0000	1.7
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -58,6 +58,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:53:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:53:58 -0500
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.107,1.108
Message-ID: <200602071153.k17BrwrS016538@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-panel.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- gnome-panel.spec	28 Jan 2006 05:04:31 -0000	1.107
+++ gnome-panel.spec	7 Feb 2006 11:53:56 -0000	1.108
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.90
-Release: 1
+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
@@ -194,6 +194,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:54:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:54:10 -0500
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.32,1.33
Message-ID: <200602071154.k17BsAnX016680@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-pilot.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-pilot.spec	9 Dec 2005 22:40:41 -0000	1.32
+++ gnome-pilot.spec	7 Feb 2006 11:54:07 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.1
+Release: 7.fc5.2
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -148,6 +148,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-7.fc5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:54:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:54:21 -0500
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.14,
	1.15
Message-ID: <200602071154.k17BsLQ6016808@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot-conduits/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16777

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-pilot-conduits.spec	12 Jan 2006 04:01:25 -0000	1.14
+++ gnome-pilot-conduits.spec	7 Feb 2006 11:54:18 -0000	1.15
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 3.FC5
+Release: 3.FC5.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -63,6 +63,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-3.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 11 2006 David Malcolm <dmalcolm at redhat.com> - 2.0.13-3.FC5
 - extend patch 2 to handle a missing fix in the email conduit, renaming it from
   gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch to



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:54:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:54:31 -0500
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.17,1.18
Message-ID: <200602071154.k17BsVwK016940@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16910

Modified Files:
	gnome-power-manager.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-power-manager.spec	31 Jan 2006 17:49:56 -0000	1.17
+++ gnome-power-manager.spec	7 Feb 2006 11:54:28 -0000	1.18
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-2
 - rebuild 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:54:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:54:42 -0500
Subject: rpms/gnome-print/devel gnome-print.spec,1.21,1.22
Message-ID: <200602071154.k17BsgGm017076@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-print.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-print/devel/gnome-print.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-print.spec	9 Dec 2005 22:40:42 -0000	1.21
+++ gnome-print.spec	7 Feb 2006 11:54:39 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Printing libraries for GNOME.
 Name: gnome-print
 Version: 0.37
-Release: 12.1
+Release: 12.2
 Epoch: 1
 License: LGPL
 Group: System Environment/Base
@@ -177,6 +177,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.37-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:54:53 -0500
Subject: rpms/gnome-python2/devel gnome-python.spec,1.33,1.34
Message-ID: <200602071154.k17Bsr3I017212@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-python.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-python.spec	6 Feb 2006 19:48:44 -0000	1.33
+++ gnome-python.spec	7 Feb 2006 11:54:50 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
 Version: 2.12.3
-Release: 1 
+Release: 1.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 Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 06 2006 John (J5) Palmieri <johnp at redhat.com> - 2.12.3-1
 - Update to 2.12.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:55:03 -0500
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.41,1.42
Message-ID: <200602071155.k17Bt3ZK017345@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17314

Modified Files:
	gnome-python-extras.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-python-extras.spec	6 Feb 2006 22:47:31 -0000	1.41
+++ gnome-python-extras.spec	7 Feb 2006 11:55:00 -0000	1.42
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.13.3
-Release: 3 
+Release: 3.1 
 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
@@ -124,6 +124,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-3
 - Upload correct tar ball and try again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:55:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:55:19 -0500
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.51,1.52
Message-ID: <200602071155.k17BtJ4h017508@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-screensaver.spec	31 Jan 2006 20:57:54 -0000	1.51
+++ gnome-screensaver.spec	7 Feb 2006 11:55:15 -0000	1.52
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 2
+Release: 2.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -146,6 +146,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-2
 - try to migrate xscreensaver screensavers (bug 172715)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:55:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:55:31 -0500
Subject: rpms/gnome-session/devel gnome-session.spec,1.52,1.53
Message-ID: <200602071155.k17BtVQL017660@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-session.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-session.spec	28 Jan 2006 05:13:05 -0000	1.52
+++ gnome-session.spec	7 Feb 2006 11:55:28 -0000	1.53
@@ -13,7 +13,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -152,6 +152,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:55:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:55:43 -0500
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.18,1.19
Message-ID: <200602071155.k17BthQJ017800@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-speech.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-speech.spec	9 Dec 2005 22:40:43 -0000	1.18
+++ gnome-speech.spec	7 Feb 2006 11:55:41 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.3.9
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:55:53 -0500
Subject: rpms/gnome-spell/devel gnome-spell.spec,1.17,1.18
Message-ID: <200602071155.k17BtrVr017927@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-spell.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-spell.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-spell.spec	19 Jan 2006 14:01:21 -0000	1.17
+++ gnome-spell.spec	7 Feb 2006 11:55:51 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Bonobo component for spell checking
 Name: gnome-spell
 Version: 1.0.5
-Release: 13
+Release: 13.1
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2
 Patch0: gnome-spell-1.0.2-pspell-compat.patch
 Patch1: gnome-spell-1.0.2-langlist.patch
@@ -66,6 +66,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-13.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 1.0.5-13
 - s/sed -ie/sed -i -e/
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:56:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:56:04 -0500
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.40,
	1.41
Message-ID: <200602071156.k17Bu4a2018072@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18040

Modified Files:
	gnome-system-monitor.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-system-monitor.spec	31 Jan 2006 18:18:12 -0000	1.40
+++ gnome-system-monitor.spec	7 Feb 2006 11:56:02 -0000	1.41
@@ -11,7 +11,7 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.13.90
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_datadir}/omf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:56:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:56:14 -0500
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.30,1.31
Message-ID: <200602071156.k17BuE7B018203@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-terminal.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-terminal.spec	31 Jan 2006 02:28:17 -0000	1.30
+++ gnome-terminal.spec	7 Feb 2006 11:56:12 -0000	1.31
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -103,6 +103,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Christopher Aillon <caillon at redhat.com> 2.13.90-1
 - Update to 2.13.90
 - Add patch to not specify a default invisible char, let GTK+ handle it



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:56:26 -0500
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.7,1.8
Message-ID: <200602071156.k17BuQG1018333@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18309

Modified Files:
	gnome-user-share.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-user-share.spec	3 Feb 2006 15:06:45 -0000	1.7
+++ gnome-user-share.spec	7 Feb 2006 11:56:23 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -59,6 +59,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Alexander Larsson <alexl at redhat.com> 0.9-2
 - Patch config for apache 2.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:56:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:56:37 -0500
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.88,1.89
Message-ID: <200602071156.k17BubxZ018474@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-utils.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gnome-utils.spec	6 Feb 2006 15:54:41 -0000	1.88
+++ gnome-utils.spec	7 Feb 2006 11:56:35 -0000	1.89
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.91
-Release: 2
+Release: 2.1
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -214,6 +214,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.91-2
 - Fix a gnome-system-log crash
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:56:50 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.93,1.94
Message-ID: <200602071156.k17BuocD018614@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-vfs2.spec	4 Feb 2006 05:25:31 -0000	1.93
+++ gnome-vfs2.spec	7 Feb 2006 11:56:48 -0000	1.94
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.4
-Release: 7
+Release: 7.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -182,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com> 2.13.4-7
 - Fix requires
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:57:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:57:02 -0500
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.31,
	1.32
Message-ID: <200602071157.k17Bv2Kh018758@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18727

Modified Files:
	gnome-volume-manager.spec 
Log Message:
bump for new gcc/glibc


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-volume-manager.spec	27 Jan 2006 03:58:49 -0000	1.31
+++ gnome-volume-manager.spec	7 Feb 2006 11:56:59 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.11
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.11-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.11-1
 - Update 1.5.11
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:57:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:57:12 -0500
Subject: rpms/gnopernicus/devel gnopernicus.spec,1.37,1.38
Message-ID: <200602071157.k17BvCut018875@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18847

Modified Files:
	gnopernicus.spec 
Log Message:
bump for new gcc/glibc


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnopernicus.spec	31 Jan 2006 04:15:50 -0000	1.37
+++ gnopernicus.spec	7 Feb 2006 11:57:09 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 1.0.1-1
 - Update to 1.0.1 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:57:24 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.22,1.23
Message-ID: <200602071157.k17BvOxZ019017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18986

Modified Files:
	gnucash.spec 
Log Message:
bump for new gcc/glibc


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnucash.spec	13 Jan 2006 19:07:38 -0000	1.22
+++ gnucash.spec	7 Feb 2006 11:57:21 -0000	1.23
@@ -3,7 +3,7 @@
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
 Version: 1.8.12
-Release: 2
+Release: 2.1
 License: GPL/GFDL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz
@@ -106,6 +106,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.12-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Bill Nottingham <notting at redhat.com> 1.8.12-2
 - disable postgres backend (#177646)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:57:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:57:38 -0500
Subject: rpms/gnu-efi/devel gnu-efi.spec,1.11,1.12
Message-ID: <200602071157.k17Bvcv3019176@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnu-efi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19145

Modified Files:
	gnu-efi.spec 
Log Message:
bump for new gcc/glibc


Index: gnu-efi.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-efi/devel/gnu-efi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnu-efi.spec	9 Dec 2005 22:40:45 -0000	1.11
+++ gnu-efi.spec	7 Feb 2006 11:57:35 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Development Libraries and headers for EFI
 Name: gnu-efi
 Version: 3.0a
-Release: 7.1
+Release: 7.2
 Group: Development/System
 License: GPL
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz
@@ -49,6 +49,9 @@
 /usr/lib/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0a-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:57:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:57:49 -0500
Subject: rpms/gnupg/devel gnupg.spec,1.39,1.40
Message-ID: <200602071157.k17Bvnrw019308@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnupg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19278

Modified Files:
	gnupg.spec 
Log Message:
bump for new gcc/glibc


Index: gnupg.spec
===================================================================
RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnupg.spec	9 Dec 2005 22:40:46 -0000	1.39
+++ gnupg.spec	7 Feb 2006 11:57:46 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
 Version: 1.4.2
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 %{_mandir}/man7/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:58:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:58:00 -0500
Subject: rpms/gnuplot/devel gnuplot.spec,1.23,1.24
Message-ID: <200602071158.k17Bw0Y9019441@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnuplot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19412

Modified Files:
	gnuplot.spec 
Log Message:
bump for new gcc/glibc


Index: gnuplot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnuplot.spec	9 Dec 2005 22:40:46 -0000	1.23
+++ gnuplot.spec	7 Feb 2006 11:57:58 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A program for plotting mathematical expressions and data.
 Name: gnuplot
 Version: 4.0.0
-Release: 10.1
+Release: 10.2
 License: Redistributable, with restrictions
 Group: Applications/Engineering
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-10.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:58:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:58:25 -0500
Subject: rpms/gnutls/devel gnutls.spec,1.16,1.17
Message-ID: <200602071158.k17BwPbR019672@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19643

Modified Files:
	gnutls.spec 
Log Message:
bump for new gcc/glibc


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnutls.spec	3 Jan 2006 19:46:58 -0000	1.16
+++ gnutls.spec	7 Feb 2006 11:58:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
 Version: 1.2.9
-Release: 3
+Release: 3.1
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel >= 1.2.2
@@ -114,6 +114,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1.2.9-3
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:58:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:58:41 -0500
Subject: rpms/gob2/devel gob2.spec,1.8,1.9
Message-ID: <200602071158.k17BwfWB019842@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gob2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19812

Modified Files:
	gob2.spec 
Log Message:
bump for new gcc/glibc


Index: gob2.spec
===================================================================
RCS file: /cvs/dist/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gob2.spec	9 Dec 2005 22:40:47 -0000	1.8
+++ gob2.spec	7 Feb 2006 11:58:39 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: GOB2, The GObject Builder
 Name: gob2
 Version: 2.0.12
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Tools
 Source: gob2-%{version}.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.12-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:58:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:58:52 -0500
Subject: rpms/gok/devel gok.spec,1.26,1.27
Message-ID: <200602071158.k17BwqHw019968@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19941

Modified Files:
	gok.spec 
Log Message:
bump for new gcc/glibc


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gok.spec	9 Dec 2005 22:40:47 -0000	1.26
+++ gok.spec	7 Feb 2006 11:58:49 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.0.5
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -106,6 +106,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:03 -0500
Subject: rpms/gpart/devel gpart.spec,1.3,1.4
Message-ID: <200602071159.k17Bx3Ev020100@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gpart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20071

Modified Files:
	gpart.spec 
Log Message:
bump for new gcc/glibc


Index: gpart.spec
===================================================================
RCS file: /cvs/dist/rpms/gpart/devel/gpart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpart.spec	9 Dec 2005 22:40:47 -0000	1.3
+++ gpart.spec	7 Feb 2006 11:59:00 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:  A program for recovering corrupt partition tables.
 Name: gpart
 Version: 0.1h
-Release: 1.1
+Release: 1.2
 ExclusiveArch: i386
 Source: http://www.stud.uni-hannover.de/user/76201/%{name}/%{name}-%{version}.tar.gz
 Patch0: gpart-0.1h-varname.patch
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1h-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:13 -0500
Subject: rpms/gperf/devel gperf.spec,1.17,1.18
Message-ID: <200602071159.k17BxDgi020231@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gperf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20201

Modified Files:
	gperf.spec 
Log Message:
bump for new gcc/glibc


Index: gperf.spec
===================================================================
RCS file: /cvs/dist/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gperf.spec	9 Dec 2005 22:40:47 -0000	1.17
+++ gperf.spec	7 Feb 2006 11:59:11 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A perfect hash function generator.
 Name: gperf
 Version: 3.0.1
-Release: 7.1
+Release: 7.2
 License: GPL
 Source: ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Patch0: gperf-3.0.1-gcc4.patch
@@ -51,6 +51,9 @@
 %{_infodir}/gperf.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:25 -0500
Subject: rpms/gphoto2/devel gphoto2.spec,1.52,1.53
Message-ID: <200602071159.k17BxP3s020355@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20325

Modified Files:
	gphoto2.spec 
Log Message:
bump for new gcc/glibc


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gphoto2.spec	30 Jan 2006 18:38:23 -0000	1.52
+++ gphoto2.spec	7 Feb 2006 11:59:22 -0000	1.53
@@ -5,7 +5,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 5
+Release: 5.1
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -212,6 +212,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.99-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Bill Nottingham <notting at redhat.com> 2.1.99-5
 - set permissions on /dev/bus/usb/XXX as well - that's what new
   libusb uses by default



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:36 -0500
Subject: rpms/gpm/devel gpm.spec,1.37,1.38
Message-ID: <200602071159.k17BxakA020491@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20462

Modified Files:
	gpm.spec 
Log Message:
bump for new gcc/glibc


Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gpm.spec	18 Jan 2006 12:07:55 -0000	1.37
+++ gpm.spec	7 Feb 2006 11:59:34 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 73
+Release: 73.1
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -178,6 +178,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.20.1-73.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Petr Rockai <prockai at redhat.com> 1.20.1-73
 - do not ooops in gpm when console device cannot be found, print
   an error message instead and exit(1), as per BR 140025, 176178



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:47 -0500
Subject: rpms/grep/devel grep.spec,1.57,1.58
Message-ID: <200602071159.k17BxlGG020619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20590

Modified Files:
	grep.spec 
Log Message:
bump for new gcc/glibc


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- grep.spec	3 Feb 2006 14:12:33 -0000	1.57
+++ grep.spec	7 Feb 2006 11:59:44 -0000	1.58
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 52
+Release: 52.1
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -94,6 +94,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-52.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-52
 - Prevent 'grep -P' from segfaulting (bug #171379).
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 11:59:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 06:59:58 -0500
Subject: rpms/groff/devel groff.spec,1.34,1.35
Message-ID: <200602071159.k17BxwIW020749@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/groff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20718

Modified Files:
	groff.spec 
Log Message:
bump for new gcc/glibc


Index: groff.spec
===================================================================
RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- groff.spec	2 Feb 2006 08:54:09 -0000	1.34
+++ groff.spec	7 Feb 2006 11:59:56 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18.1.1
-Release: 9
+Release: 9.1
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -210,6 +210,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1.1-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Miroslav Lichvar <mlichvar at redhat.com> - 1.18.1.1-9
 - remove gxditview from groff package (#179684)
 - remove obsolete "--enable-japanese" configure option



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:01:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:01:56 -0500
Subject: rpms/grub/devel grub.spec,1.34,1.35
Message-ID: <200602071201.k17C1uoV020956@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20928

Modified Files:
	grub.spec 
Log Message:
bump for new gcc/glibc


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- grub.spec	13 Jan 2006 22:14:04 -0000	1.34
+++ grub.spec	7 Feb 2006 12:01:53 -0000	1.35
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 2
+Release: 2.1
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -220,6 +220,9 @@
 %{_datadir}/grub
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.97-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Peter Jones <pjones at redhat.com> - 0.97-2
 - add dmraid support
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:04:04 -0500
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.7,1.8
Message-ID: <200602071204.k17C447b021133@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21121

Modified Files:
	gsf-sharp.spec 
Log Message:
bump for new gcc/glibc


Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gsf-sharp.spec	1 Feb 2006 01:18:06 -0000	1.7
+++ gsf-sharp.spec	7 Feb 2006 12:03:58 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.6
-Release:        6
+Release:        6.1
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.6-6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:04:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:04:49 -0500
Subject: rpms/gsl/devel gsl.spec,1.18,1.19
Message-ID: <200602071204.k17C4nvo021224@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21207

Modified Files:
	gsl.spec 
Log Message:
bump for new gcc/glibc


Index: gsl.spec
===================================================================
RCS file: /cvs/dist/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gsl.spec	9 Dec 2005 22:40:49 -0000	1.18
+++ gsl.spec	7 Feb 2006 12:04:45 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis.
 Name: gsl
 Version: 1.7
-Release: 1.1
+Release: 1.2
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
@@ -79,6 +79,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:05:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:05:24 -0500
Subject: rpms/gstreamer/devel gstreamer.spec,1.43,1.44
Message-ID: <200602071205.k17C5OCD021343@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer.spec 
Log Message:
bump for new gcc/glibc


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gstreamer.spec	18 Jan 2006 16:27:15 -0000	1.43
+++ gstreamer.spec	7 Feb 2006 12:05:11 -0000	1.44
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.2
-Release: 	1
+Release: 	1.1
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -199,6 +199,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.2-1
 - Upgrade to 0.10.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:06:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:06:02 -0500
Subject: rpms/gstreamer08/devel gstreamer08.spec,1.7,1.8
Message-ID: <200602071206.k17C621n021494@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gstreamer08/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21470

Modified Files:
	gstreamer08.spec 
Log Message:
bump for new gcc/glibc


Index: gstreamer08.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer08/devel/gstreamer08.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gstreamer08.spec	10 Jan 2006 20:38:16 -0000	1.7
+++ gstreamer08.spec	7 Feb 2006 12:06:00 -0000	1.8
@@ -10,7 +10,7 @@
 
 Name:           %{gstreamer}
 Version:        0.8.11
-Release:        3
+Release:        3.1
 Summary:        GStreamer streaming media framework runtime.
 
 Group:          Applications/Multimedia
@@ -168,6 +168,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.11-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Bill Nottingham <notting at redhat.com> 0.8.11-3
 - requires(pre) coreutils, since we call env
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:06:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:06:31 -0500
Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.6,1.7
Message-ID: <200602071206.k17C6V7t021639@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gstreamer08-plugins/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21589

Modified Files:
	gstreamer08-plugins.spec 
Log Message:
bump for new gcc/glibc


Index: gstreamer08-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer08-plugins.spec	19 Jan 2006 18:39:59 -0000	1.6
+++ gstreamer08-plugins.spec	7 Feb 2006 12:06:28 -0000	1.7
@@ -8,7 +8,7 @@
 
 Name:           %{gstreamer}-plugins
 Version:        0.8.11
-Release:        6
+Release:        6.1
 Summary:        GStreamer Streaming media framework plug-ins
 
 Group:          Applications/Multimedia
@@ -317,6 +317,9 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.11-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Christopher Aillon <caillon at redhat.com> - 0.8.11-6
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:06:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:06:52 -0500
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.7,
	1.8
Message-ID: <200602071206.k17C6qUd021770@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
bump for new gcc/glibc


Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gstreamer-plugins-base.spec	2 Feb 2006 15:13:27 -0000	1.7
+++ gstreamer-plugins-base.spec	7 Feb 2006 12:06:50 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.2
-Release: 	2
+Release: 	2.1
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -187,6 +187,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Warren Togami <wtogami at redhat.com> - 0.10.2-2
 - buildreq cdparanoia-devel (#179034 thias)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:07:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:07:13 -0500
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.4,
	1.5
Message-ID: <200602071207.k17C7DCg021893@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
bump for new gcc/glibc


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gstreamer-plugins-good.spec	18 Jan 2006 16:42:28 -0000	1.4
+++ gstreamer-plugins-good.spec	7 Feb 2006 12:07:10 -0000	1.5
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.1
-Release:  	1	
+Release:  	1.1	
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -173,6 +173,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com>  0.10.1-1
 - Upgrade to 0.10.1
 - Add libgstid3demux.so to the files section



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:07:32 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.30,1.31
Message-ID: <200602071207.k17C7WeM022017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21992

Modified Files:
	gthumb.spec 
Log Message:
bump for new gcc/glibc


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gthumb.spec	27 Jan 2006 17:43:54 -0000	1.30
+++ gthumb.spec	7 Feb 2006 12:07:29 -0000	1.31
@@ -9,7 +9,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.7.2
-Release: 2
+Release: 2.1
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -92,6 +92,9 @@
 %{_datadir}/pixmaps
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.2-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Ray Strode <rstrode at redhat.com> - 2.7.2-2
 - drop redhat-menus buildrequires
 - use make install DESTDIR instead %%makeinstall



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:07:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:07:46 -0500
Subject: rpms/gtk+/devel gtk+.spec,1.51,1.52
Message-ID: <200602071207.k17C7kf9022170@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk+/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22143

Modified Files:
	gtk+.spec 
Log Message:
bump for new gcc/glibc


Index: gtk+.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk+/devel/gtk+.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gtk+.spec	9 Dec 2005 22:40:49 -0000	1.51
+++ gtk+.spec	7 Feb 2006 12:07:43 -0000	1.52
@@ -4,7 +4,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk+
 Version: 1.2.10
-Release: 49.1
+Release: 49.2
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -214,6 +214,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-49.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:08:03 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.117,1.118
Message-ID: <200602071208.k17C83E2022321@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2.spec 
Log Message:
bump for new gcc/glibc


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gtk2.spec	6 Feb 2006 17:36:35 -0000	1.117
+++ gtk2.spec	7 Feb 2006 12:08:00 -0000	1.118
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 5
+Release: 5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -263,6 +263,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.11-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-5
 - Sync render fix with upstream
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:08:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:08:33 -0500
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.33,1.34
Message-ID: <200602071208.k17C8XjW022573@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2-engines.spec 
Log Message:
bump for new gcc/glibc


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gtk2-engines.spec	31 Jan 2006 02:46:23 -0000	1.33
+++ gtk2-engines.spec	7 Feb 2006 12:08:30 -0000	1.34
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	1
+Release:	1.1
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.7.4-1
 - Update to 2.7.4
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:05 -0500
Subject: rpms/gtk-engines/devel gtk-engines.spec,1.20,1.21
Message-ID: <200602071209.k17C95u3022833@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22794

Modified Files:
	gtk-engines.spec 
Log Message:
bump for new gcc/glibc


Index: gtk-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-engines/devel/gtk-engines.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-engines.spec	10 Jan 2006 22:04:04 -0000	1.20
+++ gtk-engines.spec	7 Feb 2006 12:09:02 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Theme engines for GTK+.
 Name: gtk-engines
 Version: 0.12
-Release: 7.1
+Release: 7.2
 Epoch: 1
 License: GPL
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:18 -0500
Subject: rpms/gtkhtml/devel gtkhtml.spec,1.20,1.21
Message-ID: <200602071209.k17C9Ik3022988@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22958

Modified Files:
	gtkhtml.spec 
Log Message:
bump for new gcc/glibc


Index: gtkhtml.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml/devel/gtkhtml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtkhtml.spec	9 Dec 2005 22:40:50 -0000	1.20
+++ gtkhtml.spec	7 Feb 2006 12:09:15 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: gtkhtml library
 Name: gtkhtml
 Version: 1.1.9
-Release: 11.1
+Release: 11.2
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.9-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:28 -0500
Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.14,1.15
Message-ID: <200602071209.k17C9S8c023118@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23085

Modified Files:
	gtkhtml2.spec 
Log Message:
bump for new gcc/glibc


Index: gtkhtml2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml2/devel/gtkhtml2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtkhtml2.spec	9 Dec 2005 22:40:51 -0000	1.14
+++ gtkhtml2.spec	7 Feb 2006 12:09:26 -0000	1.15
@@ -7,7 +7,7 @@
 Summary: An HTML widget for GTK+ 2.0
 Name: gtkhtml2
 Version: 2.6.3
-Release: 1.1
+Release: 1.2
 Source0: libgtkhtml-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:38 -0500
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.53,1.54
Message-ID: <200602071209.k17C9cGf023235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23206

Modified Files:
	gtkhtml3.spec 
Log Message:
bump for new gcc/glibc


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gtkhtml3.spec	31 Jan 2006 18:27:54 -0000	1.53
+++ gtkhtml3.spec	7 Feb 2006 12:09:35 -0000	1.54
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.9.90
-Release: 3
+Release: 3.1
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.9.90-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 3.9.90-3
 - Actually apply the patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:48 -0500
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.8,1.9
Message-ID: <200602071209.k17C9mEo023365@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23334

Modified Files:
	gtk-sharp.spec 
Log Message:
bump for new gcc/glibc


Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-sharp.spec	19 Jan 2006 10:18:05 -0000	1.8
+++ gtk-sharp.spec	7 Feb 2006 12:09:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gtk-sharp
 Version:        1.0.10
-Release:        4
+Release:        4.1
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_prefix}/share/gapi
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.10-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Alexander Larsson <alexl at redhat.com> 1.0.10-4
 - mono now builds on s390x
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:09:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:09:59 -0500
Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.9,1.10
Message-ID: <200602071209.k17C9xpm023494@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23462

Modified Files:
	gtk-sharp2.spec 
Log Message:
bump for new gcc/glibc


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-sharp2.spec	31 Jan 2006 23:14:45 -0000	1.9
+++ gtk-sharp2.spec	7 Feb 2006 12:09:56 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
 Version:        2.8.0
-Release:        1
+Release:        1.1
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@
 %{_prefix}/share/gapi-2.0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 2.8.0-1
 - Update to 2.8.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:10:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:10:14 -0500
Subject: rpms/gtksourceview/devel gtksourceview.spec,1.26,1.27
Message-ID: <200602071210.k17CAE9q023624@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23594

Modified Files:
	gtksourceview.spec 
Log Message:
bump for new gcc/glibc


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gtksourceview.spec	5 Feb 2006 04:10:15 -0000	1.26
+++ gtksourceview.spec	7 Feb 2006 12:10:10 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.5.7
-Release: 2 
+Release: 2.1 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.7-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb  4 2006 Matthias Clasen <mclasen at redhat.com>
 - Update URL
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:10:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:10:34 -0500
Subject: rpms/gtkspell/devel gtkspell.spec,1.13,1.14
Message-ID: <200602071210.k17CAYbA023809@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23778

Modified Files:
	gtkspell.spec 
Log Message:
bump for new gcc/glibc


Index: gtkspell.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gtkspell.spec	9 Dec 2005 22:40:51 -0000	1.13
+++ gtkspell.spec	7 Feb 2006 12:10:30 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: GtkSpell provides on-the-fly spell checking for GtkTextView widgets.
 Name: gtkspell
 Version: 2.0.11
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://gtkspell.sourceforge.net/
@@ -62,6 +62,9 @@
 %{_includedir}/gtkspell-2.0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.11-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:10:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:10:48 -0500
Subject: rpms/guile/devel guile.spec,1.33,1.34
Message-ID: <200602071210.k17CAm6F023966@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/guile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23935

Modified Files:
	guile.spec 
Log Message:
bump for new gcc/glibc


Index: guile.spec
===================================================================
RCS file: /cvs/dist/rpms/guile/devel/guile.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- guile.spec	6 Feb 2006 14:36:22 -0000	1.33
+++ guile.spec	7 Feb 2006 12:10:45 -0000	1.34
@@ -4,7 +4,7 @@
 Summary: A GNU implementation of Scheme for application extensibility.
 Name: guile
 Version: 1.6.7
-Release: 5
+Release: 5.1
 Source: ftp://ftp.gnu.org/gnu/guile-%{version}.tar.gz
 Source2: http://ai.king.net.pl/guile-1.6-missing-tools.tar.gz
 Patch1: guile-1.6.7-rpath.patch
@@ -177,6 +177,9 @@
 %{_includedir}/libguile.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:1.6.7-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Miroslav Lichvar <mlichvar at redhat.com> 5:1.6.7-5
 - Avoid marking qthreads library as requiring executable stack (#179274)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:10:59 -0500
Subject: rpms/gulm/devel gulm.spec,1.23,1.24
Message-ID: <200602071210.k17CAxwJ024101@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gulm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24069

Modified Files:
	gulm.spec 
Log Message:
bump for new gcc/glibc


Index: gulm.spec
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gulm.spec	16 Dec 2005 22:41:48 -0000	1.23
+++ gulm.spec	7 Feb 2006 12:10:57 -0000	1.24
@@ -12,7 +12,7 @@
 
 Name: gulm
 Version: 1.0.5
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL
 Group: System Environment/Daemons
 Summary: gulm - One possible lock manager for GFS
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:11:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:11:09 -0500
Subject: rpms/Guppi/devel Guppi.spec,1.20,1.21
Message-ID: <200602071211.k17CB9Hl024230@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Guppi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24198

Modified Files:
	Guppi.spec 
Log Message:
bump for new gcc/glibc


Index: Guppi.spec
===================================================================
RCS file: /cvs/dist/rpms/Guppi/devel/Guppi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Guppi.spec	9 Dec 2005 22:39:28 -0000	1.20
+++ Guppi.spec	7 Feb 2006 12:11:07 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: GNOME Data Analysis and Visualization.
 Name: Guppi
 Version: 0.40.3
-Release: 24.1
+Release: 24.2
 License: GPL
 Group: Applications/Engineering
 Source: ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/libguppi.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.40.3-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:11:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:11:21 -0500
Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.7,1.8
Message-ID: <200602071211.k17CBLSm024358@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gwenhywfar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24330

Modified Files:
	gwenhywfar.spec 
Log Message:
bump for new gcc/glibc


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gwenhywfar.spec	22 Dec 2005 07:35:22 -0000	1.7
+++ gwenhywfar.spec	7 Feb 2006 12:11:17 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 1.99.2
-Release: 1
+Release: 1.1
 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz
 Patch: gwenhywfar-aclocal.patch
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.99.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Bill Nottingham <notting at redhat.com> 1.99.2-1
 - update to 1.99.2
 - use the pkgconfig file, not gwenhywfar-config



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:11:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:11:32 -0500
Subject: rpms/g-wrap/devel g-wrap.spec,1.16,1.17
Message-ID: <200602071211.k17CBWMq024493@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24464

Modified Files:
	g-wrap.spec 
Log Message:
bump for new gcc/glibc


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- g-wrap.spec	9 Dec 2005 22:40:30 -0000	1.16
+++ g-wrap.spec	7 Feb 2006 12:11:29 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.3.4
-Release: 9.1
+Release: 9.2
 Group: Development/Libraries
 License: GPL
 Requires: guile
@@ -95,6 +95,9 @@
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.4-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:11:45 -0500
Subject: rpms/gzip/devel gzip.spec,1.22,1.23
Message-ID: <200602071211.k17CBjbF024633@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24604

Modified Files:
	gzip.spec 
Log Message:
bump for new gcc/glibc


Index: gzip.spec
===================================================================
RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gzip.spec	9 Dec 2005 22:40:52 -0000	1.22
+++ gzip.spec	7 Feb 2006 12:11:41 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program.
 Name: gzip
 Version: 1.3.5
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:11:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:11:57 -0500
Subject: rpms/h2ps/devel h2ps.spec,1.11,1.12
Message-ID: <200602071211.k17CBvoG024769@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/h2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24741

Modified Files:
	h2ps.spec 
Log Message:
bump for new gcc/glibc


Index: h2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/h2ps/devel/h2ps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- h2ps.spec	9 Dec 2005 22:40:52 -0000	1.11
+++ h2ps.spec	7 Feb 2006 12:11:54 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Korean Hangul coverter from text file to postscript
 Name:		h2ps
 Version:	2.06
-Release: 14.1
+Release: 14.2
 License:	Distributable
 Group:		Applications/Text
 Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %attr(755,root,root)/usr/bin/h2ps
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.06-14.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:12:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:12:08 -0500
Subject: rpms/hal/devel hal.spec,1.79,1.80
Message-ID: <200602071212.k17CC87c024903@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24871

Modified Files:
	hal.spec 
Log Message:
bump for new gcc/glibc


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- hal.spec	18 Jan 2006 22:19:12 -0000	1.79
+++ hal.spec	7 Feb 2006 12:12:05 -0000	1.80
@@ -18,7 +18,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.6
-Release: 3 
+Release: 3.1 
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -173,6 +173,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.6-3
 - Patch storage-method policy so that the eject method is available
   to audio cd's



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:12:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:12:19 -0500
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.22,1.23
Message-ID: <200602071212.k17CCJ7r025032@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	hal-cups-utils.spec 
Log Message:
bump for new gcc/glibc


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- hal-cups-utils.spec	12 Jan 2006 20:35:50 -0000	1.22
+++ hal-cups-utils.spec	7 Feb 2006 12:12:16 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.5.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -70,6 +70,9 @@
 %{_sysconfdir}/rc.d/init.d/cups-config-daemon
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> - 0.5.5-1
 - New version, which makes sure we build the daemon with PIE
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:12:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:12:30 -0500
Subject: rpms/hardlink/devel hardlink.spec,1.19,1.20
Message-ID: <200602071212.k17CCUEM025172@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hardlink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25144

Modified Files:
	hardlink.spec 
Log Message:
bump for new gcc/glibc


Index: hardlink.spec
===================================================================
RCS file: /cvs/dist/rpms/hardlink/devel/hardlink.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- hardlink.spec	9 Dec 2005 22:40:53 -0000	1.19
+++ hardlink.spec	7 Feb 2006 12:12:27 -0000	1.20
@@ -35,6 +35,9 @@
 %{_mandir}/man1/hardlink.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release: :.1 1.19.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:12:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:12:40 -0500
Subject: rpms/hdparm/devel hdparm.spec,1.24,1.25
Message-ID: <200602071212.k17CCe9s025302@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25270

Modified Files:
	hdparm.spec 
Log Message:
bump for new gcc/glibc


Index: hdparm.spec
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- hdparm.spec	20 Dec 2005 16:01:40 -0000	1.24
+++ hdparm.spec	7 Feb 2006 12:12:38 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A utility for displaying and/or setting hard disk parameters.
 Name: hdparm
 Version: 6.3
-Release: 2
+Release: 2.1
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 20 2005 Karsten Hopp <karsten at redhat.de> 6.3-2
 - use ExcludeArch, this allows building on archs we don't
   ship such as Alpha (#175919)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:12:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:12:50 -0500
Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.40,1.41
Message-ID: <200602071212.k17CCoPN025422@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/HelixPlayer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25390

Modified Files:
	HelixPlayer.spec 
Log Message:
bump for new gcc/glibc


Index: HelixPlayer.spec
===================================================================
RCS file: /cvs/dist/rpms/HelixPlayer/devel/HelixPlayer.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- HelixPlayer.spec	10 Dec 2005 16:38:50 -0000	1.40
+++ HelixPlayer.spec	7 Feb 2006 12:12:48 -0000	1.41
@@ -4,7 +4,7 @@
 Name: HelixPlayer
 Version: 1.0.6
 Epoch: 1
-Release: 1.1
+Release: 1.2
 Group: Applications/Multimedia
 License: RPSL, GPL
 URL: https://player.helixcommunity.org/
@@ -168,6 +168,9 @@
 %{_datadir}/application-registry/hxplay.applications
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:13:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:13:06 -0500
Subject: rpms/hesiod/devel hesiod.spec,1.11,1.12
Message-ID: <200602071213.k17CD6fu025578@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hesiod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25546

Modified Files:
	hesiod.spec 
Log Message:
bump for new gcc/glibc


Index: hesiod.spec
===================================================================
RCS file: /cvs/dist/rpms/hesiod/devel/hesiod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hesiod.spec	9 Dec 2005 22:40:54 -0000	1.11
+++ hesiod.spec	7 Feb 2006 12:13:02 -0000	1.12
@@ -1,6 +1,6 @@
 Name: hesiod
 Version: 3.0.2
-Release: 31.1
+Release: 31.2
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 Patch0: hesiod-3.0.2-shlib.patch
 Patch1: hesiod-3.0.2-env.patch
@@ -33,6 +33,9 @@
 the header files and libraries required for building programs which use Hesiod.
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-31.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:13:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:13:15 -0500
Subject: rpms/hexedit/devel hexedit.spec,1.18,1.19
Message-ID: <200602071213.k17CDFE5025714@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hexedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25682

Modified Files:
	hexedit.spec 
Log Message:
bump for new gcc/glibc


Index: hexedit.spec
===================================================================
RCS file: /cvs/dist/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hexedit.spec	26 Jan 2006 09:42:34 -0000	1.18
+++ hexedit.spec	7 Feb 2006 12:13:13 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A hexadecimal file viewer and editor.
 Name: hexedit
 Version: 1.2.12
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Editors
 Url: http://merd.net/pixel
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.12-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Jindrich Novy <jnovy at redhat.com> 1.2.12-3
 - rebuilt (#178824)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:13:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:13:26 -0500
Subject: rpms/hfsutils/devel hfsutils.spec,1.8,1.9
Message-ID: <200602071213.k17CDQTQ025843@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25811

Modified Files:
	hfsutils.spec 
Log Message:
bump for new gcc/glibc


Index: hfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hfsutils.spec	9 Dec 2005 22:40:54 -0000	1.8
+++ hfsutils.spec	7 Feb 2006 12:13:23 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes.
 Name: hfsutils
 Version: 3.2.6  
-Release: 7.1
+Release: 7.2
 Group: Applications/File
 License: GPL
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
@@ -120,6 +120,9 @@
 %{_includedir}/rsrc.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:13:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:13:42 -0500
Subject: rpms/hsqldb/devel hsqldb.spec,1.12,1.13
Message-ID: <200602071213.k17CDgbc026002@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25974

Modified Files:
	hsqldb.spec 
Log Message:
bump for new gcc/glibc


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hsqldb.spec	3 Jan 2006 19:09:21 -0000	1.12
+++ hsqldb.spec	7 Feb 2006 12:13:39 -0000	1.13
@@ -3,7 +3,7 @@
 %define name		hsqldb
 %define version		1.80.1
 %define cvs_version	1_8_0_1
-%define release 	1jpp_5fc
+%define release 	1jpp_6fc
 
 Name:		%{name}
 Version:	%{version}
@@ -208,6 +208,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_6fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 03 2006 Jesse Keating <jkeating at redhat.com> 0:1.80.1-1jpp_5fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:13:53 -0500
Subject: rpms/htdig/devel htdig.spec,1.24,1.25
Message-ID: <200602071213.k17CDrCU026142@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/htdig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26114

Modified Files:
	htdig.spec 
Log Message:
bump for new gcc/glibc


Index: htdig.spec
===================================================================
RCS file: /cvs/dist/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- htdig.spec	19 Dec 2005 23:25:48 -0000	1.24
+++ htdig.spec	7 Feb 2006 12:13:51 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0b6
-Release: 6.4
+Release: 6.4.1
 Epoch: 3
 License: GPL
 Group: Applications/Internet
@@ -140,6 +140,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:3.2.0b6-6.4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 - patched to not fail on apache version 2.x



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:14:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:14:24 -0500
Subject: rpms/httpd/devel httpd.spec,1.85,1.86
Message-ID: <200602071214.k17CEObR026439@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	httpd.spec 
Log Message:
bump for new gcc/glibc


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- httpd.spec	6 Feb 2006 14:58:12 -0000	1.85
+++ httpd.spec	7 Feb 2006 12:14:22 -0000	1.86
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 5.1
+Release: 5.1.1
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -491,6 +491,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.0-5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Joe Orton <jorton at redhat.com> 2.2.0-5.1
 - mod_auth_basic/mod_authn_file: if no provider is configured,
   and AuthUserFile is not configured, decline to handle authn



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:14:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:14:38 -0500
Subject: rpms/icon-slicer/devel icon-slicer.spec,1.7,1.8
Message-ID: <200602071214.k17CEcZb026584@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icon-slicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26554

Modified Files:
	icon-slicer.spec 
Log Message:
bump for new gcc/glibc


Index: icon-slicer.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-slicer/devel/icon-slicer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- icon-slicer.spec	9 Dec 2005 22:40:57 -0000	1.7
+++ icon-slicer.spec	7 Feb 2006 12:14:35 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Utility for icon theme generation
 Name: icon-slicer
 Version: 0.3
-Release: 7.1
+Release: 7.2
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %{_bindir}/icon-slicer
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:14:49 -0500
Subject: rpms/icu/devel icu.spec,1.11,1.12
Message-ID: <200602071214.k17CEnjH026713@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26689

Modified Files:
	icu.spec 
Log Message:
bump for new gcc/glibc


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- icu.spec	3 Jan 2006 10:55:14 -0000	1.11
+++ icu.spec	7 Feb 2006 12:14:46 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.4
-Release: 	6
+Release: 	6.1
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.4-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> - 3.4-6
 - add icu-gcc41.patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:15:02 -0500
Subject: rpms/iddev/devel iddev.spec,1.11,1.12
Message-ID: <200602071215.k17CF2Mb026857@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iddev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26828

Modified Files:
	iddev.spec 
Log Message:
bump for new gcc/glibc


Index: iddev.spec
===================================================================
RCS file: /cvs/dist/rpms/iddev/devel/iddev.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- iddev.spec	9 Dec 2005 22:40:57 -0000	1.11
+++ iddev.spec	7 Feb 2006 12:14:59 -0000	1.12
@@ -12,7 +12,7 @@
 
 Name: iddev
 Version: 2.0.0
-Release: 4.FC5.1
+Release: 4.FC5.2
 License: GPL
 Group: System Environment/Libraries
 Summary: iddev is a library that identifies device contents.
@@ -58,6 +58,9 @@
 %{_includedir}/iddev.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-4.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:15:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:15:16 -0500
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.52,1.53
Message-ID: <200602071215.k17CFGam027011@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26979

Modified Files:
	ImageMagick.spec 
Log Message:
bump for new gcc/glibc


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ImageMagick.spec	30 Jan 2006 14:07:28 -0000	1.52
+++ ImageMagick.spec	7 Feb 2006 12:15:13 -0000	1.53
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 4
+Release: 4.1
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -225,6 +225,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.2.5.4-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 6.2.5.4-4
 - Make -devel require lcms-devel (#179200)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:15:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:15:30 -0500
Subject: rpms/imake/devel imake.spec,1.15,1.16
Message-ID: <200602071215.k17CFTel027159@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27135

Modified Files:
	imake.spec 
Log Message:
bump for new gcc/glibc


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- imake.spec	31 Jan 2006 17:06:05 -0000	1.15
+++ imake.spec	7 Feb 2006 12:15:27 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -139,6 +139,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* 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
 - Updated all packages to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:15:52 -0500
Subject: rpms/imlib/devel imlib.spec,1.23,1.24
Message-ID: <200602071215.k17CFqZX027374@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27343

Modified Files:
	imlib.spec 
Log Message:
bump for new gcc/glibc


Index: imlib.spec
===================================================================
RCS file: /cvs/dist/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- imlib.spec	9 Dec 2005 22:40:59 -0000	1.23
+++ imlib.spec	7 Feb 2006 12:15:49 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: An image loading and rendering library for X11R6.
 Name: imlib
 Version: 1.9.13
-Release: 26.1
+Release: 26.2
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -139,6 +139,9 @@
 %{_datadir}/man/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.9.13-26.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:16:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:16:07 -0500
Subject: rpms/indent/devel indent.spec,1.19,1.20
Message-ID: <200602071216.k17CG7UN028763@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28367

Modified Files:
	indent.spec 
Log Message:
bump for new gcc/glibc


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- indent.spec	3 Feb 2006 16:01:23 -0000	1.19
+++ indent.spec	7 Feb 2006 12:16:05 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12
+Release: 12.1
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb 02 2006 Petr Machata <pmachata at redhat.com> 2.2.9-12
 - Adding Wei-Lun Chao's zh_TW UTF-8 messages (#134044)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:16:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:16:23 -0500
Subject: rpms/inn/devel inn.spec,1.24,1.25
Message-ID: <200602071216.k17CGNMT030792@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30260

Modified Files:
	inn.spec 
Log Message:
bump for new gcc/glibc


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- inn.spec	9 Dec 2005 22:40:59 -0000	1.24
+++ inn.spec	7 Feb 2006 12:16:20 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.2
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -285,6 +285,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:16:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:16:38 -0500
Subject: rpms/iproute/devel iproute.spec,1.43,1.44
Message-ID: <200602071216.k17CGchS032131@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31957

Modified Files:
	iproute.spec 
Log Message:
bump for new gcc/glibc


Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- iproute.spec	17 Jan 2006 18:06:02 -0000	1.43
+++ iproute.spec	7 Feb 2006 12:16:35 -0000	1.44
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.15
-Release: 1
+Release: 1.1
 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
@@ -85,6 +85,9 @@
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Radek Vokal <rvokal at redhat.com> 2.6.15-1
 - upgrade to 2.6.15-060110
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:16:52 -0500
Subject: rpms/iprutils/devel iprutils.spec,1.15,1.16
Message-ID: <200602071216.k17CGqT2001113@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv743

Modified Files:
	iprutils.spec 
Log Message:
bump for new gcc/glibc


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- iprutils.spec	23 Dec 2005 10:19:25 -0000	1.15
+++ iprutils.spec	7 Feb 2006 12:16:49 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.1.1
-Release: 1
+Release: 1.1
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -55,6 +55,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 23 2005 Paul Nasrat <pnasrat at redhat.com> - 2.1.1-1
 - Update to 2.1.1
 - Use RPM_OPT_FLAGS



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:17:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:17:04 -0500
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.20,1.21
Message-ID: <200602071217.k17CH4g9001913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1767

Modified Files:
	ipsec-tools.spec 
Log Message:
bump for new gcc/glibc


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ipsec-tools.spec	9 Dec 2005 22:41:00 -0000	1.20
+++ ipsec-tools.spec	7 Feb 2006 12:17:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.3
-Release: 1.1
+Release: 1.2
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -90,6 +90,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:17:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:17:16 -0500
Subject: rpms/iptables/devel iptables.spec,1.39,1.40
Message-ID: <200602071217.k17CHGD7003156@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2706

Modified Files:
	iptables.spec 
Log Message:
bump for new gcc/glibc


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- iptables.spec	2 Feb 2006 13:24:00 -0000	1.39
+++ iptables.spec	7 Feb 2006 12:17:14 -0000	1.40
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
 Version: 1.3.5
-Release: 1
+Release: 1.1
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -151,6 +151,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Thomas Woerner <twoerner at redhat.com> 1.3.5-1
 - new version 1.3.5
 - fixed init script to set policy for raw tables, too (#179094)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:17:29 -0500
Subject: rpms/iptraf/devel iptraf.spec,1.16,1.17
Message-ID: <200602071217.k17CHTLd004015@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3876

Modified Files:
	iptraf.spec 
Log Message:
bump for new gcc/glibc


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- iptraf.spec	3 Feb 2006 14:38:34 -0000	1.16
+++ iptraf.spec	7 Feb 2006 12:17:25 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility.
 Name: iptraf
 Version: 3.0.0
-Release: 1
+Release: 1.1
 Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
@@ -80,6 +80,9 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Miroslav Lichvar <mlichvar at redhat.com> 3.0.0-1
 - update to release 3.0.0
 - spec cleanup



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:17:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:17:43 -0500
Subject: rpms/iptstate/devel iptstate.spec,1.8,1.9
Message-ID: <200602071217.k17CHhQ4005342@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptstate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5195

Modified Files:
	iptstate.spec 
Log Message:
bump for new gcc/glibc


Index: iptstate.spec
===================================================================
RCS file: /cvs/dist/rpms/iptstate/devel/iptstate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iptstate.spec	9 Dec 2005 22:41:01 -0000	1.8
+++ iptstate.spec	7 Feb 2006 12:17:41 -0000	1.9
@@ -1,7 +1,7 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
 Version: 1.4
-Release: 1.1.1
+Release: 1.1.2
 Source: iptstate-%{version}.tar.bz2
 Patch0: iptstate-1.4-man8.patch
 Group: System Environment/Base
@@ -51,6 +51,9 @@
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-1.1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:17:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:17:55 -0500
Subject: rpms/iputils/devel iputils.spec,1.33,1.34
Message-ID: <200602071217.k17CHtHY006420@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6262

Modified Files:
	iputils.spec 
Log Message:
bump for new gcc/glibc


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- iputils.spec	6 Feb 2006 10:02:24 -0000	1.33
+++ iputils.spec	7 Feb 2006 12:17:52 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 34
+Release: 34.1
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -164,6 +164,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 20020927-34.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Radek Vok??l <rvokal at redhat.com> 20020927-34
 - ping clean-up, added new ICMP warning messages
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:18:08 -0500
Subject: rpms/ipv6calc/devel ipv6calc.spec,1.15,1.16
Message-ID: <200602071218.k17CI8gq007462@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7331

Modified Files:
	ipv6calc.spec 
Log Message:
bump for new gcc/glibc


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ipv6calc.spec	9 Dec 2005 22:41:01 -0000	1.15
+++ ipv6calc.spec	7 Feb 2006 12:18:06 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
 Version: 	0.50
-Release: 1.1
+Release: 1.2
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
 License: 	GNU GPL version 2
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.50-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:18:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:18:21 -0500
Subject: rpms/ipvsadm/devel ipvsadm.spec,1.9,1.10
Message-ID: <200602071218.k17CILSH008863@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipvsadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8834

Modified Files:
	ipvsadm.spec 
Log Message:
bump for new gcc/glibc


Index: ipvsadm.spec
===================================================================
RCS file: /cvs/dist/rpms/ipvsadm/devel/ipvsadm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ipvsadm.spec	9 Dec 2005 22:41:01 -0000	1.9
+++ ipvsadm.spec	7 Feb 2006 12:18:18 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Utility to administer the Linux Virtual Server
 Name: ipvsadm
 Version: 1.24
-Release: 7.1
+Release: 7.2
 License: GPL
 URL: http://www.LinuxVirtualServer.org/
 Group: Applications/System
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.24-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:18:33 -0500
Subject: rpms/irda-utils/devel irda-utils.spec,1.20,1.21
Message-ID: <200602071218.k17CIXgD008991@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	irda-utils.spec 
Log Message:
bump for new gcc/glibc


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- irda-utils.spec	9 Dec 2005 22:41:01 -0000	1.20
+++ irda-utils.spec	7 Feb 2006 12:18:30 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.16
-Release: 7.1
+Release: 7.2
 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
 Patch1: irda-utils-0.9.14-chkconfig.patch
 Patch2: irda-utils-0.9.14-typo.patch
@@ -86,6 +86,9 @@
 %doc tekram/README.tekram
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.16-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:18:44 -0500
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.48,1.49
Message-ID: <200602071218.k17CIikX009120@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	isdn4k-utils.spec 
Log Message:
bump for new gcc/glibc


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- isdn4k-utils.spec	18 Dec 2005 17:27:44 -0000	1.48
+++ isdn4k-utils.spec	7 Feb 2006 12:18:41 -0000	1.49
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 38
+Release: 38.1
 License: GPL
 Group: Applications/System
 
@@ -477,6 +477,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-38.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Dec 18 2005 Than Ngo <than at redhat.com> 3.2-38
 - add correct app-defaults directory
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:18:57 -0500
Subject: rpms/isicom/devel isicom.spec,1.14,1.15
Message-ID: <200602071218.k17CIvdC009262@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/isicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9232

Modified Files:
	isicom.spec 
Log Message:
bump for new gcc/glibc


Index: isicom.spec
===================================================================
RCS file: /cvs/dist/rpms/isicom/devel/isicom.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- isicom.spec	9 Dec 2005 22:41:03 -0000	1.14
+++ isicom.spec	7 Feb 2006 12:18:54 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Multitech IntelligentSerialInternal (ISI) Support Tools
 Name: isicom
 Version: 3.05
-Release: 18.1
+Release: 18.2
 License: GPL (not Firmware)
 Group: Applications/System
 URL: http://www.multitech.com/
@@ -71,6 +71,9 @@
 %{_datadir}/isicom/*.bin
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.05-18.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:19:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:19:07 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.135,
	1.136
Message-ID: <200602071219.k17CJ7Hd009383@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9356

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
bump for new gcc/glibc


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.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- java-1.4.2-gcj-compat.spec	7 Feb 2006 00:37:08 -0000	1.135
+++ java-1.4.2-gcj-compat.spec	7 Feb 2006 12:19:04 -0000	1.136
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_76rh
+%define release 	40jpp_77rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -589,6 +589,9 @@
 %{_javadocdir}/java
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.2.0-40jpp_77rh
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_76rh
 - Test src.zip before extracting its contents.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:19:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:19:38 -0500
Subject: rpms/javacc/devel javacc.spec,1.12,1.13
Message-ID: <200602071219.k17CJcYN009635@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9608

Modified Files:
	javacc.spec 
Log Message:
bump for new gcc/glibc


Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- javacc.spec	21 Dec 2005 20:01:55 -0000	1.12
+++ javacc.spec	7 Feb 2006 12:19:34 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           javacc
 Version:        3.2
-Release: 	1jpp_4fc
+Release: 	1jpp_5fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -91,6 +91,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.2-1jpp_4fc
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:19:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:19:48 -0500
Subject: rpms/java_cup/devel java_cup.spec,1.11,1.12
Message-ID: <200602071219.k17CJm8w009776@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9744

Modified Files:
	java_cup.spec 
Log Message:
bump for new gcc/glibc


Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java_cup.spec	3 Jan 2006 19:27:22 -0000	1.11
+++ java_cup.spec	7 Feb 2006 12:19:46 -0000	1.12
@@ -1,7 +1,7 @@
 %define name		java_cup
 %define version		0.10
 %define pkg_version	v10k
-%define release 	0.k.1jpp_6fc
+%define release 	0.k.1jpp_7fc
 %define section		free
 
 Name:		%{name}
@@ -101,6 +101,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_7fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1:0.10-0.k.1jpp_6fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:19:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:19:58 -0500
Subject: rpms/jfsutils/devel jfsutils.spec,1.12,1.13
Message-ID: <200602071219.k17CJwE6009903@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9871

Modified Files:
	jfsutils.spec 
Log Message:
bump for new gcc/glibc


Index: jfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jfsutils/devel/jfsutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jfsutils.spec	3 Jan 2006 19:30:24 -0000	1.12
+++ jfsutils.spec	7 Feb 2006 12:19:56 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the JFS filesystem.
 Name: jfsutils
 Version: 1.1.10
-Release: 3
+Release: 3.1
 Source0: jfsutils-%{version}.tar.gz
 URL: http://oss.software.ibm.com/jfs
 Group: System Environment/Base
@@ -43,6 +43,9 @@
 %doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.10-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com>
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:20:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:20:09 -0500
Subject: rpms/joe/devel joe.spec,1.25,1.26
Message-ID: <200602071220.k17CK9ou010035@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10004

Modified Files:
	joe.spec 
Log Message:
bump for new gcc/glibc


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- joe.spec	9 Dec 2005 22:41:05 -0000	1.25
+++ joe.spec	7 Feb 2006 12:20:07 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.3
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -54,6 +54,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:20:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:20:21 -0500
Subject: rpms/joystick/devel joystick.spec,1.14,1.15
Message-ID: <200602071220.k17CKLhr010175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10146

Modified Files:
	joystick.spec 
Log Message:
bump for new gcc/glibc


Index: joystick.spec
===================================================================
RCS file: /cvs/dist/rpms/joystick/devel/joystick.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- joystick.spec	9 Dec 2005 22:41:05 -0000	1.14
+++ joystick.spec	7 Feb 2006 12:20:18 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring most popular joysticks.
 Name: joystick
 Version: 1.2.15
-Release: 20.1
+Release: 20.2
 License: GPL
 Group: System Environment/Base
 ExcludeArch: s390 s390x
@@ -41,6 +41,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.15-20.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:20:31 -0500
Subject: rpms/jpilot/devel jpilot.spec,1.29,1.30
Message-ID: <200602071220.k17CKVPR010312@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10280

Modified Files:
	jpilot.spec 
Log Message:
bump for new gcc/glibc


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jpilot.spec	9 Dec 2005 22:41:05 -0000	1.29
+++ jpilot.spec	7 Feb 2006 12:20:29 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -79,6 +79,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.8-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:20:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:20:43 -0500
Subject: rpms/jsch/devel jsch.spec,1.10,1.11
Message-ID: <200602071220.k17CKhRF010437@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	jsch.spec 
Log Message:
bump for new gcc/glibc


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jsch.spec	21 Dec 2005 21:35:45 -0000	1.10
+++ jsch.spec	7 Feb 2006 12:20:40 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           jsch
 Version:        0.1.18
-Release:        1jpp_4fc
+Release:        1jpp_5fc
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-1jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Andrew Overholt <overholt at redhat.com> 0.1.18-1jpp_4fc
 - Rebuild again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:20:56 -0500
Subject: rpms/jwhois/devel jwhois.spec,1.23,1.24
Message-ID: <200602071220.k17CKumi010585@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10552

Modified Files:
	jwhois.spec 
Log Message:
bump for new gcc/glibc


Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jwhois.spec	9 Dec 2005 22:41:06 -0000	1.23
+++ jwhois.spec	7 Feb 2006 12:20:53 -0000	1.24
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 3.2.3
-Release: 3.1
+Release: 3.2
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
@@ -63,6 +63,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:21:05 -0500
Subject: rpms/k3b/devel k3b.spec,1.24,1.25
Message-ID: <200602071221.k17CL5Br010715@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10684

Modified Files:
	k3b.spec 
Log Message:
bump for new gcc/glibc


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- k3b.spec	24 Jan 2006 15:26:40 -0000	1.24
+++ k3b.spec	7 Feb 2006 12:21:03 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.10
-Release: 2
+Release: 2.1
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.10-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> 0:0.12.10-2
 - removed .la files (#172638)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:21:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:21:18 -0500
Subject: rpms/kasumi/devel kasumi.spec,1.11,1.12
Message-ID: <200602071221.k17CLIuC010858@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kasumi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10828

Modified Files:
	kasumi.spec 
Log Message:
bump for new gcc/glibc


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasumi.spec	15 Dec 2005 07:30:35 -0000	1.11
+++ kasumi.spec	7 Feb 2006 12:21:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name:    kasumi
 Version: 1.0
-Release: 1.fc5
+Release: 1.fc5.1
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-1.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Akira TAGOH <tagoh at redhat.com> - 1.0-1
 - New upstream release.
 - kasumi-1.0-gcc41.patch: build with -ffriend-injection to temporarily get it



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:21:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:21:29 -0500
Subject: rpms/kbd/devel kbd.spec,1.27,1.28
Message-ID: <200602071221.k17CLTou010983@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10955

Modified Files:
	kbd.spec 
Log Message:
bump for new gcc/glibc


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kbd.spec	20 Jan 2006 17:58:10 -0000	1.27
+++ kbd.spec	7 Feb 2006 12:21:26 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 13
+Release: 13.1
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -121,6 +121,9 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 20 2006 Miloslav Trmac <mitr at redhat.com> - 1.12-13
 - Fix build with new coreutils
 - Hardcode paths in unicode_start to avoid a few file lookups (#178329)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:21:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:21:40 -0500
Subject: rpms/kcc/devel kcc.spec,1.13,1.14
Message-ID: <200602071221.k17CLeae011119@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11088

Modified Files:
	kcc.spec 
Log Message:
bump for new gcc/glibc


Index: kcc.spec
===================================================================
RCS file: /cvs/dist/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kcc.spec	9 Dec 2005 22:41:07 -0000	1.13
+++ kcc.spec	7 Feb 2006 12:21:37 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		kcc
 Version:	2.3
-Release: 24.1
+Release: 24.2
 License:	GPL
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -49,6 +49,9 @@
 %{_mandir}/man1/kcc.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:21:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:21:50 -0500
Subject: rpms/kdbg/devel kdbg.spec,1.23,1.24
Message-ID: <200602071221.k17CLoSZ011242@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdbg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11214

Modified Files:
	kdbg.spec 
Log Message:
bump for new gcc/glibc


Index: kdbg.spec
===================================================================
RCS file: /cvs/dist/rpms/kdbg/devel/kdbg.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- kdbg.spec	16 Dec 2005 15:09:28 -0000	1.23
+++ kdbg.spec	7 Feb 2006 12:21:47 -0000	1.24
@@ -1,7 +1,7 @@
 Name: kdbg
 Summary: A GUI for gdb, the GNU debugger, and KDE.
 Version: 2.0.2
-Release: 1
+Release: 1.1
 Epoch: 1
 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
 License: GPL
@@ -60,6 +60,9 @@
 %{_docdir}/HTML/en/%{name}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Than Ngo <than at redhat.com> 1:2.0.2-1
 - update to 2.0.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:22:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:22:01 -0500
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.12,1.13
Message-ID: <200602071222.k17CM16q011388@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11355

Modified Files:
	kdeaccessibility.spec 
Log Message:
bump for new gcc/glibc


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kdeaccessibility.spec	3 Feb 2006 22:07:18 -0000	1.12
+++ kdeaccessibility.spec	7 Feb 2006 12:21:58 -0000	1.13
@@ -7,7 +7,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 1:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:22:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:22:15 -0500
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.42,1.43
Message-ID: <200602071222.k17CMFmb011535@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11506

Modified Files:
	kdeaddons.spec 
Log Message:
bump for new gcc/glibc


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdeaddons.spec	3 Feb 2006 22:21:14 -0000	1.42
+++ kdeaddons.spec	7 Feb 2006 12:22:11 -0000	1.43
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -168,6 +168,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:22:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:22:26 -0500
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.54,1.55
Message-ID: <200602071222.k17CMQJ1011670@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11639

Modified Files:
	kdeadmin.spec 
Log Message:
bump for new gcc/glibc


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdeadmin.spec	3 Feb 2006 22:55:09 -0000	1.54
+++ kdeadmin.spec	7 Feb 2006 12:22:23 -0000	1.55
@@ -23,7 +23,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -409,6 +409,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:22:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:22:38 -0500
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.44,1.45
Message-ID: <200602071222.k17CMcFP011803@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeartwork.spec 
Log Message:
bump for new gcc/glibc


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdeartwork.spec	3 Feb 2006 23:21:30 -0000	1.44
+++ kdeartwork.spec	7 Feb 2006 12:22:35 -0000	1.45
@@ -14,7 +14,7 @@
 
 Name: kdeartwork
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:22:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:22:54 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.148,1.149
Message-ID: <200602071222.k17CMsH7011980@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdebase.spec 
Log Message:
bump for new gcc/glibc


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- kdebase.spec	3 Feb 2006 17:42:39 -0000	1.148
+++ kdebase.spec	7 Feb 2006 12:22:51 -0000	1.149
@@ -23,7 +23,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 2
+Release: 2.1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -419,6 +419,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-2
 - apply patch to fix broken xx_XX layouts in kxkb
 - cleanup spec file



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:23:14 -0500
Subject: rpms/kdebindings/devel kdebindings.spec,1.39,1.40
Message-ID: <200602071223.k17CNEo7012182@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12156

Modified Files:
	kdebindings.spec 
Log Message:
bump for new gcc/glibc


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdebindings.spec	4 Feb 2006 10:44:58 -0000	1.39
+++ kdebindings.spec	7 Feb 2006 12:23:11 -0000	1.40
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -282,6 +282,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:23:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:23:28 -0500
Subject: rpms/kdeedu/devel kdeedu.spec,1.42,1.43
Message-ID: <200602071223.k17CNS0o012330@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12299

Modified Files:
	kdeedu.spec 
Log Message:
bump for new gcc/glibc


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdeedu.spec	4 Feb 2006 22:08:37 -0000	1.42
+++ kdeedu.spec	7 Feb 2006 12:23:24 -0000	1.43
@@ -13,7 +13,7 @@
 
 Name: kdeedu
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -184,6 +184,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb 04 2006 Than Ngo <than at redhat.com> 3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:23:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:23:48 -0500
Subject: rpms/kdegames/devel kdegames.spec,1.46,1.47
Message-ID: <200602071223.k17CNmIM012532@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdegames/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12501

Modified Files:
	kdegames.spec 
Log Message:
bump for new gcc/glibc


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdegames.spec	3 Feb 2006 21:52:02 -0000	1.46
+++ kdegames.spec	7 Feb 2006 12:23:45 -0000	1.47
@@ -19,7 +19,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -153,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:24:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:24:04 -0500
Subject: rpms/kdelibs/devel kdelibs.spec,1.124,1.125
Message-ID: <200602071224.k17CO4hY012742@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdelibs.spec 
Log Message:
bump for new gcc/glibc


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kdelibs.spec	2 Feb 2006 21:40:22 -0000	1.124
+++ kdelibs.spec	7 Feb 2006 12:24:01 -0000	1.125
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 2
+Release: 2.1
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -412,6 +412,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-2 
 - add Obsolete: kdelibs-docs
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:24:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:24:21 -0500
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.54,1.55
Message-ID: <200602071224.k17COLNc012921@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12890

Modified Files:
	kdemultimedia.spec 
Log Message:
bump for new gcc/glibc


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdemultimedia.spec	2 Feb 2006 21:33:39 -0000	1.54
+++ kdemultimedia.spec	7 Feb 2006 12:24:17 -0000	1.55
@@ -29,7 +29,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -246,6 +246,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:24:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:24:37 -0500
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.69,1.70
Message-ID: <200602071224.k17CObAM013099@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdenetwork.spec 
Log Message:
bump for new gcc/glibc


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdenetwork.spec	5 Feb 2006 19:29:54 -0000	1.69
+++ kdenetwork.spec	7 Feb 2006 12:24:34 -0000	1.70
@@ -14,7 +14,7 @@
 
 Name: kdenetwork
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -237,6 +237,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 05 2006 Than Ngo <than at redhat.com> 7:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:24:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:24:57 -0500
Subject: rpms/kdepim/devel kdepim.spec,1.74,1.75
Message-ID: <200602071224.k17COvwU013308@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13277

Modified Files:
	kdepim.spec 
Log Message:
bump for new gcc/glibc


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- kdepim.spec	2 Feb 2006 17:28:58 -0000	1.74
+++ kdepim.spec	7 Feb 2006 12:24:54 -0000	1.75
@@ -9,7 +9,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: /usr
@@ -207,6 +207,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - update to 3.5.1
 - get rid of kdepim-3.5.0-kmail-113730.patch, which included in new upstream 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:25:12 -0500
Subject: rpms/kdesdk/devel kdesdk.spec,1.49,1.50
Message-ID: <200602071225.k17CPCBx013469@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13435

Modified Files:
	kdesdk.spec 
Log Message:
bump for new gcc/glibc


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kdesdk.spec	5 Feb 2006 21:13:07 -0000	1.49
+++ kdesdk.spec	7 Feb 2006 12:25:08 -0000	1.50
@@ -15,7 +15,7 @@
 
 Name: kdesdk
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -236,6 +236,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 05 2006 Than Ngo <than at redhat.com> 3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:25:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:25:23 -0500
Subject: rpms/kdeutils/devel kdeutils.spec,1.52,1.53
Message-ID: <200602071225.k17CPNna013614@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeutils.spec 
Log Message:
bump for new gcc/glibc


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kdeutils.spec	5 Feb 2006 20:45:17 -0000	1.52
+++ kdeutils.spec	7 Feb 2006 12:25:21 -0000	1.53
@@ -11,7 +11,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -326,6 +326,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:25:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:25:35 -0500
Subject: rpms/kdevelop/devel kdevelop.spec,1.43,1.44
Message-ID: <200602071225.k17CPZQW013753@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13721

Modified Files:
	kdevelop.spec 
Log Message:
bump for new gcc/glibc


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdevelop.spec	5 Feb 2006 21:21:57 -0000	1.43
+++ kdevelop.spec	7 Feb 2006 12:25:32 -0000	1.44
@@ -13,7 +13,7 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.1
-Release: 1
+Release: 1.1
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -154,6 +154,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 05 2006 Than Ngo <than at redhat.com> 9:3.3.1-1 
 - 3.3.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:25:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:25:48 -0500
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.26,1.27
Message-ID: <200602071225.k17CPmA2013894@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13868

Modified Files:
	kdewebdev.spec 
Log Message:
bump for new gcc/glibc


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kdewebdev.spec	5 Feb 2006 21:34:07 -0000	1.26
+++ kdewebdev.spec	7 Feb 2006 12:25:45 -0000	1.27
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1
+Release: 1.1
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -147,6 +147,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:26:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:26:03 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.41,1.42
Message-ID: <200602071226.k17CQ3qG014056@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kernel-xen.spec 
Log Message:
bump for new gcc/glibc


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kernel-xen.spec	7 Feb 2006 00:45:15 -0000	1.41
+++ kernel-xen.spec	7 Feb 2006 12:26:01 -0000	1.42
@@ -1584,6 +1584,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 166: Tag takes single token only: Release: :.1 1.41_FC5.jkeating
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide 1.1914.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:26:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:26:58 -0500
Subject: rpms/kexec-tools/devel kexec-tools.spec,1.8,1.9
Message-ID: <200602071226.k17CQw3j014540@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14511

Modified Files:
	kexec-tools.spec 
Log Message:
bump for new gcc/glibc


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kexec-tools.spec	2 Feb 2006 10:38:55 -0000	1.8
+++ kexec-tools.spec	7 Feb 2006 12:26:54 -0000	1.9
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 7.1
+Release: 7.1.1
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -92,6 +92,9 @@
 %doc TODO
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.101-7.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Thomas Graf <tgraf at redhat.com> - 1.101-7.1
 - Add patch to enable the kdump binary for x86_64
 * Wed Feb 01 2006 Thomas Graf <tgraf at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:27:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:27:08 -0500
Subject: rpms/kon2/devel kon2.spec,1.19,1.20
Message-ID: <200602071227.k17CR8Qt014672@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kon2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14640

Modified Files:
	kon2.spec 
Log Message:
bump for new gcc/glibc


Index: kon2.spec
===================================================================
RCS file: /cvs/dist/rpms/kon2/devel/kon2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kon2.spec	9 Dec 2005 22:41:14 -0000	1.19
+++ kon2.spec	7 Feb 2006 12:27:06 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: KON - Kanji ON Linux console
 Name: kon2
 Version: 0.3.9b
-Release: 26.1
+Release: 26.2
 Group: Applications/System
 Source0: ftp://ftp.linet.gr.jp/pub/KON/%{name}-%{version}.tar.gz
 Source1: ftp.linux.or.jp/pub/PJE/PJE-0.1beta/tgz/install/konfnt.tgz
@@ -121,6 +121,9 @@
 %{_datadir}/fonts/pubfont.k.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9b-26.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:27:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:27:19 -0500
Subject: rpms/krb5-auth-dialog/devel krb5-auth-dialog.spec,1.16,1.17
Message-ID: <200602071227.k17CRJAN014804@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14773

Modified Files:
	krb5-auth-dialog.spec 
Log Message:
bump for new gcc/glibc


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- krb5-auth-dialog.spec	31 Jan 2006 06:54:33 -0000	1.16
+++ krb5-auth-dialog.spec	7 Feb 2006 12:27:16 -0000	1.17
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.6
-Release: 1
+Release: 1.1
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.6-1
 - Update to 0.6, adding an autostart file
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:27:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:27:28 -0500
Subject: rpms/krbafs/devel krbafs.spec,1.19,1.20
Message-ID: <200602071227.k17CRS8N014929@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krbafs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14901

Modified Files:
	krbafs.spec 
Log Message:
bump for new gcc/glibc


Index: krbafs.spec
===================================================================
RCS file: /cvs/dist/rpms/krbafs/devel/krbafs.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- krbafs.spec	9 Dec 2005 22:41:14 -0000	1.19
+++ krbafs.spec	7 Feb 2006 12:27:26 -0000	1.20
@@ -1,6 +1,6 @@
 Name: krbafs
 Version: 1.2.2
-Release: 9.1
+Release: 9.2
 Source: ftp://ftp.pdc.kth.se/pub/krb/src/krb4-%{version}.tar.gz
 Source1: krbafs.versions
 Patch0: krb4-1.2.2-ioctl.patch
@@ -40,6 +40,9 @@
 building applications which use the krbafs library.
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:27:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:27:39 -0500
Subject: rpms/ksh/devel ksh.spec,1.16,1.17
Message-ID: <200602071227.k17CRd2m015062@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ksh.spec 
Log Message:
bump for new gcc/glibc


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ksh.spec	2 Feb 2006 11:25:01 -0000	1.16
+++ ksh.spec	7 Feb 2006 12:27:37 -0000	1.17
@@ -7,7 +7,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20050202
-Release:      4
+Release:      4.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
@@ -92,6 +92,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 20050202-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Karsten Hopp <karsten at redhat.de> 20050202-4
 - fix uname -i output
 - fix loop (*-path.patch)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:27:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:27:50 -0500
Subject: rpms/kudzu/devel kudzu.spec,1.115,1.116
Message-ID: <200602071227.k17CRorR015198@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15167

Modified Files:
	kudzu.spec 
Log Message:
bump for new gcc/glibc


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- kudzu.spec	30 Jan 2006 21:16:36 -0000	1.115
+++ kudzu.spec	7 Feb 2006 12:27:47 -0000	1.116
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.24
-Release: 1
+Release: 1.1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.24-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Bill Nottingham <notting at redhat.com> - 1.2.24-1
 - fix xenblk/i2o sysfs probing
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:01 -0500
Subject: rpms/lcms/devel lcms.spec,1.2,1.3
Message-ID: <200602071228.k17CS17o015330@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lcms/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15299

Modified Files:
	lcms.spec 
Log Message:
bump for new gcc/glibc


Index: lcms.spec
===================================================================
RCS file: /cvs/dist/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lcms.spec	9 Jan 2006 10:46:35 -0000	1.2
+++ lcms.spec	7 Feb 2006 12:27:58 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           lcms
 Version:        1.15
-Release:        1
+Release:        1.1
 Summary:        Color Management System
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@
 %ghost %{python_sitearch}/lcms.py?
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Alexander Larsson <alexl at redhat.com> - 1.15-1
 - Move from extras to core, update to 1.15
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:12 -0500
Subject: rpms/less/devel less.spec,1.27,1.28
Message-ID: <200602071228.k17CSCxr015461@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/less/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15431

Modified Files:
	less.spec 
Log Message:
bump for new gcc/glibc


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- less.spec	16 Jan 2006 14:21:41 -0000	1.27
+++ less.spec	7 Feb 2006 12:28:10 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 394
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -54,6 +54,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 394-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Jindrich Novy <jnovy at redhat.com> 394-2
 - apply better fix for #120916 from Avi Kivity (#177819)
   to avoid flickering when '>' is pressed multiple times



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:23 -0500
Subject: rpms/lha/devel lha.spec,1.15,1.16
Message-ID: <200602071228.k17CSNSi015585@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lha/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15556

Modified Files:
	lha.spec 
Log Message:
bump for new gcc/glibc


Index: lha.spec
===================================================================
RCS file: /cvs/dist/rpms/lha/devel/lha.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lha.spec	9 Dec 2005 22:41:17 -0000	1.15
+++ lha.spec	7 Feb 2006 12:28:20 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: An archiving and compression utility for LHarc format archives.
 Name: lha
 Version: 1.14i
-Release: 19.1
+Release: 19.2
 License: freeware
 Group: Applications/Archiving
 Source: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/lha-114i.tar.gz
@@ -49,6 +49,9 @@
 %{_bindir}/lha
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.14i-19.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:33 -0500
Subject: rpms/libaio/devel libaio.spec,1.18,1.19
Message-ID: <200602071228.k17CSXDE015724@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libaio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15693

Modified Files:
	libaio.spec 
Log Message:
bump for new gcc/glibc


Index: libaio.spec
===================================================================
RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libaio.spec	4 Jan 2006 16:14:14 -0000	1.18
+++ libaio.spec	7 Feb 2006 12:28:30 -0000	1.19
@@ -1,6 +1,6 @@
 Name: libaio
 Version: 0.3.106
-Release: 2
+Release: 2.1
 Summary: Linux-native asynchronous I/O access library
 License: LGPL
 Group:  System Environment/Libraries
@@ -70,6 +70,9 @@
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.106-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 04 2006 Jeff Moyer <jmoyer at redhat.com> - 0.3.106-2
 - Update to the latest sources, which contain the following change:
   Add a .proc directive for the ia64_aio_raw_syscall macro.  This sounds a lot



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:43 -0500
Subject: rpms/libao/devel libao.spec,1.17,1.18
Message-ID: <200602071228.k17CShhW015850@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15819

Modified Files:
	libao.spec 
Log Message:
bump for new gcc/glibc


Index: libao.spec
===================================================================
RCS file: /cvs/dist/rpms/libao/devel/libao.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libao.spec	10 Dec 2005 09:37:42 -0000	1.17
+++ libao.spec	7 Feb 2006 12:28:41 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Cross Platform Audio Output Library.
 Name: libao
 Version: 0.8.6
-Release: 1.1
+Release: 1.2
 Group: System Environment/Libraries
 License: GPL
 URL: http://www.xiph.org/
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:28:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:28:52 -0500
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.11,1.12
Message-ID: <200602071228.k17CSqnl015969@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15942

Modified Files:
	libart_lgpl.spec 
Log Message:
bump for new gcc/glibc


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libart_lgpl.spec	9 Dec 2005 22:41:30 -0000	1.11
+++ libart_lgpl.spec	7 Feb 2006 12:28:50 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 2.1
+Release: 2.2
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -61,6 +61,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:29:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:29:03 -0500
Subject: rpms/libavc1394/devel libavc1394.spec,1.17,1.18
Message-ID: <200602071229.k17CT35o016100@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libavc1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16068

Modified Files:
	libavc1394.spec 
Log Message:
bump for new gcc/glibc


Index: libavc1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libavc1394/devel/libavc1394.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libavc1394.spec	22 Dec 2005 21:00:33 -0000	1.17
+++ libavc1394.spec	7 Feb 2006 12:29:00 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Audio/Video Control library for IEEE-1394 devices
 Name: libavc1394
 Version: 0.5.1
-Release: 2
+Release: 2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Warren Togami <wtogami at redhat.com> 0.5.1-2
 - remove .a and .la (#172641)
 - GPL -> LGPL (#165908)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:29:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:29:12 -0500
Subject: rpms/libbonobo/devel libbonobo.spec,1.32,1.33
Message-ID: <200602071229.k17CTC2V016188@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16175

Modified Files:
	libbonobo.spec 
Log Message:
bump for new gcc/glibc


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libbonobo.spec	26 Jan 2006 20:37:20 -0000	1.32
+++ libbonobo.spec	7 Feb 2006 12:29:10 -0000	1.33
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 8
+Release: 8.1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -113,6 +113,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-8.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 2.13.1-8
 - one more iteration of the shlib patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:29:23 -0500
Subject: rpms/libbonoboui/devel libbonoboui.spec,1.35,1.36
Message-ID: <200602071229.k17CTN0G022355@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonoboui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19166

Modified Files:
	libbonoboui.spec 
Log Message:
bump for new gcc/glibc


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libbonoboui.spec	19 Jan 2006 14:09:44 -0000	1.35
+++ libbonoboui.spec	7 Feb 2006 12:29:19 -0000	1.36
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.13.1
-Release: 4
+Release: 4.1
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: ta.po
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 2.13.1-4
 - change sed -ie to sed -i -e
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:29:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:29:34 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.20,1.21
Message-ID: <200602071229.k17CTYex003698@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv668

Modified Files:
	libbtctl.spec 
Log Message:
bump for new gcc/glibc


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libbtctl.spec	9 Dec 2005 22:41:30 -0000	1.20
+++ libbtctl.spec	7 Feb 2006 12:29:31 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.5.0
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:29:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:29:48 -0500
Subject: rpms/libcap/devel libcap.spec,1.18,1.19
Message-ID: <200602071229.k17CTmGO019321@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16106

Modified Files:
	libcap.spec 
Log Message:
bump for new gcc/glibc


Index: libcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libcap/devel/libcap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libcap.spec	19 Dec 2005 13:03:45 -0000	1.18
+++ libcap.spec	7 Feb 2006 12:29:45 -0000	1.19
@@ -1,6 +1,6 @@
 Name: libcap
 Version: 1.10
-Release: 24
+Release: 24.1
 Summary: Library for getting and setting POSIX.1e capabilities
 Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2
 Source1: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/capfaq-0.2.txt
@@ -79,6 +79,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Karsten Hopp <karsten at redhat.de> 1.10-24
 - added development manpages
 - as there are no manpages for the executables available, added at least



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:30:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:30:32 -0500
Subject: rpms/libc-client/devel libc-client.spec,1.15,1.16
Message-ID: <200602071230.k17CUW5n006702@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libc-client/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4163

Modified Files:
	libc-client.spec 
Log Message:
bump for new gcc/glibc


Index: libc-client.spec
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libc-client.spec	31 Jan 2006 13:11:01 -0000	1.15
+++ libc-client.spec	7 Feb 2006 12:30:19 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: C-client mail access routines for IMAP and POP protocols
 Name: libc-client
 Version: 2004g
-Release: 2
+Release: 2.1
 License: University of Washington Free-Fork License
 Group: System Environment/Daemons
 URL: http://www.washington.edu/imap/
@@ -122,6 +122,9 @@
 %{_libdir}/lib%{soname}.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2004g-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 2004g-2
 - bump soname (#179017)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:31:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:31:33 -0500
Subject: rpms/libchewing/devel libchewing.spec,1.2,1.3
Message-ID: <200602071231.k17CVX3e008902@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libchewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8732

Modified Files:
	libchewing.spec 
Log Message:
bump for new gcc/glibc


Index: libchewing.spec
===================================================================
RCS file: /cvs/dist/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libchewing.spec	9 Dec 2005 22:41:31 -0000	1.2
+++ libchewing.spec	7 Feb 2006 12:31:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libchewing
 Version:	0.2.7
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
 Summary:      Intelligent phonetic input method library for Traditional Chinese
 
 Group: 		System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:32:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:32:17 -0500
Subject: rpms/libcroco/devel libcroco.spec,1.13,1.14
Message-ID: <200602071232.k17CWH0A010560@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcroco/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10368

Modified Files:
	libcroco.spec 
Log Message:
bump for new gcc/glibc


Index: libcroco.spec
===================================================================
RCS file: /cvs/dist/rpms/libcroco/devel/libcroco.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libcroco.spec	9 Dec 2005 22:41:32 -0000	1.13
+++ libcroco.spec	7 Feb 2006 12:32:11 -0000	1.14
@@ -1,7 +1,7 @@
 Name:             libcroco
 Summary:          A CSS2 parsing library 
 Version:          0.6.0
-Release: 6.1
+Release: 6.2
 License:          LGPL
 Group:            System Environment/Libraries
 Source:           %{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:32:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:32:52 -0500
Subject: rpms/libdbi/devel libdbi.spec,1.13,1.14
Message-ID: <200602071232.k17CWqRa010736@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10723

Modified Files:
	libdbi.spec 
Log Message:
bump for new gcc/glibc


Index: libdbi.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi/devel/libdbi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libdbi.spec	9 Dec 2005 22:41:32 -0000	1.13
+++ libdbi.spec	7 Feb 2006 12:32:50 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Database Independent Abstraction Layer for C
 Name: libdbi
 Version: 0.8.1
-Release: 1.1
+Release: 1.2
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi.sourceforge.net/
@@ -70,6 +70,9 @@
 %{_libdir}/libdbi.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:33:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:33:54 -0500
Subject: rpms/libdbi-drivers/devel libdbi-drivers.spec,1.5,1.6
Message-ID: <200602071233.k17CXsoM010789@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10778

Modified Files:
	libdbi-drivers.spec 
Log Message:
bump for new gcc/glibc


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi-drivers/devel/libdbi-drivers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libdbi-drivers.spec	9 Dec 2005 22:41:32 -0000	1.5
+++ libdbi-drivers.spec	7 Feb 2006 12:33:38 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.1a
-Release: 1.1
+Release: 1.2
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi-drivers.sourceforge.net/
@@ -89,6 +89,9 @@
 %{_libdir}/dbd/libdbdpgsql.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1a-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:34:24 -0500
Subject: rpms/libdmx/devel libdmx.spec,1.8,1.9
Message-ID: <200602071234.k17CYON5010860@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10848

Modified Files:
	libdmx.spec 
Log Message:
bump for new gcc/glibc


Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdmx.spec	23 Jan 2006 22:36:38 -0000	1.8
+++ libdmx.spec	7 Feb 2006 12:34:12 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
 - Updated libdmx to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:34:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:34:45 -0500
Subject: rpms/libdrm/devel libdrm.spec,1.8,1.9
Message-ID: <200602071234.k17CYjNQ010918@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10903

Modified Files:
	libdrm.spec 
Log Message:
bump for new gcc/glibc


Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libdrm.spec	11 Jan 2006 18:52:41 -0000	1.8
+++ libdrm.spec	7 Feb 2006 12:34:42 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* 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
 - Replaced the temporary tongue-in-cheek humourous package summary and
   description with the proper package descriptions, as many people didn't get



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:35:17 -0500
Subject: rpms/libdv/devel libdv.spec,1.12,1.13
Message-ID: <200602071235.k17CZHU2010974@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10960

Modified Files:
	libdv.spec 
Log Message:
bump for new gcc/glibc


Index: libdv.spec
===================================================================
RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libdv.spec	9 Dec 2005 22:41:32 -0000	1.12
+++ libdv.spec	7 Feb 2006 12:35:15 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: 	Software decoder for DV format video.
 Name: 		libdv
 Version: 	0.103
-Release: 4.1
+Release: 4.2
 Epoch:		0
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.103-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:35:39 -0500
Subject: rpms/libevent/devel libevent.spec,1.2,1.3
Message-ID: <200602071235.k17CZdnn011028@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libevent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11015

Modified Files:
	libevent.spec 
Log Message:
bump for new gcc/glibc


Index: libevent.spec
===================================================================
RCS file: /cvs/dist/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libevent.spec	24 Jan 2006 04:26:56 -0000	1.2
+++ libevent.spec	7 Feb 2006 12:35:37 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libevent
 Version:        1.1a
-Release:        3
+Release:        3.1
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1a-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Warren Togami <wtogami at redhat.com> - 1.1a-3
 - rebuild (#177697)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:36:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:36:12 -0500
Subject: rpms/libexif/devel libexif.spec,1.15,1.16
Message-ID: <200602071236.k17CaCNR011082@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libexif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11070

Modified Files:
	libexif.spec 
Log Message:
bump for new gcc/glibc


Index: libexif.spec
===================================================================
RCS file: /cvs/dist/rpms/libexif/devel/libexif.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libexif.spec	9 Dec 2005 22:41:32 -0000	1.15
+++ libexif.spec	7 Feb 2006 12:36:09 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
 Version: 0.6.12
-Release: 3.1
+Release: 3.2
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libexif.sourceforge.net/
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/libexif.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.12-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:36:28 -0500
Subject: rpms/libfontenc/devel libfontenc.spec,1.10,1.11
Message-ID: <200602071236.k17CaSXT011139@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11126

Modified Files:
	libfontenc.spec 
Log Message:
bump for new gcc/glibc


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libfontenc.spec	23 Jan 2006 22:36:56 -0000	1.10
+++ libfontenc.spec	7 Feb 2006 12:36:26 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* 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
 - Updated libfontenc to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:36:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:36:44 -0500
Subject: rpms/libFS/devel libFS.spec,1.20,1.21
Message-ID: <200602071236.k17CaifI011192@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11181

Modified Files:
	libFS.spec 
Log Message:
bump for new gcc/glibc


Index: libFS.spec
===================================================================
RCS file: /cvs/dist/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libFS.spec	23 Jan 2006 20:05:53 -0000	1.20
+++ libFS.spec	7 Feb 2006 12:36:41 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:36:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:36:52 -0500
Subject: rpms/libgail-gnome/devel libgail-gnome.spec,1.16,1.17
Message-ID: <200602071236.k17Caqr4011250@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libgail-gnome.spec 
Log Message:
bump for new gcc/glibc


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libgail-gnome.spec	31 Jan 2006 04:58:25 -0000	1.16
+++ libgail-gnome.spec	7 Feb 2006 12:36:50 -0000	1.17
@@ -7,7 +7,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
 Version: 1.1.3
-Release: 1
+Release: 1.1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 
 - Update to 1.1.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:01 -0500
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.20,1.21
Message-ID: <200602071237.k17Cb1Ak011304@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgconf-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11291

Modified Files:
	libgconf-java.spec 
Log Message:
bump for new gcc/glibc


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libgconf-java.spec	22 Dec 2005 07:19:23 -0000	1.20
+++ libgconf-java.spec	7 Feb 2006 12:36:58 -0000	1.21
@@ -12,7 +12,7 @@
 
 %define	name_base	libgconf-java
 %define	version		2.12.1
-%define release 	2
+%define release 	2.1
 
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
@@ -106,6 +106,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 2.12.1-2
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:10 -0500
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.9,1.10
Message-ID: <200602071237.k17CbAPj011360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgcrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11347

Modified Files:
	libgcrypt.spec 
Log Message:
bump for new gcc/glibc


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgcrypt.spec	9 Dec 2005 22:41:33 -0000	1.9
+++ libgcrypt.spec	7 Feb 2006 12:37:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.2.2
-Release: 1.1
+Release: 1.2
 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
@@ -77,6 +77,9 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:22 -0500
Subject: rpms/libgdiplus/devel libgdiplus.spec,1.10,1.11
Message-ID: <200602071237.k17CbMN3011414@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgdiplus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11402

Modified Files:
	libgdiplus.spec 
Log Message:
bump for new gcc/glibc


Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgdiplus.spec	31 Jan 2006 21:25:46 -0000	1.10
+++ libgdiplus.spec	7 Feb 2006 12:37:19 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libgdiplus
 Version:        1.1.13.2
-Release:        1
+Release:        1.1
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.13.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-1
 - Update to 1.1.13.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:35 -0500
Subject: rpms/libghttp/devel libghttp.spec,1.14,1.15
Message-ID: <200602071237.k17CbZ1k011470@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libghttp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11457

Modified Files:
	libghttp.spec 
Log Message:
bump for new gcc/glibc


Index: libghttp.spec
===================================================================
RCS file: /cvs/dist/rpms/libghttp/devel/libghttp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libghttp.spec	9 Dec 2005 22:41:33 -0000	1.14
+++ libghttp.spec	7 Feb 2006 12:37:32 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: GNOME http client library.
 Name: libghttp
 Version: 1.0.9
-Release: 11.1
+Release: 11.2
 License: LGPL
 Epoch: 1
 Group: System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/ghttpConf.sh
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.9-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:43 -0500
Subject: rpms/libglade/devel libglade.spec,1.20,1.21
Message-ID: <200602071237.k17Cbh7o011524@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11512

Modified Files:
	libglade.spec 
Log Message:
bump for new gcc/glibc


Index: libglade.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade/devel/libglade.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libglade.spec	10 Dec 2005 09:37:40 -0000	1.20
+++ libglade.spec	7 Feb 2006 12:37:41 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The libglade library for loading user interfaces.
 Name:		libglade
 Version: 	0.17
-Release: 16.1
+Release: 16.2
 Epoch:		1
 License:	LGPL
 Group: System Environment/Libraries
@@ -89,6 +89,9 @@
 %doc %{_datadir}/gnome/html/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-16.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:51 -0500
Subject: rpms/libglade2/devel libglade2.spec,1.19,1.20
Message-ID: <200602071237.k17CbpPT011582@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11569

Modified Files:
	libglade2.spec 
Log Message:
bump for new gcc/glibc


Index: libglade2.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libglade2.spec	9 Dec 2005 22:41:34 -0000	1.19
+++ libglade2.spec	7 Feb 2006 12:37:49 -0000	1.20
@@ -5,7 +5,7 @@
 Summary: The libglade library for loading user interfaces.
 Name: libglade2
 Version: 2.5.1
-Release: 3.1
+Release: 3.2
 License: LGPL
 Group: System Environment/Libraries
 Source: libglade-%{version}.tar.bz2
@@ -85,6 +85,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:37:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:37:59 -0500
Subject: rpms/libglade-java/devel libglade-java.spec,1.27,1.28
Message-ID: <200602071237.k17CbxMD011637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11624

Modified Files:
	libglade-java.spec 
Log Message:
bump for new gcc/glibc


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libglade-java.spec	31 Jan 2006 15:08:37 -0000	1.27
+++ libglade-java.spec	7 Feb 2006 12:37:57 -0000	1.28
@@ -12,7 +12,7 @@
 
 %define	name_base	libglade-java
 %define	version		2.12.2
-%define release 	1
+%define release 	1.1
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
@@ -113,6 +113,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Adam jocksch  <ajocksch at redhat.com> - 2.12.2-1
 - Updated tarball, deps.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:07 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.47,1.48
Message-ID: <200602071238.k17Cc7Mn011692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11679

Modified Files:
	libgnome.spec 
Log Message:
bump for new gcc/glibc


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libgnome.spec	5 Feb 2006 07:27:01 -0000	1.47
+++ libgnome.spec	7 Feb 2006 12:38:05 -0000	1.48
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.13.7
-Release: 4
+Release: 4.1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -157,6 +157,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.7-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-4
 - Update requires
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:15 -0500
Subject: rpms/libgnomecanvas/devel libgnomecanvas.spec,1.25,1.26
Message-ID: <200602071238.k17CcFVI011747@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11734

Modified Files:
	libgnomecanvas.spec 
Log Message:
bump for new gcc/glibc


Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libgnomecanvas.spec	3 Jan 2006 17:04:36 -0000	1.25
+++ libgnomecanvas.spec	7 Feb 2006 12:38:13 -0000	1.26
@@ -8,7 +8,7 @@
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.13.0
-Release: 1
+Release: 1.1
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -93,6 +93,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 03 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.0-1
 - Update to 2.13.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:23 -0500
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.34,1.35
Message-ID: <200602071238.k17CcNt3011803@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11789

Modified Files:
	libgnomecups.spec 
Log Message:
bump for new gcc/glibc


Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgnomecups.spec	10 Dec 2005 09:37:37 -0000	1.34
+++ libgnomecups.spec	7 Feb 2006 12:38:21 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release: 3.1
+Release: 3.2
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -67,6 +67,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:31 -0500
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.27,1.28
Message-ID: <200602071238.k17CcVul011859@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11844

Modified Files:
	libgnome-java.spec 
Log Message:
bump for new gcc/glibc


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libgnome-java.spec	22 Dec 2005 07:20:49 -0000	1.27
+++ libgnome-java.spec	7 Feb 2006 12:38:29 -0000	1.28
@@ -12,7 +12,7 @@
 
 %define	name_base	libgnome-java
 %define	version		2.12.1
-%define release 	3
+%define release 	3.1
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
@@ -108,6 +108,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 2.12.1-2
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:41 -0500
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.31,1.32
Message-ID: <200602071238.k17Ccfvo011913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11900

Modified Files:
	libgnomeprint22.spec 
Log Message:
bump for new gcc/glibc


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libgnomeprint22.spec	21 Dec 2005 16:30:10 -0000	1.31
+++ libgnomeprint22.spec	7 Feb 2006 12:38:38 -0000	1.32
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	4
+Release:	4.1
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -131,6 +131,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Kristian H??gsberg <krh at redhat.com> 2.12.1-4
 - Spec file clean-ups from from Matthias Saou (#172923):
   - Explicitly disable rpath.



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:49 -0500
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.25,1.26
Message-ID: <200602071238.k17CcnOG011969@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11956

Modified Files:
	libgnomeprintui22.spec 
Log Message:
bump for new gcc/glibc


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libgnomeprintui22.spec	9 Dec 2005 22:41:35 -0000	1.25
+++ libgnomeprintui22.spec	7 Feb 2006 12:38:47 -0000	1.26
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 1.1
+Release: 1.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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:38:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:38:58 -0500
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.34,1.35
Message-ID: <200602071238.k17CcwdD012024@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12011

Modified Files:
	libgnomeui.spec 
Log Message:
bump for new gcc/glibc


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libgnomeui.spec	27 Jan 2006 03:35:16 -0000	1.34
+++ libgnomeui.spec	7 Feb 2006 12:38:55 -0000	1.35
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.13.3
-Release: 1
+Release: 1.1
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -160,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 2.13.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:06 -0500
Subject: rpms/libgpg-error/devel libgpg-error.spec,1.7,1.8
Message-ID: <200602071239.k17Cd6t7012079@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpg-error/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12066

Modified Files:
	libgpg-error.spec 
Log Message:
bump for new gcc/glibc


Index: libgpg-error.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpg-error/devel/libgpg-error.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgpg-error.spec	9 Dec 2005 22:41:36 -0000	1.7
+++ libgpg-error.spec	7 Feb 2006 12:39:04 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: libgpg-error
 Name: libgpg-error
 Version: 1.1
-Release: 1.1
+Release: 1.2
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig
@@ -65,6 +65,9 @@
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:15 -0500
Subject: rpms/libgpod/devel libgpod.spec,1.1,1.2
Message-ID: <200602071239.k17CdFoB012134@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12121

Modified Files:
	libgpod.spec 
Log Message:
bump for new gcc/glibc


Index: libgpod.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgpod.spec	4 Jan 2006 19:08:33 -0000	1.1
+++ libgpod.spec	7 Feb 2006 12:39:13 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.3.0
-Release: 2 
+Release: 2.1 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 04 2006 John (J5) Palmieri <johnp at redhat.com> 0.3.0-2
 - Modified Matthias Saou's SPEC file found on freshrpms.net
 - Added to Fedora Core



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:25 -0500
Subject: rpms/libgsf/devel libgsf.spec,1.21,1.22
Message-ID: <200602071239.k17CdPcV012189@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12176

Modified Files:
	libgsf.spec 
Log Message:
bump for new gcc/glibc


Index: libgsf.spec
===================================================================
RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgsf.spec	9 Dec 2005 22:41:36 -0000	1.21
+++ libgsf.spec	7 Feb 2006 12:39:23 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.13.3
-Release: 2.1
+Release: 2.2
 Group: System Environment/Libraries
 License: LGPL
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.13.3-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:37 -0500
Subject: rpms/libgssapi/devel libgssapi.spec,1.2,1.3
Message-ID: <200602071239.k17CdbKn012243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12231

Modified Files:
	libgssapi.spec 
Log Message:
bump for new gcc/glibc


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgssapi.spec	6 Jan 2006 22:28:36 -0000	1.2
+++ libgssapi.spec	7 Feb 2006 12:39:35 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.7
-Release: 1
+Release: 1.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
@@ -70,5 +70,8 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 6 2006 Steve Dickson <steved at redhat.com>  0.7-1
 - Initial commit



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:45 -0500
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.40,1.41
Message-ID: <200602071239.k17CdjTQ012299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12286

Modified Files:
	libgtk-java.spec 
Log Message:
bump for new gcc/glibc


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libgtk-java.spec	31 Jan 2006 15:07:41 -0000	1.40
+++ libgtk-java.spec	7 Feb 2006 12:39:43 -0000	1.41
@@ -13,7 +13,7 @@
 
 %define	name_base 	libgtk-java
 %define	version		2.8.3
-%define release 	1
+%define release 	1.1
 
 
 Summary:	Java bindings for GTK+
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Adam Jocksch <ajocksch at redhat.com> - 2.8.3-1
 - updated tarball to libgtk-java-2.8.3.tar.gz.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:39:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:39:55 -0500
Subject: rpms/libgtop2/devel libgtop2.spec,1.28,1.29
Message-ID: <200602071239.k17Cdtbp012354@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12341

Modified Files:
	libgtop2.spec 
Log Message:
bump for new gcc/glibc


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgtop2.spec	27 Jan 2006 03:29:10 -0000	1.28
+++ libgtop2.spec	7 Feb 2006 12:39:53 -0000	1.29
@@ -7,7 +7,7 @@
 Name:		libgtop2
 Summary:        libgtop library (version 2)
 Version: 	2.13.3
-Release: 	1
+Release: 	1.1
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 24 2006 Matthias Clasen <mclasen at redhat.com>
 - Update to 2.13.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:40:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:40:04 -0500
Subject: rpms/libibverbs/devel libibverbs.spec,1.6,1.7
Message-ID: <200602071240.k17Ce410012414@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libibverbs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12400

Modified Files:
	libibverbs.spec 
Log Message:
bump for new gcc/glibc


Index: libibverbs.spec
===================================================================
RCS file: /cvs/dist/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libibverbs.spec	16 Dec 2005 23:21:18 -0000	1.6
+++ libibverbs.spec	7 Feb 2006 12:40:02 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name: libibverbs
 Version: 1.0.rc4
-Release: 0.%{ver}%{?dist}.1
+Release: 0.%{ver}%{?dist}.2
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:40:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:40:19 -0500
Subject: rpms/libICE/devel libICE.spec,1.9,1.10
Message-ID: <200602071240.k17CeJ4F012471@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12456

Modified Files:
	libICE.spec 
Log Message:
bump for new gcc/glibc


Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libICE.spec	23 Jan 2006 22:21:34 -0000	1.9
+++ libICE.spec	7 Feb 2006 12:40:16 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:40:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:40:29 -0500
Subject: rpms/libIDL/devel libIDL.spec,1.16,1.17
Message-ID: <200602071240.k17CeTD8012531@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12517

Modified Files:
	libIDL.spec 
Log Message:
bump for new gcc/glibc


Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libIDL.spec	9 Dec 2005 22:41:19 -0000	1.16
+++ libIDL.spec	7 Feb 2006 12:40:26 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 2.1
+Release: 2.2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
 License: LGPL
@@ -73,6 +73,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:40:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:40:44 -0500
Subject: rpms/libiec61883/devel libiec61883.spec,1.6,1.7
Message-ID: <200602071240.k17Cei7P012619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libiec61883/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12605

Modified Files:
	libiec61883.spec 
Log Message:
bump for new gcc/glibc


Index: libiec61883.spec
===================================================================
RCS file: /cvs/dist/rpms/libiec61883/devel/libiec61883.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libiec61883.spec	13 Jan 2006 16:28:05 -0000	1.6
+++ libiec61883.spec	7 Feb 2006 12:40:41 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Streaming library for IEEE1394
 Name: libiec61883
 Version: 1.0.0
-Release: 10.fc5
+Release: 10.fc5.1
 License: LGPL
 Group: Libraries
 Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 30 2005 Jarod Wilson <jarod at wilsonet.com> 1.0.0-10
 - Add missing autoconf, automake and libtool
   BuildRequires



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:40:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:40:52 -0500
Subject: rpms/libieee1284/devel libieee1284.spec,1.8,1.9
Message-ID: <200602071240.k17Ceq1d012675@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libieee1284/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12662

Modified Files:
	libieee1284.spec 
Log Message:
bump for new gcc/glibc


Index: libieee1284.spec
===================================================================
RCS file: /cvs/dist/rpms/libieee1284/devel/libieee1284.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libieee1284.spec	9 Dec 2005 22:41:37 -0000	1.8
+++ libieee1284.spec	7 Feb 2006 12:40:50 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A library for interfacing IEEE 1284-compatible devices.
 Name: libieee1284
 Version: 0.2.9
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
@@ -72,6 +72,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.9-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:01 -0500
Subject: rpms/libjpeg/devel libjpeg.spec,1.15,1.16
Message-ID: <200602071241.k17Cf1g0012732@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12718

Modified Files:
	libjpeg.spec 
Log Message:
bump for new gcc/glibc


Index: libjpeg.spec
===================================================================
RCS file: /cvs/dist/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libjpeg.spec	9 Dec 2005 22:41:37 -0000	1.15
+++ libjpeg.spec	7 Feb 2006 12:40:58 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: A library for manipulating JPEG image format files.
 Name: libjpeg
 Version: 6b
-Release: 36.1
+Release: 36.2
 License: distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
@@ -87,6 +87,9 @@
 /usr/include/*.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:10 -0500
Subject: rpms/liblbxutil/devel liblbxutil.spec,1.8,1.9
Message-ID: <200602071241.k17CfA4P012787@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liblbxutil/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12774

Modified Files:
	liblbxutil.spec 
Log Message:
bump for new gcc/glibc


Index: liblbxutil.spec
===================================================================
RCS file: /cvs/dist/rpms/liblbxutil/devel/liblbxutil.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liblbxutil.spec	23 Jan 2006 22:37:12 -0000	1.8
+++ liblbxutil.spec	7 Feb 2006 12:41:08 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 liblbxutil runtime library
 Name: liblbxutil
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -72,6 +72,9 @@
 %{_libdir}/pkgconfig/lbxutil.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:19 -0500
Subject: rpms/libmng/devel libmng.spec,1.23,1.24
Message-ID: <200602071241.k17CfJoC012842@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12829

Modified Files:
	libmng.spec 
Log Message:
bump for new gcc/glibc


Index: libmng.spec
===================================================================
RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libmng.spec	9 Dec 2005 22:41:37 -0000	1.23
+++ libmng.spec	7 Feb 2006 12:41:17 -0000	1.24
@@ -1,6 +1,6 @@
 Name: libmng
 Version: 1.0.9
-Release: 3.1
+Release: 3.2
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 License: BSD-like
@@ -77,6 +77,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:28 -0500
Subject: rpms/libmthca/devel libmthca.spec,1.4,1.5
Message-ID: <200602071241.k17CfSmH012901@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmthca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12885

Modified Files:
	libmthca.spec 
Log Message:
bump for new gcc/glibc


Index: libmthca.spec
===================================================================
RCS file: /cvs/dist/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmthca.spec	9 Dec 2005 22:41:38 -0000	1.4
+++ libmthca.spec	7 Feb 2006 12:41:26 -0000	1.5
@@ -8,7 +8,7 @@
 
 Name: libmthca
 Version: 1.0.rc4
-Release: 0.%{ver}%{?dist}.1
+Release: 0.%{ver}%{?dist}.2
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
@@ -64,6 +64,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:37 -0500
Subject: rpms/libmusicbrainz/devel libmusicbrainz.spec,1.11,1.12
Message-ID: <200602071241.k17Cfbmt012961@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmusicbrainz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12943

Modified Files:
	libmusicbrainz.spec 
Log Message:
bump for new gcc/glibc


Index: libmusicbrainz.spec
===================================================================
RCS file: /cvs/dist/rpms/libmusicbrainz/devel/libmusicbrainz.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libmusicbrainz.spec	9 Dec 2005 22:41:38 -0000	1.11
+++ libmusicbrainz.spec	7 Feb 2006 12:41:35 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A library for accessing MusicBrainz servers
 Name: libmusicbrainz
 Version: 2.1.1
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org
@@ -61,6 +61,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:49 -0500
Subject: rpms/libnl/devel libnl.spec,1.9,1.10
Message-ID: <200602071241.k17CfnP5013017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13004

Modified Files:
	libnl.spec 
Log Message:
bump for new gcc/glibc


Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libnl.spec	16 Jan 2006 17:02:38 -0000	1.9
+++ libnl.spec	7 Feb 2006 12:41:47 -0000	1.10
@@ -5,7 +5,7 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.7.%{preversion}
+Release: 0.7.%{preversion}.1
 URL: http://people.suug.ch/~tgr/libnl/
 Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz
 Source1: %{name}-1.pc
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.7.pre5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Christopher Aillon <caillon at redhat.com> 1.0-0.7.pre5
 - Add patch to not chown files to root.root during make install; it
   happens normally.



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:41:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:41:59 -0500
Subject: rpms/libnotify/devel libnotify.spec,1.5,1.6
Message-ID: <200602071241.k17Cfx7w013072@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13059

Modified Files:
	libnotify.spec 
Log Message:
bump for new gcc/glibc


Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnotify.spec	12 Jan 2006 16:32:47 -0000	1.5
+++ libnotify.spec	7 Feb 2006 12:41:56 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.3.0
-Release: 4
+Release: 4.1
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 12 2006 Christopher Aillon <caillon at redhat.com> - 0.3.0-4
 - Require a desktop-notification-daemon to be present.  Currently,
   this is notify-daemon, but libnotify doesn't specifically require



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:07 -0500
Subject: rpms/libofx/devel libofx.spec,1.12,1.13
Message-ID: <200602071242.k17Cg78S013129@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13114

Modified Files:
	libofx.spec 
Log Message:
bump for new gcc/glibc


Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libofx.spec	6 Jan 2006 16:53:31 -0000	1.12
+++ libofx.spec	7 Feb 2006 12:42:05 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.0
-Release: 2
+Release: 2.1
 Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 Patch: libofx-0.7.0-gcc4.patch
 Requires: openjade >= 1.3.1
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan  6 2006 Nalin Dahyabhai <nalin at redhat.com> 0.8.0-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:20 -0500
Subject: rpms/libogg/devel libogg.spec,1.18,1.19
Message-ID: <200602071242.k17CgKRG013195@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libogg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13181

Modified Files:
	libogg.spec 
Log Message:
bump for new gcc/glibc


Index: libogg.spec
===================================================================
RCS file: /cvs/dist/rpms/libogg/devel/libogg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libogg.spec	18 Jan 2006 16:10:13 -0000	1.18
+++ libogg.spec	7 Feb 2006 12:42:18 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The Ogg bitstream file format library.
 Name:		libogg
 Version:	1.1.3
-Release:	1 
+Release:	1.1 
 Epoch:		2
 Group: System Environment/Libraries
 License:      BSD
@@ -70,6 +70,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> 2:1.1.3-1
 - Update to 1.1.3
 - doc/ogg changed to doc/libogg



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:29 -0500
Subject: rpms/liboil/devel liboil.spec,1.3,1.4
Message-ID: <200602071242.k17CgTsw013249@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liboil/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13236

Modified Files:
	liboil.spec 
Log Message:
bump for new gcc/glibc


Index: liboil.spec
===================================================================
RCS file: /cvs/dist/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- liboil.spec	23 Dec 2005 05:22:11 -0000	1.3
+++ liboil.spec	7 Feb 2006 12:42:27 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.6
-Release: 3.fc5
+Release: 3.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-3.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Warren Togami <wtogami at redhat.com> 0.3.6-3
 - s390 build patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:40 -0500
Subject: rpms/liboldX/devel liboldX.spec,1.9,1.10
Message-ID: <200602071242.k17Cgeij013305@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liboldX/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13291

Modified Files:
	liboldX.spec 
Log Message:
bump for new gcc/glibc


Index: liboldX.spec
===================================================================
RCS file: /cvs/dist/rpms/liboldX/devel/liboldX.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liboldX.spec	23 Jan 2006 22:37:26 -0000	1.9
+++ liboldX.spec	7 Feb 2006 12:42:37 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 liboldX runtime library
 Name: liboldX
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/oldx.pc
 
 %changelog
+* 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
 - Updated liboldX to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:51 -0500
Subject: rpms/libpfm/devel libpfm.spec,1.5,1.6
Message-ID: <200602071242.k17CgpcM013359@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpfm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13346

Modified Files:
	libpfm.spec 
Log Message:
bump for new gcc/glibc


Index: libpfm.spec
===================================================================
RCS file: /cvs/dist/rpms/libpfm/devel/libpfm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libpfm.spec	9 Dec 2005 22:41:39 -0000	1.5
+++ libpfm.spec	7 Feb 2006 12:42:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: a performance monitoring library for Linux/ia64
 Name: libpfm
 Version: 3.0
-Release: 4.1
+Release: 4.2
 License: MIT-style
 Group: Development/Libraries
 ExclusiveArch: ia64
@@ -90,6 +90,9 @@
 %attr(644,root,root) %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:42:59 -0500
Subject: rpms/libpng/devel libpng.spec,1.25,1.26
Message-ID: <200602071242.k17CgxON013415@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13401

Modified Files:
	libpng.spec 
Log Message:
bump for new gcc/glibc


Index: libpng.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libpng.spec	9 Dec 2005 22:41:40 -0000	1.25
+++ libpng.spec	7 Feb 2006 12:42:56 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
 Version: 1.2.8
-Release: 2.1
+Release: 2.2
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -75,6 +75,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.8-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:07 -0500
Subject: rpms/libpng10/devel libpng10.spec,1.16,1.17
Message-ID: <200602071243.k17Ch7eE013471@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpng10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13458

Modified Files:
	libpng10.spec 
Log Message:
bump for new gcc/glibc


Index: libpng10.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libpng10.spec	9 Dec 2005 22:41:40 -0000	1.16
+++ libpng10.spec	7 Feb 2006 12:43:05 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Old version of libpng, needed to run old binaries.
 Name: libpng10
 Version: 1.0.18
-Release: 3.1
+Release: 3.2
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -76,6 +76,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.18-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:16 -0500
Subject: rpms/libraw1394/devel libraw1394.spec,1.15,1.16
Message-ID: <200602071243.k17ChGUK013530@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13516

Modified Files:
	libraw1394.spec 
Log Message:
bump for new gcc/glibc


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libraw1394.spec	13 Dec 2005 22:06:28 -0000	1.15
+++ libraw1394.spec	7 Feb 2006 12:43:14 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Library providing low-level IEEE-1394 access
 Name: libraw1394
 Version: 1.2.0
-Release: 3.fc5
+Release: 3.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Warren Togami <wtogami at redhat.com> - 1.2.0-3
 - disable static and remove .la (#172642)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:26 -0500
Subject: rpms/librtas/devel librtas.spec,1.3,1.4
Message-ID: <200602071243.k17ChQhE013615@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/librtas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13602

Modified Files:
	librtas.spec 
Log Message:
bump for new gcc/glibc


Index: librtas.spec
===================================================================
RCS file: /cvs/dist/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- librtas.spec	9 Dec 2005 22:41:40 -0000	1.3
+++ librtas.spec	7 Feb 2006 12:43:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Libraries to provide access to RTAS calls and RTAS events.
 Name: librtas
 Version: 1.2.4
-Release: 1.1
+Release: 1.2
 URL: http://librtas.ozlabs.org
 License: IBM Common Public License (CPL) v1.0
 Group: System Environment/Libraries
@@ -62,6 +62,9 @@
 /usr/include/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:35 -0500
Subject: rpms/libsdp/devel libsdp.spec,1.6,1.7
Message-ID: <200602071243.k17ChZFI013673@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsdp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13659

Modified Files:
	libsdp.spec 
Log Message:
bump for new gcc/glibc


Index: libsdp.spec
===================================================================
RCS file: /cvs/dist/rpms/libsdp/devel/libsdp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsdp.spec	9 Dec 2005 22:41:41 -0000	1.6
+++ libsdp.spec	7 Feb 2006 12:43:33 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name: libsdp
 Version: 0.90
-Release: 0.%{ver}%{?dist}.1
+Release: 0.%{ver}%{?dist}.2
 Summary: A library for direct userspace use of Sockets Direct Protocol
 
 Group: System Environment/Libraries
@@ -50,6 +50,9 @@
 %doc COPYING ChangeLog NEWS README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.90-0.4265.1.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:44 -0500
Subject: rpms/libselinux/devel libselinux.spec,1.179,1.180
Message-ID: <200602071243.k17Chidf013727@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libselinux.spec 
Log Message:
bump for new gcc/glibc


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- libselinux.spec	20 Jan 2006 16:17:43 -0000	1.179
+++ libselinux.spec	7 Feb 2006 12:43:42 -0000	1.180
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.29.7
-Release: 1
+Release: 1.1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -108,6 +108,9 @@
 %{_libdir}/python2.4/site-packages/selinux.py*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 20 2006 Dan Walsh <dwalsh at redhat.com> 1.29.7-1
 - Upgrade to latest from NSA
 	* Merged install-pywrap Makefile patch from Joshua Brindle.



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:43:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:43:53 -0500
Subject: rpms/libsemanage/devel libsemanage.spec,1.70,1.71
Message-ID: <200602071243.k17ChrqG013782@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13769

Modified Files:
	libsemanage.spec 
Log Message:
bump for new gcc/glibc


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- libsemanage.spec	2 Feb 2006 17:11:07 -0000	1.70
+++ libsemanage.spec	7 Feb 2006 12:43:51 -0000	1.71
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.5.20
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.20-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 
 * Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.5.20-1
 - Upgrade to latest from NSA



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:01 -0500
Subject: rpms/libsepol/devel libsepol.spec,1.106,1.107
Message-ID: <200602071244.k17Ci1XO013841@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13827

Modified Files:
	libsepol.spec 
Log Message:
bump for new gcc/glibc


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- libsepol.spec	2 Feb 2006 17:08:27 -0000	1.106
+++ libsepol.spec	7 Feb 2006 12:43:58 -0000	1.107
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.11.12
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,6 +80,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.12-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
 - Upgrade to latest from NSA
 	* Merged assertion copying bugfix from Joshua Brindle.



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:08 -0500
Subject: rpms/libsetrans/devel libsetrans.spec,1.27,1.28
Message-ID: <200602071244.k17Ci8hp013895@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libsetrans.spec 
Log Message:
bump for new gcc/glibc


Index: libsetrans.spec
===================================================================
RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libsetrans.spec	17 Jan 2006 19:14:59 -0000	1.27
+++ libsetrans.spec	7 Feb 2006 12:44:06 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: SELinux Translation library
 Name: libsetrans
 Version: 0.1.18
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -51,6 +51,9 @@
 %{_mandir}/man8/mcs.8.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.18-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 11 2006 Dan Walsh <dwalsh at redhat.com> 0.1.18-1
 - Return original context on translation failure 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:16 -0500
Subject: rpms/libsilc/devel libsilc.spec,1.7,1.8
Message-ID: <200602071244.k17CiGDl013950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13937

Modified Files:
	libsilc.spec 
Log Message:
bump for new gcc/glibc


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsilc.spec	9 Dec 2005 22:41:42 -0000	1.7
+++ libsilc.spec	7 Feb 2006 12:44:14 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name: libsilc
 Version: 0.9.12
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
@@ -99,6 +99,9 @@
 %{_includedir}/silc/*.h
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:24 -0500
Subject: rpms/libSM/devel libSM.spec,1.9,1.10
Message-ID: <200602071244.k17CiO1Q014005@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13992

Modified Files:
	libSM.spec 
Log Message:
bump for new gcc/glibc


Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libSM.spec	23 Jan 2006 22:21:48 -0000	1.9
+++ libSM.spec	7 Feb 2006 12:44:22 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:32 -0500
Subject: rpms/libsoup/devel libsoup.spec,1.27,1.28
Message-ID: <200602071244.k17CiWUj014062@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14049

Modified Files:
	libsoup.spec 
Log Message:
bump for new gcc/glibc


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libsoup.spec	9 Dec 2005 22:41:42 -0000	1.27
+++ libsoup.spec	7 Feb 2006 12:44:30 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.7
-Release: 1.1
+Release: 1.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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:39 -0500
Subject: rpms/libtermcap/devel libtermcap.spec,1.17,1.18
Message-ID: <200602071244.k17Cid07014118@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtermcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14104

Modified Files:
	libtermcap.spec 
Log Message:
bump for new gcc/glibc


Index: libtermcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libtermcap.spec	2 Jan 2006 16:13:02 -0000	1.17
+++ libtermcap.spec	7 Feb 2006 12:44:37 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A basic system library for accessing the termcap database.
 Name: libtermcap
 Version: 2.0.8
-Release: 44
+Release: 44.1
 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2
 Url: ftp://metalab.unc.edu/pub/Linux/GCC/
 License: LGPL
@@ -125,6 +125,9 @@
 %{_infodir}/termcap.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.8-44.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 2 2006 Petr Raszyk <praszyk at redhat.com> 2.0.8-44
 - Rebuild. 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:47 -0500
Subject: rpms/libtheora/devel libtheora.spec,1.9,1.10
Message-ID: <200602071244.k17Cilh2014171@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtheora/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14159

Modified Files:
	libtheora.spec 
Log Message:
bump for new gcc/glibc


Index: libtheora.spec
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libtheora.spec	10 Dec 2005 09:37:32 -0000	1.9
+++ libtheora.spec	7 Feb 2006 12:44:45 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha5
-Release: 1.1
+Release: 1.2
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0alpha5-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:44:56 -0500
Subject: rpms/libtiff/devel libtiff.spec,1.34,1.35
Message-ID: <200602071244.k17CiuEc014227@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14214

Modified Files:
	libtiff.spec 
Log Message:
bump for new gcc/glibc


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libtiff.spec	9 Dec 2005 22:41:42 -0000	1.34
+++ libtiff.spec	7 Feb 2006 12:44:53 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.7.4
-Release: 3.1
+Release: 3.2
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:45:05 -0500
Subject: rpms/libtool/devel libtool.spec,1.37,1.38
Message-ID: <200602071245.k17Cj5VM014288@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14275

Modified Files:
	libtool.spec 
Log Message:
bump for new gcc/glibc


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- libtool.spec	6 Feb 2006 09:05:32 -0000	1.37
+++ libtool.spec	7 Feb 2006 12:45:03 -0000	1.38
@@ -4,7 +4,7 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:    2
+Release:    2.1
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.22-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Karsten Hopp <karsten at redhat.de> 1.5.22-2
 - libtool-ltdl-devel is LGPL (#168075)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:45:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:45:15 -0500
Subject: rpms/libunwind/devel libunwind.spec,1.14,1.15
Message-ID: <200602071245.k17CjFCT014344@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libunwind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14330

Modified Files:
	libunwind.spec 
Log Message:
bump for new gcc/glibc


Index: libunwind.spec
===================================================================
RCS file: /cvs/dist/rpms/libunwind/devel/libunwind.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libunwind.spec	9 Dec 2005 22:41:43 -0000	1.14
+++ libunwind.spec	7 Feb 2006 12:45:12 -0000	1.15
@@ -5,7 +5,7 @@
 Name: libunwind
 # Latest libunwind release.
 Version: 0.98.2
-Release: 3.1
+Release: 3.2
 License: BSD
 Group: Development/Debuggers
 Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/libunwind-0.98.2.tar.gz
@@ -44,6 +44,9 @@
 /usr/include/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.98.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:45:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:45:28 -0500
Subject: rpms/libusb/devel libusb.spec,1.21,1.22
Message-ID: <200602071245.k17CjSXO014398@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14385

Modified Files:
	libusb.spec 
Log Message:
bump for new gcc/glibc


Index: libusb.spec
===================================================================
RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libusb.spec	27 Jan 2006 09:25:47 -0000	1.21
+++ libusb.spec	7 Feb 2006 12:45:26 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices.
 Name: libusb
 Version: 0.1.11
-Release: 2
+Release: 2.1
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.11-format.patch
 Patch1: libusb-0.1.11-searchorder.patch
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.11-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Jindrich Novy <jnovy at redhat.com> 0.1.11-2
 - change device search order, /dev/bus/usb is tried first,
   then /proc/bus/usb, and never try /sys/bus/usb (#178994)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:45:43 -0500
Subject: rpms/libuser/devel libuser.spec,1.46,1.47
Message-ID: <200602071245.k17Cjh5J014834@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14442

Modified Files:
	libuser.spec 
Log Message:
bump for new gcc/glibc


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libuser.spec	9 Dec 2005 22:41:44 -0000	1.46
+++ libuser.spec	7 Feb 2006 12:45:40 -0000	1.47
@@ -5,7 +5,7 @@
 
 Name: libuser
 Version: 0.54.3
-Release: 1.1
+Release: 1.2
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.54.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:45:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:45:56 -0500
Subject: rpms/libvir/devel libvir.spec,1.3,1.4
Message-ID: <200602071245.k17CjuNt017110@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16786

Modified Files:
	libvir.spec 
Log Message:
bump for new gcc/glibc


Index: libvir.spec
===================================================================
RCS file: /cvs/dist/rpms/libvir/devel/libvir.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libvir.spec	29 Jan 2006 11:05:11 -0000	1.3
+++ libvir.spec	7 Feb 2006 12:45:54 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvir
 Version: 0.0.2
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Development/Libraries
 Source: libvir-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %doc python/libvirclass.txt
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 29 2006 Daniel Veillard <veillard at redhat.com> 0.0.2-1
 - upstream release of 0.0.2, use xend, save and restore added, python bindings
   fixed



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:06 -0500
Subject: rpms/libvorbis/devel libvorbis.spec,1.21,1.22
Message-ID: <200602071246.k17Ck64V018867@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvorbis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18405

Modified Files:
	libvorbis.spec 
Log Message:
bump for new gcc/glibc


Index: libvorbis.spec
===================================================================
RCS file: /cvs/dist/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libvorbis.spec	18 Jan 2006 16:11:58 -0000	1.21
+++ libvorbis.spec	7 Feb 2006 12:46:04 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.1.2
-Release: 	1
+Release: 	1.1
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -82,6 +82,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 John (J5) Palmieri <johnp at redhat.com> 1:1.1.2-1
 - Update to 1.1.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:16 -0500
Subject: rpms/libvte-java/devel libvte-java.spec,1.8,1.9
Message-ID: <200602071246.k17CkGls020620@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20174

Modified Files:
	libvte-java.spec 
Log Message:
bump for new gcc/glibc


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libvte-java.spec	25 Jan 2006 13:51:47 -0000	1.8
+++ libvte-java.spec	7 Feb 2006 12:46:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.11.11
-Release:   8
+Release:   8.1
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL
@@ -97,6 +97,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.11-8.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Igor Foox <ifoox at redhat.com> - 0.11.11-8
 - Excluding s390x.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:27 -0500
Subject: rpms/libwmf/devel libwmf.spec,1.16,1.17
Message-ID: <200602071246.k17CkR3D022478@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22033

Modified Files:
	libwmf.spec 
Log Message:
bump for new gcc/glibc


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libwmf.spec	19 Jan 2006 10:20:26 -0000	1.16
+++ libwmf.spec	7 Feb 2006 12:46:25 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 4
+Release: 4.1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -98,6 +98,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 19 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-4
 - rh#178275# match srvg gtk2 %{_host} usage for pixbuf loaders
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:37 -0500
Subject: rpms/libwnck/devel libwnck.spec,1.39,1.40
Message-ID: <200602071246.k17CkbZ6024183@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23734

Modified Files:
	libwnck.spec 
Log Message:
bump for new gcc/glibc


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libwnck.spec	30 Jan 2006 20:28:11 -0000	1.39
+++ libwnck.spec	7 Feb 2006 12:46:35 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.13.90
-Release: 1
+Release: 1.1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:47 -0500
Subject: rpms/libwpd/devel libwpd.spec,1.20,1.21
Message-ID: <200602071246.k17Ckl7E025810@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libwpd.spec 
Log Message:
bump for new gcc/glibc


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libwpd.spec	23 Dec 2005 01:12:22 -0000	1.20
+++ libwpd.spec	7 Feb 2006 12:46:44 -0000	1.21
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.4
-Release: 1.1
+Release: 1.2
 Source: %{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 URL: http://libwpd.sf.net/
@@ -66,6 +66,9 @@
 %{_includedir}/libwpd-0.8/libwpd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0.8.4-1.1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:46:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:46:56 -0500
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.16,1.17
Message-ID: <200602071246.k17Ckus9027235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwvstreams/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27222

Modified Files:
	libwvstreams.spec 
Log Message:
bump for new gcc/glibc


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libwvstreams.spec	19 Dec 2005 15:24:09 -0000	1.16
+++ libwvstreams.spec	7 Feb 2006 12:46:54 -0000	1.17
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.2.1
-Release: 1
+Release: 1.1
 Summary: WvStreams is a network programming library written in C++.
 Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz
 Patch1: libwvstreams-3.70-gcc3.patch
@@ -96,6 +96,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Harald Hoyer <harald at redhat.com> 4.2.1-1
 - version 4.2.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:06 -0500
Subject: rpms/libX11/devel libX11.spec,1.13,1.14
Message-ID: <200602071247.k17Cl638027291@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27277

Modified Files:
	libX11.spec 
Log Message:
bump for new gcc/glibc


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libX11.spec	24 Dec 2005 06:56:34 -0000	1.13
+++ libX11.spec	7 Feb 2006 12:47:04 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -239,6 +239,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Added "Requires: libXau-devel, libXdmcp-devel" to -devel subpackage (#176313)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:10 -0500
Subject: rpms/system-config-soundcard/devel .cvsignore, 1.9, 1.10 sources,
	1.11, 1.12 system-config-soundcard.spec, 1.27,
	1.28 system-config-soundcard-1.2.14-alsa-ver.patch, 1.1,
	NONE system-config-soundcard-1.2.14-desktop.patch, 1.1,
	NONE system-config-soundcard-1.2.14-dyn-keys.patch, 1.1,
	NONE system-config-soundcard-1.2.14-kudzu-log.patch, 1.1,
	NONE system-config-soundcard-1.2.14-text.patch, 1.1, NONE
Message-ID: <200602071247.k17ClAZO027342@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	.cvsignore sources system-config-soundcard.spec 
Removed Files:
	system-config-soundcard-1.2.14-alsa-ver.patch 
	system-config-soundcard-1.2.14-desktop.patch 
	system-config-soundcard-1.2.14-dyn-keys.patch 
	system-config-soundcard-1.2.14-kudzu-log.patch 
	system-config-soundcard-1.2.14-text.patch 
Log Message:
volume control, new look, music (#178124)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Oct 2005 13:37:08 -0000	1.9
+++ .cvsignore	7 Feb 2006 12:47:06 -0000	1.10
@@ -3,3 +3,4 @@
 system-config-soundcard-1.2.11.tar.bz2
 system-config-soundcard-1.2.12.tar.bz2
 system-config-soundcard-1.2.14.tar.bz2
+system-config-soundcard-1.2.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Nov 2005 12:41:23 -0000	1.11
+++ sources	7 Feb 2006 12:47:06 -0000	1.12
@@ -1 +1 @@
-94af30e4efdaa5dae972cd6ba7b73c00  system-config-soundcard-1.2.14.tar.bz2
+63b8e8c07dc93c12826f6f12c0bc871b  system-config-soundcard-1.2.16.tar.bz2


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- system-config-soundcard.spec	1 Feb 2006 08:17:07 -0000	1.27
+++ system-config-soundcard.spec	7 Feb 2006 12:47:07 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
-Version: 1.2.14
-Release: 6
+Version: 1.2.16
+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
-Patch1: system-config-soundcard-1.2.14-desktop.patch
-Patch2: system-config-soundcard-1.2.14-dyn-keys.patch
-Patch3: system-config-soundcard-1.2.14-text.patch
-Patch4: system-config-soundcard-1.2.14-kudzu-log.patch
-Patch5: system-config-soundcard-1.2.14-alsa-ver.patch
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 ExcludeArch: s390 s390x
@@ -33,11 +28,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1 -b .dyn
-%patch3 -p1 -b .text
-%patch4 -p1 -b .log
-%patch5 -p1 -b .alsa
 
 %build
 make
@@ -91,6 +81,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Wed Feb 01 2006 Martin Stransky <stransky at redhat.com> 1.2.16-1
+- volume control, new look, music (#178124)
+
 * Wed Feb 01 2006 Martin Stransky <stransky at redhat.com> 1.2.14-6
 - added alsa-lib/utils log
 


--- system-config-soundcard-1.2.14-alsa-ver.patch DELETED ---


--- system-config-soundcard-1.2.14-desktop.patch DELETED ---


--- system-config-soundcard-1.2.14-dyn-keys.patch DELETED ---


--- system-config-soundcard-1.2.14-kudzu-log.patch DELETED ---


--- system-config-soundcard-1.2.14-text.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:15 -0500
Subject: rpms/libXau/devel libXau.spec,1.8,1.9
Message-ID: <200602071247.k17ClFZZ027371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27358

Modified Files:
	libXau.spec 
Log Message:
bump for new gcc/glibc


Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXau.spec	23 Jan 2006 22:22:35 -0000	1.8
+++ libXau.spec	7 Feb 2006 12:47:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man3/XauWriteAuth.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:23 -0500
Subject: rpms/libXaw/devel libXaw.spec,1.9,1.10
Message-ID: <200602071247.k17ClNQ0027455@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27414

Modified Files:
	libXaw.spec 
Log Message:
bump for new gcc/glibc


Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXaw.spec	23 Jan 2006 22:22:52 -0000	1.9
+++ libXaw.spec	7 Feb 2006 12:47:20 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Updated libXaw to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:31 -0500
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.8,1.9
Message-ID: <200602071247.k17ClVEV027511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27497

Modified Files:
	libXcomposite.spec 
Log Message:
bump for new gcc/glibc


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXcomposite.spec	23 Jan 2006 22:23:21 -0000	1.8
+++ libXcomposite.spec	7 Feb 2006 12:47:29 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.2.2.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2.2-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 0.2.2.2-2
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:39 -0500
Subject: rpms/libXcursor/devel libXcursor.spec,1.8,1.9
Message-ID: <200602071247.k17Cldii027572@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27559

Modified Files:
	libXcursor.spec 
Log Message:
bump for new gcc/glibc


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXcursor.spec	23 Jan 2006 22:23:47 -0000	1.8
+++ libXcursor.spec	7 Feb 2006 12:47:37 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.5.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -87,6 +87,9 @@
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:47 -0500
Subject: rpms/libXdamage/devel libXdamage.spec,1.8,1.9
Message-ID: <200602071247.k17CllRe027630@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27614

Modified Files:
	libXdamage.spec 
Log Message:
bump for new gcc/glibc


Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXdamage.spec	23 Jan 2006 22:24:11 -0000	1.8
+++ libXdamage.spec	7 Feb 2006 12:47:44 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
 Version: 1.0.2.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:47:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:47:54 -0500
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.8,1.9
Message-ID: <200602071247.k17ClsCC027684@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27671

Modified Files:
	libXdmcp.spec 
Log Message:
bump for new gcc/glibc


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXdmcp.spec	23 Jan 2006 22:24:43 -0000	1.8
+++ libXdmcp.spec	7 Feb 2006 12:47:52 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:01 -0500
Subject: rpms/libXevie/devel libXevie.spec,1.8,1.9
Message-ID: <200602071248.k17Cm1pc027739@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27726

Modified Files:
	libXevie.spec 
Log Message:
bump for new gcc/glibc


Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXevie.spec	23 Jan 2006 22:25:08 -0000	1.8
+++ libXevie.spec	7 Feb 2006 12:47:59 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:09 -0500
Subject: rpms/libXext/devel libXext.spec,1.9,1.10
Message-ID: <200602071248.k17Cm9ie027794@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27781

Modified Files:
	libXext.spec 
Log Message:
bump for new gcc/glibc


Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXext.spec	31 Jan 2006 21:35:03 -0000	1.9
+++ libXext.spec	7 Feb 2006 12:48:07 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.0
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -130,6 +130,9 @@
 %{_mandir}/man3/XmbufQueryExtension.3x*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
 - Added "Requires: xorg-x11-proto-devel >= 7.0-1" to devel package (#173713)
 - Added "libX11-devel" to devel package (#176078)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:16 -0500
Subject: rpms/libXfixes/devel libXfixes.spec,1.8,1.9
Message-ID: <200602071248.k17CmGaN027850@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27836

Modified Files:
	libXfixes.spec 
Log Message:
bump for new gcc/glibc


Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXfixes.spec	23 Jan 2006 22:25:52 -0000	1.8
+++ libXfixes.spec	7 Feb 2006 12:48:14 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfixes runtime library
 Name: libXfixes
 Version: 3.0.1.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1.2-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 3.0.1.2-2
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:24 -0500
Subject: rpms/libXfont/devel libXfont.spec,1.11,1.12
Message-ID: <200602071248.k17CmOuX027904@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27891

Modified Files:
	libXfont.spec 
Log Message:
bump for new gcc/glibc


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXfont.spec	23 Jan 2006 22:26:05 -0000	1.11
+++ libXfont.spec	7 Feb 2006 12:48:22 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -94,6 +94,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:33 -0500
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.8,1.9
Message-ID: <200602071248.k17CmX31027967@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27950

Modified Files:
	libXfontcache.spec 
Log Message:
bump for new gcc/glibc


Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXfontcache.spec	23 Jan 2006 22:26:25 -0000	1.8
+++ libXfontcache.spec	7 Feb 2006 12:48:30 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man3/FontCacheQueryVersion.3x*
 
 %changelog
+* 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
 - Updated libXfontcache to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:41 -0500
Subject: rpms/libXft/devel libXft.spec,1.11,1.12
Message-ID: <200602071248.k17Cmfr7028022@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28009

Modified Files:
	libXft.spec 
Log Message:
bump for new gcc/glibc


Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXft.spec	3 Feb 2006 10:50:08 -0000	1.11
+++ libXft.spec	7 Feb 2006 12:48:39 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.8.2
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -94,6 +94,9 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* 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
 - Added missing dependencies to devel subpackage to fix (#176744)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:49 -0500
Subject: rpms/libXi/devel libXi.spec,1.8,1.9
Message-ID: <200602071248.k17Cmnnu028081@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28066

Modified Files:
	libXi.spec 
Log Message:
bump for new gcc/glibc


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXi.spec	23 Jan 2006 22:27:18 -0000	1.8
+++ libXi.spec	7 Feb 2006 12:48:47 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:48:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:48:57 -0500
Subject: rpms/libXinerama/devel libXinerama.spec,1.8,1.9
Message-ID: <200602071248.k17Cmvaf028136@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28123

Modified Files:
	libXinerama.spec 
Log Message:
bump for new gcc/glibc


Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXinerama.spec	23 Jan 2006 22:27:36 -0000	1.8
+++ libXinerama.spec	7 Feb 2006 12:48:55 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/xinerama.pc
 
 %changelog
+* 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
 - Updated libXinerama to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:04 -0500
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.10,1.11
Message-ID: <200602071249.k17Cn42P028191@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libxkbfile.spec 
Log Message:
bump for new gcc/glibc


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxkbfile.spec	23 Jan 2006 22:37:42 -0000	1.10
+++ libxkbfile.spec	7 Feb 2006 12:49:02 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* 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
 - Updated libxkbfile to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:12 -0500
Subject: rpms/libxkbui/devel libxkbui.spec,1.8,1.9
Message-ID: <200602071249.k17CnC6u028246@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxkbui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28233

Modified Files:
	libxkbui.spec 
Log Message:
bump for new gcc/glibc


Index: libxkbui.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/libxkbui.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libxkbui.spec	23 Jan 2006 22:37:59 -0000	1.8
+++ libxkbui.spec	7 Feb 2006 12:49:10 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbui runtime library
 Name: libxkbui
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xkbui.pc
 
 %changelog
+* 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
 - Updated libxkbui to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:19 -0500
Subject: rpms/libxklavier/devel libxklavier.spec,1.14,1.15
Message-ID: <200602071249.k17CnJeN028301@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28288

Modified Files:
	libxklavier.spec 
Log Message:
bump for new gcc/glibc


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libxklavier.spec	19 Jan 2006 07:10:16 -0000	1.14
+++ libxklavier.spec	7 Feb 2006 12:49:17 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	2.1
-Release:	3
+Release:	3.1
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -71,6 +71,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Christopher Aillon <caillon at redhat.com> 2.1-3
 - Add missing BR: libX11-devel libxml2-devel libxkbfile-devel
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:27 -0500
Subject: rpms/libxml/devel libxml.spec,1.17,1.18
Message-ID: <200602071249.k17CnRvZ028356@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28343

Modified Files:
	libxml.spec 
Log Message:
bump for new gcc/glibc


Index: libxml.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libxml.spec	9 Dec 2005 22:41:46 -0000	1.17
+++ libxml.spec	7 Feb 2006 12:49:25 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		libxml
 Summary:	libXML library
 Version:	1.8.17
-Release: 13.1
+Release: 13.2
 Epoch:		1
 License:	LGPL
 Group:		Development/Libraries
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.8.17-13.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:35 -0500
Subject: rpms/libxml2/devel libxml2.spec,1.32,1.33
Message-ID: <200602071249.k17CnZKM028412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28398

Modified Files:
	libxml2.spec 
Log Message:
bump for new gcc/glibc


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libxml2.spec	5 Jan 2006 15:50:02 -0000	1.32
+++ libxml2.spec	7 Feb 2006 12:49:32 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.23
-Release: 1
+Release: 1.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -127,6 +127,9 @@
 %doc doc/python.html
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.23-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan  5 2006 Daniel Veillard <veillard at redhat.com>
 - upstream release 2.6.23 see http://xmlsoft.org/news.html
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:44 -0500
Subject: rpms/libXmu/devel libXmu.spec,1.8,1.9
Message-ID: <200602071249.k17Cniii028466@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28453

Modified Files:
	libXmu.spec 
Log Message:
bump for new gcc/glibc


Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXmu.spec	23 Jan 2006 22:27:50 -0000	1.8
+++ libXmu.spec	7 Feb 2006 12:49:42 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:49:52 -0500
Subject: rpms/libXp/devel libXp.spec,1.9,1.10
Message-ID: <200602071249.k17CnqKY028521@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28508

Modified Files:
	libXp.spec 
Log Message:
bump for new gcc/glibc


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXp.spec	23 Jan 2006 22:28:04 -0000	1.9
+++ libXp.spec	7 Feb 2006 12:49:50 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -98,6 +98,9 @@
 %endif
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:50:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:50:00 -0500
Subject: rpms/libXpm/devel libXpm.spec,1.9,1.10
Message-ID: <200602071250.k17Co0WB028580@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28565

Modified Files:
	libXpm.spec 
Log Message:
bump for new gcc/glibc


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXpm.spec	23 Jan 2006 22:28:19 -0000	1.9
+++ libXpm.spec	7 Feb 2006 12:49:58 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.4.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -89,6 +89,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:50:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:50:22 -0500
Subject: rpms/libXrandr/devel libXrandr.spec,1.8,1.9
Message-ID: <200602071250.k17CoMw2028637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28625

Modified Files:
	libXrandr.spec 
Log Message:
bump for new gcc/glibc


Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXrandr.spec	23 Jan 2006 22:28:36 -0000	1.8
+++ libXrandr.spec	7 Feb 2006 12:50:20 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.1.0.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0.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.0.2-2
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:50:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:50:30 -0500
Subject: rpms/libXrender/devel libXrender.spec,1.9,1.10
Message-ID: <200602071250.k17CoUn6028694@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28680

Modified Files:
	libXrender.spec 
Log Message:
bump for new gcc/glibc


Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXrender.spec	23 Jan 2006 22:28:54 -0000	1.9
+++ libXrender.spec	7 Feb 2006 12:50:28 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.0.2
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0.2-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 0.9.0.2-3
 - Bump and rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:50:44 -0500
Subject: rpms/libXres/devel libXres.spec,1.8,1.9
Message-ID: <200602071250.k17Coiql028749@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28735

Modified Files:
	libXres.spec 
Log Message:
bump for new gcc/glibc


Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXres.spec	23 Jan 2006 22:29:11 -0000	1.8
+++ libXres.spec	7 Feb 2006 12:50:42 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:50:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:50:52 -0500
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.13,1.14
Message-ID: <200602071250.k17CoqAx028803@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28790

Modified Files:
	libXScrnSaver.spec 
Log Message:
bump for new gcc/glibc


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXScrnSaver.spec	23 Jan 2006 22:22:04 -0000	1.13
+++ libXScrnSaver.spec	7 Feb 2006 12:50:50 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Updated libXScrnSaver to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:00 -0500
Subject: rpms/libxslt/devel libxslt.spec,1.34,1.35
Message-ID: <200602071251.k17Cp0OR028858@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxslt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28845

Modified Files:
	libxslt.spec 
Log Message:
bump for new gcc/glibc


Index: libxslt.spec
===================================================================
RCS file: /cvs/dist/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libxslt.spec	9 Dec 2005 22:41:47 -0000	1.34
+++ libxslt.spec	7 Feb 2006 12:50:57 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.15
-Release: 1.1
+Release: 1.2
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -119,6 +119,9 @@
 %doc python/tests/*.xsl
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.15-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:08 -0500
Subject: rpms/libXt/devel libXt.spec,1.13,1.14
Message-ID: <200602071251.k17Cp8uW028913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28900

Modified Files:
	libXt.spec 
Log Message:
bump for new gcc/glibc


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libXt.spec	23 Jan 2006 22:29:25 -0000	1.13
+++ libXt.spec	7 Feb 2006 12:51:06 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:16 -0500
Subject: rpms/libXTrap/devel libXTrap.spec,1.8,1.9
Message-ID: <200602071251.k17CpGTM028969@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXTrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28955

Modified Files:
	libXTrap.spec 
Log Message:
bump for new gcc/glibc


Index: libXTrap.spec
===================================================================
RCS file: /cvs/dist/rpms/libXTrap/devel/libXTrap.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXTrap.spec	23 Jan 2006 22:22:20 -0000	1.8
+++ libXTrap.spec	7 Feb 2006 12:51:14 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXTrap runtime library
 Name: libXTrap
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xtrap.pc
 
 %changelog
+* 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
 - Bumped and rebuilt with X11R7 tarball
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:24 -0500
Subject: rpms/libXtst/devel libXtst.spec,1.8,1.9
Message-ID: <200602071251.k17CpOKe029024@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29010

Modified Files:
	libXtst.spec 
Log Message:
bump for new gcc/glibc


Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXtst.spec	23 Jan 2006 22:29:41 -0000	1.8
+++ libXtst.spec	7 Feb 2006 12:51:22 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
+* 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
 - Updated libXtst to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:32 -0500
Subject: rpms/libXv/devel libXv.spec,1.9,1.10
Message-ID: <200602071251.k17CpWCj029079@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29065

Modified Files:
	libXv.spec 
Log Message:
bump for new gcc/glibc


Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXv.spec	1 Feb 2006 07:45:14 -0000	1.9
+++ libXv.spec	7 Feb 2006 12:51:30 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name: libXv
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Updated libXv to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:39 -0500
Subject: rpms/libXvMC/devel libXvMC.spec,1.9,1.10
Message-ID: <200602071251.k17CpdIZ029133@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29120

Modified Files:
	libXvMC.spec 
Log Message:
bump for new gcc/glibc


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXvMC.spec	1 Feb 2006 00:57:00 -0000	1.9
+++ libXvMC.spec	7 Feb 2006 12:51:37 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.1
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added "Requires: libXv-devel, xorg-x11-proto-devel" to fix (#176862)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:47 -0500
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.8,1.9
Message-ID: <200602071251.k17CplW1029188@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29175

Modified Files:
	libXxf86dga.spec 
Log Message:
bump for new gcc/glibc


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXxf86dga.spec	23 Jan 2006 22:34:38 -0000	1.8
+++ libXxf86dga.spec	7 Feb 2006 12:51:45 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:51:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:51:54 -0500
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.8,1.9
Message-ID: <200602071251.k17CpsFp029243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29230

Modified Files:
	libXxf86misc.spec 
Log Message:
bump for new gcc/glibc


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libXxf86misc.spec	23 Jan 2006 22:35:47 -0000	1.8
+++ libXxf86misc.spec	7 Feb 2006 12:51:52 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:02 -0500
Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.9,1.10
Message-ID: <200602071252.k17Cq2jk029298@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29285

Modified Files:
	libXxf86vm.spec 
Log Message:
bump for new gcc/glibc


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXxf86vm.spec	23 Jan 2006 22:36:14 -0000	1.9
+++ libXxf86vm.spec	7 Feb 2006 12:52:00 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
 Version: 1.0.0
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - Bumped and rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:10 -0500
Subject: rpms/linux-atm/devel linux-atm.spec,1.11,1.12
Message-ID: <200602071252.k17CqAuB029353@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29340

Modified Files:
	linux-atm.spec 
Log Message:
bump for new gcc/glibc


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linux-atm.spec	21 Dec 2005 12:32:28 -0000	1.11
+++ linux-atm.spec	7 Feb 2006 12:52:08 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.3
+Release: 0.20050118.3.1
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -85,6 +85,9 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 David Woodhouse <dwmw2 at redhat.com> 2.5.0-0.20050118.3
 - Package cleanups from Matthias Saou (#172932):
 -  Add missing /sbin/ldconfig calls for the libs package.



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:18 -0500
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.18,1.19
Message-ID: <200602071252.k17CqIAh029408@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxdoc-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29395

Modified Files:
	linuxdoc-tools.spec 
Log Message:
bump for new gcc/glibc


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- linuxdoc-tools.spec	9 Dec 2005 22:41:47 -0000	1.18
+++ linuxdoc-tools.spec	7 Feb 2006 12:52:16 -0000	1.19
@@ -5,7 +5,7 @@
 Obsoletes: sgml-tools
 Obsoletes: linuxdoc-sgml
 Version: 0.9.21
-Release: 6.1
+Release: 6.2
 License: Freely distributable
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -100,6 +100,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.21-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:26 -0500
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.26,1.27
Message-ID: <200602071252.k17CqQrH029463@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29450

Modified Files:
	linuxwacom.spec 
Log Message:
bump for new gcc/glibc


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- linuxwacom.spec	13 Jan 2006 19:23:30 -0000	1.26
+++ linuxwacom.spec	7 Feb 2006 12:52:23 -0000	1.27
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.2
 Epoch:		0
-Release:	1
+Release:	1.1
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -97,6 +97,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Kristian H??gsberg <krh at redhat.com> 0:0.7.2-1
 - Update to version 0.7.2.
 - Drop linuxwacom-0.6.4-linux-input.patch since the kernel headers now



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:34 -0500
Subject: rpms/lksctp-tools/devel lksctp-tools.spec,1.9,1.10
Message-ID: <200602071252.k17CqYNj029519@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lksctp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29505

Modified Files:
	lksctp-tools.spec 
Log Message:
bump for new gcc/glibc


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lksctp-tools.spec	24 Jan 2006 07:15:12 -0000	1.9
+++ lksctp-tools.spec	7 Feb 2006 12:52:31 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.5
-Release: 1.fc5
+Release: 1.fc5.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://lksctp.sourceforge.net/
@@ -89,6 +89,9 @@
 %doc doc/*.txt
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Warren Togami <wtogami at redhat.com> 1.0.5-1
 - 1.0.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:42 -0500
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.31,1.32
Message-ID: <200602071252.k17Cqgl5029574@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29560

Modified Files:
	lm_sensors.spec 
Log Message:
bump for new gcc/glibc


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lm_sensors.spec	16 Jan 2006 17:29:20 -0000	1.31
+++ lm_sensors.spec	7 Feb 2006 12:52:39 -0000	1.32
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.9.1
-Release: 6
+Release: 6.1
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -107,6 +107,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.1-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Peter Jones <pjones at redhat.com> 2.9.1-6
 - fix initscript subsys locking
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:49 -0500
Subject: rpms/lockdev/devel lockdev.spec,1.21,1.22
Message-ID: <200602071252.k17CqnTJ029631@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lockdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29618

Modified Files:
	lockdev.spec 
Log Message:
bump for new gcc/glibc


Index: lockdev.spec
===================================================================
RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lockdev.spec	9 Dec 2005 22:41:48 -0000	1.21
+++ lockdev.spec	7 Feb 2006 12:52:47 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A library for locking devices.
 Name: lockdev
 Version: 1.0.1
-Release: 9.1
+Release: 9.2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
@@ -81,6 +81,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:52:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:52:57 -0500
Subject: rpms/logrotate/devel logrotate.spec,1.42,1.43
Message-ID: <200602071252.k17CqvNP029687@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29673

Modified Files:
	logrotate.spec 
Log Message:
bump for new gcc/glibc


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- logrotate.spec	9 Dec 2005 22:41:49 -0000	1.42
+++ logrotate.spec	7 Feb 2006 12:52:55 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.3
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.7.3-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:05 -0500
Subject: rpms/lrzsz/devel lrzsz.spec,1.14,1.15
Message-ID: <200602071253.k17Cr5t5029742@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lrzsz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29729

Modified Files:
	lrzsz.spec 
Log Message:
bump for new gcc/glibc


Index: lrzsz.spec
===================================================================
RCS file: /cvs/dist/rpms/lrzsz/devel/lrzsz.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lrzsz.spec	9 Dec 2005 22:41:50 -0000	1.14
+++ lrzsz.spec	7 Feb 2006 12:53:03 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: The lrz and lsz modem communications programs.
 Name: lrzsz
 Version: 0.12.20
-Release: 21.1
+Release: 21.2
 License: GPL
 Group: Applications/Communications
 Source: http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
@@ -43,6 +43,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12.20-21.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:13 -0500
Subject: rpms/lslk/devel lslk.spec,1.15,1.16
Message-ID: <200602071253.k17CrDuV029798@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lslk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29784

Modified Files:
	lslk.spec 
Log Message:
bump for new gcc/glibc


Index: lslk.spec
===================================================================
RCS file: /cvs/dist/rpms/lslk/devel/lslk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lslk.spec	9 Dec 2005 22:41:50 -0000	1.15
+++ lslk.spec	7 Feb 2006 12:53:10 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A lock file lister.
 Name: lslk
 Version: 1.29
-Release: 16.1
+Release: 16.2
 License: Free
 Group: Development/Debuggers
 Source: ftp://vic.cc.purdue.edu/pub/tools/unix/lslk/lslk_%{version}_W.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:20 -0500
Subject: rpms/lsof/devel lsof.spec,1.22,1.23
Message-ID: <200602071253.k17CrKPD029852@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29839

Modified Files:
	lsof.spec 
Log Message:
bump for new gcc/glibc


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lsof.spec	9 Dec 2005 22:41:50 -0000	1.22
+++ lsof.spec	7 Feb 2006 12:53:18 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.76
-Release: 1.1
+Release: 1.2
 License: Free
 %define lsofrh lsof_%{version}-rh
 Group: Development/Debuggers
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.76-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:28 -0500
Subject: rpms/ltrace/devel ltrace.spec,1.21,1.22
Message-ID: <200602071253.k17CrSEX029907@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ltrace.spec 
Log Message:
bump for new gcc/glibc


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ltrace.spec	9 Jan 2006 14:16:21 -0000	1.21
+++ ltrace.spec	7 Feb 2006 12:53:26 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.3.36
-Release: 4
+Release: 4.1
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz
 Patch2: ltrace-ppc64.patch
@@ -59,6 +59,9 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.36-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Jakub Jelinek <jakub at redhat.com> 0.3.36-4
 - added ppc64 and s390x support (IBM)
 - added ia64 support (Ian Wienand)



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:36 -0500
Subject: rpms/lv/devel lv.spec,1.20,1.21
Message-ID: <200602071253.k17CraKR029962@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29949

Modified Files:
	lv.spec 
Log Message:
bump for new gcc/glibc


Index: lv.spec
===================================================================
RCS file: /cvs/dist/rpms/lv/devel/lv.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lv.spec	9 Dec 2005 22:41:51 -0000	1.20
+++ lv.spec	7 Feb 2006 12:53:34 -0000	1.21
@@ -3,7 +3,7 @@
 Summary:	A Powerful Multilingual File Viewer
 Name:		lv
 Version:	4.51
-Release: 7.1
+Release: 7.2
 License: distributable
 Group: Applications/Text
 URL: http://www.ff.iij4u.or.jp/~nrt/lv/
@@ -61,6 +61,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.51-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:44 -0500
Subject: rpms/lvm2/devel lvm2.spec,1.59,1.60
Message-ID: <200602071253.k17CriVa030017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30004

Modified Files:
	lvm2.spec 
Log Message:
bump for new gcc/glibc


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- lvm2.spec	9 Dec 2005 22:41:51 -0000	1.59
+++ lvm2.spec	7 Feb 2006 12:53:42 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.01
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -68,6 +68,9 @@
 /var/lock/lvm
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.02.01-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:53:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:53:53 -0500
Subject: rpms/lynx/devel lynx.spec,1.31,1.32
Message-ID: <200602071253.k17Crr6l030072@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lynx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30059

Modified Files:
	lynx.spec 
Log Message:
bump for new gcc/glibc


Index: lynx.spec
===================================================================
RCS file: /cvs/dist/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lynx.spec	9 Dec 2005 22:41:51 -0000	1.31
+++ lynx.spec	7 Feb 2006 12:53:50 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 27.1
+Release: 27.2
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5rel.1.tar.bz2
@@ -96,6 +96,9 @@
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-27.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:01 -0500
Subject: rpms/m17n-lib/devel m17n-lib.spec,1.3,1.4
Message-ID: <200602071254.k17Cs12F030136@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	m17n-lib.spec 
Log Message:
bump for new gcc/glibc


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- m17n-lib.spec	2 Feb 2006 07:59:31 -0000	1.3
+++ m17n-lib.spec	7 Feb 2006 12:53:59 -0000	1.4
@@ -5,7 +5,7 @@
 
 Name:		m17n-lib
 Version:	1.3.1
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Multilingual text library
 
 Group:		System Environment/Libraries
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Jens Petersen <petersen at redhat.com> - 1.3.1-1
 - update to 1.3.1 release
   - rename use_otf and use_anthy macros to with_gui and with_examples



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:11 -0500
Subject: rpms/m2crypto/devel m2crypto.spec,1.18,1.19
Message-ID: <200602071254.k17CsBID002541@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31380

Modified Files:
	m2crypto.spec 
Log Message:
bump for new gcc/glibc


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- m2crypto.spec	3 Jan 2006 01:38:41 -0000	1.18
+++ m2crypto.spec	7 Feb 2006 12:54:07 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.15
-Release: 3
+Release: 3.1
 # http://svn.osafoundation.org/m2crypto/tags/0.15
 Source0: m2crypto-%{version}.tar.bz2
 Patch0: m2crypto-0.13-SSLServer.patch
@@ -52,6 +52,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Miloslav Trmac <mitr at redhat.com> - 0.15-3
 - Add BuildRequires: swig
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:21 -0500
Subject: rpms/m4/devel m4.spec,1.18,1.19
Message-ID: <200602071254.k17CsL1r005868@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/m4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5840

Modified Files:
	m4.spec 
Log Message:
bump for new gcc/glibc


Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- m4.spec	9 Dec 2005 22:41:52 -0000	1.18
+++ m4.spec	7 Feb 2006 12:54:19 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.4
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -50,6 +50,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:31 -0500
Subject: rpms/macutils/devel macutils.spec,1.16,1.17
Message-ID: <200602071254.k17CsVRQ005990@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/macutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5958

Modified Files:
	macutils.spec 
Log Message:
bump for new gcc/glibc


Index: macutils.spec
===================================================================
RCS file: /cvs/dist/rpms/macutils/devel/macutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- macutils.spec	9 Dec 2005 22:41:52 -0000	1.16
+++ macutils.spec	7 Feb 2006 12:54:29 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating Macintosh file formats.
 Name: macutils
 Version: 2.0b3
-Release: 32.1
+Release: 32.2
 License: Distributable
 Group: Applications/System
 Source: ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0b3-32.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:42 -0500
Subject: rpms/magma/devel magma.spec,1.25,1.26
Message-ID: <200602071254.k17Csgtx006128@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/magma/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6087

Modified Files:
	magma.spec 
Log Message:
bump for new gcc/glibc


Index: magma.spec
===================================================================
RCS file: /cvs/dist/rpms/magma/devel/magma.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- magma.spec	9 Dec 2005 22:41:52 -0000	1.25
+++ magma.spec	7 Feb 2006 12:54:40 -0000	1.26
@@ -12,7 +12,7 @@
 
 Name: magma
 Version: 1.0.3
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Libraries
 Summary: A cluster/lock manager API abstraction library
@@ -79,6 +79,9 @@
 %{_mandir}/man3/clu_get_event.3.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:54:52 -0500
Subject: rpms/magma-plugins/devel magma-plugins.spec,1.15,1.16
Message-ID: <200602071254.k17Csqa9006266@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/magma-plugins/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6234

Modified Files:
	magma-plugins.spec 
Log Message:
bump for new gcc/glibc


Index: magma-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/magma-plugins/devel/magma-plugins.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- magma-plugins.spec	16 Dec 2005 22:50:37 -0000	1.15
+++ magma-plugins.spec	7 Feb 2006 12:54:50 -0000	1.16
@@ -12,7 +12,7 @@
 
 Name: magma-plugins
 Version: 1.0.5
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL
 Group: System Environment/Libraries
 Summary: Cluster manager plugins for magma
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-0.FC5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt w/ new upstream sources
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:55:03 -0500
Subject: rpms/mailman/devel mailman.spec,1.52,1.53
Message-ID: <200602071255.k17Ct3Dp006397@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6365

Modified Files:
	mailman.spec 
Log Message:
bump for new gcc/glibc


Index: mailman.spec
===================================================================
RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mailman.spec	10 Jan 2006 10:20:28 -0000	1.52
+++ mailman.spec	7 Feb 2006 12:55:00 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access.
 Name: mailman
 Version: 2.1.7
-Release: 1
+Release: 1.1
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -328,6 +328,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:2.1.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Harald Hoyer <harald at redhat.com> - 3:2.1.7-1
 - version 2.1.7
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:55:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:55:16 -0500
Subject: rpms/mailx/devel mailx.spec,1.20,1.21
Message-ID: <200602071255.k17CtGUe006542@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6512

Modified Files:
	mailx.spec 
Log Message:
bump for new gcc/glibc


Index: mailx.spec
===================================================================
RCS file: /cvs/dist/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mailx.spec	9 Dec 2005 22:41:54 -0000	1.20
+++ mailx.spec	7 Feb 2006 12:55:13 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: The /bin/mail program for sending e-mail messages.
 Name: mailx
 Version: 8.1.1
-Release: 44.1
+Release: 44.2
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.debian.org/pub/debian/hamm/source/mail/mailx-8.1.1.tar.gz
@@ -106,6 +106,9 @@
 %{_mandir}/man1/Mail.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:55:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:55:29 -0500
Subject: rpms/make/devel make.spec,1.24,1.25
Message-ID: <200602071255.k17CtTc6006686@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/make/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6657

Modified Files:
	make.spec 
Log Message:
bump for new gcc/glibc


Index: make.spec
===================================================================
RCS file: /cvs/dist/rpms/make/devel/make.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- make.spec	2 Feb 2006 13:45:32 -0000	1.24
+++ make.spec	7 Feb 2006 12:55:26 -0000	1.25
@@ -2,7 +2,7 @@
 Name: make
 Epoch: 1
 Version: 3.80
-Release: 10
+Release: 10.1
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -86,6 +86,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.80-10.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 02 2006 Petr Machata <pmachata at redhat.com> 3.80-10
 - H.J. Lu caught a typo in the patch and provided a new one. (#175376)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:55:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:55:41 -0500
Subject: rpms/MAKEDEV/devel MAKEDEV.spec,1.48,1.49
Message-ID: <200602071255.k17Ctf10006844@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/MAKEDEV/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6811

Modified Files:
	MAKEDEV.spec 
Log Message:
bump for new gcc/glibc


Index: MAKEDEV.spec
===================================================================
RCS file: /cvs/dist/rpms/MAKEDEV/devel/MAKEDEV.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- MAKEDEV.spec	27 Jan 2006 02:33:21 -0000	1.48
+++ MAKEDEV.spec	7 Feb 2006 12:55:39 -0000	1.49
@@ -1,6 +1,6 @@
 Name: MAKEDEV
 Version: 3.21
-Release: 1
+Release: 1.1
 Group: System Environment/Base
 License: GPL
 Source: MAKEDEV-%{version}-%{release}.tar.gz
@@ -49,6 +49,9 @@
 %config %{_sysconfdir}/makedev.d
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.21-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Nalin Dahyabhai <nalin at redhat.com> 3.21-1
 - update to 4 January devices-2.6+.txt:
   - add ttyNX*



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:01 -0500
Subject: rpms/man/devel man.spec,1.43,1.44
Message-ID: <200602071256.k17Cu1Ep007039@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7009

Modified Files:
	man.spec 
Log Message:
bump for new gcc/glibc


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- man.spec	2 Feb 2006 19:35:39 -0000	1.43
+++ man.spec	7 Feb 2006 12:55:58 -0000	1.44
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.6c
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -320,6 +320,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6c-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Florian La Roche <laroche at redhat.com>
 - 1.6c
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:12 -0500
Subject: rpms/mc/devel mc.spec,1.78,1.79
Message-ID: <200602071256.k17CuC7S007177@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7145

Modified Files:
	mc.spec 
Log Message:
bump for new gcc/glibc


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mc.spec	3 Feb 2006 13:18:04 -0000	1.78
+++ mc.spec	7 Feb 2006 12:56:09 -0000	1.79
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	7
+Release:	7.1
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -182,6 +182,9 @@
 %dir %{_datadir}/mc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.6.1a-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb  1 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-7
 - update from CVS - fixes syntax file for PHP
 - make displaying of free space configurable



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:23 -0500
Subject: rpms/mdadm/devel mdadm.spec,1.25,1.26
Message-ID: <200602071256.k17CuNvX007307@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7277

Modified Files:
	mdadm.spec 
Log Message:
bump for new gcc/glibc


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mdadm.spec	9 Dec 2005 22:41:58 -0000	1.25
+++ mdadm.spec	7 Feb 2006 12:56:21 -0000	1.26
@@ -1,7 +1,7 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.2
-Release: 1.fc5.1
+Release: 1.fc5.2
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
@@ -83,6 +83,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-1.fc5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:35 -0500
Subject: rpms/memtest86+/devel memtest86+.spec,1.20,1.21
Message-ID: <200602071256.k17CuZPD007453@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/memtest86+/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7421

Modified Files:
	memtest86+.spec 
Log Message:
bump for new gcc/glibc


Index: memtest86+.spec
===================================================================
RCS file: /cvs/dist/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- memtest86+.spec	9 Dec 2005 22:42:00 -0000	1.20
+++ memtest86+.spec	7 Feb 2006 12:56:33 -0000	1.21
@@ -6,7 +6,7 @@
 Summary: Stand-alone memory tester for x86 and x86-64 computers
 Name: memtest86+
 Version: 1.65
-Release: 2.1
+Release: 2.2
 License: GPL
 ExclusiveArch: %{ix86} x86_64
 Group: System Environment/Base
@@ -60,6 +60,9 @@
 /sbin/new-memtest-pkg --remove %{version}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.65-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:45 -0500
Subject: rpms/metacity/devel metacity.spec,1.50,1.51
Message-ID: <200602071256.k17CujOj007578@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	metacity.spec 
Log Message:
bump for new gcc/glibc


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- metacity.spec	30 Jan 2006 20:25:27 -0000	1.50
+++ metacity.spec	7 Feb 2006 12:56:43 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.13.55
-Release: 1
+Release: 1.1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -106,6 +106,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.55-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.55-1
 - Update to 2.13.55
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:56:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:56:56 -0500
Subject: rpms/mgetty/devel mgetty.spec,1.34,1.35
Message-ID: <200602071256.k17Cuu08007708@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mgetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7679

Modified Files:
	mgetty.spec 
Log Message:
bump for new gcc/glibc


Index: mgetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mgetty.spec	18 Dec 2005 21:10:27 -0000	1.34
+++ mgetty.spec	7 Feb 2006 12:56:54 -0000	1.35
@@ -5,7 +5,7 @@
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
 Version: 1.1.33
-Release: 7.FC5
+Release: 7.FC5.1
 Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
 Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
 Source2: logrotate.mgetty
@@ -341,6 +341,9 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.33-7.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Dec 18 2005 Jason Vas Dias<jvdias at redhat.com> - 1.1.33-7.FC5
 - rebuild for new gcc + remove 'xmkmf' invocation for Modular X11
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:57:08 -0500
Subject: rpms/mikmod/devel mikmod.spec,1.25,1.26
Message-ID: <200602071257.k17Cv8ub007854@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7821

Modified Files:
	mikmod.spec 
Log Message:
bump for new gcc/glibc


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mikmod.spec	9 Dec 2005 22:42:01 -0000	1.25
+++ mikmod.spec	7 Feb 2006 12:57:06 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: A MOD music file player.
 Name: mikmod
 Version: 3.1.6
-Release: 36.1
+Release: 36.2
 License: GPL/LGPL
 Group: Applications/Multimedia
 Prereq: /sbin/ldconfig
@@ -118,6 +118,9 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.6-36.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:57:20 -0500
Subject: rpms/mingetty/devel mingetty.spec,1.13,1.14
Message-ID: <200602071257.k17CvK0p007988@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mingetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7957

Modified Files:
	mingetty.spec 
Log Message:
bump for new gcc/glibc


Index: mingetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mingetty/devel/mingetty.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mingetty.spec	9 Dec 2005 22:42:01 -0000	1.13
+++ mingetty.spec	7 Feb 2006 12:57:17 -0000	1.14
@@ -2,7 +2,7 @@
 Name: mingetty
 Version: 1.07
 License: GPL
-Release: 5.1
+Release: 5.2
 Group: System Environment/Base
 Source: mingetty-%{version}.tar.gz
 Patch: mingetty-1.00-opt.patch
@@ -37,6 +37,9 @@
 %{_mandir}/man8/mingetty.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:57:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:57:29 -0500
Subject: rpms/minicom/devel minicom.spec,1.18,1.19
Message-ID: <200602071257.k17CvTVa008110@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/minicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8082

Modified Files:
	minicom.spec 
Log Message:
bump for new gcc/glibc


Index: minicom.spec
===================================================================
RCS file: /cvs/dist/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- minicom.spec	9 Dec 2005 22:42:01 -0000	1.18
+++ minicom.spec	7 Feb 2006 12:57:27 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
 Version: 2.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
@@ -81,6 +81,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:57:41 -0500
Subject: rpms/mkbootdisk/devel mkbootdisk.spec,1.17,1.18
Message-ID: <200602071257.k17Cvfuw008246@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mkbootdisk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8216

Modified Files:
	mkbootdisk.spec 
Log Message:
bump for new gcc/glibc


Index: mkbootdisk.spec
===================================================================
RCS file: /cvs/dist/rpms/mkbootdisk/devel/mkbootdisk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mkbootdisk.spec	9 Dec 2005 22:42:01 -0000	1.17
+++ mkbootdisk.spec	7 Feb 2006 12:57:38 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Creates a boot floppy disk for booting a system.
 Name: mkbootdisk
 Version: 1.5.2
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.2-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:57:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:57:51 -0500
Subject: rpms/mktemp/devel mktemp.spec,1.20,1.21
Message-ID: <200602071257.k17Cvpes008367@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mktemp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8336

Modified Files:
	mktemp.spec 
Log Message:
bump for new gcc/glibc


Index: mktemp.spec
===================================================================
RCS file: /cvs/dist/rpms/mktemp/devel/mktemp.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mktemp.spec	9 Dec 2005 22:42:02 -0000	1.20
+++ mktemp.spec	7 Feb 2006 12:57:48 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A small utility for safely making /tmp files.
 Name: mktemp
 Version: 1.5
-Release: 23.1
+Release: 23.2
 Epoch: 3
 License: BSD
 Group: System Environment/Base
@@ -39,6 +39,9 @@
 %{_mandir}/man1/mktemp.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:1.5-23.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:01 -0500
Subject: rpms/mlocate/devel mlocate.spec,1.4,1.5
Message-ID: <200602071258.k17Cw1RB008493@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mlocate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8463

Modified Files:
	mlocate.spec 
Log Message:
bump for new gcc/glibc


Index: mlocate.spec
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mlocate.spec	31 Dec 2005 22:50:16 -0000	1.4
+++ mlocate.spec	7 Feb 2006 12:57:59 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.12
-Release: 1
+Release: 1.1
 License: GPLv2
 Group: Applications/System
 Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %ghost /var/lib/mlocate/mlocate.db
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Dec 31 2005 Miloslav Trmac <mitr at redhat.com> - 0.12-1
 - Update to mlocate-0.12
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:11 -0500
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.9,1.10
Message-ID: <200602071258.k17CwBcq008620@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8590

Modified Files:
	mod_auth_kerb.spec 
Log Message:
bump for new gcc/glibc


Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_auth_kerb.spec	9 Dec 2005 22:42:02 -0000	1.9
+++ mod_auth_kerb.spec	7 Feb 2006 12:58:09 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 8.1
+Release: 8.2
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -54,6 +54,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:22 -0500
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql.spec,1.20,1.21
Message-ID: <200602071258.k17CwM4J008743@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8714

Modified Files:
	mod_auth_mysql.spec 
Log Message:
bump for new gcc/glibc


Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mod_auth_mysql.spec	9 Dec 2005 22:42:03 -0000	1.20
+++ mod_auth_mysql.spec	7 Feb 2006 12:58:19 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Basic authentication for the Apache web server using a MySQL database.
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 2.1
+Release: 2.2
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
@@ -45,6 +45,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.0-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:32 -0500
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.21,1.22
Message-ID: <200602071258.k17CwWEH008868@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8838

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
bump for new gcc/glibc


Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_auth_pgsql.spec	6 Jan 2006 09:04:46 -0000	1.21
+++ mod_auth_pgsql.spec	7 Feb 2006 12:58:30 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache web server using a PostgreSQL database.
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 2
+Release: 2.1
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -51,6 +51,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan  6 2006 Joe Orton <jorton at redhat.com> 2.0.3-2
 - update to 2.0.3 (includes fix for CVE-2005-3656)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:42 -0500
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.12,1.13
Message-ID: <200602071258.k17CwgiY008991@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_authz_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8961

Modified Files:
	mod_authz_ldap.spec 
Log Message:
bump for new gcc/glibc


Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_authz_ldap.spec	9 Dec 2005 22:42:04 -0000	1.12
+++ mod_authz_ldap.spec	7 Feb 2006 12:58:39 -0000	1.13
@@ -2,7 +2,7 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 6.1
+Release: 6.2
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
@@ -73,6 +73,9 @@
 %doc NEWS AUTHORS ChangeLog COPYING INSTALL
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.26-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:58:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:58:53 -0500
Subject: rpms/mod_perl/devel mod_perl.spec,1.35,1.36
Message-ID: <200602071258.k17Cwr28009113@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9084

Modified Files:
	mod_perl.spec 
Log Message:
bump for new gcc/glibc


Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_perl.spec	9 Dec 2005 22:42:09 -0000	1.35
+++ mod_perl.spec	7 Feb 2006 12:58:50 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release: 3.1
+Release: 3.2
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:59:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:59:08 -0500
Subject: rpms/mod_python/devel mod_python.spec,1.25,1.26
Message-ID: <200602071259.k17Cx8Ga009258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9229

Modified Files:
	mod_python.spec 
Log Message:
bump for new gcc/glibc


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_python.spec	9 Dec 2005 22:42:09 -0000	1.25
+++ mod_python.spec	7 Feb 2006 12:59:04 -0000	1.26
@@ -4,7 +4,7 @@
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
 Version: 3.1.4
-Release: 3.1
+Release: 3.2
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch1: mod_python-3.1.3-maxlocks.patch
@@ -70,6 +70,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.4-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:59:19 -0500
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.16,1.17
Message-ID: <200602071259.k17CxJCb009386@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9359

Modified Files:
	module-init-tools.spec 
Log Message:
bump for new gcc/glibc


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- module-init-tools.spec	24 Jan 2006 14:15:27 -0000	1.16
+++ module-init-tools.spec	7 Feb 2006 12:59:16 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.2
+Release: 0.%{preversion}.2.1
 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
@@ -90,6 +90,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.pre9.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.2
 - ghost /etc/modprobe.conf (#130603)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:59:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:59:29 -0500
Subject: rpms/mono/devel mono.spec,1.25,1.26
Message-ID: <200602071259.k17CxTf9009510@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9482

Modified Files:
	mono.spec 
Log Message:
bump for new gcc/glibc


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mono.spec	31 Jan 2006 21:31:43 -0000	1.25
+++ mono.spec	7 Feb 2006 12:59:26 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.1.13.2
-Release:        1
+Release:        1.1
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -490,6 +490,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.13.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-1
 - Update to 1.1.13.2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 12:59:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 07:59:46 -0500
Subject: rpms/mozilla/devel mozilla.spec,1.85,1.86
Message-ID: <200602071259.k17Cxk0f009685@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9657

Modified Files:
	mozilla.spec 
Log Message:
bump for new gcc/glibc


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- mozilla.spec	5 Feb 2006 16:13:35 -0000	1.85
+++ mozilla.spec	7 Feb 2006 12:59:43 -0000	1.86
@@ -11,7 +11,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.12
-Release:     4
+Release:     4.1
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -742,6 +742,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 37:1.7.12-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 37:1.7.12-4
 - Fix CVE-2005-4134, CVE-2006-0292, CVE-2006-0296
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:00:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:00:21 -0500
Subject: rpms/mozplugger/devel mozplugger.spec,1.19,1.20
Message-ID: <200602071300.k17D0Lof009904@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mozplugger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9873

Modified Files:
	mozplugger.spec 
Log Message:
bump for new gcc/glibc


Index: mozplugger.spec
===================================================================
RCS file: /cvs/dist/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mozplugger.spec	9 Dec 2005 22:42:10 -0000	1.19
+++ mozplugger.spec	7 Feb 2006 13:00:14 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.7.3
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
@@ -48,6 +48,9 @@
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:01:27 -0500
Subject: rpms/mpage/devel mpage.spec,1.19,1.20
Message-ID: <200602071301.k17D1R0v010101@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mpage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10040

Modified Files:
	mpage.spec 
Log Message:
bump for new gcc/glibc


Index: mpage.spec
===================================================================
RCS file: /cvs/dist/rpms/mpage/devel/mpage.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mpage.spec	9 Dec 2005 22:42:10 -0000	1.19
+++ mpage.spec	7 Feb 2006 13:01:14 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A tool for printing multiple pages of text on each printed page.
 Name: mpage
 Version: 2.5.4
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.mesa.nl/pub/mpage/mpage-%{version}.tgz
@@ -45,6 +45,9 @@
 %{_datadir}/mpage
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:03:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:03:35 -0500
Subject: rpms/mrtg/devel mrtg.spec,1.24,1.25
Message-ID: <200602071303.k17D3Z93010270@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10245

Modified Files:
	mrtg.spec 
Log Message:
bump for new gcc/glibc


Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mrtg.spec	30 Jan 2006 22:57:28 -0000	1.24
+++ mrtg.spec	7 Feb 2006 13:03:23 -0000	1.25
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.13.0
-Release:   1
+Release:   1.1
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
 Source1:   mrtg.cfg
@@ -110,6 +110,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Miloslav Trmac <mitr at redhat.com> - 2.13.0-1
 - Update to mrtg-2.13.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:04:17 -0500
Subject: rpms/mtools/devel mtools.spec,1.19,1.20
Message-ID: <200602071304.k17D4HvP010408@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10395

Modified Files:
	mtools.spec 
Log Message:
bump for new gcc/glibc


Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mtools.spec	9 Dec 2005 22:42:10 -0000	1.19
+++ mtools.spec	7 Feb 2006 13:04:15 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:04:55 -0500
Subject: rpms/mtr/devel mtr.spec,1.30,1.31
Message-ID: <200602071304.k17D4teN010520@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10499

Modified Files:
	mtr.spec 
Log Message:
bump for new gcc/glibc


Index: mtr.spec
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mtr.spec	9 Dec 2005 22:42:10 -0000	1.30
+++ mtr.spec	7 Feb 2006 13:04:52 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.69
-Release: 7.1
+Release: 7.2
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:0.69-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:05:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:05:49 -0500
Subject: rpms/mt-st/devel mt-st.spec,1.19,1.20
Message-ID: <200602071305.k17D5nhK010687@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mt-st/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10659

Modified Files:
	mt-st.spec 
Log Message:
bump for new gcc/glibc


Index: mt-st.spec
===================================================================
RCS file: /cvs/dist/rpms/mt-st/devel/mt-st.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mt-st.spec	9 Dec 2005 22:42:10 -0000	1.19
+++ mt-st.spec	7 Feb 2006 13:05:35 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Install mt-st if you need a tool to control tape drives.
 Name: mt-st
 Version: 0.9b
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/System
 Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{_mandir}/man[18]/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9b-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:06:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:06:30 -0500
Subject: rpms/mtx/devel mtx.spec,1.17,1.18
Message-ID: <200602071306.k17D6UeT010861@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10829

Modified Files:
	mtx.spec 
Log Message:
bump for new gcc/glibc


Index: mtx.spec
===================================================================
RCS file: /cvs/dist/rpms/mtx/devel/mtx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mtx.spec	9 Dec 2005 22:42:11 -0000	1.17
+++ mtx.spec	7 Feb 2006 13:06:27 -0000	1.18
@@ -1,6 +1,6 @@
 Name: mtx
 Version: 1.2.18
-Release: 8.1
+Release: 8.2
 Summary: A SCSI media changer control program.
 License: GPL
 Group: Applications/System
@@ -49,6 +49,9 @@
 %{_sbindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.18-8.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:06:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:06:52 -0500
Subject: rpms/mutt/devel mutt.spec,1.30,1.31
Message-ID: <200602071306.k17D6q7x010999@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mutt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10970

Modified Files:
	mutt.spec 
Log Message:
bump for new gcc/glibc


Index: mutt.spec
===================================================================
RCS file: /cvs/dist/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mutt.spec	9 Dec 2005 22:42:11 -0000	1.30
+++ mutt.spec	7 Feb 2006 13:06:50 -0000	1.31
@@ -2,7 +2,7 @@
 Name: mutt
 %define uversion 0.9
 Version: 1.4.2.1
-Release: 6.1
+Release: 6.2
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -154,6 +154,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:1.4.2.1-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:07:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:07:18 -0500
Subject: rpms/mx/devel mx.spec,1.13,1.14
Message-ID: <200602071307.k17D7IOp011127@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11092

Modified Files:
	mx.spec 
Log Message:
bump for new gcc/glibc


Index: mx.spec
===================================================================
RCS file: /cvs/dist/rpms/mx/devel/mx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mx.spec	9 Dec 2005 20:45:07 -0000	1.13
+++ mx.spec	7 Feb 2006 13:07:14 -0000	1.14
@@ -4,7 +4,7 @@
 Summary:  A collection of Python software tools.
 Name: mx%{pybasever}
 Version: 2.0.6
-Release: 2.1
+Release: 2.2
 URL: http://www.lemburg.com/files/python/eGenix-mx-Extensions.html
 Source0: http://www.lemburg.com/python/egenix-mx-base-%{version}.tar.gz
 Patch0: egenix-mx-base-2.0.2-pyconfig.patch
@@ -65,6 +65,9 @@
 %{_prefix}/%{_lib}/python*/site-packages/mx
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:07:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:07:31 -0500
Subject: rpms/mx4j/devel mx4j.spec,1.41,1.42
Message-ID: <200602071307.k17D7VQm011242@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11224

Modified Files:
	mx4j.spec 
Log Message:
bump for new gcc/glibc


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mx4j.spec	21 Dec 2005 21:25:21 -0000	1.41
+++ mx4j.spec	7 Feb 2006 13:07:29 -0000	1.42
@@ -1,6 +1,6 @@
 %define name        mx4j
 %define version     3.0.1
-%define release     1jpp_6fc
+%define release     1jpp_7fc
 %define section     free
 
 Name:           %{name}
@@ -183,6 +183,9 @@
 %doc dist/docs/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_7fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.0.1-1jpp_6fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:07:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:07:55 -0500
Subject: rpms/mysql/devel mysql.spec,1.70,1.71
Message-ID: <200602071307.k17D7t1V011361@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mysql.spec 
Log Message:
bump for new gcc/glibc


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mysql.spec	5 Jan 2006 07:09:06 -0000	1.70
+++ mysql.spec	7 Feb 2006 13:07:52 -0000	1.71
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.18
-Release: 1
+Release: 1.1
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -380,6 +380,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0.18-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan  5 2006 Tom Lane <tgl at redhat.com> 5.0.18-1
 - Update to MySQL 5.0.18
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:08:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:08:43 -0500
Subject: rpms/mysqlclient10/devel mysqlclient10.spec,1.11,1.12
Message-ID: <200602071308.k17D8hl7011586@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11556

Modified Files:
	mysqlclient10.spec 
Log Message:
bump for new gcc/glibc


Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysqlclient10.spec	15 Dec 2005 19:44:41 -0000	1.11
+++ mysqlclient10.spec	7 Feb 2006 13:08:41 -0000	1.12
@@ -1,6 +1,6 @@
 Name: mysqlclient10
 Version: 3.23.58
-Release: 9
+Release: 9.1
 Summary: Backlevel MySQL shared libraries.
 License: LGPL
 Group: Applications/Databases
@@ -151,6 +151,9 @@
 %{_libdir}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.23.58-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Tom Lane <tgl at redhat.com> 3.23.58-9
 - fix my_config.h for 64-bit and ppc platforms
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:09:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:09:00 -0500
Subject: rpms/mysqlclient14/devel mysqlclient14.spec,1.5,1.6
Message-ID: <200602071309.k17D90Co011748@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient14/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11718

Modified Files:
	mysqlclient14.spec 
Log Message:
bump for new gcc/glibc


Index: mysqlclient14.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient14/devel/mysqlclient14.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mysqlclient14.spec	15 Dec 2005 19:43:13 -0000	1.5
+++ mysqlclient14.spec	7 Feb 2006 13:08:57 -0000	1.6
@@ -1,6 +1,6 @@
 Name: mysqlclient14
 Version: 4.1.14
-Release: 4
+Release: 4.1
 Summary: Backlevel MySQL shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -158,6 +158,9 @@
 %{_libdir}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.14-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Tom Lane <tgl at redhat.com> 4.1.14-4
 - fix my_config.h for 64-bit and ppc platforms
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:09:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:09:29 -0500
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec,1.2,1.3
Message-ID: <200602071309.k17D9TrW011961@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
bump for new gcc/glibc


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-connector-odbc.spec	9 Dec 2005 22:42:13 -0000	1.2
+++ mysql-connector-odbc.spec	7 Feb 2006 13:09:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 3.51.12
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.mysql.com/downloads/api-myodbc.html
@@ -65,6 +65,9 @@
 %{_libdir}/lib*so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.51.12-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:09:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:09:39 -0500
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.19,1.20
Message-ID: <200602071309.k17D9dLB012086@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	MySQL-python.spec 
Log Message:
bump for new gcc/glibc


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MySQL-python.spec	9 Dec 2005 22:39:29 -0000	1.19
+++ MySQL-python.spec	7 Feb 2006 13:09:37 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.0
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Development/Libraries
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %dir /usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/constants
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:09:50 -0500
Subject: rpms/nano/devel nano.spec,1.9,1.10
Message-ID: <200602071309.k17D9oB5012219@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nano/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12187

Modified Files:
	nano.spec 
Log Message:
bump for new gcc/glibc


Index: nano.spec
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/nano.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nano.spec	9 Dec 2005 20:45:20 -0000	1.9
+++ nano.spec	7 Feb 2006 13:09:47 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A small text editor
 Name:		nano
 Version:	1.3.8
-Release: 1.1
+Release: 1.2
 License:	GPL
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -51,6 +51,9 @@
 %{_infodir}/nano.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.8-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:10:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:10:00 -0500
Subject: rpms/nasm/devel nasm.spec,1.15,1.16
Message-ID: <200602071310.k17DA093012346@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nasm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12318

Modified Files:
	nasm.spec 
Log Message:
bump for new gcc/glibc


Index: nasm.spec
===================================================================
RCS file: /cvs/dist/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nasm.spec	9 Dec 2005 22:42:14 -0000	1.15
+++ nasm.spec	7 Feb 2006 13:09:58 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A portable x86 assembler which uses Intel-like syntax.
 Name: nasm
 Version: 0.98.39
-Release: 3.1
+Release: 3.2
 Patch0: nasm-0.98-boguself2.patch
 Patch1: nasm-0.98.39-overfl.patch
 License: LGPL
@@ -90,6 +90,9 @@
 %{_bindir}/rdx
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.98.39-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:10:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:10:12 -0500
Subject: rpms/nautilus/devel nautilus.spec,1.90,1.91
Message-ID: <200602071310.k17DACBK012471@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12441

Modified Files:
	nautilus.spec 
Log Message:
bump for new gcc/glibc


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- nautilus.spec	6 Feb 2006 21:27:46 -0000	1.90
+++ nautilus.spec	7 Feb 2006 13:10:09 -0000	1.91
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.13.90
-Release:	2
+Release:	2.1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
 - Avoid delays in rendering the background
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:10:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:10:23 -0500
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.45,1.46
Message-ID: <200602071310.k17DANin012613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12581

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
bump for new gcc/glibc


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- nautilus-cd-burner.spec	31 Jan 2006 04:27:40 -0000	1.45
+++ nautilus-cd-burner.spec	7 Feb 2006 13:10:21 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.13.90
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:10:33 -0500
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.6,1.7
Message-ID: <200602071310.k17DAXGl012725@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12697

Modified Files:
	nautilus-sendto.spec 
Log Message:
bump for new gcc/glibc


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nautilus-sendto.spec	28 Jan 2006 16:36:16 -0000	1.6
+++ nautilus-sendto.spec	7 Feb 2006 13:10:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.4
-Release: 7
+Release: 7.1
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 0.4-7
 - rebuild for new e-d-s
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:10:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:10:50 -0500
Subject: rpms/nc/devel nc.spec,1.23,1.24
Message-ID: <200602071310.k17DAoZj012888@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12860

Modified Files:
	nc.spec 
Log Message:
bump for new gcc/glibc


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nc.spec	25 Jan 2006 10:11:59 -0000	1.23
+++ nc.spec	7 Feb 2006 13:10:47 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 3
+Release: 3.1
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -54,6 +54,9 @@
 %doc README scripts
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.84-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Radek Vokal <rvokal at redhat.com> 1.84-3
 - warnings cleaned-up, compile with -Werror
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:11:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:11:02 -0500
Subject: rpms/ncompress/devel ncompress.spec,1.16,1.17
Message-ID: <200602071311.k17DB2bt013028@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12990

Modified Files:
	ncompress.spec 
Log Message:
bump for new gcc/glibc


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ncompress.spec	9 Dec 2005 22:42:18 -0000	1.16
+++ ncompress.spec	7 Feb 2006 13:10:58 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 43.1
+Release: 43.2
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -69,6 +69,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-43.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:11:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:11:11 -0500
Subject: rpms/ncpfs/devel ncpfs.spec,1.23,1.24
Message-ID: <200602071311.k17DBBHT013154@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13125

Modified Files:
	ncpfs.spec 
Log Message:
bump for new gcc/glibc


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ncpfs.spec	9 Dec 2005 22:42:19 -0000	1.23
+++ ncpfs.spec	7 Feb 2006 13:11:09 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 1.1
+Release: 1.2
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -116,6 +116,9 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:11:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:11:22 -0500
Subject: rpms/ncurses/devel ncurses.spec,1.56,1.57
Message-ID: <200602071311.k17DBMbL013273@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncurses/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13246

Modified Files:
	ncurses.spec 
Log Message:
bump for new gcc/glibc


Index: ncurses.spec
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ncurses.spec	31 Jan 2006 09:47:49 -0000	1.56
+++ ncurses.spec	7 Feb 2006 13:11:19 -0000	1.57
@@ -2,7 +2,7 @@
 Name: ncurses
 Version: 5.5
 %define includedirw %{_includedir}/ncursesw
-Release: 18
+Release: 18.1
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -165,6 +165,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.5-18.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 31 2006 Jindrich Novy <jnovy at redhat.com> 5.5-18
 - add --with-chtype=long to avoid type clashes on x86_64 (#178824)
 - spec cleanup



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:11:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:11:41 -0500
Subject: rpms/neon/devel neon.spec,1.21,1.22
Message-ID: <200602071311.k17DBfSY013479@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	neon.spec 
Log Message:
bump for new gcc/glibc


Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- neon.spec	31 Jan 2006 11:02:17 -0000	1.21
+++ neon.spec	7 Feb 2006 13:11:38 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
@@ -74,6 +74,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 0.25.5-1
 - update to 0.25.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:11:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:11:56 -0500
Subject: rpms/netdump/devel netdump.spec,1.20,1.21
Message-ID: <200602071311.k17DBuBw013641@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13608

Modified Files:
	netdump.spec 
Log Message:
bump for new gcc/glibc


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- netdump.spec	9 Dec 2005 22:42:20 -0000	1.20
+++ netdump.spec	7 Feb 2006 13:11:54 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.14
-Release: 1.1
+Release: 1.2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -95,6 +95,9 @@
 %doc example_scripts
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:12:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:12:08 -0500
Subject: rpms/netpbm/devel netpbm.spec,1.50,1.51
Message-ID: <200602071312.k17DC8e1013767@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13739

Modified Files:
	netpbm.spec 
Log Message:
bump for new gcc/glibc


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- netpbm.spec	18 Jan 2006 13:40:38 -0000	1.50
+++ netpbm.spec	7 Feb 2006 13:12:04 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 2
+Release: 2.1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -174,6 +174,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 10.31-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Jindrich Novy <jnovy at redhat.com> 10.31-2
 - rebuild to have greater version than in FC4 (#177698)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:12:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:12:24 -0500
Subject: rpms/net-snmp/devel net-snmp.spec,1.64,1.65
Message-ID: <200602071312.k17DCOJH013945@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-snmp.spec 
Log Message:
bump for new gcc/glibc


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- net-snmp.spec	2 Feb 2006 08:17:55 -0000	1.64
+++ net-snmp.spec	7 Feb 2006 13:12:22 -0000	1.65
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3
-Release: 4
+Release: 4.1
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -317,6 +317,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.3-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Radek Vok??l <rvokal at redhat.com> 5.3-4
 - fix crash on s390x and ppc64
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:12:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:12:38 -0500
Subject: rpms/net-tools/devel net-tools.spec,1.54,1.55
Message-ID: <200602071312.k17DCcB0014105@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-tools.spec 
Log Message:
bump for new gcc/glibc


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- net-tools.spec	6 Feb 2006 07:42:55 -0000	1.54
+++ net-tools.spec	7 Feb 2006 13:12:36 -0000	1.55
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 61
+Release: 61.1
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -223,6 +223,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.60-61.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Radek Vok??l <rvokal at redhat.com> 1.60-61
 - mii-tool manpage fixed (#180055)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:12:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:12:52 -0500
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.86,1.87
Message-ID: <200602071312.k17DCqti014257@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14226

Modified Files:
	NetworkManager.spec 
Log Message:
bump for new gcc/glibc


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- NetworkManager.spec	6 Feb 2006 03:18:10 -0000	1.86
+++ NetworkManager.spec	7 Feb 2006 13:12:49 -0000	1.87
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 10%{?nm_cvs_version}
+Release: 10%{?nm_cvs_version}.1
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -209,6 +209,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-10.cvs20060205.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205
 - Workarounds for madwifi/Atheros cards
 - Do better with non-SSID-broadcasting access points



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:13:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:13:03 -0500
Subject: rpms/newt/devel newt.spec,1.33,1.34
Message-ID: <200602071313.k17DD3Dc014387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14357

Modified Files:
	newt.spec 
Log Message:
bump for new gcc/glibc


Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- newt.spec	17 Jan 2006 17:58:30 -0000	1.33
+++ newt.spec	7 Feb 2006 13:13:00 -0000	1.34
@@ -4,7 +4,7 @@
 Name: newt
 %define version 0.52.2
 Version: %{version}
-Release: 5
+Release: 5.1
 License: LGPL
 Group: System Environment/Libraries
 Source: newt-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %{_libdir}/libnewt.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.52.2-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Petr Rockai <prockai at redhat.com> - 0.52.2-5
 - Fix a crash in checkboxtree.c where pressing pgup/pgdown
   on a checkboxtree with less items than its height would



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:13:14 -0500
Subject: rpms/newt-perl/devel newt-perl.spec,1.7,1.8
Message-ID: <200602071313.k17DDECb014525@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	newt-perl.spec 
Log Message:
bump for new gcc/glibc


Index: newt-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/newt-perl/devel/newt-perl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- newt-perl.spec	9 Dec 2005 22:42:22 -0000	1.7
+++ newt-perl.spec	7 Feb 2006 13:13:11 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Perl bindings for the Newt library
 Name: newt-perl
 Version: 1.08
-Release: 9.1
+Release: 9.2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Source: ftp://ftp.msg.com.mx/pub/Newt/Newt-1.08.tar.gz
@@ -60,6 +60,9 @@
 %doc ChangeLog README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.08-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:13:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:13:26 -0500
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.83,1.84
Message-ID: <200602071313.k17DDQvu014666@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	nfs-utils.spec 
Log Message:
bump for new gcc/glibc


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- nfs-utils.spec	20 Jan 2006 14:37:19 -0000	1.83
+++ nfs-utils.spec	7 Feb 2006 13:13:23 -0000	1.84
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc2
-Release: 4.FC5
+Release: 4.FC5.1
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -223,6 +223,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8.rc2-4.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 20 2006 Steve Dickson <SteveD at RedHat.com> 1.0.8.rc2-4.FC5
 - Added new libnfsidmap call, nfs4_set_debug(), to rpc.idmapd
   which turns on debugging in the libarary.



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:13:40 -0500
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.3,1.4
Message-ID: <200602071313.k17DDeGQ014824@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14793

Modified Files:
	nfs-utils-lib.spec 
Log Message:
bump for new gcc/glibc


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nfs-utils-lib.spec	20 Jan 2006 13:52:17 -0000	1.3
+++ nfs-utils-lib.spec	7 Feb 2006 13:13:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 2
+Release: 2.1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -131,6 +131,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Steve Dickson <steved at redhat.com> 1.0.8-2
 - Added debugging routines to libnfsidmap
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:13:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:13:51 -0500
Subject: rpms/nhpf/devel nhpf.spec,1.10,1.11
Message-ID: <200602071313.k17DDpt6014951@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nhpf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14926

Modified Files:
	nhpf.spec 
Log Message:
bump for new gcc/glibc


Index: nhpf.spec
===================================================================
RCS file: /cvs/dist/rpms/nhpf/devel/nhpf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nhpf.spec	10 Dec 2005 09:37:27 -0000	1.10
+++ nhpf.spec	7 Feb 2006 13:13:48 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
 Name:		nhpf
 Version:	1.42
-Release: 9.1
+Release: 9.2
 License:	Distributable
 Group:		Applications/Text
 Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
@@ -36,6 +36,9 @@
 %attr(755,root,root)/usr/bin/nhpf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:02 -0500
Subject: rpms/nkf/devel nkf.spec,1.16,1.17
Message-ID: <200602071314.k17DE2pM015090@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nkf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15059

Modified Files:
	nkf.spec 
Log Message:
bump for new gcc/glibc


Index: nkf.spec
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nkf.spec	9 Dec 2005 22:42:23 -0000	1.16
+++ nkf.spec	7 Feb 2006 13:13:59 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: A Kanji code conversion filter.
 Name: nkf
 Version: 2.05
-Release: 1.1
+Release: 1.2
 License: BSD-like
 Group: Applications/Text
 #Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar
@@ -73,6 +73,9 @@
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.05-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:13 -0500
Subject: rpms/nmap/devel nmap.spec,1.26,1.27
Message-ID: <200602071314.k17DEDjL015236@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15203

Modified Files:
	nmap.spec 
Log Message:
bump for new gcc/glibc


Index: nmap.spec
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nmap.spec	2 Feb 2006 11:51:12 -0000	1.26
+++ nmap.spec	7 Feb 2006 13:14:11 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 4.00
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:4.00-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> - 2:4.00-1
 - version 4.00
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:23 -0500
Subject: rpms/notify-daemon/devel notify-daemon.spec,1.7,1.8
Message-ID: <200602071314.k17DENRS015363@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15332

Modified Files:
	notify-daemon.spec 
Log Message:
bump for new gcc/glibc


Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- notify-daemon.spec	3 Feb 2006 22:29:40 -0000	1.7
+++ notify-daemon.spec	7 Feb 2006 13:14:21 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 6
+Release: 6.1
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -57,6 +57,9 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-6
 - Add patch to determine whether a compositing manager is running
   when drawing a new notification bubble, as long as the CM grabs



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:34 -0500
Subject: rpms/nspr/devel nspr.spec,1.11,1.12
Message-ID: <200602071314.k17DEYtS015496@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15464

Modified Files:
	nspr.spec 
Log Message:
bump for new gcc/glibc


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nspr.spec	5 Jan 2006 23:38:41 -0000	1.11
+++ nspr.spec	7 Feb 2006 13:14:32 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.1
-Release:	2
+Release:	2.1
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan  5 2006 Kai Engert <kengert at redhat.com> 4.6.1-2
 - Do not use -ansi when compiling, because of a compilation
   problem with latest glibc and anonymous unions.



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:47 -0500
Subject: rpms/nss/devel nss.spec,1.7,1.8
Message-ID: <200602071314.k17DElai015651@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15608

Modified Files:
	nss.spec 
Log Message:
bump for new gcc/glibc


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nss.spec	19 Jan 2006 14:42:48 -0000	1.7
+++ nss.spec	7 Feb 2006 13:14:45 -0000	1.8
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11
-Release:          3
+Release:          3.1
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -308,6 +308,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.11-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Ray Strode <rstrode at redhat.com> 3.11-3
 - rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:14:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:14:46 -0500
Subject: rpms/authd/FC-4 authd-1.4.3-ipv6-mapping.patch, NONE, 1.1 authd.spec,
	1.30, 1.31
Message-ID: <200602071314.k17DEk9a015625@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-ipv6-mapping.patch 
Log Message:
add xinetd to Prereq, fix for #150502 (authd doesn't map IPv6 to IPv4 from xinetd)

authd-1.4.3-ipv6-mapping.patch:
 authd.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE authd-1.4.3-ipv6-mapping.patch ---
--- authd-1.4.3/authd.c.old	2005-06-24 16:08:04.000000000 +0200
+++ authd-1.4.3/authd.c	2005-06-24 16:12:06.000000000 +0200
@@ -485,8 +485,19 @@
 
                 assert(opt.mapped != NULL);
                 strcpy(peer_128, opt.mapped); strcpy(host_128, opt.mapped);
-                strncpy(host_128, addr_hex, z);
-                strncpy(peer_128, peer_addr_hex, strlen(peer_addr_hex));
+
+                /*
+                   If mapping IPV4 to IPV6 space is enabled,
+                   take only last 4 numbers of IPV6
+                */
+                if(opt.mapped[0]) {
+                  strncpy(host_128, addr_hex+z-8, 8);
+                  strncpy(peer_128, peer_addr_hex, 8);
+                } else {
+                  strncpy(host_128, addr_hex, z);
+                  strncpy(peer_128, peer_addr_hex, strlen(peer_addr_hex));
+                }
+
                 if (strcmp(peer_128, host_128) != 0) return addr;
             }
             // hex addr must have even number of digits


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/FC-4/authd.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- authd.spec	8 Apr 2005 10:05:01 -0000	1.30
+++ authd.spec	7 Feb 2006 13:14:43 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 4.devel
+Release: 5.FC4
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -10,8 +10,10 @@
 Source0: %{name}-%{version}.tar.gz
 Patch0: authd-1.4.3-gcc4.patch
 Patch1: authd-1.4.3-disable.patch
+Patch2: authd-1.4.3-ipv6-mapping.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel
+Prereq: xinetd
 
 %description
 authd is a small and fast RFC 1413 ident protocol daemon
@@ -23,6 +25,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -63,6 +66,10 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Tue Feb  7 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-5.FC4
+- add xinetd to Prereq
+- fix for #150502 (authd doesn't map IPv6 to IPv4 from xinetd)
+
 * Fri Apr  8 2005 Martin Stransky <stransky at redhat.com> - 1.4.3-4.devel
 - clear last update
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:15:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:15:01 -0500
Subject: rpms/nss_db/devel nss_db.spec,1.28,1.29
Message-ID: <200602071315.k17DF1Nd015839@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15803

Modified Files:
	nss_db.spec 
Log Message:
bump for new gcc/glibc


Index: nss_db.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nss_db.spec	9 Dec 2005 22:42:31 -0000	1.28
+++ nss_db.spec	7 Feb 2006 13:14:59 -0000	1.29
@@ -2,7 +2,7 @@
 Summary: An NSS library for the Berkeley DB.
 Name: nss_db
 Version: 2.2
-Release: 34.1
+Release: 34.2
 Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz
 Source2: db-getent-Makefile
@@ -109,6 +109,9 @@
 %config /var/db/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-34.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:15:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:15:19 -0500
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.55,1.56
Message-ID: <200602071315.k17DFJTJ016009@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15977

Modified Files:
	nss_ldap.spec 
Log Message:
bump for new gcc/glibc


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- nss_ldap.spec	25 Jan 2006 22:54:37 -0000	1.55
+++ nss_ldap.spec	7 Feb 2006 13:15:16 -0000	1.56
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: 248
-Release: 1
+Release: 1.1
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -215,6 +215,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 248-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Nalin Dahyabhai <nalin at redhat.com> 248-1
 - update to nss_ldap 248
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:15:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:15:43 -0500
Subject: rpms/ntp/devel ntp.spec,1.46,1.47
Message-ID: <200602071315.k17DFhnK016211@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ntp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16193

Modified Files:
	ntp.spec 
Log Message:
bump for new gcc/glibc


Index: ntp.spec
===================================================================
RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ntp.spec	9 Dec 2005 22:42:31 -0000	1.46
+++ ntp.spec	7 Feb 2006 13:15:41 -0000	1.47
@@ -8,7 +8,7 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP).
 Name: ntp
 Version: 4.2.0.a.20050816
-Release: 10.1
+Release: 10.2
 License: distributable
 Group: System Environment/Daemons
 Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-%{tarversion}.tar.gz
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0.a.20050816-10.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:16:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:16:49 -0500
Subject: rpms/numactl/devel numactl.spec,1.24,1.25
Message-ID: <200602071316.k17DGnGK025201@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24994

Modified Files:
	numactl.spec 
Log Message:
bump for new gcc/glibc


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- numactl.spec	9 Dec 2005 22:42:31 -0000	1.24
+++ numactl.spec	7 Feb 2006 13:16:46 -0000	1.25
@@ -71,6 +71,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release: :.1 1.24.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:17:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:17:07 -0500
Subject: rpms/nut/devel nut.spec,1.29,1.30
Message-ID: <200602071317.k17DH7LA027657@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27231

Modified Files:
	nut.spec 
Log Message:
bump for new gcc/glibc


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nut.spec	3 Jan 2006 08:47:20 -0000	1.29
+++ nut.spec	7 Feb 2006 13:17:04 -0000	1.30
@@ -11,7 +11,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.0.2
-Release: 6
+Release: 6.1
 Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -270,6 +270,9 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-6.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 03 2006 Radek Vokal <rvokal at redhat.com> 2.0.2-6
 - rebuilt against new libnetsnmp
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:17:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:17:26 -0500
Subject: rpms/oaf/devel oaf.spec,1.17,1.18
Message-ID: <200602071317.k17DHQa9029384@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29351

Modified Files:
	oaf.spec 
Log Message:
bump for new gcc/glibc


Index: oaf.spec
===================================================================
RCS file: /cvs/dist/rpms/oaf/devel/oaf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- oaf.spec	9 Dec 2005 22:42:32 -0000	1.17
+++ oaf.spec	7 Feb 2006 13:17:24 -0000	1.18
@@ -1,7 +1,7 @@
 Name: oaf
 Summary: Object activation framework for GNOME.
 Version: 0.6.10
-Release: 12.1
+Release: 12.2
 License: LGPL and GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/stable/%{name}/%{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/*.sh
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:17:39 -0500
Subject: rpms/opal/devel opal.spec,1.2,1.3
Message-ID: <200602071317.k17DHdFH029527@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	opal.spec 
Log Message:
bump for new gcc/glibc


Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opal.spec	24 Jan 2006 20:31:43 -0000	1.2
+++ opal.spec	7 Feb 2006 13:17:36 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Open Phone Abstraction Library
 Name: opal
 Version: 2.1
-Release: 1
+Release: 1.1
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
@@ -56,5 +56,8 @@
 %{_datadir}/opal
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Daniel Veillard <veillard at redhat.com> - 2.1-1
 - initial version based on the openh323 spec file



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:17:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:17:56 -0500
Subject: rpms/open/devel open.spec,1.11,1.12
Message-ID: <200602071317.k17DHuEA029697@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/open/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29667

Modified Files:
	open.spec 
Log Message:
bump for new gcc/glibc


Index: open.spec
===================================================================
RCS file: /cvs/dist/rpms/open/devel/open.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- open.spec	9 Dec 2005 22:42:32 -0000	1.11
+++ open.spec	7 Feb 2006 13:17:54 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A tool which will start a program on a virtual console.
 Name: open
 Version: 1.4
-Release: 24.1
+Release: 24.2
 License: GPL
 Group: Applications/System
 Source: ftp://sunsite.unc.edu/pub/Linux/utils/console/open-%{version}.tar.gz
@@ -43,6 +43,9 @@
 %attr(644,root,root) %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:09 -0500
Subject: rpms/openCryptoki/devel openCryptoki.spec,1.13,1.14
Message-ID: <200602071318.k17DI8kW029835@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openCryptoki/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29806

Modified Files:
	openCryptoki.spec 
Log Message:
bump for new gcc/glibc


Index: openCryptoki.spec
===================================================================
RCS file: /cvs/dist/rpms/openCryptoki/devel/openCryptoki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openCryptoki.spec	9 Dec 2005 22:42:33 -0000	1.13
+++ openCryptoki.spec	7 Feb 2006 13:18:06 -0000	1.14
@@ -2,7 +2,7 @@
 Name: openCryptoki
 Summary: Implementation of Cryptoki v2.11 for IBM Crypto Hardware
 Version: 2.1.6
-Release: 2.1
+Release: 2.2
 License: Other License(s), see package
 Group: Productivity/Security
 Source: %{name}-%{version}-%{sub_version}.tar.bz2
@@ -87,6 +87,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:23 -0500
Subject: rpms/authd/devel authd.spec,1.34,1.35
Message-ID: <200602071318.k17DIN0J029998@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29964

Modified Files:
	authd.spec 
Log Message:
re-tag


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- authd.spec	7 Feb 2006 11:03:59 -0000	1.34
+++ authd.spec	7 Feb 2006 13:18:21 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 6.devel.2
+Release: 7
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -66,6 +66,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Tue Feb 07 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-7
+- re-tag
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-6.devel.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:26 -0500
Subject: rpms/openhpi/devel openhpi.spec,1.28,1.29
Message-ID: <200602071318.k17DIQT3030030@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	openhpi.spec 
Log Message:
bump for new gcc/glibc


Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openhpi.spec	10 Jan 2006 00:56:35 -0000	1.28
+++ openhpi.spec	7 Feb 2006 13:18:23 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.2.1
-Release: 4
+Release: 4.1
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Peter Jones <pjones at redhat.com> 2.2.1-4
 - Don't use -Werror, it doesn't build with that on ppc64 currently.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:37 -0500
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.25,1.26
Message-ID: <200602071318.k17DIbi3030191@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30161

Modified Files:
	OpenIPMI.spec 
Log Message:
bump for new gcc/glibc


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- OpenIPMI.spec	6 Feb 2006 13:47:24 -0000	1.25
+++ OpenIPMI.spec	7 Feb 2006 13:18:35 -0000	1.26
@@ -2,7 +2,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 1.4.14
-Release: 18
+Release: 18.1
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -131,6 +131,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Phil Knirsch <pknirsch at redhat.com> 1.4.14-18
 - Updated ipmitool to latest upstream version.
 - Removed 3 patches for already fixed bugs in latest ipmitool.



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:48 -0500
Subject: rpms/openjade/devel openjade.spec,1.30,1.31
Message-ID: <200602071318.k17DImUm030323@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30292

Modified Files:
	openjade.spec 
Log Message:
bump for new gcc/glibc


Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openjade.spec	6 Jan 2006 09:22:14 -0000	1.30
+++ openjade.spec	7 Feb 2006 13:18:46 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 23
+Release: 23.1
 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 Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.2-23.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan  6 2006 Tim Waugh <twaugh at redhat.com> 1.3.2-23
 - Rebuild against new opensp.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:18:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:18:59 -0500
Subject: rpms/openldap/devel openldap.spec,1.50,1.51
Message-ID: <200602071318.k17DIxJu030441@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30413

Modified Files:
	openldap.spec 
Log Message:
bump for new gcc/glibc


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- openldap.spec	31 Jan 2006 21:47:36 -0000	1.50
+++ openldap.spec	7 Feb 2006 13:18:56 -0000	1.51
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: %{version_23}
-Release: 2
+Release: 2.1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -684,6 +684,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.19-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 10 2006 Jay Fenlason <fenlason at redhat.com> 2.3.19-2
 - Upgrade to 2.3.19, which upstream now considers stable
 - Modify the -config.patch, ldap.init, and this spec file to put the



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:19:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:19:52 -0500
Subject: rpms/openmotif/devel openmotif.spec,1.41,1.42
Message-ID: <200602071319.k17DJqrR030868@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30842

Modified Files:
	openmotif.spec 
Log Message:
bump for new gcc/glibc


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openmotif.spec	2 Feb 2006 16:57:34 -0000	1.41
+++ openmotif.spec	7 Feb 2006 13:19:50 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.1.9
+Release: 0.1.9.1
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
@@ -156,6 +156,9 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.1.9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.9
 - new CVS version 2006-02-02
 - fixed CVE-2005-3964: libUil buffer overflows (#174814)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:20:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:20:05 -0500
Subject: rpms/openobex/devel openobex.spec,1.10,1.11
Message-ID: <200602071320.k17DK5bE031015@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30991

Modified Files:
	openobex.spec 
Log Message:
bump for new gcc/glibc


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openobex.spec	9 Dec 2005 22:42:34 -0000	1.10
+++ openobex.spec	7 Feb 2006 13:20:03 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.0.1
-Release: 4.1
+Release: 4.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -65,6 +65,9 @@
 %{_includedir}/openobex/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:20:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:20:16 -0500
Subject: rpms/openobex-apps/devel openobex-apps.spec,1.8,1.9
Message-ID: <200602071320.k17DKGkg031148@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openobex-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31116

Modified Files:
	openobex-apps.spec 
Log Message:
bump for new gcc/glibc


Index: openobex-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex-apps/devel/openobex-apps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openobex-apps.spec	9 Dec 2005 22:42:34 -0000	1.8
+++ openobex-apps.spec	7 Feb 2006 13:20:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Applications for using OBEX
 Name: openobex-apps
 Version: 1.0.0
-Release: 8.1
+Release: 8.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -19,6 +19,9 @@
 Open OBEX Applications
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-8.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:20:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:20:27 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.617,1.618
Message-ID: <200602071320.k17DKREj031278@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31247

Modified Files:
	openoffice.org.spec 
Log Message:
bump for new gcc/glibc


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -r1.617 -r1.618
--- openoffice.org.spec	6 Feb 2006 09:29:57 -0000	1.617
+++ openoffice.org.spec	7 Feb 2006 13:20:24 -0000	1.618
@@ -120,7 +120,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.0.1.%{ooomilestone}
-Release: 	%{rh_rpm_release}.%{rh_rpm_extension}
+Release: 	%{rh_rpm_release}.%{rh_rpm_extension}.1
 Epoch:		1
 License:	LGPL
 Group:		Applications/Productivity
@@ -3375,6 +3375,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-11
 - rh#180125# unnecessary gnome mime files
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:21:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:21:48 -0500
Subject: rpms/opensm/devel opensm.spec,1.5,1.6
Message-ID: <200602071321.k17DLm4D031925@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/opensm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31895

Modified Files:
	opensm.spec 
Log Message:
bump for new gcc/glibc


Index: opensm.spec
===================================================================
RCS file: /cvs/dist/rpms/opensm/devel/opensm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opensm.spec	9 Dec 2005 22:42:35 -0000	1.5
+++ opensm.spec	7 Feb 2006 13:21:45 -0000	1.6
@@ -7,7 +7,7 @@
 
 Name: opensm
 Version: 1.0
-Release: 0.%{ver}%{?dist}.1
+Release: 0.%{ver}%{?dist}.2
 Summary:  OpenIB InfiniBand Subnet Manager and management utilities
 
 Group: System Environment/Base
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.4265.1.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:22:09 -0500
Subject: rpms/opensp/devel opensp.spec,1.5,1.6
Message-ID: <200602071322.k17DM9d5032137@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/opensp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32105

Modified Files:
	opensp.spec 
Log Message:
bump for new gcc/glibc


Index: opensp.spec
===================================================================
RCS file: /cvs/dist/rpms/opensp/devel/opensp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opensp.spec	5 Jan 2006 13:29:04 -0000	1.5
+++ opensp.spec	7 Feb 2006 13:22:07 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: SGML and XML parser
 Name: opensp
 Version: 1.5.2
-Release: 1
+Release: 1.1
 Requires: sgml-common >= 0.5
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan  5 2006 Tim Waugh <twaugh at redhat.com>  1.5.2-1
 - 1.5.2.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:22:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:22:20 -0500
Subject: rpms/openssl/devel openssl.spec,1.67,1.68
Message-ID: <200602071322.k17DMKEF032264@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32234

Modified Files:
	openssl.spec 
Log Message:
bump for new gcc/glibc


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- openssl.spec	15 Dec 2005 10:45:33 -0000	1.67
+++ openssl.spec	7 Feb 2006 13:22:17 -0000	1.68
@@ -23,7 +23,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl
 Version: 0.9.8a
-Release: 5
+Release: 5.1
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -382,6 +382,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8a-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Tomas Mraz <tmraz at redhat.com> 0.9.8a-5
 - don't include SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG
   in SSL_OP_ALL (#175779)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:22:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:22:31 -0500
Subject: rpms/openssl097a/devel openssl.spec,1.6,1.7
Message-ID: <200602071322.k17DMV9N032405@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32372

Modified Files:
	openssl.spec 
Log Message:
bump for new gcc/glibc


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openssl.spec	9 Dec 2005 22:42:35 -0000	1.6
+++ openssl.spec	7 Feb 2006 13:22:29 -0000	1.7
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl097a
 Version: 0.9.7a
-Release: 4.1
+Release: 4.2
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -383,6 +383,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7a-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:22:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:22:43 -0500
Subject: rpms/openswan/devel openswan.spec,1.26,1.27
Message-ID: <200602071322.k17DMhhg032533@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openswan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32503

Modified Files:
	openswan.spec 
Log Message:
bump for new gcc/glibc


Index: openswan.spec
===================================================================
RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- openswan.spec	9 Dec 2005 22:42:36 -0000	1.26
+++ openswan.spec	7 Feb 2006 13:22:40 -0000	1.27
@@ -25,7 +25,7 @@
 %define srcpkgver 2.4.4
 
 %define debug_package %{nil}
-Release: %{ourrelease}.1
+Release: %{ourrelease}.2
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -50,7 +50,7 @@
 %package userland
 Summary: Openswan IPSEC usermod tools
 Group: System Environment/Daemons
-Release: %{ourrelease}.1
+Release: %{ourrelease}.2
 %endif
 Provides: ipsec-userland
 Obsoletes: freeswan superfreeswan super-freeswan
@@ -60,13 +60,13 @@
 %package doc
 Summary: Openswan IPSEC full documentation
 Group: System Environment/Daemons
-Release: %{ourrelease}.1
+Release: %{ourrelease}.2
 
 %if %{with_klips}
 %package klips
 Summary: Openswan kernel module
 Group:  System Environment/Kernel
-Release: %{krelver}_%{ourrelease}.1
+Release: %{krelver}_%{ourrelease}.2
 Provides: ipsec-kernel
 Requires: kernel = %{kversion}
 # do not make the dependancy circular for now.
@@ -252,6 +252,9 @@
 exit 0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.4-1.1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:22:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:22:53 -0500
Subject: rpms/oprofile/devel oprofile.spec,1.36,1.37
Message-ID: <200602071322.k17DMr8Q032660@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32628

Modified Files:
	oprofile.spec 
Log Message:
bump for new gcc/glibc


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- oprofile.spec	23 Dec 2005 01:44:20 -0000	1.36
+++ oprofile.spec	7 Feb 2006 13:22:50 -0000	1.37
@@ -4,7 +4,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
-Release: %{oprofile_release}
+Release: %{oprofile_release}.1
 License: GPL
 Group: Development/System
 #
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:03 -0500
Subject: rpms/ORBit/devel ORBit.spec,1.18,1.19
Message-ID: <200602071323.k17DN3wZ000315@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32752

Modified Files:
	ORBit.spec 
Log Message:
bump for new gcc/glibc


Index: ORBit.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ORBit.spec	9 Dec 2005 22:39:29 -0000	1.18
+++ ORBit.spec	7 Feb 2006 13:23:00 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit
 Version: 0.5.17
-Release: 15.1
+Release: 15.2
 Epoch: 1
 Source: ftp://ftp.labs.redhat.com/pub/ORBit/%{name}-%{version}.tar.bz2
 Patch0: ORBit-0.5.17-aligned-access.patch
@@ -103,6 +103,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:14 -0500
Subject: rpms/pam/devel pam.spec,1.102,1.103
Message-ID: <200602071323.k17DNEPn000479@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv450

Modified Files:
	pam.spec 
Log Message:
bump for new gcc/glibc


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- pam.spec	3 Feb 2006 12:41:29 -0000	1.102
+++ pam.spec	7 Feb 2006 13:23:11 -0000	1.103
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.3.0
-Release: 1
+Release: 1.1
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -351,6 +351,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.3.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-1
 - new upstream version
 - updated db4 to 4.3.29



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:27 -0500
Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.13,1.14
Message-ID: <200602071323.k17DNRSW000624@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv596

Modified Files:
	pam_ccreds.spec 
Log Message:
bump for new gcc/glibc


Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pam_ccreds.spec	18 Jan 2006 15:51:27 -0000	1.13
+++ pam_ccreds.spec	7 Feb 2006 13:23:25 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 3
-Release: 3
+Release: 3.1
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %attr(4755,root,root) %{_sbindir}/ccreds_validate
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Tomas Mraz <tmraz at redhat.com> - 3-3
 - don't change ownership in make install
 - build ccreds_validate as PIE



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:37 -0500
Subject: rpms/pam_krb5/devel pam_krb5.spec,1.36,1.37
Message-ID: <200602071323.k17DNbhZ000750@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv722

Modified Files:
	pam_krb5.spec 
Log Message:
bump for new gcc/glibc


Index: pam_krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_krb5/devel/pam_krb5.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pam_krb5.spec	26 Jan 2006 23:47:14 -0000	1.36
+++ pam_krb5.spec	7 Feb 2006 13:23:35 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A Pluggable Authentication Module for Kerberos 5.
 Name: pam_krb5
 Version: 2.2.5
-Release: 1
+Release: 1.1
 Source0: pam_krb5-%{version}-%{release}.tar.gz
 License: LGPL
 Group: System Environment/Base
@@ -44,6 +44,9 @@
 
 # $Id$
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.2.5-1
 - don't log debug messages that we're skipping session setup/teardown unless
   debugging is enabled (#179037)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:48 -0500
Subject: rpms/pam_passwdqc/devel pam_passwdqc.spec,1.5,1.6
Message-ID: <200602071323.k17DNmps000883@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_passwdqc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv853

Modified Files:
	pam_passwdqc.spec 
Log Message:
bump for new gcc/glibc


Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_passwdqc/devel/pam_passwdqc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pam_passwdqc.spec	9 Dec 2005 22:42:37 -0000	1.5
+++ pam_passwdqc.spec	7 Feb 2006 13:23:45 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.2
-Release: 1.1
+Release: 1.2
 License: BSD-compatible
 Group: System Environment/Base
 URL: http://www.openwall.com/passwdqc/
@@ -37,6 +37,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:23:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:23:58 -0500
Subject: rpms/pam_smb/devel pam_smb.spec,1.14,1.15
Message-ID: <200602071323.k17DNwCV001004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_smb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv972

Modified Files:
	pam_smb.spec 
Log Message:
bump for new gcc/glibc


Index: pam_smb.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_smb/devel/pam_smb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pam_smb.spec	2 Feb 2006 02:13:18 -0000	1.14
+++ pam_smb.spec	7 Feb 2006 13:23:56 -0000	1.15
@@ -1,6 +1,6 @@
 Name: pam_smb
 Version: 1.1.7
-Release: 7
+Release: 7.1
 Summary: A Pluggable Authentication Module (PAM) for use with SMB servers.
 Group: System Environment/Base
 URL: http://www.csn.ul.ie/~airlied/pam_smb/
@@ -43,6 +43,9 @@
 /%{_lib}/security/pam_smb_auth.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-7.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb  1 2006 Nalin Dahyabhai <nalin at redhat.com> 1.1.7-7
 - remove a stray quote from configure.in that was causing a syntax error
   and breaking recompiles (upstream #1422089)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:09 -0500
Subject: rpms/pango/devel pango.spec,1.57,1.58
Message-ID: <200602071324.k17DO99j001141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1111

Modified Files:
	pango.spec 
Log Message:
bump for new gcc/glibc


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- pango.spec	6 Feb 2006 17:14:40 -0000	1.57
+++ pango.spec	7 Feb 2006 13:24:06 -0000	1.58
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.11.4
-Release: 1
+Release: 1.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.4-1
 - Update to 1.11.4
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:19 -0500
Subject: rpms/parted/devel parted.spec,1.60,1.61
Message-ID: <200602071324.k17DOJ9J001271@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1239

Modified Files:
	parted.spec 
Log Message:
bump for new gcc/glibc


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- parted.spec	9 Dec 2005 22:42:38 -0000	1.60
+++ parted.spec	7 Feb 2006 13:24:16 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.25
-Release: 5.1
+Release: 5.2
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -99,6 +99,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.25-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:30 -0500
Subject: rpms/passwd/devel passwd.spec,1.22,1.23
Message-ID: <200602071324.k17DOUjN001405@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/passwd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1375

Modified Files:
	passwd.spec 
Log Message:
bump for new gcc/glibc


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- passwd.spec	1 Feb 2006 14:10:22 -0000	1.22
+++ passwd.spec	7 Feb 2006 13:24:28 -0000	1.23
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM.
 Name: passwd
 Version: 0.71
-Release: 3
+Release: 3.1
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Steve Grubb <sgrubb at redhat.com> 0.71-3
 - Adjust audit patch so it builds without libaudit
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:39 -0500
Subject: rpms/patch/devel patch.spec,1.24,1.25
Message-ID: <200602071324.k17DOd73001530@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1498

Modified Files:
	patch.spec 
Log Message:
bump for new gcc/glibc


Index: patch.spec
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- patch.spec	9 Dec 2005 22:42:39 -0000	1.24
+++ patch.spec	7 Feb 2006 13:24:37 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 29.1
+Release: 29.2
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -60,6 +60,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-29.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:49 -0500
Subject: rpms/patchutils/devel patchutils.spec,1.18,1.19
Message-ID: <200602071324.k17DOn0Q001652@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patchutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1621

Modified Files:
	patchutils.spec 
Log Message:
bump for new gcc/glibc


Index: patchutils.spec
===================================================================
RCS file: /cvs/dist/rpms/patchutils/devel/patchutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- patchutils.spec	9 Dec 2005 22:42:39 -0000	1.18
+++ patchutils.spec	7 Feb 2006 13:24:47 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
 Version: 0.2.31
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
@@ -45,6 +45,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.31-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:24:59 -0500
Subject: rpms/pax/devel pax.spec,1.14,1.15
Message-ID: <200602071324.k17DOxqY001797@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1761

Modified Files:
	pax.spec 
Log Message:
bump for new gcc/glibc


Index: pax.spec
===================================================================
RCS file: /cvs/dist/rpms/pax/devel/pax.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pax.spec	9 Dec 2005 22:42:39 -0000	1.14
+++ pax.spec	7 Feb 2006 13:24:57 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.4-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:25:11 -0500
Subject: rpms/pciutils/devel pciutils.spec,1.34,1.35
Message-ID: <200602071325.k17DPB5X001939@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pciutils.spec 
Log Message:
bump for new gcc/glibc


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pciutils.spec	13 Dec 2005 22:35:07 -0000	1.34
+++ pciutils.spec	7 Feb 2006 13:25:08 -0000	1.35
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.1
-Release: 	1
+Release: 	1.1
 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
@@ -68,6 +68,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Bill Nottingham <notting at redhat.com> - 2.2.1-1
 - update to 2.2.1, adjust patches
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:25:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:25:21 -0500
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.13,1.14
Message-ID: <200602071325.k17DPLsn002068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2037

Modified Files:
	pcmciautils.spec 
Log Message:
bump for new gcc/glibc


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pcmciautils.spec	13 Dec 2005 21:09:26 -0000	1.13
+++ pcmciautils.spec	7 Feb 2006 13:25:18 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 011
-Release: 1
+Release: 1.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
@@ -40,6 +40,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 011-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005  Bill Nottingham <notting at redhat.com> 011-1
 - update to 011, now ships with its own udev rules
 - remove pcmcia-cs provide



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:25:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:25:31 -0500
Subject: rpms/pcre/devel pcre.spec,1.15,1.16
Message-ID: <200602071325.k17DPV1q002203@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcre/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2171

Modified Files:
	pcre.spec 
Log Message:
bump for new gcc/glibc


Index: pcre.spec
===================================================================
RCS file: /cvs/dist/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcre.spec	9 Dec 2005 22:42:40 -0000	1.15
+++ pcre.spec	7 Feb 2006 13:25:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name: pcre
 Version: 6.3
-Release: 1.1
+Release: 1.2
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 %{_bindir}/pcre-config
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:25:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:25:41 -0500
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.17,1.18
Message-ID: <200602071325.k17DPflJ002333@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-Bit-Vector.spec	3 Feb 2006 18:24:50 -0000	1.17
+++ perl-Bit-Vector.spec	7 Feb 2006 13:25:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
 Version:        6.4
-Release: 	2.2
+Release: 	2.2.1
 Summary:        A module for high-performance Perl manipulation of bit vectors
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.4-2.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 6.4-2.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:25:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:25:52 -0500
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.18,1.19
Message-ID: <200602071325.k17DPq8T002462@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
bump for new gcc/glibc


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-BSD-Resource.spec	3 Feb 2006 18:19:39 -0000	1.18
+++ perl-BSD-Resource.spec	7 Feb 2006 13:25:50 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.24
-Release: 	3.2
+Release: 	3.2.1
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.24-3.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.24-3.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:26:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:26:02 -0500
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.21,1.22
Message-ID: <200602071326.k17DQ2s6002589@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Compress-Zlib.spec	3 Feb 2006 18:32:59 -0000	1.21
+++ perl-Compress-Zlib.spec	7 Feb 2006 13:26:00 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name: perl-Compress-Zlib
 Version: 1.41
-Release: 1.2
+Release: 1.2.1
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: distributable
 Group: Development/Libraries
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.41-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:26:18 -0500
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.15,1.16
Message-ID: <200602071326.k17DQINr002758@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Crypt-SSLeay.spec	3 Feb 2006 18:41:25 -0000	1.15
+++ perl-Crypt-SSLeay.spec	7 Feb 2006 13:26:15 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Name: perl-Crypt-SSLeay
 Version: 0.51
-Release: 9.2
+Release: 9.2.1
 License: GPL or Artistic
 Group: Development/Libraries
 Source0: http://www.cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.51-9.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.51-9.2
 - rebuild for new perl-5.8.8 / gcc / glibc
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:26:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:26:30 -0500
Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.14,1.15
Message-ID: <200602071326.k17DQUkt002912@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Date-Calc.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-Date-Calc.spec	3 Feb 2006 18:57:03 -0000	1.14
+++ perl-Date-Calc.spec	7 Feb 2006 13:26:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
 Version:        5.4
-Release: 	1.2
+Release: 	1.2.1
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.4-1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 5.4-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:26:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:26:40 -0500
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.23,1.24
Message-ID: <200602071326.k17DQe0o003047@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump for new gcc/glibc


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-DBD-MySQL.spec	3 Feb 2006 18:49:03 -0000	1.23
+++ perl-DBD-MySQL.spec	7 Feb 2006 13:26:38 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0002
-Release: 	2.2
+Release: 	2.2.1
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0002-2.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0002-2.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:26:51 -0500
Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.24,1.25
Message-ID: <200602071326.k17DQpkf003165@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-Pg.spec 
Log Message:
bump for new gcc/glibc


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBD-Pg.spec	3 Feb 2006 18:51:21 -0000	1.24
+++ perl-DBD-Pg.spec	7 Feb 2006 13:26:48 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
 Version:        1.43
-Release: 	2.2
+Release: 	2.2.1
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.43-2.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.43-2.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:27:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:27:01 -0500
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.22,1.23
Message-ID: <200602071327.k17DR1s9003296@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBI.spec 
Log Message:
bump for new gcc/glibc


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-DBI.spec	3 Feb 2006 18:54:26 -0000	1.22
+++ perl-DBI.spec	7 Feb 2006 13:26:58 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.50
-Release: 	2
+Release: 	2.1
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.50-2
 - rebuild for new perl-5.8.8 / gcc / glibc
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:27:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:27:27 -0500
Subject: rpms/perl-Digest-SHA1/devel perl-Digest-SHA1.spec,1.11,1.12
Message-ID: <200602071327.k17DRROv003551@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Digest-SHA1.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Digest-SHA1.spec	3 Feb 2006 19:11:24 -0000	1.11
+++ perl-Digest-SHA1.spec	7 Feb 2006 13:27:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
 Version:        2.11
-Release: 	1
+Release: 	1.1
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.11-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.11-1
 - Upgrade to 2.11
 - rebuild for new perl-5.8.8



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:27:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:27:38 -0500
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.16,1.17
Message-ID: <200602071327.k17DRcdZ003681@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
bump for new gcc/glibc


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-HTML-Parser.spec	3 Feb 2006 19:33:34 -0000	1.16
+++ perl-HTML-Parser.spec	7 Feb 2006 13:27:35 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.48
-Release: 1.1
+Release: 1.1.1
 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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.48-1.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.48-1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:27:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:27:50 -0500
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.20,1.21
Message-ID: <200602071327.k17DRoSp003820@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Net-DNS.spec 
Log Message:
bump for new gcc/glibc


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- perl-Net-DNS.spec	3 Feb 2006 19:54:40 -0000	1.20
+++ perl-Net-DNS.spec	7 Feb 2006 13:27:47 -0000	1.21
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.55
-Release: 1.1
+Release: 1.1.1
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries
@@ -52,6 +52,9 @@
 %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.55-1.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.55-1.1
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:02 -0500
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.22,1.23
Message-ID: <200602071328.k17DS2M1003948@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-PDL.spec 
Log Message:
bump for new gcc/glibc


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-PDL.spec	3 Feb 2006 21:06:42 -0000	1.22
+++ perl-PDL.spec	7 Feb 2006 13:27:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.2
-Release: 	2.fc5.1.2 
+Release: 	2.fc5.1.2.1 
 Summary:        PDL Perl module
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-2.fc5.1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.4.2-2.fc5.1.2
 - rebuild for new perl-5.8.8
 - enable build to succeed without perl-PDL being installed :-)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:12 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.4,1.5
Message-ID: <200602071328.k17DSCu8004084@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-String-CRC32.spec 
Log Message:
bump for new gcc/glibc


Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-String-CRC32.spec	3 Feb 2006 21:12:35 -0000	1.4
+++ perl-String-CRC32.spec	7 Feb 2006 13:28:10 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.3
-Release:        3.FC5
+Release:        3.FC5.1
 
 Summary:        Perl interface for cyclic redundency check generation
 
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3-3.FC5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0:1.03-3.FC5
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:22 -0500
Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.13,1.14
Message-ID: <200602071328.k17DSMII004220@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-TermReadKey.spec 
Log Message:
bump for new gcc/glibc


Index: perl-TermReadKey.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-TermReadKey.spec	3 Feb 2006 21:15:00 -0000	1.13
+++ perl-TermReadKey.spec	7 Feb 2006 13:28:20 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           perl-TermReadKey
 Version:        2.30
-Release: 	1.2
+Release: 	1.2.1
 Summary:        A perl module for simple terminal control
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.30-1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.30-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:32 -0500
Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.10,1.11
Message-ID: <200602071328.k17DSWPw004341@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-LibXML.spec 
Log Message:
bump for new gcc/glibc


Index: perl-XML-LibXML.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-XML-LibXML.spec	3 Feb 2006 21:55:42 -0000	1.10
+++ perl-XML-LibXML.spec	7 Feb 2006 13:28:30 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: XML-LibXML Perl module
 Name: perl-XML-LibXML
 Version: 1.58
-Release: 2.2
+Release: 2.2.1
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-LibXML/
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.58-2.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 1.58-2.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:43 -0500
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.16,1.17
Message-ID: <200602071328.k17DShnr004469@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-Parser.spec 
Log Message:
bump for new gcc/glibc


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-XML-Parser.spec	3 Feb 2006 21:39:41 -0000	1.16
+++ perl-XML-Parser.spec	7 Feb 2006 13:28:40 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.34
-Release:	6.1.2
+Release:	6.1.2.1
 Summary:        A low level Perl module for parsing XML either via trees or streaming
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.34-6.1.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 2.34-6-1.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:28:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:28:54 -0500
Subject: rpms/pfmon/devel pfmon.spec,1.6,1.7
Message-ID: <200602071328.k17DSs0g004595@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pfmon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4567

Modified Files:
	pfmon.spec 
Log Message:
bump for new gcc/glibc


Index: pfmon.spec
===================================================================
RCS file: /cvs/dist/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pfmon.spec	9 Dec 2005 22:42:42 -0000	1.6
+++ pfmon.spec	7 Feb 2006 13:28:51 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: a performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.0
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Development/Tools
 Buildroot: /var/tmp/pfmon-root
@@ -52,6 +52,9 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:29:04 -0500
Subject: rpms/php/devel php.spec,1.103,1.104
Message-ID: <200602071329.k17DT4tf004723@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	php.spec 
Log Message:
bump for new gcc/glibc


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- php.spec	31 Jan 2006 14:30:33 -0000	1.103
+++ php.spec	7 Feb 2006 13:29:01 -0000	1.104
@@ -3,7 +3,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 4
+Release: 4.1
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -537,6 +537,9 @@
 %files pdo -f files.pdo
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:29:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:29:24 -0500
Subject: rpms/pilot-link/devel pilot-link.spec,1.36,1.37
Message-ID: <200602071329.k17DTOEO004912@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4881

Modified Files:
	pilot-link.spec 
Log Message:
bump for new gcc/glibc


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pilot-link.spec	9 Dec 2005 22:42:43 -0000	1.36
+++ pilot-link.spec	7 Feb 2006 13:29:21 -0000	1.37
@@ -5,7 +5,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.12.0
-Release: 0.pre4.5.1
+Release: 0.pre4.5.2
 Source: pilot-link-%{version}-%{interversion}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch
@@ -132,6 +132,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12.0-0.pre4.5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:29:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:29:37 -0500
Subject: rpms/pinfo/devel pinfo.spec,1.24,1.25
Message-ID: <200602071329.k17DTbVP005066@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5035

Modified Files:
	pinfo.spec 
Log Message:
bump for new gcc/glibc


Index: pinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pinfo.spec	9 Dec 2005 22:42:43 -0000	1.24
+++ pinfo.spec	7 Feb 2006 13:29:34 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: An info file viewer.
 Name: pinfo
 Version: 0.6.8
-Release: 11.1
+Release: 11.2
 Group: System Environment/Base
 License: GPL
 URL: http://dione.ids.pl/~pborys/software/pinfo
@@ -70,6 +70,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:29:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:29:51 -0500
Subject: rpms/pkgconfig/devel pkgconfig.spec,1.28,1.29
Message-ID: <200602071329.k17DTpZk005227@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pkgconfig.spec 
Log Message:
bump for new gcc/glibc


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pkgconfig.spec	9 Dec 2005 22:42:44 -0000	1.28
+++ pkgconfig.spec	7 Feb 2006 13:29:49 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.20
-Release: 2.1
+Release: 2.2
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -45,6 +45,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.20-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:30:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:30:03 -0500
Subject: rpms/planner/devel planner.spec,1.18,1.19
Message-ID: <200602071330.k17DU3gK005372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5330

Modified Files:
	planner.spec 
Log Message:
bump for new gcc/glibc


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- planner.spec	6 Feb 2006 12:06:59 -0000	1.18
+++ planner.spec	7 Feb 2006 13:30:00 -0000	1.19
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   3
+Release:   3.1
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -212,6 +212,9 @@
 # Changelog
 ##################################
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Caolan McNamara <caolanm at redhat.com> - 0.13-3
 - rh#179781# add evolution data server plugin
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:31:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:31:26 -0500
Subject: rpms/pm-utils/devel pm-utils.spec,1.22,1.23
Message-ID: <200602071331.k17DVQrg005502@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pm-utils.spec 
Log Message:
bump for new gcc/glibc


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pm-utils.spec	25 Jan 2006 01:05:15 -0000	1.22
+++ pm-utils.spec	7 Feb 2006 13:31:21 -0000	1.23
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.09
-Release: 1
+Release: 1.1
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -81,6 +81,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.09-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Jeremy Katz <katzj at redhat.com> - 0.09-1
 - Remove button module on suspend
 - Set default kernel in grub to current one when hibernating 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:32:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:32:51 -0500
Subject: rpms/pnm2ppa/devel pnm2ppa.spec,1.7,1.8
Message-ID: <200602071332.k17DWpMh005613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pnm2ppa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5594

Modified Files:
	pnm2ppa.spec 
Log Message:
bump for new gcc/glibc


Index: pnm2ppa.spec
===================================================================
RCS file: /cvs/dist/rpms/pnm2ppa/devel/pnm2ppa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pnm2ppa.spec	9 Dec 2005 22:42:45 -0000	1.7
+++ pnm2ppa.spec	7 Feb 2006 13:32:48 -0000	1.8
@@ -3,7 +3,7 @@
 Epoch: 1
 Obsoletes: ppa
 Version: 1.04
-Release: 13.1
+Release: 13.2
 URL: http://sourceforge.net/projects/pnm2ppa 
 Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
 Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
@@ -80,6 +80,9 @@
 %config /etc/pbm2ppa.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.04-13.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:34:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:34:16 -0500
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.231,1.232
Message-ID: <200602071334.k17DYGfJ005763@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5729

Modified Files:
	policycoreutils.spec 
Log Message:
bump for new gcc/glibc


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- policycoreutils.spec	3 Feb 2006 14:58:37 -0000	1.231
+++ policycoreutils.spec	7 Feb 2006 13:34:13 -0000	1.232
@@ -4,7 +4,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.18
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,6 +97,9 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29.18-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 
 * Fri Feb 3 2006 Dan Walsh <dwalsh at redhat.com> 1.29.18-2
 - Add auditing to semanage



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:34:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:34:42 -0500
Subject: rpms/poppler/devel poppler.spec,1.21,1.22
Message-ID: <200602071334.k17DYg0J005872@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5845

Modified Files:
	poppler.spec 
Log Message:
bump for new gcc/glibc


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- poppler.spec	18 Jan 2006 18:17:17 -0000	1.21
+++ poppler.spec	7 Feb 2006 13:34:39 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Pdf rendering library
 Name: poppler
 Version: 0.5.0
-Release: 4
+Release: 4.1
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-4
 - change xpdf conflict version to be <= instead of <
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:35:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:35:04 -0500
Subject: rpms/portmap/devel portmap.spec,1.16,1.17
Message-ID: <200602071335.k17DZ4LJ005995@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/portmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5971

Modified Files:
	portmap.spec 
Log Message:
bump for new gcc/glibc


Index: portmap.spec
===================================================================
RCS file: /cvs/dist/rpms/portmap/devel/portmap.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- portmap.spec	9 Dec 2005 22:42:45 -0000	1.16
+++ portmap.spec	7 Feb 2006 13:35:01 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: A program which manages RPC connections.
 Name: portmap
 Version: 4.0
-Release: 65.1
+Release: 65.2
 Group: System Environment/Daemons
 License: BSD
 Source0: ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/portmap/portmap_4.tar.gz
@@ -109,6 +109,9 @@
 %config	%{initdir}/portmap
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:35:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:35:24 -0500
Subject: rpms/postfix/devel postfix.spec,1.36,1.37
Message-ID: <200602071335.k17DZO3g006125@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6095

Modified Files:
	postfix.spec 
Log Message:
bump for new gcc/glibc


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- postfix.spec	24 Jan 2006 15:49:14 -0000	1.36
+++ postfix.spec	7 Feb 2006 13:35:21 -0000	1.37
@@ -43,7 +43,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.2.8
-Release: 1
+Release: 1.1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -467,6 +467,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.8-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Florian Festi <ffesti at redhat.com> 2:2.2.8-1
 - new version 2.2.8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:35:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:35:35 -0500
Subject: rpms/postgresql/devel postgresql.spec,1.63,1.64
Message-ID: <200602071335.k17DZZe7006273@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6243

Modified Files:
	postgresql.spec 
Log Message:
bump for new gcc/glibc


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- postgresql.spec	9 Jan 2006 17:59:35 -0000	1.63
+++ postgresql.spec	7 Feb 2006 13:35:32 -0000	1.64
@@ -82,7 +82,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 8.1.2
-Release: 1
+Release: 1.1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -819,6 +819,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Tom Lane <tgl at redhat.com> 8.1.2-1
 - Update to PostgreSQL 8.1.2
 - Repair extraneous quote in pgtcl configure script ... odd that bash



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:02 -0500
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.11,1.12
Message-ID: <200602071336.k17Da2n9006513@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6482

Modified Files:
	postgresql-odbc.spec 
Log Message:
bump for new gcc/glibc


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postgresql-odbc.spec	3 Feb 2006 22:15:42 -0000	1.11
+++ postgresql-odbc.spec	7 Feb 2006 13:35:59 -0000	1.12
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
 Version: 08.01.0200
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Applications/Databases
 Url: http://gborg.postgresql.org/project/psqlodbc
@@ -66,6 +66,9 @@
 %{_libdir}/psqlodbc.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 08.01.0200-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Tom Lane <tgl at redhat.com> 08.01.0200-1
 - Update to version 08.01.0200.
 - Upstream now calls the library psqlodbcw.so ... add a symlink to avoid



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:13 -0500
Subject: rpms/ppc64-utils/devel ppc64-utils.spec,1.16,1.17
Message-ID: <200602071336.k17DaDX8006640@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ppc64-utils.spec 
Log Message:
bump for new gcc/glibc


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ppc64-utils.spec	9 Dec 2005 22:42:46 -0000	1.16
+++ ppc64-utils.spec	7 Feb 2006 13:36:09 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.9
-Release: 12.1
+Release: 12.2
 License: GPL and OSL
 Group: System Environment/Base
 Source0: ppc64-utils-%{ppc64utilsver}.tar.gz
@@ -67,6 +67,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:23 -0500
Subject: rpms/ppp/devel ppp.spec,1.35,1.36
Message-ID: <200602071336.k17DaNul006772@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6741

Modified Files:
	ppp.spec 
Log Message:
bump for new gcc/glibc


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ppp.spec	9 Dec 2005 22:42:47 -0000	1.35
+++ ppp.spec	7 Feb 2006 13:36:20 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.3
-Release: 6.1
+Release: 6.2
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:37 -0500
Subject: rpms/prctl/devel prctl.spec,1.12,1.13
Message-ID: <200602071336.k17DaboU006927@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/prctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6897

Modified Files:
	prctl.spec 
Log Message:
bump for new gcc/glibc


Index: prctl.spec
===================================================================
RCS file: /cvs/dist/rpms/prctl/devel/prctl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- prctl.spec	9 Dec 2005 22:42:47 -0000	1.12
+++ prctl.spec	7 Feb 2006 13:36:34 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utility to perform process operations
 Name: prctl
 Version: 1.4
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: Applications/System
 URL:	http://sourceforge.net/projects/prctl
@@ -37,6 +37,9 @@
 %{_mandir}/man1/prctl.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:47 -0500
Subject: rpms/prelink/devel prelink.spec,1.31,1.32
Message-ID: <200602071336.k17DalQZ007052@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7022

Modified Files:
	prelink.spec 
Log Message:
bump for new gcc/glibc


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- prelink.spec	14 Dec 2005 12:24:34 -0000	1.31
+++ prelink.spec	7 Feb 2006 13:36:44 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.6
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 %define date 20051214
@@ -89,6 +89,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 12 2005 Jakub Jelinek <jakub at redhat.com> 0.3.6-2
 - rebuilt with GCC 4.1
 - link against newer glibc to fix MALLOC_PERTURB_ bug on 64-bit



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:36:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:36:57 -0500
Subject: rpms/privoxy/devel privoxy.spec,1.11,1.12
Message-ID: <200602071336.k17Davmf007182@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/privoxy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7150

Modified Files:
	privoxy.spec 
Log Message:
bump for new gcc/glibc


Index: privoxy.spec
===================================================================
RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- privoxy.spec	9 Dec 2005 22:42:47 -0000	1.11
+++ privoxy.spec	7 Feb 2006 13:36:55 -0000	1.12
@@ -38,7 +38,7 @@
 # Version and release should be updated acordingly on configure.in and
 # configure. Otherwise, the package can be build with the wrong value
 Version: 3.0.3
-Release: 9.1
+Release: 9.2
 Summary: Privoxy - privacy enhancing proxy
 License: GPL
 Source0: http://www.waldherr.org/%{name}/%{name}-%{version}-stable-src.tar.gz
@@ -328,6 +328,9 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.3-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:37:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:37:08 -0500
Subject: rpms/procinfo/devel procinfo.spec,1.17,1.18
Message-ID: <200602071337.k17Db8LC007305@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7275

Modified Files:
	procinfo.spec 
Log Message:
bump for new gcc/glibc


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- procinfo.spec	9 Dec 2005 22:42:48 -0000	1.17
+++ procinfo.spec	7 Feb 2006 13:37:05 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.1
+Release: 18.2
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 18-18.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:37:20 -0500
Subject: rpms/procmail/devel procmail.spec,1.16,1.17
Message-ID: <200602071337.k17DbKTf007438@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7413

Modified Files:
	procmail.spec 
Log Message:
bump for new gcc/glibc


Index: procmail.spec
===================================================================
RCS file: /cvs/dist/rpms/procmail/devel/procmail.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- procmail.spec	9 Dec 2005 22:42:48 -0000	1.16
+++ procmail.spec	7 Feb 2006 13:37:16 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The procmail mail processing program.
 Name: procmail
 Version: 3.22
-Release: 16.1
+Release: 16.2
 License: GPL or Artistic
 Group: System Environment/Daemons
 Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
@@ -58,6 +58,9 @@
 %{_mandir}/man[15]/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.22-16.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:37:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:37:32 -0500
Subject: rpms/procps/devel procps.spec,1.44,1.45
Message-ID: <200602071337.k17DbWGt007575@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	procps.spec 
Log Message:
bump for new gcc/glibc


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- procps.spec	15 Dec 2005 17:04:10 -0000	1.44
+++ procps.spec	7 Feb 2006 13:37:29 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -99,6 +99,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Dan Walsh <dwalsh at redhat.com> 3.2.6-3
 - Translate context
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:37:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:37:41 -0500
Subject: rpms/psacct/devel psacct.spec,1.18,1.19
Message-ID: <200602071337.k17DbfZD007705@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7672

Modified Files:
	psacct.spec 
Log Message:
bump for new gcc/glibc


Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- psacct.spec	3 Jan 2006 10:32:39 -0000	1.18
+++ psacct.spec	7 Feb 2006 13:37:39 -0000	1.19
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 38
+Release: 38.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -161,6 +161,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2-38.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan  3 2006 Ivana Varekova <varekova at redhat.com> 6.3.2-38
 - fix typo bug 176811
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:37:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:37:51 -0500
Subject: rpms/psmisc/devel psmisc.spec,1.23,1.24
Message-ID: <200602071337.k17DbprL007833@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7802

Modified Files:
	psmisc.spec 
Log Message:
bump for new gcc/glibc


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- psmisc.spec	9 Dec 2005 22:42:49 -0000	1.23
+++ psmisc.spec	7 Feb 2006 13:37:49 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 21.8
-Release: 1.1
+Release: 1.2
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 21.8-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:02 -0500
Subject: rpms/pstack/devel pstack.spec,1.15,1.16
Message-ID: <200602071338.k17Dc2CP007963@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pstack/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7931

Modified Files:
	pstack.spec 
Log Message:
bump for new gcc/glibc


Index: pstack.spec
===================================================================
RCS file: /cvs/dist/rpms/pstack/devel/pstack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pstack.spec	9 Dec 2005 22:42:49 -0000	1.15
+++ pstack.spec	7 Feb 2006 13:37:59 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Display stack trace of a running process
 Name: pstack
 Version: 1.2
-Release: 7.1
+Release: 7.2
 License: GPL
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
@@ -83,6 +83,9 @@
 %{_mandir}/man1/pstack.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:12 -0500
Subject: rpms/psutils/devel psutils.spec,1.12,1.13
Message-ID: <200602071338.k17DcCU8008086@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8054

Modified Files:
	psutils.spec 
Log Message:
bump for new gcc/glibc


Index: psutils.spec
===================================================================
RCS file: /cvs/dist/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- psutils.spec	9 Dec 2005 22:42:49 -0000	1.12
+++ psutils.spec	7 Feb 2006 13:38:09 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 25.1
+Release: 25.2
 License: distributable
 Group: Applications/Publishing
 Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz
@@ -46,6 +46,9 @@
 /usr/lib/psutils
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.17-25.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:22 -0500
Subject: rpms/pump/devel pump.spec,1.22,1.23
Message-ID: <200602071338.k17DcM0G008217@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8184

Modified Files:
	pump.spec 
Log Message:
bump for new gcc/glibc


Index: pump.spec
===================================================================
RCS file: /cvs/dist/rpms/pump/devel/pump.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pump.spec	9 Dec 2005 22:42:50 -0000	1.22
+++ pump.spec	7 Feb 2006 13:38:20 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A Bootp and DHCP client for automatic IP configuration.
 Name: pump
 Version: 0.8.24
-Release: 1.1
+Release: 1.2
 Group: System Environment/Daemons
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-root
@@ -75,6 +75,9 @@
 %{_sbindir}/netconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:32 -0500
Subject: rpms/pwlib/devel pwlib.spec,1.27,1.28
Message-ID: <200602071338.k17DcWu8008342@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pwlib.spec 
Log Message:
bump for new gcc/glibc


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pwlib.spec	24 Jan 2006 14:13:02 -0000	1.27
+++ pwlib.spec	7 Feb 2006 13:38:30 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.9.2
-Release:        1
+Release:        1.1
 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
@@ -93,6 +93,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Daniel Veillard <veillard at redhat.com> - 1.9.2-1
 - beta version of next release for ekiga
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:43 -0500
Subject: rpms/pycairo/devel pycairo.spec,1.4,1.5
Message-ID: <200602071338.k17DchAo008465@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pycairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8434

Modified Files:
	pycairo.spec 
Log Message:
bump for new gcc/glibc


Index: pycairo.spec
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pycairo.spec	9 Dec 2005 22:42:51 -0000	1.4
+++ pycairo.spec	7 Feb 2006 13:38:39 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Python bindings for the cairo library
 Name: pycairo
 Version: 1.0.2 
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Development/Languages
 URL: http://cairographics.org/
@@ -56,6 +56,9 @@
 %{_includedir}/pycairo/pycairo.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:38:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:38:52 -0500
Subject: rpms/pygtk2/devel pygtk.spec,1.44,1.45
Message-ID: <200602071338.k17Dcq7d008597@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pygtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8568

Modified Files:
	pygtk.spec 
Log Message:
bump for new gcc/glibc


Index: pygtk.spec
===================================================================
RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pygtk.spec	16 Jan 2006 01:34:08 -0000	1.44
+++ pygtk.spec	7 Feb 2006 13:38:49 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: Python bindings for the GTK+ widget set.
 Name: pygtk2
 Version: 2.8.4
-Release: 1
+Release: 1.1
 License: LGPL
 Group: Development/Languages
 Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2
@@ -109,6 +109,9 @@
 %{_prefix}/share/pygtk/2.0/defs/pangocairo.override
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 15 2006 Christopher Aillon <caillon at redhat.com> - 2.8.4-1
 - Bump to upstream 2.8.4
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:39:02 -0500
Subject: rpms/pyOpenSSL/devel pyOpenSSL.spec,1.19,1.20
Message-ID: <200602071339.k17Dd2J8008727@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyOpenSSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8696

Modified Files:
	pyOpenSSL.spec 
Log Message:
bump for new gcc/glibc


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/dist/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pyOpenSSL.spec	9 Dec 2005 22:42:51 -0000	1.19
+++ pyOpenSSL.spec	7 Feb 2006 13:38:59 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.6
-Release: 1.p24.7.1
+Release: 1.p24.7.2
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.5.1-openssl097.patch
 Patch2: pyOpenSSL-elinks.patch
@@ -57,6 +57,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.p24.7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:39:14 -0500
Subject: rpms/pyorbit/devel pyorbit.spec,1.15,1.16
Message-ID: <200602071339.k17DdEZr008865@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8835

Modified Files:
	pyorbit.spec 
Log Message:
bump for new gcc/glibc


Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pyorbit.spec	9 Dec 2005 22:42:52 -0000	1.15
+++ pyorbit.spec	7 Feb 2006 13:39:11 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: Python bindings for ORBit2.
 Name: pyorbit
 Version: 2.0.1
-Release: 4.1
+Release: 4.2
 License: LGPL
 Group: Development/Languages
 Source: %{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.1-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:39:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:39:25 -0500
Subject: rpms/pyparted/devel pyparted.spec,1.16,1.17
Message-ID: <200602071339.k17DdPp4009007@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8976

Modified Files:
	pyparted.spec 
Log Message:
bump for new gcc/glibc


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pyparted.spec	9 Dec 2005 22:42:52 -0000	1.16
+++ pyparted.spec	7 Feb 2006 13:39:22 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: python module for parted
 Name: pyparted
 Version: 1.6.10
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:39:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:39:35 -0500
Subject: rpms/PyQt/devel PyQt.spec,1.24,1.25
Message-ID: <200602071339.k17DdZbr009131@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9101

Modified Files:
	PyQt.spec 
Log Message:
bump for new gcc/glibc


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- PyQt.spec	9 Dec 2005 22:39:30 -0000	1.24
+++ PyQt.spec	7 Feb 2006 13:39:33 -0000	1.25
@@ -16,7 +16,7 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.15
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -95,6 +95,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:39:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:39:49 -0500
Subject: rpms/python/devel python.spec,1.62,1.63
Message-ID: <200602071339.k17DdnOA009288@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python.spec 
Log Message:
bump for new gcc/glibc


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- python.spec	24 Jan 2006 20:42:27 -0000	1.62
+++ python.spec	7 Feb 2006 13:39:46 -0000	1.63
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.2
-Release: 3
+Release: 3.1
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -359,6 +359,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:40:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:40:02 -0500
Subject: rpms/python-elementtree/devel python-elementtree.spec,1.2,1.3
Message-ID: <200602071340.k17De28N009432@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-elementtree.spec 
Log Message:
bump for new gcc/glibc


Index: python-elementtree.spec
===================================================================
RCS file: /cvs/dist/rpms/python-elementtree/devel/python-elementtree.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-elementtree.spec	9 Dec 2005 22:42:53 -0000	1.2
+++ python-elementtree.spec	7 Feb 2006 13:40:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name: python-elementtree
 Version: 1.2.6
-Release: 4.1
+Release: 4.2
 Summary: Fast XML parser and writer
 Group: Development/Libraries
 License: PSF
@@ -67,6 +67,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.6-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:40:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:40:14 -0500
Subject: rpms/python-ldap/devel python-ldap.spec,1.12,1.13
Message-ID: <200602071340.k17DeEbG009569@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-ldap.spec 
Log Message:
bump for new gcc/glibc


Index: python-ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-ldap.spec	9 Dec 2005 22:42:53 -0000	1.12
+++ python-ldap.spec	7 Feb 2006 13:40:11 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           python-ldap
 Version:        2.0.6
-Release: 5.1
+Release: 5.2
 Epoch:          0
 Summary:        An object-oriented API to access LDAP directory servers.
 
@@ -49,6 +49,9 @@
 %doc LICENCE CHANGES README TODO Demo
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.6-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:40:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:40:26 -0500
Subject: rpms/python-numeric/devel python-numeric.spec,1.4,1.5
Message-ID: <200602071340.k17DeQ4t009696@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-numeric.spec 
Log Message:
bump for new gcc/glibc


Index: python-numeric.spec
===================================================================
RCS file: /cvs/dist/rpms/python-numeric/devel/python-numeric.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-numeric.spec	9 Dec 2005 22:42:53 -0000	1.4
+++ python-numeric.spec	7 Feb 2006 13:40:24 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Numerical Extension to Python
 Name: python-numeric
 Version: 23.7
-Release: 2.1
+Release: 2.2
 License: Python
 Group: Development/Languages
 URL: http://numpy.sourceforge.net
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 23.7-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:40:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:40:36 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.5,1.6
Message-ID: <200602071340.k17DearF009820@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-sqlite.spec 
Log Message:
bump for new gcc/glibc


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-sqlite.spec	3 Feb 2006 22:21:07 -0000	1.5
+++ python-sqlite.spec	7 Feb 2006 13:40:34 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Python bindings for sqlite.
 Name: python-sqlite
 Version: 1.1.7
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Libraries
 URL: http://pysqlite.org/
@@ -36,6 +36,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.7-1
 - Upgrade to latest upstream 1.1.x series
 - sqlite_prepare fix now upstream



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:40:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:40:46 -0500
Subject: rpms/pyxf86config/devel pyxf86config.spec,1.22,1.23
Message-ID: <200602071340.k17DekY0009940@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9910

Modified Files:
	pyxf86config.spec 
Log Message:
bump for new gcc/glibc


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pyxf86config.spec	17 Jan 2006 06:34:13 -0000	1.22
+++ pyxf86config.spec	7 Feb 2006 13:40:44 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.23
-Release: 1
+Release: 1.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.23-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Christopher Aillon <caillon at redhat.com> 0.3.23-1
 - Use the standard X headers instead of keeping a copy in-tree
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:41:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:41:04 -0500
Subject: rpms/PyXML/devel PyXML.spec,1.19,1.20
Message-ID: <200602071341.k17Df4Tj010113@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyXML/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10084

Modified Files:
	PyXML.spec 
Log Message:
bump for new gcc/glibc


Index: PyXML.spec
===================================================================
RCS file: /cvs/dist/rpms/PyXML/devel/PyXML.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PyXML.spec	9 Dec 2005 22:39:30 -0000	1.19
+++ PyXML.spec	7 Feb 2006 13:41:01 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: XML libraries for python.
 Name: PyXML
 Version: 0.8.4
-Release: 3.1
+Release: 3.2
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
@@ -47,6 +47,9 @@
 %{_libdir}/python%pyver/site-packages/_xmlplus/
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:41:15 -0500
Subject: rpms/qt/devel qt.spec,1.98,1.99
Message-ID: <200602071341.k17DfFQZ010243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10214

Modified Files:
	qt.spec 
Log Message:
bump for new gcc/glibc


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- qt.spec	17 Jan 2006 14:19:05 -0000	1.98
+++ qt.spec	7 Feb 2006 13:41:12 -0000	1.99
@@ -85,7 +85,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 12
+Release: 12.1
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -740,6 +740,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.5-12.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Than Ngo <than at redhat.com> 1:3.3.5-12
 - add BuildRequires on mesa-libGL-devel
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:41:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:41:31 -0500
Subject: rpms/quagga/devel quagga.spec,1.28,1.29
Message-ID: <200602071341.k17DfVxK010408@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quagga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10380

Modified Files:
	quagga.spec 
Log Message:
bump for new gcc/glibc


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- quagga.spec	9 Dec 2005 22:42:55 -0000	1.28
+++ quagga.spec	7 Feb 2006 13:41:28 -0000	1.29
@@ -31,7 +31,7 @@
 Summary: Routing daemon
 Name:		quagga
 Version:	0.98.5
-Release: 3.1
+Release: 3.2
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -345,6 +345,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.98.5-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:41:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:41:45 -0500
Subject: rpms/quota/devel quota.spec,1.24,1.25
Message-ID: <200602071341.k17DfjEI010561@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quota/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10530

Modified Files:
	quota.spec 
Log Message:
bump for new gcc/glibc


Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/devel/quota.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- quota.spec	9 Dec 2005 22:42:56 -0000	1.24
+++ quota.spec	7 Feb 2006 13:41:43 -0000	1.25
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.13
-Release: 1.1
+Release: 1.2
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:41:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:41:55 -0500
Subject: rpms/rarpd/devel rarpd.spec,1.15,1.16
Message-ID: <200602071341.k17DftBG010687@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rarpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10656

Modified Files:
	rarpd.spec 
Log Message:
bump for new gcc/glibc


Index: rarpd.spec
===================================================================
RCS file: /cvs/dist/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rarpd.spec	9 Dec 2005 22:42:56 -0000	1.15
+++ rarpd.spec	7 Feb 2006 13:41:53 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 22.1
+Release: 22.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - ss981107-22.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:05 -0500
Subject: rpms/rcs/devel rcs.spec,1.14,1.15
Message-ID: <200602071342.k17Dg5YL010816@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rcs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10786

Modified Files:
	rcs.spec 
Log Message:
bump for new gcc/glibc


Index: rcs.spec
===================================================================
RCS file: /cvs/dist/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rcs.spec	9 Dec 2005 22:42:56 -0000	1.14
+++ rcs.spec	7 Feb 2006 13:42:03 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 29.1
+Release: 29.2
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -55,6 +55,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.7-29.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:15 -0500
Subject: rpms/rdate/devel rdate.spec,1.16,1.17
Message-ID: <200602071342.k17DgF4c010939@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10911

Modified Files:
	rdate.spec 
Log Message:
bump for new gcc/glibc


Index: rdate.spec
===================================================================
RCS file: /cvs/dist/rpms/rdate/devel/rdate.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rdate.spec	9 Dec 2005 22:42:57 -0000	1.16
+++ rdate.spec	7 Feb 2006 13:42:13 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Tool for getting the date/time from a remote machine.
 Name: rdate
 Version: 1.4
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/System
 Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz
@@ -34,6 +34,9 @@
 %{_mandir}/man1/rdate.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:26 -0500
Subject: rpms/rdesktop/devel rdesktop.spec,1.19,1.20
Message-ID: <200602071342.k17DgQm6011068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11036

Modified Files:
	rdesktop.spec 
Log Message:
bump for new gcc/glibc


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rdesktop.spec	9 Dec 2005 22:42:57 -0000	1.19
+++ rdesktop.spec	7 Feb 2006 13:42:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.4.1
-Release: 3.1
+Release: 3.2
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:37 -0500
Subject: rpms/rdist/devel rdist.spec,1.17,1.18
Message-ID: <200602071342.k17DgbUN011196@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11165

Modified Files:
	rdist.spec 
Log Message:
bump for new gcc/glibc


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rdist.spec	9 Dec 2005 22:42:57 -0000	1.17
+++ rdist.spec	7 Feb 2006 13:42:34 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 42.1
+Release: 42.2
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -87,6 +87,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-42.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:48 -0500
Subject: rpms/readahead/devel readahead.spec,1.23,1.24
Message-ID: <200602071342.k17Dgm8F011338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11300

Modified Files:
	readahead.spec 
Log Message:
bump for new gcc/glibc


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- readahead.spec	13 Jan 2006 09:24:42 -0000	1.23
+++ readahead.spec	7 Feb 2006 13:42:45 -0000	1.24
@@ -76,6 +76,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release:	:.1 1.23.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Karel Zak <kzak at redhat.com>
 - check & cleanup list of files by readahead-gen script
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:42:58 -0500
Subject: rpms/readline/devel readline.spec,1.24,1.25
Message-ID: <200602071342.k17DgwYD011455@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readline/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11427

Modified Files:
	readline.spec 
Log Message:
bump for new gcc/glibc


Index: readline.spec
===================================================================
RCS file: /cvs/dist/rpms/readline/devel/readline.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- readline.spec	9 Dec 2005 22:42:58 -0000	1.24
+++ readline.spec	7 Feb 2006 13:42:55 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A library for editing typed command lines.
 Name: readline
 Version: 5.0
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -100,6 +100,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:43:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:43:11 -0500
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.119,1.120
Message-ID: <200602071343.k17DhBwn011599@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11566

Modified Files:
	redhat-artwork.spec 
Log Message:
bump for new gcc/glibc


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- redhat-artwork.spec	5 Feb 2006 07:03:41 -0000	1.119
+++ redhat-artwork.spec	7 Feb 2006 13:43:08 -0000	1.120
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.237
-Release: 1
+Release: 1.1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -154,6 +154,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.237-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Matthias Clasen <mclasen at redhat.com> 0.237-1
 - Fix Bluecurve-inverse wait cursor
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:43:23 -0500
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.14,1.15
Message-ID: <200602071343.k17DhNnt011734@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11704

Modified Files:
	redhat-lsb.spec 
Log Message:
bump for new gcc/glibc


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- redhat-lsb.spec	13 Jan 2006 03:50:11 -0000	1.14
+++ redhat-lsb.spec	7 Feb 2006 13:43:21 -0000	1.15
@@ -48,7 +48,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.0
-Release: 9
+Release: 9.1
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{lsbrelver}.tar.gz
@@ -395,6 +395,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Leon Ho <llch at redhat.com> 3.0-9
 - Migrated back to rawhide
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:43:35 -0500
Subject: rpms/regexp/devel regexp.spec,1.27,1.28
Message-ID: <200602071343.k17DhZ6F011869@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11836

Modified Files:
	regexp.spec 
Log Message:
bump for new gcc/glibc


Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- regexp.spec	22 Dec 2005 02:07:32 -0000	1.27
+++ regexp.spec	7 Feb 2006 13:43:32 -0000	1.28
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release 	2jpp_4fc
+%define release 	2jpp_5fc
 %define section		free
 
 Name:           %{name}
@@ -94,6 +94,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.2-2jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:43:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:43:45 -0500
Subject: rpms/reiserfs-utils/devel reiserfs-utils.spec,1.9,1.10
Message-ID: <200602071343.k17DhjdG011988@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	reiserfs-utils.spec 
Log Message:
bump for new gcc/glibc


Index: reiserfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/reiserfs-utils/devel/reiserfs-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- reiserfs-utils.spec	9 Dec 2005 22:42:59 -0000	1.9
+++ reiserfs-utils.spec	7 Feb 2006 13:43:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name: reiserfs-utils
 Version: 3.6.19
-Release: 2.1
+Release: 2.2
 Summary: Tools for creating, repairing, and debugging ReiserFS filesystems.
 URL: http://www.namesys.com/
 Source: ftp://namesys.com/pub/reiserfsprogs/reiserfsprogs-%{version}.tar.gz
@@ -64,6 +64,9 @@
 rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
+* 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
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:43:55 -0500
Subject: rpms/rgmanager/devel rgmanager.spec,1.20,1.21
Message-ID: <200602071343.k17Dhtgw012125@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12101

Modified Files:
	rgmanager.spec 
Log Message:
bump for new gcc/glibc


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rgmanager.spec	16 Dec 2005 22:12:21 -0000	1.20
+++ rgmanager.spec	7 Feb 2006 13:43:53 -0000	1.21
@@ -12,7 +12,7 @@
 
 Name: rgmanager
 Version: 1.9.44
-Release: 0.FC5.1
+Release: 0.FC5.1.1
 License: GPL,LGPL
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Enterprise Linux
@@ -70,6 +70,9 @@
 %config /etc/rc.d/init.d/rgmanager
 
 %changelog
+* 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
+
 * Fri Dec 16 2005 Chris Feist <cfeist at redhat.com>
 - Rebuilt with new upstream sources.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:06 -0500
Subject: rpms/rhdb-utils/devel rhdb-utils.spec,1.10,1.11
Message-ID: <200602071344.k17Di6wY012277@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	rhdb-utils.spec 
Log Message:
bump for new gcc/glibc


Index: rhdb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rhdb-utils/devel/rhdb-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rhdb-utils.spec	9 Dec 2005 22:43:00 -0000	1.10
+++ rhdb-utils.spec	7 Feb 2006 13:44:03 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition.
 Name: rhdb-utils
 Version: 8.1.1
-Release: 1.1
+Release: 1.2
 URL: http://sources.redhat.com/rhdb/
 License: GPL
 Group: Applications/Databases
@@ -50,6 +50,9 @@
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:17 -0500
Subject: rpms/rhgb/devel rhgb.spec,1.46,1.47
Message-ID: <200602071344.k17DiH3J012412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12382

Modified Files:
	rhgb.spec 
Log Message:
bump for new gcc/glibc


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- rhgb.spec	25 Jan 2006 20:03:05 -0000	1.46
+++ rhgb.spec	7 Feb 2006 13:44:14 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.2
-Release: 21
+Release: 21.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Ray Strode <rstrode at redhat.com> 0.16.2-21
 - add lame hack to scale logos down if in low resolutions (bug 178737)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:27 -0500
Subject: rpms/rhn-applet/devel applet.spec,1.34,1.35
Message-ID: <200602071344.k17DiRfS012545@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhn-applet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12515

Modified Files:
	applet.spec 
Log Message:
bump for new gcc/glibc


Index: applet.spec
===================================================================
RCS file: /cvs/dist/rpms/rhn-applet/devel/applet.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- applet.spec	9 Dec 2005 22:43:00 -0000	1.34
+++ applet.spec	7 Feb 2006 13:44:25 -0000	1.35
@@ -10,7 +10,7 @@
 Name: rhn-applet
 URL: https://rhn.redhat.com/
 Version: 2.1.17
-Release: 4.1
+Release: 4.2
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: python >= 2.2.1
 BuildRequires: python-devel >= 2.2.1
@@ -82,6 +82,9 @@
 %doc doc/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.17-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:37 -0500
Subject: rpms/rhpl/devel rhpl.spec,1.63,1.64
Message-ID: <200602071344.k17Dibmo012677@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12645

Modified Files:
	rhpl.spec 
Log Message:
bump for new gcc/glibc


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- rhpl.spec	21 Dec 2005 21:37:37 -0000	1.63
+++ rhpl.spec	7 Feb 2006 13:44:35 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
 Version: 0.180
-Release: 1
+Release: 1.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,6 +39,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.180-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Chris Lumens <clumens at redhat.com> 0.180-1
 - Deprecate rhpl.log.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:48 -0500
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.49,1.50
Message-ID: <200602071344.k17DimJG012797@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12766

Modified Files:
	rhythmbox.spec 
Log Message:
bump for new gcc/glibc


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- rhythmbox.spec	4 Feb 2006 20:10:49 -0000	1.49
+++ rhythmbox.spec	7 Feb 2006 13:44:45 -0000	1.50
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.3.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sat Feb  4 2006 Christopher Aillon <caillon at redhat.com> 0.9.3.1-1
 - Update to 0.9.3.1
 - Use gstreamer (0.10)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:44:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:44:59 -0500
Subject: rpms/ipsec-tools/devel .cvsignore, 1.8, 1.9 ipsec-tools.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200602071344.k17Dixnd012934@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12895

Modified Files:
	.cvsignore ipsec-tools.spec sources 
Log Message:
- version 0.6.4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Dec 2005 10:32:29 -0000	1.8
+++ .cvsignore	7 Feb 2006 13:44:56 -0000	1.9
@@ -1 +1 @@
-ipsec-tools-0.6.3.tar.bz2
+ipsec-tools-0.6.4.tar.bz2


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ipsec-tools.spec	7 Feb 2006 12:17:01 -0000	1.21
+++ ipsec-tools.spec	7 Feb 2006 13:44:56 -0000	1.22
@@ -1,6 +1,6 @@
 Name: ipsec-tools
-Version: 0.6.3
-Release: 1.2
+Version: 0.6.4
+Release: 1
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -90,6 +90,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> 0.6.4-1
+- version 0.6.4
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Dec 2005 10:32:29 -0000	1.8
+++ sources	7 Feb 2006 13:44:56 -0000	1.9
@@ -1 +1 @@
-8070f90402919d8d313c32c2ee465b2f  ipsec-tools-0.6.3.tar.bz2
+d0242a943c82c0cbf28005966ff35e21  ipsec-tools-0.6.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:45:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:45:05 -0500
Subject: rpms/rpm/devel rpm.spec,1.193,1.194
Message-ID: <200602071345.k17Dj11V012952@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12911

Modified Files:
	rpm.spec 
Log Message:
bump for new gcc/glibc


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- rpm.spec	31 Jan 2006 16:20:31 -0000	1.193
+++ rpm.spec	7 Feb 2006 13:44:57 -0000	1.194
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 15
+Release: 15.1
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -568,6 +568,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.4.2-15.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-15
 - Rebuild for newer neon
 - Fix scriptlet deadlock (#146549)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:45:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:45:25 -0500
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.33,1.34
Message-ID: <200602071345.k17DjPah013152@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rp-pppoe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13115

Modified Files:
	rp-pppoe.spec 
Log Message:
bump for new gcc/glibc


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/dist/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rp-pppoe.spec	9 Dec 2005 22:43:02 -0000	1.33
+++ rp-pppoe.spec	7 Feb 2006 13:45:23 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.5
-Release: 30.1
+Release: 30.2
 License: GPL
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -150,6 +150,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5-30.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:45:39 -0500
Subject: rpms/rsh/devel rsh.spec,1.24,1.25
Message-ID: <200602071345.k17Djdne014484@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14162

Modified Files:
	rsh.spec 
Log Message:
bump for new gcc/glibc


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rsh.spec	9 Dec 2005 22:43:02 -0000	1.24
+++ rsh.spec	7 Feb 2006 13:45:37 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 33.1
+Release: 33.2
 License: BSD
 Group: Applications/Internet
 
@@ -175,6 +175,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-33.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:45:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:45:52 -0500
Subject: rpms/rsync/devel rsync.spec,1.33,1.34
Message-ID: <200602071345.k17DjqUF015911@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsync/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15482

Modified Files:
	rsync.spec 
Log Message:
bump for new gcc/glibc


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rsync.spec	9 Dec 2005 22:43:02 -0000	1.33
+++ rsync.spec	7 Feb 2006 13:45:50 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.6
-Release: 2.1
+Release: 2.2
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.6-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:46:10 -0500
Subject: rpms/ruby/devel ruby.spec,1.53,1.54
Message-ID: <200602071346.k17DkAnZ018121@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17888

Modified Files:
	ruby.spec 
Log Message:
bump for new gcc/glibc


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ruby.spec	6 Feb 2006 04:21:50 -0000	1.53
+++ ruby.spec	7 Feb 2006 13:46:07 -0000	1.54
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	3
+Release:	3.1
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -420,6 +420,9 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-3
 - ruby-1.8.4-no-eaccess.patch: backported from ruby CVS to avoid conflict
   between newer glibc. (#179835)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:46:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:46:27 -0500
Subject: rpms/rusers/devel rusers.spec,1.18,1.19
Message-ID: <200602071346.k17DkROV020328@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rusers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20090

Modified Files:
	rusers.spec 
Log Message:
bump for new gcc/glibc


Index: rusers.spec
===================================================================
RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rusers.spec	9 Dec 2005 22:43:04 -0000	1.18
+++ rusers.spec	7 Feb 2006 13:46:24 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 45.1
+Release: 45.2
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -140,6 +140,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-45.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:46:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:46:45 -0500
Subject: rpms/rwall/devel rwall.spec,1.16,1.17
Message-ID: <200602071346.k17DkjpF022348@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwall/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22101

Modified Files:
	rwall.spec 
Log Message:
bump for new gcc/glibc


Index: rwall.spec
===================================================================
RCS file: /cvs/dist/rpms/rwall/devel/rwall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rwall.spec	9 Dec 2005 22:43:04 -0000	1.16
+++ rwall.spec	7 Feb 2006 13:46:42 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Client for sending messages to a host's logged in users.
 Name: rwall
 Version: 0.17
-Release: 25.1
+Release: 25.2
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwall-%{version}.tar.gz
@@ -100,6 +100,9 @@
 %config /etc/rc.d/init.d/rwalld
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:46:58 -0500
Subject: rpms/rwho/devel rwho.spec,1.14,1.15
Message-ID: <200602071346.k17Dkw3V023525@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwho/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23132

Modified Files:
	rwho.spec 
Log Message:
bump for new gcc/glibc


Index: rwho.spec
===================================================================
RCS file: /cvs/dist/rpms/rwho/devel/rwho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rwho.spec	9 Dec 2005 22:43:05 -0000	1.14
+++ rwho.spec	7 Feb 2006 13:46:55 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines.
 Name: rwho
 Version: 0.17
-Release: 25.1
+Release: 25.2
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-%{version}.tar.gz
@@ -98,6 +98,9 @@
 %config /etc/rc.d/init.d/rwhod
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:47:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:47:11 -0500
Subject: rpms/s390utils/devel s390utils.spec,1.32,1.33
Message-ID: <200602071347.k17DlBbg025322@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/s390utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24888

Modified Files:
	s390utils.spec 
Log Message:
bump for new gcc/glibc


Index: s390utils.spec
===================================================================
RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- s390utils.spec	30 Jan 2006 17:37:24 -0000	1.32
+++ s390utils.spec	7 Feb 2006 13:47:08 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: Linux/390 specific utilities.
 Name: s390utils
 Version: 1.5.0
-Release: 2
+Release: 2.1
 Epoch: 2
 License: GPL
 Group: System Environment/Base
@@ -146,6 +146,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.5.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Phil Knirsch <pknirsch at redhat.com> 2:1.5.0-2
 - Fixed problem with s390-tools-1.5.0-fdasd-raid.patch
 - Don't try to remove the non empty _bindir



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:47:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:47:24 -0500
Subject: rpms/sane-backends/devel sane-backends.spec,1.50,1.51
Message-ID: <200602071347.k17DlOBc026655@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26636

Modified Files:
	sane-backends.spec 
Log Message:
bump for new gcc/glibc


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sane-backends.spec	25 Jan 2006 21:10:50 -0000	1.50
+++ sane-backends.spec	7 Feb 2006 13:47:22 -0000	1.51
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 3
+Release: 3.1
 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
@@ -133,6 +133,9 @@
 %{_libdir}/sane/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Bill Nottingham <notting at redhat.com> 1.0.17-3
 - ship udev rules for device creation (#177650). Require udev
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:47:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:47:37 -0500
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.17,1.18
Message-ID: <200602071347.k17DlbpR026796@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-frontends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26766

Modified Files:
	sane-frontends.spec 
Log Message:
bump for new gcc/glibc


Index: sane-frontends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sane-frontends.spec	9 Dec 2005 22:43:06 -0000	1.17
+++ sane-frontends.spec	7 Feb 2006 13:47:35 -0000	1.18
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 1.1
+Release: 1.2
 Summary: Graphical frontend to SANE
 URL:       http://www.sane-project.org
 Source0:    ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.14-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:47:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:47:49 -0500
Subject: rpms/screen/devel screen.spec,1.25,1.26
Message-ID: <200602071347.k17Dln7p026933@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26904

Modified Files:
	screen.spec 
Log Message:
bump for new gcc/glibc


Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- screen.spec	17 Jan 2006 16:13:50 -0000	1.25
+++ screen.spec	7 Feb 2006 13:47:46 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
 Version: 4.0.2
-Release: 11
+Release: 11.1
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -175,6 +175,9 @@
 %config /etc/pam.d/screen
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-11.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Petr Rockai <prockai at redhat.com> - 4.0.2-11
 - change the default lockscreen shortcut to ^aX to make
   it harder to hit by accident, as per BR 157821



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:47:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:47:59 -0500
Subject: rpms/scrollkeeper/devel scrollkeeper.spec,1.17,1.18
Message-ID: <200602071347.k17DlxEO027057@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27026

Modified Files:
	scrollkeeper.spec 
Log Message:
bump for new gcc/glibc


Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scrollkeeper.spec	9 Dec 2005 22:43:10 -0000	1.17
+++ scrollkeeper.spec	7 Feb 2006 13:47:56 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
 Name:       scrollkeeper
 Version:    0.3.14
-Release: 5.1
+Release: 5.2
 Source0:    http://download.sourceforge.net/scrollkeeper/%{name}-%{version}.tar.gz
 License:    LGPL
 Group:      System Environment/Base
@@ -120,6 +120,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.14-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:48:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:48:13 -0500
Subject: rpms/SDL/devel SDL.spec,1.35,1.36
Message-ID: <200602071348.k17DmDxa027205@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27174

Modified Files:
	SDL.spec 
Log Message:
bump for new gcc/glibc


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SDL.spec	27 Jan 2006 13:21:32 -0000	1.35
+++ SDL.spec	7 Feb 2006 13:48:10 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.9
-Release: 5
+Release: 5.1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.1.7-byteorder.patch
 Patch13: SDL-1.2.7-ppc_modes.patch
@@ -102,6 +102,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Thomas Woerner <twoerner at redhat.com> 1.2.9-5
 - added upstream no exec stack patch
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:48:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:48:25 -0500
Subject: rpms/sed/devel sed.spec,1.28,1.29
Message-ID: <200602071348.k17DmPau027342@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27305

Modified Files:
	sed.spec 
Log Message:
bump for new gcc/glibc


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sed.spec	6 Feb 2006 08:52:44 -0000	1.28
+++ sed.spec	7 Feb 2006 13:48:22 -0000	1.29
@@ -5,7 +5,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Florian La Roche <laroche at redhat.com>
 - 4.1.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:48:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:48:29 -0500
Subject: rpms/aqbanking/devel aqbanking.spec,1.11,1.12
Message-ID: <200602071348.k17DmTTx027374@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27335

Modified Files:
	aqbanking.spec 
Log Message:
- buildrequire libofx-devel instead of libofx (pulls in libofx)


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aqbanking.spec	7 Feb 2006 10:53:44 -0000	1.11
+++ aqbanking.spec	7 Feb 2006 13:48:25 -0000	1.12
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 1.8.1beta
-Release: 2.1
+Release: 3
 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 >= 0.7.0
+BuildRequires: libofx-devel >= 0.7.0
 Prereq: /sbin/ldconfig
 Obsoletes: aqhbci, aqhbci-qt-tools
 
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Karsten Hopp <karsten at redhat.de> 1.8.1beta-3
+- buildrequire libofx-devel instead of libofx (pulls in libofx)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.1beta-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:48:39 -0500
Subject: rpms/sendmail/devel sendmail.spec,1.62,1.63
Message-ID: <200602071348.k17DmdeM027529@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27499

Modified Files:
	sendmail.spec 
Log Message:
bump for new gcc/glibc


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sendmail.spec	9 Dec 2005 22:43:11 -0000	1.62
+++ sendmail.spec	7 Feb 2006 13:48:36 -0000	1.63
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.5
-Release: 2.1
+Release: 2.2
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -572,6 +572,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.13.5-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:48:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:48:53 -0500
Subject: rpms/setarch/devel setarch.spec,1.11,1.12
Message-ID: <200602071348.k17DmrU4027686@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setarch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27651

Modified Files:
	setarch.spec 
Log Message:
bump for new gcc/glibc


Index: setarch.spec
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/setarch.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setarch.spec	9 Dec 2005 22:43:11 -0000	1.11
+++ setarch.spec	7 Feb 2006 13:48:51 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Personality setter
 Name: setarch
 Version: 1.8
-Release: 1.1
+Release: 1.2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Kernel
@@ -54,6 +54,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:49:05 -0500
Subject: rpms/setools/devel setools.spec,1.49,1.50
Message-ID: <200602071349.k17Dn546027816@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27782

Modified Files:
	setools.spec 
Log Message:
bump for new gcc/glibc


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- setools.spec	31 Jan 2006 21:25:24 -0000	1.49
+++ setools.spec	7 Feb 2006 13:49:02 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -234,6 +234,9 @@
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3-1
 - Update from upstream
   * apol:



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:49:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:49:33 -0500
Subject: rpms/setserial/devel setserial.spec,1.15,1.16
Message-ID: <200602071349.k17DnXfr028068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28037

Modified Files:
	setserial.spec 
Log Message:
bump for new gcc/glibc


Index: setserial.spec
===================================================================
RCS file: /cvs/dist/rpms/setserial/devel/setserial.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- setserial.spec	9 Dec 2005 22:43:12 -0000	1.15
+++ setserial.spec	7 Feb 2006 13:49:31 -0000	1.16
@@ -3,7 +3,7 @@
 Summary: A utility for configuring serial ports.
 Name: setserial
 Version: 2.17
-Release: 19.1
+Release: 19.2
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: setserial-2.17-fhs.patch
 Patch1: setserial-2.17-rc.patch
@@ -52,6 +52,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.17-19.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:49:52 -0500
Subject: rpms/setuptool/devel setuptool.spec,1.22,1.23
Message-ID: <200602071349.k17DnqA3028261@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setuptool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28231

Modified Files:
	setuptool.spec 
Log Message:
bump for new gcc/glibc


Index: setuptool.spec
===================================================================
RCS file: /cvs/dist/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- setuptool.spec	30 Jan 2006 02:46:22 -0000	1.22
+++ setuptool.spec	7 Feb 2006 13:49:50 -0000	1.23
@@ -2,7 +2,7 @@
 # named "setup".  Oh, well.
 Name: setuptool
 Version: 1.18.1
-Release: 1
+Release: 1.1
 Summary: A text mode system configuration tool.
 License: GPL
 Group: Applications/System
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 29 2006 Nalin Dahyabhai <nalin at redhat.com> 1.18.1-1
 - add missing dependency on usermode (#179230)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:50:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:50:04 -0500
Subject: rpms/sg3_utils/devel sg3_utils.spec,1.8,1.9
Message-ID: <200602071350.k17Do48o028416@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28383

Modified Files:
	sg3_utils.spec 
Log Message:
bump for new gcc/glibc


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sg3_utils.spec	8 Nov 2005 11:05:13 -0000	1.8
+++ sg3_utils.spec	7 Feb 2006 13:50:02 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Utils for Linux's SCSI generic driver devices + raw devices
 Name: sg3_utils
 Version: 1.17
-Release: 1
+Release: 1.1
 License: GPL
 Group: Utilities/System
 Source: ftp://www.torque.net/sg/p/sg3_utils-%{version}.tgz
@@ -72,6 +72,9 @@
 %{_libdir}/*.la
  
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.17-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Nov 07 2005 Phil Knirsch <pknirsch at redhat.com> 1.17-1
 - Update to sg3-utils-1.17
 - Split package up into 3 subpackages: sg3_utils, devel and libs



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:50:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:50:15 -0500
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.65,1.66
Message-ID: <200602071350.k17DoFut028541@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	shadow-utils.spec 
Log Message:
bump for new gcc/glibc


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- shadow-utils.spec	6 Jan 2006 09:56:57 -0000	1.65
+++ shadow-utils.spec	7 Feb 2006 13:50:13 -0000	1.66
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.14
-Release: 1
+Release: 1.1
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -197,6 +197,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:4.0.14-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 06 2006 Peter Vrabec <pvrabec at redhat.com> 2:4.0.14-1
 - upgrade
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:50:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:50:28 -0500
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.31,1.32
Message-ID: <200602071350.k17DoSIS028677@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28646

Modified Files:
	shared-mime-info.spec 
Log Message:
bump for new gcc/glibc


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- shared-mime-info.spec	30 Jan 2006 10:14:34 -0000	1.31
+++ shared-mime-info.spec	7 Feb 2006 13:50:25 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.16.cvs20051219
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -62,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Caolan McNamara <caolanm at redhat.com> - 0.16.cvs20051219-2
 - rh#179138# add openoffice.org as preferred app for oasis formats 
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:50:40 -0500
Subject: rpms/sharutils/devel sharutils.spec,1.24,1.25
Message-ID: <200602071350.k17Doelf028818@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sharutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28791

Modified Files:
	sharutils.spec 
Log Message:
bump for new gcc/glibc


Index: sharutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sharutils.spec	6 Feb 2006 08:35:37 -0000	1.24
+++ sharutils.spec	7 Feb 2006 13:50:37 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
 Version: 4.6.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Florian La Roche <laroche at redhat.com>
 - 4.6.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:50:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:50:52 -0500
Subject: rpms/sip/devel sip.spec,1.23,1.24
Message-ID: <200602071350.k17Doq2m028948@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28918

Modified Files:
	sip.spec 
Log Message:
bump for new gcc/glibc


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sip.spec	9 Dec 2005 22:43:13 -0000	1.23
+++ sip.spec	7 Feb 2006 13:50:50 -0000	1.24
@@ -15,7 +15,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.3.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -83,6 +83,9 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.3.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:51:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:51:04 -0500
Subject: rpms/slang/devel slang.spec,1.33,1.34
Message-ID: <200602071351.k17Dp4lo029077@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29051

Modified Files:
	slang.spec 
Log Message:
bump for new gcc/glibc


Index: slang.spec
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/slang.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- slang.spec	9 Dec 2005 22:43:14 -0000	1.33
+++ slang.spec	7 Feb 2006 13:51:00 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: slang
 Version: 2.0.5
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/slang-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 %{_includedir}/slang
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.5-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:51:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:51:24 -0500
Subject: rpms/slrn/devel slrn.spec,1.26,1.27
Message-ID: <200602071351.k17DpOTZ029276@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slrn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29241

Modified Files:
	slrn.spec 
Log Message:
bump for new gcc/glibc


Index: slrn.spec
===================================================================
RCS file: /cvs/dist/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- slrn.spec	9 Dec 2005 22:43:15 -0000	1.26
+++ slrn.spec	7 Feb 2006 13:51:20 -0000	1.27
@@ -1,6 +1,6 @@
 Name: slrn
 Version: 0.9.8.1pl1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/slrn/slrn-%{version}.tar.bz2
@@ -98,6 +98,9 @@
 %{_mandir}/man1/slrnpull.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8.1pl1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:51:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:51:37 -0500
Subject: rpms/smartmontools/devel smartmontools.spec,1.13,1.14
Message-ID: <200602071351.k17DpbbJ029412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29380

Modified Files:
	smartmontools.spec 
Log Message:
bump for new gcc/glibc


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- smartmontools.spec	16 Dec 2005 22:17:09 -0000	1.13
+++ smartmontools.spec	7 Feb 2006 13:51:33 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.33
-Release: 	4
+Release: 	4.1
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:5.33-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 16 2005 Tomas Mraz <tmraz at redhat.com> 1:5.33-4
 - mail should be sent to root not root at localhost (#174252)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:51:47 -0500
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.37,1.38
Message-ID: <200602071351.k17Dplpj029546@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29517

Modified Files:
	sound-juicer.spec 
Log Message:
bump for new gcc/glibc


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sound-juicer.spec	5 Feb 2006 19:52:39 -0000	1.37
+++ sound-juicer.spec	7 Feb 2006 13:51:45 -0000	1.38
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.13.4
-Release:	3
+Release:	3.1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -92,6 +92,9 @@
 %{_datadir}/omf/sound-juicer
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Christopher Aillon <caillon at redhat.com> 2.13.4-3
 - Fix broken Requires
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:00 -0500
Subject: rpms/sox/devel sox.spec,1.22,1.23
Message-ID: <200602071352.k17Dq0iW029694@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29663

Modified Files:
	sox.spec 
Log Message:
bump for new gcc/glibc


Index: sox.spec
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sox.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sox.spec	13 Dec 2005 13:44:05 -0000	1.22
+++ sox.spec	7 Feb 2006 13:51:57 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
 Version: 12.17.9
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Thomas Woerner <twoerner at redhat.com> 12.17.9-1
 - new version 12.17.9
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:10 -0500
Subject: rpms/spamassassin/devel spamassassin.spec,1.60,1.61
Message-ID: <200602071352.k17DqA3E029814@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29786

Modified Files:
	spamassassin.spec 
Log Message:
bump for new gcc/glibc


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- spamassassin.spec	19 Jan 2006 04:36:03 -0000	1.60
+++ spamassassin.spec	7 Feb 2006 13:52:07 -0000	1.61
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.0
-Release: 5.fc5
+Release: 5.fc5.1
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -149,6 +149,9 @@
 exit 0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5.fc5.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Warren Togami <wtogami at redhat.com> - 3.1.0-5
 - include SPAM_PID dir (#177788)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:22 -0500
Subject: rpms/speex/devel speex.spec,1.10,1.11
Message-ID: <200602071352.k17DqM7H029961@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/speex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29930

Modified Files:
	speex.spec 
Log Message:
bump for new gcc/glibc


Index: speex.spec
===================================================================
RCS file: /cvs/dist/rpms/speex/devel/speex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- speex.spec	9 Dec 2005 22:43:16 -0000	1.10
+++ speex.spec	7 Feb 2006 13:52:19 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
 Version: 	1.0.5
-Release: 1.1
+Release: 1.2
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
@@ -73,6 +73,9 @@
 %{_libdir}/libspeex.a
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:31 -0500
Subject: rpms/sqlite/devel sqlite.spec,1.13,1.14
Message-ID: <200602071352.k17DqVKW030091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sqlite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30059

Modified Files:
	sqlite.spec 
Log Message:
bump for new gcc/glibc


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sqlite.spec	31 Jan 2006 19:31:38 -0000	1.13
+++ sqlite.spec	7 Feb 2006 13:52:29 -0000	1.14
@@ -4,7 +4,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.3.3
-Release: 1
+Release: 1.1
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -96,6 +96,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 3.3.3-1
 - Update to 3.3.3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:45 -0500
Subject: rpms/squashfs-tools/devel squashfs-tools.spec,1.3,1.4
Message-ID: <200602071352.k17Dqjjs030238@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squashfs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30210

Modified Files:
	squashfs-tools.spec 
Log Message:
bump for new gcc/glibc


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- squashfs-tools.spec	9 Dec 2005 22:43:17 -0000	1.3
+++ squashfs-tools.spec	7 Feb 2006 13:52:42 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: squashfs utilities
 Name: squashfs-tools
 Version: 2.2r2
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Base
 URL: http://squashfs.sf.net
@@ -36,6 +36,9 @@
 /sbin/mksquashfs
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2r2-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:52:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:52:55 -0500
Subject: rpms/squid/devel squid.spec,1.54,1.55
Message-ID: <200602071352.k17DqtVQ030371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30341

Modified Files:
	squid.spec 
Log Message:
bump for new gcc/glibc


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- squid.spec	29 Dec 2005 14:23:41 -0000	1.54
+++ squid.spec	7 Feb 2006 13:52:52 -0000	1.55
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE12
-Release: 4
+Release: 4.1
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -324,6 +324,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE12-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 28 2005  Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-4
 - added follow-xff patch (#176055)
 - samba path fix (#176659)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:53:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:53:06 -0500
Subject: rpms/star/devel star.spec,1.19,1.20
Message-ID: <200602071353.k17Dr6hY030508@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	star.spec 
Log Message:
bump for new gcc/glibc


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- star.spec	9 Dec 2005 22:43:18 -0000	1.19
+++ star.spec	7 Feb 2006 13:53:04 -0000	1.20
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5a69
-Release: 1.1
+Release: 1.2
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-nofsync.patch
@@ -102,6 +102,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5a69-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:53:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:53:18 -0500
Subject: rpms/stardict/devel stardict.spec,1.14,1.15
Message-ID: <200602071353.k17DrI5X030646@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30615

Modified Files:
	stardict.spec 
Log Message:
bump for new gcc/glibc


Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- stardict.spec	13 Jan 2006 03:40:38 -0000	1.14
+++ stardict.spec	7 Feb 2006 13:53:16 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    2
+Release:    2.1
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -60,6 +60,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Leon Ho <llch at redhat.com> 2.4.5-2
 - added in patch to fix #176890
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:53:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:53:29 -0500
Subject: rpms/startup-notification/devel startup-notification.spec, 1.11,
	1.12
Message-ID: <200602071353.k17DrTJk030781@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/startup-notification/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30751

Modified Files:
	startup-notification.spec 
Log Message:
bump for new gcc/glibc


Index: startup-notification.spec
===================================================================
RCS file: /cvs/dist/rpms/startup-notification/devel/startup-notification.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- startup-notification.spec	9 Dec 2005 22:43:18 -0000	1.11
+++ startup-notification.spec	7 Feb 2006 13:53:26 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Library for tracking application startup
 Name: startup-notification
 Version: 0.8
-Release: 3.1
+Release: 3.2
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:53:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:53:42 -0500
Subject: rpms/statserial/devel statserial.spec,1.16,1.17
Message-ID: <200602071353.k17DrgZD030926@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/statserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30895

Modified Files:
	statserial.spec 
Log Message:
bump for new gcc/glibc


Index: statserial.spec
===================================================================
RCS file: /cvs/dist/rpms/statserial/devel/statserial.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- statserial.spec	9 Dec 2005 22:43:19 -0000	1.16
+++ statserial.spec	7 Feb 2006 13:53:39 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A tool which displays the status of serial port modem lines.
 Name: statserial
 Version: 1.1
-Release: 38.1
+Release: 38.2
 License: BSD
 Group: Applications/System
 Source: ftp://metalab.unc.edu/pub/Linux/system/serial/statserial-1.1.tar.gz
@@ -45,6 +45,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1-38.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:53:51 -0500
Subject: rpms/strace/devel strace.spec,1.33,1.34
Message-ID: <200602071353.k17Drpb4031050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31018

Modified Files:
	strace.spec 
Log Message:
bump for new gcc/glibc


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- strace.spec	17 Jan 2006 06:25:03 -0000	1.33
+++ strace.spec	7 Feb 2006 13:53:48 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process.
 Name: strace
 Version: 4.5.14
-Release: 1
+Release: 1.1
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Roland McGrath <roland at redhat.com> - 4.5.14-1
 - Fix biarch decoding of socket syscalls (#174354).
 - Fix biarch -e support (#173986).



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:54:03 -0500
Subject: rpms/struts/devel struts.spec,1.25,1.26
Message-ID: <200602071354.k17Ds3vO031184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31145

Modified Files:
	struts.spec 
Log Message:
bump for new gcc/glibc


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- struts.spec	22 Dec 2005 09:02:48 -0000	1.25
+++ struts.spec	7 Feb 2006 13:54:00 -0000	1.26
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.4
-%define release 	2jpp_5fc
+%define release 	2jpp_6fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -211,6 +211,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_6fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_5fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:54:14 -0500
Subject: rpms/stunnel/devel stunnel.spec,1.35,1.36
Message-ID: <200602071354.k17DsEww031324@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stunnel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31292

Modified Files:
	stunnel.spec 
Log Message:
bump for new gcc/glibc


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- stunnel.spec	31 Jan 2006 00:17:26 -0000	1.35
+++ stunnel.spec	7 Feb 2006 13:54:12 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
 Version: 4.14
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -91,6 +91,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.14-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Miloslav Trmac <mitr at redhat.com> - 4.14-3
 - Use pthread threading to fix crash on x86_64 (#179236)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:54:25 -0500
Subject: rpms/subversion/devel subversion.spec,1.69,1.70
Message-ID: <200602071354.k17DsP2W031459@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	subversion.spec 
Log Message:
bump for new gcc/glibc


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- subversion.spec	31 Jan 2006 13:08:46 -0000	1.69
+++ subversion.spec	7 Feb 2006 13:54:23 -0000	1.70
@@ -16,7 +16,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.0
-Release: 4
+Release: 4.1
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -252,6 +252,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Joe Orton <jorton at redhat.com> 1.3.0-4
 - run check-swig-py in %%check (#178448)
 - relax JDK requirement (Kenneth Porter, #177367)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:54:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:54:40 -0500
Subject: rpms/sudo/devel sudo.spec,1.34,1.35
Message-ID: <200602071354.k17DseWU031625@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31601

Modified Files:
	sudo.spec 
Log Message:
bump for new gcc/glibc


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sudo.spec	23 Jan 2006 14:37:30 -0000	1.34
+++ sudo.spec	7 Feb 2006 13:54:38 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 3
+Release: 3.1
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -92,6 +92,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.8p12-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Dan Walsh <dwalsh at redhat.com> 1.6.8p12-3
 - Remove selinux patch.  It has been decided that the SELinux patch for sudo is
 - no longer necessary.  In tageted policy it had no effect.  In strict/MLS policy



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:54:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:54:53 -0500
Subject: rpms/swig/devel swig.spec,1.23,1.24
Message-ID: <200602071354.k17DsrU0031772@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/swig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31742

Modified Files:
	swig.spec 
Log Message:
bump for new gcc/glibc


Index: swig.spec
===================================================================
RCS file: /cvs/dist/rpms/swig/devel/swig.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- swig.spec	9 Dec 2005 22:43:21 -0000	1.23
+++ swig.spec	7 Feb 2006 13:54:50 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.24
-Release: 2.1
+Release: 2.2
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -57,6 +57,9 @@
 %{_datadir}/swig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.24-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:55:04 -0500
Subject: rpms/symlinks/devel symlinks.spec,1.7,1.8
Message-ID: <200602071355.k17Dt4mO031906@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/symlinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31877

Modified Files:
	symlinks.spec 
Log Message:
bump for new gcc/glibc


Index: symlinks.spec
===================================================================
RCS file: /cvs/dist/rpms/symlinks/devel/symlinks.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- symlinks.spec	9 Dec 2005 22:43:22 -0000	1.7
+++ symlinks.spec	7 Feb 2006 13:55:01 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: A utility which maintains a system's symbolic links.
 Name: symlinks
 Version: 1.2
-Release: 24.1
+Release: 24.2
 Group: Applications/System
 License: distributable
 Source: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@
 %{_mandir}/man8/symlinks.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:55:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:55:15 -0500
Subject: rpms/synaptics/devel synaptics.spec,1.16,1.17
Message-ID: <200602071355.k17DtFJU032038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32010

Modified Files:
	synaptics.spec 
Log Message:
bump for new gcc/glibc


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- synaptics.spec	9 Dec 2005 22:43:22 -0000	1.16
+++ synaptics.spec	7 Feb 2006 13:55:12 -0000	1.17
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release: 4.1
+Release: 4.2
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -68,6 +68,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:55:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:55:26 -0500
Subject: rpms/sysfsutils/devel sysfsutils.spec,1.11,1.12
Message-ID: <200602071355.k17DtQSa032170@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32140

Modified Files:
	sysfsutils.spec 
Log Message:
bump for new gcc/glibc


Index: sysfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sysfsutils.spec	9 Dec 2005 22:43:22 -0000	1.11
+++ sysfsutils.spec	7 Feb 2006 13:55:23 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: sysfsutils, library interface to sysfs.
 Name: sysfsutils
 Version: 1.3.0
-Release: 1.1
+Release: 1.2
 Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-redhatify.patch
 License: GPL/LGPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:55:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:55:37 -0500
Subject: rpms/sysklogd/devel sysklogd.spec,1.32,1.33
Message-ID: <200602071355.k17DtbPH032302@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32274

Modified Files:
	sysklogd.spec 
Log Message:
bump for new gcc/glibc


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sysklogd.spec	15 Dec 2005 20:27:45 -0000	1.32
+++ sysklogd.spec	7 Feb 2006 13:55:35 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 34
+Release: 34.1
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
@@ -101,6 +101,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-34.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Jason Vas Dias<jvdias at redhat.com> 1.4.1rh-34
 - Add 'Provides: syslog' for bug 172885
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:55:48 -0500
Subject: rpms/syslinux/devel syslinux.spec,1.28,1.29
Message-ID: <200602071355.k17Dtmfe032442@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	syslinux.spec 
Log Message:
bump for new gcc/glibc


Index: syslinux.spec
===================================================================
RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- syslinux.spec	9 Dec 2005 22:43:23 -0000	1.28
+++ syslinux.spec	7 Feb 2006 13:55:46 -0000	1.29
@@ -2,7 +2,7 @@
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.10-2.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:00 -0500
Subject: rpms/sysstat/devel sysstat.spec,1.34,1.35
Message-ID: <200602071356.k17Du0ps032573@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32537

Modified Files:
	sysstat.spec 
Log Message:
bump for new gcc/glibc


Index: sysstat.spec
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sysstat.spec	9 Dec 2005 22:43:23 -0000	1.34
+++ sysstat.spec	7 Feb 2006 13:55:57 -0000	1.35
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 6.0.1
-Release: 3.1
+Release: 3.2
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -109,6 +109,9 @@
 /var/log/sa
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.0.1-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:11 -0500
Subject: rpms/system-config-boot/devel system-config-boot.spec,1.10,1.11
Message-ID: <200602071356.k17DuBEf032698@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-boot.spec 
Log Message:
bump for new gcc/glibc


Index: system-config-boot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-boot/devel/system-config-boot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system-config-boot.spec	9 Dec 2005 22:43:24 -0000	1.10
+++ system-config-boot.spec	7 Feb 2006 13:56:07 -0000	1.11
@@ -2,7 +2,7 @@
 Summary: A graphical interface for configuring the boot loader
 Name: system-config-boot
 Version: 0.2.11
-Release: 1.1
+Release: 1.2
 URL: http://fedora.redhat.com/
 License: GPL
 ExclusiveOS: Linux
@@ -63,6 +63,9 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-boot
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.11-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:27 -0500
Subject: rpms/system-config-printer/devel printconf.spec,1.59,1.60
Message-ID: <200602071356.k17DuRrt000414@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	printconf.spec 
Log Message:
bump for new gcc/glibc


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- printconf.spec	26 Jan 2006 12:46:01 -0000	1.59
+++ printconf.spec	7 Feb 2006 13:56:24 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
 Version: 0.6.150
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source0: printconf-%{version}.tar.bz2
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.150-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 26 2006 Tim Waugh <twaugh at redhat.com> 0.6.150-1
 - 0.6.150:
   - Handle ncopies in textonly filter (bug #178946).



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:38 -0500
Subject: rpms/system-config-securitylevel/devel
	system-config-securitylevel.spec, 1.71, 1.72
Message-ID: <200602071356.k17Duc4I000535@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-securitylevel.spec 
Log Message:
bump for new gcc/glibc


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- system-config-securitylevel.spec	27 Jan 2006 19:12:26 -0000	1.71
+++ system-config-securitylevel.spec	7 Feb 2006 13:56:35 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
 Version: 1.6.14
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -96,6 +96,9 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.14-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Chris Lumens <clumens at redhat.com> 1.6.14-1
 - Fix sorting on trusted services list.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:48 -0500
Subject: rpms/systemtap/devel systemtap.spec,1.20,1.21
Message-ID: <200602071356.k17DumAO000665@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv635

Modified Files:
	systemtap.spec 
Log Message:
bump for new gcc/glibc


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- systemtap.spec	2 Feb 2006 15:59:35 -0000	1.20
+++ systemtap.spec	7 Feb 2006 13:56:46 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name: systemtap
 Version: 0.5.4
-Release: 2
+Release: 2.1
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Frank Eigler <fche at redhat.com> - 0.5.4-2
 - Rebuilt for devel
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:56:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:56:59 -0500
Subject: rpms/SysVinit/devel SysVinit.spec,1.38,1.39
Message-ID: <200602071356.k17Duxt0000782@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv754

Modified Files:
	SysVinit.spec 
Log Message:
bump for new gcc/glibc


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- SysVinit.spec	21 Dec 2005 17:26:17 -0000	1.38
+++ SysVinit.spec	7 Feb 2006 13:56:56 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -124,6 +124,9 @@
 /dev/initctl
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.86-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Bill Nottingham <notting at redhat.com> - 2.86-2
 - fix single user mode (#176348)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:57:23 -0500
Subject: rpms/talk/devel talk.spec,1.16,1.17
Message-ID: <200602071357.k17DvNIG000992@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/talk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv963

Modified Files:
	talk.spec 
Log Message:
bump for new gcc/glibc


Index: talk.spec
===================================================================
RCS file: /cvs/dist/rpms/talk/devel/talk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- talk.spec	9 Dec 2005 22:43:30 -0000	1.16
+++ talk.spec	7 Feb 2006 13:57:20 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Talk client for one-on-one Internet chatting.
 Name: talk
 Version: 0.17
-Release: 29.1
+Release: 29.2
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ntalk-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %config(noreplace) /etc/xinetd.d/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-29.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:57:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:57:33 -0500
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.15,1.16
Message-ID: <200602071357.k17DvX7c001124@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1096

Modified Files:
	tanukiwrapper.spec 
Log Message:
bump for new gcc/glibc


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tanukiwrapper.spec	22 Dec 2005 06:13:27 -0000	1.15
+++ tanukiwrapper.spec	7 Feb 2006 13:57:30 -0000	1.16
@@ -1,6 +1,6 @@
 %define name		tanukiwrapper
 %define version		3.1.1
-%define release 	4jpp_4fc
+%define release 	4jpp_5fc
 %define section		devel
 
 Summary:	Java Service Wrapper
@@ -152,6 +152,9 @@
 %{_datadir}/%{name}-%{version}/test
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_5fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:57:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:57:43 -0500
Subject: rpms/tar/devel tar.spec,1.29,1.30
Message-ID: <200602071357.k17Dvhdt001251@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1220

Modified Files:
	tar.spec 
Log Message:
bump for new gcc/glibc


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tar.spec	6 Feb 2006 11:17:45 -0000	1.29
+++ tar.spec	7 Feb 2006 13:57:41 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 12
+Release: 12.1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -115,6 +115,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.15.1-12.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb 06 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-12
 - fix extracting sparse files to a filesystem like vfat,
   when ftruncate may fail to grow the size of a file.(#179507)



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:57:53 -0500
Subject: rpms/tcl/devel tcl.spec,1.16,1.17
Message-ID: <200602071357.k17DvrYO001378@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcl.spec 
Log Message:
bump for new gcc/glibc


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tcl.spec	2 Feb 2006 18:42:35 -0000	1.16
+++ tcl.spec	7 Feb 2006 13:57:51 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 3
+Release: 3.1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -150,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-3
 - Patched syntax errors in configure and tcl.m4 so it works with bash
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:06 -0500
Subject: rpms/tclx/devel tclx.spec,1.9,1.10
Message-ID: <200602071358.k17Dw6ks001517@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1489

Modified Files:
	tclx.spec 
Log Message:
bump for new gcc/glibc


Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tclx.spec	6 Feb 2006 16:20:42 -0000	1.9
+++ tclx.spec	7 Feb 2006 13:58:03 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 1
+Release: 1.1
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -106,6 +106,9 @@
 %{_mandir}/man*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb 03 2006 David Cantrell <dcantrell at redhat.com> - 8.4.0-1
 - Upgraded to tclx-8.4.0
 - Removed patches that applied to the old build method for tclx



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:16 -0500
Subject: rpms/tcpdump/devel tcpdump.spec,1.46,1.47
Message-ID: <200602071358.k17DwGoo001638@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcpdump.spec 
Log Message:
bump for new gcc/glibc


Index: tcpdump.spec
===================================================================
RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- tcpdump.spec	20 Dec 2005 12:46:01 -0000	1.46
+++ tcpdump.spec	7 Feb 2006 13:58:13 -0000	1.47
@@ -19,7 +19,7 @@
 Version: %{tcpdump_version}
 %define	tcpdump_dir	tcpdump-%{tcpdump_version}
 %define tcpslice_dir	tcpslice
-Release: %{tcpdump_release}
+Release: %{tcpdump_release}.1
 
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 Epoch: 14
@@ -76,7 +76,7 @@
 # if you change the Version, don't forget to edit libpcap-shared.patch
 # could be sed'd automatically
 Version: %{pcap_version}
-Release: %{pcap_release}.1
+Release: %{pcap_release}.1.1
 %define	libpcap_dir	libpcap-%{pcap_version}
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
@@ -98,7 +98,7 @@
 
 %package -n arpwatch
 Version: 2.1a13
-Release: %{arpwatch_release}.1
+Release: %{arpwatch_release}.1.1
 %define	arpwatch_dir	arpwatch-2.1a13
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
@@ -315,6 +315,9 @@
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 14:3.9.4-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 20 2005 Martin Stransky <stransky at redhat.com> - 14:3.9.4-2
 - fix for #176010 - file owner problem when using 'ring buffer
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:27 -0500
Subject: rpms/tcp_wrappers/devel tcp_wrappers.spec,1.17,1.18
Message-ID: <200602071358.k17DwRvb001783@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcp_wrappers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1750

Modified Files:
	tcp_wrappers.spec 
Log Message:
bump for new gcc/glibc


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tcp_wrappers.spec	24 Jan 2006 14:41:36 -0000	1.17
+++ tcp_wrappers.spec	7 Feb 2006 13:58:25 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 40
+Release: 40.1
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -106,6 +106,9 @@
 %{_sbindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 24 2006 Thomas Woerner <twoerner at redhat.com> 7.6-40
 - fixed uninitialized fp in function inet_cfg (#162412)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:37 -0500
Subject: rpms/tcsh/devel tcsh.spec,1.34,1.35
Message-ID: <200602071358.k17DwbHe001910@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1881

Modified Files:
	tcsh.spec 
Log Message:
bump for new gcc/glibc


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tcsh.spec	9 Dec 2005 22:43:33 -0000	1.34
+++ tcsh.spec	7 Feb 2006 13:58:35 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 5.1
+Release: 5.2
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -102,6 +102,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.14-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:48 -0500
Subject: rpms/telnet/devel telnet.spec,1.21,1.22
Message-ID: <200602071358.k17DwmkZ002040@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2011

Modified Files:
	telnet.spec 
Log Message:
bump for new gcc/glibc


Index: telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- telnet.spec	9 Dec 2005 22:43:34 -0000	1.21
+++ telnet.spec	7 Feb 2006 13:58:45 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 35.1
+Release: 35.2
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -125,6 +125,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-35.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:58:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:58:59 -0500
Subject: rpms/tetex/devel tetex.spec,1.82,1.83
Message-ID: <200602071358.k17DwxtS002161@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2131

Modified Files:
	tetex.spec 
Log Message:
bump for new gcc/glibc


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- tetex.spec	18 Jan 2006 11:12:06 -0000	1.82
+++ tetex.spec	7 Feb 2006 13:58:56 -0000	1.83
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 16
+Release: 16.1
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -789,6 +789,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-16.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Jindrich Novy <jnovy at redhat.com> 3.0-16
 - add missing libXaw-devel dependency
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:59:45 -0500
Subject: rpms/texinfo/devel texinfo.spec,1.32,1.33
Message-ID: <200602071359.k17DxjUH002535@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	texinfo.spec 
Log Message:
bump for new gcc/glibc


Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- texinfo.spec	16 Jan 2006 05:17:26 -0000	1.32
+++ texinfo.spec	7 Feb 2006 13:59:42 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 9
+Release: 9.1
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -123,6 +123,9 @@
 %{_mandir}/man5/info.5*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.8-9.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-9
 - Fix handling of bzip2'ed files (#128637)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 13:59:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 08:59:56 -0500
Subject: rpms/tftp/devel tftp.spec,1.26,1.27
Message-ID: <200602071359.k17DxuLC002670@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2639

Modified Files:
	tftp.spec 
Log Message:
bump for new gcc/glibc


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tftp.spec	9 Dec 2005 22:43:35 -0000	1.26
+++ tftp.spec	7 Feb 2006 13:59:54 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2
@@ -76,6 +76,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.41-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:00:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:00:49 -0500
Subject: rpms/thunderbird/devel thunderbird.spec,1.61,1.62
Message-ID: <200602071400.k17E0nlS002794@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2763

Modified Files:
	thunderbird.spec 
Log Message:
bump for new gcc/glibc


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- thunderbird.spec	28 Jan 2006 06:15:16 -0000	1.61
+++ thunderbird.spec	7 Feb 2006 14:00:32 -0000	1.62
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5
-Release:	2
+Release:	2.1
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -199,6 +199,9 @@
 #===============================================================================
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.5-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5-2
 - Add some langpacks back in
 - Stop providing MozillaThunderbird



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:03:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:03:16 -0500
Subject: rpms/time/devel time.spec,1.14,1.15
Message-ID: <200602071403.k17E3G2I002999@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/time/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2981

Modified Files:
	time.spec 
Log Message:
bump for new gcc/glibc


Index: time.spec
===================================================================
RCS file: /cvs/dist/rpms/time/devel/time.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- time.spec	9 Dec 2005 22:43:35 -0000	1.14
+++ time.spec	7 Feb 2006 14:03:11 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A GNU utility for monitoring a program's use of system resources.
 Name: time
 Version: 1.7
-Release: 27.1
+Release: 27.2
 License: GPL
 Group: Applications/System
 Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_infodir}/time.info*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7-27.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:04:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:04:54 -0500
Subject: rpms/timidity++/devel timidity++.spec,1.10,1.11
Message-ID: <200602071404.k17E4rIE003210@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/timidity++/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3185

Modified Files:
	timidity++.spec 
Log Message:
bump for new gcc/glibc


Index: timidity++.spec
===================================================================
RCS file: /cvs/dist/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- timidity++.spec	9 Dec 2005 22:43:36 -0000	1.10
+++ timidity++.spec	7 Feb 2006 14:04:36 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer.
 Name: timidity++
 Version: 2.13.2
-Release: 1.1
+Release: 1.2
 Group: Applications/Multimedia
 Source: http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:05:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:05:25 -0500
Subject: rpms/tk/devel tk.spec,1.17,1.18
Message-ID: <200602071405.k17E5P1v003363@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3335

Modified Files:
	tk.spec 
Log Message:
bump for new gcc/glibc


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tk.spec	2 Feb 2006 19:00:54 -0000	1.17
+++ tk.spec	7 Feb 2006 14:05:22 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.12
-Release: 1
+Release: 1.1
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -117,6 +117,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb 02 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-1
 - Upgraded to tk-8.4.12
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:06:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:06:16 -0500
Subject: rpms/tmpwatch/devel tmpwatch.spec,1.23,1.24
Message-ID: <200602071406.k17E6GiL003480@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tmpwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3460

Modified Files:
	tmpwatch.spec 
Log Message:
bump for new gcc/glibc


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/tmpwatch/devel/tmpwatch.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tmpwatch.spec	9 Dec 2005 22:43:36 -0000	1.23
+++ tmpwatch.spec	7 Feb 2006 14:06:04 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed.
 Name: tmpwatch
 Version: 2.9.6
-Release: 1.1
+Release: 1.2
 Source: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
@@ -49,6 +49,9 @@
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.6-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:06:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:06:39 -0500
Subject: rpms/tn5250/devel tn5250.spec,1.11,1.12
Message-ID: <200602071406.k17E6dte003592@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3575

Modified Files:
	tn5250.spec 
Log Message:
bump for new gcc/glibc


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tn5250.spec	9 Dec 2005 22:43:37 -0000	1.11
+++ tn5250.spec	7 Feb 2006 14:06:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: 	5250 Telnet protocol and Terminal
 Name: 		tn5250
 Version: 	0.17.3
-Release: 1.1
+Release: 1.2
 License: 	GPL 
 Group: 		Applications/Internet
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %attr( - ,root,root)  %{_libdir}/pkgconfig/tn5250.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:07:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:07:22 -0500
Subject: rpms/tomboy/devel tomboy.spec,1.12,1.13
Message-ID: <200602071407.k17E7MhV003748@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3712

Modified Files:
	tomboy.spec 
Log Message:
bump for new gcc/glibc


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tomboy.spec	6 Feb 2006 20:27:53 -0000	1.12
+++ tomboy.spec	7 Feb 2006 14:07:19 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        1
+Release:        1.1
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -93,6 +93,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-1
 - Tomboy 0.3.5
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:07:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:07:35 -0500
Subject: rpms/tomcat5/devel tomcat5.spec,1.56,1.57
Message-ID: <200602071407.k17E7ZfO003890@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3860

Modified Files:
	tomcat5.spec 
Log Message:
bump for new gcc/glibc


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- tomcat5.spec	2 Feb 2006 04:50:38 -0000	1.56
+++ tomcat5.spec	7 Feb 2006 14:07:32 -0000	1.57
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release 	8jpp_9fc
+%define release 	8jpp_10fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -849,6 +849,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager.jar.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - sh: line 1: build-classpath: command not found
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Feb  1 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_9fc
 - Fixed XSS vulnerabilities in the example apps.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:07:49 -0500
Subject: rpms/totem/devel totem.spec,1.48,1.49
Message-ID: <200602071407.k17E7ngY004036@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4008

Modified Files:
	totem.spec 
Log Message:
bump for new gcc/glibc


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- totem.spec	31 Jan 2006 03:06:24 -0000	1.48
+++ totem.spec	7 Feb 2006 14:07:46 -0000	1.49
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.3.90
-Release: 1 
+Release: 1.1 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -136,6 +136,9 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 1.3.90-1
 - Update to 1.3.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:08:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:08:09 -0500
Subject: rpms/traceroute/devel traceroute.spec,1.20,1.21
Message-ID: <200602071408.k17E89sd004159@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4128

Modified Files:
	traceroute.spec 
Log Message:
bump for new gcc/glibc


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- traceroute.spec	9 Jan 2006 09:33:31 -0000	1.20
+++ traceroute.spec	7 Feb 2006 14:08:07 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.0.4
-Release: 1
+Release: 1.1
 Epoch: 2
 License: GPL
 Group: Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 09 2006 Radek Vokal <rvokal at redhat.com> 1.0.4-1
 - upgrade to 1.0.4
 - proper fix for bug #173762



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:08:21 -0500
Subject: rpms/transfig/devel transfig.spec,1.18,1.19
Message-ID: <200602071408.k17E8KHJ004295@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4269

Modified Files:
	transfig.spec 
Log Message:
bump for new gcc/glibc


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- transfig.spec	19 Dec 2005 16:08:14 -0000	1.18
+++ transfig.spec	7 Feb 2006 14:08:18 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 13
+Release: 13.1
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -82,6 +82,9 @@
 %{xfig_libdir}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-13.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Than Ngo <than at redhat.com> 3.2.4-13
 - fix build problem with modular X
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:08:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:08:36 -0500
Subject: rpms/tree/devel tree.spec,1.16,1.17
Message-ID: <200602071408.k17E8aaW004433@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tree/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4403

Modified Files:
	tree.spec 
Log Message:
bump for new gcc/glibc


Index: tree.spec
===================================================================
RCS file: /cvs/dist/rpms/tree/devel/tree.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tree.spec	9 Dec 2005 22:43:38 -0000	1.16
+++ tree.spec	7 Feb 2006 14:08:33 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A utility which displays a tree view of the contents of directories.
 Name: tree
 Version: 1.5.0
-Release: 3.1
+Release: 3.2
 Group: Applications/File
 License: GPL
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -48,6 +48,9 @@
 %doc README
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:08:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:08:47 -0500
Subject: rpms/tsclient/devel tsclient.spec,1.10,1.11
Message-ID: <200602071408.k17E8l3A004558@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tsclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4532

Modified Files:
	tsclient.spec 
Log Message:
bump for new gcc/glibc


Index: tsclient.spec
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tsclient.spec	9 Dec 2005 22:43:38 -0000	1.10
+++ tsclient.spec	7 Feb 2006 14:08:43 -0000	1.11
@@ -7,7 +7,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 0.140
-Release: 1.1
+Release: 1.2
 URL: http://www.gnomepro.com/tsclient/
 Source0: http://www.gnomepro.com/tsclient/%{name}-%{version}.tar.gz
 License: GPL
@@ -73,6 +73,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.140-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:08:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:08:57 -0500
Subject: rpms/ttcp/devel ttcp.spec,1.11,1.12
Message-ID: <200602071408.k17E8vsj004695@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4666

Modified Files:
	ttcp.spec 
Log Message:
bump for new gcc/glibc


Index: ttcp.spec
===================================================================
RCS file: /cvs/dist/rpms/ttcp/devel/ttcp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ttcp.spec	9 Dec 2005 22:43:39 -0000	1.11
+++ ttcp.spec	7 Feb 2006 14:08:55 -0000	1.12
@@ -1,6 +1,6 @@
 Name: ttcp
 Version: 1.12
-Release: 13.1
+Release: 13.2
 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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:09:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:09:07 -0500
Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.14,1.15
Message-ID: <200602071409.k17E975Z004812@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttmkfdir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4783

Modified Files:
	ttmkfdir.spec 
Log Message:
bump for new gcc/glibc


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ttmkfdir.spec	9 Dec 2005 22:43:39 -0000	1.14
+++ ttmkfdir.spec	7 Feb 2006 14:09:04 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 19.1
+Release: 19.2
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -51,6 +51,9 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.9-19.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:09:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:09:17 -0500
Subject: rpms/tux/devel tux.spec,1.23,1.24
Message-ID: <200602071409.k17E9HkV004932@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4903

Modified Files:
	tux.spec 
Log Message:
bump for new gcc/glibc


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tux.spec	9 Dec 2005 22:43:39 -0000	1.23
+++ tux.spec	7 Feb 2006 14:09:14 -0000	1.24
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 4.1
+Release: 4.2
 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
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:09:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:09:26 -0500
Subject: rpms/tvtime/devel tvtime.spec,1.23,1.24
Message-ID: <200602071409.k17E9Qqb005054@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tvtime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5022

Modified Files:
	tvtime.spec 
Log Message:
bump for new gcc/glibc


Index: tvtime.spec
===================================================================
RCS file: /cvs/dist/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- tvtime.spec	23 Dec 2005 12:10:37 -0000	1.23
+++ tvtime.spec	7 Feb 2006 14:09:24 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer.
 Name: tvtime
 Version: 1.0.1
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -92,6 +92,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 23 2005 Than Ngo <than at redhat.com> 1.0.1-3
 - fix build problem with gcc4.1
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:09:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:09:38 -0500
Subject: rpms/udapl/devel udapl.spec,1.6,1.7
Message-ID: <200602071409.k17E9cUf005186@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/udapl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5154

Modified Files:
	udapl.spec 
Log Message:
bump for new gcc/glibc


Index: udapl.spec
===================================================================
RCS file: /cvs/dist/rpms/udapl/devel/udapl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udapl.spec	9 Dec 2005 22:43:40 -0000	1.6
+++ udapl.spec	7 Feb 2006 14:09:36 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name: udapl
 Version: 1.2
-Release: 0.%{ver}%{?dist}.1
+Release: 0.%{ver}%{?dist}.2
 Summary: A library for direct userspace use of RDMA protocols
 
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2-0.4265.1.FC5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:09:52 -0500
Subject: rpms/umb-scheme/devel umb-scheme-3.2.spec,1.18,1.19
Message-ID: <200602071409.k17E9qOA005362@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/umb-scheme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5331

Modified Files:
	umb-scheme-3.2.spec 
Log Message:
bump for new gcc/glibc


Index: umb-scheme-3.2.spec
===================================================================
RCS file: /cvs/dist/rpms/umb-scheme/devel/umb-scheme-3.2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- umb-scheme-3.2.spec	9 Dec 2005 22:43:41 -0000	1.18
+++ umb-scheme-3.2.spec	7 Feb 2006 14:09:49 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: An implementation of the Scheme programming language.
 Name: umb-scheme
 Version: 3.2
-Release: 39.1
+Release: 39.2
 License: GPL SLIB
 Group: Development/Languages
 Source: ftp://ftp.cs.umb.edu/pub/scheme/umb-scheme-3.2.tar.bz2
@@ -85,6 +85,9 @@
 %{_infodir}/umb-scheme.info.gz
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-39.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:10:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:10:07 -0500
Subject: rpms/units/devel units.spec,1.14,1.15
Message-ID: <200602071410.k17EA7et005530@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/units/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5499

Modified Files:
	units.spec 
Log Message:
bump for new gcc/glibc


Index: units.spec
===================================================================
RCS file: /cvs/dist/rpms/units/devel/units.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- units.spec	9 Dec 2005 22:43:41 -0000	1.14
+++ units.spec	7 Feb 2006 14:10:05 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another.
 Name: units
 Version: 1.85
-Release: 1.1
+Release: 1.2
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Engineering
@@ -44,6 +44,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.85-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:10:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:10:19 -0500
Subject: rpms/unix2dos/devel unix2dos.spec,1.17,1.18
Message-ID: <200602071410.k17EAJ1l005666@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unix2dos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5631

Modified Files:
	unix2dos.spec 
Log Message:
bump for new gcc/glibc


Index: unix2dos.spec
===================================================================
RCS file: /cvs/dist/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- unix2dos.spec	9 Dec 2005 22:43:41 -0000	1.17
+++ unix2dos.spec	7 Feb 2006 14:10:16 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: unix2dos - UNIX to DOS text file format converter
 Name: unix2dos
 Version: 2.2
-Release: 26.1
+Release: 26.2
 License: distributable
 Group: Applications/Text
 Source: unix2dos-2.2.src.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-26.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:10:33 -0500
Subject: rpms/unixODBC/devel unixODBC.spec,1.31,1.32
Message-ID: <200602071410.k17EAXqQ005798@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5767

Modified Files:
	unixODBC.spec 
Log Message:
bump for new gcc/glibc


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- unixODBC.spec	9 Dec 2005 22:43:41 -0000	1.31
+++ unixODBC.spec	7 Feb 2006 14:10:30 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.11
-Release: 6.1
+Release: 6.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -176,6 +176,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.11-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:10:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:10:46 -0500
Subject: rpms/unzip/devel unzip.spec,1.29,1.30
Message-ID: <200602071410.k17EAkwI005947@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5913

Modified Files:
	unzip.spec 
Log Message:
bump for new gcc/glibc


Index: unzip.spec
===================================================================
RCS file: /cvs/dist/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- unzip.spec	6 Feb 2006 11:43:00 -0000	1.29
+++ unzip.spec	7 Feb 2006 14:10:43 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files.
 Name: unzip
 Version: 5.52
-Release: 2
+Release: 2.1
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.52-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Feb  6 2006 Ivana Varekova <varekova at redhat.com> 5.52-2
 - fix bug 180078 - unzip -l causing error
 - fix CVE-2005-4667 - unzip long file name buffer overflow



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:10:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:10:59 -0500
Subject: rpms/up2date/devel up2date.spec,1.117,1.118
Message-ID: <200602071410.k17EAxsi006080@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/up2date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6052

Modified Files:
	up2date.spec 
Log Message:
bump for new gcc/glibc


Index: up2date.spec
===================================================================
RCS file: /cvs/dist/rpms/up2date/devel/up2date.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- up2date.spec	9 Dec 2005 22:43:42 -0000	1.117
+++ up2date.spec	7 Feb 2006 14:10:56 -0000	1.118
@@ -5,7 +5,7 @@
 Url: http://rhn.redhat.com
 Name: up2date
 Version: 4.4.23
-Release: 4.1
+Release: 4.2
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: python >= 2.2.2
 Requires: rpm >= 4.1-1.05
@@ -302,6 +302,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.4.23-4.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:11:10 -0500
Subject: rpms/usbutils/devel usbutils.spec,1.16,1.17
Message-ID: <200602071411.k17EBAY5006219@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usbutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6191

Modified Files:
	usbutils.spec 
Log Message:
bump for new gcc/glibc


Index: usbutils.spec
===================================================================
RCS file: /cvs/dist/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- usbutils.spec	13 Dec 2005 13:46:47 -0000	1.16
+++ usbutils.spec	7 Feb 2006 14:11:08 -0000	1.17
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 0.71
-Release: 1
+Release: 1.1
 Source:	http://prdownloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 Patch1: usbutils-0.70-hwdata.patch
 URL: http://www.linux-usb.org/
@@ -47,6 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.71-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Dec 13 2005 Thomas Woerner <twoerner at redhat.com> 0.71-1
 - new version 0.71
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:11:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:11:20 -0500
Subject: rpms/usermode/devel usermode.spec,1.56,1.57
Message-ID: <200602071411.k17EBKaY006343@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usermode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6312

Modified Files:
	usermode.spec 
Log Message:
bump for new gcc/glibc


Index: usermode.spec
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- usermode.spec	31 Jan 2006 14:22:12 -0000	1.56
+++ usermode.spec	7 Feb 2006 14:11:18 -0000	1.57
@@ -6,7 +6,7 @@
 Summary: Tools for certain user account management tasks.
 Name: usermode
 Version: 1.85
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Jindrich Novy <jnovy at redhat.com> 1.85-2
 - add gettext, libattr-devel, libSM-devel dependencies
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:11:30 -0500
Subject: rpms/utempter/devel utempter.spec,1.13,1.14
Message-ID: <200602071411.k17EBU1v006469@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/utempter/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6439

Modified Files:
	utempter.spec 
Log Message:
bump for new gcc/glibc


Index: utempter.spec
===================================================================
RCS file: /cvs/dist/rpms/utempter/devel/utempter.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- utempter.spec	9 Dec 2005 22:43:43 -0000	1.13
+++ utempter.spec	7 Feb 2006 14:11:28 -0000	1.14
@@ -1,7 +1,7 @@
 Summary:   A privileged helper for utmp/wtmp updates.
 Name:      utempter
 Version:   0.5.5
-Release: 7.1
+Release: 7.2
 License:   MIT/LGPL
 Group:     System Environment/Base
 Source:    utempter-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{_includedir}/utempter.h
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:11:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:11:40 -0500
Subject: rpms/util-linux/devel util-linux.spec,1.103,1.104
Message-ID: <200602071411.k17EBejQ006598@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6567

Modified Files:
	util-linux.spec 
Log Message:
bump for new gcc/glibc


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- util-linux.spec	20 Jan 2006 03:19:45 -0000	1.103
+++ util-linux.spec	7 Feb 2006 14:11:38 -0000	1.104
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.14
+Release: 0.14.1
 License: distributable
 Group: System Environment/Base
 
@@ -624,6 +624,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.14.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 19 2006 Steve Dickson <steved at redhat.com> 2.13-0.14
 - Updated the gssd_check() and idmapd_check(), used with
   nfsv4 mounts, to looked for the correct file in /var/lock/subsys



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:11:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:11:52 -0500
Subject: rpms/uucp/devel uucp.spec,1.27,1.28
Message-ID: <200602071411.k17EBqAq006739@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/uucp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6709

Modified Files:
	uucp.spec 
Log Message:
bump for new gcc/glibc


Index: uucp.spec
===================================================================
RCS file: /cvs/dist/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- uucp.spec	9 Dec 2005 22:43:43 -0000	1.27
+++ uucp.spec	7 Feb 2006 14:11:50 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: The uucp utility for copying files between systems.
 Name: uucp
 Version: 1.07
-Release: 11.1
+Release: 11.2
 License: GPL
 Group: Applications/Communications
 Source0: ftp://ftp.gnu.org/pub/gnu/uucp/uucp-%{version}.tar.gz
@@ -152,6 +152,9 @@
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.07-11.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:12:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:12:03 -0500
Subject: rpms/valgrind/devel valgrind.spec,1.25,1.26
Message-ID: <200602071412.k17EC3oo006868@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6836

Modified Files:
	valgrind.spec 
Log Message:
bump for new gcc/glibc


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- valgrind.spec	10 Jan 2006 10:36:37 -0000	1.25
+++ valgrind.spec	7 Feb 2006 14:12:00 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.1.0
-Release: 1
+Release: 1.1
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.1.0-valgrind_h.patch
@@ -111,6 +111,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.1.0-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Jakub Jelinek <jakub at redhat.com> 3.1.0-1
 - upgrade to 3.1.0 (#174582)
   - many bugfixes, ppc32 support



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:12:14 -0500
Subject: rpms/valgrind-callgrind/devel valgrind-callgrind.spec,1.12,1.13
Message-ID: <200602071412.k17ECEjd006994@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/valgrind-callgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6962

Modified Files:
	valgrind-callgrind.spec 
Log Message:
bump for new gcc/glibc


Index: valgrind-callgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/valgrind-callgrind.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- valgrind-callgrind.spec	16 Jan 2006 10:32:02 -0000	1.12
+++ valgrind-callgrind.spec	7 Feb 2006 14:12:11 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Call-graph profiler plugin for valgrind
 Name: valgrind-callgrind
 Version: 0.10.1
-Release: 1
+Release: 1.1
 Source0: http://kcachegrind.sourceforge.net/callgrind-%{version}.tar.bz2
 License: GPL
 URL: http://kcachegrind.sourceforge.net/
@@ -61,6 +61,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Jakub Jelinek <jakub at redhat.com> 0.10.1-1
 - update to 0.10.1 (#176551)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:12:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:12:29 -0500
Subject: rpms/vconfig/devel vconfig.spec,1.9,1.10
Message-ID: <200602071412.k17ECT44007162@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7128

Modified Files:
	vconfig.spec 
Log Message:
bump for new gcc/glibc


Index: vconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/vconfig.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vconfig.spec	9 Dec 2005 22:43:45 -0000	1.9
+++ vconfig.spec	7 Feb 2006 14:12:26 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Linux 802.1q VLAN configuration utility
 Name: vconfig
 Version: 1.8
-Release: 7.1
+Release: 7.2
 License: LGPL
 Group: System Environment/Base
 Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
@@ -34,6 +34,9 @@
 %{_mandir}/man8/vconfig.8*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8-7.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:12:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:12:40 -0500
Subject: rpms/vim/devel vim.spec,1.94,1.95
Message-ID: <200602071412.k17ECea1007289@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7263

Modified Files:
	vim.spec 
Log Message:
bump for new gcc/glibc


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vim.spec	2 Jan 2006 12:12:52 -0000	1.94
+++ vim.spec	7 Feb 2006 14:12:37 -0000	1.95
@@ -25,7 +25,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 1.1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -488,6 +488,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:12:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:12:58 -0500
Subject: rpms/vino/devel vino.spec,1.32,1.33
Message-ID: <200602071412.k17ECwdB007459@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vino/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7431

Modified Files:
	vino.spec 
Log Message:
bump for new gcc/glibc


Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- vino.spec	17 Jan 2006 09:18:20 -0000	1.32
+++ vino.spec	7 Feb 2006 14:12:56 -0000	1.33
@@ -7,7 +7,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.13.5
-Release: 2
+Release: 2.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Mark McLoughlin <markmc at redhat.com> 2.13.5-2
 - Build with --enable-avahi
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:13:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:13:10 -0500
Subject: rpms/vlock/devel vlock.spec,1.17,1.18
Message-ID: <200602071413.k17EDAQd007591@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7564

Modified Files:
	vlock.spec 
Log Message:
bump for new gcc/glibc


Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vlock.spec	9 Dec 2005 22:43:46 -0000	1.17
+++ vlock.spec	7 Feb 2006 14:13:06 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A program which locks one or more virtual consoles.
 Name: vlock
 Version: 1.3
-Release: 22.1
+Release: 22.2
 License: GPL
 Group: Applications/System
 Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:13:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:13:21 -0500
Subject: rpms/vnc/devel vnc.spec,1.126,1.127
Message-ID: <200602071413.k17EDLQq007738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7707

Modified Files:
	vnc.spec 
Log Message:
bump for new gcc/glibc


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- vnc.spec	31 Jan 2006 12:36:12 -0000	1.126
+++ vnc.spec	7 Feb 2006 14:13:19 -0000	1.127
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 34
+Release: 34.1
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -256,6 +256,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.1-34.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Tim Waugh <twaugh at redhat.com> 4.1.1-34
 - Updated xorg-x11-server to 1.0.1-1.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:13:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:13:35 -0500
Subject: rpms/vorbis-tools/devel vorbis-tools.spec,1.15,1.16
Message-ID: <200602071413.k17EDZZg007888@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7861

Modified Files:
	vorbis-tools.spec 
Log Message:
bump for new gcc/glibc


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vorbis-tools.spec	10 Dec 2005 09:20:39 -0000	1.15
+++ vorbis-tools.spec	7 Feb 2006 14:13:32 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1
-Release: 1.1
+Release: 1.2
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -54,6 +54,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:13:53 -0500
Subject: rpms/vsftpd/devel vsftpd.spec,1.40,1.41
Message-ID: <200602071413.k17EDrjJ008073@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8043

Modified Files:
	vsftpd.spec 
Log Message:
bump for new gcc/glibc


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vsftpd.spec	12 Jan 2006 10:46:10 -0000	1.40
+++ vsftpd.spec	7 Feb 2006 14:13:50 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.4
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -134,6 +134,9 @@
 /var/ftp
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Jan 12 2006 Radek Vokal <rvokal at redhat.com> 2.0.4-1
 - upgrade to 2.0.4
 - vsftpd now lock files for simultanous up/downloads (#162511)



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:03 -0500
Subject: rpms/vte/devel vte.spec,1.57,1.58
Message-ID: <200602071414.k17EE3g8008200@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8173

Modified Files:
	vte.spec 
Log Message:
bump for new gcc/glibc


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- vte.spec	31 Jan 2006 03:09:54 -0000	1.57
+++ vte.spec	7 Feb 2006 14:14:01 -0000	1.58
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.11.17
-Release: 1.fc5.1
+Release: 1.fc5.1.1
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.17-1.fc5.1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> 0.11.17-1
 - Update to 0.11.17
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:14 -0500
Subject: rpms/w3m/devel w3m.spec,1.29,1.30
Message-ID: <200602071414.k17EEEKA008325@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8297

Modified Files:
	w3m.spec 
Log Message:
bump for new gcc/glibc


Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- w3m.spec	9 Dec 2005 22:43:48 -0000	1.29
+++ w3m.spec	7 Feb 2006 14:14:12 -0000	1.30
@@ -4,7 +4,7 @@
 
 Name:		w3m
 Version:	0.5.1
-Release: 12.1
+Release: 12.2
 License:	BSD
 URL:		http://w3m.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -128,6 +128,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:26 -0500
Subject: rpms/webalizer/devel webalizer.spec,1.22,1.23
Message-ID: <200602071414.k17EEQhL008462@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/webalizer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8431

Modified Files:
	webalizer.spec 
Log Message:
bump for new gcc/glibc


Index: webalizer.spec
===================================================================
RCS file: /cvs/dist/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- webalizer.spec	9 Dec 2005 22:43:48 -0000	1.22
+++ webalizer.spec	7 Feb 2006 14:14:23 -0000	1.23
@@ -5,7 +5,7 @@
 Summary: A flexible Web server log file analysis program.
 Group: Applications/Internet
 Version: %{ver}_%{patchlevel}
-Release: 29.1
+Release: 29.2
 URL: http://www.mrunix.net/webalizer/
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
@@ -97,6 +97,9 @@
 %attr(-, webalizer, root) /var/www/usage/*.png
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.01_10-29.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:37 -0500
Subject: rpms/wget/devel wget.spec,1.42,1.43
Message-ID: <200602071414.k17EEbZX008589@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8561

Modified Files:
	wget.spec 
Log Message:
bump for new gcc/glibc


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wget.spec	9 Dec 2005 22:43:49 -0000	1.42
+++ wget.spec	7 Feb 2006 14:14:34 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10.2
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:49 -0500
Subject: rpms/which/devel which.spec,1.8,1.9
Message-ID: <200602071414.k17EEnYf008731@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/which/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8703

Modified Files:
	which.spec 
Log Message:
bump for new gcc/glibc


Index: which.spec
===================================================================
RCS file: /cvs/dist/rpms/which/devel/which.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- which.spec	9 Dec 2005 22:43:50 -0000	1.8
+++ which.spec	7 Feb 2006 14:14:46 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Displays where a particular program in your path is located.
 Name: which
 Version: 2.16
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:14:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:14:59 -0500
Subject: rpms/wireless-tools/devel wireless-tools.spec,1.29,1.30
Message-ID: <200602071414.k17EExqE008863@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8837

Modified Files:
	wireless-tools.spec 
Log Message:
bump for new gcc/glibc


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wireless-tools.spec	9 Dec 2005 22:43:50 -0000	1.29
+++ wireless-tools.spec	7 Feb 2006 14:14:56 -0000	1.30
@@ -26,7 +26,7 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{preversion}.%{release_extension}.1
+Release: 0.%{preversion}.%{release_extension}.2
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{preversion}.tar.gz
@@ -76,6 +76,9 @@
 /%{_lib}/*.so.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:28-0.pre10.5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:15:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:15:15 -0500
Subject: rpms/wordtrans/devel wordtrans.spec,1.22,1.23
Message-ID: <200602071415.k17EFFOK009021@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8996

Modified Files:
	wordtrans.spec 
Log Message:
bump for new gcc/glibc


Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wordtrans.spec	9 Dec 2005 22:43:50 -0000	1.22
+++ wordtrans.spec	7 Feb 2006 14:15:12 -0000	1.23
@@ -11,7 +11,7 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1pre13
-Release: 12.1
+Release: 12.2
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
 Source1: ger-eng.txt
@@ -303,6 +303,9 @@
 /var/www/wordtrans
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:15:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:15:39 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.3,1.4
Message-ID: <200602071415.k17EFdcF009175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9146

Modified Files:
	wpa_supplicant.spec 
Log Message:
bump for new gcc/glibc


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wpa_supplicant.spec	6 Feb 2006 00:07:16 -0000	1.3
+++ wpa_supplicant.spec	7 Feb 2006 14:15:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Version: 0.5.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-1
 - Update to 0.5.1
 - Add WE auth fallback to actually work with older drivers



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:15:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:15:59 -0500
Subject: rpms/wvdial/devel wvdial.spec,1.18,1.19
Message-ID: <200602071415.k17EFxZf009614@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wvdial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9416

Modified Files:
	wvdial.spec 
Log Message:
bump for new gcc/glibc


Index: wvdial.spec
===================================================================
RCS file: /cvs/dist/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wvdial.spec	19 Dec 2005 15:45:45 -0000	1.18
+++ wvdial.spec	7 Feb 2006 14:15:56 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A heuristic autodialer for PPP connections.
 Name: wvdial
 Version: 1.54.0
-Release: 5.2
+Release: 5.2.1
 License: LGPL
 URL: http://open.nit.ca/wvdial/
 Group: System Environment/Daemons
@@ -55,6 +55,9 @@
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.54.0-5.2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Dec 19 2005 Harald Hoyer <harald at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:16:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:16:17 -0500
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.40,1.41
Message-ID: <200602071416.k17EGHJ4010695@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10516

Modified Files:
	xalan-j2.spec 
Log Message:
bump for new gcc/glibc


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xalan-j2.spec	22 Dec 2005 02:20:31 -0000	1.40
+++ xalan-j2.spec	7 Feb 2006 14:16:15 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           xalan-j2
 Version:        %{version}
-Release:        3jpp_6fc
+Release:        3jpp_7fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -215,6 +215,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.0-3jpp_7fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:2.6.0-3jpp_6fc
 - rebuild again
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:16:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:16:43 -0500
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.23,1.24
Message-ID: <200602071416.k17EGhCF012480@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12310

Modified Files:
	Xaw3d.spec 
Log Message:
bump for new gcc/glibc


Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Xaw3d.spec	9 Dec 2005 22:39:31 -0000	1.23
+++ Xaw3d.spec	7 Feb 2006 14:16:41 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 6.1
+Release: 6.2
 Group: System Environment/Libraries
 Source: http://www.visi.com/~hawkeyed/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -99,6 +99,9 @@
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:17:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:17:10 -0500
Subject: rpms/xcdroast/devel xcdroast.spec,1.24,1.25
Message-ID: <200602071417.k17EHAjJ013900@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xcdroast/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13547

Modified Files:
	xcdroast.spec 
Log Message:
bump for new gcc/glibc


Index: xcdroast.spec
===================================================================
RCS file: /cvs/dist/rpms/xcdroast/devel/xcdroast.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xcdroast.spec	9 Dec 2005 22:43:51 -0000	1.24
+++ xcdroast.spec	7 Feb 2006 14:17:07 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: An X Window System based tool for creating CDs.
 Name: xcdroast
 Version: 0.98a15
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/xcdroast/xcdroast-0.98alpha15.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/applications/*
  
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.98a15-12.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:17:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:17:42 -0500
Subject: rpms/xchat/devel xchat.spec,1.48,1.49
Message-ID: <200602071417.k17EHgVW015238@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14899

Modified Files:
	xchat.spec 
Log Message:
bump for new gcc/glibc


Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xchat.spec	10 Dec 2005 09:20:34 -0000	1.48
+++ xchat.spec	7 Feb 2006 14:17:39 -0000	1.49
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.0
-Release: 3.1
+Release: 3.2
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.6.0-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1:2.6.0-3.1
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:18:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:18:08 -0500
Subject: rpms/xdelta/devel xdelta.spec,1.17,1.18
Message-ID: <200602071418.k17EI8AN016613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16432

Modified Files:
	xdelta.spec 
Log Message:
bump for new gcc/glibc


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xdelta.spec	9 Dec 2005 22:43:52 -0000	1.17
+++ xdelta.spec	7 Feb 2006 14:18:05 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.3
-Release: 17.1
+Release: 17.2
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/aclocal/xdelta.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-17.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:18:26 -0500
Subject: rpms/xen/devel xen.spec,1.81,1.82
Message-ID: <200602071418.k17EIQAW017271@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17112

Modified Files:
	xen.spec 
Log Message:
bump for new gcc/glibc


Index: xen.spec
===================================================================
RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xen.spec	2 Feb 2006 22:24:14 -0000	1.81
+++ xen.spec	7 Feb 2006 14:18:23 -0000	1.82
@@ -5,7 +5,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0
-Release: 0.20060130.fc5.3
+Release: 0.20060130.fc5.3.1
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -144,6 +144,9 @@
 %dir %{_localstatedir}/run/xenstored
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-0.20060130.fc5.3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 3.0-0.20060130.fc5.3
 - disable iptables/ip6tables/arptables on bridging when bringing up a
   Xen bridge. If complicated filtering is needed that uses this, custom



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:18:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:18:49 -0500
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.39,1.40
Message-ID: <200602071418.k17EInMJ018140@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17986

Modified Files:
	xerces-j2.spec 
Log Message:
bump for new gcc/glibc


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xerces-j2.spec	2 Feb 2006 08:07:02 -0000	1.39
+++ xerces-j2.spec	7 Feb 2006 14:18:46 -0000	1.40
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.2
 %define cvs_version	2_6_2
-%define release 	6jpp_3fc
+%define release 	6jpp_4fc
 %define section		free
 
 Name:		%{name}
@@ -281,6 +281,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.2-6jpp_4fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Feb  2 2006 Archit Shah <ashah at redhat.com> 0:2.6.2-6jpp_3fc
 - build xerces without using native code
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:19:02 -0500
Subject: rpms/xferstats/devel xferstats.spec,1.9,1.10
Message-ID: <200602071419.k17EJ2E2019023@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18820

Modified Files:
	xferstats.spec 
Log Message:
bump for new gcc/glibc


Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xferstats.spec	9 Dec 2005 22:43:52 -0000	1.9
+++ xferstats.spec	7 Feb 2006 14:19:00 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Compiles information about file transfers from logfiles
 Name: xferstats
 Version: 2.16
-Release: 13.1
+Release: 13.2
 URL: http://xferstats.off.net/
 Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz
 Patch0: xferstats.patch
@@ -44,6 +44,9 @@
 %{_datadir}/xferstats
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:19:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:19:15 -0500
Subject: rpms/xfig/devel xfig.spec,1.32,1.33
Message-ID: <200602071419.k17EJFJd019962@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19785

Modified Files:
	xfig.spec 
Log Message:
bump for new gcc/glibc


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xfig.spec	21 Dec 2005 18:50:44 -0000	1.32
+++ xfig.spec	7 Feb 2006 14:19:12 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 17
+Release: 17.1
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -107,6 +107,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Dec 21 2005 Than Ngo <than at redhat.com> 3.2.4-17
 - workaround for utf8
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:19:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:19:30 -0500
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.10,1.11
Message-ID: <200602071419.k17EJUYa021132@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20911

Modified Files:
	xfsprogs.spec 
Log Message:
bump for new gcc/glibc


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xfsprogs.spec	9 Dec 2005 22:43:53 -0000	1.10
+++ xfsprogs.spec	7 Feb 2006 14:19:27 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem.
 Name: xfsprogs
 Version: 2.7.3
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -98,6 +98,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:19:44 -0500
Subject: rpms/xinetd/devel xinetd.spec,1.27,1.28
Message-ID: <200602071419.k17EJiBP021949@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21774

Modified Files:
	xinetd.spec 
Log Message:
bump for new gcc/glibc


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xinetd.spec	9 Dec 2005 22:43:53 -0000	1.27
+++ xinetd.spec	7 Feb 2006 14:19:42 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.13
-Release: 6.1
+Release: 6.2
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -124,6 +124,9 @@
 %config(noreplace) /etc/sysconfig/xinetd
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.13-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:20:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:20:01 -0500
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.7,1.8
Message-ID: <200602071420.k17EK1mL023332@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23298

Modified Files:
	xmlrpc.spec 
Log Message:
bump for new gcc/glibc


Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xmlrpc.spec	25 Jan 2006 21:17:27 -0000	1.7
+++ xmlrpc.spec	7 Feb 2006 14:19:58 -0000	1.8
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_2fc
+%define release		1jpp_3fc
 %define	section		free
 %define gcj_support     1
 
@@ -105,6 +105,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_3fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 25 2006 Igor Foox <ifoox at redhat.com>  0:2.0.1-1jpp_2fc
 - ExcludeArch s390x and ppc64
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:20:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:20:18 -0500
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.20,1.21
Message-ID: <200602071420.k17EKIIV023479@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23445

Modified Files:
	xmlsec1.spec 
Log Message:
bump for new gcc/glibc


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmlsec1.spec	16 Dec 2005 06:07:04 -0000	1.20
+++ xmlsec1.spec	7 Feb 2006 14:20:15 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 4
+Release: 4.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -227,6 +227,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-4.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> 1.2.9-4
 - NSS has been split out of the mozilla package, so require that now
   and update separate_nspr.patch to account for the new NSS as well



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:20:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:20:33 -0500
Subject: rpms/xmlto/devel xmlto.spec,1.19,1.20
Message-ID: <200602071420.k17EKX9O023602@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23574

Modified Files:
	xmlto.spec 
Log Message:
bump for new gcc/glibc


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xmlto.spec	9 Dec 2005 22:43:55 -0000	1.19
+++ xmlto.spec	7 Feb 2006 14:20:30 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 9.1
+Release: 9.2
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.18-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:20:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:20:50 -0500
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.7,1.8
Message-ID: <200602071420.k17EKoiU023735@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23710

Modified Files:
	xorg-x11-apps.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-apps.spec	31 Jan 2006 16:29:41 -0000	1.7
+++ xorg-x11-apps.spec	7 Feb 2006 14:20:48 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -173,6 +173,9 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* 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
 - Upgraded all apps to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:21:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:21:09 -0500
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.4,1.5
Message-ID: <200602071421.k17EL9bZ023882@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23849

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drivers.spec	23 Nov 2005 15:49:41 -0000	1.4
+++ xorg-x11-drivers.spec	7 Feb 2006 14:21:06 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 0.99.2
-Release: 4
+Release: 4.1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -264,6 +264,9 @@
 
 
 %changelog
+* 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
 - Add ur98 driver back, as it is part of X11R7 RC2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:21:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:21:23 -0500
Subject: rpms/xorg-x11-drv-acecad/devel xorg-x11-drv-acecad.spec,1.6,1.7
Message-ID: <200602071421.k17ELNrG024019@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-acecad/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23987

Modified Files:
	xorg-x11-drv-acecad.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-acecad.spec	2 Feb 2006 09:37:25 -0000	1.6
+++ xorg-x11-drv-acecad.spec	7 Feb 2006 14:21:21 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -50,6 +50,9 @@
 %{_mandir}/man4/acecad.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-acecad to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:21:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:21:34 -0500
Subject: rpms/squid/devel squid-2.5.STABLE12-asyncio_counters.patch, NONE,
	1.1 squid-2.5.STABLE12-irix_timezone.patch, NONE,
	1.1 squid-2.5.STABLE12-prctl_args.patch, NONE, 1.1 squid.spec,
	1.55, 1.56
Message-ID: <200602071421.k17ELUeA024051@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24022

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE12-asyncio_counters.patch 
	squid-2.5.STABLE12-irix_timezone.patch 
	squid-2.5.STABLE12-prctl_args.patch 
Log Message:
new upstream patches

squid-2.5.STABLE12-asyncio_counters.patch:
 aiops.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE squid-2.5.STABLE12-asyncio_counters.patch ---
Index: squid/src/fs/aufs/aiops.c
diff -c squid/src/fs/aufs/aiops.c:1.12.2.11 squid/src/fs/aufs/aiops.c:1.12.2.12
*** squid/src/fs/aufs/aiops.c:1.12.2.11	Mon Apr 25 10:27:02 2005
--- squid/src/fs/aufs/aiops.c	Mon Dec 26 09:32:28 2005
***************
*** 941,946 ****
--- 941,949 ----
      squidaio_thread_t *threadp;
      int i;
  
+     if (!squidaio_initialised)
+ 	return;
+ 
      storeAppendPrintf(sentry, "\n\nThreads Status:\n");
      storeAppendPrintf(sentry, "#\tID\t# Requests\n");
  

squid-2.5.STABLE12-irix_timezone.patch:
 rfc1123.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE squid-2.5.STABLE12-irix_timezone.patch ---
Index: squid/lib/rfc1123.c
diff -c squid/lib/rfc1123.c:1.29.2.3 squid/lib/rfc1123.c:1.29.2.4
*** squid/lib/rfc1123.c:1.29.2.3	Sun Jul  3 02:18:38 2005
--- squid/lib/rfc1123.c	Sun Jan 22 10:18:23 2006
***************
*** 229,234 ****
--- 229,235 ----
  #elif defined (_timezone)
  #elif defined(_SQUID_AIX_)
  #elif defined(_SQUID_CYGWIN_)
+ #elif defined(_SQUID_SGI_)
  #else
  	extern long timezone;
  #endif

squid-2.5.STABLE12-prctl_args.patch:
 tools.c |    6 !!!!!!
 1 files changed, 6 modifications(!)

--- NEW FILE squid-2.5.STABLE12-prctl_args.patch ---
Index: squid/src/tools.c
diff -c squid/src/tools.c:1.213.2.20 squid/src/tools.c:1.213.2.22
*** squid/src/tools.c:1.213.2.20	Fri Sep 16 15:13:18 2005
--- squid/src/tools.c	Sat Jan 14 18:17:47 2006
***************
*** 563,569 ****
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }
--- 563,569 ----
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }
***************
*** 580,586 ****
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }
--- 580,586 ----
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }
***************
*** 605,611 ****
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }
--- 605,611 ----
  #endif
  #if HAVE_PRCTL && defined(PR_SET_DUMPABLE)
      /* Set Linux DUMPABLE flag */
!     if (Config.coredump_dir && prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) != 0)
  	debug(50, 2) ("prctl: %s\n", xstrerror());
  #endif
  }


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- squid.spec	7 Feb 2006 13:52:52 -0000	1.55
+++ squid.spec	7 Feb 2006 14:21:25 -0000	1.56
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE12
-Release: 4.1
+Release: 5
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -21,6 +21,9 @@
 # Upstream patches
 Patch100: squid-2.5.STABLE12-setenv.patch
 Patch101: squid-2.5.STABLE12-SMB_BadFetch.patch
+Patch102: squid-2.5.STABLE12-asyncio_counters.patch
+Patch103: squid-2.5.STABLE12-prctl_args.patch
+Patch104: squid-2.5.STABLE12-irix_timezone.patch
 
 # External patches
 Patch150: squid-2.5.STABLE12-follow-xff.patch
@@ -62,6 +65,9 @@
 
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
 
 %patch150 -p1 -b .follow-xff
 
@@ -324,6 +330,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Feb 07 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE12-5
+- new upstream patches
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE12-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:21:45 -0500
Subject: rpms/xorg-x11-drv-aiptek/devel xorg-x11-drv-aiptek.spec,1.6,1.7
Message-ID: <200602071421.k17ELjUp024217@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-aiptek/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24158

Modified Files:
	xorg-x11-drv-aiptek.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-aiptek.spec	2 Feb 2006 09:38:06 -0000	1.6
+++ xorg-x11-drv-aiptek.spec	7 Feb 2006 14:21:43 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -52,6 +52,9 @@
 %{_mandir}/man4/aiptek.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-aiptek to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:22:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:22:04 -0500
Subject: rpms/xorg-x11-drv-apm/devel xorg-x11-drv-apm.spec,1.8,1.9
Message-ID: <200602071422.k17EM4HC024355@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-apm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24323

Modified Files:
	xorg-x11-drv-apm.spec 
Log Message:
bump for new gcc/glibc


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-apm.spec	3 Feb 2006 13:28:23 -0000	1.8
+++ xorg-x11-drv-apm.spec	7 Feb 2006 14:22:01 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
 Version: 1.0.1.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   apm.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.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.1.5-1
 - Updated xorg-x11-drv-apm to version 1.0.1.5 from X11R7.0
 - Added apm.xinf videoalias file.



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:22:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:22:24 -0500
Subject: rpms/xorg-x11-drv-ark/devel xorg-x11-drv-ark.spec,1.7,1.8
Message-ID: <200602071422.k17EMOdl024487@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-ark/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24458

Modified Files:
	xorg-x11-drv-ark.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-ark.spec	3 Feb 2006 13:28:37 -0000	1.7
+++ xorg-x11-drv-ark.spec	7 Feb 2006 14:22:20 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ark video driver
 Name:      xorg-x11-drv-ark
 Version:   0.5.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ark.xinf
@@ -56,6 +56,9 @@
 #%{_mandir}/man4/*.4x*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.5.0.5-1
 - Updated xorg-x11-drv-ark to version 0.5.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:22:59 -0500
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.10,1.11
Message-ID: <200602071422.k17EMxRW024654@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24615

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
bump for new gcc/glibc


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-ati.spec	5 Feb 2006 17:05:18 -0000	1.10
+++ xorg-x11-drv-ati.spec	7 Feb 2006 14:22:49 -0000	1.11
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
@@ -82,6 +82,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.5.7.3-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-3
 - Updated radeon.xinf to be up to date with the xf86PciInfo.h from the Xorg
   X server 1.0.1-1 source.  This should account for all supported Radeon



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:23:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:23:19 -0500
Subject: rpms/xorg-x11-drv-calcomp/devel xorg-x11-drv-calcomp.spec,1.6,1.7
Message-ID: <200602071423.k17ENJ3n024795@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-calcomp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24770

Modified Files:
	xorg-x11-drv-calcomp.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-calcomp.spec	2 Feb 2006 09:38:34 -0000	1.6
+++ xorg-x11-drv-calcomp.spec	7 Feb 2006 14:23:16 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 calcomp input driver
 Name:      xorg-x11-drv-calcomp
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/calcomp.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-calcomp to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:23:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:23:37 -0500
Subject: rpms/xorg-x11-drv-chips/devel xorg-x11-drv-chips.spec,1.6,1.7
Message-ID: <200602071423.k17ENbPi024925@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-chips/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24893

Modified Files:
	xorg-x11-drv-chips.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-chips.spec	3 Feb 2006 13:29:06 -0000	1.6
+++ xorg-x11-drv-chips.spec	7 Feb 2006 14:23:34 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 chips video driver
 Name:      xorg-x11-drv-chips
 Version: 1.0.1.3
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/everything/%{tarball}-%{version}.tar.bz2
 Source1:   chips.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/chips.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.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> 1.0.1.3-1
 - Updated xorg-x11-drv-chips to version 1.0.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:00 -0500
Subject: rpms/xorg-x11-drv-cirrus/devel xorg-x11-drv-cirrus.spec,1.7,1.8
Message-ID: <200602071424.k17EO0Ea025084@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-cirrus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25053

Modified Files:
	xorg-x11-drv-cirrus.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-cirrus.spec	3 Feb 2006 13:29:22 -0000	1.7
+++ xorg-x11-drv-cirrus.spec	7 Feb 2006 14:23:57 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
@@ -59,6 +59,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-cirrus to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:12 -0500
Subject: rpms/xorg-x11-drv-citron/devel xorg-x11-drv-citron.spec,1.6,1.7
Message-ID: <200602071424.k17EOC6m025230@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25201

Modified Files:
	xorg-x11-drv-citron.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-citron.spec	2 Feb 2006 09:38:57 -0000	1.6
+++ xorg-x11-drv-citron.spec	7 Feb 2006 14:24:10 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 citron input driver
 Name:      xorg-x11-drv-citron
 Version: 2.1.1.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/citron.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.1.1.5-1
 - Updated xorg-x11-drv-citron to version 2.1.1.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:24 -0500
Subject: rpms/xorg-x11-drv-cyrix/devel xorg-x11-drv-cyrix.spec,1.6,1.7
Message-ID: <200602071424.k17EOO2Y025370@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-cyrix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25338

Modified Files:
	xorg-x11-drv-cyrix.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-cyrix.spec	3 Feb 2006 13:29:36 -0000	1.6
+++ xorg-x11-drv-cyrix.spec	7 Feb 2006 14:24:22 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 cyrix video driver
 Name:      xorg-x11-drv-cyrix
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cyrix.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/cyrix.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-cyrix to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:36 -0500
Subject: rpms/xorg-x11-drv-digitaledge/devel xorg-x11-drv-digitaledge.spec,
	1.6, 1.7
Message-ID: <200602071424.k17EOag2025463@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25429

Modified Files:
	xorg-x11-drv-digitaledge.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-digitaledge.spec	2 Feb 2006 09:39:22 -0000	1.6
+++ xorg-x11-drv-digitaledge.spec	7 Feb 2006 14:24:34 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 digitaledge input driver
 Name:      xorg-x11-drv-digitaledge
 Version: 1.0.1.3
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.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> 1.0.1.3-1
 - Updated xorg-x11-drv-digitaledge to version 1.0.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:46 -0500
Subject: rpms/xorg-x11-drv-dmc/devel xorg-x11-drv-dmc.spec,1.6,1.7
Message-ID: <200602071424.k17EOk3i025581@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dmc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25552

Modified Files:
	xorg-x11-drv-dmc.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-dmc.spec	2 Feb 2006 09:39:47 -0000	1.6
+++ xorg-x11-drv-dmc.spec	7 Feb 2006 14:24:44 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dmc.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-dmc to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:24:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:24:57 -0500
Subject: rpms/xorg-x11-drv-dummy/devel xorg-x11-drv-dummy.spec,1.6,1.7
Message-ID: <200602071424.k17EOvKb025704@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dummy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25674

Modified Files:
	xorg-x11-drv-dummy.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-dummy.spec	3 Feb 2006 13:29:49 -0000	1.6
+++ xorg-x11-drv-dummy.spec	7 Feb 2006 14:24:54 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.1.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/dummy.4x*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.0.5-1
 - Updated xorg-x11-drv-dummy to version 0.1.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:25:07 -0500
Subject: rpms/xorg-x11-drv-dynapro/devel xorg-x11-drv-dynapro.spec,1.6,1.7
Message-ID: <200602071425.k17EP7OX025831@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dynapro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25806

Modified Files:
	xorg-x11-drv-dynapro.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-dynapro.spec	2 Feb 2006 09:41:22 -0000	1.6
+++ xorg-x11-drv-dynapro.spec	7 Feb 2006 14:25:05 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dynapro.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-dynapro to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:25:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:25:18 -0500
Subject: rpms/xorg-x11-drv-elo2300/devel xorg-x11-drv-elo2300.spec,1.6,1.7
Message-ID: <200602071425.k17EPIT8025967@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-elo2300/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25935

Modified Files:
	xorg-x11-drv-elo2300.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-elo2300.spec	2 Feb 2006 09:42:12 -0000	1.6
+++ xorg-x11-drv-elo2300.spec	7 Feb 2006 14:25:15 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elo2300 input driver
 Name:      xorg-x11-drv-elo2300
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/elo2300.4x*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-elo2300 to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:25:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:25:29 -0500
Subject: rpms/xorg-x11-drv-elographics/devel xorg-x11-drv-elographics.spec,
	1.6, 1.7
Message-ID: <200602071425.k17EPTwG026100@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-elographics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26070

Modified Files:
	xorg-x11-drv-elographics.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-elographics.spec	2 Feb 2006 09:42:59 -0000	1.6
+++ xorg-x11-drv-elographics.spec	7 Feb 2006 14:25:26 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/elographics.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-elographics to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:25:40 -0500
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.6,1.7
Message-ID: <200602071425.k17EPeqd026225@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26194

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-evdev.spec	2 Feb 2006 09:43:29 -0000	1.6
+++ xorg-x11-drv-evdev.spec	7 Feb 2006 14:25:37 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-evdev to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:25:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:25:50 -0500
Subject: rpms/xorg-x11-drv-fbdev/devel xorg-x11-drv-fbdev.spec,1.6,1.7
Message-ID: <200602071425.k17EPoAW026348@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-fbdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26320

Modified Files:
	xorg-x11-drv-fbdev.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-fbdev.spec	3 Feb 2006 13:30:16 -0000	1.6
+++ xorg-x11-drv-fbdev.spec	7 Feb 2006 14:25:47 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
 Version:   0.1.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.0.5-1
 - Updated xorg-x11-drv-fbdev to version 0.1.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:00 -0500
Subject: rpms/xorg-x11-drv-fpit/devel xorg-x11-drv-fpit.spec,1.6,1.7
Message-ID: <200602071426.k17EQ0YR026485@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-fpit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26452

Modified Files:
	xorg-x11-drv-fpit.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-fpit.spec	2 Feb 2006 09:43:56 -0000	1.6
+++ xorg-x11-drv-fpit.spec	7 Feb 2006 14:25:57 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fpit.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-fpit to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:09 -0500
Subject: rpms/xorg-x11-drv-glint/devel xorg-x11-drv-glint.spec,1.6,1.7
Message-ID: <200602071426.k17EQ973026603@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-glint/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26571

Modified Files:
	xorg-x11-drv-glint.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-glint.spec	3 Feb 2006 13:31:03 -0000	1.6
+++ xorg-x11-drv-glint.spec	7 Feb 2006 14:26:07 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
 Version:   1.0.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   glint.xinf
@@ -53,6 +53,9 @@
 %{_mandir}/man4/glint.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.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> 1.0.1.3-1
 - Updated xorg-x11-drv-glint to version 1.0.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:21 -0500
Subject: rpms/xorg-x11-drv-hyperpen/devel xorg-x11-drv-hyperpen.spec, 1.6,
	1.7
Message-ID: <200602071426.k17EQLiE026731@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26697

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-hyperpen.spec	2 Feb 2006 09:44:19 -0000	1.6
+++ xorg-x11-drv-hyperpen.spec	7 Feb 2006 14:26:18 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-hyperpen to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:31 -0500
Subject: rpms/xorg-x11-drv-i128/devel xorg-x11-drv-i128.spec,1.6,1.7
Message-ID: <200602071426.k17EQVbi026864@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-i128/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26836

Modified Files:
	xorg-x11-drv-i128.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-i128.spec	3 Feb 2006 13:32:13 -0000	1.6
+++ xorg-x11-drv-i128.spec	7 Feb 2006 14:26:29 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i128 video driver
 Name:      xorg-x11-drv-i128
 Version:   1.1.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i128.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/i128.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.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.1.0.5-1
 - Updated xorg-x11-drv-i128 to version 1.1.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:41 -0500
Subject: rpms/xorg-x11-drv-i740/devel xorg-x11-drv-i740.spec,1.6,1.7
Message-ID: <200602071426.k17EQfY8026990@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-i740/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26960

Modified Files:
	xorg-x11-drv-i740.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-i740.spec	3 Feb 2006 13:33:05 -0000	1.6
+++ xorg-x11-drv-i740.spec	7 Feb 2006 14:26:38 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i740.xinf
@@ -53,6 +53,9 @@
 %{_mandir}/man4/i740.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-i740 to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:26:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:26:51 -0500
Subject: rpms/xorg-x11-drv-i810/devel xorg-x11-drv-i810.spec,1.9,1.10
Message-ID: <200602071426.k17EQpNf027121@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27090

Modified Files:
	xorg-x11-drv-i810.spec 
Log Message:
bump for new gcc/glibc


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-i810.spec	4 Feb 2006 12:35:06 -0000	1.9
+++ xorg-x11-drv-i810.spec	7 Feb 2006 14:26:49 -0000	1.10
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
 Version:   1.4.1.3
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
@@ -74,6 +74,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* 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
 - Added 8086:2772 mapping to i810.xinf for bug (#178451)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:02 -0500
Subject: rpms/xorg-x11-drv-jamstudio/devel xorg-x11-drv-jamstudio.spec, 1.6,
	1.7
Message-ID: <200602071427.k17ER2So027257@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27228

Modified Files:
	xorg-x11-drv-jamstudio.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-jamstudio.spec	2 Feb 2006 09:45:05 -0000	1.6
+++ xorg-x11-drv-jamstudio.spec	7 Feb 2006 14:27:00 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 jamstudio input driver
 Name:      xorg-x11-drv-jamstudio
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/js_x.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-jamstudio to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:12 -0500
Subject: rpms/xorg-x11-drv-joystick/devel xorg-x11-drv-joystick.spec, 1.6,
	1.7
Message-ID: <200602071427.k17ERCxJ027386@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27356

Modified Files:
	xorg-x11-drv-joystick.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-joystick.spec	2 Feb 2006 09:45:31 -0000	1.6
+++ xorg-x11-drv-joystick.spec	7 Feb 2006 14:27:10 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 joystick input driver
 Name:      xorg-x11-drv-joystick
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-joystick to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:22 -0500
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.6,
	1.7
Message-ID: <200602071427.k17ERMOI027511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27478

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-keyboard.spec	2 Feb 2006 09:46:52 -0000	1.6
+++ xorg-x11-drv-keyboard.spec	7 Feb 2006 14:27:19 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
 Version: 1.0.1.3
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.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> 1.0.1.3-1
 - Updated xorg-x11-drv-keyboard to version 1.0.1.3 from X11R7.0
 - Added alpha/sparc/sparc64 to ExclusiveArch list (#176590)



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:32 -0500
Subject: rpms/xorg-x11-drv-magellan/devel xorg-x11-drv-magellan.spec, 1.6,
	1.7
Message-ID: <200602071427.k17ERWXf027637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-magellan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27605

Modified Files:
	xorg-x11-drv-magellan.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-magellan.spec	2 Feb 2006 09:48:39 -0000	1.6
+++ xorg-x11-drv-magellan.spec	7 Feb 2006 14:27:29 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/magellan.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-magellan to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:44 -0500
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec, 1.6,
	1.7
Message-ID: <200602071427.k17ERiZJ027784@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27751

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-magictouch.spec	2 Feb 2006 09:49:11 -0000	1.6
+++ xorg-x11-drv-magictouch.spec	7 Feb 2006 14:27:42 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magictouch input driver
 Name:      xorg-x11-drv-magictouch
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/magictouch.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-magictouch to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:27:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:27:55 -0500
Subject: rpms/xorg-x11-drv-mga/devel xorg-x11-drv-mga.spec,1.6,1.7
Message-ID: <200602071427.k17ERtWN027914@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27882

Modified Files:
	xorg-x11-drv-mga.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-mga.spec	3 Feb 2006 13:35:00 -0000	1.6
+++ xorg-x11-drv-mga.spec	7 Feb 2006 14:27:53 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.2.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   mga.xinf
@@ -61,6 +61,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.2.1.3-1
 - Updated xorg-x11-drv-mga to version 1.2.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:06 -0500
Subject: rpms/xorg-x11-drv-microtouch/devel xorg-x11-drv-microtouch.spec, 1.6,
	1.7
Message-ID: <200602071428.k17ES6f3028045@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-microtouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28014

Modified Files:
	xorg-x11-drv-microtouch.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-microtouch.spec	2 Feb 2006 09:49:29 -0000	1.6
+++ xorg-x11-drv-microtouch.spec	7 Feb 2006 14:28:03 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/microtouch.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-microtouch to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:16 -0500
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.7,1.8
Message-ID: <200602071428.k17ESGht028178@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28147

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-mouse.spec	2 Feb 2006 09:50:00 -0000	1.7
+++ xorg-x11-drv-mouse.spec	7 Feb 2006 14:28:14 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version: 1.0.3.1
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3.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.3.1-1
 - Updated xorg-x11-drv-mouse to version 1.0.3.1 from X11R7.0
 - Rename temporary name of mouse manpage, to close (#178744)



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:27 -0500
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec,1.6,1.7
Message-ID: <200602071428.k17ESRTL028307@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mutouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28276

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-mutouch.spec	2 Feb 2006 09:50:36 -0000	1.6
+++ xorg-x11-drv-mutouch.spec	7 Feb 2006 14:28:25 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -51,6 +51,9 @@
 %{_mandir}/man4/mutouch.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-mutouch to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:38 -0500
Subject: rpms/xorg-x11-drv-neomagic/devel xorg-x11-drv-neomagic.spec, 1.6,
	1.7
Message-ID: <200602071428.k17ESc36028430@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-neomagic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28401

Modified Files:
	xorg-x11-drv-neomagic.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-neomagic.spec	3 Feb 2006 13:35:31 -0000	1.6
+++ xorg-x11-drv-neomagic.spec	7 Feb 2006 14:28:35 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-neomagic to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:48 -0500
Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.7,1.8
Message-ID: <200602071428.k17ESm3h028556@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28524

Modified Files:
	xorg-x11-drv-nsc.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nsc.spec	3 Feb 2006 13:45:04 -0000	1.7
+++ xorg-x11-drv-nsc.spec	7 Feb 2006 14:28:45 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nsc video driver
 Name:      xorg-x11-drv-nsc
 Version:   2.7.6.5
-Release:   2
+Release:   2.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nsc.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/nsc.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.6.5-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Feb  3 2006 Mike A. Harris <mharris at redhat.com> 2.7.6.5-2
 - Added nsc.xinf driver mapping file.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:28:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:28:57 -0500
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.7,1.8
Message-ID: <200602071428.k17ESvDK028683@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28647

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nv.spec	3 Feb 2006 13:36:40 -0000	1.7
+++ xorg-x11-drv-nv.spec	7 Feb 2006 14:28:55 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.0.1.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -58,6 +58,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.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.1.5-1
 - Updated xorg-x11-drv-nv to version 1.0.1.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:29:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:29:08 -0500
Subject: rpms/xorg-x11-drv-palmax/devel xorg-x11-drv-palmax.spec,1.6,1.7
Message-ID: <200602071429.k17ET8tS028809@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-palmax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28781

Modified Files:
	xorg-x11-drv-palmax.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-palmax.spec	2 Feb 2006 09:51:23 -0000	1.6
+++ xorg-x11-drv-palmax.spec	7 Feb 2006 14:29:06 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 palmax input driver
 Name:      xorg-x11-drv-palmax
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/palmax.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-palmax to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:29:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:29:19 -0500
Subject: rpms/xorg-x11-drv-penmount/devel xorg-x11-drv-penmount.spec, 1.6,
	1.7
Message-ID: <200602071429.k17ETJvx028950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-penmount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28916

Modified Files:
	xorg-x11-drv-penmount.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-penmount.spec	2 Feb 2006 09:52:01 -0000	1.6
+++ xorg-x11-drv-penmount.spec	7 Feb 2006 14:29:16 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-penmount to version 1.0.0.5 from X11R7.0
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:29:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:29:29 -0500
Subject: rpms/xorg-x11-drv-rendition/devel xorg-x11-drv-rendition.spec, 1.6,
	1.7
Message-ID: <200602071429.k17ETTdk029083@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29045

Modified Files:
	xorg-x11-drv-rendition.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-rendition.spec	3 Feb 2006 13:37:06 -0000	1.6
+++ xorg-x11-drv-rendition.spec	7 Feb 2006 14:29:27 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 rendition video driver
 Name:      xorg-x11-drv-rendition
 Version:   4.0.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   rendition.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/rendition.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-rendition to version 4.0.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:29:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:29:42 -0500
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.7,1.8
Message-ID: <200602071429.k17ETg5v029220@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29190

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-s3.spec	3 Feb 2006 13:37:20 -0000	1.7
+++ xorg-x11-drv-s3.spec	7 Feb 2006 14:29:39 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
 Version:   0.3.5.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3.xinf
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/s3.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:29:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:29:54 -0500
Subject: rpms/xorg-x11-drv-s3virge/devel xorg-x11-drv-s3virge.spec,1.6,1.7
Message-ID: <200602071429.k17ETs0R029372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-s3virge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29341

Modified Files:
	xorg-x11-drv-s3virge.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-s3virge.spec	3 Feb 2006 13:37:36 -0000	1.6
+++ xorg-x11-drv-s3virge.spec	7 Feb 2006 14:29:51 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
 Version:   1.8.6.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3virge.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.6.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.8.6.5-1
 - Updated xorg-x11-drv-s3virge to version 1.8.6.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:30:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:30:04 -0500
Subject: rpms/xorg-x11-drv-savage/devel xorg-x11-drv-savage.spec,1.7,1.8
Message-ID: <200602071430.k17EU4aM029506@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29481

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-savage.spec	3 Feb 2006 13:37:58 -0000	1.7
+++ xorg-x11-drv-savage.spec	7 Feb 2006 14:30:02 -0000	1.8
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.0.2.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
@@ -66,6 +66,9 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 2.0.2.3-1
 - Updated xorg-x11-drv-savage to version 2.0.2.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:30:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:30:28 -0500
Subject: rpms/xorg-x11-drv-siliconmotion/devel
	xorg-x11-drv-siliconmotion.spec, 1.6, 1.7
Message-ID: <200602071430.k17EUSZY029657@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-siliconmotion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29626

Modified Files:
	xorg-x11-drv-siliconmotion.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-siliconmotion.spec	3 Feb 2006 13:38:14 -0000	1.6
+++ xorg-x11-drv-siliconmotion.spec	7 Feb 2006 14:30:25 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 siliconmotion video driver
 Name:      xorg-x11-drv-siliconmotion
 Version: 1.3.1.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   siliconmotion.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/siliconmotion.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.1.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.3.1.5-1
 - Updated xorg-x11-drv-siliconmotion to version 1.3.1.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:30:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:30:50 -0500
Subject: rpms/xorg-x11-drv-sis/devel xorg-x11-drv-sis.spec,1.7,1.8
Message-ID: <200602071430.k17EUoNF029802@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29770

Modified Files:
	xorg-x11-drv-sis.spec 
Log Message:
bump for new gcc/glibc


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-sis.spec	3 Feb 2006 13:38:31 -0000	1.7
+++ xorg-x11-drv-sis.spec	7 Feb 2006 14:30:48 -0000	1.8
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.8.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   sis.xinf
@@ -63,6 +63,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.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.8.1.3-1
 - Updated xorg-x11-drv-sis to version 0.8.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:31:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:31:14 -0500
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.6,1.7
Message-ID: <200602071431.k17EVEv9029923@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29902

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-sisusb.spec	3 Feb 2006 13:38:50 -0000	1.6
+++ xorg-x11-drv-sisusb.spec	7 Feb 2006 14:31:12 -0000	1.7
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version: 0.7.1.3
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 # FIXME: If using a CVS version, uncomment the second Source0 line and use
 # it instead.
@@ -83,6 +83,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-sisusb to version 0.7.1.3 from X11R7.0
 - Removed 'x' suffix from manpage dirs to match RC4 upstream.



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:31:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:31:47 -0500
Subject: rpms/xorg-x11-drv-spaceorb/devel xorg-x11-drv-spaceorb.spec, 1.6,
	1.7
Message-ID: <200602071431.k17EVl9u030045@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30012

Modified Files:
	xorg-x11-drv-spaceorb.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-spaceorb.spec	2 Feb 2006 09:52:32 -0000	1.6
+++ xorg-x11-drv-spaceorb.spec	7 Feb 2006 14:31:44 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 spaceorb input driver
 Name:      xorg-x11-drv-spaceorb
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-spaceorb to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:32:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:32:09 -0500
Subject: rpms/xorg-x11-drv-summa/devel xorg-x11-drv-summa.spec,1.6,1.7
Message-ID: <200602071432.k17EW9kk030174@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-summa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30144

Modified Files:
	xorg-x11-drv-summa.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-summa.spec	2 Feb 2006 09:53:03 -0000	1.6
+++ xorg-x11-drv-summa.spec	7 Feb 2006 14:32:07 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 summa input driver
 Name:      xorg-x11-drv-summa
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-summa to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:32:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:32:36 -0500
Subject: rpms/xorg-x11-drv-tdfx/devel xorg-x11-drv-tdfx.spec,1.6,1.7
Message-ID: <200602071432.k17EWaK8030318@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tdfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30287

Modified Files:
	xorg-x11-drv-tdfx.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-tdfx.spec	3 Feb 2006 13:39:04 -0000	1.6
+++ xorg-x11-drv-tdfx.spec	7 Feb 2006 14:32:33 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
 Version:   1.1.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.1.1.3-1
 - Updated xorg-x11-drv-tdfx to version 1.1.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:32:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:32:59 -0500
Subject: rpms/xorg-x11-drv-tek4957/devel xorg-x11-drv-tek4957.spec,1.3,1.4
Message-ID: <200602071432.k17EWxYo030456@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tek4957/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30422

Modified Files:
	xorg-x11-drv-tek4957.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-drv-tek4957.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tek4957/devel/xorg-x11-drv-tek4957.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-tek4957.spec	5 Nov 2005 00:18:29 -0000	1.3
+++ xorg-x11-drv-tek4957.spec	7 Feb 2006 14:32:57 -0000	1.4
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 tek4957 input driver
 Name:      xorg-x11-drv-tek4957
 Version: 1.0.0.1
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 # FIXME: If using a CVS version, uncomment the second Source0 line and use
 # it instead.
@@ -81,6 +81,9 @@
 %{_mandir}/man4x/*.4x*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 1.0.0.1-1
 - Updated xorg-x11-drv-tek4957 to version 1.0.0.1 from X11R7 RC1
 - Fix *.la file removal.



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:33:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:33:31 -0500
Subject: rpms/xorg-x11-drv-trident/devel xorg-x11-drv-trident.spec,1.6,1.7
Message-ID: <200602071433.k17EXVkS030580@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30559

Modified Files:
	xorg-x11-drv-trident.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-trident.spec	3 Feb 2006 13:39:20 -0000	1.6
+++ xorg-x11-drv-trident.spec	7 Feb 2006 14:33:28 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 trident video driver
 Name:      xorg-x11-drv-trident
 Version:   1.0.1.2
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   trident.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.2-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.2-1
 - Updated xorg-x11-drv-trident to version 1.0.1.2 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:33:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:33:45 -0500
Subject: rpms/xorg-x11-drv-tseng/devel xorg-x11-drv-tseng.spec,1.6,1.7
Message-ID: <200602071433.k17EXj3a030696@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tseng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30683

Modified Files:
	xorg-x11-drv-tseng.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-tseng.spec	3 Feb 2006 13:39:34 -0000	1.6
+++ xorg-x11-drv-tseng.spec	7 Feb 2006 14:33:43 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tseng video driver
 Name:      xorg-x11-drv-tseng
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tseng.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/tseng.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-tseng to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:34:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:34:04 -0500
Subject: rpms/xorg-x11-drv-ur98/devel xorg-x11-drv-ur98.spec,1.5,1.6
Message-ID: <200602071434.k17EY4cF030811@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-ur98/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30781

Modified Files:
	xorg-x11-drv-ur98.spec 
Log Message:
bump for new gcc/glibc


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-ur98.spec	2 Feb 2006 09:53:53 -0000	1.5
+++ xorg-x11-drv-ur98.spec	7 Feb 2006 14:34:01 -0000	1.6
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ur98 input driver
 Name:      xorg-x11-drv-ur98
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/ur98.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-ur98 to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:34:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:34:27 -0500
Subject: rpms/xorg-x11-drv-v4l/devel xorg-x11-drv-v4l.spec,1.5,1.6
Message-ID: <200602071434.k17EYRw1030883@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-v4l/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30869

Modified Files:
	xorg-x11-drv-v4l.spec 
Log Message:
bump for new gcc/glibc


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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-v4l.spec	3 Feb 2006 13:39:47 -0000	1.5
+++ xorg-x11-drv-v4l.spec	7 Feb 2006 14:34:25 -0000	1.6
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 v4l video driver
 Name:      xorg-x11-drv-v4l
 Version:   0.0.1.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/v4l.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.5-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.0.1.5-1
 - Updated xorg-x11-drv-v4l to version 0.0.1.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:34:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:34:43 -0500
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.6,1.7
Message-ID: <200602071434.k17EYhae030938@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30924

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-vesa.spec	3 Feb 2006 13:40:20 -0000	1.6
+++ xorg-x11-drv-vesa.spec	7 Feb 2006 14:34:41 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.0.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.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> 1.0.1.3-1
 - Updated xorg-x11-drv-vesa to version 1.0.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:34:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:34:56 -0500
Subject: rpms/xorg-x11-drv-vga/devel xorg-x11-drv-vga.spec,1.6,1.7
Message-ID: <200602071434.k17EYus9030993@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-vga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30980

Modified Files:
	xorg-x11-drv-vga.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-vga.spec	3 Feb 2006 13:40:38 -0000	1.6
+++ xorg-x11-drv-vga.spec	7 Feb 2006 14:34:54 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.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> 4.0.0.5-1
 - Updated xorg-x11-drv-vga to version 4.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:35:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:35:17 -0500
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.9,1.10
Message-ID: <200602071435.k17EZH02031054@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31040

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
bump for new gcc/glibc


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-via.spec	3 Feb 2006 13:40:52 -0000	1.9
+++ xorg-x11-drv-via.spec	7 Feb 2006 14:35:15 -0000	1.10
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.1.33.2
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -85,6 +85,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.33.2-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-1
 - Updated xorg-x11-drv-via to version 0.1.33.2 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:35:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:35:42 -0500
Subject: rpms/xorg-x11-drv-vmware/devel xorg-x11-drv-vmware.spec,1.6,1.7
Message-ID: <200602071435.k17EZgbj006681@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-vmware/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4516

Modified Files:
	xorg-x11-drv-vmware.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-vmware.spec	3 Feb 2006 13:41:09 -0000	1.6
+++ xorg-x11-drv-vmware.spec	7 Feb 2006 14:35:40 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vmware video driver
 Name:      xorg-x11-drv-vmware
 Version:   10.11.1.3
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   vmware.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 10.11.1.3-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 10.11.1.3-1
 - Updated xorg-x11-drv-vmware to version 10.11.1.3 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:36:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:36:17 -0500
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.6,1.7
Message-ID: <200602071436.k17EaHvn020462@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17609

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-void.spec	2 Feb 2006 09:54:51 -0000	1.6
+++ xorg-x11-drv-void.spec	7 Feb 2006 14:36:15 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version: 1.0.0.5
-Release: 1
+Release: 1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/void.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-void to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:36:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:36:53 -0500
Subject: rpms/xorg-x11-drv-voodoo/devel xorg-x11-drv-voodoo.spec,1.6,1.7
Message-ID: <200602071436.k17EarUr032218@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-voodoo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30779

Modified Files:
	xorg-x11-drv-voodoo.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-voodoo.spec	3 Feb 2006 13:41:23 -0000	1.6
+++ xorg-x11-drv-voodoo.spec	7 Feb 2006 14:36:40 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
 Version:   1.0.0.5
-Release:   1
+Release:   1.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   voodoo.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* 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
 - Updated xorg-x11-drv-voodoo to version 1.0.0.5 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:37:22 -0500
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.10,1.11
Message-ID: <200602071437.k17EbM7v014321@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11609

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
bump for new gcc/glibc


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-font-utils.spec	27 Jan 2006 03:11:07 -0000	1.10
+++ xorg-x11-font-utils.spec	7 Feb 2006 14:37:20 -0000	1.11
@@ -5,7 +5,7 @@
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -129,6 +129,9 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* 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 18 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated all utilities to the versions shipped in X11R7.0.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:37:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:37:45 -0500
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.15,
	1.16
Message-ID: <200602071437.k17EbjMm023222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22464

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
bump for new gcc/glibc


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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-proto-devel.spec	27 Jan 2006 19:36:23 -0000	1.15
+++ xorg-x11-proto-devel.spec	7 Feb 2006 14:37:43 -0000	1.16
@@ -6,7 +6,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 2
+Release: 2.1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -278,6 +278,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 27 2006 Kristian H??gsberg <krh at redhat.com> 7.0-2
 - Add glproto-texture-from-drawable.patch to add opcodes and tokens
   for GLX_texture_from_drawable extension.



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:38:13 -0500
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.6,1.7
Message-ID: <200602071438.k17EcDp6025544@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25531

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-resutils.spec	31 Jan 2006 16:18:04 -0000	1.6
+++ xorg-x11-resutils.spec	7 Feb 2006 14:38:11 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -95,6 +95,9 @@
 %{_mandir}/man1/viewres.1x*
 
 %changelog
+* 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
 - Update all resource utils to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:38:34 -0500
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.10,
	1.11
Message-ID: <200602071438.k17EcYhS025599@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25586

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
bump for new gcc/glibc


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-server-utils.spec	31 Jan 2006 16:10:02 -0000	1.10
+++ xorg-x11-server-utils.spec	7 Feb 2006 14:38:32 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -212,6 +212,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* 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
 - Updated all packages to the versions from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:38:49 -0500
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.9,1.10
Message-ID: <200602071438.k17EcnQS025654@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25641

Modified Files:
	xorg-x11-twm.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-twm.spec	31 Jan 2006 15:21:42 -0000	1.9
+++ xorg-x11-twm.spec	7 Feb 2006 14:38:46 -0000	1.10
@@ -5,7 +5,7 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -100,6 +100,9 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* 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 18 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated to twm 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:39:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:39:05 -0500
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec,1.6,1.7
Message-ID: <200602071439.k17Ed5aO025709@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25696

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
bump for new gcc/glibc


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-util-macros.spec	24 Dec 2005 04:31:05 -0000	1.6
+++ xorg-x11-util-macros.spec	7 Feb 2006 14:39:03 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -41,6 +41,9 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 23 2005 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Update to util-macros-1.0.1 from X11R7.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:39:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:39:16 -0500
Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.7,1.8
Message-ID: <200602071439.k17EdGJK025763@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25751

Modified Files:
	xorg-x11-utils.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-utils.spec	31 Jan 2006 16:10:25 -0000	1.7
+++ xorg-x11-utils.spec	7 Feb 2006 14:39:14 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -102,6 +102,9 @@
 %{_mandir}/man1/xwininfo.1x.gz
 
 %changelog
+* 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
 - Updated all tarballs to versions from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:39:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:39:42 -0500
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.7,1.8
Message-ID: <200602071439.k17EdgWt025819@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xauth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25806

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-xauth.spec	31 Jan 2006 15:21:56 -0000	1.7
+++ xorg-x11-xauth.spec	7 Feb 2006 14:39:39 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 # FIXME: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -66,6 +66,9 @@
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
+* 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 18 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
 - Updated to xauth 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:39:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:39:52 -0500
Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.7,1.8
Message-ID: <200602071439.k17Edq0f025874@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25861

Modified Files:
	xorg-x11-xbitmaps.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-xbitmaps.spec	31 Jan 2006 15:39:04 -0000	1.7
+++ xorg-x11-xbitmaps.spec	7 Feb 2006 14:39:50 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* 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
 - Updated to xbitmaps 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:40:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:40:11 -0500
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.16,1.17
Message-ID: <200602071440.k17EeBkg025932@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25917

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-xdm.spec	9 Jan 2006 16:54:34 -0000	1.16
+++ xorg-x11-xdm.spec	7 Feb 2006 14:40:08 -0000	1.17
@@ -18,7 +18,7 @@
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -214,6 +214,9 @@
 %{_mandir}/man1x/*.1x*
 
 %changelog
+* 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
 - Updated xdm to version 1.0.1 from X11R7.
 - Added --with-xdmscriptdir option to ./configure to put scripts in /etc



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:40:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:40:34 -0500
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.14,1.15
Message-ID: <200602071440.k17EeYPp025989@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25976

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xfs.spec	5 Feb 2006 22:17:26 -0000	1.14
+++ xorg-x11-xfs.spec	7 Feb 2006 14:40:32 -0000	1.15
@@ -8,7 +8,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 # FIXME: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -288,6 +288,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* 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
+
 * Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com>
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
 - Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:40:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:40:49 -0500
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.5,1.6
Message-ID: <200602071440.k17Een2B026048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xfwp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26033

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-xfwp.spec	31 Jan 2006 16:22:20 -0000	1.5
+++ xorg-x11-xfwp.spec	7 Feb 2006 14:40:46 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X firewall proxy
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man1/xfwp.1x*
 
 %changelog
+* 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
 - Updated all tarballs to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:41:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:41:01 -0500
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.13,1.14
Message-ID: <200602071441.k17Ef1d8026119@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26106

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-xinit.spec	31 Jan 2006 15:31:51 -0000	1.13
+++ xorg-x11-xinit.spec	7 Feb 2006 14:40:59 -0000	1.14
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -93,6 +93,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* 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
 - Updated to xinit 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:41:15 -0500
Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.8,1.9
Message-ID: <200602071441.k17EfF7t026171@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26161

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
bump for new gcc/glibc


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-xkb-utils.spec	31 Jan 2006 15:33:44 -0000	1.8
+++ xorg-x11-xkb-utils.spec	7 Feb 2006 14:41:13 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -97,6 +97,9 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* 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
 - Updated all apps to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:41:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:41:42 -0500
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.6,1.7
Message-ID: <200602071441.k17EfgXt026229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26216

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
bump for new gcc/glibc


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-xsm.spec	31 Jan 2006 16:05:17 -0000	1.6
+++ xorg-x11-xsm.spec	7 Feb 2006 14:41:40 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -122,6 +122,9 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* 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
 - Updated all apps to version 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:42:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:42:00 -0500
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.9,
	1.10
Message-ID: <200602071442.k17Eg0AJ026281@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26271

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
bump for new gcc/glibc


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-xtrans-devel.spec	23 Jan 2006 19:11:39 -0000	1.9
+++ xorg-x11-xtrans-devel.spec	7 Feb 2006 14:41:57 -0000	1.10
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.0
-Release: 3
+Release: 3.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -59,6 +59,9 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Mike A. Harris <mharris at redhat.com> 1.0.0-3
 - Bump and rebuild.
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:42:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:42:17 -0500
Subject: rpms/xpdf/devel xpdf.spec,1.72,1.73
Message-ID: <200602071442.k17EgH1P026342@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26328

Modified Files:
	xpdf.spec 
Log Message:
bump for new gcc/glibc


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- xpdf.spec	23 Jan 2006 14:47:17 -0000	1.72
+++ xpdf.spec	7 Feb 2006 14:42:13 -0000	1.73
@@ -5,7 +5,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 11
+Release: 11.1
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -232,6 +232,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-11.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 23 2006 Than Ngo <than at redhat.com> 3.01-11
 - add correct app-defaults directory #178545
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:42:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:42:34 -0500
Subject: rpms/xrestop/devel xrestop.spec,1.7,1.8
Message-ID: <200602071442.k17EgYSj026398@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xrestop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26384

Modified Files:
	xrestop.spec 
Log Message:
bump for new gcc/glibc


Index: xrestop.spec
===================================================================
RCS file: /cvs/dist/rpms/xrestop/devel/xrestop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xrestop.spec	9 Dec 2005 22:43:55 -0000	1.7
+++ xrestop.spec	7 Feb 2006 14:42:32 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: X Resource Monitor
 Name: xrestop
 Version: 0.2
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Development/Tools
 URL: http://www.freedesktop.org/Software/xrestop
@@ -41,6 +41,9 @@
 %{_mandir}/man1/xrestop.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2-6.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:42:42 -0500
Subject: rpms/xsane/devel xsane.spec,1.28,1.29
Message-ID: <200602071442.k17EggjO026453@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26439

Modified Files:
	xsane.spec 
Log Message:
bump for new gcc/glibc


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xsane.spec	16 Jan 2006 14:27:10 -0000	1.28
+++ xsane.spec	7 Feb 2006 14:42:40 -0000	1.29
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2
+Release: 2.1
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
@@ -97,6 +97,9 @@
 exit 0
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan 16 2006 Nils Philippsen <nphilipp at redhat.com> 0.99-2
 - fix buffer overflow
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:42:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:42:51 -0500
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.72,1.73
Message-ID: <200602071442.k17EgpL5026505@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26495

Modified Files:
	xscreensaver.spec 
Log Message:
bump for new gcc/glibc


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- xscreensaver.spec	23 Jan 2006 02:51:46 -0000	1.72
+++ xscreensaver.spec	7 Feb 2006 14:42:49 -0000	1.73
@@ -6,7 +6,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release: 	1
+Release: 	1.1
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -253,6 +253,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.23-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Jan 13 2006 Ray Strode <rstrode at redhat.com> 1:4.23-1
 - update to 4.23
 - add a BuildRequires on imake (spotted by Mamoru Tasaka)



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:43:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:43:14 -0500
Subject: rpms/xsri/devel xsri.spec,1.12,1.13
Message-ID: <200602071443.k17EhEsf026564@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26550

Modified Files:
	xsri.spec 
Log Message:
bump for new gcc/glibc


Index: xsri.spec
===================================================================
RCS file: /cvs/dist/rpms/xsri/devel/xsri.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xsri.spec	9 Dec 2005 22:43:56 -0000	1.12
+++ xsri.spec	7 Feb 2006 14:43:12 -0000	1.13
@@ -2,7 +2,7 @@
 Summary:   X Set Root Image
 Name:      xsri
 Version:   2.1.0
-Release: 9.1
+Release: 9.2
 Epoch:     1
 License:   GPL
 Group:     System Environment/Base
@@ -35,6 +35,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:43:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:43:22 -0500
Subject: rpms/xterm/devel xterm.spec,1.34,1.35
Message-ID: <200602071443.k17EhMAj026619@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26605

Modified Files:
	xterm.spec 
Log Message:
bump for new gcc/glibc


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xterm.spec	17 Jan 2006 20:41:21 -0000	1.34
+++ xterm.spec	7 Feb 2006 14:43:20 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 208
-Release: 1
+Release: 1.1
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -105,6 +105,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 208-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 17 2006 Jason Vas Dias<jvdias at redhat.com> - 208-1
 - Upgrade to upstream version 208
 - Allow root user to grab the console, even if /dev/console 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:43:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:43:33 -0500
Subject: rpms/yaboot/devel yaboot.spec,1.30,1.31
Message-ID: <200602071443.k17EhXlG026674@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26660

Modified Files:
	yaboot.spec 
Log Message:
bump for new gcc/glibc


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- yaboot.spec	9 Dec 2005 22:43:56 -0000	1.30
+++ yaboot.spec	7 Feb 2006 14:43:31 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.16.1
+Release: 0.16.2
 License: GPL
 Group: System Environment/Base
 Source: http://penguinppc.org/bootloaders/yaboot/yaboot-%{version}.tar.gz
@@ -107,6 +107,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.16.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:43:42 -0500
Subject: rpms/yelp/devel yelp.spec,1.49,1.50
Message-ID: <200602071443.k17Ehgih026728@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26715

Modified Files:
	yelp.spec 
Log Message:
bump for new gcc/glibc


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- yelp.spec	31 Jan 2006 05:20:51 -0000	1.49
+++ yelp.spec	7 Feb 2006 14:43:40 -0000	1.50
@@ -13,7 +13,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.13.4
-Release: 1
+Release: 1.1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-1
 - Update to 2.13.4
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:43:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:43:51 -0500
Subject: rpms/ypbind/devel ypbind.spec,1.21,1.22
Message-ID: <200602071443.k17EhpXx026783@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26770

Modified Files:
	ypbind.spec 
Log Message:
bump for new gcc/glibc


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ypbind.spec	9 Dec 2005 22:43:57 -0000	1.21
+++ ypbind.spec	7 Feb 2006 14:43:49 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.17.2
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -84,6 +84,9 @@
 %doc README NEWS
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:1.17.2-5.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:44:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:44:03 -0500
Subject: rpms/ypserv/devel ypserv.spec,1.26,1.27
Message-ID: <200602071444.k17Ei3ix026838@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26825

Modified Files:
	ypserv.spec 
Log Message:
bump for new gcc/glibc


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ypserv.spec	9 Jan 2006 17:06:47 -0000	1.26
+++ ypserv.spec	7 Feb 2006 14:44:01 -0000	1.27
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.13
-Release: 10
+Release: 10.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13-10.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Mon Jan  9 2006 Chris Feist <cfeist at redhat.com> - 2.13-10
 - Fix crash with ypxfr caused by failing to zero out data (bz #161217)
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:44:11 -0500
Subject: rpms/yp-tools/devel yp-tools.spec,1.17,1.18
Message-ID: <200602071444.k17EiBH0026893@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26880

Modified Files:
	yp-tools.spec 
Log Message:
bump for new gcc/glibc


Index: yp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- yp-tools.spec	9 Dec 2005 22:43:57 -0000	1.17
+++ yp-tools.spec	7 Feb 2006 14:44:09 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
 Version: 2.8
-Release: 8.1
+Release: 8.2
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %dir /var/yp
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8-8.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:44:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:44:19 -0500
Subject: rpms/zip/devel zip.spec,1.20,1.21
Message-ID: <200602071444.k17EiJRR026948@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26935

Modified Files:
	zip.spec 
Log Message:
bump for new gcc/glibc


Index: zip.spec
===================================================================
RCS file: /cvs/dist/rpms/zip/devel/zip.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- zip.spec	9 Dec 2005 22:43:57 -0000	1.20
+++ zip.spec	7 Feb 2006 14:44:17 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP.
 Name: zip
 Version: 2.31
-Release: 1.1
+Release: 1.2
 License: distributable
 Group: Applications/Archiving
 Source: http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz
@@ -66,6 +66,9 @@
 %{_mandir}/man1/zip.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.31-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:44:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:44:28 -0500
Subject: rpms/zisofs-tools/devel zisofs-tools.spec,1.12,1.13
Message-ID: <200602071444.k17EiSGD027004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zisofs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26990

Modified Files:
	zisofs-tools.spec 
Log Message:
bump for new gcc/glibc


Index: zisofs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/zisofs-tools/devel/zisofs-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- zisofs-tools.spec	9 Dec 2005 22:43:58 -0000	1.12
+++ zisofs-tools.spec	7 Feb 2006 14:44:25 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Utilities for creating compressed CD-ROM filesystems.
 Name: zisofs-tools
 Version: 1.0.6
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/System
 URL: http://www.kernel.org/pub/linux/utils/fs/zisofs/
@@ -35,6 +35,9 @@
 %{_mandir}/man1/mkzftree.1*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-3.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:44:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:44:36 -0500
Subject: rpms/zlib/devel zlib.spec,1.24,1.25
Message-ID: <200602071444.k17EiamI027057@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27045

Modified Files:
	zlib.spec 
Log Message:
bump for new gcc/glibc


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zlib.spec	9 Dec 2005 22:43:58 -0000	1.24
+++ zlib.spec	7 Feb 2006 14:44:34 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-Release: 1.1
+Release: 1.2
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
@@ -77,6 +77,9 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 14:56:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 09:56:11 -0500
Subject: rpms/booty/devel .cvsignore, 1.37, 1.38 booty.spec, 1.40,
	1.41 sources, 1.40, 1.41
Message-ID: <200602071456.k17EuBWk016022@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15958

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	6 Feb 2006 22:03:51 -0000	1.37
+++ .cvsignore	7 Feb 2006 14:56:09 -0000	1.38
@@ -1 +1,2 @@
 booty-0.66.tar.bz2
+booty-0.67.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- booty.spec	6 Feb 2006 22:03:52 -0000	1.40
+++ booty.spec	7 Feb 2006 14:56:09 -0000	1.41
@@ -1,6 +1,6 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.66
+Version: 0.67
 Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
@@ -34,6 +34,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 0.67-1
+- Fix syntax error.
+
 * Mon Feb  6 2006 Peter Jones <pjones at redhat.com> - 0.66-1
 - use "mapper/raidnamep0" for partition names instead of "mapper/raidname0"
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	6 Feb 2006 22:18:16 -0000	1.40
+++ sources	7 Feb 2006 14:56:09 -0000	1.41
@@ -1 +1 @@
-4df77e8d430fedc7378cb01339fad752  booty-0.66.tar.bz2
+f85304d2a1d2f3a3a95c8a02a663ad8c  booty-0.67.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:06:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:06:38 -0500
Subject: rpms/xpdf/FC-4 xpdf-3.01pl2.patch, NONE, 1.1 xpdf.spec, 1.57,
	1.58 xpdf-2.01-locale.patch, 1.1, NONE xpdf-2.02-pdftops.patch,
	1.1, NONE xpdf-3.0-cjk-font.patch, 1.1,
	NONE xpdf-3.00-CAN-2005-0064.patch, 1.1,
	NONE xpdf-3.00-CVE-2005-3191.patch, 1.1,
	NONE xpdf-3.00-PathScanner.patch, 1.1,
	NONE xpdf-3.00-can-2004-1125.patch, 1.1,
	NONE xpdf-3.00-freetype2.patch, 1.1,
	NONE xpdf-3.00-overflow.patch, 1.2,
	NONE xpdf-3.01-CAN-2005-3193.patch, 1.1,
	NONE xpdf-3.01-CVE-2005-3191.patch, 1.1,
	NONE xpdf-3.01pl1.patch, 1.1, NONE
Message-ID: <200602071506.k17F6cPN018790@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.01pl2.patch 
Removed Files:
	xpdf-2.01-locale.patch xpdf-2.02-pdftops.patch 
	xpdf-3.0-cjk-font.patch xpdf-3.00-CAN-2005-0064.patch 
	xpdf-3.00-CVE-2005-3191.patch xpdf-3.00-PathScanner.patch 
	xpdf-3.00-can-2004-1125.patch xpdf-3.00-freetype2.patch 
	xpdf-3.00-overflow.patch xpdf-3.01-CAN-2005-3193.patch 
	xpdf-3.01-CVE-2005-3191.patch xpdf-3.01pl1.patch 
Log Message:
- apply official patch to fix buffer overflow issue in the xpdf codebase
  when handling splash images CVE-2006-0301 (#179047)



xpdf-3.01pl2.patch:
 goo/gmem.c                   |   22 ++++++++++!!!!!!!!!!!!
 splash/SplashXPathScanner.cc |   32 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf/JBIG2Stream.cc          |   19 +++++++++++++++++!!
 xpdf/JPXStream.cc            |    7 +++++++
 xpdf/Stream.cc               |   41 +++++++++++++++++++++++++++++++++++++++++
 xpdf/Stream.h                |    5 +++!!
 6 files changed, 78 insertions(+), 48 modifications(!)

--- NEW FILE xpdf-3.01pl2.patch ---
diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
*** xpdf-3.01.orig/goo/gmem.c	Tue Aug 16 22:34:30 2005
--- xpdf-3.01/goo/gmem.c	Tue Jan 17 17:03:57 2006
***************
*** 11,16 ****
--- 11,17 ----
  #include <stdlib.h>
  #include <stddef.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  
  #ifdef DEBUG_MEM
***************
*** 63,69 ****
    int lst;
    unsigned long *trl, *p;
  
!   if (size == 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
--- 64,70 ----
    int lst;
    unsigned long *trl, *p;
  
!   if (size <= 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
***************
*** 86,92 ****
  #else
    void *p;
  
!   if (size == 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
--- 87,93 ----
  #else
    void *p;
  
!   if (size <= 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
***************
*** 102,108 ****
    void *q;
    int oldSize;
  
!   if (size == 0) {
      if (p)
        gfree(p);
      return NULL;
--- 103,109 ----
    void *q;
    int oldSize;
  
!   if (size <= 0) {
      if (p)
        gfree(p);
      return NULL;
***************
*** 120,126 ****
  #else
    void *q;
  
!   if (size == 0) {
      if (p)
        free(p);
      return NULL;
--- 121,127 ----
  #else
    void *q;
  
!   if (size <= 0) {
      if (p)
        free(p);
      return NULL;
***************
*** 140,147 ****
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 141,151 ----
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
***************
*** 151,158 ****
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 155,168 ----
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     if (p) {
+       gfree(p);
+     }
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JBIG2Stream.cc	Tue Jan 17 17:29:46 2006
***************
*** 13,18 ****
--- 13,19 ----
  #endif
  
  #include <stdlib.h>
+ #include <limits.h>
  #include "GList.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 681,686 ****
--- 682,691 ----
    w = wA;
    h = hA;
    line = (wA + 7) >> 3;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    data[h * line] = 0;
***************
*** 692,697 ****
--- 697,706 ----
    w = bitmap->w;
    h = bitmap->h;
    line = bitmap->line;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    memcpy(data, bitmap->data, h * line);
***************
*** 720,726 ****
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
--- 729,735 ----
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
***************
*** 2294,2299 ****
--- 2303,2316 ----
        !readUWord(&stepX) || !readUWord(&stepY)) {
      goto eofError;
    }
+   if (w == 0 || h == 0 || w >= INT_MAX / h) {
+     error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
+     return;
+   }
+   if (gridH == 0 || gridW >= INT_MAX / gridH) {
+     error(getPos(), "Bad grid size in JBIG2 halftone segment");
+     return;
+   }
  
    // get pattern dictionary
    if (nRefSegs != 1) {
diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
*** xpdf-3.01.orig/xpdf/JPXStream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JPXStream.cc	Tue Jan 17 17:14:06 2006
***************
*** 12,17 ****
--- 12,18 ----
  #pragma implementation
  #endif
  
+ #include <limits.h>
  #include "gmem.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 818,823 ****
--- 819,830 ----
  	            / img.xTileSize;
        img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
  	            / img.yTileSize;
+       // check for overflow before allocating memory
+       if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
+ 	  img.nXTiles >= INT_MAX / img.nYTiles) {
+ 	error(getPos(), "Bad tile count in JPX SIZ marker segment");
+ 	return gFalse;
+       }
        img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
  				      sizeof(JPXTile));
        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
*** xpdf-3.01.orig/xpdf/Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.cc	Tue Jan 17 17:31:52 2006
***************
*** 15,20 ****
--- 15,21 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <stddef.h>
+ #include <limits.h>
  #ifndef WIN32
  #include <unistd.h>
  #endif
***************
*** 406,418 ****
--- 407,432 ----
    width = widthA;
    nComps = nCompsA;
    nBits = nBitsA;
+   predLine = NULL;
+   ok = gFalse;
  
    nVals = width * nComps;
+   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+       nComps >= INT_MAX / nBits ||
+       width >= INT_MAX / nComps / nBits ||
+       nVals * nBits + 7 < 0) {
+     return;
+   }
    pixBytes = (nComps * nBits + 7) >> 3;
    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+   if (rowBytes <= 0) {
+     return;
+   }
    predLine = (Guchar *)gmalloc(rowBytes);
    memset(predLine, 0, rowBytes);
    predIdx = rowBytes;
+ 
+   ok = gTrue;
  }
  
  StreamPredictor::~StreamPredictor() {
***************
*** 1004,1009 ****
--- 1018,1027 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
***************
*** 1259,1264 ****
--- 1277,1285 ----
    if (columns < 1) {
      columns = 1;
    }
+   if (columns + 4 <= 0) {
+     columns = INT_MAX - 4;
+   }
    rows = rowsA;
    endOfBlock = endOfBlockA;
    black = blackA;
***************
*** 2899,2904 ****
--- 2920,2930 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2925,2930 ****
--- 2951,2961 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2947,2952 ****
--- 2978,2988 ----
  
    length = read16() - 2;
    scanInfo.numComps = str->getChar();
+   if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     scanInfo.numComps = 0;
+     return gFalse;
+   }
    --length;
    if (length != 2 * scanInfo.numComps + 3) {
      error(getPos(), "Bad DCT scan info block");
***************
*** 3041,3046 ****
--- 3077,3083 ----
  	numACHuffTables = index+1;
        tbl = &acHuffTables[index];
      } else {
+       index &= 0x0f;
        if (index >= numDCHuffTables)
  	numDCHuffTables = index+1;
        tbl = &dcHuffTables[index];
***************
*** 3827,3832 ****
--- 3864,3873 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
*** xpdf-3.01.orig/xpdf/Stream.h	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.h	Tue Jan 17 17:19:54 2006
***************
*** 232,237 ****
--- 232,239 ----
  
    ~StreamPredictor();
  
+   GBool isOk() { return ok; }
+ 
    int lookChar();
    int getChar();
  
***************
*** 249,254 ****
--- 251,257 ----
    int rowBytes;			// bytes per line
    Guchar *predLine;		// line buffer
    int predIdx;			// current index in predLine
+   GBool ok;
  };
  
  //------------------------------------------------------------------------
***************
*** 527,533 ****
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { inputBits -= n; }
  };
  
  //------------------------------------------------------------------------
--- 530,536 ----
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
  };
  
  //------------------------------------------------------------------------
diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
*** xpdf-3.01.orig/splash/SplashXPathScanner.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/splash/SplashXPathScanner.cc	Wed Feb  1 17:01:14 2006
***************
*** 186,192 ****
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
--- 186,192 ----
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
***************
*** 236,254 ****
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (ySegMin <= y) {
! 	// intersection with top edge
! 	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
        } else {
! 	// x coord of segment endpoint with min y coord
! 	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
        }
!       if (ySegMax >= y + 1) {
! 	// intersection with bottom edge
! 	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       } else {
! 	// x coord of segment endpoint with max y coord
! 	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
        }
      }
      if (xx0 < xx1) {
--- 236,262 ----
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (seg->x0 < seg->x1) {
! 	xSegMin = seg->x0;
! 	xSegMax = seg->x1;
        } else {
! 	xSegMin = seg->x1;
! 	xSegMax = seg->x0;
        }
!       // intersection with top edge
!       xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
!       // intersection with bottom edge
!       xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       // the segment may not actually extend to the top and/or bottom edges
!       if (xx0 < xSegMin) {
! 	xx0 = xSegMin;
!       } else if (xx0 > xSegMax) {
! 	xx0 = xSegMax;
!       }
!       if (xx1 < xSegMin) {
! 	xx1 = xSegMin;
!       } else if (xx1 > xSegMax) {
! 	xx1 = xSegMax;
        }
      }
      if (xx0 < xx1) {


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/xpdf.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- xpdf.spec	10 Jan 2006 13:00:43 -0000	1.57
+++ xpdf.spec	7 Feb 2006 15:06:35 -0000	1.58
@@ -5,7 +5,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 0.FC4.6
+Release: 0.FC4.7
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -30,8 +30,10 @@
 Patch11: xpdf-3.01-crash.patch
 Patch12: xpdf-3.00-64bit.patch
 Patch13: xpdf-3.01-resize.patch
-Patch15: xpdf-3.01-CVE-2005-3191.patch
-Patch16: xpdf-3.01-CAN-2005-3193.patch
+
+# Security patches
+# xpdf-3.01-CVE-2005-3191, CAN-2005-3193, CVE-2006-0301
+Patch100: xpdf-3.01pl2.patch
 
 Requires: urw-fonts
 Requires: htmlview
@@ -116,8 +118,9 @@
 %patch11 -p1 -b .crash
 %patch12 -p1 -b .alloc
 %patch13 -p1 -b .resize
-%patch15 -p1 -b .CVE-2005-3191
-%patch16 -p1 -b .CVE-2005-3193
+
+# security patches
+%patch100 -p1 -b .CVE-2005-3191_CAN-2005-3193_CVE-2006-0301
 
 %build
 find -name "*orig" | xargs rm -f
@@ -205,7 +208,11 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
-* Tue Jan 10 2006 Karsten Hopp <karsten at redhat.de> 3.01-0.FC4.6
+* Fri Jan 27 2006 Than Ngo <than at redhat.com> 1:3.01-0.FC4.7
+- apply patch to fix buffer overflow issue in the xpdf codebase
+  when handling splash images CVE-2006-0301 (#179047).
+
+* Tue Jan 10 2006 Karsten Hopp <karsten at redhat.de> 1:3.01-0.FC4.6
 - fix CAN-2005-3193
 
 * Wed Dec 14 2005 Kristian H?gsberg <krh at redhat.com> 1:3.01-0.FC4.5


--- xpdf-2.01-locale.patch DELETED ---


--- xpdf-2.02-pdftops.patch DELETED ---


--- xpdf-3.0-cjk-font.patch DELETED ---


--- xpdf-3.00-CAN-2005-0064.patch DELETED ---


--- xpdf-3.00-CVE-2005-3191.patch DELETED ---


--- xpdf-3.00-PathScanner.patch DELETED ---


--- xpdf-3.00-can-2004-1125.patch DELETED ---


--- xpdf-3.00-freetype2.patch DELETED ---


--- xpdf-3.00-overflow.patch DELETED ---


--- xpdf-3.01-CAN-2005-3193.patch DELETED ---


--- xpdf-3.01-CVE-2005-3191.patch DELETED ---


--- xpdf-3.01pl1.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:10:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:10:10 -0500
Subject: rpms/xpdf/FC-4 xpdf.spec,1.58,1.59
Message-ID: <200602071510.k17FAAaN019879@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	xpdf.spec 
Log Message:
- apply official patch to fix buffer overflow issue in the xpdf codebase
  when handling splash images CVE-2006-0301 (#179047).



Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/xpdf.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xpdf.spec	7 Feb 2006 15:06:35 -0000	1.58
+++ xpdf.spec	7 Feb 2006 15:10:08 -0000	1.59
@@ -5,7 +5,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 0.FC4.7
+Release: 0.FC4.8
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -208,6 +208,10 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 1:3.01-0.FC4.8
+- apply official patch to fix buffer overflow issue in the xpdf codebase
+  when handling splash images CVE-2006-0301 (#179047).
+
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 1:3.01-0.FC4.7
 - apply patch to fix buffer overflow issue in the xpdf codebase
   when handling splash images CVE-2006-0301 (#179047).



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:25:11 -0500
Subject: rpms/xpdf/FC-3 xpdf-3.00-64bit.patch, NONE, 1.1 xpdf-3.00-gcc4.patch,
	NONE, 1.1 xpdf-3.01-crash.patch, NONE,
	1.1 xpdf-3.01-resize.patch, NONE, 1.1 xpdf-3.01pl2.patch, NONE,
	1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xpdf.spec, 1.44,
	1.45 xpdf-2.01-locale.patch, 1.1, NONE xpdf-2.02-pdftops.patch,
	1.1, NONE xpdf-3.0-cjk-font.patch, 1.1,
	NONE xpdf-3.00-CAN-2005-0064.patch, 1.1,
	NONE xpdf-3.00-PathScanner.patch, 1.1,
	NONE xpdf-3.00-can-2004-1125.patch, 1.1,
	NONE xpdf-3.00-freetype2.patch, 1.1,
	NONE xpdf-3.00-overflow.patch, 1.2, NONE
Message-ID: <200602071525.k17FPBN4006545@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xpdf/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv6456

Modified Files:
	.cvsignore sources xpdf.spec 
Added Files:
	xpdf-3.00-64bit.patch xpdf-3.00-gcc4.patch 
	xpdf-3.01-crash.patch xpdf-3.01-resize.patch 
	xpdf-3.01pl2.patch 
Removed Files:
	xpdf-2.01-locale.patch xpdf-2.02-pdftops.patch 
	xpdf-3.0-cjk-font.patch xpdf-3.00-CAN-2005-0064.patch 
	xpdf-3.00-PathScanner.patch xpdf-3.00-can-2004-1125.patch 
	xpdf-3.00-freetype2.patch xpdf-3.00-overflow.patch 
Log Message:
- apply patch to fix buffer overflow in kpdf, CVE-2006-0301


xpdf-3.00-64bit.patch:
 gmem.c |   10 +++++-----
 gmem.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE xpdf-3.00-64bit.patch ---
--- xpdf-3.00/goo/gmem.h.me	2005-07-25 10:47:46.000000000 +0200
+++ xpdf-3.00/goo/gmem.h	2005-07-25 10:49:55.000000000 +0200
@@ -19,13 +19,13 @@
  * Same as malloc, but prints error message and exits if malloc()
  * returns NULL.
  */
-extern void *gmalloc(int size);
+extern void *gmalloc(size_t size);
 
 /*
  * Same as realloc, but prints error message and exits if realloc()
  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
  */
-extern void *grealloc(void *p, int size);
+extern void *grealloc(void *p, size_t size);
 
 /*
  * Same as free, but checks for and ignores NULL pointers.
--- xpdf-3.00/goo/gmem.c.me	2005-07-25 10:47:51.000000000 +0200
+++ xpdf-3.00/goo/gmem.c	2005-07-25 10:49:30.000000000 +0200
@@ -53,9 +53,9 @@
 
 #endif /* DEBUG_MEM */
 
-void *gmalloc(int size) {
+void *gmalloc(size_t size) {
 #ifdef DEBUG_MEM
-  int size1;
+  size_t size1;
   char *mem;
   GMemHdr *hdr;
   void *data;
@@ -94,11 +94,11 @@
 #endif
 }
 
-void *grealloc(void *p, int size) {
+void *grealloc(void *p, size_t size) {
 #ifdef DEBUG_MEM
   GMemHdr *hdr;
   void *q;
-  int oldSize;
+  size_t oldSize;
 
   if (size == 0) {
     if (p)
@@ -137,7 +137,7 @@
 
 void gfree(void *p) {
 #ifdef DEBUG_MEM
-  int size;
+  size_t size;
   GMemHdr *hdr;
   GMemHdr *prevHdr, *q;
   int lst;

xpdf-3.00-gcc4.patch:
 TextOutputDev.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xpdf-3.00-gcc4.patch ---
--- xpdf-3.00/xpdf/TextOutputDev.h.orig	2005-06-13 10:11:17.000000000 +0200
+++ xpdf-3.00/xpdf/TextOutputDev.h	2005-06-13 10:27:18.000000000 +0200
@@ -169,7 +169,7 @@
 class TextLine {
 public:
 
-  TextLine(TextBlock *blkA, int rotA, double baseA);
+  TextLine(class TextBlock *blkA, int rotA, double baseA);
   ~TextLine();
 
   void addWord(TextWord *word);
@@ -226,7 +226,7 @@
 class TextBlock {
 public:
 
-  TextBlock(TextPage *pageA, int rotA);
+  TextBlock(class TextPage *pageA, int rotA);
   ~TextBlock();
 
   void addWord(TextWord *word);
@@ -416,7 +416,7 @@
 private:
 
   void clear();
-  void assignColumns(TextLineFrag *frags, int nFrags, int rot);
+  void assignColumns(class TextLineFrag *frags, int nFrags, int rot);
   int dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GString *s);
 
   GBool rawOrder;		// keep text in content stream order

xpdf-3.01-crash.patch:
 fofi/FoFiType1.cc |   11 ++++++++---
 splash/Splash.cc  |    5 +++++
 2 files changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE xpdf-3.01-crash.patch ---
--- xpdf-3.00/splash/Splash.cc.tn	2005-07-25 09:59:45.000000000 +0200
+++ xpdf-3.00/splash/Splash.cc	2005-07-25 10:00:58.000000000 +0200
@@ -636,6 +641,11 @@
 
   xPath = new SplashXPath(path, state->flatness, gTrue);
   xPath->sort();
+  if (!&xPath->segs[0])
+  {
+    delete xPath;
+    return splashErrEmptyPath;
+  }
   scanner = new SplashXPathScanner(xPath, eo);
 
   // get the min and max x and y values
--- xpdf-3.00/fofi/FoFiType1.cc.tn	2005-07-25 10:34:04.000000000 +0200
+++ xpdf-3.00/fofi/FoFiType1.cc	2005-07-25 10:41:37.000000000 +0200
@@ -187,9 +187,14 @@
 	    }
 	  }
 	} else {
-	  if (strtok(buf, " \t") &&
-	      (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
-	    break;
+	  p = strtok(buf, " \t\n\r");
+	  if (p)
+	  {
+	    if (!strcmp(p, "def")) break;
+	    if (!strcmp(p, "readonly")) break;
+	    // the spec does not says this but i'm mantaining old xpdf behaviour that accepts "foo def" as end of the encoding array
+	    p = strtok(buf, " \t\n\r");
+	    if (p && !strcmp(p, "def")) break;
 	  }
 	}
 	line = line1;

xpdf-3.01-resize.patch:
 XPDFCore.cc |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE xpdf-3.01-resize.patch ---
--- xpdf-3.01/xpdf/XPDFCore.cc.resize	2005-10-06 23:40:10.000000000 +0200
+++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-06 23:40:10.000000000 +0200
@@ -979,6 +979,9 @@
   XPDFCore *core = (XPDFCore *)ptr;
   XEvent event;
   Widget top;
+  Window rootWin;
+  int x1, y1;
+  Guint w1, h1, bw1, depth1;
   Arg args[2];
   int n;
   Dimension w, h;
@@ -986,15 +989,20 @@
 
   // find the top-most widget which has an associated window, and look
   // for a pending ConfigureNotify in the event queue -- if there is
-  // one, that means we're still resizing, and we want to skip the
-  // current event
+  // one, and it specifies a different width or height, that means
+  // we're still resizing, and we want to skip the current event
   for (top = core->parentWidget;
        XtParent(top) && XtWindow(XtParent(top));
        top = XtParent(top)) ;
   if (XCheckTypedWindowEvent(core->display, XtWindow(top),
 			     ConfigureNotify, &event)) {
     XPutBackEvent(core->display, &event);
-    return;
+    XGetGeometry(core->display, event.xconfigure.window,
+		 &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
+    if ((Guint)event.xconfigure.width != w1 ||
+	(Guint)event.xconfigure.height != h1) {
+      return;
+    }
   }
 
   n = 0;

xpdf-3.01pl2.patch:
 goo/gmem.c                   |   22 ++++++++++!!!!!!!!!!!!
 splash/SplashXPathScanner.cc |   32 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf/JBIG2Stream.cc          |   19 +++++++++++++++++!!
 xpdf/JPXStream.cc            |    7 +++++++
 xpdf/Stream.cc               |   41 +++++++++++++++++++++++++++++++++++++++++
 xpdf/Stream.h                |    5 +++!!
 6 files changed, 78 insertions(+), 48 modifications(!)

--- NEW FILE xpdf-3.01pl2.patch ---
diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
*** xpdf-3.01.orig/goo/gmem.c	Tue Aug 16 22:34:30 2005
--- xpdf-3.01/goo/gmem.c	Tue Jan 17 17:03:57 2006
***************
*** 11,16 ****
--- 11,17 ----
  #include <stdlib.h>
  #include <stddef.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  
  #ifdef DEBUG_MEM
***************
*** 63,69 ****
    int lst;
    unsigned long *trl, *p;
  
!   if (size == 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
--- 64,70 ----
    int lst;
    unsigned long *trl, *p;
  
!   if (size <= 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
***************
*** 86,92 ****
  #else
    void *p;
  
!   if (size == 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
--- 87,93 ----
  #else
    void *p;
  
!   if (size <= 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
***************
*** 102,108 ****
    void *q;
    int oldSize;
  
!   if (size == 0) {
      if (p)
        gfree(p);
      return NULL;
--- 103,109 ----
    void *q;
    int oldSize;
  
!   if (size <= 0) {
      if (p)
        gfree(p);
      return NULL;
***************
*** 120,126 ****
  #else
    void *q;
  
!   if (size == 0) {
      if (p)
        free(p);
      return NULL;
--- 121,127 ----
  #else
    void *q;
  
!   if (size <= 0) {
      if (p)
        free(p);
      return NULL;
***************
*** 140,147 ****
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 141,151 ----
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
***************
*** 151,158 ****
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 155,168 ----
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     if (p) {
+       gfree(p);
+     }
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JBIG2Stream.cc	Tue Jan 17 17:29:46 2006
***************
*** 13,18 ****
--- 13,19 ----
  #endif
  
  #include <stdlib.h>
+ #include <limits.h>
  #include "GList.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 681,686 ****
--- 682,691 ----
    w = wA;
    h = hA;
    line = (wA + 7) >> 3;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    data[h * line] = 0;
***************
*** 692,697 ****
--- 697,706 ----
    w = bitmap->w;
    h = bitmap->h;
    line = bitmap->line;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    memcpy(data, bitmap->data, h * line);
***************
*** 720,726 ****
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
--- 729,735 ----
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
***************
*** 2294,2299 ****
--- 2303,2316 ----
        !readUWord(&stepX) || !readUWord(&stepY)) {
      goto eofError;
    }
+   if (w == 0 || h == 0 || w >= INT_MAX / h) {
+     error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
+     return;
+   }
+   if (gridH == 0 || gridW >= INT_MAX / gridH) {
+     error(getPos(), "Bad grid size in JBIG2 halftone segment");
+     return;
+   }
  
    // get pattern dictionary
    if (nRefSegs != 1) {
diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
*** xpdf-3.01.orig/xpdf/JPXStream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JPXStream.cc	Tue Jan 17 17:14:06 2006
***************
*** 12,17 ****
--- 12,18 ----
  #pragma implementation
  #endif
  
+ #include <limits.h>
  #include "gmem.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 818,823 ****
--- 819,830 ----
  	            / img.xTileSize;
        img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
  	            / img.yTileSize;
+       // check for overflow before allocating memory
+       if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
+ 	  img.nXTiles >= INT_MAX / img.nYTiles) {
+ 	error(getPos(), "Bad tile count in JPX SIZ marker segment");
+ 	return gFalse;
+       }
        img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
  				      sizeof(JPXTile));
        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
*** xpdf-3.01.orig/xpdf/Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.cc	Tue Jan 17 17:31:52 2006
***************
*** 15,20 ****
--- 15,21 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <stddef.h>
+ #include <limits.h>
  #ifndef WIN32
  #include <unistd.h>
  #endif
***************
*** 406,418 ****
--- 407,432 ----
    width = widthA;
    nComps = nCompsA;
    nBits = nBitsA;
+   predLine = NULL;
+   ok = gFalse;
  
    nVals = width * nComps;
+   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+       nComps >= INT_MAX / nBits ||
+       width >= INT_MAX / nComps / nBits ||
+       nVals * nBits + 7 < 0) {
+     return;
+   }
    pixBytes = (nComps * nBits + 7) >> 3;
    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+   if (rowBytes <= 0) {
+     return;
+   }
    predLine = (Guchar *)gmalloc(rowBytes);
    memset(predLine, 0, rowBytes);
    predIdx = rowBytes;
+ 
+   ok = gTrue;
  }
  
  StreamPredictor::~StreamPredictor() {
***************
*** 1004,1009 ****
--- 1018,1027 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
***************
*** 1259,1264 ****
--- 1277,1285 ----
    if (columns < 1) {
      columns = 1;
    }
+   if (columns + 4 <= 0) {
+     columns = INT_MAX - 4;
+   }
    rows = rowsA;
    endOfBlock = endOfBlockA;
    black = blackA;
***************
*** 2899,2904 ****
--- 2920,2930 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2925,2930 ****
--- 2951,2961 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2947,2952 ****
--- 2978,2988 ----
  
    length = read16() - 2;
    scanInfo.numComps = str->getChar();
+   if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     scanInfo.numComps = 0;
+     return gFalse;
+   }
    --length;
    if (length != 2 * scanInfo.numComps + 3) {
      error(getPos(), "Bad DCT scan info block");
***************
*** 3041,3046 ****
--- 3077,3083 ----
  	numACHuffTables = index+1;
        tbl = &acHuffTables[index];
      } else {
+       index &= 0x0f;
        if (index >= numDCHuffTables)
  	numDCHuffTables = index+1;
        tbl = &dcHuffTables[index];
***************
*** 3827,3832 ****
--- 3864,3873 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
*** xpdf-3.01.orig/xpdf/Stream.h	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.h	Tue Jan 17 17:19:54 2006
***************
*** 232,237 ****
--- 232,239 ----
  
    ~StreamPredictor();
  
+   GBool isOk() { return ok; }
+ 
    int lookChar();
    int getChar();
  
***************
*** 249,254 ****
--- 251,257 ----
    int rowBytes;			// bytes per line
    Guchar *predLine;		// line buffer
    int predIdx;			// current index in predLine
+   GBool ok;
  };
  
  //------------------------------------------------------------------------
***************
*** 527,533 ****
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { inputBits -= n; }
  };
  
  //------------------------------------------------------------------------
--- 530,536 ----
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
  };
  
  //------------------------------------------------------------------------
diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
*** xpdf-3.01.orig/splash/SplashXPathScanner.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/splash/SplashXPathScanner.cc	Wed Feb  1 17:01:14 2006
***************
*** 186,192 ****
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
--- 186,192 ----
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
***************
*** 236,254 ****
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (ySegMin <= y) {
! 	// intersection with top edge
! 	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
        } else {
! 	// x coord of segment endpoint with min y coord
! 	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
        }
!       if (ySegMax >= y + 1) {
! 	// intersection with bottom edge
! 	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       } else {
! 	// x coord of segment endpoint with max y coord
! 	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
        }
      }
      if (xx0 < xx1) {
--- 236,262 ----
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (seg->x0 < seg->x1) {
! 	xSegMin = seg->x0;
! 	xSegMax = seg->x1;
        } else {
! 	xSegMin = seg->x1;
! 	xSegMax = seg->x0;
        }
!       // intersection with top edge
!       xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
!       // intersection with bottom edge
!       xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       // the segment may not actually extend to the top and/or bottom edges
!       if (xx0 < xSegMin) {
! 	xx0 = xSegMin;
!       } else if (xx0 > xSegMax) {
! 	xx0 = xSegMax;
!       }
!       if (xx1 < xSegMin) {
! 	xx1 = xSegMin;
!       } else if (xx1 > xSegMax) {
! 	xx1 = xSegMax;
        }
      }
      if (xx0 < xx1) {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	9 Sep 2004 15:12:33 -0000	1.12
+++ .cvsignore	7 Feb 2006 15:25:09 -0000	1.13
@@ -6,3 +6,4 @@
 xpdf-japanese.tar.gz
 xpdf-korean.tar.gz
 xpdf-thai.tar.gz
+xpdf-3.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Sep 2004 15:12:33 -0000	1.12
+++ sources	7 Feb 2006 15:25:09 -0000	1.13
@@ -1,8 +1,7 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
-95294cef3031dd68e65f331e8750b2c2  xpdf-3.00.tar.gz
 030392ef4ad4e75caf899064265f73aa  xpdf-chinese-simplified.tar.gz
 233d80c56b636facb434c510addc0f28  xpdf-chinese-traditional.tar.gz
 4d80764d10ff406ddb7d26784ed575d9  xpdf-cyrillic.tar.gz
 7f3d680a49fd71cb86c0d60527402217  xpdf-japanese.tar.gz
 308af86071963cc959d596c710ac4119  xpdf-korean.tar.gz
 c4954dad99e2c2df997ac50dc2c09d1b  xpdf-thai.tar.gz
+e004c69c7dddef165d768b1362b44268  xpdf-3.01.tar.gz


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-3/xpdf.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xpdf.spec	9 Feb 2005 09:57:43 -0000	1.44
+++ xpdf.spec	7 Feb 2006 15:25:09 -0000	1.45
@@ -1,20 +1,17 @@
 %define desktop_file 1
 %define desktop_file_utils_version 0.2.90
-%define t1lib_version 5.0.2
-%define t1lib 0
 %define monolithic 1
 
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
-Version: 3.00
-Release: 10.4
+Version: 3.01
+Release: 0.FC3.5
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
 Group: Applications/Publishing
 
 Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.foolabs.com/pub/xpdf/t1lib-%{t1lib_version}.tar.gz
 Source3: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz
 Source4: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz
 Source5: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz
@@ -25,20 +22,18 @@
 Source11: acroread.png
 
 Patch0: xpdf-3.00-redhat.patch
-Patch1: xpdf-2.01-locale.patch
-Patch2: xpdf-2.02-pdftops.patch
 Patch3: xpdf-2.02-ext.patch
-Patch4: xpdf-3.00-freetype2.patch
-Patch5: xpdf-3.0-cjk-font.patch
 Patch6: xpdf-3.00-core.patch
 Patch7: xpdf-3.00-xfont.patch
-Patch8: xpdf-3.00-PathScanner.patch
 Patch9: xpdf-3.00-papersize.patch
-
-# security
-Patch100: xpdf-3.00-overflow.patch
-Patch101: xpdf-3.00-can-2004-1125.patch
-Patch102: xpdf-3.00-CAN-2005-0064.patch
+Patch10: xpdf-3.00-gcc4.patch
+Patch11: xpdf-3.01-crash.patch
+Patch12: xpdf-3.00-64bit.patch
+Patch13: xpdf-3.01-resize.patch
+
+# Security patches:
+# xpdf-3.01-CVE-2005-3191, CAN-2005-3193, CVE-2006-0301
+Patch100: xpdf-3.01pl2.patch
 
 Requires: urw-fonts
 Requires: htmlview
@@ -56,7 +51,7 @@
 Obsoletes: %{name}-japanese
 %endif
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %package chinese-simplified
 Summary: Chinese Simplified support
@@ -112,29 +107,22 @@
 KSX1001 encoding
 
 %prep
-%setup -q -a 1 -a 3 -a 4 -a 5 -a 6
+%setup -q -a 3 -a 4 -a 5 -a 6
 %patch -p1
 %patch3 -p1 -b .ext
-%patch4 -p1 -b .freetype217
-%patch5 -p1 -b .cjk
 %patch6 -p1 -b .core
 %patch7 -p1 -b .fonts
-%patch8 -p1 -b .xpath
 %patch9 -p1 -b .papersize
+%patch10 -p1 -b .gcc4
+%patch11 -p1 -b .crash
+%patch12 -p1 -b .alloc
+%patch13 -p1 -b .resize
 
 # security fixes
-%patch100 -p1 -b .sec
-%patch101 -p1 -b .can-2004-1125
-%patch102 -p1 -b .CAN-2005-0064
+%patch100 -p1 -b ..CVE-2005-3191_CAN-2005-3193_CVE-2006-0301
 
 %build
 find -name "*orig" | xargs rm -f
-%if %{t1lib}
-   pushd t1lib-%{t1lib_version}
-   %configure --disable-shared --enable-static
-   make %{?_smp_mflags} without_doc
-   popd
-%endif
 
 autoconf
 %configure \
@@ -144,12 +132,7 @@
    --with-gzip \
    --enable-opi \
    --with-appdef-dir=/usr/X11R6/lib/X11/app-defaults/ \
-%if %{t1lib}
-   --with-t1-library=`pwd`/t1lib-%{t1lib_version}/lib/.libs \
-   --with-t1-includes=`pwd`/t1lib-%{t1lib_version}/lib \
-%else
    --without-t1-library \
-%endif
    --with-freetype2-library=%{_libdir} \
    --with-freetype2-includes=%{_includedir}/freetype2
 
@@ -224,6 +207,28 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 1:3.01-0.FC3.5
+- apply patch to fix buffer overflow in kpdf, CVE-2006-0301
+
+* Wed Dec 14 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC3.4
+- better fix for CAN-2005-3193
+
+* Tue Dec 06 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC3.3 
+- apply upstream patch to fix CAN-2005-3193
+
+* Fri Oct 07 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC3.2
+- apply upstream patch to fix resize/redraw bug #166569
+
+* Thu Aug 18 2005 Than Ngo <than at redhat.com> 1:3.01-0.FC3.1
+- update to 3.01
+
+* Wed Jul 27 2005 Than Ngo <than at redhat.com> 1:3.00-10.6.FC3
+- better patch to fix CAN-2005-2097, #163918
+
+* Tue Jul 26 2005 Than Ngo <than at redhat.com> 1:3.00-10.5.FC3
+- backport patch to fix xpdf DoS, CAN-2005-2097, #163918
+- fix xpdf crash #163807
+
 * Wed Feb 09 2005 Than Ngo <than at redhat.com> 1:3.00-10.4
 - More fixing of CAN-2004-0888 patch (bug #135393, #147524)
 


--- xpdf-2.01-locale.patch DELETED ---


--- xpdf-2.02-pdftops.patch DELETED ---


--- xpdf-3.0-cjk-font.patch DELETED ---


--- xpdf-3.00-CAN-2005-0064.patch DELETED ---


--- xpdf-3.00-PathScanner.patch DELETED ---


--- xpdf-3.00-can-2004-1125.patch DELETED ---


--- xpdf-3.00-freetype2.patch DELETED ---


--- xpdf-3.00-overflow.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:27:04 -0500
Subject: rpms/libsepol/devel .cvsignore, 1.83, 1.84 libsepol.spec, 1.107,
	1.108 sources, 1.84, 1.85
Message-ID: <200602071527.k17FR4Wg007497@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7462

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
- Upgrade to latest from NSA
	* Merged seuser/user_extra support patch from Joshua Brindle.
	* Merged fix patch from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	2 Feb 2006 17:08:27 -0000	1.83
+++ .cvsignore	7 Feb 2006 15:27:01 -0000	1.84
@@ -81,3 +81,4 @@
 libsepol-1.11.10.tgz
 libsepol-1.11.11.tgz
 libsepol-1.11.12.tgz
+libsepol-1.11.13.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- libsepol.spec	7 Feb 2006 12:43:58 -0000	1.107
+++ libsepol.spec	7 Feb 2006 15:27:01 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.11.12
-Release: 1.1
+Version: 1.11.13
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,6 +80,11 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
+- Upgrade to latest from NSA
+	* Merged seuser/user_extra support patch from Joshua Brindle.
+	* Merged fix patch from Ivan Gyurdiev.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.12-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- sources	2 Feb 2006 17:08:27 -0000	1.84
+++ sources	7 Feb 2006 15:27:01 -0000	1.85
@@ -1 +1 @@
-29d310647a425b1e5e3d380799001282  libsepol-1.11.12.tgz
+02fe7e69782284c0c5bc562acb3efc03  libsepol-1.11.13.tgz



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:30:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:30:12 -0500
Subject: rpms/libsemanage/devel .cvsignore, 1.50, 1.51 libsemanage.spec, 1.71,
	1.72 sources, 1.52, 1.53
Message-ID: <200602071530.k17FUBiL008963@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8933

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.21-1
- Upgrade to latest from NSA
	* Merged seuser/user_extra support patch from Joshua Brindle.
	* Merged remote system dbase patch from Ivan Gyurdiev.	



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	2 Feb 2006 17:11:07 -0000	1.50
+++ .cvsignore	7 Feb 2006 15:30:09 -0000	1.51
@@ -53,3 +53,4 @@
 libsemanage-1.5.18.tgz
 libsemanage-1.5.19.tgz
 libsemanage-1.5.20.tgz
+libsemanage-1.5.21.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- libsemanage.spec	7 Feb 2006 12:43:51 -0000	1.71
+++ libsemanage.spec	7 Feb 2006 15:30:09 -0000	1.72
@@ -1,9 +1,9 @@
-%define libsepolver 1.11.12-1
+%define libsepolver 1.11.13-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.20
-Release: 1.1
+Version: 1.5.21
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -75,10 +75,14 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.21-1
+- Upgrade to latest from NSA
+	* Merged seuser/user_extra support patch from Joshua Brindle.
+	* Merged remote system dbase patch from Ivan Gyurdiev.	
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.20-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-
 * Thu Feb 2 2006 Dan Walsh <dwalsh at redhat.com> 1.5.20-1
 - Upgrade to latest from NSA
 	* Merged clone record on set_con patch from Ivan Gyurdiev.	


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	2 Feb 2006 17:11:07 -0000	1.52
+++ sources	7 Feb 2006 15:30:09 -0000	1.53
@@ -1 +1 @@
-30451c12207597488fa7df8589fd1120  libsemanage-1.5.20.tgz
+b102f0d9a53b79927aeeff9c5fe448d0  libsemanage-1.5.21.tgz



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:33:21 -0500
Subject: rpms/checkpolicy/devel .cvsignore, 1.54, 1.55 checkpolicy.spec, 1.88,
	1.89 sources, 1.55, 1.56
Message-ID: <200602071533.k17FXLrp009209@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9174

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.1-1
- Latest upgrade from NSA
	* Merged sepol_av_to_string patch from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	9 Dec 2005 18:24:24 -0000	1.54
+++ .cvsignore	7 Feb 2006 15:33:17 -0000	1.55
@@ -37,3 +37,4 @@
 checkpolicy-1.27.19.tgz
 checkpolicy-1.27.20.tgz
 checkpolicy-1.28.tgz
+checkpolicy-1.29.1.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- checkpolicy.spec	7 Feb 2006 11:14:04 -0000	1.88
+++ checkpolicy.spec	7 Feb 2006 15:33:17 -0000	1.89
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.9-1
+%define libsepolver 1.11.13-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.28
-Release: 5.1
+Version: 1.29.1
+Release: 1
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,12 +47,19 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.1-1
+- Latest upgrade from NSA
+	* Merged sepol_av_to_string patch from Joshua Brindle.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.28-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 13 2006 Dan Walsh <dwalsh at redhat.com> 1.28-5
 - Rebuild to get latest libsepol
 
+* Fri Jan 13 2006 Dan Walsh <dwalsh at redhat.com> 1.28-5
+- Rebuild to get latest libsepol
+
 * Thu Jan 5 2006 Dan Walsh <dwalsh at redhat.com> 1.28-4
 - Rebuild to get latest libsepol
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	9 Dec 2005 18:24:24 -0000	1.55
+++ sources	7 Feb 2006 15:33:17 -0000	1.56
@@ -1 +1 @@
-6e6b605fa37d7b23855d5b6a837dd26c  checkpolicy-1.28.tgz
+b3301f4557cdca4b92d2762ceacd0e8f  checkpolicy-1.29.1.tgz



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:37:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:37:58 -0500
Subject: rpms/policycoreutils/devel .cvsignore, 1.100,
	1.101 policycoreutils-rhat.patch, 1.160,
	1.161 policycoreutils.spec, 1.232, 1.233 sources, 1.104, 1.105
Message-ID: <200602071537.k17FbwFW010769@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10739

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-1
- Update from upstream
	* Merged seuser/user_extra support patch to semodule_package 
	  from Joshua Brindle.
	* Merged getopt type fix for semodule_link/expand and sestatus
	  from Chris PeBenito.
- Fix genhomedircon output



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	2 Feb 2006 17:23:00 -0000	1.100
+++ .cvsignore	7 Feb 2006 15:37:54 -0000	1.101
@@ -88,3 +88,5 @@
 policycoreutils-1.29.15.tgz
 policycoreutils-1.29.17.tgz
 policycoreutils-1.29.18.tgz
+policycoreutils-1.29.19.tgz
+policycoreutils-1.29.20.tgz

policycoreutils-rhat.patch:
 scripts/genhomedircon |    4 
 semanage/seobject.py  |  400 ++++++++++++++++++++++++++++----------------------
 2 files changed, 227 insertions(+), 177 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- policycoreutils-rhat.patch	3 Feb 2006 14:58:37 -0000	1.160
+++ policycoreutils-rhat.patch	7 Feb 2006 15:37:54 -0000	1.161
@@ -1,6 +1,27 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.18/semanage/seobject.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.20/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-01-30 18:32:39.000000000 -0500
++++ policycoreutils-1.29.20/scripts/genhomedircon	2006-02-07 10:36:38.000000000 -0500
+@@ -170,7 +170,7 @@
+ 	def heading(self):
+ 		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
+ 		if self.semanaged:
+-			ret += "# use seusers command to manage system users in order to change the file_context\n#\n#\n"
++			ret += "# use semanage command to manage system users in order to change the file_context\n#\n#\n"
+ 		else:
+ 			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
+ 		return ret
+@@ -196,7 +196,7 @@
+ 		return role
+ 		
+ 	def adduser(self, udict, user, seuser, role):
+-		if seuser == "user_u" or user == "__default__":
++		if seuser == "user_u" or user == "__default__" or user == "system_u":
+ 			return
+ 		# !!! chooses first role in the list to use in the file context !!!
+ 		if role[-2:] == "_r" or role[-2:] == "_u":
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.20/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
-+++ policycoreutils-1.29.18/semanage/seobject.py	2006-02-03 09:57:03.000000000 -0500
++++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-07 10:35:46.000000000 -0500
 @@ -21,8 +21,11 @@
  #
  #  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- policycoreutils.spec	7 Feb 2006 13:34:13 -0000	1.232
+++ policycoreutils.spec	7 Feb 2006 15:37:54 -0000	1.233
@@ -1,10 +1,10 @@
-%define libsepolver 1.11.12-1
-%define libsemanagever 1.5.20-1
-%define libselinuxver 1.29.6-1
+%define libsepolver 1.11.13-1
+%define libsemanagever 1.5.21-1
+%define libselinuxver 1.29.7-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.18
-Release: 2.1
+Version: 1.29.20
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,10 +97,17 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-1
+- Update from upstream
+	* Merged seuser/user_extra support patch to semodule_package 
+	  from Joshua Brindle.
+	* Merged getopt type fix for semodule_link/expand and sestatus
+	  from Chris PeBenito.
+- Fix genhomedircon output
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29.18-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-
 * Fri Feb 3 2006 Dan Walsh <dwalsh at redhat.com> 1.29.18-2
 - Add auditing to semanage
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	2 Feb 2006 17:23:01 -0000	1.104
+++ sources	7 Feb 2006 15:37:54 -0000	1.105
@@ -1 +1 @@
-6980bea91969631d694dda89e8401105  policycoreutils-1.29.18.tgz
+3b3793a52a940f5ec19a077965625b18  policycoreutils-1.29.20.tgz



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:39:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:39:08 -0500
Subject: rpms/selinux-doc/devel .cvsignore, 1.18, 1.19 selinux-doc.spec, 1.21,
	1.22 sources, 1.19, 1.20
Message-ID: <200602071539.k17Fd8lr011362@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11331

Modified Files:
	.cvsignore selinux-doc.spec sources 
Log Message:
* Tue Feb 7 2005 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
- Update to NSA Release version
	* Updated module report for removal of magic number fields
	  from security structures (in 2.6.16).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-doc/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Dec 2005 00:22:50 -0000	1.18
+++ .cvsignore	7 Feb 2006 15:39:06 -0000	1.19
@@ -14,3 +14,4 @@
 selinux-doc-1.23.2.tgz
 selinux-doc-1.23.3.tgz
 selinux-doc-1.25.1.tgz
+selinux-doc-1.25.2.tgz


Index: selinux-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-doc/devel/selinux-doc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- selinux-doc.spec	15 Dec 2005 00:22:50 -0000	1.21
+++ selinux-doc.spec	7 Feb 2006 15:39:06 -0000	1.22
@@ -1,6 +1,6 @@
 Summary: SELinux documentation
 Name: selinux-doc
-Version: 1.25.1
+Version: 1.25.2
 Release: 1
 License: Public Use License v1.0 
 Group: System Environment/Base
@@ -63,6 +63,11 @@
 %doc /usr/share/doc/%{name}-%{version}
 
 %changelog
+* Tue Feb 7 2005 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
+- Update to NSA Release version
+	* Updated module report for removal of magic number fields
+	  from security structures (in 2.6.16).
+
 * Wed Dec 14 2005 Dan Walsh <dwalsh at redhat.com> 1.25.1-1
 - Update to NSA Release version
 	* Updated inode hook section of module report for


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-doc/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	15 Dec 2005 00:22:50 -0000	1.19
+++ sources	7 Feb 2006 15:39:06 -0000	1.20
@@ -1 +1 @@
-92f08aa26ce374efbf264870a28726f4  selinux-doc-1.25.1.tgz
+5a1829d0ec185ae19888f784ffc4d0aa  selinux-doc-1.25.2.tgz



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:39:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:39:28 -0500
Subject: rpms/xpdf/devel xpdf-3.01pl2.patch, NONE, 1.1 xpdf.spec, 1.73,
	1.74 xpdf-3.01-CAN-2005-3193.patch, 1.1,
	NONE xpdf-3.01-CVE-2005-3191.patch, 1.1, NONE
Message-ID: <200602071539.k17FdSRg011557@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11480

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.01pl2.patch 
Removed Files:
	xpdf-3.01-CAN-2005-3193.patch xpdf-3.01-CVE-2005-3191.patch 
Log Message:
- apply patch to fix buffer overflow issue in the xpdf codebase
  when handling splash images CVE-2006-0301 (#179423)


xpdf-3.01pl2.patch:
 goo/gmem.c                   |   22 ++++++++++!!!!!!!!!!!!
 splash/SplashXPathScanner.cc |   32 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 xpdf/JBIG2Stream.cc          |   19 +++++++++++++++++!!
 xpdf/JPXStream.cc            |    7 +++++++
 xpdf/Stream.cc               |   41 +++++++++++++++++++++++++++++++++++++++++
 xpdf/Stream.h                |    5 +++!!
 6 files changed, 78 insertions(+), 48 modifications(!)

--- NEW FILE xpdf-3.01pl2.patch ---
diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
*** xpdf-3.01.orig/goo/gmem.c	Tue Aug 16 22:34:30 2005
--- xpdf-3.01/goo/gmem.c	Tue Jan 17 17:03:57 2006
***************
*** 11,16 ****
--- 11,17 ----
  #include <stdlib.h>
  #include <stddef.h>
  #include <string.h>
+ #include <limits.h>
  #include "gmem.h"
  
  #ifdef DEBUG_MEM
***************
*** 63,69 ****
    int lst;
    unsigned long *trl, *p;
  
!   if (size == 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
--- 64,70 ----
    int lst;
    unsigned long *trl, *p;
  
!   if (size <= 0)
      return NULL;
    size1 = gMemDataSize(size);
    if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
***************
*** 86,92 ****
  #else
    void *p;
  
!   if (size == 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
--- 87,93 ----
  #else
    void *p;
  
!   if (size <= 0)
      return NULL;
    if (!(p = malloc(size))) {
      fprintf(stderr, "Out of memory\n");
***************
*** 102,108 ****
    void *q;
    int oldSize;
  
!   if (size == 0) {
      if (p)
        gfree(p);
      return NULL;
--- 103,109 ----
    void *q;
    int oldSize;
  
!   if (size <= 0) {
      if (p)
        gfree(p);
      return NULL;
***************
*** 120,126 ****
  #else
    void *q;
  
!   if (size == 0) {
      if (p)
        free(p);
      return NULL;
--- 121,127 ----
  #else
    void *q;
  
!   if (size <= 0) {
      if (p)
        free(p);
      return NULL;
***************
*** 140,147 ****
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 141,151 ----
  void *gmallocn(int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
***************
*** 151,158 ****
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
    n = nObjs * objSize;
!   if (objSize == 0 || n / objSize != nObjs) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
--- 155,168 ----
  void *greallocn(void *p, int nObjs, int objSize) {
    int n;
  
+   if (nObjs == 0) {
+     if (p) {
+       gfree(p);
+     }
+     return NULL;
+   }
    n = nObjs * objSize;
!   if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
      fprintf(stderr, "Bogus memory allocation size\n");
      exit(1);
    }
diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JBIG2Stream.cc	Tue Jan 17 17:29:46 2006
***************
*** 13,18 ****
--- 13,19 ----
  #endif
  
  #include <stdlib.h>
+ #include <limits.h>
  #include "GList.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 681,686 ****
--- 682,691 ----
    w = wA;
    h = hA;
    line = (wA + 7) >> 3;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    data[h * line] = 0;
***************
*** 692,697 ****
--- 697,706 ----
    w = bitmap->w;
    h = bitmap->h;
    line = bitmap->line;
+   if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+     data = NULL;
+     return;
+   }
    // need to allocate one extra guard byte for use in combine()
    data = (Guchar *)gmalloc(h * line + 1);
    memcpy(data, bitmap->data, h * line);
***************
*** 720,726 ****
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
--- 729,735 ----
  }
  
  void JBIG2Bitmap::expand(int newH, Guint pixel) {
!   if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
      return;
    }
    // need to allocate one extra guard byte for use in combine()
***************
*** 2294,2299 ****
--- 2303,2316 ----
        !readUWord(&stepX) || !readUWord(&stepY)) {
      goto eofError;
    }
+   if (w == 0 || h == 0 || w >= INT_MAX / h) {
+     error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
+     return;
+   }
+   if (gridH == 0 || gridW >= INT_MAX / gridH) {
+     error(getPos(), "Bad grid size in JBIG2 halftone segment");
+     return;
+   }
  
    // get pattern dictionary
    if (nRefSegs != 1) {
diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
*** xpdf-3.01.orig/xpdf/JPXStream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JPXStream.cc	Tue Jan 17 17:14:06 2006
***************
*** 12,17 ****
--- 12,18 ----
  #pragma implementation
  #endif
  
+ #include <limits.h>
  #include "gmem.h"
  #include "Error.h"
  #include "JArithmeticDecoder.h"
***************
*** 818,823 ****
--- 819,830 ----
  	            / img.xTileSize;
        img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
  	            / img.yTileSize;
+       // check for overflow before allocating memory
+       if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
+ 	  img.nXTiles >= INT_MAX / img.nYTiles) {
+ 	error(getPos(), "Bad tile count in JPX SIZ marker segment");
+ 	return gFalse;
+       }
        img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
  				      sizeof(JPXTile));
        for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
*** xpdf-3.01.orig/xpdf/Stream.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.cc	Tue Jan 17 17:31:52 2006
***************
*** 15,20 ****
--- 15,21 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <stddef.h>
+ #include <limits.h>
  #ifndef WIN32
  #include <unistd.h>
  #endif
***************
*** 406,418 ****
--- 407,432 ----
    width = widthA;
    nComps = nCompsA;
    nBits = nBitsA;
+   predLine = NULL;
+   ok = gFalse;
  
    nVals = width * nComps;
+   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+       nComps >= INT_MAX / nBits ||
+       width >= INT_MAX / nComps / nBits ||
+       nVals * nBits + 7 < 0) {
+     return;
+   }
    pixBytes = (nComps * nBits + 7) >> 3;
    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+   if (rowBytes <= 0) {
+     return;
+   }
    predLine = (Guchar *)gmalloc(rowBytes);
    memset(predLine, 0, rowBytes);
    predIdx = rowBytes;
+ 
+   ok = gTrue;
  }
  
  StreamPredictor::~StreamPredictor() {
***************
*** 1004,1009 ****
--- 1018,1027 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
***************
*** 1259,1264 ****
--- 1277,1285 ----
    if (columns < 1) {
      columns = 1;
    }
+   if (columns + 4 <= 0) {
+     columns = INT_MAX - 4;
+   }
    rows = rowsA;
    endOfBlock = endOfBlockA;
    black = blackA;
***************
*** 2899,2904 ****
--- 2920,2930 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2925,2930 ****
--- 2951,2961 ----
    height = read16();
    width = read16();
    numComps = str->getChar();
+   if (numComps <= 0 || numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     numComps = 0;
+     return gFalse;
+   }
    if (prec != 8) {
      error(getPos(), "Bad DCT precision %d", prec);
      return gFalse;
***************
*** 2947,2952 ****
--- 2978,2988 ----
  
    length = read16() - 2;
    scanInfo.numComps = str->getChar();
+   if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+     error(getPos(), "Bad number of components in DCT stream");
+     scanInfo.numComps = 0;
+     return gFalse;
+   }
    --length;
    if (length != 2 * scanInfo.numComps + 3) {
      error(getPos(), "Bad DCT scan info block");
***************
*** 3041,3046 ****
--- 3077,3083 ----
  	numACHuffTables = index+1;
        tbl = &acHuffTables[index];
      } else {
+       index &= 0x0f;
        if (index >= numDCHuffTables)
  	numDCHuffTables = index+1;
        tbl = &dcHuffTables[index];
***************
*** 3827,3832 ****
--- 3864,3873 ----
      FilterStream(strA) {
    if (predictor != 1) {
      pred = new StreamPredictor(this, predictor, columns, colors, bits);
+     if (!pred->isOk()) {
+       delete pred;
+       pred = NULL;
+     }
    } else {
      pred = NULL;
    }
diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
*** xpdf-3.01.orig/xpdf/Stream.h	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.h	Tue Jan 17 17:19:54 2006
***************
*** 232,237 ****
--- 232,239 ----
  
    ~StreamPredictor();
  
+   GBool isOk() { return ok; }
+ 
    int lookChar();
    int getChar();
  
***************
*** 249,254 ****
--- 251,257 ----
    int rowBytes;			// bytes per line
    Guchar *predLine;		// line buffer
    int predIdx;			// current index in predLine
+   GBool ok;
  };
  
  //------------------------------------------------------------------------
***************
*** 527,533 ****
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { inputBits -= n; }
  };
  
  //------------------------------------------------------------------------
--- 530,536 ----
    short getWhiteCode();
    short getBlackCode();
    short lookBits(int n);
!   void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
  };
  
  //------------------------------------------------------------------------
diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
*** xpdf-3.01.orig/splash/SplashXPathScanner.cc	Tue Aug 16 22:34:31 2005
--- xpdf-3.01/splash/SplashXPathScanner.cc	Wed Feb  1 17:01:14 2006
***************
*** 186,192 ****
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
--- 186,192 ----
  }
  
  void SplashXPathScanner::computeIntersections(int y) {
!   SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
    SplashXPathSeg *seg;
    int i, j;
  
***************
*** 236,254 ****
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (ySegMin <= y) {
! 	// intersection with top edge
! 	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
        } else {
! 	// x coord of segment endpoint with min y coord
! 	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
        }
!       if (ySegMax >= y + 1) {
! 	// intersection with bottom edge
! 	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       } else {
! 	// x coord of segment endpoint with max y coord
! 	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
        }
      }
      if (xx0 < xx1) {
--- 236,262 ----
      } else if (seg->flags & splashXPathVert) {
        xx0 = xx1 = seg->x0;
      } else {
!       if (seg->x0 < seg->x1) {
! 	xSegMin = seg->x0;
! 	xSegMax = seg->x1;
        } else {
! 	xSegMin = seg->x1;
! 	xSegMax = seg->x0;
        }
!       // intersection with top edge
!       xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
!       // intersection with bottom edge
!       xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
!       // the segment may not actually extend to the top and/or bottom edges
!       if (xx0 < xSegMin) {
! 	xx0 = xSegMin;
!       } else if (xx0 > xSegMax) {
! 	xx0 = xSegMax;
!       }
!       if (xx1 < xSegMin) {
! 	xx1 = xSegMin;
!       } else if (xx1 > xSegMax) {
! 	xx1 = xSegMax;
        }
      }
      if (xx0 < xx1) {


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xpdf.spec	7 Feb 2006 14:42:13 -0000	1.73
+++ xpdf.spec	7 Feb 2006 15:39:25 -0000	1.74
@@ -5,7 +5,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 11.1
+Release: 12
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -31,8 +31,10 @@
 Patch12: xpdf-3.00-64bit.patch
 Patch13: xpdf-3.01-resize.patch
 Patch14: xpdf-3.01-freetype-internals.patch
-Patch15: xpdf-3.01-CVE-2005-3191.patch
-Patch16: xpdf-3.01-CAN-2005-3193.patch
+
+# Security patches
+# xpdf-3.01-CVE-2005-3191, CAN-2005-3193, CVE-2006-0301
+Patch100: xpdf-3.01pl2.patch
 
 Requires: urw-fonts
 Requires: htmlview
@@ -127,8 +129,9 @@
 %patch12 -p1 -b .alloc
 %patch13 -p1 -b .resize
 %patch14 -p1 -b .freetype-internals
-%patch15 -p1 -b .CVE-2005-3191.patch 
-%patch16 -p1 -b .CAN-2005-3193.patch
+
+# security patches
+%patch100 -p1 -b .CVE-2005-3191_CAN-2005-3193_CVE-2006-0301
 
 %build
 find -name "*orig" | xargs rm -f
@@ -232,6 +235,10 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Tue Feb 07 2006 Than Ngo <than at redhat.com> 3.01-12
+- apply patch to fix buffer overflow issue in the xpdf codebase
+  when handling splash images CVE-2006-0301 (#179423)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-11.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


--- xpdf-3.01-CAN-2005-3193.patch DELETED ---


--- xpdf-3.01-CVE-2005-3191.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 15:39:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 10:39:44 -0500
Subject: rpms/selinux-doc/devel selinux-doc.spec,1.22,1.23
Message-ID: <200602071539.k17Fdim6011728@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-doc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11702

Modified Files:
	selinux-doc.spec 
Log Message:
* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
- Update to NSA Release version
	* Updated module report for removal of magic number fields
	  from security structures (in 2.6.16).



Index: selinux-doc.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-doc/devel/selinux-doc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- selinux-doc.spec	7 Feb 2006 15:39:06 -0000	1.22
+++ selinux-doc.spec	7 Feb 2006 15:39:42 -0000	1.23
@@ -63,7 +63,7 @@
 %doc /usr/share/doc/%{name}-%{version}
 
 %changelog
-* Tue Feb 7 2005 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
+* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
 - Update to NSA Release version
 	* Updated module report for removal of magic number fields
 	  from security structures (in 2.6.16).



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:08:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:08:23 -0500
Subject: rpms/tix/devel tix-8.4.0-relid.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 tix.spec, 1.8,
	1.9 tix-8.1.4-install-pkgIndex-datadir-83662.patch, 1.1,
	NONE tix-8.1.4-pkgIndex-datadir-83662.patch, 1.1, NONE
Message-ID: <200602071608.k17G8N8e001638@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1582

Modified Files:
	.cvsignore sources tix.spec 
Added Files:
	tix-8.4.0-relid.patch 
Removed Files:
	tix-8.1.4-install-pkgIndex-datadir-83662.patch 
	tix-8.1.4-pkgIndex-datadir-83662.patch 
Log Message:
Upgraded to tix-8.4.0.


tix-8.4.0-relid.patch:
 configure        |    2 +-
 tclconfig/tcl.m4 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tix-8.4.0-relid.patch ---
--- tix-8.4.0/configure.relid	2004-12-23 20:55:38.000000000 -0500
+++ tix-8.4.0/configure	2006-02-06 12:05:57.000000000 -0500
@@ -7453,7 +7453,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
--- tix-8.4.0/tclconfig/tcl.m4.relid	2004-12-23 20:55:38.000000000 -0500
+++ tix-8.4.0/tclconfig/tcl.m4	2006-02-06 12:06:17.000000000 -0500
@@ -773,7 +773,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -2160,7 +2160,7 @@
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Sep 2004 13:19:43 -0000	1.2
+++ .cvsignore	7 Feb 2006 16:08:20 -0000	1.3
@@ -1 +1,2 @@
 tix-8.1.4.tar.gz
+tix-8.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Sep 2004 13:19:43 -0000	1.2
+++ sources	7 Feb 2006 16:08:20 -0000	1.3
@@ -1 +1 @@
-1051ef1ec41c48c7ca8b9d6ad3436227  tix-8.1.4.tar.gz
+7fcd84a1a6e27e432cb07284b7a34317  tix-8.4.0.tar.gz


Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tix.spec	9 Dec 2005 22:43:36 -0000	1.8
+++ tix.spec	7 Feb 2006 16:08:20 -0000	1.9
@@ -1,20 +1,19 @@
-%define tixmajor 8.1
-%define tkmajor 8.4
+%define tixmajor 8.4
+%define tcltkver 8.4.12
 
 Summary: A set of extension widgets for Tk
 Name: tix
 Epoch: 1
-Version: %{tixmajor}.4
-Release: 100.1
+Version: %{tixmajor}.0
+Release: 1
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
 Source0: http://tix.sourceforge.net/dist/tix-%{version}.tar.gz
-Source1: tix-8.1.4-pkgIndex-datadir-83662.patch
+Patch0: tix-%{version}-relid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: tcl tk
-Buildrequires: tcl-devel tk-devel
-Patch1: tix-8.1.4-install-pkgIndex-datadir-83662.patch
+Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
+Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
 
 %description
 Tix, the Tk Interface eXtension, is a powerful set of user interface
@@ -51,41 +50,49 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .pkgIndex
+%patch0 -p1 -b .relid
+
+# patch 0 touches tcl.m4
+autoconf
 
 %build
-cd unix
-%configure --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir}
-cd tk%{tkmajor}
-patch -b --suffix .datadir < %SOURCE1
-%configure --enable-shared --with-tclconfig=%{_libdir} --with-tkconfig=%{_libdir} --with-tclinclude=%{_includedir} --with-tkinclude=%{_includedir}
-cd ..
-# ( cd itcl%{itcl_major}; 
-#   patch -b --suffix .datadir < %SOURCE20
-#   %%configure --with-itcl=%{tcltktop}/itcl%{itclvers} --enable-shared )
+%configure \
+   --with-tcl=%{_libdir} \
+   --with-tk=%{_libdir} \
+   --enable-64bit
 make all %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p %{buildroot}%{_libdir} %{buildroot}%{_datadir}
-%makeinstall -C unix LIB_DIR=%{buildroot}%{_libdir} MAN_DIR=%{buildroot}%{_mandir} TIX_LIBRARY=%{buildroot}%{_datadir}/tix%{tixmajor} TCL_BIN_DIR=%{_bindir}
-
-# for linking with -ltix
-ln -s libtix%{tixmajor}.%{tkmajor}.so %{buildroot}%{_libdir}/libtix.so
-# create tixwish symlink
-ln -s tixwish%{tixmajor}.%{tkmajor} %{buildroot}%{_bindir}/tixwish
+# install demo scripts
+mkdir -p $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
+cp -a demos $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
+
+# move shared lib
+mv $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT/usr/lib/libTix%{tixmajor}.so
+( cd $RPM_BUILD_ROOT/usr/lib
+  ln -sf libTix%{tixmajor}.so libTix.so
+  ln -sf libTix%{tixmajor}.so libtix.so
+)
+
+# the header and man pages were in the previous package, keeping for now...
+mkdir -p $RPM_BUILD_ROOT/usr/include
+install -m 0644 generic/tix.h $RPM_BUILD_ROOT/usr/include/tix.h
 
-# XXX set execute bits on library so that requires are generated.
-chmod +x %{buildroot}%{_libdir}/libtix*.so
-
-# remove buildroot traces
-perl -pi -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/tix-private|" %buildroot/%{_libdir}/tixConfig.sh
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/mann
+cp man/*.n $RPM_BUILD_ROOT/usr/share/man/mann
 
 # ship docs except pdf
 rm -rf docs/pdf
 find docs -name .cvsignore -exec rm '{}' ';'
 
+# these files end up in the doc directory
+rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/README.txt
+rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/license.terms
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -93,27 +100,33 @@
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/tix%{tixmajor}
-%{_libdir}/libtix%{tixmajor}.%{tkmajor}.so
-%{_libdir}/libtixsam%{tixmajor}.%{tkmajor}.so
-%{_libdir}/tix%{tixmajor}
-%{_libdir}/tixConfig.sh
+/usr/lib/libTix%{tixmajor}.so
+%dir /usr/lib/Tix%{tixmajor}
+/usr/lib/Tix%{tixmajor}/*.tcl
+/usr/lib/Tix%{tixmajor}/bitmaps
+/usr/lib/Tix%{tixmajor}/pref
+/usr/share/Tix%{tixmajor}
 %doc *.txt *.html license.terms
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
+%{_includedir}/tix.h
 %{_libdir}/libtix.so
+%{_libdir}/libTix.so
 %{_mandir}/mann
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/*
 
+
 %changelog
+* Mon Feb 06 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-1
+- Upgraded to tix-8.4.0
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


--- tix-8.1.4-install-pkgIndex-datadir-83662.patch DELETED ---


--- tix-8.1.4-pkgIndex-datadir-83662.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:12:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:12:54 -0500
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.13.5-lid-suspend.patch, NONE,
	1.1 gnome-power-manager-2.13.5-xdg.patch, NONE,
	1.1 gnome-power-manager.spec, 1.18, 1.19
Message-ID: <200602071612.k17GCshG003728@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3697

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.13.5-lid-suspend.patch 
	gnome-power-manager-2.13.5-xdg.patch 
Log Message:
* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.13.5-3
- Install into the autostart directory
- Don't suspend on lid close while on AC power


gnome-power-manager-2.13.5-lid-suspend.patch:
 gpm-manager.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5-lid-suspend.patch ---
Index: src/gpm-manager.c
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/src/gpm-manager.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -d -u -p -r1.36 -r1.37
--- src/gpm-manager.c	5 Feb 2006 16:36:09 -0000	1.36
+++ src/gpm-manager.c	6 Feb 2006 00:05:42 -0000	1.37
@@ -914,8 +914,11 @@ lid_button_pressed (GpmManager	 *manager
 	GpmDpmsMode mode;
 	GError     *error;
 	gboolean    res;
+	gboolean    on_ac;
 
-	g_debug ("lid button changed: %d", state);
+	gpm_power_get_on_ac (manager->priv->power, &on_ac, NULL);
+
+	g_debug ("lid_button_pressed: button changed: %d", state);
 
 	/*
 	 * We enable/disable DPMS because some laptops do
@@ -924,8 +927,17 @@ lid_button_pressed (GpmManager	 *manager
 	 * http://bugzilla.gnome.org/show_bug.cgi?id=321313
 	 */
 	if (state) {
-		/* we only do a policy event when the lid is CLOSED */
-		manager_policy_do (manager, GPM_PREF_BUTTON_LID);
+		/*
+		 * We only do a policy event when the lid is CLOSED
+		 * and we are on battery power. See
+		 * http://bugzilla.gnome.org/show_bug.cgi?id=329512
+		 */
+		if (on_ac) {
+			g_debug ("lid_button_pressed: Ignoring policy as on AC");
+		} else {
+			g_debug ("lid_button_pressed: Performing policy as on battery");
+			manager_policy_do (manager, GPM_PREF_BUTTON_LID);
+		}
 		mode = GPM_DPMS_MODE_OFF;
 	} else {
 		mode = GPM_DPMS_MODE_ON;

gnome-power-manager-2.13.5-xdg.patch:
 Makefile.am                 |    2 +-
 gnome-power-manager.spec.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5-xdg.patch ---
? gpm-xdg.patch
? libnotify-0.3.0-4.i386.rpm
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/data/Makefile.am,v
retrieving revision 1.4
diff -d -u -p -r1.4 Makefile.am
--- data/Makefile.am	24 Jan 2006 11:16:33 -0000	1.4
+++ data/Makefile.am	28 Jan 2006 17:38:44 -0000
@@ -10,7 +10,7 @@ desktop_in_files = gnome-power-preferenc
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-autostartdir = $(datadir)/autostart
+autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = gnome-power-manager.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
Index: data/gnome-power-manager.spec.in
===================================================================
RCS file: /cvs/gnome/gnome-power-manager/data/gnome-power-manager.spec.in,v
retrieving revision 1.5
diff -d -u -p -r1.5 gnome-power-manager.spec.in
--- data/gnome-power-manager.spec.in	24 Jan 2006 11:23:58 -0000	1.5
+++ data/gnome-power-manager.spec.in	28 Jan 2006 17:38:44 -0000
@@ -94,7 +94,7 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/gnome/help/gnome-power-manager/C/*
 %{_datadir}/omf/gnome-power-manager/*
-%{_datadir}/autostart/*
+%{_sysconfdir}/xdg/autostart/*
 
 %changelog
 * Sun Nov 27 2005 Richard Hughes <richard at hughsie.com> 0.3.1-1


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-power-manager.spec	7 Feb 2006 11:54:28 -0000	1.18
+++ gnome-power-manager.spec	7 Feb 2006 16:12:52 -0000	1.19
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -16,14 +16,15 @@
 BuildPrereq: libwnck-devel
 BuildPrereq: hal-devel >= %{hal_version}
 BuildPrereq: dbus-devel >= %{dbus_version}
-BuildPrereq: libnotify
+BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
-
+Patch1: gnome-power-manager-2.13.5-xdg.patch
+Patch2: gnome-power-manager-2.13.5-lid-suspend.patch
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
 displaying icons and handling user callbacks in an interactive GNOME session. 
@@ -32,6 +33,8 @@
 
 %prep
 %setup -q
+%patch1 -p0
+%patch2 -p0
 
 %build
 %configure --disable-scrollkeeper
@@ -45,11 +48,7 @@
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart                     \
-  $RPM_BUILD_ROOT%{_datadir}/autostart/gnome-power-manager.desktop
-
-# remove this line when we switch to autostart gnome-session and
-# get the launching code out of gnome-settings-daemon
-echo "Hidden=true" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
+  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop
 
 %find_lang %name
 
@@ -84,6 +83,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.13.5-3
+- Install into the autostart directory
+- Don't suspend on lid close while on AC power
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:20:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:20:09 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.118,1.119
Message-ID: <200602071620.k17GK9D1019418@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gtk2.spec 
Log Message:
* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> 2.8.11-6
- Fix up jkeating's recent %changelog entry to match this spec's style
- Make the devel package Require %{version}-%{release}



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gtk2.spec	7 Feb 2006 12:08:00 -0000	1.118
+++ gtk2.spec	7 Feb 2006 16:20:06 -0000	1.119
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 5.1
+Release: 6
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -67,7 +67,7 @@
 %package devel
 Summary: Development tools for GTK+ applications.
 Group: Development/Libraries
-Requires: gtk2 = %{version}
+Requires: gtk2 = %{version}-%{release}
 Requires: pango-devel >= %{pango_version}
 Requires: atk-devel >= %{atk_version}
 Requires: glib2-devel >= %{glib2_version}
@@ -263,7 +263,11 @@
 %doc tmpdocs/examples
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.11-5.1
+* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> 2.8.11-6
+- Fix up jkeating's recent %%changelog entry to match this spec's style
+- Make the devel package Require %%{version}-%%{release}
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 2.8.11-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-5



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:21:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:21:11 -0500
Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.19,
	1.20 selinux-policy-strict.spec, 1.336, 1.337
Message-ID: <200602071621.k17GLB5B019962@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-strict/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv19918

Modified Files:
	policy-20050916.patch selinux-policy-strict.spec 
Log Message:
* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
- Allow zebra to use bgp
- Allow spamd to connect to razor


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    4 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   13 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1678 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20050916.patch	18 Jan 2006 16:29:52 -0000	1.19
+++ policy-20050916.patch	7 Feb 2006 16:21:06 -0000	1.20
@@ -945,7 +945,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.27.1/domains/program/unused/apache.te
 --- nsapolicy/domains/program/unused/apache.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/apache.te	2006-01-02 14:02:37.000000000 -0500
++++ policy-1.27.1/domains/program/unused/apache.te	2006-01-30 13:44:40.000000000 -0500
 @@ -66,7 +66,7 @@
  
  # httpd_exec_t is the type give to the httpd executable.
@@ -999,6 +999,15 @@
  } else {
  dontaudit httpd_t admin_tty_type:chr_file rw_file_perms;
  }
+@@ -352,7 +356,7 @@
+ allow httpd_suexec_t urandom_device_t:chr_file { getattr read };
+ 
+ # for shell scripts
+-allow httpd_suexec_t bin_t:dir search;
++allow httpd_suexec_t bin_t:dir r_dir_perms;
+ allow httpd_suexec_t bin_t:lnk_file read;
+ can_exec(httpd_suexec_t, { bin_t shell_exec_t })
+ 
 @@ -367,13 +371,13 @@
  allow httpd_suexec_t autofs_t:dir { search getattr };
  tmp_domain(httpd_suexec)
@@ -1078,7 +1087,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.27.1/domains/program/unused/auditd.te
 --- nsapolicy/domains/program/unused/auditd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/auditd.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/domains/program/unused/auditd.te	2006-02-02 13:55:10.000000000 -0500
 @@ -12,6 +12,12 @@
  
  daemon_domain(auditd)
@@ -1092,7 +1101,17 @@
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
  allow auditd_t self:unix_dgram_socket create_socket_perms;
  allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
-@@ -65,3 +71,6 @@
+@@ -58,10 +64,16 @@
+ 
+ dontaudit auditctl_t local_login_t:fd use;
+ allow auditctl_t proc_t:dir search;
++allow auditctl_t proc_t:lnk_file { getattr read };
+ allow auditctl_t sysctl_kernel_t:dir search;
+ allow auditctl_t sysctl_kernel_t:file { getattr read };
+ dontaudit auditctl_t init_t:fd use; 
++allow auditctl_t device_t:dir r_dir_perms;
++allow auditctl_t devpts_t:dir r_dir_perms;
+ allow auditctl_t initrc_devpts_t:chr_file { read write };
  allow auditctl_t privfd:fd use;
  
  
@@ -2866,8 +2885,8 @@
  dontaudit snmpd_t selinux_config_t:dir search;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/spamd.te policy-1.27.1/domains/program/unused/spamd.te
 --- nsapolicy/domains/program/unused/spamd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/spamd.te	2005-11-30 16:42:28.000000000 -0500
-@@ -9,20 +9,22 @@
++++ policy-1.27.1/domains/program/unused/spamd.te	2006-02-06 10:36:59.000000000 -0500
+@@ -9,21 +9,23 @@
  
  tmp_domain(spamd)
  
@@ -2886,14 +2905,15 @@
 +dontaudit spamd_t sysadm_home_dir_t:dir { getattr search };
  
  can_network_server(spamd_t)
++nsswitch_domain(spamd_t)
 +allow spamd_t spamd_port_t:tcp_socket name_bind;
 +allow spamd_t port_type:udp_socket name_bind;
 +dontaudit spamd_t reserved_port_type:udp_socket name_bind;
-+can_ypbind(spamd_t)
-+can_resolve(spamd_t)
  allow spamd_t self:capability net_bind_service;
++allow spamd_t razor_port_t:tcp_socket name_connect;
  
  allow spamd_t proc_t:file { getattr read };
+ 
 @@ -52,20 +54,4 @@
  allow spamd_t urandom_device_t:chr_file { getattr read };
  
@@ -3079,7 +3099,16 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-06 11:10:45.000000000 -0500
+@@ -8,7 +8,7 @@
+ type zebra_conf_t, file_type, sysadmfile;
+ r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
+ 
+-can_network_server(zebra_t)
++can_network(zebra_t)
+ can_ypbind(zebra_t)
+ allow zebra_t { etc_t etc_runtime_t }:file { getattr read };
+ 
 @@ -24,7 +24,7 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -4150,7 +4179,7 @@
 -ifeq ($(MCS),y)
 -TYPE=mcs
 -endif
-+TYPE=strict
++TYPE=targeted
  
  INSTALLDIR = $(TOPDIR)/$(TYPE)
  POLICYPATH = $(INSTALLDIR)/policy
@@ -4917,7 +4946,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts
 --- nsapolicy/net_contexts	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/net_contexts	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/net_contexts	2006-02-06 11:09:39.000000000 -0500
 @@ -50,6 +50,10 @@
  portcon tcp 53 system_u:object_r:dns_port_t
  
@@ -4946,15 +4975,17 @@
  portcon tcp 783 system_u:object_r:spamd_port_t
  portcon tcp 540 system_u:object_r:uucpd_port_t
  portcon tcp 2401 system_u:object_r:cvs_port_t
-@@ -146,6 +149,7 @@
+@@ -145,7 +148,9 @@
+ portcon udp 4569 system_u:object_r:asterisk_port_t
  portcon udp 5060 system_u:object_r:asterisk_port_t
  portcon tcp 2000 system_u:object_r:mail_port_t
++portcon tcp 179  system_u:object_r:zebra_port_t
  portcon tcp 2601 system_u:object_r:zebra_port_t
 +portcon tcp 2605 system_u:object_r:zebra_port_t
  portcon tcp 2628 system_u:object_r:dict_port_t
  portcon tcp 3306 system_u:object_r:mysqld_port_t
  portcon tcp 3632 system_u:object_r:distccd_port_t
-@@ -161,9 +165,14 @@
+@@ -161,9 +166,14 @@
  portcon tcp 5432 system_u:object_r:postgresql_port_t
  portcon tcp 5666 system_u:object_r:inetd_child_port_t
  portcon tcp 5703 system_u:object_r:ptal_port_t


Index: selinux-policy-strict.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- selinux-policy-strict.spec	18 Jan 2006 16:29:52 -0000	1.336
+++ selinux-policy-strict.spec	7 Feb 2006 16:21:06 -0000	1.337
@@ -11,7 +11,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.19
+Release: 2.21
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -229,6 +229,14 @@
 exit 0
 
 %changelog
+* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
+- Allow zebra to use bgp
+- Allow spamd to connect to razor
+
+* Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.20
+- Add ldap support to spamd
+- Auditing changes 
+
 * Wed Jan 18 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.19
 - Add support for labeled networking in upcoming kernel
 - Fix man page and booleans file



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:37:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:37:26 -0500
Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch,1.20,1.21
Message-ID: <200602071637.k17GbQpJ015447@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-strict/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv15431

Modified Files:
	policy-20050916.patch 
Log Message:
* Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
- Allow zebra to use bgp
- Allow spamd to connect to razor


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    4 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   13 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1678 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policy-20050916.patch	7 Feb 2006 16:21:06 -0000	1.20
+++ policy-20050916.patch	7 Feb 2006 16:37:22 -0000	1.21
@@ -4179,7 +4179,7 @@
 -ifeq ($(MCS),y)
 -TYPE=mcs
 -endif
-+TYPE=targeted
++TYPE=strict
  
  INSTALLDIR = $(TOPDIR)/$(TYPE)
  POLICYPATH = $(INSTALLDIR)/policy



From fedora-cvs-commits at redhat.com  Tue Feb  7 16:55:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 11:55:53 -0500
Subject: rpms/xmltex/devel xmltex.spec,1.15,1.16
Message-ID: <200602071655.k17Gtrrj004341@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/xmltex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4303

Modified Files:
	xmltex.spec 
Log Message:
* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-7
- Fix xmltex symlink (-> latex) (bug #168728).



Index: xmltex.spec
===================================================================
RCS file: /cvs/dist/rpms/xmltex/devel/xmltex.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xmltex.spec	9 Dec 2005 22:43:54 -0000	1.15
+++ xmltex.spec	7 Feb 2006 16:55:50 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Namespace-aware XML parser written in TeX.
 Name:		xmltex
 Version:	20020625
-Release: 6.1
+Release: 7
 License:	LaTeX Project Public License (http://www.latex-project.org/lppl.txt)
 Group:		Applications/Publishing
 Source0:	ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz
@@ -36,7 +36,7 @@
 install pdf%{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/
 install %{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/
 ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name}
-ln -s tex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
+ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
 
 gzip -9nf readme.txt
 
@@ -64,6 +64,9 @@
 %{_datadir}/texmf/tex/xmltex
 
 %changelog
+* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-7
+- Fix xmltex symlink (-> latex) (bug #168728).
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
@@ -133,8 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.15  2005/12/09 22:43:54  jkeating
-gcc update bump
+Revision 1.16  2006/02/07 16:55:50  twaugh
+* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-7
+- Fix xmltex symlink (-> latex) (bug #168728).
 
 Revision 1.6  2001/03/27 16:50:29  wiget
 add xmltex.cfg file and one missing dir in %%files; release 3



From fedora-cvs-commits at redhat.com  Tue Feb  7 17:00:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 12:00:13 -0500
Subject: rpms/xmltex/FC-4 xmltex.spec,1.14,1.15
Message-ID: <200602071700.k17H0DxY006285@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	xmltex.spec 
Log Message:
* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-5.2
- Fix xmltex symlink (-> latex) (bug #168728).



Index: xmltex.spec
===================================================================
RCS file: /cvs/dist/rpms/xmltex/FC-4/xmltex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xmltex.spec	20 Sep 2005 16:05:07 -0000	1.14
+++ xmltex.spec	7 Feb 2006 17:00:10 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Namespace-aware XML parser written in TeX.
 Name:		xmltex
 Version:	20020625
-Release:	5.1
+Release:	5.2
 License:	LaTeX Project Public License (http://www.latex-project.org/lppl.txt)
 Group:		Applications/Publishing
 Source0:	ftp://ftp.tex.ac.uk/tex-archive/macros/xmltex-1.9.tar.gz
@@ -36,7 +36,7 @@
 install pdf%{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/
 install %{name}.fmt $RPM_BUILD_ROOT%{_datadir}/texmf/web2c/
 ln -s pdftex ${RPM_BUILD_ROOT}%{_bindir}/pdf%{name}
-ln -s tex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
+ln -s latex ${RPM_BUILD_ROOT}%{_bindir}/%{name}
 
 gzip -9nf readme.txt
 
@@ -64,6 +64,9 @@
 %{_datadir}/texmf/tex/xmltex
 
 %changelog
+* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-5.2
+- Fix xmltex symlink (-> latex) (bug #168728).
+
 * Tue Sep 20 2005 Tim Waugh <twaugh at redhat.com> 20020625-5.1
 - Build fmt file using &latex not &hugelatex (bug #168728).
 
@@ -130,9 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld.org.pl
 
 $Log$
-Revision 1.14  2005/09/20 16:05:07  twaugh
-* Tue Sep 20 2005 Tim Waugh <twaugh at redhat.com> 20020625-5.1
-- Build fmt file using &latex not &hugelatex (bug #168728).
+Revision 1.15  2006/02/07 17:00:10  twaugh
+* Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 20020625-5.2
+- Fix xmltex symlink (-> latex) (bug #168728).
 
 Revision 1.6  2001/03/27 16:50:29  wiget
 add xmltex.cfg file and one missing dir in %%files; release 3



From fedora-cvs-commits at redhat.com  Tue Feb  7 17:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 12:21:16 -0500
Subject: rpms/gnome-themes/devel gnome-themes-2.11.91-clearlooks.patch, 1.2,
	1.3 gnome-themes.spec, 1.51, 1.52
Message-ID: <200602071721.k17HLG13025295@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes-2.11.91-clearlooks.patch gnome-themes.spec 
Log Message:
make icon themes visible


gnome-themes-2.11.91-clearlooks.patch:
 gnome-themes-2.11.91/configure.in                             |   11 ++++++++++
 gnome-themes-2.11.91/gtk-themes/Makefile.am                   |    9 +++++++-
 gnome-themes-2.11.91/icon-themes/Makefile.am                  |    2 -
 gnome-themes-2.13.90/desktop-themes/Clearlooks/index.theme.in |    2 -
 4 files changed, 21 insertions(+), 3 deletions(-)

Index: gnome-themes-2.11.91-clearlooks.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.11.91-clearlooks.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-themes-2.11.91-clearlooks.patch	7 Sep 2005 16:51:11 -0000	1.2
+++ gnome-themes-2.11.91-clearlooks.patch	7 Feb 2006 17:21:13 -0000	1.3
@@ -41,3 +41,11 @@
  common/Makefile
  HighContrast/Makefile
  HighContrast/gtk-2.0/Makefile
+--- gnome-themes-2.13.90/desktop-themes/Clearlooks/index.theme.in.clearlooks-icons	2006-02-07 11:29:34.000000000 -0500
++++ gnome-themes-2.13.90/desktop-themes/Clearlooks/index.theme.in	2006-02-07 11:29:52.000000000 -0500
+@@ -5,4 +5,4 @@
+ Encoding=UTF-8
+ GtkTheme=Clearlooks
+ MetacityTheme=Clearlooks
+-IconTheme=gnome
++IconTheme=Clearlooks


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnome-themes.spec	31 Jan 2006 04:25:09 -0000	1.51
+++ gnome-themes.spec	7 Feb 2006 17:21:13 -0000	1.52
@@ -4,12 +4,11 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
 Version: 2.13.90
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/
 Source: %{name}-%{version}.tar.bz2
 Source1: clearlooks-%{clearlooks_version}.tar.bz2
 Source2: clearlooks-metacity-%{clearlooks_metacity_version}.tar.gz
-Patch1: gnome-themes-hidden.patch
 Patch2: gnome-themes-2.11.91-clearlooks.patch
 Patch3: clearlooks-0.5-inherit-bluecurve.patch
 Patch4: gnome-themes-2.11.90-redmond.patch
@@ -49,7 +48,6 @@
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-DeepSky gtk-themes
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Olive gtk-themes
 mv clearlooks-%{clearlooks_version}/themes/Clearlooks-Quicksilver gtk-themes
-%patch1 -p1 -b .hidden
 %patch2 -p1 -b .clearlooks
 %patch4 -p1 -b .redmond
 
@@ -92,6 +90,10 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
+- Remove the hidden patch, since it causes icon themes
+  to not show up in the theme capplet
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:08:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:08:28 -0500
Subject: rpms/aspell-it/devel aspell-it.spec,1.15,1.16
Message-ID: <200602071808.k17I8Sgf022212@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-it/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22181

Modified Files:
	aspell-it.spec 
Log Message:
changelog timestamp typo


Index: aspell-it.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-it/devel/aspell-it.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-it.spec	7 Feb 2006 10:58:03 -0000	1.15
+++ aspell-it.spec	7 Feb 2006 18:08:25 -0000	1.16
@@ -47,7 +47,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Tue Feb 24 2006 Ivana Varekova <varekova at redhat.com> 50:0.53-4
+* Tue Jan 24 2006 Ivana Varekova <varekova at redhat.com> 50:0.53-4
 - fix typo (bug 178755)
 
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:10:20 -0500
Subject: rpms/elfutils/devel elfutils.spec,1.59,1.60
Message-ID: <200602071810.k17IAKqn023105@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23073

Modified Files:
	elfutils.spec 
Log Message:
spec typo


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- elfutils.spec	7 Feb 2006 11:28:56 -0000	1.59
+++ elfutils.spec	7 Feb 2006 18:10:17 -0000	1.60
@@ -14,7 +14,7 @@
 %if !%{compat}
 Release: %{release}
 %else
-Release: 0.%{release}.1
+Release: 0.%{release}
 %endif
 %if %{gpl}
 License: GPL



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:10:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:10:54 -0500
Subject: rpms/elfutils/devel elfutils.spec,1.60,1.61
Message-ID: <200602071810.k17IAssK023411@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23379

Modified Files:
	elfutils.spec 
Log Message:
bump release again


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- elfutils.spec	7 Feb 2006 18:10:17 -0000	1.60
+++ elfutils.spec	7 Feb 2006 18:10:52 -0000	1.61
@@ -1,5 +1,5 @@
 %define version 0.119
-%define release 1.1
+%define release 1.2
 
 %define gpl 0
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -247,7 +247,7 @@
 %{_libdir}/libelf.so
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 13 2006 Roland McGrath <roland at redhat.com> - 0.119-1



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:23:50 -0500
Subject: rpms/redhat-menus/devel .cvsignore, 1.34, 1.35 redhat-menus.spec,
	1.56, 1.57 sources, 1.36,
	1.37 redhat-menus-5.5.5-fix-pirut.patch, 1.1,
	NONE redhat-menus-6.5.4-fix-applications.patch, 1.1, NONE
Message-ID: <200602071823.k17INopa002897@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1359

Modified Files:
	.cvsignore redhat-menus.spec sources 
Removed Files:
	redhat-menus-5.5.5-fix-pirut.patch 
	redhat-menus-6.5.4-fix-applications.patch 
Log Message:
- use gnome icon names for "-Other" menu files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	1 Feb 2006 21:51:06 -0000	1.34
+++ .cvsignore	7 Feb 2006 18:23:47 -0000	1.35
@@ -1 +1 @@
-redhat-menus-6.5.4.tar.gz
+redhat-menus-6.6.4.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- redhat-menus.spec	5 Feb 2006 05:29:26 -0000	1.56
+++ redhat-menus.spec	7 Feb 2006 18:23:47 -0000	1.57
@@ -3,8 +3,8 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 6.5.4
-Release: 3
+Version: 6.6.4
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -24,9 +24,6 @@
 ## old evolution packages point to a no-longer-existing symlink
 Conflicts: evolution <= 2.4.1-5
 
-Patch0: redhat-menus-5.5.5-fix-pirut.patch
-Patch1: redhat-menus-6.5.4-fix-applications.patch
-
 %description
 
 This package contains the XML files that describe the menu layout for 
@@ -35,8 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-pirut
-%patch1 -p1 -b .fix-applications
 
 %build
 
@@ -71,6 +66,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Tue Feb 7 2006 Ray Strode <rstrode at redhat.com> - 6.6.4-1
+- use gnome icon names for "-Other" menu files
+
 * Sun Feb 5 2006 Matthias Clasen <mclasen at redhat.com> - 6.5.4-3
 - Add missing requires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	1 Feb 2006 21:51:06 -0000	1.36
+++ sources	7 Feb 2006 18:23:47 -0000	1.37
@@ -1 +1 @@
-056674603636e82e218bc713c8153bb2  redhat-menus-6.5.4.tar.gz
+055b44401e2bddfdf81b135ee30bea0f  redhat-menus-6.6.4.tar.gz


--- redhat-menus-5.5.5-fix-pirut.patch DELETED ---


--- redhat-menus-6.5.4-fix-applications.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:27:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:27:11 -0500
Subject: rpms/kernel/FC-4 .cvsignore, 1.172, 1.173 kernel-2.6.spec, 1.1593,
	1.1594 sources, 1.156, 1.157 upstream, 1.97, 1.98
Message-ID: <200602071827.k17IRBKL003151@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
2.6.15.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- .cvsignore	1 Feb 2006 00:07:22 -0000	1.172
+++ .cvsignore	7 Feb 2006 18:27:08 -0000	1.173
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.15.2.bz2
+patch-2.6.15.3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1593
retrieving revision 1.1594
diff -u -r1.1593 -r1.1594
--- kernel-2.6.spec	3 Feb 2006 18:57:58 -0000	1.1593
+++ kernel-2.6.spec	7 Feb 2006 18:27:09 -0000	1.1594
@@ -206,7 +206,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.15.2.bz2
+Patch1: patch-2.6.15.3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1276,6 +1276,10 @@
 %endif
 
 %changelog
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.15.3
+  Fixes remotely exploitable bug in ICMP (CVE-2006-0454)
+
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - Make 'quiet' work again.
 - dm-crypt: zero key before freeing it


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- sources	1 Feb 2006 00:07:22 -0000	1.156
+++ sources	7 Feb 2006 18:27:09 -0000	1.157
@@ -1,2 +1,2 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-f5dea6c02ad6f943f5a711df694e2120  patch-2.6.15.2.bz2
+198739ce31f4b8e2309189891defa4de  patch-2.6.15.3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- upstream	1 Feb 2006 00:07:22 -0000	1.97
+++ upstream	7 Feb 2006 18:27:09 -0000	1.98
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.15.2.bz2
+patch-2.6.15.3.bz2
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:29:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:29:31 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1594,1.1595
Message-ID: <200602071829.k17ITVc0003241@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump






From fedora-cvs-commits at redhat.com  Tue Feb  7 18:29:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:29:53 -0500
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.5,1.6
Message-ID: <200602071829.k17ITrcO003336@cvs.devel.redhat.com>

Author: johnp

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

Modified Files:
	gnome-mount.spec 
Log Message:
- Fix build to not tie the release to the tarball name



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-mount.spec	7 Feb 2006 11:53:24 -0000	1.5
+++ gnome-mount.spec	7 Feb 2006 18:29:51 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060117.1
+Release: 0.cvs20060117.2
 License: GPL
 Group: Applications/System
-Source: %{name}-%{version}-%{release}.tar.gz
+Source: %{name}-%{version}-0.cvs20060117.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: hal >= 0.5.0
 Requires: dbus >= 0.60
@@ -58,6 +58,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Tue Feb 07 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-0.cvs20060117.2
+- fix build
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4-0.cvs20060117.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:34:22 -0500
Subject: rpms/tix/devel tix.spec,1.9,1.10
Message-ID: <200602071834.k17IYM57003477@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3463

Modified Files:
	tix.spec 
Log Message:
Better use of macros in the install and files sections.



Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tix.spec	7 Feb 2006 16:08:20 -0000	1.9
+++ tix.spec	7 Feb 2006 18:34:18 -0000	1.10
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -56,10 +56,7 @@
 autoconf
 
 %build
-%configure \
-   --with-tcl=%{_libdir} \
-   --with-tk=%{_libdir} \
-   --enable-64bit
+%configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-64bit
 make all %{?_smp_mflags}
 
 %install
@@ -67,30 +64,30 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # install demo scripts
-mkdir -p $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
-cp -a demos $RPM_BUILD_ROOT/usr/share/Tix%{tixmajor}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
+cp -a demos $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
 
 # move shared lib
-mv $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT/usr/lib/libTix%{tixmajor}.so
-( cd $RPM_BUILD_ROOT/usr/lib
+mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so
+( cd $RPM_BUILD_ROOT%{_libdir}
   ln -sf libTix%{tixmajor}.so libTix.so
   ln -sf libTix%{tixmajor}.so libtix.so
 )
 
 # the header and man pages were in the previous package, keeping for now...
-mkdir -p $RPM_BUILD_ROOT/usr/include
-install -m 0644 generic/tix.h $RPM_BUILD_ROOT/usr/include/tix.h
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+install -m 0644 generic/tix.h $RPM_BUILD_ROOT%{_includedir}/tix.h
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/mann
-cp man/*.n $RPM_BUILD_ROOT/usr/share/man/mann
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/mann
+cp man/*.n $RPM_BUILD_ROOT%{_mandir}/mann
 
 # ship docs except pdf
 rm -rf docs/pdf
 find docs -name .cvsignore -exec rm '{}' ';'
 
 # these files end up in the doc directory
-rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/README.txt
-rm -f $RPM_BUILD_ROOT/usr/lib/Tix%{tixmajor}/license.terms
+rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/README.txt
+rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/license.terms
 
 
 %clean
@@ -103,12 +100,12 @@
 
 %files
 %defattr(-,root,root,-)
-/usr/lib/libTix%{tixmajor}.so
-%dir /usr/lib/Tix%{tixmajor}
-/usr/lib/Tix%{tixmajor}/*.tcl
-/usr/lib/Tix%{tixmajor}/bitmaps
-/usr/lib/Tix%{tixmajor}/pref
-/usr/share/Tix%{tixmajor}
+%{_libdir}/libTix%{tixmajor}.so
+%dir %{_libdir}/Tix%{tixmajor}
+%{_libdir}/Tix%{tixmajor}/*.tcl
+%{_libdir}/Tix%{tixmajor}/bitmaps
+%{_libdir}/Tix%{tixmajor}/pref
+%{_datadir}/Tix%{tixmajor}
 %doc *.txt *.html license.terms
 
 %files devel
@@ -124,6 +121,9 @@
 
 
 %changelog
+* Tue Feb 07 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-2
+- Better use of macros in the install and files sections
+
 * Mon Feb 06 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-1
 - Upgraded to tix-8.4.0
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:52:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:52:07 -0500
Subject: rpms/python-sqlite/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200602071852.k17Iq7KL016431@cvs.devel.redhat.com>

Author: pnasrat

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

Modified Files:
	.cvsignore sources 
Log Message:
upload src


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Mar 2005 20:31:42 -0000	1.2
+++ .cvsignore	7 Feb 2006 18:52:05 -0000	1.3
@@ -1 +1,2 @@
 pysqlite-1.1.6.tar.gz
+pysqlite-1.1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Mar 2005 20:31:42 -0000	1.2
+++ sources	7 Feb 2006 18:52:05 -0000	1.3
@@ -1 +1 @@
-cc936312beff1bd7ab6e4f46d745237c  pysqlite-1.1.6.tar.gz
+edbed4ccfdc114754c73081e79163be1  pysqlite-1.1.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb  7 18:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 13:52:20 -0500
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.23,
	1.24 gnome-icon-theme.spec, 1.35, 1.36 sources, 1.23, 1.24
Message-ID: <200602071852.k17IqKMQ016492@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16447

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
Add missing icons



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Feb 2006 04:21:40 -0000	1.23
+++ .cvsignore	7 Feb 2006 18:52:17 -0000	1.24
@@ -14,3 +14,5 @@
 gnome-icon-theme-2.13.5.tar.bz2
 gnome-icon-theme-2.13.5.1.tar.bz2
 gnome-icon-theme-2.13.7.tar.bz2
+external-icons-2.13.90-1.tar.gz
+external-icons-2.13.7.tar.gz


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-icon-theme.spec	7 Feb 2006 04:21:40 -0000	1.35
+++ gnome-icon-theme.spec	7 Feb 2006 18:52:17 -0000	1.36
@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.13.7
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
-Source1: external-icons-2.10.1-2.tar.gz
+Source1: external-icons-2.13.7.tar.gz
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -37,40 +37,25 @@
 ## remove these bogus files
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
 
-## create symlinks so the gnome theme covers some extra icons we've added
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-ln -s gnome-util.png redhat-accessories.png
-#ln -s %{_datadir}/pixmaps/.png redhat-extras.png
-ln -s gnome-joystick.png redhat-games.png
-ln -s gnome-graphics.png redhat-graphics.png
+for i in 48x48 24x24; do 
+## create symlinks so the all icon themes know some extra icons we've added
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+
+ln -s ../../../gnome/$i/apps/gnome-util.png redhat-accessories.png
+ln -s ../../../gnome/$i/apps/gnome-joystick.png redhat-games.png
+ln -s ../../../gnome/$i/apps/gnome-graphics.png redhat-graphics.png
 ln -s ../../../../pixmaps/gnome-home.png redhat-home.png
-ln -s gnome-globe.png redhat-internet.png
-ln -s gnome-desktop-config.png redhat-preferences.png
-ln -s gnome-applications.png redhat-office.png
-ln -s gnome-devel.png redhat-programming.png
-ln -s gnome-server-config.png redhat-server_settings.png
-ln -s gnome-multimedia.png redhat-sound_video.png
-ln -s gnome-starthere.png redhat-starthere.png
-ln -s gnome-system-config.png redhat-system_settings.png
-ln -s gnome-system.png redhat-system_tools.png
-#ln -s %{_datadir}/pixmaps/.png redhat-tools.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-
-rm -f gnome-fs-locally-shared.png
-rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-
-rm -f gnome-fs-locally-shared.png rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
+ln -s ../../../gnome/$i/apps/gnome-globe.png redhat-internet.png
+ln -s ../../../gnome/$i/apps/gnome-desktop-config.png redhat-preferences.png
+ln -s ../../../gnome/$i/apps/gnome-applications.png redhat-office.png
+ln -s ../../../gnome/$i/apps/gnome-devel.png redhat-programming.png
+ln -s ../../../gnome/$i/apps/gnome-server-config.png redhat-server_settings.png
+ln -s ../../../gnome/$i/apps/gnome-multimedia.png redhat-sound_video.png
+ln -s ../../../gnome/$i/apps/gnome-starthere.png redhat-starthere.png
+ln -s ../../../gnome/$i/apps/gnome-system-config.png redhat-system_settings.png
+ln -s ../../../gnome/$i/apps/gnome-system.png redhat-system_tools.png
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +76,10 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-2
+- Add back some icons that went missing
+- Fix redhat- symlinks that were broken since FC1
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-1
 - Update to 2.13.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Feb 2006 04:21:40 -0000	1.23
+++ sources	7 Feb 2006 18:52:17 -0000	1.24
@@ -1,2 +1,2 @@
-e6c3328995f2ce73ee91d1a654198f3f  external-icons-2.10.1-2.tar.gz
 65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
+8374adf91a28e2f56888672f74d80a52  external-icons-2.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:16:02 -0500
Subject: rpms/beagle/devel beagle.spec,1.22,1.23
Message-ID: <200602071916.k17JG2f6031351@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31253

Modified Files:
	beagle.spec 
Log Message:
Add missing 



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- beagle.spec	7 Feb 2006 11:08:03 -0000	1.22
+++ beagle.spec	7 Feb 2006 19:16:00 -0000	1.23
@@ -16,6 +16,8 @@
 BuildRequires:  gmime-sharp >= 2.1.19
 BuildRequires:  evolution-sharp >= 0.10.2-3
 BuildRequires:  libXScrnSaver-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnome-devel
 Requires: sqlite >= 3.3.1
 Requires: zip mono-core poppler-utils
 Patch0: beagle-0.2.0-security-fix.patch
@@ -148,6 +150,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen2redhat.com> - 0.2.1-2
+- Add missing BuildRequires (#180336)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:16:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:16:50 -0500
Subject: rpms/beagle/devel beagle.spec,1.23,1.24
Message-ID: <200602071916.k17JGoQI005517@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4814

Modified Files:
	beagle.spec 
Log Message:
Bump rev



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- beagle.spec	7 Feb 2006 19:16:00 -0000	1.23
+++ beagle.spec	7 Feb 2006 19:16:46 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        1.1
+Release:        2
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:18:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:18:18 -0500
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_51-bz180145-mail_i18n.patch,
	NONE, 1.1 vixie-cron.spec, 1.63, 1.64
Message-ID: <200602071918.k17JIIoJ012307@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12272

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_51-bz180145-mail_i18n.patch 
Log Message:
fix bug 180145:  provide support for mail in non-ascii charsets

vixie-cron-4.1-_51-bz180145-mail_i18n.patch:
 cron.c       |   11 +++++++++++
 crontab.5    |   16 +++++++++++++---
 do_command.c |   32 ++++++++++++++++++++++++++++++++
 externs.h    |    6 ++++++
 globals.h    |    3 ++-
 5 files changed, 64 insertions(+), 4 deletions(-)

--- NEW FILE vixie-cron-4.1-_51-bz180145-mail_i18n.patch ---
--- vixie-cron-4.1/externs.h.mail_i18n	2004-07-21 09:31:55.000000000 -0400
+++ vixie-cron-4.1/externs.h	2006-02-07 13:06:46.000000000 -0500
@@ -61,6 +61,12 @@
 # include <bsd_auth.h>
 #endif /*BSD_AUTH*/
 
+/* include locale stuff for mailer "Content-Type": 
+ */
+#include <locale.h>
+#include <nl_types.h>
+#include <langinfo.h>
+
 #define DIR_T	struct dirent
 #define WAIT_T	int
 #define SIG_T	sig_t
--- vixie-cron-4.1/cron.c.mail_i18n	2006-01-26 14:41:39.000000000 -0500
+++ vixie-cron-4.1/cron.c	2006-02-07 13:10:42.000000000 -0500
@@ -60,6 +60,7 @@
 	struct sigaction sact;
 	cron_db	database;
 	int fd;
+	char *cs;
 
 	ProgramName = argv[0];
 
@@ -99,6 +100,16 @@
 	if ( getenv("CRON_VALIDATE_MAILRCPTS") != 0L )
 	    ValidateMailRcpts=1;
 
+	/* Get the default locale character set for the mail 
+	 * "Content-Type: ...; charset=" header
+	 */
+	setlocale(LC_ALL,""); /* set locale to system defaults or to
+				 that specified by any  LC_* env vars */
+	if ( ( cs = nl_langinfo( CODESET ) ) != 0L )
+	    strncpy( cron_default_mail_charset, cs, MAX_ENVSTR );
+	else
+	    strcpy( cron_default_mail_charset, "US-ASCII" );
+	
 	/* if there are no debug flags turned on, fork as a daemon should.
 	 */
 	if (DebugFlags) {
--- vixie-cron-4.1/do_command.c.mail_i18n	2006-01-26 14:41:39.000000000 -0500
+++ vixie-cron-4.1/do_command.c	2006-02-07 13:19:27.000000000 -0500
@@ -375,6 +375,8 @@
 				char	**env;
 				char	mailcmd[MAX_COMMAND];
 				char	hostname[MAXHOSTNAMELEN];
+				char    *content_type = env_get("CONTENT_TYPE",jobenv),
+				        *content_transfer_encoding = env_get("CONTENT_TRANSFER_ENCODING",jobenv);
 
 				gethostname(hostname, MAXHOSTNAMELEN);
 				
@@ -400,10 +402,40 @@
 				fprintf(mail, "Subject: Cron <%s@%s> %s\n",
 					usernm, first_word(hostname, "."),
 					e->cmd);
+
 #ifdef MAIL_DATE
 				fprintf(mail, "Date: %s\n",
 					arpadate(&StartTime));
 #endif /*MAIL_DATE*/
+				if ( content_type == 0L )
+				{   
+					fprintf(mail, "Content-Type: text/plain; charset=%s\n",
+						cron_default_mail_charset
+					       );
+				}else
+				{       /* user specified Content-Type header. 
+					 * disallow new-lines for security reasons 
+					 * (else users could specify arbitrary mail headers!)
+					 */
+					char *nl=content_type;
+					size_t ctlen = strlen(content_type);				    
+					while(  (*nl != '\0') 
+					     && ((nl=strchr(nl,'\n')) != 0L)
+					     && (nl < (content_type+ctlen)) 
+					     ) *nl = ' ';
+					fprintf(mail,"Content-Type: %s\n", content_type);
+				}
+				if ( content_transfer_encoding != 0L )
+				{
+					char *nl=content_transfer_encoding;
+					size_t ctlen = strlen(content_transfer_encoding);
+					while(  (*nl != '\0') 
+					     && ((nl=strchr(nl,'\n')) != 0L)
+					     && (nl < (content_transfer_encoding+ctlen))
+					     ) *nl = ' ';				
+					fprintf(mail,"Content-Transfer-Encoding: %s\n", content_transfer_encoding);
+				}
+
 				for (env = jobenv;  *env;  env++)
 					fprintf(mail, "X-Cron-Env: <%s>\n",
 						*env);
--- vixie-cron-4.1/crontab.5.mail_i18n	2006-01-26 14:41:39.000000000 -0500
+++ vixie-cron-4.1/crontab.5	2006-02-07 13:34:42.000000000 -0500
@@ -61,7 +61,7 @@
 .IR cron (8)
 daemon.
 SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd 
-line of the crontab's owner.
+line of the crontab\'s owner.
 HOME and SHELL may be overridden by settings in the crontab; LOGNAME may not.
 .PP
 (Another note: the LOGNAME variable is sometimes called USER on BSD systems...
@@ -74,8 +74,18 @@
 sent to the user so named.  If MAILTO is defined but empty (MAILTO=""), no
 mail will be sent.  Otherwise mail is sent to the owner of the crontab.  This
 option is useful if you decide on /bin/mail instead of /usr/lib/sendmail as
-your mailer when you install cron -- /bin/mail doesn't do aliasing, and UUCP
-usually doesn't read its mail.
+your mailer when you install cron -- /bin/mail doesn\'t do aliasing, and UUCP
+usually doesn\'t read its mail.
+.PP
+By default, cron will send mail using the mail 'Content-Type:' header of 'text/plain' with the 'charset=' parameter set to the charmap / codeset of the locale in which 
+.IR crond(8)
+is started up - ie. either the default system locale, if no LC_* environment
+variables are set, or the locale specified by the LC_* environment variables
+( see 
+.IR locale(7) ). 
+You can use different character encodings for mailed cron job output by 
+setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
+to the correct values of the mail headers of those names.  
 .PP
 The format of a cron command is very much the V7 standard, with a number of
 upward-compatible extensions.  Each line has five time and date fields,
--- vixie-cron-4.1/globals.h.mail_i18n	2006-01-26 14:41:39.000000000 -0500
+++ vixie-cron-4.1/globals.h	2006-02-07 12:46:34.000000000 -0500
@@ -66,7 +66,8 @@
 XTRN int        PermitAnyCrontab INIT(0);
 XTRN int        ValidateMailRcpts INIT(0);
 XTRN char       MailCmd[MAX_COMMAND] INIT("");
-
+XTRN char       cron_default_mail_charset[MAX_ENVSTR] INIT("");
+ 
 #if DEBUGGING
 XTRN int	DebugFlags INIT(0);
 XTRN const char *DebugFlagNames[]


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vixie-cron.spec	26 Jan 2006 19:51:52 -0000	1.63
+++ vixie-cron.spec	7 Feb 2006 19:18:14 -0000	1.64
@@ -7,7 +7,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 50.FC5
+Release: 51.FC5
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -65,6 +65,7 @@
 Patch48: vixie-cron-4.1-_48-security.patch
 Patch49: vixie-cron-4.1-_49-bz178436.patch
 Patch50: vixie-cron-4.1-_50-bz178931.patch
+Patch51: vixie-cron-4.1-_51-bz180145-mail_i18n.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -146,6 +147,7 @@
 %patch48 -p1 -b .security
 %patch49 -p1 -b .bz178436
 %patch50 -p1 -b .bz178931
+%patch51 -p1 -b .mail_i18n
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror"
@@ -203,6 +205,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias<jvdias at redhat.com> - 4.1-51.FC5
+- fix bug 180145: provide support for mail in non-ascii charsets
+
 * Thu Jan 26 2006 Jason Vas Dias<jvdias at redhat.com> - 4.1-50.FC5
 - fix bug 178436: prevent per-minute jobs being delayed into next minute
 - fix bug 178931: remove pam_unix and pam_krb5 from pam session stack



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:28:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:28:53 -0500
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.9,
	1.10 gnome-power-manager.spec, 1.19, 1.20 sources, 1.9,
	1.10 gnome-power-manager-2.13.5-lid-suspend.patch, 1.1,
	NONE gnome-power-manager-2.13.5-xdg.patch, 1.1, NONE
Message-ID: <200602071928.k17JSrag017661@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17558

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Removed Files:
	gnome-power-manager-2.13.5-lid-suspend.patch 
	gnome-power-manager-2.13.5-xdg.patch 
Log Message:
- pull cvs snapshot from HEAD and drop the patches caillon
  just added



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Jan 2006 19:33:39 -0000	1.9
+++ .cvsignore	7 Feb 2006 19:28:50 -0000	1.10
@@ -1,2 +1 @@
-gnome-power-manager-0.3.4.tar.gz
-gnome-power-manager-2.13.5.tar.bz2
+gnome-power-manager-2.13.5.0.20060207.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-power-manager.spec	7 Feb 2006 16:12:52 -0000	1.19
+++ gnome-power-manager.spec	7 Feb 2006 19:28:50 -0000	1.20
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.13.5
-Release: 3
+Version: 2.13.5.0.20060207
+Release: 1
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -23,8 +23,6 @@
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
-Patch1: gnome-power-manager-2.13.5-xdg.patch
-Patch2: gnome-power-manager-2.13.5-lid-suspend.patch
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
 displaying icons and handling user callbacks in an interactive GNOME session. 
@@ -33,8 +31,6 @@
 
 %prep
 %setup -q
-%patch1 -p0
-%patch2 -p0
 
 %build
 %configure --disable-scrollkeeper
@@ -83,6 +79,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb  7 2006 Ray Strode <rstrode at redhat.com> - 2.13.5.0.20060207-1
+- pull cvs snapshot from HEAD and drop the patches caillon
+  just added
+
 * Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.13.5-3
 - Install into the autostart directory
 - Don't suspend on lid close while on AC power


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Jan 2006 19:33:39 -0000	1.9
+++ sources	7 Feb 2006 19:28:50 -0000	1.10
@@ -1 +1 @@
-beb9a4d1f7822ee2117503de4dd95a2e  gnome-power-manager-2.13.5.tar.bz2
+0c5b78d9015dd59ff6f4e05d8d08d3e7  gnome-power-manager-2.13.5.0.20060207.tar.bz2


--- gnome-power-manager-2.13.5-lid-suspend.patch DELETED ---


--- gnome-power-manager-2.13.5-xdg.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:30:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:30:02 -0500
Subject: rpms/gjdoc/devel gjdoc-fix-control-z.patch, NONE, 1.1 gjdoc.spec,
	1.32, 1.33
Message-ID: <200602071930.k17JU2YV018261@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18220

Modified Files:
	gjdoc.spec 
Added Files:
	gjdoc-fix-control-z.patch 
Log Message:
Added ^Z as a whitespace character.

gjdoc-fix-control-z.patch:
 Parser.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gjdoc-fix-control-z.patch ---
--- gjdoc-0.7.7/src/gnu/classpath/tools/gjdoc/Parser.java.sav	2006-01-25 18:51:45.646386000 -0500
+++ gjdoc-0.7.7/src/gnu/classpath/tools/gjdoc/Parser.java	2006-01-25 18:51:55.264757000 -0500
@@ -627,10 +627,10 @@
       return this.addComments;
    }
 
-   public static final String WHITESPACE=" \t\r\n";
+   public static final String WHITESPACE=" \t\r\n";
 
    public static final boolean isWhitespace(char c) {
-      return (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '');
+      return (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '' || c == '');
       //return WHITESPACE.indexOf(c)>=0; 
    }
 


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gjdoc.spec	7 Feb 2006 11:48:26 -0000	1.32
+++ gjdoc.spec	7 Feb 2006 19:30:00 -0000	1.33
@@ -1,12 +1,13 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 2.1
+Release: 3
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
 Group: Development/Tools
 
 Source0: ftp://ftp.gnu.org/gnu/classpath/gjdoc-%{version}.tar.gz
+Patch0: %{name}-fix-control-z.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: gcc-java >= 4.0.0-8
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -49,6 +51,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 07 2006 Rafael Schloming <rafaels at redhat.com> - 0.7.7-3
+- Added ^Z as a whitespace character.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:53:46 -0500
Subject: rpms/vixie-cron/FC-4 vixie-cron-4.1-_44-bz180145-mail_i18n.patch,
	NONE, 1.1 vixie-cron.spec, 1.53, 1.54
Message-ID: <200602071953.k17Jrjs3007202@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7170

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_44-bz180145-mail_i18n.patch 
Log Message:
fix bug 180145: provide support for mail in non-ascii charsets

vixie-cron-4.1-_44-bz180145-mail_i18n.patch:
 cron.c       |   11 +++++++++++
 crontab.5    |   10 ++++++++++
 do_command.c |   31 +++++++++++++++++++++++++++++++
 externs.h    |    6 ++++++
 globals.h    |    1 +
 5 files changed, 59 insertions(+)

--- NEW FILE vixie-cron-4.1-_44-bz180145-mail_i18n.patch ---
--- vixie-cron-4.1/externs.h.mail_i18n	2004-07-21 09:31:55.000000000 -0400
+++ vixie-cron-4.1/externs.h	2006-02-07 14:35:57.000000000 -0500
@@ -61,6 +61,12 @@
 # include <bsd_auth.h>
 #endif /*BSD_AUTH*/
 
+/* include locale stuff for mailer "Content-Type": 
+ */
+#include <locale.h>
+#include <nl_types.h>
+#include <langinfo.h>
+
 #define DIR_T	struct dirent
 #define WAIT_T	int
 #define SIG_T	sig_t
--- vixie-cron-4.1/globals.h.mail_i18n	2006-02-07 14:33:49.000000000 -0500
+++ vixie-cron-4.1/globals.h	2006-02-07 14:37:02.000000000 -0500
@@ -65,6 +65,7 @@
 XTRN int	NoFork INIT(0);
 XTRN int        PermitAnyCrontab INIT(0);
 XTRN int        ValidateMailRcpts INIT(0);
+XTRN char       cron_default_mail_charset[MAX_ENVSTR] INIT("");
 
 #if DEBUGGING
 XTRN int	DebugFlags INIT(0);
--- vixie-cron-4.1/cron.c.mail_i18n	2006-02-07 14:33:49.000000000 -0500
+++ vixie-cron-4.1/cron.c	2006-02-07 14:39:54.000000000 -0500
@@ -60,6 +60,7 @@
 	struct sigaction sact;
 	cron_db	database;
 	int fd;
+	char *cs;
 
 	ProgramName = argv[0];
 
@@ -99,6 +100,16 @@
 	if ( getenv("CRON_VALIDATE_MAILRCPTS") != 0L )
 	    ValidateMailRcpts=1;
 
+	/* Get the default locale character set for the mail 
+	 * "Content-Type: ...; charset=" header
+	 */
+	setlocale(LC_ALL,""); /* set locale to system defaults or to
+				 that specified by any  LC_* env vars */
+	if ( ( cs = nl_langinfo( CODESET ) ) != 0L )
+	    strncpy( cron_default_mail_charset, cs, MAX_ENVSTR );
+	else
+	    strcpy( cron_default_mail_charset, "US-ASCII" );
+
 	/* if there are no debug flags turned on, fork as a daemon should.
 	 */
 	if (DebugFlags) {
--- vixie-cron-4.1/do_command.c.mail_i18n	2006-02-07 14:33:49.000000000 -0500
+++ vixie-cron-4.1/do_command.c	2006-02-07 14:39:32.000000000 -0500
@@ -489,6 +489,8 @@
 				char	**env;
 				char	mailcmd[MAX_COMMAND];
 				char	hostname[MAXHOSTNAMELEN];
+				char    *content_type = env_get("CONTENT_TYPE",jobenv),
+				        *content_transfer_encoding = env_get("CONTENT_TRANSFER_ENCODING",jobenv);
 
 				gethostname(hostname, MAXHOSTNAMELEN);
 				if (strlens(MAILFMT, MAILARG, NULL) + 1
@@ -510,6 +512,35 @@
 				fprintf(mail, "Date: %s\n",
 					arpadate(&StartTime));
 #endif /*MAIL_DATE*/
+				if ( content_type == 0L )
+				{   
+					fprintf(mail, "Content-Type: text/plain; charset=%s\n",
+						cron_default_mail_charset
+					       );
+				}else
+				{       /* user specified Content-Type header. 
+					 * disallow new-lines for security reasons 
+					 * (else users could specify arbitrary mail headers!)
+					 */
+					char *nl=content_type;
+					size_t ctlen = strlen(content_type);				    
+					while(  (*nl != '\0') 
+					     && ((nl=strchr(nl,'\n')) != 0L)
+					     && (nl < (content_type+ctlen)) 
+					     ) *nl = ' ';
+					fprintf(mail,"Content-Type: %s\n", content_type);
+				}
+				if ( content_transfer_encoding != 0L )
+				{
+					char *nl=content_transfer_encoding;
+					size_t ctlen = strlen(content_transfer_encoding);
+					while(  (*nl != '\0') 
+					     && ((nl=strchr(nl,'\n')) != 0L)
+					     && (nl < (content_transfer_encoding+ctlen))
+					     ) *nl = ' ';				
+					fprintf(mail,"Content-Transfer-Encoding: %s\n", content_transfer_encoding);
+				}
+
 				for (env = jobenv;  *env;  env++)
 					fprintf(mail, "X-Cron-Env: <%s>\n",
 						*env);
--- vixie-cron-4.1/crontab.5.mail_i18n	2006-02-07 14:33:48.000000000 -0500
+++ vixie-cron-4.1/crontab.5	2006-02-07 14:40:48.000000000 -0500
@@ -77,6 +77,16 @@
 your mailer when you install cron -- /bin/mail doesn't do aliasing, and UUCP
 usually doesn't read its mail.
 .PP
+By default, cron will send mail using the mail 'Content-Type:' header of 'text/plain' with the 'charset=' parameter set to the charmap / codeset of the locale in which 
+.IR crond(8)
+is started up - ie. either the default system locale, if no LC_* environment
+variables are set, or the locale specified by the LC_* environment variables
+( see 
+.IR locale(7) ). 
+You can use different character encodings for mailed cron job output by 
+setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
+to the correct values of the mail headers of those names.  
+.PP
 The format of a cron command is very much the V7 standard, with a number of
 upward-compatible extensions.  Each line has five time and date fields,
 followed by a user name if this is the system crontab file,


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vixie-cron.spec	26 Jan 2006 19:05:00 -0000	1.53
+++ vixie-cron.spec	7 Feb 2006 19:53:42 -0000	1.54
@@ -7,7 +7,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 41.FC4
+Release: 44.FC4
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -58,6 +58,7 @@
 Patch41: vixie-cron-4.1-CAN-2005-1038-fix-race.patch
 Patch42: vixie-cron-4.1-_42-bz178431.patch
 Patch43: vixie-cron-4.1-_43-bz173926.patch
+Patch44: vixie-cron-4.1-_44-bz180145-mail_i18n.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: sysklogd >= 1.3.33-6, bash >= 2.0
 %if %{WITH_SELINUX}
@@ -131,6 +132,7 @@
 %patch41 -p1 -b .CAN-2005-1038-fix-race
 %patch42 -p1 -b .bz178431
 %patch43 -p1 -b .bz173926
+%patch44 -p1 -b .bz180145
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -188,6 +190,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 4.1-44.FC4
+- fix bug 180145: provide support for mail in non-ascii charsets
+
 * Thu Jan 26 2006 Jason Vas Dias <jvdias at redhat.com> - 4.1-41.FC4
 - fix bug 178931 / 178939: silence pam_krb5 debug messages
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:55:03 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.339, 1.340 kernel-2.6.spec, 1.1914,
	1.1915 sources, 1.281, 1.282 upstream, 1.255, 1.256
Message-ID: <200602071955.k17Jt3fX007878@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git3.bz2.sign 
Log Message:
git3



--- NEW FILE patch-2.6.16-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD5+PNyGugalF9Dw4RAjtsAKCJX8fuUlA3RX24LxQ3uLlTlMnv3wCgkG48
lsV4Ke9qVQz7GD8Mla3HmUQ=
=Rhvy
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- .cvsignore	6 Feb 2006 15:39:59 -0000	1.339
+++ .cvsignore	7 Feb 2006 19:55:00 -0000	1.340
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git2.bz2
+patch-2.6.16-rc2-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1914
retrieving revision 1.1915
diff -u -r1.1914 -r1.1915
--- kernel-2.6.spec	6 Feb 2006 22:08:24 -0000	1.1914
+++ kernel-2.6.spec	7 Feb 2006 19:55:00 -0000	1.1915
@@ -206,7 +206,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git2.bz2
+Patch2: patch-2.6.16-rc2-git3.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1395,6 +1395,9 @@
 %endif
 
 %changelog
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git3
+
 * Mon Feb  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- sources	6 Feb 2006 15:40:00 -0000	1.281
+++ sources	7 Feb 2006 19:55:00 -0000	1.282
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-b5306d5c471ef0a301ced2acb475d361  patch-2.6.16-rc2-git2.bz2
+a1e8c0cbebb73561c1d7eae45b5d6ee6  patch-2.6.16-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- upstream	6 Feb 2006 15:40:00 -0000	1.255
+++ upstream	7 Feb 2006 19:55:00 -0000	1.256
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git2.bz2
+patch-2.6.16-rc2-git3.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:55:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:55:38 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc1-git6.bz2.sign,1.1,NONE
Message-ID: <200602071955.k17JtcOp008171@cvs.devel.redhat.com>

Author: davej

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

Removed Files:
	patch-2.6.16-rc1-git6.bz2.sign 
Log Message:
dead



--- patch-2.6.16-rc1-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:55:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:55:58 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git2.bz2.sign,1.1,NONE
Message-ID: <200602071955.k17Jtw5Q008391@cvs.devel.redhat.com>

Author: davej

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

Removed Files:
	patch-2.6.16-rc2-git2.bz2.sign 
Log Message:
dead



--- patch-2.6.16-rc2-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 19:56:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 14:56:01 -0500
Subject: rpms/system-config-lvm/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 system-config-lvm.spec, 1.19, 1.20
Message-ID: <200602071956.k17Ju16P008445@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.12-1.0 on branch devel from system-config-lvm-1.0.12-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	3 Feb 2006 22:59:49 -0000	1.18
+++ .cvsignore	7 Feb 2006 19:55:59 -0000	1.19
@@ -1 +1 @@
-system-config-lvm-1.0.11.tar.gz
+system-config-lvm-1.0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	3 Feb 2006 22:59:49 -0000	1.18
+++ sources	7 Feb 2006 19:55:59 -0000	1.19
@@ -1 +1 @@
-a4817d73a685cde6ac16037c433d1c70  system-config-lvm-1.0.11.tar.gz
+a9beb0b714f4887aa808d9c92a278c3e  system-config-lvm-1.0.12.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- system-config-lvm.spec	3 Feb 2006 22:59:49 -0000	1.19
+++ system-config-lvm.spec	7 Feb 2006 19:55:59 -0000	1.20
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
-Version: 1.0.11
+Version: 1.0.12
 Release: 1.0
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -51,6 +51,8 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* Mon Feb 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.12-1.0
+  - Under certain conditions, labels might show partially
 * Fri Feb 03 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.11-1.0
   - Fixes for bz175077,169860,178128,161917,171117,175131,178195 
 * Thu Jan 05 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.10-1.0



From fedora-cvs-commits at redhat.com  Tue Feb  7 20:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 15:19:26 -0500
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.22, 1.23 sources,
	1.28, 1.29 system-config-kickstart.spec, 1.32, 1.33
Message-ID: <200602072019.k17KJQEF028684@cvs.devel.redhat.com>

Author: clumens

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

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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	3 Feb 2006 20:36:42 -0000	1.22
+++ .cvsignore	7 Feb 2006 20:19:23 -0000	1.23
@@ -15,3 +15,4 @@
 system-config-kickstart-2.6.2.tar.bz2
 system-config-kickstart-2.6.3.tar.bz2
 system-config-kickstart-2.6.4.tar.bz2
+system-config-kickstart-2.6.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	3 Feb 2006 20:36:42 -0000	1.28
+++ sources	7 Feb 2006 20:19:23 -0000	1.29
@@ -1 +1 @@
-ccbe17a8cbac0e87ee6105697d68852d  system-config-kickstart-2.6.4.tar.bz2
+2ca40213a5c70a04bb31441dbc59879d  system-config-kickstart-2.6.5.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- system-config-kickstart.spec	3 Feb 2006 20:36:42 -0000	1.32
+++ system-config-kickstart.spec	7 Feb 2006 20:19:23 -0000	1.33
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.4
+Version: 2.6.5
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 2.6.5-1
+- Smarter repo-enabling code (#180097).
+
 * Fri Feb 03 2006 Chris Lumens <clumens at redhat.com> 2.6.4-1
 - Convert package selection to using pirut (#178759).
 - Partitioning screen fixes for cciss.



From fedora-cvs-commits at redhat.com  Tue Feb  7 20:37:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 15:37:38 -0500
Subject: rpms/kernel-xen/devel xen-gcc-4.1-compile-fix.patch, NONE,
	1.1 kernel-xen.spec, 1.42, 1.43
Message-ID: <200602072037.k17KbcvP026456@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Added Files:
	xen-gcc-4.1-compile-fix.patch 
Log Message:
enable gcc-4.1 & debug options for hypervisor

xen-gcc-4.1-compile-fix.patch:
 mpspec_def.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xen-gcc-4.1-compile-fix.patch ---
diff -uNp xen/include/asm-x86/mpspec_def.h.orig xen/include/asm-x86/mpspec_def.h
--- xen/include/asm-x86/mpspec_def.h.orig	2006-02-07 21:24:36.000000000 +0100
+++ xen/include/asm-x86/mpspec_def.h	2006-02-07 21:24:48.000000000 +0100
@@ -75,7 +75,7 @@ struct mpc_config_bus
 {
 	unsigned char mpc_type;
 	unsigned char mpc_busid;
-	unsigned char mpc_bustype[6] __attribute((packed));
+	unsigned char mpc_bustype[6];
 };
 
 /* List of Bus Type string values, Intel MP Spec. */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kernel-xen.spec	7 Feb 2006 12:26:01 -0000	1.42
+++ kernel-xen.spec	7 Feb 2006 20:37:35 -0000	1.43
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -184,7 +184,6 @@
 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
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
-BuildRequires: compat-gcc-32
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 
@@ -411,6 +410,8 @@
 # Do not add anything non-trivial here.
 Patch10001: linux-2.6-random-patches.patch
 
+Patch20000: xen-gcc-4.1-compile-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -685,6 +686,12 @@
   fi
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+
+%if %{buildxen}
+cd xen
+%patch20000 -p1
+cd ..
+%endif
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
@@ -1227,12 +1234,12 @@
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
 %if %{buildxenPAE}
-  make CC=gcc32 pae=y
+  make debug=y verbose=y crash_debug=y pae=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
 %endif
-  make CC=gcc32
+  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 ..
@@ -1584,7 +1591,12 @@
 %endif
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 166: Tag takes single token only: Release: :.1 1.41_FC5.jkeating
+* Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
+- fix xen to compile with gcc-4.1.
+- disable PAE build.
+- enable debug hypervisor options.
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Tue Feb  7 20:46:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 15:46:53 -0500
Subject: rpms/fontconfig/devel fc-app-dir-fix-new.diff, NONE, 1.1 .cvsignore,
	1.17, 1.18 fontconfig.spec, 1.65, 1.66 sources, 1.18,
	1.19 fontconfig-2.3.93-defaultconfig.patch, 1.4,
	NONE fontconfig-fccache-update-check.patch, 1.1,
	NONE fontconfig-fontsubdir-parse-fix.patch, 1.1,
	NONE fontconfig-memleak-fix.patch, 1.1,
	NONE fontconfig-misc-warning-fixes.patch, 1.1,
	NONE fontconfig-seife-crash.patch, 1.1, NONE
Message-ID: <200602072046.k17Kkrgg006759@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore fontconfig.spec sources 
Added Files:
	fc-app-dir-fix-new.diff 
Removed Files:
	fontconfig-2.3.93-defaultconfig.patch 
	fontconfig-fccache-update-check.patch 
	fontconfig-fontsubdir-parse-fix.patch 
	fontconfig-memleak-fix.patch 
	fontconfig-misc-warning-fixes.patch 
	fontconfig-seife-crash.patch 
Log Message:
newer cvs snapshot


fc-app-dir-fix-new.diff:
 fccache.c |   22 ++++++++++------------
 fccfg.c   |   35 ++++++++++++++++++++++++++++-------
 fcdir.c   |    6 +-----
 3 files changed, 39 insertions(+), 24 deletions(-)

--- NEW FILE fc-app-dir-fix-new.diff ---
diff -ru fontconfig-2.3.93.20060207.orig/src/fccache.c fontconfig-2.3.93.20060207/src/fccache.c
--- fontconfig-2.3.93.20060207.orig/src/fccache.c	2006-02-07 16:04:03.000000000 +0100
+++ fontconfig-2.3.93.20060207/src/fccache.c	2006-02-07 18:28:56.000000000 +0100
@@ -842,7 +842,6 @@
 {
     int			ret = 0;
     FcChar8		*dir;
-    const FcChar8	*name;
     FcStrSet		*subdirs;
     FcStrList		*sublist;
     struct stat		statb;
@@ -856,16 +855,15 @@
 	if (!FcConfigAcceptFilename (config, dir))
 	    continue;
 
-	/* Skip this directory if already updated
-	 * to avoid the looped directories via symlinks
-	 */
-	name = FcConfigNormalizeFontDir (config, dir);
-	if (name) 
-	{
-	    if (FcStrSetMember (processed_dirs, dir))
-		continue;
-	    FcStrSetAdd (processed_dirs, dir);
-	}
+	/* Skip this directory if already scanned */
+ 	dir = FcConfigNormalizeFontDir (config, dir);
+ 	if (! dir)
+ 	    continue;
+	if (FcStrSetMember (processed_dirs, dir))
+	    continue;
+ 	if (! FcStrSetAdd (processed_dirs, dir))
+ 	    continue;
+
 
 	subdirs = FcStrSetCreate ();
 	if (!subdirs)
@@ -907,7 +905,7 @@
 	if (FcDirCacheValid (dir) && FcDirCacheRead (set, subdirs, dir, config))
 	{
 	    /* if an old entry is found in the global cache, disable it */
-	    if ((d = FcGlobalCacheDirFind (cache, (const char *)name)) != NULL)
+	    if ((d = FcGlobalCacheDirFind (cache, (const char *)dir)) != NULL)
 	    {
 		d->state = FcGCDirDisabled;
 		/* save the updated config later without this entry */
diff -ru fontconfig-2.3.93.20060207.orig/src/fccfg.c fontconfig-2.3.93.20060207/src/fccfg.c
--- fontconfig-2.3.93.20060207.orig/src/fccfg.c	2006-02-07 16:04:03.000000000 +0100
+++ fontconfig-2.3.93.20060207/src/fccfg.c	2006-02-07 18:27:54.000000000 +0100
@@ -419,9 +419,6 @@
 FcConfigAddFontDir (FcConfig	    *config,
 		    const FcChar8   *d)
 {
-    /* Avoid adding d if it's an alias of something else, too. */
-    if (FcConfigInodeMatchFontDir(config, d))
-	return FcTrue;
     return FcStrSetAddFilename (config->fontDirs, d);
 }
 
@@ -1879,9 +1876,10 @@
     return FcTrue;
 }
 
-FcBool
-FcConfigAppFontAddDir (FcConfig	    *config,
-		       const FcChar8   *dir)
+static FcBool
+FcConfigAppFontAddDirWithCheck (FcConfig	    *config,
+				const FcChar8   *dir,
+				FcStrSet *processed_dirs)
 {
     FcFontSet	*set;
     FcStrSet	*subdirs;
@@ -1915,11 +1913,17 @@
 	FcStrSetDestroy (subdirs);
 	return FcFalse;
     }
+    FcStrSetAdd (processed_dirs, dir);
     if ((sublist = FcStrListCreate (subdirs)))
     {
 	while ((subdir = FcStrListNext (sublist)))
 	{
-	    FcConfigAppFontAddDir (config, subdir);
+	    FcChar8 *name;
+	    name = FcConfigNormalizeFontDir (config, subdir);
+	    if (! name)
+		name = subdir;
+	    if (! FcStrSetMember (processed_dirs, name))
+		FcConfigAppFontAddDirWithCheck (config, name, processed_dirs);
 	}
 	FcStrListDone (sublist);
     }
@@ -1927,6 +1931,23 @@
     return FcTrue;
 }
 
+FcBool
+FcConfigAppFontAddDir (FcConfig	    *config,
+		       const FcChar8   *dir)
+{
+    FcStrSet *processed_dirs;
+    FcBool res;
+
+    processed_dirs = FcStrSetCreate ();
+    if (! processed_dirs)
+	return FcFalse;
+
+    res = FcConfigAppFontAddDirWithCheck (config, dir, processed_dirs);
+    FcStrSetDestroy (processed_dirs);
+
+    return res;
+}
+
 void
 FcConfigAppFontClear (FcConfig	    *config)
 {
diff -ru fontconfig-2.3.93.20060207.orig/src/fcdir.c fontconfig-2.3.93.20060207/src/fcdir.c
--- fontconfig-2.3.93.20060207.orig/src/fcdir.c	2006-02-07 16:04:03.000000000 +0100
+++ fontconfig-2.3.93.20060207/src/fcdir.c	2006-02-07 18:27:54.000000000 +0100
@@ -129,11 +129,7 @@
 	return FcTrue;
 
     if (config)
-	dir = FcConfigNormalizeFontDir (config, dir);
-
-    /* refuse to scan a directory that can't be normalized. */
-    if (!dir)
-	return FcFalse;
+        FcConfigAddFontDir (config, dir);
 
     if (!force)
     {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	31 Jan 2006 13:44:03 -0000	1.17
+++ .cvsignore	7 Feb 2006 20:46:51 -0000	1.18
@@ -2,3 +2,4 @@
 fontconfig-2.3.93.cvs20060124.tar.gz
 fontconfig-2.3.93.cvs20060129.tar.gz
 fontconfig-2.3.93.cvs20060131.tar.gz
+fontconfig-2.3.93.cvs20060207.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- fontconfig.spec	7 Feb 2006 11:40:49 -0000	1.65
+++ fontconfig.spec	7 Feb 2006 20:46:51 -0000	1.66
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93.cvs20060131
-Release: 3.1
+Version: 2.3.93.cvs20060207
+Release: 1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -13,12 +13,7 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
-Patch2: fontconfig-fontsubdir-parse-fix.patch
-Patch3: fontconfig-memleak-fix.patch
-Patch4: fontconfig-misc-warning-fixes.patch
-Patch5: fontconfig-fccache-update-check.patch
-Patch6: fontconfig-seife-crash.patch
-Patch7: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
+Patch2: fc-app-dir-fix-new.diff
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -55,12 +50,7 @@
 %setup -q
 
 %patch1 -p1 -b .defaultconfig
-%patch2 -p0 -b .fontsubdir-parse-fix
-%patch3 -p0 -b .fontconfig-memleak-fix
-%patch4 -p1 -b .fontconfig-misc-warning-fixes
-%patch5 -p0 -b .fontconfig-fccache-update-check
-%patch6 -p0 -b .fontconfig-seife-crash
-%patch7 -p1 -b .move-user-cache
+%patch2 -p1 -b .app-dir-fix
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -145,6 +135,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060207-1
+- Newer cvs snapshot
+- Drop upstreamed patches, pick up some new ones
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.93.cvs20060131-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Jan 2006 13:44:03 -0000	1.18
+++ sources	7 Feb 2006 20:46:51 -0000	1.19
@@ -1 +1 @@
-a95a7de00ffbcf4e6f0bc2c8a94d9d93  fontconfig-2.3.93.cvs20060131.tar.gz
+4514a786bcfc619a44f95f5a90549a04  fontconfig-2.3.93.cvs20060207.tar.gz


--- fontconfig-2.3.93-defaultconfig.patch DELETED ---


--- fontconfig-fccache-update-check.patch DELETED ---


--- fontconfig-fontsubdir-parse-fix.patch DELETED ---


--- fontconfig-memleak-fix.patch DELETED ---


--- fontconfig-misc-warning-fixes.patch DELETED ---


--- fontconfig-seife-crash.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 20:50:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 15:50:14 -0500
Subject: rpms/fontconfig/devel fontconfig.spec,1.66,1.67
Message-ID: <200602072050.k17KoEWv006938@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	fontconfig.spec 
Log Message:
Reinstate the move-user-cache patch



Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- fontconfig.spec	7 Feb 2006 20:46:51 -0000	1.66
+++ fontconfig.spec	7 Feb 2006 20:50:11 -0000	1.67
@@ -13,7 +13,8 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
-Patch2: fc-app-dir-fix-new.diff
+Patch2: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
+Patch3: fc-app-dir-fix-new.diff
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -50,7 +51,8 @@
 %setup -q
 
 %patch1 -p1 -b .defaultconfig
-%patch2 -p1 -b .app-dir-fix
+%patch2 -p1 -b .move-user-cache
+%patch3 -p1 -b .app-dir-fix
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF



From fedora-cvs-commits at redhat.com  Tue Feb  7 20:54:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 15:54:58 -0500
Subject: rpms/fontconfig/devel fontconfig-2.3.93-defaultconfig.patch, 1.5,
	1.6
Message-ID: <200602072054.k17KswG6015588@cvs.devel.redhat.com>

Author: mclasen

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

Added Files:
	fontconfig-2.3.93-defaultconfig.patch 
Log Message:
read another lost patch


fontconfig-2.3.93-defaultconfig.patch:
 fonts.conf.in |  103 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 82 insertions(+), 21 deletions(-)

Index: fontconfig-2.3.93-defaultconfig.patch
===================================================================
RCS file: fontconfig-2.3.93-defaultconfig.patch
diff -N fontconfig-2.3.93-defaultconfig.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fontconfig-2.3.93-defaultconfig.patch	7 Feb 2006 20:54:54 -0000	1.6
@@ -0,0 +1,185 @@
+--- fontconfig-2.3.93/fonts.conf.in.defaultconfig	2005-11-02 23:48:59.000000000 -0500
++++ fontconfig-2.3.93/fonts.conf.in	2006-01-17 20:33:53.000000000 -0500
+@@ -78,7 +78,9 @@
+ 		<family>Times</family>
+ 		<family>Nimbus Roman No9 L</family>
+ 		<family>Luxi Serif</family>
++		<family>Sazanami Mincho</family>
+ 		<family>Kochi Mincho</family>
++		<family>AR PL ZenKai Uni</family>
+ 		<family>AR PL SungtiL GB</family>
+ 		<family>AR PL Mingti2L Big5</family>
+ 		<family>?????? ??????</family>
+@@ -98,7 +100,9 @@
+ 		<family>Albany AMT</family>
+ 		<family>Nimbus Sans L</family>
+ 		<family>Luxi Sans</family>
++		<family>Sazanami Gothic</family>
+ 		<family>Kochi Gothic</family>
++		<family>AR PL ShanHeiSun Uni</family>
+ 		<family>AR PL KaitiM GB</family>
+ 		<family>AR PL KaitiM Big5</family>
+ 		<family>?????? ????????????</family>
+@@ -146,15 +150,37 @@
+   -->
+         <alias>
+ 	  <family>Times</family>
+-	  <accept><family>Nimbus Roman No9 L</family></accept>
++	  <accept>
++	    <family>Nimbus Roman No9 L</family>
++	    <family>Thorndale AMT</family>
++	    <family>Times New Roman</family>
++	  </accept>
+ 	</alias>
+         <alias>
+ 	  <family>Helvetica</family>
+-	  <accept><family>Nimbus Sans L</family></accept>
++	  <accept>
++	    <family>Nimbus Sans L</family>
++	    <family>Albany AMT</family>
++	    <family>Arial</family>
++	  </accept>
+ 	</alias>
+         <alias>
+ 	  <family>Courier</family>
+-	  <accept><family>Nimbus Mono L</family></accept>
++	  <accept>
++	    <family>Cumberland AMT</family>
++	    <family>Courier New</family>
++	    <family>Nimbus Mono L</family>
++	  </accept>
++	</alias>
++
++	<alias>
++	  <family>ZapfDingbats</family>
++	  <accept><family>Dingbats</family></accept>
++	</alias>
++
++	<alias>
++	  <family>Symbol</family>
++	  <accept><family>Open Symbols L</family></accept>
+ 	</alias>
+ 
+ <!--
+@@ -163,11 +189,18 @@
+  -->
+  	<alias>
+ 		<family>Times New Roman</family>
+-		<accept><family>Thorndale AMT</family></accept>
++		<accept>
++			<family>Thorndale AMT</family>
++			<family>Nimbus Roman No9 L</family>
++		</accept>
+ 	</alias>
+  	<alias>
+ 		<family>Arial</family>
+-		<accept><family>Albany AMT</family></accept>
++		<accept>
++			<family>Albany AMT</family>
++			<family>Nimbus Sans L</family>
++			<family>Arial</family>
++		</accept>
+ 	</alias>
+  	<alias>
+ 		<family>Courier New</family>
+@@ -260,16 +293,25 @@
+ 	<alias>
+ 		<family>serif</family>
+ 		<prefer>
++			<family>Nimbus Roman No9 L</family>
++			<family>Thorndale AMT</family>
+ 			<family>Bitstream Vera Serif</family>
+ 			<family>Times New Roman</family>
+-			<family>Thorndale AMT</family>
+ 			<family>Luxi Serif</family>
+-			<family>Nimbus Roman No9 L</family>
+ 			<family>Times</family>
+-			<family>Frank Ruehl</family>
++			<family>KacstQura</family>
++			<family>Frank Ruehl CLM</family>
++                        <family>Lohit Bengali</family>
++			<family>Lohit Gujarati</family>
++			<family>Lohit Hindi</family>
++			<family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
++			<family>Sazanami Mincho</family>
++			<family>Kochi Mincho</family>
++			<family>ZYSong18030</family>
+ 			<family>MgOpen Canonica</family>
+ 			<family>FreeSerif</family>
+-			<family>Kochi Mincho</family>
++			<family>AR PL Zenkai Uni</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
+ 			<family>?????? ??????</family>
+@@ -279,39 +321,58 @@
+ 	<alias>
+ 		<family>sans-serif</family>
+ 		<prefer>
++			<family>Luxi Sans</family>
++			<family>Albany AMT</family>
+ 			<family>Bitstream Vera Sans</family>
+ 			<family>Verdana</family>
+ 			<family>Arial</family>
+-			<family>Albany AMT</family>
+-			<family>Luxi Sans</family>
+ 			<family>Nimbus Sans L</family>
+ 			<family>Helvetica</family>
++  			<family>KacstQura</family>
+ 			<family>Nachlieli</family>
+-			<family>MgOpen Modata</family>
+-			<family>FreeSans</family>
++                        <family>Lohit Bengali</family>
++			<family>Lohit Gujarati</family>
++			<family>Lohit Hindi</family>
++			<family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
++			<family>Sazanami Gothic</family>
+ 			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>AR PL KaitiM Big5</family>
+ 			<family>?????? ????????????</family>
+-			<family>Baekmuk Dotum</family>
++			<family>MgOpen Modata</family>
++			<family>FreeSans</family>
++                        <family>ZYSong18030</family>
++			<family>AR PL ShanHeiSun Uni</family>
++			<family>AR PL SungtiL GB</family>
++			<family>AR PL Mingti2L Big5</family>
++			<family>Baekmuk Gulim</family>
+ 			<family>SimSun</family>
+ 		</prefer>
+ 	</alias>
+ 	<alias>
+ 		<family>monospace</family>
+ 		<prefer>
++			<family>Luxi Mono</family>
+ 			<family>Bitstream Vera Sans Mono</family>
+ 			<family>Andale Mono</family>
+ 			<family>Courier New</family>
+ 			<family>Cumberland AMT</family>
+-			<family>Luxi Mono</family>
++                        <family>KacstQura</family>
++                        <family>Miriam Mono CLM</family>
++                        <family>Lohit Bengali</family>
++                        <family>Lohit Gujarati</family>
++                        <family>Lohit Hindi</family>
++                        <family>Lohit Punjabi</family>
++			<family>Lohit Tamil</family>
+ 			<family>Nimbus Mono L</family>
+ 			<family>Courier</family>
+-			<family>Miriam Mono</family>
++                        <family>Sazanami Gothic</family>
++                        <family>Kochi Gothic</family>
++                        <family>ZYSong18030</family>
++			<family>AR PL ShanHeiSun Uni</family>
++                        <family>AR PL SungtiL GB</family>
++                        <family>AR PL Mingti2L Big5</family>
++                        <family>Baekmuk Gulim</family>
+ 			<family>FreeMono</family>
+-			<family>Kochi Gothic</family>
+-			<family>AR PL KaitiM GB</family>
+-			<family>Baekmuk Dotum</family>
+ 		</prefer>
+ 	</alias>
+ 



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:00:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:00:52 -0500
Subject: rpms/gaim/devel gaim-1.5.0-logging-compatibility.patch, NONE,
	1.1 gaim.spec, 1.112, 1.113
Message-ID: <200602072100.k17L0qxh018537@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18356

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.5.0-logging-compatibility.patch 
Log Message:
allow compat with gaim-2.x log format (rlaager)


gaim-1.5.0-logging-compatibility.patch:
 log.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-logging-compatibility.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.103.2.8
diff -u -d -p -r1.103.2.8 log.c
--- src/log.c	16 Aug 2005 17:53:37 -0000	1.103.2.8
+++ src/log.c	6 Feb 2006 21:26:02 -0000
@@ -424,7 +424,7 @@ static GList *log_lister_common(GaimLogT
 
 	while ((filename = g_dir_read_name(dir))) {
 		if (gaim_str_has_suffix(filename, ext) &&
-				strlen(filename) == 17 + strlen(ext)) {
+				strlen(filename) >= 17 + strlen(ext)) {
 			GaimLog *log;
 			struct generic_logger_data *data;
 			time_t stamp = gaim_str_to_time(filename, FALSE);


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- gaim.spec	7 Feb 2006 11:42:55 -0000	1.112
+++ gaim.spec	7 Feb 2006 21:00:32 -0000	1.113
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        14.fc5.1
+Release:        15.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -68,6 +68,7 @@
 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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -159,6 +160,7 @@
 %patch179 -p0
 %patch180 -p2
 %patch181 -p1
+%patch182 -p0
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -273,10 +275,10 @@
 %endif
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-14.fc5.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
+- allow compat with gaim-2.x log format (rlaager)
 
-* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14.fc5
+* Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> 1:1.5.0-14
 - rebuild for new e-d-s
 
 * Fri Jan 13 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-13



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:23:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:23:52 -0500
Subject: rpms/udev/devel udev.spec,1.144,1.145
Message-ID: <200602072123.k17LNqAM006229@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6194

Modified Files:
	udev.spec 
Log Message:
* Tue Feb  7 2006 Jeremy Katz <katzj at redhat.com> - 084-2
- continue to include /sbin/udev for now as it's needed for determining 
  the version of udev



Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- udev.spec	7 Feb 2006 11:06:20 -0000	1.144
+++ udev.spec	7 Feb 2006 21:23:49 -0000	1.145
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -162,6 +162,7 @@
 install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
 install -m 0755 udevstart $RPM_BUILD_ROOT/sbin
+install -m 0755 udev $RPM_BUILD_ROOT/sbin
 install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 
@@ -214,6 +215,7 @@
 %doc etc/udev/redhat/udev.rules
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevcontrol
+%attr(0755,root,root) /sbin/udev
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevstart
 %attr(0755,root,root) /sbin/start_udev
@@ -274,6 +276,10 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Tue Feb  7 2006 Jeremy Katz <katzj at redhat.com> - 084-2
+- continue to include /sbin/udev for now as it's needed for determining 
+  the version of udev
+
 * Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> - 084-1
 - version 084
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:31:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:31:51 -0500
Subject: rpms/expect/devel expect.spec,1.11,1.12
Message-ID: <200602072131.k17LVpSq009225@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/expect/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9200

Modified Files:
	expect.spec 
Log Message:
rebuilt



Index: expect.spec
===================================================================
RCS file: /cvs/dist/rpms/expect/devel/expect.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- expect.spec	9 Dec 2005 22:40:23 -0000	1.11
+++ expect.spec	7 Feb 2006 21:31:30 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}.0
-Release: 2.1
+Release: 3
 License: Public Domain
 Group: Development/Languages
 URL: http://expect.nist.gov/
@@ -152,6 +152,9 @@
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Tue Feb 07 2006 David Cantrell <dcantrell at redhat.com> - 5.43.0-3
+- Rebuilt
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:45:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:45:36 -0500
Subject: rpms/udev/devel udev.spec,1.145,1.146
Message-ID: <200602072145.k17Ljan3015682@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15305

Modified Files:
	udev.spec 
Log Message:
okay, don't need this


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- udev.spec	7 Feb 2006 21:23:49 -0000	1.145
+++ udev.spec	7 Feb 2006 21:45:33 -0000	1.146
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 2
+Release: 1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -162,7 +162,6 @@
 install -m 0644 extras/path_id $RPM_BUILD_ROOT/sbin/path_id
 install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
 install -m 0755 udevstart $RPM_BUILD_ROOT/sbin
-install -m 0755 udev $RPM_BUILD_ROOT/sbin
 install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev
 
 
@@ -215,7 +214,6 @@
 %doc etc/udev/redhat/udev.rules
 %attr(0755,root,root) /sbin/udevd.static
 %attr(0755,root,root) /sbin/udevcontrol
-%attr(0755,root,root) /sbin/udev
 %attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/udevstart
 %attr(0755,root,root) /sbin/start_udev
@@ -276,10 +274,6 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
-* Tue Feb  7 2006 Jeremy Katz <katzj at redhat.com> - 084-2
-- continue to include /sbin/udev for now as it's needed for determining 
-  the version of udev
-
 * Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> - 084-1
 - version 084
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:47:12 -0500
Subject: rpms/bind/devel bind-9.3.2rc1-dbus-0.6.patch,1.1,1.2
Message-ID: <200602072147.k17LlCx8027237@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27211

Modified Files:
	bind-9.3.2rc1-dbus-0.6.patch 
Log Message:
allow builds with dbus version < 0.6 again

bind-9.3.2rc1-dbus-0.6.patch:
 dbus_service.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: bind-9.3.2rc1-dbus-0.6.patch
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind-9.3.2rc1-dbus-0.6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bind-9.3.2rc1-dbus-0.6.patch	3 Dec 2005 00:10:48 -0000	1.1
+++ bind-9.3.2rc1-dbus-0.6.patch	7 Feb 2006 21:47:08 -0000	1.2
@@ -1,11 +1,16 @@
---- bind-9.3.2rc1/bin/named/dbus_service.c.dbus-0.6	2005-12-02 18:29:02.000000000 -0500
-+++ bind-9.3.2rc1/bin/named/dbus_service.c	2005-12-02 18:30:37.000000000 -0500
-@@ -1069,7 +1069,8 @@
+--- bind-9.3.2/bin/named/dbus_service.c.dbus-0.6	2006-02-07 16:41:28.000000000 -0500
++++ bind-9.3.2/bin/named/dbus_service.c	2006-02-07 16:42:27.000000000 -0500
+@@ -1069,7 +1069,13 @@
  
      switch
  	(   dbus_bus_request_name 
 -	    (   connection, name, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT , &error
-+	    (   connection, name, 0, /* DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT - now default in dbus-0.6 */
++	    (   connection, name, 
++#ifdef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
++		DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT ,
++#else
++		0 ,
++#endif
 +		&error
  	    ) 
  	)



From fedora-cvs-commits at redhat.com  Tue Feb  7 21:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 16:48:01 -0500
Subject: rpms/bind/devel bind-9.3.2-redhat_doc.patch,NONE,1.1
Message-ID: <200602072148.k17Lm17J027577@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27544

Added Files:
	bind-9.3.2-redhat_doc.patch 
Log Message:
regenerate for non-DBUS builds

bind-9.3.2-redhat_doc.patch:
 named.8 |   69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+)

--- NEW FILE bind-9.3.2-redhat_doc.patch ---
--- bind-9.3.2/bin/named/named.8.redhat_doc	2005-10-12 22:33:46.000000000 -0400
+++ bind-9.3.2/bin/named/named.8	2006-02-07 15:56:31.000000000 -0500
@@ -169,6 +169,75 @@
 .TP
 \fI/var/run/named.pid\fR
 The default process\-id file.
+.PP
+.SH "NOTES"
+.PP
+.TP
+\fBRed Hat SELinux BIND Security Profile:\fR
+.PP
+By default, Red Hat ships BIND with the most secure SELinux policy
+that will not prevent normal BIND operation and will prevent exploitation
+of all known BIND security vulnerabilities . See the selinux(8) man page
+for information about SElinux.
+.PP
+It is not necessary to run named in a chroot environment if the Red Hat
+SELinux policy for named is enabled. When enabled, this policy is far
+more secure than a chroot environment. Users are recommended to enable
+SELinux and remove the bind-chroot package.
+.PP
+With this extra security comes some restrictions:
+.PP
+By default, the SELinux policy does not allow named to write any master
+zone database files. Only the root user may create files in the $ROOTDIR/var/named
+zone database file directory (the options { "directory" } option), where
+$ROOTDIR is set in /etc/sysconfig/named.
+.PP
+The "named" group must be granted read privelege to 
+these files in order for named to be enabled to read them. 
+.PP
+Any file created in the zone database file directory is automatically assigned
+the SELinux file context named_zone_t .
+.PP
+By default, SELinux prevents any role from modifying named_zone_t files; this
+means that files in the zone database directory cannot be modified by dynamic
+DNS (DDNS) updates or zone transfers.
+.PP
+The Red Hat BIND distribution and SELinux policy creates two directories where
+named is allowed to create and modify files: $ROOTDIR/var/named/slaves and
+$ROOTDIR/var/named/data. By placing files you want named to modify, such as
+slave or DDNS updateable zone files and database / statistics dump files in 
+these directories, named will work normally and no further operator action is
+required. Files in these directories are automatically assigned the 'named_cache_t'
+file context, which SELinux allows named to write.
+.PP
+You can enable the named_t domain to write and create named_zone_t files by use
+of the SELinux tunable boolean variable "named_write_master_zones", using the
+setsebool(8) command or the system-config-security GUI . If you do this, you
+must also set the ENABLE_ZONE_WRITE variable in /etc/sysconfig/named to 
+1 / yes to set the ownership of files in the $ROOTDIR/var/named directory
+to named:named in order for named to be allowed to write them. 
+.PP
+\fBRed Hat BIND named_sdb SDB support:\fR
+.PP
+Red Hat ships the bind-sdb RPM that provides the /usr/sbin/named_sdb program,
+which is named compiled with the Simplified Database Backend modules that ISC
+provides in the "contrib/sdb" directory.
+.PP
+The SDB modules for LDAP, PostGreSQL and DirDB are compiled into named_sdb.
+.PP
+To run named_sdb, set the ENABLE_SDB variable in /etc/sysconfig/named to 1 or "yes",
+and then the "service named start" named initscript will run named_sdb instead
+of named .
+.PP
+See the documentation for the various SDB modules in /usr/share/doc/bind-sdb-*/ .
+.br
+.PP
+\fBRed Hat system-config-bind:\fR
+.PP
+Red Hat provides the system-config-bind GUI to configure named.conf and zone
+database files. Run the "system-config-bind" command and access the manual
+by selecting the Help menu.
+.PP
 .SH "SEE ALSO"
 .PP
 RFC 1033,



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:13:30 -0500
Subject: rpms/bind/devel bind.spec,1.89,1.90
Message-ID: <200602072213.k17MDUtg003574@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3536

Modified Files:
	bind.spec 
Log Message:
fix bug 179816: allow dbus builds to work with dbus version < 0.6; regenerate redhat_doc patch for non-DBUS builds


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- bind.spec	7 Feb 2006 19:46:42 -0000	1.89
+++ bind.spec	7 Feb 2006 22:13:28 -0000	1.90
@@ -9,7 +9,7 @@
 Name: bind
 License: BSD-like
 Version: 9.3.2
-Release: 3
+Release: 4
 Epoch:   30
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -49,7 +49,7 @@
 Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch14: libbind-9.3.1rc1-fix_h_errno.patch
 Patch15: bind-9.3.2b2-dbus.patch
-Patch16: bind-9.3.1-redhat_doc.patch
+Patch16: bind-9.3.2-redhat_doc.patch
 Patch17: bind-9.3.2b1-fix_sdb_ldap.patch
 Patch18: bind-9.3.1-reject_resolv_conf_errors.patch
 Patch19: bind-9.3.1-next_server_on_referral.patch
@@ -227,8 +227,7 @@
 %endif
 %patch23 -p1 -b .dbus_archdep_libdir
 %else
-# This does not apply anymore:
-#patch16 -p1 -b .redhat_doc
+%patch16 -p1 -b .redhat_doc
 %endif
 %if %{SDB}
 %patch17 -p1 -b .fix_sdb_ldap
@@ -245,11 +244,10 @@
 %patch26 -p1 -b .flush_cache
 %patch27 -p1 -b .dbus_restart
 %patch28 -p1 -b .dbus-0.6
-%endif
-%patch29 -p1 -b .bz177854
+# this patch no longer required (kernel now fixed):
+# %patch29 -p1 -b .bz177854
 #
 # this must follow all dbus patches:
-%if %{WITH_DBUS}
 %if %{SDB}
 cp -fp bin/named/{dbus_mgr.c,dbus_service.c,log.c,server.c} bin/named_sdb
 cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named
@@ -755,6 +753,10 @@
 :;
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-4
+- regenerate redhat_doc patch for non-DBUS builds
+- allow dbus builds to work with dbus version < 0.6 (bz #179816)
+
 * Tue Feb 07 2006 Florian La Roche <laroche at redhat.com> 30:9.3.2-3
 - try supporting without dbus support
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:15:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:15:36 -0500
Subject: rpms/libmusicbrainz/devel libmusicbrainz.spec,1.12,1.13
Message-ID: <200602072215.k17MFalG004553@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/libmusicbrainz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4522

Modified Files:
	libmusicbrainz.spec 
Log Message:
* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.1.1-2
- Stop shipping the .a file in the main package



Index: libmusicbrainz.spec
===================================================================
RCS file: /cvs/dist/rpms/libmusicbrainz/devel/libmusicbrainz.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libmusicbrainz.spec	7 Feb 2006 12:41:35 -0000	1.12
+++ libmusicbrainz.spec	7 Feb 2006 22:15:34 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A library for accessing MusicBrainz servers
 Name: libmusicbrainz
 Version: 2.1.1
-Release: 1.2
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org
@@ -39,11 +39,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-:
+%{__rm} -rf $RPM_BUILD_ROOT
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -52,7 +54,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO INSTALL
 %{_libdir}/*.so.*
-%{_libdir}/*.a
 
 %files devel
 %defattr(-,root,root,-)
@@ -61,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.1.1-2
+- Stop shipping the .a file in the main package
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:17:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:17:24 -0500
Subject: rpms/kernel/devel linux-2.6-softmac-git.patch,1.5,1.6
Message-ID: <200602072217.k17MHOiY017744@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	linux-2.6-softmac-git.patch 
Log Message:
Fix softmac scanning

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |   78 +++
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  392 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  456 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  238 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3325 insertions(+), 3 deletions(-)

Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-softmac-git.patch	6 Feb 2006 15:33:08 -0000	1.5
+++ linux-2.6-softmac-git.patch	7 Feb 2006 22:17:20 -0000	1.6
@@ -2812,7 +2812,7 @@
 index 0000000..d90d31f
 --- /dev/null
 +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
-@@ -0,0 +1,237 @@
+@@ -0,0 +1,238 @@
 +/*
 + * Scanning routines.
 + *
@@ -2993,6 +2993,7 @@
 +	dprintk(PFX "Scanning %d channels\n", sm->scaninfo->number_channels);
 +	sm->scaninfo->current_channel_idx = 0;
 +	sm->scaninfo->started = 1;
++	sm->scaninfo->stop = 0;
 +	INIT_COMPLETION(sm->scaninfo->finished);
 +	schedule_work(&sm->scaninfo->softmac_scan);
 +	spin_unlock_irqrestore(&sm->lock, flags);



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:19:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:19:02 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1915,1.1916
Message-ID: <200602072219.k17MJ2e4018492@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix softmac scanning


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1915
retrieving revision 1.1916
diff -u -r1.1915 -r1.1916
--- kernel-2.6.spec	7 Feb 2006 19:55:00 -0000	1.1915
+++ kernel-2.6.spec	7 Feb 2006 22:18:59 -0000	1.1916
@@ -1395,6 +1395,9 @@
 %endif
 
 %changelog
+* Tue Feb  7 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix softmac scanning
+
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git3
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:20:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:20:18 -0500
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.16,1.17
Message-ID: <200602072220.k17MKIgK019037@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19013

Modified Files:
	tog-pegasus.spec 
Log Message:
restore SSLv23_method SSL support now that bug 173399 is fixed; rebuild for new gcc, glibc, glibc-kernheaders


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tog-pegasus.spec	15 Dec 2005 22:49:19 -0000	1.16
+++ tog-pegasus.spec	7 Feb 2006 22:20:11 -0000	1.17
@@ -15,7 +15,7 @@
 Summary: 	OpenPegasus WBEM Services for Linux
 Name:    	tog-pegasus
 Version: 	2.5
-Release:	5
+Release:	6
 Epoch:   	2
 Group:   	Systems Management/Base
 License: 	Open Group Pegasus Open Source
@@ -77,7 +77,8 @@
 %patch2 -p1 -b .make_install
 %patch3 -p1 -b .add_cmpi_provider_lib
 %patch4 -p1 -b .enable_cql
-%patch5 -p1 -b .bz173401
+# %patch5 -p1 -b .bz173401
+# now fixed with openssl-0.9.8a-3+
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -245,6 +246,10 @@
 #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-6
+- restore SSLv23_method SSL support now that bug 173399 is fixed
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Thu Dec 15 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-5
 - fix bug 175434 : deal with pegasus uid/gid already existing
   on first install



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:27:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:27:20 -0500
Subject: rpms/kernel/devel linux-2.6-debug-boot-delay.patch,1.2,1.3
Message-ID: <200602072227.k17MRK5Y021735@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-boot-delay.patch 
Log Message:
touch nmi


linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   35 +++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-boot-delay.patch	6 Feb 2006 22:47:46 -0000	1.2
+++ linux-2.6-debug-boot-delay.patch	7 Feb 2006 22:27:14 -0000	1.3
@@ -72,15 +72,16 @@
  	preset_lpj = simple_strtoul(str,NULL,0);
 --- linux-2615-work.orig/kernel/printk.c
 +++ linux-2615-work/kernel/printk.c
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,8 @@
  #include <linux/smp_lock.h>
  #include <linux/console.h>
  #include <linux/init.h>
 +#include <linux/jiffies.h>
++#include <linux/nmi.h>
  #include <linux/module.h>
  #include <linux/interrupt.h>			/* For in_interrupt() */
  #include <linux/config.h>
-@@ -201,6 +202,33 @@ out:
+@@ -201,6 +202,34 @@ out:
  
  __setup("log_buf_len=", log_buf_len_setup);
  
@@ -106,6 +107,7 @@
 +		 */
 +		if (time_after(jiffies, timeout))
 +			break;
++		touch_nmi_watchdog();
 +	}
 +}
 +



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:29:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:29:05 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1916,1.1917
Message-ID: <200602072229.k17MT5NW022560@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1916
retrieving revision 1.1917
diff -u -r1.1916 -r1.1917
--- kernel-2.6.spec	7 Feb 2006 22:18:59 -0000	1.1916
+++ kernel-2.6.spec	7 Feb 2006 22:29:02 -0000	1.1917
@@ -1395,6 +1395,9 @@
 %endif
 
 %changelog
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+- Touch NMI watchdogs in printk pauser.
+
 * Tue Feb  7 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix softmac scanning
 



From fedora-cvs-commits at redhat.com  Tue Feb  7 22:32:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 17:32:13 -0500
Subject: rpms/flac/devel sources,1.3,1.4
Message-ID: <200602072232.k17MWDh8023524@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23480

Modified Files:
	sources 
Log Message:
nix the old tarball


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Mar 2005 17:11:48 -0000	1.3
+++ sources	7 Feb 2006 22:32:08 -0000	1.4
@@ -1,2 +1 @@
-19b456a27b5fcf502c76cc33f33e1490  flac-1.1.0.tar.gz
 2bfc127cdda02834d0491ab531a20960  flac-1.1.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:04:55 -0500
Subject: rpms/eclipse/devel eclipse-javadoclinks.patch, 1.3, 1.4 eclipse.spec,
	1.238, 1.239
Message-ID: <200602072304.k17N4tVM032200@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32159

Modified Files:
	eclipse-javadoclinks.patch eclipse.spec 
Log Message:
* Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
- Use new java-1.4.2-gcj-compat-javadoc package.
- Always generate debug info when building RPMs (Andrew Haley).


eclipse-javadoclinks.patch:
 org.eclipse.jdt.doc.isv/jdtOptions           |    1 +
 org.eclipse.pde.doc.user/pdeOptions          |    1 +
 org.eclipse.platform.doc.isv/platformOptions |    1 +
 3 files changed, 3 insertions(+)

Index: eclipse-javadoclinks.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-javadoclinks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-javadoclinks.patch	19 Dec 2005 16:52:27 -0000	1.3
+++ eclipse-javadoclinks.patch	7 Feb 2006 23:04:50 -0000	1.4
@@ -1,33 +1,36 @@
 diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions plugins/org.eclipse.jdt.doc.isv/jdtOptions
---- plugins/org.eclipse.jdt.doc.isv/jdtOptions	2005-12-19 11:30:24.000000000 -0500
-+++ plugins/org.eclipse.jdt.doc.isv/jdtOptions	2005-12-19 11:33:01.000000000 -0500
-@@ -11,7 +11,6 @@
+--- plugins/org.eclipse.jdt.doc.isv/jdtOptions	2006-02-07 13:24:31.000000000 -0500
++++ plugins/org.eclipse.jdt.doc.isv/jdtOptions	2006-02-07 13:21:30.000000000 -0500
+@@ -11,7 +11,7 @@
  -bottom "Copyright (c) IBM Corp. and others 2000, 2005.  All Rights Reserved."
  -group "Java Development Tools Core Plug-in Packages" "org.eclipse.jdt.core:org.eclipse.jdt.core.*"
  -group "Java Development Tools UI Plug-in Packages" "org.eclipse.jdt.ui:org.eclipse.jdt.ui.*"
 --link http://java.sun.com/j2se/1.4/docs/api
++-linkoffline /usr/share/javadoc/java /usr/share/javadoc/java
  -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
  -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi
  
 diff -uNr plugins/org.eclipse.pde.doc.user/pdeOptions plugins/org.eclipse.pde.doc.user/pdeOptions
---- plugins/org.eclipse.pde.doc.user/pdeOptions	2005-12-19 11:31:44.000000000 -0500
-+++ plugins/org.eclipse.pde.doc.user/pdeOptions	2005-12-19 11:33:06.000000000 -0500
-@@ -9,7 +9,6 @@
+--- plugins/org.eclipse.pde.doc.user/pdeOptions	2006-02-07 13:21:52.000000000 -0500
++++ plugins/org.eclipse.pde.doc.user/pdeOptions	2006-02-07 13:22:20.000000000 -0500
+@@ -9,7 +9,7 @@
  -doctitle "Eclipse PDE API Specification"
  -header "<b>Eclipse PDE</b><br>Release 3.1"
  -bottom "Copyright (c) IBM Corp. and others 2000, 2005.  All Rights Reserved."
 --link http://java.sun.com/j2se/1.4/docs/api
++-linkoffline /usr/share/javadoc/java /usr/share/javadoc/java
  -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api ../org.eclipse.platform.doc.isv/reference/api
  -linkoffline ./../../../org.eclipse.platform.doc.isv/reference/osgi ../org.eclipse.platform.doc.isv/reference/osgi
  -linkoffline ./../../../org.eclipse.jdt.doc.isv/reference/api ../org.eclipse.jdt.doc.isv/reference/api
 diff -uNr plugins/org.eclipse.platform.doc.isv/platformOptions plugins/org.eclipse.platform.doc.isv/platformOptions
---- plugins/org.eclipse.platform.doc.isv/platformOptions	2005-12-19 11:31:54.000000000 -0500
-+++ plugins/org.eclipse.platform.doc.isv/platformOptions	2005-12-19 11:33:13.000000000 -0500
-@@ -10,7 +10,6 @@
+--- plugins/org.eclipse.platform.doc.isv/platformOptions	2006-02-07 13:22:52.000000000 -0500
++++ plugins/org.eclipse.platform.doc.isv/platformOptions	2006-02-07 13:23:03.000000000 -0500
+@@ -10,7 +10,7 @@
  -doctitle "Eclipse Platform API Specification"
  -header "<b>Eclipse Platform</b><br>Release 3.1"
  -bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using Eclipse APIs</a>.</p><p>Copyright (c) IBM Corp. and others 2000, 2005. All rights reserved.</p></font>'
 --link http://java.sun.com/j2se/1.4.2/docs/api
++-linkoffline /usr/share/javadoc/java /usr/share/javadoc/java
  -link  ../osgi
  
  org.eclipse.ant.core


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- eclipse.spec	6 Feb 2006 20:50:01 -0000	1.238
+++ eclipse.spec	7 Feb 2006 23:04:50 -0000	1.239
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_4fc
+Release:        1jpp_5fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -108,6 +108,8 @@
 Patch47:	%{name}-launcher-link.patch
 # Don't attempt to link to Sun's javadocs
 Patch48:	%{name}-javadoclinks.patch
+# Always generate debug info when building RPMs (Andrew Haley)
+Patch49:	%{name}-ecj-rpmdebuginfo.patch
 
 %if %{gcj_support}
 ExcludeArch: ppc64 s390 s390x
@@ -130,6 +132,7 @@
 BuildRequires:  libXtst-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
+BuildRequires:  java-javadoc
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
 BuildRequires:	java-gcj-compat-devel >= 1.0.43
@@ -196,6 +199,7 @@
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/perl
 Requires:       /usr/bin/mozilla
+Requires:       java-javadoc
 
 PreReq:         gtk2 >= 2.6
 
@@ -413,7 +417,18 @@
 %patch37 -p1
 %patch47 -p1
 popd
+# Link against our system-installed javadocs
 %patch48 -p0
+pushd plugins/org.eclipse.jdt.doc.isv
+sed --in-place "s:/usr/share/:%{_datadir}/:g" jdtOptions
+popd
+pushd plugins/org.eclipse.pde.doc.user
+sed --in-place "s:/usr/share/:%{_datadir}/:g" pdeOptions
+popd
+pushd plugins/org.eclipse.platform.doc.isv
+sed --in-place "s:/usr/share/:%{_datadir}/:g" platformOptions
+popd
+%patch49 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -1258,6 +1273,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
+- Use new java-1.4.2-gcj-compat-javadoc package.
+- Always generate debug info when building RPMs (Andrew Haley).
+
 * Mon Feb 06 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc
 - Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
 - Link against generic libjawt.so (rh#158755).



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:10:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:10:13 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1917,1.1918
Message-ID: <200602072310.k17NADX8032647@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
lets try s390 again, just for kicks.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1917
retrieving revision 1.1918
diff -u -r1.1917 -r1.1918
--- kernel-2.6.spec	7 Feb 2006 22:29:02 -0000	1.1917
+++ kernel-2.6.spec	7 Feb 2006 23:10:08 -0000	1.1918
@@ -155,8 +155,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  Tue Feb  7 23:11:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:11:25 -0500
Subject: rpms/parted/devel parted-1.6.25-dm.patch,1.3,1.4
Message-ID: <200602072311.k17NBPYq032710@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32695

Modified Files:
	parted-1.6.25-dm.patch 
Log Message:
- name dm partitions with a "p"

parted-1.6.25-dm.patch:
 configure.in            |   12 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/linux.c       |  340 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 353 insertions(+), 3 deletions(-)

Index: parted-1.6.25-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.6.25-dm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- parted-1.6.25-dm.patch	1 Dec 2005 22:23:20 -0000	1.3
+++ parted-1.6.25-dm.patch	7 Feb 2006 23:11:21 -0000	1.4
@@ -348,7 +348,7 @@
 +		if (vol_name && *vol_name && *(++vol_name))
 +			vol_name = strdup (vol_name);
 +		else
-+			asprintf (&vol_name, "%s%d", dev_name, part->num);
++			asprintf (&vol_name, "%sp%d", dev_name, part->num);
 +		if (!vol_name)
 +			return 0;
 +	}



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:13:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:13:16 -0500
Subject: rpms/parted/devel parted.spec,1.61,1.62
Message-ID: <200602072313.k17NDGF1000389@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv366

Modified Files:
	parted.spec 
Log Message:
- name dm partitions with a "p"


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- parted.spec	7 Feb 2006 13:24:16 -0000	1.61
+++ parted.spec	7 Feb 2006 23:13:12 -0000	1.62
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.25
-Release: 5.2
+Release: 6
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -99,10 +99,13 @@
 %{_libdir}/*.a*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.25-5.2
+* Tue Feb  7 2006 Peter Jones <pjones at redhat.com> 1.6.25-6
+- Fix dm partition naming.
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 1.6.25-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Fri Dec  9 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 
 * Fri Dec  2 2005 Peter Jones <pjones at redhat.com> 1.6.25-5



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:17:47 -0500
Subject: rpms/lftp/devel lftp-3.4.1-dont_core.patch, NONE, 1.1 .cvsignore,
	1.21, 1.22 lftp.spec, 1.37, 1.38 sources, 1.21, 1.22
Message-ID: <200602072317.k17NHlNJ008778@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore lftp.spec sources 
Added Files:
	lftp-3.4.1-dont_core.patch 
Log Message:
Upgrade to 3.4.1; make it not dump core with one URL argument

lftp-3.4.1-dont_core.patch:
 commands.cc |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

--- NEW FILE lftp-3.4.1-dont_core.patch ---
--- lftp-3.4.1/src/commands.cc.dont_core	2006-02-06 05:57:29.000000000 -0500
+++ lftp-3.4.1/src/commands.cc	2006-02-07 17:53:14.000000000 -0500
@@ -1508,15 +1508,19 @@
    if(time_style && time_style[0]) {
       if(time_style[0]=='+')
 	 time_fmt=xstrdup(time_style+1);
-      else if(!strcmp(optarg,"full-iso"))
-//	 time_fmt=xstrdup("%Y-%m-%d %H:%M:%S.%N %z"); // %N and %z are GNU extensions
-	 time_fmt=xstrdup("%Y-%m-%d %H:%M:%S");
-      else if(!strcmp(optarg,"long-iso"))
-	 time_fmt=xstrdup("%Y-%m-%d %H:%M");
-      else if(!strcmp(optarg,"iso"))
-	 time_fmt=xstrdup("%Y-%m-%d \n%m-%d %H:%M");
-      else
-	 time_fmt=xstrdup(time_style);
+      if( optarg )
+      {
+	  if(!strcmp(optarg,"full-iso"))
+          //  time_fmt=xstrdup("%Y-%m-%d %H:%M:%S.%N %z"); // %N and %z are GNU extensions
+	      time_fmt=xstrdup("%Y-%m-%d %H:%M:%S");
+	  else if(!strcmp(optarg,"long-iso"))
+	      time_fmt=xstrdup("%Y-%m-%d %H:%M");
+	  else if(!strcmp(optarg,"iso"))
+	      time_fmt=xstrdup("%Y-%m-%d \n%m-%d %H:%M");
+	  else
+	      time_fmt=xstrdup(time_style);
+      }else
+	  time_fmt=xstrdup(time_style);
       need_exact_time=false;
       if(time_fmt) {
 	 static const char exact_fmts[][3]={"%H","%M","%S","%N",""};


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Jan 2006 19:19:16 -0000	1.21
+++ .cvsignore	7 Feb 2006 23:17:44 -0000	1.22
@@ -10,3 +10,4 @@
 lftp-3.3.5.tar.bz2.asc
 lftp-3.4.0.tar.bz2
 lftp-3.4.0.tar.bz2.asc
+lftp-3.4.1.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lftp.spec	13 Jan 2006 19:19:56 -0000	1.37
+++ lftp.spec	7 Feb 2006 23:17:44 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.0
+Version: 	3.4.1
 Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
@@ -10,6 +10,7 @@
 BuildPrereq: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel
 Requires:    	perl-String-CRC32
 Patch173276: 	lftp-3.3.5-bz173276.patch
+Patch2:		lftp-3.4.1-dont_core.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -21,6 +22,7 @@
 %setup -q
 #%patch173276 -p1 -b .bz173276
 #^- now fixed upstream
+%patch2 -p1 -b .dont_core
 
 %build
 if pkg-config openssl ; then
@@ -68,6 +70,10 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.1-1
+- Upgrade to upstream version 3.4.1
+- fix core dump
+
 * Fri Jan 13 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.0-1
 - Upgrade to upstream version 3.4.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Jan 2006 19:19:16 -0000	1.21
+++ sources	7 Feb 2006 23:17:44 -0000	1.22
@@ -1,2 +1 @@
-5d39a8b250691a693470b1773b5c6bd4  lftp-3.4.0.tar.bz2
-5b942423a324da718ec42e30e2feed74  lftp-3.4.0.tar.bz2.asc
+4c73ad8e96c9ae1107b384fd59fcc009  lftp-3.4.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:44:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:44:25 -0500
Subject: rpms/kernel-xen/devel patch-2.6.16-rc2-git3.bz2.sign, NONE,
	1.1 .cvsignore, 1.14, 1.15 kernel-xen.spec, 1.43,
	1.44 linux-2.6-debug-boot-delay.patch, 1.1, 1.2 sources, 1.14,
	1.15 upstream, 1.7, 1.8 patch-2.6.16-rc2-git2.bz2.sign, 1.1, NONE
Message-ID: <200602072344.k17NiPu3028746@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-xen.spec linux-2.6-debug-boot-delay.patch 
	sources upstream 
Added Files:
	patch-2.6.16-rc2-git3.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git2.bz2.sign 
Log Message:
merge with rawhide 1.1918.


--- NEW FILE patch-2.6.16-rc2-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD5+PNyGugalF9Dw4RAjtsAKCJX8fuUlA3RX24LxQ3uLlTlMnv3wCgkG48
lsV4Ke9qVQz7GD8Mla3HmUQ=
=Rhvy
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	7 Feb 2006 00:45:15 -0000	1.14
+++ .cvsignore	7 Feb 2006 23:44:22 -0000	1.15
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060202.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git2.bz2
+patch-2.6.16-rc2-git3.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kernel-xen.spec	7 Feb 2006 20:37:35 -0000	1.43
+++ kernel-xen.spec	7 Feb 2006 23:44:22 -0000	1.44
@@ -219,7 +219,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git2.bz2
+Patch2: patch-2.6.16-rc2-git3.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1591,6 +1591,9 @@
 %endif
 
 %changelog
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+- merge with rawhide 1.1918.
+
 * Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
 - fix xen to compile with gcc-4.1.
 - disable PAE build.
@@ -1599,6 +1602,9 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git3
+
 * Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide 1.1914.
 

linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-boot-delay.patch	7 Feb 2006 00:45:15 -0000	1.1
+++ linux-2.6-debug-boot-delay.patch	7 Feb 2006 23:44:22 -0000	1.2
@@ -98,7 +98,7 @@
 +	timeout = jiffies + msecs_to_jiffies(millisecs);
 +	while (k) {
 +		k--;
-+		rep_nop();
++		cpu_relax();
 +		/*
 +		 * use (volatile) jiffies to prevent
 +		 * compiler reduction; loop termination via jiffies


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	7 Feb 2006 00:45:16 -0000	1.14
+++ sources	7 Feb 2006 23:44:22 -0000	1.15
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 9a0a0e3c3ad5d049fcd29fb913d6c3a6  xen-20060202.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-b5306d5c471ef0a301ced2acb475d361  patch-2.6.16-rc2-git2.bz2
+a1e8c0cbebb73561c1d7eae45b5d6ee6  patch-2.6.16-rc2-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upstream	7 Feb 2006 00:45:16 -0000	1.7
+++ upstream	7 Feb 2006 23:44:22 -0000	1.8
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git2.bz2
+patch-2.6.16-rc2-git3.bz2


--- patch-2.6.16-rc2-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:47:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:47:13 -0500
Subject: rpms/tog-pegasus/devel pegasus-2.5-syslog_h.patch,NONE,1.1
Message-ID: <200602072347.k17NlDpk009901@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9869

Added Files:
	pegasus-2.5-syslog_h.patch 
Log Message:
includes no longer included syslog.h - add

pegasus-2.5-syslog_h.patch:
 PAMBasicAuthenticatorUnix.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE pegasus-2.5-syslog_h.patch ---
--- pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.syslog_h	2006-02-07 17:31:36.000000000 -0500
+++ pegasus-2.5/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp	2006-02-07 17:34:57.000000000 -0500
@@ -46,6 +46,8 @@
 #include <prot.h>
 #endif
 
+#include <syslog.h>
+
 #if defined (PEGASUS_USE_PAM_STANDALONE_PROC)
 #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/IPC.h>



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:47:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:47:46 -0500
Subject: rpms/tog-pegasus/devel pegasus-2.5-install_id.patch,NONE,1.1
Message-ID: <200602072347.k17NlkLK010177@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10147

Added Files:
	pegasus-2.5-install_id.patch 
Log Message:
install now fails on chown failure

pegasus-2.5-install_id.patch:
 Makefile |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE pegasus-2.5-install_id.patch ---
--- pegasus-2.5/rpm/Makefile.install_id	2006-02-07 17:37:39.000000000 -0500
+++ pegasus-2.5/rpm/Makefile	2006-02-07 18:39:05.000000000 -0500
@@ -30,6 +30,9 @@
 
 include $(ROOT)/mak/config.mak
 
+INSTALL_USER?=root
+INSTALL_GROUP?=root
+
 #Defines subdirectories to go to recursively
 
 DIRS =  manLinux
@@ -53,9 +56,9 @@
 
 install: tog-pegasus.rc wbem cimserver_planned.conf
 ifdef PEGASUS_INSTALL
-	$(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus
-	$(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf
-	$(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem
 	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR) 
 	cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/
 	cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:48:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:48:58 -0500
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.17,1.18
Message-ID: <200602072348.k17NmwE3010738@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10593

Modified Files:
	tog-pegasus.spec 
Log Message:
- restore SSLv23_method SSL support now that bug 173399 is fixed
- rebuild for new gcc, glibc, glibc-kernheaders
- PAMBasicAuthenticatorUnix.cpp includes no longer include syslog.h: add
- /usr/bin/install now decides to fail if chown fails - set $INSTALL_USER, $INSTALL_GROUP



Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tog-pegasus.spec	7 Feb 2006 22:20:11 -0000	1.17
+++ tog-pegasus.spec	7 Feb 2006 23:48:55 -0000	1.18
@@ -33,6 +33,8 @@
 Patch3:         pegasus-2.5-add_cmpi_provider_lib.patch
 Patch4:		pegasus-2.5-enable_cql.patch
 Patch5:		pegasus-2.5-bz173401.patch
+Patch6:         pegasus-2.5-syslog_h.patch
+Patch7:		pegasus-2.5-install_id.patch
 BuildRequires:    bash, sed, grep, coreutils, procps, gcc, gcc-c++, libstdc++, make, pam-devel, krb5-devel, krb5-libs, openssl-devel >= 0.9.6, e2fsprogs
 Requires:         bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools
 Requires(post):   bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam, krb5-libs, e2fsprogs, redhat-lsb, chkconfig, SysVinit, bind-utils, bind-libs, net-tools 
@@ -79,6 +81,8 @@
 %patch4 -p1 -b .enable_cql
 # %patch5 -p1 -b .bz173401
 # now fixed with openssl-0.9.8a-3+
+%patch6 -p1 -b .syslog_h
+%patch7 -p1 -b .install_id
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -105,6 +109,10 @@
 export LD_LIBRARY_PATH=${PEGASUS_HOME}/%{_lib}:/%{_lib}:/usr/%{_lib}
 unset  PEGASUS_STAGING_DIR
 export PEGASUS_SDK_STAGING_DIR=${PEGASUS_HOME}/stageSDK
+# why oh why did they make /usr/bin/install fail on the chown!!! :
+export INSTALL_USER=`id -un`
+export INSTALL_GROUP=`id -gn`
+#
 make install
 rm -rf $PEGASUS_HOME
 mkdir -p $RPM_BUILD_ROOT{${PEGASUS_CONFIG_DIR},${PEGASUS_VARRUN_DIR},${PEGASUS_LOG_DIR},$PEGASUS_VARDATA_DIR}
@@ -249,6 +257,8 @@
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-6
 - restore SSLv23_method SSL support now that bug 173399 is fixed
 - rebuild for new gcc, glibc, glibc-kernheaders
+- PAMBasicAuthenticatorUnix.cpp includes no longer include syslog.h: add
+- /usr/bin/install now decides to fail if chown fails - set $INSTALL_USER, $INSTALL_GROUP
 
 * Thu Dec 15 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-5
 - fix bug 175434 : deal with pegasus uid/gid already existing



From fedora-cvs-commits at redhat.com  Tue Feb  7 23:58:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 18:58:04 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.44,1.45
Message-ID: <200602072358.k17Nw4mr014998@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
build everything


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kernel-xen.spec	7 Feb 2006 23:44:22 -0000	1.44
+++ kernel-xen.spec	7 Feb 2006 23:58:01 -0000	1.45
@@ -3,10 +3,10 @@
 # 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 buildup 0
-%define buildsmp 0
+%define buildup 1
+%define buildsmp 1
 %define includexen 1
-%define includexenPAE 0
+%define includexenPAE 1
 %define builddoc 0
 %define buildkdump 0
 
@@ -50,16 +50,10 @@
 %ifarch i686
 %define buildxen %{includexen}
 %define buildxenPAE %{includexenPAE}
-%define buildkdump 0
+%define buildkdump 1
 %else
 %define buildxen 0
 %define buildxenPAE 0
-%define buildkdump 0
-%endif
-
-%if %{buildxen}
-%define make_target vmlinuz
-%define kernel_image vmlinuz
 %endif
 
 %ifarch %{all_x86}
@@ -1058,6 +1052,10 @@
 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
 
+cd linux-%{kversion}.%{_target_cpu}
+
+
+
 BuildKernel() {
 
     # Pick the right config file for the kernel we're building
@@ -1255,20 +1253,24 @@
 BuildKernel smp
 %endif
 
+%if %{buildkdump}
+BuildKernel kdump
+%endif
+
 %if %{buildxenPAE}
+%define make_target vmlinuz
+%define kernel_image vmlinuz
 BuildKernel hypervisor-PAE
 BuildKernel guest-PAE
 %endif
 
 %if %{buildxen}
+%define make_target vmlinuz
+%define kernel_image vmlinuz
 BuildKernel hypervisor
 BuildKernel guest
 %endif
 
-%if %{buildkdump}
-BuildKernel kdump
-%endif
-
 ###
 ### install
 ###
@@ -1591,8 +1593,10 @@
 %endif
 
 %changelog
-* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide 1.1918.
+- add up, smp & kdump kernels.
+- add xen PAE kernels.
 
 * Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
 - fix xen to compile with gcc-4.1.



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:10:45 -0500
Subject: rpms/libdaemon/devel libdaemon.spec,1.5,1.6
Message-ID: <200602080010.k180Aj8U018162@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/libdaemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18135

Modified Files:
	libdaemon.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: libdaemon.spec
===================================================================
RCS file: /cvs/dist/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libdaemon.spec	9 Jan 2006 16:40:09 -0000	1.5
+++ libdaemon.spec	8 Feb 2006 00:10:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name: libdaemon
 Version: 0.10
-Release: 2
+Release: 3
 Summary: library for writing UNIX daemons
 
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-3
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Mon Jan 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-2
 - rebuild for new gcc / glibc
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:11:48 -0500
Subject: rpms/avahi/devel avahi.spec,1.36,1.37
Message-ID: <200602080011.k180BmAr018665@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18634

Modified Files:
	avahi.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- avahi.spec	1 Feb 2006 23:13:55 -0000	1.36
+++ avahi.spec	8 Feb 2006 00:11:45 -0000	1.37
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.6
-Release: 	1
+Release: 	2
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -302,6 +302,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-2
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Wed Feb 01 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-1
 - fix bug 179448: mis-alignment of input cmsghdr msg->msg_control buffer on ia64
 - Upgrade to 0.6.6



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:20:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:20:06 -0500
Subject: rpms/radvd/devel radvd.spec,1.26,1.27
Message-ID: <200602080020.k180K6HO002339@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2306

Modified Files:
	radvd.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- radvd.spec	16 Jan 2006 16:35:29 -0000	1.26
+++ radvd.spec	8 Feb 2006 00:20:04 -0000	1.27
@@ -3,7 +3,7 @@
 Summary:   A Router Advertisement daemon
 Name:      radvd
 Version:   0.9.1
-Release:   1
+Release:   1.1
 License:   BSD-style
 Group:     System Environment/Daemons
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-1.1
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Mon Jan 16 2006 Jason Vas Dias<jvdias at redhat.com> - 0.9.1-1
 - Upgrade to upstream version 0.9.1
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:23:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:23:09 -0500
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.21,1.22
Message-ID: <200602080023.k180N9Y0003763@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3735

Modified Files:
	dhcpv6.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dhcpv6.spec	18 Dec 2005 21:13:11 -0000	1.21
+++ dhcpv6.spec	8 Feb 2006 00:23:06 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 15.2
+Release: 16
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -130,6 +130,9 @@
 %attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-16
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Sun Dec 18 2005 Jason Vas Dias<jvdias at redhat.com> - 0.10-15.2
 - rebuild for new gcc & flex
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:25:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:25:56 -0500
Subject: rpms/at/devel at.spec,1.34,1.35
Message-ID: <200602080025.k180Pueb005031@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5001

Modified Files:
	at.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/devel/at.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- at.spec	18 Dec 2005 20:51:03 -0000	1.34
+++ at.spec	8 Feb 2006 00:25:53 -0000	1.35
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 80.2
+Release: 80.3
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -188,6 +188,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.1.8-80.3
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Fri Dec 18 2005 Jason Vas Dias<jvdias at redhat.com> - 3.1.8-80.2
 - rebuild for new flex
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:28:16 -0500
Subject: rpms/anacron/devel anacron.spec,1.15,1.16
Message-ID: <200602080028.k180SGBN006154@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6116

Modified Files:
	anacron.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- anacron.spec	11 Jan 2006 22:03:07 -0000	1.15
+++ anacron.spec	8 Feb 2006 00:28:14 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 35
+Release: 36
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -110,6 +110,9 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2.3-36
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Wed Jan 11 2006 Peter Jones <pjones at redhat.com> 2.3-35
 - Fix initscript so changing runlevel shuts it down correctly
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:32:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:32:31 -0500
Subject: rpms/netatalk/devel netatalk.spec,1.24,1.25
Message-ID: <200602080032.k180WVGt007293@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7268

Modified Files:
	netatalk.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- netatalk.spec	9 Dec 2005 22:42:20 -0000	1.24
+++ netatalk.spec	8 Feb 2006 00:32:18 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 4.1
+Release: 4.2
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -179,6 +179,9 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com>
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:36:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:36:27 -0500
Subject: rpms/lam/devel lam.spec,1.29,1.30
Message-ID: <200602080036.k180aRaV007986@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7953

Modified Files:
	lam.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- lam.spec	9 Dec 2005 22:41:15 -0000	1.29
+++ lam.spec	8 Feb 2006 00:36:24 -0000	1.30
@@ -3,7 +3,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 8.FC5.1
+Release: 8.FC5.2
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -112,6 +112,9 @@
 %endif
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:7.1.1-8.2
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:41:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:41:26 -0500
Subject: rpms/pvm/devel pvm.spec,1.34,1.35
Message-ID: <200602080041.k180fQtB010314@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/pvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10286

Modified Files:
	pvm.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/devel/pvm.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pvm.spec	9 Dec 2005 22:42:50 -0000	1.34
+++ pvm.spec	8 Feb 2006 00:41:24 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 6.1
+Release: 6.7
 License: freely distributable
 Group: Development/Libraries
 Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -225,6 +225,9 @@
 /usr/share/pvm3/xpvm/*
 
 %changelog
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.5-6.7
+- rebuild for new gcc, glibc, glibc-kernheaders
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:56:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:56:49 -0500
Subject: rpms/at/devel at-3.1.8-install_no_chown.patch,NONE,1.1
Message-ID: <200602080056.k180un7f021432@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21418

Added Files:
	at-3.1.8-install_no_chown.patch 
Log Message:
workaround new /usr/bin/install failure on chown

at-3.1.8-install_no_chown.patch:
 Makefile.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE at-3.1.8-install_no_chown.patch ---
--- at-3.1.8/Makefile.in.install_no_chown	2006-02-07 19:46:46.000000000 -0500
+++ at-3.1.8/Makefile.in	2006-02-07 19:53:01.000000000 -0500
@@ -65,6 +65,9 @@
 DIST = $(CSRCS) $(HEADERS) $(MISC) $(OTHERS)
 LIST = Filelist Filelist.asc
 
+INSTALL_ROOT_USER  ?= root
+INSTALL_ROOT_GROUP ?= root
+
 .PHONY: all install clean dist distclean
 
 all: at atd atrun
@@ -105,7 +108,7 @@
 	chmod 600 $(IROOT)$(LFILE)
 	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
 	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL)  -m 600 at.deny $(IROOT)$(etcdir)/
-	$(INSTALL) -o root -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd
+	$(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd
 	$(INSTALL)   -m 4755 -s at $(IROOT)$(bindir)
 	$(LN_S) -f at $(IROOT)$(bindir)/atq
 	$(LN_S) -f at $(IROOT)$(bindir)/atrm



From fedora-cvs-commits at redhat.com  Wed Feb  8 00:57:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 19:57:31 -0500
Subject: rpms/at/devel at.spec,1.35,1.36
Message-ID: <200602080057.k180vVlv021453@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21442

Modified Files:
	at.spec 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders; workaround new /usr/bin/install failure on chown


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/devel/at.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- at.spec	8 Feb 2006 00:25:53 -0000	1.35
+++ at.spec	8 Feb 2006 00:57:29 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 80.3
+Release: 81
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -38,7 +38,7 @@
 Patch31: at-3.1.8-r_option.patch
 Patch32: at-3.1.8-pam_loginuid.patch
 Patch33: at-3.1.8-getseuserbyname.patch
-
+Patch34: at-3.1.8-install_no_chown.patch
 Prereq: fileutils chkconfig /etc/init.d
 BuildPrereq: flex bison autoconf
 BuildPrereq: libselinux-devel >= 1.27.9
@@ -104,6 +104,8 @@
 %patch31 -p1 -b .-r_option
 %patch32 -p1 -b .pam_loginuid
 %patch33 -p1 -b .getseuserbyname
+%patch34 -p1 -b .install_no_chown
+
 %build
 # patch10 touches configure.in
 autoconf
@@ -128,12 +130,13 @@
 
 %install
 rm -rf %{buildroot}
-
 %makeinstall DAEMON_USERNAME=`id -nu` \
 	DAEMON_GROUPNAME=`id -ng` \
 	etcdir=%{buildroot}%{_sysconfdir} \
 	ATJOB_DIR=%{buildroot}%{_localstatedir}/spool/at \
-	ATSPOOL_DIR=%{buildroot}%{_localstatedir}/spool/at/spool 
+	ATSPOOL_DIR=%{buildroot}%{_localstatedir}/spool/at/spool \
+	INSTALL_ROOT_USER=`id -nu` \
+	INSTALL_ROOT_GROUP=`id -nu`;
 echo > %{buildroot}%{_sysconfdir}/at.deny
 mkdir docs
 cp $RPM_BUILD_ROOT/%{_prefix}/doc/at/* docs/
@@ -188,8 +191,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
-* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.1.8-80.3
+* Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.1.8-81
 - rebuild for new gcc, glibc, glibc-kernheaders
+- workaround new refusal of /usr/bin/install to chown
 
 * Fri Dec 18 2005 Jason Vas Dias<jvdias at redhat.com> - 3.1.8-80.2
 - rebuild for new flex



From fedora-cvs-commits at redhat.com  Wed Feb  8 01:08:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 20:08:48 -0500
Subject: rpms/dhcpv6/devel dhcpv6-0.10-install_no_chown.patch, NONE,
	1.1 dhcpv6.spec, 1.22, 1.23
Message-ID: <200602080108.k1818mHD021672@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21657

Modified Files:
	dhcpv6.spec 
Added Files:
	dhcpv6-0.10-install_no_chown.patch 
Log Message:
rebuild for new gcc, glibc, glibc-kernheaders; workaround new /usr/bin/install failure on chown

dhcpv6-0.10-install_no_chown.patch:
 Makefile.in |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE dhcpv6-0.10-install_no_chown.patch ---
--- dhcp-0.10/Makefile.in.install_no_chown	2006-02-07 20:00:18.000000000 -0500
+++ dhcp-0.10/Makefile.in	2006-02-07 20:04:19.000000000 -0500
@@ -16,6 +16,8 @@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_DATA=@INSTALL_DATA@
+INSTALL_USER ?= root
+INSTALL_GROUP ?= root
 prefix=	@prefix@
 exec_prefix=	@exec_prefix@
 bindir=	@bindir@
@@ -95,27 +97,27 @@
 install::
 	$(INSTALL) -d $(DESTDIR)$(sbindir)
 	$(INSTALL) -d $(DESTDIR)/sbin
-	$(INSTALL_PROGRAM) -s -o bin -g bin dhcp6s $(DESTDIR)$(sbindir)
-	$(INSTALL_PROGRAM) -s -o bin -g bin dhcp6r $(DESTDIR)$(sbindir)
-	$(INSTALL_PROGRAM) -s -o bin -g bin dhcp6c $(DESTDIR)/sbin
+	$(INSTALL_PROGRAM) -s -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s $(DESTDIR)$(sbindir)
+	$(INSTALL_PROGRAM) -s -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6r $(DESTDIR)$(sbindir)
+	$(INSTALL_PROGRAM) -s -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6c $(DESTDIR)/sbin
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8 $(DESTDIR)$(mandir)/man5
-	$(INSTALL_DATA) -o bin -g bin dhcp6c.8 $(DESTDIR)$(mandir)/man8/
-	$(INSTALL_DATA) -o bin -g bin dhcp6s.8 $(DESTDIR)$(mandir)/man8/
-	$(INSTALL_DATA) -o bin -g bin dhcp6r.8 $(DESTDIR)$(mandir)/man8/
-	$(INSTALL_DATA) -o bin -g bin dhcp6c.conf.5 $(DESTDIR)$(mandir)/man5/
-	$(INSTALL_DATA) -o bin -g bin dhcp6s.conf.5 $(DESTDIR)$(mandir)/man5/
+	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6c.8 $(DESTDIR)$(mandir)/man8/
+	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.8 $(DESTDIR)$(mandir)/man8/
+	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6r.8 $(DESTDIR)$(mandir)/man8/
+	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6c.conf.5 $(DESTDIR)$(mandir)/man5/
+	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.conf.5 $(DESTDIR)$(mandir)/man5/
 	$(INSTALL) -d  $(DESTDIR)$(initdir)
-	$(INSTALL_PROGRAM) -o root -g root dhcp6s.sh $(DESTDIR)$(initdir)/dhcp6s
-	$(INSTALL_PROGRAM) -o root -g root dhcp6r.sh $(DESTDIR)$(initdir)/dhcp6r
+	$(INSTALL_PROGRAM) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.sh $(DESTDIR)$(initdir)/dhcp6s
+	$(INSTALL_PROGRAM) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6r.sh $(DESTDIR)$(initdir)/dhcp6r
 	$(INSTALL) -d  $(DESTDIR)/etc/sysconfig
-	$(INSTALL_DATA) -o bin -g bin dhcp6s.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6s
-	$(INSTALL_DATA) -o bin -g bin dhcp6r.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6r
+	$(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
 
 
 rh_install:: install
 	$(INSTALL) -d $(initdir)
-	$(INSTALL_PROGRAM) -o root -g root dhcp6s.sh $(initdir)/dhcp6s
-	$(INSTALL_PROGRAM) -o root -g root dhcp6c.sh $(initdir)/dhcp6c
+	$(INSTALL_PROGRAM) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.sh $(initdir)/dhcp6s
+	$(INSTALL_PROGRAM) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6c.sh $(initdir)/dhcp6c
 	$(CHKCONFIG) --add dhcp6s
 	$(CHKCONFIG) --add dhcp6c
 


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dhcpv6.spec	8 Feb 2006 00:23:06 -0000	1.22
+++ dhcpv6.spec	8 Feb 2006 01:08:46 -0000	1.23
@@ -22,7 +22,7 @@
 Patch11: dhcpv6-0.10-warnings.patch
 Patch12: dhcpv6-0.10-use_glibc_ifaddrs.patch
 Patch13: dhcpv6-0.10-165882.patch
-
+Patch14: dhcpv6-0.10-install_no_chown.patch
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRequires: flex, bison
 
@@ -54,6 +54,7 @@
 %patch12 -p1 -b .use_glibc_ifaddrs
 rm -f ifaddrs.h
 %patch13 -p1 -b .165882
+%patch14 -p1 -b .install_no_chown
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIE"
@@ -74,7 +75,7 @@
     /usr/bin/tr -d '\r' < $m.dos > $m;
 done;
 popd
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL_USER=`id -nu` INSTALL_GROUP=`id -gn`
 mkdir -p %{buildroot}%{_localstatedir}/lib/dhcpv6
 
 %package -n dhcpv6_client



From fedora-cvs-commits at redhat.com  Wed Feb  8 02:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 7 Feb 2006 21:44:56 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.102, 1.103 kudzu.spec, 1.116,
	1.117 sources, 1.115, 1.116
Message-ID: <200602080244.k182iuuR031287@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31241

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	30 Jan 2006 21:03:10 -0000	1.102
+++ .cvsignore	8 Feb 2006 02:44:52 -0000	1.103
@@ -1 +1 @@
-kudzu-1.2.24.tar.gz
+kudzu-1.2.25.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kudzu.spec	7 Feb 2006 12:27:47 -0000	1.116
+++ kudzu.spec	8 Feb 2006 02:44:53 -0000	1.117
@@ -1,6 +1,6 @@
 Name: kudzu
-Version: 1.2.24
-Release: 1.1
+Version: 1.2.25
+Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,8 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.24-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> - 1.2.25-1
+- in installer environment, sg isn't loaded, so there are deviceless
+  scsi devs (#180378)
 
 * Mon Jan 30 2006 Bill Nottingham <notting at redhat.com> - 1.2.24-1
 - fix xenblk/i2o sysfs probing


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	30 Jan 2006 21:53:36 -0000	1.115
+++ sources	8 Feb 2006 02:44:53 -0000	1.116
@@ -1 +1 @@
-f124d2e772c9f21f614461b807c2ae01  kudzu-1.2.24.tar.gz
+13142cbc3c3f80f94a6e6cb6605a7a02  kudzu-1.2.25.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  8 08:12:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 03:12:43 -0500
Subject: rpms/agg/devel agg.spec,1.5,1.6
Message-ID: <200602080812.k188Ch8j001937@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1900

Modified Files:
	agg.spec 
Log Message:
rh#180341# BuildRequires


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- agg.spec	7 Feb 2006 10:52:03 -0000	1.5
+++ agg.spec	8 Feb 2006 08:12:40 -0000	1.6
@@ -1,13 +1,13 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.3
-Release: 1.1
+Release: 2
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
 Source:  http://www.antigrain.com/%{name}23.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: automake
+BuildRequires: automake, libX11-devel
 Patch1: agg23-optional-gpc.patch
 
 %description
@@ -56,6 +56,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 08 2006 Caolan McNamara <caolanm at redhat.com> - 2.3-2
+- rh#180341# BuildRequires
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 10:01:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 05:01:42 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.45,1.46
Message-ID: <200602081001.k18A1gnC019185@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
Do cd linux-<blah> at the right moment


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kernel-xen.spec	7 Feb 2006 23:58:01 -0000	1.45
+++ kernel-xen.spec	8 Feb 2006 10:01:23 -0000	1.46
@@ -1052,10 +1052,6 @@
 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
 
-cd linux-%{kversion}.%{_target_cpu}
-
-
-
 BuildKernel() {
 
     # Pick the right config file for the kernel we're building



From fedora-cvs-commits at redhat.com  Wed Feb  8 12:30:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 07:30:51 -0500
Subject: rpms/kernel-xen/devel/configs config-i686-smp, 1.2,
	1.3 config-x86-generic, 1.7, 1.8
Message-ID: <200602081230.k18CUpjv030282@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-i686-smp config-x86-generic 
Log Message:
SMP_ALTERNATIVES don't work


Index: config-i686-smp
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-i686-smp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-i686-smp	21 Dec 2005 11:24:56 -0000	1.2
+++ config-i686-smp	8 Feb 2006 12:30:20 -0000	1.3
@@ -10,5 +10,3 @@
 # CONFIG_X86_PC is not set
 CONFIG_X86_GENERICARCH=y
 
-# Enable SMP alternatives (dynamic kernel text rewriting for UP/SMP primitives)
-CONFIG_SMP_ALTERNATIVES=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-x86-generic	7 Feb 2006 00:45:16 -0000	1.7
+++ config-x86-generic	8 Feb 2006 12:30:20 -0000	1.8
@@ -48,6 +48,7 @@
 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



From fedora-cvs-commits at redhat.com  Wed Feb  8 13:10:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 08:10:15 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.46,1.47
Message-ID: <200602081310.k18DAFRh011702@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
disable SMP_ALTERNATIVES


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kernel-xen.spec	8 Feb 2006 10:01:23 -0000	1.46
+++ kernel-xen.spec	8 Feb 2006 13:10:13 -0000	1.47
@@ -1590,6 +1590,9 @@
 
 %changelog
 * Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- removed SMP_ALTERNATIVES from smp kernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
 - merge with rawhide 1.1918.
 - add up, smp & kdump kernels.
 - add xen PAE kernels.



From fedora-cvs-commits at redhat.com  Wed Feb  8 14:42:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 09:42:23 -0500
Subject: rpms/fontconfig/devel .cvsignore, 1.18, 1.19 fontconfig.spec, 1.67,
	1.68 sources, 1.19, 1.20
Message-ID: <200602081442.k18EgNOi019740@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
new snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	7 Feb 2006 20:46:51 -0000	1.18
+++ .cvsignore	8 Feb 2006 14:42:21 -0000	1.19
@@ -3,3 +3,4 @@
 fontconfig-2.3.93.cvs20060129.tar.gz
 fontconfig-2.3.93.cvs20060131.tar.gz
 fontconfig-2.3.93.cvs20060207.tar.gz
+fontconfig-2.3.93.cvs20060208.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- fontconfig.spec	7 Feb 2006 20:50:11 -0000	1.67
+++ fontconfig.spec	8 Feb 2006 14:42:21 -0000	1.68
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93.cvs20060207
+Version: 2.3.93.cvs20060208
 Release: 1
 License: MIT
 Group: System Environment/Libraries
@@ -14,7 +14,6 @@
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
 Patch2: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
-Patch3: fc-app-dir-fix-new.diff
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel
@@ -52,7 +51,6 @@
 
 %patch1 -p1 -b .defaultconfig
 %patch2 -p1 -b .move-user-cache
-%patch3 -p1 -b .app-dir-fix
 
 %build
 %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF
@@ -137,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060208-1
+- Newer cvs snapshot
+
 * Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060207-1
 - Newer cvs snapshot
 - Drop upstreamed patches, pick up some new ones


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Feb 2006 20:46:51 -0000	1.19
+++ sources	8 Feb 2006 14:42:21 -0000	1.20
@@ -1 +1 @@
-4514a786bcfc619a44f95f5a90549a04  fontconfig-2.3.93.cvs20060207.tar.gz
+b5580c9698cec1382955e9cebcf4a636  fontconfig-2.3.93.cvs20060208.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  8 15:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 10:42:39 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.340, 1.341 kernel-2.6.spec, 1.1918,
	1.1919 sources, 1.282, 1.283 upstream, 1.256,
	1.257 patch-2.6.16-rc2-git3.bz2.sign, 1.1, NONE
Message-ID: <200602081542.k18Fgdnq027416@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git4.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git3.bz2.sign 
Log Message:
git4



--- NEW FILE patch-2.6.16-rc2-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD6TU5yGugalF9Dw4RAoc5AJ9G8eQHxCdRt7/l/hOZpJNh9+pkFwCeOyEe
tRV+TjPfH9NiIXXM9shDT4g=
=obem
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- .cvsignore	7 Feb 2006 19:55:00 -0000	1.340
+++ .cvsignore	8 Feb 2006 15:42:36 -0000	1.341
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git3.bz2
+patch-2.6.16-rc2-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1918
retrieving revision 1.1919
diff -u -r1.1918 -r1.1919
--- kernel-2.6.spec	7 Feb 2006 23:10:08 -0000	1.1918
+++ kernel-2.6.spec	8 Feb 2006 15:42:36 -0000	1.1919
@@ -205,7 +205,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git3.bz2
+Patch2: patch-2.6.16-rc2-git4.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1394,6 +1394,9 @@
 %endif
 
 %changelog
+* Wed Feb  8 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git4
+
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - Touch NMI watchdogs in printk pauser.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- sources	7 Feb 2006 19:55:00 -0000	1.282
+++ sources	8 Feb 2006 15:42:37 -0000	1.283
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-a1e8c0cbebb73561c1d7eae45b5d6ee6  patch-2.6.16-rc2-git3.bz2
+8765513beeeea79a19a9670e4c95685c  patch-2.6.16-rc2-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- upstream	7 Feb 2006 19:55:00 -0000	1.256
+++ upstream	8 Feb 2006 15:42:37 -0000	1.257
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git3.bz2
+patch-2.6.16-rc2-git4.bz2


--- patch-2.6.16-rc2-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  8 15:45:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 10:45:31 -0500
Subject: rpms/mcelog/devel .cvsignore, 1.4, 1.5 mcelog.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <200602081545.k18FjVfU029273@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28798

Modified Files:
	.cvsignore mcelog.spec sources 
Log Message:
0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 16:33:44 -0000	1.4
+++ .cvsignore	8 Feb 2006 15:45:29 -0000	1.5
@@ -1 +1,2 @@
 mcelog-0.5.tar.gz
+mcelog-0.6.tar.gz


Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mcelog.spec	19 Dec 2005 16:33:44 -0000	1.13
+++ mcelog.spec	8 Feb 2006 15:45:29 -0000	1.14
@@ -1,6 +1,6 @@
 Summary:        Tool to translate x86-64 CPU Machine Check Exception data.
 Name:           mcelog
-Version:        0.5
+Version:        0.6
 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
 Epoch:		1
 Group:          System Environment/Base
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Wed Feb  8 2005 Dave Jones <davej at redhat.com>
+- Update to upstream 0.6
+
 * Mon Dec 19 2005 Dave Jones <davej at redhat.com>
 - Update to upstream 0.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Dec 2005 16:33:44 -0000	1.4
+++ sources	8 Feb 2006 15:45:29 -0000	1.5
@@ -1 +1,2 @@
 7bf3462a80afc5f621405b891bd62752  mcelog-0.5.tar.gz
+5aa068b928ec09add6bc099d59264338  mcelog-0.6.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  8 15:45:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 10:45:51 -0500
Subject: rpms/mcelog/devel mcelog.spec,1.14,1.15
Message-ID: <200602081545.k18FjpI2032495@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31713

Modified Files:
	mcelog.spec 
Log Message:
doh



Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mcelog.spec	8 Feb 2006 15:45:29 -0000	1.14
+++ mcelog.spec	8 Feb 2006 15:45:49 -0000	1.15
@@ -46,7 +46,7 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
-* Wed Feb  8 2005 Dave Jones <davej at redhat.com>
+* Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - Update to upstream 0.6
 
 * Mon Dec 19 2005 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:09:27 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.47,1.48
Message-ID: <200602081609.k18G9R5E017353@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
transform make_target & kernel_image into arguments for BuildKernel


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kernel-xen.spec	8 Feb 2006 13:10:13 -0000	1.47
+++ kernel-xen.spec	8 Feb 2006 16:09:25 -0000	1.48
@@ -3,8 +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 buildup 1
-%define buildsmp 1
+%define buildup 0
+%define buildsmp 0
 %define includexen 1
 %define includexenPAE 1
 %define builddoc 0
@@ -1053,23 +1053,27 @@
 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
 
@@ -1082,7 +1086,7 @@
     make -s ARCH=$Arch nonint_oldconfig > /dev/null
     make -s ARCH=$Arch include/linux/version.h 
 
-    make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
+    make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget
     make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
     make ARCH=$Arch buildcheck
     
@@ -1094,12 +1098,12 @@
     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
 
-    if [ "$1" == "kdump" ]; then
+    if [ "$Flavour" == "kdump" ]; then
         cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
         rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     fi
@@ -1242,29 +1246,25 @@
 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
 
 %if %{buildkdump}
-BuildKernel kdump
+BuildKernel %make_target %kernel_image kdump
 %endif
 
 %if %{buildxenPAE}
-%define make_target vmlinuz
-%define kernel_image vmlinuz
-BuildKernel hypervisor-PAE
-BuildKernel guest-PAE
+BuildKernel vmlinuz vmlinuz hypervisor-PAE
+BuildKernel vmlinuz vmlinuz guest-PAE
 %endif
 
 %if %{buildxen}
-%define make_target vmlinuz
-%define kernel_image vmlinuz
-BuildKernel hypervisor
-BuildKernel guest
+BuildKernel vmlinuz vmlinuz hypervisor
+BuildKernel vmlinuz vmlinuz guest
 %endif
 
 ###
@@ -1590,6 +1590,9 @@
 
 %changelog
 * Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- make_target & kernel_image passed as arguments to BuildKernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
 - removed SMP_ALTERNATIVES from smp kernel.
 
 * Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:19:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:19:12 -0500
Subject: rpms/lftp/devel .cvsignore, 1.22, 1.23 lftp.spec, 1.38, 1.39 sources,
	1.22, 1.23
Message-ID: <200602081619.k18GJCIG001808@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore lftp.spec sources 
Log Message:
Upgrade to 3.4.2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	7 Feb 2006 23:17:44 -0000	1.22
+++ .cvsignore	8 Feb 2006 16:19:09 -0000	1.23
@@ -11,3 +11,4 @@
 lftp-3.4.0.tar.bz2
 lftp-3.4.0.tar.bz2.asc
 lftp-3.4.1.tar.bz2
+lftp-3.4.2.tar.bz2


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- lftp.spec	7 Feb 2006 23:17:44 -0000	1.38
+++ lftp.spec	8 Feb 2006 16:19:09 -0000	1.39
@@ -1,6 +1,6 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
-Version: 	3.4.1
+Version: 	3.4.2
 Release: 	1
 License: 	GPL
 Group: 		Applications/Internet
@@ -22,7 +22,8 @@
 %setup -q
 #%patch173276 -p1 -b .bz173276
 #^- now fixed upstream
-%patch2 -p1 -b .dont_core
+#%patch2 -p1 -b .dont_core
+#^- now fixed upstream
 
 %build
 if pkg-config openssl ; then
@@ -70,6 +71,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Wed Feb 08 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.2-1
+- Upgrade to upstream version 3.4.2, that fixes 3.4.1's coredump
+
 * Tue Feb 07 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.1-1
 - Upgrade to upstream version 3.4.1
 - fix core dump


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	7 Feb 2006 23:17:44 -0000	1.22
+++ sources	8 Feb 2006 16:19:09 -0000	1.23
@@ -1 +1 @@
-4c73ad8e96c9ae1107b384fd59fcc009  lftp-3.4.1.tar.bz2
+a572a3ab4490a58bb10b51ef97ef5c30  lftp-3.4.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:19:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:19:22 -0500
Subject: rpms/sudo/devel sudo-1.6.8p12-env-reset.patch, NONE, 1.1 sudo.spec,
	1.35, 1.36
Message-ID: <200602081619.k18GJMis001926@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1880

Modified Files:
	sudo.spec 
Added Files:
	sudo-1.6.8p12-env-reset.patch 
Log Message:
reset env. by default

sudo-1.6.8p12-env-reset.patch:
 sudoers |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE sudo-1.6.8p12-env-reset.patch ---
--- sudo-1.6.8p12/sudoers.env_reset	2006-02-08 16:58:15.000000000 +0100
+++ sudo-1.6.8p12/sudoers	2006-02-08 16:59:02.000000000 +0100
@@ -13,6 +13,14 @@
 
 # Defaults specification
 
+Defaults    env_reset
+Defaults    env_keep = "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR \
+                        LS_COLORS MAIL PS1 PS2 QTDIR USERNAME \
+                        LANG LC_ADDRESS LC_CTYPE LC_COLLATE LC_IDENTIFICATION \
+                        LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC \
+                        LC_PAPER LC_TELEPHONE LC_TIME LC_ALL LANGUAGE LINGUAS \
+                        _XKB_CHARSET"
+
 # Runas alias specification
 
 # User privilege specification


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sudo.spec	7 Feb 2006 13:54:38 -0000	1.35
+++ sudo.spec	8 Feb 2006 16:19:20 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 3.1
+Release: 4
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -14,6 +14,8 @@
 Patch2: sudo-1.6.8p8-pam-sess.patch
 # don't strip
 Patch3: sudo-1.6.7p5-strip.patch
+# Default sudoers
+Patch4: sudo-1.6.8p12-env-reset.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -30,6 +32,7 @@
 %setup -q
 %patch2 -p1 -b .sess
 %patch3 -p1 -b .strip
+%patch4 -p1 -b .env_reset
 
 %build
 %ifarch s390 s390x
@@ -92,6 +95,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Wed Feb  8 2006 Karel Zak <kzak at redhat.com> 1.6.8p12-4
+- reset env. by default
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.8p12-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:36:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:36:27 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.48,1.49
Message-ID: <200602081636.k18GaREX007684@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
RPM variables that use local shell variables still not defined -> insanity


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kernel-xen.spec	8 Feb 2006 16:09:25 -0000	1.48
+++ kernel-xen.spec	8 Feb 2006 16:36:24 -0000	1.49
@@ -25,7 +25,7 @@
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
-%define kernel_image arch/$Arch/boot/bzImage
+%define kernel_image x86
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -1083,6 +1083,9 @@
     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 include/linux/version.h 
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:48:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:48:10 -0500
Subject: rpms/gail/devel gail-1.8.8-combobox-name.patch, NONE, 1.1 gail.spec,
	1.32, 1.33
Message-ID: <200602081648.k18GmACN025324@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25177

Modified Files:
	gail.spec 
Added Files:
	gail-1.8.8-combobox-name.patch 
Log Message:
Fix a a11y gimp crash


gail-1.8.8-combobox-name.patch:
 gailcombobox.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gail-1.8.8-combobox-name.patch ---
--- gail-1.8.8/gail/gailcombobox.c.combobox-name	2005-11-28 13:02:45.000000000 -0500
+++ gail-1.8.8/gail/gailcombobox.c	2006-02-08 11:40:01.000000000 -0500
@@ -242,6 +242,7 @@
   combo_box = GTK_COMBO_BOX (widget);
   gail_combo_box = GAIL_COMBO_BOX (obj);
   g_free (gail_combo_box->name);
+  gail_combo_box->name = NULL;
   if (gtk_combo_box_get_active_iter (combo_box, &iter))
     {
       model = gtk_combo_box_get_model (combo_box);
@@ -253,9 +254,12 @@
           gtk_tree_model_get_value (model, &iter, i, &value);
           if (G_VALUE_HOLDS_STRING (&value))
             {
-              gail_combo_box->name =  (gchar *) g_value_get_string (&value);
+              gail_combo_box->name = (gchar *) g_value_dup_string (&value);
+	      g_value_unset (&value);
               break;
             }
+
+	  g_value_unset (&value);	  
         }
     }
   return gail_combo_box->name;


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gail.spec	7 Feb 2006 11:42:45 -0000	1.32
+++ gail.spec	8 Feb 2006 16:48:06 -0000	1.33
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.8
-Release: 1.2
+Release: 2
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -16,11 +16,13 @@
 Requires: gtk2 >= %{gtk2_version}
 Requires: libgnomecanvas >= %{libgnomecanvas_version}
 
-BuildRequires: libtool automake autoconf gtk-doc
+BuildRequires: libtool automake autoconf 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
 
+Patch0: gail-1.8.8-combobox-name.patch
+
 %description
 GAIL implements the abstract interfaces found in ATK for GTK+ and
 GNOME libraries, enabling accessibility technologies such as at-spi to
@@ -41,6 +43,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .combobox-name
 
 %build
 libtoolize --force
@@ -48,7 +51,7 @@
 automake
 autoconf
 autoheader
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 
 make ##%{?_smp_mflags}
 
@@ -83,6 +86,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.8-2
+- Avoid crashing the gimp
+- Use api docs from tarball
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.8-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 16:51:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 11:51:31 -0500
Subject: rpms/gail/devel gail.spec,1.33,1.34
Message-ID: <200602081651.k18GpVw6026865@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26807

Modified Files:
	gail.spec 
Log Message:
bump rev



Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gail.spec	8 Feb 2006 16:48:06 -0000	1.33
+++ gail.spec	8 Feb 2006 16:51:28 -0000	1.34
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.8
-Release: 2
+Release: 3
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -86,7 +86,7 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.8-2
+* Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.8-3
 - Avoid crashing the gimp
 - Use api docs from tarball
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 17:13:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 12:13:26 -0500
Subject: rpms/rhpxl/devel .cvsignore, 1.16, 1.17 rhpxl.spec, 1.18,
	1.19 sources, 1.18, 1.19
Message-ID: <200602081713.k18HDQdi023007@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22992

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 Feb 2006 22:10:38 -0000	1.16
+++ .cvsignore	8 Feb 2006 17:13:24 -0000	1.17
@@ -2,3 +2,4 @@
 rhpxl-0.11.tar.gz
 rhpxl-0.12.tar.gz
 rhpxl-0.13.tar.gz
+rhpxl-0.14.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rhpxl.spec	1 Feb 2006 22:10:38 -0000	1.18
+++ rhpxl.spec	8 Feb 2006 17:13:24 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.13
+Version: 0.14
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -14,6 +14,7 @@
 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
+Requires: xorg-x11-server-Xorg >= 1.0.1-6
 Conflicts: libXfont < 0.99.2-2
 
 %description
@@ -39,10 +40,12 @@
 %defattr(-,root,root)
 %doc README ChangeLog COPYING
 %{python_sitelib}/rhpxl
-%{_datadir}/rhpxl
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Feb 08 2006 Chris Lumens <clumens at redhat.com> 0.14-1
+- Remove modes data since this is now in the X server package.
+
 * Wed Feb 01 2006 Chris Lumens <clumens at redhat.com> 0.13-1
 - Add aspect ratio patch from Jef Spaleta <jspaleta AT gmail.com> (#158143).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	1 Feb 2006 22:10:38 -0000	1.18
+++ sources	8 Feb 2006 17:13:24 -0000	1.19
@@ -1 +1 @@
-34d8b74f9cf4ee9fdd978e69d5b6a4af  rhpxl-0.13.tar.gz
+d1d567541b573e7c8395235933055397  rhpxl-0.14.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  8 17:14:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 12:14:45 -0500
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.23,1.24
Message-ID: <200602081714.k18HEjYH023078@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/cdparanoia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23061

Modified Files:
	cdparanoia.spec 
Log Message:
- rebuilt 



Index: cdparanoia.spec
===================================================================
RCS file: /cvs/dist/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cdparanoia.spec	7 Feb 2006 11:13:17 -0000	1.23
+++ cdparanoia.spec	8 Feb 2006 17:14:43 -0000	1.24
@@ -3,7 +3,7 @@
 
 Name: cdparanoia
 Version: %{realver}
-Release: 26.2
+Release: 27
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
@@ -123,6 +123,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Wed Feb 08 2006 Monty Montgomery <cmontgom at redhat.com> - alpha9.8-27
+- rebuilt 
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - alpha9.8-26.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 18:40:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 13:40:08 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.239,1.240
Message-ID: <200602081840.k18Ie8o7029137@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29104

Modified Files:
	eclipse.spec 
Log Message:
Tweak swt-gtk symlinks (rh#180000).


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- eclipse.spec	7 Feb 2006 23:04:50 -0000	1.239
+++ eclipse.spec	8 Feb 2006 18:40:05 -0000	1.240
@@ -730,10 +730,10 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
 #ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
-#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk.jar
+#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
 # SWT is still a 3.1.1 jar ... (rh#180000)
 ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar swt-gtk-3.1.1.jar
-ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk.jar
+ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk-%{eclipse_majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 18:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 13:45:50 -0500
Subject: rpms/gtk2/devel gtk+-2.8.11-double-free.patch, NONE, 1.1 gtk2.spec,
	1.119, 1.120
Message-ID: <200602081845.k18Ijogb002410@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.8.11-double-free.patch 
Log Message:
Fix a double-free


gtk+-2.8.11-double-free.patch:
 gtkfilesystem.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gtk+-2.8.11-double-free.patch ---
--- gtk+-2.8.11/gtk/gtkfilesystem.c.double-free	2006-02-08 13:43:19.000000000 -0500
+++ gtk+-2.8.11/gtk/gtkfilesystem.c	2006-02-08 13:43:44.000000000 -0500
@@ -86,6 +86,8 @@
   new_info = g_memdup (info, sizeof (GtkFileInfo));
   if (new_info->display_name)
     new_info->display_name = g_strdup (new_info->display_name);
+  if (new_info->display_key)
+    new_info->display_key = g_strdup (new_info->display_key);
   if (new_info->mime_type)
     new_info->mime_type = g_strdup (new_info->mime_type);
 


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gtk2.spec	7 Feb 2006 16:20:06 -0000	1.119
+++ gtk2.spec	8 Feb 2006 18:45:46 -0000	1.120
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 6
+Release: 7
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -30,6 +30,9 @@
 # Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320
 # fixed in 2.8.12
 Patch4: render-avoid-repeat.patch
+# Fix a double free in the file chooser
+# fixed in 2.8.12
+Patch5: gtk+-2.8.11-double-free.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -94,6 +97,7 @@
 %patch1 -p1 -b .inputmethod
 %patch3 -p1 -b .set-invisible-char-to-bullet
 %patch4 -p1 -b .render-avoid-repeat
+%patch5 -p1 -b .double-free
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -263,6 +267,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Wed Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-7
+- Fix a double free in the file chooser
+
 * Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> 2.8.11-6
 - Fix up jkeating's recent %%changelog entry to match this spec's style
 - Make the devel package Require %%{version}-%%{release}



From fedora-cvs-commits at redhat.com  Wed Feb  8 19:24:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 14:24:33 -0500
Subject: rpms/util-linux/devel util-linux-2.13-rmparts.patch, NONE,
	1.1 util-linux.spec, 1.104, 1.105
Message-ID: <200602081924.k18JOXl3031742@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31680

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-rmparts.patch 
Log Message:
- add "blockdev --rmpart N <device>" and "blockdev --rmparts <device>"


util-linux-2.13-rmparts.patch:
 blockdev.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+)

--- NEW FILE util-linux-2.13-rmparts.patch ---
--- util-linux-2.13-pre6/disk-utils/blockdev.c.rmparts	2006-02-08 14:10:48.000000000 -0500
+++ util-linux-2.13-pre6/disk-utils/blockdev.c	2006-02-08 14:19:31.000000000 -0500
@@ -29,6 +29,28 @@
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif
 
+#ifndef BLKPG
+#define BLKPG _IO(0x12,105)
+#define BLKPG_DEL_PARTITION 2
+#define BLKPG_DEVNAMELTH 64
+#define BLKPG_VOLNAMELTH 64
+
+struct blkpg_partition {
+	long long start;
+	long long length;
+	long long pno;
+	char devname[BLKPG_DEVNAMELTH];
+	char volname[BLKPG_VOLNAMELTH];
+};
+
+struct blkpg_ioctl_arg {
+	int op;
+	int flags;
+	int datalen;
+	void *data;
+};
+#endif
+
 /* Maybe <linux/hdreg.h> could be included */
 #ifndef HDIO_GETGEO
 #define HDIO_GETGEO 0x0301
@@ -93,6 +115,10 @@
 	{ "--rereadpt", "BLKRRPART", BLKRRPART, ARGNONE, 0, NULL,
 	  N_("reread partition table") },
 #endif
+#ifdef BLKPG
+	{ "--rmpart", "BLKPG", BLKPG, ARGINTAP, 0, "PARTNO", N_("disable partition") },
+	{ "--rmparts", "BLKPG", BLKPG, ARGNONE, 0, NULL, N_("disable all partitions") },
+#endif
 };
 
 #define SIZE(a)	(sizeof(a)/sizeof((a)[0]))
@@ -144,6 +170,35 @@
 	return 0;
 }
 
+#ifdef BLKPG
+static int
+disable_partition(int fd, int partno) {
+	struct blkpg_partition part = {
+		.pno = partno,
+	};
+	struct blkpg_ioctl_arg io = {
+		.op = BLKPG_DEL_PARTITION,
+		.datalen = sizeof(part),
+		.data = &part,
+	};
+	int res;
+
+	res = ioctl(fd, BLKPG, &io);
+	if (res < 0)
+		return 0;
+	return 1;
+}
+
+static int
+disable_partitions(int fd) {
+	int p, res = 0;
+
+	for (p = 1; p <= 256; p++)
+		res += disable_partition(fd, p);
+	return res ? 0 : -1;
+}
+#endif
+
 void do_commands(int fd, char **argv, int d);
 void report_header(void);
 void report_device(char *device, int quiet);
@@ -259,6 +314,12 @@
 		switch(bdcms[j].argtype) {
 		default:
 		case ARGNONE:
+#ifdef BLKPG
+			if (bdcms[j].ioc == BLKPG) {
+				res = disable_partitions(fd);
+				break;
+			}
+#endif
 			res = ioctl(fd, bdcms[j].ioc, 0);
 			break;
 		case ARGINTA:
@@ -276,6 +337,13 @@
 					bdcms[j].name);
 				usage();
 			}
+#ifdef BLKPG
+			if (bdcms[j].ioc == BLKPG) {
+				iarg = atoi(argv[++i]);
+				res = disable_partition(fd, iarg) ? 0 : -1;
+				break;
+			}
+#endif
 			iarg = atoi(argv[++i]);
 			res = ioctl(fd, bdcms[j].ioc, &iarg);
 			break;


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- util-linux.spec	7 Feb 2006 14:11:38 -0000	1.104
+++ util-linux.spec	8 Feb 2006 19:24:29 -0000	1.105
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.14.1
+Release: 0.15
 License: distributable
 Group: System Environment/Base
 
@@ -167,6 +167,8 @@
 Patch221: util-linux-2.12p-col-EILSEQ.patch
 # 174111 - mount allows loopback devices to be mounted more than once to the same mount point
 Patch222: util-linux-2.13-mount-twiceloop.patch
+# nobug - add --rmpart N and --rmparts
+Patch223: util-linux-2.13-rmparts.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -241,6 +243,7 @@
 %patch220 -p1
 %patch221 -p1
 %patch222 -p1
+%patch223 -p1
 
 %build
 unset LINGUAS || :
@@ -624,6 +627,9 @@
 /sbin/losetup
 
 %changelog
+* Wed Feb  8 2006 Peter Jones <pjones at redhat.com> 2.13-0.15
+- add "blockdev --rmpart N <device>" and "blockdev --rmparts <device>"
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.14.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 19:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 14:27:41 -0500
Subject: rpms/firstboot/devel .cvsignore, 1.46, 1.47 firstboot.spec, 1.65,
	1.66 sources, 1.62, 1.63
Message-ID: <200602081927.k18JRfJM000752@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/firstboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv672

Modified Files:
	.cvsignore firstboot.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	6 Feb 2006 17:03:06 -0000	1.46
+++ .cvsignore	8 Feb 2006 19:27:38 -0000	1.47
@@ -18,3 +18,4 @@
 firstboot-1.4.1.tar.bz2
 firstboot-1.4.2.tar.bz2
 firstboot-1.4.3.tar.bz2
+firstboot-1.4.4.tar.bz2


Index: firstboot.spec
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- firstboot.spec	6 Feb 2006 17:03:07 -0000	1.65
+++ firstboot.spec	8 Feb 2006 19:27:38 -0000	1.66
@@ -1,6 +1,6 @@
 Summary: Initial system configuration utility
 Name: firstboot
-Version: 1.4.3
+Version: 1.4.4
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -108,6 +108,10 @@
 
 
 %changelog
+* Wed Feb 08 2006 Chris Lumens <clumens at redhat.com> 1.4.4-1
+- Get rid of chkconfig --off calls.
+- Smarter checking for if we need to reboot or not.
+
 * Mon Feb 06 2006 Chris Lumens <clumens at redhat.com> 1.4.3-1
 - Tweak firstboot-tui requires to not require X (#180046).
 - Wrap left side labels if they're too long.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firstboot/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	6 Feb 2006 17:03:07 -0000	1.62
+++ sources	8 Feb 2006 19:27:38 -0000	1.63
@@ -1 +1 @@
-dd30d0d5563c3549adbba86db6134a5d  firstboot-1.4.3.tar.bz2
+239772c08b12679666a1af3ced0c266c  firstboot-1.4.4.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  8 19:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 14:57:08 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.136,
	1.137
Message-ID: <200602081957.k18Jv8tb023261@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-serv23135

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Wed Feb  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_78rh
- Install javadocs in versioned directory.




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.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- java-1.4.2-gcj-compat.spec	7 Feb 2006 12:19:04 -0000	1.136
+++ java-1.4.2-gcj-compat.spec	8 Feb 2006 19:57:05 -0000	1.137
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_77rh
+%define release 	40jpp_78rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -123,9 +123,10 @@
 
 %package javadoc
 Summary:	API documentation for libgcj
-Group:		Development/Libraries
+Group:		Development/Documentation
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	java-javadoc = %{epoch}:%{version}-%{release}
+Provides:	java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
 
 %description javadoc
 This package installs Javadoc API documentation for libgcj.
@@ -277,7 +278,8 @@
 %endif
 
 # build and install api documentation
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/java
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+touch $RPM_BUILD_ROOT%{_javadocdir}/{%{name},java}
 mkdir docsbuild
 pushd docsbuild
 # work around ppc64 file system corruption
@@ -287,11 +289,11 @@
     rm -rf gnu
     find ./ -name \*.java | xargs -n 1 dirname | sort | uniq | sed -e "s/\.\///" | sed -e "s/\//\./" | \
       sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | sed -e "s/\//\./" | \
-      xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/java -encoding UTF-8 -breakiterator -licensetext \
+      xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -encoding UTF-8 -breakiterator -licensetext \
         -linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
         -windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'` Documentation"
   else
-    touch $RPM_BUILD_ROOT%{_javadocdir}/java/package-list
+    touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
   fi
 popd
 
@@ -422,6 +424,11 @@
   %{_javadir}/src-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.zip \
   %{_jvmdir}/%{cname}-%{version}/src.zip
 
+%post javadoc
+rm -f %{_javadocdir}/%{name} %{_javadocdir}/java
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/java
+
 %postun
 if [ $1 -eq 0 ] ; then
 
@@ -586,9 +593,14 @@
 
 %files javadoc
 %defattr(-,root,root)
-%{_javadocdir}/java
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
+%ghost %doc %{_javadocdir}/java
 
 %changelog
+* Wed Feb  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_78rh
+- Install javadocs in versioned directory.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.2.0-40jpp_77rh
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:04:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:04:45 -0500
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.50,
	1.51 sources, 1.62, 1.63 system-config-securitylevel.spec,
	1.72, 1.73
Message-ID: <200602082004.k18K4jaS024479@cvs.devel.redhat.com>

Author: clumens

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

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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Jan 2006 19:12:26 -0000	1.50
+++ .cvsignore	8 Feb 2006 20:04:38 -0000	1.51
@@ -38,3 +38,4 @@
 system-config-securitylevel-1.6.12.tar.bz2
 system-config-securitylevel-1.6.13.tar.bz2
 system-config-securitylevel-1.6.14.tar.bz2
+system-config-securitylevel-1.6.15.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	27 Jan 2006 19:12:26 -0000	1.62
+++ sources	8 Feb 2006 20:04:39 -0000	1.63
@@ -1 +1 @@
-65a9b4dc7a374df95e865d91d81d93ef  system-config-securitylevel-1.6.14.tar.bz2
+4438dc3db0910fe0cadff8d90efbcfde  system-config-securitylevel-1.6.15.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- system-config-securitylevel.spec	7 Feb 2006 13:56:35 -0000	1.72
+++ system-config-securitylevel.spec	8 Feb 2006 20:04:39 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.14
-Release: 1.1
+Version: 1.6.15
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -96,6 +96,12 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 1.6.15-1
+- Fix firstboot warnings.
+- Make other services box look better.
+- Force reboot if SELinux is changed from enabled to disabled in
+  firstboot (#177639).
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.14-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:06:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:06:51 -0500
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.24,1.25
Message-ID: <200602082006.k18K6pIf024827@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/cdparanoia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24786

Modified Files:
	cdparanoia.spec 
Log Message:
- fix patch 10's backup file



Index: cdparanoia.spec
===================================================================
RCS file: /cvs/dist/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cdparanoia.spec	8 Feb 2006 17:14:43 -0000	1.24
+++ cdparanoia.spec	8 Feb 2006 20:06:47 -0000	1.25
@@ -63,7 +63,7 @@
 %patch7 -p1 -b .verbosity3
 %patch8 -p1 -b .env
 %patch9 -p1 -b .smalldma
-%patch10 -p1
+%patch10 -p1 -b .lm
 
 %build
 rm -rf $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:07:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:07:05 -0500
Subject: rpms/kernel/devel/configs config-s390-generic,1.8,1.9
Message-ID: <200602082007.k18K75eQ024884@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-s390-generic 
Log Message:
make qeth work again



Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-s390-generic	8 Jan 2006 01:59:04 -0000	1.8
+++ config-s390-generic	8 Feb 2006 20:07:01 -0000	1.9
@@ -173,3 +173,5 @@
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
 
+# Breaks qeth (Feb 8th 2006)
+# CONFIG_DEBUG_SLAB is not set



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:13:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:13:26 -0500
Subject: rpms/kernel/devel .cvsignore, 1.341, 1.342 kernel-2.6.spec, 1.1919,
	1.1920 sources, 1.283, 1.284 upstream, 1.257, 1.258
Message-ID: <200602082013.k18KDQnf027538@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
git6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- .cvsignore	8 Feb 2006 15:42:36 -0000	1.341
+++ .cvsignore	8 Feb 2006 20:13:23 -0000	1.342
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git4.bz2
+patch-2.6.16-rc2-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1919
retrieving revision 1.1920
diff -u -r1.1919 -r1.1920
--- kernel-2.6.spec	8 Feb 2006 15:42:36 -0000	1.1919
+++ kernel-2.6.spec	8 Feb 2006 20:13:23 -0000	1.1920
@@ -205,7 +205,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git4.bz2
+Patch2: patch-2.6.16-rc2-git6.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1395,7 +1395,7 @@
 
 %changelog
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git4
+- 2.6.16rc2-git6
 
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - Touch NMI watchdogs in printk pauser.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- sources	8 Feb 2006 15:42:37 -0000	1.283
+++ sources	8 Feb 2006 20:13:24 -0000	1.284
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-8765513beeeea79a19a9670e4c95685c  patch-2.6.16-rc2-git4.bz2
+7ee40eba40c5e4ad35f187839b9306b3  patch-2.6.16-rc2-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- upstream	8 Feb 2006 15:42:37 -0000	1.257
+++ upstream	8 Feb 2006 20:13:24 -0000	1.258
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git4.bz2
+patch-2.6.16-rc2-git6.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:13:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:13:42 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git6.bz2.sign, NONE,
	1.1 patch-2.6.16-rc2-git4.bz2.sign, 1.1, NONE
Message-ID: <200602082013.k18KDgf2027677@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.16-rc2-git6.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git4.bz2.sign 
Log Message:
signs



--- NEW FILE patch-2.6.16-rc2-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD6kAsyGugalF9Dw4RAqFIAJwJIvpDdtq1CDaNfomr33LSy6iUbgCeOxoe
oH+C6gOlNzlgXcve3PjtfU8=
=MxGR
-----END PGP SIGNATURE-----


--- patch-2.6.16-rc2-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb  8 20:19:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 15:19:08 -0500
Subject: rpms/parted/devel parted-1.6.25-dm.patch,1.4,1.5
Message-ID: <200602082019.k18KJ8U2010052@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9964

Modified Files:
	parted-1.6.25-dm.patch 
Log Message:
- fix dm partition naming.  again.


parted-1.6.25-dm.patch:
 configure.in            |   12 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/linux.c       |  341 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 354 insertions(+), 3 deletions(-)

Index: parted-1.6.25-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.6.25-dm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- parted-1.6.25-dm.patch	7 Feb 2006 23:11:21 -0000	1.4
+++ parted-1.6.25-dm.patch	8 Feb 2006 20:19:05 -0000	1.5
@@ -174,7 +174,15 @@
  	case PED_DEVICE_UNKNOWN:
  		if (!init_generic (dev, _("Unknown")))
  			goto error_free_arch_specific;
-@@ -1836,6 +1935,243 @@
+@@ -1624,6 +1723,7 @@
+ 	} else if (dev->type == PED_DEVICE_DAC960
+ 			|| dev->type == PED_DEVICE_CPQARRAY
+ 			|| dev->type == PED_DEVICE_ATARAID
++			|| dev->type == PED_DEVICE_DM
+ 			|| isdigit (dev->path[path_len - 1]))
+ 	        snprintf (result, result_len, "%sp%d", dev->path, num);
+ 	else
+@@ -1836,6 +1936,243 @@
  }
  
  static int
@@ -348,7 +356,7 @@
 +		if (vol_name && *vol_name && *(++vol_name))
 +			vol_name = strdup (vol_name);
 +		else
-+			asprintf (&vol_name, "%sp%d", dev_name, part->num);
++			vol_name = strdup (dev_name);
 +		if (!vol_name)
 +			return 0;
 +	}
@@ -418,7 +426,7 @@
  _kernel_reread_part_table (PedDevice* dev)
  {
  	LinuxSpecific*	arch_specific = LINUX_SPECIFIC (dev);
-@@ -1878,7 +2214,9 @@
+@@ -1878,7 +2215,9 @@
  static int
  linux_disk_commit (PedDisk* disk)
  {



From fedora-cvs-commits at redhat.com  Wed Feb  8 21:07:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 16:07:10 -0500
Subject: rpms/kernel-xen/devel .cvsignore, 1.15, 1.16 kernel-xen.spec, 1.49,
	1.50 sources, 1.15, 1.16
Message-ID: <200602082107.k18L7AQq008103@cvs.devel.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore kernel-xen.spec sources 
Log Message:
* Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com> 
- update to newer hypervisor snapshot, conflict with older tools
- fix pae hypervisor new-kernel-pkg call



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Feb 2006 23:44:22 -0000	1.15
+++ .cvsignore	8 Feb 2006 21:06:58 -0000	1.16
@@ -2,6 +2,6 @@
 temp-*
 kernel-xen-2.6.15
 linux-2.6.15.tar.bz2
-xen-20060202.tar.bz2
 patch-2.6.16-rc2.bz2
 patch-2.6.16-rc2-git3.bz2
+xen-20060208.tar.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kernel-xen.spec	8 Feb 2006 16:36:24 -0000	1.49
+++ kernel-xen.spec	8 Feb 2006 21:06:58 -0000	1.50
@@ -6,7 +6,7 @@
 %define buildup 0
 %define buildsmp 0
 %define includexen 1
-%define includexenPAE 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -50,7 +50,7 @@
 %ifarch i686
 %define buildxen %{includexen}
 %define buildxenPAE %{includexenPAE}
-%define buildkdump 1
+%define buildkdump 0
 %else
 %define buildxen 0
 %define buildxenPAE 0
@@ -182,7 +182,7 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source1: xen-20060202.tar.bz2
+Source1: xen-20060208.tar.bz2
 Source2: Config.mk
 
 Source10: COPYING.modules
@@ -1366,7 +1366,7 @@
 
 %post hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor-PAE
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-PAE-devel
@@ -1592,6 +1592,10 @@
 %endif
 
 %changelog
+* Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com> 
+- update to newer hypervisor snapshot, conflict with older tools
+- fix pae hypervisor new-kernel-pkg call
+
 * Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
 - make_target & kernel_image passed as arguments to BuildKernel.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	7 Feb 2006 23:44:22 -0000	1.15
+++ sources	8 Feb 2006 21:06:59 -0000	1.16
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-9a0a0e3c3ad5d049fcd29fb913d6c3a6  xen-20060202.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 a1e8c0cbebb73561c1d7eae45b5d6ee6  patch-2.6.16-rc2-git3.bz2
+30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb  8 21:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 16:14:18 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.50,1.51
Message-ID: <200602082114.k18LEICw000375@cvs.devel.redhat.com>

Author: katzj

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

Modified Files:
	kernel-xen.spec 
Log Message:
really commit the conflict


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kernel-xen.spec	8 Feb 2006 21:06:58 -0000	1.50
+++ kernel-xen.spec	8 Feb 2006 21:14:16 -0000	1.51
@@ -145,7 +145,7 @@
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
 #
-%define xen_conflicts glibc < 2.3.5-1
+%define xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
 #
 # Packages that need to be installed before the kernel is, because the %post



From fedora-cvs-commits at redhat.com  Wed Feb  8 22:03:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 17:03:58 -0500
Subject: rpms/xorg-x11-server/devel comment-header-modefiles.txt, NONE,
	1.1 xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, NONE,
	1.1 xorg-x11-server.spec, 1.39, 1.40
Message-ID: <200602082203.k18M3wr0014989@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14953

Modified Files:
	xorg-x11-server.spec 
Added Files:
	comment-header-modefiles.txt 
	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 
Log Message:
* Wed Feb  8 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)
- Install a copy of the vesamodes and extramodes files which contain the list
  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)



--- NEW FILE comment-header-modefiles.txt ---
//
// IMPORTANT NOTE:  DO NOT HAND EDIT THIS FILE
//
// The "vesamodes" and "extramodes" files in this directory are read-only,
// and are provided for the Red Hat config tools to have access to the list
// of video modes which are hard coded into the Xorg X server at compile
// time.  Do not add video modes to these files, as the X server does not
// read them, so any modes added will be ignored, and will potentially
// confuse the config tools, or cause them to generate non-working config
// files.  If you wish to add custom modelines to the X server, you can
// do so in the X server config file "xorg.conf".
//
///////////////////////////////////////////////////////////////////////////




xorg-x11-server-1.0.1-Red-Hat-extramodes.patch:
 extramodes |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 113 insertions(+)

--- NEW FILE xorg-x11-server-1.0.1-Red-Hat-extramodes.patch ---
--- hw/xfree86/common/extramodes.redhat-custom-modelines	2002-11-10 23:21:46.000000000 -0500
+++ hw/xfree86/common/extramodes	2002-11-23 06:29:45.000000000 -0500
@@ -10,15 +10,27 @@
 # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
 ModeLine "1152x768"   64.995 1152 1178 1314 1472  768  771  777  806 +hsync +vsync
 
+# 1152x864 @ 85Hz (Red Hat custom modeline)
+ModeLine "1152x864"  121.5 1152 1216 1344 1568    864  865  868  911 +hsync -vsync
+
 # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
 ModeLine "1400x1050" 122.0 1400 1488 1640 1880   1050 1052 1064 1082 +hsync +vsync
 
+# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz
+ModeLine "1400x1050" 151.0 1400 1464 1656 1960   1050 1051 1054 1100 +hsync +vsync
+
 # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
 ModeLine "1400x1050" 155.8 1400 1464 1784 1912   1050 1052 1064 1090 +hsync +vsync
 
+# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
+ModeLine "1400x1050" 184.0 1400 1464 1656 1960   1050 1051 1054 1100 +hsync +vsync
+
 # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
 Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
 
+# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz
+Modeline "1920x1200" 230.0   1920 1936 2096 2528  1200 1201 1204 1250 -HSync -VSync
+
 # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
 Modeline "1920x1440" 341.35  1920 2072 2288 2656  1440 1441 1444 1512 -hsync +vsync
 
@@ -31,3 +43,104 @@
 # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
 Modeline "2048x1536" 388.04  2048 2216 2440 2832  1536 1537 1540 1612 -hsync +vsync
 
+# 848x480 @ 60.00 Hz (GTF) hsync: 29.82 kHz; pclk: 31.49 MHz
+Modeline "848x480"  31.49  848 864 952 1056  480 481 484 497  -HSync +Vsync
+
+# 848x480 @ 70.00 Hz (GTF) hsync: 35.00 kHz; pclk: 37.52 MHz
+Modeline "848x480"  37.52  848 872 960 1072  480 481 484 500  -HSync +Vsync
+
+# 848x480 @ 75.00 Hz (GTF) hsync: 37.65 kHz; pclk: 40.96 MHz
+Modeline "848x480"  40.96  848 880 968 1088  480 481 484 502  -HSync +Vsync
+
+# 848x480 @ 85.00 Hz (GTF) hsync: 42.92 kHz; pclk: 47.39 MHz
+Modeline "848x480"  47.39  848 888 976 1104  480 481 484 505  -HSync +Vsync
+
+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
+Modeline "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
+
+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz
+Modeline "1152x864"  96.77  1152 1224 1344 1536  864 865 868 900  -HSync +Vsync
+
+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz
+Modeline "1152x864"  104.99  1152 1224 1352 1552  864 865 868 902  -HSync +Vsync
+
+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
+Modeline "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
+
+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz
+Modeline "1400x1050"  145.06  1400 1496 1648 1896  1050 1051 1054 1093  -HSync +Vsync
+
+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
+Modeline "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
+
+# 1280x800 @ 60.00 Hz (GTF) hsync: 49.68 kHz; pclk: 83.46 MHz
+Modeline "1280x800"  83.46  1280 1344 1480 1680  800 801 804 828  -HSync +Vsync
+
+# 1280x800 @ 70.00 Hz (GTF) hsync: 58.31 kHz; pclk: 98.89 MHz
+Modeline "1280x800"  98.89  1280 1352 1488 1696  800 801 804 833  -HSync +Vsync
+
+# 1280x800 @ 75.00 Hz (GTF) hsync: 62.62 kHz; pclk: 107.21 MHz
+Modeline "1280x800"  107.21  1280 1360 1496 1712  800 801 804 835  -HSync +Vsync
+
+# 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 @ 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 @ 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
+
+# 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
+
+# 1280x720 @ 70.00 Hz (GTF) hsync: 52.50 kHz; pclk: 89.04 MHz
+Modeline "1280x720"  89.04  1280 1352 1488 1696  720 721 724 750  -HSync +Vsync
+
+# 1280x720 @ 75.00 Hz (GTF) hsync: 56.40 kHz; pclk: 95.65 MHz
+Modeline "1280x720"  95.65  1280 1352 1488 1696  720 721 724 752  -HSync +Vsync
+
+# 1280x720 @ 85.00 Hz (GTF) hsync: 64.26 kHz; pclk: 110.01 MHz
+Modeline "1280x720"  110.01  1280 1360 1496 1712  720 721 724 756  -HSync +Vsync
+
+# 1280x768 @ 60.00 Hz (GTF) hsync: 47.70 kHz; pclk: 80.14 MHz
+Modeline "1280x768"  80.14  1280 1344 1480 1680  768 769 772 795  -HSync +Vsync
+
+# 1280x768 @ 70.00 Hz (GTF) hsync: 56.00 kHz; pclk: 94.98 MHz
+Modeline "1280x768"  94.98  1280 1352 1488 1696  768 769 772 800  -HSync +Vsync
+
+# 1280x768 @ 75.00 Hz (GTF) hsync: 60.15 kHz; pclk: 102.98 MHz
+Modeline "1280x768"  102.98  1280 1360 1496 1712  768 769 772 802  -HSync +Vsync
+
+# 1280x768 @ 85.00 Hz (GTF) hsync: 68.60 kHz; pclk: 118.53 MHz
+Modeline "1280x768"  118.53  1280 1368 1504 1728  768 769 772 807  -HSync +Vsync
+
+# 1920x1200 @ 60.00 Hz (GTF) hsync: 74.52 kHz; pclk: 193.16 MHz
+Modeline "1920x1200"  193.16  1920 2048 2256 2592  1200 1201 1204 1242  -HSync +Vsync
+
+# 1920x1200 @ 70.00 Hz (GTF) hsync: 87.43 kHz; pclk: 228.02 MHz
+Modeline "1920x1200"  228.02  1920 2056 2264 2608  1200 1201 1204 1249  -HSync +Vsync
+
+# 1920x1200 @ 75.00 Hz (GTF) hsync: 93.97 kHz; pclk: 246.59 MHz
+Modeline "1920x1200"  246.59  1920 2064 2272 2624  1200 1201 1204 1253  -HSync +Vsync
+
+# 1920x1200 @ 85.00 Hz (GTF) hsync: 107.10 kHz; pclk: 282.74 MHz
+Modeline "1920x1200"  282.74  1920 2072 2280 2640  1200 1201 1204 1260  -HSync +Vsync
+
+# 2560x1600 @ 60.00 Hz (GTF) hsync: 99.36 kHz; pclk: 348.16 MHz
+Modeline "2560x1600"  348.16  2560 2752 3032 3504  1600 1601 1604 1656  -HSync +Vsync
+
+# 2560x1600 @ 70.00 Hz (GTF) hsync: 116.55 kHz; pclk: 410.26 MHz
+Modeline "2560x1600"  410.26  2560 2760 3040 3520  1600 1601 1604 1665  -HSync +Vsync
+
+# 2560x1600 @ 75.00 Hz (GTF) hsync: 125.25 kHz; pclk: 442.88 MHz
+Modeline "2560x1600"  442.88  2560 2768 3048 3536  1600 1601 1604 1670  -HSync +Vsync
+
+# 2560x1600 @ 85.00 Hz (GTF) hsync: 142.80 kHz; pclk: 507.23 MHz
+Modeline "2560x1600"  507.23  2560 2768 3056 3552  1600 1601 1604 1680  -HSync +Vsync


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xorg-x11-server.spec	7 Feb 2006 11:49:56 -0000	1.39
+++ xorg-x11-server.spec	8 Feb 2006 22:03:43 -0000	1.40
@@ -4,13 +4,14 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   5
+Release:   6
 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
+Source100: comment-header-modefiles.txt
 
 Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=5093
@@ -25,6 +26,7 @@
 Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
 
 Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
+Patch1001:  xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
 
 # INFO: We don't ship the X server on s390/s390x/ppc64
 ExcludeArch: s390 s390x ppc64
@@ -238,6 +240,7 @@
 %patch101 -p2 -b .SEGV-on-null-interface
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
+%patch1001 -p0 -b .Red-Hat-extramodes
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -280,6 +283,17 @@
 # Make these directories now so the Xorg package can own them.
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
+# Install the vesamodes and extramodes files to let our install/config tools
+# be able to parse the same modelist as the X server uses (rhpxl).
+{
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
+    for each in vesamodes extramodes ; do
+        install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+        cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+        chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
+    done
+}
+
 # FIXME: Remove unwanted files/dirs
 {
     rm $RPM_BUILD_ROOT%{_bindir}/xorgconfig
@@ -372,6 +386,9 @@
 %{_bindir}/pcitweak
 %endif
 %{_bindir}/scanpci
+%dir %{_datadir}/xorg
+%{_datadir}/xorg/vesamodes
+%{_datadir}/xorg/extramodes
 %dir %{_libdir}/xorg
 %dir %{_libdir}/xorg/modules
 %dir %{_libdir}/xorg/modules/drivers
@@ -496,6 +513,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Wed Feb  8 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)
+- Install a copy of the vesamodes and extramodes files which contain the list
+  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
 - Updated "BuildRequires: mesa-source >= 6.4.2-2" to get fix for (#176976)
 



From fedora-cvs-commits at redhat.com  Wed Feb  8 22:58:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 17:58:39 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.240,1.241
Message-ID: <200602082258.k18Mwdv2027666@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27634

Modified Files:
	eclipse.spec 
Log Message:
foo


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- eclipse.spec	8 Feb 2006 18:40:05 -0000	1.240
+++ eclipse.spec	8 Feb 2006 22:58:35 -0000	1.241
@@ -1276,6 +1276,7 @@
 * Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
 - Use new java-1.4.2-gcj-compat-javadoc package.
 - Always generate debug info when building RPMs (Andrew Haley).
+- Slightly modify swt-gtk symlinks (rh#180000).
 
 * Mon Feb 06 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc
 - Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).



From fedora-cvs-commits at redhat.com  Wed Feb  8 23:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 18:08:03 -0500
Subject: rpms/audit/devel .cvsignore, 1.56, 1.57 audit.spec, 1.77,
	1.78 sources, 1.63, 1.64
Message-ID: <200602082308.k18N83Y9022221@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22207

Modified Files:
	.cvsignore audit.spec sources 
Log Message:
* Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1
- Fix bug in autrace where it didn't run on kernels without file watch support
- Add syslog message to auditd saying what program was started for dispatcher
- Remove audit_send_user from public api
- Fix bug in USER_LOGIN messages where ausearch does not translate
  msg='uid=500: into acct name (#178102).
- Change comm with dispatcher to socketpair from pipe
- Change auditd to use custom daemonize to avoid race in init scripts
- Update error message when deleting a rule that doesn't exist (#176239)
- Call shutdown_dispatcher when auditd stops
- Add new logging function audit_log_semanage_message



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	5 Jan 2006 23:37:48 -0000	1.56
+++ .cvsignore	8 Feb 2006 23:08:01 -0000	1.57
@@ -53,3 +53,4 @@
 audit-1.1.1.tar.gz
 audit-1.1.2.tar.gz
 audit-1.1.3.tar.gz
+audit-1.1.4.tar.gz


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- audit.spec	7 Feb 2006 11:02:55 -0000	1.77
+++ audit.spec	8 Feb 2006 23:08:01 -0000	1.78
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
-Version: 1.1.3
-Release: 1.1
+Version: 1.1.4
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -146,12 +146,24 @@
 
 
 %changelog
+* Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1
+- Fix bug in autrace where it didn't run on kernels without file watch support
+- Add syslog message to auditd saying what program was started for dispatcher
+- Remove audit_send_user from public api
+- Fix bug in USER_LOGIN messages where ausearch does not translate
+  msg='uid=500: into acct name (#178102).
+- Change comm with dispatcher to socketpair from pipe
+- Change auditd to use custom daemonize to avoid race in init scripts
+- Update error message when deleting a rule that doesn't exist (#176239)
+- Call shutdown_dispatcher when auditd stops
+- Add new logging function audit_log_semanage_message
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Thu Jan 5 2006 Steve Grubb <sgrubb at redhat.com> 1.1.3-1
 - Add timestamp to daemon_config messages (#174865)
-- Add error checking of year for aureport & ausearh
+- Add error checking of year for aureport & ausearch
 - Treat af_unix sockets as files for searching and reporting
 - Update capp & lspp rules to combine syscalls for higher performance
 - Adjusted the chkconfig line for auditd to start a little earlier


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	5 Jan 2006 23:37:48 -0000	1.63
+++ sources	8 Feb 2006 23:08:01 -0000	1.64
@@ -1 +1 @@
-ff5be0c2fdc3a28ec4903f64a5587faf  audit-1.1.3.tar.gz
+3a5f2a609b72de4101cc78f28c233a30  audit-1.1.4.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb  8 23:34:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 18:34:08 -0500
Subject: rpms/kernel-xen/devel linux-2.6-xen-acpi.patch,1.1,1.2
Message-ID: <200602082334.k18NY88P013353@cvs.devel.redhat.com>

Author: katzj

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

Modified Files:
	linux-2.6-xen-acpi.patch 
Log Message:
ARGH!  we need this on x86_64 too


linux-2.6-xen-acpi.patch:
 arch/x86_64/kernel/mpparse-xen.c   |    6 +++---
 b/arch/i386/kernel/acpi/boot-xen.c |    6 +++---
 b/arch/i386/kernel/mpparse-xen.c   |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

Index: linux-2.6-xen-acpi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-acpi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-acpi.patch	3 Feb 2006 19:26:04 -0000	1.1
+++ linux-2.6-xen-acpi.patch	8 Feb 2006 23:34:03 -0000	1.2
@@ -57,3 +57,25 @@
  	return gsi;
  }
  
+--- a/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:30:03.000000000 -0500
++++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:32:45.000000000 -0500
+@@ -920,7 +920,7 @@
+ 
+ #define MAX_GSI_NUM	4096
+ 
+-int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
++int mp_register_gsi(u32 gsi, int triggering, int polarity)
+ {
+ 	int			ioapic = -1;
+ 	int			ioapic_pin = 0;
+@@ -991,8 +991,8 @@
+ 	}
+ 
+ 	io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
+-		edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
+-		active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
++		    triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
++		    polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
+ 	return gsi;
+ }
+ 



From fedora-cvs-commits at redhat.com  Wed Feb  8 23:54:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 18:54:27 -0500
Subject: rpms/tanukiwrapper/devel tanukiwrapper-notarget.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200602082354.k18NsRTM001689@cvs.devel.redhat.com>

Author: dbhole

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1442

Modified Files:
	.cvsignore sources 
Added Files:
	tanukiwrapper-notarget.patch 
Log Message:

- Fixed a syntax error in build file patch.
- Moved build file into cvs (was marked as a source file before).



tanukiwrapper-notarget.patch:
 build.xml |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE tanukiwrapper-notarget.patch ---
--- ./build.xml.sav	2004-07-16 10:29:13.000000000 -0400
+++ ./build.xml	2006-02-08 18:51:13.000000000 -0500
@@ -199,8 +199,7 @@
         <javac srcdir="${src.dir}/java" destdir="${build.classes}"
                deprecation="on"
                debug="on"
-               optimize="on"
-               target="1.2"> <!-- The 1.2 target is done so we work with older JVMs -->
+               optimize="on">
             <classpath id="compile.classpath"/>
         </javac>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2005 22:38:03 -0000	1.5
+++ .cvsignore	8 Feb 2006 23:54:24 -0000	1.6
@@ -2,4 +2,3 @@
 wrapper_3.1.1_src
 i386
 *.src.rpm
-tanukiwrapper-notarget.patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 22:38:03 -0000	1.4
+++ sources	8 Feb 2006 23:54:24 -0000	1.5
@@ -1,2 +1 @@
 eb6555c36e5ae6a99eacbd24c376dcf4  wrapper_3.1.1_src-RHCLEAN.tar.bz2
-49f0c1c05e8d3313c13482c065e4cc60  tanukiwrapper-notarget.patch



From fedora-cvs-commits at redhat.com  Thu Feb  9 00:07:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 19:07:01 -0500
Subject: rpms/kernel-xen/devel linux-2.6-xen-acpi.patch,1.2,1.3
Message-ID: <200602090007.k19071IP004735@cvs.devel.redhat.com>

Author: katzj

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

Modified Files:
	linux-2.6-xen-acpi.patch 
Log Message:
missed a hunk


linux-2.6-xen-acpi.patch:
 arch/x86_64/kernel/mpparse-xen.c   |    8 ++++----
 b/arch/i386/kernel/acpi/boot-xen.c |    6 +++---
 b/arch/i386/kernel/mpparse-xen.c   |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

Index: linux-2.6-xen-acpi.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-acpi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-acpi.patch	8 Feb 2006 23:34:03 -0000	1.2
+++ linux-2.6-xen-acpi.patch	9 Feb 2006 00:06:57 -0000	1.3
@@ -58,7 +58,7 @@
  }
  
 --- a/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:30:03.000000000 -0500
-+++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:32:45.000000000 -0500
++++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 19:06:46.000000000 -0500
 @@ -920,7 +920,7 @@
  
  #define MAX_GSI_NUM	4096
@@ -68,6 +68,15 @@
  {
  	int			ioapic = -1;
  	int			ioapic_pin = 0;
+@@ -969,7 +969,7 @@
+ 
+ 	mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
+ 
+-	if (edge_level) {
++	if (triggering == ACPI_LEVEL_SENSITIVE) {
+ 		/*
+ 		 * For PCI devices assign IRQs in order, avoiding gaps
+ 		 * due to unused I/O APIC pins.
 @@ -991,8 +991,8 @@
  	}
  



From fedora-cvs-commits at redhat.com  Thu Feb  9 00:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 19:54:48 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.213, 1.214 anaconda.spec, 1.332,
	1.333 sources, 1.332, 1.333
Message-ID: <200602090054.k190sm9q014544@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14494/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.17-1 on branch devel from anaconda-10.91.17-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- .cvsignore	7 Feb 2006 02:39:24 -0000	1.213
+++ .cvsignore	9 Feb 2006 00:54:45 -0000	1.214
@@ -1 +1 @@
-anaconda-10.91.16.tar.bz2
+anaconda-10.91.17.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- anaconda.spec	7 Feb 2006 02:39:24 -0000	1.332
+++ anaconda.spec	9 Feb 2006 00:54:45 -0000	1.333
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.16
+Version: 10.91.17
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -32,6 +32,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
+Requires: /usr/bin/strip
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system which 
@@ -78,6 +79,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 08 2006 Paul Nasrat <pnasrat at redhat.com> - 10.91.17-1
+- Handle bind mounts correctly (#160911, dcantrel)
+- Upgrade package black list and make upgrades work
+- Disable repo conf for now 
+- loader debuginfo
+- kickstart - suggest fix (#174597, clumens)
+
 * Mon Feb  6 2006 Jeremy Katz <katzj at redhat.com> - 10.91.16-1
 - fix writing out instdata for root password, etc (#180310)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -r1.332 -r1.333
--- sources	7 Feb 2006 02:39:24 -0000	1.332
+++ sources	9 Feb 2006 00:54:45 -0000	1.333
@@ -1 +1 @@
-4aeec18281f7fbf3bcd63729714105f8  anaconda-10.91.16.tar.bz2
+9afeea6c3c1e9261d67d428adc327a36  anaconda-10.91.17.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  9 01:38:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 20:38:37 -0500
Subject: rpms/kernel-xen/devel linux-2.6-percpu-NR_CPUS-hotplug-fix.patch,
	NONE, 1.1 kernel-xen.spec, 1.51, 1.52
Message-ID: <200602090138.k191caZ0023394@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
Log Message:
fix oops on SMP boot (#180535)

linux-2.6-percpu-NR_CPUS-hotplug-fix.patch:
 sched.c |   64 +++++++++++++++++++++++++++++-----------------------------------
 1 files changed, 29 insertions(+), 35 deletions(-)

--- NEW FILE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch ---
--- linux-2.6.15.i686/kernel/sched.c.idle_init	2006-02-08 17:56:50.000000000 -0500
+++ linux-2.6.15.i686/kernel/sched.c	2006-02-08 17:58:57.000000000 -0500
@@ -4437,6 +4437,35 @@ void __devinit init_idle(task_t *idle, i
 {
 	runqueue_t *rq = cpu_rq(cpu);
 	unsigned long flags;
+	prio_array_t *array;
+	int j, k;
+
+	spin_lock_init(&rq->lock);
+	rq->nr_running = 0;
+	rq->active = rq->arrays;
+	rq->expired = rq->arrays + 1;
+	rq->best_expired_prio = MAX_PRIO;
+
+#ifdef CONFIG_SMP
+	rq->sd = NULL;
+	for (j = 1; j < 3; j++)
+		rq->cpu_load[j] = 0;
+	rq->active_balance = 0;
+	rq->push_cpu = 0;
+	rq->migration_thread = NULL;
+	INIT_LIST_HEAD(&rq->migration_queue);
+#endif
+	atomic_set(&rq->nr_iowait, 0);
+
+	for (j = 0; j < 2; j++) {
+		array = rq->arrays + j;
+		for (k = 0; k < MAX_PRIO; k++) {
+			INIT_LIST_HEAD(array->queue + k);
+			__clear_bit(k, array->bitmap);
+		}
+		// delimiter for bitsearch
+		__set_bit(MAX_PRIO, array->bitmap);
+	}
 
 	idle->sleep_avg = 0;
 	idle->array = NULL;
@@ -6110,41 +6139,6 @@ int in_sched_functions(unsigned long add
 
 void __init sched_init(void)
 {
-	runqueue_t *rq;
-	int i, j, k;
-
-	for_each_cpu(i) {
-		prio_array_t *array;
-
-		rq = cpu_rq(i);
-		spin_lock_init(&rq->lock);
-		rq->nr_running = 0;
-		rq->active = rq->arrays;
-		rq->expired = rq->arrays + 1;
-		rq->best_expired_prio = MAX_PRIO;
-
-#ifdef CONFIG_SMP
-		rq->sd = NULL;
-		for (j = 1; j < 3; j++)
-			rq->cpu_load[j] = 0;
-		rq->active_balance = 0;
-		rq->push_cpu = 0;
-		rq->migration_thread = NULL;
-		INIT_LIST_HEAD(&rq->migration_queue);
-#endif
-		atomic_set(&rq->nr_iowait, 0);
-
-		for (j = 0; j < 2; j++) {
-			array = rq->arrays + j;
-			for (k = 0; k < MAX_PRIO; k++) {
-				INIT_LIST_HEAD(array->queue + k);
-				__clear_bit(k, array->bitmap);
-			}
-			// delimiter for bitsearch
-			__set_bit(MAX_PRIO, array->bitmap);
-		}
-	}
-
 	/*
 	 * The boot idle thread does lazy MMU switching as well:
 	 */


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- kernel-xen.spec	8 Feb 2006 21:14:16 -0000	1.51
+++ kernel-xen.spec	9 Feb 2006 01:38:34 -0000	1.52
@@ -371,6 +371,7 @@
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-percpu-NR_CPUS.patch
+Patch1861: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 Patch1870: linux-2.6-net-suppress-msgs.patch
 Patch1880: linux-2.6-fs-namei-deadlock.patch
 Patch1890: linux-2.6-stradis-oops.patch
@@ -957,6 +958,7 @@
 %patch1850 -p1
 # Fix percpu data accesses
 %patch1860 -p1
+%patch1861 -p1
 # Suppress some network layer msgs
 %patch1870 -p1
 # Fix deadlock in do_path_lookup()
@@ -1592,6 +1594,9 @@
 %endif
 
 %changelog
+* Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
+- fix oops on SMP boot (#180535)
+
 * Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com> 
 - update to newer hypervisor snapshot, conflict with older tools
 - fix pae hypervisor new-kernel-pkg call



From fedora-cvs-commits at redhat.com  Thu Feb  9 04:57:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 8 Feb 2006 23:57:44 -0500
Subject: rpms/control-center/devel .cvsignore, 1.35, 1.36 control-center.spec,
	1.124, 1.125 sources, 1.38, 1.39
Message-ID: <200602090457.k194vi5P014269@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14205

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	6 Feb 2006 17:19:37 -0000	1.35
+++ .cvsignore	9 Feb 2006 04:57:41 -0000	1.36
@@ -8,3 +8,4 @@
 control-center-2.13.5.1.tar.bz2
 control-center-2.13.90.tar.bz2
 control-center-2.12.3.tar.bz2
+control-center-2.13.91.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- control-center.spec	7 Feb 2006 11:17:00 -0000	1.124
+++ control-center.spec	9 Feb 2006 04:57:41 -0000	1.125
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.13.90
-Release: 6.1
+Version: 2.13.91
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -36,7 +36,6 @@
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.13.3-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
-Patch9: control-center-2.13.90-broken-es-help.patch
 Patch10: background-no-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -107,7 +106,6 @@
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
-%patch9 -p1 -b .broken-es-help
 %patch10 -p1 -b .no-delay
 
 %build
@@ -230,6 +228,10 @@
 # (also its headers)
 
 %changelog
+* Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+- Reenable Spanish help
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.90-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	6 Feb 2006 17:19:37 -0000	1.38
+++ sources	9 Feb 2006 04:57:41 -0000	1.39
@@ -1,2 +1,2 @@
-bdf783600f3774e1bf0b0ed1f6fd6ba7  control-center-2.13.90.tar.bz2
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
+205c4a6ace4747e4ffb9db44868e755d  control-center-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  9 05:05:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 00:05:57 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1920,1.1921
Message-ID: <200602090505.k1955vK7015655@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
shock horror, s390 busted.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1920
retrieving revision 1.1921
diff -u -r1.1920 -r1.1921
--- kernel-2.6.spec	8 Feb 2006 20:13:23 -0000	1.1920
+++ kernel-2.6.spec	9 Feb 2006 05:05:53 -0000	1.1921
@@ -155,7 +155,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Thu Feb  9 05:11:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 00:11:58 -0500
Subject: rpms/gnome-terminal/devel gnome-terminal-2.13.90-link.patch, NONE,
	1.1 gnome-terminal.spec, 1.31, 1.32
Message-ID: <200602090511.k195BwYP016879@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-terminal.spec 
Added Files:
	gnome-terminal-2.13.90-link.patch 
Log Message:
fix open link menuitems


gnome-terminal-2.13.90-link.patch:
 terminal-screen.c |   57 +++++++++++++++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 30 deletions(-)

--- NEW FILE gnome-terminal-2.13.90-link.patch ---
--- gnome-terminal-2.13.90/src/terminal-screen.c.link	2006-02-09 00:03:29.000000000 -0500
+++ gnome-terminal-2.13.90/src/terminal-screen.c	2006-02-09 00:08:26.000000000 -0500
@@ -1581,37 +1581,35 @@
 
   if (screen->priv->matched_string != NULL) 
     {
-      if (screen->priv->matched_flavor == FLAVOR_EMAIL)
+      if (screen->priv->matched_flavor == FLAVOR_EMAIL &&
+	  strncmp ("mailto:", screen->priv->matched_string, 7))
 	{
-	  if (strncmp ("mailto:", screen->priv->matched_string, 7))
-	    {
-	      menu_item = append_menuitem (screen->priv->popup_menu,
-					   _("_Send Mail To..."),
-					   G_CALLBACK (open_url_callback),
-					   screen);
-
-	      menu_item = append_menuitem (screen->priv->popup_menu,
-					   _("_Copy E-mail Address"),
-					   G_CALLBACK (copy_url_callback),
-					   screen);
-	    }
-	  else
-	    {
-	      menu_item = append_menuitem (screen->priv->popup_menu,
-					   _("_Open Link"),
-					   G_CALLBACK (open_url_callback),
-					   screen);
-
-	      menu_item = append_menuitem (screen->priv->popup_menu,
-					   _("_Copy Link Address"),
-					   G_CALLBACK (copy_url_callback),
-					   screen);
-	    }
+	  menu_item = append_menuitem (screen->priv->popup_menu,
+				       _("_Send Mail To..."),
+				       G_CALLBACK (open_url_callback),
+				       screen);
+
+	  menu_item = append_menuitem (screen->priv->popup_menu,
+				       _("_Copy E-mail Address"),
+				       G_CALLBACK (copy_url_callback),
+				       screen);
+	}
+      else
+	{
+	  menu_item = append_menuitem (screen->priv->popup_menu,
+				       _("_Open Link"),
+				       G_CALLBACK (open_url_callback),
+				       screen);
+
+	  menu_item = append_menuitem (screen->priv->popup_menu,
+				       _("_Copy Link Address"),
+				       G_CALLBACK (copy_url_callback),
+				       screen);
 	}
-
       menu_item = gtk_separator_menu_item_new ();
       gtk_widget_show (menu_item);
-      gtk_menu_shell_append (GTK_MENU_SHELL (screen->priv->popup_menu), menu_item);
+      gtk_menu_shell_append (GTK_MENU_SHELL (screen->priv->popup_menu),
+			     menu_item);
     }
 
   menu_item = append_menuitem (screen->priv->popup_menu,
@@ -1718,8 +1716,8 @@
       gtk_widget_show (im_menu);
       gtk_widget_show (menu_item);
       gtk_menu_shell_append (GTK_MENU_SHELL (screen->priv->popup_menu), menu_item);
-    }
-
+   }
+ 
   gtk_menu_popup (GTK_MENU (screen->priv->popup_menu),
                   NULL, NULL,
                   NULL, NULL, 
@@ -2083,7 +2081,6 @@
                      TerminalScreen *screen)
 {
   char *text;
-  gboolean userset;
 
   text = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
 


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnome-terminal.spec	7 Feb 2006 11:56:12 -0000	1.31
+++ gnome-terminal.spec	9 Feb 2006 05:11:51 -0000	1.32
@@ -13,12 +13,15 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.13.90
-Release: 1.1
+Release: 2
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
+# fixed in 2.13.91
 Patch1: gnome-terminal-2.13.90-invisible-char.patch
+# fixed in 2.13.91
+Patch2: gnome-terminal-2.13.90-link.patch
 License: GPL 
 Group: User Interface/Desktops
 
@@ -55,6 +58,7 @@
 cp ${RPM_SOURCE_DIR}/ne.po po
 %patch0 -p1 -b .inputmethod
 %patch1 -p0 -b .invisible-char
+%patch2 -p1 -b .link
 
 %build
 
@@ -103,6 +107,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
+- Re-add "Open Link" menuitems
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 05:58:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 00:58:21 -0500
Subject: rpms/redhat-menus/devel .cvsignore, 1.35, 1.36 redhat-menus.spec,
	1.57, 1.58 sources, 1.37, 1.38
Message-ID: <200602090558.k195wL3o011338@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-menus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11322

Modified Files:
	.cvsignore redhat-menus.spec sources 
Log Message:
6.6.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	7 Feb 2006 18:23:47 -0000	1.35
+++ .cvsignore	9 Feb 2006 05:58:19 -0000	1.36
@@ -1 +1,2 @@
 redhat-menus-6.6.4.tar.gz
+redhat-menus-6.6.5.tar.gz


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- redhat-menus.spec	7 Feb 2006 18:23:47 -0000	1.57
+++ redhat-menus.spec	9 Feb 2006 05:58:19 -0000	1.58
@@ -3,7 +3,7 @@
 
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
-Version: 6.6.4
+Version: 6.6.5
 Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Thu Feb 9 2006 Matthias Clasen <mclasen at redhat.com> - 6.6.5-1
+- Really move pirut to toplevel
+
 * Tue Feb 7 2006 Ray Strode <rstrode at redhat.com> - 6.6.4-1
 - use gnome icon names for "-Other" menu files
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	7 Feb 2006 18:23:47 -0000	1.37
+++ sources	9 Feb 2006 05:58:19 -0000	1.38
@@ -1 +1 @@
-055b44401e2bddfdf81b135ee30bea0f  redhat-menus-6.6.4.tar.gz
+aff5ac40612ccad298972431abe4e192  redhat-menus-6.6.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:21:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:21:11 -0500
Subject: rpms/cpufreq-utils/devel .cvsignore, 1.5, 1.6 cpufreq-utils.spec,
	1.21, 1.22
Message-ID: <200602090621.k196LBR6024224@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore cpufreq-utils.spec 
Log Message:
rebuild


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2005 23:03:42 -0000	1.5
+++ .cvsignore	9 Feb 2006 06:21:09 -0000	1.6
@@ -1 +1,2 @@
 cpufrequtils-0.4.tar.bz2
+cpufrequtils-0.4


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cpufreq-utils.spec	19 Dec 2005 23:03:42 -0000	1.21
+++ cpufreq-utils.spec	9 Feb 2006 06:21:09 -0000	1.22
@@ -81,6 +81,9 @@
 %{_mandir}/man1/cpufreq-set.1*
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Mon Dec 19 2005 Dave Jones <davej at redhat.com>
 - New upstream 0.4 release.
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:21:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:21:23 -0500
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.28,1.29
Message-ID: <200602090621.k196LNlU024279@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24265

Modified Files:
	cpuspeed.spec 
Log Message:
rebuild


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cpuspeed.spec	17 Dec 2005 06:17:37 -0000	1.28
+++ cpuspeed.spec	9 Feb 2006 06:21:21 -0000	1.29
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:22:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:22:34 -0500
Subject: rpms/dmidecode/devel dmidecode.spec,1.22,1.23
Message-ID: <200602090622.k196MYwe024389@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/dmidecode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24376

Modified Files:
	dmidecode.spec 
Log Message:
rebuild


Index: dmidecode.spec
===================================================================
RCS file: /cvs/dist/rpms/dmidecode/devel/dmidecode.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dmidecode.spec	17 Dec 2005 00:33:30 -0000	1.22
+++ dmidecode.spec	9 Feb 2006 06:22:32 -0000	1.23
@@ -46,6 +46,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:22:59 -0500
Subject: rpms/irqbalance/devel irqbalance.spec,1.22,1.23
Message-ID: <200602090622.k196MxWf024454@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24440

Modified Files:
	irqbalance.spec 
Log Message:
rebuild


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- irqbalance.spec	17 Dec 2005 06:17:43 -0000	1.22
+++ irqbalance.spec	9 Feb 2006 06:22:57 -0000	1.23
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:23:27 -0500
Subject: rpms/longrun/devel longrun.spec,1.12,1.13
Message-ID: <200602090623.k196NRgv024540@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/longrun/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24526

Modified Files:
	longrun.spec 
Log Message:
rebuild


Index: longrun.spec
===================================================================
RCS file: /cvs/dist/rpms/longrun/devel/longrun.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- longrun.spec	17 Dec 2005 00:40:15 -0000	1.12
+++ longrun.spec	9 Feb 2006 06:23:25 -0000	1.13
@@ -49,6 +49,9 @@
 /usr/share/man/man1/longrun.1.gz
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:23:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:23:42 -0500
Subject: rpms/mcelog/devel mcelog.spec,1.15,1.16
Message-ID: <200602090623.k196Ng3O024599@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/mcelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24581

Modified Files:
	mcelog.spec 
Log Message:
rebuild


Index: mcelog.spec
===================================================================
RCS file: /cvs/dist/rpms/mcelog/devel/mcelog.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mcelog.spec	8 Feb 2006 15:45:49 -0000	1.15
+++ mcelog.spec	9 Feb 2006 06:23:40 -0000	1.16
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - Update to upstream 0.6
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:23:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:23:57 -0500
Subject: rpms/microcode_ctl/devel microcode_ctl.spec,1.29,1.30
Message-ID: <200602090623.k196NvGA024655@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/microcode_ctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24642

Modified Files:
	microcode_ctl.spec 
Log Message:
rebuild


Index: microcode_ctl.spec
===================================================================
RCS file: /cvs/dist/rpms/microcode_ctl/devel/microcode_ctl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- microcode_ctl.spec	27 Jan 2006 21:20:55 -0000	1.29
+++ microcode_ctl.spec	9 Feb 2006 06:23:55 -0000	1.30
@@ -82,6 +82,9 @@
 exit 0
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Jan 27 2006 Dave Jones <davej at redhat.com>
 - Update to upstream 1.13
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:25:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:25:44 -0500
Subject: rpms/rng-utils/devel rng-utils.spec, NONE, 1.1 rng-tools.spec, 1.9,
	NONE
Message-ID: <200602090625.k196PiXk000878@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	rng-utils.spec 
Removed Files:
	rng-tools.spec 
Log Message:
rename



***** Error reading new file: [Errno 2] No such file or directory: 'rng-utils.spec'

--- rng-tools.spec DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:26:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:26:36 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.1,1.2
Message-ID: <200602090626.k196Qa9g001294@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
fix ver



Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rng-utils.spec	9 Feb 2006 06:25:41 -0000	1.1
+++ rng-utils.spec	9 Feb 2006 06:26:33 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:        Random number generator related utilities
 Name:           rng-utils
 Version:        2.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:27:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:27:42 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.2,1.3
Message-ID: <200602090627.k196Rgse001836@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rng-utils.spec	9 Feb 2006 06:26:33 -0000	1.2
+++ rng-utils.spec	9 Feb 2006 06:27:39 -0000	1.3
@@ -71,3 +71,4 @@
 * Sat Dec 18 2004 Dave Jones <davej at redhat.com>
 - Initial packaging, based upon kernel-utils.
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:27:53 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.3,1.4
Message-ID: <200602090627.k196Rrmh001940@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rng-utils.spec	9 Feb 2006 06:27:39 -0000	1.3
+++ rng-utils.spec	9 Feb 2006 06:27:50 -0000	1.4
@@ -72,3 +72,4 @@
 - Initial packaging, based upon kernel-utils.
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:28:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:28:04 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.4,1.5
Message-ID: <200602090628.k196S45E002040@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rng-utils.spec	9 Feb 2006 06:27:50 -0000	1.4
+++ rng-utils.spec	9 Feb 2006 06:28:01 -0000	1.5
@@ -73,3 +73,4 @@
 
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:28:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:28:11 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.5,1.6
Message-ID: <200602090628.k196SBw3002101@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rng-utils.spec	9 Feb 2006 06:28:01 -0000	1.5
+++ rng-utils.spec	9 Feb 2006 06:28:07 -0000	1.6
@@ -74,3 +74,4 @@
 
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:28:16 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.6,1.7
Message-ID: <200602090628.k196SG2K002167@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rng-utils.spec	9 Feb 2006 06:28:07 -0000	1.6
+++ rng-utils.spec	9 Feb 2006 06:28:13 -0000	1.7
@@ -75,3 +75,4 @@
 
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:28:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:28:23 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.7,1.8
Message-ID: <200602090628.k196SN5F002241@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rng-utils.spec	9 Feb 2006 06:28:13 -0000	1.7
+++ rng-utils.spec	9 Feb 2006 06:28:19 -0000	1.8
@@ -76,3 +76,4 @@
 
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:28:34 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.8,1.9
Message-ID: <200602090628.k196SY2K002317@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
bump version


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rng-utils.spec	9 Feb 2006 06:28:19 -0000	1.8
+++ rng-utils.spec	9 Feb 2006 06:28:29 -0000	1.9
@@ -77,3 +77,4 @@
 
 
 
+



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:29:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:29:26 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.9,1.10
Message-ID: <200602090629.k196TQM0002402@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
rebuild


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rng-utils.spec	9 Feb 2006 06:28:29 -0000	1.9
+++ rng-utils.spec	9 Feb 2006 06:29:06 -0000	1.10
@@ -53,6 +53,9 @@
 /usr/share/man/man8/rngd.8.gz
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 
@@ -70,11 +73,3 @@
 
 * Sat Dec 18 2004 Dave Jones <davej at redhat.com>
 - Initial packaging, based upon kernel-utils.
-
-
-
-
-
-
-
-



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:29:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:29:46 -0500
Subject: rpms/salinfo/devel salinfo.spec,1.8,1.9
Message-ID: <200602090629.k196TkJ5002432@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2405

Modified Files:
	salinfo.spec 
Log Message:
rebuild


Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- salinfo.spec	17 Dec 2005 06:17:57 -0000	1.8
+++ salinfo.spec	9 Feb 2006 06:29:25 -0000	1.9
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:29:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:29:47 -0500
Subject: rpms/x86info/devel x86info.spec,1.19,1.20
Message-ID: <200602090629.k196TlSa002448@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/x86info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2406

Modified Files:
	x86info.spec 
Log Message:
rebuild


Index: x86info.spec
===================================================================
RCS file: /cvs/dist/rpms/x86info/devel/x86info.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- x86info.spec	17 Dec 2005 06:18:05 -0000	1.19
+++ x86info.spec	9 Feb 2006 06:29:27 -0000	1.20
@@ -44,6 +44,9 @@
 %attr(0644,root,root) %{_mandir}/*/*
 
 %changelog
+* Thu Feb 09 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:34:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:34:11 -0500
Subject: rpms/salinfo/devel salinfo.spec,1.9,1.10
Message-ID: <200602090634.k196YBuq002739@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2685

Modified Files:
	salinfo.spec 
Log Message:
bump






From fedora-cvs-commits at redhat.com  Thu Feb  9 06:36:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:36:06 -0500
Subject: rpms/salinfo/devel salinfo.spec,1.10,1.11
Message-ID: <200602090636.k196a69x003006@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/salinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2963

Modified Files:
	salinfo.spec 
Log Message:
suffix



Index: salinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/salinfo/devel/salinfo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- salinfo.spec	9 Feb 2006 06:33:41 -0000	1.10
+++ salinfo.spec	9 Feb 2006 06:36:04 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        SAL info tool.
 Name:           salinfo
 Version:        0.5
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL



From fedora-cvs-commits at redhat.com  Thu Feb  9 06:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 01:41:22 -0500
Subject: rpms/longrun/devel longrun.spec,1.13,1.14
Message-ID: <200602090641.k196fMAu005352@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/longrun/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5289

Modified Files:
	longrun.spec 
Log Message:
missing build require



Index: longrun.spec
===================================================================
RCS file: /cvs/dist/rpms/longrun/devel/longrun.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- longrun.spec	9 Feb 2006 06:23:25 -0000	1.13
+++ longrun.spec	9 Feb 2006 06:41:19 -0000	1.14
@@ -9,6 +9,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:	i386
 Obsoletes:	kernel-utils
+BuildRequires: groff
 
 Patch1: longrun-0.9-14.patch
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 08:20:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 03:20:22 -0500
Subject: rpms/planner/devel planner.spec,1.19,1.20
Message-ID: <200602090820.k198KMZe013875@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13862

Modified Files:
	planner.spec 
Log Message:
rh#180559# rebuild


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- planner.spec	7 Feb 2006 13:30:00 -0000	1.19
+++ planner.spec	9 Feb 2006 08:20:19 -0000	1.20
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   3.1
+Release:   4
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -212,6 +212,9 @@
 # Changelog
 ##################################
 %changelog
+* Thu Feb 09 2006 Caolan McNamara <caolanm at redhat.com> - 0.13-4
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.13-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 09:50:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 04:50:00 -0500
Subject: rpms/xorg-x11-xfs/devel xfs.init, 1.4, 1.5 xorg-x11-xfs.spec, 1.15,
	1.16
Message-ID: <200602090950.k199o03L024367@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24336

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Thu Feb  9 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.



Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfs.init	5 Feb 2006 22:17:26 -0000	1.4
+++ xfs.init	9 Feb 2006 09:49:57 -0000	1.5
@@ -30,7 +30,7 @@
    # chkfontpath that we do not want, including headers, FPE numbers and
    # whitespace and other junk.  Also filters out FPE's with trailing
    # modifiers such as ":unscaled" et al.
-   for dir in $(/usr/sbin/chkfontpath --list | sed -e '/^Current/d;s#^[0-9]*: ##g;s#^/.*:[a-z]*$##g;/^[[:space:]]*$/d' | sort | uniq) ;do
+   for dir in $(/usr/sbin/chkfontpath --list | sed -e '/^Current/d;s#^[0-9]*: ##g;s#:unscaled$##g;/^[[:space:]]*$/d' | sort | uniq) ;do
       if [ -d "$dir" ]; then
          cd "$dir"
          # If fonts.dir does not exist, or if there are files in the


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xfs.spec	7 Feb 2006 14:40:32 -0000	1.15
+++ xorg-x11-xfs.spec	9 Feb 2006 09:49:57 -0000	1.16
@@ -8,8 +8,8 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
-# FIXME: Remove Epoch line if package gets renamed
+Release: 2
+# NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
 Group: System Environment/Daemons
@@ -256,44 +256,41 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_bindir}
 %{_bindir}/xfs
-%dir %{_bindir}
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/fs
 # NOTE: We intentionally override the upstream default config file location
 # during build.
 # FIXME: Create patch for the following, and submit it upstream.
-# <daniels> mharris: uhm, just set configdir=$(sysconfdir) in Makefile.am
-# <mharris> daniels: Do you mean, change it in Makefile.am, and submit patch to fix?  Or patch it for local use?
-# <daniels> mharris: and submit patch to fix, yeah
+# Check if this is still relevent:  set configdir=$(sysconfdir) in Makefile.am
+# and if so, submit patch upstream to fix.
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/fs/config
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 # FIXME: The manpage incorrectly points to /usr/X11R6/...
 %{_mandir}/man1/xfs.1x*
 %{_sysconfdir}/rc.d/init.d/xfs
 
 %files utils
-%dir %{_bindir}
 %{_bindir}/fslsfonts
 %{_bindir}/fstobdf
 %{_bindir}/showfont
 %{_bindir}/xfsinfo
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/fslsfonts.1x*
 %{_mandir}/man1/fstobdf.1x*
 %{_mandir}/man1/showfont.1x*
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
-* 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
-
-* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com>
+* Thu Feb  9 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
+- 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
 - Updated all tarballs to version 1.0.1 from X11R7.0
@@ -307,7 +304,7 @@
   variable.
 - Change manpage dir from man1x back to man1 to match upstream.
 
-* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> - 1:0.99.2-4
+* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> 1:0.99.2-4
 - require initscripts instead of /etc/init.d/functions
 
 * Tue Nov 15 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-3



From fedora-cvs-commits at redhat.com  Thu Feb  9 10:48:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 05:48:26 -0500
Subject: rpms/planner/devel planner.spec,1.20,1.21
Message-ID: <200602091048.k19AmQ8B015195@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15181

Modified Files:
	planner.spec 
Log Message:
impatient


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- planner.spec	9 Feb 2006 08:20:19 -0000	1.20
+++ planner.spec	9 Feb 2006 10:48:23 -0000	1.21
@@ -86,9 +86,10 @@
 ##################################
 %build
 
-aclocal-1.7
+# aclocal-1.7
 automake-1.7
-intltoolize --force
+# intltoolize --force
+intltoolize
 libtoolize --force
 autoconf
 %configure --enable-python --enable-gtk-doc --disable-dotnet --disable-update-mimedb --enable-eds --enable-eds-backend



From fedora-cvs-commits at redhat.com  Thu Feb  9 10:58:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 05:58:06 -0500
Subject: rpms/kernel/FC-4 linux-2.6-powerpc64-fpexc.patch, NONE,
	1.1 linux-2.6-usb-find-interface.patch, NONE,
	1.1 kernel-2.6.spec, 1.1595, 1.1596
Message-ID: <200602091058.k19Aw6dM025057@cvs.devel.redhat.com>

Author: dwmw2

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-powerpc64-fpexc.patch 
	linux-2.6-usb-find-interface.patch 
Log Message:
* Thu Feb  9 2006 David Woodhouse <dwmw2 at redhat.com>
- Fix PPC64 FP exception setup
- Fix brain damage in usb_find_interface (#176333)


linux-2.6-powerpc64-fpexc.patch:
 fpu.S |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-powerpc64-fpexc.patch ---
diff-tree e2f5a3c1bec1cf3e7c76c080fd7f21476f05008a (from 6cb6524d90b6e5497e79a1474bdb2f26755d1c02)
Author: Paul Mackerras <paulus at samba.org>
Date:   Tue Feb 7 13:55:30 2006 +1100

    powerpc/64: Fix bug in setting floating-point exception mode
    
    When loading up the FPU, we were using a 'ld' (load doubleword)
    instruction to get the FP exception mode from the thread_struct,
    but it's only an int field.  This changes the ld to lwz (load
    word and zero-extend).
    
    Signed-off-by: Paul Mackerras <paulus at samba.org>

diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index e4362df..340730f 100644
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -66,7 +66,7 @@ _GLOBAL(load_up_fpu)
 #else
 	ld	r4,PACACURRENT(r13)
 	addi	r5,r4,THREAD		/* Get THREAD */
-	ld	r4,THREAD_FPEXC_MODE(r5)
+	lwz	r4,THREAD_FPEXC_MODE(r5)
 	ori	r12,r12,MSR_FP
 	or	r12,r12,r4
 	std	r12,_MSR(r1)

linux-2.6-usb-find-interface.patch:
 usb.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-usb-find-interface.patch ---
>From bugzilla at redhat.com Wed Dec 21 19:27:47 2005
Return-path: <apache at redhat.com>
Delivery-date: Wed, 21 Dec 2005 19:27:47 +0000
Received: from [172.16.58.1] (helo=devserv.devel.redhat.com) by
	hades.cambridge.redhat.com with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1Ep9cp-0002hs-5p for dwmw2 at cambridge.redhat.com; Wed, 21 Dec 2005 19:27:47
	+0000
Received: from dwmw2 by devserv.devel.redhat.com with local (Exim 4.41 #1
	(Red Hat Linux)) id 1Ep9c1-00009U-Aa for dwmw2 at cambridge.redhat.com; Wed,
	21 Dec 2005 14:26:57 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254]) by devserv.devel.redhat.com (8.12.11/8.12.11) with ESMTP
	id jBLJQu1m000575 for <dwmw2 at devserv.devel.redhat.com>; Wed, 21 Dec 2005
	14:26:56 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by
	int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id jBLJQu116063 for
	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:26:56 -0500
Received: from www.beta.redhat.com (beta.redhat.com [172.16.48.203]) by
	mx1.redhat.com (8.12.11/8.12.11) with ESMTP id jBLJQuRu016509 for
	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:26:56 -0500
Received: from www.beta.redhat.com (localhost.localdomain [127.0.0.1]) by
	www.beta.redhat.com (8.12.11/8.12.10) with ESMTP id jBLJNERi006601 for
	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:23:14 -0500
Received: (from apache at localhost) by www.beta.redhat.com
	(8.12.11/8.12.11/Submit) id jBLJNEA5006599; Wed, 21 Dec 2005 14:23:14 -0500
Date: Wed, 21 Dec 2005 14:23:14 -0500
Message-Id: <200512211923.jBLJNEA5006599 at www.beta.redhat.com>
From: bugzilla at redhat.com
To: dwmw2 at redhat.com
Subject: [Bug 176333] Cannot use second USB printer
Content-type: text/plain; charset=utf-8
In-Reply-To: <bug-176333-23438 at bugzilla.redhat.com>
X-Loop: bugzilla at redhat.com
X-BeenThere: bugzilla at redhat.com
X-Bugzilla-Product: Fedora Core
X-Bugzilla-Version: fc4
X-Bugzilla-Component: kernel
X-Bugzilla-Comment: Public
X-Bugzilla-Reason: Reporter
X-Bugzilla-Changed-Fields: Comment
X-Evolution-Source: imap://dwmw2 at invincible.cambridge.redhat.com/
Content-Transfer-Encoding: 8bit
Mime-Version: 1.0

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug report.

Summary: Cannot use second USB printer


https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176333





------- Additional Comments From zaitcev at redhat.com  2005-12-21 14:23 EST -------
What a horrible shit. Written by Pat Mochel, no less.
Please try this instead:

--- linux-2.6.14/drivers/usb/core/usb.c	2005-10-28 19:12:01.000000000 -0700
+++ linux-2.6.14-lem/drivers/usb/core/usb.c	2005-12-21 11:19:00.000000000 -0800
@@ -478,20 +477,23 @@ usb_match_id(struct usb_interface *inter
 	return NULL;
 }
 
+struct find_interface_arg {
+	int minor;
+	struct usb_interface *interface;
+};
 
 static int __find_interface(struct device * dev, void * data)
 {
-	struct usb_interface ** ret = (struct usb_interface **)data;
-	struct usb_interface * intf = *ret;
-	int *minor = (int *)data;
+	struct find_interface_arg *arg = data;
+	struct usb_interface *intf;
 
 	/* can't look at usb devices, only interfaces */
 	if (dev->driver == &usb_generic_driver)
 		return 0;
 
 	intf = to_usb_interface(dev);
-	if (intf->minor != -1 && intf->minor == *minor) {
-		*ret = intf;
+	if (intf->minor != -1 && intf->minor == arg->minor) {
+		arg->interface = intf;
 		return 1;
 	}
 	return 0;
@@ -508,12 +510,12 @@ static int __find_interface(struct devic
  */
 struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)
 {
-	struct usb_interface *intf = (struct usb_interface *)(long)minor;
-	int ret;
-
-	ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface);
+	struct find_interface_arg argb;
 
-	return ret ? intf : NULL;
+	argb.minor = minor;
+	argb.interface = NULL;
+	driver_for_each_device(&drv->driver, NULL, &argb, __find_interface);
+	return argb.interface;
 }
 
 static int usb_device_match (struct device *dev, struct device_driver *drv)


-- 
Configure bugmail: https://bugzilla.redhat.com/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You reported the bug, or are watching the reporter.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1595
retrieving revision 1.1596
diff -u -r1.1595 -r1.1596
--- kernel-2.6.spec	7 Feb 2006 18:29:28 -0000	1.1595
+++ kernel-2.6.spec	9 Feb 2006 10:58:04 -0000	1.1596
@@ -227,6 +227,7 @@
 Patch303: linux-2.6.15-mv643xx-fixes.patch
 Patch304: linux-2.6-ppc-rtas-check.patch
 Patch305: linux-2.6-powerpc-parport.patch
+Patch306: linux-2.6-powerpc64-fpexc.patch
 
 # 400 - 499   ia64
 # 500 - 599   s390(x)
@@ -353,6 +354,7 @@
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
 Patch1840: linux-2.6-dm-crypt-zero-key-before-free.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
+Patch1870: linux-2.6-usb-find-interface.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
 Patch1890: linux-2.6-dcache-inode-leak.patch
 
@@ -591,6 +593,7 @@
 %patch303 -p1
 %patch304 -p1
 %patch305 -p1
+%patch306 -p1
 
 #
 # Xen
@@ -796,6 +799,8 @@
 %patch1840 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
+# Fix idiocy in usb_find_interface()
+%patch1870 -p1
 # Some it87 probing causes reboots on some systems.
 %patch1880 -p1
 # Fix inode leak in d_instantiate_unique
@@ -1276,6 +1281,10 @@
 %endif
 
 %changelog
+* Thu Feb  9 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix PPC64 FP exception setup
+- Fix brain damage in usb_find_interface (#176333)
+
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.15.3
   Fixes remotely exploitable bug in ICMP (CVE-2006-0454)



From fedora-cvs-commits at redhat.com  Thu Feb  9 11:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 06:12:11 -0500
Subject: rpms/xorg-x11-xfs/devel xfs.init,1.5,1.6
Message-ID: <200602091112.k19BCBB0028115@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28085

Modified Files:
	xfs.init 
Log Message:
Clear fc-cache remnants from xfs.init


Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfs.init	9 Feb 2006 09:49:57 -0000	1.5
+++ xfs.init	9 Feb 2006 11:12:08 -0000	1.6
@@ -22,8 +22,6 @@
 
 prog=xfs
 
-FC_CACHE=/usr/bin/fc-cache
-
 buildfontlist() {
    pushd . &> /dev/null
    # chkfontpath output filtering, strips all of the junk output by
@@ -51,16 +49,6 @@
          fi
       fi
    done
-   # Now we run fc-cache, assuming fonts may have been added, without
-   # explicitly checking, as it is rather fast anyway.  Some older versions
-   # of fc-cache will SEGV, which is prevented by invoking it with HOME=/
-   #
-   # Update:  We no longer run fc-cache, upon request of fontconfig rpm
-   # maintainer.  Later, if it is decided that fc-cache should be ran at
-   # system startup time, the fontconfig package should provide its own
-   # initscript, as fc-cache has nothing to do with xfs nor core fonts, so
-   # doesn't really belong in here anyway.  (Bug #179362)   
-   #[ -x "$FC_CACHE" ] && HOME=/ "$FC_CACHE"
    popd &> /dev/null
 }
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 11:38:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 06:38:27 -0500
Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.3,1.4
Message-ID: <200602091138.k19BcRSN017539@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17504

Modified Files:
	xorg-x11-filesystem.spec 
Log Message:
* Thu Feb  9 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
- Bumped version to 7.0-1 and rebuilt.



Index: xorg-x11-filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-filesystem.spec	23 Nov 2005 10:03:30 -0000	1.3
+++ xorg-x11-filesystem.spec	9 Feb 2006 11:38:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: X.Org X11 filesystem layout
 Name: xorg-x11-filesystem
-Version: 0.99.2
-Release: 3
+Version: 7.0
+Release: 1
 License: MIT/X11
 Group: System Environment/Base
 URL: http://www.redhat.com
@@ -82,6 +82,9 @@
 %{_bindir}/xorg-x11-filesystem-upgrade
 
 %changelog
+* Thu Feb  9 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
 - Ok, even though I _tested_ it, and it worked..  the previous build had a
   broken post, preun, and postun script, due to copy and paste error.  Ugh.



From fedora-cvs-commits at redhat.com  Thu Feb  9 12:05:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 07:05:53 -0500
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.5,1.6
Message-ID: <200602091205.k19C5rhj007077@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7042

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
* Thu Feb  9 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



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drivers.spec	7 Feb 2006 14:21:06 -0000	1.5
+++ xorg-x11-drivers.spec	9 Feb 2006 12:05:25 -0000	1.6
@@ -1,5 +1,9 @@
+# DO NOT HAND EDIT "Requires" LISTS, it is machine generated
+
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
+Version: 7.0
+Release: 1
 Version: 0.99.2
 Release: 4.1
 License: MIT/X11
@@ -14,12 +18,13 @@
 #            automatic update.
 #
 # I used the following to generate the list:
-# for a in $(< xorg-all-drivers.txt ) ; do (echo -n "%ifarch " ;grep "^ExclusiveArch:" $a/devel/$a.spec | sed -e "s/^ExclusiveArch: //" ; echo -e "Requires: $a\n%endif\n") ; done
-%ifarch %{ix86} x86_64 ia64 ppc
+# for a in $(< xorg-all-drivers.txt ) ; \
+#   do (echo -n "%ifarch " ;grep "^ExclusiveArch:" $a/devel/$a.spec | sed -e "s/^ExclusiveArch: //" ; echo -e "Requires: $a\n%endif\n") ; done
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-acecad
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-aiptek
 %endif
 
@@ -35,7 +40,7 @@
 Requires: xorg-x11-drv-ati
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-calcomp
 %endif
 
@@ -47,7 +52,7 @@
 Requires: xorg-x11-drv-cirrus
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-citron
 %endif
 
@@ -55,11 +60,11 @@
 Requires: xorg-x11-drv-cyrix
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-digitaledge
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-dmc
 %endif
 
@@ -67,19 +72,19 @@
 Requires: xorg-x11-drv-dummy
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-dynapro
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-elo2300
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-elographics
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-evdev
 %endif
 
@@ -87,7 +92,7 @@
 Requires: xorg-x11-drv-fbdev
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-fpit
 %endif
 
@@ -95,7 +100,7 @@
 Requires: xorg-x11-drv-glint
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-hyperpen
 %endif
 
@@ -111,39 +116,39 @@
 Requires: xorg-x11-drv-i810
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-jamstudio
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-joystick
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-keyboard
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-magellan
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-magictouch
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mga
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-microtouch
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mouse
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-mutouch
 %endif
 
@@ -155,15 +160,15 @@
 Requires: xorg-x11-drv-nsc
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-nv
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-palmax
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-penmount
 %endif
 
@@ -195,15 +200,15 @@
 Requires: xorg-x11-drv-sisusb
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-spaceorb
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-summa
 %endif
 
-%ifarch %{ix86} x86_64
+%ifarch %{ix86} x86_64 ia64 ppc alpha
 Requires: xorg-x11-drv-tdfx
 %endif
 
@@ -211,14 +216,18 @@
 Requires: xorg-x11-drv-trident
 %endif
 
-%ifarch %{ix86}
+%ifarch %{ix86} alpha
 Requires: xorg-x11-drv-tseng
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-ur98
 %endif
 
+%ifarch %{ix86}
+Requires: xorg-x11-drv-v4l
+%endif
+
 %ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-vesa
 %endif
@@ -235,7 +244,7 @@
 Requires: xorg-x11-drv-vmware
 %endif
 
-%ifarch %{ix86} x86_64 ia64 ppc
+%ifarch %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 Requires: xorg-x11-drv-void
 %endif
 
@@ -243,6 +252,7 @@
 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
@@ -258,22 +268,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-%defattr(-,root,root,-)
-%doc
-
+#%files
+#%defattr(-,root,root,-)
+#%doc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Nov 23 2005 Mike Harris <mharris at redhat.com> 0.99.2-4
 - Add ur98 driver back, as it is part of X11R7 RC2
 
-* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-3
+* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-3
 - ur98 driver doesn't exist
 
-* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-2
+* Tue Nov 15 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-2
 - add an obsoletes on xorg-x11 to get pulled in on upgrades
 
 * Tue Nov 15 2005 Mike Harris <mharris at redhat.com> 0.99.2-1



From fedora-cvs-commits at redhat.com  Thu Feb  9 12:07:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 07:07:00 -0500
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.6,1.7
Message-ID: <200602091207.k19C70pb007263@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7236

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
Fix merge conflict


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drivers.spec	9 Feb 2006 12:05:25 -0000	1.6
+++ xorg-x11-drivers.spec	9 Feb 2006 12:06:49 -0000	1.7
@@ -4,8 +4,6 @@
 Name: xorg-x11-drivers
 Version: 7.0
 Release: 1
-Version: 0.99.2
-Release: 4.1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com



From fedora-cvs-commits at redhat.com  Thu Feb  9 12:26:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 07:26:55 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, NONE,
	1.1 selinux-policy.spec, 1.101, 1.102 seusers-mls, 1.2,
	1.3 seusers-strict, 1.1, 1.2 policy-20060104.patch, 1.32, NONE
Message-ID: <200602091226.k19CQtqW028419@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28381

Modified Files:
	selinux-policy.spec seusers-mls seusers-strict 
Added Files:
	policy-20060207.patch 
Removed Files:
	policy-20060104.patch 
Log Message:


policy-20060207.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/kudzu.te             |    2 -
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/su.if                |    7 +---
 policy/modules/kernel/bootloader.te       |    4 +-
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/files.if            |    2 -
 policy/modules/kernel/filesystem.if       |   51 ++++++++++++++++++++++++++++++
 policy/modules/kernel/terminal.if         |    2 -
 policy/modules/services/automount.if      |   16 +++++++++
 policy/modules/services/automount.te      |    1 
 policy/modules/services/cron.if           |    2 -
 policy/modules/services/cron.te           |    1 
 policy/modules/services/fetchmail.te      |    1 
 policy/modules/services/hal.te            |   10 +++++
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    2 +
 policy/modules/services/networkmanager.te |    5 ++
 policy/modules/services/postfix.te        |    3 +
 policy/modules/services/remotelogin.te    |   28 +---------------
 policy/modules/services/sendmail.te       |    1 
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/fstools.te          |    2 +
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.if        |   18 ++++++++++
 policy/modules/system/libraries.te        |    1 
 policy/modules/system/locallogin.te       |    4 --
 policy/modules/system/logging.te          |    4 +-
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/selinuxutil.te      |    2 +
 policy/modules/system/udev.te             |    4 +-
 policy/modules/system/unconfined.te       |    6 +++
 policy/modules/system/userdomain.if       |   17 ++++++++++
 policy/modules/system/userdomain.te       |    7 ++++
 40 files changed, 197 insertions(+), 49 deletions(-)

--- NEW FILE policy-20060207.patch ---
diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.12/build.conf
--- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
+++ serefpolicy-2.2.12/build.conf	2006-02-08 11:43:58.000000000 -0500
@@ -8,13 +8,13 @@
 # version policy it supports.  Setting this will
 # override the version.  This only has an
 # effect for monolithic policies.
-#OUTPUT_POLICY = 18
+#OUTPUT_POLICY = 20
 
 # Policy Type
 # strict, targeted,
 # strict-mls, targeted-mls,
 # strict-mcs, targeted-mcs
-TYPE = strict
+TYPE = strict-mcs
 
 # Policy Name
 # If set, this will be used as the policy
@@ -40,7 +40,7 @@
 
 # Build monolithic policy.  Putting n here
 # will build a loadable module policy.
-MONOLITHIC=y
+MONOLITHIC=n
 
 # Polyinstantiation
 # Enable polyinstantiated directory support.
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.12/policy/mcs
--- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
+++ serefpolicy-2.2.12/policy/mcs	2006-02-08 11:43:58.000000000 -0500
@@ -137,15 +137,24 @@
 # Only files are constrained by MCS at this stage.
 #
 mlsconstrain file { write setattr append unlink link rename
-		    create ioctl lock execute } (h1 dom h2);
+		    ioctl lock execute relabelfrom } (h1 dom h2);
+
+mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2));
 
 mlsconstrain file { read } ((h1 dom h2) or 
 			    ( t1 == mlsfileread ));
 
 
 # new file labels must be dominated by the relabeling subject clearance
-mlsconstrain { dir file lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom relabelto }
+mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom }
 	( h1 dom h2 );
+mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { create relabelto }
+	(( h1 dom h2 ) and ( l2 eq h2 ));
+
+mlsconstrain process { ptrace } ( h1 dom h2 );
+
+mlsconstrain process { sigkill sigstop } ( h1 dom h2 ) or
+		( t1 == init_t ) or ( t1 == initrc_t );
 
 define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
 link unlink rename relabelfrom relabelto }')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.12/policy/modules/admin/kudzu.te
--- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-07 10:43:25.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/admin/kudzu.te	2006-02-08 11:43:58.000000000 -0500
@@ -24,7 +24,6 @@
 allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
 dontaudit kudzu_t self:capability sys_tty_config;
 allow kudzu_t self:process { signal_perms execmem };
-auditallow kudzu_t self:process execmem; 
 allow kudzu_t self:fifo_file rw_file_perms;
 allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
 allow kudzu_t self:unix_dgram_socket create_socket_perms;
@@ -72,6 +71,7 @@
 storage_read_scsi_generic(kudzu_t)
 storage_read_tape(kudzu_t)
 storage_raw_write_fixed_disk(kudzu_t)
+storage_raw_write_removable_device(kudzu_t)
 storage_raw_read_fixed_disk(kudzu_t)
 storage_raw_read_removable_device(kudzu_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.12/policy/modules/admin/prelink.te
--- nsaserefpolicy/policy/modules/admin/prelink.te	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/admin/prelink.te	2006-02-08 11:43:58.000000000 -0500
@@ -65,6 +65,7 @@
 fs_getattr_xattr_fs(prelink_t)
 
 libs_use_ld_so(prelink_t)
+libs_execute_no_trans_ld_so(prelink_t)
 libs_manage_ld_so(prelink_t)
 libs_relabel_ld_so(prelink_t)
 libs_use_shared_libs(prelink_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.12/policy/modules/admin/readahead.te
--- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/admin/readahead.te	2006-02-08 11:43:58.000000000 -0500
@@ -47,7 +47,9 @@
 fs_search_auto_mountpoints(readahead_t)
 fs_getattr_all_pipes(readahead_t)
 fs_getattr_all_files(readahead_t)
-fs_search_ramfs(readahead_t)
+fs_dontaudit_search_ramfs(readahead_t)
+fs_dontaudit_read_ramfs_fifo_file(readahead_t)
+fs_dontaudit_read_ramfs_file(readahead_t)
 fs_read_tmpfs_symlinks(readahead_t)
 
 term_dontaudit_use_console(readahead_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.12/policy/modules/admin/su.if
--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/admin/su.if	2006-02-08 11:43:58.000000000 -0500
@@ -23,13 +23,12 @@
 	# Transition from the user domain to this domain.
 	domain_auto_trans($2, su_exec_t, $1_su_t)
 	allow $2 $1_su_t:fd use;
-	allow $1_su_t $2:fd use;
-	allow $1_su_t $2:fifo_file rw_file_perms;
-	allow $1_su_t $2:process sigchld;
+	allow $2 $1_su_t:fifo_file rw_file_perms;
+	allow $2 $1_su_t:process sigchld;
 
 	# By default, revert to the calling domain when a shell is executed.
 	corecmd_shell_domtrans($1_su_t,$2)
-	allow $2 $1_su_t:fd use;
+	allow $1_su_t $2:fd use;
 	allow $1_su_t $2:fd use;
 	allow $1_su_t $2:fifo_file rw_file_perms;
 	allow $1_su_t $2:process sigchld;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.12/policy/modules/kernel/bootloader.te
--- nsaserefpolicy/policy/modules/kernel/bootloader.te	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/bootloader.te	2006-02-08 11:43:58.000000000 -0500
@@ -71,7 +71,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:fifo_file { getattr read write };
+allow bootloader_t self:fifo_file rw_file_perms;
 
 allow bootloader_t boot_t:dir { create rw_dir_perms };
 allow bootloader_t boot_t:file create_file_perms;
@@ -110,7 +110,7 @@
 dev_dontaudit_rw_generic_dev_nodes(bootloader_t)
 dev_read_rand(bootloader_t)
 dev_read_urand(bootloader_t)
-dev_getattr_sysfs_dirs(bootloader_t)
+dev_read_sysfs(bootloader_t)
 # for reading BIOS data
 dev_read_raw_memory(bootloader_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.12/policy/modules/kernel/corenetwork.te.in
--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/corenetwork.te.in	2006-02-08 11:43:58.000000000 -0500
@@ -124,6 +124,7 @@
 network_port(uucpd, tcp,540,s0)
 network_port(vnc, tcp,5900,s0)
 network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
+network_port(bgp, tcp,179,s0, udp,179,s0)
 network_port(zebra, tcp,2601,s0)
 network_port(zope, tcp,8021,s0)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.12/policy/modules/kernel/devices.fc
--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/devices.fc	2006-02-08 11:43:58.000000000 -0500
@@ -78,6 +78,7 @@
 /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
 /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
 /dev/usb/scanner.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
+/dev/bus/usb/.*/[0-9]+	-c	gen_context(system_u:object_r:usb_device_t,s0)
 
 ifdef(`distro_redhat',`
 # originally from named.fc
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.12/policy/modules/kernel/devices.te
--- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/devices.te	2006-02-08 11:43:58.000000000 -0500
@@ -159,6 +159,11 @@
 genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
 genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
 
+#
+# usb_device_t is the type for /dev/bus/usb/[0-9]+/[0-9]+
+type usb_device_t;
+dev_node(usb_device_t)
+
 type v4l_device_t;
 dev_node(v4l_device_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.12/policy/modules/kernel/files.fc
--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/files.fc	2006-02-08 11:43:58.000000000 -0500
@@ -192,6 +192,8 @@
 /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 
 /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
+/usr/doc(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
+/usr/src(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
 
 /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
 /usr/tmp/.*			<<none>>
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.12/policy/modules/kernel/files.if
--- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-03 08:55:52.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/files.if	2006-02-08 11:43:58.000000000 -0500
@@ -2080,7 +2080,7 @@
 		attribute tmpfile;
 	')
 
-	allow $1 tmpfile:dir { search getattr };
+	allow $1 tmpfile:dir { search setattr };
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.12/policy/modules/kernel/filesystem.if
--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/filesystem.if	2006-02-08 11:43:58.000000000 -0500
@@ -929,6 +929,22 @@
 
 ########################################
 ## <summary>
+##	List inotifyfs filesystem. 
+## </summary>
+## <param name="domain">
+##	Domain allowed access.
+## </param>
+#
+interface(`fs_list_inotifyfs',`
+	gen_require(`
+		type inotifyfs_t;
+	')
+
+	allow $1 inotifyfs_t:dir r_dir_perms;
+')
+
+########################################
+## <summary>
 ##	Mount an iso9660 filesystem, which
 ##	is usually used on CDs.
 ## </summary>
@@ -1763,6 +1779,38 @@
 
 ########################################
 ## <summary>
+##	Dontaudit read on a ramfs file/fifo_file
+## </summary>
+## <param name="domain">
+##	Domain allowed access.
+## </param>
+#
+interface(`fs_dontaudit_read_ramfs_file',`
+	gen_require(`
+		type ramfs_t;
+	')
+
+	dontaudit $1 ramfs_t:file read;
+')
+
+########################################
+## <summary>
+##	Dontaudit read on a ramfs fifo_file
+## </summary>
+## <param name="domain">
+##	Domain allowed access.
+## </param>
+#
+interface(`fs_dontaudit_read_ramfs_fifo_file',`
+	gen_require(`
+		type ramfs_t;
+	')
+
+	dontaudit $1 ramfs_t:fifo_file read;
+')
+
+########################################
+## <summary>
 ##	Write to named pipe on a ramfs filesystem.
 ## </summary>
 ## <param name="domain">
@@ -2727,3 +2775,6 @@
 	# and its files.
 	allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;
 ')
+
+
+
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.12/policy/modules/kernel/terminal.if
--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-03 08:55:53.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/kernel/terminal.if	2006-02-09 07:23:31.000000000 -0500
@@ -386,7 +386,7 @@
 		type devpts_t;
 	')
 
-	dontaudit $1 devpts_t:chr_file { read write };
+	dontaudit $1 devpts_t:chr_file { getattr read write };
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.12/policy/modules/services/automount.if
--- nsaserefpolicy/policy/modules/services/automount.if	2005-12-12 15:35:53.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/automount.if	2006-02-09 07:12:23.000000000 -0500
@@ -39,3 +39,19 @@
 	corecmd_search_sbin($1)
 	can_exec($1,automount_etc_t)
 ')
+
+########################################
+## <summary>
+##	dontaudit getattr of automount tmp dir
+## </summary>
+## <param name="domain">
+##	Domain allowed access.
+## </param>
+#
+interface(`automount_dontaudit_getattr_tmp_dir',`
+	gen_require(`
+		type automount_tmp_t;
+	')
+
+	dontaudit $1 automount_tmp_t:dir getattr;
+')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.12/policy/modules/services/automount.te
--- nsaserefpolicy/policy/modules/services/automount.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/automount.te	2006-02-08 11:43:58.000000000 -0500
@@ -63,6 +63,7 @@
 kernel_read_system_state(automount_t)
 kernel_list_proc(automount_t)
 
+bootloader_getattr_boot_dirs(automount_t)
 bootloader_search_boot(automount_t)
 
 corecmd_exec_sbin(automount_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.12/policy/modules/services/cron.if
--- nsaserefpolicy/policy/modules/services/cron.if	2006-02-03 15:45:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/cron.if	2006-02-08 11:43:58.000000000 -0500
@@ -407,7 +407,7 @@
 		type crond_t;
 	')
 
-	allow $1 crond_t:fifo_file { read write };
+	allow $1 crond_t:fifo_file { getattr read write };
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.12/policy/modules/services/cron.te
--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/cron.te	2006-02-08 11:43:58.000000000 -0500
@@ -108,6 +108,7 @@
 
 corecmd_exec_shell(crond_t)
 corecmd_list_sbin(crond_t)
+corecmd_read_sbin_symlinks(crond_t)
 
 domain_use_wide_inherit_fd(crond_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.12/policy/modules/services/fetchmail.te
--- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-03 08:55:53.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/fetchmail.te	2006-02-08 11:43:58.000000000 -0500
@@ -44,6 +44,7 @@
 kernel_list_proc(fetchmail_t)
 kernel_getattr_proc_files(fetchmail_t)
 kernel_read_proc_symlinks(fetchmail_t)
+kernel_dontaudit_read_system_state(fetchmail_t)
 
 corenet_non_ipsec_sendrecv(fetchmail_t)
 corenet_tcp_sendrecv_generic_if(fetchmail_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.12/policy/modules/services/hal.te
--- nsaserefpolicy/policy/modules/services/hal.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/hal.te	2006-02-09 07:25:33.000000000 -0500
@@ -50,6 +50,7 @@
 kernel_read_fs_sysctls(hald_t)
 kernel_write_proc_files(hald_t)
 
+bootloader_getattr_boot_dirs(hald_t)
 bootloader_search_boot(hald_t)
 
 corecmd_exec_bin(hald_t)
@@ -97,6 +98,8 @@
 
 mls_file_read_up(hald_t)
 
+modutils_domtrans_insmod_uncond(hald_t)
+
 selinux_get_fs_mount(hald_t)
 selinux_validate_context(hald_t)
 selinux_compute_access_vector(hald_t)
@@ -112,12 +115,15 @@
 term_dontaudit_use_console(hald_t)
 term_dontaudit_ioctl_unallocated_ttys(hald_t)
 term_dontaudit_use_unallocated_ttys(hald_t)
+term_dontaudit_use_generic_ptys(hald_t)
 
 init_use_fd(hald_t)
 init_use_script_ptys(hald_t)
 init_domtrans_script(hald_t)
 init_write_initctl(hald_t)
 init_read_utmp(hald_t)
+#hal runs shutdown, probably need a shutdown domain
+init_rw_utmp(hald_t)
 
 libs_use_ld_so(hald_t)
 libs_use_shared_libs(hald_t)
@@ -150,6 +156,10 @@
 	apm_stream_connect(hald_t)
 ')
 
+optional_policy(`automount', `
+	automount_dontaudit_getattr_tmp_dir(hald_t)
+')
+
 optional_policy(`bind',`
 	bind_search_cache(hald_t)
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.12/policy/modules/services/mta.if
--- nsaserefpolicy/policy/modules/services/mta.if	2006-02-03 15:45:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/mta.if	2006-02-08 11:43:58.000000000 -0500
@@ -434,6 +434,7 @@
 
 	allow $1 sendmail_exec_t:lnk_file r_file_perms;
 	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
+	domain_entry_file($1,sendmail_exec_t)
 
 	allow $1 system_mail_t:fd use;
 	allow system_mail_t $1:fd use;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.12/policy/modules/services/mta.te
--- nsaserefpolicy/policy/modules/services/mta.te	2006-02-03 15:45:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/mta.te	2006-02-08 11:43:58.000000000 -0500
@@ -145,6 +145,8 @@
 	files_getattr_tmp_dirs(system_mail_t)
 
 	postfix_exec_master(system_mail_t)
+	postfix_read_config(system_mail_t)
+	postfix_search_spool(system_mail_t)
 
 	ifdef(`distro_redhat',`
 		# compatability for old default main.cf
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.12/policy/modules/services/networkmanager.te
--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/networkmanager.te	2006-02-08 11:43:58.000000000 -0500
@@ -31,7 +31,10 @@
 
 allow NetworkManager_t NetworkManager_var_run_t:file create_file_perms;
 allow NetworkManager_t NetworkManager_var_run_t:dir rw_dir_perms;
-files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t)
+files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
+
+allow NetworkManager_t NetworkManager_var_run_t:sock_file create_file_perms;
+allow NetworkManager_t NetworkManager_var_run_t:dir create_dir_perms;
 
 kernel_read_system_state(NetworkManager_t)
 kernel_read_network_state(NetworkManager_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.12/policy/modules/services/postfix.te
--- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/postfix.te	2006-02-08 11:43:58.000000000 -0500
@@ -411,6 +411,9 @@
 allow postfix_postdrop_t self:capability sys_resource;
 allow postfix_postdrop_t self:tcp_socket create;
 allow postfix_postdrop_t self:udp_socket create_socket_perms;
+corenet_udp_sendrecv_all_if(postfix_postdrop_t)
+corenet_udp_sendrecv_all_nodes(postfix_postdrop_t)
+sysnet_dns_name_resolve(postfix_postdrop_t)
 
 allow postfix_postdrop_t postfix_public_t:dir search;
 allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.12/policy/modules/services/remotelogin.te
--- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/remotelogin.te	2006-02-08 11:43:58.000000000 -0500
@@ -98,6 +98,7 @@
 files_list_mnt(remote_login_t)
 # for when /var/mail is a sym-link
 files_read_var_symlinks(remote_login_t)
+files_polyinstantiate_all(remote_login_t)
 
 init_rw_utmp(remote_login_t)
 
@@ -164,29 +165,6 @@
 	usermanage_read_crack_db(remote_login_t)
 ')
 
-ifdef(`TODO',`
-# this goes to xdm:
-optional_policy(`remotelogin',`
-	# FIXME: what is this for?
-	remotelogin_signull(xdm_t)
+optional_policy(`alsa',`
+	alsa_domtrans(remote_login_t)
 ')
-# Login can polyinstantiate
-polyinstantiater(remote_login_t)
-
-ifdef(`alsa.te', `
-domain_auto_trans($1_login_t, alsa_exec_t, alsa_t)
-')
-
-allow remote_login_t userpty_type:chr_file { setattr write };
-allow remote_login_t ptyfile:chr_file { getattr ioctl };
-
-optional_policy(`rlogind',`
-	allow remote_login_t rlogind_devpts_t:chr_file { setattr rw_file_perms };
-	allow remote_login_t rlogind_devpts_t:chr_file { relabelfrom relabelto };
-')
-
-optional_policy(`telnetd',`
-	allow remote_login_t telnetd_devpts_t:chr_file { setattr rw_file_perms };
-	allow remote_login_t telnetd_devpts_t:chr_file { relabelfrom relabelto };
-')
-') dnl endif TODO
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.12/policy/modules/services/sendmail.te
--- nsaserefpolicy/policy/modules/services/sendmail.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/sendmail.te	2006-02-08 11:43:58.000000000 -0500
@@ -65,6 +65,7 @@
 
 # for piping mail to a command
 corecmd_exec_shell(sendmail_t)
+corecmd_search_sbin(sendmail_t)
 
 domain_use_wide_inherit_fd(sendmail_t)
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.12/policy/modules/services/spamassassin.te
--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/spamassassin.te	2006-02-08 11:43:58.000000000 -0500
@@ -77,6 +77,8 @@
 # DnsResolver.pm module which binds to
 # random ports >= 1024.
 corenet_udp_bind_generic_port(spamd_t)
+corenet_tcp_connect_razor_port(spamd_t)
+sysnet_use_ldap(spamd_t)
 
 dev_read_sysfs(spamd_t)
 dev_read_urand(spamd_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.12/policy/modules/services/zebra.te
--- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/services/zebra.te	2006-02-08 11:43:58.000000000 -0500
@@ -34,7 +34,7 @@
 allow zebra_t self:unix_dgram_socket create_socket_perms;
 allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
 allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
-allow zebra_t self:tcp_socket connected_stream_socket_perms;
+allow zebra_t self:tcp_socket { connect connected_stream_socket_perms };
 allow zebra_t self:udp_socket create_socket_perms;
 allow zebra_t self:rawip_socket create_socket_perms;
 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.12/policy/modules/system/fstools.te
--- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/fstools.te	2006-02-09 07:06:48.000000000 -0500
@@ -57,6 +57,8 @@
 kernel_rw_unlabeled_dirs(fsadm_t)
 kernel_rw_unlabeled_blk_files(fsadm_t)
 
+bootloader_getattr_boot_dirs(fsadm_t)
+
 dev_getattr_all_chr_files(fsadm_t)
 # mkreiserfs and other programs need this for UUID
 dev_read_rand(fsadm_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.12/policy/modules/system/init.fc
--- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/init.fc	2006-02-08 11:43:58.000000000 -0500
@@ -22,7 +22,8 @@
 #
 # /sbin
 #
-/sbin/init		--	gen_context(system_u:object_r:init_exec_t,s0)
+/sbin/init(ng)?		--	gen_context(system_u:object_r:init_exec_t,s0)
+
 
 ifdef(`distro_gentoo', `
 /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.12/policy/modules/system/libraries.if
--- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/libraries.if	2006-02-08 11:43:58.000000000 -0500
@@ -70,6 +70,23 @@
 
 ########################################
 ## <summary>
+##	Allow domain execute_no_trans on ld_so_t
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
+#
+interface(`libs_execute_no_trans_ld_so',`
+	gen_require(`
+		type ld_so_t;
+	')
+
+	files_list_etc($1)
+	allow $1 ld_so_t:file execute_no_trans;
+')
+
+########################################
+## <summary>
 ##	Use the dynamic link/loader for automatic loading
 ##	of shared libraries with legacy support.
 ## </summary>
@@ -253,6 +270,7 @@
 
 	allow $1 lib_t:dir search_dir_perms;
 	allow $1 lib_t:file manage_file_perms;
+	allow $1 lib_t:lnk_file unlink;
 ')
 
 ########################################
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.12/policy/modules/system/libraries.te
--- nsaserefpolicy/policy/modules/system/libraries.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/libraries.te	2006-02-08 11:43:58.000000000 -0500
@@ -53,6 +53,7 @@
 
 allow ldconfig_t ld_so_cache_t:file create_file_perms;
 files_filetrans_etc(ldconfig_t,ld_so_cache_t,file)
+files_search_usr(ldconfig_t)
 
 allow ldconfig_t lib_t:dir rw_dir_perms;
 allow ldconfig_t lib_t:lnk_file { getattr create read unlink };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.12/policy/modules/system/locallogin.te
--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/locallogin.te	2006-02-08 11:43:58.000000000 -0500
@@ -214,10 +214,8 @@
 	alsa_domtrans(local_login_t)
 ')
 
-ifdef(`TODO',`
 # Login can polyinstantiate
-polyinstantiater(local_login_t)
-') dnl endif TODO
+files_polyinstantiate_all(local_login_t)
 
 #################################
 # 
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.12/policy/modules/system/logging.te
--- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/logging.te	2006-02-08 11:43:58.000000000 -0500
@@ -92,6 +92,8 @@
 	term_use_unallocated_ttys(auditctl_t)
 ')
 
+term_use_all_terms(auditctl_t)
+
 ifdef(`TODO',`
 role secadm_r types auditctl_t;
 role sysadm_r types auditctl_t;
@@ -114,7 +116,7 @@
 
 allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
 dontaudit auditd_t self:capability sys_tty_config;
-allow auditd_t self:process { signal_perms setsched };
+allow auditd_t self:process { signal_perms setpgid setsched };
 allow auditd_t self:file { getattr read write };
 allow auditd_t self:unix_dgram_socket create_socket_perms;
 allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.12/policy/modules/system/mount.te
--- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/mount.te	2006-02-08 11:43:58.000000000 -0500
@@ -33,6 +33,8 @@
 dev_getattr_all_blk_files(mount_t)
 dev_list_all_dev_nodes(mount_t)
 dev_rw_lvm_control(mount_t)
+dev_dontaudit_getattr_memory_dev(mount_t)
+dev_getattr_sound_dev(mount_t)
 
 storage_raw_read_fixed_disk(mount_t)
 storage_raw_write_fixed_disk(mount_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.12/policy/modules/system/selinuxutil.te
--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/selinuxutil.te	2006-02-09 07:21:02.000000000 -0500
@@ -245,6 +245,7 @@
 selinux_compute_relabel_context(newrole_t)
 selinux_compute_user_contexts(newrole_t)
 
+term_dontaudit_use_unallocated_ttys(newrole_t)
 term_use_all_user_ttys(newrole_t)
 term_use_all_user_ptys(newrole_t)
 term_relabel_all_user_ttys(newrole_t)
@@ -354,6 +355,7 @@
 init_use_script_ptys(restorecon_t)
 
 domain_use_wide_inherit_fd(restorecon_t)
+domain_dontaudit_search_all_domains_state(restorecon_t)
 
 files_read_etc_runtime_files(restorecon_t)
 files_read_etc_files(restorecon_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.12/policy/modules/system/udev.te
--- nsaserefpolicy/policy/modules/system/udev.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/udev.te	2006-02-08 11:43:58.000000000 -0500
@@ -18,6 +18,8 @@
 domain_obj_id_change_exemption(udev_t)
 domain_entry_file(udev_t,udev_helper_exec_t)
 domain_wide_inherit_fd(udev_t)
+domain_read_all_domains_state(udev_t)
+
 init_daemon_domain(udev_t,udev_exec_t)
 
 type udev_etc_t alias etc_udev_t;
@@ -90,7 +92,7 @@
 dev_delete_generic_files(udev_t)
 
 fs_getattr_all_fs(udev_t)
-fs_search_inotifyfs(udev_t)
+fs_list_inotifyfs(udev_t)
 
 selinux_get_fs_mount(udev_t)
 selinux_validate_context(udev_t)
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.12/policy/modules/system/unconfined.te
--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-07 10:43:26.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/unconfined.te	2006-02-08 11:43:58.000000000 -0500
@@ -152,4 +152,10 @@
 	optional_policy(`xserver',`
 		xserver_domtrans_xdm_xserver(unconfined_t)
 	')
+	optional_policy(`fstools',`
+		fstools_domtrans(unconfined_t)
+	')
+	optional_policy(`mount',`
+		mount_domtrans(unconfined_t)
+	')
 ')
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.12/policy/modules/system/userdomain.if
--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-03 15:45:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/userdomain.if	2006-02-08 11:43:58.000000000 -0500
@@ -2817,6 +2817,23 @@
 
 ########################################
 ## <summary>
+##	Do not audit attempts to append to the staff
+##	users home directory.
+## </summary>
+## <param name="domain">
+##	Domain to not audit.
+## </param>
+#
+interface(`userdom_dontaudit_append_staff_home_files',`
+	gen_require(`
+		type staff_home_t;
+	')
+
+	dontaudit $1 staff_home_t:file append;
+')
+
+########################################
+## <summary>
 ##	Read files in the staff users home directory.
 ## </summary>
 ## <param name="domain">
diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.12/policy/modules/system/userdomain.te
--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
+++ serefpolicy-2.2.12/policy/modules/system/userdomain.te	2006-02-08 11:43:58.000000000 -0500
@@ -162,10 +162,13 @@
 		')
 	')
 
+	init_exec(sysadm_t)
+
 	ifdef(`enable_mls',`
 		logging_read_audit_log(secadm_t)
 		logging_domtrans_auditctl(secadm_t)
 		mls_process_read_up(secadm_t)
+		userdom_dontaudit_append_staff_home_files(secadm_t)
 	', `
 		logging_domtrans_auditctl(sysadm_t)
 		logging_read_audit_log(sysadm_t)
@@ -224,6 +227,10 @@
 
 	optional_policy(`dmesg',`
 		dmesg_exec(sysadm_t)
+		ifdef(`enable_mls',`
+			dmesg_exec(secadm_t)
+		')
+
 	')
 
 	optional_policy(`dmidecode',`


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- selinux-policy.spec	6 Feb 2006 19:12:13 -0000	1.101
+++ selinux-policy.spec	9 Feb 2006 12:26:53 -0000	1.102
@@ -5,12 +5,12 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.11
-Release: 2
+Version: 2.2.12
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
-patch: policy-20060104.patch
+patch: policy-20060207.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: seusers-targeted
@@ -295,6 +295,10 @@
 
 %changelog
 
+* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 2.2.12-1
+- Update from upstream
+
+
 * Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 2.2.11-2
 - Fix for spamd to use razor port
 


Index: seusers-mls
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/seusers-mls,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seusers-mls	29 Nov 2005 05:22:53 -0000	1.2
+++ seusers-mls	9 Feb 2006 12:26:53 -0000	1.3
@@ -1,2 +1,3 @@
+system_u:system_u:s0-s15:c0.c255
 root:root:s0-s15:c0.c255
 __default__:user_u:s0


Index: seusers-strict
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/seusers-strict,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seusers-strict	24 Jan 2006 15:41:46 -0000	1.1
+++ seusers-strict	9 Feb 2006 12:26:53 -0000	1.2
@@ -1,2 +1,3 @@
+system_u:system_u:s0-s0:c0.c255
 root:root:s0-s0:c0.c255
 __default__:user_u:s0


--- policy-20060104.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  9 13:19:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 08:19:35 -0500
Subject: rpms/tzdata/devel .cvsignore, 1.19, 1.20 sources, 1.21,
	1.22 tzdata.spec, 1.25, 1.26
Message-ID: <200602091319.k19DJZbi031877@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31762

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Minor changes.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	2 Feb 2006 19:55:43 -0000	1.19
+++ .cvsignore	9 Feb 2006 13:19:31 -0000	1.20
@@ -1,3 +1,3 @@
-tzdata2006a-base.tar.bz2
+tzdata2006a-2-base.tar.bz2
 tzdata2006a.tar.gz
 tzcode2006a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	2 Feb 2006 19:55:43 -0000	1.21
+++ sources	9 Feb 2006 13:19:31 -0000	1.22
@@ -1,3 +1,3 @@
-325dba39b9741b63b94e4c05a3fefd5c  tzdata2006a-base.tar.bz2
+906a4c98cc5240f416524a256b039c42  tzdata2006a-2-base.tar.bz2
 69e6b498bf4b8d66568fa9a7816b6321  tzdata2006a.tar.gz
 00c545c57ce1bbfbc550eb21244cf57b  tzcode2006a.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tzdata.spec	2 Feb 2006 19:55:43 -0000	1.25
+++ tzdata.spec	9 Feb 2006 13:19:31 -0000	1.26
@@ -1,10 +1,10 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2006a
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
-Source0: tzdata%{version}-base.tar.bz2
+Source0: tzdata%{version}-%{release}-base.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 Buildroot: /var/tmp/tzdata-root
@@ -22,12 +22,12 @@
 tar xzf %{SOURCE1} -C %{name}%{version}
 mkdir tzcode%{version}
 tar xzf %{SOURCE2} -C tzcode%{version}
-
-%build
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
     -e 's|@install_root@|%{buildroot}|' \
   Makeconfig.in > Makeconfig
+
+%build
 make
 grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
 
@@ -46,6 +46,9 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Feb 02 2006 Petr Machata <pmachata at redhat.com> 2006a-2
+- Small changes in tst-timezone.c
+
 * Thu Feb 02 2006 Petr Machata <pmachata at redhat.com> 2006a-1
 - Upstream 2006a:
   - private.h(scheck): changing char* to char const*



From fedora-cvs-commits at redhat.com  Thu Feb  9 13:22:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 08:22:28 -0500
Subject: rpms/rsh/devel netkit-rsh-0.17-rlogin-linefeed.patch, NONE,
	1.1 rsh.spec, 1.25, 1.26
Message-ID: <200602091322.k19DMSPp000767@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv726

Modified Files:
	rsh.spec 
Added Files:
	netkit-rsh-0.17-rlogin-linefeed.patch 
Log Message:
rlogind fix

netkit-rsh-0.17-rlogin-linefeed.patch:
 sockconv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE netkit-rsh-0.17-rlogin-linefeed.patch ---
--- netkit-rsh-0.17/rlogind/sockconv.c.linefeed	2006-02-09 14:10:27.000000000 +0100
+++ netkit-rsh-0.17/rlogind/sockconv.c	2006-02-09 14:11:06.000000000 +0100
@@ -126,16 +126,16 @@
       }
       break;
     case PAM_ERROR_MSG:
-      fprintf(stderr,"%s\n",msgm[replies]->msg);
+      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
       string = NULL;
       
       break;
     case PAM_TEXT_INFO:
-      fprintf(stderr,"%s\n",msgm[replies]->msg);
+      fprintf(stderr,"%s\r\n",msgm[replies]->msg);
       string = NULL;
       break;
     default:
-      fprintf(stderr, "erroneous conversation (%d)\n"
+      fprintf(stderr, "erroneous conversation (%d)\r\n"
 	      ,msgm[replies]->msg_style);
       drop_reply(reply,replies);
       return (PAM_CONV_ERR);


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- rsh.spec	7 Feb 2006 13:45:37 -0000	1.25
+++ rsh.spec	9 Feb 2006 13:22:25 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 33.2
+Release: 34
 License: BSD
 Group: Applications/Internet
 
@@ -46,6 +46,7 @@
 Patch26: netkit-rsh-0.17-pam-conv.patch
 Patch27: netkit-rsh-0.17-rcp-largefile.patch
 Patch28: netkit-rsh-0.17-pam-rhost.patch
+Patch29: netkit-rsh-0.17-rlogin-linefeed.patch
 
 %description
 The rsh package contains a set of programs which allow users to run
@@ -106,7 +107,7 @@
 %patch26 -p1 -b .pam-conv
 %patch27 -p1 -b .largefile
 %patch28 -p1 -b .pam-rhost
-
+%patch29 -p1 -b .linefeed
 
 # No, I don't know what this is doing in the tarball.
 rm -f rexec/rexec
@@ -175,10 +176,13 @@
 %{_mandir}/man8/*.8*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-33.2
+* Thu Feb  9 2006 Karel Zak <kzak at redhat.com> 0.17-34
+- fix #178916 - Line feeds when password needs changing with rlogin
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.17-33.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0.17-33.1
 - rebuilt
 
 * Mon Nov 28 2005 Karel Zak <kzak at redhat.com> 0.17-33
@@ -324,7 +328,7 @@
 - expunge all mentions of kerberos authentication or DES encryption using
   kerberos from the man pages
 
-* Thu May 25 2000 Trond Eivind Glomsr?d <teg at redhat.com>
+* Thu May 25 2000 Trond Eivind Glomsrod <teg at redhat.com>
 - switched to xinetd
 
 * Tue Mar  7 2000 Jeff Johnson <jbj at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Feb  9 13:56:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 08:56:55 -0500
Subject: rpms/selinux-policy/devel .cvsignore,1.35,1.36 sources,1.39,1.40
Message-ID: <200602091356.k19DutLk026204@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26173

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	4 Feb 2006 03:03:20 -0000	1.35
+++ .cvsignore	9 Feb 2006 13:56:52 -0000	1.36
@@ -36,3 +36,4 @@
 serefpolicy-2.2.9.tgz
 serefpolicy-2.2.10.tgz
 serefpolicy-2.2.11.tgz
+serefpolicy-2.2.12.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	4 Feb 2006 03:03:32 -0000	1.39
+++ sources	9 Feb 2006 13:56:52 -0000	1.40
@@ -1 +1 @@
-5ebd15e9870ac40f8be45b5a999750cb  serefpolicy-2.2.11.tgz
+90df72dee4541507737910ff48175760  serefpolicy-2.2.12.tgz



From fedora-cvs-commits at redhat.com  Thu Feb  9 14:04:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 09:04:24 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.24,
	1.25 selinux-policy-targeted.spec, 1.357, 1.358
Message-ID: <200602091404.k19E4OZ8027315@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27278

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
- Allow zebra to connect to bgp


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    5 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   14 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1680 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policy-20050916.patch	6 Feb 2006 16:12:27 -0000	1.24
+++ policy-20050916.patch	9 Feb 2006 14:04:15 -0000	1.25
@@ -3099,7 +3099,7 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-06 11:10:45.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-09 08:59:05.000000000 -0500
 @@ -8,7 +8,7 @@
  type zebra_conf_t, file_type, sysadmfile;
  r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
@@ -3109,15 +3109,17 @@
  can_ypbind(zebra_t)
  allow zebra_t { etc_t etc_runtime_t }:file { getattr read };
  
-@@ -24,7 +24,7 @@
+@@ -24,8 +24,9 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow zebra_t self:rawip_socket create_socket_perms;
 -allow zebra_t self:netlink_route_socket r_netlink_socket_perms;
 +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
  allow zebra_t zebra_port_t:tcp_socket name_bind;
++allow zebra_t bgp_port_t:tcp_socket name_connect;
  
  allow zebra_t proc_t:file { getattr read };
+ allow zebra_t { sysctl_t sysctl_net_t }:dir search;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/useradd.te policy-1.27.1/domains/program/useradd.te
 --- nsapolicy/domains/program/useradd.te	2005-09-16 11:17:27.000000000 -0400
 +++ policy-1.27.1/domains/program/useradd.te	2005-11-30 16:42:28.000000000 -0500
@@ -4946,7 +4948,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts
 --- nsapolicy/net_contexts	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/net_contexts	2006-02-06 11:09:39.000000000 -0500
++++ policy-1.27.1/net_contexts	2006-02-09 08:58:02.000000000 -0500
 @@ -50,6 +50,10 @@
  portcon tcp 53 system_u:object_r:dns_port_t
  
@@ -4979,7 +4981,7 @@
  portcon udp 4569 system_u:object_r:asterisk_port_t
  portcon udp 5060 system_u:object_r:asterisk_port_t
  portcon tcp 2000 system_u:object_r:mail_port_t
-+portcon tcp 179  system_u:object_r:zebra_port_t
++portcon tcp 179  system_u:object_r:bgp_port_t
  portcon tcp 2601 system_u:object_r:zebra_port_t
 +portcon tcp 2605 system_u:object_r:zebra_port_t
  portcon tcp 2628 system_u:object_r:dict_port_t
@@ -5252,7 +5254,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicy/types/network.te policy-1.27.1/types/network.te
 --- nsapolicy/types/network.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/types/network.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/types/network.te	2006-02-09 08:58:32.000000000 -0500
 @@ -18,7 +18,7 @@
  type dhcpd_port_t, port_type, reserved_port_type;
  type smbd_port_t, port_type, reserved_port_type;
@@ -5279,7 +5281,11 @@
  type howl_port_t, port_type;
  type dict_port_t, port_type;
  type syslogd_port_t, port_type, reserved_port_type;
-@@ -120,11 +119,13 @@
+@@ -117,14 +116,17 @@
+ type dhcpc_port_t, port_type, reserved_port_type;
+ type ntp_port_t, port_type, reserved_port_type;
+ type stunnel_port_t, port_type;
++type bgp_port_t, port_type, reserved_port_type;
  type zebra_port_t, port_type;
  type i18n_input_port_t, port_type;
  type vnc_port_t, port_type;
@@ -5295,7 +5301,7 @@
  type postgrey_port_t, port_type;
  type asterisk_port_t, port_type;
  type utcpserver_port_t, port_type;
-@@ -157,7 +158,7 @@
+@@ -157,7 +159,7 @@
  type telnetd_port_t, port_type, reserved_port_type;
  type comsat_port_t, port_type, reserved_port_type;
  type cvs_port_t, port_type;


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- selinux-policy-targeted.spec	6 Feb 2006 16:12:27 -0000	1.357
+++ selinux-policy-targeted.spec	9 Feb 2006 14:04:20 -0000	1.358
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.21
+Release: 2.22
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,6 +234,9 @@
 exit 0
 
 %changelog
+* Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
+- Allow zebra to connect to bgp
+
 * Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
 - Allow zebra to use bgp
 - Allow spamd to connect to razor



From fedora-cvs-commits at redhat.com  Thu Feb  9 14:06:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 09:06:19 -0500
Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.21,
	1.22 selinux-policy-strict.spec, 1.337, 1.338
Message-ID: <200602091406.k19E6JTT027499@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-strict/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27440

Modified Files:
	policy-20050916.patch selinux-policy-strict.spec 
Log Message:
* Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
- Allow zebra to connect to bgp


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    5 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   14 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1680 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policy-20050916.patch	7 Feb 2006 16:37:22 -0000	1.21
+++ policy-20050916.patch	9 Feb 2006 14:06:08 -0000	1.22
@@ -3099,7 +3099,7 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-06 11:10:45.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-09 08:59:05.000000000 -0500
 @@ -8,7 +8,7 @@
  type zebra_conf_t, file_type, sysadmfile;
  r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
@@ -3109,15 +3109,17 @@
  can_ypbind(zebra_t)
  allow zebra_t { etc_t etc_runtime_t }:file { getattr read };
  
-@@ -24,7 +24,7 @@
+@@ -24,8 +24,9 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow zebra_t self:rawip_socket create_socket_perms;
 -allow zebra_t self:netlink_route_socket r_netlink_socket_perms;
 +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
  allow zebra_t zebra_port_t:tcp_socket name_bind;
++allow zebra_t bgp_port_t:tcp_socket name_connect;
  
  allow zebra_t proc_t:file { getattr read };
+ allow zebra_t { sysctl_t sysctl_net_t }:dir search;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/useradd.te policy-1.27.1/domains/program/useradd.te
 --- nsapolicy/domains/program/useradd.te	2005-09-16 11:17:27.000000000 -0400
 +++ policy-1.27.1/domains/program/useradd.te	2005-11-30 16:42:28.000000000 -0500
@@ -4946,7 +4948,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts
 --- nsapolicy/net_contexts	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/net_contexts	2006-02-06 11:09:39.000000000 -0500
++++ policy-1.27.1/net_contexts	2006-02-09 08:58:02.000000000 -0500
 @@ -50,6 +50,10 @@
  portcon tcp 53 system_u:object_r:dns_port_t
  
@@ -4979,7 +4981,7 @@
  portcon udp 4569 system_u:object_r:asterisk_port_t
  portcon udp 5060 system_u:object_r:asterisk_port_t
  portcon tcp 2000 system_u:object_r:mail_port_t
-+portcon tcp 179  system_u:object_r:zebra_port_t
++portcon tcp 179  system_u:object_r:bgp_port_t
  portcon tcp 2601 system_u:object_r:zebra_port_t
 +portcon tcp 2605 system_u:object_r:zebra_port_t
  portcon tcp 2628 system_u:object_r:dict_port_t
@@ -5252,7 +5254,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicy/types/network.te policy-1.27.1/types/network.te
 --- nsapolicy/types/network.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/types/network.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/types/network.te	2006-02-09 08:58:32.000000000 -0500
 @@ -18,7 +18,7 @@
  type dhcpd_port_t, port_type, reserved_port_type;
  type smbd_port_t, port_type, reserved_port_type;
@@ -5279,7 +5281,11 @@
  type howl_port_t, port_type;
  type dict_port_t, port_type;
  type syslogd_port_t, port_type, reserved_port_type;
-@@ -120,11 +119,13 @@
+@@ -117,14 +116,17 @@
+ type dhcpc_port_t, port_type, reserved_port_type;
+ type ntp_port_t, port_type, reserved_port_type;
+ type stunnel_port_t, port_type;
++type bgp_port_t, port_type, reserved_port_type;
  type zebra_port_t, port_type;
  type i18n_input_port_t, port_type;
  type vnc_port_t, port_type;
@@ -5295,7 +5301,7 @@
  type postgrey_port_t, port_type;
  type asterisk_port_t, port_type;
  type utcpserver_port_t, port_type;
-@@ -157,7 +158,7 @@
+@@ -157,7 +159,7 @@
  type telnetd_port_t, port_type, reserved_port_type;
  type comsat_port_t, port_type, reserved_port_type;
  type cvs_port_t, port_type;


Index: selinux-policy-strict.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- selinux-policy-strict.spec	7 Feb 2006 16:21:06 -0000	1.337
+++ selinux-policy-strict.spec	9 Feb 2006 14:06:08 -0000	1.338
@@ -11,7 +11,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.21
+Release: 2.22
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -229,6 +229,9 @@
 exit 0
 
 %changelog
+* Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
+- Allow zebra to connect to bgp
+
 * Mon Feb 6 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.21
 - Allow zebra to use bgp
 - Allow spamd to connect to razor



From fedora-cvs-commits at redhat.com  Thu Feb  9 14:31:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 09:31:32 -0500
Subject: rpms/redhat-artwork/devel .cvsignore, 1.68, 1.69 redhat-artwork.spec,
	1.120, 1.121 sources, 1.69, 1.70
Message-ID: <200602091431.k19EVWk6016432@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16364

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
left handed cursor themes



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore	5 Feb 2006 07:03:41 -0000	1.68
+++ .cvsignore	9 Feb 2006 14:31:30 -0000	1.69
@@ -5,3 +5,4 @@
 redhat-artwork-0.235.tar.gz
 redhat-artwork-0.236.tar.gz
 redhat-artwork-0.237.tar.gz
+redhat-artwork-0.238.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- redhat-artwork.spec	7 Feb 2006 13:43:08 -0000	1.120
+++ redhat-artwork.spec	9 Feb 2006 14:31:30 -0000	1.121
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.237
-Release: 1.1
+Version: 0.238
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -51,7 +51,6 @@
 tar xjf %{SOURCE3}
 %patch0 -p1 -b .clearlooks
 %patch2 -p1 -b .padding-fix
-#%patch3 -p1 -b .throbber
 %patch4 -p1 -b .remove-throbber
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
@@ -154,6 +153,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 0.238-1
+- Add left-handed cursor themes
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.237-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	5 Feb 2006 07:03:41 -0000	1.69
+++ sources	9 Feb 2006 14:31:30 -0000	1.70
@@ -1,4 +1 @@
-d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
-cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
-395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-bed7216a1b18c2138b0505205f5d795f  redhat-artwork-0.237.tar.gz
+5eaa09532af562bea59c10c28356928d  redhat-artwork-0.238.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 14:41:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 09:41:56 -0500
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.121,1.122
Message-ID: <200602091441.k19Efud1011545@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11530

Modified Files:
	redhat-artwork.spec 
Log Message:
remove gu.po patch



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- redhat-artwork.spec	9 Feb 2006 14:31:30 -0000	1.121
+++ redhat-artwork.spec	9 Feb 2006 14:41:54 -0000	1.122
@@ -52,6 +52,7 @@
 %patch0 -p1 -b .clearlooks
 %patch2 -p1 -b .padding-fix
 %patch4 -p1 -b .remove-throbber
+
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 14:51:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 09:51:07 -0500
Subject: rpms/redhat-artwork/devel sources,1.70,1.71
Message-ID: <200602091451.k19Ep72l024274@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24254

Modified Files:
	sources 
Log Message:
fix sources



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	9 Feb 2006 14:31:30 -0000	1.70
+++ sources	9 Feb 2006 14:51:04 -0000	1.71
@@ -1 +1,4 @@
+d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
+cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
+395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
 5eaa09532af562bea59c10c28356928d  redhat-artwork-0.238.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:09:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:09:28 -0500
Subject: rpms/system-config-kickstart/devel .cvsignore, 1.23, 1.24 sources,
	1.29, 1.30 system-config-kickstart.spec, 1.33, 1.34
Message-ID: <200602091509.k19F9SbP003741@cvs.devel.redhat.com>

Author: clumens

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

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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Feb 2006 20:19:23 -0000	1.23
+++ .cvsignore	9 Feb 2006 15:09:26 -0000	1.24
@@ -16,3 +16,4 @@
 system-config-kickstart-2.6.3.tar.bz2
 system-config-kickstart-2.6.4.tar.bz2
 system-config-kickstart-2.6.5.tar.bz2
+system-config-kickstart-2.6.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	7 Feb 2006 20:19:23 -0000	1.29
+++ sources	9 Feb 2006 15:09:26 -0000	1.30
@@ -1 +1 @@
-2ca40213a5c70a04bb31441dbc59879d  system-config-kickstart-2.6.5.tar.bz2
+e8cb25a720a8c40581056c6e6b1cccc3  system-config-kickstart-2.6.6.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- system-config-kickstart.spec	7 Feb 2006 20:19:23 -0000	1.33
+++ system-config-kickstart.spec	9 Feb 2006 15:09:26 -0000	1.34
@@ -1,6 +1,6 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
-Version: 2.6.5
+Version: 2.6.6
 Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
@@ -77,6 +77,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 2.6.6-1
+- Fix .desktop file, other references to /usr/sbin.
+
 * Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 2.6.5-1
 - Smarter repo-enabling code (#180097).
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:24:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:24:45 -0500
Subject: rpms/notify-daemon/devel notify-daemon.spec,1.8,1.9
Message-ID: <200602091524.k19FOjmA022687@cvs.devel.redhat.com>

Author: laroche

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22610

Modified Files:
	notify-daemon.spec 
Log Message:
- remove empty scripts



Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- notify-daemon.spec	7 Feb 2006 13:14:21 -0000	1.8
+++ notify-daemon.spec	9 Feb 2006 15:24:42 -0000	1.9
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 6.1
+Release: 7
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -22,7 +22,6 @@
 Patch2: notify-daemon-0.3.1-xselection.patch
 
 %description
-
 notify-daemon is the server implementation of the freedesktop.org desktop 
 notification specification.  
 
@@ -33,7 +32,6 @@
 %patch2 -p1 -b .xselection
 
 %build
-
 %configure 
 make
 
@@ -45,10 +43,6 @@
 %clean
 rm -rf %{buildroot}
 
-%post
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS
@@ -57,6 +51,9 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
+- remove empty scripts from .spec file
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:33:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:33:09 -0500
Subject: rpms/libgssapi/devel libgssapi.spec,1.3,1.4
Message-ID: <200602091533.k19FX94D024723@cvs.devel.redhat.com>

Author: laroche

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24685

Modified Files:
	libgssapi.spec 
Log Message:
- remove empty scripts



Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgssapi.spec	7 Feb 2006 12:39:35 -0000	1.3
+++ libgssapi.spec	9 Feb 2006 15:33:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.7
-Release: 1.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.7.tar.gz
@@ -31,7 +31,6 @@
 
 %prep
 %setup -q
-
 %patch0 -p1
 
 %build
@@ -44,10 +43,7 @@
 %makeinstall
 install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
-%post
-/sbin/ldconfig
-
-%preun
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -70,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
+- remove empty scripts
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:39:56 -0500
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.4,1.5
Message-ID: <200602091539.k19Fdum9026183@cvs.devel.redhat.com>

Author: laroche

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26138

Modified Files:
	nfs-utils-lib.spec 
Log Message:
- remove empty scripts



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nfs-utils-lib.spec	7 Feb 2006 13:13:37 -0000	1.4
+++ nfs-utils-lib.spec	9 Feb 2006 15:39:53 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 2.1
+Release: 3
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -79,10 +79,7 @@
 	popd
 done
 
-%post
-/sbin/ldconfig
-
-%preun
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -131,6 +128,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Thu Feb 09 2006 Florian La Roche <laroche at redhat.com> 1.0.8-3
+- remove empty scripts
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:47:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:47:36 -0500
Subject: rpms/openoffice.org/devel sources,1.151,1.152
Message-ID: <200602091547.k19Flarw009270@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9241

Modified Files:
	sources 
Log Message:
in crashreporter, check for accessibility and a better GNOME/KDE test


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	31 Jan 2006 10:15:00 -0000	1.151
+++ sources	9 Feb 2006 15:47:34 -0000	1.152
@@ -2,7 +2,6 @@
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
 33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
-b96362d6fe9451cffc21da249038a007  openoffice.org-simple-crash_report.sh
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 374c6a2d4d846acf171d0fd212d4d7af  OOA680_m1.tar.bz2
@@ -10,3 +9,4 @@
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 8bc013e30e432ce3927e402e9aaa8c9f  redhat-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
+92c2b4d5ec968071f9722fa61277058a  openoffice.org-simple-crash_report.sh



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:55:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:55:58 -0500
Subject: rpms/eclipse/devel eclipse-ecj-rpmdebuginfo.patch,NONE,1.1
Message-ID: <200602091555.k19FtwxW013029@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12994

Added Files:
	eclipse-ecj-rpmdebuginfo.patch 
Log Message:
Add ecj rpm debuginfo patch.

eclipse-ecj-rpmdebuginfo.patch:
 Main.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

--- NEW FILE eclipse-ecj-rpmdebuginfo.patch ---
--- plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java.orig	2006-02-07 13:50:13.000000000 -0500
+++ plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java	2006-02-07 13:55:29.000000000 -0500
@@ -2405,6 +2405,28 @@
 			this.times = new long[this.repetitions];
 			this.timesCounter = 0;
 		}
+                {
+                       // If we're building an RPM, force full debugging info to
+                       // be generated, no matter what options have been passed
+                       // by Ant.  This is something of a kludge, but it is far
+                       // better than the alternative, which is having class
+                       // files with debug info mysteriously missing.
+
+                       String RpmPackageName = System.getenv("RPM_PACKAGE_NAME");
+                       String RpmArch = System.getenv("RPM_ARCH");
+                       String RpmBuildRoot = System.getenv("RPM_BUILD_ROOT");
+                       if (RpmPackageName != null && RpmArch != null && RpmBuildRoot != null) {
+                               this.options.put(
+                                   CompilerOptions.OPTION_LocalVariableAttribute,
+                                   CompilerOptions.GENERATE);
+                               this.options.put(
+                                   CompilerOptions.OPTION_LineNumberAttribute,
+                                   CompilerOptions.GENERATE);
+                               this.options.put(
+                                   CompilerOptions.OPTION_SourceFileAttribute,
+                                   CompilerOptions.GENERATE);
+                       }
+                }
 	}
 
 	private void addNewEntry(final int InsideClasspath, final int InsideSourcepath, ArrayList bootclasspaths, ArrayList classpaths,ArrayList sourcepathClasspaths, String currentClasspathName, ArrayList currentRuleSpecs, int mode, String customEncoding) {



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:56:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:56:32 -0500
Subject: rpms/kernel/FC-4 jwltest-acpi-dsdt-initrd.patch, NONE,
	1.1.48.1 jwltest-mii-force_media.patch, NONE,
	1.1.4.1 jwltest-rhine-mdelay-undo.patch, NONE,
	1.1.2.1 jwltest-sky2.patch, NONE,
	1.1.16.1 jwltest-tulip-last_irq.patch, NONE,
	1.1.6.1 jwltest-via-velocity-tx_csum.patch, NONE,
	1.1.14.1 kernel-2.6.spec, 1.1596, 1.1596.2.1
Message-ID: <200602091556.k19FuWfv013342@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc4-30-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc4-30-branch
	jwltest-acpi-dsdt-initrd.patch jwltest-mii-force_media.patch 
	jwltest-rhine-mdelay-undo.patch jwltest-sky2.patch 
	jwltest-tulip-last_irq.patch 
	jwltest-via-velocity-tx_csum.patch 
Log Message:


jwltest-acpi-dsdt-initrd.patch:
 drivers/acpi/Kconfig        |   13 +++++
 drivers/acpi/osl.c          |  104 +++++++++++++++++++++++++++++++++++++++-----
 drivers/acpi/tables/tbget.c |    5 ++
 init/main.c                 |   16 +++---
 4 files changed, 120 insertions(+), 18 deletions(-)

--- NEW FILE jwltest-acpi-dsdt-initrd.patch ---
--- linux-2.6.14/drivers/acpi/Kconfig.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/drivers/acpi/Kconfig	2005-11-07 15:45:27.000000000 -0500
@@ -341,4 +341,17 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
 
+config ACPI_INITRD
+	bool "Read DSDT from initrd or initramfs"
+	depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT
+	default n
+	help
+	  The DSDT (Differentiated System Description Table) often needs to be
+	  overridden because of broken BIOS implementations. If you want to use
+	  a customized DSDT, please use the mkinitrd tool (mkinitrd package) to 
+	  attach the DSDT to the initrd or initramfs 
+	  (see http://gaugusch.at/kernel.shtml for details)
+	  If there is no DSDT found in the initrd, the DSDT from the BIOS is
+	  used. It is save to say yes here.
+
 endmenu
--- linux-2.6.14/drivers/acpi/osl.c.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/drivers/acpi/osl.c	2005-11-07 15:45:27.000000000 -0500
@@ -44,6 +44,10 @@
 #include <asm/uaccess.h>
 
 #include <linux/efi.h>
+#ifdef CONFIG_ACPI_INITRD
+#include<linux/syscalls.h>
+#include <linux/initrd.h>
+#endif
 
 #define _COMPONENT		ACPI_OS_SERVICES
 ACPI_MODULE_NAME("osl")
@@ -244,24 +248,104 @@ acpi_os_predefined_override(const struct
 	return AE_OK;
 }
 
+#ifdef CONFIG_ACPI_INITRD
+static char *
+acpi_find_dsdt_initrd(void)
+{
+	static const char signature[] = "INITRDDSDT123DSDT123";
+	char *dsdt_start = NULL;
+	char *dsdt_buffer = NULL;
+	unsigned long len = 0, len2 = 0;
+	int fd;
+	char ramfs_dsdt_name[10] = "/DSDT.aml";
+	struct kstat stat;
+
+	/* try to get dsdt from tail of initrd */
+	if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) {
+		if (initrd_start) {
+			char *data = (char *)initrd_start;
+
+			printk(KERN_INFO PREFIX "Looking for DSDT in initrd...");
+
+			/* Search for the start signature */
+			while (data < (char *)initrd_end - sizeof(signature) - 4) {
+				if (!memcmp(data, signature, sizeof(signature))) {
+					data += sizeof(signature);
+					if (!memcmp(data, "DSDT", 4))
+						dsdt_start = data;
+					break;
+				}
+				data++;
+			}
+
+			if (dsdt_start){
+				printk(PREFIX " found at offset %zu",
+				       dsdt_start - (char *)initrd_start);
+				len = (char*) initrd_end - dsdt_start;
+				printk(", size: %zu bytes\n", len);
+				dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1);
+				memcpy(dsdt_buffer, dsdt_start, len);
+				*(dsdt_buffer + len + 1)= '\0';
+			}					
+			else
+				printk(" not found!\n");
+		}
+	}
+	/* get dsdt from initramfs */
+	else{
+		printk(KERN_INFO PREFIX "Looking for DSDT in initramfs...");
+		if (vfs_stat(ramfs_dsdt_name, &stat) < 0){
+			printk ("error getting stats for file %s\n", ramfs_dsdt_name);
+			return NULL;
+		}
+		
+		len = stat.size;
+		dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1);
+		if (!dsdt_buffer) {
+			printk("Could not allocate %lu bytes of memory\n", len);
+			return NULL;
+		}
+		printk (" found %s ...", ramfs_dsdt_name);
+		
+		len2 = sys_read (fd, (char __user *) dsdt_buffer, len);
+		if (len2 < len ){
+			printk(PREFIX "\nError trying to read %lu bytes from %s\n", 
+			       len, ramfs_dsdt_name);
+			ACPI_MEM_FREE (dsdt_buffer);
+			dsdt_buffer = NULL;
+		}
+		else{
+			printk(" successfully read %lu bytes from %s\n", 
+			       len, ramfs_dsdt_name);
+			*(dsdt_buffer + len + 1) = '\0';
+		}
+	}
+	if (!dsdt_buffer)
+	    printk(" not found!\n");
+	return dsdt_buffer;
+}
+#endif
+	
 acpi_status
-acpi_os_table_override(struct acpi_table_header * existing_table,
-		       struct acpi_table_header ** new_table)
+acpi_os_table_override (struct acpi_table_header *existing_table,
+			struct acpi_table_header **new_table)
 {
 	if (!existing_table || !new_table)
 		return AE_BAD_PARAMETER;
-
-#ifdef CONFIG_ACPI_CUSTOM_DSDT
-	if (strncmp(existing_table->signature, "DSDT", 4) == 0)
-		*new_table = (struct acpi_table_header *)AmlCode;
-	else
-		*new_table = NULL;
-#else
+		
 	*new_table = NULL;
+	if (strncmp(existing_table->signature, "DSDT", 4) == 0) {
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+		*new_table = (struct acpi_table_header*)AmlCode;
+#elif defined(CONFIG_ACPI_INITRD)
+		*new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd();
 #endif
+		if (*new_table)
+			printk(KERN_INFO PREFIX "Using customized DSDT\n");
+	}
 	return AE_OK;
 }
-
+ 
 static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
 	return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
--- linux-2.6.14/drivers/acpi/tables/tbget.c.orig	2005-11-07 15:46:15.000000000 -0500
+++ linux-2.6.14/drivers/acpi/tables/tbget.c	2005-11-07 15:46:08.000000000 -0500
@@ -283,6 +283,11 @@ acpi_tb_table_override(struct acpi_table
 	ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n",
 			  table_info->pointer->signature));
 
+#ifdef CONFIG_ACPI_INITRD
+	if (new_table)
+	    ACPI_MEM_FREE(new_table);
+#endif
+
 	return_ACPI_STATUS(AE_OK);
 }
 
--- linux-2.6.14/init/main.c.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/init/main.c	2005-11-07 15:45:27.000000000 -0500
@@ -540,8 +540,6 @@ asmlinkage void __init start_kernel(void
 
 	check_bugs();
 
-	acpi_early_init(); /* before LAPIC and SMP init */
-
 	/* Do the rest non-__init'ed, we're now alive */
 	rest_init();
 }
@@ -671,6 +669,14 @@ static int init(void * unused)
 	 */
 	child_reaper = current;
 
+	/*
+	 * Do this before initcalls, because some drivers want to access
+	 * firmware files.
+	 */
+	populate_rootfs();
+
+	acpi_early_init(); /* before LAPIC and SMP init */
+
 	/* Sets up cpus_possible() */
 	smp_prepare_cpus(max_cpus);
 
@@ -682,12 +688,6 @@ static int init(void * unused)
 
 	cpuset_init_smp();
 
-	/*
-	 * Do this before initcalls, because some drivers want to access
-	 * firmware files.
-	 */
-	populate_rootfs();
-
 	do_basic_setup();
 
 	/*

jwltest-mii-force_media.patch:
 mii.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE jwltest-mii-force_media.patch ---
--- linux-2.6.15/drivers/net/mii.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/mii.c	2006-01-09 13:49:32.000000000 -0500
@@ -266,10 +266,6 @@ unsigned int mii_check_media (struct mii
 	int advertise, lpa, media, duplex;
 	int lpa2 = 0;
 
-	/* if forced media, go no further */
-	if (mii->force_media)
-		return 0; /* duplex did not change */
-
 	/* check current and old link status */
 	old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0;
 	new_carrier = (unsigned int) mii_link_ok(mii);
@@ -293,6 +289,13 @@ unsigned int mii_check_media (struct mii
 	 */
 	netif_carrier_on(mii->dev);
 
+	/* if forced media, go no further */
+	if (mii->force_media) {
+		if (ok_to_print)
+			printk(KERN_INFO "%s: link up\n", mii->dev->name);
+		return 0; /* duplex did not change */
+	}
+
 	/* get MII advertise and LPA values */
 	if ((!init_media) && (mii->advertising))
 		advertise = mii->advertising;

jwltest-rhine-mdelay-undo.patch:
 via-rhine.c |   34 +++-------------------------------
 1 files changed, 3 insertions(+), 31 deletions(-)

--- NEW FILE jwltest-rhine-mdelay-undo.patch ---
--- linux-2.6.15/drivers/net/via-rhine.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/via-rhine.c	2006-02-09 10:52:37.000000000 -0500
@@ -490,8 +490,6 @@ struct rhine_private {
 	u8 tx_thresh, rx_thresh;
 
 	struct mii_if_info mii_if;
-	struct work_struct tx_timeout_task;
-	struct work_struct check_media_task;
 	void __iomem *base;
 };
 
@@ -499,8 +497,6 @@ static int  mdio_read(struct net_device 
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
 static int  rhine_open(struct net_device *dev);
 static void rhine_tx_timeout(struct net_device *dev);
-static void rhine_tx_timeout_task(struct net_device *dev);
-static void rhine_check_media_task(struct net_device *dev);
 static int  rhine_start_tx(struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
 static void rhine_tx(struct net_device *dev);
@@ -855,12 +851,6 @@ static int __devinit rhine_init_one(stru
 	if (rp->quirks & rqRhineI)
 		dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
 
-	INIT_WORK(&rp->tx_timeout_task,
-		  (void (*)(void *))rhine_tx_timeout_task, dev);
-
-	INIT_WORK(&rp->check_media_task,
-		  (void (*)(void *))rhine_check_media_task, dev);
-
 	/* dev->name not defined before register_netdev()! */
 	rc = register_netdev(dev);
 	if (rc)
@@ -1087,11 +1077,6 @@ static void rhine_check_media(struct net
 		   ioaddr + ChipCmd1);
 }
 
-static void rhine_check_media_task(struct net_device *dev)
-{
-	rhine_check_media(dev, 0);
-}
-
 static void init_registers(struct net_device *dev)
 {
 	struct rhine_private *rp = netdev_priv(dev);
@@ -1145,8 +1130,8 @@ static void rhine_disable_linkmon(void _
 	if (quirks & rqRhineI) {
 		iowrite8(0x01, ioaddr + MIIRegAddr);	// MII_BMSR
 
-		/* Do not call from ISR! */
-		msleep(1);
+		/* Can be called from ISR. Evil. */
+		mdelay(1);
 
 		/* 0x80 must be set immediately before turning it off */
 		iowrite8(0x80, ioaddr + MIICmd);
@@ -1236,16 +1221,6 @@ static int rhine_open(struct net_device 
 static void rhine_tx_timeout(struct net_device *dev)
 {
 	struct rhine_private *rp = netdev_priv(dev);
-
-	/*
-	 * Move bulk of work outside of interrupt context
-	 */
-	schedule_work(&rp->tx_timeout_task);
-}
-
-static void rhine_tx_timeout_task(struct net_device *dev)
-{
-	struct rhine_private *rp = netdev_priv(dev);
 	void __iomem *ioaddr = rp->base;
 
 	printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
@@ -1651,7 +1626,7 @@ static void rhine_error(struct net_devic
 	spin_lock(&rp->lock);
 
 	if (intr_status & IntrLinkChange)
-		schedule_work(&rp->check_media_task);
+		rhine_check_media(dev, 0);
 	if (intr_status & IntrStatsMax) {
 		rp->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);
 		rp->stats.rx_missed_errors += ioread16(ioaddr + RxMissed);
@@ -1899,9 +1874,6 @@ static int rhine_close(struct net_device
 	spin_unlock_irq(&rp->lock);
 
 	free_irq(rp->pdev->irq, dev);
-
-	flush_scheduled_work();
-
 	free_rbufs(dev);
 	free_tbufs(dev);
 	free_ring(dev);

jwltest-sky2.patch:
 Kconfig       |   18 
 Makefile      |    1 
 sky2.c        | 3040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sky2.h        | 1910 ++++++++++++++++++++++++++++++++++++
 sky2_compat.h |    6 
 5 files changed, 4975 insertions(+)

--- NEW FILE jwltest-sky2.patch ---
--- linux-2.6.14/drivers/net/sky2.h.orig	2005-11-14 09:45:48.000000000 -0500
+++ linux-2.6.14/drivers/net/sky2.h	2005-11-14 09:45:56.000000000 -0500
@@ -0,0 +1,1910 @@
+/*
+ * Definitions for the new Marvell Yukon 2 driver.
+ */
+#ifndef _SKY2_H
+#define _SKY2_H
+
+/* PCI config registers */
+#define PCI_DEV_REG1	0x40
+#define PCI_DEV_REG2	0x44
+#define PCI_DEV_STATUS  0x7c
+#define PCI_OS_PCI_X    (1<<26)
+
+#define PEX_LNK_STAT	0xf2
+#define PEX_UNC_ERR_STAT 0x104
+#define PEX_DEV_CTRL	0xe8
+
+/* Yukon-2 */
+enum pci_dev_reg_1 {
+	PCI_Y2_PIG_ENA	 = 1<<31, /* Enable Plug-in-Go (YUKON-2) */
+	PCI_Y2_DLL_DIS	 = 1<<30, /* Disable PCI DLL (YUKON-2) */
+	PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */
+	PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */
+	PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */
+	PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */
+};
+
+enum pci_dev_reg_2 {
+	PCI_VPD_WR_THR	= 0xffL<<24,	/* Bit 31..24:	VPD Write Threshold */
+	PCI_DEV_SEL	= 0x7fL<<17,	/* Bit 23..17:	EEPROM Device Select */
+	PCI_VPD_ROM_SZ	= 7L<<14,	/* Bit 16..14:	VPD ROM Size	*/
+
+	PCI_PATCH_DIR	= 0xfL<<8,	/* Bit 11.. 8:	Ext Patches dir 3..0 */
+	PCI_EXT_PATCHS	= 0xfL<<4,	/* Bit	7.. 4:	Extended Patches 3..0 */
+	PCI_EN_DUMMY_RD	= 1<<3,		/* Enable Dummy Read */
+	PCI_REV_DESC	= 1<<2,		/* Reverse Desc. Bytes */
+
+	PCI_USEDATA64	= 1<<0,		/* Use 64Bit Data bus ext */
+};
+
+
+#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
+			       PCI_STATUS_SIG_SYSTEM_ERROR | \
+			       PCI_STATUS_REC_MASTER_ABORT | \
+			       PCI_STATUS_REC_TARGET_ABORT | \
+			       PCI_STATUS_PARITY)
+
+enum pex_dev_ctrl {
+	PEX_DC_MAX_RRS_MSK	= 7<<12, /* Bit 14..12:	Max. Read Request Size */
+	PEX_DC_EN_NO_SNOOP	= 1<<11,/* Enable No Snoop */
+	PEX_DC_EN_AUX_POW	= 1<<10,/* Enable AUX Power */
+	PEX_DC_EN_PHANTOM	= 1<<9,	/* Enable Phantom Functions */
+	PEX_DC_EN_EXT_TAG	= 1<<8,	/* Enable Extended Tag Field */
+	PEX_DC_MAX_PLS_MSK	= 7<<5,	/* Bit  7.. 5:	Max. Payload Size Mask */
+	PEX_DC_EN_REL_ORD	= 1<<4,	/* Enable Relaxed Ordering */
+	PEX_DC_EN_UNS_RQ_RP	= 1<<3,	/* Enable Unsupported Request Reporting */
+	PEX_DC_EN_FAT_ER_RP	= 1<<2,	/* Enable Fatal Error Reporting */
+	PEX_DC_EN_NFA_ER_RP	= 1<<1,	/* Enable Non-Fatal Error Reporting */
+	PEX_DC_EN_COR_ER_RP	= 1<<0,	/* Enable Correctable Error Reporting */
+};
+#define  PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK)
+
+/* PEX_UNC_ERR_STAT	 PEX Uncorrectable Errors Status Register (Yukon-2) */
+enum pex_err {
+	PEX_UNSUP_REQ 	= 1<<20, /* Unsupported Request Error */
+
+	PEX_MALFOR_TLP	= 1<<18, /* Malformed TLP */
+
+	PEX_UNEXP_COMP	= 1<<16, /* Unexpected Completion */
+
+	PEX_COMP_TO	= 1<<14, /* Completion Timeout */
+	PEX_FLOW_CTRL_P	= 1<<13, /* Flow Control Protocol Error */
+	PEX_POIS_TLP	= 1<<12, /* Poisoned TLP */
+
+	PEX_DATA_LINK_P = 1<<4,	/* Data Link Protocol Error */
+	PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P),
+};
+
+
+enum csr_regs {
+	B0_RAP		= 0x0000,
+	B0_CTST		= 0x0004,
+	B0_Y2LED	= 0x0005,
+	B0_POWER_CTRL	= 0x0007,
+	B0_ISRC		= 0x0008,
+	B0_IMSK		= 0x000c,
+	B0_HWE_ISRC	= 0x0010,
+	B0_HWE_IMSK	= 0x0014,
+
+	/* Special ISR registers (Yukon-2 only) */
+	B0_Y2_SP_ISRC2	= 0x001c,
+	B0_Y2_SP_ISRC3	= 0x0020,
+	B0_Y2_SP_EISR	= 0x0024,
+	B0_Y2_SP_LISR	= 0x0028,
+	B0_Y2_SP_ICR	= 0x002c,
+
+	B2_MAC_1	= 0x0100,
+	B2_MAC_2	= 0x0108,
+	B2_MAC_3	= 0x0110,
+	B2_CONN_TYP	= 0x0118,
+	B2_PMD_TYP	= 0x0119,
+	B2_MAC_CFG	= 0x011a,
+	B2_CHIP_ID	= 0x011b,
+	B2_E_0		= 0x011c,
+
+	B2_Y2_CLK_GATE  = 0x011d,
+	B2_Y2_HW_RES	= 0x011e,
+	B2_E_3		= 0x011f,
+	B2_Y2_CLK_CTRL	= 0x0120,
+
+	B2_TI_INI	= 0x0130,
+	B2_TI_VAL	= 0x0134,
+	B2_TI_CTRL	= 0x0138,
+	B2_TI_TEST	= 0x0139,
+
+	B2_TST_CTRL1	= 0x0158,
+	B2_TST_CTRL2	= 0x0159,
+	B2_GP_IO	= 0x015c,
+
+	B2_I2C_CTRL	= 0x0160,
+	B2_I2C_DATA	= 0x0164,
+	B2_I2C_IRQ	= 0x0168,
+	B2_I2C_SW	= 0x016c,
+
+	B3_RAM_ADDR	= 0x0180,
+	B3_RAM_DATA_LO	= 0x0184,
+	B3_RAM_DATA_HI	= 0x0188,
+
+/* RAM Interface Registers */
+/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */
+/*
+ * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
+ * not usable in SW. Please notice these are NOT real timeouts, these are
+ * the number of qWords transferred continuously.
+ */
+#define RAM_BUFFER(port, reg)	(reg | (port <<6))
+
+	B3_RI_WTO_R1	= 0x0190,
+	B3_RI_WTO_XA1	= 0x0191,
+	B3_RI_WTO_XS1	= 0x0192,
+	B3_RI_RTO_R1	= 0x0193,
+	B3_RI_RTO_XA1	= 0x0194,
+	B3_RI_RTO_XS1	= 0x0195,
+	B3_RI_WTO_R2	= 0x0196,
+	B3_RI_WTO_XA2	= 0x0197,
+	B3_RI_WTO_XS2	= 0x0198,
+	B3_RI_RTO_R2	= 0x0199,
+	B3_RI_RTO_XA2	= 0x019a,
+	B3_RI_RTO_XS2	= 0x019b,
+	B3_RI_TO_VAL	= 0x019c,
+	B3_RI_CTRL	= 0x01a0,
+	B3_RI_TEST	= 0x01a2,
+	B3_MA_TOINI_RX1	= 0x01b0,
+	B3_MA_TOINI_RX2	= 0x01b1,
+	B3_MA_TOINI_TX1	= 0x01b2,
+	B3_MA_TOINI_TX2	= 0x01b3,
+	B3_MA_TOVAL_RX1	= 0x01b4,
+	B3_MA_TOVAL_RX2	= 0x01b5,
+	B3_MA_TOVAL_TX1	= 0x01b6,
+	B3_MA_TOVAL_TX2	= 0x01b7,
+	B3_MA_TO_CTRL	= 0x01b8,
+	B3_MA_TO_TEST	= 0x01ba,
+	B3_MA_RCINI_RX1	= 0x01c0,
+	B3_MA_RCINI_RX2	= 0x01c1,
+	B3_MA_RCINI_TX1	= 0x01c2,
+	B3_MA_RCINI_TX2	= 0x01c3,
+	B3_MA_RCVAL_RX1	= 0x01c4,
+	B3_MA_RCVAL_RX2	= 0x01c5,
+	B3_MA_RCVAL_TX1	= 0x01c6,
+	B3_MA_RCVAL_TX2	= 0x01c7,
+	B3_MA_RC_CTRL	= 0x01c8,
+	B3_MA_RC_TEST	= 0x01ca,
+	B3_PA_TOINI_RX1	= 0x01d0,
+	B3_PA_TOINI_RX2	= 0x01d4,
+	B3_PA_TOINI_TX1	= 0x01d8,
+	B3_PA_TOINI_TX2	= 0x01dc,
+	B3_PA_TOVAL_RX1	= 0x01e0,
+	B3_PA_TOVAL_RX2	= 0x01e4,
+	B3_PA_TOVAL_TX1	= 0x01e8,
+	B3_PA_TOVAL_TX2	= 0x01ec,
+	B3_PA_CTRL	= 0x01f0,
+	B3_PA_TEST	= 0x01f2,
+
+	Y2_CFG_SPC	= 0x1c00,
+};
+
+/*	B0_CTST			16 bit	Control/Status register */
+enum {
+	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */
+	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */
+	Y2_ASF_ENABLE	= 1<<13,/* ASF Unit Enable (YUKON-2 only) */
+	Y2_ASF_DISABLE	= 1<<12,/* ASF Unit Disable (YUKON-2 only) */
+	Y2_CLK_RUN_ENA	= 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */
+	Y2_CLK_RUN_DIS	= 1<<10,/* CLK_RUN Disable (YUKON-2 only) */
+	Y2_LED_STAT_ON	= 1<<9, /* Status LED On  (YUKON-2 only) */
+	Y2_LED_STAT_OFF	= 1<<8, /* Status LED Off (YUKON-2 only) */
+
[...4603 lines suppressed...]
+		goto err_out_free_regions;
+	}
+
+	memset(hw, 0, sizeof(*hw));
+	hw->pdev = pdev;
+	spin_lock_init(&hw->phy_lock);
+
+	hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+	if (!hw->regs) {
+		printk(KERN_ERR PFX "%s: cannot map device registers\n",
+		       pci_name(pdev));
+		goto err_out_free_hw;
+	}
+	hw->pm_cap = pm_cap;
+
+	err = sky2_reset(hw);
+	if (err)
+		goto err_out_iounmap;
+
+	printk(KERN_INFO PFX "addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",
+	       pci_resource_start(pdev, 0), pdev->irq,
+	       yukon_name[hw->chip_id - CHIP_ID_YUKON],
+	       hw->chip_id, hw->chip_rev);
+
+	dev = sky2_init_netdev(hw, 0, using_dac);
+	if (!dev)
+		goto err_out_free_pci;
+
+	err = register_netdev(dev);
+	if (err) {
+		printk(KERN_ERR PFX "%s: cannot register net device\n",
+		       pci_name(pdev));
+		goto err_out_free_netdev;
+	}
+
+	sky2_show_addr(dev);
+
+	if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) {
+		if (register_netdev(dev1) == 0)
+			sky2_show_addr(dev1);
+		else {
+			/* Failure to register second port need not be fatal */
+			printk(KERN_WARNING PFX
+			       "register of second port failed\n");
+			hw->dev[1] = NULL;
+			free_netdev(dev1);
+		}
+	}
+
+	err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw);
+	if (err) {
+		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
+		       pci_name(pdev), pdev->irq);
+		goto err_out_unregister;
+	}
+
+	hw->intr_mask = Y2_IS_BASE;
+	sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
+	pci_set_drvdata(pdev, hw);
+
+	return 0;
+
+err_out_unregister:
+	if (dev1) {
+		unregister_netdev(dev1);
+		free_netdev(dev1);
+	}
+	unregister_netdev(dev);
+err_out_free_netdev:
+	free_netdev(dev);
+err_out_free_pci:
+	sky2_write8(hw, B0_CTST, CS_RST_SET);
+	pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+err_out_iounmap:
+	iounmap(hw->regs);
+err_out_free_hw:
+	kfree(hw);
+err_out_free_regions:
+	pci_release_regions(pdev);
+	pci_disable_device(pdev);
+err_out:
+	return err;
+}
+
+static void __devexit sky2_remove(struct pci_dev *pdev)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	struct net_device *dev0, *dev1;
+
+	if (!hw)
+		return;
+
+	dev0 = hw->dev[0];
+	dev1 = hw->dev[1];
+	if (dev1)
+		unregister_netdev(dev1);
+	unregister_netdev(dev0);
+
+	sky2_write32(hw, B0_IMSK, 0);
+	sky2_set_power_state(hw, PCI_D3hot);
+	sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
+	sky2_write8(hw, B0_CTST, CS_RST_SET);
+	sky2_read8(hw, B0_CTST);
+
+	free_irq(pdev->irq, hw);
+	pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+	pci_release_regions(pdev);
+	pci_disable_device(pdev);
+
+	if (dev1)
+		free_netdev(dev1);
+	free_netdev(dev0);
+	iounmap(hw->regs);
+	kfree(hw);
+
+	pci_set_drvdata(pdev, NULL);
+}
+
+#ifdef CONFIG_PM
+static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	int i;
+
+	for (i = 0; i < 2; i++) {
+		struct net_device *dev = hw->dev[i];
+
+		if (dev) {
+			if (!netif_running(dev))
+				continue;
+
+			sky2_down(dev);
+			netif_device_detach(dev);
+		}
+	}
+
+	return sky2_set_power_state(hw, pci_choose_state(pdev, state));
+}
+
+static int sky2_resume(struct pci_dev *pdev)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	int i;
+
+	pci_restore_state(pdev);
+	pci_enable_wake(pdev, PCI_D0, 0);
+	sky2_set_power_state(hw, PCI_D0);
+
+	sky2_reset(hw);
+
+	for (i = 0; i < 2; i++) {
+		struct net_device *dev = hw->dev[i];
+		if (dev) {
+			if (netif_running(dev)) {
+				netif_device_attach(dev);
+				sky2_up(dev);
+			}
+		}
+	}
+	return 0;
+}
+#endif
+
+static struct pci_driver sky2_driver = {
+	.name = DRV_NAME,
+	.id_table = sky2_id_table,
+	.probe = sky2_probe,
+	.remove = __devexit_p(sky2_remove),
+#ifdef CONFIG_PM
+	.suspend = sky2_suspend,
+	.resume = sky2_resume,
+#endif
+};
+
+static int __init sky2_init_module(void)
+{
+	return pci_module_init(&sky2_driver);
+}
+
+static void __exit sky2_cleanup_module(void)
+{
+	pci_unregister_driver(&sky2_driver);
+}
+
+module_init(sky2_init_module);
+module_exit(sky2_cleanup_module);
+
+MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver");
+MODULE_AUTHOR("Stephen Hemminger <shemminger at osdl.org>");
+MODULE_LICENSE("GPL");
--- linux-2.6.14/drivers/net/sky2_compat.h.orig	2005-11-14 09:56:09.000000000 -0500
+++ linux-2.6.14/drivers/net/sky2_compat.h	2005-11-14 09:56:02.000000000 -0500
@@ -0,0 +1,6 @@
+#ifndef __SKY2_COMPAT_H__
+#define __SKY2_COMPAT_H__
+
+#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev)
+
+#endif /* __SKY2_COMPAT_H__ */

jwltest-tulip-last_irq.patch:
 tulip_core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jwltest-tulip-last_irq.patch ---
--- linux-2.6.14/drivers/net/tulip/tulip_core.c.orig	2005-12-13 15:31:26.000000000 -0500
+++ linux-2.6.14/drivers/net/tulip/tulip_core.c	2005-12-13 15:31:20.000000000 -0500
@@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str
 			    dev->dev_addr, 6);
 		}
 #endif
-#if defined(__i386__)		/* Patch up x86 BIOS bug. */
+#if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */
 		if (last_irq)
 			irq = last_irq;
 #endif

jwltest-via-velocity-tx_csum.patch:
 via-velocity.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jwltest-via-velocity-tx_csum.patch ---
--- linux-2.6.14/drivers/net/via-velocity.c.orig	2005-11-29 15:41:12.000000000 -0500
+++ linux-2.6.14/drivers/net/via-velocity.c	2005-11-29 15:41:47.000000000 -0500
@@ -792,7 +792,7 @@ static int __devinit velocity_found1(str
 #endif
 
 	if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) {
-		dev->features |= NETIF_F_HW_CSUM;
+		dev->features |= NETIF_F_IP_CSUM;
 	}
 
 	ret = register_netdev(dev);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1596
retrieving revision 1.1596.2.1
diff -u -r1.1596 -r1.1596.2.1
--- kernel-2.6.spec	9 Feb 2006 10:58:04 -0000	1.1596
+++ kernel-2.6.spec	9 Feb 2006 15:56:28 -0000	1.1596.2.1
@@ -19,7 +19,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.30
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -157,7 +158,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -230,6 +232,7 @@
 Patch306: linux-2.6-powerpc64-fpexc.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -313,6 +316,11 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
+Patch1302: jwltest-sky2.patch
+Patch1303: jwltest-via-velocity-tx_csum.patch
+Patch1304: jwltest-tulip-last_irq.patch
+Patch1305: jwltest-mii-force_media.patch
+Patch1306: jwltest-rhine-mdelay-undo.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -374,6 +382,8 @@
 # ACPI patches.
 Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch
 
+Patch2200: jwltest-acpi-dsdt-initrd.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. 
@@ -595,6 +605,10 @@
 %patch305 -p1
 %patch306 -p1
 
+# 
+# ia64
+#
+
 #
 # Xen
 #
@@ -726,6 +740,16 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
+# add sky2 driver from upstream
+%patch1302 -p1
+# via-velocity tx_csum only works for IPv4
+%patch1303 -p1
+# apply bios work-around for tulip to x86_64 as well as i386
+%patch1304 -p1
+# fix link state change bug w/ generic mii
+%patch1305 -p1
+# undo via-rhine mdelay elimination patch
+%patch1306 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -828,6 +852,9 @@
 # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
 %patch2100 -p1
 
+# Add DSDT override from initrd
+%patch2200 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream



From fedora-cvs-commits at redhat.com  Thu Feb  9 15:56:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 10:56:32 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.53.4.1 config-ia64-generic, 1.6, 1.6.16.1 config-x86-generic,
	1.19, 1.19.4.1 config-x86_64-generic, 1.16, 1.16.6.1
Message-ID: <200602091556.k19FuWce013356@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv13301/configs

Modified Files:
      Tag: private-linville-jwltest-fc4-30-branch
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.53.4.1
diff -u -r1.53 -r1.53.4.1
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	9 Feb 2006 15:56:30 -0000	1.53.4.1
@@ -1035,6 +1035,8 @@
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
+CONFIG_SKY2=m
+CONFIG_SKY2_EC_A1=y
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.6
retrieving revision 1.6.16.1
diff -u -r1.6 -r1.6.16.1
--- config-ia64-generic	6 Dec 2005 23:12:21 -0000	1.6
+++ config-ia64-generic	9 Feb 2006 15:56:30 -0000	1.6.16.1
@@ -124,6 +124,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_INITRD=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -u -r1.19 -r1.19.4.1
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	9 Feb 2006 15:56:30 -0000	1.19.4.1
@@ -150,6 +150,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 CONFIG_PNPACPI=y
 
 #


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.16
retrieving revision 1.16.6.1
diff -u -r1.16 -r1.16.6.1
--- config-x86_64-generic	6 Jan 2006 23:35:07 -0000	1.16
+++ config-x86_64-generic	9 Feb 2006 15:56:30 -0000	1.16.6.1
@@ -78,6 +78,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set



From fedora-cvs-commits at redhat.com  Thu Feb  9 16:10:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 11:10:24 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.342, 1.343 kernel-2.6.spec, 1.1921,
	1.1922 sources, 1.284, 1.285 upstream, 1.258,
	1.259 patch-2.6.16-rc2-git6.bz2.sign, 1.1, NONE
Message-ID: <200602091610.k19GAOuw016247@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git7.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git6.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.16-rc2-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD6ujryGugalF9Dw4RAmSxAJ94FLXEN0gJSRFzkTXFfv8hQHx6TgCcD74k
Pwfjh7OT/B/D7E2uXXpTJkA=
=1uiv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- .cvsignore	8 Feb 2006 20:13:23 -0000	1.342
+++ .cvsignore	9 Feb 2006 16:10:21 -0000	1.343
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git6.bz2
+patch-2.6.16-rc2-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1921
retrieving revision 1.1922
diff -u -r1.1921 -r1.1922
--- kernel-2.6.spec	9 Feb 2006 05:05:53 -0000	1.1921
+++ kernel-2.6.spec	9 Feb 2006 16:10:21 -0000	1.1922
@@ -206,7 +206,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git6.bz2
+Patch2: patch-2.6.16-rc2-git7.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -1395,6 +1395,9 @@
 %endif
 
 %changelog
+* Thu Feb  9 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git7
+
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- sources	8 Feb 2006 20:13:24 -0000	1.284
+++ sources	9 Feb 2006 16:10:21 -0000	1.285
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-7ee40eba40c5e4ad35f187839b9306b3  patch-2.6.16-rc2-git6.bz2
+190a95ff28c3a49cd18e212170a28920  patch-2.6.16-rc2-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- upstream	8 Feb 2006 20:13:24 -0000	1.258
+++ upstream	9 Feb 2006 16:10:21 -0000	1.259
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git6.bz2
+patch-2.6.16-rc2-git7.bz2


--- patch-2.6.16-rc2-git6.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  9 16:43:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 11:43:56 -0500
Subject: rpms/frysk/devel .cvsignore, 1.7, 1.8 frysk.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200602091643.k19GhuiR001269@cvs.devel.redhat.com>

Author: ajocksch

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1251

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
- Imported new frysk tarball.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Jan 2006 20:55:44 -0000	1.7
+++ .cvsignore	9 Feb 2006 16:43:53 -0000	1.8
@@ -1 +1,2 @@
 frysk-0.0.1.2006.01.22.tar.bz2
+frysk-0.0.1.2006.02.09.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- frysk.spec	7 Feb 2006 11:42:01 -0000	1.23
+++ frysk.spec	9 Feb 2006 16:43:53 -0000	1.24
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.01.22
-Release:	0.FC5.1.1
+Version:	0.0.1.2006.02.09
+Release:	0.FC5.0
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -86,6 +86,9 @@
 %{_datadir}/pixmaps/fryskTrayIcon48.png
 
 %changelog
+* Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
+- Imported new frysk tarball.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.01.22-0.FC5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Jan 2006 20:55:44 -0000	1.7
+++ sources	9 Feb 2006 16:43:53 -0000	1.8
@@ -1 +1 @@
-958178e1427c8fdde93a891e7fc1e526  frysk-0.0.1.2006.01.22.tar.bz2
+196c0fac126528597bf3e7fa771c674e  frysk-0.0.1.2006.02.09.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  9 16:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 11:52:26 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1922,
	1.1923 linux-2.6-net-wireless-features.patch, 1.1, 1.2
Message-ID: <200602091652.k19GqQMl013969@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-net-wireless-features.patch 
Log Message:
Dan's encryption-fu



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -r1.1922 -r1.1923
--- kernel-2.6.spec	9 Feb 2006 16:10:21 -0000	1.1922
+++ kernel-2.6.spec	9 Feb 2006 16:52:23 -0000	1.1923
@@ -1397,6 +1397,7 @@
 %changelog
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git7
+- More airo encryption fixing from Dan Williams.
 
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6

linux-2.6-net-wireless-features.patch:
 a/drivers/net/wireless/ipw2200.c                |    5 
 drivers/net/wireless/airo.c                     |  276 +++++++++++++++++++++++-
 linux-2.6.15.noarch/drivers/net/wireless/airo.c |   10 
 3 files changed, 286 insertions(+), 5 deletions(-)

Index: linux-2.6-net-wireless-features.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-net-wireless-features.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-net-wireless-features.patch	30 Jan 2006 22:33:09 -0000	1.1
+++ linux-2.6-net-wireless-features.patch	9 Feb 2006 16:52:24 -0000	1.2
@@ -355,3 +355,38 @@
  }
 
 
+The previous patch that added ENCODEEXT and AUTH support to the airo
+driver contained a slight error which would cause setting the TX
+key index ignore a valid key-set request at the same time.  This patch
+allows any combination of setting the TX key index and setting an
+encryption key.
+
+Signed-off-by: Dan Williams
+
+--- linux-2.6.15.noarch/drivers/net/wireless/airo.c~	2006-02-09 11:37:23.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/airo.c	2006-02-09 11:40:46.000000000 -0500
+@@ -6311,7 +6311,7 @@ static int airo_set_encodeext(struct net
+ 	CapabilityRid cap_rid;		/* Card capability info */
+ 	int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 );
+ 	u16 currentAuthType = local->config.authType;
+-	int idx, key_len, alg = ext->alg;	/* Check encryption mode */
++	int idx, key_len, alg = ext->alg, set_key = 1;	/* Check encryption mode */
+ 	wep_key_t key;
+ 
+ 	/* Is WEP supported ? */
+@@ -6336,8 +6336,14 @@ static int airo_set_encodeext(struct net
+ 
+ 	/* Just setting the transmit key? */
+ 	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
++		/* Only set transmit key index here, actual
++		 * key is set below if needed.
++		 */
+ 		set_wep_key(local, idx, NULL, 0, perm, 1);
+-	} else {
++		set_key = ext->key_len > 0 ? 1 : 0;
++	}
++
++	if (set_key) {
+ 		/* Set the requested key first */
+ 		memset(key.key, 0, MAX_KEY_SIZE);
+ 		switch (alg) {



From fedora-cvs-commits at redhat.com  Thu Feb  9 16:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 11:53:13 -0500
Subject: rpms/frysk/devel frysk.spec,1.24,1.25
Message-ID: <200602091653.k19GrDH9014079@cvs.devel.redhat.com>

Author: ajocksch

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14064

Modified Files:
	frysk.spec 
Log Message:
* Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
- Removed ftrace from %files and added libexedir files and man pages.




Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- frysk.spec	9 Feb 2006 16:43:53 -0000	1.24
+++ frysk.spec	9 Feb 2006 16:53:11 -0000	1.25
@@ -76,7 +76,6 @@
 %files
 %defattr(-,root,root)
 %doc COPYING frysk-imports/common/EXCEPTION
-%{_bindir}/ftrace
 %{_bindir}/frysk
 %{_libdir}/*so*
 %dir %{_datadir}/%{name}
@@ -84,10 +83,13 @@
 %{_datadir}/java/*.jar
 %{_datadir}/applications/frysk.desktop
 %{_datadir}/pixmaps/fryskTrayIcon48.png
+%{_mandir}/man*/*
+%{_libexecdir}/frysk/*
 
 %changelog
 * Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
-- Imported new frysk tarball.
+- Removed ftrace from %files and added libexedir files and man pages.
+- Imported new frysk tarball, 
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.1.2006.01.22-0.FC5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:31:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:31:51 -0500
Subject: rpms/mod_perl/devel mod_perl.spec,1.36,1.37
Message-ID: <200602091731.k19HVpfI014428@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14337

Modified Files:
	mod_perl.spec 
Log Message:
- bump release



Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mod_perl.spec	7 Feb 2006 12:58:50 -0000	1.36
+++ mod_perl.spec	9 Feb 2006 17:31:32 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release: 3.2
+Release:        5
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:38:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:38:23 -0500
Subject: rpms/yaboot/devel yaboot-1.3.13-multisata.patch, NONE,
	1.1 yaboot.spec, 1.31, 1.32
Message-ID: <200602091738.k19HcNc0015323@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15280

Modified Files:
	yaboot.spec 
Added Files:
	yaboot-1.3.13-multisata.patch 
Log Message:
fix g5 sdb

yaboot-1.3.13-multisata.patch:
 ofpath |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE yaboot-1.3.13-multisata.patch ---
--- yaboot-1.3.13/ybin/ofpath.multisata	2006-02-09 12:32:37.000000000 -0500
+++ yaboot-1.3.13/ybin/ofpath	2005-12-02 18:30:25.000000000 -0500
@@ -298,10 +298,10 @@
 	    echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
 	    ;;
 	ata_k2|sata_svw)
-	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
-			lgrep "$i" "k2-s-ata" ; done)"
+	    HOST_LIST="$(for i in `find /proc/device-tree -name compatible ` ; do
+			lgrep "$i" "k2-sata" ; done | sort)"
 	    DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
-	    echo "${DEVICE_PATH##*device-tree}/k2-sata@$DEVICE_ID/disk at 0:$PARTITION"
+	    echo "${DEVICE_PATH##*device-tree}/disk at 0:$PARTITION"
 	    ;;
 	*)
 	    echo 1>&2 "$PRG: Driver: $SCSI_DRIVER is not supported"


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- yaboot.spec	7 Feb 2006 14:43:31 -0000	1.31
+++ yaboot.spec	9 Feb 2006 17:38:21 -0000	1.32
@@ -1,10 +1,10 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.16.2
+Release: 0.17
 License: GPL
 Group: System Environment/Base
-Source: http://penguinppc.org/bootloaders/yaboot/yaboot-%{version}.tar.gz
+Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
 Patch1: yaboot-1.3.3-man.patch
 Patch2: yaboot-1.3.6-ofboot.patch
 Patch3: yaboot-1.3.6-rh.patch
@@ -32,8 +32,8 @@
 Patch25: yaboot-1.3.13-netboot.patch
 Patch26: yaboot-1.3.13-printversion.patch
 Patch27: yaboot-ppc64.patch
-
-URL: http://penguinppc.org/bootloaders/yaboot/
+Patch28: yaboot-1.3.13-multisata.patch
+URL: http://yaboot.ozlabs.org/
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: ybin
 ExclusiveArch: ppc ppc64
@@ -74,6 +74,7 @@
 %patch25 -p1 -b .netboot
 %patch26 -p1 -b .printversion
 %patch27 -p1 -b .ppc64
+%patch28 -p1 -b .multisata
 
 %build
 make VERSIONEXTRA='\ (Red Hat %version-%release)'
@@ -107,6 +108,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Thu Feb 09 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-0.17
+- Fix ofpath for multi-disk G5
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.16.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:38:24 -0500
Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.6,1.7
Message-ID: <200602091738.k19HcOoe015343@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
skip irq warning.


linux-2.6-debug-oops-pause.patch:
 traps.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-debug-oops-pause.patch	4 Feb 2006 04:39:51 -0000	1.6
+++ linux-2.6-debug-oops-pause.patch	9 Feb 2006 17:38:22 -0000	1.7
@@ -25,7 +25,7 @@
 +{
 +	int i;
 +	for (i=120;i>0;i--) {
-+		mdelay(1000);
++		udelay(1000 * 1000);
 +		touch_nmi_watchdog();
 +		printk("Continuing in %d seconds. \r", i);
 +	}



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:39:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:39:08 -0500
Subject: rpms/yaboot/devel yaboot.spec,1.32,1.33
Message-ID: <200602091739.k19Hd8aw015551@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15515

Modified Files:
	yaboot.spec 
Log Message:
bug no


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- yaboot.spec	9 Feb 2006 17:38:21 -0000	1.32
+++ yaboot.spec	9 Feb 2006 17:39:05 -0000	1.33
@@ -109,7 +109,7 @@
 
 %changelog
 * Thu Feb 09 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-0.17
-- Fix ofpath for multi-disk G5
+- Fix ofpath for multi-disk G5 (#180182)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.16.2
 - rebuilt for new gcc4.1 snapshot and glibc changes



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:42:42 -0500
Subject: rpms/yaboot/devel yaboot-1.3.12-llan.patch,1.1,NONE
Message-ID: <200602091742.k19HggsG017143@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17080

Removed Files:
	yaboot-1.3.12-llan.patch 
Log Message:
removed



--- yaboot-1.3.12-llan.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  9 17:43:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 12:43:06 -0500
Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.7,1.8
Message-ID: <200602091743.k19Hh6Q8017351@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
don't pause on ==== for now


linux-2.6-debug-oops-pause.patch:
 traps.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-debug-oops-pause.patch	9 Feb 2006 17:38:22 -0000	1.7
+++ linux-2.6-debug-oops-pause.patch	9 Feb 2006 17:43:03 -0000	1.8
@@ -39,7 +39,7 @@
  		if (!stack)
  			break;
  		printk(KERN_EMERG " =======================\n");
-+		pause_for_two_minutes();
++		//pause_for_two_minutes();
  	}
  }
  



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:15:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:15:29 -0500
Subject: rpms/gnome-themes/devel gnome-themes-2.11.90-redmond.patch, 1.1,
	1.2 gnome-themes.spec, 1.52, 1.53
Message-ID: <200602091815.k19IFTGW007629@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-themes-2.11.90-redmond.patch gnome-themes.spec 
Log Message:
Fix a warning


gnome-themes-2.11.90-redmond.patch:
 gtkrc |    7 -------
 1 files changed, 7 deletions(-)

Index: gnome-themes-2.11.90-redmond.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.11.90-redmond.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-themes-2.11.90-redmond.patch	10 Aug 2005 14:06:41 -0000	1.1
+++ gnome-themes-2.11.90-redmond.patch	9 Feb 2006 18:15:26 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-themes-2.11.90/gtk-themes/Simple/gtkrc.redmond	2005-08-10 10:04:41.030968000 -0400
-+++ gnome-themes-2.11.90/gtk-themes/Simple/gtkrc	2005-08-10 10:05:00.700279000 -0400
+--- gnome-themes-2.13.90/gtk-themes/Simple/gtkrc.redmond	2005-08-23 15:01:25.000000000 -0400
++++ gnome-themes-2.13.90/gtk-themes/Simple/gtkrc	2006-02-09 13:14:20.000000000 -0500
 @@ -50,11 +50,6 @@
  {
    bg[PRELIGHT]     = "#ffffff" 
@@ -11,4 +11,11 @@
 -   engine "redmond95" { }
  }
  
+ style "progressbar" = "default"
+@@ -64,6 +59,4 @@
+ 
  class "GtkWidget" style "default"
+ class "GtkMenuItem*"	style "menu"
+-class "GtkCheckButton" style "togglebuttons"
+-class "GtkRadioButton" style "togglebuttons"
+ class "GtkProgressBar" style "progressbar"


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-themes.spec	7 Feb 2006 17:21:13 -0000	1.52
+++ gnome-themes.spec	9 Feb 2006 18:15:26 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: Themes collection for GNOME
 Name: gnome-themes
 Version: 2.13.90
-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
@@ -90,6 +90,9 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-3
+- Fix a warning
+
 * Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
 - Remove the hidden patch, since it causes icon themes
   to not show up in the theme capplet



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:22:58 -0500
Subject: rpms/xorg-x11-drv-nv/devel nv.xinf, 1.1, 1.2 xorg-x11-drv-nv.spec,
	1.8, 1.9
Message-ID: <200602091822.k19IMw0O023255@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23229

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-2
- Syncronized nv.xinf with nv_driver.c PCI ID list, including 10DE:0092 and
  10DE:00F2 for bug (#179997).



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv.xinf	3 Feb 2006 13:36:40 -0000	1.1
+++ nv.xinf	9 Feb 2006 18:22:55 -0000	1.2
@@ -14,17 +14,32 @@
 alias pcivideo:v000010DEd00000042sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000046sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000048sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000004Esv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000090sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000091sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000092sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000093sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000094sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000098sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000099sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000009Csv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000009Dsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000009Esv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000A0sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000C0sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000C1sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000C2sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000000C3sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000C8sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000C9sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000CCsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000000CDsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000000CEsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000000F2sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000100sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000101sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000103sv*sd*bc*sc*i* nv
@@ -52,7 +67,19 @@
 alias pcivideo:v000010DEd00000152sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000153sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000160sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000161sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000162sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000163sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000164sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000165sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000166sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000167sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000168sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000169sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000016Bsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000016Csv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000016Dsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000016Esv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000170sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000171sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000172sv*sd*bc*sc*i* nv
@@ -74,6 +101,7 @@
 alias pcivideo:v000010DEd00000186sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000187sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000188sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000189sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000018Asv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000018Bsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv
@@ -86,8 +114,14 @@
 alias pcivideo:v000010DEd00000203sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000210sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000212sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000215sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000220sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000221sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000222sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000228sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000252sv*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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nv.spec	7 Feb 2006 14:28:55 -0000	1.8
+++ xorg-x11-drv-nv.spec	9 Feb 2006 18:22:55 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.0.1.5
-Release:   1.1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -58,7 +58,11 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.5-1.1
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-2
+- Syncronized nv.xinf with nv_driver.c PCI ID list, including 10DE:0092 and
+  10DE:00F2 for bug (#179997).
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0.1.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.1.5-1



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:52:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:52:13 -0500
Subject: rpms/xorg-x11-drv-nv/devel nv-1.0.1.5-updateto-cvs20050209.patch,
	NONE, 1.1
Message-ID: <200602091852.k19IqDCN003826@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3811

Added Files:
	nv-1.0.1.5-updateto-cvs20050209.patch 
Log Message:
Added nv-1.0.1.5-updateto-cvs20050209.patch

nv-1.0.1.5-updateto-cvs20050209.patch:
 ChangeLog        |   26 +++++
 man/nv.man       |   14 ++-
 src/nv_driver.c  |  241 ++++++++++++++++++++++++++++++++++++++-----------------
 src/nv_hw.c      |   34 +++++--
 src/nv_include.h |    4 
 src/nv_shadow.c  |   15 +++
 src/nv_type.h    |    1 
 7 files changed, 251 insertions(+), 84 deletions(-)

--- NEW FILE nv-1.0.1.5-updateto-cvs20050209.patch ---
Index: driver/xf86-video-nv/ChangeLog
diff -u driver/xf86-video-nv/ChangeLog:1.8 driver/xf86-video-nv/ChangeLog:1.11
--- driver/xf86-video-nv/ChangeLog:1.8	Tue Dec 20 18:30:01 2005
+++ driver/xf86-video-nv/ChangeLog	Tue Jan 24 08:45:29 2006
@@ -1,3 +1,29 @@
+2006-01-24  Aaron Plattner  <aplattner at nvidia.com>
+
+	* src/nv_driver.c:
+	Fix typo in PCI ID (reported by Stefan Dirsch).
+	Patch from Mark Vojkovich to XFree86 CVS on 2006-01-23.
+
+2006-01-22  Aaron Plattner  <aplattner at nvidia.com>
+
+	* man/nv.man:
+	* src/nv_driver.c: (NVProbe), (NVPreInit):
+	* src/nv_hw.c: (nvGetClocks), (NVCalcStateExt), (NVLoadStateExt):
+	New chip support from Mark Vojkovich's 2006-01-20 and 2006-01-21 XFree86 CVS
+	updates.
+
+2006-01-01  Aaron Plattner  <aplattner at nvidia.com>
+
+	* man/nv.man:
+	* src/nv_driver.c: (NVPreInit), (NVScreenInit), (NVRandRGetInfo),
+	(NVRandRSetConfig), (NVDriverFunc):
+	* src/nv_include.h:
+	* src/nv_shadow.c: (NVRefreshArea8), (NVRefreshArea16),
+	(NVRefreshArea32):
+	* src/nv_type.h:
+	Preliminary RandR rotation support.
+	Bug #4708 <https://bugs.freedesktop.org/show_bug.cgi?id=4708>
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
Index: driver/xf86-video-nv/man/nv.man
diff -u driver/xf86-video-nv/man/nv.man:1.4 driver/xf86-video-nv/man/nv.man:1.6
--- driver/xf86-video-nv/man/nv.man:1.4	Sat Jul  9 09:51:58 2005
+++ driver/xf86-video-nv/man/nv.man	Sun Jan 22 16:04:41 2006
@@ -54,10 +54,11 @@
 NV30, NV31, NV34, NV35, NV36, NV37, NV38 
 .TP 22
 .B GeForce 6XXX
-NV40, NV41, NV43, NV44, NV45
+NV40, NV41, NV43, NV44, NV45, C51
 .TP 22
 .B GeForce 7XXX
-G70
+G70, G71, G72, G73
+
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
@@ -119,8 +120,13 @@
 Rotate the display clockwise or counterclockwise.  This mode is unaccelerated.
 Default: no rotation.
 
-Note: The Resize and Rotate extension will be disabled if the Rotate option
-is used.
+Note: The Resize and Rotate extension will be disabled if the Rotate "CW" or
+Rotate "CCW" options are used.
+.TP
+.BI "Option \*qRotate\*q \*qRandR\*q"
+Enable rotation of the screen using the Resize and Rotate extension.
+This mode is unaccelerated.
+Default: no rotation support.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  Default: off.
Index: driver/xf86-video-nv/src/nv_driver.c
diff -u driver/xf86-video-nv/src/nv_driver.c:1.18 driver/xf86-video-nv/src/nv_driver.c:1.21
--- driver/xf86-video-nv/src/nv_driver.c:1.18	Thu Sep 29 14:47:29 2005
+++ driver/xf86-video-nv/src/nv_driver.c	Tue Jan 24 08:45:29 2006
@@ -58,6 +58,10 @@
 static void    NVFreeScreen(int scrnIndex, int flags);
 static ModeStatus NVValidMode(int scrnIndex, DisplayModePtr mode,
 			      Bool verbose, int flags);
+#ifdef RANDR
+static Bool    NVDriverFunc(ScrnInfoPtr pScrnInfo, xorgDriverFuncOp op,
+			      pointer data);
+#endif
 
 /* Internally used functions */
 
@@ -87,7 +91,7 @@
         0
 };
 
-/* Known cards as of 2005/09/21  */
+/* Known cards as of 2006/01/12  */
 
 static SymTabRec NVKnownChipsets[] =
 {
@@ -133,7 +137,7 @@
 #else
   { 0x10DE0179, "GeForce4 440 Go 64M" },
 #endif
-  { 0x10DE017A, "Quadro4 NVS" },
+  { 0x10DE017A, "Quadro NVS" },
   { 0x10DE017C, "Quadro4 500 GoGL" },
   { 0x10DE017D, "GeForce4 410 Go 16M" },
 
@@ -147,7 +151,7 @@
 #if defined(__powerpc__)
   { 0x10DE0189, "GeForce4 MX with AGP8X (Mac)" },
 #endif
-  { 0x10DE018A, "Quadro4 280 NVS" },
+  { 0x10DE018A, "Quadro4 NVS 280 SD" },
   { 0x10DE018B, "Quadro4 380 XGL" },
   { 0x10DE018C, "Quadro NVS 50 PCI" },
   { 0x10DE018D, "GeForce4 448 Go" },
@@ -161,7 +165,6 @@
 
   { 0x10DE0250, "GeForce4 Ti 4600" },
   { 0x10DE0251, "GeForce4 Ti 4400" },
-  { 0x10DE0252, "0x0252" },
   { 0x10DE0253, "GeForce4 Ti 4200" },
   { 0x10DE0258, "Quadro4 900 XGL" },
   { 0x10DE0259, "Quadro4 750 XGL" },
@@ -182,21 +185,15 @@
 
   { 0x10DE0311, "GeForce FX 5600 Ultra" },
   { 0x10DE0312, "GeForce FX 5600" },
-  { 0x10DE0313, "0x0313"},
-  { 0x10DE0314, "GeForce FX 5600SE" },
-  { 0x10DE0316, "0x0316" },
-  { 0x10DE0317, "0x0317" },
+  { 0x10DE0314, "GeForce FX 5600XT" },
   { 0x10DE031A, "GeForce FX Go5600" },
   { 0x10DE031B, "GeForce FX Go5650" },
   { 0x10DE031C, "Quadro FX Go700" },
-  { 0x10DE031D, "0x031D" },
-  { 0x10DE031E, "0x031E" },
-  { 0x10DE031F, "0x031F" },
 
   { 0x10DE0320, "GeForce FX 5200" },
   { 0x10DE0321, "GeForce FX 5200 Ultra" },
   { 0x10DE0322, "GeForce FX 5200" },
-  { 0x10DE0323, "GeForce FX 5200SE" },
+  { 0x10DE0323, "GeForce FX 5200LE" },
   { 0x10DE0324, "GeForce FX Go5200" },
   { 0x10DE0325, "GeForce FX Go5250" },
   { 0x10DE0326, "GeForce FX 5500" },
@@ -204,47 +201,40 @@
   { 0x10DE0328, "GeForce FX Go5200 32M/64M" },
 #if defined(__powerpc__)
   { 0x10DE0329, "GeForce FX 5200 (Mac)" },
-#else
-  { 0x10DE0329, "0x0329" },
 #endif
   { 0x10DE032A, "Quadro NVS 55/280 PCI" },
   { 0x10DE032B, "Quadro FX 500/600 PCI" },
   { 0x10DE032C, "GeForce FX Go53xx Series" },
   { 0x10DE032D, "GeForce FX Go5100" },
-  { 0x10DE032F, "0x032F" },
 
   { 0x10DE0330, "GeForce FX 5900 Ultra" },
   { 0x10DE0331, "GeForce FX 5900" },
   { 0x10DE0332, "GeForce FX 5900XT" },
   { 0x10DE0333, "GeForce FX 5950 Ultra" },
-  { 0x10DE033F, "Quadro FX 700" },
   { 0x10DE0334, "GeForce FX 5900ZT" },
   { 0x10DE0338, "Quadro FX 3000" },
+  { 0x10DE033F, "Quadro FX 700" },
 
   { 0x10DE0341, "GeForce FX 5700 Ultra" },
   { 0x10DE0342, "GeForce FX 5700" },
   { 0x10DE0343, "GeForce FX 5700LE" },
   { 0x10DE0344, "GeForce FX 5700VE" },
-  { 0x10DE0345, "0x0345" },
   { 0x10DE0347, "GeForce FX Go5700" },
   { 0x10DE0348, "GeForce FX Go5700" },
-  { 0x10DE0349, "0x0349" },
-  { 0x10DE034B, "0x034B" },
   { 0x10DE034C, "Quadro FX Go1000" },
   { 0x10DE034E, "Quadro FX 1100" },
-  { 0x10DE034F, "0x034F" },
 
   { 0x10DE0040, "GeForce 6800 Ultra" },
   { 0x10DE0041, "GeForce 6800" },
   { 0x10DE0042, "GeForce 6800 LE" },
-  { 0x10DE0043, "0x0043" },
+  { 0x10DE0043, "GeForce 6800 XE" },
   { 0x10DE0045, "GeForce 6800 GT" },
   { 0x10DE0046, "GeForce 6800 GT" },
+  { 0x10DE0047, "GeForce 6800 GS" },
   { 0x10DE0048, "GeForce 6800 XT" },
-  { 0x10DE0049, "0x0049" },
   { 0x10DE004E, "Quadro FX 4000" },
 
-  { 0x10DE00C0, "0x00C0" },
+  { 0x10DE00C0, "GeForce 6800 GS" },
   { 0x10DE00C1, "GeForce 6800" },
   { 0x10DE00C2, "GeForce 6800 LE" },
   { 0x10DE00C3, "GeForce 6800 XT" },
@@ -257,16 +247,13 @@
   { 0x10DE0140, "GeForce 6600 GT" },
   { 0x10DE0141, "GeForce 6600" },
   { 0x10DE0142, "GeForce 6600 LE" },
-  { 0x10DE0143, "0x0143" },
+  { 0x10DE0143, "GeForce 6600 VE" },
   { 0x10DE0144, "GeForce Go 6600" },
   { 0x10DE0145, "GeForce 6610 XL" },
   { 0x10DE0146, "GeForce Go 6600 TE/6200 TE" },
   { 0x10DE0147, "GeForce 6700 XL" },
   { 0x10DE0148, "GeForce Go 6600" },
   { 0x10DE0149, "GeForce Go 6600 GT" },
-  { 0x10DE014B, "0x014B" },
-  { 0x10DE014C, "0x014C" },
-  { 0x10DE014D, "0x014D" },
   { 0x10DE014E, "Quadro FX 540" },
   { 0x10DE014F, "GeForce 6200" },
 
@@ -280,32 +267,49 @@
   { 0x10DE0167, "GeForce Go 6200" },
   { 0x10DE0168, "GeForce Go 6400" },
   { 0x10DE0169, "GeForce 6250" },
-  { 0x10DE016B, "0x016B" },
-  { 0x10DE016C, "0x016C" },
-  { 0x10DE016D, "0x016D" },
-  { 0x10DE016E, "0x016E" },
 
-  { 0x10DE0210, "0x0210" },
   { 0x10DE0211, "GeForce 6800" },
   { 0x10DE0212, "GeForce 6800 LE" },
   { 0x10DE0215, "GeForce 6800 GT" },
+  { 0x10DE0218, "GeForce 6800 XT" },
 
-  { 0x10DE0220, "0x0220" },
   { 0x10DE0221, "GeForce 6200" },
-  { 0x10DE0222, "0x0222" },
-  { 0x10DE0228, "0x0228" },
 
-  { 0x10DE0090, "0x0090" },
+  { 0x10DE0090, "GeForce 7800 GTX" },
   { 0x10DE0091, "GeForce 7800 GTX" },
   { 0x10DE0092, "GeForce 7800 GT" },
-  { 0x10DE0093, "0x0093" },
-  { 0x10DE0094, "0x0094" },
+  { 0x10DE0093, "GeForce 7800 GS" },
+  { 0x10DE0095, "GeForce 7800 SLI" },
   { 0x10DE0098, "GeForce Go 7800" },
   { 0x10DE0099, "GeForce Go 7800 GTX" },
-  { 0x10DE009C, "0x009C" },
   { 0x10DE009D, "Quadro FX 4500" },
-  { 0x10DE009E, "0x009E" },
-  
+
+  { 0x10DE01D1, "GeForce 7300 LE" },
+  { 0x10DE01D6, "GeForce Go 7200" },
+  { 0x10DE01D7, "GeForce Go 7300" },
+  { 0x10DE01D8, "GeForce Go 7400" },
+  { 0x10DE01DA, "Quadro NVS 110M" },
+  { 0x10DE01DB, "Quadro NVS 120M" },
+  { 0x10DE01DC, "Quadro FX 350M" },
+  { 0x10DE01DE, "Quadro FX 350" },
+  { 0x10DE01DF, "GeForce 7300 GS" },
+
+  { 0x10DE0398, "GeForce Go 7600" },
+  { 0x10DE0399, "GeForce Go 7600 GT"},
+  { 0x10DE039A, "Quadro NVS 300M" },
+  { 0x10DE039C, "Quadro FX 550M" },
+
+  { 0x10DE0298, "GeForce Go 7900 GS" },
+  { 0x10DE0299, "GeForce Go 7900 GTX" },
+  { 0x10DE029A, "Quadro FX 2500M" },
+  { 0x10DE029B, "Quadro FX 1500M" },
+
+  { 0x10DE0240, "GeForce 6150" },
+  { 0x10DE0241, "GeForce 6150 LE" },
+  { 0x10DE0242, "GeForce 6100" },
+  { 0x10DE0244, "GeForce Go 6150" },
+  { 0x10DE0247, "GeForce Go 6100" },
+
   {-1, NULL}
 };
 
@@ -697,12 +701,11 @@
                case 0x0120:
                case 0x0140:
                case 0x0160:
-               case 0x0130:
                case 0x01D0:
                case 0x0090:
                case 0x0210:
                case 0x0220:
-               case 0x0230:
+               case 0x0240:
                case 0x0290:
                case 0x0390:
                    NVChipsets[numUsed].token = pciid;
@@ -1236,6 +1239,7 @@
 	pScrn->ValidMode     = fbdevHWValidModeWeak();
     }
     pNv->Rotate = 0;
+    pNv->RandRRotation = FALSE;
     if ((s = xf86GetOptValString(pNv->Options, OPTION_ROTATE))) {
       if(!xf86NameCmp(s, "CW")) {
 	pNv->ShadowFB = TRUE;
@@ -1252,13 +1256,29 @@
 	pNv->Rotate = -1;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
 		"Rotating screen counter clockwise - acceleration disabled\n");
+      } else
+      if(!xf86NameCmp(s, "RandR")) {
+#ifdef RANDR
+	pNv->ShadowFB = TRUE;
+	pNv->NoAccel = TRUE;
+	pNv->HWCursor = FALSE;
+	pNv->RandRRotation = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		"Using RandR rotation - acceleration disabled\n");
+#else
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		"This driver was not compiled with support for the Resize and "
+		"Rotate extension.  Cannot honor 'Option \"Rotate\" "
+		"\"RandR\"'.\n");
+#endif
       } else {
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
 		"\"%s\" is not a valid value for Option \"Rotate\"\n", s);
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
-		"Valid options are \"CW\" or \"CCW\"\n");
+		"Valid options are \"CW\", \"CCW\", and \"RandR\"\n");
       }
     }
+
     if(xf86GetOptValInteger(pNv->Options, OPTION_VIDEO_KEY, &(pNv->videoKey))) {
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
                                 pNv->videoKey);
@@ -1377,26 +1397,25 @@
     case 0x0280:   /* GeForce4 Ti (8x AGP) */
          pNv->Architecture =  NV_ARCH_20;
          break;
-    case 0x0300:   /* GeForceFX 5800 */
-    case 0x0310:   /* GeForceFX 5600 */
-    case 0x0320:   /* GeForceFX 5200 */
-    case 0x0330:   /* GeForceFX 5900 */
-    case 0x0340:   /* GeForceFX 5700 */
+    case 0x0300:   /* GeForce FX 5800 */
+    case 0x0310:   /* GeForce FX 5600 */
+    case 0x0320:   /* GeForce FX 5200 */
+    case 0x0330:   /* GeForce FX 5900 */
+    case 0x0340:   /* GeForce FX 5700 */
          pNv->Architecture =  NV_ARCH_30;
          break;
-    case 0x0040:
-    case 0x00C0:
-    case 0x0120:
-    case 0x0130:
-    case 0x0140:
-    case 0x0160:
-    case 0x01D0:
-    case 0x0090:
-    case 0x0210:
-    case 0x0220:
-    case 0x0230:
-    case 0x0290:
-    case 0x0390:
+    case 0x0040:   /* GeForce 6800 */
+    case 0x00C0:   /* GeForce 6800 */
+    case 0x0120:   /* GeForce 6800 */
+    case 0x0140:   /* GeForce 6600 */
+    case 0x0160:   /* GeForce 6200 */
+    case 0x01D0:   /* GeForce 7200, 7300, 7400 */
+    case 0x0090:   /* GeForce 7800 */
+    case 0x0210:   /* GeForce 6800 */
+    case 0x0220:   /* GeForce 6200 */
+    case 0x0290:   /* GeForce 7900 */
+    case 0x0390:   /* GeForce 7600 */
+    case 0x0240:   /* GeForce 6100 */
          pNv->Architecture =  NV_ARCH_40;
          break;
     default:
@@ -1840,7 +1859,7 @@
     int ret;
     VisualPtr visual;
     unsigned char *FBStart;
-    int width, height, displayWidth, offscreenHeight;
+    int width, height, displayWidth, offscreenHeight, shadowHeight;
     BoxRec AvailFBArea;
 
     /* 
@@ -1925,9 +1944,18 @@
 	width = pScrn->virtualY;
     }
 
+    /* If RandR rotation is enabled, leave enough space in the
+     * framebuffer for us to rotate the screen dimensions without
+     * changing the pitch.
+     */
+    if(pNv->RandRRotation)
+        shadowHeight = max(width, height);
+    else
+        shadowHeight = height;
+
     if(pNv->ShadowFB) {
  	pNv->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
-        pNv->ShadowPtr = xalloc(pNv->ShadowPitch * height);
+        pNv->ShadowPtr = xalloc(pNv->ShadowPitch * shadowHeight);
 	displayWidth = pNv->ShadowPitch / (pScrn->bitsPerPixel >> 3);
         FBStart = pNv->ShadowPtr;
     } else {
@@ -2019,18 +2047,21 @@
     if(pNv->ShadowFB) {
 	RefreshAreaFuncPtr refreshArea = NVRefreshArea;
 
-	if(pNv->Rotate) {
-   	   pNv->PointerMoved = pScrn->PointerMoved;
-	   pScrn->PointerMoved = NVPointerMoved;
+	if(pNv->Rotate || pNv->RandRRotation) {
+	   pNv->PointerMoved = pScrn->PointerMoved;
+	   if(pNv->Rotate)
+	       pScrn->PointerMoved = NVPointerMoved;
 
 	   switch(pScrn->bitsPerPixel) {
                case 8:	refreshArea = NVRefreshArea8;	break;
                case 16:	refreshArea = NVRefreshArea16;	break;
                case 32:	refreshArea = NVRefreshArea32;	break;
 	   }
-           xf86DisableRandR();
-           xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                      "Driver rotation enabled, RandR disabled\n");
+           if(!pNv->RandRRotation) {
+               xf86DisableRandR();
+               xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                          "Driver rotation enabled, RandR disabled\n");
+           }
 	}
 
 	ShadowFBInit(pScreen, refreshArea);
@@ -2044,7 +2075,7 @@
     pScrn->memPhysBase = pNv->FbAddress;
     pScrn->fbOffset = 0;
 
-    if(pNv->Rotate == 0)
+    if(pNv->Rotate == 0 && !pNv->RandRRotation)
        NVInitVideo(pScreen);
 
     pScreen->SaveScreen = NVSaveScreen;
@@ -2056,6 +2087,13 @@
     pNv->BlockHandler = pScreen->BlockHandler;
     pScreen->BlockHandler = NVBlockHandler;
 
+#ifdef RANDR
+    /* Install our DriverFunc.  We have to do it this way instead of using the
+     * HaveDriverFuncs argument to xf86AddDriver, because InitOutput clobbers
+     * pScrn->DriverFunc */
+    pScrn->DriverFunc = NVDriverFunc;
+#endif
+
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1) {
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
@@ -2087,3 +2125,64 @@
     NVDACSave(pScrn, vgaReg, nvReg, pNv->Primary);
 }
 
+#ifdef RANDR
+static Bool
+NVRandRGetInfo(ScrnInfoPtr pScrn, Rotation *rotations)
+{
+    NVPtr pNv = NVPTR(pScrn);
+
+    if(pNv->RandRRotation)
+       *rotations = RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_270;
+    else
+       *rotations = RR_Rotate_0;
+
+    return TRUE;
+}
+
+static Bool
+NVRandRSetConfig(ScrnInfoPtr pScrn, xorgRRConfig *config)
+{
+    NVPtr pNv = NVPTR(pScrn);
+
+    switch(config->rotation) {
+        case RR_Rotate_0:
+            pNv->Rotate = 0;
+            pScrn->PointerMoved = pNv->PointerMoved;
+            break;
+
+        case RR_Rotate_90:
+            pNv->Rotate = -1;
+            pScrn->PointerMoved = NVPointerMoved;
+            break;
+
+        case RR_Rotate_270:
+            pNv->Rotate = 1;
+            pScrn->PointerMoved = NVPointerMoved;
+            break;
+
+        default:
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "Unexpected rotation in NVRandRSetConfig!\n");
+            pNv->Rotate = 0;
+            pScrn->PointerMoved = pNv->PointerMoved;
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+static Bool
+NVDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer data)
+{
+    switch(op) {
+       case RR_GET_INFO:
+          return NVRandRGetInfo(pScrn, (Rotation*)data);
+       case RR_SET_CONFIG:
+          return NVRandRSetConfig(pScrn, (xorgRRConfig*)data);
+       default:
+          return FALSE;
+    }
+
+    return FALSE;
+}
+#endif
Index: driver/xf86-video-nv/src/nv_hw.c
diff -u driver/xf86-video-nv/src/nv_hw.c:1.11 driver/xf86-video-nv/src/nv_hw.c:1.12
--- driver/xf86-video-nv/src/nv_hw.c:1.11	Thu Sep 29 14:47:29 2005
+++ driver/xf86-video-nv/src/nv_hw.c	Sun Jan 22 16:04:41 2006
@@ -144,16 +144,23 @@
 
     if(pNv->Architecture >= NV_ARCH_40) {
        pll = pNv->PMC[0x4020/4];
-       P = (pll >> 16) & 0x03;
+       P = (pll >> 16) & 0x07;
        pll = pNv->PMC[0x4024/4];
        M = pll & 0xFF;
        N = (pll >> 8) & 0xFF;
-       MB = (pll >> 16) & 0xFF;
-       NB = (pll >> 24) & 0xFF;
+       if(((pNv->Chipset & 0xfff0) == 0x0290) ||
+          ((pNv->Chipset & 0xfff0) == 0x0390))
+       {
+          MB = 1;
+          NB = 1;
+       } else {
+          MB = (pll >> 16) & 0xFF;
+          NB = (pll >> 24) & 0xFF;
+       }
        *MClk = ((N * NB * pNv->CrystalFreqKHz) / (M * MB)) >> P;
 
        pll = pNv->PMC[0x4000/4];
-       P = (pll >> 16) & 0x03;  
+       P = (pll >> 16) & 0x07;  
        pll = pNv->PMC[0x4004/4];
        M = pll & 0xFF;
        N = (pll >> 8) & 0xFF;
@@ -875,6 +882,10 @@
         case NV_ARCH_20:
         case NV_ARCH_30:
         default:
+            if((pNv->Chipset & 0xfff0) == 0x0240) {
+                state->arbitration0 = 256; 
+                state->arbitration1 = 0x0480; 
+            } else
             if(((pNv->Chipset & 0xffff) == 0x01A0) ||
                ((pNv->Chipset & 0xffff) == 0x01f0))
             {
@@ -945,7 +956,8 @@
 
         if(((pNv->Chipset & 0xfff0) == 0x0090) ||
            ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-           ((pNv->Chipset & 0xfff0) == 0x0290))
+           ((pNv->Chipset & 0xfff0) == 0x0290) ||
+           ((pNv->Chipset & 0xfff0) == 0x0390))
         {
            regions = 15;
         }
@@ -1200,6 +1212,7 @@
                  break;
               case 0x0160:
               case 0x01D0:
+              case 0x0240:
                  pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
                  pNv->PMC[0x1704/4] = 0;
                  pNv->PMC[0x1708/4] = 0;
@@ -1213,13 +1226,13 @@
                  pNv->PGRAPH[0x082C/4] = 0x00000108;
                  break;
               case 0x0220:
-              case 0x0230:
                  pNv->PGRAPH[0x0860/4] = 0;
                  pNv->PGRAPH[0x0864/4] = 0;
                  pNv->PRAMDAC[0x0608/4] |= 0x00100000;
                  break;
               case 0x0090:
               case 0x0290:
+              case 0x0390:
                  pNv->PRAMDAC[0x0608/4] |= 0x00100000;
                  pNv->PGRAPH[0x0828/4] = 0x07830610;
                  pNv->PGRAPH[0x082C/4] = 0x0000016A;
@@ -1277,7 +1290,8 @@
            } else {
               if(((pNv->Chipset & 0xfff0) == 0x0090) ||
                  ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-                 ((pNv->Chipset & 0xfff0) == 0x0290))
+                 ((pNv->Chipset & 0xfff0) == 0x0290) ||
+                 ((pNv->Chipset & 0xfff0) == 0x0390))
               {
                  for(i = 0; i < 60; i++) {
                    pNv->PGRAPH[(0x0D00/4) + i] = pNv->PFB[(0x0600/4) + i];
@@ -1287,7 +1301,8 @@
                  for(i = 0; i < 48; i++) {
                    pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
                    if(((pNv->Chipset & 0xfff0) != 0x0160) &&
-                      ((pNv->Chipset & 0xfff0) != 0x0220))
+                      ((pNv->Chipset & 0xfff0) != 0x0220) &&
+                      ((pNv->Chipset & 0xfff0) != 0x0240))
                    {
                       pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];
                    }
@@ -1309,7 +1324,8 @@
               } else {
                  if(((pNv->Chipset & 0xfff0) == 0x0090) ||
                     ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-                    ((pNv->Chipset & 0xfff0) == 0x0290)) 
+                    ((pNv->Chipset & 0xfff0) == 0x0290) ||
+                    ((pNv->Chipset & 0xfff0) == 0x0390)) 
                  {
                     pNv->PGRAPH[0x0DF0/4] = pNv->PFB[0x0200/4];
                     pNv->PGRAPH[0x0DF4/4] = pNv->PFB[0x0204/4];
Index: driver/xf86-video-nv/src/nv_include.h
diff -u driver/xf86-video-nv/src/nv_include.h:1.3 driver/xf86-video-nv/src/nv_include.h:1.4
--- driver/xf86-video-nv/src/nv_include.h:1.3	Wed Apr 20 05:25:29 2005
+++ driver/xf86-video-nv/src/nv_include.h	Sun Jan  1 17:54:19 2006
@@ -52,6 +52,10 @@
 
 #include "region.h"
 
+#ifdef RANDR
+#include <X11/extensions/randr.h>
+#endif
+
 #include "nv_local.h"
 #include "nv_type.h"
 #include "nv_proto.h"
Index: driver/xf86-video-nv/src/nv_shadow.c
diff -u driver/xf86-video-nv/src/nv_shadow.c:1.3 driver/xf86-video-nv/src/nv_shadow.c:1.4
--- driver/xf86-video-nv/src/nv_shadow.c:1.3	Sun Jul 10 19:29:58 2005
+++ driver/xf86-video-nv/src/nv_shadow.c	Sun Jan  1 17:54:19 2006
@@ -68,6 +68,11 @@
     CARD8 *dstPtr, *srcPtr, *src;
     CARD32 *dst;
 
+    if(!pNv->Rotate) {
+       NVRefreshArea(pScrn, num, pbox);
+       return;
+    }
+
     dstPitch = pScrn->displayWidth;
     srcPitch = -pNv->Rotate * pNv->ShadowPitch;
 
@@ -114,6 +119,11 @@
     CARD16 *dstPtr, *srcPtr, *src;
     CARD32 *dst;
 
+    if(!pNv->Rotate) {
+       NVRefreshArea(pScrn, num, pbox);
+       return;
+    }
+
     dstPitch = pScrn->displayWidth;
     srcPitch = -pNv->Rotate * pNv->ShadowPitch >> 1;
 
@@ -159,6 +169,11 @@
     int count, width, height, dstPitch, srcPitch;
     CARD32 *dstPtr, *srcPtr, *src, *dst;
 
+    if(!pNv->Rotate) {
+       NVRefreshArea(pScrn, num, pbox);
+       return;
+    }
+
     dstPitch = pScrn->displayWidth;
     srcPitch = -pNv->Rotate * pNv->ShadowPitch >> 2;
 
Index: driver/xf86-video-nv/src/nv_type.h
diff -u driver/xf86-video-nv/src/nv_type.h:1.5 driver/xf86-video-nv/src/nv_type.h:1.6
--- driver/xf86-video-nv/src/nv_type.h:1.5	Thu Apr 21 15:25:47 2005
+++ driver/xf86-video-nv/src/nv_type.h	Sun Jan  1 17:54:19 2006
@@ -172,6 +172,7 @@
     CARD32              currentRop;
     Bool                WaitVSyncPossible;
     Bool                BlendingPossible;
+    Bool                RandRRotation;
 } NVRec, *NVPtr;
 
 #define NVPTR(p) ((NVPtr)((p)->driverPrivate))



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:52:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:52:53 -0500
Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.8,1.9
Message-ID: <200602091852.k19IqraG003852@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-oops-pause.patch 
Log Message:
fix stupidity.


linux-2.6-debug-oops-pause.patch:
 traps.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-debug-oops-pause.patch	9 Feb 2006 17:43:03 -0000	1.8
+++ linux-2.6-debug-oops-pause.patch	9 Feb 2006 18:52:49 -0000	1.9
@@ -17,15 +17,16 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -151,6 +152,17 @@ static inline unsigned long print_contex
+@@ -151,6 +152,18 @@ static inline unsigned long print_contex
  	return ebp;
  }
  
 +void pause_for_two_minutes(void)
 +{
-+	int i;
-+	for (i=120;i>0;i--) {
-+		udelay(1000 * 1000);
++	int i, j;
++	for (i=120; i>0; i--) {
++		for (j=0; j<1000; j++)
++			udelay(1000);
 +		touch_nmi_watchdog();
 +		printk("Continuing in %d seconds. \r", i);
 +	}



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:53:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:53:21 -0500
Subject: rpms/gdm/devel gdm-2.13.0.7-pam_stack.patch, NONE, 1.1 gdm.spec,
	1.124, 1.125
Message-ID: <200602091853.k19IrLfu003947@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3932

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.13.0.7-pam_stack.patch 
Log Message:
misc fixes


gdm-2.13.0.7-pam_stack.patch:
 config/gdm           |   11 ++++++-----
 config/gdm-autologin |    9 +++++----
 gdmsetup-pam         |   10 +++-------
 3 files changed, 14 insertions(+), 16 deletions(-)

--- NEW FILE gdm-2.13.0.7-pam_stack.patch ---
--- gdm-2.13.0.7/gdmsetup-pam.pam_stack	2006-02-09 13:49:18.000000000 -0500
+++ gdm-2.13.0.7/gdmsetup-pam	2006-02-09 13:49:22.000000000 -0500
@@ -1,8 +1,4 @@
 #%PAM-1.0
-auth       sufficient   pam_rootok.so
-auth       sufficient   pam_timestamp.so
-auth       required     pam_stack.so service=system-auth
-session    required     pam_permit.so
-session    optional     pam_xauth.so
-session    optional     pam_timestamp.so
-account    required     pam_permit.so
+auth		include		config-util
+account		include		config-util
+session		include		config-util
--- gdm-2.13.0.7/config/gdm-autologin.pam_stack	2006-02-09 13:49:41.000000000 -0500
+++ gdm-2.13.0.7/config/gdm-autologin	2006-02-09 13:49:45.000000000 -0500
@@ -1,8 +1,9 @@
 #%PAM-1.0
 auth       required	pam_env.so
-auth       required	pam_nologin.so
 auth       required	pam_permit.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=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_console.so
--- gdm-2.13.0.7/config/gdm.pam_stack	2006-02-09 13:49:30.000000000 -0500
+++ gdm-2.13.0.7/config/gdm	2006-02-09 13:49:34.000000000 -0500
@@ -1,8 +1,9 @@
 #%PAM-1.0
 auth       required	pam_env.so
-auth       required	pam_stack.so service=system-auth
-auth       required	pam_nologin.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
+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_console.so


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gdm.spec	7 Feb 2006 11:45:18 -0000	1.124
+++ gdm.spec	9 Feb 2006 18:53:18 -0000	1.125
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.7
-Release: 1.1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -44,6 +44,7 @@
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch20: gdm-2.13.0.4-add-locale-header.patch
 Patch21: gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch
+Patch22: gdm-2.13.0.7-pam_stack.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -116,6 +117,7 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch20 -p1 -b .add-locale-header
 %patch21 -p1 -b .fix-gdm-safe-restart-conf-path
+%patch22 -p1 -b .pam_stack
 
 # 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
@@ -172,6 +174,9 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmsetup.desktop
 (cd $RPM_BUILD_ROOT%{_datadir}/applications; ln -sf ../desktop-menu-patches/gnome-gdmsetup.desktop .)
 
+# use consolehelper for gdmsetup
+(cd $RPM_BUILD_ROOT/usr/bin; ln -s gdmsetup consolehelper)
+
 # fix the "login photo" file
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -305,6 +310,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.0.7-2
+- Make gdmsetup use consolehelper
+- Don't use deprecated pam_stack
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0.7-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 18:53:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 13:53:59 -0500
Subject: rpms/eclipse/FC-4 eclipse-ecj-rpmdebuginfo.patch, NONE,
	1.1 eclipse-efj-doc.patch, NONE, 1.1 .cvsignore, 1.17,
	1.18 eclipse-efj.patch, 1.2, 1.3 eclipse-tomcat5-build.2.patch,
	1.2, 1.3 eclipse-usebuiltlauncher.patch, 1.1, 1.2 eclipse.spec,
	1.170, 1.171 sources, 1.28, 1.29
Message-ID: <200602091853.k19Irxkf003981@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	.cvsignore eclipse-efj.patch eclipse-tomcat5-build.2.patch 
	eclipse-usebuiltlauncher.patch eclipse.spec sources 
Added Files:
	eclipse-ecj-rpmdebuginfo.patch eclipse-efj-doc.patch 
Log Message:
3.1.2

eclipse-ecj-rpmdebuginfo.patch:
 Main.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+)

--- NEW FILE eclipse-ecj-rpmdebuginfo.patch ---
--- plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java.orig	2006-02-07 13:50:13.000000000 -0500
+++ plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java	2006-02-07 13:55:29.000000000 -0500
@@ -2405,6 +2405,28 @@
 			this.times = new long[this.repetitions];
 			this.timesCounter = 0;
 		}
+                {
+                       // If we're building an RPM, force full debugging info to
+                       // be generated, no matter what options have been passed
+                       // by Ant.  This is something of a kludge, but it is far
+                       // better than the alternative, which is having class
+                       // files with debug info mysteriously missing.
+
+                       String RpmPackageName = System.getenv("RPM_PACKAGE_NAME");
+                       String RpmArch = System.getenv("RPM_ARCH");
+                       String RpmBuildRoot = System.getenv("RPM_BUILD_ROOT");
+                       if (RpmPackageName != null && RpmArch != null && RpmBuildRoot != null) {
+                               this.options.put(
+                                   CompilerOptions.OPTION_LocalVariableAttribute,
+                                   CompilerOptions.GENERATE);
+                               this.options.put(
+                                   CompilerOptions.OPTION_LineNumberAttribute,
+                                   CompilerOptions.GENERATE);
+                               this.options.put(
+                                   CompilerOptions.OPTION_SourceFileAttribute,
+                                   CompilerOptions.GENERATE);
+                       }
+                }
 	}
 
 	private void addNewEntry(final int InsideClasspath, final int InsideSourcepath, ArrayList bootclasspaths, ArrayList classpaths,ArrayList sourcepathClasspaths, String currentClasspathName, ArrayList currentRuleSpecs, int mode, String customEncoding) {

eclipse-efj-doc.patch:
 tasks/tasks-230.htm |   36 ++++++++++++++++++++++++
 tasks/tasks-231.htm |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tasks/tasks-232.htm |   58 ++++++++++++++++++++++++++++++++++++++
 tasks/tasks-68.htm  |    3 +-
 topics_Tasks.xml    |    7 ++++
 5 files changed, 180 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-efj-doc.patch ---
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-230.htm org.eclipse.jdt.doc.user/tasks/tasks-230.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-230.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-230.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Using the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Using the Formatter Application
+    </h1>
+    <p>
+ 	The JDT has a commandline Eclipse Application that allows users to format Java source code either with 
+ 	the Eclipse default code formatter options or with custom options.
+    </p>
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-66.htm">Formatting Java Code</a><br>
+      <a href="tasks-231.htm">Running the Formatter Application</a>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">CodeFormatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-231.htm org.eclipse.jdt.doc.user/tasks/tasks-231.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-231.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-231.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Running the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Running the Formatter Application
+    </h1>
+    <p>
+    Running the Formatter Application is as simple as running the org.eclipse.jdt.core.JavaCodeFormatter application from the commandline:
+    <pre>
+    eclipse -vm &lt;path to virtual machine&gt; -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] &lt;files&gt;
+    </pre>
+    <table border="1" cellspacing="0" cellpadding="5" width="600">
+      <tr>
+        <td width="25%">&lt;files&gt;</td> 
+        <td>Java source files and/or directories to format. Only files ending with .java will be formatted in the given directory.</td>
+      </tr>
+    </table>
+    </p>
+    <p>
+    <table border="1" cellspacing="0" cellpadding="5" width="600">
+    	<thead>
+		<tr>
+			<th><p>OPTIONS</p></th>
+			<th><p>Description</p></th>
+		</tr>
+	    </thead>
+	    <tbody>
+		<tr>
+			<td valign="top" width="25%"><p>-config &lt;file&gt;</p></td>
+			<td valign="top"><p>Use the formatting style from the specified properties file. 
+			                    Refer to <a href="tasks-232.htm">Generating a config file for the Formatter Application</a>
+			                    for details.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-help</p></td>
+			<td valign="top"><p>Display the help message.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-quiet</p></td>
+			<td valign="top"><p>Only print error messages.</p>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><p>-verbose</p></td>
+			<td valign="top"><p>Be verbose about the formatting job.</p>
+			</td>
+		</tr>
+		</tbody>
+	</table>
+    </p>
+    
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-66.htm">Formatting Java Code</a><br>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">CodeFormatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-232.htm org.eclipse.jdt.doc.user/tasks/tasks-232.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-232.htm	1969-12-31 19:00:00.000000000 -0500
+++ org.eclipse.jdt.doc.user/tasks/tasks-232.htm	2006-02-04 12:49:11.000000000 -0500
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+  <head>
+<meta name="copyright" content="Copyright (c) Red Hat Incorporated 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta http-equiv="Content-Style-Type" content="text/css">
+    <title>
+      Generating a config file for the Formatter Application
+    </title>
+    <link rel="stylesheet" href="../book.css" charset="ISO-8859-1" type="text/css">
+  </head>
+  <body>
+    <h1>
+      Generating a config file for the Formatter Application
+    </h1>
+    <p>
+    Generating a config file for the Formatter Application involves modifying the code formatter settings
+    for a Java Project and copying org.eclipse.jdt.core.prefs out of the .settings directory for that project.
+    </p>
+    <ol>
+      <li>
+        Select a java project, open the pop-up menu and choose <strong>Properties</strong>.
+      </li>
+
+      <li>
+        Select the <strong>Code Style &gt; Formatter</strong> page and check <strong>Enable project specific sttings</strong>.
+      </li>
+      <li>
+        Select or edit a profile as explained above.
+      </li>
+
+      <li>
+        Click <strong>OK</strong> when you are done.
+      </li>
+      
+      <li>
+        Use either a file manager or the command line to copy <b><code>workspace/YourJavaProject/.settings/org.eclipse.jdt.core.prefs</code></b>
+        to a new location.
+      </li>
+      
+    </ol>
+    </p>
+    <p>
+      <img src="../images/ngrelt.png" alt="Related tasks" border="0" >
+    </p>
+    <p>
+      <a href="tasks-68.htm">Setting code formatting preferences</a><br>
+    </p>
+    <p>
+      <img src="../images/ngrelr.png" alt="Related reference" border="0" >
+    </p>
+    <p>
+      <a href="../reference/ref-17.htm">Code Formatter</a><br>
+    </p>
+    
+  </body>
+</html>
+
diff -ruN org.eclipse.jdt.doc.user.orig/tasks/tasks-68.htm org.eclipse.jdt.doc.user/tasks/tasks-68.htm
--- org.eclipse.jdt.doc.user.orig/tasks/tasks-68.htm	2005-06-23 06:30:40.000000000 -0400
+++ org.eclipse.jdt.doc.user/tasks/tasks-68.htm	2006-02-04 12:50:06.000000000 -0500
@@ -63,7 +63,8 @@
     </p>
     <p>
       <a href="tasks-66.htm">Formatting Java code</a><br>
-       <a href="tasks-67.htm">Formatting files or portions of code</a>
+      <a href="tasks-67.htm">Formatting files or portions of code</a><br>
+      <a href="tasks-230.htm">Using the Formatter Application</a>
     </p>
     <p>
       <img border="0"  src="../images/ngrelr.png" alt="Related reference">
diff -ruN org.eclipse.jdt.doc.user.orig/topics_Tasks.xml org.eclipse.jdt.doc.user/topics_Tasks.xml
--- org.eclipse.jdt.doc.user.orig/topics_Tasks.xml	2005-06-23 10:55:16.000000000 -0400
+++ org.eclipse.jdt.doc.user/topics_Tasks.xml	2006-02-04 12:50:03.000000000 -0500
@@ -310,4 +310,9 @@
 		</topic>
 	</topic>
 	<anchor id="t_scrapbook" />
-</toc>
\ No newline at end of file
+	<topic label="Using the Formatter Application" href="tasks/tasks-230.htm">
+			<topic label="Running the Formatter Application" href="tasks/tasks-231.htm"></topic>
+			<topic label="Generating a config file for the Formatter Application" href="tasks/tasks-232.htm"></topic>
+	</topic>
+	
+</toc>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Dec 2005 04:59:04 -0000	1.17
+++ .cvsignore	9 Feb 2006 18:53:56 -0000	1.18
@@ -1,2 +1,2 @@
-eclipse-sourceBuild-srcIncluded-3.1.1.zip
-eclipse-fedora-splash-3.1.1.png
+eclipse-sourceBuild-srcIncluded-3.1.2.zip
+eclipse-fedora-splash-3.1.2.png

eclipse-efj.patch:
 formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java |  389 ++++++++++
 formatter/org/eclipse/jdt/core/formatter/messages.properties           |   41 +
 plugin.xml                                                             |   12 
 3 files changed, 441 insertions(+), 1 deletion(-)

Index: eclipse-efj.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-efj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-efj.patch	6 Dec 2005 20:35:49 -0000	1.2
+++ eclipse-efj.patch	9 Feb 2006 18:53:56 -0000	1.3
@@ -1,51 +1,10 @@
-Index: plugin.xml
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/plugin.xml,v
-retrieving revision 1.76
-diff -u -r1.76 plugin.xml
---- plugin.xml	4 Jan 2005 10:43:40 -0000	1.76
-+++ plugin.xml	25 Jan 2005 05:04:57 -0000
-@@ -209,4 +209,15 @@
-    <initializer class="org.eclipse.jdt.internal.core.JavaCorePreferenceInitializer"/>
- </extension>
- 
-+<!-- =================================================================================== -->
-+<!-- Extension: Java Code Formatter                                                      -->
-+<!-- =================================================================================== -->
-+<extension
-+      id="JavaCodeFormatter"
-+      point="org.eclipse.core.runtime.applications">
-+      	<application>
-+      		<run class="org.eclipse.jdt.core.formatter.CodeFormatterApplication" />
-+		</application>
-+</extension>
-+
- </plugin>
-Index: formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java,v
-retrieving revision 1.8
-diff -u -r1.8 CodeFormatter.java
---- formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java	7 Jun 2004 15:46:28 -0000	1.8
-+++ formatter/org/eclipse/jdt/core/formatter/CodeFormatter.java	25 Jan 2005 05:04:58 -0000
-@@ -62,7 +62,7 @@
- 	 *      level of zero or below has no effect.
- 	 * @param lineSeparator the line separator to use in formatted source,
- 	 *     if set to <code>null</code>, then the platform default one will be used.
--	 * @return the text edit
-+	 * @return the text edit or <code>null</code> if the given string cannot be formatted.
- 	 * @throws IllegalArgumentException if offset is lower than 0, length is lower than 0 or
- 	 * length is greater than source length.
- 	 */
-Index: formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
-===================================================================
-RCS file: formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
-diff -N formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,427 @@
+diff -ruN org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java
+--- org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	1969-12-31 19:00:00.000000000 -0500
++++ org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/CodeFormatterApplication.java	2006-02-03 22:02:39.000000000 -0500
+@@ -0,0 +1,389 @@
 +/*******************************************************************************
 + * Copyright (c) 2004 Ben Konrath <ben at bagu.org>
++ * Copyright (c) 2006 Red Hat Incorporated
 + * All rights reserved. This program and the accompanying materials 
 + * are made available under the terms of the Eclipse Public License v1.0
 + * which accompanies this distribution, and is available at
@@ -53,477 +12,450 @@
 + * 
 + * Contributors:
 + *     Ben Konrath <ben at bagu.org> - initial implementation
++ *     Red Hat Incorporated - improvements based on comments from JDT developers
++ *     IBM Corporation - Code review and integration
 + *******************************************************************************/
-+
 +package org.eclipse.jdt.core.formatter;
 +
-+import java.io.BufferedReader;
++import java.io.BufferedInputStream;
 +import java.io.BufferedWriter;
 +import java.io.File;
 +import java.io.FileInputStream;
-+import java.io.FileReader;
 +import java.io.FileWriter;
 +import java.io.IOException;
-+import java.io.Writer;
 +import java.text.MessageFormat;
 +import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.MissingResourceException;
-+import java.util.ResourceBundle;
-+
-+import javax.xml.parsers.ParserConfigurationException;
-+import javax.xml.parsers.SAXParser;
-+import javax.xml.parsers.SAXParserFactory;
++import java.util.Properties;
 +
 +import org.eclipse.core.runtime.IPlatformRunnable;
-+import org.eclipse.core.runtime.Platform;
 +import org.eclipse.jdt.core.ToolFactory;
 +import org.eclipse.jdt.internal.core.util.Util;
 +import org.eclipse.jface.text.BadLocationException;
 +import org.eclipse.jface.text.Document;
 +import org.eclipse.jface.text.IDocument;
++import org.eclipse.osgi.util.NLS;
 +import org.eclipse.text.edits.TextEdit;
-+import org.xml.sax.Attributes;
-+import org.xml.sax.InputSource;
-+import org.xml.sax.SAXException;
-+import org.xml.sax.helpers.DefaultHandler;
 +
 +/**
-+ * Class that handles the org.eclipse.jdt.core.JavaCodeFormatter the
-+ * application. The map file reading code is based on code in ProfileStore.java
-+ * (org.eclipse.jdf.ui).
++ * Implements an Eclipse Application for org.eclipse.jdt.core.JavaCodeFormatter.
 + * 
-+ * There are a couple improvments that could be made:
-+ * 1. Add an import clean up option (requires stuff from org.eclipse.jdt.ui).
-+ * 2. Make a list of all the files first and then format. You could then 
-+ *    remove duplicate files. 
++ * There are a couple improvments that could be made: 1. Make a list of all the
++ * files first so that a file does not get formatted twice. 2. Use a text based
++ * progress monitor for output.
 + * 
-+ * @author Ben Konrath <ben at bagu.org>
++ * @author Ben Konrath <bkonrath at redhat.com>
++ * @since 3.2
 + */
 +public class CodeFormatterApplication implements IPlatformRunnable {
 +
-+    /**
-+     * A SAX event handler to parse the config xml.
-+     */
-+    private final static class ConfigHandler extends DefaultHandler {
-+
-+        /**
-+         * Identifiers for the XML file.
-+         */
-+        private final String XML_NODE_ROOT = "profiles"; //$NON-NLS-1$
-+
-+        private final String XML_NODE_PROFILE = "profile"; //$NON-NLS-1$
-+
-+        private final String XML_NODE_SETTING = "setting"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_VERSION = "version"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-+
-+        private final String XML_ATTRIBUTE_VALUE = "value"; //$NON-NLS-1$
-+
-+        private int fVersion;
-+
-+        private String fName;
-+
-+        private Map fSettings;
-+
-+        public void startElement(String uri, String localName, String qName,
-+                Attributes attributes) throws SAXException {
-+
-+            if (qName.equals(XML_NODE_SETTING)) {
-+
-+                final String key = attributes.getValue(XML_ATTRIBUTE_ID);
-+                final String value = attributes.getValue(XML_ATTRIBUTE_VALUE);
-+                fSettings.put(key, value);
-+
-+            } else if (qName.equals(XML_NODE_PROFILE)) {
-+
-+                fName = attributes.getValue(XML_ATTRIBUTE_NAME);
-+                fSettings = new HashMap(200);
-+
-+            } else if (qName.equals(XML_NODE_ROOT)) {
-+
-+                try {
-+                    fVersion = Integer.parseInt(attributes
-+                            .getValue(XML_ATTRIBUTE_VERSION));
-+                } catch (NumberFormatException ex) {
-+                    throw new SAXException(ex);
-+                }
-+
-+            }
-+        }
-+
-+        public Map getSettings() {
-+            return fSettings;
-+        }
-+
-+        public int getVersion() {
-+            return fVersion;
-+        }
-+
-+        public String getName() {
-+            return fName;
-+        }
-+
-+    }
-+
-+    /**
-+     * Deals with the messages in the properties file (cut n' pasted from a
-+     * generated class).
-+     */
-+    private final static class FormatterAppMessages {
-+        private static final String BUNDLE_NAME = "org.eclipse.jdt.core.formatter.FormatterAppMessages";//$NON-NLS-1$
-+
-+        private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-+                .getBundle(BUNDLE_NAME);
-+
-+        public static String getString(String key) {
-+            try {
-+                return RESOURCE_BUNDLE.getString(key);
-+            } catch (MissingResourceException e) {
-+                return '!' + key + '!';
-+            }
-+        }
-+
-+        public static String getFormattedString(String key, String arg) {
-+            return getFormattedString(key, new String[] { arg });
-+        }
-+
-+        public static String getFormattedString(String key, String[] args) {
-+            return MessageFormat.format(getString(key), args);
-+        }
-+    }
-+    
-+    /*
-+     * FIXME This value should come from ProfileVersioner.CURRENT_VERSION, however
-+     * this class cannot be included here because it is internal to
-+     * org.eclipse.jdt.ui and becuase this plugin (org.eclipse.jdt.core) does
-+     * not require org.eclipse.jdt.ui (nor should it). Refactoring this to make
-+     * it an external class of org.eclipse.jdt.core would solve these problems.
-+     */
-+    int CURRENT_VERSION = 8;
-+
-+    /**
-+     * Read the xml config file and return a Map representing the options that
-+     * are in the specified config file.
-+     */
-+    public Map readConfig(String filename) {
-+
-+        try {
-+            final FileInputStream reader = new FileInputStream(new File(
-+                    filename));
-+            final ConfigHandler handler = new ConfigHandler();
-+
-+            try {
-+                InputSource inputSource = new InputSource(reader);
-+                final SAXParserFactory factory = SAXParserFactory.newInstance();
-+                final SAXParser parser = factory.newSAXParser();
-+                parser.parse(inputSource, handler);
-+                if (handler.getVersion() != CURRENT_VERSION)
-+                    return null;
-+                configName = handler.getName();
-+                return handler.getSettings();
-+
-+            } finally {
-+                try { reader.close(); } catch (IOException e) { /* ignore */ }
-+            }
-+
-+        } catch (IOException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        } catch (SAXException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        } catch (ParserConfigurationException e) {
-+            Util.log(e, FormatterAppMessages
-+                    .getString("ConfigFile.reading.error")); //$NON-NLS-1$
-+        }
-+        return null;
-+    }
-+    
-+    /**
-+     * Runs the Java code formatter application
-+     */
-+    public Object run(Object args) throws Exception {
-+        
-+        ArrayList fileList = processCommandLine((String[]) args);
-+        
-+        // nothing to do
-+        if (fileList == null || fileList.isEmpty())
-+        	return EXIT_OK;
-+       
-+        if (!quiet) {
-+        	if (configName != null)
-+        		System.out.println(FormatterAppMessages.getFormattedString("CommandLine.config.file", configName)); //$NON-NLS-1$
-+            System.out.println(FormatterAppMessages.getString("CommandLine.start")); //$NON-NLS-1$
-+        }
-+        
-+        // format the list of files and/or directories
-+        while (!fileList.isEmpty()) {
-+        	File file = (File) fileList.remove(0);
-+        		
-+            if (file.isDirectory())
-+                formatDirTree(file);
-+            else
-+                formatFile(file);    
-+        }
-+        
-+        if (!quiet) {
-+            System.out.println(FormatterAppMessages.getString("CommandLine.done")); //$NON-NLS-1$
-+        }
-+        
-+        return EXIT_OK;
-+    }
-+
-+    private void displayHelp(String message) {
-+        System.err.println(message);
-+        System.out.println(""); //$NON-NLS-1$
-+        displayHelp();
-+    }
-+
-+    private String configName;
-+    
-+    /*
-+     * The output will look like this:
-+     * 
-+     * "Usage: eclipse -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] <files>
-+     *     <files>		Java source files and/or directories to format.
-+     *					Only files ending with .java will be formatted in the given directory.
-+     *  OPTIONS:
-+     *	   -config <file>		Use the formatting style from the specified config file.
-+     *							This file must be an xml file that has been exported by Eclipse 3.0.
-+     *     -help				Display this message.
-+     *     -quiet				Only print error messages.
-+     *	   -verbose				Be verbose about the formatting job.   
-+     */
-+    private void displayHelp() {
-+        String binaryName = Platform.getOS().equals(Platform.OS_WIN32) ? "eclipse.exe" : "eclipse"; //$NON-NLS-1$ //$NON-NLS-2$
-+
-+        // this is UG-LY. is there a way to make this look nicer?
-+        System.out.println(FormatterAppMessages.getFormattedString("CommandLine.usage", //$NON-NLS-1$
-+        		binaryName + " -application org.eclipse.jdt.core.JavaCodeFormatter")); //$NON-NLS-1$
-+        System.out.println(""); //$NON-NLS-1$
-+        
-+        System.out.println("   " + FormatterAppMessages.getString("CommandLine.files") //$NON-NLS-1$ //$NON-NLS-2$
-+                + "\t" + FormatterAppMessages.getString("CommandLine.files.msg1")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("\t\t" //$NON-NLS-1$
-+        		+ FormatterAppMessages.getFormattedString("CommandLine.files.msg2", ".java")); //$NON-NLS-1$ //$NON-NLS-2$ 
-+        
-+        System.out.println(FormatterAppMessages.getString("CommandLine.options")); //$NON-NLS-1$
-+        System.out.println("   " + FormatterAppMessages.getFormattedString("CommandLine.config", ARG_CONFIG) //$NON-NLS-1$ //$NON-NLS-2$ 
-+        		+ "\t" + FormatterAppMessages.getString("CommandLine.config.msg1")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("\t\t\t" + FormatterAppMessages.getString("CommandLine.config.msg2")); //$NON-NLS-1$ //$NON-NLS-2$
-+        System.out.println("   " + ARG_HELP + "\t\t" + FormatterAppMessages.getString("CommandLine.help")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-+        System.out.println("   " + ARG_QUIET + "\t\t" + FormatterAppMessages.getString("CommandLine.quiet")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-+        System.out.println("   " + ARG_VERBOSE +"\t\t" + FormatterAppMessages.getString("CommandLine.verbose")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-+    }
-+    
-+    private final String ARG_HELP =    "-help"; //$NON-NLS-1$
-+    private final String ARG_CONFIG =  "-config"; //$NON-NLS-1$
-+    private final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
-+    private final String ARG_QUIET = "-quiet"; //$NON-NLS-1$
-+    private boolean verbose = false;
-+    private boolean quiet = false;
-+    
-+    private ArrayList processCommandLine(String[] argsArray) {
++	/**
++	 * Deals with the messages in the properties file (cut n' pasted from a
++	 * generated class).
++	 */
++	private final static class Messages extends NLS {
++		private static final String BUNDLE_NAME = "org.eclipse.jdt.core.formatter.messages";//$NON-NLS-1$
 +
-+        ArrayList args = new ArrayList();
-+        for (int i = 0; i < argsArray.length; i++) {
-+			args.add(argsArray[i]);
++		public static String CommandLineConfigFile;
++
++		public static String CommandLineDone;
++
++		public static String CommandLineErrorConfig;
++
++		public static String CommandLineErrorFile;
++
++		public static String CommandLineErrorFileDir;
++
++		public static String CommandLineErrorQuietVerbose;
++		
++		public static String CommandLineErrorNoConfigFile;
++
++		public static String CommandLineFormatting;
++
++		public static String CommandLineStart;
++
++		public static String CommandLineUsage;
++
++		public static String ConfigFileReadingError;
++
++		public static String FormatProblem;
++
++		public static String CaughtException;
++
++		public static String ExceptionSkip;
++
++		static {
++			NLS.initializeMessages(BUNDLE_NAME, Messages.class);
 +		}
-+        
-+        // look for flag-like args
-+        if (args.remove(ARG_HELP)) {
-+            displayHelp();
-+            return null;
-+        }
-+        if (args.remove(ARG_VERBOSE))
-+            verbose = true;
-+        if (args.remove(ARG_QUIET)) 
-+        	quiet = true;
-+        
-+        if (quiet && verbose) {
-+        	displayHelp(FormatterAppMessages.getFormattedString
-+        			("CommandLineError.quiet.verbose", new String[] {ARG_QUIET, ARG_VERBOSE})); //$NON-NLS-1$
-+        	return null;
-+        }
-+        args.remove("-pdelaunch"); //$NON-NLS-1$
-+
-+        // look for flag/param args
-+        int index = args.indexOf(ARG_CONFIG);
-+        if (index >= 0) {
-+            args.remove(index);
-+            String configFile = (String) args.remove(index);
-+            options = readConfig(configFile);
-+            if (options == null) {
-+                displayHelp(FormatterAppMessages
-+                        .getFormattedString("CommandLineError.config", configFile)); //$NON-NLS-1$
-+                return null;
-+            }
-+        }
-+
-+        // only the files and directories should remain
-+        ArrayList fileList = new ArrayList();
-+        while (!args.isEmpty()) {
-+			String fileName = (String) args.remove(0);
-+			File file = new File(fileName);
-+			if (file.exists()) {
-+				fileList.add(file);
-+			} else {
-+				displayHelp(FormatterAppMessages
-+					.getFormattedString("CommandLineError.file", fileName)); //$NON-NLS-1$
-+				return null;
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @return the manipulated String
++		 */
++		public static String bind(String message) {
++			return bind(message, null);
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param binding
++		 *            the object to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object binding) {
++			return bind(message, new Object[] {
++				binding
++			});
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param binding1
++		 *            An object to be inserted into the message
++		 * @param binding2
++		 *            A second object to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object binding1, Object binding2) {
++			return bind(message, new Object[] {
++					binding1, binding2
++			});
++		}
++
++		/**
++		 * Bind the given message's substitution locations with the given string
++		 * values.
++		 * 
++		 * @param message
++		 *            the message to be manipulated
++		 * @param bindings
++		 *            An array of objects to be inserted into the message
++		 * @return the manipulated String
++		 */
++		public static String bind(String message, Object[] bindings) {
++			return MessageFormat.format(message, bindings);
++		}
++	}
++
++	private final String ARG_CONFIG = "-config"; //$NON-NLS-1$
++
++	private final String ARG_HELP = "-help"; //$NON-NLS-1$
++
++	private final String ARG_QUIET = "-quiet"; //$NON-NLS-1$
++
++	private final String ARG_VERBOSE = "-verbose"; //$NON-NLS-1$
++
++	private String configName;
++
++	private Properties options = null;
++
++	private final String PDE_LAUNCH = "-pdelaunch"; //$NON-NLS-1$
++
++	private boolean quiet = false;
++
++	private boolean verbose = false;
++
++	/** 
++	 * Display the command line usage message.
++	 */
++	private void displayHelp() {
++		System.out.println(Messages.bind(Messages.CommandLineUsage));
++	}
++
++	private void displayHelp(String message) {
++		System.err.println(message);
++		System.out.println();
++		displayHelp();
++	}
++
++	/**
++	 * Recursively format the Java source code that is contained in the
++	 * directory rooted at dir.
++	 */
++	private void formatDirTree(File dir, CodeFormatter codeFormatter) {
++
++		File[] files = dir.listFiles();
++		if (files == null)
++			return;
++
++		for (int i = 0; i < files.length; i++) {
++			File file = files[i];
++			if (file.isDirectory()) {
++				formatDirTree(file, codeFormatter);
++			} else if (Util.isJavaLikeFileName(file.getPath())) {
++				formatFile(file, codeFormatter);
 +			}
 +		}
-+        
-+        if (fileList.isEmpty())
-+        	displayHelp(FormatterAppMessages.getString("CommandLineError.file.dir")); //$NON-NLS-1$
-+        	
-+        return fileList;
-+    }
-+
-+    /**
-+     * Recursively format the Java source code that is contained in the
-+     * directory rooted at dir.
-+     */
-+    private void formatDirTree(File dir) {
-+
-+        File[] files = dir.listFiles();
-+        if (files == null)
-+            return;
-+
-+        for (int i = 0; i < files.length; i++) {
-+            File file = files[i];
-+            if (file.isDirectory()) {
-+                formatDirTree(file);
-+            } else if (file.getPath().endsWith(".java")) { //$NON-NLS-1$
-+                formatFile(file);
-+            }
-+        }
-+    }
-+
-+    // internal representation of configuration options in the xml file
-+    private Map options = null;
-+
-+    /**
-+     * Format the given Java source file.
-+     */
-+    private void formatFile(File file) {
-+        
-+        IDocument doc = new Document();
-+        try {
-+            // read the file
-+            final BufferedReader in = new BufferedReader(new FileReader(file));
-+            if (verbose) {           
-+                System.out.println(FormatterAppMessages.getFormattedString
-+                		("CommandLine.formatting", file.getName())); //$NON-NLS-1$
-+            }
-+            String line;
-+            String contents = ""; //$NON-NLS-1$
-+            try {
-+                while ((line = in.readLine()) != null)
-+                    contents = contents
-+                            + System.getProperty("line.separator") + line; //$NON-NLS-1$
-+            } finally {
-+                try { in.close(); } catch (IOException e) { /* ignore */  }
-+            }
-+          
-+            // format the file (the meat and potatoes)
-+            doc.set(contents);
-+            TextEdit edit = ToolFactory.createCodeFormatter(options).format(
-+                    CodeFormatter.K_COMPILATION_UNIT, doc.get(), 0,
-+                    doc.getLength(), 0, null);
-+            if (edit != null) {
-+                edit.apply(doc);
-+            } else {            	
-+                System.err.println
-+                	(FormatterAppMessages.getFormattedString("Edit.problem", file.getName())); //$NON-NLS-1$
-+                return;
-+            }
-+        
-+            // write the file
-+            final Writer out = new BufferedWriter(new FileWriter(file, false));
-+            try {
-+                out.write(doc.get());
-+                out.flush();
-+            } finally {
-+                try { out.close(); } catch (IOException e) { /* ignore */ }
-+            }
-+            
-+        } catch (IOException e) {
-+            String errorMessage = FormatterAppMessages.getString("Exception.io") + " " //$NON-NLS-1$ //$NON-NLS-2$
-+            	+ e.getLocalizedMessage();
-+            Util.log(e, errorMessage);
-+            System.err.println(errorMessage); 
-+            System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$
-+            
-+        }  catch (BadLocationException e) {
-+            String errorMessage = FormatterAppMessages.getString("Exception.bad.location") + " " //$NON-NLS-1$ //$NON-NLS-2$
-+    			+ e.getLocalizedMessage();
-+            Util.log(e, errorMessage);
-+            System.err.println(errorMessage); 
-+            System.err.println(FormatterAppMessages.getString("Exception.skip")); //$NON-NLS-1$
-+        }
-+    }
++	}
 +
-+}
-Index: formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
-===================================================================
-RCS file: formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
-diff -N formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ formatter/org/eclipse/jdt/core/formatter/FormatterAppMessages.properties	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,47 @@
-+/*******************************************************************************
-+ * Copyright (c) 2004 Ben Konrath <ben at bagu.org>
-+ * All rights reserved. This program and the accompanying materials 
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     Ben Konrath <ben at bagu.org> - initial implementation
-+ *******************************************************************************/
++	/**
++	 * Format the given Java source file.
++	 */
++	private void formatFile(File file, CodeFormatter codeFormatter) {
++		IDocument doc = new Document();
++		try {
++			// read the file
++			if (this.verbose) {
++				System.out.println(Messages.bind(Messages.CommandLineFormatting, file.getAbsolutePath()));
++			}
++			String contents = new String(org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(file, null));
++			// format the file (the meat and potatoes)
++			doc.set(contents);
++			TextEdit edit = codeFormatter.format(CodeFormatter.K_COMPILATION_UNIT, contents, 0, contents.length(), 0, null);
++			if (edit != null) {
++				edit.apply(doc);
++			} else {
++				System.err.println(Messages.bind(Messages.FormatProblem, file.getAbsolutePath()));
++				return;
++			}
 +
-+CommandLine.start=Starting format job ...
-+CommandLine.done=Done.
-+CommandLine.config.file=Configuration Name: {0}
-+CommandLine.formatting=Formatting: {0}
++			// write the file
++			final BufferedWriter out = new BufferedWriter(new FileWriter(file));
++			try {
++				out.write(doc.get());
++				out.flush();
++			} finally {
++				try {
++					out.close();
++				} catch (IOException e) {
++					/* ignore */
++				}
++			}
++		} catch (IOException e) {
++			String errorMessage = Messages.bind(Messages.CaughtException, "IOException", e.getLocalizedMessage()); //$NON-NLS-1$
++			Util.log(e, errorMessage);
++			System.err.println(Messages.bind(Messages.ExceptionSkip ,errorMessage));
++		} catch (BadLocationException e) {
++			String errorMessage = Messages.bind(Messages.CaughtException, "BadLocationException", e.getLocalizedMessage()); //$NON-NLS-1$
++			Util.log(e, errorMessage);
++			System.err.println(Messages.bind(Messages.ExceptionSkip ,errorMessage));
++		}
++	}
 +
-+CommandLine.usage=Usage: {0} [ OPTIONS ] <files>
++	private File[] processCommandLine(String[] argsArray) {
 +
-+CommandLine.files=<files>
-+CommandLine.files.msg1=Java source files and/or directories to format.
-+CommandLine.files.msg2=Only files ending with {0} will be formatted in the given directory.
++		ArrayList args = new ArrayList();
++		for (int i = 0; i < argsArray.length; i++) {
++			args.add(argsArray[i]);
++		}
++		int index = 0;
++		final int argCount = argsArray.length;
 +
-+CommandLine.options=OPTIONS:
-+CommandLine.config={0} <file>
-+CommandLine.config.msg1=Use the formatting style from the specified config file.
-+CommandLine.config.msg2=This file must be an xml file that has been exported by Eclipse 3.0.
-+CommandLine.help=Display this message.
-+CommandLine.quiet=Only print error messages.
-+CommandLine.verbose=Be verbose about the formatting job.
++		final int DEFAULT_MODE = 0;
++		final int CONFIG_MODE = 1;
++		
++		int mode = DEFAULT_MODE;
++		final int INITIAL_SIZE = 1;
++		int fileCounter = 0;
++		
++		File[] filesToFormat = new File[INITIAL_SIZE];
++
++		loop: while (index < argCount) {
++			String currentArg = argsArray[index++];
++
++			switch(mode) {
++				case DEFAULT_MODE :
++					if (PDE_LAUNCH.equals(currentArg)) {
++						continue loop;
++					}			
++					if (ARG_HELP.equals(currentArg)) {
++						displayHelp();
++						return null;				
++					}
++					if (ARG_VERBOSE.equals(currentArg)) {
++						this.verbose = true;
++						continue loop;
++					}
++					if (ARG_QUIET.equals(currentArg)) {
++						this.quiet = true;
++						continue loop;
++					}
++					if (ARG_CONFIG.equals(currentArg)) {
++						mode = CONFIG_MODE;
++						continue loop;
++					}
++					// the current arg should be a file or a directory name
++					File file = new File(currentArg);
++					if (file.exists()) {
++						if (filesToFormat.length == fileCounter) {
++							System.arraycopy(filesToFormat, 0, (filesToFormat = new File[fileCounter * 2]), 0, fileCounter);
++						}
++						filesToFormat[fileCounter++] = file;
++					} else {
++						displayHelp(Messages.bind(Messages.CommandLineErrorFile, currentArg));
++						return null;
++					}	
++					break;
++				case CONFIG_MODE :
++					this.configName = currentArg;
++					this.options = readConfig(currentArg);
++					if (this.options == null) {
++						displayHelp(Messages.bind(Messages.CommandLineErrorConfig, currentArg));
++						return null;
++					}
++					mode = DEFAULT_MODE;
++					continue loop;
++			}			
++		}
 +
++		if (mode == CONFIG_MODE) {
++			displayHelp(Messages.bind(Messages.CommandLineErrorNoConfigFile));
++			return null;			
++		}
++		if (this.quiet && this.verbose) {
++			displayHelp(
++				Messages.bind(
++					Messages.CommandLineErrorQuietVerbose,
++					new String[] { ARG_QUIET, ARG_VERBOSE }
++				));
++			return null;
++		}
++		if (fileCounter == 0) {
++			displayHelp(Messages.bind(Messages.CommandLineErrorFileDir));
++			return null;
++		}
++		if (filesToFormat.length != fileCounter) {
++			System.arraycopy(filesToFormat, 0, (filesToFormat = new File[fileCounter]), 0, fileCounter);
++		}
++		return filesToFormat;
++	}
 +
-+CommandLineError.file={0} does not exsit. Please specify only valid Java Source files.
-+CommandLineError.config=There was problem reading the config file, {0}.
-+CommandLineError.file.dir=You must specify at least one file or dirctory to format.
-+CommandLineError.quiet.verbose=You cannot use the options {0} and {1} together.
++	/**
++	 * Return a Java Properties file representing the options that are in the
++	 * specified config file.
++	 */
++	private Properties readConfig(String filename) {
++		BufferedInputStream stream = null;
++		try {
++			stream = new BufferedInputStream(new FileInputStream(new File(filename)));
++			final Properties formatterOptions = new Properties();
++			formatterOptions.load(stream);
++			return formatterOptions;
++		} catch (IOException e) {
++			Util.log(e, Messages.bind(Messages.ConfigFileReadingError));
++		} finally {
++			if (stream != null) {
++				try {
++					stream.close();
++				} catch (IOException e) {
++					/* ignore */
++				}
++			}
++		}
++		return null;
++	}
 +
++	/**
++	 * Runs the Java code formatter application
++	 */
++	public Object run(Object args) throws Exception {
++		File[] filesToFormat = processCommandLine((String[]) args);
 +
-+Exception.io=Caught IOExecption:
-+Exception.bad.location=Caught BadLocationException:  
-+Exception.skip=Skipping File.
++		if (filesToFormat == null) {
++			return EXIT_OK;
++		}
 +
++		if (!this.quiet) {
++			if (this.configName != null) {
++				System.out.println(Messages.bind(Messages.CommandLineConfigFile, this.configName));
++			}
++			System.out.println(Messages.bind(Messages.CommandLineStart));
++		}
 +
-+ConfigFile.reading.error=Error Reading config file.
++		// format the list of files and/or directories
++		final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(this.options);
++		for (int i = 0, max = filesToFormat.length; i < max; i++) {
++			final File file = filesToFormat[i];
++			if (file.isDirectory()) {
++				formatDirTree(file, codeFormatter);
++			} else if (Util.isJavaLikeFileName(file.getPath())) {
++				formatFile(file, codeFormatter);
++			}			
++		}
++		if (!this.quiet) {
++			System.out.println(Messages.bind(Messages.CommandLineDone));
++		}
 +
++		return EXIT_OK;
++	}
 +
-+Edit.problem=The Eclipse formatter had a problem {0}, Skipping.
++}
+diff -ruN org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/messages.properties org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/messages.properties
+--- org.eclipse.jdt.core.orig/formatter/org/eclipse/jdt/core/formatter/messages.properties	1969-12-31 19:00:00.000000000 -0500
++++ org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/messages.properties	2006-02-03 22:02:36.000000000 -0500
+@@ -0,0 +1,41 @@
++###############################################################################
++# Copyright (c) 2006 Ben Konrath <ben at bagu.org>
++# All rights reserved. This program and the accompanying materials
++# are made available under the terms of the Eclipse Public License v1.0
++# which accompanies this distribution, and is available at
++# http://www.eclipse.org/legal/epl-v10.html
++#
++# Contributors:
++#     Ben Konrath <ben at bagu.org> - initial implementation
++#     IBM Corporation - Code review and integration
++###############################################################################
++CommandLineStart=Starting format job ...
++CommandLineDone=Done.
++CommandLineConfigFile=Configuration Name: {0}
++CommandLineFormatting=Formatting: {0}
++
++CommandLineUsage=Usage: eclipse -application org.eclipse.jdt.core.JavaCodeFormatter [ OPTIONS ] <files>\n\
++\n\
++\   <files>   Java source files and/or directories to format.\n\
++\             Only files ending with .java will be formatted in the given directory.\n\
++\n\
++\OPTIONS:\n\
++\   -config <configFile> Use the formatting style from the specified properties file.\n\
++\                        Refer to the help documentation to find out how to generate this file.\n\
++\n\
++\   -help                Display this message.\n\
++\   -quiet               Only print error messages.\n\
++\   -verbose             Be verbose about the formatting job.
++
++CommandLineErrorFile={0} does not exist. Please specify only valid Java Source files.
++CommandLineErrorConfig=A problem occured while reading the config file {0}.
++CommandLineErrorFileDir=You must specify at least one file or directory to format.
++CommandLineErrorQuietVerbose=You cannot use the options {0} and {1} together.
++CommandLineErrorNoConfigFile=No configuration file specified.
++
++CaughtException=Caught {0} : {1}
++ExceptionSkip= {0}\nSkipping File.
++
++ConfigFileReadingError=Error Reading config file.
++
++FormatProblem=The Eclipse formatter failed to format {0}. Skip the file.
+\ No newline at end of file
+diff -ruN org.eclipse.jdt.core.orig/plugin.xml org.eclipse.jdt.core/plugin.xml
+--- org.eclipse.jdt.core.orig/plugin.xml	2005-05-09 07:29:30.000000000 -0400
++++ org.eclipse.jdt.core/plugin.xml	2006-02-04 13:17:09.000000000 -0500
+@@ -155,7 +155,17 @@
+ 	<fileTypes extension="jardesc" type="text"/>
+ 	<fileTypes extension="zip" type="binary"/>
+ </extension>
+-      
++<!-- =================================================================================== -->
++<!-- Extension: Java Code Formatter                                                      -->
++<!-- =================================================================================== -->
++<extension
++      id="JavaCodeFormatter"
++      point="org.eclipse.core.runtime.applications">
++      	<application>
++      		<run class="org.eclipse.jdt.core.formatter.CodeFormatterApplication" />
++		</application>
++</extension>
 +
-Content-Type: text/plain
-
+ <!-- =================================================================================== -->
+ <!-- Extension: Java Content Types                                                       -->
+ <!-- =================================================================================== -->

eclipse-tomcat5-build.2.patch:
 assemble.org.eclipse.sdk.aix.motif.ppc.xml       |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml  |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.ia64.xml     |    2 +-
 assemble.org.eclipse.sdk.solaris.gtk.sparc.xml   |    2 +-
 assemble.org.eclipse.sdk.solaris.motif.sparc.xml |    2 +-
 assemble.org.eclipse.sdk.win32.win32.x86.xml     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Index: eclipse-tomcat5-build.2.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-tomcat5-build.2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-tomcat5-build.2.patch	21 Oct 2005 14:55:24 -0000	1.2
+++ eclipse-tomcat5-build.2.patch	9 Feb 2006 18:53:56 -0000	1.3
@@ -1,84 +1,72 @@
 diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
---- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/aix.motif.ppc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:29:08.000000000 -0500
+@@ -608,7 +608,7 @@
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
---- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -580,7 +580,7 @@
- 		</antcall>
- 		<eclipse.brand root="${eclipse.base}/hpux.motif.ia64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<zip destfile="${archiveFullPath}" filesonly="false" whenempty="skip" update="true">
+--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:30:34.000000000 -0500
+@@ -597,7 +597,7 @@
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.expressions_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.pde.doc.user_3.1.2" prefix="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"			/>
 -			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
-+			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.help.appserver_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.0.jar"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.ant.ui_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.ant.ui_3.1.1.jar"			/>
- 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.pde.runtime_3.1.1.jar" fullpath="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.1.1.jar"			/>
++			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.0.30" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
+ 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.1" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"			/>
+ 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"			/>
 diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
---- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -594,7 +594,7 @@
- 		<eclipse.brand root="${eclipse.base}/hpux.motif.PA_RISC/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
+--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:31:47.000000000 -0500
+@@ -618,7 +618,7 @@
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
---- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/solaris.gtk.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
+--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:32:20.000000000 -0500
+@@ -607,7 +607,7 @@
  		<exec executable="zip" dir="${assemblyTempDir}">
  			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
---- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -584,7 +584,7 @@
- 		<eclipse.brand root="${eclipse.base}/solaris.motif.sparc/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:32:38.000000000 -0500
+@@ -609,7 +609,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.motif.sparc_3.1.2"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
 diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
---- assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-10-11 10:56:12.000000000 -0400
-+++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -608,7 +608,7 @@
- 		<eclipse.brand root="${eclipse.base}/win32.win32.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}"		/>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
+--- assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:25:28.000000000 -0500
++++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:32:52.000000000 -0500
+@@ -634,7 +634,7 @@
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.win32.win32.x86_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 -			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
 +			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.0.30"/>
- 		</exec>
- 		<exec executable="zip" dir="${assemblyTempDir}">
- 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
-diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml	2005-10-11 10:56:12.000000000 -0400
-+++ features/org.eclipse.platform/build.xml	2005-10-11 10:57:32.000000000 -0400
-@@ -346,7 +346,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.1" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
- 		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
- 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
- 	</target>
- 	<target name="rootFileswin32_win32_x86">
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
+ 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>

eclipse-usebuiltlauncher.patch:
 build.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+)

Index: eclipse-usebuiltlauncher.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-usebuiltlauncher.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-usebuiltlauncher.patch	28 Oct 2005 16:28:46 -0000	1.1
+++ eclipse-usebuiltlauncher.patch	9 Feb 2006 18:53:56 -0000	1.2
@@ -1,7 +1,8 @@
---- features/org.eclipse.platform/build.xml	2005-10-28 12:24:11.000000000 -0400
-+++ features/org.eclipse.platform/build.xml	2005-10-28 12:25:22.000000000 -0400
-@@ -349,6 +349,11 @@
- 		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.1/feature.xml"  selfVersion="3.1.1" featureIds="org.eclipse.rcp,3.1.1," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.1,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.1,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.1,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.1,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.1,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.1,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.1,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
+--- features/org.eclipse.platform/build.xml	2006-02-06 13:49:43.000000000 -0500
++++ features/org.eclipse.platform/build.xml	2006-02-06 13:58:52.000000000 -0500
+@@ -349,6 +349,12 @@
+ 		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.ecli!
pse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
 +	<target name="copybuiltlauncher" if="libsconfig">
@@ -9,10 +10,11 @@
 +			<fileset dir="${basedir}/../../launchertmp" includes="**"			/>
 +		</copy>
 +	</target>
++
  	<target name="rootFileswin32_win32_x86">
  		<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
  		<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -357,6 +362,8 @@
+@@ -357,6 +363,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -21,7 +23,7 @@
  		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileslinux_gtk_x86">
-@@ -368,6 +375,8 @@
+@@ -369,6 +377,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -30,25 +32,25 @@
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -379,6 +388,8 @@
+@@ -380,6 +390,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
 +		<!-- Copy the launcher that we built over the pre-built binary -->
 +		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 	<target name="rootFileslinux_gtk_ppc64">
-@@ -389,6 +400,8 @@
+@@ -391,6 +403,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
 +		<!-- Copy the launcher that we built over the pre-built binary -->
 +		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 	<target name="rootFileslinux_gtk_x86_64">
-@@ -400,6 +413,8 @@
+@@ -404,6 +418,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -57,7 +59,7 @@
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -411,6 +426,8 @@
+@@ -415,6 +431,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -66,7 +68,7 @@
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileslinux_motif_x86">
-@@ -424,6 +441,8 @@
+@@ -429,6 +447,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -75,7 +77,7 @@
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -435,6 +454,8 @@
+@@ -440,6 +460,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -84,7 +86,7 @@
  		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFilessolaris_gtk_sparc">
-@@ -445,6 +466,8 @@
+@@ -450,6 +472,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -93,7 +95,7 @@
  		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFilesaix_motif_ppc">
-@@ -455,6 +478,8 @@
+@@ -460,6 +484,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -102,7 +104,7 @@
  		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_PA_RISC">
-@@ -465,6 +490,8 @@
+@@ -470,6 +496,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -111,7 +113,7 @@
  		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_ia64">
-@@ -475,6 +502,8 @@
+@@ -480,6 +508,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -120,7 +122,7 @@
  		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_ia64_32">
-@@ -485,6 +514,8 @@
+@@ -490,6 +520,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -129,16 +131,7 @@
  		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFilesmacosx_carbon_ppc">
-@@ -495,6 +526,8 @@
- 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
- 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
- 		</copy>
-+		<!-- Copy the launcher that we built over the pre-built binary -->
-+		<antcall target="copybuiltlauncher" />
- 		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> 
- 		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> 
- 		<exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux">
-@@ -511,6 +544,8 @@
+@@ -516,6 +548,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- eclipse.spec	5 Jan 2006 16:26:33 -0000	1.170
+++ eclipse.spec	9 Feb 2006 18:53:56 -0000	1.171
@@ -9,9 +9,8 @@
 %define eclipse_major   3
 %define eclipse_minor   1
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   1
+%define eclipse_micro   2
 %define libname         libswt3
-%define build_id        M20050929-0840
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -23,11 +22,11 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_1fc.FC4.12
+Release:        1jpp_4fc.FC4
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-sourceBuild-srcIncluded-3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-sourceBuild-srcIncluded-3.1.2.zip
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
@@ -35,7 +34,7 @@
 Source8:        %{name}-pde.install     
 Source9:        %{name}-platform.install
 Source10:       %{libname}-gtk2.install
-Source11:	%{name}-fedora-splash-3.1.1.png
+Source11:	%{name}-fedora-splash-3.1.2.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
 Source19:       %{name}-filenamepatterns.txt
@@ -58,18 +57,16 @@
 # 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
+Patch13:	%{name}-s390ands390x.patch
 # Stupid spaces in directories ...
-#Patch14:	%{name}-s390ands390x2.patch
-# Make find work.  See
-# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
-#Patch16:	%{name}-find.patch
+Patch14:	%{name}-s390ands390x2.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
 # Add command-line source code formatter
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=75333
 Patch19: 	%{name}-efj.patch
+Patch25: 	%{name}-efj-doc.patch
 # GNU-style JDT formatter
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770
 Patch20: 	%{name}-gnuformatterjdt.patch
@@ -98,8 +95,6 @@
 Patch37:	%{name}-gre64.conf.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=111299
-Patch39:	%{name}-e.o111299.patch
 Patch40:	%{name}-usebuiltlauncher.patch
 Patch45:	%{name}-webapp-jasperclasspath.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
@@ -107,9 +102,11 @@
 Patch47:	%{name}-launcher-link.patch
 # Don't attempt to link to Sun's javadocs
 Patch48:	%{name}-javadoclinks.patch
+# Always generate debug info when building RPMs (Andrew Haley)
+Patch49:	%{name}-ecj-rpmdebuginfo.patch
 
 %if %{gcj_support}
-ExcludeArch: s390 s390x ia64 ppc64
+ExcludeArch: ppc64 s390 s390x
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -129,6 +126,7 @@
 BuildRequires:  mozilla-nspr-devel = 37:1.7.12
 BuildRequires:  xorg-x11-devel
 %endif
+BuildRequires:  unzip
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
 BuildRequires:	java-gcj-compat-devel >= 1.0.33
@@ -139,7 +137,7 @@
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 #BuildRequires: ant-apache-bsf ant-commons-net
-BuildRequires: ant-javamail ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
+BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.18-1jpp
 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
@@ -200,7 +198,7 @@
 
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 #Requires: ant-apache-bsf ant-commons-net
-Requires: ant-javamail ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
+Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jsch >= 0:0.1.18-1jpp
 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
@@ -331,19 +329,19 @@
 %if %{gcj_support}
 #%patch13 -p1
 %endif
-%if %{gcj_support}
-#%patch16 -p0
-%endif
 pushd plugins/org.eclipse.swt.gtk.linux.x86_64
 %patch18 -p0
 popd
 pushd plugins/org.eclipse.jdt.core
-%patch19 -p0
+%patch19 -p1
 #%patch20 -p0
 popd
-pushd plugins/org.eclipse.jdt.ui
-#%patch21 -p0
+pushd plugins/org.eclipse.jdt.doc.user
+%patch25 -p1
 popd
+#pushd plugins/org.eclipse.jdt.ui
+#%patch21 -p0
+#popd
 pushd plugins/org.eclipse.update.core
 %patch22 -p0
 popd
@@ -379,9 +377,6 @@
 %patch35 -p0
 %patch36 -p1
 %patch38 -p0
-pushd plugins
-%patch39 -p0
-popd
 %patch40 -p0
 pushd plugins/org.eclipse.help.webapp
 %patch45
@@ -403,6 +398,7 @@
 %patch47 -p1
 popd
 %patch48 -p0
+%patch49 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -507,10 +503,7 @@
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
 sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
-%if %{gcj_support}
-  # link against gcj's jawt implementation.
-  sed --in-place "s/-ljawt/-lgcjawt/" make_linux.mak
-%endif
+sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
 
@@ -541,35 +534,32 @@
   # Delete our modified ecj and restore the backup
   rm -rf ecj-bootstrap-tmp
   
-  ## 1b. Natively-compile it
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -o ecj-bootstrap.jar.so ecj-bootstrap.jar
-  # 
-  #gcj-dbtool -n ecj-bootstrap.db 30000
-  #gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
+  # 1b. Natively-compile it
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o ecj-bootstrap.jar.so ecj-bootstrap.jar
+   
+  gcj-dbtool -n ecj-bootstrap.db 30000
+  gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
   
-  ## 2a. Build ecj
+  # 2a. Build ecj
   export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
-  #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
-  #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
+  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
 %endif
 ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
 %if %{gcj_support}
-  ## 2b. Natively-compile ecj
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
-  # 
-  # gcj-dbtool -n jdtcoresrc/ecj.db 30000
-  # gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
-  # export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
-  # 
-  # # Remove our gcj-built ecj
-  # rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
-  rm ecj-bootstrap.jar
+  # 2b. Natively-compile ecj
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
+   
+  gcj-dbtool -n jdtcoresrc/ecj.db 30000
+  gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
+
+  # Remove our gcj-built ecj
+  rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
+
   # To enSURE we're not using any pre-compiled ecj on the build system, set this
-  #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
-  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=blah"
+  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
 %endif
 
 # 3. Use this ecj to rebuild itself
@@ -577,16 +567,15 @@
 ant -buildfile jdtcoresrc/compilejdtcore.xml
 
 %if %{gcj_support}
-  ## Natively-compile it
-  #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-  #  -o ecj.jar.so ecj.jar
-  #gcj-dbtool -n ecj.db 30000
-  #gcj-dbtool -a ecj.db ecj.jar{,.so}
-  #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db"
-  #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
+  # Natively-compile it
+  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o ecj.jar.so ecj.jar
+  gcj-dbtool -n ecj.db 30000
+  gcj-dbtool -a ecj.db ecj.jar{,.so}
+  export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
   
   # Remove old native bits
-  #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
+  rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
 %endif
 
 # Build the rest of Eclipse
@@ -626,8 +615,8 @@
   result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.1.jar
-unzip -d plugins plugins/org.eclipse.jdt.core_3.1.1.jar jdtCompilerAdapter.jar
+# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.2.jar
+unzip -d plugins plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar
 
 # Extract .so files
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
@@ -714,7 +703,11 @@
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
+# SWT is still a 3.1.1 jar ... (rh#180000)
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar swt-gtk-3.1.1.jar
+ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk-%{eclipse_majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -893,7 +886,7 @@
 pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
   gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
     -Wl,-R,%{_libdir}/gcj/%{name} \
-    org.eclipse.jdt.core_3.1.1.jar.so jdtCompilerAdapter.jar.so -o \
+    org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \
     $RPM_BUILD_ROOT%{_bindir}/ecj
 popd
 chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
@@ -1029,8 +1022,8 @@
 %if %{gcj_support}
 # Native bits
 %dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so
 %{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db
 %{_bindir}/ecj
@@ -1053,8 +1046,8 @@
 %dir %{_libdir}/gcj/%{name}
 %{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.so
 %endif
@@ -1063,12 +1056,12 @@
 %{_bindir}/efj
 %if %{gcj_support}
 # Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/junitruntime.jar.db
 %{_libdir}/gcj/%{name}/junitruntime.jar.so
 %{_libdir}/gcj/%{name}/junitsupport.jar.db
@@ -1096,8 +1089,8 @@
 %{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
 %endif
@@ -1116,7 +1109,7 @@
 %{_datadir}/%{name}/features/org.eclipse.rcp.source_3.*
 
 %files platform -f %{name}-platform.install
-%ifnarch ppc
+%ifarch %{ix86} x86_64
 %{_datadir}/%{name}/about.html
 %{_datadir}/%{name}/about_files
 %endif
@@ -1152,14 +1145,14 @@
 %{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
@@ -1180,14 +1173,14 @@
 %{_libdir}/gcj/%{name}/webapp.jar.so
 %{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
 %{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.db
@@ -1202,36 +1195,36 @@
 %{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/compatibility.jar.db
 %{_libdir}/gcj/%{name}/compatibility.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
@@ -1252,8 +1245,8 @@
 %{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.db
 %{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
 %{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
 # These will go away when we get a newer system ant
@@ -1264,12 +1257,38 @@
 %files platform-devel
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
 %{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc.FC4
+- Always generate debug info when building RPMs (Andrew Haley).
+
+* Mon Feb 06 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc
+- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000).
+- Link against generic libjawt.so (rh#158755).
+- Re-add patch to use built launcher.
+
+* Sat Feb 4 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_3fc
+- Update efj patches to match what has been committed to HEAD.
+
+* Fri Feb 3 2006 Igor Foox <ifoox at redhat.com> 3.1.2-1jpp_2fc
+- Updated launcher script.
+
+* Tue Jan 31 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_1fc
+- 3.1.2.
+- Remove unnecessary patches.
+
+* Tue Jan 31 2006 Karsten Hopp <karsten at redhat.de>
+- BuildRequire: unzip
+
 * Thu Jan 05 2006 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.12
 - Rebuild with new gjdoc (rh#161147).
 
+* Wed Jan 04 2006 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_15fc
+- Use natively-compiled ecj during build.
+- Attempt build on ia64.
+- Change about_files to be i386 and x86_64 only (will patch file upstream).
+
 * Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.11
 - Update patch for offline javadoc linking.
 - Rebuild with new gjdoc (rh#161147).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Dec 2005 04:59:04 -0000	1.28
+++ sources	9 Feb 2006 18:53:56 -0000	1.29
@@ -1,2 +1,2 @@
-0d78d5f8afe767014a1cc69ee8c20869  eclipse-sourceBuild-srcIncluded-3.1.1.zip
-0c2a9c7c9f8c6cd1e7264dd0be801d66  eclipse-fedora-splash-3.1.1.png
+f2c8066151de14c5ccdf420266ce9f39  eclipse-sourceBuild-srcIncluded-3.1.2.zip
+1ee1e19362e3ee4d3b67a6dea18961de  eclipse-fedora-splash-3.1.2.png



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:01:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:01:45 -0500
Subject: rpms/eclipse/FC-4 eclipse.spec,1.171,1.172
Message-ID: <200602091901.k19J1jfr004289@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
No ia64 for FC4.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- eclipse.spec	9 Feb 2006 18:53:56 -0000	1.171
+++ eclipse.spec	9 Feb 2006 19:01:28 -0000	1.172
@@ -106,9 +106,9 @@
 Patch49:	%{name}-ecj-rpmdebuginfo.patch
 
 %if %{gcj_support}
-ExcludeArch: ppc64 s390 s390x
+ExcludeArch: ia64 ppc64 s390 s390x
 %else
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -1286,7 +1286,6 @@
 
 * Wed Jan 04 2006 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_15fc
 - Use natively-compiled ecj during build.
-- Attempt build on ia64.
 - Change about_files to be i386 and x86_64 only (will patch file upstream).
 
 * Mon Dec 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.11



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:03:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:03:19 -0500
Subject: rpms/xorg-x11-drv-nv/devel nv.xinf, 1.2, 1.3 xorg-x11-drv-nv.spec,
	1.9, 1.10
Message-ID: <200602091903.k19J3JBa004364@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4347

Modified Files:
	nv.xinf xorg-x11-drv-nv.spec 
Log Message:
* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-3
- Added nv-1.0.1.5-updateto-cvs20050209.patch to sync driver with CVS and pick
  up support for newer Nvidia chips, and RandR rotation support.  (#180101)



Index: nv.xinf
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nv.xinf	9 Feb 2006 18:22:55 -0000	1.2
+++ nv.xinf	9 Feb 2006 19:03:15 -0000	1.3
@@ -15,6 +15,7 @@
 alias pcivideo:v000010DEd00000043sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000045sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000046sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000047sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000048sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000049sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000004Dsv*sd*bc*sc*i* nv
@@ -24,6 +25,7 @@
 alias pcivideo:v000010DEd00000092sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000093sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000094sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000095sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000098sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000099sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000009Csv*sd*bc*sc*i* nv
@@ -107,6 +109,15 @@
 alias pcivideo:v000010DEd0000018Csv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000018Dsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000001A0sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001D1sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001D6sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001D7sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001D8sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001DAsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001DBsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001DCsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001DEsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd000001DFsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd000001F0sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000200sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000201sv*sd*bc*sc*i* nv
@@ -116,12 +127,18 @@
 alias pcivideo:v000010DEd00000211sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000212sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000215sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000218sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000021Dsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000021Esv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000220sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000221sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000222sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000228sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000240sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000241sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000242sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000244sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000247sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000250sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000251sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000252sv*sd*bc*sc*i* nv
@@ -136,6 +153,10 @@
 alias pcivideo:v000010DEd00000288sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000289sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000028Csv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000298sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000299sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000029Asv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000029Bsv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000300sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000301sv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd00000302sv*sd*bc*sc*i* nv
@@ -187,6 +208,10 @@
 alias pcivideo:v000010DEd0000034Csv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000034Esv*sd*bc*sc*i* nv
 alias pcivideo:v000010DEd0000034Fsv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000398sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd00000399sv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000039Asv*sd*bc*sc*i* nv
+alias pcivideo:v000010DEd0000039Csv*sd*bc*sc*i* nv
 alias pcivideo:v000012D2d00000018sv*sd*bc*sc*i* nv
 alias pcivideo:v000012D2d00000019sv*sd*bc*sc*i* nv
 alias pcivideo:v000012D2d00000020sv*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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-nv.spec	9 Feb 2006 18:22:55 -0000	1.9
+++ xorg-x11-drv-nv.spec	9 Feb 2006 19:03:16 -0000	1.10
@@ -7,10 +7,11 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.0.1.5
-Release:   2
+Release:   3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
+Patch0:    nv-1.0.1.5-updateto-cvs20050209.patch
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p2 -b .updateto-cvs20050209
 
 %build
 %configure --disable-static
@@ -58,6 +60,10 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-3
+- Added nv-1.0.1.5-updateto-cvs20050209.patch to sync driver with CVS and pick
+  up support for newer Nvidia chips, and RandR rotation support.  (#180101)
+
 * Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.5-2
 - Syncronized nv.xinf with nv_driver.c PCI ID list, including 10DE:0092 and
   10DE:00F2 for bug (#179997).



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:17:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:17:45 -0500
Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.4,1.5
Message-ID: <200602091917.k19JHjKq017340@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17326

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added xkbdata-1.0.1-sysreq-fix-bug175661.patch to fix (#175661)



Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-xkbdata.spec	31 Jan 2006 15:36:32 -0000	1.4
+++ xorg-x11-xkbdata.spec	9 Feb 2006 19:17:43 -0000	1.5
@@ -3,16 +3,19 @@
 Summary: xkb data files for the X.Org X11 X server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
+Patch0: xkbdata-1.0.1-sysreq-fix-bug175661.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
 BuildRequires: xkbcomp
 
 Provides: xkbdata
@@ -22,6 +25,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p0 -b .sysreq-fix-bug175661
 
 %build
 %configure
@@ -35,10 +39,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# FIXME: The file list should be generated by a script, that auto-flags dirs
+# with %dir etc. as a future enhancement.
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_datadir}
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/xkb
 %{_datadir}/X11/xkb/compat.dir
@@ -432,6 +437,9 @@
 %{_datadir}/X11/xkb/types/pc
 
 %changelog
+* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added xkbdata-1.0.1-sysreq-fix-bug175661.patch to fix (#175661)
+
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
 - Updated to xbitmaps 1.0.1 from X11R7.0
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:18:53 -0500
Subject: rpms/xorg-x11-xkbdata/devel
	xkbdata-1.0.1-sysreq-fix-bug175661.patch, NONE, 1.1
Message-ID: <200602091918.k19JIrlH017407@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17393

Added Files:
	xkbdata-1.0.1-sysreq-fix-bug175661.patch 
Log Message:
add xkbdata-1.0.1-sysreq-fix-bug175661.patch

xkbdata-1.0.1-sysreq-fix-bug175661.patch:
 pc |    8 --------
 1 files changed, 8 deletions(-)

--- NEW FILE xkbdata-1.0.1-sysreq-fix-bug175661.patch ---
This patch was ported forward from XFree86-4.3.0-xkb-sysreq.patch in RHEL3,
and other 4.3.0 based Red Hat releases.  There were 5 files patched in the
original patch, but most of it seems to have gotten merged upstream.  This
part is still not upstream however in X11R7.

Fixes bug:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175661


--- symbols/pc/pc.xkb-sysreq	2003-08-22 20:48:08.000000000 -0400
+++ symbols/pc/pc	2003-08-22 20:54:17.000000000 -0400
@@ -101,19 +101,11 @@
 	type= "PC_SYSRQ",
 	symbols[Group1]= [ Print, Sys_Req ]
     };
-    key <SYRQ> {
-	type= "PC_SYSRQ",
-	symbols[Group1]= [ Print, Sys_Req ]
-    };
     key <SCLK> {  [  Scroll_Lock	]	};
     key <PAUS> {
 	type= "PC_BREAK",
 	symbols[Group1]= [ Pause, Break ]
     };
-    key <BRK> {
-	type= "PC_BREAK",
-	symbols[Group1]= [ Pause, Break ]
-    };
     key  <INS> {	[  Insert		]	};
     key <HOME> {	[  Home			]	};
     key <PGUP> {	[  Prior		]	};



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:24:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:24:52 -0500
Subject: rpms/gdm/devel gdm.spec,1.125,1.126
Message-ID: <200602091924.k19JOq5F025925@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25845

Modified Files:
	gdm.spec 
Log Message:
misc fixes



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gdm.spec	9 Feb 2006 18:53:18 -0000	1.125
+++ gdm.spec	9 Feb 2006 19:24:49 -0000	1.126
@@ -175,7 +175,7 @@
 (cd $RPM_BUILD_ROOT%{_datadir}/applications; ln -sf ../desktop-menu-patches/gnome-gdmsetup.desktop .)
 
 # use consolehelper for gdmsetup
-(cd $RPM_BUILD_ROOT/usr/bin; ln -s gdmsetup consolehelper)
+(cd $RPM_BUILD_ROOT/usr/bin; ln -sf consolehelper gdmsetup)
 
 # fix the "login photo" file
 desktop-file-install --vendor gnome --delete-original       \



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:32:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:32:01 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1923,1.1924
Message-ID: <200602091932.k19JW1g4027840@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1923
retrieving revision 1.1924
diff -u -r1.1923 -r1.1924
--- kernel-2.6.spec	9 Feb 2006 16:52:23 -0000	1.1923
+++ kernel-2.6.spec	9 Feb 2006 19:31:40 -0000	1.1924
@@ -1398,6 +1398,7 @@
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git7
 - More airo encryption fixing from Dan Williams.
+- Minor tweaks to the oops-pauser.
 
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:36:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:36:06 -0500
Subject: rpms/poppler/FC-4 .cvsignore, 1.10, 1.11 poppler.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200602091936.k19Ja6eL028292@cvs.devel.redhat.com>

Author: krh

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

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
update to 0.4.5 for CVE-2006-0301


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/poppler/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Jan 2006 23:18:11 -0000	1.10
+++ .cvsignore	9 Feb 2006 19:36:03 -0000	1.11
@@ -1 +1 @@
-poppler-0.4.4.tar.gz
+poppler-0.4.5.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/FC-4/poppler.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- poppler.spec	10 Jan 2006 23:18:11 -0000	1.14
+++ poppler.spec	9 Feb 2006 19:36:03 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: PDF rendering library
 Name: poppler
-Version: 0.4.4
+Version: 0.4.5
 Release: 1.1
 License: GPL
 Group: Development/Libraries
@@ -52,6 +52,9 @@
 %{_includedir}/poppler
 
 %changelog
+* Thu Feb  9 2006 Kristian H??gsberg <krh at redhat.com> 0.4.5-1.1
+- Security release: CVE-2006-0301.
+
 * Tue Jan 10 2006 Kristian H??gsberg <krh at redhat.com> 0.4.4-1.1
 - Update to 0.4.4 release and drop poppler-0.4.3-CVE-2005-3191.patch.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/poppler/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Jan 2006 23:18:11 -0000	1.10
+++ sources	9 Feb 2006 19:36:03 -0000	1.11
@@ -1 +1 @@
-e081bca749a3373b2d95e696b7dddb9b  poppler-0.4.4.tar.gz
+2bb1c75aa3f9c42f0ba48b5492e6d32c  poppler-0.4.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:38:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:38:44 -0500
Subject: rpms/evolution/devel evolution.spec,1.121,1.122
Message-ID: <200602091938.k19JcigQ029311@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	evolution.spec 
Log Message:
* Thu Feb  9 2006 Christopher Aillon <caillon at redhat.com> - 2.5.90-2
- Disable the inline audio plugin for now since it uses gstreamer08



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- evolution.spec	7 Feb 2006 11:36:05 -0000	1.121
+++ evolution.spec	9 Feb 2006 19:38:42 -0000	1.122
@@ -26,6 +26,7 @@
 %define exchange_support 1
 %define nm_support 1
 %define libnotify_support 1
+%define inline_audio_support 0
 
 # Upstream tarballs often contain instances of undeclared functions; these tend
 # to work on i386 but fail on 64-bit architectures.  Leave this on to trap the
@@ -38,7 +39,7 @@
 
 Name: evolution
 Version: 2.5.90
-Release: 1.1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -156,8 +157,10 @@
 BuildRequires: desktop-file-utils
 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
 
+%if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
 BuildRequires: gstreamer08-devel
+%endif
 
 %if %{ldap_support} 
 BuildRequires: openldap-devel >= 2.0.11 
@@ -500,8 +503,10 @@
 %{evo_plugin_dir}/org-gnome-addressbook-file.eplug
 %{evo_plugin_dir}/liborg-gnome-addressbook-file.so
 
+%if %{inline_audio_support}
 %{evo_plugin_dir}/org-gnome-audio-inline.eplug
 %{evo_plugin_dir}/liborg-gnome-audio-inline.so
+%endif
 
 %{evo_plugin_dir}/org-gnome-calendar-file.eplug
 %{evo_plugin_dir}/liborg-gnome-calendar-file.so
@@ -624,6 +629,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Feb  9 2006 Christopher Aillon <caillon at redhat.com> - 2.5.90-2
+- Disable the inline audio plugin for now since it uses gstreamer08
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 19:58:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 14:58:40 -0500
Subject: rpms/rhpl/devel rhpl.spec,1.64,1.65
Message-ID: <200602091958.k19JwefW018172@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18154

Modified Files:
	rhpl.spec 
Log Message:
bump rev to build


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- rhpl.spec	7 Feb 2006 13:44:35 -0000	1.64
+++ rhpl.spec	9 Feb 2006 19:58:38 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
 Version: 0.180
-Release: 1.1
+Release: 1.2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,7 +39,7 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.180-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.180-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Dec 21 2005 Chris Lumens <clumens at redhat.com> 0.180-1



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:04:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:04:55 -0500
Subject: rpms/diskdumputils/devel diskdumputils.spec,1.16,1.17
Message-ID: <200602092004.k19K4tYd018616@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diskdumputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18593

Modified Files:
	diskdumputils.spec 
Log Message:
bump rev to build


Index: diskdumputils.spec
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/diskdumputils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- diskdumputils.spec	7 Feb 2006 11:24:00 -0000	1.16
+++ diskdumputils.spec	9 Feb 2006 20:04:23 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: diskdump utilities
 Name: diskdumputils
 Version: 1.0.1
-Release: 6.3.1
+Release: 6.3.2
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/System
@@ -61,7 +61,7 @@
 /usr/sbin/savecore
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-6.3.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-6.3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:10:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:10:43 -0500
Subject: rpms/openldap/devel openldap.spec,1.51,1.52
Message-ID: <200602092010.k19KAhAV020481@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20425

Modified Files:
	openldap.spec 
Log Message:
Modify the ldap.init script to call runuser correctly.



Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- openldap.spec	7 Feb 2006 13:18:56 -0000	1.51
+++ openldap.spec	9 Feb 2006 20:10:40 -0000	1.52
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: %{version_23}
-Release: 2.1
+Release: 3
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -546,7 +546,7 @@
 # If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it.
 # It was created by the uninstall of the previous version.
 if [ -f /var/lib/ldap/upgrade.ldif ] ; then
-	/sbin/runuser -f -m -s /bin/sh -c "/usr/sbin/slapadd" -- "ldap" < /var/lib/ldap/upgrade.ldif
+	/sbin/runuser -m -s /usr/sbin/slapadd -- "ldap" -l /var/lib/ldap/upgrade.ldif
 	rm /var/lib/ldap/upgrade.ldif
 fi
 exec > /dev/null 2> /dev/null
@@ -576,9 +576,7 @@
 # Save an ldif of the database where the "% post servers" scriptlet can
 # restore it.  Also save the database files to a "rpmorig" directory
 # Just In Case (TM)
-if slapcat -l /dev/null > /dev/null 2>&1 ; then
-	/sbin/service ldap stop > /dev/null 2>&1 || :
-	/usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif
+if /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif > /dev/null 2>&1 ; then
 	rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
 	mkdir /var/lib/ldap/rpmorig
 	mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || :
@@ -684,6 +682,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Feb 9 2006 Jay Fenlason <fenlason at redhat.com> 2.3.19-3
+- Modify the ldap.init script to call runuser correctly.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.19-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:11:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:11:40 -0500
Subject: rpms/mx4j/devel mx4j.spec,1.42,1.43
Message-ID: <200602092011.k19KBet0020973@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20945

Modified Files:
	mx4j.spec 
Log Message:
no more needing of jonathan-rmi


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mx4j.spec	7 Feb 2006 13:07:29 -0000	1.42
+++ mx4j.spec	9 Feb 2006 20:11:37 -0000	1.43
@@ -1,6 +1,6 @@
 %define name        mx4j
 %define version     3.0.1
-%define release     1jpp_7fc
+%define release     1jpp_8fc
 %define section     free
 
 Name:           %{name}
@@ -40,7 +40,6 @@
 BuildRequires:  docbook-style-xsl >= 1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
-BuildRequires:  jonathan-rmi >= 0:3.1-5
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
@@ -183,8 +182,9 @@
 %doc dist/docs/*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_7fc
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_8fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
+- remove dep on jonathan-rmi
 
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.0.1-1jpp_6fc
 - rebuilt again



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:34:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:34:40 -0500
Subject: rpms/kernel/devel/configs config-s390-generic,1.9,1.10
Message-ID: <200602092034.k19KYeDs009410@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-s390-generic 
Log Message:
fix s390 ?



Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-s390-generic	8 Feb 2006 20:07:01 -0000	1.9
+++ config-s390-generic	9 Feb 2006 20:34:29 -0000	1.10
@@ -175,3 +175,5 @@
 
 # Breaks qeth (Feb 8th 2006)
 # CONFIG_DEBUG_SLAB is not set
+
+# CONFIG_BOOT_DELAY is not set



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:34:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:34:40 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1924,1.1925
Message-ID: <200602092034.k19KYeun009393@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix s390 ?



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1924
retrieving revision 1.1925
diff -u -r1.1924 -r1.1925
--- kernel-2.6.spec	9 Feb 2006 19:31:40 -0000	1.1924
+++ kernel-2.6.spec	9 Feb 2006 20:34:27 -0000	1.1925
@@ -155,8 +155,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 Feb  9 20:39:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:39:22 -0500
Subject: rpms/evolution/devel evolution.spec,1.122,1.123
Message-ID: <200602092039.k19KdM1q011029@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	evolution.spec 
Log Message:
clean out the audio plugins


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- evolution.spec	9 Feb 2006 19:38:42 -0000	1.122
+++ evolution.spec	9 Feb 2006 20:39:18 -0000	1.123
@@ -351,6 +351,12 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
 
+# remove additional things we don't want
+%if ! %{inline_audio_support}
+%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \
+           $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so
+%endif
+
 # scrollkeeper gets handled in %post
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:56:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:56:58 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.25,1.26
Message-ID: <200602092056.k19Kuw3b031400@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31368

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
- Build against 3.1.2.


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- eclipse-bugzilla.spec	7 Feb 2006 11:27:22 -0000	1.25
+++ eclipse-bugzilla.spec	9 Feb 2006 20:56:55 -0000	1.26
@@ -22,11 +22,11 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	6.1
+Release:	6.2
 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 >= 3.1.0_fc-2
+Requires: eclipse-platform = 3.1.2
 
 # 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 
@@ -84,7 +84,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -128,6 +128,9 @@
 %endif
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.2
+- Build against 3.1.2.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.1.1_fc-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 20:57:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 15:57:37 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.18, 1.19 pykickstart.spec, 1.18,
	1.19 sources, 1.19, 1.20
Message-ID: <200602092057.k19KvbQY031718@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31674

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	1 Feb 2006 22:03:30 -0000	1.18
+++ .cvsignore	9 Feb 2006 20:57:34 -0000	1.19
@@ -7,3 +7,4 @@
 pykickstart-0.15.tar.gz
 pykickstart-0.16.tar.gz
 pykickstart-0.17.tar.gz
+pykickstart-0.18.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pykickstart.spec	1 Feb 2006 22:03:30 -0000	1.18
+++ pykickstart.spec	9 Feb 2006 20:57:34 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.17
+Version: 0.18
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,11 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 0.18-1
+- Fix some errors pychecker caught.
+- Allow exceptions to not be fatal so ksvalidator can spot more errors in
+  a single pass (#179894).
+
 * Wed Feb 01 2006 Chris Lumens <clumens at redhat.com> 0.17-1
 - Don't set a default port for vnc.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	1 Feb 2006 22:03:30 -0000	1.19
+++ sources	9 Feb 2006 20:57:34 -0000	1.20
@@ -1 +1 @@
-4003f52868ed737bddc1f38bfbada767  pykickstart-0.17.tar.gz
+d48a4e95ee669f01fa8c57cb3c3d9f1c  pykickstart-0.18.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:09:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:09:35 -0500
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.32,1.33
Message-ID: <200602092109.k19L9Z7r000744@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv718

Modified Files:
	eclipse-cdt.spec 
Log Message:
Build against SDK 3.1.2.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eclipse-cdt.spec	7 Feb 2006 11:27:33 -0000	1.32
+++ eclipse-cdt.spec	9 Feb 2006 21:09:29 -0000	1.33
@@ -63,7 +63,7 @@
 %endif
 
 Requires: 	ctags gdb make
-Requires: 	eclipse-platform >= 3.1.1
+Requires: 	eclipse-platform = 3.1.2
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -122,7 +122,7 @@
     -DjavacFailOnError=true \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
     -DdontFetchAnything=true 
 
 if ! [ -e $(pwd)/org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}* ]; then
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_5fc
+- Build against SDK 3.1.2.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:14:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:14:04 -0500
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.14,1.15
Message-ID: <200602092114.k19LE4Zj027886@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27873

Modified Files:
	eclipse-pydev.spec 
Log Message:
Build against SDK 3.1.2.


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- eclipse-pydev.spec	16 Dec 2005 23:24:14 -0000	1.14
+++ eclipse-pydev.spec	9 Feb 2006 21:14:01 -0000	1.15
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-pydev
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	13
+Release:	14
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -90,7 +90,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -104,7 +104,7 @@
   case $file in
     *org.python.pydev*)
       # The ".." is needed since the zip files contain "eclipse/foo".
-      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxf $file)
+      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip $file)
       ;;
   esac
 done
@@ -133,6 +133,9 @@
 %endif
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-14
+- Build against 3.1.2.
+
 * Fri Dec 16 2005 Andrew Overholt <overholt at redhat.com> 0.9.3_fc-13
 - Build against gcc 4.1.
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:18:24 -0500
Subject: rpms/audit/devel audit-1.1.4-semanage.patch, NONE, 1.1 audit.spec,
	1.78, 1.79
Message-ID: <200602092118.k19LIOop008063@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8048

Modified Files:
	audit.spec 
Added Files:
	audit-1.1.4-semanage.patch 
Log Message:
* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-2
- Change audit_log_semanage_message to take new params.


audit-1.1.4-semanage.patch:
 audit_logging.c |   15 +++++++++++----
 libaudit.h      |    5 +++--
 2 files changed, 14 insertions(+), 6 deletions(-)

--- NEW FILE audit-1.1.4-semanage.patch ---
diff -ur audit-1.1.4.orig/lib/audit_logging.c audit-1.1.4/lib/audit_logging.c
--- audit-1.1.4.orig/lib/audit_logging.c	2006-02-09 16:03:31.000000000 -0500
+++ audit-1.1.4/lib/audit_logging.c	2006-02-09 16:08:50.000000000 -0500
@@ -405,8 +405,10 @@
  *        only when user is NULL.
  * new_seuser - the new seuser that the login user is getting
  * new_role - the new_role that the login user is getting
+ * new_range - the new mls range that the login user is getting
  * old_seuser - the old seuser that the login usr had
  * old_role - the old role that the login user had
+ * old_range - the old mls range that the login usr had
  * host - The hostname if known
  * addr - The IP address of the user
  * tty  - The tty of the user
@@ -416,8 +418,9 @@
  */
 int audit_log_semanage_message(int audit_fd, int type, const char *pgname,
 	const char *op, const char *name, unsigned int id, 
-	const char *new_seuser, const char *new_role, const char *old_seuser,
-	const  char *old_role, const char *host, const char *addr,
+	const char *new_seuser, const char *new_role, const char *new_range,
+	const char *old_seuser, const char *old_role, const char *old_range,
+	const char *host, const char *addr,
 	const char *tty, int result)
 {
 	const char *success;
@@ -445,12 +448,14 @@
 
 	if (name)
 		snprintf(buf, sizeof(buf), 
-	     "op=%s acct=%s old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
+	     "op=%s acct=%s old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 			op, name, 
 			old_seuser ? old_seuser : "?",
 			old_role ? old_role : "?",
+			old_range ? old_range : "?",
 			new_seuser ? new_seuser : "?",
 			new_role ? new_role : "?",
+			new_range ? new_range : "?",
 			pgname,
 			host ? host : "?",
 			addrbuf,
@@ -459,12 +464,14 @@
 			);
 	else
 		snprintf(buf, sizeof(buf),
-		"op=%s id=%u old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
+		"op=%s id=%u old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 			op, id,
 			old_seuser ? old_seuser : "?",
 			old_role ? old_role : "?",
+			old_range ? old_range : "?",
 			new_seuser ? new_seuser : "?",
 			new_role ? new_role : "?",
+			new_range ? new_range : "?",
 			pgname,
 			host ? host : "?",
 			addrbuf,
diff -ur audit-1.1.4.orig/lib/libaudit.h audit-1.1.4/lib/libaudit.h
--- audit-1.1.4.orig/lib/libaudit.h	2006-02-09 16:03:31.000000000 -0500
+++ audit-1.1.4/lib/libaudit.h	2006-02-09 16:11:40.000000000 -0500
@@ -384,8 +384,9 @@
 	const char *tty, uid_t uid);
 extern int audit_log_semanage_message(int audit_fd, int type,
 	const char *pgname, const char *op, const char *name, unsigned int id,
-        const char *new_seuser, const char *new_role, const char *old_seuser,
-        const  char *old_role, const char *host, const char *addr,
+        const char *new_seuser, const char *new_role, const char *new_range,
+	const char *old_seuser, const char *old_role, const char *old_range,
+	const char *host, const char *addr,
         const char *tty, int result);
 
 /* Rule-building helper functions */


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- audit.spec	8 Feb 2006 23:08:01 -0000	1.78
+++ audit.spec	9 Feb 2006 21:18:22 -0000	1.79
@@ -1,12 +1,13 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
 Patch1: audit-1.1.3-initscript-disabled.patch
+Patch2: audit-1.1.4-semanage.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig
 BuildRequires: glibc-kernheaders >= 2.4-9.1.95
@@ -56,6 +57,7 @@
 %setup -q
 # When in production, uncomment this so the patch is applied
 #%patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -fv --install
@@ -146,6 +148,9 @@
 
 
 %changelog
+* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-2
+- Change audit_log_semanage_message to take new params.
+
 * Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1
 - Fix bug in autrace where it didn't run on kernels without file watch support
 - Add syslog message to auditd saying what program was started for dispatcher



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:18:33 -0500
Subject: rpms/eclipse-pydev/devel eclipse-pydev.spec,1.15,1.16
Message-ID: <200602092118.k19LIXgw008087@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-pydev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8074

Modified Files:
	eclipse-pydev.spec 
Log Message:
unzip -> tar.


Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- eclipse-pydev.spec	9 Feb 2006 21:14:01 -0000	1.15
+++ eclipse-pydev.spec	9 Feb 2006 21:18:30 -0000	1.16
@@ -104,7 +104,7 @@
   case $file in
     *org.python.pydev*)
       # The ".." is needed since the zip files contain "eclipse/foo".
-      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip $file)
+      (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar xf $file)
       ;;
   esac
 done



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:21:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:21:18 -0500
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.33,1.34
Message-ID: <200602092121.k19LLIJf008216@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8203

Modified Files:
	eclipse-cdt.spec 
Log Message:
>= 3.1.2.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- eclipse-cdt.spec	9 Feb 2006 21:09:29 -0000	1.33
+++ eclipse-cdt.spec	9 Feb 2006 21:21:15 -0000	1.34
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_5fc
+Release: 	1jpp_6fc
 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
@@ -63,7 +63,7 @@
 %endif
 
 Requires: 	ctags gdb make
-Requires: 	eclipse-platform = 3.1.2
+Requires: 	eclipse-platform >= 3.1.2
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -231,6 +231,9 @@
 
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_6fc
+- Make it Require >= 3.1.2.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_5fc
 - Build against SDK 3.1.2.
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:25:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:25:12 -0500
Subject: rpms/mysql/devel my.cnf, 1.2, 1.3 mysql.init, 1.17, 1.18 mysql.spec,
	1.71, 1.72
Message-ID: <200602092125.k19LPCxM008320@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	my.cnf mysql.init mysql.spec 
Log Message:
err-log option has been renamed to log-error, fix my.cnf and initscript


Index: my.cnf
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/my.cnf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- my.cnf	23 Nov 2004 19:03:37 -0000	1.2
+++ my.cnf	9 Feb 2006 21:25:10 -0000	1.3
@@ -10,5 +10,5 @@
 basedir=/var/lib
 
 [mysqld_safe]
-err-log=/var/log/mysqld.log
+log-error=/var/log/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid


Index: mysql.init
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mysql.init	14 Nov 2005 17:31:18 -0000	1.17
+++ mysql.init	9 Feb 2006 21:25:10 -0000	1.18
@@ -47,7 +47,7 @@
 datadir="$result"
 get_mysql_option /etc/my.cnf socket "$datadir/mysql.sock"
 socketfile="$result"
-get_mysql_option /etc/my.cnf err-log "/var/log/mysqld.log"
+get_mysql_option /etc/my.cnf log-error "/var/log/mysqld.log"
 errlogfile="$result"
 get_mysql_option /etc/my.cnf pid-file "/var/run/mysqld/mysqld.pid"
 mypidfile="$result"
@@ -69,8 +69,9 @@
 	chmod 0755 "$datadir"
 	# The reason for explicitly specifying --pid-file is that there may
 	# be no such entry in my.cnf, and the default behavior will be to not
-	# create it at all...
-	/usr/bin/mysqld_safe  --defaults-file=/etc/my.cnf --pid-file="$mypidfile" >/dev/null 2>&1 &
+	# create it at all.  Likewise, we specify --log-error in case there
+	# was not an entry in my.cnf.
+	/usr/bin/mysqld_safe  --defaults-file=/etc/my.cnf --pid-file="$mypidfile" --log-error="$errlogfile" >/dev/null 2>&1 &
 	ret=$?
 	# Spin for a maximum of N seconds waiting for the server to come up.
 	# Rather than assuming we know a valid username, accept an "access


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mysql.spec	7 Feb 2006 13:07:52 -0000	1.71
+++ mysql.spec	9 Feb 2006 21:25:10 -0000	1.72
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.18
-Release: 1.1
+Release: 2
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -380,6 +380,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Thu Feb  9 2006 Tom Lane <tgl at redhat.com> 5.0.18-2
+- err-log option has been renamed to log-error, fix my.cnf and initscript
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0.18-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:28:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:28:05 -0500
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.28,1.29
Message-ID: <200602092128.k19LS5JB008493@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8480

Modified Files:
	eclipse-changelog.spec 
Log Message:
Build against 3.1.2.


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- eclipse-changelog.spec	16 Dec 2005 23:35:03 -0000	1.28
+++ eclipse-changelog.spec	9 Feb 2006 21:28:02 -0000	1.29
@@ -21,11 +21,11 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        23
+Release:        24
 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
+Requires:	eclipse-platform >= 3.1.2
 
 # 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 
@@ -95,7 +95,7 @@
     -DjavacFailOnError=false \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
-    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+    -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.2/scripts \
     -DdontFetchAnything=true 
 popd
 
@@ -122,10 +122,10 @@
 
 %if %{gcj_support}
 %post
-/usr/bin/rebuild-gcj-db
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db
+%{_bindir}/rebuild-gcj-db
 %endif
 
 %files
@@ -137,6 +137,9 @@
 %endif
 
 %changelog
+* Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-24
+- Build against 3.1.2.
+
 * Fri Dec 16 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-23
 - Build against gcc 4.1.
 



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:31:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:31:57 -0500
Subject: rpms/gnome-icon-theme/devel
	gnome-icon-theme-2.13.7-gnome-spinner.patch, NONE,
	1.1 gnome-icon-theme.spec, 1.36, 1.37 sources, 1.24, 1.25
Message-ID: <200602092131.k19LVvEM008594@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8582

Modified Files:
	gnome-icon-theme.spec sources 
Added Files:
	gnome-icon-theme-2.13.7-gnome-spinner.patch 
Log Message:
add back gnome-spinner


gnome-icon-theme-2.13.7-gnome-spinner.patch:
 index.theme.in |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gnome-icon-theme-2.13.7-gnome-spinner.patch ---
--- gnome-icon-theme-2.13.7/index.theme.in.gnome-spinner	2006-02-09 16:26:22.000000000 -0500
+++ gnome-icon-theme-2.13.7/index.theme.in	2006-02-09 16:26:59.000000000 -0500
@@ -1,7 +1,7 @@
 [Icon Theme]
 _Name=GNOME
 _Comment=Default GNOME Theme
-Directories=48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object!
,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic
+Directories=36x36/apps,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/places,24x24/status,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/places,16x16/status,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/emoticons,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/s!
tock/object,16x16/stock/table,16x16/stock/text,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status,scalable/stock/generic
 
 [48x48/actions]
 Size=48
@@ -352,3 +352,8 @@
 Context=Stock
 Type=Scalable
 
+[36x36/apps]
+Size=36
+Context=Applications
+Type=Fixed
+


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-icon-theme.spec	7 Feb 2006 18:52:17 -0000	1.36
+++ gnome-icon-theme.spec	9 Feb 2006 21:31:53 -0000	1.37
@@ -1,9 +1,10 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.13.7
-Release: 2
+Release: 3
 Source0: %{name}-%{version}.tar.bz2
 Source1: external-icons-2.13.7.tar.gz
+Patch0: gnome-icon-theme-2.13.7-gnome-spinner.patch
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gnome-spinner
 
 %build
 %configure --disable-hicolor-check
@@ -31,6 +33,7 @@
 cp -rf 16x16 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
 cp -rf 24x24 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
 cp -rf 32x32 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
+cp -rf 36x36 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
 cp -rf 48x48 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
 cp -rf hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
 
@@ -76,6 +79,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-3
+- Add the spinner back
+
 * Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-2
 - Add back some icons that went missing
 - Fix redhat- symlinks that were broken since FC1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	7 Feb 2006 18:52:17 -0000	1.24
+++ sources	9 Feb 2006 21:31:53 -0000	1.25
@@ -1,2 +1,3 @@
 65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
-8374adf91a28e2f56888672f74d80a52  external-icons-2.13.7.tar.gz
+a5401d6f085979fe6601f2241743af86  gnome-icon-theme-2.12.1.tar.bz2
+bdd237a6f0cda01148f3cdc90366d344  external-icons-2.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:45:35 -0500
Subject: rpms/kernel/devel/configs config-generic, 1.148,
	1.149 config-ia64-generic, 1.19, 1.20 config-powerpc-generic,
	1.14, 1.15 config-powerpc32-generic, 1.10,
	1.11 config-s390-generic, 1.10, 1.11
Message-ID: <200602092145.k19LjZb4010835@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-powerpc32-generic config-s390-generic 
Log Message:
really apply git patches. Doh.



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- config-generic	6 Feb 2006 22:08:25 -0000	1.148
+++ config-generic	9 Feb 2006 21:45:33 -0000	1.149
@@ -1529,6 +1529,7 @@
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-ia64-generic	16 Jan 2006 02:40:19 -0000	1.19
+++ config-ia64-generic	9 Feb 2006 21:45:33 -0000	1.20
@@ -47,6 +47,7 @@
 #
 # IDE chipset support/bugfixes
 #
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_SGIIOC4=m
 
 #


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- config-powerpc-generic	16 Jan 2006 02:40:19 -0000	1.14
+++ config-powerpc-generic	9 Feb 2006 21:45:33 -0000	1.15
@@ -40,6 +40,7 @@
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM112=m
 CONFIG_I2C_POWERMAC=y
 CONFIG_APPLE_AIRPORT=m
 CONFIG_SERIAL_PMACZILOG=m


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-powerpc32-generic	14 Jan 2006 00:18:21 -0000	1.10
+++ config-powerpc32-generic	9 Feb 2006 21:45:33 -0000	1.11
@@ -63,8 +63,5 @@
 
 # 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-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config-s390-generic	9 Feb 2006 20:34:29 -0000	1.10
+++ config-s390-generic	9 Feb 2006 21:45:33 -0000	1.11
@@ -27,6 +27,7 @@
 CONFIG_CMM=y
 # CONFIG_CMM_PROC is not set
 CONFIG_VIRT_TIMER=y
+CONFIG_DASD_EER=m
 CONFIG_DASD_CMB=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=m



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:45:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:45:36 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1925,
	1.1926 linux-2.6-compile-fixes.patch, 1.48,
	1.49 linux-2.6-debug-oops-pause.patch, 1.9,
	1.10 linux-2.6-netdump.patch, 1.3, 1.4 linux-2.6-tux.patch,
	1.10, 1.11 linux-2.6-debunk-i2c.patch, 1.1,
	NONE linux-2.6-fs-namei-deadlock.patch, 1.1,
	NONE linux-2.6-net-suppress-msgs.patch, 1.1,
	NONE linux-2.6-percpu-NR_CPUS.patch, 1.1,
	NONE linux-2.6-snd-powermac.patch, 1.1,
	NONE linux-2.6-stradis-oops.patch, 1.1, NONE
Message-ID: <200602092145.k19Ljaqp010794@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-oops-pause.patch linux-2.6-netdump.patch 
	linux-2.6-tux.patch 
Removed Files:
	linux-2.6-debunk-i2c.patch linux-2.6-fs-namei-deadlock.patch 
	linux-2.6-net-suppress-msgs.patch 
	linux-2.6-percpu-NR_CPUS.patch linux-2.6-snd-powermac.patch 
	linux-2.6-stradis-oops.patch 
Log Message:
really apply git patches. Doh.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1925
retrieving revision 1.1926
diff -u -r1.1925 -r1.1926
--- kernel-2.6.spec	9 Feb 2006 20:34:27 -0000	1.1925
+++ kernel-2.6.spec	9 Feb 2006 21:45:32 -0000	1.1926
@@ -222,12 +222,9 @@
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch207: linux-2.6-x86_64-generic-sigsuspend.patch
-Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6.15-cell-numa-init.patch
-Patch302: linux-2.6-debunk-i2c.patch
-Patch303: linux-2.6-snd-powermac.patch
 #Patch304: linux-2.6.15-mv643xx-fixes.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
@@ -357,10 +354,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-percpu-NR_CPUS.patch
-Patch1870: linux-2.6-net-suppress-msgs.patch
-Patch1880: linux-2.6-fs-namei-deadlock.patch
-Patch1890: linux-2.6-stradis-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -594,9 +587,9 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 # Backout broken DRM changes.
-%patch3 -p1 -R
+#%patch3 -p1 -R
 %patch4 -p1
 
 #
@@ -635,18 +628,12 @@
 %patch206 -p1
 # Generic sys_rt_sigsuspend()
 %patch207 -p1
-# Add ppoll/pselect syscalls
-%patch208 -p1
 
 # 
 # ppc64
 #
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
-# Revert I2C Bunkage.
-%patch302 -p1
-# Fix I2C handling in snd_powermac
-%patch303 -p1
 # Fix the MV643xx Gigabit Ethernet driver
 #%patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -856,14 +843,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Fix percpu data accesses
-%patch1860 -p1
-# Suppress some network layer msgs
-%patch1870 -p1
-# Fix deadlock in do_path_lookup()
-%patch1880 -p1
-# Fix oops in stradis on init
-%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -900,7 +879,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:
 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- linux-2.6-compile-fixes.patch	3 Feb 2006 18:51:30 -0000	1.48
+++ linux-2.6-compile-fixes.patch	9 Feb 2006 21:45:32 -0000	1.49
@@ -1,71 +1,2 @@
---- linux-2.6.15/include/asm-generic/signal.h.orig	2006-01-06 16:05:09.000000000 +0000
-+++ linux-2.6.15/include/asm-generic/signal.h	2006-01-06 16:05:19.000000000 +0000
-@@ -9,6 +9,7 @@
- #endif
- 
- #ifndef __ASSEMBLY__
-+#include <linux/compiler.h>
- typedef void __signalfn_t(int);
- typedef __signalfn_t __user *__sighandler_t;
- 
---- linux-2.6.15/drivers/net/spider_net.c.orig	2006-01-06 16:38:43.000000000 +0000
-+++ linux-2.6.15/drivers/net/spider_net.c	2006-01-06 16:39:10.000000000 +0000
-@@ -48,6 +48,7 @@
- #include <asm/bitops.h>
- #include <asm/pci-bridge.h>
- #include <net/checksum.h>
-+#include <net/ip.h>
- 
- #include "spider_net.h"
- 
-Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
-is enabled.
 
-Signed-off-by: Jes Sorensen <jes at sgi.com>
-----
 
- arch/ia64/Kconfig |    3 +++
- drivers/Makefile  |    2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: linux-2.6/arch/ia64/Kconfig
-===================================================================
---- linux-2.6.orig/arch/ia64/Kconfig
-+++ linux-2.6/arch/ia64/Kconfig
-@@ -374,6 +374,9 @@
- 	  To use this option, you have to ensure that the "/proc file system
- 	  support" (CONFIG_PROC_FS) is enabled, too.
- 
-+config SGI_SN
-+	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
-+
- source "drivers/firmware/Kconfig"
- 
- source "fs/Kconfig.binfmt"
-Index: linux-2.6/drivers/Makefile
-===================================================================
---- linux-2.6.orig/drivers/Makefile
-+++ linux-2.6/drivers/Makefile
-@@ -69,7 +69,7 @@
- obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
- obj-$(CONFIG_MMC)		+= mmc/
- obj-$(CONFIG_INFINIBAND)	+= infiniband/
--obj-$(CONFIG_SGI_IOC4)		+= sn/
-+obj-$(CONFIG_SGI_SN)		+= sn/
- obj-y				+= firmware/
- obj-$(CONFIG_CRYPTO)		+= crypto/
- obj-$(CONFIG_SUPERH)		+= sh/
-
---- linux-2.6.15.noarch/include/linux/suspend.h~	2006-02-02 16:27:38.000000000 -0500
-+++ linux-2.6.15.noarch/include/linux/suspend.h	2006-02-02 16:28:07.000000000 -0500
-@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone 
- #ifdef CONFIG_PM
- /* kernel/power/swsusp.c */
- extern int software_suspend(void);
--
--extern int pm_prepare_console(void);
--extern void pm_restore_console(void);
--
- #else
- static inline int software_suspend(void)
- {

linux-2.6-debug-oops-pause.patch:
 traps.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-debug-oops-pause.patch	9 Feb 2006 18:52:49 -0000	1.9
+++ linux-2.6-debug-oops-pause.patch	9 Feb 2006 21:45:32 -0000	1.10
@@ -36,10 +36,10 @@
  static void show_trace_log_lvl(struct task_struct *task,
  			       unsigned long *stack, char *log_lvl)
  {
-@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
- 		if (!stack)
+@@ -190,6 +190,7 @@ static void show_trace_log_lvl(struct ta
  			break;
- 		printk(KERN_EMERG " =======================\n");
+ 		printk(log_lvl);
+ 		printk(" =======================\n");
 +		//pause_for_two_minutes();
  	}
  }

linux-2.6-netdump.patch:
 linux-2.6.12/drivers/net/netdump.c         |  550 +++++++++++++++++++++++++++++
 linux-2.6.12/drivers/net/netdump.h         |   90 ++++
 linux-2.6.12/include/asm-generic/netdump.h |   48 ++
 linux-2.6.12/include/asm-i386/netdump.h    |   79 ++++
 linux-2.6.12/include/asm-ia64/netdump.h    |   82 ++++
 linux-2.6.12/include/asm-powerpc/netdump.h |   79 ++++
 linux-2.6.12/include/asm-s390/netdump.h    |    6 
 linux-2.6.12/include/asm-x86_64/netdump.h  |   79 ++++
 linux-2.6.12/include/linux/netdevice.h     |    8 
 linux-2.6.12/include/linux/netpoll.h       |    4 
 linux-2.6.12/net/core/netpoll.c            |   17 
 linux-2.6.14/drivers/net/Makefile          |    1 
 linux-2.6.15.noarch/drivers/net/Kconfig    |    7 
 13 files changed, 1039 insertions(+), 11 deletions(-)

Index: linux-2.6-netdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-netdump.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-netdump.patch	27 Nov 2005 04:25:24 -0000	1.3
+++ linux-2.6-netdump.patch	9 Feb 2006 21:45:32 -0000	1.4
@@ -644,22 +644,22 @@
 +
 +module_init(init_netdump);
 +module_exit(cleanup_netdump);
---- linux-2.6.12/drivers/net/Kconfig.netdump.orig	2005-08-19 17:45:43.052483533 -0400
-+++ linux-2.6.12/drivers/net/Kconfig	2005-08-19 17:48:14.835252548 -0400
-@@ -2545,6 +2545,13 @@ config NETCONSOLE
+--- linux-2.6.15.noarch/drivers/net/Kconfig~	2006-02-09 16:15:49.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/Kconfig	2006-02-09 16:16:28.000000000 -0500
+@@ -2715,6 +2715,13 @@ config NETCONSOLE
  	If you want to log kernel messages over the network, enable this.
  	See <file:Documentation/networking/netconsole.txt> for details.
  
-+ config NETDUMP
++config NETDUMP
 +	tristate "Network kernel crash dump support"
 +	depends on NETPOLL && NETPOLL_TRAP && (X86 || PPC_PSERIES || IA64)
 +	---help---
 +	Enable this option if you have a netdump server and you would like
 +	to collect kernel crash dumps.
 +
- endif #NETDEVICES
- 
  config NETPOLL
+ 	def_bool NETCONSOLE
+ 
 --- linux-2.6.14/drivers/net/Makefile~	2005-10-30 21:44:17.000000000 -0500
 +++ linux-2.6.14/drivers/net/Makefile	2005-10-30 21:44:33.000000000 -0500
 @@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/

linux-2.6-tux.patch:
 arch/alpha/kernel/systbls.S      |    8 
 arch/i386/kernel/syscall_table.S |   10 
 arch/ia64/kernel/entry.S         |    8 
 arch/ia64/kernel/ia64_ksyms.c    |    5 
 arch/x86_64/ia32/ia32entry.S     |   10 
 fs/dcache.c                      |   36 
 fs/exec.c                        |    2 
 fs/fcntl.c                       |    4 
 fs/namei.c                       |   18 
 fs/namespace.c                   |    2 
 fs/open.c                        |    4 
 fs/pipe.c                        |    2 
 fs/read_write.c                  |    2 
 include/asm-alpha/fcntl.h        |    1 
 include/asm-generic/fcntl.h      |    4 
 include/asm-i386/unistd.h        |    5 
 include/asm-ia64/unistd.h        |    2 
 include/asm-sparc/fcntl.h        |    1 
 include/asm-sparc64/fcntl.h      |    1 
 include/asm-x86_64/unistd.h      |   10 
 include/linux/buffer_head.h      |    1 
 include/linux/dcache.h           |    8 
 include/linux/errno.h            |    3 
 include/linux/file.h             |    2 
 include/linux/fs.h               |    7 
 include/linux/kmod.h             |    2 
 include/linux/namei.h            |    2 
 include/linux/net.h              |    1 
 include/linux/sched.h            |    5 
 include/linux/skbuff.h           |    2 
 include/linux/socket.h           |    5 
 include/linux/sysctl.h           |   50 
 include/net/sock.h               |    8 
 include/net/tcp.h                |    3 
 include/net/tux.h                |  804 ++++++++++++++
 include/net/tux_u.h              |  163 ++
 kernel/exit.c                    |    7 
 kernel/fork.c                    |    1 
 kernel/kmod.c                    |   28 
 kernel/signal.c                  |    1 
 mm/filemap.c                     |   19 
 mm/truncate.c                    |    2 
 net/Kconfig                      |    1 
 net/Makefile                     |    1 
 net/core/sock.c                  |    5 
 net/ipv4/tcp.c                   |    3 
 net/ipv4/tcp_input.c             |    1 
 net/ipv4/tcp_output.c            |    3 
 net/socket.c                     |  197 ++-
 net/tux/Kconfig                  |   25 
 net/tux/Makefile                 |   12 
 net/tux/abuf.c                   |  190 +++
 net/tux/accept.c                 |  863 +++++++++++++++
 net/tux/cachemiss.c              |  265 ++++
 net/tux/cgi.c                    |  171 +++
 net/tux/directory.c              |  302 +++++
 net/tux/extcgi.c                 |  329 +++++
 net/tux/gzip.c                   |   40 
 net/tux/input.c                  |  641 +++++++++++
 net/tux/logger.c                 |  837 ++++++++++++++
 net/tux/main.c                   | 1417 +++++++++++++++++++++++++
 net/tux/mod.c                    |  262 ++++
 net/tux/output.c                 |  352 ++++++
 net/tux/parser.h                 |  102 +
 net/tux/postpone.c               |   77 +
 net/tux/proc.c                   | 1149 ++++++++++++++++++++
 net/tux/proto_ftp.c              | 1555 +++++++++++++++++++++++++++
 net/tux/proto_http.c             | 2197 +++++++++++++++++++++++++++++++++++++++
 net/tux/redirect.c               |  172 +++
 net/tux/times.c                  |  392 ++++++
 net/tux/times.h                  |   26 
 net/tux/userspace.c              |   27 
 72 files changed, 12775 insertions(+), 98 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-tux.patch	11 Jan 2006 00:39:36 -0000	1.10
+++ linux-2.6-tux.patch	9 Feb 2006 21:45:32 -0000	1.11
@@ -470,14 +470,14 @@
 ===================================================================
 --- linux.orig/include/linux/dcache.h
 +++ linux/include/linux/dcache.h
-@@ -108,6 +108,7 @@ struct dentry {
+@@ -107,6 +107,7 @@ struct dentry {
  	struct dentry_operations *d_op;
  	struct super_block *d_sb;	/* The root of the dentry tree */
  	void *d_fsdata;			/* fs-specific data */
 +	void *d_extra_attributes;	/* TUX-specific data */
+ #ifdef CONFIG_PROFILING
  	struct dcookie_struct *d_cookie; /* cookie, if any */
- 	int d_mounted;
- 	unsigned char d_iname[DNAME_INLINE_LEN_MIN];	/* small names */
+ #endif
 @@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe
  extern void shrink_dcache_parent(struct dentry *);
  extern void shrink_dcache_anon(struct hlist_head *);


--- linux-2.6-debunk-i2c.patch DELETED ---


--- linux-2.6-fs-namei-deadlock.patch DELETED ---


--- linux-2.6-net-suppress-msgs.patch DELETED ---


--- linux-2.6-percpu-NR_CPUS.patch DELETED ---


--- linux-2.6-snd-powermac.patch DELETED ---


--- linux-2.6-stradis-oops.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb  9 21:49:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 16:49:47 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.214, 1.215 anaconda.spec, 1.333,
	1.334 sources, 1.333, 1.334
Message-ID: <200602092149.k19LnlYC021567@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21544/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.18-1 on branch devel from anaconda-10.91.18-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- .cvsignore	9 Feb 2006 00:54:45 -0000	1.214
+++ .cvsignore	9 Feb 2006 21:49:45 -0000	1.215
@@ -1 +1 @@
-anaconda-10.91.17.tar.bz2
+anaconda-10.91.18.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- anaconda.spec	9 Feb 2006 00:54:45 -0000	1.333
+++ anaconda.spec	9 Feb 2006 21:49:45 -0000	1.334
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.17
+Version: 10.91.18
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,13 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 10.91.18-1
+- Add iscsi support (Patrick Mansfield <patmans AT us.ibm.com>)
+- Allow retry if CD image isn't found on NFS server (#109051, dcantrel)
+- Fix location of video modes data files
+- Add x86_64 kernel-xen-guest (katzj)
+- Better loader debugging support (katzj)
+
 * Wed Feb 08 2006 Paul Nasrat <pnasrat at redhat.com> - 10.91.17-1
 - Handle bind mounts correctly (#160911, dcantrel)
 - Upgrade package black list and make upgrades work


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- sources	9 Feb 2006 00:54:45 -0000	1.333
+++ sources	9 Feb 2006 21:49:45 -0000	1.334
@@ -1 +1 @@
-9afeea6c3c1e9261d67d428adc327a36  anaconda-10.91.17.tar.bz2
+fcd79cb916a21770b4711037d49e0ce0  anaconda-10.91.18.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  9 22:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 17:05:48 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.215, 1.216 anaconda.spec, 1.334,
	1.335 sources, 1.334, 1.335
Message-ID: <200602092205.k19M5mqD032024@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31997/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.91.19-1 on branch devel from anaconda-10.91.19-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- .cvsignore	9 Feb 2006 21:49:45 -0000	1.215
+++ .cvsignore	9 Feb 2006 22:05:35 -0000	1.216
@@ -1 +1 @@
-anaconda-10.91.18.tar.bz2
+anaconda-10.91.19.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- anaconda.spec	9 Feb 2006 21:49:45 -0000	1.334
+++ anaconda.spec	9 Feb 2006 22:05:35 -0000	1.335
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.91.18
+Version: 10.91.19
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 10.91.19-1
+- Fix loader typo.
+
 * Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 10.91.18-1
 - Add iscsi support (Patrick Mansfield <patmans AT us.ibm.com>)
 - Allow retry if CD image isn't found on NFS server (#109051, dcantrel)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- sources	9 Feb 2006 21:49:45 -0000	1.334
+++ sources	9 Feb 2006 22:05:35 -0000	1.335
@@ -1 +1 @@
-fcd79cb916a21770b4711037d49e0ce0  anaconda-10.91.18.tar.bz2
+f674c920a5f9938573956fcaf27336d8  anaconda-10.91.19.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb  9 22:21:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 17:21:13 -0500
Subject: rpms/audit/devel audit-1.1.4-semanage.patch, 1.1, 1.2 audit.spec,
	1.79, 1.80
Message-ID: <200602092221.k19MLD7U016664@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16637

Modified Files:
	audit-1.1.4-semanage.patch audit.spec 
Log Message:
* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
- Change audit_log_semanage_message to take new params.


audit-1.1.4-semanage.patch:
 audit_logging.c |   31 +++++++++++++++++++------------
 libaudit.h      |    5 +++--
 2 files changed, 22 insertions(+), 14 deletions(-)

Index: audit-1.1.4-semanage.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-1.1.4-semanage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audit-1.1.4-semanage.patch	9 Feb 2006 21:18:22 -0000	1.1
+++ audit-1.1.4-semanage.patch	9 Feb 2006 22:21:09 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur audit-1.1.4.orig/lib/audit_logging.c audit-1.1.4/lib/audit_logging.c
 --- audit-1.1.4.orig/lib/audit_logging.c	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/audit_logging.c	2006-02-09 16:08:50.000000000 -0500
++++ audit-1.1.4/lib/audit_logging.c	2006-02-09 17:14:53.000000000 -0500
 @@ -405,8 +405,10 @@
   *        only when user is NULL.
   * new_seuser - the new seuser that the login user is getting
@@ -31,12 +31,16 @@
 -	     "op=%s acct=%s old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 +	     "op=%s acct=%s old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
  			op, name, 
- 			old_seuser ? old_seuser : "?",
- 			old_role ? old_role : "?",
-+			old_range ? old_range : "?",
- 			new_seuser ? new_seuser : "?",
- 			new_role ? new_role : "?",
-+			new_range ? new_range : "?",
+-			old_seuser ? old_seuser : "?",
+-			old_role ? old_role : "?",
+-			new_seuser ? new_seuser : "?",
+-			new_role ? new_role : "?",
++			old_seuser && strlen(old_seuser) ? old_seuser : "?",
++			old_role && strlen(old_role) ? old_role : "?",
++			old_range && strlen(old_range) ? old_range : "?",
++			new_seuser && strlen(new_seuser) ? new_seuser : "?",
++			new_role && strlen(new_role) ? new_role : "?",
++			new_range && strlen(new_range) ? new_range : "?",
  			pgname,
  			host ? host : "?",
  			addrbuf,
@@ -47,18 +51,22 @@
 -		"op=%s id=%u old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 +		"op=%s id=%u old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
  			op, id,
- 			old_seuser ? old_seuser : "?",
- 			old_role ? old_role : "?",
-+			old_range ? old_range : "?",
- 			new_seuser ? new_seuser : "?",
- 			new_role ? new_role : "?",
-+			new_range ? new_range : "?",
+-			old_seuser ? old_seuser : "?",
+-			old_role ? old_role : "?",
+-			new_seuser ? new_seuser : "?",
+-			new_role ? new_role : "?",
++			old_seuser && strlen(old_seuser) ? old_seuser : "?",
++			old_role && strlen(old_role) ? old_role : "?",
++			old_range && strlen(old_range) ? old_range : "?",
++			new_seuser && strlen(new_seuser) ? new_seuser : "?",
++			new_role && strlen(new_role) ? new_role : "?",
++			new_range && strlen(new_range) ? new_range : "?",
  			pgname,
  			host ? host : "?",
  			addrbuf,
 diff -ur audit-1.1.4.orig/lib/libaudit.h audit-1.1.4/lib/libaudit.h
 --- audit-1.1.4.orig/lib/libaudit.h	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/libaudit.h	2006-02-09 16:11:40.000000000 -0500
++++ audit-1.1.4/lib/libaudit.h	2006-02-09 16:14:51.000000000 -0500
 @@ -384,8 +384,9 @@
  	const char *tty, uid_t uid);
  extern int audit_log_semanage_message(int audit_fd, int type,


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- audit.spec	9 Feb 2006 21:18:22 -0000	1.79
+++ audit.spec	9 Feb 2006 22:21:09 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -148,7 +148,7 @@
 
 
 %changelog
-* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-2
+* Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
 - Change audit_log_semanage_message to take new params.
 
 * Wed Feb 8 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-1



From fedora-cvs-commits at redhat.com  Thu Feb  9 22:33:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 17:33:14 -0500
Subject: rpms/gnome-applet-vm/devel gnome-applet-vm.spec,1.4,1.5
Message-ID: <200602092233.k19MXEin020669@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20551

Modified Files:
	gnome-applet-vm.spec 
Log Message:
Fixed dependancies to libvirt following the library name change, Daniel



Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-applet-vm.spec	7 Feb 2006 11:50:53 -0000	1.4
+++ gnome-applet-vm.spec	9 Feb 2006 22:33:01 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
 Version: 0.0.5
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-applet-vm-%{version}.tar.gz
@@ -16,7 +16,7 @@
 %define gnome_panel_version 2.5.91
 %define libbonoboui_version 2.3.0
 
-BuildRequires:  libvir
+BuildRequires:  libvirt-devel
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -27,6 +27,7 @@
 
 Prereq:         gtk2 >= %{gtk2_version}
 Requires:	xen
+Requires:	libvirt
 Requires:	gnome-panel >= %{gnome_panel_version}
 
 %description
@@ -83,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Feb  9 2006 Daniel Veillard <veillard at redhat.com> - 0.0.5-1.2
+- rebuilt to update depends on libvirt following library rename
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 00:30:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 19:30:44 -0500
Subject: rpms/kernel/devel linux-2.6-disable-broken-radeon-drm.patch, NONE,
	1.1 kernel-2.6.spec, 1.1926, 1.1927 drm.patch, 1.2, NONE
Message-ID: <200602100030.k1A0Uisu000912@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-disable-broken-radeon-drm.patch 
Removed Files:
	drm.patch 
Log Message:
disable broken drm


linux-2.6-disable-broken-radeon-drm.patch:
 drm_pciids.h |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE linux-2.6-disable-broken-radeon-drm.patch ---
--- linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h~	2006-02-09 19:26:06.000000000 -0500
+++ linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h	2006-02-09 19:26:56.000000000 -0500
@@ -85,7 +85,6 @@
 	{0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
 	{0x1002, 0x596A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
 	{0x1002, 0x596B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-	{0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
 	{0x1002, 0x5c61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \
 	{0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
 	{0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -r1.1926 -r1.1927
--- kernel-2.6.spec	9 Feb 2006 21:45:32 -0000	1.1926
+++ kernel-2.6.spec	10 Feb 2006 00:30:30 -0000	1.1927
@@ -206,8 +206,7 @@
 #
 Patch1: patch-2.6.16-rc2.bz2
 Patch2: patch-2.6.16-rc2-git7.bz2
-Patch3: drm.patch
-Patch4: linux-2.6-cpufreq-git.patch
+Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -354,6 +353,7 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
+Patch1860: linux-2.6-disable-broken-radeon-drm.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -588,9 +588,7 @@
 # Update to latest upstream.
 %patch1 -p1
 %patch2 -p1
-# Backout broken DRM changes.
-#%patch3 -p1 -R
-%patch4 -p1
+%patch3 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -843,6 +841,8 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
+# Disable broken radeon DRM for now
+%patch1860 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1377,6 +1377,7 @@
 - 2.6.16rc2-git7
 - More airo encryption fixing from Dan Williams.
 - Minor tweaks to the oops-pauser.
+- Disable DRM for certain Radeons that don't work right now.
 
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6


--- drm.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 00:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 19:40:18 -0500
Subject: rpms/device-mapper-multipath/devel .cvsignore, 1.6,
	1.7 device-mapper-multipath.spec, 1.19, 1.20 sources, 1.7, 1.8
Message-ID: <200602100040.k1A0eIKW003441@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3313

Modified Files:
	.cvsignore device-mapper-multipath.spec sources 
Log Message:
updated to latest upstream source



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Dec 2005 03:27:44 -0000	1.6
+++ .cvsignore	10 Feb 2006 00:40:15 -0000	1.7
@@ -1,2 +1,3 @@
 multipath-tools-0.4.4.2.tar.bz2
 multipath-tools-0.4.5.52.tgz
+multipath-tools-0.4.5.56.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- device-mapper-multipath.spec	7 Feb 2006 11:22:54 -0000	1.19
+++ device-mapper-multipath.spec	10 Feb 2006 00:40:15 -0000	1.20
@@ -1,11 +1,11 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 9.1.1
+Release: 12.0
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-0.4.5.52.tgz
+Source0: multipath-tools-0.4.5.56.tgz
 Patch0: fedora.patch
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -19,7 +19,7 @@
 * multipathd :  Detects when paths fail and execs multipath to update things.
 
 %prep
-%setup -q -n multipath-tools-0.4.5.52
+%setup -q -n multipath-tools-0.4.5.56
 
 %patch0 -p1
 
@@ -62,6 +62,9 @@
 /var/cache/multipath
 
 %changelog
+* Tue Feb 07 2006 Benjamin Marzinski <bmarzins at redhat.com> -0.4.5-12.0
+- Updated to latest upstream source (t0_4_5_post56)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4.5-9.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Dec 2005 03:27:44 -0000	1.7
+++ sources	10 Feb 2006 00:40:15 -0000	1.8
@@ -1 +1 @@
-46802f5188cdb4221a27e2f6225889d2  multipath-tools-0.4.5.52.tgz
+f724ea004e6a7d37e6e523d43f7c556f  multipath-tools-0.4.5.56.tgz



From fedora-cvs-commits at redhat.com  Fri Feb 10 00:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 19:50:37 -0500
Subject: rpms/system-config-netboot/devel .cvsignore, 1.25, 1.26 sources,
	1.27, 1.28 system-config-netboot.spec, 1.40, 1.41
Message-ID: <200602100050.k1A0obIb020495@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore sources system-config-netboot.spec 
Log Message:
- fix problem reported by f1 at micromemory.com: 
  detect and deal with missing libraries in the client root correctly
- fix bug 178392: disklessrc's "^$MODULE" should be "^$MODULE "
- ship updated .po files



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	22 Dec 2005 00:34:19 -0000	1.25
+++ .cvsignore	10 Feb 2006 00:50:34 -0000	1.26
@@ -11,3 +11,4 @@
 system-config-netboot-0.1.33.tar.gz
 system-config-netboot-0.1.34.tar.gz
 system-config-netboot-0.1.36.tar.gz
+system-config-netboot-0.1.37.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	22 Dec 2005 00:34:19 -0000	1.27
+++ sources	10 Feb 2006 00:50:34 -0000	1.28
@@ -1 +1 @@
-bf26f2345a02359ae1e61da754f2c0a7  system-config-netboot-0.1.36.tar.gz
+8e8d2d4108dd88e8308921d84bc73441  system-config-netboot-0.1.37.tar.gz


Index: system-config-netboot.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- system-config-netboot.spec	22 Dec 2005 00:34:19 -0000	1.40
+++ system-config-netboot.spec	10 Feb 2006 00:50:34 -0000	1.41
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: system-config-netboot is an network booting/install configuration utility
 Name: system-config-netboot
-Version: 0.1.36
+Version: 0.1.37
 Release: 1
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -73,6 +73,12 @@
 %config %{_sysconfdir}/security/console.apps/system-config-netboot
 
 %changelog
+* Thu Feb 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.1.37-1
+- fix problem reported by f1 at micromemory.com: 
+  detect and deal with missing libraries in the client root correctly
+- fix bug 178392: disklessrc's "^$MODULE" should be "^$MODULE "
+- ship updated .po files
+
 * Wed Dec 21 2005 Jason Vas Dias <jvdias at redhat.com> - 0.1.36-1
 - fix bug 170634: don't use pam_stack in pam configuration file
 - fix bug 171820: add desktop.in file to POTFILES.in



From fedora-cvs-commits at redhat.com  Fri Feb 10 01:30:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 20:30:14 -0500
Subject: rpms/kernel/devel linux-2.6-sound-emu10k1-ac97.patch, 1.2,
	NONE linux-2.6-x86_64-add-ppoll-pselect.patch, 1.1,
	NONE linux-2.6.15-mv643xx-fixes.patch, 1.1, NONE
Message-ID: <200602100130.k1A1UE7W014933@cvs.devel.redhat.com>

Author: davej

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

Removed Files:
	linux-2.6-sound-emu10k1-ac97.patch 
	linux-2.6-x86_64-add-ppoll-pselect.patch 
	linux-2.6.15-mv643xx-fixes.patch 
Log Message:
remove old patches



--- linux-2.6-sound-emu10k1-ac97.patch DELETED ---


--- linux-2.6-x86_64-add-ppoll-pselect.patch DELETED ---


--- linux-2.6.15-mv643xx-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 02:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 21:02:49 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1596,1.1597
Message-ID: <200602100202.k1A22nFX030931@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
SMP only in the SMP kernel.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1596
retrieving revision 1.1597
diff -u -r1.1596 -r1.1597
--- kernel-2.6.spec	9 Feb 2006 10:58:04 -0000	1.1596
+++ kernel-2.6.spec	10 Feb 2006 02:02:39 -0000	1.1597
@@ -1281,6 +1281,9 @@
 %endif
 
 %changelog
+* Thu Feb  9 2006 Dave Jones <davej at redhat.com>
+- Disable SMP in x86-64 UP kernels. (Whoops).
+
 * Thu Feb  9 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix PPC64 FP exception setup
 - Fix brain damage in usb_find_interface (#176333)



From fedora-cvs-commits at redhat.com  Fri Feb 10 02:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 21:02:49 -0500
Subject: rpms/kernel/FC-4/configs config-x86_64-generic, 1.16,
	1.17 config-x86_64-smp, 1.1, 1.2
Message-ID: <200602100202.k1A22nYM030939@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv30911/configs

Modified Files:
	config-x86_64-generic config-x86_64-smp 
Log Message:
SMP only in the SMP kernel.




Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config-x86_64-generic	6 Jan 2006 23:35:07 -0000	1.16
+++ config-x86_64-generic	10 Feb 2006 02:02:47 -0000	1.17
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+# CONFIG_SMP is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y


Index: config-x86_64-smp
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-smp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-x86_64-smp	6 Feb 2005 05:49:11 -0000	1.1
+++ config-x86_64-smp	10 Feb 2006 02:02:47 -0000	1.2
@@ -0,0 +1 @@
+CONFIG_SMP=y



From fedora-cvs-commits at redhat.com  Fri Feb 10 02:44:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 21:44:11 -0500
Subject: rpms/m17n-db/devel .cvsignore, 1.3, 1.4 m17n-db.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200602100244.k1A2iB7t011393@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
- update to 1.3.2 bugfix release
- do not include ja-anthy.mim input map



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Feb 2006 06:03:25 -0000	1.3
+++ .cvsignore	10 Feb 2006 02:44:08 -0000	1.4
@@ -1 +1 @@
-m17n-db-1.3.1.tar.gz
+m17n-db-1.3.2.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- m17n-db.spec	2 Feb 2006 06:06:26 -0000	1.4
+++ m17n-db.spec	10 Feb 2006 02:44:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
-Version:	1.3.1
+Version:	1.3.2
 Release:	1%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
@@ -350,8 +350,9 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-# don't need ispell
+# don't need ispell or anthy
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png}
 
 # drop pkgconfig file for now
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc
@@ -654,6 +655,10 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-1
+- update to 1.3.2 bugfix release
+- do not include ja-anthy.mim input map
+
 * Thu Feb  2 2006 Jens Petersen <petersen at redhat.com> - 1.3.1-1
 - update to 1.3.1 release
   - add new icons to language subpackages


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Feb 2006 06:03:25 -0000	1.3
+++ sources	10 Feb 2006 02:44:08 -0000	1.4
@@ -1 +1 @@
-5f17f94b3ea2973e947ac0024bcbe939  m17n-db-1.3.1.tar.gz
+dae9f012cef26f8d58861e169f1d0b0f  m17n-db-1.3.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 02:57:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 21:57:47 -0500
Subject: rpms/kernel-xen/devel/configs config-s390-generic,1.2,1.3
Message-ID: <200602100257.k1A2vljE001086@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-s390-generic 
Log Message:
rebase with rawhide 1.1924


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-s390-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-s390-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-s390-generic	10 Feb 2006 02:57:43 -0000	1.3
@@ -135,8 +135,10 @@
 #
 # S390 crypto hw
 #
-CONFIG_CRYPTO_SHA1_Z990=m
-CONFIG_CRYPTO_DES_Z990=m
+CONFIG_CRYPTO_SHA1_S390=m
+CONFIG_CRYPTO_SHA256_S390=m
+CONFIG_CRYPTO_DES_S390=m
+CONFIG_CRYPTO_AES_S390=m
 
 #
 # Kernel hacking
@@ -171,4 +173,5 @@
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MII is not set
 
-
+# Breaks qeth (Feb 8th 2006)
+# CONFIG_DEBUG_SLAB is not set



From fedora-cvs-commits at redhat.com  Fri Feb 10 02:57:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 21:57:47 -0500
Subject: rpms/kernel-xen/devel patch-2.6.16-rc2-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.16, 1.17 kernel-xen.spec, 1.52,
	1.53 linux-2.6-debug-boot-delay.patch, 1.2,
	1.3 linux-2.6-debug-oops-pause.patch, 1.5,
	1.6 linux-2.6-net-wireless-features.patch, 1.1,
	1.2 linux-2.6-softmac-git.patch, 1.3, 1.4 sources, 1.16,
	1.17 upstream, 1.8, 1.9 patch-2.6.16-rc2-git3.bz2.sign, 1.1, NONE
Message-ID: <200602100257.k1A2vlcJ001080@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-xen.spec linux-2.6-debug-boot-delay.patch 
	linux-2.6-debug-oops-pause.patch 
	linux-2.6-net-wireless-features.patch 
	linux-2.6-softmac-git.patch sources upstream 
Added Files:
	patch-2.6.16-rc2-git7.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git3.bz2.sign 
Log Message:
rebase with rawhide 1.1924


--- NEW FILE patch-2.6.16-rc2-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD6ujryGugalF9Dw4RAmSxAJ94FLXEN0gJSRFzkTXFfv8hQHx6TgCcD74k
Pwfjh7OT/B/D7E2uXXpTJkA=
=1uiv
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	8 Feb 2006 21:06:58 -0000	1.16
+++ .cvsignore	10 Feb 2006 02:57:43 -0000	1.17
@@ -3,5 +3,5 @@
 kernel-xen-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git3.bz2
 xen-20060208.tar.bz2
+patch-2.6.16-rc2-git7.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- kernel-xen.spec	9 Feb 2006 01:38:34 -0000	1.52
+++ kernel-xen.spec	10 Feb 2006 02:57:43 -0000	1.53
@@ -3,9 +3,10 @@
 # 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 buildup 0
-%define buildsmp 0
+%define buildup 1
+%define buildsmp 1
 %define includexen 1
+# includexenPAE requieres includexen enabled
 %define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
@@ -50,7 +51,7 @@
 %ifarch i686
 %define buildxen %{includexen}
 %define buildxenPAE %{includexenPAE}
-%define buildkdump 0
+%define buildkdump 1
 %else
 %define buildxen 0
 %define buildxenPAE 0
@@ -158,8 +159,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch i686
-# 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -213,7 +214,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git3.bz2
+Patch2: patch-2.6.16-rc2-git7.bz2
 Patch3: drm.patch
 Patch4: linux-2.6-cpufreq-git.patch
 
@@ -495,7 +496,7 @@
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
-# the xen0 kernel needs a newer mkinitrd than everything else right now
+# 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
@@ -529,13 +530,13 @@
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
 Prereq: %{kernel_prereq}
 Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
-# the xen0 kernel needs a newer mkinitrd than everything else right now
+# the hypervisor-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
@@ -555,8 +556,8 @@
 Group: System Environment/Kernel
 AutoReqProv: no
 Provides: kernel-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
-Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
 %description hypervisor-PAE-devel
@@ -602,7 +603,7 @@
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
@@ -622,9 +623,9 @@
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
-Provides: kernel-devel = %{rpmversion}-%{release}guest
+Provides: kernel-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
 %description guest-PAE-devel
@@ -1058,7 +1059,6 @@
     MakeTarget=$1
     KernelImage=$2
     Flavour=$3
-    
 
     # Pick the right config file for the kernel we're building
     if [ -n "$Flavour" ] ; then
@@ -1088,6 +1088,7 @@
     if [ "$KernelImage" == "x86" ]; then
        KernelImage=arch/$Arch/boot/bzImage
     fi
+
     make -s ARCH=$Arch nonint_oldconfig > /dev/null
     make -s ARCH=$Arch include/linux/version.h 
 
@@ -1251,17 +1252,13 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{buildup}
-BuildKernel %make_target %kernel_image 
+BuildKernel %make_target %kernel_image
 %endif
 
 %if %{buildsmp}
 BuildKernel %make_target %kernel_image smp
 %endif
 
-%if %{buildkdump}
-BuildKernel %make_target %kernel_image kdump
-%endif
-
 %if %{buildxenPAE}
 BuildKernel vmlinuz vmlinuz hypervisor-PAE
 BuildKernel vmlinuz vmlinuz guest-PAE
@@ -1272,6 +1269,10 @@
 BuildKernel vmlinuz vmlinuz guest
 %endif
 
+%if %{buildkdump}
+BuildKernel %make_target %kernel_image kdump
+%endif
+
 ###
 ### install
 ###
@@ -1355,7 +1356,7 @@
 
 %post hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-devel
@@ -1366,35 +1367,35 @@
   popd > /dev/null
 fi
 
-%post hypervisor-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
+%post guest
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
+/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post hypervisor-PAE-devel
+%post guest-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu} > /dev/null
+  pushd /usr/src/kernels/%{KVERREL}-guest-%{_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 guest
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
+%post hypervisor-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post guest-devel
+%post hypervisor-PAE-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu} > /dev/null
+  pushd /usr/src/kernels/%{KVERREL}-hypervisor-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 guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
+/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-PAE-devel
@@ -1427,19 +1428,19 @@
 
 %preun hypervisor
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
 
-%preun hypervisor-PAE
+%preun guest
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
 
-%preun guest
+%preun hypervisor-PAE
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
 
 %preun guest-PAE
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
 
 
 ###
@@ -1594,6 +1595,15 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1924.
+- merge with rawhide spec file.
+
+* Thu Feb  9 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git7
+- More airo encryption fixing from Dan Williams.
+- Minor tweaks to the oops-pauser.
+
 * Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
 - fix oops on SMP boot (#180535)
 
@@ -1612,6 +1622,9 @@
 - add up, smp & kdump kernels.
 - add xen PAE kernels.
 
+* Wed Feb  8 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git6
+
 * Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
 - fix xen to compile with gcc-4.1.
 - disable PAE build.
@@ -1621,6 +1634,12 @@
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+- Touch NMI watchdogs in printk pauser.
+
+* Tue Feb  7 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix softmac scanning
+
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git3
 
 * Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>
@@ -1818,10 +1837,7 @@
 * Mon Jan  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git5
 
-* Sat Jan  7 2006 Dave Jones <davej at redhat.com>
-- Silence some iseries build warnings.
-
-* Sat Jan  7 2006 Dave Jones <davej at redhat.com>
+* Sat Jan 07 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git3
 
 * Fri Jan  6 2006 Dave Jones <davej at redhat.com>
@@ -1834,9 +1850,6 @@
 - Fix IA64 build (asm-generic/signal.h needs linux/compiler.h)
 
 * Fri Jan  6 2006 Dave Jones <davej at redhat.com>
-- Branch CVS for test2.
-
-* Fri Jan  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git2
 - Add timer quirk for ATI chipsets.
 - Reboot through BIOS on HP laptops.
@@ -1846,10 +1859,6 @@
 - Hush some debug messages in w1 driver.
 - Disable input layer on iseries.
 - VM OOM killer tweaks.
-- Flip IO scheduler to 'AS' by default again.
-  (CFQ has slab corruption bugs right now).
-- Enable nvram driver for x86-64
-- Fix posix-cpu-timers sched_time accumulation.
 
 * Thu Jan  5 2006 Dave Jones <davej at redhat.com>
 - Try to debug some negative pagecount errors.

linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   35 +++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-boot-delay.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-boot-delay.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-debug-boot-delay.patch	7 Feb 2006 23:44:22 -0000	1.2
+++ linux-2.6-debug-boot-delay.patch	10 Feb 2006 02:57:43 -0000	1.3
@@ -72,15 +72,16 @@
  	preset_lpj = simple_strtoul(str,NULL,0);
 --- linux-2615-work.orig/kernel/printk.c
 +++ linux-2615-work/kernel/printk.c
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,8 @@
  #include <linux/smp_lock.h>
  #include <linux/console.h>
  #include <linux/init.h>
 +#include <linux/jiffies.h>
++#include <linux/nmi.h>
  #include <linux/module.h>
  #include <linux/interrupt.h>			/* For in_interrupt() */
  #include <linux/config.h>
-@@ -201,6 +202,33 @@ out:
+@@ -201,6 +202,34 @@ out:
  
  __setup("log_buf_len=", log_buf_len_setup);
  
@@ -106,6 +107,7 @@
 +		 */
 +		if (time_after(jiffies, timeout))
 +			break;
++		touch_nmi_watchdog();
 +	}
 +}
 +

linux-2.6-debug-oops-pause.patch:
 traps.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-debug-oops-pause.patch	7 Feb 2006 00:45:15 -0000	1.5
+++ linux-2.6-debug-oops-pause.patch	10 Feb 2006 02:57:43 -0000	1.6
@@ -17,15 +17,16 @@
  
  #ifdef CONFIG_EISA
  #include <linux/ioport.h>
-@@ -151,6 +152,17 @@ static inline unsigned long print_contex
+@@ -151,6 +152,18 @@ static inline unsigned long print_contex
  	return ebp;
  }
  
 +void pause_for_two_minutes(void)
 +{
-+	int i;
-+	for (i=120;i>0;i--) {
-+		mdelay(1000);
++	int i, j;
++	for (i=120; i>0; i--) {
++		for (j=0; j<1000; j++)
++			udelay(1000);
 +		touch_nmi_watchdog();
 +		printk("Continuing in %d seconds. \r", i);
 +	}
@@ -39,7 +40,7 @@
  		if (!stack)
  			break;
  		printk(KERN_EMERG " =======================\n");
-+		pause_for_two_minutes();
++		//pause_for_two_minutes();
  	}
  }
  

linux-2.6-net-wireless-features.patch:
 a/drivers/net/wireless/ipw2200.c                |    5 
 drivers/net/wireless/airo.c                     |  276 +++++++++++++++++++++++-
 linux-2.6.15.noarch/drivers/net/wireless/airo.c |   10 
 3 files changed, 286 insertions(+), 5 deletions(-)

Index: linux-2.6-net-wireless-features.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-net-wireless-features.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-net-wireless-features.patch	31 Jan 2006 21:26:16 -0000	1.1
+++ linux-2.6-net-wireless-features.patch	10 Feb 2006 02:57:43 -0000	1.2
@@ -355,3 +355,38 @@
  }
 
 
+The previous patch that added ENCODEEXT and AUTH support to the airo
+driver contained a slight error which would cause setting the TX
+key index ignore a valid key-set request at the same time.  This patch
+allows any combination of setting the TX key index and setting an
+encryption key.
+
+Signed-off-by: Dan Williams
+
+--- linux-2.6.15.noarch/drivers/net/wireless/airo.c~	2006-02-09 11:37:23.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/airo.c	2006-02-09 11:40:46.000000000 -0500
+@@ -6311,7 +6311,7 @@ static int airo_set_encodeext(struct net
+ 	CapabilityRid cap_rid;		/* Card capability info */
+ 	int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 );
+ 	u16 currentAuthType = local->config.authType;
+-	int idx, key_len, alg = ext->alg;	/* Check encryption mode */
++	int idx, key_len, alg = ext->alg, set_key = 1;	/* Check encryption mode */
+ 	wep_key_t key;
+ 
+ 	/* Is WEP supported ? */
+@@ -6336,8 +6336,14 @@ static int airo_set_encodeext(struct net
+ 
+ 	/* Just setting the transmit key? */
+ 	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
++		/* Only set transmit key index here, actual
++		 * key is set below if needed.
++		 */
+ 		set_wep_key(local, idx, NULL, 0, perm, 1);
+-	} else {
++		set_key = ext->key_len > 0 ? 1 : 0;
++	}
++
++	if (set_key) {
+ 		/* Set the requested key first */
+ 		memset(key.key, 0, MAX_KEY_SIZE);
+ 		switch (alg) {

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |   78 +++
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  392 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  456 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  238 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3325 insertions(+), 3 deletions(-)

Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-softmac-git.patch	7 Feb 2006 00:45:15 -0000	1.3
+++ linux-2.6-softmac-git.patch	10 Feb 2006 02:57:43 -0000	1.4
@@ -2812,7 +2812,7 @@
 index 0000000..d90d31f
 --- /dev/null
 +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
-@@ -0,0 +1,237 @@
+@@ -0,0 +1,238 @@
 +/*
 + * Scanning routines.
 + *
@@ -2993,6 +2993,7 @@
 +	dprintk(PFX "Scanning %d channels\n", sm->scaninfo->number_channels);
 +	sm->scaninfo->current_channel_idx = 0;
 +	sm->scaninfo->started = 1;
++	sm->scaninfo->stop = 0;
 +	INIT_COMPLETION(sm->scaninfo->finished);
 +	schedule_work(&sm->scaninfo->softmac_scan);
 +	spin_unlock_irqrestore(&sm->lock, flags);


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Feb 2006 21:06:59 -0000	1.16
+++ sources	10 Feb 2006 02:57:43 -0000	1.17
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-a1e8c0cbebb73561c1d7eae45b5d6ee6  patch-2.6.16-rc2-git3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
+190a95ff28c3a49cd18e212170a28920  patch-2.6.16-rc2-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstream	7 Feb 2006 23:44:22 -0000	1.8
+++ upstream	10 Feb 2006 02:57:43 -0000	1.9
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git3.bz2
+patch-2.6.16-rc2-git7.bz2


--- patch-2.6.16-rc2-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:07:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:07:15 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1927,
	1.1928 linux-2.6-selinux-mprotect-checks.patch, 1.3, 1.4
Message-ID: <200602100307.k1A37FO2002978@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-selinux-mprotect-checks.patch 
Log Message:
selinux mprotect tweaks



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1927
retrieving revision 1.1928
diff -u -r1.1927 -r1.1928
--- kernel-2.6.spec	10 Feb 2006 00:30:30 -0000	1.1927
+++ kernel-2.6.spec	10 Feb 2006 03:07:11 -0000	1.1928
@@ -1378,6 +1378,7 @@
 - More airo encryption fixing from Dan Williams.
 - Minor tweaks to the oops-pauser.
 - Disable DRM for certain Radeons that don't work right now.
+- Further fixing of the selinux mprotect patch
 
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-selinux-mprotect-checks.patch	2 Feb 2006 21:20:36 -0000	1.3
+++ linux-2.6-selinux-mprotect-checks.patch	10 Feb 2006 03:07:11 -0000	1.4
@@ -1,8 +1,22 @@
-
-
---- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
-+++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
-@@ -2425,7 +2425,6 @@ static int selinux_file_mprotect(struct 
+--- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-09 22:05:47.000000000 -0500
++++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-09 22:06:13.000000000 -0500
+@@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil
+ 
+ static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
+ {
+-#ifndef CONFIG_PPC32
+ 	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
+ 		/*
+ 		 * We are making executable an anonymous mapping or a
+@@ -2376,7 +2375,6 @@ static int file_map_prot_check(struct fi
+ 		if (rc)
+ 			return rc;
+ 	}
+-#endif
+ 
+ 	if (file) {
+ 		/* read access is always possible with a mapping */
+@@ -2423,7 +2421,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -10,20 +24,17 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2444,8 +2444,10 @@ static int selinux_file_mprotect(struct 
+@@ -2442,13 +2439,14 @@ static int selinux_file_mprotect(struct 
  			 * modified content.  This typically should only
  			 * occur for text relocations.
  			 */
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
++#if !defined(CONFIG_IA64)
  			rc = file_has_perm(current, vma->vm_file,
  					   FILE__EXECMOD);
 +#endif
  		}
  		if (rc)
  			return rc;
-@@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
- 		if (rc)
- 			return rc;
  	}
 -#endif
  



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:10:33 -0500
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.25,1.26
Message-ID: <200602100310.k1A3AXmA003950@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-mag.spec 
Log Message:
Make it build



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-mag.spec	7 Feb 2006 11:52:29 -0000	1.25
+++ gnome-mag.spec	10 Feb 2006 03:10:29 -0000	1.26
@@ -3,13 +3,12 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.3
-Release: 1.1
+Release: 2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Patch0: gnome-mag-0.10.2-lib64.patch
 BuildRequires: automake14
 BuildRequires: intltool
 BuildRequires: libX11-devel, libXtst-devel, libXdamage-devel
@@ -33,12 +32,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .lib64
 
 %build
-aclocal
-automake-1.9
-autoconf
 %configure
 make
 
@@ -75,6 +70,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.12.3-2
+- Make it build
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:11:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:11:52 -0500
Subject: rpms/xscreensaver/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 xscreensaver.spec, 1.73, 1.74
Message-ID: <200602100311.k1A3Bqtt004353@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4237

Modified Files:
	.cvsignore sources xscreensaver.spec 
Log Message:
- update to 4.23
- add a BuildRequires on imake (spotted by Mamoru Tasaka)
- add a lot of patches and fixes from Mamoru Tasaka



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 Jan 2006 03:19:48 -0000	1.13
+++ .cvsignore	10 Feb 2006 03:11:50 -0000	1.14
@@ -1 +1 @@
-xscreensaver-4.23.tar.gz
+xscreensaver-4.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Jan 2006 03:19:48 -0000	1.14
+++ sources	10 Feb 2006 03:11:50 -0000	1.15
@@ -1 +1 @@
-27491d117a8f7ae57d1fdf5f15d61ac6  xscreensaver-4.23.tar.gz
+174b6a7cebd892c1a6c2d56bf5ac5af6  xscreensaver-4.24.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xscreensaver.spec	7 Feb 2006 14:42:49 -0000	1.73
+++ xscreensaver.spec	10 Feb 2006 03:11:50 -0000	1.74
@@ -1,39 +1,34 @@
 %define	name xscreensaver
-%define	version 4.23
+%define	version 4.24
 
 %define default_text %{_datadir}/doc/fedora-release-4/RELEASE-NOTES
 
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release: 	1.1
+Release: 	1
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
 URL:		http://www.jwz.org/xscreensaver/
 Source0:	xscreensaver-%{version}.tar.gz
 Source1:	removed-display-modes
-Patch0:		xscreensaver-4.22-change-defaults.patch
-Patch1:		xscreensaver-4.16-sanitize-hacks.patch
+Patch0:		xscreensaver-4.24-change-defaults.patch
+Patch1:		xscreensaver-4.24-sanitize-hacks.patch
 Patch2:		xscreensaver-4.21-dont-ping-if-not-root.patch
 Patch3:		xscreensaver-4.21-use-hack-basename.patch
 Patch4:		xscreensaver-4.22-fix-man-pages.patch
 Patch5:		xscreensaver-4.22-dont-allow-root.patch
 Patch6:		xscreensaver-4.22-pam-include.patch
-Patch7:		xscreensaver-4.22-use-manname.patch
 Patch8:		xscreensaver-4.22-write-explicit-dirname.patch
 Patch9:		xscreensaver-4.22-use-hackdirname.patch
 Patch10:	xscreensaver-4.22-show-uname.patch
 Patch11:	xscreensaver-4.22-make-hackdir-absolute-path-new.patch
-Patch12:	xscreensaver-4.23-manfile-entry-fix.patch
-Patch13:	xscreensaver-4.22-mandir-fix-against10.patch
-Patch14:	xscreensaver-4.23-fix-inconsistency.patch
 Patch15:	xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch
 Patch16:	xscreensaver-4.23-realpath-heap-allocate.patch
 Patch17:	xscreensaver-4.23-default-text.patch
 Patch18:	xscreensaver-4.23-modularX-addoption.patch
 Patch19:	xscreensaver-4.23-remove-gccwarn-pointer.patch
-Patch20:	xscreensaver-4.23-fix-free-demoGtk.patch
 
 Buildroot:	%{_tmppath}/%{name}-root
 
@@ -67,6 +62,8 @@
 Summary: An enhanced set of screensavers that require OpenGL.
 Group: Amusements/Graphics
 Obsoletes: xscreensaver-gl
+BuildRequires: libGLU-devel, libGL-devel
+Requires: libGL, libGLU
 
 %description
 A modular screen saver and locker for the X Window System.
@@ -94,25 +91,20 @@
 %setup -q
 %patch0 -p1 -b .change-defaults
 %patch1 -p1 -b .sanitize-hacks
-%patch2 -p1 -b .dont-ping-if-not-root
+#%patch2 -p1 -b .dont-ping-if-not-root
 %patch3 -p1 -b .use-hack-basename
-%patch4 -p1 -b .fix-man-pages
+#%patch4 -p1 -b .fix-man-pages
 %patch5 -p1 -b .dont-allow-root
 %patch6 -p1 -b .pam-include
-%patch7 -p1 -b .use-manname
 %patch8 -p1 -b .write-explicit-dirname
 %patch9 -p1 -b .use-hackdirname
 %patch10 -p1 -b .show-uname
 %patch11 -p1 -b .make-hackdir-absolute-path-new
-%patch12 -p1 -b .manfile-entry-fix
-%patch13 -p1 -b .mandir-fix-against10
-%patch14 -p1 -b .fix-inconsistency
 %patch15 -p1 -b .allow-zero-dpms-timeout-MOREFIX
 %patch16 -p1 -b .realpath-heap-allocate
 %patch17 -p1 -b .default-text
 %patch18 -p1 -b .modularX-addoption
 %patch19 -p1 -b .remove-gccwarn-pointer
-%patch20 -p1 -b .fix-free-demoGtk
 
 
 if [ -x %{_datadir}/libtool/config.guess ]; then



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:22:21 -0500
Subject: rpms/totem/devel totem.spec,1.49,1.50
Message-ID: <200602100322.k1A3MLXk020439@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20384

Modified Files:
	totem.spec 
Log Message:
Rebuild



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- totem.spec	7 Feb 2006 14:07:46 -0000	1.49
+++ totem.spec	10 Feb 2006 03:22:18 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.3.90
-Release: 1.1 
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -136,6 +136,9 @@
 %{_libdir}/*so
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 1.3.90-2
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:23:04 -0500
Subject: rpms/xscreensaver/devel/xscreensaver-4.24 - New directory
Message-ID: <200602100323.k1A3N4Ew020775@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel/xscreensaver-4.24
In directory cvs.devel.redhat.com:/tmp/cvs-serv20745/xscreensaver-4.24

Log Message:
Directory /cvs/dist/rpms/xscreensaver/devel/xscreensaver-4.24 added to the repository




From fedora-cvs-commits at redhat.com  Fri Feb 10 03:24:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:24:10 -0500
Subject: rpms/xscreensaver/devel xscreensaver-4.24-change-defaults.patch,
	NONE, 1.1 xscreensaver-4.24-sanitize-hacks.patch, NONE, 1.1
Message-ID: <200602100324.k1A3OA6p021233@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21127

Added Files:
	xscreensaver-4.24-change-defaults.patch 
	xscreensaver-4.24-sanitize-hacks.patch 
Log Message:
- add patches


xscreensaver-4.24-change-defaults.patch:
 XScreenSaver.ad.in |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

--- NEW FILE xscreensaver-4.24-change-defaults.patch ---
--- xscreensaver-4.24/driver/XScreenSaver.ad.in.change-defaults	2006-02-08 22:14:02.000000000 -0500
+++ xscreensaver-4.24/driver/XScreenSaver.ad.in	2006-02-09 11:14:11.000000000 -0500
@@ -37,25 +37,25 @@
 *dpmsStandby:		2:00:00
 *dpmsSuspend:		2:00:00
 *dpmsOff:		4:00:00
-*grabDesktopImages:	True
+*grabDesktopImages:	False
 *grabVideoFrames:	False
 *chooseRandomImages:	@DEFAULT_IMAGES_P@
 *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
 *nice:			10
 *memoryLimit:		0
-*lock:			False
-*lockVTs:		True
+*lock:			True
+*lockVTs:		False
 *verbose:		False
 *timestamp:		True
 *fade:			True
 *unfade:		False
 *fadeSeconds:		0:00:03
 *fadeTicks:		20
-*splash:		True
+*splash:		False
 *splashDuration:	0:00:05
 *visualID:		default
 *captureStderr: 	False
-*ignoreUninstalledPrograms: False
+*ignoreUninstalledPrograms: True
 
 *textMode:		file
 *textLiteral:		XScreenSaver
@@ -75,7 +75,7 @@
 
 ! Set this to True if you are experiencing longstanding XFree86 bug #421
 ! (xscreensaver not covering the whole screen)
-GetViewPortIsFullOfLies: False
+GetViewPortIsFullOfLies: True
 
 ! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.)
 *demoCommand: xscreensaver-demo
@@ -94,13 +94,11 @@
 !
 !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
 !
- at GNOME24@*loadURL: gnome-open '%s'
 @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
 @GNOME24@		--command '/bin/sh -c "man %s; read foo"'
 !
 !   Gnome 2.2:
 !
- at GNOME22@*loadURL: gnome-url-show '%s'
 @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \
 @GNOME22@		--command '/bin/sh -c "man %s; read foo"'
 !
@@ -111,10 +109,10 @@
 !
 !   non-Gnome systems:
 !
- at NOGNOME@*loadURL: firefox '%s' || mozilla '%s' || netscape '%s'
 @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
 @NOGNOME@		    -e /bin/sh -c 'man "%s" ; read foo'
 
+loadURL: htmlview '%s'
 
 ! The format used for printing the date and time in the password dialog box
 ! (see the strftime(3) manual page for details.)
@@ -237,7 +235,7 @@
 				epicycle -root				    \n\
 				interference -root			    \n\
 				truchet -root -randomize		    \n\
-				bsod -root				    \n\
+-				bsod -root				    \n\
 				crystal -root				    \n\
 				discrete -root				    \n\
 				kumppa -root				    \n\
@@ -471,7 +469,7 @@
 *Dialog.borderWidth:		1
 *Dialog.shadowThickness:	2
 
-*passwd.heading.label:		XScreenSaver %s
+*passwd.heading.label:		Screen Locked
 *passwd.body.label:		Please enter your password.
 *passwd.login.label:		New Login
 *passwd.user.label:		Username:

xscreensaver-4.24-sanitize-hacks.patch:
 barcode.c     |   10 ----------
 glx/glsnake.c |   12 ++++++------
 2 files changed, 6 insertions(+), 16 deletions(-)

--- NEW FILE xscreensaver-4.24-sanitize-hacks.patch ---
--- xscreensaver-4.24/hacks/glx/glsnake.c.sanitize-hacks	2006-02-08 21:08:28.000000000 -0500
+++ xscreensaver-4.24/hacks/glx/glsnake.c	2006-02-09 11:17:08.000000000 -0500
@@ -533,7 +533,7 @@
 	PIN, ZERO, RIGHT, RIGHT, ZERO, PIN, PIN, ZERO, PIN, PIN, ZERO,
 	RIGHT, ZERO }
     },
-    { "k's turd",
+    { "caterpillar",
       { RIGHT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT,
 	RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN,
 	RIGHT, LEFT, RIGHT, PIN, ZERO }
@@ -558,22 +558,22 @@
 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
 	ZERO, ZERO, ZERO }
     },
-    { "kissy box",
+    { "ribbon",
       { PIN, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
 	ZERO, PIN, ZERO }
     },
-    { "erect penis",     /* thanks benno */
+    { "shuffle board",     /* thanks benno */
       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
 	ZERO, ZERO }
     },
-    { "flaccid penis",
+    { "anchor",
       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
 	ZERO, ZERO }
     },
-    { "vagina",
+    { "engagement ring",
       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
 	PIN, RIGHT, ZERO }
@@ -993,7 +993,7 @@
     { "Parrot",
         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
     },
-    { "Penis",
+    { "Shuttle",
         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
     },
     { "PictureCommingSoon",
--- xscreensaver-4.24/hacks/barcode.c.sanitize-hacks	2004-08-08 19:40:50.000000000 -0400
+++ xscreensaver-4.24/hacks/barcode.c	2006-02-09 11:15:04.000000000 -0500
@@ -122,8 +122,6 @@
   "belly",
   "bliss",
   "bogosity",
-  "boobies",
-  "boobs",
   "booty",
   "bread",
   "bubba",
@@ -136,7 +134,6 @@
   "children",
   "chocolate",
   "CLONE",
-  "cock",
   "constriction",
   "contrition",
   "cop",
@@ -176,7 +173,6 @@
   "fear",
   "fever",
   "filth",
-  "flatulence",
   "fluff",
   "fnord",
   "freedom",
@@ -193,9 +189,7 @@
   "happiness",
   "hate",
   "helplessness",
-  "hemorrhoid",
   "hermaphrodite",
-  "heroin",
   "heroine",
   "hope",
   "hysteria",
@@ -270,7 +264,6 @@
   "punishment",
   "punk rock",
   "punk",
-  "pussy",
   "quagmire",
   "quarantine",
   "quartz",
@@ -279,7 +272,6 @@
   "rage",
   "readout",
   "reality",
-  "rectum",
   "reject",
   "rejection",
   "respect",
@@ -338,8 +330,6 @@
   "vegetarian",
   "venom",
   "verifiability",
-  "viagra",
-  "vibrator",
   "victim",
   "vignette",
   "villainy",



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:25:24 -0500
Subject: rpms/kernel-xen/devel/configs config-generic, 1.6,
	1.7 config-ia64-generic, 1.4, 1.5 config-powerpc-generic, 1.4,
	1.5 config-powerpc32-generic, 1.3, 1.4 config-s390-generic, 1.3, 1.4
Message-ID: <200602100325.k1A3POU1021835@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-generic config-ia64-generic config-powerpc-generic 
	config-powerpc32-generic config-s390-generic 
Log Message:
rebase on rawhide 1.1927


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-generic	7 Feb 2006 00:45:16 -0000	1.6
+++ config-generic	10 Feb 2006 03:25:21 -0000	1.7
@@ -1529,6 +1529,7 @@
 CONFIG_SENSORS_EEPROM=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_HDAPS=m


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-ia64-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-ia64-generic	10 Feb 2006 03:25:21 -0000	1.5
@@ -47,6 +47,7 @@
 #
 # IDE chipset support/bugfixes
 #
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_SGIIOC4=m
 
 #


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc-generic	26 Jan 2006 22:14:35 -0000	1.4
+++ config-powerpc-generic	10 Feb 2006 03:25:21 -0000	1.5
@@ -40,6 +40,7 @@
 CONFIG_ADB=y
 CONFIG_ADB_PMU=y
 CONFIG_WINDFARM=y
+CONFIG_WINDFARM_PM112=m
 CONFIG_I2C_POWERMAC=y
 CONFIG_APPLE_AIRPORT=m
 CONFIG_SERIAL_PMACZILOG=m


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc32-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc32-generic	26 Jan 2006 22:14:35 -0000	1.3
+++ config-powerpc32-generic	10 Feb 2006 03:25:21 -0000	1.4
@@ -63,8 +63,5 @@
 
 # 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-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-s390-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-s390-generic	10 Feb 2006 02:57:43 -0000	1.3
+++ config-s390-generic	10 Feb 2006 03:25:21 -0000	1.4
@@ -27,6 +27,7 @@
 CONFIG_CMM=y
 # CONFIG_CMM_PROC is not set
 CONFIG_VIRT_TIMER=y
+CONFIG_DASD_EER=m
 CONFIG_DASD_CMB=m
 CONFIG_NETIUCV=m
 CONFIG_SMSGIUCV=m
@@ -175,3 +176,5 @@
 
 # Breaks qeth (Feb 8th 2006)
 # CONFIG_DEBUG_SLAB is not set
+
+# CONFIG_BOOT_DELAY is not set



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:25:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:25:24 -0500
Subject: rpms/kernel-xen/devel linux-2.6-disable-broken-radeon-drm.patch,
	NONE, 1.1 kernel-xen.spec, 1.53,
	1.54 linux-2.6-compile-fixes.patch, 1.4,
	1.5 linux-2.6-debug-oops-pause.patch, 1.6,
	1.7 linux-2.6-netdump.patch, 1.2, 1.3 linux-2.6-tux.patch, 1.3,
	1.4 linux-2.6-xen-merge.patch, 1.9, 1.10 drm.patch, 1.2,
	NONE linux-2.6-debunk-i2c.patch, 1.1,
	NONE linux-2.6-fs-namei-deadlock.patch, 1.1,
	NONE linux-2.6-net-suppress-msgs.patch, 1.1,
	NONE linux-2.6-percpu-NR_CPUS.patch, 1.1,
	NONE linux-2.6-snd-powermac.patch, 1.1,
	NONE linux-2.6-sound-emu10k1-ac97.patch, 1.2,
	NONE linux-2.6-stradis-oops.patch, 1.1,
	NONE linux-2.6-x86_64-add-ppoll-pselect.patch, 1.1,
	NONE linux-2.6.15-mv643xx-fixes.patch, 1.2, NONE
Message-ID: <200602100325.k1A3POQ2021822@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec linux-2.6-compile-fixes.patch 
	linux-2.6-debug-oops-pause.patch linux-2.6-netdump.patch 
	linux-2.6-tux.patch linux-2.6-xen-merge.patch 
Added Files:
	linux-2.6-disable-broken-radeon-drm.patch 
Removed Files:
	drm.patch linux-2.6-debunk-i2c.patch 
	linux-2.6-fs-namei-deadlock.patch 
	linux-2.6-net-suppress-msgs.patch 
	linux-2.6-percpu-NR_CPUS.patch linux-2.6-snd-powermac.patch 
	linux-2.6-sound-emu10k1-ac97.patch 
	linux-2.6-stradis-oops.patch 
	linux-2.6-x86_64-add-ppoll-pselect.patch 
	linux-2.6.15-mv643xx-fixes.patch 
Log Message:
rebase on rawhide 1.1927

linux-2.6-disable-broken-radeon-drm.patch:
 drm_pciids.h |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE linux-2.6-disable-broken-radeon-drm.patch ---
--- linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h~	2006-02-09 19:26:06.000000000 -0500
+++ linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h	2006-02-09 19:26:56.000000000 -0500
@@ -85,7 +85,6 @@
 	{0x1002, 0x5969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100}, \
 	{0x1002, 0x596A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
 	{0x1002, 0x596B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
-	{0x1002, 0x5b60, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \
 	{0x1002, 0x5c61, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \
 	{0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \
 	{0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kernel-xen.spec	10 Feb 2006 02:57:43 -0000	1.53
+++ kernel-xen.spec	10 Feb 2006 03:25:20 -0000	1.54
@@ -159,8 +159,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
@@ -215,8 +214,7 @@
 #
 Patch1: patch-2.6.16-rc2.bz2
 Patch2: patch-2.6.16-rc2-git7.bz2
-Patch3: drm.patch
-Patch4: linux-2.6-cpufreq-git.patch
+Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -231,12 +229,9 @@
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86_64-tif-restore-sigmask.patch
 Patch207: linux-2.6-x86_64-generic-sigsuspend.patch
-Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6.15-cell-numa-init.patch
-Patch302: linux-2.6-debunk-i2c.patch
-Patch303: linux-2.6-snd-powermac.patch
 #Patch304: linux-2.6.15-mv643xx-fixes.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
@@ -371,11 +366,7 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-percpu-NR_CPUS.patch
-Patch1861: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
-Patch1870: linux-2.6-net-suppress-msgs.patch
-Patch1880: linux-2.6-fs-namei-deadlock.patch
-Patch1890: linux-2.6-stradis-oops.patch
+Patch1860: linux-2.6-disable-broken-radeon-drm.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -692,10 +683,8 @@
 
 # Update to latest upstream.
 %patch1 -p1
-#%patch2 -p1
-# Backout broken DRM changes.
-%patch3 -p1 -R
-%patch4 -p1
+%patch2 -p1
+%patch3 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -733,18 +722,12 @@
 %patch206 -p1
 # Generic sys_rt_sigsuspend()
 %patch207 -p1
-# Add ppoll/pselect syscalls
-%patch208 -p1
 
 # 
 # ppc64
 #
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
-# Revert I2C Bunkage.
-%patch302 -p1
-# Fix I2C handling in snd_powermac
-%patch303 -p1
 # Fix the MV643xx Gigabit Ethernet driver
 #%patch304 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -957,15 +940,8 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Fix percpu data accesses
+# Disable broken radeon DRM for now
 %patch1860 -p1
-%patch1861 -p1
-# Suppress some network layer msgs
-%patch1870 -p1
-# Fix deadlock in do_path_lookup()
-%patch1880 -p1
-# Fix oops in stradis on init
-%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1002,7 +978,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
@@ -1595,6 +1571,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+- rebase 1.1927.
+
 * Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase rawhide 1.1924.
 - merge with rawhide spec file.
@@ -1603,6 +1582,7 @@
 - 2.6.16rc2-git7
 - More airo encryption fixing from Dan Williams.
 - Minor tweaks to the oops-pauser.
+- Disable DRM for certain Radeons that don't work right now.
 
 * Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
 - fix oops on SMP boot (#180535)

linux-2.6-compile-fixes.patch:
 0 files changed

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-compile-fixes.patch	7 Feb 2006 00:45:15 -0000	1.4
+++ linux-2.6-compile-fixes.patch	10 Feb 2006 03:25:20 -0000	1.5
@@ -1,71 +1,2 @@
---- linux-2.6.15/include/asm-generic/signal.h.orig	2006-01-06 16:05:09.000000000 +0000
-+++ linux-2.6.15/include/asm-generic/signal.h	2006-01-06 16:05:19.000000000 +0000
-@@ -9,6 +9,7 @@
- #endif
- 
- #ifndef __ASSEMBLY__
-+#include <linux/compiler.h>
- typedef void __signalfn_t(int);
- typedef __signalfn_t __user *__sighandler_t;
- 
---- linux-2.6.15/drivers/net/spider_net.c.orig	2006-01-06 16:38:43.000000000 +0000
-+++ linux-2.6.15/drivers/net/spider_net.c	2006-01-06 16:39:10.000000000 +0000
-@@ -48,6 +48,7 @@
- #include <asm/bitops.h>
- #include <asm/pci-bridge.h>
- #include <net/checksum.h>
-+#include <net/ip.h>
- 
- #include "spider_net.h"
- 
-Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
-is enabled.
 
-Signed-off-by: Jes Sorensen <jes at sgi.com>
-----
 
- arch/ia64/Kconfig |    3 +++
- drivers/Makefile  |    2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: linux-2.6/arch/ia64/Kconfig
-===================================================================
---- linux-2.6.orig/arch/ia64/Kconfig
-+++ linux-2.6/arch/ia64/Kconfig
-@@ -374,6 +374,9 @@
- 	  To use this option, you have to ensure that the "/proc file system
- 	  support" (CONFIG_PROC_FS) is enabled, too.
- 
-+config SGI_SN
-+	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
-+
- source "drivers/firmware/Kconfig"
- 
- source "fs/Kconfig.binfmt"
-Index: linux-2.6/drivers/Makefile
-===================================================================
---- linux-2.6.orig/drivers/Makefile
-+++ linux-2.6/drivers/Makefile
-@@ -69,7 +69,7 @@
- obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
- obj-$(CONFIG_MMC)		+= mmc/
- obj-$(CONFIG_INFINIBAND)	+= infiniband/
--obj-$(CONFIG_SGI_IOC4)		+= sn/
-+obj-$(CONFIG_SGI_SN)		+= sn/
- obj-y				+= firmware/
- obj-$(CONFIG_CRYPTO)		+= crypto/
- obj-$(CONFIG_SUPERH)		+= sh/
-
---- linux-2.6.15.noarch/include/linux/suspend.h~	2006-02-02 16:27:38.000000000 -0500
-+++ linux-2.6.15.noarch/include/linux/suspend.h	2006-02-02 16:28:07.000000000 -0500
-@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone 
- #ifdef CONFIG_PM
- /* kernel/power/swsusp.c */
- extern int software_suspend(void);
--
--extern int pm_prepare_console(void);
--extern void pm_restore_console(void);
--
- #else
- static inline int software_suspend(void)
- {

linux-2.6-debug-oops-pause.patch:
 traps.c |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-oops-pause.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-oops-pause.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-debug-oops-pause.patch	10 Feb 2006 02:57:43 -0000	1.6
+++ linux-2.6-debug-oops-pause.patch	10 Feb 2006 03:25:20 -0000	1.7
@@ -36,10 +36,10 @@
  static void show_trace_log_lvl(struct task_struct *task,
  			       unsigned long *stack, char *log_lvl)
  {
-@@ -176,6 +188,7 @@ static void show_trace_log_lvl(struct ta
- 		if (!stack)
+@@ -190,6 +190,7 @@ static void show_trace_log_lvl(struct ta
  			break;
- 		printk(KERN_EMERG " =======================\n");
+ 		printk(log_lvl);
+ 		printk(" =======================\n");
 +		//pause_for_two_minutes();
  	}
  }

linux-2.6-netdump.patch:
 linux-2.6.12/drivers/net/netdump.c         |  550 +++++++++++++++++++++++++++++
 linux-2.6.12/drivers/net/netdump.h         |   90 ++++
 linux-2.6.12/include/asm-generic/netdump.h |   48 ++
 linux-2.6.12/include/asm-i386/netdump.h    |   79 ++++
 linux-2.6.12/include/asm-ia64/netdump.h    |   82 ++++
 linux-2.6.12/include/asm-powerpc/netdump.h |   79 ++++
 linux-2.6.12/include/asm-s390/netdump.h    |    6 
 linux-2.6.12/include/asm-x86_64/netdump.h  |   79 ++++
 linux-2.6.12/include/linux/netdevice.h     |    8 
 linux-2.6.12/include/linux/netpoll.h       |    4 
 linux-2.6.12/net/core/netpoll.c            |   17 
 linux-2.6.14/drivers/net/Makefile          |    1 
 linux-2.6.15.noarch/drivers/net/Kconfig    |    7 
 13 files changed, 1039 insertions(+), 11 deletions(-)

Index: linux-2.6-netdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-netdump.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-netdump.patch	21 Dec 2005 11:24:51 -0000	1.2
+++ linux-2.6-netdump.patch	10 Feb 2006 03:25:20 -0000	1.3
@@ -644,22 +644,22 @@
 +
 +module_init(init_netdump);
 +module_exit(cleanup_netdump);
---- linux-2.6.12/drivers/net/Kconfig.netdump.orig	2005-08-19 17:45:43.052483533 -0400
-+++ linux-2.6.12/drivers/net/Kconfig	2005-08-19 17:48:14.835252548 -0400
-@@ -2545,6 +2545,13 @@ config NETCONSOLE
+--- linux-2.6.15.noarch/drivers/net/Kconfig~	2006-02-09 16:15:49.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/Kconfig	2006-02-09 16:16:28.000000000 -0500
+@@ -2715,6 +2715,13 @@ config NETCONSOLE
  	If you want to log kernel messages over the network, enable this.
  	See <file:Documentation/networking/netconsole.txt> for details.
  
-+ config NETDUMP
++config NETDUMP
 +	tristate "Network kernel crash dump support"
 +	depends on NETPOLL && NETPOLL_TRAP && (X86 || PPC_PSERIES || IA64)
 +	---help---
 +	Enable this option if you have a netdump server and you would like
 +	to collect kernel crash dumps.
 +
- endif #NETDEVICES
- 
  config NETPOLL
+ 	def_bool NETCONSOLE
+ 
 --- linux-2.6.14/drivers/net/Makefile~	2005-10-30 21:44:17.000000000 -0500
 +++ linux-2.6.14/drivers/net/Makefile	2005-10-30 21:44:33.000000000 -0500
 @@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/

linux-2.6-tux.patch:
 arch/alpha/kernel/systbls.S      |    8 
 arch/i386/kernel/syscall_table.S |   10 
 arch/ia64/kernel/entry.S         |    8 
 arch/ia64/kernel/ia64_ksyms.c    |    5 
 arch/x86_64/ia32/ia32entry.S     |   10 
 fs/dcache.c                      |   36 
 fs/exec.c                        |    2 
 fs/fcntl.c                       |    4 
 fs/namei.c                       |   18 
 fs/namespace.c                   |    2 
 fs/open.c                        |    4 
 fs/pipe.c                        |    2 
 fs/read_write.c                  |    2 
 include/asm-alpha/fcntl.h        |    1 
 include/asm-generic/fcntl.h      |    4 
 include/asm-i386/unistd.h        |    5 
 include/asm-ia64/unistd.h        |    2 
 include/asm-sparc/fcntl.h        |    1 
 include/asm-sparc64/fcntl.h      |    1 
 include/asm-x86_64/unistd.h      |   10 
 include/linux/buffer_head.h      |    1 
 include/linux/dcache.h           |    8 
 include/linux/errno.h            |    3 
 include/linux/file.h             |    2 
 include/linux/fs.h               |    7 
 include/linux/kmod.h             |    2 
 include/linux/namei.h            |    2 
 include/linux/net.h              |    1 
 include/linux/sched.h            |    5 
 include/linux/skbuff.h           |    2 
 include/linux/socket.h           |    5 
 include/linux/sysctl.h           |   50 
 include/net/sock.h               |    8 
 include/net/tcp.h                |    3 
 include/net/tux.h                |  804 ++++++++++++++
 include/net/tux_u.h              |  163 ++
 kernel/exit.c                    |    7 
 kernel/fork.c                    |    1 
 kernel/kmod.c                    |   28 
 kernel/signal.c                  |    1 
 mm/filemap.c                     |   19 
 mm/truncate.c                    |    2 
 net/Kconfig                      |    1 
 net/Makefile                     |    1 
 net/core/sock.c                  |    5 
 net/ipv4/tcp.c                   |    3 
 net/ipv4/tcp_input.c             |    1 
 net/ipv4/tcp_output.c            |    3 
 net/socket.c                     |  197 ++-
 net/tux/Kconfig                  |   25 
 net/tux/Makefile                 |   12 
 net/tux/abuf.c                   |  190 +++
 net/tux/accept.c                 |  863 +++++++++++++++
 net/tux/cachemiss.c              |  265 ++++
 net/tux/cgi.c                    |  171 +++
 net/tux/directory.c              |  302 +++++
 net/tux/extcgi.c                 |  329 +++++
 net/tux/gzip.c                   |   40 
 net/tux/input.c                  |  641 +++++++++++
 net/tux/logger.c                 |  837 ++++++++++++++
 net/tux/main.c                   | 1417 +++++++++++++++++++++++++
 net/tux/mod.c                    |  262 ++++
 net/tux/output.c                 |  352 ++++++
 net/tux/parser.h                 |  102 +
 net/tux/postpone.c               |   77 +
 net/tux/proc.c                   | 1149 ++++++++++++++++++++
 net/tux/proto_ftp.c              | 1555 +++++++++++++++++++++++++++
 net/tux/proto_http.c             | 2197 +++++++++++++++++++++++++++++++++++++++
 net/tux/redirect.c               |  172 +++
 net/tux/times.c                  |  392 ++++++
 net/tux/times.h                  |   26 
 net/tux/userspace.c              |   27 
 72 files changed, 12775 insertions(+), 98 deletions(-)

Index: linux-2.6-tux.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-tux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-tux.patch	26 Jan 2006 22:14:34 -0000	1.3
+++ linux-2.6-tux.patch	10 Feb 2006 03:25:20 -0000	1.4
@@ -470,14 +470,14 @@
 ===================================================================
 --- linux.orig/include/linux/dcache.h
 +++ linux/include/linux/dcache.h
-@@ -108,6 +108,7 @@ struct dentry {
+@@ -107,6 +107,7 @@ struct dentry {
  	struct dentry_operations *d_op;
  	struct super_block *d_sb;	/* The root of the dentry tree */
  	void *d_fsdata;			/* fs-specific data */
 +	void *d_extra_attributes;	/* TUX-specific data */
+ #ifdef CONFIG_PROFILING
  	struct dcookie_struct *d_cookie; /* cookie, if any */
- 	int d_mounted;
- 	unsigned char d_iname[DNAME_INLINE_LEN_MIN];	/* small names */
+ #endif
 @@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe
  extern void shrink_dcache_parent(struct dentry *);
  extern void shrink_dcache_anon(struct hlist_head *);

linux-2.6-xen-merge.patch:
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   43 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 linux-2.6.15.i686/arch/i386/Kconfig              |   79 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61908 insertions(+), 818 deletions(-)

Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-xen-merge.patch	7 Feb 2006 00:45:15 -0000	1.9
+++ linux-2.6-xen-merge.patch	10 Feb 2006 03:25:20 -0000	1.10
@@ -3582,10 +3582,10 @@
  #define smp_mb()	mb()
 -#define smp_rmb()	rmb()
 -#define smp_wmb()	wmb()
-+#define set_mb(var, value) do { xchg(&var, value); } while (0)
++#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 +#endif
  #define smp_read_barrier_depends()	read_barrier_depends()
--#define set_mb(var, value) do { xchg(&var, value); } while (0)
+-#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
  #else
  #define smp_mb()	barrier()
  #define smp_rmb()	barrier()


--- drm.patch DELETED ---


--- linux-2.6-debunk-i2c.patch DELETED ---


--- linux-2.6-fs-namei-deadlock.patch DELETED ---


--- linux-2.6-net-suppress-msgs.patch DELETED ---


--- linux-2.6-percpu-NR_CPUS.patch DELETED ---


--- linux-2.6-snd-powermac.patch DELETED ---


--- linux-2.6-sound-emu10k1-ac97.patch DELETED ---


--- linux-2.6-stradis-oops.patch DELETED ---


--- linux-2.6-x86_64-add-ppoll-pselect.patch DELETED ---


--- linux-2.6.15-mv643xx-fixes.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:26:07 -0500
Subject: rpms/totem/devel totem.spec,1.50,1.51
Message-ID: <200602100326.k1A3Q7L1022158@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22104

Modified Files:
	totem.spec 
Log Message:
Rebuild



Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- totem.spec	10 Feb 2006 03:22:18 -0000	1.50
+++ totem.spec	10 Feb 2006 03:26:04 -0000	1.51
@@ -63,7 +63,6 @@
 %patch1 -p1 -b .feature-help-removal
 
 %build
-autoreconf
 export MOZILLA_PLUGINDIR=%{_libdir}/mozilla 
 %configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:32:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:32:57 -0500
Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec, 1.37,
	1.38 sources, 1.25, 1.26
Message-ID: <200602100332.k1A3WvM7024046@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24008

Modified Files:
	gnome-icon-theme.spec sources 
Log Message:
Add better shutdown icon



Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnome-icon-theme.spec	9 Feb 2006 21:31:53 -0000	1.37
+++ gnome-icon-theme.spec	10 Feb 2006 03:32:52 -0000	1.38
@@ -1,8 +1,9 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.13.7
-Release: 3
+Release: 4
 Source0: %{name}-%{version}.tar.bz2
+# the gnome-shutdown.png icons are upstream in 2.13.8
 Source1: external-icons-2.13.7.tar.gz
 Patch0: gnome-icon-theme-2.13.7-gnome-spinner.patch
 License: GPL
@@ -79,6 +80,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-4
+- Add better shutdown icon
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-3
 - Add the spinner back
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	9 Feb 2006 21:31:53 -0000	1.25
+++ sources	10 Feb 2006 03:32:52 -0000	1.26
@@ -1,3 +1,3 @@
 65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
 a5401d6f085979fe6601f2241743af86  gnome-icon-theme-2.12.1.tar.bz2
-bdd237a6f0cda01148f3cdc90366d344  external-icons-2.13.7.tar.gz
+ffb4dcac90e0e6d6d5a5d1dec957e54c  external-icons-2.13.7.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:37:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:37:25 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.48,1.49
Message-ID: <200602100337.k1A3bPkb024992@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24938

Modified Files:
	libgnome.spec 
Log Message:
Rebuild



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libgnome.spec	7 Feb 2006 12:38:05 -0000	1.48
+++ libgnome.spec	10 Feb 2006 03:37:20 -0000	1.49
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.13.7
-Release: 4.1
+Release: 5
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -104,6 +104,8 @@
 
 %build
 intltoolize -f
+autoconf
+automake
 %configure --enable-gtk-doc
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
@@ -157,6 +159,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.7-5
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.7-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:46:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:46:41 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.49,1.50
Message-ID: <200602100346.k1A3kf51001711@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv784

Modified Files:
	libgnome.spec 
Log Message:
Rebuild



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgnome.spec	10 Feb 2006 03:37:20 -0000	1.49
+++ libgnome.spec	10 Feb 2006 03:46:36 -0000	1.50
@@ -103,9 +103,6 @@
 %patch7 -p1 -b .popt
 
 %build
-intltoolize -f
-autoconf
-automake
 %configure --enable-gtk-doc
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool



From fedora-cvs-commits at redhat.com  Fri Feb 10 03:54:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 22:54:49 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.54,1.55
Message-ID: <200602100354.k1A3sm0E010820@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
compile only for x86


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kernel-xen.spec	10 Feb 2006 03:25:20 -0000	1.54
+++ kernel-xen.spec	10 Feb 2006 03:54:43 -0000	1.55
@@ -7,7 +7,7 @@
 %define buildsmp 1
 %define includexen 1
 # includexenPAE requieres includexen enabled
-%define includexenPAE 0
+%define includexenPAE 1
 %define builddoc 0
 %define buildkdump 0
 
@@ -159,7 +159,8 @@
 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 s390 s390x
+ExclusiveArch:noarch i686
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Fri Feb 10 04:58:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 23:58:19 -0500
Subject: rpms/kernel/devel Makefile.config, 1.32, 1.33 kernel-2.6.spec,
	1.1928, 1.1929
Message-ID: <200602100458.k1A4wJiA013531@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
start syncing kernel-xen



Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.config	31 Jan 2006 22:13:01 -0000	1.32
+++ Makefile.config	10 Feb 2006 04:58:14 -0000	1.33
@@ -12,8 +12,9 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ia64.config \
-	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
-	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
+	$(CFG)-i686-hypervisor.config $(CFG)-i686-guest.config \
+	$(CFG)-i686-hypervisor-PAE.config $(CFG)-i686-guest-PAE.config \
+	$(CFG)-x86_64-hypervisor.config $(CFG)-x86_64-guest.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -118,15 +119,21 @@
 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
-	perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-i686-hypervisor.config: configs/config-xen-xen0 temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-hypervisor-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-guest.config: configs/config-xen-xenU temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
-	perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-i686-guest-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic
+	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic
-	perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-x86_64-hypervisor.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
-	perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-x86_64-guest.config: configs/config-xen-xenU 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.1928
retrieving revision 1.1929
diff -u -r1.1928 -r1.1929
--- kernel-2.6.spec	10 Feb 2006 03:07:11 -0000	1.1928
+++ kernel-2.6.spec	10 Feb 2006 04:58:14 -0000	1.1929
@@ -6,6 +6,8 @@
 %define buildup 1
 %define buildsmp 1
 %define includexen 0
+# includexenPAE requieres includexen enabled
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -24,7 +26,7 @@
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
-%define kernel_image arch/$Arch/boot/bzImage
+%define kernel_image x86
 
 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
 
@@ -48,9 +50,11 @@
 
 %ifarch i686
 %define buildxen %{includexen}
+%define buildxenPAE %{includexenPAE}
 %define buildkdump 1
 %else
 %define buildxen 0
+%define buildxenPAE 0
 %endif
 
 %ifarch %{all_x86}
@@ -193,13 +197,15 @@
 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
+Source31: kernel-%{kversion}-i686-hypervisor.config
+Source32: kernel-%{kversion}-i686-guest.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-hypervisor-PAE.config
+Source38: kernel-%{kversion}-i686-guest-PAE.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
@@ -461,25 +467,25 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
 
-%package xen0
+%package hypervisor
 Summary: The Linux kernel compiled for Xen guest0 VM operations
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
 Prereq: %{kernel_prereq}
 Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
-# the xen0 kernel needs a newer mkinitrd than everything else right now
+# 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
+%description hypervisor
 This package includes a version of the Linux kernel which
 runs in Xen's guest0 VM and provides device services to
 the unprivileged guests.
@@ -487,25 +493,65 @@
 Install this package in your Xen guest0 environment.
 
 
-%package xen0-devel
+%package hypervisor-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
+Provides: kernel-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description xen0-devel
+%description hypervisor-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package xenU
+
+%package hypervisor-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}hypervisor-PAE
+Prereq: %{kernel_prereq}
+Requires: xen
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the hypervisor-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 hypervisor-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 hypervisor-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description hypervisor-PAE-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
+%package guest
 Summary: The Linux kernel compiled for unprivileged Xen guest VMs
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
@@ -515,22 +561,56 @@
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description xenU
+%description guest
 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
+%package guest-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
+Provides: kernel-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
+Provides: kernel-devel = %{rpmversion}-%{release}guest
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description xenU-devel
+%description guest-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
+%package guest-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}guest-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 guest-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 guest-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description guest-PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
@@ -932,28 +1012,27 @@
 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
 
-cd linux-%{kversion}.%{_target_cpu}
-
-
-
 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
 
@@ -963,10 +1042,14 @@
     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 include/linux/version.h 
 
-    make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
+    make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget
     make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
     make ARCH=$Arch buildcheck
     
@@ -978,12 +1061,12 @@
     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
 
-    if [ "$1" == "kdump" ]; then
+    if [ "$Flavour" == "kdump" ]; then
         cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
         rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
     fi
@@ -1111,21 +1194,28 @@
 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
+
+%if %{buildxenPAE}
+BuildKernel vmlinuz vmlinuz hypervisor-PAE
+BuildKernel vmlinuz vmlinuz guest-PAE
 %endif
 
 %if %{buildxen}
-BuildKernel xen0
-BuildKernel xenU
+BuildKernel vmlinuz vmlinuz hypervisor
+BuildKernel vmlinuz vmlinuz guest
 %endif
 
 %if %{buildkdump}
-BuildKernel kdump
+BuildKernel %make_target %kernel_image kdump
 %endif
 
 ###
@@ -1209,27 +1299,52 @@
   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 %{KVERREL}xen0
+%post hypervisor
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
+/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post hypervisor-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-hypervisor-%{_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 guest
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post guest-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  pushd /usr/src/kernels/%{KVERREL}-guest-%{_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 hypervisor-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post xen0-devel
+%post hypervisor-PAE-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
+  pushd /usr/src/kernels/%{KVERREL}-hypervisor-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
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
+%post guest-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post xenU-devel
+%post guest-PAE-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
+  pushd /usr/src/kernels/%{KVERREL}-guest-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
@@ -1254,13 +1369,21 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
 
-%preun xen0
+%preun hypervisor
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
+
+%preun guest
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
 
-%preun xenU
+%preun hypervisor-PAE
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
+
+%preun guest-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
 
 
 ###
@@ -1305,41 +1428,79 @@
 %endif
 
 %if %{buildxen}
-%files xen0
+%files hypervisor
 %defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0
-/boot/System.map-%{KVERREL}xen0
-/boot/config-%{KVERREL}xen0
-%dir /lib/modules/%{KVERREL}xen0
-/lib/modules/%{KVERREL}xen0/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0/build
-/lib/modules/%{KVERREL}xen0/source
+/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
+/boot/System.map-%{KVERREL}hypervisor
+/boot/config-%{KVERREL}hypervisor
+%dir /lib/modules/%{KVERREL}hypervisor
+/lib/modules/%{KVERREL}hypervisor/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
+/lib/modules/%{KVERREL}hypervisor/source
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0/extra
-/lib/modules/%{KVERREL}xen0/updates
+/lib/modules/%{KVERREL}hypervisor/extra
+/lib/modules/%{KVERREL}hypervisor/updates
 
-%files xen0-devel
+%files hypervisor-devel
 %defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}hypervisor-%{_target_cpu}
 
-%files xenU
+%files guest
 %defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU
-/boot/System.map-%{KVERREL}xenU
-/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
+/%{image_install_path}/vmlinuz-%{KVERREL}guest
+/boot/System.map-%{KVERREL}guest
+/boot/config-%{KVERREL}guest
+%dir /lib/modules/%{KVERREL}guest
+/lib/modules/%{KVERREL}guest/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}guest/build
+/lib/modules/%{KVERREL}guest/source
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU/extra
-/lib/modules/%{KVERREL}xenU/updates
+/lib/modules/%{KVERREL}guest/extra
+/lib/modules/%{KVERREL}guest/updates
 
-%files xenU-devel
+%files guest-devel
 %defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
+%endif
+
+%if %{buildxenPAE}
+%files hypervisor-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
+/boot/System.map-%{KVERREL}hypervisor-PAE
+/boot/config-%{KVERREL}hypervisor-PAE
+%dir /lib/modules/%{KVERREL}hypervisor-PAE
+/lib/modules/%{KVERREL}hypervisor-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build
+/lib/modules/%{KVERREL}hypervisor-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}hypervisor-PAE/extra
+/lib/modules/%{KVERREL}hypervisor-PAE/updates
+
+%files hypervisor-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu}
+
+%files guest-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}guest-PAE
+/boot/System.map-%{KVERREL}guest-PAE
+/boot/config-%{KVERREL}guest-PAE
+%dir /lib/modules/%{KVERREL}guest-PAE
+/lib/modules/%{KVERREL}guest-PAE/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}guest-PAE/build
+/lib/modules/%{KVERREL}guest-PAE/source
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}guest-PAE/extra
+/lib/modules/%{KVERREL}guest-PAE/updates
+
+%files guest-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu}
 %endif
 
 %if %{buildkdump}
@@ -1373,6 +1534,13 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+- Begin the kernel-xen & kernel merge by merging the easy bits.
+
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1924.
+- merge with rawhide spec file.
+
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git7
 - More airo encryption fixing from Dan Williams.
@@ -1380,9 +1548,35 @@
 - Disable DRM for certain Radeons that don't work right now.
 - Further fixing of the selinux mprotect patch
 
+* Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
+- fix oops on SMP boot (#180535)
+
+* Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com>
+- update to newer hypervisor snapshot, conflict with older tools
+- fix pae hypervisor new-kernel-pkg call
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- make_target & kernel_image passed as arguments to BuildKernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- removed SMP_ALTERNATIVES from smp kernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1918.
+- add up, smp & kdump kernels.
+- add xen PAE kernels.
+
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6
 
+* Tue Feb  7 2006 Juan Quintela <quintela at redhat.com>
+- fix xen to compile with gcc-4.1.
+- disable PAE build.
+- enable debug hypervisor options.
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com>
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - Touch NMI watchdogs in printk pauser.
 
@@ -1392,6 +1586,9 @@
 * Tue Feb  7 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git3
 
+* Mon Feb  6 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1914.
+
 * Mon Feb  6 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git2
 
@@ -1405,6 +1602,11 @@
 - 2.6.16rc2-git1
 - Fix deadlock in do_path_lookup()
 
+* Fri Feb  3 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to chrisw's latest merge tree (fix skbuff conflicts)
+- Rebase to xen-unstable hypervisor cset 8737
+- Fix merge of davej's acpi changes to xen
+
 * Fri Feb  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2
 - Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
@@ -1413,6 +1615,17 @@
 - Fix some bogus percpu data accesses.
 - Suppress some network layer msgs
 
+* Thu Feb  2 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19892
+- Disable PAE again
+
+* Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
+- merged with rawhide 1985.
+- enable PAE for this run.
+
+* Thu Feb  2 2006 Juan Quintela <quintela at redhat.com>
+- Add PAE hypervisor & guest kernel, disabled by default.
+
 * Thu Feb  2 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc1-git6
 - enable the periodic slab debugger again.
@@ -1435,6 +1648,10 @@
 * Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
 - Enable x86-64 kdumping, and kdump related specfile cleanup.
 
+* Tue Jan 31 2006 Juan Quintela <quintela at redhat.com>
+- Merge with rawhide 1884.
+- kdump don't work yet at xen.
+
 * Mon Jan 30 2006 Dave Jones <davej at redhat.com>
 - Dan Williams' goodies for wireless drivers to make NetworkManager
   work with WEP/WPA on ipw2200, and WEP on airo.
@@ -1443,6 +1660,14 @@
 - New userspace audit message types.
 - Fix software suspend on kernels without memory hotplug. (#178339)
 
+* Fri Jan 27 2006  Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19859
+- Rebase to HV from xen-unstable.hg cset 8680
+- Delete unused linux-2.6.12-xen.patch
+
+* Thu Jan 26 2006 Juan Quintela <quintela at redhat.com>
+- "don't edit patches by hand" release.
+
 * Thu Jan 26 2006 Dave Jones <davej at redhat.com>
 - Fix building of kdump kernels.
 - Fix slab corruption in network layer.
@@ -1450,6 +1675,9 @@
 - Update ACPI to latest acpi-git tree.
 - Fix the SELinux mprotect checks on executable mappings. (#178747)
 
+* Wed Jan 25 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide kernel 1.1869.
+
 * Wed Jan 25 2006 Dave Jones <davej at redhat.com>
 - Disable page allocation debugging again.
 
@@ -1527,9 +1755,19 @@
 - 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e)
 - Disable S390
 
+* Wed Jan 11 2006  <sct at redhat.com>
+- Fix up kevent usage for xen net backend
+- Fix %post to create mkinitrd for domU
+
 * Tue Jan 10 2006 David Woodhouse <dwmw2 at redhat.com>
 - 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7)
 
+* Mon Jan  9 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase xen to hypervisor from 20060106
+- Rebase xen kernel code to linux-2.6-merge.hg cset 16985
+- Disable power management bits that don't work in Xen
+- Remove include/asm-xen from rpm
+
 * Mon Jan  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git5
 
@@ -1611,6 +1849,20 @@
 * Wed Dec 21 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc6-git2
 
+* Wed Dec 21 2005 Juan Quintela <quintela at trasno.org>
+- rebase to rawhide 1.7779.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- switch BSD license to Dual BSD/GPL as agreed with upstream.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- add EXPORT_SYMBOL for xen_net_read_mac.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- xennet is a module again.
+- merge with rawhide 1.7776 kernel.
+- HIGHMEM4G is default now.
+
 * Tue Dec 20 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc6-git1
 - Make APM work again.
@@ -1698,6 +1950,9 @@
 * Sat Dec 03 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc4-git2
 
+* Fri Dec  2 2005 Stephen Tweedie <sct at redhat.com>
+- Initial merge of current linux-2.6-merge.hg tree into rawhide
+
 * Fri Dec 02 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc4-git1
 - sysfs debug on x86-64 too.



From fedora-cvs-commits at redhat.com  Fri Feb 10 04:59:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 9 Feb 2006 23:59:00 -0500
Subject: rpms/kernel/devel/configs config-xen-xen0-PAE, NONE,
	1.1 config-xen-xenU-PAE, NONE, 1.1
Message-ID: <200602100459.k1A4x02J013567@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	config-xen-xen0-PAE config-xen-xenU-PAE 
Log Message:
new files



--- NEW FILE config-xen-xen0-PAE ---
#
# 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=m
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set

# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HIGHMEM=y

#
# 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

# 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

#
# 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


--- NEW FILE config-xen-xenU-PAE ---
#
# XEN
#
# CONFIG_XEN_PRIVILEGED_GUEST is not set
# CONFIG_XEN_PHYSDEV_ACCESS is not set
# CONFIG_XEN_BLKDEV_BACKEND is not set
# CONFIG_XEN_NETDEV_BACKEND is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=m
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
CONFIG_XEN_DISABLE_SERIAL=y

# CONFIG_NOHIGHMEM is not set
# CONFIG_HIGHMEM4G is not set
CONFIG_HIGHMEM64G=y
CONFIG_HIGHMEM=y

#
# Disable the non-xen drivers, since unprivileged guests
# do not get hardware access

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
# CONFIG_PCI is not set
# CONFIG_ISA is not set
# CONFIG_HOTPLUG is not set

#
# PCMCIA/CardBus support
#
# CONFIG_PCMCIA is not set
# CONFIG_YENTA is not set
# CONFIG_CARDBUS is not set

#
# Generic Driver Options
#
# CONFIG_FW_LOADER is not set

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
# CONFIG_PARPORT is not set

#
# Plug and Play support
#
# CONFIG_PNP is not set
# CONFIG_ISAPNP is not set

#
# Dongle support
#
# CONFIG_DONGLE is not set

#
# File systems
#
CONFIG_EXT3_FS=y
CONFIG_JBD=y

#
# FIR device drivers
#
# CONFIG_BT is not set

#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_ATMEL is not set
# CONFIG_IEEE80211 is not set

# 
# TPM
# 
# CONFIG_XEN_TPMDEV_FRONTEND is not set

# CONFIG_TOSHIBA is not set



From fedora-cvs-commits at redhat.com  Fri Feb 10 05:45:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 00:45:19 -0500
Subject: rpms/eclipse/FC-4 eclipse.spec, 1.172, 1.173 rebuild-sdk-features,
	1.1, 1.2
Message-ID: <200602100545.k1A5jGc8005317@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec rebuild-sdk-features 
Log Message:
- Update the rebuild-sdk-features script to use the 3.1 updatesite.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- eclipse.spec	9 Feb 2006 19:01:28 -0000	1.172
+++ eclipse.spec	10 Feb 2006 05:45:06 -0000	1.173
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_4fc.FC4
+Release:        1jpp_5fc.FC4
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1260,6 +1260,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_5fc.FC4
+- Update the rebuild-sdk-features script to use the 3.1 updatesite.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc.FC4
 - Always generate debug info when building RPMs (Andrew Haley).
 


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/rebuild-sdk-features,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rebuild-sdk-features	6 Dec 2005 20:36:16 -0000	1.1
+++ rebuild-sdk-features	10 Feb 2006 05:45:11 -0000	1.2
@@ -42,8 +42,8 @@
 echo "   </license>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo "   <url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-echo "      <update label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-echo "      <discovery label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+echo "      <update label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.1\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+echo "      <discovery label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.1\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo "   </url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 05:48:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 00:48:37 -0500
Subject: rpms/eclipse/devel eclipse.spec, 1.241, 1.242 rebuild-sdk-features,
	1.1, 1.2
Message-ID: <200602100548.k1A5mb11016486@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14982

Modified Files:
	eclipse.spec rebuild-sdk-features 
Log Message:
- Update the rebuild-sdk-features script to use the 3.1 updatesite.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- eclipse.spec	8 Feb 2006 22:58:35 -0000	1.241
+++ eclipse.spec	10 Feb 2006 05:48:34 -0000	1.242
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_5fc
+Release:        1jpp_6fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1273,6 +1273,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
+- Update the rebuild-sdk-features script to use the 3.1 updatesite.
+
 * Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
 - Use new java-1.4.2-gcj-compat-javadoc package.
 - Always generate debug info when building RPMs (Andrew Haley).


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/rebuild-sdk-features,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rebuild-sdk-features	6 Dec 2005 20:05:48 -0000	1.1
+++ rebuild-sdk-features	10 Feb 2006 05:48:34 -0000	1.2
@@ -42,8 +42,8 @@
 echo "   </license>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo "   <url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-echo "      <update label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-echo "      <discovery label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.0\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+echo "      <update label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.1\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+echo "      <discovery label=\"%updateSiteName\" url=\"http://update.eclipse.org/updates/3.1\"/>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo "   </url>" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 08:25:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 03:25:22 -0500
Subject: rpms/kernel/FC-4 patch-2.6.15.4.bz2.sign, NONE, 1.1 .cvsignore,
	1.173, 1.174 kernel-2.6.spec, 1.1597, 1.1598 sources, 1.157,
	1.158 upstream, 1.98, 1.99 linux-2.6-dcache-inode-leak.patch,
	1.1, NONE linux-2.6-dm-crypt-zero-key-before-free.patch, 1.1,
	NONE linux-2.6-scsi-barrier-leak.patch, 1.1, NONE
Message-ID: <200602100825.k1A8PM1M016438@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.15.4.bz2.sign 
Removed Files:
	linux-2.6-dcache-inode-leak.patch 
	linux-2.6-dm-crypt-zero-key-before-free.patch 
	linux-2.6-scsi-barrier-leak.patch 
Log Message:
.15.4



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

iD8DBQBD7EacyGugalF9Dw4RAgxcAJ9U5j4r2Z1s8D0PbBfp83rmcYx20ACfYSvZ
7znr0B6YasUw3eOcyZyESLs=
=JSkk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- .cvsignore	7 Feb 2006 18:27:08 -0000	1.173
+++ .cvsignore	10 Feb 2006 08:25:19 -0000	1.174
@@ -2,4 +2,4 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.15.3.bz2
+patch-2.6.15.4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1597
retrieving revision 1.1598
diff -u -r1.1597 -r1.1598
--- kernel-2.6.spec	10 Feb 2006 02:02:39 -0000	1.1597
+++ kernel-2.6.spec	10 Feb 2006 08:25:19 -0000	1.1598
@@ -206,7 +206,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.15.3.bz2
+Patch1: patch-2.6.15.4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -304,7 +304,6 @@
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-megaraid-legacy.patch
 Patch1103: linux-2.6-scsi-advansys-pcitable.patch
-Patch1104: linux-2.6-scsi-barrier-leak.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -352,11 +351,9 @@
 Patch1810: linux-2.6-pwc-powerup-by-default.patch
 Patch1820: linux-2.6-net-acenic-use-after-free.patch
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
-Patch1840: linux-2.6-dm-crypt-zero-key-before-free.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
 Patch1870: linux-2.6-usb-find-interface.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
-Patch1890: linux-2.6-dcache-inode-leak.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -711,8 +708,6 @@
 %patch1102 -p1
 # Add a pci table to advansys driver.
 %patch1103 -p1
-# Fix scsi_cmd_cache leak.
-%patch1104 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -795,16 +790,12 @@
 %patch1820 -p1
 # PNP support for smsc-ircc2
 %patch1830 -p1
-# dm-crypt: zero key before freeing it
-%patch1840 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
 # Fix idiocy in usb_find_interface()
 %patch1870 -p1
 # Some it87 probing causes reboots on some systems.
 %patch1880 -p1
-# Fix inode leak in d_instantiate_unique
-%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1281,6 +1272,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.15.4
+
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
 - Disable SMP in x86-64 UP kernels. (Whoops).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources	7 Feb 2006 18:27:09 -0000	1.157
+++ sources	10 Feb 2006 08:25:19 -0000	1.158
@@ -1,2 +1,2 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-198739ce31f4b8e2309189891defa4de  patch-2.6.15.3.bz2
+16c9747058fa575886b32ca022667f60  patch-2.6.15.4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- upstream	7 Feb 2006 18:27:09 -0000	1.98
+++ upstream	10 Feb 2006 08:25:19 -0000	1.99
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.15.3.bz2
+patch-2.6.15.4.bz2
 


--- linux-2.6-dcache-inode-leak.patch DELETED ---


--- linux-2.6-dm-crypt-zero-key-before-free.patch DELETED ---


--- linux-2.6-scsi-barrier-leak.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 08:26:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 03:26:31 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1598,1.1599
Message-ID: <200602100826.k1A8QVqk017049@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1598
retrieving revision 1.1599
diff -u -r1.1598 -r1.1599
--- kernel-2.6.spec	10 Feb 2006 08:25:19 -0000	1.1598
+++ kernel-2.6.spec	10 Feb 2006 08:26:29 -0000	1.1599
@@ -1272,7 +1272,7 @@
 %endif
 
 %changelog
-* Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+* Fri Feb 10 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1832_FC4]
 - 2.6.15.4
 
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
@@ -1282,7 +1282,7 @@
 - Fix PPC64 FP exception setup
 - Fix brain damage in usb_find_interface (#176333)
 
-* Tue Feb  7 2006 Dave Jones <davej at redhat.com>
+* Tue Feb  7 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1831_FC4]
 - 2.6.15.3
   Fixes remotely exploitable bug in ICMP (CVE-2006-0454)
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 08:40:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 03:40:56 -0500
Subject: rpms/fonts-arabic/devel fonts-arabic.spec,1.7,1.8
Message-ID: <200602100840.k1A8eup9020944@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/fonts-arabic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20918

Modified Files:
	fonts-arabic.spec 
Log Message:
url changed


Index: fonts-arabic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fonts-arabic.spec	9 Dec 2005 22:40:27 -0000	1.7
+++ fonts-arabic.spec	10 Feb 2006 08:40:53 -0000	1.8
@@ -1,13 +1,13 @@
 Name: fonts-arabic
 Version: 1.5
-Release: 4.1
+Release: 5
 License: GPL
 Source: KacstArabicFonts-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
 Group: User Interface/X
 Summary: Fonts for Arabic
-URL: http://www.linux.org.sa/download/download.html
+URL: http://www.arabeyes.org/resources.php
 Prereq: fontconfig 
  
 %description
@@ -49,6 +49,9 @@
 %ghost %{_datadir}/fonts/arabic/fonts.cache-1
 
 %changelog
+* Fri Feb 10 2005 Caolan McNamara <caolanm at redhat.com> - 1.5-5
+- update url
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 08:41:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 03:41:56 -0500
Subject: rpms/fonts-arabic/devel fonts-arabic.spec,1.8,1.9
Message-ID: <200602100841.k1A8fuOU021440@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/fonts-arabic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21412

Modified Files:
	fonts-arabic.spec 
Log Message:
url changed


Index: fonts-arabic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fonts-arabic.spec	10 Feb 2006 08:40:53 -0000	1.8
+++ fonts-arabic.spec	10 Feb 2006 08:41:54 -0000	1.9
@@ -52,7 +52,7 @@
 * Fri Feb 10 2005 Caolan McNamara <caolanm at redhat.com> - 1.5-5
 - update url
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Thu Dec 09 2005 Jesse Keating <jkeating at redhat.com> 
 - rebuilt
 
 * Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1.5-4



From fedora-cvs-commits at redhat.com  Fri Feb 10 08:43:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 03:43:31 -0500
Subject: rpms/fonts-arabic/devel fonts-arabic.spec,1.9,1.10
Message-ID: <200602100843.k1A8hVtj022198@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/fonts-arabic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22170

Modified Files:
	fonts-arabic.spec 
Log Message:
url changed


Index: fonts-arabic.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fonts-arabic.spec	10 Feb 2006 08:41:54 -0000	1.9
+++ fonts-arabic.spec	10 Feb 2006 08:43:28 -0000	1.10
@@ -49,10 +49,10 @@
 %ghost %{_datadir}/fonts/arabic/fonts.cache-1
 
 %changelog
-* Fri Feb 10 2005 Caolan McNamara <caolanm at redhat.com> - 1.5-5
+* Fri Feb 10 2006 Caolan McNamara <caolanm at redhat.com> - 1.5-5
 - update url
 
-* Thu Dec 09 2005 Jesse Keating <jkeating at redhat.com> 
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 
 - rebuilt
 
 * Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1.5-4



From fedora-cvs-commits at redhat.com  Fri Feb 10 09:25:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 04:25:38 -0500
Subject: rpms/beagle/devel beagle.spec,1.24,1.25
Message-ID: <200602100925.k1A9Pc6x030023@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29976

Modified Files:
	beagle.spec 
Log Message:
* Fri Feb 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.1-3
- Correctly allocate uid/gid




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- beagle.spec	7 Feb 2006 19:16:46 -0000	1.24
+++ beagle.spec	10 Feb 2006 09:25:35 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        2
+Release:        3
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -112,8 +112,10 @@
 %postun -n libbeagle -p /sbin/ldconfig
 
 %pre
-/usr/sbin/groupadd -r beagleindex 2> /dev/null || :
-/usr/sbin/useradd -r -s /bin/bash -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
+%define beagle_user_uid 57
+
+/usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || :
+/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -150,6 +152,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Feb 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.1-3
+- Correctly allocate uid/gid
+
 * Tue Feb  7 2006 Matthias Clasen <mclasen2redhat.com> - 0.2.1-2
 - Add missing BuildRequires (#180336)
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 10:05:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 05:05:37 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.343, 1.344 kernel-2.6.spec, 1.1929,
	1.1930 sources, 1.285, 1.286 upstream, 1.259,
	1.260 patch-2.6.16-rc2-git7.bz2.sign, 1.1, NONE
Message-ID: <200602101005.k1AA5bjS015648@cvs.devel.redhat.com>

Author: davej

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

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



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

iD8DBQBD7DpsyGugalF9Dw4RAk1SAJ4hO1IizgNv9twgbWczfAnPMhT3UACfZybQ
axd63bNEQIJbh8Ep3ASuY1I=
=sihR
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- .cvsignore	9 Feb 2006 16:10:21 -0000	1.343
+++ .cvsignore	10 Feb 2006 10:05:34 -0000	1.344
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git7.bz2
+patch-2.6.16-rc2-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -r1.1929 -r1.1930
--- kernel-2.6.spec	10 Feb 2006 04:58:14 -0000	1.1929
+++ kernel-2.6.spec	10 Feb 2006 10:05:34 -0000	1.1930
@@ -211,7 +211,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git7.bz2
+Patch2: patch-2.6.16-rc2-git8.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -1535,6 +1535,7 @@
 
 %changelog
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git8
 - Begin the kernel-xen & kernel merge by merging the easy bits.
 
 * Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- sources	9 Feb 2006 16:10:21 -0000	1.285
+++ sources	10 Feb 2006 10:05:34 -0000	1.286
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-190a95ff28c3a49cd18e212170a28920  patch-2.6.16-rc2-git7.bz2
+22f793f90eb19d463b672a29000d3a8d  patch-2.6.16-rc2-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- upstream	9 Feb 2006 16:10:21 -0000	1.259
+++ upstream	10 Feb 2006 10:05:34 -0000	1.260
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git7.bz2
+patch-2.6.16-rc2-git8.bz2


--- patch-2.6.16-rc2-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 10:27:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 05:27:39 -0500
Subject: rpms/net-tools/devel net-tools-1.60-netstat_stop_trim.patch, NONE,
	1.1 net-tools.spec, 1.55, 1.56
Message-ID: <200602101027.k1AARd7Y028282@cvs.devel.redhat.com>

Author: rvokal

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

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-netstat_stop_trim.patch 
Log Message:
 - new option for netstat - -T stops trimming remote and local addresses (#176465)

net-tools-1.60-netstat_stop_trim.patch:
 man/en_US/netstat.8 |    4 ++++
 netstat.c           |   24 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

--- NEW FILE net-tools-1.60-netstat_stop_trim.patch ---
--- net-tools-1.60/man/en_US/netstat.8.old	2006-02-10 11:18:11.000000000 +0100
+++ net-tools-1.60/man/en_US/netstat.8	2006-02-10 11:22:19.000000000 +0100
@@ -176,6 +176,10 @@
 Print routing information from the FIB.  (This is the default.)
 .SS "\-C"
 Print routing information from the route cache.
+.SS "\-Z \-\-context"
+If SELinux enabled print SELinux context.
+.SS "\-T \-\-trim"
+Stop trimming long addresses.
 .SS delay
 Netstat will cycle printing through statistics every 
 .B delay 
--- net-tools-1.60/netstat.c.old	2006-02-10 11:18:12.000000000 +0100
+++ net-tools-1.60/netstat.c	2006-02-10 11:13:50.000000000 +0100
@@ -157,6 +157,9 @@
 int flag_arg = 0;
 int flag_ver = 0;
 int flag_selinux = 0;
+int flag_trim = 0;
+
+
 
 FILE *procinfo;
 
@@ -980,17 +983,21 @@
 		 get_sname(htons(local_port), "tcp",
 			   flag_not & FLAG_NUM_PORT));
 
-	if ((strlen(local_addr) + strlen(buffer)) >= 27)
-	    local_addr[27 - strlen(buffer) - 1] = '\0';
+	if (!flag_trim) {
+	    if ((strlen(local_addr) + strlen(buffer)) >= 27)
+		local_addr[27 - strlen(buffer) - 1] = '\0';
+	}
 
 	strcat(local_addr, ":");
 	strncat(local_addr, buffer, sizeof(local_addr));
 	local_addr[sizeof(local_addr)-1] = 0;
 	snprintf(buffer, sizeof(buffer), "%s",
 		 get_sname(htons(rem_port), "tcp", flag_not & FLAG_NUM_PORT));
-
-	if ((strlen(rem_addr) + strlen(buffer)) >= 27)
-	    rem_addr[27 - strlen(buffer) - 1] = '\0';
+	
+	if (!flag_trim) {
+	    if ((strlen(rem_addr) + strlen(buffer)) >= 27)
+		rem_addr[27 - strlen(buffer) - 1] = '\0';
+	}
 
 	strcat(rem_addr, ":");
 	strncat(rem_addr, buffer, sizeof(rem_addr));
@@ -1776,6 +1783,7 @@
 	{"fib", 0, 0, 'F'},
 	{"groups", 0, 0, 'g'},
 	{"context", 0, 0, 'Z'},
+	{"trim", 0, 0, 'T'},
 	{NULL, 0, 0, 0}
     };
 
@@ -1788,7 +1796,7 @@
 
     afname[0] = '\0';
 
-    while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxlZ", longopts, &lop)) != EOF)
+    while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxlZT", longopts, &lop)) != EOF)
 	switch (i) {
 	case -1:
 	    break;
@@ -1904,6 +1912,10 @@
 	    usage();
 	case 's':
 	    flag_sta++;
+	    break;
+	case 'T':
+	    flag_trim++;
+	    break;
 	}
 
     if(argc == optind + 1) {


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- net-tools.spec	7 Feb 2006 13:12:36 -0000	1.55
+++ net-tools.spec	10 Feb 2006 10:27:36 -0000	1.56
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 61.1
+Release: 62
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -58,6 +58,7 @@
 Patch44: net-tools-1.60-hostname_man.patch
 Patch45: net-tools-1.60-interface_stack.patch
 Patch46: net-tools-1.60-selinux.patch
+Patch47: net-tools-1.60-netstat_stop_trim.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
@@ -112,6 +113,7 @@
 %patch44 -p1 -b .hostname_man
 %patch45 -p0 -b .stack
 %patch46 -p1 -b .selinux
+%patch47 -p1 -b .trim
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -223,6 +225,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Fri Feb 10 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-62
+- new option for netstat - -T stops trimming remote and local addresses (#176465)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.60-61.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 10:57:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 05:57:22 -0500
Subject: rpms/ksh/devel ksh.spec,1.17,1.18
Message-ID: <200602101057.k1AAvLPX017863@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	ksh.spec 
Log Message:
rebuild


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ksh.spec	7 Feb 2006 12:27:37 -0000	1.17
+++ ksh.spec	10 Feb 2006 10:57:18 -0000	1.18
@@ -7,7 +7,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20050202
-Release:      4.1
+Release:      5
 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
@@ -92,6 +92,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Karsten Hopp <karsten at redhat.de> 20050202-5
+- rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 20050202-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 11:33:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 06:33:24 -0500
Subject: rpms/sg3_utils/devel .cvsignore, 1.3, 1.4 sg3_utils.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200602101133.k1ABXOlF009540@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9478

Modified Files:
	.cvsignore sg3_utils.spec sources 
Log Message:
- Update to sg3_utils-1.19



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2005 11:05:13 -0000	1.3
+++ .cvsignore	10 Feb 2006 11:33:21 -0000	1.4
@@ -1 +1 @@
-sg3_utils-1.17.tgz
+sg3_utils-1.19.tgz


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sg3_utils.spec	7 Feb 2006 13:50:02 -0000	1.9
+++ sg3_utils.spec	10 Feb 2006 11:33:21 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Utils for Linux's SCSI generic driver devices + raw devices
 Name: sg3_utils
-Version: 1.17
-Release: 1.1
+Version: 1.19
+Release: 1
 License: GPL
 Group: Utilities/System
 Source: ftp://www.torque.net/sg/p/sg3_utils-%{version}.tgz
@@ -49,7 +49,8 @@
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
         rm -rf $RPM_BUILD_ROOT
 fi
-make install PREFIX=$RPM_BUILD_ROOT/usr
+%makeinstall
+#make install PREFIX=$RPM_BUILD_ROOT/usr
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +73,9 @@
 %{_libdir}/*.la
  
 %changelog
+* Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.19-1
+- Update to sg3_utils-1.19
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.17-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2005 11:05:13 -0000	1.3
+++ sources	10 Feb 2006 11:33:21 -0000	1.4
@@ -1 +1 @@
-dfa4d86bd8f6e3e11932380ce5f660d4  sg3_utils-1.17.tgz
+7275db9303beb4d7a8f37af89910845b  sg3_utils-1.19.tgz



From fedora-cvs-commits at redhat.com  Fri Feb 10 11:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 06:41:13 -0500
Subject: rpms/sg3_utils/devel sg3_utils.spec,1.10,1.11
Message-ID: <200602101141.k1ABfDX4012201@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12125

Modified Files:
	sg3_utils.spec 
Log Message:
- Fixed rebuild problem on 64bit archs.



Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sg3_utils.spec	10 Feb 2006 11:33:21 -0000	1.10
+++ sg3_utils.spec	10 Feb 2006 11:41:11 -0000	1.11
@@ -49,8 +49,11 @@
 if [ "$RPM_BUILD_ROOT" != "/" ]; then
         rm -rf $RPM_BUILD_ROOT
 fi
-%makeinstall
-#make install PREFIX=$RPM_BUILD_ROOT/usr
+%ifarch sparc64 ppc64 s390x x86_64
+make install PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=$RPM_BUILD_ROOT/usr/lib64
+%else
+make install PREFIX=$RPM_BUILD_ROOT/usr
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,7 +77,8 @@
  
 %changelog
 * Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.19-1
-- Update to sg3_utils-1.19
+- Update to sg3_utils-1.19.
+- Fixed rebuild problem on 64bit archs.
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.17-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes



From fedora-cvs-commits at redhat.com  Fri Feb 10 12:44:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 07:44:53 -0500
Subject: rpms/netpbm/FC-4 netpbm-10.29-pnmtopng.patch, 1.1, 1.2 netpbm.spec,
	1.41, 1.42
Message-ID: <200602101244.k1ACirMN015881@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	netpbm-10.29-pnmtopng.patch netpbm.spec 
Log Message:
* Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4.1
- fix segfault caused by usage of uninitialized variables while
  parsing cmdline arguments in pnmtopng (#179645)
- add validity check for date/time in pnmtopng
- fix unchecked sscanf reads



netpbm-10.29-pnmtopng.patch:
 pnmtopng.c |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

Index: netpbm-10.29-pnmtopng.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.29-pnmtopng.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.29-pnmtopng.patch	4 Jan 2006 12:19:36 -0000	1.1
+++ netpbm-10.29-pnmtopng.patch	10 Feb 2006 12:44:49 -0000	1.2
@@ -1,6 +1,54 @@
---- netpbm-10.29/converter/other/pnmtopng.c.segfault	2005-08-06 19:26:55.000000000 +0200
-+++ netpbm-10.29/converter/other/pnmtopng.c	2005-10-05 14:33:03.000000000 +0200
-@@ -1618,7 +1618,7 @@ makePngLine(png_byte *           const l
+--- netpbm-10.31/converter/other/pnmtopng.c.pnmtopng	2005-10-16 21:36:43.000000000 +0200
++++ netpbm-10.31/converter/other/pnmtopng.c	2006-02-10 13:32:55.000000000 +0100
+@@ -215,15 +215,12 @@ static void
+ parseModtimeOpt(const char * const modtimeOpt,
+                 time_t *     const modtimeP) {
+ 
+-    /* It would be nice to validate this better, e.g. don't accept
+-       month 42 or hour -4.
+-    */
+-
+     struct tm brokenTime;
+     int year;
+     int month;
++    int count;
+ 
+-    sscanf(modtimeOpt, "%d-%d-%d %d:%d:%d",
++    count = sscanf(modtimeOpt, "%d-%d-%d %d:%d:%d",
+            &year,
+            &month,
+            &brokenTime.tm_mday,
+@@ -231,6 +228,20 @@ parseModtimeOpt(const char * const modti
+            &brokenTime.tm_min,
+            &brokenTime.tm_sec);
+ 
++    if (count != 6) {
++    	pm_error("Invalid modtime format, it should be [yy]yy-mm-dd hh:mm:ss.");
++    	exit(EXIT_FAILURE);
++    }
++    
++    if (year < 0 || month < 0 || brokenTime.tm_mday < 0 ||
++        brokenTime.tm_hour < 0 || brokenTime.tm_min < 0 ||
++        brokenTime.tm_sec < 0 || year > 9999 || month > 12 ||
++        brokenTime.tm_mday > 31 || brokenTime.tm_hour > 23 ||
++        brokenTime.tm_min > 59 || brokenTime.tm_sec > 59) {
++        pm_error("Bad time format specified for the modtime option.");
++    	exit(EXIT_FAILURE);
++    }
++
+     brokenTime.tm_mon = month - 1;
+     if (year >= 1900)
+         brokenTime.tm_year = year - 1900;
+@@ -296,7 +307,7 @@ parseCommandLine (int argc, char ** argv
+     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
+             &ztxtSpec,             0);
+     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
+-            &modtimeSpec,          0);
++            &cmdlineP->modtimeSpec,0);
+     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
+             &paletteSpec,          0);
+     OPTENT3(0, "compression",      OPT_UINT,
+@@ -1973,7 +1984,7 @@ makePngLine(png_byte *           const l
              *pp++ = PNM_GET1(p_png) & 0xff;
          } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
              unsigned int paletteIndex;
@@ -9,7 +57,7 @@
                  paletteIndex = lookupColorAlpha(caht, &p, &alpha_mask[col]);
              else
                  paletteIndex = ppm_lookupcolor(cht, &p);
-@@ -1637,7 +1637,7 @@ makePngLine(png_byte *           const l
+@@ -1992,7 +2003,7 @@ makePngLine(png_byte *           const l
          } else
              pm_error("INTERNAL ERROR: undefined color_type");
                  


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- netpbm.spec	4 Jan 2006 12:19:36 -0000	1.41
+++ netpbm.spec	10 Feb 2006 12:44:49 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 1.FC4
+Release: 1.FC4.1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -173,6 +173,12 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4.1
+- fix segfault caused by usage of uninitialized variables while
+  parsing cmdline arguments in pnmtopng (#179645)
+- add validity check for date/time in pnmtopng
+- fix unchecked sscanf reads
+
 * Wed Jan 04 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4
 - update to 10.31
 - update security patch



From fedora-cvs-commits at redhat.com  Fri Feb 10 13:06:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 08:06:35 -0500
Subject: rpms/netpbm/devel netpbm-10.29-pnmtopng.patch, 1.2, 1.3 netpbm.spec,
	1.51, 1.52
Message-ID: <200602101306.k1AD6Zh8007019@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6954

Modified Files:
	netpbm-10.29-pnmtopng.patch netpbm.spec 
Log Message:
* Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-3
- fix segfault caused by usage of uninitialized variables while
  parsing cmdline arguments in pnmtopng (#179645)
- add validity check for date/time in pnmtopng
- fix unchecked sscanf reads



netpbm-10.29-pnmtopng.patch:
 pnmtopng.c |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

Index: netpbm-10.29-pnmtopng.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.29-pnmtopng.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netpbm-10.29-pnmtopng.patch	21 Oct 2005 12:52:58 -0000	1.2
+++ netpbm-10.29-pnmtopng.patch	10 Feb 2006 13:06:26 -0000	1.3
@@ -1,6 +1,54 @@
---- netpbm-10.29/converter/other/pnmtopng.c.segfault	2005-08-06 19:26:55.000000000 +0200
-+++ netpbm-10.29/converter/other/pnmtopng.c	2005-10-05 14:33:03.000000000 +0200
-@@ -1618,7 +1618,7 @@ makePngLine(png_byte *           const l
+--- netpbm-10.31/converter/other/pnmtopng.c.pnmtopng	2005-10-16 21:36:43.000000000 +0200
++++ netpbm-10.31/converter/other/pnmtopng.c	2006-02-10 13:32:55.000000000 +0100
+@@ -215,15 +215,12 @@ static void
+ parseModtimeOpt(const char * const modtimeOpt,
+                 time_t *     const modtimeP) {
+ 
+-    /* It would be nice to validate this better, e.g. don't accept
+-       month 42 or hour -4.
+-    */
+-
+     struct tm brokenTime;
+     int year;
+     int month;
++    int count;
+ 
+-    sscanf(modtimeOpt, "%d-%d-%d %d:%d:%d",
++    count = sscanf(modtimeOpt, "%d-%d-%d %d:%d:%d",
+            &year,
+            &month,
+            &brokenTime.tm_mday,
+@@ -231,6 +228,20 @@ parseModtimeOpt(const char * const modti
+            &brokenTime.tm_min,
+            &brokenTime.tm_sec);
+ 
++    if (count != 6) {
++    	pm_error("Invalid modtime format, it should be [yy]yy-mm-dd hh:mm:ss.");
++    	exit(EXIT_FAILURE);
++    }
++    
++    if (year < 0 || month < 0 || brokenTime.tm_mday < 0 ||
++        brokenTime.tm_hour < 0 || brokenTime.tm_min < 0 ||
++        brokenTime.tm_sec < 0 || year > 9999 || month > 12 ||
++        brokenTime.tm_mday > 31 || brokenTime.tm_hour > 23 ||
++        brokenTime.tm_min > 59 || brokenTime.tm_sec > 59) {
++        pm_error("Bad time format specified for the modtime option.");
++    	exit(EXIT_FAILURE);
++    }
++
+     brokenTime.tm_mon = month - 1;
+     if (year >= 1900)
+         brokenTime.tm_year = year - 1900;
+@@ -296,7 +307,7 @@ parseCommandLine (int argc, char ** argv
+     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
+             &ztxtSpec,             0);
+     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
+-            &modtimeSpec,          0);
++            &cmdlineP->modtimeSpec,0);
+     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
+             &paletteSpec,          0);
+     OPTENT3(0, "compression",      OPT_UINT,
+@@ -1973,7 +1984,7 @@ makePngLine(png_byte *           const l
              *pp++ = PNM_GET1(p_png) & 0xff;
          } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
              unsigned int paletteIndex;
@@ -9,7 +57,7 @@
                  paletteIndex = lookupColorAlpha(caht, &p, &alpha_mask[col]);
              else
                  paletteIndex = ppm_lookupcolor(cht, &p);
-@@ -1637,7 +1637,7 @@ makePngLine(png_byte *           const l
+@@ -1992,7 +2003,7 @@ makePngLine(png_byte *           const l
          } else
              pm_error("INTERNAL ERROR: undefined color_type");
                  


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- netpbm.spec	7 Feb 2006 13:12:04 -0000	1.51
+++ netpbm.spec	10 Feb 2006 13:06:27 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 2.1
+Release: 3
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -174,6 +174,12 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-3
+- fix segfault caused by usage of uninitialized variables while
+  parsing cmdline arguments in pnmtopng (#179645)
+- add validity check for date/time in pnmtopng
+- fix unchecked sscanf reads
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 10.31-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 13:43:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 08:43:52 -0500
Subject: rpms/vconfig/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 vconfig.spec, 1.10, 1.11
Message-ID: <200602101343.k1ADhq62000717@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/vconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv582

Modified Files:
	.cvsignore sources vconfig.spec 
Log Message:
- Update to vconfig-1.9
- Fixed License.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 13:57:21 -0000	1.3
+++ .cvsignore	10 Feb 2006 13:43:49 -0000	1.4
@@ -1 +1 @@
-vlan.1.8.tar.gz
+vlan.1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Sep 2004 13:57:21 -0000	1.3
+++ sources	10 Feb 2006 13:43:49 -0000	1.4
@@ -1 +1 @@
-1edd81324b4ffc0702c9ff289a342d91  vlan.1.8.tar.gz
+5f0c6060b33956fb16e11a15467dd394  vlan.1.9.tar.gz


Index: vconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/vconfig.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vconfig.spec	7 Feb 2006 14:12:26 -0000	1.10
+++ vconfig.spec	10 Feb 2006 13:43:49 -0000	1.11
@@ -1,8 +1,8 @@
 Summary: Linux 802.1q VLAN configuration utility
 Name: vconfig
-Version: 1.8
-Release: 7.2
-License: LGPL
+Version: 1.9
+Release: 1
+License: GPL
 Group: System Environment/Base
 Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
 URL: http://www.candelatech.com/~greear/vlan.html
@@ -34,12 +34,18 @@
 %{_mandir}/man8/vconfig.8*
 
 %changelog
+* Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.9-1
+- Updated to vconfig-1.9
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1.8-7.1
 - rebuilt
 
+* Mon Aug 15 2005 Phil Knirsch <pknirsch at redhat.com>
+- Fixed license from LGPL to GPL (#163998)
+
 * Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> 1.8-7
 - bump release and rebuild with gcc 4
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 13:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 08:53:24 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.26,1.27
Message-ID: <200602101353.k1ADrOaV017629@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17600

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
- Change strict 3.1.2 to >= 3.1.2.


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- eclipse-bugzilla.spec	9 Feb 2006 20:56:55 -0000	1.26
+++ eclipse-bugzilla.spec	10 Feb 2006 13:53:21 -0000	1.27
@@ -22,11 +22,11 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	6.2
+Release:	6.3
 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 = 3.1.2
+Requires: eclipse-platform >= 3.1.2
 
 # 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 
@@ -128,6 +128,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.3
+- Change strict 3.1.2 to >= 3.1.2.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.2
 - Build against 3.1.2.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 14:12:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 09:12:41 -0500
Subject: rpms/lm_sensors/devel .cvsignore, 1.12, 1.13 lm_sensors.spec, 1.32,
	1.33 sources, 1.12, 1.13
Message-ID: <200602101412.k1AECfRR023427@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23357

Modified Files:
	.cvsignore lm_sensors.spec sources 
Log Message:
- Update to lm_sensors-2.9.2
- Fixed wrong subsys locking (#176965)
- Removed lm_sensors pwmconfig, has been fixed upstream now



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 May 2005 15:11:50 -0000	1.12
+++ .cvsignore	10 Feb 2006 14:12:38 -0000	1.13
@@ -1 +1 @@
-lm_sensors-2.9.1.tar.gz
+lm_sensors-2.9.2.tar.gz


Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lm_sensors.spec	7 Feb 2006 12:52:39 -0000	1.32
+++ lm_sensors.spec	10 Feb 2006 14:12:38 -0000	1.33
@@ -1,6 +1,6 @@
 Name: lm_sensors
-Version: 2.9.1
-Release: 6.1
+Version: 2.9.2
+Release: 1
 URL: http://secure.netroedge.com/~lm78/
 Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz
 Source1: lm_sensors.sysconfig
@@ -13,7 +13,6 @@
 Patch6: lm_sensors-2.8.3-rpath.patch
 Patch7: lm_sensors-2.8.7-udev.patch
 Patch8: lm_sensors-2.9.1-kernel26.patch
-Patch9: lm_sensors-2.9.1-pwconfig.patch
 Summary: Hardware monitoring tools.
 Group: Applications/System
 License: GPL
@@ -46,7 +45,6 @@
 %patch6 -p1 -b .rpath
 %patch7 -p1 -b .udev
 %patch8 -p1 -b .kernel26
-%patch9 -p1 -b .pwconfig
 
 %build
 mkdir -p kernel/include/linux
@@ -107,6 +105,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> 2.9.2-1
+- Update to lm_sensors-2.9.2
+- Fixed wrong subsys locking (#176965)
+- Removed lm_sensors pwmconfig, has been fixed upstream now
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.1-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 May 2005 15:11:50 -0000	1.12
+++ sources	10 Feb 2006 14:12:38 -0000	1.13
@@ -1 +1 @@
-f5af615e39441d95471bdb72a3f01709  lm_sensors-2.9.1.tar.gz
+229f83cfbd081d5e7bd46885efec1c72  lm_sensors-2.9.2.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 14:52:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 09:52:05 -0500
Subject: rpms/eclipse/devel eclipse.spec, 1.242, 1.243 rebuild-sdk-features,
	1.2, 1.3
Message-ID: <200602101452.k1AEq5xR016005@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15991

Modified Files:
	eclipse.spec rebuild-sdk-features 
Log Message:
Minor rebuild-sdk-features touch-ups.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- eclipse.spec	10 Feb 2006 05:48:34 -0000	1.242
+++ eclipse.spec	10 Feb 2006 14:52:02 -0000	1.243
@@ -142,6 +142,7 @@
 %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
+# 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.18-1jpp
@@ -204,6 +205,7 @@
 PreReq:         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
+# 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
 Requires: jsch >= 0:0.1.18-1jpp
@@ -451,6 +453,7 @@
 ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
 ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
 ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
 ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
 ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
@@ -462,6 +465,7 @@
 ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
 ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
 # We don't have this in FC5
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
 # We used to ship these pre-built, but we're not going to do that anymore.  If
 # we can build them using free stuff, we will. -- overholt, 2005-07-04
@@ -582,7 +586,7 @@
    
   gcj-dbtool -n jdtcoresrc/ecj.db 30000
   gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
-   
+
   # Remove our gcj-built ecj
   rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
 
@@ -1274,7 +1278,7 @@
 
 %changelog
 * Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
-- Update the rebuild-sdk-features script to use the 3.1 updatesite.
+- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
 
 * Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
 - Use new java-1.4.2-gcj-compat-javadoc package.


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/rebuild-sdk-features,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebuild-sdk-features	10 Feb 2006 05:48:34 -0000	1.2
+++ rebuild-sdk-features	10 Feb 2006 14:52:02 -0000	1.3
@@ -17,8 +17,8 @@
 
 # platform.xml header, etc.
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > configuration/org.eclipse.update/platform.xml
-echo "<config version=\"3.0\" date=\"1133364008091\" transient=\"false\">" >> configuration/org.eclipse.update/platform.xml
-echo "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">" >> configuration/org.eclipse.update/platform.xml
+echo "<config date=\"1139581358577\" transient=\"false\" version=\"3.0\">" >> configuration/org.eclipse.update/platform.xml
+echo "<site enabled=\"true\" policy=\"USER-EXCLUDE\" updateable=\"true\" url=\"platform:/base/\">" >> configuration/org.eclipse.update/platform.xml
 featureId="org.eclipse.sdk"
 version=${sdkVersion}
 echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">" >> configuration/org.eclipse.update/platform.xml
@@ -48,12 +48,15 @@
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 
 # Possible SDK features are:
-#  org.eclipse.jdt_${version}
-#  org.eclipse.pde_${version}
 #  org.eclipse.platform_${version}
 #  org.eclipse.platform.source_${version}
-#  org.eclipse.rcp_${version}
+#  org.eclipse.jdt_${version}
+#  org.eclipse.jdt.source_${version}
+#  org.eclipse.pde_${version}
+#  org.eclipse.pde.source_${version}
 #  org.eclipse.sdk_${version}
+#  org.eclipse.rcp_${version}
+#  org.eclipse.rcp.source_${version}
 
 features=$(ls features)
 for feature in $features
@@ -90,12 +93,15 @@
   then
       if [ "xx${version}xx" != "xxxx" ]
       then
-            echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
-	    echo "</feature>" >> configuration/org.eclipse.update/platform.xml
-	    if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
-	    then
-		echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-	    fi
+          echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
+          echo "</feature>" >> configuration/org.eclipse.update/platform.xml
+          if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
+          then
+              if [ "xx${featureId}" != "xxorg.eclipse.rcp.source" ]
+              then
+                  echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+              fi
+          fi
       fi
   fi
 done



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:19:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:19:36 -0500
Subject: rpms/gcc/devel .cvsignore, 1.131,
	1.132 gcc41-ldbl-default-libstdc++.patch, 1.3,
	1.4 gcc41-ldbl-default.patch, 1.2,
	1.3 gcc41-ldbl-mangle-as-g.patch, 1.1,
	1.2 gcc41-ppc32-ldbl.patch, 1.1, 1.2 gcc41.spec, 1.29,
	1.30 sources, 1.133, 1.134 gcc41-gc-pthread_create.patch, 1.2, NONE
Message-ID: <200602101519.k1AFJaAS011992@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11922

Modified Files:
	.cvsignore gcc41-ldbl-default-libstdc++.patch 
	gcc41-ldbl-default.patch gcc41-ldbl-mangle-as-g.patch 
	gcc41-ppc32-ldbl.patch gcc41.spec sources 
Removed Files:
	gcc41-gc-pthread_create.patch 
Log Message:
4.1.0-0.24



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- .cvsignore	6 Feb 2006 10:04:18 -0000	1.131
+++ .cvsignore	10 Feb 2006 15:19:31 -0000	1.132
@@ -1 +1 @@
-gcc-4.1.0-20060206.tar.bz2
+gcc-4.1.0-20060210.tar.bz2

gcc41-ldbl-default-libstdc++.patch:
 config.h.in                        |    3 +
 config/linker-map.gnu              |   79 +++++++++++++++++++++++-----
 config/locale/generic/c_locale.cc  |    9 ++-
 config/locale/gnu/c_locale.cc      |    9 ++-
 config/os/gnu-linux/ldbl-extra.ver |   19 ++++++
 configure                          |   88 ++++++++++++++++++++++++++++++-
 configure.ac                       |   19 ++++++
 include/Makefile.am                |    9 ++-
 include/Makefile.in                |    9 ++-
 include/bits/c++config             |   22 +++++++
 include/bits/locale_facets.h       |   61 +++++++++++++++++++++
 include/bits/locale_facets.tcc     |   82 +++++++++++++++++++++++++----
 include/bits/localefwd.h           |    4 +
 src/Makefile.am                    |   31 +++++++++--
 src/Makefile.in                    |   52 +++++++++++++++---
 src/compatibility-ldbl.cc          |   73 +++++++++++++++++++++++++
 src/compatibility.cc               |  104 ++++++++++++++++++++++++++++++++++++-
 src/complex_io.cc                  |   19 ++++++
 src/istream-inst.cc                |   18 ++++++
 src/limits.cc                      |   33 +++++++++++
 src/locale-inst.cc                 |   50 +++++++++++++++++
 src/locale-misc-inst.cc            |   19 ++++++
 src/locale.cc                      |   43 +++++++++++++--
 src/ostream-inst.cc                |   18 ++++++
 src/wlocale-inst.cc                |   44 +++++++++++++++
 testsuite/testsuite_abi.cc         |   11 ++-
 26 files changed, 863 insertions(+), 65 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.3 -r 1.4 gcc41-ldbl-default-libstdc++.patch
Index: gcc41-ldbl-default-libstdc++.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-default-libstdc++.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gcc41-ldbl-default-libstdc++.patch	6 Feb 2006 10:04:21 -0000	1.3
+++ gcc41-ldbl-default-libstdc++.patch	10 Feb 2006 15:19:31 -0000	1.4
@@ -1,4 +1,4 @@
-2006-02-04  Jakub Jelinek  <jakub at redhat.com>
+2006-02-07  Jakub Jelinek  <jakub at redhat.com>
 	    Benjamin Kosnik  <bkoz at redhat.com>
 
 	* configure.ac (_GLIBCXX_LONG_DOUBLE_COMPAT): New check.
@@ -8,18 +8,12 @@
 	* configure: Rebuilt.
 	* config.h.in: Rebuilt.
 	* config/os/gnu-linux/ldbl-extra.ver: New file.
-	* src/Makefile.am (libstdc++-symbol.ver): Append instead of
-	insert in the middle if port specific symbol file requests it.
-	(ldbl_compat_sources): New variable.
-	(sources): Use it.
-	(compatibility-ldbl.lo, compatibility-ldbl.o): New rules.
-	* src/Makefile.in: Rebuilt.
 	* config/linker-map.gnu: Make sure no __float128 symbols are
 	exported.
-	* include/bits/localefwd.h: Surround std::{money,num}_{get,put}
-	with _GLIBCXX_BEGIN_LDBL_NAMESPACE and _GLIBCXX_END_LDBL_NAMESPACE.
-	(_GLIBCXX_LDBL_NAMESPACE, _GLIBCXX_BEGIN_LDBL_NAMESPACE,
+	* include/bits/c++config (_GLIBCXX_LONG_DOUBLE_COMPAT,
+	_GLIBCXX_LDBL_NAMESPACE, _GLIBCXX_BEGIN_LDBL_NAMESPACE,
 	_GLIBCXX_END_LDBL_NAMESPACE): Define.
+	* include/bits/localefwd.h: Use them to conditionally scope facets.
 	* include/bits/locale_facets.h: Surround std::{money,num}_{get,put}
 	with _GLIBCXX_BEGIN_LDBL_NAMESPACE and _GLIBCXX_END_LDBL_NAMESPACE.
 	[_GLIBCXX_LONG_DOUBLE_COMPAT] (std::money_get): Add __do_get method.
@@ -31,500 +25,380 @@
 	(std::money_get::__do_get, std::money_put::__do_put,
 	std::num_get::__do_get, std::num_put::__do_put): New
 	specializations.
+	* include/Makefile.am: Conditionally define
+	_GLIBCXX_LONG_DOUBLE_COMPAT in c++config.
+	* include/Makefile.in: Regenerate.
 	* src/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT] (_GLIBCXX_LOC_ID,
 	_GLIBCXX_SYNC_ID): Define, use them.
 	* src/compatibility-ldbl.cc: New file.
 	* src/complex_io.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Add compatibility
 	symbols.
-	* src/istream-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
 	* src/limits.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
-	* src/locale-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
+	* src/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
+	* src/locale-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.	
+	* src/locale-misc-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
+	* src/istream-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
 	* src/ostream-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
+	* src/locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
 	* src/wlocale-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
 	* src/compatibility.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
-	* src/locale-misc-inst.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
 	* config/locale/generic/c_locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]:
 	Likewise.
-	* config/locale/gnu/c_locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]: Likewise.
+	* config/locale/gnu/c_locale.cc [_GLIBCXX_LONG_DOUBLE_COMPAT]:
+	Likewise.
+	* src/Makefile.am (libstdc++-symbol.ver): Append instead of
+	insert in the middle if port specific symbol file requests it.
+	(ldbl_compat_sources): New variable.
+	(sources): Use it.
+	(compatibility-ldbl.lo, compatibility-ldbl.o): New rules.
+	* src/Makefile.in: Rebuilt.
+	* testsuite/testsuite_abi.cc: Recognize GLIBCXX_LDBL_3.4,
+	GLIBCXX_LDBL_3.4.7, CXXABI_LDBL_1.3.	
 
---- libstdc++-v3/include/bits/locale_facets.h.jj	2006-02-04 10:42:42.000000000 +0100
-+++ libstdc++-v3/include/bits/locale_facets.h	2006-02-04 10:44:51.000000000 +0100
-@@ -1,6 +1,6 @@
- // Locale support -*- C++ -*-
+--- libstdc++-v3/configure.ac.jj	2006-02-02 16:38:33.000000000 +0100
++++ libstdc++-v3/configure.ac	2006-02-10 14:53:36.000000000 +0100
+@@ -281,6 +281,25 @@ fi
+ # This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no.
+ GLIBCXX_ENABLE_SYMVERS([yes])
  
--// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++ac_ldbl_compat=no
++case "$target" in
++  powerpc*-*-*gnu* | \
++  sparc*-*-linux* | \
++  s390*-*-linux* | \
++  alpha*-*-linux*)
++  AC_TRY_COMPILE(, [
++#if !defined __LONG_DOUBLE_128__ || (defined(__sparc__) && defined(__arch64__))
++#error no need for long double compatibility
++#endif
++  ], [ac_ldbl_compat=yes], [ac_ldbl_compat=no])
++  if test "$ac_ldbl_compat" = yes; then
++    AC_DEFINE([_GLIBCXX_LONG_DOUBLE_COMPAT],1,
++	      [Define if compatibility should be provided for -mlong-double-64.])
++    port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver"
++  fi
++esac
++GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes)
++
+ # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE.
+ GLIBCXX_CONFIGURE_TESTSUITE
+ 
+--- libstdc++-v3/src/locale.cc.jj	2006-02-02 16:38:25.000000000 +0100
++++ libstdc++-v3/src/locale.cc	2006-02-10 14:57:26.000000000 +0100
+@@ -1,4 +1,4 @@
+-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
  // Free Software Foundation, Inc.
  //
  // This file is part of the GNU ISO C++ Library.  This library is free
-@@ -1910,6 +1910,7 @@ namespace std
-       ~numpunct_byname() { }
-     };
- 
-+_GLIBCXX_BEGIN_LDBL_NAMESPACE
-   /**
-    *  @brief  Facet for parsing number strings.
-    *
-@@ -2176,13 +2177,27 @@ namespace std
-       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
- 	     double&) const;
+@@ -41,6 +41,21 @@ namespace __gnu_internal
+   static __glibcxx_mutex_define_initialized(locale_cache_mutex);
+ }
  
-+      // XXX GLIBCXX_ABI Deprecated
-+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-+      virtual iter_type
-+      __do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-+	       double&) const;
-+#else
-       virtual iter_type
-       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
- 	     long double&) const;
++// XXX GLIBCXX_ABI Deprecated
++#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
++# define _GLIBCXX_LOC_ID(mangled) extern std::locale::id mangled
++_GLIBCXX_LOC_ID (_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++# ifdef _GLIBCXX_USE_WCHAR_T
++_GLIBCXX_LOC_ID (_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
++_GLIBCXX_LOC_ID (_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE);
++# endif
 +#endif
- 
-       virtual iter_type
-       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
- 	     void*&) const;
 +
-+      // XXX GLIBCXX_ABI Deprecated
-+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-+      virtual iter_type
-+      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-+	     long double&) const;
-+#endif
-       //@}
-     };
- 
-@@ -2438,17 +2453,30 @@ namespace std
-       virtual iter_type
-       do_put(iter_type, ios_base&, char_type __fill, double __v) const;
- 
-+      // XXX GLIBCXX_ABI Deprecated
-+#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__
-+      virtual iter_type
-+      __do_put(iter_type, ios_base&, char_type __fill, double __v) const;
-+#else
-       virtual iter_type
-       do_put(iter_type, ios_base&, char_type __fill, long double __v) const;
+ namespace std 
+ {
+   // Definitions for static const data members of locale.
+@@ -398,9 +413,29 @@ namespace std 
+   locale::id::_M_id() const
+   {
+     if (!_M_index)
+-      _M_index = 1 + __gnu_cxx::__exchange_and_add(&_S_refcount, 1);
++      {
++	// XXX GLIBCXX_ABI Deprecated
++#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
++	locale::id *f = 0;
++# define _GLIBCXX_SYNC_ID(facet, mangled) \
++	if (this == &::mangled)				\
++	  f = &facet::id
++	_GLIBCXX_SYNC_ID (num_get<char>, _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++	_GLIBCXX_SYNC_ID (num_put<char>, _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++	_GLIBCXX_SYNC_ID (money_get<char>, _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++	_GLIBCXX_SYNC_ID (money_put<char>, _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE);
++# ifdef _GLIBCXX_USE_WCHAR_T
++	_GLIBCXX_SYNC_ID (num_get<wchar_t>, _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE);
[...1970 lines suppressed...]
++#endif
++
+   template<typename _CharT, typename _OutIter>
+     _OutIter
+     money_put<_CharT, _OutIter>::
+@@ -1726,6 +1787,7 @@ namespace std
+     { return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
+ 	            : _M_insert<false>(__s, __io, __fill, __digits); }
  
-     # std::__convert_to_v
--    _ZSt14__convert_to_v*;
-+    _ZSt14__convert_to_vI[^g]*;
++_GLIBCXX_END_LDBL_NAMESPACE
  
-     # __gnu_cxx::stdio_sync_filebuf
-     _ZTVN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EEE;
-@@ -399,7 +449,8 @@ GLIBCXX_3.4 {
-     _ZTSN9__gnu_cxx13stdio_filebufI[cw]St11char_traitsI[cw]EEE;
+   // NB: Not especially useful. Without an ios_base object or some
+   // kind of locale reference, we are left clawing at the air where
+@@ -2511,12 +2573,12 @@ namespace std
+   extern template class moneypunct<char, true>;
+   extern template class moneypunct_byname<char, false>;
+   extern template class moneypunct_byname<char, true>;
+-  extern template class money_get<char>;
+-  extern template class money_put<char>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE money_get<char>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE money_put<char>;
+   extern template class numpunct<char>;
+   extern template class numpunct_byname<char>;
+-  extern template class num_get<char>;
+-  extern template class num_put<char>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE num_get<char>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE num_put<char>;
+   extern template class __timepunct<char>;
+   extern template class time_put<char>;
+   extern template class time_put_byname<char>;
+@@ -2638,12 +2700,12 @@ namespace std
+   extern template class moneypunct<wchar_t, true>;
+   extern template class moneypunct_byname<wchar_t, false>;
+   extern template class moneypunct_byname<wchar_t, true>;
+-  extern template class money_get<wchar_t>;
+-  extern template class money_put<wchar_t>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE money_get<wchar_t>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE money_put<wchar_t>;
+   extern template class numpunct<wchar_t>;
+   extern template class numpunct_byname<wchar_t>;
+-  extern template class num_get<wchar_t>;
+-  extern template class num_put<wchar_t>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE num_get<wchar_t>;
++  extern template class _GLIBCXX_LDBL_NAMESPACE num_put<wchar_t>;
+   extern template class __timepunct<wchar_t>;
+   extern template class time_put<wchar_t>;
+   extern template class time_put_byname<wchar_t>;
+--- libstdc++-v3/include/Makefile.in.jj	2006-02-02 16:38:32.000000000 +0100
++++ libstdc++-v3/include/Makefile.in	2006-02-10 15:13:22.000000000 +0100
+@@ -1203,13 +1203,18 @@ ${host_builddir}/c++config.h: ${top_buil
+ 				${glibcxx_srcdir}/include/bits/c++config \
+ 				stamp-${host_alias} \
+ 				${toplevel_srcdir}/gcc/DATESTAMP
+-	@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
++	@ldbl_compat='' ;\
++	grep "^[ 	]*#[ 	]*define[ 	][ 	]*_GLIBCXX_LONG_DOUBLE_COMPAT[ 	][ 	]*1[ 	]*$$" \
++	${CONFIG_HEADER} > /dev/null 2>&1 \
++	&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
++	sed -e "$$ldbl_compat" ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+ 	sed -e 's/^/#define __GLIBCXX__ /' \
+-            < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\
++	    < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\
+ 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
+ 	    -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
+ 	    -e 's/VERSION/_GLIBCXX_VERSION/g' \
+ 	    -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
++	    -e '/[ 	]_GLIBCXX_LONG_DOUBLE_COMPAT[ 	]/d' \
+ 	    < ${CONFIG_HEADER} >> $@ ;\
+ 	echo "#endif // _CXXCONFIG_" >>$@
  
-     # function-scope static objects requires a guard variable.
--    _ZGVNSt*;
-+    _ZGVNSt[^1]*;
-+    _ZGVNSt1[^7]*;
+--- libstdc++-v3/testsuite/testsuite_abi.cc.jj	2006-02-02 16:39:16.000000000 +0100
++++ libstdc++-v3/testsuite/testsuite_abi.cc	2006-02-10 14:57:38.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
  
-     # virtual function thunks
-     _ZThn8_NS*;
-@@ -659,9 +710,9 @@ CXXABI_1.3 {
-     _ZTVN10__cxxabiv121__vmi_class_type_infoE;
+-// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++// Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
  
-     # typeinfo structure (and some names)
--    _ZTI[a-z];
--    _ZTIP[a-z];
--    _ZTIPK[a-z];
-+    _ZTI[a-fh-z];
-+    _ZTIP[a-fh-z];
-+    _ZTIPK[a-fh-z];
-     _ZTIN10__cxxabiv117__array_type_infoE;
-     _ZTIN10__cxxabiv117__class_type_infoE;
-     _ZTIN10__cxxabiv116__enum_type_infoE;
-@@ -674,9 +725,9 @@ CXXABI_1.3 {
-     _ZTIN10__cxxabiv121__vmi_class_type_infoE;
+ // This library is free software; you can redistribute it and/or
+ // modify it under the terms of the GNU General Public License as
+@@ -186,8 +186,11 @@ check_version(symbol& test, bool added)
+       known_versions.push_back("GLIBCXX_3.4.5");
+       known_versions.push_back("GLIBCXX_3.4.6");
+       known_versions.push_back("GLIBCXX_3.4.7");
++      known_versions.push_back("GLIBCXX_LDBL_3.4");
++      known_versions.push_back("GLIBCXX_LDBL_3.4.7");
+       known_versions.push_back("CXXABI_1.3");
+       known_versions.push_back("CXXABI_1.3.1");
++      known_versions.push_back("CXXABI_LDBL_1.3");
+     }
+   compat_list::iterator begin = known_versions.begin();
+   compat_list::iterator end = known_versions.end();
+@@ -223,9 +226,7 @@ check_version(symbol& test, bool added)
+ 	  // New version labels are ok. The rest are not.
+ 	  compat_list::iterator it2 = find(begin, end, test.name);
+ 	  if (it2 != end)
+-	    {
+-	      test.version_status = symbol::compatible;
+-	    }
++	    test.version_status = symbol::compatible;
+ 	  else
+ 	    test.version_status = symbol::incompatible;
+ 	}
+@@ -369,7 +370,7 @@ compare_symbols(const char* baseline_fil
+ 	  added_names.erase(it);
+ 	}
+       else
+-	  missing_names.push_back(what);
++	missing_names.push_back(what);
+     }
  
-     # typeinfo name
--    _ZTS[a-z];
--    _ZTSP[a-z];
--    _ZTSPK[a-z];
-+    _ZTS[a-fh-z];
-+    _ZTSP[a-fh-z];
-+    _ZTSPK[a-fh-z];
-     _ZTSN10__cxxabiv117__array_type_infoE;
-     _ZTSN10__cxxabiv117__class_type_infoE;
-     _ZTSN10__cxxabiv116__enum_type_infoE;
---- libstdc++-v3/configure.jj	2006-02-04 10:42:45.000000000 +0100
-+++ libstdc++-v3/configure	2006-02-04 10:48:27.000000000 +0100
+   // Check missing names for compatibility.
+--- libstdc++-v3/configure.jj	2006-02-02 16:38:28.000000000 +0100
++++ libstdc++-v3/configure	2006-02-10 14:53:36.000000000 +0100
 @@ -309,7 +309,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
@@ -1535,43 +1691,3 @@
  s, at baseline_dir@,$baseline_dir,;t t
  s, at ATOMICITY_SRCDIR@,$ATOMICITY_SRCDIR,;t t
  s, at ATOMIC_WORD_SRCDIR@,$ATOMIC_WORD_SRCDIR,;t t
---- libstdc++-v3/configure.ac.jj	2006-02-04 10:42:45.000000000 +0100
-+++ libstdc++-v3/configure.ac	2006-02-04 10:44:55.000000000 +0100
-@@ -281,6 +281,25 @@ fi
- # This depends on GLIBCXX CHECK_LINKER_FEATURES, but without it assumes no.
- GLIBCXX_ENABLE_SYMVERS([yes])
- 
-+ac_ldbl_compat=no
-+case "$target" in
-+  powerpc*-*-*gnu* | \
-+  sparc*-*-linux* | \
-+  s390*-*-linux* | \
-+  alpha*-*-linux*)
-+  AC_TRY_COMPILE(, [
-+#if !defined __LONG_DOUBLE_128__ || (defined(__sparc__) && defined(__arch64__))
-+#error no need for long double compatibility
-+#endif
-+  ], [ac_ldbl_compat=yes], [ac_ldbl_compat=no])
-+  if test "$ac_ldbl_compat" = yes; then
-+    AC_DEFINE([_GLIBCXX_LONG_DOUBLE_COMPAT],1,
-+	      [Define if compatibility should be provided for -mlong-double-64.])
-+    port_specific_symbol_files="\$(top_srcdir)/config/os/gnu-linux/ldbl-extra.ver"
-+  fi
-+esac
-+GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes)
-+
- # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE.
- GLIBCXX_CONFIGURE_TESTSUITE
- 
---- libstdc++-v3/config.h.in.jj	2006-02-04 10:42:45.000000000 +0100
-+++ libstdc++-v3/config.h.in	2006-02-04 10:44:55.000000000 +0100
-@@ -658,6 +658,9 @@
- /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
- #undef _GLIBCXX_HOSTED
- 
-+/* Define if compatibility should be provided for -mlong-double-64. */
-+#undef _GLIBCXX_LONG_DOUBLE_COMPAT
-+
- /* Define if ptrdiff_t is int. */
- #undef _GLIBCXX_PTRDIFF_T_IS_INT
- 

gcc41-ldbl-default.patch:
 config.gcc                          |    6 ++---
 config.in                           |    6 +++++
 config/alpha/alpha.c                |    5 ++++
 config/alpha/libgcc-alpha-ldbl.ver  |   32 ++++++++++++++++++++++++++
 config/alpha/t-linux                |    1 
 config/rs6000/linux.h               |    5 ++++
 config/rs6000/linux64.h             |    5 ++++
 config/s390/s390.c                  |    5 ++++
 config/sparc/libgcc-sparc-glibc.ver |   33 +++++++++++++++++++++++++++
 config/sparc/linux.h                |   27 +++++++++++-----------
 config/sparc/linux64.h              |   41 +++++++++++++++-------------------
 config/sparc/sparc.c                |    5 ++++
 config/sparc/t-linux                |    5 ++++
 config/sparc/t-linux64              |    6 -----
 configure                           |   43 +++++++++++++++++++++++++++++++++++-
 configure.ac                        |   33 +++++++++++++++++++++++++++
 doc/install.texi                    |    8 ++++++
 17 files changed, 220 insertions(+), 46 deletions(-)

Index: gcc41-ldbl-default.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-ldbl-default.patch	6 Feb 2006 10:04:21 -0000	1.2
+++ gcc41-ldbl-default.patch	10 Feb 2006 15:19:31 -0000	1.3
@@ -1,9 +1,9 @@
-2006-02-05  Jakub Jelinek  <jakub at redhat.com>
+2006-02-10  Jakub Jelinek  <jakub at redhat.com>
+
+	* doc/install.texi (Options specification): Document
+	--with-long-double-128.
 
-	* config.gcc (s390-*-linux*): Add s390/t-linux to tmake_file.
-	(s390x-*-linux*): Likewise.
-	* config/s390/t-linux64 (SHLIB_MAPFILES): Removed.
-	* config/s390/t-linux: New file.
+2006-02-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* config.gcc (sparc-*-linux*): Add sparc/t-linux to tmake_file.
 	(sparc64-*-linux*): Likewise.
@@ -348,24 +348,6 @@
  	;;
  alpha*-*-gnu*)
  	target_cpu_default="MASK_GAS"
-@@ -1864,7 +1864,7 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-ai
- 	;;
- s390-*-linux*)
- 	tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
--	tmake_file="${tmake_file} s390/t-crtstuff"
-+	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux"
- 	;;
- s390x-*-linux*)
- 	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
-@@ -1872,7 +1872,7 @@ s390x-*-linux*)
- 	md_file=s390/s390.md
- 	extra_modes=s390/s390-modes.def
- 	out_file=s390/s390.c
--	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux64"
-+	tmake_file="${tmake_file} s390/t-crtstuff s390/t-linux s390/t-linux64"
- 	;;
- s390x-ibm-tpf*)
-         tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
 @@ -2059,7 +2059,7 @@ sparc-*-elf*)
  sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
  	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
@@ -485,19 +467,20 @@
 +# Avoid the t-linux version file.
 +SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \
 +		 $(srcdir)/config/sparc/libgcc-sparc-glibc.ver
---- gcc/config/s390/t-linux64.jj	2006-01-28 00:42:59.000000000 +0100
-+++ gcc/config/s390/t-linux64	2006-02-05 20:51:34.000000000 +0100
-@@ -6,7 +6,3 @@ LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
+--- gcc/doc/install.texi.jj	2006-02-02 16:39:46.000000000 +0100
++++ gcc/doc/install.texi	2006-02-10 15:33:53.000000000 +0100
+@@ -1224,6 +1224,14 @@ error message.
+ All support for systems which have been obsoleted in one release of GCC
+ is removed entirely in the next major release, unless someone steps
+ forward to maintain the port.
++
++ at item --with-long-double-128
++Specify if @code{long double} type should be 128-bit by default on selected
++GNU/Linux architectures.  If using @code{--without-long-double-128},
++ at code{long double} will be by default 64-bit, the same as @code{double} type.
++When neither of these configure options are used, the default will be
++128-bit @code{long double} when built against GNU C Library 2.4 and later,
++64-bit @code{long double} otherwise.
+ @end table
  
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
--
--# Override t-slibgcc-elf-ver to export some libgcc symbols with
--# the symbol versions that glibc used.
--SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver
---- gcc/config/s390/t-linux.jj	2006-02-05 20:51:18.000000000 +0100
-+++ gcc/config/s390/t-linux	2006-02-05 20:51:25.000000000 +0100
-@@ -0,0 +1,3 @@
-+# Override t-slibgcc-elf-ver to export some libgcc symbols with
-+# the symbol versions that glibc used.
-+SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/s390/libgcc-glibc.ver
+ @subheading Cross-Compiler-Specific Options

gcc41-ldbl-mangle-as-g.patch:
 alpha/alpha.c   |   20 ++++++++++++++++++++
 alpha/linux.h   |    3 +++
 s390/linux.h    |    3 +++
 s390/s390.c     |   20 ++++++++++++++++++++
 sparc/linux.h   |    3 +++
 sparc/linux64.h |    3 +++
 sparc/sparc.c   |   24 ++++++++++++++++++++++++
 7 files changed, 76 insertions(+)

Index: gcc41-ldbl-mangle-as-g.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ldbl-mangle-as-g.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ldbl-mangle-as-g.patch	4 Feb 2006 12:42:09 -0000	1.1
+++ gcc41-ldbl-mangle-as-g.patch	10 Feb 2006 15:19:31 -0000	1.2
@@ -1,8 +1,3 @@
-2006-02-04  Jakub Jelinek  <jakub at redhat.com>
-
-	* config/rs6000/rs6000.c (rs6000_mangle_fundamental_type): Mangle
-	long double as "g" on linux with -mlong-double-128.
-
 2006-02-03  Aldy Hernandez  <aldyh at redhat.com>
 
 	* config/s390/s390.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
@@ -22,24 +17,6 @@
 	* config/sparc/sparc.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
 	(sparc_mangle_fundamental_type): New.
 
---- gcc/config/rs6000/rs6000.c.jj	2006-02-04 11:46:38.000000000 +0100
-+++ gcc/config/rs6000/rs6000.c	2006-02-04 11:46:59.000000000 +0100
-@@ -17353,6 +17353,15 @@ rs6000_mangle_fundamental_type (tree typ
-   if (type == pixel_type_node) return "u7__pixel";
-   if (type == bool_int_type_node) return "U6__booli";
- 
-+#ifdef POWERPC_LINUX
-+  /* On powerpc*-*-linux* where -mlong-double-64 used to be
-+     the default, mangle DFmode long double as 'e' and
-+     TFmode long double as 'g' (__float128 in Itanium ABI).  */
-+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
-+      && TARGET_LONG_DOUBLE_128)
-+    return "g";
-+#endif
-+
-   /* For all other types, use normal C++ mangling.  */
-   return NULL;
- }
 --- gcc/config/alpha/linux.h.jj	2006-02-04 10:42:41.000000000 +0100
 +++ gcc/config/alpha/linux.h	2006-02-04 12:36:09.000000000 +0100
 @@ -82,3 +82,6 @@ Boston, MA 02110-1301, USA.  */

gcc41-ppc32-ldbl.patch:
 config/fp-bit.h |    4 
 doc/invoke.texi |  317 +++++++++++++++++++++++++++++++++++++-------------------
 libgcc-std.ver  |    4 
 mklibgcc.in     |    2 
 4 files changed, 221 insertions(+), 106 deletions(-)

Index: gcc41-ppc32-ldbl.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ppc32-ldbl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ppc32-ldbl.patch	28 Jan 2006 10:00:01 -0000	1.1
+++ gcc41-ppc32-ldbl.patch	10 Feb 2006 15:19:31 -0000	1.2
@@ -1,3 +1,26 @@
+2006-02-04  David Edelsohn  <edelsohn at gnu.org>
+	    Jakub Jelinek  <jakub at redhat.com>
+
+	* config/rs6000/rs6000.c (rs6000_mangle_fundamental_type): Mangle
+	IBM extended float format long double as "g" on powerpc*-linux.
+
+2006-02-01  Jakub Jelinek  <jakub at redhat.com>
+
+	* config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): For
+	-msoft-float -mlong-double-128 only issue a warning, but don't
+	swich to DFmode long double.
+
+2006-01-28  David Edelsohn  <edelsohn at gnu.org>
+
+	* config/rs6000/aix43.h (SUBTARGET_OVERRIDE_OPTIONS): -msoft-float
+	and -mlong-double-128 are incompatible.
+	* config/rs6000/aix52.h (SUBTARGET_OVERRIDE_OPTIONS): Same.
+	* config/rs6000/t-aix43 (LIB2FUNCS_EXTRA): Add ppc64-fp.c.
+	(TARGET_LIBGCC2_CFLAGS): Define.
+	* config/rs6000/t-aix52 (LIB2FUNCS_EXTRA): Same.
+	(TARGET_LIBGCC2_CFLAGS): Same.
+	* config/rs6000/ppc64-fp.c: Compile for 64-bit AIX.
+
 2006-01-27  Jakub Jelinek  <jakub at redhat.com>
 
 	PR target/25864
@@ -106,9 +129,16 @@
  
  @item -mprototype
  @itemx -mno-prototype
---- gcc/config/rs6000/darwin.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/darwin.h	2006-01-28 10:33:14.000000000 +0100
-@@ -313,6 +313,8 @@ do {									\
+--- gcc/config/rs6000/darwin.h	(revision 110228)
++++ gcc/config/rs6000/darwin.h	(revision 110836)
+@@ -1,5 +1,5 @@
+ /* Target definitions for PowerPC running Darwin (Mac OS X).
+-   Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++   Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
+    Contributed by Apple Computer Inc.
+ 
+@@ -311,6 +311,8 @@ do {									\
  /* Darwin only runs on PowerPC, so short-circuit POWER patterns.  */
  #undef  TARGET_POWER
  #define TARGET_POWER 0
@@ -117,8 +147,8 @@
  
  /* Since Darwin doesn't do TOCs, stub this out.  */
  
---- gcc/config/rs6000/libgcc-ppc-glibc.ver.jj	2006-01-28 10:33:14.000000000 +0100
-+++ gcc/config/rs6000/libgcc-ppc-glibc.ver	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/libgcc-ppc-glibc.ver	(revision 0)
++++ gcc/config/rs6000/libgcc-ppc-glibc.ver	(revision 110836)
 @@ -0,0 +1,31 @@
 +%ifndef _SOFT_FLOAT
 +%ifndef __powerpc64__
@@ -151,9 +181,18 @@
 +  __gcc_qdiv
 +}
 +%endif
---- gcc/config/rs6000/rs6000.c.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/rs6000.c	2006-01-28 10:33:14.000000000 +0100
-@@ -158,10 +158,13 @@ enum rs6000_nop_insertion rs6000_sched_i
+--- gcc/config/rs6000/rs6000.c	(revision 110228)
++++ gcc/config/rs6000/rs6000.c	(revision 110836)
+@@ -1,6 +1,7 @@
+ /* Subroutines used for code generation on IBM RS/6000.
+    Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++   2000, 2001, 2002, 2003, 2004, 2005, 2006
++   Free Software Foundation, Inc.
+    Contributed by Richard Kenner (kenner at vlsi1.ultra.nyu.edu)
+ 
+    This file is part of GCC.
+@@ -158,10 +159,13 @@ enum rs6000_nop_insertion rs6000_sched_i
  /* Support targetm.vectorize.builtin_mask_for_load.  */
  static GTY(()) tree altivec_builtin_mask_for_load;
  
@@ -169,7 +208,7 @@
  int rs6000_altivec_abi;
  
  /* Nonzero if we want SPE ABI extensions.  */
-@@ -1286,6 +1289,11 @@ rs6000_override_options (const char *def
+@@ -1286,6 +1290,11 @@ rs6000_override_options (const char *def
    if (!rs6000_explicit_options.long_double)
      rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE;
  
@@ -181,7 +220,7 @@
    /* Set Altivec ABI as default for powerpc64 linux.  */
    if (TARGET_ELF && TARGET_64BIT)
      {
-@@ -1399,8 +1407,7 @@ rs6000_override_options (const char *def
+@@ -1399,8 +1408,7 @@ rs6000_override_options (const char *def
    if (!rs6000_explicit_options.aix_struct_ret)
      aix_struct_return = (DEFAULT_ABI != ABI_V4 || DRAFT_V4_STRUCT_RET);
  
@@ -191,7 +230,7 @@
      REAL_MODE_FORMAT (TFmode) = &ibm_extended_format;
  
    /* Allocate an alias set for register saves & restores from stack.  */
-@@ -1772,6 +1779,17 @@ rs6000_handle_option (size_t code, const
+@@ -1772,6 +1780,17 @@ rs6000_handle_option (size_t code, const
  	  warning (0, "Using old darwin ABI");
  	}
  
@@ -209,7 +248,7 @@
        else
  	{
  	  error ("unknown ABI specified: '%s'", arg);
-@@ -3885,7 +3903,7 @@ rs6000_emit_move (rtx dest, rtx source, 
+@@ -3885,7 +3904,7 @@ rs6000_emit_move (rtx dest, rtx source, 
  
    /* 128-bit constant floating-point values on Darwin should really be
       loaded as two parts.  */
@@ -218,7 +257,7 @@
        && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128
        && mode == TFmode && GET_CODE (operands[1]) == CONST_DOUBLE)
      {
-@@ -4209,7 +4227,7 @@ rs6000_return_in_memory (tree type, tree
+@@ -4209,7 +4228,7 @@ rs6000_return_in_memory (tree type, tree
        return true;
      }
  
@@ -227,7 +266,7 @@
      return true;
  
    return false;
-@@ -4596,13 +4614,15 @@ function_arg_advance (CUMULATIVE_ARGS *c
+@@ -4596,13 +4615,15 @@ function_arg_advance (CUMULATIVE_ARGS *c
    else if (DEFAULT_ABI == ABI_V4)
      {
        if (TARGET_HARD_FLOAT && TARGET_FPRS
@@ -247,7 +286,7 @@
  		cum->words += cum->words & 1;
  	      cum->words += rs6000_arg_size (mode, type);
  	    }
-@@ -5127,9 +5147,10 @@ function_arg (CUMULATIVE_ARGS *cum, enum
+@@ -5127,9 +5148,10 @@ function_arg (CUMULATIVE_ARGS *cum, enum
    else if (abi == ABI_V4)
      {
        if (TARGET_HARD_FLOAT && TARGET_FPRS
@@ -260,7 +299,7 @@
  	    return gen_rtx_REG (mode, cum->fregno);
  	  else
  	    return NULL_RTX;
-@@ -5332,7 +5353,7 @@ rs6000_pass_by_reference (CUMULATIVE_ARG
+@@ -5332,7 +5354,7 @@ rs6000_pass_by_reference (CUMULATIVE_ARG
  			  enum machine_mode mode, tree type,
  			  bool named ATTRIBUTE_UNUSED)
  {
@@ -269,7 +308,7 @@
      {
        if (TARGET_DEBUG_ARG)
  	fprintf (stderr, "function_arg_pass_by_reference: V4 long double\n");
-@@ -5783,14 +5804,16 @@ rs6000_gimplify_va_arg (tree valist, tre
+@@ -5783,14 +5805,16 @@ rs6000_gimplify_va_arg (tree valist, tre
    align = 1;
  
    if (TARGET_HARD_FLOAT && TARGET_FPRS
@@ -289,7 +328,7 @@
  	align = 8;
      }
    else
-@@ -5822,7 +5845,7 @@ rs6000_gimplify_va_arg (tree valist, tre
+@@ -5822,7 +5846,7 @@ rs6000_gimplify_va_arg (tree valist, tre
  	 As are any other 2 gpr item such as complex int due to a
  	 historical mistake.  */
        u = reg;
@@ -298,7 +337,7 @@
  	{
  	  u = build2 (BIT_AND_EXPR, TREE_TYPE (reg), reg,
  		     size_int (n_reg - 1));
-@@ -9028,33 +9051,32 @@ rs6000_init_libfuncs (void)
+@@ -9028,33 +9052,32 @@ rs6000_init_libfuncs (void)
    if (!TARGET_HARD_FLOAT)
      return;
  
@@ -355,7 +394,7 @@
    else
      {
        /* 32-bit SVR4 quad floating point routines.  */
-@@ -11089,7 +11111,7 @@ rs6000_generate_compare (enum rtx_code c
+@@ -11089,7 +11112,7 @@ rs6000_generate_compare (enum rtx_code c
  	 CLOBBERs to match cmptf_internal2 pattern.  */
        if (comp_mode == CCFPmode && TARGET_XL_COMPAT
  	  && GET_MODE (rs6000_compare_op0) == TFmode
@@ -364,24 +403,47 @@
  	  && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128)
  	emit_insn (gen_rtx_PARALLEL (VOIDmode,
  	  gen_rtvec (9,
-@@ -18873,6 +18895,7 @@ rs6000_function_value (tree valtype, tre
- 						   GP_ARG_RETURN + 3),
- 				      GEN_INT (12))));
-     }
+@@ -17331,6 +17354,14 @@ rs6000_mangle_fundamental_type (tree typ
+   if (type == pixel_type_node) return "u7__pixel";
+   if (type == bool_int_type_node) return "U6__booli";
+ 
++  /* Mangle IBM extended float long double as `g' (__float128) on
++     powerpc*-linux where long-double-64 previously was the default.  */
++  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
++      && TARGET_ELF
++      && TARGET_LONG_DOUBLE_128
++      && !TARGET_IEEEQUAD)
++    return "g";
 +
-   if ((INTEGRAL_TYPE_P (valtype)
-        && TYPE_PRECISION (valtype) < BITS_PER_WORD)
-       || POINTER_TYPE_P (valtype))
---- gcc/config/rs6000/linux64.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/linux64.h	2006-01-28 10:33:14.000000000 +0100
-@@ -568,3 +568,5 @@ while (0)
+   /* For all other types, use normal C++ mangling.  */
+   return NULL;
+ }
+--- gcc/config/rs6000/linux64.h	(revision 110228)
++++ gcc/config/rs6000/linux64.h	(revision 110836)
+@@ -1,6 +1,6 @@
+ /* Definitions of target machine for GNU compiler,
+    for 64 bit PowerPC linux.
+-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
++   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
+ 
+    This file is part of GCC.
+@@ -567,3 +567,5 @@ while (0)
     ppc64 glibc provides it at -0x7010(13).  */
  #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? -0x7010 : -0x7008)
  #endif
 +
 +#define POWERPC_LINUX
---- gcc/config/rs6000/darwin-ldouble.c.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/darwin-ldouble.c	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/darwin-ldouble.c	(revision 110228)
++++ gcc/config/rs6000/darwin-ldouble.c	(revision 110836)
+@@ -1,5 +1,6 @@
+ /* 128-bit long double support routines for Darwin.
+-   Copyright (C) 1993, 2003, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 1993, 2003, 2004, 2005, 2006
++   Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+ 
 @@ -48,7 +49,7 @@ Software Foundation, 51 Franklin Street,
  
     This code currently assumes big-endian.  */
@@ -401,8 +463,8 @@
  /* Provide definitions of the old symbol names to satisfy apps and
     shared libs built against an older libgcc.  To access the _xlq
     symbols an explicit version reference is needed, so these won't
---- gcc/config/rs6000/t-linux64.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/t-linux64	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/t-linux64	(revision 110228)
++++ gcc/config/rs6000/t-linux64	(revision 110836)
 @@ -4,9 +4,7 @@
  LIB2FUNCS_EXTRA = tramp.S $(srcdir)/config/rs6000/ppc64-fp.c \
  	$(srcdir)/config/rs6000/darwin-ldouble.c
@@ -428,8 +490,17 @@
 -	else \
 -	  sed -e '/cc1_options/{ n; s/$$/ %{!m32:-mlong-double-128}/; }' < specs > $@; \
 -	fi
---- gcc/config/rs6000/rs6000.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/rs6000.h	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/rs6000.h	(revision 110228)
++++ gcc/config/rs6000/rs6000.h	(revision 110836)
+@@ -1,6 +1,7 @@
+ /* Definitions of target machine for GNU compiler, for IBM RS/6000.
+    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++   2000, 2001, 2002, 2003, 2004, 2005, 2006
++   Free Software Foundation, Inc.
+    Contributed by Richard Kenner (kenner at vlsi1.ultra.nyu.edu)
+ 
+    This file is part of GCC.
 @@ -291,6 +292,7 @@ extern const char *rs6000_traceback_name
  /* These are separate from target_flags because we've run out of bits
     there.  */
@@ -457,8 +528,8 @@
     ? 0									  \
     : GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO)				  \
     ? reg_classes_intersect_p (FLOAT_REGS, CLASS)			  \
---- gcc/config/rs6000/t-ppccomm.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/t-ppccomm	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/t-ppccomm	(revision 110228)
++++ gcc/config/rs6000/t-ppccomm	(revision 110836)
 @@ -1,6 +1,6 @@
  # Common support for PowerPC ELF targets (both EABI and SVR4).
  
@@ -486,19 +557,39 @@
  # Switch synonyms
  MULTILIB_MATCHES_ENDIAN	= mlittle=mlittle-endian mbig=mbig-endian
  MULTILIB_MATCHES_SYSV	= mcall-sysv=mcall-sysv-eabi mcall-sysv=mcall-sysv-noeabi mcall-sysv=mcall-linux mcall-sysv=mcall-netbsd
---- gcc/config/rs6000/ppc64-fp.c.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/ppc64-fp.c	2006-01-28 10:33:14.000000000 +0100
-@@ -31,6 +31,7 @@ Software Foundation, 51 Franklin Street,
+--- gcc/config/rs6000/ppc64-fp.c	(revision 110228)
++++ gcc/config/rs6000/ppc64-fp.c	(revision 110836)
+@@ -2,7 +2,7 @@
+    libgcc2.c with macros expanded to force the use of specific types.
+  
+    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-   2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
++   2000, 2001, 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+ 
+@@ -30,7 +30,8 @@ along with GCC; see the file COPYING.  I
+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
  02110-1301, USA.  */
  
- #if defined(__powerpc64__)
+-#if defined(__powerpc64__)
++#if defined(__powerpc64__) || defined (__64BIT__)
 +#define TMODES
  #include "config/fp-bit.h"
  
  extern DItype __fixtfdi (TFtype);
---- gcc/config/rs6000/rs6000.md.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/rs6000.md	2006-01-28 10:33:14.000000000 +0100
-@@ -151,7 +152,7 @@
+--- gcc/config/rs6000/rs6000.md	(revision 110228)
++++ gcc/config/rs6000/rs6000.md	(revision 110836)
+@@ -1,6 +1,7 @@
+ ;; Machine description for IBM RISC System 6000 (POWER) for GNU C compiler
+ ;; Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+-;; 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++;; Free Software Foundation, Inc.
+ ;; Contributed by Richard Kenner (kenner at vlsi1.ultra.nyu.edu)
+ 
+ ;; This file is part of GCC.
+@@ -151,7 +152,7 @@ (define_mode_macro P [(SI "TARGET_32BIT"
  ; Any hardware-supported floating-point mode
  (define_mode_macro FP [(SF "TARGET_HARD_FLOAT")
    (DF "TARGET_HARD_FLOAT && (TARGET_FPRS || TARGET_E500_DOUBLE)")
@@ -507,7 +598,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128")])
  
  ; Various instructions that come in SI and DI forms.
-@@ -7785,7 +7786,7 @@
+@@ -8249,7 +8250,7 @@ (define_insn "*movdf_softfloat64"
  (define_expand "movtf"
    [(set (match_operand:TF 0 "general_operand" "")
  	(match_operand:TF 1 "any_operand" ""))]
@@ -516,7 +607,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "{ rs6000_emit_move (operands[0], operands[1], TFmode); DONE; }")
  
-@@ -7795,7 +7796,7 @@
+@@ -8259,7 +8260,7 @@ (define_expand "movtf"
  (define_insn_and_split "*movtf_internal"
    [(set (match_operand:TF 0 "nonimmediate_operand" "=o,f,f,r,Y,r")
  	(match_operand:TF 1 "input_operand"         "f,o,f,YGHF,r,r"))]
@@ -525,7 +616,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128
     && (gpc_reg_operand (operands[0], TFmode)
         || gpc_reg_operand (operands[1], TFmode))"
-@@ -7809,7 +7810,7 @@
+@@ -8273,7 +8274,7 @@ (define_expand "extenddftf2"
    [(parallel [(set (match_operand:TF 0 "nonimmediate_operand" "")
  		   (float_extend:TF (match_operand:DF 1 "input_operand" "")))
  	      (use (match_dup 2))])]
@@ -534,7 +625,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
  {
    operands[2] = CONST0_RTX (DFmode);
-@@ -7819,7 +7820,7 @@
+@@ -8283,7 +8284,7 @@ (define_insn_and_split "*extenddftf2_int
    [(set (match_operand:TF 0 "nonimmediate_operand" "=o,f,&f,r")
         (float_extend:TF (match_operand:DF 1 "input_operand" "fr,mf,mf,rmGHF")))
     (use (match_operand:DF 2 "zero_reg_mem_operand" "rf,m,f,n"))]
@@ -543,7 +634,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "#"
    "&& reload_completed"
-@@ -7837,7 +7838,7 @@
+@@ -8301,7 +8302,7 @@ (define_insn_and_split "*extenddftf2_int
  (define_expand "extendsftf2"
    [(set (match_operand:TF 0 "nonimmediate_operand" "")
  	(float_extend:TF (match_operand:SF 1 "gpc_reg_operand" "")))]
@@ -552,7 +643,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
  {
    rtx tmp = gen_reg_rtx (DFmode);
-@@ -7849,14 +7850,14 @@
+@@ -8313,14 +8314,14 @@ (define_expand "extendsftf2"
  (define_expand "trunctfdf2"
    [(set (match_operand:DF 0 "gpc_reg_operand" "")
  	(float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "")))]
@@ -569,7 +660,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "@
     #
-@@ -7872,7 +7873,7 @@
+@@ -8336,7 +8337,7 @@ (define_insn_and_split "trunctfdf2_inter
  (define_insn "trunctfdf2_internal2"
    [(set (match_operand:DF 0 "gpc_reg_operand" "=f")
  	(float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "f")))]
@@ -578,7 +669,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "fadd %0,%1,%L1"
    [(set_attr "type" "fp")])
-@@ -7881,7 +7882,7 @@
+@@ -8345,7 +8346,7 @@ (define_insn_and_split "trunctfsf2"
    [(set (match_operand:SF 0 "gpc_reg_operand" "=f")
  	(float_truncate:SF (match_operand:TF 1 "gpc_reg_operand" "f")))
     (clobber (match_scratch:DF 2 "=f"))]
@@ -587,7 +678,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "#"
    "&& reload_completed"
-@@ -7894,7 +7895,7 @@
+@@ -8358,7 +8359,7 @@ (define_insn_and_split "trunctfsf2"
  (define_expand "floatsitf2"
    [(set (match_operand:TF 0 "gpc_reg_operand" "=f")
          (float:TF (match_operand:SI 1 "gpc_reg_operand" "r")))]
@@ -596,7 +687,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
  {
    rtx tmp = gen_reg_rtx (DFmode);
-@@ -7922,7 +7923,7 @@
+@@ -8386,7 +8387,7 @@ (define_expand "fix_trunctfsi2"
  	      (clobber (match_dup 3))
  	      (clobber (match_dup 4))
  	      (clobber (match_dup 5))])]
@@ -605,7 +696,7 @@
     && (TARGET_POWER2 || TARGET_POWERPC)
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
  {
-@@ -7939,7 +7940,7 @@
+@@ -8403,7 +8404,7 @@ (define_insn_and_split "*fix_trunctfsi2_
     (clobber (match_operand:DF 3 "gpc_reg_operand" "=&f"))
     (clobber (match_operand:DI 4 "gpc_reg_operand" "=f"))
     (clobber (match_operand:DI 5 "memory_operand" "=o"))]
@@ -614,7 +705,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "#"
    "&& (!no_new_pseudos || offsettable_nonstrict_memref_p (operands[5]))"
-@@ -7960,7 +7961,7 @@
+@@ -8424,7 +8425,7 @@ (define_insn_and_split "*fix_trunctfsi2_
  (define_insn "negtf2"
    [(set (match_operand:TF 0 "gpc_reg_operand" "=f")
  	(neg:TF (match_operand:TF 1 "gpc_reg_operand" "f")))]
@@ -623,7 +714,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "*
  {
-@@ -7975,7 +7976,7 @@
+@@ -8439,7 +8440,7 @@ (define_insn "negtf2"
  (define_expand "abstf2"
    [(set (match_operand:TF 0 "gpc_reg_operand" "=f")
  	(abs:TF (match_operand:TF 1 "gpc_reg_operand" "f")))]
@@ -632,7 +723,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "
  {
-@@ -7995,7 +7996,7 @@
+@@ -8459,7 +8460,7 @@ (define_expand "abstf2_internal"
  			   (label_ref (match_operand 2 "" ""))
  			   (pc)))
     (set (match_dup 6) (neg:DF (match_dup 6)))]
@@ -641,7 +732,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "
  {
-@@ -10934,7 +10935,7 @@
+@@ -11398,7 +11399,7 @@ (define_insn "*cmptf_internal1"
    [(set (match_operand:CCFP 0 "cc_reg_operand" "=y")
  	(compare:CCFP (match_operand:TF 1 "gpc_reg_operand" "f")
  		      (match_operand:TF 2 "gpc_reg_operand" "f")))]
@@ -650,7 +741,7 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "fcmpu %0,%1,%2\;bne %0,$+8\;fcmpu %0,%L1,%L2"
    [(set_attr "type" "fpcompare")
-@@ -10952,7 +10953,7 @@
+@@ -11416,7 +11417,7 @@ (define_insn_and_split "*cmptf_internal2
      (clobber (match_scratch:DF 8 "=f"))
      (clobber (match_scratch:DF 9 "=f"))
      (clobber (match_scratch:DF 10 "=f"))]
@@ -659,9 +750,17 @@
     && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128"
    "#"
    "&& reload_completed"
---- gcc/config/rs6000/aix.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/aix.h	2006-01-28 10:33:14.000000000 +0100
-@@ -38,6 +38,8 @@
+--- gcc/config/rs6000/aix.h	(revision 110228)
++++ gcc/config/rs6000/aix.h	(revision 110836)
+@@ -1,6 +1,6 @@
+ /* Definitions of target machine for GNU compiler,
+    for IBM RS/6000 POWER running AIX.
+-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
++   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
+ 
+    This file is part of GCC.
+@@ -42,6 +42,8 @@
  #define TARGET_ALTIVEC 0
  #undef  TARGET_ALTIVEC_ABI
  #define TARGET_ALTIVEC_ABI 0
@@ -670,30 +769,117 @@
  
  /* The AIX linker will discard static constructors in object files before
     collect has a chance to see them, so scan the object files directly.  */
---- gcc/config/rs6000/linux.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/linux.h	2006-01-28 10:33:14.000000000 +0100
+--- gcc/config/rs6000/linux.h	(revision 110228)
++++ gcc/config/rs6000/linux.h	(revision 110836)
+@@ -1,7 +1,7 @@
+ /* Definitions of target machine for GNU compiler,
+    for PowerPC machines running Linux.
+-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-   Free Software Foundation, Inc.
++   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
++   2004, 2005, 2006 Free Software Foundation, Inc.
+    Contributed by Michael Meissner (meissner at cygnus.com).
+ 
+    This file is part of GCC.
 @@ -118,3 +118,5 @@
  /* ppc32 glibc provides __stack_chk_guard in -0x7008(2).  */
  #define TARGET_THREAD_SSP_OFFSET	-0x7008
  #endif
 +
 +#define POWERPC_LINUX
---- gcc/config/rs6000/sysv4.h.jj	2006-01-28 09:54:04.000000000 +0100
-+++ gcc/config/rs6000/sysv4.h	2006-01-28 10:33:14.000000000 +0100
-@@ -215,6 +215,13 @@ do {									\
+--- gcc/config/rs6000/sysv4.h	(revision 110228)
++++ gcc/config/rs6000/sysv4.h	(revision 110836)
+@@ -1,6 +1,6 @@
+ /* Target definitions for GNU compiler for PowerPC running System V.4
+    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+-   2004, 2005 Free Software Foundation, Inc.
++   2004, 2005, 2006 Free Software Foundation, Inc.
+    Contributed by Cygnus Support.
+ 
+    This file is part of GCC.
+@@ -215,6 +215,10 @@ do {									\
        error ("-msecure-plt not supported by your assembler");		\
      }									\
  									\
++  if (TARGET_SOFT_FLOAT && TARGET_LONG_DOUBLE_128			\
++      && rs6000_explicit_options.long_double)				\
++    warning (0, "-msoft-float and -mlong-double-128 not supported");	\
++									\
+   /* Treat -fPIC the same as -mrelocatable.  */				\
+   if (flag_pic > 1 && DEFAULT_ABI != ABI_AIX)				\
+     target_flags |= MASK_RELOCATABLE | MASK_MINIMAL_TOC | MASK_NO_FP_IN_TOC; \
+--- gcc/config/rs6000/aix43.h	(revision 110228)
++++ gcc/config/rs6000/aix43.h	(revision 110836)
+@@ -1,6 +1,6 @@
+ /* Definitions of target machine for GNU compiler,
+    for IBM RS/6000 POWER running AIX version 4.3.
+-   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
++   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+    Free Software Foundation, Inc.
+    Contributed by David Edelsohn (edelsohn at gnu.org).
+ 
+@@ -43,6 +43,12 @@ do {									\
+       target_flags |= MASK_POWERPC64;					\
+       warning (0, "-maix64 requires PowerPC64 architecture remain enabled"); \
+     }									\
 +  if (TARGET_SOFT_FLOAT && TARGET_LONG_DOUBLE_128)			\
 +    {									\
 +      rs6000_long_double_type_size = 64;				\
 +      if (rs6000_explicit_options.long_double)				\
 +	warning (0, "soft-float and long-double-128 are incompatible");	\
 +    }									\
-+									\
-   /* Treat -fPIC the same as -mrelocatable.  */				\
-   if (flag_pic > 1 && DEFAULT_ABI != ABI_AIX)				\
-     target_flags |= MASK_RELOCATABLE | MASK_MINIMAL_TOC | MASK_NO_FP_IN_TOC; \
+   if (TARGET_POWERPC64 && ! TARGET_64BIT)				\
+     {									\
+       error ("-maix64 required: 64-bit computation with 32-bit addressing not yet supported"); \
+--- gcc/config/rs6000/aix52.h	(revision 110228)
++++ gcc/config/rs6000/aix52.h	(revision 110836)
+@@ -1,6 +1,6 @@
+ /* Definitions of target machine for GNU compiler,
+    for IBM RS/6000 POWER running AIX V5.2.
+-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+    Contributed by David Edelsohn (edelsohn at gnu.org).
+ 
+    This file is part of GCC.
+@@ -42,6 +42,12 @@ do {									\
+       target_flags |= MASK_POWERPC64;					\
+       warning (0, "-maix64 requires PowerPC64 architecture remain enabled"); \
+     }									\
++  if (TARGET_SOFT_FLOAT && TARGET_LONG_DOUBLE_128)			\
++    {									\
++      rs6000_long_double_type_size = 64;				\
++      if (rs6000_explicit_options.long_double)				\
++	warning (0, "soft-float and long-double-128 are incompatible");	\
++    }									\
+   if (TARGET_POWERPC64 && ! TARGET_64BIT)				\
+     {									\
+       error ("-maix64 required: 64-bit computation with 32-bit addressing not yet supported"); \
+--- gcc/config/rs6000/t-aix43	(revision 110228)
++++ gcc/config/rs6000/t-aix43	(revision 110836)
+@@ -67,7 +67,9 @@ SHLIB_MAPFILES = $(srcdir)/libgcc-std.ve
+ SHLIB_NM_FLAGS = -Bpg -X32_64
+ 
+ # GCC 128-bit long double support routines.
+-LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/darwin-ldouble.c
++LIB2FUNCS_EXTRA =  $(srcdir)/config/rs6000/ppc64-fp.c \
++	$(srcdir)/config/rs6000/darwin-ldouble.c
++TARGET_LIBGCC2_CFLAGS = -mlong-double-128
+ 
+ # Either 32-bit and 64-bit objects in archives.
+ AR_FLAGS_FOR_TARGET = -X32_64
+--- gcc/config/rs6000/t-aix52	(revision 110228)
++++ gcc/config/rs6000/t-aix52	(revision 110836)
+@@ -48,7 +48,9 @@ SHLIB_MAPFILES = $(srcdir)/libgcc-std.ve
+ SHLIB_NM_FLAGS = -Bpg -X32_64
+ 
+ # GCC 128-bit long double support routines.
+-LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/darwin-ldouble.c
++LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/ppc64-fp.c \
++	$(srcdir)/config/rs6000/darwin-ldouble.c
++TARGET_LIBGCC2_CFLAGS = -mlong-double-128
+ 
+ # Either 32-bit and 64-bit objects in archives.
+ AR_FLAGS_FOR_TARGET = -X32_64
 --- gcc/config/fp-bit.h.jj	2006-01-28 09:54:06.000000000 +0100
 +++ gcc/config/fp-bit.h	2006-01-28 10:33:14.000000000 +0100
 @@ -87,7 +87,9 @@ Boston, MA 02110-1301, USA.  */


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gcc41.spec	6 Feb 2006 10:04:21 -0000	1.29
+++ gcc41.spec	10 Feb 2006 15:19:31 -0000	1.30
@@ -1,6 +1,6 @@
-%define DATE 20060206
+%define DATE 20060210
 %define gcc_version 4.1.0
-%define gcc_release 0.23
+%define gcc_release 0.24
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -72,6 +72,14 @@
 Requires: libgomp = %{version}-%{release}
 Obsoletes: gcc3
 Obsoletes: egcs
+%ifarch sparc
+Obsoletes: gcc-sparc32
+Obsoletes: gcc-c++-sparc32
+%endif
+%ifarch ppc
+Obsoletes: gcc-ppc32
+Obsoletes: gcc-c++-ppc32
+%endif
 Obsoletes: gcc-chill
 %if !%{build_ada}
 Obsoletes: gcc-gnat < %{version}-%{release}
@@ -92,8 +100,6 @@
 Patch3: gcc41-ia64-libunwind.patch
 Patch4: gcc41-gnuc-rh-release.patch
 Patch5: gcc41-java-nomulti.patch
-Patch6: gcc41-multi32-hack.patch
-Patch7: gcc41-gc-pthread_create.patch
 Patch8: gcc41-ada-pr18302.patch
 Patch9: gcc41-ada-tweaks.patch
 Patch10: gcc41-ia64-frame-base-loclist.patch
@@ -331,56 +337,6 @@
 %description -n libgcj-src
 The Java(tm) runtime library sources for use in Eclipse.
 
-%package sparc32
-Summary: The C compiler optimized for generating SPARC 32bit code
-Group: Development/Languages
-Requires: gcc = %{version}-%{release}, %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
-Autoreq: true
-
-%description sparc32
-This package contains the GNU C compiler which only supports generating
-32bit SPARC code, but should be faster than the 32/64bit gcc package. You
-should install this package if you want to trade disk space required for
-this package for faster compilation of 32bit code.
-
-%package c++-sparc32
-Summary: The C++ compiler optimized for generating SPARC 32bit code
-Group: Development/Languages
-Requires: gcc-c++ = %{version}-%{release}, gcc-sparc32 = %{version}-%{release}
-Requires: %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.so
-Autoreq: true
-
-%description c++-sparc32
-This package contains the GNU C++ compiler which only supports generating
-32bit SPARC code, but should be faster than the 32/64bit gcc package. You
-should install this package if you want to trade disk space required for
-this package for faster compilation of 32bit code.
-
-%package ppc32
-Summary: The C compiler optimized for generating PowerPC 32bit code
-Group: Development/Languages
-Requires: gcc = %{version}-%{release}, %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
-Autoreq: true
-
-%description ppc32
-This package contains the GNU C compiler which only supports generating
-32bit PowerPC code, but should be faster than the 32/64bit gcc package. You
-should install this package if you want to trade disk space required for
-this package for faster compilation of 32bit code.
-
-%package c++-ppc32
-Summary: The C++ compiler optimized for generating PowerPC 32bit code
-Group: Development/Languages
-Requires: gcc-c++ = %{version}-%{release}, gcc-ppc32 = %{version}-%{release}
-Requires: %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libstdc++.so
-Autoreq: true
-
-%description c++-ppc32
-This package contains the GNU C++ compiler which only supports generating
-32bit PowerPC code, but should be faster than the 32/64bit gcc package. You
-should install this package if you want to trade disk space required for
-this package for faster compilation of 32bit code.
-
 %package -n cpp
 Summary: The C Preprocessor.
 Group: Development/Languages
@@ -441,10 +397,6 @@
 %patch3 -p0 -b .ia64-libunwind~
 %patch4 -p0 -b .gnuc-rh-release~
 %patch5 -p0 -b .java-nomulti~
-%ifarch ppc sparc
-%patch6 -p0 -b .multi32-hack~
-%endif
-%patch7 -p0 -b .gc-pthread_create~
 %patch8 -p0 -b .ada-pr18302~
 %patch9 -p0 -b .ada-tweaks~
 %patch10 -p0 -b .ia64-frame-base-loclist~
@@ -596,23 +548,6 @@
 # Make protoize
 make -C gcc CC="./xgcc -B ./ -O2" proto
 
-%ifarch sparc ppc
-# Build the -m32 only compiler which does not use long long for HOST_WIDE_INT
-mkdir gcc32
-cd gcc32
-OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fno-rtti//g' -e 's/-fno-exceptions//g'`
-echo "#!/bin/sh" > gcc32
-echo "exec `cd ../gcc; pwd`/xgcc -B `cd ../gcc; pwd`/ $OPT_FLAGS "'"$@"' >> gcc32
-chmod +x gcc32
-CC=`pwd`/gcc32 CFLAGS="$OPT_FLAGS" CXXFLAGS="$OPT_FLAGS" XCFLAGS="$OPT_FLAGS" \
-  TCFLAGS="$OPT_FLAGS" ../../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-  --enable-shared --enable-threads=posix --enable-checking=release --disable-libunwind-exceptions \
-  --with-system-zlib --enable-__cxa_atexit --enable-languages=c,c++ \
-  --host=%{_target_platform} --build=%{_target_platform} --target=%{_target_platform}
-make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" all-gcc 
-cd ..
-%endif
-
 # Make generated man pages even if Pod::Man is not new enough
 perl -pi -e 's/head3/head2/' ../contrib/texi2pod.pl
 for i in ../gcc/doc/*.texi; do
@@ -726,27 +661,11 @@
   fi
 done
 
-%ifarch sparc ppc
-# Install the sparc/ppc -m32 only compilers
-FULLPATH32=$RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{_target_platform}/%{gcc_version}
-FULLEPATH32=$RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}
-mkdir -p $FULLPATH32 $FULLEPATH32
-ln -sf %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include \
-  $FULLPATH32/
-install -m 755 gcc32/gcc/cc1 $FULLEPATH32/
-install -m 755 gcc32/gcc/cc1plus $FULLEPATH32/
-ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
-  $RPM_BUILD_ROOT%{_prefix}/bin/%{_target_platform}-gcc
-%endif
-%ifarch sparc ppc
-cp -al $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{gcc_target_platform} \
-  $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_version}/%{_target_platform}
-%endif
-%ifarch sparc64
+%ifarch sparc sparc64
 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
 %endif
-%ifarch ppc64
+%ifarch ppc ppc64
 ln -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target_platform}-gcc \
   $RPM_BUILD_ROOT%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
 %endif
@@ -1508,47 +1427,17 @@
 %endif
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
-%ifarch sparc
-%files sparc32
-%defattr(-,root,root)
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{_target_platform}
-%dir %{_prefix}/lib/gcc/%{_target_platform}/%{gcc_version}
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{_target_platform}
-%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}
-%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}/cc1
-%{_prefix}/lib/gcc/%{_target_platform}/%{gcc_version}/include
-
-%files c++-sparc32
-%defattr(-,root,root)
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{_target_platform}
-%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}
-%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}/cc1plus
-%endif
-
-%ifarch ppc
-%files ppc32
-%defattr(-,root,root)
-%dir %{_prefix}/lib/gcc
-%dir %{_prefix}/lib/gcc/%{_target_platform}
-%dir %{_prefix}/lib/gcc/%{_target_platform}/%{gcc_version}
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{_target_platform}
-%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}
-%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}/cc1
-%{_prefix}/lib/gcc/%{_target_platform}/%{gcc_version}/include
-
-%files c++-ppc32
-%defattr(-,root,root)
-%dir %{_prefix}/libexec/gcc
-%dir %{_prefix}/libexec/gcc/%{_target_platform}
-%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}
-%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_version}/cc1plus
-%endif
-
 %changelog
+* Fri Feb 10 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.24
+- update from gcc-4_1-branch (-r110632:110831)
+  - PRs tree-opt/26180, c++/26070, c++/26071, fortran/25577, java/26192,
+	libfortran/23815, libstdc++/26127, target/23359, target/26109,
+	tree-opt/25251
+- remove gcc-ppc32, gcc-c++-ppc32, gcc-sparc32 and gcc-c++-sparc32
+  subpackages, they do more harm than good.  Particularly this time
+  gcc*ppc32 and gcc*sparc32 defaulted to DFmode long double rather
+  than TFmode long double
+
 * Mon Feb  6 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.23
 - update from gcc-4_1-branch (-r110582:110632)
   - PRs classpath/24618, classpath/25141, classpath/25727, fortran/25046,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sources	6 Feb 2006 10:04:21 -0000	1.133
+++ sources	10 Feb 2006 15:19:31 -0000	1.134
@@ -1 +1 @@
-2411c297b2de7b306228701906031c10  gcc-4.1.0-20060206.tar.bz2
+36ce392e2b0466ebd1960456561bac5b  gcc-4.1.0-20060210.tar.bz2


--- gcc41-gc-pthread_create.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:21:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:21:26 -0500
Subject: rpms/eclipse/FC-4 eclipse-tomcat5-build.3.patch, NONE,
	1.1 eclipse.spec, 1.173, 1.174
Message-ID: <200602101521.k1AFLQsn012808@cvs.devel.redhat.com>

Author: bkonrath

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

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-tomcat5-build.3.patch 
Log Message:
Make platform/feature.xml reference the tomcat5 plugin.


eclipse-tomcat5-build.3.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-tomcat5-build.3.patch ---
diff -ru eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml eclipse-3.1.2/features/org.eclipse.platform/build.xml
--- eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml	2006-02-10 01:01:11.000000000 -0500
+++ eclipse-3.1.2/features/org.eclipse.platform/build.xml	2006-02-10 01:07:56.000000000 -0500
@@ -346,7 +346,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="copybuiltlauncher" if="libsconfig">


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- eclipse.spec	10 Feb 2006 05:45:06 -0000	1.173
+++ eclipse.spec	10 Feb 2006 15:21:22 -0000	1.174
@@ -80,6 +80,7 @@
 Patch28: 	%{name}-tomcat5.patch
 Patch29: 	%{name}-tomcat5-build.patch
 Patch30: 	%{name}-tomcat5-build.2.patch
+Patch50: 	%{name}-tomcat5-build.3.patch
 Patch31: 	%{name}-webapp-tomcat5.patch
 # We don't have cairo in FC4
 Patch32:	%{name}-swt-nocairo.fc4.patch
@@ -356,6 +357,7 @@
 %patch29 -p0
 popd
 %patch30 -p0
+%patch50 -p1
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
@@ -1262,6 +1264,7 @@
 %changelog
 * Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_5fc.FC4
 - Update the rebuild-sdk-features script to use the 3.1 updatesite.
+- Make platform/feature.xml reference the tomcat5 plugin.
 
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc.FC4
 - Always generate debug info when building RPMs (Andrew Haley).



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:22:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:22:56 -0500
Subject: rpms/yum/devel yum-2.5-comps-conditional.patch, NONE,
	1.1 yum-2.5-plugin-groups.patch, NONE, 1.1 yum.spec, 1.78, 1.79
Message-ID: <200602101522.k1AFMuQb013526@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13486

Modified Files:
	yum.spec 
Added Files:
	yum-2.5-comps-conditional.patch yum-2.5-plugin-groups.patch 
Log Message:
group work

yum-2.5-comps-conditional.patch:
 comps.py |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

--- NEW FILE yum-2.5-comps-conditional.patch ---
--- ./yum/comps.py.condcomps	2006-01-05 00:31:00.000000000 -0500
+++ ./yum/comps.py	2006-02-10 09:42:21.000000000 -0500
@@ -45,6 +45,7 @@
         self.mandatory_packages = {}
         self.optional_packages = {}
         self.default_packages = {}
+        self.conditional_packages = {}
         self.langonly = None ## what the hell is this?
         self.groupid = None
         self.display_order = 1024
@@ -61,7 +62,8 @@
     def _packageiter(self):
         lst = self.mandatory_packages.keys() + \
               self.optional_packages.keys() + \
-              self.default_packages.keys()
+              self.default_packages.keys() + \
+              self.conditional_packages.keys() 
         
         return lst
     
@@ -137,7 +139,7 @@
                 if not type:
                     type = u'mandatory'
 
-                if type not in ('mandatory', 'default', 'optional'):
+                if type not in ('mandatory', 'default', 'optional', 'conditional'):
                     raise CompsException
 
                 package = child.text
@@ -147,6 +149,10 @@
                     self.default_packages[package] = 1
                 elif type == 'optional':
                     self.optional_packages[package] = 1
+                elif type == 'conditional':
+                    self.conditional_packages[package] = child.attrib.get('requires')
+
+
 
     def add(self, obj):
         """Add another group object to this object"""
@@ -160,6 +166,8 @@
             self.default_packages[pkg] = 1
         for pkg in obj.optional_packages.keys():
             self.optional_packages[pkg] = 1
+        for pkg in obj.conditional_packages.keys():
+            self.conditional_packages[pkg] = obj.conditional_packages[pkg]
         
         # name and description translations
         for lang in obj.translated_name.keys():
@@ -369,7 +377,7 @@
             # optional/default packages installed.
             # If so - then the group is installed
             else:
-                check_pkgs = group.optional_packages.keys() + group.default_packages.keys()
+                check_pkgs = group.optional_packages.keys() + group.default_packages.keys() + group.conditional_packages.keys()
                 group.installed = False
                 for pkgname in check_pkgs:
                     if inst_pkg_names.has_key(pkgname):

yum-2.5-plugin-groups.patch:
 plugins.py |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

--- NEW FILE yum-2.5-plugin-groups.patch ---
--- ./yum/plugins.py.plugingrp	2005-12-12 00:51:35.000000000 -0500
+++ ./yum/plugins.py	2006-02-10 09:45:05.000000000 -0500
@@ -82,7 +82,7 @@
 # API, the major version number must be incremented and the minor version number
 # reset to 0. If a change is made that doesn't break backwards compatibility,
 # then the minor number must be incremented.
-API_VERSION = '2.1'
+API_VERSION = '2.2'
 
 # Plugin types
 TYPE_CORE = 0
@@ -95,8 +95,8 @@
     'init': 'InitPluginConduit',
     'predownload': 'DownloadPluginConduit',
     'postdownload': 'DownloadPluginConduit',
-    'prereposetup': 'RepoSetupPluginConduit',
-    'postreposetup': 'RepoSetupPluginConduit',
+    'prereposetup': 'PreRepoSetupPluginConduit',
+    'postreposetup': 'PostRepoSetupPluginConduit',
     'close': 'PluginConduit',
     'pretrans': 'MainPluginConduit',
     'posttrans': 'MainPluginConduit',
@@ -428,7 +428,7 @@
         '''
         return self._base.repos
 
-class RepoSetupPluginConduit(InitPluginConduit):
+class PreRepoSetupPluginConduit(InitPluginConduit):
 
     def getCmdLine(self):
         '''Return parsed command line options.
@@ -447,10 +447,20 @@
         self._base.doRpmDBSetup()
         return self._base.rpmdb
 
-class DownloadPluginConduit(RepoSetupPluginConduit):
+class PostRepoSetupPluginConduit(PreRepoSetupPluginConduit):
+
+    def getGroups(self):
+        '''Return group information.
+
+        @return: yum.comps.Comps instance
+        '''
+        self._base.doGroupSetup()
+        return self._base.comps
+
+class DownloadPluginConduit(PostRepoSetupPluginConduit):
 
     def __init__(self, parent, base, conf, pkglist, errors=None):
-        RepoSetupPluginConduit.__init__(self, parent, base, conf)
+        PostRepoSetupPluginConduit.__init__(self, parent, base, conf)
         self._pkglist = pkglist
         self._errors = errors
 
@@ -470,7 +480,7 @@
             return {}
         return self._errors
 
-class MainPluginConduit(RepoSetupPluginConduit):
+class MainPluginConduit(PostRepoSetupPluginConduit):
 
     def getPackages(self, repo=None):
         if repo:


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- yum.spec	3 Feb 2006 20:00:22 -0000	1.78
+++ yum.spec	10 Feb 2006 15:22:54 -0000	1.79
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.5.1
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz
@@ -17,6 +17,8 @@
 Patch2: yum-2.5-sortedconstants.patch
 Patch3: yum-2.5-sortedtransaction.patch
 Patch4: yum-2.5-tsinfo-factory.patch
+Patch5: yum-2.5-plugin-groups.patch
+Patch6: yum-2.5-comps-conditional.patch
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -41,6 +43,8 @@
 %patch2 -p0 -b .sortedconstants
 %patch3 -p0 -b .sortedtransaction
 %patch4 -p0 -b .tsinfofactory
+%patch5 -p0 -b .plugingrp
+%patch6 -p0 -b .condcomps
 
 %build
 make
@@ -102,6 +106,9 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Fri Feb 10 2006 Paul Nasrat <pnasrat at redhat.com> - 2.5.1-5
+- Merge patches from head for group plugin support and conditionals
+
 * Fri Feb 03 2006 Paul Nasrat <pnasrat at redhat.com> - 2.5.1-4
 - Fix group unselect traceback (cf #177737)
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:28:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:28:35 -0500
Subject: rpms/python/devel python.spec,1.63,1.64
Message-ID: <200602101528.k1AFSZ0h016128@cvs.devel.redhat.com>

Author: misa

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

Modified Files:
	python.spec 
Log Message:
Rebuilt for newer tix


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- python.spec	7 Feb 2006 13:39:46 -0000	1.63
+++ python.spec	10 Feb 2006 15:28:32 -0000	1.64
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.2
-Release: 3.1
+Release: 3.2
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -359,6 +359,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:29:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:29:23 -0500
Subject: rpms/gcc/devel gcc41-ada-pr18302.patch,1.1,1.2
Message-ID: <200602101529.k1AFTNrb016275@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16202

Modified Files:
	gcc41-ada-pr18302.patch 
Log Message:
4.1.0-0.24


gcc41-ada-pr18302.patch:
 0 files changed

Index: gcc41-ada-pr18302.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-ada-pr18302.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-ada-pr18302.patch	29 Nov 2005 19:55:44 -0000	1.1
+++ gcc41-ada-pr18302.patch	10 Feb 2006 15:29:19 -0000	1.2
@@ -70,6 +70,6 @@
  	test -d $(ACATSDIR) || mkdir -p $(ACATSDIR)
  	testdir=`cd ${srcdir}/${ACATSDIR}; ${PWD_COMMAND}`; \
 +	EXPECT=${EXPECT} ; export EXPECT ; \
- 	export testdir; cd $(ACATSDIR); $${testdir}/run_acats $(CHAPTERS)
+ 	export testdir; cd $(ACATSDIR); $(SHELL) $${testdir}/run_acats $(CHAPTERS)
  
  .PHONY: check-gnat



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:31:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:31:04 -0500
Subject: rpms/eclipse/devel eclipse-tomcat5-build.3.patch, NONE,
	1.1 eclipse.spec, 1.243, 1.244
Message-ID: <200602101531.k1AFV46c016449@cvs.devel.redhat.com>

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16385

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-tomcat5-build.3.patch 
Log Message:
Make platform/feature.xml reference the tomcat5 plugin.


eclipse-tomcat5-build.3.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-tomcat5-build.3.patch ---
diff -ru eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml eclipse-3.1.2/features/org.eclipse.platform/build.xml
--- eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml	2006-02-10 01:01:11.000000000 -0500
+++ eclipse-3.1.2/features/org.eclipse.platform/build.xml	2006-02-10 01:07:56.000000000 -0500
@@ -346,7 +346,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.0.30,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="copybuiltlauncher" if="libsconfig">


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- eclipse.spec	10 Feb 2006 14:52:02 -0000	1.243
+++ eclipse.spec	10 Feb 2006 15:30:47 -0000	1.244
@@ -81,6 +81,7 @@
 Patch28: 	%{name}-tomcat5.patch
 Patch29: 	%{name}-tomcat5-build.patch
 Patch30: 	%{name}-tomcat5-build.2.patch
+Patch50:        %{name}-tomcat5-build.3.patch
 Patch31: 	%{name}-webapp-tomcat5.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 
 Patch33:        %{name}-compare-create-api.patch
@@ -365,6 +366,7 @@
 %patch29 -p0
 popd
 %patch30 -p0
+%patch50 -p1
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
@@ -1279,6 +1281,7 @@
 %changelog
 * Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
 - Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
+- Make platform/feature.xml reference the tomcat5 plugin.
 
 * Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
 - Use new java-1.4.2-gcj-compat-javadoc package.



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:35:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:35:42 -0500
Subject: rpms/gcc/devel gcc41.spec, 1.30,
	1.31 gcc41-ia64-frame-base-loclist.patch, 1.4, NONE
Message-ID: <200602101535.k1AFZgof016943@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16917

Modified Files:
	gcc41.spec 
Removed Files:
	gcc41-ia64-frame-base-loclist.patch 
Log Message:
4.1.0-0.24



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gcc41.spec	10 Feb 2006 15:19:31 -0000	1.30
+++ gcc41.spec	10 Feb 2006 15:35:39 -0000	1.31
@@ -102,7 +102,6 @@
 Patch5: gcc41-java-nomulti.patch
 Patch8: gcc41-ada-pr18302.patch
 Patch9: gcc41-ada-tweaks.patch
-Patch10: gcc41-ia64-frame-base-loclist.patch
 Patch11: gcc41-java-slow_pthread_self.patch
 Patch12: gcc41-fortran-finclude.patch
 Patch13: gcc41-ppc32-retaddr.patch
@@ -399,7 +398,6 @@
 %patch5 -p0 -b .java-nomulti~
 %patch8 -p0 -b .ada-pr18302~
 %patch9 -p0 -b .ada-tweaks~
-%patch10 -p0 -b .ia64-frame-base-loclist~
 %patch11 -p0 -b .java-slow_pthread_self~
 %patch12 -p0 -b .fortran-finclude~
 %patch13 -p0 -b .ppc32-retaddr~


--- gcc41-ia64-frame-base-loclist.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:37:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:37:15 -0500
Subject: rpms/gcc/devel gcc41.spec, 1.31, 1.32 gcc41-java-rh179070.patch, 1.1,
	NONE
Message-ID: <200602101537.k1AFbFSA017161@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17143

Modified Files:
	gcc41.spec 
Removed Files:
	gcc41-java-rh179070.patch 
Log Message:
4.1.0-0.24



Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gcc41.spec	10 Feb 2006 15:35:39 -0000	1.31
+++ gcc41.spec	10 Feb 2006 15:37:12 -0000	1.32
@@ -110,7 +110,6 @@
 Patch16: gcc41-ldbl-default.patch
 Patch17: gcc41-ldbl-default-libstdc++.patch
 Patch18: gcc41-sparc64-g7.patch
-Patch19: gcc41-java-rh179070.patch
 Patch20: gcc41-fortran-where.patch
 
 %define _gnu %{nil}
@@ -406,7 +405,6 @@
 %patch16 -p0 -b .ldbl-default~
 %patch17 -p0 -b .ldbl-default-libstdc++~
 %patch18 -p0 -b .sparc64-g7~
-%patch19 -p0 -b .java-rh179070~
 %patch20 -p0 -b .fortran-where~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c


--- gcc41-java-rh179070.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:43:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:43:39 -0500
Subject: rpms/oprofile/FC-4 oprofile_opcontrol.patch, NONE, 1.1 oprofile.spec,
	1.28, 1.29
Message-ID: <200602101543.k1AFhdHX020046@cvs.devel.redhat.com>

Author: wcohen

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

Modified Files:
	oprofile.spec 
Added Files:
	oprofile_opcontrol.patch 
Log Message:
Use full path for which and dirname in opcontrol.



oprofile_opcontrol.patch:
 opcontrol |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE oprofile_opcontrol.patch ---
--- oprofile-0.8.1/utils/opcontrol.orig	2006-02-10 10:08:05.000000000 -0500
+++ oprofile-0.8.1/utils/opcontrol	2006-02-10 10:09:15.000000000 -0500
@@ -1340,8 +1340,9 @@
 # main
 
 # determine the location of opcontrol and related programs
-OPCONTROL=`which $0`
-OPDIR=`dirname $OPCONTROL`
+BINDIR="/usr/bin"
+OPCONTROL=`$BINDIR/which $0`
+OPDIR=`$BINDIR/dirname $OPCONTROL`
 
 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/FC-4/oprofile.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- oprofile.spec	13 Apr 2005 15:04:23 -0000	1.28
+++ oprofile.spec	10 Feb 2006 15:43:36 -0000	1.29
@@ -1,6 +1,6 @@
 %define DATE 20050405
 %define oprofile_version 0.8.2
-%define oprofile_release 4
+%define oprofile_release 5
 Summary: System wide profiler
 Name: oprofile
 Version: 0.8.2
@@ -17,6 +17,7 @@
 Patch63: oprofile-0.7-libs.patch
 #Patch79: oprofile-0.8.1-power970.patch
 Patch80: oprofile-0.8.2-ppc64dot.patch
+Patch82: oprofile_opcontrol.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
@@ -54,6 +55,7 @@
 #%patch35 -p1 -b .separate
 %patch63 -p1 -b .libs
 %patch80 -p1 -b .ppc64dot
+%patch82 -p1 -b .opcontrol
 
 ./autogen.sh
 
@@ -229,6 +231,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Will Cohen <wcohen at redhat.com>
+- Complete path for which and dirname in opcontrol.
+
 * Wed Apr 13 2005 Will Cohen <wcohen at redhat.com>
 - Add which dependency.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 15:47:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 10:47:25 -0500
Subject: rpms/oprofile/devel oprofile_opcontrol.patch, NONE,
	1.1 oprofile.spec, 1.37, 1.38
Message-ID: <200602101547.k1AFlPEu001636@cvs.devel.redhat.com>

Author: wcohen

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1481

Modified Files:
	oprofile.spec 
Added Files:
	oprofile_opcontrol.patch 
Log Message:
Use the full path for which and dirname in opcontrol.



oprofile_opcontrol.patch:
 opcontrol |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE oprofile_opcontrol.patch ---
--- oprofile-0.8.1/utils/opcontrol.orig	2006-02-10 10:08:05.000000000 -0500
+++ oprofile-0.8.1/utils/opcontrol	2006-02-10 10:09:15.000000000 -0500
@@ -1340,8 +1340,9 @@
 # main
 
 # determine the location of opcontrol and related programs
-OPCONTROL=`which $0`
-OPDIR=`dirname $OPCONTROL`
+BINDIR="/usr/bin"
+OPCONTROL=`$BINDIR/which $0`
+OPDIR=`$BINDIR/dirname $OPCONTROL`
 
 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- oprofile.spec	7 Feb 2006 13:22:50 -0000	1.37
+++ oprofile.spec	10 Feb 2006 15:47:22 -0000	1.38
@@ -1,6 +1,6 @@
 %define DATE 200511111
 %define oprofile_version 0.9.1
-%define oprofile_release 7
+%define oprofile_release 8
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
@@ -18,6 +18,7 @@
 #Patch79: oprofile-0.8.1-power970.patch
 #Patch80: oprofile-0.8.2-ppc64dot.patch
 Patch81: oprofile-0.9.1-anon.patch
+Patch82: oprofile_opcontrol.patch
 
 URL: http://oprofile.sf.net
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x alpha alphaev6 sparc sparc64
@@ -56,6 +57,7 @@
 %patch63 -p1 -b .libs
 #%patch80 -p1 -b .ppc64dot
 %patch81 -p1 -b .anon
+%patch82 -p1 -b .opcontrol
 
 ./autogen.sh
 
@@ -231,6 +233,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Will Cohen <wcohen at redhat.com>
+- Complete path for which and dirname in opcontrol.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:16:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:16:27 -0500
Subject: rpms/gnome-applet-vm/devel .cvsignore, 1.3, 1.4 gnome-applet-vm.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200602101616.k1AGGRFh019132@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gnome-applet-vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18893

Modified Files:
	.cvsignore gnome-applet-vm.spec sources 
Log Message:
new upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 Jan 2006 19:38:50 -0000	1.3
+++ .cvsignore	10 Feb 2006 16:16:24 -0000	1.4
@@ -1 +1 @@
-gnome-applet-vm-0.0.5.tar.gz
+gnome-applet-vm-0.0.6.tar.gz


Index: gnome-applet-vm.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/gnome-applet-vm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applet-vm.spec	9 Feb 2006 22:33:01 -0000	1.5
+++ gnome-applet-vm.spec	10 Feb 2006 16:16:24 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Simple virtual domains monitor which embed themselves in the GNOME panel
 Name: gnome-applet-vm
-Version: 0.0.5
-Release: 1.2
+Version: 0.0.6
+Release: 1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-applet-vm-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 0.0.6-1
+- new upstream version
+
 * Thu Feb  9 2006 Daniel Veillard <veillard at redhat.com> - 0.0.5-1.2
 - rebuilt to update depends on libvirt following library rename
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applet-vm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Jan 2006 19:38:50 -0000	1.3
+++ sources	10 Feb 2006 16:16:24 -0000	1.4
@@ -1 +1 @@
-f0c401a39ecaaacdbd2f304b1d551032  gnome-applet-vm-0.0.5.tar.gz
+664b870e292233ebd05bd8dd56c06692  gnome-applet-vm-0.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:20:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:20:28 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.55,1.56
Message-ID: <200602101620.k1AGKSw2025334@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
test x86_64 aloun


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kernel-xen.spec	10 Feb 2006 03:54:43 -0000	1.55
+++ kernel-xen.spec	10 Feb 2006 16:20:25 -0000	1.56
@@ -160,7 +160,7 @@
 Version: %{rpmversion}
 Release: %{release}
 #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch:noarch i686
+ExclusiveArch:noarch x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:28:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:28:33 -0500
Subject: rpms/system-config-lvm/devel .cvsignore, 1.19, 1.20 sources, 1.19,
	1.20 system-config-lvm.spec, 1.20, 1.21
Message-ID: <200602101628.k1AGSXeq029136@cvs.devel.redhat.com>

Author: kupcevic

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

Modified Files:
	.cvsignore sources system-config-lvm.spec 
Log Message:
auto-import system-config-lvm-1.0.13-1.0 on branch devel from system-config-lvm-1.0.13-1.0.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	7 Feb 2006 19:55:59 -0000	1.19
+++ .cvsignore	10 Feb 2006 16:28:30 -0000	1.20
@@ -1 +1 @@
-system-config-lvm-1.0.12.tar.gz
+system-config-lvm-1.0.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	7 Feb 2006 19:55:59 -0000	1.19
+++ sources	10 Feb 2006 16:28:30 -0000	1.20
@@ -1 +1 @@
-a9beb0b714f4887aa808d9c92a278c3e  system-config-lvm-1.0.12.tar.gz
+9f717ee1b787ab5bbade50cf9e072bd5  system-config-lvm-1.0.13.tar.gz


Index: system-config-lvm.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- system-config-lvm.spec	7 Feb 2006 19:55:59 -0000	1.20
+++ system-config-lvm.spec	10 Feb 2006 16:28:30 -0000	1.21
@@ -1,7 +1,7 @@
 # -*- RPM-SPEC -*-
 Summary: A utility for graphically configuring Logical Volumes.
 Name: system-config-lvm
-Version: 1.0.12
+Version: 1.0.13
 Release: 1.0
 URL: http://www.redhat.com/ 
 Source0: %{name}-%{version}.tar.gz
@@ -51,6 +51,8 @@
 %config %{_sysconfdir}/security/console.apps/system-config-lvm
 
 %changelog
+* 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
   - Under certain conditions, labels might show partially
 * Fri Feb 03 2006 Stanko Kupcevic <kupcevic at redhat.com> 1.0.11-1.0



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:38:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:38:00 -0500
Subject: rpms/tix/devel tix-8.4.0-soname.patch,NONE,1.1 tix.spec,1.10,1.11
Message-ID: <200602101638.k1AGc073028004@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30955

Modified Files:
	tix.spec 
Added Files:
	tix-8.4.0-soname.patch 
Log Message:
Patched Makefile to add SONAME to libTix8.4.so, bumped release number.


tix-8.4.0-soname.patch:
 Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tix-8.4.0-soname.patch ---
--- tix-8.4.0/Makefile.in.soname	2004-12-23 20:55:38.000000000 -0500
+++ tix-8.4.0/Makefile.in	2006-02-10 11:35:17.000000000 -0500
@@ -115,7 +115,7 @@
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
-LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname=$(PKG_LIB_FILE)
 MAKE_LIB	= @MAKE_LIB@
 MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
 MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
@@ -125,7 +125,7 @@
 RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
-SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@ $(LDFLAGS_DEFAULT)
 SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
 STLIB_LD	= @STLIB_LD@
 TCL_DEFS	= @TCL_DEFS@


Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tix.spec	7 Feb 2006 18:34:18 -0000	1.10
+++ tix.spec	10 Feb 2006 16:37:57 -0000	1.11
@@ -5,12 +5,13 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 2
+Release: 3
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
 Source0: http://tix.sourceforge.net/dist/tix-%{version}.tar.gz
 Patch0: tix-%{version}-relid.patch
+Patch1: tix-%{version}-soname.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
 Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .relid
+%patch1 -p1 -b .soname
 
 # patch 0 touches tcl.m4
 autoconf
@@ -121,6 +123,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-3
+- Added missing SONAME to libTix8.4.so
+
 * Tue Feb 07 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-2
 - Better use of macros in the install and files sections
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:42:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:42:09 -0500
Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.9,
	1.10 libsemanage.spec, 1.72, 1.73
Message-ID: <200602101642.k1AGg9ow025338@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25322

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.21-2
- Fix handling of seusers and users_map file


libsemanage-rhat.patch:
 direct_api.c |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsemanage-rhat.patch	14 Jan 2006 04:52:46 -0000	1.9
+++ libsemanage-rhat.patch	10 Feb 2006 16:42:07 -0000	1.10
@@ -1,42 +1,57 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-1.5.14/Makefile
---- nsalibsemanage/Makefile	2006-01-05 10:33:10.000000000 -0500
-+++ libsemanage-1.5.14/Makefile	2006-01-13 23:46:32.000000000 -0500
-@@ -1,11 +1,17 @@
- all: 
- 	$(MAKE) -C src all
- 
-+pywrap: 
-+	$(MAKE) -C src pywrap
+diff -Naurp --exclude-from excludes old/libsemanage/src/direct_api.c new/libsemanage/src/direct_api.c
+--- old/libsemanage/src/direct_api.c	2006-02-08 03:20:08.000000000 -0500
++++ new/libsemanage/src/direct_api.c	2006-02-09 19:14:15.000000000 -0500
+@@ -475,7 +475,7 @@ static int semanage_direct_commit(semana
+ 
+ 		/* ==================== File-backed ================== */
+ 
+-		/* write the linked file contexts template */
++		/* File Contexts */
+ 		if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL ||
+ 		    write_file(sh, ofilename, sepol_module_package_get_file_contexts(base), 
+ 				sepol_module_package_get_file_contexts_len(base)) == -1) {
+@@ -484,29 +484,36 @@ static int semanage_direct_commit(semana
+ 
+ 		if (semanage_split_fc(sh)) 
+ 			goto cleanup;
+-	
 +
- install: 
- 	$(MAKE) -C include install
- 	$(MAKE) -C src install
- 	$(MAKE) -C man install
- 
-+install-pywrap: 
-+	$(MAKE) -C src install-pywrap
++		pfcontexts->dtable->drop_cache(pfcontexts->dbase);
 +
- relabel:
++		/* Seusers */
+ 		if (sepol_module_package_get_seusers_len(base)) {
+ 			if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS)) == NULL ||
+ 			    write_file(sh, ofilename, sepol_module_package_get_seusers(base), 
+ 					sepol_module_package_get_seusers_len(base)) == -1) {
+ 				goto cleanup;
+ 			}
++			pseusers->dtable->drop_cache(pseusers->dbase);
++
++		} else {
++			if (pseusers->dtable->clear(sh, pseusers->dbase) < 0)
++				goto cleanup;
+ 		}
+ 
++		/* Users_extra */
+ 		if (sepol_module_package_get_user_extra_len(base)) {
+ 			if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USER_EXTRA)) == NULL ||
+ 			    write_file(sh, ofilename, sepol_module_package_get_user_extra(base), 
+ 					sepol_module_package_get_user_extra_len(base)) == -1) {
+ 				goto cleanup;
+ 			}
+-		}
++			pusers_extra->dtable->drop_cache(pusers_extra->dbase);
+ 
+-		/* Drop any cached content for file_contexts, seusers, or users_extra,
+-	 	 * since it is now superceded by the files just written, and needs to be
+-		 * re-cached */
+-		pfcontexts->dtable->drop_cache(pfcontexts->dbase);
+-		pseusers->dtable->drop_cache(pseusers->dbase);
+-		pusers_extra->dtable->drop_cache(pusers_extra->dbase);
++		} else {
++			if (pusers_extra->dtable->clear(sh, pusers_extra->dbase) < 0)
++				goto cleanup;
++		}
+ 
+ 		/* ==================== Policydb-backed ================ */
  
- clean:
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-1.5.14/src/Makefile
---- nsalibsemanage/src/Makefile	2005-11-29 10:54:15.000000000 -0500
-+++ libsemanage-1.5.14/src/Makefile	2006-01-13 23:46:17.000000000 -0500
-@@ -37,7 +37,7 @@
- 
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
- 
--all: $(LIBA) $(LIBSO) $(SWIGSO)
-+all: $(LIBA) $(LIBSO) 
- 
- pywrap: all $(SWIGLOBJ) $(SWIGSO) 
- 
-@@ -75,7 +75,7 @@
- swigify: $(SWIGIF)
- 	$(SWIG) $^
- 
--install: all install-pywrap 
-+install: all 
- 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
- 	install -m 644 $(LIBA) $(LIBDIR)
- 	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- libsemanage.spec	7 Feb 2006 15:30:09 -0000	1.72
+++ libsemanage.spec	10 Feb 2006 16:42:07 -0000	1.73
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.5.21
-Release: 1
+Release: 2
 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} 
@@ -39,6 +40,7 @@
 
 %prep
 %setup -q
+%patch -p2 -b .rhat
 
 %build
 make clean
@@ -75,7 +77,10 @@
 %{_mandir}/man3/*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.21-1
+* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.21-2
+- Fix handling of seusers and users_map file
+
+* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.21-1
 - Upgrade to latest from NSA
 	* Merged seuser/user_extra support patch from Joshua Brindle.
 	* Merged remote system dbase patch from Ivan Gyurdiev.	



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:49:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:49:56 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.27,1.28
Message-ID: <200602101649.k1AGnuJJ005502@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5489

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.4
- Use Epoch in Requires (rh#180915).
- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- eclipse-bugzilla.spec	10 Feb 2006 13:53:21 -0000	1.27
+++ eclipse-bugzilla.spec	10 Feb 2006 16:49:54 -0000	1.28
@@ -22,11 +22,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	6.3
+Release:	6.4
 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 >= 3.1.2
+Requires: eclipse-platform >= 1:3.1.2
+Requires: eclipse-platform < 1:3.1.3
 
 # 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 
@@ -128,6 +129,10 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.4
+- Use Epoch in Requires (rh#180915).
+- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.
+
 * Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.3
 - Change strict 3.1.2 to >= 3.1.2.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 16:53:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 11:53:53 -0500
Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.29,1.30
Message-ID: <200602101653.k1AGrrsp005574@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5548

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-25
- Use Epoch in Requires (rh#180915).
- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.



Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eclipse-changelog.spec	9 Feb 2006 21:28:02 -0000	1.29
+++ eclipse-changelog.spec	10 Feb 2006 16:53:51 -0000	1.30
@@ -21,11 +21,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        24
+Release:        25
 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 >= 3.1.2
+Requires:	eclipse-platform >= 1:3.1.2
+Requires:	eclipse-platform < 1:3.1.3
 
 # 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 
@@ -137,6 +138,10 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-25
+- Use Epoch in Requires (rh#180915).
+- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-24
 - Build against 3.1.2.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:00:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:00:09 -0500
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.34,1.35
Message-ID: <200602101700.k1AH09fg015906@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15821

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_7fc
- Use Epoch in Requires (rh#180915).
- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.



Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eclipse-cdt.spec	9 Feb 2006 21:21:15 -0000	1.34
+++ eclipse-cdt.spec	10 Feb 2006 17:00:05 -0000	1.35
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_6fc
+Release: 	1jpp_7fc
 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
@@ -63,7 +63,8 @@
 %endif
 
 Requires: 	ctags gdb make
-Requires: 	eclipse-platform >= 3.1.2
+Requires: 	eclipse-platform >= 1:3.1.2
+Requires: 	eclipse-platform < 1:3.1.3
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -177,10 +178,10 @@
 
 %if %{gcj_support}
 %post
-/usr/bin/rebuild-gcj-db
+%{_bindir}/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db
+%{_bindir}/rebuild-gcj-db
 %endif
 
 %files
@@ -231,6 +232,10 @@
 
 
 %changelog
+* Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_7fc
+- Use Epoch in Requires (rh#180915).
+- Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.
+
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_6fc
 - Make it Require >= 3.1.2.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:04:20 -0500
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.161,
	1.162 policycoreutils.spec, 1.233, 1.234
Message-ID: <200602101704.k1AH4KQw016438@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16394

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-2
- Fix auditing to semanage
- Change genhomedircon to use new prefix interface in libselinux


policycoreutils-rhat.patch:
 scripts/genhomedircon |   64 +++-----
 semanage/seobject.py  |  397 +++++++++++++++++++++++++++-----------------------
 2 files changed, 250 insertions(+), 211 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- policycoreutils-rhat.patch	7 Feb 2006 15:37:54 -0000	1.161
+++ policycoreutils-rhat.patch	10 Feb 2006 17:04:04 -0000	1.162
@@ -1,7 +1,27 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.20/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2006-01-30 18:32:39.000000000 -0500
-+++ policycoreutils-1.29.20/scripts/genhomedircon	2006-02-07 10:36:38.000000000 -0500
-@@ -170,7 +170,7 @@
++++ policycoreutils-1.29.20/scripts/genhomedircon	2006-02-09 10:27:15.000000000 -0500
+@@ -4,7 +4,7 @@
+ #
+ # genhomedircon - this script is used to generate file context
+ # configuration entries for user home directories based on their
+-# default roles and is run when building the policy. Specifically, we
++# default prefixes and is run when building the policy. Specifically, we
+ # replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files with
+ # generic and user-specific values.
+ #
+@@ -15,9 +15,7 @@
+ # The file CONTEXTDIR/files/homedir_template exists.  This file is used to
+ # set up the home directory context for each real user.
+ # 
+-# If a user has more than one role, genhomedircon uses the first role in the list.
+-#
+-# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, role user
++# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, prefix user
+ #
+ # "Real" users (as opposed to system users) are those whose UID is greater than
+ #  or equal STARTING_UID (usually 500) and whose login is not a member of
+@@ -170,37 +168,34 @@
  	def heading(self):
  		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
  		if self.semanaged:
@@ -10,18 +30,130 @@
  		else:
  			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
  		return ret
-@@ -196,7 +196,7 @@
- 		return role
+ 
+-	def defaultrole(self, name):
++	def get_default_prefix(self, name):
+ 		for idx in range(self.usize):
+ 			user = semanage_user_by_idx(self.ulist, idx)
+ 			if semanage_user_get_name(user) == name:
+-				if name == "staff_u" or name == "root" and self.type != "targeted":
+-					return "staff_r"
+-				else:
+-					return "user_r"
++				return semanage_user_get_prefix(user)
+ 		return name
+-	def getOldRole(self, role):
+-		rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % role)
++	def get_old_prefix(self, user):
++		rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % user)
+ 		if rc == "":					    
+-			rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % role)
++			rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % user)
+ 		if rc != "":
+ 			user=rc.split()
+-			role = user[3]
+-			if role == "{":
+-				role = user[4]
+-		return role
++			prefix = user[3]
++			if prefix == "{":
++				prefix = user[4]
++		if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
++			prefix = prefix[:-2]
++		return prefix
  		
- 	def adduser(self, udict, user, seuser, role):
+-	def adduser(self, udict, user, seuser, role):
 -		if seuser == "user_u" or user == "__default__":
++	def adduser(self, udict, user, seuser, prefix):
 +		if seuser == "user_u" or user == "__default__" or user == "system_u":
  			return
- 		# !!! chooses first role in the list to use in the file context !!!
- 		if role[-2:] == "_r" or role[-2:] == "_u":
+-		# !!! chooses first role in the list to use in the file context !!!
+-		if role[-2:] == "_r" or role[-2:] == "_u":
+-			role = role[:-2]
++		# !!! chooses first prefix in the list to use in the file context !!!
+ 		try:
+ 			home = pwd.getpwnam(user)[5]
+ 			if home == "/":
+@@ -217,7 +212,7 @@
+ 				return
+ 		prefs = {}
+ 		prefs["seuser"] = seuser
+-		prefs["role"] = role
++		prefs["prefix"] = prefix
+ 		prefs["home"] = home
+ 		udict[user] = prefs
+ 		
+@@ -229,7 +224,7 @@
+ 				user=[]
+ 				seuser = semanage_seuser_by_idx(list, idx)
+ 				seusername=semanage_seuser_get_sename(seuser)
+-				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.defaultrole(seusername))
++				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.get_default_prefix(seusername))
+ 				
+ 		else:
+ 			try:
+@@ -242,8 +237,8 @@
+ 					if len(user) < 2:
+ 						continue
+ 					
+-					role=self.getOldRole(user[1])
+-					self.adduser(udict, user[0], user[1], role)
++					prefix=self.get_old_prefix(user[1])
++					self.adduser(udict, user[0], user[1], prefix)
+ 				fd.close()
+ 			except IOError, error:
+ 				# Must be install so force add of root
+@@ -251,40 +246,37 @@
+ 
+ 		return udict
+ 
+-	def getHomeDirContext(self, user, seuser, home, role):
++	def getHomeDirContext(self, user, seuser, home, prefix):
+ 		ret="\n\n#\n# Home Context for user %s\n#\n\n" % user
+ 		fd=open(self.getHomeDirTemplate(), 'r')
+ 		for i in  fd.read().split('\n'):
+ 			if i.startswith("HOME_DIR") == 1:
+ 				i=i.replace("HOME_DIR", home)
+-				i=i.replace("ROLE", role)
++				i=i.replace("ROLE", prefix)
+ 				i=i.replace("system_u", seuser)
+ 				ret = ret+i+"\n"
+ 		fd.close()
+ 		return ret
+ 
+-	def getUserContext(self, user, sel_user, role):
++	def getUserContext(self, user, sel_user, prefix):
+ 		ret=""
+ 		fd=open(self.getHomeDirTemplate(), 'r')
+ 		for i in  fd.read().split('\n'):
+ 			if i.find("USER") == 1:
+ 				i=i.replace("USER", user)
+-				i=i.replace("ROLE", role)
++				i=i.replace("ROLE", prefix)
+ 				i=i.replace("system_u", sel_user)
+ 				ret=ret+i+"\n"
+ 		fd.close()
+ 		return ret
+ 
+ 	def genHomeDirContext(self):
+-		if self.semanaged and grep(self.getHomeDirTemplate(), "ROLE") != "":
+-			warning("genhomedircon:  Warning!  No support yet for expanding ROLE macros in the %s file when using libsemanage." % self.getHomeDirTemplate());
+-			warning("genhomedircon:  You must manually update file_contexts.homedirs for any non-user_r users (including root).");
+ 		users = self.getUsers()
+ 		ret=""
+-		# Fill in HOME and ROLE for users that are defined
++		# Fill in HOME and prefix for users that are defined
+ 		for u in users.keys():
+-			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["role"])
+-			ret += self.getUserContext (u, users[u]["seuser"], users[u]["role"])
++			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["prefix"])
++			ret += self.getUserContext (u, users[u]["seuser"], users[u]["prefix"])
+ 		return ret+"\n"
+ 
+ 	def checkExists(self, home):
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.20/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
-+++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-07 10:35:46.000000000 -0500
++++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-10 11:48:59.000000000 -0500
 @@ -21,8 +21,11 @@
  #
  #  
@@ -35,7 +167,7 @@
  
  def validate_level(raw):
  	sensitivity="s([0-9]|1[0-5])"
-@@ -170,119 +173,143 @@
+@@ -170,119 +173,145 @@
  		if sename == "":
  			sename = "user_u"
  			
@@ -117,18 +249,18 @@
 +				raise ValueError("Could not add login mapping for %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user mapping", name, 0, sename, "", serange, "", "", "", "", "", "", 0);
 +			raise error
 +		
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"adding selinux user mapping",
-+					     name, 0, "", "", "", 1);
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user mapping", name, 0, sename, "", serange, "", "", "", "", "", "", 1);
  		semanage_seuser_key_free(k)
  		semanage_seuser_free(u)
  
  	def modify(self, name, sename = "", serange = ""):
 -		if sename == "" and serange == "":
 -			raise ValueError("Requires seuser or serange")
++		oldsename=""
++		oldserange=""
 +		try:
 +			if sename == "" and serange == "":
 +				raise ValueError("Requires seuser or serange")
@@ -162,10 +294,16 @@
 -			semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
 -		if sename != "":
 -			semanage_seuser_set_sename(self.sh, u, sename)
++			oldserange=semanage_seuser_get_mlsrange(u)
++			oldsename=semanage_seuser_get_sename(u)
 +			if serange != "":
 +				semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange))
++			else:
++				serange=oldserange
 +			if sename != "":
 +				semanage_seuser_set_sename(self.sh, u, sename)
++			else:
++				sename=oldsename
  
 -		rc = semanage_begin_transaction(self.sh)
 -		if rc < 0:
@@ -184,18 +322,16 @@
 +			rc = semanage_seuser_modify_local(self.sh, k, u)
 +			if rc < 0:
 +				raise ValueError("Could not modify login mapping for %s" % name)
- 
++
 +			rc = semanage_commit(self.sh)
 +			if rc < 0:
 +				raise ValueError("Could not modify login mapping for %s" % name)
-+
+ 
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping", name, 0, sename, "", serange, "", oldsename, "", oldserange, "", "", "", 0);
 +			raise error
-+
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping",
-+					     name, 0, "", "", "", 1);
++		
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping", name, 0, sename, "", serange, oldsename, "", oldserange, "", 1);
  		semanage_seuser_key_free(k)
  		semanage_seuser_free(u)
  
@@ -254,109 +390,107 @@
 +				raise ValueError("Could not delete login mapping for %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user mapping", name, 0, name, "", "", "", "", "", "", "", "", 0);
 +			raise error
-+
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete selinux user mapping",
-+					     name, 0, "", "", "", 1);
++		
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user mapping", name, 0, name, "", "", "", "", "", "", "", "", 1);
  		semanage_seuser_key_free(k)
  
  		
-@@ -322,127 +349,150 @@
+@@ -322,127 +351,145 @@
  		else:
  			selevel = untranslate(selevel)
  
 -		(rc,k) = semanage_user_key_create(self.sh, name)
 -		if rc < 0:
 -			raise ValueError("Could not create a key for %s" % name)
+-
+-		(rc,exists) = semanage_user_exists(self.sh, k)
+-		if rc < 0:
+-			raise ValueError("Could not check if SELinux user %s is defined" % name)
+-		if exists:
+-			raise ValueError("SELinux user %s is already defined" % name)
++		seroles=" ".join(roles)
 +		try:
 +			(rc,k) = semanage_user_key_create(self.sh, name)
 +			if rc < 0:
 +				raise ValueError("Could not create a key for %s" % name)
  
--		(rc,exists) = semanage_user_exists(self.sh, k)
+-		(rc,u) = semanage_user_create(self.sh)
 -		if rc < 0:
--			raise ValueError("Could not check if SELinux user %s is defined" % name)
--		if exists:
--			raise ValueError("SELinux user %s is already defined" % name)
+-			raise ValueError("Could not create SELinux user for %s" % name)
 +			(rc,exists) = semanage_user_exists(self.sh, k)
 +			if rc < 0:
 +				raise ValueError("Could not check if SELinux user %s is defined" % name)
 +			if exists:
 +				raise ValueError("SELinux user %s is already defined" % name)
  
--		(rc,u) = semanage_user_create(self.sh)
+-		rc = semanage_user_set_name(self.sh, u, name)
 -		if rc < 0:
--			raise ValueError("Could not create SELinux user for %s" % name)
+-			raise ValueError("Could not set name for %s" % name)
 +			(rc,u) = semanage_user_create(self.sh)
 +			if rc < 0:
 +				raise ValueError("Could not create SELinux user for %s" % name)
  
--		rc = semanage_user_set_name(self.sh, u, name)
--		if rc < 0:
--			raise ValueError("Could not set name for %s" % name)
+-		for r in roles:
+-			rc = semanage_user_add_role(self.sh, u, r)
 +			rc = semanage_user_set_name(self.sh, u, name)
-+			if rc < 0:
+ 			if rc < 0:
+-				raise ValueError("Could not add role %s for %s" % (r, name))
 +				raise ValueError("Could not set name for %s" % name)
  
--		for r in roles:
--			rc = semanage_user_add_role(self.sh, u, r)
+-		rc = semanage_user_set_mlsrange(self.sh, u, serange)
+-		if rc < 0:
+-			raise ValueError("Could not set MLS range for %s" % name)
 +			for r in roles:
 +				rc = semanage_user_add_role(self.sh, u, r)
 +				if rc < 0:
 +					raise ValueError("Could not add role %s for %s" % (r, name))
-+
+ 
+-		rc = semanage_user_set_mlslevel(self.sh, u, selevel)
+-		if rc < 0:
+-			raise ValueError("Could not set MLS level for %s" % name)
 +			rc = semanage_user_set_mlsrange(self.sh, u, serange)
- 			if rc < 0:
--				raise ValueError("Could not add role %s for %s" % (r, name))
++			if rc < 0:
 +				raise ValueError("Could not set MLS range for %s" % name)
  
--		rc = semanage_user_set_mlsrange(self.sh, u, serange)
+-		(rc,key) = semanage_user_key_extract(self.sh,u)
 -		if rc < 0:
--			raise ValueError("Could not set MLS range for %s" % name)
+-			raise ValueError("Could not extract key for %s" % name)
 +			rc = semanage_user_set_mlslevel(self.sh, u, selevel)
 +			if rc < 0:
 +				raise ValueError("Could not set MLS level for %s" % name)
  
--		rc = semanage_user_set_mlslevel(self.sh, u, selevel)
+-		rc = semanage_begin_transaction(self.sh)
 -		if rc < 0:
--			raise ValueError("Could not set MLS level for %s" % name)
+-			raise ValueError("Could not start semanage transaction")
 +			(rc,key) = semanage_user_key_extract(self.sh,u)
 +			if rc < 0:
 +				raise ValueError("Could not extract key for %s" % name)
  
--		(rc,key) = semanage_user_key_extract(self.sh,u)
+-		rc = semanage_user_modify_local(self.sh, k, u)
 -		if rc < 0:
--			raise ValueError("Could not extract key for %s" % name)
+-			raise ValueError("Could not add SELinux user %s" % name)
 +			rc = semanage_begin_transaction(self.sh)
 +			if rc < 0:
 +				raise ValueError("Could not start semanage transaction")
  
--		rc = semanage_begin_transaction(self.sh)
+-		rc = semanage_commit(self.sh)
 -		if rc < 0:
--			raise ValueError("Could not start semanage transaction")
+-			raise ValueError("Could not add SELinux user %s" % name)
 +			rc = semanage_user_modify_local(self.sh, k, u)
 +			if rc < 0:
 +				raise ValueError("Could not add SELinux user %s" % name)
- 
--		rc = semanage_user_modify_local(self.sh, k, u)
--		if rc < 0:
--			raise ValueError("Could not add SELinux user %s" % name)
++
 +			rc = semanage_commit(self.sh)
 +			if rc < 0:
 +				raise ValueError("Could not add SELinux user %s" % name)
  
--		rc = semanage_commit(self.sh)
--		if rc < 0:
--			raise ValueError("Could not add SELinux user %s" % name)
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user record", name, 0, name, seroles, serange, "", "", "", "", "", "", 0);
 +			raise error
- 
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add Selinux User Record",
-+					     name, 0, "", "", "", 1);
++		
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user record", name, 0, name, seroles, serange, "", "", "", "", "", "", 1);
  		semanage_user_key_free(k)
  		semanage_user_free(u)
  
@@ -423,7 +557,6 @@
 -		rc = semanage_commit(self.sh)
 -		if rc < 0:
 -			raise ValueError("Could not modify SELinux user %s" % name)
--		
 +			rc = semanage_user_modify_local(self.sh, k, u)
 +			if rc < 0:
 +				raise ValueError("Could not modify SELinux user %s" % name)
@@ -433,12 +566,10 @@
 +				raise ValueError("Could not modify SELinux user %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify SELinux user record", name, 0, seuser, seroles, serange, oldseuser, oldseroles, olrserange, "", 0);
 +			raise error
-+
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify Selinux User Record",
-+					     name, 0, "", "", "", 1);
+ 		
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify SELinux user record", name, 0, seuser, seroles, serange, oldseuser, oldseroles, olrserange, "", 1);
  		semanage_user_key_free(k)
  		semanage_user_free(u)
  
@@ -495,12 +626,10 @@
 +			if rc < 0:
 +				raise ValueError("Could not delete SELinux user %s" % name)
 +		except ValueError, error:
-+			audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],error.args[0],
-+						     name, 0, "", "", "", 0);
++			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user record", name, 0, "", "", "", "", "", "", "", "", "", 0);
 +			raise error
  		
-+		audit.audit_log_acct_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"Delete Selinux User Record",
-+					     name, 0, "", "", "", 1);
++		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user record", name, 0, "", "", "", "", "", "", "", "", "", 1);
  		semanage_user_key_free(k)		
  
  	def get_all(self):


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- policycoreutils.spec	7 Feb 2006 15:37:54 -0000	1.233
+++ policycoreutils.spec	10 Feb 2006 17:04:05 -0000	1.234
@@ -1,10 +1,11 @@
+%define libauditver 1.1.4-3
 %define libsepolver 1.11.13-1
-%define libsemanagever 1.5.21-1
+%define libsemanagever 1.5.21-2
 %define libselinuxver 1.29.7-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.20
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -12,7 +13,7 @@
 
 BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} 
 PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff
-Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python
+Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >=  %{libauditver} 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
@@ -97,6 +98,10 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-2
+- Fix auditing to semanage
+- Change genhomedircon to use new prefix interface in libselinux
+
 * Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-1
 - Update from upstream
 	* Merged seuser/user_extra support patch to semodule_package 



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:08:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:08:32 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.25,
	1.26 selinux-policy-targeted.spec, 1.358, 1.359
Message-ID: <200602101708.k1AH8WNr017197@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17176

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
- Now zebra wants to listen on bgp


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    5 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   14 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1680 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policy-20050916.patch	9 Feb 2006 14:04:15 -0000	1.25
+++ policy-20050916.patch	10 Feb 2006 17:08:28 -0000	1.26
@@ -3099,7 +3099,7 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-09 08:59:05.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-10 12:07:40.000000000 -0500
 @@ -8,7 +8,7 @@
  type zebra_conf_t, file_type, sysadmfile;
  r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
@@ -3116,7 +3116,7 @@
 -allow zebra_t self:netlink_route_socket r_netlink_socket_perms;
 +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
  allow zebra_t zebra_port_t:tcp_socket name_bind;
-+allow zebra_t bgp_port_t:tcp_socket name_connect;
++allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect };
  
  allow zebra_t proc_t:file { getattr read };
  allow zebra_t { sysctl_t sysctl_net_t }:dir search;


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- selinux-policy-targeted.spec	9 Feb 2006 14:04:20 -0000	1.358
+++ selinux-policy-targeted.spec	10 Feb 2006 17:08:28 -0000	1.359
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.22
+Release: 2.23
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,6 +234,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
+- Now zebra wants to listen on bgp
+
 * Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
 - Allow zebra to connect to bgp
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:24:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:24:27 -0500
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.23,1.24
Message-ID: <200602101724.k1AHOR7r003876@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3765

Modified Files:
	desktop-file-utils.spec 
Log Message:
- call update-desktop-database in %%post (bug 180898)



Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- desktop-file-utils.spec	7 Feb 2006 11:21:35 -0000	1.23
+++ desktop-file-utils.spec	10 Feb 2006 17:24:25 -0000	1.24
@@ -1,6 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
+Release: 5
 Release: 4.1
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
@@ -45,12 +46,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+update-desktop-database %{_datadir}/applications
+
+%postun
+update-desktop-database %{_datadir}/applications
+
 %files
 %defattr(-,root,root)
 %{_bindir}/*
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 0.10-5
+- call update-desktop-database in %%post (bug 180898)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:25:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:25:01 -0500
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.24,1.25
Message-ID: <200602101725.k1AHP1q2004179@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4086

Modified Files:
	desktop-file-utils.spec 
Log Message:
remove superfluous release field



Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- desktop-file-utils.spec	10 Feb 2006 17:24:25 -0000	1.24
+++ desktop-file-utils.spec	10 Feb 2006 17:24:58 -0000	1.25
@@ -2,7 +2,6 @@
 Name: desktop-file-utils
 Version: 0.10
 Release: 5
-Release: 4.1
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch



From fedora-cvs-commits at redhat.com  Fri Feb 10 17:49:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 12:49:05 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1930,
	1.1931 linux-2.6-compile-fixes.patch, 1.49, 1.50
Message-ID: <200602101749.k1AHn5WO025307@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
build fix



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -r1.1930 -r1.1931
--- kernel-2.6.spec	10 Feb 2006 10:05:34 -0000	1.1930
+++ kernel-2.6.spec	10 Feb 2006 17:49:02 -0000	1.1931
@@ -959,7 +959,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:
 compat_signal.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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- linux-2.6-compile-fixes.patch	9 Feb 2006 21:45:32 -0000	1.49
+++ linux-2.6-compile-fixes.patch	10 Feb 2006 17:49:03 -0000	1.50
@@ -1,2 +1,17 @@
 
+arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
+include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
 
+Signed-off-by: Dave Jones <davej at redhat.com>
+
+--- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~	2006-02-10 12:47:57.000000000 -0500
++++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c	2006-02-10 12:48:05.000000000 -0500
+@@ -196,7 +196,7 @@ sys32_sigaction(int sig, const struct ol
+ }
+ 
+ int
+-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
++do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
+ 
+ asmlinkage long
+ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:20:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:20:46 -0500
Subject: rpms/kernel-xen/devel linux-2.6-percpu-NR_CPUS-hotplug-fix.patch,
	1.1, 1.2
Message-ID: <200602101820.k1AIKkrW016349@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
Log Message:
remember to throw this patch away once we inherit the proper fix from upstream - backporting not too practical now

linux-2.6-percpu-NR_CPUS-hotplug-fix.patch:
 sched.c |   64 +++++++++++++++++++++++++++++-----------------------------------
 1 files changed, 29 insertions(+), 35 deletions(-)

Index: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-percpu-NR_CPUS-hotplug-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-percpu-NR_CPUS-hotplug-fix.patch	9 Feb 2006 01:38:34 -0000	1.1
+++ linux-2.6-percpu-NR_CPUS-hotplug-fix.patch	10 Feb 2006 18:20:43 -0000	1.2
@@ -1,3 +1,8 @@
+This is the wrong fix in the long run, but it works for now.
+We will inherit the proper fix from upstream soon, at that
+point this patch can go away.  None of the alternative hacks
+to fix this bug actually seemed any better than this one. - Rik
+
 --- linux-2.6.15.i686/kernel/sched.c.idle_init	2006-02-08 17:56:50.000000000 -0500
 +++ linux-2.6.15.i686/kernel/sched.c	2006-02-08 17:58:57.000000000 -0500
 @@ -4437,6 +4437,35 @@ void __devinit init_idle(task_t *idle, i



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:24:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:24:06 -0500
Subject: rpms/kernel-xen/devel/configs config-x86-generic, 1.8,
	1.9 config-x86_64-generic, 1.6, 1.7 config-xen-x86_64, 1.2, 1.3
Message-ID: <200602101824.k1AIO676017966@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-x86-generic config-x86_64-generic config-xen-x86_64 
Log Message:
Fix x86_64 (and hopefully rest of archs)


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-x86-generic	8 Feb 2006 12:30:20 -0000	1.8
+++ config-x86-generic	10 Feb 2006 18:24:04 -0000	1.9
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+CONFIG_X86_64_XEN is not set
 #
 # Processor type and features
 #


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-x86_64-generic	7 Feb 2006 00:45:16 -0000	1.6
+++ config-x86_64-generic	10 Feb 2006 18:24:04 -0000	1.7
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+# CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-x86_64,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-x86_64	21 Dec 2005 11:24:56 -0000	1.2
+++ config-xen-x86_64	10 Feb 2006 18:24:04 -0000	1.3
@@ -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



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:24:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:24:07 -0500
Subject: rpms/kernel-xen/devel linux-2.6-xen-smp.patch, NONE,
	1.1 linux-2.6-xen-x86_64-fixes.patch, NONE,
	1.1 kernel-xen.spec, 1.56, 1.57
Message-ID: <200602101824.k1AIO7Cw017955@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-smp.patch linux-2.6-xen-x86_64-fixes.patch 
Log Message:
Fix x86_64 (and hopefully rest of archs)

linux-2.6-xen-smp.patch:
 sched.c |   64 +++++++++++++++++++++++++++++-----------------------------------
 1 files changed, 29 insertions(+), 35 deletions(-)

--- NEW FILE linux-2.6-xen-smp.patch ---
--- linux-2.6.15.i686/kernel/sched.c.idle_init	2006-02-08 17:56:50.000000000 -0500
+++ linux-2.6.15.i686/kernel/sched.c	2006-02-08 17:58:57.000000000 -0500
@@ -4437,6 +4437,35 @@ void __devinit init_idle(task_t *idle, i
 {
 	runqueue_t *rq = cpu_rq(cpu);
 	unsigned long flags;
+	prio_array_t *array;
+	int j, k;
+
+	spin_lock_init(&rq->lock);
+	rq->nr_running = 0;
+	rq->active = rq->arrays;
+	rq->expired = rq->arrays + 1;
+	rq->best_expired_prio = MAX_PRIO;
+
+#ifdef CONFIG_SMP
+	rq->sd = NULL;
+	for (j = 1; j < 3; j++)
+		rq->cpu_load[j] = 0;
+	rq->active_balance = 0;
+	rq->push_cpu = 0;
+	rq->migration_thread = NULL;
+	INIT_LIST_HEAD(&rq->migration_queue);
+#endif
+	atomic_set(&rq->nr_iowait, 0);
+
+	for (j = 0; j < 2; j++) {
+		array = rq->arrays + j;
+		for (k = 0; k < MAX_PRIO; k++) {
+			INIT_LIST_HEAD(array->queue + k);
+			__clear_bit(k, array->bitmap);
+		}
+		// delimiter for bitsearch
+		__set_bit(MAX_PRIO, array->bitmap);
+	}
 
 	idle->sleep_avg = 0;
 	idle->array = NULL;
@@ -6110,41 +6139,6 @@ int in_sched_functions(unsigned long add
 
 void __init sched_init(void)
 {
-	runqueue_t *rq;
-	int i, j, k;
-
-	for_each_cpu(i) {
-		prio_array_t *array;
-
-		rq = cpu_rq(i);
-		spin_lock_init(&rq->lock);
-		rq->nr_running = 0;
-		rq->active = rq->arrays;
-		rq->expired = rq->arrays + 1;
-		rq->best_expired_prio = MAX_PRIO;
-
-#ifdef CONFIG_SMP
-		rq->sd = NULL;
-		for (j = 1; j < 3; j++)
-			rq->cpu_load[j] = 0;
-		rq->active_balance = 0;
-		rq->push_cpu = 0;
-		rq->migration_thread = NULL;
-		INIT_LIST_HEAD(&rq->migration_queue);
-#endif
-		atomic_set(&rq->nr_iowait, 0);
-
-		for (j = 0; j < 2; j++) {
-			array = rq->arrays + j;
-			for (k = 0; k < MAX_PRIO; k++) {
-				INIT_LIST_HEAD(array->queue + k);
-				__clear_bit(k, array->bitmap);
-			}
-			// delimiter for bitsearch
-			__set_bit(MAX_PRIO, array->bitmap);
-		}
-	}
-
 	/*
 	 * The boot idle thread does lazy MMU switching as well:
 	 */

linux-2.6-xen-x86_64-fixes.patch:
 arch/x86_64/ia32/Makefile        |    2 ++
 arch/x86_64/kernel/head-xen.S    |    3 ++-
 arch/x86_64/kernel/setup-xen.c   |    3 +++
 arch/x86_64/kernel/setup64-xen.c |    2 ++
 arch/x86_64/mm/pageattr-xen.c    |    9 ++++++++-
 drivers/xen/core/smpboot.c       |   12 ++++++++++++
 6 files changed, 29 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-x86_64-fixes.patch ---
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID df98f37a88b05ced33ed0915efa576e5b110b60d
# Parent  2710f2fe624a5103d198e6685e250c6678f34ec1
Fix x86_64 SMP support.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb  7 13:57:40 2006 +0000
@@ -911,6 +911,9 @@ void __init setup_arch(char **cmdline_p)
 	init_apic_mappings();
 #endif
 #endif
+#if defined(CONFIG_XEN) && defined(CONFIG_SMP) && !defined(CONFIG_HOTPLUG_CPU)
+	prefill_possible_map();
+#endif
 
 #if defined(CONFIG_XEN_PRIVILEGED_GUEST) || !defined(CONFIG_XEN)
 	/*
diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Tue Feb  7 13:57:40 2006 +0000
@@ -272,8 +272,10 @@ void __cpuinit cpu_init (void)
 	 * Initialize the per-CPU GDT with the boot GDT,
 	 * and set up the GDT descriptor:
 	 */
+#ifndef CONFIG_XEN 
 	if (cpu)
  		memcpy(cpu_gdt(cpu), cpu_gdt_table, GDT_SIZE);
+#endif
 
 	cpu_gdt_descr[cpu].size = GDT_SIZE;
 #ifndef CONFIG_XEN 
diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Feb  7 13:57:40 2006 +0000
@@ -81,6 +81,18 @@ unsigned int maxcpus = NR_CPUS;
 unsigned int maxcpus = NR_CPUS;
 #endif
 
+void __init prefill_possible_map(void)
+{
+	int i, rc;
+
+	for (i = 0; i < NR_CPUS; i++) {
+		rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
+		if (rc == -ENOENT)
+			break;
+		cpu_set(i, cpu_possible_map);
+	}
+}
+
 void __init smp_alloc_memory(void)
 {
 }
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 581d4a0ac7290523d04f5a7d8b35cc727baa8089
# Parent  5caf1de3f2682e91831b09f464c70662658a8e45
Fix ia32 support.

From: Chris Wright <chrisw at sous-sol.org>
Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 5caf1de3f268 -r 581d4a0ac729 linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile
--- a/linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile	Tue Feb  7 15:56:39 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile	Tue Feb  7 15:24:04 2006 +0000
@@ -33,6 +33,8 @@ AFLAGS_vsyscall-syscall.o = -m32 -Iarch/
 
 ifdef CONFIG_XEN
 AFLAGS_vsyscall-int80.o = -m32 -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)
# HG changeset patch
# User kaf24 at firebug.cl.cam.ac.uk
# Node ID aefd8b8c6b1fc3242e6a231a4461c12780d0c254
# Parent  581d4a0ac7290523d04f5a7d8b35cc727baa8089
Since USER_PTRS_PER_PGD depends on TASK_SIZE and thus on the current
thread, it must not be used in code that can be called in the context
switch path (otherwise the 32-bitness of the outgoing task is used
here rather then the 32-bitness of the incoming one, possibly
resulting in large parts of the page tables not getting converted to
read-only).

Signed-off-by: Jan Beulich <JBeulich at novell.com>

diff -r 581d4a0ac729 -r aefd8b8c6b1f linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c	Tue Feb  7 15:24:04 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c	Tue Feb  7 19:16:11 2006 +0100
@@ -40,7 +40,14 @@ static void mm_walk(struct mm_struct *mm
 	int          g,u,m;
 
 	pgd = mm->pgd;
-	for (g = 0; g <= USER_PTRS_PER_PGD; g++, pgd++) {
+	/*
+	 * Cannot iterate up to USER_PTRS_PER_PGD as these pagetables may not
+	 * be the 'current' task's pagetables (e.g., current may be 32-bit,
+	 * but the pagetables may be for a 64-bit task).
+	 * Subtracting 1 from TASK_SIZE64 means the loop limit is correct
+	 * regardless of whether TASK_SIZE64 is a multiple of PGDIR_SIZE.
+	 */
+	for (g = 0; g <= ((TASK_SIZE64-1) / PGDIR_SIZE); g++, pgd++) {
 		if (pgd_none(*pgd))
 			continue;
 		pud = pud_offset(pgd, 0);
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 57e6d721842703c08bf7dafbfb5efe3c9a44725d
# Parent  7cd3d2e41559a047b0c329b2f9032cc555ca209c
Fix hypercall_page location on x86_64.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 7cd3d2e41559 -r 57e6d7218427 linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb  3 18:24:28 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb  3 18:45:14 2006 +0000
@@ -19,7 +19,7 @@
 	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
 	.ascii	",XEN_VER=xen-3.0"
 	.ascii	",VIRT_BASE=0xffffffff80000000"
-	.ascii	",HYPERCALL_PAGE=0x10d" /* __pa(hypercall_page) >> 12 */
+	.ascii	",HYPERCALL_PAGE=0x10a" /* __pa(hypercall_page) >> 12 */
 	.ascii	",LOADER=generic"
 	.byte	0
       
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 1bc2d1fe503c331157bac60e6534e78693fbc1d4
# Parent  c5fd98fcb127f5de28312ed8a36e67b31c74dca2
Fill hypercall_page so that its VA space doesn't get used for code.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r c5fd98fcb127 -r 1bc2d1fe503c linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Mon Feb  6 14:52:45 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Mon Feb  6 15:26:29 2006 +0000
@@ -189,6 +189,7 @@ NEXT_PAGE(hypercall_page)
 	 * different address than expected. */
 	.quad	__adjust_hypercall_page_in_header
 .endif
+	.fill	512,8,0
 
 #undef NEXT_PAGE
 


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kernel-xen.spec	10 Feb 2006 16:20:25 -0000	1.56
+++ kernel-xen.spec	10 Feb 2006 18:24:04 -0000	1.57
@@ -66,6 +66,7 @@
 %ifarch x86_64
 %define buildsmp 0
 %define buildkdump 1
+%define buildxen %{includexen}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -253,6 +254,8 @@
 Patch705: linux-2.6.14-xen_net_read_mac_export.patch
 Patch706: linux-2.6.14-xen_remap_vma_flags.patch
 Patch707: linux-2.6-xen-acpi.patch
+Patch708: linux-2.6-xen-x86_64-fixes.patch
+Patch709: linux-2.6-xen-smp.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -756,6 +759,8 @@
 %patch705 -p1
 %patch706 -p1
 %patch707 -p1
+%patch708 -p2
+%patch709 -p1
 %endif
 
 #
@@ -774,11 +779,9 @@
 # Exec shield 
 %patch810 -p1
 
-# Fix up the vdso.
-%patch811 -p1
-
 # Xen exec-shield bits
 %if %{includexen}
+%patch811 -p1
 %patch812 -p1
 %patch813 -p1
 #%patch815 -p1
@@ -1572,8 +1575,10 @@
 %endif
 
 %changelog
-* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase 1.1927.
+- added xen smp fixes.
+- added xen x86_64 fixes.
 
 * Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase rawhide 1.1924.



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:27:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:27:23 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.137,
	1.138
Message-ID: <200602101827.k1AIRN1Z019505@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-serv19405

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Fri Feb 10 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_79rh
- Install compatibility amd64 symlink.




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.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- java-1.4.2-gcj-compat.spec	8 Feb 2006 19:57:05 -0000	1.137
+++ java-1.4.2-gcj-compat.spec	10 Feb 2006 18:27:19 -0000	1.138
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_78rh
+%define release 	40jpp_79rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -297,6 +297,11 @@
   fi
 popd
 
+%ifarch x86_64
+ln -s %{_jvmdir}/%{jredir}/lib/%{_arch} \
+  $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -564,6 +569,9 @@
 %endif
 %{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
 %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+%ifarch x86_64
+%{_jvmdir}/%{jredir}/lib/amd64
+%endif
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -598,6 +606,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Fri Feb 10 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_79rh
+- Install compatibility amd64 symlink.
+
 * Wed Feb  8 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_78rh
 - Install javadocs in versioned directory.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:29:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:29:20 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.57,
	1.58 linux-2.6-xen-smp.patch, 1.1, NONE
Message-ID: <200602101829.k1AITK7e011397@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Removed Files:
	linux-2.6-xen-smp.patch 
Log Message:
same patch as linux-2.6-percpu-NR_CPUS-hotplug-fix.patch


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kernel-xen.spec	10 Feb 2006 18:24:04 -0000	1.57
+++ kernel-xen.spec	10 Feb 2006 18:29:18 -0000	1.58
@@ -255,7 +255,7 @@
 Patch706: linux-2.6.14-xen_remap_vma_flags.patch
 Patch707: linux-2.6-xen-acpi.patch
 Patch708: linux-2.6-xen-x86_64-fixes.patch
-Patch709: linux-2.6-xen-smp.patch
+Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -1212,7 +1212,7 @@
 
 # prepare directories
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/boot
+
 
 %if %{buildxen}
   cd xen


--- linux-2.6-xen-smp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:33:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:33:34 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.58,1.59
Message-ID: <200602101833.k1AIXYAk014038@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
compile in all arches


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kernel-xen.spec	10 Feb 2006 18:29:18 -0000	1.58
+++ kernel-xen.spec	10 Feb 2006 18:33:03 -0000	1.59
@@ -160,8 +160,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch:noarch x86_64
+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  Fri Feb 10 18:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:34:24 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1931,1.1932
Message-ID: <200602101834.k1AIYOt0014064@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
drop borken bits



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1931
retrieving revision 1.1932
diff -u -r1.1931 -r1.1932
--- kernel-2.6.spec	10 Feb 2006 17:49:02 -0000	1.1931
+++ kernel-2.6.spec	10 Feb 2006 18:34:00 -0000	1.1932
@@ -703,9 +703,9 @@
 # Reboot thru bios on HP laptops.
 %patch205 -p1
 # Implement TIF_RESTORE_SIGMASK
-%patch206 -p1
+#%patch206 -p1
 # Generic sys_rt_sigsuspend()
-%patch207 -p1
+#%patch207 -p1
 
 # 
 # ppc64
@@ -1537,6 +1537,8 @@
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git8
 - Begin the kernel-xen & kernel merge by merging the easy bits.
+- Remove x86_64 TIF_RESTORE_SIGMASK & generic sys_rt_sigsuspend
+  (They seemed to cause big problems)
 
 * Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase rawhide 1.1924.



From fedora-cvs-commits at redhat.com  Fri Feb 10 18:40:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 13:40:01 -0500
Subject: rpms/audit/devel audit-1.1.4-semanage.patch, 1.2, 1.3 audit.spec,
	1.80, 1.81
Message-ID: <200602101840.k1AIe1Xd014269@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14254

Modified Files:
	audit-1.1.4-semanage.patch audit.spec 
Log Message:
* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-4
- Change audit_log_semanage_message to check strlen as well as NULL.


audit-1.1.4-semanage.patch:
 audit_logging.c |   37 ++++++++++++++++++++++---------------
 libaudit.h      |    5 +++--
 2 files changed, 25 insertions(+), 17 deletions(-)

Index: audit-1.1.4-semanage.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-1.1.4-semanage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audit-1.1.4-semanage.patch	9 Feb 2006 22:21:09 -0000	1.2
+++ audit-1.1.4-semanage.patch	10 Feb 2006 18:39:57 -0000	1.3
@@ -1,6 +1,6 @@
 diff -ur audit-1.1.4.orig/lib/audit_logging.c audit-1.1.4/lib/audit_logging.c
 --- audit-1.1.4.orig/lib/audit_logging.c	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/audit_logging.c	2006-02-09 17:14:53.000000000 -0500
++++ audit-1.1.4/lib/audit_logging.c	2006-02-10 13:28:28.000000000 -0500
 @@ -405,8 +405,10 @@
   *        only when user is NULL.
   * new_seuser - the new seuser that the login user is getting
@@ -24,9 +24,21 @@
  	const char *tty, int result)
  {
  	const char *success;
-@@ -445,12 +448,14 @@
+@@ -436,21 +439,23 @@
  
- 	if (name)
+ 	_resolve_addr(addrbuf, host);
+ 
+-	if (pgname == NULL) {
++	if (pgname == NULL || strlen(pgname) == 0) {
+ 		_get_exename(exename, sizeof(exename));
+ 		pgname = exename;
+ 	}
+-	if (tty == NULL) 
++	if (tty == NULL || strlen(tty) == 0) 
+ 		tty = _get_tty(ttyname, TTY_PATH);
+ 
+-	if (name)
++	if (name && strlen(name) > 0)
  		snprintf(buf, sizeof(buf), 
 -	     "op=%s acct=%s old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 +	     "op=%s acct=%s old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
@@ -66,7 +78,7 @@
  			addrbuf,
 diff -ur audit-1.1.4.orig/lib/libaudit.h audit-1.1.4/lib/libaudit.h
 --- audit-1.1.4.orig/lib/libaudit.h	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/libaudit.h	2006-02-09 16:14:51.000000000 -0500
++++ audit-1.1.4/lib/libaudit.h	2006-02-09 17:15:39.000000000 -0500
 @@ -384,8 +384,9 @@
  	const char *tty, uid_t uid);
  extern int audit_log_semanage_message(int audit_fd, int type,


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- audit.spec	9 Feb 2006 22:21:09 -0000	1.80
+++ audit.spec	10 Feb 2006 18:39:57 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-4
+- Change audit_log_semanage_message to check strlen as well as NULL.
+
 * Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
 - Change audit_log_semanage_message to take new params.
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:29:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:29:39 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.59,1.60
Message-ID: <200602101929.k1AJTdWh027113@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
really need xen x86_64 config files


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kernel-xen.spec	10 Feb 2006 18:33:03 -0000	1.59
+++ kernel-xen.spec	10 Feb 2006 19:29:18 -0000	1.60
@@ -160,7 +160,8 @@
 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 s390 s390x
+ExclusiveArch: noarch x86_64 ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -209,6 +210,8 @@
 #Source36: kernel-%{kversion}-sparc64-smp.config
 Source37: kernel-%{kversion}-i686-hypervisor-PAE.config
 Source38: kernel-%{kversion}-i686-guest-PAE.config
+Source39: kernel-%{kversion}-x86_64-hypervisor-PAE.config
+Source40: kernel-%{kversion}-x86_64-guest.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:40:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:40:42 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.60,1.61
Message-ID: <200602101940.k1AJegaC029725@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
x86_64 don't need PAE suffix


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kernel-xen.spec	10 Feb 2006 19:29:18 -0000	1.60
+++ kernel-xen.spec	10 Feb 2006 19:40:40 -0000	1.61
@@ -210,7 +210,7 @@
 #Source36: kernel-%{kversion}-sparc64-smp.config
 Source37: kernel-%{kversion}-i686-hypervisor-PAE.config
 Source38: kernel-%{kversion}-i686-guest-PAE.config
-Source39: kernel-%{kversion}-x86_64-hypervisor-PAE.config
+Source39: kernel-%{kversion}-x86_64-hypervisor.config
 Source40: kernel-%{kversion}-x86_64-guest.config
 
 #



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:50:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:50:17 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git9.bz2.sign, NONE,
	1.1 .cvsignore, 1.344, 1.345 kernel-2.6.spec, 1.1932,
	1.1933 sources, 1.286, 1.287 upstream, 1.260,
	1.261 patch-2.6.16-rc2-git8.bz2.sign, 1.1, NONE
Message-ID: <200602101950.k1AJoHpi013845@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git9.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git8.bz2.sign 
Log Message:
git9



--- NEW FILE patch-2.6.16-rc2-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD7OMsyGugalF9Dw4RAmY6AJ9lETBZP0O/DCMdQh1/SzvPhiMYpQCfXIQ4
fCckncunM5pTalPAZjEccZg=
=0OSu
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- .cvsignore	10 Feb 2006 10:05:34 -0000	1.344
+++ .cvsignore	10 Feb 2006 19:50:14 -0000	1.345
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git8.bz2
+patch-2.6.16-rc2-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1932
retrieving revision 1.1933
diff -u -r1.1932 -r1.1933
--- kernel-2.6.spec	10 Feb 2006 18:34:00 -0000	1.1932
+++ kernel-2.6.spec	10 Feb 2006 19:50:14 -0000	1.1933
@@ -211,7 +211,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git8.bz2
+Patch2: patch-2.6.16-rc2-git9.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -1535,7 +1535,7 @@
 
 %changelog
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git8
+- 2.6.16rc2-git8 & -git9
 - Begin the kernel-xen & kernel merge by merging the easy bits.
 - Remove x86_64 TIF_RESTORE_SIGMASK & generic sys_rt_sigsuspend
   (They seemed to cause big problems)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- sources	10 Feb 2006 10:05:34 -0000	1.286
+++ sources	10 Feb 2006 19:50:15 -0000	1.287
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-22f793f90eb19d463b672a29000d3a8d  patch-2.6.16-rc2-git8.bz2
+2372504ca717972c7e099ee4da5080bb  patch-2.6.16-rc2-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- upstream	10 Feb 2006 10:05:34 -0000	1.260
+++ upstream	10 Feb 2006 19:50:15 -0000	1.261
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git8.bz2
+patch-2.6.16-rc2-git9.bz2


--- patch-2.6.16-rc2-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:52:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:52:58 -0500
Subject: rpms/perl/devel perl-5.8.8-debian_fix_net_nntp.patch,NONE,1.1
Message-ID: <200602101952.k1AJqwub015080@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-debian_fix_net_nntp.patch 
Log Message:
debian's fix for Net::NNTP

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

--- NEW FILE perl-5.8.8-debian_fix_net_nntp.patch ---
--- perl-5.8.8/lib/Net/NNTP.pm.debian_fix_net_nntp.patch	2004-05-06 09:36:05.000000000 -0400
+++ perl-5.8.8/lib/Net/NNTP.pm	2006-02-10 14:01:30.000000000 -0500
@@ -120,7 +120,7 @@
  my $nntp = shift;
  my @fh;
 
- @fh = (pop) if @_ == 2 || (@_ && ref($_[0]) || ref(\$_[0]) eq 'GLOB');
+ @fh = (pop) if @_ == 2 || (@_ && (ref($_[0]) || ref(\$_[0]) eq 'GLOB'));
 
  $nntp->_ARTICLE(@_)
     ? $nntp->read_until_dot(@fh)



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:54:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:54:10 -0500
Subject: rpms/perl/devel perl.spec,1.82,1.83
Message-ID: <200602101954.k1AJsAMh015649@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
perl.spec


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- perl.spec	7 Feb 2006 00:16:34 -0000	1.82
+++ perl.spec	10 Feb 2006 19:54:08 -0000	1.83
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    1.2
+%define perlrel    2
 %define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -144,6 +144,9 @@
 # module updatesd
 # Patch202:       perl-5.8.0-Safe2.09.patch
 Patch178343:	perl-5.8.8-bz178343.patch
+#
+# Debian's fix for Net::NNTP:
+Patch32:        perl-5.8.8-debian_fix_net_nntp.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
@@ -316,6 +319,8 @@
 
 %patch178343 -p1
 
+%patch32 -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()
@@ -524,6 +529,12 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-2
+- Rebuild again
+- Debian released 5.8.8 patches today; apply only relevant difference:
+  03_fix_net_nntp : fix precedence in Net::NNTP::article 
+                    from Brendan O'Dea<bod at debian.org>
+
 * Mon Feb 06 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-1.2
 - Rebuild with new gcc, glibc, and glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 19:54:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 14:54:58 -0500
Subject: rpms/perl/devel perl.spec,1.83,1.84
Message-ID: <200602101954.k1AJswF2016014@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
Rebuild (again); merge in Debian's Net::NNTP fix





From fedora-cvs-commits at redhat.com  Fri Feb 10 20:20:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:20:57 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.6,1.18.2.7
Message-ID: <200602102020.k1AKKvZe004082@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4011

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
fix build - it installs goffice privately



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -u -r1.18.2.6 -r1.18.2.7
--- gnucash.spec	23 Jan 2006 17:14:19 -0000	1.18.2.6
+++ gnucash.spec	10 Feb 2006 20:20:54 -0000	1.18.2.7
@@ -1,4 +1,4 @@
-%define svnrev 12955
+%define svnrev 13127
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
@@ -112,8 +112,6 @@
 %{_datadir}/gnome/help/gnucash
 %{_datadir}/mime-info/gnucash.*
 %{_datadir}/omf/gnucash-docs
-%{_datadir}/pixmaps/goffice
-%{_datadir}/goffice
 %{_datadir}/applications/*
 %{_mandir}/man*/*
 %config %{_sysconfdir}/gnucash



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:36:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:36:10 -0500
Subject: rpms/gnucash/devel .cvsignore, 1.12.2.3, 1.12.2.4 gnucash.spec,
	1.18.2.7, 1.18.2.8 sources, 1.12.2.3, 1.12.2.4
Message-ID: <200602102036.k1AKaAGg008604@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8537

Modified Files:
      Tag: gnucash-g2-branch
	.cvsignore gnucash.spec sources 
Log Message:
official 1.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- .cvsignore	23 Jan 2006 17:14:19 -0000	1.12.2.3
+++ .cvsignore	10 Feb 2006 20:36:08 -0000	1.12.2.4
@@ -6,3 +6,5 @@
 gnucash-docs-1.9.0.svn12307.tar.bz2
 gnucash-1.9.0.svn12955.tar.bz2
 gnucash-docs-1.9.0.svn12955.tar.bz2
+gnucash-1.9.0.tar.gz
+gnucash-docs-1.9.0.svn13195.tar.bz2


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- gnucash.spec	10 Feb 2006 20:20:54 -0000	1.18.2.7
+++ gnucash.spec	10 Feb 2006 20:36:08 -0000	1.18.2.8
@@ -1,14 +1,15 @@
-%define svnrev 13127
+%define svnrev 13195
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
 Version: 1.9.0
-Release: 0.svn%{svnrev}.1
+Release: 1
+# Release: 1.svn%{svnrev}.1
 License: GPL/GFDL
 Group: Applications/Productivity
-#Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz
+Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/%{name}-%{version}.tar.gz
 #Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz
-Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
+#Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
 Source1: gnucash-docs-1.9.0.svn%{svnrev}.tar.bz2
 Patch3: gnucash-1.8.11-icon.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
@@ -119,6 +120,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Fri Feb 10 2005 Bill Nottingham <notting at redhat.com> 1.9.0-1
+- update to official 1.9.0
+
 * Sat Dec 24 2005 Bill Nottingham <notting at redhat.com> 1.9.0-0.12168.1
 - update to 2.x branch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- sources	23 Jan 2006 17:14:19 -0000	1.12.2.3
+++ sources	10 Feb 2006 20:36:08 -0000	1.12.2.4
@@ -1,2 +1,2 @@
-02ab326d552c8a7646afb9febc6c969c  gnucash-1.9.0.svn12955.tar.bz2
-b614b3db74d18da91a23b80f609e4934  gnucash-docs-1.9.0.svn12955.tar.bz2
+4b3dd389c9ee007dae1307f1bc2696e0  gnucash-1.9.0.tar.gz
+81ee8609a14ac0bd1cf8d601e3a4ae8e  gnucash-docs-1.9.0.svn13195.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:36:28 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.8,1.18.2.9
Message-ID: <200602102036.k1AKaSxh023479@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16205

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
2006, doofus



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
diff -u -r1.18.2.8 -r1.18.2.9
--- gnucash.spec	10 Feb 2006 20:36:08 -0000	1.18.2.8
+++ gnucash.spec	10 Feb 2006 20:36:25 -0000	1.18.2.9
@@ -120,7 +120,7 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Fri Feb 10 2005 Bill Nottingham <notting at redhat.com> 1.9.0-1
+* Fri Feb 10 2006 Bill Nottingham <notting at redhat.com> 1.9.0-1
 - update to official 1.9.0
 
 * Sat Dec 24 2005 Bill Nottingham <notting at redhat.com> 1.9.0-0.12168.1



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:38:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:38:45 -0500
Subject: rpms/avahi/devel avahi-0.6.3-lockfile.patch,1.1,1.2
Message-ID: <200602102038.k1AKcjwb002927@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2911

Modified Files:
	avahi-0.6.3-lockfile.patch 
Log Message:
avahi-dnsconfd lockfile must be named avahi-dnsconfd, not avahi-daemon

avahi-0.6.3-lockfile.patch:
 avahi-daemon.in   |   20 ++++++++++++--------
 avahi-dnsconfd.in |   17 +++++++++++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

Index: avahi-0.6.3-lockfile.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.3-lockfile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.3-lockfile.patch	20 Jan 2006 18:12:43 -0000	1.1
+++ avahi-0.6.3-lockfile.patch	10 Feb 2006 20:38:43 -0000	1.2
@@ -1,13 +1,20 @@
---- avahi-0.6.3/initscript/fedora/avahi-dnsconfd.in.lockfile	2006-01-19 09:53:11.000000000 -0500
-+++ avahi-0.6.3/initscript/fedora/avahi-dnsconfd.in	2006-01-19 09:59:20.000000000 -0500
-@@ -23,11 +23,18 @@
- AVAHI_BIN=@sbindir@/avahi-dnsconfd
+--- avahi-0.6.6/initscript/fedora/avahi-daemon.in.lockfile	2006-02-10 15:35:33.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-daemon.in	2006-02-10 15:35:33.000000000 -0500
+@@ -23,18 +23,20 @@
+ AVAHI_BIN=@sbindir@/avahi-daemon
  test -x $AVAHI_BIN || exit 5
  
 +LOCKFILE=/var/lock/subsys/avahi-daemon
 +
+ base=${0##*/}
+ 
  start() {
- 	echo -n $"Starting Avahi DNS daemon... "
+ 	echo -n $"Starting Avahi daemon... "
+-	if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then
+-	    success;
+-	    echo;
+-	    return 0;
+-	fi;
          $AVAHI_BIN -D
  	RETVAL=$?
 -	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
@@ -20,45 +27,36 @@
  	echo
  	return $RETVAL
  }
-@@ -36,6 +43,8 @@
-         echo -n "Shutting down Avahi DNS daemon: "
+@@ -44,6 +46,7 @@
          $AVAHI_BIN -k
  	RETVAL=$?
-+	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+ 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
 +	rm -f $LOCKFILE
  	echo
  	return $RETVAL
  }
-@@ -76,9 +85,9 @@
+@@ -83,8 +86,9 @@
          reload 
  	;;
    condrestart)
 -        $AVAHI_BIN -c
 -        [ $? = 0 ] && restart || :
--	;;
 +  	if [ -f $LOCKFILE ]; then
 +		restart
 +	fi
+ 	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
- 	exit 1
---- avahi-0.6.3/initscript/fedora/avahi-daemon.in.lockfile	2006-01-19 09:53:05.000000000 -0500
-+++ avahi-0.6.3/initscript/fedora/avahi-daemon.in	2006-01-19 09:59:20.000000000 -0500
-@@ -23,18 +23,20 @@
- AVAHI_BIN=@sbindir@/avahi-daemon
+--- avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in.lockfile	2006-02-10 15:35:33.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in	2006-02-10 15:36:14.000000000 -0500
+@@ -23,11 +23,18 @@
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
  test -x $AVAHI_BIN || exit 5
  
-+LOCKFILE=/var/lock/subsys/avahi-daemon
++LOCKFILE=/var/lock/subsys/avahi-dnsconfd
 +
- base=${0##*/}
- 
  start() {
- 	echo -n $"Starting Avahi daemon... "
--	if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then
--	    success;
--	    echo;
--	    return 0;
--	fi;
+ 	echo -n $"Starting Avahi DNS daemon... "
          $AVAHI_BIN -D
  	RETVAL=$?
 -	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
@@ -71,23 +69,25 @@
  	echo
  	return $RETVAL
  }
-@@ -44,6 +46,7 @@
+@@ -36,6 +43,8 @@
+         echo -n "Shutting down Avahi DNS daemon: "
          $AVAHI_BIN -k
  	RETVAL=$?
- 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
++	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
 +	rm -f $LOCKFILE
  	echo
  	return $RETVAL
  }
-@@ -83,8 +86,9 @@
+@@ -76,9 +85,9 @@
          reload 
  	;;
    condrestart)
 -        $AVAHI_BIN -c
 -        [ $? = 0 ] && restart || :
+-	;;
 +  	if [ -f $LOCKFILE ]; then
 +		restart
 +	fi
- 	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+ 	exit 1



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:39:36 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.9,1.18.2.10
Message-ID: <200602102039.k1AKdaLo002957@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2942

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
fix for official



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.9
retrieving revision 1.18.2.10
diff -u -r1.18.2.9 -r1.18.2.10
--- gnucash.spec	10 Feb 2006 20:36:25 -0000	1.18.2.9
+++ gnucash.spec	10 Feb 2006 20:39:34 -0000	1.18.2.10
@@ -34,7 +34,7 @@
 balanced books.
 
 %prep
-%setup -q -n gnucash -a 1
+%setup -q -a 1
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
 %patch5 -p1 -b .aq



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:42:36 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.10,1.18.2.11
Message-ID: <200602102042.k1AKgabC003061@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3048

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
oops, fix that one too



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.10
retrieving revision 1.18.2.11
diff -u -r1.18.2.10 -r1.18.2.11
--- gnucash.spec	10 Feb 2006 20:39:34 -0000	1.18.2.10
+++ gnucash.spec	10 Feb 2006 20:42:33 -0000	1.18.2.11
@@ -40,7 +40,7 @@
 %patch5 -p1 -b .aq
 
 %build
-./autogen.sh --prefix=/usr
+#./autogen.sh --prefix=/usr
 %configure --disable-sql --enable-error-on-warning=no \
 	--enable-ofx \
 	--enable-hbci \



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:44:23 -0500
Subject: rpms/avahi/devel avahi-0.6.3-lockfile.patch,1.2,1.3
Message-ID: <200602102044.k1AKiNhK003146@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3131

Modified Files:
	avahi-0.6.3-lockfile.patch 
Log Message:
further fix for bug 178746: avahi-dnsconfd lockfile must be named avahi-dnsconfd, not avahi-daemon

avahi-0.6.3-lockfile.patch:
 avahi-daemon.in   |   20 ++++++++++++--------
 avahi-dnsconfd.in |   21 +++++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

Index: avahi-0.6.3-lockfile.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.3-lockfile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avahi-0.6.3-lockfile.patch	10 Feb 2006 20:38:43 -0000	1.2
+++ avahi-0.6.3-lockfile.patch	10 Feb 2006 20:44:19 -0000	1.3
@@ -1,5 +1,5 @@
---- avahi-0.6.6/initscript/fedora/avahi-daemon.in.lockfile	2006-02-10 15:35:33.000000000 -0500
-+++ avahi-0.6.6/initscript/fedora/avahi-daemon.in	2006-02-10 15:35:33.000000000 -0500
+--- avahi-0.6.6/initscript/fedora/avahi-daemon.in.lockfile	2006-02-10 15:41:55.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-daemon.in	2006-02-10 15:41:55.000000000 -0500
 @@ -23,18 +23,20 @@
  AVAHI_BIN=@sbindir@/avahi-daemon
  test -x $AVAHI_BIN || exit 5
@@ -47,8 +47,19 @@
  	;;
    *)
  	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
---- avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in.lockfile	2006-02-10 15:35:33.000000000 -0500
-+++ avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in	2006-02-10 15:36:14.000000000 -0500
+--- avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in.lockfile	2006-02-10 15:41:55.000000000 -0500
++++ avahi-0.6.6/initscript/fedora/avahi-dnsconfd.in	2006-02-10 15:43:03.000000000 -0500
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ #
+-# avahi-daemon:       Starts the Avahi dns configuration daemon
++# avahi-dnsconfd:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 34 98 02
++# chkconfig: - 98 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
+ #       on the local LAN. This is useful for configuring unicast DNS servers in
 @@ -23,11 +23,18 @@
  AVAHI_BIN=@sbindir@/avahi-dnsconfd
  test -x $AVAHI_BIN || exit 5



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:47:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:47:42 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.11,1.18.2.12
Message-ID: <200602102047.k1AKlgWU015683@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15670

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.11
retrieving revision 1.18.2.12
diff -u -r1.18.2.11 -r1.18.2.12
--- gnucash.spec	10 Feb 2006 20:42:33 -0000	1.18.2.11
+++ gnucash.spec	10 Feb 2006 20:47:40 -0000	1.18.2.12
@@ -15,12 +15,12 @@
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 Patch5: gnucash-1.8.12-aq.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml3-devel
-BuildPrereq: libgsf-devel >= 1.12.2
+BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel
+BuildRequires: libgsf-devel >= 1.12.2
 # cairo-devel >= 0.5.0
-BuildPrereq: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
-BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl
-BuildRequires: desktop-file-utils, scrollkeeper texinfo
+BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
+BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl
+BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel
 Requires: slib >= 3a1-5
 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4
 %define __perl_requires  %{nil}



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:48:32 -0500
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.13.90-shrink-em.patch, NONE,
	1.1 gnome-screensaver.spec, 1.52, 1.53
Message-ID: <200602102048.k1AKmW2M015770@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.13.90-shrink-em.patch 
Log Message:
- take some more measures to cut cpu usage down


gnome-screensaver-2.13.90-shrink-em.patch:
 floaters.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE gnome-screensaver-2.13.90-shrink-em.patch ---
--- gnome-screensaver-2.13.90/savers/floaters.c.shrink-em	2006-02-10 14:20:32.000000000 -0500
+++ gnome-screensaver-2.13.90/savers/floaters.c	2006-02-10 15:39:31.000000000 -0500
@@ -47,14 +47,14 @@
 #endif
 
 #ifndef FLOATER_MAX_SIZE
-#define FLOATER_MAX_SIZE (256.0)
+#define FLOATER_MAX_SIZE (128.0)
 #endif
 
 #ifndef FLOATER_MIN_SIZE
 #define FLOATER_MIN_SIZE (16.0)
 #endif
 #ifndef FLOATER_DEFAULT_COUNT
-#define FLOATER_DEFAULT_COUNT (16)
+#define FLOATER_DEFAULT_COUNT (5)
 #endif
 
 #ifndef SMALL_ANGLE
@@ -565,7 +565,7 @@
       floater->path_start_scale = floater->scale;
 
       if (g_random_double () > .5)
-        floater->path_end_scale = g_random_double_range (0.25, 1.0);
+        floater->path_end_scale = g_random_double_range (0.10, performance_ratio);
 
       /* poor man's distribution */
       if (screen_saver->should_do_rotations &&
@@ -914,7 +914,7 @@
 static gdouble
 screen_saver_get_image_cache_usage (ScreenSaver *screen_saver)
 {
-  static const gdouble cache_capacity = (FLOATER_MAX_SIZE - FLOATER_MIN_SIZE);
+  static const gdouble cache_capacity = (FLOATER_MAX_SIZE - FLOATER_MIN_SIZE + 1);
 
   return g_hash_table_size (screen_saver->cached_sources) / cache_capacity;
 }
@@ -984,12 +984,12 @@
   for (tmp = screen_saver->floaters; tmp != NULL; tmp = tmp->next)
     {
       ScreenSaverFloater *floater;
-#ifdef CULL_FLOATERS
+#ifdef CULL_FLOATERS || 1
       GdkRectangle rect;
       gint size;
 
-      rect.x = (int) (floater->position.x - .5 * size);
-      rect.y = (int) (floater->position.y - .5 * size);
+      rect.x = (int) (floater->position.x - .5 * G_SQRT2 * size);
+      rect.y = (int) (floater->position.y - .5 * G_SQRT2 * size);
       rect.width = G_SQRT2 * size;
       rect.height = G_SQRT2 * size;
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gnome-screensaver.spec	7 Feb 2006 11:55:15 -0000	1.52
+++ gnome-screensaver.spec	10 Feb 2006 20:48:30 -0000	1.53
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 2.1
+Release: 3
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 
 Patch0: gnome-screensaver-2.13.90-lock-dialog.patch
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
+Patch2: gnome-screensaver-2.13.90-shrink-em.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org
@@ -60,6 +61,7 @@
 %setup -q -a2
 %patch0 -p1 -b .lock-dialog
 %patch1 -p1 -b .use-floaters-by-default
+%patch2 -p1 -b .shrink-em
 
 %build
 intltoolize --force
@@ -146,6 +148,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-3
+- take some more measures to cut cpu usage down
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:50:44 -0500
Subject: rpms/avahi/devel avahi.spec,1.37,1.38
Message-ID: <200602102050.k1AKoiQg015861@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15847

Modified Files:
	avahi.spec 
Log Message:
Rebuild; further fix for bz178746


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- avahi.spec	8 Feb 2006 00:11:45 -0000	1.37
+++ avahi.spec	10 Feb 2006 20:50:41 -0000	1.38
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.6
-Release: 	2
+Release: 	3
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -302,6 +302,10 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-3
+- rebuild for new gcc (again)
+- further fix for bug 178746: fix avahi-dnsconfd initscript 
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-2
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 20:56:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 15:56:39 -0500
Subject: rpms/gtk-sharp2/devel .cvsignore, 1.3, 1.4 gtk-sharp2.spec, 1.10,
	1.11 sources, 1.3, 1.4
Message-ID: <200602102056.k1AKudMJ025217@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gtk-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25183

Modified Files:
	.cvsignore gtk-sharp2.spec sources 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 2.8.1-1
- Update to 2.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Jan 2006 23:14:45 -0000	1.3
+++ .cvsignore	10 Feb 2006 20:56:37 -0000	1.4
@@ -1,2 +1,3 @@
 gtk-sharp-2.4.0.tar.gz
 gtk-sharp-2.8.0.tar.gz
+gtk-sharp-2.8.1.tar.gz


Index: gtk-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtk-sharp2.spec	7 Feb 2006 12:09:56 -0000	1.10
+++ gtk-sharp2.spec	10 Feb 2006 20:56:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gtk-sharp2
-Version:        2.8.0
-Release:        1.1
+Version:        2.8.1
+Release:        1
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -92,6 +92,9 @@
 %{_prefix}/share/gapi-2.0
 
 %changelog
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 2.8.1-1
+- Update to 2.8.1
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Jan 2006 23:14:45 -0000	1.3
+++ sources	10 Feb 2006 20:56:37 -0000	1.4
@@ -1 +1 @@
-4a6a802ce9a021867c7a90dfe3bc16a3  gtk-sharp-2.8.0.tar.gz
+4ac4f371b13b7e3cfad26eaadb0c9eeb  gtk-sharp-2.8.1.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:01:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:01:26 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.12,1.18.2.13
Message-ID: <200602102101.k1AL1BOj026544@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26470

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
Looks like we don't need to beat the aqbanking detection any more - yay.



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.12
retrieving revision 1.18.2.13
diff -u -r1.18.2.12 -r1.18.2.13
--- gnucash.spec	10 Feb 2006 20:47:40 -0000	1.18.2.12
+++ gnucash.spec	10 Feb 2006 21:01:08 -0000	1.18.2.13
@@ -37,7 +37,7 @@
 %setup -q -a 1
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
-%patch5 -p1 -b .aq
+#%patch5 -p1 -b .aq
 
 %build
 #./autogen.sh --prefix=/usr



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:03:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:03:21 -0500
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.25,1.26
Message-ID: <200602102103.k1AL3LIk026736@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26654

Modified Files:
	desktop-file-utils.spec 
Log Message:
- call update-desktop-database in %%preun (bug 180898)
- don't fail if update-desktop-database fails
- don't use %%makeinstall



Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- desktop-file-utils.spec	10 Feb 2006 17:24:58 -0000	1.25
+++ desktop-file-utils.spec	10 Feb 2006 21:03:00 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 5
+Release: 6
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch
@@ -36,7 +36,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We don't want the vfs module yet
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libmenu*
@@ -46,10 +46,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-desktop-database %{_datadir}/applications || :
 
-%postun
-update-desktop-database %{_datadir}/applications
+%preun
+update-desktop-database %{_datadir}/applications || :
 
 %files
 %defattr(-,root,root)
@@ -57,6 +57,11 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 0.10-6
+- call update-desktop-database in %%preun (bug 180898)
+- don't fail if update-desktop-database fails
+- don't use %%makeinstall
+
 * Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 0.10-5
 - call update-desktop-database in %%post (bug 180898)
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:09:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:09:23 -0500
Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.22,
	1.23 selinux-policy-strict.spec, 1.338, 1.339
Message-ID: <200602102109.k1AL9NB4027764@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-strict/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27732

Modified Files:
	policy-20050916.patch selinux-policy-strict.spec 
Log Message:
* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
- Final fix for zebra


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   63 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    5 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   14 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   14 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1680 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20050916.patch	9 Feb 2006 14:06:08 -0000	1.22
+++ policy-20050916.patch	10 Feb 2006 21:09:19 -0000	1.23
@@ -3099,7 +3099,7 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-09 08:59:05.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-10 12:07:40.000000000 -0500
 @@ -8,7 +8,7 @@
  type zebra_conf_t, file_type, sysadmfile;
  r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
@@ -3116,7 +3116,7 @@
 -allow zebra_t self:netlink_route_socket r_netlink_socket_perms;
 +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
  allow zebra_t zebra_port_t:tcp_socket name_bind;
-+allow zebra_t bgp_port_t:tcp_socket name_connect;
++allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect };
  
  allow zebra_t proc_t:file { getattr read };
  allow zebra_t { sysctl_t sysctl_net_t }:dir search;


Index: selinux-policy-strict.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- selinux-policy-strict.spec	9 Feb 2006 14:06:08 -0000	1.338
+++ selinux-policy-strict.spec	10 Feb 2006 21:09:19 -0000	1.339
@@ -11,7 +11,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.22
+Release: 2.23
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -229,6 +229,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
+- Final fix for zebra
+
 * Thu Feb 9 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.22
 - Allow zebra to connect to bgp
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:18:57 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.50,1.51
Message-ID: <200602102118.k1ALIvmn011848@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
better fix


linux-2.6-compile-fixes.patch:
 compat_signal.c |    1 -
 1 files changed, 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- linux-2.6-compile-fixes.patch	10 Feb 2006 17:49:03 -0000	1.50
+++ linux-2.6-compile-fixes.patch	10 Feb 2006 21:18:54 -0000	1.51
@@ -6,12 +6,11 @@
 
 --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~	2006-02-10 12:47:57.000000000 -0500
 +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c	2006-02-10 12:48:05.000000000 -0500
-@@ -196,7 +196,7 @@ sys32_sigaction(int sig, const struct ol
+@@ -196,7 +196,6 @@ sys32_sigaction(int sig, const struct ol
  }
  
  int
 -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
-+do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact);
  
  asmlinkage long
  sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:25:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:25:20 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.18.2.13,1.18.2.14
Message-ID: <200602102125.k1ALPK0U014797@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14723

Modified Files:
      Tag: gnucash-g2-branch
	gnucash.spec 
Log Message:
more build tweaks



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.13
retrieving revision 1.18.2.14
diff -u -r1.18.2.13 -r1.18.2.14
--- gnucash.spec	10 Feb 2006 21:01:08 -0000	1.18.2.13
+++ gnucash.spec	10 Feb 2006 21:25:18 -0000	1.18.2.14
@@ -116,7 +116,7 @@
 %{_datadir}/applications/*
 %{_mandir}/man*/*
 %config %{_sysconfdir}/gnucash
-%doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches
+%doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog



From fedora-cvs-commits at redhat.com  Fri Feb 10 21:28:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 16:28:03 -0500
Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.51,1.52
Message-ID: <200602102128.k1ALS3kP016105@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
duh


linux-2.6-compile-fixes.patch:
 compat_signal.c |    3 ---
 1 files changed, 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- linux-2.6-compile-fixes.patch	10 Feb 2006 21:18:54 -0000	1.51
+++ linux-2.6-compile-fixes.patch	10 Feb 2006 21:28:00 -0000	1.52
@@ -6,11 +6,11 @@
 
 --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~	2006-02-10 12:47:57.000000000 -0500
 +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c	2006-02-10 12:48:05.000000000 -0500
-@@ -196,7 +196,6 @@ sys32_sigaction(int sig, const struct ol
+@@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
  }
  
- int
+-int
 -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
- 
+-
  asmlinkage long
  sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:02:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:02:09 -0500
Subject: rpms/gawk/devel gawk-3.1.5-wconcat.patch, NONE, 1.1 gawk.spec, 1.32,
	1.33
Message-ID: <200602102202.k1AM29bg007588@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7549

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.5-wconcat.patch 
Log Message:
fix wide characters concatenation

gawk-3.1.5-wconcat.patch:
 eval.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gawk-3.1.5-wconcat.patch ---
--- gawk-3.1.5/eval.c.wconcat	2006-02-10 22:45:26.000000000 +0100
+++ gawk-3.1.5/eval.c	2006-02-10 22:46:01.000000000 +0100
@@ -1176,6 +1176,7 @@
 			memcpy(l->stptr + l->stlen, r->stptr, r->stlen);
 			l->stlen += r->stlen;
 			l->stptr[l->stlen] = '\0';
+			l->flags &= ~WSTRCUR;
 		} else {
 			char *nval;
 			size_t nlen = l->stlen + r->stlen + 2;


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gawk.spec	7 Feb 2006 11:43:35 -0000	1.32
+++ gawk.spec	10 Feb 2006 22:01:46 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 5.1
+Release: 6
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -15,6 +15,7 @@
 Patch3: gawk-3.1.5-fieldwidths.patch
 Patch4:	gawk-3.1.5-binmode.patch
 Patch5: gawk-3.1.5-num2str.patch
+Patch6: gawk-3.1.5-wconcat.patch
 
 %description
 The gawk packages contains the GNU version of awk, a text processing
@@ -31,6 +32,7 @@
 %patch3 -p1 -b .fieldwidths
 %patch4 -p1 -b .binmode
 %patch5 -p1 -b .num2str
+%patch6 -p1 -b .wconcat
 
 %build
 %configure
@@ -79,6 +81,9 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-6
+- fix wide characters concatenation
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:39:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:39:06 -0500
Subject: rpms/eclipse-bugzilla/devel .cvsignore, 1.3,
	1.4 eclipse-bugzilla.spec, 1.28, 1.29 sources, 1.14, 1.15
Message-ID: <200602102239.k1AMd6gA024678@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24656

Modified Files:
	.cvsignore eclipse-bugzilla.spec sources 
Log Message:
* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1
- Update to version 0.2.0 which includes bugfixes and xmlrpc support for
bugzilla.redhat.com.
- Remove _fc from versioning.
- Add Requires and BuildRequires on xmlrpc.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 21:10:36 -0000	1.3
+++ .cvsignore	10 Feb 2006 22:39:03 -0000	1.4
@@ -1 +1 @@
-eclipse-bugzilla-fetched-HEAD-0.1.1.tar.gz
+eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- eclipse-bugzilla.spec	10 Feb 2006 16:49:54 -0000	1.28
+++ eclipse-bugzilla.spec	10 Feb 2006 22:39:03 -0000	1.29
@@ -6,9 +6,9 @@
 %define section			free
 %define eclipse_name 		eclipse
 %define	version_major		0
-%define version_minor		1
+%define version_minor		2
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	1
+%define version_micro   	0
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -22,28 +22,38 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	6.4
+Release:	1	
 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: xmlrpc >= 2.0.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 
 # this is to check out org.eclipse.team.bugzilla.releng.  Edit maps/bugzilla.map 
-# to refer to the# tag appropriate to the release.  Then run the "fetch" 
+# to refer to the tag appropriate to the release.  Then run the "fetch" 
 # target to fetch everything.  Package this up, such that the tar
 # file unpacks a new "org.eclipse.team.bugzilla.releng" directory with all the
-# contents.  See the java command to see how to invoke
-# things in the releng build.xml.
-
-Source0: eclipse-bugzilla-fetched-HEAD-0.1.1.tar.gz
+# contents. 
+# Here's an example of how to invoke that command from within the releng 
+# direcotry:
+#
+# 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/
+#     -DdontUnzip=true fetch 
+Source0: eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
 BuildRequires: eclipse-pde
 BuildRequires: libswt3-gtk2
+BuildRequires: xmlrpc >= 2.0.1
+
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.1-4
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
@@ -129,6 +139,12 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1
+- Update to version 0.2.0 which includes bugfixes and xmlrpc support for
+bugzilla.redhat.com.
+- Remove _fc from versioning. 
+- Add Requires and BuildRequires on xmlrpc.
+
 * Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.4
 - Use Epoch in Requires (rh#180915).
 - Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	21 Jul 2005 21:10:36 -0000	1.14
+++ sources	10 Feb 2006 22:39:03 -0000	1.15
@@ -1 +1 @@
-61f5a4b00f6c39f506214ea837fa4e71  eclipse-bugzilla-fetched-HEAD-0.1.1.tar.gz
+a0778247c17fd82fac9d43201304bddc  eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:42:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:42:38 -0500
Subject: rpms/audit/devel audit-1.1.4-semanage.patch, 1.3, 1.4 audit.spec,
	1.81, 1.82
Message-ID: <200602102242.k1AMgckw024889@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24875

Modified Files:
	audit-1.1.4-semanage.patch audit.spec 
Log Message:
* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-5
- Change audit_log_semanage_message to check strlen as well as NULL.


audit-1.1.4-semanage.patch:
 audit_logging.c |   45 ++++++++++++++++++++++++++-------------------
 libaudit.h      |    5 +++--
 2 files changed, 29 insertions(+), 21 deletions(-)

Index: audit-1.1.4-semanage.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-1.1.4-semanage.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- audit-1.1.4-semanage.patch	10 Feb 2006 18:39:57 -0000	1.3
+++ audit-1.1.4-semanage.patch	10 Feb 2006 22:42:34 -0000	1.4
@@ -1,6 +1,6 @@
 diff -ur audit-1.1.4.orig/lib/audit_logging.c audit-1.1.4/lib/audit_logging.c
 --- audit-1.1.4.orig/lib/audit_logging.c	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/audit_logging.c	2006-02-10 13:28:28.000000000 -0500
++++ audit-1.1.4/lib/audit_logging.c	2006-02-10 17:37:22.000000000 -0500
 @@ -405,8 +405,10 @@
   *        only when user is NULL.
   * new_seuser - the new seuser that the login user is getting
@@ -24,7 +24,7 @@
  	const char *tty, int result)
  {
  	const char *success;
-@@ -436,21 +439,23 @@
+@@ -436,39 +439,43 @@
  
  	_resolve_addr(addrbuf, host);
  
@@ -54,9 +54,12 @@
 +			new_role && strlen(new_role) ? new_role : "?",
 +			new_range && strlen(new_range) ? new_range : "?",
  			pgname,
- 			host ? host : "?",
+-			host ? host : "?",
++			host && strlen(host) ? host : "?",
  			addrbuf,
-@@ -459,12 +464,14 @@
+-			tty ? tty : "?",
++			tty && strlen(tty) ? tty : "?",
+ 			success
  			);
  	else
  		snprintf(buf, sizeof(buf),
@@ -74,11 +77,17 @@
 +			new_role && strlen(new_role) ? new_role : "?",
 +			new_range && strlen(new_range) ? new_range : "?",
  			pgname,
- 			host ? host : "?",
+-			host ? host : "?",
++			host && strlen(host) ? host : "?",
  			addrbuf,
+-			tty ? tty : "?",
++			tty && strlen(tty) ? tty : "?",
+ 			success
+ 			);
+ 
 diff -ur audit-1.1.4.orig/lib/libaudit.h audit-1.1.4/lib/libaudit.h
 --- audit-1.1.4.orig/lib/libaudit.h	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/libaudit.h	2006-02-09 17:15:39.000000000 -0500
++++ audit-1.1.4/lib/libaudit.h	2006-02-10 13:35:19.000000000 -0500
 @@ -384,8 +384,9 @@
  	const char *tty, uid_t uid);
  extern int audit_log_semanage_message(int audit_fd, int type,


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- audit.spec	10 Feb 2006 18:39:57 -0000	1.81
+++ audit.spec	10 Feb 2006 22:42:34 -0000	1.82
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -148,7 +148,7 @@
 
 
 %changelog
-* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-4
+* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-5
 - Change audit_log_semanage_message to check strlen as well as NULL.
 
 * Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:43:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:43:44 -0500
Subject: rpms/thunderbird/devel firefox-1.5.0.1-dumpstack.patch, NONE,
	1.1 thunderbird.spec, 1.62, 1.63
Message-ID: <200602102243.k1AMhiW9025009@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24987

Modified Files:
	thunderbird.spec 
Added Files:
	firefox-1.5.0.1-dumpstack.patch 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5-3
- Add dumpstack.patch
- Improve the langpack install stuff


firefox-1.5.0.1-dumpstack.patch:
 nsStackFrameUnix.cpp  |   16 +++-------------
 nsTraceRefcntImpl.cpp |   25 ++++++-------------------
 2 files changed, 9 insertions(+), 32 deletions(-)

--- NEW FILE firefox-1.5.0.1-dumpstack.patch ---
Index: xpcom/base/nsTraceRefcntImpl.cpp
===================================================================
RCS file: /cvs/mozilla/xpcom/base/nsTraceRefcntImpl.cpp,v
retrieving revision 1.98
diff -p -u -1 -2 -r1.98 nsTraceRefcntImpl.cpp
--- xpcom/base/nsTraceRefcntImpl.cpp	3 Feb 2006 19:35:14 -0000	1.98
+++ xpcom/base/nsTraceRefcntImpl.cpp	6 Feb 2006 20:30:53 -0000
@@ -41,37 +41,24 @@
 #include "nsISupports.h"
 #include "nsVoidArray.h"
 #include "prprf.h"
 #include "prlog.h"
 #include "plstr.h"
 #include <stdlib.h>
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include <math.h>
 
 #if defined(_WIN32)
 #include <windows.h>
-#elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
-#include <setjmp.h>
-
-//
-// On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
-// if __USE_GNU is defined.  I suppose its some kind of standards
-// adherence thing.
-//
-#if (__GLIBC_MINOR__ >= 1) && !defined(__USE_GNU)
-#define __USE_GNU
-#endif
-
-#include <dlfcn.h>
 #endif
 
 #ifdef HAVE_LIBDL
 #include <dlfcn.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 
 NS_COM void 
 NS_MeanAndStdDev(double n, double sumOfValues, double sumOfSquaredValues,
                  double *meanResult, double *stdDevResult)
 {
@@ -451,25 +438,25 @@ static PRIntn PR_CALLBACK DumpSerialNumb
                             record->COMPtrCount);
 #else
   fprintf((FILE*) aClosure, "%d (%d references)\n",
                             record->serialNumber,
                             record->refCount);
 #endif
   return HT_ENUMERATE_NEXT;
 }
 
 
 #endif /* NS_BUILD_REFCNT_LOGGING */
 
-nsresult
+NS_COM nsresult
 nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
 {
   nsresult rv = NS_OK;
 #ifdef NS_BUILD_REFCNT_LOGGING
   if (gBloatLog == nsnull || gBloatView == nsnull) {
     return NS_ERROR_FAILURE;
   }
   if (out == nsnull) {
     out = gBloatLog;
   }
 
   LOCK_TRACELOG();
@@ -528,25 +515,25 @@ nsTraceRefcntImpl::DumpStatistics(Statis
   if (gSerialNumbers) {
     fprintf(out, "\n\nSerial Numbers of Leaked Objects:\n");
     PL_HashTableEnumerateEntries(gSerialNumbers, DumpSerialNumbers, out);
   }
 
 done:
   gLogging = wasLogging;
   UNLOCK_TRACELOG();
 #endif
   return rv;
 }
 
-void
+NS_COM void
 nsTraceRefcntImpl::ResetStatistics()
 {
 #ifdef NS_BUILD_REFCNT_LOGGING
   LOCK_TRACELOG();
   if (gBloatView) {
     PL_HashTableDestroy(gBloatView);
     gBloatView = nsnull;
   }
   UNLOCK_TRACELOG();
 #endif
 }
 
@@ -812,43 +799,43 @@ static void InitTraceLog(void)
 
   if (gBloatLog || gRefcntsLog || gAllocLog || gLeakyLog || gCOMPtrLog) {
     gLogging = PR_TRUE;
   }
 
   gTraceLock = PR_NewLock();
 }
 
 #endif
 
 #if defined(_WIN32) && defined(_M_IX86) && !defined(WINCE) // WIN32 x86 stack walking code
 #include "nsStackFrameWin.h"
-void
+NS_COM void
 nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
 {
   DumpStackToFile(aStream);
 }
 
 // WIN32 x86 stack walking code
 // i386 or PPC Linux stackwalking code or Solaris
-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+#elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
 #include "nsStackFrameUnix.h"
-void
+NS_COM void
 nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
 {
   DumpStackToFile(aStream);
 }
 
 #else // unsupported platform.
 
-void
+NS_COM void
 nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
 {
 	fprintf(aStream, "write me, dammit!\n");
 }
 
 #endif
 
 //----------------------------------------------------------------------
 
 // This thing is exported by libstdc++
 // Yes, this is a gcc only hack
 #if defined(MOZ_DEMANGLE_SYMBOLS)
Index: xpcom/base/nsStackFrameUnix.cpp
===================================================================
RCS file: /cvs/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
retrieving revision 1.14
diff -p -u -1 -2 -r1.14 nsStackFrameUnix.cpp
--- xpcom/base/nsStackFrameUnix.cpp	3 Feb 2006 19:35:14 -0000	1.14
+++ xpcom/base/nsStackFrameUnix.cpp	6 Feb 2006 20:28:06 -0000
@@ -74,43 +74,33 @@ void DemangleSymbol(const char * aSymbol
     /* See demangle.h in the gcc source for the voodoo */
     char * demangled = abi::__cxa_demangle(aSymbol,0,0,0);
     
     if (demangled)
     {
         strncpy(aBuffer,demangled,aBufLen);
         free(demangled);
     }
 #endif // MOZ_DEMANGLE_SYMBOLS
 }
 
 
-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+#if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
 
-#include <setjmp.h>
-//
 
 void DumpStackToFile(FILE* aStream)
 {
-  jmp_buf jb;
-  setjmp(jb);
-
   // Stack walking code courtesy Kipp's "leaky".
 
-  // Get the frame pointer out of the jmp_buf
-  void **bp = (void**)
-#if defined(__i386) 
-    (jb[0].__jmpbuf[JB_BP]);
-#elif defined(PPC)
-    (jb[0].__jmpbuf[JB_GPR1]);
-#endif
+  // Get the frame pointer
+  void **bp = (void**) __builtin_frame_address(0);
 
   int skip = 2;
   for ( ; (void**)*bp > bp; bp = (void**)*bp) {
     void *pc = *(bp+1);
     if (--skip <= 0) {
       Dl_info info;
       int ok = dladdr(pc, &info);
       if (!ok) {
         fprintf(aStream, "UNKNOWN %p\n", pc);
         continue;
       }
 


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- thunderbird.spec	7 Feb 2006 14:00:32 -0000	1.62
+++ thunderbird.spec	10 Feb 2006 22:43:41 -0000	1.63
@@ -8,7 +8,7 @@
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
 Version:	1.5
-Release:	2.1
+Release:	3
 Epoch:		0
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -51,6 +51,7 @@
 # patches from upstream (Patch100+)
 Patch100:       firefox-bug305970.patch
 Patch101:       thunderbird-1.5-bug304720.patch
+Patch102:       firefox-1.5-dumpstack.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,6 +102,7 @@
 
 %patch100 -p1
 %patch101 -p1
+%patch102 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -169,6 +171,18 @@
   extensiondir=$RPM_BUILD_ROOT%{tbdir}/extensions/langpack-$language at thunderbird.mozilla.org
   %{__mkdir_p} $extensiondir
   unzip $langpack -d $extensiondir
+  find $extensiondir -type f | xargs chmod 644
+
+  langtmp=%{_tmpdir}/%{name}/langpack-$language
+  %{__mkdir_p} $langtmp
+  jarfile=$extensiondir/chrome/$language.jar
+  unzip $jarfile -d $langtmp
+  find $langtmp -type f | xargs chmod 644
+  %{__rm} -rf $jarfile
+  cd $langtmp
+  zip -r -D $jarfile locale
+  %{__rm} -rf locale
+  cd -
 done
 %{__rm} -rf thunderbird-langpacks
 
@@ -199,7 +213,11 @@
 #===============================================================================
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.5-2.1
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5-3
+- Add dumpstack.patch
+- Improve the langpack install stuff
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5-2



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:43:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:43:45 -0500
Subject: rpms/gnutls/FC-4 gnutls-1.0.25-tls.patch, NONE, 1.1 gnutls.spec, 1.9,
	1.10
Message-ID: <200602102243.k1AMhj1S025023@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	gnutls.spec 
Added Files:
	gnutls-1.0.25-tls.patch 
Log Message:
fix for CVE-2006-0645

gnutls-1.0.25-tls.patch:
 minitasn1/coding.c     |   51 +++++--
 minitasn1/decoding.c   |  318 +++++++++++++++++++++++++++++++++----------------
 minitasn1/der.h        |   19 +-
 minitasn1/element.c    |   16 +-
 minitasn1/int.h        |    1 
 minitasn1/libtasn1.h   |    1 
 minitasn1/parser_aux.c |    4 
 minitasn1/structure.c  |   46 +++----
 x509/xml.c             |   31 +++-
 9 files changed, 314 insertions(+), 173 deletions(-)

--- NEW FILE gnutls-1.0.25-tls.patch ---
--- gnutls-1.0.25/lib/x509/xml.c.tls	2004-08-04 23:36:03.000000000 +0200
+++ gnutls-1.0.25/lib/x509/xml.c	2006-02-10 21:54:08.000000000 +0100
@@ -51,10 +51,13 @@
 
 static int _gnutls_x509_expand_extensions(ASN1_TYPE* rasn);
 
-static const void *find_default_value(ASN1_TYPE x)
+static const void *find_default_value(ASN1_TYPE x, int *p_value_len)
 {
 	ASN1_TYPE p = x;
 
+        if(p_value_len)
+          *p_value_len = 0;
+
 	if (x->value == NULL && x->type & CONST_DEFAULT) {
 		if (x->down) {
 			x = x->down;
@@ -66,8 +69,11 @@
 							return "TRUE";
 						else
 							return "FALSE";
-					} else
+					} else {
+                                                if(p_value_len)
+                                                  *p_value_len = x->value_len;
 						return x->value;
+                                        }
 				}
 				x = x->right;
 			} while (x != NULL);
@@ -335,7 +341,7 @@
 
 		if (p->type == TYPE_BIT_STRING) {
 			len2 = -1;
-			len = _asn1_get_length_der(p->value, &len2);
+			len = _asn1_get_length_der(p->value, p->value_len, &len2);
 			snprintf(tmp, sizeof(tmp), " length=\"%i\"",
 				 (len - 1) * 8 - (p->value[len2]));
 			STR_APPEND(tmp);
@@ -346,11 +352,14 @@
 
 		if (is_node_printable(p)) {
 			const unsigned char *value;
+                        int value_len;
 
 			if (p->value == NULL)
-				value = find_default_value(p);
-			else
+				value = find_default_value(p,&value_len);
+			else {
 				value = p->value;
+                                value_len = p->value_len;
+                        }
 
 			switch (type_field(p->type)) {
 
@@ -366,7 +375,7 @@
 				if (value) {
 					len2 = -1;
 					len =
-					    _asn1_get_length_der(value,
+					    _asn1_get_length_der(value,value_len,
 								 &len2);
 
 					for (k = 0; k < len; k++) {
@@ -383,7 +392,7 @@
 				if (value) {
 					len2 = -1;
 					len =
-					    _asn1_get_length_der(value,
+					    _asn1_get_length_der(value,value_len,
 								 &len2);
 
 					for (k = 0; k < len; k++) {
@@ -412,7 +421,7 @@
 				if (value) {
 					len2 = -1;
 					len =
-					    _asn1_get_length_der(value,
+					    _asn1_get_length_der(value,value_len,
 								 &len2);
 
 					for (k = 1; k < len; k++) {
@@ -428,7 +437,7 @@
 				if (value) {
 					len2 = -1;
 					len =
-					    _asn1_get_length_der(value,
+					    _asn1_get_length_der(value,value_len,
 								 &len2);
 					for (k = 0; k < len; k++) {
 						snprintf(tmp, sizeof(tmp),
@@ -448,7 +457,7 @@
 					if (value) {
 						len3 = -1;
 						len2 =
-						    _asn1_get_length_der(value,
+						    _asn1_get_length_der(value,value_len,
 									 &len3);
 						for (k = 0; k < len2; k++) {
 							snprintf(tmp, sizeof(tmp),
@@ -469,7 +478,7 @@
 					 type_field(up->left->type)==TYPE_OBJECT_ID) {
 					
 					len2 =
-					    _asn1_get_length_der(up->value,
+					    _asn1_get_length_der(up->value, up->value_len,
 								 &len3);
 
 					if (len2 > 0 && strcmp( p->name, "type")==0) {
--- gnutls-1.0.25/lib/minitasn1/der.h.tls	2004-10-28 22:56:31.000000000 +0200
+++ gnutls-1.0.25/lib/minitasn1/der.h	2006-02-10 21:54:08.000000000 +0100
@@ -28,30 +28,25 @@
 #define TAG_NULL             0x05
 #define TAG_GENERALSTRING    0x1B
 
-unsigned int _asn1_get_tag_der(const unsigned char *der,
-                unsigned char *class,int  *len);
+int _asn1_get_tag_der(const unsigned char *der, int der_len,
+                unsigned char *class,int  *len, unsigned long *tag);
 
 void _asn1_octet_der(const unsigned char *str,int str_len,
                      unsigned char *der,int *der_len);
 
-asn1_retCode _asn1_get_octet_der(const unsigned char *der,
-                int *der_len,unsigned char *str,int str_size, int *str_len);
+asn1_retCode _asn1_get_octet_der(const unsigned char *der, int der_len,
+                int *ret_len,unsigned char *str,int str_size, int *str_len);
 
 void _asn1_bit_der(const unsigned char *str,int bit_len,
                    unsigned char *der,int *der_len);
 
-asn1_retCode _asn1_get_bit_der(const unsigned char *der,
-                int *der_len,unsigned char *str, int str_size, 
+asn1_retCode _asn1_get_bit_der(const unsigned char *der, int der_len,
+                int *ret_len,unsigned char *str, int str_size, 
                 int *bit_len);
 
-signed long _asn1_get_length_der(const unsigned char *der,int  *len);
+signed long _asn1_get_length_der(const unsigned char *der,int der_len, int  *len);
 
 void _asn1_length_der(unsigned long len,unsigned char *ans,int *ans_len);
 
 
 #endif
-
-
-
-
-
--- gnutls-1.0.25/lib/minitasn1/int.h.tls	2004-10-28 22:56:41.000000000 +0200
+++ gnutls-1.0.25/lib/minitasn1/int.h	2006-02-10 21:54:08.000000000 +0100
@@ -85,6 +85,7 @@
   char *name;                    /* Node name */
   unsigned int type;             /* Node type */
   unsigned char *value;          /* Node value */
+  int value_len;
   struct node_asn_struct *down;  /* Pointer to the son node */
   struct node_asn_struct *right; /* Pointer to the brother node */
   struct node_asn_struct *left;  /* Pointer to the next list element */ 
--- gnutls-1.0.25/lib/minitasn1/decoding.c.tls	2004-11-13 22:53:49.000000000 +0100
+++ gnutls-1.0.25/lib/minitasn1/decoding.c	2006-02-10 22:20:02.000000000 +0100
@@ -46,11 +46,14 @@
 
   
 signed long
-_asn1_get_length_der(const unsigned char *der,int  *len)
+_asn1_get_length_der(const unsigned char *der, int der_len, int  *len)
 {
   unsigned long ans;
   int k,punt;
 
+  *len = 0;
+  if (der_len <= 0) return 0;
+
   if(!(der[0]&128)){
     /* short form */
     *len=1;
@@ -62,7 +65,14 @@
     punt=1;
     if(k){  /* definite length method */
       ans=0;
-      while(punt<=k) ans=ans*256+der[punt++];
+      while(punt<=k && punt < der_len) {
+         unsigned long last = ans;
+         ans=ans*256+der[punt++];
+         if (ans < last)
+            /* we wrapped around, no bignum support... */
+            return -2;
+      }
+          
     }
     else{  /* indefinite length method */
       ans=-1;
@@ -76,12 +86,14 @@
 
 
 
-unsigned int
-_asn1_get_tag_der(const unsigned char *der,unsigned char *class,int  *len)
+int
+_asn1_get_tag_der(const unsigned char *der, int der_len,
+                 unsigned char *class,int  *len, unsigned long *tag)
 {
   int punt,ris;
 
-  if (der==NULL || len == NULL) return ASN1_DER_ERROR;
+  if (der==NULL || der_len <= 0 || len == NULL) return ASN1_DER_ERROR;
+      
   *class=der[0]&0xE0;
   if((der[0]&0x1F)!=0x1F){
     /* short form */
@@ -92,25 +104,45 @@
     /* Long form */
     punt=1;
     ris=0;
-    while(der[punt]&128) ris=ris*128+(der[punt++]&0x7F);
-    ris=ris*128+(der[punt++]&0x7F);   
+    while(punt <= der_len && der[punt]&128) {
+      int last = ris;
+      ris=ris*128+(der[punt++]&0x7F);
+      if (ris < last)
+        /* wrapper around, and no bignums... */
+        return ASN1_DER_ERROR;
+      }
+      if (punt >= der_len)
+        return ASN1_DER_ERROR;
+      {
+        int last = ris;
+        ris=ris*128+(der[punt++]&0x7F);
+        if (ris < last)
+	       /* wrapper around, and no bignums... */
+           return ASN1_DER_ERROR;
+    }    
     *len=punt;
   }
-  return ris;
+  if (tag) *tag = ris;
+  return ASN1_SUCCESS;
 }
 
 
 
 
 int
-_asn1_get_octet_der(const unsigned char *der,int *der_len,unsigned char *str,int str_size, int *str_len)
+_asn1_get_octet_der(const unsigned char *der, int der_len, int *ret_len,unsigned char *str,int str_size, int *str_len)
 {
   int len_len;
 
+  if (der_len <= 0) return ASN1_GENERIC_ERROR;
+
   /* if(str==NULL) return ASN1_SUCCESS; */
-  *str_len=_asn1_get_length_der(der,&len_len);
+  *str_len=_asn1_get_length_der(der, der_len, &len_len);
+  
+  if (*str_len < 0)
+     return ASN1_DER_ERROR;
 
-  *der_len=*str_len+len_len;
+  *ret_len=*str_len+len_len;
   if ( str_size >= *str_len)
 	  memcpy(str,der+len_len,*str_len);
   else {
@@ -125,17 +157,17 @@
 /* Returns ASN1_SUCCESS on success or an error code on error.
  */
 int
-_asn1_get_time_der(const unsigned char *der,int *der_len,unsigned char *str,int str_size)
+_asn1_get_time_der(const unsigned char *der, int der_len, int *ret_len,unsigned char *str,int str_size)
 {
   int len_len,str_len;
 
-  if(str==NULL) return ASN1_DER_ERROR;
-  str_len=_asn1_get_length_der(der,&len_len);
+  if(der_len <=0 || str==NULL) return ASN1_DER_ERROR;
+  str_len=_asn1_get_length_der(der, der_len, &len_len); 
   if (str_len < 0 || str_size < str_len) 
      return ASN1_DER_ERROR;
   memcpy(str,der+len_len,str_len);
   str[str_len]=0;
-  *der_len=str_len+len_len;
+  *ret_len=str_len+len_len;  
   
   return ASN1_SUCCESS;
 }
@@ -143,14 +175,19 @@
 
 
 void
-_asn1_get_objectid_der(const unsigned char *der,int *der_len,unsigned char *str, int str_size)
+_asn1_get_objectid_der(const unsigned char *der,int der_len, int *ret_len,unsigned char *str, int str_size)
 {
   int len_len,len,k;
   char temp[20];
   unsigned long val,val1;
 
-  if(str==NULL) return;
-  len=_asn1_get_length_der(der,&len_len);
+  *ret_len = 0;
+  if (str && str_size > 0) str[0] = 0; /* no oid */
+
+  if(str==NULL || der_len <= 0) return;
+  len=_asn1_get_length_der(der,der_len, &len_len);
+  
+  if (len < 0 || len > der_len || len_len > der_len) return;  
   
   val1=der[len_len]/40;
   val=der[len_len]-val1*40;
@@ -169,20 +206,23 @@
       val=0;
     }
   }
-  *der_len=len+len_len;
+  *ret_len=len+len_len;
 }
 
 
 
 
 int
-_asn1_get_bit_der(const unsigned char *der,int *der_len,unsigned char *str, int str_size, int *bit_len)
+_asn1_get_bit_der(const unsigned char *der, int der_len, int *ret_len, unsigned char *str, int str_size, int *bit_len)
 {
   int len_len,len_byte;
+  
+  if (der_len <=0) return ASN1_GENERIC_ERROR;
+  len_byte=_asn1_get_length_der(der,der_len,&len_len)-1;
+  if (len_byte < 0)
+    return ASN1_DER_ERROR;
 
-  len_byte=_asn1_get_length_der(der,&len_len)-1;
-
-  *der_len=len_byte+len_len+1;  
+  *ret_len=len_byte+len_len+1;    
   *bit_len=len_byte*8-der[len_len];
 
   if (str_size >= len_byte)
@@ -198,13 +238,14 @@
 
 
 int
-_asn1_extract_tag_der(node_asn *node,const unsigned char *der,int *der_len)
+_asn1_extract_tag_der(node_asn *node,const unsigned char *der, int der_len,int *ret_len)
 {
   node_asn *p;
   int counter,len2,len3,is_tag_implicit;
   unsigned long tag,tag_implicit=0;
   unsigned char class,class2,class_implicit=0;
 
+  if (der_len <= 0) return ASN1_GENERIC_ERROR;
 
   counter=is_tag_implicit=0;
 
@@ -217,10 +258,15 @@
 	else if(p->type&CONST_PRIVATE) class2=PRIVATE;
 	else class2=CONTEXT_SPECIFIC;
 	
-	if(p->type&CONST_EXPLICIT){
-	  tag=_asn1_get_tag_der(der+counter,&class,&len2);
+	if(p->type&CONST_EXPLICIT){	  
+	  if (_asn1_get_tag_der(der+counter, der_len-counter,&class,&len2, &tag)!=ASN1_SUCCESS)
+	     return ASN1_DER_ERROR;
+	  if (counter+len2 > der_len)
+	    return ASN1_DER_ERROR;    
 	  counter+=len2;
-	  len3=_asn1_get_length_der(der+counter,&len2);
+	  len3=_asn1_get_length_der(der+counter,der_len-counter, &len2);
+	  if (len3 < 0)
+	    return ASN1_DER_ERROR;      
 	  counter+=len2;
 	  if(!is_tag_implicit){
 	    if((class!=(class2|STRUCTURED)) || (tag!=strtoul(p->value,NULL,10)))
@@ -249,8 +295,11 @@
     }
   }
 
-  if(is_tag_implicit){
-    tag=_asn1_get_tag_der(der+counter,&class,&len2);
+  if(is_tag_implicit){    
+    if (_asn1_get_tag_der(der+counter, der_len-counter,&class,&len2, &tag)!=ASN1_SUCCESS)
+	     return ASN1_DER_ERROR;
+    if (counter+len2 > der_len)
+      return ASN1_DER_ERROR;  
     if((class!=class_implicit) || (tag!=tag_implicit)){
       if(type_field(node->type)==TYPE_OCTET_STRING){
 	class_implicit |= STRUCTURED;
@@ -264,11 +313,15 @@
   else{
     if(type_field(node->type)==TYPE_TAG){
       counter=0;
-      *der_len=counter;
+      *ret_len=counter;    
       return ASN1_SUCCESS;
     }
 
-    tag=_asn1_get_tag_der(der+counter,&class,&len2);
+
+    if (_asn1_get_tag_der(der+counter, der_len-counter,&class,&len2,&tag)!=ASN1_SUCCESS)
+     return ASN1_DER_ERROR;
+    if (counter+len2 > der_len)
+      return ASN1_DER_ERROR;
     switch(type_field(node->type)){
     case TYPE_NULL:
       if((class!=UNIVERSAL) || (tag!=TAG_NULL)) return ASN1_DER_ERROR;
@@ -322,7 +375,7 @@
   }
 
   counter+=len2;
-  *der_len=counter;
+  *ret_len=counter;
   return ASN1_SUCCESS;
 }
 
@@ -383,7 +436,9 @@
 
   if(*(der-1) & STRUCTURED){
     tot_len=0;
-    indefinite=_asn1_get_length_der(der,&len3);
+    indefinite=_asn1_get_length_der(der, *len, &len3);
+    if (indefinite < -1)
+      return ASN1_DER_ERROR;
 
     counter+=len3;
     if(indefinite>=0) indefinite+=len3;
@@ -403,7 +458,7 @@
 	
       counter++;
 
-      len2=_asn1_get_length_der(der+counter,&len3);
+      len2=_asn1_get_length_der(der+counter,*len-counter, &len3);      
       if(len2 <= 0) return ASN1_DER_ERROR;
 
       counter+=len3+len2;
@@ -421,14 +476,19 @@
       _asn1_length_der(tot_len,temp,&len2);
       tot_len+=len2;
       temp2=temp+len2;
-      len2=_asn1_get_length_der(der,&len3);
+      len2=_asn1_get_length_der(der,*len,&len3);
+      if(len2 < -1) return ASN1_DER_ERROR;  
       counter2=len3+1;
 
       if(indefinite==-1) counter_end=counter-2;
       else counter_end=counter;
       
       while(counter2<counter_end){
-	len2=_asn1_get_length_der(der+counter2,&len3);	
+	len2=_asn1_get_length_der(der+counter2, *len-counter, &len3);
+	if(len2 < -1) return ASN1_DER_ERROR;
+	/* FIXME: to be checked. Is this ok? Has the
+	 * size been checked before?
+	 */      	
 	memcpy(temp2,der+counter2+len3,len2);
 	temp2+=len2;
 	counter2+=len2+len3+1;
@@ -438,7 +498,9 @@
     }
   }
   else{  /* NOT STRUCTURED */
-    len2=_asn1_get_length_der(der,&len3);
+    len2=_asn1_get_length_der(der, *len, &len3);
+    if(len2 < 0) return ASN1_DER_ERROR;
+    if(len3+len2 > *len) return ASN1_DER_ERROR;  
     if(node)
       _asn1_set_value(node,der,len3+len2);
     counter=len3+len2;
@@ -454,7 +516,7 @@
 _asn1_get_indefinite_length_string(const unsigned char* der,int* len)
 {
   int len2,len3,counter,indefinite;
-  unsigned int tag;
+  unsigned long tag;
   unsigned char class;
 
   counter=indefinite=0;
@@ -469,9 +531,13 @@
       else continue;
     }
 
-    tag=_asn1_get_tag_der(der+counter,&class,&len2);
+    if(_asn1_get_tag_der(der+counter, *len-counter,&class,&len2,&tag)!=ASN1_SUCCESS)
+     return ASN1_DER_ERROR;
+    if (counter+len2 > *len)
+      return ASN1_DER_ERROR;
     counter+=len2;
-    len2=_asn1_get_length_der(der+counter,&len3);
+    len2=_asn1_get_length_der(der+counter, *len-counter,&len3);
+    if(len2 < -1) return ASN1_DER_ERROR;    
     if(len2 == -1){
       indefinite++;
       counter+=1;
@@ -516,7 +582,7 @@
   char temp[128];
   int counter,len2,len3,len4,move,ris,tlen;
   unsigned char class,*temp2;
-  unsigned int tag;
+  unsigned long tag;
   int indefinite, result;
   const unsigned char* der = ider;
 
@@ -559,11 +625,11 @@
 	while(p2){
 	  if((p2->type&CONST_SET) && (p2->type&CONST_NOT_USED)){
 	    if(type_field(p2->type)!=TYPE_CHOICE)
-	      ris=_asn1_extract_tag_der(p2,der+counter,&len2);
+	      ris=_asn1_extract_tag_der(p2,der+counter,len-counter, &len2);        
 	    else{
 	      p3=p2->down;
 	      while(p3){
-		ris=_asn1_extract_tag_der(p3,der+counter,&len2);
+		ris=_asn1_extract_tag_der(p3,der+counter,len-counter, &len2);          
 		if(ris==ASN1_SUCCESS) break;
 		p3=p3->right;
 	      }
@@ -602,7 +668,7 @@
       if(type_field(p->type)==TYPE_CHOICE){
 	while(p->down){
 	  if(counter<len)
-	    ris=_asn1_extract_tag_der(p->down,der+counter,&len2);
+        ris=_asn1_extract_tag_der(p->down,der+counter,len-counter,&len2);
 	  else
 	    ris=ASN1_DER_ERROR;
 	  if(ris==ASN1_SUCCESS){
@@ -638,7 +704,7 @@
 	if((len2!=-1) && (counter>len2)) ris=ASN1_TAG_ERROR;
       }
      
-      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,&len2);
+      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,len-counter,&len2);
       if(ris!=ASN1_SUCCESS){
 	if(p->type&CONST_OPTION){
 	  p->type|=CONST_NOT_USED;
@@ -679,13 +745,15 @@
 	move=RIGHT;
 	break;
       case TYPE_INTEGER: case TYPE_ENUMERATED:
-	len2=_asn1_get_length_der(der+counter,&len3);
+ 	len2=_asn1_get_length_der(der+counter,len-counter, &len3);
+ 	if(len2 < 0) return ASN1_DER_ERROR;
+ 	if (len2+len3 > len-counter) return ASN1_DER_ERROR;	
 	_asn1_set_value(p,der+counter,len3+len2);
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
       case TYPE_OBJECT_ID:
-	_asn1_get_objectid_der(der+counter,&len2, temp, sizeof(temp));
+ 	_asn1_get_objectid_der(der+counter,len-counter,&len2, temp, sizeof(temp));            
 	tlen = strlen(temp);
 	if( tlen > 0)
 	   _asn1_set_value(p,temp,tlen+1);
@@ -693,7 +761,7 @@
 	move=RIGHT;
       break;
       case TYPE_TIME:
-	result = _asn1_get_time_der(der+counter,&len2,temp,sizeof(temp)-1);
+ 	result = _asn1_get_time_der(der+counter,len-counter,&len2,temp,sizeof(temp)-1);            
 	if (result != ASN1_SUCCESS) {
 		asn1_delete_structure(element);
 	        return result;
@@ -712,14 +780,18 @@
 	move=RIGHT;
 	break;
       case TYPE_GENERALSTRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
-	_asn1_set_value(p,der+counter,len3+len2);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;
+	if (len3+len2 > len-counter) return ASN1_DER_ERROR;
+	   _asn1_set_value(p,der+counter,len3+len2);          
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
       case TYPE_BIT_STRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
-	_asn1_set_value(p,der+counter,len3+len2);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;
+	if (len3+len2 > len-counter) return ASN1_DER_ERROR;
+  	   _asn1_set_value(p,der+counter,len3+len2);          
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
@@ -728,10 +800,12 @@
 	  len2=strtol(p->value,NULL,10);
 	  _asn1_set_value(p,NULL,0);
 	  if(len2==-1){ /* indefinite length method */
-	    if((der[counter]) || der[counter+1]){
-	      asn1_delete_structure(element);
-	      return ASN1_DER_ERROR;
-	    }
+	    if (len-counter+1 > 0) {
+ 	      if((der[counter]) || der[counter+1]){
+	        asn1_delete_structure(element);
+	        return ASN1_DER_ERROR;
+	      }
+            } else return ASN1_DER_ERROR;      
 	    counter+=2;
 	  }
 	  else{ /* definite length method */
@@ -743,7 +817,8 @@
 	  move=RIGHT;
 	}
 	else{   /* move==DOWN || move==RIGHT */
-	  len3=_asn1_get_length_der(der+counter,&len2);
+	  len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	  if(len3 < -1) return ASN1_DER_ERROR;   
 	  counter+=len2;
 	  if(len3>0){
 	    _asn1_ltostr(counter+len3,temp);
@@ -802,7 +877,8 @@
 	  }
 	}
 	else{   /* move==DOWN || move==RIGHT */
-	  len3=_asn1_get_length_der(der+counter,&len2);
+	  len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	  if(len3 < -1) return ASN1_DER_ERROR;
 	  counter+=len2;
 	  if(len3){
 	    if(len3>0){ /* definite length method */
@@ -823,9 +899,15 @@
 	}
 	move=RIGHT;
 	break;
-      case TYPE_ANY:
-	tag=_asn1_get_tag_der(der+counter,&class,&len2);
-	len4=_asn1_get_length_der(der+counter+len2,&len3);
+      case TYPE_ANY:        
+      
+ 	if(_asn1_get_tag_der(der+counter,len-counter,&class,&len2,&tag)!=ASN1_SUCCESS)
+        return ASN1_DER_ERROR;
+ 	if (counter+len2 > len)
+ 	  return ASN1_DER_ERROR;
+ 	len4=_asn1_get_length_der(der+counter+len2,len-counter-len2,&len3);
+ 	if(len4 < -1) return ASN1_DER_ERROR;
+ 	if(len4 > len-counter+len2+len3) return ASN1_DER_ERROR;
 	
 	if(len4 != -1){
 	  len2+=len4;
@@ -949,7 +1031,7 @@
   int nameLen=MAX_NAME_SIZE*10-1,state;
   int counter,len2,len3,len4,move,ris, tlen;
   unsigned char class,*temp2;
-  unsigned int tag;
+  unsigned long tag;
   int indefinite, result;
   const unsigned char* der = ider;
 
@@ -1018,11 +1100,11 @@
 	while(p2){
 	  if((p2->type&CONST_SET) && (p2->type&CONST_NOT_USED)){
 	    if(type_field(p2->type)!=TYPE_CHOICE)
-	      ris=_asn1_extract_tag_der(p2,der+counter,&len2);
+	      ris=_asn1_extract_tag_der(p2,der+counter,len-counter,&len2);        
 	    else{
 	      p3=p2->down;
 	      while(p3){
-		ris=_asn1_extract_tag_der(p3,der+counter,&len2);
+		ris=_asn1_extract_tag_der(p3,der+counter,len-counter,&len2);          
 		if(ris==ASN1_SUCCESS) break;
 		p3=p3->right;
 	      }
@@ -1061,7 +1143,7 @@
       if(type_field(p->type)==TYPE_CHOICE){
 	while(p->down){
 	  if(counter<len)
-	    ris=_asn1_extract_tag_der(p->down,der+counter,&len2);
+	    ris=_asn1_extract_tag_der(p->down,der+counter,len-counter,&len2);      
 	  else
 	    ris=ASN1_DER_ERROR;
 	  if(ris==ASN1_SUCCESS){
@@ -1097,7 +1179,7 @@
 	if(counter>len2) ris=ASN1_TAG_ERROR;
       }
 
-      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,&len2);
+      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,len-counter,&len2);          
       if(ris!=ASN1_SUCCESS){
 	if(p->type&CONST_OPTION){
 	  p->type|=CONST_NOT_USED;
@@ -1150,8 +1232,10 @@
 	move=RIGHT;
 	break;
       case TYPE_INTEGER: case TYPE_ENUMERATED:
-	len2=_asn1_get_length_der(der+counter,&len3);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;
 	if(state==FOUND){
+	  if (len3+len2 > len-counter) return ASN1_DER_ERROR;    
 	  _asn1_set_value(p,der+counter,len3+len2);
 	  
 	  if(p==nodeFound) state=EXIT;
@@ -1160,8 +1244,8 @@
 	move=RIGHT;
 	break;
       case TYPE_OBJECT_ID:
-	if(state==FOUND){
-	  _asn1_get_objectid_der(der+counter,&len2, temp, sizeof(temp));
+	if(state==FOUND){	  
+ 	  _asn1_get_objectid_der(der+counter, len-counter,&len2, temp, sizeof(temp));
 	  tlen = strlen(temp);
 	  
 	  if (tlen > 0)
@@ -1170,7 +1254,7 @@
 	  if(p==nodeFound) state=EXIT;
 	}
 	else{
-	  len2=_asn1_get_length_der(der+counter,&len3);
+ 	  len2=_asn1_get_length_der(der+counter, len-counter, &len3);
 	  len2+=len3;
 	}
 
@@ -1179,7 +1263,7 @@
       break;
       case TYPE_TIME:
 	if(state==FOUND){
-	  result = _asn1_get_time_der(der+counter,&len2,temp,sizeof(temp)-1);
+	  result = _asn1_get_time_der(der+counter, len-counter, &len2,temp,sizeof(temp)-1);
 	  if (result != ASN1_SUCCESS) {
 		asn1_delete_structure(structure);
 	        return result;
@@ -1192,7 +1276,7 @@
 	  if(p==nodeFound) state=EXIT;
 	}
 	else{
-	  len2=_asn1_get_length_der(der+counter,&len3);
+	  len2=_asn1_get_length_der(der+counter, len-counter, &len3);
 	  len2+=len3;
 	}
 
@@ -1213,8 +1297,10 @@
 	move=RIGHT;
 	break;
       case TYPE_GENERALSTRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;     
 	if(state==FOUND){
+	  if (len3+len2 > len-counter) return ASN1_DER_ERROR;    
 	  _asn1_set_value(p,der+counter,len3+len2);
 	 
 	  if(p==nodeFound) state=EXIT;
@@ -1223,8 +1309,10 @@
 	move=RIGHT;
 	break;
       case TYPE_BIT_STRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;
 	if(state==FOUND){
+	  if (len3+len2 > len-counter) return ASN1_DER_ERROR;    
 	  _asn1_set_value(p,der+counter,len3+len2);
 	  
 	  if(p==nodeFound) state=EXIT;
@@ -1254,12 +1342,14 @@
 	}
 	else{   /* move==DOWN || move==RIGHT */
 	  if(state==OTHER_BRANCH){
-	    len3=_asn1_get_length_der(der+counter,&len2);
+	    len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	    if(len3 < 0) return ASN1_DER_ERROR;      	    
 	    counter+=len2+len3;
 	    move=RIGHT;
 	  }
-	  else { /*  state==SAME_BRANCH or state==FOUND */
-	    len3=_asn1_get_length_der(der+counter,&len2);
+	  else { /*  state==SAME_BRANCH or state==FOUND */	    
+	    len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	    if(len3 < 0) return ASN1_DER_ERROR;      
 	    counter+=len2;
 	    if(len3>0){
 	      _asn1_ltostr(counter+len3,temp);
@@ -1309,12 +1399,14 @@
 	}
 	else{   /* move==DOWN || move==RIGHT */
 	  if(state==OTHER_BRANCH){
-	    len3=_asn1_get_length_der(der+counter,&len2);
+	    len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	    if(len3 < 0) return ASN1_DER_ERROR;
 	    counter+=len2+len3;
 	    move=RIGHT;
 	  }
 	  else{ /* state==FOUND or state==SAME_BRANCH */
-	    len3=_asn1_get_length_der(der+counter,&len2);
+	    len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	    if(len3 < 0) return ASN1_DER_ERROR;     
 	    counter+=len2;
 	    if(len3){
 	      _asn1_ltostr(counter+len3,temp);
@@ -1333,8 +1425,14 @@
 	
 	break;
       case TYPE_ANY:
-	tag=_asn1_get_tag_der(der+counter,&class,&len2);
-	len4=_asn1_get_length_der(der+counter+len2,&len3);
+          
+ 	if(_asn1_get_tag_der(der+counter, len-counter,&class,&len2,&tag)!=ASN1_SUCCESS)
+           return ASN1_DER_ERROR;
+ 	if (counter+len2 > len)
+ 	  return ASN1_DER_ERROR;
+ 
+ 	len4=_asn1_get_length_der(der+counter+len2,len-counter-len2,&len3);
+ 	if(len4 < -1) return ASN1_DER_ERROR;    
 	
 	if(len4 != -1){
 	  len2+=len4;
@@ -1538,7 +1636,7 @@
   node_asn *node,*node_to_find,*p,*p2,*p3;
   int counter,len2,len3,len4,move,ris;
   unsigned char class;
-  unsigned int tag;
+  unsigned long tag;
   int indefinite;
   const unsigned char* der = ider;
 
@@ -1586,10 +1684,10 @@
 	while(p2){
 	  if((p2->type&CONST_SET) && (p2->type&CONST_NOT_USED)){  /* CONTROLLARE */
 	    if(type_field(p2->type)!=TYPE_CHOICE)
-	      ris=_asn1_extract_tag_der(p2,der+counter,&len2);
+	      ris=_asn1_extract_tag_der(p2,der+counter,len-counter,&len2);
 	    else{
 	      p3=p2->down;
-	      ris=_asn1_extract_tag_der(p3,der+counter,&len2);
+	      ris=_asn1_extract_tag_der(p3,der+counter,len-counter,&len2);        
 	    }
 	    if(ris==ASN1_SUCCESS){
 	      p2->type&=~CONST_NOT_USED;
@@ -1606,11 +1704,11 @@
 
       if(type_field(p->type)==TYPE_CHOICE){
 	p=p->down;
-	ris=_asn1_extract_tag_der(p,der+counter,&len2);
+	ris=_asn1_extract_tag_der(p,der+counter,len-counter,&len2);      
 	if(p==node_to_find) *start=counter;
       }
 
-      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,&len2);
+      if(ris==ASN1_SUCCESS) ris=_asn1_extract_tag_der(p,der+counter,len-counter,&len2);          
       if(ris!=ASN1_SUCCESS){
 	if(p->type&CONST_OPTION){
 	  p->type|=CONST_NOT_USED;
@@ -1638,18 +1736,21 @@
 	counter++;
 	move=RIGHT;
 	break;
-      case TYPE_INTEGER: case TYPE_ENUMERATED:
-	len2=_asn1_get_length_der(der+counter,&len3);
+      case TYPE_INTEGER: case TYPE_ENUMERATED:	
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;      
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
       case TYPE_OBJECT_ID:
-	len2=_asn1_get_length_der(der+counter,&len3);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;      
 	counter+=len2+len3;
 	move=RIGHT;
       break;
       case TYPE_TIME:
-	len2=_asn1_get_length_der(der+counter,&len3);
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;     
 	counter+=len2+len3;
 	move=RIGHT;
 	break;
@@ -1660,19 +1761,22 @@
 	counter+=len3;
 	move=RIGHT;
 	break;
-      case TYPE_GENERALSTRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
+      case TYPE_GENERALSTRING:	
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;      
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
-      case TYPE_BIT_STRING:
-	len2=_asn1_get_length_der(der+counter,&len3);
+      case TYPE_BIT_STRING:	
+	len2=_asn1_get_length_der(der+counter,len-counter,&len3);
+	if(len2 < 0) return ASN1_DER_ERROR;     
 	counter+=len3+len2;
 	move=RIGHT;
 	break;
       case TYPE_SEQUENCE:  case TYPE_SET:
 	if(move!=UP){
-	  len3=_asn1_get_length_der(der+counter,&len2);
+	  len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	  if(len3 < -1) return ASN1_DER_ERROR;    
 	  counter+=len2;
 	  if(len3==0) move=RIGHT;
 	  else move=DOWN; 
@@ -1684,8 +1788,9 @@
 	}
 	break;
       case TYPE_SEQUENCE_OF: case TYPE_SET_OF:
-	if(move!=UP){
-	  len3=_asn1_get_length_der(der+counter,&len2);
+	if(move!=UP){	  
+	  len3=_asn1_get_length_der(der+counter,len-counter,&len2);
+	  if(len3 < -1) return ASN1_DER_ERROR;    
 	  counter+=len2;
 	  if((len3==-1) && !der[counter] && !der[counter+1])
 	    counter+=2;
@@ -1703,8 +1808,14 @@
 	move=RIGHT;
 	break;
       case TYPE_ANY:
-	tag=_asn1_get_tag_der(der+counter,&class,&len2);
-	len4=_asn1_get_length_der(der+counter+len2,&len3);
+          
+ 	if(_asn1_get_tag_der(der+counter, len-counter,&class,&len2,&tag)!=ASN1_SUCCESS)
+           return ASN1_DER_ERROR;
+ 	if (counter+len2 > len)
+ 	  return ASN1_DER_ERROR;
+ 
+ 	len4=_asn1_get_length_der(der+counter+len2,len-counter-len2,&len3);
+ 	if(len4 < -1) return ASN1_DER_ERROR;     		
 	
 	if(len4 != -1){
 	  counter+=len2+len4+len3;
@@ -1876,7 +1987,8 @@
 		result=asn1_create_element(definitions,name,&aux);
 		if(result == ASN1_SUCCESS){
 		  _asn1_set_name(aux,p->name);
-		  len2=_asn1_get_length_der(p->value,&len3);
+		  len2=_asn1_get_length_der(p->value,p->value_len,&len3);
+		  if(len2 < 0) return ASN1_DER_ERROR;
 		  
 		  result=asn1_der_decoding(&aux,p->value+len3,len2,
 					   errorDescription);
@@ -2041,8 +2153,9 @@
 		
 	  result=asn1_create_element(definitions,name,&aux);
 	  if(result == ASN1_SUCCESS){
-	    _asn1_set_name(aux,octetNode->name);	  
-	    len2=_asn1_get_length_der(octetNode->value,&len3);
+	    _asn1_set_name(aux,octetNode->name);	  	    
+	    len2=_asn1_get_length_der(octetNode->value,octetNode->value_len,&len3);
+	    if(len2 < 0) return ASN1_DER_ERROR;
 	    
 	    result=asn1_der_decoding(&aux,octetNode->value+len3,len2,
 				     errorDescription);
@@ -2087,4 +2200,3 @@
 
   return retCode;
 }
-
--- gnutls-1.0.25/lib/minitasn1/element.c.tls	2004-10-28 22:56:41.000000000 +0200
+++ gnutls-1.0.25/lib/minitasn1/element.c	2006-02-10 21:54:08.000000000 +0100
@@ -1,4 +1,5 @@
 /*
+ *      Copyright (C) 2004, 2006 Free Software Foundation
  *      Copyright (C) 2000,2001,2002,2003 Fabio Fiorina
  *
  * This file is part of LIBASN1.
@@ -657,8 +658,8 @@
       }
     }
     else{
-      len2=-1;
-      if (_asn1_get_octet_der(node->value,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;
+      len2=-1;      
+      if (_asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;          
     }
     break;
   case TYPE_OBJECT_ID:
@@ -690,22 +691,23 @@
     break;
   case TYPE_OCTET_STRING:
     len2=-1;
-    if (_asn1_get_octet_der(node->value,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;
+    if (_asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;        
     break;
   case TYPE_GENERALSTRING:
     len2=-1;
-    if (_asn1_get_octet_der(node->value,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;
+    if (_asn1_get_octet_der(node->value,node->value_len,&len2,value, value_size, len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;        
     break;
   case TYPE_BIT_STRING:
-    len2=-1;
-    if (_asn1_get_bit_der(node->value,&len2,value,value_size,len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;
+    len2=-1; 
+    if (_asn1_get_bit_der(node->value,node->value_len,&len2,value,value_size,len)!=ASN1_SUCCESS) return ASN1_MEM_ERROR;        
     break;
   case TYPE_CHOICE:
     PUT_STR_VALUE( value, value_size, node->down->name);
     break; 
   case TYPE_ANY:
     len3=-1;
-    len2=_asn1_get_length_der(node->value,&len3);
+    len2=_asn1_get_length_der(node->value,node->value_len,&len3);
+    if (len2 < 0) return ASN1_DER_ERROR;  
     PUT_VALUE( value, value_size, node->value+len3, len2);
     break;
   default:
--- gnutls-1.0.25/lib/minitasn1/structure.c.tls	2004-11-13 22:53:49.000000000 +0100
+++ gnutls-1.0.25/lib/minitasn1/structure.c	2006-02-10 21:54:08.000000000 +0100
@@ -360,8 +360,9 @@
 	switch(type_field(p_s->type)){
 	case TYPE_OCTET_STRING: case TYPE_BIT_STRING: case TYPE_GENERALSTRING: 
 	case TYPE_INTEGER:    
-	  len2=-1;
-	  len=_asn1_get_length_der(p_s->value,&len2);
+	  len2=-1;	  
+	  len=_asn1_get_length_der(p_s->value,p_s->value_len,&len2);
+	  if (len < 0) return NULL;    
 	  _asn1_set_value(p_d,p_s->value,len+len2);
 	  break;
 	default:
@@ -724,17 +725,19 @@
       case TYPE_INTEGER:
 	if(p->value){
 	  len2=-1;
-	  len=_asn1_get_length_der(p->value,&len2);
+	  len=_asn1_get_length_der(p->value,p->value_len,&len2);   
 	  fprintf(out,"  value:0x");
-	  for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	  if (len > 0)
+	    for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);    
 	}
 	break;
       case TYPE_ENUMERATED:
 	if(p->value){
 	  len2=-1;
-	  len=_asn1_get_length_der(p->value,&len2);
+	  len=_asn1_get_length_der(p->value,p->value_len,&len2);    
 	  fprintf(out,"  value:0x");
-	  for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	  if (len > 0)
+	    for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);          
 	}
 	break;
       case TYPE_TIME:
@@ -749,25 +752,30 @@
       case TYPE_BIT_STRING:
 	if(p->value){
 	  len2=-1;
-	  len=_asn1_get_length_der(p->value,&len2);
-	  fprintf(out,"  value(%i):",(len-1)*8-(p->value[len2]));
-	  for(k=1;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	  len=_asn1_get_length_der(p->value,p->value_len,&len2);
+	  if (len>0)
+	    {
+	      fprintf(out,"  value(%i):",(len-1)*8-(p->value[len2]));
+	      for(k=1;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	    }  
 	}
 	break;
       case TYPE_OCTET_STRING:
 	if(p->value){
 	  len2=-1;
-	  len=_asn1_get_length_der(p->value,&len2);
+	  len=_asn1_get_length_der(p->value,p->value_len,&len2);    
 	  fprintf(out,"  value:");
-	  for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	  if (len>0)
+	    for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);          
 	}
 	break;
       case TYPE_GENERALSTRING:
 	if(p->value){
-	  len2=-1;
-	  len=_asn1_get_length_der(p->value,&len2);
+	  len2=-1;	  
+	  len=_asn1_get_length_der(p->value,p->value_len,&len2);    
 	  fprintf(out,"  value:");
-	  for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);
+	  if (len>0)
+	    for(k=0;k<len;k++) fprintf(out,"%02x",(p->value)[k+len2]);         
 	}
 	break;
       case TYPE_OBJECT_ID:
@@ -776,9 +784,10 @@
       case TYPE_ANY:
 	if(p->value){
 	  len3=-1;
-	  len2=_asn1_get_length_der(p->value,&len3);
+	  len2=_asn1_get_length_der(p->value,p->value_len,&len3);    
 	  fprintf(out,"  value:");
-	  for(k=0;k<len2;k++) fprintf(out,"%02x",(p->value)[k+len3]);
+	  if (len2>0)
+	    for(k=0;k<len2;k++) fprintf(out,"%02x",(p->value)[k+len3]);          
 	}
 	break;
       case TYPE_SET:
@@ -958,8 +967,3 @@
 
   return NULL;  /* ASN1_ELEMENT_NOT_FOUND; */
 }
-
-
-
-
-
--- gnutls-1.0.25/lib/minitasn1/libtasn1.h.tls	2004-10-28 22:56:41.000000000 +0200
+++ gnutls-1.0.25/lib/minitasn1/libtasn1.h	2006-02-10 21:54:08.000000000 +0100
@@ -106,6 +106,7 @@
   char *name;                    /* Node name */
   unsigned int type;             /* Node type */
   unsigned char *value;          /* Node value */
+  int value_len;
   struct node_asn_struct *down;  /* Pointer to the son node */
   struct node_asn_struct *right; /* Pointer to the brother node */
   struct node_asn_struct *left;  /* Pointer to the next list element */ 
--- gnutls-1.0.25/lib/minitasn1/parser_aux.c.tls	2004-11-13 22:53:49.000000000 +0100
+++ gnutls-1.0.25/lib/minitasn1/parser_aux.c	2006-02-10 21:54:08.000000000 +0100
@@ -185,11 +185,13 @@
   if(node==NULL) return node;
   if(node->value){
     _asn1_free(node->value);
-    node->value=NULL;  
+    node->value = NULL;  
+    node->value_len = 0;
   }
   if(!len) return node;
   node->value=(unsigned char *) _asn1_malloc(len);
   if (node->value==NULL) return NULL;
+  node->value_len = len;
   
   memcpy(node->value,value,len);
   return node;
--- gnutls-1.0.25/lib/minitasn1/coding.c.tls	2004-11-13 22:53:49.000000000 +0100
+++ gnutls-1.0.25/lib/minitasn1/coding.c	2006-02-10 21:59:10.000000000 +0100
@@ -147,7 +147,7 @@
 {
   int len_len;
 
-  if(der==NULL) return;
+  if(der==NULL || str_len <= 0) return;
   _asn1_length_der(str_len,der,&len_len);
   memcpy(der+len_len,str,str_len);
   *der_len=str_len+len_len;
@@ -533,7 +533,7 @@
 /* Return:                                            */
 /******************************************************/
 void
-_asn1_ordering_set(unsigned char *der,node_asn *node)
+_asn1_ordering_set(unsigned char *der, int der_len, node_asn *node)
 {
   struct vet{
     int end;
@@ -567,13 +567,16 @@
     else last->next=p_vet;
     last=p_vet;
 
-    /* tag value calculation */
-    tag=_asn1_get_tag_der(der+counter,&class,&len2);
+    /* tag value calculation */    
+    if (_asn1_get_tag_der(der+counter, der_len-counter,&class,&len2, &tag)!=ASN1_SUCCESS)
+        return;        
     p_vet->value=(class<<24)|tag;
     counter+=len2;
 
     /* extraction and length */
-    len2=_asn1_get_length_der(der+counter,&len);
+    len2=_asn1_get_length_der(der+counter,der_len-counter,&len);
+    if (len2<0) 
+        return;    
     counter+=len+len2;
 
     p_vet->end=counter;
@@ -625,7 +628,7 @@
 /* Return:                                            */
 /******************************************************/
 void
-_asn1_ordering_set_of(unsigned char *der,node_asn *node)
+_asn1_ordering_set_of(unsigned char *der, int der_len, node_asn *node)
 {
   struct vet{
     int end;
@@ -660,11 +663,17 @@
     last=p_vet;
 
     /* extraction of tag and length */
-    _asn1_get_tag_der(der+counter,&class,&len);
-    counter+=len;
-    len2=_asn1_get_length_der(der+counter,&len);
-    counter+=len+len2;
+    if (der_len-counter > 0) {
 
+       if (_asn1_get_tag_der(der+counter, der_len - counter, &class,&len,NULL)!=ASN1_SUCCESS)
+          return;
+       counter+=len;
+    
+       len2=_asn1_get_length_der(der+counter,der_len-counter,&len);
+       if (len2<0) return;
+       counter+=len+len2;
+    }
+    
     p_vet->end=counter;
     p=p->right;
   }
@@ -799,7 +808,8 @@
 	  _asn1_error_description_value_not_found(p,ErrorDescription);
 	  return ASN1_VALUE_NOT_FOUND;
 	}
-	len2=_asn1_get_length_der(p->value,&len3);
+	len2=_asn1_get_length_der(p->value,p->value_len, &len3);
+	if (len2<0) return ASN1_DER_ERROR;
 	max_len -= len2+len3;
 	if(max_len>=0)
 	  memcpy(der+counter,p->value,len3+len2);
@@ -841,7 +851,8 @@
 	_asn1_error_description_value_not_found(p,ErrorDescription);
 	return ASN1_VALUE_NOT_FOUND;
       }
-      len2=_asn1_get_length_der(p->value,&len3);
+      len2=_asn1_get_length_der(p->value,p->value_len,&len3);
+      if (len2<0) return ASN1_DER_ERROR;  
       max_len-=len2+len3;
       if(max_len>=0)
 	memcpy(der+counter,p->value,len3+len2);
@@ -853,7 +864,8 @@
 	_asn1_error_description_value_not_found(p,ErrorDescription);
 	return ASN1_VALUE_NOT_FOUND;
       }
-      len2=_asn1_get_length_der(p->value,&len3);
+      len2=_asn1_get_length_der(p->value,p->value_len,&len3);
+      if (len2<0) return ASN1_DER_ERROR;  
       max_len-=len2+len3;
       if(max_len>=0)
 	memcpy(der+counter,p->value,len3+len2);
@@ -865,7 +877,8 @@
 	_asn1_error_description_value_not_found(p,ErrorDescription);
 	return ASN1_VALUE_NOT_FOUND;
       }
-      len2=_asn1_get_length_der(p->value,&len3);
+      len2=_asn1_get_length_der(p->value,p->value_len,&len3);
+      if (len2<0) return ASN1_DER_ERROR;  
       max_len-=len2+len3;
       if(max_len>=0)
 	memcpy(der+counter,p->value,len3+len2);
@@ -898,7 +911,7 @@
 	len2=strtol(p->value,NULL,10);
 	_asn1_set_value(p,NULL,0);
 	if((type_field(p->type)==TYPE_SET) && (max_len>=0))
-	  _asn1_ordering_set(der+len2,p);
+	  _asn1_ordering_set(der+len2, max_len-len2,p);
 	_asn1_length_der(counter-len2,temp,&len3);
 	max_len-=len3;
 	if(max_len>=0){
@@ -929,8 +942,9 @@
       if(move==UP){
 	len2=strtol(p->value,NULL,10);
 	_asn1_set_value(p,NULL,0);
-	if((type_field(p->type)==TYPE_SET_OF) && (max_len>=0))
-	  _asn1_ordering_set_of(der+len2,p);
+	if((type_field(p->type)==TYPE_SET_OF) && (max_len-len2>0)) {
+	  _asn1_ordering_set_of(der+len2, max_len-len2,p);
+    }    
 	_asn1_length_der(counter-len2,temp,&len3);
 	max_len-=len3;
 	if(max_len>=0){
@@ -946,7 +960,8 @@
 	_asn1_error_description_value_not_found(p,ErrorDescription);
 	return ASN1_VALUE_NOT_FOUND;
       }
-      len2=_asn1_get_length_der(p->value,&len3);
+      len2=_asn1_get_length_der(p->value,p->value_len,&len3);
+      if (len2<0) return ASN1_DER_ERROR;  
       max_len-=len2;
       if(max_len>=0)
 	memcpy(der+counter,p->value+len3,len2);


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/FC-4/gnutls.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnutls.spec	30 Apr 2005 20:43:43 -0000	1.9
+++ gnutls.spec	10 Feb 2006 22:43:42 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A TLS implementation.
 Name: gnutls
 Version: 1.0.25
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel
@@ -14,6 +14,7 @@
 Source0: %{name}-%{version}-nosrp.tar.bz2
 Patch0: gnutls-1.0.25-nosrp.patch
 Patch1: gnutls-1.0.24-version-script.patch
+Patch2: gnutls-1.0.25-tls.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package devel
@@ -39,6 +40,7 @@
 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 libextra/$i
 done
+%patch2 -p1 -b .tls
 
 %build
 %configure --with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-included-lzo --disable-srp-authentication
@@ -74,6 +76,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Martin Stransky <stransky at redhat.com> 1.0.25-2
+- fix for CVE-2006-0645
+
 * Sat Apr 30 2005 Tomas Mraz <tmraz at redhat.com> 1.0.25-1
 - new upstream version fixes potential DOS attack
 



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:45:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:45:27 -0500
Subject: rpms/firefox/devel firefox-1.5.0.1-dumpstack.patch, 1.2,
	1.3 firefox.spec, 1.102, 1.103
Message-ID: <200602102245.k1AMjRLc025215@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25203

Modified Files:
	firefox-1.5.0.1-dumpstack.patch firefox.spec 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-3
- Improve the langpack install stuff
- Fix up dumpstack.patch to match the finalized change


firefox-1.5.0.1-dumpstack.patch:
 nsStackFrameUnix.cpp  |   16 +++-------------
 nsTraceRefcntImpl.cpp |   25 ++++++-------------------
 2 files changed, 9 insertions(+), 32 deletions(-)

Index: firefox-1.5.0.1-dumpstack.patch
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-1.5.0.1-dumpstack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-1.5.0.1-dumpstack.patch	2 Feb 2006 05:32:06 -0000	1.2
+++ firefox-1.5.0.1-dumpstack.patch	10 Feb 2006 22:45:22 -0000	1.3
@@ -1,25 +1,201 @@
-Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
+Index: xpcom/base/nsTraceRefcntImpl.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
-retrieving revision 1.12
-diff -d -u -p -r1.12 nsStackFrameUnix.cpp
---- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
-+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
-@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
+RCS file: /cvs/mozilla/xpcom/base/nsTraceRefcntImpl.cpp,v
+retrieving revision 1.98
+diff -p -u -1 -2 -r1.98 nsTraceRefcntImpl.cpp
+--- xpcom/base/nsTraceRefcntImpl.cpp	3 Feb 2006 19:35:14 -0000	1.98
++++ xpcom/base/nsTraceRefcntImpl.cpp	6 Feb 2006 20:30:53 -0000
+@@ -41,37 +41,24 @@
+ #include "nsISupports.h"
+ #include "nsVoidArray.h"
+ #include "prprf.h"
+ #include "prlog.h"
+ #include "plstr.h"
+ #include <stdlib.h>
+ #include "nsCOMPtr.h"
+ #include "nsCRT.h"
+ #include <math.h>
  
- void DumpStackToFile(FILE* aStream)
+ #if defined(_WIN32)
+ #include <windows.h>
+-#elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
+-#include <setjmp.h>
+-
+-//
+-// On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
+-// if __USE_GNU is defined.  I suppose its some kind of standards
+-// adherence thing.
+-//
+-#if (__GLIBC_MINOR__ >= 1) && !defined(__USE_GNU)
+-#define __USE_GNU
+-#endif
+-
+-#include <dlfcn.h>
+ #endif
+ 
+ #ifdef HAVE_LIBDL
+ #include <dlfcn.h>
+ #endif
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+ NS_COM void 
+ NS_MeanAndStdDev(double n, double sumOfValues, double sumOfSquaredValues,
+                  double *meanResult, double *stdDevResult)
  {
-+  fprintf(aStream, "Stacktrace disabled for now.\n"
-+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
-+#if 0
-   jmp_buf jb;
-   setjmp(jb);
+@@ -451,25 +438,25 @@ static PRIntn PR_CALLBACK DumpSerialNumb
+                             record->COMPtrCount);
+ #else
+   fprintf((FILE*) aClosure, "%d (%d references)\n",
+                             record->serialNumber,
+                             record->refCount);
+ #endif
+   return HT_ENUMERATE_NEXT;
+ }
  
-@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
-               symbol, off, info.dli_fname, foff);
-     }
+ 
+ #endif /* NS_BUILD_REFCNT_LOGGING */
+ 
+-nsresult
++NS_COM nsresult
+ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
+ {
+   nsresult rv = NS_OK;
+ #ifdef NS_BUILD_REFCNT_LOGGING
+   if (gBloatLog == nsnull || gBloatView == nsnull) {
+     return NS_ERROR_FAILURE;
+   }
+   if (out == nsnull) {
+     out = gBloatLog;
+   }
+ 
+   LOCK_TRACELOG();
+@@ -528,25 +515,25 @@ nsTraceRefcntImpl::DumpStatistics(Statis
+   if (gSerialNumbers) {
+     fprintf(out, "\n\nSerial Numbers of Leaked Objects:\n");
+     PL_HashTableEnumerateEntries(gSerialNumbers, DumpSerialNumbers, out);
    }
-+#endif
+ 
+ done:
+   gLogging = wasLogging;
+   UNLOCK_TRACELOG();
+ #endif
+   return rv;
+ }
+ 
+-void
++NS_COM void
+ nsTraceRefcntImpl::ResetStatistics()
+ {
+ #ifdef NS_BUILD_REFCNT_LOGGING
+   LOCK_TRACELOG();
+   if (gBloatView) {
+     PL_HashTableDestroy(gBloatView);
+     gBloatView = nsnull;
+   }
+   UNLOCK_TRACELOG();
+ #endif
+ }
+ 
+@@ -812,43 +799,43 @@ static void InitTraceLog(void)
+ 
+   if (gBloatLog || gRefcntsLog || gAllocLog || gLeakyLog || gCOMPtrLog) {
+     gLogging = PR_TRUE;
+   }
+ 
+   gTraceLock = PR_NewLock();
  }
  
- #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
+ #endif
+ 
+ #if defined(_WIN32) && defined(_M_IX86) && !defined(WINCE) // WIN32 x86 stack walking code
+ #include "nsStackFrameWin.h"
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ // WIN32 x86 stack walking code
+ // i386 or PPC Linux stackwalking code or Solaris
+-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
++#elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+ #include "nsStackFrameUnix.h"
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ #else // unsupported platform.
+ 
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+ 	fprintf(aStream, "write me, dammit!\n");
+ }
+ 
+ #endif
+ 
+ //----------------------------------------------------------------------
+ 
+ // This thing is exported by libstdc++
+ // Yes, this is a gcc only hack
+ #if defined(MOZ_DEMANGLE_SYMBOLS)
+Index: xpcom/base/nsStackFrameUnix.cpp
+===================================================================
+RCS file: /cvs/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
+retrieving revision 1.14
+diff -p -u -1 -2 -r1.14 nsStackFrameUnix.cpp
+--- xpcom/base/nsStackFrameUnix.cpp	3 Feb 2006 19:35:14 -0000	1.14
++++ xpcom/base/nsStackFrameUnix.cpp	6 Feb 2006 20:28:06 -0000
+@@ -74,43 +74,33 @@ void DemangleSymbol(const char * aSymbol
+     /* See demangle.h in the gcc source for the voodoo */
+     char * demangled = abi::__cxa_demangle(aSymbol,0,0,0);
+     
+     if (demangled)
+     {
+         strncpy(aBuffer,demangled,aBufLen);
+         free(demangled);
+     }
+ #endif // MOZ_DEMANGLE_SYMBOLS
+ }
+ 
+ 
+-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
++#if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+ 
+-#include <setjmp.h>
+-//
+ 
+ void DumpStackToFile(FILE* aStream)
+ {
+-  jmp_buf jb;
+-  setjmp(jb);
+-
+   // Stack walking code courtesy Kipp's "leaky".
+ 
+-  // Get the frame pointer out of the jmp_buf
+-  void **bp = (void**)
+-#if defined(__i386) 
+-    (jb[0].__jmpbuf[JB_BP]);
+-#elif defined(PPC)
+-    (jb[0].__jmpbuf[JB_GPR1]);
+-#endif
++  // Get the frame pointer
++  void **bp = (void**) __builtin_frame_address(0);
+ 
+   int skip = 2;
+   for ( ; (void**)*bp > bp; bp = (void**)*bp) {
+     void *pc = *(bp+1);
+     if (--skip <= 0) {
+       Dl_info info;
+       int ok = dladdr(pc, &info);
+       if (!ok) {
+         fprintf(aStream, "UNKNOWN %p\n", pc);
+         continue;
+       }
+ 


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- firefox.spec	7 Feb 2006 11:39:57 -0000	1.102
+++ firefox.spec	10 Feb 2006 22:45:22 -0000	1.103
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        2.1
+Release:        3
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -105,7 +105,7 @@
 %ifnarch i386
 %patch5  -p0
 %endif
-%patch6 -p1
+%patch6 -p0
 
 %patch20 -p0
 %patch21 -p1
@@ -206,15 +206,19 @@
   extensiondir=$RPM_BUILD_ROOT%{ffdir}/extensions/langpack-$language at firefox.mozilla.org
   %{__mkdir_p} $extensiondir
   unzip $langpack -d $extensiondir
+  find $extensiondir -type f | xargs chmod 644
 
-  %{__rm} -rf locale
+  langtmp=%{_tmpdir}/%{name}/langpack-$language
+  %{__mkdir_p} $langtmp
   jarfile=$extensiondir/chrome/$language.jar
-  unzip $jarfile
-  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" locale/browser-region/region.properties
+  unzip $jarfile -d $langtmp
+  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" $langtmp/locale/browser-region/region.properties
+  find $langtmp -type f | xargs chmod 644
   %{__rm} -rf $jarfile
+  cd $langtmp
   zip -r -D $jarfile locale
   %{__rm} -rf locale
-
+  cd -
 done
 %{__rm} -rf firefox-langpacks
 
@@ -258,7 +262,11 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.1-2.1
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-3
+- Improve the langpack install stuff
+- Fix up dumpstack.patch to match the finalized change
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Feb  1 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-2



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:46:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:46:38 -0500
Subject: rpms/gnutls/FC-4 gnutls.spec,1.10,1.11
Message-ID: <200602102246.k1AMkcPe000864@cvs.devel.redhat.com>

Author: stransky

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

Modified Files:
	gnutls.spec 
Log Message:
release change


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/FC-4/gnutls.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnutls.spec	10 Feb 2006 22:43:42 -0000	1.10
+++ gnutls.spec	10 Feb 2006 22:46:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A TLS implementation.
 Name: gnutls
 Version: 1.0.25
-Release: 2
+Release: 2.FC4
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel
@@ -76,7 +76,7 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Feb 10 2006 Martin Stransky <stransky at redhat.com> 1.0.25-2
+* Fri Feb 10 2006 Martin Stransky <stransky at redhat.com> 1.0.25-2.FC4
 - fix for CVE-2006-0645
 
 * Sat Apr 30 2005 Tomas Mraz <tmraz at redhat.com> 1.0.25-1



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:46:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:46:56 -0500
Subject: rpms/thunderbird/devel thunderbird.spec,1.63,1.64
Message-ID: <200602102246.k1AMkutB003672@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/thunderbird/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3123

Modified Files:
	thunderbird.spec 
Log Message:
woops, mistyped the filename


Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- thunderbird.spec	10 Feb 2006 22:43:41 -0000	1.63
+++ thunderbird.spec	10 Feb 2006 22:46:52 -0000	1.64
@@ -34,6 +34,7 @@
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
 Patch6:         firefox-1.1-nss-system-nspr.patch
+Patch7:       firefox-1.5.0.1-dumpstack.patch
 
 Patch10:        thunderbird-0.7.3-psfonts.patch
 Patch11:        thunderbird-0.7.3-gnome-uriloader.patch
@@ -51,7 +52,6 @@
 # patches from upstream (Patch100+)
 Patch100:       firefox-bug305970.patch
 Patch101:       thunderbird-1.5-bug304720.patch
-Patch102:       firefox-1.5-dumpstack.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,6 +93,7 @@
 %endif
 
 %patch6 -p1
+%patch7 -p0
 %patch10 -p1 -b .psfonts
 %patch11 -p1 -b .gnome-uriloader
 %patch24 -p1
@@ -102,7 +103,6 @@
 
 %patch100 -p1
 %patch101 -p1
-%patch102 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig



From fedora-cvs-commits at redhat.com  Fri Feb 10 22:52:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 17:52:34 -0500
Subject: rpms/eclipse-bugzilla/devel sources,1.15,1.16
Message-ID: <200602102252.k1AMqYXq005752@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5739

Modified Files:
	sources 
Log Message:
Uploaded fixed source file.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	10 Feb 2006 22:39:03 -0000	1.15
+++ sources	10 Feb 2006 22:52:31 -0000	1.16
@@ -1 +1 @@
-a0778247c17fd82fac9d43201304bddc  eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz
+b29442560c52e70bafd2447f281d83d1  eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 10 23:12:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 18:12:42 -0500
Subject: rpms/eclipse/FC-4 eclipse.spec, 1.174, 1.175 rebuild-sdk-features,
	1.2, 1.3
Message-ID: <200602102312.k1ANCgpQ018524@cvs.devel.redhat.com>

Author: overholt

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

Modified Files:
	eclipse.spec rebuild-sdk-features 
Log Message:
Cleanup rebuild-sdk-features.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- eclipse.spec	10 Feb 2006 15:21:22 -0000	1.174
+++ eclipse.spec	10 Feb 2006 23:12:38 -0000	1.175
@@ -1262,8 +1262,8 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
-* Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_5fc.FC4
-- Update the rebuild-sdk-features script to use the 3.1 updatesite.
+* Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
+- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
 - Make platform/feature.xml reference the tomcat5 plugin.
 
 * Thu Feb 09 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_4fc.FC4


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/rebuild-sdk-features,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebuild-sdk-features	10 Feb 2006 05:45:11 -0000	1.2
+++ rebuild-sdk-features	10 Feb 2006 23:12:39 -0000	1.3
@@ -17,8 +17,8 @@
 
 # platform.xml header, etc.
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > configuration/org.eclipse.update/platform.xml
-echo "<config version=\"3.0\" date=\"1133364008091\" transient=\"false\">" >> configuration/org.eclipse.update/platform.xml
-echo "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">" >> configuration/org.eclipse.update/platform.xml
+echo "<config date=\"1139581358577\" transient=\"false\" version=\"3.0\">" >> configuration/org.eclipse.update/platform.xml
+echo "<site enabled=\"true\" policy=\"USER-EXCLUDE\" updateable=\"true\" url=\"platform:/base/\">" >> configuration/org.eclipse.update/platform.xml
 featureId="org.eclipse.sdk"
 version=${sdkVersion}
 echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">" >> configuration/org.eclipse.update/platform.xml
@@ -48,12 +48,15 @@
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 
 # Possible SDK features are:
-#  org.eclipse.jdt_${version}
-#  org.eclipse.pde_${version}
 #  org.eclipse.platform_${version}
 #  org.eclipse.platform.source_${version}
-#  org.eclipse.rcp_${version}
+#  org.eclipse.jdt_${version}
+#  org.eclipse.jdt.source_${version}
+#  org.eclipse.pde_${version}
+#  org.eclipse.pde.source_${version}
 #  org.eclipse.sdk_${version}
+#  org.eclipse.rcp_${version}
+#  org.eclipse.rcp.source_${version}
 
 features=$(ls features)
 for feature in $features
@@ -90,12 +93,15 @@
   then
       if [ "xx${version}xx" != "xxxx" ]
       then
-            echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
-	    echo "</feature>" >> configuration/org.eclipse.update/platform.xml
-	    if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
-	    then
-		echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-	    fi
+          echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
+          echo "</feature>" >> configuration/org.eclipse.update/platform.xml
+          if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
+          then
+              if [ "xx${featureId}" != "xxorg.eclipse.rcp.source" ]
+              then
+                  echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+              fi
+          fi
       fi
   fi
 done



From fedora-cvs-commits at redhat.com  Fri Feb 10 23:20:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 18:20:16 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.29,1.30
Message-ID: <200602102320.k1ANKG9x001697@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1618

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1.1
- Release bumpt to build.




Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eclipse-bugzilla.spec	10 Feb 2006 22:39:03 -0000	1.29
+++ eclipse-bugzilla.spec	10 Feb 2006 23:20:12 -0000	1.30
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	1	
+Release:	1.1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -139,6 +139,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1.1
+- Release bumpt to build.
+
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1
 - Update to version 0.2.0 which includes bugfixes and xmlrpc support for
 bugzilla.redhat.com.



From fedora-cvs-commits at redhat.com  Fri Feb 10 23:27:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 18:27:36 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.30,1.31
Message-ID: <200602102327.k1ANRaGr005034@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5004

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2
- Release bump to build.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- eclipse-bugzilla.spec	10 Feb 2006 23:20:12 -0000	1.30
+++ eclipse-bugzilla.spec	10 Feb 2006 23:27:34 -0000	1.31
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	1.1
+Release:	2
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -139,13 +139,15 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2
+- Release bump to build.
+
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1.1
-- Release bumpt to build.
+- Release bump to build.
 
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-1
 - Update to version 0.2.0 which includes bugfixes and xmlrpc support for
 bugzilla.redhat.com.
-- Remove _fc from versioning. 
 - Add Requires and BuildRequires on xmlrpc.
 
 * Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 0.1.1_fc-6.4



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:29:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:29:18 -0500
Subject: rpms/a2ps/devel a2ps.spec,1.29,1.30
Message-ID: <200602110129.k1B1TIKK028263@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28226

Modified Files:
	a2ps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- a2ps.spec	7 Feb 2006 10:49:14 -0000	1.29
+++ a2ps.spec	11 Feb 2006 01:29:00 -0000	1.30
@@ -1,10 +1,10 @@
 %define	ver	4.13b
-%define rel 48.2
+%define rel 48.2.1
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: %{ver}
-Release: %{rel}.2
+Release: %{rel}.2.1
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -226,6 +226,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.2.1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:30:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:30:56 -0500
Subject: rpms/acl/devel acl.spec,1.24,1.25
Message-ID: <200602110130.k1B1UuGq028402@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28371

Modified Files:
	acl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- acl.spec	7 Feb 2006 10:49:17 -0000	1.24
+++ acl.spec	11 Feb 2006 01:30:44 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Access control list utilities.
 Name: acl
 Version: 2.2.34
-Release: 1.1
+Release: 1.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl-%{version}.src.tar.gz
@@ -97,6 +97,9 @@
 /%{_lib}/libacl.so.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.34-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.34-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:32:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:32:23 -0500
Subject: rpms/adjtimex/devel adjtimex.spec,1.17,1.18
Message-ID: <200602110132.k1B1WNcj028551@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/adjtimex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28509

Modified Files:
	adjtimex.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: adjtimex.spec
===================================================================
RCS file: /cvs/dist/rpms/adjtimex/devel/adjtimex.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- adjtimex.spec	7 Feb 2006 10:51:55 -0000	1.17
+++ adjtimex.spec	11 Feb 2006 01:32:12 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A utility for adjusting kernel time variables.
 Name: adjtimex
 Version: 1.20
-Release: 1.2
+Release: 1.2.1
 ExclusiveOS: Linux
 License: distributable
 Group: System Environment/Base
@@ -43,6 +43,9 @@
 %{_mandir}/man8/adjtimex.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.20-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.20-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:32:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:32:49 -0500
Subject: rpms/agg/devel agg.spec,1.6,1.7
Message-ID: <200602110132.k1B1Wnmi028674@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28648

Modified Files:
	agg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- agg.spec	8 Feb 2006 08:12:40 -0000	1.6
+++ agg.spec	11 Feb 2006 01:32:44 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.3
-Release: 2
+Release: 2.1
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
@@ -56,6 +56,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-2.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb 08 2006 Caolan McNamara <caolanm at redhat.com> - 2.3-2
 - rh#180341# BuildRequires
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:33:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:33:08 -0500
Subject: rpms/alchemist/devel alchemist.spec,1.18,1.19
Message-ID: <200602110133.k1B1X8Rn028829@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/alchemist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28795

Modified Files:
	alchemist.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: alchemist.spec
===================================================================
RCS file: /cvs/dist/rpms/alchemist/devel/alchemist.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- alchemist.spec	7 Feb 2006 10:52:06 -0000	1.18
+++ alchemist.spec	11 Feb 2006 01:33:06 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: A multi-sourced configuration back-end.
 Name: alchemist
 Version: 1.0.36
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %doc src/doc/html
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.36-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.36-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:33:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:33:43 -0500
Subject: rpms/alsa-lib/devel alsa-lib.spec,1.42,1.43
Message-ID: <200602110133.k1B1XhPc028999@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-lib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- alsa-lib.spec	7 Feb 2006 10:52:14 -0000	1.42
+++ alsa-lib.spec	11 Feb 2006 01:33:41 -0000	1.43
@@ -5,7 +5,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 3.rc2.1
+Release: 3.rc2.2
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
@@ -149,6 +149,9 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-3.rc2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:34:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:34:51 -0500
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.31,1.32
Message-ID: <200602110134.k1B1YpQU029161@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	alsa-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- alsa-utils.spec	7 Feb 2006 10:52:22 -0000	1.31
+++ alsa-utils.spec	11 Feb 2006 01:34:47 -0000	1.32
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	2.rc2.1
+Release: 	2.rc2.2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -69,6 +69,9 @@
 /usr/share/locale/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-2.rc2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-2.rc2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:35:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:35:12 -0500
Subject: rpms/amanda/devel amanda.spec,1.27,1.28
Message-ID: <200602110135.k1B1ZCDs029296@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amanda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29266

Modified Files:
	amanda.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: amanda.spec
===================================================================
RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- amanda.spec	7 Feb 2006 10:52:30 -0000	1.27
+++ amanda.spec	11 Feb 2006 01:35:10 -0000	1.28
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.4.5p1
-Release: 3.1
+Release: 3.2
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
@@ -322,6 +322,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5p1-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5p1-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:35:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:35:27 -0500
Subject: rpms/amtu/devel amtu.spec,1.12,1.13
Message-ID: <200602110135.k1B1ZRuU029434@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/amtu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29410

Modified Files:
	amtu.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: amtu.spec
===================================================================
RCS file: /cvs/dist/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- amtu.spec	7 Feb 2006 10:52:38 -0000	1.12
+++ amtu.spec	11 Feb 2006 01:35:24 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
 Version: 1.0.4
-Release: 2.1
+Release: 2.2
 License: Common Public License
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -60,6 +60,9 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.4-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:35:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:35:39 -0500
Subject: rpms/am-utils/devel am-utils.spec,1.33,1.34
Message-ID: <200602110135.k1B1ZdfH029574@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	am-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: am-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- am-utils.spec	7 Feb 2006 10:52:50 -0000	1.33
+++ am-utils.spec	11 Feb 2006 01:35:35 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd.
 Name: am-utils
 Version: 6.1.3
-Release: 1.2
+Release: 1.2.1
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -132,6 +132,9 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:6.1.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:35:58 -0500
Subject: rpms/anaconda/devel anaconda.spec,1.335,1.336
Message-ID: <200602110135.k1B1Zwg7029719@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29694

Modified Files:
	anaconda.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- anaconda.spec	9 Feb 2006 22:05:35 -0000	1.335
+++ anaconda.spec	11 Feb 2006 01:35:51 -0000	1.336
@@ -1,6 +1,6 @@
 Name: anaconda
 Version: 10.91.19
-Release: 1
+Release: 1.1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -79,6 +79,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 10.91.19-1.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 10.91.19-1
 - Fix loader typo.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:36:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:36:09 -0500
Subject: rpms/libgdiplus/devel libgdiplus.spec,1.11,1.12
Message-ID: <200602110136.k1B1a9VO029833@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/libgdiplus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29801

Modified Files:
	libgdiplus.spec 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-2
- Rebuild



Index: libgdiplus.spec
===================================================================
RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libgdiplus.spec	7 Feb 2006 12:37:19 -0000	1.11
+++ libgdiplus.spec	11 Feb 2006 01:36:06 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libgdiplus
 Version:        1.1.13.2
-Release:        1.1
+Release:        2
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
 Group:          System Environment/Libraries
@@ -45,6 +45,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-2
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.13.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:36:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:36:15 -0500
Subject: rpms/anacron/devel anacron.spec,1.16,1.17
Message-ID: <200602110136.k1B1aFSJ029880@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/anacron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29856

Modified Files:
	anacron.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: anacron.spec
===================================================================
RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anacron.spec	8 Feb 2006 00:28:14 -0000	1.16
+++ anacron.spec	11 Feb 2006 01:36:12 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A cron-like program that can run jobs lost during downtime.
 Name: anacron
 Version: 2.3
-Release: 36
+Release: 36.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz
@@ -110,6 +110,9 @@
 %config /etc/cron.weekly/0anacron
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-36.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2.3-36
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:36:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:36:34 -0500
Subject: rpms/ant/devel ant.spec,1.69,1.70
Message-ID: <200602110136.k1B1aYml030062@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ant.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ant.spec	7 Feb 2006 10:52:58 -0000	1.69
+++ ant.spec	11 Feb 2006 01:36:32 -0000	1.70
@@ -5,7 +5,7 @@
 
 Name:           ant
 Version:        1.6.5
-Release: 	%{jpprelease}_5fc
+Release: 	%{jpprelease}_6fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -751,6 +751,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_6fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.5-1jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:36:54 -0500
Subject: rpms/anthy/devel anthy.spec,1.17,1.18
Message-ID: <200602110136.k1B1asc2030260@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	anthy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- anthy.spec	7 Feb 2006 10:53:10 -0000	1.17
+++ anthy.spec	11 Feb 2006 01:36:52 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name:		anthy
 Version:	%{version}
-Release: 2.2
+Release: 2.2.1
 License:	GPL
 URL:		http://sourceforge.jp/projects/anthy/
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -117,6 +117,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7100b-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7100b-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:37:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:37:17 -0500
Subject: rpms/apr/devel apr.spec,1.47,1.48
Message-ID: <200602110137.k1B1bHwh030445@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30415

Modified Files:
	apr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apr.spec	7 Feb 2006 10:53:28 -0000	1.47
+++ apr.spec	11 Feb 2006 01:37:13 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.2
-Release: 7.1
+Release: 7.2
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -127,6 +127,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:37:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:37:38 -0500
Subject: rpms/apr-util/devel apr-util.spec,1.23,1.24
Message-ID: <200602110137.k1B1bc5o030650@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30619

Modified Files:
	apr-util.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apr-util.spec	7 Feb 2006 10:53:36 -0000	1.23
+++ apr-util.spec	11 Feb 2006 01:37:34 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
 Version: 1.2.2
-Release: 4.1
+Release: 4.2
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -101,6 +101,9 @@
 %doc --parents html
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:38:08 -0500
Subject: rpms/aqbanking/devel aqbanking.spec,1.12,1.13
Message-ID: <200602110138.k1B1c8KL030907@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aqbanking/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30873

Modified Files:
	aqbanking.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aqbanking.spec
===================================================================
RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aqbanking.spec	7 Feb 2006 13:48:25 -0000	1.12
+++ aqbanking.spec	11 Feb 2006 01:38:04 -0000	1.13
@@ -1,7 +1,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export.
 Version: 1.8.1beta
-Release: 3
+Release: 3.1
 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz
 Source1: aqbanking-%{version}-gladesrc.tar.gz
 Group: System Environment/Libraries
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.1beta-3.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Karsten Hopp <karsten at redhat.de> 1.8.1beta-3
 - buildrequire libofx-devel instead of libofx (pulls in libofx)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:38:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:38:30 -0500
Subject: rpms/arptables_jf/devel arptables_jf.spec,1.10,1.11
Message-ID: <200602110138.k1B1cU0P031112@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/arptables_jf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31086

Modified Files:
	arptables_jf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: arptables_jf.spec
===================================================================
RCS file: /cvs/dist/rpms/arptables_jf/devel/arptables_jf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- arptables_jf.spec	7 Feb 2006 10:53:55 -0000	1.10
+++ arptables_jf.spec	11 Feb 2006 01:38:27 -0000	1.11
@@ -4,7 +4,7 @@
 
 Epoch: 0
 Version: 0.0.8
-Release: 6.2
+Release: 6.2.1
 Source: %{name}-%{version}.tbz
 #Source1: Makefile
 #Source2: arptables.h
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.0.8-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:38:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:38:46 -0500
Subject: rpms/arts/devel arts.spec,1.55,1.56
Message-ID: <200602110138.k1B1ckRd031262@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	arts.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: arts.spec
===================================================================
RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- arts.spec	7 Feb 2006 10:54:03 -0000	1.55
+++ arts.spec	11 Feb 2006 01:38:42 -0000	1.56
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 1.5.1
-Release: 1.1
+Release: 1.2
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -172,6 +172,9 @@
 %{_bindir}/artsc-config
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8:1.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:39:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:39:11 -0500
Subject: rpms/aspell/devel aspell.spec,1.27,1.28
Message-ID: <200602110139.k1B1dB4w031507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31437

Modified Files:
	aspell.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- aspell.spec	7 Feb 2006 10:54:11 -0000	1.27
+++ aspell.spec	11 Feb 2006 01:39:07 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A spelling checker.
 Name: aspell
 Version: 0.60.3
-Release: 3.1
+Release: 3.2
 Epoch: 12
 License: LGPL
 Group: Applications/Text
@@ -119,6 +119,9 @@
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 12:0.60.3-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 12:0.60.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:39:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:39:39 -0500
Subject: rpms/aspell-af/devel aspell-af.spec,1.6,1.7
Message-ID: <200602110139.k1B1ddME031688@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-af/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31652

Modified Files:
	aspell-af.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-af.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-af/devel/aspell-af.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-af.spec	7 Feb 2006 10:54:23 -0000	1.6
+++ aspell-af.spec	11 Feb 2006 01:39:35 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:39:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:39:52 -0500
Subject: rpms/aspell-bg/devel aspell-bg.spec,1.10,1.11
Message-ID: <200602110139.k1B1dqa8031865@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-bg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31837

Modified Files:
	aspell-bg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-bg.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-bg/devel/aspell-bg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aspell-bg.spec	7 Feb 2006 10:54:35 -0000	1.10
+++ aspell-bg.spec	11 Feb 2006 01:39:49 -0000	1.11
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.2
+Release: 11.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -46,6 +46,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:40:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:40:09 -0500
Subject: rpms/aspell-br/devel aspell-br.spec,1.6,1.7
Message-ID: <200602110140.k1B1e964032021@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-br/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31985

Modified Files:
	aspell-br.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-br.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-br/devel/aspell-br.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-br.spec	7 Feb 2006 10:54:47 -0000	1.6
+++ aspell-br.spec	11 Feb 2006 01:40:07 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:40:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:40:28 -0500
Subject: rpms/aspell-ca/devel aspell-ca.spec,1.16,1.17
Message-ID: <200602110140.k1B1eSDu032187@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32156

Modified Files:
	aspell-ca.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-ca.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ca/devel/aspell-ca.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-ca.spec	7 Feb 2006 10:54:58 -0000	1.16
+++ aspell-ca.spec	11 Feb 2006 01:40:26 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:40:57 -0500
Subject: rpms/aspell-cs/devel aspell-cs.spec,1.7,1.8
Message-ID: <200602110140.k1B1eviV032372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32341

Modified Files:
	aspell-cs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-cs.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cs/devel/aspell-cs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aspell-cs.spec	7 Feb 2006 10:55:09 -0000	1.7
+++ aspell-cs.spec	11 Feb 2006 01:40:55 -0000	1.8
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:49:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:49:16 -0500
Subject: rpms/gstreamer/devel .cvsignore, 1.18, 1.19 gstreamer.spec, 1.44,
	1.45 sources, 1.19, 1.20
Message-ID: <200602110149.k1B1nGTv016599@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
- Update to 0.10.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Jan 2006 16:27:15 -0000	1.18
+++ .cvsignore	11 Feb 2006 01:49:12 -0000	1.19
@@ -1,3 +1 @@
-gstreamer-0.10.0.tar.bz2
-gstreamer-0.10.1.tar.bz2
-gstreamer-0.10.2.tar.bz2
+gstreamer-0.10.3.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gstreamer.spec	7 Feb 2006 12:05:11 -0000	1.44
+++ gstreamer.spec	11 Feb 2006 01:49:12 -0000	1.45
@@ -5,8 +5,8 @@
 %define 	_libxml2	2.4.0
 
 Name: 		%{gstreamer}
-Version: 	0.10.2
-Release: 	1.1
+Version: 	0.10.3
+Release: 	1
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -199,6 +199,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
+- Update to 0.10.3
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	18 Jan 2006 16:27:15 -0000	1.19
+++ sources	11 Feb 2006 01:49:13 -0000	1.20
@@ -1 +1 @@
-870206cef20bcc6fce8f3531b64a818b  gstreamer-0.10.2.tar.bz2
+bee72ad6bccc334e5c8af72c1ff4ffce  gstreamer-0.10.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:51:21 -0500
Subject: rpms/xorg-x11-drv-tdfx/devel xorg-x11-drv-tdfx.spec,1.7,1.8
Message-ID: <200602110151.k1B1pLiI017680@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tdfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17651

Modified Files:
	xorg-x11-drv-tdfx.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-tdfx.spec	7 Feb 2006 14:32:33 -0000	1.7
+++ xorg-x11-drv-tdfx.spec	11 Feb 2006 01:51:19 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
 Version:   1.1.1.3
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:52:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:52:28 -0500
Subject: rpms/aspell-cy/devel aspell-cy.spec,1.6,1.7
Message-ID: <200602110152.k1B1qSjP018903@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-cy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18871

Modified Files:
	aspell-cy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-cy.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-cy/devel/aspell-cy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-cy.spec	7 Feb 2006 10:55:20 -0000	1.6
+++ aspell-cy.spec	11 Feb 2006 01:52:25 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:52:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:52:48 -0500
Subject: rpms/aspell-da/devel aspell-da.spec,1.17,1.18
Message-ID: <200602110152.k1B1qlmY019101@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-da/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19068

Modified Files:
	aspell-da.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-da.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-da/devel/aspell-da.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aspell-da.spec	7 Feb 2006 10:55:31 -0000	1.17
+++ aspell-da.spec	11 Feb 2006 01:52:45 -0000	1.18
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 12.2
+Release: 12.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:52:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:52:59 -0500
Subject: rpms/aspell-de/devel aspell-de.spec,1.15,1.16
Message-ID: <200602110152.k1B1qxVO019229@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-de/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19198

Modified Files:
	aspell-de.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-de.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-de/devel/aspell-de.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- aspell-de.spec	7 Feb 2006 10:55:40 -0000	1.15
+++ aspell-de.spec	11 Feb 2006 01:52:57 -0000	1.16
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 11.2
+Release: 11.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:53:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:53:14 -0500
Subject: rpms/aspell-el/devel aspell-el.spec,1.6,1.7
Message-ID: <200602110153.k1B1rEhU019381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19352

Modified Files:
	aspell-el.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-el.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-el/devel/aspell-el.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-el.spec	7 Feb 2006 10:55:55 -0000	1.6
+++ aspell-el.spec	11 Feb 2006 01:53:11 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:53:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:53:32 -0500
Subject: rpms/aspell-en/devel aspell-en.spec,1.9,1.10
Message-ID: <200602110153.k1B1rWmV019537@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-en/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19504

Modified Files:
	aspell-en.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-en.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-en/devel/aspell-en.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aspell-en.spec	7 Feb 2006 10:56:05 -0000	1.9
+++ aspell-en.spec	11 Feb 2006 01:53:30 -0000	1.10
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 6.0
-Release: 1.2
+Release: 1.2.1
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -46,6 +46,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:6.0-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:6.0-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:53:46 -0500
Subject: rpms/aspell-es/devel aspell-es.spec,1.19,1.20
Message-ID: <200602110153.k1B1rkiB019681@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-es/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19652

Modified Files:
	aspell-es.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-es.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- aspell-es.spec	7 Feb 2006 10:56:16 -0000	1.19
+++ aspell-es.spec	11 Feb 2006 01:53:43 -0000	1.20
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 13.2
+Release: 13.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-13.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-13.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:53:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:53:59 -0500
Subject: rpms/aspell-fo/devel aspell-fo.spec,1.6,1.7
Message-ID: <200602110153.k1B1rxpZ019818@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19792

Modified Files:
	aspell-fo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-fo.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fo/devel/aspell-fo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-fo.spec	7 Feb 2006 10:56:27 -0000	1.6
+++ aspell-fo.spec	11 Feb 2006 01:53:56 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:54:15 -0500
Subject: rpms/aspell-fr/devel aspell-fr.spec,1.13,1.14
Message-ID: <200602110154.k1B1sFn1019968@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-fr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19942

Modified Files:
	aspell-fr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-fr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-fr/devel/aspell-fr.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aspell-fr.spec	7 Feb 2006 10:56:37 -0000	1.13
+++ aspell-fr.spec	11 Feb 2006 01:54:12 -0000	1.14
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 9.2
+Release: 9.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:54:26 -0500
Subject: rpms/aspell-ga/devel aspell-ga.spec,1.6,1.7
Message-ID: <200602110154.k1B1sQTL020092@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20067

Modified Files:
	aspell-ga.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-ga.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ga/devel/aspell-ga.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-ga.spec	7 Feb 2006 10:56:48 -0000	1.6
+++ aspell-ga.spec	11 Feb 2006 01:54:24 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:54:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:54:40 -0500
Subject: rpms/aspell-gd/devel aspell-gd.spec,1.6,1.7
Message-ID: <200602110154.k1B1seXV020217@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20190

Modified Files:
	aspell-gd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-gd.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gd/devel/aspell-gd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-gd.spec	7 Feb 2006 10:56:58 -0000	1.6
+++ aspell-gd.spec	11 Feb 2006 01:54:37 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:54:52 -0500
Subject: rpms/aspell-gl/devel aspell-gl.spec,1.6,1.7
Message-ID: <200602110154.k1B1sqqr020357@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-gl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20328

Modified Files:
	aspell-gl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-gl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-gl/devel/aspell-gl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-gl.spec	7 Feb 2006 10:57:10 -0000	1.6
+++ aspell-gl.spec	11 Feb 2006 01:54:49 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:55:04 -0500
Subject: rpms/aspell-hr/devel aspell-hr.spec,1.6,1.7
Message-ID: <200602110155.k1B1t41A020492@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-hr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20461

Modified Files:
	aspell-hr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-hr.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-hr/devel/aspell-hr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-hr.spec	7 Feb 2006 10:57:22 -0000	1.6
+++ aspell-hr.spec	11 Feb 2006 01:55:01 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:55:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:55:18 -0500
Subject: rpms/aspell-id/devel aspell-id.spec,1.6,1.7
Message-ID: <200602110155.k1B1tIiT020635@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-id/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20603

Modified Files:
	aspell-id.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-id.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-id/devel/aspell-id.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aspell-id.spec	7 Feb 2006 10:57:42 -0000	1.6
+++ aspell-id.spec	11 Feb 2006 01:55:15 -0000	1.7
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50.1
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:55:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:55:34 -0500
Subject: rpms/aspell-is/devel aspell-is.spec,1.4,1.5
Message-ID: <200602110155.k1B1tYrU020778@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-is/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20742

Modified Files:
	aspell-is.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-is.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-is/devel/aspell-is.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aspell-is.spec	7 Feb 2006 10:57:53 -0000	1.4
+++ aspell-is.spec	11 Feb 2006 01:55:31 -0000	1.5
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51.1
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51.1-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51.1-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:55:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:55:45 -0500
Subject: rpms/aspell-it/devel aspell-it.spec,1.16,1.17
Message-ID: <200602110155.k1B1tj2e020906@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-it/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20882

Modified Files:
	aspell-it.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-it.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-it/devel/aspell-it.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-it.spec	7 Feb 2006 18:08:25 -0000	1.16
+++ aspell-it.spec	11 Feb 2006 01:55:42 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.53
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.53-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:55:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:55:56 -0500
Subject: rpms/aspell-nl/devel aspell-nl.spec,1.16,1.17
Message-ID: <200602110155.k1B1tu6T021038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-nl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21013

Modified Files:
	aspell-nl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-nl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-nl.spec	7 Feb 2006 10:58:09 -0000	1.16
+++ aspell-nl.spec	11 Feb 2006 01:55:54 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 8.1
+Release: 8.2
 License: distributable
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-8.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:56:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:56:08 -0500
Subject: rpms/aspell-no/devel aspell-no.spec,1.18,1.19
Message-ID: <200602110156.k1B1u8UM021175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-no/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21143

Modified Files:
	aspell-no.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-no.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-no/devel/aspell-no.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aspell-no.spec	7 Feb 2006 10:58:20 -0000	1.18
+++ aspell-no.spec	11 Feb 2006 01:56:06 -0000	1.19
@@ -5,7 +5,7 @@
 Name: aspell-no
 Epoch: 50
 Version: 0.50.1
-Release: 9.2
+Release: 9.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -49,6 +49,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50.1-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:56:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:56:25 -0500
Subject: rpms/aspell-pl/devel aspell-pl.spec,1.9,1.10
Message-ID: <200602110156.k1B1uPUb021302@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21279

Modified Files:
	aspell-pl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-pl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pl/devel/aspell-pl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aspell-pl.spec	7 Feb 2006 10:58:31 -0000	1.9
+++ aspell-pl.spec	11 Feb 2006 01:56:23 -0000	1.10
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 5.2
+Release: 5.2.1
 License: Creative Commons ShareAlike
 Group: Applications/Text
 URL: http://aspell.net/
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:56:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:56:41 -0500
Subject: rpms/aspell-pt/devel aspell-pt.spec,1.14,1.15
Message-ID: <200602110156.k1B1ufCI021446@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-pt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21424

Modified Files:
	aspell-pt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-pt.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-pt/devel/aspell-pt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aspell-pt.spec	7 Feb 2006 10:58:46 -0000	1.14
+++ aspell-pt.spec	11 Feb 2006 01:56:39 -0000	1.15
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 10.2
+Release: 10.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -51,6 +51,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-10.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-10.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:56:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:56:54 -0500
Subject: rpms/aspell-ru/devel aspell-ru.spec,1.4,1.5
Message-ID: <200602110156.k1B1uskY021593@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-ru/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21563

Modified Files:
	aspell-ru.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-ru.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-ru/devel/aspell-ru.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aspell-ru.spec	7 Feb 2006 10:58:58 -0000	1.4
+++ aspell-ru.spec	11 Feb 2006 01:56:52 -0000	1.5
@@ -4,7 +4,7 @@
 Epoch: 50
 Name: aspell-%{lang}
 Version: 0.99f7
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.99f7-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.99f7-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:57:08 -0500
Subject: rpms/aspell-sl/devel aspell-sl.spec,1.2,1.3
Message-ID: <200602110157.k1B1v8j6021740@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21714

Modified Files:
	aspell-sl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sl/devel/aspell-sl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aspell-sl.spec	7 Feb 2006 10:59:09 -0000	1.2
+++ aspell-sl.spec	11 Feb 2006 01:57:06 -0000	1.3
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.50
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.50-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:57:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:57:26 -0500
Subject: rpms/aspell-sr/devel aspell-sl.spec,1.3,1.4
Message-ID: <200602110157.k1B1vQ40021915@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21883

Modified Files:
	aspell-sl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-sl.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sr/devel/aspell-sl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aspell-sl.spec	7 Feb 2006 10:59:20 -0000	1.3
+++ aspell-sl.spec	11 Feb 2006 01:57:23 -0000	1.4
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.02
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.02-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.02-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:57:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:57:42 -0500
Subject: rpms/aspell-sv/devel aspell-sv.spec,1.16,1.17
Message-ID: <200602110157.k1B1vgj9022077@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/aspell-sv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22049

Modified Files:
	aspell-sv.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: aspell-sv.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell-sv/devel/aspell-sv.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- aspell-sv.spec	7 Feb 2006 10:59:34 -0000	1.16
+++ aspell-sv.spec	11 Feb 2006 01:57:40 -0000	1.17
@@ -4,7 +4,7 @@
 Name: aspell-%{lang}
 Epoch: 50
 Version: 0.51
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Text
 URL: http://aspell.net/
@@ -44,6 +44,9 @@
 #%{_datadir}/aspell/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 50:0.51-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:58:01 -0500
Subject: rpms/at/devel at.spec,1.36,1.37
Message-ID: <200602110158.k1B1w1vS022261@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/at/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22230

Modified Files:
	at.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: at.spec
===================================================================
RCS file: /cvs/dist/rpms/at/devel/at.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- at.spec	8 Feb 2006 00:57:29 -0000	1.36
+++ at.spec	11 Feb 2006 01:57:59 -0000	1.37
@@ -4,7 +4,7 @@
 Summary: Job spooling tools.
 Name: at
 Version: 3.1.8
-Release: 81
+Release: 81.1
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz
@@ -191,6 +191,9 @@
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.8-81.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.1.8-81
 - rebuild for new gcc, glibc, glibc-kernheaders
 - workaround new refusal of /usr/bin/install to chown



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:58:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:58:13 -0500
Subject: rpms/atk/devel atk.spec,1.28,1.29
Message-ID: <200602110158.k1B1wDkO022387@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	atk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: atk.spec
===================================================================
RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- atk.spec	7 Feb 2006 10:59:45 -0000	1.28
+++ atk.spec	11 Feb 2006 01:58:11 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: Interfaces for accessibility support.
 Name: atk
 Version: 1.11.2
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: System Environment/Libraries
 Source: atk-%{version}.tar.bz2 
@@ -68,6 +68,9 @@
 %{_datadir}/gtk-doc/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:58:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:58:30 -0500
Subject: rpms/at-spi/devel at-spi.spec,1.27,1.28
Message-ID: <200602110158.k1B1wUZo022525@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22496

Modified Files:
	at-spi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- at-spi.spec	7 Feb 2006 10:59:57 -0000	1.27
+++ at-spi.spec	11 Feb 2006 01:58:27 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.7.4
-Release: 1.1
+Release: 1.2
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_includedir}/* 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:58:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:58:47 -0500
Subject: rpms/attr/devel attr.spec,1.19,1.20
Message-ID: <200602110158.k1B1wlxk022662@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/attr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22632

Modified Files:
	attr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: attr.spec
===================================================================
RCS file: /cvs/dist/rpms/attr/devel/attr.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- attr.spec	7 Feb 2006 11:00:57 -0000	1.19
+++ attr.spec	11 Feb 2006 01:58:45 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Utilities for managing filesystem extended attributes.
 Name: attr
 Version: 2.4.28
-Release: 1.1
+Release: 1.2
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 2.0.0
 BuildRoot: %{_tmppath}/%{name}-root
@@ -114,6 +114,9 @@
 /%{_lib}/libattr.so.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.28-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.28-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:59:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:59:24 -0500
Subject: rpms/audiofile/devel audiofile.spec,1.17,1.18
Message-ID: <200602110159.k1B1xOuW022796@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audiofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22766

Modified Files:
	audiofile.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: audiofile.spec
===================================================================
RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- audiofile.spec	7 Feb 2006 11:02:06 -0000	1.17
+++ audiofile.spec	11 Feb 2006 01:59:17 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
 Version: 0.2.6
-Release: 2.2
+Release: 2.2.1
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.6-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.6-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 01:59:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 20:59:36 -0500
Subject: rpms/audit/devel audit.spec,1.82,1.83
Message-ID: <200602110159.k1B1xa6Q022918@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22886

Modified Files:
	audit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- audit.spec	10 Feb 2006 22:42:34 -0000	1.82
+++ audit.spec	11 Feb 2006 01:59:34 -0000	1.83
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 5
+Release: 5.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.4-5.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-5
 - Change audit_log_semanage_message to check strlen as well as NULL.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:00:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:00:01 -0500
Subject: rpms/authconfig/devel authconfig.spec,1.53,1.54
Message-ID: <200602110200.k1B201JV023046@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23017

Modified Files:
	authconfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- authconfig.spec	7 Feb 2006 11:03:20 -0000	1.53
+++ authconfig.spec	11 Feb 2006 01:59:57 -0000	1.54
@@ -3,7 +3,7 @@
 Version: 5.2.0
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1.1
+Release: 1.2
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -94,6 +94,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.2.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.2.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:00:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:00:41 -0500
Subject: rpms/authd/devel authd.spec,1.35,1.36
Message-ID: <200602110200.k1B20fWm023236@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/authd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23198

Modified Files:
	authd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: authd.spec
===================================================================
RCS file: /cvs/dist/rpms/authd/devel/authd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- authd.spec	7 Feb 2006 13:18:21 -0000	1.35
+++ authd.spec	11 Feb 2006 02:00:37 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: a RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 7
+Release: 7.1
 License: GPL
 Group: System Environment/Daemons
 Obsoletes: pidentd
@@ -66,6 +66,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-7.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Martin Stransky <stransky at redhat.com> - 1.4.3-7
 - re-tag
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:01:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:01:36 -0500
Subject: rpms/autofs/devel autofs.spec,1.75,1.76
Message-ID: <200602110201.k1B21aX6023401@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	autofs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- autofs.spec	7 Feb 2006 11:04:43 -0000	1.75
+++ autofs.spec	11 Feb 2006 02:01:31 -0000	1.76
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 16.2.1
+%define release 16.2.2
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -152,6 +152,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.1.4-16.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:03:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:03:22 -0500
Subject: rpms/autorun/devel autorun.spec,1.25,1.26
Message-ID: <200602110203.k1B23Mmo023616@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/autorun/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23566

Modified Files:
	autorun.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: autorun.spec
===================================================================
RCS file: /cvs/dist/rpms/autorun/devel/autorun.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- autorun.spec	7 Feb 2006 11:05:29 -0000	1.25
+++ autorun.spec	11 Feb 2006 02:03:19 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: A CD-ROM mounting utility.
 Name: autorun
 Version: 3.18
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source: %name-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.18-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.18-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:04:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:04:10 -0500
Subject: rpms/avahi/devel avahi.spec,1.38,1.39
Message-ID: <200602110204.k1B24AWc023733@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23708

Modified Files:
	avahi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- avahi.spec	10 Feb 2006 20:50:41 -0000	1.38
+++ avahi.spec	11 Feb 2006 02:03:58 -0000	1.39
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.6
-Release: 	3
+Release: 	3.1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -302,6 +302,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-3.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.6-3
 - rebuild for new gcc (again)
 - further fix for bug 178746: fix avahi-dnsconfd initscript 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:05:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:05:00 -0500
Subject: rpms/bash/devel bash.spec,1.107,1.108
Message-ID: <200602110205.k1B250PU023870@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23842

Modified Files:
	bash.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- bash.spec	7 Feb 2006 11:06:50 -0000	1.107
+++ bash.spec	11 Feb 2006 02:04:58 -0000	1.108
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 6.1
+Release: 6.2
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -214,6 +214,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:05:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:05:48 -0500
Subject: rpms/bc/devel bc.spec,1.16,1.17
Message-ID: <200602110205.k1B25maB024024@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23998

Modified Files:
	bc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bc.spec
===================================================================
RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bc.spec	7 Feb 2006 11:07:32 -0000	1.16
+++ bc.spec	11 Feb 2006 02:05:44 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: GNU's bc (a numeric processing language) and dc (a calculator).
 Name: bc
 Version: 1.06
-Release: 19.2
+Release: 19.2.1
 License: GPL
 URL: http://www.gnu.org/software/bc/
 Group: Applications/Engineering
@@ -69,6 +69,9 @@
 %{_infodir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.06-19.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.06-19.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:06:21 -0500
Subject: rpms/beecrypt/devel beecrypt.spec,1.24,1.25
Message-ID: <200602110206.k1B26L2m024164@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/beecrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24139

Modified Files:
	beecrypt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: beecrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- beecrypt.spec	7 Feb 2006 11:08:22 -0000	1.24
+++ beecrypt.spec	11 Feb 2006 02:06:17 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 9.2
+Release: 9.2.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://sourceforge.net/projects/beecrypt
@@ -118,6 +118,9 @@
 %endif
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.2-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:06:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:06:52 -0500
Subject: rpms/bg5ps/devel bg5ps.spec,1.17,1.18
Message-ID: <200602110206.k1B26qIw024299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bg5ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24286

Modified Files:
	bg5ps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bg5ps.spec
===================================================================
RCS file: /cvs/dist/rpms/bg5ps/devel/bg5ps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bg5ps.spec	7 Feb 2006 11:08:43 -0000	1.17
+++ bg5ps.spec	11 Feb 2006 02:06:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name: bg5ps
 Version: 1.3.0
-Release: 22.2
+Release: 22.2.1
 License: GPL
 Summary: Converts Big5 encoded Chinese into printable postscript.
 Group: Applications/Publishing
@@ -49,6 +49,9 @@
 %config %{_sysconfdir}/*.conf*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-22.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-22.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:07:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:07:05 -0500
Subject: rpms/bind/devel bind.spec,1.90,1.91
Message-ID: <200602110207.k1B2753M024403@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24375

Modified Files:
	bind.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bind.spec
===================================================================
RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- bind.spec	7 Feb 2006 22:13:28 -0000	1.90
+++ bind.spec	11 Feb 2006 02:07:03 -0000	1.91
@@ -9,7 +9,7 @@
 Name: bind
 License: BSD-like
 Version: 9.3.2
-Release: 4
+Release: 4.1
 Epoch:   30
 Url: http://www.isc.org/products/BIND/
 Buildroot: %{_tmppath}/%{name}-root
@@ -753,6 +753,9 @@
 :;
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 30:9.3.2-4.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 30:9.3.2-4
 - regenerate redhat_doc patch for non-DBUS builds
 - allow dbus builds to work with dbus version < 0.6 (bz #179816)



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:07:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:07:57 -0500
Subject: rpms/binutils/devel binutils.spec,1.72,1.73
Message-ID: <200602110207.k1B27vnc024588@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	binutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- binutils.spec	7 Feb 2006 11:09:00 -0000	1.72
+++ binutils.spec	11 Feb 2006 02:07:51 -0000	1.73
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.16.91.0.5
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -159,6 +159,9 @@
 %{_infodir}/*info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16.91.0.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16.91.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:08:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:08:46 -0500
Subject: rpms/bison/devel bison.spec,1.22,1.23
Message-ID: <200602110208.k1B28kai024750@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bison/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24730

Modified Files:
	bison.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bison.spec
===================================================================
RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bison.spec	7 Feb 2006 11:09:29 -0000	1.22
+++ bison.spec	11 Feb 2006 02:08:38 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
 Version: 2.1
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -98,6 +98,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:09:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:09:26 -0500
Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.14,1.15
Message-ID: <200602110209.k1B29QCY024878@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24859

Modified Files:
	bluez-hcidump.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bluez-hcidump.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bluez-hcidump.spec	7 Feb 2006 11:09:44 -0000	1.14
+++ bluez-hcidump.spec	11 Feb 2006 02:09:12 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
 Version: 1.27
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -40,6 +40,9 @@
 %{_mandir}/man8/hcidump.8.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.27-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.27-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:09:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:09:48 -0500
Subject: rpms/bluez-libs/devel bluez-libs.spec,1.22,1.23
Message-ID: <200602110209.k1B29mDN025017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24987

Modified Files:
	bluez-libs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bluez-libs.spec	7 Feb 2006 11:09:57 -0000	1.22
+++ bluez-libs.spec	11 Feb 2006 02:09:45 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
 Version: 2.22
-Release: 1.2
+Release: 1.2.1
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.22-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.22-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:10:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:10:10 -0500
Subject: rpms/bluez-pin/devel bluez-pin.spec,1.11,1.12
Message-ID: <200602110210.k1B2AAux025133@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25100

Modified Files:
	bluez-pin.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bluez-pin.spec	7 Feb 2006 11:10:19 -0000	1.11
+++ bluez-pin.spec	11 Feb 2006 02:10:05 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: D-BUS Bluetooth PIN helper
 Name: bluez-pin
 Version: 0.24
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 %{_prefix}/share/bluez-pin/bluez-pin.glade
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.24-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.24-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:10:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:10:33 -0500
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.32,1.33
Message-ID: <200602110210.k1B2AXkw025284@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bluez-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bluez-utils.spec	7 Feb 2006 11:10:28 -0000	1.32
+++ bluez-utils.spec	11 Feb 2006 02:10:31 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
 Version: 2.22
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -108,6 +108,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.22-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.22-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:10:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:10:51 -0500
Subject: rpms/bogl/devel bogl.spec,1.19,1.20
Message-ID: <200602110210.k1B2ApQl025395@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bogl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25362

Modified Files:
	bogl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bogl.spec
===================================================================
RCS file: /cvs/dist/rpms/bogl/devel/bogl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bogl.spec	7 Feb 2006 11:10:41 -0000	1.19
+++ bogl.spec	11 Feb 2006 02:10:49 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A terminal program for displaying Unicode on the console.
 Name: bogl
 Version: 0.1.18
-Release: 11.2
+Release: 11.2.1
 # URL: used to be http://www.stanford.edu/~blp/projects.html, now none
 Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.2.tar.gz
 Source1: wlite-0.8.1.tar.gz
@@ -98,6 +98,9 @@
 /usr/lib/bogl
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:11:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:11:13 -0500
Subject: rpms/boost/devel boost.spec,1.23,1.24
Message-ID: <200602110211.k1B2BDfa025521@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/boost/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25492

Modified Files:
	boost.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: boost.spec
===================================================================
RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- boost.spec	7 Feb 2006 11:10:53 -0000	1.23
+++ boost.spec	11 Feb 2006 02:11:10 -0000	1.24
@@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.33.1
-Release: 4.1
+Release: 4.2
 License: Boost Software License
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@@ -159,6 +159,9 @@
 %{_docdir}/boost-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.33.1-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.33.1-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:11:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:11:56 -0500
Subject: rpms/bootparamd/devel bootparamd.spec,1.18,1.19
Message-ID: <200602110211.k1B2BukQ025744@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bootparamd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25707

Modified Files:
	bootparamd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bootparamd.spec
===================================================================
RCS file: /cvs/dist/rpms/bootparamd/devel/bootparamd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bootparamd.spec	7 Feb 2006 11:11:13 -0000	1.18
+++ bootparamd.spec	11 Feb 2006 02:11:53 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: A server process which provides boot information to diskless clients.
 Name: bootparamd
 Version: 0.17
-Release: 24.devel.1
+Release: 24.devel.2
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-bootparamd-%{version}%{_snapshot}.tar.gz
@@ -90,6 +90,9 @@
 %config /etc/rc.d/init.d/bootparamd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-24.devel.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-24.devel.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:12:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:12:06 -0500
Subject: rpms/booty/devel booty.spec,1.41,1.42
Message-ID: <200602110212.k1B2C6DZ025874@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25842

Modified Files:
	booty.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- booty.spec	7 Feb 2006 14:56:09 -0000	1.41
+++ booty.spec	11 Feb 2006 02:12:03 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: simple python bootloader config lib
 Name: booty
 Version: 0.67
-Release: 1
+Release: 1.1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
@@ -34,6 +34,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.67-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 0.67-1
 - Fix syntax error.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:12:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:12:17 -0500
Subject: rpms/bridge-utils/devel bridge-utils.spec,1.16,1.17
Message-ID: <200602110212.k1B2CHC2025997@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	bridge-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bridge-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bridge-utils/devel/bridge-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bridge-utils.spec	7 Feb 2006 11:11:28 -0000	1.16
+++ bridge-utils.spec	11 Feb 2006 02:12:14 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring the linux ethernet bridge
 Name: bridge-utils
 Version: 1.0.6
-Release: 1.1
+Release: 1.2
 License: GPL
 URL: http://bridge.sourceforge.net/
 Group: System Environment/Base
@@ -63,6 +63,9 @@
 %{_libdir}/libbridge.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:12:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:12:28 -0500
Subject: rpms/brltty/devel brltty.spec,1.11,1.12
Message-ID: <200602110212.k1B2CSwC026137@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/brltty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26105

Modified Files:
	brltty.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: brltty.spec
===================================================================
RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- brltty.spec	7 Feb 2006 11:11:40 -0000	1.11
+++ brltty.spec	11 Feb 2006 02:12:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name: brltty
 Version: 3.2
-Release: 10.2
+Release: 10.2.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -78,6 +78,9 @@
 /etc/brltty
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-10.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-10.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:12:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:12:40 -0500
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.45,1.46
Message-ID: <200602110212.k1B2CeSD026272@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26242

Modified Files:
	bug-buddy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- bug-buddy.spec	7 Feb 2006 11:11:51 -0000	1.45
+++ bug-buddy.spec	11 Feb 2006 02:12:37 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.13.0
-Release: 1.1
+Release: 1.2
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -107,6 +107,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:12:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:12:51 -0500
Subject: rpms/busybox/devel busybox.spec,1.30,1.31
Message-ID: <200602110212.k1B2CpZg026399@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26369

Modified Files:
	busybox.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- busybox.spec	7 Feb 2006 11:12:01 -0000	1.30
+++ busybox.spec	11 Feb 2006 02:12:48 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.01
-Release: 2.2
+Release: 2.2.1
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -74,6 +74,9 @@
 /sbin/busybox.anaconda
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.01-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:13:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:13:02 -0500
Subject: rpms/byacc/devel byacc-1.9.spec,1.12,1.13
Message-ID: <200602110213.k1B2D2ai026527@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/byacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26498

Modified Files:
	byacc-1.9.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: byacc-1.9.spec
===================================================================
RCS file: /cvs/dist/rpms/byacc/devel/byacc-1.9.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- byacc-1.9.spec	7 Feb 2006 11:12:12 -0000	1.12
+++ byacc-1.9.spec	11 Feb 2006 02:12:59 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A public domain Yacc parser generator.
 Name: byacc
 Version: 1.9
-Release: 29.2
+Release: 29.2.1
 License: public domain
 Group: Development/Tools
 # The source is taken from FreeBSD's CVS as of Thu Sep 28 2000
@@ -46,6 +46,9 @@
 %{_mandir}/man1/byacc.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9-29.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9-29.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:13:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:13:13 -0500
Subject: rpms/bzip2/devel bzip2.spec,1.17,1.18
Message-ID: <200602110213.k1B2DD7n026660@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/bzip2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26628

Modified Files:
	bzip2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: bzip2.spec
===================================================================
RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bzip2.spec	7 Feb 2006 11:12:23 -0000	1.17
+++ bzip2.spec	11 Feb 2006 02:13:09 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A file compression utility.
 Name: bzip2
 Version: 1.0.3
-Release: 2.2
+Release: 2.2.1
 License: BSD
 Group: Applications/File
 URL: http://sources.redhat.com/bzip2/
@@ -109,6 +109,9 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:13:31 -0500
Subject: rpms/cadaver/devel cadaver.spec,1.21,1.22
Message-ID: <200602110213.k1B2DVNE026854@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cadaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26824

Modified Files:
	cadaver.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cadaver.spec
===================================================================
RCS file: /cvs/dist/rpms/cadaver/devel/cadaver.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cadaver.spec	7 Feb 2006 11:12:35 -0000	1.21
+++ cadaver.spec	11 Feb 2006 02:13:29 -0000	1.22
@@ -1,6 +1,6 @@
 Name: cadaver
 Version: 0.22.3
-Release: 2.1
+Release: 2.2
 Summary: Command-line WebDAV client
 License: GPL
 Group: Applications/Internet
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.22.3-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.22.3-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:13:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:13:41 -0500
Subject: rpms/cairo/devel cairo.spec,1.31,1.32
Message-ID: <200602110213.k1B2DfQ0026974@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26946

Modified Files:
	cairo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cairo.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cairo.spec	7 Feb 2006 11:12:46 -0000	1.31
+++ cairo.spec	11 Feb 2006 02:13:39 -0000	1.32
@@ -4,7 +4,7 @@
 Summary:   A vector graphics library
 Name:      cairo
 Version:   1.0.2
-Release:   4.1
+Release:   4.2
 URL:       http://cairographics.org
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL/MPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:13:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:13:54 -0500
Subject: rpms/cairo-java/devel cairo-java.spec,1.22,1.23
Message-ID: <200602110213.k1B2Dsr3027126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cairo-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27098

Modified Files:
	cairo-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cairo-java.spec	7 Feb 2006 11:12:56 -0000	1.22
+++ cairo-java.spec	11 Feb 2006 02:13:52 -0000	1.23
@@ -12,7 +12,7 @@
 
 %define	name_base	cairo-java
 %define	version		1.0.2
-%define release 	0.1
+%define release 	0.2
 # exclude while s390x is borked on beehive
 #ExcludeArch: s390x
 
@@ -113,6 +113,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-0.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-0.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:14:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:14:10 -0500
Subject: rpms/ccs/devel ccs.spec,1.32,1.33
Message-ID: <200602110214.k1B2EASO027304@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ccs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27267

Modified Files:
	ccs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ccs.spec
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ccs.spec	7 Feb 2006 11:13:07 -0000	1.32
+++ ccs.spec	11 Feb 2006 02:14:08 -0000	1.33
@@ -12,7 +12,7 @@
 
 Name: ccs
 Version: 1.0.2
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Base
 Summary: CCS - The Cluster Configuration System
@@ -85,6 +85,9 @@
 %{_includedir}/ccs.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:14:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:14:20 -0500
Subject: rpms/cdparanoia/devel cdparanoia.spec,1.25,1.26
Message-ID: <200602110214.k1B2EK7Z027421@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdparanoia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27392

Modified Files:
	cdparanoia.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/dist/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cdparanoia.spec	8 Feb 2006 20:06:47 -0000	1.25
+++ cdparanoia.spec	11 Feb 2006 02:14:18 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name: cdparanoia
 Version: %{realver}
-Release: 27
+Release: 27.1
 License: GPL
 Group: Applications/Multimedia
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{realver}.src.tgz 
@@ -123,6 +123,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - alpha9.8-27.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb 08 2006 Monty Montgomery <cmontgom at redhat.com> - alpha9.8-27
 - rebuilt 
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:14:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:14:31 -0500
Subject: rpms/cdrdao/devel cdrdao.spec,1.31,1.32
Message-ID: <200602110214.k1B2EVTx027542@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cdrdao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27515

Modified Files:
	cdrdao.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cdrdao.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cdrdao.spec	7 Feb 2006 11:13:28 -0000	1.31
+++ cdrdao.spec	11 Feb 2006 02:14:28 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
 Name: cdrdao
 Version: 1.2.0
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Applications/Multimedia
 URL: http://cdrdao.sourceforge.net/
@@ -54,6 +54,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:14:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:14:42 -0500
Subject: rpms/cdrtools/devel cdrtools.spec,1.40,1.41
Message-ID: <200602110214.k1B2Eg6g027679@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cdrtools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cdrtools.spec	7 Feb 2006 11:13:37 -0000	1.40
+++ cdrtools.spec	11 Feb 2006 02:14:40 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a03
-Release: 2.1
+Release: 2.2
 %define tarversion 2.01.01a03
 License: GPL
 Group: Applications/System
@@ -229,6 +229,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a03-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8:2.01.01.0.a03-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:14:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:14:53 -0500
Subject: rpms/check/devel check.spec,1.3,1.4
Message-ID: <200602110214.k1B2ErwM027805@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/check/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27773

Modified Files:
	check.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: check.spec
===================================================================
RCS file: /cvs/dist/rpms/check/devel/check.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- check.spec	7 Feb 2006 11:13:53 -0000	1.3
+++ check.spec	11 Feb 2006 02:14:51 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		check
 Version:	0.9.3
-Release:	4.fc5.1
+Release:	4.fc5.2
 Summary:	A unit test framework for C
 Source0:	http://download.sourceforge.net/check/%{name}-%{version}.tar.gz
 Group:		Development/Tools
@@ -54,6 +54,9 @@
 %{_datadir}/aclocal/check.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3-4.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3-4.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:15:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:15:04 -0500
Subject: rpms/checkpolicy/devel checkpolicy.spec,1.89,1.90
Message-ID: <200602110215.k1B2F4N7027940@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27909

Modified Files:
	checkpolicy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- checkpolicy.spec	7 Feb 2006 15:33:17 -0000	1.89
+++ checkpolicy.spec	11 Feb 2006 02:15:00 -0000	1.90
@@ -2,7 +2,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 1.29.1
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,9 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.1-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.1-1
 - Latest upgrade from NSA
 	* Merged sepol_av_to_string patch from Joshua Brindle.



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:15:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:15:21 -0500
Subject: rpms/chkconfig/devel chkconfig.spec,1.34,1.35
Message-ID: <200602110215.k1B2FLqD028078@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28053

Modified Files:
	chkconfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- chkconfig.spec	7 Feb 2006 11:14:16 -0000	1.34
+++ chkconfig.spec	11 Feb 2006 02:15:19 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
 Version: 1.3.26
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.26-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.26-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:15:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:15:45 -0500
Subject: rpms/chkfontpath/devel chkfontpath.spec,1.13,1.14
Message-ID: <200602110215.k1B2FjAd028714@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/chkfontpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28504

Modified Files:
	chkfontpath.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: chkfontpath.spec
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/chkfontpath.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chkfontpath.spec	7 Feb 2006 11:14:27 -0000	1.13
+++ chkfontpath.spec	11 Feb 2006 02:15:42 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Simple interface for editing the font path for the X font server.
 Name: chkfontpath
 Version: 1.10.0
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -41,6 +41,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:16:02 -0500
Subject: rpms/ckermit/devel ckermit.spec,1.18,1.19
Message-ID: <200602110216.k1B2G23E029867@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ckermit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29551

Modified Files:
	ckermit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ckermit.spec
===================================================================
RCS file: /cvs/dist/rpms/ckermit/devel/ckermit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ckermit.spec	7 Feb 2006 11:14:40 -0000	1.18
+++ ckermit.spec	11 Feb 2006 02:15:59 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: The quintessential all-purpose communications program
 Name: ckermit
 Version: 8.0.211
-Release: 4.2
+Release: 4.2.1
 License: Special (see COPYING.TXT.gz)
 Group: Applications/Communications
 Source0: ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
@@ -82,6 +82,9 @@
 %{_mandir}/man1/kermit.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.0.211-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.0.211-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:16:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:16:30 -0500
Subject: rpms/compat-db/devel compat-db.spec,1.16,1.17
Message-ID: <200602110216.k1B2GUgC031339@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	compat-db.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- compat-db.spec	7 Feb 2006 11:15:20 -0000	1.16
+++ compat-db.spec	11 Feb 2006 02:16:28 -0000	1.17
@@ -16,7 +16,7 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
 Name: compat-db
 Version: 4.2.52
-Release: 3.2
+Release: 3.2.1
 # Tarball taken from glibc 2.1.3  
 #Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz  
 Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
@@ -168,6 +168,9 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:17:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:17:00 -0500
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.10,1.11
Message-ID: <200602110217.k1B2H0Os000627@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv473

Modified Files:
	compat-gcc-296.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- compat-gcc-296.spec	7 Feb 2006 11:15:39 -0000	1.10
+++ compat-gcc-296.spec	11 Feb 2006 02:16:58 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
-Release: %{gcc_release}.1
+Release: %{gcc_release}.2
 License: GPL
 Group: Development/Languages
 ExclusiveArch: %{ix86} ia64 ppc
@@ -1088,6 +1088,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.96-134.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.96-134.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:18:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:18:12 -0500
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.18,1.19
Message-ID: <200602110218.k1B2ICp3003759@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3662

Modified Files:
	compat-gcc-32.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compat-gcc-32.spec	7 Feb 2006 11:16:07 -0000	1.18
+++ compat-gcc-32.spec	11 Feb 2006 02:18:08 -0000	1.19
@@ -21,7 +21,7 @@
 Summary: The compatibility GNU Compiler Collection
 Name: compat-gcc-32
 Version: %{gcc_version}
-Release: %{gcc_release}.1
+Release: %{gcc_release}.2
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
@@ -634,6 +634,9 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-54.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-54.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:18:53 -0500
Subject: rpms/compat-slang/devel compat-slang.spec,1.12,1.13
Message-ID: <200602110218.k1B2IrUZ006123@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/compat-slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5985

Modified Files:
	compat-slang.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: compat-slang.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-slang/devel/compat-slang.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- compat-slang.spec	7 Feb 2006 11:16:40 -0000	1.12
+++ compat-slang.spec	11 Feb 2006 02:18:50 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: compat-slang
 Version: 1.4.9
-Release: 27.2
+Release: 27.2.1
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://space.mit.edu/pub/davis/slang/v1.4/slang-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 %{_libdir}/libslang*.so.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.9-27.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.9-27.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:19:09 -0500
Subject: rpms/control-center/devel control-center.spec,1.125,1.126
Message-ID: <200602110219.k1B2J9r5007444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7280

Modified Files:
	control-center.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- control-center.spec	9 Feb 2006 04:57:41 -0000	1.125
+++ control-center.spec	11 Feb 2006 02:19:06 -0000	1.126
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.91
-Release: 1
+Release: 1.1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -228,6 +228,9 @@
 # (also its headers)
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-1.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 - Reenable Spanish help



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:19:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:19:23 -0500
Subject: rpms/coreutils/devel coreutils.spec,1.107,1.108
Message-ID: <200602110219.k1B2JNQI008415@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	coreutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- coreutils.spec	7 Feb 2006 11:17:15 -0000	1.107
+++ coreutils.spec	11 Feb 2006 02:19:21 -0000	1.108
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.93
-Release: 7.1
+Release: 7.2
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
 /sbin/runuser
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.93-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.93-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:19:41 -0500
Subject: rpms/cpio/devel cpio.spec,1.33,1.34
Message-ID: <200602110219.k1B2JfV2009692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9673

Modified Files:
	cpio.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cpio.spec	7 Feb 2006 11:17:33 -0000	1.33
+++ cpio.spec	11 Feb 2006 02:19:38 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 11.2
+Release: 11.2.1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -105,6 +105,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:19:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:19:56 -0500
Subject: rpms/cracklib/devel cracklib.spec,1.26,1.27
Message-ID: <200602110219.k1B2JuV8009825@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cracklib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9792

Modified Files:
	cracklib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cracklib.spec
===================================================================
RCS file: /cvs/dist/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cracklib.spec	7 Feb 2006 11:17:53 -0000	1.26
+++ cracklib.spec	11 Feb 2006 02:19:54 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: A password-checking library.
 Name: cracklib
 Version: 2.8.6
-Release: 1.2
+Release: 1.2.1
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/cracklib/cracklib-words.gz
@@ -145,6 +145,9 @@
 %{_sbindir}/packer
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:20:15 -0500
Subject: rpms/crypto-utils/devel crypto-utils.spec,1.23,1.24
Message-ID: <200602110220.k1B2KFRk009979@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	crypto-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: crypto-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/crypto-utils/devel/crypto-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- crypto-utils.spec	7 Feb 2006 11:18:30 -0000	1.23
+++ crypto-utils.spec	11 Feb 2006 02:20:13 -0000	1.24
@@ -4,7 +4,7 @@
 Summary: SSL certificate and key management utilities
 Name: crypto-utils
 Version: 2.2
-Release: 9.2
+Release: 9.2.1
 Source: crypto-rand-%{crver}.tar.gz
 Source1: genkey.pl
 Source2: certwatch.c
@@ -101,6 +101,9 @@
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:20:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:20:30 -0500
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.16,1.17
Message-ID: <200602110220.k1B2KUQU010105@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10075

Modified Files:
	cryptsetup-luks.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cryptsetup-luks.spec	7 Feb 2006 11:18:44 -0000	1.16
+++ cryptsetup-luks.spec	11 Feb 2006 02:20:27 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.1
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
@@ -66,6 +66,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:20:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:20:47 -0500
Subject: rpms/cscope/devel cscope.spec,1.20,1.21
Message-ID: <200602110220.k1B2Kl1j010235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cscope/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10209

Modified Files:
	cscope.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cscope.spec
===================================================================
RCS file: /cvs/dist/rpms/cscope/devel/cscope.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cscope.spec	7 Feb 2006 11:18:55 -0000	1.20
+++ cscope.spec	11 Feb 2006 02:20:45 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: C source code tree search and browse tool 
 Name: cscope
 Version: 15.5
-Release: 13.1 
+Release: 13.2 
 Source0: http://unc.dl.sourceforge.net/sourceforge/cscope/cscope-15.5.tar.gz 
 URL: http://cscope.sourceforge.net
 License: BSD 
@@ -85,6 +85,9 @@
 rm -f %{emacs_lisp_path}/xcscope.el
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 15.5-13.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 15.5-13.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:21:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:21:06 -0500
Subject: rpms/ctags/devel ctags.spec,1.17,1.18
Message-ID: <200602110221.k1B2L6OL010372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ctags/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10340

Modified Files:
	ctags.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ctags.spec
===================================================================
RCS file: /cvs/dist/rpms/ctags/devel/ctags.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ctags.spec	7 Feb 2006 11:19:06 -0000	1.17
+++ ctags.spec	11 Feb 2006 02:21:02 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A C programming language indexing and/or cross-reference tool.
 Name: ctags
 Version: 5.5.4
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/ctags/ctags-%{version}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man1/ctags*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.5.4-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:21:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:21:25 -0500
Subject: rpms/cups/devel cups.spec,1.132,1.133
Message-ID: <200602110221.k1B2LP86010519@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cups.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- cups.spec	7 Feb 2006 11:19:19 -0000	1.132
+++ cups.spec	11 Feb 2006 02:21:22 -0000	1.133
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.1.23
-Release: 30.1
+Release: 30.2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2
@@ -433,6 +433,9 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:21:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:21:44 -0500
Subject: rpms/curl/devel curl.spec,1.32,1.33
Message-ID: <200602110221.k1B2LiX8010673@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10647

Modified Files:
	curl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- curl.spec	7 Feb 2006 11:19:36 -0000	1.32
+++ curl.spec	11 Feb 2006 02:21:41 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Name: curl 
 Version: 7.15.1
-Release: 1.2
+Release: 1.2.1
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -91,6 +91,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.15.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.15.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:22:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:22:02 -0500
Subject: rpms/cvs/devel cvs.spec,1.41,1.42
Message-ID: <200602110222.k1B2M2c5010803@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	cvs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cvs.spec
===================================================================
RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cvs.spec	7 Feb 2006 11:19:50 -0000	1.41
+++ cvs.spec	11 Feb 2006 02:21:59 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: A version control system.
 Name: cvs
 Version: 1.11.21
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Development/Tools
 Source0: https://ccvs.cvshome.org/files/documents/19/192/cvs-%{version}.tar.bz2
@@ -139,6 +139,9 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.21-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.21-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:22:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:22:23 -0500
Subject: rpms/cyrus-sasl/devel cyrus-sasl.spec,1.47,1.48
Message-ID: <200602110222.k1B2MNCI010933@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/cyrus-sasl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10906

Modified Files:
	cyrus-sasl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/dist/rpms/cyrus-sasl/devel/cyrus-sasl.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- cyrus-sasl.spec	7 Feb 2006 11:20:01 -0000	1.47
+++ cyrus-sasl.spec	11 Feb 2006 02:22:20 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.21
-Release: 9.1
+Release: 9.2
 License: Freely Distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -409,6 +409,9 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.21-9.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.21-9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:22:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:22:47 -0500
Subject: rpms/dasher/devel dasher.spec,1.28,1.29
Message-ID: <200602110222.k1B2MlfX011081@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11052

Modified Files:
	dasher.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- dasher.spec	7 Feb 2006 11:20:18 -0000	1.28
+++ dasher.spec	11 Feb 2006 02:22:43 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 3.99.2
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -80,6 +80,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.99.2-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.99.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:23:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:23:12 -0500
Subject: rpms/db4/devel db4.spec,1.29,1.30
Message-ID: <200602110223.k1B2NCU2011223@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11198

Modified Files:
	db4.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- db4.spec	7 Feb 2006 11:20:32 -0000	1.29
+++ db4.spec	11 Feb 2006 02:23:09 -0000	1.30
@@ -11,7 +11,7 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 1.2
+Release: 1.2.1
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
@@ -356,6 +356,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:23:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:23:45 -0500
Subject: rpms/dbus/devel dbus.spec,1.69,1.70
Message-ID: <200602110223.k1B2NjnG011457@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11425

Modified Files:
	dbus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dbus.spec	7 Feb 2006 11:20:51 -0000	1.69
+++ dbus.spec	11 Feb 2006 02:23:43 -0000	1.70
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.60
-Release: 7.1 
+Release: 7.2 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -336,6 +336,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.60-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.60-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:24:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:24:14 -0500
Subject: rpms/dcraw/devel dcraw.spec,1.6,1.7
Message-ID: <200602110224.k1B2OEGa011699@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dcraw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11667

Modified Files:
	dcraw.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dcraw.spec
===================================================================
RCS file: /cvs/dist/rpms/dcraw/devel/dcraw.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dcraw.spec	7 Feb 2006 11:21:07 -0000	1.6
+++ dcraw.spec	11 Feb 2006 02:24:12 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: A tool for decoding raw image data from digital cameras.
 Name: dcraw
 Version: 0.0.%dcrawdate
-Release: 1.1
+Release: 1.2
 Group: Applications/Multimedia
 License: freely distributable
 #The next file is actually http://www.cybercom.net/~dcoffin/dcraw/dcraw.c
@@ -41,6 +41,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.0.20051211-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.20051211-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:24:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:24:29 -0500
Subject: rpms/ddd/devel ddd.spec,1.24,1.25
Message-ID: <200602110224.k1B2OTvJ011855@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ddd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11828

Modified Files:
	ddd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ddd.spec
===================================================================
RCS file: /cvs/dist/rpms/ddd/devel/ddd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ddd.spec	7 Feb 2006 11:21:19 -0000	1.24
+++ ddd.spec	11 Feb 2006 02:24:27 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: GUI for several command-line debuggers
 Name: ddd
 Version: 3.3.11
-Release: 5.1
+Release: 5.2
 License: GPL or BSD
 Group: Development/Debuggers
 URL: http://www.gnu.org/software/ddd/
@@ -85,6 +85,9 @@
 %{_mandir}/man1/ddd.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.3.11-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3.11-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:24:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:24:43 -0500
Subject: rpms/desktop-file-utils/devel desktop-file-utils.spec,1.26,1.27
Message-ID: <200602110224.k1B2OhWI012014@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-file-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11982

Modified Files:
	desktop-file-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- desktop-file-utils.spec	10 Feb 2006 21:03:00 -0000	1.26
+++ desktop-file-utils.spec	11 Feb 2006 02:24:41 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.10
-Release: 6
+Release: 6.1
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: %{name}-%{version}.tar.gz
 Patch0: desktop-file-utils-0.9-nogroup.patch
@@ -57,6 +57,9 @@
 %{_datadir}/emacs/site-lisp/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-6.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 0.10-6
 - call update-desktop-database in %%preun (bug 180898)
 - don't fail if update-desktop-database fails



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:24:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:24:55 -0500
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.50,1.51
Message-ID: <200602110224.k1B2OtiG012138@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12108

Modified Files:
	desktop-printing.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- desktop-printing.spec	7 Feb 2006 11:21:57 -0000	1.50
+++ desktop-printing.spec	11 Feb 2006 02:24:53 -0000	1.51
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 5.1 
+Release: 5.2 
 License: GPL
 Group: Applications/File
 # total lie
@@ -87,6 +87,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.19-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.19-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:05 -0500
Subject: rpms/device-mapper/devel device-mapper.spec,1.27,1.28
Message-ID: <200602110225.k1B2P5kE012262@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12236

Modified Files:
	device-mapper.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- device-mapper.spec	7 Feb 2006 11:22:43 -0000	1.27
+++ device-mapper.spec	11 Feb 2006 02:25:03 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.02.02
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.02.02-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.02.02-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:16 -0500
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.20, 1.21
Message-ID: <200602110225.k1B2PGmS012399@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12365

Modified Files:
	device-mapper-multipath.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- device-mapper-multipath.spec	10 Feb 2006 00:40:15 -0000	1.20
+++ device-mapper-multipath.spec	11 Feb 2006 02:25:14 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 12.0
+Release: 12.0.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -62,6 +62,9 @@
 /var/cache/multipath
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4.5-12.0.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Benjamin Marzinski <bmarzins at redhat.com> -0.4.5-12.0
 - Updated to latest upstream source (t0_4_5_post56)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:27 -0500
Subject: rpms/dhcdbd/devel dhcdbd.spec,1.26,1.27
Message-ID: <200602110225.k1B2PRMj012535@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcdbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12502

Modified Files:
	dhcdbd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dhcdbd.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dhcdbd.spec	7 Feb 2006 11:23:05 -0000	1.26
+++ dhcdbd.spec	11 Feb 2006 02:25:24 -0000	1.27
@@ -9,7 +9,7 @@
 Summary:   DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options.
 Name: 	   dhcdbd
 Version:   1.12
-Release:   1.FC5.1
+Release:   1.FC5.2
 License:   GPL
 Group:     System Environment/Daemons
 URL: 	   http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-1.FC5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:37 -0500
Subject: rpms/dhcp/devel dhcp.spec,1.84,1.85
Message-ID: <200602110225.k1B2PbcL012656@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12625

Modified Files:
	dhcp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- dhcp.spec	7 Feb 2006 00:28:01 -0000	1.84
+++ dhcp.spec	11 Feb 2006 02:25:34 -0000	1.85
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 21.1
+Release: 21.1.1
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -325,6 +325,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 11:3.0.3-21.1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb 06 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-21.1
 - Rebuild for new gcc, glibc and glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:48 -0500
Subject: rpms/dhcpv6/devel dhcpv6.spec,1.23,1.24
Message-ID: <200602110225.k1B2PmwR012785@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12758

Modified Files:
	dhcpv6.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dhcpv6.spec	8 Feb 2006 01:08:46 -0000	1.23
+++ dhcpv6.spec	11 Feb 2006 02:25:45 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 16
+Release: 16.1
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
@@ -131,6 +131,9 @@
 %attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-16.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-16
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:25:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:25:59 -0500
Subject: rpms/dialog/devel dialog.spec,1.22,1.23
Message-ID: <200602110225.k1B2PxmG012913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12886

Modified Files:
	dialog.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/dialog/devel/dialog.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dialog.spec	7 Feb 2006 11:23:17 -0000	1.22
+++ dialog.spec	11 Feb 2006 02:25:56 -0000	1.23
@@ -2,7 +2,7 @@
 Name: dialog
 %define SubVersion 20051107
 Version: 1.0.%{SubVersion}
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/System
 URL: http://invisible-island.net/dialog/dialog.html
@@ -46,6 +46,9 @@
 #%{_datadir}/locale/*/LC_MESSAGES/dialog.mo
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.20051107-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.20051107-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:26:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:26:10 -0500
Subject: rpms/dictd/devel dictd.spec,1.20,1.21
Message-ID: <200602110226.k1B2QAh8013038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dictd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13010

Modified Files:
	dictd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dictd.spec
===================================================================
RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dictd.spec	7 Feb 2006 11:23:27 -0000	1.20
+++ dictd.spec	11 Feb 2006 02:26:07 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: DICT protocol (RFC 2229) command-line client
 Name: dictd
 Version: 1.9.15
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: Applications/Internet
 Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9.15-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.15-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:26:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:26:22 -0500
Subject: rpms/diffstat/devel diffstat.spec,1.16,1.17
Message-ID: <200602110226.k1B2QMgA013167@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13138

Modified Files:
	diffstat.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: diffstat.spec
===================================================================
RCS file: /cvs/dist/rpms/diffstat/devel/diffstat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- diffstat.spec	7 Feb 2006 11:23:38 -0000	1.16
+++ diffstat.spec	11 Feb 2006 02:26:19 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A utility which provides statistics based on the output of diff.
 Name: diffstat
 Version: 1.41
-Release: 1.2
+Release: 1.2.1
 Group: Development/Tools
 License: distributable
 URL: http://invisible-island.net/diffstat
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:26:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:26:32 -0500
Subject: rpms/diffutils/devel diffutils.spec,1.18,1.19
Message-ID: <200602110226.k1B2QW71013290@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/diffutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13262

Modified Files:
	diffutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: diffutils.spec
===================================================================
RCS file: /cvs/dist/rpms/diffutils/devel/diffutils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- diffutils.spec	7 Feb 2006 11:23:47 -0000	1.18
+++ diffutils.spec	11 Feb 2006 02:26:30 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities.
 Name: diffutils
 Version: 2.8.1
-Release: 15.2
+Release: 15.2.1
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_infodir}/diff.info*gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.1-15.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.1-15.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:26:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:26:43 -0500
Subject: rpms/distcache/devel distcache.spec,1.15,1.16
Message-ID: <200602110226.k1B2Qh2I013410@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/distcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13381

Modified Files:
	distcache.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: distcache.spec
===================================================================
RCS file: /cvs/dist/rpms/distcache/devel/distcache.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- distcache.spec	7 Feb 2006 11:24:10 -0000	1.15
+++ distcache.spec	11 Feb 2006 02:26:40 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: Distributed SSL session cache
 Name: distcache
 Version: 1.4.5
-Release: 12.2
+Release: 12.2.1
 License: LGPL
 Group: System Environment/Daemons
 URL: http://www.distcache.org/
@@ -101,6 +101,9 @@
 %{_mandir}/man2/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.5-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:26:53 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.33,1.34
Message-ID: <200602110226.k1B2QrEF013534@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13505

Modified Files:
	dmraid.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dmraid.spec	7 Feb 2006 11:24:43 -0000	1.33
+++ dmraid.spec	11 Feb 2006 02:26:51 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc9
-Release: FC5_5.1
+Release: FC5_5.2
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -104,6 +104,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:27:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:27:04 -0500
Subject: rpms/dos2unix/devel dos2unix.spec,1.19,1.20
Message-ID: <200602110227.k1B2R4gM013659@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dos2unix.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dos2unix.spec
===================================================================
RCS file: /cvs/dist/rpms/dos2unix/devel/dos2unix.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dos2unix.spec	7 Feb 2006 11:24:56 -0000	1.19
+++ dos2unix.spec	11 Feb 2006 02:27:02 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: Text file format converter
 Name: dos2unix
 Version: 3.1
-Release: 24.2
+Release: 24.2.1
 Group: Applications/Text
 License: Freely distributable
 Source: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1-24.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1-24.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:27:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:27:14 -0500
Subject: rpms/dosfstools/devel dosfstools.spec,1.23,1.24
Message-ID: <200602110227.k1B2REd7013779@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dosfstools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13748

Modified Files:
	dosfstools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dosfstools.spec
===================================================================
RCS file: /cvs/dist/rpms/dosfstools/devel/dosfstools.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- dosfstools.spec	7 Feb 2006 11:25:09 -0000	1.23
+++ dosfstools.spec	11 Feb 2006 02:27:12 -0000	1.24
@@ -1,7 +1,7 @@
 Name: dosfstools
 Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux.
 Version: 2.11
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-%{version}.src.tar.gz
@@ -56,6 +56,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.11-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.11-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:27:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:27:25 -0500
Subject: rpms/dovecot/devel dovecot.spec,1.43,1.44
Message-ID: <200602110227.k1B2RPcd013898@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	dovecot.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- dovecot.spec	9 Feb 2006 12:37:04 -0000	1.43
+++ dovecot.spec	11 Feb 2006 02:27:22 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: Dovecot Secure imap server
 Name: dovecot
 Version: 1.0
-Release: 0.beta2.4
+Release: 0.beta2.4.1
 License: LGPL
 Group: System Environment/Daemons
 
@@ -203,6 +203,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.beta2.4.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Petr Rockai <prockai at redhat.com> - 1.0-0.beta2.4
 - enable inotify as it should work now (#179431)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:27:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:27:35 -0500
Subject: rpms/doxygen/devel doxygen.spec,1.35,1.36
Message-ID: <200602110227.k1B2RZLD014024@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/doxygen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13995

Modified Files:
	doxygen.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: doxygen.spec
===================================================================
RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- doxygen.spec	7 Feb 2006 11:25:34 -0000	1.35
+++ doxygen.spec	11 Feb 2006 02:27:32 -0000	1.36
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.4.6
-Release: 1.1
+Release: 1.2
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -102,6 +102,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.6-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.6-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:27:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:27:48 -0500
Subject: rpms/dtach/devel dtach.spec,1.10,1.11
Message-ID: <200602110227.k1B2RmsL014171@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dtach/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14143

Modified Files:
	dtach.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dtach.spec
===================================================================
RCS file: /cvs/dist/rpms/dtach/devel/dtach.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dtach.spec	7 Feb 2006 11:25:47 -0000	1.10
+++ dtach.spec	11 Feb 2006 02:27:45 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A simple program that emulates the detach feature of screen.
 Name: dtach
 Version: 0.7
-Release: 1.2
+Release: 1.2.1
 License: GPL
 URL: http://dtach.sourceforge.net
 Group: Applications/System
@@ -42,6 +42,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:28:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:28:02 -0500
Subject: rpms/dump/devel dump.spec,1.34,1.35
Message-ID: <200602110228.k1B2S2f3014319@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14291

Modified Files:
	dump.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dump.spec
===================================================================
RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dump.spec	7 Feb 2006 11:26:10 -0000	1.34
+++ dump.spec	11 Feb 2006 02:27:59 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: Programs for backing up and restoring ext2/ext3 filesystems
 Name: dump
 Version: 0.4b41
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Applications/Archiving
 URL: http://dump.sourceforge.net/
@@ -114,6 +114,9 @@
 %{_mandir}/man8/rmt.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4b41-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4b41-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:28:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:28:12 -0500
Subject: rpms/dvd+rw-tools/devel dvd+rw-tools.spec,1.15,1.16
Message-ID: <200602110228.k1B2SCK9014448@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvd+rw-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14415

Modified Files:
	dvd+rw-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dvd+rw-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/dvd+rw-tools/devel/dvd+rw-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dvd+rw-tools.spec	7 Feb 2006 11:26:28 -0000	1.15
+++ dvd+rw-tools.spec	11 Feb 2006 02:28:10 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	Toolchain to master DVD+RW/+R media
 Name:		dvd+rw-tools
 Version:	5.21.4.10.8
-Release: 6.2
+Release: 6.2.1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
@@ -54,6 +54,9 @@
 %{_mandir}/man1/growisofs.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.21.4.10.8-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:28:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:28:22 -0500
Subject: rpms/dvgrab/devel dvgrab.spec,1.14,1.15
Message-ID: <200602110228.k1B2SMJr014566@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/dvgrab/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14539

Modified Files:
	dvgrab.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: dvgrab.spec
===================================================================
RCS file: /cvs/dist/rpms/dvgrab/devel/dvgrab.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dvgrab.spec	7 Feb 2006 11:26:56 -0000	1.14
+++ dvgrab.spec	11 Feb 2006 02:28:19 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility to capture video from a DV camera
 Name: dvgrab
 Version: 2.0
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://kino.schirmacher.de/
@@ -36,6 +36,9 @@
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:28:32 -0500
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.45,1.46
Message-ID: <200602110228.k1B2SWSC014693@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14666

Modified Files:
	e2fsprogs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- e2fsprogs.spec	7 Feb 2006 11:27:10 -0000	1.45
+++ e2fsprogs.spec	11 Feb 2006 02:28:30 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -296,6 +296,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.38-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.38-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:29:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:29:04 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.244,1.245
Message-ID: <200602110229.k1B2T4A3014878@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14842

Modified Files:
	eclipse.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- eclipse.spec	10 Feb 2006 15:30:47 -0000	1.244
+++ eclipse.spec	11 Feb 2006 02:29:01 -0000	1.245
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_6fc
+Release:        1jpp_7fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1279,6 +1279,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.1.2-1jpp_7fc
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
 - Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
 - Make platform/feature.xml reference the tomcat5 plugin.



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:29:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:29:19 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.31,1.32
Message-ID: <200602110229.k1B2TJ4C014921@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14888

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2.1 - Release bump to build.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- eclipse-bugzilla.spec	10 Feb 2006 23:27:34 -0000	1.31
+++ eclipse-bugzilla.spec	11 Feb 2006 02:29:17 -0000	1.32
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	2
+Release:	2.1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -139,6 +139,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2.1
+- Release bump to build.
+
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2
 - Release bump to build.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:30:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:30:33 -0500
Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.35,1.36
Message-ID: <200602110230.k1B2UX5T015348@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15317

Modified Files:
	eclipse-cdt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eclipse-cdt.spec	10 Feb 2006 17:00:05 -0000	1.35
+++ eclipse-cdt.spec	11 Feb 2006 02:30:30 -0000	1.36
@@ -21,7 +21,7 @@
 Summary: 	%{pkg_summary}
 Name: 		%{eclipse_name}-cdt
 Version: 	%{majmin}.%{micro}
-Release: 	1jpp_7fc
+Release: 	1jpp_8fc
 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
@@ -232,6 +232,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_8fc
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Andrew Overholt <overholt at redhat.com> 3.0.1-1jpp_7fc
 - Use Epoch in Requires (rh#180915).
 - Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2.



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:33:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:33:01 -0500
Subject: rpms/ed/devel ed.spec,1.16,1.17
Message-ID: <200602110233.k1B2X1rn015669@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15614

Modified Files:
	ed.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ed.spec
===================================================================
RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ed.spec	7 Feb 2006 11:27:49 -0000	1.16
+++ ed.spec	11 Feb 2006 02:32:58 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The GNU line editor.
 Name: ed
 Version: 0.2
-Release: 38.2
+Release: 38.2.1
 License: GPL
 Group:	Applications/Text
 Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2-38.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2-38.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:33:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:33:23 -0500
Subject: rpms/eel2/devel eel2.spec,1.36,1.37
Message-ID: <200602110233.k1B2XNUt015791@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15764

Modified Files:
	eel2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- eel2.spec	7 Feb 2006 11:28:00 -0000	1.36
+++ eel2.spec	11 Feb 2006 02:33:20 -0000	1.37
@@ -16,7 +16,7 @@
 Name:		eel2
 Summary:        Eazel Extensions Library.
 Version: 	2.13.90
-Release: 1.1
+Release: 1.2
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:33:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:33:55 -0500
Subject: rpms/efax/devel efax.spec,1.19,1.20
Message-ID: <200602110233.k1B2Xtig015905@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/efax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15876

Modified Files:
	efax.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: efax.spec
===================================================================
RCS file: /cvs/dist/rpms/efax/devel/efax.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- efax.spec	7 Feb 2006 11:28:09 -0000	1.19
+++ efax.spec	11 Feb 2006 02:33:52 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A program for faxing using a Class 1, 2 or 2.0 fax modem.
 Name: efax
 Version: 0.9
-Release: 27.1
+Release: 27.2
 License: GPL
 Group: Applications/Communications
 Url: http://www.cce.com/efax/
@@ -62,6 +62,9 @@
 %dir %{_localstatedir}/log/fax
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9-27.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-27.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:34:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:34:30 -0500
Subject: rpms/eject/devel eject.spec,1.21,1.22
Message-ID: <200602110234.k1B2YUJo016021@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eject/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15997

Modified Files:
	eject.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eject.spec
===================================================================
RCS file: /cvs/dist/rpms/eject/devel/eject.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- eject.spec	7 Feb 2006 11:28:21 -0000	1.21
+++ eject.spec	11 Feb 2006 02:34:27 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control.
 Name: eject
 Version: 2.1.2
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Base
 Source: http://metalab.unc.edu/pub/Linux/utils/disk-management/%{name}-%{version}.tar.gz
@@ -50,6 +50,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:35:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:35:11 -0500
Subject: rpms/ekiga/devel ekiga.spec,1.8,1.9
Message-ID: <200602110235.k1B2ZBPX016150@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16120

Modified Files:
	ekiga.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ekiga.spec	7 Feb 2006 11:28:32 -0000	1.8
+++ ekiga.spec	11 Feb 2006 02:35:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 1.99.0
-Release: 3.1
+Release: 3.2
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -84,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.99.0-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.99.0-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:35:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:35:40 -0500
Subject: rpms/ElectricFence/devel ElectricFence.spec,1.14,1.15
Message-ID: <200602110235.k1B2ZeRC016338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ElectricFence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16308

Modified Files:
	ElectricFence.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ElectricFence.spec
===================================================================
RCS file: /cvs/dist/rpms/ElectricFence/devel/ElectricFence.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElectricFence.spec	7 Feb 2006 11:28:45 -0000	1.14
+++ ElectricFence.spec	11 Feb 2006 02:35:37 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A debugger which detects memory allocation violations.
 Name: ElectricFence
 Version: 2.2.2
-Release: 20.2
+Release: 20.2.1
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.perens.com/pub/ElectricFence/beta/%{name}-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-20.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.2-20.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:36:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:36:00 -0500
Subject: rpms/elfutils/devel elfutils.spec,1.61,1.62
Message-ID: <200602110236.k1B2a0US016469@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elfutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16450

Modified Files:
	elfutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: elfutils.spec
===================================================================
RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- elfutils.spec	7 Feb 2006 18:10:52 -0000	1.61
+++ elfutils.spec	11 Feb 2006 02:35:58 -0000	1.62
@@ -1,5 +1,5 @@
 %define version 0.119
-%define release 1.2
+%define release 1.2.1
 
 %define gpl 0
 %if %{?_with_compat:1}%{!?_with_compat:0}
@@ -14,7 +14,7 @@
 %if !%{compat}
 Release: %{release}
 %else
-Release: 0.%{release}
+Release: 0.%{release}.1
 %endif
 %if %{gpl}
 License: GPL
@@ -247,6 +247,9 @@
 %{_libdir}/libelf.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.119-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:36:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:36:38 -0500
Subject: rpms/elinks/devel elinks.spec,1.31,1.32
Message-ID: <200602110236.k1B2acvK016700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/elinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16667

Modified Files:
	elinks.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: elinks.spec
===================================================================
RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- elinks.spec	7 Feb 2006 11:29:14 -0000	1.31
+++ elinks.spec	11 Feb 2006 02:36:35 -0000	1.32
@@ -2,7 +2,7 @@
 Name: elinks
 Summary: A text-mode Web browser.
 Version: 0.11.0
-Release: 2.1
+Release: 2.2
 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
@@ -83,6 +83,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.11.0-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:37:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:37:19 -0500
Subject: rpms/emacs/devel emacs.spec,1.63,1.64
Message-ID: <200602110237.k1B2bJax016937@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16912

Modified Files:
	emacs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- emacs.spec	7 Feb 2006 11:29:27 -0000	1.63
+++ emacs.spec	11 Feb 2006 02:37:16 -0000	1.64
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 12.1
+Release: 12.2
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -538,6 +538,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 21.4-12.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 21.4-12.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:37:55 -0500
Subject: rpms/enscript/devel enscript.spec,1.27,1.28
Message-ID: <200602110237.k1B2btpe017184@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/enscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17154

Modified Files:
	enscript.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: enscript.spec
===================================================================
RCS file: /cvs/dist/rpms/enscript/devel/enscript.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- enscript.spec	7 Feb 2006 11:29:51 -0000	1.27
+++ enscript.spec	11 Feb 2006 02:37:52 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: A plain ASCII to PostScript converter.
 Name: enscript
 Version: 1.6.4
-Release: 1.1.1
+Release: 1.1.2
 License: GPL
 Group: Applications/Publishing
 Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.4-1.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.4-1.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:38:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:38:22 -0500
Subject: rpms/eog/devel eog.spec,1.38,1.39
Message-ID: <200602110238.k1B2cMlt017372@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17346

Modified Files:
	eog.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- eog.spec	7 Feb 2006 11:30:02 -0000	1.38
+++ eog.spec	11 Feb 2006 02:38:18 -0000	1.39
@@ -13,7 +13,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -97,6 +97,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:38:35 -0500
Subject: rpms/epic/devel epic.spec,1.17,1.18
Message-ID: <200602110238.k1B2cZt0017508@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17484

Modified Files:
	epic.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- epic.spec	7 Feb 2006 11:30:57 -0000	1.17
+++ epic.spec	11 Feb 2006 02:38:32 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 2.2
+Release: 2.2.1
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -78,6 +78,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:39:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:39:13 -0500
Subject: rpms/eruby/devel eruby.spec,1.15,1.16
Message-ID: <200602110239.k1B2dDbm017688@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/eruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17656

Modified Files:
	eruby.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: eruby.spec
===================================================================
RCS file: /cvs/dist/rpms/eruby/devel/eruby.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- eruby.spec	7 Feb 2006 11:33:03 -0000	1.15
+++ eruby.spec	11 Feb 2006 02:39:10 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		eruby
 Version:	1.0.5
-Release: 5.2
+Release: 5.2.1
 License:	distributable
 URL:		http://www.modruby.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:40:05 -0500
Subject: rpms/esound/devel esound.spec,1.27,1.28
Message-ID: <200602110240.k1B2e550017987@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/esound/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17949

Modified Files:
	esound.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: esound.spec
===================================================================
RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- esound.spec	7 Feb 2006 11:33:51 -0000	1.27
+++ esound.spec	11 Feb 2006 02:40:02 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: Allows several audio streams to play on a single audio device.
 Name:      esound
 Version:   0.2.36
-Release: 2.2
+Release: 2.2.1
 Epoch: 1
 License: GPL
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.36-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.2.36-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:40:18 -0500
Subject: rpms/ethereal/devel ethereal.spec,1.65,1.66
Message-ID: <200602110240.k1B2eI9q018131@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ethereal.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ethereal.spec
===================================================================
RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ethereal.spec	7 Feb 2006 11:34:42 -0000	1.65
+++ ethereal.spec	11 Feb 2006 02:40:15 -0000	1.66
@@ -4,7 +4,7 @@
 Summary: 	Network traffic analyzer
 Name: 		ethereal
 Version:	0.10.14
-Release: 	3.1
+Release: 	3.2
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10.14-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.14-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:40:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:40:33 -0500
Subject: rpms/ethtool/devel ethtool.spec,1.14,1.15
Message-ID: <200602110240.k1B2eX1V018294@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ethtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18266

Modified Files:
	ethtool.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ethtool.spec
===================================================================
RCS file: /cvs/dist/rpms/ethtool/devel/ethtool.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ethtool.spec	7 Feb 2006 11:35:21 -0000	1.14
+++ ethtool.spec	11 Feb 2006 02:40:30 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Ethernet settings tool for PCI ethernet cards
 Name: ethtool
 Version: 3
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/System
 URL: http://sourceforge.net/projects/gkernel/
@@ -39,6 +39,9 @@
 %{_mandir}/man8/ethtool.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:40:48 -0500
Subject: rpms/evince/devel evince.spec,1.40,1.41
Message-ID: <200602110240.k1B2em2g018442@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18409

Modified Files:
	evince.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- evince.spec	7 Feb 2006 11:35:47 -0000	1.40
+++ evince.spec	11 Feb 2006 02:40:45 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:		evince
 Version:	0.5.0
-Release:	3.1
+Release:	3.2
 Summary:	Document viewer
 
 License: 	GPL
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:40:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:40:59 -0500
Subject: rpms/evolution/devel evolution.spec,1.123,1.124
Message-ID: <200602110240.k1B2exBb018573@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- evolution.spec	9 Feb 2006 20:39:18 -0000	1.123
+++ evolution.spec	11 Feb 2006 02:40:56 -0000	1.124
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.5.90
-Release: 2
+Release: 2.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -635,6 +635,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.90-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Christopher Aillon <caillon at redhat.com> - 2.5.90-2
 - Disable the inline audio plugin for now since it uses gstreamer08
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:41:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:41:13 -0500
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.50,1.51
Message-ID: <200602110241.k1B2fD2F018737@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18703

Modified Files:
	evolution-connector.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- evolution-connector.spec	7 Feb 2006 11:36:25 -0000	1.50
+++ evolution-connector.spec	11 Feb 2006 02:41:11 -0000	1.51
@@ -7,7 +7,7 @@
 
 Name: evolution-connector
 Version: 2.5.9.0
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -95,6 +95,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:41:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:41:26 -0500
Subject: rpms/a2ps/devel a2ps.spec,1.30,1.31
Message-ID: <200602110241.k1B2fQvu018879@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18841

Modified Files:
	a2ps.spec 
Log Message:
cleanup release issues


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- a2ps.spec	11 Feb 2006 01:29:00 -0000	1.30
+++ a2ps.spec	11 Feb 2006 02:41:22 -0000	1.31
@@ -1,10 +1,10 @@
 %define	ver	4.13b
-%define rel 48.2.1
+%define rel 	48.3
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
 Version: %{ver}
-Release: %{rel}.2.1
+Release: %{rel}
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz 
@@ -226,7 +226,7 @@
 %dir %{_datadir}/a2ps
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.2.1.2.1
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.3
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.2.2



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:41:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:41:27 -0500
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.83,
	1.84
Message-ID: <200602110241.k1B2fRAH018894@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	evolution-data-server.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- evolution-data-server.spec	7 Feb 2006 11:36:38 -0000	1.83
+++ evolution-data-server.spec	11 Feb 2006 02:41:23 -0000	1.84
@@ -25,7 +25,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.90
-Release: 2.1
+Release: 2.2
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.90-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.90-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:41:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:41:47 -0500
Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.21,1.22
Message-ID: <200602110241.k1B2fldx019113@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-webcal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19076

Modified Files:
	evolution-webcal.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: evolution-webcal.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- evolution-webcal.spec	7 Feb 2006 11:37:28 -0000	1.21
+++ evolution-webcal.spec	11 Feb 2006 02:41:44 -0000	1.22
@@ -6,7 +6,7 @@
 Name: evolution-webcal
 Summary: A handler for webcal URIs
 Version: 2.4.1
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Internet
 Source0: %{name}-%{version}.tar.bz2
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.1-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:41:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:41:52 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.36, 1.37 modules-mls.conf,
	1.11, 1.12 modules-strict.conf, 1.3, 1.4 policy-20060207.patch,
	1.1, 1.2 policygentool, 1.2, 1.3 selinux-policy.spec, 1.102,
	1.103 sources, 1.40, 1.41
Message-ID: <200602110241.k1B2fqDf019205@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19123

Modified Files:
	.cvsignore modules-mls.conf modules-strict.conf 
	policy-20060207.patch policygentool selinux-policy.spec 
	sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	9 Feb 2006 13:56:52 -0000	1.36
+++ .cvsignore	11 Feb 2006 02:41:50 -0000	1.37
@@ -37,3 +37,4 @@
 serefpolicy-2.2.10.tgz
 serefpolicy-2.2.11.tgz
 serefpolicy-2.2.12.tgz
+serefpolicy-2.2.13.tgz


Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- modules-mls.conf	31 Jan 2006 00:35:32 -0000	1.11
+++ modules-mls.conf	11 Feb 2006 02:41:50 -0000	1.12
@@ -838,6 +838,13 @@
 selinuxutil = base
 
 # Layer: system
+# Module: semodule
+#
+# Policy for semodule
+# 
+semodule = base
+
+# Layer: system
 # Module: udev
 #
 # Policy for udev.
@@ -970,3 +977,5 @@
 # logwatch executable
 # 
 logwatch = base
+
+


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modules-strict.conf	3 Feb 2006 14:54:23 -0000	1.3
+++ modules-strict.conf	11 Feb 2006 02:41:50 -0000	1.4
@@ -1022,6 +1022,13 @@
 selinuxutil = module
 
 # Layer: system
+# Module: semodule
+#
+# Policy for semodule
+# 
+semodule = base
+
+# Layer: system
 # Module: udev
 #
 # Policy for udev.

policy-20060207.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/kudzu.te             |    2 -
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/su.if                |    7 +---
 policy/modules/kernel/bootloader.te       |    4 +-
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.if          |   17 +++++++++
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/files.if            |    2 -
 policy/modules/kernel/filesystem.if       |   48 +++++++++++++++++++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/kernel/terminal.if         |    2 -
 policy/modules/services/apache.fc         |    4 ++
 policy/modules/services/automount.if      |   16 +++++++++
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/cron.if           |    2 -
 policy/modules/services/cron.te           |    1 
 policy/modules/services/fetchmail.te      |    1 
 policy/modules/services/hal.te            |   11 ++++++
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    2 +
 policy/modules/services/networkmanager.te |    7 ++--
 policy/modules/services/postfix.te        |    5 ++
 policy/modules/services/remotelogin.te    |   28 +---------------
 policy/modules/services/sendmail.te       |    1 
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/fstools.te          |    2 +
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.if        |   18 ++++++++++
 policy/modules/system/libraries.te        |    1 
 policy/modules/system/locallogin.te       |    4 --
 policy/modules/system/logging.te          |    4 +-
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/selinuxutil.fc      |    1 
 policy/modules/system/selinuxutil.if      |   18 +++++++++-
 policy/modules/system/selinuxutil.te      |    2 +
 policy/modules/system/semodule.fc         |    7 ++++
 policy/modules/system/semodule.if         |   24 +++++++++++++
 policy/modules/system/semodule.te         |   52 ++++++++++++++++++++++++++++++
 policy/modules/system/udev.te             |    4 +-
 policy/modules/system/unconfined.if       |    1 
 policy/modules/system/unconfined.te       |    6 +++
 policy/modules/system/userdomain.if       |   17 +++++++++
 policy/modules/system/userdomain.te       |   13 +++++++
 50 files changed, 329 insertions(+), 51 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- policy-20060207.patch	9 Feb 2006 12:26:53 -0000	1.1
+++ policy-20060207.patch	11 Feb 2006 02:41:50 -0000	1.2
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.12/build.conf
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.13/build.conf
 --- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.12/build.conf	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/build.conf	2006-02-10 21:35:41.000000000 -0500
 @@ -8,13 +8,13 @@
  # version policy it supports.  Setting this will
  # override the version.  This only has an
@@ -26,9 +26,9 @@
  
  # Polyinstantiation
  # Enable polyinstantiated directory support.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.12/policy/mcs
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.13/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.12/policy/mcs	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/mcs	2006-02-10 21:35:41.000000000 -0500
 @@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
@@ -56,9 +56,9 @@
  
  define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
  link unlink rename relabelfrom relabelto }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.12/policy/modules/admin/kudzu.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.13/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-07 10:43:25.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/admin/kudzu.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/admin/kudzu.te	2006-02-10 21:35:42.000000000 -0500
 @@ -24,7 +24,6 @@
  allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
  dontaudit kudzu_t self:capability sys_tty_config;
@@ -75,9 +75,9 @@
  storage_raw_read_fixed_disk(kudzu_t)
  storage_raw_read_removable_device(kudzu_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.12/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.13/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/admin/prelink.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/admin/prelink.te	2006-02-10 21:35:42.000000000 -0500
 @@ -65,6 +65,7 @@
  fs_getattr_xattr_fs(prelink_t)
  
@@ -86,9 +86,9 @@
  libs_manage_ld_so(prelink_t)
  libs_relabel_ld_so(prelink_t)
  libs_use_shared_libs(prelink_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.12/policy/modules/admin/readahead.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.13/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/admin/readahead.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/admin/readahead.te	2006-02-10 21:35:42.000000000 -0500
 @@ -47,7 +47,9 @@
  fs_search_auto_mountpoints(readahead_t)
  fs_getattr_all_pipes(readahead_t)
@@ -100,9 +100,9 @@
  fs_read_tmpfs_symlinks(readahead_t)
  
  term_dontaudit_use_console(readahead_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.12/policy/modules/admin/su.if
---- nsaserefpolicy/policy/modules/admin/su.if	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/admin/su.if	2006-02-08 11:43:58.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.13/policy/modules/admin/su.if
+--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-10 21:34:11.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/admin/su.if	2006-02-10 21:35:42.000000000 -0500
 @@ -23,13 +23,12 @@
  	# Transition from the user domain to this domain.
  	domain_auto_trans($2, su_exec_t, $1_su_t)
@@ -120,9 +120,9 @@
  	allow $1_su_t $2:fd use;
  	allow $1_su_t $2:fifo_file rw_file_perms;
  	allow $1_su_t $2:process sigchld;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.12/policy/modules/kernel/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.13/policy/modules/kernel/bootloader.te
 --- nsaserefpolicy/policy/modules/kernel/bootloader.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/bootloader.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/bootloader.te	2006-02-10 21:35:42.000000000 -0500
 @@ -71,7 +71,7 @@
  
  allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
@@ -141,9 +141,9 @@
  # for reading BIOS data
  dev_read_raw_memory(bootloader_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.12/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.13/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/corenetwork.te.in	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/corenetwork.te.in	2006-02-10 21:35:42.000000000 -0500
 @@ -124,6 +124,7 @@
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
@@ -152,9 +152,9 @@
  network_port(zebra, tcp,2601,s0)
  network_port(zope, tcp,8021,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.12/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.13/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/devices.fc	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/devices.fc	2006-02-10 21:35:42.000000000 -0500
 @@ -78,6 +78,7 @@
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
@@ -163,9 +163,33 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.12/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.13/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/devices.if	2006-02-10 21:35:42.000000000 -0500
+@@ -2656,3 +2656,20 @@
+ 	typeattribute $1 memory_raw_write, memory_raw_read;
+ ')
+ 
++
++########################################
++## <summary>
++##	Read and write the USB device.
++## </summary>
++## <param name="domain">
++##	Domain allowed access.
++## </param>
++#
++interface(`dev_rw_usb',`
++	gen_require(`
++		type usb_device_t;
++	')
++
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 usb_device_t:chr_file { read write };
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.13/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/devices.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/devices.te	2006-02-10 21:35:42.000000000 -0500
 @@ -159,6 +159,11 @@
  genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
  genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
@@ -178,9 +202,9 @@
  type v4l_device_t;
  dev_node(v4l_device_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.12/policy/modules/kernel/files.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.13/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/files.fc	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/files.fc	2006-02-10 21:35:42.000000000 -0500
 @@ -192,6 +192,8 @@
  /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
  
@@ -190,10 +214,10 @@
  
  /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
  /usr/tmp/.*			<<none>>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.12/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/files.if	2006-02-08 11:43:58.000000000 -0500
-@@ -2080,7 +2080,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.13/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/files.if	2006-02-10 21:35:42.000000000 -0500
+@@ -2292,7 +2292,7 @@
  		attribute tmpfile;
  	')
  
@@ -202,10 +226,10 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.12/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/filesystem.if	2006-02-08 11:43:58.000000000 -0500
-@@ -929,6 +929,22 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.13/policy/modules/kernel/filesystem.if
+--- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/filesystem.if	2006-02-10 21:35:42.000000000 -0500
+@@ -1033,6 +1033,22 @@
  
  ########################################
  ## <summary>
@@ -228,7 +252,7 @@
  ##	Mount an iso9660 filesystem, which
  ##	is usually used on CDs.
  ## </summary>
-@@ -1763,6 +1779,38 @@
+@@ -1965,6 +1981,38 @@
  
  ########################################
  ## <summary>
@@ -267,17 +291,21 @@
  ##	Write to named pipe on a ramfs filesystem.
  ## </summary>
  ## <param name="domain">
-@@ -2727,3 +2775,6 @@
- 	# and its files.
- 	allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.13/policy/modules/kernel/mls.te
+--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/mls.te	2006-02-10 21:35:42.000000000 -0500
+@@ -87,6 +87,7 @@
  ')
-+
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.12/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/kernel/terminal.if	2006-02-09 07:23:31.000000000 -0500
-@@ -386,7 +386,7 @@
+ 
+ ifdef(`enable_mls',`
++range_transition secadm_t semodule_exec_t s15:c0.c255;
+ range_transition initrc_t auditd_exec_t s15:c0.c255;
+ range_transition kernel_t init_exec_t s0 - s15:c0.c255;
+ range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.13/policy/modules/kernel/terminal.if
+--- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-10 21:34:13.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/kernel/terminal.if	2006-02-10 21:35:42.000000000 -0500
+@@ -430,7 +430,7 @@
  		type devpts_t;
  	')
  
@@ -286,10 +314,35 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.12/policy/modules/services/automount.if
---- nsaserefpolicy/policy/modules/services/automount.if	2005-12-12 15:35:53.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/automount.if	2006-02-09 07:12:23.000000000 -0500
-@@ -39,3 +39,19 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.13/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-07 10:43:26.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/apache.fc	2006-02-10 21:35:42.000000000 -0500
+@@ -48,6 +48,7 @@
+ /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
+ /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
++/var/lib/cacti(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
+ /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
+ /var/lib/squirrelmail/prefs(/.*)?	gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
+ 
+@@ -55,6 +56,8 @@
+ /var/log/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
+ /var/log/cgiwrap\.log.*		--	gen_context(system_u:object_r:httpd_log_t,s0)
+ /var/log/httpd(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
++/var/log/cacti(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
++
+ ifdef(`distro_debian', `
+ /var/log/horde2(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
+ ')
+@@ -73,3 +76,4 @@
+ /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /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)
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.13/policy/modules/services/automount.if
+--- nsaserefpolicy/policy/modules/services/automount.if	2006-02-10 21:34:13.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/automount.if	2006-02-10 21:35:42.000000000 -0500
+@@ -43,3 +43,19 @@
  	corecmd_search_sbin($1)
  	can_exec($1,automount_etc_t)
  ')
@@ -309,9 +362,9 @@
 +
 +	dontaudit $1 automount_tmp_t:dir getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.12/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.13/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/automount.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/automount.te	2006-02-10 21:35:42.000000000 -0500
 @@ -63,6 +63,7 @@
  kernel_read_system_state(automount_t)
  kernel_list_proc(automount_t)
@@ -320,10 +373,21 @@
  bootloader_search_boot(automount_t)
  
  corecmd_exec_sbin(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.12/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/cron.if	2006-02-08 11:43:58.000000000 -0500
-@@ -407,7 +407,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.13/policy/modules/services/bluetooth.te
+--- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/bluetooth.te	2006-02-10 21:35:42.000000000 -0500
+@@ -101,6 +101,7 @@
+ 
+ dev_read_sysfs(bluetooth_t)
+ dev_rw_usbfs(bluetooth_t)
++dev_rw_usb(bluetooth_t)
+ dev_read_urand(bluetooth_t)
+ 
+ fs_getattr_all_fs(bluetooth_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.13/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-02-10 21:34:13.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/cron.if	2006-02-10 21:35:42.000000000 -0500
+@@ -429,7 +429,7 @@
  		type crond_t;
  	')
  
@@ -332,9 +396,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.12/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/cron.te	2006-02-08 11:43:58.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.13/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-10 11:31:48.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/cron.te	2006-02-10 21:35:42.000000000 -0500
 @@ -108,6 +108,7 @@
  
  corecmd_exec_shell(crond_t)
@@ -343,9 +407,9 @@
  
  domain_use_wide_inherit_fd(crond_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.12/policy/modules/services/fetchmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.13/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/fetchmail.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/fetchmail.te	2006-02-10 21:35:42.000000000 -0500
 @@ -44,6 +44,7 @@
  kernel_list_proc(fetchmail_t)
  kernel_getattr_proc_files(fetchmail_t)
@@ -354,9 +418,9 @@
  
  corenet_non_ipsec_sendrecv(fetchmail_t)
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.12/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.13/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/hal.te	2006-02-09 07:25:33.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/hal.te	2006-02-10 21:35:42.000000000 -0500
 @@ -50,6 +50,7 @@
  kernel_read_fs_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
@@ -390,7 +454,15 @@
  
  libs_use_ld_so(hald_t)
  libs_use_shared_libs(hald_t)
-@@ -150,6 +156,10 @@
+@@ -125,6 +131,7 @@
+ libs_exec_lib_files(hald_t)
+ 
+ logging_send_syslog_msg(hald_t)
++logging_search_logs(hald_t)
+ 
+ miscfiles_read_localization(hald_t)
+ miscfiles_read_hwdata(hald_t)
+@@ -150,6 +157,10 @@
  	apm_stream_connect(hald_t)
  ')
  
@@ -401,10 +473,10 @@
  optional_policy(`bind',`
  	bind_search_cache(hald_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.12/policy/modules/services/mta.if
---- nsaserefpolicy/policy/modules/services/mta.if	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/mta.if	2006-02-08 11:43:58.000000000 -0500
-@@ -434,6 +434,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.13/policy/modules/services/mta.if
+--- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/mta.if	2006-02-10 21:35:42.000000000 -0500
+@@ -458,6 +458,7 @@
  
  	allow $1 sendmail_exec_t:lnk_file r_file_perms;
  	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
@@ -412,9 +484,9 @@
  
  	allow $1 system_mail_t:fd use;
  	allow system_mail_t $1:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.12/policy/modules/services/mta.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.13/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/mta.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/mta.te	2006-02-10 21:35:42.000000000 -0500
 @@ -145,6 +145,8 @@
  	files_getattr_tmp_dirs(system_mail_t)
  
@@ -424,9 +496,18 @@
  
  	ifdef(`distro_redhat',`
  		# compatability for old default main.cf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.12/policy/modules/services/networkmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.13/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/networkmanager.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/networkmanager.te	2006-02-10 21:35:42.000000000 -0500
+@@ -22,7 +22,7 @@
+ dontaudit NetworkManager_t self:capability sys_tty_config;
+ allow NetworkManager_t self:process { setcap getsched signal_perms };
+ allow NetworkManager_t self:fifo_file rw_file_perms;
+-allow NetworkManager_t self:unix_dgram_socket create_socket_perms;
++allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
+ allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
+ allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms;
+ allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
 @@ -31,7 +31,10 @@
  
  allow NetworkManager_t NetworkManager_var_run_t:file create_file_perms;
@@ -439,10 +520,19 @@
  
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.12/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.13/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/postfix.te	2006-02-08 11:43:58.000000000 -0500
-@@ -411,6 +411,9 @@
++++ serefpolicy-2.2.13/policy/modules/services/postfix.te	2006-02-10 21:35:42.000000000 -0500
+@@ -273,6 +273,8 @@
+ corecmd_exec_shell(postfix_local_t)
+ corecmd_exec_bin(postfix_local_t)
+ 
++files_read_etc_files(postfix_local_t)
++
+ mta_read_aliases(postfix_local_t)
+ mta_delete_spool(postfix_local_t)
+ # For reading spamassasin
+@@ -411,6 +413,9 @@
  allow postfix_postdrop_t self:capability sys_resource;
  allow postfix_postdrop_t self:tcp_socket create;
  allow postfix_postdrop_t self:udp_socket create_socket_perms;
@@ -452,9 +542,9 @@
  
  allow postfix_postdrop_t postfix_public_t:dir search;
  allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.12/policy/modules/services/remotelogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.13/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/remotelogin.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/remotelogin.te	2006-02-10 21:35:42.000000000 -0500
 @@ -98,6 +98,7 @@
  files_list_mnt(remote_login_t)
  # for when /var/mail is a sym-link
@@ -495,9 +585,9 @@
 -	allow remote_login_t telnetd_devpts_t:chr_file { relabelfrom relabelto };
 -')
 -') dnl endif TODO
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.12/policy/modules/services/sendmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.13/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/sendmail.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/sendmail.te	2006-02-10 21:35:42.000000000 -0500
 @@ -65,6 +65,7 @@
  
  # for piping mail to a command
@@ -506,9 +596,9 @@
  
  domain_use_wide_inherit_fd(sendmail_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.12/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.13/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/spamassassin.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/spamassassin.te	2006-02-10 21:35:42.000000000 -0500
 @@ -77,6 +77,8 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -518,9 +608,9 @@
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.12/policy/modules/services/zebra.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.13/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/services/zebra.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/services/zebra.te	2006-02-10 21:35:42.000000000 -0500
 @@ -34,7 +34,7 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -530,9 +620,9 @@
  allow zebra_t self:udp_socket create_socket_perms;
  allow zebra_t self:rawip_socket create_socket_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.12/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.13/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/fstools.te	2006-02-09 07:06:48.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/fstools.te	2006-02-10 21:35:42.000000000 -0500
 @@ -57,6 +57,8 @@
  kernel_rw_unlabeled_dirs(fsadm_t)
  kernel_rw_unlabeled_blk_files(fsadm_t)
@@ -542,9 +632,9 @@
  dev_getattr_all_chr_files(fsadm_t)
  # mkreiserfs and other programs need this for UUID
  dev_read_rand(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.12/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.13/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/init.fc	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/init.fc	2006-02-10 21:35:42.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -555,10 +645,10 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.12/policy/modules/system/libraries.if
---- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/libraries.if	2006-02-08 11:43:58.000000000 -0500
-@@ -70,6 +70,23 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.13/policy/modules/system/libraries.if
+--- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/libraries.if	2006-02-10 21:35:42.000000000 -0500
+@@ -80,6 +80,23 @@
  
  ########################################
  ## <summary>
@@ -582,7 +672,7 @@
  ##	Use the dynamic link/loader for automatic loading
  ##	of shared libraries with legacy support.
  ## </summary>
-@@ -253,6 +270,7 @@
+@@ -283,6 +300,7 @@
  
  	allow $1 lib_t:dir search_dir_perms;
  	allow $1 lib_t:file manage_file_perms;
@@ -590,9 +680,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.12/policy/modules/system/libraries.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.13/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/libraries.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/libraries.te	2006-02-10 21:35:42.000000000 -0500
 @@ -53,6 +53,7 @@
  
  allow ldconfig_t ld_so_cache_t:file create_file_perms;
@@ -601,9 +691,9 @@
  
  allow ldconfig_t lib_t:dir rw_dir_perms;
  allow ldconfig_t lib_t:lnk_file { getattr create read unlink };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.12/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.13/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/locallogin.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/locallogin.te	2006-02-10 21:35:42.000000000 -0500
 @@ -214,10 +214,8 @@
  	alsa_domtrans(local_login_t)
  ')
@@ -616,9 +706,9 @@
  
  #################################
  # 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.12/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.13/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/logging.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/logging.te	2006-02-10 21:35:42.000000000 -0500
 @@ -92,6 +92,8 @@
  	term_use_unallocated_ttys(auditctl_t)
  ')
@@ -637,9 +727,9 @@
  allow auditd_t self:file { getattr read write };
  allow auditd_t self:unix_dgram_socket create_socket_perms;
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.12/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.13/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/mount.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/mount.te	2006-02-10 21:35:42.000000000 -0500
 @@ -33,6 +33,8 @@
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
@@ -649,9 +739,55 @@
  
  storage_raw_read_fixed_disk(mount_t)
  storage_raw_write_fixed_disk(mount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.12/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.13/policy/modules/system/selinuxutil.fc
+--- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.fc	2006-02-10 21:35:42.000000000 -0500
+@@ -10,6 +10,7 @@
+ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
+ 
+ /etc/selinux/([^/]*/)?policy(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
++/etc/selinux/([^/]*/)?modules(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
+ /etc/selinux/([^/]*/)?seusers	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
+ /etc/selinux/([^/]*/)?users(/.*)?	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.13/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.if	2006-02-10 21:35:42.000000000 -0500
+@@ -587,6 +587,22 @@
+ 
+ ########################################
+ #
++# seutil_rw_file_contexts(domain)
++#
++interface(`seutil_rw_file_contexts',`
++	gen_require(`
++		type selinux_config_t, file_context_t;
++	')
++
++	files_search_etc($1)
++	allow $1 selinux_config_t:dir search;
++	allow $1 file_context_t:dir r_dir_perms;
++	allow $1 file_context_t:file rw_file_perms;
++	allow $1 file_context_t:lnk_file { getattr read };
++')
++
++########################################
++#
+ # seutil_read_bin_policy(domain)
+ #
+ interface(`seutil_read_bin_policy',`
+@@ -649,7 +665,7 @@
+ 
+ 	files_search_etc($1)
+ 	allow $1 selinux_config_t:dir search;
+-	allow $1 policy_config_t:dir rw_dir_perms;
++	allow $1 policy_config_t:dir create_dir_perms;
+ 	allow $1 policy_config_t:file create_file_perms;
+ 	typeattribute $1 can_write_binary_policy;
+ ')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.13/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/selinuxutil.te	2006-02-09 07:21:02.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.te	2006-02-10 21:35:42.000000000 -0500
 @@ -245,6 +245,7 @@
  selinux_compute_relabel_context(newrole_t)
  selinux_compute_user_contexts(newrole_t)
@@ -668,9 +804,104 @@
  
  files_read_etc_runtime_files(restorecon_t)
  files_read_etc_files(restorecon_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.12/policy/modules/system/udev.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.fc serefpolicy-2.2.13/policy/modules/system/semodule.fc
+--- nsaserefpolicy/policy/modules/system/semodule.fc	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/semodule.fc	2006-02-10 21:35:42.000000000 -0500
+@@ -0,0 +1,7 @@
++
++# semodule executable will have:
++# label: system_u:object_r:semodule_exec_t
++# MLS sensitivity: s0
++# MCS categories: <none>
++
++/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.if serefpolicy-2.2.13/policy/modules/system/semodule.if
+--- nsaserefpolicy/policy/modules/system/semodule.if	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/semodule.if	2006-02-10 21:35:42.000000000 -0500
+@@ -0,0 +1,24 @@
++## <summary>Policy for semodule.</summary>
++
++########################################
++## <summary>
++##	Execute a domain transition to run semodule.
++## </summary>
++## <param name="domain">
++##	Domain allowed to transition.
++## </param>
++#
++interface(`semodule_domtrans',`
++	gen_require(`
++		type semodule_t, semodule_exec_t;
++	')
++	files_search_usr($1)
++	corecmd_search_bin($1)
++
++	domain_auto_trans($1,semodule_exec_t,semodule_t)
++
++	allow $1 semodule_t:fd use;
++	allow semodule_t $1:fd use;
++	allow semodule_t $1:fifo_file rw_file_perms;
++	allow semodule_t $1:process sigchld;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.te serefpolicy-2.2.13/policy/modules/system/semodule.te
+--- nsaserefpolicy/policy/modules/system/semodule.te	1969-12-31 19:00:00.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/semodule.te	2006-02-10 21:35:42.000000000 -0500
+@@ -0,0 +1,52 @@
++
++policy_module(semodule,1.0.0)
++
++########################################
++#
++# Declarations
++#
++
++type semodule_t;
++domain_type(semodule_t)
++type semodule_exec_t;
++domain_entry_file(semodule_t, semodule_exec_t)
++role system_r types semodule_t;
++
++term_use_all_terms(semodule_t)
++allow semodule_t policy_config_t:file { read write };
++
++########################################
++#
++# semodule local policy
++#
++corecmd_exec_bin(semodule_t)
++corecmd_exec_sbin(semodule_t)
++
++files_read_etc_files(semodule_t)
++files_search_etc(semodule_t)
++files_list_usr(semodule_t)
++files_list_pids(semodule_t)
++files_read_usr_files(semodule_t)
++
++kernel_read_system_state(semodule_t)
++kernel_read_kernel_sysctls(semodule_t)
++
++libs_use_ld_so(semodule_t)
++libs_use_shared_libs(semodule_t)
++libs_use_lib_files(semodule_t)
++
++mls_rangetrans_target(semodule_t)
++
++optional_policy(`selinux', `
++	selinux_get_enforce_mode(semodule_t)
++')
++
++seutil_search_default_contexts(semodule_t)
++seutil_rw_file_contexts(semodule_t)
++seutil_domtrans_setfiles(semodule_t)
++seutil_domtrans_loadpolicy(semodule_t)
++seutil_read_config(semodule_t)
++seutil_manage_bin_policy(semodule_t)
++seutil_use_newrole_fd(semodule_t)
++
++allow semodule_t self:unix_stream_socket create_stream_socket_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.13/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/udev.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/udev.te	2006-02-10 21:35:42.000000000 -0500
 @@ -18,6 +18,8 @@
  domain_obj_id_change_exemption(udev_t)
  domain_entry_file(udev_t,udev_helper_exec_t)
@@ -689,9 +920,20 @@
  
  selinux_get_fs_mount(udev_t)
  selinux_validate_context(udev_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.12/policy/modules/system/unconfined.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.13/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-10 21:34:15.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/unconfined.if	2006-02-10 21:35:42.000000000 -0500
+@@ -19,6 +19,7 @@
+ 
+ 	# Use any Linux capability.
+ 	allow $1 self:capability *;
++	allow $1 self:fifo_file create_file_perms;
+ 
+ 	# Transition to myself, to make get_ordered_context_list happy.
+ 	allow $1 self:process transition;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.13/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/unconfined.te	2006-02-08 11:43:58.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/unconfined.te	2006-02-10 21:35:42.000000000 -0500
 @@ -152,4 +152,10 @@
  	optional_policy(`xserver',`
  		xserver_domtrans_xdm_xserver(unconfined_t)
@@ -703,10 +945,10 @@
 +		mount_domtrans(unconfined_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.12/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/userdomain.if	2006-02-08 11:43:58.000000000 -0500
-@@ -2817,6 +2817,23 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.13/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-10 21:34:15.000000000 -0500
++++ serefpolicy-2.2.13/policy/modules/system/userdomain.if	2006-02-10 21:35:42.000000000 -0500
+@@ -3049,6 +3049,23 @@
  
  ########################################
  ## <summary>
@@ -730,10 +972,10 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.12/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.13/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.12/policy/modules/system/userdomain.te	2006-02-08 11:43:58.000000000 -0500
-@@ -162,10 +162,13 @@
++++ serefpolicy-2.2.13/policy/modules/system/userdomain.te	2006-02-10 21:35:42.000000000 -0500
+@@ -162,10 +162,16 @@
  		')
  	')
  
@@ -743,11 +985,14 @@
  		logging_read_audit_log(secadm_t)
  		logging_domtrans_auditctl(secadm_t)
  		mls_process_read_up(secadm_t)
++		mls_file_write_down(secadm_t)
++		mls_file_upgrade(secadm_t)
++		mls_file_downgrade(secadm_t)
 +		userdom_dontaudit_append_staff_home_files(secadm_t)
  	', `
  		logging_domtrans_auditctl(sysadm_t)
  		logging_read_audit_log(sysadm_t)
-@@ -224,6 +227,10 @@
+@@ -224,6 +230,10 @@
  
  	optional_policy(`dmesg',`
  		dmesg_exec(sysadm_t)
@@ -758,3 +1003,13 @@
  	')
  
  	optional_policy(`dmidecode',`
+@@ -347,6 +357,9 @@
+ 			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
+ 			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
+ 			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
++			semodule_domtrans(secadm_t)
++			role secadm_r types semodule_t;
++			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
+ 		', `
+ 			selinux_set_enforce_mode(sysadm_t)
+ 			selinux_set_boolean(sysadm_t)


Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policygentool	6 Feb 2006 19:12:13 -0000	1.2
+++ policygentool	11 Feb 2006 02:41:50 -0000	1.3
@@ -26,23 +26,7 @@
 
 ########################### Interface File #############################
 interface="\n\
-## <summary>TEMPLATETYPE policy</summary>\n\
-## <desc>\n\
-##	<p>\n\
-##		More descriptive text about TEMPLATETYPE.  The <desc>\n\
-##		tag can also use <p>, <ul>, and <ol>\n\
-##		html tags for formatting.\n\
-##	</p>\n\
-##	<p>\n\
-##		This policy supports the following TEMPLATETYPE features:\n\
-##		<ul>\n\
-##		<li>Feature A</li>\n\
-##		<li>Feature B</li>\n\
-##		<li>Feature C</li>\n\
-##		</ul>\n\
-##	</p>\n\
-## </desc>\n\
-#\n\
+## <summary>policy for TEMPLATETYPE</summary>\n\
 \n\
 ########################################\n\
 ## <summary>\n\
@@ -61,8 +45,8 @@
 \n\
 	allow $1 TEMPLATETYPE_t:fd use;\n\
 	allow TEMPLATETYPE_t $1:fd use;\n\
-	allow $1 TEMPLATETYPE_t:fifo_file rw_file_perms;\n\
-	allow $1 TEMPLATETYPE_t:process sigchld;\n\
+	allow TEMPLATETYPE_t:$1:fifo_file rw_file_perms;\n\
+	allow TEMPLATETYPE_t $1:process sigchld;\n\
 ')\n\
 "
 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- selinux-policy.spec	9 Feb 2006 12:26:53 -0000	1.102
+++ selinux-policy.spec	11 Feb 2006 02:41:50 -0000	1.103
@@ -5,7 +5,7 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.12
+Version: 2.2.13
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -295,6 +295,9 @@
 
 %changelog
 
+* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.13-1
+- Add semodule policy
+
 * Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 2.2.12-1
 - Update from upstream
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	9 Feb 2006 13:56:52 -0000	1.40
+++ sources	11 Feb 2006 02:41:50 -0000	1.41
@@ -1 +1 @@
-90df72dee4541507737910ff48175760  serefpolicy-2.2.12.tgz
+cd259d3029bd3688b80a8b7804a75e10  serefpolicy-2.2.13.tgz



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:01 -0500
Subject: rpms/expat/devel expat.spec,1.21,1.22
Message-ID: <200602110242.k1B2g1PV019318@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/expat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19285

Modified Files:
	expat.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: expat.spec
===================================================================
RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- expat.spec	7 Feb 2006 11:37:39 -0000	1.21
+++ expat.spec	11 Feb 2006 02:41:58 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A library for parsing XML.
 Name: expat
 Version: 1.95.8
-Release: 8.1
+Release: 8.2
 Group: System Environment/Libraries
 Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz
 URL: http://www.libexpat.org/
@@ -70,6 +70,9 @@
 %{_includedir}/*.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.95.8-8.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.95.8-8.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:11 -0500
Subject: rpms/expect/devel expect.spec,1.12,1.13
Message-ID: <200602110242.k1B2gBpO019445@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/expect/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19414

Modified Files:
	expect.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: expect.spec
===================================================================
RCS file: /cvs/dist/rpms/expect/devel/expect.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- expect.spec	7 Feb 2006 21:31:30 -0000	1.12
+++ expect.spec	11 Feb 2006 02:42:08 -0000	1.13
@@ -3,7 +3,7 @@
 Summary: A program-script interaction and testing utility
 Name: expect
 Version: %{majorver}.0
-Release: 3
+Release: 3.1
 License: Public Domain
 Group: Development/Languages
 URL: http://expect.nist.gov/
@@ -152,6 +152,9 @@
 %{_mandir}/man1/tknewsbiff.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.43.0-3.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 David Cantrell <dcantrell at redhat.com> - 5.43.0-3
 - Rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:22 -0500
Subject: rpms/fbset/devel fbset.spec,1.15,1.16
Message-ID: <200602110242.k1B2gMj4019581@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fbset/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19550

Modified Files:
	fbset.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: fbset.spec
===================================================================
RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fbset.spec	7 Feb 2006 11:37:50 -0000	1.15
+++ fbset.spec	11 Feb 2006 02:42:19 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Tools for managing a frame buffer's video mode properties.
 Name: fbset
 Version: 2.1
-Release: 20.2
+Release: 20.2.1
 License: GPL
 Group: Applications/System
 URL: http://home.tvd.be/cr26864/Linux/fbdev/
@@ -41,6 +41,9 @@
 %config	%{_sysconfdir}/fb.modes
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-20.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-20.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:35 -0500
Subject: rpms/fence/devel fence.spec,1.22,1.23
Message-ID: <200602110242.k1B2gZsB019722@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19689

Modified Files:
	fence.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: fence.spec
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fence.spec	7 Feb 2006 11:38:02 -0000	1.22
+++ fence.spec	11 Feb 2006 02:42:30 -0000	1.23
@@ -12,7 +12,7 @@
 
 Name: fence
 Version: 1.32.10
-Release: 0.FC5.1.1
+Release: 0.FC5.1.2
 License: GPL
 Group: System Environment/Base
 Summary: fence - The cluster I/O fencing system
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.32.10-0.FC5.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.32.10-0.FC5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:48 -0500
Subject: rpms/gstreamer-plugins-good/devel .cvsignore, 1.3,
	1.4 gstreamer-plugins-good.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200602110242.k1B2gmOs019870@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	.cvsignore gstreamer-plugins-good.spec sources 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.2-1
- Update to 0.10.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Jan 2006 16:32:52 -0000	1.3
+++ .cvsignore	11 Feb 2006 02:42:45 -0000	1.4
@@ -1,2 +1 @@
-gst-plugins-good-0.10.0.tar.bz2
-gst-plugins-good-0.10.1.tar.bz2
+gst-plugins-good-0.10.2.tar.bz2


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gstreamer-plugins-good.spec	7 Feb 2006 12:07:10 -0000	1.5
+++ gstreamer-plugins-good.spec	11 Feb 2006 02:42:45 -0000	1.6
@@ -5,8 +5,8 @@
 %define         _gstpb          0.10.0
 
 Name: 		%{gstreamer}-plugins-good
-Version: 	0.10.1
-Release:  	1.1	
+Version: 	0.10.2
+Release:  	1
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -173,6 +173,9 @@
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null
 
 %changelog
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.2-1
+- Update to 0.10.2
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Jan 2006 16:32:52 -0000	1.3
+++ sources	11 Feb 2006 02:42:45 -0000	1.4
@@ -1 +1 @@
-be5ba72454a1df6e4e6d5deeeec88e59  gst-plugins-good-0.10.1.tar.bz2
+03d3d0b5f19014fe0065234a3ea65ee6  gst-plugins-good-0.10.2.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:42:48 -0500
Subject: rpms/festival/devel festival.spec,1.21,1.22
Message-ID: <200602110242.k1B2gmBo019871@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/festival/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19832

Modified Files:
	festival.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: festival.spec
===================================================================
RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- festival.spec	7 Feb 2006 11:38:13 -0000	1.21
+++ festival.spec	11 Feb 2006 02:42:45 -0000	1.22
@@ -1,7 +1,7 @@
 Name: festival
 Summary: A free speech synthesizer
 Version: 1.95
-Release: 5.1
+Release: 5.2
 
 # we ship the 1.4.2 docs for now.
 %define docversion 1.4.2
@@ -292,6 +292,9 @@
 %{_includedir}/festival/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.95-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.95-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:43:19 -0500
Subject: rpms/fetchmail/devel fetchmail.spec,1.39,1.40
Message-ID: <200602110243.k1B2hJN1020164@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20132

Modified Files:
	fetchmail.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- fetchmail.spec	7 Feb 2006 11:38:33 -0000	1.39
+++ fetchmail.spec	11 Feb 2006 02:43:15 -0000	1.40
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.2.1
-Release: 1.1
+Release: 1.2
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2.asc
@@ -86,6 +86,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:43:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:43:31 -0500
Subject: rpms/file/devel file.spec,1.45,1.46
Message-ID: <200602110243.k1B2hVRt020310@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/file/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20272

Modified Files:
	file.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: file.spec
===================================================================
RCS file: /cvs/dist/rpms/file/devel/file.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- file.spec	7 Feb 2006 11:38:45 -0000	1.45
+++ file.spec	11 Feb 2006 02:43:28 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: A utility for determining file types.
 Name: file
 Version: 4.16
-Release: 6.1
+Release: 6.2
 License: distributable
 Group: Applications/File
 Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@ -87,6 +87,9 @@
 %{_libdir}/libmagic.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.16-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.16-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:43:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:43:43 -0500
Subject: rpms/filesystem/devel filesystem.spec,1.26,1.27
Message-ID: <200602110243.k1B2hhwJ020452@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/filesystem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20420

Modified Files:
	filesystem.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: filesystem.spec
===================================================================
RCS file: /cvs/dist/rpms/filesystem/devel/filesystem.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- filesystem.spec	7 Feb 2006 11:39:06 -0000	1.26
+++ filesystem.spec	11 Feb 2006 02:43:40 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
 Version: 2.3.7
-Release: 1.2
+Release: 1.2.1
 License: Public Domain
 Group: System Environment/Base
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -93,6 +93,9 @@
 /var/yp
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:43:55 -0500
Subject: rpms/findutils/devel findutils.spec,1.44,1.45
Message-ID: <200602110243.k1B2htD8020570@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/findutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20543

Modified Files:
	findutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: findutils.spec
===================================================================
RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- findutils.spec	7 Feb 2006 11:39:18 -0000	1.44
+++ findutils.spec	11 Feb 2006 02:43:52 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs).
 Name: findutils
 Version: 4.2.27
-Release: 3.1
+Release: 3.2
 Epoch: 1
 License: GPL
 Group: Applications/File
@@ -71,6 +71,9 @@
 %{_infodir}/find.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.2.27-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.2.27-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:44:18 -0500
Subject: rpms/finger/devel finger.spec,1.20,1.21
Message-ID: <200602110244.k1B2iIdX026120@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/finger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21500

Modified Files:
	finger.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: finger.spec
===================================================================
RCS file: /cvs/dist/rpms/finger/devel/finger.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- finger.spec	7 Feb 2006 11:39:41 -0000	1.20
+++ finger.spec	11 Feb 2006 02:44:14 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: The finger client.
 Name: finger
 Version: 0.17
-Release: 32.1
+Release: 32.2
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %{_mandir}/man8/fingerd.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:44:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:44:31 -0500
Subject: rpms/flac/devel flac.spec,1.18,1.19
Message-ID: <200602110244.k1B2iVBS009235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flac/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6128

Modified Files:
	flac.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: flac.spec
===================================================================
RCS file: /cvs/dist/rpms/flac/devel/flac.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- flac.spec	7 Feb 2006 11:40:30 -0000	1.18
+++ flac.spec	11 Feb 2006 02:44:28 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: An encoder/decoder for the Free Lossless Audio Codec.
 Name: flac
 Version: 1.1.2
-Release: 25.2
+Release: 25.2.1
 License: LGPL/GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/flac/flac-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-25.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.2-25.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:44:50 -0500
Subject: rpms/flex/devel flex.spec,1.21,1.22
Message-ID: <200602110244.k1B2ioFJ028388@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/flex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27058

Modified Files:
	flex.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: flex.spec
===================================================================
RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- flex.spec	7 Feb 2006 11:40:40 -0000	1.21
+++ flex.spec	11 Feb 2006 02:44:48 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Name: flex
 Version: 2.5.4a
-Release: 37.1
+Release: 37.2
 License: BSD
 Group: Development/Tools
 URL: http://www.gnu.org/software/flex/
@@ -79,6 +79,9 @@
 %{_includedir}/FlexLexer.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4a-37.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4a-37.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:45:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:45:09 -0500
Subject: rpms/fontconfig/devel fontconfig.spec,1.68,1.69
Message-ID: <200602110245.k1B2j9Dk013903@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	fontconfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- fontconfig.spec	8 Feb 2006 14:42:21 -0000	1.68
+++ fontconfig.spec	11 Feb 2006 02:45:06 -0000	1.69
@@ -3,7 +3,7 @@
 Summary: Font configuration and customization library
 Name: fontconfig
 Version: 2.3.93.cvs20060208
-Release: 1
+Release: 1.1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -135,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.93.cvs20060208-1.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060208-1
 - Newer cvs snapshot
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:45:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:45:22 -0500
Subject: rpms/foomatic/devel foomatic.spec,1.131,1.132
Message-ID: <200602110245.k1B2jMr7015120@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/foomatic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15107

Modified Files:
	foomatic.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- foomatic.spec	7 Feb 2006 11:41:00 -0000	1.131
+++ foomatic.spec	11 Feb 2006 02:45:20 -0000	1.132
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 33.1
+Release: 33.2
 License:	GPL
 Group: System Environment/Libraries
 
@@ -275,6 +275,9 @@
 %{_var}/cache/foomatic
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-33.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-33.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:45:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:45:43 -0500
Subject: rpms/freeglut/devel freeglut.spec,1.15,1.16
Message-ID: <200602110245.k1B2jhRN017485@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freeglut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17030

Modified Files:
	freeglut.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- freeglut.spec	7 Feb 2006 11:41:15 -0000	1.15
+++ freeglut.spec	11 Feb 2006 02:45:40 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   3.1
+Release:   3.2
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -87,6 +87,9 @@
 %{_libdir}/libglut.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:45:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:45:57 -0500
Subject: rpms/freeradius/devel freeradius.spec,1.28,1.29
Message-ID: <200602110245.k1B2jvqA019907@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	freeradius.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: freeradius.spec
===================================================================
RCS file: /cvs/dist/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- freeradius.spec	7 Feb 2006 11:41:27 -0000	1.28
+++ freeradius.spec	11 Feb 2006 02:45:54 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
 Version: 1.0.5
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -263,6 +263,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.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.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:46:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:46:18 -0500
Subject: rpms/freetype/devel freetype.spec,1.27,1.28
Message-ID: <200602110246.k1B2kHBB022255@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21860

Modified Files:
	freetype.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- freetype.spec	7 Feb 2006 11:41:38 -0000	1.27
+++ freetype.spec	11 Feb 2006 02:46:14 -0000	1.28
@@ -11,7 +11,7 @@
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
 Version: 2.1.10
-Release: 5.2
+Release: 5.2.1
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -286,6 +286,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.10-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.10-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:46:40 -0500
Subject: rpms/fribidi/devel fribidi.spec,1.7,1.8
Message-ID: <200602110246.k1B2kerK026248@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/fribidi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25782

Modified Files:
	fribidi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: fribidi.spec
===================================================================
RCS file: /cvs/dist/rpms/fribidi/devel/fribidi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fribidi.spec	7 Feb 2006 11:41:50 -0000	1.7
+++ fribidi.spec	11 Feb 2006 02:46:37 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.10.4
-Release: 8.2
+Release: 8.2.1
 URL: http://freedesktop.org/Software/FriBidi
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -56,6 +56,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10.4-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.4-8.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:46:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:46:59 -0500
Subject: rpms/ftp/devel ftp.spec,1.25,1.26
Message-ID: <200602110246.k1B2kxhf027876@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27865

Modified Files:
	ftp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ftp.spec
===================================================================
RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ftp.spec	7 Feb 2006 11:42:24 -0000	1.25
+++ ftp.spec	11 Feb 2006 02:46:57 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Name: ftp
 Version: 0.17
-Release: 32.1.1
+Release: 32.1.2
 License: BSD
 Group: Applications/Internet
 Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-32.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:47:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:47:12 -0500
Subject: rpms/gail/devel gail.spec,1.34,1.35
Message-ID: <200602110247.k1B2lCXq027934@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27920

Modified Files:
	gail.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gail.spec	8 Feb 2006 16:51:28 -0000	1.34
+++ gail.spec	11 Feb 2006 02:47:10 -0000	1.35
@@ -5,7 +5,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
 Version: 1.8.8
-Release: 3
+Release: 3.1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.8-3.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  8 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.8-3
 - Avoid crashing the gimp
 - Use api docs from tarball



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:47:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:47:24 -0500
Subject: rpms/gaim/devel gaim.spec,1.113,1.114
Message-ID: <200602110247.k1B2lOkP027988@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27975

Modified Files:
	gaim.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gaim.spec	7 Feb 2006 21:00:32 -0000	1.113
+++ gaim.spec	11 Feb 2006 02:47:22 -0000	1.114
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:        15.fc5
+Release:        15.fc5.1
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -275,6 +275,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.5.0-15.fc5.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Warren Togami <wtogami at redhat.com> 1:1.5.0-15
 - allow compat with gaim-2.x log format (rlaager)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:47:39 -0500
Subject: rpms/gal/devel gal.spec,1.18,1.19
Message-ID: <200602110247.k1B2ldlf028042@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28030

Modified Files:
	gal.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gal.spec
===================================================================
RCS file: /cvs/dist/rpms/gal/devel/gal.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gal.spec	7 Feb 2006 11:43:15 -0000	1.18
+++ gal.spec	11 Feb 2006 02:47:37 -0000	1.19
@@ -3,7 +3,7 @@
 
 Name: gal
 Version: 0.24
-Release: 6.2
+Release: 6.2.1
 Summary: The GNOME Application Library
 Group: System Environment/Libraries
 Epoch: 1
@@ -82,6 +82,9 @@
 %{_libdir}/libgal.so.*.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.24-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.24-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:47:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:47:49 -0500
Subject: rpms/gamin/devel gamin.spec,1.44,1.45
Message-ID: <200602110247.k1B2lne7028098@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gamin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28085

Modified Files:
	gamin.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gamin.spec
===================================================================
RCS file: /cvs/dist/rpms/gamin/devel/gamin.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gamin.spec	7 Feb 2006 11:43:25 -0000	1.44
+++ gamin.spec	11 Feb 2006 02:47:47 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: Library providing the FAM File Alteration Monitor API
 Name: gamin
 Version: 0.1.7
-Release: 1.2
+Release: 1.2.1
 License: LGPL
 Group: Development/Libraries
 Source: gamin-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.7-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:47:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:47:57 -0500
Subject: rpms/gawk/devel gawk.spec,1.33,1.34
Message-ID: <200602110247.k1B2lvOO028153@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28140

Modified Files:
	gawk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gawk.spec	10 Feb 2006 22:01:46 -0000	1.33
+++ gawk.spec	11 Feb 2006 02:47:55 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 6
+Release: 6.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-6.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Karel Zak <kzak at redhat.com> 3.1.5-6
 - fix wide characters concatenation
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:48:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:48:10 -0500
Subject: rpms/gcc/devel gcc41.spec,1.32,1.33
Message-ID: <200602110248.k1B2mALP028208@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28195

Modified Files:
	gcc41.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gcc41.spec	10 Feb 2006 15:37:12 -0000	1.32
+++ gcc41.spec	11 Feb 2006 02:48:07 -0000	1.33
@@ -24,7 +24,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}
+Release: %{gcc_release}.1
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{version}-%{DATE}.tar.bz2
@@ -1424,6 +1424,9 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.0-0.24.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.24
 - update from gcc-4_1-branch (-r110632:110831)
   - PRs tree-opt/26180, c++/26070, c++/26071, fortran/25577, java/26192,



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:48:39 -0500
Subject: rpms/GConf/devel GConf.spec,1.11,1.12
Message-ID: <200602110248.k1B2mdud028264@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28251

Modified Files:
	GConf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GConf.spec	7 Feb 2006 11:43:46 -0000	1.11
+++ GConf.spec	11 Feb 2006 02:48:37 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The Gnome Config System.
 Name: GConf
 Version: 1.0.9
-Release: 18.1
+Release: 18.2
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.gz
@@ -114,6 +114,9 @@
 %{_bindir}/gconf-config-1
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:48:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:48:49 -0500
Subject: rpms/GConf2/devel GConf2.spec,1.35,1.36
Message-ID: <200602110248.k1B2mnhL028319@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28306

Modified Files:
	GConf2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- GConf2.spec	7 Feb 2006 11:43:57 -0000	1.35
+++ GConf2.spec	11 Feb 2006 02:48:47 -0000	1.36
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 3.1
+Release: 3.2
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:48:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:48:59 -0500
Subject: rpms/gconf-editor/devel gconf-editor.spec,1.29,1.30
Message-ID: <200602110248.k1B2mxv6028374@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gconf-editor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28361

Modified Files:
	gconf-editor.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gconf-editor.spec
===================================================================
RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gconf-editor.spec	7 Feb 2006 11:44:07 -0000	1.29
+++ gconf-editor.spec	11 Feb 2006 02:48:57 -0000	1.30
@@ -8,7 +8,7 @@
 Summary: Editor/admin tool for GConf
 Name: gconf-editor
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -94,6 +94,9 @@
 %{_datadir}/omf/gconf-editor
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:49:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:49:13 -0500
Subject: rpms/gd/devel gd.spec,1.29,1.30
Message-ID: <200602110249.k1B2nDPF028426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28416

Modified Files:
	gd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gd.spec
===================================================================
RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gd.spec	7 Feb 2006 11:44:18 -0000	1.29
+++ gd.spec	11 Feb 2006 02:49:11 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.33
-Release:       6.1
+Release:       6.2
 Group:         System Environment/Libraries
 License:       BSD-style
 URL:           http://www.boutell.com/gd/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.33-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.33-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:49:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:49:33 -0500
Subject: rpms/gdb/devel gdb.spec,1.168,1.169
Message-ID: <200602110249.k1B2nXS0028493@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28479

Modified Files:
	gdb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gdb.spec	7 Feb 2006 11:44:29 -0000	1.168
+++ gdb.spec	11 Feb 2006 02:49:31 -0000	1.169
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.98.1
+Release: 1.98.2
 
 License: GPL
 Group: Development/Debuggers
@@ -536,6 +536,9 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:50:43 -0500
Subject: rpms/gdbm/devel gdbm.spec,1.18,1.19
Message-ID: <200602110250.k1B2ohsP028552@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28539

Modified Files:
	gdbm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gdbm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdbm/devel/gdbm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gdbm.spec	7 Feb 2006 11:44:46 -0000	1.18
+++ gdbm.spec	11 Feb 2006 02:50:40 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: A GNU set of database routines which use extensible hashing.
 Name: gdbm
 Version: 1.8.0
-Release: 26.1
+Release: 26.2
 Source: ftp://ftp.gnu.org/gnu/gdbm-%{version}.tar.gz
 Patch0: gdbm-1.8.0-jbj.patch
 Patch1: gdbm-1.8.0-fhs.patch
@@ -97,6 +97,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.0-26.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:50:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:50:53 -0500
Subject: rpms/gdk-pixbuf/devel gdk-pixbuf.spec,1.36,1.37
Message-ID: <200602110250.k1B2orHH028606@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdk-pixbuf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28594

Modified Files:
	gdk-pixbuf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/dist/rpms/gdk-pixbuf/devel/gdk-pixbuf.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gdk-pixbuf.spec	7 Feb 2006 11:45:01 -0000	1.36
+++ gdk-pixbuf.spec	11 Feb 2006 02:50:51 -0000	1.37
@@ -1,6 +1,6 @@
 Name: gdk-pixbuf
 Version: 0.22.0
-Release: 21.2
+Release: 21.2.1
 Epoch: 1
 Summary: An image loading library used with GNOME.
 License: LGPL
@@ -197,6 +197,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.22.0-21.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.22.0-21.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:51:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:51:05 -0500
Subject: rpms/gdm/devel gdm.spec,1.126,1.127
Message-ID: <200602110251.k1B2p59U028662@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28649

Modified Files:
	gdm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gdm.spec	9 Feb 2006 19:24:49 -0000	1.126
+++ gdm.spec	11 Feb 2006 02:51:03 -0000	1.127
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.7
-Release: 2
+Release: 2.1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -310,6 +310,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0.7-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.0.7-2
 - Make gdmsetup use consolehelper
 - Don't use deprecated pam_stack



From fedora-cvs-commits at redhat.com  Sat Feb 11 02:51:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 21:51:29 -0500
Subject: rpms/gedit/devel gedit.spec,1.72,1.73
Message-ID: <200602110251.k1B2pT1I028717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28704

Modified Files:
	gedit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- gedit.spec	7 Feb 2006 02:03:30 -0000	1.72
+++ gedit.spec	11 Feb 2006 02:51:27 -0000	1.73
@@ -16,7 +16,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.13.90
-Release: 	3	
+Release: 	3.1	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.90-3.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 1:2.13.90-3
 - Add dependancy on gnome-python2-desktop
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:02:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:02:11 -0500
Subject: rpms/genromfs/devel genromfs.spec,1.14,1.15
Message-ID: <200602110302.k1B32BoB028942@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/genromfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28927

Modified Files:
	genromfs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: genromfs.spec
===================================================================
RCS file: /cvs/dist/rpms/genromfs/devel/genromfs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- genromfs.spec	7 Feb 2006 11:45:52 -0000	1.14
+++ genromfs.spec	11 Feb 2006 03:02:06 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Utility for creating romfs filesystems.
 Name: genromfs
 Version: 0.5.1
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Base
 Source: http://unc.dl.sourceforge.net/sourceforge/romfs/genromfs-0.5.1.tar.gz
@@ -38,6 +38,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:03:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:03:48 -0500
Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.13,1.14
Message-ID: <200602110303.k1B33mDs029026@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/geronimo-specs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29002

Modified Files:
	geronimo-specs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: geronimo-specs.spec
===================================================================
RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- geronimo-specs.spec	7 Feb 2006 11:46:06 -0000	1.13
+++ geronimo-specs.spec	11 Feb 2006 03:03:34 -0000	1.14
@@ -2,7 +2,7 @@
 %define name            geronimo-specs
 %define version         1.0
 %define mstone		M2
-%define release 	0.%{mstone}.2jpp_6fc
+%define release 	0.%{mstone}.2jpp_7fc
 %define section         free
 
 Summary:        Geronimo J2EE server J2EE specifications
@@ -120,6 +120,9 @@
 %{_javadir}/*.jar
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.M2.2jpp_7fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.M2.2jpp_6fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:04:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:04:53 -0500
Subject: rpms/gettext/devel gettext.spec,1.49,1.50
Message-ID: <200602110304.k1B34r2K029086@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29073

Modified Files:
	gettext.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gettext.spec	7 Feb 2006 11:46:18 -0000	1.49
+++ gettext.spec	11 Feb 2006 03:04:50 -0000	1.50
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.5
-Release: 2.2.1
+Release: 2.2.2
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -218,6 +218,9 @@
 %{_libdir}/%{name}/gnu.gettext.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:05:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:05:38 -0500
Subject: rpms/gftp/devel gftp.spec,1.19,1.20
Message-ID: <200602110305.k1B35cMX029142@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29128

Modified Files:
	gftp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gftp.spec
===================================================================
RCS file: /cvs/dist/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gftp.spec	7 Feb 2006 11:47:00 -0000	1.19
+++ gftp.spec	11 Feb 2006 03:05:36 -0000	1.20
@@ -2,7 +2,7 @@
 Name: gftp
 Version: 2.0.18
 Epoch: 1
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/Internet
 Url: http://gftp.seul.org/
@@ -73,6 +73,9 @@
 %{_mandir}/man*/gftp.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.18-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.18-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:06:56 -0500
Subject: rpms/ghostscript/devel ghostscript.spec,1.99,1.100
Message-ID: <200602110306.k1B36uuZ029212@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29198

Modified Files:
	ghostscript.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ghostscript.spec	7 Feb 2006 11:47:15 -0000	1.99
+++ ghostscript.spec	11 Feb 2006 03:06:53 -0000	1.100
@@ -6,7 +6,7 @@
 Version: %{gs_ver}
 BuildRequires: libjpeg-devel
 
-Release: 5.1
+Release: 5.2
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -263,6 +263,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.15.1-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.15.1-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:07:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:07:49 -0500
Subject: rpms/giflib/devel giflib.spec,1.4,1.5
Message-ID: <200602110307.k1B37nMD029283@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/giflib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29267

Modified Files:
	giflib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: giflib.spec
===================================================================
RCS file: /cvs/dist/rpms/giflib/devel/giflib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- giflib.spec	7 Feb 2006 11:47:31 -0000	1.4
+++ giflib.spec	11 Feb 2006 03:07:46 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Library for manipulating GIF format image files
 Name: giflib
 Version: 4.1.3
-Release: 6.2
+Release: 6.2.1
 License: MIT
 URL: http://www.sf.net/projects/libungif/
 Source0: http://dl.sf.net/libungif/%{name}-%{version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.3-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.3-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:08:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:08:04 -0500
Subject: rpms/gimp/devel gimp.spec,1.87,1.88
Message-ID: <200602110308.k1B384MA029339@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29326

Modified Files:
	gimp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- gimp.spec	7 Feb 2006 11:47:54 -0000	1.87
+++ gimp.spec	11 Feb 2006 03:08:02 -0000	1.88
@@ -19,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}2.1
+Release: %{?prever:0.0.%{prever}.}2.2
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -348,6 +348,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:08:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:08:36 -0500
Subject: rpms/gimp-print/devel gimp-print.spec,1.33,1.34
Message-ID: <200602110308.k1B38aof029402@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gimp-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29389

Modified Files:
	gimp-print.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gimp-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gimp-print.spec	7 Feb 2006 11:48:08 -0000	1.33
+++ gimp-print.spec	11 Feb 2006 03:08:34 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: A collection of high-quality printer drivers.
 Name: gimp-print
 Version: 4.2.7
-Release: 15.1
+Release: 15.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://gimp-print.sourceforge.net/
@@ -193,6 +193,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.7-15.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.7-15.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:09:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:09:08 -0500
Subject: rpms/gjdoc/devel gjdoc.spec,1.33,1.34
Message-ID: <200602110309.k1B397DL029472@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gjdoc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29444

Modified Files:
	gjdoc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gjdoc.spec
===================================================================
RCS file: /cvs/dist/rpms/gjdoc/devel/gjdoc.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gjdoc.spec	7 Feb 2006 19:30:00 -0000	1.33
+++ gjdoc.spec	11 Feb 2006 03:09:05 -0000	1.34
@@ -1,6 +1,6 @@
 Name: gjdoc
 Version: 0.7.7
-Release: 3
+Release: 3.1
 URL: http://savannah.gnu.org/projects/classpath/
 License: GPL
 Summary: GNU Javadoc
@@ -51,6 +51,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.7-3.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Rafael Schloming <rafaels at redhat.com> - 0.7.7-3
 - Added ^Z as a whitespace character.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:09:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:09:27 -0500
Subject: rpms/gkrellm/devel gkrellm.spec,1.28,1.29
Message-ID: <200602110309.k1B39Rv1029530@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29514

Modified Files:
	gkrellm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gkrellm.spec	7 Feb 2006 11:48:38 -0000	1.28
+++ gkrellm.spec	11 Feb 2006 03:09:25 -0000	1.29
@@ -2,7 +2,7 @@
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
 Version:	2.2.7
-Release: 5.2
+Release: 5.2.1
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -183,6 +183,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:10:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:10:01 -0500
Subject: rpms/glade2/devel glade2.spec,1.19,1.20
Message-ID: <200602110310.k1B3A1c2029589@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glade2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- glade2.spec	7 Feb 2006 11:48:49 -0000	1.19
+++ glade2.spec	11 Feb 2006 03:09:48 -0000	1.20
@@ -17,7 +17,7 @@
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 1.2
+Release: 1.2.1
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:10:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:10:24 -0500
Subject: rpms/glib/devel glib.spec,1.17,1.18
Message-ID: <200602110310.k1B3AOmI029649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/glib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29636

Modified Files:
	glib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glib.spec
===================================================================
RCS file: /cvs/dist/rpms/glib/devel/glib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- glib.spec	7 Feb 2006 11:49:00 -0000	1.17
+++ glib.spec	11 Feb 2006 03:10:22 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions.
 Name: glib
 Version: 1.2.10
-Release: 18.2.1
+Release: 18.2.2
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:10:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:10:42 -0500
Subject: rpms/glib2/devel glib2.spec,1.76,1.77
Message-ID: <200602110310.k1B3Ag0T029709@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glib2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- glib2.spec	7 Feb 2006 11:49:11 -0000	1.76
+++ glib2.spec	11 Feb 2006 03:10:40 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.9.5
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.9.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:11:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:11:05 -0500
Subject: rpms/glibc/devel glibc.spec,1.219,1.220
Message-ID: <200602110311.k1B3B5sF029766@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glibc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- glibc.spec	4 Feb 2006 08:44:52 -0000	1.219
+++ glibc.spec	11 Feb 2006 03:11:03 -0000	1.220
@@ -20,7 +20,7 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}
+Release: %{glibcrelease}.1
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2
@@ -1245,6 +1245,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.90-36.1
+- bump again for double-long bug on ppc(64)
+
 * Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-36
 - update from CVS
   - fix frequency setting for ITIMER_PROF (#179938, BZ#2268)



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:11:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:11:26 -0500
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200602110311.k1B3BQjc029827@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gstreamer-plugins-base.spec sources 
Log Message:
* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-1
- Update to 0.10.3



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-plugins-base.spec	7 Feb 2006 12:06:50 -0000	1.8
+++ gstreamer-plugins-base.spec	11 Feb 2006 03:11:24 -0000	1.9
@@ -4,8 +4,8 @@
 %define         _gst            0.10.2
 
 Name: 		%{gstreamer}-plugins-base
-Version: 	0.10.2
-Release: 	2.1
+Version: 	0.10.3
+Release: 	1
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -187,6 +187,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-1
+- Update to 0.10.3
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jan 2006 16:29:49 -0000	1.4
+++ sources	11 Feb 2006 03:11:24 -0000	1.5
@@ -1 +1 @@
-08b1f541e81baa67aeab6df90cfe61d5  gst-plugins-base-0.10.2.tar.bz2
+8fb69b7c5eb98f15c45c659cad3cb614  gst-plugins-base-0.10.3.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:11:53 -0500
Subject: rpms/glibc-kernheaders/devel glibc-kernheaders.spec,1.103,1.104
Message-ID: <200602110311.k1B3BrTq029905@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	glibc-kernheaders.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glibc-kernheaders.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- glibc-kernheaders.spec	7 Feb 2006 11:49:22 -0000	1.103
+++ glibc-kernheaders.spec	11 Feb 2006 03:11:51 -0000	1.104
@@ -1,7 +1,7 @@
 Summary: Header files for the Linux kernel for use by glibc
 Name: glibc-kernheaders
 Version: 3.0
-Release: 5.1
+Release: 5.2
 License: GPL
 Group: Development/System
 ExclusiveOS: Linux
@@ -176,6 +176,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:12:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:12:07 -0500
Subject: rpms/glib-java/devel glib-java.spec,1.25,1.26
Message-ID: <200602110312.k1B3C7Qd029965@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/glib-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29952

Modified Files:
	glib-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: glib-java.spec
===================================================================
RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- glib-java.spec	7 Feb 2006 11:49:32 -0000	1.25
+++ glib-java.spec	11 Feb 2006 03:12:05 -0000	1.26
@@ -15,7 +15,7 @@
 Summary:   Base Library for the Java-GNOME libraries 
 Name:      %{java_pkg_prefix}%{name_base}
 Version:   0.2.3
-Release:   1.1
+Release:   1.2
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name_base}-%{version}.tar.gz
 License:   LGPL
@@ -117,6 +117,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:12:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:12:18 -0500
Subject: rpms/gmp/devel gmp.spec,1.24,1.25
Message-ID: <200602110312.k1B3CIxm030020@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30007

Modified Files:
	gmp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gmp.spec
===================================================================
RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gmp.spec	7 Feb 2006 11:49:57 -0000	1.24
+++ gmp.spec	11 Feb 2006 03:12:15 -0000	1.25
@@ -8,7 +8,7 @@
 Summary: A GNU arbitrary precision library.
 Name: gmp
 Version: 4.1.4
-Release: 6.2
+Release: 6.2.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
@@ -163,6 +163,9 @@
 %{_infodir}/mpfr.info*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.4-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:12:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:12:32 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.109,1.110
Message-ID: <200602110312.k1B3CWoW030076@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-applets.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-applets.spec	7 Feb 2006 11:50:41 -0000	1.109
+++ gnome-applets.spec	11 Feb 2006 03:12:30 -0000	1.110
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.3
-Release:  	4.1
+Release:  	4.2
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -175,6 +175,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.3-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.3-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:13:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:13:01 -0500
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.26,1.27
Message-ID: <200602110313.k1B3D1HX030140@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-bluetooth.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-bluetooth.spec	7 Feb 2006 11:51:07 -0000	1.26
+++ gnome-bluetooth.spec	11 Feb 2006 03:12:57 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.6.0
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -110,6 +110,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:13:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:13:14 -0500
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.47,1.48
Message-ID: <200602110313.k1B3DERk030202@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-desktop.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnome-desktop.spec	7 Feb 2006 11:51:18 -0000	1.47
+++ gnome-desktop.spec	11 Feb 2006 03:13:10 -0000	1.48
@@ -11,7 +11,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -132,6 +132,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:13:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:13:30 -0500
Subject: rpms/gnome-games/devel gnome-games.spec,1.64,1.65
Message-ID: <200602110313.k1B3DUwr030260@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-games.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- gnome-games.spec	7 Feb 2006 11:51:30 -0000	1.64
+++ gnome-games.spec	11 Feb 2006 03:13:27 -0000	1.65
@@ -11,7 +11,7 @@
 Summary: GNOME games.
 Name: gnome-games
 Version: 2.13.6
-Release: 3.1
+Release: 3.2
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.6-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.6-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:13:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:13:46 -0500
Subject: rpms/gnome-kerberos/devel gnome-kerberos.spec,1.16,1.17
Message-ID: <200602110313.k1B3DkLI030315@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-kerberos.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-kerberos.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-kerberos/devel/gnome-kerberos.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-kerberos.spec	7 Feb 2006 11:51:43 -0000	1.16
+++ gnome-kerberos.spec	11 Feb 2006 03:13:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name: gnome-kerberos
 Version: 0.3.3
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -34,6 +34,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.3-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.3-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:13:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:13:53 -0500
Subject: rpms/gnome-keyring/devel gnome-keyring.spec,1.18,1.19
Message-ID: <200602110313.k1B3DrbT030370@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-keyring.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-keyring.spec	7 Feb 2006 11:51:53 -0000	1.18
+++ gnome-keyring.spec	11 Feb 2006 03:13:51 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 0.4.6
-Release: 1.2
+Release: 1.2.1
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:06 -0500
Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.12,
	1.13
Message-ID: <200602110314.k1B3E6tq030425@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30412

Modified Files:
	gnome-keyring-manager.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-keyring-manager.spec	7 Feb 2006 11:52:04 -0000	1.12
+++ gnome-keyring-manager.spec	11 Feb 2006 03:14:04 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-keyring-manager
 Version: 2.12.0
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
@@ -58,6 +58,9 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:14 -0500
Subject: rpms/gnome-libs/devel gnome-libs.spec,1.41,1.42
Message-ID: <200602110314.k1B3EEmY030480@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-libs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-libs.spec	7 Feb 2006 11:52:17 -0000	1.41
+++ gnome-libs.spec	11 Feb 2006 03:14:12 -0000	1.42
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 48.1
+Release: 48.2
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -350,6 +350,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:25 -0500
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.26,1.27
Message-ID: <200602110314.k1B3EPJn030538@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mag.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-mag.spec	10 Feb 2006 03:10:29 -0000	1.26
+++ gnome-mag.spec	11 Feb 2006 03:14:23 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.3
-Release: 2
+Release: 2.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -70,6 +70,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.12.3-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 0.12.3-2
 - Make it build
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:33 -0500
Subject: rpms/gnome-media/devel gnome-media.spec,1.58,1.59
Message-ID: <200602110314.k1B3EXwY030591@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-media.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-media.spec	7 Feb 2006 11:52:40 -0000	1.58
+++ gnome-media.spec	11 Feb 2006 03:14:31 -0000	1.59
@@ -11,7 +11,7 @@
 Summary:        GNOME media programs.
 Name:           gnome-media
 Version:        2.13.91
-Release:        2.1
+Release:        2.2
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.91-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.91-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:43 -0500
Subject: rpms/gnome-menus/devel gnome-menus.spec,1.26,1.27
Message-ID: <200602110314.k1B3EhPN030645@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-menus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-menus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-menus.spec	7 Feb 2006 11:52:51 -0000	1.26
+++ gnome-menus.spec	11 Feb 2006 03:14:41 -0000	1.27
@@ -7,7 +7,7 @@
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
 Version: 2.13.5
-Release: 5.1
+Release: 5.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
@@ -91,6 +91,9 @@
 %{_bindir}/gnome-menu-spec-test
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:14:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:14:52 -0500
Subject: rpms/gnome-mime-data/devel gnome-mime-data.spec,1.16,1.17
Message-ID: <200602110314.k1B3EqLN030700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-mime-data/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30687

Modified Files:
	gnome-mime-data.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-mime-data.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mime-data/devel/gnome-mime-data.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-mime-data.spec	7 Feb 2006 11:53:11 -0000	1.16
+++ gnome-mime-data.spec	11 Feb 2006 03:14:50 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: MIME type data files for GNOME desktop
 Name: gnome-mime-data
 Version: 2.4.2
-Release: 1.2
+Release: 1.2.1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -61,6 +61,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:02 -0500
Subject: rpms/gnome-netstatus/devel gnome-netstatus.spec,1.27,1.28
Message-ID: <200602110315.k1B3F2O4030765@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-netstatus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-netstatus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-netstatus/devel/gnome-netstatus.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-netstatus.spec	7 Feb 2006 11:53:34 -0000	1.27
+++ gnome-netstatus.spec	11 Feb 2006 03:14:59 -0000	1.28
@@ -7,7 +7,7 @@
 Summary: Network status applet
 Name: gnome-netstatus
 Version: 2.12.0
-Release: 3.2
+Release: 3.2.1
 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
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:12 -0500
Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.7,1.8
Message-ID: <200602110315.k1B3FC76030820@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-nettool.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-nettool.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-nettool.spec	7 Feb 2006 11:53:46 -0000	1.7
+++ gnome-nettool.spec	11 Feb 2006 03:15:09 -0000	1.8
@@ -6,7 +6,7 @@
 Summary: A GNOME interface for various networking tools
 Name: gnome-nettool
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -58,6 +58,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:24 -0500
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.108,1.109
Message-ID: <200602110315.k1B3FO7W030876@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-panel.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- gnome-panel.spec	7 Feb 2006 11:53:56 -0000	1.108
+++ gnome-panel.spec	11 Feb 2006 03:15:22 -0000	1.109
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.90
-Release: 1.1
+Release: 1.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
@@ -194,6 +194,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:37 -0500
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.33,1.34
Message-ID: <200602110315.k1B3Fbif031934@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-pilot.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-pilot.spec	7 Feb 2006 11:54:07 -0000	1.33
+++ gnome-pilot.spec	11 Feb 2006 03:15:35 -0000	1.34
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.2
+Release: 7.fc5.2.1
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -148,6 +148,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-7.fc5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-7.fc5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:48 -0500
Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits.spec, 1.15,
	1.16
Message-ID: <200602110315.k1B3FmHV001276@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-pilot-conduits/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv830

Modified Files:
	gnome-pilot-conduits.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-pilot-conduits.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-pilot-conduits.spec	7 Feb 2006 11:54:18 -0000	1.15
+++ gnome-pilot-conduits.spec	11 Feb 2006 03:15:46 -0000	1.16
@@ -5,7 +5,7 @@
 Summary: Additional conduits for gnome-pilot
 Name: gnome-pilot-conduits
 Version: 2.0.13
-Release: 3.FC5.1
+Release: 3.FC5.2
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
@@ -63,6 +63,9 @@
 %{_libdir}/gnome-pilot/conduits/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-3.FC5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-3.FC5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:15:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:15:58 -0500
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.20,1.21
Message-ID: <200602110315.k1B3Fw5T003134@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2617

Modified Files:
	gnome-power-manager.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-power-manager.spec	7 Feb 2006 19:28:50 -0000	1.20
+++ gnome-power-manager.spec	11 Feb 2006 03:15:56 -0000	1.21
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5.0.20060207
-Release: 1
+Release: 1.1
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -79,6 +79,9 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5.0.20060207-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Ray Strode <rstrode at redhat.com> - 2.13.5.0.20060207-1
 - pull cvs snapshot from HEAD and drop the patches caillon
   just added



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:16:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:16:12 -0500
Subject: rpms/gnome-print/devel gnome-print.spec,1.22,1.23
Message-ID: <200602110316.k1B3GCI8005674@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-print.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-print/devel/gnome-print.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-print.spec	7 Feb 2006 11:54:39 -0000	1.22
+++ gnome-print.spec	11 Feb 2006 03:16:10 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Printing libraries for GNOME.
 Name: gnome-print
 Version: 0.37
-Release: 12.2
+Release: 12.2.1
 Epoch: 1
 License: LGPL
 Group: System Environment/Base
@@ -177,6 +177,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.37-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.37-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:16:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:16:33 -0500
Subject: rpms/gnome-python2/devel gnome-python.spec,1.34,1.35
Message-ID: <200602110316.k1B3GXkd009369@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-python.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-python.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-python.spec	7 Feb 2006 11:54:50 -0000	1.34
+++ gnome-python.spec	11 Feb 2006 03:16:31 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: The sources for the PyGNOME Python extension module.
 Name: gnome-python2
 Version: 2.12.3
-Release: 1.1 
+Release: 1.2 
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:16:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:16:47 -0500
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec,1.1,1.2
Message-ID: <200602110316.k1B3GlUZ011255@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11241

Modified Files:
	gnome-python-desktop.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-python-desktop.spec	6 Feb 2006 21:28:17 -0000	1.1
+++ gnome-python-desktop.spec	11 Feb 2006 03:16:45 -0000	1.2
@@ -14,7 +14,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.13.3
-Release: 1
+Release: 1.1
 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
@@ -211,6 +211,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 John (J5) Palmieri <johnp at redhat.com> - 2.13.3-1
 - Initial build.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:03 -0500
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.42,1.43
Message-ID: <200602110317.k1B3H3Zf011314@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11300

Modified Files:
	gnome-python-extras.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-python-extras.spec	7 Feb 2006 11:55:00 -0000	1.42
+++ gnome-python-extras.spec	11 Feb 2006 03:17:01 -0000	1.43
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.13.3
-Release: 3.1 
+Release: 3.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
@@ -124,6 +124,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:13 -0500
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.53,1.54
Message-ID: <200602110317.k1B3HDak011369@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-screensaver.spec	10 Feb 2006 20:48:30 -0000	1.53
+++ gnome-screensaver.spec	11 Feb 2006 03:17:10 -0000	1.54
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 3
+Release: 3.1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -148,6 +148,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-3.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-3
 - take some more measures to cut cpu usage down
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:23 -0500
Subject: rpms/gnome-session/devel gnome-session.spec,1.53,1.54
Message-ID: <200602110317.k1B3HNUc011424@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-session.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnome-session.spec	7 Feb 2006 11:55:28 -0000	1.53
+++ gnome-session.spec	11 Feb 2006 03:17:20 -0000	1.54
@@ -13,7 +13,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -152,6 +152,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:31 -0500
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.19,1.20
Message-ID: <200602110317.k1B3HVn4011479@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-speech.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-speech.spec	7 Feb 2006 11:55:41 -0000	1.19
+++ gnome-speech.spec	11 Feb 2006 03:17:29 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.3.9
-Release: 1.2
+Release: 1.2.1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:39 -0500
Subject: rpms/gnome-spell/devel gnome-spell.spec,1.18,1.19
Message-ID: <200602110317.k1B3HdYw011534@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-spell.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-spell.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-spell.spec	7 Feb 2006 11:55:51 -0000	1.18
+++ gnome-spell.spec	11 Feb 2006 03:17:36 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Bonobo component for spell checking
 Name: gnome-spell
 Version: 1.0.5
-Release: 13.1
+Release: 13.2
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2
 Patch0: gnome-spell-1.0.2-pspell-compat.patch
 Patch1: gnome-spell-1.0.2-langlist.patch
@@ -66,6 +66,9 @@
 %{_datadir}/idl/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-13.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-13.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:47 -0500
Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.41,
	1.42
Message-ID: <200602110317.k1B3HlAZ011589@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11576

Modified Files:
	gnome-system-monitor.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnome-system-monitor.spec	7 Feb 2006 11:56:02 -0000	1.41
+++ gnome-system-monitor.spec	11 Feb 2006 03:17:44 -0000	1.42
@@ -11,7 +11,7 @@
 Summary: Simple process monitor
 Name: gnome-system-monitor
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_datadir}/omf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:17:57 -0500
Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.32,1.33
Message-ID: <200602110317.k1B3HvaW011645@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-terminal.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-terminal.spec	9 Feb 2006 05:11:51 -0000	1.32
+++ gnome-terminal.spec	11 Feb 2006 03:17:55 -0000	1.33
@@ -13,7 +13,7 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.13.90
-Release: 2
+Release: 2.1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
@@ -107,6 +107,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
 - Re-add "Open Link" menuitems
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:07 -0500
Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.8,1.9
Message-ID: <200602110318.k1B3I7aX011700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-user-share/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11686

Modified Files:
	gnome-user-share.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-user-share.spec	7 Feb 2006 11:56:23 -0000	1.8
+++ gnome-user-share.spec	11 Feb 2006 03:18:04 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 0.9
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -59,6 +59,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:16 -0500
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.89,1.90
Message-ID: <200602110318.k1B3IGFN011755@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gnome-utils.spec	7 Feb 2006 11:56:35 -0000	1.89
+++ gnome-utils.spec	11 Feb 2006 03:18:13 -0000	1.90
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.91
-Release: 2.1
+Release: 2.2
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -214,6 +214,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:26 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.94,1.95
Message-ID: <200602110318.k1B3IQuC011809@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-vfs2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-vfs2.spec	7 Feb 2006 11:56:48 -0000	1.94
+++ gnome-vfs2.spec	11 Feb 2006 03:18:24 -0000	1.95
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.4
-Release: 7.1
+Release: 7.2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -182,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:36 -0500
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.32,
	1.33
Message-ID: <200602110318.k1B3IavQ011865@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11852

Modified Files:
	gnome-volume-manager.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gnome-volume-manager.spec	7 Feb 2006 11:56:59 -0000	1.32
+++ gnome-volume-manager.spec	11 Feb 2006 03:18:33 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.11
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.11-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.11-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:44 -0500
Subject: rpms/gnopernicus/devel gnopernicus.spec,1.38,1.39
Message-ID: <200602110318.k1B3IiAJ011921@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11907

Modified Files:
	gnopernicus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnopernicus.spec	7 Feb 2006 11:57:09 -0000	1.38
+++ gnopernicus.spec	11 Feb 2006 03:18:42 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:18:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:18:53 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.23,1.24
Message-ID: <200602110318.k1B3IrRq011975@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11962

Modified Files:
	gnucash.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnucash.spec	7 Feb 2006 11:57:21 -0000	1.23
+++ gnucash.spec	11 Feb 2006 03:18:50 -0000	1.24
@@ -3,7 +3,7 @@
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
 Version: 1.8.12
-Release: 2.1
+Release: 2.2
 License: GPL/GFDL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz
@@ -106,6 +106,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.12-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.12-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:19:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:19:04 -0500
Subject: rpms/gnupg/devel gnupg.spec,1.40,1.41
Message-ID: <200602110319.k1B3J45l012030@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnupg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12017

Modified Files:
	gnupg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnupg.spec
===================================================================
RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnupg.spec	7 Feb 2006 11:57:46 -0000	1.40
+++ gnupg.spec	11 Feb 2006 03:19:02 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage.
 Name: gnupg
 Version: 1.4.2
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -102,6 +102,9 @@
 %{_mandir}/man7/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.2-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.2-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:19:21 -0500
Subject: rpms/gnuplot/devel gnuplot.spec,1.24,1.25
Message-ID: <200602110319.k1B3JLQs012085@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnuplot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12072

Modified Files:
	gnuplot.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnuplot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnuplot.spec	7 Feb 2006 11:57:58 -0000	1.24
+++ gnuplot.spec	11 Feb 2006 03:19:18 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A program for plotting mathematical expressions and data.
 Name: gnuplot
 Version: 4.0.0
-Release: 10.2
+Release: 10.2.1
 License: Redistributable, with restrictions
 Group: Applications/Engineering
 Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-10.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0-10.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:19:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:19:31 -0500
Subject: rpms/gnutls/devel gnutls.spec,1.17,1.18
Message-ID: <200602110319.k1B3JVIg012140@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12127

Modified Files:
	gnutls.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnutls.spec	7 Feb 2006 11:58:23 -0000	1.17
+++ gnutls.spec	11 Feb 2006 03:19:29 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
 Version: 1.2.9
-Release: 3.1
+Release: 3.2
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel >= 1.2.2
@@ -114,6 +114,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:19:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:19:40 -0500
Subject: rpms/gob2/devel gob2.spec,1.9,1.10
Message-ID: <200602110319.k1B3JeXo012195@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gob2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12182

Modified Files:
	gob2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gob2.spec
===================================================================
RCS file: /cvs/dist/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gob2.spec	7 Feb 2006 11:58:39 -0000	1.9
+++ gob2.spec	11 Feb 2006 03:19:38 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: GOB2, The GObject Builder
 Name: gob2
 Version: 2.0.12
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Development/Tools
 Source: gob2-%{version}.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.12-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.12-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:19:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:19:50 -0500
Subject: rpms/gok/devel gok.spec,1.27,1.28
Message-ID: <200602110319.k1B3JoKl012258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12245

Modified Files:
	gok.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gok.spec	7 Feb 2006 11:58:49 -0000	1.27
+++ gok.spec	11 Feb 2006 03:19:47 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 1.0.5
-Release: 6.2
+Release: 6.2.1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
@@ -106,6 +106,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:20:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:20:16 -0500
Subject: rpms/gperf/devel gperf.spec,1.18,1.19
Message-ID: <200602110320.k1B3KGkn012316@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gperf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12303

Modified Files:
	gperf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gperf.spec
===================================================================
RCS file: /cvs/dist/rpms/gperf/devel/gperf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gperf.spec	7 Feb 2006 11:59:11 -0000	1.18
+++ gperf.spec	11 Feb 2006 03:20:13 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A perfect hash function generator.
 Name: gperf
 Version: 3.0.1
-Release: 7.2
+Release: 7.2.1
 License: GPL
 Source: ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
 Patch0: gperf-3.0.1-gcc4.patch
@@ -51,6 +51,9 @@
 %{_infodir}/gperf.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:20:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:20:27 -0500
Subject: rpms/gphoto2/devel gphoto2.spec,1.53,1.54
Message-ID: <200602110320.k1B3KRCf012373@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gphoto2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12358

Modified Files:
	gphoto2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gphoto2.spec
===================================================================
RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gphoto2.spec	7 Feb 2006 11:59:22 -0000	1.53
+++ gphoto2.spec	11 Feb 2006 03:20:24 -0000	1.54
@@ -5,7 +5,7 @@
 %define libpkg libgphoto2
 %define libver 2.1.99
 Version: %{pkgver}
-Release: 5.1
+Release: 5.2
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -212,6 +212,9 @@
 # ChangeLog
 ########################################################################
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.99-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.99-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:20:39 -0500
Subject: rpms/gpm/devel gpm.spec,1.38,1.39
Message-ID: <200602110320.k1B3Kd68012428@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12415

Modified Files:
	gpm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gpm.spec
===================================================================
RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gpm.spec	7 Feb 2006 11:59:34 -0000	1.38
+++ gpm.spec	11 Feb 2006 03:20:37 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.20.1
-Release: 73.1
+Release: 73.2
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
@@ -178,6 +178,9 @@
 %{_libdir}/libgpm.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.20.1-73.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.20.1-73.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:20:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:20:48 -0500
Subject: rpms/grep/devel grep.spec,1.58,1.59
Message-ID: <200602110320.k1B3Km0V012483@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12470

Modified Files:
	grep.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- grep.spec	7 Feb 2006 11:59:44 -0000	1.58
+++ grep.spec	11 Feb 2006 03:20:45 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 52.1
+Release: 52.2
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -94,6 +94,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-52.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-52.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:20:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:20:56 -0500
Subject: rpms/groff/devel groff.spec,1.35,1.36
Message-ID: <200602110320.k1B3KuXi012538@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/groff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12525

Modified Files:
	groff.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: groff.spec
===================================================================
RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- groff.spec	7 Feb 2006 11:59:56 -0000	1.35
+++ groff.spec	11 Feb 2006 03:20:54 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18.1.1
-Release: 9.1
+Release: 9.2
 License: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -210,6 +210,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1.1-9.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1.1-9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:21:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:21:05 -0500
Subject: rpms/gsl/devel gsl.spec,1.19,1.20
Message-ID: <200602110321.k1B3L5US012594@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gsl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12580

Modified Files:
	gsl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gsl.spec
===================================================================
RCS file: /cvs/dist/rpms/gsl/devel/gsl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gsl.spec	7 Feb 2006 12:04:45 -0000	1.19
+++ gsl.spec	11 Feb 2006 03:21:03 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The GNU Scientific Library for numerical analysis.
 Name: gsl
 Version: 1.7
-Release: 1.2
+Release: 1.2.1
 URL: http://sources.redhat.com/gsl/
 Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
@@ -79,6 +79,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:21:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:21:26 -0500
Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.7,1.8
Message-ID: <200602110321.k1B3LQMa012648@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gstreamer08-plugins/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12635

Modified Files:
	gstreamer08-plugins.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gstreamer08-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gstreamer08-plugins.spec	7 Feb 2006 12:06:28 -0000	1.7
+++ gstreamer08-plugins.spec	11 Feb 2006 03:21:24 -0000	1.8
@@ -8,7 +8,7 @@
 
 Name:           %{gstreamer}-plugins
 Version:        0.8.11
-Release:        6.1
+Release:        6.2
 Summary:        GStreamer Streaming media framework plug-ins
 
 Group:          Applications/Multimedia
@@ -317,6 +317,9 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.11-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.11-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:21:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:21:35 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.31,1.32
Message-ID: <200602110321.k1B3LZkF012703@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12690

Modified Files:
	gthumb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gthumb.spec	7 Feb 2006 12:07:29 -0000	1.31
+++ gthumb.spec	11 Feb 2006 03:21:33 -0000	1.32
@@ -9,7 +9,7 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.7.2
-Release: 2.1
+Release: 2.2
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -92,6 +92,9 @@
 %{_datadir}/pixmaps
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.2-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:21:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:21:46 -0500
Subject: rpms/gtk+/devel gtk+.spec,1.52,1.53
Message-ID: <200602110321.k1B3LkxE012758@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk+/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12745

Modified Files:
	gtk+.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtk+.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk+/devel/gtk+.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- gtk+.spec	7 Feb 2006 12:07:43 -0000	1.52
+++ gtk+.spec	11 Feb 2006 03:21:44 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk+
 Version: 1.2.10
-Release: 49.2
+Release: 49.2.1
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -214,6 +214,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-49.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-49.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:21:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:21:56 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.120,1.121
Message-ID: <200602110321.k1B3LuTa012814@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gtk2.spec	8 Feb 2006 18:45:46 -0000	1.120
+++ gtk2.spec	11 Feb 2006 03:21:53 -0000	1.121
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 7
+Release: 7.1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -267,6 +267,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.11-7.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.8.11-7
 - Fix a double free in the file chooser
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:09 -0500
Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.34,1.35
Message-ID: <200602110322.k1B3M9Bj012871@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gtk2-engines.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gtk2-engines.spec	7 Feb 2006 12:08:30 -0000	1.34
+++ gtk2-engines.spec	11 Feb 2006 03:22:07 -0000	1.35
@@ -1,7 +1,7 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	1.1
+Release:	1.2
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
@@ -60,6 +60,9 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:17 -0500
Subject: rpms/gtk-engines/devel gtk-engines.spec,1.21,1.22
Message-ID: <200602110322.k1B3MHnc012927@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtk-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12913

Modified Files:
	gtk-engines.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtk-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-engines/devel/gtk-engines.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-engines.spec	7 Feb 2006 12:09:02 -0000	1.21
+++ gtk-engines.spec	11 Feb 2006 03:22:15 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Theme engines for GTK+.
 Name: gtk-engines
 Version: 0.12
-Release: 7.2
+Release: 7.2.1
 Epoch: 1
 License: GPL
 Group: System Environment/Libraries
@@ -127,6 +127,9 @@
 %{_datadir}/themes/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:29 -0500
Subject: rpms/gtkhtml/devel gtkhtml.spec,1.21,1.22
Message-ID: <200602110322.k1B3MTRr012981@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12968

Modified Files:
	gtkhtml.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtkhtml.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml/devel/gtkhtml.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtkhtml.spec	7 Feb 2006 12:09:15 -0000	1.21
+++ gtkhtml.spec	11 Feb 2006 03:22:26 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: gtkhtml library
 Name: gtkhtml
 Version: 1.1.9
-Release: 11.2
+Release: 11.2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -134,6 +134,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.9-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.9-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:38 -0500
Subject: rpms/gtkhtml2/devel gtkhtml2.spec,1.15,1.16
Message-ID: <200602110322.k1B3Mc5m013037@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13023

Modified Files:
	gtkhtml2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtkhtml2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml2/devel/gtkhtml2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtkhtml2.spec	7 Feb 2006 12:09:26 -0000	1.15
+++ gtkhtml2.spec	11 Feb 2006 03:22:35 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: An HTML widget for GTK+ 2.0
 Name: gtkhtml2
 Version: 2.6.3
-Release: 1.2
+Release: 1.2.1
 Source0: libgtkhtml-%{version}.tar.bz2
 License: LGPL
 Group: System Environment/Libraries
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:46 -0500
Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.54,1.55
Message-ID: <200602110322.k1B3Mkoe013091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13078

Modified Files:
	gtkhtml3.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gtkhtml3.spec	7 Feb 2006 12:09:35 -0000	1.54
+++ gtkhtml3.spec	11 Feb 2006 03:22:44 -0000	1.55
@@ -5,7 +5,7 @@
 Summary: gtkhtml library
 Name: gtkhtml3
 Version: 3.9.90
-Release: 3.1
+Release: 3.2
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -100,6 +100,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.9.90-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.9.90-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:22:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:22:55 -0500
Subject: rpms/gtksourceview/devel gtksourceview.spec,1.27,1.28
Message-ID: <200602110322.k1B3Mtxh013146@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtksourceview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13133

Modified Files:
	gtksourceview.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtksourceview.spec
===================================================================
RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gtksourceview.spec	7 Feb 2006 12:10:10 -0000	1.27
+++ gtksourceview.spec	11 Feb 2006 03:22:52 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.5.7
-Release: 2.1 
+Release: 2.2 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -71,6 +71,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.7-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.7-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:23:04 -0500
Subject: rpms/gtkspell/devel gtkspell.spec,1.14,1.15
Message-ID: <200602110323.k1B3N4Fm013201@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gtkspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13188

Modified Files:
	gtkspell.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gtkspell.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gtkspell.spec	7 Feb 2006 12:10:30 -0000	1.14
+++ gtkspell.spec	11 Feb 2006 03:23:02 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: GtkSpell provides on-the-fly spell checking for GtkTextView widgets.
 Name: gtkspell
 Version: 2.0.11
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://gtkspell.sourceforge.net/
@@ -62,6 +62,9 @@
 %{_includedir}/gtkspell-2.0
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.11-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.11-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:23:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:23:12 -0500
Subject: rpms/guile/devel guile.spec,1.34,1.35
Message-ID: <200602110323.k1B3NCku013257@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/guile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13243

Modified Files:
	guile.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: guile.spec
===================================================================
RCS file: /cvs/dist/rpms/guile/devel/guile.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- guile.spec	7 Feb 2006 12:10:45 -0000	1.34
+++ guile.spec	11 Feb 2006 03:23:10 -0000	1.35
@@ -4,7 +4,7 @@
 Summary: A GNU implementation of Scheme for application extensibility.
 Name: guile
 Version: 1.6.7
-Release: 5.1
+Release: 5.2
 Source: ftp://ftp.gnu.org/gnu/guile-%{version}.tar.gz
 Source2: http://ai.king.net.pl/guile-1.6-missing-tools.tar.gz
 Patch1: guile-1.6.7-rpath.patch
@@ -177,6 +177,9 @@
 %{_includedir}/libguile.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5:1.6.7-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:1.6.7-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:23:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:23:23 -0500
Subject: rpms/gulm/devel gulm.spec,1.24,1.25
Message-ID: <200602110323.k1B3NNw1013311@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gulm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13298

Modified Files:
	gulm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gulm.spec
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gulm.spec	7 Feb 2006 12:10:57 -0000	1.24
+++ gulm.spec	11 Feb 2006 03:23:19 -0000	1.25
@@ -12,7 +12,7 @@
 
 Name: gulm
 Version: 1.0.5
-Release: 0.FC5.1.1
+Release: 0.FC5.1.2
 License: GPL
 Group: System Environment/Daemons
 Summary: gulm - One possible lock manager for GFS
@@ -84,6 +84,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-0.FC5.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-0.FC5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:23:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:23:49 -0500
Subject: rpms/Guppi/devel Guppi.spec,1.21,1.22
Message-ID: <200602110323.k1B3Nnmv013377@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Guppi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13363

Modified Files:
	Guppi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: Guppi.spec
===================================================================
RCS file: /cvs/dist/rpms/Guppi/devel/Guppi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Guppi.spec	7 Feb 2006 12:11:07 -0000	1.21
+++ Guppi.spec	11 Feb 2006 03:23:46 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: GNOME Data Analysis and Visualization.
 Name: Guppi
 Version: 0.40.3
-Release: 24.2
+Release: 24.2.1
 License: GPL
 Group: Applications/Engineering
 Source: ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/libguppi.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.40.3-24.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.40.3-24.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:23:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:23:58 -0500
Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.8,1.9
Message-ID: <200602110323.k1B3NwKU013432@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gwenhywfar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13418

Modified Files:
	gwenhywfar.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gwenhywfar.spec
===================================================================
RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gwenhywfar.spec	7 Feb 2006 12:11:17 -0000	1.8
+++ gwenhywfar.spec	11 Feb 2006 03:23:56 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A multi-platform helper library for other libraries
 Name: gwenhywfar
 Version: 1.99.2
-Release: 1.1
+Release: 1.2
 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz
 Patch: gwenhywfar-aclocal.patch
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_datadir}/aclocal/gwenhywfar.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.99.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.99.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:24:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:24:08 -0500
Subject: rpms/g-wrap/devel g-wrap.spec,1.17,1.18
Message-ID: <200602110324.k1B3O838013507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13494

Modified Files:
	g-wrap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- g-wrap.spec	7 Feb 2006 12:11:29 -0000	1.17
+++ g-wrap.spec	11 Feb 2006 03:24:05 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.3.4
-Release: 9.2
+Release: 9.2.1
 Group: Development/Libraries
 License: GPL
 Requires: guile
@@ -95,6 +95,9 @@
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.4-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.4-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:24:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:24:18 -0500
Subject: rpms/gzip/devel gzip.spec,1.23,1.24
Message-ID: <200602110324.k1B3OI7m020783@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/gzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17622

Modified Files:
	gzip.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: gzip.spec
===================================================================
RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gzip.spec	7 Feb 2006 12:11:41 -0000	1.23
+++ gzip.spec	11 Feb 2006 03:24:15 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program.
 Name: gzip
 Version: 1.3.5
-Release: 6.2
+Release: 6.2.1
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:24:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:24:31 -0500
Subject: rpms/h2ps/devel h2ps.spec,1.12,1.13
Message-ID: <200602110324.k1B3OVUX021692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/h2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21662

Modified Files:
	h2ps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: h2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/h2ps/devel/h2ps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- h2ps.spec	7 Feb 2006 12:11:54 -0000	1.12
+++ h2ps.spec	11 Feb 2006 03:24:28 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Korean Hangul coverter from text file to postscript
 Name:		h2ps
 Version:	2.06
-Release: 14.2
+Release: 14.2.1
 License:	Distributable
 Group:		Applications/Text
 Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %attr(755,root,root)/usr/bin/h2ps
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.06-14.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.06-14.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:24:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:24:44 -0500
Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.23,1.24
Message-ID: <200602110324.k1B3OiJL021835@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	hal-cups-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hal-cups-utils.spec	7 Feb 2006 12:12:16 -0000	1.23
+++ hal-cups-utils.spec	11 Feb 2006 03:24:41 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.5.5
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -70,6 +70,9 @@
 %{_sysconfdir}/rc.d/init.d/cups-config-daemon
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:24:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:24:56 -0500
Subject: rpms/hardlink/devel hardlink.spec,1.20,1.21
Message-ID: <200602110324.k1B3OuQ2021986@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hardlink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21957

Modified Files:
	hardlink.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hardlink.spec
===================================================================
RCS file: /cvs/dist/rpms/hardlink/devel/hardlink.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hardlink.spec	7 Feb 2006 12:12:27 -0000	1.20
+++ hardlink.spec	11 Feb 2006 03:24:53 -0000	1.21
@@ -1,7 +1,7 @@
 Summary:	Create a tree of hardlinks
 Name:		hardlink
 Version:	1.0
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -35,7 +35,10 @@
 %{_mandir}/man1/hardlink.1*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release: :.1 1.19.1
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-1.20.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0-1.19.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:25:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:25:08 -0500
Subject: rpms/hdparm/devel hdparm.spec,1.25,1.26
Message-ID: <200602110325.k1B3P8K6022112@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22081

Modified Files:
	hdparm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hdparm.spec
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hdparm.spec	7 Feb 2006 12:12:38 -0000	1.25
+++ hdparm.spec	11 Feb 2006 03:25:05 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A utility for displaying and/or setting hard disk parameters.
 Name: hdparm
 Version: 6.3
-Release: 2.1
+Release: 2.2
 License: BSD
 Group: Applications/System
 URL:    http://sourceforge.net/projects/hdparm/
@@ -46,6 +46,9 @@
 %{_mandir}/man8/hdparm.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:25:25 -0500
Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.41,1.42
Message-ID: <200602110325.k1B3PP2r022293@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/HelixPlayer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22262

Modified Files:
	HelixPlayer.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: HelixPlayer.spec
===================================================================
RCS file: /cvs/dist/rpms/HelixPlayer/devel/HelixPlayer.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- HelixPlayer.spec	7 Feb 2006 12:12:48 -0000	1.41
+++ HelixPlayer.spec	11 Feb 2006 03:25:21 -0000	1.42
@@ -4,7 +4,7 @@
 Name: HelixPlayer
 Version: 1.0.6
 Epoch: 1
-Release: 1.2
+Release: 1.2.1
 Group: Applications/Multimedia
 License: RPSL, GPL
 URL: https://player.helixcommunity.org/
@@ -168,6 +168,9 @@
 %{_datadir}/application-registry/hxplay.applications
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:26:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:26:27 -0500
Subject: rpms/hesiod/devel hesiod.spec,1.12,1.13
Message-ID: <200602110326.k1B3QRmY022808@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hesiod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22771

Modified Files:
	hesiod.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hesiod.spec
===================================================================
RCS file: /cvs/dist/rpms/hesiod/devel/hesiod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hesiod.spec	7 Feb 2006 12:13:02 -0000	1.12
+++ hesiod.spec	11 Feb 2006 03:26:25 -0000	1.13
@@ -1,6 +1,6 @@
 Name: hesiod
 Version: 3.0.2
-Release: 31.2
+Release: 31.2.1
 Source: ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-%{version}.tar.gz
 Patch0: hesiod-3.0.2-shlib.patch
 Patch1: hesiod-3.0.2-env.patch
@@ -33,6 +33,9 @@
 the header files and libraries required for building programs which use Hesiod.
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-31.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.2-31.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:26:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:26:42 -0500
Subject: rpms/hexedit/devel hexedit.spec,1.19,1.20
Message-ID: <200602110326.k1B3Qg8d022962@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hexedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22931

Modified Files:
	hexedit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hexedit.spec
===================================================================
RCS file: /cvs/dist/rpms/hexedit/devel/hexedit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- hexedit.spec	7 Feb 2006 12:13:13 -0000	1.19
+++ hexedit.spec	11 Feb 2006 03:26:39 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A hexadecimal file viewer and editor.
 Name: hexedit
 Version: 1.2.12
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Editors
 Url: http://merd.net/pixel
@@ -39,6 +39,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.12-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.12-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:26:53 -0500
Subject: rpms/hfsutils/devel hfsutils.spec,1.9,1.10
Message-ID: <200602110326.k1B3QrAr023091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23066

Modified Files:
	hfsutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/hfsutils/devel/hfsutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hfsutils.spec	7 Feb 2006 12:13:23 -0000	1.9
+++ hfsutils.spec	11 Feb 2006 03:26:50 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Tools for reading and writing Macintosh HFS volumes.
 Name: hfsutils
 Version: 3.2.6  
-Release: 7.2
+Release: 7.2.1
 Group: Applications/File
 License: GPL
 Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz 
@@ -120,6 +120,9 @@
 %{_includedir}/rsrc.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:27:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:27:03 -0500
Subject: rpms/hplip/devel hplip.spec,1.45,1.46
Message-ID: <200602110327.k1B3R3w1023221@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23191

Modified Files:
	hplip.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- hplip.spec	7 Feb 2006 10:52:25 -0000	1.45
+++ hplip.spec	11 Feb 2006 03:27:00 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.8
-Release: 3
+Release: 3.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -156,6 +156,9 @@
 fi
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):0.9.8-3.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-3
 - Patchlevel 3.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:27:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:27:19 -0500
Subject: rpms/hsqldb/devel hsqldb.spec,1.13,1.14
Message-ID: <200602110327.k1B3RJuT023381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hsqldb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23343

Modified Files:
	hsqldb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: hsqldb.spec
===================================================================
RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hsqldb.spec	7 Feb 2006 12:13:39 -0000	1.13
+++ hsqldb.spec	11 Feb 2006 03:27:15 -0000	1.14
@@ -3,7 +3,7 @@
 %define name		hsqldb
 %define version		1.80.1
 %define cvs_version	1_8_0_1
-%define release 	1jpp_6fc
+%define release 	1jpp_7fc
 
 Name:		%{name}
 Version:	%{version}
@@ -208,6 +208,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_7fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.80.1-1jpp_6fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:27:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:27:31 -0500
Subject: rpms/htdig/devel htdig.spec,1.26,1.27
Message-ID: <200602110327.k1B3RVqN023523@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/htdig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23491

Modified Files:
	htdig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: htdig.spec
===================================================================
RCS file: /cvs/dist/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- htdig.spec	9 Feb 2006 17:48:28 -0000	1.26
+++ htdig.spec	11 Feb 2006 03:27:27 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0b6
-Release: 6.4.2
+Release: 6.4.2.1
 Epoch: 3
 License: GPL
 Group: Applications/Internet
@@ -142,6 +142,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3:3.2.0b6-6.4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Jitka Kudrnacova <jkudrnac at redhat.com> - 3:3.2.0b6-6.4.2
 - fixed building in rawhide (#176894)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:27:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:27:43 -0500
Subject: rpms/httpd/devel httpd.spec,1.86,1.87
Message-ID: <200602110327.k1B3RhRp023659@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	httpd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- httpd.spec	7 Feb 2006 12:14:22 -0000	1.86
+++ httpd.spec	11 Feb 2006 03:27:40 -0000	1.87
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 5.1.1
+Release: 5.1.2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -491,6 +491,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.0-5.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - (none):2.2.0-5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:28:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:28:01 -0500
Subject: rpms/icon-slicer/devel icon-slicer.spec,1.8,1.9
Message-ID: <200602110328.k1B3S1eb023843@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icon-slicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23813

Modified Files:
	icon-slicer.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: icon-slicer.spec
===================================================================
RCS file: /cvs/dist/rpms/icon-slicer/devel/icon-slicer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- icon-slicer.spec	7 Feb 2006 12:14:35 -0000	1.8
+++ icon-slicer.spec	11 Feb 2006 03:27:58 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Utility for icon theme generation
 Name: icon-slicer
 Version: 0.3
-Release: 7.2
+Release: 7.2.1
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
@@ -37,6 +37,9 @@
 %{_bindir}/icon-slicer
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:28:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:28:17 -0500
Subject: rpms/icu/devel icu.spec,1.12,1.13
Message-ID: <200602110328.k1B3SHXm023999@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23968

Modified Files:
	icu.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- icu.spec	7 Feb 2006 12:14:46 -0000	1.12
+++ icu.spec	11 Feb 2006 03:28:13 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           icu
 Version:        3.4
-Release: 	6.1
+Release: 	6.2
 Summary:        International Components for Unicode
 
 Group:          System Environment/Libraries
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.4-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:28:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:28:32 -0500
Subject: rpms/iddev/devel iddev.spec,1.12,1.13
Message-ID: <200602110328.k1B3SWvF024159@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iddev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24130

Modified Files:
	iddev.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iddev.spec
===================================================================
RCS file: /cvs/dist/rpms/iddev/devel/iddev.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- iddev.spec	7 Feb 2006 12:14:59 -0000	1.12
+++ iddev.spec	11 Feb 2006 03:28:29 -0000	1.13
@@ -12,7 +12,7 @@
 
 Name: iddev
 Version: 2.0.0
-Release: 4.FC5.2
+Release: 4.FC5.2.1
 License: GPL
 Group: System Environment/Libraries
 Summary: iddev is a library that identifies device contents.
@@ -58,6 +58,9 @@
 %{_includedir}/iddev.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-4.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.0-4.FC5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:28:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:28:43 -0500
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.53,1.54
Message-ID: <200602110328.k1B3ShmP024294@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24264

Modified Files:
	ImageMagick.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ImageMagick.spec	7 Feb 2006 12:15:13 -0000	1.53
+++ ImageMagick.spec	11 Feb 2006 03:28:40 -0000	1.54
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 4.1
+Release: 4.2
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -225,6 +225,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.2.5.4-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.2.5.4-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:28:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:28:55 -0500
Subject: rpms/imake/devel imake.spec,1.16,1.17
Message-ID: <200602110328.k1B3StDS024421@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24402

Modified Files:
	imake.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: imake.spec
===================================================================
RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- imake.spec	7 Feb 2006 12:15:27 -0000	1.16
+++ imake.spec	11 Feb 2006 03:28:53 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -139,6 +139,9 @@
 %{_mandir}/man1/xmkmf.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:29:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:29:46 -0500
Subject: rpms/imlib/devel imlib.spec,1.24,1.25
Message-ID: <200602110329.k1B3Tksj024565@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/imlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24537

Modified Files:
	imlib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: imlib.spec
===================================================================
RCS file: /cvs/dist/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- imlib.spec	7 Feb 2006 12:15:49 -0000	1.24
+++ imlib.spec	11 Feb 2006 03:29:44 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: An image loading and rendering library for X11R6.
 Name: imlib
 Version: 1.9.13
-Release: 26.2
+Release: 26.2.1
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -139,6 +139,9 @@
 %{_datadir}/man/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.9.13-26.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.9.13-26.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:31:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:31:57 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.61,
	1.62 linux-2.6-execshield-xen.patch, 1.3,
	1.4 linux-2.6.14-xen-compile-fixes.patch, 1.2, 1.3
Message-ID: <200602110331.k1B3Vv2r024724@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec linux-2.6-execshield-xen.patch 
	linux-2.6.14-xen-compile-fixes.patch 
Log Message:
more x86_64 xen fixes


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel-xen.spec	10 Feb 2006 19:40:40 -0000	1.61
+++ kernel-xen.spec	11 Feb 2006 03:31:22 -0000	1.62
@@ -250,7 +250,7 @@
 
 # 700 - 799 Xen
 Patch700: linux-2.6-xen-merge.patch
-#Patch701: linux-2.6.14-xen-compile-fixes.patch
+Patch701: linux-2.6.14-xen-compile-fixes.patch
 Patch702: linux-2.6-xen-no-tls-warn.patch
 Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch
 Patch705: linux-2.6.14-xen_net_read_mac_export.patch
@@ -755,7 +755,7 @@
 %if %{includexen}
 # Base Xen patch from linux-2.6-merge.hg
 %patch700 -p1
-#%patch701 -p1
+%patch701 -p1
 %patch702 -p1
 %patch704 -p1
 %patch705 -p1

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                         |   93 ++++++++++++++++++-
 arch/i386/mm/init-xen.c                              |   11 +-
 linux-2.6.14/include/asm-i386/desc.h                 |    5 +
 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c |   23 ----
 7 files changed, 171 insertions(+), 29 deletions(-)

Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield-xen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-execshield-xen.patch	9 Jan 2006 20:42:13 -0000	1.3
+++ linux-2.6-execshield-xen.patch	11 Feb 2006 03:31:22 -0000	1.4
@@ -296,3 +296,44 @@
  
  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);
+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
+ 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; 
+@@ -60,28 +60,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:

linux-2.6.14-xen-compile-fixes.patch:
 apic-xen.c |    9 +++++++++
 1 files changed, 9 insertions(+)

Index: linux-2.6.14-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.14-xen-compile-fixes.patch	11 Jan 2006 19:49:30 -0000	1.2
+++ linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 03:31:22 -0000	1.3
@@ -1,63 +1,19 @@
---- linux-2.6.14/drivers/xen/netback/xenbus.c.~1~	2006-01-09 10:50:45.000000000 -0500
-+++ linux-2.6.14/drivers/xen/netback/xenbus.c	2006-01-09 10:54:58.000000000 -0500
-@@ -129,12 +129,12 @@
- 		return err;
- 	}
- 	else {
--		add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-+		add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
- 			       &length, "script=%s", val);
- 		kfree(val);
- 	}
- 
--	add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+	add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- 		       "vif=%s", netif->dev->name);
- 
- 	envp[i] = NULL;
-@@ -181,7 +181,7 @@
- 			return;
- 		}
- 
--		kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE);
-+		kobject_hotplug(&dev->dev.kobj, KOBJ_ONLINE);
- 
- 		maybe_connect(be);
- 	}
-@@ -214,7 +214,7 @@
- 		break;
- 
- 	case XenbusStateClosed:
--		kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
-+		kobject_hotplug(&dev->dev.kobj, KOBJ_OFFLINE);
- 		device_unregister(&dev->dev);
- 		break;
- 
---- linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c.~1~	2006-01-09 10:50:22.000000000 -0500
-+++ linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c	2006-01-09 10:59:20.000000000 -0500
-@@ -232,7 +232,7 @@
- 	.bus = {
- 		.name  = "xen-backend",
- 		.match = xenbus_match,
--		.uevent = xenbus_uevent_backend,
-+		.hotplug = xenbus_uevent_backend,
- 	},
- 	.dev = {
- 		.bus_id = "xen-backend",
-@@ -257,13 +257,13 @@
- 		return -ENODEV;
- 
- 	/* stuff we want to pass to /sbin/hotplug */
--	add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+	add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- 		       "XENBUS_TYPE=%s", xdev->devicetype);
- 
--	add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+	add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- 		       "XENBUS_PATH=%s", xdev->nodename);
- 
--	add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-+	add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
- 		       "XENBUS_BASE_PATH=%s", xenbus_backend.root);
- 
- 	/* terminate, set to next free slot, shrink available space */
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c
+--- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c	2006-02-10 20:25:27.000000000 +0100
++++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c	2006-02-11 03:11:49.000000000 +0100
+@@ -42,6 +42,15 @@
+ int apic_verbosity;
+ int disable_apic;
+ 
++/*
++ * 'what should we do if we get a hw irq event on an illegal vector'.
++ * each architecture has to answer this themselves.
++ */
++void ack_bad_irq(unsigned int irq)
++{
++	printk("unexpected IRQ trap at vector %02x\n", irq);
++}
++
+ void smp_local_timer_interrupt(struct pt_regs *regs)
+ {
+ 	profile_tick(CPU_PROFILING, regs);



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:33:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:33:14 -0500
Subject: rpms/indent/devel indent.spec,1.20,1.21
Message-ID: <200602110333.k1B3XEiK024799@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/indent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24733

Modified Files:
	indent.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: indent.spec
===================================================================
RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- indent.spec	7 Feb 2006 12:16:05 -0000	1.20
+++ indent.spec	11 Feb 2006 03:32:31 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A GNU program for formatting C code.
 Name: indent
 Version: 2.2.9
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: Applications/Text
 URL: http://www.gnu.org/software/indent/
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.9-12.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:34:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:34:35 -0500
Subject: rpms/initscripts/devel initscripts.spec,1.105,1.106
Message-ID: <200602110334.k1B3YZMh024951@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24930

Modified Files:
	initscripts.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- initscripts.spec	7 Feb 2006 05:16:10 -0000	1.105
+++ initscripts.spec	11 Feb 2006 03:34:23 -0000	1.106
@@ -3,7 +3,7 @@
 Version: 8.26
 License: GPL
 Group: System Environment/Base
-Release: 1
+Release: 1.1
 Source: initscripts-%{version}.tar.bz2
 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/
 Patch0: initscripts-s390.patch
@@ -208,6 +208,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.26-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> 8.26-1
 - revert "rc.sysinit: don't mount usbfs, libusb no longer uses it" change
 - add some ugly hacks to make sure net hotplug doesn't run after unclean



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:35:47 -0500
Subject: rpms/inn/devel inn.spec,1.25,1.26
Message-ID: <200602110335.k1B3ZlpZ025097@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/inn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25059

Modified Files:
	inn.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: inn.spec
===================================================================
RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- inn.spec	7 Feb 2006 12:16:20 -0000	1.25
+++ inn.spec	11 Feb 2006 03:35:33 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
 Version: 2.4.2
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -285,6 +285,9 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:36:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:36:36 -0500
Subject: rpms/intltool/devel intltool.spec,1.20,1.21
Message-ID: <200602110336.k1B3aarT025306@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/intltool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25285

Modified Files:
	intltool.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: intltool.spec
===================================================================
RCS file: /cvs/dist/rpms/intltool/devel/intltool.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- intltool.spec	7 Feb 2006 03:16:19 -0000	1.20
+++ intltool.spec	11 Feb 2006 03:36:33 -0000	1.21
@@ -1,7 +1,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files.
 Version: 0.34.2
-Release: 1
+Release: 1.1
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.bz2
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.34.2-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 0.34.2-1
 - Update to 0.34.2
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:36:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:36:48 -0500
Subject: rpms/iproute/devel iproute.spec,1.44,1.45
Message-ID: <200602110336.k1B3amjd025436@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25406

Modified Files:
	iproute.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- iproute.spec	7 Feb 2006 12:16:35 -0000	1.44
+++ iproute.spec	11 Feb 2006 03:36:46 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.15
-Release: 1.1
+Release: 1.2
 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
@@ -85,6 +85,9 @@
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:37:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:37:21 -0500
Subject: rpms/iprutils/devel iprutils.spec,1.16,1.17
Message-ID: <200602110337.k1B3bLpE025708@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iprutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25677

Modified Files:
	iprutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iprutils.spec
===================================================================
RCS file: /cvs/dist/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- iprutils.spec	7 Feb 2006 12:16:49 -0000	1.16
+++ iprutils.spec	11 Feb 2006 03:37:19 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.1.1
-Release: 1.1
+Release: 1.2
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
@@ -55,6 +55,9 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:37:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:37:40 -0500
Subject: rpms/ipsec-tools/devel ipsec-tools.spec,1.22,1.23
Message-ID: <200602110337.k1B3bePx025892@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipsec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25839

Modified Files:
	ipsec-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ipsec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/ipsec-tools/devel/ipsec-tools.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ipsec-tools.spec	7 Feb 2006 13:44:56 -0000	1.22
+++ ipsec-tools.spec	11 Feb 2006 03:37:37 -0000	1.23
@@ -1,6 +1,6 @@
 Name: ipsec-tools
 Version: 0.6.4
-Release: 1
+Release: 1.1
 Summary: Tools for configuring and using IPSEC
 License: BSD
 Group: System Environment/Base
@@ -90,6 +90,9 @@
 %config(noreplace) /etc/racoon/racoon.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> 0.6.4-1
 - version 0.6.4
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:37:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:37:59 -0500
Subject: rpms/iptables/devel iptables.spec,1.40,1.41
Message-ID: <200602110337.k1B3bxju026141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26093

Modified Files:
	iptables.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iptables.spec
===================================================================
RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- iptables.spec	7 Feb 2006 12:17:14 -0000	1.40
+++ iptables.spec	11 Feb 2006 03:37:55 -0000	1.41
@@ -3,7 +3,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities.
 Version: 1.3.5
-Release: 1.1
+Release: 1.2
 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -151,6 +151,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:38:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:38:13 -0500
Subject: rpms/iptraf/devel iptraf.spec,1.17,1.18
Message-ID: <200602110338.k1B3cDwZ026279@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptraf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26243

Modified Files:
	iptraf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iptraf.spec
===================================================================
RCS file: /cvs/dist/rpms/iptraf/devel/iptraf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- iptraf.spec	7 Feb 2006 12:17:25 -0000	1.17
+++ iptraf.spec	11 Feb 2006 03:38:11 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A console-based network monitoring utility.
 Name: iptraf
 Version: 3.0.0
-Release: 1.1
+Release: 1.2
 Source: ftp://iptraf.seul.org/pub/iptraf/%{name}-%{version}.tar.gz
 URL: http://iptraf.seul.org/
 Patch0: iptraf-2.4.0-Makefile.patch
@@ -80,6 +80,9 @@
 %dir %attr(700,root,root) /var/lib/iptraf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:38:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:38:28 -0500
Subject: rpms/iptstate/devel iptstate.spec,1.9,1.10
Message-ID: <200602110338.k1B3cSi1026440@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iptstate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26409

Modified Files:
	iptstate.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iptstate.spec
===================================================================
RCS file: /cvs/dist/rpms/iptstate/devel/iptstate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- iptstate.spec	7 Feb 2006 12:17:41 -0000	1.9
+++ iptstate.spec	11 Feb 2006 03:38:26 -0000	1.10
@@ -1,7 +1,7 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
 Version: 1.4
-Release: 1.1.2
+Release: 1.1.2.1
 Source: iptstate-%{version}.tar.bz2
 Patch0: iptstate-1.4-man8.patch
 Group: System Environment/Base
@@ -51,6 +51,9 @@
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4-1.1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-1.1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:38:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:38:40 -0500
Subject: rpms/iputils/devel iputils.spec,1.34,1.35
Message-ID: <200602110338.k1B3cehD026557@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26529

Modified Files:
	iputils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- iputils.spec	7 Feb 2006 12:17:52 -0000	1.34
+++ iputils.spec	11 Feb 2006 03:38:37 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 34.1
+Release: 34.2
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -164,6 +164,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20020927-34.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 20020927-34.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:38:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:38:50 -0500
Subject: rpms/ipv6calc/devel ipv6calc.spec,1.16,1.17
Message-ID: <200602110338.k1B3codf026679@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26648

Modified Files:
	ipv6calc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ipv6calc.spec	7 Feb 2006 12:18:06 -0000	1.16
+++ ipv6calc.spec	11 Feb 2006 03:38:48 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
 Version: 	0.50
-Release: 1.2
+Release: 1.2.1
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
 License: 	GNU GPL version 2
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.50-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.50-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:39:02 -0500
Subject: rpms/ipvsadm/devel ipvsadm.spec,1.10,1.11
Message-ID: <200602110339.k1B3d247026822@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ipvsadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26791

Modified Files:
	ipvsadm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ipvsadm.spec
===================================================================
RCS file: /cvs/dist/rpms/ipvsadm/devel/ipvsadm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ipvsadm.spec	7 Feb 2006 12:18:18 -0000	1.10
+++ ipvsadm.spec	11 Feb 2006 03:38:59 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Utility to administer the Linux Virtual Server
 Name: ipvsadm
 Version: 1.24
-Release: 7.2
+Release: 7.2.1
 License: GPL
 URL: http://www.LinuxVirtualServer.org/
 Group: Applications/System
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.24-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.24-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:39:14 -0500
Subject: rpms/irda-utils/devel irda-utils.spec,1.21,1.22
Message-ID: <200602110339.k1B3dE4o026959@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	irda-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- irda-utils.spec	7 Feb 2006 12:18:30 -0000	1.21
+++ irda-utils.spec	11 Feb 2006 03:39:11 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Utilities for infrared communication between devices.
 Name: irda-utils
 Version: 0.9.16
-Release: 7.2
+Release: 7.2.1
 Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
 Patch1: irda-utils-0.9.14-chkconfig.patch
 Patch2: irda-utils-0.9.14-typo.patch
@@ -86,6 +86,9 @@
 %doc tekram/README.tekram
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.16-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.16-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:39:26 -0500
Subject: rpms/iscsi-initiator-utils/devel iscsi-initiator-utils.spec, 1.7,
	1.8
Message-ID: <200602110339.k1B3dQNV027093@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/iscsi-initiator-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27063

Modified Files:
	iscsi-initiator-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iscsi-initiator-utils.spec	3 Feb 2006 17:57:39 -0000	1.7
+++ iscsi-initiator-utils.spec	11 Feb 2006 03:39:24 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 5.0.5.476
-Release: 0
+Release: 0.1
 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
@@ -66,6 +66,9 @@
 %{_mandir}/*/*
 
 %changelog
+* 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)
+
 * Mon Jan 23 2006 Mike Christie <mchristi at redhat.com>
 - rebase package to bring in ppc64 unsigned long vs unsigned
   long long fix and iscsadm return value fix. Also drop rdma patch



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:39:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:39:37 -0500
Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.49,1.50
Message-ID: <200602110339.k1B3dbbx027222@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	isdn4k-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: isdn4k-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- isdn4k-utils.spec	7 Feb 2006 12:18:41 -0000	1.49
+++ isdn4k-utils.spec	11 Feb 2006 03:39:34 -0000	1.50
@@ -15,7 +15,7 @@
 Summary: Utilities for configuring an ISDN subsystem.
 Name: isdn4k-utils
 Version: 3.2
-Release: 38.1
+Release: 38.2
 License: GPL
 Group: Applications/System
 
@@ -477,6 +477,9 @@
 %doc xmonisdn/README
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-38.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-38.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:39:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:39:54 -0500
Subject: rpms/isicom/devel isicom.spec,1.15,1.16
Message-ID: <200602110339.k1B3dsMY027416@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/isicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27386

Modified Files:
	isicom.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: isicom.spec
===================================================================
RCS file: /cvs/dist/rpms/isicom/devel/isicom.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- isicom.spec	7 Feb 2006 12:18:54 -0000	1.15
+++ isicom.spec	11 Feb 2006 03:39:52 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Multitech IntelligentSerialInternal (ISI) Support Tools
 Name: isicom
 Version: 3.05
-Release: 18.2
+Release: 18.2.1
 License: GPL (not Firmware)
 Group: Applications/System
 URL: http://www.multitech.com/
@@ -71,6 +71,9 @@
 %{_datadir}/isicom/*.bin
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.05-18.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.05-18.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:40:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:40:07 -0500
Subject: rpms/jakarta-commons-beanutils/devel jakarta-commons-beanutils.spec,
	1.28, 1.29
Message-ID: <200602110340.k1B3e7mO027554@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-beanutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27523

Modified Files:
	jakarta-commons-beanutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-beanutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-beanutils/devel/jakarta-commons-beanutils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jakarta-commons-beanutils.spec	22 Dec 2005 08:30:16 -0000	1.28
+++ jakarta-commons-beanutils.spec	11 Feb 2006 03:40:04 -0000	1.29
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.7.0
-%define release 	2jpp_4fc
+%define release 	2jpp_5fc
 %define	section		free
 
 Name:		%{name}
@@ -106,6 +106,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - sh: line 1: build-classpath: command not found
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.7.0-2jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:40:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:40:18 -0500
Subject: rpms/jakarta-commons-collections/devel
	jakarta-commons-collections.spec, 1.35, 1.36
Message-ID: <200602110340.k1B3eIeC027698@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-collections/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27665

Modified Files:
	jakarta-commons-collections.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-collections.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-collections/devel/jakarta-commons-collections.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jakarta-commons-collections.spec	22 Dec 2005 02:12:45 -0000	1.35
+++ jakarta-commons-collections.spec	11 Feb 2006 03:40:15 -0000	1.36
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		3.1
-%define release 	2jpp_3fc
+%define release 	2jpp_4fc
 %define	section		free
 
 Name:		%{name}
@@ -110,6 +110,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1-2jpp_4fc
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:3.1-2jpp_3fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:40:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:40:32 -0500
Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec,
	1.25, 1.26
Message-ID: <200602110340.k1B3eWwS027834@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27804

Modified Files:
	jakarta-commons-digester.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jakarta-commons-digester.spec	22 Dec 2005 08:42:08 -0000	1.25
+++ jakarta-commons-digester.spec	11 Feb 2006 03:40:29 -0000	1.26
@@ -2,7 +2,7 @@
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
 %define version         1.6
-%define release 	2jpp_7fc
+%define release 	2jpp_8fc
 %define section         free
 
 Name:           %{name}
@@ -112,6 +112,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - sh: line 1: build-classpath: command not found
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.6-2jpp_7fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:40:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:40:43 -0500
Subject: rpms/jakarta-commons-el/devel jakarta-commons-el.spec,1.24,1.25
Message-ID: <200602110340.k1B3ehkU027950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-el/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27922

Modified Files:
	jakarta-commons-el.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-el.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-el/devel/jakarta-commons-el.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jakarta-commons-el.spec	22 Dec 2005 07:55:18 -0000	1.24
+++ jakarta-commons-el.spec	11 Feb 2006 03:40:40 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0
-Release: 	4jpp_4fc
+Release: 	4jpp_5fc
 Epoch:          0
 Summary:        The Jakarta Commons Extension Language
 License:        Apache Software License
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-4jpp_5fc
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-4jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:40:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:40:55 -0500
Subject: rpms/jakarta-commons-logging/devel jakarta-commons-logging.spec,
	1.28, 1.29
Message-ID: <200602110340.k1B3eteP028091@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-logging/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28060

Modified Files:
	jakarta-commons-logging.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-logging.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-logging/devel/jakarta-commons-logging.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jakarta-commons-logging.spec	22 Dec 2005 07:58:03 -0000	1.28
+++ jakarta-commons-logging.spec	11 Feb 2006 03:40:51 -0000	1.29
@@ -5,7 +5,7 @@
 
 Name:           %{name}
 Version:        1.0.4
-Release: 	2jpp_8fc
+Release: 	2jpp_9fc
 Epoch:          0
 Summary:        Jakarta Commons Logging Package
 License:        Apache Software License
@@ -124,6 +124,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.4-2jpp_9fc
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0.4-2jpp_8fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:41:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:41:05 -0500
Subject: rpms/jakarta-commons-modeler/devel jakarta-commons-modeler.spec,
	1.27, 1.28
Message-ID: <200602110341.k1B3f5QH028222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jakarta-commons-modeler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28192

Modified Files:
	jakarta-commons-modeler.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jakarta-commons-modeler.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-modeler/devel/jakarta-commons-modeler.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jakarta-commons-modeler.spec	22 Dec 2005 08:53:51 -0000	1.27
+++ jakarta-commons-modeler.spec	11 Feb 2006 03:41:03 -0000	1.28
@@ -2,7 +2,7 @@
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
 %define version		1.1
-%define release 	4jpp_4fc
+%define release 	4jpp_5fc
 %define	section		free
 
 Name:		%{name}
@@ -116,6 +116,9 @@
 %ghost %dir %{_javadocdir}/%{name}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_5fc
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1-4jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:41:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:41:16 -0500
Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.138,
	1.139
Message-ID: <200602110341.k1B3fGeq028352@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28322

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- java-1.4.2-gcj-compat.spec	10 Feb 2006 18:27:19 -0000	1.138
+++ java-1.4.2-gcj-compat.spec	11 Feb 2006 03:41:13 -0000	1.139
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_79rh
+%define release 	40jpp_80rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -606,6 +606,9 @@
 %ghost %doc %{_javadocdir}/java
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.4.2.0-40jpp_80rh
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_79rh
 - Install compatibility amd64 symlink.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:41:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:41:31 -0500
Subject: rpms/javacc/devel javacc.spec,1.13,1.14
Message-ID: <200602110341.k1B3fV8m028513@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/javacc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28481

Modified Files:
	javacc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: javacc.spec
===================================================================
RCS file: /cvs/dist/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- javacc.spec	7 Feb 2006 12:19:34 -0000	1.13
+++ javacc.spec	11 Feb 2006 03:41:28 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           javacc
 Version:        3.2
-Release: 	1jpp_5fc
+Release: 	1jpp_6fc
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
@@ -91,6 +91,9 @@
 %{_datadir}/%{name}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_6fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:3.2-1jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:41:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:41:43 -0500
Subject: rpms/java_cup/devel java_cup.spec,1.12,1.13
Message-ID: <200602110341.k1B3fhN0028659@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/java_cup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28632

Modified Files:
	java_cup.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: java_cup.spec
===================================================================
RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java_cup.spec	7 Feb 2006 12:19:46 -0000	1.12
+++ java_cup.spec	11 Feb 2006 03:41:41 -0000	1.13
@@ -1,7 +1,7 @@
 %define name		java_cup
 %define version		0.10
 %define pkg_version	v10k
-%define release 	0.k.1jpp_7fc
+%define release 	0.k.1jpp_8fc
 %define section		free
 
 Name:		%{name}
@@ -101,6 +101,9 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_8fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.10-0.k.1jpp_7fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:41:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:41:52 -0500
Subject: rpms/jfsutils/devel jfsutils.spec,1.13,1.14
Message-ID: <200602110341.k1B3fqPK028770@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28742

Modified Files:
	jfsutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/jfsutils/devel/jfsutils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jfsutils.spec	7 Feb 2006 12:19:56 -0000	1.13
+++ jfsutils.spec	11 Feb 2006 03:41:50 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the JFS filesystem.
 Name: jfsutils
 Version: 1.1.10
-Release: 3.1
+Release: 3.2
 Source0: jfsutils-%{version}.tar.gz
 URL: http://oss.software.ibm.com/jfs
 Group: System Environment/Base
@@ -43,6 +43,9 @@
 %doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.10-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.10-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:42:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:42:03 -0500
Subject: rpms/joe/devel joe.spec,1.26,1.27
Message-ID: <200602110342.k1B3g3AH028895@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28865

Modified Files:
	joe.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: joe.spec
===================================================================
RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- joe.spec	7 Feb 2006 12:20:07 -0000	1.26
+++ joe.spec	11 Feb 2006 03:42:00 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: An easy to use, modeless text editor.
 Name: joe
 Version: 3.3
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Editors
 Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz
@@ -54,6 +54,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:42:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:42:30 -0500
Subject: rpms/joystick/devel joystick.spec,1.15,1.16
Message-ID: <200602110342.k1B3gTwB029137@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29108

Modified Files:
	joystick.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: joystick.spec
===================================================================
RCS file: /cvs/dist/rpms/joystick/devel/joystick.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- joystick.spec	7 Feb 2006 12:20:18 -0000	1.15
+++ joystick.spec	11 Feb 2006 03:42:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utilities for configuring most popular joysticks.
 Name: joystick
 Version: 1.2.15
-Release: 20.2
+Release: 20.2.1
 License: GPL
 Group: System Environment/Base
 ExcludeArch: s390 s390x
@@ -41,6 +41,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.15-20.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.15-20.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:42:39 -0500
Subject: rpms/jpilot/devel jpilot.spec,1.30,1.31
Message-ID: <200602110342.k1B3gdg5029258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29229

Modified Files:
	jpilot.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jpilot.spec	7 Feb 2006 12:20:29 -0000	1.30
+++ jpilot.spec	11 Feb 2006 03:42:37 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -79,6 +79,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99.8-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.8-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:42:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:42:50 -0500
Subject: rpms/jsch/devel jsch.spec,1.11,1.12
Message-ID: <200602110342.k1B3goMT029388@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	jsch.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jsch.spec
===================================================================
RCS file: /cvs/dist/rpms/jsch/devel/jsch.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jsch.spec	7 Feb 2006 12:20:40 -0000	1.11
+++ jsch.spec	11 Feb 2006 03:42:48 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           jsch
 Version:        0.1.18
-Release:        1jpp_5fc
+Release:        1jpp_6fc
 Epoch:          0
 Summary:        Pure Java implementation of SSH2
 Group:          Development/Libraries/Java
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-1jpp_6fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.1.18-1jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:01 -0500
Subject: rpms/jwhois/devel jwhois.spec,1.24,1.25
Message-ID: <200602110343.k1B3h1CY029526@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/jwhois/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29493

Modified Files:
	jwhois.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: jwhois.spec
===================================================================
RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jwhois.spec	7 Feb 2006 12:20:53 -0000	1.24
+++ jwhois.spec	11 Feb 2006 03:42:58 -0000	1.25
@@ -1,6 +1,6 @@
 Name: jwhois
 Version: 3.2.3
-Release: 3.2
+Release: 3.2.1
 URL: http://www.gnu.org/software/jwhois/
 Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
@@ -63,6 +63,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:11 -0500
Subject: rpms/k3b/devel k3b.spec,1.25,1.26
Message-ID: <200602110343.k1B3hBTL029651@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29625

Modified Files:
	k3b.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- k3b.spec	7 Feb 2006 12:21:03 -0000	1.25
+++ k3b.spec	11 Feb 2006 03:43:09 -0000	1.26
@@ -3,7 +3,7 @@
 
 Name: k3b
 Version: 0.12.10
-Release: 2.1
+Release: 2.2
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.10-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.12.10-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:25 -0500
Subject: rpms/kasumi/devel kasumi.spec,1.12,1.13
Message-ID: <200602110343.k1B3hPd3029807@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kasumi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29777

Modified Files:
	kasumi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kasumi.spec
===================================================================
RCS file: /cvs/dist/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kasumi.spec	7 Feb 2006 12:21:16 -0000	1.12
+++ kasumi.spec	11 Feb 2006 03:43:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name:    kasumi
 Version: 1.0
-Release: 1.fc5.1
+Release: 1.fc5.2
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0-1.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-1.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:36 -0500
Subject: rpms/kbd/devel kbd.spec,1.28,1.29
Message-ID: <200602110343.k1B3hap5029932@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kbd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29900

Modified Files:
	kbd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kbd.spec
===================================================================
RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kbd.spec	7 Feb 2006 12:21:26 -0000	1.28
+++ kbd.spec	11 Feb 2006 03:43:33 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 13.1
+Release: 13.2
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -121,6 +121,9 @@
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:47 -0500
Subject: rpms/kcc/devel kcc.spec,1.14,1.15
Message-ID: <200602110343.k1B3hlj4030067@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30037

Modified Files:
	kcc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kcc.spec
===================================================================
RCS file: /cvs/dist/rpms/kcc/devel/kcc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kcc.spec	7 Feb 2006 12:21:37 -0000	1.14
+++ kcc.spec	11 Feb 2006 03:43:44 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		kcc
 Version:	2.3
-Release: 24.2
+Release: 24.2.1
 License:	GPL
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -49,6 +49,9 @@
 %{_mandir}/man1/kcc.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-24.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-24.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:43:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:43:58 -0500
Subject: rpms/kdbg/devel kdbg.spec,1.24,1.25
Message-ID: <200602110343.k1B3hwJQ030203@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdbg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30171

Modified Files:
	kdbg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdbg.spec
===================================================================
RCS file: /cvs/dist/rpms/kdbg/devel/kdbg.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kdbg.spec	7 Feb 2006 12:21:47 -0000	1.24
+++ kdbg.spec	11 Feb 2006 03:43:55 -0000	1.25
@@ -1,7 +1,7 @@
 Name: kdbg
 Summary: A GUI for gdb, the GNU debugger, and KDE.
 Version: 2.0.2
-Release: 1.1
+Release: 1.2
 Epoch: 1
 Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
 License: GPL
@@ -60,6 +60,9 @@
 %{_docdir}/HTML/en/%{name}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:44:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:44:08 -0500
Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.13,1.14
Message-ID: <200602110344.k1B3i8Q2030329@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeaccessibility/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30300

Modified Files:
	kdeaccessibility.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeaccessibility.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdeaccessibility.spec	7 Feb 2006 12:21:58 -0000	1.13
+++ kdeaccessibility.spec	11 Feb 2006 03:44:05 -0000	1.14
@@ -7,7 +7,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Epoch: 1
 Summary: K Desktop Environment - Accessibility
 Name: kdeaccessibility
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:44:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:44:30 -0500
Subject: rpms/kdeaddons/devel kdeaddons.spec,1.43,1.44
Message-ID: <200602110344.k1B3iUar030548@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeaddons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30510

Modified Files:
	kdeaddons.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdeaddons.spec	7 Feb 2006 12:22:11 -0000	1.43
+++ kdeaddons.spec	11 Feb 2006 03:44:27 -0000	1.44
@@ -13,7 +13,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Name: kdeaddons
 Summary: K Desktop Environment - Plugins
 Group: User Interface/Desktops
@@ -168,6 +168,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:44:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:44:43 -0500
Subject: rpms/kdeadmin/devel kdeadmin.spec,1.55,1.56
Message-ID: <200602110344.k1B3ihYN030691@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30661

Modified Files:
	kdeadmin.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdeadmin.spec	7 Feb 2006 12:22:23 -0000	1.55
+++ kdeadmin.spec	11 Feb 2006 03:44:39 -0000	1.56
@@ -23,7 +23,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Name: kdeadmin
 Summary: Administrative tools for KDE.
 Epoch: 7
@@ -409,6 +409,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:45:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:45:02 -0500
Subject: rpms/kdeartwork/devel kdeartwork.spec,1.45,1.46
Message-ID: <200602110345.k1B3j2dH030896@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeartwork.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeartwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeartwork/devel/kdeartwork.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kdeartwork.spec	7 Feb 2006 12:22:35 -0000	1.45
+++ kdeartwork.spec	11 Feb 2006 03:44:59 -0000	1.46
@@ -14,7 +14,7 @@
 
 Name: kdeartwork
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Summary: Additional artwork (themes, sound themes, ...) for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -156,6 +156,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:45:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:45:25 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.149,1.150
Message-ID: <200602110345.k1B3jPgo031092@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdebase.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- kdebase.spec	7 Feb 2006 12:22:51 -0000	1.149
+++ kdebase.spec	11 Feb 2006 03:45:23 -0000	1.150
@@ -23,7 +23,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 2.1
+Release: 2.2
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -419,6 +419,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:46:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:46:00 -0500
Subject: rpms/kdebindings/devel kdebindings.spec,1.40,1.41
Message-ID: <200602110346.k1B3k01B003052@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2638

Modified Files:
	kdebindings.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- kdebindings.spec	7 Feb 2006 12:23:11 -0000	1.40
+++ kdebindings.spec	11 Feb 2006 03:45:57 -0000	1.41
@@ -26,7 +26,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -282,6 +282,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:46:16 -0500
Subject: rpms/kdeedu/devel kdeedu.spec,1.43,1.44
Message-ID: <200602110346.k1B3kGlN004542@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdeedu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4218

Modified Files:
	kdeedu.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeedu.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdeedu.spec	7 Feb 2006 12:23:24 -0000	1.43
+++ kdeedu.spec	11 Feb 2006 03:46:13 -0000	1.44
@@ -13,7 +13,7 @@
 
 Name: kdeedu
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Summary: Educational/Edutainment applications for KDE
 URL: http://www.kde.org/
 License: GPL
@@ -184,6 +184,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:46:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:46:46 -0500
Subject: rpms/kdegames/devel kdegames.spec,1.47,1.48
Message-ID: <200602110346.k1B3kktt008021@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdegames/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7613

Modified Files:
	kdegames.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdegames.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdegames.spec	7 Feb 2006 12:23:45 -0000	1.47
+++ kdegames.spec	11 Feb 2006 03:46:42 -0000	1.48
@@ -19,7 +19,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Epoch: 6
 Summary: K Desktop Environment - Games
 Name: kdegames
@@ -153,6 +153,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:47:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:47:03 -0500
Subject: rpms/kdegraphics/devel kdegraphics.spec,1.73,1.74
Message-ID: <200602110347.k1B3l3vO010131@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdegraphics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9928

Modified Files:
	kdegraphics.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdegraphics.spec	7 Feb 2006 11:15:16 -0000	1.73
+++ kdegraphics.spec	11 Feb 2006 03:47:01 -0000	1.74
@@ -16,7 +16,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 2
+Release: 2.1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -375,6 +375,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Than Ngo <than at redhat.com> 7:3.5.1-2
 - apply patch to fix buffer overflow in kpdf, CVE-2006-0301 (#179425)
 - apply patch to fix gcc warning (#169189)



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:47:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:47:21 -0500
Subject: rpms/kdelibs/devel kdelibs.spec,1.125,1.126
Message-ID: <200602110347.k1B3lLKi012085@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdelibs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kdelibs.spec	7 Feb 2006 12:24:01 -0000	1.125
+++ kdelibs.spec	11 Feb 2006 03:47:18 -0000	1.126
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 2.1
+Release: 2.2
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -412,6 +412,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:47:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:47:53 -0500
Subject: rpms/kdemultimedia/devel kdemultimedia.spec,1.55,1.56
Message-ID: <200602110347.k1B3lrax012366@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdemultimedia/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12334

Modified Files:
	kdemultimedia.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kdemultimedia.spec	7 Feb 2006 12:24:17 -0000	1.55
+++ kdemultimedia.spec	11 Feb 2006 03:47:50 -0000	1.56
@@ -29,7 +29,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -246,6 +246,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:48:06 -0500
Subject: rpms/kdenetwork/devel kdenetwork.spec,1.70,1.71
Message-ID: <200602110348.k1B3m6P3012522@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdenetwork.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kdenetwork.spec	7 Feb 2006 12:24:34 -0000	1.70
+++ kdenetwork.spec	11 Feb 2006 03:48:04 -0000	1.71
@@ -14,7 +14,7 @@
 
 Name: kdenetwork
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Summary: K Desktop Environment - Network Applications
 Epoch: 7
 Group: Applications/Internet
@@ -237,6 +237,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:48:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:48:21 -0500
Subject: rpms/kdepim/devel kdepim.spec,1.75,1.76
Message-ID: <200602110348.k1B3mLge012672@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdepim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12646

Modified Files:
	kdepim.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdepim.spec
===================================================================
RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdepim.spec	7 Feb 2006 12:24:54 -0000	1.75
+++ kdepim.spec	11 Feb 2006 03:48:18 -0000	1.76
@@ -9,7 +9,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Name: kdepim
 Summary: PIM (Personal Information Manager) for KDE
 Prefix: /usr
@@ -207,6 +207,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:48:39 -0500
Subject: rpms/kdesdk/devel kdesdk.spec,1.50,1.51
Message-ID: <200602110348.k1B3mduH012859@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdesdk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12829

Modified Files:
	kdesdk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdesdk.spec
===================================================================
RCS file: /cvs/dist/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdesdk.spec	7 Feb 2006 12:25:08 -0000	1.50
+++ kdesdk.spec	11 Feb 2006 03:48:37 -0000	1.51
@@ -15,7 +15,7 @@
 
 Name: kdesdk
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Summary: The KDE Software Development Kit (SDK)
 URL: http://www.kde.org/
 License: GPL
@@ -236,6 +236,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - (none):3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:48:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:48:52 -0500
Subject: rpms/kdeutils/devel kdeutils.spec,1.53,1.54
Message-ID: <200602110348.k1B3mq2L013000@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	kdeutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kdeutils.spec	7 Feb 2006 12:25:21 -0000	1.53
+++ kdeutils.spec	11 Feb 2006 03:48:49 -0000	1.54
@@ -11,7 +11,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Name: kdeutils
 Prefix: /usr
 Summary: K Desktop Environment - Utilities
@@ -326,6 +326,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:49:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:49:03 -0500
Subject: rpms/kdevelop/devel kdevelop.spec,1.44,1.45
Message-ID: <200602110349.k1B3n3iW013139@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdevelop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13109

Modified Files:
	kdevelop.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdevelop.spec
===================================================================
RCS file: /cvs/dist/rpms/kdevelop/devel/kdevelop.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdevelop.spec	7 Feb 2006 12:25:32 -0000	1.44
+++ kdevelop.spec	11 Feb 2006 03:49:01 -0000	1.45
@@ -13,7 +13,7 @@
 Name: kdevelop
 Summary: Integrated Development Environment for C++/C
 Version: 3.3.1
-Release: 1.1
+Release: 1.2
 Epoch: 9
 URL: http://www.kdevelop.org/
 Group: Development/Tools
@@ -154,6 +154,9 @@
 %{_datadir}/servicetypes/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 9:3.3.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:49:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:49:24 -0500
Subject: rpms/kdewebdev/devel kdewebdev.spec,1.27,1.28
Message-ID: <200602110349.k1B3nOtk013333@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kdewebdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13306

Modified Files:
	kdewebdev.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/dist/rpms/kdewebdev/devel/kdewebdev.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kdewebdev.spec	7 Feb 2006 12:25:45 -0000	1.27
+++ kdewebdev.spec	11 Feb 2006 03:49:22 -0000	1.28
@@ -12,7 +12,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.1
-Release: 1.1
+Release: 1.2
 Summary: WEB Development package for the K Desktop Environment.
 Name: kdewebdev
 Url: http://quanta.sourceforge.net/
@@ -147,6 +147,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:49:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:49:50 -0500
Subject: rpms/krb5/devel krb5.spec,1.67,1.68
Message-ID: <200602110349.k1B3nof1013559@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13532

Modified Files:
	krb5.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5/devel/krb5.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- krb5.spec	6 Feb 2006 20:04:44 -0000	1.67
+++ krb5.spec	11 Feb 2006 03:49:47 -0000	1.68
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system.
 Name: krb5
 Version: 1.4.3
-Release: 4
+Release: 4.1
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.3-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -138,6 +138,9 @@
 workstation.
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.3-4.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Nalin Dahyabhai <nalin at redhat.com> 1.4.3-4
 - give a little bit more information to the user when kinit gets the catch-all
   I/O error (#180175)



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:50:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:50:12 -0500
Subject: rpms/krbafs/devel krbafs.spec,1.20,1.21
Message-ID: <200602110350.k1B3oCEd013773@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/krbafs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13740

Modified Files:
	krbafs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: krbafs.spec
===================================================================
RCS file: /cvs/dist/rpms/krbafs/devel/krbafs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- krbafs.spec	7 Feb 2006 12:27:26 -0000	1.20
+++ krbafs.spec	11 Feb 2006 03:50:10 -0000	1.21
@@ -1,6 +1,6 @@
 Name: krbafs
 Version: 1.2.2
-Release: 9.2
+Release: 9.2.1
 Source: ftp://ftp.pdc.kth.se/pub/krb/src/krb4-%{version}.tar.gz
 Source1: krbafs.versions
 Patch0: krb4-1.2.2-ioctl.patch
@@ -40,6 +40,9 @@
 building applications which use the krbafs library.
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:50:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:50:27 -0500
Subject: rpms/ksh/devel ksh.spec,1.18,1.19
Message-ID: <200602110350.k1B3oRbb013922@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ksh.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ksh.spec	10 Feb 2006 10:57:18 -0000	1.18
+++ ksh.spec	11 Feb 2006 03:50:24 -0000	1.19
@@ -7,7 +7,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20050202
-Release:      5
+Release:      5.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
@@ -92,6 +92,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20050202-5.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Karsten Hopp <karsten at redhat.de> 20050202-5
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:50:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:50:40 -0500
Subject: rpms/kudzu/devel kudzu.spec,1.117,1.118
Message-ID: <200602110350.k1B3oeeb014067@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14035

Modified Files:
	kudzu.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kudzu.spec	8 Feb 2006 02:44:53 -0000	1.117
+++ kudzu.spec	11 Feb 2006 03:50:38 -0000	1.118
@@ -1,6 +1,6 @@
 Name: kudzu
 Version: 1.2.25
-Release: 1
+Release: 1.1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.25-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> - 1.2.25-1
 - in installer environment, sg isn't loaded, so there are deviceless
   scsi devs (#180378)



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:50:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:50:51 -0500
Subject: rpms/lam/devel lam.spec,1.30,1.31
Message-ID: <200602110350.k1B3opVQ014188@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14158

Modified Files:
	lam.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- lam.spec	8 Feb 2006 00:36:24 -0000	1.30
+++ lam.spec	11 Feb 2006 03:50:48 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 8.FC5.2
+Release: 8.FC5.2.1
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -112,6 +112,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:7.1.1-8.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:7.1.1-8.2
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:51:16 -0500
Subject: rpms/lcms/devel lcms.spec,1.3,1.4
Message-ID: <200602110351.k1B3pGn4014426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lcms/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14395

Modified Files:
	lcms.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lcms.spec
===================================================================
RCS file: /cvs/dist/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lcms.spec	7 Feb 2006 12:27:58 -0000	1.3
+++ lcms.spec	11 Feb 2006 03:51:13 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           lcms
 Version:        1.15
-Release:        1.1
+Release:        1.2
 Summary:        Color Management System
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@
 %ghost %{python_sitearch}/lcms.py?
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:51:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:51:28 -0500
Subject: rpms/less/devel less.spec,1.28,1.29
Message-ID: <200602110351.k1B3pSH7014570@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/less/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14538

Modified Files:
	less.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- less.spec	7 Feb 2006 12:28:10 -0000	1.28
+++ less.spec	11 Feb 2006 03:51:25 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 394
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -54,6 +54,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 394-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 394-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:51:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:51:39 -0500
Subject: rpms/lftp/devel lftp.spec,1.39,1.40
Message-ID: <200602110351.k1B3pdlC014700@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	lftp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- lftp.spec	8 Feb 2006 16:19:09 -0000	1.39
+++ lftp.spec	11 Feb 2006 03:51:36 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.2
-Release: 	1
+Release: 	1.1
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -71,6 +71,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4.2-1.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb 08 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.2-1
 - Upgrade to upstream version 3.4.2, that fixes 3.4.1's coredump
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:51:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:51:50 -0500
Subject: rpms/lha/devel lha.spec,1.16,1.17
Message-ID: <200602110351.k1B3poX4014835@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lha/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14804

Modified Files:
	lha.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lha.spec
===================================================================
RCS file: /cvs/dist/rpms/lha/devel/lha.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lha.spec	7 Feb 2006 12:28:20 -0000	1.16
+++ lha.spec	11 Feb 2006 03:51:48 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: An archiving and compression utility for LHarc format archives.
 Name: lha
 Version: 1.14i
-Release: 19.2
+Release: 19.2.1
 License: freeware
 Group: Applications/Archiving
 Source: http://www2m.biglobe.ne.jp/~dolphin/lha/prog/lha-114i.tar.gz
@@ -49,6 +49,9 @@
 %{_bindir}/lha
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.14i-19.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.14i-19.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:52:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:52:01 -0500
Subject: rpms/libaio/devel libaio.spec,1.19,1.20
Message-ID: <200602110352.k1B3q1mU014970@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libaio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14938

Modified Files:
	libaio.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libaio.spec
===================================================================
RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libaio.spec	7 Feb 2006 12:28:30 -0000	1.19
+++ libaio.spec	11 Feb 2006 03:51:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name: libaio
 Version: 0.3.106
-Release: 2.1
+Release: 2.2
 Summary: Linux-native asynchronous I/O access library
 License: LGPL
 Group:  System Environment/Libraries
@@ -70,6 +70,9 @@
 %attr(0644,root,root) %{_libdir}/libaio.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.106-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.106-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:52:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:52:11 -0500
Subject: rpms/libao/devel libao.spec,1.18,1.19
Message-ID: <200602110352.k1B3qB5l015098@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libao/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15068

Modified Files:
	libao.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libao.spec
===================================================================
RCS file: /cvs/dist/rpms/libao/devel/libao.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libao.spec	7 Feb 2006 12:28:41 -0000	1.18
+++ libao.spec	11 Feb 2006 03:52:09 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Cross Platform Audio Output Library.
 Name: libao
 Version: 0.8.6
-Release: 1.2
+Release: 1.2.1
 Group: System Environment/Libraries
 License: GPL
 URL: http://www.xiph.org/
@@ -65,6 +65,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:52:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:52:22 -0500
Subject: rpms/libart_lgpl/devel libart_lgpl.spec,1.12,1.13
Message-ID: <200602110352.k1B3qMYv015220@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libart_lgpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15195

Modified Files:
	libart_lgpl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libart_lgpl.spec
===================================================================
RCS file: /cvs/dist/rpms/libart_lgpl/devel/libart_lgpl.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libart_lgpl.spec	7 Feb 2006 12:28:50 -0000	1.12
+++ libart_lgpl.spec	11 Feb 2006 03:52:19 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 2.2
+Release: 2.2.1
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -61,6 +61,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.17-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:52:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:52:32 -0500
Subject: rpms/libavc1394/devel libavc1394.spec,1.18,1.19
Message-ID: <200602110352.k1B3qWge015347@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libavc1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15317

Modified Files:
	libavc1394.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libavc1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libavc1394/devel/libavc1394.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libavc1394.spec	7 Feb 2006 12:29:00 -0000	1.18
+++ libavc1394.spec	11 Feb 2006 03:52:30 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Audio/Video Control library for IEEE-1394 devices
 Name: libavc1394
 Version: 0.5.1
-Release: 2.1
+Release: 2.2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://dl.sourceforge.net/libavc1394/libavc1394-%{version}.tar.gz
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:52:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:52:48 -0500
Subject: rpms/libbonobo/devel libbonobo.spec,1.33,1.34
Message-ID: <200602110352.k1B3qmJQ015516@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15479

Modified Files:
	libbonobo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libbonobo.spec	7 Feb 2006 12:29:10 -0000	1.33
+++ libbonobo.spec	11 Feb 2006 03:52:45 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 8.1
+Release: 8.2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -113,6 +113,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-8.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-8.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:53:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:53:11 -0500
Subject: rpms/libbonoboui/devel libbonoboui.spec,1.36,1.37
Message-ID: <200602110353.k1B3rBUb015745@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbonoboui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15716

Modified Files:
	libbonoboui.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libbonoboui.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libbonoboui.spec	7 Feb 2006 12:29:19 -0000	1.36
+++ libbonoboui.spec	11 Feb 2006 03:53:09 -0000	1.37
@@ -14,7 +14,7 @@
 Summary: Bonobo user interface components
 Name: libbonoboui
 Version: 2.13.1
-Release: 4.1
+Release: 4.2
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: ta.po
@@ -132,6 +132,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:53:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:53:24 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.21,1.22
Message-ID: <200602110353.k1B3rOB6015888@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15857

Modified Files:
	libbtctl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libbtctl.spec	7 Feb 2006 12:29:31 -0000	1.21
+++ libbtctl.spec	11 Feb 2006 03:53:22 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.5.0
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -74,6 +74,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:53:37 -0500
Subject: rpms/libcap/devel libcap.spec,1.19,1.20
Message-ID: <200602110353.k1B3rbHM016022@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15992

Modified Files:
	libcap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libcap/devel/libcap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libcap.spec	7 Feb 2006 12:29:45 -0000	1.19
+++ libcap.spec	11 Feb 2006 03:53:34 -0000	1.20
@@ -1,6 +1,6 @@
 Name: libcap
 Version: 1.10
-Release: 24.1
+Release: 24.2
 Summary: Library for getting and setting POSIX.1e capabilities
 Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2
 Source1: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/capfaq-0.2.txt
@@ -79,6 +79,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10-24.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:53:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:53:47 -0500
Subject: rpms/libc-client/devel libc-client.spec,1.16,1.17
Message-ID: <200602110353.k1B3rl0P016166@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libc-client/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16133

Modified Files:
	libc-client.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libc-client.spec
===================================================================
RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libc-client.spec	7 Feb 2006 12:30:19 -0000	1.16
+++ libc-client.spec	11 Feb 2006 03:53:45 -0000	1.17
@@ -5,7 +5,7 @@
 Summary: C-client mail access routines for IMAP and POP protocols
 Name: libc-client
 Version: 2004g
-Release: 2.1
+Release: 2.2
 License: University of Washington Free-Fork License
 Group: System Environment/Daemons
 URL: http://www.washington.edu/imap/
@@ -122,6 +122,9 @@
 %{_libdir}/lib%{soname}.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2004g-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2004g-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:54:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:54:00 -0500
Subject: rpms/libchewing/devel libchewing.spec,1.3,1.4
Message-ID: <200602110354.k1B3s0X2016295@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libchewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16267

Modified Files:
	libchewing.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libchewing.spec
===================================================================
RCS file: /cvs/dist/rpms/libchewing/devel/libchewing.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libchewing.spec	7 Feb 2006 12:31:28 -0000	1.3
+++ libchewing.spec	11 Feb 2006 03:53:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		libchewing
 Version:	0.2.7
-Release: 1%{?dist}.2
+Release: 1%{?dist}.2.1
 Summary:      Intelligent phonetic input method library for Traditional Chinese
 
 Group: 		System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:54:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:54:12 -0500
Subject: rpms/libcroco/devel libcroco.spec,1.14,1.15
Message-ID: <200602110354.k1B3sCm0016444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libcroco/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16414

Modified Files:
	libcroco.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libcroco.spec
===================================================================
RCS file: /cvs/dist/rpms/libcroco/devel/libcroco.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libcroco.spec	7 Feb 2006 12:32:11 -0000	1.14
+++ libcroco.spec	11 Feb 2006 03:54:09 -0000	1.15
@@ -1,7 +1,7 @@
 Name:             libcroco
 Summary:          A CSS2 parsing library 
 Version:          0.6.0
-Release: 6.2
+Release: 6.2.1
 License:          LGPL
 Group:            System Environment/Libraries
 Source:           %{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/libcroco-0.6.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:54:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:54:25 -0500
Subject: rpms/libdaemon/devel libdaemon.spec,1.6,1.7
Message-ID: <200602110354.k1B3sPP9016587@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdaemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16558

Modified Files:
	libdaemon.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdaemon.spec
===================================================================
RCS file: /cvs/dist/rpms/libdaemon/devel/libdaemon.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libdaemon.spec	8 Feb 2006 00:10:42 -0000	1.6
+++ libdaemon.spec	11 Feb 2006 03:54:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name: libdaemon
 Version: 0.10
-Release: 3
+Release: 3.1
 Summary: library for writing UNIX daemons
 
 Group: System Environment/Libraries
@@ -68,6 +68,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.10-3.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.10-3
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:54:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:54:35 -0500
Subject: rpms/libdbi/devel libdbi.spec,1.14,1.15
Message-ID: <200602110354.k1B3sZAm016725@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16695

Modified Files:
	libdbi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdbi.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi/devel/libdbi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdbi.spec	7 Feb 2006 12:32:50 -0000	1.14
+++ libdbi.spec	11 Feb 2006 03:54:33 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Database Independent Abstraction Layer for C
 Name: libdbi
 Version: 0.8.1
-Release: 1.2
+Release: 1.2.1
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi.sourceforge.net/
@@ -70,6 +70,9 @@
 %{_libdir}/libdbi.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:54:48 -0500
Subject: rpms/libdbi-drivers/devel libdbi-drivers.spec,1.6,1.7
Message-ID: <200602110354.k1B3smAY016871@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdbi-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16840

Modified Files:
	libdbi-drivers.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdbi-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/libdbi-drivers/devel/libdbi-drivers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libdbi-drivers.spec	7 Feb 2006 12:33:38 -0000	1.6
+++ libdbi-drivers.spec	11 Feb 2006 03:54:46 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Database-specific drivers for libdbi
 Name: libdbi-drivers
 Version: 0.8.1a
-Release: 1.2
+Release: 1.2.1
 Group: Development/Libraries
 License: LGPL
 URL: http://libdbi-drivers.sourceforge.net/
@@ -89,6 +89,9 @@
 %{_libdir}/dbd/libdbdpgsql.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1a-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1a-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:02 -0500
Subject: rpms/libdmx/devel libdmx.spec,1.9,1.10
Message-ID: <200602110355.k1B3t2Tl017022@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdmx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16994

Modified Files:
	libdmx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdmx.spec
===================================================================
RCS file: /cvs/dist/rpms/libdmx/devel/libdmx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libdmx.spec	7 Feb 2006 12:34:12 -0000	1.9
+++ libdmx.spec	11 Feb 2006 03:54:59 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libdmx runtime library
 Name: libdmx
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:13 -0500
Subject: rpms/libdrm/devel libdrm.spec,1.9,1.10
Message-ID: <200602110355.k1B3tD5g017154@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdrm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17122

Modified Files:
	libdrm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdrm.spec
===================================================================
RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libdrm.spec	7 Feb 2006 12:34:42 -0000	1.9
+++ libdrm.spec	11 Feb 2006 03:55:10 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: libdrm Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -87,6 +87,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:24 -0500
Subject: rpms/libdv/devel libdv.spec,1.13,1.14
Message-ID: <200602110355.k1B3tOIH017288@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libdv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17257

Modified Files:
	libdv.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libdv.spec
===================================================================
RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libdv.spec	7 Feb 2006 12:35:15 -0000	1.13
+++ libdv.spec	11 Feb 2006 03:55:21 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	Software decoder for DV format video.
 Name: 		libdv
 Version: 	0.103
-Release: 4.2
+Release: 4.2.1
 Epoch:		0
 License: 	LGPL
 Group: 		System Environment/Libraries
@@ -84,6 +84,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.103-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.103-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:37 -0500
Subject: rpms/libevent/devel libevent.spec,1.3,1.4
Message-ID: <200602110355.k1B3tbMP017437@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libevent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17408

Modified Files:
	libevent.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libevent.spec
===================================================================
RCS file: /cvs/dist/rpms/libevent/devel/libevent.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libevent.spec	7 Feb 2006 12:35:37 -0000	1.3
+++ libevent.spec	11 Feb 2006 03:55:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libevent
 Version:        1.1a
-Release:        3.1
+Release:        3.2
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1a-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1a-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:48 -0500
Subject: rpms/libexif/devel libexif.spec,1.16,1.17
Message-ID: <200602110355.k1B3tmow017577@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libexif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17544

Modified Files:
	libexif.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libexif.spec
===================================================================
RCS file: /cvs/dist/rpms/libexif/devel/libexif.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libexif.spec	7 Feb 2006 12:36:09 -0000	1.16
+++ libexif.spec	11 Feb 2006 03:55:46 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
 Version: 0.6.12
-Release: 3.2
+Release: 3.2.1
 Group: System Environment/Libraries
 License: LGPL
 URL: http://libexif.sourceforge.net/
@@ -63,6 +63,9 @@
 %{_libdir}/pkgconfig/libexif.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.12-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.12-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:55:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:55:59 -0500
Subject: rpms/libfontenc/devel libfontenc.spec,1.11,1.12
Message-ID: <200602110355.k1B3txwo017702@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libfontenc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17675

Modified Files:
	libfontenc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libfontenc.spec
===================================================================
RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libfontenc.spec	7 Feb 2006 12:36:26 -0000	1.11
+++ libfontenc.spec	11 Feb 2006 03:55:56 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libfontenc runtime library
 Name: libfontenc
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_libdir}/pkgconfig/fontenc.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:56:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:56:10 -0500
Subject: rpms/libFS/devel libFS.spec,1.21,1.22
Message-ID: <200602110356.k1B3uAji017844@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17811

Modified Files:
	libFS.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libFS.spec
===================================================================
RCS file: /cvs/dist/rpms/libFS/devel/libFS.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libFS.spec	7 Feb 2006 12:36:41 -0000	1.21
+++ libFS.spec	11 Feb 2006 03:56:08 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libFS runtime library
 Name: libFS
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/libfs.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:56:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:56:21 -0500
Subject: rpms/libgail-gnome/devel libgail-gnome.spec,1.17,1.18
Message-ID: <200602110356.k1B3uLTU017977@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libgail-gnome.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgail-gnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgail-gnome/devel/libgail-gnome.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libgail-gnome.spec	7 Feb 2006 12:36:50 -0000	1.17
+++ libgail-gnome.spec	11 Feb 2006 03:56:18 -0000	1.18
@@ -7,7 +7,7 @@
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: libgail-gnome
 Version: 1.1.3
-Release: 1.1
+Release: 1.2
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:56:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:56:32 -0500
Subject: rpms/libgconf-java/devel libgconf-java.spec,1.21,1.22
Message-ID: <200602110356.k1B3uWCo018106@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libgconf-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libgconf-java.spec	7 Feb 2006 12:36:58 -0000	1.21
+++ libgconf-java.spec	11 Feb 2006 03:56:29 -0000	1.22
@@ -12,7 +12,7 @@
 
 %define	name_base	libgconf-java
 %define	version		2.12.1
-%define release 	2.1
+%define release 	2.2
 
 Summary:	Java bindings for GConf
 Name:		%{java_pkg_prefix}%{name_base}
@@ -106,6 +106,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:56:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:56:42 -0500
Subject: rpms/libgcrypt/devel libgcrypt.spec,1.10,1.11
Message-ID: <200602110356.k1B3ugEj018235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgcrypt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18198

Modified Files:
	libgcrypt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgcrypt.spec
===================================================================
RCS file: /cvs/dist/rpms/libgcrypt/devel/libgcrypt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgcrypt.spec	7 Feb 2006 12:37:07 -0000	1.10
+++ libgcrypt.spec	11 Feb 2006 03:56:40 -0000	1.11
@@ -1,6 +1,6 @@
 Name: libgcrypt
 Version: 1.2.2
-Release: 1.2
+Release: 1.2.1
 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
@@ -77,6 +77,9 @@
 %{_infodir}/gcrypt.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:56:53 -0500
Subject: rpms/libghttp/devel libghttp.spec,1.15,1.16
Message-ID: <200602110356.k1B3urbl018368@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libghttp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18331

Modified Files:
	libghttp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libghttp.spec
===================================================================
RCS file: /cvs/dist/rpms/libghttp/devel/libghttp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libghttp.spec	7 Feb 2006 12:37:32 -0000	1.15
+++ libghttp.spec	11 Feb 2006 03:56:50 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: GNOME http client library.
 Name: libghttp
 Version: 1.0.9
-Release: 11.2
+Release: 11.2.1
 License: LGPL
 Epoch: 1
 Group: System Environment/Libraries
@@ -54,6 +54,9 @@
 %{_libdir}/ghttpConf.sh
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.9-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.9-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:57:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:57:03 -0500
Subject: rpms/libglade/devel libglade.spec,1.21,1.22
Message-ID: <200602110357.k1B3v37v018491@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18461

Modified Files:
	libglade.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libglade.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade/devel/libglade.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libglade.spec	7 Feb 2006 12:37:41 -0000	1.21
+++ libglade.spec	11 Feb 2006 03:57:00 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: The libglade library for loading user interfaces.
 Name:		libglade
 Version: 	0.17
-Release: 16.2
+Release: 16.2.1
 Epoch:		1
 License:	LGPL
 Group: System Environment/Libraries
@@ -89,6 +89,9 @@
 %doc %{_datadir}/gnome/html/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-16.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-16.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:57:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:57:13 -0500
Subject: rpms/libglade2/devel libglade2.spec,1.20,1.21
Message-ID: <200602110357.k1B3vDKk018621@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18592

Modified Files:
	libglade2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libglade2.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- libglade2.spec	7 Feb 2006 12:37:49 -0000	1.20
+++ libglade2.spec	11 Feb 2006 03:57:11 -0000	1.21
@@ -5,7 +5,7 @@
 Summary: The libglade library for loading user interfaces.
 Name: libglade2
 Version: 2.5.1
-Release: 3.2
+Release: 3.2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: libglade-%{version}.tar.bz2
@@ -85,6 +85,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:57:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:57:25 -0500
Subject: rpms/libglade-java/devel libglade-java.spec,1.28,1.29
Message-ID: <200602110357.k1B3vPHP018756@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libglade-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18729

Modified Files:
	libglade-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libglade-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libglade-java.spec	7 Feb 2006 12:37:57 -0000	1.28
+++ libglade-java.spec	11 Feb 2006 03:57:23 -0000	1.29
@@ -12,7 +12,7 @@
 
 %define	name_base	libglade-java
 %define	version		2.12.2
-%define release 	1.1
+%define release 	1.2
 
 Summary:	Java bindings for libglade
 Name:		%{java_pkg_prefix}%{name_base}
@@ -113,6 +113,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:57:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:57:40 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.50,1.51
Message-ID: <200602110357.k1B3vdl8018918@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18872

Modified Files:
	libgnome.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libgnome.spec	10 Feb 2006 03:46:36 -0000	1.50
+++ libgnome.spec	11 Feb 2006 03:57:36 -0000	1.51
@@ -12,7 +12,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.13.7
-Release: 5
+Release: 5.1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -156,6 +156,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.7-5.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.7-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:57:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:57:50 -0500
Subject: rpms/libgnomecanvas/devel libgnomecanvas.spec,1.26,1.27
Message-ID: <200602110357.k1B3vo8g019048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecanvas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19017

Modified Files:
	libgnomecanvas.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnomecanvas.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libgnomecanvas.spec	7 Feb 2006 12:38:13 -0000	1.26
+++ libgnomecanvas.spec	11 Feb 2006 03:57:48 -0000	1.27
@@ -8,7 +8,7 @@
 Summary: GnomeCanvas widget
 Name: libgnomecanvas
 Version: 2.13.0
-Release: 1.1
+Release: 1.2
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -93,6 +93,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:58:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:58:01 -0500
Subject: rpms/libgnomecups/devel libgnomecups.spec,1.35,1.36
Message-ID: <200602110358.k1B3w1dm019175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomecups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19144

Modified Files:
	libgnomecups.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnomecups.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgnomecups.spec	7 Feb 2006 12:38:21 -0000	1.35
+++ libgnomecups.spec	11 Feb 2006 03:57:58 -0000	1.36
@@ -1,7 +1,7 @@
 Summary:  GNOME library for CUPS integration
 Name:     libgnomecups
 Version:  0.2.2
-Release: 3.2
+Release: 3.2.1
 License:  LGPL
 Group:    Development/Libraries
 URL:      http://www.gnome.org
@@ -67,6 +67,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:58:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:58:31 -0500
Subject: rpms/libgnome-java/devel libgnome-java.spec,1.28,1.29
Message-ID: <200602110358.k1B3wVkM019454@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnome-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19423

Modified Files:
	libgnome-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnome-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libgnome-java.spec	7 Feb 2006 12:38:29 -0000	1.28
+++ libgnome-java.spec	11 Feb 2006 03:58:28 -0000	1.29
@@ -12,7 +12,7 @@
 
 %define	name_base	libgnome-java
 %define	version		2.12.1
-%define release 	3.1
+%define release 	3.2
 
 Summary:	Java bindings for libgnome
 Name:		%{java_pkg_prefix}%{name_base}	
@@ -108,6 +108,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:58:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:58:42 -0500
Subject: rpms/libgnomeprint22/devel libgnomeprint22.spec,1.32,1.33
Message-ID: <200602110358.k1B3wg7Q019583@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprint22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19561

Modified Files:
	libgnomeprint22.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnomeprint22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libgnomeprint22.spec	7 Feb 2006 12:38:38 -0000	1.32
+++ libgnomeprint22.spec	11 Feb 2006 03:58:40 -0000	1.33
@@ -16,7 +16,7 @@
 Summary: Printing library for GNOME.
 Name:		libgnomeprint22
 Version: 	2.12.1
-Release:	4.1
+Release:	4.2
 License:	LGPL
 Group:          System Environment/Base
 Source: 	libgnomeprint-%{version}.tar.bz2
@@ -131,6 +131,9 @@
 %{_datadir}/gtk-doc/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 03:59:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 22:59:30 -0500
Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.26,1.27
Message-ID: <200602110359.k1B3xUfD019730@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeprintui22/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19699

Modified Files:
	libgnomeprintui22.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnomeprintui22.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libgnomeprintui22.spec	7 Feb 2006 12:38:47 -0000	1.26
+++ libgnomeprintui22.spec	11 Feb 2006 03:59:27 -0000	1.27
@@ -6,7 +6,7 @@
 Summary: GUI support for libgnomeprint
 Name: libgnomeprintui22
 Version: 2.12.1
-Release: 1.2
+Release: 1.2.1
 Source0: libgnomeprintui-%{version}.tar.bz2
 URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/
 License: LGPL
@@ -101,6 +101,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.12.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:00:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:00:22 -0500
Subject: rpms/libgnomeui/devel libgnomeui.spec,1.35,1.36
Message-ID: <200602110400.k1B40LLO019873@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19827

Modified Files:
	libgnomeui.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libgnomeui.spec	7 Feb 2006 12:38:55 -0000	1.35
+++ libgnomeui.spec	11 Feb 2006 04:00:00 -0000	1.36
@@ -18,7 +18,7 @@
 Summary: GNOME base GUI library
 Name: libgnomeui
 Version: 2.13.3
-Release: 1.1
+Release: 1.2
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -160,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:03:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:03:36 -0500
Subject: rpms/libgpg-error/devel libgpg-error.spec,1.8,1.9
Message-ID: <200602110403.k1B43akK020103@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpg-error/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20055

Modified Files:
	libgpg-error.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgpg-error.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpg-error/devel/libgpg-error.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgpg-error.spec	7 Feb 2006 12:39:04 -0000	1.8
+++ libgpg-error.spec	11 Feb 2006 04:03:33 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: libgpg-error
 Name: libgpg-error
 Version: 1.1
-Release: 1.2
+Release: 1.2.1
 URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig
@@ -65,6 +65,9 @@
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:05:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:05:10 -0500
Subject: rpms/libgpod/devel libgpod.spec,1.2,1.3
Message-ID: <200602110405.k1B45Ar0020221@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgpod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20191

Modified Files:
	libgpod.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgpod.spec
===================================================================
RCS file: /cvs/dist/rpms/libgpod/devel/libgpod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgpod.spec	7 Feb 2006 12:39:13 -0000	1.2
+++ libgpod.spec	11 Feb 2006 04:04:58 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.3.0
-Release: 2.1 
+Release: 2.2 
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:05:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:05:57 -0500
Subject: rpms/libgsf/devel libgsf.spec,1.22,1.23
Message-ID: <200602110405.k1B45vk5020329@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgsf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20310

Modified Files:
	libgsf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgsf.spec
===================================================================
RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libgsf.spec	7 Feb 2006 12:39:23 -0000	1.22
+++ libgsf.spec	11 Feb 2006 04:05:52 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.13.3
-Release: 2.2
+Release: 2.2.1
 Group: System Environment/Libraries
 License: LGPL
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.13.3-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.13.3-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:06:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:06:36 -0500
Subject: rpms/libgssapi/devel libgssapi.spec,1.4,1.5
Message-ID: <200602110406.k1B46aiO020460@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20429

Modified Files:
	libgssapi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgssapi.spec	9 Feb 2006 15:33:02 -0000	1.4
+++ libgssapi.spec	11 Feb 2006 04:06:33 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.7
-Release: 2
+Release: 2.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
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
 - remove empty scripts
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:07:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:07:07 -0500
Subject: rpms/libgtk-java/devel libgtk-java.spec,1.41,1.42
Message-ID: <200602110407.k1B477Z7020561@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20542

Modified Files:
	libgtk-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libgtk-java.spec	7 Feb 2006 12:39:43 -0000	1.41
+++ libgtk-java.spec	11 Feb 2006 04:07:04 -0000	1.42
@@ -13,7 +13,7 @@
 
 %define	name_base 	libgtk-java
 %define	version		2.8.3
-%define release 	1.1
+%define release 	1.2
 
 
 Summary:	Java bindings for GTK+
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:07:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:07:33 -0500
Subject: rpms/libgtop2/devel libgtop2.spec,1.29,1.30
Message-ID: <200602110407.k1B47XGE020681@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20655

Modified Files:
	libgtop2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgtop2.spec	7 Feb 2006 12:39:53 -0000	1.29
+++ libgtop2.spec	11 Feb 2006 04:07:30 -0000	1.30
@@ -7,7 +7,7 @@
 Name:		libgtop2
 Summary:        libgtop library (version 2)
 Version: 	2.13.3
-Release: 	1.1
+Release: 	1.2
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:07:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:07:50 -0500
Subject: rpms/libibverbs/devel libibverbs.spec,1.7,1.8
Message-ID: <200602110407.k1B47ofs020827@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libibverbs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20797

Modified Files:
	libibverbs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libibverbs.spec
===================================================================
RCS file: /cvs/dist/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libibverbs.spec	7 Feb 2006 12:40:02 -0000	1.7
+++ libibverbs.spec	11 Feb 2006 04:07:47 -0000	1.8
@@ -7,7 +7,7 @@
 
 Name: libibverbs
 Version: 1.0.rc4
-Release: 0.%{ver}%{?dist}.2
+Release: 0.%{ver}%{?dist}.2.1
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
@@ -87,6 +87,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:08:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:08:04 -0500
Subject: rpms/libICE/devel libICE.spec,1.10,1.11
Message-ID: <200602110408.k1B484MP020980@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libICE/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20948

Modified Files:
	libICE.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libICE.spec
===================================================================
RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libICE.spec	7 Feb 2006 12:40:16 -0000	1.10
+++ libICE.spec	11 Feb 2006 04:08:02 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:08:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:08:21 -0500
Subject: rpms/libIDL/devel libIDL.spec,1.17,1.18
Message-ID: <200602110408.k1B48Lic021132@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libIDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21100

Modified Files:
	libIDL.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libIDL.spec
===================================================================
RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libIDL.spec	7 Feb 2006 12:40:26 -0000	1.17
+++ libIDL.spec	11 Feb 2006 04:08:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Library for parsing IDL (Interface Definition Language)
 Name: libIDL
 Version: 0.8.6
-Release: 2.2
+Release: 2.2.1
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
 License: LGPL
@@ -73,6 +73,9 @@
 %{_infodir}/libIDL2.info.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.6-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:08:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:08:54 -0500
Subject: rpms/libidn/devel libidn.spec,1.27,1.28
Message-ID: <200602110408.k1B48sma021352@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libidn.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libidn.spec	7 Feb 2006 11:16:53 -0000	1.27
+++ libidn.spec	11 Feb 2006 04:08:51 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.2
-Release: 1
+Release: 1.1
 URL: http://www.gnu.org/software/libidn
 License: LGPL
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
@@ -85,6 +85,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.2-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb 06 2006 Florian La Roche <laroche at redhat.com>
 - 0.6.1
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:09:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:09:06 -0500
Subject: rpms/libiec61883/devel libiec61883.spec,1.7,1.8
Message-ID: <200602110409.k1B496m7021493@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libiec61883/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21463

Modified Files:
	libiec61883.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libiec61883.spec
===================================================================
RCS file: /cvs/dist/rpms/libiec61883/devel/libiec61883.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libiec61883.spec	7 Feb 2006 12:40:41 -0000	1.7
+++ libiec61883.spec	11 Feb 2006 04:09:03 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Streaming library for IEEE1394
 Name: libiec61883
 Version: 1.0.0
-Release: 10.fc5.1
+Release: 10.fc5.2
 License: LGPL
 Group: Libraries
 Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz
@@ -79,6 +79,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-10.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:09:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:09:17 -0500
Subject: rpms/libieee1284/devel libieee1284.spec,1.9,1.10
Message-ID: <200602110409.k1B49H2s021628@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libieee1284/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21598

Modified Files:
	libieee1284.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libieee1284.spec
===================================================================
RCS file: /cvs/dist/rpms/libieee1284/devel/libieee1284.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libieee1284.spec	7 Feb 2006 12:40:50 -0000	1.9
+++ libieee1284.spec	11 Feb 2006 04:09:14 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: A library for interfacing IEEE 1284-compatible devices.
 Name: libieee1284
 Version: 0.2.9
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://cyberelk.net/tim/libieee1284/
@@ -72,6 +72,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.9-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.9-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:09:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:09:30 -0500
Subject: rpms/libjpeg/devel libjpeg.spec,1.16,1.17
Message-ID: <200602110409.k1B49UF7021780@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libjpeg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21750

Modified Files:
	libjpeg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libjpeg.spec
===================================================================
RCS file: /cvs/dist/rpms/libjpeg/devel/libjpeg.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libjpeg.spec	7 Feb 2006 12:40:58 -0000	1.16
+++ libjpeg.spec	11 Feb 2006 04:09:27 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: A library for manipulating JPEG image format files.
 Name: libjpeg
 Version: 6b
-Release: 36.2
+Release: 36.2.1
 License: distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2
@@ -87,6 +87,9 @@
 /usr/include/*.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6b-36.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:09:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:09:42 -0500
Subject: rpms/liblbxutil/devel liblbxutil.spec,1.9,1.10
Message-ID: <200602110409.k1B49gqa021920@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liblbxutil/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21890

Modified Files:
	liblbxutil.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: liblbxutil.spec
===================================================================
RCS file: /cvs/dist/rpms/liblbxutil/devel/liblbxutil.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- liblbxutil.spec	7 Feb 2006 12:41:08 -0000	1.9
+++ liblbxutil.spec	11 Feb 2006 04:09:39 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 liblbxutil runtime library
 Name: liblbxutil
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -72,6 +72,9 @@
 %{_libdir}/pkgconfig/lbxutil.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:09:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:09:53 -0500
Subject: rpms/libmng/devel libmng.spec,1.24,1.25
Message-ID: <200602110409.k1B49rmr022045@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22017

Modified Files:
	libmng.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libmng.spec
===================================================================
RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libmng.spec	7 Feb 2006 12:41:17 -0000	1.24
+++ libmng.spec	11 Feb 2006 04:09:49 -0000	1.25
@@ -1,6 +1,6 @@
 Name: libmng
 Version: 1.0.9
-Release: 3.2
+Release: 3.2.1
 URL: http://www.libmng.com/
 Summary: Library for Multiple-image Network Graphics support
 License: BSD-like
@@ -77,6 +77,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:04 -0500
Subject: rpms/libmthca/devel libmthca.spec,1.5,1.6
Message-ID: <200602110410.k1B4A4Xk022190@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmthca/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22158

Modified Files:
	libmthca.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libmthca.spec
===================================================================
RCS file: /cvs/dist/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmthca.spec	7 Feb 2006 12:41:26 -0000	1.5
+++ libmthca.spec	11 Feb 2006 04:10:01 -0000	1.6
@@ -8,7 +8,7 @@
 
 Name: libmthca
 Version: 1.0.rc4
-Release: 0.%{ver}%{?dist}.2
+Release: 0.%{ver}%{?dist}.2.1
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
@@ -64,6 +64,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.rc4-0.4265.1.FC5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:14 -0500
Subject: rpms/libmusicbrainz/devel libmusicbrainz.spec,1.13,1.14
Message-ID: <200602110410.k1B4AEf8022313@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libmusicbrainz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22280

Modified Files:
	libmusicbrainz.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libmusicbrainz.spec
===================================================================
RCS file: /cvs/dist/rpms/libmusicbrainz/devel/libmusicbrainz.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libmusicbrainz.spec	7 Feb 2006 22:15:34 -0000	1.13
+++ libmusicbrainz.spec	11 Feb 2006 04:10:12 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A library for accessing MusicBrainz servers
 Name: libmusicbrainz
 Version: 2.1.1
-Release: 2
+Release: 2.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.musicbrainz.org
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1-2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Christopher Aillon <caillon at redhat.com> - 2.1.1-2
 - Stop shipping the .a file in the main package
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:24 -0500
Subject: rpms/libnotify/devel libnotify.spec,1.6,1.7
Message-ID: <200602110410.k1B4AOkM022444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22411

Modified Files:
	libnotify.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libnotify.spec	7 Feb 2006 12:41:56 -0000	1.6
+++ libnotify.spec	11 Feb 2006 04:10:22 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: libnotify notification library 
 Name: libnotify 
 Version: 0.3.0
-Release: 4.1
+Release: 4.2
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:37 -0500
Subject: rpms/libofx/devel libofx.spec,1.13,1.14
Message-ID: <200602110410.k1B4AaOR022560@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libofx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22540

Modified Files:
	libofx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libofx.spec
===================================================================
RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libofx.spec	7 Feb 2006 12:42:05 -0000	1.13
+++ libofx.spec	11 Feb 2006 04:10:34 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.0
-Release: 2.1
+Release: 2.2
 Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 Patch: libofx-0.7.0-gcc4.patch
 Requires: openjade >= 1.3.1
@@ -62,6 +62,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.0-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:47 -0500
Subject: rpms/libogg/devel libogg.spec,1.19,1.20
Message-ID: <200602110410.k1B4AlXZ022684@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libogg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22653

Modified Files:
	libogg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libogg.spec
===================================================================
RCS file: /cvs/dist/rpms/libogg/devel/libogg.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libogg.spec	7 Feb 2006 12:42:18 -0000	1.19
+++ libogg.spec	11 Feb 2006 04:10:44 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The Ogg bitstream file format library.
 Name:		libogg
 Version:	1.1.3
-Release:	1.1 
+Release:	1.2 
 Epoch:		2
 Group: System Environment/Libraries
 License:      BSD
@@ -70,6 +70,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:1.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:10:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:10:57 -0500
Subject: rpms/liboil/devel liboil.spec,1.4,1.5
Message-ID: <200602110410.k1B4Avcl022813@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liboil/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22782

Modified Files:
	liboil.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: liboil.spec
===================================================================
RCS file: /cvs/dist/rpms/liboil/devel/liboil.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- liboil.spec	7 Feb 2006 12:42:27 -0000	1.4
+++ liboil.spec	11 Feb 2006 04:10:55 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Library of Optimized Inner Loops, CPU optimized functions
 Name: liboil
 Version: 0.3.6
-Release: 3.fc5.1
+Release: 3.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://liboil.freedesktop.org/
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-3.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-3.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:11:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:11:08 -0500
Subject: rpms/liboldX/devel liboldX.spec,1.10,1.11
Message-ID: <200602110411.k1B4B8Sg022937@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/liboldX/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22906

Modified Files:
	liboldX.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: liboldX.spec
===================================================================
RCS file: /cvs/dist/rpms/liboldX/devel/liboldX.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- liboldX.spec	7 Feb 2006 12:42:37 -0000	1.10
+++ liboldX.spec	11 Feb 2006 04:11:05 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 liboldX runtime library
 Name: liboldX
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/oldx.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:11:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:11:19 -0500
Subject: rpms/libpng/devel libpng.spec,1.26,1.27
Message-ID: <200602110411.k1B4BJie023081@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23042

Modified Files:
	libpng.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libpng.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libpng.spec	7 Feb 2006 12:42:56 -0000	1.26
+++ libpng.spec	11 Feb 2006 04:11:17 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
 Version: 1.2.8
-Release: 2.2
+Release: 2.2.1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -75,6 +75,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.8-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.8-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:11:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:11:36 -0500
Subject: rpms/libpng10/devel libpng10.spec,1.17,1.18
Message-ID: <200602110411.k1B4BaIM023250@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libpng10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23221

Modified Files:
	libpng10.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libpng10.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libpng10.spec	7 Feb 2006 12:43:05 -0000	1.17
+++ libpng10.spec	11 Feb 2006 04:11:33 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Old version of libpng, needed to run old binaries.
 Name: libpng10
 Version: 1.0.18
-Release: 3.2
+Release: 3.2.1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -76,6 +76,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.18-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.18-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:11:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:11:47 -0500
Subject: rpms/libraw1394/devel libraw1394.spec,1.16,1.17
Message-ID: <200602110411.k1B4BlPv023387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libraw1394/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23357

Modified Files:
	libraw1394.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libraw1394.spec
===================================================================
RCS file: /cvs/dist/rpms/libraw1394/devel/libraw1394.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libraw1394.spec	7 Feb 2006 12:43:14 -0000	1.16
+++ libraw1394.spec	11 Feb 2006 04:11:44 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Library providing low-level IEEE-1394 access
 Name: libraw1394
 Version: 1.2.0
-Release: 3.fc5.1
+Release: 3.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:11:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:11:58 -0500
Subject: rpms/librsvg2/devel librsvg2.spec,1.37,1.38
Message-ID: <200602110411.k1B4BwtS023526@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23494

Modified Files:
	librsvg2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- librsvg2.spec	7 Feb 2006 03:38:06 -0000	1.37
+++ librsvg2.spec	11 Feb 2006 04:11:56 -0000	1.38
@@ -13,7 +13,7 @@
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
 Version: 2.13.92
-Release: 1
+Release: 1.1
 
 License: 	LGPL
 Group: System Environment/Libraries
@@ -121,6 +121,9 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.92-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:12:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:12:12 -0500
Subject: rpms/librtas/devel librtas.spec,1.4,1.5
Message-ID: <200602110412.k1B4CCYw023677@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/librtas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23638

Modified Files:
	librtas.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: librtas.spec
===================================================================
RCS file: /cvs/dist/rpms/librtas/devel/librtas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- librtas.spec	7 Feb 2006 12:43:24 -0000	1.4
+++ librtas.spec	11 Feb 2006 04:12:08 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Libraries to provide access to RTAS calls and RTAS events.
 Name: librtas
 Version: 1.2.4
-Release: 1.2
+Release: 1.2.1
 URL: http://librtas.ozlabs.org
 License: IBM Common Public License (CPL) v1.0
 Group: System Environment/Libraries
@@ -62,6 +62,9 @@
 /usr/include/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.4-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:12:22 -0500
Subject: rpms/libsdp/devel libsdp.spec,1.7,1.8
Message-ID: <200602110412.k1B4CM2g023811@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsdp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23780

Modified Files:
	libsdp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsdp.spec
===================================================================
RCS file: /cvs/dist/rpms/libsdp/devel/libsdp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libsdp.spec	7 Feb 2006 12:43:33 -0000	1.7
+++ libsdp.spec	11 Feb 2006 04:12:20 -0000	1.8
@@ -5,7 +5,7 @@
 
 Name: libsdp
 Version: 0.90
-Release: 0.%{ver}%{?dist}.2
+Release: 0.%{ver}%{?dist}.2.1
 Summary: A library for direct userspace use of Sockets Direct Protocol
 
 Group: System Environment/Libraries
@@ -50,6 +50,9 @@
 %doc COPYING ChangeLog NEWS README
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.90-0.4265.1.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.90-0.4265.1.FC5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:12:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:12:33 -0500
Subject: rpms/libselinux/devel libselinux.spec,1.180,1.181
Message-ID: <200602110412.k1B4CX3L023944@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libselinux.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- libselinux.spec	7 Feb 2006 12:43:42 -0000	1.180
+++ libselinux.spec	11 Feb 2006 04:12:30 -0000	1.181
@@ -3,7 +3,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 1.29.7
-Release: 1.1
+Release: 1.2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -108,6 +108,9 @@
 %{_libdir}/python2.4/site-packages/selinux.py*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.7-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29.7-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:12:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:12:44 -0500
Subject: rpms/libsemanage/devel libsemanage.spec,1.73,1.74
Message-ID: <200602110412.k1B4CiwU024082@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24054

Modified Files:
	libsemanage.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libsemanage.spec	10 Feb 2006 16:42:07 -0000	1.73
+++ libsemanage.spec	11 Feb 2006 04:12:41 -0000	1.74
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 1.5.21
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -77,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.21-2.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.21-2
 - Fix handling of seusers and users_map file
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:12:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:12:54 -0500
Subject: rpms/libsepol/devel libsepol.spec,1.108,1.109
Message-ID: <200602110412.k1B4Csq6024211@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24180

Modified Files:
	libsepol.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- libsepol.spec	7 Feb 2006 15:27:01 -0000	1.108
+++ libsepol.spec	11 Feb 2006 04:12:51 -0000	1.109
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.11.13
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,6 +80,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.13-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
 - Upgrade to latest from NSA
 	* Merged seuser/user_extra support patch from Joshua Brindle.



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:13:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:13:04 -0500
Subject: rpms/libsetrans/devel libsetrans.spec,1.28,1.29
Message-ID: <200602110413.k1B4D4QO024342@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsetrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24311

Modified Files:
	libsetrans.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsetrans.spec
===================================================================
RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libsetrans.spec	7 Feb 2006 12:44:06 -0000	1.28
+++ libsetrans.spec	11 Feb 2006 04:13:02 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: SELinux Translation library
 Name: libsetrans
 Version: 0.1.18
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -51,6 +51,9 @@
 %{_mandir}/man8/mcs.8.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.18-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.18-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:13:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:13:15 -0500
Subject: rpms/libsilc/devel libsilc.spec,1.8,1.9
Message-ID: <200602110413.k1B4DF4G024478@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsilc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24440

Modified Files:
	libsilc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsilc.spec
===================================================================
RCS file: /cvs/dist/rpms/libsilc/devel/libsilc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libsilc.spec	7 Feb 2006 12:44:14 -0000	1.8
+++ libsilc.spec	11 Feb 2006 04:13:13 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: SILC Client Library
 Name: libsilc
 Version: 0.9.12
-Release: 12.2
+Release: 12.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.silcnet.org/
@@ -99,6 +99,9 @@
 %{_includedir}/silc/*.h
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:13:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:13:27 -0500
Subject: rpms/libSM/devel libSM.spec,1.10,1.11
Message-ID: <200602110413.k1B4DRhQ024608@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libSM/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24578

Modified Files:
	libSM.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libSM.spec
===================================================================
RCS file: /cvs/dist/rpms/libSM/devel/libSM.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libSM.spec	7 Feb 2006 12:44:22 -0000	1.10
+++ libSM.spec	11 Feb 2006 04:13:25 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libSM runtime library
 Name: libSM
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_libdir}/pkgconfig/sm.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:13:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:13:39 -0500
Subject: rpms/libsoup/devel libsoup.spec,1.28,1.29
Message-ID: <200602110413.k1B4DdwR024751@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24712

Modified Files:
	libsoup.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libsoup.spec	7 Feb 2006 12:44:30 -0000	1.28
+++ libsoup.spec	11 Feb 2006 04:13:36 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.7
-Release: 1.2
+Release: 1.2.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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:13:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:13:50 -0500
Subject: rpms/libstdc++so7/devel libstdc++7.spec,1.1,1.2
Message-ID: <200602110413.k1B4Dods024883@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libstdc++so7/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24854

Modified Files:
	libstdc++7.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libstdc++7.spec
===================================================================
RCS file: /cvs/dist/rpms/libstdc++so7/devel/libstdc++7.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libstdc++7.spec	8 Feb 2006 09:19:12 -0000	1.1
+++ libstdc++7.spec	11 Feb 2006 04:13:48 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: libstdc++.so.7 preview
 Name: libstdc++so7
 Version: 4.2.0
-Release: 0.3.%{datestamp}
+Release: 0.3.%{datestamp}.1
 License: GPL
 Group: System Environment/Libraries
 Source0: gcc_stub-4.1-20060118.tar.bz2
@@ -175,6 +175,9 @@
 %{_prefix}/include/c++/4.2.0-*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0-0.3.20060203.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 03 2006 Benjamin Kosnik <bkoz at redhat.com> 4.2.0-0.3
 - Fixup datestamp issues.
 - Use datestamp, or something close, as part of the versioned namespace name.



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:14:15 -0500
Subject: rpms/libtermcap/devel libtermcap.spec,1.18,1.19
Message-ID: <200602110414.k1B4EFUM025120@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtermcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25088

Modified Files:
	libtermcap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libtermcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtermcap.spec	7 Feb 2006 12:44:37 -0000	1.18
+++ libtermcap.spec	11 Feb 2006 04:14:12 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A basic system library for accessing the termcap database.
 Name: libtermcap
 Version: 2.0.8
-Release: 44.1
+Release: 44.2
 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2
 Url: ftp://metalab.unc.edu/pub/Linux/GCC/
 License: LGPL
@@ -125,6 +125,9 @@
 %{_infodir}/termcap.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.8-44.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.8-44.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:14:27 -0500
Subject: rpms/libtheora/devel libtheora.spec,1.10,1.11
Message-ID: <200602110414.k1B4ERuh025259@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtheora/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25223

Modified Files:
	libtheora.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libtheora.spec
===================================================================
RCS file: /cvs/dist/rpms/libtheora/devel/libtheora.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libtheora.spec	7 Feb 2006 12:44:45 -0000	1.10
+++ libtheora.spec	11 Feb 2006 04:14:25 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Theora Video Compression Codec
 Name: libtheora
 Version: 1.0alpha5
-Release: 1.2
+Release: 1.2.1
 Epoch: 0
 License: BSD
 Group: System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0alpha5-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0alpha5-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:14:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:14:40 -0500
Subject: rpms/libtiff/devel libtiff.spec,1.35,1.36
Message-ID: <200602110414.k1B4EeP5025384@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25354

Modified Files:
	libtiff.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libtiff.spec	7 Feb 2006 12:44:53 -0000	1.35
+++ libtiff.spec	11 Feb 2006 04:14:36 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Library of functions for manipulating TIFF format image files
 Name: libtiff
 Version: 3.7.4
-Release: 3.2
+Release: 3.2.1
 License: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.7.4-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:14:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:14:54 -0500
Subject: rpms/libtool/devel libtool.spec,1.38,1.39
Message-ID: <200602110414.k1B4EsPa025534@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libtool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25510

Modified Files:
	libtool.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- libtool.spec	7 Feb 2006 12:45:03 -0000	1.38
+++ libtool.spec	11 Feb 2006 04:14:51 -0000	1.39
@@ -4,7 +4,7 @@
 Summary:	The GNU Portable Library Tool
 Name:		libtool
 Version:	%{upstream_version}
-Release:    2.1
+Release:    2.2
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
@@ -141,6 +141,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.22-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.22-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:15:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:15:10 -0500
Subject: rpms/libusb/devel libusb.spec,1.22,1.23
Message-ID: <200602110415.k1B4FAln025700@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25663

Modified Files:
	libusb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libusb.spec
===================================================================
RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libusb.spec	7 Feb 2006 12:45:26 -0000	1.22
+++ libusb.spec	11 Feb 2006 04:15:06 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A library which allows userspace access to USB devices.
 Name: libusb
 Version: 0.1.11
-Release: 2.1
+Release: 2.2
 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz
 Patch0: libusb-0.1.11-format.patch
 Patch1: libusb-0.1.11-searchorder.patch
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.11-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.11-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:15:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:15:22 -0500
Subject: rpms/libuser/devel libuser.spec,1.47,1.48
Message-ID: <200602110415.k1B4FMv6025837@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25802

Modified Files:
	libuser.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libuser.spec	7 Feb 2006 12:45:40 -0000	1.47
+++ libuser.spec	11 Feb 2006 04:15:20 -0000	1.48
@@ -5,7 +5,7 @@
 
 Name: libuser
 Version: 0.54.3
-Release: 1.2
+Release: 1.2.1
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.54.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.54.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:15:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:15:39 -0500
Subject: rpms/libvorbis/devel libvorbis.spec,1.22,1.23
Message-ID: <200602110415.k1B4FdrK026937@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvorbis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26725

Modified Files:
	libvorbis.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libvorbis.spec
===================================================================
RCS file: /cvs/dist/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libvorbis.spec	7 Feb 2006 12:46:04 -0000	1.22
+++ libvorbis.spec	11 Feb 2006 04:15:35 -0000	1.23
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.1.2
-Release: 	1.1
+Release: 	1.2
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -82,6 +82,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:15:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:15:59 -0500
Subject: rpms/libvte-java/devel libvte-java.spec,1.9,1.10
Message-ID: <200602110415.k1B4Fxmu028749@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libvte-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28515

Modified Files:
	libvte-java.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libvte-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libvte-java.spec	7 Feb 2006 12:46:13 -0000	1.9
+++ libvte-java.spec	11 Feb 2006 04:15:55 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:   Wrapper library for GNOME VTE
 Name:      libvte-java 
 Version:   0.11.11
-Release:   8.1
+Release:   8.2
 URL:       http://java-gnome.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   LGPL
@@ -97,6 +97,9 @@
 %{_datadir}/java/*.zip
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.11.11-8.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.11-8.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:16:14 -0500
Subject: rpms/libwmf/devel libwmf.spec,1.17,1.18
Message-ID: <200602110416.k1B4GEnl030356@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30041

Modified Files:
	libwmf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libwmf.spec	7 Feb 2006 12:46:25 -0000	1.17
+++ libwmf.spec	11 Feb 2006 04:16:11 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 4.1
+Release: 4.2
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -98,6 +98,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:16:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:16:26 -0500
Subject: rpms/libwnck/devel libwnck.spec,1.40,1.41
Message-ID: <200602110416.k1B4GQVQ031742@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31503

Modified Files:
	libwnck.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libwnck.spec	7 Feb 2006 12:46:35 -0000	1.40
+++ libwnck.spec	11 Feb 2006 04:16:24 -0000	1.41
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:16:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:16:39 -0500
Subject: rpms/libwpd/devel libwpd.spec,1.21,1.22
Message-ID: <200602110416.k1B4Gdww000817@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	libwpd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libwpd.spec
===================================================================
RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- libwpd.spec	7 Feb 2006 12:46:44 -0000	1.21
+++ libwpd.spec	11 Feb 2006 04:16:37 -0000	1.22
@@ -1,7 +1,7 @@
 Name: libwpd
 Summary: Library for reading and converting WordPerfect(tm) documents.
 Version: 0.8.4
-Release: 1.2
+Release: 1.2.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
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:16:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:16:53 -0500
Subject: rpms/libwvstreams/devel libwvstreams.spec,1.17,1.18
Message-ID: <200602110416.k1B4GrdW002042@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libwvstreams/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1599

Modified Files:
	libwvstreams.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libwvstreams.spec	7 Feb 2006 12:46:54 -0000	1.17
+++ libwvstreams.spec	11 Feb 2006 04:16:50 -0000	1.18
@@ -1,6 +1,6 @@
 Name: libwvstreams
 Version: 4.2.1
-Release: 1.1
+Release: 1.2
 Summary: WvStreams is a network programming library written in C++.
 Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz
 Patch1: libwvstreams-3.70-gcc3.patch
@@ -96,6 +96,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:17:13 -0500
Subject: rpms/libX11/devel libX11.spec,1.14,1.15
Message-ID: <200602110417.k1B4HDVR005380@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4900

Modified Files:
	libX11.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libX11.spec	7 Feb 2006 12:47:04 -0000	1.14
+++ libX11.spec	11 Feb 2006 04:17:11 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -239,6 +239,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:17:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:17:27 -0500
Subject: rpms/libXau/devel libXau.spec,1.9,1.10
Message-ID: <200602110417.k1B4HRig006970@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXau/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6940

Modified Files:
	libXau.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXau.spec
===================================================================
RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXau.spec	7 Feb 2006 12:47:13 -0000	1.9
+++ libXau.spec	11 Feb 2006 04:17:24 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXau runtime library
 Name: libXau
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man3/XauWriteAuth.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:17:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:17:38 -0500
Subject: rpms/libXaw/devel libXaw.spec,1.10,1.11
Message-ID: <200602110417.k1B4HcvL007102@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXaw/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7070

Modified Files:
	libXaw.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXaw.spec
===================================================================
RCS file: /cvs/dist/rpms/libXaw/devel/libXaw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXaw.spec	7 Feb 2006 12:47:20 -0000	1.10
+++ libXaw.spec	11 Feb 2006 04:17:35 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXaw runtime library
 Name: libXaw
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:17:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:17:48 -0500
Subject: rpms/libXcomposite/devel libXcomposite.spec,1.9,1.10
Message-ID: <200602110417.k1B4HmGf007222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcomposite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7197

Modified Files:
	libXcomposite.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXcomposite.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcomposite/devel/libXcomposite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXcomposite.spec	7 Feb 2006 12:47:29 -0000	1.9
+++ libXcomposite.spec	11 Feb 2006 04:17:46 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcomposite runtime library
 Name: libXcomposite
 Version: 0.2.2.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2.2-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.2.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:17:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:17:59 -0500
Subject: rpms/libXcursor/devel libXcursor.spec,1.9,1.10
Message-ID: <200602110417.k1B4HxNm007341@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXcursor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7311

Modified Files:
	libXcursor.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXcursor.spec
===================================================================
RCS file: /cvs/dist/rpms/libXcursor/devel/libXcursor.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXcursor.spec	7 Feb 2006 12:47:37 -0000	1.9
+++ libXcursor.spec	11 Feb 2006 04:17:57 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXcursor runtime library
 Name: libXcursor
 Version: 1.1.5.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -87,6 +87,9 @@
 %{_mandir}/man3/Xcursor.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:18:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:18:11 -0500
Subject: rpms/libXdamage/devel libXdamage.spec,1.9,1.10
Message-ID: <200602110418.k1B4IBJs007481@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdamage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7451

Modified Files:
	libXdamage.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXdamage.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdamage/devel/libXdamage.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXdamage.spec	7 Feb 2006 12:47:44 -0000	1.9
+++ libXdamage.spec	11 Feb 2006 04:18:09 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdamage runtime library
 Name: libXdamage
 Version: 1.0.2.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xdamage.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:18:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:18:23 -0500
Subject: rpms/libXdmcp/devel libXdmcp.spec,1.9,1.10
Message-ID: <200602110418.k1B4INBK007613@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXdmcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7582

Modified Files:
	libXdmcp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXdmcp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXdmcp/devel/libXdmcp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXdmcp.spec	7 Feb 2006 12:47:52 -0000	1.9
+++ libXdmcp.spec	11 Feb 2006 04:18:20 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:18:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:18:36 -0500
Subject: rpms/libXevie/devel libXevie.spec,1.9,1.10
Message-ID: <200602110418.k1B4IZ6h007762@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXevie/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7730

Modified Files:
	libXevie.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXevie.spec
===================================================================
RCS file: /cvs/dist/rpms/libXevie/devel/libXevie.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXevie.spec	7 Feb 2006 12:47:59 -0000	1.9
+++ libXevie.spec	11 Feb 2006 04:18:32 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXevie runtime library
 Name: libXevie
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -80,6 +80,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:18:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:18:46 -0500
Subject: rpms/libXext/devel libXext.spec,1.10,1.11
Message-ID: <200602110418.k1B4Ik2H007895@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7864

Modified Files:
	libXext.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXext.spec
===================================================================
RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXext.spec	7 Feb 2006 12:48:07 -0000	1.10
+++ libXext.spec	11 Feb 2006 04:18:43 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.0
-Release: 3.1
+Release: 3.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -130,6 +130,9 @@
 %{_mandir}/man3/XmbufQueryExtension.3x*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:18:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:18:57 -0500
Subject: rpms/libXfixes/devel libXfixes.spec,1.9,1.10
Message-ID: <200602110418.k1B4IvdV008029@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfixes/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7997

Modified Files:
	libXfixes.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXfixes.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfixes/devel/libXfixes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXfixes.spec	7 Feb 2006 12:48:14 -0000	1.9
+++ libXfixes.spec	11 Feb 2006 04:18:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfixes runtime library
 Name: libXfixes
 Version: 3.0.1.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1.2-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.1.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:19:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:19:22 -0500
Subject: rpms/libXfont/devel libXfont.spec,1.12,1.13
Message-ID: <200602110419.k1B4JMe0008250@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfont/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8211

Modified Files:
	libXfont.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXfont.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXfont.spec	7 Feb 2006 12:48:22 -0000	1.12
+++ libXfont.spec	11 Feb 2006 04:19:18 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfont runtime library
 Name: libXfont
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -94,6 +94,9 @@
 %{_libdir}/pkgconfig/xfont.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:19:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:19:33 -0500
Subject: rpms/libXfontcache/devel libXfontcache.spec,1.9,1.10
Message-ID: <200602110419.k1B4JXpB008393@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXfontcache/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8357

Modified Files:
	libXfontcache.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXfontcache.spec
===================================================================
RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXfontcache.spec	7 Feb 2006 12:48:30 -0000	1.9
+++ libXfontcache.spec	11 Feb 2006 04:19:30 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXfontcache runtime library
 Name: libXfontcache
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man3/FontCacheQueryVersion.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:19:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:19:43 -0500
Subject: rpms/libXft/devel libXft.spec,1.12,1.13
Message-ID: <200602110419.k1B4JhWY008516@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXft/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8484

Modified Files:
	libXft.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXft.spec
===================================================================
RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libXft.spec	7 Feb 2006 12:48:39 -0000	1.12
+++ libXft.spec	11 Feb 2006 04:19:41 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXft runtime library
 Name: libXft
 Version: 2.1.8.2
-Release: 3.1
+Release: 3.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -94,6 +94,9 @@
 %{_mandir}/man3/Xft.3*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:19:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:19:54 -0500
Subject: rpms/libXi/devel libXi.spec,1.9,1.10
Message-ID: <200602110419.k1B4Jshh008650@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8616

Modified Files:
	libXi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXi.spec
===================================================================
RCS file: /cvs/dist/rpms/libXi/devel/libXi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXi.spec	7 Feb 2006 12:48:47 -0000	1.9
+++ libXi.spec	11 Feb 2006 04:19:52 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXi runtime library
 Name: libXi
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:05 -0500
Subject: rpms/libXinerama/devel libXinerama.spec,1.9,1.10
Message-ID: <200602110420.k1B4K5KC008774@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXinerama/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8750

Modified Files:
	libXinerama.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXinerama.spec
===================================================================
RCS file: /cvs/dist/rpms/libXinerama/devel/libXinerama.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXinerama.spec	7 Feb 2006 12:48:55 -0000	1.9
+++ libXinerama.spec	11 Feb 2006 04:20:02 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXinerama runtime library
 Name: libXinerama
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_libdir}/pkgconfig/xinerama.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:15 -0500
Subject: rpms/libxkbfile/devel libxkbfile.spec,1.11,1.12
Message-ID: <200602110420.k1B4KFuG008905@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxkbfile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8874

Modified Files:
	libxkbfile.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxkbfile.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxkbfile.spec	7 Feb 2006 12:49:02 -0000	1.11
+++ libxkbfile.spec	11 Feb 2006 04:20:12 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -82,6 +82,9 @@
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:26 -0500
Subject: rpms/libxkbui/devel libxkbui.spec,1.9,1.10
Message-ID: <200602110420.k1B4KQjp009036@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxkbui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8998

Modified Files:
	libxkbui.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxkbui.spec
===================================================================
RCS file: /cvs/dist/rpms/libxkbui/devel/libxkbui.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxkbui.spec	7 Feb 2006 12:49:10 -0000	1.9
+++ libxkbui.spec	11 Feb 2006 04:20:23 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbui runtime library
 Name: libxkbui
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -76,6 +76,9 @@
 %{_libdir}/pkgconfig/xkbui.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:37 -0500
Subject: rpms/libxklavier/devel libxklavier.spec,1.15,1.16
Message-ID: <200602110420.k1B4Kb39009162@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9132

Modified Files:
	libxklavier.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libxklavier.spec	7 Feb 2006 12:49:17 -0000	1.15
+++ libxklavier.spec	11 Feb 2006 04:20:34 -0000	1.16
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	2.1
-Release:	3.1
+Release:	3.2
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -71,6 +71,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:47 -0500
Subject: rpms/libxml/devel libxml.spec,1.18,1.19
Message-ID: <200602110420.k1B4KlbQ009285@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9256

Modified Files:
	libxml.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxml.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml/devel/libxml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libxml.spec	7 Feb 2006 12:49:25 -0000	1.18
+++ libxml.spec	11 Feb 2006 04:20:44 -0000	1.19
@@ -1,7 +1,7 @@
 Name:		libxml
 Summary:	libXML library
 Version:	1.8.17
-Release: 13.2
+Release: 13.2.1
 Epoch:		1
 License:	LGPL
 Group:		Development/Libraries
@@ -71,6 +71,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.8.17-13.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.8.17-13.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:20:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:20:58 -0500
Subject: rpms/libxml2/devel libxml2.spec,1.33,1.34
Message-ID: <200602110420.k1B4Kwo3009412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxml2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9381

Modified Files:
	libxml2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxml2.spec
===================================================================
RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libxml2.spec	7 Feb 2006 12:49:32 -0000	1.33
+++ libxml2.spec	11 Feb 2006 04:20:55 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.23
-Release: 1.1
+Release: 1.2
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -127,6 +127,9 @@
 %doc doc/python.html
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.23-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.23-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:21:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:21:10 -0500
Subject: rpms/libXmu/devel libXmu.spec,1.9,1.10
Message-ID: <200602110421.k1B4LAic009557@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXmu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9526

Modified Files:
	libXmu.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXmu.spec
===================================================================
RCS file: /cvs/dist/rpms/libXmu/devel/libXmu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXmu.spec	7 Feb 2006 12:49:42 -0000	1.9
+++ libXmu.spec	11 Feb 2006 04:21:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
 Name: libXmu
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -105,6 +105,9 @@
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:21:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:21:22 -0500
Subject: rpms/libXp/devel libXp.spec,1.10,1.11
Message-ID: <200602110421.k1B4LM5O009696@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9665

Modified Files:
	libXp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXp.spec
===================================================================
RCS file: /cvs/dist/rpms/libXp/devel/libXp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXp.spec	7 Feb 2006 12:49:50 -0000	1.10
+++ libXp.spec	11 Feb 2006 04:21:19 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: X.Org X11 libXp runtime library
 Name: libXp
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -98,6 +98,9 @@
 %endif
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:21:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:21:33 -0500
Subject: rpms/libXpm/devel libXpm.spec,1.10,1.11
Message-ID: <200602110421.k1B4LXuq009839@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9801

Modified Files:
	libXpm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXpm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXpm/devel/libXpm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXpm.spec	7 Feb 2006 12:49:58 -0000	1.10
+++ libXpm.spec	11 Feb 2006 04:21:30 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
 Version: 3.5.4.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -89,6 +89,9 @@
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:21:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:21:46 -0500
Subject: rpms/libXrandr/devel libXrandr.spec,1.9,1.10
Message-ID: <200602110421.k1B4Lkjt009992@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrandr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9961

Modified Files:
	libXrandr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXrandr.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrandr/devel/libXrandr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXrandr.spec	7 Feb 2006 12:50:20 -0000	1.9
+++ libXrandr.spec	11 Feb 2006 04:21:44 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
 Version: 1.1.0.2
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0.2-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.0.2-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:21:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:21:57 -0500
Subject: rpms/libXrender/devel libXrender.spec,1.10,1.11
Message-ID: <200602110421.k1B4Lvfe010114@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXrender/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10086

Modified Files:
	libXrender.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXrender.spec
===================================================================
RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXrender.spec	7 Feb 2006 12:50:28 -0000	1.10
+++ libXrender.spec	11 Feb 2006 04:21:55 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
 Version: 0.9.0.2
-Release: 3.1
+Release: 3.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0.2-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0.2-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:22:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:22:07 -0500
Subject: rpms/libXres/devel libXres.spec,1.9,1.10
Message-ID: <200602110422.k1B4M7CM010235@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXres/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10207

Modified Files:
	libXres.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXres.spec
===================================================================
RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXres.spec	7 Feb 2006 12:50:42 -0000	1.9
+++ libXres.spec	11 Feb 2006 04:22:04 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXres runtime library
 Name: libXres
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -78,6 +78,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:22:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:22:18 -0500
Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.14,1.15
Message-ID: <200602110422.k1B4MIr1010360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXScrnSaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10330

Modified Files:
	libXScrnSaver.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXScrnSaver.spec
===================================================================
RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXScrnSaver.spec	7 Feb 2006 12:50:50 -0000	1.14
+++ libXScrnSaver.spec	11 Feb 2006 04:22:15 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:22:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:22:29 -0500
Subject: rpms/libxslt/devel libxslt.spec,1.35,1.36
Message-ID: <200602110422.k1B4MTci010492@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libxslt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10462

Modified Files:
	libxslt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libxslt.spec
===================================================================
RCS file: /cvs/dist/rpms/libxslt/devel/libxslt.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libxslt.spec	7 Feb 2006 12:50:57 -0000	1.35
+++ libxslt.spec	11 Feb 2006 04:22:26 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.15
-Release: 1.2
+Release: 1.2.1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
@@ -119,6 +119,9 @@
 %doc python/tests/*.xsl
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.15-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.15-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:22:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:22:41 -0500
Subject: rpms/libXt/devel libXt.spec,1.14,1.15
Message-ID: <200602110422.k1B4MfGb010625@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10596

Modified Files:
	libXt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXt.spec
===================================================================
RCS file: /cvs/dist/rpms/libXt/devel/libXt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libXt.spec	7 Feb 2006 12:51:06 -0000	1.14
+++ libXt.spec	11 Feb 2006 04:22:39 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -129,6 +129,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:22:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:22:51 -0500
Subject: rpms/libXTrap/devel libXTrap.spec,1.9,1.10
Message-ID: <200602110422.k1B4MprT010749@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXTrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10716

Modified Files:
	libXTrap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXTrap.spec
===================================================================
RCS file: /cvs/dist/rpms/libXTrap/devel/libXTrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXTrap.spec	7 Feb 2006 12:51:14 -0000	1.9
+++ libXTrap.spec	11 Feb 2006 04:22:49 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXTrap runtime library
 Name: libXTrap
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xtrap.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:02 -0500
Subject: rpms/libXtst/devel libXtst.spec,1.9,1.10
Message-ID: <200602110423.k1B4N2xJ010875@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXtst/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10838

Modified Files:
	libXtst.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXtst.spec
===================================================================
RCS file: /cvs/dist/rpms/libXtst/devel/libXtst.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXtst.spec	7 Feb 2006 12:51:22 -0000	1.9
+++ libXtst.spec	11 Feb 2006 04:22:59 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -73,6 +73,9 @@
 %{_libdir}/pkgconfig/xtst.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:12 -0500
Subject: rpms/libXv/devel libXv.spec,1.10,1.11
Message-ID: <200602110423.k1B4NCYB011002@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10970

Modified Files:
	libXv.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXv.spec
===================================================================
RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXv.spec	7 Feb 2006 12:51:30 -0000	1.10
+++ libXv.spec	11 Feb 2006 04:23:09 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXv runtime library
 Name: libXv
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -79,6 +79,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:21 -0500
Subject: rpms/libXvMC/devel libXvMC.spec,1.10,1.11
Message-ID: <200602110423.k1B4NLaq011127@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11100

Modified Files:
	libXvMC.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXvMC.spec	7 Feb 2006 12:51:37 -0000	1.10
+++ libXvMC.spec	11 Feb 2006 04:23:19 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.1
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -85,6 +85,9 @@
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:31 -0500
Subject: rpms/libXxf86dga/devel libXxf86dga.spec,1.9,1.10
Message-ID: <200602110423.k1B4NVa9011247@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86dga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11219

Modified Files:
	libXxf86dga.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXxf86dga.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86dga/devel/libXxf86dga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXxf86dga.spec	7 Feb 2006 12:51:45 -0000	1.9
+++ libXxf86dga.spec	11 Feb 2006 04:23:28 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:41 -0500
Subject: rpms/libXxf86misc/devel libXxf86misc.spec,1.9,1.10
Message-ID: <200602110423.k1B4NfnN011377@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86misc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11348

Modified Files:
	libXxf86misc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXxf86misc.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86misc/devel/libXxf86misc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libXxf86misc.spec	7 Feb 2006 12:51:52 -0000	1.9
+++ libXxf86misc.spec	11 Feb 2006 04:23:39 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86misc runtime library
 Name: libXxf86misc
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -74,6 +74,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:23:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:23:51 -0500
Subject: rpms/libXxf86vm/devel libXxf86vm.spec,1.10,1.11
Message-ID: <200602110423.k1B4Np5V011501@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/libXxf86vm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11469

Modified Files:
	libXxf86vm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: libXxf86vm.spec
===================================================================
RCS file: /cvs/dist/rpms/libXxf86vm/devel/libXxf86vm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libXxf86vm.spec	7 Feb 2006 12:52:00 -0000	1.10
+++ libXxf86vm.spec	11 Feb 2006 04:23:49 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXxf86vm runtime library
 Name: libXxf86vm
 Version: 1.0.0
-Release: 2.1
+Release: 2.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -75,6 +75,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:24:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:24:01 -0500
Subject: rpms/linux-atm/devel linux-atm.spec,1.12,1.13
Message-ID: <200602110424.k1B4O11X011635@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linux-atm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11597

Modified Files:
	linux-atm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: linux-atm.spec
===================================================================
RCS file: /cvs/dist/rpms/linux-atm/devel/linux-atm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-atm.spec	7 Feb 2006 12:52:08 -0000	1.12
+++ linux-atm.spec	11 Feb 2006 04:23:59 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Tools to support ATM networking under Linux
 Name: linux-atm
 Version: 2.5.0
-Release: 0.20050118.3.1
+Release: 0.20050118.3.2
 License: BSD, GPL, LGPL
 URL: http://linux-atm.sourceforge.net/
 Group: System Environment/Daemons
@@ -85,6 +85,9 @@
 %{_libdir}/libatm.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.0-0.20050118.3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:24:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:24:13 -0500
Subject: rpms/linuxdoc-tools/devel linuxdoc-tools.spec,1.19,1.20
Message-ID: <200602110424.k1B4ODJN011770@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxdoc-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11737

Modified Files:
	linuxdoc-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: linuxdoc-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxdoc-tools/devel/linuxdoc-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- linuxdoc-tools.spec	7 Feb 2006 12:52:16 -0000	1.19
+++ linuxdoc-tools.spec	11 Feb 2006 04:24:10 -0000	1.20
@@ -5,7 +5,7 @@
 Obsoletes: sgml-tools
 Obsoletes: linuxdoc-sgml
 Version: 0.9.21
-Release: 6.2
+Release: 6.2.1
 License: Freely distributable
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -100,6 +100,9 @@
 %{_mandir}/*/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.21-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:24:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:24:40 -0500
Subject: rpms/linuxwacom/devel linuxwacom.spec,1.27,1.28
Message-ID: <200602110424.k1B4Oe6o012025@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11997

Modified Files:
	linuxwacom.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- linuxwacom.spec	7 Feb 2006 12:52:23 -0000	1.27
+++ linuxwacom.spec	11 Feb 2006 04:24:37 -0000	1.28
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.2
 Epoch:		0
-Release:	1.1
+Release:	1.2
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -97,6 +97,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:24:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:24:50 -0500
Subject: rpms/lksctp-tools/devel lksctp-tools.spec,1.10,1.11
Message-ID: <200602110424.k1B4OoQb012150@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lksctp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12120

Modified Files:
	lksctp-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lksctp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/lksctp-tools/devel/lksctp-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lksctp-tools.spec	7 Feb 2006 12:52:31 -0000	1.10
+++ lksctp-tools.spec	11 Feb 2006 04:24:47 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: User-space access to Linux Kernel SCTP
 Name: lksctp-tools
 Version: 1.0.5
-Release: 1.fc5.1
+Release: 1.fc5.2
 License: LGPL
 Group: System Environment/Libraries
 URL: http://lksctp.sourceforge.net/
@@ -89,6 +89,9 @@
 %doc doc/*.txt
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:00 -0500
Subject: rpms/lockdev/devel lockdev.spec,1.22,1.23
Message-ID: <200602110425.k1B4P0tC012278@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lockdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12248

Modified Files:
	lockdev.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lockdev.spec
===================================================================
RCS file: /cvs/dist/rpms/lockdev/devel/lockdev.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lockdev.spec	7 Feb 2006 12:52:47 -0000	1.22
+++ lockdev.spec	11 Feb 2006 04:24:58 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A library for locking devices.
 Name: lockdev
 Version: 1.0.1
-Release: 9.2
+Release: 9.2.1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
@@ -81,6 +81,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:11 -0500
Subject: rpms/logrotate/devel logrotate.spec,1.43,1.44
Message-ID: <200602110425.k1B4PBiu012412@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/logrotate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12379

Modified Files:
	logrotate.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: logrotate.spec
===================================================================
RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- logrotate.spec	7 Feb 2006 12:52:55 -0000	1.43
+++ logrotate.spec	11 Feb 2006 04:25:09 -0000	1.44
@@ -5,7 +5,7 @@
 Summary: Rotates, compresses, removes and mails system log files.
 Name: logrotate
 Version: 3.7.3
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: System Environment/Base
 Source: logrotate-%{PACKAGE_VERSION}.tar.gz
@@ -56,6 +56,9 @@
 %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.7.3-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.7.3-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:25 -0500
Subject: rpms/lrzsz/devel lrzsz.spec,1.15,1.16
Message-ID: <200602110425.k1B4PPFW012559@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lrzsz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12524

Modified Files:
	lrzsz.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lrzsz.spec
===================================================================
RCS file: /cvs/dist/rpms/lrzsz/devel/lrzsz.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lrzsz.spec	7 Feb 2006 12:53:03 -0000	1.15
+++ lrzsz.spec	11 Feb 2006 04:25:22 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The lrz and lsz modem communications programs.
 Name: lrzsz
 Version: 0.12.20
-Release: 21.2
+Release: 21.2.1
 License: GPL
 Group: Applications/Communications
 Source: http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
@@ -43,6 +43,9 @@
 %{_mandir}/*/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12.20-21.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:35 -0500
Subject: rpms/lslk/devel lslk.spec,1.16,1.17
Message-ID: <200602110425.k1B4PZ44012697@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lslk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12666

Modified Files:
	lslk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lslk.spec
===================================================================
RCS file: /cvs/dist/rpms/lslk/devel/lslk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lslk.spec	7 Feb 2006 12:53:10 -0000	1.16
+++ lslk.spec	11 Feb 2006 04:25:33 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A lock file lister.
 Name: lslk
 Version: 1.29
-Release: 16.2
+Release: 16.2.1
 License: Free
 Group: Development/Debuggers
 Source: ftp://vic.cc.purdue.edu/pub/tools/unix/lslk/lslk_%{version}_W.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.29-16.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:46 -0500
Subject: rpms/lsof/devel lsof.spec,1.23,1.24
Message-ID: <200602110425.k1B4PkZY012826@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12800

Modified Files:
	lsof.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lsof.spec	7 Feb 2006 12:53:18 -0000	1.23
+++ lsof.spec	11 Feb 2006 04:25:43 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.76
-Release: 1.2
+Release: 1.2.1
 License: Free
 %define lsofrh lsof_%{version}-rh
 Group: Development/Debuggers
@@ -43,6 +43,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.76-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.76-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:25:58 -0500
Subject: rpms/ltrace/devel ltrace.spec,1.22,1.23
Message-ID: <200602110425.k1B4Pwuv012961@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ltrace.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ltrace.spec
===================================================================
RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ltrace.spec	7 Feb 2006 12:53:26 -0000	1.22
+++ ltrace.spec	11 Feb 2006 04:25:55 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables.
 Name: ltrace
 Version: 0.3.36
-Release: 4.1
+Release: 4.2
 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz
 Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz
 Patch2: ltrace-ppc64.patch
@@ -59,6 +59,9 @@
 %config /etc/ltrace.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.36-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.36-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:26:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:26:08 -0500
Subject: rpms/lv/devel lv.spec,1.21,1.22
Message-ID: <200602110426.k1B4Q8vY013095@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13066

Modified Files:
	lv.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lv.spec
===================================================================
RCS file: /cvs/dist/rpms/lv/devel/lv.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- lv.spec	7 Feb 2006 12:53:34 -0000	1.21
+++ lv.spec	11 Feb 2006 04:26:05 -0000	1.22
@@ -3,7 +3,7 @@
 Summary:	A Powerful Multilingual File Viewer
 Name:		lv
 Version:	4.51
-Release: 7.2
+Release: 7.2.1
 License: distributable
 Group: Applications/Text
 URL: http://www.ff.iij4u.or.jp/~nrt/lv/
@@ -61,6 +61,9 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.51-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.51-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:26:18 -0500
Subject: rpms/lvm2/devel lvm2.spec,1.60,1.61
Message-ID: <200602110426.k1B4QIVw013228@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13196

Modified Files:
	lvm2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- lvm2.spec	7 Feb 2006 12:53:42 -0000	1.60
+++ lvm2.spec	11 Feb 2006 04:26:16 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.01
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -68,6 +68,9 @@
 /var/lock/lvm
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.02.01-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.02.01-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:26:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:26:31 -0500
Subject: rpms/lynx/devel lynx.spec,1.32,1.33
Message-ID: <200602110426.k1B4QV8T013367@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lynx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13338

Modified Files:
	lynx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: lynx.spec
===================================================================
RCS file: /cvs/dist/rpms/lynx/devel/lynx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lynx.spec	7 Feb 2006 12:53:50 -0000	1.32
+++ lynx.spec	11 Feb 2006 04:26:28 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 27.2
+Release: 27.2.1
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5rel.1.tar.bz2
@@ -96,6 +96,9 @@
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-27.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8.5-27.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:26:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:26:44 -0500
Subject: rpms/m17n-lib/devel m17n-lib.spec,1.6,1.7
Message-ID: <200602110426.k1B4Qiwb013519@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	m17n-lib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-lib/devel/m17n-lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- m17n-lib.spec	10 Feb 2006 02:54:37 -0000	1.6
+++ m17n-lib.spec	11 Feb 2006 04:26:41 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:		m17n-lib
 Version:	1.3.2
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Multilingual text library
 
 Group:		System Environment/Libraries
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.2-1.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-1
 - update to 1.3.2 release
   - m17n-lib-no-gui-headers.patch is now upstream



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:26:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:26:56 -0500
Subject: rpms/m2crypto/devel m2crypto.spec,1.19,1.20
Message-ID: <200602110426.k1B4QuIi013656@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/m2crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13632

Modified Files:
	m2crypto.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: m2crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- m2crypto.spec	7 Feb 2006 12:54:07 -0000	1.19
+++ m2crypto.spec	11 Feb 2006 04:26:54 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Support for using OpenSSL in python scripts.
 Name: m2crypto
 Version: 0.15
-Release: 3.1
+Release: 3.2
 # http://svn.osafoundation.org/m2crypto/tags/0.15
 Source0: m2crypto-%{version}.tar.bz2
 Patch0: m2crypto-0.13-SSLServer.patch
@@ -52,6 +52,9 @@
 %{_libdir}/python%{pythonver}/site-packages/M2Crypto
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.15-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:27:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:27:06 -0500
Subject: rpms/m4/devel m4.spec,1.19,1.20
Message-ID: <200602110427.k1B4R6Yj013794@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	m4.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: m4.spec
===================================================================
RCS file: /cvs/dist/rpms/m4/devel/m4.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- m4.spec	7 Feb 2006 12:54:19 -0000	1.19
+++ m4.spec	11 Feb 2006 04:27:04 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor.
 Name: m4
 Version: 1.4.4
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -50,6 +50,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:27:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:27:18 -0500
Subject: rpms/macutils/devel macutils.spec,1.17,1.18
Message-ID: <200602110427.k1B4RIgb013929@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/macutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13898

Modified Files:
	macutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: macutils.spec
===================================================================
RCS file: /cvs/dist/rpms/macutils/devel/macutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- macutils.spec	7 Feb 2006 12:54:29 -0000	1.17
+++ macutils.spec	11 Feb 2006 04:27:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Utilities for manipulating Macintosh file formats.
 Name: macutils
 Version: 2.0b3
-Release: 32.2
+Release: 32.2.1
 License: Distributable
 Group: Applications/System
 Source: ftp://sunsite.unc.edu/pub/Linux/utils/compress/%{name}.tar.gz
@@ -48,6 +48,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0b3-32.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0b3-32.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:27:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:27:28 -0500
Subject: rpms/magma/devel magma.spec,1.26,1.27
Message-ID: <200602110427.k1B4RSCc014050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/magma/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14019

Modified Files:
	magma.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: magma.spec
===================================================================
RCS file: /cvs/dist/rpms/magma/devel/magma.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- magma.spec	7 Feb 2006 12:54:40 -0000	1.26
+++ magma.spec	11 Feb 2006 04:27:25 -0000	1.27
@@ -12,7 +12,7 @@
 
 Name: magma
 Version: 1.0.3
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Libraries
 Summary: A cluster/lock manager API abstraction library
@@ -79,6 +79,9 @@
 %{_mandir}/man3/clu_get_event.3.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:27:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:27:40 -0500
Subject: rpms/mailman/devel mailman.spec,1.53,1.54
Message-ID: <200602110427.k1B4Ref5014189@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailman/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14155

Modified Files:
	mailman.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mailman.spec
===================================================================
RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mailman.spec	7 Feb 2006 12:55:00 -0000	1.53
+++ mailman.spec	11 Feb 2006 04:27:37 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access.
 Name: mailman
 Version: 2.1.7
-Release: 1.1
+Release: 1.2
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -328,6 +328,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3:2.1.7-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:2.1.7-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:27:53 -0500
Subject: rpms/mailx/devel mailx.spec,1.21,1.22
Message-ID: <200602110427.k1B4Rr6r014341@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mailx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14310

Modified Files:
	mailx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mailx.spec
===================================================================
RCS file: /cvs/dist/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mailx.spec	7 Feb 2006 12:55:13 -0000	1.21
+++ mailx.spec	11 Feb 2006 04:27:51 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: The /bin/mail program for sending e-mail messages.
 Name: mailx
 Version: 8.1.1
-Release: 44.2
+Release: 44.2.1
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.debian.org/pub/debian/hamm/source/mail/mailx-8.1.1.tar.gz
@@ -106,6 +106,9 @@
 %{_mandir}/man1/Mail.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-44.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:28:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:28:04 -0500
Subject: rpms/make/devel make.spec,1.25,1.26
Message-ID: <200602110428.k1B4S4rQ014471@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/make/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14439

Modified Files:
	make.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: make.spec
===================================================================
RCS file: /cvs/dist/rpms/make/devel/make.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- make.spec	7 Feb 2006 12:55:26 -0000	1.25
+++ make.spec	11 Feb 2006 04:28:02 -0000	1.26
@@ -2,7 +2,7 @@
 Name: make
 Epoch: 1
 Version: 3.80
-Release: 10.1
+Release: 10.2
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -86,6 +86,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.80-10.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.80-10.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:28:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:28:14 -0500
Subject: rpms/MAKEDEV/devel MAKEDEV.spec,1.50,1.51
Message-ID: <200602110428.k1B4SEZ9014601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/MAKEDEV/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14568

Modified Files:
	MAKEDEV.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: MAKEDEV.spec
===================================================================
RCS file: /cvs/dist/rpms/MAKEDEV/devel/MAKEDEV.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- MAKEDEV.spec	7 Feb 2006 19:05:29 -0000	1.50
+++ MAKEDEV.spec	11 Feb 2006 04:28:12 -0000	1.51
@@ -1,6 +1,6 @@
 Name: MAKEDEV
 Version: 3.21
-Release: 2
+Release: 2.1
 Group: System Environment/Base
 License: GPL
 Source: MAKEDEV-%{version}-%{release}.tar.gz
@@ -49,6 +49,9 @@
 %config %{_sysconfdir}/makedev.d
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.21-2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Nalin Dahyabhai <nalin at redhat.com> 3.21-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:28:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:28:24 -0500
Subject: rpms/man/devel man.spec,1.44,1.45
Message-ID: <200602110428.k1B4SOAK014720@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14693

Modified Files:
	man.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- man.spec	7 Feb 2006 12:55:58 -0000	1.44
+++ man.spec	11 Feb 2006 04:28:22 -0000	1.45
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.6c
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -320,6 +320,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6c-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6c-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:28:36 -0500
Subject: rpms/mc/devel mc.spec,1.79,1.80
Message-ID: <200602110428.k1B4SaUA014863@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14832

Modified Files:
	mc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mc.spec	7 Feb 2006 12:56:09 -0000	1.79
+++ mc.spec	11 Feb 2006 04:28:33 -0000	1.80
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	7.1
+Release:	7.2
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -182,6 +182,9 @@
 %dir %{_datadir}/mc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.6.1a-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.6.1a-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:29:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:29:56 -0500
Subject: rpms/mdadm/devel mdadm.spec,1.26,1.27
Message-ID: <200602110429.k1B4TuvT015014@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mdadm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14983

Modified Files:
	mdadm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mdadm.spec
===================================================================
RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mdadm.spec	7 Feb 2006 12:56:21 -0000	1.26
+++ mdadm.spec	11 Feb 2006 04:29:35 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:     mdadm controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     2.2
-Release: 1.fc5.2
+Release: 1.fc5.2.1
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     mdmpd-0.4.tgz
@@ -83,6 +83,9 @@
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-1.fc5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-1.fc5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:31:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:31:11 -0500
Subject: rpms/mesa/devel mesa.spec,1.40,1.41
Message-ID: <200602110431.k1B4VBFu015159@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15133

Modified Files:
	mesa.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mesa.spec	7 Feb 2006 11:21:32 -0000	1.40
+++ mesa.spec	11 Feb 2006 04:30:56 -0000	1.41
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 2
+Release: 2.1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -431,6 +431,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.4.2-2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-2
 - Added new "glx-utils" subpackage with glxgears and glxinfo (#173510)
 - Added mesa-6.4.2-dprintf-to-debugprintf-for-bug180122.patch to workaround



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:33:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:33:54 -0500
Subject: rpms/metacity/devel metacity.spec,1.51,1.52
Message-ID: <200602110433.k1B4Xsqc015317@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	metacity.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- metacity.spec	7 Feb 2006 12:56:43 -0000	1.51
+++ metacity.spec	11 Feb 2006 04:33:20 -0000	1.52
@@ -3,7 +3,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: 2.13.55
-Release: 1.1
+Release: 1.2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -106,6 +106,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.55-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.55-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:35:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:35:35 -0500
Subject: rpms/mgetty/devel mgetty.spec,1.35,1.36
Message-ID: <200602110435.k1B4ZZr7015505@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mgetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15474

Modified Files:
	mgetty.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mgetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mgetty.spec	7 Feb 2006 12:56:54 -0000	1.35
+++ mgetty.spec	11 Feb 2006 04:35:32 -0000	1.36
@@ -5,7 +5,7 @@
 Summary: A getty replacement for use with data and fax modems.
 Name: mgetty
 Version: 1.1.33
-Release: 7.FC5.1
+Release: 7.FC5.2
 Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz
 Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc
 Source2: logrotate.mgetty
@@ -341,6 +341,9 @@
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.33-7.FC5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.33-7.FC5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:36:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:36:09 -0500
Subject: rpms/mikmod/devel mikmod.spec,1.26,1.27
Message-ID: <200602110436.k1B4a9VJ015633@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mikmod/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15610

Modified Files:
	mikmod.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mikmod.spec
===================================================================
RCS file: /cvs/dist/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mikmod.spec	7 Feb 2006 12:57:06 -0000	1.26
+++ mikmod.spec	11 Feb 2006 04:36:06 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: A MOD music file player.
 Name: mikmod
 Version: 3.1.6
-Release: 36.2
+Release: 36.2.1
 License: GPL/LGPL
 Group: Applications/Multimedia
 Prereq: /sbin/ldconfig
@@ -118,6 +118,9 @@
 %{_mandir}/man1/libmikmod-config*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.6-36.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.6-36.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:36:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:36:19 -0500
Subject: rpms/mingetty/devel mingetty.spec,1.14,1.15
Message-ID: <200602110436.k1B4aJOg015758@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mingetty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15728

Modified Files:
	mingetty.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mingetty.spec
===================================================================
RCS file: /cvs/dist/rpms/mingetty/devel/mingetty.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mingetty.spec	7 Feb 2006 12:57:17 -0000	1.14
+++ mingetty.spec	11 Feb 2006 04:36:17 -0000	1.15
@@ -2,7 +2,7 @@
 Name: mingetty
 Version: 1.07
 License: GPL
-Release: 5.2
+Release: 5.2.1
 Group: System Environment/Base
 Source: mingetty-%{version}.tar.gz
 Patch: mingetty-1.00-opt.patch
@@ -37,6 +37,9 @@
 %{_mandir}/man8/mingetty.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.07-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:36:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:36:30 -0500
Subject: rpms/minicom/devel minicom.spec,1.19,1.20
Message-ID: <200602110436.k1B4aUdo015896@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/minicom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15863

Modified Files:
	minicom.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: minicom.spec
===================================================================
RCS file: /cvs/dist/rpms/minicom/devel/minicom.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- minicom.spec	7 Feb 2006 12:57:27 -0000	1.19
+++ minicom.spec	11 Feb 2006 04:36:27 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
 Version: 2.1
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
@@ -81,6 +81,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:36:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:36:42 -0500
Subject: rpms/mktemp/devel mktemp.spec,1.21,1.22
Message-ID: <200602110436.k1B4aglx016030@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mktemp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16000

Modified Files:
	mktemp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mktemp.spec
===================================================================
RCS file: /cvs/dist/rpms/mktemp/devel/mktemp.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mktemp.spec	7 Feb 2006 12:57:48 -0000	1.21
+++ mktemp.spec	11 Feb 2006 04:36:40 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A small utility for safely making /tmp files.
 Name: mktemp
 Version: 1.5
-Release: 23.2
+Release: 23.2.1
 Epoch: 3
 License: BSD
 Group: System Environment/Base
@@ -39,6 +39,9 @@
 %{_mandir}/man1/mktemp.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3:1.5-23.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:1.5-23.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:36:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:36:52 -0500
Subject: rpms/mlocate/devel mlocate.spec,1.5,1.6
Message-ID: <200602110436.k1B4aqAT016152@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mlocate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16126

Modified Files:
	mlocate.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mlocate.spec
===================================================================
RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mlocate.spec	7 Feb 2006 12:57:59 -0000	1.5
+++ mlocate.spec	11 Feb 2006 04:36:49 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: An utility for finding files by name
 Name: mlocate
 Version: 0.12
-Release: 1.1
+Release: 1.2
 License: GPLv2
 Group: Applications/System
 Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %ghost /var/lib/mlocate/mlocate.db
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.12-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.12-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:03 -0500
Subject: rpms/mod_auth_kerb/devel mod_auth_kerb.spec,1.10,1.11
Message-ID: <200602110437.k1B4b3pU016275@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_kerb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16251

Modified Files:
	mod_auth_kerb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_auth_kerb.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_kerb/devel/mod_auth_kerb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_auth_kerb.spec	7 Feb 2006 12:58:09 -0000	1.10
+++ mod_auth_kerb.spec	11 Feb 2006 04:37:00 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Kerberos authentication module for HTTP
 Name: mod_auth_kerb
 Version: 5.0
-Release: 8.2
+Release: 8.2.1
 License: Apache
 Group: System Environment/Daemons
 URL: http://modauthkerb.sourceforge.net/
@@ -54,6 +54,9 @@
 %{_libdir}/httpd/modules/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0-8.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:13 -0500
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql.spec,1.21,1.22
Message-ID: <200602110437.k1B4bDKD016399@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16370

Modified Files:
	mod_auth_mysql.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_auth_mysql.spec	7 Feb 2006 12:58:19 -0000	1.21
+++ mod_auth_mysql.spec	11 Feb 2006 04:37:11 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Basic authentication for the Apache web server using a MySQL database.
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 2.2
+Release: 2.2.1
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
@@ -45,6 +45,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.0-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.0-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:24 -0500
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.22,1.23
Message-ID: <200602110437.k1B4bN76016526@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16496

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_auth_pgsql.spec	7 Feb 2006 12:58:30 -0000	1.22
+++ mod_auth_pgsql.spec	11 Feb 2006 04:37:21 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache web server using a PostgreSQL database.
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 2.1
+Release: 2.2
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -51,6 +51,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:29 -0500
Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.13,1.14
Message-ID: <200602110437.k1B4bTE4016617@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_authz_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16589

Modified Files:
	mod_authz_ldap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_authz_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_authz_ldap.spec	7 Feb 2006 12:58:39 -0000	1.13
+++ mod_authz_ldap.spec	11 Feb 2006 04:37:26 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: LDAP authorization module for the Apache HTTP Server
 Name: mod_authz_ldap
 Version: 0.26
-Release: 6.2
+Release: 6.2.1
 License: BSD
 Group: System Environment/Daemons
 URL: http://authzldap.othello.ch/
@@ -73,6 +73,9 @@
 %doc NEWS AUTHORS ChangeLog COPYING INSTALL
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.26-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.26-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:41 -0500
Subject: rpms/mod_perl/devel mod_perl.spec,1.37,1.38
Message-ID: <200602110437.k1B4bfQ0016753@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16723

Modified Files:
	mod_perl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_perl.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_perl.spec	9 Feb 2006 17:31:32 -0000	1.37
+++ mod_perl.spec	11 Feb 2006 04:37:38 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:           mod_perl
 Version:        2.0.2
-Release:        5
+Release:        5.1
 Summary:        An embedded Perl interpreter for the Apache Web server
 
 Group:          System Environment/Daemons
@@ -132,6 +132,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-5.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:37:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:37:52 -0500
Subject: rpms/mod_python/devel mod_python.spec,1.26,1.27
Message-ID: <200602110437.k1B4bqaI016888@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16860

Modified Files:
	mod_python.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_python.spec	7 Feb 2006 12:59:04 -0000	1.26
+++ mod_python.spec	11 Feb 2006 04:37:50 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
 Version: 3.1.4
-Release: 3.2
+Release: 3.2.1
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch1: mod_python-3.1.3-maxlocks.patch
@@ -70,6 +70,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.4-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.4-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:03 -0500
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.17,1.18
Message-ID: <200602110438.k1B4c3i4017016@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16986

Modified Files:
	module-init-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- module-init-tools.spec	7 Feb 2006 12:59:16 -0000	1.17
+++ module-init-tools.spec	11 Feb 2006 04:38:01 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.2.1
+Release: 0.%{preversion}.2.2
 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
@@ -90,6 +90,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.pre9.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.pre9.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:14 -0500
Subject: rpms/mozplugger/devel mozplugger.spec,1.20,1.21
Message-ID: <200602110438.k1B4cEXw017141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mozplugger/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17112

Modified Files:
	mozplugger.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mozplugger.spec
===================================================================
RCS file: /cvs/dist/rpms/mozplugger/devel/mozplugger.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mozplugger.spec	7 Feb 2006 13:00:14 -0000	1.20
+++ mozplugger.spec	11 Feb 2006 04:38:11 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A generic mozilla plug-in
 Name: mozplugger
 Version: 1.7.3
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Internet
 Url: http://mozplugger.mozdev.org/
@@ -48,6 +48,9 @@
 %{_mandir}/man7/mozplugger.7*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7.3-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:24 -0500
Subject: rpms/mpage/devel mpage.spec,1.22,1.23
Message-ID: <200602110438.k1B4cOO1017277@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mpage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17247

Modified Files:
	mpage.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mpage.spec
===================================================================
RCS file: /cvs/dist/rpms/mpage/devel/mpage.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mpage.spec	9 Feb 2006 10:28:55 -0000	1.22
+++ mpage.spec	11 Feb 2006 04:38:22 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A tool for printing multiple pages of text on each printed page.
 Name: mpage
 Version: 2.5.4
-Release: 6
+Release: 6.1
 License: GPL
 Group: Applications/Publishing
 Source: ftp://ftp.mesa.nl/pub/mpage/mpage-%{version}.tgz
@@ -47,6 +47,9 @@
 %{_datadir}/mpage
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-6.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb 08 2006 Jitka Kudrnacova <jkudrnac at redhat.com> 2.5.4-6
 - Fixed page scaling (bug #173276) and modified the manpage
   (the bug was mentioned in the manpage)



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:36 -0500
Subject: rpms/mrtg/devel mrtg.spec,1.25,1.26
Message-ID: <200602110438.k1B4caCh017408@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17377

Modified Files:
	mrtg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mrtg.spec	7 Feb 2006 13:03:23 -0000	1.25
+++ mrtg.spec	11 Feb 2006 04:38:34 -0000	1.26
@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.13.0
-Release:   1.1
+Release:   1.2
 URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
 Source0:   http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
 Source1:   mrtg.cfg
@@ -110,6 +110,9 @@
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:47 -0500
Subject: rpms/mtools/devel mtools.spec,1.20,1.21
Message-ID: <200602110438.k1B4cl01017526@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17497

Modified Files:
	mtools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mtools.spec
===================================================================
RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mtools.spec	7 Feb 2006 13:04:15 -0000	1.20
+++ mtools.spec	11 Feb 2006 04:38:45 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Programs for accessing MS-DOS disks without mounting the disks.
 Name: mtools
 Version: 3.9.10
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/System
 Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.9.10-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:38:59 -0500
Subject: rpms/mtr/devel mtr.spec,1.31,1.32
Message-ID: <200602110438.k1B4cxWT017657@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17630

Modified Files:
	mtr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mtr.spec
===================================================================
RCS file: /cvs/dist/rpms/mtr/devel/mtr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mtr.spec	7 Feb 2006 13:04:52 -0000	1.31
+++ mtr.spec	11 Feb 2006 04:38:56 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool.
 Name: mtr
 Version: 0.69
-Release: 7.2
+Release: 7.2.1
 Epoch:	2
 Group: Applications/Internet
 License: GPL
@@ -98,6 +98,9 @@
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:0.69-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:0.69-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:39:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:39:09 -0500
Subject: rpms/mt-st/devel mt-st.spec,1.20,1.21
Message-ID: <200602110439.k1B4d9Dv017778@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mt-st/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17748

Modified Files:
	mt-st.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mt-st.spec
===================================================================
RCS file: /cvs/dist/rpms/mt-st/devel/mt-st.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mt-st.spec	7 Feb 2006 13:05:35 -0000	1.20
+++ mt-st.spec	11 Feb 2006 04:39:06 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Install mt-st if you need a tool to control tape drives.
 Name: mt-st
 Version: 0.9b
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://metalab.unc.edu/pub/Linux/system/backup/mt-st-%{version}.tar.gz
@@ -44,6 +44,9 @@
 %{_mandir}/man[18]/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9b-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9b-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:39:19 -0500
Subject: rpms/mtx/devel mtx.spec,1.18,1.19
Message-ID: <200602110439.k1B4dJWA017902@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mtx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17871

Modified Files:
	mtx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mtx.spec
===================================================================
RCS file: /cvs/dist/rpms/mtx/devel/mtx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mtx.spec	7 Feb 2006 13:06:27 -0000	1.18
+++ mtx.spec	11 Feb 2006 04:39:16 -0000	1.19
@@ -1,6 +1,6 @@
 Name: mtx
 Version: 1.2.18
-Release: 8.2
+Release: 8.2.1
 Summary: A SCSI media changer control program.
 License: GPL
 Group: Applications/System
@@ -49,6 +49,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.18-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.18-8.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:39:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:39:31 -0500
Subject: rpms/mutt/devel mutt.spec,1.31,1.32
Message-ID: <200602110439.k1B4dV3D018032@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mutt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18003

Modified Files:
	mutt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mutt.spec
===================================================================
RCS file: /cvs/dist/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mutt.spec	7 Feb 2006 13:06:50 -0000	1.31
+++ mutt.spec	11 Feb 2006 04:39:27 -0000	1.32
@@ -2,7 +2,7 @@
 Name: mutt
 %define uversion 0.9
 Version: 1.4.2.1
-Release: 6.2
+Release: 6.2.1
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -154,6 +154,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5:1.4.2.1-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:1.4.2.1-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:39:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:39:43 -0500
Subject: rpms/mx/devel mx.spec,1.14,1.15
Message-ID: <200602110439.k1B4dhlh018170@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18142

Modified Files:
	mx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mx.spec
===================================================================
RCS file: /cvs/dist/rpms/mx/devel/mx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mx.spec	7 Feb 2006 13:07:14 -0000	1.14
+++ mx.spec	11 Feb 2006 04:39:40 -0000	1.15
@@ -4,7 +4,7 @@
 Summary:  A collection of Python software tools.
 Name: mx%{pybasever}
 Version: 2.0.6
-Release: 2.2
+Release: 2.2.1
 URL: http://www.lemburg.com/files/python/eGenix-mx-Extensions.html
 Source0: http://www.lemburg.com/python/egenix-mx-base-%{version}.tar.gz
 Patch0: egenix-mx-base-2.0.2-pyconfig.patch
@@ -65,6 +65,9 @@
 %{_prefix}/%{_lib}/python*/site-packages/mx
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.6-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:39:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:39:54 -0500
Subject: rpms/mx4j/devel mx4j.spec,1.43,1.44
Message-ID: <200602110439.k1B4dsSO018297@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18270

Modified Files:
	mx4j.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mx4j.spec	9 Feb 2006 20:11:37 -0000	1.43
+++ mx4j.spec	11 Feb 2006 04:39:51 -0000	1.44
@@ -1,6 +1,6 @@
 %define name        mx4j
 %define version     3.0.1
-%define release     1jpp_8fc
+%define release     1jpp_9fc
 %define section     free
 
 Name:           %{name}
@@ -182,6 +182,9 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_9fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_8fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 - remove dep on jonathan-rmi



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:40:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:40:05 -0500
Subject: rpms/mysql/devel mysql.spec,1.72,1.73
Message-ID: <200602110440.k1B4e5LC018424@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mysql.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mysql.spec	9 Feb 2006 21:25:10 -0000	1.72
+++ mysql.spec	11 Feb 2006 04:40:02 -0000	1.73
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.18
-Release: 2
+Release: 2.1
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -380,6 +380,9 @@
 %{_datadir}/sql-bench
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0.18-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Tom Lane <tgl at redhat.com> 5.0.18-2
 - err-log option has been renamed to log-error, fix my.cnf and initscript
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:40:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:40:40 -0500
Subject: rpms/mysqlclient10/devel mysqlclient10.spec,1.12,1.13
Message-ID: <200602110440.k1B4ee1a018717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18686

Modified Files:
	mysqlclient10.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mysqlclient10.spec	7 Feb 2006 13:08:41 -0000	1.12
+++ mysqlclient10.spec	11 Feb 2006 04:40:37 -0000	1.13
@@ -1,6 +1,6 @@
 Name: mysqlclient10
 Version: 3.23.58
-Release: 9.1
+Release: 9.2
 Summary: Backlevel MySQL shared libraries.
 License: LGPL
 Group: Applications/Databases
@@ -151,6 +151,9 @@
 %{_libdir}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.23.58-9.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.23.58-9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:40:57 -0500
Subject: rpms/mysqlclient14/devel mysqlclient14.spec,1.6,1.7
Message-ID: <200602110440.k1B4evW9018897@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mysqlclient14/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18868

Modified Files:
	mysqlclient14.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mysqlclient14.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient14/devel/mysqlclient14.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mysqlclient14.spec	7 Feb 2006 13:08:57 -0000	1.6
+++ mysqlclient14.spec	11 Feb 2006 04:40:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name: mysqlclient14
 Version: 4.1.14
-Release: 4.1
+Release: 4.2
 Summary: Backlevel MySQL shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -158,6 +158,9 @@
 %{_libdir}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.14-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.14-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:41:14 -0500
Subject: rpms/mysql-connector-odbc/devel mysql-connector-odbc.spec,1.3,1.4
Message-ID: <200602110441.k1B4fEtT019073@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	mysql-connector-odbc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: mysql-connector-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mysql-connector-odbc.spec	7 Feb 2006 13:09:27 -0000	1.3
+++ mysql-connector-odbc.spec	11 Feb 2006 04:41:11 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 3.51.12
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.mysql.com/downloads/api-myodbc.html
@@ -65,6 +65,9 @@
 %{_libdir}/lib*so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.51.12-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.51.12-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:41:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:41:24 -0500
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.20,1.21
Message-ID: <200602110441.k1B4fOJe019197@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	MySQL-python.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MySQL-python.spec	7 Feb 2006 13:09:37 -0000	1.20
+++ MySQL-python.spec	11 Feb 2006 04:41:22 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.0
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Development/Libraries
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %dir /usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/constants
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:41:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:41:36 -0500
Subject: rpms/nano/devel nano.spec,1.10,1.11
Message-ID: <200602110441.k1B4faVE019330@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nano/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19299

Modified Files:
	nano.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nano.spec
===================================================================
RCS file: /cvs/dist/rpms/nano/devel/nano.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nano.spec	7 Feb 2006 13:09:47 -0000	1.10
+++ nano.spec	11 Feb 2006 04:41:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A small text editor
 Name:		nano
 Version:	1.3.8
-Release: 1.2
+Release: 1.2.1
 License:	GPL
 Group:		Applications/Editors
 URL:		http://www.nano-editor.org
@@ -51,6 +51,9 @@
 %{_infodir}/nano.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.8-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.8-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:41:49 -0500
Subject: rpms/nasm/devel nasm.spec,1.16,1.17
Message-ID: <200602110441.k1B4fnBl019486@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nasm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19454

Modified Files:
	nasm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nasm.spec
===================================================================
RCS file: /cvs/dist/rpms/nasm/devel/nasm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nasm.spec	7 Feb 2006 13:09:58 -0000	1.16
+++ nasm.spec	11 Feb 2006 04:41:46 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: A portable x86 assembler which uses Intel-like syntax.
 Name: nasm
 Version: 0.98.39
-Release: 3.2
+Release: 3.2.1
 Patch0: nasm-0.98-boguself2.patch
 Patch1: nasm-0.98.39-overfl.patch
 License: LGPL
@@ -90,6 +90,9 @@
 %{_bindir}/rdx
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.98.39-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.98.39-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:41:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:41:59 -0500
Subject: rpms/nautilus/devel nautilus.spec,1.91,1.92
Message-ID: <200602110441.k1B4fxqt019612@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19581

Modified Files:
	nautilus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- nautilus.spec	7 Feb 2006 13:10:09 -0000	1.91
+++ nautilus.spec	11 Feb 2006 04:41:56 -0000	1.92
@@ -18,7 +18,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.13.90
-Release:	2.1
+Release:	2.2
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:42:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:42:17 -0500
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.46,1.47
Message-ID: <200602110442.k1B4gHib019786@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19755

Modified Files:
	nautilus-cd-burner.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- nautilus-cd-burner.spec	7 Feb 2006 13:10:21 -0000	1.46
+++ nautilus-cd-burner.spec	11 Feb 2006 04:42:14 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.13.90
-Release: 1.1
+Release: 1.2
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:42:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:42:27 -0500
Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.7,1.8
Message-ID: <200602110442.k1B4gRJ4019913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nautilus-sendto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19882

Modified Files:
	nautilus-sendto.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nautilus-sendto.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nautilus-sendto.spec	7 Feb 2006 13:10:31 -0000	1.7
+++ nautilus-sendto.spec	11 Feb 2006 04:42:25 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           nautilus-sendto
 Version:        0.4
-Release: 7.1
+Release: 7.2
 Summary:        Nautilus context menu for sending files
 
 Group:          User Interface/Desktops
@@ -75,6 +75,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.4-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:42:39 -0500
Subject: rpms/nc/devel nc.spec,1.24,1.25
Message-ID: <200602110442.k1B4gdj3020048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20015

Modified Files:
	nc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nc.spec
===================================================================
RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nc.spec	7 Feb 2006 13:10:47 -0000	1.24
+++ nc.spec	11 Feb 2006 04:42:35 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Reads and writes data across network connections using TCP or UDP.
 Name: nc
 Version: 1.84
-Release: 3.1
+Release: 3.2
 URL:	 http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 Source0: nc-%{version}.tar.bz2
 Patch0: nc-1.84-glib.patch
@@ -54,6 +54,9 @@
 %doc README scripts
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.84-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.84-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:42:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:42:49 -0500
Subject: rpms/ncompress/devel ncompress.spec,1.17,1.18
Message-ID: <200602110442.k1B4gnFg020174@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncompress/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20145

Modified Files:
	ncompress.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ncompress.spec
===================================================================
RCS file: /cvs/dist/rpms/ncompress/devel/ncompress.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ncompress.spec	7 Feb 2006 13:10:58 -0000	1.17
+++ ncompress.spec	11 Feb 2006 04:42:46 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Fast compression and decompression utilities.
 Name: ncompress
 Version: 4.2.4
-Release: 43.2
+Release: 43.2.1
 License: distributable
 Group: Applications/File
 Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
@@ -69,6 +69,9 @@
 %doc LZW.INFO README
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-43.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.4-43.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:43:00 -0500
Subject: rpms/ncpfs/devel ncpfs.spec,1.24,1.25
Message-ID: <200602110443.k1B4h0bN020302@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncpfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20270

Modified Files:
	ncpfs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ncpfs.spec
===================================================================
RCS file: /cvs/dist/rpms/ncpfs/devel/ncpfs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ncpfs.spec	7 Feb 2006 13:11:09 -0000	1.24
+++ ncpfs.spec	11 Feb 2006 04:42:58 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux.
 Name: ncpfs
 Version: 2.2.6
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz
 Patch: ncpfs-2.2.3-fix.patch
@@ -116,6 +116,9 @@
 %{_mandir}/man8/ipx*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:43:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:43:23 -0500
Subject: rpms/ncurses/devel ncurses.spec,1.57,1.58
Message-ID: <200602110443.k1B4hNaP020505@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ncurses/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20476

Modified Files:
	ncurses.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ncurses.spec
===================================================================
RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ncurses.spec	7 Feb 2006 13:11:19 -0000	1.57
+++ ncurses.spec	11 Feb 2006 04:43:20 -0000	1.58
@@ -2,7 +2,7 @@
 Name: ncurses
 Version: 5.5
 %define includedirw %{_includedir}/ncursesw
-Release: 18.1
+Release: 18.2
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -165,6 +165,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.5-18.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.5-18.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:43:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:43:40 -0500
Subject: rpms/neon/devel neon.spec,1.22,1.23
Message-ID: <200602110443.k1B4hewI020689@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	neon.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- neon.spec	7 Feb 2006 13:11:38 -0000	1.22
+++ neon.spec	11 Feb 2006 04:43:38 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
@@ -74,6 +74,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:43:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:43:50 -0500
Subject: rpms/netatalk/devel netatalk.spec,1.25,1.26
Message-ID: <200602110443.k1B4hoAp020814@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netatalk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20786

Modified Files:
	netatalk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: netatalk.spec
===================================================================
RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- netatalk.spec	8 Feb 2006 00:32:18 -0000	1.25
+++ netatalk.spec	11 Feb 2006 04:43:48 -0000	1.26
@@ -3,7 +3,7 @@
 Summary: AppleTalk networking programs
 Name:    netatalk
 Version: 2.0.3
-Release: 4.2
+Release: 4.2.1
 Epoch:   4
 License: GPL
 Group: 	 System Environment/Daemons
@@ -179,6 +179,9 @@
 %{_libdir}/atalk/*.la
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com>
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:44:07 -0500
Subject: rpms/netdump/devel netdump.spec,1.21,1.22
Message-ID: <200602110444.k1B4i7Fa020980@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netdump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20952

Modified Files:
	netdump.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: netdump.spec
===================================================================
RCS file: /cvs/dist/rpms/netdump/devel/netdump.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- netdump.spec	7 Feb 2006 13:11:54 -0000	1.21
+++ netdump.spec	11 Feb 2006 04:44:04 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Client setup for network kernel message logging and crash dumps
 Name: netdump
 Version: 0.7.14
-Release: 1.2
+Release: 1.2.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Daemons
@@ -95,6 +95,9 @@
 %doc example_scripts
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7.14-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:44:17 -0500
Subject: rpms/netpbm/devel netpbm.spec,1.52,1.53
Message-ID: <200602110444.k1B4iH87021110@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21083

Modified Files:
	netpbm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- netpbm.spec	10 Feb 2006 13:06:27 -0000	1.52
+++ netpbm.spec	11 Feb 2006 04:44:15 -0000	1.53
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 3
+Release: 3.1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -174,6 +174,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 10.31-3.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-3
 - fix segfault caused by usage of uninitialized variables while
   parsing cmdline arguments in pnmtopng (#179645)



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:44:40 -0500
Subject: rpms/net-snmp/devel net-snmp.spec,1.65,1.66
Message-ID: <200602110444.k1B4ie2X021316@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-snmp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- net-snmp.spec	7 Feb 2006 13:12:22 -0000	1.65
+++ net-snmp.spec	11 Feb 2006 04:44:37 -0000	1.66
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.3
-Release: 4.1
+Release: 4.2
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -317,6 +317,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.3-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.3-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:44:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:44:54 -0500
Subject: rpms/net-tools/devel net-tools.spec,1.56,1.57
Message-ID: <200602110444.k1B4isDh021470@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	net-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- net-tools.spec	10 Feb 2006 10:27:36 -0000	1.56
+++ net-tools.spec	11 Feb 2006 04:44:51 -0000	1.57
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 62
+Release: 62.1
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -225,6 +225,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.60-62.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-62
 - new option for netstat - -T stops trimming remote and local addresses (#176465)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:45:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:45:06 -0500
Subject: rpms/newt/devel newt.spec,1.34,1.35
Message-ID: <200602110445.k1B4j6BS021609@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/newt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21585

Modified Files:
	newt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: newt.spec
===================================================================
RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- newt.spec	7 Feb 2006 13:13:00 -0000	1.34
+++ newt.spec	11 Feb 2006 04:45:04 -0000	1.35
@@ -4,7 +4,7 @@
 Name: newt
 %define version 0.52.2
 Version: %{version}
-Release: 5.1
+Release: 5.2
 License: LGPL
 Group: System Environment/Libraries
 Source: newt-%{version}.tar.gz
@@ -89,6 +89,9 @@
 %{_libdir}/libnewt.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.52.2-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.52.2-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:45:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:45:21 -0500
Subject: rpms/newt-perl/devel newt-perl.spec,1.8,1.9
Message-ID: <200602110445.k1B4jLO6021752@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	newt-perl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: newt-perl.spec
===================================================================
RCS file: /cvs/dist/rpms/newt-perl/devel/newt-perl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- newt-perl.spec	7 Feb 2006 13:13:11 -0000	1.8
+++ newt-perl.spec	11 Feb 2006 04:45:18 -0000	1.9
@@ -2,7 +2,7 @@
 Summary: Perl bindings for the Newt library
 Name: newt-perl
 Version: 1.08
-Release: 9.2
+Release: 9.2.1
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Source: ftp://ftp.msg.com.mx/pub/Newt/Newt-1.08.tar.gz
@@ -60,6 +60,9 @@
 %doc ChangeLog README
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.08-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.08-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:45:50 -0500
Subject: rpms/nfs-utils/devel nfs-utils.spec,1.84,1.85
Message-ID: <200602110445.k1B4jogQ024788@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	nfs-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- nfs-utils.spec	7 Feb 2006 13:13:23 -0000	1.84
+++ nfs-utils.spec	11 Feb 2006 04:45:47 -0000	1.85
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.8.rc2
-Release: 4.FC5.1
+Release: 4.FC5.2
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -223,6 +223,9 @@
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8.rc2-4.FC5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:46:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:46:06 -0500
Subject: rpms/nfs-utils-lib/devel nfs-utils-lib.spec,1.5,1.6
Message-ID: <200602110446.k1B4k6U7026645@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nfs-utils-lib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26223

Modified Files:
	nfs-utils-lib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nfs-utils-lib.spec	9 Feb 2006 15:39:53 -0000	1.5
+++ nfs-utils-lib.spec	11 Feb 2006 04:46:03 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.0.8
-Release: 3
+Release: 3.1
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -128,6 +128,9 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.8-3.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Florian La Roche <laroche at redhat.com> 1.0.8-3
 - remove empty scripts
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:46:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:46:21 -0500
Subject: rpms/nhpf/devel nhpf.spec,1.11,1.12
Message-ID: <200602110446.k1B4kL0B028536@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nhpf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28238

Modified Files:
	nhpf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nhpf.spec
===================================================================
RCS file: /cvs/dist/rpms/nhpf/devel/nhpf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nhpf.spec	7 Feb 2006 13:13:48 -0000	1.11
+++ nhpf.spec	11 Feb 2006 04:46:18 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:	Hangul Printing Filter for Netscape (2.0 or later) PS-saved file
 Name:		nhpf
 Version:	1.42
-Release: 9.2
+Release: 9.2.1
 License:	Distributable
 Group:		Applications/Text
 Source0:	ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/%{name}-%{version}.tar.gz
@@ -36,6 +36,9 @@
 %attr(755,root,root)/usr/bin/nhpf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.42-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:46:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:46:35 -0500
Subject: rpms/nkf/devel nkf.spec,1.17,1.18
Message-ID: <200602110446.k1B4kZrq029973@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nkf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29621

Modified Files:
	nkf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nkf.spec
===================================================================
RCS file: /cvs/dist/rpms/nkf/devel/nkf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nkf.spec	7 Feb 2006 13:13:59 -0000	1.17
+++ nkf.spec	11 Feb 2006 04:46:31 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: A Kanji code conversion filter.
 Name: nkf
 Version: 2.05
-Release: 1.2
+Release: 1.2.1
 License: BSD-like
 Group: Applications/Text
 #Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar
@@ -73,6 +73,9 @@
 %{_mandir}/man3/NKF.3pm.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.05-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.05-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:46:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:46:51 -0500
Subject: rpms/nmap/devel nmap.spec,1.27,1.28
Message-ID: <200602110446.k1B4kpXX031771@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31383

Modified Files:
	nmap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nmap.spec
===================================================================
RCS file: /cvs/dist/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- nmap.spec	7 Feb 2006 13:14:11 -0000	1.27
+++ nmap.spec	11 Feb 2006 04:46:49 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 4.00
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
@@ -84,6 +84,9 @@
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:4.00-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:4.00-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:47:06 -0500
Subject: rpms/notify-daemon/devel notify-daemon.spec,1.9,1.10
Message-ID: <200602110447.k1B4l6YL001250@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv951

Modified Files:
	notify-daemon.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- notify-daemon.spec	9 Feb 2006 15:24:42 -0000	1.9
+++ notify-daemon.spec	11 Feb 2006 04:47:03 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 7
+Release: 7.1
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -51,6 +51,9 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-7.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
 - remove empty scripts from .spec file
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:47:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:47:20 -0500
Subject: rpms/nspr/devel nspr.spec,1.12,1.13
Message-ID: <200602110447.k1B4lKa5002788@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nspr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2760

Modified Files:
	nspr.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nspr.spec
===================================================================
RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nspr.spec	7 Feb 2006 13:14:32 -0000	1.12
+++ nspr.spec	11 Feb 2006 04:47:17 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:	Netscape Portable Runtime
 Name:		nspr
 Version:	4.6.1
-Release:	2.1
+Release:	2.2
 License:	MPL/GPL/LGPL
 URL:		http://www.mozilla.org/projects/nspr/
 Group:		System Environment/Libraries
@@ -109,6 +109,9 @@
 %{_bindir}/nspr-config
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:47:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:47:31 -0500
Subject: rpms/nss/devel nss.spec,1.8,1.9
Message-ID: <200602110447.k1B4lVTo002927@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2895

Modified Files:
	nss.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nss.spec	7 Feb 2006 13:14:45 -0000	1.8
+++ nss.spec	11 Feb 2006 04:47:28 -0000	1.9
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11
-Release:          3.1
+Release:          3.2
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -308,6 +308,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.11-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.11-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:47:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:47:49 -0500
Subject: rpms/nss_db/devel nss_db.spec,1.29,1.30
Message-ID: <200602110447.k1B4lnZR003094@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_db/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3066

Modified Files:
	nss_db.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nss_db.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_db/devel/nss_db.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- nss_db.spec	7 Feb 2006 13:14:59 -0000	1.29
+++ nss_db.spec	11 Feb 2006 04:47:46 -0000	1.30
@@ -2,7 +2,7 @@
 Summary: An NSS library for the Berkeley DB.
 Name: nss_db
 Version: 2.2
-Release: 34.2
+Release: 34.2.1
 Source: ftp://sources.redhat.com/pub/glibc/releases/nss_db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz
 Source2: db-getent-Makefile
@@ -109,6 +109,9 @@
 %config /var/db/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-34.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-34.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:48:03 -0500
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.58,1.59
Message-ID: <200602110448.k1B4m3Iw003266@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3234

Modified Files:
	nss_ldap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- nss_ldap.spec	9 Feb 2006 19:25:55 -0000	1.58
+++ nss_ldap.spec	11 Feb 2006 04:48:01 -0000	1.59
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: 248
-Release: 2
+Release: 2.1
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -219,6 +219,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 248-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Nalin Dahyabhai <nalin at redhat.com> - 248-2
 - set "nss_initgroups_ignoreusers root,ldap" in the default configuration
   file, so that nss_ldap will assume that there are no supplemental groups



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:48:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:48:14 -0500
Subject: rpms/ntp/devel ntp.spec,1.47,1.48
Message-ID: <200602110448.k1B4mENf003398@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ntp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3369

Modified Files:
	ntp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ntp.spec
===================================================================
RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ntp.spec	7 Feb 2006 13:15:41 -0000	1.47
+++ ntp.spec	11 Feb 2006 04:48:12 -0000	1.48
@@ -8,7 +8,7 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP).
 Name: ntp
 Version: 4.2.0.a.20050816
-Release: 10.2
+Release: 10.2.1
 License: distributable
 Group: System Environment/Daemons
 Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-%{tarversion}.tar.gz
@@ -221,6 +221,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0.a.20050816-10.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.2.0.a.20050816-10.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:48:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:48:28 -0500
Subject: rpms/numactl/devel numactl.spec,1.25,1.26
Message-ID: <200602110448.k1B4mSAw003555@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/numactl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3524

Modified Files:
	numactl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: numactl.spec
===================================================================
RCS file: /cvs/dist/rpms/numactl/devel/numactl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- numactl.spec	7 Feb 2006 13:16:46 -0000	1.25
+++ numactl.spec	11 Feb 2006 04:48:25 -0000	1.26
@@ -1,7 +1,7 @@
 Name:		numactl
 Summary:	library for tuning for Non Uniform Memory Access machines
 Version:	0.6.4
-Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1
+Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2
 License:	LGPL/GPL
 Group: 		System Environment/Base
 URL: 		ftp://ftp.suse.com/pub/people/ak/numa/
@@ -71,6 +71,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.4-1.25.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release: :.1 1.24.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:48:39 -0500
Subject: rpms/nut/devel nut.spec,1.30,1.31
Message-ID: <200602110448.k1B4md7E003677@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3649

Modified Files:
	nut.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: nut.spec
===================================================================
RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nut.spec	7 Feb 2006 13:17:04 -0000	1.30
+++ nut.spec	11 Feb 2006 04:48:37 -0000	1.31
@@ -11,7 +11,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.0.2
-Release: 6.1
+Release: 6.2
 Group: Applications/System
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -270,6 +270,9 @@
 %{_mandir}/man8/upsset.cgi.8.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-6.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:48:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:48:50 -0500
Subject: rpms/oaf/devel oaf.spec,1.18,1.19
Message-ID: <200602110448.k1B4mo4u003808@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3777

Modified Files:
	oaf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: oaf.spec
===================================================================
RCS file: /cvs/dist/rpms/oaf/devel/oaf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- oaf.spec	7 Feb 2006 13:17:24 -0000	1.18
+++ oaf.spec	11 Feb 2006 04:48:48 -0000	1.19
@@ -1,7 +1,7 @@
 Name: oaf
 Summary: Object activation framework for GNOME.
 Version: 0.6.10
-Release: 12.2
+Release: 12.2.1
 License: LGPL and GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/stable/%{name}/%{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/*.sh
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:49:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:49:01 -0500
Subject: rpms/opal/devel opal.spec,1.3,1.4
Message-ID: <200602110449.k1B4n1pB003949@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	opal.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- opal.spec	7 Feb 2006 13:17:36 -0000	1.3
+++ opal.spec	11 Feb 2006 04:48:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Open Phone Abstraction Library
 Name: opal
 Version: 2.1
-Release: 1.1
+Release: 1.2
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
@@ -56,6 +56,9 @@
 %{_datadir}/opal
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:49:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:49:14 -0500
Subject: rpms/open/devel open.spec,1.12,1.13
Message-ID: <200602110449.k1B4nEjl004090@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/open/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4058

Modified Files:
	open.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: open.spec
===================================================================
RCS file: /cvs/dist/rpms/open/devel/open.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- open.spec	7 Feb 2006 13:17:54 -0000	1.12
+++ open.spec	11 Feb 2006 04:49:11 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A tool which will start a program on a virtual console.
 Name: open
 Version: 1.4
-Release: 24.2
+Release: 24.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://sunsite.unc.edu/pub/Linux/utils/console/open-%{version}.tar.gz
@@ -43,6 +43,9 @@
 %attr(644,root,root) %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4-24.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-24.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:49:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:49:25 -0500
Subject: rpms/openhpi/devel openhpi.spec,1.29,1.30
Message-ID: <200602110449.k1B4nPaE004224@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4194

Modified Files:
	openhpi.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- openhpi.spec	7 Feb 2006 13:18:23 -0000	1.29
+++ openhpi.spec	11 Feb 2006 04:49:23 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: openhpi Hardware Platform Interface (HPI) library and tools
 Name: openhpi
 Version: 2.2.1
-Release: 4.1
+Release: 4.2
 License: BSD
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:49:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:49:39 -0500
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.26,1.27
Message-ID: <200602110449.k1B4nd8J004385@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4353

Modified Files:
	OpenIPMI.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- OpenIPMI.spec	7 Feb 2006 13:18:35 -0000	1.26
+++ OpenIPMI.spec	11 Feb 2006 04:49:37 -0000	1.27
@@ -2,7 +2,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 1.4.14
-Release: 18.1
+Release: 18.2
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -131,6 +131,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:49:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:49:54 -0500
Subject: rpms/openjade/devel openjade.spec,1.31,1.32
Message-ID: <200602110449.k1B4nsl8004548@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openjade/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4517

Modified Files:
	openjade.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openjade.spec
===================================================================
RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openjade.spec	7 Feb 2006 13:18:46 -0000	1.31
+++ openjade.spec	11 Feb 2006 04:49:51 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 23.1
+Release: 23.2
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.2-23.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.2-23.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:50:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:50:08 -0500
Subject: rpms/openldap/devel openldap.spec,1.52,1.53
Message-ID: <200602110450.k1B4o8WO004690@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4667

Modified Files:
	openldap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- openldap.spec	9 Feb 2006 20:10:40 -0000	1.52
+++ openldap.spec	11 Feb 2006 04:50:05 -0000	1.53
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: %{version_23}
-Release: 3
+Release: 3.1
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -682,6 +682,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.19-3.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 9 2006 Jay Fenlason <fenlason at redhat.com> 2.3.19-3
 - Modify the ldap.init script to call runuser correctly.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:50:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:50:30 -0500
Subject: rpms/openmotif/devel openmotif.spec,1.42,1.43
Message-ID: <200602110450.k1B4oUjV004898@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4871

Modified Files:
	openmotif.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openmotif.spec	7 Feb 2006 13:19:50 -0000	1.42
+++ openmotif.spec	11 Feb 2006 04:50:26 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: Open Motif runtime libraries and executables.
 Name: openmotif
 Version: 2.3.0
-Release: 0.1.9.1
+Release: 0.1.9.2
 License: Open Group Public License
 Group: System Environment/Libraries
 #Source:  %{intern_name}-%{version}.tar.gz
@@ -156,6 +156,9 @@
 %{_datadir}/man/man5/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3.0-0.1.9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:50:43 -0500
Subject: rpms/openobex/devel openobex.spec,1.11,1.12
Message-ID: <200602110450.k1B4ohKP005050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5019

Modified Files:
	openobex.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openobex.spec	7 Feb 2006 13:20:03 -0000	1.11
+++ openobex.spec	11 Feb 2006 04:50:41 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Library for using OBEX
 Name: openobex
 Version: 1.0.1
-Release: 4.2
+Release: 4.2.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -65,6 +65,9 @@
 %{_includedir}/openobex/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:51:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:51:08 -0500
Subject: rpms/openobex-apps/devel openobex-apps.spec,1.9,1.10
Message-ID: <200602110451.k1B4p8w5005298@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openobex-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5265

Modified Files:
	openobex-apps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openobex-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex-apps/devel/openobex-apps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openobex-apps.spec	7 Feb 2006 13:20:13 -0000	1.9
+++ openobex-apps.spec	11 Feb 2006 04:51:06 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Applications for using OBEX
 Name: openobex-apps
 Version: 1.0.0
-Release: 8.2
+Release: 8.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -19,6 +19,9 @@
 Open OBEX Applications
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-8.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:51:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:51:19 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.618,1.619
Message-ID: <200602110451.k1B4pJjB005431@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5400

Modified Files:
	openoffice.org.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- openoffice.org.spec	7 Feb 2006 13:20:24 -0000	1.618
+++ openoffice.org.spec	11 Feb 2006 04:51:16 -0000	1.619
@@ -120,7 +120,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.0.1.%{ooomilestone}
-Release: 	%{rh_rpm_release}.%{rh_rpm_extension}.1
+Release: 	%{rh_rpm_release}.%{rh_rpm_extension}.2
 Epoch:		1
 License:	LGPL
 Group:		Applications/Productivity
@@ -3375,6 +3375,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:53:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:53:28 -0500
Subject: rpms/opensm/devel opensm.spec,1.6,1.7
Message-ID: <200602110453.k1B4rSVP006381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/opensm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6353

Modified Files:
	opensm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: opensm.spec
===================================================================
RCS file: /cvs/dist/rpms/opensm/devel/opensm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opensm.spec	7 Feb 2006 13:21:45 -0000	1.6
+++ opensm.spec	11 Feb 2006 04:53:25 -0000	1.7
@@ -7,7 +7,7 @@
 
 Name: opensm
 Version: 1.0
-Release: 0.%{ver}%{?dist}.2
+Release: 0.%{ver}%{?dist}.2.1
 Summary:  OpenIB InfiniBand Subnet Manager and management utilities
 
 Group: System Environment/Base
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.4265.1.FC5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.4265.1.FC5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:53:40 -0500
Subject: rpms/opensp/devel opensp.spec,1.6,1.7
Message-ID: <200602110453.k1B4reHT006519@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/opensp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6487

Modified Files:
	opensp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: opensp.spec
===================================================================
RCS file: /cvs/dist/rpms/opensp/devel/opensp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opensp.spec	7 Feb 2006 13:22:07 -0000	1.6
+++ opensp.spec	11 Feb 2006 04:53:37 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: SGML and XML parser
 Name: opensp
 Version: 1.5.2
-Release: 1.1
+Release: 1.2
 Requires: sgml-common >= 0.5
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:53:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:53:51 -0500
Subject: rpms/openssh/devel openssh.spec,1.85,1.86
Message-ID: <200602110453.k1B4rpHb006650@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6615

Modified Files:
	openssh.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- openssh.spec	6 Feb 2006 20:16:03 -0000	1.85
+++ openssh.spec	11 Feb 2006 04:53:48 -0000	1.86
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p1
-%define rel 2
+%define rel 2.1
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -450,6 +450,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3p1-2.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p1-2
 - fixed another place where syslog was called in signal handler
 - pass locale environment variables to server, accept them there (#179851)



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:01 -0500
Subject: rpms/openssl/devel openssl.spec,1.68,1.69
Message-ID: <200602110454.k1B4s1wb006785@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6748

Modified Files:
	openssl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- openssl.spec	7 Feb 2006 13:22:17 -0000	1.68
+++ openssl.spec	11 Feb 2006 04:53:59 -0000	1.69
@@ -23,7 +23,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl
 Version: 0.9.8a
-Release: 5.1
+Release: 5.2
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -382,6 +382,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8a-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8a-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:14 -0500
Subject: rpms/openssl097a/devel openssl.spec,1.7,1.8
Message-ID: <200602110454.k1B4sEAb006925@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openssl097a/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6893

Modified Files:
	openssl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openssl.spec
===================================================================
RCS file: /cvs/dist/rpms/openssl097a/devel/openssl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openssl.spec	7 Feb 2006 13:22:29 -0000	1.7
+++ openssl.spec	11 Feb 2006 04:54:11 -0000	1.8
@@ -21,7 +21,7 @@
 Summary: The OpenSSL toolkit.
 Name: openssl097a
 Version: 0.9.7a
-Release: 4.2
+Release: 4.2.1
 Source: openssl-%{version}-usa.tar.bz2
 Source1: hobble-openssl
 Source2: Makefile.certificate
@@ -383,6 +383,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7a-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.7a-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:26 -0500
Subject: rpms/openswan/devel openswan.spec,1.27,1.28
Message-ID: <200602110454.k1B4sQ7p007076@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/openswan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7043

Modified Files:
	openswan.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: openswan.spec
===================================================================
RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- openswan.spec	7 Feb 2006 13:22:40 -0000	1.27
+++ openswan.spec	11 Feb 2006 04:54:23 -0000	1.28
@@ -25,7 +25,7 @@
 %define srcpkgver 2.4.4
 
 %define debug_package %{nil}
-Release: %{ourrelease}.2
+Release: %{ourrelease}.2.1
 License: GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -50,7 +50,7 @@
 %package userland
 Summary: Openswan IPSEC usermod tools
 Group: System Environment/Daemons
-Release: %{ourrelease}.2
+Release: %{ourrelease}.2.1
 %endif
 Provides: ipsec-userland
 Obsoletes: freeswan superfreeswan super-freeswan
@@ -60,13 +60,13 @@
 %package doc
 Summary: Openswan IPSEC full documentation
 Group: System Environment/Daemons
-Release: %{ourrelease}.2
+Release: %{ourrelease}.2.1
 
 %if %{with_klips}
 %package klips
 Summary: Openswan kernel module
 Group:  System Environment/Kernel
-Release: %{krelver}_%{ourrelease}.2
+Release: %{krelver}_%{ourrelease}.2.1
 Provides: ipsec-kernel
 Requires: kernel = %{kversion}
 # do not make the dependancy circular for now.
@@ -252,6 +252,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.4-1.1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.4-1.1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:38 -0500
Subject: rpms/oprofile/devel oprofile.spec,1.38,1.39
Message-ID: <200602110454.k1B4scSu007207@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oprofile/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7179

Modified Files:
	oprofile.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: oprofile.spec
===================================================================
RCS file: /cvs/dist/rpms/oprofile/devel/oprofile.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- oprofile.spec	10 Feb 2006 15:47:22 -0000	1.38
+++ oprofile.spec	11 Feb 2006 04:54:35 -0000	1.39
@@ -4,7 +4,7 @@
 Summary: System wide profiler
 Name: oprofile
 Version: 0.9.1
-Release: %{oprofile_release}.1
+Release: %{oprofile_release}.1.1
 License: GPL
 Group: Development/System
 #
@@ -233,6 +233,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.1-8.1.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Will Cohen <wcohen at redhat.com>
 - Complete path for which and dirname in opcontrol.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:48 -0500
Subject: rpms/ORBit/devel ORBit.spec,1.19,1.20
Message-ID: <200602110454.k1B4smYT007335@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7303

Modified Files:
	ORBit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ORBit.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ORBit.spec	7 Feb 2006 13:23:00 -0000	1.19
+++ ORBit.spec	11 Feb 2006 04:54:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit
 Version: 0.5.17
-Release: 15.2
+Release: 15.2.1
 Epoch: 1
 Source: ftp://ftp.labs.redhat.com/pub/ORBit/%{name}-%{version}.tar.bz2
 Patch0: ORBit-0.5.17-aligned-access.patch
@@ -103,6 +103,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:54:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:54:59 -0500
Subject: rpms/ORBit2/devel ORBit2.spec,1.31,1.32
Message-ID: <200602110454.k1B4sxoF007470@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7439

Modified Files:
	ORBit2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ORBit2.spec	7 Feb 2006 03:41:33 -0000	1.31
+++ ORBit2.spec	11 Feb 2006 04:54:56 -0000	1.32
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
 Version: 2.13.3
-Release: 1
+Release: 1.1
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -94,6 +94,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.3-1
 - Update to 2.13.3
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:55:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:55:10 -0500
Subject: rpms/pam/devel pam.spec,1.103,1.104
Message-ID: <200602110455.k1B4tAxX007601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7569

Modified Files:
	pam.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- pam.spec	7 Feb 2006 13:23:11 -0000	1.103
+++ pam.spec	11 Feb 2006 04:55:08 -0000	1.104
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.3.0
-Release: 1.1
+Release: 1.2
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -351,6 +351,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99.3.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99.3.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:55:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:55:24 -0500
Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.14,1.15
Message-ID: <200602110455.k1B4tOcu007759@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_ccreds/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7728

Modified Files:
	pam_ccreds.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pam_ccreds.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pam_ccreds.spec	7 Feb 2006 13:23:25 -0000	1.14
+++ pam_ccreds.spec	11 Feb 2006 04:55:21 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Pam module to cache login credentials
 Name: pam_ccreds
 Version: 3
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %attr(4755,root,root) %{_sbindir}/ccreds_validate
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:55:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:55:34 -0500
Subject: rpms/pam_krb5/devel pam_krb5.spec,1.38,1.39
Message-ID: <200602110455.k1B4tYkO007885@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_krb5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7858

Modified Files:
	pam_krb5.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pam_krb5.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_krb5/devel/pam_krb5.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- pam_krb5.spec	7 Feb 2006 19:21:32 -0000	1.38
+++ pam_krb5.spec	11 Feb 2006 04:55:32 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: A Pluggable Authentication Module for Kerberos 5.
 Name: pam_krb5
 Version: 2.2.6
-Release: 1
+Release: 1.1
 Source0: pam_krb5-%{version}-%{release}.tar.gz
 License: LGPL
 Group: System Environment/Base
@@ -44,6 +44,9 @@
 
 # $Id$
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.6-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Nalin Dahyabhai <nalin at redhat.com> - 2.2.6-1
 - add a "krb4_use_as_req" option so that obtaining v4 creds kinit-style can
   be disabled completely (Hugo Meiland)



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:55:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:55:45 -0500
Subject: rpms/pam_passwdqc/devel pam_passwdqc.spec,1.6,1.7
Message-ID: <200602110455.k1B4tjTh008013@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_passwdqc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7981

Modified Files:
	pam_passwdqc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pam_passwdqc.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_passwdqc/devel/pam_passwdqc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pam_passwdqc.spec	7 Feb 2006 13:23:45 -0000	1.6
+++ pam_passwdqc.spec	11 Feb 2006 04:55:42 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Pluggable password quality-control module.
 Name: pam_passwdqc
 Version: 1.0.2
-Release: 1.2
+Release: 1.2.1
 License: BSD-compatible
 Group: System Environment/Base
 URL: http://www.openwall.com/passwdqc/
@@ -37,6 +37,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:55:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:55:55 -0500
Subject: rpms/pam_smb/devel pam_smb.spec,1.15,1.16
Message-ID: <200602110455.k1B4tt5p008135@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pam_smb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8104

Modified Files:
	pam_smb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pam_smb.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_smb/devel/pam_smb.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pam_smb.spec	7 Feb 2006 13:23:56 -0000	1.15
+++ pam_smb.spec	11 Feb 2006 04:55:53 -0000	1.16
@@ -1,6 +1,6 @@
 Name: pam_smb
 Version: 1.1.7
-Release: 7.1
+Release: 7.2
 Summary: A Pluggable Authentication Module (PAM) for use with SMB servers.
 Group: System Environment/Base
 URL: http://www.csn.ul.ie/~airlied/pam_smb/
@@ -43,6 +43,9 @@
 /%{_lib}/security/pam_smb_auth.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-7.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:56:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:56:19 -0500
Subject: rpms/pango/devel pango.spec,1.58,1.59
Message-ID: <200602110456.k1B4uJXP008363@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8331

Modified Files:
	pango.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pango.spec	7 Feb 2006 13:24:06 -0000	1.58
+++ pango.spec	11 Feb 2006 04:56:16 -0000	1.59
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.11.4
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:56:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:56:29 -0500
Subject: rpms/parted/devel parted.spec,1.62,1.63
Message-ID: <200602110456.k1B4uTI1008490@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8460

Modified Files:
	parted.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- parted.spec	7 Feb 2006 23:13:12 -0000	1.62
+++ parted.spec	11 Feb 2006 04:56:26 -0000	1.63
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.25
-Release: 6
+Release: 6.1
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -99,6 +99,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.25-6.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb  7 2006 Peter Jones <pjones at redhat.com> 1.6.25-6
 - Fix dm partition naming.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:56:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:56:41 -0500
Subject: rpms/passwd/devel passwd.spec,1.23,1.24
Message-ID: <200602110456.k1B4uf2l008634@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/passwd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8601

Modified Files:
	passwd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: passwd.spec
===================================================================
RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- passwd.spec	7 Feb 2006 13:24:28 -0000	1.23
+++ passwd.spec	11 Feb 2006 04:56:39 -0000	1.24
@@ -7,7 +7,7 @@
 Summary: The passwd utility for setting/changing passwords using PAM.
 Name: passwd
 Version: 0.71
-Release: 3.1
+Release: 3.2
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.71-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:56:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:56:51 -0500
Subject: rpms/patch/devel patch.spec,1.25,1.26
Message-ID: <200602110456.k1B4up0f008752@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8727

Modified Files:
	patch.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: patch.spec
===================================================================
RCS file: /cvs/dist/rpms/patch/devel/patch.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- patch.spec	7 Feb 2006 13:24:37 -0000	1.25
+++ patch.spec	11 Feb 2006 04:56:48 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The GNU patch command, for modifying/upgrading files.
 Name: patch
 Version: 2.5.4
-Release: 29.2
+Release: 29.2.1
 License: GPL
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -60,6 +60,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-29.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.5.4-29.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:01 -0500
Subject: rpms/patchutils/devel patchutils.spec,1.19,1.20
Message-ID: <200602110457.k1B4v1jG008870@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/patchutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8839

Modified Files:
	patchutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: patchutils.spec
===================================================================
RCS file: /cvs/dist/rpms/patchutils/devel/patchutils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- patchutils.spec	7 Feb 2006 13:24:47 -0000	1.19
+++ patchutils.spec	11 Feb 2006 04:56:58 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
 Version: 0.2.31
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/patchutils/
@@ -45,6 +45,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.31-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2.31-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:11 -0500
Subject: rpms/pax/devel pax.spec,1.15,1.16
Message-ID: <200602110457.k1B4vBYq009005@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8974

Modified Files:
	pax.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pax.spec
===================================================================
RCS file: /cvs/dist/rpms/pax/devel/pax.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pax.spec	7 Feb 2006 13:24:57 -0000	1.15
+++ pax.spec	11 Feb 2006 04:57:09 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: POSIX File System Archiver
 Name: pax
 Version: 3.4
-Release: 1.2
+Release: 1.2.1
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
@@ -35,6 +35,9 @@
 %doc %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.4-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:22 -0500
Subject: rpms/pciutils/devel pciutils.spec,1.35,1.36
Message-ID: <200602110457.k1B4vMb8009134@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pciutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pciutils.spec	7 Feb 2006 13:25:08 -0000	1.35
+++ pciutils.spec	11 Feb 2006 04:57:18 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	2.2.1
-Release: 	1.1
+Release: 	1.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
@@ -68,6 +68,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:32 -0500
Subject: rpms/pcmciautils/devel pcmciautils.spec,1.14,1.15
Message-ID: <200602110457.k1B4vWcj009267@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcmciautils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9234

Modified Files:
	pcmciautils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pcmciautils.spec
===================================================================
RCS file: /cvs/dist/rpms/pcmciautils/devel/pcmciautils.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pcmciautils.spec	7 Feb 2006 13:25:18 -0000	1.14
+++ pcmciautils.spec	11 Feb 2006 04:57:29 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 011
-Release: 1.1
+Release: 1.2
 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
@@ -40,6 +40,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 011-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 011-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:41 -0500
Subject: rpms/pcre/devel pcre.spec,1.16,1.17
Message-ID: <200602110457.k1B4vfJr009390@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pcre/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9357

Modified Files:
	pcre.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pcre.spec
===================================================================
RCS file: /cvs/dist/rpms/pcre/devel/pcre.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pcre.spec	7 Feb 2006 13:25:29 -0000	1.16
+++ pcre.spec	11 Feb 2006 04:57:39 -0000	1.17
@@ -1,6 +1,6 @@
 Name: pcre
 Version: 6.3
-Release: 1.2
+Release: 1.2.1
 Summary: Perl-compatible regular expression library
 URL: http://www.pcre.org/
 Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2
@@ -77,6 +77,9 @@
 %{_bindir}/pcre-config
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:57:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:57:53 -0500
Subject: rpms/perl/devel perl.spec,1.84,1.85
Message-ID: <200602110457.k1B4vrBP009522@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- perl.spec	10 Feb 2006 19:54:55 -0000	1.84
+++ perl.spec	11 Feb 2006 04:57:50 -0000	1.85
@@ -43,7 +43,7 @@
 
 Name:           perl
 Version:        %{perlver}
-Release:        %{perlrel}
+Release:        %{perlrel}.1
 Epoch:          %{perlepoch}
 Summary:        The Perl programming language
 
@@ -529,6 +529,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:5.8.8-2.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-2
 - Rebuild again
 - Debian released 5.8.8 patches today; apply only relevant difference:



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:58:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:58:11 -0500
Subject: rpms/perl-Bit-Vector/devel perl-Bit-Vector.spec,1.18,1.19
Message-ID: <200602110458.k1B4wBHK009718@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Bit-Vector.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Bit-Vector.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Bit-Vector/devel/perl-Bit-Vector.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-Bit-Vector.spec	7 Feb 2006 13:25:39 -0000	1.18
+++ perl-Bit-Vector.spec	11 Feb 2006 04:58:09 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           perl-Bit-Vector
 Version:        6.4
-Release: 	2.2.1
+Release: 	2.2.2
 Summary:        A module for high-performance Perl manipulation of bit vectors
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.4-2.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.4-2.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:58:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:58:21 -0500
Subject: rpms/perl-BSD-Resource/devel perl-BSD-Resource.spec,1.19,1.20
Message-ID: <200602110458.k1B4wLXt009847@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-BSD-Resource.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-BSD-Resource.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-BSD-Resource/devel/perl-BSD-Resource.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- perl-BSD-Resource.spec	7 Feb 2006 13:25:50 -0000	1.19
+++ perl-BSD-Resource.spec	11 Feb 2006 04:58:19 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           perl-BSD-Resource
 Version:        1.24
-Release: 	3.2.1
+Release: 	3.2.2
 Summary:        BSD process resource limit and priority functions
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.24-3.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.24-3.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:58:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:58:32 -0500
Subject: rpms/perl-Compress-Zlib/devel perl-Compress-Zlib.spec,1.22,1.23
Message-ID: <200602110458.k1B4wWOx009975@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Compress-Zlib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Compress-Zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Compress-Zlib/devel/perl-Compress-Zlib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- perl-Compress-Zlib.spec	7 Feb 2006 13:26:00 -0000	1.22
+++ perl-Compress-Zlib.spec	11 Feb 2006 04:58:29 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name: perl-Compress-Zlib
 Version: 1.41
-Release: 1.2.1
+Release: 1.2.2
 Summary: A module providing Perl interfaces to the zlib compression library.
 License: distributable
 Group: Development/Libraries
@@ -55,6 +55,9 @@
 %{perl_vendorarch}/auto/Compress/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.41-1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 04:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 10 Feb 2006 23:58:44 -0500
Subject: rpms/perl-Crypt-SSLeay/devel perl-Crypt-SSLeay.spec,1.16,1.17
Message-ID: <200602110458.k1B4wioC010103@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Crypt-SSLeay.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Crypt-SSLeay.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Crypt-SSLeay/devel/perl-Crypt-SSLeay.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Crypt-SSLeay.spec	7 Feb 2006 13:26:15 -0000	1.16
+++ perl-Crypt-SSLeay.spec	11 Feb 2006 04:58:42 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Crypt::SSLeay - OpenSSL glue that provides LWP https support
 Name: perl-Crypt-SSLeay
 Version: 0.51
-Release: 9.2.1
+Release: 9.2.2
 License: GPL or Artistic
 Group: Development/Libraries
 Source0: http://www.cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.51-9.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.51-9.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:00:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:00:37 -0500
Subject: rpms/perl-Date-Calc/devel perl-Date-Calc.spec,1.15,1.16
Message-ID: <200602110500.k1B50bxF010272@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Date-Calc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Date-Calc.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Date-Calc/devel/perl-Date-Calc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- perl-Date-Calc.spec	7 Feb 2006 13:26:27 -0000	1.15
+++ perl-Date-Calc.spec	11 Feb 2006 05:00:34 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           perl-Date-Calc
 Version:        5.4
-Release: 	1.2.1
+Release: 	1.2.2
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.4-1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.4-1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:02:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:02:46 -0500
Subject: rpms/perl-DBD-MySQL/devel perl-DBD-MySQL.spec,1.24,1.25
Message-ID: <200602110502.k1B52kdi010497@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-MySQL.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-DBD-MySQL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-MySQL/devel/perl-DBD-MySQL.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- perl-DBD-MySQL.spec	7 Feb 2006 13:26:38 -0000	1.24
+++ perl-DBD-MySQL.spec	11 Feb 2006 05:02:43 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        3.0002
-Release: 	2.2.1
+Release: 	2.2.2
 Summary:        A MySQL interface for perl
 
 Group:          Development/Libraries
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0002-2.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0002-2.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:03:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:03:21 -0500
Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.25,1.26
Message-ID: <200602110503.k1B53LnO010649@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBD-Pg.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-DBD-Pg.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- perl-DBD-Pg.spec	7 Feb 2006 13:26:48 -0000	1.25
+++ perl-DBD-Pg.spec	11 Feb 2006 05:03:18 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           perl-DBD-Pg
 Version:        1.43
-Release: 	2.2.1
+Release: 	2.2.2
 Summary:        A PostgresSQL interface for perl
 
 Group:          Development/Libraries
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.43-2.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.43-2.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:04:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:04:16 -0500
Subject: rpms/perl-DBI/devel perl-DBI.spec,1.23,1.24
Message-ID: <200602110504.k1B54GKM010796@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-DBI.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-DBI.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-DBI/devel/perl-DBI.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-DBI.spec	7 Feb 2006 13:26:58 -0000	1.23
+++ perl-DBI.spec	11 Feb 2006 05:04:13 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-DBI
 Version:        1.50
-Release: 	2.1
+Release: 	2.2
 Summary:        A database access API for perl
 
 Group:          Development/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.50-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:04:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:04:40 -0500
Subject: rpms/perl-Digest-SHA1/devel perl-Digest-SHA1.spec,1.12,1.13
Message-ID: <200602110504.k1B54eCb010916@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Digest-SHA1.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Digest-SHA1.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Digest-SHA1/devel/perl-Digest-SHA1.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Digest-SHA1.spec	7 Feb 2006 13:27:24 -0000	1.12
+++ perl-Digest-SHA1.spec	11 Feb 2006 05:04:37 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           perl-Digest-SHA1
 Version:        2.11
-Release: 	1.1
+Release: 	1.2
 Summary:        Digest-SHA1 Perl module
 
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.11-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.11-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:05:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:05:14 -0500
Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.17,1.18
Message-ID: <200602110505.k1B55E5R011064@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-HTML-Parser.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-HTML-Parser.spec	7 Feb 2006 13:27:35 -0000	1.17
+++ perl-HTML-Parser.spec	11 Feb 2006 05:05:11 -0000	1.18
@@ -5,7 +5,7 @@
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
 Version: 3.48
-Release: 1.1.1
+Release: 1.1.2
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.48-1.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.48-1.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:05:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:05:44 -0500
Subject: rpms/perl-Net-DNS/devel perl-Net-DNS.spec,1.21,1.22
Message-ID: <200602110505.k1B55iJv011204@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-Net-DNS.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-Net-DNS.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- perl-Net-DNS.spec	7 Feb 2006 13:27:47 -0000	1.21
+++ perl-Net-DNS.spec	11 Feb 2006 05:05:41 -0000	1.22
@@ -1,6 +1,6 @@
 Name: perl-Net-DNS
 Version: 0.55
-Release: 1.1.1
+Release: 1.1.2
 Summary: DNS resolver modules for Perl
 License: GPL or Artistic
 Group: Development/Libraries
@@ -52,6 +52,9 @@
 %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.55-1.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.55-1.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:06:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:06:12 -0500
Subject: rpms/perl-PDL/devel perl-PDL.spec,1.23,1.24
Message-ID: <200602110506.k1B56CoG011367@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-PDL.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- perl-PDL.spec	7 Feb 2006 13:27:59 -0000	1.23
+++ perl-PDL.spec	11 Feb 2006 05:06:09 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           perl-PDL
 Version:        2.4.2
-Release: 	2.fc5.1.2.1 
+Release: 	2.fc5.1.2.2 
 Summary:        PDL Perl module
 
 Group:          Development/Libraries
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-2.fc5.1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.2-2.fc5.1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:06:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:06:34 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.5,1.6
Message-ID: <200602110506.k1B56YLC011513@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-String-CRC32.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-String-CRC32.spec	7 Feb 2006 13:28:10 -0000	1.5
+++ perl-String-CRC32.spec	11 Feb 2006 05:06:30 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-String-CRC32
 Version:        1.3
-Release:        3.FC5.1
+Release:        3.FC5.2
 
 Summary:        Perl interface for cyclic redundency check generation
 
@@ -53,6 +53,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3-3.FC5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3-3.FC5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:07:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:07:11 -0500
Subject: rpms/perl-TermReadKey/devel perl-TermReadKey.spec,1.14,1.15
Message-ID: <200602110507.k1B57BRc011695@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-TermReadKey.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-TermReadKey.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-TermReadKey/devel/perl-TermReadKey.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-TermReadKey.spec	7 Feb 2006 13:28:20 -0000	1.14
+++ perl-TermReadKey.spec	11 Feb 2006 05:07:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           perl-TermReadKey
 Version:        2.30
-Release: 	1.2.1
+Release: 	1.2.2
 Summary:        A perl module for simple terminal control
 
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.30-1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.30-1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:07:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:07:33 -0500
Subject: rpms/perl-XML-LibXML/devel perl-XML-LibXML.spec,1.11,1.12
Message-ID: <200602110507.k1B57XOu011848@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-LibXML.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-XML-LibXML.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML/devel/perl-XML-LibXML.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-XML-LibXML.spec	7 Feb 2006 13:28:30 -0000	1.11
+++ perl-XML-LibXML.spec	11 Feb 2006 05:07:31 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: XML-LibXML Perl module
 Name: perl-XML-LibXML
 Version: 1.58
-Release: 2.2.1
+Release: 2.2.2
 License: GPL or Artistic
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/XML-LibXML/
@@ -65,6 +65,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.58-2.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.58-2.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:08:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:08:10 -0500
Subject: rpms/perl-XML-LibXML-Common/devel perl-XML-LibXML-Common.spec, 1.9,
	1.10
Message-ID: <200602110508.k1B58A0H011999@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/perl-XML-LibXML-Common/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11962

Modified Files:
	perl-XML-LibXML-Common.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-XML-LibXML-Common.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-LibXML-Common/devel/perl-XML-LibXML-Common.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-XML-LibXML-Common.spec	3 Feb 2006 21:48:16 -0000	1.9
+++ perl-XML-LibXML-Common.spec	11 Feb 2006 05:08:07 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           perl-XML-LibXML-Common
 Version:        0.13
-Release: 	8.2
+Release: 	8.2.1
 Summary:        XML-LibXML-Common Perl module
 
 Group:          Development/Libraries
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 0.13-8.2
 - rebuild for new perl-5.8.8
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:08:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:08:34 -0500
Subject: rpms/perl-XML-Parser/devel perl-XML-Parser.spec,1.17,1.18
Message-ID: <200602110508.k1B58Ymb012140@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	perl-XML-Parser.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: perl-XML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-XML-Parser/devel/perl-XML-Parser.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- perl-XML-Parser.spec	7 Feb 2006 13:28:40 -0000	1.17
+++ perl-XML-Parser.spec	11 Feb 2006 05:08:30 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           perl-XML-Parser
 Version:        2.34
-Release:	6.1.2.1
+Release:	6.1.2.2
 Summary:        A low level Perl module for parsing XML either via trees or streaming
 
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.34-6.1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.34-6.1.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:09:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:09:10 -0500
Subject: rpms/php/devel php.spec,1.104,1.105
Message-ID: <200602110509.k1B59A2I012289@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	php.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- php.spec	7 Feb 2006 13:29:01 -0000	1.104
+++ php.spec	11 Feb 2006 05:09:07 -0000	1.105
@@ -3,7 +3,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 4.1
+Release: 4.2
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -537,6 +537,9 @@
 %files pdo -f files.pdo
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.1.2-4.2
+- 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:09:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:09:25 -0500
Subject: rpms/pilot-link/devel pilot-link.spec,1.37,1.38
Message-ID: <200602110509.k1B59PAe012387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pilot-link/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12368

Modified Files:
	pilot-link.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- pilot-link.spec	7 Feb 2006 13:29:21 -0000	1.37
+++ pilot-link.spec	11 Feb 2006 05:09:23 -0000	1.38
@@ -5,7 +5,7 @@
 Summary: File transfer utilities between Linux and PalmPilots.
 Name: pilot-link
 Version: 0.12.0
-Release: 0.pre4.5.2
+Release: 0.pre4.5.2.1
 Source: pilot-link-%{version}-%{interversion}.tar.bz2
 Url: http://www.pilot-link.org/
 Patch1: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch
@@ -132,6 +132,9 @@
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12.0-0.pre4.5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.12.0-0.pre4.5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:10:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:10:04 -0500
Subject: rpms/pinfo/devel pinfo.spec,1.25,1.26
Message-ID: <200602110510.k1B5A4Dh012521@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12493

Modified Files:
	pinfo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- pinfo.spec	7 Feb 2006 13:29:34 -0000	1.25
+++ pinfo.spec	11 Feb 2006 05:10:01 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: An info file viewer.
 Name: pinfo
 Version: 0.6.8
-Release: 11.2
+Release: 11.2.1
 Group: System Environment/Base
 License: GPL
 URL: http://dione.ids.pl/~pborys/software/pinfo
@@ -70,6 +70,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.8-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:10:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:10:20 -0500
Subject: rpms/pkgconfig/devel pkgconfig.spec,1.29,1.30
Message-ID: <200602110510.k1B5AKio012645@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pkgconfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pkgconfig.spec	7 Feb 2006 13:29:49 -0000	1.29
+++ pkgconfig.spec	11 Feb 2006 05:10:16 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.20
-Release: 2.2
+Release: 2.2.1
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -45,6 +45,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.20-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:10:45 -0500
Subject: rpms/planner/devel planner.spec,1.21,1.22
Message-ID: <200602110510.k1B5AjGj012786@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/planner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12764

Modified Files:
	planner.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: planner.spec
===================================================================
RCS file: /cvs/dist/rpms/planner/devel/planner.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- planner.spec	9 Feb 2006 10:48:23 -0000	1.21
+++ planner.spec	11 Feb 2006 05:10:42 -0000	1.22
@@ -8,7 +8,7 @@
 Summary:   A graphical project management tool.
 Name:      planner
 Version:   0.13
-Release:   4
+Release:   4.1
 URL:       http://planner.imendio.org
 License:   GPL
 Group:     Applications/Productivity
@@ -213,6 +213,9 @@
 # Changelog
 ##################################
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-4.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Caolan McNamara <caolanm at redhat.com> - 0.13-4
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:11:10 -0500
Subject: rpms/pm-utils/devel pm-utils.spec,1.23,1.24
Message-ID: <200602110511.k1B5BAkB012865@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pm-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pm-utils.spec	7 Feb 2006 13:31:21 -0000	1.23
+++ pm-utils.spec	11 Feb 2006 05:11:07 -0000	1.24
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
 Version: 0.09
-Release: 1.1
+Release: 1.2
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -81,6 +81,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.09-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.09-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:11:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:11:30 -0500
Subject: rpms/pnm2ppa/devel pnm2ppa.spec,1.8,1.9
Message-ID: <200602110511.k1B5BUnC013145@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pnm2ppa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12907

Modified Files:
	pnm2ppa.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pnm2ppa.spec
===================================================================
RCS file: /cvs/dist/rpms/pnm2ppa/devel/pnm2ppa.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pnm2ppa.spec	7 Feb 2006 13:32:48 -0000	1.8
+++ pnm2ppa.spec	11 Feb 2006 05:11:27 -0000	1.9
@@ -3,7 +3,7 @@
 Epoch: 1
 Obsoletes: ppa
 Version: 1.04
-Release: 13.2
+Release: 13.2.1
 URL: http://sourceforge.net/projects/pnm2ppa 
 Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
 Source1: http://www.httptech.com/ppa/files/ppa-0.8.6.tar.gz
@@ -80,6 +80,9 @@
 %config /etc/pbm2ppa.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.04-13.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.04-13.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:12:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:12:25 -0500
Subject: rpms/policycoreutils/devel policycoreutils.spec,1.234,1.235
Message-ID: <200602110512.k1B5CPVp012567@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6648

Modified Files:
	policycoreutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- policycoreutils.spec	10 Feb 2006 17:04:05 -0000	1.234
+++ policycoreutils.spec	11 Feb 2006 05:12:23 -0000	1.235
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.20
-Release: 2
+Release: 2.1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -98,6 +98,9 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.20-2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Dan Walsh <dwalsh at redhat.com> 1.29.20-2
 - Fix auditing to semanage
 - Change genhomedircon to use new prefix interface in libselinux



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:12:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:12:48 -0500
Subject: rpms/poppler/devel poppler.spec,1.22,1.23
Message-ID: <200602110512.k1B5Cmu1020623@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20610

Modified Files:
	poppler.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- poppler.spec	7 Feb 2006 13:34:39 -0000	1.22
+++ poppler.spec	11 Feb 2006 05:12:46 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Pdf rendering library
 Name: poppler
 Version: 0.5.0
-Release: 4.1
+Release: 4.2
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:13:20 -0500
Subject: rpms/portmap/devel portmap.spec,1.17,1.18
Message-ID: <200602110513.k1B5DKQM002710@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/portmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31917

Modified Files:
	portmap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: portmap.spec
===================================================================
RCS file: /cvs/dist/rpms/portmap/devel/portmap.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- portmap.spec	7 Feb 2006 13:35:01 -0000	1.17
+++ portmap.spec	11 Feb 2006 05:13:16 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: A program which manages RPC connections.
 Name: portmap
 Version: 4.0
-Release: 65.2
+Release: 65.2.1
 Group: System Environment/Daemons
 License: BSD
 Source0: ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/portmap/portmap_4.tar.gz
@@ -109,6 +109,9 @@
 %config	%{initdir}/portmap
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:13:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:13:43 -0500
Subject: rpms/postfix/devel postfix.spec,1.37,1.38
Message-ID: <200602110513.k1B5Dhfs005491@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postfix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4997

Modified Files:
	postfix.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: postfix.spec
===================================================================
RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- postfix.spec	7 Feb 2006 13:35:21 -0000	1.37
+++ postfix.spec	11 Feb 2006 05:13:38 -0000	1.38
@@ -43,7 +43,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 2.2.8
-Release: 1.1
+Release: 1.2
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -467,6 +467,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.8-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.8-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:14:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:14:11 -0500
Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.12,1.13
Message-ID: <200602110514.k1B5EB0S007401@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql-odbc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7387

Modified Files:
	postgresql-odbc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: postgresql-odbc.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- postgresql-odbc.spec	7 Feb 2006 13:35:59 -0000	1.12
+++ postgresql-odbc.spec	11 Feb 2006 05:14:08 -0000	1.13
@@ -1,7 +1,7 @@
 Name: postgresql-odbc
 Summary: PostgreSQL ODBC driver.
 Version: 08.01.0200
-Release: 1.1
+Release: 1.2
 License: LGPL
 Group: Applications/Databases
 Url: http://gborg.postgresql.org/project/psqlodbc
@@ -66,6 +66,9 @@
 %{_libdir}/psqlodbc.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 08.01.0200-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 08.01.0200-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:14:32 -0500
Subject: rpms/ppc64-utils/devel ppc64-utils.spec,1.17,1.18
Message-ID: <200602110514.k1B5EWna007454@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	ppc64-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ppc64-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/ppc64-utils/devel/ppc64-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ppc64-utils.spec	7 Feb 2006 13:36:09 -0000	1.17
+++ ppc64-utils.spec	11 Feb 2006 05:14:30 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: Linux/PPC64 specific utilities
 Name: ppc64-utils
 Version: 0.9
-Release: 12.2
+Release: 12.2.1
 License: GPL and OSL
 Group: System Environment/Base
 Source0: ppc64-utils-%{ppc64utilsver}.tar.gz
@@ -67,6 +67,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:14:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:14:55 -0500
Subject: rpms/ppp/devel ppp.spec,1.36,1.37
Message-ID: <200602110514.k1B5Et9r007509@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7497

Modified Files:
	ppp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ppp.spec	7 Feb 2006 13:36:20 -0000	1.36
+++ ppp.spec	11 Feb 2006 05:14:52 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.3
-Release: 6.2
+Release: 6.2.1
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:15:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:15:27 -0500
Subject: rpms/prelink/devel prelink.spec,1.32,1.33
Message-ID: <200602110515.k1B5FRA4007571@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7558

Modified Files:
	prelink.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- prelink.spec	7 Feb 2006 13:36:44 -0000	1.32
+++ prelink.spec	11 Feb 2006 05:15:24 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.6
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Base
 %define date 20051214
@@ -89,6 +89,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:15:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:15:52 -0500
Subject: rpms/privoxy/devel privoxy.spec,1.12,1.13
Message-ID: <200602110515.k1B5Fqfm007692@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/privoxy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7615

Modified Files:
	privoxy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: privoxy.spec
===================================================================
RCS file: /cvs/dist/rpms/privoxy/devel/privoxy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- privoxy.spec	7 Feb 2006 13:36:55 -0000	1.12
+++ privoxy.spec	11 Feb 2006 05:15:50 -0000	1.13
@@ -38,7 +38,7 @@
 # Version and release should be updated acordingly on configure.in and
 # configure. Otherwise, the package can be build with the wrong value
 Version: 3.0.3
-Release: 9.2
+Release: 9.2.1
 Summary: Privoxy - privacy enhancing proxy
 License: GPL
 Source0: http://www.waldherr.org/%{name}/%{name}-%{version}-stable-src.tar.gz
@@ -328,6 +328,9 @@
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0.3-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.3-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:16:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:16:31 -0500
Subject: rpms/procinfo/devel procinfo.spec,1.18,1.19
Message-ID: <200602110516.k1B5GV8l009186@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8838

Modified Files:
	procinfo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- procinfo.spec	7 Feb 2006 13:37:05 -0000	1.18
+++ procinfo.spec	11 Feb 2006 05:16:29 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 18.2
+Release: 18.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 18-18.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 18-18.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:17:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:17:11 -0500
Subject: rpms/procmail/devel procmail.spec,1.17,1.18
Message-ID: <200602110517.k1B5HBhs010724@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/procmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10402

Modified Files:
	procmail.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: procmail.spec
===================================================================
RCS file: /cvs/dist/rpms/procmail/devel/procmail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- procmail.spec	7 Feb 2006 13:37:16 -0000	1.17
+++ procmail.spec	11 Feb 2006 05:17:08 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The procmail mail processing program.
 Name: procmail
 Version: 3.22
-Release: 16.2
+Release: 16.2.1
 License: GPL or Artistic
 Group: System Environment/Daemons
 Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz
@@ -58,6 +58,9 @@
 %{_mandir}/man[15]/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.22-16.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.22-16.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:17:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:17:53 -0500
Subject: rpms/procps/devel procps.spec,1.45,1.46
Message-ID: <200602110517.k1B5Hr6f012367@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	procps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- procps.spec	7 Feb 2006 13:37:29 -0000	1.45
+++ procps.spec	11 Feb 2006 05:17:46 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.6
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -99,6 +99,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.6-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:18:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:18:33 -0500
Subject: rpms/psacct/devel psacct.spec,1.19,1.20
Message-ID: <200602110518.k1B5IXnJ013843@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13568

Modified Files:
	psacct.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- psacct.spec	7 Feb 2006 13:37:39 -0000	1.19
+++ psacct.spec	11 Feb 2006 05:18:30 -0000	1.20
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 38.1
+Release: 38.2
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -161,6 +161,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2-38.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2-38.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:18:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:18:48 -0500
Subject: rpms/psmisc/devel psmisc.spec,1.24,1.25
Message-ID: <200602110518.k1B5ImUv014883@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psmisc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14703

Modified Files:
	psmisc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: psmisc.spec
===================================================================
RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- psmisc.spec	7 Feb 2006 13:37:49 -0000	1.24
+++ psmisc.spec	11 Feb 2006 05:18:45 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: Utilities for managing processes on your system.
 Name: psmisc
 Version: 21.8
-Release: 1.2
+Release: 1.2.1
 License: BSD/GPL
 Group: Applications/System
 Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
@@ -59,6 +59,9 @@
 %{_mandir}/man1/pstree.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 21.8-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 21.8-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:19:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:19:04 -0500
Subject: rpms/pstack/devel pstack.spec,1.16,1.17
Message-ID: <200602110519.k1B5J4jJ015981@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pstack/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15812

Modified Files:
	pstack.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pstack.spec
===================================================================
RCS file: /cvs/dist/rpms/pstack/devel/pstack.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pstack.spec	7 Feb 2006 13:37:59 -0000	1.16
+++ pstack.spec	11 Feb 2006 05:19:01 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Display stack trace of a running process
 Name: pstack
 Version: 1.2
-Release: 7.2
+Release: 7.2.1
 License: GPL
 Group: Development/Debuggers
 BuildRoot: %{_tmppath}/%{name}-root
@@ -83,6 +83,9 @@
 %{_mandir}/man1/pstack.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:19:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:19:19 -0500
Subject: rpms/psutils/devel psutils.spec,1.13,1.14
Message-ID: <200602110519.k1B5JJGq017024@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/psutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16772

Modified Files:
	psutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: psutils.spec
===================================================================
RCS file: /cvs/dist/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psutils.spec	7 Feb 2006 13:38:09 -0000	1.13
+++ psutils.spec	11 Feb 2006 05:19:16 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 25.2
+Release: 25.2.1
 License: distributable
 Group: Applications/Publishing
 Source: ftp://ftp.dcs.ed.ac.uk/pub/ajcd/psutils-p17.tar.gz
@@ -46,6 +46,9 @@
 /usr/lib/psutils
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.17-25.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.17-25.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:19:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:19:31 -0500
Subject: rpms/pump/devel pump.spec,1.23,1.24
Message-ID: <200602110519.k1B5JVFJ018314@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17943

Modified Files:
	pump.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pump.spec
===================================================================
RCS file: /cvs/dist/rpms/pump/devel/pump.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pump.spec	7 Feb 2006 13:38:20 -0000	1.23
+++ pump.spec	11 Feb 2006 05:19:28 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A Bootp and DHCP client for automatic IP configuration.
 Name: pump
 Version: 0.8.24
-Release: 1.2
+Release: 1.2.1
 Group: System Environment/Daemons
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-root
@@ -75,6 +75,9 @@
 %{_sbindir}/netconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:19:44 -0500
Subject: rpms/pvm/devel pvm.spec,1.35,1.36
Message-ID: <200602110519.k1B5JiUc019280@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pvm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19174

Modified Files:
	pvm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pvm.spec
===================================================================
RCS file: /cvs/dist/rpms/pvm/devel/pvm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pvm.spec	8 Feb 2006 00:41:24 -0000	1.35
+++ pvm.spec	11 Feb 2006 05:19:39 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Libraries for distributed computing.
 Name: pvm 
 Version: 3.4.5
-Release: 6.7
+Release: 6.7.1
 License: freely distributable
 Group: Development/Libraries
 Source0: http://www.netlib.org/pvm3/pvm%{version}.tgz
@@ -225,6 +225,9 @@
 /usr/share/pvm3/xpvm/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 3.4.5-6.7
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:20:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:20:05 -0500
Subject: rpms/pwlib/devel pwlib.spec,1.28,1.29
Message-ID: <200602110520.k1B5K5DS020654@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	pwlib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pwlib.spec	7 Feb 2006 13:38:30 -0000	1.28
+++ pwlib.spec	11 Feb 2006 05:20:03 -0000	1.29
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
 Version:	1.9.2
-Release:        1.1
+Release:        1.2
 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
@@ -93,6 +93,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:20:31 -0500
Subject: rpms/pycairo/devel pycairo.spec,1.5,1.6
Message-ID: <200602110520.k1B5KVGj020709@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pycairo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20696

Modified Files:
	pycairo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pycairo.spec
===================================================================
RCS file: /cvs/dist/rpms/pycairo/devel/pycairo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pycairo.spec	7 Feb 2006 13:38:39 -0000	1.5
+++ pycairo.spec	11 Feb 2006 05:20:28 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: Python bindings for the cairo library
 Name: pycairo
 Version: 1.0.2 
-Release: 1.2
+Release: 1.2.1
 License: LGPL
 Group: Development/Languages
 URL: http://cairographics.org/
@@ -56,6 +56,9 @@
 %{_includedir}/pycairo/pycairo.h
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:20:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:20:54 -0500
Subject: rpms/pyOpenSSL/devel pyOpenSSL.spec,1.20,1.21
Message-ID: <200602110520.k1B5KsJv020762@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyOpenSSL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20753

Modified Files:
	pyOpenSSL.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pyOpenSSL.spec
===================================================================
RCS file: /cvs/dist/rpms/pyOpenSSL/devel/pyOpenSSL.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pyOpenSSL.spec	7 Feb 2006 13:38:59 -0000	1.20
+++ pyOpenSSL.spec	11 Feb 2006 05:20:49 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
 Version: 0.6
-Release: 1.p24.7.2
+Release: 1.p24.7.2.1
 Source0: http://pyopenssl.sf.net/%{name}-%{version}.tar.gz
 Patch0: pyOpenSSL-0.5.1-openssl097.patch
 Patch2: pyOpenSSL-elinks.patch
@@ -57,6 +57,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.p24.7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.p24.7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:21:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:21:21 -0500
Subject: rpms/pyorbit/devel pyorbit.spec,1.16,1.17
Message-ID: <200602110521.k1B5LLCS020821@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20808

Modified Files:
	pyorbit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pyorbit.spec	7 Feb 2006 13:39:11 -0000	1.16
+++ pyorbit.spec	11 Feb 2006 05:21:19 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: Python bindings for ORBit2.
 Name: pyorbit
 Version: 2.0.1
-Release: 4.2
+Release: 4.2.1
 License: LGPL
 Group: Development/Languages
 Source: %{name}-%{version}.tar.bz2
@@ -66,6 +66,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.1-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.1-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:21:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:21:50 -0500
Subject: rpms/pyparted/devel pyparted.spec,1.17,1.18
Message-ID: <200602110521.k1B5Loqd020872@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyparted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20863

Modified Files:
	pyparted.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pyparted.spec
===================================================================
RCS file: /cvs/dist/rpms/pyparted/devel/pyparted.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pyparted.spec	7 Feb 2006 13:39:22 -0000	1.17
+++ pyparted.spec	11 Feb 2006 05:21:47 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: python module for parted
 Name: pyparted
 Version: 1.6.10
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.6.10-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:22:21 -0500
Subject: rpms/PyQt/devel PyQt.spec,1.25,1.26
Message-ID: <200602110522.k1B5MLXB020932@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20919

Modified Files:
	PyQt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- PyQt.spec	7 Feb 2006 13:39:33 -0000	1.25
+++ PyQt.spec	11 Feb 2006 05:22:15 -0000	1.26
@@ -16,7 +16,7 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.15
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -95,6 +95,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:23:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:23:05 -0500
Subject: rpms/python/devel python.spec,1.64,1.65
Message-ID: <200602110523.k1B5N5Ej020985@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- python.spec	10 Feb 2006 15:28:32 -0000	1.64
+++ python.spec	11 Feb 2006 05:23:02 -0000	1.65
@@ -19,7 +19,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.2
-Release: 3.2
+Release: 3.2.1
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -359,6 +359,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:23:27 -0500
Subject: rpms/python-elementtree/devel python-elementtree.spec,1.3,1.4
Message-ID: <200602110523.k1B5NRF9021044@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-elementtree.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python-elementtree.spec
===================================================================
RCS file: /cvs/dist/rpms/python-elementtree/devel/python-elementtree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-elementtree.spec	7 Feb 2006 13:40:00 -0000	1.3
+++ python-elementtree.spec	11 Feb 2006 05:23:25 -0000	1.4
@@ -6,7 +6,7 @@
 
 Name: python-elementtree
 Version: 1.2.6
-Release: 4.2
+Release: 4.2.1
 Summary: Fast XML parser and writer
 Group: Development/Libraries
 License: PSF
@@ -67,6 +67,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.6-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.6-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:23:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:23:45 -0500
Subject: rpms/python-ldap/devel python-ldap.spec,1.13,1.14
Message-ID: <200602110523.k1B5NjEp021097@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-ldap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python-ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/python-ldap/devel/python-ldap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-ldap.spec	7 Feb 2006 13:40:11 -0000	1.13
+++ python-ldap.spec	11 Feb 2006 05:23:42 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           python-ldap
 Version:        2.0.6
-Release: 5.2
+Release: 5.2.1
 Epoch:          0
 Summary:        An object-oriented API to access LDAP directory servers.
 
@@ -49,6 +49,9 @@
 %doc LICENCE CHANGES README TODO Demo
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.6-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.6-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:24:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:24:08 -0500
Subject: rpms/python-numeric/devel python-numeric.spec,1.5,1.6
Message-ID: <200602110524.k1B5O8xf021160@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-numeric.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python-numeric.spec
===================================================================
RCS file: /cvs/dist/rpms/python-numeric/devel/python-numeric.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-numeric.spec	7 Feb 2006 13:40:24 -0000	1.5
+++ python-numeric.spec	11 Feb 2006 05:24:06 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Numerical Extension to Python
 Name: python-numeric
 Version: 23.7
-Release: 2.2
+Release: 2.2.1
 License: Python
 Group: Development/Languages
 URL: http://numpy.sourceforge.net
@@ -39,6 +39,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 23.7-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 23.7-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:24:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:24:34 -0500
Subject: rpms/python-pyblock/devel python-pyblock.spec,1.17,1.18
Message-ID: <200602110524.k1B5OYMp021216@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-pyblock.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-pyblock.spec	6 Feb 2006 22:07:49 -0000	1.17
+++ python-pyblock.spec	11 Feb 2006 05:24:31 -0000	1.18
@@ -5,7 +5,7 @@
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
 Version: 0.13
-Release: 1
+Release: 1.1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -38,6 +38,9 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-1.1
+- bump again for double-long bug on ppc(64)
+
 * Mon Feb  6 2006 Peter Jones <pjones at redhat.com> - 0.13-1
 - partition naming/creation/detection fixes
 - fixes for isw (ICH[4567]R) "groups"



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:25:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:25:04 -0500
Subject: rpms/python-sqlite/devel python-sqlite.spec,1.6,1.7
Message-ID: <200602110525.k1B5P49C021271@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	python-sqlite.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: python-sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/python-sqlite/devel/python-sqlite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-sqlite.spec	7 Feb 2006 13:40:34 -0000	1.6
+++ python-sqlite.spec	11 Feb 2006 05:25:01 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: Python bindings for sqlite.
 Name: python-sqlite
 Version: 1.1.7
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/Libraries
 URL: http://pysqlite.org/
@@ -36,6 +36,9 @@
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.7-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:25:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:25:25 -0500
Subject: rpms/pyxf86config/devel pyxf86config.spec,1.23,1.24
Message-ID: <200602110525.k1B5PP9d021323@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21313

Modified Files:
	pyxf86config.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pyxf86config.spec	7 Feb 2006 13:40:44 -0000	1.23
+++ pyxf86config.spec	11 Feb 2006 05:25:22 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
 Version: 0.3.23
-Release: 1.1
+Release: 1.2
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.23-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.23-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:25:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:25:45 -0500
Subject: rpms/PyXML/devel PyXML.spec,1.20,1.21
Message-ID: <200602110525.k1B5PjG4021381@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyXML/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21368

Modified Files:
	PyXML.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: PyXML.spec
===================================================================
RCS file: /cvs/dist/rpms/PyXML/devel/PyXML.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PyXML.spec	7 Feb 2006 13:41:01 -0000	1.20
+++ PyXML.spec	11 Feb 2006 05:25:43 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: XML libraries for python.
 Name: PyXML
 Version: 0.8.4
-Release: 3.2
+Release: 3.2.1
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
@@ -47,6 +47,9 @@
 %{_libdir}/python%pyver/site-packages/_xmlplus/
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:26:07 -0500
Subject: rpms/qt/devel qt.spec,1.99,1.100
Message-ID: <200602110526.k1B5Q7UK021437@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21423

Modified Files:
	qt.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- qt.spec	7 Feb 2006 13:41:12 -0000	1.99
+++ qt.spec	11 Feb 2006 05:26:03 -0000	1.100
@@ -85,7 +85,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 12.1
+Release: 12.2
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -740,6 +740,9 @@
 
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.3.5-12.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:26:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:26:35 -0500
Subject: rpms/quagga/devel quagga.spec,1.29,1.30
Message-ID: <200602110526.k1B5QZ0L021490@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quagga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21478

Modified Files:
	quagga.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- quagga.spec	7 Feb 2006 13:41:28 -0000	1.29
+++ quagga.spec	11 Feb 2006 05:26:32 -0000	1.30
@@ -31,7 +31,7 @@
 Summary: Routing daemon
 Name:		quagga
 Version:	0.98.5
-Release: 3.2
+Release: 3.2.1
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -345,6 +345,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.98.5-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.98.5-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:26:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:26:54 -0500
Subject: rpms/quota/devel quota.spec,1.25,1.26
Message-ID: <200602110526.k1B5QsRR021543@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/quota/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21533

Modified Files:
	quota.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: quota.spec
===================================================================
RCS file: /cvs/dist/rpms/quota/devel/quota.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- quota.spec	7 Feb 2006 13:41:43 -0000	1.25
+++ quota.spec	11 Feb 2006 05:26:47 -0000	1.26
@@ -2,7 +2,7 @@
 Summary: System administration tools for monitoring users' disk usage.
 Epoch: 1
 Version: 3.13
-Release: 1.2
+Release: 1.2.1
 License: BSD
 URL: http://sourceforge.net/projects/linuxquota/
 Group: System Environment/Base
@@ -76,6 +76,9 @@
 
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.13-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:27:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:27:21 -0500
Subject: rpms/radvd/devel radvd.spec,1.27,1.28
Message-ID: <200602110527.k1B5RLFv021601@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/radvd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21588

Modified Files:
	radvd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: radvd.spec
===================================================================
RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- radvd.spec	8 Feb 2006 00:20:04 -0000	1.27
+++ radvd.spec	11 Feb 2006 05:27:19 -0000	1.28
@@ -3,7 +3,7 @@
 Summary:   A Router Advertisement daemon
 Name:      radvd
 Version:   0.9.1
-Release:   1.1
+Release:   1.1.1
 License:   BSD-style
 Group:     System Environment/Daemons
 Source:    http://www.litech.org/radvd/radvd-%{version}.tar.gz
@@ -82,6 +82,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 0.9.1-1.1
 - rebuild for new gcc, glibc, glibc-kernheaders
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:27:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:27:41 -0500
Subject: rpms/rarpd/devel rarpd.spec,1.16,1.17
Message-ID: <200602110527.k1B5RfII021655@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rarpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21643

Modified Files:
	rarpd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rarpd.spec
===================================================================
RCS file: /cvs/dist/rpms/rarpd/devel/rarpd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rarpd.spec	7 Feb 2006 13:41:53 -0000	1.16
+++ rarpd.spec	11 Feb 2006 05:27:38 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The RARP daemon.
 Name: rarpd
 Version: ss981107
-Release: 22.2
+Release: 22.2.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@ -76,6 +76,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - ss981107-22.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - ss981107-22.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:28:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:28:10 -0500
Subject: rpms/rcs/devel rcs.spec,1.15,1.16
Message-ID: <200602110528.k1B5SAdT021712@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rcs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21698

Modified Files:
	rcs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rcs.spec
===================================================================
RCS file: /cvs/dist/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rcs.spec	7 Feb 2006 13:42:03 -0000	1.15
+++ rcs.spec	11 Feb 2006 05:28:07 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 29.2
+Release: 29.2.1
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -55,6 +55,9 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.7-29.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.7-29.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:28:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:28:34 -0500
Subject: rpms/rdate/devel rdate.spec,1.17,1.18
Message-ID: <200602110528.k1B5SYKA021766@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdate/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21753

Modified Files:
	rdate.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rdate.spec
===================================================================
RCS file: /cvs/dist/rpms/rdate/devel/rdate.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rdate.spec	7 Feb 2006 13:42:13 -0000	1.17
+++ rdate.spec	11 Feb 2006 05:28:30 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Tool for getting the date/time from a remote machine.
 Name: rdate
 Version: 1.4
-Release: 4.2
+Release: 4.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://people.redhat.com/sopwith/rdate-%{version}.tar.gz
@@ -34,6 +34,9 @@
 %{_mandir}/man1/rdate.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:28:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:28:56 -0500
Subject: rpms/rdesktop/devel rdesktop.spec,1.20,1.21
Message-ID: <200602110528.k1B5SumN021822@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21809

Modified Files:
	rdesktop.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rdesktop.spec	7 Feb 2006 13:42:24 -0000	1.20
+++ rdesktop.spec	11 Feb 2006 05:28:53 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           rdesktop
 Version:        1.4.1
-Release: 3.2
+Release: 3.2.1
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
@@ -38,6 +38,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:29:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:29:21 -0500
Subject: rpms/rdist/devel rdist.spec,1.18,1.19
Message-ID: <200602110529.k1B5TLGm021879@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rdist/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21866

Modified Files:
	rdist.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rdist.spec
===================================================================
RCS file: /cvs/dist/rpms/rdist/devel/rdist.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rdist.spec	7 Feb 2006 13:42:34 -0000	1.18
+++ rdist.spec	11 Feb 2006 05:29:19 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Maintains identical copies of files on multiple machines.
 Name: rdist
 Version: 6.1.5
-Release: 42.2
+Release: 42.2.1
 Epoch: 1
 License: BSD
 Group: Applications/System
@@ -87,6 +87,9 @@
 %{_mandir}/man8/rdist.8*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:6.1.5-42.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:30:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:30:15 -0500
Subject: rpms/readahead/devel readahead.spec,1.24,1.25
Message-ID: <200602110530.k1B5UF1V021942@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readahead/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21931

Modified Files:
	readahead.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: readahead.spec
===================================================================
RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- readahead.spec	7 Feb 2006 13:42:45 -0000	1.24
+++ readahead.spec	11 Feb 2006 05:30:12 -0000	1.25
@@ -1,7 +1,7 @@
 Summary:        Read a preset list of files into memory.
 Name:           readahead
 Version:        1.2
-Release:	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1
+Release:	%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -76,7 +76,10 @@
 
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - error: line 4: Tag takes single token only: Release:	:.1 1.23.1
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-1.24.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2-1.23.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 13 2006 Karel Zak <kzak at redhat.com>



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:30:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:30:39 -0500
Subject: rpms/readline/devel readline.spec,1.25,1.26
Message-ID: <200602110530.k1B5UdVs022001@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/readline/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21987

Modified Files:
	readline.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: readline.spec
===================================================================
RCS file: /cvs/dist/rpms/readline/devel/readline.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- readline.spec	7 Feb 2006 13:42:55 -0000	1.25
+++ readline.spec	11 Feb 2006 05:30:37 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A library for editing typed command lines.
 Name: readline
 Version: 5.0
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -100,6 +100,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.0-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:31:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:31:02 -0500
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.122,1.123
Message-ID: <200602110531.k1B5V2CL022071@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22057

Modified Files:
	redhat-artwork.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- redhat-artwork.spec	9 Feb 2006 14:41:54 -0000	1.122
+++ redhat-artwork.spec	11 Feb 2006 05:31:00 -0000	1.123
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.238
-Release: 1
+Release: 1.1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -154,6 +154,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.238-1.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 0.238-1
 - Add left-handed cursor themes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:31:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:31:25 -0500
Subject: rpms/redhat-lsb/devel redhat-lsb.spec,1.15,1.16
Message-ID: <200602110531.k1B5VPEY022126@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/redhat-lsb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22112

Modified Files:
	redhat-lsb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: redhat-lsb.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- redhat-lsb.spec	7 Feb 2006 13:43:21 -0000	1.15
+++ redhat-lsb.spec	11 Feb 2006 05:31:23 -0000	1.16
@@ -48,7 +48,7 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.0
-Release: 9.1
+Release: 9.2
 URL: http://www.linuxbase.org/
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{lsbrelver}.tar.gz
@@ -395,6 +395,9 @@
 /usr/sbin/redhat_lsb_trigger.%{_target_cpu}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:31:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:31:46 -0500
Subject: rpms/regexp/devel regexp.spec,1.28,1.29
Message-ID: <200602110531.k1B5Vkup022180@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22167

Modified Files:
	regexp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- regexp.spec	7 Feb 2006 13:43:32 -0000	1.28
+++ regexp.spec	11 Feb 2006 05:31:43 -0000	1.29
@@ -1,7 +1,7 @@
 %define name		regexp
 %define full_name	jakarta-%{name}
 %define version		1.3
-%define release 	2jpp_5fc
+%define release 	2jpp_6fc
 %define section		free
 
 Name:           %{name}
@@ -94,6 +94,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_6fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.3-2jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:32:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:32:21 -0500
Subject: rpms/rhdb-utils/devel rhdb-utils.spec,1.11,1.12
Message-ID: <200602110532.k1B5WLIE022235@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	rhdb-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rhdb-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rhdb-utils/devel/rhdb-utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rhdb-utils.spec	7 Feb 2006 13:44:03 -0000	1.11
+++ rhdb-utils.spec	11 Feb 2006 05:32:19 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition.
 Name: rhdb-utils
 Version: 8.1.1
-Release: 1.2
+Release: 1.2.1
 URL: http://sources.redhat.com/rhdb/
 License: GPL
 Group: Applications/Databases
@@ -50,6 +50,9 @@
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:33:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:33:22 -0500
Subject: rpms/rhgb/devel rhgb.spec,1.47,1.48
Message-ID: <200602110533.k1B5XMg3022292@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22278

Modified Files:
	rhgb.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- rhgb.spec	7 Feb 2006 13:44:14 -0000	1.47
+++ rhgb.spec	11 Feb 2006 05:33:20 -0000	1.48
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.2
-Release: 21.1
+Release: 21.2
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:33:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:33:46 -0500
Subject: rpms/rhn-applet/devel applet.spec,1.35,1.36
Message-ID: <200602110533.k1B5XkNn022346@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhn-applet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22333

Modified Files:
	applet.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: applet.spec
===================================================================
RCS file: /cvs/dist/rpms/rhn-applet/devel/applet.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- applet.spec	7 Feb 2006 13:44:25 -0000	1.35
+++ applet.spec	11 Feb 2006 05:33:43 -0000	1.36
@@ -10,7 +10,7 @@
 Name: rhn-applet
 URL: https://rhn.redhat.com/
 Version: 2.1.17
-Release: 4.2
+Release: 4.2.1
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: python >= 2.2.1
 BuildRequires: python-devel >= 2.2.1
@@ -82,6 +82,9 @@
 %doc doc/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.17-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.17-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:34:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:34:09 -0500
Subject: rpms/rhpl/devel rhpl.spec,1.66,1.67
Message-ID: <200602110534.k1B5Y92q022401@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22388

Modified Files:
	rhpl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- rhpl.spec	9 Feb 2006 20:37:18 -0000	1.66
+++ rhpl.spec	11 Feb 2006 05:34:06 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
 Version: 0.181
-Release: 2
+Release: 2.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,6 +39,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.181-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jeremy Katz <katzj at redhat.com> - 0.181-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:34:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:34:28 -0500
Subject: rpms/rhythmbox/devel rhythmbox.spec,1.50,1.51
Message-ID: <200602110534.k1B5YS0X022456@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22443

Modified Files:
	rhythmbox.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- rhythmbox.spec	7 Feb 2006 13:44:45 -0000	1.50
+++ rhythmbox.spec	11 Feb 2006 05:34:26 -0000	1.51
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.3.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -96,6 +96,9 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:34:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:34:54 -0500
Subject: rpms/rpm/devel rpm.spec,1.194,1.195
Message-ID: <200602110534.k1B5Ys9i022511@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22498

Modified Files:
	rpm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- rpm.spec	7 Feb 2006 13:44:57 -0000	1.194
+++ rpm.spec	11 Feb 2006 05:34:50 -0000	1.195
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 15.1
+Release: 15.2
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -568,6 +568,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.4.2-15.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.4.2-15.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:35:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:35:41 -0500
Subject: rpms/rp-pppoe/devel rp-pppoe.spec,1.34,1.35
Message-ID: <200602110535.k1B5ZfQc022566@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rp-pppoe/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22553

Modified Files:
	rp-pppoe.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rp-pppoe.spec
===================================================================
RCS file: /cvs/dist/rpms/rp-pppoe/devel/rp-pppoe.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rp-pppoe.spec	7 Feb 2006 13:45:23 -0000	1.34
+++ rp-pppoe.spec	11 Feb 2006 05:35:38 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A PPP over Ethernet client (for xDSL support).
 Name: rp-pppoe
 Version: 3.5
-Release: 30.2
+Release: 30.2.1
 License: GPL
 Group: System Environment/Daemons
 Url: http://www.roaringpenguin.com/pppoe/
@@ -150,6 +150,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.5-30.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.5-30.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:35:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:35:58 -0500
Subject: rpms/rsh/devel rsh.spec,1.26,1.27
Message-ID: <200602110535.k1B5ZwSZ022621@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22608

Modified Files:
	rsh.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rsh.spec
===================================================================
RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rsh.spec	9 Feb 2006 13:22:25 -0000	1.26
+++ rsh.spec	11 Feb 2006 05:35:56 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Clients for remote access commands (rsh, rlogin, rcp).
 Name: rsh
 Version: 0.17
-Release: 34
+Release: 34.1
 License: BSD
 Group: Applications/Internet
 
@@ -176,6 +176,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-34.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Karel Zak <kzak at redhat.com> 0.17-34
 - fix #178916 - Line feeds when password needs changing with rlogin
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:36:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:36:16 -0500
Subject: rpms/rsync/devel rsync.spec,1.34,1.35
Message-ID: <200602110536.k1B5aGI6022676@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rsync/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22663

Modified Files:
	rsync.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rsync.spec
===================================================================
RCS file: /cvs/dist/rpms/rsync/devel/rsync.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rsync.spec	7 Feb 2006 13:45:50 -0000	1.34
+++ rsync.spec	11 Feb 2006 05:36:14 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A program for synchronizing files over a network.
 Name: rsync
 Version: 2.6.6
-Release: 2.2
+Release: 2.2.1
 Group: Applications/Internet
 # TAG: for pre versions use
 #Source:	ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre1.tar.gz
@@ -57,6 +57,9 @@
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.6-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.6-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:36:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:36:40 -0500
Subject: rpms/ruby/devel ruby.spec,1.54,1.55
Message-ID: <200602110536.k1B5aetF022732@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22719

Modified Files:
	ruby.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ruby.spec	7 Feb 2006 13:46:07 -0000	1.54
+++ ruby.spec	11 Feb 2006 05:36:38 -0000	1.55
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	3.1
+Release:	3.2
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -420,6 +420,9 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.4-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:37:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:37:17 -0500
Subject: rpms/rusers/devel rusers.spec,1.19,1.20
Message-ID: <200602110537.k1B5bHuk022786@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rusers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22774

Modified Files:
	rusers.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rusers.spec
===================================================================
RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rusers.spec	7 Feb 2006 13:46:24 -0000	1.19
+++ rusers.spec	11 Feb 2006 05:37:14 -0000	1.20
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network.
 Name: rusers
 Version: 0.17
-Release: 45.2
+Release: 45.2.1
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -140,6 +140,9 @@
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-45.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-45.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:37:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:37:49 -0500
Subject: rpms/rwall/devel rwall.spec,1.17,1.18
Message-ID: <200602110537.k1B5bnpn022842@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwall/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22829

Modified Files:
	rwall.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rwall.spec
===================================================================
RCS file: /cvs/dist/rpms/rwall/devel/rwall.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rwall.spec	7 Feb 2006 13:46:42 -0000	1.17
+++ rwall.spec	11 Feb 2006 05:37:47 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Client for sending messages to a host's logged in users.
 Name: rwall
 Version: 0.17
-Release: 25.2
+Release: 25.2.1
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwall-%{version}.tar.gz
@@ -100,6 +100,9 @@
 %config /etc/rc.d/init.d/rwalld
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:37:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:37:59 -0500
Subject: rpms/rwho/devel rwho.spec,1.15,1.16
Message-ID: <200602110537.k1B5bxfY022898@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rwho/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22884

Modified Files:
	rwho.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: rwho.spec
===================================================================
RCS file: /cvs/dist/rpms/rwho/devel/rwho.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rwho.spec	7 Feb 2006 13:46:55 -0000	1.15
+++ rwho.spec	11 Feb 2006 05:37:57 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines.
 Name: rwho
 Version: 0.17
-Release: 25.2
+Release: 25.2.1
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rwho-%{version}.tar.gz
@@ -98,6 +98,9 @@
 %config /etc/rc.d/init.d/rwhod
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-25.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:38:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:38:08 -0500
Subject: rpms/samba/devel samba.spec,1.58,1.59
Message-ID: <200602110538.k1B5c8do022952@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22939

Modified Files:
	samba.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- samba.spec	9 Dec 2005 22:43:05 -0000	1.58
+++ samba.spec	11 Feb 2006 05:38:05 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: The Samba SMB server.
 Name: samba
 Version: 3.0.20b
-Release: 2.1
+Release: 2.1.1
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -442,6 +442,9 @@
 %{_mandir}/man8/libsmbclient.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.0.20b-2.1.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:38:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:38:35 -0500
Subject: rpms/sane-backends/devel sane-backends.spec,1.51,1.52
Message-ID: <200602110538.k1B5cZJB023008@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22994

Modified Files:
	sane-backends.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sane-backends.spec	7 Feb 2006 13:47:22 -0000	1.51
+++ sane-backends.spec	11 Feb 2006 05:38:33 -0000	1.52
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 3.1
+Release: 3.2
 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
@@ -133,6 +133,9 @@
 %{_libdir}/sane/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:38:49 -0500
Subject: rpms/sane-frontends/devel sane-frontends.spec,1.18,1.19
Message-ID: <200602110538.k1B5cnAm023062@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sane-frontends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23049

Modified Files:
	sane-frontends.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sane-frontends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sane-frontends.spec	7 Feb 2006 13:47:35 -0000	1.18
+++ sane-frontends.spec	11 Feb 2006 05:38:47 -0000	1.19
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 1.2
+Release: 1.2.1
 Summary: Graphical frontend to SANE
 URL:       http://www.sane-project.org
 Source0:    ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.14-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.14-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:38:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:38:58 -0500
Subject: rpms/scim/devel scim.spec,1.22,1.23
Message-ID: <200602110538.k1B5cw9k023118@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23104

Modified Files:
	scim.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim.spec	10 Feb 2006 02:07:14 -0000	1.22
+++ scim.spec	11 Feb 2006 05:38:56 -0000	1.23
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   4
+Release:   4.1
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -184,6 +184,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-4.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-4
 - parse the libstdc++so7 datestamp from the wrapper script
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:07 -0500
Subject: rpms/scim-anthy/devel scim-anthy.spec,1.24,1.25
Message-ID: <200602110539.k1B5d7ax023173@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	scim-anthy.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- scim-anthy.spec	10 Feb 2006 01:26:24 -0000	1.24
+++ scim-anthy.spec	11 Feb 2006 05:39:04 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           scim-anthy
 Version:        0.9.0
-Release:	2.fc5
+Release:	2.fc5.1
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.0-2.fc5.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com>
 - list .so modules explicitly in filelist
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:17 -0500
Subject: rpms/scim-chewing/devel scim-chewing.spec,1.7,1.8
Message-ID: <200602110539.k1B5dHkn023227@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-chewing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23214

Modified Files:
	scim-chewing.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-chewing.spec	9 Feb 2006 11:10:26 -0000	1.7
+++ scim-chewing.spec	11 Feb 2006 05:39:15 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		scim-chewing
 Version:	0.2.1
-Release:	5%{?dist}
+Release:	5%{?dist}.1
 Summary:	Chewing Chinese input method for SCIM
 
 License:	GPL
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.1-5.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-5
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against newer lib



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:26 -0500
Subject: rpms/scim-hangul/devel scim-hangul.spec,1.11,1.12
Message-ID: <200602110539.k1B5dQaW023282@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-hangul/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23269

Modified Files:
	scim-hangul.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-hangul.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-hangul.spec	9 Feb 2006 09:23:15 -0000	1.11
+++ scim-hangul.spec	11 Feb 2006 05:39:24 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           scim-hangul
 Version:        0.2.1
-Release:        3.fc5
+Release:        3.fc5.1
 
 License:        GPL
 URL:            http://www.scim-im.org/
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.1-3.fc5.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against newer lib



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:34 -0500
Subject: rpms/scim-m17n/devel scim-m17n.spec,1.3,1.4
Message-ID: <200602110539.k1B5dYbJ023337@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	scim-m17n.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-m17n.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-m17n/devel/scim-m17n.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-m17n.spec	9 Feb 2006 09:34:33 -0000	1.3
+++ scim-m17n.spec	11 Feb 2006 05:39:32 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           scim-m17n
 Version:        0.1.4
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        SCIM IMEngine for m17n-lib
 
 Group:          System Environment/Libraries
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.4-3.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com> - 0.1.4-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against newer lib



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:42 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.6,1.7
Message-ID: <200602110539.k1B5dgJs023392@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23379

Modified Files:
	scim-pinyin.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-pinyin.spec	9 Feb 2006 09:50:21 -0000	1.6
+++ scim-pinyin.spec	11 Feb 2006 05:39:40 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -72,6 +72,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.91-4.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com> - 0.5.91-4
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:39:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:39:52 -0500
Subject: rpms/scim-qtimm/devel scim-qtimm.spec,1.5,1.6
Message-ID: <200602110539.k1B5dqSK023447@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-qtimm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23434

Modified Files:
	scim-qtimm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-qtimm.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-qtimm/devel/scim-qtimm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-qtimm.spec	9 Dec 2005 22:43:08 -0000	1.5
+++ scim-qtimm.spec	11 Feb 2006 05:39:50 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           scim-qtimm
 Version:        0.9.4
-Release: 2%{?dist}.1
+Release: 2%{?dist}.1.1
 Summary:        SCIM input method module for Qt
 
 License:	GPL
@@ -48,6 +48,9 @@
 
 
 %changelog
+* 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)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:00 -0500
Subject: rpms/scim-tables/devel scim-tables.spec,1.21,1.22
Message-ID: <200602110540.k1B5e048023504@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scim-tables/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23489

Modified Files:
	scim-tables.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scim-tables.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-tables/devel/scim-tables.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- scim-tables.spec	9 Feb 2006 09:54:59 -0000	1.21
+++ scim-tables.spec	11 Feb 2006 05:39:58 -0000	1.22
@@ -5,7 +5,7 @@
 
 Name:		scim-tables
 Version:	0.5.6
-Release:	2
+Release:	2.1
 Summary:	SCIM Generic Table IMEngine
 
 License:	GPL
@@ -420,6 +420,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Jens Petersen <petersen at redhat.com> - 0.5.6-2
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:12 -0500
Subject: rpms/screen/devel screen.spec,1.26,1.27
Message-ID: <200602110540.k1B5eCsX023560@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/screen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23547

Modified Files:
	screen.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: screen.spec
===================================================================
RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- screen.spec	7 Feb 2006 13:47:46 -0000	1.26
+++ screen.spec	11 Feb 2006 05:40:09 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
 Version: 4.0.2
-Release: 11.1
+Release: 11.2
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -175,6 +175,9 @@
 %config /etc/pam.d/screen
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-11.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.2-11.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:21 -0500
Subject: rpms/scrollkeeper/devel scrollkeeper.spec,1.18,1.19
Message-ID: <200602110540.k1B5eLdY023615@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/scrollkeeper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23602

Modified Files:
	scrollkeeper.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: scrollkeeper.spec
===================================================================
RCS file: /cvs/dist/rpms/scrollkeeper/devel/scrollkeeper.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scrollkeeper.spec	7 Feb 2006 13:47:56 -0000	1.18
+++ scrollkeeper.spec	11 Feb 2006 05:40:19 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: ScrollKeeper is a cataloging system for documentation on open systems.
 Name:       scrollkeeper
 Version:    0.3.14
-Release: 5.2
+Release: 5.2.1
 Source0:    http://download.sourceforge.net/scrollkeeper/%{name}-%{version}.tar.gz
 License:    LGPL
 Group:      System Environment/Base
@@ -120,6 +120,9 @@
 /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.14-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.14-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:31 -0500
Subject: rpms/SDL/devel SDL.spec,1.36,1.37
Message-ID: <200602110540.k1B5eV1t023670@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23657

Modified Files:
	SDL.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- SDL.spec	7 Feb 2006 13:48:10 -0000	1.36
+++ SDL.spec	11 Feb 2006 05:40:28 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.9
-Release: 5.1
+Release: 5.2
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.1.7-byteorder.patch
 Patch13: SDL-1.2.7-ppc_modes.patch
@@ -102,6 +102,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:49 -0500
Subject: rpms/sed/devel sed.spec,1.29,1.30
Message-ID: <200602110540.k1B5enF4023725@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23712

Modified Files:
	sed.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sed.spec
===================================================================
RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sed.spec	7 Feb 2006 13:48:22 -0000	1.29
+++ sed.spec	11 Feb 2006 05:40:47 -0000	1.30
@@ -5,7 +5,7 @@
 Summary: A GNU stream text editor.
 Name: sed
 Version: 4.1.5
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz
@@ -63,6 +63,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.1.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:40:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:40:57 -0500
Subject: rpms/sendmail/devel sendmail.spec,1.63,1.64
Message-ID: <200602110540.k1B5evUd023780@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23767

Modified Files:
	sendmail.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sendmail.spec	7 Feb 2006 13:48:36 -0000	1.63
+++ sendmail.spec	11 Feb 2006 05:40:55 -0000	1.64
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.5
-Release: 2.2
+Release: 2.2.1
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -572,6 +572,9 @@
 %{_docdir}/sendmail
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.13.5-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.13.5-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:06 -0500
Subject: rpms/setarch/devel setarch.spec,1.12,1.13
Message-ID: <200602110541.k1B5f6ZI023835@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setarch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23822

Modified Files:
	setarch.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: setarch.spec
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/setarch.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- setarch.spec	7 Feb 2006 13:48:51 -0000	1.12
+++ setarch.spec	11 Feb 2006 05:41:04 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Personality setter
 Name: setarch
 Version: 1.8
-Release: 1.2
+Release: 1.2.1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Kernel
@@ -54,6 +54,9 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:14 -0500
Subject: rpms/setools/devel setools.spec,1.50,1.51
Message-ID: <200602110541.k1B5fEPa023890@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23877

Modified Files:
	setools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- setools.spec	7 Feb 2006 13:49:02 -0000	1.50
+++ setools.spec	11 Feb 2006 05:41:11 -0000	1.51
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
 Version: 2.3
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -234,6 +234,9 @@
 %{_libdir}/libsefs.so.1.2.1
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:22 -0500
Subject: rpms/setserial/devel setserial.spec,1.16,1.17
Message-ID: <200602110541.k1B5fMij023945@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23932

Modified Files:
	setserial.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: setserial.spec
===================================================================
RCS file: /cvs/dist/rpms/setserial/devel/setserial.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- setserial.spec	7 Feb 2006 13:49:31 -0000	1.16
+++ setserial.spec	11 Feb 2006 05:41:20 -0000	1.17
@@ -3,7 +3,7 @@
 Summary: A utility for configuring serial ports.
 Name: setserial
 Version: 2.17
-Release: 19.2
+Release: 19.2.1
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: setserial-2.17-fhs.patch
 Patch1: setserial-2.17-rc.patch
@@ -52,6 +52,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.17-19.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.17-19.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:30 -0500
Subject: rpms/setuptool/devel setuptool.spec,1.23,1.24
Message-ID: <200602110541.k1B5fU2u024000@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/setuptool/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23987

Modified Files:
	setuptool.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: setuptool.spec
===================================================================
RCS file: /cvs/dist/rpms/setuptool/devel/setuptool.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- setuptool.spec	7 Feb 2006 13:49:50 -0000	1.23
+++ setuptool.spec	11 Feb 2006 05:41:28 -0000	1.24
@@ -2,7 +2,7 @@
 # named "setup".  Oh, well.
 Name: setuptool
 Version: 1.18.1
-Release: 1.1
+Release: 1.2
 Summary: A text mode system configuration tool.
 License: GPL
 Group: Applications/System
@@ -46,6 +46,9 @@
 %attr(0644,root,root) %{_sysconfdir}/setuptool.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.18.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:38 -0500
Subject: rpms/sg3_utils/devel sg3_utils.spec,1.11,1.12
Message-ID: <200602110541.k1B5fcvg024055@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sg3_utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24042

Modified Files:
	sg3_utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sg3_utils.spec
===================================================================
RCS file: /cvs/dist/rpms/sg3_utils/devel/sg3_utils.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sg3_utils.spec	10 Feb 2006 11:41:11 -0000	1.11
+++ sg3_utils.spec	11 Feb 2006 05:41:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Utils for Linux's SCSI generic driver devices + raw devices
 Name: sg3_utils
 Version: 1.19
-Release: 1
+Release: 1.1
 License: GPL
 Group: Utilities/System
 Source: ftp://www.torque.net/sg/p/sg3_utils-%{version}.tgz
@@ -76,6 +76,9 @@
 %{_libdir}/*.la
  
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.19-1.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.19-1
 - Update to sg3_utils-1.19.
 - Fixed rebuild problem on 64bit archs.



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:46 -0500
Subject: rpms/shadow-utils/devel shadow-utils.spec,1.66,1.67
Message-ID: <200602110541.k1B5fkDB024110@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	shadow-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: shadow-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- shadow-utils.spec	7 Feb 2006 13:50:13 -0000	1.66
+++ shadow-utils.spec	11 Feb 2006 05:41:44 -0000	1.67
@@ -5,7 +5,7 @@
 Summary: Utilities for managing accounts and shadow password files.
 Name: shadow-utils
 Version: 4.0.14
-Release: 1.1
+Release: 1.2
 Epoch: 2
 URL: http://shadow.pld.org.pl/
 Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2
@@ -197,6 +197,9 @@
 %{_mandir}/*/man8/faillog.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:4.0.14-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:4.0.14-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:41:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:41:55 -0500
Subject: rpms/sharutils/devel sharutils.spec,1.25,1.26
Message-ID: <200602110541.k1B5ftio024165@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sharutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24152

Modified Files:
	sharutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sharutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sharutils/devel/sharutils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sharutils.spec	7 Feb 2006 13:50:37 -0000	1.25
+++ sharutils.spec	11 Feb 2006 05:41:53 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives.
 Name: sharutils
 Version: 4.6.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Archiving
 Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.6.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:03 -0500
Subject: rpms/sip/devel sip.spec,1.24,1.25
Message-ID: <200602110542.k1B5g3uo024222@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24207

Modified Files:
	sip.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sip.spec
===================================================================
RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sip.spec	7 Feb 2006 13:50:50 -0000	1.24
+++ sip.spec	11 Feb 2006 05:42:01 -0000	1.25
@@ -15,7 +15,7 @@
 Summary: SIP - Python/C++ Bindings Generator
 Name: sip
 Version: 4.3.1
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Development/Tools
 Url: http://www.riverbankcomputing.co.uk/
@@ -83,6 +83,9 @@
 %{_includedir}/python%{pythonver}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.3.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:11 -0500
Subject: rpms/slang/devel slang.spec,1.34,1.35
Message-ID: <200602110542.k1B5gBRL024278@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slang/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24264

Modified Files:
	slang.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: slang.spec
===================================================================
RCS file: /cvs/dist/rpms/slang/devel/slang.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- slang.spec	7 Feb 2006 13:51:00 -0000	1.34
+++ slang.spec	11 Feb 2006 05:42:09 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: The shared library for the S-Lang extension language.
 Name: slang
 Version: 2.0.5
-Release: 5.2
+Release: 5.2.1
 License: GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.0/slang-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 %{_includedir}/slang
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.5-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.5-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:21 -0500
Subject: rpms/slrn/devel slrn.spec,1.27,1.28
Message-ID: <200602110542.k1B5gLTP024332@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/slrn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24319

Modified Files:
	slrn.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: slrn.spec
===================================================================
RCS file: /cvs/dist/rpms/slrn/devel/slrn.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- slrn.spec	7 Feb 2006 13:51:20 -0000	1.27
+++ slrn.spec	11 Feb 2006 05:42:19 -0000	1.28
@@ -1,6 +1,6 @@
 Name: slrn
 Version: 0.9.8.1pl1
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: Applications/Internet
 Source0: http://download.sourceforge.net/slrn/slrn-%{version}.tar.bz2
@@ -98,6 +98,9 @@
 %{_mandir}/man1/slrnpull.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8.1pl1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.9.8.1pl1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:31 -0500
Subject: rpms/smartmontools/devel smartmontools.spec,1.14,1.15
Message-ID: <200602110542.k1B5gV3C024387@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/smartmontools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24374

Modified Files:
	smartmontools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: smartmontools.spec
===================================================================
RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smartmontools.spec	7 Feb 2006 13:51:33 -0000	1.14
+++ smartmontools.spec	11 Feb 2006 05:42:29 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
 Version:	5.33
-Release: 	4.1
+Release: 	4.2
 Epoch:		1
 Group:		System Environment/Base
 License:	GPL
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:5.33-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:5.33-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:39 -0500
Subject: rpms/sound-juicer/devel sound-juicer.spec,1.38,1.39
Message-ID: <200602110542.k1B5gdo1024442@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24429

Modified Files:
	sound-juicer.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sound-juicer.spec	7 Feb 2006 13:51:45 -0000	1.38
+++ sound-juicer.spec	11 Feb 2006 05:42:37 -0000	1.39
@@ -13,7 +13,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.13.4
-Release:	3.1
+Release:	3.2
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -92,6 +92,9 @@
 %{_datadir}/omf/sound-juicer
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:48 -0500
Subject: rpms/sox/devel sox.spec,1.23,1.24
Message-ID: <200602110542.k1B5gmwa024498@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24484

Modified Files:
	sox.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sox.spec
===================================================================
RCS file: /cvs/dist/rpms/sox/devel/sox.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sox.spec	7 Feb 2006 13:51:57 -0000	1.23
+++ sox.spec	11 Feb 2006 05:42:46 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
 Version: 12.17.9
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
@@ -66,6 +66,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 12.17.9-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:42:58 -0500
Subject: rpms/spamassassin/devel spamassassin.spec,1.61,1.62
Message-ID: <200602110542.k1B5gwnJ024554@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24539

Modified Files:
	spamassassin.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- spamassassin.spec	7 Feb 2006 13:52:07 -0000	1.61
+++ spamassassin.spec	11 Feb 2006 05:42:56 -0000	1.62
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.0
-Release: 5.fc5.1
+Release: 5.fc5.2
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -149,6 +149,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5.fc5.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5.fc5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:43:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:43:12 -0500
Subject: rpms/speex/devel speex.spec,1.11,1.12
Message-ID: <200602110543.k1B5hCtu024608@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/speex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24594

Modified Files:
	speex.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: speex.spec
===================================================================
RCS file: /cvs/dist/rpms/speex/devel/speex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- speex.spec	7 Feb 2006 13:52:19 -0000	1.11
+++ speex.spec	11 Feb 2006 05:43:10 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
 Version: 	1.0.5
-Release: 1.2
+Release: 1.2.1
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
@@ -73,6 +73,9 @@
 %{_libdir}/libspeex.a
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:43:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:43:22 -0500
Subject: rpms/sqlite/devel sqlite.spec,1.14,1.15
Message-ID: <200602110543.k1B5hM2S024663@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sqlite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24649

Modified Files:
	sqlite.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sqlite.spec
===================================================================
RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sqlite.spec	7 Feb 2006 13:52:29 -0000	1.14
+++ sqlite.spec	11 Feb 2006 05:43:20 -0000	1.15
@@ -4,7 +4,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.3.3
-Release: 1.1
+Release: 1.2
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -96,6 +96,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.3.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.3.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:43:30 -0500
Subject: rpms/squashfs-tools/devel squashfs-tools.spec,1.4,1.5
Message-ID: <200602110543.k1B5hUU4024717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squashfs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24704

Modified Files:
	squashfs-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: squashfs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/squashfs-tools/devel/squashfs-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- squashfs-tools.spec	7 Feb 2006 13:52:42 -0000	1.4
+++ squashfs-tools.spec	11 Feb 2006 05:43:28 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: squashfs utilities
 Name: squashfs-tools
 Version: 2.2r2
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://squashfs.sf.net
@@ -36,6 +36,9 @@
 /sbin/mksquashfs
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2r2-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2r2-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:43:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:43:46 -0500
Subject: rpms/squid/devel squid.spec,1.56,1.57
Message-ID: <200602110543.k1B5hkMB024773@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24759

Modified Files:
	squid.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- squid.spec	7 Feb 2006 14:21:25 -0000	1.56
+++ squid.spec	11 Feb 2006 05:43:44 -0000	1.57
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE12
-Release: 5
+Release: 5.1
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -330,6 +330,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7:2.5.STABLE12-5.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE12-5
 - new upstream patches
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:43:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:43:57 -0500
Subject: rpms/star/devel star.spec,1.20,1.21
Message-ID: <200602110543.k1B5hv41024829@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	star.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- star.spec	7 Feb 2006 13:53:04 -0000	1.20
+++ star.spec	11 Feb 2006 05:43:55 -0000	1.21
@@ -4,7 +4,7 @@
 Summary:  An archiving tool with ACL support
 Name: star
 Version: 1.5a69
-Release: 1.2
+Release: 1.2.1
 Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2
 Patch1: star-1.5-newMake.patch
 Patch2: star-1.5-nofsync.patch
@@ -102,6 +102,9 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5a69-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5a69-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:05 -0500
Subject: rpms/stardict/devel stardict.spec,1.15,1.16
Message-ID: <200602110544.k1B5i5VJ024884@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stardict/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24870

Modified Files:
	stardict.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: stardict.spec
===================================================================
RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- stardict.spec	7 Feb 2006 13:53:16 -0000	1.15
+++ stardict.spec	11 Feb 2006 05:44:03 -0000	1.16
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:    2.4.5
-Release:    2.1
+Release:    2.2
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
@@ -60,6 +60,9 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.4.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:16 -0500
Subject: rpms/startup-notification/devel startup-notification.spec, 1.12,
	1.13
Message-ID: <200602110544.k1B5iGSu024938@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/startup-notification/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24925

Modified Files:
	startup-notification.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: startup-notification.spec
===================================================================
RCS file: /cvs/dist/rpms/startup-notification/devel/startup-notification.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- startup-notification.spec	7 Feb 2006 13:53:26 -0000	1.12
+++ startup-notification.spec	11 Feb 2006 05:44:14 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Library for tracking application startup
 Name: startup-notification
 Version: 0.8
-Release: 3.2
+Release: 3.2.1
 URL: http://www.freedesktop.org/software/startup-notification/
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:24 -0500
Subject: rpms/statserial/devel statserial.spec,1.17,1.18
Message-ID: <200602110544.k1B5iO8a024993@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/statserial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24980

Modified Files:
	statserial.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: statserial.spec
===================================================================
RCS file: /cvs/dist/rpms/statserial/devel/statserial.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- statserial.spec	7 Feb 2006 13:53:39 -0000	1.17
+++ statserial.spec	11 Feb 2006 05:44:22 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A tool which displays the status of serial port modem lines.
 Name: statserial
 Version: 1.1
-Release: 38.2
+Release: 38.2.1
 License: BSD
 Group: Applications/System
 Source: ftp://metalab.unc.edu/pub/Linux/system/serial/statserial-1.1.tar.gz
@@ -45,6 +45,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1-38.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1-38.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:32 -0500
Subject: rpms/strace/devel strace.spec,1.34,1.35
Message-ID: <200602110544.k1B5iWOj025049@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/strace/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25035

Modified Files:
	strace.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: strace.spec
===================================================================
RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- strace.spec	7 Feb 2006 13:53:48 -0000	1.34
+++ strace.spec	11 Feb 2006 05:44:29 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process.
 Name: strace
 Version: 4.5.14
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Development/Debuggers
 URL: http://sourceforge.net/projects/strace/
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.5.14-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:39 -0500
Subject: rpms/struts/devel struts.spec,1.26,1.27
Message-ID: <200602110544.k1B5idwV025104@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25090

Modified Files:
	struts.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- struts.spec	7 Feb 2006 13:54:00 -0000	1.26
+++ struts.spec	11 Feb 2006 05:44:37 -0000	1.27
@@ -1,7 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.4
-%define release 	2jpp_6fc
+%define release 	2jpp_7fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -211,6 +211,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_7fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_6fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:49 -0500
Subject: rpms/stunnel/devel stunnel.spec,1.36,1.37
Message-ID: <200602110544.k1B5in40025159@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/stunnel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25145

Modified Files:
	stunnel.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: stunnel.spec
===================================================================
RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- stunnel.spec	7 Feb 2006 13:54:12 -0000	1.36
+++ stunnel.spec	11 Feb 2006 05:44:47 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: An SSL-encrypting socket wrapper.
 Name: stunnel
 Version: 4.14
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Internet
 URL: http://stunnel.mirt.net/
@@ -91,6 +91,9 @@
 %exclude %{_sysconfdir}/stunnel/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.14-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.14-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:44:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:44:57 -0500
Subject: rpms/subversion/devel subversion.spec,1.70,1.71
Message-ID: <200602110544.k1B5ivDH025213@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	subversion.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- subversion.spec	7 Feb 2006 13:54:23 -0000	1.70
+++ subversion.spec	11 Feb 2006 05:44:55 -0000	1.71
@@ -16,7 +16,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.0
-Release: 4.1
+Release: 4.2
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -252,6 +252,9 @@
 %endif
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:45:18 -0500
Subject: rpms/sudo/devel sudo.spec,1.36,1.37
Message-ID: <200602110545.k1B5jIWu025279@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sudo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25266

Modified Files:
	sudo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sudo.spec
===================================================================
RCS file: /cvs/dist/rpms/sudo/devel/sudo.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sudo.spec	8 Feb 2006 16:19:20 -0000	1.36
+++ sudo.spec	11 Feb 2006 05:45:16 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users.
 Name: sudo
 Version: 1.6.8p12
-Release: 4
+Release: 4.1
 License: BSD
 Group: Applications/System
 Source: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
@@ -95,6 +95,9 @@
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.8p12-4.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  8 2006 Karel Zak <kzak at redhat.com> 1.6.8p12-4
 - reset env. by default
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:45:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:45:29 -0500
Subject: rpms/swig/devel swig.spec,1.24,1.25
Message-ID: <200602110545.k1B5jTiZ025505@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/swig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25321

Modified Files:
	swig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: swig.spec
===================================================================
RCS file: /cvs/dist/rpms/swig/devel/swig.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- swig.spec	7 Feb 2006 13:54:50 -0000	1.24
+++ swig.spec	11 Feb 2006 05:45:26 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages.
 Name: swig
 Version: 1.3.24
-Release: 2.2
+Release: 2.2.1
 License: BSD
 Group: Development/Tools
 URL: http://swig.sourceforge.net/
@@ -57,6 +57,9 @@
 %{_datadir}/swig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.24-2.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.24-2.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:45:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:45:42 -0500
Subject: rpms/symlinks/devel symlinks.spec,1.8,1.9
Message-ID: <200602110545.k1B5jg3w027844@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/symlinks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27339

Modified Files:
	symlinks.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: symlinks.spec
===================================================================
RCS file: /cvs/dist/rpms/symlinks/devel/symlinks.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- symlinks.spec	7 Feb 2006 13:55:01 -0000	1.8
+++ symlinks.spec	11 Feb 2006 05:45:39 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: A utility which maintains a system's symbolic links.
 Name: symlinks
 Version: 1.2
-Release: 24.2
+Release: 24.2.1
 Group: Applications/System
 License: distributable
 Source: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@
 %{_mandir}/man8/symlinks.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2-24.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2-24.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:45:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:45:56 -0500
Subject: rpms/synaptics/devel synaptics.spec,1.17,1.18
Message-ID: <200602110545.k1B5jul2030171@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/synaptics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29716

Modified Files:
	synaptics.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: synaptics.spec
===================================================================
RCS file: /cvs/dist/rpms/synaptics/devel/synaptics.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- synaptics.spec	7 Feb 2006 13:55:12 -0000	1.17
+++ synaptics.spec	11 Feb 2006 05:45:53 -0000	1.18
@@ -3,7 +3,7 @@
 Name:           synaptics
 Version:        0.14.4
 Epoch:		0
-Release: 4.2
+Release: 4.2.1
 Summary:        Synaptics Touchpad Driver
 
 Group:          User Interface/X Hardware Support
@@ -68,6 +68,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:0.14.4-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:46:08 -0500
Subject: rpms/sysfsutils/devel sysfsutils.spec,1.12,1.13
Message-ID: <200602110546.k1B5k8m4032389@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysfsutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31459

Modified Files:
	sysfsutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sysfsutils.spec
===================================================================
RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sysfsutils.spec	7 Feb 2006 13:55:23 -0000	1.12
+++ sysfsutils.spec	11 Feb 2006 05:46:03 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: sysfsutils, library interface to sysfs.
 Name: sysfsutils
 Version: 1.3.0
-Release: 1.2
+Release: 1.2.1
 Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-redhatify.patch
 License: GPL/LGPL
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.0-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:46:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:46:20 -0500
Subject: rpms/sysklogd/devel sysklogd.spec,1.33,1.34
Message-ID: <200602110546.k1B5kKPP002114@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1595

Modified Files:
	sysklogd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sysklogd.spec	7 Feb 2006 13:55:35 -0000	1.33
+++ sysklogd.spec	11 Feb 2006 05:46:18 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 34.1
+Release: 34.2
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
@@ -101,6 +101,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-34.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-34.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:46:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:46:31 -0500
Subject: rpms/sysstat/devel sysstat.spec,1.35,1.36
Message-ID: <200602110546.k1B5kV0f003955@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/sysstat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3471

Modified Files:
	sysstat.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: sysstat.spec
===================================================================
RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sysstat.spec	7 Feb 2006 13:55:57 -0000	1.35
+++ sysstat.spec	11 Feb 2006 05:46:28 -0000	1.36
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 6.0.1
-Release: 3.2
+Release: 3.2.1
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -109,6 +109,9 @@
 /var/log/sa
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.0.1-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.0.1-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:46:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:46:40 -0500
Subject: rpms/system-config-printer/devel printconf.spec,1.60,1.61
Message-ID: <200602110546.k1B5kePg005701@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	printconf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- printconf.spec	7 Feb 2006 13:56:24 -0000	1.60
+++ printconf.spec	11 Feb 2006 05:46:38 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
 Version: 0.6.150
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 Source0: printconf-%{version}.tar.bz2
@@ -174,6 +174,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.150-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6.150-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:46:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:46:50 -0500
Subject: rpms/system-config-securitylevel/devel
	system-config-securitylevel.spec, 1.73, 1.74
Message-ID: <200602110546.k1B5koPK005756@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	system-config-securitylevel.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- system-config-securitylevel.spec	8 Feb 2006 20:04:39 -0000	1.73
+++ system-config-securitylevel.spec	11 Feb 2006 05:46:48 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
 Version: 1.6.15
-Release: 1
+Release: 1.1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -96,6 +96,9 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.15-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Chris Lumens <clumens at redhat.com> 1.6.15-1
 - Fix firstboot warnings.
 - Make other services box look better.



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:00 -0500
Subject: rpms/systemtap/devel systemtap.spec,1.21,1.22
Message-ID: <200602110547.k1B5l0sB005811@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/systemtap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5798

Modified Files:
	systemtap.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: systemtap.spec
===================================================================
RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- systemtap.spec	7 Feb 2006 13:56:46 -0000	1.21
+++ systemtap.spec	11 Feb 2006 05:46:58 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name: systemtap
 Version: 0.5.4
-Release: 2.1
+Release: 2.2
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.4-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:10 -0500
Subject: rpms/SysVinit/devel SysVinit.spec,1.39,1.40
Message-ID: <200602110547.k1B5lAHN005867@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5853

Modified Files:
	SysVinit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- SysVinit.spec	7 Feb 2006 13:56:56 -0000	1.39
+++ SysVinit.spec	11 Feb 2006 05:47:08 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -124,6 +124,9 @@
 /dev/initctl
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.86-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.86-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:19 -0500
Subject: rpms/talk/devel talk.spec,1.17,1.18
Message-ID: <200602110547.k1B5lJrP005922@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/talk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5908

Modified Files:
	talk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: talk.spec
===================================================================
RCS file: /cvs/dist/rpms/talk/devel/talk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- talk.spec	7 Feb 2006 13:57:20 -0000	1.17
+++ talk.spec	11 Feb 2006 05:47:17 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Talk client for one-on-one Internet chatting.
 Name: talk
 Version: 0.17
-Release: 29.2
+Release: 29.2.1
 License: BSD
 Group: Applications/Internet
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ntalk-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %config(noreplace) /etc/xinetd.d/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17-29.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17-29.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:28 -0500
Subject: rpms/tanukiwrapper/devel tanukiwrapper.spec,1.16,1.17
Message-ID: <200602110547.k1B5lSJk005976@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5963

Modified Files:
	tanukiwrapper.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- tanukiwrapper.spec	7 Feb 2006 13:57:30 -0000	1.16
+++ tanukiwrapper.spec	11 Feb 2006 05:47:26 -0000	1.17
@@ -1,6 +1,6 @@
 %define name		tanukiwrapper
 %define version		3.1.1
-%define release 	4jpp_5fc
+%define release 	4jpp_6fc
 %define section		devel
 
 Summary:	Java Service Wrapper
@@ -152,6 +152,9 @@
 %{_datadir}/%{name}-%{version}/test
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_6fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:3.1.1-4jpp_5fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:35 -0500
Subject: rpms/tar/devel tar.spec,1.30,1.31
Message-ID: <200602110547.k1B5lZIT006031@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6018

Modified Files:
	tar.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- tar.spec	7 Feb 2006 13:57:41 -0000	1.30
+++ tar.spec	11 Feb 2006 05:47:33 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -115,6 +115,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.15.1-12.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.15.1-12.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:46 -0500
Subject: rpms/tcl/devel tcl.spec,1.17,1.18
Message-ID: <200602110547.k1B5lk0E006086@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcl.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tcl.spec	7 Feb 2006 13:57:51 -0000	1.17
+++ tcl.spec	11 Feb 2006 05:47:44 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 3.1
+Release: 3.2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -150,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:47:58 -0500
Subject: rpms/tclx/devel tclx.spec,1.10,1.11
Message-ID: <200602110547.k1B5lwDW006141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tclx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6128

Modified Files:
	tclx.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tclx.spec
===================================================================
RCS file: /cvs/dist/rpms/tclx/devel/tclx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tclx.spec	7 Feb 2006 13:58:03 -0000	1.10
+++ tclx.spec	11 Feb 2006 05:47:56 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Extensions for Tcl and Tk
 Name: tclx
 Version: %{major_ver}.0
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Development/Languages
 URL: http://tclx.sourceforge.net/
@@ -106,6 +106,9 @@
 %{_mandir}/man*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:48:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:48:15 -0500
Subject: rpms/tcpdump/devel tcpdump.spec,1.47,1.48
Message-ID: <200602110548.k1B5mFV5006205@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	tcpdump.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tcpdump.spec
===================================================================
RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- tcpdump.spec	7 Feb 2006 13:58:13 -0000	1.47
+++ tcpdump.spec	11 Feb 2006 05:48:13 -0000	1.48
@@ -19,7 +19,7 @@
 Version: %{tcpdump_version}
 %define	tcpdump_dir	tcpdump-%{tcpdump_version}
 %define tcpslice_dir	tcpslice
-Release: %{tcpdump_release}.1
+Release: %{tcpdump_release}.2
 
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 Epoch: 14
@@ -76,7 +76,7 @@
 # if you change the Version, don't forget to edit libpcap-shared.patch
 # could be sed'd automatically
 Version: %{pcap_version}
-Release: %{pcap_release}.1.1
+Release: %{pcap_release}.1.2
 %define	libpcap_dir	libpcap-%{pcap_version}
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
@@ -98,7 +98,7 @@
 
 %package -n arpwatch
 Version: 2.1a13
-Release: %{arpwatch_release}.1.1
+Release: %{arpwatch_release}.1.2
 %define	arpwatch_dir	arpwatch-2.1a13
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
@@ -315,6 +315,9 @@
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 14:3.9.4-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 14:3.9.4-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:48:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:48:33 -0500
Subject: rpms/tcp_wrappers/devel tcp_wrappers.spec,1.18,1.19
Message-ID: <200602110548.k1B5mXg7006260@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcp_wrappers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6246

Modified Files:
	tcp_wrappers.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tcp_wrappers.spec
===================================================================
RCS file: /cvs/dist/rpms/tcp_wrappers/devel/tcp_wrappers.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tcp_wrappers.spec	7 Feb 2006 13:58:25 -0000	1.18
+++ tcp_wrappers.spec	11 Feb 2006 05:48:31 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A security tool which acts as a wrapper for TCP daemons.
 Name: tcp_wrappers
 Version: 7.6
-Release: 40.1
+Release: 40.2
 
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -106,6 +106,9 @@
 %{_sbindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.6-40.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:48:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:48:41 -0500
Subject: rpms/tcsh/devel tcsh.spec,1.35,1.36
Message-ID: <200602110548.k1B5mfu7006314@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tcsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6301

Modified Files:
	tcsh.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tcsh.spec	7 Feb 2006 13:58:35 -0000	1.35
+++ tcsh.spec	11 Feb 2006 05:48:39 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 5.2
+Release: 5.2.1
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -102,6 +102,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.14-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.14-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:49:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:49:18 -0500
Subject: rpms/telnet/devel telnet.spec,1.22,1.23
Message-ID: <200602110549.k1B5nI95006369@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6356

Modified Files:
	telnet.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- telnet.spec	7 Feb 2006 13:58:45 -0000	1.22
+++ telnet.spec	11 Feb 2006 05:49:16 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 35.2
+Release: 35.2.1
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -125,6 +125,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-35.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:0.17-35.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:49:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:49:40 -0500
Subject: rpms/tetex/devel tetex.spec,1.83,1.84
Message-ID: <200602110549.k1B5netu006426@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6413

Modified Files:
	tetex.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- tetex.spec	7 Feb 2006 13:58:56 -0000	1.83
+++ tetex.spec	11 Feb 2006 05:49:38 -0000	1.84
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 16.1
+Release: 16.2
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -789,6 +789,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-16.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0-16.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:51:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:51:26 -0500
Subject: rpms/texinfo/devel texinfo.spec,1.33,1.34
Message-ID: <200602110551.k1B5pQt6006484@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	texinfo.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- texinfo.spec	7 Feb 2006 13:59:42 -0000	1.33
+++ texinfo.spec	11 Feb 2006 05:51:24 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 9.1
+Release: 9.2
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -123,6 +123,9 @@
 %{_mandir}/man5/info.5*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.8-9.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.8-9.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:51:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:51:34 -0500
Subject: rpms/tftp/devel tftp.spec,1.27,1.28
Message-ID: <200602110551.k1B5pYwa006539@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6526

Modified Files:
	tftp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tftp.spec	7 Feb 2006 13:59:54 -0000	1.27
+++ tftp.spec	11 Feb 2006 05:51:32 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 1.2
+Release: 1.2.1
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2
@@ -76,6 +76,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.41-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.41-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:51:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:51:42 -0500
Subject: rpms/time/devel time.spec,1.15,1.16
Message-ID: <200602110551.k1B5pgIw006594@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/time/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6581

Modified Files:
	time.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: time.spec
===================================================================
RCS file: /cvs/dist/rpms/time/devel/time.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- time.spec	7 Feb 2006 14:03:11 -0000	1.15
+++ time.spec	11 Feb 2006 05:51:40 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A GNU utility for monitoring a program's use of system resources.
 Name: time
 Version: 1.7
-Release: 27.2
+Release: 27.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz
@@ -46,6 +46,9 @@
 %{_infodir}/time.info*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7-27.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.7-27.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:51:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:51:53 -0500
Subject: rpms/timidity++/devel timidity++.spec,1.11,1.12
Message-ID: <200602110551.k1B5prNZ006649@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/timidity++/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6636

Modified Files:
	timidity++.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: timidity++.spec
===================================================================
RCS file: /cvs/dist/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- timidity++.spec	7 Feb 2006 14:04:36 -0000	1.11
+++ timidity++.spec	11 Feb 2006 05:51:51 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer.
 Name: timidity++
 Version: 2.13.2
-Release: 1.2
+Release: 1.2.1
 Group: Applications/Multimedia
 Source: http://www.goice.co.jp/member/mo/timidity/dist/TiMidity++-%{version}.tar.bz2
 Source1: http://archive.cs.umbc.edu/pub/midia/instruments.tar.bz2
@@ -68,6 +68,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.2-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:06 -0500
Subject: rpms/tix/devel tix.spec,1.11,1.12
Message-ID: <200602110552.k1B5q6r9006705@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tix/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6691

Modified Files:
	tix.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tix.spec
===================================================================
RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tix.spec	10 Feb 2006 16:37:57 -0000	1.11
+++ tix.spec	11 Feb 2006 05:52:04 -0000	1.12
@@ -5,7 +5,7 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.0
-Release: 3
+Release: 3.1
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
@@ -123,6 +123,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:8.4.0-3.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 David Cantrell <dcantrell at redhat.com> - 1:8.4.0-3
 - Added missing SONAME to libTix8.4.so
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:16 -0500
Subject: rpms/tk/devel tk.spec,1.18,1.19
Message-ID: <200602110552.k1B5qGV8006763@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6749

Modified Files:
	tk.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tk.spec
===================================================================
RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tk.spec	7 Feb 2006 14:05:22 -0000	1.18
+++ tk.spec	11 Feb 2006 05:52:13 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Tk graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{majorver}.12
-Release: 1.1
+Release: 1.2
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -117,6 +117,9 @@
 %{_mandir}/mann/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:25 -0500
Subject: rpms/tmpwatch/devel tmpwatch.spec,1.24,1.25
Message-ID: <200602110552.k1B5qPPE006818@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tmpwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6804

Modified Files:
	tmpwatch.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tmpwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/tmpwatch/devel/tmpwatch.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tmpwatch.spec	7 Feb 2006 14:06:04 -0000	1.24
+++ tmpwatch.spec	11 Feb 2006 05:52:23 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A utility for removing files based on when they were last accessed.
 Name: tmpwatch
 Version: 2.9.6
-Release: 1.2
+Release: 1.2.1
 Source: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Base
@@ -49,6 +49,9 @@
 %config(noreplace) /etc/cron.daily/tmpwatch
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.9.6-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.9.6-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:34 -0500
Subject: rpms/tn5250/devel tn5250.spec,1.12,1.13
Message-ID: <200602110552.k1B5qYFJ006873@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tn5250/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6860

Modified Files:
	tn5250.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tn5250.spec
===================================================================
RCS file: /cvs/dist/rpms/tn5250/devel/tn5250.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tn5250.spec	7 Feb 2006 14:06:36 -0000	1.12
+++ tn5250.spec	11 Feb 2006 05:52:32 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: 	5250 Telnet protocol and Terminal
 Name: 		tn5250
 Version: 	0.17.3
-Release: 1.2
+Release: 1.2.1
 License: 	GPL 
 Group: 		Applications/Internet
 Source:		http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %attr( - ,root,root)  %{_libdir}/pkgconfig/tn5250.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.17.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.17.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:43 -0500
Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.18,1.19
Message-ID: <200602110552.k1B5qh4P006930@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6917

Modified Files:
	tog-pegasus.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tog-pegasus.spec	7 Feb 2006 23:48:55 -0000	1.18
+++ tog-pegasus.spec	11 Feb 2006 05:52:41 -0000	1.19
@@ -15,7 +15,7 @@
 Summary: 	OpenPegasus WBEM Services for Linux
 Name:    	tog-pegasus
 Version: 	2.5
-Release:	6
+Release:	6.1
 Epoch:   	2
 Group:   	Systems Management/Base
 License: 	Open Group Pegasus Open Source
@@ -254,6 +254,9 @@
 #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.5-6.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-6
 - restore SSLv23_method SSL support now that bug 173399 is fixed
 - rebuild for new gcc, glibc, glibc-kernheaders



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:52:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:52:53 -0500
Subject: rpms/tomcat5/devel tomcat5.spec,1.57,1.58
Message-ID: <200602110552.k1B5qrPf006985@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6972

Modified Files:
	tomcat5.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- tomcat5.spec	7 Feb 2006 14:07:32 -0000	1.57
+++ tomcat5.spec	11 Feb 2006 05:52:51 -0000	1.58
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release 	8jpp_10fc
+%define release 	8jpp_11fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -849,7 +849,10 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager.jar.*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - sh: line 1: build-classpath: command not found
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:5.0.30-8jpp_10fc
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:5.0.30-8jpp_9fc.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Feb  1 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_9fc



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:03 -0500
Subject: rpms/totem/devel totem.spec,1.51,1.52
Message-ID: <200602110553.k1B5r3g5007041@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7028

Modified Files:
	totem.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- totem.spec	10 Feb 2006 03:26:04 -0000	1.51
+++ totem.spec	11 Feb 2006 05:53:00 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 1.3.90
-Release: 2
+Release: 2.1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -135,6 +135,9 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.90-2.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> - 1.3.90-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:11 -0500
Subject: rpms/traceroute/devel traceroute.spec,1.21,1.22
Message-ID: <200602110553.k1B5rB6m007096@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7083

Modified Files:
	traceroute.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- traceroute.spec	7 Feb 2006 14:08:07 -0000	1.21
+++ traceroute.spec	11 Feb 2006 05:53:09 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.0.4
-Release: 1.1
+Release: 1.2
 Epoch: 2
 License: GPL
 Group: Applications/Internet
@@ -57,6 +57,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:20 -0500
Subject: rpms/transfig/devel transfig.spec,1.19,1.20
Message-ID: <200602110553.k1B5rKIa007152@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/transfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7138

Modified Files:
	transfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: transfig.spec
===================================================================
RCS file: /cvs/dist/rpms/transfig/devel/transfig.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- transfig.spec	7 Feb 2006 14:08:18 -0000	1.19
+++ transfig.spec	11 Feb 2006 05:53:18 -0000	1.20
@@ -5,7 +5,7 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 13.1
+Release: 13.2
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -82,6 +82,9 @@
 %{xfig_libdir}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-13.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.2.4-13.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:28 -0500
Subject: rpms/tree/devel tree.spec,1.17,1.18
Message-ID: <200602110553.k1B5rSi9007207@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tree/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7193

Modified Files:
	tree.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tree.spec
===================================================================
RCS file: /cvs/dist/rpms/tree/devel/tree.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- tree.spec	7 Feb 2006 14:08:33 -0000	1.17
+++ tree.spec	11 Feb 2006 05:53:26 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A utility which displays a tree view of the contents of directories.
 Name: tree
 Version: 1.5.0
-Release: 3.2
+Release: 3.2.1
 Group: Applications/File
 License: GPL
 Url: http://mama.indstate.edu/users/ice/tree/
@@ -48,6 +48,9 @@
 %doc README
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:38 -0500
Subject: rpms/tsclient/devel tsclient.spec,1.11,1.12
Message-ID: <200602110553.k1B5rceU007262@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tsclient/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7248

Modified Files:
	tsclient.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tsclient.spec
===================================================================
RCS file: /cvs/dist/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tsclient.spec	7 Feb 2006 14:08:43 -0000	1.11
+++ tsclient.spec	11 Feb 2006 05:53:35 -0000	1.12
@@ -7,7 +7,7 @@
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
 Version: 0.140
-Release: 1.2
+Release: 1.2.1
 URL: http://www.gnomepro.com/tsclient/
 Source0: http://www.gnomepro.com/tsclient/%{name}-%{version}.tar.gz
 License: GPL
@@ -73,6 +73,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.140-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.140-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:46 -0500
Subject: rpms/ttcp/devel ttcp.spec,1.12,1.13
Message-ID: <200602110553.k1B5rkRR007317@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7303

Modified Files:
	ttcp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ttcp.spec
===================================================================
RCS file: /cvs/dist/rpms/ttcp/devel/ttcp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ttcp.spec	7 Feb 2006 14:08:55 -0000	1.12
+++ ttcp.spec	11 Feb 2006 05:53:44 -0000	1.13
@@ -1,6 +1,6 @@
 Name: ttcp
 Version: 1.12
-Release: 13.2
+Release: 13.2.1
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.12-13.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:53:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:53:53 -0500
Subject: rpms/ttmkfdir/devel ttmkfdir.spec,1.15,1.16
Message-ID: <200602110553.k1B5rrOk007371@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ttmkfdir/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7358

Modified Files:
	ttmkfdir.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ttmkfdir.spec
===================================================================
RCS file: /cvs/dist/rpms/ttmkfdir/devel/ttmkfdir.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ttmkfdir.spec	7 Feb 2006 14:09:04 -0000	1.15
+++ ttmkfdir.spec	11 Feb 2006 05:53:51 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 19.2
+Release: 19.2.1
 Source0: %{name}-%{version}.tar.bz2
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
@@ -51,6 +51,9 @@
 %{_bindir}/ttmkfdir
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.0.9-19.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:54:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:54:15 -0500
Subject: rpms/tux/devel tux.spec,1.24,1.25
Message-ID: <200602110554.k1B5sFW1009262@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7434

Modified Files:
	tux.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tux.spec
===================================================================
RCS file: /cvs/dist/rpms/tux/devel/tux.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tux.spec	7 Feb 2006 14:09:14 -0000	1.24
+++ tux.spec	11 Feb 2006 05:54:12 -0000	1.25
@@ -5,7 +5,7 @@
 %define minor 2
 %define patchlevel 18
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 4.2
+Release: 4.2.1
 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
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.18-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:54:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:54:28 -0500
Subject: rpms/tvtime/devel tvtime.spec,1.24,1.25
Message-ID: <200602110554.k1B5sSJP015549@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/tvtime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15517

Modified Files:
	tvtime.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: tvtime.spec
===================================================================
RCS file: /cvs/dist/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tvtime.spec	7 Feb 2006 14:09:24 -0000	1.24
+++ tvtime.spec	11 Feb 2006 05:54:24 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer.
 Name: tvtime
 Version: 1.0.1
-Release: 3.1
+Release: 3.2
 License: GPL
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -92,6 +92,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:54:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:54:39 -0500
Subject: rpms/udev/devel udev.spec,1.146,1.147
Message-ID: <200602110554.k1B5sdAI015685@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15653

Modified Files:
	udev.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- udev.spec	7 Feb 2006 21:45:33 -0000	1.146
+++ udev.spec	11 Feb 2006 05:54:36 -0000	1.147
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -274,6 +274,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 084-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Harald Hoyer <harald at redhat.com> - 084-1
 - version 084
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:54:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:54:52 -0500
Subject: rpms/umb-scheme/devel umb-scheme-3.2.spec,1.19,1.20
Message-ID: <200602110554.k1B5sqWU015828@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/umb-scheme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15796

Modified Files:
	umb-scheme-3.2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: umb-scheme-3.2.spec
===================================================================
RCS file: /cvs/dist/rpms/umb-scheme/devel/umb-scheme-3.2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- umb-scheme-3.2.spec	7 Feb 2006 14:09:49 -0000	1.19
+++ umb-scheme-3.2.spec	11 Feb 2006 05:54:49 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: An implementation of the Scheme programming language.
 Name: umb-scheme
 Version: 3.2
-Release: 39.2
+Release: 39.2.1
 License: GPL SLIB
 Group: Development/Languages
 Source: ftp://ftp.cs.umb.edu/pub/scheme/umb-scheme-3.2.tar.bz2
@@ -85,6 +85,9 @@
 %{_infodir}/umb-scheme.info.gz
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-39.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2-39.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:04 -0500
Subject: rpms/units/devel units.spec,1.15,1.16
Message-ID: <200602110555.k1B5t43W015966@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/units/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15938

Modified Files:
	units.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: units.spec
===================================================================
RCS file: /cvs/dist/rpms/units/devel/units.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- units.spec	7 Feb 2006 14:10:05 -0000	1.15
+++ units.spec	11 Feb 2006 05:55:01 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A utility for converting amounts from one unit to another.
 Name: units
 Version: 1.85
-Release: 1.2
+Release: 1.2.1
 Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/Engineering
@@ -44,6 +44,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.85-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.85-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:14 -0500
Subject: rpms/unix2dos/devel unix2dos.spec,1.18,1.19
Message-ID: <200602110555.k1B5tEs8016095@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unix2dos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16065

Modified Files:
	unix2dos.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: unix2dos.spec
===================================================================
RCS file: /cvs/dist/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- unix2dos.spec	7 Feb 2006 14:10:16 -0000	1.18
+++ unix2dos.spec	11 Feb 2006 05:55:11 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: unix2dos - UNIX to DOS text file format converter
 Name: unix2dos
 Version: 2.2
-Release: 26.2
+Release: 26.2.1
 License: distributable
 Group: Applications/Text
 Source: unix2dos-2.2.src.tar.gz
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2-26.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2-26.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:25 -0500
Subject: rpms/unixODBC/devel unixODBC.spec,1.32,1.33
Message-ID: <200602110555.k1B5tPwC016221@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unixODBC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16198

Modified Files:
	unixODBC.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: unixODBC.spec
===================================================================
RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- unixODBC.spec	7 Feb 2006 14:10:30 -0000	1.32
+++ unixODBC.spec	11 Feb 2006 05:55:22 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.11
-Release: 6.2
+Release: 6.2.1
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
@@ -176,6 +176,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.11-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.2.11-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:36 -0500
Subject: rpms/unzip/devel unzip.spec,1.30,1.31
Message-ID: <200602110555.k1B5ta2h016360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/unzip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16333

Modified Files:
	unzip.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: unzip.spec
===================================================================
RCS file: /cvs/dist/rpms/unzip/devel/unzip.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- unzip.spec	7 Feb 2006 14:10:43 -0000	1.30
+++ unzip.spec	11 Feb 2006 05:55:34 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A utility for unpacking zip files.
 Name: unzip
 Version: 5.52
-Release: 2.1
+Release: 2.2
 License: BSD
 Group: Applications/Archiving
 Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.52-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.52-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:48 -0500
Subject: rpms/up2date/devel up2date.spec,1.118,1.119
Message-ID: <200602110555.k1B5tm8d016497@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/up2date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16465

Modified Files:
	up2date.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: up2date.spec
===================================================================
RCS file: /cvs/dist/rpms/up2date/devel/up2date.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- up2date.spec	7 Feb 2006 14:10:56 -0000	1.118
+++ up2date.spec	11 Feb 2006 05:55:45 -0000	1.119
@@ -5,7 +5,7 @@
 Url: http://rhn.redhat.com
 Name: up2date
 Version: 4.4.23
-Release: 4.2
+Release: 4.2.1
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: python >= 2.2.2
 Requires: rpm >= 4.1-1.05
@@ -302,6 +302,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.4.23-4.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.4.23-4.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:55:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:55:59 -0500
Subject: rpms/usbutils/devel usbutils.spec,1.17,1.18
Message-ID: <200602110555.k1B5tx9F016639@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usbutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16608

Modified Files:
	usbutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: usbutils.spec
===================================================================
RCS file: /cvs/dist/rpms/usbutils/devel/usbutils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- usbutils.spec	7 Feb 2006 14:11:08 -0000	1.17
+++ usbutils.spec	11 Feb 2006 05:55:57 -0000	1.18
@@ -1,6 +1,6 @@
 Name: usbutils
 Version: 0.71
-Release: 1.1
+Release: 1.2
 Source:	http://prdownloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz
 Patch1: usbutils-0.70-hwdata.patch
 URL: http://www.linux-usb.org/
@@ -47,6 +47,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.71-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.71-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:56:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:56:09 -0500
Subject: rpms/usermode/devel usermode.spec,1.57,1.58
Message-ID: <200602110556.k1B5u9i6016760@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/usermode/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16732

Modified Files:
	usermode.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: usermode.spec
===================================================================
RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- usermode.spec	7 Feb 2006 14:11:18 -0000	1.57
+++ usermode.spec	11 Feb 2006 05:56:06 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: Tools for certain user account management tasks.
 Name: usermode
 Version: 1.85
-Release: 2.1
+Release: 2.2
 License: GPL
 Group: Applications/System
 Source: usermode-%{version}.tar.bz2
@@ -120,6 +120,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.85-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:56:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:56:21 -0500
Subject: rpms/utempter/devel utempter.spec,1.14,1.15
Message-ID: <200602110556.k1B5uLHD016898@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/utempter/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16867

Modified Files:
	utempter.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: utempter.spec
===================================================================
RCS file: /cvs/dist/rpms/utempter/devel/utempter.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- utempter.spec	7 Feb 2006 14:11:28 -0000	1.14
+++ utempter.spec	11 Feb 2006 05:56:18 -0000	1.15
@@ -1,7 +1,7 @@
 Summary:   A privileged helper for utmp/wtmp updates.
 Name:      utempter
 Version:   0.5.5
-Release: 7.2
+Release: 7.2.1
 License:   MIT/LGPL
 Group:     System Environment/Base
 Source:    utempter-%{version}.tar.gz
@@ -53,6 +53,9 @@
 %{_includedir}/utempter.h
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.5-7.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:56:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:56:34 -0500
Subject: rpms/util-linux/devel util-linux.spec,1.105,1.106
Message-ID: <200602110556.k1B5uYfJ017042@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17011

Modified Files:
	util-linux.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- util-linux.spec	8 Feb 2006 19:24:29 -0000	1.105
+++ util-linux.spec	11 Feb 2006 05:56:30 -0000	1.106
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.15
+Release: 0.15.1
 License: distributable
 Group: System Environment/Base
 
@@ -627,6 +627,9 @@
 /sbin/losetup
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb  8 2006 Peter Jones <pjones at redhat.com> 2.13-0.15
 - add "blockdev --rmpart N <device>" and "blockdev --rmparts <device>"
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:56:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:56:47 -0500
Subject: rpms/uucp/devel uucp.spec,1.28,1.29
Message-ID: <200602110556.k1B5ulmw017193@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/uucp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17162

Modified Files:
	uucp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: uucp.spec
===================================================================
RCS file: /cvs/dist/rpms/uucp/devel/uucp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- uucp.spec	7 Feb 2006 14:11:50 -0000	1.28
+++ uucp.spec	11 Feb 2006 05:56:44 -0000	1.29
@@ -7,7 +7,7 @@
 Summary: The uucp utility for copying files between systems.
 Name: uucp
 Version: 1.07
-Release: 11.2
+Release: 11.2.1
 License: GPL
 Group: Applications/Communications
 Source0: ftp://ftp.gnu.org/pub/gnu/uucp/uucp-%{version}.tar.gz
@@ -152,6 +152,9 @@
 %config(noreplace)	%{_newconfigdir}/sys
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.07-11.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.07-11.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:57:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:57:00 -0500
Subject: rpms/valgrind/devel valgrind.spec,1.26,1.27
Message-ID: <200602110557.k1B5v0vY017337@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/valgrind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17306

Modified Files:
	valgrind.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: valgrind.spec
===================================================================
RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- valgrind.spec	7 Feb 2006 14:12:00 -0000	1.26
+++ valgrind.spec	11 Feb 2006 05:56:56 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.1.0
-Release: 1.1
+Release: 1.2
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.1.0-valgrind_h.patch
@@ -111,6 +111,9 @@
 %{_mandir}/man1/valgrind*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.1.0-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.1.0-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:57:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:57:12 -0500
Subject: rpms/vconfig/devel vconfig.spec,1.11,1.12
Message-ID: <200602110557.k1B5vCqc017478@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17446

Modified Files:
	vconfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/vconfig.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vconfig.spec	10 Feb 2006 13:43:49 -0000	1.11
+++ vconfig.spec	11 Feb 2006 05:57:09 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Linux 802.1q VLAN configuration utility
 Name: vconfig
 Version: 1.9
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
@@ -34,6 +34,9 @@
 %{_mandir}/man8/vconfig.8*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9-1.1
+- bump again for double-long bug on ppc(64)
+
 * Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> - 1.9-1
 - Updated to vconfig-1.9
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:57:23 -0500
Subject: rpms/vim/devel vim.spec,1.95,1.96
Message-ID: <200602110557.k1B5vNsV017610@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17580

Modified Files:
	vim.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- vim.spec	7 Feb 2006 14:12:37 -0000	1.95
+++ vim.spec	11 Feb 2006 05:57:20 -0000	1.96
@@ -25,7 +25,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1.1
+Release: 1.2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -488,6 +488,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:57:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:57:44 -0500
Subject: rpms/vino/devel vino.spec,1.33,1.34
Message-ID: <200602110557.k1B5viR5017804@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vino/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17780

Modified Files:
	vino.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- vino.spec	7 Feb 2006 14:12:56 -0000	1.33
+++ vino.spec	11 Feb 2006 05:57:42 -0000	1.34
@@ -7,7 +7,7 @@
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.13.5
-Release: 2.1
+Release: 2.2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -94,6 +94,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:57:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:57:56 -0500
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.64,1.65
Message-ID: <200602110557.k1B5vuox017942@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17911

Modified Files:
	vixie-cron.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- vixie-cron.spec	7 Feb 2006 19:18:14 -0000	1.64
+++ vixie-cron.spec	11 Feb 2006 05:57:53 -0000	1.65
@@ -7,7 +7,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 51.FC5
+Release: 51.FC5.1
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -205,6 +205,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:4.1-51.FC5.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jason Vas Dias<jvdias at redhat.com> - 4.1-51.FC5
 - fix bug 180145: provide support for mail in non-ascii charsets
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:58:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:58:07 -0500
Subject: rpms/vlock/devel vlock.spec,1.18,1.19
Message-ID: <200602110558.k1B5w7XM018067@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vlock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18042

Modified Files:
	vlock.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vlock.spec
===================================================================
RCS file: /cvs/dist/rpms/vlock/devel/vlock.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vlock.spec	7 Feb 2006 14:13:06 -0000	1.18
+++ vlock.spec	11 Feb 2006 05:58:04 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A program which locks one or more virtual consoles.
 Name: vlock
 Version: 1.3
-Release: 22.2
+Release: 22.2.1
 License: GPL
 Group: Applications/System
 Source: ftp://tsx-11.mit.edu:/pub/linux/sources/usr.bin/vlock-1.3.tar.gz
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3-22.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:58:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:58:20 -0500
Subject: rpms/vnc/devel vnc.spec,1.128,1.129
Message-ID: <200602110558.k1B5wKjr018214@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18183

Modified Files:
	vnc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- vnc.spec	8 Feb 2006 15:10:16 -0000	1.128
+++ vnc.spec	11 Feb 2006 05:58:17 -0000	1.129
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 35
+Release: 35.1
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -256,6 +256,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.1-35.1
+- bump again for double-long bug on ppc(64)
+
 * Wed Feb 08 2006 Jitka Kudrnacova <jkudrnac at redhat.com> 4.1.1-35
 - Add a test for existence of index.theme before calling
   gtk-update-icon-cache in post-(un)installation script,



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:58:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:58:33 -0500
Subject: rpms/vorbis-tools/devel vorbis-tools.spec,1.16,1.17
Message-ID: <200602110558.k1B5wXmu018360@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vorbis-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18331

Modified Files:
	vorbis-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vorbis-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/vorbis-tools/devel/vorbis-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vorbis-tools.spec	7 Feb 2006 14:13:32 -0000	1.16
+++ vorbis-tools.spec	11 Feb 2006 05:58:31 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.1.1
-Release: 1.2
+Release: 1.2.1
 Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
@@ -54,6 +54,9 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.1-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 05:59:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 00:59:34 -0500
Subject: rpms/vsftpd/devel vsftpd.spec,1.41,1.42
Message-ID: <200602110559.k1B5xYRL018507@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vsftpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18461

Modified Files:
	vsftpd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vsftpd.spec
===================================================================
RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vsftpd.spec	7 Feb 2006 14:13:50 -0000	1.41
+++ vsftpd.spec	11 Feb 2006 05:59:15 -0000	1.42
@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.4
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -134,6 +134,9 @@
 /var/ftp
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:02:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:02:10 -0500
Subject: rpms/vte/devel vte.spec,1.58,1.59
Message-ID: <200602110602.k1B62Ajd018704@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18662

Modified Files:
	vte.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vte.spec	7 Feb 2006 14:14:01 -0000	1.58
+++ vte.spec	11 Feb 2006 06:01:55 -0000	1.59
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.11.17
-Release: 1.fc5.1.1
+Release: 1.fc5.1.2
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.11.17-1.fc5.1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11.17-1.fc5.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:02:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:02:56 -0500
Subject: rpms/w3m/devel w3m.spec,1.30,1.31
Message-ID: <200602110602.k1B62uTL018820@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18790

Modified Files:
	w3m.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- w3m.spec	7 Feb 2006 14:14:12 -0000	1.30
+++ w3m.spec	11 Feb 2006 06:02:53 -0000	1.31
@@ -4,7 +4,7 @@
 
 Name:		w3m
 Version:	0.5.1
-Release: 12.2
+Release: 12.2.1
 License:	BSD
 URL:		http://w3m.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -128,6 +128,9 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:03:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:03:44 -0500
Subject: rpms/webalizer/devel webalizer.spec,1.23,1.24
Message-ID: <200602110603.k1B63ip9018959@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/webalizer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18936

Modified Files:
	webalizer.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: webalizer.spec
===================================================================
RCS file: /cvs/dist/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- webalizer.spec	7 Feb 2006 14:14:23 -0000	1.23
+++ webalizer.spec	11 Feb 2006 06:03:42 -0000	1.24
@@ -5,7 +5,7 @@
 Summary: A flexible Web server log file analysis program.
 Group: Applications/Internet
 Version: %{ver}_%{patchlevel}
-Release: 29.2
+Release: 29.2.1
 URL: http://www.mrunix.net/webalizer/
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
@@ -97,6 +97,9 @@
 %attr(-, webalizer, root) /var/www/usage/*.png
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.01_10-29.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.01_10-29.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:04:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:04:17 -0500
Subject: rpms/wget/devel wget.spec,1.43,1.44
Message-ID: <200602110604.k1B64Hbj019074@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wget/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19046

Modified Files:
	wget.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: wget.spec
===================================================================
RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wget.spec	7 Feb 2006 14:14:34 -0000	1.43
+++ wget.spec	11 Feb 2006 06:04:14 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Name: wget
 Version: 1.10.2
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/Internet
 Url: http://wget.sunsite.dk/
@@ -70,6 +70,9 @@
 %{_infodir}/*
 
 %changelog
+* 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)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.10.2-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:05:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:05:11 -0500
Subject: rpms/which/devel which.spec,1.9,1.10
Message-ID: <200602110605.k1B65BcU019317@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/which/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19292

Modified Files:
	which.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: which.spec
===================================================================
RCS file: /cvs/dist/rpms/which/devel/which.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- which.spec	7 Feb 2006 14:14:46 -0000	1.9
+++ which.spec	11 Feb 2006 06:05:09 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Displays where a particular program in your path is located.
 Name: which
 Version: 2.16
-Release: 6.2
+Release: 6.2.1
 License: GPL
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:05:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:05:33 -0500
Subject: rpms/wordtrans/devel wordtrans.spec,1.23,1.24
Message-ID: <200602110605.k1B65Xjk019429@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19412

Modified Files:
	wordtrans.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wordtrans.spec	7 Feb 2006 14:15:12 -0000	1.23
+++ wordtrans.spec	11 Feb 2006 06:05:30 -0000	1.24
@@ -11,7 +11,7 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1pre13
-Release: 12.2
+Release: 12.2.1
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
 Source1: ger-eng.txt
@@ -303,6 +303,9 @@
 /var/www/wordtrans
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1pre13-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:06:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:06:15 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.4,1.5
Message-ID: <200602110606.k1B66FNa019666@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19639

Modified Files:
	wpa_supplicant.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wpa_supplicant.spec	7 Feb 2006 14:15:37 -0000	1.4
+++ wpa_supplicant.spec	11 Feb 2006 06:06:12 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Version: 0.5.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -95,6 +95,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:06:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:06:30 -0500
Subject: rpms/wvdial/devel wvdial.spec,1.19,1.20
Message-ID: <200602110606.k1B66Ufj019807@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/wvdial/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19783

Modified Files:
	wvdial.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: wvdial.spec
===================================================================
RCS file: /cvs/dist/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wvdial.spec	7 Feb 2006 14:15:56 -0000	1.19
+++ wvdial.spec	11 Feb 2006 06:06:27 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A heuristic autodialer for PPP connections.
 Name: wvdial
 Version: 1.54.0
-Release: 5.2.1
+Release: 5.2.2
 License: LGPL
 URL: http://open.nit.ca/wvdial/
 Group: System Environment/Daemons
@@ -55,6 +55,9 @@
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.54.0-5.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.54.0-5.2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:06:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:06:50 -0500
Subject: rpms/xalan-j2/devel xalan-j2.spec,1.41,1.42
Message-ID: <200602110606.k1B66ovb019953@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xalan-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19921

Modified Files:
	xalan-j2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xalan-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xalan-j2.spec	7 Feb 2006 14:16:15 -0000	1.41
+++ xalan-j2.spec	11 Feb 2006 06:06:48 -0000	1.42
@@ -4,7 +4,7 @@
 
 Name:           xalan-j2
 Version:        %{version}
-Release:        3jpp_7fc
+Release:        3jpp_8fc
 Epoch:          0
 Summary:        Java XSLT processor
 License:        Apache Software License
@@ -215,6 +215,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.0-3jpp_8fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.0-3jpp_7fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:07:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:07:16 -0500
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.24,1.25
Message-ID: <200602110607.k1B67GDX020087@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20058

Modified Files:
	Xaw3d.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Xaw3d.spec	7 Feb 2006 14:16:41 -0000	1.24
+++ Xaw3d.spec	11 Feb 2006 06:07:13 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 6.2
+Release: 6.2.1
 Group: System Environment/Libraries
 Source: http://www.visi.com/~hawkeyed/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -99,6 +99,9 @@
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:07:37 -0500
Subject: rpms/xcdroast/devel xcdroast.spec,1.25,1.26
Message-ID: <200602110607.k1B67b7m020209@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xcdroast/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20179

Modified Files:
	xcdroast.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xcdroast.spec
===================================================================
RCS file: /cvs/dist/rpms/xcdroast/devel/xcdroast.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xcdroast.spec	7 Feb 2006 14:17:07 -0000	1.25
+++ xcdroast.spec	11 Feb 2006 06:07:34 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: An X Window System based tool for creating CDs.
 Name: xcdroast
 Version: 0.98a15
-Release: 12.2
+Release: 12.2.1
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/xcdroast/xcdroast-0.98alpha15.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/applications/*
  
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.98a15-12.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.98a15-12.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:08:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:08:03 -0500
Subject: rpms/xdelta/devel xdelta.spec,1.18,1.19
Message-ID: <200602110608.k1B68346020390@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20367

Modified Files:
	xdelta.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xdelta.spec	7 Feb 2006 14:18:05 -0000	1.18
+++ xdelta.spec	11 Feb 2006 06:08:00 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.3
-Release: 17.2
+Release: 17.2.1
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
@@ -75,6 +75,9 @@
 %{_datadir}/aclocal/xdelta.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-17.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-17.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:09:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:09:11 -0500
Subject: rpms/xerces-j2/devel xerces-j2.spec,1.40,1.41
Message-ID: <200602110609.k1B69BCh020633@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20585

Modified Files:
	xerces-j2.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xerces-j2.spec	7 Feb 2006 14:18:46 -0000	1.40
+++ xerces-j2.spec	11 Feb 2006 06:08:54 -0000	1.41
@@ -1,7 +1,7 @@
 %define name		xerces-j2
 %define version		2.6.2
 %define cvs_version	2_6_2
-%define release 	6jpp_4fc
+%define release 	6jpp_5fc
 %define section		free
 
 Name:		%{name}
@@ -281,6 +281,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.2-6jpp_5fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.2-6jpp_4fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:11:10 -0500
Subject: rpms/xferstats/devel xferstats.spec,1.10,1.11
Message-ID: <200602110611.k1B6BAvZ020950@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20926

Modified Files:
	xferstats.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xferstats.spec	7 Feb 2006 14:19:00 -0000	1.10
+++ xferstats.spec	11 Feb 2006 06:11:00 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Compiles information about file transfers from logfiles
 Name: xferstats
 Version: 2.16
-Release: 13.2
+Release: 13.2.1
 URL: http://xferstats.off.net/
 Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz
 Patch0: xferstats.patch
@@ -44,6 +44,9 @@
 %{_datadir}/xferstats
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:11:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:11:25 -0500
Subject: rpms/xfig/devel xfig.spec,1.33,1.34
Message-ID: <200602110611.k1B6BPGI021075@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21062

Modified Files:
	xfig.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xfig.spec	7 Feb 2006 14:19:12 -0000	1.33
+++ xfig.spec	11 Feb 2006 06:11:23 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 17.1
+Release: 17.2
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -107,6 +107,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:11:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:11:51 -0500
Subject: rpms/xfsprogs/devel xfsprogs.spec,1.11,1.12
Message-ID: <200602110611.k1B6BpIQ021243@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xfsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21211

Modified Files:
	xfsprogs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfsprogs.spec	7 Feb 2006 14:19:27 -0000	1.11
+++ xfsprogs.spec	11 Feb 2006 06:11:47 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Utilities for managing the XFS filesystem.
 Name: xfsprogs
 Version: 2.7.3
-Release: 1.2
+Release: 1.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://oss.sgi.com/projects/xfs/
@@ -98,6 +98,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.7.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:12:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:12:03 -0500
Subject: rpms/xinetd/devel xinetd.spec,1.28,1.29
Message-ID: <200602110612.k1B6C3JP021368@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xinetd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21340

Modified Files:
	xinetd.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xinetd.spec
===================================================================
RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xinetd.spec	7 Feb 2006 14:19:42 -0000	1.28
+++ xinetd.spec	11 Feb 2006 06:12:00 -0000	1.29
@@ -4,7 +4,7 @@
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.13
-Release: 6.2
+Release: 6.2.1
 License: Distributable (BSD-like)
 Group: System Environment/Daemons
 Epoch: 2
@@ -124,6 +124,9 @@
 %config(noreplace) /etc/sysconfig/xinetd
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.13-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.3.13-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:12:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:12:25 -0500
Subject: rpms/xml-commons/devel xml-commons.spec,1.32,1.33
Message-ID: <200602110612.k1B6CPQT021481@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21467

Modified Files:
	xml-commons.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xml-commons.spec	22 Dec 2005 02:10:52 -0000	1.32
+++ xml-commons.spec	11 Feb 2006 06:12:23 -0000	1.33
@@ -3,7 +3,7 @@
 Summary:        Common code for XML projects
 Name:           xml-commons
 Version:        1.0
-Release: 	0.b2.7jpp_4fc
+Release: 	0.b2.7jpp_5fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
@@ -184,6 +184,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.b2.7jpp_5fc
+- bump again for double-long bug on ppc(64)
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0-0.b2.7jpp_4fc
 - rebuilt again
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:12:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:12:51 -0500
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.8,1.9
Message-ID: <200602110612.k1B6Cpkv021625@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21599

Modified Files:
	xmlrpc.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmlrpc.spec	7 Feb 2006 14:19:58 -0000	1.8
+++ xmlrpc.spec	11 Feb 2006 06:12:48 -0000	1.9
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_3fc
+%define release		1jpp_4fc
 %define	section		free
 %define gcj_support     1
 
@@ -105,6 +105,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_4fc
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_3fc
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:13:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:13:17 -0500
Subject: rpms/xmlsec1/devel xmlsec1.spec,1.21,1.22
Message-ID: <200602110613.k1B6DHxB021778@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlsec1/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21751

Modified Files:
	xmlsec1.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xmlsec1.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlsec1/devel/xmlsec1.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xmlsec1.spec	7 Feb 2006 14:20:15 -0000	1.21
+++ xmlsec1.spec	11 Feb 2006 06:13:13 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
 Version: 1.2.9
-Release: 4.1
+Release: 4.2
 License: MIT
 Group: Development/Libraries
 Source: ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-%{version}.tar.gz
@@ -227,6 +227,9 @@
 %{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-4.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:13:31 -0500
Subject: rpms/xmlto/devel xmlto.spec,1.20,1.21
Message-ID: <200602110613.k1B6DVQi021935@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xmlto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21905

Modified Files:
	xmlto.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xmlto.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlto/devel/xmlto.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xmlto.spec	7 Feb 2006 14:20:30 -0000	1.20
+++ xmlto.spec	11 Feb 2006 06:13:28 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: A tool for converting XML files to various formats.
 Name: xmlto
 Version: 0.0.18
-Release: 9.2
+Release: 9.2.1
 License: GPL
 Group: Applications/System
 URL: http://cyberelk.net/tim/xmlto/
@@ -58,6 +58,9 @@
 %{_datadir}/xmlto
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.0.18-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.0.18-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:13:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:13:42 -0500
Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.8,1.9
Message-ID: <200602110613.k1B6DgCx022059@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22032

Modified Files:
	xorg-x11-apps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-apps.spec	7 Feb 2006 14:20:48 -0000	1.8
+++ xorg-x11-apps.spec	11 Feb 2006 06:13:39 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 applications
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -173,6 +173,9 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:14:17 -0500
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.7,1.8
Message-ID: <200602110614.k1B6EH08022358@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22329

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drivers.spec	9 Feb 2006 12:06:49 -0000	1.7
+++ xorg-x11-drivers.spec	11 Feb 2006 06:14:15 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.0
-Release: 1
+Release: 1.1
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -271,6 +271,9 @@
 #%doc
 
 %changelog
+* 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



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:14:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:14:28 -0500
Subject: rpms/xorg-x11-drv-acecad/devel xorg-x11-drv-acecad.spec,1.7,1.8
Message-ID: <200602110614.k1B6ESdU022487@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-acecad/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22458

Modified Files:
	xorg-x11-drv-acecad.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-acecad.spec	7 Feb 2006 14:21:21 -0000	1.7
+++ xorg-x11-drv-acecad.spec	11 Feb 2006 06:14:25 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 acecad input driver
 Name:      xorg-x11-drv-acecad
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -50,6 +50,9 @@
 %{_mandir}/man4/acecad.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:14:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:14:53 -0500
Subject: rpms/xorg-x11-drv-aiptek/devel xorg-x11-drv-aiptek.spec,1.7,1.8
Message-ID: <200602110614.k1B6ErrB022724@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-aiptek/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22690

Modified Files:
	xorg-x11-drv-aiptek.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-aiptek.spec	7 Feb 2006 14:21:43 -0000	1.7
+++ xorg-x11-drv-aiptek.spec	11 Feb 2006 06:14:51 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 aiptek input driver
 Name:      xorg-x11-drv-aiptek
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -52,6 +52,9 @@
 %{_mandir}/man4/aiptek.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:15:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:15:28 -0500
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.11,1.12
Message-ID: <200602110615.k1B6FS6i023017@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22987

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-ati.spec	7 Feb 2006 14:22:49 -0000	1.11
+++ xorg-x11-drv-ati.spec	11 Feb 2006 06:15:26 -0000	1.12
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   3.1
+Release:   3.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
@@ -82,6 +82,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.5.7.3-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.5.7.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:15:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:15:42 -0500
Subject: rpms/xorg-x11-drv-calcomp/devel xorg-x11-drv-calcomp.spec,1.7,1.8
Message-ID: <200602110615.k1B6FgXJ023175@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-calcomp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23124

Modified Files:
	xorg-x11-drv-calcomp.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-calcomp.spec	7 Feb 2006 14:23:16 -0000	1.7
+++ xorg-x11-drv-calcomp.spec	11 Feb 2006 06:15:39 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 calcomp input driver
 Name:      xorg-x11-drv-calcomp
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/calcomp.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:15:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:15:57 -0500
Subject: rpms/xorg-x11-drv-citron/devel xorg-x11-drv-citron.spec,1.7,1.8
Message-ID: <200602110615.k1B6Fv0P024461@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24245

Modified Files:
	xorg-x11-drv-citron.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-citron.spec	7 Feb 2006 14:24:10 -0000	1.7
+++ xorg-x11-drv-citron.spec	11 Feb 2006 06:15:53 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 citron input driver
 Name:      xorg-x11-drv-citron
 Version: 2.1.1.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/citron.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.1.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:16:15 -0500
Subject: rpms/xorg-x11-drv-digitaledge/devel xorg-x11-drv-digitaledge.spec,
	1.7, 1.8
Message-ID: <200602110616.k1B6GFJw025981@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-digitaledge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25704

Modified Files:
	xorg-x11-drv-digitaledge.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-digitaledge.spec	7 Feb 2006 14:24:34 -0000	1.7
+++ xorg-x11-drv-digitaledge.spec	11 Feb 2006 06:16:12 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 digitaledge input driver
 Name:      xorg-x11-drv-digitaledge
 Version: 1.0.1.3
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:16:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:16:28 -0500
Subject: rpms/xorg-x11-drv-dmc/devel xorg-x11-drv-dmc.spec,1.7,1.8
Message-ID: <200602110616.k1B6GSCG027750@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dmc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27216

Modified Files:
	xorg-x11-drv-dmc.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-dmc.spec	7 Feb 2006 14:24:44 -0000	1.7
+++ xorg-x11-drv-dmc.spec	11 Feb 2006 06:16:26 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dmc input driver
 Name:      xorg-x11-drv-dmc
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dmc.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:16:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:16:44 -0500
Subject: rpms/xorg-x11-drv-dummy/devel xorg-x11-drv-dummy.spec,1.7,1.8
Message-ID: <200602110616.k1B6GifU029240@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dummy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28896

Modified Files:
	xorg-x11-drv-dummy.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-dummy.spec	7 Feb 2006 14:24:54 -0000	1.7
+++ xorg-x11-drv-dummy.spec	11 Feb 2006 06:16:40 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dummy video driver
 Name:      xorg-x11-drv-dummy
 Version:   0.1.0.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/dummy.4x*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:16:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:16:59 -0500
Subject: rpms/xorg-x11-drv-dynapro/devel xorg-x11-drv-dynapro.spec,1.7,1.8
Message-ID: <200602110616.k1B6GxXJ030819@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-dynapro/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30639

Modified Files:
	xorg-x11-drv-dynapro.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-dynapro.spec	7 Feb 2006 14:25:05 -0000	1.7
+++ xorg-x11-drv-dynapro.spec	11 Feb 2006 06:16:57 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 dynapro input driver
 Name:      xorg-x11-drv-dynapro
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/dynapro.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:17:13 -0500
Subject: rpms/xorg-x11-drv-elo2300/devel xorg-x11-drv-elo2300.spec,1.7,1.8
Message-ID: <200602110617.k1B6HDJA032214@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-elo2300/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32071

Modified Files:
	xorg-x11-drv-elo2300.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-elo2300.spec	7 Feb 2006 14:25:15 -0000	1.7
+++ xorg-x11-drv-elo2300.spec	11 Feb 2006 06:17:10 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elo2300 input driver
 Name:      xorg-x11-drv-elo2300
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/elo2300.4x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:17:29 -0500
Subject: rpms/xorg-x11-drv-elographics/devel xorg-x11-drv-elographics.spec,
	1.7, 1.8
Message-ID: <200602110617.k1B6HTPL001577@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-elographics/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1329

Modified Files:
	xorg-x11-drv-elographics.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-elographics.spec	7 Feb 2006 14:25:26 -0000	1.7
+++ xorg-x11-drv-elographics.spec	11 Feb 2006 06:17:26 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/elographics.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:17:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:17:44 -0500
Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.7,1.8
Message-ID: <200602110617.k1B6HiUt003099@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2781

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-evdev.spec	7 Feb 2006 14:25:37 -0000	1.7
+++ xorg-x11-drv-evdev.spec	11 Feb 2006 06:17:40 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:17:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:17:57 -0500
Subject: rpms/xorg-x11-drv-fbdev/devel xorg-x11-drv-fbdev.spec,1.7,1.8
Message-ID: <200602110617.k1B6Hv68004444@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-fbdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4412

Modified Files:
	xorg-x11-drv-fbdev.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-fbdev.spec	7 Feb 2006 14:25:47 -0000	1.7
+++ xorg-x11-drv-fbdev.spec	11 Feb 2006 06:17:54 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
 Version:   0.1.0.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:18:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:18:06 -0500
Subject: rpms/xorg-x11-drv-fpit/devel xorg-x11-drv-fpit.spec,1.7,1.8
Message-ID: <200602110618.k1B6I6Sq004572@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-fpit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4540

Modified Files:
	xorg-x11-drv-fpit.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-fpit.spec	7 Feb 2006 14:25:57 -0000	1.7
+++ xorg-x11-drv-fpit.spec	11 Feb 2006 06:18:04 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 fpit input driver
 Name:      xorg-x11-drv-fpit
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/fpit.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:18:24 -0500
Subject: rpms/xorg-x11-drv-hyperpen/devel xorg-x11-drv-hyperpen.spec, 1.7,
	1.8
Message-ID: <200602110618.k1B6IOJh004730@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-hyperpen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4698

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-hyperpen.spec	7 Feb 2006 14:26:18 -0000	1.7
+++ xorg-x11-drv-hyperpen.spec	11 Feb 2006 06:18:22 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:18:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:18:34 -0500
Subject: rpms/xorg-x11-drv-jamstudio/devel xorg-x11-drv-jamstudio.spec, 1.7,
	1.8
Message-ID: <200602110618.k1B6IY1a004854@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-jamstudio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4824

Modified Files:
	xorg-x11-drv-jamstudio.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-jamstudio.spec	7 Feb 2006 14:27:00 -0000	1.7
+++ xorg-x11-drv-jamstudio.spec	11 Feb 2006 06:18:32 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 jamstudio input driver
 Name:      xorg-x11-drv-jamstudio
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/js_x.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:18:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:18:44 -0500
Subject: rpms/xorg-x11-drv-joystick/devel xorg-x11-drv-joystick.spec, 1.7,
	1.8
Message-ID: <200602110618.k1B6IirJ004973@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-joystick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4943

Modified Files:
	xorg-x11-drv-joystick.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-joystick.spec	7 Feb 2006 14:27:10 -0000	1.7
+++ xorg-x11-drv-joystick.spec	11 Feb 2006 06:18:42 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 joystick input driver
 Name:      xorg-x11-drv-joystick
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:19:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:19:10 -0500
Subject: rpms/xorg-x11-drv-keyboard/devel xorg-x11-drv-keyboard.spec, 1.7,
	1.8
Message-ID: <200602110619.k1B6JAkt005210@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-keyboard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5180

Modified Files:
	xorg-x11-drv-keyboard.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-keyboard.spec	7 Feb 2006 14:27:19 -0000	1.7
+++ xorg-x11-drv-keyboard.spec	11 Feb 2006 06:19:08 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 keyboard input driver
 Name:      xorg-x11-drv-keyboard
 Version: 1.0.1.3
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/keyboard.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:19:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:19:21 -0500
Subject: rpms/xorg-x11-drv-magellan/devel xorg-x11-drv-magellan.spec, 1.7,
	1.8
Message-ID: <200602110619.k1B6JLaU005343@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-magellan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5310

Modified Files:
	xorg-x11-drv-magellan.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-magellan.spec	7 Feb 2006 14:27:29 -0000	1.7
+++ xorg-x11-drv-magellan.spec	11 Feb 2006 06:19:19 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/magellan.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:19:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:19:34 -0500
Subject: rpms/xorg-x11-drv-magictouch/devel xorg-x11-drv-magictouch.spec, 1.7,
	1.8
Message-ID: <200602110619.k1B6JYps005473@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-magictouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5445

Modified Files:
	xorg-x11-drv-magictouch.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-magictouch.spec	7 Feb 2006 14:27:42 -0000	1.7
+++ xorg-x11-drv-magictouch.spec	11 Feb 2006 06:19:30 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 magictouch input driver
 Name:      xorg-x11-drv-magictouch
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/magictouch.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:19:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:19:53 -0500
Subject: rpms/xorg-x11-drv-mga/devel xorg-x11-drv-mga.spec,1.7,1.8
Message-ID: <200602110619.k1B6JrSh005646@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5615

Modified Files:
	xorg-x11-drv-mga.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-mga.spec	7 Feb 2006 14:27:53 -0000	1.7
+++ xorg-x11-drv-mga.spec	11 Feb 2006 06:19:50 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
 Version:   1.2.1.3
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   mga.xinf
@@ -61,6 +61,9 @@
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:20:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:20:28 -0500
Subject: rpms/xorg-x11-drv-microtouch/devel xorg-x11-drv-microtouch.spec, 1.7,
	1.8
Message-ID: <200602110620.k1B6KSho005958@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-microtouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5928

Modified Files:
	xorg-x11-drv-microtouch.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-microtouch.spec	7 Feb 2006 14:28:03 -0000	1.7
+++ xorg-x11-drv-microtouch.spec	11 Feb 2006 06:20:25 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 microtouch input driver
 Name:      xorg-x11-drv-microtouch
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/microtouch.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:20:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:20:50 -0500
Subject: rpms/xorg-x11-drv-mouse/devel xorg-x11-drv-mouse.spec,1.8,1.9
Message-ID: <200602110620.k1B6KoeK006182@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6154

Modified Files:
	xorg-x11-drv-mouse.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-mouse.spec	7 Feb 2006 14:28:14 -0000	1.8
+++ xorg-x11-drv-mouse.spec	11 Feb 2006 06:20:47 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mouse input driver
 Name:      xorg-x11-drv-mouse
 Version: 1.0.3.1
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -54,6 +54,9 @@
 %{_mandir}/man4/mouse-driver.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3.1-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.3.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:21:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:21:01 -0500
Subject: rpms/xorg-x11-drv-mutouch/devel xorg-x11-drv-mutouch.spec,1.7,1.8
Message-ID: <200602110621.k1B6L10s006317@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-mutouch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6291

Modified Files:
	xorg-x11-drv-mutouch.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-mutouch.spec	7 Feb 2006 14:28:25 -0000	1.7
+++ xorg-x11-drv-mutouch.spec	11 Feb 2006 06:20:59 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -51,6 +51,9 @@
 %{_mandir}/man4/mutouch.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:21:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:21:12 -0500
Subject: rpms/xorg-x11-drv-nv/devel xorg-x11-drv-nv.spec,1.10,1.11
Message-ID: <200602110621.k1B6LCLn006451@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6414

Modified Files:
	xorg-x11-drv-nv.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-nv.spec	9 Feb 2006 19:03:16 -0000	1.10
+++ xorg-x11-drv-nv.spec	11 Feb 2006 06:21:09 -0000	1.11
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   1.0.1.5
-Release:   3
+Release:   3.1
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   nv.xinf
@@ -60,6 +60,9 @@
 %{_mandir}/man4/nv.4*
 
 %changelog
+* 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
 - Added nv-1.0.1.5-updateto-cvs20050209.patch to sync driver with CVS and pick
   up support for newer Nvidia chips, and RandR rotation support.  (#180101)



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:21:24 -0500
Subject: rpms/xorg-x11-drv-palmax/devel xorg-x11-drv-palmax.spec,1.7,1.8
Message-ID: <200602110621.k1B6LOnu006586@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-palmax/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6556

Modified Files:
	xorg-x11-drv-palmax.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-palmax.spec	7 Feb 2006 14:29:06 -0000	1.7
+++ xorg-x11-drv-palmax.spec	11 Feb 2006 06:21:21 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 palmax input driver
 Name:      xorg-x11-drv-palmax
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/palmax.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:21:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:21:33 -0500
Subject: rpms/xorg-x11-drv-penmount/devel xorg-x11-drv-penmount.spec, 1.7,
	1.8
Message-ID: <200602110621.k1B6LXJc006724@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-penmount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6688

Modified Files:
	xorg-x11-drv-penmount.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-penmount.spec	7 Feb 2006 14:29:16 -0000	1.7
+++ xorg-x11-drv-penmount.spec	11 Feb 2006 06:21:31 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:21:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:21:44 -0500
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.8,1.9
Message-ID: <200602110621.k1B6LiNH006851@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6822

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-s3.spec	7 Feb 2006 14:29:39 -0000	1.8
+++ xorg-x11-drv-s3.spec	11 Feb 2006 06:21:42 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
 Version:   0.3.5.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3.xinf
@@ -53,6 +53,9 @@
 #%{_mandir}/man4/s3.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:00 -0500
Subject: rpms/xorg-x11-drv-s3virge/devel xorg-x11-drv-s3virge.spec,1.7,1.8
Message-ID: <200602110622.k1B6M0Bo007004@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-s3virge/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6977

Modified Files:
	xorg-x11-drv-s3virge.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-s3virge.spec	7 Feb 2006 14:29:51 -0000	1.7
+++ xorg-x11-drv-s3virge.spec	11 Feb 2006 06:21:57 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3virge video driver
 Name:      xorg-x11-drv-s3virge
 Version:   1.8.6.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3virge.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/s3virge.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.6.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.8.6.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:10 -0500
Subject: rpms/xorg-x11-drv-savage/devel xorg-x11-drv-savage.spec,1.8,1.9
Message-ID: <200602110622.k1B6MAbO007125@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7095

Modified Files:
	xorg-x11-drv-savage.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-savage.spec	7 Feb 2006 14:30:02 -0000	1.8
+++ xorg-x11-drv-savage.spec	11 Feb 2006 06:22:07 -0000	1.9
@@ -13,7 +13,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.0.2.3
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   savage.xinf
@@ -66,6 +66,9 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.2.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:21 -0500
Subject: rpms/xorg-x11-drv-sis/devel xorg-x11-drv-sis.spec,1.8,1.9
Message-ID: <200602110622.k1B6MLMv007258@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-sis/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7227

Modified Files:
	xorg-x11-drv-sis.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-sis.spec	7 Feb 2006 14:30:48 -0000	1.8
+++ xorg-x11-drv-sis.spec	11 Feb 2006 06:22:18 -0000	1.9
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 sis video driver
 Name:      xorg-x11-drv-sis
 Version:   0.8.1.3
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   sis.xinf
@@ -63,6 +63,9 @@
 %{_mandir}/man4/sis.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.8.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:31 -0500
Subject: rpms/xorg-x11-drv-sisusb/devel xorg-x11-drv-sisusb.spec,1.7,1.8
Message-ID: <200602110622.k1B6MVAY007388@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-sisusb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7358

Modified Files:
	xorg-x11-drv-sisusb.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-sisusb.spec	7 Feb 2006 14:31:12 -0000	1.7
+++ xorg-x11-drv-sisusb.spec	11 Feb 2006 06:22:29 -0000	1.8
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 sisusb video driver
 Name:      xorg-x11-drv-sisusb
 Version: 0.7.1.3
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 # FIXME: If using a CVS version, uncomment the second Source0 line and use
 # it instead.
@@ -83,6 +83,9 @@
 %{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:44 -0500
Subject: rpms/xorg-x11-drv-spaceorb/devel xorg-x11-drv-spaceorb.spec, 1.7,
	1.8
Message-ID: <200602110622.k1B6MiKM007527@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-spaceorb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7498

Modified Files:
	xorg-x11-drv-spaceorb.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-spaceorb.spec	7 Feb 2006 14:31:44 -0000	1.7
+++ xorg-x11-drv-spaceorb.spec	11 Feb 2006 06:22:41 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 spaceorb input driver
 Name:      xorg-x11-drv-spaceorb
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:22:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:22:55 -0500
Subject: rpms/xorg-x11-drv-summa/devel xorg-x11-drv-summa.spec,1.7,1.8
Message-ID: <200602110622.k1B6MtGX007654@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-summa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7624

Modified Files:
	xorg-x11-drv-summa.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-summa.spec	7 Feb 2006 14:32:07 -0000	1.7
+++ xorg-x11-drv-summa.spec	11 Feb 2006 06:22:52 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 summa input driver
 Name:      xorg-x11-drv-summa
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 #%{_mandir}/man4/*.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:23:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:23:08 -0500
Subject: rpms/xorg-x11-drv-tek4957/devel xorg-x11-drv-tek4957.spec,1.4,1.5
Message-ID: <200602110623.k1B6N86E007814@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tek4957/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7787

Modified Files:
	xorg-x11-drv-tek4957.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-drv-tek4957.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-tek4957/devel/xorg-x11-drv-tek4957.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-tek4957.spec	7 Feb 2006 14:32:57 -0000	1.4
+++ xorg-x11-drv-tek4957.spec	11 Feb 2006 06:23:05 -0000	1.5
@@ -11,7 +11,7 @@
 Summary:   Xorg X11 tek4957 input driver
 Name:      xorg-x11-drv-tek4957
 Version: 1.0.0.1
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 # FIXME: If using a CVS version, uncomment the second Source0 line and use
 # it instead.
@@ -81,6 +81,9 @@
 %{_mandir}/man4x/*.4x*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.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.0.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:23:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:23:19 -0500
Subject: rpms/xorg-x11-drv-trident/devel xorg-x11-drv-trident.spec,1.7,1.8
Message-ID: <200602110623.k1B6NJWI007945@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7920

Modified Files:
	xorg-x11-drv-trident.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-trident.spec	7 Feb 2006 14:33:28 -0000	1.7
+++ xorg-x11-drv-trident.spec	11 Feb 2006 06:23:17 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 trident video driver
 Name:      xorg-x11-drv-trident
 Version:   1.0.1.2
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   trident.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/trident.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.2-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:23:30 -0500
Subject: rpms/xorg-x11-drv-ur98/devel xorg-x11-drv-ur98.spec,1.6,1.7
Message-ID: <200602110623.k1B6NUch008068@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-ur98/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8040

Modified Files:
	xorg-x11-drv-ur98.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-ur98.spec	7 Feb 2006 14:34:01 -0000	1.6
+++ xorg-x11-drv-ur98.spec	11 Feb 2006 06:23:27 -0000	1.7
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 ur98 input driver
 Name:      xorg-x11-drv-ur98
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/ur98.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:23:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:23:43 -0500
Subject: rpms/xorg-x11-drv-vesa/devel xorg-x11-drv-vesa.spec,1.7,1.8
Message-ID: <200602110623.k1B6NhRH008211@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8182

Modified Files:
	xorg-x11-drv-vesa.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-vesa.spec	7 Feb 2006 14:34:41 -0000	1.7
+++ xorg-x11-drv-vesa.spec	11 Feb 2006 06:23:40 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.0.1.3
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:23:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:23:59 -0500
Subject: rpms/xorg-x11-drv-vga/devel xorg-x11-drv-vga.spec,1.7,1.8
Message-ID: <200602110623.k1B6NxBp008376@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-vga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8346

Modified Files:
	xorg-x11-drv-vga.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-vga.spec	7 Feb 2006 14:34:54 -0000	1.7
+++ xorg-x11-drv-vga.spec	11 Feb 2006 06:23:56 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.0.0.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -52,6 +52,9 @@
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0.5-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:24:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:24:20 -0500
Subject: rpms/xorg-x11-drv-void/devel xorg-x11-drv-void.spec,1.7,1.8
Message-ID: <200602110624.k1B6OKoS008582@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-void/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8559

Modified Files:
	xorg-x11-drv-void.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-void.spec	7 Feb 2006 14:36:15 -0000	1.7
+++ xorg-x11-drv-void.spec	11 Feb 2006 06:24:17 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version: 1.0.0.5
-Release: 1.1
+Release: 1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
@@ -53,6 +53,9 @@
 %{_mandir}/man4/void.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:24:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:24:32 -0500
Subject: rpms/xorg-x11-drv-voodoo/devel xorg-x11-drv-voodoo.spec,1.7,1.8
Message-ID: <200602110624.k1B6OWpT008729@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-voodoo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8703

Modified Files:
	xorg-x11-drv-voodoo.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-voodoo.spec	7 Feb 2006 14:36:40 -0000	1.7
+++ xorg-x11-drv-voodoo.spec	11 Feb 2006 06:24:30 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 voodoo video driver
 Name:      xorg-x11-drv-voodoo
 Version:   1.0.0.5
-Release:   1.1
+Release:   1.2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   voodoo.xinf
@@ -57,6 +57,9 @@
 %{_mandir}/man4/voodoo.4*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:24:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:24:43 -0500
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.11,1.12
Message-ID: <200602110624.k1B6OhpT008864@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8832

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-font-utils.spec	7 Feb 2006 14:37:20 -0000	1.11
+++ xorg-x11-font-utils.spec	11 Feb 2006 06:24:41 -0000	1.12
@@ -5,7 +5,7 @@
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -129,6 +129,9 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:24:58 -0500
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.16,
	1.17
Message-ID: <200602110624.k1B6OwxE009027@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8994

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-proto-devel.spec	7 Feb 2006 14:37:43 -0000	1.16
+++ xorg-x11-proto-devel.spec	11 Feb 2006 06:24:56 -0000	1.17
@@ -6,7 +6,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 2.1
+Release: 2.2
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -278,6 +278,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:25:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:25:16 -0500
Subject: rpms/xorg-x11-resutils/devel xorg-x11-resutils.spec,1.7,1.8
Message-ID: <200602110625.k1B6PGQn009206@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-resutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9175

Modified Files:
	xorg-x11-resutils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-resutils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-resutils.spec	7 Feb 2006 14:38:11 -0000	1.7
+++ xorg-x11-resutils.spec	11 Feb 2006 06:25:13 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X resource utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -95,6 +95,9 @@
 %{_mandir}/man1/viewres.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:25:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:25:27 -0500
Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.40,1.41
Message-ID: <200602110625.k1B6PRaB009338@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9309

Modified Files:
	xorg-x11-server.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-server.spec	8 Feb 2006 22:03:43 -0000	1.40
+++ xorg-x11-server.spec	11 Feb 2006 06:25:24 -0000	1.41
@@ -4,7 +4,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.0.1
-Release:   6
+Release:   6.1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -513,6 +513,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* 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
 - 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



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:25:40 -0500
Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.11,
	1.12
Message-ID: <200602110625.k1B6PeEV009493@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9463

Modified Files:
	xorg-x11-server-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-server-utils.spec	7 Feb 2006 14:38:32 -0000	1.11
+++ xorg-x11-server-utils.spec	11 Feb 2006 06:25:37 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -212,6 +212,9 @@
 %{_mandir}/man1/xvidtune.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:26:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:26:06 -0500
Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.10,1.11
Message-ID: <200602110626.k1B6Q6H0009731@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9699

Modified Files:
	xorg-x11-twm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-twm.spec	7 Feb 2006 14:38:46 -0000	1.10
+++ xorg-x11-twm.spec	11 Feb 2006 06:26:04 -0000	1.11
@@ -5,7 +5,7 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -100,6 +100,9 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:26:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:26:18 -0500
Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec,1.7,1.8
Message-ID: <200602110626.k1B6QIBd009865@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-util-macros/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9837

Modified Files:
	xorg-x11-util-macros.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-util-macros.spec	7 Feb 2006 14:39:03 -0000	1.7
+++ xorg-x11-util-macros.spec	11 Feb 2006 06:26:15 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 Autotools macros
 Name: xorg-x11-util-macros
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -41,6 +41,9 @@
 %{_datadir}/aclocal/xorg-macros.m4
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:26:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:26:37 -0500
Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.8,1.9
Message-ID: <200602110626.k1B6QbRj010050@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10019

Modified Files:
	xorg-x11-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-utils.spec	7 Feb 2006 14:39:14 -0000	1.8
+++ xorg-x11-utils.spec	11 Feb 2006 06:26:35 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X client utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -102,6 +102,9 @@
 %{_mandir}/man1/xwininfo.1x.gz
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:26:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:26:53 -0500
Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.8,1.9
Message-ID: <200602110626.k1B6QrrL010215@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xauth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10185

Modified Files:
	xorg-x11-xauth.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xauth.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-xauth.spec	7 Feb 2006 14:39:39 -0000	1.8
+++ xorg-x11-xauth.spec	11 Feb 2006 06:26:50 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X authority utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 # FIXME: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -66,6 +66,9 @@
 %{_mandir}/man1/mkxauth.1x*
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:27:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:27:08 -0500
Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.8,1.9
Message-ID: <200602110627.k1B6R8K3010375@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10344

Modified Files:
	xorg-x11-xbitmaps.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xbitmaps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-xbitmaps.spec	7 Feb 2006 14:39:50 -0000	1.8
+++ xorg-x11-xbitmaps.spec	11 Feb 2006 06:27:05 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -81,6 +81,9 @@
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:27:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:27:19 -0500
Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.17,1.18
Message-ID: <200602110627.k1B6RJIr010508@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10479

Modified Files:
	xorg-x11-xdm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-xdm.spec	7 Feb 2006 14:40:08 -0000	1.17
+++ xorg-x11-xdm.spec	11 Feb 2006 06:27:16 -0000	1.18
@@ -18,7 +18,7 @@
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -214,6 +214,9 @@
 %{_mandir}/man1x/*.1x*
 
 %changelog
+* 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
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:27:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:27:30 -0500
Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.16,1.17
Message-ID: <200602110627.k1B6RUnb010637@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10608

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-xfs.spec	9 Feb 2006 09:49:57 -0000	1.16
+++ xorg-x11-xfs.spec	11 Feb 2006 06:27:28 -0000	1.17
@@ -8,7 +8,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 2
+Release: 2.1
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -282,6 +282,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* 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
 - Removed invocation of fc-cache from xfs initscript for bug (#179362)
 - Redirect stderr to /dev/null to squelch an unwanted error xfs.init (#155349)



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:27:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:27:43 -0500
Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.6,1.7
Message-ID: <200602110627.k1B6RhiA010771@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xfwp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10744

Modified Files:
	xorg-x11-xfwp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xfwp.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-xfwp.spec	7 Feb 2006 14:40:46 -0000	1.6
+++ xorg-x11-xfwp.spec	11 Feb 2006 06:27:40 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X firewall proxy
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -84,6 +84,9 @@
 %{_mandir}/man1/xfwp.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:27:54 -0500
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.14,1.15
Message-ID: <200602110627.k1B6RsEu010913@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10882

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-xinit.spec	7 Feb 2006 14:40:59 -0000	1.14
+++ xorg-x11-xinit.spec	11 Feb 2006 06:27:51 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -93,6 +93,9 @@
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:28:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:28:05 -0500
Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.9,1.10
Message-ID: <200602110628.k1B6S5qY011045@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11013

Modified Files:
	xorg-x11-xkb-utils.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-xkb-utils.spec	7 Feb 2006 14:41:13 -0000	1.9
+++ xorg-x11-xkb-utils.spec	11 Feb 2006 06:28:02 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -97,6 +97,9 @@
 %{_mandir}/man1/xkbprint.1x*
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:28:16 -0500
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.7,1.8
Message-ID: <200602110628.k1B6SGFw011183@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11151

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-xsm.spec	7 Feb 2006 14:41:40 -0000	1.7
+++ xorg-x11-xsm.spec	11 Feb 2006 06:28:14 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 1.1
+Release: 1.2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -122,6 +122,9 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* 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
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:28:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:28:28 -0500
Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.10,
	1.11
Message-ID: <200602110628.k1B6SSnB011312@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11283

Modified Files:
	xorg-x11-xtrans-devel.spec 
Log Message:
bump for bug in double-long on ppc(64)


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xtrans-devel.spec	7 Feb 2006 14:41:57 -0000	1.10
+++ xorg-x11-xtrans-devel.spec	11 Feb 2006 06:28:25 -0000	1.11
@@ -6,7 +6,7 @@
 Summary: X.Org X11 developmental X transport library
 Name: xorg-x11-xtrans-devel
 Version: 1.0.0
-Release: 3.1
+Release: 3.2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -59,6 +59,9 @@
 %{_datadir}/aclocal/xtrans.m4
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:28:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:28:39 -0500
Subject: rpms/xpdf/devel xpdf.spec,1.74,1.75
Message-ID: <200602110628.k1B6SdBM011452@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11421

Modified Files:
	xpdf.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xpdf.spec	7 Feb 2006 15:39:25 -0000	1.74
+++ xpdf.spec	11 Feb 2006 06:28:36 -0000	1.75
@@ -5,7 +5,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 12
+Release: 12.1
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -235,6 +235,9 @@
 %{_mandir}/man?/pdf*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-12.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Than Ngo <than at redhat.com> 3.01-12
 - apply patch to fix buffer overflow issue in the xpdf codebase
   when handling splash images CVE-2006-0301 (#179423)



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:32:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:32:18 -0500
Subject: rpms/xrestop/devel xrestop.spec,1.8,1.9
Message-ID: <200602110632.k1B6WIn5011752@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xrestop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11716

Modified Files:
	xrestop.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xrestop.spec
===================================================================
RCS file: /cvs/dist/rpms/xrestop/devel/xrestop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xrestop.spec	7 Feb 2006 14:42:32 -0000	1.8
+++ xrestop.spec	11 Feb 2006 06:32:01 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: X Resource Monitor
 Name: xrestop
 Version: 0.2
-Release: 6.2
+Release: 6.2.1
 License: GPL
 Group: Development/Tools
 URL: http://www.freedesktop.org/Software/xrestop
@@ -41,6 +41,9 @@
 %{_mandir}/man1/xrestop.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2-6.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.2-6.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:34:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:34:32 -0500
Subject: rpms/xsane/devel xsane.spec,1.29,1.30
Message-ID: <200602110634.k1B6YWF9011951@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11914

Modified Files:
	xsane.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xsane.spec	7 Feb 2006 14:42:40 -0000	1.29
+++ xsane.spec	11 Feb 2006 06:33:50 -0000	1.30
@@ -1,7 +1,7 @@
 Name: xsane
 Summary: An X Window System front-end for the SANE scanner interface.
 Version: 0.99
-Release: 2.1
+Release: 2.2
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-install-gimp-plugin
 Patch0: xsane-0.90-htmlview.patch
@@ -97,6 +97,9 @@
 exit 0
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.99-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:35:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:35:19 -0500
Subject: rpms/xscreensaver/devel xscreensaver.spec,1.74,1.75
Message-ID: <200602110635.k1B6ZJTi012103@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12072

Modified Files:
	xscreensaver.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xscreensaver.spec	10 Feb 2006 03:11:50 -0000	1.74
+++ xscreensaver.spec	11 Feb 2006 06:35:09 -0000	1.75
@@ -6,7 +6,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release: 	1
+Release: 	1.1
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -245,6 +245,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.24-1.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:4.23-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:35:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:35:50 -0500
Subject: rpms/xsri/devel xsri.spec,1.13,1.14
Message-ID: <200602110635.k1B6ZoxH012295@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xsri/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12251

Modified Files:
	xsri.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xsri.spec
===================================================================
RCS file: /cvs/dist/rpms/xsri/devel/xsri.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsri.spec	7 Feb 2006 14:43:12 -0000	1.13
+++ xsri.spec	11 Feb 2006 06:35:48 -0000	1.14
@@ -2,7 +2,7 @@
 Summary:   X Set Root Image
 Name:      xsri
 Version:   2.1.0
-Release: 9.2
+Release: 9.2.1
 Epoch:     1
 License:   GPL
 Group:     System Environment/Base
@@ -35,6 +35,9 @@
 %{_bindir}/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.1.0-9.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:36:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:36:31 -0500
Subject: rpms/xterm/devel xterm.spec,1.35,1.36
Message-ID: <200602110636.k1B6aVjT012461@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12431

Modified Files:
	xterm.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xterm.spec	7 Feb 2006 14:43:20 -0000	1.35
+++ xterm.spec	11 Feb 2006 06:36:28 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 208
-Release: 1.1
+Release: 1.2
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -105,6 +105,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 208-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 208-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:37:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:37:06 -0500
Subject: rpms/yaboot/devel yaboot.spec,1.33,1.34
Message-ID: <200602110637.k1B6b6Cw012629@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12601

Modified Files:
	yaboot.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- yaboot.spec	9 Feb 2006 17:39:05 -0000	1.33
+++ yaboot.spec	11 Feb 2006 06:37:03 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.17
+Release: 0.17.1
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -108,6 +108,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.17.1
+- bump again for double-long bug on ppc(64)
+
 * Thu Feb 09 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-0.17
 - Fix ofpath for multi-disk G5 (#180182)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:37:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:37:21 -0500
Subject: rpms/yelp/devel yelp.spec,1.50,1.51
Message-ID: <200602110637.k1B6bLB4012790@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12760

Modified Files:
	yelp.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- yelp.spec	7 Feb 2006 14:43:40 -0000	1.50
+++ yelp.spec	11 Feb 2006 06:37:18 -0000	1.51
@@ -13,7 +13,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.13.4
-Release: 1.1
+Release: 1.2
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-1.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:37:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:37:31 -0500
Subject: rpms/ypbind/devel ypbind.spec,1.22,1.23
Message-ID: <200602110637.k1B6bVTH012922@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12891

Modified Files:
	ypbind.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ypbind.spec	7 Feb 2006 14:43:49 -0000	1.22
+++ ypbind.spec	11 Feb 2006 06:37:29 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.17.2
-Release: 5.2
+Release: 5.2.1
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -84,6 +84,9 @@
 %doc README NEWS
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3:1.17.2-5.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3:1.17.2-5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:37:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:37:46 -0500
Subject: rpms/ypserv/devel ypserv.spec,1.27,1.28
Message-ID: <200602110637.k1B6bkg1013048@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13018

Modified Files:
	ypserv.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ypserv.spec	7 Feb 2006 14:44:01 -0000	1.27
+++ ypserv.spec	11 Feb 2006 06:37:44 -0000	1.28
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.13
-Release: 10.1
+Release: 10.2
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -138,6 +138,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-10.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13-10.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:37:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:37:56 -0500
Subject: rpms/yp-tools/devel yp-tools.spec,1.18,1.19
Message-ID: <200602110637.k1B6bu95013180@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/yp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13147

Modified Files:
	yp-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: yp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- yp-tools.spec	7 Feb 2006 14:44:09 -0000	1.18
+++ yp-tools.spec	11 Feb 2006 06:37:54 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
 Version: 2.8
-Release: 8.2
+Release: 8.2.1
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
@@ -61,6 +61,9 @@
 %dir /var/yp
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8-8.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8-8.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:38:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:38:07 -0500
Subject: rpms/zip/devel zip.spec,1.21,1.22
Message-ID: <200602110638.k1B6c7oW013304@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13275

Modified Files:
	zip.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: zip.spec
===================================================================
RCS file: /cvs/dist/rpms/zip/devel/zip.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- zip.spec	7 Feb 2006 14:44:17 -0000	1.21
+++ zip.spec	11 Feb 2006 06:38:04 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: A file compression and packaging utility compatible with PKZIP.
 Name: zip
 Version: 2.31
-Release: 1.2
+Release: 1.2.1
 License: distributable
 Group: Applications/Archiving
 Source: http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz
@@ -66,6 +66,9 @@
 %{_mandir}/man1/zip.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.31-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.31-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:38:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:38:21 -0500
Subject: rpms/zisofs-tools/devel zisofs-tools.spec,1.13,1.14
Message-ID: <200602110638.k1B6cLhs013463@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zisofs-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13431

Modified Files:
	zisofs-tools.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: zisofs-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/zisofs-tools/devel/zisofs-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zisofs-tools.spec	7 Feb 2006 14:44:25 -0000	1.13
+++ zisofs-tools.spec	11 Feb 2006 06:38:18 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: Utilities for creating compressed CD-ROM filesystems.
 Name: zisofs-tools
 Version: 1.0.6
-Release: 3.2
+Release: 3.2.1
 License: GPL
 Group: Applications/System
 URL: http://www.kernel.org/pub/linux/utils/fs/zisofs/
@@ -35,6 +35,9 @@
 %{_mandir}/man1/mkzftree.1*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-3.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.6-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:38:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:38:32 -0500
Subject: rpms/zlib/devel zlib.spec,1.25,1.26
Message-ID: <200602110638.k1B6cW3n013587@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zlib/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13558

Modified Files:
	zlib.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: zlib.spec
===================================================================
RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- zlib.spec	7 Feb 2006 14:44:34 -0000	1.25
+++ zlib.spec	11 Feb 2006 06:38:29 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
 Version: 1.2.3
-Release: 1.2
+Release: 1.2.1
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
@@ -77,6 +77,9 @@
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2.1
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.2.3-1.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:38:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:38:44 -0500
Subject: rpms/zsh/devel zsh.spec,1.24,1.25
Message-ID: <200602110638.k1B6ciE5013738@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/zsh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13706

Modified Files:
	zsh.spec 
Log Message:
bump for bug in double-long on ppc(64)


Index: zsh.spec
===================================================================
RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zsh.spec	7 Feb 2006 06:39:33 -0000	1.24
+++ zsh.spec	11 Feb 2006 06:38:42 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: A powerful interactive shell
 Name: zsh
 Version: 4.2.5
-Release: 1.2.1
+Release: 1.2.2
 License: BSD
 URL: http://zsh.sunsite.dk/
 Group: System Environment/Shells
@@ -140,6 +140,9 @@
 %doc Doc/zsh/*.html
 
 %changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.5-1.2.2
+- bump again for double-long bug on ppc(64)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - %{version}-%{release}
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:52:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:52:28 -0500
Subject: rpms/mod_auth_pgsql/devel mod_auth_pgsql.spec,1.23,1.24
Message-ID: <200602110652.k1B6qSL9032299@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mod_auth_pgsql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32266

Modified Files:
	mod_auth_pgsql.spec 
Log Message:
bump release again


Index: mod_auth_pgsql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_auth_pgsql.spec	11 Feb 2006 04:37:21 -0000	1.23
+++ mod_auth_pgsql.spec	11 Feb 2006 06:52:26 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Basic authentication for the Apache web server using a PostgreSQL database.
 Name: mod_auth_pgsql
 Version: 2.0.3
-Release: 2.2
+Release: 2.3
 Group: System Environment/Daemons
 URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/
 Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz
@@ -51,7 +51,7 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.3
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.0.3-2.1



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:54:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:54:06 -0500
Subject: rpms/php/devel php.spec,1.105,1.106
Message-ID: <200602110654.k1B6s6V2000601@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	php.spec 
Log Message:
bump release again


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- php.spec	11 Feb 2006 05:09:07 -0000	1.105
+++ php.spec	11 Feb 2006 06:54:03 -0000	1.106
@@ -3,7 +3,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 4.2
+Release: 4.3
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -537,7 +537,7 @@
 %files pdo -f files.pdo
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.1.2-4.2
+* 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



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:55:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:55:56 -0500
Subject: rpms/xorg-x11-drv-tdfx/devel xorg-x11-drv-tdfx.spec,1.8,1.9
Message-ID: <200602110655.k1B6tuUn001478@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-drv-tdfx/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1449

Modified Files:
	xorg-x11-drv-tdfx.spec 
Log Message:
bump release again


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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-tdfx.spec	11 Feb 2006 01:51:19 -0000	1.8
+++ xorg-x11-drv-tdfx.spec	11 Feb 2006 06:55:53 -0000	1.9
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 tdfx video driver
 Name:      xorg-x11-drv-tdfx
 Version:   1.1.1.3
-Release:   1.2
+Release:   1.3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   tdfx.xinf
@@ -57,7 +57,7 @@
 %{_mandir}/man4/tdfx.4*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.3
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.1.3-1.1



From fedora-cvs-commits at redhat.com  Sat Feb 11 06:57:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 01:57:16 -0500
Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.17,
	1.18
Message-ID: <200602110657.k1B6vGoP002141@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2111

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
bump release again


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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-proto-devel.spec	11 Feb 2006 06:24:56 -0000	1.17
+++ xorg-x11-proto-devel.spec	11 Feb 2006 06:57:13 -0000	1.18
@@ -6,7 +6,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 2.2
+Release: 2.3
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -278,7 +278,7 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.3
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.1



From fedora-cvs-commits at redhat.com  Sat Feb 11 09:19:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 04:19:36 -0500
Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.19,1.20
Message-ID: <200602110919.k1B9Jah9002760@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2689

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-55.fc5



Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- compat-gcc-32.spec	11 Feb 2006 02:18:08 -0000	1.19
+++ compat-gcc-32.spec	11 Feb 2006 09:19:33 -0000	1.20
@@ -2,7 +2,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 54.fc5
+%define gcc_release 55.fc5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -21,7 +21,7 @@
 Summary: The compatibility GNU Compiler Collection
 Name: compat-gcc-32
 Version: %{gcc_version}
-Release: %{gcc_release}.2
+Release: %{gcc_release}
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{gcc_version}-%{DATE}.tar.bz2
@@ -271,9 +271,11 @@
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 %ifarch %{ix86}
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=pentium4/-mcpu=i686/g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic/-mcpu=i686/g'`
 %endif
 %ifarch x86_64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=nocona//g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic//g'`
 %endif
 %ifarch sparc sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
@@ -634,6 +636,10 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
+* Sat Feb 11 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-55.fc5
+- replace -mtune=generic in $RPM_OPT_FLAGS with something that
+  GCC 3.2.3 groks
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-54.fc5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 12:20:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 07:20:39 -0500
Subject: rpms/kernel-xen/devel/configs config-xen-xenU,1.2,1.3
Message-ID: <200602111220.k1BCKdjO026170@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-xenU 
Log Message:
disable TRASH & MICROCODE devices form x86_64 guest


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-xenU,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-xenU	21 Dec 2005 11:24:56 -0000	1.2
+++ config-xen-xenU	11 Feb 2006 12:20:37 -0000	1.3
@@ -77,3 +77,5 @@
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 
 # CONFIG_TOSHIBA is not set
+# CONFIG_CRASH is not set
+# CONFIG_MICROCODE is not set



From fedora-cvs-commits at redhat.com  Sat Feb 11 15:48:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 10:48:49 -0500
Subject: rpms/glib2/devel .cvsignore, 1.45, 1.46 glib2.spec, 1.77,
	1.78 sources, 1.45, 1.46
Message-ID: <200602111548.k1BFmnbs008366@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.9.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	27 Jan 2006 14:53:27 -0000	1.45
+++ .cvsignore	11 Feb 2006 15:48:45 -0000	1.46
@@ -30,3 +30,4 @@
 glib-2.9.3.tar.bz2
 glib-2.9.4.tar.bz2
 glib-2.9.5.tar.bz2
+glib-2.9.6.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- glib2.spec	11 Feb 2006 03:10:40 -0000	1.77
+++ glib2.spec	11 Feb 2006 15:48:45 -0000	1.78
@@ -1,7 +1,12 @@
 Summary: A library of handy utility functions
 Name: glib2
+<<<<<<< glib2.spec
+Version: 2.9.6
+Release: 1
+=======
 Version: 2.9.5
 Release: 1.2
+>>>>>>> 1.77
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
@@ -96,6 +101,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sat Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1
+- Update to 2.9.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.9.5-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	27 Jan 2006 14:53:27 -0000	1.45
+++ sources	11 Feb 2006 15:48:45 -0000	1.46
@@ -1 +1 @@
-d92467e6a644341d704a5d0e3af8c06f  glib-2.9.5.tar.bz2
+2ba1146e767454e14ac0788187c35892  glib-2.9.6.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 15:49:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 10:49:53 -0500
Subject: rpms/glib2/devel glib2.spec,1.78,1.79
Message-ID: <200602111549.k1BFnrTl008889@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glib2.spec 
Log Message:
2.9.6



Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- glib2.spec	11 Feb 2006 15:48:45 -0000	1.78
+++ glib2.spec	11 Feb 2006 15:49:50 -0000	1.79
@@ -1,12 +1,7 @@
 Summary: A library of handy utility functions
 Name: glib2
-<<<<<<< glib2.spec
 Version: 2.9.6
 Release: 1
-=======
-Version: 2.9.5
-Release: 1.2
->>>>>>> 1.77
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 16:54:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 11:54:44 -0500
Subject: rpms/glade2/devel glade2.spec,1.20,1.21
Message-ID: <200602111654.k1BGsiG9017052@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	glade2.spec 
Log Message:
Remove redundant requires



Index: glade2.spec
===================================================================
RCS file: /cvs/dist/rpms/glade2/devel/glade2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- glade2.spec	11 Feb 2006 03:09:48 -0000	1.20
+++ glade2.spec	11 Feb 2006 16:54:40 -0000	1.21
@@ -10,22 +10,19 @@
 %define libgnomeprint22_version 2.2.0
 %define libgnomeprintui22_version 2.2.0
 %define desktop_file_utils_version 0.2.90
-%define gail_version 0.17
 
 %define po_package glade-2.0
 
 Summary:        A GTK+ GUI builder.
 Name:           glade2
 Version:        2.12.1
-Release: 1.2.1
+Release: 	2
 License:        GPL
 URL:            http://glade.gnome.org/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/glade/2.6/glade-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Group:          Development/Tools
 
-Requires: gail-devel >= %{gail_version}
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -83,6 +80,10 @@
 %{_bindir}/*
 
 %changelog
+* 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
+
 * 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  Sat Feb 11 18:39:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 13:39:23 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.90, 1.91 mkinitrd.spec, 1.99,
	1.100 sources, 1.96, 1.97
Message-ID: <200602111839.k1BIdN9h015877@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15855

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.22-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore	4 Feb 2006 00:11:03 -0000	1.90
+++ .cvsignore	11 Feb 2006 18:39:21 -0000	1.91
@@ -1 +1 @@
-mkinitrd-5.0.21.tar.bz2
+mkinitrd-5.0.22.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mkinitrd.spec	4 Feb 2006 00:11:03 -0000	1.99
+++ mkinitrd.spec	11 Feb 2006 18:39:21 -0000	1.100
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.21
+Version: 5.0.22
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,18 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Sat Feb 11 2006 Peter Jones <pjones at redhat.com> - 5.0.22-1
+- formatting cleanups
+- prefix partition number with "p" for partitions on dmraid
+- add support for disabling partitions which overlap with partitions on
+  dm devices.
+- add multipath support
+- fix dm creation ordering and partition detection
+- add "network" command (katzj)
+- add nfsroot support (katzj)
+- add iscsi support (katzj)
+- put "showlabels" back into nash
+
 * Tue Feb  3 2006 Peter Jones <pjones at redhat.com> - 5.0.21-1
 - add "mount -o bind" support and "mount --move" support (#109366, patch
   from Kasper Dupont)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- sources	4 Feb 2006 00:11:03 -0000	1.96
+++ sources	11 Feb 2006 18:39:21 -0000	1.97
@@ -1 +1 @@
-ea9ac86cc1ad5828e41df0c76a420265  mkinitrd-5.0.21.tar.bz2
+ba56a92a34fb7b22cebac0d2249cf980  mkinitrd-5.0.22.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:07:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:07:33 -0500
Subject: rpms/kernel-xen/devel/configs config-xen-generic, 1.2,
	1.3 config-xen-xenU, 1.3, 1.4
Message-ID: <200602112007.k1BK7Xx7020557@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-xen-generic config-xen-xenU 
Log Message:
x86_64 xen compilation & i686 PAE xennet fix


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-xen-generic	21 Dec 2005 11:24:56 -0000	1.2
+++ config-xen-generic	11 Feb 2006 20:07:30 -0000	1.3
@@ -107,3 +107,4 @@
 # kexec does not work with Xen right now.
 #
 # CONFIG_KEXEC is not set
+# CONFIG_CRASH is not set


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-xenU,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-xenU	11 Feb 2006 12:20:37 -0000	1.3
+++ config-xen-xenU	11 Feb 2006 20:07:30 -0000	1.4
@@ -77,5 +77,4 @@
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 
 # CONFIG_TOSHIBA is not set
-# CONFIG_CRASH is not set
 # CONFIG_MICROCODE is not set



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:07:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:07:33 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.62,
	1.63 linux-2.6.14-xen-compile-fixes.patch, 1.3, 1.4
Message-ID: <200602112007.k1BK7Xur020551@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec linux-2.6.14-xen-compile-fixes.patch 
Log Message:
x86_64 xen compilation & i686 PAE xennet fix


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kernel-xen.spec	11 Feb 2006 03:31:22 -0000	1.62
+++ kernel-xen.spec	11 Feb 2006 20:07:30 -0000	1.63
@@ -1577,6 +1577,9 @@
 %endif
 
 %changelog
+* Sat Feb 11 2006 Juan Quintela <quintela at redhat.com>
+- i686 xen PAE xennet fix.
+
 * Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
 - rebase 1.1927.
 - added xen smp fixes.

linux-2.6.14-xen-compile-fixes.patch:
 linux-2.6.15.new/arch/i386/mm/init-xen.c          |    1 +
 linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c |    9 +++++++++
 2 files changed, 10 insertions(+)

Index: linux-2.6.14-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 03:31:22 -0000	1.3
+++ linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 20:07:30 -0000	1.4
@@ -17,3 +17,14 @@
  void smp_local_timer_interrupt(struct pt_regs *regs)
  {
  	profile_tick(CPU_PROFILING, regs);
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c
+--- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c	2006-02-11 19:15:39.000000000 +0100
++++ linux-2.6.15.new/arch/i386/mm/init-xen.c	2006-02-11 16:24:12.000000000 +0100
+@@ -459,6 +459,7 @@ void zap_low_mappings (void)
+ 
+ static int disable_nx __initdata = 0;
+ u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
++EXPORT_SYMBOL(__supported_pte_mask);
+ 
+ /*
+  * noexec = on|off



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:20:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:20:40 -0500
Subject: rpms/kernel-xen/devel linux-2.6.14-xen-compile-fixes.patch,1.4,1.5
Message-ID: <200602112020.k1BKKea6006378@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	linux-2.6.14-xen-compile-fixes.patch 
Log Message:
really, really fix the ack_bad_irq x86_64 xen

linux-2.6.14-xen-compile-fixes.patch:
 linux-2.6.15.new/arch/i386/mm/init-xen.c             |    1 +
 linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c    |    9 +++++++++
 linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c |   11 +++++++++++
 3 files changed, 21 insertions(+)

Index: linux-2.6.14-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 20:07:30 -0000	1.4
+++ linux-2.6.14-xen-compile-fixes.patch	11 Feb 2006 20:20:36 -0000	1.5
@@ -28,3 +28,24 @@
  
  /*
   * noexec = on|off
+diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c
+--- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig	2006-02-11 20:17:49.000000000 +0100
++++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c	2006-02-11 20:18:09.000000000 +0100
+@@ -39,6 +39,17 @@ extern struct genapic apic_xen;
+ struct genapic *genapic = &apic_xen;
+ #endif
+ 
++#ifndef CONFIG_X86_LOCAL_APIC
++/*
++ * 'what should we do if we get a hw irq event on an illegal vector'.
++ * each architecture has to answer this themselves.
++ */
++void ack_bad_irq(unsigned int irq)
++{
++        printk("unexpected IRQ trap at vector %02x\n", irq);
++}
++#endif
++
+ 
+ /*
+  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:32:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:32:26 -0500
Subject: rpms/gtk2/devel .cvsignore, 1.44, 1.45 gtk2.spec, 1.121,
	1.122 sources, 1.47, 1.48
Message-ID: <200602112032.k1BKWQSZ003146@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.8.12



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	27 Jan 2006 18:23:58 -0000	1.44
+++ .cvsignore	11 Feb 2006 20:32:23 -0000	1.45
@@ -27,3 +27,4 @@
 gtk+-2.8.9.tar.bz2
 gtk+-2.8.10.tar.bz2
 gtk+-2.8.11.tar.bz2
+gtk+-2.8.12.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gtk2.spec	11 Feb 2006 03:21:53 -0000	1.121
+++ gtk2.spec	11 Feb 2006 20:32:23 -0000	1.122
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.11
+%define base_version 2.8.12
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
@@ -27,12 +27,6 @@
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
 Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
-# Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320
-# fixed in 2.8.12
-Patch4: render-avoid-repeat.patch
-# Fix a double free in the file chooser
-# fixed in 2.8.12
-Patch5: gtk+-2.8.11-double-free.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
 BuildPrereq: pango-devel >= %{pango_version}
@@ -96,8 +90,6 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .inputmethod
 %patch3 -p1 -b .set-invisible-char-to-bullet
-%patch4 -p1 -b .render-avoid-repeat
-%patch5 -p1 -b .double-free
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -267,6 +259,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.12-1
+- Update to 2.8.12
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.11-7.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	27 Jan 2006 18:23:58 -0000	1.47
+++ sources	11 Feb 2006 20:32:23 -0000	1.48
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-921ba85da341e52f0994f8fb569f1c61  gtk+-2.8.11.tar.bz2
+bdd3b950e4a3c65d61bceed9149888a9  gtk+-2.8.12.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:40:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:40:56 -0500
Subject: rpms/librsvg2/devel .cvsignore, 1.20, 1.21 librsvg2.spec, 1.38,
	1.39 sources, 1.20, 1.21
Message-ID: <200602112040.k1BKeuV0003310@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3295

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.13.93



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	7 Feb 2006 03:35:34 -0000	1.20
+++ .cvsignore	11 Feb 2006 20:40:54 -0000	1.21
@@ -9,3 +9,4 @@
 librsvg-2.13.3.tar.bz2
 librsvg-2.13.5.tar.bz2
 librsvg-2.13.92.tar.bz2
+librsvg-2.13.93.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- librsvg2.spec	11 Feb 2006 04:11:56 -0000	1.38
+++ librsvg2.spec	11 Feb 2006 20:40:54 -0000	1.39
@@ -12,8 +12,8 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
-Version: 2.13.92
-Release: 1.1
+Version: 2.13.93
+Release: 1
 
 License: 	LGPL
 Group: System Environment/Libraries
@@ -121,6 +121,9 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Feb 11 2006 Matthias Clasen <mclasen at redhat.com> 2.13.93-1
+- Update to 2.13.93
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.92-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	7 Feb 2006 03:35:34 -0000	1.20
+++ sources	11 Feb 2006 20:40:54 -0000	1.21
@@ -1 +1 @@
-abcf456c439613fa46b07aa14ce7ccc9  librsvg-2.13.92.tar.bz2
+e1e83ee7b54be27a2e2acb6a73398a48  librsvg-2.13.93.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:45:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:45:39 -0500
Subject: rpms/pango/devel .cvsignore, 1.27, 1.28 pango.spec, 1.59,
	1.60 sources, 1.27, 1.28
Message-ID: <200602112045.k1BKjdlL004650@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3602

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.11.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	6 Feb 2006 16:23:18 -0000	1.27
+++ .cvsignore	11 Feb 2006 20:45:37 -0000	1.28
@@ -11,3 +11,4 @@
 pango-1.11.2.tar.bz2
 pango-1.11.3.tar.bz2
 pango-1.11.4.tar.bz2
+pango-1.11.5.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- pango.spec	11 Feb 2006 04:56:16 -0000	1.59
+++ pango.spec	11 Feb 2006 20:45:37 -0000	1.60
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.11.4
-Release: 1.2
+Version: 1.11.5
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Mon Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-1
+- Update to 1.11.5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.4-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	6 Feb 2006 16:23:18 -0000	1.27
+++ sources	11 Feb 2006 20:45:37 -0000	1.28
@@ -1 +1 @@
-eb605a207bcc44ad7554c56c073aa17b  pango-1.11.4.tar.bz2
+f3b0d6211679664720d20410069757a4  pango-1.11.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 11 20:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 15:54:03 -0500
Subject: rpms/vte/devel .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 vte.spec,
	1.59, 1.60
Message-ID: <200602112054.k1BKs3dB016563@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16527

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.11.18



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Jan 2006 03:09:54 -0000	1.31
+++ .cvsignore	11 Feb 2006 20:54:01 -0000	1.32
@@ -3,3 +3,4 @@
 vte-0.11.15.tar.bz2
 vte-0.11.16.tar.bz2
 vte-0.11.17.tar.bz2
+vte-0.11.18.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	31 Jan 2006 03:09:54 -0000	1.31
+++ sources	11 Feb 2006 20:54:01 -0000	1.32
@@ -1 +1 @@
-bbe9710eca23984c884426a5d915f6eb  vte-0.11.17.tar.bz2
+e808006c365fddca611960b2efaef6a5  vte-0.11.18.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- vte.spec	11 Feb 2006 06:01:55 -0000	1.59
+++ vte.spec	11 Feb 2006 20:54:01 -0000	1.60
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.11.17
-Release: 1.fc5.1.2
+Version: 0.11.18
+Release: 1.fc5.1
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> 0.11.18-1
+- Update to 0.11.18
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.11.17-1.fc5.1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 21:05:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 16:05:49 -0500
Subject: rpms/cpufreq-utils/devel cpufreq-utils.spec,1.22,1.23
Message-ID: <200602112105.k1BL5nKM026889@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	cpufreq-utils.spec 
Log Message:
rebuild


Index: cpufreq-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/cpufreq-utils/devel/cpufreq-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cpufreq-utils.spec	9 Feb 2006 06:21:09 -0000	1.22
+++ cpufreq-utils.spec	11 Feb 2006 21:05:35 -0000	1.23
@@ -11,7 +11,7 @@
 BuildRequires:  sysfsutils-devel
 # pulls in automake and autoconf
 BuildRequires:  libtool
-ExclusiveArch:  %{ix86} x86_64 ppc ppc64 ppc64iseries
+ExclusiveArch:  %{ix86} x86_64 ppc ppc64
 
 %description
 cpufreq-utils contains several utilities that can be used to control
@@ -81,6 +81,9 @@
 %{_mandir}/man1/cpufreq-set.1*
 
 %changelog
+* Sat Feb 11 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 21:07:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 16:07:28 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git10.bz2.sign, NONE,
	1.1 .cvsignore, 1.345, 1.346 kernel-2.6.spec, 1.1933,
	1.1934 linux-2.6-compile-fixes.patch, 1.52, 1.53 sources,
	1.287, 1.288 upstream, 1.261,
	1.262 patch-2.6.16-rc2-git9.bz2.sign, 1.1, NONE
Message-ID: <200602112107.k1BL7S2W027226@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	patch-2.6.16-rc2-git10.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git9.bz2.sign 
Log Message:
git10



--- NEW FILE patch-2.6.16-rc2-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD7YwnyGugalF9Dw4RAmEtAKCMnEKVSzl7EEwAsBNptDNloVGR7gCgjc1k
QPK7bBKo2u2v4Hh233MAaEU=
=brDP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- .cvsignore	10 Feb 2006 19:50:14 -0000	1.345
+++ .cvsignore	11 Feb 2006 21:07:24 -0000	1.346
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git9.bz2
+patch-2.6.16-rc2-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1933
retrieving revision 1.1934
diff -u -r1.1933 -r1.1934
--- kernel-2.6.spec	10 Feb 2006 19:50:14 -0000	1.1933
+++ kernel-2.6.spec	11 Feb 2006 21:07:24 -0000	1.1934
@@ -211,7 +211,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git9.bz2
+Patch2: patch-2.6.16-rc2-git10.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -959,7 +959,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
@@ -1534,6 +1534,9 @@
 %endif
 
 %changelog
+* Sat Feb 11 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git10
+
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git8 & -git9
 - Begin the kernel-xen & kernel merge by merging the easy bits.

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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- linux-2.6-compile-fixes.patch	10 Feb 2006 21:28:00 -0000	1.52
+++ linux-2.6-compile-fixes.patch	11 Feb 2006 21:07:24 -0000	1.53
@@ -1,16 +0,0 @@
-
-arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
-include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~	2006-02-10 12:47:57.000000000 -0500
-+++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c	2006-02-10 12:48:05.000000000 -0500
-@@ -196,7 +196,4 @@ sys32_sigaction(int sig, const struct ol
- }
- 
--int
--do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
--
- asmlinkage long
- sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- sources	10 Feb 2006 19:50:15 -0000	1.287
+++ sources	11 Feb 2006 21:07:24 -0000	1.288
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-2372504ca717972c7e099ee4da5080bb  patch-2.6.16-rc2-git9.bz2
+d307d9bd99e8cb36bbde3ba6e8ecb2b0  patch-2.6.16-rc2-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- upstream	10 Feb 2006 19:50:15 -0000	1.261
+++ upstream	11 Feb 2006 21:07:24 -0000	1.262
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git9.bz2
+patch-2.6.16-rc2-git10.bz2


--- patch-2.6.16-rc2-git9.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb 11 21:16:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 16:16:13 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.63,1.64
Message-ID: <200602112116.k1BLGDvP003630@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
enable all archs as in the main kernel


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kernel-xen.spec	11 Feb 2006 20:07:30 -0000	1.63
+++ kernel-xen.spec	11 Feb 2006 21:16:10 -0000	1.64
@@ -160,8 +160,7 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch: noarch x86_64 ppc64
+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  Sat Feb 11 21:38:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 16:38:31 -0500
Subject: rpms/cpuspeed/devel cpuspeed.spec,1.29,1.30
Message-ID: <200602112138.k1BLcVeh018575@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18543

Modified Files:
	cpuspeed.spec 
Log Message:
rebuild


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cpuspeed.spec	9 Feb 2006 06:21:21 -0000	1.29
+++ cpuspeed.spec	11 Feb 2006 21:38:27 -0000	1.30
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Sat Feb 11 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Sat Feb 11 22:16:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 17:16:14 -0500
Subject: rpms/fontconfig/devel .cvsignore, 1.19, 1.20 fontconfig.spec, 1.69,
	1.70 sources, 1.20, 1.21
Message-ID: <200602112216.k1BMGE3n017379@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
newer snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 Feb 2006 14:42:21 -0000	1.19
+++ .cvsignore	11 Feb 2006 22:16:10 -0000	1.20
@@ -4,3 +4,4 @@
 fontconfig-2.3.93.cvs20060131.tar.gz
 fontconfig-2.3.93.cvs20060207.tar.gz
 fontconfig-2.3.93.cvs20060208.tar.gz
+fontconfig-2.3.93.cvs20060211.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- fontconfig.spec	11 Feb 2006 02:45:06 -0000	1.69
+++ fontconfig.spec	11 Feb 2006 22:16:10 -0000	1.70
@@ -2,8 +2,8 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93.cvs20060208
-Release: 1.1
+Version: 2.3.93.cvs20060211
+Release: 1
 License: MIT
 Group: System Environment/Libraries
 Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -135,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060211-1
+- Newer cvs snapshot
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.93.cvs20060208-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	8 Feb 2006 14:42:21 -0000	1.20
+++ sources	11 Feb 2006 22:16:10 -0000	1.21
@@ -1 +1 @@
-b5580c9698cec1382955e9cebcf4a636  fontconfig-2.3.93.cvs20060208.tar.gz
+e1729d312e6ea35434b5cb92f5a5163d  fontconfig-2.3.93.cvs20060211.tar.gz



From fedora-cvs-commits at redhat.com  Sat Feb 11 22:35:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 17:35:50 -0500
Subject: rpms/fontconfig/devel
	fontconfig-2.3.93.cvs20060211-move-user-cache.patch, NONE,
	1.1 fontconfig.spec, 1.70, 1.71
Message-ID: <200602112235.k1BMZoX2024386@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	fontconfig.spec 
Added Files:
	fontconfig-2.3.93.cvs20060211-move-user-cache.patch 
Log Message:
ifix patch


fontconfig-2.3.93.cvs20060211-move-user-cache.patch:
 fontconfig/fontconfig.h |    3 ++-
 src/fccache.c           |   17 ++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE fontconfig-2.3.93.cvs20060211-move-user-cache.patch ---
--- fontconfig-2.3.93.cvs20060211/src/fccache.c.move-user-cache	2006-02-11 17:30:22.000000000 -0500
+++ fontconfig-2.3.93.cvs20060211/src/fccache.c	2006-02-11 17:32:25.000000000 -0500
@@ -430,7 +430,22 @@
 	return FcFalse;
 
     if (!FcAtomicLock (atomic))
-	goto bail1;
+    {
+        FcChar8 *cache_dir; +
+        cache_dir = FcStrDirname (cache_file);
+
+        /* quick last ditch effort to try to make the dir in the
+         * off chance it doesn't exist.  This doesn't support
+         * making more than one component of the path and is
+         * broken in the WIN32 case. 
+         */
+        mkdir ((char *) cache_dir, 0777);
+        FcStrFree (cache_dir);
+
+        if (!FcAtomicLock (atomic))
+            goto bail1;
+    }
+
     fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT | O_BINARY, 
 	       S_IRUSR | S_IWUSR);
     if (fd == -1)
--- fontconfig-2.3.93.cvs20060211/src/fccfg.c.move-user-cache	2006-02-11 17:32:43.000000000 -0500
+++ fontconfig-2.3.93.cvs20060211/src/fccfg.c	2006-02-11 17:33:43.000000000 -0500
@@ -79,7 +79,7 @@
 
     config->cache = 0;
     if (FcConfigHome())
-	if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_FILE)))
+        if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_DIR "/" FC_USER_CACHE_FILE)))
 	    goto bail8;
 
 #ifdef _WIN32
--- fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h.move-user-cache	2006-02-11 17:34:11.000000000 -0500
+++ fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h	2006-02-11 17:34:46.000000000 -0500
@@ -107,8 +107,9 @@
 #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
 #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
 #define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
+#define FC_USER_CACHE_DIR           ".rh-fontconfig"
+
 
-/* Adjust outline rasterizer */
 #define FC_CHAR_WIDTH	    "charwidth"	/* Int */
 #define FC_CHAR_HEIGHT	    "charheight"/* Int */
 #define FC_MATRIX	    "matrix"    /* FcMatrix */


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- fontconfig.spec	11 Feb 2006 22:16:10 -0000	1.70
+++ fontconfig.spec	11 Feb 2006 22:35:48 -0000	1.71
@@ -13,7 +13,7 @@
 Source2: 50-no-hint-fonts.conf
 
 Patch1: fontconfig-2.3.93-defaultconfig.patch
-Patch2: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
+Patch2: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
 
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: expat-devel



From fedora-cvs-commits at redhat.com  Sat Feb 11 22:45:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 17:45:03 -0500
Subject: rpms/fontconfig/devel
	fontconfig-2.3.93.cvs20060211-move-user-cache.patch, 1.1, 1.2
Message-ID: <200602112245.k1BMj38S024515@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	fontconfig-2.3.93.cvs20060211-move-user-cache.patch 
Log Message:
fix patch


fontconfig-2.3.93.cvs20060211-move-user-cache.patch:
 fontconfig/fontconfig.h |    3 ++-
 src/fccache.c           |   17 ++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

Index: fontconfig-2.3.93.cvs20060211-move-user-cache.patch
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.93.cvs20060211-move-user-cache.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fontconfig-2.3.93.cvs20060211-move-user-cache.patch	11 Feb 2006 22:35:48 -0000	1.1
+++ fontconfig-2.3.93.cvs20060211-move-user-cache.patch	11 Feb 2006 22:45:00 -0000	1.2
@@ -1,12 +1,12 @@
---- fontconfig-2.3.93.cvs20060211/src/fccache.c.move-user-cache	2006-02-11 17:30:22.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/src/fccache.c	2006-02-11 17:32:25.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/src/fccache.c.move-user-cache	2006-02-11 15:59:04.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/src/fccache.c	2006-02-11 17:44:42.000000000 -0500
 @@ -430,7 +430,22 @@
  	return FcFalse;
  
      if (!FcAtomicLock (atomic))
 -	goto bail1;
 +    {
-+        FcChar8 *cache_dir; +
++        FcChar8 *cache_dir; 
 +        cache_dir = FcStrDirname (cache_file);
 +
 +        /* quick last ditch effort to try to make the dir in the
@@ -24,8 +24,8 @@
      fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT | O_BINARY, 
  	       S_IRUSR | S_IWUSR);
      if (fd == -1)
---- fontconfig-2.3.93.cvs20060211/src/fccfg.c.move-user-cache	2006-02-11 17:32:43.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/src/fccfg.c	2006-02-11 17:33:43.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/src/fccfg.c.move-user-cache	2006-02-07 15:06:40.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/src/fccfg.c	2006-02-11 17:40:36.000000000 -0500
 @@ -79,7 +79,7 @@
  
      config->cache = 0;
@@ -35,8 +35,8 @@
  	    goto bail8;
  
  #ifdef _WIN32
---- fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h.move-user-cache	2006-02-11 17:34:11.000000000 -0500
-+++ fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h	2006-02-11 17:34:46.000000000 -0500
+--- fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
++++ fontconfig-2.3.93.cvs20060211/fontconfig/fontconfig.h	2006-02-11 17:40:36.000000000 -0500
 @@ -107,8 +107,9 @@
  #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
  #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION



From fedora-cvs-commits at redhat.com  Sun Feb 12 01:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 20:42:45 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.85,1.86
Message-ID: <200602120142.k1C1gjZU028527@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28415

Modified Files:
	epiphany.spec 
Log Message:
Turn on zeroconf and NetworkManager support



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- epiphany.spec	7 Feb 2006 11:32:24 -0000	1.85
+++ epiphany.spec	12 Feb 2006 01:42:42 -0000	1.86
@@ -11,7 +11,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 1.9.6
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -36,6 +36,7 @@
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 BuildRequires: gnome-desktop-devel
 BuildRequires: startup-notification-devel
+BuildRequires: NetworkManager-devel
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
@@ -73,7 +74,7 @@
 %patch0 -p1 -b .homepage
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --enable-zeroconf --enable-network-manager
 make %{?_smp_mflags}
 
 %install
@@ -130,6 +131,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.6-3
+- turn on zeroconf and NetworkManager support
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 03:43:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 11 Feb 2006 22:43:52 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.86,1.87
Message-ID: <200602120343.k1C3hqx3015429@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15349

Modified Files:
	epiphany.spec 
Log Message:
no nm on s390



Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- epiphany.spec	12 Feb 2006 01:42:42 -0000	1.86
+++ epiphany.spec	12 Feb 2006 03:43:49 -0000	1.87
@@ -74,7 +74,11 @@
 %patch0 -p1 -b .homepage
 
 %build
-%configure --disable-scrollkeeper --enable-zeroconf --enable-network-manager
+%ifnarch s390 s390x
+%define enable_nm --enable-network-manager
+%endif
+
+%configure --disable-scrollkeeper --enable-zeroconf %{enable_nm} 
 make %{?_smp_mflags}
 
 %install



From fedora-cvs-commits at redhat.com  Sun Feb 12 06:07:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 01:07:07 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.5,1.6
Message-ID: <200602120607.k1C677XQ016784@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16728

Modified Files:
	wpa_supplicant.spec 
Log Message:
* Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-2
- Move initscript to /etc/rc.d/init.d




Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wpa_supplicant.spec	11 Feb 2006 06:06:12 -0000	1.5
+++ wpa_supplicant.spec	12 Feb 2006 06:07:03 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Version: 0.5.1
-Release: 1.2
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -44,9 +44,9 @@
 rm -rf %{buildroot}
 
 # init scripts
-install -d %{buildroot}/%{_sysconfdir}/init.d
+install -d %{buildroot}/%{_sysconfdir}/rc.d/init.d
 install -d %{buildroot}/%{_sysconfdir}/sysconfig
-install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/init.d/%{name}
+install -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/rc.d/init.d/%{name}
 install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
 # config
@@ -85,7 +85,7 @@
 %doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf doc
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%{_sysconfdir}/init.d/%{name}
+%{_sysconfdir}/rc.d/init.d/%{name}
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
 %{_localstatedir}/run/%{name}
@@ -95,6 +95,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-2
+- Move initscript to /etc/rc.d/init.d
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 06:11:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 01:11:19 -0500
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.24,
	1.25 gnome-icon-theme.spec, 1.38, 1.39 sources, 1.26, 1.27
Message-ID: <200602120611.k1C6BJ1V018499@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18325

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
- Update to 2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	7 Feb 2006 18:52:17 -0000	1.24
+++ .cvsignore	12 Feb 2006 06:11:16 -0000	1.25
@@ -1,18 +1 @@
-external-icons.tar.gz
-gnome-icon-theme-2.7.90.tar.bz2
-gnome-icon-theme-2.8.0.tar.bz2
-gnome-icon-theme-2.9.90.tar.bz2
-gnome-icon-theme-2.9.91.tar.bz2
-gnome-icon-theme-2.9.92.tar.bz2
-gnome-icon-theme-2.10.1.tar.bz2
-external-icons-2.10.1.tar.gz
-external-icons-2.10.1-2.tar.gz
-gnome-icon-theme-2.12.0.tar.bz2
-gnome-icon-theme-2.12.1.tar.bz2
-gnome-icon-theme-2.13.2.tar.bz2
-gnome-icon-theme-2.13.4.tar.bz2
-gnome-icon-theme-2.13.5.tar.bz2
-gnome-icon-theme-2.13.5.1.tar.bz2
-gnome-icon-theme-2.13.7.tar.bz2
-external-icons-2.13.90-1.tar.gz
-external-icons-2.13.7.tar.gz
+gnome-icon-theme-2.14.0.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-icon-theme.spec	10 Feb 2006 03:32:52 -0000	1.38
+++ gnome-icon-theme.spec	12 Feb 2006 06:11:16 -0000	1.39
@@ -1,11 +1,8 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.13.7
-Release: 4
+Version: 2.14.0
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
-# the gnome-shutdown.png icons are upstream in 2.13.8
-Source1: external-icons-2.13.7.tar.gz
-Patch0: gnome-icon-theme-2.13.7-gnome-spinner.patch
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -19,24 +16,13 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gnome-spinner
 
 %build
 %configure --disable-hicolor-check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-#install the extra icons
-tar xzvf %{SOURCE1}
-cd external-icons
-cp -rf 16x16 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
-cp -rf 24x24 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
-cp -rf 32x32 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
-cp -rf 36x36 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
-cp -rf 48x48 $RPM_BUILD_ROOT%{_datadir}/icons/gnome/
-cp -rf hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
+make install DESTDIR=$RPM_BUILD_ROOT
 
 ## remove these bogus files
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
@@ -80,6 +66,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Sun Feb 12 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1
+- Update to 2.14.0
+
 * Thu Feb  9 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-4
 - Add better shutdown icon
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	10 Feb 2006 03:32:52 -0000	1.26
+++ sources	12 Feb 2006 06:11:16 -0000	1.27
@@ -1,3 +1 @@
-65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
-a5401d6f085979fe6601f2241743af86  gnome-icon-theme-2.12.1.tar.bz2
-ffb4dcac90e0e6d6d5a5d1dec957e54c  external-icons-2.13.7.tar.gz
+4eb273a0d51acc0340fcfc59a9214553  gnome-icon-theme-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 07:28:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 02:28:10 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git11.bz2.sign, NONE,
	1.1 .cvsignore, 1.346, 1.347 kernel-2.6.spec, 1.1934,
	1.1935 sources, 1.288, 1.289 upstream, 1.262, 1.263
Message-ID: <200602120728.k1C7SANv008783@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git11.bz2.sign 
Log Message:
git11



--- NEW FILE patch-2.6.16-rc2-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD7t1ryGugalF9Dw4RAuqyAJ96gzotIp/XntZ1/0XC5PwhRWr79ACfcvPL
CUoAYyhQ6viV1XZRE56wDuw=
=xJvn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- .cvsignore	11 Feb 2006 21:07:24 -0000	1.346
+++ .cvsignore	12 Feb 2006 07:28:07 -0000	1.347
@@ -3,4 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git10.bz2
+patch-2.6.16-rc2-git11.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1934
retrieving revision 1.1935
diff -u -r1.1934 -r1.1935
--- kernel-2.6.spec	11 Feb 2006 21:07:24 -0000	1.1934
+++ kernel-2.6.spec	12 Feb 2006 07:28:07 -0000	1.1935
@@ -211,7 +211,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git10.bz2
+Patch2: patch-2.6.16-rc2-git11.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -1534,6 +1534,9 @@
 %endif
 
 %changelog
+* Sun Feb 12 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git11
+
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- sources	11 Feb 2006 21:07:24 -0000	1.288
+++ sources	12 Feb 2006 07:28:08 -0000	1.289
@@ -1,3 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-d307d9bd99e8cb36bbde3ba6e8ecb2b0  patch-2.6.16-rc2-git10.bz2
+7f3f09bb84cf7e1ab6e30e7f8bf4ec9a  patch-2.6.16-rc2-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- upstream	11 Feb 2006 21:07:24 -0000	1.262
+++ upstream	12 Feb 2006 07:28:08 -0000	1.263
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git10.bz2
+patch-2.6.16-rc2-git11.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 07:28:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 02:28:36 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git10.bz2.sign,1.1,NONE
Message-ID: <200602120728.k1C7SaWm008968@cvs.devel.redhat.com>

Author: davej

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

Removed Files:
	patch-2.6.16-rc2-git10.bz2.sign 
Log Message:
dead sign



--- patch-2.6.16-rc2-git10.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 12 07:50:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 02:50:29 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1935,1.1936
Message-ID: <200602120750.k1C7oTWl028672@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
s390 broke (newfstatat)



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1935
retrieving revision 1.1936
diff -u -r1.1935 -r1.1936
--- kernel-2.6.spec	12 Feb 2006 07:28:07 -0000	1.1935
+++ kernel-2.6.spec	12 Feb 2006 07:50:26 -0000	1.1936
@@ -159,7 +159,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0



From fedora-cvs-commits at redhat.com  Sun Feb 12 15:55:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 10:55:32 -0500
Subject: rpms/mono/devel mono.spec,1.26,1.27
Message-ID: <200602121555.k1CFtWn4004227@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4191

Modified Files:
	mono.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-2
- Rebuild



Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mono.spec	7 Feb 2006 12:59:26 -0000	1.26
+++ mono.spec	12 Feb 2006 15:55:29 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.1.13.2
-Release:        1.1
+Release:        2
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -490,6 +490,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-2
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.1.13.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 16:14:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 11:14:10 -0500
Subject: rpms/mozilla/devel mozilla-1.7.12-dumpstack.patch, 1.1,
	1.2 mozilla.spec, 1.86, 1.87
Message-ID: <200602121614.k1CGEAwQ009174@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/mozilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9142

Modified Files:
	mozilla-1.7.12-dumpstack.patch mozilla.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 37:1.7.12-5
- Update dumpstack.patch to match upstream


mozilla-1.7.12-dumpstack.patch:
 nsStackFrameUnix.cpp  |   16 +++-------------
 nsTraceRefcntImpl.cpp |   25 ++++++-------------------
 2 files changed, 9 insertions(+), 32 deletions(-)

Index: mozilla-1.7.12-dumpstack.patch
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla-1.7.12-dumpstack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-1.7.12-dumpstack.patch	5 Feb 2006 16:12:46 -0000	1.1
+++ mozilla-1.7.12-dumpstack.patch	12 Feb 2006 16:14:06 -0000	1.2
@@ -1,25 +1,147 @@
-Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
+Index: xpcom/base/nsStackFrameUnix.cpp
 ===================================================================
 RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
-retrieving revision 1.12
-diff -d -u -p -r1.12 nsStackFrameUnix.cpp
---- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
-+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
-@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
+retrieving revision 1.11
+diff -d -u -p -6 -r1.11 nsStackFrameUnix.cpp
+--- xpcom/base/nsStackFrameUnix.cpp	8 Mar 2004 07:47:44 -0000	1.11
++++ xpcom/base/nsStackFrameUnix.cpp	12 Feb 2006 16:11:45 -0000
+@@ -75,31 +75,21 @@ void DemangleSymbol(const char * aSymbol
+         free(demangled);
+     }
+ #endif // MOZ_DEMANGLE_SYMBOLS
+ }
+ 
+ 
+-#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
++#if defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
+ 
+-#include <setjmp.h>
+-//
  
  void DumpStackToFile(FILE* aStream)
  {
-+  fprintf(aStream, "Stacktrace disabled for now.\n"
-+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
-+#if 0
-   jmp_buf jb;
-   setjmp(jb);
+-  jmp_buf jb;
+-  setjmp(jb);
+-
+   // Stack walking code courtesy Kipp's "leaky".
  
-@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
-               symbol, off, info.dli_fname, foff);
-     }
-   }
-+#endif
+-  // Get the frame pointer out of the jmp_buf
+-  void **bp = (void**)
+-#if defined(__i386) 
+-    (jb[0].__jmpbuf[JB_BP]);
+-#elif defined(PPC)
+-    (jb[0].__jmpbuf[JB_GPR1]);
+-#endif
++  // Get the frame pointer
++  void **bp = (void**) __builtin_frame_address(0);
+ 
+   int skip = 2;
+   for ( ; (void**)*bp > bp; bp = (void**)*bp) {
+     void *pc = *(bp+1);
+     if (--skip <= 0) {
+       Dl_info info;
+Index: xpcom/base/nsTraceRefcntImpl.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpcom/base/nsTraceRefcntImpl.cpp,v
+retrieving revision 1.93
+diff -d -u -p -6 -r1.93 nsTraceRefcntImpl.cpp
+--- xpcom/base/nsTraceRefcntImpl.cpp	11 Feb 2004 07:16:10 -0000	1.93
++++ xpcom/base/nsTraceRefcntImpl.cpp	12 Feb 2006 16:11:45 -0000
+@@ -47,25 +47,12 @@
+ #include "nsCOMPtr.h"
+ #include "nsCRT.h"
+ #include <math.h>
+ 
+ #if defined(_WIN32)
+ #include <windows.h>
+-#elif defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))
+-#include <setjmp.h>
+-
+-//
+-// On glibc 2.1, the Dl_info api defined in <dlfcn.h> is only exposed
+-// if __USE_GNU is defined.  I suppose its some kind of standards
+-// adherence thing.
+-//
+-#if (__GLIBC_MINOR__ >= 1) && !defined(__USE_GNU)
+-#define __USE_GNU
+-#endif
+-
+-#include <dlfcn.h>
+ #endif
+ 
+ #ifdef HAVE_LIBDL
+ #include <dlfcn.h>
+ #endif
+ 
+@@ -481,13 +468,13 @@ static PRIntn PR_CALLBACK DumpSerialNumb
+   return HT_ENUMERATE_NEXT;
+ }
+ 
+ 
+ #endif /* NS_BUILD_REFCNT_LOGGING */
+ 
+-nsresult
++NS_COM nsresult
+ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
+ {
+   nsresult rv = NS_OK;
+ #ifdef NS_BUILD_REFCNT_LOGGING
+   if (gBloatLog == nsnull || gBloatView == nsnull) {
+     return NS_ERROR_FAILURE;
+@@ -558,13 +545,13 @@ done:
+   gLogging = wasLogging;
+   UNLOCK_TRACELOG();
+ #endif
+   return rv;
+ }
+ 
+-void
++NS_COM void
+ nsTraceRefcntImpl::ResetStatistics()
+ {
+ #ifdef NS_BUILD_REFCNT_LOGGING
+   LOCK_TRACELOG();
+   if (gBloatView) {
+     PL_HashTableDestroy(gBloatView);
+@@ -847,23 +834,23 @@ static void InitTraceLog(void)
+ }
+ 
+ #endif
+ 
+ #if defined(_WIN32) && defined(_M_IX86) // WIN32 x86 stack walking code
+ #include "nsStackFrameWin.h"
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ // WIN32 x86 stack walking code
+ // i386 or PPC Linux stackwalking code or Solaris
+-#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
++#elif (defined(linux) && defined(__GNUC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
+ #include "nsStackFrameUnix.h"
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+   DumpStackToFile(aStream);
+ }
+ 
+ #elif defined(XP_MAC)
+@@ -957,13 +944,13 @@ nsTraceRefcntImpl::WalkTheStack(FILE* aS
+ 			break;
+ 	}
+ }
+ 
+ #else // unsupported platform.
+ 
+-void
++NS_COM void
+ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
+ {
+ 	fprintf(aStream, "write me, dammit!\n");
  }
  
- #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
+ #endif


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/devel/mozilla.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mozilla.spec	7 Feb 2006 12:59:43 -0000	1.86
+++ mozilla.spec	12 Feb 2006 16:14:06 -0000	1.87
@@ -11,7 +11,7 @@
 Name:        mozilla
 Summary:     Web browser and mail reader
 Version:     1.7.12
-Release:     4.1
+Release:     5
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
 Source0:     mozilla-%{version}-source.tar.bz2
@@ -171,7 +171,7 @@
 %patch6 -p1
 %patch7 -p0
 %patch8 -p0
-%patch9 -p1
+%patch9 -p0
 
 # customization patches
 %patch20 -p1
@@ -742,6 +742,9 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 37:1.7.12-5
+- Update dumpstack.patch to match upstream
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 37:1.7.12-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 16:25:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 11:25:07 -0500
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.6,
	1.7
Message-ID: <200602121625.k1CGP7w6026543@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
add new .so


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer-plugins-good.spec	11 Feb 2006 02:42:45 -0000	1.6
+++ gstreamer-plugins-good.spec	12 Feb 2006 16:25:03 -0000	1.7
@@ -138,6 +138,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstid3demux.so
+%{_libdir}/gstreamer=%{majorminor}/libgstapetag.so
 
 # gstreamer-plugins with external dependencies but in the main package
 #%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so



From fedora-cvs-commits at redhat.com  Sun Feb 12 16:38:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 11:38:27 -0500
Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.7,
	1.8
Message-ID: <200602121638.k1CGcRjZ030157@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gstreamer-plugins-good.spec 
Log Message:
note to self: learn to type


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gstreamer-plugins-good.spec	12 Feb 2006 16:25:03 -0000	1.7
+++ gstreamer-plugins-good.spec	12 Feb 2006 16:38:24 -0000	1.8
@@ -138,7 +138,7 @@
 %{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstid3demux.so
-%{_libdir}/gstreamer=%{majorminor}/libgstapetag.so
+%{_libdir}/gstreamer-%{majorminor}/libgstapetag.so
 
 # gstreamer-plugins with external dependencies but in the main package
 #%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so



From fedora-cvs-commits at redhat.com  Sun Feb 12 16:39:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 11:39:35 -0500
Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.8,1.9
Message-ID: <200602121639.k1CGdZ7m030736@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gsf-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30706

Modified Files:
	gsf-sharp.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.6-7
- Rebuild



Index: gsf-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gsf-sharp.spec	7 Feb 2006 12:03:58 -0000	1.8
+++ gsf-sharp.spec	12 Feb 2006 16:39:31 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gsf-sharp
 Version:        0.6
-Release:        6.1
+Release:        7
 Summary:        Mono bindings for libgsf
 
 Group:          System Environment/Libraries
@@ -50,6 +50,9 @@
 %{_prefix}/share/gapi-2.0/gsf-api.xml
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.6-7
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-6.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:05:15 -0500
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.12,1.13
Message-ID: <200602121705.k1CH5FfD019692@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19663

Modified Files:
	evolution-sharp.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-8
- Rebuild



Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- evolution-sharp.spec	7 Feb 2006 11:36:52 -0000	1.12
+++ evolution-sharp.spec	12 Feb 2006 17:04:48 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        7.1
+Release:        8
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -58,7 +58,10 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-7.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-8
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.10.2-7.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-7



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:06:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:06:48 -0500
Subject: rpms/file-roller/devel file-roller.spec,1.47,1.48
Message-ID: <200602121706.k1CH6mLJ019857@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19844

Modified Files:
	file-roller.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 2.13.90-2
- Rebuild



Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- file-roller.spec	7 Feb 2006 11:38:56 -0000	1.47
+++ file-roller.spec	12 Feb 2006 17:06:44 -0000	1.48
@@ -10,7 +10,7 @@
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
 Version:	2.13.90
-Release: 	1.1
+Release: 	2
 
 License:	GPL
 Group:		Applications/Archiving
@@ -105,7 +105,10 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 2.13.90-2
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 2.13.90-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 31 2006 Matthias Clasen <mclasen at redhat.com> 2.13.90-1



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:08:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:08:53 -0500
Subject: rpms/libnl/devel libnl.spec,1.10,1.11
Message-ID: <200602121708.k1CH8roH020601@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/libnl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20571

Modified Files:
	libnl.spec 
Log Message:
* Tue Feb 12 2006 Christopher Aillon <caillon at redhat.com> 1.0-0.8.pre5
- Rebuild



Index: libnl.spec
===================================================================
RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libnl.spec	7 Feb 2006 12:41:47 -0000	1.10
+++ libnl.spec	12 Feb 2006 17:08:50 -0000	1.11
@@ -5,7 +5,7 @@
 License: LGPL
 Name: libnl
 Version: 1.0
-Release: 0.7.%{preversion}.1
+Release: 0.8.%{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
@@ -63,7 +63,10 @@
 %{_libdir}/pkgconfig/%{name}-1.pc
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0-0.7.pre5.1
+* Tue Feb 12 2006 Christopher Aillon <caillon at redhat.com> 1.0-0.8.pre5
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.0-0.7.pre5.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Jan 16 2006 Christopher Aillon <caillon at redhat.com> 1.0-0.7.pre5



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:17:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:17:47 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.33,1.34
Message-ID: <200602121717.k1CHHla8004509@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4474

Modified Files:
	devhelp.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.11-2
- Rebuild



Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- devhelp.spec	7 Feb 2006 11:22:32 -0000	1.33
+++ devhelp.spec	12 Feb 2006 17:17:44 -0000	1.34
@@ -3,7 +3,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.11
-Release:             1.1
+Release:             2
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -100,6 +100,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.11-2
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:23:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:23:04 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.216, 1.217 anaconda.spec, 1.336,
	1.337 sources, 1.335, 1.336
Message-ID: <200602121723.k1CHN436007012@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6958/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.0-1 on branch devel from anaconda-10.92.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- .cvsignore	9 Feb 2006 22:05:35 -0000	1.216
+++ .cvsignore	12 Feb 2006 17:23:02 -0000	1.217
@@ -1 +1 @@
-anaconda-10.91.19.tar.bz2
+anaconda-10.92.0.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- anaconda.spec	11 Feb 2006 01:35:51 -0000	1.336
+++ anaconda.spec	12 Feb 2006 17:23:02 -0000	1.337
@@ -1,6 +1,6 @@
 Name: anaconda
-Version: 10.91.19
-Release: 1.1
+Version: 10.92.0
+Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
@@ -79,8 +79,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 10.91.19-1.1
-- bump again for double-long bug on ppc(64)
+* Sun Feb 12 2006 Jeremy Katz <katzj at redhat.com> - 10.92.0-1
+- Fix length of package name in text install (dcantrel, #180469)
+- Various minor cleanups
+- Support conditional packages for langsupport (pnasrat, #178029)
 
 * Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 10.91.19-1
 - Fix loader typo.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- sources	9 Feb 2006 22:05:35 -0000	1.335
+++ sources	12 Feb 2006 17:23:02 -0000	1.336
@@ -1 +1 @@
-f674c920a5f9938573956fcaf27336d8  anaconda-10.91.19.tar.bz2
+9608623c72113123929eae1f46502b12  anaconda-10.92.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:36:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:36:53 -0500
Subject: rpms/wireless-tools/devel .cvsignore, 1.13, 1.14 sources, 1.13,
	1.14 wireless-tools.spec, 1.30, 1.31
Message-ID: <200602121736.k1CHarkE003153@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/wireless-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3138

Modified Files:
	.cvsignore sources wireless-tools.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1:28-0.pre13.5.1
- Update to 28 pre13



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	18 Oct 2005 03:51:33 -0000	1.13
+++ .cvsignore	12 Feb 2006 17:36:51 -0000	1.14
@@ -1,5 +1 @@
-wireless_tools.27.pre25.tar.gz
-wireless_tools.28.pre4.tar.gz
-wireless_tools.28.pre8.tar.gz
-wireless_tools.28.pre9.tar.gz
-wireless_tools.28.pre10.tar.gz
+wireless_tools.28.pre13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	18 Oct 2005 03:51:33 -0000	1.13
+++ sources	12 Feb 2006 17:36:51 -0000	1.14
@@ -1 +1 @@
-9d4709f06db2137f11ebe7cfc93117ba  wireless_tools.28.pre10.tar.gz
+eb2c01c2945df2682a9b3c75515fd389  wireless_tools.28.pre13.tar.gz


Index: wireless-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/wireless-tools/devel/wireless-tools.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wireless-tools.spec	7 Feb 2006 14:14:56 -0000	1.30
+++ wireless-tools.spec	12 Feb 2006 17:36:51 -0000	1.31
@@ -1,4 +1,4 @@
-%define preversion pre10
+%define preversion pre13
 
 %define build_fc3			0
 %define build_rhel4			0
@@ -26,7 +26,7 @@
 License: GPL
 Name: wireless-tools
 Version: 28
-Release: 0.%{preversion}.%{release_extension}.2
+Release: 0.%{preversion}.%{release_extension}.1
 Epoch: 1
 URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
 Source: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.%{preversion}.tar.gz
@@ -76,6 +76,9 @@
 /%{_lib}/*.so.*
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1:28-0.pre13.5.1
+- Update to 28 pre13
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:28-0.pre10.5.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 17:50:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 12:50:44 -0500
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.87,1.88
Message-ID: <200602121750.k1CHoiDR015823@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15810

Modified Files:
	NetworkManager.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-11.cvs20060205
- Rebuild



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- NetworkManager.spec	7 Feb 2006 13:12:49 -0000	1.87
+++ NetworkManager.spec	12 Feb 2006 17:50:42 -0000	1.88
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 10%{?nm_cvs_version}.1
+Release: 11%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -209,7 +209,10 @@
 
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.1-10.cvs20060205.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-11.cvs20060205
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.5.1-10.cvs20060205.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205



From fedora-cvs-commits at redhat.com  Sun Feb 12 18:27:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 13:27:31 -0500
Subject: rpms/kernel-xen/devel patch-2.6.16-rc2-git11.bz2.sign, NONE,
	1.1 .cvsignore, 1.17, 1.18 kernel-xen.spec, 1.64,
	1.65 linux-2.6-compile-fixes.patch, 1.5,
	1.6 linux-2.6-selinux-mprotect-checks.patch, 1.3, 1.4 sources,
	1.17, 1.18 upstream, 1.9, 1.10 patch-2.6.16-rc2-git7.bz2.sign,
	1.1, NONE
Message-ID: <200602121827.k1CIRVcl015348@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-xen.spec linux-2.6-compile-fixes.patch 
	linux-2.6-selinux-mprotect-checks.patch sources upstream 
Added Files:
	patch-2.6.16-rc2-git11.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git7.bz2.sign 
Log Message:
rebase with rawhide 1.1936


--- NEW FILE patch-2.6.16-rc2-git11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD7t1ryGugalF9Dw4RAuqyAJ96gzotIp/XntZ1/0XC5PwhRWr79ACfcvPL
CUoAYyhQ6viV1XZRE56wDuw=
=xJvn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	10 Feb 2006 02:57:43 -0000	1.17
+++ .cvsignore	12 Feb 2006 18:27:29 -0000	1.18
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc2-git7.bz2
+patch-2.6.16-rc2-git11.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kernel-xen.spec	11 Feb 2006 21:16:10 -0000	1.64
+++ kernel-xen.spec	12 Feb 2006 18:27:29 -0000	1.65
@@ -160,7 +160,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -216,7 +217,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git7.bz2
+Patch2: patch-2.6.16-rc2-git11.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -724,9 +725,9 @@
 # Reboot thru bios on HP laptops.
 %patch205 -p1
 # Implement TIF_RESTORE_SIGMASK
-%patch206 -p1
+#%patch206 -p1
 # Generic sys_rt_sigsuspend()
-%patch207 -p1
+#%patch207 -p1
 
 # 
 # ppc64
@@ -1232,6 +1233,8 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
+cd linux-%{kversion}.%{_target_cpu}
+
 %if %{buildup}
 BuildKernel %make_target %kernel_image
 %endif
@@ -1337,7 +1340,7 @@
 
 %post hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-devel
@@ -1350,7 +1353,6 @@
 
 %post guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
-/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-devel
@@ -1363,7 +1365,7 @@
 
 %post hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-PAE-devel
@@ -1376,7 +1378,6 @@
 
 %post guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
-/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-PAE-devel
@@ -1471,8 +1472,6 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
 /boot/System.map-%{KVERREL}hypervisor
 /boot/config-%{KVERREL}hypervisor
-/boot/xen.gz-%{KVERREL}
-/boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}hypervisor
 /lib/modules/%{KVERREL}hypervisor/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
@@ -1511,8 +1510,6 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
 /boot/System.map-%{KVERREL}hypervisor-PAE
 /boot/config-%{KVERREL}hypervisor-PAE
-/boot/xen.gz-%{KVERREL}-PAE
-/boot/xen-syms-%{KVERREL}-PAE
 %dir /lib/modules/%{KVERREL}hypervisor-PAE
 /lib/modules/%{KVERREL}hypervisor-PAE/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build
@@ -1576,6 +1573,15 @@
 %endif
 
 %changelog
+* Sun Feb 12 2006 Juan Quintela <quintela at redhat.com>
+- rebase with rawhide 1.1936
+
+* Sun Feb 12 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git11
+
+* Sat Feb 11 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git10
+
 * Sat Feb 11 2006 Juan Quintela <quintela at redhat.com>
 - i686 xen PAE xennet fix.
 
@@ -1588,11 +1594,40 @@
 - rebase rawhide 1.1924.
 - merge with rawhide spec file.
 
+* Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc2-git8 & -git9
+- Begin the kernel-xen & kernel merge by merging the easy bits.
+- Remove x86_64 TIF_RESTORE_SIGMASK & generic sys_rt_sigsuspend
+  (They seemed to cause big problems)
+
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1924.
+- merge with rawhide spec file.
+
 * Thu Feb  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git7
 - More airo encryption fixing from Dan Williams.
 - Minor tweaks to the oops-pauser.
 - Disable DRM for certain Radeons that don't work right now.
+- Further fixing of the selinux mprotect patch
+
+* Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
+- fix oops on SMP boot (#180535)
+
+* Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com>
+- update to newer hypervisor snapshot, conflict with older tools
+- fix pae hypervisor new-kernel-pkg call
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- make_target & kernel_image passed as arguments to BuildKernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- removed SMP_ALTERNATIVES from smp kernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1918.
+- add up, smp & kdump kernels.
+- add xen PAE kernels.
 
 * Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
 - fix oops on SMP boot (#180535)
@@ -1815,16 +1850,6 @@
 - Remove include/asm-xen from rpm
 
 * Mon Jan  9 2006 Dave Jones <davej at redhat.com>
-- Remove vm debug patch that triggers too easily right now.
-  (Needs fixing properly post test2).
-- kill blk_attempt_merge() which was horribly broken.
-- dm: avoid ovvrun while syncing.
-
-* Mon Jan  9 2006 David Woodhouse <dwmw2 at redhat.com>
-- Fix some usblp problems, add ieee1284_id to sysfs
-- update bcm43xx driver to version tested in -HEAD
-
-* Mon Jan  9 2006 Dave Jones <davej at redhat.com>
 - 2.6.15-git5
 
 * Sat Jan 07 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-xen/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-compile-fixes.patch	10 Feb 2006 03:25:20 -0000	1.5
+++ linux-2.6-compile-fixes.patch	12 Feb 2006 18:27:29 -0000	1.6
@@ -1,2 +0,0 @@
-
-

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-selinux-mprotect-checks.patch	7 Feb 2006 00:45:15 -0000	1.3
+++ linux-2.6-selinux-mprotect-checks.patch	12 Feb 2006 18:27:29 -0000	1.4
@@ -1,8 +1,22 @@
-
-
---- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-01 16:28:13.000000000 -0500
-+++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-01 16:30:30.000000000 -0500
-@@ -2425,7 +2425,6 @@ static int selinux_file_mprotect(struct 
+--- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-09 22:05:47.000000000 -0500
++++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-09 22:06:13.000000000 -0500
+@@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil
+ 
+ static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
+ {
+-#ifndef CONFIG_PPC32
+ 	if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) {
+ 		/*
+ 		 * We are making executable an anonymous mapping or a
+@@ -2376,7 +2375,6 @@ static int file_map_prot_check(struct fi
+ 		if (rc)
+ 			return rc;
+ 	}
+-#endif
+ 
+ 	if (file) {
+ 		/* read access is always possible with a mapping */
+@@ -2423,7 +2421,6 @@ static int selinux_file_mprotect(struct 
  	if (selinux_checkreqprot)
  		prot = reqprot;
  
@@ -10,20 +24,17 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2444,8 +2444,10 @@ static int selinux_file_mprotect(struct 
+@@ -2442,13 +2439,14 @@ static int selinux_file_mprotect(struct 
  			 * modified content.  This typically should only
  			 * occur for text relocations.
  			 */
-+#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64)
++#if !defined(CONFIG_IA64)
  			rc = file_has_perm(current, vma->vm_file,
  					   FILE__EXECMOD);
 +#endif
  		}
  		if (rc)
  			return rc;
-@@ -2484,7 +2485,6 @@ static int selinux_file_mprotect(struct 
- 		if (rc)
- 			return rc;
  	}
 -#endif
  


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Feb 2006 02:57:43 -0000	1.17
+++ sources	12 Feb 2006 18:27:29 -0000	1.18
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-190a95ff28c3a49cd18e212170a28920  patch-2.6.16-rc2-git7.bz2
+7f3f09bb84cf7e1ab6e30e7f8bf4ec9a  patch-2.6.16-rc2-git11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- upstream	10 Feb 2006 02:57:43 -0000	1.9
+++ upstream	12 Feb 2006 18:27:29 -0000	1.10
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git7.bz2
+patch-2.6.16-rc2-git11.bz2


--- patch-2.6.16-rc2-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 12 19:11:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 14:11:03 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.65,1.66
Message-ID: <200602121911.k1CJB3E4009005@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
compile only x86_64 & i686 & fix spec merge typo


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kernel-xen.spec	12 Feb 2006 18:27:29 -0000	1.65
+++ kernel-xen.spec	12 Feb 2006 19:11:00 -0000	1.66
@@ -162,6 +162,7 @@
 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 i686 x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1233,8 +1234,6 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
-cd linux-%{kversion}.%{_target_cpu}
-
 %if %{buildup}
 BuildKernel %make_target %kernel_image
 %endif
@@ -1574,6 +1573,7 @@
 
 %changelog
 * Sun Feb 12 2006 Juan Quintela <quintela at redhat.com>
+- make real release, only with x86_64 & i686.
 - rebase with rawhide 1.1936
 
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>



From fedora-cvs-commits at redhat.com  Sun Feb 12 19:17:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 14:17:55 -0500
Subject: rpms/gnome-terminal/devel .cvsignore, 1.20, 1.21 gnome-terminal.spec,
	1.33, 1.34 sources, 1.20, 1.21
Message-ID: <200602121917.k1CJHtfJ024558@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-terminal.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	31 Jan 2006 02:28:17 -0000	1.20
+++ .cvsignore	12 Feb 2006 19:17:51 -0000	1.21
@@ -5,3 +5,4 @@
 gnome-terminal-2.13.2.tar.bz2
 gnome-terminal-2.13.3.tar.bz2
 gnome-terminal-2.13.90.tar.bz2
+gnome-terminal-2.13.91.tar.bz2


Index: gnome-terminal.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-terminal.spec	11 Feb 2006 03:17:55 -0000	1.33
+++ gnome-terminal.spec	12 Feb 2006 19:17:51 -0000	1.34
@@ -12,16 +12,12 @@
 
 Summary: GNOME Terminal
 Name: gnome-terminal
-Version: 2.13.90
-Release: 2.1
+Version: 2.13.91
+Release: 1
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 Source1: ne.po
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
-# fixed in 2.13.91
-Patch1: gnome-terminal-2.13.90-invisible-char.patch
-# fixed in 2.13.91
-Patch2: gnome-terminal-2.13.90-link.patch
 License: GPL 
 Group: User Interface/Desktops
 
@@ -57,8 +53,6 @@
 %setup -q
 cp ${RPM_SOURCE_DIR}/ne.po po
 %patch0 -p1 -b .inputmethod
-%patch1 -p0 -b .invisible-char
-%patch2 -p1 -b .link
 
 %build
 
@@ -107,6 +101,9 @@
 %{_libdir}/bonobo
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	31 Jan 2006 02:28:17 -0000	1.20
+++ sources	12 Feb 2006 19:17:51 -0000	1.21
@@ -1 +1 @@
-bd6dd166ca197cf9561f122f191aa49d  gnome-terminal-2.13.90.tar.bz2
+817d89adda4f2be80240582c65873a27  gnome-terminal-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 19:31:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 14:31:25 -0500
Subject: rpms/sound-juicer/devel .cvsignore, 1.17, 1.18 sound-juicer.spec,
	1.39, 1.40 sources, 1.17, 1.18
Message-ID: <200602121931.k1CJVPWI014201@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/sound-juicer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11974

Modified Files:
	.cvsignore sound-juicer.spec sources 
Log Message:
2.13.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	31 Jan 2006 04:11:03 -0000	1.17
+++ .cvsignore	12 Feb 2006 19:30:36 -0000	1.18
@@ -7,3 +7,4 @@
 sound-juicer-2.13.1.tar.bz2
 sound-juicer-2.13.2.tar.bz2
 sound-juicer-2.13.4.tar.bz2
+sound-juicer-2.13.5.tar.bz2


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sound-juicer.spec	11 Feb 2006 05:42:37 -0000	1.39
+++ sound-juicer.spec	12 Feb 2006 19:30:49 -0000	1.40
@@ -12,8 +12,8 @@
 
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
-Version:	2.13.4
-Release:	3.2
+Version:	2.13.5
+Release:	1
 License:	GPL
 Group:		Applications/Multimedia
 Source:		%{name}-%{version}.tar.bz2
@@ -92,6 +92,9 @@
 %{_datadir}/omf/sound-juicer
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-1
+- Update to 2.13.5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	31 Jan 2006 04:11:03 -0000	1.17
+++ sources	12 Feb 2006 19:30:49 -0000	1.18
@@ -1 +1 @@
-658f035110bea08a81951c2fa6a15552  sound-juicer-2.13.4.tar.bz2
+cb0e983b4c22405851eff58cce5b9392  sound-juicer-2.13.5.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 19:40:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 14:40:35 -0500
Subject: rpms/gnome-applets/devel .cvsignore, 1.34, 1.35 gnome-applets.spec,
	1.110, 1.111 sources, 1.35, 1.36
Message-ID: <200602121940.k1CJeZ3V023815@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.13.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	31 Jan 2006 05:36:12 -0000	1.34
+++ .cvsignore	12 Feb 2006 19:40:33 -0000	1.35
@@ -6,3 +6,4 @@
 gnome-applets-2.13.1.tar.bz2
 gnome-applets-2.13.2.tar.bz2
 gnome-applets-2.13.3.tar.bz2
+gnome-applets-2.13.4.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-applets.spec	11 Feb 2006 03:12:30 -0000	1.110
+++ gnome-applets.spec	12 Feb 2006 19:40:33 -0000	1.111
@@ -17,8 +17,8 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.13.3
-Release:  	4.2
+Version: 	2.13.4
+Release:  	1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -28,8 +28,6 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=329476
-Patch5:		gnome-applets-2.13.3-bad-weather.patch
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -82,7 +80,6 @@
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
-%patch5 -p1 -b .bad-weather
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -175,6 +172,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-1
+- Update to 2.13.4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.3-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	31 Jan 2006 05:36:12 -0000	1.35
+++ sources	12 Feb 2006 19:40:33 -0000	1.36
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-a21a38a13cafbf4bcd841210f3dbc228  gnome-applets-2.13.3.tar.bz2
+d45875668fd4e30d0863bf71ead44caa  gnome-applets-2.13.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 19:58:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 14:58:10 -0500
Subject: rpms/dasher/devel .cvsignore, 1.8, 1.9 dasher.spec, 1.29,
	1.30 sources, 1.8, 1.9
Message-ID: <200602121958.k1CJwAUB013898@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13301

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
3.99.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Jan 2006 02:57:07 -0000	1.8
+++ .cvsignore	12 Feb 2006 19:58:06 -0000	1.9
@@ -5,3 +5,4 @@
 dasher-3.2.18.tar.bz2
 dasher-3.99.1.tar.bz2
 dasher-3.99.2.tar.bz2
+dasher-3.99.4.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dasher.spec	11 Feb 2006 02:22:43 -0000	1.29
+++ dasher.spec	12 Feb 2006 19:58:06 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 3.99.2
-Release: 2.2
+Version: 3.99.4
+Release: 1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -80,6 +80,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 3.99.4-1
+- Update to 3.99.4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.99.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Jan 2006 02:57:07 -0000	1.8
+++ sources	12 Feb 2006 19:58:06 -0000	1.9
@@ -1 +1 @@
-22bd64811199358850b1f58f264999bb  dasher-3.99.2.tar.bz2
+6e89a93a94c681cad892bd8e204e1887  dasher-3.99.4.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:00:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:00:39 -0500
Subject: rpms/dasher/devel dasher.spec,1.30,1.31
Message-ID: <200602122000.k1CK0d6I014352@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14325

Modified Files:
	dasher.spec 
Log Message:
3.99.4



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dasher.spec	12 Feb 2006 19:58:06 -0000	1.30
+++ dasher.spec	12 Feb 2006 20:00:21 -0000	1.31
@@ -18,7 +18,7 @@
 
 Requires: gnome-speech
 
-Patch0: dasher-3.99.2-make-compile.patch
+#Patch0: dasher-3.99.2-make-compile.patch
 
 %description
 Accessibility input method
@@ -26,7 +26,7 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .make-compile
+#%patch0 -p1 -b .make-compile
 
 %build
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:07:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:07:51 -0500
Subject: rpms/gnome-utils/devel .cvsignore, 1.37, 1.38 gnome-utils.spec, 1.90,
	1.91 sources, 1.40, 1.41
Message-ID: <200602122007.k1CK7p5x015280@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	30 Jan 2006 20:19:19 -0000	1.37
+++ .cvsignore	12 Feb 2006 20:07:47 -0000	1.38
@@ -6,3 +6,4 @@
 zenity-2.13.90.tar.bz2
 gnome-utils-2.13.91.tar.bz2
 gucharmap-1.5.1.tar.bz2
+gnome-utils-2.13.92.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- gnome-utils.spec	11 Feb 2006 03:18:13 -0000	1.90
+++ gnome-utils.spec	12 Feb 2006 20:07:47 -0000	1.91
@@ -19,8 +19,8 @@
 
 Summary: GNOME utility programs.
 Name: gnome-utils
-Version: 2.13.91
-Release: 2.2
+Version: 2.13.92
+Release: 1
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -214,6 +214,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> 2.13.92-1
+- Update to gnome-utils 2.13.92
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	30 Jan 2006 20:19:19 -0000	1.40
+++ sources	12 Feb 2006 20:07:47 -0000	1.41
@@ -1,4 +1,4 @@
 8bb1ea99ed59184b2b49c192a80fc64d  gcalctool-5.7.28.tar.bz2
 a5f7d3d6524f7f2da0978541c74aa40b  zenity-2.13.90.tar.bz2
-270d8f73d28e2334becc9c3f2bf126c5  gnome-utils-2.13.91.tar.bz2
 7ae1df29812ac27379858ffc02cfc318  gucharmap-1.5.1.tar.bz2
+c2d1a341a5722d7fc4f8ed56248c5123  gnome-utils-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:13:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:13:55 -0500
Subject: rpms/irqbalance/devel irqbalance.spec,1.23,1.24
Message-ID: <200602122013.k1CKDtn1017911@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17838

Modified Files:
	irqbalance.spec 
Log Message:
build on ppc[64]



Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- irqbalance.spec	9 Feb 2006 06:22:57 -0000	1.23
+++ irqbalance.spec	12 Feb 2006 20:13:52 -0000	1.24
@@ -11,7 +11,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Prereq:		/sbin/chkconfig /sbin/service
 Patch1: irqbalance-pie.patch
-ExclusiveArch:	i386 x86_64 ia64
+ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
 Obsoletes:	kernel-utils
 
 %description
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Dave Jones <davej at redhat.com>
+- Build for ppc[64] too.
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:14:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:14:31 -0500
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.91,1.92
Message-ID: <200602122014.k1CKEVWu018242@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
remove patch



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gnome-utils.spec	12 Feb 2006 20:07:47 -0000	1.91
+++ gnome-utils.spec	12 Feb 2006 20:14:28 -0000	1.92
@@ -33,8 +33,6 @@
 
 Patch0: gnome-utils-2.11.90-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
-# fixed in 2.13.92
-Patch2: gnome-utils-2.13.91-logview-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome
@@ -71,7 +69,6 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .logview-crash
 
 # Hide from menus
 pushd gsearchtool



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:24:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:24:28 -0500
Subject: rpms/kernel/devel linux-2.6-bcm-warnings.patch, NONE,
	1.1 kernel-2.6.spec, 1.1936, 1.1937
Message-ID: <200602122024.k1CKOSsO002685@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-bcm-warnings.patch 
Log Message:
fix warning


linux-2.6-bcm-warnings.patch:
 bcm43xx_wx.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-bcm-warnings.patch ---

drivers/net/wireless/bcm43xx/bcm43xx_wx.c:519: warning: implicit declaration of function 'bcm43xx_phy_xmitpower'

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c~	2006-02-12 15:20:41.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c	2006-02-12 15:21:40.000000000 -0500
@@ -40,6 +40,7 @@
 #include "bcm43xx_wx.h"
 #include "bcm43xx_main.h"
 #include "bcm43xx_radio.h"
+#include "bcm43xx_phy.h"
 
 
 /* The WIRELESS_EXT version, which is implemented by this driver. */


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -r1.1936 -r1.1937
--- kernel-2.6.spec	12 Feb 2006 07:50:26 -0000	1.1936
+++ kernel-2.6.spec	12 Feb 2006 20:24:26 -0000	1.1937
@@ -378,6 +378,7 @@
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
 Patch5002: linux-2.6-bcm43xx-git-mb.patch
+Patch5003: linux-2.6-bcm-warnings.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -952,6 +953,8 @@
 %patch5001 -p1
 # ... and Michael Buesch's updates (2006-02-03)
 %patch5002 -p1
+# warning fix.
+%patch5003 -p1
 
 #
 # final stuff
@@ -1537,6 +1540,7 @@
 %changelog
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git11
+- Fix warning in bcm43xx driver.
 
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10



From fedora-cvs-commits at redhat.com  Sun Feb 12 20:28:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 15:28:27 -0500
Subject: rpms/kernel/devel linux-2.6-debug-Wundef.patch,1.1,1.2
Message-ID: <200602122028.k1CKSRvS004540@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-debug-Wundef.patch 
Log Message:
Fail build on implicit function declarations.



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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-Wundef.patch	18 Aug 2005 18:28:13 -0000	1.1
+++ linux-2.6-debug-Wundef.patch	12 Feb 2006 20:28:24 -0000	1.2
@@ -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
+--- 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"
  
  HOSTCC  	= gcc
  HOSTCXX  	= g++
 -HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef
++HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef -Werror-implicit-function-declaration
  HOSTCXXFLAGS	= -O2
  
  # 	Decide whether to build built-in, modular, or both.



From fedora-cvs-commits at redhat.com  Sun Feb 12 21:27:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 16:27:53 -0500
Subject: rpms/frysk/devel .cvsignore, 1.8, 1.9 frysk.spec, 1.25, 1.26 sources,
	1.8, 1.9
Message-ID: <200602122127.k1CLRrWs029264@cvs.devel.redhat.com>

Author: cagney

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18370

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Sun Feb 12 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.0
- Import frysk 0.0.1.2006.02.12.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Feb 2006 16:43:53 -0000	1.8
+++ .cvsignore	12 Feb 2006 21:27:50 -0000	1.9
@@ -1,2 +1 @@
-frysk-0.0.1.2006.01.22.tar.bz2
-frysk-0.0.1.2006.02.09.tar.bz2
+frysk-0.0.1.2006.02.12.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- frysk.spec	9 Feb 2006 16:53:11 -0000	1.25
+++ frysk.spec	12 Feb 2006 21:27:50 -0000	1.26
@@ -1,6 +1,6 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.02.09
+Version:	0.0.1.2006.02.12
 Release:	0.FC5.0
 License:	GPL
 Group:		Development/System
@@ -87,6 +87,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Sun Feb 12 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.0
+- Import frysk 0.0.1.2006.02.12.
+
 * Thu Feb 09 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.09-0.FC5.0
 - Removed ftrace from %files and added libexedir files and man pages.
 - Imported new frysk tarball, 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Feb 2006 16:43:53 -0000	1.8
+++ sources	12 Feb 2006 21:27:50 -0000	1.9
@@ -1 +1 @@
-196c0fac126528597bf3e7fa771c674e  frysk-0.0.1.2006.02.09.tar.bz2
+c206058152c140ce99288e94c9ef4872  frysk-0.0.1.2006.02.12.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 22:29:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 17:29:55 -0500
Subject: rpms/gdm/devel
	gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch, NONE,
	1.1 .cvsignore, 1.20, 1.21 gdm.spec, 1.127, 1.128 sources,
	1.22, 1.23
Message-ID: <200602122229.k1CMTtQB024827@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24799

Modified Files:
	.cvsignore gdm.spec sources 
Added Files:
	gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch 
Log Message:
- update to cvs snapshot
- move gdm to /etc instead of /etc/X11
- move custom gdm.conf to sysconfdir instead of symlinking from
  datadir (bug 180364)


gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch:
 acconfig.h         |    3 ++-
 config/Makefile.am |   41 ++++++++++++++++++++++-------------------
 configure.ac       |   27 +++++++++++++++++++++------
 daemon/Makefile.am |    1 -
 daemon/gdmconfig.c |   15 +++++++--------
 5 files changed, 52 insertions(+), 35 deletions(-)

--- NEW FILE gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch ---
--- gdm-2.13.0.7.0.2006.02.12/acconfig.h	6 Oct 2005 19:25:13 -0000	1.32
+++ gdm-2.13.0.7.0.2006.02.12/acconfig.h	12 Feb 2006 21:52:27 -0000
@@ -2,7 +2,8 @@
 #undef VERSION
 #undef AT_BINDIR
 #undef GETTEXT_PACKAGE
-#undef GDM_CONFIGDIR
+#undef GDM_DEFAULTS_CONF
+#undef GDM_CUSTOM_CONF
 #undef GDM_USER_PATH
 #undef HALT_COMMAND
 #undef REBOOT_COMMAND
--- gdm-2.13.0.7.0.2006.02.12/configure.ac	11 Feb 2006 00:16:51 -0000	1.25
+++ gdm-2.13.0.7.0.2006.02.12/configure.ac	12 Feb 2006 21:52:29 -0000
@@ -849,17 +849,32 @@ AC_SUBST(AT_BINDIR)
 AC_DEFINE_UNQUOTED(AT_BINDIR,"$AT_BINDIR")
 
 withval=""
-AC_ARG_WITH(configdir,
-[  --with-configdir=<PATH>   PATH to Install gdm.conf configuration file [default=sysconfdir/gdm]],)
+AC_ARG_WITH(defaults_conf,
+[  --with-defaults-conf=<FILENAME>   FILENAME to give to defaults file [default=EXPANDED_DATADIR/gdm/defaults.conf]],)
 
 if test x$withval != x; then
-	GDM_CONFIGDIR="$withval"
+	GDM_DEFAULTS_CONF="$withval"
 else
-	GDM_CONFIGDIR="$sysconfdir/gdm"
+	GDM_DEFAULTS_CONF="$datadir/gdm/defaults.conf"
 fi
 
-AC_SUBST(GDM_CONFIGDIR)
-AC_DEFINE_UNQUOTED(GDM_CONFIGDIR,"$GDM_CONFIGDIR")
+AC_SUBST(GDM_DEFAULTS_CONF)
+AC_DEFINE_UNQUOTED(GDM_DEFAULTS_CONF,"$GDM_DEFAULTS_CONF")
+
+withval=""
+AC_ARG_WITH(custom_conf,
+[  --with-custom-conf=<FILENAME>   FILENAME to give to custom configuration file [default=EXPANDED_SYSCONFDIR/gdm/custom.conf]],)
+
+if test x$withval != x; then
+	GDM_CUSTOM_CONF="$withval"
+else
+	GDM_CUSTOM_CONF="$sysconfdir/gdm/custom.conf"
+fi
+
+AC_SUBST(GDM_CUSTOM_CONF)
+AC_DEFINE_UNQUOTED(GDM_CUSTOM_CONF,"$GDM_CUSTOM_CONF")
+
+
 
 AC_ARG_WITH(prefetch,
   [  --with-prefetch=[yes/no]  Install GDM library prefetch utility [default=no]],,
--- gdm-2.13.0.7.0.2006.02.12/config/Makefile.am	13 Jan 2006 19:24:21 -0000	1.62
+++ gdm-2.13.0.7.0.2006.02.12/config/Makefile.am	12 Feb 2006 21:52:29 -0000
@@ -1,6 +1,5 @@
 pixmapdir = $(datadir)/pixmaps
 confdir = $(sysconfdir)/gdm
-gdmconfdir = $(GDM_CONFIGDIR)
 crossconfdir = $(sysconfdir)/dm
 localedir = $(sysconfdir)/gdm
 bisessdir = $(datadir)/gdm/BuiltInSessions
@@ -54,9 +53,9 @@ uninstall-hook:
 	$(DESTDIR)$(instsessdir)/default.desktop \
 	$(DESTDIR)$(instsessdir)/ssh.desktop \
 	$(DESTDIR)$(instsessdir)/CDE.desktop \
-	$(DESTDIR)$(gdmconfdir)/gdm.conf \
-	$(DESTDIR)$(gdmconfdir)/gdm.conf-custom \
-	$(DESTDIR)$(gdmconfdir)/factory-gdm.conf \
+	$(DESTDIR)$(GDM_DEFAULTS_CONF) \
+	$(DESTDIR)$(GDM_CUSTOM_CONF) \
+	`dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)` \
 	$(DESTDIR)$(confdir)/XKeepsCrashing \
 	$(DESTDIR)$(confdir)/Xsession \
 	$(DESTDIR)$(confdir)/gdmprefetchlist \
@@ -75,26 +74,30 @@ install-data-hook: gdm.conf gdm.conf-cus
 		$(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
 		chmod 755 $(DESTDIR)$(crossconfdir); \
 	fi
-	if test '!' -d $(DESTDIR)$(gdmconfdir); then \
-		$(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \
-		chmod 755 $(DESTDIR)$(gdmconfdir); \
-	fi
-	if test -f $(DESTDIR)$(gdmconfdir)/gdm.conf; then \
-	   if ! cmp -s $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
-		if test '!' -f $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; then \
-			cp -f $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \
+	if test '!' -d `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; then \
+		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+		chmod 755 `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`; \
+	fi
+	if test '!' -d `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; then \
+		$(mkinstalldirs) `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; \
+		chmod 755 `dirname $(DESTDIR)$(GDM_CUSTOM_CONF)`; \
+	fi
+	if test -f $(DESTDIR)$(confdir)/gdm.conf; then \
+	   if ! cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
+		if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \
+			cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_CUSTOM_CONF); \
 		else \
-			cp -f $(DESTDIR)$(gdmconfdir)/gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf.org; \
+			cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF).org; \
 		fi; \
 	   fi; \
 	fi
-	$(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/gdm.conf
-	chmod 444 $(DESTDIR)$(gdmconfdir)/gdm.conf
-	if test '!' -f $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; then \
-		$(INSTALL_DATA) $(srcdir)/gdm.conf-custom $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \
-		chmod 644 $(DESTDIR)$(gdmconfdir)/gdm.conf-custom; \
+	$(INSTALL_DATA) gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF)
+	chmod 444 $(DESTDIR)$(GDM_DEFAULTS_CONF)
+	if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \
+		$(INSTALL_DATA) $(srcdir)/gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \
+		chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \
 	fi
-	$(INSTALL_DATA) gdm.conf $(DESTDIR)$(gdmconfdir)/factory-gdm.conf
+	$(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)`
 
 	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
 	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
--- gdm-2.13.0.7.0.2006.02.12/daemon/Makefile.am	20 Dec 2005 22:08:40 -0000	1.33
+++ gdm-2.13.0.7.0.2006.02.12/daemon/Makefile.am	12 Feb 2006 21:52:29 -0000
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce makefile.in
-DEFS = @DEFS@ -DGDM_SYSCONFDIR_CONFIG_FILE=\"$(GDM_CONFIGDIR)/gdm.conf\"
 
 # Note that we have cflags for just about everything even if
 # we don't link to everything
--- gdm-2.13.0.7.0.2006.02.12/daemon/gdmconfig.c	7 Feb 2006 23:57:25 -0000	1.17
+++ gdm-2.13.0.7.0.2006.02.12/daemon/gdmconfig.c	12 Feb 2006 21:52:31 -0000
@@ -540,7 +540,7 @@ gdm_config_init (void)
  * Get config file.  
  */
 static VeConfig *
-gdm_get_config (struct stat *statbuf)
+gdm_get_default_config (struct stat *statbuf)
 {
    int r;
 
@@ -553,13 +553,13 @@ gdm_get_config (struct stat *statbuf)
          return NULL;
       }
    } else {
-      VE_IGNORE_EINTR (r = g_stat (GDM_SYSCONFDIR_CONFIG_FILE, statbuf));
+      VE_IGNORE_EINTR (r = g_stat (GDM_DEFAULTS_CONF, statbuf));
       if (r < 0) {
          gdm_error (_("%s: No GDM configuration file: %s. Using defaults."),
-                      "gdm_config_parse", GDM_SYSCONFDIR_CONFIG_FILE);
+                      "gdm_config_parse", GDM_DEFAULTS_CONF);
          return NULL;
       } else {
-              config_file = GDM_SYSCONFDIR_CONFIG_FILE;
+              config_file = GDM_DEFAULTS_CONF;
       }
    }
 
@@ -576,12 +576,11 @@ static VeConfig *
 gdm_get_custom_config (struct stat *statbuf)
 {
    VeConfig *retval;
-   gchar *file = g_strdup_printf ("%s-custom", GDM_SYSCONFDIR_CONFIG_FILE);
    int r;
 
-   VE_IGNORE_EINTR (r = g_stat (file, statbuf));
+   VE_IGNORE_EINTR (r = g_stat (GDM_CUSTOM_CONF, statbuf));
    if (r >= 0) {
-      custom_config_file = file;
+      custom_config_file = g_strdup (GDM_CUSTOM_CONF);
       return ve_config_new (custom_config_file);
    } else {
       return NULL;
@@ -1723,7 +1722,7 @@ gdm_config_parse (void)
     * main configuration file.  If cfg is missing, then GDM will 
     * use the built-in defaults found in gdm.h.
     */
-   cfg                      = gdm_get_config (&statbuf);
+   cfg                      = gdm_get_default_config (&statbuf);
    config_file_mtime        = statbuf.st_mtime;
    custom_cfg               = gdm_get_custom_config (&statbuf);
    custom_config_file_mtime = statbuf.st_mtime;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	31 Jan 2006 16:58:14 -0000	1.20
+++ .cvsignore	12 Feb 2006 22:29:35 -0000	1.21
@@ -1 +1 @@
-gdm-2.13.0.7.tar.bz2
+gdm-2.13.0.7.0.2006.02.12.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gdm.spec	11 Feb 2006 02:51:03 -0000	1.127
+++ gdm.spec	12 Feb 2006 22:29:36 -0000	1.128
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.13.0.7
-Release: 2.1
+Version: 2.13.0.7.0.2006.02.12
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -43,8 +43,8 @@
 Patch18: gdm-2.8.0.4-dont-call-xsm.patch
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch20: gdm-2.13.0.4-add-locale-header.patch
-Patch21: gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
+Patch23: gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -116,8 +116,8 @@
 %patch18 -p1 -b .dont-call-xsm
 %patch19 -p1 -b .add-gnome-cflags
 %patch20 -p1 -b .add-locale-header
-%patch21 -p1 -b .fix-gdm-safe-restart-conf-path
 %patch22 -p1 -b .pam_stack
+%patch23 -p1 -b .move-gdm-defaults-conf
 
 # 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
@@ -129,27 +129,23 @@
 automake-1.9 --add-missing
 autoconf
 autoheader
-%configure --sysconfdir=%{_sysconfdir}/X11   \
-           --with-pam-prefix=/etc  \
-	   --localstatedir=/var    \
+%configure --with-pam-prefix=%{_sysconfdir} \
 	   --enable-console-helper \
 	   --disable-scrollkeeper  \
-	   --with-selinux \
-	   --with-configdir=%{_datadir}/gdm/config
+	   --with-selinux
 make
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Init
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/PreSession
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/PostSession
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/config
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Init
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PreSession
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostSession
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # docs go elsewhere
-rm -rf $RPM_BUILD_ROOT/%{prefix}/doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/doc
 
 # create log dir
 mkdir -p $RPM_BUILD_ROOT/var/log/gdm
@@ -197,13 +193,6 @@
 #install -m755 ${RPM_SOURCE_DIR}/zzz-bootup-complete.init                      \
 #              ${RPM_BUILD_ROOT}/etc/rc.d/init.d/zzz-bootup-complete
 
-# gdm has two config files: gdm.conf and gdm.conf-custom.  gdm.conf-custom is
-# the editable file and gdm.conf is a distro fallbacks/defaults file. We want
-# the sysadmin editable file in /etc and the distro-defaults file in
-# /usr/share/gdm/config
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm && \
- ln -sf ../../..%{_datadir}/gdm/config/gdm.conf-custom custom.conf)
-
 %find_lang gdm
 
 %clean
@@ -228,34 +217,38 @@
 # if the user already has a config file, then 
 # migrate it to the new location 
 if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then
-    cp -a %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom
+    cp -a %{_sysconfdir}/X11/gdm/gdm.conf %{_sysconfdir}/gdm/custom.conf
 
     # Comment out some entries from the custom config file that may have changed
     # locations in the update
-    sed -i -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^GraphicalTheme=Bluecurve@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^BackgroundColor=#20305a@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^LogDir=/var/log/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_datadir}/gdm/config/gdm.conf-custom 
-    sed -i -e 's@^ServAuthDir=/var/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom 
+    sed -i -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^GraphicalTheme=Bluecurve@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^BackgroundColor=#20305a@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^LogDir=/var/log/gdm@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_sysconfdir}/gdm/custom.conf 
+    sed -i -e 's@^ServAuthDir=/var/gdm@#&@' %{_sysconfdir}/gdm/custom.conf 
 
     # Someone might be trying to use different greeters for the local/remote cases
     # so migrate them to their new locations.
-    sed -i -e 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom
-    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom
+    sed -i -e 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_sysconfdir}/gdm/custom.conf
+fi
+
+if [ $1 -ge 2 ] && [ -f %{_datadir}/gdm/config/gdm.conf-custom ]; then
+    cp -a %{_datadir}/gdm/config/gdm.conf-custom %{_sysconfdir}/gdm/custom.conf
 fi
 
 %{_sbindir}/gdm-safe-restart >/dev/null 2>&1 || :
@@ -273,27 +266,26 @@
 
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 
-%dir %{_sysconfdir}/X11/gdm
-%{_sysconfdir}/X11/gdm/Xsession
-%config(noreplace) %{_sysconfdir}/X11/gdm/custom.conf
-%config(noreplace) %{_datadir}/gdm/config/gdm.conf-custom
-%config %{_sysconfdir}/X11/gdm/XKeepsCrashing
-%config %{_sysconfdir}/X11/gdm/locale.alias
-%config %{_sysconfdir}/X11/gdm/Init/*
-%config %{_sysconfdir}/X11/gdm/PostLogin/*
-%config %{_sysconfdir}/X11/gdm/PreSession/*
-%config %{_sysconfdir}/X11/gdm/PostSession/*
-%config %{_sysconfdir}/X11/gdm/modules/*
+%dir %{_sysconfdir}/gdm
+%{_sysconfdir}/gdm/Xsession
+%config(noreplace) %{_sysconfdir}/gdm/custom.conf
+%config %{_sysconfdir}/gdm/XKeepsCrashing
+%config %{_sysconfdir}/gdm/locale.alias
+%config %{_sysconfdir}/gdm/Init/*
+%config %{_sysconfdir}/gdm/PostLogin/*
+%config %{_sysconfdir}/gdm/PreSession/*
+%config %{_sysconfdir}/gdm/PostSession/*
+%config %{_sysconfdir}/gdm/modules/*
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdmsetup
 %config %{_sysconfdir}/pam.d/gdm-autologin
 %config %{_sysconfdir}/security/console.apps/gdmsetup
 #%config %{_sysconfdir}/rc.d/init.d/*
-%dir %{_sysconfdir}/X11/gdm/Init
-%dir %{_sysconfdir}/X11/gdm/PreSession
-%dir %{_sysconfdir}/X11/gdm/PostSession
-%dir %{_sysconfdir}/X11/gdm/PostLogin
-%dir %{_sysconfdir}/X11/gdm/modules
+%dir %{_sysconfdir}/gdm/Init
+%dir %{_sysconfdir}/gdm/PreSession
+%dir %{_sysconfdir}/gdm/PostSession
+%dir %{_sysconfdir}/gdm/PostLogin
+%dir %{_sysconfdir}/gdm/modules
 %{_datadir}/pixmaps
 %{_datadir}/icons
 %{_datadir}/gdm
@@ -310,6 +302,12 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sun Feb 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.7.0.2006.02.12-1
+- update to cvs snapshot
+- move gdm to /etc instead of /etc/X11
+- move custom gdm.conf to sysconfdir instead of symlinking from
+  datadir (bug 180364)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0.7-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	31 Jan 2006 16:58:14 -0000	1.22
+++ sources	12 Feb 2006 22:29:36 -0000	1.23
@@ -1 +1 @@
-70e469f85686ad861c1a8208ca231e9f  gdm-2.13.0.7.tar.bz2
+488eb7c6837793dd52eba4bca7005847  gdm-2.13.0.7.0.2006.02.12.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 12 22:51:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 17:51:57 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.6,1.7
Message-ID: <200602122251.k1CMpvwd012815@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12748

Modified Files:
	wpa_supplicant.spec 
Log Message:
* Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-3
- Documentation cleanup (Terje Rosten <terje.rosten at ntnu.no>)




Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wpa_supplicant.spec	12 Feb 2006 06:07:03 -0000	1.6
+++ wpa_supplicant.spec	12 Feb 2006 22:51:54 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Version: 0.5.1
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -65,6 +65,16 @@
 # running
 mkdir -p %{buildroot}/%{_localstatedir}/run/%{name}
 
+# man pages
+install -d %{buildroot}%{_mandir}/man{5,8}
+install -m 0644 doc/docbook/*.8 %{buildroot}%{_mandir}/man8
+install -m 0644 doc/docbook/*.5 %{buildroot}%{_mandir}/man5
+
+# some cleanup in docs
+rm -f  doc/.cvsignore
+rm -rf doc/docbook
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -82,19 +92,24 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf doc
+%doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf doc examples
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %{_sbindir}/wpa_supplicant
 %{_sbindir}/wpa_cli
 %{_localstatedir}/run/%{name}
+%{_mandir}/man8/*
+%{_mandir}/man5/*
 
 %files gui
 %defattr(-, root, root)
 %{_bindir}/wpa_gui
 
 %changelog
+* Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-3
+- Documentation cleanup (Terje Rosten <terje.rosten at ntnu.no>)
+
 * Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-2
 - Move initscript to /etc/rc.d/init.d
 



From fedora-cvs-commits at redhat.com  Sun Feb 12 23:33:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 18:33:43 -0500
Subject: rpms/shared-mime-info/devel .cvsignore, 1.8,
	1.9 shared-mime-info.spec, 1.32, 1.33 sources, 1.8, 1.9
Message-ID: <200602122333.k1CNXhL6031259@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31245

Modified Files:
	.cvsignore shared-mime-info.spec sources 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.16.cvs20060212-1
- Newer CVS snapshot



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	19 Dec 2005 16:52:08 -0000	1.8
+++ .cvsignore	12 Feb 2006 23:33:41 -0000	1.9
@@ -1,5 +1 @@
-shared-mime-info-0.15.tar.gz
-shared-mime-info-0.16.tar.gz
-shared-mime-info-0.16.cvs20051018.tar.gz
-shared-mime-info-0.16.cvs20051201.tar.gz
-shared-mime-info-0.16.cvs20051219.tar.gz
+shared-mime-info-0.16.cvs20060212.tar.gz


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- shared-mime-info.spec	7 Feb 2006 13:50:25 -0000	1.32
+++ shared-mime-info.spec	12 Feb 2006 23:33:41 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
-Version: 0.16.cvs20051219
-Release: 2.1
+Version: 0.16.cvs20060212
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -62,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.16.cvs20060212-1
+- Newer CVS snapshot
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Dec 2005 16:52:08 -0000	1.8
+++ sources	12 Feb 2006 23:33:41 -0000	1.9
@@ -1 +1 @@
-761d7a90df790e6947d4926b4c904192  shared-mime-info-0.16.cvs20051219.tar.gz
+17da05901ea08f31e6cde0cc04666b74  shared-mime-info-0.16.cvs20060212.tar.gz



From fedora-cvs-commits at redhat.com  Sun Feb 12 23:40:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 18:40:33 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.66,1.67
Message-ID: <200602122340.k1CNeXgP031390@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
git merge was _too_ clever, fixing breakage


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kernel-xen.spec	12 Feb 2006 19:11:00 -0000	1.66
+++ kernel-xen.spec	12 Feb 2006 23:40:31 -0000	1.67
@@ -1339,7 +1339,7 @@
 
 %post hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-devel
@@ -1352,6 +1352,7 @@
 
 %post guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
+/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-devel
@@ -1364,7 +1365,7 @@
 
 %post hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-PAE-devel
@@ -1377,6 +1378,7 @@
 
 %post guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
+/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post guest-PAE-devel
@@ -1471,6 +1473,8 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
 /boot/System.map-%{KVERREL}hypervisor
 /boot/config-%{KVERREL}hypervisor
+/boot/xen.gz-%{KVERREL}
+/boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}hypervisor
 /lib/modules/%{KVERREL}hypervisor/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
@@ -1509,6 +1513,8 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
 /boot/System.map-%{KVERREL}hypervisor-PAE
 /boot/config-%{KVERREL}hypervisor-PAE
+/boot/xen.gz-%{KVERREL}-PAE
+/boot/xen-syms-%{KVERREL}-PAE
 %dir /lib/modules/%{KVERREL}hypervisor-PAE
 /lib/modules/%{KVERREL}hypervisor-PAE/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build



From fedora-cvs-commits at redhat.com  Sun Feb 12 23:51:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 18:51:21 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc2-git12.bz2.sign, NONE,
	1.1 .cvsignore, 1.347, 1.348 kernel-2.6.spec, 1.1937,
	1.1938 sources, 1.289, 1.290 upstream, 1.263,
	1.264 patch-2.6.16-rc2-git11.bz2.sign, 1.1, NONE
Message-ID: <200602122351.k1CNpLmI011553@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc2-git12.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git11.bz2.sign 
Log Message:
git12



--- NEW FILE patch-2.6.16-rc2-git12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD74YtyGugalF9Dw4RAuqsAJ9kmFZDKMOHKHc8iWV3v08SpWXOyQCaA0di
J4/qcb/+rV5I5etK3Bt8ntU=
=8IhP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- .cvsignore	12 Feb 2006 07:28:07 -0000	1.347
+++ .cvsignore	12 Feb 2006 23:51:19 -0000	1.348
@@ -4,3 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
 patch-2.6.16-rc2-git11.bz2
+patch-2.6.16-rc2-git12.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1937
retrieving revision 1.1938
diff -u -r1.1937 -r1.1938
--- kernel-2.6.spec	12 Feb 2006 20:24:26 -0000	1.1937
+++ kernel-2.6.spec	12 Feb 2006 23:51:19 -0000	1.1938
@@ -159,8 +159,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
@@ -212,7 +211,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git11.bz2
+Patch2: patch-2.6.16-rc2-git12.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -1539,7 +1538,7 @@
 
 %changelog
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git11
+- 2.6.16rc2-git11 & -git12
 - Fix warning in bcm43xx driver.
 
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- sources	12 Feb 2006 07:28:08 -0000	1.289
+++ sources	12 Feb 2006 23:51:19 -0000	1.290
@@ -1,3 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 7f3f09bb84cf7e1ab6e30e7f8bf4ec9a  patch-2.6.16-rc2-git11.bz2
+e546fce308932221205f3aacab0337b9  patch-2.6.16-rc2-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- upstream	12 Feb 2006 07:28:08 -0000	1.263
+++ upstream	12 Feb 2006 23:51:19 -0000	1.264
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git11.bz2
+patch-2.6.16-rc2-git12.bz2


--- patch-2.6.16-rc2-git11.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 12 23:59:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 18:59:53 -0500
Subject: rpms/kernel/devel linux-2.6-missing-license.patch, NONE,
	1.1 linux-2.6-net-bluetooth-oops.patch, NONE,
	1.1 linux-2.6-net-ratelimit.patch, NONE,
	1.1 linux-2.6-sched-up-migration-cost.patch, NONE,
	1.1 kernel-2.6.spec, 1.1938, 1.1939
Message-ID: <200602122359.k1CNxrG0021716@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-missing-license.patch 
	linux-2.6-net-bluetooth-oops.patch 
	linux-2.6-net-ratelimit.patch 
	linux-2.6-sched-up-migration-cost.patch 
Log Message:
- Missing license tag in p8023
- Fix oops in bluetooth
- Ratelimit some networking messages
- Only print migration info on SMP



linux-2.6-missing-license.patch:
 p8023.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-missing-license.patch ---

Missing license tag.
I've assumed this is GPL.  (It could also use a MODULE_AUTHOR)

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/net/802/p8023.c~	2006-02-11 21:15:58.000000000 -0500
+++ linux-2.6.15.noarch/net/802/p8023.c	2006-02-11 21:16:06.000000000 -0500
@@ -59,3 +59,5 @@ void destroy_8023_client(struct datalink
 
 EXPORT_SYMBOL(destroy_8023_client);
 EXPORT_SYMBOL(make_8023_client);
+
+MODULE_LICENSE("GPL");



linux-2.6-net-bluetooth-oops.patch:
 hci_sock.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-net-bluetooth-oops.patch ---

> >  > >  > How do you produce these oopses, because I've never seen them.
> >  > > http://people.redhat.com/davej/sfuzz.c
> >  > > (it ran for a few hours before it caused the oopses)
> >  > 
> >  > Any options to make it appear faster? 
> > 
> > I just ran it with no arguments.
> 
> I was able to reproduce the hci_sock_getname() oops, but I have actually
> no idea how we can have a NULL pointer dereference in that code. Need to
> find a way to reproduce this faster. Took me at least 20 minutes before
> the oops appeared.

after modifying Ilja's tool, I was capable of reproducing these oopses
very fast, but it took me some time to understand why both are ending up
in a NULL pointer dereference. However here is a patch for them. The
sfuzz on AF_BLUETOOTH only is now running for over half an hour without
any oops. I will send this upstream as soon as possible.

Regards

Marcel

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index bdb6458..97bdec7 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -143,13 +143,15 @@ void hci_send_to_sock(struct hci_dev *hd
 static int hci_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct hci_dev *hdev = hci_pi(sk)->hdev;
+	struct hci_dev *hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
 	if (!sk)
 		return 0;
 
+	hdev = hci_pi(sk)->hdev;
+
 	bt_sock_unlink(&hci_sk_list, sk);
 
 	if (hdev) {
@@ -311,14 +313,18 @@ static int hci_sock_getname(struct socke
 {
 	struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr;
 	struct sock *sk = sock->sk;
+	struct hci_dev *hdev = hci_pi(sk)->hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
+	if (!hdev)
+		return -EBADFD;
+
 	lock_sock(sk);
 
 	*addr_len = sizeof(*haddr);
 	haddr->hci_family = AF_BLUETOOTH;
-	haddr->hci_dev    = hci_pi(sk)->hdev->id;
+	haddr->hci_dev    = hdev->id;
 
 	release_sock(sk);
 	return 0;



linux-2.6-net-ratelimit.patch:
 include/net/irda/irda.h |    6 +++---
 net/atm/signaling.c     |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-ratelimit.patch ---

This seems to be trivial to trigger.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/net/atm/signaling.c~	2006-02-11 19:20:09.000000000 -0500
+++ linux-2.6.15.noarch/net/atm/signaling.c	2006-02-11 19:21:30.000000000 -0500
@@ -56,7 +56,8 @@ static void sigd_put_skb(struct sk_buff 
 	remove_wait_queue(&sigd_sleep,&wait);
 #else
 	if (!sigd) {
-		printk(KERN_WARNING "atmsvc: no signaling demon\n");
+		if (net_ratelimit())
+			printk(KERN_WARNING "atmsvc: no signaling demon\n");
 		kfree_skb(skb);
 		return;
 	}


--- linux-2.6.15.noarch/include/net/irda/irda.h~	2006-02-11 19:26:02.000000000 -0500
+++ linux-2.6.15.noarch/include/net/irda/irda.h	2006-02-11 19:26:24.000000000 -0500
@@ -84,7 +84,7 @@ do { if(!(expr)) { \
 
-#define IRDA_WARNING(args...) printk(KERN_WARNING args)
-#define IRDA_MESSAGE(args...) printk(KERN_INFO args)
-#define IRDA_ERROR(args...)   printk(KERN_ERR args)
+#define IRDA_WARNING(args...) do { if (net_ratelimit()) printk(KERN_WARNING args); } while (0)
+#define IRDA_MESSAGE(args...) do { if (net_ratelimit()) printk(KERN_INFO args); } while (0)
+#define IRDA_ERROR(args...)   do { if (net_ratelimit()) printk(KERN_ERR args); } while (0)
 
 /*
  *  Magic numbers used by Linux-IrDA. Random numbers which must be unique to 






linux-2.6-sched-up-migration-cost.patch:
 sched.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-sched-up-migration-cost.patch ---
--- 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
 #endif
 		);
 	if (system_state == SYSTEM_BOOTING) {
-		printk("migration_cost=");
+		if (num_online_cpus() > 1)
+			printk("migration_cost=");
 		for (distance = 0; distance <= max_distance; distance++) {
 			if (distance)
 				printk(",");


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1938
retrieving revision 1.1939
diff -u -r1.1938 -r1.1939
--- kernel-2.6.spec	12 Feb 2006 23:51:19 -0000	1.1938
+++ kernel-2.6.spec	12 Feb 2006 23:59:48 -0000	1.1939
@@ -360,6 +360,10 @@
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-disable-broken-radeon-drm.patch
+Patch1870: linux-2.6-missing-license.patch
+Patch1880: linux-2.6-net-bluetooth-oops.patch
+Patch1881: linux-2.6-net-ratelimit.patch
+Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -924,6 +928,14 @@
 %patch1850 -p1
 # Disable broken radeon DRM for now
 %patch1860 -p1
+# Missing license tag in p8023
+%patch1870 -p1
+# Fix oops in bluetooth
+%patch1880 -p1
+# Ratelimit some networking messages
+%patch1881 -p1
+# Only print migration info on SMP
+%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1540,6 +1552,10 @@
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git11 & -git12
 - Fix warning in bcm43xx driver.
+- Missing license tag in p8023
+- Fix oops in bluetooth
+- Ratelimit some networking messages
+- Only print migration info on SMP
 
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10



From fedora-cvs-commits at redhat.com  Mon Feb 13 00:34:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 19:34:04 -0500
Subject: rpms/kernel/devel/configs config-generic, 1.149,
	1.150 config-powerpc32-generic, 1.11, 1.12 config-powerpc64,
	1.9, 1.10 config-s390, 1.1, 1.2 config-s390x, 1.1,
	1.2 config-x86-generic, 1.33, 1.34 config-x86_64-generic, 1.29, 1.30
Message-ID: <200602130034.k1D0Y4w1012250@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic config-powerpc32-generic config-powerpc64 
	config-s390 config-s390x config-x86-generic 
	config-x86_64-generic 
Log Message:
remove dead options



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- config-generic	9 Feb 2006 21:45:33 -0000	1.149
+++ config-generic	13 Feb 2006 00:33:51 -0000	1.150
@@ -10,7 +10,6 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
@@ -69,7 +68,6 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_DEBUG_KOBJECT is not set
 
 #
@@ -344,7 +342,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
@@ -543,8 +540,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
@@ -670,53 +665,31 @@
 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_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_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
@@ -746,29 +719,22 @@
 #
 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_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=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_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
@@ -1738,7 +1704,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
@@ -1772,7 +1737,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
@@ -1838,7 +1802,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
@@ -2163,7 +2126,6 @@
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_NOKIA_DKU2=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -2450,23 +2412,12 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_DEBUG_RODATA is not set
 CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
-CONFIG_KMALLOC_ACCOUNTING=y
-
-# CONFIG_WAKEUP_TIMING is not set
-# CONFIG_WAKEUP_LATENCY_HIST is not set
-# CONFIG_CRITICAL_PREEMPT_TIMING is not set
-# CONFIG_CRITICAL_IRQSOFF_TIMING is not set
-# CONFIG_LATENCY_TIMING is not set
-# CONFIG_LATENCY_TRACE is not set
-# CONFIG_MCOUNT is not set
-
 
 #
 # Security options


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-powerpc32-generic	9 Feb 2006 21:45:33 -0000	1.11
+++ config-powerpc32-generic	13 Feb 2006 00:33:52 -0000	1.12
@@ -56,7 +56,6 @@
 
 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


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-powerpc64	10 Jan 2006 01:46:00 -0000	1.9
+++ config-powerpc64	13 Feb 2006 00:33:52 -0000	1.10
@@ -28,7 +28,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-s390
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	13 Feb 2006 00:33:52 -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-s390x
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	13 Feb 2006 00:33:52 -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/devel/configs/config-x86-generic,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- config-x86-generic	3 Feb 2006 20:42:35 -0000	1.33
+++ config-x86-generic	13 Feb 2006 00:33:52 -0000	1.34
@@ -236,7 +236,6 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-CONFIG_IPW_DEBUG=y
 CONFIG_IPW2200=m
 
 CONFIG_BLK_DEV_AMD74XX=y
@@ -269,10 +268,6 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_WAKEUP_TIMING=y
-CONFIG_LATENCY_TIMING=y
-CONFIG_LATENCY_TRACE=y
-CONFIG_MCOUNT=y
 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- config-x86_64-generic	3 Feb 2006 20:42:35 -0000	1.29
+++ config-x86_64-generic	13 Feb 2006 00:33:52 -0000	1.30
@@ -14,9 +14,7 @@
 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_SWIOTLB=y
@@ -106,7 +104,6 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2200=m
 
 CONFIG_PNP=y
@@ -141,11 +138,6 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_WAKEUP_TIMING=y
-CONFIG_LATENCY_TIMING=y
-CONFIG_LATENCY_TRACE=y
-CONFIG_MCOUNT=y
-
 CONFIG_NVRAM=m
 
 CONFIG_EDAC=y



From fedora-cvs-commits at redhat.com  Mon Feb 13 00:33:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 19:33:53 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1939,1.1940
Message-ID: <200602130033.k1D0Xrgo012209@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
remove dead options



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1939
retrieving revision 1.1940
diff -u -r1.1939 -r1.1940
--- kernel-2.6.spec	12 Feb 2006 23:59:48 -0000	1.1939
+++ kernel-2.6.spec	13 Feb 2006 00:33:51 -0000	1.1940
@@ -1556,6 +1556,7 @@
 - Fix oops in bluetooth
 - Ratelimit some networking messages
 - Only print migration info on SMP
+- Remove a bunch of dead CONFIG_ options from the configs.
 
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10



From fedora-cvs-commits at redhat.com  Mon Feb 13 01:17:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 20:17:49 -0500
Subject: rpms/libgssapi/devel libgssapi-0.1-pkgconfig.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 libgssapi.spec, 1.5, 1.6 sources, 1.2,
	1.3 libgssapi-0.7-gssapi_mech.patch, 1.1, NONE
Message-ID: <200602130117.k1D1HnXW020785@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20743/devel

Modified Files:
	.cvsignore libgssapi.spec sources 
Added Files:
	libgssapi-0.1-pkgconfig.patch 
Removed Files:
	libgssapi-0.7-gssapi_mech.patch 
Log Message:
auto-import libgssapi-0.1-1 on branch devel from libgssapi-0.1-1.src.rpm

libgssapi-0.1-pkgconfig.patch:
 configure.in    |    4 ++--
 libgssapi.pc.in |   11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE libgssapi-0.1-pkgconfig.patch ---
--- libgssapi-0.1/configure.in.orig	2004-10-22 10:58:34.000000000 -0400
+++ libgssapi-0.1/configure.in	2006-02-10 09:13:55.000000000 -0500
@@ -96,7 +96,7 @@ for dir in $krb5_with /usr/kerberos /usr
          AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME),,$KRBLIB)
       break
     fi
-    CFLAGS=$CFLAGS `K5CONFIG --cflags`
+    CFLAGS=$CFLAGS `$K5CONFIG --cflags`
   fi
 done
 dnl We didn't find a usable Kerberos environment
@@ -117,4 +117,4 @@ AC_SUBST([KRBDIR])
 AC_SUBST([KRBLIB])
 AC_SUBST([K5VERS])
 
-AC_OUTPUT
+AC_OUTPUT(libgssapi.pc)
--- libgssapi-0.1/libgssapi.pc.in.orig	2006-02-10 09:13:15.000000000 -0500
+++ libgssapi-0.1/libgssapi.pc.in	2006-02-10 09:12:05.000000000 -0500
@@ -0,0 +1,11 @@
+prefix=@exec_prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/gssglue
+
+Name: libgssapi
+Description: Library that implements multi-mechanism GSS-API interface.
+Requires:
+Version: @PACKAGE_VERSION@
+Libs: -L at libdir@ -lgssapi -ldl
+Cflags: -I at includedir@/gssglue


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 22:07:23 -0000	1.2
+++ .cvsignore	13 Feb 2006 01:17:47 -0000	1.3
@@ -1 +1 @@
-libgssapi-0.7.tar.gz
+libgssapi-0.1.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgssapi.spec	11 Feb 2006 04:06:33 -0000	1.5
+++ libgssapi.spec	13 Feb 2006 01:17:47 -0000	1.6
@@ -1,10 +1,10 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
-Version: 0.7
-Release: 2.1
+Version: 0.1
+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.1.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
+Patch0: libgssapi-0.1-pkgconfig.patch
 
 %description devel
 This package includes header files and libraries necessary for
@@ -31,17 +31,24 @@
 
 %prep
 %setup -q
+
 %patch0 -p1
 
 %build
+autoconf
 %configure --prefix=%{buildroot}
 make all 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/etc
+mkdir -p %{buildroot}/{/etc,/usr/include,/usr/lib/pkgconfig}
+mkdir -p %{buildroot}/usr/include/gssglue/gssapi
+
 %makeinstall
-install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
+
+install -m 644 debian/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
+install -m 644 libgssapi.pc  %{buildroot}/usr/lib/pkgconfig/libgssapi.pc
+install -m 644 include/gssapi/gssapi.h  %{buildroot}/usr/include/gssglue/gssapi/gssapi.h
 
 %post -p /sbin/ldconfig
 
@@ -50,7 +57,6 @@
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README
@@ -66,14 +72,5 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.7-2.1
-- bump again for double-long bug on ppc(64)
-
-* Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
-- remove empty scripts
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Jan 6 2006 Steve Dickson <steved at redhat.com>  0.7-1
+* Fri Feb 10 2006 Steve Dickson <steved at redhat.com>  0.1-1
 - Initial commit


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 22:07:23 -0000	1.2
+++ sources	13 Feb 2006 01:17:47 -0000	1.3
@@ -1 +1 @@
-13979d132daf7dd5d3a591c08cd4979f  libgssapi-0.7.tar.gz
+6e37f3d1366fee219fd714e5f30b7649  libgssapi-0.1.tar.gz


--- libgssapi-0.7-gssapi_mech.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 01:21:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 20:21:51 -0500
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.13,
	1.14 gnome-doc-utils.spec, 1.16, 1.17 sources, 1.13, 1.14
Message-ID: <200602130121.k1D1LpP9022728@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22671

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 Jan 2006 04:21:05 -0000	1.13
+++ .cvsignore	13 Feb 2006 01:21:49 -0000	1.14
@@ -10,3 +10,4 @@
 gnome-doc-utils-0.5.2.tar.bz2
 gnome-doc-utils-0.5.3.tar.bz2
 gnome-doc-utils-0.5.4.tar.bz2
+gnome-doc-utils-0.5.5.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-doc-utils.spec	31 Jan 2006 04:21:05 -0000	1.16
+++ gnome-doc-utils.spec	13 Feb 2006 01:21:49 -0000	1.17
@@ -1,6 +1,6 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
-Version: 0.5.4
+Version: 0.5.5
 Release: 1
 License: LGPL
 Group: Development/Tools
@@ -53,6 +53,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.5-1
+- Update to 0.5.5
+
 * Mon Jan 30 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.4-1
 - Update to 0.5.4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Jan 2006 04:21:05 -0000	1.13
+++ sources	13 Feb 2006 01:21:49 -0000	1.14
@@ -1 +1 @@
-87c12c7d7c984b289df58c3a49726fd4  gnome-doc-utils-0.5.4.tar.bz2
+ce9a4787afb9aac91ce55bbee2127d43  gnome-doc-utils-0.5.5.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 01:24:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 20:24:18 -0500
Subject: rpms/libgssapi/devel libgssapi-0.7-gssapi_mech.patch, 1.2,
	1.3 .cvsignore, 1.3, 1.4 libgssapi.spec, 1.6, 1.7 sources, 1.3,
	1.4 libgssapi-0.1-pkgconfig.patch, 1.1, NONE
Message-ID: <200602130124.k1D1OIcM023948@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23901/devel

Modified Files:
	.cvsignore libgssapi.spec sources 
Added Files:
	libgssapi-0.7-gssapi_mech.patch 
Removed Files:
	libgssapi-0.1-pkgconfig.patch 
Log Message:
auto-import libgssapi-0.7-2 on branch devel from libgssapi-0.7-2.src.rpm

libgssapi-0.7-gssapi_mech.patch:
 gssapi_mech.conf |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: libgssapi-0.7-gssapi_mech.patch
===================================================================
RCS file: libgssapi-0.7-gssapi_mech.patch
diff -N libgssapi-0.7-gssapi_mech.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libgssapi-0.7-gssapi_mech.patch	13 Feb 2006 01:24:14 -0000	1.3
@@ -0,0 +1,11 @@
+--- libgssapi-0.7/doc/gssapi_mech.conf.orig	2005-11-22 10:16:31.000000000 -0500
++++ libgssapi-0.7/doc/gssapi_mech.conf	2006-01-06 16:48:11.904014000 -0500
+@@ -15,7 +15,7 @@
+ # library                               initialization function
+ # ================================	==========================
+ # The MIT K5 gssapi library, use special function for initialization.
+-/usr/lib/libgssapi_krb5.so		mechglue_internal_krb5_init
++libgssapi_krb5.so.2		mechglue_internal_krb5_init
+ #
+ # The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
+ # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2006 01:17:47 -0000	1.3
+++ .cvsignore	13 Feb 2006 01:24:14 -0000	1.4
@@ -1 +1 @@
-libgssapi-0.1.tar.gz
+libgssapi-0.7.tar.gz


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgssapi.spec	13 Feb 2006 01:17:47 -0000	1.6
+++ libgssapi.spec	13 Feb 2006 01:24:14 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
-Version: 0.1
-Release: 1
+Version: 0.7
+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.1.tar.gz
+Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-0.7.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.1-pkgconfig.patch
+Patch0: libgssapi-0.7-gssapi_mech.patch
 
 %description devel
 This package includes header files and libraries necessary for
@@ -31,24 +31,17 @@
 
 %prep
 %setup -q
-
 %patch0 -p1
 
 %build
-autoconf
 %configure --prefix=%{buildroot}
 make all 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/{/etc,/usr/include,/usr/lib/pkgconfig}
-mkdir -p %{buildroot}/usr/include/gssglue/gssapi
-
+mkdir -p %{buildroot}/etc
 %makeinstall
-
-install -m 644 debian/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
-install -m 644 libgssapi.pc  %{buildroot}/usr/lib/pkgconfig/libgssapi.pc
-install -m 644 include/gssapi/gssapi.h  %{buildroot}/usr/include/gssglue/gssapi/gssapi.h
+install -m 644 doc/gssapi_mech.conf %{buildroot}/etc/gssapi_mech.conf
 
 %post -p /sbin/ldconfig
 
@@ -57,6 +50,7 @@
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README
@@ -72,5 +66,11 @@
 %{_libdir}/pkgconfig/libgssapi.pc
 
 %changelog
-* Fri Feb 10 2006 Steve Dickson <steved at redhat.com>  0.1-1
+* Thu Feb 09 2006 Florian La Roche <laroche at redhat.com>
+- remove empty scripts
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.7-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Jan 6 2006 Steve Dickson <steved at redhat.com>  0.7-1
 - Initial commit


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2006 01:17:47 -0000	1.3
+++ sources	13 Feb 2006 01:24:14 -0000	1.4
@@ -1 +1 @@
-6e37f3d1366fee219fd714e5f30b7649  libgssapi-0.1.tar.gz
+13979d132daf7dd5d3a591c08cd4979f  libgssapi-0.7.tar.gz


--- libgssapi-0.1-pkgconfig.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 01:26:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 20:26:42 -0500
Subject: rpms/yelp/devel .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 yelp.spec,
	1.51, 1.52
Message-ID: <200602130126.k1D1QgO6017288@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12010

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.13.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	31 Jan 2006 05:20:50 -0000	1.22
+++ .cvsignore	13 Feb 2006 01:26:39 -0000	1.23
@@ -11,3 +11,4 @@
 yelp-2.13.2.tar.bz2
 yelp-2.13.3.tar.bz2
 yelp-2.13.4.tar.bz2
+yelp-2.13.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	31 Jan 2006 05:20:51 -0000	1.22
+++ sources	13 Feb 2006 01:26:39 -0000	1.23
@@ -1 +1 @@
-5b588e1e21f2f5c1e0333c2a7405dea6  yelp-2.13.4.tar.bz2
+8db22c647577c6c3b5249ecc3cc9987a  yelp-2.13.5.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- yelp.spec	11 Feb 2006 06:37:18 -0000	1.51
+++ yelp.spec	13 Feb 2006 01:26:39 -0000	1.52
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.13.4
-Release: 1.2
+Version: 2.13.5
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-1
+- Update to 2.13.5
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 01:26:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 20:26:54 -0500
Subject: rpms/libgssapi/devel libgssapi.spec,1.7,1.8
Message-ID: <200602130126.k1D1Qs89019023@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/libgssapi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19001/devel

Modified Files:
	libgssapi.spec 
Log Message:
auto-import libgssapi-0.7-3 on branch devel from libgssapi-0.7-3.src.rpm


Index: libgssapi.spec
===================================================================
RCS file: /cvs/dist/rpms/libgssapi/devel/libgssapi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgssapi.spec	13 Feb 2006 01:24:14 -0000	1.7
+++ libgssapi.spec	13 Feb 2006 01:26:52 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Generic Security Services Application Programming Interface Library
 Name: libgssapi
 Version: 0.7
-Release: 2
+Release: 3
 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



From fedora-cvs-commits at redhat.com  Mon Feb 13 02:02:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 21:02:02 -0500
Subject: rpms/yelp/devel yelp.spec,1.52,1.53
Message-ID: <200602130202.k1D222Nk009754@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9722

Modified Files:
	yelp.spec 
Log Message:
turn on man and info support



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- yelp.spec	13 Feb 2006 01:26:39 -0000	1.52
+++ yelp.spec	13 Feb 2006 02:01:58 -0000	1.53
@@ -13,7 +13,7 @@
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
 Version: 2.13.5
-Release: 1
+Release: 2
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -70,8 +70,8 @@
 %configure                        \
 	--enable-search	  	  \
 	--with-mozilla=mozilla    \
-	--disable-man             \
-	--disable-info            \
+	--enable-man  	          \
+	--enable-info             \
 	--disable-schemas-install
 make
 
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-2
+- Turn on info and man support for test3
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-1
 - Update to 2.13.5
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:05:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:05:44 -0500
Subject: rpms/kernel-xen/devel/configs config-generic, 1.7,
	1.8 config-powerpc32-generic, 1.4, 1.5 config-powerpc64, 1.3,
	1.4 config-s390, 1.2, 1.3 config-s390x, 1.2,
	1.3 config-x86-generic, 1.9, 1.10 config-x86_64-generic, 1.7, 1.8
Message-ID: <200602130305.k1D35ixb022599@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	config-generic config-powerpc32-generic config-powerpc64 
	config-s390 config-s390x config-x86-generic 
	config-x86_64-generic 
Log Message:
rebase rawhide 1.1940


Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-generic	10 Feb 2006 03:25:21 -0000	1.7
+++ config-generic	13 Feb 2006 03:05:31 -0000	1.8
@@ -10,7 +10,6 @@
 # Code maturity level options
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 #
@@ -69,7 +68,6 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
 # CONFIG_DEBUG_KOBJECT is not set
 
 #
@@ -344,7 +342,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
@@ -543,8 +540,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
@@ -670,53 +665,31 @@
 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_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_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
@@ -746,29 +719,22 @@
 #
 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_FRAG=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_MULTIPORT=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_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
@@ -1738,7 +1704,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
@@ -1772,7 +1737,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
@@ -1838,7 +1802,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
@@ -2163,7 +2126,6 @@
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_NOKIA_DKU2=m
 CONFIG_USB_SERIAL_OPTION=y
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
@@ -2450,23 +2412,12 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_DEBUG_RODATA is not set
 CONFIG_BOOT_DELAY=y
 
 # Turn off these debug options for production kernels.
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_VM=y
-CONFIG_KMALLOC_ACCOUNTING=y
-
-# CONFIG_WAKEUP_TIMING is not set
-# CONFIG_WAKEUP_LATENCY_HIST is not set
-# CONFIG_CRITICAL_PREEMPT_TIMING is not set
-# CONFIG_CRITICAL_IRQSOFF_TIMING is not set
-# CONFIG_LATENCY_TIMING is not set
-# CONFIG_LATENCY_TRACE is not set
-# CONFIG_MCOUNT is not set
-
 
 #
 # Security options


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc32-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-powerpc32-generic	10 Feb 2006 03:25:21 -0000	1.4
+++ config-powerpc32-generic	13 Feb 2006 03:05:32 -0000	1.5
@@ -56,7 +56,6 @@
 
 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


Index: config-powerpc64
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-powerpc64	26 Jan 2006 22:14:35 -0000	1.3
+++ config-powerpc64	13 Feb 2006 03:05:32 -0000	1.4
@@ -28,7 +28,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-s390
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-s390,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-s390	21 Dec 2005 11:24:56 -0000	1.2
+++ config-s390	13 Feb 2006 03:05:32 -0000	1.3
@@ -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-s390x
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-s390x,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-s390x	21 Dec 2005 11:24:56 -0000	1.2
+++ config-s390x	13 Feb 2006 03:05:32 -0000	1.3
@@ -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-xen/devel/configs/config-x86-generic,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- config-x86-generic	10 Feb 2006 18:24:04 -0000	1.9
+++ config-x86-generic	13 Feb 2006 03:05:32 -0000	1.10
@@ -238,7 +238,6 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-CONFIG_IPW_DEBUG=y
 CONFIG_IPW2200=m
 
 CONFIG_BLK_DEV_AMD74XX=y
@@ -271,10 +270,6 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_WAKEUP_TIMING=y
-CONFIG_LATENCY_TIMING=y
-CONFIG_LATENCY_TRACE=y
-CONFIG_MCOUNT=y
 CONFIG_CS5535_GPIO=m
 
 CONFIG_EDAC=y


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-x86_64-generic	10 Feb 2006 18:24:04 -0000	1.7
+++ config-x86_64-generic	13 Feb 2006 03:05:32 -0000	1.8
@@ -15,9 +15,7 @@
 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_SWIOTLB=y
@@ -107,7 +105,6 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2200=m
 
 CONFIG_PNP=y
@@ -142,11 +139,6 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-CONFIG_WAKEUP_TIMING=y
-CONFIG_LATENCY_TIMING=y
-CONFIG_LATENCY_TRACE=y
-CONFIG_MCOUNT=y
-
 CONFIG_NVRAM=m
 
 CONFIG_EDAC=y



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:05:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:05:33 -0500
Subject: rpms/kernel-xen/devel linux-2.6-bcm-warnings.patch, NONE,
	1.1 linux-2.6-missing-license.patch, NONE,
	1.1 linux-2.6-net-bluetooth-oops.patch, NONE,
	1.1 linux-2.6-net-ratelimit.patch, NONE,
	1.1 linux-2.6-sched-up-migration-cost.patch, NONE,
	1.1 patch-2.6.16-rc2-git12.bz2.sign, NONE, 1.1 .cvsignore,
	1.18, 1.19 kernel-xen.spec, 1.67,
	1.68 linux-2.6-debug-Wundef.patch, 1.2, 1.3 sources, 1.18,
	1.19 upstream, 1.10, 1.11 patch-2.6.16-rc2-git11.bz2.sign, 1.1, NONE
Message-ID: <200602130305.k1D35Xak022566@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-xen.spec linux-2.6-debug-Wundef.patch 
	sources upstream 
Added Files:
	linux-2.6-bcm-warnings.patch linux-2.6-missing-license.patch 
	linux-2.6-net-bluetooth-oops.patch 
	linux-2.6-net-ratelimit.patch 
	linux-2.6-sched-up-migration-cost.patch 
	patch-2.6.16-rc2-git12.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git11.bz2.sign 
Log Message:
rebase rawhide 1.1940

linux-2.6-bcm-warnings.patch:
 bcm43xx_wx.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-bcm-warnings.patch ---

drivers/net/wireless/bcm43xx/bcm43xx_wx.c:519: warning: implicit declaration of function 'bcm43xx_phy_xmitpower'

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c~	2006-02-12 15:20:41.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c	2006-02-12 15:21:40.000000000 -0500
@@ -40,6 +40,7 @@
 #include "bcm43xx_wx.h"
 #include "bcm43xx_main.h"
 #include "bcm43xx_radio.h"
+#include "bcm43xx_phy.h"
 
 
 /* The WIRELESS_EXT version, which is implemented by this driver. */

linux-2.6-missing-license.patch:
 p8023.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-missing-license.patch ---

Missing license tag.
I've assumed this is GPL.  (It could also use a MODULE_AUTHOR)

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/net/802/p8023.c~	2006-02-11 21:15:58.000000000 -0500
+++ linux-2.6.15.noarch/net/802/p8023.c	2006-02-11 21:16:06.000000000 -0500
@@ -59,3 +59,5 @@ void destroy_8023_client(struct datalink
 
 EXPORT_SYMBOL(destroy_8023_client);
 EXPORT_SYMBOL(make_8023_client);
+
+MODULE_LICENSE("GPL");



linux-2.6-net-bluetooth-oops.patch:
 hci_sock.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-net-bluetooth-oops.patch ---

> >  > >  > How do you produce these oopses, because I've never seen them.
> >  > > http://people.redhat.com/davej/sfuzz.c
> >  > > (it ran for a few hours before it caused the oopses)
> >  > 
> >  > Any options to make it appear faster? 
> > 
> > I just ran it with no arguments.
> 
> I was able to reproduce the hci_sock_getname() oops, but I have actually
> no idea how we can have a NULL pointer dereference in that code. Need to
> find a way to reproduce this faster. Took me at least 20 minutes before
> the oops appeared.

after modifying Ilja's tool, I was capable of reproducing these oopses
very fast, but it took me some time to understand why both are ending up
in a NULL pointer dereference. However here is a patch for them. The
sfuzz on AF_BLUETOOTH only is now running for over half an hour without
any oops. I will send this upstream as soon as possible.

Regards

Marcel

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index bdb6458..97bdec7 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -143,13 +143,15 @@ void hci_send_to_sock(struct hci_dev *hd
 static int hci_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct hci_dev *hdev = hci_pi(sk)->hdev;
+	struct hci_dev *hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
 	if (!sk)
 		return 0;
 
+	hdev = hci_pi(sk)->hdev;
+
 	bt_sock_unlink(&hci_sk_list, sk);
 
 	if (hdev) {
@@ -311,14 +313,18 @@ static int hci_sock_getname(struct socke
 {
 	struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr;
 	struct sock *sk = sock->sk;
+	struct hci_dev *hdev = hci_pi(sk)->hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
+	if (!hdev)
+		return -EBADFD;
+
 	lock_sock(sk);
 
 	*addr_len = sizeof(*haddr);
 	haddr->hci_family = AF_BLUETOOTH;
-	haddr->hci_dev    = hci_pi(sk)->hdev->id;
+	haddr->hci_dev    = hdev->id;
 
 	release_sock(sk);
 	return 0;



linux-2.6-net-ratelimit.patch:
 include/net/irda/irda.h |    6 +++---
 net/atm/signaling.c     |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-ratelimit.patch ---

This seems to be trivial to trigger.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/net/atm/signaling.c~	2006-02-11 19:20:09.000000000 -0500
+++ linux-2.6.15.noarch/net/atm/signaling.c	2006-02-11 19:21:30.000000000 -0500
@@ -56,7 +56,8 @@ static void sigd_put_skb(struct sk_buff 
 	remove_wait_queue(&sigd_sleep,&wait);
 #else
 	if (!sigd) {
-		printk(KERN_WARNING "atmsvc: no signaling demon\n");
+		if (net_ratelimit())
+			printk(KERN_WARNING "atmsvc: no signaling demon\n");
 		kfree_skb(skb);
 		return;
 	}


--- linux-2.6.15.noarch/include/net/irda/irda.h~	2006-02-11 19:26:02.000000000 -0500
+++ linux-2.6.15.noarch/include/net/irda/irda.h	2006-02-11 19:26:24.000000000 -0500
@@ -84,7 +84,7 @@ do { if(!(expr)) { \
 
-#define IRDA_WARNING(args...) printk(KERN_WARNING args)
-#define IRDA_MESSAGE(args...) printk(KERN_INFO args)
-#define IRDA_ERROR(args...)   printk(KERN_ERR args)
+#define IRDA_WARNING(args...) do { if (net_ratelimit()) printk(KERN_WARNING args); } while (0)
+#define IRDA_MESSAGE(args...) do { if (net_ratelimit()) printk(KERN_INFO args); } while (0)
+#define IRDA_ERROR(args...)   do { if (net_ratelimit()) printk(KERN_ERR args); } while (0)
 
 /*
  *  Magic numbers used by Linux-IrDA. Random numbers which must be unique to 






linux-2.6-sched-up-migration-cost.patch:
 sched.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-sched-up-migration-cost.patch ---
--- 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
 #endif
 		);
 	if (system_state == SYSTEM_BOOTING) {
-		printk("migration_cost=");
+		if (num_online_cpus() > 1)
+			printk("migration_cost=");
 		for (distance = 0; distance <= max_distance; distance++) {
 			if (distance)
 				printk(",");


--- NEW FILE patch-2.6.16-rc2-git12.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD74YtyGugalF9Dw4RAuqsAJ9kmFZDKMOHKHc8iWV3v08SpWXOyQCaA0di
J4/qcb/+rV5I5etK3Bt8ntU=
=8IhP
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	12 Feb 2006 18:27:29 -0000	1.18
+++ .cvsignore	13 Feb 2006 03:05:17 -0000	1.19
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc2-git11.bz2
+patch-2.6.16-rc2-git12.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kernel-xen.spec	12 Feb 2006 23:40:31 -0000	1.67
+++ kernel-xen.spec	13 Feb 2006 03:05:18 -0000	1.68
@@ -161,7 +161,6 @@
 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 i686 x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
@@ -218,7 +217,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git11.bz2
+Patch2: patch-2.6.16-rc2-git12.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -374,6 +373,10 @@
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-disable-broken-radeon-drm.patch
+Patch1870: linux-2.6-missing-license.patch
+Patch1880: linux-2.6-net-bluetooth-oops.patch
+Patch1881: linux-2.6-net-ratelimit.patch
+Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -391,6 +394,7 @@
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
 Patch5002: linux-2.6-bcm43xx-git-mb.patch
+Patch5003: linux-2.6-bcm-warnings.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -949,6 +953,14 @@
 %patch1850 -p1
 # Disable broken radeon DRM for now
 %patch1860 -p1
+# Missing license tag in p8023
+%patch1870 -p1
+# Fix oops in bluetooth
+%patch1880 -p1
+# Ratelimit some networking messages
+%patch1881 -p1
+# Only print migration info on SMP
+%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -977,6 +989,8 @@
 %patch5001 -p1
 # ... and Michael Buesch's updates (2006-02-03)
 %patch5002 -p1
+# warning fix.
+%patch5003 -p1
 
 #
 # final stuff
@@ -1578,12 +1592,22 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
+- rebase with rawhide 1.1940.
+- build only for x86_64 & i686.
+
 * Sun Feb 12 2006 Juan Quintela <quintela at redhat.com>
 - make real release, only with x86_64 & i686.
 - rebase with rawhide 1.1936
 
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git11
+- 2.6.16rc2-git11 & -git12
+- Fix warning in bcm43xx driver.
+- Missing license tag in p8023
+- Fix oops in bluetooth
+- Ratelimit some networking messages
+- Only print migration info on SMP
+- Remove a bunch of dead CONFIG_ options from the configs.
 
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10

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-xen/devel/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	21 Dec 2005 11:24:51 -0000	1.2
+++ linux-2.6-debug-Wundef.patch	13 Feb 2006 03:05:19 -0000	1.3
@@ -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
+--- 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"
  
  HOSTCC  	= gcc
  HOSTCXX  	= g++
 -HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef
++HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Wundef -Werror-implicit-function-declaration
  HOSTCXXFLAGS	= -O2
  
  # 	Decide whether to build built-in, modular, or both.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Feb 2006 18:27:29 -0000	1.18
+++ sources	13 Feb 2006 03:05:19 -0000	1.19
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-7f3f09bb84cf7e1ab6e30e7f8bf4ec9a  patch-2.6.16-rc2-git11.bz2
+e546fce308932221205f3aacab0337b9  patch-2.6.16-rc2-git12.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- upstream	12 Feb 2006 18:27:29 -0000	1.10
+++ upstream	13 Feb 2006 03:05:19 -0000	1.11
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git11.bz2
+patch-2.6.16-rc2-git12.bz2


--- patch-2.6.16-rc2-git11.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:11:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:11:43 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3.bz2.sign, NONE, 1.1 .cvsignore,
	1.348, 1.349 kernel-2.6.spec, 1.1940, 1.1941 sources, 1.290,
	1.291 upstream, 1.264, 1.265 patch-2.6.16-rc2-git12.bz2.sign,
	1.1, NONE patch-2.6.16-rc2.bz2.sign, 1.1, NONE
Message-ID: <200602130311.k1D3BhnD024646@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc3.bz2.sign 
Removed Files:
	patch-2.6.16-rc2-git12.bz2.sign patch-2.6.16-rc2.bz2.sign 
Log Message:
rc3



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

iD8DBQBD7/XoyGugalF9Dw4RAhgyAJwPT97RrfAglisQMGA6yaK1FLsN/gCggIQl
bImjY6eqBFMjDMexsQXbBR8=
=084z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- .cvsignore	12 Feb 2006 23:51:19 -0000	1.348
+++ .cvsignore	13 Feb 2006 03:11:41 -0000	1.349
@@ -2,6 +2,4 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc2.bz2
-patch-2.6.16-rc2-git11.bz2
-patch-2.6.16-rc2-git12.bz2
+patch-2.6.16-rc3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1940
retrieving revision 1.1941
diff -u -r1.1940 -r1.1941
--- kernel-2.6.spec	13 Feb 2006 00:33:51 -0000	1.1940
+++ kernel-2.6.spec	13 Feb 2006 03:11:41 -0000	1.1941
@@ -210,8 +210,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git12.bz2
+Patch1: patch-2.6.16-rc3.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -672,7 +671,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 #
@@ -1550,7 +1548,7 @@
 
 %changelog
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git11 & -git12
+- 2.6.16rc2-git11, -git12, and 2.6.16rc3
 - Fix warning in bcm43xx driver.
 - Missing license tag in p8023
 - Fix oops in bluetooth


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- sources	12 Feb 2006 23:51:19 -0000	1.290
+++ sources	13 Feb 2006 03:11:41 -0000	1.291
@@ -1,4 +1,2 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
-7f3f09bb84cf7e1ab6e30e7f8bf4ec9a  patch-2.6.16-rc2-git11.bz2
-e546fce308932221205f3aacab0337b9  patch-2.6.16-rc2-git12.bz2
+ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- upstream	12 Feb 2006 23:51:19 -0000	1.264
+++ upstream	13 Feb 2006 03:11:41 -0000	1.265
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc2.bz2
+patch-2.6.16-rc3.bz2
 patch-2.6.16-rc2-git12.bz2


--- patch-2.6.16-rc2-git12.bz2.sign DELETED ---


--- patch-2.6.16-rc2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:20:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:20:47 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin-shuangpin.patch,NONE,1.1
Message-ID: <200602130320.k1D3Klm4008694@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8179

Added Files:
	scim-pinyin-shuangpin.patch 
Log Message:
qshen: remove the MS and Ziguang shuangpin plans from the scim-pinyin shuangpin plan list


scim-pinyin-shuangpin.patch:
 scim_pinyin_imengine.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE scim-pinyin-shuangpin.patch ---
--- scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp.shuangpin-modify	2006-02-13 11:07:59.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-02-13 11:08:36.000000000 +0800
@@ -1142,8 +1142,8 @@
     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);



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:22:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:22:45 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.7,1.8
Message-ID: <200602130322.k1D3Mjgs009646@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9472

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add scim-pinyin-shuangpin.patch



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scim-pinyin.spec	11 Feb 2006 05:39:40 -0000	1.7
+++ scim-pinyin.spec	13 Feb 2006 03:22:43 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        4%{?dist}.1
+Release:        4%{?dist}.2
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL
@@ -17,6 +17,7 @@
 %endif
 Requires:	scim
 Obsoletes:	iiimf-le-chinput <= 0.3
+Patch1:         scim-pinyin-shuangpin.patch
 
 %description
 Simplified Chinese Smart Pinyin IMEngine for SCIM.
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-shuangpin
 
 
 %build
@@ -72,6 +74,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Qian Shen <qshen at redhat.com> - 0.5.91-4.2
+- add scim-pinyin-shuangpin.patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.91-4.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:36:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:36:50 -0500
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.10,1.11
Message-ID: <200602130336.k1D3aoI1006711@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6697

Modified Files:
	gecko-sharp2.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.11-5
- Rebuild



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gecko-sharp2.spec	7 Feb 2006 11:45:39 -0000	1.10
+++ gecko-sharp2.spec	13 Feb 2006 03:36:48 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        4.1
+Release:        5
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -47,7 +47,10 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.11-4.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.11-5
+- Rebuild
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.11-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.11-4



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:43:03 -0500
Subject: rpms/gmime/devel gmime.spec,1.8,1.9
Message-ID: <200602130343.k1D3h36u006801@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6787

Modified Files:
	gmime.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-3
- Rebuild



Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gmime.spec	7 Feb 2006 11:49:46 -0000	1.8
+++ gmime.spec	13 Feb 2006 03:43:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.19
-Release:        2.1
+Release:        3
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -109,7 +109,10 @@
 %endif
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.1.19-2.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-3
+- Rebuild
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 2.1.19-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-2



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:44:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:44:22 -0500
Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.9,1.10
Message-ID: <200602130344.k1D3iMoZ006869@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/gtk-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6856

Modified Files:
	gtk-sharp.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 1.0.10-5
- Rebuild



Index: gtk-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk-sharp/devel/gtk-sharp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-sharp.spec	7 Feb 2006 12:09:46 -0000	1.9
+++ gtk-sharp.spec	13 Feb 2006 03:44:19 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gtk-sharp
 Version:        1.0.10
-Release:        4.1
+Release:        5
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -71,7 +71,10 @@
 %{_prefix}/share/gapi
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.10-4.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 1.0.10-5
+- Rebuild
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> 1.0.10-4.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Thu Jan 19 2006 Alexander Larsson <alexl at redhat.com> 1.0.10-4



From fedora-cvs-commits at redhat.com  Mon Feb 13 03:48:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 22:48:08 -0500
Subject: rpms/xchat/devel xchat.spec,1.49,1.50
Message-ID: <200602130348.k1D3m8tM019452@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/xchat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19436

Modified Files:
	xchat.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1:2.6.0-4
- Rebuild



Index: xchat.spec
===================================================================
RCS file: /cvs/dist/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xchat.spec	7 Feb 2006 14:17:39 -0000	1.49
+++ xchat.spec	13 Feb 2006 03:48:06 -0000	1.50
@@ -5,7 +5,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.6.0
-Release: 3.2
+Release:   4
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1:2.6.0-4
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:2.6.0-3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:07:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:07:34 -0500
Subject: rpms/beagle/devel beagle-0.2.1-sqlite3.patch, 1.1, 1.2 beagle.spec,
	1.25, 1.26
Message-ID: <200602130407.k1D47YIk030730@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30701

Modified Files:
	beagle-0.2.1-sqlite3.patch beagle.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.2.1-4
- Update sqlite3.patch so that it behaves better with sqlite2 and 3


beagle-0.2.1-sqlite3.patch:
 configure |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

Index: beagle-0.2.1-sqlite3.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-sqlite3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.1-sqlite3.patch	31 Jan 2006 20:27:01 -0000	1.1
+++ beagle-0.2.1-sqlite3.patch	13 Feb 2006 04:07:22 -0000	1.2
@@ -1,6 +1,39 @@
---- beagle-0.2.1/configure.sqlite	2006-01-31 04:10:10.000000000 -0500
-+++ beagle-0.2.1/configure	2006-01-31 04:10:38.000000000 -0500
-@@ -21852,12 +21852,12 @@
+--- beagle-0.2.1/configure.sqlite3	2006-01-30 14:33:54.000000000 -0500
++++ beagle-0.2.1/configure	2006-02-12 22:59:57.000000000 -0500
+@@ -964,6 +964,14 @@
+ ac_env_SQLITE_LIBS_value=$SQLITE_LIBS
+ ac_cv_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
+ ac_cv_env_SQLITE_LIBS_value=$SQLITE_LIBS
++ac_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
++ac_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
++ac_cv_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
++ac_cv_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
++ac_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
++ac_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
++ac_cv_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
++ac_cv_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
+ ac_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
+ ac_env_GNOME_VFS_CFLAGS_value=$GNOME_VFS_CFLAGS
+ ac_cv_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
+@@ -1231,6 +1239,10 @@
+   SQLITE_CFLAGS
+               C compiler flags for SQLITE, overriding pkg-config
+   SQLITE_LIBS linker flags for SQLITE, overriding pkg-config
++  SQLITE3_CFLAGS
++              C compiler flags for SQLITE3, overriding pkg-config
++  SQLITE3_LIBS
++              linker flags for SQLITE3, overriding pkg-config
+   GNOME_VFS_CFLAGS
+               C compiler flags for GNOME_VFS, overriding pkg-config
+   GNOME_VFS_LIBS
+@@ -21847,17 +21859,17 @@
+ fi
+ 
+ pkg_failed=no
+-echo "$as_me:$LINENO: checking for SQLITE" >&5
+-echo $ECHO_N "checking for SQLITE... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for SQLITE3" >&5
++echo $ECHO_N "checking for SQLITE3... $ECHO_C" >&6
  
  if test -n "$PKG_CONFIG"; then
          if test -n "$PKG_CONFIG" && \
@@ -12,11 +45,11 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.3.1" 2>/dev/null`
-+  pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.3" 2>/dev/null`
++  pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.3" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -21866,12 +21866,12 @@
+@@ -21866,12 +21878,12 @@
  fi
  if test -n "$PKG_CONFIG"; then
          if test -n "$PKG_CONFIG" && \
@@ -28,27 +61,37 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -  pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.3.1" 2>/dev/null`
-+  pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.3" 2>/dev/null`
++  pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.3" 2>/dev/null`
  else
    pkg_failed=yes
  fi
-@@ -21880,7 +21880,7 @@
+@@ -21880,16 +21892,16 @@
  fi
  
  if test $pkg_failed = yes; then
 -	SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.3.1"`
-+	SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.3"`
++	SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.3"`
  	# Put the nasty error message in config.log where it belongs
- 	echo "$SQLITE_PKG_ERRORS" 1>&5
- 
-@@ -21896,8 +21896,8 @@
- fi
- 
- if test "x$SQLITE_MAJ_VER" = "x0"; then
--	{ { echo "$as_me:$LINENO: error: You need to install sqlite 2.x or >= 3.3.1" >&5
--echo "$as_me: error: You need to install sqlite 2.x or >= 3.3.1" >&2;}
-+	{ { echo "$as_me:$LINENO: error: You need to install sqlite 2.x or >= 3.3" >&5
-+echo "$as_me: error: You need to install sqlite 2.x or >= 3.3" >&2;}
-    { (exit 1); exit 1; }; }
- fi
+-	echo "$SQLITE_PKG_ERRORS" 1>&5
++	echo "$SQLITE3_PKG_ERRORS" 1>&5
  
+ 	do_nothing="1"
+ elif test $pkg_failed = untried; then
+ 	do_nothing="1"
+ else
+-	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
+-	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
++	SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
++	SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
+         echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	SQLITE_MAJ_VER="3"
+@@ -26481,6 +26493,8 @@
+ s, at POSUB@,$POSUB,;t t
+ s, at SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
+ s, at SQLITE_LIBS@,$SQLITE_LIBS,;t t
++s, at SQLITE3_CFLAGS@,$SQLITE3_CFLAGS,;t t
++s, at SQLITE3_LIBS@,$SQLITE3_LIBS,;t t
+ s, at SQLITE_MAJ_VER@,$SQLITE_MAJ_VER,;t t
+ s, at ENABLE_GUI_TRUE@,$ENABLE_GUI_TRUE,;t t
+ s, at ENABLE_GUI_FALSE@,$ENABLE_GUI_FALSE,;t t


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- beagle.spec	10 Feb 2006 09:25:35 -0000	1.25
+++ beagle.spec	13 Feb 2006 04:07:22 -0000	1.26
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        3
+Release:        4
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -152,6 +152,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.2.1-4
+- Update sqlite3.patch so that it behaves better with sqlite2 and 3
+
 * Fri Feb 10 2006 Alexander Larsson <alexl at redhat.com> - 0.2.1-3
 - Correctly allocate uid/gid
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:08:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:08:42 -0500
Subject: rpms/f-spot/devel f-spot.spec,1.13,1.14
Message-ID: <200602130408.k1D48gfJ031010@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30993

Modified Files:
	f-spot.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-3
- Rebuild



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- f-spot.spec	7 Feb 2006 11:42:12 -0000	1.13
+++ f-spot.spec	13 Feb 2006 04:08:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.8
-Release:        2.1
+Release:        3
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -68,6 +68,9 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-3
+- Rebuild
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.8-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:09:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:09:41 -0500
Subject: rpms/tomboy/devel tomboy.spec,1.13,1.14
Message-ID: <200602130409.k1D49fsQ031425@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31389

Modified Files:
	tomboy.spec 
Log Message:
* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
- Rebuild



Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tomboy.spec	7 Feb 2006 14:07:19 -0000	1.13
+++ tomboy.spec	13 Feb 2006 04:09:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        1.1
+Release:        2
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -93,7 +93,10 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-1.1
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
+- Rebuild
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Mon Feb  6 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-1



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:22:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:22:25 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.34,1.35
Message-ID: <200602130422.k1D4MP5c017181@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17143

Modified Files:
	devhelp.spec 
Log Message:
Run aclocal after intltoolize


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- devhelp.spec	12 Feb 2006 17:17:44 -0000	1.34
+++ devhelp.spec	13 Feb 2006 04:22:23 -0000	1.35
@@ -47,6 +47,7 @@
 export gt_cv_func_dgettext_libc=yes # Temporary fix
 
 intltoolize --force
+aclocal
 %configure
 
 make %{?_smp_mflags}



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:27:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:27:43 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.35,1.36
Message-ID: <200602130427.k1D4RhZc019655@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19623

Modified Files:
	devhelp.spec 
Log Message:
See if more autofoo will fix the build


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- devhelp.spec	13 Feb 2006 04:22:23 -0000	1.35
+++ devhelp.spec	13 Feb 2006 04:27:39 -0000	1.36
@@ -48,6 +48,8 @@
 
 intltoolize --force
 aclocal
+automake
+autoconf
 %configure
 
 make %{?_smp_mflags}



From fedora-cvs-commits at redhat.com  Mon Feb 13 04:38:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 12 Feb 2006 23:38:24 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.36,1.37
Message-ID: <200602130438.k1D4cODm022028@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21991

Modified Files:
	devhelp.spec 
Log Message:
Okay, more autofoo didn't work, try less


Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- devhelp.spec	13 Feb 2006 04:27:39 -0000	1.36
+++ devhelp.spec	13 Feb 2006 04:38:21 -0000	1.37
@@ -43,13 +43,6 @@
 %setup -q
 
 %build
-
-export gt_cv_func_dgettext_libc=yes # Temporary fix
-
-intltoolize --force
-aclocal
-automake
-autoconf
 %configure
 
 make %{?_smp_mflags}



From fedora-cvs-commits at redhat.com  Mon Feb 13 07:16:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 02:16:58 -0500
Subject: rpms/krb5-auth-dialog/devel .cvsignore, 1.6,
	1.7 krb5-auth-dialog.spec, 1.17, 1.18 sources, 1.6, 1.7
Message-ID: <200602130716.k1D7Gwhj000402@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/krb5-auth-dialog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32456

Modified Files:
	.cvsignore krb5-auth-dialog.spec sources 
Log Message:
* 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



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jan 2006 06:54:33 -0000	1.6
+++ .cvsignore	13 Feb 2006 07:16:55 -0000	1.7
@@ -3,3 +3,4 @@
 krb5-auth-dialog-0.4.tar.gz
 krb5-auth-dialog-0.5.tar.gz
 krb5-auth-dialog-0.6.tar.bz2
+krb5-auth-dialog-0.6.cvs20060212.tar.bz2


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- krb5-auth-dialog.spec	7 Feb 2006 12:27:16 -0000	1.17
+++ krb5-auth-dialog.spec	13 Feb 2006 07:16:55 -0000	1.18
@@ -5,8 +5,8 @@
 
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
-Version: 0.6
-Release: 1.1
+Version: 0.6.cvs20060212
+Release: 1
 License: GPL
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -49,16 +49,19 @@
 
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.1
+* 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
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 0.6-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> 0.6-1
 - Update to 0.6, adding an autostart file
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0.5-2.1
+* Fri Dec  9 2005 Jesse Keating <jkeating at redhat.com> - 0.5-2.1
 - rebuilt
 
-* Thu Dec 01 2005 John (J5) Palmieri <johnp at redhat.com> - 0.5-2
+* Thu Dec  1 2005 John (J5) Palmieri <johnp at redhat.com> - 0.5-2
 - rebuild for new dbus
 
 * Tue Nov  8 2005 Christopher Aillon <caillon at redhat.com> 0.5-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jan 2006 06:54:33 -0000	1.6
+++ sources	13 Feb 2006 07:16:55 -0000	1.7
@@ -1 +1 @@
-08fc3d903c833ac9617f722d3b440459  krb5-auth-dialog-0.6.tar.bz2
+d61e435a3ff8a6c1fbfc58ce22886c73  krb5-auth-dialog-0.6.cvs20060212.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 07:41:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 02:41:34 -0500
Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.11,1.12
Message-ID: <200602130741.k1D7fYQx014854@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-296/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14774

Modified Files:
	compat-gcc-296.spec 
Log Message:
2.96-135



Index: compat-gcc-296.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat-gcc-296.spec	11 Feb 2006 02:16:58 -0000	1.11
+++ compat-gcc-296.spec	13 Feb 2006 07:41:31 -0000	1.12
@@ -1,10 +1,10 @@
 %define DATE 20000731
 %define gcc_version 2.96
-%define gcc_release 134
+%define gcc_release 135
 Summary: 2.96-RH compatibility libraries
 Name: compat-gcc-296
 Version: %{gcc_version}
-Release: %{gcc_release}.2
+Release: %{gcc_release}
 License: GPL
 Group: Development/Languages
 ExclusiveArch: %{ix86} ia64 ppc
@@ -978,6 +978,7 @@
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 %ifarch %{ix86}
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=pentium4/-mcpu=i686/g'`
+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mtune=generic/-mcpu=i686/g'`
 %endif
 %ifarch sparc sparc64
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'`
@@ -1088,11 +1089,9 @@
 %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.96-134.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.96-134.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Mon Feb 13 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-135
+- replace -mtune=generic in $RPM_OPT_FLAGS with something that
+  GCC 2.96-RH groks
 
 * Wed Jan  4 2006 Jakub Jelinek  <jakub at redhat.com> 2.96-134
 - rebuilt against glibc-2.3.90-26 to pick up a sanitized



From fedora-cvs-commits at redhat.com  Mon Feb 13 07:56:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 02:56:54 -0500
Subject: rpms/glibc/devel .cvsignore, 1.137, 1.138 glibc-fedora.patch, 1.130,
	1.131 glibc.spec, 1.220, 1.221 sources, 1.159, 1.160
Message-ID: <200602130756.k1D7usAn028007@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.3.90-37 on branch devel from glibc-2.3.90-37.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- .cvsignore	4 Feb 2006 08:44:52 -0000	1.137
+++ .cvsignore	13 Feb 2006 07:56:52 -0000	1.138
@@ -1,2 +1,2 @@
-glibc-20060204T0758.tar.bz2
-glibc-fedora-20060204T0758.tar.bz2
+glibc-20060213T0650.tar.bz2
+glibc-fedora-20060213T0650.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   68 ++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   38 ++
 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 +
 manual/filesys.texi                            |    2 
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 sysdeps/generic/dl-cache.h                     |    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 ++
 51 files changed, 786 insertions(+), 468 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- glibc-fedora.patch	4 Feb 2006 08:44:52 -0000	1.130
+++ glibc-fedora.patch	13 Feb 2006 07:56:52 -0000	1.131
@@ -1,6 +1,6 @@
---- glibc-20060204T0758/ChangeLog	4 Feb 2006 07:14:42 -0000	1.9986
-+++ glibc-20060204T0758-fedora/ChangeLog	4 Feb 2006 08:21:09 -0000	1.8782.2.161
-@@ -25,6 +25,11 @@
+--- glibc-20060213T0650/ChangeLog	12 Feb 2006 21:41:44 -0000	1.9989
++++ glibc-20060213T0650-fedora/ChangeLog	13 Feb 2006 07:30:01 -0000	1.8782.2.162
+@@ -73,6 +73,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -12,7 +12,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -84,6 +89,11 @@
+@@ -132,6 +137,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -24,7 +24,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -2510,6 +2520,10 @@
+@@ -2558,6 +2568,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -35,7 +35,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2793,6 +2807,26 @@
+@@ -2841,6 +2855,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -62,7 +62,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5911,6 +5945,11 @@
+@@ -5959,6 +5993,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -74,7 +74,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6905,6 +6944,12 @@
+@@ -6953,6 +6992,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -87,7 +87,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -7029,6 +7074,17 @@
+@@ -7077,6 +7122,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -105,7 +105,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -10089,6 +10145,18 @@
+@@ -10137,6 +10193,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -124,8 +124,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060204T0758/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060204T0758-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060213T0650/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060213T0650-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.
@@ -175,8 +175,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-20060204T0758/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060204T0758-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060213T0650/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060213T0650-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.
@@ -203,8 +203,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060204T0758/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060204T0758-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060213T0650/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060213T0650-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>
@@ -285,8 +285,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060204T0758/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060204T0758-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060213T0650/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060213T0650-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;
@@ -311,8 +311,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060204T0758/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060204T0758-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060213T0650/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060213T0650-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -341,8 +341,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060204T0758/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060204T0758-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060213T0650/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060213T0650-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -444,8 +444,8 @@
      }
  
    search_dirs ();
---- glibc-20060204T0758/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060204T0758-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060213T0650/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060213T0650-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;
@@ -470,8 +470,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060204T0758/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060204T0758-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060213T0650/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060213T0650-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)
@@ -548,8 +548,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060204T0758/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060204T0758-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060213T0650/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060213T0650-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -565,16 +565,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060204T0758/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060213T0650/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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-20060204T0758/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060213T0650/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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-20060204T0758/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060204T0758-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060213T0650/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060213T0650-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
@@ -584,8 +584,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060204T0758/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060204T0758-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060213T0650/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060213T0650-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.  */
@@ -599,8 +599,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060204T0758/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060204T0758-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060213T0650/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060213T0650-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);
@@ -631,8 +631,8 @@
  
  #endif
  
---- glibc-20060204T0758/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060204T0758-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060213T0650/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060213T0650-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -724,8 +724,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060204T0758/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060204T0758-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060213T0650/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060213T0650-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,
  	}
      }
@@ -769,8 +769,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060204T0758/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060204T0758-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060213T0650/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060213T0650-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -779,8 +779,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060204T0758/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060204T0758-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060213T0650/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060213T0650-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -822,8 +822,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060204T0758/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060204T0758-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060213T0650/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060213T0650-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>"
@@ -838,8 +838,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060204T0758/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060204T0758-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060213T0650/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060213T0650-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>"
@@ -851,8 +851,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-20060204T0758/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060213T0650/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -923,8 +923,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060204T0758/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060204T0758-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060213T0650/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060213T0650-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -952,8 +952,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060204T0758/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060204T0758-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060213T0650/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060213T0650-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>
@@ -1029,8 +1029,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060204T0758/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060204T0758-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060213T0650/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060213T0650-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)
@@ -1086,8 +1086,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060204T0758/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
-+++ glibc-20060204T0758-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
+--- glibc-20060213T0650/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
++++ glibc-20060213T0650-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
 @@ -2806,7 +2806,7 @@ function.
  
  @comment sys/time.h
@@ -1097,9 +1097,9 @@
  This function is like @code{utimes}, except that it takes an open file
  descriptor as an argument instead of a file name.  @xref{Low-Level
  I/O}.  This function comes from FreeBSD, and is not available on all
---- glibc-20060204T0758/nptl/ChangeLog	20 Jan 2006 16:49:36 -0000	1.857
-+++ glibc-20060204T0758-fedora/nptl/ChangeLog	30 Jan 2006 09:29:47 -0000	1.706.2.75
-@@ -497,6 +497,15 @@
+--- glibc-20060213T0650/nptl/ChangeLog	13 Feb 2006 01:27:41 -0000	1.860
++++ glibc-20060213T0650-fedora/nptl/ChangeLog	13 Feb 2006 07:30:04 -0000	1.706.2.76
+@@ -519,6 +519,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1115,7 +1115,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1233,6 +1242,11 @@
+@@ -1255,6 +1264,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1127,7 +1127,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3307,6 +3321,11 @@
+@@ -3329,6 +3343,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1139,8 +1139,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060204T0758/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060204T0758-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060213T0650/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
++++ glibc-20060213T0650-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1163,8 +1163,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060204T0758/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060204T0758-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060213T0650/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060213T0650-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;
@@ -1189,8 +1189,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060204T0758/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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>
 +
@@ -1198,8 +1198,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060204T0758/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060204T0758-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+--- glibc-20060213T0650/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060213T0650-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1219,8 +1219,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060204T0758/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060204T0758-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060213T0650/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060213T0650-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1239,8 +1239,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060204T0758/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060204T0758-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060213T0650/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060213T0650-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1252,8 +1252,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060204T0758/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060204T0758-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060213T0650/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060213T0650-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
@@ -1294,8 +1294,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060204T0758/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060204T0758-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060213T0650/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060213T0650-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1305,8 +1305,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060204T0758/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060204T0758-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060213T0650/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060213T0650-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1340,8 +1340,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060204T0758/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060213T0650/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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 =
@@ -1358,8 +1358,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060204T0758/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060204T0758-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060213T0650/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060213T0650-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
@@ -1375,8 +1375,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060204T0758/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060204T0758-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060213T0650/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060213T0650-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))
@@ -1388,8 +1388,8 @@
  endif
  endif
  
---- glibc-20060204T0758/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060204T0758-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060213T0650/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060213T0650-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.  */
@@ -1741,8 +1741,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060204T0758/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060213T0650/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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.
@@ -1828,8 +1828,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060204T0758/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060204T0758-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060213T0650/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060213T0650-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);
      }
@@ -1844,8 +1844,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060213T0650-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.  */
  
@@ -1894,8 +1894,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060213T0650-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;
@@ -1938,8 +1938,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060213T0650-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"
@@ -1949,8 +1949,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060213T0650-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;
@@ -1996,8 +1996,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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.
@@ -2058,8 +2058,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060213T0650-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)
@@ -2092,24 +2092,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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-20060204T0758/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060213T0650-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-20060204T0758/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060204T0758-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060213T0650-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"_


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- glibc.spec	11 Feb 2006 03:11:03 -0000	1.220
+++ glibc.spec	13 Feb 2006 07:56:52 -0000	1.221
@@ -1,9 +1,9 @@
-%define glibcdate 20060204T0758
+%define glibcdate 20060213T0650
 %define glibcname glibc
-%define glibcsrcdir glibc-20060204T0758
+%define glibcsrcdir glibc-20060213T0650
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 36
+%define glibcrelease 37
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -20,7 +20,7 @@
 Summary: The GNU libc libraries.
 Name: glibc
 Version: %{glibcversion}
-Release: %{glibcrelease}.1
+Release: %{glibcrelease}
 License: LGPL
 Group: System Environment/Libraries
 Source0: %{glibcsrcdir}.tar.bz2
@@ -299,7 +299,7 @@
 #define __NR_mknodat		297
 #define __NR_fchownat		298
 #define __NR_futimesat		299
-#define __NR_newfstatat		300
+#define __NR_fstatat64		300
 #define __NR_unlinkat		301
 #define __NR_renameat		302
 #define __NR_linkat		303
@@ -312,34 +312,61 @@
 #define __NR_pselect6		308
 #define __NR_ppoll		309
 #endif
+#ifndef __NR_unshare
+#define __NR_unshare		310
+#endif
 %endif
 %ifarch ia64
 #ifndef __NR_timer_create
-#define __NR_timer_create		1248
-#define __NR_timer_settime		1249
-#define __NR_timer_gettime		1250
-#define __NR_timer_getoverrun		1251
-#define __NR_timer_delete		1252
-#define __NR_clock_settime		1253
-#define __NR_clock_gettime		1254
-#define __NR_clock_getres		1255
-#define __NR_clock_nanosleep		1256
+#define __NR_timer_create	1248
+#define __NR_timer_settime	1249
+#define __NR_timer_gettime	1250
+#define __NR_timer_getoverrun	1251
+#define __NR_timer_delete	1252
+#define __NR_clock_settime	1253
+#define __NR_clock_gettime	1254
+#define __NR_clock_getres	1255
+#define __NR_clock_nanosleep	1256
 #endif
 #ifndef __NR_mq_open
-#define __NR_mq_open			1262
-#define __NR_mq_unlink			1263
-#define __NR_mq_timedsend		1264
-#define __NR_mq_timedreceive		1265
-#define __NR_mq_notify			1266
-#define __NR_mq_getsetattr		1267
+#define __NR_mq_open		1262
+#define __NR_mq_unlink		1263
+#define __NR_mq_timedsend	1264
+#define __NR_mq_timedreceive	1265
+#define __NR_mq_notify		1266
+#define __NR_mq_getsetattr	1267
 #endif
 #ifndef __NR_waitid
-#define __NR_waitid			1270
+#define __NR_waitid		1270
 #endif
 #ifndef __NR_inotify_init
-#define __NR_inotify_init		1277
-#define __NR_inotify_add_watch		1278
-#define __NR_inotify_rm_watch		1279
+#define __NR_inotify_init	1277
+#define __NR_inotify_add_watch	1278
+#define __NR_inotify_rm_watch	1279
+#endif
+#ifndef __NR_openat
+#define __NR_openat		1281
+#define __NR_mkdirat		1282
+#define __NR_mknodat		1283
+#define __NR_fchownat		1284
+#define __NR_futimesat		1285
+#define __NR_newfstatat		1286
+#define __NR_unlinkat		1287
+#define __NR_renameat		1288
+#define __NR_linkat		1289
+#define __NR_symlinkat		1290
+#define __NR_readlinkat		1291
+#define __NR_fchmodat		1292
+#define __NR_faccessat		1293
+#endif
+#if 0
+#ifndef __NR_pselect6
+#define __NR_pselect6		1294
+#define __NR_ppoll		1295
+#endif
+#endif
+#ifndef __NR_unshare
+#define __NR_unshare		1296
 #endif
 %endif
 %ifarch ppc
@@ -373,6 +400,9 @@
 #define __NR_pselect6		280
 #define __NR_ppoll		281
 #endif
+#ifndef __NR_unshare
+#define __NR_unshare		282
+#endif
 %endif
 %ifarch ppc64
 #ifndef __NR_utimes
@@ -398,6 +428,9 @@
 #define __NR_pselect6		280
 #define __NR_ppoll		281
 #endif
+#ifndef __NR_unshare
+#define __NR_unshare		282
+#endif
 %endif
 %ifarch s390
 #ifndef __NR_timer_create
@@ -434,6 +467,28 @@
 #define __NR_inotify_add_watch	285
 #define __NR_inotify_rm_watch	286
 #endif
+#ifndef __NR_openat
+#define __NR_openat		288
+#define __NR_mkdirat		289
+#define __NR_mknodat		290
+#define __NR_fchownat		291
+#define __NR_futimesat		292
+#define __NR_fstatat64		293
+#define __NR_unlinkat		294
+#define __NR_renameat		295
+#define __NR_linkat		296
+#define __NR_symlinkat		297
+#define __NR_readlinkat		298
+#define __NR_fchmodat		299
+#define __NR_faccessat		300
+#endif
+#ifndef __NR_pselect6
+#define __NR_pselect6		301
+#define __NR_ppoll		302
+#endif
+#ifndef __NR_unshare
+#define __NR_unshare		303
+#endif
 %endif
 %ifarch s390x
 #ifndef __NR_timer_create
@@ -463,6 +518,28 @@
 #define __NR_inotify_add_watch	285
 #define __NR_inotify_rm_watch	286
 #endif
+#ifndef __NR_openat
+#define __NR_openat		288
+#define __NR_mkdirat		289
+#define __NR_mknodat		290
+#define __NR_fchownat		291
+#define __NR_futimesat		292
+#define __NR_newfstatat		293
+#define __NR_unlinkat		294
+#define __NR_renameat		295
+#define __NR_linkat		296
+#define __NR_symlinkat		297
+#define __NR_readlinkat		298
+#define __NR_fchmodat		299
+#define __NR_faccessat		300
+#endif
+#ifndef __NR_pselect6
+#define __NR_pselect6		301
+#define __NR_ppoll		302
+#endif
+#ifndef __NR_unshare
+#define __NR_unshare		303
+#endif
 %endif
 %ifarch sparc sparcv9 sparc64
 #ifndef __NR_mq_open
@@ -505,6 +582,9 @@
 #define __NR_pselect6		297
 #define __NR_ppoll		298
 #endif
+#ifndef __NR_unshare
+#define __NR_unshare		299
+#endif
 %endif
 %ifarch x86_64
 #ifndef __NR_mq_open
@@ -538,6 +618,18 @@
 #define __NR_fchmodat		268
 #define __NR_faccessat		269
 #endif
+#ifndef __NR_pselect6
+#define __NR_pselect6		270
+#define __NR_ppoll		271
+#endif
+#ifndef __NR_unshare
+#define __NR_unshare		272
+#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
@@ -1245,8 +1337,10 @@
 %endif
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.90-36.1
-- bump again for double-long bug on ppc(64)
+* Mon Feb 13 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-37
+- update from CVS
+  - *at fixes
+  - unshare syscall wrapper
 
 * Sat Feb  4 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-36
 - update from CVS


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- sources	4 Feb 2006 08:44:52 -0000	1.159
+++ sources	13 Feb 2006 07:56:52 -0000	1.160
@@ -1,2 +1,2 @@
-f68a984eb9c60bfc2fb747da61739d52  glibc-20060204T0758.tar.bz2
-387c111f50df07a1ba0ec9fc58454fb5  glibc-fedora-20060204T0758.tar.bz2
+3890e2c531cd1703fdb4380270c0cd4d  glibc-20060213T0650.tar.bz2
+fdd94d9838442e2aa66ee81750f1d4aa  glibc-fedora-20060213T0650.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:09:05 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin-showallkeys.patch,NONE,1.1
Message-ID: <200602130809.k1D8955V028192@cvs.devel.redhat.com>

Author: qshen

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

Added Files:
	scim-pinyin-showallkeys.patch 
Log Message:
qshen: let show all keys by default


scim-pinyin-showallkeys.patch:
 scim_pinyin_imengine.cpp       |    4 ++--
 scim_pinyin_imengine_setup.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE scim-pinyin-showallkeys.patch ---
--- scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp.allkeys-back	2006-02-13 16:03:12.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2006-02-13 16:04:53.000000000 +0800
@@ -153,7 +153,7 @@
       m_auto_combine_phrase (false),
       m_auto_fill_preedit (false),
       m_always_show_lookup (false),
-      m_show_all_keys (false),
+      m_show_all_keys (true),
       m_user_data_binary (true),
       m_valid (false),
       m_shuang_pin (false),
@@ -269,7 +269,7 @@
                             true);
         m_show_all_keys =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_SHOW_ALL_KEYS),
-                            false);
+                            true);
         m_user_data_binary =
             m_config->read (String (SCIM_CONFIG_IMENGINE_PINYIN_USER_DATA_BINARY),
                             true);
--- scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp.allkeys-back	2006-02-13 16:03:42.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine_setup.cpp	2006-02-13 16:04:06.000000000 +0800
@@ -107,7 +107,7 @@
 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          = false;
+static bool   __config_show_all_keys          = true;
 static bool   __config_dynamic_adjust         = true;
 
 static int    __config_max_user_phrase_length = 8;



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:09:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:09:50 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.9,1.10
Message-ID: <200602130809.k1D89oWh028217@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28202

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: add scim-pinyin-showallkeys.patch



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-pinyin.spec	13 Feb 2006 05:50:27 -0000	1.9
+++ scim-pinyin.spec	13 Feb 2006 08:09:45 -0000	1.10
@@ -18,6 +18,7 @@
 Requires:	scim
 Obsoletes:	iiimf-le-chinput <= 0.3
 Patch1:         scim-pinyin-shuangpin.patch
+Patch2:         scim-pinyin-showallkeys.patch
 
 %description
 Simplified Chinese Smart Pinyin IMEngine for SCIM.
@@ -26,6 +27,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .1-shuangpin
+%patch2 -p1 -b .2-showallkeys
 
 
 %build



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:10:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:10:45 -0500
Subject: rpms/gnutls/devel .cvsignore, 1.7, 1.8 gnutls.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200602130810.k1D8Ajag028246@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/gnutls/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28231

Modified Files:
	.cvsignore gnutls.spec sources 
Log Message:
* Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.10-1
- updated to new version (fixes CVE-2006-0645)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Nov 2005 11:18:46 -0000	1.7
+++ .cvsignore	13 Feb 2006 08:10:43 -0000	1.8
@@ -1 +1 @@
-gnutls-1.2.9-nosrp.tar.bz2
+gnutls-1.2.10-nosrp.tar.bz2


Index: gnutls.spec
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnutls.spec	11 Feb 2006 03:19:29 -0000	1.18
+++ gnutls.spec	13 Feb 2006 08:10:43 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A TLS protocol implementation.
 Name: gnutls
-Version: 1.2.9
-Release: 3.2
+Version: 1.2.10
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 BuildPrereq: libgcrypt-devel >= 1.2.2
@@ -114,6 +114,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 1.2.10-1
+- updated to new version (fixes CVE-2006-0645)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnutls/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Nov 2005 11:18:46 -0000	1.7
+++ sources	13 Feb 2006 08:10:43 -0000	1.8
@@ -1 +1 @@
-fbbfa1ac17f8228e59b68a5730d9a2b9  gnutls-1.2.9-nosrp.tar.bz2
+04ab0b4386d5996cf7c725f11ff8b801  gnutls-1.2.10-nosrp.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:11:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:11:26 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.10,1.11
Message-ID: <200602130811.k1D8BQGp028333@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28316

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: update release to 4.3



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-pinyin.spec	13 Feb 2006 08:09:45 -0000	1.10
+++ scim-pinyin.spec	13 Feb 2006 08:11:24 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:		scim-pinyin
 Version:	0.5.91
-Release:        4%{?dist}.2
+Release:        4%{?dist}.3
 Summary:	Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:	GPL



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:15:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:15:59 -0500
Subject: rpms/scim-pinyin/devel scim-pinyin.spec,1.11,1.12
Message-ID: <200602130815.k1D8Fx97030153@cvs.devel.redhat.com>

Author: qshen

Update of /cvs/dist/rpms/scim-pinyin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28402

Modified Files:
	scim-pinyin.spec 
Log Message:
qshen: update the changelog



Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-pinyin.spec	13 Feb 2006 08:11:24 -0000	1.11
+++ scim-pinyin.spec	13 Feb 2006 08:15:56 -0000	1.12
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Qian Shen <qshen at redhat.com> - 0.5.91-4.3
+- add scim-pinyin-showallkeys.patch
+
 * Mon Feb 13 2006 Jens Petersen <petersen at redhat.com>
 - remove superfluous post and postun scripts
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:33:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:33:27 -0500
Subject: rpms/glibc/devel glibc-fedora.patch,1.131,1.132
Message-ID: <200602130833.k1D8XRSX018981@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc-fedora.patch 
Log Message:
2.3.90-37


glibc-fedora.patch:
 ChangeLog                                                |   68 ++
 ChangeLog.11                                             |   21 
 ChangeLog.12                                             |   12 
 ChangeLog.15                                             |   45 +
 csu/elf-init.c                                           |   17 
 debug/tst-chk1.c                                         |    7 
 elf/ldconfig.c                                           |   38 +
 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 
 manual/filesys.texi                                      |    2 
 nptl/ChangeLog                                           |   40 +
 nptl/Makefile                                            |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h   |   10 
 nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h    |   10 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h           |    6 
 nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h |   19 
 nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h    |   19 
 nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h      |    8 
 nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h   |   19 
 nptl/tst-stackguard1.c                                   |    8 
 nscd/connections.c                                       |   15 
 nscd/nscd.c                                              |    4 
 nscd/nscd.conf                                           |    4 
 nscd/nscd.init                                           |   19 
 nscd/selinux.c                                           |    2 
 posix/Makefile                                           |   19 
 posix/getconf.speclist.h                                 |   15 
 sysdeps/generic/dl-cache.h                               |    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, 878 insertions(+), 482 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- glibc-fedora.patch	13 Feb 2006 07:56:52 -0000	1.131
+++ glibc-fedora.patch	13 Feb 2006 08:33:23 -0000	1.132
@@ -1098,8 +1098,33 @@
  descriptor as an argument instead of a file name.  @xref{Low-Level
  I/O}.  This function comes from FreeBSD, and is not available on all
 --- glibc-20060213T0650/nptl/ChangeLog	13 Feb 2006 01:27:41 -0000	1.860
-+++ glibc-20060213T0650-fedora/nptl/ChangeLog	13 Feb 2006 07:30:04 -0000	1.706.2.76
-@@ -519,6 +519,15 @@
++++ glibc-20060213T0650-fedora/nptl/ChangeLog	13 Feb 2006 08:21:20 -0000	1.706.2.77
+@@ -1,3 +1,24 @@
++2006-02-13  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
++	(__pthread_list_t): New typedef.
++	(pthread_mutex_t): Replace __next and __prev fields with __list.
++	* sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
++	(__pthread_list_t): New typedef.
++	(pthread_mutex_t): Replace __next and __prev fields with __list.
++	* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
++	(__pthread_list_t, __pthread_slist_t): New typedefs.
++	(pthread_mutex_t): Replace __next and __prev fields with __list.
++	* sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
++	(__pthread_list_t, __pthread_slist_t): New typedefs.
++	(pthread_mutex_t): Replace __next and __prev fields with __list.
++	* sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
++	(__pthread_list_t, __pthread_slist_t): New typedefs.
++	(pthread_mutex_t): Replace __next and __prev fields with __list.
++	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
++	(__pthread_slist_t): New typedef.
++	(pthread_mutex_t): Replace __next field with __list.
++
+ 2006-02-12  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* allocatestack.c (allocate_stack): Initialize robust_list.
+@@ -519,6 +540,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1115,7 +1140,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1255,6 +1264,11 @@
+@@ -1255,6 +1285,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1127,7 +1152,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3329,6 +3343,11 @@
+@@ -3329,6 +3364,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1198,6 +1223,205 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.11
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.7.2.5
+@@ -43,6 +43,13 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++typedef struct __pthread_internal_list
++{
++  struct __pthread_internal_list *__prev;
++  struct __pthread_internal_list *__next;
++} __pthread_list_t;
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+ typedef union
+@@ -57,8 +64,7 @@ typedef union
+        binary compatibility.  */
+     int __kind;
+     int __spins;
+-    struct __pthread_mutex_s *__next;
+-    struct __pthread_mutex_s *__prev;
++    __pthread_list_t __list;
+ #define __PTHREAD_MUTEX_HAVE_PREV	1
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	6 Jan 2006 21:37:18 -0000	1.16
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.13.2.4
+@@ -43,6 +43,13 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++typedef struct __pthread_internal_list
++{
++  struct __pthread_internal_list *__prev;
++  struct __pthread_internal_list *__next;
++} __pthread_list_t;
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+ typedef union
+@@ -57,8 +64,7 @@ typedef union
+        binary compatibility.  */
+     int __kind;
+     int __spins;
+-    struct __pthread_mutex_s *__next;
+-    struct __pthread_mutex_s *__prev;
++    __pthread_list_t __list;
+ #define __PTHREAD_MUTEX_HAVE_PREV	1
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	9 Jan 2006 21:12:31 -0000	1.18
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.14.2.5
+@@ -58,6 +58,20 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++#if __WORDSIZE == 64
++typedef struct __pthread_internal_list
++{
++  struct __pthread_internal_list *__prev;
++  struct __pthread_internal_list *__next;
++} __pthread_list_t;
++#else
++typedef struct __pthread_internal_slist
++{
++  struct __pthread_internal_slist *__next;
++} __pthread_slist_t;
++#endif
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+ typedef union
+@@ -75,15 +89,14 @@ typedef union
+     int __kind;
+ #if __WORDSIZE == 64
+     int __spins;
+-    struct __pthread_mutex_s *__next;
+-    struct __pthread_mutex_s *__prev;
++    __pthread_list_t __list;
+ # define __PTHREAD_MUTEX_HAVE_PREV	1
+ #else
+     unsigned int __nusers;
+     __extension__ union
+     {
+       int __spins;
+-      struct __pthread_mutex_s *__next;
++      __pthread_slist_t __list;
+     };
+ #endif
+   } __data;
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	9 Jan 2006 21:12:31 -0000	1.17
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.13.2.5
+@@ -57,6 +57,20 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++#if __WORDSIZE == 64
++typedef struct __pthread_internal_list
++{
++  struct __pthread_internal_list *__prev;
++  struct __pthread_internal_list *__next;
++} __pthread_list_t;
++#else
++typedef struct __pthread_internal_slist
++{
++  struct __pthread_internal_slist *__next;
++} __pthread_slist_t;
++#endif
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+ typedef union
+@@ -74,15 +88,14 @@ typedef union
+     int __kind;
+ #if __WORDSIZE == 64
+     int __spins;
+-    struct __pthread_mutex_s *__next;
+-    struct __pthread_mutex_s *__prev;
++    __pthread_list_t __list;
+ # define __PTHREAD_MUTEX_HAVE_PREV	1
+ #else
+     unsigned int __nusers;
+     __extension__ union
+     {
+       int __spins;
+-      struct __pthread_mutex_s *__next;
++      __pthread_slist_t __list;
+     };
+ #endif
+   } __data;
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.14
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.10.2.5
+@@ -44,6 +44,12 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++typedef struct __pthread_internal_slist
++{
++  struct __pthread_internal_slist *__next;
++} __pthread_slist_t;
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+ typedef union
+@@ -60,7 +66,7 @@ typedef union
+     __extension__ union
+     {
+       int __spins;
+-      struct __pthread_mutex_s *__next;
++      __pthread_slist_t __list;
+     };
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+--- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.11
++++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.7.2.5
+@@ -58,6 +58,20 @@ typedef union
+ } pthread_attr_t;
+ 
+ 
++#if __WORDSIZE == 64
++typedef struct __pthread_internal_list
++{
++  struct __pthread_internal_list *__prev;
++  struct __pthread_internal_list *__next;
++} __pthread_list_t;
++#else
++typedef struct __pthread_internal_slist
++{
++  struct __pthread_internal_slist *__next;
++} __pthread_slist_t;
++#endif
++
++
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+ typedef union
+@@ -75,15 +89,14 @@ typedef union
+     int __kind;
+ #if __WORDSIZE == 64
+     int __spins;
+-    struct __pthread_mutex_s *__next;
+-    struct __pthread_mutex_s *__prev;
++    __pthread_list_t __list;
+ # define __PTHREAD_MUTEX_HAVE_PREV	1
+ #else
+     unsigned int __nusers;
+     __extension__ union
+     {
+       int __spins;
+-      struct __pthread_mutex_s *__next;
++      __pthread_slist_t __list;
+     };
+ #endif
+   } __data;
 --- glibc-20060213T0650/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
 +++ glibc-20060213T0650-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)



From fedora-cvs-commits at redhat.com  Mon Feb 13 08:39:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 03:39:45 -0500
Subject: rpms/gstreamer/devel gstreamer.spec,1.45,1.46
Message-ID: <200602130839.k1D8djZJ021323@cvs.devel.redhat.com>

Author: caillon

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

Modified Files:
	gstreamer.spec 
Log Message:
* Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
- Rebuild



Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gstreamer.spec	11 Feb 2006 01:49:12 -0000	1.45
+++ gstreamer.spec	13 Feb 2006 08:39:43 -0000	1.46
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.3
-Release: 	1
+Release: 	2
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -199,7 +199,10 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
-* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
+* Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
+- Rebuild
+
+* Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-1
 - Update to 0.10.3
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.10.2-1.1



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:06:56 -0500
Subject: rpms/glibc/devel glibc.spec,1.221,1.222
Message-ID: <200602130906.k1D96ulN010917@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc.spec 
Log Message:
2.3.90-37



Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- glibc.spec	13 Feb 2006 07:56:52 -0000	1.221
+++ glibc.spec	13 Feb 2006 09:06:50 -0000	1.222
@@ -631,6 +631,10 @@
 #undef __NR_newfstatat
 #undef __NR_fstatat64
 %endif
+%ifarch s390 s390x
+/* FIXME: Handle pselect6 on s390/s390x.  */
+#undef __NR_pselect6
+%endif
 #endif
 EOF
 cat > override_headers/asm/errno.h <<EOF



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:18:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:18:50 -0500
Subject: rpms/glibc/devel glibc-fedora.patch,1.132,1.133
Message-ID: <200602130918.k1D9IokY027740@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc-fedora.patch 
Log Message:
2.3.90-37


glibc-fedora.patch:
 ChangeLog                                                |   68 ++
 ChangeLog.11                                             |   21 
 ChangeLog.12                                             |   12 
 ChangeLog.15                                             |   45 +
 csu/elf-init.c                                           |   17 
 debug/tst-chk1.c                                         |    7 
 elf/ldconfig.c                                           |   38 +
 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 
 libc/nptl/descr.h                                        |    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 
 manual/filesys.texi                                      |    2 
 nptl/ChangeLog                                           |   40 +
 nptl/Makefile                                            |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h   |   10 
 nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h    |   10 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h           |    6 
 nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h |   19 
 nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h    |   19 
 nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h      |    8 
 nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h   |   19 
 nptl/tst-stackguard1.c                                   |    8 
 nscd/connections.c                                       |   15 
 nscd/nscd.c                                              |    4 
 nscd/nscd.conf                                           |    4 
 nscd/nscd.init                                           |   19 
 nscd/selinux.c                                           |    2 
 posix/Makefile                                           |   19 
 posix/getconf.speclist.h                                 |   15 
 sysdeps/generic/dl-cache.h                               |    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 +
 58 files changed, 879 insertions(+), 483 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- glibc-fedora.patch	13 Feb 2006 08:33:23 -0000	1.132
+++ glibc-fedora.patch	13 Feb 2006 09:18:47 -0000	1.133
@@ -2337,3 +2337,14 @@
 @@ -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/nptl/descr.h	2006-02-13 07:51:37.000000000 +0100
++++ libc/nptl/descr.h	2006-02-13 10:17:59.000000000 +0100
+@@ -166,7 +166,7 @@ struct pthread
+   do {									      \
+     __pthread_slist_t *runp = THREAD_GETMEM (THREAD_SELF, robust_list.__next);\
+     if (runp == &mutex->__data.__list)					      \
+-      THREAD_SETMEM (THREAD_SELF, robust_list, runp->__next);		      \
++      THREAD_SETMEM (THREAD_SELF, robust_list.__next, runp->__next);	      \
+     else								      \
+       {									      \
+ 	while (runp->__next != &mutex->__data.__list)			      \



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:22:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:22:22 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.90-gpm-integration.patch,
	NONE, 1.1 gnome-panel.spec, 1.109, 1.110
Message-ID: <200602130922.k1D9MMpg029254@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.13.90-gpm-integration.patch 
Log Message:
- add first pass at gnome power manager integration


gnome-panel-2.13.90-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   59 ++++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 727 insertions(+), 11 deletions(-)

--- NEW FILE gnome-panel-2.13.90-gpm-integration.patch ---
--- gnome-panel-2.13.90/gnome-panel/Makefile.am.gpm-integration	2006-01-27 12:57:41.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/Makefile.am	2006-02-13 03:34:54.000000000 -0500
@@ -116,6 +116,7 @@
 	panel-addto.c		\
 	panel-logout.c		\
 	panel-gdm.c		\
+	panel-power-manager.c   \
 	$(EGG_RECENT_FILES_C)	\
 	$(NULL)
 
@@ -164,6 +165,7 @@
 	panel-addto.h		\
 	panel-logout.h		\
 	panel-gdm.h		\
+	panel-power-manager.h	\
 	$(EGG_RECENT_FILES_H)	\
 	$(NULL)
 
--- gnome-panel-2.13.90/gnome-panel/panel-logout.c.gpm-integration	2006-02-13 03:34:54.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-logout.c	2006-02-13 03:35:47.000000000 -0500
@@ -32,6 +32,7 @@
 
 #include "panel-logout.h"
 #include "panel-gdm.h"
+#include "panel-power-manager.h"
 #include "panel-session.h"
 
 #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
@@ -49,6 +50,7 @@
 
 struct _PanelLogoutDialogPrivate {
 	PanelLogoutDialogType type;
+	PanelPowerManager *power_manager;
 
 	int                   timeout;
 	unsigned int          timeout_id;
@@ -60,7 +62,7 @@
 
 static void panel_logout_destroy (PanelLogoutDialog *logout_dialog,
 				  gpointer           data);
-static void panel_logout_response (GtkWidget *logout_dialog,
+static void panel_logout_response (PanelLogoutDialog *logout_dialog,
 				   guint      response_id,
 				   gpointer   data);
 
@@ -137,6 +139,8 @@
 	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
 	gtk_window_stick (GTK_WINDOW (logout_dialog));
 
+	logout_dialog->priv->power_manager = panel_get_power_manager ();
+
 	g_signal_connect (logout_dialog, "destroy",
 			  G_CALLBACK (panel_logout_destroy), NULL);
 	g_signal_connect (logout_dialog, "response",
@@ -151,15 +155,21 @@
 		g_source_remove (logout_dialog->priv->timeout_id);
 	logout_dialog->priv->timeout_id = 0;
 
+	g_object_unref (logout_dialog->priv->power_manager);
+	logout_dialog->priv->power_manager = NULL;
+
 	current_dialog = NULL;
 }
 
 static void
-panel_logout_response (GtkWidget *logout_dialog,
+panel_logout_response (PanelLogoutDialog *logout_dialog,
 		       guint      response_id,
 		       gpointer   data)
 {
-	gtk_widget_destroy (logout_dialog);
+	PanelPowerManager *power_manager;
+
+	power_manager = g_object_ref (logout_dialog->priv->power_manager);
+	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
 
 	switch (response_id) {
 	case GTK_RESPONSE_CANCEL:
@@ -180,11 +190,15 @@
 		panel_session_request_logout ();
 		break;
 	case PANEL_LOGOUT_RESPONSE_STD:
-		gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
-		panel_session_request_logout ();
+	        if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) 
+	          gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
+	        else if (panel_power_manager_can_sleep_and_power_down (power_manager))
+	          panel_power_manager_request_sleep_and_power_down (power_manager);
+
 		break;
 	case PANEL_LOGOUT_RESPONSE_STR:
-		//FIXME
+	        if (panel_power_manager_can_sleep (power_manager))
+	          panel_power_manager_request_sleep (power_manager);
 		break;
 	case GTK_RESPONSE_NONE:
 	case GTK_RESPONSE_DELETE_EVENT:
@@ -192,6 +206,7 @@
 	default:
 		g_assert_not_reached ();
 	}
+	g_object_unref (power_manager);
 }
 
 static gboolean
@@ -314,7 +329,8 @@
 		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
 		//FIXME see previous FIXME
 
-		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND))
+		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND) ||
+	            panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager))
 			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
 					       _("_Suspend"),
 					       PANEL_LOGOUT_RESPONSE_STD);
--- gnome-panel-2.13.90/gnome-panel/panel-action-button.c.gpm-integration	2006-01-22 10:01:31.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-action-button.c	2006-02-13 03:34:54.000000000 -0500
@@ -47,9 +47,14 @@
 #include "panel-lockdown.h"
 #include "panel-logout.h"
 #include "panel-compatibility.h"
+#include "panel-power-manager.h"
 
 #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
 
+static gboolean panel_action_can_suspend (void);
+static gboolean panel_action_suspend_is_disabled (void);
+static void panel_action_suspend (GtkWidget *widget);
+
 enum {
 	PROP_0,
 	PROP_ACTION_TYPE,
@@ -76,6 +81,7 @@
 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
+	{ PANEL_ACTION_SUSPEND,        "suspend"       },
 	/* compatibility with GNOME < 2.13.90 */
 	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
 	{ 0,                           NULL             },
@@ -157,6 +163,13 @@
 			  gtk_get_current_event_time ());
 }
 
+static gboolean
+panel_action_shutdown_is_disabled (void)
+{
+  return panel_action_can_suspend () ||
+	 panel_lockdown_get_disable_log_out ();
+}
+
 static void
 panel_action_shutdown (GtkWidget *widget)
 {
@@ -165,6 +178,39 @@
 			  gtk_get_current_event_time ());
 }
 
+static gboolean
+panel_action_can_suspend (void)
+{
+  PanelPowerManager *manager;
+  gboolean can_suspend;
+
+  manager = panel_get_power_manager ();
+
+  can_suspend = panel_power_manager_can_sleep (manager);
+
+  g_object_unref (manager);
+
+  return can_suspend;
+}
+
+static gboolean
+panel_action_suspend_is_disabled (void)
+{
+  return !panel_action_can_suspend ();
+}
+
+static void
+panel_action_suspend (GtkWidget *widget)
+{
+  PanelPowerManager *manager;
+
+  manager = panel_get_power_manager ();
+
+  panel_power_manager_request_sleep (manager);
+
+  g_object_unref (manager);
+}
+
 /* Run Application
  */
 static void
@@ -348,7 +394,17 @@
 		"gospanel-20",
 		"ACTION:shutdown:NEW",
 		panel_action_shutdown, NULL, NULL,
-		panel_lockdown_get_disable_log_out
+		panel_action_shutdown_is_disabled
+	},
+	{
+		PANEL_ACTION_SUSPEND,
+		"screensaver",
+		N_("Suspend"),
+		N_("Suspend the computer"),
+		"gospanel-20",
+		"ACTION:suspend:NEW",
+		panel_action_suspend, NULL, NULL,
+	        panel_action_suspend_is_disabled 
 	},
 	/* deprecated actions */
 	{
@@ -853,6 +909,7 @@
 		actions [button->priv->type].invoke_menu (button, callback_name);
 }
 
+
 gboolean
 panel_action_button_load_from_drag (PanelToplevel *toplevel,
 				    int            position,
--- /dev/null	2006-02-13 00:25:00.157188500 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-power-manager.h	2006-02-13 03:34:54.000000000 -0500
@@ -0,0 +1,83 @@
+/* panel-power-manager.h - functions for powering down, restarting, and
+ *                         suspending the computer
+ *
+ * Copyright (C) 2006 Ray Strode <rstrode 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 PANEL_POWER_MANAGER_H
+#define PANEL_POWER_MANAGER_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ())
+#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager))
+#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
+#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER))
+#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER))
+#define PANEL_POWER_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
+#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ())
+typedef struct _PanelPowerManager PanelPowerManager;
+typedef struct _PanelPowerManagerClass PanelPowerManagerClass;
+typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate;
+typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest;
+typedef enum _PanelPowerManagerError PanelPowerManagerError;
+
+struct _PanelPowerManager
+{
+  GObject parent;
+
+  /*< private > */
+  PanelPowerManagerPrivate *priv;
+};
+
+struct _PanelPowerManagerClass
+{
+  GObjectClass parent_class;
+
+  /* signals */
+  void (* request_failed) (PanelPowerManager *manager, 
+	                   GError *error);
+};
+
+enum _PanelPowerManagerError
+{
+  PANEL_POWER_MANAGER_ERROR_SLEEPING = 0,
+  PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN
+};
+
+GType panel_power_manager_get_type (void);
+GQuark panel_power_manager_error_quark (void);
+
+PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC;
+
+gboolean panel_power_manager_can_sleep (PanelPowerManager *manager);
+gboolean panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager);
+gboolean panel_power_manager_can_power_down (PanelPowerManager *manager);
+gboolean panel_power_manager_can_restart (PanelPowerManager *manager);
+
+PanelPowerManagerRequest *panel_power_manager_request_sleep (PanelPowerManager *manager);
+PanelPowerManagerRequest *panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager);
+
+void panel_power_manager_cancel_request (PanelPowerManager *manager, 
+	                                 PanelPowerManagerRequest *request);
+
+
+PanelPowerManager *panel_get_power_manager (void);
+G_END_DECLS
+#endif /* PANEL_POWER_MANAGER_H */
--- gnome-panel-2.13.90/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-enums.h	2006-02-13 03:34:54.000000000 -0500
@@ -96,6 +96,7 @@
 	PANEL_ACTION_FORCE_QUIT,
 	PANEL_ACTION_CONNECT_SERVER,
         PANEL_ACTION_SHUTDOWN,
+	PANEL_ACTION_SUSPEND,
 	/* compatibility with GNOME < 2.13.90 */
         PANEL_ACTION_SCREENSHOT,
         PANEL_ACTION_LAST
--- gnome-panel-2.13.90/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-13 03:34:54.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-menu-items.c	2006-02-13 03:34:54.000000000 -0500
@@ -49,6 +49,7 @@
 #include "panel-recent.h"
 #include "panel-stock-icons.h"
 #include "panel-util.h"
+#include "panel-power-manager.h"
 
 #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
 #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
@@ -1011,8 +1012,21 @@
 
 	menuitem->priv->append_lock_logout = append_lock_logout;
 	if (append_lock_logout)
-		panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
-					   menuitem);
+	  {
+	    PanelPowerManager *manager;
+
+	    panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
+	                               menuitem);
+
+	    manager = panel_get_power_manager ();
+
+	    g_signal_connect_swapped (manager, "notify::is-connected",
+	                              G_CALLBACK
+	                              (panel_desktop_menu_item_recreate_menu), 
+	                              menuitem);
+
+	        g_object_unref (manager);
+	  }
 
 	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
@@ -1118,6 +1132,14 @@
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
 
+	item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND);
+	if (item != NULL) {
+		if (!separator_inserted)
+			add_menu_separator (menu);
+
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
+
 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
 	if (item != NULL) {
 		if (!separator_inserted)
--- /dev/null	2006-02-13 00:25:00.157188500 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-power-manager.c	2006-02-13 03:34:54.000000000 -0500
@@ -0,0 +1,533 @@
+/* panel-power-manager.c - functions for powering down, restarting, and
+ *                         suspending the computer
+ *
+ * Copyright (C) 2006 Ray Strode <rstrode 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.  
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif 
+
+#include "panel-power-manager.h"
+
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gi18n.h>
+
+#include <dbus/dbus-glib.h>
+
+struct _PanelPowerManagerPrivate
+{
+  DBusGConnection *dbus_connection;
+  DBusGProxy      *bus_proxy;
+  DBusGProxy      *gpm_proxy;
+  guint32          is_connected : 1;
+};
+
+
+static void panel_power_manager_finalize (GObject *object);
+static void panel_power_manager_class_install_signals (PanelPowerManagerClass * manager_class);
+static void
+panel_power_manager_class_install_properties (PanelPowerManagerClass *
+					      manager_class);
+
+static void panel_power_manager_get_property (GObject * object,
+					      guint prop_id,
+					      GValue * value,
+					      GParamSpec * pspec);
+
+static gboolean panel_power_manager_ensure_gpm_connection (PanelPowerManager *manager,
+	                                                   GError      **error);
+enum
+{
+  PROP_0 = 0,
+  PROP_IS_CONNECTED
+};
+
+enum
+{
+  REQUEST_FAILED = 0,
+  NUMBER_OF_SIGNALS
+};
+
+static guint panel_power_manager_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (PanelPowerManager, panel_power_manager, G_TYPE_OBJECT);
+
+static void
+panel_power_manager_class_init (PanelPowerManagerClass * manager_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+
+  object_class->finalize = panel_power_manager_finalize;
+
+  panel_power_manager_class_install_properties (manager_class);
+  panel_power_manager_class_install_signals (manager_class);
+
+  g_type_class_add_private (manager_class, sizeof (PanelPowerManagerPrivate));
+}
+
+static void
+panel_power_manager_class_install_signals (PanelPowerManagerClass *
+					   manager_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+
+  panel_power_manager_signals[REQUEST_FAILED] =
+    g_signal_new ("request-failed", G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (PanelPowerManagerClass, request_failed),
+		  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+	          G_TYPE_NONE, 1, G_TYPE_POINTER);
+  manager_class->request_failed = NULL;
+}
+
+static void
+panel_power_manager_class_install_properties (PanelPowerManagerClass *
+					      manager_class)
+{
+  GObjectClass *object_class;
+  GParamSpec *param_spec;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+  object_class->get_property = panel_power_manager_get_property;
+
+  param_spec = g_param_spec_boolean ("is-connected", _("Is connected"),
+	                             _("whether the the panel is connected "
+	                               "to the power manager"),
+	                             FALSE,
+	                             G_PARAM_READABLE);
+  g_object_class_install_property (object_class, PROP_IS_CONNECTED, param_spec);
+}
+
+static void
+panel_power_manager_on_name_owner_changed (DBusGProxy *bus_proxy,
+	                                   const char *name, 
+	                                   const char *prev_owner,
+	                                   const char *new_owner,
+	                                   PanelPowerManager *manager)
+{
+  gboolean is_online;
+
+  is_online = strcmp (new_owner, "") != 0;
+
+  if (strcmp (name, "org.gnome.PowerManager") != 0)
+    return;
+
+  if (manager->priv->gpm_proxy != NULL)
+    {
+      g_object_unref (manager->priv->gpm_proxy);
+      manager->priv->gpm_proxy = NULL;
+    }
+
+  panel_power_manager_ensure_gpm_connection (manager, NULL);
+}
+
+static gboolean
+panel_power_manager_ensure_gpm_connection (PanelPowerManager  *manager, 
+	                            GError            **error)
+{
+  GError *connection_error;
+  gboolean is_connected;
+
+  connection_error = NULL;
+  if (manager->priv->dbus_connection == NULL)
+    {
+      manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, 
+	                                               &connection_error);
+
+      if (manager->priv->dbus_connection == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+    }
+
+  g_assert (connection_error == NULL);
+
+  if (manager->priv->bus_proxy == NULL)
+    {
+      manager->priv->bus_proxy = 
+	  dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
+	                                   DBUS_SERVICE_DBUS,
+	                                   DBUS_PATH_DBUS,
+	                                   DBUS_INTERFACE_DBUS,
+	                                   &connection_error);
+
+      if (manager->priv->bus_proxy == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+
+      dbus_g_proxy_add_signal (manager->priv->bus_proxy, 
+	                       "NameOwnerChanged",
+	                       G_TYPE_STRING,
+	                       G_TYPE_STRING,
+	                       G_TYPE_STRING,
+	                       G_TYPE_INVALID);
+      dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
+	                           "NameOwnerChanged",
+	                           G_CALLBACK (panel_power_manager_on_name_owner_changed), 
+	                           manager, NULL);
+    }
+
+  g_assert (connection_error == NULL);
+
+  if (manager->priv->gpm_proxy == NULL)
+    {
+      manager->priv->gpm_proxy = 
+	  dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
+	                                   "org.gnome.PowerManager",
+	                                   "/org/gnome/PowerManager",
+	                                   "org.gnome.PowerManager",
+	                                   &connection_error);
+
+      if (manager->priv->gpm_proxy == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+    }
+  is_connected = TRUE;
+
+out:
+  if (manager->priv->is_connected != is_connected)
+    {
+      manager->priv->is_connected = is_connected;
+      g_object_notify (G_OBJECT (manager), "is-connected"); 
+    }
+
+  if (!is_connected)
+    {
+      if (manager->priv->dbus_connection == NULL)
+	{
+	  if (manager->priv->bus_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->bus_proxy);
+	      manager->priv->bus_proxy = NULL;
+	    }
+
+	  if (manager->priv->gpm_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->gpm_proxy);
+	      manager->priv->gpm_proxy = NULL;
+	    }
+	}
+      else if (manager->priv->bus_proxy == NULL)
+	{
+	  if (manager->priv->gpm_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->gpm_proxy);
+	      manager->priv->gpm_proxy = NULL;
+	    }
+	}
+    }
+
+  return is_connected;
+}
+
+static void
+panel_power_manager_init (PanelPowerManager *manager)
+{
+  GError *error;
+
+  manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+					       PANEL_TYPE_POWER_MANAGER,
+					       PanelPowerManagerPrivate);
+
+  manager->priv->dbus_connection = NULL;
+  manager->priv->bus_proxy = NULL;
+  manager->priv->gpm_proxy = NULL;
+  manager->priv->is_connected = FALSE;
+
+  error = NULL;
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+panel_power_manager_finalize (GObject * object)
+{
+  PanelPowerManager *manager;
+  GObjectClass *parent_class;
+
+  manager = PANEL_POWER_MANAGER (object);
+
+  parent_class = G_OBJECT_CLASS (panel_power_manager_parent_class);
+
+  if (parent_class->finalize != NULL)
+    parent_class->finalize (object);
+}
+
+static void
+panel_power_manager_get_property (GObject * object,
+				  guint prop_id,
+				  GValue * value, GParamSpec * pspec)
+{
+  PanelPowerManager *manager = PANEL_POWER_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_IS_CONNECTED:
+      g_value_set_boolean (value, manager->priv->is_connected);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+GQuark
+panel_power_manager_error_quark (void)
+{
+  static GQuark error_quark = 0;
+
+  if (error_quark == 0)
+    error_quark = g_quark_from_static_string ("panel-power-manager-error");
+
+  return error_quark;
+}
+
+PanelPowerManager *
+panel_power_manager_new (void)
+{
+  PanelPowerManager *manager;
+
+  manager = g_object_new (PANEL_TYPE_POWER_MANAGER, NULL);
+
+  return manager;
+}
+
+gboolean 
+panel_power_manager_can_sleep (PanelPowerManager *manager)
+{
+  GError *error;
+  gboolean can_sleep;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  can_sleep = FALSE;
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", &error,
+	                  G_TYPE_INVALID,
+	                  G_TYPE_BOOLEAN, &can_sleep, G_TYPE_INVALID)) 
+    {
+      if (error != NULL)
+	{
+	  g_message ("could not ask power manager if user can suspend - %s",
+	             error->message);
+	  g_error_free (error);
+	}
+      can_sleep = FALSE;
+    }
+
+  return can_sleep;
+}
+
+gboolean 
+panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager)
+{
+  GError *error;
+  gboolean can_sleep_and_power_down;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  can_sleep_and_power_down = FALSE;
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", &error,
+	                  G_TYPE_INVALID,
+	                  G_TYPE_BOOLEAN, &can_sleep_and_power_down, 
+	                  G_TYPE_INVALID)) 
+    {
+      if (error != NULL)
+	{
+	  g_message ("could not ask power manager if user can suspend - %s",
+	             error->message);
+	  g_error_free (error);
+	}
+      can_sleep_and_power_down = FALSE;
+    }
+
+  return can_sleep_and_power_down;
+}
+
+PanelPowerManagerRequest *
+panel_power_manager_request_sleep (PanelPowerManager *manager)
+{
+  GError *error;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_warning ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return NULL;
+    }
+
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", &error,
+	                  G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) 
+    {
+
+      GError *call_error;
+      g_warning ("could not ask power manager to suspend - %s",
+	         error->message);
+      call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR,
+	                                PANEL_POWER_MANAGER_ERROR_SLEEPING,
+	                                error->message);
+      g_error_free (error);
+      g_signal_emit (G_OBJECT (manager),
+	             panel_power_manager_signals[REQUEST_FAILED],
+	             0, call_error);
+      g_error_free (call_error);
+    }
+
+  return (PanelPowerManagerRequest *) !NULL;
+}
+
+PanelPowerManagerRequest *
+panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager)
+{
+  GError *error;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_warning ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return NULL;
+    }
+
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", &error,
+	                  G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) 
+    {
+      GError *call_error;
+
+      g_warning ("could not ask power manager to hibernate - %s",
+	         error->message);
+      call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR,
+	                                PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN,
+	                                error->message);
+      g_error_free (error);
+      g_signal_emit (G_OBJECT (manager),
+	             panel_power_manager_signals[REQUEST_FAILED],
+	             0, call_error);
+      g_error_free (call_error);
+      return NULL;
+    }
+
+  return (PanelPowerManagerRequest *) !NULL;
+}
+
+void
+panel_power_manager_cancel_request (PanelPowerManager *manager,
+	                            PanelPowerManagerRequest *request)
+{
+}
+
+PanelPowerManager *
+panel_get_power_manager (void)
+{
+  static PanelPowerManager *manager = NULL;
+
+  if (manager == NULL)
+    manager = panel_power_manager_new ();
+
+  return g_object_ref (manager);
+}
+
+
+#ifdef PANEL_POWER_MANAGER_ENABLE_TEST
+
+#include <stdio.h>
+#include <glib.h>
+
+int
+main (int argc, char **argv)
+{
+  PanelPowerManager *manager;
+  int exit_code;
+
+  g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			  | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+  g_type_init ();
+
+  g_print ("creating instance of 'power manager' object... ");
+  manager = panel_power_manager_new ();
+  g_print ("done\n");
+
+  g_print ("checking if user can put machine to sleep... ");
+  if (panel_power_manager_can_sleep (manager))
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("checking if user can hibernate machine... ");
+  if (panel_power_manager_can_sleep_and_power_down (manager))
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("attempting to suspend machine... ");
+  if (panel_power_manager_request_sleep (manager) != NULL)
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("attempting to hibernate machine... ");
+  if (panel_power_manager_request_sleep_and_power_down (manager) != NULL)
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("destroying previously created 'power manager' object... ");
+  g_object_unref (manager);
+  g_print ("done\n");
+
+  exit_code = 0;
+
+  return exit_code;
+}
+#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
--- gnome-panel-2.13.90/configure.in.gpm-integration	2006-01-27 12:21:54.000000000 -0500
+++ gnome-panel-2.13.90/configure.in	2006-02-13 03:34:54.000000000 -0500
@@ -58,10 +58,12 @@
 LIBECAL_REQUIRED=0.0.97
 LIBEDATASERVERUI_REQUIRED=1.2.0
 CAIRO_REQUIRED=1.0.0
+DBUS_REQUIRED=0.60
+DBUS_GLIB_REQUIRED=0.60
 
 dnl pkg-config dependency checks
 
-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED)
+PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 AC_SUBST(PANEL_CFLAGS)
 AC_SUBST(PANEL_LIBS)
 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- gnome-panel.spec	11 Feb 2006 03:15:22 -0000	1.109
+++ gnome-panel.spec	13 Feb 2006 09:22:19 -0000	1.110
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.90
-Release: 1.2
+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
@@ -58,6 +58,9 @@
 Patch4: gnome-panel-2.13.2-rename-system-menu.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
+Patch7: gnome-panel-2.13.90-gpm-integration.patch
+
+Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
 %description
 The GNOME panel provides the window list, workspace switcher, menus, and other 
@@ -83,6 +86,7 @@
 %patch4 -p1 -b .rename-system-menu
 %patch5 -p1 -b .about-fedora
 %patch6 -p1 -b .switch-user
+%patch7 -p1 -b .gpm-integration
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
@@ -95,6 +99,10 @@
 done
 
 %build
+intltoolize -f 
+aclocal-1.9
+automake-1.9
+autoconf
 %configure \
    --disable-gtk-doc \
    --disable-scrollkeeper \
@@ -194,6 +202,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-2
+- add first pass at gnome power manager integration
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:23:50 -0500
Subject: rpms/gnome-power-manager/devel
	gnome-power-manager-2.13.5.0.20060207-panel-integration.patch,
	NONE, 1.1 gnome-power-manager.spec, 1.21, 1.22
Message-ID: <200602130923.k1D9NoEl029915@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29806

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.13.5.0.20060207-panel-integration.patch 
Log Message:
- remove Hibernate and Suspend from menus as part of
  panel/g-p-m integration effort


gnome-power-manager-2.13.5.0.20060207-panel-integration.patch:
 gpm-tray-icon.c |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE gnome-power-manager-2.13.5.0.20060207-panel-integration.patch ---
--- gnome-power-manager-2.13.5.0.20060207/src/gpm-tray-icon.c.panel-integration	2006-02-13 03:47:26.000000000 -0500
+++ gnome-power-manager-2.13.5.0.20060207/src/gpm-tray-icon.c	2006-02-13 03:48:33.000000000 -0500
@@ -414,9 +414,6 @@
 	gtk_ui_manager_add_ui_from_string (tray->priv->ui_manager,
 					   "<ui>"
 					   "  <popup name=\"GpmTrayPopup\">"
-					   "    <menuitem action=\"TraySuspend\" />"
-					   "    <menuitem action=\"TrayHibernate\" />"
-					   "    <separator />"
 					   "    <menuitem action=\"TrayPreferences\" />"
 					   "    <separator />"
 					   "    <menuitem action=\"TrayHelp\" />"


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-power-manager.spec	11 Feb 2006 03:15:56 -0000	1.21
+++ gnome-power-manager.spec	13 Feb 2006 09:23:47 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.5.0.20060207
-Release: 1.1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -23,6 +23,8 @@
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: scrollkeeper
+Patch0: gnome-power-manager-2.13.5.0.20060207-panel-integration.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
 displaying icons and handling user callbacks in an interactive GNOME session. 
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .panel-integration
 
 %build
 %configure --disable-scrollkeeper
@@ -79,6 +82,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Sun Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.5.0.20060207-2
+- remove Hibernate and Suspend from menus as part of
+  panel/g-p-m integration effort
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5.0.20060207-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:34:24 -0500
Subject: rpms/gnome-panel/devel gnome-compiler-flags.m4, NONE,
	1.1 gnome-panel.spec, 1.110, 1.111
Message-ID: <200602130934.k1D9YN8M000332@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-compiler-flags.m4 
Log Message:
add gnome-compiler-flags.m4 for autofoo



--- NEW FILE gnome-compiler-flags.m4 ---
dnl GNOME_COMPILE_WARNINGS
dnl Turn on many useful compiler warnings
dnl For now, only works on GCC
AC_DEFUN([GNOME_COMPILE_WARNINGS],[
    dnl ******************************
    dnl More compiler warnings
    dnl ******************************

    AC_ARG_ENABLE(compile-warnings, 
                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
                                 [Turn on compiler warnings]),,
                  [enable_compile_warnings="m4_default([$1],[yes])"])

    warnCFLAGS=
    if test "x$GCC" != xyes; then
	enable_compile_warnings=no
    fi

    warning_flags=
    realsave_CFLAGS="$CFLAGS"

    case "$enable_compile_warnings" in
    no)
	warning_flags=
	;;
    minimum)
	warning_flags="-Wall"
	;;
    yes)
	warning_flags="-Wall -Wmissing-prototypes"
	;;
    maximum|error)
	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
	CFLAGS="$warning_flags $CFLAGS"
	for option in -Wno-sign-compare; do
		SAVE_CFLAGS="$CFLAGS"
		CFLAGS="$CFLAGS $option"
		AC_MSG_CHECKING([whether gcc understands $option])
		AC_TRY_COMPILE([], [],
			has_option=yes,
			has_option=no,)
		CFLAGS="$SAVE_CFLAGS"
		AC_MSG_RESULT($has_option)
		if test $has_option = yes; then
		  warning_flags="$warning_flags $option"
		fi
		unset has_option
		unset SAVE_CFLAGS
	done
	unset option
	if test "$enable_compile_warnings" = "error" ; then
	    warning_flags="$warning_flags -Werror"
	fi
	;;
    *)
	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
	;;
    esac
    CFLAGS="$realsave_CFLAGS"
    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
    AC_MSG_RESULT($warning_flags)

    AC_ARG_ENABLE(iso-c,
                  AC_HELP_STRING([--enable-iso-c],
                                 [Try to warn if code is not ISO C ]),,
                  [enable_iso_c=no])

    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
    complCFLAGS=
    if test "x$enable_iso_c" != "xno"; then
	if test "x$GCC" = "xyes"; then
	case " $CFLAGS " in
	    *[\ \	]-ansi[\ \	]*) ;;
	    *) complCFLAGS="$complCFLAGS -ansi" ;;
	esac
	case " $CFLAGS " in
	    *[\ \	]-pedantic[\ \	]*) ;;
	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
	esac
	fi
    fi
    AC_MSG_RESULT($complCFLAGS)

    WARN_CFLAGS="$warning_flags $complCFLAGS"
    AC_SUBST(WARN_CFLAGS)
])

dnl For C++, do basically the same thing.

AC_DEFUN([GNOME_CXX_WARNINGS],[
  AC_ARG_ENABLE(cxx-warnings,
                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
                               [Turn on compiler warnings.]),,
                [enable_cxx_warnings="m4_default([$1],[minimum])"])

  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
  warnCXXFLAGS=
  if test "x$GCC" != xyes; then
    enable_compile_warnings=no
  fi
  if test "x$enable_cxx_warnings" != "xno"; then
    if test "x$GCC" = "xyes"; then
      case " $CXXFLAGS " in
      *[\ \	]-Wall[\ \	]*) ;;
      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
      esac

      ## -W is not all that useful.  And it cannot be controlled
      ## with individual -Wno-xxx flags, unlike -Wall
      if test "x$enable_cxx_warnings" = "xyes"; then
	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
      fi
    fi
  fi
  AC_MSG_RESULT($warnCXXFLAGS)

   AC_ARG_ENABLE(iso-cxx,
                 AC_HELP_STRING([--enable-iso-cxx],
                                [Try to warn if code is not ISO C++ ]),,
                 [enable_iso_cxx=no])

   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
   complCXXFLAGS=
   if test "x$enable_iso_cxx" != "xno"; then
     if test "x$GCC" = "xyes"; then
      case " $CXXFLAGS " in
      *[\ \	]-ansi[\ \	]*) ;;
      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
      esac

      case " $CXXFLAGS " in
      *[\ \	]-pedantic[\ \	]*) ;;
      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
      esac
     fi
   fi
  AC_MSG_RESULT($complCXXFLAGS)

  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
  AC_SUBST(WARN_CXXFLAGS)
])


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- gnome-panel.spec	13 Feb 2006 09:22:19 -0000	1.110
+++ gnome-panel.spec	13 Feb 2006 09:34:10 -0000	1.111
@@ -20,6 +20,7 @@
 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
+Source2: gnome-compiler-flags.m4
 Source3: redhat-panel-backwards-compat-config.schemas
 License: GPL 
 Group: User Interface/Desktops
@@ -89,6 +90,7 @@
 %patch7 -p1 -b .gpm-integration
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
+cp -f %{SOURCE2} m4
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
 
 ## use the main menu icon in the menu bar
@@ -100,7 +102,7 @@
 
 %build
 intltoolize -f 
-aclocal-1.9
+aclocal-1.9 -I $PWD/m4
 automake-1.9
 autoconf
 %configure \



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:40:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:40:14 -0500
Subject: rpms/glibc/devel glibc-fedora.patch,1.133,1.134
Message-ID: <200602130940.k1D9eEON002141@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	glibc-fedora.patch 
Log Message:
2.3.90-37


glibc-fedora.patch:
 ChangeLog                                                |   68 ++
 ChangeLog.11                                             |   21 
 ChangeLog.12                                             |   12 
 ChangeLog.15                                             |   45 +
 csu/elf-init.c                                           |   17 
 debug/tst-chk1.c                                         |    7 
 elf/ldconfig.c                                           |   38 +
 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 
 libc/nptl/descr.h                                        |    2 
 libc/sysdeps/unix/sysv/linux/not-cancel.h                |   22 
 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 
 manual/filesys.texi                                      |    2 
 nptl/ChangeLog                                           |   40 +
 nptl/Makefile                                            |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h   |   10 
 nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h    |   10 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h           |    6 
 nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h |   19 
 nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h    |   19 
 nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h      |    8 
 nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h   |   19 
 nptl/tst-stackguard1.c                                   |    8 
 nscd/connections.c                                       |   15 
 nscd/nscd.c                                              |    4 
 nscd/nscd.conf                                           |    4 
 nscd/nscd.init                                           |   19 
 nscd/selinux.c                                           |    2 
 posix/Makefile                                           |   19 
 posix/getconf.speclist.h                                 |   15 
 sysdeps/generic/dl-cache.h                               |    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 +
 59 files changed, 894 insertions(+), 490 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- glibc-fedora.patch	13 Feb 2006 09:18:47 -0000	1.133
+++ glibc-fedora.patch	13 Feb 2006 09:40:11 -0000	1.134
@@ -2348,3 +2348,39 @@
      else								      \
        {									      \
  	while (runp->__next != &mutex->__data.__list)			      \
+--- libc/sysdeps/unix/sysv/linux/not-cancel.h	13 Feb 2006 07:30:05 -0000	1.5.2.1
++++ libc/sysdeps/unix/sysv/linux/not-cancel.h	13 Feb 2006 09:39:09 -0000
+@@ -28,18 +28,26 @@
+    INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
+ 
+ /* Uncancelable openat.  */
+-extern int __openat_not_cancel (int fd, const char *fname, int oflag,
++#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
++extern int __openat_nocancel (int fd, const char *fname, int oflag,
++			      mode_t mode) attribute_hidden;
++extern int __openat64_nocancel (int fd, const char *fname, int oflag,
+ 				mode_t mode) attribute_hidden;
++#else
++# define __openat_nocancel(fd, fname, oflag, mode) \
++  openat (fd, fname, oflag, mode)
++# define __openat64_nocancel(fd, fname, oflag, mode) \
++  openat64 (fd, fname, oflag, mode)
++#endif
++
+ #define openat_not_cancel(fd, fname, oflag, mode) \
+-  __openat_not_cancel (fd, fname, oflag, mode)
++  __openat_nocancel (fd, fname, oflag, mode)
+ #define openat_not_cancel_3(fd, fname, oflag) \
+-  __openat_not_cancel (fd, fname, oflag, 0)
+-extern int __openat64_not_cancel (int fd, const char *fname, int oflag,
+-				  mode_t mode) attribute_hidden;
++  __openat_nocancel (fd, fname, oflag, 0)
+ #define openat64_not_cancel(fd, fname, oflag, mode) \
+-  __openat64_not_cancel (fd, fname, oflag, mode)
++  __openat64_nocancel (fd, fname, oflag, mode)
+ #define openat64_not_cancel_3(fd, fname, oflag) \
+-  __openat64_not_cancel (fd, fname, oflag, 0)
++  __openat64_nocancel (fd, fname, oflag, 0)
+ 
+ /* Uncancelable close.  */
+ #define close_not_cancel(fd) \



From fedora-cvs-commits at redhat.com  Mon Feb 13 09:45:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 04:45:22 -0500
Subject: rpms/man/FC-4 man.spec,1.37,1.38
Message-ID: <200602130945.k1D9jMWH004467@cvs.devel.redhat.com>

Author: varekova

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

Modified Files:
	man.spec 
Log Message:
- fix bug 146849 - makewhatis from cron produce error message
  "zcat: stdout: Broken pipe" 



Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/FC-4/man.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- man.spec	17 May 2005 07:04:13 -0000	1.37
+++ man.spec	13 Feb 2006 09:45:20 -0000	1.38
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.5p
-Release: 6
+Release: 6.fc4
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.gz
@@ -316,7 +316,7 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
-* Tue May 17 2005 Ivana Varekova <varekova at redhat.xom> 1.5p-6
+* Tue May 17 2005 Ivana Varekova <varekova at redhat.com> 1.5p-6.fc4
 - change patch 18 (less hard solution) and 
   patch 13 (don't change exit number in one case)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 10:09:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 05:09:56 -0500
Subject: rpms/ksh/devel .cvsignore, 1.5, 1.6 ksh.spec, 1.19, 1.20 sources,
	1.5, 1.6
Message-ID: <200602131009.k1DA9ub0016545@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	.cvsignore ksh.spec sources 
Log Message:
- version 20060124


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Mar 2005 12:13:12 -0000	1.5
+++ .cvsignore	13 Feb 2006 10:09:53 -0000	1.6
@@ -1,3 +1,3 @@
-ast-base-locale.2005-02-02.tgz
-ast-ksh.2005-02-02.tgz
-INIT.2005-02-02.tgz
+ast-base-locale.2006-01-24.tgz
+ast-ksh.2006-01-24.tgz
+INIT.2006-01-24.tgz


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ksh.spec	11 Feb 2006 03:50:24 -0000	1.19
+++ ksh.spec	13 Feb 2006 10:09:53 -0000	1.20
@@ -1,4 +1,4 @@
-%define       releasedate   2005-02-02
+%define       releasedate   2006-01-24
 #ExcludeArch:  ia64
 
 Name:         ksh
@@ -6,8 +6,8 @@
 URL:          http://www.kornshell.com/
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
-Version:      20050202
-Release:      5.1
+Version:      20060124
+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
@@ -34,7 +34,7 @@
 %setup -q -T -D -a 2
 #%patch0 -p1 -b .ppc64
 %patch1 -p1 -b .gcc4
-%patch2 -p1 -b .path
+#patch2 -p1 -b .path
 %patch3 -p1 -b .uname
 
 %build
@@ -92,6 +92,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 13 2006 Karsten Hopp <karsten at redhat.de> 20060124-1
+- version 20060124
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20050202-5.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Mar 2005 12:13:12 -0000	1.5
+++ sources	13 Feb 2006 10:09:53 -0000	1.6
@@ -1,3 +1,3 @@
-ce418399d63ee91544cce0088f73fea0  ast-base-locale.2005-02-02.tgz
-fecce7e67b55fe986c7c2163346e0977  ast-ksh.2005-02-02.tgz
-50339ec5c16f102e865f8f766da9016d  INIT.2005-02-02.tgz
+d78f60d5429a64eb522fa95df0cb22c1  ast-base-locale.2006-01-24.tgz
+a2ccd63471e460f141d6461d659306b4  ast-ksh.2006-01-24.tgz
+7cbb9964efece69294fae60bb19f0d68  INIT.2006-01-24.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:19:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:19:38 -0500
Subject: rpms/kernel-xen/devel patch-2.6.16-rc3.bz2.sign, NONE,
	1.1 .cvsignore, 1.19, 1.20 kernel-xen.spec, 1.68, 1.69 sources,
	1.19, 1.20 upstream, 1.11, 1.12
Message-ID: <200602131219.k1DCJcei022743@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	.cvsignore kernel-xen.spec sources upstream 
Added Files:
	patch-2.6.16-rc3.bz2.sign 
Log Message:
rebase rawhide 1.1941


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

iD8DBQBD7/XoyGugalF9Dw4RAhgyAJwPT97RrfAglisQMGA6yaK1FLsN/gCggIQl
bImjY6eqBFMjDMexsQXbBR8=
=084z
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Feb 2006 03:05:17 -0000	1.19
+++ .cvsignore	13 Feb 2006 12:19:35 -0000	1.20
@@ -2,6 +2,4 @@
 temp-*
 kernel-xen-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc2.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc2-git12.bz2


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- kernel-xen.spec	13 Feb 2006 03:05:18 -0000	1.68
+++ kernel-xen.spec	13 Feb 2006 12:19:35 -0000	1.69
@@ -216,8 +216,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc2.bz2
-Patch2: patch-2.6.16-rc2-git12.bz2
+Patch1: patch-2.6.16-rc3.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -694,7 +693,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 #
@@ -1593,6 +1591,9 @@
 
 %changelog
 * Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1941.
+
+* Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
 - rebase with rawhide 1.1940.
 - build only for x86_64 & i686.
 
@@ -1601,7 +1602,7 @@
 - rebase with rawhide 1.1936
 
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc2-git11 & -git12
+- 2.6.16rc2-git11, -git12, and 2.6.16rc3
 - Fix warning in bcm43xx driver.
 - Missing license tag in p8023
 - Fix oops in bluetooth


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Feb 2006 03:05:19 -0000	1.19
+++ sources	13 Feb 2006 12:19:35 -0000	1.20
@@ -1,4 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-7b79682e01dbb03e5ede7b370d0202dc  patch-2.6.16-rc2.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-e546fce308932221205f3aacab0337b9  patch-2.6.16-rc2-git12.bz2
+


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- upstream	13 Feb 2006 03:05:19 -0000	1.11
+++ upstream	13 Feb 2006 12:19:35 -0000	1.12
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc2.bz2
+patch-2.6.16-rc3.bz2
 patch-2.6.16-rc2-git12.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:27:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:27:44 -0500
Subject: rpms/agg/devel agg.spec,1.7,1.8
Message-ID: <200602131227.k1DCRiFp019701@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19688

Modified Files:
	agg.spec 
Log Message:
build requires


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- agg.spec	11 Feb 2006 01:32:44 -0000	1.7
+++ agg.spec	13 Feb 2006 12:27:41 -0000	1.8
@@ -7,7 +7,7 @@
 License: MIT
 Source:  http://www.antigrain.com/%{name}23.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: automake, libX11-devel
+BuildRequires: automake, libtool, libX11-devel
 Patch1: agg23-optional-gpc.patch
 
 %description
@@ -56,6 +56,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 2.3-3
+- BuildRequires
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:31:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:31:39 -0500
Subject: rpms/gnome-games/devel .cvsignore, 1.32, 1.33 gnome-games.spec, 1.65,
	1.66 sources, 1.35, 1.36
Message-ID: <200602131231.k1DCVdLR019816@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.13.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	31 Jan 2006 03:29:31 -0000	1.32
+++ .cvsignore	13 Feb 2006 12:31:26 -0000	1.33
@@ -2,3 +2,4 @@
 gnome-games-extra-data-no-windows-2.12.0.tar.bz2
 gnome-games-2.13.5.tar.bz2
 gnome-games-2.13.6.tar.bz2
+gnome-games-2.13.7.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- gnome-games.spec	11 Feb 2006 03:13:27 -0000	1.65
+++ gnome-games.spec	13 Feb 2006 12:31:37 -0000	1.66
@@ -10,8 +10,8 @@
 
 Summary: GNOME games.
 Name: gnome-games
-Version: 2.13.6
-Release: 3.2
+Version: 2.13.7
+Release: 1 
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -180,6 +180,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.7-1
+- Update to 2.13.7
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.6-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	31 Jan 2006 03:29:31 -0000	1.35
+++ sources	13 Feb 2006 12:31:37 -0000	1.36
@@ -1,2 +1,2 @@
 19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
-b9421b420cd964a0bb7b7e510c4ff793  gnome-games-2.13.6.tar.bz2
+5bf973558832c376d43227be44e3c405  gnome-games-2.13.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:32:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:32:00 -0500
Subject: rpms/agg/devel agg.spec,1.8,1.9
Message-ID: <200602131232.k1DCW0oL019845@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19828

Modified Files:
	agg.spec 
Log Message:
buildrequires


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- agg.spec	13 Feb 2006 12:27:41 -0000	1.8
+++ agg.spec	13 Feb 2006 12:31:58 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.3
-Release: 2.1
+Release: 3
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:33:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:33:13 -0500
Subject: rpms/totem/devel .cvsignore, 1.18, 1.19 sources, 1.18,
	1.19 totem.spec, 1.52, 1.53
Message-ID: <200602131233.k1DCXDwM019998@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/totem/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19981

Modified Files:
	.cvsignore sources totem.spec 
Log Message:
1.3.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	31 Jan 2006 03:06:23 -0000	1.18
+++ .cvsignore	13 Feb 2006 12:33:11 -0000	1.19
@@ -12,3 +12,4 @@
 totem-1.3.0.tar.bz2
 totem-1.3.1.tar.bz2
 totem-1.3.90.tar.bz2
+totem-1.3.91.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	31 Jan 2006 03:06:24 -0000	1.18
+++ sources	13 Feb 2006 12:33:11 -0000	1.19
@@ -1 +1 @@
-fbb1ef6d8b6dc9150ab51ced8f65b618  totem-1.3.90.tar.bz2
+2d0b57549a6bcc989061468ce133ea24  totem-1.3.91.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- totem.spec	11 Feb 2006 05:53:00 -0000	1.52
+++ totem.spec	13 Feb 2006 12:33:11 -0000	1.53
@@ -4,8 +4,8 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 1.3.90
-Release: 2.1
+Version: 1.3.91
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -135,6 +135,9 @@
 %{_libdir}/*so
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.3.91-1
+- Update to 1.3.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.90-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:36:28 -0500
Subject: rpms/gnome-games/devel gnome-games.spec,1.66,1.67
Message-ID: <200602131236.k1DCaSp3020087@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
drop patch



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-games.spec	13 Feb 2006 12:31:37 -0000	1.66
+++ gnome-games.spec	13 Feb 2006 12:36:25 -0000	1.67
@@ -17,7 +17,6 @@
 Group: Amusements/Games
 Source: gnome-games-%{version}.tar.bz2
 Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2
-Patch0: gnome-games-2.13.6-gstreamer.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome-games-devel
@@ -50,8 +49,6 @@
 %prep
 %setup -q
 
-%patch0 -p1 -b .gstreamer
-
 tar xjf %{SOURCE2}
 
 cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:38:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:38:49 -0500
Subject: rpms/gnome-keyring/devel .cvsignore, 1.13, 1.14 gnome-keyring.spec,
	1.19, 1.20 sources, 1.13, 1.14
Message-ID: <200602131238.k1DCcnYi020211@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
0.4.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Nov 2005 18:41:52 -0000	1.13
+++ .cvsignore	13 Feb 2006 12:38:47 -0000	1.14
@@ -6,3 +6,4 @@
 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


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome-keyring.spec	11 Feb 2006 03:13:51 -0000	1.19
+++ gnome-keyring.spec	13 Feb 2006 12:38:47 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 0.4.6
-Release: 1.2.1
+Version: 0.4.7
+Release: 1
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: gnome-keyring-%{version}.tar.bz2
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.7-1
+- Update to 0.4.7
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4.6-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Nov 2005 18:41:52 -0000	1.13
+++ sources	13 Feb 2006 12:38:47 -0000	1.14
@@ -1 +1 @@
-7d94fc9598035ea1a92f4e777dfc4194  gnome-keyring-0.4.6.tar.bz2
+6c760ec2783ce02152ac9d8ef4471a41  gnome-keyring-0.4.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:40:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:40:42 -0500
Subject: rpms/eel2/devel .cvsignore, 1.29, 1.30 eel2.spec, 1.37, 1.38 sources,
	1.29, 1.30
Message-ID: <200602131240.k1DCegw5020319@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20304

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	31 Jan 2006 05:23:47 -0000	1.29
+++ .cvsignore	13 Feb 2006 12:40:40 -0000	1.30
@@ -13,3 +13,4 @@
 eel-2.13.3.tar.bz2
 eel-2.13.4.tar.bz2
 eel-2.13.90.tar.bz2
+eel-2.13.91.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eel2.spec	11 Feb 2006 02:33:20 -0000	1.37
+++ eel2.spec	13 Feb 2006 12:40:40 -0000	1.38
@@ -15,8 +15,8 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library.
-Version: 	2.13.90
-Release: 1.2
+Version: 	2.13.91
+Release: 1
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	31 Jan 2006 05:23:47 -0000	1.29
+++ sources	13 Feb 2006 12:40:40 -0000	1.30
@@ -1 +1 @@
-a719ac164e025fed040af40ec8d01e95  eel-2.13.90.tar.bz2
+57336cef15e19000c7021075cfda9098  eel-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:43:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:43:19 -0500
Subject: rpms/nautilus/devel .cvsignore, 1.34, 1.35 nautilus.spec, 1.92,
	1.93 sources, 1.37, 1.38
Message-ID: <200602131243.k1DChJVB020441@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20427

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	31 Jan 2006 05:29:38 -0000	1.34
+++ .cvsignore	13 Feb 2006 12:43:17 -0000	1.35
@@ -13,3 +13,4 @@
 nautilus-2.13.3.tar.bz2
 nautilus-2.13.4.tar.bz2
 nautilus-2.13.90.tar.bz2
+nautilus-2.13.91.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- nautilus.spec	11 Feb 2006 04:41:56 -0000	1.92
+++ nautilus.spec	13 Feb 2006 12:43:17 -0000	1.93
@@ -17,8 +17,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.13.90
-Release:	2.2
+Version: 	2.13.91
+Release:	1
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	31 Jan 2006 05:29:38 -0000	1.37
+++ sources	13 Feb 2006 12:43:17 -0000	1.38
@@ -1 +1 @@
-914a761043497e8250126bb84a5bfeec  nautilus-2.13.90.tar.bz2
+65910e2e146117899bb437630750505d  nautilus-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 12:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 07:49:59 -0500
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.27, 1.28 gnome-vfs2.spec, 1.95,
	1.96 sources, 1.27, 1.28
Message-ID: <200602131249.k1DCnwHJ000685@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	17 Jan 2006 04:23:46 -0000	1.27
+++ .cvsignore	13 Feb 2006 12:49:55 -0000	1.28
@@ -14,3 +14,4 @@
 gnome-vfs-2.13.2.tar.bz2
 gnome-vfs-2.13.3.tar.bz2
 gnome-vfs-2.13.4.tar.bz2
+gnome-vfs-2.13.91.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-vfs2.spec	11 Feb 2006 03:18:24 -0000	1.95
+++ gnome-vfs2.spec	13 Feb 2006 12:49:55 -0000	1.96
@@ -10,8 +10,8 @@
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 2.13.4
-Release: 7.2
+Version: 2.13.91
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -182,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.4-7.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	17 Jan 2006 04:23:47 -0000	1.27
+++ sources	13 Feb 2006 12:49:55 -0000	1.28
@@ -1 +1 @@
-194490e2cfa95ec8eb753d4cc3992902  gnome-vfs-2.13.4.tar.bz2
+a4e5e5acc6d5ce030c22106b4e5be8ea  gnome-vfs-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 13:45:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 08:45:47 -0500
Subject: rpms/hwbrowser/devel .cvsignore, 1.23, 1.24 hwbrowser.spec, 1.30,
	1.31 sources, 1.26, 1.27
Message-ID: <200602131345.k1DDjl3T009706@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/hwbrowser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7548

Modified Files:
	.cvsignore hwbrowser.spec sources 
Log Message:
avoid traceback on startup (#177197), mark "None or built-in" string as translatable (patch by Frank Arnold)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	6 Feb 2006 16:06:52 -0000	1.23
+++ .cvsignore	13 Feb 2006 13:45:44 -0000	1.24
@@ -1 +1 @@
-hwbrowser-0.25.tar.gz
+hwbrowser-0.26.tar.gz


Index: hwbrowser.spec
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/hwbrowser.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- hwbrowser.spec	6 Feb 2006 16:06:52 -0000	1.30
+++ hwbrowser.spec	13 Feb 2006 13:45:44 -0000	1.31
@@ -1,6 +1,6 @@
 Summary: A hardware browser.
 Name: hwbrowser
-Version: 0.25
+Version: 0.26
 Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -61,6 +61,10 @@
 %{_datadir}/applications/redhat-hwbrowser.desktop
 
 %changelog
+* Mon Feb 13 2006 Nils Philippsen <nphilipp at redhat.com> 0.26
+- avoid traceback on startup (#177197), mark "None or built-in" string as
+  translatable (patch by Frank Arnold)
+
 * Mon Feb 06 2006 Nils Philippsen <nphilipp at redhat.com> 0.25
 - build and distribute Slovakian translation (#180089)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwbrowser/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	6 Feb 2006 16:06:52 -0000	1.26
+++ sources	13 Feb 2006 13:45:44 -0000	1.27
@@ -1 +1 @@
-99e00d542958e950b0ee8ef71cff0d27  hwbrowser-0.25.tar.gz
+47701042f1f8b4b930f045d8632d8dd5  hwbrowser-0.26.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:11:44 -0500
Subject: rpms/openssh/devel .cvsignore, 1.17, 1.18 openssh.spec, 1.86,
	1.87 sources, 1.17, 1.18
Message-ID: <200602131411.k1DEBiRx027289@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27250

Modified Files:
	.cvsignore openssh.spec sources 
Log Message:
* Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-1
- new version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Feb 2006 16:26:13 -0000	1.17
+++ .cvsignore	13 Feb 2006 14:11:40 -0000	1.18
@@ -1 +1 @@
-openssh-4.3p1-noacss.tar.bz2
+openssh-4.3p2-noacss.tar.bz2


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- openssh.spec	11 Feb 2006 04:53:48 -0000	1.86
+++ openssh.spec	13 Feb 2006 14:11:40 -0000	1.87
@@ -57,8 +57,8 @@
 
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
-Version: 4.3p1
-%define rel 2.1
+Version: 4.3p2
+%define rel 1
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -450,6 +450,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-1
+- new version
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3p1-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Feb 2006 16:26:13 -0000	1.17
+++ sources	13 Feb 2006 14:11:41 -0000	1.18
@@ -1 +1 @@
-4c2ae8fbf9d4a58f910aec1af1ac19f2  openssh-4.3p1-noacss.tar.bz2
+8dcce96be628a67ce992f089d9db81ff  openssh-4.3p2-noacss.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:31:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:31:25 -0500
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.54,1.55
Message-ID: <200602131431.k1DEVPRf005246@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Log Message:
- migrate xscreensaver screensavers in %%post as well as the
  triggers already there (bug 180984)



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-screensaver.spec	11 Feb 2006 03:17:10 -0000	1.54
+++ gnome-screensaver.spec	13 Feb 2006 14:31:07 -0000	1.55
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 3.1
+Release: 4
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -114,6 +114,14 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
 done
 
+if rpm -q xscreensaver-extras >& /dev/null || \
+   rpm -q xscreensaver-gl-extras >& /dev/null; then
+(cd %{_datadir}/gnome-screensaver/themes; \
+for f in %{_datadir}/xscreensaver/config/*.xml; do
+  %{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1
+done)
+fi
+
 %triggerin -- xscreensaver-extras xscreensaver-gl-extras
 (cd %{_datadir}/gnome-screensaver/themes; \
 for f in %{_datadir}/xscreensaver/config/*.xml; do
@@ -148,6 +156,10 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-4
+- migrate xscreensaver screensavers in %%post as well as the
+  triggers already there (bug 180984)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:40:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:40:15 -0500
Subject: rpms/gcc/devel gcc41-pr26092.patch, NONE, 1.1 gcc41-pr26246.patch,
	NONE, 1.1 .cvsignore, 1.132, 1.133 gcc41.spec, 1.33,
	1.34 sources, 1.134, 1.135 gcc41-ldbl-mangle-as-g.patch, 1.2,
	NONE gcc41-ppc32-ldbl.patch, 1.2, NONE
Message-ID: <200602131440.k1DEeFmG008433@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8410

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr26092.patch gcc41-pr26246.patch 
Removed Files:
	gcc41-ldbl-mangle-as-g.patch gcc41-ppc32-ldbl.patch 
Log Message:
4.1.0-0.25


gcc41-pr26092.patch:
 gimplify.c                                   |   28 ++++++++++++++-------------
 testsuite/gcc.c-torture/execute/20060208-1.c |   10 +++++++++
 2 files changed, 25 insertions(+), 13 deletions(-)

--- NEW FILE gcc41-pr26092.patch ---
2006-02-08  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26092
	* gimplify.c (gimplify_call_expr): Don't call get_callee_fndecl
	twice if decl is a builtin.  When trying again, call get_callee_fndecl
	first to verify it is still a builtin.

	* gcc.c-torture/compile/20060208-1.c: New test.

--- gcc/gimplify.c.jj	2006-02-08 08:09:13.000000000 +0100
+++ gcc/gimplify.c	2006-02-08 12:53:00.000000000 +0100
@@ -1970,9 +1970,8 @@ gimplify_call_expr (tree *expr_p, tree *
   decl = get_callee_fndecl (*expr_p);
   if (decl && DECL_BUILT_IN (decl))
     {
-      tree fndecl = get_callee_fndecl (*expr_p);
       tree arglist = TREE_OPERAND (*expr_p, 1);
-      tree new = fold_builtin (fndecl, arglist, !want_value);
+      tree new = fold_builtin (decl, arglist, !want_value);
 
       if (new && new != *expr_p)
 	{
@@ -2026,19 +2025,22 @@ gimplify_call_expr (tree *expr_p, tree *
     TREE_OPERAND (*expr_p, 1) = nreverse (TREE_OPERAND (*expr_p, 1));
 
   /* Try this again in case gimplification exposed something.  */
-  if (ret != GS_ERROR && decl && DECL_BUILT_IN (decl))
+  if (ret != GS_ERROR)
     {
-      tree fndecl = get_callee_fndecl (*expr_p);
-      tree arglist = TREE_OPERAND (*expr_p, 1);
-      tree new = fold_builtin (fndecl, arglist, !want_value);
-
-      if (new && new != *expr_p)
+      decl = get_callee_fndecl (*expr_p);
+      if (decl && DECL_BUILT_IN (decl))
 	{
-	  /* There was a transformation of this call which computes the
-	     same value, but in a more efficient way.  Return and try
-	     again.  */
-	  *expr_p = new;
-	  return GS_OK;
+	  tree arglist = TREE_OPERAND (*expr_p, 1);
+	  tree new = fold_builtin (decl, arglist, !want_value);
+
+	  if (new && new != *expr_p)
+	    {
+	      /* There was a transformation of this call which computes the
+		 same value, but in a more efficient way.  Return and try
+		 again.  */
+	      *expr_p = new;
+	      return GS_OK;
+	    }
 	}
     }
 
--- gcc/testsuite/gcc.c-torture/execute/20060208-1.c.jj	2006-02-08 13:00:08.000000000 +0100
+++ gcc/testsuite/gcc.c-torture/execute/20060208-1.c	2006-02-08 12:58:58.000000000 +0100
@@ -0,0 +1,10 @@
+/* PR middle-end/26092 */
+typedef __SIZE_TYPE__ size_t;
+extern void *malloc (size_t);
+
+void *(*const foo) (size_t) = malloc;
+
+void *test (void)
+{
+  return (*foo) (3);
+}

gcc41-pr26246.patch:
 fortran/trans-decl.c                |    4 ++--
 testsuite/gfortran.dg/pr26246_1.f90 |   18 ++++++++++++++++++
 testsuite/gfortran.dg/pr26246_2.f90 |   13 +++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-pr26246.patch ---
2006-02-13  Andrew Pinski  <pinskia at physics.uc.edu>
	    Jakub Jelinek  <jakub at redhat.com>

	PR fortran/26246
	* trans-decl.c (gfc_get_symbol_decl, gfc_get_fake_result_decl): Use
	gfc_add_decl_to_function rather than gfc_finish_var_decl on length.

	* gfortran.dg/pr26246_1.f90: New test.
	* gfortran.dg/pr26246_2.f90: New test.

--- gcc/fortran/trans-decl.c.jj	2006-02-07 12:52:44.000000000 +0100
+++ gcc/fortran/trans-decl.c	2006-02-13 15:04:57.000000000 +0100
@@ -880,7 +880,7 @@ gfc_get_symbol_decl (gfc_symbol * sym)
 	  if (TREE_CODE (length) == VAR_DECL
 	      && DECL_CONTEXT (length) == NULL_TREE)
 	    {
-	      gfc_finish_var_decl (length, sym);
+	      gfc_add_decl_to_function (length);
 	      gfc_defer_symbol_init (sym);
 	    }
 	}
@@ -1792,7 +1792,7 @@ gfc_get_fake_result_decl (gfc_symbol * s
 	length = sym->ts.cl->backend_decl;
       if (TREE_CODE (length) == VAR_DECL
 	  && DECL_CONTEXT (length) == NULL_TREE)
-	gfc_finish_var_decl (length, sym);
+	gfc_add_decl_to_function (length);
     }
 
   if (gfc_return_by_reference (sym))
--- gcc/testsuite/gfortran.dg/pr26246_2.f90.jj	2006-02-13 15:28:10.000000000 +0100
+++ gcc/testsuite/gfortran.dg/pr26246_2.f90	2006-02-13 15:27:00.000000000 +0100
@@ -0,0 +1,13 @@
+! PR fortran/26246
+! { dg-options "-fdump-tree-original -fno-automatic" }
+! { dg-do compile }
+
+subroutine foo(string, n)
+  implicit none
+  integer :: n
+  character(len=n + 6), intent(in) :: string
+  if (string .eq. 'abc') call abort
+end subroutine foo
+
+! { dg-final { scan-tree-dump-times "static int" 0 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
--- gcc/testsuite/gfortran.dg/pr26246_1.f90.jj	2006-02-13 15:28:04.000000000 +0100
+++ gcc/testsuite/gfortran.dg/pr26246_1.f90	2006-02-13 15:27:00.000000000 +0100
@@ -0,0 +1,18 @@
+! PR fortran/26246
+! { dg-options "-fdump-tree-original" }
+! { dg-do compile }
+
+module pr26246_1
+  implicit none
+  contains
+    function foo(string)
+    character(*), intent(in) :: string
+    character(len=len(string)+2) :: foo
+    if (index(trim(string), '"').ne.0) then
+      foo = "'" // trim(string) // "'"
+    end if
+  end function foo
+end module pr26246_1
+
+! { dg-final { scan-tree-dump-times "static int" 0 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- .cvsignore	10 Feb 2006 15:19:31 -0000	1.132
+++ .cvsignore	13 Feb 2006 14:40:12 -0000	1.133
@@ -1 +1 @@
-gcc-4.1.0-20060210.tar.bz2
+gcc-4.1.0-20060213.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gcc41.spec	11 Feb 2006 02:48:07 -0000	1.33
+++ gcc41.spec	13 Feb 2006 14:40:12 -0000	1.34
@@ -1,6 +1,6 @@
-%define DATE 20060210
+%define DATE 20060213
 %define gcc_version 4.1.0
-%define gcc_release 0.24
+%define gcc_release 0.25
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -24,7 +24,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.1
+Release: %{gcc_release}
 License: GPL
 Group: Development/Languages
 Source0: gcc-%{version}-%{DATE}.tar.bz2
@@ -100,17 +100,17 @@
 Patch3: gcc41-ia64-libunwind.patch
 Patch4: gcc41-gnuc-rh-release.patch
 Patch5: gcc41-java-nomulti.patch
-Patch8: gcc41-ada-pr18302.patch
-Patch9: gcc41-ada-tweaks.patch
-Patch11: gcc41-java-slow_pthread_self.patch
-Patch12: gcc41-fortran-finclude.patch
-Patch13: gcc41-ppc32-retaddr.patch
-Patch14: gcc41-ppc32-ldbl.patch
-Patch15: gcc41-ldbl-mangle-as-g.patch
-Patch16: gcc41-ldbl-default.patch
-Patch17: gcc41-ldbl-default-libstdc++.patch
-Patch18: gcc41-sparc64-g7.patch
-Patch20: gcc41-fortran-where.patch
+Patch6: gcc41-ada-pr18302.patch
+Patch7: gcc41-ada-tweaks.patch
+Patch8: gcc41-java-slow_pthread_self.patch
+Patch9: gcc41-fortran-finclude.patch
+Patch10: gcc41-ppc32-retaddr.patch
+Patch11: gcc41-ldbl-default.patch
+Patch12: gcc41-ldbl-default-libstdc++.patch
+Patch13: gcc41-sparc64-g7.patch
+Patch14: gcc41-fortran-where.patch
+Patch15: gcc41-pr26092.patch
+Patch16: gcc41-pr26246.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -395,17 +395,17 @@
 %patch3 -p0 -b .ia64-libunwind~
 %patch4 -p0 -b .gnuc-rh-release~
 %patch5 -p0 -b .java-nomulti~
-%patch8 -p0 -b .ada-pr18302~
-%patch9 -p0 -b .ada-tweaks~
-%patch11 -p0 -b .java-slow_pthread_self~
-%patch12 -p0 -b .fortran-finclude~
-%patch13 -p0 -b .ppc32-retaddr~
-%patch14 -p0 -b .ppc32-ldbl~
-%patch15 -p0 -b .ldbl-mangle-as-g~
-%patch16 -p0 -b .ldbl-default~
-%patch17 -p0 -b .ldbl-default-libstdc++~
-%patch18 -p0 -b .sparc64-g7~
-%patch20 -p0 -b .fortran-where~
+%patch6 -p0 -b .ada-pr18302~
+%patch7 -p0 -b .ada-tweaks~
+%patch8 -p0 -b .java-slow_pthread_self~
+%patch9 -p0 -b .fortran-finclude~
+%patch10 -p0 -b .ppc32-retaddr~
+%patch11 -p0 -b .ldbl-default~
+%patch12 -p0 -b .ldbl-default-libstdc++~
+%patch13 -p0 -b .sparc64-g7~
+%patch14 -p0 -b .fortran-where~
+%patch15 -p0 -b .pr26092~
+%patch16 -p0 -b .pr26246~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1424,8 +1424,17 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.1.0-0.24.1
-- bump again for double-long bug on ppc(64)
+* Mon Feb 13 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.25
+- update from gcc-4_1-branch (-r110831:110903)
+  - PRs c++/16405, c++/24996, fortran/14771, fortran/20858, fortran/25756,
+	middle-end/22439
+- merge gomp changes from trunk (-r110719:110720, -r110852:110853 and
+  -r110907:110908)
+  - PR libgomp/25936
+- fix gimplification of const fn pointers to builting functions
+  (PR middle-end/26092)
+- make sure Fortran length artifical variables aren't SAVEd (Andrew Pinski,
+  PR fortran/26246)
 
 * Fri Feb 10 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.24
 - update from gcc-4_1-branch (-r110632:110831)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- sources	10 Feb 2006 15:19:31 -0000	1.134
+++ sources	13 Feb 2006 14:40:12 -0000	1.135
@@ -1 +1 @@
-36ce392e2b0466ebd1960456561bac5b  gcc-4.1.0-20060210.tar.bz2
+d1949cf2e79cf95e7f46d7b3e8f1dddc  gcc-4.1.0-20060213.tar.bz2


--- gcc41-ldbl-mangle-as-g.patch DELETED ---


--- gcc41-ppc32-ldbl.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:46:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:46:15 -0500
Subject: rpms/pwlib/devel .cvsignore, 1.11, 1.12 pwlib.spec, 1.29,
	1.30 sources, 1.11, 1.12
Message-ID: <200602131446.k1DEkFJ0017360@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	.cvsignore pwlib.spec sources 
Log Message:
new beta version for ekiga, Daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	24 Jan 2006 14:13:02 -0000	1.11
+++ .cvsignore	13 Feb 2006 14:46:12 -0000	1.12
@@ -2,3 +2,4 @@
 pwlib-1.8.4.tar.gz
 pwlib-1.8.7.tar.gz
 pwlib-1.9.2.tar.gz
+pwlib-1.9.3.tar.gz


Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pwlib.spec	11 Feb 2006 05:20:03 -0000	1.29
+++ pwlib.spec	13 Feb 2006 14:46:12 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:	Portable Windows Libary
 Name:		pwlib
-Version:	1.9.2
-Release:        1.2
+Version:	1.9.3
+Release:        1
 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
@@ -93,6 +93,9 @@
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Feb 13 2006 Daniel Veillard <veillard at redhat.com> - 1.9.3-1
+- new beta version for ekiga
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9.2-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	24 Jan 2006 14:13:02 -0000	1.11
+++ sources	13 Feb 2006 14:46:12 -0000	1.12
@@ -1,2 +1 @@
-ba4fddd6cb8d4420cc18f308ccf48e00  pwlib-1.8.7.tar.gz
-64f7ee4062f507e871863680df5278b9  pwlib-1.9.2.tar.gz
+42d5e9d274bdb02b40f5e1db06307475  pwlib-1.9.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:53:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:53:09 -0500
Subject: rpms/pwlib/devel pwlib.spec,1.30,1.31
Message-ID: <200602131453.k1DEr9cc021250@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	pwlib.spec 
Log Message:
fix spec file, Daniel



Index: pwlib.spec
===================================================================
RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pwlib.spec	13 Feb 2006 14:46:12 -0000	1.30
+++ pwlib.spec	13 Feb 2006 14:53:07 -0000	1.31
@@ -5,11 +5,10 @@
 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
-Source1: config.guess 
+#Source1: config.guess 
 License: MPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-#Patch0:		pwlib-1.6.5-debuginfo.patch
 BuildPrereq:	expat  openssl-devel pkgconfig
 
 %ifnarch  s390 s390x
@@ -19,7 +18,6 @@
 BuildRequires: alsa-lib-devel libstdc++-devel
 Requires: alsa-lib libstdc++
 BuildRequires: openldap-devel expat-devel SDL-devel
-Patch0: pwlib-1.9.2.ldap.patch
 
 %description
 PWLib is a moderately large class library that has its genesis many
@@ -41,8 +39,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-cp -f %{SOURCE1} .
+# cp -f %{SOURCE1} .
 
 %build
 export CFLAGS="$CFLAGS -DLDAP_DEPRECATED"



From fedora-cvs-commits at redhat.com  Mon Feb 13 14:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 09:58:09 -0500
Subject: rpms/mod_python/devel mod_python-3.1.4-config.patch, NONE,
	1.1 mod_python.spec, 1.27, 1.28
Message-ID: <200602131458.k1DEw9lq031139@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31112

Modified Files:
	mod_python.spec 
Added Files:
	mod_python-3.1.4-config.patch 
Log Message:
* Mon Feb 13 2006 Joe Orton <jorton at redhat.com> 3.1.4-4
- fix configure syntax error with bash 3.1 (#180731)


mod_python-3.1.4-config.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mod_python-3.1.4-config.patch ---

Fix syntax error with bash 3.1.

--- mod_python-3.1.4/configure.in.config
+++ mod_python-3.1.4/configure.in
@@ -275,7 +275,7 @@
 # get the mod_python version
 AC_SUBST(MP_VERSION)
 MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
-MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`                                      
+MP_VERSION=`echo $MP_VERSION | sed 's/"//g'`
 
 AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile)
 


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_python.spec	11 Feb 2006 04:37:50 -0000	1.27
+++ mod_python.spec	13 Feb 2006 14:58:06 -0000	1.28
@@ -4,10 +4,11 @@
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
 Version: 3.1.4
-Release: 3.2.1
+Release: 4
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch1: mod_python-3.1.3-maxlocks.patch
+Patch2: mod_python-3.1.4-config.patch
 Patch7: mod_python-20020610-gsr.patch
 Patch10: mod_python-20020722-lib64.patch
 Patch11: mod_python-3.1.3-ldflags.patch
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .maxlocks
+%patch2 -p1 -b .config
 %patch7 -p0 -b .gsr
 %patch10 -p1 -b .lib64
 %patch11 -p1 -b .ldflags
@@ -42,7 +44,7 @@
 %build
 autoconf
 %configure --with-apxs=%{_sbindir}/apxs
-make %{?_smp_mflags} APXS_CFLAGS=-Wc,-fno-strict-aliasing
+make %{?_smp_mflags} APXS_CFLAGS="-Wc,-fno-strict-aliasing"
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -70,6 +72,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Mon Feb 13 2006 Joe Orton <jorton at redhat.com> 3.1.4-4
+- fix configure syntax error with bash 3.1 (#180731)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.4-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:00:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:00:46 -0500
Subject: rpms/opal/devel opal.spec,1.4,1.5 sources,1.1,1.2
Message-ID: <200602131500.k1DF0kch031752@cvs.devel.redhat.com>

Author: veillard

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

Modified Files:
	opal.spec sources 
Log Message:
new beta release for ekiga, daniel



Index: opal.spec
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opal.spec	11 Feb 2006 04:48:59 -0000	1.4
+++ opal.spec	13 Feb 2006 15:00:31 -0000	1.5
@@ -1,13 +1,13 @@
 Summary: Open Phone Abstraction Library
 Name: opal
-Version: 2.1
-Release: 1.2
+Version: 2.1.3
+Release: 1
 URL: http://www.openh323.org/
 Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz
 License: MPL
 Group: System Environment/Libraries
-Requires: pwlib >= 1.9.2
-BuildRequires: pwlib-devel >= 1.9.2
+Requires: pwlib >= 1.9.3
+BuildRequires: pwlib-devel >= 1.9.3
 BuildRequires: openldap-devel
 BuildRoot: %{_tmppath}/%{name}-root
 Obsoletes: openh323
@@ -20,7 +20,7 @@
 Summary: Development package for opal
 Group: Development/Libraries
 Requires: opal = %{PACKAGE_VERSION}
-Requires: pwlib-devel >= 1.9.2
+Requires: pwlib-devel >= 1.9.3
 Obsoletes: openh323-devel
 %description devel
 Static libraries and header files for development with opal.
@@ -56,6 +56,9 @@
 %{_datadir}/opal
 
 %changelog
+* Mon Feb 13 2006 Daniel Veillard <veillard at redhat.com> - 2.1.3-1
+- new beta version for ekiga
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/opal/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 13:33:36 -0000	1.1
+++ sources	13 Feb 2006 15:00:31 -0000	1.2
@@ -1 +1 @@
-ca5fd2a69307d0fab717b91e26646708  opal-2.1.tar.gz
+10cbc244058b8f4928a9e337a9025fb7  opal-2.1.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:14:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:14:58 -0500
Subject: rpms/cups/devel cups.spec, 1.133, 1.134 cups-session-printing.patch,
	1.1, NONE
Message-ID: <200602131514.k1DFEwLq003009@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	cups.spec 
Removed Files:
	cups-session-printing.patch 
Log Message:
* Mon Feb 13 2006 Tim Waugh <twaugh at redhat.com>
- Removed (unapplied) session printing patch.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- cups.spec	11 Feb 2006 02:21:22 -0000	1.133
+++ cups.spec	13 Feb 2006 15:14:55 -0000	1.134
@@ -47,7 +47,6 @@
 Patch24: cups-maxlogsize.patch
 Patch25: cups-enabledisable.patch
 Patch28: cups-no-propagate-ipp-port.patch
-Patch30: cups-session-printing.patch
 Patch32: cups-pid.patch
 Patch33: cups-CAN-2004-0888.patch
 Patch34: cups-CAN-2005-2097.patch
@@ -155,7 +154,6 @@
 %patch24 -p1 -b .maxlogsize
 %patch25 -p1 -b .enabledisable
 %patch28 -p1 -b .no-propagate-ipp-port
-#%patch30 -p1 -b .session-printing
 %patch32 -p1 -b .pid
 %patch33 -p1 -b .CAN-2004-0888
 %patch34 -p1 -b .CAN-2005-2097
@@ -433,6 +431,9 @@
 %{_libdir}/cups/daemon/cups-lpd
 
 %changelog
+* Mon Feb 13 2006 Tim Waugh <twaugh at redhat.com>
+- Removed (unapplied) session printing patch.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.1.23-30.2
 - bump again for double-long bug on ppc(64)
 


--- cups-session-printing.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:28:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:28:45 -0500
Subject: rpms/checkpolicy/devel checkpolicy.spec,1.90,1.91
Message-ID: <200602131528.k1DFSj00021672@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21642

Modified Files:
	checkpolicy.spec 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.1-1.2
- Need to build again



Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- checkpolicy.spec	11 Feb 2006 02:15:00 -0000	1.90
+++ checkpolicy.spec	13 Feb 2006 15:28:42 -0000	1.91
@@ -2,7 +2,7 @@
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 1.29.1
-Release: 1.1
+Release: 1.2
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,6 +47,9 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.1-1.2
+- Need to build again
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.1-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:31:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:31:03 -0500
Subject: rpms/prelink/devel .cvsignore, 1.26, 1.27 prelink.spec, 1.33,
	1.34 sources, 1.27, 1.28
Message-ID: <200602131531.k1DFV32O021876@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/prelink/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21844

Modified Files:
	.cvsignore prelink.spec sources 
Log Message:
0.3.6-3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Dec 2005 12:24:34 -0000	1.26
+++ .cvsignore	13 Feb 2006 15:30:48 -0000	1.27
@@ -1 +1 @@
-prelink-20051214.tar.bz2
+prelink-20060213.tar.bz2


Index: prelink.spec
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/prelink.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- prelink.spec	11 Feb 2006 05:15:24 -0000	1.33
+++ prelink.spec	13 Feb 2006 15:30:48 -0000	1.34
@@ -1,10 +1,10 @@
 Summary: An ELF prelinking utility
 Name: prelink
 Version: 0.3.6
-Release: 2.2
+Release: 3
 License: GPL
 Group: System Environment/Base
-%define date 20051214
+%define date 20060213
 Source: ftp://people.redhat.com/jakub/prelink/prelink-%{date}.tar.bz2
 Source2: prelink.conf
 Source3: prelink.cron
@@ -89,11 +89,9 @@
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/prelink.log
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-2.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.6-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Mon Feb 13 2006 Jakub Jelinek <jakub at redhat.com> 0.3.6-3
+- rebuilt again, disable -Wl,-z,nocopyreloc tests on x86_64,
+  nocopyreloc really doesn't work on this platform (#180552)
 
 * Wed Dec 12 2005 Jakub Jelinek <jakub at redhat.com> 0.3.6-2
 - rebuilt with GCC 4.1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/prelink/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	14 Dec 2005 12:41:18 -0000	1.27
+++ sources	13 Feb 2006 15:30:48 -0000	1.28
@@ -1 +1 @@
-204fc6dec6963afd60d14f091cfe12ea  prelink-20051214.tar.bz2
+a3ee7d324ecdf2f1a7b8b95c01ee75fa  prelink-20060213.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:32:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:32:52 -0500
Subject: rpms/rng-utils/devel rng-utils.spec,1.10,1.11
Message-ID: <200602131532.k1DFWqKL021980@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	rng-utils.spec 
Log Message:
rebuild


Index: rng-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/rng-utils/devel/rng-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rng-utils.spec	9 Feb 2006 06:29:06 -0000	1.10
+++ rng-utils.spec	13 Feb 2006 15:32:25 -0000	1.11
@@ -53,6 +53,9 @@
 /usr/share/man/man8/rngd.8.gz
 
 %changelog
+* Mon Feb 13 2006 Dave Jones <davej at redhat.com>
+- rebuild.
+
 * Thu Feb 09 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:34:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:34:22 -0500
Subject: rpms/shared-mime-info/devel defaults.list, 1.11,
	1.12 shared-mime-info.spec, 1.33, 1.34
Message-ID: <200602131534.k1DFYMrk022109@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22054

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
- make eog the default image viewer



Index: defaults.list
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- defaults.list	30 Jan 2006 10:14:33 -0000	1.11
+++ defaults.list	13 Feb 2006 15:34:09 -0000	1.12
@@ -23,22 +23,24 @@
 image/x-xcf=gimp-2.0.desktop
 image/x-psd=gimp-2.0.desktop
 image/x-fits=gimp-2.0.desktop
-image/bmp=gtumb.desktop
-image/gif=gtumb.desktop
-image/jpeg=gtumb.desktop
-image/png=gtumb.desktop
-image/tiff=gtumb.desktop
-image/x-icb=gtumb.desktop
-image/x-ico=gtumb.desktop
-image/x-pcx=gtumb.desktop
-image/x-portable-anymap=gtumb.desktop
-image/x-portable-bitmap=gtumb.desktop
-image/x-portable-graymap=gtumb.desktop
-image/x-portable-pixmap=gtumb.desktop
-image/x-xbitmap=gtumb.desktop
-image/x-xpixmap=gtumb.desktop
-image/x-xwindowdump=gtumb.desktop
-image/svg+xml=gtumb.desktop
+image/bmp=gnome-eog.desktop
+image/gif=gnome-eog.desktop
+image/jpeg=gnome-eog.desktop
+image/jpg=gnome-eog.desktop
+image/pjpeg=gnome-eog.desktop
+image/png=gnome-eog.desktop
+image/tiff=gnome-eog.desktop
+image/x-icb=gnome-eog.desktop
+image/x-ico=gnome-eog.desktop
+image/x-pcx=gnome-eog.desktop
+image/x-portable-anymap=gnome-eog.desktop
+image/x-portable-bitmap=gnome-eog.desktop
+image/x-portable-graymap=gnome-eog.desktop
+image/x-portable-pixmap=gnome-eog.desktop
+image/x-xbitmap=gnome-eog.desktop
+image/x-xpixmap=gnome-eog.desktop
+image/x-xwindowdump=gnome-eog.desktop
+image/svg+xml=gnome-eog.desktop
 application/vnd.ms-word=openoffice.org-1.9-writer.desktop
 application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
 application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- shared-mime-info.spec	12 Feb 2006 23:33:41 -0000	1.33
+++ shared-mime-info.spec	13 Feb 2006 15:34:09 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.16.cvs20060212
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -37,7 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
@@ -62,6 +62,29 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.16.cvs20060212-2
+- make eog the default image viewer
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 30 2006 Caolan McNamara <caolanm at redhat.com> - 0.16.cvs20051219-2
+- rh#179138# add openoffice.org as preferred app for oasis formats 
+
+* Mon Dec 19 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051219-1
+- Newer cvs snapshot
+
+* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Thu Dec  1 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051201-1
+- Incorporate upstream changes
+
+* Wed Nov 02 2005 John (J5) Palmieri <johnp at redhat.com> - 0.16.cvs20051018-2
+- Change all refs of eog to gthumb in defaults.list
+
+* Tue Oct 18 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051018-1
+- Incorporate upstream changes
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.16.cvs20060212-1
 - Newer CVS snapshot
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:35:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:35:59 -0500
Subject: rpms/ekiga/devel .cvsignore, 1.1, 1.2 ekiga.spec, 1.9, 1.10 sources,
	1.1, 1.2
Message-ID: <200602131535.k1DFZxoP022571@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22052

Modified Files:
	.cvsignore ekiga.spec sources 
Log Message:
New beta test release, daniel



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 13:38:29 -0000	1.1
+++ .cvsignore	13 Feb 2006 15:35:56 -0000	1.2
@@ -1 +1,2 @@
 ekiga-1.99.0.tar.gz
+ekiga-1.99.1.tar.gz


Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ekiga.spec	11 Feb 2006 02:35:01 -0000	1.9
+++ ekiga.spec	13 Feb 2006 15:35:56 -0000	1.10
@@ -1,14 +1,14 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
-Version: 1.99.0
-Release: 3.2
+Version: 1.99.1
+Release: 1
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
 Group: Applications/Communications
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: pwlib >= 1.9.2
-Requires: opal >= 2.1
+Requires: pwlib >= 1.9.3
+Requires: opal >= 2.1.3
 Requires: GConf2 >= 1.2.1
 Requires: libgnomeui >= 2.0
 Requires: libgnome >= 2.0
@@ -19,8 +19,8 @@
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgnome-devel >= 2.0
 BuildRequires: openldap-devel
-BuildRequires: pwlib-devel >= 1.9.2
-BuildRequires: opal-devel >= 2.1
+BuildRequires: pwlib-devel >= 1.9.3
+BuildRequires: opal-devel >= 2.1.3
 BuildRequires: libxml2-devel >= 2.5.0
 BuildRequires: SDL-devel
 BuildRequires: intltool >= 0.22
@@ -84,6 +84,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Feb 13 2006 Daniel Veillard <veillard at redhat.com> - 1.99.1-1
+- new beta release issued
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.99.0-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 13:38:29 -0000	1.1
+++ sources	13 Feb 2006 15:35:56 -0000	1.2
@@ -1 +1 @@
-178844551b65ff33ef44a5d481539af7  ekiga-1.99.0.tar.gz
+1468f6be7d577ccd48c91cfa13341772  ekiga-1.99.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:39:14 -0500
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.34,1.35
Message-ID: <200602131539.k1DFdEjw024096@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24004

Modified Files:
	shared-mime-info.spec 
Log Message:
rearrange changelog to be in the right order



Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- shared-mime-info.spec	13 Feb 2006 15:34:09 -0000	1.34
+++ shared-mime-info.spec	13 Feb 2006 15:39:11 -0000	1.35
@@ -65,6 +65,9 @@
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.16.cvs20060212-2
 - make eog the default image viewer
 
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.16.cvs20060212-1
+- Newer CVS snapshot
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
@@ -85,8 +88,6 @@
 
 * Tue Oct 18 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051018-1
 - Incorporate upstream changes
-* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.16.cvs20060212-1
-- Newer CVS snapshot
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:41:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:41:09 -0500
Subject: rpms/shared-mime-info/devel shared-mime-info.spec,1.35,1.36
Message-ID: <200602131541.k1DFf9s1025015@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24935

Modified Files:
	shared-mime-info.spec 
Log Message:
more changelog munging



Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- shared-mime-info.spec	13 Feb 2006 15:39:11 -0000	1.35
+++ shared-mime-info.spec	13 Feb 2006 15:41:06 -0000	1.36
@@ -89,27 +89,6 @@
 * Tue Oct 18 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051018-1
 - Incorporate upstream changes
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.16.cvs20051219-2.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Mon Jan 30 2006 Caolan McNamara <caolanm at redhat.com> - 0.16.cvs20051219-2
-- rh#179138# add openoffice.org as preferred app for oasis formats 
-
-* Mon Dec 19 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051219-1
-- Newer cvs snapshot
-
-* Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
-
-* Thu Dec  1 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051201-1
-- Incorporate upstream changes
-
-* Wed Nov 02 2005 John (J5) Palmieri <johnp at redhat.com> - 0.16.cvs20051018-2
-- Change all refs of eog to gthumb in defaults.list
-
-* Tue Oct 18 2005 Matthias Clasen <mclasen at redhat.com> - 0.16.cvs20051018-1
-- Incorporate upstream changes
-
 * Wed Oct 12 2005 Matthias Clasen <mclasen at redhat.com> - 0.16-6
 - Add glade to defaults.list
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:48:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:48:11 -0500
Subject: rpms/eog/devel eog.spec,1.39,1.40
Message-ID: <200602131548.k1DFmBvx008249@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8189

Modified Files:
	eog.spec 
Log Message:
Fix nodisplay



Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eog.spec	11 Feb 2006 02:38:18 -0000	1.39
+++ eog.spec	13 Feb 2006 15:48:07 -0000	1.40
@@ -13,7 +13,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.13.90
-Release: 1.2
+Release: 2
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -45,7 +45,7 @@
 
 %prep
 %setup -q
-echo "NoDisplay=true" >> eog.desktop.in
+echo "NoDisplay=true" >> eog.desktop.in.in
 
 %build
 
@@ -97,6 +97,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
+- Append NoDisplay=true to the right file
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:50:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:50:36 -0500
Subject: rpms/libsepol/devel .cvsignore, 1.84, 1.85 libsepol.spec, 1.109,
	1.110 sources, 1.85, 1.86
Message-ID: <200602131550.k1DFoab4009405@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9374

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-1
- Upgrade to latest from NSA
	* Merged optionals in base patch from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- .cvsignore	7 Feb 2006 15:27:01 -0000	1.84
+++ .cvsignore	13 Feb 2006 15:50:33 -0000	1.85
@@ -82,3 +82,4 @@
 libsepol-1.11.11.tgz
 libsepol-1.11.12.tgz
 libsepol-1.11.13.tgz
+libsepol-1.11.14.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- libsepol.spec	11 Feb 2006 04:12:51 -0000	1.109
+++ libsepol.spec	13 Feb 2006 15:50:33 -0000	1.110
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.11.13
-Release: 1.1
+Version: 1.11.14
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,10 +80,14 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-1
+- Upgrade to latest from NSA
+	* Merged optionals in base patch from Joshua Brindle.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.11.13-1.1
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.11.12-1
+* Tue Feb 7 2006 Dan Walsh <dwalsh at redhat.com> 1.11.13-1
 - Upgrade to latest from NSA
 	* Merged seuser/user_extra support patch from Joshua Brindle.
 	* Merged fix patch from Ivan Gyurdiev.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- sources	7 Feb 2006 15:27:01 -0000	1.85
+++ sources	13 Feb 2006 15:50:33 -0000	1.86
@@ -1 +1 @@
-02fe7e69782284c0c5bc562acb3efc03  libsepol-1.11.13.tgz
+a0a338a20690e7fef163865ac93d05a1  libsepol-1.11.14.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:53:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:53:04 -0500
Subject: rpms/postgresql/devel .cvsignore, 1.28, 1.29 pg_config.h, 1.2,
	1.3 postgresql.spec, 1.64, 1.65 sources, 1.29, 1.30
Message-ID: <200602131553.k1DFr4MS010608@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10578

Modified Files:
	.cvsignore pg_config.h postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.1.3 (CVE-2006-0553); also update JDBC driver
and fix bug #177564.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	9 Jan 2006 01:14:36 -0000	1.28
+++ .cvsignore	13 Feb 2006 15:53:02 -0000	1.29
@@ -1,8 +1,8 @@
-postgresql-8.1.2.tar.bz2
+postgresql-8.1.3.tar.bz2
 PyGreSQL-3.7.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
-postgresql-8.1-404.jdbc2.jar
-postgresql-8.1-404.jdbc2ee.jar
-postgresql-8.1-404.jdbc3.jar
 postgresql-8.1-US.pdf
+postgresql-8.1-405.jdbc2.jar
+postgresql-8.1-405.jdbc2ee.jar
+postgresql-8.1-405.jdbc3.jar


Index: pg_config.h
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/pg_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pg_config.h	15 Dec 2005 19:38:07 -0000	1.2
+++ pg_config.h	13 Feb 2006 15:53:02 -0000	1.3
@@ -4,13 +4,14 @@
  * identical.  Hence, this file is architecture-independent and calls
  * in an arch-dependent file that will appear in just one RPM.
  *
+ * To avoid breaking arches not explicitly supported by Red Hat, we
+ * use this indirection file *only* on known multilib arches.
+ *
  * Note: this may well fail if user tries to use gcc's -I- option.
  * But that option is deprecated anyway.
  */
 #if defined(__x86_64__)
 #include "pg_config_x86_64.h"
-#elif defined(__ia64__)
-#include "pg_config_ia64.h"
 #elif defined(__i386__)
 #include "pg_config_i386.h"
 #elif defined(__ppc64__) || defined(__powerpc64__)


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- postgresql.spec	7 Feb 2006 13:35:32 -0000	1.64
+++ postgresql.spec	13 Feb 2006 15:53:02 -0000	1.65
@@ -81,8 +81,8 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.2
-Release: 1.1
+Version: 8.1.3
+Release: 1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -92,9 +92,9 @@
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
@@ -471,10 +471,17 @@
 %endif
 
 # multilib header hack; note pg_config.h is installed in two places!
-mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
-mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+# we only apply this to known Red Hat multilib arches, per bug #177564
+case `uname -i` in
+  i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+    mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.h
+    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
+    mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -i`.h
+    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+    ;;
+  *)
+    ;;
+esac
 
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
 cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
@@ -819,6 +826,11 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Tom Lane <tgl at redhat.com> 8.1.3-1
+- Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553)
+- Update to jdbc driver build 405
+- Modify multilib header hack to not break non-RH arches, per bug #177564
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 8.1.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	9 Jan 2006 01:14:36 -0000	1.29
+++ sources	13 Feb 2006 15:53:02 -0000	1.30
@@ -1,8 +1,8 @@
-12d54a11bc3a414477d37ef338bec161  postgresql-8.1.2.tar.bz2
+bb510edbb533962c0692e211b3bd8cfa  postgresql-8.1.3.tar.bz2
 9fa4c2fc1dd0b3b93a3381c048443e16  PyGreSQL-3.7.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
-441d73f6f3a56c1abf8970ed79f51d28  postgresql-8.1-404.jdbc2.jar
-f506ae68d039bcc820641c1b1a8430c7  postgresql-8.1-404.jdbc2ee.jar
-8d8788f0a8b8d2184b452e3f34d62966  postgresql-8.1-404.jdbc3.jar
 66d80897840724917cb838c76393692b  postgresql-8.1-US.pdf
+32e874651c4916bfd1a827c503d3505a  postgresql-8.1-405.jdbc2.jar
+80ca36179ab2ea0fd4e8dbf6d76ade6a  postgresql-8.1-405.jdbc2ee.jar
+2b699f0e686bcf7ec56bea16474ab2c2  postgresql-8.1-405.jdbc3.jar



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:55:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:55:13 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.37, 1.38 modules-mls.conf,
	1.12, 1.13 modules-strict.conf, 1.4, 1.5 policy-20060207.patch,
	1.2, 1.3 selinux-policy.spec, 1.103, 1.104 sources, 1.41, 1.42
Message-ID: <200602131555.k1DFtDRq011674@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11631

Modified Files:
	.cvsignore modules-mls.conf modules-strict.conf 
	policy-20060207.patch selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	11 Feb 2006 02:41:50 -0000	1.37
+++ .cvsignore	13 Feb 2006 15:55:10 -0000	1.38
@@ -38,3 +38,4 @@
 serefpolicy-2.2.11.tgz
 serefpolicy-2.2.12.tgz
 serefpolicy-2.2.13.tgz
+serefpolicy-2.2.14.tgz


Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modules-mls.conf	11 Feb 2006 02:41:50 -0000	1.12
+++ modules-mls.conf	13 Feb 2006 15:55:10 -0000	1.13
@@ -838,13 +838,6 @@
 selinuxutil = base
 
 # Layer: system
-# Module: semodule
-#
-# Policy for semodule
-# 
-semodule = base
-
-# Layer: system
 # Module: udev
 #
 # Policy for udev.


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modules-strict.conf	11 Feb 2006 02:41:50 -0000	1.4
+++ modules-strict.conf	13 Feb 2006 15:55:10 -0000	1.5
@@ -1022,13 +1022,6 @@
 selinuxutil = module
 
 # Layer: system
-# Module: semodule
-#
-# Policy for semodule
-# 
-semodule = base
-
-# Layer: system
 # Module: udev
 #
 # Policy for udev.

policy-20060207.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 +++++-
 policy/modules/admin/kudzu.te             |    2 -
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/su.if                |    7 +--
 policy/modules/kernel/bootloader.te       |    4 +-
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.if          |   19 ++++++++++
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/domain.te           |    4 +-
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/files.if            |    2 -
 policy/modules/kernel/filesystem.if       |   57 ++++++++++++++++++++++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/kernel/terminal.if         |    2 -
 policy/modules/services/apache.fc         |    4 ++
 policy/modules/services/automount.if      |   18 +++++++++
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/cron.if           |    2 -
 policy/modules/services/cron.te           |    1 
 policy/modules/services/fetchmail.te      |    1 
 policy/modules/services/hal.te            |   11 +++++
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    5 ++
 policy/modules/services/networkmanager.te |    7 ++-
 policy/modules/services/postfix.te        |    5 ++
 policy/modules/services/remotelogin.te    |   28 +-------------
 policy/modules/services/sendmail.te       |    1 
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/fstools.te          |    2 +
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.if        |   20 ++++++++++
 policy/modules/system/libraries.te        |    1 
 policy/modules/system/locallogin.te       |    4 --
 policy/modules/system/logging.te          |    4 +-
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 +++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   52 +++++++++++++++++++++++++++
 policy/modules/system/udev.te             |    4 +-
 policy/modules/system/unconfined.if       |    4 +-
 policy/modules/system/unconfined.te       |    6 +++
 policy/modules/system/userdomain.if       |   19 ++++++++++
 policy/modules/system/userdomain.te       |   13 ++++++
 48 files changed, 347 insertions(+), 53 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- policy-20060207.patch	11 Feb 2006 02:41:50 -0000	1.2
+++ policy-20060207.patch	13 Feb 2006 15:55:10 -0000	1.3
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.13/build.conf
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.14/build.conf
 --- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.13/build.conf	2006-02-10 21:35:41.000000000 -0500
++++ serefpolicy-2.2.14/build.conf	2006-02-12 11:55:03.000000000 -0500
 @@ -8,13 +8,13 @@
  # version policy it supports.  Setting this will
  # override the version.  This only has an
@@ -26,9 +26,9 @@
  
  # Polyinstantiation
  # Enable polyinstantiated directory support.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.13/policy/mcs
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.14/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.13/policy/mcs	2006-02-10 21:35:41.000000000 -0500
++++ serefpolicy-2.2.14/policy/mcs	2006-02-12 11:55:03.000000000 -0500
 @@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
@@ -56,9 +56,9 @@
  
  define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
  link unlink rename relabelfrom relabelto }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.13/policy/modules/admin/kudzu.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.14/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-07 10:43:25.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/admin/kudzu.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/kudzu.te	2006-02-12 11:55:03.000000000 -0500
 @@ -24,7 +24,6 @@
  allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
  dontaudit kudzu_t self:capability sys_tty_config;
@@ -75,9 +75,9 @@
  storage_raw_read_fixed_disk(kudzu_t)
  storage_raw_read_removable_device(kudzu_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.13/policy/modules/admin/prelink.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.14/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/admin/prelink.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/prelink.te	2006-02-12 11:55:03.000000000 -0500
 @@ -65,6 +65,7 @@
  fs_getattr_xattr_fs(prelink_t)
  
@@ -86,9 +86,9 @@
  libs_manage_ld_so(prelink_t)
  libs_relabel_ld_so(prelink_t)
  libs_use_shared_libs(prelink_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.13/policy/modules/admin/readahead.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.14/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/admin/readahead.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/readahead.te	2006-02-12 11:55:03.000000000 -0500
 @@ -47,7 +47,9 @@
  fs_search_auto_mountpoints(readahead_t)
  fs_getattr_all_pipes(readahead_t)
@@ -100,9 +100,9 @@
  fs_read_tmpfs_symlinks(readahead_t)
  
  term_dontaudit_use_console(readahead_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.13/policy/modules/admin/su.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.14/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/admin/su.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/su.if	2006-02-12 11:55:03.000000000 -0500
 @@ -23,13 +23,12 @@
  	# Transition from the user domain to this domain.
  	domain_auto_trans($2, su_exec_t, $1_su_t)
@@ -120,9 +120,9 @@
  	allow $1_su_t $2:fd use;
  	allow $1_su_t $2:fifo_file rw_file_perms;
  	allow $1_su_t $2:process sigchld;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.13/policy/modules/kernel/bootloader.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.14/policy/modules/kernel/bootloader.te
 --- nsaserefpolicy/policy/modules/kernel/bootloader.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/bootloader.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/bootloader.te	2006-02-12 11:55:03.000000000 -0500
 @@ -71,7 +71,7 @@
  
  allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
@@ -141,9 +141,9 @@
  # for reading BIOS data
  dev_read_raw_memory(bootloader_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.13/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/corenetwork.te.in	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in	2006-02-12 11:55:03.000000000 -0500
 @@ -124,6 +124,7 @@
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
@@ -152,9 +152,9 @@
  network_port(zebra, tcp,2601,s0)
  network_port(zope, tcp,8021,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.13/policy/modules/kernel/devices.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.14/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/devices.fc	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.fc	2006-02-12 11:55:03.000000000 -0500
 @@ -78,6 +78,7 @@
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
@@ -163,10 +163,10 @@
  
  ifdef(`distro_redhat',`
  # originally from named.fc
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.13/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.14/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/devices.if	2006-02-10 21:35:42.000000000 -0500
-@@ -2656,3 +2656,20 @@
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.if	2006-02-12 12:10:27.000000000 -0500
+@@ -2656,3 +2656,22 @@
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
  
@@ -176,7 +176,9 @@
 +##	Read and write the USB device.
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`dev_rw_usb',`
@@ -187,9 +189,9 @@
 +	allow $1 device_t:dir r_dir_perms;
 +	allow $1 usb_device_t:chr_file { read write };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.13/policy/modules/kernel/devices.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.14/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/devices.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.te	2006-02-12 11:55:03.000000000 -0500
 @@ -159,6 +159,11 @@
  genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
  genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
@@ -202,9 +204,21 @@
  type v4l_device_t;
  dev_node(v4l_device_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.13/policy/modules/kernel/files.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.14/policy/modules/kernel/domain.te
+--- nsaserefpolicy/policy/modules/kernel/domain.te	2006-02-10 11:31:48.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/domain.te	2006-02-12 11:55:03.000000000 -0500
+@@ -63,5 +63,7 @@
+ # SELinux identity and role change constraints
+ attribute process_uncond_exempt;	# add userhelperdomain to this one
+ 
+-neverallow { domain unlabeled_t } ~{ domain unlabeled_t }:process *;
++# TODO:
++# cjp: also need to except correctly for SEFramework
++neverallow { domain unlabeled_t } file_type:process *;
+ neverallow ~{ domain unlabeled_t } *:process *;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.14/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/files.fc	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/files.fc	2006-02-12 11:55:03.000000000 -0500
 @@ -192,6 +192,8 @@
  /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
  
@@ -214,9 +228,9 @@
  
  /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
  /usr/tmp/.*			<<none>>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.13/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.14/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/files.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/files.if	2006-02-12 11:55:03.000000000 -0500
 @@ -2292,7 +2292,7 @@
  		attribute tmpfile;
  	')
@@ -226,17 +240,19 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.13/policy/modules/kernel/filesystem.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.14/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/filesystem.if	2006-02-10 21:35:42.000000000 -0500
-@@ -1033,6 +1033,22 @@
++++ serefpolicy-2.2.14/policy/modules/kernel/filesystem.if	2006-02-12 12:07:11.000000000 -0500
+@@ -1033,6 +1033,24 @@
  
  ########################################
  ## <summary>
 +##	List inotifyfs filesystem. 
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`fs_list_inotifyfs',`
@@ -252,14 +268,16 @@
  ##	Mount an iso9660 filesystem, which
  ##	is usually used on CDs.
  ## </summary>
-@@ -1965,6 +1981,38 @@
+@@ -1965,6 +1983,42 @@
  
  ########################################
  ## <summary>
 +##	Dontaudit read on a ramfs file/fifo_file
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`fs_dontaudit_read_ramfs_file',`
@@ -275,7 +293,9 @@
 +##	Dontaudit read on a ramfs fifo_file
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`fs_dontaudit_read_ramfs_fifo_file',`
@@ -291,9 +311,16 @@
  ##	Write to named pipe on a ramfs filesystem.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.13/policy/modules/kernel/mls.te
+@@ -3041,3 +3095,6 @@
+ 	# and its files.
+ 	allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;
+ ')
++
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.14/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/mls.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/mls.te	2006-02-12 11:55:03.000000000 -0500
 @@ -87,6 +87,7 @@
  ')
  
@@ -302,9 +329,9 @@
  range_transition initrc_t auditd_exec_t s15:c0.c255;
  range_transition kernel_t init_exec_t s0 - s15:c0.c255;
  range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.13/policy/modules/kernel/terminal.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.14/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/kernel/terminal.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/terminal.if	2006-02-12 11:55:03.000000000 -0500
 @@ -430,7 +430,7 @@
  		type devpts_t;
  	')
@@ -314,9 +341,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.13/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.14/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/apache.fc	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/apache.fc	2006-02-12 11:55:03.000000000 -0500
 @@ -48,6 +48,7 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
@@ -339,10 +366,10 @@
  /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)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.13/policy/modules/services/automount.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.14/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/automount.if	2006-02-10 21:35:42.000000000 -0500
-@@ -43,3 +43,19 @@
++++ serefpolicy-2.2.14/policy/modules/services/automount.if	2006-02-12 12:07:50.000000000 -0500
+@@ -43,3 +43,21 @@
  	corecmd_search_sbin($1)
  	can_exec($1,automount_etc_t)
  ')
@@ -352,7 +379,9 @@
 +##	dontaudit getattr of automount tmp dir
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed access.
++##	</summary>
 +## </param>
 +#
 +interface(`automount_dontaudit_getattr_tmp_dir',`
@@ -362,9 +391,9 @@
 +
 +	dontaudit $1 automount_tmp_t:dir getattr;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.13/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.14/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/automount.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/automount.te	2006-02-12 11:55:03.000000000 -0500
 @@ -63,6 +63,7 @@
  kernel_read_system_state(automount_t)
  kernel_list_proc(automount_t)
@@ -373,9 +402,9 @@
  bootloader_search_boot(automount_t)
  
  corecmd_exec_sbin(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.13/policy/modules/services/bluetooth.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.14/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/bluetooth.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/bluetooth.te	2006-02-12 11:55:03.000000000 -0500
 @@ -101,6 +101,7 @@
  
  dev_read_sysfs(bluetooth_t)
@@ -384,9 +413,9 @@
  dev_read_urand(bluetooth_t)
  
  fs_getattr_all_fs(bluetooth_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.13/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.14/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/cron.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/cron.if	2006-02-12 11:55:03.000000000 -0500
 @@ -429,7 +429,7 @@
  		type crond_t;
  	')
@@ -396,9 +425,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.13/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.14/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-10 11:31:48.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/cron.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/cron.te	2006-02-12 11:55:03.000000000 -0500
 @@ -108,6 +108,7 @@
  
  corecmd_exec_shell(crond_t)
@@ -407,9 +436,9 @@
  
  domain_use_wide_inherit_fd(crond_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.13/policy/modules/services/fetchmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.14/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/fetchmail.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/fetchmail.te	2006-02-12 11:55:03.000000000 -0500
 @@ -44,6 +44,7 @@
  kernel_list_proc(fetchmail_t)
  kernel_getattr_proc_files(fetchmail_t)
@@ -418,9 +447,9 @@
  
  corenet_non_ipsec_sendrecv(fetchmail_t)
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.13/policy/modules/services/hal.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.14/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/hal.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/hal.te	2006-02-12 11:55:03.000000000 -0500
 @@ -50,6 +50,7 @@
  kernel_read_fs_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
@@ -473,9 +502,9 @@
  optional_policy(`bind',`
  	bind_search_cache(hald_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.13/policy/modules/services/mta.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.14/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/mta.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/mta.if	2006-02-12 11:55:03.000000000 -0500
 @@ -458,6 +458,7 @@
  
  	allow $1 sendmail_exec_t:lnk_file r_file_perms;
@@ -484,10 +513,20 @@
  
  	allow $1 system_mail_t:fd use;
  	allow system_mail_t $1:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.13/policy/modules/services/mta.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.14/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/mta.te	2006-02-10 21:35:42.000000000 -0500
-@@ -145,6 +145,8 @@
++++ serefpolicy-2.2.14/policy/modules/services/mta.te	2006-02-13 10:21:37.000000000 -0500
+@@ -30,6 +30,9 @@
+ 
+ mta_base_mail_template(system)
+ role system_r types system_mail_t;
++# newalias required this, not sure if it is needed in 'if' file
++allow system_mail_t self:capability { dac_override };
++
+ 
+ # cjp: need to resolve this, but require{}
+ # does not work in the else part of the optional
+@@ -145,6 +148,8 @@
  	files_getattr_tmp_dirs(system_mail_t)
  
  	postfix_exec_master(system_mail_t)
@@ -496,9 +535,9 @@
  
  	ifdef(`distro_redhat',`
  		# compatability for old default main.cf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.13/policy/modules/services/networkmanager.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.14/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/networkmanager.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/networkmanager.te	2006-02-12 11:55:03.000000000 -0500
 @@ -22,7 +22,7 @@
  dontaudit NetworkManager_t self:capability sys_tty_config;
  allow NetworkManager_t self:process { setcap getsched signal_perms };
@@ -520,9 +559,9 @@
  
  kernel_read_system_state(NetworkManager_t)
  kernel_read_network_state(NetworkManager_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.13/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.14/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/postfix.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-12 11:55:03.000000000 -0500
 @@ -273,6 +273,8 @@
  corecmd_exec_shell(postfix_local_t)
  corecmd_exec_bin(postfix_local_t)
@@ -542,9 +581,9 @@
  
  allow postfix_postdrop_t postfix_public_t:dir search;
  allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.13/policy/modules/services/remotelogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.14/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/remotelogin.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/remotelogin.te	2006-02-12 11:55:03.000000000 -0500
 @@ -98,6 +98,7 @@
  files_list_mnt(remote_login_t)
  # for when /var/mail is a sym-link
@@ -585,9 +624,9 @@
 -	allow remote_login_t telnetd_devpts_t:chr_file { relabelfrom relabelto };
 -')
 -') dnl endif TODO
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.13/policy/modules/services/sendmail.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.14/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/sendmail.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/sendmail.te	2006-02-12 11:55:03.000000000 -0500
 @@ -65,6 +65,7 @@
  
  # for piping mail to a command
@@ -596,9 +635,9 @@
  
  domain_use_wide_inherit_fd(sendmail_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.13/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.14/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/spamassassin.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/spamassassin.te	2006-02-12 11:55:03.000000000 -0500
 @@ -77,6 +77,8 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -608,9 +647,9 @@
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.13/policy/modules/services/zebra.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.14/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/services/zebra.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/zebra.te	2006-02-12 11:55:03.000000000 -0500
 @@ -34,7 +34,7 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -620,9 +659,9 @@
  allow zebra_t self:udp_socket create_socket_perms;
  allow zebra_t self:rawip_socket create_socket_perms;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.13/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.14/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/fstools.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/fstools.te	2006-02-12 11:55:03.000000000 -0500
 @@ -57,6 +57,8 @@
  kernel_rw_unlabeled_dirs(fsadm_t)
  kernel_rw_unlabeled_blk_files(fsadm_t)
@@ -632,9 +671,9 @@
  dev_getattr_all_chr_files(fsadm_t)
  # mkreiserfs and other programs need this for UUID
  dev_read_rand(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.13/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.14/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/init.fc	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/init.fc	2006-02-12 11:55:03.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -645,17 +684,19 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.13/policy/modules/system/libraries.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.14/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/libraries.if	2006-02-10 21:35:42.000000000 -0500
-@@ -80,6 +80,23 @@
++++ serefpolicy-2.2.14/policy/modules/system/libraries.if	2006-02-12 12:08:28.000000000 -0500
+@@ -80,6 +80,25 @@
  
  ########################################
  ## <summary>
 +##	Allow domain execute_no_trans on ld_so_t
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	The type of the process performing this action.
++##	</summary>
 +## </param>
 +#
 +interface(`libs_execute_no_trans_ld_so',`
@@ -672,7 +713,7 @@
  ##	Use the dynamic link/loader for automatic loading
  ##	of shared libraries with legacy support.
  ## </summary>
-@@ -283,6 +300,7 @@
+@@ -283,6 +302,7 @@
  
  	allow $1 lib_t:dir search_dir_perms;
  	allow $1 lib_t:file manage_file_perms;
@@ -680,9 +721,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.13/policy/modules/system/libraries.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.14/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/libraries.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/libraries.te	2006-02-12 11:55:03.000000000 -0500
 @@ -53,6 +53,7 @@
  
  allow ldconfig_t ld_so_cache_t:file create_file_perms;
@@ -691,9 +732,9 @@
  
  allow ldconfig_t lib_t:dir rw_dir_perms;
  allow ldconfig_t lib_t:lnk_file { getattr create read unlink };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.13/policy/modules/system/locallogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.14/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/locallogin.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/locallogin.te	2006-02-12 11:55:03.000000000 -0500
 @@ -214,10 +214,8 @@
  	alsa_domtrans(local_login_t)
  ')
@@ -706,9 +747,9 @@
  
  #################################
  # 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.13/policy/modules/system/logging.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.14/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/logging.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/logging.te	2006-02-12 11:55:03.000000000 -0500
 @@ -92,6 +92,8 @@
  	term_use_unallocated_ttys(auditctl_t)
  ')
@@ -727,9 +768,9 @@
  allow auditd_t self:file { getattr read write };
  allow auditd_t self:unix_dgram_socket create_socket_perms;
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.13/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.14/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/mount.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/mount.te	2006-02-12 11:55:03.000000000 -0500
 @@ -33,6 +33,8 @@
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
@@ -739,9 +780,9 @@
  
  storage_raw_read_fixed_disk(mount_t)
  storage_raw_write_fixed_disk(mount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.13/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.fc	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc	2006-02-12 11:57:39.000000000 -0500
 @@ -10,6 +10,7 @@
  /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
  
@@ -750,9 +791,15 @@
  /etc/selinux/([^/]*/)?seusers	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
  /etc/selinux/([^/]*/)?users(/.*)?	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.13/policy/modules/system/selinuxutil.if
+@@ -39,3 +40,5 @@
+ ifdef(`distro_debian', `
+ /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
+ ')
++
++/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.14/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.if	2006-02-12 12:03:06.000000000 -0500
 @@ -587,6 +587,22 @@
  
  ########################################
@@ -785,48 +832,18 @@
  	allow $1 policy_config_t:file create_file_perms;
  	typeattribute $1 can_write_binary_policy;
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.13/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/selinuxutil.te	2006-02-10 21:35:42.000000000 -0500
-@@ -245,6 +245,7 @@
- selinux_compute_relabel_context(newrole_t)
- selinux_compute_user_contexts(newrole_t)
- 
-+term_dontaudit_use_unallocated_ttys(newrole_t)
- term_use_all_user_ttys(newrole_t)
- term_use_all_user_ptys(newrole_t)
- term_relabel_all_user_ttys(newrole_t)
-@@ -354,6 +355,7 @@
- init_use_script_ptys(restorecon_t)
- 
- domain_use_wide_inherit_fd(restorecon_t)
-+domain_dontaudit_search_all_domains_state(restorecon_t)
+@@ -684,3 +700,27 @@
+ 	allow $1 policy_src_t:file create_file_perms;
+ ')
  
- files_read_etc_runtime_files(restorecon_t)
- files_read_etc_files(restorecon_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.fc serefpolicy-2.2.13/policy/modules/system/semodule.fc
---- nsaserefpolicy/policy/modules/system/semodule.fc	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/semodule.fc	2006-02-10 21:35:42.000000000 -0500
-@@ -0,0 +1,7 @@
-+
-+# semodule executable will have:
-+# label: system_u:object_r:semodule_exec_t
-+# MLS sensitivity: s0
-+# MCS categories: <none>
-+
-+/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.if serefpolicy-2.2.13/policy/modules/system/semodule.if
---- nsaserefpolicy/policy/modules/system/semodule.if	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/semodule.if	2006-02-10 21:35:42.000000000 -0500
-@@ -0,0 +1,24 @@
-+## <summary>Policy for semodule.</summary>
-+
 +########################################
 +## <summary>
 +##	Execute a domain transition to run semodule.
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain allowed to transition.
++##	</summary>
 +## </param>
 +#
 +interface(`semodule_domtrans',`
@@ -843,12 +860,29 @@
 +	allow semodule_t $1:fifo_file rw_file_perms;
 +	allow semodule_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/semodule.te serefpolicy-2.2.13/policy/modules/system/semodule.te
---- nsaserefpolicy/policy/modules/system/semodule.te	1969-12-31 19:00:00.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/semodule.te	2006-02-10 21:35:42.000000000 -0500
-@@ -0,0 +1,52 @@
-+
-+policy_module(semodule,1.0.0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.14/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.te	2006-02-12 11:58:03.000000000 -0500
+@@ -245,6 +245,7 @@
+ selinux_compute_relabel_context(newrole_t)
+ selinux_compute_user_contexts(newrole_t)
+ 
++term_dontaudit_use_unallocated_ttys(newrole_t)
+ term_use_all_user_ttys(newrole_t)
+ term_use_all_user_ptys(newrole_t)
+ term_relabel_all_user_ttys(newrole_t)
+@@ -354,6 +355,7 @@
+ init_use_script_ptys(restorecon_t)
+ 
+ domain_use_wide_inherit_fd(restorecon_t)
++domain_dontaudit_search_all_domains_state(restorecon_t)
+ 
+ files_read_etc_runtime_files(restorecon_t)
+ files_read_etc_files(restorecon_t)
+@@ -533,3 +535,53 @@
+ # scripts will put things in a state such that setfiles can not be run!
+ allow setfiles_t lib_t:file { read execute };
+ ') dnl endif TODO
 +
 +########################################
 +#
@@ -899,9 +933,9 @@
 +seutil_use_newrole_fd(semodule_t)
 +
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.13/policy/modules/system/udev.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.14/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/udev.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/udev.te	2006-02-12 11:55:03.000000000 -0500
 @@ -18,6 +18,8 @@
  domain_obj_id_change_exemption(udev_t)
  domain_entry_file(udev_t,udev_helper_exec_t)
@@ -920,9 +954,9 @@
  
  selinux_get_fs_mount(udev_t)
  selinux_validate_context(udev_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.13/policy/modules/system/unconfined.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.14/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/unconfined.if	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/unconfined.if	2006-02-12 12:13:10.000000000 -0500
 @@ -19,6 +19,7 @@
  
  	# Use any Linux capability.
@@ -931,9 +965,22 @@
  
  	# Transition to myself, to make get_ordered_context_list happy.
  	allow $1 self:process transition;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.13/policy/modules/system/unconfined.te
+@@ -54,10 +55,11 @@
+ 	tunable_policy(`allow_execmem && allow_execstack',`
+ 		# Allow making the stack executable via mprotect.
+ 		allow $1 self:process execstack;
++		auditallow $1 self:process execstack;
+ 	', `
+ 		# These are fairly common but seem to be harmless
+ 		# caused by using shared libraries built with old tool chains
+-		dontaudit $1 self:process execstack;
++		#dontaudit $1 self:process execstack;
+ 	')
+ 
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.14/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/unconfined.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/unconfined.te	2006-02-12 11:55:03.000000000 -0500
 @@ -152,4 +152,10 @@
  	optional_policy(`xserver',`
  		xserver_domtrans_xdm_xserver(unconfined_t)
@@ -945,10 +992,10 @@
 +		mount_domtrans(unconfined_t)
 +	')
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.13/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.14/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/userdomain.if	2006-02-10 21:35:42.000000000 -0500
-@@ -3049,6 +3049,23 @@
++++ serefpolicy-2.2.14/policy/modules/system/userdomain.if	2006-02-12 12:09:03.000000000 -0500
+@@ -3049,6 +3049,25 @@
  
  ########################################
  ## <summary>
@@ -956,7 +1003,9 @@
 +##	users home directory.
 +## </summary>
 +## <param name="domain">
++##	<summary>
 +##	Domain to not audit.
++##	</summary>
 +## </param>
 +#
 +interface(`userdom_dontaudit_append_staff_home_files',`
@@ -972,9 +1021,9 @@
  ##	Read files in the staff users home directory.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.13/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.14/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.13/policy/modules/system/userdomain.te	2006-02-10 21:35:42.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/userdomain.te	2006-02-12 11:55:03.000000000 -0500
 @@ -162,10 +162,16 @@
  		')
  	')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- selinux-policy.spec	11 Feb 2006 02:41:50 -0000	1.103
+++ selinux-policy.spec	13 Feb 2006 15:55:10 -0000	1.104
@@ -5,7 +5,7 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.13
+Version: 2.2.14
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -295,6 +295,9 @@
 
 %changelog
 
+* Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.14-1
+- Update to upstream
+
 * Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.13-1
 - Add semodule policy
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	11 Feb 2006 02:41:50 -0000	1.41
+++ sources	13 Feb 2006 15:55:10 -0000	1.42
@@ -1 +1 @@
-cd259d3029bd3688b80a8b7804a75e10  serefpolicy-2.2.13.tgz
+7b0c1f6438c0be1d7fce5c8307784e86  serefpolicy-2.2.14.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 15:58:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 10:58:16 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.69,1.70
Message-ID: <200602131558.k1DFwGIP013077@cvs.devel.redhat.com>

Author: quintela

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

Modified Files:
	kernel-xen.spec 
Log Message:
compile only xen kernels


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kernel-xen.spec	13 Feb 2006 12:19:35 -0000	1.69
+++ kernel-xen.spec	13 Feb 2006 15:58:12 -0000	1.70
@@ -3,11 +3,11 @@
 # 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 buildup 1
-%define buildsmp 1
+%define buildup 0
+%define buildsmp 0
 %define includexen 1
 # includexenPAE requieres includexen enabled
-%define includexenPAE 1
+%define includexenPAE 0
 %define builddoc 0
 %define buildkdump 0
 
@@ -1591,6 +1591,9 @@
 
 %changelog
 * Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
+- compile only xen kernels.
+
+* Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
 - rebase rawhide 1.1941.
 
 * Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:06:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:06:53 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.103, 1.104 kudzu.spec, 1.118,
	1.119 sources, 1.116, 1.117
Message-ID: <200602131606.k1DG6rtR013859@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13827

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- .cvsignore	8 Feb 2006 02:44:52 -0000	1.103
+++ .cvsignore	13 Feb 2006 16:06:50 -0000	1.104
@@ -1 +1 @@
-kudzu-1.2.25.tar.gz
+kudzu-1.2.26.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kudzu.spec	11 Feb 2006 03:50:38 -0000	1.118
+++ kudzu.spec	13 Feb 2006 16:06:50 -0000	1.119
@@ -1,6 +1,6 @@
 Name: kudzu
-Version: 1.2.25
-Release: 1.1
+Version: 1.2.26
+Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
 Group: Applications/System
@@ -79,8 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.25-1.1
-- bump again for double-long bug on ppc(64)
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.26-1
+- restrict video devices to PCI class 0300 (should solve #176978)
+- translation updates
 
 * Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> - 1.2.25-1
 - in installer environment, sg isn't loaded, so there are deviceless


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- sources	8 Feb 2006 02:44:53 -0000	1.116
+++ sources	13 Feb 2006 16:06:50 -0000	1.117
@@ -1 +1 @@
-13142cbc3c3f80f94a6e6cb6605a7a02  kudzu-1.2.25.tar.gz
+29ac798c1afd71d2a5dfcef657913624  kudzu-1.2.26.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:09:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:09:33 -0500
Subject: rpms/shared-mime-info/devel defaults.list, 1.12,
	1.13 shared-mime-info.spec, 1.36, 1.37
Message-ID: <200602131609.k1DG9XsO015056@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/shared-mime-info/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14981

Modified Files:
	defaults.list shared-mime-info.spec 
Log Message:
- add gthumb as fallback



Index: defaults.list
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- defaults.list	13 Feb 2006 15:34:09 -0000	1.12
+++ defaults.list	13 Feb 2006 16:09:30 -0000	1.13
@@ -23,24 +23,24 @@
 image/x-xcf=gimp-2.0.desktop
 image/x-psd=gimp-2.0.desktop
 image/x-fits=gimp-2.0.desktop
-image/bmp=gnome-eog.desktop
-image/gif=gnome-eog.desktop
-image/jpeg=gnome-eog.desktop
-image/jpg=gnome-eog.desktop
-image/pjpeg=gnome-eog.desktop
-image/png=gnome-eog.desktop
-image/tiff=gnome-eog.desktop
-image/x-icb=gnome-eog.desktop
-image/x-ico=gnome-eog.desktop
-image/x-pcx=gnome-eog.desktop
-image/x-portable-anymap=gnome-eog.desktop
-image/x-portable-bitmap=gnome-eog.desktop
-image/x-portable-graymap=gnome-eog.desktop
-image/x-portable-pixmap=gnome-eog.desktop
-image/x-xbitmap=gnome-eog.desktop
-image/x-xpixmap=gnome-eog.desktop
-image/x-xwindowdump=gnome-eog.desktop
-image/svg+xml=gnome-eog.desktop
+image/bmp=gnome-eog.desktop;gthumb.desktop;
+image/gif=gnome-eog.desktop;gthumb.desktop;
+image/jpeg=gnome-eog.desktop;gthumb.desktop;
+image/jpg=gnome-eog.desktop;gthumb.desktop;
+image/pjpeg=gnome-eog.desktop;gthumb.desktop;
+image/png=gnome-eog.desktop;gthumb.desktop;
+image/tiff=gnome-eog.desktop;gthumb.desktop;
+image/x-icb=gnome-eog.desktop;gthumb.desktop;
+image/x-ico=gnome-eog.desktop;gthumb.desktop;
+image/x-pcx=gnome-eog.desktop;gthumb.desktop;
+image/x-portable-anymap=gnome-eog.desktop;gthumb.desktop;
+image/x-portable-bitmap=gnome-eog.desktop;gthumb.desktop;
+image/x-portable-graymap=gnome-eog.desktop;gthumb.desktop;
+image/x-portable-pixmap=gnome-eog.desktop;gthumb.desktop;
+image/x-xbitmap=gnome-eog.desktop;gthumb.desktop;
+image/x-xpixmap=gnome-eog.desktop;gthumb.desktop;
+image/x-xwindowdump=gnome-eog.desktop;gthumb.desktop;
+image/svg+xml=gnome-eog.desktop;gthumb.desktop;
 application/vnd.ms-word=openoffice.org-1.9-writer.desktop
 application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
 application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop


Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shared-mime-info.spec	13 Feb 2006 15:41:06 -0000	1.36
+++ shared-mime-info.spec	13 Feb 2006 16:09:30 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.16.cvs20060212
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -62,6 +62,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.16.cvs20060212-3
+- add gthumb as fallback
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.16.cvs20060212-2
 - make eog the default image viewer
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:10:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:10:51 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.92, 1.93 initscripts.spec,
	1.106, 1.107 sources, 1.100, 1.101
Message-ID: <200602131610.k1DGApTq015521@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15494

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	7 Feb 2006 05:16:10 -0000	1.92
+++ .cvsignore	13 Feb 2006 16:10:48 -0000	1.93
@@ -1 +1 @@
-initscripts-8.26.tar.bz2
+initscripts-8.27.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- initscripts.spec	11 Feb 2006 03:34:23 -0000	1.106
+++ initscripts.spec	13 Feb 2006 16:10:48 -0000	1.107
@@ -1,9 +1,9 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.26
+Version: 8.27
 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
@@ -208,8 +208,10 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.26-1.1
-- bump again for double-long bug on ppc(64)
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 8.27-1
+- translation updates
+- lang.sh: revert fix for #176832, it's broken
+- ifup-aliases fixes (<pjones at redhat.com>,<mitr at redhat.com>)
 
 * Tue Feb  7 2006 Bill Nottingham <notting at redhat.com> 8.26-1
 - revert "rc.sysinit: don't mount usbfs, libusb no longer uses it" change


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	7 Feb 2006 05:16:10 -0000	1.100
+++ sources	13 Feb 2006 16:10:48 -0000	1.101
@@ -1 +1 @@
-5b24e91873235fd81f89ca69b1098a9e  initscripts-8.26.tar.bz2
+0407b0f402736229893a9b8bd74ff255  initscripts-8.27.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:11:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:11:20 -0500
Subject: rpms/openldap/devel ldap.init,1.17,1.18 openldap.spec,1.53,1.54
Message-ID: <200602131611.k1DGBKfX015716@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15649

Modified Files:
	ldap.init openldap.spec 
Log Message:
Re fix ldap.init



Index: ldap.init
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/ldap.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ldap.init	31 Jan 2006 21:47:36 -0000	1.17
+++ ldap.init	13 Feb 2006 16:11:17 -0000	1.18
@@ -121,8 +121,8 @@
 		fi
 	done
 	# Check the configuration file.
-	if ! action $"Checking configuration files for $prog: " /sbin/runuser -f -m -s /bin/sh -c "$slaptest $slaptestflags" -- "$user" ; then
-		if /sbin/runuser -f -m -s /bin/sh -c "$slaptest  -u" -- "$user" > /dev/null 2> /dev/null ; then
+	if ! action $"Checking configuration files for $prog: " /sbin/runuser -m -s "$slaptest" -- "$user" "$slaptestflags"; then
+		if /sbin/runuser -m -s "$slaptest" -- "$user" "-u" > /dev/null 2> /dev/null ; then
 			dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'`
 			for directory in $dirs ; do
 				if test -r $directory/__db.001 ; then


Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- openldap.spec	11 Feb 2006 04:50:05 -0000	1.53
+++ openldap.spec	13 Feb 2006 16:11:17 -0000	1.54
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: %{version_23}
-Release: 3.1
+Release: 4
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -682,6 +682,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Feb 13 2006 Jay Fenlason <fenlason at redhat.com> 2.3.19-4
+- Re-fix ldap.init
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.3.19-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:12:15 -0500
Subject: rpms/Guppi/devel Guppi.spec,1.22,1.23
Message-ID: <200602131612.k1DGCFmf016178@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/Guppi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16126

Modified Files:
	Guppi.spec 
Log Message:
bump 



Index: Guppi.spec
===================================================================
RCS file: /cvs/dist/rpms/Guppi/devel/Guppi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Guppi.spec	11 Feb 2006 03:23:46 -0000	1.22
+++ Guppi.spec	13 Feb 2006 16:12:12 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: GNOME Data Analysis and Visualization.
 Name: Guppi
 Version: 0.40.3
-Release: 24.2.1
+Release: 24.2.1.1
 License: GPL
 Group: Applications/Engineering
 Source: ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.bz2
@@ -82,6 +82,9 @@
 %{_datadir}/aclocal/libguppi.m4
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.40.3-24.2.1.1
+- again and again and again and again and again
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.40.3-24.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:13:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:13:20 -0500
Subject: rpms/kernel/devel upstream,1.265,1.266
Message-ID: <200602131613.k1DGDKiM016720@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	upstream 
Log Message:
dead bit



Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- upstream	13 Feb 2006 03:11:41 -0000	1.265
+++ upstream	13 Feb 2006 16:13:18 -0000	1.266
@@ -1,3 +1,2 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc2-git12.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:15:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:15:38 -0500
Subject: rpms/chkconfig/devel .cvsignore, 1.28, 1.29 chkconfig.spec, 1.35,
	1.36 sources, 1.29, 1.30
Message-ID: <200602131615.k1DGFciJ017800@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17767

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	3 Feb 2006 03:44:00 -0000	1.28
+++ .cvsignore	13 Feb 2006 16:15:36 -0000	1.29
@@ -1 +1 @@
-chkconfig-1.3.26.tar.gz
+chkconfig-1.3.27.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- chkconfig.spec	11 Feb 2006 02:15:19 -0000	1.35
+++ chkconfig.spec	13 Feb 2006 16:15:36 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
-Version: 1.3.26
-Release: 1.2
+Version: 1.3.27
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -75,11 +75,8 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.26-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.3.26-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 1.3.27-1
+- translation updates
 
 * Thu Feb  2 2006 Bill Nottingham <notting at redhat.com> 1.3.26-1
 - add support for resetting priorities without on/off status (#178864)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	3 Feb 2006 03:44:00 -0000	1.29
+++ sources	13 Feb 2006 16:15:36 -0000	1.30
@@ -1 +1 @@
-f0ac338e17fbddd1eb06f73dba9c1341  chkconfig-1.3.26.tar.gz
+7ef65db5ebc9ec36d947af6bdb48682c  chkconfig-1.3.27.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:16:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:16:42 -0500
Subject: rpms/SysVinit/devel SysVinit.spec,1.40,1.41
Message-ID: <200602131616.k1DGGgYn018842@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/SysVinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18651

Modified Files:
	SysVinit.spec 
Log Message:
bump


Index: SysVinit.spec
===================================================================
RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- SysVinit.spec	11 Feb 2006 05:47:08 -0000	1.40
+++ SysVinit.spec	13 Feb 2006 16:16:39 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes.
 Name: SysVinit
 Version: 2.86
-Release: 2.2
+Release: 2.2.2
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -124,6 +124,9 @@
 /dev/initctl
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 2.86-2.2.2
+- and again...
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.86-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:17:06 -0500
Subject: rpms/gnome-volume-manager/devel
	gnome-volume-manager-1.5.11-rh-defaults.patch, NONE,
	1.1 gnome-volume-manager.spec, 1.33,
	1.34 gnome-volume-manager-1.5.1.rh-defaults.patch, 1.1, NONE
Message-ID: <200602131617.k1DGH6q7021670@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20126

Modified Files:
	gnome-volume-manager.spec 
Added Files:
	gnome-volume-manager-1.5.11-rh-defaults.patch 
Removed Files:
	gnome-volume-manager-1.5.1.rh-defaults.patch 
Log Message:
- get rid of gnome-printer-add


gnome-volume-manager-1.5.11-rh-defaults.patch:
 gnome-volume-manager.schemas.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gnome-volume-manager-1.5.11-rh-defaults.patch ---
--- gnome-volume-manager-1.5.11/gnome-volume-manager.schemas.in.rh-defaults	2006-01-09 14:16:42.000000000 -0500
+++ gnome-volume-manager-1.5.11/gnome-volume-manager.schemas.in	2006-02-13 11:15:14.000000000 -0500
@@ -180,7 +180,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
 	<type>string</type>
-	<default></default>
+	<default>gthumb-import %h</default>
 	<locale name="C">
 	  <short>Photo management command</short>
 	  <long>Command to run when a digital camera is connected or media 
@@ -215,7 +215,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
 	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
 	<type>bool</type>
-	<default>true</default>
+	<default>false</default>
 	<locale name="C">
 	  <short>Run printer program</short>
 	  <long>Whether, when a printer is connected, gnome-volume-manager should run
@@ -227,7 +227,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
 	<type>string</type>
-	<default>gnome-printer-add hal://%h</default>
+	<default></default>
 	<locale name="C">
 	  <short>printer command</short>
 	  <long>Command to run when a printer is connected.</long>


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-volume-manager.spec	11 Feb 2006 03:18:33 -0000	1.33
+++ gnome-volume-manager.spec	13 Feb 2006 16:17:03 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.11
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -10,7 +10,7 @@
 Source3: gnome-cdda-handler
 Source4: cdda-url-handler.schemas
 Patch0: gnome-volume-manager-0.9.10.add-to-base.patch
-Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch
+Patch1: gnome-volume-manager-1.5.11-rh-defaults.patch
 Patch2: gvm-no-mount-ui-on-startup.patch 
 Patch3: gnome-volume-manager-1.5.9-goption.patch 
 BuildRoot: /var/tmp/%{name}-root
@@ -78,6 +78,9 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1.5.11-2
+- get rid of gnome-printer-add
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.11-1.2
 - bump again for double-long bug on ppc(64)
 


--- gnome-volume-manager-1.5.1.rh-defaults.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:25:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:25:43 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.19, 1.20 pykickstart.spec, 1.19,
	1.20 sources, 1.20, 1.21
Message-ID: <200602131625.k1DGPhXR002320@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2269

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	9 Feb 2006 20:57:34 -0000	1.19
+++ .cvsignore	13 Feb 2006 16:25:41 -0000	1.20
@@ -8,3 +8,4 @@
 pykickstart-0.16.tar.gz
 pykickstart-0.17.tar.gz
 pykickstart-0.18.tar.gz
+pykickstart-0.19.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pykickstart.spec	9 Feb 2006 20:57:34 -0000	1.19
+++ pykickstart.spec	13 Feb 2006 16:25:41 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.18
+Version: 0.19
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,10 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Mon Feb 13 2006 Chris Lumens <clumens at redhat.com> 0.19-1
+- --onboot requires a value (#180987).
+- Be more strict about commands that don't take arguments.
+
 * Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 0.18-1
 - Fix some errors pychecker caught.
 - Allow exceptions to not be fatal so ksvalidator can spot more errors in


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	9 Feb 2006 20:57:34 -0000	1.20
+++ sources	13 Feb 2006 16:25:41 -0000	1.21
@@ -1 +1 @@
-d48a4e95ee669f01fa8c57cb3c3d9f1c  pykickstart-0.18.tar.gz
+3cfdfcf3541b645faa279d06a6e7fbfa  pykickstart-0.19.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:26:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:26:42 -0500
Subject: rpms/samba/devel samba-3.0.21b-logfiles.patch, NONE,
	1.1 samba-3.0.21b-smb.conf.patch, NONE,
	1.1 samba-3.0.21pre1-smbspool.patch, NONE, 1.1 .cvsignore,
	1.26, 1.27 samba.spec, 1.59, 1.60 sources, 1.28,
	1.29 samba-3.0.12pre1-logfiles.patch, 1.1,
	NONE samba-3.0.20pre1-smbspool.patch, 1.1,
	NONE samba-3.0.4-smb.conf.patch, 1.1, NONE
Message-ID: <200602131626.k1DGQgIu002833@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2784

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.0.21b-logfiles.patch samba-3.0.21b-smb.conf.patch 
	samba-3.0.21pre1-smbspool.patch 
Removed Files:
	samba-3.0.12pre1-logfiles.patch 
	samba-3.0.20pre1-smbspool.patch samba-3.0.4-smb.conf.patch 
Log Message:
3.0.21b


samba-3.0.21b-logfiles.patch:
 samba-3.0.0beta3/source/lib/popt_common.c  |    4 ++--
 samba-3.0.11/packaging/Fedora/samba.log    |    2 +-
 samba-3.0.11/packaging/Fedora/smb.conf     |    4 ++--
 samba-3.0.8pre1/source/nmbd/nmbd.c         |    2 +-
 samba-3.0.8pre1/source/nsswitch/winbindd.c |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE samba-3.0.21b-logfiles.patch ---
diff -u -r samba-3.0.0beta3.orig/source/lib/popt_common.c samba-3.0.0beta3/source/lib/popt_common.c
--- samba-3.0.0beta3.orig/source/lib/popt_common.c	2003-07-28 17:27:07.000000000 -0400
+++ samba-3.0.0beta3/source/lib/popt_common.c	2003-07-28 17:56:28.000000000 -0400
@@ -55,7 +55,7 @@
 		pname++;
 
 	if (reason == POPT_CALLBACK_REASON_PRE) {
-		pstr_sprintf(logfile, "%s/log.%s", dyn_LOGFILEBASE, pname);
+		pstr_sprintf(logfile, "%s/%s.log", dyn_LOGFILEBASE, pname);
 		lp_set_logfile(logfile);
 		return;
 	}
@@ -93,7 +93,7 @@
 
 	case 'l':
 		if (arg) {
-			pstr_sprintf(logfile, "%s/log.%s", arg, pname);
+			pstr_sprintf(logfile, "%s/%s.log", arg, pname);
 			lp_set_logfile(logfile);
 		}
 		break;
--- samba-3.0.8pre1/source/nmbd/nmbd.c.logfiles	2004-09-22 08:42:14.000000000 -0400
+++ samba-3.0.8pre1/source/nmbd/nmbd.c	2004-09-27 14:16:59.000000000 -0400
@@ -626,7 +626,7 @@
 	sys_srandom(time(NULL) ^ sys_getpid());
 	
 	if (!override_logfile) {
-		slprintf(logfile, sizeof(logfile)-1, "%s/log.nmbd", dyn_LOGFILEBASE);
+		slprintf(logfile, sizeof(logfile)-1, "%s/nmbd.log", dyn_LOGFILEBASE);
 		lp_set_logfile(logfile);
 	}
 	
--- samba-3.0.8pre1/source/nsswitch/winbindd.c.logfiles	2004-09-22 08:42:13.000000000 -0400
+++ samba-3.0.8pre1/source/nsswitch/winbindd.c	2004-09-27 14:17:35.000000000 -0400
@@ -856,7 +856,7 @@
 	}
 
 	if (!override_logfile) {
-		pstr_sprintf(logfile, "%s/log.winbindd", dyn_LOGFILEBASE);
+		pstr_sprintf(logfile, "%s/winbindd.log", dyn_LOGFILEBASE);
 		lp_set_logfile(logfile);
 	}
 	setup_logging("winbindd", log_stdout);
--- samba-3.0.11/packaging/Fedora/samba.log.logfiles	2005-02-03 22:07:48.000000000 -0500
+++ samba-3.0.11/packaging/Fedora/samba.log	2005-02-04 16:17:00.000000000 -0500
@@ -1,4 +1,4 @@
-/var/log/samba/*.log /var/log/samba/log.smbd /var/log/samba/log.nmbd {
+/var/log/samba/*.log {
     notifempty
     missingok
     sharedscripts
--- samba-3.0.11/packaging/Fedora/smb.conf.logfiles	2005-02-03 22:07:48.000000000 -0500
+++ samba-3.0.11/packaging/Fedora/smb.conf	2005-02-04 16:17:48.000000000 -0500
@@ -43,9 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   # log file = /var/log/samba/%m.log
+ log file = /var/log/samba/%m.log
 # all log information in one file
-   log file = /var/log/samba/log.smbd
+#   log file = /var/log/samba/log.smbd
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50

samba-3.0.21b-smb.conf.patch:
 smb.conf |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE samba-3.0.21b-smb.conf.patch ---
--- samba-3.0.4/packaging/Fedora/smb.conf.upstream	2004-04-04 03:37:44.000000000 -0400
+++ samba-3.0.4/packaging/Fedora/smb.conf	2004-05-10 15:24:45.000000000 -0400
@@ -35,7 +35,10 @@
 # It should not be necessary to spell out the print system type unless
 # yours is non-standard. Currently supported print systems include:
 # bsd, sysv, plp, lprng, aix, hpux, qnx
-;   printing = bsd
+;   printing = cups
+
+# This option tells cups that the data has already been rasterized
+cups options = raw
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
 # otherwise the user "nobody" is used

samba-3.0.21pre1-smbspool.patch:
 smbspool.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE samba-3.0.21pre1-smbspool.patch ---
--- samba-3.0.21pre1/source/client/smbspool.c.smbspool	2005-10-17 22:45:07.000000000 -0400
+++ samba-3.0.21pre1/source/client/smbspool.c	2005-10-18 23:46:53.000000000 -0400
@@ -165,7 +165,7 @@
   }
   else
   {
-    username = null_str;
+    username = "dummy";
     password = null_str;
     server   = uri + 6;
   }


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Nov 2005 16:17:56 -0000	1.26
+++ .cvsignore	13 Feb 2006 16:26:38 -0000	1.27
@@ -1 +1 @@
-samba-3.0.20b.tar.gz
+samba-3.0.21b.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- samba.spec	11 Feb 2006 05:38:05 -0000	1.59
+++ samba.spec	13 Feb 2006 16:26:39 -0000	1.60
@@ -2,8 +2,8 @@
 
 Summary: The Samba SMB server.
 Name: samba
-Version: 3.0.20b
-Release: 2.1.1
+Version: 3.0.21b
+Release: 2
 Epoch: 0
 License: GNU GPL Version 2
 Group: System Environment/Daemons
@@ -33,17 +33,17 @@
 # generic patches
 Patch101: samba-2.2.0-smbw.patch
 Patch102: samba-3.0.0beta1-pipedir.patch
-Patch103: samba-3.0.12pre1-logfiles.patch
+Patch103: samba-3.0.21b-logfiles.patch
 Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
-Patch105: samba-3.0.4-smb.conf.patch
+Patch105: samba-3.0.21b-smb.conf.patch
 Patch106: samba-3.0.20pre1-man.patch
 Patch107: samba-3.0.20pre1-passwd.patch
 #Patch108: samba-3.0.8-non-ascii-domain.patch
 Patch109: samba-3.0.4-install.mount.smbfs.patch
-Patch110: samba-3.0.20pre1-smbspool.patch
+Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch112: samba-3.0.15pre2-bug106483.patch
-Patch113: samba-3.0.20a-warnings.patch
+#Patch113: samba-3.0.21-warnings.patch
 
 Requires: pam >= 0:0.64 %{auth} samba-common = %{epoch}:%{version}-%{release}
 Requires: logrotate >= 0:3.4 initscripts >= 0:5.54-1 
@@ -103,10 +103,12 @@
 %setup -q
 
 # copy Red Hat specific scripts
-cp %{SOURCE5} packaging/RedHat/
-cp %{SOURCE6} packaging/RedHat/
-cp %{SOURCE7} packaging/RedHat/
-cp %{SOURCE8} packaging/RedHat/winbind.init
+mkdir packaging/Fedora
+cp packaging/RedHat-9/{samba.log,smb.conf,smbusers,samba.pamd.stack} packaging/Fedora/
+cp %{SOURCE5} packaging/Fedora/
+cp %{SOURCE6} packaging/Fedora/
+cp %{SOURCE7} packaging/Fedora/
+cp %{SOURCE8} packaging/Fedora/winbind.init
 
 # Upstream patches
 #(none)
@@ -124,7 +126,7 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch112 -p1 -b .bug106483
-%patch113 -p1 -b .warnings
+#%patch113 -p1 -b .warnings
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -154,7 +156,6 @@
 	--with-pam \
 	--with-pam_smbpass \
 	--with-quotas \
-	--with-smbmount \
 	--with-syslog \
 	--with-utmp \
 	--with-vfs \
@@ -222,17 +223,15 @@
 cd ..
 
 # Install other stuff
-install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
+install -m644 packaging/Fedora/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
 install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
-install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{_bindir}
-install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
-install -m755 packaging/RedHat/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
+install -m644 packaging/Fedora/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
+install -m755 packaging/Fedora/smbprint $RPM_BUILD_ROOT%{_bindir}
+install -m755 packaging/Fedora/smb.init $RPM_BUILD_ROOT%{_initrddir}/smb
+install -m755 packaging/Fedora/winbind.init $RPM_BUILD_ROOT%{_initrddir}/winbind
 #ln -s ../..%{_initrddir}/smb  $RPM_BUILD_ROOT%{_sbindir}/samba
-install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
+install -m644 packaging/Fedora/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/samba
-ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
-ln -s ../usr/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
 # pam_smbpass
@@ -269,9 +268,12 @@
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/editreg.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbsh.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
+#rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/testprns.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmount.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbmnt.8*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man8/smbumount.8*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -357,19 +359,13 @@
 
 %files client
 %defattr(-,root,root)
-/sbin/mount.smb
-/sbin/mount.smbfs
 /sbin/mount.cifs
 /sbin/umount.cifs
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
-%{_bindir}/smbmount
-%{_bindir}/smbmnt
-%{_bindir}/smbumount
 %{_bindir}/findsmb
-%{_mandir}/man8/smbmnt.8*
-%{_mandir}/man8/smbmount.8*
-%{_mandir}/man8/smbumount.8*
+%{_bindir}/smbget
+%{_bindir}/eventlogadm
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/mount.cifs.8*
 %{_mandir}/man8/umount.cifs.8*
@@ -386,6 +382,7 @@
 %{_mandir}/man1/smbclient.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/smbget.1*
 
 %files common
 %defattr(-,root,root)
@@ -396,8 +393,10 @@
 %{_libdir}/samba/lowcase.dat
 %{_libdir}/samba/upcase.dat
 %{_libdir}/samba/valid.dat
-%{_libdir}/samba/idmap/idmap_ad.so
-%{_libdir}/samba/idmap/idmap_rid.so
+%{_libdir}/samba/idmap/ad.so
+%{_libdir}/samba/idmap/rid.so
+%{_libdir}/samba/auth/script.so
+%{_libdir}/samba/libmsrpc.so
 %{_libdir}/libnss_wins.so
 /%{_lib}/libnss_wins.so.2
 %{_libdir}/libnss_winbind.so
@@ -408,6 +407,8 @@
 %{_libdir}/libsmbclient.so.0
 %{_libdir}/samba/charset/CP*.so
 %{_includedir}/libsmbclient.h
+%{_includedir}/libmsrpc.h
+
 %{_bindir}/net
 %{_bindir}/testparm
 %{_bindir}/smbpasswd
@@ -438,10 +439,16 @@
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/net.8*
 %{_mandir}/man1/vfstest.1*
-%{_mandir}/man8/pam_winbind.8*
-%{_mandir}/man8/libsmbclient.8*
+%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man7/libsmbclient.7*
 
 %changelog
+* Wed Jan 4 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21b-2
+- New upstream version.
+- Since the rawhide kernel has dropped support for smbfs, remove smbmount
+  and smbumount.  Users should use mount.cifs instead.
+- Upgrade to 3.0.21b
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:3.0.20b-2.1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	14 Nov 2005 16:17:56 -0000	1.28
+++ sources	13 Feb 2006 16:26:39 -0000	1.29
@@ -1 +1 @@
-39c0cae08fe0224cb003aa0af97d3050  samba-3.0.20b.tar.gz
+bb73dffb33f4a39386ef9f3e07ae28ff  samba-3.0.21b.tar.gz


--- samba-3.0.12pre1-logfiles.patch DELETED ---


--- samba-3.0.20pre1-smbspool.patch DELETED ---


--- samba-3.0.4-smb.conf.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:26:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:26:46 -0500
Subject: rpms/gnome-mount/devel .cvsignore, 1.4, 1.5 gnome-mount.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200602131626.k1DGQk8Y002892@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	.cvsignore gnome-mount.spec sources 
Log Message:
* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213
- new upstream snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jan 2006 20:25:41 -0000	1.4
+++ .cvsignore	13 Feb 2006 16:26:42 -0000	1.5
@@ -1,3 +1,4 @@
 gnome-mount-0.2.tar.gz
 gnome-mount-0.3.tar.gz
 gnome-mount-0.4-0.cvs20060117.tar.gz
+gnome-mount-0.4-0.cvs20060213.tar.gz


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-mount.spec	7 Feb 2006 18:29:51 -0000	1.6
+++ gnome-mount.spec	13 Feb 2006 16:26:42 -0000	1.7
@@ -1,10 +1,10 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060117.2
+Release: 0.cvs20060213
 License: GPL
 Group: Applications/System
-Source: %{name}-%{version}-0.cvs20060117.tar.gz
+Source: %{name}-%{version}-0.cvs20060213.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: hal >= 0.5.0
 Requires: dbus >= 0.60
@@ -58,6 +58,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213
+- new upstream snapshot
+
 * Tue Feb 07 2006 John (J5) Palmieri <johnp at redhat.com> - 0.4-0.cvs20060117.2
 - fix build
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2006 20:25:41 -0000	1.4
+++ sources	13 Feb 2006 16:26:42 -0000	1.5
@@ -1 +1 @@
-bc4542ecc2b22d4576fd14f0aec8344f  gnome-mount-0.4-0.cvs20060117.tar.gz
+a2d266e2ea88bc54eb22550354ea7789  gnome-mount-0.4-0.cvs20060213.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:27:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:27:37 -0500
Subject: rpms/samba/devel samba.spec,1.60,1.61
Message-ID: <200602131627.k1DGRbv1003338@cvs.devel.redhat.com>

Author: fenlason

Update of /cvs/dist/rpms/samba/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3205

Modified Files:
	samba.spec 
Log Message:
Correct the date on changelog entry



Index: samba.spec
===================================================================
RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- samba.spec	13 Feb 2006 16:26:39 -0000	1.60
+++ samba.spec	13 Feb 2006 16:27:32 -0000	1.61
@@ -443,7 +443,7 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %changelog
-* Wed Jan 4 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21b-2
+* Mon Feb 13 2006 Jay Fenlason <fenlason at redhat.com> 3.0.21b-2
 - New upstream version.
 - Since the rawhide kernel has dropped support for smbfs, remove smbmount
   and smbumount.  Users should use mount.cifs instead.



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:28:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:28:53 -0500
Subject: rpms/ypserv/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 ypserv-2.11-iface-binding3.patch, 1.2, 1.3 ypserv.spec,
	1.28, 1.29 ypserv-2.13-pie.patch, 1.1,
	NONE ypserv-2.13-zero-buffer.patch, 1.1, NONE
Message-ID: <200602131628.k1DGSrl6003922@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3889

Modified Files:
	.cvsignore sources ypserv-2.11-iface-binding3.patch 
	ypserv.spec 
Removed Files:
	ypserv-2.13-pie.patch ypserv-2.13-zero-buffer.patch 
Log Message:
Built for latest sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Sep 2004 15:21:39 -0000	1.11
+++ .cvsignore	13 Feb 2006 16:28:40 -0000	1.12
@@ -1 +1 @@
-ypserv-2.13.tar.bz2
+ypserv-2.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	9 Sep 2004 15:21:39 -0000	1.11
+++ sources	13 Feb 2006 16:28:40 -0000	1.12
@@ -1 +1 @@
-caa5e7b2af6f62d6051643cc1c00b5c8  ypserv-2.13.tar.bz2
+f6f856fc8143040ba8db61a1717ae815  ypserv-2.19.tar.bz2

ypserv-2.11-iface-binding3.patch:
 ypserv.8.in            |   16 +
 ypserv.c               |   74 +++++
 ypserv.c.iface_binding |  635 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 720 insertions(+), 5 deletions(-)

Index: ypserv-2.11-iface-binding3.patch
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv-2.11-iface-binding3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ypserv-2.11-iface-binding3.patch	14 Oct 2004 19:13:51 -0000	1.2
+++ ypserv-2.11-iface-binding3.patch	13 Feb 2006 16:28:40 -0000	1.3
@@ -50,9 +50,9 @@
 +#include <linux/if.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
- 
- #include "yp.h"
- #include "access.h"
+ #if defined(HAVE_RPC_SVC_SOC_H)
+ #include <rpc/svc_soc.h> /* for svcudp_create() */
+ #endif /* HAVE_RPC_SVC_SOC_H */
 @@ -60,6 +64,8 @@
  #define YPOLDVERS 1
  #endif


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ypserv.spec	11 Feb 2006 06:37:44 -0000	1.28
+++ ypserv.spec	13 Feb 2006 16:28:41 -0000	1.29
@@ -3,8 +3,8 @@
 Summary: The NIS (Network Information Service) server.
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
-Version: 2.13
-Release: 10.2
+Version: 2.19
+Release: 0
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -18,10 +18,8 @@
 Patch2: ypserv-2.5-nfsnobody2.patch
 Patch3: ypserv-2.11-nomap.patch
 Patch4: ypserv-2.11-iface-binding3.patch
-Patch5: ypserv-2.13-pie.patch
 Patch6: ypserv-2.13-yplib-memleak.patch
 Patch7: ypserv-2.13-ypxfr-zeroresp.patch
-Patch8: ypserv-2.13-zero-buffer.patch
 Obsoletes: yppasswd
 BuildRequires: gdbm-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -49,10 +47,8 @@
 %patch2 -p1 -b .nfsnobody
 %patch3 -p1 -b .nomap
 %patch4 -p1 -b .iface
-%patch5 -p1 -b .pie
 %patch6 -p1 -b .memleak
 %patch7 -p1 -b .respzero
-%patch8 -p1 -b .zero-buffer
 
 %build
 cp etc/README etc/README.etc
@@ -138,6 +134,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Mon Jan  9 2006 Chris Feist <cfeist at redhat.com> - 2.19-0
+- Rebuilt against latest upstream sources (2.19).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-10.2
 - bump again for double-long bug on ppc(64)
 


--- ypserv-2.13-pie.patch DELETED ---


--- ypserv-2.13-zero-buffer.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:33:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:33:43 -0500
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.7,1.8
Message-ID: <200602131633.k1DGXh2j004360@cvs.devel.redhat.com>

Author: davidz

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

Modified Files:
	gnome-mount.spec 
Log Message:
* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213.1
- fix build




Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-mount.spec	13 Feb 2006 16:26:42 -0000	1.7
+++ gnome-mount.spec	13 Feb 2006 16:33:26 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060213
+Release: 0.cvs20060213.1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}-0.cvs20060213.tar.gz
@@ -47,6 +47,7 @@
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_sysconfdir}/gconf/schemas/gnome-mount.schemas
+%{_datadir}/locale/*
 %{_bindir}/gnome-eject
 %{_bindir}/gnome-mount
 %{_bindir}/gnome-mount-properties
@@ -58,6 +59,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213.1
+- fix build
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213
 - new upstream snapshot
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:35:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:35:46 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.217, 1.218 anaconda.spec, 1.337,
	1.338 sources, 1.336, 1.337
Message-ID: <200602131635.k1DGZkUL004552@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4525/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.1-1 on branch devel from anaconda-10.92.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- .cvsignore	12 Feb 2006 17:23:02 -0000	1.217
+++ .cvsignore	13 Feb 2006 16:35:42 -0000	1.218
@@ -1 +1 @@
-anaconda-10.92.0.tar.bz2
+anaconda-10.92.1.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- anaconda.spec	12 Feb 2006 17:23:02 -0000	1.337
+++ anaconda.spec	13 Feb 2006 16:35:43 -0000	1.338
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.0
+Version: 10.92.1
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.1-1
+- try to fix x86_64 xen guest
+
 * Sun Feb 12 2006 Jeremy Katz <katzj at redhat.com> - 10.92.0-1
 - Fix length of package name in text install (dcantrel, #180469)
 - Various minor cleanups


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- sources	12 Feb 2006 17:23:02 -0000	1.336
+++ sources	13 Feb 2006 16:35:43 -0000	1.337
@@ -1 +1 @@
-9608623c72113123929eae1f46502b12  anaconda-10.92.0.tar.bz2
+3be1e4c4a7035ae1c314cfad3bd95458  anaconda-10.92.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:37:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:37:27 -0500
Subject: rpms/ypbind/devel .cvsignore, 1.9, 1.10 sources, 1.9,
	1.10 ypbind.spec, 1.23, 1.24 ypbind-mt-1.16-bindingrace.patch,
	1.1, NONE ypbind-mt-1.16-nullhandle.patch, 1.1, NONE
Message-ID: <200602131637.k1DGbRTl004895@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/ypbind/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4871

Modified Files:
	.cvsignore sources ypbind.spec 
Removed Files:
	ypbind-mt-1.16-bindingrace.patch 
	ypbind-mt-1.16-nullhandle.patch 
Log Message:
Rebuilt for latest version of ypbind.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	9 Sep 2004 15:19:34 -0000	1.9
+++ .cvsignore	13 Feb 2006 16:37:24 -0000	1.10
@@ -1 +1 @@
-ypbind-mt-1.17.2.tar.bz2
+ypbind-mt-1.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	9 Sep 2004 15:19:34 -0000	1.9
+++ sources	13 Feb 2006 16:37:24 -0000	1.10
@@ -1 +1 @@
-0cffc59ead490f0e03c3cb453e1c92e1  ypbind-mt-1.17.2.tar.bz2
+4878b742d61590501230aa8baa6a4f53  ypbind-mt-1.19.tar.bz2


Index: ypbind.spec
===================================================================
RCS file: /cvs/dist/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ypbind.spec	11 Feb 2006 06:37:29 -0000	1.23
+++ ypbind.spec	13 Feb 2006 16:37:24 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
-Version: 1.17.2
-Release: 5.2.1
+Version: 1.19
+Release: 0
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -9,8 +9,6 @@
 Source1: ypbind.init
 Patch1: ypbind-1.11-broadcast.patch
 Patch2: ypbind-1.11-gettextdomain.patch
-Patch3: ypbind-mt-1.16-bindingrace.patch
-Patch4: ypbind-mt-1.16-nullhandle.patch
 Prereq: /sbin/chkconfig
 Requires: portmap, yp-tools, bash >= 2.0
 Epoch: 3
@@ -37,8 +35,6 @@
 %setup -q -n ypbind-mt-%{version}
 %patch1 -p1 -b .broadcast
 %patch2 -p1 -b .fixit
-%patch3 -p1 -b .race
-%patch4 -p1 -b .nullhandle
 
 %build
 %configure --sbindir=/sbin
@@ -84,6 +80,9 @@
 %doc README NEWS
 
 %changelog
+* Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 3:1.19
+- Build for latest version of ypbind-mt
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3:1.17.2-5.2.1
 - bump again for double-long bug on ppc(64)
 


--- ypbind-mt-1.16-bindingrace.patch DELETED ---


--- ypbind-mt-1.16-nullhandle.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:37:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:37:51 -0500
Subject: rpms/ypserv/devel ypserv.spec,1.29,1.30
Message-ID: <200602131637.k1DGbpMv004997@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/ypserv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4961

Modified Files:
	ypserv.spec 
Log Message:
Fixed changelog entry with correct date.


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ypserv.spec	13 Feb 2006 16:28:41 -0000	1.29
+++ ypserv.spec	13 Feb 2006 16:37:48 -0000	1.30
@@ -134,7 +134,7 @@
 %{_includedir}/*/*
 
 %changelog
-* Mon Jan  9 2006 Chris Feist <cfeist at redhat.com> - 2.19-0
+* Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 2.19-0
 - Rebuilt against latest upstream sources (2.19).
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-10.2



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:42:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:42:14 -0500
Subject: rpms/hal/devel .cvsignore, 1.37, 1.38 hal.spec, 1.80, 1.81 sources,
	1.38, 1.39
Message-ID: <200602131642.k1DGgEFO031824@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31807

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-0.cvs20060213
- Upstream CVS snapshot. Drop a patch that is upstream. Switch to using
  udev rules instead of hotplug helpers for udev->hald channel.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	17 Jan 2006 14:47:00 -0000	1.37
+++ .cvsignore	13 Feb 2006 16:42:12 -0000	1.38
@@ -25,3 +25,4 @@
 hal-0.5.5.1.cvs20060109.tar.gz
 hal-0.5.6.tar.gz
 hal-0.5.5.1.cvs20060111.tar.gz
+hal-0.5.7-0.cvs20060213.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- hal.spec	7 Feb 2006 12:12:05 -0000	1.80
+++ hal.spec	13 Feb 2006 16:42:12 -0000	1.81
@@ -17,12 +17,11 @@
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.6
-Release: 3.1 
+Version: 0.5.7
+Release: 0.cvs20060213
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
-Patch0: hal-0.5.6-eject-audio-cd.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -81,12 +80,10 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .eject-audio-cd
 
 %build
 
-%configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab
-make
+%configure --disable-docbook-docs --with-os-type=redhat
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -130,7 +127,6 @@
 
 %dir %{_sysconfdir}/hal
 %{_sysconfdir}/hal/*
-/etc/hotplug.d/default/20-hal.hotplug
 
 %{_sbindir}/hald
 
@@ -151,9 +147,11 @@
 %{_datadir}/hal/scripts/*
 %{_datadir}/hal/fdi/*
 %{_datadir}/locale/*
-%{_datadir}/man/*
 %{_datadir}/doc/hal-%{version}/conf/*
 
+%{_sysconfdir}/udev/rules.d/90-hal.rules
+%{_bindir}/hal-system-power-pmu
+
 %files devel
 %defattr(-,root,root)
 
@@ -173,6 +171,10 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-0.cvs20060213
+- Upstream CVS snapshot. Drop a patch that is upstream. Switch to using
+  udev rules instead of hotplug helpers for udev->hald channel.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.5.6-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	17 Jan 2006 14:47:00 -0000	1.38
+++ sources	13 Feb 2006 16:42:12 -0000	1.39
@@ -1 +1 @@
-1e494b4319bbdfeb25224f914e34d0d3  hal-0.5.6.tar.gz
+d112d5ae66aacfb3d600581f3dd8b78f  hal-0.5.7-0.cvs20060213.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:42:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:42:58 -0500
Subject: rpms/yp-tools/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 yp-tools.spec, 1.19, 1.20 yp-tools-2.8-overrun.patch, 1.1, NONE
Message-ID: <200602131642.k1DGgwuZ031900@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/yp-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31883

Modified Files:
	.cvsignore sources yp-tools.spec 
Removed Files:
	yp-tools-2.8-overrun.patch 
Log Message:
Updated to latest yp-tools sources>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Sep 2004 15:13:15 -0000	1.6
+++ .cvsignore	13 Feb 2006 16:42:56 -0000	1.7
@@ -1 +1 @@
-yp-tools-2.8.tar.bz2
+yp-tools-2.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Sep 2004 15:13:15 -0000	1.6
+++ sources	13 Feb 2006 16:42:56 -0000	1.7
@@ -1 +1 @@
-4a6792c367a3e01e4af7b07f449039e9  yp-tools-2.8.tar.bz2
+19de06a04129ec26773f9198e086fcd4  yp-tools-2.9.tar.bz2


Index: yp-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/yp-tools/devel/yp-tools.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- yp-tools.spec	11 Feb 2006 06:37:54 -0000	1.19
+++ yp-tools.spec	13 Feb 2006 16:42:56 -0000	1.20
@@ -1,13 +1,12 @@
 Summary: NIS (or YP) client programs.
 Name: yp-tools
-Version: 2.8
-Release: 8.2.1
+Version: 2.9
+Release: 0
 License: GPL
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/yp-tools/index.html
 Patch1: yp-tools-2.7-md5.patch
-Patch2: yp-tools-2.8-overrun.patch
 Obsoletes: yppasswd, yp-clients
 Requires: ypbind
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -35,7 +34,6 @@
 %prep
 %setup -q
 %patch1 -p1 -b .md5
-%patch2 -p1 -b .overflow
 
 %build
 %configure --disable-domainname
@@ -61,7 +59,7 @@
 %dir /var/yp
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8-8.2.1
+* Mon Feb 13 2006 Chris Feist <cfeist at redhat.com> - 2.9-0
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.8-8.2


--- yp-tools-2.8-overrun.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:43:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:43:15 -0500
Subject: rpms/xterm/FC-4 xterm-208-bz180450.patch,NONE,1.1
Message-ID: <200602131643.k1DGhFF2031959@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	xterm-208-bz180450.patch 
Log Message:
fix bug 180450: disallow Bell() if term widget not realized yet

xterm-208-bz180450.patch:
 misc.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE xterm-208-bz180450.patch ---
--- xterm-208/misc.c.bz180450	2006-01-03 21:10:25.000000000 -0500
+++ xterm-208/misc.c	2006-02-13 11:36:39.000000000 -0500
@@ -512,6 +512,10 @@
 
     TRACE(("BELL %d\n", percent));
 
+    if (!XtIsRealized((Widget) term)) {
+	return;
+    }
+
     /* has enough time gone by that we are allowed to ring
        the bell again? */
     if (screen->bellSuppressTime) {



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:44:07 -0500
Subject: rpms/xterm/FC-4 xterm-208-root-grab-console.patch,NONE,1.1
Message-ID: <200602131644.k1DGi77m032016@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	xterm-208-root-grab-console.patch 
Log Message:
allow root user to redirect console, even if /dev/console owned by other user

xterm-208-root-grab-console.patch:
 main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xterm-208-root-grab-console.patch ---
--- xterm-208/main.c.root-grab-console	2006-01-03 21:10:25.000000000 -0500
+++ xterm-208/main.c	2006-01-17 15:09:42.000000000 -0500
@@ -2055,11 +2055,12 @@
 #ifndef __sgi
 	    {
 		struct stat sbuf;
+		uid_t my_uid = getuid();
 
 		/* Must be owner and have read/write permission.
 		   xdm cooperates to give the console the right user. */
 		if (!stat("/dev/console", &sbuf) &&
-		    (sbuf.st_uid == getuid()) &&
+		    ((my_uid==0) || (sbuf.st_uid == my_uid)) &&
 		    !access("/dev/console", R_OK | W_OK)) {
 		    Console = True;
 		} else



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:45:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:45:10 -0500
Subject: rpms/hal/devel hal.spec,1.81,1.82
Message-ID: <200602131645.k1DGjAOt032071@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32057

Modified Files:
	hal.spec 
Log Message:
fix build


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- hal.spec	13 Feb 2006 16:42:12 -0000	1.81
+++ hal.spec	13 Feb 2006 16:45:07 -0000	1.82
@@ -18,9 +18,9 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 0.cvs20060213
+Release: 0.cvs20060213.1
 URL: http://www.freedesktop.org/Software/hal
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}-0.cvs20060213.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -171,6 +171,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-0.cvs20060213.1
+- fix build
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-0.cvs20060213
 - Upstream CVS snapshot. Drop a patch that is upstream. Switch to using
   udev rules instead of hotplug helpers for udev->hald channel.



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:46:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:46:04 -0500
Subject: rpms/xterm/FC-4 xterm-resources-redhat.patch,1.7,1.8
Message-ID: <200602131646.k1DGk43e032135@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	xterm-resources-redhat.patch 
Log Message:
rebase for v208; restore default scrollBar:1 setting

xterm-resources-redhat.patch:
 XTerm.ad |    5 +++++
 1 files changed, 5 insertions(+)

Index: xterm-resources-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm-resources-redhat.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xterm-resources-redhat.patch	22 Nov 2005 23:30:56 -0000	1.7
+++ xterm-resources-redhat.patch	13 Feb 2006 16:45:58 -0000	1.8
@@ -1,9 +1,11 @@
---- xterm-207/XTerm.ad.resources-redhat	2005-11-03 08:17:27.000000000 -0500
-+++ xterm-207/XTerm.ad	2005-11-22 18:26:56.000000000 -0500
-@@ -183,3 +183,6 @@
- ! Set a border for the menus to make them simpler to distinguish against the
- ! vt100 widget:
- *SimpleMenu*borderWidth: 2
+--- xterm-208/XTerm.ad.redhat-resources	2006-01-03 21:10:17.000000000 -0500
++++ xterm-208/XTerm.ad	2006-01-17 15:05:24.000000000 -0500
+@@ -186,3 +186,8 @@
+ 
+ ! Here is a pattern that is useful for double-clicking on a URL:
+ *charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,126:48
 +
++! Red Hat Defaults:
 +*VT100*eightBitInput: 0
 +*VT100*backarrowKey:  0
++*VT100*scrollBar:     1



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:46:17 -0500
Subject: rpms/fence/devel fence.spec,1.23,1.24
Message-ID: <200602131646.k1DGkHRs032683@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/fence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32516

Modified Files:
	fence.spec 
Log Message:
Re-synced w/ RHEL-4


Index: fence.spec
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fence.spec	11 Feb 2006 02:42:30 -0000	1.23
+++ fence.spec	13 Feb 2006 16:46:14 -0000	1.24
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: fence
-Version: 1.32.10
-Release: 0.FC5.1.2
+Version: 1.32.17
+Release: 0.FC5.0
 License: GPL
 Group: System Environment/Base
 Summary: fence - The cluster I/O fencing system
@@ -38,7 +38,7 @@
 %build
 ./configure --mandir=%{_mandir}
 sed -i '/RELEASE_MAJOR/s/= .*/= 1/' make/defines.mk
-sed -i '/RELEASE_MINOR/s/= .*/= 32.7/' make/defines.mk
+sed -i '/RELEASE_MINOR/s/= .*/= 32.1/' make/defines.mk
 sed -i '/RELEASE /s/= .*/= %version/' make/defines.mk
 make
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:46:49 -0500
Subject: rpms/xterm/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xterm.spec,
	1.17, 1.18
Message-ID: <200602131646.k1DGknj2003180@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	.cvsignore sources xterm.spec 
Log Message:
Upgrade to v208; fix bug 180450


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Nov 2005 23:37:26 -0000	1.7
+++ .cvsignore	13 Feb 2006 16:46:47 -0000	1.8
@@ -3,3 +3,4 @@
 xterm-205.tgz
 xterm-205.tgz.asc
 xterm-207.tgz
+xterm-208.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Nov 2005 23:37:26 -0000	1.7
+++ sources	13 Feb 2006 16:46:47 -0000	1.8
@@ -1 +1 @@
-3de8a3756c284a46a08c6d0308909486  xterm-207.tgz
+a062d0b398918015d07c31ecdcc5111a  xterm-208.tgz


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xterm.spec	21 Dec 2005 22:26:58 -0000	1.17
+++ xterm.spec	13 Feb 2006 16:46:47 -0000	1.18
@@ -3,8 +3,8 @@
 
 Summary: xterm terminal emulator for the X Window System
 Name: xterm
-Version: 207
-Release: 2.FC4
+Version: 208
+Release: 1.FC4
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -15,6 +15,8 @@
 Patch2: xterm-179-ppc-fix-bug-101472.patch
 Patch3: xterm-tty-group-name.patch
 Patch4: xterm-appsdir.patch
+Patch5: xterm-208-root-grab-console.patch
+Patch6: xterm-208-bz180450.patch
 BuildRequires: xorg-x11-devel >= 6.7.0
 BuildRequires: utempter libtermcap-devel
 
@@ -35,6 +37,8 @@
 %endif
 %patch3 -p1 -b .tty-group-name
 %patch4 -p1 -b .appsdir
+%patch5 -p1 -b .root-grab-console
+%patch6 -p1 -b .bz180450
 
 %{?!_with_256_color: %define _with_256_color 1}
 %{?!_with_tek4014: %define _with_tek4014 1}
@@ -88,6 +92,11 @@
 %{_x11bindir}/xterm
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 208-1.FC4
+- Upgrade to upstream version 208
+- fix bug 180450: disallow Bell() generation before 
+  'term' widget is realized
+
 * Wed Dec 21 2005 Jason Vas Dias <jvdias at redhat.com> - 207-2.FC4
 - Fix bug 164210: tek4014 support should be enabled by default
 - Fix bug 175684: compile with --enable-256-color



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:48:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:48:48 -0500
Subject: rpms/fence/devel .cvsignore, 1.3, 1.4 fence.spec, 1.24, 1.25 sources,
	1.7, 1.8
Message-ID: <200602131648.k1DGmlJo012387@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/fence/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12370

Modified Files:
	.cvsignore fence.spec sources 
Log Message:
Use new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2004 04:40:19 -0000	1.3
+++ .cvsignore	13 Feb 2006 16:48:45 -0000	1.4
@@ -1 +1 @@
-fence-1.0.tar.gz
+fence-1.32.17.tar.gz


Index: fence.spec
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/fence.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fence.spec	13 Feb 2006 16:46:14 -0000	1.24
+++ fence.spec	13 Feb 2006 16:48:45 -0000	1.25
@@ -12,7 +12,7 @@
 
 Name: fence
 Version: 1.32.17
-Release: 0.FC5.0
+Release: 0.FC5.1
 License: GPL
 Group: System Environment/Base
 Summary: fence - The cluster I/O fencing system


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fence/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Dec 2005 23:34:28 -0000	1.7
+++ sources	13 Feb 2006 16:48:45 -0000	1.8
@@ -1 +1 @@
-1aabd64ef0eb3c1aacc0a0a981520eaf  fence-1.32.10.tar.gz
+1edc92581f3b2d6fd5bbf0f2294e90f2  fence-1.32.17.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:52:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:52:59 -0500
Subject: rpms/rgmanager/devel .cvsignore, 1.3, 1.4 rgmanager.spec, 1.21,
	1.22 sources, 1.8, 1.9
Message-ID: <200602131652.k1DGqx7j012508@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/rgmanager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12493

Modified Files:
	.cvsignore rgmanager.spec sources 
Log Message:
Sync'ed w/ RHEL-4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 19:57:50 -0000	1.3
+++ .cvsignore	13 Feb 2006 16:52:55 -0000	1.4
@@ -1,2 +1 @@
-rgmanager-1.9.2.tar.gz
-rgmanager-1.9.31.tar.gz
+rgmanager-1.9.46.tar.gz


Index: rgmanager.spec
===================================================================
RCS file: /cvs/dist/rpms/rgmanager/devel/rgmanager.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rgmanager.spec	7 Feb 2006 13:43:53 -0000	1.21
+++ rgmanager.spec	13 Feb 2006 16:52:57 -0000	1.22
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: rgmanager
-Version: 1.9.44
-Release: 0.FC5.1.1
+Version: 1.9.46
+Release: 0.FC5.0
 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Dec 2005 22:12:21 -0000	1.8
+++ sources	13 Feb 2006 16:52:57 -0000	1.9
@@ -1 +1 @@
-c8035eb8f06c3d894aa51143904d15ea  rgmanager-1.9.44.tar.gz
+323f9b74c62b14223012c9676f83a4d4  rgmanager-1.9.46.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:54:30 -0500
Subject: rpms/ccs/devel .cvsignore, 1.4, 1.5 ccs.spec, 1.33, 1.34 sources,
	1.8, 1.9
Message-ID: <200602131654.k1DGsUEv012626@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/ccs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12612

Modified Files:
	.cvsignore ccs.spec sources 
Log Message:
Sync'ed w/ RHEL-4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Oct 2004 21:23:04 -0000	1.4
+++ .cvsignore	13 Feb 2006 16:54:28 -0000	1.5
@@ -1 +1 @@
-ccs-0.7.tar.gz
+ccs-1.0.3.tar.gz


Index: ccs.spec
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ccs.spec	11 Feb 2006 02:14:08 -0000	1.33
+++ ccs.spec	13 Feb 2006 16:54:28 -0000	1.34
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: ccs
-Version: 1.0.2
-Release: 3.2.1
+Version: 1.0.3
+Release: 0.1
 License: GPL
 Group: System Environment/Base
 Summary: CCS - The Cluster Configuration System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Nov 2005 23:00:59 -0000	1.8
+++ sources	13 Feb 2006 16:54:28 -0000	1.9
@@ -1 +1 @@
-f3450c50e596474d525f23940875927c  ccs-1.0.2.tar.gz
+7679958d55643807d05ecafa48f07934  ccs-1.0.3.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:55:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:55:03 -0500
Subject: rpms/ccs/devel ccs.spec,1.34,1.35
Message-ID: <200602131655.k1DGt3FX012689@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/ccs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12675

Modified Files:
	ccs.spec 
Log Message:
Bumped rev.


Index: ccs.spec
===================================================================
RCS file: /cvs/dist/rpms/ccs/devel/ccs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ccs.spec	13 Feb 2006 16:54:28 -0000	1.34
+++ ccs.spec	13 Feb 2006 16:55:00 -0000	1.35
@@ -12,7 +12,7 @@
 
 Name: ccs
 Version: 1.0.3
-Release: 0.1
+Release: 0.2
 License: GPL
 Group: System Environment/Base
 Summary: CCS - The Cluster Configuration System



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:56:26 -0500
Subject: rpms/magma/devel .cvsignore, 1.5, 1.6 magma.spec, 1.27, 1.28 sources,
	1.11, 1.12
Message-ID: <200602131656.k1DGuQ3t012795@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/magma/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12778

Modified Files:
	.cvsignore magma.spec sources 
Log Message:
Sync'ed w/ RHEL-4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/magma/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2004 21:26:48 -0000	1.5
+++ .cvsignore	13 Feb 2006 16:56:24 -0000	1.6
@@ -1 +1 @@
-magma-1.0-pre2.tar.gz
+magma-1.0.4.tar.gz


Index: magma.spec
===================================================================
RCS file: /cvs/dist/rpms/magma/devel/magma.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- magma.spec	11 Feb 2006 04:27:25 -0000	1.27
+++ magma.spec	13 Feb 2006 16:56:24 -0000	1.28
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: magma
-Version: 1.0.3
-Release: 3.2.1
+Version: 1.0.4
+Release: 0.1
 License: GPL
 Group: System Environment/Libraries
 Summary: A cluster/lock manager API abstraction library


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/magma/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	15 Nov 2005 17:45:15 -0000	1.11
+++ sources	13 Feb 2006 16:56:24 -0000	1.12
@@ -1 +1 @@
-6709733255ab9ebe445f173e18ff400e  magma-1.0.3.tar.gz
+845ee1011b7a754325a69ef386d6944d  magma-1.0.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:57:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:57:16 -0500
Subject: rpms/eclipse-bugzilla/devel .cvsignore, 1.4,
	1.5 eclipse-bugzilla.spec, 1.32, 1.33 sources, 1.16, 1.17
Message-ID: <200602131657.k1DGvGl9012862@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12840

Modified Files:
	.cvsignore eclipse-bugzilla.spec sources 
Log Message:
* Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1
- Updated to 0.2.1 which includes xmlrpc.jar, %prep section now
removes  this file and symlinks it to /usr/share/xmlrpc.jar.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2006 22:39:03 -0000	1.4
+++ .cvsignore	13 Feb 2006 16:57:11 -0000	1.5
@@ -1 +1 @@
-eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz
+eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eclipse-bugzilla.spec	11 Feb 2006 02:29:17 -0000	1.32
+++ eclipse-bugzilla.spec	13 Feb 2006 16:57:12 -0000	1.33
@@ -8,7 +8,7 @@
 %define	version_major		0
 %define version_minor		2
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	0
+%define version_micro   	1
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -21,8 +21,8 @@
 
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
-Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	2.1
+Version: 	%{version_majmin}.%{version_micro}
+Release:	1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -72,6 +72,10 @@
 %prep
 %setup -q -c 
 
+# Change .jar to symlink
+rm -f plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
+ln -sf %{_datadir}/java/xmlrpc.jar  plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
+
 %build
 
 # See comments in the script to understand this.
@@ -139,6 +143,10 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1
+- Updated to 0.2.1 which includes xmlrpc.jar, %prep section now
+removes  this file and symlinks it to /usr/share/xmlrpc.jar.
+
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2.1
 - Release bump to build.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	10 Feb 2006 22:52:31 -0000	1.16
+++ sources	13 Feb 2006 16:57:12 -0000	1.17
@@ -1 +1 @@
-b29442560c52e70bafd2447f281d83d1  eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz
+ab8157afad29507ec05063d2f5d43de8  eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:58:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:58:04 -0500
Subject: rpms/m17n-db/devel .cvsignore, 1.4, 1.5 m17n-db.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200602131658.k1DGw4lB012927@cvs.devel.redhat.com>

Author: petersen

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

Modified Files:
	.cvsignore m17n-db.spec sources 
Log Message:
- add Indian input maps ported from scim-tables
- add Nepali subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2006 02:44:08 -0000	1.4
+++ .cvsignore	13 Feb 2006 16:58:02 -0000	1.5
@@ -1 +1,2 @@
 m17n-db-1.3.2.tar.gz
+m17n-db-indic-0.1.tar.gz


Index: m17n-db.spec
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- m17n-db.spec	10 Feb 2006 02:44:08 -0000	1.5
+++ m17n-db.spec	13 Feb 2006 16:58:02 -0000	1.6
@@ -1,11 +1,12 @@
 Name:		m17n-db
 Summary:	Multilingualization datafiles for m17n-lib
 Version:	1.3.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.m17n.org/m17n-lib/index.html
 Source0:	%{name}-%{version}.tar.gz
+Source1:	%{name}-indic-0.1.tar.gz
 BuildArch: 	noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -233,6 +234,14 @@
 m17n-db Myanmar input map.
 
 
+%package nepali
+Summary:	m17n-db input tables for Nepali
+Group:		System Environment/Libraries
+
+%description nepali
+m17n-db Nepali input maps.
+
+
 %package oriya
 Summary:	m17n-db input table for Oriya
 Group:		System Environment/Libraries
@@ -338,7 +347,7 @@
 
 
 %prep
-%setup -q
+%setup -q -a1
 
 
 %build
@@ -350,6 +359,10 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+# add new Indic maps
+cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n
+cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons
+
 # don't need ispell or anthy
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png}
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png}
@@ -563,6 +576,13 @@
 %{_datadir}/m17n/icons/my-*.png
 
 
+%files nepali
+%defattr(-,root,root)
+%dir %{_datadir}/m17n
+%{_datadir}/m17n/ne-*.mim
+%{_datadir}/m17n/icons/ne-*.png
+
+
 %files oriya
 %defattr(-,root,root)
 %dir %{_datadir}/m17n
@@ -655,6 +675,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-2
+- add Indian input maps ported from scim-tables
+- add Nepali subpackage
+
 * Fri Feb 10 2006 Jens Petersen <petersen at redhat.com> - 1.3.2-1
 - update to 1.3.2 bugfix release
 - do not include ja-anthy.mim input map


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2006 02:44:08 -0000	1.4
+++ sources	13 Feb 2006 16:58:02 -0000	1.5
@@ -1 +1,2 @@
 dae9f012cef26f8d58861e169f1d0b0f  m17n-db-1.3.2.tar.gz
+ebd752746a32d3f71f86ed3c1a7102c2  m17n-db-indic-0.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:58:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:58:25 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.33,1.34
Message-ID: <200602131658.k1DGwPSu013018@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12989

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1.1
- Updated source file.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- eclipse-bugzilla.spec	13 Feb 2006 16:57:12 -0000	1.33
+++ eclipse-bugzilla.spec	13 Feb 2006 16:58:23 -0000	1.34
@@ -8,7 +8,7 @@
 %define	version_major		0
 %define version_minor		2
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	1
+%define version_micro   	1.1
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -46,7 +46,7 @@
 #     -buildfile build.xml -Dbasedir=`pwd` 
 #     -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.1.2/scripts/
 #     -DdontUnzip=true fetch 
-Source0: eclipse-bugzilla-fetched-R0_2_0-0.2.0.tar.gz
+Source0: eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz
 
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
@@ -143,6 +143,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1.1
+- Updated source file.
+
 * Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1
 - Updated to 0.2.1 which includes xmlrpc.jar, %prep section now
 removes  this file and symlinks it to /usr/share/xmlrpc.jar.



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:59:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:59:31 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.34,1.35
Message-ID: <200602131659.k1DGxVZ5013143@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13126

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
Removed % from prep in changelog error


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eclipse-bugzilla.spec	13 Feb 2006 16:58:23 -0000	1.34
+++ eclipse-bugzilla.spec	13 Feb 2006 16:59:23 -0000	1.35
@@ -8,7 +8,7 @@
 %define	version_major		0
 %define version_minor		2
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	1.1
+%define version_micro   	1.2
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -147,7 +147,7 @@
 - Updated source file.
 
 * Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1
-- Updated to 0.2.1 which includes xmlrpc.jar, %prep section now
+- Updated to 0.2.1 which includes xmlrpc.jar, prep section now
 removes  this file and symlinks it to /usr/share/xmlrpc.jar.
 
 * Fri Feb 10 2006 Igor Foox <ifoox at redhat.com> 0.2.0-2.1



From fedora-cvs-commits at redhat.com  Mon Feb 13 16:59:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 11:59:55 -0500
Subject: rpms/GFS/devel .cvsignore, 1.5, 1.6 GFS.spec, 1.23, 1.24 sources,
	1.14, 1.15
Message-ID: <200602131659.k1DGxtAD013211@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13195

Modified Files:
	.cvsignore GFS.spec sources 
Log Message:
Synced to RHEL-4


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/GFS/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Apr 2005 19:57:43 -0000	1.5
+++ .cvsignore	13 Feb 2006 16:59:51 -0000	1.6
@@ -1,2 +1 @@
-gfs-6.1-pre2.tar.gz
-gfs-6.1-pre22.tar.gz
+gfs-6.1.5.tar.gz


Index: GFS.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS/devel/GFS.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- GFS.spec	7 Feb 2006 11:46:32 -0000	1.23
+++ GFS.spec	13 Feb 2006 16:59:51 -0000	1.24
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: GFS
-Version: 6.1.4
-Release: 0.FC5.1.1
+Version: 6.1.5
+Release: 0.FC5.1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS - The Global File System


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Dec 2005 23:16:40 -0000	1.14
+++ sources	13 Feb 2006 16:59:51 -0000	1.15
@@ -1 +1 @@
-d8cbe36200ffb64989576cbb59567730  gfs-6.1.4.tar.gz
+9fe79249a1fb60114ba91cad99fce9ab  gfs-6.1.5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:07:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:07:18 -0500
Subject: rpms/libuser/devel .cvsignore, 1.34, 1.35 libuser.spec, 1.48,
	1.49 sources, 1.36, 1.37
Message-ID: <200602131707.k1DH7IDL013425@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13408

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Mon Feb 13 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.4-1
- New release with updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	2 Dec 2005 17:57:06 -0000	1.34
+++ .cvsignore	13 Feb 2006 17:07:15 -0000	1.35
@@ -1 +1 @@
-libuser-0.54.3.tar.gz
+libuser-0.54.4.tar.gz


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- libuser.spec	11 Feb 2006 04:15:20 -0000	1.48
+++ libuser.spec	13 Feb 2006 17:07:15 -0000	1.49
@@ -4,8 +4,8 @@
 %define python %(%{__python} -c "import sys; print sys.version[:3]")
 
 Name: libuser
-Version: 0.54.3
-Release: 1.2.1
+Version: 0.54.4
+Release: 1
 Group: System Environment/Base
 License: LGPL
 Source: libuser-%{version}.tar.gz
@@ -96,6 +96,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Feb 13 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.4-1
+- New release with updated translations
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.54.3-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	2 Dec 2005 17:57:06 -0000	1.36
+++ sources	13 Feb 2006 17:07:15 -0000	1.37
@@ -1 +1 @@
-a01b5191e9f84a16740654d7bf1d2ec7  libuser-0.54.3.tar.gz
+9df2502283bbd5657d8d1c600b798ee5  libuser-0.54.4.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:11:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:11:28 -0500
Subject: rpms/xterm/devel xterm-209-redhat-resources.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xterm.spec,
	1.36, 1.37
Message-ID: <200602131711.k1DHBSwm013547@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13532

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-209-redhat-resources.patch 
Log Message:
Upgrade to upstream version 209

xterm-209-redhat-resources.patch:
 XTerm.ad |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE xterm-209-redhat-resources.patch ---
--- xterm-209/XTerm.ad.redhat-resources	2006-02-12 20:14:58.000000000 -0500
+++ xterm-209/XTerm.ad	2006-02-13 11:27:08.000000000 -0500
@@ -185,3 +185,8 @@
 !
 ! Alternatively,
 !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*backarrowKey:  0
+*VT100*scrollBar:     1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Jan 2006 20:41:21 -0000	1.10
+++ .cvsignore	13 Feb 2006 17:11:25 -0000	1.11
@@ -8,3 +8,4 @@
 UnicodeData-Latest.txt.gz
 16colors.txt
 xterm-208.tgz
+xterm-209.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Jan 2006 20:41:21 -0000	1.10
+++ sources	13 Feb 2006 17:11:26 -0000	1.11
@@ -1,4 +1,4 @@
-a062d0b398918015d07c31ecdcc5111a  xterm-208.tgz
+c75cdbf9395bbc2cd69863fbe7c2e019  xterm-209.tgz
 0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
 92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xterm.spec	11 Feb 2006 06:36:28 -0000	1.36
+++ xterm.spec	13 Feb 2006 17:11:26 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 208
-Release: 1.2
+Version: 209
+Release: 1
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -17,7 +17,7 @@
 Patch4: xterm-206-appsdir.patch
 Patch5: xterm-207-freetype.patch
 Patch6: xterm-207-eightBitInput_false.patch
-Patch7: xterm-208-redhat-resources.patch
+Patch7: xterm-209-redhat-resources.patch
 Patch8: xterm-208-root-grab-console.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
@@ -105,6 +105,9 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 209-1
+- Upgrade to upstream version 209 (fixes bug 180450)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 208-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:14:32 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.3,
	1.4 selinux-policy.spec, 1.104, 1.105
Message-ID: <200602131714.k1DHEWFK013617@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13602

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 build.conf                                |    6 +--
 policy/mcs                                |   13 +++++-
 policy/modules/admin/kudzu.te             |    2 -
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/su.if                |    7 +--
 policy/modules/kernel/bootloader.te       |    4 +-
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.if          |   19 ++++++++++
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/domain.te           |    4 +-
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/files.if            |    2 -
 policy/modules/kernel/filesystem.if       |   57 ++++++++++++++++++++++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/kernel/terminal.if         |    2 -
 policy/modules/services/apache.fc         |    4 ++
 policy/modules/services/automount.if      |   18 +++++++++
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/cron.if           |    2 -
 policy/modules/services/cron.te           |    1 
 policy/modules/services/fetchmail.te      |    1 
 policy/modules/services/hal.te            |   11 +++++
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    5 ++
 policy/modules/services/networkmanager.te |    7 ++-
 policy/modules/services/postfix.te        |    6 +++
 policy/modules/services/remotelogin.te    |   28 +-------------
 policy/modules/services/sendmail.te       |    1 
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/fstools.te          |    2 +
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.if        |   20 ++++++++++
 policy/modules/system/libraries.te        |    1 
 policy/modules/system/locallogin.te       |    4 --
 policy/modules/system/logging.te          |    4 +-
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 +++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   52 +++++++++++++++++++++++++++
 policy/modules/system/udev.te             |    4 +-
 policy/modules/system/unconfined.if       |    4 +-
 policy/modules/system/unconfined.te       |    6 +++
 policy/modules/system/userdomain.if       |   19 ++++++++++
 policy/modules/system/userdomain.te       |   13 ++++++
 48 files changed, 348 insertions(+), 53 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policy-20060207.patch	13 Feb 2006 15:55:10 -0000	1.3
+++ policy-20060207.patch	13 Feb 2006 17:14:30 -0000	1.4
@@ -561,7 +561,7 @@
  kernel_read_network_state(NetworkManager_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.14/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-13 12:08:11.000000000 -0500
 @@ -273,6 +273,8 @@
  corecmd_exec_shell(postfix_local_t)
  corecmd_exec_bin(postfix_local_t)
@@ -571,7 +571,15 @@
  mta_read_aliases(postfix_local_t)
  mta_delete_spool(postfix_local_t)
  # For reading spamassasin
-@@ -411,6 +413,9 @@
+@@ -394,6 +396,7 @@
+ 
+ allow postfix_pipe_t postfix_private_t:dir search;
+ allow postfix_pipe_t postfix_private_t:sock_file write;
++allow postfix_pipe_t postfix_public_t:fifo_file { getattr write };
+ 
+ allow postfix_pipe_t postfix_spool_t:dir search;
+ allow postfix_pipe_t postfix_spool_t:file rw_file_perms;
+@@ -411,6 +414,9 @@
  allow postfix_postdrop_t self:capability sys_resource;
  allow postfix_postdrop_t self:tcp_socket create;
  allow postfix_postdrop_t self:udp_socket create_socket_perms;


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- selinux-policy.spec	13 Feb 2006 15:55:10 -0000	1.104
+++ selinux-policy.spec	13 Feb 2006 17:14:30 -0000	1.105
@@ -6,7 +6,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.14
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -25,6 +25,9 @@
 Source12: setrans-strict.conf
 Source13: policygentool
 Source14: Makefile.devel
+Source15: users_extra-targeted
+Source16: users_extra-strict
+Source17: users_extra-mls
 
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/serefpolicy-buildroot
@@ -72,11 +75,13 @@
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
+touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/users_extra \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 ${RPM_SOURCE_DIR}/seusers-%1 ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/modules/active/seusers \
+install -m0644 ${RPM_SOURCE_DIR}/users_extra-%1 ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/modules/active/users_extra \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/setrans.conf \
 %nil
 
@@ -90,9 +95,11 @@
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
+%ghost %{_sysconfdir}/selinux/%1/users_extra \
 %dir %{_sysconfdir}/selinux/%1/modules \
 %attr(700,root,root) %dir %{_sysconfdir}/selinux/%1/modules/active \
 %verify(not md5 size mtime) %attr(600,root,root) %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
+%verify(not md5 size mtime) %attr(600,root,root) %{_sysconfdir}/selinux/%1/modules/active/users_extra \
 %dir %{_sysconfdir}/selinux/%1/policy/ \
 %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \
 %dir %{_sysconfdir}/selinux/%1/contexts \
@@ -295,6 +302,9 @@
 
 %changelog
 
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.14-2
+- Add users_extra files
+
 * Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 2.2.14-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:17:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:17:59 -0500
Subject: rpms/gnopernicus/devel .cvsignore, 1.28, 1.29 gnopernicus.spec, 1.39,
	1.40 sources, 1.28, 1.29
Message-ID: <200602131717.k1DHHxnt020797@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20341

Modified Files:
	.cvsignore gnopernicus.spec sources 
Log Message:
1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	31 Jan 2006 04:15:50 -0000	1.28
+++ .cvsignore	13 Feb 2006 17:17:55 -0000	1.29
@@ -17,3 +17,4 @@
 gnopernicus-0.12.0.tar.bz2
 gnopernicus-1.0.0.tar.bz2
 gnopernicus-1.0.1.tar.bz2
+gnopernicus-1.0.2.tar.bz2


Index: gnopernicus.spec
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnopernicus.spec	11 Feb 2006 03:18:42 -0000	1.39
+++ gnopernicus.spec	13 Feb 2006 17:17:55 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: GNOME screen reader
 Name: gnopernicus
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.baum.ro/gnopernicus.html
@@ -100,6 +100,9 @@
 %{_includedir}/gnopernicus-1.0
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen 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
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	31 Jan 2006 04:15:50 -0000	1.28
+++ sources	13 Feb 2006 17:17:55 -0000	1.29
@@ -1 +1 @@
-8467c0ecf7af3bba313c2869c77d0243  gnopernicus-1.0.1.tar.bz2
+197a8d018b9680bfc2baedc96afda8de  gnopernicus-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:18:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:18:52 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.35,1.36
Message-ID: <200602131718.k1DHIqrQ021841@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21390

Modified Files:
	eclipse-bugzilla.spec 
Log Message:



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- eclipse-bugzilla.spec	13 Feb 2006 16:59:23 -0000	1.35
+++ eclipse-bugzilla.spec	13 Feb 2006 17:18:50 -0000	1.36
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1
+Release:	1.1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -73,8 +73,9 @@
 %setup -q -c 
 
 # Change .jar to symlink
+cd eclipse-bugzilla-%{vesrion}/org.eclipse.team.bugzilla.releng/results/
 rm -f plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
-ln -sf %{_datadir}/java/xmlrpc.jar  plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
+ln -sf %{_datadir}/java/xmlrpc.jar plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
 
 %build
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:19:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:19:25 -0500
Subject: rpms/gdm/devel gdm.spec,1.128,1.129
Message-ID: <200602131719.k1DHJPME024585@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24035

Modified Files:
	gdm.spec 
Log Message:
- migrate custom.conf settings with /etc/X11/gdm to /etc/gdm



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gdm.spec	12 Feb 2006 22:29:36 -0000	1.128
+++ gdm.spec	13 Feb 2006 17:19:21 -0000	1.129
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.7.0.2006.02.12
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -251,6 +251,10 @@
     cp -a %{_datadir}/gdm/config/gdm.conf-custom %{_sysconfdir}/gdm/custom.conf
 fi
 
+if [ $1 -ge 2 ]; then
+   sed -i -e 's@/etc/X11/gdm@/etc/gdm at g' %{_sysconfdir}/gdm/custom.conf
+fi
+
 %{_sbindir}/gdm-safe-restart >/dev/null 2>&1 || :
 
 %postun
@@ -302,6 +306,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.7.0.2006.02.12-2
+- migrate custom.conf settings with /etc/X11/gdm to /etc/gdm
+
 * Sun Feb 12 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.7.0.2006.02.12-1
 - update to cvs snapshot
 - move gdm to /etc instead of /etc/X11



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:24:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:24:10 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.36,1.37
Message-ID: <200602131724.k1DHOA7u026732@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26716

Modified Files:
	eclipse-bugzilla.spec 
Log Message:



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- eclipse-bugzilla.spec	13 Feb 2006 17:18:50 -0000	1.36
+++ eclipse-bugzilla.spec	13 Feb 2006 17:24:06 -0000	1.37
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1.1
+Release:	1.2
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -73,7 +73,9 @@
 %setup -q -c 
 
 # Change .jar to symlink
-cd eclipse-bugzilla-%{vesrion}/org.eclipse.team.bugzilla.releng/results/
+pwd
+ls
+cd eclipse-bugzilla-%{version_majmin}.%{version_micro}/org.eclipse.team.bugzilla.releng/results/
 rm -f plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
 ln -sf %{_datadir}/java/xmlrpc.jar plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:26:21 -0500
Subject: rpms/kernel/devel jwltest-e1000-7_0_33-k2.patch, NONE,
	1.1.2.1 jwltest-sk98lin-neuter.patch, NONE,
	1.1.8.1 kernel-2.6.spec, 1.1941, 1.1941.2.1
Message-ID: <200602131726.k1DHQLi7003304@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc5-8-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc5-8-branch
	jwltest-e1000-7_0_33-k2.patch jwltest-sk98lin-neuter.patch 
Log Message:


jwltest-e1000-7_0_33-k2.patch:
 e1000.h         |   52 +--
 e1000_ethtool.c |  113 +++----
 e1000_hw.c      |  861 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 e1000_hw.h      |  366 ++++++++++++++++++++++-
 e1000_main.c    |  674 +++++++++++++++++++------------------------
 e1000_osdep.h   |    4 
 e1000_param.c   |   78 +----
 7 files changed, 1508 insertions(+), 640 deletions(-)

--- NEW FILE jwltest-e1000-7_0_33-k2.patch ---
--- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig	2006-02-13 11:48:40.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c	2006-02-13 11:54:16.000000000 -0500
@@ -44,10 +44,19 @@
  */
 
 #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when e1000_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+
 #define E1000_PARAM(X, desc) \
-	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-	static int num_##X = 0; \
-	module_param_array_named(X, X, int, &num_##X, 0); \
+	static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+	MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \
 	MODULE_PARM_DESC(X, desc);
 
 /* Transmit Descriptor Count
@@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct
 		BUG();
 	}
 
-	DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n",
+	DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n",
 	       opt->name, *value, opt->err);
 	*value = opt->def;
 	return -1;
@@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter
 		DPRINTK(PROBE, NOTICE,
 		       "Warning: no configuration for board #%i\n", bd);
 		DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
+		bd = E1000_MAX_NIC;
 	}
 
 	{ /* Transmit Descriptor Count */
@@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		if (num_TxDescriptors > bd) {
 			tx_ring->count = TxDescriptors[bd];
 			e1000_validate_option(&tx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(tx_ring->count,
 						REQ_TX_DESCRIPTOR_MULTIPLE);
-		} else {
-			tx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		if (num_RxDescriptors > bd) {
 			rx_ring->count = RxDescriptors[bd];
 			e1000_validate_option(&rx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(rx_ring->count,
 						REQ_RX_DESCRIPTOR_MULTIPLE);
-		} else {
-			rx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		if (num_XsumRX > bd) {
 			int rx_csum = XsumRX[bd];
 			e1000_validate_option(&rx_csum, &opt, adapter);
 			adapter->rx_csum = rx_csum;
-		} else {
-			adapter->rx_csum = opt.def;
-		}
 	}
 	{ /* Flow Control */
 
@@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		if (num_FlowControl > bd) {
 			int fc = FlowControl[bd];
 			e1000_validate_option(&fc, &opt, adapter);
 			adapter->hw.fc = adapter->hw.original_fc = fc;
-		} else {
-			adapter->hw.fc = adapter->hw.original_fc = opt.def;
-		}
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		if (num_TxIntDelay > bd) {
 			adapter->tx_int_delay = TxIntDelay[bd];
 			e1000_validate_option(&adapter->tx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_int_delay = opt.def;
-		}
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		if (num_TxAbsIntDelay > bd) {
 			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		if (num_RxIntDelay > bd) {
 			adapter->rx_int_delay = RxIntDelay[bd];
 			e1000_validate_option(&adapter->rx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		if (num_RxAbsIntDelay > bd) {
 			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		if (num_InterruptThrottleRate > bd) {
 			adapter->itr = InterruptThrottleRate[bd];
 			switch (adapter->itr) {
 			case 0:
@@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter
 					adapter);
 				break;
 			}
-		} else {
-			adapter->itr = opt.def;
-		}
 	}
 
 	switch (adapter->hw.media_type) {
@@ -518,17 +492,18 @@ static void __devinit
 e1000_check_fiber_options(struct e1000_adapter *adapter)
 {
 	int bd = adapter->bd_number;
-	if (num_Speed > bd) {
+	bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd;
+	if ((Speed[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if (num_Duplex > bd) {
+	if ((Duplex[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
+	if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) {
 		DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
 				 "not valid for fiber adapters, "
 				 "parameter ignored\n");
@@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_
 {
 	int speed, dplx, an;
[...3966 lines suppressed...]
-
 	rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
 	rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
 		E1000_MAX_RXD : E1000_MAX_82544_RXD));
@@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
+	case e1000_80003es2lan:
 		toggle = 0x7FFFF3FF;
 		break;
 	case e1000_82573:
@@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
 		/* autoneg off */
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
+	} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
+		e1000_write_phy_reg(&adapter->hw,
+		                    GG82563_PHY_KMRN_MODE_CTRL,
+		                    0x1CE);
 	}
 	/* force 1000, set loopback */
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);
@@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap
 	case e1000_82571:
 	case e1000_82572:
 	case e1000_82573:
+	case e1000_80003es2lan:
 		return e1000_integrated_phy_loopback(adapter);
 		break;
 
@@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap
 	case e1000_82546_rev_3:
 	default:
 		hw->autoneg = TRUE;
+		if (hw->phy_type == e1000_phy_gg82563) {
+			e1000_write_phy_reg(hw,
+					    GG82563_PHY_KMRN_MODE_CTRL,
+					    0x180);
+		}
 		e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
 		if (phy_reg & MII_CR_LOOPBACK) {
 			phy_reg &= ~MII_CR_LOOPBACK;
@@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 		wol->supported = 0;
 		wol->wolopts   = 0;
 		return;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a) {
+			wol->supported = 0;
+			return;
+		}
+		/* KSP3 does not suppport UCAST wake-ups for any interface */
+		wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
+
+		if (adapter->wol & E1000_WUFC_EX)
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+		wol->wolopts = 0;
+		goto do_defaults;
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
+
+do_defaults:
 		if (adapter->wol & E1000_WUFC_EX)
 			wol->wolopts |= WAKE_UCAST;
 		if (adapter->wol & E1000_WUFC_MC)
@@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82543GC_COPPER:
 	case E1000_DEV_ID_82544EI_FIBER:
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
 		return wol->wolopts ? -EOPNOTSUPP : 0;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a)
+			return wol->wolopts ? -EOPNOTSUPP : 0;
+
+		if (wol->wolopts & WAKE_UCAST) {
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+			return -EOPNOTSUPP;
+		}
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev,
 			adapter->wol |= E1000_WUFC_BC;
 		if (wol->wolopts & WAKE_MAGIC)
 			adapter->wol |= E1000_WUFC_MAG;
+
 	}
 
 	return 0;
@@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic
 		struct ethtool_stats *stats, uint64_t *data)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_E1000_MQ
-	uint64_t *queue_stat;
-	int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t);
-	int j, k;
-#endif
 	int i;
 
 	e1000_update_stats(adapter);
@@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic
 		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
 			sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
 	}
-#ifdef CONFIG_E1000_MQ
-	for (j = 0; j < adapter->num_tx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-	for (j = 0; j < adapter->num_rx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-#endif
 /*	BUG_ON(i != E1000_STATS_LEN); */
 }
 
 static void
 e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
 {
-#ifdef CONFIG_E1000_MQ
-	struct e1000_adapter *adapter = netdev_priv(netdev);
-#endif
 	uint8_t *p = data;
 	int i;
 
@@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net
 			       ETH_GSTRING_LEN);
 			p += ETH_GSTRING_LEN;
 		}
-#ifdef CONFIG_E1000_MQ
-		for (i = 0; i < adapter->num_tx_queues; i++) {
-			sprintf(p, "tx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "tx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-		for (i = 0; i < adapter->num_rx_queues; i++) {
-			sprintf(p, "rx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "rx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-#endif
 /*		BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
 		break;
 	}
@@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum		= e1000_get_tx_csum,
+	.get_tx_csum            = e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
+#ifdef ETHTOOL_GPERMADDR
+	.get_perm_addr  	= ethtool_op_get_perm_addr,
+#endif
 };
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
+  
+void set_ethtool_ops(struct net_device *netdev)
 {
 	SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
 }

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,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1941
retrieving revision 1.1941.2.1
diff -u -r1.1941 -r1.1941.2.1
--- kernel-2.6.spec	13 Feb 2006 03:11:41 -0000	1.1941
+++ kernel-2.6.spec	13 Feb 2006 17:26:19 -0000	1.1941.2.1
@@ -22,8 +22,9 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+%define rhbsys .jwltest.8
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -159,7 +160,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -238,6 +240,7 @@
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -321,6 +324,8 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
+Patch1303: jwltest-sk98lin-neuter.patch
+Patch1304: jwltest-e1000-7_0_33-k2.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -860,6 +865,10 @@
 %patch1301 -p1
 # Goodies for wireless drivers to make NetworkManager work
 %patch1302 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1303 -p1
+# update e1000 to 7.0.33-k2(-pre)
+%patch1304 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:27:47 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.37,1.38
Message-ID: <200602131727.k1DHRlOi004013@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3988

Modified Files:
	eclipse-bugzilla.spec 
Log Message:



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- eclipse-bugzilla.spec	13 Feb 2006 17:24:06 -0000	1.37
+++ eclipse-bugzilla.spec	13 Feb 2006 17:27:44 -0000	1.38
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1.2
+Release:	1.3
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -73,11 +73,10 @@
 %setup -q -c 
 
 # Change .jar to symlink
-pwd
-ls
-cd eclipse-bugzilla-%{version_majmin}.%{version_micro}/org.eclipse.team.bugzilla.releng/results/
+pushd org.eclipse.team.bugzilla.releng/results/
 rm -f plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
 ln -sf %{_datadir}/java/xmlrpc.jar plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
+popd
 
 %build
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:30:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:30:18 -0500
Subject: rpms/gnopernicus/devel sources,1.29,1.30
Message-ID: <200602131730.k1DHUI4L004741@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnopernicus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4668

Modified Files:
	sources 
Log Message:
fix timestamps



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Feb 2006 17:17:55 -0000	1.29
+++ sources	13 Feb 2006 17:30:15 -0000	1.30
@@ -1 +1 @@
-197a8d018b9680bfc2baedc96afda8de  gnopernicus-1.0.2.tar.bz2
+676a64e2cf145823ac764dc8d964dc21  gnopernicus-1.0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 17:47:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 12:47:09 -0500
Subject: rpms/postgresql/FC-4 .cvsignore, 1.26, 1.27 postgresql.spec, 1.54,
	1.55 sources, 1.27, 1.28
Message-ID: <200602131747.k1DHl9FI022750@cvs.devel.redhat.com>

Author: tgl

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

Modified Files:
	.cvsignore postgresql.spec sources 
Log Message:
Update to PostgreSQL 8.0.7 and jdbc driver build 315


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-4/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	9 Jan 2006 19:25:56 -0000	1.26
+++ .cvsignore	13 Feb 2006 17:47:06 -0000	1.27
@@ -1,8 +1,8 @@
-postgresql-8.0.6.tar.bz2
+postgresql-8.0.7.tar.bz2
 PyGreSQL-3.6.2.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
-postgresql-8.0-314.jdbc2.jar
-postgresql-8.0-314.jdbc2ee.jar
-postgresql-8.0-314.jdbc3.jar
 postgresql-8.0-US.pdf
+postgresql-8.0-315.jdbc2.jar
+postgresql-8.0-315.jdbc2ee.jar
+postgresql-8.0-315.jdbc3.jar


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-4/postgresql.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- postgresql.spec	9 Jan 2006 19:25:56 -0000	1.54
+++ postgresql.spec	13 Feb 2006 17:47:06 -0000	1.55
@@ -42,7 +42,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.0.6
+Version: 8.0.7
 
 # Conventions for PostgreSQL Global Development Group RPM releases:
 
@@ -71,9 +71,9 @@
 Source3: postgresql.init
 Source4: Makefile.regress
 Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/postgresql-8.0-314.jdbc2.jar
-Source9: http://jdbc.postgresql.org/download/postgresql-8.0-314.jdbc2ee.jar
-Source10: http://jdbc.postgresql.org/download/postgresql-8.0-314.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/postgresql-8.0-315.jdbc2.jar
+Source9: http://jdbc.postgresql.org/download/postgresql-8.0-315.jdbc2ee.jar
+Source10: http://jdbc.postgresql.org/download/postgresql-8.0-315.jdbc3.jar
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
@@ -829,6 +829,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Tom Lane <tgl at redhat.com> 8.0.7-1.FC4.1
+- Update to PostgreSQL 8.0.7 and jdbc driver build 315
+
 * Mon Jan  9 2006 Tom Lane <tgl at redhat.com> 8.0.6-1.FC4.1
 - Update to PostgreSQL 8.0.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	9 Jan 2006 19:25:56 -0000	1.27
+++ sources	13 Feb 2006 17:47:06 -0000	1.28
@@ -1,8 +1,8 @@
-f3b27b8171267f9a87592f931c09f0ee  postgresql-8.0.6.tar.bz2
+6316b680a32f692b96cddf9d8eb79bda  postgresql-8.0.7.tar.bz2
 1f2694ea546c852c5a0ba2b17f7c5ce1  PyGreSQL-3.6.2.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
-ab21c5256a999f9726d008e2919ca936  postgresql-8.0-314.jdbc2.jar
-7405817f375f1b091a67ea751daad094  postgresql-8.0-314.jdbc2ee.jar
-e1977857d76483fb739e8ba9533392a5  postgresql-8.0-314.jdbc3.jar
 2edd229aa83105175a1212a001dd030a  postgresql-8.0-US.pdf
+444797a938fc627efee43835b983f542  postgresql-8.0-315.jdbc2.jar
+183ff7f93a29347f45fe94dc31517960  postgresql-8.0-315.jdbc2ee.jar
+c1d67ac9b46f1930b0199c62d3f07f68  postgresql-8.0-315.jdbc3.jar



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:05:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:05:15 -0500
Subject: rpms/kernel/devel linux-2.6-build-nonintconfig.patch,1.3,1.4
Message-ID: <200602131805.k1DI5Flf028626@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	linux-2.6-build-nonintconfig.patch 
Log Message:
warn on non-existent symbols again


linux-2.6-build-nonintconfig.patch:
 linux-2.6.14/scripts/kconfig/confdata.c |    8 +++-----
 linux-800/scripts/kconfig/Makefile      |    4 ++++
 linux-800/scripts/kconfig/conf.c        |   26 +++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 8 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-build-nonintconfig.patch	16 Nov 2005 05:13:37 -0000	1.3
+++ linux-2.6-build-nonintconfig.patch	13 Feb 2006 18:04:43 -0000	1.4
@@ -106,7 +106,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 +115,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);



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:06:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:06:46 -0500
Subject: rpms/postgresql/FC-3 rpm-multilib-7.4.12.patch, NONE, 1.1 .cvsignore,
	1.22, 1.23 postgresql.spec, 1.44, 1.45 sources, 1.23,
	1.24 pg74.215.jdbc1.jar, 1.1, NONE pg74.215.jdbc2.jar, 1.1,
	NONE pg74.215.jdbc2ee.jar, 1.1, NONE pg74.215.jdbc3.jar, 1.1,
	NONE rpm-multilib-7.4.11.patch, 1.1, NONE
Message-ID: <200602131806.k1DI6k5o028843@cvs.devel.redhat.com>

Author: tgl

Update of /cvs/dist/rpms/postgresql/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28816

Modified Files:
	.cvsignore postgresql.spec sources 
Added Files:
	rpm-multilib-7.4.12.patch 
Removed Files:
	pg74.215.jdbc1.jar pg74.215.jdbc2.jar pg74.215.jdbc2ee.jar 
	pg74.215.jdbc3.jar rpm-multilib-7.4.11.patch 
Log Message:
Update to PostgreSQL 7.4.12 and jdbc driver build 216

rpm-multilib-7.4.12.patch:
 config/python.m4 |   10 +++++++---
 configure.in     |   33 ++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 18 deletions(-)

--- NEW FILE rpm-multilib-7.4.12.patch ---
diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4
--- postgresql-7.4.1.orig/config/python.m4	2003-09-02 02:01:48.000000000 +0300
+++ postgresql-7.4.1/config/python.m4	2003-11-18 21:29:47.000000000 +0200
@@ -25,7 +25,11 @@
 python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"`
 python_prefix=`${PYTHON} -c "import sys; print sys.prefix"`
 python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"`
-python_configdir="${python_execprefix}/lib/python${python_version}/config"
+python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"`
+python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"`
+python_configdir="${python_path}/config"
+python_moduledir="${python_path}/site-packages"
+python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages"
 python_includespec="-I${python_prefix}/include/python${python_version}"
 if test "$python_prefix" != "$python_execprefix"; then
   python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec"
@@ -37,9 +41,9 @@
 AC_SUBST(python_includespec)[]dnl
 # This should be enough of a message.
 if test "$python_prefix" != "$python_execprefix"; then
-  AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}])
+	AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}])
 else
-  AC_MSG_RESULT([$python_prefix/lib/python${python_version}])
+	AC_MSG_RESULT([$python_prefix/${python_libpath}])
 fi
 ])# _PGAC_CHECK_PYTHON_DIRS
 
diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in
--- postgresql-7.4.1.orig/configure.in	2003-11-16 23:33:50.000000000 +0200
+++ postgresql-7.4.1/configure.in	2003-11-18 21:31:09.000000000 +0200
@@ -19,12 +19,11 @@
 dnl
 dnl The GNU folks apparently haven't heard that some people don't use
 dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir".
-m4_define([info], [doc])
-m4_define([infodir], [docdir])
+dnl
+dnl Now use both docdir and infodir to work properly with RPM macros
+dnl (courtesy, Elliott Lee <sopwith at redhat.com>)
+dnl - Andrew Overholt <overholt at redhat.com> 10 December 2002
 AC_INIT([PostgreSQL], [7.4.12], [pgsql-bugs at postgresql.org])
-m4_undefine([infodir])
-m4_undefine([info])
-AC_SUBST(docdir)
 
 AC_PREREQ(2.53)
 AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group])
@@ -40,6 +39,10 @@
 template=
 AC_MSG_CHECKING([which template to use])
 
+AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc)
+docdir="$with_docdir"
+AC_SUBST(docdir)
+
 PGAC_ARG_REQ(with, template, [],
 [
   case $withval in
@@ -442,8 +445,8 @@
   if test -d "$krb4_prefix/include"; then
     INCLUDES="$INCLUDES -I$krb4_prefix/include"
   fi
-  if test -d "$krb4_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb4_prefix/lib"
+  if test -d "$krb4_prefix/$LIBNAME"; then
+    LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME"
   fi
 
   krb_srvtab="/etc/srvtab"
@@ -452,7 +455,7 @@
 
 AC_SUBST(with_krb4)
 
-
+test -z "$LIBNAME" && LIBNAME=lib
 #
 # Kerberos 5
 #
@@ -467,8 +470,8 @@
   if test -d "$krb5_prefix/include"; then
     INCLUDES="$INCLUDES -I$krb5_prefix/include"
   fi
-  if test -d "$krb5_prefix/lib"; then
-    LIBDIRS="$LIBDIRS -L$krb5_prefix/lib"
+  if test -d "$krb5_prefix/$LIBNAME"; then
+    LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME"
   fi
 
   krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab"
@@ -485,7 +488,7 @@
 
 AC_SUBST(krb_srvtab)
 
-
+test -z "$LIBNAME" && LIBNAME=lib
 #
 # Kerberos configuration parameters
 #
@@ -496,7 +499,7 @@
 AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"],
                    [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)])
 
-
+test -z "$LIBNAME" && LIBNAME=lib
 #
 # PAM
 #
@@ -533,8 +536,8 @@
   if test -d "${openssl_prefix}/include" ; then
     INCLUDES="$INCLUDES -I${openssl_prefix}/include"
   fi
-  if test -d "${openssl_prefix}/lib" ; then
-    LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib"
+  if test -d "${openssl_prefix}/$LIBNAME" ; then
+    LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME"
   fi
 ])
 
@@ -597,7 +600,7 @@
 case $host_os in sysv5*)
   AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R],
   [
-    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib"
+    pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME"
     AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no])
     LDFLAGS=$pgac_save_LDFLAGS
   ])


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	9 Jan 2006 21:44:01 -0000	1.22
+++ .cvsignore	13 Feb 2006 18:06:42 -0000	1.23
@@ -1,2 +1,6 @@
-postgresql-7.4.11.tar.bz2
+postgresql-7.4.12.tar.bz2
 PyGreSQL-3.6.1.tgz
+pg74.216.jdbc1.jar
+pg74.216.jdbc2.jar
+pg74.216.jdbc2ee.jar
+pg74.216.jdbc3.jar


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- postgresql.spec	9 Jan 2006 21:44:01 -0000	1.44
+++ postgresql.spec	13 Feb 2006 18:06:42 -0000	1.45
@@ -44,7 +44,7 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 7.4.11
+Version: 7.4.12
 
 # Conventions for PostgreSQL Global Development Group RPM releases:
 
@@ -72,10 +72,10 @@
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source3: postgresql.init
 Source6: README.rpm-dist
-Source8: http://jdbc.postgresql.org/download/pg74.215.jdbc1.jar
-Source9: http://jdbc.postgresql.org/download/pg74.215.jdbc2.jar
-Source10: http://jdbc.postgresql.org/download/pg74.215.jdbc2ee.jar
-Source11: http://jdbc.postgresql.org/download/pg74.215.jdbc3.jar
+Source8: http://jdbc.postgresql.org/download/pg74.216.jdbc1.jar
+Source9: http://jdbc.postgresql.org/download/pg74.216.jdbc2.jar
+Source10: http://jdbc.postgresql.org/download/pg74.216.jdbc2ee.jar
+Source11: http://jdbc.postgresql.org/download/pg74.216.jdbc3.jar
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
 Source18: ftp://ftp.druid.net/pub/distrib/PyGreSQL-3.6.1.tgz
@@ -813,6 +813,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Tom Lane <tgl at redhat.com> 7.4.12-1.FC3.1
+- Update to PostgreSQL 7.4.12 and jdbc driver build 216
+
 * Mon Jan  9 2006 Tom Lane <tgl at redhat.com> 7.4.11-1.FC3.1
 - Update to PostgreSQL 7.4.11
 - Add rpath to plperl.so (bug #162198)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/postgresql/FC-3/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	9 Jan 2006 21:44:01 -0000	1.23
+++ sources	13 Feb 2006 18:06:42 -0000	1.24
@@ -1,2 +1,6 @@
-e56cded48379b80de577db15e4ed5a68  postgresql-7.4.11.tar.bz2
+f89f66d6601305505c192da8cf1c3d8e  postgresql-7.4.12.tar.bz2
 057c2d93f333ff2ed2177a8b87e19c0c  PyGreSQL-3.6.1.tgz
+230de24e1646a2d48d5b277cc935e856  pg74.216.jdbc1.jar
+2cc5751baa465a310b4f349d46ddc38f  pg74.216.jdbc2.jar
+f6b48622ce69f26d5219c1f330b62163  pg74.216.jdbc2ee.jar
+ab6da87ab17b32b258ea29bd452e8349  pg74.216.jdbc3.jar


--- pg74.215.jdbc1.jar DELETED ---


--- pg74.215.jdbc2.jar DELETED ---


--- pg74.215.jdbc2ee.jar DELETED ---


--- pg74.215.jdbc3.jar DELETED ---


--- rpm-multilib-7.4.11.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:15:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:15:06 -0500
Subject: rpms/beagle/devel beagle.spec,1.26,1.27
Message-ID: <200602131815.k1DIF6CM032256@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32167

Modified Files:
	beagle.spec 
Log Message:
- remove preferences from accessories menu



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- beagle.spec	13 Feb 2006 04:07:22 -0000	1.26
+++ beagle.spec	13 Feb 2006 18:15:02 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        4
+Release:        5
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -92,6 +92,7 @@
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   --add-category X-Red-Hat-Base					\
+  --remove-category Utility                                     \
   --add-only-show-in=GNOME                                      \
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
@@ -152,6 +153,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.2.1-4
+- remove preferences from accessories menu
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.2.1-4
 - Update sqlite3.patch so that it behaves better with sqlite2 and 3
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:23:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:23:01 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1941,1.1942
Message-ID: <200602131823.k1DIN1MW015821@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec 
Log Message:
new xen is sub-arched, include/asm-xen no longer exists (diff reduction between kernel and kernel-xen)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1941
retrieving revision 1.1942
diff -u -r1.1941 -r1.1942
--- kernel-2.6.spec	13 Feb 2006 03:11:41 -0000	1.1941
+++ kernel-2.6.spec	13 Feb 2006 18:22:58 -0000	1.1942
@@ -1123,9 +1123,6 @@
     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
-%if %{buildxen}
-    cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-%endif
     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



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:32:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:32:22 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.90-use-beagle.patch, NONE,
	1.1 gnome-panel.spec, 1.111, 1.112
Message-ID: <200602131832.k1DIWM2h018659@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.13.90-use-beagle.patch 
Log Message:
- use beagle if available for search tool


gnome-panel-2.13.90-use-beagle.patch:
 panel-menu-items.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE gnome-panel-2.13.90-use-beagle.patch ---
--- gnome-panel-2.13.90/gnome-panel/panel-menu-items.c.use-beagle	2006-02-13 13:26:43.000000000 -0500
+++ gnome-panel-2.13.90/gnome-panel/panel-menu-items.c	2006-02-13 13:28:08.000000000 -0500
@@ -634,9 +634,15 @@
 
 	add_menu_separator (places_menu);
 
-	panel_menu_items_append_from_desktop (places_menu,
-					      "gnome-search-tool.desktop",
-					      NULL);
+        if (panel_is_program_in_path ("beagle-search")) {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-beagle-search.desktop",
+                                                    NULL);
+        } else {
+              panel_menu_items_append_from_desktop (places_menu,
+                                                    "gnome-search-tool.desktop",
+                                                    NULL);
+        }
 
 	*recent_view = panel_recent_append_documents_menu (places_menu,
 							   *recent_view);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-panel.spec	13 Feb 2006 09:34:10 -0000	1.111
+++ gnome-panel.spec	13 Feb 2006 18:32:20 -0000	1.112
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.90
-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
@@ -60,6 +60,7 @@
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
 Patch7: gnome-panel-2.13.90-gpm-integration.patch
+Patch8: gnome-panel-2.13.90-use-beagle.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
@@ -88,6 +89,7 @@
 %patch5 -p1 -b .about-fedora
 %patch6 -p1 -b .switch-user
 %patch7 -p1 -b .gpm-integration
+%patch8 -p1 -b .use-beagle
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -204,7 +206,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
-* Sun Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-2
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-3
+- use beagle if available for search tool
+
+* Sun Feb 12 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-2
 - add first pass at gnome power manager integration
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:39:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:39:10 -0500
Subject: rpms/epiphany/devel epiphany.spec,1.87,1.88
Message-ID: <200602131839.k1DIdATw020719@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20688

Modified Files:
	epiphany.spec 
Log Message:
rebump for build order issues in double-long bump


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- epiphany.spec	12 Feb 2006 03:43:49 -0000	1.87
+++ epiphany.spec	13 Feb 2006 18:39:06 -0000	1.88
@@ -11,7 +11,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 1.9.6
-Release: 3
+Release: 3.1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -135,6 +135,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-3.1
+- rebump for build order issues during double-long bump
+
 * Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.6-3
 - turn on zeroconf and NetworkManager support
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:39:26 -0500
Subject: rpms/evolution-connector/devel evolution-connector.spec,1.51,1.52
Message-ID: <200602131839.k1DIdQse020882@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20860

Modified Files:
	evolution-connector.spec 
Log Message:
rebump for build order issues in double-long bump


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- evolution-connector.spec	11 Feb 2006 02:41:11 -0000	1.51
+++ evolution-connector.spec	13 Feb 2006 18:39:23 -0000	1.52
@@ -7,7 +7,7 @@
 
 Name: evolution-connector
 Version: 2.5.9.0
-Release: 2.2
+Release: 2.2.1
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -95,6 +95,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:39:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:39:42 -0500
Subject: rpms/GConf/devel GConf.spec,1.12,1.13
Message-ID: <200602131839.k1DIdglQ021038@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21006

Modified Files:
	GConf.spec 
Log Message:
rebump for build order issues in double-long bump


Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- GConf.spec	11 Feb 2006 02:48:37 -0000	1.12
+++ GConf.spec	13 Feb 2006 18:39:38 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: The Gnome Config System.
 Name: GConf
 Version: 1.0.9
-Release: 18.2
+Release: 18.2.1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.gz
@@ -114,6 +114,9 @@
 %{_bindir}/gconf-config-1
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:39:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:39:58 -0500
Subject: rpms/GConf2/devel GConf2.spec,1.36,1.37
Message-ID: <200602131839.k1DIdwLC021173@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21142

Modified Files:
	GConf2.spec 
Log Message:
rebump for build order issues in double-long bump


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- GConf2.spec	11 Feb 2006 02:48:47 -0000	1.36
+++ GConf2.spec	13 Feb 2006 18:39:55 -0000	1.37
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 3.2
+Release: 3.2.1
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:40:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:40:14 -0500
Subject: rpms/gnome-libs/devel gnome-libs.spec,1.42,1.43
Message-ID: <200602131840.k1DIeEM4021309@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-libs.spec 
Log Message:
rebump for build order issues in double-long bump


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-libs.spec	11 Feb 2006 03:14:12 -0000	1.42
+++ gnome-libs.spec	13 Feb 2006 18:40:10 -0000	1.43
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 48.2
+Release: 48.2.1
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -350,6 +350,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:40:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:40:30 -0500
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.8,1.9
Message-ID: <200602131840.k1DIeU2I021463@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-mount.spec 
Log Message:
rebump for build order issues in double-long bump


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-mount.spec	13 Feb 2006 16:33:26 -0000	1.8
+++ gnome-mount.spec	13 Feb 2006 18:40:27 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060213.1
+Release: 0.cvs20060213.1.1
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}-0.cvs20060213.tar.gz
@@ -59,6 +59,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.4-0.cvs20060213.1.1
+- rebump for build order issues during double-long bump
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-0.cvs20060213.1
 - fix build
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:40:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:40:41 -0500
Subject: rpms/hal/devel hal.spec,1.82,1.83
Message-ID: <200602131840.k1DIefx4021598@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21566

Modified Files:
	hal.spec 
Log Message:
rebump for build order issues in double-long bump


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- hal.spec	13 Feb 2006 16:45:07 -0000	1.82
+++ hal.spec	13 Feb 2006 18:40:39 -0000	1.83
@@ -18,7 +18,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 0.cvs20060213.1
+Release: 0.cvs20060213.1.1
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}-0.cvs20060213.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -171,6 +171,9 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.5.7-0.cvs20060213.1.1
+- rebump for build order issues during double-long bump
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-0.cvs20060213.1
 - fix build
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:40:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:40:52 -0500
Subject: rpms/HelixPlayer/devel HelixPlayer.spec,1.42,1.43
Message-ID: <200602131840.k1DIeq3L021717@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/HelixPlayer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21687

Modified Files:
	HelixPlayer.spec 
Log Message:
rebump for build order issues in double-long bump


Index: HelixPlayer.spec
===================================================================
RCS file: /cvs/dist/rpms/HelixPlayer/devel/HelixPlayer.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- HelixPlayer.spec	11 Feb 2006 03:25:21 -0000	1.42
+++ HelixPlayer.spec	13 Feb 2006 18:40:49 -0000	1.43
@@ -4,7 +4,7 @@
 Name: HelixPlayer
 Version: 1.0.6
 Epoch: 1
-Release: 1.2.1
+Release: 1.2.2
 Group: Applications/Multimedia
 License: RPSL, GPL
 URL: https://player.helixcommunity.org/
@@ -168,6 +168,9 @@
 %{_datadir}/application-registry/hxplay.applications
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:41:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:41:12 -0500
Subject: rpms/ImageMagick/devel ImageMagick.spec,1.54,1.55
Message-ID: <200602131841.k1DIfBvC021923@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ImageMagick/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21886

Modified Files:
	ImageMagick.spec 
Log Message:
rebump for build order issues in double-long bump


Index: ImageMagick.spec
===================================================================
RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ImageMagick.spec	11 Feb 2006 03:28:40 -0000	1.54
+++ ImageMagick.spec	13 Feb 2006 18:41:08 -0000	1.55
@@ -9,7 +9,7 @@
 %else
 Version: %{VER}
 %endif
-Release: 4.2
+Release: 4.2.1
 License: freeware
 Group: Applications/Multimedia
 %if "%{Patchlevel}" != ""
@@ -225,6 +225,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 6.2.5.4-4.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.2.5.4-4.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:41:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:41:25 -0500
Subject: rpms/lcms/devel lcms.spec,1.4,1.5
Message-ID: <200602131841.k1DIfOgK022066@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/lcms/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22037

Modified Files:
	lcms.spec 
Log Message:
rebump for build order issues in double-long bump


Index: lcms.spec
===================================================================
RCS file: /cvs/dist/rpms/lcms/devel/lcms.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lcms.spec	11 Feb 2006 03:51:13 -0000	1.4
+++ lcms.spec	13 Feb 2006 18:41:22 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           lcms
 Version:        1.15
-Release:        1.2
+Release:        1.2.1
 Summary:        Color Management System
 
 Group:          Applications/Productivity
@@ -95,6 +95,9 @@
 %ghost %{python_sitearch}/lcms.py?
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.15-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:41:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:41:42 -0500
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.100,1.101
Message-ID: <200602131841.k1DIfgLi022242@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22214

Modified Files:
	mkinitrd.spec 
Log Message:
rebump for build order issues in double-long bump


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- mkinitrd.spec	11 Feb 2006 18:39:21 -0000	1.100
+++ mkinitrd.spec	13 Feb 2006 18:41:39 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 5.0.22
-Release: 1
+Release: 1.1
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
@@ -63,6 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 5.0.22-1.1
+- rebump for build order issues during double-long bump
+
 * Sat Feb 11 2006 Peter Jones <pjones at redhat.com> - 5.0.22-1
 - formatting cleanups
 - prefix partition number with "p" for partitions on dmraid



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:41:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:41:54 -0500
Subject: rpms/module-init-tools/devel module-init-tools.spec,1.18,1.19
Message-ID: <200602131841.k1DIfsZD022383@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/module-init-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22351

Modified Files:
	module-init-tools.spec 
Log Message:
rebump for build order issues in double-long bump


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- module-init-tools.spec	11 Feb 2006 04:38:01 -0000	1.18
+++ module-init-tools.spec	13 Feb 2006 18:41:51 -0000	1.19
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.2.2
+Release: 0.%{preversion}.2.2.1
 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
@@ -90,6 +90,9 @@
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.pre9.2.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2-0.pre9.2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:42:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:42:06 -0500
Subject: rpms/MySQL-python/devel MySQL-python.spec,1.21,1.22
Message-ID: <200602131842.k1DIg6wi022531@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	MySQL-python.spec 
Log Message:
rebump for build order issues in double-long bump


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/dist/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MySQL-python.spec	11 Feb 2006 04:41:22 -0000	1.21
+++ MySQL-python.spec	13 Feb 2006 18:42:03 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.0
-Release: 3.2.1
+Release: 3.2.2
 License: GPL
 Group: Development/Libraries
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz
@@ -57,6 +57,9 @@
 %dir /usr/%{_lib}/python%{pybasever}/site-packages/MySQLdb/constants
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.0-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:42:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:42:19 -0500
Subject: rpms/nss_ldap/devel nss_ldap.spec,1.59,1.60
Message-ID: <200602131842.k1DIgJR5022669@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/nss_ldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22632

Modified Files:
	nss_ldap.spec 
Log Message:
rebump for build order issues in double-long bump


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/dist/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- nss_ldap.spec	11 Feb 2006 04:48:01 -0000	1.59
+++ nss_ldap.spec	13 Feb 2006 18:42:14 -0000	1.60
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP.
 Name: nss_ldap
 Version: 248
-Release: 2.1
+Release: 2.2
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -219,6 +219,9 @@
 %doc pam_ldap-%{pam_ldap_version}/ldapns.schema
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 248-2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 248-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:42:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:42:50 -0500
Subject: rpms/oaf/devel oaf.spec,1.19,1.20
Message-ID: <200602131842.k1DIgoae022945@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22915

Modified Files:
	oaf.spec 
Log Message:
rebump for build order issues in double-long bump


Index: oaf.spec
===================================================================
RCS file: /cvs/dist/rpms/oaf/devel/oaf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- oaf.spec	11 Feb 2006 04:48:48 -0000	1.19
+++ oaf.spec	13 Feb 2006 18:42:47 -0000	1.20
@@ -1,7 +1,7 @@
 Name: oaf
 Summary: Object activation framework for GNOME.
 Version: 0.6.10
-Release: 12.2.1
+Release: 12.2.2
 License: LGPL and GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/stable/%{name}/%{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/*.sh
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:00 -0500
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.27,1.28
Message-ID: <200602131843.k1DIh0qE023071@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23042

Modified Files:
	OpenIPMI.spec 
Log Message:
rebump for build order issues in double-long bump


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- OpenIPMI.spec	11 Feb 2006 04:49:37 -0000	1.27
+++ OpenIPMI.spec	13 Feb 2006 18:42:58 -0000	1.28
@@ -2,7 +2,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 1.4.14
-Release: 18.2
+Release: 18.2.1
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -131,6 +131,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:04 -0500
Subject: rpms/gnome-desktop/devel .cvsignore, 1.25, 1.26 gnome-desktop.spec,
	1.48, 1.49 sources, 1.25, 1.26
Message-ID: <200602131843.k1DIh4Jg023116@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	28 Jan 2006 05:08:50 -0000	1.25
+++ .cvsignore	13 Feb 2006 18:43:01 -0000	1.26
@@ -13,3 +13,4 @@
 gnome-desktop-2.13.4.tar.bz2
 gnome-desktop-2.13.5.tar.bz2
 gnome-desktop-2.13.90.tar.bz2
+gnome-desktop-2.13.91.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-desktop.spec	11 Feb 2006 03:13:10 -0000	1.48
+++ gnome-desktop.spec	13 Feb 2006 18:43:01 -0000	1.49
@@ -10,8 +10,8 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.13.90
-Release: 1.2
+Version: 2.13.91
+Release: 1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -132,6 +132,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	28 Jan 2006 05:08:51 -0000	1.25
+++ sources	13 Feb 2006 18:43:01 -0000	1.26
@@ -1 +1 @@
-cf3bfad911903ed215d0d938ceb81e9d  gnome-desktop-2.13.90.tar.bz2
+c7941026d569c6d9e9fe5eceaf2ac74b  gnome-desktop-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:15 -0500
Subject: rpms/ORBit/devel ORBit.spec,1.20,1.21
Message-ID: <200602131843.k1DIhFwr023253@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23220

Modified Files:
	ORBit.spec 
Log Message:
rebump for build order issues in double-long bump


Index: ORBit.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ORBit.spec	11 Feb 2006 04:54:46 -0000	1.20
+++ ORBit.spec	13 Feb 2006 18:43:13 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit
 Version: 0.5.17
-Release: 15.2.1
+Release: 15.2.2
 Epoch: 1
 Source: ftp://ftp.labs.redhat.com/pub/ORBit/%{name}-%{version}.tar.bz2
 Patch0: ORBit-0.5.17-aligned-access.patch
@@ -103,6 +103,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.5.17-15.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:26 -0500
Subject: rpms/ORBit2/devel ORBit2.spec,1.32,1.33
Message-ID: <200602131843.k1DIhQx8023419@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/ORBit2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23387

Modified Files:
	ORBit2.spec 
Log Message:
rebump for build order issues in double-long bump


Index: ORBit2.spec
===================================================================
RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ORBit2.spec	11 Feb 2006 04:54:56 -0000	1.32
+++ ORBit2.spec	13 Feb 2006 18:43:24 -0000	1.33
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker.
 Name: ORBit2
 Version: 2.13.3
-Release: 1.1
+Release: 1.2
 Source: %{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
 License: LGPL/GPL
@@ -94,6 +94,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:42 -0500
Subject: rpms/portmap/devel portmap.spec,1.18,1.19
Message-ID: <200602131843.k1DIhgoS023589@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/portmap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23551

Modified Files:
	portmap.spec 
Log Message:
rebump for build order issues in double-long bump


Index: portmap.spec
===================================================================
RCS file: /cvs/dist/rpms/portmap/devel/portmap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- portmap.spec	11 Feb 2006 05:13:16 -0000	1.18
+++ portmap.spec	13 Feb 2006 18:43:40 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: A program which manages RPC connections.
 Name: portmap
 Version: 4.0
-Release: 65.2.1
+Release: 65.2.2
 Group: System Environment/Daemons
 License: BSD
 Source0: ftp://coast.cs.purdue.edu/pub/tools/unix/netutils/portmap/portmap_4.tar.gz
@@ -109,6 +109,9 @@
 %config	%{initdir}/portmap
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0-65.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:43:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:43:55 -0500
Subject: rpms/postgresql/devel postgresql.spec,1.65,1.66
Message-ID: <200602131843.k1DIhtvn023736@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/postgresql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23704

Modified Files:
	postgresql.spec 
Log Message:
rebump for build order issues in double-long bump


Index: postgresql.spec
===================================================================
RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- postgresql.spec	13 Feb 2006 15:53:02 -0000	1.65
+++ postgresql.spec	13 Feb 2006 18:43:53 -0000	1.66
@@ -82,7 +82,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 8.1.3
-Release: 1
+Release: 1.1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -826,6 +826,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 8.1.3-1.1
+- rebump for build order issues during double-long bump
+
 * Mon Feb 13 2006 Tom Lane <tgl at redhat.com> 8.1.3-1
 - Update to PostgreSQL 8.1.3 (fixes bug #180617, CVE-2006-0553)
 - Update to jdbc driver build 405



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:45:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:45:03 -0500
Subject: rpms/pump/devel pump.spec,1.24,1.25
Message-ID: <200602131845.k1DIj3ph024296@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/pump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24265

Modified Files:
	pump.spec 
Log Message:
rebump for build order issues in double-long bump


Index: pump.spec
===================================================================
RCS file: /cvs/dist/rpms/pump/devel/pump.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pump.spec	11 Feb 2006 05:19:28 -0000	1.24
+++ pump.spec	13 Feb 2006 18:45:01 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: A Bootp and DHCP client for automatic IP configuration.
 Name: pump
 Version: 0.8.24
-Release: 1.2.1
+Release: 1.2.2
 Group: System Environment/Daemons
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-root
@@ -75,6 +75,9 @@
 %{_sbindir}/netconfig
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.24-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:45:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:45:18 -0500
Subject: rpms/PyQt/devel PyQt.spec,1.26,1.27
Message-ID: <200602131845.k1DIjI51024441@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyQt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24416

Modified Files:
	PyQt.spec 
Log Message:
rebump for build order issues in double-long bump


Index: PyQt.spec
===================================================================
RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PyQt.spec	11 Feb 2006 05:22:15 -0000	1.26
+++ PyQt.spec	13 Feb 2006 18:45:16 -0000	1.27
@@ -16,7 +16,7 @@
 Summary: Python bindings for Qt
 Name: PyQt
 Version: 3.15
-Release: 1.2.1
+Release: 1.2.2
 License: GPL
 Group: Development/Languages
 Url: http://www.riverbankcomputing.co.uk/pyqt/
@@ -95,6 +95,9 @@
 %doc examples/*.png examples/*.gif examples/*.bmp
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.15-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:45:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:45:46 -0500
Subject: rpms/PyXML/devel PyXML.spec,1.21,1.22
Message-ID: <200602131845.k1DIjkRo026206@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/PyXML/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26055

Modified Files:
	PyXML.spec 
Log Message:
rebump for build order issues in double-long bump


Index: PyXML.spec
===================================================================
RCS file: /cvs/dist/rpms/PyXML/devel/PyXML.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PyXML.spec	11 Feb 2006 05:25:43 -0000	1.21
+++ PyXML.spec	13 Feb 2006 18:45:42 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: XML libraries for python.
 Name: PyXML
 Version: 0.8.4
-Release: 3.2.1
+Release: 3.2.2
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
@@ -47,6 +47,9 @@
 %{_libdir}/python%pyver/site-packages/_xmlplus/
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.8.4-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:46:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:46:01 -0500
Subject: rpms/rhgb/devel rhgb.spec,1.48,1.49
Message-ID: <200602131846.k1DIk1QG027712@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27596

Modified Files:
	rhgb.spec 
Log Message:
rebump for build order issues in double-long bump


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rhgb.spec	11 Feb 2006 05:33:20 -0000	1.48
+++ rhgb.spec	13 Feb 2006 18:45:58 -0000	1.49
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.2
-Release: 21.2
+Release: 21.2.1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:46:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:46:17 -0500
Subject: rpms/SDL/devel SDL.spec,1.37,1.38
Message-ID: <200602131846.k1DIkHg8029389@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/SDL/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29251

Modified Files:
	SDL.spec 
Log Message:
rebump for build order issues in double-long bump


Index: SDL.spec
===================================================================
RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- SDL.spec	11 Feb 2006 05:40:28 -0000	1.37
+++ SDL.spec	13 Feb 2006 18:46:15 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: A cross-platform multimedia library.
 Name: SDL
 Version: 1.2.9
-Release: 5.2
+Release: 5.2.1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Patch0: SDL-1.1.7-byteorder.patch
 Patch13: SDL-1.2.7-ppc_modes.patch
@@ -102,6 +102,9 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-5.2.1
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.2.9-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:46:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:46:32 -0500
Subject: rpms/Xaw3d/devel Xaw3d.spec,1.25,1.26
Message-ID: <200602131846.k1DIkWVu030480@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/Xaw3d/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30291

Modified Files:
	Xaw3d.spec 
Log Message:
rebump for build order issues in double-long bump


Index: Xaw3d.spec
===================================================================
RCS file: /cvs/dist/rpms/Xaw3d/devel/Xaw3d.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Xaw3d.spec	11 Feb 2006 06:07:13 -0000	1.25
+++ Xaw3d.spec	13 Feb 2006 18:46:30 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A version of the MIT Athena widget set for X.
 Name: Xaw3d
 Version: 1.5E
-Release: 6.2.1
+Release: 6.2.2
 Group: System Environment/Libraries
 Source: http://www.visi.com/~hawkeyed/X/Xaw3d-%{version}.tar.gz
 Source1: ftp://ftp.x.org/contrib/widgets/Xaw3d/R6/Xaw3d-1.3.tar.gz
@@ -99,6 +99,9 @@
 %{_includedir}/X11/Xaw3d
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-6.2.2
+- rebump for build order issues during double-long bump
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5E-6.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:54:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:54:26 -0500
Subject: rpms/NetworkManager/devel .cvsignore, 1.28, 1.29 NetworkManager.spec,
	1.88, 1.89 sources, 1.44, 1.45
Message-ID: <200602131854.k1DIsQ0L008564@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8479

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Feb 13 2006 Dan Williams <dcbw at redhat.com> 0.5.1-11.cvs20060213
- Minor bug fixes
- Update to VPN dbus API for passing user-defined routes to vpn service




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	6 Feb 2006 03:18:10 -0000	1.28
+++ .cvsignore	13 Feb 2006 18:54:24 -0000	1.29
@@ -7,3 +7,4 @@
 NetworkManager-0.5.1.cvs20060127.tar.gz
 NetworkManager-0.5.1.cvs20060131.tar.gz
 NetworkManager-0.5.1.cvs20060205.tar.gz
+NetworkManager-0.5.1.cvs20060213.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- NetworkManager.spec	12 Feb 2006 17:50:42 -0000	1.88
+++ NetworkManager.spec	13 Feb 2006 18:54:24 -0000	1.89
@@ -9,13 +9,13 @@
 %define bind_version 24:9.3.1-20
 
 %if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060205
+%define nm_cvs_version	.cvs20060213
 %endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 11%{?nm_cvs_version}
+Release: 12%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -209,12 +209,17 @@
 
 
 %changelog
+* Mon Feb 13 2006 Dan Williams <dcbw at redhat.com> 0.5.1-12.cvs20060213
+- Minor bug fixes
+- Update to VPN dbus API for passing user-defined routes to vpn service
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-11.cvs20060205
 - Rebuild
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.5.1-10.cvs20060205.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
+>>>>>>> 1.88
 * Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205
 - Workarounds for madwifi/Atheros cards
 - Do better with non-SSID-broadcasting access points


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	6 Feb 2006 03:18:10 -0000	1.44
+++ sources	13 Feb 2006 18:54:24 -0000	1.45
@@ -1 +1 @@
-0c4a79e5e950dd62d465ca3c4d179a8c  NetworkManager-0.5.1.cvs20060205.tar.gz
+8e383b8c13ba254f030b70f09c5dd30b  NetworkManager-0.5.1.cvs20060213.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:56:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:56:56 -0500
Subject: rpms/libwnck/devel .cvsignore, 1.28, 1.29 libwnck.spec, 1.41,
	1.42 sources, 1.28, 1.29
Message-ID: <200602131856.k1DIuuDu009781@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9725

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	30 Jan 2006 20:28:11 -0000	1.28
+++ .cvsignore	13 Feb 2006 18:56:53 -0000	1.29
@@ -6,3 +6,4 @@
 libwnck-2.13.4.tar.bz2
 libwnck-2.13.5.tar.bz2
 libwnck-2.13.90.tar.bz2
+libwnck-2.13.91.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libwnck.spec	11 Feb 2006 04:16:24 -0000	1.41
+++ libwnck.spec	13 Feb 2006 18:56:53 -0000	1.42
@@ -5,8 +5,8 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.13.90
-Release: 1.2
+Version: 2.13.91
+Release: 1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 Jan 2006 20:28:11 -0000	1.28
+++ sources	13 Feb 2006 18:56:53 -0000	1.29
@@ -1 +1 @@
-db59b6756e4854a5c6f92743e178fa4f  libwnck-2.13.90.tar.bz2
+74eeda1e0e0a7a0c53d3e2376c6428e1  libwnck-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:57:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:57:00 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.133,1.134
Message-ID: <200602131857.k1DIv03r009817@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- cman-kernel.spec	7 Feb 2006 11:15:02 -0000	1.133
+++ cman-kernel.spec	13 Feb 2006 18:56:56 -0000	1.134
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1826.2.10_FC5
+%define kernel_version 2.6.15-1.1941_FC5
 %define subversion 20051219.162641.FC5
  
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.1
+Release: 20051219.162641.FC5.11.2
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:57:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:57:11 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.117,1.118
Message-ID: <200602131857.k1DIvBON010016@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnbd-kernel.spec	7 Feb 2006 11:50:26 -0000	1.117
+++ gnbd-kernel.spec	13 Feb 2006 18:57:09 -0000	1.118
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.1826.2.10_FC5
+%define kernel_version 2.6.15-1.1941_FC5
 %define subversion 20051108.134753.FC5
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15.0
-Release: 20051108.134753.FC5.18.1
+Release: 20051108.134753.FC5.18.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 Feb 13 18:57:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:57:19 -0500
Subject: rpms/beagle/devel beagle.spec,1.27,1.28
Message-ID: <200602131857.k1DIvJQf010126@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9970

Modified Files:
	beagle.spec 
Log Message:
- remove preferences from accessories menu
- hide holmes (gnome-panel shows it in places now)
- change holmes icon to one we have



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- beagle.spec	13 Feb 2006 18:15:02 -0000	1.27
+++ beagle.spec	13 Feb 2006 18:57:15 -0000	1.28
@@ -96,6 +96,10 @@
   --add-only-show-in=GNOME                                      \
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
+echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop
+
+sed -i -e 's at Icon=tango-system-search at Icon=gnome-search-tool@' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop
+
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/beagle/*.la
@@ -155,6 +159,8 @@
 %changelog
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.2.1-4
 - remove preferences from accessories menu
+- hide holmes (gnome-panel shows it in places now)
+- change holmes icon to one we have
 
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.2.1-4
 - Update sqlite3.patch so that it behaves better with sqlite2 and 3



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:57:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:57:23 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.108,1.109
Message-ID: <200602131857.k1DIvNUp010167@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- dlm-kernel.spec	7 Feb 2006 11:24:32 -0000	1.108
+++ dlm-kernel.spec	13 Feb 2006 18:57:18 -0000	1.109
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1826.2.10_FC5
+%define kernel_version 2.6.15-1.1941_FC5
 %define subversion 20051219.162641.FC5
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.1
+Release: 20051219.162641.FC5.9.2
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Feb 13 18:57:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 13:57:37 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.124,1.125
Message-ID: <200602131857.k1DIvbkf010300@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- GFS-kernel.spec	7 Feb 2006 11:46:46 -0000	1.124
+++ GFS-kernel.spec	13 Feb 2006 18:57:34 -0000	1.125
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1826.2.10_FC5
+%define kernel_version 2.6.15-1.1941_FC5
 %define subversion 20051219.162641.FC5
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.10.1
+Release: 20051219.162641.FC5.10.2
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:01:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:01:04 -0500
Subject: rpms/gtkhtml3/devel .cvsignore, 1.30, 1.31 gtkhtml3.spec, 1.55,
	1.56 sources, 1.30, 1.31
Message-ID: <200602131901.k1DJ14nT004805@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4783

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
3.9.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Jan 2006 23:06:12 -0000	1.30
+++ .cvsignore	13 Feb 2006 19:00:55 -0000	1.31
@@ -1 +1,2 @@
 gtkhtml-3.9.90.tar.bz2
+gtkhtml-3.9.91.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gtkhtml3.spec	11 Feb 2006 03:22:44 -0000	1.55
+++ gtkhtml3.spec	13 Feb 2006 19:00:55 -0000	1.56
@@ -4,8 +4,8 @@
 
 Summary: gtkhtml library
 Name: gtkhtml3
-Version: 3.9.90
-Release: 3.2
+Version: 3.9.91
+Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2
@@ -27,8 +27,6 @@
 # Patches from bugzilla.ximian.com #65670, #66206
 Patch2: gtkhtml-3.3.2-imcommit.patch
 Patch3: gtkhtml-fix-indic-navigation-129212.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=329344
-Patch4: gtkhtml-3.9.90-free.patch
 
 %description
 GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
@@ -51,9 +49,7 @@
 %setup -q -n gtkhtml-%{version}
 
 %patch1 -p1 -b .crash
-#%patch2 -p1 -b .imcommit
 %patch3 -p1 -b .fix-129212
-%patch4 -p1 -b .free
 
 %build
 %configure
@@ -100,6 +96,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 3.9.91-1
+- Update to 3.9.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.9.90-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Jan 2006 23:06:12 -0000	1.30
+++ sources	13 Feb 2006 19:00:55 -0000	1.31
@@ -1 +1 @@
-8f2336c28c2696251dc055ca1882cf2c  gtkhtml-3.9.90.tar.bz2
+f91f480fa8db18a2b2dae69144285369  gtkhtml-3.9.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:07:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:07:25 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1942,1.1943
Message-ID: <200602131907.k1DJ7Pnv005001@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec 
Log Message:
fix up names so RPMs end up the same as those from kernel-xen (diff reduction between kernel and kernel-xen)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1942
retrieving revision 1.1943
diff -u -r1.1942 -r1.1943
--- kernel-2.6.spec	13 Feb 2006 18:22:58 -0000	1.1942
+++ kernel-2.6.spec	13 Feb 2006 19:07:22 -0000	1.1943
@@ -471,7 +471,7 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
 
-%package hypervisor
+%package xen-hypervisor
 Summary: The Linux kernel compiled for Xen guest0 VM operations
 
 Group: System Environment/Kernel
@@ -489,7 +489,7 @@
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description hypervisor
+%description xen-hypervisor
 This package includes a version of the Linux kernel which
 runs in Xen's guest0 VM and provides device services to
 the unprivileged guests.
@@ -497,21 +497,21 @@
 Install this package in your Xen guest0 environment.
 
 
-%package hypervisor-devel
+%package xen-hypervisor-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-xen-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
 Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description hypervisor-devel
+%description xen-hypervisor-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
 
-%package hypervisor-PAE
+%package xen-hypervisor-PAE
 Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support
 
 Group: System Environment/Kernel
@@ -529,7 +529,7 @@
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description hypervisor-PAE
+%description xen-hypervisor-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.
@@ -537,20 +537,20 @@
 Install this package in your Xen guest0 environment.
 
 
-%package hypervisor-PAE-devel
+%package xen-hypervisor-PAE-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-xen-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
 Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description hypervisor-PAE-devel
+%description xen-hypervisor-PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package guest
+%package xen-guest
 Summary: The Linux kernel compiled for unprivileged Xen guest VMs
 
 Group: System Environment/Kernel
@@ -565,26 +565,26 @@
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description guest
+%description xen-guest
 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 guest-devel
+%package xen-guest-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-xen-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
 Provides: kernel-devel = %{rpmversion}-%{release}guest
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description guest-devel
+%description xen-guest-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package guest-PAE
+%package xen-guest-PAE
 Summary: The Linux kernel compiled for unprivileged Xen guest VMs with PAE support
 
 Group: System Environment/Kernel
@@ -599,22 +599,22 @@
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description guest-PAE
+%description xen-guest-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 guest-PAE-devel
+%package xen-guest-PAE-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-xen-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
 Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
-%description guest-PAE-devel
+%description xen-guest-PAE-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
@@ -1309,12 +1309,12 @@
   popd > /dev/null
 fi
 
-%post hypervisor
+%post xen-hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
 /sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post hypervisor-devel
+%post xen-hypervisor-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu} > /dev/null
@@ -1322,11 +1322,11 @@
   popd > /dev/null
 fi
 
-%post guest
+%post xen-guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post guest-devel
+%post xen-guest-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu} > /dev/null
@@ -1334,12 +1334,12 @@
   popd > /dev/null
 fi
 
-%post hypervisor-PAE
+%post xen-hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
 /sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post hypervisor-PAE-devel
+%post xen-hypervisor-PAE-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu} > /dev/null
@@ -1347,11 +1347,11 @@
   popd > /dev/null
 fi
 
-%post guest-PAE
+%post xen-guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post guest-PAE-devel
+%post xen-guest-PAE-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
   pushd /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu} > /dev/null
@@ -1379,19 +1379,19 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
 
-%preun hypervisor
+%preun xen-hypervisor
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
 
-%preun guest
+%preun xen-guest
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
 
-%preun hypervisor-PAE
+%preun xen-hypervisor-PAE
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
 
-%preun guest-PAE
+%preun xen-guest-PAE
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
 
@@ -1438,7 +1438,7 @@
 %endif
 
 %if %{buildxen}
-%files hypervisor
+%files xen-hypervisor
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
 /boot/System.map-%{KVERREL}hypervisor
@@ -1451,12 +1451,12 @@
 /lib/modules/%{KVERREL}hypervisor/extra
 /lib/modules/%{KVERREL}hypervisor/updates
 
-%files hypervisor-devel
+%files xen-hypervisor-devel
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}hypervisor-%{_target_cpu}
 
-%files guest
+%files xen-guest
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}guest
 /boot/System.map-%{KVERREL}guest
@@ -1469,14 +1469,14 @@
 /lib/modules/%{KVERREL}guest/extra
 /lib/modules/%{KVERREL}guest/updates
 
-%files guest-devel
+%files xen-guest-devel
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
 %endif
 
 %if %{buildxenPAE}
-%files hypervisor-PAE
+%files xen-hypervisor-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
 /boot/System.map-%{KVERREL}hypervisor-PAE
@@ -1489,12 +1489,12 @@
 /lib/modules/%{KVERREL}hypervisor-PAE/extra
 /lib/modules/%{KVERREL}hypervisor-PAE/updates
 
-%files hypervisor-PAE-devel
+%files xen-hypervisor-PAE-devel
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu}
 
-%files guest-PAE
+%files xen-guest-PAE
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}guest-PAE
 /boot/System.map-%{KVERREL}guest-PAE
@@ -1507,7 +1507,7 @@
 /lib/modules/%{KVERREL}guest-PAE/extra
 /lib/modules/%{KVERREL}guest-PAE/updates
 
-%files guest-PAE-devel
+%files xen-guest-PAE-devel
 %defattr(-,root,root)
 %verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu}
 /usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu}



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:09:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:09:24 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.93, 1.94 initscripts.spec,
	1.107, 1.108 sources, 1.101, 1.102
Message-ID: <200602131909.k1DJ9Oli005072@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5057

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	13 Feb 2006 16:10:48 -0000	1.93
+++ .cvsignore	13 Feb 2006 19:09:22 -0000	1.94
@@ -1 +1 @@
-initscripts-8.27.tar.bz2
+initscripts-8.28.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- initscripts.spec	13 Feb 2006 16:10:48 -0000	1.107
+++ initscripts.spec	13 Feb 2006 19:09:22 -0000	1.108
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.27
+Version: 8.28
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,11 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 8.28-1
+- kill nash-hotplug before starting udev (<pjones at redhat.com>)
+- silence warnings on /dev/pts remount (<pjones at redhat.com>)
+- more translation updates
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 8.27-1
 - translation updates
 - lang.sh: revert fix for #176832, it's broken


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	13 Feb 2006 16:10:48 -0000	1.101
+++ sources	13 Feb 2006 19:09:22 -0000	1.102
@@ -1 +1 @@
-0407b0f402736229893a9b8bd74ff255  initscripts-8.27.tar.bz2
+8340e9dd33aaf706f29f24a80353a2d8  initscripts-8.28.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:16:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:16:08 -0500
Subject: rpms/kernel-xen/devel patch-2.6.16-rc2-git12.bz2.sign, 1.1,
	NONE patch-2.6.16-rc2.bz2.sign, 1.1, NONE
Message-ID: <200602131916.k1DJG8r4006936@cvs.devel.redhat.com>

Author: quintela

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

Removed Files:
	patch-2.6.16-rc2-git12.bz2.sign patch-2.6.16-rc2.bz2.sign 
Log Message:
we are in rc3 already


--- patch-2.6.16-rc2-git12.bz2.sign DELETED ---


--- patch-2.6.16-rc2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:16:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:16:54 -0500
Subject: rpms/cman-kernel/devel .cvsignore, 1.20, 1.21 cman-kernel.spec,
	1.134, 1.135 sources, 1.21, 1.22
Message-ID: <200602131916.k1DJGsEN015842@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore cman-kernel.spec sources 
Log Message:
Include new sources for 2.6.16.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	19 Dec 2005 22:28:10 -0000	1.20
+++ .cvsignore	13 Feb 2006 19:16:52 -0000	1.21
@@ -1,16 +1 @@
-cman-kernel-2.6.9-0.tar.gz
-cman-kernel-2.6.10-0.tar.gz
-cman-kernel-2.6.11-0.tar.gz
-cman-kernel-2.6.9-27.tar.gz
-cman-kernel-2.6.11-0.5.devel.1110235827.FC4.tar.gz
-cman-kernel-2.6.11.1.20050419-162405.FC4.tar.gz
-cman-kernel-2.6.11.1.20050419-164153.FC4.tar.gz
-cman-kernel-2.6.11.1-20050419-165357.FC4.tar.gz
-cman-kernel-2.6.11.1-20050419.165550.FC4.tar.gz
-cman-kernel-2.6.11.1-20050419.170309.FC4.tar.gz
-cman-kernel-2.6.11.2-20050420.112235.FC4.tar.gz
-cman-kernel-2.6.11.3-20050425.154843.FC4.tar.gz
-cman-kernel-2.6.11.4-20050517.141233.FC4.tar.gz
-cman-kernel-2.6.11.5-20050601.152643.FC4.tar.gz
-cman-kernel-2.6.14.0-20051108.134753.FC5.tar.gz
-cman-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- cman-kernel.spec	13 Feb 2006 18:56:56 -0000	1.134
+++ cman-kernel.spec	13 Feb 2006 19:16:52 -0000	1.135
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.2
+Release: 20051219.162641.FC5.11.3
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 Dec 2005 22:28:10 -0000	1.21
+++ sources	13 Feb 2006 19:16:52 -0000	1.22
@@ -1 +1 @@
-129f15bb3e29228fe3b37d3d3f9ccfa5  cman-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+129f15bb3e29228fe3b37d3d3f9ccfa5  cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:23:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:23:47 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec, 1.135, 1.136 sources, 1.22,
	1.23
Message-ID: <200602131923.k1DJNlbU017849@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec sources 
Log Message:
Fixed sources.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- cman-kernel.spec	13 Feb 2006 19:16:52 -0000	1.135
+++ cman-kernel.spec	13 Feb 2006 19:23:45 -0000	1.136
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.3
+Release: 20051219.162641.FC5.11.4
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Feb 2006 19:16:52 -0000	1.22
+++ sources	13 Feb 2006 19:23:45 -0000	1.23
@@ -1 +1 @@
-129f15bb3e29228fe3b37d3d3f9ccfa5  cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+9339efb0b79d72ce05caac6f61ce9057  cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:28:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:28:38 -0500
Subject: rpms/GFS-kernel/devel .cvsignore, 1.19, 1.20 GFS-kernel.spec, 1.125,
	1.126 sources, 1.20, 1.21
Message-ID: <200602131928.k1DJSclG027947@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore GFS-kernel.spec sources 
Log Message:
New sources for new kernel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	19 Dec 2005 22:28:40 -0000	1.19
+++ .cvsignore	13 Feb 2006 19:28:35 -0000	1.20
@@ -1,17 +1 @@
-gfs-kernel-2.6.7-2.tar.gz
-gfs-kernel-2.6.10-0.tar.gz
-gfs-kernel-2.6.11-0.tar.gz
-gfs-kernel-2.6.9-26.tar.gz
-gfs-kernel-2.6.11-0.5.devel.1110235827.FC4.tar.gz
-gfs-kernel-2.6.11.1.20050419-162405.FC4.tar.gz
-gfs-kernel-2.6.11.1-20050419.165550.FC4.tar.gz
-gfs-kernel-2.6.11.1-20050419.170309.FC4.tar.gz
-gfs-kernel-2.6.11.2-20050425.154843.FC4.tar.gz
-gfs-kernel-2.6.11.3-20050426.134031.FC4.tar.gz
-gfs-kernel-2.6.11.4-20050503.144108.FC4.tar.gz
-gfs-kernel-2.6.11.5-20050505.133825.FC4.tar.gz
-gfs-kernel-2.6.11.6-20050517.141233.FC4.tar.gz
-gfs-kernel-2.6.11.7-20050519.153509.FC4.tar.gz
-gfs-kernel-2.6.11.8-20050601.152643.FC4.tar.gz
-gfs-kernel-2.6.14.0-20051108.134753.FC5.tar.gz
-gfs-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+gfs-kernel-2.6.15.0-20051219.162641.FC5.tar.gz


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- GFS-kernel.spec	13 Feb 2006 18:57:34 -0000	1.125
+++ GFS-kernel.spec	13 Feb 2006 19:28:35 -0000	1.126
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.10.2
+Release: 20051219.162641.FC5.10.3
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	19 Dec 2005 22:28:40 -0000	1.20
+++ sources	13 Feb 2006 19:28:35 -0000	1.21
@@ -1 +1 @@
-3c4aeecaffe2a3f7d5117f81c95179bd  gfs-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+07947dca249a099f52a02560a97b71d6  gfs-kernel-2.6.15.0-20051219.162641.FC5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:30:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:30:00 -0500
Subject: rpms/dlm-kernel/devel .cvsignore, 1.17, 1.18 dlm-kernel.spec, 1.109,
	1.110 sources, 1.18, 1.19
Message-ID: <200602131930.k1DJU0s7028213@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore dlm-kernel.spec sources 
Log Message:
New sources for new kernel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	19 Dec 2005 22:28:24 -0000	1.17
+++ .cvsignore	13 Feb 2006 19:29:45 -0000	1.18
@@ -1,14 +1 @@
-dlm-kernel-2.6.9-0.tar.gz
-dlm-kernel-2.6.10-0.tar.gz
-dlm-kernel-2.6.11-0.tar.gz
-dlm-kernel-2.6.9-26.tar.gz
-dlm-kernel-2.6.11-0.5.devel.1110235827.FC4.tar.gz
-dlm-kernel-2.6.11.1.20050419-162405.FC4.tar.gz
-dlm-kernel-2.6.11.1-20050419.165550.FC4.tar.gz
-dlm-kernel-2.6.11.1-20050419.170309.FC4.tar.gz
-dlm-kernel-2.6.11.2-20050420.131626.FC4.tar.gz
-dlm-kernel-2.6.11.3-20050425.154843.FC4.tar.gz
-dlm-kernel-2.6.11.4-20050517.141233.FC4.tar.gz
-dlm-kernel-2.6.11.5-20050601.152643.FC4.tar.gz
-dlm-kernel-2.6.14.0-20051108.134753.FC5.tar.gz
-dlm-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+dlm-kernel-2.6.15.0-20051219.162641.FC5.tar.gz


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- dlm-kernel.spec	13 Feb 2006 18:57:18 -0000	1.109
+++ dlm-kernel.spec	13 Feb 2006 19:29:46 -0000	1.110
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.2
+Release: 20051219.162641.FC5.9.3
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 Dec 2005 22:28:24 -0000	1.18
+++ sources	13 Feb 2006 19:29:46 -0000	1.19
@@ -1 +1 @@
-6d18b7abd1fc7b29523a8f469d2bf4fc  dlm-kernel-2.6.14.1-20051219.162641.FC5.tar.gz
+29d3788cee35194f81d70390913530a3  dlm-kernel-2.6.15.0-20051219.162641.FC5.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:31:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:31:42 -0500
Subject: rpms/checkpolicy/devel .cvsignore, 1.55, 1.56 checkpolicy.spec, 1.91,
	1.92 sources, 1.56, 1.57
Message-ID: <200602131931.k1DJVgWZ028417@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28337

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.2-1
- Latest upgrade from NSA
	* Merged optionals in base patch from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Feb 2006 15:33:17 -0000	1.55
+++ .cvsignore	13 Feb 2006 19:31:16 -0000	1.56
@@ -38,3 +38,4 @@
 checkpolicy-1.27.20.tgz
 checkpolicy-1.28.tgz
 checkpolicy-1.29.1.tgz
+checkpolicy-1.29.2.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- checkpolicy.spec	13 Feb 2006 15:28:42 -0000	1.91
+++ checkpolicy.spec	13 Feb 2006 19:31:16 -0000	1.92
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.13-1
+%define libsepolver 1.11.14-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.29.1
-Release: 1.2
+Version: 1.29.2
+Release: 1
 License: GPL
 Group: Development/System
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -47,8 +47,12 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.2-1
+- Latest upgrade from NSA
+	* Merged optionals in base patch from Joshua Brindle.
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.1-1.2
-- Need to build again
+- Need to build againi
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.1-1.1
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	7 Feb 2006 15:33:17 -0000	1.56
+++ sources	13 Feb 2006 19:31:17 -0000	1.57
@@ -1 +1 @@
-b3301f4557cdca4b92d2762ceacd0e8f  checkpolicy-1.29.1.tgz
+763c11f38e568daa8cf154341d1dd195  checkpolicy-1.29.2.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:31:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:31:31 -0500
Subject: rpms/libsemanage/devel .cvsignore, 1.51, 1.52 libsemanage.spec, 1.74,
	1.75 sources, 1.53, 1.54
Message-ID: <200602131931.k1DJVViT028380@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28327

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.23-1
- Upgrade to latest from NSA
	* Merged optionals in base patch from Joshua Brindle.
	* Merged treat seusers/users_extra as optional sections patch from
	  Ivan Gyurdiev.
	* Merged parse_optional fixes from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	7 Feb 2006 15:30:09 -0000	1.51
+++ .cvsignore	13 Feb 2006 19:31:13 -0000	1.52
@@ -54,3 +54,4 @@
 libsemanage-1.5.19.tgz
 libsemanage-1.5.20.tgz
 libsemanage-1.5.21.tgz
+libsemanage-1.5.23.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libsemanage.spec	11 Feb 2006 04:12:41 -0000	1.74
+++ libsemanage.spec	13 Feb 2006 19:31:13 -0000	1.75
@@ -1,13 +1,12 @@
-%define libsepolver 1.11.13-1
+%define libsepolver 1.11.14-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.21
-Release: 2.1
+Version: 1.5.23
+Release: 1
 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 -p2 -b .rhat
 
 %build
 make clean
@@ -77,6 +75,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.23-1
+- Upgrade to latest from NSA
+	* Merged optionals in base patch from Joshua Brindle.
+	* Merged treat seusers/users_extra as optional sections patch from
+	  Ivan Gyurdiev.
+	* Merged parse_optional fixes from Ivan Gyurdiev.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.21-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	7 Feb 2006 15:30:09 -0000	1.53
+++ sources	13 Feb 2006 19:31:17 -0000	1.54
@@ -1 +1 @@
-b102f0d9a53b79927aeeff9c5fe448d0  libsemanage-1.5.21.tgz
+0484ae69e477977a298a64e5084f8856  libsemanage-1.5.23.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:51:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:51:47 -0500
Subject: rpms/selinux-policy/devel users_extra-mls, NONE,
	1.1 users_extra-strict, NONE, 1.1 users_extra-targeted, NONE,
	1.1 policy-20060207.patch, 1.4, 1.5 selinux-policy.spec, 1.105,
	1.106
Message-ID: <200602131951.k1DJplMA015952@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15916

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Added Files:
	users_extra-mls users_extra-strict users_extra-targeted 
Log Message:



--- NEW FILE users_extra-mls ---
user root prefix staff;
user staff_u prefix staff;
user user_u prefix user;
user sysadm_u prefix sysadm;
user secadm_u prefix secadm;


--- NEW FILE users_extra-strict ---
user root prefix staff;
user staff_u prefix staff;
user user_u prefix user;
user sysadm_u prefix sysadm;


--- NEW FILE users_extra-targeted ---
user root prefix user;
user user_u prefix user;

policy-20060207.patch:
 Rules.modular                             |    2 -
 build.conf                                |    6 +--
 policy/mcs                                |   13 +++++-
 policy/modules/admin/kudzu.te             |    2 -
 policy/modules/admin/prelink.te           |    1 
 policy/modules/admin/readahead.te         |    4 +-
 policy/modules/admin/su.if                |    7 +--
 policy/modules/kernel/bootloader.te       |    4 +-
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.fc          |    1 
 policy/modules/kernel/devices.if          |   19 ++++++++++
 policy/modules/kernel/devices.te          |    5 ++
 policy/modules/kernel/domain.te           |    4 +-
 policy/modules/kernel/files.fc            |    2 +
 policy/modules/kernel/files.if            |    2 -
 policy/modules/kernel/filesystem.if       |   57 ++++++++++++++++++++++++++++++
 policy/modules/kernel/terminal.if         |    2 -
 policy/modules/services/apache.fc         |    4 ++
 policy/modules/services/automount.if      |   18 +++++++++
 policy/modules/services/automount.te      |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/cron.if           |    2 -
 policy/modules/services/cron.te           |    1 
 policy/modules/services/fetchmail.te      |    1 
 policy/modules/services/hal.te            |   11 +++++
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    5 ++
 policy/modules/services/networkmanager.te |    7 ++-
 policy/modules/services/postfix.te        |    6 +++
 policy/modules/services/remotelogin.te    |   28 +-------------
 policy/modules/services/sendmail.te       |    1 
 policy/modules/services/spamassassin.te   |    2 +
 policy/modules/services/zebra.te          |    2 -
 policy/modules/system/fstools.te          |    2 +
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/libraries.if        |   20 ++++++++++
 policy/modules/system/libraries.te        |    1 
 policy/modules/system/locallogin.te       |    4 --
 policy/modules/system/logging.te          |    4 +-
 policy/modules/system/mount.te            |    2 +
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 +++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   52 +++++++++++++++++++++++++++
 policy/modules/system/udev.te             |    4 +-
 policy/modules/system/unconfined.if       |    4 +-
 policy/modules/system/unconfined.te       |    6 +++
 policy/modules/system/userdomain.if       |   19 ++++++++++
 policy/modules/system/userdomain.te       |   13 ++++++
 48 files changed, 348 insertions(+), 54 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- policy-20060207.patch	13 Feb 2006 17:14:30 -0000	1.4
+++ policy-20060207.patch	13 Feb 2006 19:51:43 -0000	1.5
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.14/build.conf
 --- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.14/build.conf	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/build.conf	2006-02-13 14:29:38.000000000 -0500
 @@ -8,13 +8,13 @@
  # version policy it supports.  Setting this will
  # override the version.  This only has an
@@ -28,7 +28,7 @@
  # Enable polyinstantiated directory support.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.14/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/mcs	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/mcs	2006-02-13 14:29:38.000000000 -0500
 @@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
@@ -58,7 +58,7 @@
  link unlink rename relabelfrom relabelto }')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.14/policy/modules/admin/kudzu.te
 --- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-07 10:43:25.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/kudzu.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/kudzu.te	2006-02-13 14:29:38.000000000 -0500
 @@ -24,7 +24,6 @@
  allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
  dontaudit kudzu_t self:capability sys_tty_config;
@@ -77,7 +77,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.14/policy/modules/admin/prelink.te
 --- nsaserefpolicy/policy/modules/admin/prelink.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/prelink.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/prelink.te	2006-02-13 14:29:38.000000000 -0500
 @@ -65,6 +65,7 @@
  fs_getattr_xattr_fs(prelink_t)
  
@@ -88,7 +88,7 @@
  libs_use_shared_libs(prelink_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.14/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/readahead.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/readahead.te	2006-02-13 14:29:38.000000000 -0500
 @@ -47,7 +47,9 @@
  fs_search_auto_mountpoints(readahead_t)
  fs_getattr_all_pipes(readahead_t)
@@ -102,7 +102,7 @@
  term_dontaudit_use_console(readahead_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.14/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/su.if	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/admin/su.if	2006-02-13 14:29:38.000000000 -0500
 @@ -23,13 +23,12 @@
  	# Transition from the user domain to this domain.
  	domain_auto_trans($2, su_exec_t, $1_su_t)
@@ -122,7 +122,7 @@
  	allow $1_su_t $2:process sigchld;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.14/policy/modules/kernel/bootloader.te
 --- nsaserefpolicy/policy/modules/kernel/bootloader.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/bootloader.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/bootloader.te	2006-02-13 14:29:38.000000000 -0500
 @@ -71,7 +71,7 @@
  
  allow bootloader_t self:capability { dac_read_search fsetid sys_rawio sys_admin mknod chown };
@@ -143,7 +143,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in	2006-02-13 14:29:38.000000000 -0500
 @@ -124,6 +124,7 @@
  network_port(uucpd, tcp,540,s0)
  network_port(vnc, tcp,5900,s0)
@@ -154,7 +154,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.14/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.fc	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.fc	2006-02-13 14:29:38.000000000 -0500
 @@ -78,6 +78,7 @@
  /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
  /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
@@ -165,7 +165,7 @@
  # originally from named.fc
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.14/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.if	2006-02-12 12:10:27.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.if	2006-02-13 14:29:38.000000000 -0500
 @@ -2656,3 +2656,22 @@
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
@@ -191,7 +191,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.14/policy/modules/kernel/devices.te
 --- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/devices.te	2006-02-13 14:29:38.000000000 -0500
 @@ -159,6 +159,11 @@
  genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
  genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
@@ -206,7 +206,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.14/policy/modules/kernel/domain.te
 --- nsaserefpolicy/policy/modules/kernel/domain.te	2006-02-10 11:31:48.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/domain.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/domain.te	2006-02-13 14:29:38.000000000 -0500
 @@ -63,5 +63,7 @@
  # SELinux identity and role change constraints
  attribute process_uncond_exempt;	# add userhelperdomain to this one
@@ -218,7 +218,7 @@
  neverallow ~{ domain unlabeled_t } *:process *;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.14/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/files.fc	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/files.fc	2006-02-13 14:29:38.000000000 -0500
 @@ -192,6 +192,8 @@
  /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
  
@@ -230,7 +230,7 @@
  /usr/tmp/.*			<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.14/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/files.if	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/files.if	2006-02-13 14:29:38.000000000 -0500
 @@ -2292,7 +2292,7 @@
  		attribute tmpfile;
  	')
@@ -242,7 +242,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.14/policy/modules/kernel/filesystem.if
 --- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/filesystem.if	2006-02-12 12:07:11.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/filesystem.if	2006-02-13 14:29:38.000000000 -0500
 @@ -1033,6 +1033,24 @@
  
  ########################################
@@ -318,20 +318,9 @@
 +
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.14/policy/modules/kernel/mls.te
---- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/mls.te	2006-02-12 11:55:03.000000000 -0500
-@@ -87,6 +87,7 @@
- ')
- 
- ifdef(`enable_mls',`
-+range_transition secadm_t semodule_exec_t s15:c0.c255;
- range_transition initrc_t auditd_exec_t s15:c0.c255;
- range_transition kernel_t init_exec_t s0 - s15:c0.c255;
- range_transition kernel_t lvm_exec_t s0 - s15:c0.c255;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.14/policy/modules/kernel/terminal.if
 --- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/terminal.if	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/kernel/terminal.if	2006-02-13 14:29:38.000000000 -0500
 @@ -430,7 +430,7 @@
  		type devpts_t;
  	')
@@ -343,7 +332,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.14/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/apache.fc	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/apache.fc	2006-02-13 14:29:38.000000000 -0500
 @@ -48,6 +48,7 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
@@ -368,7 +357,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.14/policy/modules/services/automount.if
 --- nsaserefpolicy/policy/modules/services/automount.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/automount.if	2006-02-12 12:07:50.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/automount.if	2006-02-13 14:29:38.000000000 -0500
 @@ -43,3 +43,21 @@
  	corecmd_search_sbin($1)
  	can_exec($1,automount_etc_t)
@@ -393,7 +382,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.14/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/automount.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/automount.te	2006-02-13 14:29:38.000000000 -0500
 @@ -63,6 +63,7 @@
  kernel_read_system_state(automount_t)
  kernel_list_proc(automount_t)
@@ -404,7 +393,7 @@
  corecmd_exec_sbin(automount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.14/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/bluetooth.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/bluetooth.te	2006-02-13 14:29:38.000000000 -0500
 @@ -101,6 +101,7 @@
  
  dev_read_sysfs(bluetooth_t)
@@ -415,7 +404,7 @@
  fs_getattr_all_fs(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.14/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/cron.if	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/cron.if	2006-02-13 14:29:38.000000000 -0500
 @@ -429,7 +429,7 @@
  		type crond_t;
  	')
@@ -427,7 +416,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.14/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-10 11:31:48.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/cron.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/cron.te	2006-02-13 14:29:38.000000000 -0500
 @@ -108,6 +108,7 @@
  
  corecmd_exec_shell(crond_t)
@@ -438,7 +427,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.14/policy/modules/services/fetchmail.te
 --- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/fetchmail.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/fetchmail.te	2006-02-13 14:29:38.000000000 -0500
 @@ -44,6 +44,7 @@
  kernel_list_proc(fetchmail_t)
  kernel_getattr_proc_files(fetchmail_t)
@@ -449,7 +438,7 @@
  corenet_tcp_sendrecv_generic_if(fetchmail_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.14/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/hal.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/hal.te	2006-02-13 14:29:38.000000000 -0500
 @@ -50,6 +50,7 @@
  kernel_read_fs_sysctls(hald_t)
  kernel_write_proc_files(hald_t)
@@ -504,7 +493,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.14/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/mta.if	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/mta.if	2006-02-13 14:29:38.000000000 -0500
 @@ -458,6 +458,7 @@
  
  	allow $1 sendmail_exec_t:lnk_file r_file_perms;
@@ -515,7 +504,7 @@
  	allow system_mail_t $1:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.14/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/mta.te	2006-02-13 10:21:37.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/mta.te	2006-02-13 14:29:38.000000000 -0500
 @@ -30,6 +30,9 @@
  
  mta_base_mail_template(system)
@@ -537,7 +526,7 @@
  		# compatability for old default main.cf
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.14/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/networkmanager.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/networkmanager.te	2006-02-13 14:29:38.000000000 -0500
 @@ -22,7 +22,7 @@
  dontaudit NetworkManager_t self:capability sys_tty_config;
  allow NetworkManager_t self:process { setcap getsched signal_perms };
@@ -561,7 +550,7 @@
  kernel_read_network_state(NetworkManager_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.14/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-13 12:08:11.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-13 14:29:38.000000000 -0500
 @@ -273,6 +273,8 @@
  corecmd_exec_shell(postfix_local_t)
  corecmd_exec_bin(postfix_local_t)
@@ -591,7 +580,7 @@
  allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.14/policy/modules/services/remotelogin.te
 --- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/remotelogin.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/remotelogin.te	2006-02-13 14:29:38.000000000 -0500
 @@ -98,6 +98,7 @@
  files_list_mnt(remote_login_t)
  # for when /var/mail is a sym-link
@@ -634,7 +623,7 @@
 -') dnl endif TODO
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.14/policy/modules/services/sendmail.te
 --- nsaserefpolicy/policy/modules/services/sendmail.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/sendmail.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/sendmail.te	2006-02-13 14:29:38.000000000 -0500
 @@ -65,6 +65,7 @@
  
  # for piping mail to a command
@@ -645,7 +634,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.14/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/spamassassin.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/spamassassin.te	2006-02-13 14:29:38.000000000 -0500
 @@ -77,6 +77,8 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -657,7 +646,7 @@
  dev_read_urand(spamd_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.14/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/zebra.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/services/zebra.te	2006-02-13 14:29:38.000000000 -0500
 @@ -34,7 +34,7 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
@@ -669,7 +658,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.14/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/fstools.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/fstools.te	2006-02-13 14:29:38.000000000 -0500
 @@ -57,6 +57,8 @@
  kernel_rw_unlabeled_dirs(fsadm_t)
  kernel_rw_unlabeled_blk_files(fsadm_t)
@@ -681,7 +670,7 @@
  dev_read_rand(fsadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.14/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/init.fc	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/init.fc	2006-02-13 14:29:38.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -694,7 +683,7 @@
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.14/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/libraries.if	2006-02-12 12:08:28.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/libraries.if	2006-02-13 14:29:38.000000000 -0500
 @@ -80,6 +80,25 @@
  
  ########################################
@@ -731,7 +720,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.14/policy/modules/system/libraries.te
 --- nsaserefpolicy/policy/modules/system/libraries.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/libraries.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/libraries.te	2006-02-13 14:29:38.000000000 -0500
 @@ -53,6 +53,7 @@
  
  allow ldconfig_t ld_so_cache_t:file create_file_perms;
@@ -742,7 +731,7 @@
  allow ldconfig_t lib_t:lnk_file { getattr create read unlink };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.14/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/locallogin.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/locallogin.te	2006-02-13 14:29:38.000000000 -0500
 @@ -214,10 +214,8 @@
  	alsa_domtrans(local_login_t)
  ')
@@ -757,7 +746,7 @@
  # 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.14/policy/modules/system/logging.te
 --- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/logging.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/logging.te	2006-02-13 14:29:38.000000000 -0500
 @@ -92,6 +92,8 @@
  	term_use_unallocated_ttys(auditctl_t)
  ')
@@ -778,7 +767,7 @@
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.14/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/mount.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/mount.te	2006-02-13 14:29:38.000000000 -0500
 @@ -33,6 +33,8 @@
  dev_getattr_all_blk_files(mount_t)
  dev_list_all_dev_nodes(mount_t)
@@ -790,7 +779,7 @@
  storage_raw_write_fixed_disk(mount_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc	2006-02-12 11:57:39.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc	2006-02-13 14:29:38.000000000 -0500
 @@ -10,6 +10,7 @@
  /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
  
@@ -807,7 +796,7 @@
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.14/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.if	2006-02-12 12:03:06.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.if	2006-02-13 14:29:38.000000000 -0500
 @@ -587,6 +587,22 @@
  
  ########################################
@@ -870,7 +859,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.14/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.te	2006-02-12 11:58:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.te	2006-02-13 14:29:38.000000000 -0500
 @@ -245,6 +245,7 @@
  selinux_compute_relabel_context(newrole_t)
  selinux_compute_user_contexts(newrole_t)
@@ -943,7 +932,7 @@
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.14/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/udev.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/udev.te	2006-02-13 14:29:38.000000000 -0500
 @@ -18,6 +18,8 @@
  domain_obj_id_change_exemption(udev_t)
  domain_entry_file(udev_t,udev_helper_exec_t)
@@ -964,7 +953,7 @@
  selinux_validate_context(udev_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.14/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/unconfined.if	2006-02-12 12:13:10.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/unconfined.if	2006-02-13 14:29:38.000000000 -0500
 @@ -19,6 +19,7 @@
  
  	# Use any Linux capability.
@@ -988,7 +977,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.14/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/unconfined.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/unconfined.te	2006-02-13 14:29:38.000000000 -0500
 @@ -152,4 +152,10 @@
  	optional_policy(`xserver',`
  		xserver_domtrans_xdm_xserver(unconfined_t)
@@ -1002,7 +991,7 @@
  ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.14/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/userdomain.if	2006-02-12 12:09:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/userdomain.if	2006-02-13 14:29:38.000000000 -0500
 @@ -3049,6 +3049,25 @@
  
  ########################################
@@ -1031,7 +1020,7 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.14/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/userdomain.te	2006-02-12 11:55:03.000000000 -0500
++++ serefpolicy-2.2.14/policy/modules/system/userdomain.te	2006-02-13 14:29:38.000000000 -0500
 @@ -162,10 +162,16 @@
  		')
  	')
@@ -1070,3 +1059,15 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.14/Rules.modular
+--- nsaserefpolicy/Rules.modular	2006-01-26 16:54:24.000000000 -0500
++++ serefpolicy-2.2.14/Rules.modular	2006-02-13 14:29:38.000000000 -0500
+@@ -81,7 +81,7 @@
+ #
+ $(BASE_PKG): tmp/base.mod $(BASE_FC)
+ 	@echo "Creating $(NAME) base module package"
+-	$(verbose) $(SEMOD_PKG) -o $@ -m tmp/base.mod -f $(BASE_FC)
++	$(verbose) $(SEMOD_PKG) $(USER_EXTRAS) -o $@ -m tmp/base.mod -f $(BASE_FC)
+ 
+ tmp/base.mod: base.conf
+ 	@echo "Compiling $(NAME) base module"


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- selinux-policy.spec	13 Feb 2006 17:14:30 -0000	1.105
+++ selinux-policy.spec	13 Feb 2006 19:51:43 -0000	1.106
@@ -61,7 +61,7 @@
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
 %define installCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} USER_EXTRAS="-u ${RPM_SOURCE_DIR}/users_extra-%1" base.pp \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} modules \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
 %{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
@@ -75,13 +75,11 @@
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
-touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/users_extra \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 ${RPM_SOURCE_DIR}/seusers-%1 ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/modules/active/seusers \
-install -m0644 ${RPM_SOURCE_DIR}/users_extra-%1 ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/modules/active/users_extra \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/setrans.conf \
 %nil
 
@@ -95,11 +93,9 @@
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
-%ghost %{_sysconfdir}/selinux/%1/users_extra \
 %dir %{_sysconfdir}/selinux/%1/modules \
 %attr(700,root,root) %dir %{_sysconfdir}/selinux/%1/modules/active \
 %verify(not md5 size mtime) %attr(600,root,root) %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
-%verify(not md5 size mtime) %attr(600,root,root) %{_sysconfdir}/selinux/%1/modules/active/users_extra \
 %dir %{_sysconfdir}/selinux/%1/policy/ \
 %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \
 %dir %{_sysconfdir}/selinux/%1/contexts \



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:54:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:54:13 -0500
Subject: rpms/policycoreutils/devel .cvsignore, 1.101,
	1.102 policycoreutils-rhat.patch, 1.162,
	1.163 policycoreutils.spec, 1.235, 1.236 sources, 1.105, 1.106
Message-ID: <200602131954.k1DJsDLA017112@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17079

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.23-1
- Update from upstream
	* Merged newrole -V/--version support from Glauber de Oliveira Costa.
	* Merged genhomedircon prefix patch from Dan Walsh.
	* Merged optionals in base patch from Joshua Brindle.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- .cvsignore	7 Feb 2006 15:37:54 -0000	1.101
+++ .cvsignore	13 Feb 2006 19:54:09 -0000	1.102
@@ -90,3 +90,4 @@
 policycoreutils-1.29.18.tgz
 policycoreutils-1.29.19.tgz
 policycoreutils-1.29.20.tgz
+policycoreutils-1.29.23.tgz

policycoreutils-rhat.patch:
 seobject.py |  397 +++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 222 insertions(+), 175 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- policycoreutils-rhat.patch	10 Feb 2006 17:04:04 -0000	1.162
+++ policycoreutils-rhat.patch	13 Feb 2006 19:54:09 -0000	1.163
@@ -1,156 +1,3 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.20/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon	2006-01-30 18:32:39.000000000 -0500
-+++ policycoreutils-1.29.20/scripts/genhomedircon	2006-02-09 10:27:15.000000000 -0500
-@@ -4,7 +4,7 @@
- #
- # genhomedircon - this script is used to generate file context
- # configuration entries for user home directories based on their
--# default roles and is run when building the policy. Specifically, we
-+# default prefixes and is run when building the policy. Specifically, we
- # replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files with
- # generic and user-specific values.
- #
-@@ -15,9 +15,7 @@
- # The file CONTEXTDIR/files/homedir_template exists.  This file is used to
- # set up the home directory context for each real user.
- # 
--# If a user has more than one role, genhomedircon uses the first role in the list.
--#
--# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, role user
-+# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, prefix user
- #
- # "Real" users (as opposed to system users) are those whose UID is greater than
- #  or equal STARTING_UID (usually 500) and whose login is not a member of
-@@ -170,37 +168,34 @@
- 	def heading(self):
- 		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
- 		if self.semanaged:
--			ret += "# use seusers command to manage system users in order to change the file_context\n#\n#\n"
-+			ret += "# use semanage command to manage system users in order to change the file_context\n#\n#\n"
- 		else:
- 			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
- 		return ret
- 
--	def defaultrole(self, name):
-+	def get_default_prefix(self, name):
- 		for idx in range(self.usize):
- 			user = semanage_user_by_idx(self.ulist, idx)
- 			if semanage_user_get_name(user) == name:
--				if name == "staff_u" or name == "root" and self.type != "targeted":
--					return "staff_r"
--				else:
--					return "user_r"
-+				return semanage_user_get_prefix(user)
- 		return name
--	def getOldRole(self, role):
--		rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % role)
-+	def get_old_prefix(self, user):
-+		rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % user)
- 		if rc == "":					    
--			rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % role)
-+			rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % user)
- 		if rc != "":
- 			user=rc.split()
--			role = user[3]
--			if role == "{":
--				role = user[4]
--		return role
-+			prefix = user[3]
-+			if prefix == "{":
-+				prefix = user[4]
-+		if len(prefix) > 2 and (prefix[-2:] == "_r" or prefix[-2:] == "_u"):
-+			prefix = prefix[:-2]
-+		return prefix
- 		
--	def adduser(self, udict, user, seuser, role):
--		if seuser == "user_u" or user == "__default__":
-+	def adduser(self, udict, user, seuser, prefix):
-+		if seuser == "user_u" or user == "__default__" or user == "system_u":
- 			return
--		# !!! chooses first role in the list to use in the file context !!!
--		if role[-2:] == "_r" or role[-2:] == "_u":
--			role = role[:-2]
-+		# !!! chooses first prefix in the list to use in the file context !!!
- 		try:
- 			home = pwd.getpwnam(user)[5]
- 			if home == "/":
-@@ -217,7 +212,7 @@
- 				return
- 		prefs = {}
- 		prefs["seuser"] = seuser
--		prefs["role"] = role
-+		prefs["prefix"] = prefix
- 		prefs["home"] = home
- 		udict[user] = prefs
- 		
-@@ -229,7 +224,7 @@
- 				user=[]
- 				seuser = semanage_seuser_by_idx(list, idx)
- 				seusername=semanage_seuser_get_sename(seuser)
--				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.defaultrole(seusername))
-+				self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.get_default_prefix(seusername))
- 				
- 		else:
- 			try:
-@@ -242,8 +237,8 @@
- 					if len(user) < 2:
- 						continue
- 					
--					role=self.getOldRole(user[1])
--					self.adduser(udict, user[0], user[1], role)
-+					prefix=self.get_old_prefix(user[1])
-+					self.adduser(udict, user[0], user[1], prefix)
- 				fd.close()
- 			except IOError, error:
- 				# Must be install so force add of root
-@@ -251,40 +246,37 @@
- 
- 		return udict
- 
--	def getHomeDirContext(self, user, seuser, home, role):
-+	def getHomeDirContext(self, user, seuser, home, prefix):
- 		ret="\n\n#\n# Home Context for user %s\n#\n\n" % user
- 		fd=open(self.getHomeDirTemplate(), 'r')
- 		for i in  fd.read().split('\n'):
- 			if i.startswith("HOME_DIR") == 1:
- 				i=i.replace("HOME_DIR", home)
--				i=i.replace("ROLE", role)
-+				i=i.replace("ROLE", prefix)
- 				i=i.replace("system_u", seuser)
- 				ret = ret+i+"\n"
- 		fd.close()
- 		return ret
- 
--	def getUserContext(self, user, sel_user, role):
-+	def getUserContext(self, user, sel_user, prefix):
- 		ret=""
- 		fd=open(self.getHomeDirTemplate(), 'r')
- 		for i in  fd.read().split('\n'):
- 			if i.find("USER") == 1:
- 				i=i.replace("USER", user)
--				i=i.replace("ROLE", role)
-+				i=i.replace("ROLE", prefix)
- 				i=i.replace("system_u", sel_user)
- 				ret=ret+i+"\n"
- 		fd.close()
- 		return ret
- 
- 	def genHomeDirContext(self):
--		if self.semanaged and grep(self.getHomeDirTemplate(), "ROLE") != "":
--			warning("genhomedircon:  Warning!  No support yet for expanding ROLE macros in the %s file when using libsemanage." % self.getHomeDirTemplate());
--			warning("genhomedircon:  You must manually update file_contexts.homedirs for any non-user_r users (including root).");
- 		users = self.getUsers()
- 		ret=""
--		# Fill in HOME and ROLE for users that are defined
-+		# Fill in HOME and prefix for users that are defined
- 		for u in users.keys():
--			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["role"])
--			ret += self.getUserContext (u, users[u]["seuser"], users[u]["role"])
-+			ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["prefix"])
-+			ret += self.getUserContext (u, users[u]["seuser"], users[u]["prefix"])
- 		return ret+"\n"
- 
- 	def checkExists(self, home):
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.20/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
 +++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-10 11:48:59.000000000 -0500


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- policycoreutils.spec	11 Feb 2006 05:12:23 -0000	1.235
+++ policycoreutils.spec	13 Feb 2006 19:54:09 -0000	1.236
@@ -1,11 +1,11 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.11.13-1
-%define libsemanagever 1.5.21-2
+%define libsepolver 1.11.14-1
+%define libsemanagever 1.5.23-1
 %define libselinuxver 1.29.7-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.20
-Release: 2.1
+Version: 1.29.23
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -98,6 +98,12 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.23-1
+- Update from upstream
+	* Merged newrole -V/--version support from Glauber de Oliveira Costa.
+	* Merged genhomedircon prefix patch from Dan Walsh.
+	* Merged optionals in base patch from Joshua Brindle.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.29.20-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	7 Feb 2006 15:37:54 -0000	1.105
+++ sources	13 Feb 2006 19:54:09 -0000	1.106
@@ -1 +1 @@
-3b3793a52a940f5ec19a077965625b18  policycoreutils-1.29.20.tgz
+b57167cc3ee8d8d49cbb848ebe5628d5  policycoreutils-1.29.23.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:56:50 -0500
Subject: rpms/gnome-session/devel .cvsignore, 1.18, 1.19 gnome-session.spec,
	1.54, 1.55 sources, 1.18, 1.19
Message-ID: <200602131956.k1DJuorD018400@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-session.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	28 Jan 2006 05:13:05 -0000	1.18
+++ .cvsignore	13 Feb 2006 19:56:46 -0000	1.19
@@ -3,3 +3,4 @@
 gnome-session-2.13.4.tar.bz2
 gnome-session-2.13.5.tar.bz2
 gnome-session-2.13.90.tar.bz2
+gnome-session-2.13.91.tar.bz2


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-session.spec	11 Feb 2006 03:17:20 -0000	1.54
+++ gnome-session.spec	13 Feb 2006 19:56:46 -0000	1.55
@@ -12,8 +12,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.13.90
-Release: 1.2
+Version: 2.13.91
+Release: 1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -152,6 +152,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	28 Jan 2006 05:13:05 -0000	1.18
+++ sources	13 Feb 2006 19:56:46 -0000	1.19
@@ -1 +1 @@
-f908dc6da3094a4b9fccd6f294828fb7  gnome-session-2.13.90.tar.bz2
+3c580ad3870a70348b8c20d060833ce8  gnome-session-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 19:57:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 14:57:30 -0500
Subject: rpms/perl/devel perl-5.8.8-up27133_up27169.patch,NONE,1.1
Message-ID: <200602131957.k1DJvUYc018766@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	perl-5.8.8-up27133_up27169.patch 
Log Message:
upstream patch 27170

perl-5.8.8-up27133_up27169.patch:
 ext/threads/threads.xs |    2 +-
 regcomp.c              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-5.8.8-up27133_up27169.patch ---
--- perl-5.8.8/ext/threads/threads.xs.up27133_up27169	2005-10-16 13:53:32.000000000 -0400
+++ perl-5.8.8/ext/threads/threads.xs	2006-02-13 14:21:47.000000000 -0500
@@ -623,7 +623,7 @@
 	  PerlInterpreter *other_perl = thread->interp;
 	  CLONE_PARAMS clone_params;
 	  clone_params.stashes = newAV();
-	  clone_params.flags |= CLONEf_JOIN_IN;
+	  clone_params.flags = CLONEf_JOIN_IN;
 	  PL_ptr_table = ptr_table_new();
 	  current_thread = Perl_ithread_get(aTHX);
 	  Perl_ithread_set(aTHX_ thread);
--- perl-5.8.8/regcomp.c.up27133_up27169	2006-01-08 15:59:27.000000000 -0500
+++ perl-5.8.8/regcomp.c	2006-02-13 14:23:26.000000000 -0500
@@ -1810,7 +1810,7 @@
     r->subbeg = NULL;
     r->reganch = pm->op_pmflags & PMf_COMPILETIME;
     r->nparens = RExC_npar - 1;	/* set early to validate backrefs */
-
+    r->lastparen = 0;                   /* mg.c reads this.  */
     r->substrs = 0;			/* Useful during FAIL. */
     r->startp = 0;			/* Useful during FAIL. */
     r->endp = 0;			/* Useful during FAIL. */



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:01:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:01:50 -0500
Subject: rpms/perl/devel perl.spec,1.85,1.86
Message-ID: <200602132001.k1DK1oGR019661@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	perl.spec 
Log Message:
apply upstream patch 27170; fix release tag


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- perl.spec	11 Feb 2006 04:57:50 -0000	1.85
+++ perl.spec	13 Feb 2006 20:01:15 -0000	1.86
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver    5.8.8
-%define perlrel    2
+%define perlrel    3
 %define perlepoch  4
 
 %{?!perl_debugging:    %define perl_debugging 0}
@@ -43,7 +43,7 @@
 
 Name:           perl
 Version:        %{perlver}
-Release:        %{perlrel}.1
+Release:        %{perlrel}
 Epoch:          %{perlepoch}
 Summary:        The Perl programming language
 
@@ -147,6 +147,9 @@
 #
 # Debian's fix for Net::NNTP:
 Patch32:        perl-5.8.8-debian_fix_net_nntp.patch
+#
+# Upstream patches 27133 and 27169 (27170):
+Patch33: 	perl-5.8.8-up27133_up27169.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gawk, grep, tcsh, dos2unix, man, groff
@@ -321,6 +324,8 @@
 
 %patch32 -p1
 
+%patch33 -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()
@@ -529,6 +534,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Jason Vas Dias <jvdias at redhat.com> - 4:5.8.8-3
+- Apply upstream bugfix patch 27170
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:5.8.8-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:03:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:03:37 -0500
Subject: rpms/gok/devel .cvsignore, 1.15, 1.16 gok.spec, 1.28, 1.29 sources,
	1.15, 1.16
Message-ID: <200602132003.k1DK3bcD019760@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gok/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19696

Modified Files:
	.cvsignore gok.spec sources 
Log Message:
1.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	28 Jun 2005 16:37:23 -0000	1.15
+++ .cvsignore	13 Feb 2006 20:03:01 -0000	1.16
@@ -6,3 +6,4 @@
 gok-1.0.2.tar.bz2
 gok-1.0.3.tar.bz2
 gok-1.0.5.tar.bz2
+gok-1.0.6.tar.bz2


Index: gok.spec
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gok.spec	11 Feb 2006 03:19:47 -0000	1.28
+++ gok.spec	13 Feb 2006 20:03:02 -0000	1.29
@@ -2,16 +2,14 @@
 
 Summary: GNOME Onscreen Keyboard
 Name: gok
-Version: 1.0.5
-Release: 6.2.1
+Version: 1.0.6
+Release: 1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gok.ca/
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gok/1.0/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Patch2: gok-0.10.2-launcher.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=322062
-Patch3: gok-1.0.5-realloc.patch
 Patch4: gok-1.0.5-crash.patch
 
 PreReq:         scrollkeeper >= 0.1.4
@@ -50,7 +48,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .launcher
-%patch3 -p1 -b .realloc
 %patch4 -p1 -b .crash
 
 %build
@@ -106,6 +103,9 @@
 %{_libdir}/pkgconfig/*pc
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.6-1
+- Update to 1.0.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-6.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gok/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	28 Jun 2005 16:37:23 -0000	1.15
+++ sources	13 Feb 2006 20:03:04 -0000	1.16
@@ -1 +1 @@
-a9334a0e1dc11bbba817c128503260b0  gok-1.0.5.tar.bz2
+9dba56d24a16784d7945a18c95dabc55  gok-1.0.6.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:08:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:08:15 -0500
Subject: rpms/gulm/devel .cvsignore, 1.4, 1.5 gulm.spec, 1.25, 1.26 sources,
	1.10, 1.11
Message-ID: <200602132008.k1DK8Flo020549@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gulm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20516

Modified Files:
	.cvsignore gulm.spec sources 
Log Message:
Synced to RHEL-4.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Oct 2004 21:34:16 -0000	1.4
+++ .cvsignore	13 Feb 2006 20:08:13 -0000	1.5
@@ -1 +1 @@
-gulm-1.0-pre2.tar.gz
+gulm-1.0.6.tar.gz


Index: gulm.spec
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/gulm.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gulm.spec	11 Feb 2006 03:23:19 -0000	1.25
+++ gulm.spec	13 Feb 2006 20:08:13 -0000	1.26
@@ -11,8 +11,8 @@
 ###############################################################################
 
 Name: gulm
-Version: 1.0.5
-Release: 0.FC5.1.2
+Version: 1.0.6
+Release: 0.FC5.1
 License: GPL
 Group: System Environment/Daemons
 Summary: gulm - One possible lock manager for GFS


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gulm/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	16 Dec 2005 22:41:48 -0000	1.10
+++ sources	13 Feb 2006 20:08:13 -0000	1.11
@@ -1 +1 @@
-b31012f3703a6123ff638992b6fb0765  gulm-1.0.5.tar.gz
+6635e2477848d2266f0f00874cd498dc  gulm-1.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:10:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:10:00 -0500
Subject: rpms/metacity/devel .cvsignore, 1.30, 1.31 metacity.spec, 1.52,
	1.53 sources, 1.30, 1.31
Message-ID: <200602132010.k1DKA0Kl021385@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
2.13.89



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	30 Jan 2006 20:25:27 -0000	1.30
+++ .cvsignore	13 Feb 2006 20:09:57 -0000	1.31
@@ -1,3 +1,4 @@
 metacity-2.13.21.tar.bz2
 metacity-2.13.34.tar.bz2
 metacity-2.13.55.tar.bz2
+metacity-2.13.89.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- metacity.spec	11 Feb 2006 04:33:20 -0000	1.52
+++ metacity.spec	13 Feb 2006 20:09:57 -0000	1.53
@@ -2,8 +2,8 @@
 
 Summary: Metacity window manager
 Name: metacity
-Version: 2.13.55
-Release: 1.2
+Version: 2.13.89
+Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
@@ -106,6 +106,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.89-1
+- Update to 2.13.89
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.55-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Jan 2006 20:25:27 -0000	1.30
+++ sources	13 Feb 2006 20:09:57 -0000	1.31
@@ -1 +1 @@
-34ee1ce1c7f6d8c7d29beb2f2265c752  metacity-2.13.55.tar.bz2
+836cf722209c59babff98075498193b9  metacity-2.13.89.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:10:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:10:08 -0500
Subject: rpms/gail/devel .cvsignore, 1.16, 1.17 gail.spec, 1.35, 1.36 sources,
	1.16, 1.17
Message-ID: <200602132010.k1DKA85s021452@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20090

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 Nov 2005 13:34:53 -0000	1.16
+++ .cvsignore	13 Feb 2006 20:10:05 -0000	1.17
@@ -5,3 +5,4 @@
 gail-1.8.4.tar.bz2
 gail-1.8.5.tar.bz2
 gail-1.8.8.tar.bz2
+gail-1.8.9.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gail.spec	11 Feb 2006 02:47:10 -0000	1.35
+++ gail.spec	13 Feb 2006 20:10:05 -0000	1.36
@@ -4,8 +4,8 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.8.8
-Release: 3.1
+Version: 1.8.9
+Release: 1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -86,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.9-1
+- Update to 1.8.9
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.8-3.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	30 Nov 2005 13:34:54 -0000	1.16
+++ sources	13 Feb 2006 20:10:05 -0000	1.17
@@ -1 +1 @@
-9fd96f8f702b46c328329468632c0729  gail-1.8.8.tar.bz2
+24c7313ed474806e720adfd7c234ee8d  gail-1.8.9.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:26:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:26:23 -0500
Subject: rpms/gnbd-kernel/devel .cvsignore, 1.12, 1.13 gnbd-kernel.spec,
	1.118, 1.119 sources, 1.15, 1.16
Message-ID: <200602132026.k1DKQNoC009048@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore gnbd-kernel.spec sources 
Log Message:
Build for 2.6.15 kernel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Jan 2006 20:02:57 -0000	1.12
+++ .cvsignore	13 Feb 2006 20:26:20 -0000	1.13
@@ -1 +1 @@
-gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz
+gnbd-kernel-2.6.15-0.tar.gz


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- gnbd-kernel.spec	13 Feb 2006 18:57:09 -0000	1.118
+++ gnbd-kernel.spec	13 Feb 2006 20:26:20 -0000	1.119
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 1
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 20051108.134753.FC5
+%define subversion 0
 
 %ifnarch i686
 %define buildsmp 0
@@ -24,8 +24,8 @@
 %endif
 
 Name: gnbd-kernel
-Version: 2.6.15.0
-Release: 20051108.134753.FC5.18.2
+Version: 2.6.15
+Release: 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	13 Jan 2006 20:11:57 -0000	1.15
+++ sources	13 Feb 2006 20:26:20 -0000	1.16
@@ -1 +1 @@
-e80582426a34fc242414a0eb57cf212b  gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz
+07524aa943010883d4de8873daeb35c8  gnbd-kernel-2.6.15-0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:27:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:27:09 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.119,1.120
Message-ID: <200602132027.k1DKR9uA009458@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Bumped rev.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- gnbd-kernel.spec	13 Feb 2006 20:26:20 -0000	1.119
+++ gnbd-kernel.spec	13 Feb 2006 20:27:07 -0000	1.120
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 0
+Release: 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 Feb 13 20:30:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:30:43 -0500
Subject: rpms/GFS-kernel/devel .cvsignore, 1.20, 1.21 GFS-kernel.spec, 1.126,
	1.127 sources, 1.21, 1.22
Message-ID: <200602132030.k1DKUhp0010436@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore GFS-kernel.spec sources 
Log Message:
Build for 2.6.15 kernel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Feb 2006 19:28:35 -0000	1.20
+++ .cvsignore	13 Feb 2006 20:30:40 -0000	1.21
@@ -1 +1 @@
-gfs-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+gfs-kernel-2.6.15-0.tar.gz


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- GFS-kernel.spec	13 Feb 2006 19:28:35 -0000	1.126
+++ GFS-kernel.spec	13 Feb 2006 20:30:40 -0000	1.127
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 20051219.162641.FC5
+%define subversion 0
 
 %ifnarch i686
 %define buildsmp 0
@@ -24,8 +24,8 @@
 %endif 
 
 Name: GFS-kernel
-Version: 2.6.15.0
-Release: 20051219.162641.FC5.10.3
+Version: 2.6.15
+Release: 1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Feb 2006 19:28:35 -0000	1.21
+++ sources	13 Feb 2006 20:30:40 -0000	1.22
@@ -1 +1 @@
-07947dca249a099f52a02560a97b71d6  gfs-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+9701102f3ed585a5eb57574c0a0930b7  gfs-kernel-2.6.15-0.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:32:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:32:59 -0500
Subject: rpms/gail/devel gail.spec,1.36,1.37
Message-ID: <200602132032.k1DKWxbQ010612@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10564

Modified Files:
	gail.spec 
Log Message:
build api docs



Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gail.spec	13 Feb 2006 20:10:05 -0000	1.36
+++ gail.spec	13 Feb 2006 20:32:47 -0000	1.37
@@ -20,6 +20,7 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
+BuildRequires: gtk-doc
 
 Patch0: gail-1.8.8-combobox-name.patch
 
@@ -51,7 +52,7 @@
 automake
 autoconf
 autoheader
-%configure --disable-gtk-doc
+%configure --enable-gtk-doc
 
 make ##%{?_smp_mflags}
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:36:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:36:03 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.218, 1.219 anaconda.spec, 1.338,
	1.339 sources, 1.337, 1.338
Message-ID: <200602132036.k1DKa34B011140@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11104/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.2-1 on branch devel from anaconda-10.92.2-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- .cvsignore	13 Feb 2006 16:35:42 -0000	1.218
+++ .cvsignore	13 Feb 2006 20:36:00 -0000	1.219
@@ -1 +1 @@
-anaconda-10.92.1.tar.bz2
+anaconda-10.92.2.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- anaconda.spec	13 Feb 2006 16:35:43 -0000	1.338
+++ anaconda.spec	13 Feb 2006 20:36:00 -0000	1.339
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.1
+Version: 10.92.2
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,9 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.2-1
+- more x86_64 xen guest fixing
+
 * Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.1-1
 - try to fix x86_64 xen guest
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- sources	13 Feb 2006 16:35:43 -0000	1.337
+++ sources	13 Feb 2006 20:36:01 -0000	1.338
@@ -1 +1 @@
-3be1e4c4a7035ae1c314cfad3bd95458  anaconda-10.92.1.tar.bz2
+202bf35496499e334ba3c73624523775  anaconda-10.92.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:45:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:45:52 -0500
Subject: rpms/gnbd-kernel/devel .cvsignore, 1.13, 1.14 gnbd-kernel.spec,
	1.120, 1.121 sources, 1.16, 1.17
Message-ID: <200602132045.k1DKjqeW015535@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore gnbd-kernel.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	13 Feb 2006 20:26:20 -0000	1.13
+++ .cvsignore	13 Feb 2006 20:45:48 -0000	1.14
@@ -1 +1 @@
-gnbd-kernel-2.6.15-0.tar.gz
+gnbd-kernel-2.6.15-1.tar.gz


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gnbd-kernel.spec	13 Feb 2006 20:27:07 -0000	1.120
+++ gnbd-kernel.spec	13 Feb 2006 20:45:48 -0000	1.121
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 1
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 0
+%define subversion 1
 
 %ifnarch i686
 %define buildsmp 0
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 1
+Release: 2
 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Feb 2006 20:26:20 -0000	1.16
+++ sources	13 Feb 2006 20:45:48 -0000	1.17
@@ -1 +1 @@
-07524aa943010883d4de8873daeb35c8  gnbd-kernel-2.6.15-0.tar.gz
+7f9332c03380a41ebe16b3f7b03755f7  gnbd-kernel-2.6.15-1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 20:57:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 15:57:58 -0500
Subject: rpms/libsepol/devel libsepol.spec,1.110,1.111
Message-ID: <200602132057.k1DKvwwv000963@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv932

Modified Files:
	libsepol.spec 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-2
- Fix post install not to fire if /dev/initctr does not exist



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- libsepol.spec	13 Feb 2006 15:50:33 -0000	1.110
+++ libsepol.spec	13 Feb 2006 20:57:55 -0000	1.111
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.11.14
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -60,7 +60,7 @@
 
 %post
 /sbin/ldconfig
-[ -x /sbin/telinit ] && /sbin/telinit U
+[ -x /sbin/telinit ] && [ -p /dev/initctl ]  && /sbin/telinit U
 exit 0
 
 %postun -p /sbin/ldconfig
@@ -80,6 +80,9 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-2
+- Fix post install not to fire if /dev/initctr does not exist
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-1
 - Upgrade to latest from NSA
 	* Merged optionals in base patch from Joshua Brindle.



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:00:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:00:12 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.121,1.122
Message-ID: <200602132100.k1DL0CgQ007219@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Don't build xen.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- gnbd-kernel.spec	13 Feb 2006 20:45:48 -0000	1.121
+++ gnbd-kernel.spec	13 Feb 2006 20:59:55 -0000	1.122
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1941_FC5
 %define subversion 1
 
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 2
+Release: 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  Mon Feb 13 21:04:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:04:28 -0500
Subject: rpms/GFS-kernel/devel .cvsignore, 1.21, 1.22 GFS-kernel.spec, 1.127,
	1.128 sources, 1.22, 1.23
Message-ID: <200602132104.k1DL4SVW024787@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore GFS-kernel.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Feb 2006 20:30:40 -0000	1.21
+++ .cvsignore	13 Feb 2006 21:03:55 -0000	1.22
@@ -1 +1 @@
-gfs-kernel-2.6.15-0.tar.gz
+gfs-kernel-2.6.15-1.tar.gz


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- GFS-kernel.spec	13 Feb 2006 20:30:40 -0000	1.127
+++ GFS-kernel.spec	13 Feb 2006 21:04:12 -0000	1.128
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 0
+%define subversion 1
 
 %ifnarch i686
 %define buildsmp 0
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Feb 2006 20:30:40 -0000	1.22
+++ sources	13 Feb 2006 21:04:12 -0000	1.23
@@ -1 +1 @@
-9701102f3ed585a5eb57574c0a0930b7  gfs-kernel-2.6.15-0.tar.gz
+45239d2618e3b4ebac3bca76d2340d20  gfs-kernel-2.6.15-1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:14:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:14:44 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.91, 1.92 mkinitrd.spec, 1.101,
	1.102 sources, 1.97, 1.98
Message-ID: <200602132114.k1DLEi8F028420@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28404

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.23-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore	11 Feb 2006 18:39:21 -0000	1.91
+++ .cvsignore	13 Feb 2006 21:14:42 -0000	1.92
@@ -1 +1 @@
-mkinitrd-5.0.22.tar.bz2
+mkinitrd-5.0.23.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- mkinitrd.spec	13 Feb 2006 18:41:39 -0000	1.101
+++ mkinitrd.spec	13 Feb 2006 21:14:42 -0000	1.102
@@ -1,7 +1,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.22
-Release: 1.1
+Version: 5.0.23
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: mkinitrd-%{version}.tar.bz2
@@ -63,6 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 5.0.23-1
+- add basic hotplug handler and firmware loader
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 5.0.22-1.1
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sources	11 Feb 2006 18:39:21 -0000	1.97
+++ sources	13 Feb 2006 21:14:42 -0000	1.98
@@ -1 +1 @@
-ba56a92a34fb7b22cebac0d2249cf980  mkinitrd-5.0.22.tar.bz2
+377718f04e3b757223c4746370b534f7  mkinitrd-5.0.23.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:17:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:17:19 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.20, 1.21 pykickstart.spec, 1.20,
	1.21 sources, 1.21, 1.22
Message-ID: <200602132117.k1DLHJXO008591@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7114

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	13 Feb 2006 16:25:41 -0000	1.20
+++ .cvsignore	13 Feb 2006 21:17:17 -0000	1.21
@@ -9,3 +9,4 @@
 pykickstart-0.17.tar.gz
 pykickstart-0.18.tar.gz
 pykickstart-0.19.tar.gz
+pykickstart-0.20.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pykickstart.spec	13 Feb 2006 16:25:41 -0000	1.20
+++ pykickstart.spec	13 Feb 2006 21:17:17 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.19
+Version: 0.20
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,9 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Mon Feb 13 2006 Chris Lumens <clumens at redhat.com> 0.20-1
+- Correctly set --noformat and --useexisting on lvm and raid.
+
 * Mon Feb 13 2006 Chris Lumens <clumens at redhat.com> 0.19-1
 - --onboot requires a value (#180987).
 - Be more strict about commands that don't take arguments.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Feb 2006 16:25:41 -0000	1.21
+++ sources	13 Feb 2006 21:17:17 -0000	1.22
@@ -1 +1 @@
-3cfdfcf3541b645faa279d06a6e7fbfa  pykickstart-0.19.tar.gz
+ba07f292ce3fc3a767e401c3ad9b84be  pykickstart-0.20.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:17:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:17:52 -0500
Subject: rpms/kernel/devel/configs config-x86-generic, 1.34,
	1.35 config-x86_64-generic, 1.30, 1.31 config-xen-generic, 1.7,
	1.8 config-xen-x86_64, 1.1, 1.2 config-xen-xen0, 1.3,
	1.4 config-xen-xenU, 1.2, 1.3
Message-ID: <200602132117.k1DLHqwN008734@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-x86-generic config-x86_64-generic config-xen-generic 
	config-xen-x86_64 config-xen-xen0 config-xen-xenU 
Log Message:
Merge kernel-xen back to kernel



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- config-x86-generic	13 Feb 2006 00:33:52 -0000	1.34
+++ config-x86-generic	13 Feb 2006 21:17:48 -0000	1.35
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+CONFIG_X86_64_XEN is not set
 #
 # Processor type and features
 #
@@ -48,6 +49,7 @@
 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


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-x86_64-generic	13 Feb 2006 00:33:52 -0000	1.30
+++ config-x86_64-generic	13 Feb 2006 21:17:48 -0000	1.31
@@ -1,4 +1,5 @@
 CONFIG_UID16=y
+# CONFIG_X86_64_XEN is not set
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set
 CONFIG_GENERIC_CPU=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-xen-generic	24 Aug 2005 02:28:49 -0000	1.7
+++ config-xen-generic	13 Feb 2006 21:17:48 -0000	1.8
@@ -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,12 @@
 # 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
 
 #
 # X86 Processor Configuration
 #
-CONFIG_XENARCH="i386"
+CONFIG_X86_XEN=y
+# CONFIG_X86_PC is not set
 CONFIG_MMU=y
 CONFIG_UID16=y
 CONFIG_GENERIC_ISA_DMA=y
@@ -57,9 +55,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,6 +73,7 @@
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_4KSTACKS is not set
 # CONFIG_KPROBES is not set
+# CONFIG_DEBUG_RODATA is not set
 
 #
 # Disabled until I figure out a way to make next_ram_page work
@@ -103,3 +102,9 @@
 # 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


Index: config-xen-x86_64
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-x86_64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-x86_64	27 Apr 2005 20:57:41 -0000	1.1
+++ config-xen-x86_64	13 Feb 2006 21:17:48 -0000	1.2
@@ -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


Index: config-xen-xen0
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen0,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-xen0	23 Feb 2005 21:50:59 -0000	1.3
+++ config-xen-xen0	13 Feb 2006 21:17:48 -0000	1.4
@@ -5,9 +5,10 @@
 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)
@@ -49,6 +50,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 +59,15 @@
 # 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


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/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	13 Feb 2006 21:17:48 -0000	1.3
@@ -6,8 +6,9 @@
 # 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
@@ -69,3 +70,11 @@
 #
 # CONFIG_ATMEL is not set
 # CONFIG_IEEE80211 is not set
+
+# 
+# TPM
+# 
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+
+# CONFIG_TOSHIBA is not set
+# CONFIG_MICROCODE is not set



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:17:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:17:50 -0500
Subject: rpms/kernel/devel linux-2.6-intel-cache-build.patch, NONE,
	1.1 linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, NONE,
	1.1 linux-2.6-vdso-xen.patch, NONE,
	1.1 linux-2.6-xen-acpi.patch, NONE,
	1.1 linux-2.6-xen-compile-fixes.patch, NONE,
	1.1 linux-2.6-xen-gcc-4.1-compile-fix.patch, NONE,
	1.1 linux-2.6-xen-guest-enable-char-devices.patch, NONE,
	1.1 linux-2.6-xen-merge.patch, NONE,
	1.1 linux-2.6-xen-no-tls-warn.patch, NONE,
	1.1 linux-2.6-xen-x86_64-fixes.patch, NONE,
	1.1 linux-2.6-xen_net_read_mac_export.patch, NONE,
	1.1 linux-2.6-xen_remap_vma_flags.patch, NONE,
	1.1 patch-2.6.16-rc3-git1.bz2.sign, NONE, 1.1 .cvsignore,
	1.349, 1.350 kernel-2.6.spec, 1.1943,
	1.1944 linux-2.6-crash-xen.patch, 1.1,
	1.2 linux-2.6-crashdump-common.patch, 1.8,
	1.9 linux-2.6-execshield-fixes.patch, 1.3,
	1.4 linux-2.6-execshield-xen.patch, 1.1,
	1.2 linux-2.6-xen-vdso-note.patch, 1.1, 1.2 sources, 1.291,
	1.292 upstream, 1.266,
	1.267 linux-2.6.14-intel-cache-build.patch, 1.1, NONE
Message-ID: <200602132117.k1DLHonq008665@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-crash-xen.patch 
	linux-2.6-crashdump-common.patch 
	linux-2.6-execshield-fixes.patch 
	linux-2.6-execshield-xen.patch linux-2.6-xen-vdso-note.patch 
	sources upstream 
Added Files:
	linux-2.6-intel-cache-build.patch 
	linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
	linux-2.6-vdso-xen.patch linux-2.6-xen-acpi.patch 
	linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen-gcc-4.1-compile-fix.patch 
	linux-2.6-xen-guest-enable-char-devices.patch 
	linux-2.6-xen-merge.patch linux-2.6-xen-no-tls-warn.patch 
	linux-2.6-xen-x86_64-fixes.patch 
	linux-2.6-xen_net_read_mac_export.patch 
	linux-2.6-xen_remap_vma_flags.patch 
	patch-2.6.16-rc3-git1.bz2.sign 
Removed Files:
	linux-2.6.14-intel-cache-build.patch 
Log Message:
Merge kernel-xen back to kernel


linux-2.6-intel-cache-build.patch:
 intel_cacheinfo.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-intel-cache-build.patch ---
--- linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c.orig	2005-11-02 11:25:14.000000000 +0000
+++ linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-11-02 11:25:23.000000000 +0000
@@ -569,7 +569,7 @@ static int __cpuinit cache_add_dev(struc
 	return retval;
 }
 
-static void __cpuexit cache_remove_dev(struct sys_device * sys_dev)
+static void cache_remove_dev(struct sys_device * sys_dev)
 {
 	unsigned int cpu = sys_dev->id;
 	unsigned long i;

linux-2.6-percpu-NR_CPUS-hotplug-fix.patch:
 sched.c |   64 +++++++++++++++++++++++++++++-----------------------------------
 1 files changed, 29 insertions(+), 35 deletions(-)

--- NEW FILE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch ---
This is the wrong fix in the long run, but it works for now.
We will inherit the proper fix from upstream soon, at that
point this patch can go away.  None of the alternative hacks
to fix this bug actually seemed any better than this one. - Rik

--- linux-2.6.15.i686/kernel/sched.c.idle_init	2006-02-08 17:56:50.000000000 -0500
+++ linux-2.6.15.i686/kernel/sched.c	2006-02-08 17:58:57.000000000 -0500
@@ -4437,6 +4437,35 @@ void __devinit init_idle(task_t *idle, i
 {
 	runqueue_t *rq = cpu_rq(cpu);
 	unsigned long flags;
+	prio_array_t *array;
+	int j, k;
+
+	spin_lock_init(&rq->lock);
+	rq->nr_running = 0;
+	rq->active = rq->arrays;
+	rq->expired = rq->arrays + 1;
+	rq->best_expired_prio = MAX_PRIO;
+
+#ifdef CONFIG_SMP
+	rq->sd = NULL;
+	for (j = 1; j < 3; j++)
+		rq->cpu_load[j] = 0;
+	rq->active_balance = 0;
+	rq->push_cpu = 0;
+	rq->migration_thread = NULL;
+	INIT_LIST_HEAD(&rq->migration_queue);
+#endif
+	atomic_set(&rq->nr_iowait, 0);
+
+	for (j = 0; j < 2; j++) {
+		array = rq->arrays + j;
+		for (k = 0; k < MAX_PRIO; k++) {
+			INIT_LIST_HEAD(array->queue + k);
+			__clear_bit(k, array->bitmap);
+		}
+		// delimiter for bitsearch
+		__set_bit(MAX_PRIO, array->bitmap);
+	}
 
 	idle->sleep_avg = 0;
 	idle->array = NULL;
@@ -6110,41 +6139,6 @@ int in_sched_functions(unsigned long add
 
 void __init sched_init(void)
 {
-	runqueue_t *rq;
-	int i, j, k;
-
-	for_each_cpu(i) {
-		prio_array_t *array;
-
-		rq = cpu_rq(i);
-		spin_lock_init(&rq->lock);
-		rq->nr_running = 0;
-		rq->active = rq->arrays;
-		rq->expired = rq->arrays + 1;
-		rq->best_expired_prio = MAX_PRIO;
-
-#ifdef CONFIG_SMP
-		rq->sd = NULL;
-		for (j = 1; j < 3; j++)
-			rq->cpu_load[j] = 0;
-		rq->active_balance = 0;
-		rq->push_cpu = 0;
-		rq->migration_thread = NULL;
-		INIT_LIST_HEAD(&rq->migration_queue);
-#endif
-		atomic_set(&rq->nr_iowait, 0);
-
-		for (j = 0; j < 2; j++) {
-			array = rq->arrays + j;
-			for (k = 0; k < MAX_PRIO; k++) {
-				INIT_LIST_HEAD(array->queue + k);
-				__clear_bit(k, array->bitmap);
-			}
-			// delimiter for bitsearch
-			__set_bit(MAX_PRIO, array->bitmap);
-		}
-	}
-
 	/*
 	 * The boot idle thread does lazy MMU switching as well:
 	 */

linux-2.6-vdso-xen.patch:
 mmu.h  |    1 +
 page.h |    5 +++++
 2 files changed, 6 insertions(+)

--- NEW FILE linux-2.6-vdso-xen.patch ---
Merge rawhide vdso into xen-specific subarch.
---

 include/asm-i386/mach-xen/asm/mmu.h  |    1 +
 include/asm-i386/mach-xen/asm/page.h |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/asm-i386/mach-xen/asm/mmu.h b/include/asm-i386/mach-xen/asm/mmu.h
index 32987b8..c646692 100644
--- a/include/asm-i386/mach-xen/asm/mmu.h
+++ b/include/asm-i386/mach-xen/asm/mmu.h
@@ -12,6 +12,7 @@ typedef struct { 
 	int size;
 	struct semaphore sem;
 	void *ldt;
+	void *vdso;
 } mm_context_t;
 
 /* mm/memory.c:exit_mmap hook */
diff --git a/include/asm-i386/mach-xen/asm/page.h b/include/asm-i386/mach-xen/asm/page.h
index 74b385b..21f8300 100644
--- a/include/asm-i386/mach-xen/asm/page.h
+++ b/include/asm-i386/mach-xen/asm/page.h
@@ -237,6 +237,11 @@ extern int page_is_ram(unsigned long pag
 #undef LOAD_OFFSET
 #define LOAD_OFFSET		0
 
+/*
+ * Under exec-shield we don't use the generic fixmap gate area.
+ * The vDSO ("gate area") has a normal vma found the normal ways.
+ */
+#define __HAVE_ARCH_GATE_AREA  1
 
 #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
 #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)

linux-2.6-xen-acpi.patch:
 arch/x86_64/kernel/mpparse-xen.c   |    8 ++++----
 b/arch/i386/kernel/acpi/boot-xen.c |    6 +++---
 b/arch/i386/kernel/mpparse-xen.c   |    8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE linux-2.6-xen-acpi.patch ---
--- a/arch/i386/kernel/acpi/boot-xen.c~	2006-02-02 15:24:54.000000000 -0500
+++ b/arch/i386/kernel/acpi/boot-xen.c	2006-02-02 18:07:39.000000000 -0500
@@ -466,7 +466,7 @@
  * success: return IRQ number (>=0)
  * failure: return < 0
  */
-int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
+int acpi_register_gsi(u32 gsi, int triggering, int polarity)
 {
 	unsigned int irq;
 	unsigned int plat_gsi = gsi;
@@ -478,14 +478,14 @@
 	if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
 		extern void eisa_set_level_irq(unsigned int irq);
 
-		if (edge_level == ACPI_LEVEL_SENSITIVE)
+		if (triggering == ACPI_LEVEL_SENSITIVE)
 			eisa_set_level_irq(gsi);
 	}
 #endif
 
 #ifdef CONFIG_X86_IO_APIC
 	if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
-		plat_gsi = mp_register_gsi(gsi, edge_level, active_high_low);
+		plat_gsi = mp_register_gsi(gsi, triggering, polarity);
 	}
 #endif
 	acpi_gsi_to_irq(plat_gsi, &irq);
--- a/arch/i386/kernel/mpparse-xen.c~	2006-02-02 18:08:53.000000000 -0500
+++ b/arch/i386/kernel/mpparse-xen.c	2006-02-02 18:08:58.000000000 -0500
@@ -1097,7 +1097,7 @@
 
 #define MAX_GSI_NUM	4096
 
-int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
+int mp_register_gsi (u32 gsi, int triggering, int polarity)
 {
 	int			ioapic = -1;
 	int			ioapic_pin = 0;
@@ -1146,7 +1146,7 @@
 
 	mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
 
-	if (edge_level) {
+	if (triggering == ACPI_LEVEL_SENSITIVE) {
 		/*
 		 * For PCI devices assign IRQs in order, avoiding gaps
 		 * due to unused I/O APIC pins.
@@ -1168,8 +1168,8 @@
 	}
 
 	io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
-		    edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
-		    active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
+		    triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
+		    polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
 	return gsi;
 }
 
--- a/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 18:30:03.000000000 -0500
+++ b/arch/x86_64/kernel/mpparse-xen.c	2006-02-08 19:06:46.000000000 -0500
@@ -920,7 +920,7 @@
 
 #define MAX_GSI_NUM	4096
 
-int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
+int mp_register_gsi(u32 gsi, int triggering, int polarity)
 {
 	int			ioapic = -1;
 	int			ioapic_pin = 0;
@@ -969,7 +969,7 @@
 
 	mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
 
-	if (edge_level) {
+	if (triggering == ACPI_LEVEL_SENSITIVE) {
 		/*
 		 * For PCI devices assign IRQs in order, avoiding gaps
 		 * due to unused I/O APIC pins.
@@ -991,8 +991,8 @@
 	}
 
 	io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,
-		edge_level == ACPI_EDGE_SENSITIVE ? 0 : 1,
-		active_high_low == ACPI_ACTIVE_HIGH ? 0 : 1);
+		    triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,
+		    polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
 	return gsi;
 }
 

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.new/arch/i386/mm/init-xen.c             |    1 +
 linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c    |    9 +++++++++
 linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c |   11 +++++++++++
 3 files changed, 21 insertions(+)

--- NEW FILE linux-2.6-xen-compile-fixes.patch ---
diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c
--- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c	2006-02-10 20:25:27.000000000 +0100
+++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c	2006-02-11 03:11:49.000000000 +0100
@@ -42,6 +42,15 @@
 int apic_verbosity;
 int disable_apic;
 
+/*
+ * 'what should we do if we get a hw irq event on an illegal vector'.
+ * each architecture has to answer this themselves.
+ */
+void ack_bad_irq(unsigned int irq)
+{
+	printk("unexpected IRQ trap at vector %02x\n", irq);
+}
+
 void smp_local_timer_interrupt(struct pt_regs *regs)
 {
 	profile_tick(CPU_PROFILING, regs);
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c
--- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c	2006-02-11 19:15:39.000000000 +0100
+++ linux-2.6.15.new/arch/i386/mm/init-xen.c	2006-02-11 16:24:12.000000000 +0100
@@ -459,6 +459,7 @@ void zap_low_mappings (void)
 
 static int disable_nx __initdata = 0;
 u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
+EXPORT_SYMBOL(__supported_pte_mask);
 
 /*
  * noexec = on|off
diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c
--- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig	2006-02-11 20:17:49.000000000 +0100
+++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c	2006-02-11 20:18:09.000000000 +0100
@@ -39,6 +39,17 @@ extern struct genapic apic_xen;
 struct genapic *genapic = &apic_xen;
 #endif
 
+#ifndef CONFIG_X86_LOCAL_APIC
+/*
+ * 'what should we do if we get a hw irq event on an illegal vector'.
+ * each architecture has to answer this themselves.
+ */
+void ack_bad_irq(unsigned int irq)
+{
+        printk("unexpected IRQ trap at vector %02x\n", irq);
+}
+#endif
+
 
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.

linux-2.6-xen-gcc-4.1-compile-fix.patch:
 mpspec_def.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-gcc-4.1-compile-fix.patch ---
diff -uNp xen/include/asm-x86/mpspec_def.h.orig xen/include/asm-x86/mpspec_def.h
--- xen/include/asm-x86/mpspec_def.h.orig	2006-02-07 21:24:36.000000000 +0100
+++ xen/include/asm-x86/mpspec_def.h	2006-02-07 21:24:48.000000000 +0100
@@ -75,7 +75,7 @@ struct mpc_config_bus
 {
 	unsigned char mpc_type;
 	unsigned char mpc_busid;
-	unsigned char mpc_bustype[6] __attribute((packed));
+	unsigned char mpc_bustype[6];
 };
 
 /* List of Bus Type string values, Intel MP Spec. */

linux-2.6-xen-guest-enable-char-devices.patch:
 linux-2.6-xen.hg/drivers/Kconfig  |    3 +++
 linux-2.6.14/drivers/char/Kconfig |   15 +++++++++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE linux-2.6-xen-guest-enable-char-devices.patch ---
Return-path: <xen-devel-bounces at lists.xensource.com>
Envelope-to: www-data at lists.xensource.com
Delivery-date: Mon, 12 Dec 2005 10:35:06 +0000
Received: from localhost ([127.0.0.1] helo=lists.xensource.com)
	by host-192-168-0-1-bcn-london with esmtp (Exim 4.50)
	id 1Ell1O-00073f-6w; Mon, 12 Dec 2005 10:35:06 +0000
Received: from [192.168.0.10] (helo=lists.xensource.com)
	by host-192-168-0-1-bcn-london with esmtp (Exim 4.50)
	id 1Ell19-0006x9-Km
	for xen-devel at lists.xensource.com; Mon, 12 Dec 2005 10:34:51 +0000
Received: from mx2.suse.de ([195.135.220.15])
	by 192.168.0.10 with esmtp (Exim 4.50) id 1Elkyj-000814-KZ
	for xen-devel at lists.xensource.com; Mon, 12 Dec 2005 10:32:22 +0000
Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx2.suse.de (Postfix) with ESMTP id 981AD1CBE8;
	Mon, 12 Dec 2005 11:33:43 +0100 (CET)
To: Hans-Christian Armingeon <johnny at wh-netz.de>
References: <1133474930.11038.27.camel at localhost.localdomain>
	<200512111748.24640.johnny at wh-netz.de>
From: Andi Kleen <ak at suse.de>
Date: 12 Dec 2005 08:05:05 -0700
In-Reply-To: <200512111748.24640.johnny at wh-netz.de>
Message-ID: <p73y82qnyou.fsf at verdi.suse.de>
Lines: 103
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SA-Exim-Connect-IP: 195.135.220.15
X-SA-Exim-Mail-From: ak at suse.de
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on 192.168.0.10
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 required=5.0 tests=AWL,BAYES_00,
	DATE_IN_FUTURE_03_06 autolearn=no version=3.1.0
X-SA-Exim-Version: 4.2 (built Thu, 03 Mar 2005 10:44:12 +0100)
X-SA-Exim-Scanned: Yes (on 192.168.0.10)
Cc: xen-devel at lists.xensource.com
Subject: [Xen-devel] Re: No PTYs with linux-2.6-xen.hg
X-BeenThere: xen-devel at lists.xensource.com
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Xen developer discussion <xen-devel.lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request at lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel at lists.xensource.com>
List-Help: <mailto:xen-devel-request at lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request at lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces at lists.xensource.com
Errors-To: xen-devel-bounces at lists.xensource.com


[mail will be delayed due to dumb mailing list policy]

Hans-Christian Armingeon <johnny at wh-netz.de> writes:

> Hi there,
> 
> I am having the same problem.
> Is anyone working on that issue?

This patch will fix it. It also reenables other useful
character drivers. Only softdog is still MIA.

However there are other problems still. e.g. current Xen
seems to have broken balloning again.

-Andi

diff -uNp linux-2.6.14/drivers/char/Kconfig.orig linux-2.6.14/drivers/char/Kconfig
--- linux-2.6.14/drivers/char/Kconfig.orig	2005-12-20 16:26:56.000000000 +0100
+++ linux-2.6.14/drivers/char/Kconfig	2005-12-20 16:46:03.000000000 +0100
@@ -4,6 +4,8 @@
 
 menu "Character devices"
 
+if !XEN || XEN_PHYSDEV_ACCESS
+
 config VT
 	bool "Virtual terminal" if EMBEDDED
 	select INPUT
@@ -415,6 +417,8 @@ config SGI_MBCS
 
 source "drivers/serial/Kconfig"
 
+endif
+
 config UNIX98_PTYS
 	bool "Unix98 PTY support" if EMBEDDED
 	default y
@@ -471,6 +475,8 @@ config LEGACY_PTY_COUNT
 	  When not in use, each legacy PTY occupies 12 bytes on 32-bit
 	  architectures and 24 bytes on 64-bit architectures.
 
+if !XEN || XEN_PHYSDEV_ACCESS
+
 config PRINTER
 	tristate "Parallel printer support"
 	depends on PARPORT
@@ -954,6 +960,8 @@ config GPIO_VR41XX
 	tristate "NEC VR4100 series General-purpose I/O Unit support"
 	depends on CPU_VR41XX
 
+endif
+
 config RAW_DRIVER
 	tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
 	help
@@ -965,6 +973,8 @@ config RAW_DRIVER
           Applications should simply open the device (eg /dev/hda1)
           with the O_DIRECT flag.
 
+
+
 config MAX_RAW_DEVS
 	int "Maximum number of RAW devices to support (1-8192)"
 	depends on RAW_DRIVER
@@ -974,6 +984,8 @@ config MAX_RAW_DEVS
 	  Default is 256. Increase this number in case you need lots of
 	  raw devices.
 
+if !XEN || XEN_PHYSDEV_ACCESS
+
 config HPET
 	bool "HPET - High Precision Event Timer" if (X86 || IA64)
 	default n
@@ -1023,6 +1035,7 @@ config MMTIMER
 
 source "drivers/char/tpm/Kconfig"
 
+
 config TELCLOCK
 	tristate "Telecom clock driver for MPBL0010 ATCA SBC"
 	depends on EXPERIMENTAL
@@ -1035,5 +1048,7 @@ config TELCLOCK
 	  sysfs directory, /sys/devices/platform/telco_clock, with a number of
 	  files for controlling the behavior of this hardware.
 
+endif
+
 endmenu
 
diff -u linux-2.6-xen.hg/drivers/Kconfig-o linux-2.6-xen.hg/drivers/Kconfig
--- linux-2.6-xen.hg/drivers/Kconfig-o	2005-11-16 01:37:04.000000000 +0100
+++ linux-2.6-xen.hg/drivers/Kconfig	2005-12-12 07:11:52.000000000 +0100
@@ -49,9 +49,12 @@
 # input before char - char/joystick depends on it. As does USB.
 
 source "drivers/input/Kconfig"
+endif
 
 source "drivers/char/Kconfig"
 
+if !XEN || XEN_PHYSDEV_ACCESS
+
 source "drivers/i2c/Kconfig"
 
 source "drivers/w1/Kconfig"

_______________________________________________
Xen-devel mailing list
Xen-devel at lists.xensource.com
http://lists.xensource.com/xen-devel


linux-2.6-xen-merge.patch:
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   43 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 linux-2.6.15.i686/arch/i386/Kconfig              |   79 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61908 insertions(+), 818 deletions(-)

--- NEW FILE linux-2.6-xen-merge.patch ---
diff -uNp linux-2.6.15.i686/arch/i386/Kconfig.orig linux-2.6.15.i686/arch/i386/Kconfig
--- linux-2.6.15.i686/arch/i386/Kconfig.orig	2006-02-07 00:15:08.000000000 +0100
+++ linux-2.6.15.i686/arch/i386/Kconfig	2006-02-07 00:28:15.000000000 +0100
@@ -58,6 +58,15 @@ config X86_PC
 	help
 	  Choose this option if your computer is a standard PC or compatible.
 
+config X86_XEN
+	bool "Xen-compatible"
+	select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
+	select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
+	select SWIOTLB if XEN_PHYSDEV_ACCESS
+	help
+	  Choose this option is you plan to run this kernel on top of Xen
+	  Hypervisor.
+
 config X86_ELAN
 	bool "AMD Elan"
 	help
@@ -159,6 +168,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.
@@ -202,6 +212,19 @@ config SMP
 
 	  If you don't know what to do here, say N.
 
+config SMP_ALTERNATIVES
+	bool "SMP alternatives support (EXPERIMENTAL)"
+	depends on SMP && EXPERIMENTAL
+	help
+	  Try to reduce the overhead of running an SMP kernel on a uniprocessor
+	  host slightly by replacing certain key instruction sequences
+	  according to whether we currently have more than one CPU available.
+	  This should provide a noticeable boost to performance when
+	  running SMP kernels on UP machines, and have negligible impact
+	  when running on an true SMP host.
+
+	    If unsure, say N.
+
 config NR_CPUS
 	int "Maximum number of CPUs (2-255)"
 	range 2 255
@@ -218,7 +241,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
@@ -230,7 +253,7 @@ source "kernel/Kconfig.preempt"
 
 config X86_UP_APIC
 	bool "Local APIC support on uniprocessors"
-	depends on !SMP && !(X86_VISWS || X86_VOYAGER)
+	depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
 	help
 	  A local APIC (Advanced Programmable Interrupt Controller) is an
 	  integrated interrupt controller in the CPU. If you have a single-CPU
@@ -267,12 +290,12 @@ config X86_UP_APIC_DEFAULT_OFF
 
 config X86_LOCAL_APIC
 	bool
-	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
+	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
 	default y
 
 config X86_IO_APIC
 	bool
-	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
+	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
 	default y
 
 config X86_VISWS_APIC
@@ -280,9 +303,14 @@ config X86_VISWS_APIC
 	depends on X86_VISWS
 	default y
 
+config X86_TSC
+	bool
+	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN
+	default y
+
 config X86_MCE
 	bool "Machine Check Exception"
-	depends on !X86_VOYAGER
+	depends on !(X86_VOYAGER || X86_XEN)
 	---help---
 	  Machine Check Exception support allows the processor to notify the
 	  kernel if it detects a problem (e.g. overheating, component failure).
@@ -372,6 +400,7 @@ config X86_REBOOTFIXUPS
 
 config MICROCODE
 	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
+	depends on !XEN_UNPRIVILEGED_GUEST
 	---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
@@ -389,6 +418,7 @@ config MICROCODE
 
 config X86_MSR
 	tristate "/dev/cpu/*/msr - Model-specific register support"
+	depends on !X86_XEN
 	help
 	  This device gives privileged processes access to the x86
 	  Model-Specific Registers (MSRs).  It is a character device with
@@ -404,6 +434,10 @@ config X86_CPUID
 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
 	  /dev/cpu/31/cpuid.
 
+config SWIOTLB
+	bool
+	default n
+
 source "drivers/firmware/Kconfig"
 
 choice
@@ -571,7 +605,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
 
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
-	depends on HIGHMEM4G || HIGHMEM64G
+	depends on (HIGHMEM4G || HIGHMEM64G) && !X86_XEN
 	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
@@ -580,6 +614,7 @@ config HIGHPTE
 
 config MATH_EMULATION
 	bool "Math emulation"
+	depends on !X86_XEN
 	---help---
 	  Linux can emulate a math coprocessor (used for floating point
 	  operations) if you don't have one. 486DX and Pentium processors have
@@ -605,6 +640,8 @@ config MATH_EMULATION
 
 config MTRR
 	bool "MTRR (Memory Type Range Register) support"
+	depends on !XEN_UNPRIVILEGED_GUEST
+	default y if X86_XEN
 	---help---
 	  On Intel P6 family processors (Pentium Pro, Pentium II and later)
 	  the Memory Type Range Registers (MTRRs) may be used to control
@@ -639,7 +676,7 @@ config MTRR
 
 config EFI
 	bool "Boot from EFI support (EXPERIMENTAL)"
-	depends on ACPI
+	depends on ACPI && !X86_XEN
 	default n
 	---help---
 	This enables the the kernel to boot on EFI platforms using
@@ -657,7 +694,7 @@ config EFI
 
 config IRQBALANCE
  	bool "Enable kernel irq balancing"
-	depends on SMP && X86_IO_APIC
+	depends on SMP && X86_IO_APIC && !X86_XEN
 	default y
 	help
  	  The default yes will allow the kernel to do irq load balancing.
@@ -700,7 +737,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
 	bool "kexec system call (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && !X86_XEN
 	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
@@ -754,6 +791,7 @@ config HOTPLUG_CPU
 config DOUBLEFAULT
 	default y
 	bool "Enable doublefault exception handler" if EMBEDDED
+	depends on !XEN
 	help
           This option allows trapping of rare doublefault exceptions that
           would otherwise cause a system to silently reboot. Disabling this
@@ -764,18 +802,20 @@ endmenu
 
 
 menu "Power management options (ACPI, APM)"
-	depends on !X86_VOYAGER
+	depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
 
+if !X86_XEN
 source kernel/power/Kconfig
+endif
 
 source "drivers/acpi/Kconfig"
 
 menu "APM (Advanced Power Management) BIOS Support"
-depends on PM && !X86_VISWS
[...66600 lines suppressed...]
+	int (*uevent)(struct xenbus_device *, char **, int, char *, int);
+	struct device_driver driver;
+	int (*read_otherend_details)(struct xenbus_device *dev);
+};
+
+static inline struct xenbus_driver *to_xenbus_driver(struct device_driver *drv)
+{
+	return container_of(drv, struct xenbus_driver, driver);
+}
+
+int xenbus_register_frontend(struct xenbus_driver *drv);
+int xenbus_register_backend(struct xenbus_driver *drv);
+void xenbus_unregister_driver(struct xenbus_driver *drv);
+
+typedef u32 xenbus_transaction_t;
+
+char **xenbus_directory(xenbus_transaction_t t,
+			const char *dir, const char *node, unsigned int *num);
+void *xenbus_read(xenbus_transaction_t t,
+		  const char *dir, const char *node, unsigned int *len);
+int xenbus_write(xenbus_transaction_t t,
+		 const char *dir, const char *node, const char *string);
+int xenbus_mkdir(xenbus_transaction_t t,
+		 const char *dir, const char *node);
+int xenbus_exists(xenbus_transaction_t t,
+		  const char *dir, const char *node);
+int xenbus_rm(xenbus_transaction_t t, const char *dir, const char *node);
+int xenbus_transaction_start(xenbus_transaction_t *t);
+int xenbus_transaction_end(xenbus_transaction_t t, int abort);
+
+/* Single read and scanf: returns -errno or num scanned if > 0. */
+int xenbus_scanf(xenbus_transaction_t t,
+		 const char *dir, const char *node, const char *fmt, ...)
+	__attribute__((format(scanf, 4, 5)));
+
+/* Single printf and write: returns -errno or 0. */
+int xenbus_printf(xenbus_transaction_t t,
+		  const char *dir, const char *node, const char *fmt, ...)
+	__attribute__((format(printf, 4, 5)));
+
+/* Generic read function: NULL-terminated triples of name,
+ * sprintf-style type string, and pointer. Returns 0 or errno.*/
+int xenbus_gather(xenbus_transaction_t t, const char *dir, ...);
+
+/* notifer routines for when the xenstore comes up */
+int register_xenstore_notifier(struct notifier_block *nb);
+void unregister_xenstore_notifier(struct notifier_block *nb);
+
+int register_xenbus_watch(struct xenbus_watch *watch);
+void unregister_xenbus_watch(struct xenbus_watch *watch);
+void xs_suspend(void);
+void xs_resume(void);
+
+/* Used by xenbus_dev to borrow kernel's store connection. */
+void *xenbus_dev_request_and_reply(struct xsd_sockmsg *msg);
+
+/* Called from xen core code. */
+void xenbus_suspend(void);
+void xenbus_resume(void);
+
+#define XENBUS_IS_ERR_READ(str) ({			\
+	if (!IS_ERR(str) && strlen(str) == 0) {		\
+		kfree(str);				\
+		str = ERR_PTR(-ERANGE);			\
+	}						\
+	IS_ERR(str);					\
+})
+
+#define XENBUS_EXIST_ERR(err) ((err) == -ENOENT || (err) == -ERANGE)
+
+
+/**
+ * Register a watch on the given path, using the given xenbus_watch structure
+ * for storage, and the given callback function as the callback.  Return 0 on
+ * success, or -errno on error.  On success, the given path will be saved as
+ * watch->node, and remains the caller's to free.  On error, watch->node will
+ * be NULL, the device will switch to XenbusStateClosing, and the error will
+ * be saved in the store.
+ */
+int xenbus_watch_path(struct xenbus_device *dev, const char *path,
+		      struct xenbus_watch *watch, 
+		      void (*callback)(struct xenbus_watch *,
+				       const char **, unsigned int));
+
+
+/**
+ * Register a watch on the given path/path2, using the given xenbus_watch
+ * structure for storage, and the given callback function as the callback.
+ * Return 0 on success, or -errno on error.  On success, the watched path
+ * (path/path2) will be saved as watch->node, and becomes the caller's to
+ * kfree().  On error, watch->node will be NULL, so the caller has nothing to
+ * free, the device will switch to XenbusStateClosing, and the error will be
+ * saved in the store.
+ */
+int xenbus_watch_path2(struct xenbus_device *dev, const char *path,
+		       const char *path2, struct xenbus_watch *watch, 
+		       void (*callback)(struct xenbus_watch *,
+					const char **, unsigned int));
+
+
+/**
+ * Advertise in the store a change of the given driver to the given new_state.
+ * Perform the change inside the given transaction xbt.  xbt may be NULL, in
+ * which case this is performed inside its own transaction.  Return 0 on
+ * success, or -errno on error.  On error, the device will switch to
+ * XenbusStateClosing, and the error will be saved in the store.
+ */
+int xenbus_switch_state(struct xenbus_device *dev,
+			xenbus_transaction_t xbt,
+			XenbusState new_state);
+
+
+/**
+ * Grant access to the given ring_mfn to the peer of the given device.  Return
+ * 0 on success, or -errno on error.  On error, the device will switch to
+ * XenbusStateClosing, and the error will be saved in the store.
+ */
+int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn);
+
+
+/**
+ * Allocate an event channel for the given xenbus_device, assigning the newly
+ * created local port to *port.  Return 0 on success, or -errno on error.  On
+ * error, the device will switch to XenbusStateClosing, and the error will be
+ * saved in the store.
+ */
+int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port);
+
+
+/**
+ * Return the state of the driver rooted at the given store path, or
+ * XenbusStateClosed if no state can be read.
+ */
+XenbusState xenbus_read_driver_state(const char *path);
+
+
+/***
+ * Report the given negative errno into the store, along with the given
+ * formatted message.
+ */
+void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt,
+		      ...);
+
+
+/***
+ * Equivalent to xenbus_dev_error(dev, err, fmt, args), followed by
+ * xenbus_switch_state(dev, NULL, XenbusStateClosing) to schedule an orderly
+ * closedown of this driver and its peer.
+ */
+void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt,
+		      ...);
+
+
+#endif /* _ASM_XEN_XENBUS_H */
+
+/*
+ * Local variables:
+ *  c-file-style: "linux"
+ *  indent-tabs-mode: t
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
diff -r 52f446a807c8 -r 2905f31ca453 include/xen/xencons.h
--- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+++ b/include/xen/xencons.h	Wed Feb  1 20:21:42 2006 -0500
@@ -0,0 +1,14 @@
+#ifndef __ASM_XENCONS_H__
+#define __ASM_XENCONS_H__
+
+void xencons_force_flush(void);
+void xencons_resume(void);
+
+/* Interrupt work hooks. Receive data, or kick data out. */
+void xencons_rx(char *buf, unsigned len, struct pt_regs *regs);
+void xencons_tx(void);
+
+int xencons_ring_init(void);
+int xencons_ring_send(const char *data, unsigned len);
+
+#endif /* __ASM_XENCONS_H__ */
diff -r 52f446a807c8 -r 2905f31ca453 scripts/Makefile.xen
--- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+++ b/scripts/Makefile.xen	Wed Feb  1 20:21:42 2006 -0500
@@ -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}; \
+			[ -f $(srctree)/$(src)/$${c} ] || \
+			   [ -f $(srctree)/$(src)/$${s} ] \
+				&& echo $$oxen \
+				|| echo $(var) ) \
+	  )
+# filterxen($1 = allobj, $2 = noobjs)
+filterxen = $(filter-out $(2), $(1))

linux-2.6-xen-no-tls-warn.patch:
 fixup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen-no-tls-warn.patch ---
--- linux-2.6.14/arch/i386/kernel/fixup.c~	2006-01-06 16:10:00.000000000 -0500
+++ linux-2.6.14/arch/i386/kernel/fixup.c	2006-01-06 16:13:01.000000000 -0500
@@ -39,7 +39,7 @@
 
 fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
 {
-	static unsigned long printed = 0;
+	static unsigned long printed = 1;
 	char info[100];
 	int i;
 

linux-2.6-xen-x86_64-fixes.patch:
 arch/x86_64/ia32/Makefile        |    2 ++
 arch/x86_64/kernel/head-xen.S    |    3 ++-
 arch/x86_64/kernel/setup-xen.c   |    3 +++
 arch/x86_64/kernel/setup64-xen.c |    2 ++
 arch/x86_64/mm/pageattr-xen.c    |    9 ++++++++-
 drivers/xen/core/smpboot.c       |   12 ++++++++++++
 6 files changed, 29 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-xen-x86_64-fixes.patch ---
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID df98f37a88b05ced33ed0915efa576e5b110b60d
# Parent  2710f2fe624a5103d198e6685e250c6678f34ec1
Fix x86_64 SMP support.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Tue Feb  7 13:57:40 2006 +0000
@@ -911,6 +911,9 @@ void __init setup_arch(char **cmdline_p)
 	init_apic_mappings();
 #endif
 #endif
+#if defined(CONFIG_XEN) && defined(CONFIG_SMP) && !defined(CONFIG_HOTPLUG_CPU)
+	prefill_possible_map();
+#endif
 
 #if defined(CONFIG_XEN_PRIVILEGED_GUEST) || !defined(CONFIG_XEN)
 	/*
diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Tue Feb  7 13:57:40 2006 +0000
@@ -272,8 +272,10 @@ void __cpuinit cpu_init (void)
 	 * Initialize the per-CPU GDT with the boot GDT,
 	 * and set up the GDT descriptor:
 	 */
+#ifndef CONFIG_XEN 
 	if (cpu)
  		memcpy(cpu_gdt(cpu), cpu_gdt_table, GDT_SIZE);
+#endif
 
 	cpu_gdt_descr[cpu].size = GDT_SIZE;
 #ifndef CONFIG_XEN 
diff -r 2710f2fe624a -r df98f37a88b0 linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Feb  7 12:59:27 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c	Tue Feb  7 13:57:40 2006 +0000
@@ -81,6 +81,18 @@ unsigned int maxcpus = NR_CPUS;
 unsigned int maxcpus = NR_CPUS;
 #endif
 
+void __init prefill_possible_map(void)
+{
+	int i, rc;
+
+	for (i = 0; i < NR_CPUS; i++) {
+		rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
+		if (rc == -ENOENT)
+			break;
+		cpu_set(i, cpu_possible_map);
+	}
+}
+
 void __init smp_alloc_memory(void)
 {
 }
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 581d4a0ac7290523d04f5a7d8b35cc727baa8089
# Parent  5caf1de3f2682e91831b09f464c70662658a8e45
Fix ia32 support.

From: Chris Wright <chrisw at sous-sol.org>
Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 5caf1de3f268 -r 581d4a0ac729 linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile
--- a/linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile	Tue Feb  7 15:56:39 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/ia32/Makefile	Tue Feb  7 15:24:04 2006 +0000
@@ -33,6 +33,8 @@ AFLAGS_vsyscall-syscall.o = -m32 -Iarch/
 
 ifdef CONFIG_XEN
 AFLAGS_vsyscall-int80.o = -m32 -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)
# HG changeset patch
# User kaf24 at firebug.cl.cam.ac.uk
# Node ID aefd8b8c6b1fc3242e6a231a4461c12780d0c254
# Parent  581d4a0ac7290523d04f5a7d8b35cc727baa8089
Since USER_PTRS_PER_PGD depends on TASK_SIZE and thus on the current
thread, it must not be used in code that can be called in the context
switch path (otherwise the 32-bitness of the outgoing task is used
here rather then the 32-bitness of the incoming one, possibly
resulting in large parts of the page tables not getting converted to
read-only).

Signed-off-by: Jan Beulich <JBeulich at novell.com>

diff -r 581d4a0ac729 -r aefd8b8c6b1f linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c	Tue Feb  7 15:24:04 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/mm/pageattr-xen.c	Tue Feb  7 19:16:11 2006 +0100
@@ -40,7 +40,14 @@ static void mm_walk(struct mm_struct *mm
 	int          g,u,m;
 
 	pgd = mm->pgd;
-	for (g = 0; g <= USER_PTRS_PER_PGD; g++, pgd++) {
+	/*
+	 * Cannot iterate up to USER_PTRS_PER_PGD as these pagetables may not
+	 * be the 'current' task's pagetables (e.g., current may be 32-bit,
+	 * but the pagetables may be for a 64-bit task).
+	 * Subtracting 1 from TASK_SIZE64 means the loop limit is correct
+	 * regardless of whether TASK_SIZE64 is a multiple of PGDIR_SIZE.
+	 */
+	for (g = 0; g <= ((TASK_SIZE64-1) / PGDIR_SIZE); g++, pgd++) {
 		if (pgd_none(*pgd))
 			continue;
 		pud = pud_offset(pgd, 0);
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 57e6d721842703c08bf7dafbfb5efe3c9a44725d
# Parent  7cd3d2e41559a047b0c329b2f9032cc555ca209c
Fix hypercall_page location on x86_64.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r 7cd3d2e41559 -r 57e6d7218427 linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb  3 18:24:28 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb  3 18:45:14 2006 +0000
@@ -19,7 +19,7 @@
 	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
 	.ascii	",XEN_VER=xen-3.0"
 	.ascii	",VIRT_BASE=0xffffffff80000000"
-	.ascii	",HYPERCALL_PAGE=0x10d" /* __pa(hypercall_page) >> 12 */
+	.ascii	",HYPERCALL_PAGE=0x10a" /* __pa(hypercall_page) >> 12 */
 	.ascii	",LOADER=generic"
 	.byte	0
       
# HG changeset patch
# User cl349 at firebug.cl.cam.ac.uk
# Node ID 1bc2d1fe503c331157bac60e6534e78693fbc1d4
# Parent  c5fd98fcb127f5de28312ed8a36e67b31c74dca2
Fill hypercall_page so that its VA space doesn't get used for code.

Signed-off-by: Christian Limpach <Christian.Limpach at cl.cam.ac.uk>

diff -r c5fd98fcb127 -r 1bc2d1fe503c linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Mon Feb  6 14:52:45 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Mon Feb  6 15:26:29 2006 +0000
@@ -189,6 +189,7 @@ NEXT_PAGE(hypercall_page)
 	 * different address than expected. */
 	.quad	__adjust_hypercall_page_in_header
 .endif
+	.fill	512,8,0
 
 #undef NEXT_PAGE
 

linux-2.6-xen_net_read_mac_export.patch:
 net_driver_util.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-xen_net_read_mac_export.patch ---
diff -uNp linux-2.6.14/drivers/xen/net_driver_util.c.orig linux-2.6.14/drivers/xen/net_driver_util.c
--- linux-2.6.14/drivers/xen/net_driver_util.c.orig	2005-12-20 17:59:34.000000000 +0100
+++ linux-2.6.14/drivers/xen/net_driver_util.c	2005-12-20 17:59:52.000000000 +0100
@@ -55,6 +55,7 @@ int xen_net_read_mac(struct xenbus_devic
 	return 0;
 }
 
+EXPORT_SYMBOL_GPL(xen_net_read_mac);
 
 /*
  * Local variables:

linux-2.6-xen_remap_vma_flags.patch:
 ioremap-xen.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-xen_remap_vma_flags.patch ---
diff -uNp linux-2.6.14/arch/i386/mm/ioremap-xen.c.orig linux-2.6.14/arch/i386/mm/ioremap-xen.c
--- linux-2.6.14/arch/i386/mm/ioremap-xen.c.orig	2005-12-20 20:08:14.000000000 +0100
+++ linux-2.6.14/arch/i386/mm/ioremap-xen.c	2005-12-20 20:09:10.000000000 +0100
@@ -118,7 +118,7 @@ int direct_remap_pfn_range(struct vm_are
 			   domid_t  domid)
 {
 	/* Same as remap_pfn_range(). */
-	vma->vm_flags |= VM_IO | VM_RESERVED;
+	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
 
 	return __direct_remap_pfn_range(
 		vma->vm_mm, address, mfn, size, prot, domid);


--- NEW FILE patch-2.6.16-rc3-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD8NeqyGugalF9Dw4RAlGFAJwK1rbxp7P0fmRWfAjBKO59vWUF/wCfThik
BmIX5AUTGM0kOHuU023345U=
=yqCV
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -r1.349 -r1.350
--- .cvsignore	13 Feb 2006 03:11:41 -0000	1.349
+++ .cvsignore	13 Feb 2006 21:17:47 -0000	1.350
@@ -3,3 +3,5 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
+xen-20060208.tar.bz2
+patch-2.6.16-rc3-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1943
retrieving revision 1.1944
diff -u -r1.1943 -r1.1944
--- kernel-2.6.spec	13 Feb 2006 19:07:22 -0000	1.1943
+++ kernel-2.6.spec	13 Feb 2006 21:17:47 -0000	1.1944
@@ -5,7 +5,7 @@
 
 %define buildup 1
 %define buildsmp 1
-%define includexen 0
+%define includexen 1
 # includexenPAE requieres includexen enabled
 %define includexenPAE 0
 %define builddoc 0
@@ -66,6 +66,7 @@
 %ifarch x86_64
 %define buildsmp 0
 %define buildkdump 1
+%define buildxen %{includexen}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -146,7 +147,7 @@
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
 #
-%define xen_conflicts glibc < 2.3.5-1
+%define xen_conflicts glibc < 2.3.5-1, xen < 3.0.1
 
 #
 # Packages that need to be installed before the kernel is, because the %post
@@ -182,6 +183,8 @@
 
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
+Source1: xen-20060208.tar.bz2
+Source2: Config.mk
 
 Source10: COPYING.modules
 Source11: genkey
@@ -206,11 +209,14 @@
 #Source36: kernel-%{kversion}-sparc64-smp.config
 Source37: kernel-%{kversion}-i686-hypervisor-PAE.config
 Source38: kernel-%{kversion}-i686-guest-PAE.config
+Source39: kernel-%{kversion}-x86_64-hypervisor.config
+Source40: kernel-%{kversion}-x86_64-guest.config
 
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
+Patch2: patch-2.6.16-rc3-git1.bz2
 Patch3: linux-2.6-cpufreq-git.patch
 
 # Patches 100 through 500 are meant for architecture patches
@@ -221,7 +227,7 @@
 Patch200: linux-2.6-x86-tune-p4.patch
 Patch201: linux-2.6-x86-apic-off-by-default.patch
 Patch202: linux-2.6-x86-vga-vidfail.patch
-Patch203: linux-2.6.14-intel-cache-build.patch
+Patch203: linux-2.6-intel-cache-build.patch
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86_64-tif-restore-sigmask.patch
@@ -242,9 +248,15 @@
 # 600 - 699   sparc(64)
 
 # 700 - 799 Xen
-Patch700: linux-2.6-xen.patch
-Patch701: linux-2.6-xen-additional.patch
-Patch702: linux-2.6-xen-compile.patch
+Patch700: linux-2.6-xen-merge.patch
+Patch701: linux-2.6-xen-compile-fixes.patch
+Patch702: linux-2.6-xen-no-tls-warn.patch
+Patch704: linux-2.6-xen-guest-enable-char-devices.patch
+Patch705: linux-2.6-xen_net_read_mac_export.patch
+Patch706: linux-2.6-xen_remap_vma_flags.patch
+Patch707: linux-2.6-xen-acpi.patch
+Patch708: linux-2.6-xen-x86_64-fixes.patch
+Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -259,6 +271,7 @@
 Patch812: linux-2.6-execshield-vdso.patch
 Patch813: linux-2.6-xen-vdso-note.patch
 Patch814: linux-2.6-execshield-fixes.patch
+Patch815: linux-2.6-vdso-xen.patch
 
 # Module signing infrastructure.
 Patch900: linux-2.6-modsign-core.patch
@@ -394,6 +407,8 @@
 # Do not add anything non-trivial here.
 Patch10001: linux-2.6-random-patches.patch
 
+Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -655,8 +670,9 @@
 %prep
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
-%setup -q -n %{name}-%{version} -c
+%setup -q -n %{name}-%{version} -c -a1
   rm -f pax_global_header
+  cp %{SOURCE2} .
   mv linux-%{kversion} vanilla
 else
   # We already have a vanilla dir.
@@ -667,10 +683,17 @@
   fi
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+
+%if %{buildxen}
+cd xen
+%patch20000 -p1
+cd ..
+%endif
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 
 #
@@ -734,9 +757,16 @@
 # Xen
 #
 %if %{includexen}
+# Base Xen patch from linux-2.6-merge.hg
 %patch700 -p1
 %patch701 -p1
 %patch702 -p1
+%patch704 -p1
+%patch705 -p1
+%patch706 -p1
+%patch707 -p1
+%patch708 -p2
+%patch709 -p1
 %endif
 
 #
@@ -758,14 +788,9 @@
 # Xen exec-shield bits
 %if %{includexen}
 %patch811 -p1
-%endif
-
-# Fix up the vdso.
 %patch812 -p1
-
-# Xen vDSO hack
-%if %{includexen}
 %patch813 -p1
+#%patch815 -p1
 %endif
 
 # Final small execshield fixes.
@@ -818,7 +843,8 @@
 #
 %patch1050 -p1
 %if %{includexen}
-%patch1051 -p1
+#TODO! --sct @@@
+#%patch1051 -p1
 %endif
 
 #
@@ -1123,6 +1149,9 @@
     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
+%if %{buildxen}
+    cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+%endif
     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
@@ -1204,6 +1233,21 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/boot
 
+%if %{buildxen}
+  cd xen
+  mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
+%if %{buildxenPAE}
+  make debug=y verbose=y crash_debug=y pae=y
+  install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE
+  install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
+  make clean
+%endif
+  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 ..
+%endif
+
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{buildup}
@@ -1311,7 +1355,7 @@
 
 %post xen-hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-hypervisor-devel
@@ -1324,6 +1368,7 @@
 
 %post xen-guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
+/sbin/new-kernel-pkg --package kernel-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-guest-devel
@@ -1336,7 +1381,7 @@
 
 %post xen-hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-hypervisor-PAE-devel
@@ -1349,6 +1394,7 @@
 
 %post xen-guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
+/sbin/new-kernel-pkg --package kernel-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-guest-PAE-devel
@@ -1443,6 +1489,8 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
 /boot/System.map-%{KVERREL}hypervisor
 /boot/config-%{KVERREL}hypervisor
+/boot/xen.gz-%{KVERREL}
+/boot/xen-syms-%{KVERREL}
 %dir /lib/modules/%{KVERREL}hypervisor
 /lib/modules/%{KVERREL}hypervisor/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
@@ -1481,6 +1529,8 @@
 /%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
 /boot/System.map-%{KVERREL}hypervisor-PAE
 /boot/config-%{KVERREL}hypervisor-PAE
+/boot/xen.gz-%{KVERREL}-PAE
+/boot/xen-syms-%{KVERREL}-PAE
 %dir /lib/modules/%{KVERREL}hypervisor-PAE
 /lib/modules/%{KVERREL}hypervisor-PAE/kernel
 %verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build
@@ -1544,6 +1594,21 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc3-git1
+- Merge kernel-xen back to kernel.
+
+* Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1941.
+
+* Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
+- rebase with rawhide 1.1940.
+- build only for x86_64 & i686.
+
+* Sun Feb 12 2006 Juan Quintela <quintela at redhat.com>
+- make real release, only with x86_64 & i686.
+- rebase with rawhide 1.1936
+
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git11, -git12, and 2.6.16rc3
 - Fix warning in bcm43xx driver.
@@ -1556,6 +1621,18 @@
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git10
 
+* Sat Feb 11 2006 Juan Quintela <quintela at redhat.com>
+- i686 xen PAE xennet fix.
+
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase 1.1927.
+- added xen smp fixes.
+- added xen x86_64 fixes.
+
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1924.
+- merge with rawhide spec file.
+
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git8 & -git9
 - Begin the kernel-xen & kernel merge by merging the easy bits.
@@ -1591,6 +1668,24 @@
 - add up, smp & kdump kernels.
 - add xen PAE kernels.
 
+* Wed Feb  8 2006 Rik van Riel <riel at redhat.com>
+- fix oops on SMP boot (#180535)
+
+* Wed Feb  8 2006 Jeremy Katz <katzj at redhat.com> 
+- update to newer hypervisor snapshot, conflict with older tools
+- fix pae hypervisor new-kernel-pkg call
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- make_target & kernel_image passed as arguments to BuildKernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- removed SMP_ALTERNATIVES from smp kernel.
+
+* Wed Feb  8 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1918.
+- add up, smp & kdump kernels.
+- add xen PAE kernels.
+
 * Wed Feb  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git6
 

linux-2.6-crash-xen.patch:
 init-xen.c |    2 ++
 1 files changed, 2 insertions(+)

Index: linux-2.6-crash-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crash-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-crash-xen.patch	15 Oct 2005 01:07:29 -0000	1.1
+++ linux-2.6-crash-xen.patch	13 Feb 2006 21:17:47 -0000	1.2
@@ -1,10 +1,19 @@
---- linux-2.6.10/arch/xen/i386/mm/init.c.crash	2005-02-23 15:09:46.520537480 -0500
-+++ linux-2.6.10/arch/xen/i386/mm/init.c	2005-02-23 15:10:05.259476105 -0500
-@@ -244,6 +244,7 @@ static inline int page_is_ram(unsigned l
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(page_is_ram);
+Fix up xen for crash driver in rawhide
+---
+
+ arch/i386/xen/mm/init.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/i386/xen/mm/init.c b/arch/i386/xen/mm/init.c
+index 4c8c7ac..caf4afd 100644
+--- a/arch/i386/mm/init-xen.c
++++ b/arch/i386/mm/init-xen.c
+@@ -281,6 +281,8 @@ int page_is_ram(unsigned long pagenr)
+ 
+ #endif
  
++EXPORT_SYMBOL_GPL(page_is_ram);
++
  #ifdef CONFIG_HIGHMEM
  pte_t *kmap_pte;
+ pgprot_t kmap_prot;

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/i386/mm/pgtable.c          |    3 
 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 
 32 files changed, 952 insertions(+), 14 deletions(-)

Index: linux-2.6-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- linux-2.6-crashdump-common.patch	26 Jan 2006 20:45:32 -0000	1.8
+++ linux-2.6-crashdump-common.patch	13 Feb 2006 21:17:47 -0000	1.9
@@ -239,14 +239,15 @@
 +#endif /* _ASM_X86_64_CRASHDUMP_H */
 --- linux-2.6.12/include/asm-i386/kmap_types.h.orig	2005-06-17 15:48:29.000000000 -0400
 +++ linux-2.6.12/include/asm-i386/kmap_types.h	2005-08-18 14:23:59.000000000 -0400
-@@ -23,7 +23,9 @@
+@@ -23,8 +23,10 @@
  D(10)	KM_IRQ1,
  D(11)	KM_SOFTIRQ0,
  D(12)	KM_SOFTIRQ1,
--D(13)	KM_TYPE_NR
-+D(13)	KM_CRASHDUMP,
-+D(14)	KM_UNUSED,
-+D(15)	KM_TYPE_NR
+ D(13)	KM_SWIOTLB,
+-D(14)	KM_TYPE_NR
++D(14)	KM_CRASHDUMP,
++D(15)	KM_UNUSED,
++D(16)	KM_TYPE_NR
  };
  
  #undef D

linux-2.6-execshield-fixes.patch:
 linux-2.6.15.i686/include/asm-i386/desc.h         |    2 +-
 linux-exec-shield-curr.q/arch/i386/kernel/traps.c |    2 +-
 linux-exec-shield-curr.q/fs/proc/base.c           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-execshield-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-execshield-fixes.patch	17 Jan 2006 21:18:44 -0000	1.3
+++ linux-2.6-execshield-fixes.patch	13 Feb 2006 21:17:47 -0000	1.4
@@ -30,16 +30,15 @@
  #endif
  #ifdef CONFIG_SECURITY
  	E(PROC_TGID_ATTR,      "attr",    S_IFDIR|S_IRUGO|S_IXUGO),
-Index: linux-exec-shield-curr.q/include/asm-i386/desc.h
-===================================================================
---- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h
-+++ linux-exec-shield-curr.q/include/asm-i386/desc.h
-@@ -168,7 +168,7 @@ static inline void set_user_cs(struct de
- }
+diff -uNp linux-2.6.15.i686/include/asm-i386/desc.h.orig linux-2.6.15.i686/include/asm-i386/desc.h
+--- linux-2.6.15.i686/include/asm-i386/desc.h.orig	2006-01-25 17:57:49.000000000 -0500
++++ linux-2.6.15.i686/include/asm-i386/desc.h	2006-01-25 18:00:02.000000000 -0500
+@@ -208,7 +208,7 @@ static inline void set_user_cs(struct de
  
+ #ifndef CONFIG_X86_XEN
  #define load_user_cs_desc(cpu, mm) \
 -    	per_cpu(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);
++ 	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
+ #else
+ #define load_user_cs_desc(cpu, mm) \
+ 	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);

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                         |   93 ++++++++++++++++++-
 arch/i386/mm/init-xen.c                              |   11 +-
 linux-2.6.14/include/asm-i386/desc.h                 |    5 +
 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c |   23 ----
 7 files changed, 171 insertions(+), 29 deletions(-)

Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-execshield-xen.patch	15 Oct 2005 01:02:15 -0000	1.1
+++ linux-2.6-execshield-xen.patch	13 Feb 2006 21:17:47 -0000	1.2
@@ -1,78 +1,69 @@
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/cpu/common.c linux-812/arch/xen/i386/kernel/cpu/common.c
---- linux-811/arch/xen/i386/kernel/cpu/common.c
-+++ linux-812/arch/xen/i386/kernel/cpu/common.c
-@@ -400,6 +400,12 @@ void __init identify_cpu(struct cpuinfo_
- 	if (disable_pse)
- 		clear_bit(X86_FEATURE_PSE, c->x86_capability);
- 
-+	/* hack: disable SEP for non-NX cpus; SEP breaks Execshield. */
-+	#ifdef CONFIG_HIGHMEM64G
-+	if (!test_bit(X86_FEATURE_NX, c->x86_capability))
-+	#endif
-+		clear_bit(X86_FEATURE_SEP, c->x86_capability);
-+
- 	/* If the model name is still unset, do table lookup. */
- 	if ( !c->x86_model_id[0] ) {
- 		char *p;
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/entry.S linux-812/arch/xen/i386/kernel/entry.S
---- linux-811/arch/xen/i386/kernel/entry.S
-+++ linux-812/arch/xen/i386/kernel/entry.S
-@@ -234,7 +234,12 @@ sysenter_past_esp:
+Merge rawhide execshield diffs into xen subarch
+---
+
+ arch/i386/xen/kernel/entry.S              |    8 ++
+ arch/i386/xen/kernel/process.c            |   58 ++++++++++++++++++
+ arch/i386/xen/kernel/smp.c                |    2 +
+ arch/i386/xen/kernel/traps.c              |   93 ++++++++++++++++++++++++++++-
+ arch/i386/xen/mm/init.c                   |   11 +++
+ include/asm-i386/mach-xen/asm/desc.h      |   14 ++++
+ include/asm-i386/mach-xen/asm/mmu.h       |    2 +
+ include/asm-i386/mach-xen/asm/processor.h |    6 ++
+ 8 files changed, 187 insertions(+), 7 deletions(-)
+
+diff --git a/arch/i386/xen/kernel/entry.S b/arch/i386/xen/kernel/entry.S
+index 8e71c50..ced2bb8 100644
+--- a/arch/i386/kernel/entry-xen.S
++++ b/arch/i386/kernel/entry-xen.S
+@@ -233,8 +233,12 @@ sysenter_past_esp:
  	pushl %ebp
  	pushfl
  	pushl $(__USER_CS)
 -	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.
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/process.c linux-812/arch/xen/i386/kernel/process.c
---- linux-811/arch/xen/i386/kernel/process.c
-+++ linux-812/arch/xen/i386/kernel/process.c
-@@ -55,6 +55,7 @@
- 
- #include <linux/irq.h>
- #include <linux/err.h>
-+#include <linux/random.h>
- 
- #include <asm/tlbflush.h>
- #include <asm/cpu.h>
-@@ -94,6 +95,52 @@ void enable_hlt(void)
- 
- EXPORT_SYMBOL(enable_hlt);
+  * Careful about security.
+diff --git a/arch/i386/xen/kernel/process.c b/arch/i386/xen/kernel/process.c
+index 55be738..dbd41a1 100644
+--- a/arch/i386/kernel/process-xen.c
++++ b/arch/i386/kernel/process-xen.c
+@@ -543,6 +543,8 @@ struct task_struct fastcall * __switch_t
+ #if 0 /* lazy fpu sanity check */
+ 	else BUG_ON(!(read_cr0() & 8));
+ #endif
++	if (next_p->mm)
++		load_user_cs_desc(cpu, next_p->mm);
  
-+void randomize_brk(unsigned long old_brk)
-+{
-+	unsigned long new_brk, range_start, range_end;
-+
-+	range_start = 0x08000000;
-+	if (current->mm->brk >= range_start)
-+		range_start = current->mm->brk;
-+	range_end = range_start + 0x02000000;
-+	new_brk = randomize_range(range_start, range_end, 0);
-+	if (new_brk)
-+		current->mm->brk = new_brk;
-+}
+ 	/*
+ 	 * Reload esp0.
+@@ -835,3 +837,59 @@ unsigned long arch_align_stack(unsigned 
+ 		sp -= get_random_int() % 8192;
+ 	return sp & ~0xf;
+ }
 +
 +void arch_add_exec_range(struct mm_struct *mm, unsigned long limit)
 +{
 +	if (limit > mm->context.exec_limit) {
 +		mm->context.exec_limit = limit;
 +		set_user_cs(&mm->context.user_cs, limit);
-+		if (mm == current->mm)
++		if (mm == current->mm) {
++			preempt_disable();
 +			load_user_cs_desc(smp_processor_id(), mm);
++			preempt_enable();
++		}
 +	}
 +}
-+
 +void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end)
 +{
 +	struct vm_area_struct *vma;
-+	unsigned long limit = 0;
++	unsigned long limit = PAGE_SIZE;
 +
 +	if (old_end == mm->context.exec_limit) {
 +		for (vma = mm->mmap; vma; vma = vma->vm_next)
@@ -81,8 +72,11 @@
 +
 +		mm->context.exec_limit = limit;
 +		set_user_cs(&mm->context.user_cs, limit);
-+		if (mm == current->mm)
++		if (mm == current->mm) {
++			preempt_disable();
 +			load_user_cs_desc(smp_processor_id(), mm);
++			preempt_enable();
++		}
 +	}
 +}
 +
@@ -92,55 +86,28 @@
 +	set_user_cs(&mm->context.user_cs, 0);
 +}
 +
- /* XXX XEN doesn't use default_idle(), poll_idle(). Use xen_idle() instead. */
- extern void stop_hz_timer(void);
- extern void start_hz_timer(void);
-@@ -566,6 +613,12 @@ struct task_struct fastcall * __switch_t
- 	}
- 
- 	/*
-+	 * Exec-shield CS adjustment.
-+	 */
-+	if (next_p->mm)
-+		load_user_cs_desc(cpu, next_p->mm);
++/*
++ * Generate random brk address between 128MB and 196MB. (if the layout
++ * allows it.)
++ */
++void randomize_brk(unsigned long old_brk)
++{
++	unsigned long new_brk, range_start, range_end;
 +
-+	/*
- 	 * Now maybe reload the debug registers
- 	 */
- 	if (unlikely(next->debugreg[7])) {
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/signal.c linux-812/arch/xen/i386/kernel/signal.c
---- linux-811/arch/xen/i386/kernel/signal.c
-+++ linux-812/arch/xen/i386/kernel/signal.c
-@@ -380,7 +380,7 @@ static void setup_frame(int sig, struct 
- 			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;
- 
-@@ -475,7 +475,7 @@ static void setup_rt_frame(int sig, stru
- 		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);
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/smp.c linux-812/arch/xen/i386/kernel/smp.c
---- linux-811/arch/xen/i386/kernel/smp.c
-+++ linux-812/arch/xen/i386/kernel/smp.c
-@@ -23,6 +23,7 @@
- 
- #include <asm/mtrr.h>
- #include <asm/tlbflush.h>
-+#include <asm/desc.h>
- #if 0
- #include <mach_apic.h>
- #endif
-@@ -289,6 +290,8 @@ irqreturn_t smp_invalidate_interrupt(int
++	range_start = 0x08000000;
++	if (current->mm->brk >= range_start)
++		range_start = current->mm->brk;
++	range_end = range_start + 0x02000000;
++	new_brk = randomize_range(range_start, range_end, 0);
++	if (new_brk)
++		current->mm->brk = new_brk;
++}
++
+diff --git a/arch/i386/xen/kernel/smp.c b/arch/i386/xen/kernel/smp.c
+index 855e088..230200c 100644
+--- a/arch/i386/kernel/smp-xen.c
++++ b/arch/i386/kernel/smp-xen.c
+@@ -277,6 +277,8 @@ irqreturn_t smp_invalidate_interrupt(int
  	unsigned long cpu;
  
  	cpu = get_cpu();
@@ -149,18 +116,17 @@
  
  	if (!cpu_isset(cpu, flush_cpumask))
  		goto out;
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/kernel/traps.c linux-812/arch/xen/i386/kernel/traps.c
---- linux-811/arch/xen/i386/kernel/traps.c
-+++ linux-812/arch/xen/i386/kernel/traps.c
-@@ -449,13 +449,91 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv
- DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
- DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
- DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
--DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
+diff --git a/arch/i386/xen/kernel/traps.c b/arch/i386/xen/kernel/traps.c
+index 0f7199b..878c084 100644
+--- a/arch/i386/kernel/traps-xen.c
++++ b/arch/i386/kernel/traps-xen.c
+@@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che
  #ifdef CONFIG_X86_MCE
  DO_ERROR(18, SIGBUS, "machine check", machine_check)
  #endif
- 
+-DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
++
++
 +/*
 + * lazy-check for CS validity on exec-shield binaries:
 + *
@@ -168,7 +134,7 @@
 + * Solar Designer <solar at openwall.com>. Thanks!
 + */
 +static int
-+check_lazy_exec_limit(int cpu, struct pt_regs * regs, long error_code)
++check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code)
 +{
 +	struct desc_struct *desc1, *desc2;
 +	struct vm_area_struct *vma;
@@ -222,22 +188,22 @@
 + */
 +fastcall void do_iret_error(struct pt_regs *regs, long error_code)
 +{
-+	int ok;
-+	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
++	int ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
 +	put_cpu();
 +	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-+				error_code, 32, SIGSEGV) != NOTIFY_STOP) {
++			      error_code, 32, SIGSEGV) != NOTIFY_STOP) {
 +		siginfo_t info;
 +		info.si_signo = SIGSEGV;
 +		info.si_errno = 0;
 +		info.si_code = ILL_BADSTK;
 +		info.si_addr = 0;
 +		do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-+				&info);
++			&info);
 +	}
 +}
-+
- fastcall void do_general_protection(struct pt_regs * regs, long error_code)
+ 
+ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
+ 					      long error_code)
  {
 +	int cpu = get_cpu();
 +	int ok;
@@ -245,7 +211,7 @@
  	/*
  	 * If we trapped on an LDT access then ensure that the default_ldt is
  	 * loaded, if nothing else. We load default_ldt lazily because LDT
-@@ -465,11 +543,18 @@ fastcall void do_general_protection(stru
+@@ -473,13 +551,22 @@ fastcall void __kprobes do_general_prote
  		unsigned long ldt;
  		__asm__ __volatile__ ("sldt %0" : "=r" (ldt));
  		if (ldt == 0) {
@@ -255,19 +221,55 @@
  		}
  	}
  
+-	current->thread.error_code = error_code;
+-	current->thread.trap_no = 13;
 +	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
 +
 +	if (ok)
 +		return;
 +
++	if (print_fatal_signals) {
++		printk("#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id());
++		printk(" exec_limit: %08lx, user_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, current->mm->context.user_cs.a, current->mm->context.user_cs.b);
++	}
+ 
  	if (regs->eflags & VM_MASK)
  		goto gp_in_vm86;
+diff --git a/arch/i386/xen/mm/init.c b/arch/i386/xen/mm/init.c
+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
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/arch/xen/i386/mm/init.c linux-812/arch/xen/i386/mm/init.c
---- linux-811/arch/xen/i386/mm/init.c
-+++ linux-812/arch/xen/i386/mm/init.c
-@@ -504,7 +504,10 @@ void __init paging_init(void)
+@@ -469,7 +472,7 @@ u64 __supported_pte_mask __read_mostly =
+  * Control non executable mappings.
+  *
+  * on      Enable
+- * off     Disable
++ * off     Disable (disables exec-shield too)
+  */
+ void __init noexec_setup(const char *str)
+ {
+@@ -479,6 +482,7 @@ void __init noexec_setup(const char *str
+ 	} else if (!strncmp(str,"off",3)) {
+ 		disable_nx = 1;
+ 		__supported_pte_mask &= ~_PAGE_NX;
++		exec_shield = 0;
+ 	}
+ }
+ 
+@@ -547,7 +551,10 @@ void __init paging_init(void)
  	set_nx();
  	if (nx_enabled)
  		printk("NX (Execute Disable) protection: active\n");
@@ -278,91 +280,60 @@
  
  	pagetable_init();
  
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/fs/binfmt_elf.c linux-812/fs/binfmt_elf.c
---- linux-811/fs/binfmt_elf.c
-+++ linux-812/fs/binfmt_elf.c
-@@ -42,6 +42,7 @@
- #include <asm/uaccess.h>
- #include <asm/param.h>
- #include <asm/page.h>
-+#include <asm/pgalloc.h>
- 
- #include <linux/elf.h>
- 
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/asm-xen/asm-i386/desc.h linux-812/include/asm-xen/asm-i386/desc.h
---- linux-811/include/asm-xen/asm-i386/desc.h
-+++ linux-812/include/asm-xen/asm-i386/desc.h
-@@ -141,6 +141,16 @@ static inline unsigned long get_desc_bas
- 	return base;
+--- linux-2.6.14/include/asm-i386/desc.h~	2006-01-06 17:09:44.000000000 -0500
++++ linux-2.6.14/include/asm-i386/desc.h	2006-01-06 17:22:41.000000000 -0500
+@@ -210,8 +210,13 @@
+ 	desc->b = (limit & 0xf0000) | 0x00c0fb00;
  }
  
-+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-+{
-+	limit = (limit - 1) / PAGE_SIZE;
-+	desc->a = limit & 0xffff;
-+	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-+}
-+
++#ifndef CONFIG_X86_XEN
+ #define load_user_cs_desc(cpu, mm) \
+     	per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++#else
 +#define load_user_cs_desc(cpu, mm) \
-+	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); 
-+
- #endif /* !__ASSEMBLY__ */
++	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
++#endif
  
- #endif
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/asm-xen/asm-i386/mmu.h linux-812/include/asm-xen/asm-i386/mmu.h
---- linux-811/include/asm-xen/asm-i386/mmu.h
-+++ linux-812/include/asm-xen/asm-i386/mmu.h
-@@ -7,6 +7,9 @@
-  * 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.
-  */
- typedef struct { 
- 	int size;
-@@ -14,6 +17,9 @@ typedef struct { 
- 	void *ldt;
- 	unsigned pinned:1;
- 	struct list_head unpinned;
-+	struct desc_struct user_cs;
-+	unsigned long exec_limit;
-+	void *vdso;
- } mm_context_t;
- 
- extern struct list_head mm_unpinned;
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/asm-xen/asm-i386/pgalloc.h linux-812/include/asm-xen/asm-i386/pgalloc.h
---- linux-811/include/asm-xen/asm-i386/pgalloc.h
-+++ linux-812/include/asm-xen/asm-i386/pgalloc.h
-@@ -58,4 +58,9 @@ extern void pte_free(struct page *pte);
- 
- #define check_pgt_cache()	do { } while (0)
- 
-+/* Exec-Shield dummy macros */
-+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);
-+extern void arch_flush_exec_range(struct mm_struct *mm);
-+
- #endif /* _I386_PGALLOC_H */
-diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/asm-xen/asm-i386/processor.h linux-812/include/asm-xen/asm-i386/processor.h
---- linux-811/include/asm-xen/asm-i386/processor.h
-+++ linux-812/include/asm-xen/asm-i386/processor.h
-@@ -511,6 +511,9 @@ static inline void load_esp0(struct tss_
- 	regs->xcs = __USER_CS;					\
- 	regs->eip = new_eip;					\
- 	regs->esp = new_esp;					\
-+	preempt_disable();					\
-+	load_user_cs_desc(smp_processor_id(), current->mm);	\
-+	preempt_enable();					\
- } while (0)
+ 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);
+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
+ 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; 
+@@ -60,28 +60,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);
  
  /*
-@@ -700,4 +703,7 @@ extern void select_idle_routine(const st
- 
- extern unsigned long boot_option_idle_override;
- 
-+#define __HAVE_ARCH_ALIGN_STACK
-+extern unsigned long arch_align_stack(unsigned long sp);
-+
- #endif /* __ASM_I386_PROCESSOR_H */
+  * Great future plan:

linux-2.6-xen-vdso-note.patch:
 vsyscall-note-xen.S |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-xen-vdso-note.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-vdso-note.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-vdso-note.patch	15 Oct 2005 01:02:15 -0000	1.1
+++ linux-2.6-xen-vdso-note.patch	13 Feb 2006 21:17:47 -0000	1.2
@@ -1,84 +1,9 @@
---- linux-2.6/arch/xen/i386/kernel/vsyscall-note.S
-+++ linux-2.6/arch/xen/i386/kernel/vsyscall-note.S
-@@ -0,0 +1,32 @@
-+/*
-+ * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
-+ * Here we can supply some information useful to userland.
-+ * First we get the vanilla i386 note that supplies the kernel version info.
-+ */
-+
-+#include "../../../i386/kernel/vsyscall-note.S"
-+
-+/*
-+ * Now we add a special note telling glibc's dynamic linker a fake hardware
-+ * flavor that it will use to choose the search path for libraries in the
-+ * same way it uses real hardware capabilities like "mmx".
-+ * We supply "nosegneg" as the fake capability, to indicate that we
-+ * do not like negative offsets in instructions using segment overrides,
-+ * since we implement those inefficiently.  This makes it possible to
-+ * install libraries optimized to avoid those access patterns in someplace
-+ * like /lib/i686/tls/nosegneg.  Note that an /etc/ld.so.conf.d/file
-+ * corresponding to the bits here is needed to make ldconfig work right.
-+ * It should contain:
-+ *	hwcap 0 nosegneg
-+ * to match the mapping of bit to name that we give here.
-+ */
-+#define NOTE_KERNELCAP_BEGIN(ncaps, mask) \
-+	ASM_ELF_NOTE_BEGIN(".note.kernelcap", "a", "GNU", 2) \
-+	.long ncaps, mask
-+#define NOTE_KERNELCAP(bit, name) \
-+	.byte bit; .asciz name
-+#define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
-+
-+NOTE_KERNELCAP_BEGIN(1, 1)
-+NOTE_KERNELCAP(0, "nosegneg")
-+NOTE_KERNELCAP_END
---- linux-2.6.11/include/asm-xen/asm-i386/page.h.vdso	2005-04-27 10:33:03.000000000 -0400
-+++ linux-2.6.11/include/asm-xen/asm-i386/page.h	2005-04-27 10:33:19.000000000 -0400
-@@ -200,6 +200,8 @@ extern int sysctl_legacy_va_layout;
- 
- #define devmem_is_allowed(x) 1
- 
-+#define __HAVE_ARCH_GATE_AREA 1
-+
- #endif /* __KERNEL__ */
- 
- #endif /* _I386_PAGE_H */
---- linux-2.6.12/arch/xen/i386/kernel/ldt.c.vdso	2005-08-19 10:50:02.000000000 -0400
-+++ linux-2.6.12/arch/xen/i386/kernel/ldt.c	2005-08-21 11:01:21.000000000 -0400
-@@ -101,8 +101,9 @@
- 	struct mm_struct * old_mm;
- 	int retval = 0;
- 
--	memset(&mm->context, 0, sizeof(mm->context));
- 	init_MUTEX(&mm->context.sem);
-+	mm->context.size = 0;
-+	mm->context.pinned = 0;
- 	old_mm = current->mm;
- 	if (old_mm && old_mm->context.size > 0) {
- 		down(&old_mm->context.sem);
---- linux-2.6.12/arch/xen/i386/kernel/Makefile.vdso	2005-08-22 13:38:36.000000000 -0400
-+++ linux-2.6.12/arch/xen/i386/kernel/Makefile	2005-08-22 13:42:00.000000000 -0400
-@@ -69,7 +69,7 @@
+--- linux-2.6.14/arch/i386/kernel/vsyscall-note-xen.S~	2006-01-06 17:26:37.000000000 -0500
++++ linux-2.6.14/arch/i386/kernel/vsyscall-note-xen.S	2006-01-06 17:32:11.000000000 -0500
+@@ -28,5 +28,5 @@
+ #define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
  
- $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
--		      $(obj)/vsyscall-%.o FORCE
-+		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
- 	$(call if_changed,syscall)
- 
- # We also create a special relocatable object that should mirror the symbol
-@@ -81,11 +81,11 @@
- 
- SYSCFLAGS_vsyscall-syms.o = -r
- $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
--			$(obj)/vsyscall-sysenter.o FORCE
-+			$(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
- 	$(call if_changed,syscall)
- 
- c-link	:=
--s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o syscall_table.o
-+s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o vsyscall-note.o syscall_table.o
- 
- $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
- 	@ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@
+ NOTE_KERNELCAP_BEGIN(1, 1)
+-NOTE_KERNELCAP(1, "nosegneg")  /* Change 1 back to 0 when glibc is fixed! */
++NOTE_KERNELCAP(0, "nosegneg")
+ NOTE_KERNELCAP_END


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- sources	13 Feb 2006 03:11:41 -0000	1.291
+++ sources	13 Feb 2006 21:17:47 -0000	1.292
@@ -1,2 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
+30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
+3d429736212d795ad28806945066d697  patch-2.6.16-rc3-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- upstream	13 Feb 2006 16:13:18 -0000	1.266
+++ upstream	13 Feb 2006 21:17:47 -0000	1.267
@@ -1,2 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
+patch-2.6.16-rc3-git1.bz2


--- linux-2.6.14-intel-cache-build.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:21:24 -0500
Subject: rpms/kernel/devel Config.mk,NONE,1.1
Message-ID: <200602132121.k1DLLOis008993@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	Config.mk 
Log Message:
new file



--- NEW FILE Config.mk ---
# -*- mode: Makefile; -*-

# Currently supported architectures: x86_32, x86_64
XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
XEN_TARGET_X86_PAE  ?= n

# Tools to run on system hosting the build
HOSTCC     = gcc
HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer

AS         = $(CROSS_COMPILE)as
LD         = $(CROSS_COMPILE)ld
CC         = $(CROSS_COMPILE)gcc
CPP        = $(CROSS_COMPILE)gcc -E
AR         = $(CROSS_COMPILE)ar
RANLIB     = $(CROSS_COMPILE)ranlib
NM         = $(CROSS_COMPILE)nm
STRIP      = $(CROSS_COMPILE)strip
OBJCOPY    = $(CROSS_COMPILE)objcopy
OBJDUMP    = $(CROSS_COMPILE)objdump

DISTDIR     ?= $(XEN_ROOT)/dist

INSTALL      = install
INSTALL_DIR  = $(INSTALL) -d -m0755
INSTALL_DATA = $(INSTALL) -m0644
INSTALL_PROG = $(INSTALL) -m0755

ifeq ($(XEN_TARGET_ARCH),x86_64)
LIBDIR = lib64
else
LIBDIR = lib
endif

ifneq ($(EXTRA_PREFIX),)
EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
endif

LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) 
CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))

# Choose the best mirror to download linux kernel
KERNEL_REPO = http://www.kernel.org

# ACM_USE_SECURITY_POLICY is set to security policy of Xen
# Supported models are:
#	ACM_NULL_POLICY (ACM will not be built with this policy)
#	ACM_CHINESE_WALL_POLICY
#	ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY
#	ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY

# Optional components
XENSTAT_XENTOP ?= y

VTPM_TOOLS ?= n

-include $(XEN_ROOT)/.config



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:26:57 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.104, 1.105 kudzu.spec, 1.119,
	1.120 sources, 1.117, 1.118
Message-ID: <200602132126.k1DLQvEm018460@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18437

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- .cvsignore	13 Feb 2006 16:06:50 -0000	1.104
+++ .cvsignore	13 Feb 2006 21:26:55 -0000	1.105
@@ -1 +1 @@
-kudzu-1.2.26.tar.gz
+kudzu-1.2.27.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kudzu.spec	13 Feb 2006 16:06:50 -0000	1.119
+++ kudzu.spec	13 Feb 2006 21:26:55 -0000	1.120
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.26
+Version: 1.2.27
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.27-1
+- restrict video devices to PCI class 0300, correctly (should solve #176978)
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.26-1
 - restrict video devices to PCI class 0300 (should solve #176978)
 - translation updates


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources	13 Feb 2006 16:06:50 -0000	1.117
+++ sources	13 Feb 2006 21:26:55 -0000	1.118
@@ -1 +1 @@
-29ac798c1afd71d2a5dfcef657913624  kudzu-1.2.26.tar.gz
+d1b8c0cd0456cf81847342c36a99f91c  kudzu-1.2.27.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:39:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:39:14 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1944,1.1945
Message-ID: <200602132139.k1DLdEIx021083@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec 
Log Message:
package naming bits


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1944
retrieving revision 1.1945
diff -u -r1.1944 -r1.1945
--- kernel-2.6.spec	13 Feb 2006 21:17:47 -0000	1.1944
+++ kernel-2.6.spec	13 Feb 2006 21:39:11 -0000	1.1945
@@ -1355,7 +1355,7 @@
 
 %post xen-hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-hypervisor-devel
@@ -1368,7 +1368,7 @@
 
 %post xen-guest
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
-/sbin/new-kernel-pkg --package kernel-guest --mkinitrd --depmod --install %{KVERREL}guest
+/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-guest-devel
@@ -1381,7 +1381,7 @@
 
 %post xen-hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-hypervisor-PAE-devel
@@ -1394,7 +1394,7 @@
 
 %post xen-guest-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
-/sbin/new-kernel-pkg --package kernel-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
+/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post xen-guest-PAE-devel



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:47:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:47:19 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1945,1.1946
Message-ID: <200602132147.k1DLlJtC004846@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec 
Log Message:
bump


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -r1.1945 -r1.1946
--- kernel-2.6.spec	13 Feb 2006 21:39:11 -0000	1.1945
+++ kernel-2.6.spec	13 Feb 2006 21:47:16 -0000	1.1946
@@ -1595,7 +1595,7 @@
 
 %changelog
 * Mon Feb 13 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc3-git1
+- 2.6.16rc3-git1 
 - Merge kernel-xen back to kernel.
 
 * Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:48:03 -0500
Subject: rpms/libdv/devel libdv-0.103-mmx.patch, NONE, 1.1 libdv.spec, 1.14,
	1.15
Message-ID: <200602132148.k1DLm3Ps005225@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/libdv/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5197

Modified Files:
	libdv.spec 
Added Files:
	libdv-0.103-mmx.patch 
Log Message:
fix build

libdv-0.103-mmx.patch:
 mmx.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE libdv-0.103-mmx.patch ---
--- libdv-0.103/libdv/mmx.h.mmx	2006-02-13 16:43:45.000000000 -0500
+++ libdv-0.103/libdv/mmx.h	2006-02-13 16:43:57.000000000 -0500
@@ -353,16 +353,16 @@
 #define	mmx_i2r(op, imm, reg) \
 	__asm__ __volatile__ (#op " %0, %%" #reg \
 			      : /* nothing */ \
-			      : "X" (imm) )
+			      : "i" (imm) )
 
 #define	mmx_m2r(op, mem, reg) \
 	__asm__ __volatile__ (#op " %0, %%" #reg \
 			      : /* nothing */ \
-			      : "X" (mem))
+			      : "m" (mem))
 
 #define	mmx_r2m(op, reg, mem) \
 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
-			      : "=X" (mem) \
+			      : "=m" (mem) \
 			      : /* nothing */ )
 
 #define	mmx_r2r(op, regs, regd) \
@@ -372,8 +372,8 @@
 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
 			      #op " %1, %%mm0\n\t" \
 			      "movq %%mm0, %0" \
-			      : "=X" (memd) \
-			      : "X" (mems))
+			      : "=m" (memd) \
+			      : "m" (mems))
 
 #endif
 


Index: libdv.spec
===================================================================
RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libdv.spec	11 Feb 2006 03:55:21 -0000	1.14
+++ libdv.spec	13 Feb 2006 21:48:00 -0000	1.15
@@ -1,15 +1,17 @@
 Summary: 	Software decoder for DV format video.
 Name: 		libdv
 Version: 	0.103
-Release: 4.2.1
+Release:	4.3
 Epoch:		0
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://libdv.sourceforge.net/
 Source0: 	http://dl.sourceforge.net/sourceforge/libdv/libdv-0.103.tar.gz
 Patch0:         libdv-0.103-noexec-stack.patch
+Patch1:         libdv-0.103-mmx.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	gtk+-devel >= 0:1.2.4
+BuildRequires:	libXv-devel
 ExcludeArch:    s390 s390x
 
 %package	devel
@@ -41,7 +43,8 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -84,6 +87,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 0:0.103-4.3
+- Patch to build with gcc 4.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.103-4.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 21:57:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 16:57:41 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1946,1.1947
Message-ID: <200602132157.k1DLvfs2009620@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec 
Log Message:
remove pre-subarch xen cp, for the second time today ;)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1946
retrieving revision 1.1947
diff -u -r1.1946 -r1.1947
--- kernel-2.6.spec	13 Feb 2006 21:47:16 -0000	1.1946
+++ kernel-2.6.spec	13 Feb 2006 21:57:39 -0000	1.1947
@@ -1149,9 +1149,6 @@
     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
-%if %{buildxen}
-    cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-%endif
     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



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:04:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:04:20 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.219, 1.220 anaconda.spec, 1.339,
	1.340 sources, 1.338, 1.339
Message-ID: <200602132204.k1DM4KXs010455@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10400/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.3-1 on branch devel from anaconda-10.92.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- .cvsignore	13 Feb 2006 20:36:00 -0000	1.219
+++ .cvsignore	13 Feb 2006 22:03:33 -0000	1.220
@@ -1 +1 @@
-anaconda-10.92.2.tar.bz2
+anaconda-10.92.3.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- anaconda.spec	13 Feb 2006 20:36:00 -0000	1.339
+++ anaconda.spec	13 Feb 2006 22:03:34 -0000	1.340
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.2
+Version: 10.92.3
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.3-1
+- Don't debug log about missing help text (clumens)
+- Reduce deps for pkgorder
+- Updated kickstart docs (clumens)
+
 * Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.2-1
 - more x86_64 xen guest fixing
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- sources	13 Feb 2006 20:36:01 -0000	1.338
+++ sources	13 Feb 2006 22:03:47 -0000	1.339
@@ -1 +1 @@
-202bf35496499e334ba3c73624523775  anaconda-10.92.2.tar.bz2
+eab323981d8a1759c4b33e94eba80e58  anaconda-10.92.3.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:16:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:16:02 -0500
Subject: rpms/gnbd-kernel/devel .cvsignore, 1.14, 1.15 gnbd-kernel.spec,
	1.122, 1.123 sources, 1.17, 1.18
Message-ID: <200602132216.k1DMG29r019023@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore gnbd-kernel.spec sources 
Log Message:
Build for latest kernel.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Feb 2006 20:45:48 -0000	1.14
+++ .cvsignore	13 Feb 2006 22:16:00 -0000	1.15
@@ -1 +1 @@
-gnbd-kernel-2.6.15-1.tar.gz
+gfs-kernel-2.6.15-2.tar.gz


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gnbd-kernel.spec	13 Feb 2006 20:59:55 -0000	1.122
+++ gnbd-kernel.spec	13 Feb 2006 22:16:00 -0000	1.123
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 1
+%define subversion 2
 
 %ifnarch i686
 %define buildsmp 0
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 3
+Release: 4
 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Feb 2006 20:45:48 -0000	1.17
+++ sources	13 Feb 2006 22:16:00 -0000	1.18
@@ -1 +1 @@
-7f9332c03380a41ebe16b3f7b03755f7  gnbd-kernel-2.6.15-1.tar.gz
+46401c7480479923790bdcb500e4d293  gfs-kernel-2.6.15-2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:35:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:35:41 -0500
Subject: rpms/kernel-xen/devel kernel-xen.spec,1.70,1.71
Message-ID: <200602132235.k1DMZfwe001105@cvs.devel.redhat.com>

Author: katzj

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

Modified Files:
	kernel-xen.spec 
Log Message:
* Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com>
- pass argument to new-kernel-pkg for location of HV



Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kernel-xen.spec	13 Feb 2006 15:58:12 -0000	1.70
+++ kernel-xen.spec	13 Feb 2006 22:35:37 -0000	1.71
@@ -1351,7 +1351,7 @@
 
 %post hypervisor
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-devel
@@ -1377,7 +1377,7 @@
 
 %post hypervisor-PAE
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
 %post hypervisor-PAE-devel
@@ -1590,6 +1590,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com>
+- pass argument to new-kernel-pkg for location of HV
+
 * Mon Feb 13 2006 Juan Quintela <quintela at redhat.com>
 - compile only xen kernels.
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:41:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:41:12 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.128,1.129
Message-ID: <200602132241.k1DMfC84003654@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Build new upstream sourcews.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- GFS-kernel.spec	13 Feb 2006 21:04:12 -0000	1.128
+++ GFS-kernel.spec	13 Feb 2006 22:41:09 -0000	1.129
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1941_FC5
-%define subversion 1
+%define subversion 2
 
 %ifnarch i686
 %define buildsmp 0
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:49:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:49:11 -0500
Subject: rpms/oaf/devel oaf.spec,1.20,1.21
Message-ID: <200602132249.k1DMnAT0019627@cvs.devel.redhat.com>

Author: jkeating

Update of /cvs/dist/rpms/oaf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19597

Modified Files:
	oaf.spec 
Log Message:
bump a 3rd time for long-double fixes


Index: oaf.spec
===================================================================
RCS file: /cvs/dist/rpms/oaf/devel/oaf.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- oaf.spec	13 Feb 2006 18:42:47 -0000	1.20
+++ oaf.spec	13 Feb 2006 22:49:07 -0000	1.21
@@ -1,7 +1,7 @@
 Name: oaf
 Summary: Object activation framework for GNOME.
 Version: 0.6.10
-Release: 12.2.2
+Release: 12.3
 License: LGPL and GPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/stable/%{name}/%{name}-%{version}.tar.bz2
@@ -78,6 +78,9 @@
 %{_libdir}/*.sh
 
 %changelog
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.3
+- needed to build a 3rd from for the long-double issues
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.6.10-12.2.2
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:51:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:51:18 -0500
Subject: rpms/GFS-kernel/devel .cvsignore, 1.22, 1.23 GFS-kernel.spec, 1.129,
	1.130 sources, 1.23, 1.24
Message-ID: <200602132251.k1DMpIaH020650@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore GFS-kernel.spec sources 
Log Message:
Include new sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Feb 2006 21:03:55 -0000	1.22
+++ .cvsignore	13 Feb 2006 22:51:15 -0000	1.23
@@ -1 +1 @@
-gfs-kernel-2.6.15-1.tar.gz
+gfs-kernel-2.6.15-2.tar.gz


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- GFS-kernel.spec	13 Feb 2006 22:41:09 -0000	1.129
+++ GFS-kernel.spec	13 Feb 2006 22:51:15 -0000	1.130
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Feb 2006 21:04:12 -0000	1.23
+++ sources	13 Feb 2006 22:51:15 -0000	1.24
@@ -1 +1 @@
-45239d2618e3b4ebac3bca76d2340d20  gfs-kernel-2.6.15-1.tar.gz
+46401c7480479923790bdcb500e4d293  gfs-kernel-2.6.15-2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 22:52:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 17:52:19 -0500
Subject: rpms/gnome-libs/devel gnome-libs.spec,1.43,1.44
Message-ID: <200602132252.k1DMqJlD021177@cvs.devel.redhat.com>

Author: jkeating

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

Modified Files:
	gnome-libs.spec 
Log Message:
bump a 3rd time for long-double fixes


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-libs.spec	13 Feb 2006 18:40:10 -0000	1.43
+++ gnome-libs.spec	13 Feb 2006 22:52:16 -0000	1.44
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 48.2.1
+Release: 	48.3
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -350,8 +350,8 @@
 
 
 %changelog
-* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.2.1
-- rebump for build order issues during double-long bump
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.3
+- need to rebuild a 3rd time for long-double fixes.
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Mon Feb 13 23:07:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 18:07:25 -0500
Subject: rpms/gdm/devel .cvsignore, 1.21, 1.22 gdm.spec, 1.129, 1.130 sources,
	1.23, 1.24
Message-ID: <200602132307.k1DN7PVU018327@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18316

Modified Files:
	.cvsignore gdm.spec sources 
Log Message:

- update to 2.13.0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 Feb 2006 22:29:35 -0000	1.21
+++ .cvsignore	13 Feb 2006 23:07:12 -0000	1.22
@@ -1 +1 @@
-gdm-2.13.0.7.0.2006.02.12.tar.bz2
+gdm-2.13.0.8.tar.gz


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gdm.spec	13 Feb 2006 17:19:21 -0000	1.129
+++ gdm.spec	13 Feb 2006 23:07:12 -0000	1.130
@@ -14,8 +14,8 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.13.0.7.0.2006.02.12
-Release: 2
+Version: 2.13.0.8
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -44,7 +44,6 @@
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch20: gdm-2.13.0.4-add-locale-header.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
-Patch23: gdm-2.13.0.7.0.2006.02.12-move-gdm-defaults-conf.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -117,7 +116,6 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch20 -p1 -b .add-locale-header
 %patch22 -p1 -b .pam_stack
-%patch23 -p1 -b .move-gdm-defaults-conf
 
 # 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
@@ -306,6 +304,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-1
+- update to 2.13.0.8
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.7.0.2006.02.12-2
 - migrate custom.conf settings with /etc/X11/gdm to /etc/gdm
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Feb 2006 22:29:36 -0000	1.23
+++ sources	13 Feb 2006 23:07:13 -0000	1.24
@@ -1 +1 @@
-488eb7c6837793dd52eba4bca7005847  gdm-2.13.0.7.0.2006.02.12.tar.bz2
+a0988b6ef167aaf4b11c85c0db6795cd  gdm-2.13.0.8.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 13 23:10:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 18:10:29 -0500
Subject: rpms/gdm/devel gdm.spec,1.130,1.131
Message-ID: <200602132310.k1DNATx6018477@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18442

Modified Files:
	gdm.spec 
Log Message:
s/bz2/gz/



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gdm.spec	13 Feb 2006 23:07:12 -0000	1.130
+++ gdm.spec	13 Feb 2006 23:10:26 -0000	1.131
@@ -20,7 +20,7 @@
 License: LGPL/GPL
 Group: User Interface/X
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm
-Source: gdm-%{PACKAGE_VERSION}.tar.bz2
+Source: gdm-%{PACKAGE_VERSION}.tar.gz
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init



From fedora-cvs-commits at redhat.com  Mon Feb 13 23:32:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 18:32:11 -0500
Subject: rpms/python-pyblock/devel .cvsignore, 1.11, 1.12 python-pyblock.spec,
	1.18, 1.19 sources, 1.15, 1.16
Message-ID: <200602132332.k1DNWB5A031270@cvs.devel.redhat.com>

Author: pjones

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

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- update to 0.14-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	6 Feb 2006 22:07:49 -0000	1.11
+++ .cvsignore	13 Feb 2006 23:31:57 -0000	1.12
@@ -1 +1 @@
-pyblock-0.13.tar.bz2
+pyblock-0.14.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-pyblock.spec	11 Feb 2006 05:24:31 -0000	1.18
+++ python-pyblock.spec	13 Feb 2006 23:31:57 -0000	1.19
@@ -4,8 +4,8 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.13
-Release: 1.1
+Version: 0.14
+Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
 Group: System Environment/Libraries
@@ -38,6 +38,11 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 0.14-1
+- remove member partitions when we activate, rebuild them when we deactivate
+- add another "count_devices(ctx->lc, NATIVE)" in discover_raiddevs.  it
+  seems to help...
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.13-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Feb 2006 22:07:49 -0000	1.15
+++ sources	13 Feb 2006 23:31:57 -0000	1.16
@@ -1 +1 @@
-bb05f208de1459ee10b324ea988fd543  pyblock-0.13.tar.bz2
+d3cee09b63cf1deae5181443738d87f8  pyblock-0.14.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 13 23:45:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 18:45:29 -0500
Subject: rpms/epiphany/devel .cvsignore, 1.34, 1.35 epiphany.spec, 1.88,
	1.89 sources, 1.34, 1.35
Message-ID: <200602132345.k1DNjTD6032253@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31706

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
* Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
- Update to 1.9.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	31 Jan 2006 05:07:47 -0000	1.34
+++ .cvsignore	13 Feb 2006 23:45:27 -0000	1.35
@@ -1,23 +1 @@
-epiphany-1.3.8.tar.bz2
-epiphany-1.4.0.tar.bz2
-epiphany-1.4.3.tar.gz
-epiphany-1.4.3.tar.bz2
-epiphany-1.4.4.tar.bz2
-epiphany-1.4.6.tar.bz2
-epiphany-1.4.7.tar.bz2
-epiphany-1.5.5.tar.bz2
-epiphany-1.5.6.tar.bz2
-epiphany-1.5.7.tar.bz2
-epiphany-1.8.2.tar.bz2
-epiphany-1.7.1.tar.bz2
-epiphany-1.7.2.tar.bz2
-epiphany-1.7.3.tar.bz2
-epiphany-1.7.4.tar.bz2
-epiphany-1.7.5.tar.bz2
-epiphany-1.7.6.tar.bz2
-epiphany-1.8.0.tar.bz2
-epiphany-1.9.2.tar.bz2
-epiphany-1.9.3.1.tar.bz2
-epiphany-1.9.4.tar.bz2
-epiphany-1.9.5.1.tar.bz2
-epiphany-1.9.6.tar.bz2
+epiphany-1.9.7.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- epiphany.spec	13 Feb 2006 18:39:06 -0000	1.88
+++ epiphany.spec	13 Feb 2006 23:45:27 -0000	1.89
@@ -10,8 +10,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 1.9.6
-Release: 3.1
+Version: 1.9.7
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -135,6 +135,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
+- Update to 1.9.7
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.9.6-3.1
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	31 Jan 2006 05:07:48 -0000	1.34
+++ sources	13 Feb 2006 23:45:27 -0000	1.35
@@ -1 +1 @@
-097278ad79deaa017b8c026b5c8a383f  epiphany-1.9.6.tar.bz2
+0539ab861985aeec962b546245788612  epiphany-1.9.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 00:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 19:02:39 -0500
Subject: rpms/grub/devel grub-0.93-special-device-names.patch,1.1,1.2
Message-ID: <200602140002.k1E02d3b022098@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22051

Modified Files:
	grub-0.93-special-device-names.patch 
Log Message:
- minor formatting change


grub-0.93-special-device-names.patch:
 device.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

Index: grub-0.93-special-device-names.patch
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub-0.93-special-device-names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-0.93-special-device-names.patch	9 Sep 2004 05:55:33 -0000	1.1
+++ grub-0.93-special-device-names.patch	14 Feb 2006 00:02:19 -0000	1.2
@@ -9,7 +9,7 @@
 +  sprintf (dev + strlen(dev), "%s%d", 
 +	   /* Compaq smart and others */
 +	   (strncmp(dev, "/dev/ida/", 9) == 0 ||
-+            strncmp(dev, "/dev/ataraid/", 13) == 0 ||
++	    strncmp(dev, "/dev/ataraid/", 13) == 0 ||
 +	    strncmp(dev, "/dev/cciss/", 11) == 0 ||
 +	    strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
 +	   ((partition >> 16) & 0xFF) + 1);



From fedora-cvs-commits at redhat.com  Tue Feb 14 00:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 19:06:41 -0500
Subject: rpms/grub/devel grub-0.97-dmraid-partition-names.patch, NONE,
	1.1 grub.spec, 1.35, 1.36
Message-ID: <200602140006.k1E06fqB022354@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/grub/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22297

Modified Files:
	grub.spec 
Added Files:
	grub-0.97-dmraid-partition-names.patch 
Log Message:
- fix dmraid partitioning
- update changelog/version to 0.97-3


grub-0.97-dmraid-partition-names.patch:
 device.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE grub-0.97-dmraid-partition-names.patch ---
--- grub-0.97/lib/device.c.dmraid-partition-names	2006-02-13 18:53:59.000000000 -0500
+++ grub-0.97/lib/device.c	2006-02-13 18:56:04.000000000 -0500
@@ -1106,6 +1106,7 @@
 	   /* Compaq smart and others */
 	   (strncmp(dev, "/dev/ida/", 9) == 0 ||
 	    strncmp(dev, "/dev/ataraid/", 13) == 0 ||
+	    strncmp(dev, "/dev/mapper/", 12) == 0 || 
 	    strncmp(dev, "/dev/cciss/", 11) == 0 ||
 	    strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
 	   ((partition >> 16) & 0xFF) + 1);


Index: grub.spec
===================================================================
RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- grub.spec	7 Feb 2006 12:01:53 -0000	1.35
+++ grub.spec	14 Feb 2006 00:06:39 -0000	1.36
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 2.1
+Release: 3
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPL
@@ -96,6 +96,7 @@
 # install correctly on dmraid devices
 Patch1112: grub-0.97-dmraid.patch
 Patch1113: grub-0.97-dmraid-recheck-bad.patch
+Patch1114: grub-0.97-dmraid-partition-names.patch
 
 ExclusiveArch: i386 x86_64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo
@@ -167,6 +168,7 @@
 
 %patch1112 -p1 -b .dmraid
 %patch1113 -p1 -b .dmraid-recheck-bad
+%patch1114 -p1 -b .dmraid-partition-names
 
 %build
 autoreconf --install --force
@@ -220,6 +222,9 @@
 %{_datadir}/grub
 
 %changelog
+* Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 0.97-3
+- fix partition names on dmraid
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.97-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 00:49:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 19:49:52 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.92, 1.93 mkinitrd.spec, 1.102,
	1.103 sources, 1.98, 1.99
Message-ID: <200602140049.k1E0nqqa031708@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31631

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.24-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- .cvsignore	13 Feb 2006 21:14:42 -0000	1.92
+++ .cvsignore	14 Feb 2006 00:49:50 -0000	1.93
@@ -1 +1 @@
-mkinitrd-5.0.23.tar.bz2
+mkinitrd-5.0.24.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- mkinitrd.spec	13 Feb 2006 21:14:42 -0000	1.102
+++ mkinitrd.spec	14 Feb 2006 00:49:50 -0000	1.103
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.23
+Version: 5.0.24
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,11 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 5.0.24-1
+- use the right nash-dm command to get the device list
+- check if a subdevice has the same partition table, not if it starts
+  at the right place (fixes partition comparison on !mirror devices)
+
 * Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 5.0.23-1
 - add basic hotplug handler and firmware loader
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	13 Feb 2006 21:14:42 -0000	1.98
+++ sources	14 Feb 2006 00:49:50 -0000	1.99
@@ -1 +1 @@
-377718f04e3b757223c4746370b534f7  mkinitrd-5.0.23.tar.bz2
+b086806b7b40ed5ad0fb70330fb9bceb  mkinitrd-5.0.24.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 01:57:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 20:57:36 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1947,
	1.1948 linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, 1.1, 1.2
Message-ID: <200602140157.k1E1vaMO009204@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	kernel-2.6.spec linux-2.6-percpu-NR_CPUS-hotplug-fix.patch 
Log Message:
go with the SMP workaround from Hubertus


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -r1.1947 -r1.1948
--- kernel-2.6.spec	13 Feb 2006 21:57:39 -0000	1.1947
+++ kernel-2.6.spec	14 Feb 2006 01:57:32 -0000	1.1948
@@ -1591,6 +1591,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Rik van Riel <riel at redhat.com>
+- go with the SMP workaround from Hubertus
+
 * Mon Feb 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git1 
 - Merge kernel-xen back to kernel.

linux-2.6-percpu-NR_CPUS-hotplug-fix.patch:
 sched.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-percpu-NR_CPUS-hotplug-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-percpu-NR_CPUS-hotplug-fix.patch	13 Feb 2006 21:17:47 -0000	1.1
+++ linux-2.6-percpu-NR_CPUS-hotplug-fix.patch	14 Feb 2006 01:57:33 -0000	1.2
@@ -1,85 +1,37 @@
-This is the wrong fix in the long run, but it works for now.
-We will inherit the proper fix from upstream soon, at that
-point this patch can go away.  None of the alternative hacks
-to fix this bug actually seemed any better than this one. - Rik
-
---- linux-2.6.15.i686/kernel/sched.c.idle_init	2006-02-08 17:56:50.000000000 -0500
-+++ linux-2.6.15.i686/kernel/sched.c	2006-02-08 17:58:57.000000000 -0500
-@@ -4437,6 +4437,35 @@ void __devinit init_idle(task_t *idle, i
- {
- 	runqueue_t *rq = cpu_rq(cpu);
- 	unsigned long flags;
-+	prio_array_t *array;
-+	int j, k;
-+
-+	spin_lock_init(&rq->lock);
-+	rq->nr_running = 0;
-+	rq->active = rq->arrays;
-+	rq->expired = rq->arrays + 1;
-+	rq->best_expired_prio = MAX_PRIO;
-+
-+#ifdef CONFIG_SMP
-+	rq->sd = NULL;
-+	for (j = 1; j < 3; j++)
-+		rq->cpu_load[j] = 0;
-+	rq->active_balance = 0;
-+	rq->push_cpu = 0;
-+	rq->migration_thread = NULL;
-+	INIT_LIST_HEAD(&rq->migration_queue);
-+#endif
-+	atomic_set(&rq->nr_iowait, 0);
-+
-+	for (j = 0; j < 2; j++) {
-+		array = rq->arrays + j;
-+		for (k = 0; k < MAX_PRIO; k++) {
-+			INIT_LIST_HEAD(array->queue + k);
-+			__clear_bit(k, array->bitmap);
-+		}
-+		// delimiter for bitsearch
-+		__set_bit(MAX_PRIO, array->bitmap);
-+	}
- 
- 	idle->sleep_avg = 0;
- 	idle->array = NULL;
-@@ -6110,41 +6139,6 @@ int in_sched_functions(unsigned long add
+From frankeh at watson.ibm.com Mon Feb 13 19:48:26 2006
+Date: Mon, 13 Feb 2006 19:19:19 -0500
+From: Hubertus Franke <frankeh at watson.ibm.com>
+To: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
+Subject: SMP BUG
+
+Folks the change introduced in 2.6.16-rc2   over 2.6.15
+wrt to the SMP initialization are wrong.
+Please apply to unroll the change..
+
+Here is the logic ...
+sched_init is called from start_kernel before the
+architecture specific function cpu_check_smp() is called
+which is done as part of rest_init().
+
+On s390 this actually sets the cpu_possible_map, which
+is now used in sched_init through the for_each_cpu without
+properly being initialized.
+As a result bringing 2nd and subsequent cpu online
+breaks.
+
+This should be a quick fix, until this chicken and egg
+problem is solved otherwise.
+
+-- Hubertus
+
+--- linux-2.6.15.i686/kernel/sched.c.smpfix	2006-02-13 20:54:11.000000000 -0500
++++ linux-2.6.15.i686/kernel/sched.c	2006-02-13 20:54:23.000000000 -0500
+@@ -6018,7 +6018,7 @@ void __init sched_init(void)
+ 	runqueue_t *rq;
+ 	int i, j, k;
  
- void __init sched_init(void)
- {
--	runqueue_t *rq;
--	int i, j, k;
--
 -	for_each_cpu(i) {
--		prio_array_t *array;
--
--		rq = cpu_rq(i);
--		spin_lock_init(&rq->lock);
--		rq->nr_running = 0;
--		rq->active = rq->arrays;
--		rq->expired = rq->arrays + 1;
--		rq->best_expired_prio = MAX_PRIO;
--
--#ifdef CONFIG_SMP
--		rq->sd = NULL;
--		for (j = 1; j < 3; j++)
--			rq->cpu_load[j] = 0;
--		rq->active_balance = 0;
--		rq->push_cpu = 0;
--		rq->migration_thread = NULL;
--		INIT_LIST_HEAD(&rq->migration_queue);
--#endif
--		atomic_set(&rq->nr_iowait, 0);
--
--		for (j = 0; j < 2; j++) {
--			array = rq->arrays + j;
--			for (k = 0; k < MAX_PRIO; k++) {
--				INIT_LIST_HEAD(array->queue + k);
--				__clear_bit(k, array->bitmap);
--			}
--			// delimiter for bitsearch
--			__set_bit(MAX_PRIO, array->bitmap);
--		}
--	}
--
- 	/*
- 	 * The boot idle thread does lazy MMU switching as well:
- 	 */
++	for (i = 0; i < NR_CPUS; i++ ) {
+ 		prio_array_t *array;
+ 
+ 		rq = cpu_rq(i);



From fedora-cvs-commits at redhat.com  Tue Feb 14 04:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 23:21:39 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.105, 1.106 kudzu.spec, 1.120,
	1.121 sources, 1.118, 1.119
Message-ID: <200602140421.k1E4LdRk016033@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15989

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- .cvsignore	13 Feb 2006 21:26:55 -0000	1.105
+++ .cvsignore	14 Feb 2006 04:21:36 -0000	1.106
@@ -1 +1 @@
-kudzu-1.2.27.tar.gz
+kudzu-1.2.28.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kudzu.spec	13 Feb 2006 21:26:55 -0000	1.120
+++ kudzu.spec	14 Feb 2006 04:21:36 -0000	1.121
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.27
+Version: 1.2.28
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.28-1
+- vbe/edid probing on x86_64 via x86emu - thanks to Matthew Garrett
+  & Tollef Fog Heen
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.27-1
 - restrict video devices to PCI class 0300, correctly (should solve #176978)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	13 Feb 2006 21:26:55 -0000	1.118
+++ sources	14 Feb 2006 04:21:36 -0000	1.119
@@ -1 +1 @@
-d1b8c0cd0456cf81847342c36a99f91c  kudzu-1.2.27.tar.gz
+60411e8fd6e42604c24cbd365d4d38d4  kudzu-1.2.28.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 04:42:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 13 Feb 2006 23:42:55 -0500
Subject: rpms/kudzu/devel sources,1.119,1.120
Message-ID: <200602140442.k1E4gtaa023354@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23307

Modified Files:
	sources 
Log Message:
fix build



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- sources	14 Feb 2006 04:21:36 -0000	1.119
+++ sources	14 Feb 2006 04:42:52 -0000	1.120
@@ -1 +1 @@
-60411e8fd6e42604c24cbd365d4d38d4  kudzu-1.2.28.tar.gz
+7038a1d182f7f46a11b349ef3207d4b6  kudzu-1.2.28.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 05:05:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 00:05:55 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.220, 1.221 anaconda.spec, 1.340,
	1.341 sources, 1.339, 1.340
Message-ID: <200602140505.k1E55tdu011478@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11418/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.4-1 on branch devel from anaconda-10.92.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- .cvsignore	13 Feb 2006 22:03:33 -0000	1.220
+++ .cvsignore	14 Feb 2006 05:05:50 -0000	1.221
@@ -1 +1 @@
-anaconda-10.92.3.tar.bz2
+anaconda-10.92.4.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- anaconda.spec	13 Feb 2006 22:03:34 -0000	1.340
+++ anaconda.spec	14 Feb 2006 05:05:53 -0000	1.341
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.3
+Version: 10.92.4
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Feb 14 2006 Jeremy Katz <katzj at redhat.com> - 10.92.4-1
+- improve globbing for xen guest kernels
+- Don't add a kernel if one is already selected.
+
 * Mon Feb 13 2006 Jeremy Katz <katzj at redhat.com> - 10.92.3-1
 - Don't debug log about missing help text (clumens)
 - Reduce deps for pkgorder


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- sources	13 Feb 2006 22:03:47 -0000	1.339
+++ sources	14 Feb 2006 05:05:53 -0000	1.340
@@ -1 +1 @@
-eab323981d8a1759c4b33e94eba80e58  anaconda-10.92.3.tar.bz2
+b0ae782f751b811e67a1f6c41e42811b  anaconda-10.92.4.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 05:46:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 00:46:28 -0500
Subject: rpms/gnome-screensaver/devel gnome-logo-white.svg, NONE,
	1.1 gnome-screensaver.spec, 1.55, 1.56
Message-ID: <200602140546.k1E5kSuo005182@cvs.devel.redhat.com>

Author: rstrode

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-logo-white.svg 
Log Message:
- migrate xscreensaver screensavers in %%post as well as the
  triggers already there (bug 180984)



--- NEW FILE gnome-logo-white.svg ---
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN' 
          'http://www.w3.org/TR//REC-SVG-0904/DTD/svg10.dtd'>
<svg xmlns='http://www.w3.org/2/svg' version='1.0' 
     x='0' y='0' width='128' height='128' 
     viewBox='0 0 96 118'>
  <g style='fill:#ffffff;'>
      <path d='M 86.068,0.0 C 61.466,0.0 56.851,35.041 70.691,35.041 C 84.529,35.041 110.67100,0.0 86.068,0.0 z '/>
      <path d='M 45.217,30.699 C 52.586,31.149 60.671,2.5770 46.821,4.3740 C 32.976,6.1710 37.845,30.249 45.217,30.699 z '/>
      <path d='M 11.445,48.453 C 16.686,46.146 12.120,23.581 3.2080,29.735 C -5.7,35.890 6.2040,50.759 11.445,48.453 z '/>
      <path d='M 26.212,36.642 C 32.451,35.370 32.793,9.7780 21.667,14.369 C 10.539,18.961 19.978,37.916 26.212,36.642 L 26.212,36.642 z '/>
      <path d='M 58.791,93.913 C 59.898,102.367 52.589,106.542 45.431,101.092 C 22.644,83.743 83.160,75.088 79.171,51.386 C 75.860,31.712 15.495,37.769 8.6210,68.553 C 3.9680,89.374 27.774,118.26 52.614,118.26 C 64.834,118.26 78.929,107.226 81.566,93.248 C 83.580,82.589 57.867,86.860 58.791,93.913 L 58.791,93.913 z '/>
  </g>
</svg>


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-screensaver.spec	13 Feb 2006 14:31:07 -0000	1.55
+++ gnome-screensaver.spec	14 Feb 2006 05:46:26 -0000	1.56
@@ -14,7 +14,7 @@
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
 Version: 2.13.90
-Release: 4
+Release: 5
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -22,6 +22,7 @@
 Source2: fedoralogo-floaters-lock-dialog.tar.gz
 Source3: gnome-compiler-flags.m4
 Source4: fedoralogo-floaters.desktop
+Source5: gnome-logo-white.svg
 
 Patch0: gnome-screensaver-2.13.90-lock-dialog.patch
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
@@ -104,6 +105,10 @@
 install -D -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_libexecdir}/gnome-screensaver
 install -D -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
+install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-logo-white.svg
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 08:11:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 03:11:04 -0500
Subject: rpms/binutils/devel binutils-2.16.91.0.6-elfvsb-test.patch, NONE,
	1.1 binutils-2.16.91.0.6-ia64-lib64.patch, NONE,
	1.1 binutils-2.16.91.0.6-ltconfig-multilib.patch, NONE,
	1.1 binutils-2.16.91.0.6-place-orphan.patch, NONE,
	1.1 binutils-2.16.91.0.6-ppc64-pie.patch, NONE,
	1.1 binutils-2.16.91.0.6-standards.patch, NONE, 1.1 .cvsignore,
	1.23, 1.24 binutils.spec, 1.73, 1.74 sources, 1.24,
	1.25 binutils-2.16.91.0.5-elfvsb-test.patch, 1.1,
	NONE binutils-2.16.91.0.5-ia64-lib64.patch, 1.1,
	NONE binutils-2.16.91.0.5-ltconfig-multilib.patch, 1.1,
	NONE binutils-2.16.91.0.5-place-orphan.patch, 1.1,
	NONE binutils-2.16.91.0.5-ppc64-pie.patch, 1.1,
	NONE binutils-2.16.91.0.5-ppc64-toc1-discard.patch, 1.1,
	NONE binutils-2.16.91.0.5-standards.patch, 1.1, NONE
Message-ID: <200602140811.k1E8B4XV025854@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	.cvsignore binutils.spec sources 
Added Files:
	binutils-2.16.91.0.6-elfvsb-test.patch 
	binutils-2.16.91.0.6-ia64-lib64.patch 
	binutils-2.16.91.0.6-ltconfig-multilib.patch 
	binutils-2.16.91.0.6-place-orphan.patch 
	binutils-2.16.91.0.6-ppc64-pie.patch 
	binutils-2.16.91.0.6-standards.patch 
Removed Files:
	binutils-2.16.91.0.5-elfvsb-test.patch 
	binutils-2.16.91.0.5-ia64-lib64.patch 
	binutils-2.16.91.0.5-ltconfig-multilib.patch 
	binutils-2.16.91.0.5-place-orphan.patch 
	binutils-2.16.91.0.5-ppc64-pie.patch 
	binutils-2.16.91.0.5-ppc64-toc1-discard.patch 
	binutils-2.16.91.0.5-standards.patch 
Log Message:
2.16.91.0.6-1


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

--- NEW FILE binutils-2.16.91.0.6-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.16.91.0.6-ia64-lib64.patch:
 ld/emulparams/elf64_ia64.sh |   10 ++++++++++
 ltconfig                    |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE binutils-2.16.91.0.6-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.16.91.0.6-ltconfig-multilib.patch:
 ltconfig |   17 +++++++++++++++++
 1 files changed, 17 insertions(+)

--- NEW FILE binutils-2.16.91.0.6-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.16.91.0.6-place-orphan.patch:
 elf64ppc.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.16.91.0.6-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.16.91.0.6-ppc64-pie.patch:
 elf64-ppc.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE binutils-2.16.91.0.6-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.16.91.0.6-standards.patch:
 standards.texi |  493 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 322 insertions(+), 171 deletions(-)

--- NEW FILE binutils-2.16.91.0.6-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 ifinfo
- 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 ifinfo
+ at end direntry
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY
 @set CHAPTER node
 @end ifinfo
 
- at ifinfo
-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 ifinfo
+ 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 ifinfo
+ at contents
+
+ at ifnottex
 @node Top, Preface, (dir), (dir)
 @top Version
 
-Last updated @value{lastupdate}.
- at end ifinfo
+ 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	2 Jan 2006 16:19:39 -0000	1.23
+++ .cvsignore	14 Feb 2006 08:11:01 -0000	1.24
@@ -1 +1 @@
-binutils-2.16.91.0.5.tar.bz2
+binutils-2.16.91.0.6.tar.bz2


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- binutils.spec	11 Feb 2006 02:07:51 -0000	1.73
+++ binutils.spec	14 Feb 2006 08:11:01 -0000	1.74
@@ -1,18 +1,17 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
-Version: 2.16.91.0.5
-Release: 1.2
+Version: 2.16.91.0.6
+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.16.91.0.5-ltconfig-multilib.patch
-Patch2: binutils-2.16.91.0.5-ppc64-pie.patch
-Patch3: binutils-2.16.91.0.5-place-orphan.patch
-Patch4: binutils-2.16.91.0.5-ia64-lib64.patch
-Patch5: binutils-2.16.91.0.5-elfvsb-test.patch
-Patch6: binutils-2.16.91.0.5-standards.patch
-Patch7: binutils-2.16.91.0.5-ppc64-toc1-discard.patch
+Patch1: binutils-2.16.91.0.6-ltconfig-multilib.patch
+Patch2: binutils-2.16.91.0.6-ppc64-pie.patch
+Patch3: binutils-2.16.91.0.6-place-orphan.patch
+Patch4: binutils-2.16.91.0.6-ia64-lib64.patch
+Patch5: binutils-2.16.91.0.6-elfvsb-test.patch
+Patch6: binutils-2.16.91.0.6-standards.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -48,7 +47,6 @@
 %endif
 %patch5 -p0 -b .elfvsb-test~
 %patch6 -p0 -b .standards~
-%patch7 -p0 -b .ppc64-toc1-discard~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -159,11 +157,11 @@
 %{_infodir}/*info*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16.91.0.5-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.16.91.0.5-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Tue Feb 14 2006 Jakub Jelinek <jakub at redhat.com> 2.16.91.0.6-1
+- update to 2.16.91.0.6
+  - fix ppc64 --gc-sections
+  - disassembler fixes for x86_64 cr/debug regs
+  - fix linker search order for DT_NEEDED libs
 
 * Mon Jan 02 2006 Jakub Jelinek <jakub at redhat.com> 2.16.91.0.5-1
 - update to 2.16.91.0.5


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	2 Jan 2006 16:19:39 -0000	1.24
+++ sources	14 Feb 2006 08:11:01 -0000	1.25
@@ -1 +1 @@
-29fdde06e229672daaaacbf52362520a  binutils-2.16.91.0.5.tar.bz2
+00ef9f1429d5f18702d08552f5c09441  binutils-2.16.91.0.6.tar.bz2


--- binutils-2.16.91.0.5-elfvsb-test.patch DELETED ---


--- binutils-2.16.91.0.5-ia64-lib64.patch DELETED ---


--- binutils-2.16.91.0.5-ltconfig-multilib.patch DELETED ---


--- binutils-2.16.91.0.5-place-orphan.patch DELETED ---


--- binutils-2.16.91.0.5-ppc64-pie.patch DELETED ---


--- binutils-2.16.91.0.5-ppc64-toc1-discard.patch DELETED ---


--- binutils-2.16.91.0.5-standards.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 08:47:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 03:47:31 -0500
Subject: rpms/gawk/devel gawk-3.1.5-wconcat.patch, 1.1, 1.2 gawk.spec, 1.34,
	1.35
Message-ID: <200602140847.k1E8lVIS002080@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2045

Modified Files:
	gawk-3.1.5-wconcat.patch gawk.spec 
Log Message:
improved wchar concat

gawk-3.1.5-wconcat.patch:
 eval.c |    7 +++++++
 1 files changed, 7 insertions(+)

Index: gawk-3.1.5-wconcat.patch
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk-3.1.5-wconcat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gawk-3.1.5-wconcat.patch	10 Feb 2006 22:01:46 -0000	1.1
+++ gawk-3.1.5-wconcat.patch	14 Feb 2006 08:47:27 -0000	1.2
@@ -1,10 +1,16 @@
---- gawk-3.1.5/eval.c.wconcat	2006-02-10 22:45:26.000000000 +0100
-+++ gawk-3.1.5/eval.c	2006-02-10 22:46:01.000000000 +0100
-@@ -1176,6 +1176,7 @@
+--- gawk-3.1.5/eval.c.wconcat	2006-02-14 09:40:54.000000000 +0100
++++ gawk-3.1.5/eval.c	2006-02-14 09:43:33.000000000 +0100
+@@ -1176,6 +1176,13 @@
  			memcpy(l->stptr + l->stlen, r->stptr, r->stlen);
  			l->stlen += r->stlen;
  			l->stptr[l->stlen] = '\0';
-+			l->flags &= ~WSTRCUR;
++#if defined MBS_SUPPORT
++			if (r->wstptr != NULL)
++				free(r->wstptr);
++			r->wstptr = NULL;
++			r->wstlen = 0;
++			r->flags &= ~WSTRCUR;
++#endif /* MBS_SUPPORT */
  		} else {
  			char *nval;
  			size_t nlen = l->stlen + r->stlen + 2;


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/devel/gawk.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gawk.spec	11 Feb 2006 02:47:55 -0000	1.34
+++ gawk.spec	14 Feb 2006 08:47:27 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.5
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -81,6 +81,9 @@
 %{_datadir}/awk
 
 %changelog
+* 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
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.5-6.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 09:24:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 04:24:26 -0500
Subject: rpms/binutils/devel binutils-2.16.91.0.6-build-fixes.patch, NONE,
	1.1 binutils.spec, 1.74, 1.75
Message-ID: <200602140924.k1E9OQ6K027954@cvs.devel.redhat.com>

Author: jakub

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

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.16.91.0.6-build-fixes.patch 
Log Message:
2.16.91.0.6-1


binutils-2.16.91.0.6-build-fixes.patch:
 binutils/config.in                 |    8 ++++++++
 gas/config.in                      |    4 ++++
 ld/testsuite/ld-elfcomm/common1b.c |    6 +++++-
 ld/testsuite/ld-shared/main.c      |    2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

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

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

--- gas/config.in.jj	2005-08-16 11:21:34.000000000 +0200
+++ gas/config.in	2006-02-14 09:57:13.000000000 +0100
@@ -48,6 +48,10 @@
 /* Is the prototype for getopt in <unistd.h> in the expected format? */
 #undef HAVE_DECL_GETOPT
 
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
 /* Define to 1 if you have the <errno.h> header file. */
 #undef HAVE_ERRNO_H
 
--- binutils/config.in.jj	2005-09-13 09:15:40.000000000 +0200
+++ binutils/config.in	2006-02-14 09:57:02.000000000 +0100
@@ -50,6 +50,10 @@
    */
 #undef HAVE_DECL_SBRK
 
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SNPRINTF
+
 /* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
    */
 #undef HAVE_DECL_STPCPY
@@ -58,6 +62,10 @@
    */
 #undef HAVE_DECL_STRSTR
 
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
 /* Does the platform use an executable suffix? */
 #undef HAVE_EXECUTABLE_SUFFIX
 
--- 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];


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- binutils.spec	14 Feb 2006 08:11:01 -0000	1.74
+++ binutils.spec	14 Feb 2006 09:24:23 -0000	1.75
@@ -12,6 +12,7 @@
 Patch4: binutils-2.16.91.0.6-ia64-lib64.patch
 Patch5: binutils-2.16.91.0.6-elfvsb-test.patch
 Patch6: binutils-2.16.91.0.6-standards.patch
+Patch7: binutils-2.16.91.0.6-build-fixes.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -47,6 +48,7 @@
 %endif
 %patch5 -p0 -b .elfvsb-test~
 %patch6 -p0 -b .standards~
+%patch7 -p0 -b .build-fixes~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks



From fedora-cvs-commits at redhat.com  Tue Feb 14 09:56:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 04:56:16 -0500
Subject: rpms/ksh/devel ksh-20060124-syntax.patch, NONE, 1.1 ksh.spec, 1.20,
	1.21
Message-ID: <200602140956.k1E9uGnP013431@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	ksh.spec 
Added Files:
	ksh-20060124-syntax.patch 
Log Message:
- make it build in chroots (#180561)

ksh-20060124-syntax.patch:
 Mamfile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE ksh-20060124-syntax.patch ---
diff -urN ksh-20060124_old/src/lib/libast/Mamfile ksh-20060124_new/src/lib/libast/Mamfile
--- ksh-20060124_old/src/lib/libast/Mamfile	2006-01-24 18:17:19.000000000 -0500
+++ ksh-20060124_new/src/lib/libast/Mamfile	2006-02-14 04:43:39.000000000 -0500
@@ -6939,7 +6939,7 @@
 make ${INSTALLROOT}/include/ast/fmtmsg.h
 prev comp/fmtmsg.h
 prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
+exec - case "${mam_cc_HOSTTYPE}" in
 exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
 exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x
 exec - 	then	rm -f 1.${COTEMP}.x
@@ -6960,7 +6960,7 @@
 make ${INSTALLROOT}/include/ast/libgen.h
 prev comp/libgen.h
 prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
+exec - case "${mam_cc_HOSTTYPE}" in
 exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
 exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x
 exec - 	then	rm -f 1.${COTEMP}.x
@@ -6981,7 +6981,7 @@
 make ${INSTALLROOT}/include/ast/syslog.h
 prev comp/syslog.h
 prev ast_lib.h
-exec - case ${mam_cc_HOSTTYPE} in
+exec - case "${mam_cc_HOSTTYPE}" in
 exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
 exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x
 exec - 	then	rm -f 1.${COTEMP}.x


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ksh.spec	13 Feb 2006 10:09:53 -0000	1.20
+++ ksh.spec	14 Feb 2006 09:56:14 -0000	1.21
@@ -15,6 +15,7 @@
 Patch1:       ksh-20041225-gcc4.patch
 Patch2:       ksh-20050202-path.patch
 Patch3:       ksh-20050202-uname.patch
+Patch4:       ksh-20060124-syntax.patch
 
 #   build information
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
@@ -36,10 +37,13 @@
 %patch1 -p1 -b .gcc4
 #patch2 -p1 -b .path
 %patch3 -p1 -b .uname
+%patch4 -p1 -b .syntax
 
 %build
 ./bin/package "read" ||:
+# Use this for debugging:
 #export CCFLAGS="-O0 -ggdb"
+#./bin/package DEBUG "make"
 ./bin/package "make"
 cp lib/package/LICENSES/ast LICENSE
 
@@ -94,6 +98,7 @@
 %changelog
 * Mon Feb 13 2006 Karsten Hopp <karsten at redhat.de> 20060124-1
 - version 20060124
+- make it build in chroots (#180561)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20050202-5.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Tue Feb 14 09:57:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 04:57:39 -0500
Subject: rpms/ksh/devel ksh.spec,1.21,1.22
Message-ID: <200602140957.k1E9vdNr013487@cvs.devel.redhat.com>

Author: karsten

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

Modified Files:
	ksh.spec 
Log Message:
fix release and changelog


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ksh.spec	14 Feb 2006 09:56:14 -0000	1.21
+++ ksh.spec	14 Feb 2006 09:57:37 -0000	1.22
@@ -7,7 +7,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20060124
-Release:      1
+Release:      2
 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
@@ -96,9 +96,11 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 14 2006 Karsten Hopp <karsten at redhat.de> 20060124-2
+- make it build in chroots (#180561)
+
 * Mon Feb 13 2006 Karsten Hopp <karsten at redhat.de> 20060124-1
 - version 20060124
-- make it build in chroots (#180561)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20050202-5.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Tue Feb 14 12:55:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 07:55:07 -0500
Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.8,1.9
Message-ID: <200602141255.k1ECt7To004113@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4083

Modified Files:
	xorg-x11-xsm.spec 
Log Message:
Cleanup file lists to add missing dir ownerships, and remove unnecessary dir ownerships


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-xsm.spec	11 Feb 2006 06:28:14 -0000	1.8
+++ xorg-x11-xsm.spec	14 Feb 2006 12:55:03 -0000	1.9
@@ -84,8 +84,8 @@
 
 %files
 %defattr(-,root,root,-)
+# FIXME: Fill in %doc sometime
 %doc
-%dir %{_bindir}
 %{_bindir}/rstart
 %{_bindir}/rstartd
 %{_bindir}/smproxy
@@ -96,9 +96,11 @@
 %{_datadir}/X11/rstart/commands/@List
 %{_datadir}/X11/rstart/commands/ListContexts
 %{_datadir}/X11/rstart/commands/ListGenericCommands
+%dir %{_datadir}/X11/rstart/commands/x11r6
 %{_datadir}/X11/rstart/commands/x11r6/@List
 %{_datadir}/X11/rstart/commands/x11r6/LoadMonitor
 %{_datadir}/X11/rstart/commands/x11r6/Terminal
+%dir %{_datadir}/X11/rstart/contexts
 %{_datadir}/X11/rstart/contexts/@List
 %{_datadir}/X11/rstart/contexts/default
 %{_datadir}/X11/rstart/contexts/x11r6
@@ -108,13 +110,11 @@
 %dir %{_libdir}/X11/rstart
 # NOTE: This binary can and probably should sit in /usr/sbin, but oh well.
 %{_libdir}/X11/rstart/rstartd.real
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/rstart.1x*
 %{_mandir}/man1/rstartd.1x*
 %{_mandir}/man1/smproxy.1x*
 %{_mandir}/man1/xsm.1x*
-%dir %{_sysconfdir}
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/rstart
 %config %{_sysconfdir}/X11/rstart/config



From fedora-cvs-commits at redhat.com  Tue Feb 14 12:56:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 07:56:43 -0500
Subject: rpms/system-config-printer/devel .cvsignore, 1.56,
	1.57 printconf.spec, 1.61, 1.62 sources, 1.58, 1.59
Message-ID: <200602141256.k1ECuh8B004931@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	.cvsignore printconf.spec sources 
Log Message:
* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.6.151-1
- 0.6.151:
  - Fixed case-insensitive printer matching (bug #181295).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	26 Jan 2006 12:46:01 -0000	1.56
+++ .cvsignore	14 Feb 2006 12:56:40 -0000	1.57
@@ -36,3 +36,4 @@
 printconf-0.6.148.tar.bz2
 printconf-0.6.149.tar.bz2
 printconf-0.6.150.tar.bz2
+printconf-0.6.151.tar.bz2


Index: printconf.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- printconf.spec	11 Feb 2006 05:46:38 -0000	1.61
+++ printconf.spec	14 Feb 2006 12:56:40 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: A printer configuration backend/frontend combination.
 Name: system-config-printer
-Version: 0.6.150
-Release: 1.2
+Version: 0.6.151
+Release: 1
 License: GPL
 Group: System Environment/Daemons
 Source0: printconf-%{version}.tar.bz2
@@ -174,6 +174,10 @@
 
 
 %changelog
+* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.6.151-1
+- 0.6.151:
+  - Fixed case-insensitive printer matching (bug #181295).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.150-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	26 Jan 2006 12:46:01 -0000	1.58
+++ sources	14 Feb 2006 12:56:40 -0000	1.59
@@ -1 +1 @@
-e07b9361061146ce3a16781922bd489e  printconf-0.6.150.tar.bz2
+845ddb531b137b91a39f40070f6cf305  printconf-0.6.151.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 14:09:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 09:09:09 -0500
Subject: rpms/compat-db/devel db4-db_load.patch, NONE, 1.1 compat-db.spec,
	1.17, 1.18
Message-ID: <200602141409.k1EE995k020664@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	compat-db.spec 
Added Files:
	db4-db_load.patch 
Log Message:
* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-4
- clarify pointer usage in db_load.c (#110697)


db4-db_load.patch:
 db-4.1.25/db_load/db_load.c               |    2 +-
 db-4.2.52/build_vxworks/db_load/db_load.c |    2 +-
 db-4.2.52/db_load/db_load.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE db4-db_load.patch ---
--- compat-db-4.2.52/db-4.1.25/db_load/db_load.c.db_load	2002-08-08 06:26:54.000000000 +0200
+++ compat-db-4.2.52/db-4.1.25/db_load/db_load.c	2006-02-14 14:53:35.000000000 +0100
@@ -895,7 +895,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/db_load/db_load.c.db_load	2003-10-16 19:51:08.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/db_load/db_load.c	2006-02-14 14:53:02.000000000 +0100
@@ -939,7 +939,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c.db_load	2003-10-22 05:23:34.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c	2006-02-14 14:51:41.000000000 +0100
@@ -954,7 +954,7 @@ db_load_convprintable(dbenv, instr, outs
 				continue;
 			}
 			c = db_load_digitize(dbenv, *instr, &e1) << 4;
-			c |= db_load_digitize(dbenv, *++instr, &e2);
+			c |= db_load_digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				db_load_badend(dbenv);
 				return (EINVAL);


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/devel/compat-db.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- compat-db.spec	11 Feb 2006 02:16:28 -0000	1.17
+++ compat-db.spec	14 Feb 2006 14:09:06 -0000	1.18
@@ -16,12 +16,14 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
 Name: compat-db
 Version: 4.2.52
-Release: 3.2.1
+Release: 4
 # Tarball taken from glibc 2.1.3  
 #Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz  
 Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
 Source1: http://www.sleepycat.com/update/4.2.52/db-4.2.52.tar.gz
 
+Patch1: db4-db_load.patch
+
 Patch17: patch.4.1.25.1
 Patch18: patch.4.1.25.2
 
@@ -48,6 +50,8 @@
 %prep
 %setup -q -c -a 1
 
+%patch1 -p1 -b .db-load
+
 pushd db-4.1.25
 %patch17 -p0
 %patch18 -p0
@@ -168,6 +172,9 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-4
+- clarify pointer usage in db_load.c (#110697)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.52-3.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 14:19:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 09:19:22 -0500
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.103,1.104
Message-ID: <200602141419.k1EEJMrX004528@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4468

Modified Files:
	mkinitrd.spec 
Log Message:
- update for 5.0.24-1



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mkinitrd.spec	14 Feb 2006 00:49:50 -0000	1.103
+++ mkinitrd.spec	14 Feb 2006 14:19:18 -0000	1.104
@@ -63,7 +63,7 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
-* Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 5.0.24-1
+* Tue Feb 14 2006 Peter Jones <pjones at redhat.com> - 5.0.24-1
 - use the right nash-dm command to get the device list
 - check if a subdevice has the same partition table, not if it starts
   at the right place (fixes partition comparison on !mirror devices)
@@ -83,7 +83,6 @@
 - fix dm creation ordering and partition detection
 - add "network" command (katzj)
 - add nfsroot support (katzj)
-- add iscsi support (katzj)
 - put "showlabels" back into nash
 
 * Tue Feb  3 2006 Peter Jones <pjones at redhat.com> - 5.0.21-1



From fedora-cvs-commits at redhat.com  Tue Feb 14 14:19:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 09:19:34 -0500
Subject: rpms/mkinitrd/devel sources,1.99,1.100
Message-ID: <200602141419.k1EEJYdu004622@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4585

Modified Files:
	sources 
Log Message:
- update for 5.0.24-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	14 Feb 2006 00:49:50 -0000	1.99
+++ sources	14 Feb 2006 14:19:31 -0000	1.100
@@ -1 +1 @@
-b086806b7b40ed5ad0fb70330fb9bceb  mkinitrd-5.0.24.tar.bz2
+5d504265c30e290f089e2377c3358ae9  mkinitrd-5.0.24.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 14:25:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 09:25:40 -0500
Subject: rpms/netpbm/devel netpbm-10.31-xwdfix.patch, NONE, 1.1 netpbm.spec,
	1.53, 1.54
Message-ID: <200602141425.k1EEPeW5007021@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6917

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.31-xwdfix.patch 
Log Message:
* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-4
- make xwdtopnm work on x86_64 (#181001)


netpbm-10.31-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-10.31-xwdfix.patch ---
--- netpbm-10.31/converter/other/xwdtopnm.c.xwdfix	2006-02-14 15:13:58.000000000 +0100
+++ netpbm-10.31/converter/other/xwdtopnm.c	2006-02-14 15:15:37.000000000 +0100
@@ -985,7 +985,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
 
             assert(nBitsToTake <= 32);
             


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- netpbm.spec	11 Feb 2006 04:44:15 -0000	1.53
+++ netpbm.spec	14 Feb 2006 14:25:38 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 3.1
+Release: 4
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -20,6 +20,7 @@
 Patch10: netpbm-10.28-CAN-2005-2471.patch
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
+Patch13: netpbm-10.31-xwdfix.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -76,6 +77,7 @@
 %patch10 -p1 -b .CAN-2005-2471
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
+%patch13 -p1 -b .xwdfix
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -174,6 +176,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-4
+- make xwdtopnm work on x86_64 (#181001)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 10.31-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 16:05:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 11:05:43 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.150,1.151
Message-ID: <200602141605.k1EG5gTx005923@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase.spec 
Log Message:
kscreensaver/kdm/kcheckpass use a separate PAM config file






From fedora-cvs-commits at redhat.com  Tue Feb 14 16:11:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 11:11:45 -0500
Subject: rpms/notify-daemon/devel notify-daemon.spec,1.10,1.11
Message-ID: <200602141611.k1EGBjAP007872@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/notify-daemon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7841

Modified Files:
	notify-daemon.spec 
Log Message:
* Tue Feb 14 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-8
- BuildRequires love, for all you lovers out there.



Index: notify-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notify-daemon.spec	11 Feb 2006 04:47:03 -0000	1.10
+++ notify-daemon.spec	14 Feb 2006 16:11:42 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Notification Daemon 
 Name: notify-daemon
 Version: 0.3.1
-Release: 7.1
+Release: 8
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: libnotify-devel
 Requires: glib2 >= %{glib2_version}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_version}
@@ -51,6 +52,9 @@
 %{_datadir}/dbus-1/services/notify-daemon.service
 
 %changelog
+* Tue Feb 14 2006 Christopher Aillon <caillon at redhat.com> - 0.3.1-8
+- BuildRequires love, for all you lovers out there.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.1-7.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 16:18:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 11:18:31 -0500
Subject: rpms/hplip/devel hplip.spec,1.46,1.47
Message-ID: <200602141618.k1EGIVOd023320@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23288

Modified Files:
	hplip.spec 
Log Message:
* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-4
- Added Obsoletes: hpoj tags back in (bug #181476).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- hplip.spec	11 Feb 2006 03:27:00 -0000	1.46
+++ hplip.spec	14 Feb 2006 16:18:28 -0000	1.47
@@ -1,10 +1,12 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.8
-Release: 3.1
+Release: 4
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
+Obsoletes: hpoj <= 0.91
+Obsoletes: xojpanel <= 0.91
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
@@ -45,6 +47,7 @@
 Summary: SANE driver for scanners in HP's multi-function devices
 Group: System Environment/Daemons
 License: GPL
+Obsoletes: libsane-hpoj <= 0.91
 Requires: sane-backends
 ExcludeArch: s390 s390x
 
@@ -156,6 +159,9 @@
 fi
 
 %changelog
+* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-4
+- Added Obsoletes: hpoj tags back in (bug #181476).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - (none):0.9.8-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 16:49:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 11:49:15 -0500
Subject: rpms/gstreamer/devel gstreamer.spec,1.46,1.47
Message-ID: <200602141649.k1EGnFG8004640@cvs.devel.redhat.com>

Author: riel

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

Modified Files:
	gstreamer.spec 
Log Message:
Obsolete gstreamer-plugins (#181296)


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gstreamer.spec	13 Feb 2006 08:39:43 -0000	1.46
+++ gstreamer.spec	14 Feb 2006 16:49:12 -0000	1.47
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}
 Version: 	0.10.3
-Release: 	2
+Release: 	3
 Summary: 	GStreamer streaming media framework runtime
 
 Group: 		Applications/Multimedia
@@ -18,6 +18,8 @@
 Requires:	gstreamer-tools >= %{version}
 Requires:	gstreamer-plugins-base
 Requires:	gstreamer-plugins-good
+# superceded by the two packages above
+Obsoletes:	gstreamer-plugins
 
 BuildRequires: 	glib2-devel >= %{_glib2}
 BuildRequires: 	libxml2-devel >= %{_libxml2}
@@ -199,6 +201,9 @@
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Tue Feb 14 2006 Rik van Riel <riel at redhat.com> - 0.10-3-3
+- Obsolete gstreamer-plugins (#181296)
+
 * Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:04:39 -0500
Subject: rpms/gcc/devel gcc41-expr_nonzero_p.patch, NONE,
	1.1 gcc41-libstdc++-bitset.patch, NONE,
	1.1 gcc41-mmintrin.patch, NONE, 1.1 gcc41-pr22275.patch, NONE,
	1.1 gcc41-pr25626.patch, NONE, 1.1 gcc41-pr26151.patch, NONE,
	1.1 gcc41-pr26209.patch, NONE, 1.1 gcc41-vrp.patch, NONE,
	1.1 .cvsignore, 1.133, 1.134 gcc41.spec, 1.34, 1.35 sources,
	1.135, 1.136 gcc41-ldbl-default-libstdc++.patch, 1.4,
	NONE gcc41-ldbl-default.patch, 1.3, NONE gcc41-pr26092.patch,
	1.1, NONE gcc41-pr26246.patch, 1.1, NONE
Message-ID: <200602141704.k1EH4dA6015872@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15783

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-expr_nonzero_p.patch gcc41-libstdc++-bitset.patch 
	gcc41-mmintrin.patch gcc41-pr22275.patch gcc41-pr25626.patch 
	gcc41-pr26151.patch gcc41-pr26209.patch gcc41-vrp.patch 
Removed Files:
	gcc41-ldbl-default-libstdc++.patch gcc41-ldbl-default.patch 
	gcc41-pr26092.patch gcc41-pr26246.patch 
Log Message:
4.1.0-0.26


gcc41-expr_nonzero_p.patch:
 0 files changed

--- NEW FILE gcc41-expr_nonzero_p.patch ---
2006-02-10  Jeff Law  <law at redhat.com>

	* fold-const.c (tree_expr_nonzero_p): Fix thinko.

--- gcc/fold-const.c	(revision 110848)
+++ gcc/fold-const.c	(revision 110849)
@@ -11256,7 +11256,7 @@ tree_expr_nonzero_p (tree t)
 	tree inner_type = TREE_TYPE (TREE_OPERAND (t, 0));
 	tree outer_type = TREE_TYPE (t);
 
-	return (TYPE_PRECISION (inner_type) >= TYPE_PRECISION (outer_type)
+	return (TYPE_PRECISION (outer_type) >= TYPE_PRECISION (inner_type)
 		&& tree_expr_nonzero_p (TREE_OPERAND (t, 0)));
       }
       break;

gcc41-libstdc++-bitset.patch:
 0 files changed

--- NEW FILE gcc41-libstdc++-bitset.patch ---
2006-01-30  Paolo Carlini  <pcarlini at suse.de>

	* include/std/std_bitset.h (bitset<>::_M_copy_to_string):
	Call the internal _Unchecked_set(size_t) instead of set.

--- libstdc++-v3/include/std/std_bitset.h	(revision 110410)
+++ libstdc++-v3/include/std/std_bitset.h	(working copy)
@@ -1156,7 +1157,7 @@
 	      case '0':
 		break;
 	      case '1':
-		set(__i);
+		_Unchecked_set(__i);
 		break;
 	      default:
 		__throw_invalid_argument(__N("bitset::_M_copy_from_string"));

gcc41-mmintrin.patch:
 0 files changed

--- NEW FILE gcc41-mmintrin.patch ---
2006-01-27  H.J. Lu  <hongjiu.lu at intel.com>

	* config/i386/emmintrin.h (_mm_cvtsd_f64): Add missing Intel
	intrinsic.
	(_mm_cvtsi128_si64): Likewise.
	(_mm_cvtsd_si64): Likewise.
	(_mm_cvttsd_si64): Likewise.
	(_mm_cvtsi64_sd): Likewise.
	(_mm_cvtsi64_si128): Likewise.
	* config/i386/mmintrin.h (_m_from_int64): Likewise.
	(_mm_cvtsi64_m64): Likewise.
	(_m_to_int64): Likewise.
	(_mm_cvtm64_si64): Likewise.
	* config/i386/xmmintrin.h (_mm_cvtss_si64): Likewise.
	(_mm_cvttss_si64): Likewise.
	(_mm_cvtsi64_ss): Likewise.
	(_mm_cvtss_f32): Likewise.

--- gcc/config/i386/mmintrin.h	(revision 110310)
+++ gcc/config/i386/mmintrin.h	(revision 110311)
@@ -25,7 +26,7 @@
    Public License.  */
 
 /* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
+   User Guide and Reference, version 9.0.  */
 
 #ifndef _MMINTRIN_H_INCLUDED
 #define _MMINTRIN_H_INCLUDED
@@ -69,13 +70,27 @@ _m_from_int (int __i)
 
 #ifdef __x86_64__
 /* Convert I to a __m64 object.  */
+
+/* Intel intrinsic.  */
+static __inline __m64  __attribute__((__always_inline__))
+_m_from_int64 (long long __i)
+{
+  return (__m64) __i;
+}
+
+static __inline __m64  __attribute__((__always_inline__))
+_mm_cvtsi64_m64 (long long __i)
+{
+  return (__m64) __i;
+}
+
+/* Microsoft intrinsic.  */
 static __inline __m64  __attribute__((__always_inline__))
 _mm_cvtsi64x_si64 (long long __i)
 {
   return (__m64) __i;
 }
 
-/* Convert I to a __m64 object.  */
 static __inline __m64  __attribute__((__always_inline__))
 _mm_set_pi64x (long long __i)
 {
@@ -97,7 +112,22 @@ _m_to_int (__m64 __i)
 }
 
 #ifdef __x86_64__
-/* Convert the lower 32 bits of the __m64 object into an integer.  */
+/* Convert the __m64 object to a 64bit integer.  */
+
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_m_to_int64 (__m64 __i)
+{
+  return (long long)__i;
+}
+
+static __inline long long __attribute__((__always_inline__))
+_mm_cvtm64_si64 (__m64 __i)
+{
+  return (long long)__i;
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvtsi64_si64x (__m64 __i)
 {
--- gcc/config/i386/xmmintrin.h	(revision 110310)
+++ gcc/config/i386/xmmintrin.h	(revision 110311)
@@ -25,7 +26,7 @@
    Public License.  */
 
 /* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
+   User Guide and Reference, version 9.0.  */
 
 #ifndef _XMMINTRIN_H_INCLUDED
 #define _XMMINTRIN_H_INCLUDED
@@ -491,8 +492,17 @@ _mm_cvt_ss2si (__m128 __A)
 }
 
 #ifdef __x86_64__
-/* Convert the lower SPFP value to a 32-bit integer according to the current
-   rounding mode.  */
+/* Convert the lower SPFP value to a 32-bit integer according to the
+   current rounding mode.  */
+
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_mm_cvtss_si64 (__m128 __A)
+{
+  return __builtin_ia32_cvtss2si64 ((__v4sf) __A);
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvtss_si64x (__m128 __A)
 {
@@ -529,6 +539,15 @@ _mm_cvtt_ss2si (__m128 __A)
 
 #ifdef __x86_64__
 /* Truncate the lower SPFP value to a 32-bit integer.  */
+
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_mm_cvttss_si64 (__m128 __A)
+{
+  return __builtin_ia32_cvttss2si64 ((__v4sf) __A);
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvttss_si64x (__m128 __A)
 {
@@ -565,6 +584,15 @@ _mm_cvt_si2ss (__m128 __A, int __B)
 
 #ifdef __x86_64__
 /* Convert B to a SPFP value and insert it as element zero in A.  */
+
+/* Intel intrinsic.  */
+static __inline __m128 __attribute__((__always_inline__))
+_mm_cvtsi64_ss (__m128 __A, long long __B)
+{
+  return (__m128) __builtin_ia32_cvtsi642ss ((__v4sf) __A, __B);
+}
+
+/* Microsoft intrinsic.  */
 static __inline __m128 __attribute__((__always_inline__))
 _mm_cvtsi64x_ss (__m128 __A, long long __B)
 {
@@ -911,6 +939,12 @@ _mm_store_ss (float *__P, __m128 __A)
   *__P = __builtin_ia32_vec_ext_v4sf ((__v4sf)__A, 0);
 }
 
+static __inline float __attribute__((__always_inline__))
+_mm_cvtss_f32 (__m128 __A)
+{
+  return __builtin_ia32_vec_ext_v4sf ((__v4sf)__A, 0);
+}
+
 /* Store four SPFP values.  The address must be 16-byte aligned.  */
 static __inline void __attribute__((__always_inline__))
 _mm_store_ps (float *__P, __m128 __A)
--- gcc/config/i386/emmintrin.h	(revision 110310)
+++ gcc/config/i386/emmintrin.h	(revision 110311)
@@ -25,7 +25,7 @@
    Public License.  */
 
 /* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
+   User Guide and Reference, version 9.0.  */
 
 #ifndef _EMMINTRIN_H_INCLUDED
 #define _EMMINTRIN_H_INCLUDED
@@ -158,6 +158,12 @@ _mm_store_sd (double *__P, __m128d __A)
   *__P = __builtin_ia32_vec_ext_v2df (__A, 0);
 }
 
+static __inline double __attribute__((__always_inline__))
+_mm_cvtsd_f64 (__m128d __A)
+{
+  return __builtin_ia32_vec_ext_v2df (__A, 0);
+}
+
 static __inline void __attribute__((__always_inline__))
 _mm_storel_pd (double *__P, __m128d __A)
 {
@@ -199,6 +205,14 @@ _mm_cvtsi128_si32 (__m128i __A)
 }
 
 #ifdef __x86_64__
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_mm_cvtsi128_si64 (__m128i __A)
+{
+  return __builtin_ia32_vec_ext_v2di ((__v2di)__A, 0);
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvtsi128_si64x (__m128i __A)
 {
@@ -789,6 +803,14 @@ _mm_cvtsd_si32 (__m128d __A)
 }
 
 #ifdef __x86_64__
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_mm_cvtsd_si64 (__m128d __A)
+{
+  return __builtin_ia32_cvtsd2si64 ((__v2df) __A);
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvtsd_si64x (__m128d __A)
 {
@@ -803,6 +825,14 @@ _mm_cvttsd_si32 (__m128d __A)
 }
 
 #ifdef __x86_64__
+/* Intel intrinsic.  */
+static __inline long long __attribute__((__always_inline__))
+_mm_cvttsd_si64 (__m128d __A)
+{
+  return __builtin_ia32_cvttsd2si64 ((__v2df) __A);
+}
+
+/* Microsoft intrinsic.  */
 static __inline long long __attribute__((__always_inline__))
 _mm_cvttsd_si64x (__m128d __A)
 {
@@ -823,6 +853,14 @@ _mm_cvtsi32_sd (__m128d __A, int __B)
 }
 
 #ifdef __x86_64__
+/* Intel intrinsic.  */
+static __inline __m128d __attribute__((__always_inline__))
+_mm_cvtsi64_sd (__m128d __A, long long __B)
+{
+  return (__m128d)__builtin_ia32_cvtsi642sd ((__v2df) __A, __B);
+}
+
+/* Microsoft intrinsic.  */
 static __inline __m128d __attribute__((__always_inline__))
 _mm_cvtsi64x_sd (__m128d __A, long long __B)
 {
@@ -1379,6 +1417,14 @@ _mm_cvtsi32_si128 (int __A)
 }
 
 #ifdef __x86_64__
+/* Intel intrinsic.  */
+static __inline __m128i __attribute__((__always_inline__))
+_mm_cvtsi64_si128 (long long __A)
+{
+  return _mm_set_epi64x (0, __A);
+}
+
+/* Microsoft intrinsic.  */
 static __inline __m128i __attribute__((__always_inline__))
 _mm_cvtsi64x_si128 (long long __A)
 {

gcc41-pr22275.patch:
 0 files changed

--- NEW FILE gcc41-pr22275.patch ---
2006-02-14  Michael Matz  <matz at suse.de>

	PR middle-end/22275

	* stor-layout.c (layout_decl): Zero-width bitfields aren't
	influenced by maximum_field_alignment or DECL_PACKED.
	(update_alignment_for_field): Ditto.
	(place_field): Ditto.
	* doc/extend.texi (<#pragma pack>, <Type Attributes>): Document
	this behaviour.

--- gcc/stor-layout.c	(revision 110979)
+++ gcc/stor-layout.c	(revision 110982)
@@ -337,6 +337,8 @@ layout_decl (tree decl, unsigned int kno
     /* For fields, it's a bit more complicated...  */
     {
       bool old_user_align = DECL_USER_ALIGN (decl);
+      bool zero_bitfield = false;
+      unsigned int mfa;
 
       if (DECL_BIT_FIELD (decl))
 	{
@@ -345,9 +347,9 @@ layout_decl (tree decl, unsigned int kno
 	  /* A zero-length bit-field affects the alignment of the next
 	     field.  */
 	  if (integer_zerop (DECL_SIZE (decl))
-	      && ! DECL_PACKED (decl)
 	      && ! targetm.ms_bitfield_layout_p (DECL_FIELD_CONTEXT (decl)))
 	    {
+	      zero_bitfield = true;
 #ifdef PCC_BITFIELD_TYPE_MATTERS
 	      if (PCC_BITFIELD_TYPE_MATTERS)
 		do_type_align (type, decl);
@@ -408,12 +410,13 @@ layout_decl (tree decl, unsigned int kno
 	 check old_user_align instead.  */
       if (DECL_PACKED (decl)
 	  && !old_user_align
+	  && !zero_bitfield
 	  && (DECL_NONADDRESSABLE_P (decl)
 	      || DECL_SIZE_UNIT (decl) == 0
 	      || TREE_CODE (DECL_SIZE_UNIT (decl)) == INTEGER_CST))
 	DECL_ALIGN (decl) = MIN (DECL_ALIGN (decl), BITS_PER_UNIT);
 
-      if (! DECL_USER_ALIGN (decl) && ! DECL_PACKED (decl))
+      if (! DECL_USER_ALIGN (decl) && (! DECL_PACKED (decl) || zero_bitfield))
 	{
 	  /* Some targets (i.e. i386, VMS) limit struct field alignment
 	     to a lower boundary than alignment of variables unless
@@ -427,9 +430,13 @@ layout_decl (tree decl, unsigned int kno
 #endif
 	}
 
+      if (zero_bitfield)
+        mfa = initial_max_fld_align * BITS_PER_UNIT;
+      else
+	mfa = maximum_field_alignment;
       /* Should this be controlled by DECL_USER_ALIGN, too?  */
-      if (maximum_field_alignment != 0)
-	DECL_ALIGN (decl) = MIN (DECL_ALIGN (decl), maximum_field_alignment);
+      if (mfa != 0)
+	DECL_ALIGN (decl) = MIN (DECL_ALIGN (decl), mfa);
     }
 
   /* Evaluate nonconstant size only once, either now or as soon as safe.  */
@@ -713,7 +720,16 @@ update_alignment_for_field (record_layou
 	    type_align = ADJUST_FIELD_ALIGN (field, type_align);
 #endif
 
-	  if (maximum_field_alignment != 0)
+	  /* Targets might chose to handle unnamed and hence possibly
+	     zero-width bitfield.  Those are not influenced by #pragmas
+	     or packed attributes.  */
+	  if (integer_zerop (DECL_SIZE (field)))
+	    {
+	      if (initial_max_fld_align)
+	        type_align = MIN (type_align,
+				  initial_max_fld_align * BITS_PER_UNIT);
+	    }
+	  else if (maximum_field_alignment != 0)
 	    type_align = MIN (type_align, maximum_field_alignment);
 	  else if (DECL_PACKED (field))
 	    type_align = MIN (type_align, BITS_PER_UNIT);
@@ -1175,6 +1191,10 @@ place_field (record_layout_info rli, tre
   if (DECL_BIT_FIELD_TYPE (field))
     {
       unsigned int type_align = TYPE_ALIGN (type);
+      unsigned int mfa = maximum_field_alignment;
+
+      if (integer_zerop (DECL_SIZE (field)))
+        mfa = initial_max_fld_align * BITS_PER_UNIT;
 
       /* Only the MS bitfields use this.  We used to also put any kind of
 	 packed bit fields into prev_field, but that makes no sense, because
@@ -1183,8 +1203,8 @@ place_field (record_layout_info rli, tre
 	 are also not fulfilled.
 	 There is no sane value to set rli->remaining_in_alignment to when
 	 a packed bitfield in prev_field is unaligned.  */
-      if (maximum_field_alignment != 0)
-	type_align = MIN (type_align, maximum_field_alignment);
+      if (mfa != 0)
+	type_align = MIN (type_align, mfa);
       gcc_assert (rli->prev_field
 		  || actual_align >= type_align || DECL_PACKED (field)
 		  || integer_zerop (DECL_SIZE (field))
--- gcc/doc/extend.texi	(revision 110979)
+++ gcc/doc/extend.texi	(revision 110982)
@@ -3288,9 +3288,10 @@ alignment.  See your linker documentatio
 
 @item packed
 This attribute, attached to @code{struct} or @code{union} type
-definition, specifies that each member of the structure or union is
-placed to minimize the memory required.  When attached to an @code{enum}
-definition, it indicates that the smallest integral type should be used.
+definition, specifies that each member (other than zero-width bitfields)
+of the structure or union is placed to minimize the memory required.  When
+attached to an @code{enum} definition, it indicates that the smallest
+integral type should be used.
 
 @opindex fshort-enums
 Specifying this attribute for @code{struct} and @code{union} types is
@@ -9423,10 +9424,10 @@ way of knowing that that happened.)
 @subsection Structure-Packing Pragmas
 
 For compatibility with Win32, GCC supports a set of @code{#pragma}
-directives which change the maximum alignment of members of structures,
-unions, and classes subsequently defined.  The @var{n} value below always
-is required to be a small power of two and specifies the new alignment
-in bytes.
+directives which change the maximum alignment of members of structures
+(other than zero-width bitfields), unions, and classes subsequently
+defined.  The @var{n} value below always is required to be a small power
+of two and specifies the new alignment in bytes.
 
 @enumerate
 @item @code{#pragma pack(@var{n})} simply sets the new alignment.

gcc41-pr25626.patch:
 0 files changed

--- NEW FILE gcc41-pr25626.patch ---
2006-01-15  Paolo Carlini  <pcarlini at suse.de>
	    Gabriel Dos Reis  <gdr at integrable-solutions.net>

	PR libstdc++/25626
	* include/std/std_valarray.h (valarray(const slice_array<>&),
	valarray(const gslice_array<>&), valarray(const mask_array<>&),
	valarray(const indirect_array<>&), valarray(const _Expr<>&)):
	Forward to __valarray_copy_construct, not __valarray_copy.
	* include/bits/valarray_array.h
	(__valarray_copy_construct(_Array<>, _Array<>, _Array<>, size_t),
	__valarray_copy_construct(_Array<>, size_t, size_t, _Array<>)):
	New.

--- libstdc++-v3/include/bits/valarray_array.h	(revision 109725)
+++ libstdc++-v3/include/bits/valarray_array.h	(revision 109726)
@@ -428,6 +428,22 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _Tp* const __restrict__ _M_data;
     };
 
+
+  // Copy-construct plain array __b[<__n>] from indexed array __a[__i[<__n>]]
+  template<typename _Tp>
+    inline void
+    __valarray_copy_construct(_Array<_Tp> __a, _Array<size_t> __i,
+			      _Array<_Tp> __b, size_t __n)
+    { std::__valarray_copy_construct(__a._M_data, __i._M_data,
+				     __b._M_data, __n); }
+
+  // Copy-construct plain array __b[<__n>] from strided array __a[<__n : __s>]
+  template<typename _Tp>
+    inline void
+    __valarray_copy_construct(_Array<_Tp> __a, size_t __n, size_t __s,
+			      _Array<_Tp> __b)
+    { std::__valarray_copy_construct(__a._M_data, __n, __s, __b._M_data); }
+
   template<typename _Tp>
     inline void
     __valarray_fill (_Array<_Tp> __a, size_t __n, const _Tp& __t)
--- libstdc++-v3/include/std/std_valarray.h	(revision 109725)
+++ libstdc++-v3/include/std/std_valarray.h	(revision 109726)
@@ -583,7 +583,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     valarray<_Tp>::valarray(const slice_array<_Tp>& __sa)
     : _M_size(__sa._M_sz), _M_data(__valarray_get_storage<_Tp>(__sa._M_sz))
     {
-      std::__valarray_copy
+      std::__valarray_copy_construct
 	(__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data));
     }
 
@@ -593,7 +593,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     : _M_size(__ga._M_index.size()),
       _M_data(__valarray_get_storage<_Tp>(_M_size))
     {
-      std::__valarray_copy
+      std::__valarray_copy_construct
 	(__ga._M_array, _Array<size_t>(__ga._M_index),
 	 _Array<_Tp>(_M_data), _M_size);
     }
@@ -603,7 +603,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     valarray<_Tp>::valarray(const mask_array<_Tp>& __ma)
     : _M_size(__ma._M_sz), _M_data(__valarray_get_storage<_Tp>(__ma._M_sz))
     {
-      std::__valarray_copy
+      std::__valarray_copy_construct
 	(__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size);
     }
 
@@ -612,7 +612,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     valarray<_Tp>::valarray(const indirect_array<_Tp>& __ia)
     : _M_size(__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_sz))
     {
-      std::__valarray_copy
+      std::__valarray_copy_construct
 	(__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size);
     }
 
@@ -620,7 +620,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     inline
     valarray<_Tp>::valarray(const _Expr<_Dom, _Tp>& __e)
     : _M_size(__e.size()), _M_data(__valarray_get_storage<_Tp>(_M_size))
-    { std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data)); }
+    { std::__valarray_copy_construct(__e, _M_size, _Array<_Tp>(_M_data)); }
 
   template<typename _Tp>
     inline

gcc41-pr26151.patch:
 0 files changed

--- NEW FILE gcc41-pr26151.patch ---
2006-02-14  Volker Reichelt  <reichelt at igpm.rwth-aachen.de>

	PR c++/26151
	* parser.c (cp_parser_decl_specifier_seq): Check for duplicate
	decl-specifiers.  Remove extra check for duplicate 'friend'.
	* decl.c (grokdeclarator): Remove check for duplicate
	decl-specifiers.  Set longlong together with long_p.

--- gcc/cp/decl.c	(revision 110979)
+++ gcc/cp/decl.c	(revision 110982)
@@ -6662,7 +6662,6 @@ grokdeclarator (const cp_declarator *dec
      this value will be NULL_TREE, even if the entity is located at
      namespace scope.  */
   tree in_namespace = NULL_TREE;
-  cp_decl_spec ds;
   cp_storage_class storage_class;
   bool unsigned_p, signed_p, short_p, long_p, thread_p;
   bool type_was_error_mark_node = false;
@@ -6671,6 +6670,7 @@ grokdeclarator (const cp_declarator *dec
   unsigned_p = declspecs->specs[(int)ds_unsigned];
   short_p = declspecs->specs[(int)ds_short];
   long_p = declspecs->specs[(int)ds_long];
+  longlong = declspecs->specs[(int)ds_long] >= 2;
   thread_p = declspecs->specs[(int)ds_thread];
 
   if (decl_context == FUNCDEF)
@@ -6884,45 +6884,6 @@ grokdeclarator (const cp_declarator *dec
   explicit_int = declspecs->explicit_int_p;
   explicit_char = declspecs->explicit_char_p;
 
-  /* Check for repeated decl-specifiers.  */
-  for (ds = ds_first; ds != ds_last; ++ds)
-    {
-      unsigned count = declspecs->specs[(int)ds];
-      if (count < 2)
-	continue;
-      /* The "long" specifier is a special case because of
-	 "long long".  */
-      if (ds == ds_long)
-	{
-	  if (count > 2)
-	    error ("%<long long long%> is too long for GCC");
-	  else if (pedantic && !in_system_header && warn_long_long)
-	    pedwarn ("ISO C++ does not support %<long long%>");
-	  else
-	    longlong = 1;
-	}
-      else if (declspecs->specs[(int)ds] > 1)
-	{
-	  static const char *const decl_spec_names[] = {
-	    "signed",
-	    "unsigned",
-	    "short",
-	    "long",
-	    "const",
-	    "volatile",
-	    "restrict",
-	    "inline",
-	    "virtual",
-	    "explicit",
-	    "friend",
-	    "typedef",
-	    "__complex",
-	    "__thread"
-	  };
-	  error ("duplicate %qs", decl_spec_names[(int)ds]);
-	}
-    }
-
 #if 0
   /* See the code below that used this.  */
   if (typedef_decl)
--- gcc/cp/parser.c	(revision 110979)
+++ gcc/cp/parser.c	(revision 110982)
@@ -7290,6 +7290,7 @@ cp_parser_decl_specifier_seq (cp_parser*
 			      int* declares_class_or_enum)
 {
   bool constructor_possible_p = !parser->in_declarator_p;
+  cp_decl_spec ds;
 
   /* Clear DECL_SPECS.  */
   clear_decl_specs (decl_specs);
@@ -7324,8 +7325,7 @@ cp_parser_decl_specifier_seq (cp_parser*
 	  /* decl-specifier:
 	       friend  */
 	case RID_FRIEND:
-	  if (decl_specs->specs[(int) ds_friend]++)
-	    error ("duplicate %<friend%>");
+	  ++decl_specs->specs[(int) ds_friend];
 	  /* Consume the token.  */
 	  cp_lexer_consume_token (parser->lexer);
 	  break;
@@ -7491,6 +7491,42 @@ cp_parser_decl_specifier_seq (cp_parser*
       flags |= CP_PARSER_FLAGS_OPTIONAL;
     }
 
+  /* Check for repeated decl-specifiers.  */
+  for (ds = ds_first; ds != ds_last; ++ds)
+    {
+      unsigned count = decl_specs->specs[(int)ds];
+      if (count < 2)
+	continue;
+      /* The "long" specifier is a special case because of "long long".  */
+      if (ds == ds_long)
+	{
+	  if (count > 2)
+	    error ("%<long long long%> is too long for GCC");
+	  else if (pedantic && !in_system_header && warn_long_long)
+	    pedwarn ("ISO C++ does not support %<long long%>");
+	}
+      else if (count > 1)
+	{
+	  static const char *const decl_spec_names[] = {
+	    "signed",
+	    "unsigned",
+	    "short",
+	    "long",
+	    "const",
+	    "volatile",
+	    "restrict",
+	    "inline",
+	    "virtual",
+	    "explicit",
+	    "friend",
+	    "typedef",
+	    "__complex",
+	    "__thread"
+	  };
+	  error ("duplicate %qs", decl_spec_names[(int)ds]);
+	}
+    }
+
   /* Don't allow a friend specifier with a class definition.  */
   if (decl_specs->specs[(int) ds_friend] != 0
       && (*declares_class_or_enum & 2))

gcc41-pr26209.patch:
 tree-cfg.c        |    5 +----
 tree-cfgcleanup.c |   15 ++++++++++-----
 tree-ssa-loop.c   |    3 ++-
 3 files changed, 13 insertions(+), 10 deletions(-)

--- NEW FILE gcc41-pr26209.patch ---
2006-02-13  Zdenek Dvorak  <dvorakz at suse.cz>

	PR tree-optimization/26209
	* tree-ssa-loop.c (pass_scev_cprop): Add TODO_cleanup_cfg.
	* tree-cfgcleanup.c (cleanup_control_flow): Remove dead
	eh edges.
	* tree-cfg.c (replace_uses_by): Do not alter cfg.

--- gcc/tree-cfg.c.jj	2006-02-02 16:39:45.000000000 +0100
+++ gcc/tree-cfg.c	2006-02-14 16:14:08.000000000 +0100
@@ -1324,10 +1324,7 @@ replace_uses_by (tree name, tree val)
       if (TREE_CODE (rhs) == ADDR_EXPR)
 	recompute_tree_invarant_for_addr_expr (rhs);
 
-      /* If the statement could throw and now cannot, we need to prune cfg.  */
-      if (maybe_clean_or_replace_eh_stmt (stmt, stmt))
-	tree_purge_dead_eh_edges (bb_for_stmt (stmt));
-
+      maybe_clean_or_replace_eh_stmt (stmt, stmt);
       mark_new_vars_to_rename (stmt);
     }
 
--- gcc/tree-ssa-loop.c.jj	2006-02-02 16:39:51.000000000 +0100
+++ gcc/tree-ssa-loop.c	2006-02-14 16:14:02.000000000 +0100
@@ -303,7 +303,8 @@ struct tree_opt_pass pass_scev_cprop =
   0,					/* properties_provided */
   0,					/* properties_destroyed */
   0,					/* todo_flags_start */
-  TODO_dump_func | TODO_update_ssa_only_virtuals,
+  TODO_dump_func | TODO_cleanup_cfg
+    | TODO_update_ssa_only_virtuals,
 					/* todo_flags_finish */
   0					/* letter */
 };
--- gcc/tree-cfgcleanup.c.jj	2006-02-02 16:39:41.000000000 +0100
+++ gcc/tree-cfgcleanup.c	2006-02-14 16:14:05.000000000 +0100
@@ -157,19 +157,24 @@ cleanup_control_flow (void)
     {
       bsi = bsi_last (bb);
 
+      /* If the last statement of the block could throw and now cannot,
+	 we need to prune cfg.  */
+      tree_purge_dead_eh_edges (bb);
+
       if (bsi_end_p (bsi))
 	continue;
 
       stmt = bsi_stmt (bsi);
+
       if (TREE_CODE (stmt) == COND_EXPR
 	  || TREE_CODE (stmt) == SWITCH_EXPR)
 	retval |= cleanup_control_expr_graph (bb, bsi);
-
       /* If we had a computed goto which has a compile-time determinable
 	 destination, then we can eliminate the goto.  */
-      if (TREE_CODE (stmt) == GOTO_EXPR
-	  && TREE_CODE (GOTO_DESTINATION (stmt)) == ADDR_EXPR
-	  && TREE_CODE (TREE_OPERAND (GOTO_DESTINATION (stmt), 0)) == LABEL_DECL)
+      else if (TREE_CODE (stmt) == GOTO_EXPR
+	       && TREE_CODE (GOTO_DESTINATION (stmt)) == ADDR_EXPR
+	       && (TREE_CODE (TREE_OPERAND (GOTO_DESTINATION (stmt), 0))
+		   == LABEL_DECL))
 	{
 	  edge e;
 	  tree label;
@@ -213,7 +218,7 @@ cleanup_control_flow (void)
 
       /* Check for indirect calls that have been turned into
 	 noreturn calls.  */
-      if (noreturn_call_p (stmt) && remove_fallthru_edge (bb->succs))
+      else if (noreturn_call_p (stmt) && remove_fallthru_edge (bb->succs))
 	{
 	  free_dominance_info (CDI_DOMINATORS);
 	  retval = true;

gcc41-vrp.patch:
 0 files changed

--- NEW FILE gcc41-vrp.patch ---
2006-02-13  Jeff Law  <law at redhat.com>

	* tree-vrp.c (extract_range_from_binary_expr): Remove handling of
	TRUTH_XOR_EPR.

--- gcc/tree-vrp.c	(revision 110937)
+++ gcc/tree-vrp.c	(revision 110938)
@@ -1278,8 +1278,7 @@ extract_range_from_binary_expr (value_ra
       && code != TRUTH_ANDIF_EXPR
       && code != TRUTH_ORIF_EXPR
       && code != TRUTH_AND_EXPR
-      && code != TRUTH_OR_EXPR
-      && code != TRUTH_XOR_EXPR)
+      && code != TRUTH_OR_EXPR)
     {
       set_value_range_to_varying (vr);
       return;
@@ -1365,8 +1364,7 @@ extract_range_from_binary_expr (value_ra
   if (code == TRUTH_ANDIF_EXPR
       || code == TRUTH_ORIF_EXPR
       || code == TRUTH_AND_EXPR
-      || code == TRUTH_OR_EXPR
-      || code == TRUTH_XOR_EXPR)
+      || code == TRUTH_OR_EXPR)
     {
       /* If one of the operands is zero, we know that the whole
 	 expression evaluates zero.  */


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- .cvsignore	13 Feb 2006 14:40:12 -0000	1.133
+++ .cvsignore	14 Feb 2006 17:04:22 -0000	1.134
@@ -1 +1 @@
-gcc-4.1.0-20060213.tar.bz2
+gcc-4.1.0-20060214.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gcc41.spec	13 Feb 2006 14:40:12 -0000	1.34
+++ gcc41.spec	14 Feb 2006 17:04:24 -0000	1.35
@@ -1,6 +1,6 @@
-%define DATE 20060213
+%define DATE 20060214
 %define gcc_version 4.1.0
-%define gcc_release 0.25
+%define gcc_release 0.26
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -105,12 +105,16 @@
 Patch8: gcc41-java-slow_pthread_self.patch
 Patch9: gcc41-fortran-finclude.patch
 Patch10: gcc41-ppc32-retaddr.patch
-Patch11: gcc41-ldbl-default.patch
-Patch12: gcc41-ldbl-default-libstdc++.patch
-Patch13: gcc41-sparc64-g7.patch
-Patch14: gcc41-fortran-where.patch
-Patch15: gcc41-pr26092.patch
-Patch16: gcc41-pr26246.patch
+Patch11: gcc41-sparc64-g7.patch
+Patch12: gcc41-fortran-where.patch
+Patch13: gcc41-expr_nonzero_p.patch
+Patch14: gcc41-libstdc++-bitset.patch
+Patch15: gcc41-mmintrin.patch
+Patch16: gcc41-pr22275.patch
+Patch17: gcc41-pr25626.patch
+Patch18: gcc41-pr26151.patch
+Patch19: gcc41-pr26209.patch
+Patch20: gcc41-vrp.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -400,12 +404,16 @@
 %patch8 -p0 -b .java-slow_pthread_self~
 %patch9 -p0 -b .fortran-finclude~
 %patch10 -p0 -b .ppc32-retaddr~
-%patch11 -p0 -b .ldbl-default~
-%patch12 -p0 -b .ldbl-default-libstdc++~
-%patch13 -p0 -b .sparc64-g7~
-%patch14 -p0 -b .fortran-where~
-%patch15 -p0 -b .pr26092~
-%patch16 -p0 -b .pr26246~
+%patch11 -p0 -b .sparc64-g7~
+%patch12 -p0 -b .fortran-where~
+%patch13 -p0 -b .expr_nonzero_p~
+%patch14 -p0 -b .libstdc++-bitset~
+%patch15 -p0 -b .mmintrin~
+%patch16 -p0 -b .pr22275~
+%patch17 -p0 -b .pr25626~
+%patch18 -p0 -b .pr26151~
+%patch19 -p0 -b .pr26209~
+%patch20 -p0 -b .vrp~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1424,6 +1432,23 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Feb 14 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.26
+- update from gcc-4_1-branch (-r110903:110978)
+  - PRs fortran/20861, fortran/20871, fortran/25059, fortran/25070,
+	fortran/25083, fortran/25088, fortran/25103, fortran/26038,
+	fortran/26074, inline-asm/16194, libfortran/24685,
+	libfortran/25425, target/26141, tree-optimization/26258
+- ABI change - revert to GCC 3.3 and earlier behaviour of
+  zero sized bitfields in packed structs (Michael Matz, PR middle-end/22275)
+- fix valarrays vs. non-POD (Paolo Carlini, Gabriel Dos Reis,
+  PR libstdc++/25626)
+- fix C++ duplicate declspec diagnostics (Volker Reichelt, PR c++/26151)
+- fix dominance ICE (Zdenek Dvorak, PR tree-optimization/26209)
+- add some new Intel {,e,x}mmintrin.h intrinsics (H.J. Lu)
+- speedup bitset<>::_M_copy_to_string (Paolo Carlini)
+- fix tree_expr_nonzero_p (Jeff Law)
+- fix TRUTH_XOR_EXPR handling in VRP (Jeff Law)
+
 * Mon Feb 13 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.25
 - update from gcc-4_1-branch (-r110831:110903)
   - PRs c++/16405, c++/24996, fortran/14771, fortran/20858, fortran/25756,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- sources	13 Feb 2006 14:40:12 -0000	1.135
+++ sources	14 Feb 2006 17:04:24 -0000	1.136
@@ -1 +1 @@
-d1949cf2e79cf95e7f46d7b3e8f1dddc  gcc-4.1.0-20060213.tar.bz2
+c492d5acbe9bade087754f9216d87d13  gcc-4.1.0-20060214.tar.bz2


--- gcc41-ldbl-default-libstdc++.patch DELETED ---


--- gcc41-ldbl-default.patch DELETED ---


--- gcc41-pr26092.patch DELETED ---


--- gcc41-pr26246.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:12:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:12:03 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.38, 1.39 Makefile.devel, 1.1,
	1.2 policy-20060207.patch, 1.5, 1.6 selinux-policy.spec, 1.106,
	1.107 sources, 1.42, 1.43
Message-ID: <200602141712.k1EHC3mk017475@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17432

Modified Files:
	.cvsignore Makefile.devel policy-20060207.patch 
	selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	13 Feb 2006 15:55:10 -0000	1.38
+++ .cvsignore	14 Feb 2006 17:11:59 -0000	1.39
@@ -39,3 +39,4 @@
 serefpolicy-2.2.12.tgz
 serefpolicy-2.2.13.tgz
 serefpolicy-2.2.14.tgz
+serefpolicy-2.2.15.tgz


Index: Makefile.devel
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/Makefile.devel,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.devel	3 Feb 2006 14:59:07 -0000	1.1
+++ Makefile.devel	14 Feb 2006 17:11:59 -0000	1.2
@@ -1,5 +1,8 @@
+# installation paths
+SHAREDIR := $(PREFIX)/share/selinux
+HEADERDIR := $(SHAREDIR)/refpolicy/include
 
--include build.conf
+include $(HEADERDIR)/build.conf
 
 # executables
 PREFIX := /usr
@@ -8,6 +11,7 @@
 CHECKMODULE := $(BINDIR)/checkmodule
 SEMODULE := $(SBINDIR)/semodule
 SEMOD_PKG := $(BINDIR)/semodule_package
+XMLLINT := $(BINDIR)/xmllint
 
 # helper tools
 AWK ?= gawk
@@ -15,10 +19,12 @@
 M4 ?= m4
 SED ?= sed
 EINFO ?= echo
+PYTHON ?= python
 
-# set default build options
+# set default build options if missing
 NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
 MLSENABLED := $(shell cat /selinux/mls)
+MODPKGDIR := $(SHAREDIR)/$(NAME)
 
 ifeq ($(MLSENABLED),1)
 MCSFLAG=-mcs
@@ -27,11 +33,7 @@
 TYPE ?= $(NAME)${MCSFLAG}
 DIRECT_INITRC ?= n
 POLY ?= n
-
-# installation paths
-SHAREDIR := $(PREFIX)/share/selinux
-MODPKGDIR := $(SHAREDIR)/$(NAME)
-HEADERDIR := $(SHAREDIR)/refpolicy/include
+QUIET ?= y
 
 # compile strict policy if requested.
 ifneq ($(findstring strict,$(TYPE)),)

policy-20060207.patch:
 Makefile                                  |    2 -
 Rules.modular                             |    2 -
 policy/mcs                                |   13 ++++++-
 policy/modules/kernel/devices.if          |   19 +++++++++++
 policy/modules/kernel/mls.if              |   19 +++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/hal.te            |    5 ++-
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    3 +
 policy/modules/services/networkmanager.te |    2 -
 policy/modules/services/postfix.te        |    4 ++
 policy/modules/services/spamassassin.te   |    1 
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/init.te             |    2 +
 policy/modules/system/libraries.if        |    1 
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 ++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   50 ++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.if       |    3 +
 policy/modules/system/userdomain.te       |    7 ++++
 support/Makefile.devel                    |   12 ++++++-
 22 files changed, 185 insertions(+), 11 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- policy-20060207.patch	13 Feb 2006 19:51:43 -0000	1.5
+++ policy-20060207.patch	14 Feb 2006 17:11:59 -0000	1.6
@@ -1,34 +1,18 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/build.conf serefpolicy-2.2.14/build.conf
---- nsaserefpolicy/build.conf	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.14/build.conf	2006-02-13 14:29:38.000000000 -0500
-@@ -8,13 +8,13 @@
- # version policy it supports.  Setting this will
- # override the version.  This only has an
- # effect for monolithic policies.
--#OUTPUT_POLICY = 18
-+#OUTPUT_POLICY = 20
- 
- # Policy Type
- # strict, targeted,
- # strict-mls, targeted-mls,
- # strict-mcs, targeted-mcs
--TYPE = strict
-+TYPE = strict-mcs
- 
- # Policy Name
- # If set, this will be used as the policy
-@@ -40,7 +40,7 @@
- 
- # Build monolithic policy.  Putting n here
- # will build a loadable module policy.
--MONOLITHIC=y
-+MONOLITHIC=n
- 
- # Polyinstantiation
- # Enable polyinstantiated directory support.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.14/policy/mcs
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.15/Makefile
+--- nsaserefpolicy/Makefile	2006-02-14 07:20:17.000000000 -0500
++++ serefpolicy-2.2.15/Makefile	2006-02-14 11:16:13.000000000 -0500
+@@ -45,7 +45,7 @@
+ AWK ?= gawk
+ GREP ?= egrep
+ M4 ?= m4
+-PYTHON ?= python
++PYTHON ?= /usr/bin/python
+ SED ?= sed
+ SH ?= sh
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.15/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/mcs	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/mcs	2006-02-14 08:04:17.000000000 -0500
 @@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
@@ -52,120 +36,13 @@
 +mlsconstrain process { ptrace } ( h1 dom h2 );
 +
 +mlsconstrain process { sigkill sigstop } ( h1 dom h2 ) or
-+		( t1 == init_t ) or ( t1 == initrc_t );
++		( t1 == mlskillall );
  
  define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
  link unlink rename relabelfrom relabelto }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.14/policy/modules/admin/kudzu.te
---- nsaserefpolicy/policy/modules/admin/kudzu.te	2006-02-07 10:43:25.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/kudzu.te	2006-02-13 14:29:38.000000000 -0500
-@@ -24,7 +24,6 @@
- allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod };
- dontaudit kudzu_t self:capability sys_tty_config;
- allow kudzu_t self:process { signal_perms execmem };
--auditallow kudzu_t self:process execmem; 
- allow kudzu_t self:fifo_file rw_file_perms;
- allow kudzu_t self:unix_stream_socket { connectto create_stream_socket_perms };
- allow kudzu_t self:unix_dgram_socket create_socket_perms;
-@@ -72,6 +71,7 @@
- storage_read_scsi_generic(kudzu_t)
- storage_read_tape(kudzu_t)
- storage_raw_write_fixed_disk(kudzu_t)
-+storage_raw_write_removable_device(kudzu_t)
- storage_raw_read_fixed_disk(kudzu_t)
- storage_raw_read_removable_device(kudzu_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.14/policy/modules/admin/prelink.te
---- nsaserefpolicy/policy/modules/admin/prelink.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/prelink.te	2006-02-13 14:29:38.000000000 -0500
-@@ -65,6 +65,7 @@
- fs_getattr_xattr_fs(prelink_t)
- 
- libs_use_ld_so(prelink_t)
-+libs_execute_no_trans_ld_so(prelink_t)
- libs_manage_ld_so(prelink_t)
- libs_relabel_ld_so(prelink_t)
- libs_use_shared_libs(prelink_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.14/policy/modules/admin/readahead.te
---- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/readahead.te	2006-02-13 14:29:38.000000000 -0500
-@@ -47,7 +47,9 @@
- fs_search_auto_mountpoints(readahead_t)
- fs_getattr_all_pipes(readahead_t)
- fs_getattr_all_files(readahead_t)
--fs_search_ramfs(readahead_t)
-+fs_dontaudit_search_ramfs(readahead_t)
-+fs_dontaudit_read_ramfs_fifo_file(readahead_t)
-+fs_dontaudit_read_ramfs_file(readahead_t)
- fs_read_tmpfs_symlinks(readahead_t)
- 
- term_dontaudit_use_console(readahead_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.14/policy/modules/admin/su.if
---- nsaserefpolicy/policy/modules/admin/su.if	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/admin/su.if	2006-02-13 14:29:38.000000000 -0500
-@@ -23,13 +23,12 @@
- 	# Transition from the user domain to this domain.
- 	domain_auto_trans($2, su_exec_t, $1_su_t)
- 	allow $2 $1_su_t:fd use;
--	allow $1_su_t $2:fd use;
--	allow $1_su_t $2:fifo_file rw_file_perms;
--	allow $1_su_t $2:process sigchld;
-+	allow $2 $1_su_t:fifo_file rw_file_perms;
-+	allow $2 $1_su_t:process sigchld;
- 
- 	# By default, revert to the calling domain when a shell is executed.
- 	corecmd_shell_domtrans($1_su_t,$2)
--	allow $2 $1_su_t:fd use;
-+	allow $1_su_t $2:fd use;
- 	allow $1_su_t $2:fd use;
- 	allow $1_su_t $2:fifo_file rw_file_perms;
- 	allow $1_su_t $2:process sigchld;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.14/policy/modules/kernel/bootloader.te
---- nsaserefpolicy/policy/modules/kernel/bootloader.te	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/bootloader.te	2006-02-13 14:29:38.000000000 -0500
-@@ -71,7 +71,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:fifo_file { getattr read write };
-+allow bootloader_t self:fifo_file rw_file_perms;
- 
- allow bootloader_t boot_t:dir { create rw_dir_perms };
- allow bootloader_t boot_t:file create_file_perms;
-@@ -110,7 +110,7 @@
- dev_dontaudit_rw_generic_dev_nodes(bootloader_t)
- dev_read_rand(bootloader_t)
- dev_read_urand(bootloader_t)
--dev_getattr_sysfs_dirs(bootloader_t)
-+dev_read_sysfs(bootloader_t)
- # for reading BIOS data
- dev_read_raw_memory(bootloader_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/corenetwork.te.in	2006-02-13 14:29:38.000000000 -0500
-@@ -124,6 +124,7 @@
- network_port(uucpd, tcp,540,s0)
- network_port(vnc, tcp,5900,s0)
- network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0)
-+network_port(bgp, tcp,179,s0, udp,179,s0)
- network_port(zebra, tcp,2601,s0)
- network_port(zope, tcp,8021,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.14/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-02 10:39:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.fc	2006-02-13 14:29:38.000000000 -0500
-@@ -78,6 +78,7 @@
- /dev/usb/lp.*		-c	gen_context(system_u:object_r:printer_device_t,s0)
- /dev/usb/mdc800.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
- /dev/usb/scanner.*	-c	gen_context(system_u:object_r:scanner_device_t,s0)
-+/dev/bus/usb/.*/[0-9]+	-c	gen_context(system_u:object_r:usb_device_t,s0)
- 
- ifdef(`distro_redhat',`
- # originally from named.fc
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.14/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.15/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.if	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 08:04:17.000000000 -0500
 @@ -2656,3 +2656,22 @@
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
@@ -189,211 +66,46 @@
 +	allow $1 device_t:dir r_dir_perms;
 +	allow $1 usb_device_t:chr_file { read write };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.2.14/policy/modules/kernel/devices.te
---- nsaserefpolicy/policy/modules/kernel/devices.te	2006-02-01 08:23:28.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/devices.te	2006-02-13 14:29:38.000000000 -0500
-@@ -159,6 +159,11 @@
- genfscon usbfs / gen_context(system_u:object_r:usbfs_t,s0)
- genfscon usbdevfs / gen_context(system_u:object_r:usbfs_t,s0)
- 
-+#
-+# usb_device_t is the type for /dev/bus/usb/[0-9]+/[0-9]+
-+type usb_device_t;
-+dev_node(usb_device_t)
-+
- type v4l_device_t;
- dev_node(v4l_device_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.2.14/policy/modules/kernel/domain.te
---- nsaserefpolicy/policy/modules/kernel/domain.te	2006-02-10 11:31:48.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/domain.te	2006-02-13 14:29:38.000000000 -0500
-@@ -63,5 +63,7 @@
- # SELinux identity and role change constraints
- attribute process_uncond_exempt;	# add userhelperdomain to this one
- 
--neverallow { domain unlabeled_t } ~{ domain unlabeled_t }:process *;
-+# TODO:
-+# cjp: also need to except correctly for SEFramework
-+neverallow { domain unlabeled_t } file_type:process *;
- neverallow ~{ domain unlabeled_t } *:process *;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.14/policy/modules/kernel/files.fc
---- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-03 08:55:52.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/files.fc	2006-02-13 14:29:38.000000000 -0500
-@@ -192,6 +192,8 @@
- /usr/share(/.*)?/lib(64)?(/.*)?	gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/src(/.*)?			gen_context(system_u:object_r:src_t,s0)
-+/usr/doc(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
-+/usr/src(/.*)?/lib(/.*)?	gen_context(system_u:object_r:usr_t,s0)
- 
- /usr/tmp			-d	gen_context(system_u:object_r:tmp_t,s0-s15:c0.c255)
- /usr/tmp/.*			<<none>>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.14/policy/modules/kernel/files.if
---- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/files.if	2006-02-13 14:29:38.000000000 -0500
-@@ -2292,7 +2292,7 @@
- 		attribute tmpfile;
- 	')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.2.15/policy/modules/kernel/mls.if
+--- nsaserefpolicy/policy/modules/kernel/mls.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/mls.if	2006-02-14 08:04:17.000000000 -0500
+@@ -214,3 +214,22 @@
  
--	allow $1 tmpfile:dir { search getattr };
-+	allow $1 tmpfile:dir { search setattr };
+ 	typeattribute $1 mlstrustedobject;
  ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.14/policy/modules/kernel/filesystem.if
---- nsaserefpolicy/policy/modules/kernel/filesystem.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/filesystem.if	2006-02-13 14:29:38.000000000 -0500
-@@ -1033,6 +1033,24 @@
- 
- ########################################
- ## <summary>
-+##	List inotifyfs filesystem. 
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`fs_list_inotifyfs',`
-+	gen_require(`
-+		type inotifyfs_t;
-+	')
-+
-+	allow $1 inotifyfs_t:dir r_dir_perms;
-+')
-+
-+########################################
-+## <summary>
- ##	Mount an iso9660 filesystem, which
- ##	is usually used on CDs.
- ## </summary>
-@@ -1965,6 +1983,42 @@
- 
- ########################################
- ## <summary>
-+##	Dontaudit read on a ramfs file/fifo_file
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`fs_dontaudit_read_ramfs_file',`
-+	gen_require(`
-+		type ramfs_t;
-+	')
-+
-+	dontaudit $1 ramfs_t:file read;
-+')
 +
 +########################################
 +## <summary>
-+##	Dontaudit read on a ramfs fifo_file
++##	This domain is allowed to sigkill and sigstop 
++##	all domains regardless of sensitivity level
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain allowed access.
++##	Domain target for user exemption.
 +##	</summary>
 +## </param>
 +#
-+interface(`fs_dontaudit_read_ramfs_fifo_file',`
++interface(`mls_killall',`
 +	gen_require(`
-+		type ramfs_t;
++		attribute mlskillall;
 +	')
 +
-+	dontaudit $1 ramfs_t:fifo_file read;
++	typeattribute $1 mlskillall;
 +')
-+
-+########################################
-+## <summary>
- ##	Write to named pipe on a ramfs filesystem.
- ## </summary>
- ## <param name="domain">
-@@ -3041,3 +3095,6 @@
- 	# and its files.
- 	allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *;
- ')
-+
-+
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.14/policy/modules/kernel/terminal.if
---- nsaserefpolicy/policy/modules/kernel/terminal.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/kernel/terminal.if	2006-02-13 14:29:38.000000000 -0500
-@@ -430,7 +430,7 @@
- 		type devpts_t;
- 	')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.15/policy/modules/kernel/mls.te
+--- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/mls.te	2006-02-14 08:04:17.000000000 -0500
+@@ -46,6 +46,7 @@
  
--	dontaudit $1 devpts_t:chr_file { read write };
-+	dontaudit $1 devpts_t:chr_file { getattr read write };
- ')
+ attribute privrangetrans;
+ attribute mlsrangetrans;
++attribute mlskillall;
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.14/policy/modules/services/apache.fc
---- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/apache.fc	2006-02-13 14:29:38.000000000 -0500
-@@ -48,6 +48,7 @@
- /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
- /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-+/var/lib/cacti(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
- /var/lib/php/session(/.*)?		gen_context(system_u:object_r:httpd_var_run_t,s0)
- /var/lib/squirrelmail/prefs(/.*)?	gen_context(system_u:object_r:httpd_squirrelmail_t,s0)
- 
-@@ -55,6 +56,8 @@
- /var/log/apache-ssl(2)?(/.*)?		gen_context(system_u:object_r:httpd_log_t,s0)
- /var/log/cgiwrap\.log.*		--	gen_context(system_u:object_r:httpd_log_t,s0)
- /var/log/httpd(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
-+/var/log/cacti(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
-+
- ifdef(`distro_debian', `
- /var/log/horde2(/.*)?			gen_context(system_u:object_r:httpd_log_t,s0)
- ')
-@@ -73,3 +76,4 @@
- /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
- /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)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.if serefpolicy-2.2.14/policy/modules/services/automount.if
---- nsaserefpolicy/policy/modules/services/automount.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/automount.if	2006-02-13 14:29:38.000000000 -0500
-@@ -43,3 +43,21 @@
- 	corecmd_search_sbin($1)
- 	can_exec($1,automount_etc_t)
- ')
-+
-+########################################
-+## <summary>
-+##	dontaudit getattr of automount tmp dir
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`automount_dontaudit_getattr_tmp_dir',`
-+	gen_require(`
-+		type automount_tmp_t;
-+	')
-+
-+	dontaudit $1 automount_tmp_t:dir getattr;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.14/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/automount.te	2006-02-13 14:29:38.000000000 -0500
-@@ -63,6 +63,7 @@
- kernel_read_system_state(automount_t)
- kernel_list_proc(automount_t)
- 
-+bootloader_getattr_boot_dirs(automount_t)
- bootloader_search_boot(automount_t)
- 
- corecmd_exec_sbin(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.14/policy/modules/services/bluetooth.te
+ #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.15/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/bluetooth.te	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/bluetooth.te	2006-02-14 08:04:17.000000000 -0500
 @@ -101,6 +101,7 @@
  
  dev_read_sysfs(bluetooth_t)
@@ -402,77 +114,28 @@
  dev_read_urand(bluetooth_t)
  
  fs_getattr_all_fs(bluetooth_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.14/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/cron.if	2006-02-13 14:29:38.000000000 -0500
-@@ -429,7 +429,7 @@
- 		type crond_t;
- 	')
- 
--	allow $1 crond_t:fifo_file { read write };
-+	allow $1 crond_t:fifo_file { getattr read write };
- ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.14/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-10 11:31:48.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/cron.te	2006-02-13 14:29:38.000000000 -0500
-@@ -108,6 +108,7 @@
- 
- corecmd_exec_shell(crond_t)
- corecmd_list_sbin(crond_t)
-+corecmd_read_sbin_symlinks(crond_t)
- 
- domain_use_wide_inherit_fd(crond_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.14/policy/modules/services/fetchmail.te
---- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/fetchmail.te	2006-02-13 14:29:38.000000000 -0500
-@@ -44,6 +44,7 @@
- kernel_list_proc(fetchmail_t)
- kernel_getattr_proc_files(fetchmail_t)
- kernel_read_proc_symlinks(fetchmail_t)
-+kernel_dontaudit_read_system_state(fetchmail_t)
- 
- corenet_non_ipsec_sendrecv(fetchmail_t)
- corenet_tcp_sendrecv_generic_if(fetchmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.14/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/hal.te	2006-02-13 14:29:38.000000000 -0500
-@@ -50,6 +50,7 @@
- kernel_read_fs_sysctls(hald_t)
- kernel_write_proc_files(hald_t)
- 
-+bootloader_getattr_boot_dirs(hald_t)
- bootloader_search_boot(hald_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.15/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-02-14 07:20:26.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/hal.te	2006-02-14 09:05:04.000000000 -0500
+@@ -22,7 +22,7 @@
+ #
  
- corecmd_exec_bin(hald_t)
-@@ -97,6 +98,8 @@
+ # execute openvt which needs setuid
+-allow hald_t self:capability { setuid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio };
++allow hald_t self:capability { setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio };
+ dontaudit hald_t self:capability sys_tty_config;
+ allow hald_t self:process signal_perms;
+ allow hald_t self:fifo_file rw_file_perms;
+@@ -97,6 +97,8 @@
  
  mls_file_read_up(hald_t)
  
-+modutils_domtrans_insmod_uncond(hald_t)
++modutils_domtrans_insmod(hald_t)
 +
  selinux_get_fs_mount(hald_t)
  selinux_validate_context(hald_t)
  selinux_compute_access_vector(hald_t)
-@@ -112,12 +115,15 @@
- term_dontaudit_use_console(hald_t)
- term_dontaudit_ioctl_unallocated_ttys(hald_t)
- term_dontaudit_use_unallocated_ttys(hald_t)
-+term_dontaudit_use_generic_ptys(hald_t)
- 
- init_use_fd(hald_t)
- init_use_script_ptys(hald_t)
- init_domtrans_script(hald_t)
- init_write_initctl(hald_t)
- init_read_utmp(hald_t)
-+#hal runs shutdown, probably need a shutdown domain
-+init_rw_utmp(hald_t)
- 
- libs_use_ld_so(hald_t)
- libs_use_shared_libs(hald_t)
-@@ -125,6 +131,7 @@
+@@ -128,6 +130,7 @@
  libs_exec_lib_files(hald_t)
  
  logging_send_syslog_msg(hald_t)
@@ -480,20 +143,9 @@
  
  miscfiles_read_localization(hald_t)
  miscfiles_read_hwdata(hald_t)
-@@ -150,6 +157,10 @@
- 	apm_stream_connect(hald_t)
- ')
- 
-+optional_policy(`automount', `
-+	automount_dontaudit_getattr_tmp_dir(hald_t)
-+')
-+
- optional_policy(`bind',`
- 	bind_search_cache(hald_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.14/policy/modules/services/mta.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.15/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/mta.if	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/mta.if	2006-02-14 08:04:17.000000000 -0500
 @@ -458,6 +458,7 @@
  
  	allow $1 sendmail_exec_t:lnk_file r_file_perms;
@@ -502,9 +154,9 @@
  
  	allow $1 system_mail_t:fd use;
  	allow system_mail_t $1:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.14/policy/modules/services/mta.te
---- nsaserefpolicy/policy/modules/services/mta.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/mta.te	2006-02-13 14:29:38.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.15/policy/modules/services/mta.te
+--- nsaserefpolicy/policy/modules/services/mta.te	2006-02-14 07:20:26.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/mta.te	2006-02-14 08:04:17.000000000 -0500
 @@ -30,6 +30,9 @@
  
  mta_base_mail_template(system)
@@ -515,18 +167,9 @@
  
  # cjp: need to resolve this, but require{}
  # does not work in the else part of the optional
-@@ -145,6 +148,8 @@
- 	files_getattr_tmp_dirs(system_mail_t)
- 
- 	postfix_exec_master(system_mail_t)
-+	postfix_read_config(system_mail_t)
-+	postfix_search_spool(system_mail_t)
- 
- 	ifdef(`distro_redhat',`
- 		# compatability for old default main.cf
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.14/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/networkmanager.te	2006-02-13 14:29:38.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.15/policy/modules/services/networkmanager.te
+--- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-14 07:20:26.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/networkmanager.te	2006-02-14 08:04:17.000000000 -0500
 @@ -22,7 +22,7 @@
  dontaudit NetworkManager_t self:capability sys_tty_config;
  allow NetworkManager_t self:process { setcap getsched signal_perms };
@@ -536,21 +179,9 @@
  allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
  allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms;
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
-@@ -31,7 +31,10 @@
- 
- allow NetworkManager_t NetworkManager_var_run_t:file create_file_perms;
- allow NetworkManager_t NetworkManager_var_run_t:dir rw_dir_perms;
--files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t)
-+files_filetrans_pid(NetworkManager_t,NetworkManager_var_run_t, { dir file sock_file })
-+
-+allow NetworkManager_t NetworkManager_var_run_t:sock_file create_file_perms;
-+allow NetworkManager_t NetworkManager_var_run_t:dir create_dir_perms;
- 
- kernel_read_system_state(NetworkManager_t)
- kernel_read_network_state(NetworkManager_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.14/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-03 08:55:54.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/postfix.te	2006-02-13 14:29:38.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.15/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-14 07:20:26.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/postfix.te	2006-02-14 08:04:17.000000000 -0500
 @@ -273,6 +273,8 @@
  corecmd_exec_shell(postfix_local_t)
  corecmd_exec_bin(postfix_local_t)
@@ -568,109 +199,28 @@
  
  allow postfix_pipe_t postfix_spool_t:dir search;
  allow postfix_pipe_t postfix_spool_t:file rw_file_perms;
-@@ -411,6 +414,9 @@
- allow postfix_postdrop_t self:capability sys_resource;
- allow postfix_postdrop_t self:tcp_socket create;
- allow postfix_postdrop_t self:udp_socket create_socket_perms;
-+corenet_udp_sendrecv_all_if(postfix_postdrop_t)
-+corenet_udp_sendrecv_all_nodes(postfix_postdrop_t)
-+sysnet_dns_name_resolve(postfix_postdrop_t)
- 
- allow postfix_postdrop_t postfix_public_t:dir search;
- allow postfix_postdrop_t postfix_public_t:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.2.14/policy/modules/services/remotelogin.te
---- nsaserefpolicy/policy/modules/services/remotelogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/remotelogin.te	2006-02-13 14:29:38.000000000 -0500
-@@ -98,6 +98,7 @@
- files_list_mnt(remote_login_t)
- # for when /var/mail is a sym-link
- files_read_var_symlinks(remote_login_t)
-+files_polyinstantiate_all(remote_login_t)
+@@ -425,6 +428,7 @@
+ term_dontaudit_use_all_user_ttys(postfix_postdrop_t)
  
- init_rw_utmp(remote_login_t)
+ sysnet_dns_name_resolve(postfix_postdrop_t)
++sysnet_dontaudit_read_config(postfix_postdrop_t)
  
-@@ -164,29 +165,6 @@
- 	usermanage_read_crack_db(remote_login_t)
- ')
+ mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
  
--ifdef(`TODO',`
--# this goes to xdm:
--optional_policy(`remotelogin',`
--	# FIXME: what is this for?
--	remotelogin_signull(xdm_t)
-+optional_policy(`alsa',`
-+	alsa_domtrans(remote_login_t)
- ')
--# Login can polyinstantiate
--polyinstantiater(remote_login_t)
--
--ifdef(`alsa.te', `
--domain_auto_trans($1_login_t, alsa_exec_t, alsa_t)
--')
--
--allow remote_login_t userpty_type:chr_file { setattr write };
--allow remote_login_t ptyfile:chr_file { getattr ioctl };
--
--optional_policy(`rlogind',`
--	allow remote_login_t rlogind_devpts_t:chr_file { setattr rw_file_perms };
--	allow remote_login_t rlogind_devpts_t:chr_file { relabelfrom relabelto };
--')
--
--optional_policy(`telnetd',`
--	allow remote_login_t telnetd_devpts_t:chr_file { setattr rw_file_perms };
--	allow remote_login_t telnetd_devpts_t:chr_file { relabelfrom relabelto };
--')
--') dnl endif TODO
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.14/policy/modules/services/sendmail.te
---- nsaserefpolicy/policy/modules/services/sendmail.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/sendmail.te	2006-02-13 14:29:38.000000000 -0500
-@@ -65,6 +65,7 @@
- 
- # for piping mail to a command
- corecmd_exec_shell(sendmail_t)
-+corecmd_search_sbin(sendmail_t)
- 
- domain_use_wide_inherit_fd(sendmail_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.14/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/spamassassin.te	2006-02-13 14:29:38.000000000 -0500
-@@ -77,6 +77,8 @@
- # DnsResolver.pm module which binds to
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.15/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-14 07:20:28.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-14 08:04:17.000000000 -0500
+@@ -78,6 +78,7 @@
  # random ports >= 1024.
  corenet_udp_bind_generic_port(spamd_t)
-+corenet_tcp_connect_razor_port(spamd_t)
+ corenet_tcp_connect_razor_port(spamd_t)
 +sysnet_use_ldap(spamd_t)
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.14/policy/modules/services/zebra.te
---- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/services/zebra.te	2006-02-13 14:29:38.000000000 -0500
-@@ -34,7 +34,7 @@
- allow zebra_t self:unix_dgram_socket create_socket_perms;
- allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
- allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
--allow zebra_t self:tcp_socket connected_stream_socket_perms;
-+allow zebra_t self:tcp_socket { connect connected_stream_socket_perms };
- allow zebra_t self:udp_socket create_socket_perms;
- allow zebra_t self:rawip_socket create_socket_perms;
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.14/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/fstools.te	2006-02-13 14:29:38.000000000 -0500
-@@ -57,6 +57,8 @@
- kernel_rw_unlabeled_dirs(fsadm_t)
- kernel_rw_unlabeled_blk_files(fsadm_t)
- 
-+bootloader_getattr_boot_dirs(fsadm_t)
-+
- dev_getattr_all_chr_files(fsadm_t)
- # mkreiserfs and other programs need this for UUID
- dev_read_rand(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.14/policy/modules/system/init.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.15/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/init.fc	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/init.fc	2006-02-14 08:04:17.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -681,36 +231,29 @@
  
  ifdef(`distro_gentoo', `
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.14/policy/modules/system/libraries.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.15/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-02-08 10:03:08.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/init.te	2006-02-14 08:04:17.000000000 -0500
+@@ -157,6 +157,7 @@
+ 
+ mls_file_read_up(init_t)
+ mls_file_write_down(init_t)
++mls_killall(init_t)
+ mls_rangetrans_target(init_t)
+ 
+ seutil_read_config(init_t)
+@@ -362,6 +363,7 @@
+ 
+ mls_file_read_up(initrc_t)
+ mls_file_write_down(initrc_t)
++mls_killall(initrc_t)
+ mls_process_read_up(initrc_t)
+ mls_process_write_down(initrc_t)
+ mls_rangetrans_source(initrc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.15/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/libraries.if	2006-02-13 14:29:38.000000000 -0500
-@@ -80,6 +80,25 @@
- 
- ########################################
- ## <summary>
-+##	Allow domain execute_no_trans on ld_so_t
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`libs_execute_no_trans_ld_so',`
-+	gen_require(`
-+		type ld_so_t;
-+	')
-+
-+	files_list_etc($1)
-+	allow $1 ld_so_t:file execute_no_trans;
-+')
-+
-+########################################
-+## <summary>
- ##	Use the dynamic link/loader for automatic loading
- ##	of shared libraries with legacy support.
- ## </summary>
-@@ -283,6 +302,7 @@
++++ serefpolicy-2.2.15/policy/modules/system/libraries.if	2006-02-14 08:04:17.000000000 -0500
+@@ -283,6 +283,7 @@
  
  	allow $1 lib_t:dir search_dir_perms;
  	allow $1 lib_t:file manage_file_perms;
@@ -718,68 +261,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.2.14/policy/modules/system/libraries.te
---- nsaserefpolicy/policy/modules/system/libraries.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/libraries.te	2006-02-13 14:29:38.000000000 -0500
-@@ -53,6 +53,7 @@
- 
- allow ldconfig_t ld_so_cache_t:file create_file_perms;
- files_filetrans_etc(ldconfig_t,ld_so_cache_t,file)
-+files_search_usr(ldconfig_t)
- 
- allow ldconfig_t lib_t:dir rw_dir_perms;
- allow ldconfig_t lib_t:lnk_file { getattr create read unlink };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.14/policy/modules/system/locallogin.te
---- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/locallogin.te	2006-02-13 14:29:38.000000000 -0500
-@@ -214,10 +214,8 @@
- 	alsa_domtrans(local_login_t)
- ')
- 
--ifdef(`TODO',`
- # Login can polyinstantiate
--polyinstantiater(local_login_t)
--') dnl endif TODO
-+files_polyinstantiate_all(local_login_t)
- 
- #################################
- # 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.14/policy/modules/system/logging.te
---- nsaserefpolicy/policy/modules/system/logging.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/logging.te	2006-02-13 14:29:38.000000000 -0500
-@@ -92,6 +92,8 @@
- 	term_use_unallocated_ttys(auditctl_t)
- ')
- 
-+term_use_all_terms(auditctl_t)
-+
- ifdef(`TODO',`
- role secadm_r types auditctl_t;
- role sysadm_r types auditctl_t;
-@@ -114,7 +116,7 @@
- 
- allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
- dontaudit auditd_t self:capability sys_tty_config;
--allow auditd_t self:process { signal_perms setsched };
-+allow auditd_t self:process { signal_perms setpgid setsched };
- allow auditd_t self:file { getattr read write };
- allow auditd_t self:unix_dgram_socket create_socket_perms;
- allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.14/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/mount.te	2006-02-13 14:29:38.000000000 -0500
-@@ -33,6 +33,8 @@
- dev_getattr_all_blk_files(mount_t)
- dev_list_all_dev_nodes(mount_t)
- dev_rw_lvm_control(mount_t)
-+dev_dontaudit_getattr_memory_dev(mount_t)
-+dev_getattr_sound_dev(mount_t)
- 
- storage_raw_read_fixed_disk(mount_t)
- storage_raw_write_fixed_disk(mount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.fc	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc	2006-02-14 08:04:17.000000000 -0500
 @@ -10,6 +10,7 @@
  /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
  
@@ -794,9 +278,9 @@
  ')
 +
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.14/policy/modules/system/selinuxutil.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.15/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.if	2006-02-13 14:29:38.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.if	2006-02-14 08:04:17.000000000 -0500
 @@ -587,6 +587,22 @@
  
  ########################################
@@ -857,26 +341,10 @@
 +	allow semodule_t $1:fifo_file rw_file_perms;
 +	allow semodule_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.14/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-03 15:45:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/selinuxutil.te	2006-02-13 14:29:38.000000000 -0500
-@@ -245,6 +245,7 @@
- selinux_compute_relabel_context(newrole_t)
- selinux_compute_user_contexts(newrole_t)
- 
-+term_dontaudit_use_unallocated_ttys(newrole_t)
- term_use_all_user_ttys(newrole_t)
- term_use_all_user_ptys(newrole_t)
- term_relabel_all_user_ttys(newrole_t)
-@@ -354,6 +355,7 @@
- init_use_script_ptys(restorecon_t)
- 
- domain_use_wide_inherit_fd(restorecon_t)
-+domain_dontaudit_search_all_domains_state(restorecon_t)
- 
- files_read_etc_runtime_files(restorecon_t)
- files_read_etc_files(restorecon_t)
-@@ -533,3 +535,53 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.15/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-14 07:20:31.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.te	2006-02-14 08:04:17.000000000 -0500
+@@ -535,3 +535,53 @@
  # scripts will put things in a state such that setfiles can not be run!
  allow setfiles_t lib_t:file { read execute };
  ') dnl endif TODO
@@ -930,39 +398,10 @@
 +seutil_use_newrole_fd(semodule_t)
 +
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.14/policy/modules/system/udev.te
---- nsaserefpolicy/policy/modules/system/udev.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/udev.te	2006-02-13 14:29:38.000000000 -0500
-@@ -18,6 +18,8 @@
- domain_obj_id_change_exemption(udev_t)
- domain_entry_file(udev_t,udev_helper_exec_t)
- domain_wide_inherit_fd(udev_t)
-+domain_read_all_domains_state(udev_t)
-+
- init_daemon_domain(udev_t,udev_exec_t)
- 
- type udev_etc_t alias etc_udev_t;
-@@ -90,7 +92,7 @@
- dev_delete_generic_files(udev_t)
- 
- fs_getattr_all_fs(udev_t)
--fs_search_inotifyfs(udev_t)
-+fs_list_inotifyfs(udev_t)
- 
- selinux_get_fs_mount(udev_t)
- selinux_validate_context(udev_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.14/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/unconfined.if	2006-02-13 14:29:38.000000000 -0500
-@@ -19,6 +19,7 @@
- 
- 	# Use any Linux capability.
- 	allow $1 self:capability *;
-+	allow $1 self:fifo_file create_file_perms;
- 
- 	# Transition to myself, to make get_ordered_context_list happy.
- 	allow $1 self:process transition;
-@@ -54,10 +55,11 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.15/policy/modules/system/unconfined.if
+--- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-14 07:20:31.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/unconfined.if	2006-02-14 08:04:17.000000000 -0500
+@@ -55,10 +55,11 @@
  	tunable_policy(`allow_execmem && allow_execstack',`
  		# Allow making the stack executable via mprotect.
  		allow $1 self:process execstack;
@@ -975,81 +414,22 @@
  	')
  
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.14/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/unconfined.te	2006-02-13 14:29:38.000000000 -0500
-@@ -152,4 +152,10 @@
- 	optional_policy(`xserver',`
- 		xserver_domtrans_xdm_xserver(unconfined_t)
- 	')
-+	optional_policy(`fstools',`
-+		fstools_domtrans(unconfined_t)
-+	')
-+	optional_policy(`mount',`
-+		mount_domtrans(unconfined_t)
-+	')
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.14/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/userdomain.if	2006-02-13 14:29:38.000000000 -0500
-@@ -3049,6 +3049,25 @@
- 
- ########################################
- ## <summary>
-+##	Do not audit attempts to append to the staff
-+##	users home directory.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_dontaudit_append_staff_home_files',`
-+	gen_require(`
-+		type staff_home_t;
-+	')
-+
-+	dontaudit $1 staff_home_t:file append;
-+')
-+
-+########################################
-+## <summary>
- ##	Read files in the staff users home directory.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.14/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.14/policy/modules/system/userdomain.te	2006-02-13 14:29:38.000000000 -0500
-@@ -162,10 +162,16 @@
- 		')
- 	')
- 
-+	init_exec(sysadm_t)
-+
- 	ifdef(`enable_mls',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.15/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-14 07:20:31.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/userdomain.te	2006-02-14 08:04:17.000000000 -0500
+@@ -168,7 +168,11 @@
  		logging_read_audit_log(secadm_t)
  		logging_domtrans_auditctl(secadm_t)
  		mls_process_read_up(secadm_t)
 +		mls_file_write_down(secadm_t)
 +		mls_file_upgrade(secadm_t)
 +		mls_file_downgrade(secadm_t)
-+		userdom_dontaudit_append_staff_home_files(secadm_t)
+ 		userdom_dontaudit_append_staff_home_files(secadm_t)
++		corecmd_exec_shell(sysadm_t)
  	', `
  		logging_domtrans_auditctl(sysadm_t)
  		logging_read_audit_log(sysadm_t)
-@@ -224,6 +230,10 @@
- 
- 	optional_policy(`dmesg',`
- 		dmesg_exec(sysadm_t)
-+		ifdef(`enable_mls',`
-+			dmesg_exec(secadm_t)
-+		')
-+
- 	')
- 
- 	optional_policy(`dmidecode',`
-@@ -347,6 +357,9 @@
+@@ -354,6 +358,9 @@
  			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
@@ -1059,10 +439,10 @@
  		', `
  			selinux_set_enforce_mode(sysadm_t)
  			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.14/Rules.modular
---- nsaserefpolicy/Rules.modular	2006-01-26 16:54:24.000000000 -0500
-+++ serefpolicy-2.2.14/Rules.modular	2006-02-13 14:29:38.000000000 -0500
-@@ -81,7 +81,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.15/Rules.modular
+--- nsaserefpolicy/Rules.modular	2006-02-14 07:20:18.000000000 -0500
++++ serefpolicy-2.2.15/Rules.modular	2006-02-14 08:04:17.000000000 -0500
+@@ -83,7 +83,7 @@
  #
  $(BASE_PKG): tmp/base.mod $(BASE_FC)
  	@echo "Creating $(NAME) base module package"
@@ -1071,3 +451,29 @@
  
  tmp/base.mod: base.conf
  	@echo "Compiling $(NAME) base module"
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.15/support/Makefile.devel
+--- nsaserefpolicy/support/Makefile.devel	2006-02-10 17:05:19.000000000 -0500
++++ serefpolicy-2.2.15/support/Makefile.devel	2006-02-14 08:41:26.000000000 -0500
+@@ -1,3 +1,6 @@
++# installation paths
++SHAREDIR := $(PREFIX)/share/selinux
++HEADERDIR := $(SHAREDIR)/refpolicy/include
+ 
+ include $(HEADERDIR)/build.conf
+ 
+@@ -19,8 +22,13 @@
+ PYTHON ?= python
+ 
+ # set default build options if missing
+-TYPE ?= strict
+-NAME ?= $(TYPE)
++NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
++MLSENABLED := $(shell cat /selinux/mls)
++ifeq ($(MLSENABLED),1)
++MCSFLAG=-mcs
++endif
++
++TYPE ?= $(NAME)${MCSFLAG}
+ DIRECT_INITRC ?= n
+ POLY ?= n
+ QUIET ?= y


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- selinux-policy.spec	13 Feb 2006 19:51:43 -0000	1.106
+++ selinux-policy.spec	14 Feb 2006 17:11:59 -0000	1.107
@@ -5,8 +5,8 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.14
-Release: 2
+Version: 2.2.15
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -24,10 +24,9 @@
 Source11: seusers-strict
 Source12: setrans-strict.conf
 Source13: policygentool
-Source14: Makefile.devel
-Source15: users_extra-targeted
-Source16: users_extra-strict
-Source17: users_extra-mls
+Source14: users_extra-targeted
+Source15: users_extra-strict
+Source16: users_extra-mls
 
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/serefpolicy-buildroot
@@ -179,7 +178,7 @@
 make 
 make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
-install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
+ln -sf ./include/Makefile ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -298,6 +297,9 @@
 
 %changelog
 
+* Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-1
+- Update to upsteam
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 2.2.14-2
 - Add users_extra files
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	13 Feb 2006 15:55:10 -0000	1.42
+++ sources	14 Feb 2006 17:11:59 -0000	1.43
@@ -1 +1 @@
-7b0c1f6438c0be1d7fce5c8307784e86  serefpolicy-2.2.14.tgz
+6018f8b9cf975dadf25e4051d0ed36d4  serefpolicy-2.2.15.tgz



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:21:45 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.136,1.137
Message-ID: <200602141721.k1EHLjPj001836@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- cman-kernel.spec	13 Feb 2006 19:23:45 -0000	1.136
+++ cman-kernel.spec	14 Feb 2006 17:21:42 -0000	1.137
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1941_FC5
+%define kernel_version 2.6.15-1.1948_FC5
 %define subversion 20051219.162641.FC5
  
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.4
+Release: 20051219.162641.FC5.11.5
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:21:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:21:55 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.123,1.124
Message-ID: <200602141721.k1EHLttM001984@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gnbd-kernel.spec	13 Feb 2006 22:16:00 -0000	1.123
+++ gnbd-kernel.spec	14 Feb 2006 17:21:53 -0000	1.124
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1941_FC5
+%define kernel_version 2.6.15-1.1948_FC5
 %define subversion 2
 
 %ifnarch i686



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:22:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:22:06 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.110,1.111
Message-ID: <200602141722.k1EHM6w0002113@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- dlm-kernel.spec	13 Feb 2006 19:29:46 -0000	1.110
+++ dlm-kernel.spec	14 Feb 2006 17:22:04 -0000	1.111
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1941_FC5
+%define kernel_version 2.6.15-1.1948_FC5
 %define subversion 20051219.162641.FC5
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.3
+Release: 20051219.162641.FC5.9.4
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:22:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:22:19 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.130,1.131
Message-ID: <200602141722.k1EHMIHS002246@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- GFS-kernel.spec	13 Feb 2006 22:51:15 -0000	1.130
+++ GFS-kernel.spec	14 Feb 2006 17:22:15 -0000	1.131
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1941_FC5
+%define kernel_version 2.6.15-1.1948_FC5
 %define subversion 2
 
 %ifnarch i686



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:24:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:24:10 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.124,1.125
Message-ID: <200602141724.k1EHOACT003182@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	gnbd-kernel.spec 
Log Message:
Added FC5 to release tag.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gnbd-kernel.spec	14 Feb 2006 17:21:53 -0000	1.124
+++ gnbd-kernel.spec	14 Feb 2006 17:24:07 -0000	1.125
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 4
+Release: 5.FC5.0
 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  Tue Feb 14 17:24:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:24:41 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.131,1.132
Message-ID: <200602141724.k1EHOfvP003448@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	GFS-kernel.spec 
Log Message:
Added FC5 to release tag.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- GFS-kernel.spec	14 Feb 2006 17:22:15 -0000	1.131
+++ GFS-kernel.spec	14 Feb 2006 17:24:38 -0000	1.132
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 4
+Release: 5.FC5.0
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:37:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:37:55 -0500
Subject: rpms/gnbd-kernel/devel .cvsignore, 1.15, 1.16 gnbd-kernel.spec,
	1.125, 1.126 sources, 1.18, 1.19
Message-ID: <200602141737.k1EHbtdq006853@cvs.devel.redhat.com>

Author: cfeist

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

Modified Files:
	.cvsignore gnbd-kernel.spec sources 
Log Message:
Include the proper sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	13 Feb 2006 22:16:00 -0000	1.15
+++ .cvsignore	14 Feb 2006 17:37:52 -0000	1.16
@@ -1 +1 @@
-gfs-kernel-2.6.15-2.tar.gz
+gnbd-kernel-2.6.15-2.tar.gz


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gnbd-kernel.spec	14 Feb 2006 17:24:07 -0000	1.125
+++ gnbd-kernel.spec	14 Feb 2006 17:37:52 -0000	1.126
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.0
+Release: 5.FC5.1
 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	13 Feb 2006 22:16:00 -0000	1.18
+++ sources	14 Feb 2006 17:37:52 -0000	1.19
@@ -1 +1 @@
-46401c7480479923790bdcb500e4d293  gfs-kernel-2.6.15-2.tar.gz
+767a3028d0d3c574db9f4a59616a9650  gnbd-kernel-2.6.15-2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:52:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:52:34 -0500
Subject: rpms/hplip/FC-4 hplip.spec, 1.26, 1.27 sources, 1.5,
	1.6 hplip-0.9.5-2.patch, 1.1, NONE hplip-0.9.7-2.patch, 1.1,
	NONE hplip-compile.patch, 1.1, NONE
Message-ID: <200602141752.k1EHqYE4025808@cvs.devel.redhat.com>

Author: twaugh

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

Modified Files:
	hplip.spec sources 
Removed Files:
	hplip-0.9.5-2.patch hplip-0.9.7-2.patch hplip-compile.patch 
Log Message:
* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-3.2
- 0.9.8 (bug #181493).



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-4/hplip.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hplip.spec	23 Dec 2005 09:29:06 -0000	1.26
+++ hplip.spec	14 Feb 2006 17:52:32 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.7
-Release: 4.2
+Version: 0.9.8
+Release: 3.2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.131.3
@@ -11,7 +11,7 @@
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-0.9.7-2.patch
+Patch4: hplip-0.9.8-3.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -64,11 +64,11 @@
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply patch 0.9.7-2
-%patch4 -p1 -b .0.9.7-2
+# Apply patch 0.9.8-3
+%patch4 -p1 -b .0.9.8-3
 
 %build
-%configure
+%configure --disable-foomatic-install --disable-cups-install
 make
 
 %install
@@ -105,6 +105,10 @@
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
+# Don't package hpfax yet.
+rm -f %{buildroot}%{_libdir}/cups/backend/hpfax
+rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax*
+
 %clean
 rm -rf %{buildroot}
 
@@ -152,6 +156,9 @@
 fi
 
 %changelog
+* Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-3.2
+- 0.9.8 (bug #181493).
+
 * Fri Dec 23 2005 Tim Waugh <twaugh at redhat.com> 0.9.7-4.2
 - Fixed system-config-printer conflict.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2005 09:17:13 -0000	1.5
+++ sources	14 Feb 2006 17:52:32 -0000	1.6
@@ -1 +1 @@
-d2ee27d7c347f549306a880561c5030a  hplip-0.9.7.tar.gz
+3eae08ec7dbecdc03e7972b132dfdde6  hplip-0.9.8.tar.gz


--- hplip-0.9.5-2.patch DELETED ---


--- hplip-0.9.7-2.patch DELETED ---


--- hplip-compile.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 17:54:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 12:54:13 -0500
Subject: rpms/hplip/FC-4 hplip-0.9.8-3.patch,NONE,1.1
Message-ID: <200602141754.k1EHsDYL026631@cvs.devel.redhat.com>

Author: twaugh

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

Added Files:
	hplip-0.9.8-3.patch 
Log Message:
Add patch

hplip-0.9.8-3.patch:
 ChangeLog                    |   13 ++
 Makefile.am                  |   13 +-
 base/device.py               |  248 +++++++++++++++++++++----------------------
 base/status.py               |  113 +++++++++----------
 data/xml/HPLIP-02-2006.xml   |   83 --------------
 hplip_readme.html            |   15 --
 prnt/hpijs/Makefile.am       |    4 
 prnt/hpijs/hpijs_readme.html |    3 
 8 files changed, 206 insertions(+), 286 deletions(-)

--- NEW FILE hplip-0.9.8-3.patch ---
diff -uNr hplip-0.9.8.old/base/device.py hplip-0.9.8.new/base/device.py
--- hplip-0.9.8.old/base/device.py	2006-01-27 14:14:45.000000000 -0800
+++ hplip-0.9.8.new/base/device.py	2006-02-06 13:49:33.000000000 -0800
@@ -438,8 +438,6 @@
         self.panel_check = True
         self.io_state = IO_STATE_HP_READY
         self.is_local = isLocal(self.bus)
-        self.dev_file = ''
-        self.serial = ''
 
         self.supported = False
 
@@ -829,11 +827,12 @@
                 log.error("Error getting 3-bit status.")
                 raise Error(ERROR_DEVICE_IO_ERROR)
 
-            try:
-                self.getDeviceID()
-            except Error, e:
-                log.error("Error getting device ID.")
-                raise Error(ERROR_DEVICE_IO_ERROR)
+            if self.tech_type in (TECH_TYPE_MONO_INK, TECH_TYPE_COLOR_INK):
+                try:
+                    self.getDeviceID()
+                except Error, e:
+                    log.error("Error getting device ID.")
+                    raise Error(ERROR_DEVICE_IO_ERROR)
 
             try:
                 self.getDevFile()
@@ -868,102 +867,101 @@
 
             status_block = {}
 
+            if status_type == STATUS_TYPE_NONE:
+                log.warn("No status available for device.")
+                status_block = {'status-code' : STATUS_PRINTER_IDLE}
+
+            elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
+                log.debug("Type 1/2 (S: or VSTATUS:) status")
+                status_block = status.parseStatus(self.deviceID)
+
+            elif status_type == STATUS_TYPE_LJ:
+                log.debug("Type 3 LaserJet status")
+                status_block = status.StatusType3(self, self.deviceID)
+
+            elif status_type == STATUS_TYPE_S_W_BATTERY:
+                log.debug("Type 4 S: status with battery check")
+                status_block = status.parseStatus(self.deviceID)
+                status.BatteryCheck(self, status_block)
+
+            else:
+                log.error("Unimplemented status type: %d" % status_type)
+
+            if status_block:
+                log.debug(status_block)
+                self.dq.update(status_block)
+                try:
+                    status_block['agents']
+                except KeyError:
+                    pass
+                else:
+                    agents = status_block['agents']
+                    del self.dq['agents']
+
+            
+            status_code = self.dq.get('status-code', STATUS_UNKNOWN)
+            
+            if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
+                tx_active, rx_active = status.getFaxStatus(self)
+                
+                if tx_active:
+                    status_code = STATUS_FAX_TX_ACTIVE
+                elif rx_active:
+                    status_code = STATUS_FAX_RX_ACTIVE
+                    
+    
             try:
-                if status_type == STATUS_TYPE_NONE:
-                    log.warn("No status available for device.")
-                    status_block = {'status-code' : STATUS_PRINTER_IDLE}
-    
-                elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
-                    log.debug("Type 1/2 (S: or VSTATUS:) status")
-                    status_block = status.parseStatus(self.deviceID)
-    
-                elif status_type == STATUS_TYPE_LJ:
-                    log.debug("Type 3 LaserJet status")
-                    status_block = status.StatusType3(self, self.deviceID)
-    
-                elif status_type == STATUS_TYPE_S_W_BATTERY:
-                    log.debug("Type 4 S: status with battery check")
-                    status_block = status.parseStatus(self.deviceID)
-                    status.BatteryCheck(self, status_block)
+                self.dq.update({'status-desc' : self.queryString(status_code),
+                                'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
+                                })
+
+            except (KeyError, Error):
+                self.dq.update({'status-desc' : '',
+                                'error-state' : ERROR_STATE_CLEAR,
+                                })
     
-                else:
-                    log.error("Unimplemented status type: %d" % status_type)
+            self.sendEvent(status_code)
+
+            if not quick:
+                r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
     
-                if status_block:
-                    log.debug(status_block)
-                    self.dq.update(status_block)
-                    try:
-                        status_block['agents']
-                    except KeyError:
-                        pass
-                    else:
-                        agents = status_block['agents']
-                        del self.dq['agents']
+                if status_type != STATUS_TYPE_NONE:
     
-                
-                status_code = self.dq.get('status-code', STATUS_UNKNOWN)
-                
-                if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
-                    tx_active, rx_active = status.getFaxStatus(self)
-                    
-                    if tx_active:
-                        status_code = STATUS_FAX_TX_ACTIVE
-                    elif rx_active:
-                        status_code = STATUS_FAX_RX_ACTIVE
-                        
-        
-                try:
-                    self.dq.update({'status-desc' : self.queryString(status_code),
-                                    'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
-                                    })
-    
-                except (KeyError, Error):
-                    self.dq.update({'status-desc' : '',
-                                    'error-state' : ERROR_STATE_CLEAR,
-                                    })
-        
-                self.sendEvent(status_code)
+                    if self.panel_check:
+                        self.panel_check = bool(self.mq.get('panel-check-type', 0))
     
-                if not quick:
-                    r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
-        
-                    if status_type != STATUS_TYPE_NONE:
-        
-                        if self.panel_check:
-                            self.panel_check = bool(self.mq.get('panel-check-type', 0))
-        
-                        if self.panel_check and status_type != STATUS_TYPE_NONE:
-                            #try:
+                    if self.panel_check and status_type != STATUS_TYPE_NONE:
+                        try:
                             self.panel_check, line1, line2 = status.PanelCheck(self)
-                            #finally:
-                            #    self.closePML()
-        
-                            self.dq.update({'panel': int(self.panel_check),
-                                              'panel-line1': line1,
-                                              'panel-line2': line2,})
-        
-        
-                        if r_type > 0:
+                        finally:
+                            self.closePML()
+    
+                        self.dq.update({'panel': int(self.panel_check),
+                                          'panel-line1': line1,
+                                          'panel-line2': line2,})
+    
+    
+                    if r_type > 0:
+                        if self.r_values is None:
+                            fields, data, result_code = \
+                                self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
+                            
+                            if result_code == ERROR_SUCCESS and data:
+                                try:
+                                    r_value = int(data.strip())
+                                except:
+                                    pass
+                                else:
+                                    log.debug("r_value=%d" % r_value)
+                                    r_value_str = str(r_value)
+                                    r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                    rg, rr = r_value_str[:3], r_value_str[3:]
+                                    r_value = int(rr)
+                                    self.r_values = r_value, r_value_str, rg, rr
+                                    
                             if self.r_values is None:
-                                fields, data, result_code = \
-                                    self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
-                                
-                                if result_code == ERROR_SUCCESS and data:
+                                if status_type ==  STATUS_TYPE_S and self.is_local:
                                     try:
-                                        r_value = int(data.strip())
-                                    except:
-                                        pass
-                                    else:
-                                        log.debug("r_value=%d" % r_value)
-                                        r_value_str = str(r_value)
-                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                        rg, rr = r_value_str[:3], r_value_str[3:]
-                                        r_value = int(rr)
-                                        self.r_values = r_value, r_value_str, rg, rr
-                                        
-                                if self.r_values is None:
-                                    if status_type ==  STATUS_TYPE_S:
-                                        #try:
                                         try:
                                             r_value = self.getDynamicCounter(140)
             
@@ -984,42 +982,40 @@
                                         except Error:
                                             log.error("Error attempting to read r-value (1).")
                                             r_value = 0
-                
-                                        #finally:
-                                        #    self.closePrint()
-                                    
-                                    elif status_type == STATUS_TYPE_S_SNMP:
+            
+                                    finally:
+                                        self.closePrint()
+                                
+                                elif status_type == STATUS_TYPE_S_SNMP:
+                                    try:
                                         result_code, r_value = self.getPML(pml.OID_R_SETTING)
-                                        #self.closePML()
+                                    finally:
+                                        self.closePML()
+                                    
+                                    if r_value is not None:
+                                        log.debug("r_value=%d" % r_value)
+                                        r_value_str = str(r_value)
+                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                        rg, rr = r_value_str[:3], r_value_str[3:]
+                                        r_value = int(rr)
+                                        self.r_values = r_value, r_value_str, rg, rr
                                         
-                                        if r_value is not None:
-                                            log.debug("r_value=%d" % r_value)
-                                            r_value_str = str(r_value)
-                                            r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                            rg, rr = r_value_str[:3], r_value_str[3:]
-                                            r_value = int(rr)
-                                            self.r_values = r_value, r_value_str, rg, rr
-                                            
-                                            fields, data, result_code = \
-                                                self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
-                                        else:
-                                            r_value = 0
-                                            
+                                        fields, data, result_code = \
+                                            self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
+                                    else:
+                                        r_value = 0
                                         
-                            else:
-                                r_value, r_value_str, rg, rr = self.r_values
-        
-                    self.dq.update({'r'  : r_value,
-                                    'rs' : r_value_str,
-                                    'rg' : rg,
-                                    'rr' : rr,
-                                  })
-            finally:
-                self.closePML()
-                self.closePrint()
+                                    
+                        else:
+                            r_value, r_value_str, rg, rr = self.r_values
+    
+                self.dq.update({'r'  : r_value,
+                                'rs' : r_value_str,
+                                'rg' : rg,
+                                'rr' : rr,
+                              })
             
             if not quick:
-                
                 a = 1
                 while True:
                     mq_agent_kind = self.mq.get('r%d-agent%d-kind' % (r_value, a), 0)
diff -uNr hplip-0.9.8.old/base/status.py hplip-0.9.8.new/base/status.py
--- hplip-0.9.8.old/base/status.py	2006-01-24 10:35:53.000000000 -0800
+++ hplip-0.9.8.new/base/status.py	2006-02-06 13:49:35.000000000 -0800
@@ -668,64 +668,64 @@
     # Assumes dev is already open (i.e., dev.io_state==IO_STATE_HP_OPEN)
     try_dynamic_counters = False
     try:
-        #channel = dev.openChannel( 'HP-MESSAGE' )
-        dev.openPML()
-    except Error:
-        log.error("PML channel open failed.")
-        try_dynamic_counters = True
-    else:
-        result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
-        result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
-
-        if battery_level is not None and \
-            power_mode is not None:
-
-            if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
-                battery_level >= 0:
-
-                for x in BATTERY_PML_TRIGGER_MAP:
-                    if x[0] >= battery_level > x[1]:
-                        battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
-                        break
-
-                if power_mode & pml.POWER_MODE_CHARGING:
-                    agent_health = AGENT_HEALTH_CHARGING
-
-                elif power_mode & pml.POWER_MODE_DISCHARGING:
-                    agent_health = AGENT_HEALTH_DISCHARGING
-
+        try:
+            dev.openPML()
+        except Error:
+            log.error("PML channel open failed.")
+            try_dynamic_counters = True
+        else:
+            result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
+            result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
+    
+            if battery_level is not None and \
+                power_mode is not None:
+    
+                if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
+                    battery_level >= 0:
+    
+                    for x in BATTERY_PML_TRIGGER_MAP:
+                        if x[0] >= battery_level > x[1]:
+                            battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
+                            break
+    
+                    if power_mode & pml.POWER_MODE_CHARGING:
+                        agent_health = AGENT_HEALTH_CHARGING
+    
+                    elif power_mode & pml.POWER_MODE_DISCHARGING:
+                        agent_health = AGENT_HEALTH_DISCHARGING
+    
+                    else:
+                        agent_health = AGENT_HEALTH_OK
+    
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : agent_health,
+                                                    'level'  : battery_level,
+                                                    'level-trigger' : battery_trigger_level,
+                                                    })
                 else:
-                    agent_health = AGENT_HEALTH_OK
-
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : agent_health,
-                                                'level'  : battery_level,
-                                                'level-trigger' : battery_trigger_level,
-                                                })
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : AGENT_HEALTH_UNKNOWN,
+                                                    'level'  : 0,
+                                                    'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
+                                                    })
+    
             else:
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : AGENT_HEALTH_UNKNOWN,
-                                                'level'  : 0,
-                                                'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
-                                                })
-
-        else:
-            try_dynamic_counters = True
-
-        #dev.closeChannel( 'HP-MESSAGE' )
-        #dev.closePML()
-
-        if try_dynamic_counters:
+                try_dynamic_counters = True
+    
+    finally:
+        dev.closePML()
 
+    if try_dynamic_counters:
+        try:
             try:
                 battery_health = dev.getDynamicCounter(200)
                 battery_trigger_level = dev.getDynamicCounter(201)
                 battery_level = dev.getDynamicCounter(202)
-
+    
                 status_block['agents'].append({
                                                 'kind'   : AGENT_KIND_INT_BATTERY,
                                                 'type'   : AGENT_TYPE_UNSPECIFIED,
@@ -741,7 +741,8 @@
                                                 'level'  : 0,
                                                 'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
                                                 })
-
+        finally:
+            dev.closePrint()
 
 # this works for 2 pen products that allow 1 or 2 pens inserted
 # from: k, kcm, cmy, ggk
@@ -785,8 +786,8 @@
             
 def getFaxStatus(dev):
     tx_active, rx_active = False, False
-    #try:
-    if 1:
+
+    try:
         dev.openPML()
     
         result_code, tx_state = dev.getPML(pml.OID_FAXJOB_TX_STATUS)
@@ -801,7 +802,7 @@
             if rx_state not in (pml.FAXJOB_RX_STATUS_IDLE, pml.FAXJOB_RX_STATUS_DONE):
                 rx_active = True
     
-    #finally:
-    #    dev.closePML()
+    finally:
+        dev.closePML()
         
     return tx_active, rx_active
diff -uNr hplip-0.9.8.old/ChangeLog hplip-0.9.8.new/ChangeLog
--- hplip-0.9.8.old/ChangeLog	2006-01-31 12:00:08.000000000 -0800
+++ hplip-0.9.8.new/ChangeLog	2006-02-06 13:54:33.000000000 -0800
@@ -1,3 +1,16 @@
+2006-02-06 dsuffield
+    * Created hplip-0.9.8-3.patch
+	
+2006-02-06 syie
+    * Remove Jedi from models.xml
+
+2006-02-06 dwelch
+    * Fixed defect 832 (An r-value (1) error occurs while launching toolbox.) [aka, the RAW mode defect as reported by Henrique de Moraes Holschuh (Debian)]
+
+2006-02-06 dsuffield
+    * Applied hplip-0.9.8-2.patch.
+    * Removed Jedi for readme files.
+
 2006-01-30 dsuffield
     * Release 0.9.8.22 (public release 0.9.8)
 	
diff -uNr hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml
--- hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml	2006-01-31 11:57:04.000000000 -0800
+++ hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml	2006-02-06 13:07:03.000000000 -0800
@@ -24,7 +24,7 @@
 This file automatically generated by model_editor.py.
 Please do not hand edit this file.
 
-Last written on Tue, 31 Jan 2006 12:02:06 by syie
+Last written on Mon, 06 Feb 2006 13:07:03 by dsuffiel
 using model_editor version 6.2.
 -->
 
@@ -168,87 +168,6 @@
     <r type="1"/>
 </model>
 
-<model name="HP_Color_LaserJet_2605">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dtn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
 <model name="HP_LaserJet_3050">
     <id></id>
     <icon>hp_LaserJet_3015.png</icon>
diff -uNr hplip-0.9.8.old/hplip_readme.html hplip-0.9.8.new/hplip_readme.html
--- hplip-0.9.8.old/hplip_readme.html	2006-01-31 12:02:53.000000000 -0800
+++ hplip-0.9.8.new/hplip_readme.html	2006-02-06 13:57:14.000000000 -0800
@@ -890,18 +890,6 @@
 <td class=xl19 width=144 style='width:108pt'><b>Services/Status</b></td>
 </tr>
 <tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dtn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
 <td height=17 style='height:12.75pt'>Color_LaserJet_3000</td>
 <td>No</td><td>Yes</td><td>Yes</td><td>LJColor</td>
 <td>No</td><td>No</td><td>No</td>
@@ -1793,7 +1781,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -2563,7 +2550,7 @@
 &#169 2004-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPLIP 0.9.8, last updated January 27, 2006
+HPLIP 0.9.8, last updated February 6, 2006
 </font>
 </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am	2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -20,8 +20,10 @@
 dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
     sendfax.py setup.py
 
-# hp backend.
 cupsdir = $(CUPS_BACKEND_PATH)
+cupsppddir = $(CUPS_PPD_PATH)
+
+# hp backend.
 cups_PROGRAMS = hp
 hp_SOURCES = backend/hp/hp.c 
 hp_LDADD = libhplip-api.la
@@ -232,7 +234,7 @@
 #
 #       Edit hpiod.conf in destdir.
 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(CUPS_PPD_PATH)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(cupsppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
 #
 #       Edit hpiod.sh in destdir.
 	sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
@@ -260,12 +262,15 @@
 	   cp -f data/xml/unreleased/*.xml $(DESTDIR)$(hplipdir)/data/xml/; \
 	fi
 #
-#       Install fax support, let hpijs install ppd for now.
+#       Install fax support.
 	mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax 
 	if [ "$(rpm_install)" = "no" ]; then \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsdir); \
 	   $(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsppddir)/model; \
+	   $(INSTALL_SCRIPT) $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd $(DESTDIR)$(cupsppddir)/model; \
+	   gzip -f $(DESTDIR)$(cupsppddir)/model/HP-Fax-hplip.ppd; \
 	fi
-	cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
 
 #
 # Add prerequisites for testing (or building?) "make install DESTDIR=/build".
diff -uNr hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html
--- hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html	2006-01-27 16:19:10.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html	2006-02-06 13:45:38.000000000 -0800
@@ -3279,7 +3279,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -4141,7 +4140,7 @@
 &#169 2001-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPIJS 2.1.8, last updated January 27, 2006
+HPIJS 2.1.8, last updated February 6, 2006
 </font>
  </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/prnt/hpijs/Makefile.am hplip-0.9.8.new/prnt/hpijs/Makefile.am
--- hplip-0.9.8.old/prnt/hpijs/Makefile.am	2006-01-24 12:19:06.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -80,8 +80,8 @@
 	rm -f $(DESTDIR)$(ppddir)/hp*.ppd*
 
 install-cups:
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
 	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
 	$(mkinstalldirs) $(DESTDIR)$(CUPS_PPD_PATH)
 	ln -s $(datadir)/ppd $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:20:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:20:29 -0500
Subject: rpms/dhcp/devel dhcp-3.0.3-bz181482.patch,NONE,1.1
Message-ID: <200602141820.k1EIKTdk015017@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14989

Added Files:
	dhcp-3.0.3-bz181482.patch 
Log Message:
fix bug 181482: dhclient-script not updating resolv.conf on RENEW ($new_domain_servers -> $new_domain_name_servers !)

dhcp-3.0.3-bz181482.patch:
 linux |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.3-bz181482.patch ---
--- dhcp-3.0.3/client/scripts/linux.bz181482	2006-02-14 12:51:33.000000000 -0500
+++ dhcp-3.0.3/client/scripts/linux	2006-02-14 12:53:31.000000000 -0500
@@ -45,10 +45,10 @@
       return 
   fi
 
-  if [ x$reason == xRENEW ]; then 
-      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
-	  return
-      fi
+  if [ x$reason == xRENEW ] &&
+     [ "$new_domain_name" == "$old_domain_name" ] && 
+     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
+      return;
   fi
 
   if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:23:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:23:48 -0500
Subject: rpms/dhcp/devel dhcp.spec,1.85,1.86
Message-ID: <200602141823.k1EINmaL016582@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16549

Modified Files:
	dhcp.spec 
Log Message:
fix bug 181482: resolv.conf not updated on RENEW


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- dhcp.spec	11 Feb 2006 02:25:34 -0000	1.85
+++ dhcp.spec	14 Feb 2006 18:23:46 -0000	1.86
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 21.1.1
+Release: 22
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -75,6 +75,7 @@
 Patch168: dhcp-3.0.3-bz176270.patch
 Patch169: dhcp-3.0.3-bz176615.patch
 Patch170: dhcp-3.0.3-bz177845.patch
+Patch171: dhcp-3.0.3-bz181482.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -192,6 +193,7 @@
 %patch168 -p1 -b .bz176270
 %patch169 -p1 -b .bz176615
 %patch170 -p1 -b .bz177845
+%patch171 -p1 -b .bz181482
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcpd
@@ -325,6 +327,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-22
+- fix bug 181482: resolv.conf not updated on RENEW :
+  since dhcp-3.0.1rc12-RHScript.patch: "$new_domain_servers" should have
+  been "$new_domain_name_servers" :-(
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 11:3.0.3-21.1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:37:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:37:05 -0500
Subject: rpms/dhcp/FC-4 dhcp-3.0.2-bz181482.patch,NONE,1.1
Message-ID: <200602141837.k1EIb5bI013113@cvs.devel.redhat.com>

Author: jvdias

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

Added Files:
	dhcp-3.0.2-bz181482.patch 
Log Message:
fix bug 181482: dhclient-script not updating resolv.conf on RENEW ($new_domain_servers -> $new_domain_name_servers !)

dhcp-3.0.2-bz181482.patch:
 linux |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.2-bz181482.patch ---
--- dhcp-3.0.2/client/scripts/linux.bz181482	2006-02-14 13:30:39.000000000 -0500
+++ dhcp-3.0.2/client/scripts/linux	2006-02-14 13:33:06.000000000 -0500
@@ -45,10 +45,10 @@
       return 
   fi
 
-  if [ x$reason == xRENEW ]; then 
-      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
-	  return
-      fi
+  if [ x$reason == xRENEW ] &&
+     [ "$new_domain_name" == "$old_domain_name" ] && 
+     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
+      return;
   fi
 
   if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:37:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:37:27 -0500
Subject: rpms/dhcp/FC-4 dhcp.spec,1.68,1.69
Message-ID: <200602141837.k1EIbRhd013135@cvs.devel.redhat.com>

Author: jvdias

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

Modified Files:
	dhcp.spec 
Log Message:
fix bug 181482: resolv.conf not updated on RENEW


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- dhcp.spec	16 Jan 2006 21:32:25 -0000	1.68
+++ dhcp.spec	14 Feb 2006 18:37:17 -0000	1.69
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.2
-Release: 30.FC4
+Release: 32.FC4
 Epoch:   10
 License: distributable
 Group: System Environment/Daemons
@@ -69,6 +69,7 @@
 Patch162: dhcp-3.0.2-bz176270.patch
 Patch163: dhcp-3.0.2-bz176615.patch
 Patch164: dhcp-3.0.2-bz177845.patch
+Patch165: dhcp-3.0.2-bz181482.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -179,6 +180,7 @@
 %patch162 -p1 -b .bz176270
 %patch163 -p1 -b .bz176615
 %patch164 -p1 -b .bz177845
+%patch165 -p1 -b .bz181482
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcp
@@ -309,6 +311,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-32
+- fix bug 181482: resolv.conf not updated on RENEW :
+  since dhcp-3.0.1rc12-RHScript.patch: "$new_domain_servers" should have
+  been "$new_domain_name_servers" :-(
+
 * Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-30
 - fix bug 177845: allow default router to be same as ip-address
 - fix bug 176615: fix DDNS updates when client sends host-name with trailing NUL                  



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:41:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:41:38 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.106, 1.107 kudzu.spec, 1.121,
	1.122 sources, 1.120, 1.121
Message-ID: <200602141841.k1EIfcMr013227@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13211

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- .cvsignore	14 Feb 2006 04:21:36 -0000	1.106
+++ .cvsignore	14 Feb 2006 18:41:36 -0000	1.107
@@ -1 +1 @@
-kudzu-1.2.28.tar.gz
+kudzu-1.2.29.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kudzu.spec	14 Feb 2006 04:21:36 -0000	1.121
+++ kudzu.spec	14 Feb 2006 18:41:36 -0000	1.122
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.28
+Version: 1.2.29
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Feb 14 2006 Bill Nottingham <notting at redhat.com> - 1.2.29-1
+- silence!
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 1.2.28-1
 - vbe/edid probing on x86_64 via x86emu - thanks to Matthew Garrett
   & Tollef Fog Heen


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- sources	14 Feb 2006 04:42:52 -0000	1.120
+++ sources	14 Feb 2006 18:41:36 -0000	1.121
@@ -1 +1 @@
-7038a1d182f7f46a11b349ef3207d4b6  kudzu-1.2.28.tar.gz
+4253c8846b4f07dc508ed4d2c3ff2c83  kudzu-1.2.29.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:49:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:49:18 -0500
Subject: rpms/dhcp/FC-3 dhcp-3.0.1-bz160655_obz15293.patch, NONE,
	1.1 dhcp-3.0.1-bz167028-ibm-unicast-bootp.patch, NONE,
	1.1 dhcp-3.0.1-bz173324.patch, NONE,
	1.1 dhcp-3.0.1-bz176270.patch, NONE,
	1.1 dhcp-3.0.1-bz176615.patch, NONE,
	1.1 dhcp-3.0.1-bz177845.patch, NONE,
	1.1 dhcp-3.0.1-dhclient_routes.patch, NONE,
	1.1 dhcp-3.0.1-dhclient-script-fixes.patch, NONE, 1.1
Message-ID: <200602141849.k1EInIll025800@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25783

Added Files:
	dhcp-3.0.1-bz160655_obz15293.patch 
	dhcp-3.0.1-bz167028-ibm-unicast-bootp.patch 
	dhcp-3.0.1-bz173324.patch dhcp-3.0.1-bz176270.patch 
	dhcp-3.0.1-bz176615.patch dhcp-3.0.1-bz177845.patch 
	dhcp-3.0.1-dhclient_routes.patch 
	dhcp-3.0.1-dhclient-script-fixes.patch 
Log Message:
import fixes from RHEL-4

dhcp-3.0.1-bz160655_obz15293.patch:
 common/options.c |  178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 includes/dhcpd.h |    3 
 server/dhcp.c    |   19 ++---
 3 files changed, 190 insertions(+), 10 deletions(-)

--- NEW FILE dhcp-3.0.1-bz160655_obz15293.patch ---
--- dhcp-3.0.1/server/dhcp.c.bz160655_obz15293	2005-11-18 17:39:56.000000000 -0500
+++ dhcp-3.0.1/server/dhcp.c	2005-11-18 17:39:56.000000000 -0500
@@ -188,17 +188,16 @@
 	}
       nolease:
 
-	/* Classify the client. */
-	if ((oc = lookup_option (&dhcp_universe, packet -> options,
-				 DHO_HOST_NAME))) {
-		if (!oc -> expression)
-			while (oc -> data.len &&
-			       oc -> data.data [oc -> data.len - 1] == 0) {
-				ms_nulltp = 1;
-				oc -> data.len--;
-			}
-	}
+ 	/* If a client null terminates options it sends, it probably
+ 	 * expects the server to reciprocate.
+ 	 */
+  	if ((oc = lookup_option (&dhcp_universe, packet -> options,
+  				 DHO_HOST_NAME))) {
+  		if (!oc -> expression)
+ 			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
+  	}
 
+	/* Classify the client. */	
 	classify_client (packet);
 
 	switch (packet -> packet_type) {
--- dhcp-3.0.1/includes/dhcpd.h.bz160655_obz15293	2005-11-18 17:39:56.000000000 -0500
+++ dhcp-3.0.1/includes/dhcpd.h	2005-11-18 17:41:49.000000000 -0500
@@ -187,6 +187,9 @@
 	struct expression *expression;
 	struct option *option;
 	struct data_string data;
+
+	#define OPTION_HAD_NULLS	0x00000001
+	u_int32_t flags;
 };
 
 struct option_state {
--- dhcp-3.0.1/common/options.c.bz160655_obz15293	2004-06-10 13:59:19.000000000 -0400
+++ dhcp-3.0.1/common/options.c	2005-11-18 17:39:56.000000000 -0500
@@ -958,6 +958,169 @@
 	return bufix;
 }
 
+/* Return true if the format string has a variable length text option
+ * ("t"), return false otherwise.
+ */
+
+int
+format_has_text(format)
+	const char *format;
+{
+	const char *p;
+/*	int retval = 0; */
+
+	p = format;
+	while (*p != '\0') {
+		switch (*p++) {
+		    case 'd':
+		    case 't':
+			return 1;
+
+			/* These symbols are arbitrary, not fixed or
+			 * determinable length...text options with them is
+			 * invalid.
+			 */
+		    case 'A':
+		    case 'a':
+		    case 'X':
+		    case 'x':
+			return 0;
+
+			/* 'E' is variable length, but not arbitrary...you
+			 * can find its length if you can find an END option.
+			 * N is one-byte in length but trails a name of a
+			 * space defining the enumeration values.  So treat
+			 * both the same - valid, fixed-length fields.
+			 */
+		    case 'E':
+		    case 'N':
+			/* Consume the space name. */
+			while ((*p != '\0') && (*p++ != '.'))
+				;
+			break;
+
+		    default:
+			break;
+		}
+	}
+
+	return 0;
+}
+
+/* Determine the minimum length of a DHCP option prior to any variable
+ * or inconsistent length formats, according to its configured format
+ * variable (and possibly from supplied option cache contents for variable
+ * length format symbols).
+ */
+
+int
+format_min_length(format, oc)
+	const char *format;
+	struct option_cache *oc;
+{
+	const char *p;
+	int min_len = 0;
+	int last_size = 0;
+
+	p = format;
+	while (*p != '\0') {
+		switch (*p++) {
+		    case 'I': /* IPv4 Address */
+		    case 'l': /* int32_t */
+		    case 'L': /* uint32_t */
+		    case 'T': /* Lease Time, uint32_t equivalent */
+			min_len += 4;
+			last_size = 4;
+			break;
+
+		    case 's': /* int16_t */
+		    case 'S': /* uint16_t */
+			min_len += 2;
+			last_size = 2;
+			break;
+
+		    case 'N': /* Enumeration in 1-byte values. */
+			/* Consume space name. */
+			while ((*p != '\0') && (*p++ != '.'))
+				;
+
+			/* Fall Through to handle as one-byte field */
+
+		    case 'b': /* int8_t */
+		    case 'B': /* uint8_t */
+		    case 'F': /* Flag that is always true. */
+		    case 'f': /* Flag */
+			min_len++;
+			last_size = 1;
+			break;
+
+		    case 'o': /* Last argument is optional. */
+			min_len -= last_size;
+		    case 'e': /* Encapsulation hint (there is an 'E' later). */
+			last_size = 0;
+			break;
+
+		    case 'E': /* Encapsulated options. */
+			/* Consume space name. */
+			while ((*p != '\0') && (*p++ != '.'))
+				;
+
+			/* Find an end option, or find that the encaps options
+			 * go all the way to the end (or beyond) of the data
+			 * portion of the option.
+			 */
+			last_size = 0;
+			while (min_len < oc->data.len) {
+				if (oc->data.data[min_len] == DHO_END) {
+					min_len++;
+					last_size++;
+					break;
+				} else if (oc->data.data[min_len] == DHO_PAD) {
+					min_len++;
+					last_size++;
+				} else if ((min_len + 1) < oc->data.len) {
+					min_len += oc->data.data[min_len+1]+2;
+					last_size += oc->data.data[min_len+1]+2;
+				} else {
+					/* Suboption length is out of bounds,
+					 * advance beyond the code/length pair
+					 * to trigger below error conditonal.
+					 */
+					min_len += 2;
+					last_size += 2;
+					break;
+				}
+			}
+
+			if (min_len > oc->data.len) {
+				log_error("format_min_length(%s): "
+					  "Encapsulated options exceed "
+					  "supplied buffer.", format);
+				return INT_MAX;
+			}
+
+			break;
+
+		    case 'd': /* "Domain name" */
+		    case 't': /* "ASCII Text" */
+		    case 'X': /* "ASCII or Hex Conditional */
+		    case 'x': /* "Hex" */
+		    case 'A': /* Array of all that precedes. */
+		    case 'a': /* Array of preceding symbol. */
+			return min_len;
+
+		    default:
+			/* No safe value is known. */
+			log_error("format_min_length(%s): No safe value "
+				  "for unknown format symbols.", format);
+			return INT_MAX;
+		}
+	}
+
+	return min_len;
+}
+
+
 /* Format the specified option so that a human can easily read it. */
 
 const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
@@ -1412,6 +1575,21 @@
 	
 	op -> option = option;
 
+	/* If this option is ultimately a text option, null determinate to
+	 * comply with RFC2132 section 2.  Mark a flag so this can be sensed
+	 * later to echo NULLs back to clients that supplied them (they
+	 * probably expect them).
+	 */
+	if (format_has_text(option->format)) {
+		int min_len = format_min_length(option->format, op);
+
+		while ((op->data.len > min_len) &&
+		       (op->data.data[op->data.len-1] == '\0')) {
+			op->data.len--;
+			op->flags |= OPTION_HAD_NULLS;
+		}
+	}
+
 	/* Now store the option. */
 	save_option (universe, options, op);
 

dhcp-3.0.1-bz167028-ibm-unicast-bootp.patch:
 bootp.c |   13 ++++++++++++-
 dhcp.c  |   38 ++++++++++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 9 deletions(-)

--- NEW FILE dhcp-3.0.1-bz167028-ibm-unicast-bootp.patch ---
--- dhcp-3.0.3/server/bootp.c.bz167028	2005-05-18 15:54:17.000000000 -0400
+++ dhcp-3.0.3/server/bootp.c	2005-11-15 12:04:29.000000000 -0500
@@ -62,6 +62,7 @@
 	char msgbuf [1024];
 	int ignorep;
 	int peer_has_leases = 0;
+	int norelay = 0;
 
 	if (packet -> raw -> op != BOOTREQUEST)
 		return;
@@ -77,7 +78,7 @@
 		 ? inet_ntoa (packet -> raw -> giaddr)
 		 : packet -> interface -> name);
 
-	if (!locate_network (packet)) {
+	if ((norelay = locate_network (packet)) == 0) {
 		log_info ("%s: network unknown", msgbuf);
 		return;
 	}
@@ -357,6 +358,16 @@
 					      from, &to, &hto);
 			goto out;
 		}
+	} else if (norelay == 2) {
+		to.sin_addr = raw.ciaddr;
+		to.sin_port = remote_port;
+		if (fallback_interface) {
+			result = send_packet (fallback_interface,
+					      (struct packet *)0,
+					      &raw, outgoing.packet_length,
+					      from, &to, &hto);
+			goto out;                
+		}
 
 	/* If it comes from a client that already knows its address
 	   and is not requesting a broadcast response, and we can
--- dhcp-3.0.3/server/dhcp.c.bz167028	2005-11-15 12:00:35.000000000 -0500
+++ dhcp-3.0.3/server/dhcp.c	2005-11-15 12:04:29.000000000 -0500
@@ -3787,6 +3787,7 @@
 	struct data_string data;
 	struct subnet *subnet = (struct subnet *)0;
 	struct option_cache *oc;
+	int norelay = 0;
 
 	/* See if there's a subnet selection option. */
 	oc = lookup_option (&dhcp_universe, packet -> options,
@@ -3796,12 +3797,27 @@
 	   from the interface, if there is one.   If not, fail. */
 	if (!oc && !packet -> raw -> giaddr.s_addr) {
 		if (packet -> interface -> shared_network) {
-			shared_network_reference
-				(&packet -> shared_network,
-				 packet -> interface -> shared_network, MDL);
-			return 1;
-		}
-		return 0;
+			struct in_addr any_addr;
+			any_addr.s_addr = INADDR_ANY;
+			if (!packet -> packet_type &&
+			    memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
+				struct iaddr cip;
+				memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
+				cip.len = 4;
+				if (!find_grouped_subnet(&subnet,
+				    packet -> interface -> shared_network, 
+				    cip, MDL)) 
+					norelay = 2;
+			}
+			if (!norelay) {
+				shared_network_reference
+					(&packet -> shared_network,
+					 packet -> interface -> shared_network,
+					 MDL);
+				return 1;
+			}
+		} else
+			return 0;
 	}
 
 	/* If there's an SSO, and it's valid, use it to figure out the
@@ -3823,7 +3839,10 @@
 		data_string_forget (&data, MDL);
 	} else {
 		ia.len = 4;
-		memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
+		if (norelay)
+			memcpy (ia.iabuf, &packet -> raw -> ciaddr, 4);
+		else
+			memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
 	}
 
 	/* If we know the subnet on which the IP address lives, use it. */
@@ -3831,7 +3850,10 @@
 		shared_network_reference (&packet -> shared_network,
 					  subnet -> shared_network, MDL);
 		subnet_dereference (&subnet, MDL);
-		return 1;
+		if (norelay)
+			return norelay;
+		else
+			return 1;
 	}
 
 	/* Otherwise, fail. */

dhcp-3.0.1-bz173324.patch:
 dispatch.c |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

--- NEW FILE dhcp-3.0.1-bz173324.patch ---
--- dhcp-3.0.1/omapip/dispatch.c.bz173324	2004-07-09 20:11:17.000000000 -0400
+++ dhcp-3.0.1/omapip/dispatch.c	2005-11-18 17:17:25.000000000 -0500
@@ -494,27 +494,44 @@
 	return ISC_R_NOTFOUND;
 }
 
+/* omapi_io_destroy (object, MDL);
+ *
+ *	Find the requsted IO [object] and remove it from the list of io
+ * states, causing the cleanup functions to destroy it.  Note that we must
+ * hold a reference on the object while moving its ->next reference and
+ * removing the reference in the chain to the target object...otherwise it
+ * may be cleaned up from under us.
+ */
 isc_result_t omapi_io_destroy (omapi_object_t *h, const char *file, int line)
 {
-	omapi_io_object_t *obj, *p, *last;
+	omapi_io_object_t *obj = NULL, *p, *last = NULL, **holder;
 
 	if (h -> type != omapi_type_io_object)
 		return ISC_R_INVALIDARG;
 	
-	obj = (omapi_io_object_t *)h;
-
 	/* remove from the list of I/O states */
 	for (p = omapi_io_states.next; p; p = p -> next) {
-		if (p == obj) {
-			omapi_io_dereference (&last -> next, MDL);
-			omapi_io_reference (&last -> next, p -> next, MDL);
-			omapi_io_dereference (&p, MDL);
-			break;
+		if (p == (omapi_io_object_t *)h) {
+			omapi_io_reference (&obj, p, MDL);
+
+			if (last)
+				holder = &last -> next;
+			else
+				holder = &omapi_io_states.next;
+
+			omapi_io_dereference (holder, MDL);
+
+			if (obj -> next) {
+				omapi_io_reference (holder, obj -> next, MDL);
+				omapi_io_dereference (&obj -> next, MDL);
+			}
+
+			return omapi_io_dereference (&obj, MDL);
 		}
 		last = p;
 	}
-		
-	return ISC_R_SUCCESS;
+
+	return ISC_R_NOTFOUND;
 }
 
 isc_result_t omapi_io_signal_handler (omapi_object_t *h,

dhcp-3.0.1-bz176270.patch:
 linux |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE dhcp-3.0.1-bz176270.patch ---
--- dhcp-3.0.1/client/scripts/linux.bz176270	2005-12-20 14:51:40.000000000 -0500
+++ dhcp-3.0.1/client/scripts/linux	2005-12-20 15:04:57.000000000 -0500
@@ -261,9 +261,13 @@
 	let i=0;
 	default_routers=()
 	for router in $new_routers; do
-	    if [ -z "$router" ] || [ `IFS=. ip2num $router` -le 0 ] || \
-	       [[ $router = *255* ]] || [[ "${default_routers[@]}" == *"$router"* ]]; 
-	    then
+	    added_router=0
+	    for r in ${default_routers[@]}; do
+		if [ "$r" == "$router" ]; then
+		    added_router=1;
+		fi;
+	    done
+	    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ "$router" = "$new_broadcast_address" ]]; then
 		continue;
 	    fi;
 	    default_routers=(${default_routers[@]} $router)

dhcp-3.0.1-bz176615.patch:
 dhcp.c |   11 +++++++++++
 1 files changed, 11 insertions(+)

--- NEW FILE dhcp-3.0.1-bz176615.patch ---
--- dhcp-3.0.1/server/dhcp.c.bz176615	2006-01-16 15:24:06.000000000 -0500
+++ dhcp-3.0.1/server/dhcp.c	2006-01-16 15:25:52.000000000 -0500
@@ -194,7 +194,18 @@
   	if ((oc = lookup_option (&dhcp_universe, packet -> options,
   				 DHO_HOST_NAME))) {
   		if (!oc -> expression)
+		{
  			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
+			if( (!ms_nulltp) && (oc->data.data[oc->data.len-1] == '\0') )
+			{
+				while (oc -> data.len &&
+				       oc -> data.data [oc -> data.len - 1] == 0) {
+					ms_nulltp = 1;
+					oc -> data.len--;
+					oc->flags |= OPTION_HAD_NULLS;
+				}
+			}
+		}
   	}
 
 	/* Classify the client. */	

dhcp-3.0.1-bz177845.patch:
 linux |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.1-bz177845.patch ---
--- dhcp-3.0.1/client/scripts/linux.bz177845	2006-01-16 15:24:06.000000000 -0500
+++ dhcp-3.0.1/client/scripts/linux	2006-01-16 15:32:58.000000000 -0500
@@ -267,7 +267,7 @@
 		    added_router=1;
 		fi;
 	    done
-	    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ "$router" = "$new_broadcast_address" ]]; then
+	    if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ("$new_subnet_mask" != "255.255.255.255") ]]; then
 		continue;
 	    fi;
 	    default_routers=(${default_routers[@]} $router)
@@ -421,7 +421,7 @@
   fi
 }
 
-if [ x$new_broadcast_address != x ]; then
+if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != '255.255.255.255' ] ; then
   new_broadcast_arg="broadcast $new_broadcast_address"
 fi
 if [ x$old_broadcast_address != x ]; then

dhcp-3.0.1-dhclient_routes.patch:
 linux |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 86 insertions(+), 8 deletions(-)

--- NEW FILE dhcp-3.0.1-dhclient_routes.patch ---
--- dhcp-3.0.2rc3/client/scripts/linux.dhclient_routes	2005-02-10 14:20:33.000000000 -0500
+++ dhcp-3.0.2rc3/client/scripts/linux	2005-02-10 18:45:41.000000000 -0500
@@ -99,6 +99,68 @@
 relmajor=`echo $release |/bin/cut -f1 -d'.'`
 relminor=`echo $release |/bin/cut -f2 -d'.'`
 
+# simple IP arithmetic functions:
+
+function quad2num()
+{
+    if [ $# -eq 4 ]; then
+       let n="$1<<24|$2<<16|$3<<8|$4"
+       echo $n;
+       return 0;
+    fi
+    echo '0';
+    return 1;
+}
+
+function ip2num()
+{
+    IFS='.' quad2num $1;
+}
+
+function num2ip()
+{
+    let n="$1";
+    let o1='(n>>24)&0xff';
+    let o2='(n>>16)&0xff';
+    let o3='(n>>8)&0xff';
+    let o4='n & 0xff';
+    echo $o1.$o2.$o3.$o4;
+}
+
+function mask()
+{   
+    ip=$1
+    m=$2
+    let ip=`IFS='.' ip2num $ip`;
+    let m=`IFS='.' ip2num $m`;
+    let n='ip&m';
+    num2ip $n;
+}
+
+function add_default_gateway()
+{
+        router=$1
+	# Handle silly DHCP servers that give us a router not on our subnet:
+	routerSubnet=`mask $router $new_subnet_mask`
+	mySubnet=`mask $new_ip_address $new_subnet_mask`
+	routerUnreachable=0
+	if [ "$routerSubnet" != "$mySubnet" ]; then
+           if /sbin/arping -q -I $interface -w2 $router; then
+	       route add -host $router dev $interface;
+           else
+	       routerUnreachable=1;
+	       echo "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet"
+	       if [ -x /usr/bin/logger ]; then
+		   /usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet";
+	       fi;
+	   fi;
+        fi;
+	if [ "$routerUnreachable" -eq 0 ]; then
+	    /sbin/ip route replace default via $router dev $interface && return 0;
+	fi;
+	return 1;
+}
+
 if [ x$new_broadcast_address != x ]; then
   new_broadcast_arg="broadcast $new_broadcast_address"
 fi
@@ -174,10 +236,18 @@
       if [ $added_old_broadcast_route -eq 1 ]; then
 	  route del default;
       fi;
-    fi
-    for router in $new_routers; do
-      route add default gw $router && break; # there can be only one !
-    done
+    fi;
+    if [[ ( -z "$GATEWAYDEV" && -z "$GATEWAY" ) || ( -z "$GATEWAY" && ( "$GATEWAYDEV" = "$interface") )  ]]; then
+	for router in $new_routers; do
+	    add_default_gateway $router && break;
+	done
+    elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then
+	routerSubnet=`mask $GATEWAY $new_subnet_mask`
+	mySubnet=`mask $new_ip_address $new_subnet_mask`
+	if [ "$routerSubnet" = "$mySubnet" ]; then
+	   ip route replace default via $GATEWAY dev $interface 
+	fi;
+    fi;
     # static routes
     if [ "x$new_static_routes" != x ]; then
       len=`echo $new_static_routes | awk '{print NF}'`
@@ -309,7 +379,7 @@
   ifconfig $interface inet $new_ip_address $new_subnet_arg \
 					$new_broadcast_arg
   set $new_routers
-  if ping -q -c 1 -w 10 $1; then
+  if ping -q -c 1 -w 10 -I $interface $1; then
     if [ x$new_ip_address != x$alias_ip_address ] && \
 			[ x$alias_ip_address != x ]; then
       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
@@ -319,9 +389,17 @@
 		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
       route add -net $new_network_number
     fi
-    for router in $new_routers; do
-      route add default gw $router
-    done
+    if [[ ( -z "$GATEWAYDEV" && -z "$GATEWAY" ) || ( -z "$GATEWAY" && ( "$GATEWAYDEV" = "$interface") )  ]]; then
+	for router in $new_routers; do
+	    add_default_gateway $router && break;
+	done
+    elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" ) ]]; then
+	routerSubnet=`mask $GATEWAY $new_subnet_mask`
+	mySubnet=`mask $new_ip_address $new_subnet_mask`
+	if [ "$routerSubnet" = "$mySubnet" ]; then
+	   ip route replace default via $GATEWAY dev $interface 
+	fi;
+    fi;
     if [ "${PEERDNS}" != "no" ]; then 
       make_resolv_conf
     fi

dhcp-3.0.1-dhclient-script-fixes.patch:
 linux |  218 +++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 165 insertions(+), 53 deletions(-)

--- NEW FILE dhcp-3.0.1-dhclient-script-fixes.patch ---
--- dhcp-3.0.1/client/scripts/linux.dhclient-script-fixes	2005-11-18 18:53:53.000000000 -0500
+++ dhcp-3.0.1/client/scripts/linux	2005-11-21 12:53:33.000000000 -0500
@@ -155,38 +155,62 @@
 
 function class_bits()
 {
-    let bits=0
-    IFS='.' os="$1"
-    for b in $os; do
-       if [ $b -ne 0 ]; then
-	   let bits=bits+8;
-       fi;
-    done
-    echo $bits
+    let ip=`IFS='.' ip2num $1`;
+    let bits=32
+    let mask='255';
+    for ((i=0; i <= 3; i++, 'mask<<=8')); do
+	let v='ip&mask';
+	if [ "$v" -eq 0 ] ; then
+	    let bits-=8;
+        else
+            break;
+	fi;
+    done;
+    echo $bits;
+}
+
+function routerReachable()
+{ # Handle silly DHCP servers that give us a router not on our subnet:    
+    router=$1
+    routerSubnet=`mask $router $new_subnet_mask`
+    mySubnet=`mask $new_ip_address $new_subnet_mask`
+    unreachable=0
+    if [ "$routerSubnet" != "$mySubnet" ]; then
+	unreachable=1
+	if /sbin/arping -f -q -I $interface -w2 $router; then
+	    /sbin/ip route add ${router}/32 dev $interface
+	    if [ $? -eq 0 ]; then
+		unreachable=0
+	    else
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: failed to create host route for unreachable router $router not on subnet $mySubnet";
+	    fi
+	else
+	    unreachable=1
+	    if [ -x /usr/bin/logger ]; then
+		/usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet router subnet $routerSubnet";
+	    fi;
+	fi;
+    fi;
+    return $unreachable;
 }
 
 function add_default_gateway()
 {
-        router=$1
-	# Handle silly DHCP servers that give us a router not on our subnet:
-	routerSubnet=`mask $router $new_subnet_mask`
-	mySubnet=`mask $new_ip_address $new_subnet_mask`
-	routerUnreachable=0
-	if [ "$routerSubnet" != "$mySubnet" ]; then
-           if /sbin/arping -q -I $interface -w2 $router; then
-	       /sbin/ip route replace ${router}/32 dev $interface;
-           else
-	       routerUnreachable=1;
-	       echo "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet"
-	       if [ -x /usr/bin/logger ]; then
-		   /usr/bin/logger -p local7.notice -t "NET"  "dhclient: DHCP router $router is unreachable on DHCP subnet $mySubnet";
-	       fi;
-	   fi;
-        fi;
-	if [ "$routerUnreachable" -eq 0 ]; then
-	    /sbin/ip route replace default via $router dev $interface && return 0;
+    router=$1
+    metric=''
+    if [ $# -gt 1 ] && [ "$2" -gt 0 ]; then 
+	metric="metric $2";
+    fi;    
+    if routerReachable $router ; then
+	/sbin/ip route replace default via $router dev $interface $metric;
+	if [ $? -ne 0 ]; then 
+	    /usr/bin/logger -p local7.notice -t "NET"  'dhclient: failed to create default route: '$router dev $interface $metric;
+	    return 1;
+	else
+	    return 0;
 	fi;
-	return 1;
+    fi;
+    return 1;
 }
 
 function dhconfig()
@@ -203,11 +227,24 @@
     ifconfig $interface inet 0 down
   fi
 
-  if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+  if [ x$reason = xBOUND ] || [ x$reason = xREBOOT ] ||
+     [ x$old_ip_address  != x$new_ip_address ] ||
+     [ x$old_subnet_mask != x$new_subnet_mask ] ||
+     [ x$new_network_number != x$new_network_number ] ||
+     [ x$old_broadcast_address != x$new_broadcast_address ] ||
+     [ "x$old_routers" != "x$new_routers" ] ||
+     [ x$old_interface_mtu != x$new_interface_mtu ] ; then
 
     ifconfig $interface inet $new_ip_address $new_subnet_arg \
-							$new_broadcast_arg
+	$new_broadcast_arg
+    if [ -n "$new_interface_mtu" ]; then
+	/sbin/ip link set $interface mtu $new_interface_mtu;
+    fi;
+    if [ -x /etc/dhclient-${interface}-up-hooks ]; then
+	. /etc/dhclient-${interface}-up-hooks;
+    elif [ -x /etc/dhclient-up-hooks ]; then
+	. /etc/dhclient-up-hooks;
+    fi;
     # Add a network route to the computed network address.
     if [ $relmajor -lt 2 ] || \
 		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
@@ -217,11 +254,26 @@
 	    /sbin/ip route del default;
 	fi;
     fi;
-    if [[ ( -z "$GATEWAYDEV" &&  (-z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") ) || ( (-z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") &&  ( "$GATEWAYDEV" = "$interface") )  ]]; then
+    if [[ ( -z "$GATEWAYDEV" &&  (-z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") ) || \
+	( ( -z "$GATEWAY" || -z "$DHCLIENT_USE_GATEWAY") &&  ( "$GATEWAYDEV" = "$interface") )  ]]; 
+    then
+	metric='';
+	let i=0;
+	default_routers=()
 	for router in $new_routers; do
-	    add_default_gateway $router && break;
+	    if [ -z "$router" ] || [ `IFS=. ip2num $router` -le 0 ] || \
+	       [[ $router = *255* ]] || [[ "${default_routers[@]}" == *"$router"* ]]; 
+	    then
+		continue;
+	    fi;
+	    default_routers=(${default_routers[@]} $router)
+	    add_default_gateway $router $metric;		    
+	    let i=i+1;
+	    metric=$i; 
 	done
-    elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && ( -n "$GATEWAY" && -n "$DHCLIENT_USE_GATEWAY" ) ]]; then
+    elif [[ ( -z "$GATEWAYDEV" || ( "$GATEWAYDEV" = "$interface" ) ) && \
+	    ( -n "$GATEWAY" && -n "$DHCLIENT_USE_GATEWAY" ) ]]; 
+    then
 	routerSubnet=`mask $GATEWAY $new_subnet_mask`
 	mySubnet=`mask $new_ip_address $new_subnet_mask`
 	if [ "$routerSubnet" = "$mySubnet" ]; then
@@ -231,15 +283,34 @@
     # static routes
     if [ "x$new_static_routes" != x ]; then
 	IFS=', 	' static_routes=($new_static_routes)
-	let i=0
-	while [ $i -lt ${#static_routes[@]} ]; do
+	route_targets=()
+	for((i=0; i<${#static_routes[@]}; i+=2)); do
 	    target=${static_routes[$i]}
 	    gateway=${static_routes[$i+1]}
-	    let i=i+2
-	    /sbin/ip route replace ${target}/`class_bits $target` via ${gateway} dev $interface
-	done
-    fi
-  fi
+	    metric=''
+	    for t in ${route_targets[@]}; do
+		if [ $t == $target ]; then
+		    if [ -z "$metric" ]; then
+			metric=1;
+		    else
+			((metric=metric+1));
+		    fi;
+		fi;
+	    done;
+	    if [ -n "$metric" ]; then
+		metric="metric $metric";
+	    fi;		    
+	    if routerReachable $gateway; then
+		/sbin/ip route replace ${target}/`class_bits $target` via ${gateway} dev $interface ${metric}
+		if [ $? -ne 0 ]; then
+		    /usr/bin/logger -p local7.notice -t 'NET' 'dhclient: failed to create static route:' ${target}/`class_bits $target` via ${gateway} dev $interface ${metric};			
+		else			    
+		    route_targets=(${route_targets[@]} $target);
+		fi;
+	    fi;
+	done;
+     fi;
+  fi;
 
   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
    then
@@ -249,6 +320,9 @@
   fi
 
   make_resolv_conf
+  if [ -n "$new_host_name" ] && need_hostname; then
+      hostname $new_host_name
+  fi
 
   if [ "${PEERNIS}" = no ]; then
     :
@@ -272,8 +346,8 @@
 	if [ "$level" = "unknown" ]; then
 	    level=1;
 	fi
-	if ! pkill -HUP ypbind && [ $contents -gt 0 ] && chkconfig --level=$level ypbind; then
-	   service ypbind start >/dev/null 2>&1;
+	if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ]; then
+	    kill -HUP $yppid;	    
         fi
   elif [ -n "$new_nis_servers" ]; then
         save_previous /etc/yp.conf
@@ -289,14 +363,35 @@
 	if [ "$level" = "unknown" ]; then
 	    level=1;
 	fi
-        if ! pkill -HUP ypbind && [ $contents -gt 0 ] && chkconfig --level=$level ypbind; then
-	    service ypbind start >/dev/null 2>&1;
+	if [ $contents -gt 0 ] && [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ]; then
+	    kill -HUP $yppid;
         fi
   fi
 
   if [ "${PEERNTP}" = no ]; then
     :
   elif [ -n "$new_ntp_servers" ] && [ -e /etc/ntp.conf ]; then
+      if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+	  if [ -n "$new_time_offset" ]; then
+	  #  DHCP option "time-offset" is requested by default and should be handled
+          #  (otherwise it is very difficult to sync a network of machines to the same wallclock time with NTP).
+	  #  The geographical zone abbreviation cannot be determined from the GMT offset,
+	  #  but the $ZONEINFO/Etc/GMT$offset file can be used - note: server must take account of DST.
+	      ((z=new_time_offset/3600));
+	      ((hoursWest=`printf '%+d' $z`))
+	      if (( $hoursWest < 0 )); then
+		   # tzdata treats negative 'hours west' as positive 'gmtoff' !
+		  ((hoursWest*=-1));
+	      fi
+	      tzfile=/usr/share/zoneinfo/Etc/GMT`printf '%+d' $hoursWest`;
+	      if [ -e $tzfile ]; then
+		  /bin/mv -f /etc/localtime /etc/localtime.predhclient;
+		  /bin/cp -fp $tzfile /etc/localtime;
+		  /bin/touch /etc/localtime;
+	      fi;
+	  fi;
+      fi;
+
       save_previous /etc/ntp.conf
       /bin/egrep -v '(^[\ \	]*server)|(generated by /sbin/dhclient-script)'< /etc/ntp.conf.predhclient > /etc/ntp.conf
       echo '# servers generated by /sbin/dhclient-script' >> /etc/ntp.conf
@@ -320,10 +415,6 @@
 	 /sbin/service ntpd condrestart >/dev/null 2>&1
       fi;
   fi
-
-  if [ -n "$new_host_name" ] && need_hostname; then
-      hostname $new_host_name
-  fi
 }
 
 if [ x$new_broadcast_address != x ]; then
@@ -367,12 +458,15 @@
   # We need to give the kernel some time to get the interface up.
   # sleep 1
   # I don't think we need to do this with modern kernels - JVD .
-
+  # but just in case:
+  if [ -n "$DHCLIENT_DELAY" ] && [ "$DHCLIENT_DELAY" -gt 0 ] ; then
+      sleep $DHCLIENT_DELAY;
+  fi;
   exit_with_hooks 0
 fi
 
 if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
-    if [ -z "$new_ip_address" ] || [ -z "$interface" ] ||  /sbin/arping -q -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
+    if [ -z "$new_ip_address" ] || [ -z "$interface" ] ||  /sbin/arping -q -f -c 2 -w 3 -D -I ${interface} ${new_ip_address}; then
 	exit_with_hooks 0
     else
 	exit_with_hooks 1
@@ -392,6 +486,13 @@
      rm -f /etc/resolv.conf.predhclient
      [ -x /sbin/restorecon ] && /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1
   fi
+  if [ -n "$DHCP_TIME_OFFSET_SETS_TIMEZONE" ] && [[ "$DHCP_TIME_OFFSET_SETS_TIMEZONE" = [yY1]* ]]; then
+      if [ -e /etc/localtime.predhclient ]; then
+	  /bin/rm -f /etc/localtime
+	  /bin/mv -f /etc/localtime.predhclient /etc/localtime;
+	  /bin/touch /etc/localtime;
+      fi;
+  fi;
   if [ -f /etc/ntp.conf.predhclient ]; then
      /bin/mv -f /etc/ntp.conf.predhclient /etc/ntp.conf
      if [ -f /etc/ntp/step-tickers.predhclient ]; then
@@ -401,10 +502,22 @@
      service ntpd condrestart >/dev/null 2>&1 
   fi
   if [ -f /etc/yp.conf.predhclient ]; then
+     /bin/rm -f /etc/yp.conf
      /bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
-     [ -x /sbin/restorecon ] && /sbin/restorecon /etc/yp.conf >/dev/null 2>&1
-     pkill -HUP ypbind
+     level=`/sbin/runlevel`
+     level=${level##*\ }
+     if [ "$level" = "unknown" ]; then
+	 level=1;
+     fi
+     if [[ "$level" = [0-6] ]] && /sbin/chkconfig --level=$level ypbind >/dev/null 2>&1 && [ -r /var/run/ypbind.pid ] && yppid=`cat /var/run/ypbind.pid` && [ -d /proc/${yppid} ] && [ "`if [ -x /sbin/busybox ]; then /sbin/busybox readlink /proc/${yppid}/exe; else echo /sbin/ypbind; fi`" = "/sbin/ypbind" ] ; then
+	 kill -HUP $yppid;
+     fi
   fi 
+  if [ -x /etc/dhclient-${interface}-down-hooks ]; then
+      . /etc/dhclient-${interface}-down-hooks;
+  elif [ -x /etc/dhclient-down-hooks ]; then
+      . /etc/dhclient-down-hooks;
+  fi;
   if [ x$alias_ip_address != x ]; then
     # Turn off alias interface.
     ifconfig $interface:0- inet 0
@@ -436,5 +549,4 @@
 elif [ x$reason = xTIMEOUT ]; then
   exit_with_hooks 1
 fi
-
 exit_with_hooks 0



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:49:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:49:59 -0500
Subject: rpms/dhcp/FC-3 dhcp-3.0.1-bz181482.patch,NONE,1.1
Message-ID: <200602141849.k1EInxA4025851@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25837

Added Files:
	dhcp-3.0.1-bz181482.patch 
Log Message:
fix bug 181482: resolv.conf not updated on RENEW

dhcp-3.0.1-bz181482.patch:
 linux |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dhcp-3.0.1-bz181482.patch ---
--- dhcp-3.0.1/client/scripts/linux.bz181482	2006-02-14 13:44:06.000000000 -0500
+++ dhcp-3.0.1/client/scripts/linux	2006-02-14 13:45:40.000000000 -0500
@@ -32,10 +32,10 @@
       return 
   fi
 
-  if [ x$reason == xRENEW ]; then 
-      if [ "$new_domain_name" == "$old_domain_name" ] && [ "$new_domain_servers" == "$old_domain_servers" ]; then
-	  return
-      fi
+  if [ x$reason == xRENEW ] &&
+     [ "$new_domain_name" == "$old_domain_name" ] &&
+     [ "$new_domain_name_servers" == "$old_domain_name_servers" ]; then
+      return;
   fi
 
   if [ -n "$new_domain_name" ] || [ -n "$new_domain_name_servers" ]; then



From fedora-cvs-commits at redhat.com  Tue Feb 14 18:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 13:53:07 -0500
Subject: rpms/dhcp/FC-3 dhcp.spec,1.43,1.44
Message-ID: <200602141853.k1EIr7xQ025909@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv25896

Modified Files:
	dhcp.spec 
Log Message:
fix bug 181482: resolv.conf not updated on RENEW


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-3/dhcp.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- dhcp.spec	7 Jul 2005 23:22:53 -0000	1.43
+++ dhcp.spec	14 Feb 2006 18:53:05 -0000	1.44
@@ -2,7 +2,7 @@
 Name: dhcp
 Epoch: 7
 Version: 3.0.1
-Release: 44_FC3
+Release: 52_FC3
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
@@ -47,7 +47,14 @@
 Patch142: dhcp-3.0.1-dhclient-no_isc_blurb.patch
 Patch143: dhcp-3.0.1-uint8_binding_state.patch
 Patch144: dhcp-3.0.1-dhclient-script-update.patch
-
+Patch145: dhcp-3.0.1-bz173324.patch
+Patch146: dhcp-3.0.1-bz167028-ibm-unicast-bootp.patch
+Patch147: dhcp-3.0.1-bz160655_obz15293.patch
+Patch148: dhcp-3.0.1-dhclient-script-fixes.patch
+Patch149: dhcp-3.0.1-bz176270.patch
+Patch150: dhcp-3.0.1-bz176615.patch
+Patch151: dhcp-3.0.1-bz177845.patch
+Patch152: dhcp-3.0.1-bz181482.patch
 URL: http://isc.org/products/DHCP/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig
@@ -132,7 +139,14 @@
 %patch142 -p1 -b .dhclient-no_isc_blurb
 %patch143 -p1 -b .uint8_binding_state
 %patch144 -p1 -b .dhclient-script-update
-
+%patch145 -p1 -b .bz173324
+%patch146 -p1 -b .bz167028-ibm-unicast-bootp
+%patch147 -p1 -b .bz160655_obz15293
+%patch148 -p1 -b .dhclient-script-fixes
+%patch149 -p1 -b .bz176270
+%patch150 -p1 -b .bz176615
+%patch151 -p1 -b .bz177845
+%patch152 -p1 -b .bz181482
 cp %SOURCE1 .
 cat <<EOF >site.conf
 VARDB=%{_localstatedir}/lib/dhcp
@@ -250,6 +264,25 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0.1-52.FC3
+- fix bug 181482: resolv.conf not updated on RENEW
+
+* Mon Jan 16 2006 Jason Vas Dias <jvdias at redhat.com> - 3.0.1-52.FC3
+- fix bug 177845: allow default router to be same as ip-address
+- fix bug 176615: fix DDNS updates when host-name contains trailing NUL
+
+* Tue Dec 20 2005 Jason Vas Dias <jvdias at redhat.com> - 3.0.1-52.FC3
+- fix bug 176270: allow routers with an octet of 255 in their IP address
+
+* Wed Dec 14 2005 Jason Vas Dias <jvdias at redhat.com> 3.0.1-52.FC3
+- fix typo in dhcpd initscript '/var/lib/dhcpd' -> '/var/lib/dhcp'
+
+* Fri Nov 18 2005 Jason Vas Dias <jvdias at redhat.com> 3.0.1-52.FC3
+- fix bug 160655 / upstream bug 15293: apply upstream patch to fix trailing null options
+- fix bug 167028 : apply IBM unicast BOOTP patch (from xma at us.ibm.com)
+- fix bug 173324 : omapi memory leak 
+- dhclient-script fixes: e.g. bug 173619
+
 * Thu Jul 07 2005 Jason Vas Dias <jvdias at redhat.com> 7:3.0.1-44_FC3
 - fix bug 162080 + 159929: prevent dhclient flooding network on repeated DHCPDECLINE
 - fix compile with default compiler: change binding_state_t to uint8_t (now upstream)



From fedora-cvs-commits at redhat.com  Tue Feb 14 19:22:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:22:17 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1941,1.1941.4.1
Message-ID: <200602141922.k1EJMHb6023328@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-fc5-lspp8-branch
	kernel-2.6.spec 
Log Message:
Update specfile for lspp .8 kernel



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1941
retrieving revision 1.1941.4.1
diff -u -r1.1941 -r1.1941.4.1
--- kernel-2.6.spec	13 Feb 2006 03:11:41 -0000	1.1941
+++ kernel-2.6.spec	14 Feb 2006 19:22:14 -0000	1.1941.4.1
@@ -22,7 +22,7 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys   .lspp.8
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -394,6 +394,16 @@
 # Do not add anything non-trivial here.
 Patch10001: linux-2.6-random-patches.patch
 
+# Audit patches
+Patch20010: linux-2.6-audit-git.patch
+Patch20011: linux-2.6-audit-promisc.patch
+Patch20012: linux-2.6-audit-tty.patch
+Patch20013: linux-2.6-vm86-audit_syscall_exit.patch
+Patch20014: linux-2.6-audit-string-1.patch
+Patch20015: linux-2.6-audit-string-2.patch
+Patch20016: linux-2.6-audit-inotify-api.patch
+Patch20017: linux-2.6-audit-rule-log.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -977,6 +987,14 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+%patch20010 -p1
+%patch20011 -p1
+%patch20012 -p1
+%patch20013 -p1
+%patch20014 -p1
+%patch20015 -p1
+%patch20016 -p1
+%patch20017 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -1547,6 +1565,9 @@
 %endif
 
 %changelog
+* Tue Feb 14 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.8 kernel
+
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc2-git11, -git12, and 2.6.16rc3
 - Fix warning in bcm43xx driver.



From fedora-cvs-commits at redhat.com  Tue Feb 14 19:26:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:26:07 -0500
Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE,
	1.1.8.1 linux-2.6-audit-inotify-api.patch, NONE,
	1.1.2.1 linux-2.6-audit-promisc.patch, NONE,
	1.1.4.1 linux-2.6-audit-rule-log.patch, NONE,
	1.1.4.1 linux-2.6-audit-string-1.patch, NONE,
	1.1.4.1 linux-2.6-audit-string-2.patch, NONE,
	1.1.4.1 linux-2.6-audit-tty.patch, NONE,
	1.1.4.1 linux-2.6-vm86-audit_syscall_exit.patch, NONE, 1.1.2.1
Message-ID: <200602141926.k1EJQ7PQ025107@cvs.devel.redhat.com>

Author: sgrubb

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

Added Files:
      Tag: private-fc5-lspp8-branch
	linux-2.6-audit-git.patch linux-2.6-audit-inotify-api.patch 
	linux-2.6-audit-promisc.patch linux-2.6-audit-rule-log.patch 
	linux-2.6-audit-string-1.patch linux-2.6-audit-string-2.patch 
	linux-2.6-audit-tty.patch 
	linux-2.6-vm86-audit_syscall_exit.patch 
Log Message:
Added audit patches for lspp.8 kernel


linux-2.6-audit-git.patch:
 arch/ia64/kernel/ptrace.c      |   10 
 fs/namei.c                     |   14 
 fs/open.c                      |    8 
 fs/xattr.c                     |   11 
 include/linux/audit.h          |   98 ++++-
 include/linux/fsnotify.h       |   14 
 include/linux/security.h       |   33 +
 ipc/msg.c                      |    5 
 ipc/sem.c                      |    5 
 ipc/shm.c                      |    4 
 ipc/util.c                     |    2 
 kernel/Makefile                |    2 
 kernel/audit.c                 |  142 +++++--
 kernel/audit.h                 |   70 +++
 kernel/auditfilter.c           |  375 +++++++++++++++++++
 kernel/auditsc.c               |  786 +++++++++++++++++++++--------------------
 security/dummy.c               |   14 
 security/selinux/hooks.c       |   98 ++---
 security/selinux/nlmsgtab.c    |    6 
 security/selinux/selinuxfs.c   |   11 
 security/selinux/ss/services.c |   15 
 21 files changed, 1204 insertions(+), 519 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 4b19d04..49fd3f6 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1663,8 +1663,14 @@ syscall_trace_leave (long arg0, long arg
 		     long arg4, long arg5, long arg6, long arg7,
 		     struct pt_regs regs)
 {
-	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8);
+	if (unlikely(current->audit_context)) {
+		int success = AUDITSC_RESULT(regs.r10);
+		long result = regs.r8;
+
+		if (success != AUDITSC_SUCCESS)
+			result = -result;
+		audit_syscall_exit(current, success, result);
+	}
 
 	if (test_thread_flag(TIF_SYSCALL_TRACE)
 	    && (current->ptrace & PT_PTRACED))
diff --git a/fs/namei.c b/fs/namei.c
index 6dbbd42..55798c3 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1126,8 +1126,7 @@ int fastcall path_lookup(const char *nam
 	retval = link_path_walk(name, nd);
 out:
	if (likely(retval == 0)) {
-		if (unlikely(current->audit_context && nd && nd->dentry &&
-				nd->dentry->d_inode))
+		if (nd && nd->dentry && nd->dentry->d_inode)
 		audit_inode(name, nd->dentry->d_inode, flags);
	}
 	return retval;
@@ -1301,6 +1300,7 @@ static inline int may_delete(struct inod
 		return -ENOENT;
 
 	BUG_ON(victim->d_parent->d_inode != dir);
+	audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino);
 
 	error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
 	if (error)
@@ -1420,7 +1420,7 @@ int vfs_create(struct inode *dir, struct
 	DQUOT_INIT(dir);
 	error = dir->i_op->create(dir, dentry, mode, nd);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1739,7 +1739,7 @@ int vfs_mknod(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mknod(dir, dentry, mode, dev);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1810,7 +1810,7 @@ int vfs_mkdir(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mkdir(dir, dentry, mode);
 	if (!error)
-		fsnotify_mkdir(dir, dentry->d_name.name);
+		fsnotify_mkdir(dir, dentry);
 	return error;
 }
 
@@ -2047,7 +2047,7 @@ int vfs_symlink(struct inode *dir, struc
 	DQUOT_INIT(dir);
 	error = dir->i_op->symlink(dir, dentry, oldname);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -2118,7 +2118,7 @@ int vfs_link(struct dentry *old_dentry, 
 	error = dir->i_op->link(old_dentry, dir, new_dentry);
 	up(&old_dentry->d_inode->i_sem);
 	if (!error)
-		fsnotify_create(dir, new_dentry->d_name.name);
+		fsnotify_create(dir, new_dentry);
 	return error;
 }
 
diff --git a/fs/open.c b/fs/open.c
index f53a5b9..3231a67 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -25,6 +25,7 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
+#include <linux/audit.h>
 
 #include <asm/unistd.h>
 
@@ -613,6 +614,8 @@ asmlinkage long sys_fchmod(unsigned int 
 	dentry = file->f_dentry;
 	inode = dentry->d_inode;
 
+	audit_inode(NULL, inode, 0);
+
 	err = -EROFS;
 	if (IS_RDONLY(inode))
 		goto out_putf;
@@ -736,7 +739,10 @@ asmlinkage long sys_fchown(unsigned int 
 
 	file = fget(fd);
 	if (file) {
-		error = chown_common(file->f_dentry, user, group);
+		struct dentry * dentry;
+		dentry = file->f_dentry;
+		audit_inode(NULL, dentry->d_inode, 0);
+		error = chown_common(dentry, user, group);
 		fput(file);
 	}
 	return error;
diff --git a/fs/xattr.c b/fs/xattr.c
index bcc2156..8f40edf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -17,6 +17,7 @@
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/fsnotify.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 
 /*
@@ -113,12 +114,15 @@ sys_fsetxattr(int fd, char __user *name,
 	      size_t size, int flags)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = setxattr(f->f_dentry, name, value, size, flags);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = setxattr(dentry, name, value, size, flags);
 	fput(f);
 	return error;
 }
@@ -365,12 +369,15 @@ asmlinkage long
 sys_fremovexattr(int fd, char __user *name)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = removexattr(f->f_dentry, name);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = removexattr(dentry, name);
 	fput(f);
 	return error;
 }
diff --git a/include/linux/audit.h b/include/linux/audit.h
index da3c019..a485639 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -33,11 +33,20 @@
  * 1200 - 1299 messages internal to the audit daemon
  * 1300 - 1399 audit event messages
  * 1400 - 1499 SE Linux use
- * 1500 - 1999 future use
- * 2000 is for otherwise unclassified kernel audit messages
+ * 1500 - 1599 kernel LSPP events
+ * 1600 - 1699 kernel crypto events
+ * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 2000 is for otherwise unclassified kernel audit messages (legacy)
+ * 2001 - 2099 unused (kernel)
+ * 2100 - 2199 user space anomaly records
+ * 2200 - 2299 user space actions taken in response to anomalies
+ * 2300 - 2399 user space generated LSPP events
+ * 2400 - 2499 user space crypto events
+ * 2500 - 2999 future user space (maybe integrity labels and related events)
  *
- * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user
- * space. Anything over that is kernel --> user space communication.
+ * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
+ * exclusively user space. 1300-2099 is kernel --> user space 
+ * communication.
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
@@ -54,6 +63,8 @@
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
[...2439 lines suppressed...]
-		rc = -EOPNOTSUPP;
-		goto out;
-	}
-
-	rc = security_sid_to_context(isec->sid, &context, &len);
-	if (rc)
-		goto out;
-
-	/* Probe for required buffer size */
-	if (!buffer || !size) {
-		rc = len;
-		goto out_free;
-	}
 
-	if (size < len) {
-		rc = -ERANGE;
-		goto out_free;
-	}
+	if (strcmp(name, XATTR_SELINUX_SUFFIX))
+		return -EOPNOTSUPP;
 
-	if (err > 0) {
-		if ((len == err) && !(memcmp(context, buffer, len))) {
-			/* Don't need to canonicalize value */
-			rc = err;
-			goto out_free;
-		}
-		memset(buffer, 0, size);
-	}
-	memcpy(buffer, context, len);
-	rc = len;
-out_free:
-	kfree(context);
-out:
-	return rc;
+	return selinux_getsecurity(isec->sid, buffer, size);
 }
 
 static int selinux_inode_setsecurity(struct inode *inode, const char *name,
@@ -4054,6 +4052,13 @@ static int selinux_ipc_permission(struct
 	return ipc_has_perm(ipcp, av);
 }
 
+static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size)
+{
+	struct ipc_security_struct *isec = ipcp->security;
+
+	return selinux_getsecurity(isec->sid, buffer, size);
+}
+
 /* module stacking operations */
 static int selinux_register_security (const char *name, struct security_operations *ops)
 {
@@ -4095,8 +4100,7 @@ static int selinux_getprocattr(struct ta
 			       char *name, void *value, size_t size)
 {
 	struct task_security_struct *tsec;
-	u32 sid, len;
-	char *context;
+	u32 sid;
 	int error;
 
 	if (current != p) {
@@ -4105,9 +4109,6 @@ static int selinux_getprocattr(struct ta
 			return error;
 	}
 
-	if (!size)
-		return -ERANGE;
-
 	tsec = p->security;
 
 	if (!strcmp(name, "current"))
@@ -4124,16 +4125,7 @@ static int selinux_getprocattr(struct ta
 	if (!sid)
 		return 0;
 
-	error = security_sid_to_context(sid, &context, &len);
-	if (error)
-		return error;
-	if (len > size) {
-		kfree(context);
-		return -ERANGE;
-	}
-	memcpy(value, context, len);
-	kfree(context);
-	return len;
+	return selinux_getsecurity(sid, value, size);
 }
 
 static int selinux_setprocattr(struct task_struct *p,
@@ -4291,6 +4283,7 @@ static struct security_operations selinu
 	.inode_getxattr =		selinux_inode_getxattr,
 	.inode_listxattr =		selinux_inode_listxattr,
 	.inode_removexattr =		selinux_inode_removexattr,
+	.inode_xattr_getsuffix =        selinux_inode_xattr_getsuffix,
 	.inode_getsecurity =            selinux_inode_getsecurity,
 	.inode_setsecurity =            selinux_inode_setsecurity,
 	.inode_listsecurity =           selinux_inode_listsecurity,
@@ -4328,6 +4321,7 @@ static struct security_operations selinu
 	.task_to_inode =                selinux_task_to_inode,
 
 	.ipc_permission =		selinux_ipc_permission,
+	.ipc_getsecurity =		selinux_ipc_getsecurity,
 
 	.msg_msg_alloc_security =	selinux_msg_msg_alloc_security,
 	.msg_msg_free_security =	selinux_msg_msg_free_security,
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index 69b9329..d7c0e91 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -148,8 +148,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16
 		break;
 
 	case SECCLASS_NETLINK_AUDIT_SOCKET:
-		if (nlmsg_type >= AUDIT_FIRST_USER_MSG &&
-		    nlmsg_type <= AUDIT_LAST_USER_MSG) {
+		if ((nlmsg_type >= AUDIT_FIRST_USER_MSG &&
+		     nlmsg_type <= AUDIT_LAST_USER_MSG) ||
+		    (nlmsg_type >= AUDIT_FIRST_USER_MSG2 &&
+                     nlmsg_type <= AUDIT_LAST_USER_MSG2)) {
 			*perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY;
 		} else {
 			err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms,
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 0e1352a..e64923b 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -21,6 +21,7 @@
 #include <linux/major.h>
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
@@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct 
 		length = task_has_security(current, SECURITY__SETENFORCE);
 		if (length)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"enforcing=%d old_enforcing=%d auid=%u", new_value, 
+			selinux_enforcing,
+			audit_get_loginuid(current->audit_context));
 		selinux_enforcing = new_value;
 		if (selinux_enforcing)
 			avc_ss_reset(0);
@@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct 
 		length = selinux_disable();
 		if (length < 0)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"selinux=0 auid=%u",
+			audit_get_loginuid(current->audit_context));
 	}
 
 	length = count;
@@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil
 		length = ret;
 	else
 		length = count;
+	audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
+		"policy loaded auid=%u",
+		audit_get_loginuid(current->audit_context));
 out:
 	up(&sel_sem);
 	vfree(data);
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 44eb4d7..2311255 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val
 		goto out;
 	}
 
-	printk(KERN_INFO "security: committed booleans { ");
 	for (i = 0; i < len; i++) {
+		if (!!values[i] != policydb.bool_val_to_struct[i]->state) {
+			audit_log(current->audit_context, GFP_ATOMIC,
+				AUDIT_MAC_CONFIG_CHANGE,
+				"bool=%s val=%d old_val=%d auid=%u",
+				policydb.p_bool_val_to_name[i],
+				!!values[i],
+				policydb.bool_val_to_struct[i]->state,
+				audit_get_loginuid(current->audit_context));
+		}
 		if (values[i]) {
 			policydb.bool_val_to_struct[i]->state = 1;
 		} else {
 			policydb.bool_val_to_struct[i]->state = 0;
 		}
-		if (i != 0)
-			printk(", ");
-		printk("%s:%d", policydb.p_bool_val_to_name[i],
-		       policydb.bool_val_to_struct[i]->state);
 	}
-	printk(" }\n");
 
 	for (cur = policydb.cond_list; cur != NULL; cur = cur->next) {
 		rc = evaluate_cond_node(&policydb, cur);

linux-2.6-audit-inotify-api.patch:
 fs/inotify.c             |  395 +++++++++++++++++++++++++++++------------------
 include/linux/fsnotify.h |   29 +--
 include/linux/inotify.h  |   17 +-
 3 files changed, 279 insertions(+), 162 deletions(-)

--- NEW FILE linux-2.6-audit-inotify-api.patch ---
>From amy.griffis at hp.com Thu Feb  9 14:07:59 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, 09 Feb 2006 14:08:27 -0500
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 k19J8QQo003353;
	Thu, 9 Feb 2006 14:08:27 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8N110283;
	Thu, 9 Feb 2006 14:08:23 -0500
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 k19J8Imo011143;
	Thu, 9 Feb 2006 14:08:18 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 67C5573351; Thu,  9 Feb 2006 14:08:18 -0500 (EST)
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
	k19J8GKS020511 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8G110252; 
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k19J85qE016990;
	Thu, 9 Feb 2006 14:08:05 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id CA77434016;
	Thu,  9 Feb 2006 14:08:01 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id 5E6F03405E;
	Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 44F1C38448A3; Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Date: Thu, 9 Feb 2006 14:07:59 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060209190759.GB9652 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com, aviro at redhat.com
References: <200602091009.16523.sgrubb at redhat.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200602091009.16523.sgrubb at redhat.com>
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
Cc: aviro at redhat.com
Subject: Re: git tree
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: 25658
X-UID: 48537
Status: RO
X-Status: ORC
X-KMail-EncryptionState: N
X-KMail-SignatureState: N
X-KMail-MDN-Sent:  

Hi Al,

Steve Grubb wrote:     [Thu Feb 09 2006, 10:09:16AM EST]
> >From Al:
> 
>        OK...  Untangling the mess around ppoll/unshare for backport to
> 2.6.15-based tree turns out to be just too messy.  Therefore,
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git/
> contains the tree based on Linus' current.  Branches:
>         * origin = mainline
>         * audit = ported stuff, that's where everything got to settle
> 
> Amy, I've moved 3 of 4 patches to current tree; please see if they
> are OK (the 3rd might be worth a look)

Looks good, except in 3rd patch fs/inotify.c should have:

#@@ -628,7 +628,7 @@ s32 inotify_add_watch(struct inotify_dev
# 		mask_add = 1;
# 
# 	/* don't let user-space set invalid bits: we don't want flags set */
#-	mask &= IN_ALL_EVENTS;
#+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
# 	if (unlikely(!mask)) {
# 		ret = -EINVAL;
# 		goto out;

Here's the full diff with this change:

diff --git a/fs/inotify.c b/fs/inotify.c
index 3041503..ab57df6 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -85,14 +85,18 @@ struct inotify_device {
 	wait_queue_head_t 	wq;		/* wait queue for i/o */
 	struct idr		idr;		/* idr mapping wd -> watch */
 	struct semaphore	sem;		/* protects this bad boy */
-	struct list_head 	events;		/* list of queued events */
 	struct list_head	watches;	/* list of watches */
 	atomic_t		count;		/* reference count */
+	u32			last_wd;	/* the last wd allocated */
+	/* userland consumer API */
+	struct list_head 	events;		/* list of queued events */
 	struct user_struct	*user;		/* user who opened this dev */
 	unsigned int		queue_size;	/* size of the queue (bytes) */
 	unsigned int		event_count;	/* number of pending events */
 	unsigned int		max_events;	/* maximum number of events */
-	u32			last_wd;	/* the last wd allocated */
+	/* kernel consumer API */
+	void (*callback)(struct inotify_event *, const char *, struct inode *,
+			 void *);		/* event callback */
 };
 
 /*
@@ -124,6 +128,7 @@ struct inotify_watch {
 	struct inode		*inode;	/* associated inode */
 	s32 			wd;	/* watch descriptor */
 	u32			mask;	/* event mask for this watch */
+	void		*callback_arg;	/* callback argument - kernel API */
 };
 
 #ifdef CONFIG_SYSCTL
@@ -175,8 +180,10 @@ static inline void get_inotify_dev(struc
 static inline void put_inotify_dev(struct inotify_device *dev)
 {
 	if (atomic_dec_and_test(&dev->count)) {
-		atomic_dec(&dev->user->inotify_devs);
-		free_uid(dev->user);
+		if (dev->user) {
+			atomic_dec(&dev->user->inotify_devs);
+			free_uid(dev->user);
+		}
 		idr_destroy(&dev->idr);
 		kfree(dev);
 	}
@@ -344,6 +351,24 @@ static void inotify_dev_event_dequeue(st
 }
 
 /*
+ * inotify_callback_event - notify kernel consumers of events
+ */
+static void inotify_callback_event(struct inotify_device *dev,
+				   struct inotify_watch *watch,
+				   u32 mask, u32 cookie, const char *name,
+				   struct inode *inode)
+{
+	struct inotify_event event;
+
+	event.wd = watch->wd;
+	event.mask = mask;
+	event.cookie = cookie;
+	event.len = 0; /* kernel consumers don't need length */
+
+	dev->callback(&event, name, inode, watch->callback_arg);
+}
+
+/*
  * inotify_dev_get_wd - returns the next WD for use by the given dev
  *
  * Callers must hold dev->sem.  This function can sleep.
@@ -387,12 +412,13 @@ static int find_inode(const char __user 
  * Both 'dev' and 'inode' (by way of nameidata) need to be pinned.
  */
 static struct inotify_watch *create_watch(struct inotify_device *dev,
-					  u32 mask, struct inode *inode)
+					  u32 mask, struct inode *inode,
+					  void *callback_arg)
 {
 	struct inotify_watch *watch;
 	int ret;
 
-	if (atomic_read(&dev->user->inotify_watches) >=
+	if (dev->user && atomic_read(&dev->user->inotify_watches) >=
 			inotify_max_user_watches)
 		return ERR_PTR(-ENOSPC);
 
@@ -408,6 +434,7 @@ static struct inotify_watch *create_watc
 
 	dev->last_wd = watch->wd;
 	watch->mask = mask;
+	watch->callback_arg = callback_arg;
 	atomic_set(&watch->count, 0);
 	INIT_LIST_HEAD(&watch->d_list);
 	INIT_LIST_HEAD(&watch->i_list);
@@ -425,7 +452,8 @@ static struct inotify_watch *create_watc
 	/* bump our own count, corresponding to our entry in dev->watches */
 	get_inotify_watch(watch);
 
-	atomic_inc(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_inc(&dev->user->inotify_watches);
 	atomic_inc(&inotify_watches);
 
 	return watch;
@@ -458,7 +486,8 @@ static void remove_watch_no_event(struct
 	list_del(&watch->i_list);
 	list_del(&watch->d_list);
 
-	atomic_dec(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_dec(&dev->user->inotify_watches);
 	atomic_dec(&inotify_watches);
 	idr_remove(&dev->idr, watch->wd);
 	put_inotify_watch(watch);
@@ -477,7 +506,10 @@ static void remove_watch_no_event(struct
  */
 static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev)
 {
-	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
+	if (dev->callback)
+		inotify_callback_event(dev, watch, IN_IGNORED, 0, NULL, NULL);
+	else
+		inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
 	remove_watch_no_event(watch, dev);
 }
 
@@ -490,7 +522,190 @@ static inline int inotify_inode_watched(
 	return !list_empty(&inode->inotify_watches);
 }
 
-/* Kernel API */
+/* Kernel consumer API */
+
+/**
+ * inotify_init - allocates and initializes an inotify device
+ * @callback: kernel consumer's event callback
+ */
+struct inotify_device *inotify_init(void (*callback)(struct inotify_event *,
+						     const char *,
+						     struct inode *, void *))
+{
+	struct inotify_device *dev;
+
+	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	if (unlikely(!dev))
+		return NULL;
+
+	idr_init(&dev->idr);
+	INIT_LIST_HEAD(&dev->events);
+	INIT_LIST_HEAD(&dev->watches);
+	init_waitqueue_head(&dev->wq);
+	sema_init(&dev->sem, 1);
+	dev->event_count = 0;
+	dev->queue_size = 0;
+	dev->max_events = inotify_max_queued_events;
+	dev->user = NULL;	/* set in sys_inotify_init */
+	dev->last_wd = 0;
+	dev->callback = callback;
+	atomic_set(&dev->count, 0);
+	get_inotify_dev(dev);
+
+	return dev;
+}
+EXPORT_SYMBOL_GPL(inotify_init);
+
+/**
+ * inotify_free - clean up and free an inotify device
+ * @dev: inotify device to free
+ */
+int inotify_free(struct inotify_device *dev)
+{
+	/*
+	 * Destroy all of the watches on this device.  Unfortunately, not very
+	 * pretty.  We cannot do a simple iteration over the list, because we
+	 * do not know the inode until we iterate to the watch.  But we need to
+	 * hold inode->inotify_sem before dev->sem.  The following works.
+	 */
+	while (1) {
+		struct inotify_watch *watch;
+		struct list_head *watches;
+		struct inode *inode;
+
+		down(&dev->sem);
+		watches = &dev->watches;
+		if (list_empty(watches)) {
+			up(&dev->sem);
+			break;
+		}
+		watch = list_entry(watches->next, struct inotify_watch, d_list);
+		get_inotify_watch(watch);
+		up(&dev->sem);
+
+		inode = watch->inode;
+		down(&inode->inotify_sem);
+		down(&dev->sem);
+		remove_watch_no_event(watch, dev);
+		up(&dev->sem);
+		up(&inode->inotify_sem);
+		put_inotify_watch(watch);
+	}
+
+	/* destroy all of the events on this device */
+	down(&dev->sem);
+	while (!list_empty(&dev->events))
+		inotify_dev_event_dequeue(dev);
+	up(&dev->sem);
+
+	/* free this device: the put matching the get in inotify_init() */
+	put_inotify_dev(dev);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(inotify_free);
+
+/**
+ * inotify_inotify_add_watch - add a watch to this inotify device
+ * @dev: inotify device
+ * @inode: inode to watch for events
+ * @mask: filesystem event mask
+ * @callback_arg - ptr to data that kernel consumer associates with this watch
+ *
+ * Caller must pin the inode in question, e.g. by calling path_lookup.
+ */
+s32 inotify_add_watch(struct inotify_device *dev, struct inode *inode,
+		      u32 mask, void *callback_arg)
+{
+	int mask_add = 0;
+	struct inotify_watch *watch, *old;
+	int ret;
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	if (mask & IN_MASK_ADD)
+		mask_add = 1;
+
+	/* don't let user-space set invalid bits: we don't want flags set */
+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
+	if (unlikely(!mask)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/*
+	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
+	 * are already watching.  We just update the mask and callback_arg and
+	 * return its wd.
+	 */
+	old = inode_find_dev(inode, dev);
+	if (unlikely(old)) {
+		if (mask_add)
+			old->mask |= mask;
+		else
+			old->mask = mask;
+		old->callback_arg = callback_arg;
+		ret = old->wd;
+		goto out;
+	}
+
+	watch = create_watch(dev, mask, inode, callback_arg);
+	if (unlikely(IS_ERR(watch))) {
+		ret = PTR_ERR(watch);
+		goto out;
+	}
+
+	/* Add the watch to the device's and the inode's list */
+	list_add(&watch->d_list, &dev->watches);
+	list_add(&watch->i_list, &inode->inotify_watches);
+	ret = watch->wd;
+
+out:
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(inotify_add_watch);
+
+/**
+ * inotify_ignore - remove a given wd from this inotify device
+ * @dev: inotify device
+ * @wd: watch descriptor to remove
+ */
+int inotify_ignore(struct inotify_device *dev, s32 wd)
+{
+	struct inotify_watch *watch;
+	struct inode *inode;
+
+	down(&dev->sem);
+	watch = idr_find(&dev->idr, wd);
+	if (unlikely(!watch)) {
+		up(&dev->sem);
+		return -EINVAL;
+	}
+	get_inotify_watch(watch);
+	inode = watch->inode;
+	up(&dev->sem);
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	/* make sure that we did not race */
+	watch = idr_find(&dev->idr, wd);
+	if (likely(watch))
+		remove_watch(watch, dev);
+
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	put_inotify_watch(watch);
+
+	return 0;
+
+}
+EXPORT_SYMBOL_GPL(inotify_ignore);
+
+/* Kernel producer API */
 
 /**
  * inotify_inode_queue_event - queue an event to all watches on this inode
@@ -498,9 +713,10 @@ static inline int inotify_inode_watched(
  * @mask: event mask describing this event
  * @cookie: cookie for synchronization, or zero
  * @name: filename, if any
+ * @cinode: child inode, used for events on directories
  */
 void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,
-			       const char *name)
+			       const char *name, struct inode *cinode)
 {
 	struct inotify_watch *watch, *next;
 
@@ -514,7 +730,12 @@ void inotify_inode_queue_event(struct in
 			struct inotify_device *dev = watch->dev;
 			get_inotify_watch(watch);
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, mask, cookie, name);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, mask,
+						       cookie, name, cinode);
+			else
+				inotify_dev_queue_event(dev, watch, mask,
+							cookie, name);
 			if (watch_mask & IN_ONESHOT)
 				remove_watch_no_event(watch, dev);
 			up(&dev->sem);
@@ -548,7 +769,8 @@ void inotify_dentry_parent_queue_event(s
 	if (inotify_inode_watched(inode)) {
 		dget(parent);
 		spin_unlock(&dentry->d_lock);
-		inotify_inode_queue_event(inode, mask, cookie, name);
+		inotify_inode_queue_event(inode, mask, cookie, name,
+					  dentry->d_inode);
 		dput(parent);
 	} else
 		spin_unlock(&dentry->d_lock);
@@ -631,7 +853,12 @@ void inotify_unmount_inodes(struct list_
 		list_for_each_entry_safe(watch, next_w, watches, i_list) {
 			struct inotify_device *dev = watch->dev;
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, IN_UNMOUNT,
+						       0, NULL, NULL);
+			else
+				inotify_dev_queue_event(dev, watch, IN_UNMOUNT,
+							0, NULL);
 			remove_watch(watch, dev);
 			up(&dev->sem);
 		}
@@ -757,83 +984,7 @@ static ssize_t inotify_read(struct file 
 
 static int inotify_release(struct inode *ignored, struct file *file)
 {
-	struct inotify_device *dev = file->private_data;
-
-	/*
-	 * Destroy all of the watches on this device.  Unfortunately, not very
-	 * pretty.  We cannot do a simple iteration over the list, because we
-	 * do not know the inode until we iterate to the watch.  But we need to
-	 * hold inode->inotify_sem before dev->sem.  The following works.
-	 */
-	while (1) {
-		struct inotify_watch *watch;
-		struct list_head *watches;
-		struct inode *inode;
-
-		down(&dev->sem);
-		watches = &dev->watches;
-		if (list_empty(watches)) {
-			up(&dev->sem);
-			break;
-		}
-		watch = list_entry(watches->next, struct inotify_watch, d_list);
-		get_inotify_watch(watch);
-		up(&dev->sem);
-
-		inode = watch->inode;
-		down(&inode->inotify_sem);
-		down(&dev->sem);
-		remove_watch_no_event(watch, dev);
-		up(&dev->sem);
-		up(&inode->inotify_sem);
-		put_inotify_watch(watch);
-	}
-
-	/* destroy all of the events on this device */
-	down(&dev->sem);
-	while (!list_empty(&dev->events))
-		inotify_dev_event_dequeue(dev);
-	up(&dev->sem);
-
-	/* free this device: the put matching the get in inotify_init() */
-	put_inotify_dev(dev);
-
-	return 0;
-}
-
-/*
- * inotify_ignore - remove a given wd from this inotify instance.
- *
- * Can sleep.
- */
-static int inotify_ignore(struct inotify_device *dev, s32 wd)
-{
-	struct inotify_watch *watch;
-	struct inode *inode;
-
-	down(&dev->sem);
-	watch = idr_find(&dev->idr, wd);
-	if (unlikely(!watch)) {
-		up(&dev->sem);
-		return -EINVAL;
-	}
-	get_inotify_watch(watch);
-	inode = watch->inode;
-	up(&dev->sem);
-
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	/* make sure that we did not race */
-	watch = idr_find(&dev->idr, wd);
-	if (likely(watch))
-		remove_watch(watch, dev);
-
-	up(&dev->sem);
-	up(&inode->inotify_sem);
-	put_inotify_watch(watch);
-
-	return 0;
+	return inotify_free(file->private_data);
 }
 
 static long inotify_ioctl(struct file *file, unsigned int cmd,
@@ -887,12 +1038,15 @@ asmlinkage long sys_inotify_init(void)
 		goto out_free_uid;
 	}
 
-	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	dev = inotify_init(NULL);
 	if (unlikely(!dev)) {
 		ret = -ENOMEM;
 		goto out_free_uid;
 	}
 
+	dev->user = user;
+	atomic_inc(&user->inotify_devs);
+
 	filp->f_op = &inotify_fops;
 	filp->f_vfsmnt = mntget(inotify_mnt);
 	filp->f_dentry = dget(inotify_mnt->mnt_root);
@@ -901,20 +1055,6 @@ asmlinkage long sys_inotify_init(void)
 	filp->f_flags = O_RDONLY;
 	filp->private_data = dev;
 
-	idr_init(&dev->idr);
-	INIT_LIST_HEAD(&dev->events);
-	INIT_LIST_HEAD(&dev->watches);
-	init_waitqueue_head(&dev->wq);
-	sema_init(&dev->sem, 1);
-	dev->event_count = 0;
-	dev->queue_size = 0;
-	dev->max_events = inotify_max_queued_events;
-	dev->user = user;
-	dev->last_wd = 0;
-	atomic_set(&dev->count, 0);
-
-	get_inotify_dev(dev);
-	atomic_inc(&user->inotify_devs);
 	fd_install(fd, filp);
 
 	return fd;
@@ -928,13 +1068,11 @@ out_put_fd:
 
 asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
 {
-	struct inotify_watch *watch, *old;
 	struct inode *inode;
 	struct inotify_device *dev;
 	struct nameidata nd;
 	struct file *filp;
 	int ret, fput_needed;
-	int mask_add = 0;
 	unsigned flags = 0;
 
 	filp = fget_light(fd, &fput_needed);
@@ -960,46 +1098,7 @@ asmlinkage long sys_inotify_add_watch(in
 	inode = nd.dentry->d_inode;
 	dev = filp->private_data;
 
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	if (mask & IN_MASK_ADD)
-		mask_add = 1;
-
-	/* don't let user-space set invalid bits: we don't want flags set */
-	mask &= IN_ALL_EVENTS | IN_ONESHOT;
-	if (unlikely(!mask)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	/*
-	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
-	 * are already watching.  We just update the mask and return its wd.
-	 */
-	old = inode_find_dev(inode, dev);
-	if (unlikely(old)) {
-		if (mask_add)
-			old->mask |= mask;
-		else
-			old->mask = mask;
-		ret = old->wd;
-		goto out;
-	}
-
-	watch = create_watch(dev, mask, inode);
-	if (unlikely(IS_ERR(watch))) {
-		ret = PTR_ERR(watch);
-		goto out;
-	}
-
-	/* Add the watch to the device's and the inode's list */
-	list_add(&watch->d_list, &dev->watches);
-	list_add(&watch->i_list, &inode->inotify_watches);
-	ret = watch->wd;
-out:
-	up(&dev->sem);
-	up(&inode->inotify_sem);
+	ret = inotify_add_watch(dev, inode, mask, NULL);
 	path_release(&nd);
 fput_and_out:
 	fput_light(filp, fput_needed);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 94919c3..606b875 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -35,16 +35,18 @@ static inline void fsnotify_move(struct 
 
 	if (isdir)
 		isdir = IN_ISDIR;
-	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
-	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
+	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, cookie,
+				  old_name, NULL);
+	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie,
+				  new_name, source);
 
 	if (target) {
-		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
+		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL,NULL);
 		inotify_inode_is_dead(target);
 	}
 
 	if (source) {
-		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
+		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);
@@ -66,7 +68,7 @@ static inline void fsnotify_nameremove(s
  */
 static inline void fsnotify_inoderemove(struct inode *inode)
 {
-	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);
+	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL);
 	inotify_inode_is_dead(inode);
 }
 
@@ -76,7 +78,8 @@ static inline void fsnotify_inoderemove(
 static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 {
 	inode_dir_notify(inode, DN_CREATE);
-	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name);
+	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
+				  dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -87,7 +90,7 @@ static inline void fsnotify_mkdir(struct
 {
 	inode_dir_notify(inode, DN_CREATE);
 	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, 
-				  dentry->d_name.name);
+				  dentry->d_name.name, dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -104,7 +107,7 @@ static inline void fsnotify_access(struc
 
 	dnotify_parent(dentry, DN_ACCESS);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -120,7 +123,7 @@ static inline void fsnotify_modify(struc
 
 	dnotify_parent(dentry, DN_MODIFY);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -135,7 +138,7 @@ static inline void fsnotify_open(struct 
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);	
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -153,7 +156,7 @@ static inline void fsnotify_close(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -168,7 +171,7 @@ static inline void fsnotify_xattr(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -215,7 +218,7 @@ static inline void fsnotify_change(struc
 	if (in_mask) {
 		if (S_ISDIR(inode->i_mode))
 			in_mask |= IN_ISDIR;
-		inotify_inode_queue_event(inode, in_mask, 0, NULL);
+		inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL);
 		inotify_dentry_parent_queue_event(dentry, in_mask, 0,
 						  dentry->d_name.name);
 	}
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index 267c88b..2a8d1bd 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -14,6 +14,9 @@
  *
  * When you are watching a directory, you will receive the filename for events
  * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ *
+ * When using inotify from the kernel, len will always be zero.  Instead you
+ * should check the path for non-NULL in your callback.
  */
 struct inotify_event {
 	__s32		wd;		/* watch descriptor */
@@ -71,8 +74,19 @@ struct inotify_event {
 
 #ifdef CONFIG_INOTIFY
 
+/* Kernel consumer API */
+
+extern struct inotify_device *inotify_init(void (*)(struct inotify_event *,
+						    const char *,
+						    struct inode *, void *));
+extern int inotify_free(struct inotify_device *);
+extern __s32 inotify_add_watch(struct inotify_device *, struct inode *, __u32,
+			       void *);
+extern int inotify_ignore(struct inotify_device *, __s32);
+
+/* Kernel producer API */
 extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
-				      const char *);
+				      const char *, struct inode *);
 extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
 					      const char *);
 extern void inotify_unmount_inodes(struct list_head *);
@@ -81,6 +95,7 @@ extern u32 inotify_get_cookie(void);
 
 #else
 
+/* Kernel producer API stubs */
 static inline void inotify_inode_queue_event(struct inode *inode,
 					     __u32 mask, __u32 cookie,
 					     const char *filename)

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


linux-2.6-audit-promisc.patch:
 include/linux/audit.h |    7 ++++++-
 net/core/dev.c        |    7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-audit-promisc.patch ---
>From linux-audit-bounces at redhat.com Sat Dec  3 13:39:07 2005
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 03 Dec 2005 13:39:07 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbW-0003Ra-S4 for dwmw2 at baythorne.infradead.org; Sat, 03 Dec 2005
	13:39:07 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbU-0006dw-2W for dwmw2 at infradead.org; Sat, 03 Dec 2005 13:39:06 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 18B39732FF; Sat,
	 3 Dec 2005 08:39:03 -0500 (EST)
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 jB3Dd1du018704; Sat, 3 Dec 2005 08:39:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	jB3Dd1V16833; Sat, 3 Dec 2005 08:39:01 -0500
Received: from vpn83-123.boston.redhat.com (vpn83-123.boston.redhat.com
	[172.16.83.123]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	jB3Dd0EW010094;  Sat, 3 Dec 2005 08:39:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
To: Linux Audit Discussion <linux-audit at redhat.com>
Date: Sat, 3 Dec 2005 08:39:35 -0500
User-Agent: KMail/1.7.2
MIME-Version: 1.0
Content-Type: Multipart/Mixed; boundary="Boundary-00=_XAakD2Qt0krjnKY"
Message-Id: <200512030839.35344.sgrubb at redhat.com>
X-loop: linux-audit at redhat.com
Cc: lspp-list <redhat-lspp at redhat.com>
Subject: [PATCH] promiscuous mode
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Hi,

When a network interface goes into promiscuous mode, its an important security 
issue. The attached patch is intended to capture that action and send an 
event to the audit system.

The patch carves out a new block of numbers for kernel detected anomalies. 
These are events that may indicate suspicious activity. Other examples of 
potential kernel anomalies would be: exceeding disk quota, rlimit violations, 
changes to syscall entry table.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/x-diff; charset="us-ascii"; name="linux-2.6.14-audit-promiscuous.patch"
Content-Disposition: attachment; filename="linux-2.6.14-audit-promiscuous.patch"
Content-Transfer-Encoding: 8bit

diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h
--- linux-2.6.14.orig/include/linux/audit.h	2005-12-02 15:28:34.000000000 -0500
+++ linux-2.6.14/include/linux/audit.h	2005-12-02 15:28:22.000000000 -0500
@@ -35,7 +35,8 @@
  * 1400 - 1499 SE Linux use
  * 1500 - 1599 kernel LSPP events
  * 1600 - 1699 kernel crypto events
- * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 1700 - 1799 kernel anomaly records
+ * 1800 - 1999 future kernel use (maybe integrity labels and related events)
  * 2000 is for otherwise unclassified kernel audit messages (legacy)
  * 2001 - 2099 unused (kernel)
  * 2100 - 2199 user space anomaly records
@@ -87,6 +88,10 @@
 #define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */
 #define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */
 
+#define AUDIT_FIRST_KERN_ANOM_MSG   1700
+#define AUDIT_LAST_KERN_ANOM_MSG    1799
+#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
+
 #define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
 
 /* Rule flags */
diff -urp linux-2.6.14.orig/net/core/dev.c linux-2.6.14/net/core/dev.c
--- linux-2.6.14.orig/net/core/dev.c	2005-12-02 14:22:10.000000000 -0500
+++ linux-2.6.14/net/core/dev.c	2005-12-02 15:23:27.000000000 -0500
@@ -114,6 +114,7 @@
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
 #include <asm/current.h>
+#include <linux/audit.h>
 
 /*
  *	The list of packet types we will receive (as opposed to discard)
@@ -2121,6 +2122,12 @@ void dev_set_promiscuity(struct net_devi
 		printk(KERN_INFO "device %s %s promiscuous mode\n",
 		       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
 		       					       "left");
+		audit_log(current->audit_context, GFP_KERNEL,
+			AUDIT_ANOM_PROMISCUOUS,
+			"dev=%s prom=%d old_prom=%d auid=%u",
+			dev->name, (dev->flags & IFF_PROMISC),
+			(old_flags & IFF_PROMISC),
+			audit_get_loginuid(current->audit_context)); 
 	}
 }
 

--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

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

linux-2.6-audit-rule-log.patch:
 include/linux/audit.h |    2 +-
 kernel/auditfilter.c  |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-audit-rule-log.patch ---
diff -ur linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-02-14 10:50:56.000000000 -0500
+++ linux-2.6.15.x86_64/include/linux/audit.h	2006-02-14 10:51:41.000000000 -0500
@@ -246,7 +246,7 @@
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
 	__u32		field_count;
-	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
 	__u32		fields[AUDIT_MAX_FIELDS];
 	__u32		values[AUDIT_MAX_FIELDS];
 	__u32		fieldflags[AUDIT_MAX_FIELDS];
diff -ur linux-2.6.15.x86_64.orig/kernel/auditfilter.c linux-2.6.15.x86_64/kernel/auditfilter.c
--- linux-2.6.15.x86_64.orig/kernel/auditfilter.c	2006-02-14 10:51:25.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditfilter.c	2006-02-14 10:52:54.000000000 -0500
@@ -586,10 +586,11 @@
 
 		err = audit_add_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u added an audit rule\n", loginuid);
-		else {
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u add rule to list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
+		if (err) {
 			if (entry->rule.watch)
 				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
@@ -606,9 +607,10 @@
 
 		err = audit_del_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u removed an audit rule\n", loginuid);
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u remove rule from list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
 		if (entry->rule.watch)
 			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);

linux-2.6-audit-string-1.patch:
 include/linux/audit.h       |   31 ++
 kernel/audit.c              |   19 +
 kernel/audit.h              |   23 +-
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++-----------
 kernel/auditsc.c            |   50 ++--
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

--- NEW FILE linux-2.6-audit-string-1.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:05:27 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; Tue, 07 Feb 2006 12:05:54 -0500
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 k17H5rQo013224;
	Tue, 7 Feb 2006 12:05:53 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5o125027;
	Tue, 7 Feb 2006 12:05:50 -0500
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 k17H5jmt006474;
	Tue, 7 Feb 2006 12:05:45 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 4C2D472F6F; Tue,  7 Feb 2006 12:05:45 -0500 (EST)
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
	k17H5hnh005461 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:05:43 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5g124983
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:42 -0500
Received: from ccerelbas04.cce.hp.com (ccerelbas04.cce.hp.com [161.114.21.107])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H5fMr025186
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:41 -0500
Received: from ccerelint01.cce.cpqcorp.net (ccerelint01.cce.cpqcorp.net
	[16.110.74.103])
	by ccerelbas04.cce.hp.com (Postfix) with ESMTP id 0523834129
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by ccerelint01.cce.cpqcorp.net (Postfix) with ESMTP id A3CB134021
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 4289738448A2; Tue,  7 Feb 2006 12:05:27 -0500 (EST)
Date: Tue, 7 Feb 2006 12:05:27 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170527.GB2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190231.GB24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190231.GB24489 at zk3.dec.com>
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: Re: [PATCH 1/2] audit string fields interface + consumer
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: 32646
X-UID: 48007

Updated patch to dynamically allocate audit rule fields in kernel's
internal representation.  Added unlikely() calls for testing memory
allocation result.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:02:31PM EST]
> Modify audit's kernel-userspace interface to allow the specification
> of string fields in audit rules.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h       |   31 +++
 kernel/audit.c              |   19 ++
 kernel/audit.h              |   23 ++
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++----------
 kernel/auditsc.c            |   50 ++---
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

b5d36f87ed2ce86a306e3ae709805e892211f870
diff --git a/include/linux/audit.h b/include/linux/audit.h
index a485639..c208554 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -50,15 +50,18 @@
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
-#define AUDIT_LIST		1002	/* List syscall filtering rules */
-#define AUDIT_ADD		1003	/* Add syscall filtering rule */
-#define AUDIT_DEL		1004	/* Delete syscall filtering rule */
+#define AUDIT_LIST		1002	/* List syscall rules -- deprecated */
+#define AUDIT_ADD		1003	/* Add syscall rule -- deprecated */
+#define AUDIT_DEL		1004	/* Delete syscall rule -- deprecated */
 #define AUDIT_USER		1005	/* Message from userspace -- deprecated */
 #define AUDIT_LOGIN		1006	/* Define the login id and information */
 #define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
 #define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
 #define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
 #define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
+#define AUDIT_ADD_RULE		1011	/* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012	/* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013	/* List syscall filtering rules */
 
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
@@ -229,6 +232,26 @@ struct audit_status {
 	__u32		backlog;	/* messages waiting in queue */
 };
 
+/* audit_rule_data supports filter rules with both integer and string
+ * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
+ * AUDIT_LIST_RULES requests.
+ */
+struct audit_rule_data {
+	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
+	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
+	__u32		field_count;
+	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		fields[AUDIT_MAX_FIELDS];
+	__u32		values[AUDIT_MAX_FIELDS];
+	__u32		fieldflags[AUDIT_MAX_FIELDS];
+	__u32		buflen;	/* total length of string fields */
+	char		buf[0];	/* string fields buffer */
+};
+
+/* audit_rule is supported to maintain backward compatibility with
+ * userspace.  It supports integer fields only and corresponds to
+ * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests.
+ */
 struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
@@ -340,7 +363,7 @@ extern void		    audit_log_d_path(struct
 extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
 extern int audit_filter_type(int type);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
-				 void *data, uid_t loginuid);
+				 void *data, size_t datasz, uid_t loginuid);
 #else
 #define audit_log(c,g,t,f,...) do { ; } while (0)
 #define audit_log_start(c,g,t) ({ NULL; })
diff --git a/kernel/audit.c b/kernel/audit.c
index d95efd6..bdda766 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -52,6 +52,7 @@
 #include <linux/audit.h>
 
 #include <net/sock.h>
+#include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 
@@ -361,9 +362,12 @@ static int audit_netlink_ok(kernel_cap_t
 	switch (msg_type) {
 	case AUDIT_GET:
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 	case AUDIT_SET:
 	case AUDIT_ADD:
+	case AUDIT_ADD_RULE:
 	case AUDIT_DEL:
+	case AUDIT_DEL_RULE:
 	case AUDIT_SIGNAL_INFO:
 		if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL))
 			err = -EPERM;
@@ -470,12 +474,23 @@ static int audit_receive_msg(struct sk_b
 		break;
 	case AUDIT_ADD:
 	case AUDIT_DEL:
-		if (nlh->nlmsg_len < sizeof(struct audit_rule))
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule))
 			return -EINVAL;
 		/* fallthrough */
 	case AUDIT_LIST:
 		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
-					   uid, seq, data, loginuid);
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
+		break;
+	case AUDIT_ADD_RULE:
+	case AUDIT_DEL_RULE:
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule_data))
+			return -EINVAL;
+		/* fallthrough */
+	case AUDIT_LIST_RULES:
+		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
 		break;
 	case AUDIT_SIGNAL_INFO:
 		sig_data.uid = audit_sig_uid;
diff --git a/kernel/audit.h b/kernel/audit.h
index 7643e46..4b602cd 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,10 +52,27 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_field {
+	u32			type;
+	u32			val;
+	u32			op;
+};
+
+struct audit_krule {
+	int			vers_ops;
+	u32			flags;
+	u32			listnr;
+	u32			action;
+	u32			mask[AUDIT_BITMASK_SIZE];
+	u32			buflen; /* for data alloc on list rules */
+	u32			field_count;
+	struct audit_field	*fields;
+};
+
 struct audit_entry {
-	struct list_head  list;
-	struct rcu_head   rcu;
-	struct audit_rule rule;
+	struct list_head	list;
+	struct rcu_head		rcu;
+	struct audit_krule	rule;
 };
 
 
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index a3a3275..5735acd 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -40,52 +40,279 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
-/* Copy rule from user-space to kernel-space.  Called from 
- * audit_add_rule during AUDIT_ADD. */
-static inline int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
+static inline void audit_free_rule(struct audit_entry *e)
 {
+	kfree(e->rule.fields);
+	kfree(e);
+}
+
+static inline void audit_free_rule_rcu(struct rcu_head *head)
+{
+	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
+	audit_free_rule(e);
+}
+
+/* Unpack a filter field's string representation from user-space
+ * buffer. */
+static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
+{
+	char *str;
+
+	if (!*bufp || (len == 0) || (len > *remain))
+		return ERR_PTR(-EINVAL);
+
+	/* Of the currently implemented string fields, PATH_MAX
+	 * defines the longest valid length.
+	 */
+	if (len > PATH_MAX)
+		return ERR_PTR(-ENAMETOOLONG);
+
+	str = kmalloc(len + 1, GFP_KERNEL);
+	if (unlikely(!str))
+		return ERR_PTR(-ENOMEM);
+
+	memcpy(str, *bufp, len);
+	str[len] = 0;
+	*bufp += len;
+	*remain -= len;
+
+	return str;
+}
+
+/* Common user-space to kernel rule translation. */
+static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
+{
+	unsigned listnr;
+	struct audit_entry *entry;
+	struct audit_field *fields;
+	int i, err;
+
+	err = -EINVAL;
+	listnr = rule->flags & ~AUDIT_FILTER_PREPEND;
+	switch(listnr) {
+	default:
+		goto exit_err;
+	case AUDIT_FILTER_USER:
+	case AUDIT_FILTER_TYPE:
+#ifdef CONFIG_AUDITSYSCALL
+	case AUDIT_FILTER_ENTRY:
+	case AUDIT_FILTER_EXIT:
+	case AUDIT_FILTER_TASK:
+#endif
+		;
+	}
+	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE &&
+	    rule->action != AUDIT_ALWAYS)
+		goto exit_err;
+	if (rule->field_count > AUDIT_MAX_FIELDS)
+		goto exit_err;
+
+	err = -ENOMEM;
+	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+	if (unlikely(!entry))
+		goto exit_err;
+	fields = kmalloc(sizeof(*fields) * rule->field_count, GFP_KERNEL);
+	if (unlikely(!fields)) {
+		kfree(entry);
+		goto exit_err;
+	}
+
+	memset(&entry->rule, 0, sizeof(struct audit_krule));
+	memset(fields, 0, sizeof(struct audit_field));
+
+	entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND;
+	entry->rule.listnr = listnr;
+	entry->rule.action = rule->action;
+	entry->rule.field_count = rule->field_count;
+	entry->rule.fields = fields;
+
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
+		entry->rule.mask[i] = rule->mask[i];
+
+	return entry;
+
+exit_err:
+	return ERR_PTR(err);
+}
+
+/* Translate struct audit_rule to kernel's rule respresentation.
+ * Exists for backward compatibility with userspace. */
+static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
+{
+	struct audit_entry *entry;
+	int err = 0;
 	int i;
 
-	if (s->action != AUDIT_NEVER
-	    && s->action != AUDIT_POSSIBLE
-	    && s->action != AUDIT_ALWAYS)
-		return -1;
-	if (s->field_count < 0 || s->field_count > AUDIT_MAX_FIELDS)
-		return -1;
-	if ((s->flags & ~AUDIT_FILTER_PREPEND) >= AUDIT_NR_FILTERS)
-		return -1;
-
-	d->flags	= s->flags;
-	d->action	= s->action;
-	d->field_count	= s->field_count;
-	for (i = 0; i < d->field_count; i++) {
-		d->fields[i] = s->fields[i];
-		d->values[i] = s->values[i];
+	entry = audit_to_entry_common(rule);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	for (i = 0; i < rule->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
+		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->val = rule->values[i];
+
+		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
+		if (f->op & AUDIT_NEGATE)
+			f->op |= AUDIT_NOT_EQUAL;
+		else if (!(f->op & AUDIT_OPERATORS))
+			f->op |= AUDIT_EQUAL;
+		f->op &= ~AUDIT_NEGATE;
 	}
-	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) d->mask[i] = s->mask[i];
-	return 0;
+
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
 }
 
-/* Check to see if two rules are identical.  It is called from
- * audit_add_rule during AUDIT_ADD and 
- * audit_del_rule during AUDIT_DEL. */
-static int audit_compare_rule(struct audit_rule *a, struct audit_rule *b)
+/* Translate struct audit_rule_data to kernel's rule respresentation. */
+static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
+					       size_t datasz)
 {
+	int err = 0;
+	struct audit_entry *entry;
+	void *bufp;
+	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
 	int i;
 
-	if (a->flags != b->flags)
-		return 1;
+	entry = audit_to_entry_common((struct audit_rule *)data);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	bufp = data->buf;
+	entry->rule.vers_ops = 2;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		err = -EINVAL;
+		if (!(data->fieldflags[i] & AUDIT_OPERATORS) ||
+		    data->fieldflags[i] & ~AUDIT_OPERATORS)
+			goto exit_free;
+
+		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
+		f->type = data->fields[i];
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			f->val = data->values[i];
+		}
+	}
 
-	if (a->action != b->action)
-		return 1;
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
+}
+
+/* Pack a filter field's string representation into data block. */
+static inline size_t audit_pack_string(void **bufp, char *str)
+{
+	size_t len = strlen(str);
+
+	memcpy(*bufp, str, len);
+	*bufp += len;
+
+	return len;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule.
+ * Exists for backward compatibility with userspace. */
+static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule)
+{
+	struct audit_rule *rule;
+	int i;
+
+	rule = kmalloc(sizeof(*rule), GFP_KERNEL);
+	if (unlikely(!rule))
+		return ERR_PTR(-ENOMEM);
+	memset(rule, 0, sizeof(*rule));
+
+	rule->flags = krule->flags | krule->listnr;
+	rule->action = krule->action;
+	rule->field_count = krule->field_count;
+	for (i = 0; i < rule->field_count; i++) {
+		rule->values[i] = krule->fields[i].val;
+		rule->fields[i] = krule->fields[i].type;
+
+		if (krule->vers_ops == 1) {
+			if (krule->fields[i].op & AUDIT_NOT_EQUAL)
+				rule->fields[i] |= AUDIT_NEGATE;
+		} else {
+			rule->fields[i] |= krule->fields[i].op;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) rule->mask[i] = krule->mask[i];
 
-	if (a->field_count != b->field_count)
+	return rule;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule_data. */
+static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
+{
+	struct audit_rule_data *data;
+	void *bufp;
+	int i;
+
+	data = kmalloc(sizeof(*data) + krule->buflen, GFP_KERNEL);
+	if (unlikely(!data))
+		return ERR_PTR(-ENOMEM);
+	memset(data, 0, sizeof(*data));
+
+	data->flags = krule->flags | krule->listnr;
+	data->action = krule->action;
+	data->field_count = krule->field_count;
+	bufp = data->buf;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &krule->fields[i];
+
+		data->fields[i] = f->type;
+		data->fieldflags[i] = f->op;
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			data->values[i] = f->val;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) data->mask[i] = krule->mask[i];
+
+	return data;
+}
+
+/* Compare two rules in kernel format.  Considered success if rules
+ * don't match. */
+static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
+{
+	int i;
+
+	if (a->flags != b->flags ||
+	    a->listnr != b->listnr ||
+	    a->action != b->action ||
+	    a->field_count != b->field_count)
 		return 1;
 
 	for (i = 0; i < a->field_count; i++) {
-		if (a->fields[i] != b->fields[i]
-		    || a->values[i] != b->values[i])
+		if (a->fields[i].type != b->fields[i].type ||
+		    a->fields[i].op != b->fields[i].op)
 			return 1;
+
+		switch(a->fields[i].type) {
+		/* call type-specific comparison routines here */
+		default:
+			if (a->fields[i].val != b->fields[i].val)
+				return 1;
+		}
 	}
 
 	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
@@ -95,41 +322,21 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
-static inline int audit_add_rule(struct audit_rule *rule,
+static inline int audit_add_rule(struct audit_entry *entry,
 				  struct list_head *list)
 {
-	struct audit_entry  *entry;
-	int i;
+	struct audit_entry *e;
 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * addition routine. */
-	list_for_each_entry(entry, list, list) {
-		if (!audit_compare_rule(rule, &entry->rule))
+	list_for_each_entry(e, list, list) {
+		if (!audit_compare_rule(&entry->rule, &e->rule))
 			return -EEXIST;
 	}
 
-	for (i = 0; i < rule->field_count; i++) {
-		if (rule->fields[i] & AUDIT_UNUSED_BITS)
-			return -EINVAL;
-		if ( rule->fields[i] & AUDIT_NEGATE)
-			rule->fields[i] |= AUDIT_NOT_EQUAL;
-		else if ( (rule->fields[i] & AUDIT_OPERATORS) == 0 )
-			rule->fields[i] |= AUDIT_EQUAL;
-		rule->fields[i] &= ~AUDIT_NEGATE;
-	}
-
-	if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL)))
-		return -ENOMEM;
-	if (audit_copy_rule(&entry->rule, rule)) {
-		kfree(entry);
-		return -EINVAL;
-	}
-
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
-		entry->rule.flags &= ~AUDIT_FILTER_PREPEND;
 		list_add_rcu(&entry->list, list);
 	} else {
 		list_add_tail_rcu(&entry->list, list);
@@ -138,16 +345,9 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
-static inline void audit_free_rule(struct rcu_head *head)
-{
-	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
-	kfree(e);
-}
-
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
-static inline int audit_del_rule(struct audit_rule *rule,
+static inline int audit_del_rule(struct audit_entry *entry,
 				 struct list_head *list)
 {
 	struct audit_entry  *e;
@@ -155,16 +355,18 @@ static inline int audit_del_rule(struct 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * deletion routine. */
 	list_for_each_entry(e, list, list) {
-		if (!audit_compare_rule(rule, &e->rule)) {
+		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
-			call_rcu(&e->rcu, audit_free_rule);
+			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
 	}
 	return -ENOENT;		/* No matching rule */
 }
 
-static int audit_list_rules(void *_dest)
+/* List rules using struct audit_rule.  Exists for backward
+ * compatibility with userspace. */
+static int audit_list(void *_dest)
 {
 	int pid, seq;
 	int *dest = _dest;
@@ -180,9 +382,16 @@ static int audit_list_rules(void *_dest)
 	/* The *_rcu iterators not needed here because we are
 	   always called with audit_netlink_sem held. */
 	for (i=0; i<AUDIT_NR_FILTERS; i++) {
-		list_for_each_entry(entry, &audit_filter_list[i], list)
+		list_for_each_entry(entry, &audit_filter_list[i], list) {
+			struct audit_rule *rule;
+
+			rule = audit_krule_to_rule(&entry->rule);
+			if (unlikely(!rule))
+				break;
 			audit_send_reply(pid, seq, AUDIT_LIST, 0, 1,
-					 &entry->rule, sizeof(entry->rule));
+					 rule, sizeof(*rule));
+			kfree(rule);
+		}
 	}
 	audit_send_reply(pid, seq, AUDIT_LIST, 1, 1, NULL, 0);
 	
@@ -190,6 +399,40 @@ static int audit_list_rules(void *_dest)
 	return 0;
 }
 
+/* List rules using struct audit_rule_data. */
+static int audit_list_rules(void *_dest)
+{
+	int pid, seq;
+	int *dest = _dest;
+	struct audit_entry *e;
+	int i;
+
+	pid = dest[0];
+	seq = dest[1];
+	kfree(dest);
+
+	down(&audit_netlink_sem);
+
+	/* The *_rcu iterators not needed here because we are
+	   always called with audit_netlink_sem held. */
+	for (i=0; i<AUDIT_NR_FILTERS; i++) {
+		list_for_each_entry(e, &audit_filter_list[i], list) {
+			struct audit_rule_data *data;
+
+			data = audit_krule_to_data(&e->rule);
+			if (unlikely(!data))
+				break;
+			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
+					 data, sizeof(*data));
+			kfree(data);
+		}
+	}
+	audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
+
+	up(&audit_netlink_sem);
+	return 0;
+}
+
 /**
  * audit_receive_filter - apply all rules to the specified message type
  * @type: audit message type
@@ -197,18 +440,20 @@ static int audit_list_rules(void *_dest)
  * @uid: target uid for netlink audit messages
  * @seq: netlink audit message sequence (serial) number
  * @data: payload data
+ * @datasz: size of payload data
  * @loginuid: loginuid of sender
  */
 int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
-							uid_t loginuid)
+			 size_t datasz, uid_t loginuid)
 {
 	struct task_struct *tsk;
 	int *dest;
-	int		   err = 0;
-	unsigned listnr;
+	int err = 0;
+	struct audit_entry *entry;
 
 	switch (type) {
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 		/* We can't just spew out the rules here because we might fill
 		 * the available socket buffer space and deadlock waiting for
 		 * auditctl to read from it... which isn't ever going to
@@ -221,41 +466,48 @@ int audit_receive_filter(int type, int p
 		dest[0] = pid;
 		dest[1] = seq;
 
-		tsk = kthread_run(audit_list_rules, dest, "audit_list_rules");
+		if (type == AUDIT_LIST)
+			tsk = kthread_run(audit_list, dest, "audit_list");
+		else
+			tsk = kthread_run(audit_list_rules, dest,
+					  "audit_list_rules");
 		if (IS_ERR(tsk)) {
 			kfree(dest);
 			err = PTR_ERR(tsk);
 		}
 		break;
 	case AUDIT_ADD:
-		listnr = ((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		switch(listnr) {
-		default:
-			return -EINVAL;
+	case AUDIT_ADD_RULE:
+		if (type == AUDIT_ADD)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		case AUDIT_FILTER_USER:
-		case AUDIT_FILTER_TYPE:
-#ifdef CONFIG_AUDITSYSCALL
-		case AUDIT_FILTER_ENTRY:
-		case AUDIT_FILTER_EXIT:
-		case AUDIT_FILTER_TASK:
-#endif
-			;
-		}
-		err = audit_add_rule(data, &audit_filter_list[listnr]);
+		err = audit_add_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
+		else
+			audit_free_rule(entry);
 		break;
 	case AUDIT_DEL:
-		listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		if (listnr >= AUDIT_NR_FILTERS)
-			return -EINVAL;
+	case AUDIT_DEL_RULE:
+		if (type == AUDIT_DEL)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		err = audit_del_rule(data, &audit_filter_list[listnr]);
+		err = audit_del_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		audit_free_rule(entry);
 		break;
 	default:
 		return -EINVAL;
@@ -287,29 +539,27 @@ int audit_comparator(const u32 left, con
 
 
 static int audit_filter_user_rules(struct netlink_skb_parms *cb,
-				   struct audit_rule *rule,
+				   struct audit_krule *rule,
 				   enum audit_state *state)
 {
 	int i;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(cb->creds.pid, op, value);
+			result = audit_comparator(cb->creds.pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(cb->creds.uid, op, value);
+			result = audit_comparator(cb->creds.uid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(cb->creds.gid, op, value);
+			result = audit_comparator(cb->creds.gid, f->op, f->val);
 			break;
 		case AUDIT_LOGINUID:
-			result = audit_comparator(cb->loginuid, op, value);
+			result = audit_comparator(cb->loginuid, f->op, f->val);
 			break;
 		}
 
@@ -354,14 +604,11 @@ int audit_filter_type(int type)
 
 	list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TYPE],
 				list) {
-		struct audit_rule *rule = &e->rule;
 		int i;
-		for (i = 0; i < rule->field_count; i++) {
-			u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-			u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-			u32 value  = rule->values[i];
-			if ( field == AUDIT_MSGTYPE ) {
-				result = audit_comparator(type, op, value); 
+		for (i = 0; i < e->rule.field_count; i++) {
+			struct audit_field *f = &e->rule.fields[i];
+			if (f->type == AUDIT_MSGTYPE) {
+				result = audit_comparator(type, f->op, f->val);
 				if (!result)
 					break;
 			}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8f0a61c..e4f7096 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -161,70 +161,68 @@ struct audit_context {
 /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
  * otherwise. */
 static int audit_filter_rules(struct task_struct *tsk,
-			      struct audit_rule *rule,
+			      struct audit_krule *rule,
 			      struct audit_context *ctx,
 			      enum audit_state *state)
 {
 	int i, j;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(tsk->pid, op, value);
+			result = audit_comparator(tsk->pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(tsk->uid, op, value);
+			result = audit_comparator(tsk->uid, f->op, f->val);
 			break;
 		case AUDIT_EUID:
-			result = audit_comparator(tsk->euid, op, value);
+			result = audit_comparator(tsk->euid, f->op, f->val);
 			break;
 		case AUDIT_SUID:
-			result = audit_comparator(tsk->suid, op, value);
+			result = audit_comparator(tsk->suid, f->op, f->val);
 			break;
 		case AUDIT_FSUID:
-			result = audit_comparator(tsk->fsuid, op, value);
+			result = audit_comparator(tsk->fsuid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(tsk->gid, op, value);
+			result = audit_comparator(tsk->gid, f->op, f->val);
 			break;
 		case AUDIT_EGID:
-			result = audit_comparator(tsk->egid, op, value);
+			result = audit_comparator(tsk->egid, f->op, f->val);
 			break;
 		case AUDIT_SGID:
-			result = audit_comparator(tsk->sgid, op, value);
+			result = audit_comparator(tsk->sgid, f->op, f->val);
 			break;
 		case AUDIT_FSGID:
-			result = audit_comparator(tsk->fsgid, op, value);
+			result = audit_comparator(tsk->fsgid, f->op, f->val);
 			break;
 		case AUDIT_PERS:
-			result = audit_comparator(tsk->personality, op, value);
+			result = audit_comparator(tsk->personality, f->op, f->val);
 			break;
 		case AUDIT_ARCH:
  			if (ctx)
-				result = audit_comparator(ctx->arch, op, value);
+				result = audit_comparator(ctx->arch, f->op, f->val);
 			break;
 
 		case AUDIT_EXIT:
 			if (ctx && ctx->return_valid)
-				result = audit_comparator(ctx->return_code, op, value);
+				result = audit_comparator(ctx->return_code, f->op, f->val);
 			break;
 		case AUDIT_SUCCESS:
 			if (ctx && ctx->return_valid) {
-				if (value)
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_SUCCESS);
+				if (f->val)
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_SUCCESS);
 				else
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_FAILURE);
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_FAILURE);
 			}
 			break;
 		case AUDIT_DEVMAJOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MAJOR(ctx->names[j].dev),	op, value)) {
+					if (audit_comparator(MAJOR(ctx->names[j].dev),	f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -234,7 +232,7 @@ static int audit_filter_rules(struct tas
 		case AUDIT_DEVMINOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MINOR(ctx->names[j].dev), op, value)) {
+					if (audit_comparator(MINOR(ctx->names[j].dev), f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -244,8 +242,8 @@ static int audit_filter_rules(struct tas
 		case AUDIT_INODE:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(ctx->names[j].ino, op, value) ||
-					    audit_comparator(ctx->names[j].pino, op, value)) {
+					if (audit_comparator(ctx->names[j].ino, f->op, f->val) ||
+					    audit_comparator(ctx->names[j].pino, f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -255,14 +253,14 @@ static int audit_filter_rules(struct tas
 		case AUDIT_LOGINUID:
 			result = 0;
 			if (ctx)
-				result = audit_comparator(ctx->loginuid, op, value);
+				result = audit_comparator(ctx->loginuid, f->op, f->val);
 			break;
 		case AUDIT_ARG0:
 		case AUDIT_ARG1:
 		case AUDIT_ARG2:
 		case AUDIT_ARG3:
 			if (ctx)
-				result = audit_comparator(ctx->argv[field-AUDIT_ARG0], op, value);
+				result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val);
 			break;
 		}
 
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index d7c0e91..7315824 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per
 	{ AUDIT_LIST,		NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
 	{ AUDIT_ADD,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_DEL,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_LIST_RULES,	NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
+	{ AUDIT_ADD_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_DEL_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_USER,		NETLINK_AUDIT_SOCKET__NLMSG_RELAY    },
 	{ AUDIT_SIGNAL_INFO,	NETLINK_AUDIT_SOCKET__NLMSG_READ     },
 };
-- 
0.99.9n

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


linux-2.6-audit-string-2.patch:
 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 +++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 -
 4 files changed, 128 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-audit-string-2.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:06:57 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; Tue, 07 Feb 2006 12:07:15 -0500
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 k17H7FQo013463;
	Tue, 7 Feb 2006 12:07:15 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H7C125794;
	Tue, 7 Feb 2006 12:07:12 -0500
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 k17H7635006635;
	Tue, 7 Feb 2006 12:07:06 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id B388872F9D; Tue,  7 Feb 2006 12:07:06 -0500 (EST)
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
	k17H74IH005569 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:07:04 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H74125739
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:04 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H732a025911
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:03 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id E699034111
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:07:00 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id DE9C63401D
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id CC89C38448A2; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Date: Tue, 7 Feb 2006 12:06:57 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170657.GC2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190453.GC24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190453.GC24489 at zk3.dec.com>
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: Re: [PATCH 2/2] audit string fields interface + consumer
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: 13244
X-UID: 48008

Merge updates to patch 1/2 of this set.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:04:53PM EST]
> Add AUDIT_WATCH field type and associated helpers.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 ++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 +
 4 files changed, 128 insertions(+), 14 deletions(-)

237afe663373e4f908cb1d0a188fd8b5216069e9
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c208554..d76fa58 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -148,6 +148,7 @@
 #define AUDIT_INODE	102
 #define AUDIT_EXIT	103
 #define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
+#define AUDIT_WATCH	105
 
 #define AUDIT_ARG0      200
 #define AUDIT_ARG1      (AUDIT_ARG0+1)
diff --git a/kernel/audit.h b/kernel/audit.h
index 4b602cd..eb33354 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,6 +52,12 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_watch {
+	char			*path;	 /* watch insertion path */
+	struct list_head	mlist;	 /* entry in master_watchlist */
+	struct list_head	rules;	 /* associated rules */
+};
+
 struct audit_field {
 	u32			type;
 	u32			val;
@@ -67,6 +73,8 @@ struct audit_krule {
 	u32			buflen; /* for data alloc on list rules */
 	u32			field_count;
 	struct audit_field	*fields;
+	struct audit_watch	*watch;	 /* associated watch */
+	struct list_head	rlist;	 /* entry in audit_watch.rules list */
 };
 
 struct audit_entry {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 5735acd..5e9f650 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/audit.h>
 #include <linux/kthread.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/netlink.h>
 #include "audit.h"
 
@@ -40,6 +42,12 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
+static inline void audit_free_watch(struct audit_watch *watch)
+{
+	kfree(watch->path);
+	kfree(watch);
+}
+
 static inline void audit_free_rule(struct audit_entry *e)
 {
 	kfree(e->rule.fields);
@@ -52,6 +60,8 @@ static inline void audit_free_rule_rcu(s
 	audit_free_rule(e);
 }
 
+static LIST_HEAD(master_watchlist);
+
 /* Unpack a filter field's string representation from user-space
  * buffer. */
 static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
@@ -79,6 +89,33 @@ static char *audit_unpack_string(void **
 	return str;
 }
 
+/* Translate a watch string to kernel respresentation. */
+static int audit_to_watch(char *path, struct audit_krule *krule, int fidx)
+{
+	struct audit_field *f = &krule->fields[fidx];
+	struct nameidata nd;
+	struct audit_watch *watch;
+
+	if (path[0] != '/' || path[f->val-1] == '/' ||
+	    krule->listnr != AUDIT_FILTER_EXIT ||
+	    f->op & ~AUDIT_EQUAL)
+		return -EINVAL;
+
+	if (path_lookup(path, 0, &nd) == 0)
+		f->val = nd.dentry->d_inode->i_ino;
+	else
+		f->val = (unsigned int)-1;
+	path_release(&nd);
+
+	watch = kmalloc(sizeof(*watch), GFP_KERNEL);
+	if (unlikely(!watch))
+		return -ENOMEM;
+	watch->path = path;
+	krule->watch = watch;
+
+	return 0;
+}
+
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 {
@@ -150,15 +187,16 @@ static struct audit_entry *audit_rule_to
 	for (i = 0; i < rule->field_count; i++) {
 		struct audit_field *f = &entry->rule.fields[i];
 
-		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
-			err = -EINVAL;
-			goto exit_free;
-		}
-
 		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->val = rule->values[i];
 
+		if (f->type & AUDIT_UNUSED_BITS ||
+		    f->type == AUDIT_WATCH) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
 		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
 		if (f->op & AUDIT_NEGATE)
 			f->op |= AUDIT_NOT_EQUAL;
@@ -182,8 +220,9 @@ static struct audit_entry *audit_data_to
 	int err = 0;
 	struct audit_entry *entry;
 	void *bufp;
-	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
+	size_t remain = datasz - sizeof(struct audit_rule_data);
 	int i;
+	char *path;
 
 	entry = audit_to_entry_common((struct audit_rule *)data);
 	if (IS_ERR(entry))
@@ -201,10 +240,20 @@ static struct audit_entry *audit_data_to
 
 		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
 		f->type = data->fields[i];
+		f->val = data->values[i];
 		switch(f->type) {
-		/* call type-specific conversion routines here */
-		default:
-			f->val = data->values[i];
+		case AUDIT_WATCH:
+			path = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(path))
+				goto exit_free;
+			entry->rule.buflen += f->val;
+
+			err = audit_to_watch(path, &entry->rule, i);
+			if (err) {
+				kfree(path);
+				goto exit_free;
+			}
+			break;
 		}
 	}
 
@@ -280,7 +329,10 @@ static struct audit_rule_data *audit_kru
 		data->fields[i] = f->type;
 		data->fieldflags[i] = f->op;
 		switch(f->type) {
-		/* call type-specific conversion routines here */
+		case AUDIT_WATCH:
+			data->buflen += data->values[i] =
+				audit_pack_string(&bufp, krule->watch->path);
+			break;
 		default:
 			data->values[i] = f->val;
 		}
@@ -290,6 +342,12 @@ static struct audit_rule_data *audit_kru
 	return data;
 }
 
+/* Compare two watches.  Considered success if rules don't match. */
+static inline int audit_compare_watch(struct audit_watch *a, struct audit_watch *b)
+{
+	return strcmp(a->path, b->path);
+}
+
 /* Compare two rules in kernel format.  Considered success if rules
  * don't match. */
 static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
@@ -308,7 +366,10 @@ static int audit_compare_rule(struct aud
 			return 1;
 
 		switch(a->fields[i].type) {
-		/* call type-specific comparison routines here */
+		case AUDIT_WATCH:
+			if (audit_compare_watch(a->watch, b->watch))
+				return 1;
+			break;
 		default:
 			if (a->fields[i].val != b->fields[i].val)
 				return 1;
@@ -322,6 +383,26 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
+/* Attach krule's watch to master_watchlist, using existing watches
+ * when possible. */
+static inline void audit_add_watch(struct audit_krule *krule)
+{
+	struct audit_watch *w;
+
+	list_for_each_entry(w, &master_watchlist, mlist) {
+		if (audit_compare_watch(w, krule->watch))
+			continue;
+
+		audit_free_watch(krule->watch);
+		krule->watch = w;
+		list_add(&krule->rlist, &w->rules);
+		return;
+	}
+	INIT_LIST_HEAD(&krule->watch->rules);
+	list_add(&krule->rlist, &krule->watch->rules);
+	list_add(&krule->watch->mlist, &master_watchlist);
+}
+
 /* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
 static inline int audit_add_rule(struct audit_entry *entry,
@@ -336,6 +417,8 @@ static inline int audit_add_rule(struct 
 			return -EEXIST;
 	}
 
+	if (entry->rule.watch)
+		audit_add_watch(&entry->rule);
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
 		list_add_rcu(&entry->list, list);
 	} else {
@@ -345,6 +428,20 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
+/* Detach watch from krule, freeing if it has no associated rules. */
+static inline void audit_detach_watch(struct audit_krule *krule)
+{
+	struct audit_watch *watch = krule->watch;
+
+	list_del(&krule->rlist);
+	krule->watch = NULL;
+
+	if (list_empty(&watch->rules)) {
+		list_del(&watch->mlist);
+		audit_free_watch(watch);
+	}
+}
+
 /* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
 static inline int audit_del_rule(struct audit_entry *entry,
@@ -357,6 +454,8 @@ static inline int audit_del_rule(struct 
 	list_for_each_entry(e, list, list) {
 		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
+			if (e->rule.watch)
+				audit_detach_watch(&e->rule);
 			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
@@ -423,7 +522,7 @@ static int audit_list_rules(void *_dest)
 			if (unlikely(!data))
 				break;
 			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
-					 data, sizeof(*data));
+					 data, sizeof(*data) + data->buflen);
 			kfree(data);
 		}
 	}
@@ -490,8 +589,11 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
-		else
+		else {
+			if (entry->rule.watch)
+				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
+		}
 		break;
 	case AUDIT_DEL:
 	case AUDIT_DEL_RULE:
@@ -507,6 +609,8 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		if (entry->rule.watch)
+			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);
 		break;
 	default:
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e4f7096..8e98b65 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -240,7 +240,8 @@ static int audit_filter_rules(struct tas
 			}
 			break;
 		case AUDIT_INODE:
-			if (ctx) {
+		case AUDIT_WATCH:
+			if (ctx && f->val != (unsigned int)-1) {
 				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)) {
-- 
0.99.9n

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


linux-2.6-audit-tty.patch:
 auditsc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-tty.patch ---
>From linux-audit-bounces at redhat.com Sun Jan  1 19:07:06 2006
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sun, 01 Jan 2006 19:07:06 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xq-0006yT-4F for dwmw2 at baythorne.infradead.org; Sun, 01 Jan 2006
	19:07:06 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xo-0000N4-CS for dwmw2 at infradead.org; Sun, 01 Jan 2006 19:07:05 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 2C86D72EB7; Sun,
	 1 Jan 2006 14:07:02 -0500 (EST)
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 k01J71MX011720 for <linux-audit at listman.util.phx.redhat.com>; Sun, 1 Jan
	2006 14:07:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	k01J70127937 for <linux-audit at int-mx1.corp.redhat.com>; Sun, 1 Jan 2006
	14:07:00 -0500
Received: from vpn50-34.rdu.redhat.com (vpn50-34.rdu.redhat.com
	[172.16.50.34]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	k01J6xa3016921 for <linux-audit at redhat.com>; Sun, 1 Jan 2006 14:07:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
Organization: Red Hat
To: linux-audit at redhat.com
Date: Sun, 1 Jan 2006 14:07:00 -0500
User-Agent: KMail/1.9
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Message-Id: <200601011407.00175.sgrubb at redhat.com>
X-MIME-Autoconverted: from quoted-printable to 8bit by
	listman.util.phx.redhat.com id k01J71MX011720
X-loop: linux-audit at redhat.com
Subject: Add tty to syscall audit records
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

Hi,

>From the RBAC specs:

FAU_SAR.1.1 The TSF shall provide the set of authorized 
RBAC administrators with the capability to read the following
audit information from the audit records:

<snip>
(e) The User Session Identifier or Terminal Type 

A patch adding the tty for all syscalls is included in this email.
Please apply.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>



diff -urp linux-2.6.14.orig/kernel/auditsc.c linux-2.6.14/kernel/auditsc.c
--- linux-2.6.14.orig/kernel/auditsc.c	2005-12-28 10:39:04.000000000 -0500
+++ linux-2.6.14/kernel/auditsc.c	2005-12-28 10:40:28.000000000 -0500
@@ -56,6 +56,7 @@
 #include <asm/unistd.h>
 #include <linux/security.h>
 #include <linux/list.h>
+#include <linux/tty.h>
 
 #include "audit.h"
 
@@ -567,6 +568,7 @@ static void audit_log_exit(struct audit_
 	int i;
 	struct audit_buffer *ab;
 	struct audit_aux_data *aux;
+	const char *tty;
 
 	ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL);
 	if (!ab)
@@ -579,11 +581,15 @@ static void audit_log_exit(struct audit_
 		audit_log_format(ab, " success=%s exit=%ld", 
 				 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
 				 context->return_code);
+	if (current->signal->tty && current->signal->tty->name)
+		tty = current->signal->tty->name;
+	else
+		tty = "(none)";
 	audit_log_format(ab,
 		  " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
 		  " pid=%d auid=%u uid=%u gid=%u"
 		  " euid=%u suid=%u fsuid=%u"
-		  " egid=%u sgid=%u fsgid=%u",
+		  " egid=%u sgid=%u fsgid=%u tty=%s",
 		  context->argv[0],
 		  context->argv[1],
 		  context->argv[2],
@@ -594,7 +600,7 @@ static void audit_log_exit(struct audit_
 		  context->uid,
 		  context->gid,
 		  context->euid, context->suid, context->fsuid,
-		  context->egid, context->sgid, context->fsgid);
+		  context->egid, context->sgid, context->fsgid, tty);
 	audit_log_task_info(ab);
 	audit_log_end(ab);
 

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

linux-2.6-vm86-audit_syscall_exit.patch:
 arch/i386/kernel/vm86.c |   12 ++++++++++--
 kernel/auditsc.c        |    5 -----
 2 files changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-vm86-audit_syscall_exit.patch ---
>From jbaron at redhat.com Tue Jan 31 16:56:28 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; Tue, 31 Jan 2006 16:59:43 -0500
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 k0VLxhVB011796;
	Tue, 31 Jan 2006 16:59:43 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLxe113090;
	Tue, 31 Jan 2006 16:59:40 -0500
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 k0VLxYad021818;
	Tue, 31 Jan 2006 16:59:34 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id DB408734FD; Tue, 31 Jan 2006 16:59:34 -0500 (EST)
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
	k0VLm1KO030358 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLm1108246
	for <linux-audit at int-mx1.corp.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from dhcp83-105.boston.redhat.com
	(IDENT:U2FsdGVkX1/BG9Gb/rarNGoKwgdY7GXxe/iR5tDmvQU at dhcp83-105.boston.redhat.com
	[172.16.83.105])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k0VLm0VC010704; 
	Tue, 31 Jan 2006 16:48:00 -0500
Date: Tue, 31 Jan 2006 16:56:28 -0500 (EST)
From: Jason Baron <jbaron at redhat.com>
X-X-Sender: jbaron at dhcp83-105.boston.redhat.com
To: linux-audit at redhat.com
Message-ID: <Pine.LNX.4.61.0601311642220.14617 at dhcp83-105.boston.redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN;
  charset=US-ASCII
X-loop: linux-audit at redhat.com
X-Mailman-Approved-At: Tue, 31 Jan 2006 16:59:33 -0500
Cc: dwmw2 at infradead.org,
 viro at zeniv.linux.org.uk
Subject: make vm86 call audit_syscall_exit
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: 6338
X-UID: 46889


hi,

The motivation behind the patch below was to address messages in 
/var/log/messages such as:

Jan 31 10:54:15 mets kernel: audit(:0): major=252 name_count=0: freeing 
multiple contexts (1)
Jan 31 10:54:15 mets kernel: audit(:0): major=113 name_count=0: freeing 
multiple contexts (2)

I can reproduce by running 'get-edid' from:
http://john.fremlin.de/programs/linux/read-edid/. 

These messages come about in the log b/c the vm86 calls do not exit via 
the normal system call exit paths and thus do not call 
'audit_syscall_exit'. The next system call will then free the context for 
itself and for the vm86 context, thus generating the above messages. This 
patch addresses the issue by simply adding a call to 'audit_syscall_exit' 
from the vm86 code.

Besides fixing the above error messages the patch also now allows vm86 
system calls to become auditable. This is useful since strace does not 
appear to properly record the return values from sys_vm86.

I think this patch is also a step in the right direction in terms of 
cleaning up some core auditing code. If we can correct any other paths 
that do not properly call the audit exit and entries points, then we can 
also eliminate the notion of context chaining.

I've tested this patch by verifying that the log messages no longer 
appear, and that the audit records for sys_vm86 appear to be correct. 
Also, 'read_edid' produces itentical output.

thanks,

Jason

Signed-off-by: Jason Baron <jbaron at redhat.com>


--- linux-2.6/kernel/auditsc.c.bak
+++ linux-2.6/kernel/auditsc.c
@@ -981,11 +981,6 @@ void audit_syscall_entry(struct task_str
 	if (context && context->in_syscall) {
 		struct audit_context *newctx;
 
-#if defined(__NR_vm86) && defined(__NR_vm86old)
-		/* vm86 mode should only be entered once */
-		if (major == __NR_vm86 || major == __NR_vm86old)
-			return;
-#endif
 #if AUDIT_DEBUG
 		printk(KERN_ERR
 		       "audit(:%d) pid=%d in syscall=%d;"
--- linux-2.6/arch/i386/kernel/vm86.c.bak	2006-01-31 12:19:56.000000000 -0500
+++ linux-2.6/arch/i386/kernel/vm86.c	2006-01-31 12:24:52.000000000 -0500
@@ -42,6 +42,7 @@
 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -251,6 +252,7 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
 	struct tss_struct *tss;
+	long eax;
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
@@ -304,13 +306,19 @@ static void do_sys_vm86(struct kernel_vm
 	tsk->thread.screen_bitmap = info->screen_bitmap;
 	if (info->flags & VM86_SCREEN_BITMAP)
 		mark_screen_rdonly(tsk->mm);
+	__asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t");
+	__asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax));
+	
+	/*call audit_syscall_exit since we do not exit via the normal paths */
+	if (unlikely(current->audit_context))
+		audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+
 	__asm__ __volatile__(
-		"xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
 		"movl %0,%%esp\n\t"
 		"movl %1,%%ebp\n\t"
 		"jmp resume_userspace"
 		: /* no outputs */
-		:"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
+		:"r" (&info->regs), "r" (task_thread_info(tsk)));
 	/* we never return here */
 }
 

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




From fedora-cvs-commits at redhat.com  Tue Feb 14 19:37:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:37:22 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1941.4.1,1.1941.4.2
Message-ID: <200602141937.k1EJbM0G027513@cvs.devel.redhat.com>

Author: sgrubb

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

Modified Files:
      Tag: private-fc5-lspp8-branch
	kernel-2.6.spec 
Log Message:
remove a patch thats in a bigger patch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1941.4.1
retrieving revision 1.1941.4.2
diff -u -r1.1941.4.1 -r1.1941.4.2
--- kernel-2.6.spec	14 Feb 2006 19:22:14 -0000	1.1941.4.1
+++ kernel-2.6.spec	14 Feb 2006 19:37:19 -0000	1.1941.4.2
@@ -927,7 +927,7 @@
 %patch1800 -p1
 # PNP support for smsc-ircc2
 %patch1810 -p1
-%patch1820 -p1
+#%patch1820 -p1
 # Silence debug messages in w1
 %patch1830 -p1
 # Reboot through BIOS on HP laptops.



From fedora-cvs-commits at redhat.com  Tue Feb 14 19:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:40:16 -0500
Subject: rpms/gdb/FC-4 gdb-6.3-type-punning-20060214.patch, NONE,
	1.1 gdb.spec, 1.166, 1.167 gdb-6.3-type-punning-20051219.patch,
	1.1, NONE
Message-ID: <200602141940.k1EJeGks028923@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-type-punning-20060214.patch 
Removed Files:
	gdb-6.3-type-punning-20051219.patch 
Log Message:
* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.99
- Use type-punning warning fixes as accepted upstream.


gdb-6.3-type-punning-20060214.patch:
 c-exp.c             |   19 ++-----------------
 c-exp.y             |   19 ++-----------------
 doublest.h          |    7 ++++++-
 jv-exp.c            |   19 ++-----------------
 jv-exp.y            |   19 ++-----------------
 objc-exp.c          |   19 ++-----------------
 objc-exp.y          |   19 ++-----------------
 p-exp.c             |   19 ++-----------------
 p-exp.y             |   19 ++-----------------
 tui/tui-data.c      |    6 +++---
 tui/tui-data.h      |    2 +-
 tui/tui-stack.c     |    4 ++--
 tui/tui-win.c       |   10 +++++-----
 tui/tui-winsource.c |    4 ++--
 varobj.c            |    2 +-
 15 files changed, 36 insertions(+), 151 deletions(-)

--- NEW FILE gdb-6.3-type-punning-20060214.patch ---
for gdb/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* doublest.h (DOUBLEST): Use long double only if we can scan
	it in.  Undefine HAVE_LONG_DOUBLE otherwise.
	(DOUBLEST_FORMAT): New.
	* c-exp.y (parse_number): Use it.
	* jv-exp.y (parse_number): Likewise.
	* objc-exp.y (parse_number): Likewise.
	* p-exp.y (parse_number): Likewise.
	* c-exp.c, jv-exp.c, objc-exp.c, p-exp.c: Rebuilt.
	* varobj.c (free_variable): Silence type-punning warnings.
	* tui/tui-data.h (struct tui_list): Change type of list member.
	* tui/tui-data.c: Remove no-longer-needed type casts.
	(source_windows): Silence type-punning warnings.
	* tui/tui-stack.c, tui/tui-win.c, tui/tui-winsource.c: Likewise.

Index: gdb-6.3/gdb/c-exp.y
===================================================================
--- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -1075,23 +1075,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/jv-exp.y
===================================================================
--- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -712,23 +712,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval, &c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp, &c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/objc-exp.y
===================================================================
--- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -1025,23 +1025,8 @@ parse_number (p, len, parsed_float, puti
 
       /* It's a float since it contains a point or an exponent.  */
 
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	sscanf (p, "%g", (float *)&putithere->typed_val_float.dval);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval);
-      else
-	{
-#ifdef PRINTF_HAS_LONG_DOUBLE
-	  sscanf (p, "%Lg", &putithere->typed_val_float.dval);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles.  */
-	  double temp;
-	  sscanf (p, "%lg", &temp);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      sscanf (p, DOUBLEST_FORMAT "%c",
+	      &putithere->typed_val_float.dval, &c);
 
       /* See if it has `f' or `l' suffix (float or long double).  */
 
Index: gdb-6.3/gdb/p-exp.y
===================================================================
--- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -798,23 +798,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/varobj.c
===================================================================
--- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/varobj.c	2006-02-14 17:21:34.000000000 -0200
@@ -1410,7 +1410,7 @@ free_variable (struct varobj *var)
   /* Free the expression if this is a root variable. */
   if (var->root->rootvar == var)
     {
-      free_current_contents ((char **) &var->root->exp);
+      free_current_contents (&var->root->exp);
       xfree (var->root);
     }
 
Index: gdb-6.3/gdb/doublest.h
===================================================================
--- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/doublest.h	2006-02-14 17:21:34.000000000 -0200
@@ -48,10 +48,15 @@ struct floatformat;
    host's `long double'.  In general, we'll probably reduce the precision of
    any such values and print a warning.  */
 
-#ifdef HAVE_LONG_DOUBLE
+#if defined HAVE_LONG_DOUBLE && defined SCANF_HAS_LONG_DOUBLE
 typedef long double DOUBLEST;
+# define DOUBLEST_FORMAT "%Lg"
 #else
 typedef double DOUBLEST;
+# define DOUBLEST_FORMAT "%g"
+/* If we can't scan or print long double, we don't want to use it
+   anywhere.  */
+# undef HAVE_LONG_DOUBLE
 #endif
 
 extern void floatformat_to_doublest (const struct floatformat *,
Index: gdb-6.3/gdb/tui/tui-data.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:21:34.000000000 -0200
@@ -44,7 +44,7 @@ static int term_height, term_width;
 static struct tui_gen_win_info _locator;
 static struct tui_gen_win_info exec_info[2];
 static struct tui_win_info * src_win_list[2];
-static struct tui_list source_windows = {(void **) src_win_list, 0};
+static struct tui_list source_windows = {src_win_list, 0};
 static int default_tab_len = DEFAULT_TAB_LEN;
 static struct tui_win_info * win_with_focus = (struct tui_win_info *) NULL;
 static struct tui_layout_def layout_def =
@@ -182,7 +182,7 @@ tui_clear_source_windows_detail (void)
   int i;
 
   for (i = 0; i < (tui_source_windows ())->count; i++)
-    tui_clear_win_detail ((struct tui_win_info *) (tui_source_windows ())->list[i]);
+    tui_clear_win_detail ((tui_source_windows ())->list[i]);
 }
 
 
@@ -779,7 +779,7 @@ tui_free_all_source_wins_content (void)
 
   for (i = 0; i < (tui_source_windows ())->count; i++)
     {
-      struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+      struct tui_win_info * win_info = (tui_source_windows ())->list[i];
 
       if (win_info != NULL)
 	{
Index: gdb-6.3/gdb/tui/tui-data.h
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:21:34.000000000 -0200
@@ -110,7 +110,7 @@ enum tui_scroll_direction
 /* General list struct.  */
 struct tui_list
 {
-  void **list;
+  struct tui_win_info **list;
   int count;
 };
 
Index: gdb-6.3/gdb/tui/tui-stack.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:21:34.000000000 -0200
@@ -343,7 +343,7 @@ tui_show_frame_info (struct frame_info *
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
 	  union tui_which_element *item;
-	  win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  win_info = (tui_source_windows ())->list[i];
 
 	  item = &((struct tui_win_element *) locator->content[0])->which_element;
 	  if (win_info == TUI_SRC_WIN)
@@ -399,7 +399,7 @@ tui_show_frame_info (struct frame_info *
       tui_show_locator_content ();
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
-	  win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  win_info = (tui_source_windows ())->list[i];
 	  tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
 	  tui_update_exec_info (win_info);
 	}
Index: gdb-6.3/gdb/tui/tui-win.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:21:34.000000000 -0200
@@ -1088,7 +1088,7 @@ tui_adjust_win_heights (struct tui_win_i
 	      make_invisible_and_set_new_height (primary_win_info, new_height);
 	      if (primary_win_info->generic.type == CMD_WIN)
 		{
-		  win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		  win_info = (tui_source_windows ())->list[0];
 		  src_win_info = win_info;
 		}
 	      else
@@ -1117,7 +1117,7 @@ tui_adjust_win_heights (struct tui_win_i
 	      else
 		{
 		  first_win = TUI_DATA_WIN;
-		  second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		  second_win = (tui_source_windows ())->list[0];
 		}
 	      if (primary_win_info == TUI_CMD_WIN)
 		{		/*
@@ -1371,7 +1371,7 @@ new_height_ok (struct tui_win_info * pri
 	      struct tui_win_info * win_info;
 
 	      if (primary_win_info == TUI_CMD_WIN)
-		win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		win_info = (tui_source_windows ())->list[0];
 	      else
 		win_info = TUI_CMD_WIN;
 	      ok = ((new_height +
@@ -1392,7 +1392,7 @@ new_height_ok (struct tui_win_info * pri
 	  else
 	    {
 	      first_win = TUI_DATA_WIN;
-	      second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
+	      second_win = (tui_source_windows ())->list[0];
 	    }
 	  /*
 	     ** We could simply add all the heights to obtain the same result
@@ -1521,7 +1521,7 @@ parse_scrolling_args (char *arg, struct 
 	    warning ("Invalid window specified. \n\
 The window name specified must be valid and visible.\n");
 	  else if (*win_to_scroll == TUI_CMD_WIN)
-	    *win_to_scroll = (struct tui_win_info *) (tui_source_windows ())->list[0];
+	    *win_to_scroll = (tui_source_windows ())->list[0];
 	}
       xfree (buf);
     }
Index: gdb-6.3/gdb/tui/tui-winsource.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:21:34.000000000 -0200
@@ -158,7 +158,7 @@ tui_update_source_windows_with_addr (COR
 
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
-	  struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  struct tui_win_info * win_info = (tui_source_windows ())->list[i];
 
 	  tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
 	  tui_clear_exec_info_content (win_info);
@@ -386,7 +386,7 @@ tui_update_all_breakpoint_info (void)
 
   for (i = 0; i < list->count; i++)
     {
-      struct tui_win_info * win = (struct tui_win_info *) list->list[i];
+      struct tui_win_info * win = list->list[i];
 
       if (tui_update_breakpoint_info (win, FALSE))
         {
Index: gdb-6.3/gdb/c-exp.c
===================================================================
--- gdb-6.3.orig/gdb/c-exp.c	2004-11-08 14:25:35.000000000 -0200
+++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2727,23 +2727,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/jv-exp.c
===================================================================
--- gdb-6.3.orig/gdb/jv-exp.c	2004-11-08 14:25:38.000000000 -0200
+++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2099,23 +2099,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval, &c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp, &c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/objc-exp.c
===================================================================
--- gdb-6.3.orig/gdb/objc-exp.c	2004-11-08 14:25:36.000000000 -0200
+++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2688,23 +2688,8 @@ parse_number (p, len, parsed_float, puti
 
       /* It's a float since it contains a point or an exponent.  */
 
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	sscanf (p, "%g", (float *)&putithere->typed_val_float.dval);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval);
-      else
-	{
-#ifdef PRINTF_HAS_LONG_DOUBLE
-	  sscanf (p, "%Lg", &putithere->typed_val_float.dval);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles.  */
-	  double temp;
-	  sscanf (p, "%lg", &temp);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      sscanf (p, DOUBLEST_FORMAT "%c",
+	      &putithere->typed_val_float.dval, &c);
 
       /* See if it has `f' or `l' suffix (float or long double).  */
 
Index: gdb-6.3/gdb/p-exp.c
===================================================================
--- gdb-6.3.orig/gdb/p-exp.c	2004-11-08 14:25:41.000000000 -0200
+++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2141,23 +2141,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- gdb.spec	16 Jan 2006 16:25:41 -0000	1.166
+++ gdb.spec	14 Feb 2006 19:40:13 -0000	1.167
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.97
+Release: 1.101
 
 License: GPL
 Group: Development/Debuggers
@@ -263,7 +263,7 @@
 
 # Silence type-punning warnings that cause compilation errors because
 # of -Werror.
-Patch171: gdb-6.3-type-punning-20051219.patch
+Patch171: gdb-6.3-type-punning-20060214.patch
 
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
@@ -536,7 +536,19 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Mon Jan 16 2006 Alexandre Oliva <aoliva at redhat.com>	6.3.0.0-1.97
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.101
+- Bump up release number.
+
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.99
+- Use type-punning warning fixes as accepted upstream.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 16 2006 Alexandre Oliva <aoliva at redhat.com>	6.3.0.0-1.98
 - Bump up release number.
 
 * Mon Dec 19 2005 Alexandre Oliva <aoliva at redhat.com>	6.3.0.0-1.94


--- gdb-6.3-type-punning-20051219.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 19:40:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:40:16 -0500
Subject: rpms/gdb/devel gdb-6.3-type-punning-20060214.patch, NONE,
	1.1 gdb.spec, 1.169, 1.170 gdb-6.3-type-punning-20051219.patch,
	1.1, NONE
Message-ID: <200602141940.k1EJeGEM028939@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28733/devel

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-type-punning-20060214.patch 
Removed Files:
	gdb-6.3-type-punning-20051219.patch 
Log Message:
* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.99
- Use type-punning warning fixes as accepted upstream.


gdb-6.3-type-punning-20060214.patch:
 c-exp.c             |   19 ++-----------------
 c-exp.y             |   19 ++-----------------
 doublest.h          |    7 ++++++-
 jv-exp.c            |   19 ++-----------------
 jv-exp.y            |   19 ++-----------------
 objc-exp.c          |   19 ++-----------------
 objc-exp.y          |   19 ++-----------------
 p-exp.c             |   19 ++-----------------
 p-exp.y             |   19 ++-----------------
 tui/tui-data.c      |    6 +++---
 tui/tui-data.h      |    2 +-
 tui/tui-stack.c     |    4 ++--
 tui/tui-win.c       |   10 +++++-----
 tui/tui-winsource.c |    4 ++--
 varobj.c            |    2 +-
 15 files changed, 36 insertions(+), 151 deletions(-)

--- NEW FILE gdb-6.3-type-punning-20060214.patch ---
for gdb/ChangeLog
from  Alexandre Oliva  <aoliva at redhat.com>

	* doublest.h (DOUBLEST): Use long double only if we can scan
	it in.  Undefine HAVE_LONG_DOUBLE otherwise.
	(DOUBLEST_FORMAT): New.
	* c-exp.y (parse_number): Use it.
	* jv-exp.y (parse_number): Likewise.
	* objc-exp.y (parse_number): Likewise.
	* p-exp.y (parse_number): Likewise.
	* c-exp.c, jv-exp.c, objc-exp.c, p-exp.c: Rebuilt.
	* varobj.c (free_variable): Silence type-punning warnings.
	* tui/tui-data.h (struct tui_list): Change type of list member.
	* tui/tui-data.c: Remove no-longer-needed type casts.
	(source_windows): Silence type-punning warnings.
	* tui/tui-stack.c, tui/tui-win.c, tui/tui-winsource.c: Likewise.

Index: gdb-6.3/gdb/c-exp.y
===================================================================
--- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -1075,23 +1075,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/jv-exp.y
===================================================================
--- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -712,23 +712,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval, &c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp, &c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/objc-exp.y
===================================================================
--- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -1025,23 +1025,8 @@ parse_number (p, len, parsed_float, puti
 
       /* It's a float since it contains a point or an exponent.  */
 
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	sscanf (p, "%g", (float *)&putithere->typed_val_float.dval);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval);
-      else
-	{
-#ifdef PRINTF_HAS_LONG_DOUBLE
-	  sscanf (p, "%Lg", &putithere->typed_val_float.dval);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles.  */
-	  double temp;
-	  sscanf (p, "%lg", &temp);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      sscanf (p, DOUBLEST_FORMAT "%c",
+	      &putithere->typed_val_float.dval, &c);
 
       /* See if it has `f' or `l' suffix (float or long double).  */
 
Index: gdb-6.3/gdb/p-exp.y
===================================================================
--- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:21:34.000000000 -0200
@@ -798,23 +798,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/varobj.c
===================================================================
--- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/varobj.c	2006-02-14 17:21:34.000000000 -0200
@@ -1410,7 +1410,7 @@ free_variable (struct varobj *var)
   /* Free the expression if this is a root variable. */
   if (var->root->rootvar == var)
     {
-      free_current_contents ((char **) &var->root->exp);
+      free_current_contents (&var->root->exp);
       xfree (var->root);
     }
 
Index: gdb-6.3/gdb/doublest.h
===================================================================
--- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/doublest.h	2006-02-14 17:21:34.000000000 -0200
@@ -48,10 +48,15 @@ struct floatformat;
    host's `long double'.  In general, we'll probably reduce the precision of
    any such values and print a warning.  */
 
-#ifdef HAVE_LONG_DOUBLE
+#if defined HAVE_LONG_DOUBLE && defined SCANF_HAS_LONG_DOUBLE
 typedef long double DOUBLEST;
+# define DOUBLEST_FORMAT "%Lg"
 #else
 typedef double DOUBLEST;
+# define DOUBLEST_FORMAT "%g"
+/* If we can't scan or print long double, we don't want to use it
+   anywhere.  */
+# undef HAVE_LONG_DOUBLE
 #endif
 
 extern void floatformat_to_doublest (const struct floatformat *,
Index: gdb-6.3/gdb/tui/tui-data.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:21:34.000000000 -0200
@@ -44,7 +44,7 @@ static int term_height, term_width;
 static struct tui_gen_win_info _locator;
 static struct tui_gen_win_info exec_info[2];
 static struct tui_win_info * src_win_list[2];
-static struct tui_list source_windows = {(void **) src_win_list, 0};
+static struct tui_list source_windows = {src_win_list, 0};
 static int default_tab_len = DEFAULT_TAB_LEN;
 static struct tui_win_info * win_with_focus = (struct tui_win_info *) NULL;
 static struct tui_layout_def layout_def =
@@ -182,7 +182,7 @@ tui_clear_source_windows_detail (void)
   int i;
 
   for (i = 0; i < (tui_source_windows ())->count; i++)
-    tui_clear_win_detail ((struct tui_win_info *) (tui_source_windows ())->list[i]);
+    tui_clear_win_detail ((tui_source_windows ())->list[i]);
 }
 
 
@@ -779,7 +779,7 @@ tui_free_all_source_wins_content (void)
 
   for (i = 0; i < (tui_source_windows ())->count; i++)
     {
-      struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+      struct tui_win_info * win_info = (tui_source_windows ())->list[i];
 
       if (win_info != NULL)
 	{
Index: gdb-6.3/gdb/tui/tui-data.h
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:21:34.000000000 -0200
@@ -110,7 +110,7 @@ enum tui_scroll_direction
 /* General list struct.  */
 struct tui_list
 {
-  void **list;
+  struct tui_win_info **list;
   int count;
 };
 
Index: gdb-6.3/gdb/tui/tui-stack.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:21:34.000000000 -0200
@@ -343,7 +343,7 @@ tui_show_frame_info (struct frame_info *
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
 	  union tui_which_element *item;
-	  win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  win_info = (tui_source_windows ())->list[i];
 
 	  item = &((struct tui_win_element *) locator->content[0])->which_element;
 	  if (win_info == TUI_SRC_WIN)
@@ -399,7 +399,7 @@ tui_show_frame_info (struct frame_info *
       tui_show_locator_content ();
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
-	  win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  win_info = (tui_source_windows ())->list[i];
 	  tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
 	  tui_update_exec_info (win_info);
 	}
Index: gdb-6.3/gdb/tui/tui-win.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:21:34.000000000 -0200
@@ -1088,7 +1088,7 @@ tui_adjust_win_heights (struct tui_win_i
 	      make_invisible_and_set_new_height (primary_win_info, new_height);
 	      if (primary_win_info->generic.type == CMD_WIN)
 		{
-		  win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		  win_info = (tui_source_windows ())->list[0];
 		  src_win_info = win_info;
 		}
 	      else
@@ -1117,7 +1117,7 @@ tui_adjust_win_heights (struct tui_win_i
 	      else
 		{
 		  first_win = TUI_DATA_WIN;
-		  second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		  second_win = (tui_source_windows ())->list[0];
 		}
 	      if (primary_win_info == TUI_CMD_WIN)
 		{		/*
@@ -1371,7 +1371,7 @@ new_height_ok (struct tui_win_info * pri
 	      struct tui_win_info * win_info;
 
 	      if (primary_win_info == TUI_CMD_WIN)
-		win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
+		win_info = (tui_source_windows ())->list[0];
 	      else
 		win_info = TUI_CMD_WIN;
 	      ok = ((new_height +
@@ -1392,7 +1392,7 @@ new_height_ok (struct tui_win_info * pri
 	  else
 	    {
 	      first_win = TUI_DATA_WIN;
-	      second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
+	      second_win = (tui_source_windows ())->list[0];
 	    }
 	  /*
 	     ** We could simply add all the heights to obtain the same result
@@ -1521,7 +1521,7 @@ parse_scrolling_args (char *arg, struct 
 	    warning ("Invalid window specified. \n\
 The window name specified must be valid and visible.\n");
 	  else if (*win_to_scroll == TUI_CMD_WIN)
-	    *win_to_scroll = (struct tui_win_info *) (tui_source_windows ())->list[0];
+	    *win_to_scroll = (tui_source_windows ())->list[0];
 	}
       xfree (buf);
     }
Index: gdb-6.3/gdb/tui/tui-winsource.c
===================================================================
--- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:21:32.000000000 -0200
+++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:21:34.000000000 -0200
@@ -158,7 +158,7 @@ tui_update_source_windows_with_addr (COR
 
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
-	  struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  struct tui_win_info * win_info = (tui_source_windows ())->list[i];
 
 	  tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
 	  tui_clear_exec_info_content (win_info);
@@ -386,7 +386,7 @@ tui_update_all_breakpoint_info (void)
 
   for (i = 0; i < list->count; i++)
     {
-      struct tui_win_info * win = (struct tui_win_info *) list->list[i];
+      struct tui_win_info * win = list->list[i];
 
       if (tui_update_breakpoint_info (win, FALSE))
         {
Index: gdb-6.3/gdb/c-exp.c
===================================================================
--- gdb-6.3.orig/gdb/c-exp.c	2004-11-08 14:25:35.000000000 -0200
+++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2727,23 +2727,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/jv-exp.c
===================================================================
--- gdb-6.3.orig/gdb/jv-exp.c	2004-11-08 14:25:38.000000000 -0200
+++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2099,23 +2099,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval, &c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp, &c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;
Index: gdb-6.3/gdb/objc-exp.c
===================================================================
--- gdb-6.3.orig/gdb/objc-exp.c	2004-11-08 14:25:36.000000000 -0200
+++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2688,23 +2688,8 @@ parse_number (p, len, parsed_float, puti
 
       /* It's a float since it contains a point or an exponent.  */
 
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	sscanf (p, "%g", (float *)&putithere->typed_val_float.dval);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval);
-      else
-	{
-#ifdef PRINTF_HAS_LONG_DOUBLE
-	  sscanf (p, "%Lg", &putithere->typed_val_float.dval);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles.  */
-	  double temp;
-	  sscanf (p, "%lg", &temp);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      sscanf (p, DOUBLEST_FORMAT "%c",
+	      &putithere->typed_val_float.dval, &c);
 
       /* See if it has `f' or `l' suffix (float or long double).  */
 
Index: gdb-6.3/gdb/p-exp.c
===================================================================
--- gdb-6.3.orig/gdb/p-exp.c	2004-11-08 14:25:41.000000000 -0200
+++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:08.000000000 -0200
@@ -2141,23 +2141,8 @@ parse_number (p, len, parsed_float, puti
       char saved_char = p[len];
 
       p[len] = 0;	/* null-terminate the token */
-      if (sizeof (putithere->typed_val_float.dval) <= sizeof (float))
-	num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c);
-      else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double))
-	num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c);
-      else
-	{
-#ifdef SCANF_HAS_LONG_DOUBLE
-	  num = sscanf (p, "%Lg%c", &putithere->typed_val_float.dval,&c);
-#else
-	  /* Scan it into a double, then assign it to the long double.
-	     This at least wins with values representable in the range
-	     of doubles. */
-	  double temp;
-	  num = sscanf (p, "%lg%c", &temp,&c);
-	  putithere->typed_val_float.dval = temp;
-#endif
-	}
+      num = sscanf (p, DOUBLEST_FORMAT "%c",
+		    &putithere->typed_val_float.dval, &c);
       p[len] = saved_char;	/* restore the input stream */
       if (num != 1) 		/* check scanf found ONLY a float ... */
 	return ERROR;


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- gdb.spec	11 Feb 2006 02:49:31 -0000	1.169
+++ gdb.spec	14 Feb 2006 19:40:14 -0000	1.170
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.98.2
+Release: 1.102
 
 License: GPL
 Group: Development/Debuggers
@@ -263,7 +263,7 @@
 
 # Silence type-punning warnings that cause compilation errors because
 # of -Werror.
-Patch171: gdb-6.3-type-punning-20051219.patch
+Patch171: gdb-6.3-type-punning-20060214.patch
 
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
@@ -536,6 +536,12 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.102
+- Bump up release number.
+
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.99
+- Use type-punning warning fixes as accepted upstream.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.0.0-1.98.2
 - bump again for double-long bug on ppc(64)
 


--- gdb-6.3-type-punning-20051219.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 19:43:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 14:43:48 -0500
Subject: rpms/initscripts/devel .cvsignore, 1.94, 1.95 initscripts.spec,
	1.108, 1.109 sources, 1.102, 1.103
Message-ID: <200602141943.k1EJhmaZ030658@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/initscripts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30613/devel

Modified Files:
	.cvsignore initscripts.spec sources 
Log Message:
auto-import initscripts-8.29-1 on branch devel from initscripts-8.29-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	13 Feb 2006 19:09:22 -0000	1.94
+++ .cvsignore	14 Feb 2006 19:43:45 -0000	1.95
@@ -1 +1 @@
-initscripts-8.28.tar.bz2
+initscripts-8.29.tar.bz2


Index: initscripts.spec
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- initscripts.spec	13 Feb 2006 19:09:22 -0000	1.108
+++ initscripts.spec	14 Feb 2006 19:43:45 -0000	1.109
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.28
+Version: 8.29
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,9 @@
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Tue Feb 14 2006 Peter Jones <pjones at redhat.com> 8.29-1
+- scrub another possible error message from dmraid output
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 8.28-1
 - kill nash-hotplug before starting udev (<pjones at redhat.com>)
 - silence warnings on /dev/pts remount (<pjones at redhat.com>)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/initscripts/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	13 Feb 2006 19:09:22 -0000	1.102
+++ sources	14 Feb 2006 19:43:45 -0000	1.103
@@ -1 +1 @@
-8340e9dd33aaf706f29f24a80353a2d8  initscripts-8.28.tar.bz2
+045152dab9da20ee95cf25b323faad8a  initscripts-8.29.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:30:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:30:48 -0500
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.65,1.66
Message-ID: <200602142030.k1EKUmMB001869@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1855

Modified Files:
	vixie-cron.spec 
Log Message:
fix bug 181439


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vixie-cron.spec	11 Feb 2006 05:57:53 -0000	1.65
+++ vixie-cron.spec	14 Feb 2006 20:30:18 -0000	1.66
@@ -7,7 +7,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 51.FC5.1
+Release: 52.FC5
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -99,17 +99,17 @@
 %patch8 -p1 -b .root-allowed
 %patch9 -p1 -b .no-header
 %patch10 -p1 -b .manpages
-%if %{WITH_SELINUX}
+#%if %{WITH_SELINUX}
 #SELinux
 # Enables SELinux support
 %patch11 -p1 -b .with_selinux
-%endif
+#%endif
 %patch12 -p1 -b .pam
-%if %{WITH_PAM}
+#%if %{WITH_PAM}
 %patch13 -p1 -b .with_pam
 %patch14 -p1 -b .pamd_crond
 %patch15 -p1 -b .system_crontab_user
-%endif
+#%endif
 %patch16 -p1 -b .crontab_selinux
 %patch17 -p1 -b .pam-rootok
 %patch18 -p1 -b .cron_log_facility
@@ -117,10 +117,10 @@
 %patch20 -p1 -b .nickname_man
 %patch21 -p1 -b -i_option
 %patch22 -p1 -b .no_0600_mode_enforce
-%if %{WITH_SELINUX}
+#%if %{WITH_SELINUX}
 %patch23 -p1 -b .freecon_segv
 %patch24 -p1 -b .selinux_crontab_new
-%endif
+#%endif
 %patch25 -p1 -b .allow-root-crontab
 %patch26 -p1 -b .saved_uids
 %patch27 -p1 -b .no-strip-header-comments



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:43:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:43:24 -0500
Subject: rpms/eclipse-bugzilla/devel .cvsignore, 1.5,
	1.6 eclipse-bugzilla.spec, 1.38, 1.39 sources, 1.17, 1.18
Message-ID: <200602142043.k1EKhORS002043@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2027

Modified Files:
	.cvsignore eclipse-bugzilla.spec sources 
Log Message:
* Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-1
- Updated to version 0.2.2 which sports working jars included int the plugin.
- Changed source file format from <name>-<cvs tag>-<version> to
<name>-<version>.
- Fixed hardcoded versions to variables.
- Some formatting fixes.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2006 16:57:11 -0000	1.5
+++ .cvsignore	14 Feb 2006 20:43:22 -0000	1.6
@@ -1 +1 @@
-eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz
+eclipse-bugzilla-fetched-0.2.2.tar.gz


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- eclipse-bugzilla.spec	13 Feb 2006 17:27:44 -0000	1.38
+++ eclipse-bugzilla.spec	14 Feb 2006 20:43:22 -0000	1.39
@@ -8,7 +8,7 @@
 %define	version_major		0
 %define version_minor		2
 %define version_majmin	%{version_major}.%{version_minor}
-%define version_micro   	1.2
+%define version_micro   	2
 %define eclipse_base   %{_datadir}/%{eclipse_name}
 %define eclipse_lib_base %{_libdir}/%{eclipse_name}
 
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1.3
+Release:	1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -46,21 +46,21 @@
 #     -buildfile build.xml -Dbasedir=`pwd` 
 #     -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.1.2/scripts/
 #     -DdontUnzip=true fetch 
-Source0: eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz
+Source0:	eclipse-bugzilla-fetched-%{version_majmin}.%{version_micro}.tar.gz
 
-BuildRequires: eclipse-platform
-BuildRequires: eclipse-jdt
-BuildRequires: eclipse-pde
-BuildRequires: libswt3-gtk2
-BuildRequires: xmlrpc >= 2.0.1
+BuildRequires: 	eclipse-platform
+BuildRequires: 	eclipse-jdt
+BuildRequires: 	eclipse-pde
+BuildRequires: 	libswt3-gtk2
+BuildRequires: 	xmlrpc >= 2.0.1
 
 %if %{gcj_support}
-BuildRequires:	gcc-java >= 4.0.1-4
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+BuildRequires:		gcc-java >= 4.0.1-4
+BuildRequires:    	java-gcj-compat-devel >= 1.0.31
+Requires(post):   	java-gcj-compat >= 1.0.31
+Requires(postun): 	java-gcj-compat >= 1.0.31
 %else
-BuildRequires:	java-devel >= 1.4.2
+BuildRequires:		java-devel >= 1.4.2
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -72,10 +72,12 @@
 %prep
 %setup -q -c 
 
-# Change .jar to symlink
+# Change .jar to symlink for the build
 pushd org.eclipse.team.bugzilla.releng/results/
 rm -f plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
 ln -sf %{_datadir}/java/xmlrpc.jar plugins/org.eclipse.team.bugzilla/lib/xmlrpc.jar
+rm -f plugins/org.eclipse.team.bugzilla/lib/jakarta-commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar plugins/org.eclipse.team.bugzilla/lib/jakarta-commons-codec.jar
 popd
 
 %build
@@ -120,6 +122,15 @@
   esac
 done
 
+pushd $RPM_BUILD_ROOT%{_datadir}/%{eclipse_name}
+rm -rf plugins/org.eclipse.team.bugzilla_%{version_majmin}.%{version_micro}/lib/xmlrpc.jar
+ln -sf %{_datadir}/java/xmlrpc.jar plugins/org.eclipse.team.bugzilla_%{version_majmin}.%{version_micro}/lib/xmlrpc.jar
+rm -f plugins/org.eclipse.team.bugzilla_%{version_majmin}.%{version_micro}/lib/jakarta-commons-codec.jar
+ln -sf %{_datadir}/java/jakarta-commons-codec.jar plugins/org.eclipse.team.bugzilla_%{version_majmin}.%{version_micro}/lib/jakarta-commons-codec.jar
+popd
+
+
+
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -145,6 +156,13 @@
 %endif
 
 %changelog
+* Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-1
+- Updated to version 0.2.2 which sports working jars included int the plugin.
+- Changed source file format from <name>-<cvs tag>-<version> to 
+<name>-<version>.
+- Fixed hardcoded versions to variables.
+- Some formatting fixes.
+
 * Mon Feb 13 2006 Igor Foox <ifoox at redhat.com> 0.2.1-1.1
 - Updated source file.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Feb 2006 16:57:12 -0000	1.17
+++ sources	14 Feb 2006 20:43:22 -0000	1.18
@@ -1 +1 @@
-ab8157afad29507ec05063d2f5d43de8  eclipse-bugzilla-fetched-R0_2_1-0.2.1.tar.gz
+460ac6be3a6306647f1ef3e6786206b4  eclipse-bugzilla-fetched-0.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:48:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:48:27 -0500
Subject: rpms/gdb/devel gdb-6.3-type-punning-20060214.patch, 1.1,
	1.2 gdb.spec, 1.170, 1.171
Message-ID: <200602142048.k1EKmRuX014638@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14607/gdb-devel

Modified Files:
	gdb-6.3-type-punning-20060214.patch gdb.spec 
Log Message:
* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.103
- Adjust type-punning patch to include fix not needed upstream.


gdb-6.3-type-punning-20060214.patch:
 c-exp.c             |   19 ++-----------------
 c-exp.y             |   19 ++-----------------
 doublest.h          |    7 ++++++-
 jv-exp.c            |   19 ++-----------------
 jv-exp.y            |   19 ++-----------------
 objc-exp.c          |   19 ++-----------------
 objc-exp.y          |   19 ++-----------------
 p-exp.c             |   19 ++-----------------
 p-exp.y             |   19 ++-----------------
 tui/tui-data.c      |    6 +++---
 tui/tui-data.h      |    2 +-
 tui/tui-stack.c     |    4 ++--
 tui/tui-win.c       |   10 +++++-----
 tui/tui-winsource.c |    4 ++--
 varobj.c            |    4 ++--
 15 files changed, 37 insertions(+), 152 deletions(-)

Index: gdb-6.3-type-punning-20060214.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-type-punning-20060214.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-type-punning-20060214.patch	14 Feb 2006 19:40:14 -0000	1.1
+++ gdb-6.3-type-punning-20060214.patch	14 Feb 2006 20:48:24 -0000	1.2
@@ -10,6 +10,7 @@
 	* p-exp.y (parse_number): Likewise.
 	* c-exp.c, jv-exp.c, objc-exp.c, p-exp.c: Rebuilt.
 	* varobj.c (free_variable): Silence type-punning warnings.
+	(varobj_refresh): Likewise.
 	* tui/tui-data.h (struct tui_list): Change type of list member.
 	* tui/tui-data.c: Remove no-longer-needed type casts.
 	(source_windows): Silence type-punning warnings.
@@ -17,8 +18,8 @@
 
 Index: gdb-6.3/gdb/c-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -1075,23 +1075,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -47,8 +48,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/jv-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -712,23 +712,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -77,8 +78,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/objc-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -1025,23 +1025,8 @@ parse_number (p, len, parsed_float, puti
  
        /* It's a float since it contains a point or an exponent.  */
@@ -107,8 +108,8 @@
  
 Index: gdb-6.3/gdb/p-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -798,23 +798,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -137,8 +138,17 @@
  	return ERROR;
 Index: gdb-6.3/gdb/varobj.c
 ===================================================================
---- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/varobj.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/varobj.c	2006-02-14 18:21:34.000000000 -0200
+@@ -866,7 +866,7 @@ varobj_refresh (void)
+       /* Get rid of the memory for the old expression.  This also
+          leaves var->root->exp == NULL, which is ok for the parsing
+          below.  */
+-      free_current_contents ((char **) &var->root->exp);
++      free_current_contents (&var->root->exp);
+                                                                                 
+       value_free (var->value);
+       var->type = NULL;
 @@ -1410,7 +1410,7 @@ free_variable (struct varobj *var)
    /* Free the expression if this is a root variable. */
    if (var->root->rootvar == var)
@@ -150,8 +160,8 @@
  
 Index: gdb-6.3/gdb/doublest.h
 ===================================================================
---- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/doublest.h	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/doublest.h	2006-02-14 17:29:22.000000000 -0200
 @@ -48,10 +48,15 @@ struct floatformat;
     host's `long double'.  In general, we'll probably reduce the precision of
     any such values and print a warning.  */
@@ -171,8 +181,8 @@
  extern void floatformat_to_doublest (const struct floatformat *,
 Index: gdb-6.3/gdb/tui/tui-data.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:29:22.000000000 -0200
 @@ -44,7 +44,7 @@ static int term_height, term_width;
  static struct tui_gen_win_info _locator;
  static struct tui_gen_win_info exec_info[2];
@@ -202,8 +212,8 @@
  	{
 Index: gdb-6.3/gdb/tui/tui-data.h
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:29:22.000000000 -0200
 @@ -110,7 +110,7 @@ enum tui_scroll_direction
  /* General list struct.  */
  struct tui_list
@@ -215,8 +225,8 @@
  
 Index: gdb-6.3/gdb/tui/tui-stack.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:29:22.000000000 -0200
 @@ -343,7 +343,7 @@ tui_show_frame_info (struct frame_info *
        for (i = 0; i < (tui_source_windows ())->count; i++)
  	{
@@ -237,8 +247,8 @@
  	}
 Index: gdb-6.3/gdb/tui/tui-win.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:29:22.000000000 -0200
 @@ -1088,7 +1088,7 @@ tui_adjust_win_heights (struct tui_win_i
  	      make_invisible_and_set_new_height (primary_win_info, new_height);
  	      if (primary_win_info->generic.type == CMD_WIN)
@@ -286,8 +296,8 @@
      }
 Index: gdb-6.3/gdb/tui/tui-winsource.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:29:22.000000000 -0200
 @@ -158,7 +158,7 @@ tui_update_source_windows_with_addr (COR
  
        for (i = 0; i < (tui_source_windows ())->count; i++)
@@ -308,8 +318,8 @@
          {
 Index: gdb-6.3/gdb/c-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/c-exp.c	2004-11-08 14:25:35.000000000 -0200
-+++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/c-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2727,23 +2727,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -338,8 +348,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/jv-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/jv-exp.c	2004-11-08 14:25:38.000000000 -0200
-+++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/jv-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2099,23 +2099,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -368,8 +378,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/objc-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/objc-exp.c	2004-11-08 14:25:36.000000000 -0200
-+++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/objc-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2688,23 +2688,8 @@ parse_number (p, len, parsed_float, puti
  
        /* It's a float since it contains a point or an exponent.  */
@@ -398,8 +408,8 @@
  
 Index: gdb-6.3/gdb/p-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/p-exp.c	2004-11-08 14:25:41.000000000 -0200
-+++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/p-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2141,23 +2141,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gdb.spec	14 Feb 2006 19:40:14 -0000	1.170
+++ gdb.spec	14 Feb 2006 20:48:24 -0000	1.171
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.102
+Release: 1.103
 
 License: GPL
 Group: Development/Debuggers
@@ -536,6 +536,12 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.106
+- Bump up release number.
+
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.103
+- Adjust type-punning patch to include fix not needed upstream.
+
 * Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.102
 - Bump up release number.
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:48:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:48:27 -0500
Subject: rpms/gdb/FC-4 gdb-6.3-type-punning-20060214.patch, 1.1, 1.2 gdb.spec,
	1.167, 1.168
Message-ID: <200602142048.k1EKmR7G014648@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb-6.3-type-punning-20060214.patch gdb.spec 
Log Message:
* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.103
- Adjust type-punning patch to include fix not needed upstream.


gdb-6.3-type-punning-20060214.patch:
 c-exp.c             |   19 ++-----------------
 c-exp.y             |   19 ++-----------------
 doublest.h          |    7 ++++++-
 jv-exp.c            |   19 ++-----------------
 jv-exp.y            |   19 ++-----------------
 objc-exp.c          |   19 ++-----------------
 objc-exp.y          |   19 ++-----------------
 p-exp.c             |   19 ++-----------------
 p-exp.y             |   19 ++-----------------
 tui/tui-data.c      |    6 +++---
 tui/tui-data.h      |    2 +-
 tui/tui-stack.c     |    4 ++--
 tui/tui-win.c       |   10 +++++-----
 tui/tui-winsource.c |    4 ++--
 varobj.c            |    4 ++--
 15 files changed, 37 insertions(+), 152 deletions(-)

Index: gdb-6.3-type-punning-20060214.patch
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-type-punning-20060214.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdb-6.3-type-punning-20060214.patch	14 Feb 2006 19:40:13 -0000	1.1
+++ gdb-6.3-type-punning-20060214.patch	14 Feb 2006 20:48:24 -0000	1.2
@@ -10,6 +10,7 @@
 	* p-exp.y (parse_number): Likewise.
 	* c-exp.c, jv-exp.c, objc-exp.c, p-exp.c: Rebuilt.
 	* varobj.c (free_variable): Silence type-punning warnings.
+	(varobj_refresh): Likewise.
 	* tui/tui-data.h (struct tui_list): Change type of list member.
 	* tui/tui-data.c: Remove no-longer-needed type casts.
 	(source_windows): Silence type-punning warnings.
@@ -17,8 +18,8 @@
 
 Index: gdb-6.3/gdb/c-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/c-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/c-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -1075,23 +1075,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -47,8 +48,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/jv-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/jv-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/jv-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -712,23 +712,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -77,8 +78,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/objc-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/objc-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/objc-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -1025,23 +1025,8 @@ parse_number (p, len, parsed_float, puti
  
        /* It's a float since it contains a point or an exponent.  */
@@ -107,8 +108,8 @@
  
 Index: gdb-6.3/gdb/p-exp.y
 ===================================================================
---- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/p-exp.y	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/p-exp.y	2006-02-14 17:29:22.000000000 -0200
 @@ -798,23 +798,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -137,8 +138,17 @@
  	return ERROR;
 Index: gdb-6.3/gdb/varobj.c
 ===================================================================
---- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/varobj.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/varobj.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/varobj.c	2006-02-14 18:21:34.000000000 -0200
+@@ -866,7 +866,7 @@ varobj_refresh (void)
+       /* Get rid of the memory for the old expression.  This also
+          leaves var->root->exp == NULL, which is ok for the parsing
+          below.  */
+-      free_current_contents ((char **) &var->root->exp);
++      free_current_contents (&var->root->exp);
+                                                                                 
+       value_free (var->value);
+       var->type = NULL;
 @@ -1410,7 +1410,7 @@ free_variable (struct varobj *var)
    /* Free the expression if this is a root variable. */
    if (var->root->rootvar == var)
@@ -150,8 +160,8 @@
  
 Index: gdb-6.3/gdb/doublest.h
 ===================================================================
---- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/doublest.h	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/doublest.h	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/doublest.h	2006-02-14 17:29:22.000000000 -0200
 @@ -48,10 +48,15 @@ struct floatformat;
     host's `long double'.  In general, we'll probably reduce the precision of
     any such values and print a warning.  */
@@ -171,8 +181,8 @@
  extern void floatformat_to_doublest (const struct floatformat *,
 Index: gdb-6.3/gdb/tui/tui-data.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-data.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-data.c	2006-02-14 17:29:22.000000000 -0200
 @@ -44,7 +44,7 @@ static int term_height, term_width;
  static struct tui_gen_win_info _locator;
  static struct tui_gen_win_info exec_info[2];
@@ -202,8 +212,8 @@
  	{
 Index: gdb-6.3/gdb/tui/tui-data.h
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-data.h	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-data.h	2006-02-14 17:29:22.000000000 -0200
 @@ -110,7 +110,7 @@ enum tui_scroll_direction
  /* General list struct.  */
  struct tui_list
@@ -215,8 +225,8 @@
  
 Index: gdb-6.3/gdb/tui/tui-stack.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-stack.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-stack.c	2006-02-14 17:29:22.000000000 -0200
 @@ -343,7 +343,7 @@ tui_show_frame_info (struct frame_info *
        for (i = 0; i < (tui_source_windows ())->count; i++)
  	{
@@ -237,8 +247,8 @@
  	}
 Index: gdb-6.3/gdb/tui/tui-win.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-win.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-win.c	2006-02-14 17:29:22.000000000 -0200
 @@ -1088,7 +1088,7 @@ tui_adjust_win_heights (struct tui_win_i
  	      make_invisible_and_set_new_height (primary_win_info, new_height);
  	      if (primary_win_info->generic.type == CMD_WIN)
@@ -286,8 +296,8 @@
      }
 Index: gdb-6.3/gdb/tui/tui-winsource.c
 ===================================================================
---- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:21:32.000000000 -0200
-+++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:21:34.000000000 -0200
+--- gdb-6.3.orig/gdb/tui/tui-winsource.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/tui/tui-winsource.c	2006-02-14 17:29:22.000000000 -0200
 @@ -158,7 +158,7 @@ tui_update_source_windows_with_addr (COR
  
        for (i = 0; i < (tui_source_windows ())->count; i++)
@@ -308,8 +318,8 @@
          {
 Index: gdb-6.3/gdb/c-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/c-exp.c	2004-11-08 14:25:35.000000000 -0200
-+++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/c-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/c-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2727,23 +2727,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -338,8 +348,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/jv-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/jv-exp.c	2004-11-08 14:25:38.000000000 -0200
-+++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/jv-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/jv-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2099,23 +2099,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  
@@ -368,8 +378,8 @@
  	return ERROR;
 Index: gdb-6.3/gdb/objc-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/objc-exp.c	2004-11-08 14:25:36.000000000 -0200
-+++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/objc-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/objc-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2688,23 +2688,8 @@ parse_number (p, len, parsed_float, puti
  
        /* It's a float since it contains a point or an exponent.  */
@@ -398,8 +408,8 @@
  
 Index: gdb-6.3/gdb/p-exp.c
 ===================================================================
---- gdb-6.3.orig/gdb/p-exp.c	2004-11-08 14:25:41.000000000 -0200
-+++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:08.000000000 -0200
+--- gdb-6.3.orig/gdb/p-exp.c	2006-02-14 17:29:17.000000000 -0200
++++ gdb-6.3/gdb/p-exp.c	2006-02-14 17:29:22.000000000 -0200
 @@ -2141,23 +2141,8 @@ parse_number (p, len, parsed_float, puti
        char saved_char = p[len];
  


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- gdb.spec	14 Feb 2006 19:40:13 -0000	1.167
+++ gdb.spec	14 Feb 2006 20:48:24 -0000	1.168
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.101
+Release: 1.103
 
 License: GPL
 Group: Development/Debuggers
@@ -536,7 +536,13 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.101
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.105
+- Bump up release number.
+
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.103
+- Adjust type-punning patch to include fix not needed upstream.
+
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.102
 - Bump up release number.
 
 * Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.99



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:51:25 -0500
Subject: rpms/gdb/devel gdb.spec,1.171,1.172
Message-ID: <200602142051.k1EKpPI8014859@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14836/gdb-devel

Modified Files:
	gdb.spec 
Log Message:
Oops, update Release


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- gdb.spec	14 Feb 2006 20:48:24 -0000	1.171
+++ gdb.spec	14 Feb 2006 20:51:23 -0000	1.172
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.103
+Release: 1.106
 
 License: GPL
 Group: Development/Debuggers



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:51:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:51:26 -0500
Subject: rpms/gdb/FC-4 gdb.spec,1.168,1.169
Message-ID: <200602142051.k1EKpQRr014868@cvs.devel.redhat.com>

Author: aoliva

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

Modified Files:
	gdb.spec 
Log Message:
Oops, update Release


Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- gdb.spec	14 Feb 2006 20:48:24 -0000	1.168
+++ gdb.spec	14 Feb 2006 20:51:23 -0000	1.169
@@ -11,7 +11,7 @@
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1.103
+Release: 1.105
 
 License: GPL
 Group: Development/Debuggers



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:51:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:51:37 -0500
Subject: rpms/kernel/devel jwltest-e1000-7_0_33-k2.patch, NONE,
	1.1.4.1 jwltest-ipw2200-hwcrypto-off.patch, NONE,
	1.1.2.1 jwltest-sk98lin-neuter.patch, NONE,
	1.1.10.1 kernel-2.6.spec, 1.1948, 1.1948.2.1
Message-ID: <200602142051.k1EKpbF5014911@cvs.devel.redhat.com>

Author: linville

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

Modified Files:
      Tag: private-linville-jwltest-fc5-9-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc5-9-branch
	jwltest-e1000-7_0_33-k2.patch 
	jwltest-ipw2200-hwcrypto-off.patch 
	jwltest-sk98lin-neuter.patch 
Log Message:


jwltest-e1000-7_0_33-k2.patch:
 e1000.h         |   52 +--
 e1000_ethtool.c |  113 +++----
 e1000_hw.c      |  861 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 e1000_hw.h      |  366 ++++++++++++++++++++++-
 e1000_main.c    |  674 +++++++++++++++++++------------------------
 e1000_osdep.h   |    4 
 e1000_param.c   |   78 +----
 7 files changed, 1508 insertions(+), 640 deletions(-)

--- NEW FILE jwltest-e1000-7_0_33-k2.patch ---
--- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig	2006-02-13 11:48:40.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c	2006-02-13 11:54:16.000000000 -0500
@@ -44,10 +44,19 @@
  */
 
 #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when e1000_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+
 #define E1000_PARAM(X, desc) \
-	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-	static int num_##X = 0; \
-	module_param_array_named(X, X, int, &num_##X, 0); \
+	static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+	MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \
 	MODULE_PARM_DESC(X, desc);
 
 /* Transmit Descriptor Count
@@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct
 		BUG();
 	}
 
-	DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n",
+	DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n",
 	       opt->name, *value, opt->err);
 	*value = opt->def;
 	return -1;
@@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter
 		DPRINTK(PROBE, NOTICE,
 		       "Warning: no configuration for board #%i\n", bd);
 		DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
+		bd = E1000_MAX_NIC;
 	}
 
 	{ /* Transmit Descriptor Count */
@@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		if (num_TxDescriptors > bd) {
 			tx_ring->count = TxDescriptors[bd];
 			e1000_validate_option(&tx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(tx_ring->count,
 						REQ_TX_DESCRIPTOR_MULTIPLE);
-		} else {
-			tx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		if (num_RxDescriptors > bd) {
 			rx_ring->count = RxDescriptors[bd];
 			e1000_validate_option(&rx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(rx_ring->count,
 						REQ_RX_DESCRIPTOR_MULTIPLE);
-		} else {
-			rx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		if (num_XsumRX > bd) {
 			int rx_csum = XsumRX[bd];
 			e1000_validate_option(&rx_csum, &opt, adapter);
 			adapter->rx_csum = rx_csum;
-		} else {
-			adapter->rx_csum = opt.def;
-		}
 	}
 	{ /* Flow Control */
 
@@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		if (num_FlowControl > bd) {
 			int fc = FlowControl[bd];
 			e1000_validate_option(&fc, &opt, adapter);
 			adapter->hw.fc = adapter->hw.original_fc = fc;
-		} else {
-			adapter->hw.fc = adapter->hw.original_fc = opt.def;
-		}
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		if (num_TxIntDelay > bd) {
 			adapter->tx_int_delay = TxIntDelay[bd];
 			e1000_validate_option(&adapter->tx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_int_delay = opt.def;
-		}
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		if (num_TxAbsIntDelay > bd) {
 			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		if (num_RxIntDelay > bd) {
 			adapter->rx_int_delay = RxIntDelay[bd];
 			e1000_validate_option(&adapter->rx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		if (num_RxAbsIntDelay > bd) {
 			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		if (num_InterruptThrottleRate > bd) {
 			adapter->itr = InterruptThrottleRate[bd];
 			switch (adapter->itr) {
 			case 0:
@@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter
 					adapter);
 				break;
 			}
-		} else {
-			adapter->itr = opt.def;
-		}
 	}
 
 	switch (adapter->hw.media_type) {
@@ -518,17 +492,18 @@ static void __devinit
 e1000_check_fiber_options(struct e1000_adapter *adapter)
 {
 	int bd = adapter->bd_number;
-	if (num_Speed > bd) {
+	bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd;
+	if ((Speed[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if (num_Duplex > bd) {
+	if ((Duplex[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
+	if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) {
 		DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
 				 "not valid for fiber adapters, "
 				 "parameter ignored\n");
@@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_
 {
 	int speed, dplx, an;
[...3966 lines suppressed...]
-
 	rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
 	rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
 		E1000_MAX_RXD : E1000_MAX_82544_RXD));
@@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
+	case e1000_80003es2lan:
 		toggle = 0x7FFFF3FF;
 		break;
 	case e1000_82573:
@@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
 		/* autoneg off */
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
+	} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
+		e1000_write_phy_reg(&adapter->hw,
+		                    GG82563_PHY_KMRN_MODE_CTRL,
+		                    0x1CE);
 	}
 	/* force 1000, set loopback */
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);
@@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap
 	case e1000_82571:
 	case e1000_82572:
 	case e1000_82573:
+	case e1000_80003es2lan:
 		return e1000_integrated_phy_loopback(adapter);
 		break;
 
@@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap
 	case e1000_82546_rev_3:
 	default:
 		hw->autoneg = TRUE;
+		if (hw->phy_type == e1000_phy_gg82563) {
+			e1000_write_phy_reg(hw,
+					    GG82563_PHY_KMRN_MODE_CTRL,
+					    0x180);
+		}
 		e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
 		if (phy_reg & MII_CR_LOOPBACK) {
 			phy_reg &= ~MII_CR_LOOPBACK;
@@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 		wol->supported = 0;
 		wol->wolopts   = 0;
 		return;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a) {
+			wol->supported = 0;
+			return;
+		}
+		/* KSP3 does not suppport UCAST wake-ups for any interface */
+		wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
+
+		if (adapter->wol & E1000_WUFC_EX)
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+		wol->wolopts = 0;
+		goto do_defaults;
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
+
+do_defaults:
 		if (adapter->wol & E1000_WUFC_EX)
 			wol->wolopts |= WAKE_UCAST;
 		if (adapter->wol & E1000_WUFC_MC)
@@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82543GC_COPPER:
 	case E1000_DEV_ID_82544EI_FIBER:
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
 		return wol->wolopts ? -EOPNOTSUPP : 0;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a)
+			return wol->wolopts ? -EOPNOTSUPP : 0;
+
+		if (wol->wolopts & WAKE_UCAST) {
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+			return -EOPNOTSUPP;
+		}
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev,
 			adapter->wol |= E1000_WUFC_BC;
 		if (wol->wolopts & WAKE_MAGIC)
 			adapter->wol |= E1000_WUFC_MAG;
+
 	}
 
 	return 0;
@@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic
 		struct ethtool_stats *stats, uint64_t *data)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_E1000_MQ
-	uint64_t *queue_stat;
-	int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t);
-	int j, k;
-#endif
 	int i;
 
 	e1000_update_stats(adapter);
@@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic
 		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
 			sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
 	}
-#ifdef CONFIG_E1000_MQ
-	for (j = 0; j < adapter->num_tx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-	for (j = 0; j < adapter->num_rx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-#endif
 /*	BUG_ON(i != E1000_STATS_LEN); */
 }
 
 static void
 e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
 {
-#ifdef CONFIG_E1000_MQ
-	struct e1000_adapter *adapter = netdev_priv(netdev);
-#endif
 	uint8_t *p = data;
 	int i;
 
@@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net
 			       ETH_GSTRING_LEN);
 			p += ETH_GSTRING_LEN;
 		}
-#ifdef CONFIG_E1000_MQ
-		for (i = 0; i < adapter->num_tx_queues; i++) {
-			sprintf(p, "tx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "tx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-		for (i = 0; i < adapter->num_rx_queues; i++) {
-			sprintf(p, "rx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "rx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-#endif
 /*		BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
 		break;
 	}
@@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum		= e1000_get_tx_csum,
+	.get_tx_csum            = e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
+#ifdef ETHTOOL_GPERMADDR
+	.get_perm_addr  	= ethtool_op_get_perm_addr,
+#endif
 };
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
+  
+void set_ethtool_ops(struct net_device *netdev)
 {
 	SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
 }

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-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,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1948
retrieving revision 1.1948.2.1
diff -u -r1.1948 -r1.1948.2.1
--- kernel-2.6.spec	14 Feb 2006 01:57:32 -0000	1.1948
+++ kernel-2.6.spec	14 Feb 2006 20:51:35 -0000	1.1948.2.1
@@ -22,7 +22,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.9
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -160,7 +161,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -244,6 +246,7 @@
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -334,6 +337,9 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
+Patch1303: jwltest-sk98lin-neuter.patch
+Patch1304: jwltest-e1000-7_0_33-k2.patch
+Patch1305: jwltest-ipw2200-hwcrypto-off.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -886,6 +892,12 @@
 %patch1301 -p1
 # Goodies for wireless drivers to make NetworkManager work
 %patch1302 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1303 -p1
+# update e1000 to 7.0.33-k2(-pre)
+%patch1304 -p1
+# disable hwcrypto in ipw2200 by default (avoid firmware resets)
+%patch1305 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Tue Feb 14 20:56:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 15:56:44 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.39,1.40
Message-ID: <200602142056.k1EKuit1024355@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24320

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
Bump release to 1.1


Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eclipse-bugzilla.spec	14 Feb 2006 20:43:22 -0000	1.39
+++ eclipse-bugzilla.spec	14 Feb 2006 20:56:39 -0000	1.40
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1
+Release:	1.1
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -156,6 +156,9 @@
 %endif
 
 %changelog
+* Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-1.1
+- Bump release.
+
 * Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-1
 - Updated to version 0.2.2 which sports working jars included int the plugin.
 - Changed source file format from <name>-<cvs tag>-<version> to 



From fedora-cvs-commits at redhat.com  Tue Feb 14 21:02:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 16:02:27 -0500
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439.patch, NONE,
	1.1 vixie-cron.spec, 1.66, 1.67
Message-ID: <200602142102.k1EL2Ruk025553@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25530

Modified Files:
	vixie-cron.spec 
Added Files:
	vixie-cron-4.1-_52-bz181439.patch 
Log Message:
fix bug 181439: enable easier selection of conditional compilation WITH_* features

vixie-cron-4.1-_52-bz181439.patch:
 Makefile |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

--- NEW FILE vixie-cron-4.1-_52-bz181439.patch ---
--- vixie-cron-4.1/Makefile.bz181439	2006-02-14 15:57:08.000000000 -0500
+++ vixie-cron-4.1/Makefile	2006-02-14 15:57:22.000000000 -0500
@@ -60,7 +60,19 @@
 INCLUDE		=	-I.
 #INCLUDE	=
 #<<need getopt()>>
-LIBS		= 	-lselinux -lpam -lpam_misc -laudit
+ifdef WITH_SELINUX
+SELINUX_LIBS=-lselinux
+SELINUX_DEFS=-DWITH_SELINUX
+endif
+ifdef WITH_PAM
+PAM_LIBS=-lpam -lpam_misc
+PAM_DEFS=-DWITH_PAM
+endif
+ifdef WITH_AUDIT
+AUDIT_LIBS=-laudit
+AUDIT_DEFS=-DWITH_AUDIT
+endif
+LIBS		=       $(SELINUX_LIBS) $(PAM_LIBS) $(AUDIT_LIBS)
 #<<optimize or debug?>>
 #CDEBUG		=	-O
 #CDEBUG		=	-g
@@ -70,7 +82,7 @@
 #<<want to use a nonstandard CC?>>
 CC		=	gcc -Wall -Wno-unused -Wno-comment
 #<<manifest defines>>
-DEFS		=	-DWITH_SELINUX -DWITH_PAM -DWITH_AUDIT
+DEFS		=	$(SELINUX_DEFS) $(PAM_DEFS) $(AUDIT_DEFS)
 #(SGI IRIX systems need this)
 #DEFS		=	-D_BSD_SIGNALS -Dconst=
 #<<the name of the BSD-like install program>>


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vixie-cron.spec	14 Feb 2006 20:30:18 -0000	1.66
+++ vixie-cron.spec	14 Feb 2006 21:02:14 -0000	1.67
@@ -4,6 +4,9 @@
 %if %{?WITH_PAM:0}%{!?WITH_PAM:1}
 %define WITH_PAM 1
 %endif
+%if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
+%define WITH_AUDIT 1
+%endif
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
@@ -66,6 +69,7 @@
 Patch49: vixie-cron-4.1-_49-bz178436.patch
 Patch50: vixie-cron-4.1-_50-bz178931.patch
 Patch51: vixie-cron-4.1-_51-bz180145-mail_i18n.patch
+Patch52: vixie-cron-4.1-_52-bz181439.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: syslog, bash >= 2.0
 Conflicts: sysklogd < 1.4.1
@@ -77,6 +81,9 @@
 Requires: pam >= 0.77-66.8
 Buildrequires: pam-devel
 %endif
+%if %{WITH_AUDIT}
+Requires: audit >= 1.0.3
+%endif
 
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
 
@@ -148,9 +155,20 @@
 %patch49 -p1 -b .bz178436
 %patch50 -p1 -b .bz178931
 %patch51 -p1 -b .mail_i18n
+%patch52 -p1 -b .bz181439
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror"
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" \
+%if %{WITH_SELINUX}
+WITH_SELINUX=1 \
+%endif
+%if %{WITH_PAM}
+WITH_PAM=1 \
+%endif
+%if %{WITH_AUDIT}
+WITH_AUDIT=1 \
+%endif
+;
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -205,6 +223,10 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-52.FC5
+- fix bug 181439: enable easier selection of optional 'WITH_*'
+  compilation features
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:4.1-51.FC5.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 21:02:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 16:02:28 -0500
Subject: rpms/diskdumputils/devel .cvsignore, 1.7, 1.8 diskdumputils.spec,
	1.17, 1.18 sources, 1.9, 1.10
Message-ID: <200602142102.k1EL2S29025604@cvs.devel.redhat.com>

Author: anderson

Update of /cvs/dist/rpms/diskdumputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25512

Modified Files:
	.cvsignore diskdumputils.spec sources 
Log Message:
updated source package to diskdumputils-1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Mar 2005 20:21:51 -0000	1.7
+++ .cvsignore	14 Feb 2006 21:02:21 -0000	1.8
@@ -1,3 +1,4 @@
 diskdumputils-0.6.1.tar.gz
 diskdumputils-0.6.2.tar.gz
 diskdumputils-1.0.1.tar.gz
+diskdumputils-1.2.8.tar.gz


Index: diskdumputils.spec
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/diskdumputils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- diskdumputils.spec	9 Feb 2006 20:04:23 -0000	1.17
+++ diskdumputils.spec	14 Feb 2006 21:02:24 -0000	1.18
@@ -1,13 +1,13 @@
 Summary: diskdump utilities
 Name: diskdumputils
-Version: 1.0.1
-Release: 6.3.2
+Version: 1.2.8
+Release: 3
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/System
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel
-Requires: initscripts glib2
+Requires: glib2
 ExclusiveArch: i386 ia64 x86_64 ppc64
 
 %description
@@ -58,9 +58,14 @@
 /usr/sbin/diskdumpctl_proc
 /usr/sbin/diskdumpctl
 /usr/sbin/diskdumpfmt
+/usr/sbin/diskdumpmsg
 /usr/sbin/savecore
+/etc/diskdump/mail_template.us
 
 %changelog
+* Tue Feb 14 2006 Dave Anderson <anderson at redhat.com> - 1.2.8-3
+- Updated source package to diskdumputils-1.2.8.tar.gz.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-6.3.2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	1 Mar 2005 20:21:51 -0000	1.9
+++ sources	14 Feb 2006 21:02:24 -0000	1.10
@@ -1 +1 @@
-c226754bb23e256653dce9e707354951  diskdumputils-1.0.1.tar.gz
+0acf1d9a625d9705f7ed0b3ba52afe74  diskdumputils-1.2.8.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 21:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 16:12:01 -0500
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439.patch,1.1,1.2
Message-ID: <200602142112.k1ELC1tA028124@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28092

Modified Files:
	vixie-cron-4.1-_52-bz181439.patch 
Log Message:
fix bug 181439: enable easier selection of conditional compilation WITH_* features

vixie-cron-4.1-_52-bz181439.patch:
 Makefile   |   16 ++++++++++++++--
 security.c |    3 +--
 structs.h  |    5 +++--
 3 files changed, 18 insertions(+), 6 deletions(-)

Index: vixie-cron-4.1-_52-bz181439.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_52-bz181439.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-_52-bz181439.patch	14 Feb 2006 21:02:14 -0000	1.1
+++ vixie-cron-4.1-_52-bz181439.patch	14 Feb 2006 21:11:58 -0000	1.2
@@ -1,5 +1,24 @@
---- vixie-cron-4.1/Makefile.bz181439	2006-02-14 15:57:08.000000000 -0500
-+++ vixie-cron-4.1/Makefile	2006-02-14 15:57:22.000000000 -0500
+--- vixie-cron-4.1/security.c.bz181439	2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/security.c	2006-02-14 16:11:00.000000000 -0500
+@@ -190,6 +190,7 @@
+ 			  int crontab_fd, 
+ 			  security_context_t *rcontext, 
+ 			  const char *tabname) {
++#ifdef WITH_SELINUX
+ 	security_context_t scontext=NULL;
+ 	security_context_t  file_context=NULL;
+ 	struct av_decision avd;
+@@ -199,8 +200,6 @@
+ 
+ 	*rcontext = NULL;
+ 
+-#ifdef WITH_SELINUX
+-
+ 	if (is_selinux_enabled() <= 0) 
+ 	    return 0;
+ 
+--- vixie-cron-4.1/Makefile.bz181439	2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/Makefile	2006-02-14 16:10:39.000000000 -0500
 @@ -60,7 +60,19 @@
  INCLUDE		=	-I.
  #INCLUDE	=
@@ -30,3 +49,25 @@
  #(SGI IRIX systems need this)
  #DEFS		=	-D_BSD_SIGNALS -Dconst=
  #<<the name of the BSD-like install program>>
+--- vixie-cron-4.1/structs.h.bz181439	2006-02-14 16:10:39.000000000 -0500
++++ vixie-cron-4.1/structs.h	2006-02-14 16:10:39.000000000 -0500
+@@ -44,6 +44,9 @@
+ 			 *
+ 			 * These are the crontabs.
+ 			 */
++#ifndef WITH_SELINUX
++#define security_context_t unsigned
++#endif
+ 
+ typedef	struct _user {
+ 	struct _user	*next, *prev;	/* links */
+@@ -51,9 +54,7 @@
+         char            *tabname;       /* /etc/cron.d/ file name or NULL */
+ 	time_t		mtime;		/* last modtime of crontab */
+ 	entry		*crontab;	/* this person's crontab */
+-#ifdef WITH_SELINUX
+         security_context_t scontext;    /* SELinux security context */
+-#endif        
+ } user;
+ 
+ typedef	struct _cron_db {



From fedora-cvs-commits at redhat.com  Tue Feb 14 21:18:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 16:18:24 -0500
Subject: rpms/vixie-cron/devel vixie-cron-4.1-_52-bz181439.patch,1.2,1.3
Message-ID: <200602142118.k1ELIOeY011038@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11004

Modified Files:
	vixie-cron-4.1-_52-bz181439.patch 
Log Message:
fix bug 181439: enable easier selection of conditional compilation WITH_* features

vixie-cron-4.1-_52-bz181439.patch:
 Makefile   |   16 ++++++++++++++--
 security.c |   13 +++++++------
 structs.h  |    5 +++--
 3 files changed, 24 insertions(+), 10 deletions(-)

Index: vixie-cron-4.1-_52-bz181439.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_52-bz181439.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vixie-cron-4.1-_52-bz181439.patch	14 Feb 2006 21:11:58 -0000	1.2
+++ vixie-cron-4.1-_52-bz181439.patch	14 Feb 2006 21:18:19 -0000	1.3
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/security.c.bz181439	2006-02-14 16:10:39.000000000 -0500
-+++ vixie-cron-4.1/security.c	2006-02-14 16:11:00.000000000 -0500
+--- vixie-cron-4.1/security.c.bz181439	2006-02-14 16:16:49.000000000 -0500
++++ vixie-cron-4.1/security.c	2006-02-14 16:16:54.000000000 -0500
 @@ -190,6 +190,7 @@
  			  int crontab_fd, 
  			  security_context_t *rcontext, 
@@ -17,8 +17,36 @@
  	if (is_selinux_enabled() <= 0) 
  	    return 0;
  
---- vixie-cron-4.1/Makefile.bz181439	2006-02-14 16:10:39.000000000 -0500
-+++ vixie-cron-4.1/Makefile	2006-02-14 16:10:39.000000000 -0500
+@@ -286,14 +285,14 @@
+    crontab environment */
+ static char ** build_env(char **cronenv)
+ {
++#ifdef WITH_PAM
+     char **jobenv = cronenv;
+-
+     char **pamenv = pam_getenvlist(pamh);
+     char *cronvar;
+     int count = 0;
+-
+     jobenv = env_copy(pamenv);
+ 
++
+         /* Now add the cron environment variables. Since env_set()
+            overwrites existing variables, this will let cron's
+            environment settings override pam's */
+@@ -304,6 +303,8 @@
+ 	    return NULL;
+ 	}
+     }
+-
+-    return jobenv;
++    return jobenv;    
++#else
++    return env_copy(cronenv);
++#endif
+ }
+--- vixie-cron-4.1/Makefile.bz181439	2006-02-14 16:16:49.000000000 -0500
++++ vixie-cron-4.1/Makefile	2006-02-14 16:16:50.000000000 -0500
 @@ -60,7 +60,19 @@
  INCLUDE		=	-I.
  #INCLUDE	=
@@ -49,8 +77,8 @@
  #(SGI IRIX systems need this)
  #DEFS		=	-D_BSD_SIGNALS -Dconst=
  #<<the name of the BSD-like install program>>
---- vixie-cron-4.1/structs.h.bz181439	2006-02-14 16:10:39.000000000 -0500
-+++ vixie-cron-4.1/structs.h	2006-02-14 16:10:39.000000000 -0500
+--- vixie-cron-4.1/structs.h.bz181439	2006-02-14 16:16:49.000000000 -0500
++++ vixie-cron-4.1/structs.h	2006-02-14 16:16:50.000000000 -0500
 @@ -44,6 +44,9 @@
  			 *
  			 * These are the crontabs.



From fedora-cvs-commits at redhat.com  Tue Feb 14 21:52:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 16:52:27 -0500
Subject: rpms/selinux-policy/devel booleans-mls.conf, 1.1,
	1.2 booleans-strict.conf, 1.1, 1.2 policy-20060207.patch, 1.6,
	1.7 selinux-policy.spec, 1.107, 1.108
Message-ID: <200602142152.k1ELqR5r003977@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3935

Modified Files:
	booleans-mls.conf booleans-strict.conf policy-20060207.patch 
	selinux-policy.spec 
Log Message:



Index: booleans-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-mls.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- booleans-mls.conf	21 Nov 2005 21:43:55 -0000	1.1
+++ booleans-mls.conf	14 Feb 2006 21:52:23 -0000	1.2
@@ -206,3 +206,4 @@
 # 
 write_untrusted_content = false
 
+spamd_enable_home_dirs = false
\ No newline at end of file


Index: booleans-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-strict.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- booleans-strict.conf	24 Jan 2006 15:41:46 -0000	1.1
+++ booleans-strict.conf	14 Feb 2006 21:52:23 -0000	1.2
@@ -206,3 +206,4 @@
 # 
 write_untrusted_content = false
 
+spamd_enable_home_dirs = false
\ No newline at end of file

policy-20060207.patch:
 Makefile                                  |    2 -
 Rules.modular                             |    2 -
 policy/global_tunables                    |    8 ++++
 policy/mcs                                |   13 ++++++-
 policy/modules/kernel/devices.if          |   19 +++++++++++
 policy/modules/kernel/mls.if              |   19 +++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/hal.te            |    5 ++-
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    3 +
 policy/modules/services/networkmanager.te |    2 -
 policy/modules/services/postfix.te        |    4 ++
 policy/modules/services/spamassassin.te   |    8 +++-
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/init.te             |    2 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/libraries.if        |    1 
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 ++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   50 ++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.if       |    3 +
 policy/modules/system/userdomain.te       |    7 ++++
 support/Makefile.devel                    |   12 ++++++-
 24 files changed, 199 insertions(+), 14 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- policy-20060207.patch	14 Feb 2006 17:11:59 -0000	1.6
+++ policy-20060207.patch	14 Feb 2006 21:52:23 -0000	1.7
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.15/Makefile
 --- nsaserefpolicy/Makefile	2006-02-14 07:20:17.000000000 -0500
-+++ serefpolicy-2.2.15/Makefile	2006-02-14 11:16:13.000000000 -0500
++++ serefpolicy-2.2.15/Makefile	2006-02-14 16:49:49.000000000 -0500
 @@ -45,7 +45,7 @@
  AWK ?= gawk
  GREP ?= egrep
@@ -10,9 +10,24 @@
  SED ?= sed
  SH ?= sh
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.15/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2006-02-10 21:34:11.000000000 -0500
++++ serefpolicy-2.2.15/policy/global_tunables	2006-02-14 16:49:59.000000000 -0500
+@@ -461,3 +461,11 @@
+ ## </desc>
+ gen_tunable(xdm_sysadm_login,false)
+ ')
++
++## <desc>
++## <p>
++## Allow spammd to read/write user home directories.
++## </p>
++## </desc>
++gen_tunable(spamd_enable_home_dirs,true)
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.15/policy/mcs
 --- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.15/policy/mcs	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/mcs	2006-02-14 16:49:49.000000000 -0500
 @@ -137,15 +137,24 @@
  # Only files are constrained by MCS at this stage.
  #
@@ -42,7 +57,7 @@
  link unlink rename relabelfrom relabelto }')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.15/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 16:49:49.000000000 -0500
 @@ -2656,3 +2656,22 @@
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
@@ -68,7 +83,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.2.15/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/mls.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/mls.if	2006-02-14 16:49:49.000000000 -0500
 @@ -214,3 +214,22 @@
  
  	typeattribute $1 mlstrustedobject;
@@ -94,7 +109,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.15/policy/modules/kernel/mls.te
 --- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/mls.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/mls.te	2006-02-14 16:49:49.000000000 -0500
 @@ -46,6 +46,7 @@
  
  attribute privrangetrans;
@@ -105,7 +120,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.15/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/bluetooth.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/bluetooth.te	2006-02-14 16:49:49.000000000 -0500
 @@ -101,6 +101,7 @@
  
  dev_read_sysfs(bluetooth_t)
@@ -116,7 +131,7 @@
  fs_getattr_all_fs(bluetooth_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.15/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/hal.te	2006-02-14 09:05:04.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/hal.te	2006-02-14 16:49:49.000000000 -0500
 @@ -22,7 +22,7 @@
  #
  
@@ -145,7 +160,7 @@
  miscfiles_read_hwdata(hald_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.15/policy/modules/services/mta.if
 --- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/mta.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/mta.if	2006-02-14 16:49:49.000000000 -0500
 @@ -458,6 +458,7 @@
  
  	allow $1 sendmail_exec_t:lnk_file r_file_perms;
@@ -156,7 +171,7 @@
  	allow system_mail_t $1:fd use;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.15/policy/modules/services/mta.te
 --- nsaserefpolicy/policy/modules/services/mta.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/mta.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/mta.te	2006-02-14 16:49:49.000000000 -0500
 @@ -30,6 +30,9 @@
  
  mta_base_mail_template(system)
@@ -169,7 +184,7 @@
  # does not work in the else part of the optional
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.15/policy/modules/services/networkmanager.te
 --- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/networkmanager.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/networkmanager.te	2006-02-14 16:49:49.000000000 -0500
 @@ -22,7 +22,7 @@
  dontaudit NetworkManager_t self:capability sys_tty_config;
  allow NetworkManager_t self:process { setcap getsched signal_perms };
@@ -181,7 +196,7 @@
  allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.15/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/postfix.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/postfix.te	2006-02-14 16:49:49.000000000 -0500
 @@ -273,6 +273,8 @@
  corecmd_exec_shell(postfix_local_t)
  corecmd_exec_bin(postfix_local_t)
@@ -209,7 +224,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.15/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-14 07:20:28.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-14 16:49:49.000000000 -0500
 @@ -78,6 +78,7 @@
  # random ports >= 1024.
  corenet_udp_bind_generic_port(spamd_t)
@@ -218,9 +233,23 @@
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
+@@ -122,8 +123,11 @@
+ 	term_dontaudit_use_unallocated_ttys(spamd_t)
+ 	term_dontaudit_use_generic_ptys(spamd_t)
+ 	files_dontaudit_read_root_files(spamd_t)
+-	userdom_manage_generic_user_home_dirs(spamd_t)
+-	userdom_manage_generic_user_home_files(spamd_t)
++	tunable_policy(`spamd_enable_home_dirs',`
++		userdom_manage_generic_user_home_dirs(spamd_t)
++		userdom_manage_generic_user_home_files(spamd_t)
++		userdom_manage_generic_user_home_symlinks(spamd_t)
++	')
+ ')
+ 
+ tunable_policy(`use_nfs_home_dirs',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.15/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/init.fc	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/init.fc	2006-02-14 16:49:49.000000000 -0500
 @@ -22,7 +22,8 @@
  #
  # /sbin
@@ -233,7 +262,7 @@
  /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.15/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-02-08 10:03:08.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/init.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/init.te	2006-02-14 16:49:49.000000000 -0500
 @@ -157,6 +157,7 @@
  
  mls_file_read_up(init_t)
@@ -250,9 +279,21 @@
  mls_process_read_up(initrc_t)
  mls_process_write_down(initrc_t)
  mls_rangetrans_source(initrc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.15/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/libraries.fc	2006-02-14 16:49:49.000000000 -0500
+@@ -62,7 +62,7 @@
+ /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
+ 
+-/usr/lib(64)?/libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.15/policy/modules/system/libraries.if
 --- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/libraries.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/libraries.if	2006-02-14 16:49:49.000000000 -0500
 @@ -283,6 +283,7 @@
  
  	allow $1 lib_t:dir search_dir_perms;
@@ -263,7 +304,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc	2006-02-14 16:49:49.000000000 -0500
 @@ -10,6 +10,7 @@
  /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
  
@@ -280,7 +321,7 @@
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.15/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.if	2006-02-14 16:49:49.000000000 -0500
 @@ -587,6 +587,22 @@
  
  ########################################
@@ -343,7 +384,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.15/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.te	2006-02-14 16:49:49.000000000 -0500
 @@ -535,3 +535,53 @@
  # scripts will put things in a state such that setfiles can not be run!
  allow setfiles_t lib_t:file { read execute };
@@ -400,7 +441,7 @@
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.15/policy/modules/system/unconfined.if
 --- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/unconfined.if	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/unconfined.if	2006-02-14 16:49:49.000000000 -0500
 @@ -55,10 +55,11 @@
  	tunable_policy(`allow_execmem && allow_execstack',`
  		# Allow making the stack executable via mprotect.
@@ -416,7 +457,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.15/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/userdomain.te	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/userdomain.te	2006-02-14 16:49:49.000000000 -0500
 @@ -168,7 +168,11 @@
  		logging_read_audit_log(secadm_t)
  		logging_domtrans_auditctl(secadm_t)
@@ -441,7 +482,7 @@
  			selinux_set_boolean(sysadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.15/Rules.modular
 --- nsaserefpolicy/Rules.modular	2006-02-14 07:20:18.000000000 -0500
-+++ serefpolicy-2.2.15/Rules.modular	2006-02-14 08:04:17.000000000 -0500
++++ serefpolicy-2.2.15/Rules.modular	2006-02-14 16:49:49.000000000 -0500
 @@ -83,7 +83,7 @@
  #
  $(BASE_PKG): tmp/base.mod $(BASE_FC)
@@ -453,7 +494,7 @@
  	@echo "Compiling $(NAME) base module"
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.15/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.15/support/Makefile.devel	2006-02-14 08:41:26.000000000 -0500
++++ serefpolicy-2.2.15/support/Makefile.devel	2006-02-14 16:49:49.000000000 -0500
 @@ -1,3 +1,6 @@
 +# installation paths
 +SHAREDIR := $(PREFIX)/share/selinux


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- selinux-policy.spec	14 Feb 2006 17:11:59 -0000	1.107
+++ selinux-policy.spec	14 Feb 2006 21:52:23 -0000	1.108
@@ -6,7 +6,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.15
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -297,6 +297,10 @@
 
 %changelog
 
+* Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-2
+- Fix spamd reading of ~/
+- fix nvidia spec
+
 * Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-1
 - Update to upsteam
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 22:10:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 17:10:01 -0500
Subject: rpms/gstreamer/FC-4 gstreamer-0.8.12-lib64.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 gstreamer.spec, 1.32, 1.33 sources,
	1.15, 1.16 gstreamer-0.8.8-lib64.patch, 1.1, NONE
Message-ID: <200602142210.k1EMA1qY008620@cvs.devel.redhat.com>

Author: cmontgom

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

Modified Files:
	.cvsignore gstreamer.spec sources 
Added Files:
	gstreamer-0.8.12-lib64.patch 
Removed Files:
	gstreamer-0.8.8-lib64.patch 
Log Message:
- Update to upstream 0.8.12
- Added Makefile .lib64 patch



gstreamer-0.8.12-lib64.patch:
 docs/gst/gstreamer-sections.txt |    4 ++++
 gst/Makefile.am                 |    1 +
 gst/gst.c                       |    4 ++--
 gst/gstregistry.h               |    4 ++++
 tools/Makefile.am               |   33 +++++++++++++++++++++++++--------
 tools/gst-register.in           |    5 +++++
 6 files changed, 41 insertions(+), 10 deletions(-)

--- NEW FILE gstreamer-0.8.12-lib64.patch ---
--- gstreamer-0.8.12/docs/gst/gstreamer-sections.txt.lib64	2006-01-29 21:21:44.000000000 -0500
+++ gstreamer-0.8.12/docs/gst/gstreamer-sections.txt	2006-02-14 16:51:27.000000000 -0500
@@ -1347,10 +1347,14 @@
 GstRegistry
 GLOBAL_REGISTRY_DIR
 GLOBAL_REGISTRY_FILE
+GLOBAL_ARCH_REGISTRY_FILE
 GLOBAL_REGISTRY_FILE_TMP
+GLOBAL_ARCH_REGISTRY_FILE_TMP
 LOCAL_REGISTRY_DIR
 LOCAL_REGISTRY_FILE
+LOCAL_ARCH_REGISTRY_FILE
 LOCAL_REGISTRY_FILE_TMP
+LOCAL_ARCH_REGISTRY_FILE_TMP
 REGISTRY_DIR_PERMS
 REGISTRY_TMPFILE_PERMS
 REGISTRY_FILE_PERMS
--- gstreamer-0.8.12/tools/Makefile.am.lib64	2005-07-24 17:05:46.000000000 -0400
+++ gstreamer-0.8.12/tools/Makefile.am	2006-02-14 16:57:20.000000000 -0500
@@ -2,9 +2,13 @@
 if GST_DISABLE_REGISTRY
 GST_REGISTRY_SRC = 
 GST_REGISTRY_SRC_V = 
+GST_REGISTRY_WRAPPER_SRC = 
+GST_REGISTRY_WRAPPER_SRC_V =
 else
-GST_REGISTRY_SRC = gst-register
-GST_REGISTRY_SRC_V = gst-register- at GST_MAJORMINOR@
+GST_REGISTRY_SRC = gst-register- at host_cpu@
+GST_REGISTRY_SRC_V = gst-register- at host_cpu@- at GST_MAJORMINOR@
+GST_REGISTRY_WRAPPER_SRC = gst-register
+GST_REGISTRY_WRAPPER_SRC_V = gst-register- at GST_MAJORMINOR@
 endif
 
 if GST_DISABLE_LOADSAVE
@@ -34,18 +38,31 @@
 
 ### so all of the programs we want to build
 bin_PROGRAMS = \
-	$(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V) \
 	$(GST_LOADSAVE_SRC) $(GST_LOADSAVE_SRC_V) \
 	$(GST_OTHER_SRC) $(GST_OTHER_SRC_V)
-bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@
+bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@ \
+	$(GST_REGISTRY_WRAPPER_SRC) $(GST_REGISTRY_WRAPPER_SRC_V)
+
+libexec_PROGRAMS = \
+	$(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V)
 
 noinst_HEADERS = tools.h
 
 # make sure each versioned tool has the right source file and flags
 if !GST_DISABLE_REGISTRY
-gst_register_ at GST_MAJORMINOR@_SOURCES = gst-register.c
-gst_register_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_register_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
+edit = sed -e 's, at libexecdir\@,$(libexecdir),g' -e 's, at GST_MAJORMINOR\@, at GST_MAJORMINOR@,g'
+
+gst-register- at GST_MAJORMINOR@: Makefile $(srcdir)/gst-register.in
+	rm -f gst-register- at GST_MAJORMINOR@ gst-register- at GST_MAJORMINOR@.tmp
+	$(edit) $(srcdir)/gst-register.in >gst-register- at GST_MAJORMINOR@.tmp
+	mv gst-register- at GST_MAJORMINOR@.tmp gst-register- at GST_MAJORMINOR@
+gst-register: Makefile $(srcdir)/gst-register.in
+	rm -f gst-register gst-register.tmp
+	$(edit) $(srcdir)/gst-register.in >gst-register.tmp
+	mv gst-register.tmp gst-register
+gst_register_ at host_cpu@_ at GST_MAJORMINOR@_SOURCES = gst-register.c
+gst_register_ at host_cpu@_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_register_ at host_cpu@_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
 endif
 if !GST_DISABLE_LOADSAVE
 gst_complete_ at GST_MAJORMINOR@_SOURCES = gst-complete.c
@@ -80,7 +97,7 @@
 
 # make sure each unversioned tool comes from gst-run.c
 if !GST_DISABLE_REGISTRY
-gst_register_SOURCES = gst-run.c
+gst_register_ at host_cpu@_SOURCES = gst-run.c
 endif
 if !GST_DISABLE_LOADSAVE
 gst_complete_SOURCES = gst-run.c
--- /dev/null	2006-02-14 10:46:40.746210750 -0500
+++ gstreamer-0.8.12/tools/gst-register.in	2006-02-14 16:51:27.000000000 -0500
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+for x in @libexecdir@/gst-register*@GST_MAJORMINOR@; do
+  $x
+done
--- gstreamer-0.8.12/gst/Makefile.am.lib64	2005-05-14 19:55:20.000000000 -0400
+++ gstreamer-0.8.12/gst/Makefile.am	2006-02-14 16:51:27.000000000 -0500
@@ -141,6 +141,7 @@
                                                                                 
 libgstreamer_ at GST_MAJORMINOR@_la_CFLAGS =	\
 	-D_GNU_SOURCE				\
+	-DHOSTCPU=\"$(host_cpu)\"		\
 	$(GST_LIB_CFLAGS) 			\
 	-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" 
 libgstreamer_ at GST_MAJORMINOR@_la_LIBADD = \
--- gstreamer-0.8.12/gst/gstregistry.h.lib64	2005-05-02 12:39:00.000000000 -0400
+++ gstreamer-0.8.12/gst/gstregistry.h	2006-02-14 16:51:27.000000000 -0500
@@ -29,10 +29,14 @@
 #define GLOBAL_REGISTRY_DIR      GST_CACHE_DIR
 #define GLOBAL_REGISTRY_FILE     GLOBAL_REGISTRY_DIR"/registry.xml"
 #define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp"
+#define GLOBAL_ARCH_REGISTRY_FILE     GLOBAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml"
+#define GLOBAL_ARCH_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp"
 
 #define LOCAL_REGISTRY_DIR       ".gstreamer-"GST_MAJORMINOR
 #define LOCAL_REGISTRY_FILE      LOCAL_REGISTRY_DIR"/registry.xml"
 #define LOCAL_REGISTRY_FILE_TMP  LOCAL_REGISTRY_DIR"/.registry.xml.tmp"
+#define LOCAL_ARCH_REGISTRY_FILE      LOCAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml"
+#define LOCAL_ARCH_REGISTRY_FILE_TMP  LOCAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp"
 
 /* compatibility for pre-POSIX defines */
 #ifdef S_IRUSR
--- gstreamer-0.8.12/gst/gst.c.lib64	2006-01-29 17:55:03.000000000 -0500
+++ gstreamer-0.8.12/gst/gst.c	2006-02-14 16:51:27.000000000 -0500
@@ -497,7 +497,7 @@
     const gchar *homedir;
 
     _global_registry =
-        gst_xml_registry_new ("global_registry", GLOBAL_REGISTRY_FILE);
+      gst_xml_registry_new ("global_registry", GLOBAL_ARCH_REGISTRY_FILE);
 
 #ifdef PLUGINS_USE_BUILDDIR
     /* location libgstelements.so */
@@ -517,7 +517,7 @@
       user_reg = g_strdup (g_getenv ("GST_REGISTRY"));
     } else {
       homedir = g_get_home_dir ();
-      user_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL);
+      user_reg = g_build_filename (homedir, LOCAL_ARCH_REGISTRY_FILE, NULL);
     }
     _user_registry = gst_xml_registry_new ("user_registry", user_reg);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 May 2005 16:06:23 -0000	1.14
+++ .cvsignore	14 Feb 2006 22:09:58 -0000	1.15
@@ -4,3 +4,4 @@
 gstreamer-0.8.8.tar.bz2
 gstreamer-0.8.9.tar.bz2
 gstreamer-0.8.10.tar.bz2
+gstreamer-0.8.12.tar.bz2


Index: gstreamer.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/FC-4/gstreamer.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gstreamer.spec	3 May 2005 16:06:23 -0000	1.32
+++ gstreamer.spec	14 Feb 2006 22:09:58 -0000	1.33
@@ -2,7 +2,7 @@
 %define _libxml2	2.4.9
 
 Name: gstreamer
-Version: 0.8.10
+Version: 0.8.12
 # keep in sync with the VERSION.  gstreamer can append a .0.1 to CVS snapshots.
 %define majmin  0.8
 %define po_package %{name}-%{majmin}
@@ -15,7 +15,7 @@
 Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # There was problems generating pdf and postscript:
-Patch0: gstreamer-0.8.8-lib64.patch
+Patch0: gstreamer-0.8.12-lib64.patch
 Patch1: gstreamer-0.7.5-nops.patch
 Patch2: gstreamer-0.8.9-cast-fix.patch
 
@@ -165,6 +165,10 @@
 %exclude %{_mandir}/man1/*-%{majmin}.1.gz
 
 %changelog
+* Tue Feb 14 2006 Monty (xiphmont) <cmontgom at redhat.com> 0.8.12-1
+- Update to upstream 0.8.12
+- Added Makefile .lib64 patch
+
 * Tue May 03 2005 John (J5) Palmieri <johnp at redhat.com> 0.8.10-1
 - Update to upstream 0.8.10
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	3 May 2005 16:07:08 -0000	1.15
+++ sources	14 Feb 2006 22:09:58 -0000	1.16
@@ -1 +1 @@
-3de474d993e23c901e9dfdd1fea486e0  gstreamer-0.8.10.tar.bz2
+80f3c4957ab3e254cc90016f87ba5482  gstreamer-0.8.12.tar.bz2


--- gstreamer-0.8.8-lib64.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 22:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 17:11:48 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.221, 1.222 anaconda.spec, 1.341,
	1.342 sources, 1.340, 1.341
Message-ID: <200602142211.k1EMBm2b009484@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9437/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.5-1 on branch devel from anaconda-10.92.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- .cvsignore	14 Feb 2006 05:05:50 -0000	1.221
+++ .cvsignore	14 Feb 2006 22:11:46 -0000	1.222
@@ -1 +1 @@
-anaconda-10.92.4.tar.bz2
+anaconda-10.92.5.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- anaconda.spec	14 Feb 2006 05:05:53 -0000	1.341
+++ anaconda.spec	14 Feb 2006 22:11:46 -0000	1.342
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.4
+Version: 10.92.5
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,14 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Feb 14 2006 Jeremy Katz <katzj at redhat.com> - 10.92.5-1
+- Fix traceback in language group selection
+- No remote save traceback button if not network (clumens)
+- More fixes for minstg2.img (clumens)
+- Disable next/back while installing packages (dcantrel)
+- Bump minimum amounts for install, graphical and early swap
+- Enable Arabic for text mode (notting)
+
 * Tue Feb 14 2006 Jeremy Katz <katzj at redhat.com> - 10.92.4-1
 - improve globbing for xen guest kernels
 - Don't add a kernel if one is already selected.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- sources	14 Feb 2006 05:05:53 -0000	1.340
+++ sources	14 Feb 2006 22:11:46 -0000	1.341
@@ -1 +1 @@
-b0ae782f751b811e67a1f6c41e42811b  anaconda-10.92.4.tar.bz2
+eda159cf73ffd561ebfcafc62d182f23  anaconda-10.92.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 22:45:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 17:45:14 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec, 1.40,
	1.41 sources, 1.18, 1.19
Message-ID: <200602142245.k1EMjEsR023177@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23163

Modified Files:
	eclipse-bugzilla.spec sources 
Log Message:
* Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-2
- Updated source, removes extraneous debug output.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- eclipse-bugzilla.spec	14 Feb 2006 20:56:39 -0000	1.40
+++ eclipse-bugzilla.spec	14 Feb 2006 22:45:12 -0000	1.41
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	1.1
+Release:	2
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
@@ -156,6 +156,9 @@
 %endif
 
 %changelog
+* Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-2
+- Updated source, removes extraneous debug output.
+
 * Tue Feb 14 2006 Igor Foox <ifoox at redhat.com> 0.2.2-1.1
 - Bump release.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	14 Feb 2006 20:43:22 -0000	1.18
+++ sources	14 Feb 2006 22:45:12 -0000	1.19
@@ -1 +1 @@
-460ac6be3a6306647f1ef3e6786206b4  eclipse-bugzilla-fetched-0.2.2.tar.gz
+059ddef9c6568341a0446ca9476f8327  eclipse-bugzilla-fetched-0.2.2.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 14 22:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 17:48:03 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.7,
	1.8 selinux-policy.spec, 1.108, 1.109
Message-ID: <200602142248.k1EMm3TW003283@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3265

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                  |    2 -
 Rules.modular                             |    2 -
 policy/global_tunables                    |    8 ++++
 policy/mcs                                |   13 ++++++-
 policy/modules/kernel/devices.if          |   19 +++++++++++
 policy/modules/kernel/mls.if              |   19 +++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/hal.te            |    5 ++-
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    3 +
 policy/modules/services/networkmanager.te |    2 -
 policy/modules/services/postfix.te        |    4 ++
 policy/modules/services/spamassassin.te   |    8 +++-
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/init.te             |    2 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/libraries.if        |    1 
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 ++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   50 ++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.if       |    3 +
 policy/modules/system/userdomain.te       |    7 ++++
 support/Makefile.devel                    |   12 ++++++-
 24 files changed, 199 insertions(+), 14 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- policy-20060207.patch	14 Feb 2006 21:52:23 -0000	1.7
+++ policy-20060207.patch	14 Feb 2006 22:48:01 -0000	1.8
@@ -57,7 +57,7 @@
  link unlink rename relabelfrom relabelto }')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.15/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 16:49:49.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 17:21:40.000000000 -0500
 @@ -2656,3 +2656,22 @@
  	typeattribute $1 memory_raw_write, memory_raw_read;
  ')
@@ -79,7 +79,7 @@
 +	')
 +
 +	allow $1 device_t:dir r_dir_perms;
-+	allow $1 usb_device_t:chr_file { read write };
++	allow $1 usb_device_t:chr_file rw_file_perms;
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.2.15/policy/modules/kernel/mls.if
 --- nsaserefpolicy/policy/modules/kernel/mls.if	2006-02-10 21:34:12.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- selinux-policy.spec	14 Feb 2006 21:52:23 -0000	1.108
+++ selinux-policy.spec	14 Feb 2006 22:48:01 -0000	1.109
@@ -6,7 +6,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.15
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -297,7 +297,8 @@
 
 %changelog
 
-* Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-2
+* Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-3
+- Fix bluetooth handling of usb devices
 - Fix spamd reading of ~/
 - fix nvidia spec
 



From fedora-cvs-commits at redhat.com  Tue Feb 14 22:58:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 17:58:39 -0500
Subject: rpms/gstreamer-plugins/FC-4 .cvsignore, 1.15,
	1.16 gstreamer-plugins.spec, 1.45, 1.46 removed-sources.txt,
	1.22, 1.23 sources, 1.24, 1.25
Message-ID: <200602142258.k1EMwdD2014208@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13854

Modified Files:
	.cvsignore gstreamer-plugins.spec removed-sources.txt sources 
Log Message:
Updated to upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	24 Mar 2005 15:52:03 -0000	1.15
+++ .cvsignore	14 Feb 2006 22:58:35 -0000	1.16
@@ -2,3 +2,4 @@
 gst-plugins-0.8.7.patched.tar.bz2
 gst-plugins-0.8.8.tar.bz2
 gst-plugins-0.8.8.patched.tar.bz2
+gst-plugins-0.8.12.patched.tar.bz2


Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gstreamer-plugins.spec	11 Aug 2005 16:24:51 -0000	1.45
+++ gstreamer-plugins.spec	14 Feb 2006 22:58:35 -0000	1.46
@@ -3,10 +3,10 @@
 
 Summary: GStreamer Streaming-media framework plugins
 Name: gstreamer-plugins
-Version: 0.8.8
+Version: 0.8.12
 %define majmin 0.8
 %define po_package gst-plugins-%{majmin}
-Release: 9 
+Release: 1
 License: LGPL
 Group: Applications/Multimedia
 Source: gst-plugins-%{version}.patched.tar.bz2
@@ -317,6 +317,9 @@
 %{_libdir}/*so
 
 %changelog
+* Tue Feb 14 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-1
+- Updated to upstream version
+
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and
   add arjan's patch for fixing the execshield bug


Index: removed-sources.txt
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/removed-sources.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- removed-sources.txt	24 Mar 2005 15:52:03 -0000	1.22
+++ removed-sources.txt	14 Feb 2006 22:58:35 -0000	1.23
@@ -1,138 +1,138 @@
---- origfiles.txt	2005-03-24 10:28:35.000000000 -0500
-+++ newfiles.txt	2005-03-24 10:29:22.000000000 -0500
-@@ -315,12 +315,6 @@
- gst-plugins-0.8.8/ext/ladspa/Makefile.in
- gst-plugins-0.8.8/ext/ladspa/search.c
- gst-plugins-0.8.8/ext/ladspa/utils.h
--gst-plugins-0.8.8/ext/lame/
--gst-plugins-0.8.8/ext/lame/gstlame.c
--gst-plugins-0.8.8/ext/lame/gstlame.h
--gst-plugins-0.8.8/ext/lame/Makefile.am
--gst-plugins-0.8.8/ext/lame/Makefile.in
--gst-plugins-0.8.8/ext/lame/README
- gst-plugins-0.8.8/ext/lcs/
- gst-plugins-0.8.8/ext/lcs/gstcolorspace.c
- gst-plugins-0.8.8/ext/lcs/Makefile.am
-@@ -361,13 +355,6 @@
- gst-plugins-0.8.8/ext/libvisual/Makefile.am
- gst-plugins-0.8.8/ext/libvisual/Makefile.in
- gst-plugins-0.8.8/ext/libvisual/visual.c
--gst-plugins-0.8.8/ext/mad/
--gst-plugins-0.8.8/ext/mad/gstid3demuxbin.c
--gst-plugins-0.8.8/ext/mad/gstid3tag.c
--gst-plugins-0.8.8/ext/mad/gstmad.c
--gst-plugins-0.8.8/ext/mad/gstmad.h
--gst-plugins-0.8.8/ext/mad/Makefile.am
--gst-plugins-0.8.8/ext/mad/Makefile.in
- gst-plugins-0.8.8/ext/Makefile.am
- gst-plugins-0.8.8/ext/Makefile.in
- gst-plugins-0.8.8/ext/mikmod/
-@@ -378,35 +365,6 @@
- gst-plugins-0.8.8/ext/mikmod/Makefile.in
- gst-plugins-0.8.8/ext/mikmod/mikmod_reader.c
- gst-plugins-0.8.8/ext/mikmod/README
--gst-plugins-0.8.8/ext/mpeg2dec/
--gst-plugins-0.8.8/ext/mpeg2dec/gstmpeg2dec.c
--gst-plugins-0.8.8/ext/mpeg2dec/gstmpeg2dec.h
--gst-plugins-0.8.8/ext/mpeg2dec/Makefile.am
--gst-plugins-0.8.8/ext/mpeg2dec/Makefile.in
--gst-plugins-0.8.8/ext/mpeg2enc/
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2enc.cc
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2enc.hh
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encoder.cc
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encoder.hh
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encoptions.cc
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encoptions.hh
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encpicturereader.cc
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encpicturereader.hh
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encstreamwriter.cc
--gst-plugins-0.8.8/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
--gst-plugins-0.8.8/ext/mpeg2enc/Makefile.am
--gst-plugins-0.8.8/ext/mpeg2enc/Makefile.in
--gst-plugins-0.8.8/ext/mplex/
--gst-plugins-0.8.8/ext/mplex/gstmplex.cc
--gst-plugins-0.8.8/ext/mplex/gstmplex.hh
--gst-plugins-0.8.8/ext/mplex/gstmplexibitstream.cc
--gst-plugins-0.8.8/ext/mplex/gstmplexibitstream.hh
--gst-plugins-0.8.8/ext/mplex/gstmplexjob.cc
--gst-plugins-0.8.8/ext/mplex/gstmplexjob.hh
--gst-plugins-0.8.8/ext/mplex/gstmplexoutputstream.cc
--gst-plugins-0.8.8/ext/mplex/gstmplexoutputstream.hh
--gst-plugins-0.8.8/ext/mplex/Makefile.am
--gst-plugins-0.8.8/ext/mplex/Makefile.in
- gst-plugins-0.8.8/ext/musepack/
- gst-plugins-0.8.8/ext/musepack/gstmusepackdec.c
- gst-plugins-0.8.8/ext/musepack/gstmusepackdec.h
-@@ -1027,72 +985,6 @@
- gst-plugins-0.8.8/gst/monoscope/monoscope.c
- gst-plugins-0.8.8/gst/monoscope/monoscope.h
- gst-plugins-0.8.8/gst/monoscope/README
--gst-plugins-0.8.8/gst/mpeg1sys/
--gst-plugins-0.8.8/gst/mpeg1sys/buffer.c
--gst-plugins-0.8.8/gst/mpeg1sys/buffer.h
--gst-plugins-0.8.8/gst/mpeg1sys/gstmpeg1systemencode.c
--gst-plugins-0.8.8/gst/mpeg1sys/gstmpeg1systemencode.h
--gst-plugins-0.8.8/gst/mpeg1sys/main.h
--gst-plugins-0.8.8/gst/mpeg1sys/Makefile.am
--gst-plugins-0.8.8/gst/mpeg1sys/Makefile.in
--gst-plugins-0.8.8/gst/mpeg1sys/systems.c
--gst-plugins-0.8.8/gst/mpeg1videoparse/
--gst-plugins-0.8.8/gst/mpeg1videoparse/gstmp1videoparse.c
--gst-plugins-0.8.8/gst/mpeg1videoparse/gstmp1videoparse.h
--gst-plugins-0.8.8/gst/mpeg1videoparse/Makefile.am
--gst-plugins-0.8.8/gst/mpeg1videoparse/Makefile.in
--gst-plugins-0.8.8/gst/mpeg2sub/
--gst-plugins-0.8.8/gst/mpeg2sub/gstmpeg2subt.c
--gst-plugins-0.8.8/gst/mpeg2sub/gstmpeg2subt.h
--gst-plugins-0.8.8/gst/mpeg2sub/Makefile.am
--gst-plugins-0.8.8/gst/mpeg2sub/Makefile.in
--gst-plugins-0.8.8/gst/mpeg2sub/Notes.txt
--gst-plugins-0.8.8/gst/mpegaudio/
--gst-plugins-0.8.8/gst/mpegaudio/common.c
--gst-plugins-0.8.8/gst/mpegaudio/common.h
--gst-plugins-0.8.8/gst/mpegaudio/encode.c
--gst-plugins-0.8.8/gst/mpegaudio/encoder.h
--gst-plugins-0.8.8/gst/mpegaudio/gstmpegaudio.c
--gst-plugins-0.8.8/gst/mpegaudio/gstmpegaudio.h
--gst-plugins-0.8.8/gst/mpegaudio/Makefile.am
--gst-plugins-0.8.8/gst/mpegaudio/Makefile.in
--gst-plugins-0.8.8/gst/mpegaudio/musicin.c
--gst-plugins-0.8.8/gst/mpegaudio/musicin.h
--gst-plugins-0.8.8/gst/mpegaudioparse/
--gst-plugins-0.8.8/gst/mpegaudioparse/gstmpegaudioparse.c
--gst-plugins-0.8.8/gst/mpegaudioparse/gstmpegaudioparse.h
--gst-plugins-0.8.8/gst/mpegaudioparse/Makefile.am
--gst-plugins-0.8.8/gst/mpegaudioparse/Makefile.in
--gst-plugins-0.8.8/gst/mpegaudio/psy.c
--gst-plugins-0.8.8/gst/mpegaudio/putbits.c
--gst-plugins-0.8.8/gst/mpegaudio/putbits.h
--gst-plugins-0.8.8/gst/mpegaudio/README.crh
--gst-plugins-0.8.8/gst/mpegaudio/subs.c
--gst-plugins-0.8.8/gst/mpegaudio/table_absthr.h
--gst-plugins-0.8.8/gst/mpegaudio/table_alloc.h
--gst-plugins-0.8.8/gst/mpegaudio/table_cb.h
--gst-plugins-0.8.8/gst/mpegaudio/table_enwindow.h
--gst-plugins-0.8.8/gst/mpegaudio/tables.c
--gst-plugins-0.8.8/gst/mpegaudio/table_th.h
--gst-plugins-0.8.8/gst/mpegaudio/tonal.c
--gst-plugins-0.8.8/gst/mpegstream/
--gst-plugins-0.8.8/gst/mpegstream/gstdvddemux.c
--gst-plugins-0.8.8/gst/mpegstream/gstdvddemux.h
--gst-plugins-0.8.8/gst/mpegstream/gstmpegclock.c
--gst-plugins-0.8.8/gst/mpegstream/gstmpegclock.h
--gst-plugins-0.8.8/gst/mpegstream/gstmpegdemux.c
--gst-plugins-0.8.8/gst/mpegstream/gstmpegdemux.h
--gst-plugins-0.8.8/gst/mpegstream/gstmpegpacketize.c
--gst-plugins-0.8.8/gst/mpegstream/gstmpegpacketize.h
--gst-plugins-0.8.8/gst/mpegstream/gstmpegparse.c
--gst-plugins-0.8.8/gst/mpegstream/gstmpegparse.h
--gst-plugins-0.8.8/gst/mpegstream/gstmpegstream.c
--gst-plugins-0.8.8/gst/mpegstream/gstrfc2250enc.c
--gst-plugins-0.8.8/gst/mpegstream/gstrfc2250enc.h
--gst-plugins-0.8.8/gst/mpegstream/Makefile.am
--gst-plugins-0.8.8/gst/mpegstream/Makefile.in
--gst-plugins-0.8.8/gst/mpegstream/notes
--gst-plugins-0.8.8/gst/mpegstream/README
- gst-plugins-0.8.8/gst/multifilesink/
- gst-plugins-0.8.8/gst/multifilesink/gstmultifilesink.c
- gst-plugins-0.8.8/gst/multifilesink/gstmultifilesink.h
+--- origfiles.txt	2006-02-14 16:40:02.000000000 -0500
++++ newfiles.txt	2006-02-14 16:40:14.000000000 -0500
+@@ -325,12 +325,6 @@
+ gst-plugins-0.8.12/ext/ladspa/Makefile.in
+ gst-plugins-0.8.12/ext/ladspa/search.c
+ gst-plugins-0.8.12/ext/ladspa/utils.h
+-gst-plugins-0.8.12/ext/lame/
+-gst-plugins-0.8.12/ext/lame/gstlame.c
+-gst-plugins-0.8.12/ext/lame/gstlame.h
+-gst-plugins-0.8.12/ext/lame/Makefile.am
+-gst-plugins-0.8.12/ext/lame/Makefile.in
+-gst-plugins-0.8.12/ext/lame/README
+ gst-plugins-0.8.12/ext/lcs/
+ gst-plugins-0.8.12/ext/lcs/gstcolorspace.c
+ gst-plugins-0.8.12/ext/lcs/Makefile.am
+@@ -372,13 +366,6 @@
+ gst-plugins-0.8.12/ext/libvisual/Makefile.am
+ gst-plugins-0.8.12/ext/libvisual/Makefile.in
+ gst-plugins-0.8.12/ext/libvisual/visual.c
+-gst-plugins-0.8.12/ext/mad/
+-gst-plugins-0.8.12/ext/mad/gstid3demuxbin.c
+-gst-plugins-0.8.12/ext/mad/gstid3tag.c
+-gst-plugins-0.8.12/ext/mad/gstmad.c
+-gst-plugins-0.8.12/ext/mad/gstmad.h
+-gst-plugins-0.8.12/ext/mad/Makefile.am
+-gst-plugins-0.8.12/ext/mad/Makefile.in
+ gst-plugins-0.8.12/ext/Makefile.am
+ gst-plugins-0.8.12/ext/Makefile.in
+ gst-plugins-0.8.12/ext/mikmod/
+@@ -389,35 +376,6 @@
+ gst-plugins-0.8.12/ext/mikmod/Makefile.in
+ gst-plugins-0.8.12/ext/mikmod/mikmod_reader.c
+ gst-plugins-0.8.12/ext/mikmod/README
+-gst-plugins-0.8.12/ext/mpeg2dec/
+-gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.c
+-gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.h
+-gst-plugins-0.8.12/ext/mpeg2dec/Makefile.am
+-gst-plugins-0.8.12/ext/mpeg2dec/Makefile.in
+-gst-plugins-0.8.12/ext/mpeg2enc/
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.cc
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.hh
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.cc
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.hh
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.cc
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.hh
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.hh
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.cc
+-gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.hh
+-gst-plugins-0.8.12/ext/mpeg2enc/Makefile.am
+-gst-plugins-0.8.12/ext/mpeg2enc/Makefile.in
+-gst-plugins-0.8.12/ext/mplex/
+-gst-plugins-0.8.12/ext/mplex/gstmplex.cc
+-gst-plugins-0.8.12/ext/mplex/gstmplex.hh
+-gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.cc
+-gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.hh
+-gst-plugins-0.8.12/ext/mplex/gstmplexjob.cc
+-gst-plugins-0.8.12/ext/mplex/gstmplexjob.hh
+-gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.cc
+-gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.hh
+-gst-plugins-0.8.12/ext/mplex/Makefile.am
+-gst-plugins-0.8.12/ext/mplex/Makefile.in
+ gst-plugins-0.8.12/ext/musepack/
+ gst-plugins-0.8.12/ext/musepack/gstmusepackdec.c
+ gst-plugins-0.8.12/ext/musepack/gstmusepackdec.h
+@@ -1097,72 +1055,6 @@
+ gst-plugins-0.8.12/gst/monoscope/monoscope.c
+ gst-plugins-0.8.12/gst/monoscope/monoscope.h
+ gst-plugins-0.8.12/gst/monoscope/README
+-gst-plugins-0.8.12/gst/mpeg1sys/
+-gst-plugins-0.8.12/gst/mpeg1sys/buffer.c
+-gst-plugins-0.8.12/gst/mpeg1sys/buffer.h
+-gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.c
+-gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.h
+-gst-plugins-0.8.12/gst/mpeg1sys/main.h
+-gst-plugins-0.8.12/gst/mpeg1sys/Makefile.am
+-gst-plugins-0.8.12/gst/mpeg1sys/Makefile.in
+-gst-plugins-0.8.12/gst/mpeg1sys/systems.c
+-gst-plugins-0.8.12/gst/mpeg1videoparse/
+-gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.c
+-gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.h
+-gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.am
+-gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.in
+-gst-plugins-0.8.12/gst/mpeg2sub/
+-gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.c
+-gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.h
+-gst-plugins-0.8.12/gst/mpeg2sub/Makefile.am
+-gst-plugins-0.8.12/gst/mpeg2sub/Makefile.in
+-gst-plugins-0.8.12/gst/mpeg2sub/Notes.txt
+-gst-plugins-0.8.12/gst/mpegaudio/
+-gst-plugins-0.8.12/gst/mpegaudio/common.c
+-gst-plugins-0.8.12/gst/mpegaudio/common.h
+-gst-plugins-0.8.12/gst/mpegaudio/encode.c
+-gst-plugins-0.8.12/gst/mpegaudio/encoder.h
+-gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.c
+-gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.h
+-gst-plugins-0.8.12/gst/mpegaudio/Makefile.am
+-gst-plugins-0.8.12/gst/mpegaudio/Makefile.in
+-gst-plugins-0.8.12/gst/mpegaudio/musicin.c
+-gst-plugins-0.8.12/gst/mpegaudio/musicin.h
+-gst-plugins-0.8.12/gst/mpegaudioparse/
+-gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.c
+-gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.h
+-gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.am
+-gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.in
+-gst-plugins-0.8.12/gst/mpegaudio/psy.c
+-gst-plugins-0.8.12/gst/mpegaudio/putbits.c
+-gst-plugins-0.8.12/gst/mpegaudio/putbits.h
+-gst-plugins-0.8.12/gst/mpegaudio/README.crh
+-gst-plugins-0.8.12/gst/mpegaudio/subs.c
+-gst-plugins-0.8.12/gst/mpegaudio/table_absthr.h
+-gst-plugins-0.8.12/gst/mpegaudio/table_alloc.h
+-gst-plugins-0.8.12/gst/mpegaudio/table_cb.h
+-gst-plugins-0.8.12/gst/mpegaudio/table_enwindow.h
+-gst-plugins-0.8.12/gst/mpegaudio/tables.c
+-gst-plugins-0.8.12/gst/mpegaudio/table_th.h
+-gst-plugins-0.8.12/gst/mpegaudio/tonal.c
+-gst-plugins-0.8.12/gst/mpegstream/
+-gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.c
+-gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.h
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.c
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.h
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.c
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.h
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.c
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.h
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.c
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.h
+-gst-plugins-0.8.12/gst/mpegstream/gstmpegstream.c
+-gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.c
+-gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.h
+-gst-plugins-0.8.12/gst/mpegstream/Makefile.am
+-gst-plugins-0.8.12/gst/mpegstream/Makefile.in
+-gst-plugins-0.8.12/gst/mpegstream/notes
+-gst-plugins-0.8.12/gst/mpegstream/README
+ gst-plugins-0.8.12/gst/multifilesink/
+ gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.c
+ gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.h


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	24 Mar 2005 15:52:03 -0000	1.24
+++ sources	14 Feb 2006 22:58:35 -0000	1.25
@@ -1,2 +1,2 @@
 1b99f623169cf62b70f3de081a633d14  Hermes-1.3.3.tar.bz2
-d19833cf25cef0d18a60fe57e89ebb49  gst-plugins-0.8.8.patched.tar.bz2
+24f2f6b220cfc7afaa08a1d4fafeda62  gst-plugins-0.8.12.patched.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 23:18:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 18:18:01 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.93, 1.94 mkinitrd.spec, 1.104,
	1.105 sources, 1.100, 1.101
Message-ID: <200602142318.k1ENI1UU031570@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31448

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.25-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- .cvsignore	14 Feb 2006 00:49:50 -0000	1.93
+++ .cvsignore	14 Feb 2006 23:17:58 -0000	1.94
@@ -1 +1 @@
-mkinitrd-5.0.24.tar.bz2
+mkinitrd-5.0.25.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mkinitrd.spec	14 Feb 2006 14:19:18 -0000	1.104
+++ mkinitrd.spec	14 Feb 2006 23:17:58 -0000	1.105
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.24
+Version: 5.0.25
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,9 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Tue Feb 14 2006 Peter Jones <pjones at redhat.com> - 5.0.25-1
+- rework hotplug control fds (#181515)
+
 * Tue Feb 14 2006 Peter Jones <pjones at redhat.com> - 5.0.24-1
 - use the right nash-dm command to get the device list
 - check if a subdevice has the same partition table, not if it starts


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	14 Feb 2006 14:19:31 -0000	1.100
+++ sources	14 Feb 2006 23:17:58 -0000	1.101
@@ -1 +1 @@
-5d504265c30e290f089e2377c3358ae9  mkinitrd-5.0.24.tar.bz2
+f2596fde549856470459b2ebd6964b94  mkinitrd-5.0.25.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 14 23:32:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 18:32:04 -0500
Subject: rpms/kernel/devel .cvsignore, 1.350, 1.351 kernel-2.6.spec, 1.1948,
	1.1949 sources, 1.292, 1.293 upstream, 1.267,
	1.268 linux-2.6-cpufreq-git.patch, 1.1,
	NONE linux-2.6-disable-broken-radeon-drm.patch, 1.1,
	NONE linux-2.6-missing-license.patch, 1.1,
	NONE linux-2.6-net-bluetooth-oops.patch, 1.1,
	NONE linux-2.6-net-ratelimit.patch, 1.1, NONE
Message-ID: <200602142332.k1ENW4pK004345@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Removed Files:
	linux-2.6-cpufreq-git.patch 
	linux-2.6-disable-broken-radeon-drm.patch 
	linux-2.6-missing-license.patch 
	linux-2.6-net-bluetooth-oops.patch 
	linux-2.6-net-ratelimit.patch 
Log Message:
git3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- .cvsignore	13 Feb 2006 21:17:47 -0000	1.350
+++ .cvsignore	14 Feb 2006 23:31:51 -0000	1.351
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git1.bz2
+patch-2.6.16-rc3-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1948
retrieving revision 1.1949
diff -u -r1.1948 -r1.1949
--- kernel-2.6.spec	14 Feb 2006 01:57:32 -0000	1.1948
+++ kernel-2.6.spec	14 Feb 2006 23:31:51 -0000	1.1949
@@ -216,8 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git1.bz2
-Patch3: linux-2.6-cpufreq-git.patch
+Patch2: patch-2.6.16-rc3-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -371,10 +370,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-disable-broken-radeon-drm.patch
-Patch1870: linux-2.6-missing-license.patch
-Patch1880: linux-2.6-net-bluetooth-oops.patch
-Patch1881: linux-2.6-net-ratelimit.patch
 Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -694,7 +689,6 @@
 # Update to latest upstream.
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -950,14 +944,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Disable broken radeon DRM for now
-%patch1860 -p1
-# Missing license tag in p8023
-%patch1870 -p1
-# Fix oops in bluetooth
-%patch1880 -p1
-# Ratelimit some networking messages
-%patch1881 -p1
 # Only print migration info on SMP
 %patch1890 -p1
 
@@ -1591,6 +1577,9 @@
 %endif
 
 %changelog
+* Mon Feb 13 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc3-git2 & -git3
+
 * Mon Feb 13 2006 Rik van Riel <riel at redhat.com>
 - go with the SMP workaround from Hubertus
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- sources	13 Feb 2006 21:17:47 -0000	1.292
+++ sources	14 Feb 2006 23:31:53 -0000	1.293
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-3d429736212d795ad28806945066d697  patch-2.6.16-rc3-git1.bz2
+8be664aa41987bb0323b47e828856362  patch-2.6.16-rc3-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- upstream	13 Feb 2006 21:17:47 -0000	1.267
+++ upstream	14 Feb 2006 23:31:59 -0000	1.268
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git1.bz2
+patch-2.6.16-rc3-git3.bz2


--- linux-2.6-cpufreq-git.patch DELETED ---


--- linux-2.6-disable-broken-radeon-drm.patch DELETED ---


--- linux-2.6-missing-license.patch DELETED ---


--- linux-2.6-net-bluetooth-oops.patch DELETED ---


--- linux-2.6-net-ratelimit.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 14 23:32:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 18:32:04 -0500
Subject: rpms/kernel/devel/configs config-powerpc-generic,1.15,1.16
Message-ID: <200602142332.k1ENW4JC004355@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-powerpc-generic 
Log Message:
git3



Index: config-powerpc-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- config-powerpc-generic	9 Feb 2006 21:45:33 -0000	1.15
+++ config-powerpc-generic	14 Feb 2006 23:32:01 -0000	1.16
@@ -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



From fedora-cvs-commits at redhat.com  Tue Feb 14 23:33:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 18:33:39 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git3.bz2.sign, NONE,
	1.1 patch-2.6.16-rc3-git1.bz2.sign, 1.1, NONE
Message-ID: <200602142333.k1ENXdtA004716@cvs.devel.redhat.com>

Author: davej

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

Added Files:
	patch-2.6.16-rc3-git3.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git1.bz2.sign 
Log Message:
signs



--- NEW FILE patch-2.6.16-rc3-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD8ingyGugalF9Dw4RAtylAJ4h/wQ2b1kMqUKXcjfa6oPPaIllbACdHQWf
5QopZoqns0sgkeZW5ijrTSY=
=up8s
-----END PGP SIGNATURE-----


--- patch-2.6.16-rc3-git1.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 00:01:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 19:01:59 -0500
Subject: rpms/kernel/devel/configs config-generic,1.150,1.151
Message-ID: <200602150001.k1F01x4U028000@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	config-generic 
Log Message:
disable MSI for now



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- config-generic	13 Feb 2006 00:33:51 -0000	1.150
+++ config-generic	15 Feb 2006 00:01:54 -0000	1.151
@@ -58,7 +58,7 @@
 #
 CONFIG_PCI=y
 # CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_MSI=y
+# CONFIG_PCI_MSI is not set
 CONFIG_PCI_LEGACY_PROC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m



From fedora-cvs-commits at redhat.com  Wed Feb 15 00:01:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 19:01:56 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1949,1.1950
Message-ID: <200602150001.k1F01u2j027979@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Log Message:
disable MSI for now



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1949
retrieving revision 1.1950
diff -u -r1.1949 -r1.1950
--- kernel-2.6.spec	14 Feb 2006 23:31:51 -0000	1.1949
+++ kernel-2.6.spec	15 Feb 2006 00:01:33 -0000	1.1950
@@ -1579,6 +1579,7 @@
 %changelog
 * Mon Feb 13 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git2 & -git3
+- Disable PCI message signalled interrupts.
 
 * Mon Feb 13 2006 Rik van Riel <riel at redhat.com>
 - go with the SMP workaround from Hubertus



From fedora-cvs-commits at redhat.com  Wed Feb 15 00:52:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 19:52:16 -0500
Subject: rpms/kernel/devel Makefile.config,1.33,1.34
Message-ID: <200602150052.k1F0qGQ8025330@cvs.devel.redhat.com>

Author: davej

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

Modified Files:
	Makefile.config 
Log Message:
remove stale configs before regenerating



Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Makefile.config	10 Feb 2006 04:58:14 -0000	1.33
+++ Makefile.config	15 Feb 2006 00:52:14 -0000	1.34
@@ -20,6 +20,7 @@
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
+	@rm -f kernel-*-config
 	@rm -f $(TEMPFILES)
 	@rm -f temp-xen-generic temp-x86-xen-generic temp-x86_64-xen-generic \
 		temp-generic temp-x86_64-xen-generic-tmp



From fedora-cvs-commits at redhat.com  Wed Feb 15 01:25:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 20:25:02 -0500
Subject: rpms/gcc/devel gcc41-pr26209.patch,1.1,1.2 gcc41.spec,1.35,1.36
Message-ID: <200602150125.k1F1P2at024046@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23925

Modified Files:
	gcc41-pr26209.patch gcc41.spec 
Log Message:
* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.0-0.27
- merge fix by Zdenek Dvorak for regression introduced by patch for PR
  tree-optimization/26209


gcc41-pr26209.patch:
 Makefile.in       |    2 +-
 tree-cfg.c        |    5 +----
 tree-cfgcleanup.c |   41 +++++++++++++++++++++++++----------------
 tree-ssa-loop.c   |    3 ++-
 4 files changed, 29 insertions(+), 22 deletions(-)

Index: gcc41-pr26209.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr26209.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr26209.patch	14 Feb 2006 17:04:24 -0000	1.1
+++ gcc41-pr26209.patch	15 Feb 2006 01:24:58 -0000	1.2
@@ -1,3 +1,9 @@
+2006-02-14  Zdenek Dvorak <dvorakz at suse.cz>
+
+	* tree-cfgcleanup.c: Include tree-scalar-evolution.h.
+	(cleanup_tree_cfg_loop): Call scev_reset.
+	* Makefile.in (tree-cfgcleanup.o): Add SCEV_H dependency.
+
 2006-02-13  Zdenek Dvorak  <dvorakz at suse.cz>
 
 	PR tree-optimization/26209
@@ -6,9 +12,11 @@
 	eh edges.
 	* tree-cfg.c (replace_uses_by): Do not alter cfg.
 
---- gcc/tree-cfg.c.jj	2006-02-02 16:39:45.000000000 +0100
-+++ gcc/tree-cfg.c	2006-02-14 16:14:08.000000000 +0100
-@@ -1324,10 +1324,7 @@ replace_uses_by (tree name, tree val)
+Index: gcc/tree-cfg.c
+===================================================================
+--- gcc/tree-cfg.c.orig	2006-02-10 11:21:52.000000000 -0200
++++ gcc/tree-cfg.c	2006-02-14 22:51:45.000000000 -0200
+@@ -1326,10 +1326,7 @@ replace_uses_by (tree name, tree val)
        if (TREE_CODE (rhs) == ADDR_EXPR)
  	recompute_tree_invarant_for_addr_expr (rhs);
  
@@ -20,8 +28,10 @@
        mark_new_vars_to_rename (stmt);
      }
  
---- gcc/tree-ssa-loop.c.jj	2006-02-02 16:39:51.000000000 +0100
-+++ gcc/tree-ssa-loop.c	2006-02-14 16:14:02.000000000 +0100
+Index: gcc/tree-ssa-loop.c
+===================================================================
+--- gcc/tree-ssa-loop.c.orig	2005-10-28 19:06:47.000000000 -0200
++++ gcc/tree-ssa-loop.c	2006-02-14 22:51:45.000000000 -0200
 @@ -303,7 +303,8 @@ struct tree_opt_pass pass_scev_cprop =
    0,					/* properties_provided */
    0,					/* properties_destroyed */
@@ -32,9 +42,19 @@
  					/* todo_flags_finish */
    0					/* letter */
  };
---- gcc/tree-cfgcleanup.c.jj	2006-02-02 16:39:41.000000000 +0100
-+++ gcc/tree-cfgcleanup.c	2006-02-14 16:14:05.000000000 +0100
-@@ -157,19 +157,24 @@ cleanup_control_flow (void)
+Index: gcc/tree-cfgcleanup.c
+===================================================================
+--- gcc/tree-cfgcleanup.c.orig	2005-10-28 19:06:47.000000000 -0200
++++ gcc/tree-cfgcleanup.c	2006-02-14 23:18:28.000000000 -0200
+@@ -45,6 +45,7 @@ Boston, MA 02110-1301, USA.  */
+ #include "cfglayout.h"
+ #include "hashtab.h"
+ #include "tree-ssa-propagate.h"
++#include "tree-scalar-evolution.h"
+ 
+ /* Remove any fallthru edge from EV.  Return true if an edge was removed.  */
+ 
+@@ -157,19 +158,24 @@ cleanup_control_flow (void)
      {
        bsi = bsi_last (bb);
  
@@ -63,7 +83,7 @@
  	{
  	  edge e;
  	  tree label;
-@@ -213,7 +218,7 @@ cleanup_control_flow (void)
+@@ -213,7 +219,7 @@ cleanup_control_flow (void)
  
        /* Check for indirect calls that have been turned into
  	 noreturn calls.  */
@@ -72,3 +92,54 @@
  	{
  	  free_dominance_info (CDI_DOMINATORS);
  	  retval = true;
+@@ -559,23 +565,26 @@ cleanup_tree_cfg (void)
+ void
+ cleanup_tree_cfg_loop (void)
+ {
+-  bitmap changed_bbs = BITMAP_ALLOC (NULL);
+-
+-  cleanup_tree_cfg ();
++  bool changed = cleanup_tree_cfg ();
+ 
+-  fix_loop_structure (current_loops, changed_bbs);
+-  calculate_dominance_info (CDI_DOMINATORS);
++  if (changed)
++    {
++      bitmap changed_bbs = BITMAP_ALLOC (NULL);
++      fix_loop_structure (current_loops, changed_bbs);
++      calculate_dominance_info (CDI_DOMINATORS);
+ 
+-  /* This usually does nothing.  But sometimes parts of cfg that originally
+-     were inside a loop get out of it due to edge removal (since they
+-     become unreachable by back edges from latch).  */
+-  rewrite_into_loop_closed_ssa (changed_bbs, TODO_update_ssa);
++      /* This usually does nothing.  But sometimes parts of cfg that originally
++	 were inside a loop get out of it due to edge removal (since they
++	 become unreachable by back edges from latch).  */
++      rewrite_into_loop_closed_ssa (changed_bbs, TODO_update_ssa);
+ 
+-  BITMAP_FREE (changed_bbs);
++      BITMAP_FREE (changed_bbs);
+ 
+ #ifdef ENABLE_CHECKING
+-  verify_loop_structure (current_loops);
++      verify_loop_structure (current_loops);
+ #endif
++      scev_reset ();
++    }
+ }
+ 
+ /* Merge the PHI nodes at BB into those at BB's sole successor.  */
+Index: gcc/Makefile.in
+===================================================================
+--- gcc/Makefile.in.orig	2006-02-14 23:17:50.000000000 -0200
++++ gcc/Makefile.in	2006-02-14 23:18:28.000000000 -0200
+@@ -1847,7 +1847,7 @@ tree-cfgcleanup.o : tree-cfgcleanup.c $(
+    $(DIAGNOSTIC_H) errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
+    $(TREE_DUMP_H) except.h langhooks.h $(CFGLOOP_H) tree-pass.h \
+    $(CFGLAYOUT_H) $(BASIC_BLOCK_H) hard-reg-set.h $(HASHTAB_H) toplev.h \
+-   tree-ssa-propagate.h
++   tree-ssa-propagate.h $(SCEV_H)
+ tree-tailcall.o : tree-tailcall.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
+    $(RTL_H) $(TREE_H) $(TM_P_H) function.h $(TM_H) coretypes.h \
+    $(TREE_DUMP_H) $(DIAGNOSTIC_H) except.h tree-pass.h $(FLAGS_H) langhooks.h \


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gcc41.spec	14 Feb 2006 17:04:24 -0000	1.35
+++ gcc41.spec	15 Feb 2006 01:24:58 -0000	1.36
@@ -1,6 +1,6 @@
 %define DATE 20060214
 %define gcc_version 4.1.0
-%define gcc_release 0.26
+%define gcc_release 0.27
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -1432,6 +1432,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.0-0.27
+- merge fix by Zdenek Dvorak for regression introduced by patch for PR
+  tree-optimization/26209
+
 * Tue Feb 14 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.26
 - update from gcc-4_1-branch (-r110903:110978)
   - PRs fortran/20861, fortran/20871, fortran/25059, fortran/25070,



From fedora-cvs-commits at redhat.com  Wed Feb 15 04:13:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 14 Feb 2006 23:13:56 -0500
Subject: rpms/evolution-data-server/devel .cvsignore, 1.38,
	1.39 evolution-data-server.spec, 1.84, 1.85 sources, 1.38, 1.39
Message-ID: <200602150413.k1F4DuEK006853@cvs.devel.redhat.com>

Author: dmalcolm

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

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
1.5.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	30 Jan 2006 23:36:19 -0000	1.38
+++ .cvsignore	15 Feb 2006 04:13:53 -0000	1.39
@@ -1 +1 @@
-evolution-data-server-1.5.90.tar.bz2
+evolution-data-server-1.5.91.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- evolution-data-server.spec	11 Feb 2006 02:41:23 -0000	1.84
+++ evolution-data-server.spec	15 Feb 2006 04:13:53 -0000	1.85
@@ -24,8 +24,8 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.5.90
-Release: 2.2
+Version: 1.5.91
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.91-1
+- 1.5.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5.90-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	30 Jan 2006 23:36:19 -0000	1.38
+++ sources	15 Feb 2006 04:13:53 -0000	1.39
@@ -1 +1 @@
-bdbf8608530d4f294b179b7c0de47d1b  evolution-data-server-1.5.90.tar.bz2
+3d0e82dbb888aabae05e160f4c502fb5  evolution-data-server-1.5.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:04:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:04:51 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.111,1.112
Message-ID: <200602150504.k1F54pQY010148@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
Build with --enable-mini-commander



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- gnome-applets.spec	12 Feb 2006 19:40:33 -0000	1.111
+++ gnome-applets.spec	15 Feb 2006 05:04:47 -0000	1.112
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.4
-Release:  	1
+Release:  	2
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -92,7 +92,10 @@
 autoconf
 
 %build
-%configure  --enable-suid=no --disable-scrollkeeper
+%configure			\  
+	--enable-suid=no 	\
+	--disable-scrollkeeper 	\
+	--enable-mini-commander
 make
 
 %install
@@ -172,6 +175,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-2
+- Build with --enable-mini-commander
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-1
 - Update to 2.13.4
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:12:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:12:15 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.112,1.113
Message-ID: <200602150512.k1F5CFxc011598@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-applets.spec 
Log Message:
Typo fix



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- gnome-applets.spec	15 Feb 2006 05:04:47 -0000	1.112
+++ gnome-applets.spec	15 Feb 2006 05:12:07 -0000	1.113
@@ -92,7 +92,7 @@
 autoconf
 
 %build
-%configure			\  
+%configure			\
 	--enable-suid=no 	\
 	--disable-scrollkeeper 	\
 	--enable-mini-commander



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:26:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:26:04 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch,
	NONE, 1.1 .cvsignore, 1.38, 1.39 gnome-panel.spec, 1.112,
	1.113 sources, 1.38, 1.39
Message-ID: <200602150526.k1F5Q4mi026374@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-panel.spec sources 
Added Files:
	gnome-panel-2.13.91-gpm-integration.patch 
Log Message:
2.13.91


gnome-panel-2.13.91-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   59 ++++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 727 insertions(+), 11 deletions(-)

--- NEW FILE gnome-panel-2.13.91-gpm-integration.patch ---
--- gnome-panel-2.13.91/gnome-panel/Makefile.am.gpm-integration	2006-02-12 14:07:03.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:21:03.000000000 -0500
@@ -116,6 +116,7 @@
 	panel-addto.c		\
 	panel-logout.c		\
 	panel-gdm.c		\
+	panel-power-manager.c   \
 	$(EGG_RECENT_FILES_C)	\
 	$(NULL)
 
@@ -164,6 +165,7 @@
 	panel-addto.h		\
 	panel-logout.h		\
 	panel-gdm.h		\
+	panel-power-manager.h	\
 	$(EGG_RECENT_FILES_H)	\
 	$(NULL)
 
--- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:21:03.000000000 -0500
@@ -32,6 +32,7 @@
 
 #include "panel-logout.h"
 #include "panel-gdm.h"
+#include "panel-power-manager.h"
 #include "panel-session.h"
 
 #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
@@ -49,6 +50,7 @@
 
 struct _PanelLogoutDialogPrivate {
 	PanelLogoutDialogType type;
+	PanelPowerManager *power_manager;
 
 	int                   timeout;
 	unsigned int          timeout_id;
@@ -60,7 +62,7 @@
 
 static void panel_logout_destroy (PanelLogoutDialog *logout_dialog,
 				  gpointer           data);
-static void panel_logout_response (GtkWidget *logout_dialog,
+static void panel_logout_response (PanelLogoutDialog *logout_dialog,
 				   guint      response_id,
 				   gpointer   data);
 
@@ -137,6 +139,8 @@
 	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
 	gtk_window_stick (GTK_WINDOW (logout_dialog));
 
+	logout_dialog->priv->power_manager = panel_get_power_manager ();
+
 	g_signal_connect (logout_dialog, "destroy",
 			  G_CALLBACK (panel_logout_destroy), NULL);
 	g_signal_connect (logout_dialog, "response",
@@ -151,15 +155,21 @@
 		g_source_remove (logout_dialog->priv->timeout_id);
 	logout_dialog->priv->timeout_id = 0;
 
+	g_object_unref (logout_dialog->priv->power_manager);
+	logout_dialog->priv->power_manager = NULL;
+
 	current_dialog = NULL;
 }
 
 static void
-panel_logout_response (GtkWidget *logout_dialog,
+panel_logout_response (PanelLogoutDialog *logout_dialog,
 		       guint      response_id,
 		       gpointer   data)
 {
-	gtk_widget_destroy (logout_dialog);
+	PanelPowerManager *power_manager;
+
+	power_manager = g_object_ref (logout_dialog->priv->power_manager);
+	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
 
 	switch (response_id) {
 	case GTK_RESPONSE_CANCEL:
@@ -180,11 +190,15 @@
 		panel_session_request_logout ();
 		break;
 	case PANEL_LOGOUT_RESPONSE_STD:
-		gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
-		panel_session_request_logout ();
+	        if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) 
+	          gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
+	        else if (panel_power_manager_can_sleep_and_power_down (power_manager))
+	          panel_power_manager_request_sleep_and_power_down (power_manager);
+
 		break;
 	case PANEL_LOGOUT_RESPONSE_STR:
-		//FIXME
+	        if (panel_power_manager_can_sleep (power_manager))
+	          panel_power_manager_request_sleep (power_manager);
 		break;
 	case GTK_RESPONSE_NONE:
 	case GTK_RESPONSE_DELETE_EVENT:
@@ -192,6 +206,7 @@
 	default:
 		g_assert_not_reached ();
 	}
+	g_object_unref (power_manager);
 }
 
 static gboolean
@@ -323,7 +338,8 @@
 		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
 		//FIXME see previous FIXME
 
-		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND))
+		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND) ||
+	            panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager))
 			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
 					       _("_Suspend"),
 					       PANEL_LOGOUT_RESPONSE_STD);
--- gnome-panel-2.13.91/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:24:35.000000000 -0500
@@ -47,10 +47,15 @@
 #include "panel-lockdown.h"
 #include "panel-logout.h"
 #include "panel-compatibility.h"
+#include "panel-power-manager.h"
 #include "panel-gdm.h"
 
 #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
 
+static gboolean panel_action_can_suspend (void);
+static gboolean panel_action_suspend_is_disabled (void);
+static void panel_action_suspend (GtkWidget *widget);
+
 enum {
 	PROP_0,
 	PROP_ACTION_TYPE,
@@ -77,6 +82,7 @@
 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
+	{ PANEL_ACTION_SUSPEND,        "suspend"       },
 	/* compatibility with GNOME < 2.13.90 */
 	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
 	{ 0,                           NULL             },
@@ -158,6 +164,13 @@
 			  gtk_get_current_event_time ());
 }
 
+static gboolean
+panel_action_shutdown_is_disabled (void)
+{
+  return panel_action_can_suspend () ||
+	 panel_lockdown_get_disable_log_out ();
+}
+
 static void
 panel_action_shutdown (GtkWidget *widget)
 {
@@ -173,6 +186,39 @@
 		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
 }
 
+static gboolean
+panel_action_can_suspend (void)
+{
+  PanelPowerManager *manager;
+  gboolean can_suspend;
+
+  manager = panel_get_power_manager ();
+
+  can_suspend = panel_power_manager_can_sleep (manager);
+
+  g_object_unref (manager);
+
+  return can_suspend;
+}
+
+static gboolean
+panel_action_suspend_is_disabled (void)
+{
+  return !panel_action_can_suspend ();
+}
+
+static void
+panel_action_suspend (GtkWidget *widget)
+{
+  PanelPowerManager *manager;
+
+  manager = panel_get_power_manager ();
+
+  panel_power_manager_request_sleep (manager);
+
+  g_object_unref (manager);
+}
+
 /* Run Application
  */
 static void
@@ -308,7 +354,17 @@
 		"gospanel-20",
 		"ACTION:logout:NEW",
 		panel_action_logout, NULL, NULL,
-		panel_lockdown_get_disable_log_out
+                panel_action_shutdown_is_disabled
+        },
+        {
+                PANEL_ACTION_SUSPEND,
+                "screensaver",
+                N_("Suspend"),
+                N_("Suspend the computer"),
+                "gospanel-20",
+                "ACTION:suspend:NEW",
+                panel_action_suspend, NULL, NULL,
+                panel_action_suspend_is_disabled
 	},
 	{
 		PANEL_ACTION_RUN,
@@ -861,6 +917,7 @@
 		actions [button->priv->type].invoke_menu (button, callback_name);
 }
 
+
 gboolean
 panel_action_button_load_from_drag (PanelToplevel *toplevel,
 				    int            position,
--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:21:03.000000000 -0500
@@ -0,0 +1,83 @@
+/* panel-power-manager.h - functions for powering down, restarting, and
+ *                         suspending the computer
+ *
+ * Copyright (C) 2006 Ray Strode <rstrode 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 PANEL_POWER_MANAGER_H
+#define PANEL_POWER_MANAGER_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ())
+#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager))
+#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
+#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER))
+#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER))
+#define PANEL_POWER_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
+#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ())
+typedef struct _PanelPowerManager PanelPowerManager;
+typedef struct _PanelPowerManagerClass PanelPowerManagerClass;
+typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate;
+typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest;
+typedef enum _PanelPowerManagerError PanelPowerManagerError;
+
+struct _PanelPowerManager
+{
+  GObject parent;
+
+  /*< private > */
+  PanelPowerManagerPrivate *priv;
+};
+
+struct _PanelPowerManagerClass
+{
+  GObjectClass parent_class;
+
+  /* signals */
+  void (* request_failed) (PanelPowerManager *manager, 
+	                   GError *error);
+};
+
+enum _PanelPowerManagerError
+{
+  PANEL_POWER_MANAGER_ERROR_SLEEPING = 0,
+  PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN
+};
+
+GType panel_power_manager_get_type (void);
+GQuark panel_power_manager_error_quark (void);
+
+PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC;
+
+gboolean panel_power_manager_can_sleep (PanelPowerManager *manager);
+gboolean panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager);
+gboolean panel_power_manager_can_power_down (PanelPowerManager *manager);
+gboolean panel_power_manager_can_restart (PanelPowerManager *manager);
+
+PanelPowerManagerRequest *panel_power_manager_request_sleep (PanelPowerManager *manager);
+PanelPowerManagerRequest *panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager);
+
+void panel_power_manager_cancel_request (PanelPowerManager *manager, 
+	                                 PanelPowerManagerRequest *request);
+
+
+PanelPowerManager *panel_get_power_manager (void);
+G_END_DECLS
+#endif /* PANEL_POWER_MANAGER_H */
--- gnome-panel-2.13.91/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:21:03.000000000 -0500
@@ -96,6 +96,7 @@
 	PANEL_ACTION_FORCE_QUIT,
 	PANEL_ACTION_CONNECT_SERVER,
         PANEL_ACTION_SHUTDOWN,
+	PANEL_ACTION_SUSPEND,
 	/* compatibility with GNOME < 2.13.90 */
         PANEL_ACTION_SCREENSHOT,
         PANEL_ACTION_LAST
--- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:21:03.000000000 -0500
@@ -49,6 +49,7 @@
 #include "panel-recent.h"
 #include "panel-stock-icons.h"
 #include "panel-util.h"
+#include "panel-power-manager.h"
 
 #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
 #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
@@ -1011,8 +1012,21 @@
 
 	menuitem->priv->append_lock_logout = append_lock_logout;
 	if (append_lock_logout)
-		panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
-					   menuitem);
+	  {
+	    PanelPowerManager *manager;
+
+	    panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
+	                               menuitem);
+
+	    manager = panel_get_power_manager ();
+
+	    g_signal_connect_swapped (manager, "notify::is-connected",
+	                              G_CALLBACK
+	                              (panel_desktop_menu_item_recreate_menu), 
+	                              menuitem);
+
+	        g_object_unref (manager);
+	  }
 
 	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
@@ -1118,6 +1132,14 @@
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 	}
 
+	item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND);
+	if (item != NULL) {
+		if (!separator_inserted)
+			add_menu_separator (menu);
+
+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	}
+
 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
 	if (item != NULL) {
 		if (!separator_inserted)
--- /dev/null	2004-06-24 14:04:38.000000000 -0400
+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:21:03.000000000 -0500
@@ -0,0 +1,533 @@
+/* panel-power-manager.c - functions for powering down, restarting, and
+ *                         suspending the computer
+ *
+ * Copyright (C) 2006 Ray Strode <rstrode 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.  
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif 
+
+#include "panel-power-manager.h"
+
+#include <errno.h>
+#include <string.h>
+
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gi18n.h>
+
+#include <dbus/dbus-glib.h>
+
+struct _PanelPowerManagerPrivate
+{
+  DBusGConnection *dbus_connection;
+  DBusGProxy      *bus_proxy;
+  DBusGProxy      *gpm_proxy;
+  guint32          is_connected : 1;
+};
+
+
+static void panel_power_manager_finalize (GObject *object);
+static void panel_power_manager_class_install_signals (PanelPowerManagerClass * manager_class);
+static void
+panel_power_manager_class_install_properties (PanelPowerManagerClass *
+					      manager_class);
+
+static void panel_power_manager_get_property (GObject * object,
+					      guint prop_id,
+					      GValue * value,
+					      GParamSpec * pspec);
+
+static gboolean panel_power_manager_ensure_gpm_connection (PanelPowerManager *manager,
+	                                                   GError      **error);
+enum
+{
+  PROP_0 = 0,
+  PROP_IS_CONNECTED
+};
+
+enum
+{
+  REQUEST_FAILED = 0,
+  NUMBER_OF_SIGNALS
+};
+
+static guint panel_power_manager_signals[NUMBER_OF_SIGNALS];
+
+G_DEFINE_TYPE (PanelPowerManager, panel_power_manager, G_TYPE_OBJECT);
+
+static void
+panel_power_manager_class_init (PanelPowerManagerClass * manager_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+
+  object_class->finalize = panel_power_manager_finalize;
+
+  panel_power_manager_class_install_properties (manager_class);
+  panel_power_manager_class_install_signals (manager_class);
+
+  g_type_class_add_private (manager_class, sizeof (PanelPowerManagerPrivate));
+}
+
+static void
+panel_power_manager_class_install_signals (PanelPowerManagerClass *
+					   manager_class)
+{
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+
+  panel_power_manager_signals[REQUEST_FAILED] =
+    g_signal_new ("request-failed", G_OBJECT_CLASS_TYPE (object_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (PanelPowerManagerClass, request_failed),
+		  NULL, NULL, g_cclosure_marshal_VOID__POINTER, 
+	          G_TYPE_NONE, 1, G_TYPE_POINTER);
+  manager_class->request_failed = NULL;
+}
+
+static void
+panel_power_manager_class_install_properties (PanelPowerManagerClass *
+					      manager_class)
+{
+  GObjectClass *object_class;
+  GParamSpec *param_spec;
+
+  object_class = G_OBJECT_CLASS (manager_class);
+  object_class->get_property = panel_power_manager_get_property;
+
+  param_spec = g_param_spec_boolean ("is-connected", _("Is connected"),
+	                             _("whether the the panel is connected "
+	                               "to the power manager"),
+	                             FALSE,
+	                             G_PARAM_READABLE);
+  g_object_class_install_property (object_class, PROP_IS_CONNECTED, param_spec);
+}
+
+static void
+panel_power_manager_on_name_owner_changed (DBusGProxy *bus_proxy,
+	                                   const char *name, 
+	                                   const char *prev_owner,
+	                                   const char *new_owner,
+	                                   PanelPowerManager *manager)
+{
+  gboolean is_online;
+
+  is_online = strcmp (new_owner, "") != 0;
+
+  if (strcmp (name, "org.gnome.PowerManager") != 0)
+    return;
+
+  if (manager->priv->gpm_proxy != NULL)
+    {
+      g_object_unref (manager->priv->gpm_proxy);
+      manager->priv->gpm_proxy = NULL;
+    }
+
+  panel_power_manager_ensure_gpm_connection (manager, NULL);
+}
+
+static gboolean
+panel_power_manager_ensure_gpm_connection (PanelPowerManager  *manager, 
+	                            GError            **error)
+{
+  GError *connection_error;
+  gboolean is_connected;
+
+  connection_error = NULL;
+  if (manager->priv->dbus_connection == NULL)
+    {
+      manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, 
+	                                               &connection_error);
+
+      if (manager->priv->dbus_connection == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+    }
+
+  g_assert (connection_error == NULL);
+
+  if (manager->priv->bus_proxy == NULL)
+    {
+      manager->priv->bus_proxy = 
+	  dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
+	                                   DBUS_SERVICE_DBUS,
+	                                   DBUS_PATH_DBUS,
+	                                   DBUS_INTERFACE_DBUS,
+	                                   &connection_error);
+
+      if (manager->priv->bus_proxy == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+
+      dbus_g_proxy_add_signal (manager->priv->bus_proxy, 
+	                       "NameOwnerChanged",
+	                       G_TYPE_STRING,
+	                       G_TYPE_STRING,
+	                       G_TYPE_STRING,
+	                       G_TYPE_INVALID);
+      dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
+	                           "NameOwnerChanged",
+	                           G_CALLBACK (panel_power_manager_on_name_owner_changed), 
+	                           manager, NULL);
+    }
+
+  g_assert (connection_error == NULL);
+
+  if (manager->priv->gpm_proxy == NULL)
+    {
+      manager->priv->gpm_proxy = 
+	  dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
+	                                   "org.gnome.PowerManager",
+	                                   "/org/gnome/PowerManager",
+	                                   "org.gnome.PowerManager",
+	                                   &connection_error);
+
+      if (manager->priv->gpm_proxy == NULL)
+	{
+	  g_propagate_error (error, connection_error);
+	  is_connected = FALSE;
+	  goto out;
+	}
+    }
+  is_connected = TRUE;
+
+out:
+  if (manager->priv->is_connected != is_connected)
+    {
+      manager->priv->is_connected = is_connected;
+      g_object_notify (G_OBJECT (manager), "is-connected"); 
+    }
+
+  if (!is_connected)
+    {
+      if (manager->priv->dbus_connection == NULL)
+	{
+	  if (manager->priv->bus_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->bus_proxy);
+	      manager->priv->bus_proxy = NULL;
+	    }
+
+	  if (manager->priv->gpm_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->gpm_proxy);
+	      manager->priv->gpm_proxy = NULL;
+	    }
+	}
+      else if (manager->priv->bus_proxy == NULL)
+	{
+	  if (manager->priv->gpm_proxy != NULL)
+	    {
+	      g_object_unref (manager->priv->gpm_proxy);
+	      manager->priv->gpm_proxy = NULL;
+	    }
+	}
+    }
+
+  return is_connected;
+}
+
+static void
+panel_power_manager_init (PanelPowerManager *manager)
+{
+  GError *error;
+
+  manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+					       PANEL_TYPE_POWER_MANAGER,
+					       PanelPowerManagerPrivate);
+
+  manager->priv->dbus_connection = NULL;
+  manager->priv->bus_proxy = NULL;
+  manager->priv->gpm_proxy = NULL;
+  manager->priv->is_connected = FALSE;
+
+  error = NULL;
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
+panel_power_manager_finalize (GObject * object)
+{
+  PanelPowerManager *manager;
+  GObjectClass *parent_class;
+
+  manager = PANEL_POWER_MANAGER (object);
+
+  parent_class = G_OBJECT_CLASS (panel_power_manager_parent_class);
+
+  if (parent_class->finalize != NULL)
+    parent_class->finalize (object);
+}
+
+static void
+panel_power_manager_get_property (GObject * object,
+				  guint prop_id,
+				  GValue * value, GParamSpec * pspec)
+{
+  PanelPowerManager *manager = PANEL_POWER_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_IS_CONNECTED:
+      g_value_set_boolean (value, manager->priv->is_connected);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+GQuark
+panel_power_manager_error_quark (void)
+{
+  static GQuark error_quark = 0;
+
+  if (error_quark == 0)
+    error_quark = g_quark_from_static_string ("panel-power-manager-error");
+
+  return error_quark;
+}
+
+PanelPowerManager *
+panel_power_manager_new (void)
+{
+  PanelPowerManager *manager;
+
+  manager = g_object_new (PANEL_TYPE_POWER_MANAGER, NULL);
+
+  return manager;
+}
+
+gboolean 
+panel_power_manager_can_sleep (PanelPowerManager *manager)
+{
+  GError *error;
+  gboolean can_sleep;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  can_sleep = FALSE;
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", &error,
+	                  G_TYPE_INVALID,
+	                  G_TYPE_BOOLEAN, &can_sleep, G_TYPE_INVALID)) 
+    {
+      if (error != NULL)
+	{
+	  g_message ("could not ask power manager if user can suspend - %s",
+	             error->message);
+	  g_error_free (error);
+	}
+      can_sleep = FALSE;
+    }
+
+  return can_sleep;
+}
+
+gboolean 
+panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager)
+{
+  GError *error;
+  gboolean can_sleep_and_power_down;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_message ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  can_sleep_and_power_down = FALSE;
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", &error,
+	                  G_TYPE_INVALID,
+	                  G_TYPE_BOOLEAN, &can_sleep_and_power_down, 
+	                  G_TYPE_INVALID)) 
+    {
+      if (error != NULL)
+	{
+	  g_message ("could not ask power manager if user can suspend - %s",
+	             error->message);
+	  g_error_free (error);
+	}
+      can_sleep_and_power_down = FALSE;
+    }
+
+  return can_sleep_and_power_down;
+}
+
+PanelPowerManagerRequest *
+panel_power_manager_request_sleep (PanelPowerManager *manager)
+{
+  GError *error;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_warning ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return NULL;
+    }
+
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", &error,
+	                  G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) 
+    {
+
+      GError *call_error;
+      g_warning ("could not ask power manager to suspend - %s",
+	         error->message);
+      call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR,
+	                                PANEL_POWER_MANAGER_ERROR_SLEEPING,
+	                                error->message);
+      g_error_free (error);
+      g_signal_emit (G_OBJECT (manager),
+	             panel_power_manager_signals[REQUEST_FAILED],
+	             0, call_error);
+      g_error_free (call_error);
+    }
+
+  return (PanelPowerManagerRequest *) !NULL;
+}
+
+PanelPowerManagerRequest *
+panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager)
+{
+  GError *error;
+
+  error = NULL;
+
+  if (!panel_power_manager_ensure_gpm_connection (manager, &error))
+    {
+      g_warning ("could not connect to power manager - %s", error->message);
+      g_error_free (error);
+      return NULL;
+    }
+
+  if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", &error,
+	                  G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) 
+    {
+      GError *call_error;
+
+      g_warning ("could not ask power manager to hibernate - %s",
+	         error->message);
+      call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR,
+	                                PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN,
+	                                error->message);
+      g_error_free (error);
+      g_signal_emit (G_OBJECT (manager),
+	             panel_power_manager_signals[REQUEST_FAILED],
+	             0, call_error);
+      g_error_free (call_error);
+      return NULL;
+    }
+
+  return (PanelPowerManagerRequest *) !NULL;
+}
+
+void
+panel_power_manager_cancel_request (PanelPowerManager *manager,
+	                            PanelPowerManagerRequest *request)
+{
+}
+
+PanelPowerManager *
+panel_get_power_manager (void)
+{
+  static PanelPowerManager *manager = NULL;
+
+  if (manager == NULL)
+    manager = panel_power_manager_new ();
+
+  return g_object_ref (manager);
+}
+
+
+#ifdef PANEL_POWER_MANAGER_ENABLE_TEST
+
+#include <stdio.h>
+#include <glib.h>
+
+int
+main (int argc, char **argv)
+{
+  PanelPowerManager *manager;
+  int exit_code;
+
+  g_log_set_always_fatal (G_LOG_LEVEL_ERROR
+			  | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
+
+  g_type_init ();
+
+  g_print ("creating instance of 'power manager' object... ");
+  manager = panel_power_manager_new ();
+  g_print ("done\n");
+
+  g_print ("checking if user can put machine to sleep... ");
+  if (panel_power_manager_can_sleep (manager))
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("checking if user can hibernate machine... ");
+  if (panel_power_manager_can_sleep_and_power_down (manager))
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("attempting to suspend machine... ");
+  if (panel_power_manager_request_sleep (manager) != NULL)
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("attempting to hibernate machine... ");
+  if (panel_power_manager_request_sleep_and_power_down (manager) != NULL)
+      g_print ("yes\n");
+  else
+      g_print ("no\n");
+
+  g_print ("destroying previously created 'power manager' object... ");
+  g_object_unref (manager);
+  g_print ("done\n");
+
+  exit_code = 0;
+
+  return exit_code;
+}
+#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
--- gnome-panel-2.13.91/configure.in.gpm-integration	2006-02-13 13:30:38.000000000 -0500
+++ gnome-panel-2.13.91/configure.in	2006-02-15 00:21:03.000000000 -0500
@@ -58,10 +58,12 @@
 LIBECAL_REQUIRED=0.0.97
 LIBEDATASERVERUI_REQUIRED=1.2.0
 CAIRO_REQUIRED=1.0.0
+DBUS_REQUIRED=0.60
+DBUS_GLIB_REQUIRED=0.60
 
 dnl pkg-config dependency checks
 
-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED)
+PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 AC_SUBST(PANEL_CFLAGS)
 AC_SUBST(PANEL_LIBS)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	28 Jan 2006 04:58:57 -0000	1.38
+++ .cvsignore	15 Feb 2006 05:26:02 -0000	1.39
@@ -8,3 +8,4 @@
 gnome-panel-2.13.4.tar.bz2
 gnome-panel-2.13.5.tar.bz2
 gnome-panel-2.13.90.tar.bz2
+gnome-panel-2.13.91.tar.bz2


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- gnome-panel.spec	13 Feb 2006 18:32:20 -0000	1.112
+++ gnome-panel.spec	15 Feb 2006 05:26:02 -0000	1.113
@@ -15,8 +15,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.13.90
-Release: 3
+Version: 2.13.91
+Release: 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
@@ -59,7 +59,7 @@
 Patch4: gnome-panel-2.13.2-rename-system-menu.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
 Patch6: gnome-panel-2.13.5-switch-user.patch
-Patch7: gnome-panel-2.13.90-gpm-integration.patch
+Patch7: gnome-panel-2.13.91-gpm-integration.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
@@ -206,6 +206,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- update to 2.13.91
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-3
 - use beagle if available for search tool
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	28 Jan 2006 04:58:57 -0000	1.38
+++ sources	15 Feb 2006 05:26:02 -0000	1.39
@@ -1 +1 @@
-6ca7470ed881ff88fa91dd5540e92fa0  gnome-panel-2.13.90.tar.bz2
+6a23bffd45e29b21c727c01677798675  gnome-panel-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:27:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:27:06 -0500
Subject: rpms/evolution/devel evo-calendar-print-with-pango-7.patch, NONE,
	1.1 .cvsignore, 1.43, 1.44 evolution.spec, 1.124,
	1.125 sources, 1.43,
	1.44 evo-calendar-print-with-pango-6.patch, 1.1,
	NONE evolution-2.5.4-fix-nm-multiple-init.patch, 1.1, NONE
Message-ID: <200602150527.k1F5R63W026920@cvs.devel.redhat.com>

Author: dmalcolm

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

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evo-calendar-print-with-pango-7.patch 
Removed Files:
	evo-calendar-print-with-pango-6.patch 
	evolution-2.5.4-fix-nm-multiple-init.patch 
Log Message:
* Tue Feb 14 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
- 2.5.91
- updated patch 101 to track upstream changes to calendar printing code
- remove uptreamed patch 807 (NM multiple initialization assertion)
- readded the mail-to-task plugin XML UI file



evo-calendar-print-with-pango-7.patch:
 print.c |  745 ++++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 383 insertions(+), 362 deletions(-)

--- NEW FILE evo-calendar-print-with-pango-7.patch ---
--- evolution-2.5.91/calendar/gui/print.c.calendar-print-with-pango	2006-02-12 23:31:51.000000000 -0500
+++ evolution-2.5.91/calendar/gui/print.c	2006-02-14 23:22:49.000000000 -0500
@@ -60,6 +60,83 @@
 #include "gnome-cal.h"
 #include "print.h"
 
+#include <libgnomeprint/gnome-print-pango.h>
+
+typedef struct EvoCalendarPrintRenderer EvoCalendarPrintRenderer;
+
+struct EvoCalendarPrintRenderer
+{
+	GnomePrintContext *pc;
+
+	/* keep one of these around: */
+	PangoLayout *pl;
+};
+
+static EvoCalendarPrintRenderer *
+evo_calendar_print_data_new (GnomePrintContext *pc);
+
+static void 
+evo_calendar_print_data_free (EvoCalendarPrintRenderer *pr);
+
+static double
+evo_calendar_print_renderer_get_width (EvoCalendarPrintRenderer *pr,
+				       PangoFontDescription *font, 
+				       const char *text);
+
+
+static EvoCalendarPrintRenderer *
+evo_calendar_print_data_new (GnomePrintContext *pc)
+{
+	EvoCalendarPrintRenderer *pr;
+
+	g_return_val_if_fail (pc, NULL);
+
+	pr = g_new0 (EvoCalendarPrintRenderer, 1);
+
+	pr->pc = pc; /* ref/unref this? the old code doesn't */
+
+	pr->pl = gnome_print_pango_create_layout (pc);
+
+	return pr;
+}
+
+static void 
+evo_calendar_print_data_free (EvoCalendarPrintRenderer *pr)
+{
+	g_return_if_fail (pr);
+
+	g_assert (pr->pl);
+	g_object_unref (G_OBJECT (pr->pl));
+
+	g_free (pr);
+}
+
+
+static double
+evo_calendar_print_renderer_get_width (EvoCalendarPrintRenderer *pr,
+				       PangoFontDescription *font, 
+				       const char *text)
+{
+	int w, h;
+
+	pango_layout_set_font_description (pr->pl, font);
+	pango_layout_set_text (pr->pl, text, -1);
+	pango_layout_set_indent (pr->pl, 0);
+
+	pango_layout_get_size (pr->pl, &w, &h);
+
+	return w/(double)PANGO_SCALE;
+}
+
+
+static double
+get_font_size (PangoFontDescription *font)
+{
+	g_return_val_if_fail (font, 0.0);
+
+	return ((double)pango_font_description_get_size (font)/(double)PANGO_SCALE);
+}
+
 
 
 /*
@@ -252,12 +329,10 @@
 		*end = d_week + d_month - 1;
 }
 
-static GnomeFont *
-get_font_for_size (double h, GnomeFontWeight weight, gboolean italic)
+static PangoFontDescription *
+get_font_for_size (EvoCalendarPrintRenderer *pr, double h, GnomeFontWeight weight, gboolean italic)
 {
-	GnomeFontFace *face;
-	GnomeFont *font;
-	double asc, desc, size;
+	PangoFontDescription *font_desc;
 	gchar *font_name;
 
 	if (weight <= GNOME_FONT_BOOK)
@@ -268,22 +343,16 @@
 	if (italic)
 		font_name = g_strconcat (font_name, " Italic", NULL);
 
-	/* This function is broken in gnome-print (it doesn't find a suitable face).
-	 * face = gnome_font_face_find_closest_from_weight_slant (DEFAULT_FONT, weight, italic); */
-	face = gnome_font_face_find (font_name);
-
-	asc = gnome_font_face_get_ascender (face);
-	desc = abs (gnome_font_face_get_descender (face));
-	size = h * 1000 / (asc + desc);
-
-	/* This function is broken in gnome-print (it doesn't find a suitable font).
-	 * font = gnome_font_find_closest_from_weight_slant (DEFAULT_FONT, weight, italic, size); */
-	font = gnome_font_find_closest (font_name, size);
+	font_desc = pango_font_description_from_string (font_name);
+
+	#define MAGIC_SCALE_FACTOR (0.86)
+	pango_font_description_set_size (font_desc,
+					 h * MAGIC_SCALE_FACTOR * PANGO_SCALE );
 
-	g_object_unref (face);
 	if (italic)
 		g_free (font_name);
-	return font;
+
+	return font_desc;
 }
 
 enum align_box {
@@ -385,18 +454,25 @@
 	gnome_print_grestore (pc);
 }
 
+
+
 /* Prints 1 line of aligned text in a box. It is centered vertically, and
    the horizontal alignment can be either ALIGN_LEFT, ALIGN_RIGHT, or
    ALIGN_CENTER. */
-static void
-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
+static double
+print_text (EvoCalendarPrintRenderer *pr, PangoFontDescription *font, const char *text,
 	   enum align_box align, double l, double r, double t, double b)
 {
-	double w, x, y;
-
-	gnome_print_gsave (pc);
-
-	w = gnome_font_get_width_utf8 (font, text);
+	double w, x;
+	int pw, ph;
+	gnome_print_gsave (pr->pc);
+
+	pango_layout_set_font_description (pr->pl, font);
+	pango_layout_set_text (pr->pl, text, -1);
+	pango_layout_set_width (pr->pl, -1); /* ensure no line-wrapping occurs */
+	pango_layout_set_indent (pr->pl, 0);
+	pango_layout_get_size (pr->pl, &pw, &ph);
+	w = pw/(double)PANGO_SCALE;
 
 	switch (align & 3) {
 	case ALIGN_LEFT:
@@ -414,63 +490,68 @@
 	/* Make sure we don't go off the left edge. */
 	x = MAX (l, x);
 
-	/* Now calculate the baseline. */
-	y = t - gnome_font_get_ascender (font);
-	
 	/* Set a clipping rectangle. */
-	gnome_print_moveto (pc, l, t);
-	gnome_print_lineto (pc, r, t);
-	gnome_print_lineto (pc, r, b);
-	gnome_print_lineto (pc, l, b);
-	gnome_print_closepath (pc);
-	gnome_print_clip (pc);
+	gnome_print_moveto (pr->pc, l, t);
+	gnome_print_lineto (pr->pc, r, t);
+	gnome_print_lineto (pr->pc, r, b);
+	gnome_print_lineto (pr->pc, l, b);
+	gnome_print_closepath (pr->pc);
+	gnome_print_clip (pr->pc);
+
+	gnome_print_newpath (pr->pc);
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
 
-	gnome_print_newpath (pc);
-	gnome_print_moveto (pc, x, y);
-	gnome_print_setfont (pc, font);
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_show (pc, text);
+	gnome_print_moveto (pr->pc, x, t);
+	gnome_print_pango_layout (pr->pc, pr->pl);
 
-	gnome_print_grestore (pc);
+	gnome_print_grestore (pr->pc);
+
+	return w;
 }
 
 /* gets/frees the font for you, as a book font */
-static void
-print_text_size(GnomePrintContext *pc, const char *text,
+static double
+print_text_size(EvoCalendarPrintRenderer *pr, const char *text,
 		     enum align_box align, double l, double r, double t, double b)
 {
-	GnomeFont *font;
+	PangoFontDescription *font;
+	double w;
 
-	font = get_font_for_size (t - b, GNOME_FONT_BOOK, FALSE);
-	print_text(pc, font, text, align, l, r, t, b);
-	g_object_unref (font);
+	font = get_font_for_size (pr, t - b, GNOME_FONT_BOOK, FALSE);
+	w = print_text(pr, font, text, align, l, r, t, b);
+	pango_font_description_free (font);
+
+	return w;
 }
 
 /* gets/frees the font for you, as a bold font */
-static void
-print_text_size_bold(GnomePrintContext *pc, const char *text,
+static double
+print_text_size_bold(EvoCalendarPrintRenderer *pr, const char *text,
 		     enum align_box align, double l, double r, double t, double b)
 {
-	GnomeFont *font;
+	PangoFontDescription *font;
+	double w;
 
-	font = get_font_for_size (t - b, GNOME_FONT_BOLD, FALSE);
-	print_text(pc, font, text, align, l, r, t, b);
-	g_object_unref (font);
+	font = get_font_for_size (pr, t - b, GNOME_FONT_BOLD, FALSE);
+	w = print_text(pr, font, text, align, l, r, t, b);
+	pango_font_description_free (font);
+
+	return w;
 }
 
 static void
-titled_box (GnomePrintContext *pc, const char *text, GnomeFont *font,
+titled_box (EvoCalendarPrintRenderer *pr, const char *text, PangoFontDescription *font,
 	    enum align_box align, double *l, double *r, double *t, double *b,
 	    double linewidth)
 {
 	double size;
 
-	size = gnome_font_get_size (font);
+	size = get_font_size (font);
 
 	if (align & ALIGN_BORDER) {
-		print_border (pc, *l, *r, *t, *t - size * 1.4,
+		print_border (pr->pc, *l, *r, *t, *t - size * 1.4,
 			      linewidth, 0.9);
-		print_border (pc, *l, *r, *t - size * 1.4, *b,
+		print_border (pr->pc, *l, *r, *t - size * 1.4, *b,
 			      linewidth, -1.0);
 
 		*l += 2;
@@ -478,7 +559,7 @@
 		*b += 2;
 	}
 
-	print_text (pc, font, text, align, *l, *r, *t, *t - size * 1.4);
+	print_text (pr, font, text, align, *l, *r, *t, *t - size * 1.4);
 	*t -= size * 1.4;
 }
 
@@ -554,13 +635,13 @@
   print out the month small, embolden any days with events.
 */
 static void
-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal, time_t month,
+print_month_small (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t month,
 		   double left, double right, double top, double bottom,
 		   int titleflags, time_t greystart, time_t greyend,
 		   int bordertitle)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	GnomeFont *font, *font_bold, *font_normal;
+	PangoFontDescription *font, *font_bold, *font_normal;
 	time_t now, next;
 	int x, y;
 	int days[42];
@@ -577,14 +658,14 @@
 	/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
 	format_date (month, titleflags, buf, 100);
 	header_size = (top - bottom) * 0.16;
-	font = get_font_for_size (header_size, GNOME_FONT_BOLD, FALSE);
+	font = get_font_for_size (pr, header_size, GNOME_FONT_BOLD, FALSE);
 	if (bordertitle) {
-		print_border (pc, left, right, top, top - header_size,
+		print_border (pr->pc, left, right, top, top - header_size,
 			      1.0, 0.9);
 	}
-	print_text (pc, font, buf, ALIGN_CENTER, left, right,
+	print_text (pr, font, buf, ALIGN_CENTER, left, right,
 		    top, top - header_size);
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	top -= header_size;
 
@@ -610,22 +691,22 @@
 	tm = *convert_timet_to_struct_tm (month, zone);
 	build_month (tm.tm_mon, tm.tm_year + 1900, days, 0, 0);
 
-	font_normal = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
-	font_bold = get_font_for_size (font_size, GNOME_FONT_BOLD, FALSE);
+	font_normal = get_font_for_size (pr, font_size, GNOME_FONT_BOOK, FALSE);
+	font_bold = get_font_for_size (pr, font_size, GNOME_FONT_BOLD, FALSE);
 
 	/* Get a reasonable estimate of the largest number we will need,
 	   and use it to calculate the offset from the right edge of the
 	   cell that we should put the numbers. */
-	w = gnome_font_get_width_utf8 (font_bold, "23");
+	w = evo_calendar_print_renderer_get_width (pr, font_bold, "23");
 	text_xpad = (col_width - w) / 2;
 
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
 
 	/* Print the abbreviated day names across the top in bold. */
 	week_start_day = calendar_config_get_week_start_day ();
 	weekday = week_start_day;
 	for (x = 0; x < 7; x++) {
-		print_text (pc, font_bold, _(daynames[weekday]), ALIGN_CENTER,
+		print_text (pr, font_bold, _(daynames[weekday]), ALIGN_CENTER,
 			    left + x * col_width, left + (x + 1) * col_width,
 			    top, top - row_height * 1.4);
 		weekday = (weekday + 1) % 7;
@@ -665,12 +746,12 @@
 				next = time_add_day_with_zone (now, 1, zone);
 				if ((now >= greystart && now < greyend)
 				    || (greystart >= now && greystart < next)) {
-					print_border (pc,
+					print_border (pr->pc,
 						      cell_left, cell_right,
 						      cell_top, cell_bottom,
 						      -1.0, 0.75);
 				}
-				print_text (pc, font, buf, ALIGN_RIGHT,
+				print_text (pr, font, buf, ALIGN_RIGHT,
 					    cell_left, text_right,
 					    cell_top, cell_bottom);
 
@@ -678,119 +759,53 @@
 			}
 		}
 	}
-	g_object_unref (font_normal);
-	g_object_unref (font_bold);
+	pango_font_description_free (font_normal);
+	pango_font_description_free (font_bold);
 }
 
 
-
 /* wraps text into the print context, not taking up more than its allowed space */
 static double
-bound_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
+bound_text(EvoCalendarPrintRenderer *pr, PangoFontDescription *font, const char *text,
 	   double left, double right, double top, double bottom, double indent)
 {
-	double maxwidth = right-left;
-	double width;
-	const char *p;
-	char *wordstart;
-	int c;
-	char *outbuffer, *o, *outbuffendmarker;
-	int outbufflen;
-	int dump=0;
-	int first=1;
-
-	g_return_val_if_fail(text!=NULL, top);
-
-	if (top<bottom) {
-		/* too much to fit in appointment printout */
-		return top;
-	}
-
-	outbufflen = 1024;
-	outbuffer = g_malloc(outbufflen);
-	outbuffendmarker = outbuffer+outbufflen-2;
-
-	top -= gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	width=0;
-	p = text;
-	wordstart = outbuffer;
-	o = outbuffer;
-	while ((c=*p)) {
-		if (c=='\n') {
-			wordstart=o;
-			dump=1;
-		} else {
-			/* grow output buffer if required */
-			if (o>=outbuffendmarker) {
-				char *newbuf;
-				outbufflen*=2;
-				newbuf = g_realloc(outbuffer, outbufflen);
-				o = newbuf+(o-outbuffer);
-				wordstart = newbuf+(o-outbuffer);
-				outbuffer = newbuf;
-				outbuffendmarker = outbuffer+outbufflen-2;
-			}
-			*o++=c;
-			if (c==' ')
-				wordstart = o;
-
-			dump=0;
-			if (g_utf8_validate (p, strlen(p), NULL)) {
-				width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));
-				if (width>maxwidth) {
-					o--;
-					p--;
-					dump=1;
-				}
-			}
-		}
-		if (dump) {
-			if (wordstart==outbuffer)
-				wordstart=o;
-			c=*wordstart;
-			*wordstart=0;
-			gnome_print_moveto(pc, left, top);
-			gnome_print_show(pc, outbuffer);
-			*wordstart=c;
-			memcpy(outbuffer, wordstart, o-wordstart);
-			width = gnome_font_get_width_utf8_sized(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
+	/* Let Pango do all the work: */
+	int w, h;
+
+	gnome_print_gsave (pr->pc);
+
+	/* Set a clipping rectangle. */
+	gnome_print_moveto (pr->pc, left, top);
+	gnome_print_lineto (pr->pc, right, top);
+	gnome_print_lineto (pr->pc, right, bottom);
+	gnome_print_lineto (pr->pc, left, bottom);
+	gnome_print_closepath (pr->pc);
+	gnome_print_clip (pr->pc);
+
+	gnome_print_newpath (pr->pc);
+
+	pango_layout_set_font_description (pr->pl, font);
+	pango_layout_set_text (pr->pl, text, -1);
+	pango_layout_set_indent (pr->pl, indent * PANGO_SCALE);
+	pango_layout_set_width (pr->pl, (right-left)*PANGO_SCALE);
+	gnome_print_moveto (pr->pc, left, top);
+	gnome_print_pango_layout (pr->pc, pr->pl);
+	
+	gnome_print_grestore (pr->pc);
+	
+	pango_layout_get_size (pr->pl, &w, &h);
 
-	return top;
+	return top - (double)h/(double)PANGO_SCALE;
 }
 
 
 /* Draw the borders, lines, and times down the left of the day view. */
 static void
-print_day_background (GnomePrintContext *pc, GnomeCalendar *gcal,
+print_day_background (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal,
 		      time_t whence, struct pdinfo *pdi,
 		      double left, double right, double top, double bottom)
 {
-	GnomeFont *font_hour, *font_minute;
+	PangoFontDescription *font_hour, *font_minute;
 	double yinc, y;
 	double width = DAY_VIEW_TIME_COLUMN_WIDTH;
 	double font_size, max_font_size, hour_font_size, minute_font_size;
@@ -798,19 +813,20 @@
 	const char *minute;
 	gboolean use_24_hour;
 	int i, hour, row;
+	double hour_minute_x;
 
 	/* Fill the time column in light-gray. */
-	print_border (pc, left, left + width, top, bottom, -1.0, 0.9);
+	print_border (pr->pc, left, left + width, top, bottom, -1.0, 0.9);
 
 	/* Draw the border around the entire view. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+	print_border (pr->pc, left, right, top, bottom, 1.0, -1.0);
 
 	/* Draw the vertical line on the right of the time column. */
-	gnome_print_setlinewidth (pc, 0.0);
-	gnome_print_moveto (pc, left + width, bottom);
-	gnome_print_lineto (pc, left + width, top);
-	gnome_print_stroke (pc);
+	gnome_print_setlinewidth (pr->pc, 0.0);
+	gnome_print_moveto (pr->pc, left + width, bottom);
+	gnome_print_lineto (pr->pc, left + width, top);
+	gnome_print_stroke (pr->pc);
 
 	/* Calculate the row height. */
 	yinc = (top - bottom) / (pdi->end_hour - pdi->start_hour);
@@ -819,19 +835,20 @@
 	font_size = yinc * 0.6;
 	max_font_size = width * 0.5;
 	hour_font_size = MIN (font_size, max_font_size);
-	font_hour = get_font_for_size (hour_font_size, GNOME_FONT_BOLD, FALSE);
+	font_hour = get_font_for_size (pr, hour_font_size, GNOME_FONT_BOLD, FALSE);
 
 	font_size = yinc * 0.33;
 	max_font_size = width * 0.25;
 	minute_font_size = MIN (font_size, max_font_size);
-	font_minute = get_font_for_size (minute_font_size, GNOME_FONT_BOLD, FALSE);
+	font_minute = get_font_for_size (pr, minute_font_size, GNOME_FONT_BOLD, FALSE);
 
 	use_24_hour = calendar_config_get_24_hour_format ();
 
 	row = 0;
+	hour_minute_x = left + width * 0.58;
 	for (i = pdi->start_hour; i < pdi->end_hour; i++) {
 		y = top - yinc * (row + 1);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
+		gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
 
 		if (use_24_hour) {
 			hour = i;
@@ -849,30 +866,30 @@
 
 		/* the hour label/minute */
 		sprintf (buf, "%d", hour);
-		print_text (pc, font_hour, buf, ALIGN_RIGHT,
-			    left, left + width * 0.58,
+		print_text (pr, font_hour, buf, ALIGN_RIGHT,
+			    left, hour_minute_x,
 			    y + yinc - 4, y + yinc - 4 - hour_font_size);
-		print_text (pc, font_minute, minute, ALIGN_RIGHT,
-			    left, left + width - 3,
+		print_text (pr, font_minute, minute, ALIGN_LEFT,
+			    hour_minute_x, left + width - 3,
 			    y + yinc - 3, y + yinc - 3 - minute_font_size);
 
 		/* Draw the horizontal line between hours, across the entire
 		   width of the day view. */
-		gnome_print_moveto (pc, left, y);
-		gnome_print_lineto (pc, right, y);
-		gnome_print_stroke (pc);
+		gnome_print_moveto (pr->pc, left, y);
+		gnome_print_lineto (pr->pc, right, y);
+		gnome_print_stroke (pr->pc);
 
 		/* Draw the horizontal line for the 1/2-hours, across the
 		   entire width except for part of the time column. */
-		gnome_print_moveto (pc, left + width * 0.6, y + yinc / 2);
-		gnome_print_lineto (pc, right, y + yinc / 2);
-		gnome_print_stroke (pc);
+		gnome_print_moveto (pr->pc, left + width * 0.6, y + yinc / 2);
+		gnome_print_lineto (pr->pc, right, y + yinc / 2);
+		gnome_print_stroke (pr->pc);
 
 		row++;
 	}
 
-	g_object_unref (font_hour);
-	g_object_unref (font_minute);
+	pango_font_description_free (font_hour);
+	pango_font_description_free (font_minute);
 }
 
 
@@ -984,7 +1001,7 @@
 
 
 static void
-print_day_long_event (GnomePrintContext *pc, GnomeFont *font,
+print_day_long_event (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 		      double left, double right, double top, double bottom,
 		      double row_height, EDayViewEvent *event,
 		      struct pdinfo *pdi, ECalModel *model)
@@ -1014,7 +1031,7 @@
 	y2 = y1 - row_height + 4;
 	red = green = blue = 0.95;
 	e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, red, green, blue,
+	print_border_with_triangles (pr->pc, x1, x2, y1, y2, 0.5, red, green, blue,
 				     left_triangle_width,
 				     right_triangle_width);
 
@@ -1033,8 +1050,7 @@
 				    buffer, sizeof (buffer));
 
 		x1 += 4;
-		print_text (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
+		x1 += print_text (pr, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);
 	}
 
 	/* If the event ends before the end of the last day being printed,
@@ -1052,8 +1068,7 @@
 				    buffer, sizeof (buffer));
 
 		x2 -= 4;
-		print_text (pc, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
+		x2 -= print_text (pr, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
 	}
 
 	/* Print the text. */
@@ -1062,12 +1077,12 @@
 
 	x1 += 4;
 	x2 -= 4;
-	print_text (pc, font, text, ALIGN_CENTER, x1, x2, y1, y2);
+	print_text (pr, font, text, ALIGN_CENTER, x1, x2, y1, y2);
 }
 
 
 static void
-print_day_event (GnomePrintContext *pc, GnomeFont *font,
+print_day_event (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 		 double left, double right, double top, double bottom,
 		 EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
 {
@@ -1110,7 +1125,7 @@
 
 	red = green = blue = 0.95;
 	e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
-	print_border_rgb (pc, x1, x2, y1, y2, 1.0, red, green, blue);
+	print_border_rgb (pr->pc, x1, x2, y1, y2, 1.0, red, green, blue);
 
 	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
 	text = summary ? (char*) summary : "";
@@ -1140,7 +1155,7 @@
 		free_text = TRUE;
 	}
 
-	bound_text (pc, font, text, x1 + 2, x2 - 2, y1, y2, 0);
+	bound_text (pr, font, text, x1 + 2, x2 - 2, y1, y2, 0);
 
 	if (free_text)
 		g_free (text);
@@ -1148,12 +1163,12 @@
 
 
 static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
+print_day_details (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t whence,
 		   double left, double right, double top, double bottom)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	EDayViewEvent *event;
-	GnomeFont *font;
+	PangoFontDescription *font;
 	time_t start, end;
 	struct pdinfo pdi;
 	gint rows_in_top_display, i;
@@ -1212,13 +1227,13 @@
 				       pdi.day_starts, &rows_in_top_display);
 
 	/* Print the long events. */
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
+	font = get_font_for_size (pr, 12, GNOME_FONT_BOOK, FALSE);
 	for (i = 0; i < pdi.long_events->len; i++) {
 		event = &g_array_index (pdi.long_events, EDayViewEvent, i);
-		print_day_long_event (pc, font, left, right, top, bottom,
+		print_day_long_event (pr, font, left, right, top, bottom,
 				      DAY_VIEW_ROW_HEIGHT, event, &pdi, model);
 	}
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	/* We always leave space for DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY in the
 	   top display, but we may have more rows than that, in which case
@@ -1227,8 +1242,8 @@
 				   DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY);
 
 	/* Draw the border around the long events. */
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	print_border (pc, left, right,
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+	print_border (pr->pc, left, right,
 		      top, top - rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,
 		      1.0, -1.0);
 
@@ -1236,7 +1251,7 @@
 	top -= rows_in_top_display * DAY_VIEW_ROW_HEIGHT + 4;
 
 	/* Draw the borders, lines, and times down the left. */
-	print_day_background (pc, gcal, whence, &pdi,
+	print_day_background (pr, gcal, whence, &pdi,
 			      left, right, top, bottom);
 
 	/* Now adjust to get rid of the time column. */
@@ -1249,13 +1264,13 @@
 	/* Print the short events. */
 	max_font_size = ((top - bottom) / pdi.rows) - 4;
 	font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
+	font = get_font_for_size (pr, font_size, GNOME_FONT_BOOK, FALSE);
 	for (i = 0; i < pdi.events[0]->len; i++) {
 		event = &g_array_index (pdi.events[0], EDayViewEvent, i);
-		print_day_event (pc, font, left, right, top, bottom,
+		print_day_event (pr, font, left, right, top, bottom,
 				 event, &pdi, model);
 	}
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	/* Free everything. */
 	free_event_array (pdi.long_events);
@@ -1284,7 +1299,7 @@
 
 
 static void
-print_week_long_event (GnomePrintContext *pc, GnomeFont *font,
+print_week_long_event (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 		       struct psinfo *psi,
 		       double x1, double x2, double y1, double y2,
 		       EWeekViewEvent *event, EWeekViewEventSpan *span,
@@ -1304,7 +1319,7 @@
 	if (event->end > psi->day_starts[span->start_day + span->num_days])
 		right_triangle_width = 4;
 
-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, red, green, blue,
+	print_border_with_triangles (pr->pc, x1, x2, y1, y2, 0.5, red, green, blue,
 				     left_triangle_width,
 				     right_triangle_width);
 
@@ -1323,8 +1338,7 @@
 				    buffer, sizeof (buffer));
 
 		x1 += 4;
-		print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
-		x1 += gnome_font_get_width_utf8 (font, buffer);
+		x1 += print_text_size (pr, buffer, ALIGN_LEFT, x1, x2, y1, y2);
 	}
 
 	/* If the event ends before the end of the last day being printed,
@@ -1342,18 +1356,17 @@
 				    buffer, sizeof (buffer));
 
 		x2 -= 4;
-		print_text_size (pc, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
-		x2 -= gnome_font_get_width_utf8 (font, buffer);
+		x2 -= print_text_size (pr, buffer, ALIGN_RIGHT, x1, x2, y1, y2);
 	}
 
 	x1 += 4;
 	x2 -= 4;
-	print_text_size (pc, text, ALIGN_CENTER, x1, x2, y1, y2);
+	print_text_size (pr, text, ALIGN_CENTER, x1, x2, y1, y2);
 }
 
 
 static void
-print_week_day_event (GnomePrintContext *pc, GnomeFont *font,
+print_week_day_event (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 		      struct psinfo *psi,
 		      double x1, double x2, double y1, double y2,
 		      EWeekViewEvent *event, EWeekViewEventSpan *span,
@@ -1373,8 +1386,8 @@
 	e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
 			    buffer, sizeof (buffer));
 
-	print_rectangle (pc, x1, x2, y1, y2, red, green, blue);
-	print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
+	print_rectangle (pr->pc, x1, x2, y1, y2, red, green, blue);
+	print_text_size (pr, buffer, ALIGN_LEFT, x1, x2, y1, y2);
 	x1 += gnome_font_get_width_utf8 (font, buffer) + 4;
 
 	date_tm.tm_hour = event->end_minute / 60;
@@ -1383,14 +1396,14 @@
 	e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
 			    buffer, sizeof (buffer));
 
-	print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);
+	print_text_size (pr, buffer, ALIGN_LEFT, x1, x2, y1, y2);
 	x1 += gnome_font_get_width_utf8 (font, buffer) + 4;
-	print_text_size (pc, text, ALIGN_LEFT, x1, x2, y1, y2);
+	print_text_size (pr, text, ALIGN_LEFT, x1, x2, y1, y2);
 }
 
 
 static void
-print_week_event (GnomePrintContext *pc, GnomeFont *font,
+print_week_event (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 		  struct psinfo *psi,
 		  double left, double top,
 		  double cell_width, double cell_height,
@@ -1456,11 +1469,11 @@
 			e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
 			if (print_is_one_day_week_event (event, span,
 							 psi->day_starts)) {
-				print_week_day_event (pc, font, psi,
+				print_week_day_event (pr, font, psi,
 						      x1, x2, y1, y2,
 						      event, span, text, red, green, blue);
 			} else {
-				print_week_long_event (pc, font, psi,
+				print_week_long_event (pr, font, psi,
 						       x1, x2, y1, y2,
 						       event, span, text, red, green, blue);
 			}
@@ -1470,7 +1483,7 @@
 
 
 static void
-print_week_view_background (GnomePrintContext *pc, GnomeFont *font,
+print_week_view_background (EvoCalendarPrintRenderer *pr, PangoFontDescription *font,
 			    struct psinfo *psi,
 			    double left, double top,
 			    double cell_width, double cell_height)
@@ -1481,7 +1494,7 @@
 	struct tm tm;
 	char *format_string, buffer[128];
 
-	font_size = gnome_font_get_size (font);
+	font_size = get_font_size (font);
 
 	for (day = 0; day < psi->days_shown; day++) {
 		e_week_view_layout_get_day_position
@@ -1502,7 +1515,7 @@
 		if (psi->multi_week_view && (tm.tm_mon != psi->month))
 			fillcolor = 0.9;
 
-		print_border (pc, x1, x2, y1, y2, 1.0, fillcolor);
+		print_border (pr->pc, x1, x2, y1, y2, 1.0, fillcolor);
 
 		if (psi->multi_week_view) {
 			if (tm.tm_mday == 1)
@@ -1510,13 +1523,13 @@
 			else
 				format_string = "%d";
 		} else {
-			gnome_print_moveto (pc, x1 + 0.1 * cell_width,
+			gnome_print_moveto (pr->pc, x1 + 0.1 * cell_width,
 					    y1 - psi->header_row_height + 3);
-			gnome_print_lineto (pc, x2,
+			gnome_print_lineto (pr->pc, x2,
 					    y1 - psi->header_row_height + 3);
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 0.5);
-			gnome_print_stroke (pc);
+			gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+			gnome_print_setlinewidth (pr->pc, 0.5);
+			gnome_print_stroke (pr->pc);
 
 			/* strftime format %A = full weekday name, %d = day of
 			   month, %B = full month name. You can change the
@@ -1527,7 +1540,7 @@
 		}
 
 		e_utf8_strftime (buffer, sizeof (buffer), format_string, &tm);
-		print_text_size (pc, buffer, ALIGN_RIGHT,
+		print_text_size (pr, buffer, ALIGN_RIGHT,
 				 x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
 	}
 }
@@ -1579,7 +1592,7 @@
 }
 
 static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal,
+print_week_summary (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal,
 		    time_t whence, gboolean multi_week_view, int weeks_shown,
 		    int month, double font_size,
 		    double left, double right, double top, double bottom)
@@ -1590,7 +1603,7 @@
 	time_t day_start;
 	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;
 	GArray *spans;
-	GnomeFont *font;
+	PangoFontDescription *font;
 	double cell_width, cell_height;
 	ECalModel *model = gnome_calendar_get_calendar_model (gcal);
 
@@ -1656,20 +1669,20 @@
 	psi.rows_per_compressed_cell = (cell_height - psi.header_row_height)
 		/ psi.row_height;
 
-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);
+	font = get_font_for_size (pr, font_size, GNOME_FONT_BOOK, FALSE);
 
 	/* Draw the grid and the day names/numbers. */
-	print_week_view_background (pc, font, &psi, left, top,
+	print_week_view_background (pr, font, &psi, left, top,
 				    cell_width, cell_height);
 
 	/* Print the events. */
 	for (event_num = 0; event_num < psi.events->len; event_num++) {
 		event = &g_array_index (psi.events, EWeekViewEvent, event_num);
-		print_week_event (pc, font, &psi, left, top,
+		print_week_event (pr, font, &psi, left, top,
 				  cell_width, cell_height, model, event, spans);
 	}
 
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	/* Free everything. */
 	for (event_num = 0; event_num < psi.events->len; event_num++) {
@@ -1681,7 +1694,7 @@
 
 
 static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
+print_year_summary (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t whence,
 		    double left, double right, double top, double bottom,
 		    int morerows)
 {
@@ -1715,7 +1728,7 @@
 		for (col = 0; col < cols; col++) {
 			l = left + col_width * col;
 			r = l + col_width;
-			print_month_small (pc, gcal, now,
+			print_month_small (pr, gcal, now,
 					   l + 8, r - 8, t - 8, b + 8,
 					   DATE_MONTH, 0, 0, TRUE);
 			now = time_add_month_with_zone (now, 1, zone);
@@ -1724,7 +1737,7 @@
 }
 
 static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
+print_month_summary (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t whence,
 		     double left, double right, double top, double bottom)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
@@ -1732,7 +1745,7 @@
 	struct tm tm;
 	struct icaltimetype tt;
 	char buffer[100];
-	GnomeFont *font;
+	PangoFontDescription *font;
 	gboolean compress_weekend;
 	int columns, col, weekday, len, month;
 	double font_size, cell_width, x1, x2, y1, y2;
@@ -1762,9 +1775,8 @@
 	tm = *convert_timet_to_struct_tm (date, zone);
 	tm.tm_mday = (tm.tm_mday % 7) + 7;
 
-	font = get_font_for_size (MONTH_NORMAL_FONT_SIZE, GNOME_FONT_BOLD, FALSE);
-	font_size = gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
+	font = get_font_for_size (pr, MONTH_NORMAL_FONT_SIZE, GNOME_FONT_BOLD, FALSE);
+	font_size = get_font_size (font);
 
 	columns = compress_weekend ? 6 : 7;
 	cell_width = (right - left) / columns;
@@ -1786,27 +1798,27 @@
 		x1 = left + cell_width * col;
 		x2 = x1 + cell_width;
 
-		print_border (pc, x1, x2, y1, y2, 1.0, -1.0);
-		print_text_size (pc, buffer, ALIGN_CENTER, x1, x2, y1, y2);
+		print_border (pr->pc, x1, x2, y1, y2, 1.0, -1.0);
+		print_text_size (pr, buffer, ALIGN_CENTER, x1, x2, y1, y2);
 
 		tm.tm_mday++;
 		tm.tm_wday = (tm.tm_wday + 1) % 7;
 	}
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	top = y2;
-	print_week_summary (pc, gcal, date, TRUE, 6, month,
+	print_week_summary (pr, gcal, date, TRUE, 6, month,
 			    MONTH_NORMAL_FONT_SIZE,
 			    left, right, top, bottom);
 }
 
 
 static void
-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal,
+print_todo_details (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal,
 		    time_t start, time_t end,
 		    double left, double right, double top, double bottom)
 {
-	GnomeFont *font_summary;
+	PangoFontDescription *font_summary;
 	double y, yend, x, xend;
 	struct icaltimetype *tt;
 	ECalendarTable *task_pad;
@@ -1820,12 +1832,12 @@
 	table = e_calendar_table_get_table (task_pad);
 	model = e_calendar_table_get_model (task_pad);
 
-	font_summary = get_font_for_size (10, GNOME_FONT_BOOK, FALSE);
+	font_summary = get_font_for_size (pr, 10, GNOME_FONT_BOOK, FALSE);
 
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+	gnome_print_setlinewidth (pr->pc, 0.0);
 
-	titled_box (pc, _("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
+	titled_box (pr, _("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,
 		    &left, &right, &top, &bottom, 1.0);
 
 	y = top - 3;
@@ -1859,33 +1871,34 @@
 			break;
 
 		/* Print the box to put the tick in. */
-		print_border (pc, x + 2, x + 8, y - 3, y - 11, 0.1, -1.0);
+		print_border (pr->pc, x + 2, x + 8, y - 3, y - 11, 0.1, -1.0);
 
 		/* If the task is complete, print a tick in the box. */
 		e_cal_component_get_completed (comp, &tt);
 		if (tt) {
 			e_cal_component_free_icaltimetype (tt);
 
-			gnome_print_setrgbcolor (pc, 0, 0, 0);
-			gnome_print_setlinewidth (pc, 1.0);
-			gnome_print_moveto (pc, x + 3, y - 8);
-			gnome_print_lineto (pc, x + 5, y - 10);
-			gnome_print_lineto (pc, x + 7, y - 3.5);
-			gnome_print_stroke (pc);
+			gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+			gnome_print_setlinewidth (pr->pc, 1.0);
+			gnome_print_moveto (pr->pc, x + 3, y - 8);
+			gnome_print_lineto (pr->pc, x + 5, y - 10);
+			gnome_print_lineto (pr->pc, x + 7, y - 3.5);
+			gnome_print_stroke (pr->pc);
 		}
 
-		y = bound_text (pc, font_summary, summary.value,
+		y = bound_text (pr, font_summary, summary.value,
 				x + 10, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary) - 6;
-		gnome_print_moveto (pc, x, y);
-		gnome_print_lineto (pc, xend, y);
-		gnome_print_stroke (pc);
+
+		y += get_font_size (font_summary) - 12;
+		gnome_print_moveto (pr->pc, x, y);
+		gnome_print_lineto (pr->pc, xend, y);
+		gnome_print_stroke (pr->pc);
 		y -= 3;
 
 		g_object_unref (comp);
 	}
 
-	g_object_unref (font_summary);
+	pango_font_description_free (font_summary);
 }
 
 
@@ -1987,7 +2000,7 @@
 
 
 static void
-print_day_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
+print_day_view (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t date,
 		double left, double right, double top, double bottom)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
@@ -1999,29 +2012,29 @@
 		todo = (right - left) * 0.75 + left;
 		header = top - HEADER_HEIGHT;
 
-		gnome_print_beginpage (pc, NULL);
+		gnome_print_beginpage (pr->pc, NULL);
 
 		/* Print the main view with all the events in. */
-		print_day_details (pc, gcal, date,
+		print_day_details (pr, gcal, date,
 				   left, todo - 2.0, header, bottom);
 
 		/* Print the TaskPad down the right. */
-		print_todo_details (pc, gcal, 0, INT_MAX,
+		print_todo_details (pr, gcal, 0, INT_MAX,
 				    todo, right, header, bottom);
 
 		/* Print the filled border around the header. */
-		print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
+		print_border (pr->pc, left, right, top, header + 2.0, 1.0, 0.9);
 
 		/* Print the 2 mini calendar-months. */
 		l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
 			- SMALL_MONTH_SPACING;
-		print_month_small (pc, gcal, date,
+		print_month_small (pr, gcal, date,
 				   l, l + SMALL_MONTH_WIDTH,
 				   top - 4, header + 4,
 				   DATE_MONTH | DATE_YEAR, date, date, FALSE);
 
 		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-		print_month_small (pc, gcal,
+		print_month_small (pr, gcal,
 				   time_add_month_with_zone (date, 1, zone),
 				   l, l + SMALL_MONTH_WIDTH,
 				   top - 4, header + 4,
@@ -2030,22 +2043,22 @@
 		/* Print the date, e.g. '8th May, 2001'. */
 		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
 			     buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
+		print_text_size_bold (pr, buf, ALIGN_LEFT,
 				      left + 4, todo, top - 4, top - 4 - 24);
 
 		/* Print the day, e.g. 'Tuesday'. */
 		format_date (date, DATE_DAYNAME, buf, 100);
-		print_text_size_bold (pc, buf, ALIGN_LEFT,
+		print_text_size_bold (pr, buf, ALIGN_LEFT,
 				 left + 4, todo, top - 32, top - 32 - 18);
 
-		gnome_print_showpage (pc);
+		gnome_print_showpage (pr->pc);
 		date = time_add_day_with_zone (date, 1, zone);
 	}
 }
 
 
 static void
-print_week_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
+print_week_view (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t date,
 		 double left, double right, double top, double bottom)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
@@ -2057,7 +2070,7 @@
 
 	header = top - HEADER_HEIGHT;
 
-	gnome_print_beginpage (pc, NULL);
+	gnome_print_beginpage (pr->pc, NULL);
 
 	tm = *convert_timet_to_struct_tm (date, zone);
 	week_start_day = calendar_config_get_week_start_day ();
@@ -2072,27 +2085,27 @@
 	}
 
 	/* Print the main week view. */
-	print_week_summary (pc, gcal, when, FALSE, 1, 0,
+	print_week_summary (pr, gcal, when, FALSE, 1, 0,
 			    WEEK_NORMAL_FONT_SIZE,
 			    left, right, header, bottom);
 
 	/* Print the border around the main view. */
-	print_border (pc, left, right, header, bottom, 1.0, -1.0);
+	print_border (pr->pc, left, right, header, bottom, 1.0, -1.0);
 
 	/* Print the border around the header area. */
-	print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);
+	print_border (pr->pc, left, right, top, header + 2.0, 1.0, 0.9);
 
 	/* Print the 2 mini calendar-months. */
 	l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2
 		- SMALL_MONTH_SPACING;
-	print_month_small (pc, gcal, when,
+	print_month_small (pr, gcal, when,
 			   l, l + SMALL_MONTH_WIDTH,
 			   top - 4, header + 4,
 			   DATE_MONTH | DATE_YEAR, when,
 			   time_add_week_with_zone (when, 1, zone), FALSE);
 
 	l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
-	print_month_small (pc, gcal,
+	print_month_small (pr, gcal,
 			   time_add_month_with_zone (when, 1, zone),
 			   l, l + SMALL_MONTH_WIDTH,
 			   top - 4, header + 4,
@@ -2101,21 +2114,21 @@
 
 	/* Print the start day of the week, e.g. '7th May 2001'. */
 	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
+	print_text_size_bold (pr, buf, ALIGN_LEFT,
 			      left + 3, right, top - 4, top - 4 - 24);
 	
 	/* Print the end day of the week, e.g. '13th May 2001'. */
 	when = time_add_day_with_zone (when, 6, zone);
 	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_LEFT,
+	print_text_size_bold (pr, buf, ALIGN_LEFT,
 			      left + 3, right, top - 24 - 3, top - 24 - 3 - 24);
 
-	gnome_print_showpage (pc);
+	gnome_print_showpage (pr->pc);
 }
 
 
 static void
-print_month_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
+print_month_view (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t date,
 		  double left, double right, double top, double bottom)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
@@ -2124,21 +2137,21 @@
 
 	header = top - HEADER_HEIGHT;
 
-	gnome_print_beginpage (pc, NULL);
+	gnome_print_beginpage (pr->pc, NULL);
 
 	/* Print the main month view. */
-	print_month_summary (pc, gcal, date, left, right, header, bottom);
+	print_month_summary (pr, gcal, date, left, right, header, bottom);
 
 	/* Print the border around the header. */
-	print_border (pc, left, right, top, header, 1.0, 0.9);
+	print_border (pr->pc, left, right, top, header, 1.0, 0.9);
 
 	/* Print the 2 mini calendar-months. */
-	print_month_small (pc, gcal,
+	print_month_small (pr, gcal,
 			   time_add_month_with_zone (date, 1, zone),
 			   right - (right - left) / 7 + 2, right - 8,
 			   top - 4, header,
 			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-	print_month_small (pc, gcal,
+	print_month_small (pr, gcal,
 			   time_add_month_with_zone (date, -1, zone),
 			   left + 8, left + (right - left) / 7 - 2,
 			   top - 4, header,
@@ -2146,30 +2159,30 @@
 
 	/* Print the month, e.g. 'May 2001'. */
 	format_date (date, DATE_MONTH | DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
+	print_text_size_bold (pr, buf, ALIGN_CENTER,
 			      left + 3, right - 3, top - 3, top - 3 - 24);
 
-	gnome_print_showpage (pc);
+	gnome_print_showpage (pr->pc);
 }
 
 
 static void
-print_year_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,
+print_year_view (EvoCalendarPrintRenderer *pr, GnomeCalendar *gcal, time_t date,
 		 double left, double right, double top, double bottom)
 {
 	char buf[100];
 
-	gnome_print_beginpage (pc, NULL);
+	gnome_print_beginpage (pr->pc, NULL);
 
-	print_year_summary (pc, gcal, date, left, right, top - 50, bottom,
+	print_year_summary (pr, gcal, date, left, right, top - 50, bottom,
 			    TRUE);
 
 	/* centered title */
 	format_date (date, DATE_YEAR, buf, 100);
-	print_text_size_bold (pc, buf, ALIGN_CENTER,
+	print_text_size_bold (pr, buf, ALIGN_CENTER,
 			      left+3, right, top-3, top - 27);
 
-	gnome_print_showpage (pc);
+	gnome_print_showpage (pr->pc);
 }
 
 static void
@@ -2212,7 +2225,7 @@
 }
 
 static void
-print_date_label (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
+print_date_label (EvoCalendarPrintRenderer *pr, ECalComponent *comp, ECal *client,
 		  double left, double right, double top, double bottom)
 {
 	icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;
@@ -2280,15 +2293,15 @@
 			write_label_piece (due, buffer, 1024, _("Due "), NULL);
 	}
 
-	print_text_size_bold (pc, buffer, ALIGN_LEFT,
+	print_text_size_bold (pr, buffer, ALIGN_LEFT,
 			      left, right, top, top - 15);
 }
 
 static void
-print_comp_item (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
+print_comp_item (EvoCalendarPrintRenderer *pr, ECalComponent *comp, ECal *client,
 		 double left, double right, double top, double bottom)
 {
-	GnomeFont *font;
+	PangoFontDescription *font;
 	ECalComponentVType vtype;
 	ECalComponentText text;
 	GSList *desc, *l;
@@ -2309,24 +2322,24 @@
 	else
 		return;
 
-	gnome_print_beginpage (pc, NULL);
+	gnome_print_beginpage (pr->pc, NULL);
 
 	/* Print the title in a box at the top of the page. */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
+	font = get_font_for_size (pr, 18, GNOME_FONT_BOLD, FALSE);
 	header_size = 50;
-	print_border (pc, left, right, top, top - header_size,
+	print_border (pr->pc, left, right, top, top - header_size,
 		      1.0, 0.9);
-	print_text (pc, font, title, ALIGN_CENTER, left, right,
+	print_text (pr, font, title, ALIGN_CENTER, left, right,
 		    top - header_size * 0.1, top - header_size);
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	top -= header_size + 10;
 
 	/* Summary */
-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
+	font = get_font_for_size (pr, 18, GNOME_FONT_BOLD, FALSE);
 	e_cal_component_get_summary (comp, &text);
 	summary_string = g_strdup_printf (_("Summary: %s"), text.value);
-	top = bound_text (pc, font, summary_string, left, right,
+	top = bound_text (pr, font, summary_string, left, right,
 			  top - 3, bottom, 0);
 	g_free (summary_string);
 
@@ -2335,17 +2348,17 @@
 	if (location && location[0]) {
 		location_string = g_strdup_printf (_("Location: %s"),
 						   location);
-		top = bound_text (pc, font, location_string, left, right,
+		top = bound_text (pr, font, location_string, left, right,
 				  top - 3, bottom, 0);
 		g_free (location_string);
 	}
-	g_object_unref (font);
+	pango_font_description_free (font);
 
 	/* Date information */
-	print_date_label (pc, comp, client, left, right, top-3, top - 15);
+	print_date_label (pr, comp, client, left, right, top-3, top - 15);
 	top -= 20;
 
-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);
+	font = get_font_for_size (pr, 12, GNOME_FONT_BOOK, FALSE);
 
 	/* For a VTODO we print the Status, Priority, % Complete and URL. */
 	if (vtype == E_CAL_COMPONENT_TODO) {
@@ -2378,9 +2391,9 @@
 			if (status_string) {
 				char *status_text = g_strdup_printf (_("Status: %s"),
 							      status_string);
-				top = bound_text (pc, font, status_text,
+				top = bound_text (pr, font, status_text,
 						  left, right, top, bottom, 0);
-				top += gnome_font_get_size (font) - 6;
+				top += get_font_size (font) - 6;
 				g_free (status_text);
 			}
 		}
@@ -2394,9 +2407,9 @@
 			e_cal_component_free_priority (priority);
 
 			pri_text = g_strdup_printf (_("Priority: %s"), priority_string);
-			top = bound_text (pc, font, pri_text,
+			top = bound_text (pr, font, pri_text,
 					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
+			top += get_font_size (font) - 6;
 			g_free (pri_text);
 		}
 
@@ -2408,9 +2421,9 @@
 			percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent);
 			e_cal_component_free_percent (percent);
 
-			top = bound_text (pc, font, percent_string,
+			top = bound_text (pr, font, percent_string,
 					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
+			top += get_font_size (font) - 6;
 		}
 
 
@@ -2420,9 +2433,9 @@
 			char *url_string = g_strdup_printf (_("URL: %s"),
 							    url);
 
-			top = bound_text (pc, font, url_string,
+			top = bound_text (pr, font, url_string,
 					  left, right, top, bottom, 0);
-			top += gnome_font_get_size (font) - 6;
+			top += get_font_size (font) - 6;
 
 			g_free (url_string);
 		}
@@ -2433,9 +2446,9 @@
 	if (categories && categories[0]) {
 		categories_string = g_strdup_printf (_("Categories: %s"),
 						     categories);
-		top = bound_text (pc, font, categories_string,
+		top = bound_text (pr, font, categories_string,
 				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
+		top += get_font_size (font) - 6;
 		g_free (categories_string);
 	}
 
@@ -2452,9 +2465,9 @@
 		}
 		e_cal_component_free_text_list (contact_list);
 
-		top = bound_text (pc, font, contacts->str,
+		top = bound_text (pr, font, contacts->str,
 				  left, right, top, bottom, 0);
-		top += gnome_font_get_size (font) - 6;
+		top += get_font_size (font) - 6;
 
 		g_string_free (contacts, TRUE);
 	}
@@ -2467,12 +2480,12 @@
 		ECalComponentText *text = l->data;
 
 		if (text->value != NULL)
-			top = bound_text (pc, font, text->value, left, right, top-3, bottom, 0);
+			top = bound_text (pr, font, text->value, left, right, top-3, bottom, 0);
 	}
 	e_cal_component_free_text_list (desc);
-	g_object_unref (font);
+	pango_font_description_free (font);
 
-	gnome_print_showpage (pc);
+	gnome_print_showpage (pr->pc);
 }
 
 void
@@ -2481,7 +2494,7 @@
 {
 	GnomePrintConfig *print_config;
 	GnomePrintJob *gpm;
-	GnomePrintContext *pc;
+	EvoCalendarPrintRenderer *pr;
 	double l, r, t, b;
 	char *old_orientation;
 	
@@ -2541,7 +2554,8 @@
 
 	gpm = gnome_print_job_new (print_config);
 
-	pc = gnome_print_job_get_context (gpm);
+	pr = evo_calendar_print_data_new (gnome_print_job_get_context (gpm));
+
 	gnome_print_config_get_page_size (print_config, &r, &t);
 
 	/* See top of source for an explanation of this */
@@ -2562,21 +2576,23 @@
 	/* depending on the view, do a different output */
 	switch (default_view) {
 	case PRINT_VIEW_DAY:
-		print_day_view (pc, gcal, date, l, r, t, b);
+		print_day_view (pr, gcal, date, l, r, t, b);
 		break;
 	case PRINT_VIEW_WEEK:
-		print_week_view (pc, gcal, date, l, r, t, b);
+		print_week_view (pr, gcal, date, l, r, t, b);
 		break;
 	case PRINT_VIEW_MONTH:
-		print_month_view (pc, gcal, date, l, r, t, b);
+		print_month_view (pr, gcal, date, l, r, t, b);
 		break;
 	case PRINT_VIEW_YEAR:
-		print_year_view (pc, gcal, date, l, r, t, b);
+		print_year_view (pr, gcal, date, l, r, t, b);
 		break;
 	default:
 		g_assert_not_reached ();
 	}
 
+	evo_calendar_print_data_free (pr);
+
 	gnome_print_job_close (gpm);
 
 	if (preview) {
@@ -2606,7 +2622,7 @@
 {
 	GnomePrintConfig *print_config;
 	GnomePrintJob *gpm;
-	GnomePrintContext *pc;
+	EvoCalendarPrintRenderer *pr;
 	double l, r, t, b;
 
 	g_return_if_fail (comp != NULL);
@@ -2646,7 +2662,7 @@
 
 	gpm = gnome_print_job_new (print_config);
 
-	pc = gnome_print_job_get_context (gpm);
+	pr = evo_calendar_print_data_new (gnome_print_job_get_context (gpm));
 	gnome_print_config_get_page_size (print_config, &r, &t);
 
 	/* See top of source for an explanation of this */
@@ -2664,9 +2680,11 @@
 	t *= (1.0 - TEMP_MARGIN);
 	r *= (1.0 - TEMP_MARGIN);
 
-	print_comp_item (pc, comp, client, l, r, t, b);
+	print_comp_item (pr, comp, client, l, r, t, b);
 	gnome_print_job_close (gpm);
 
+	evo_calendar_print_data_free (pr);
+
 	if (preview) {
 		GtkWidget *gpmp;
 
@@ -2681,25 +2699,26 @@
 }
 
 static void
-print_title (GnomePrintContext *pc, const char *title,
+print_title (EvoCalendarPrintRenderer *pr, const char *title,
 	     double page_width, double page_height)
 {
-	GnomeFont *font;
+	PangoFontDescription *font;
 	double w, x, y;
 
-	font = gnome_font_find_closest ("Sans Bold", 18);
-
-	w = gnome_font_get_width_utf8 (font, title);
+	font = pango_font_description_from_string("Sans Bold 18");
+	pango_layout_set_font_description (pr->pl, font);
+	pango_layout_set_text (pr->pl, title, -1);
+	w = pango_layout_get_width (pr->pl)/(double)PANGO_SCALE;
+	y = page_height;
 
 	x = (page_width - w) / 2;
-	y = page_height - gnome_font_get_ascender (font);
 
-	gnome_print_moveto (pc, x, y);
-	gnome_print_setfont (pc, font);
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_show (pc, title);
+	gnome_print_moveto (pr->pc, x, y);
+	gnome_print_setrgbcolor (pr->pc, 0, 0, 0);
+
+	gnome_print_pango_layout (pr->pc, pr->pl);
 
-	g_object_unref (font);
+	pango_font_description_free (font);
 }
 
 void
@@ -2707,7 +2726,7 @@
 {
 	EPrintable *printable;
 	GnomePrintConfig *print_config;
-	GnomePrintContext *pc;
+	EvoCalendarPrintRenderer *pr;
 	GnomePrintJob *gpm;
 	double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
 
@@ -2751,7 +2770,7 @@
 
 	gpm = gnome_print_job_new (print_config);
 
-	pc = gnome_print_job_get_context (gpm);
+	pr = evo_calendar_print_data_new (gnome_print_job_get_context (gpm));
 
 	gnome_print_config_get_page_size (print_config, &r, &t);
 
@@ -2777,21 +2796,23 @@
 	bottom_margin = b;
 
 	do {
-		gnome_print_beginpage (pc, "Tasks");
-		gnome_print_gsave (pc);
+		gnome_print_beginpage (pr->pc, "Tasks");
+		gnome_print_gsave (pr->pc);
 
-		gnome_print_translate (pc, left_margin, bottom_margin);
+		gnome_print_translate (pr->pc, left_margin, bottom_margin);
 
-		print_title (pc, print_header, page_width, page_height);
+		print_title (pr, print_header, page_width, page_height);
 
 		if (e_printable_data_left (printable))
-			e_printable_print_page (printable, pc,
+			e_printable_print_page (printable, pr->pc,
 						page_width, page_height - 24, TRUE);
 
-		gnome_print_grestore (pc);
-		gnome_print_showpage (pc);
+		gnome_print_grestore (pr->pc);
+		gnome_print_showpage (pr->pc);
 	} while (e_printable_data_left (printable));
 
+	evo_calendar_print_data_free (pr);
+
 	gnome_print_job_close (gpm);
 
 	if (preview) {


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	31 Jan 2006 03:27:08 -0000	1.43
+++ .cvsignore	15 Feb 2006 05:27:03 -0000	1.44
@@ -1 +1 @@
-evolution-2.5.90.tar.bz2
+evolution-2.5.91.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- evolution.spec	11 Feb 2006 02:40:56 -0000	1.124
+++ evolution.spec	15 Feb 2006 05:27:03 -0000	1.125
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.90
-Release: 2.1
+Version: 2.5.91
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -57,7 +57,7 @@
 
 # patches sent upstream
 Patch100: evo-addressbook-print-with-pango-2.patch
-Patch101: evo-calendar-print-with-pango-6.patch
+Patch101: evo-calendar-print-with-pango-7.patch
 
 #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
@@ -99,7 +99,6 @@
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 Patch805: evolution-2.5.4-fix-missing-declarations.patch
 Patch806: evolution-2.5.5.1-notification-cleanups.patch
-Patch807: evolution-2.5.4-fix-nm-multiple-init.patch
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 
 Summary: GNOME's next-generation groupware suite
@@ -244,7 +243,6 @@
 %patch804 -p1 -b .fix-missing-declarations
 %patch805 -p1 -b .fix-missing-declarations-2-5-4
 %patch806 -p1 -b .notification-cleanups
-%patch807 -p1 -b .fix-nm-multiple-init
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 
 mkdir -p krb5-fakeprefix/include
@@ -562,6 +560,7 @@
 
 %{evo_plugin_dir}/org-gnome-mail-to-task.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-to-task.so
+%{evo_plugin_dir}/org-gnome-mail-to-task.xml
 
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
@@ -635,6 +634,12 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Feb 14 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
+- 2.5.91
+- updated patch 101 to track upstream changes to calendar printing code
+- remove uptreamed patch 807 (NM multiple initialization assertion)
+- readded the mail-to-task plugin XML UI file
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.90-2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	31 Jan 2006 03:27:08 -0000	1.43
+++ sources	15 Feb 2006 05:27:04 -0000	1.44
@@ -1 +1 @@
-02751eb28ad9b31402290ed4816e5321  evolution-2.5.90.tar.bz2
+cea13421ea95707e89c0311100714573  evolution-2.5.91.tar.bz2


--- evo-calendar-print-with-pango-6.patch DELETED ---


--- evolution-2.5.4-fix-nm-multiple-init.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:29:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:29:41 -0500
Subject: rpms/gedit/devel .cvsignore, 1.34, 1.35 gedit.spec, 1.73,
	1.74 sources, 1.36, 1.37
Message-ID: <200602150529.k1F5TfUl027912@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27822

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore	30 Jan 2006 20:35:54 -0000	1.34
+++ .cvsignore	15 Feb 2006 05:29:35 -0000	1.35
@@ -9,3 +9,4 @@
 gedit-2.13.3.tar.bz2
 gedit-2.13.4.tar.bz2
 gedit-2.13.90.tar.bz2
+gedit-2.13.91.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- gedit.spec	11 Feb 2006 02:51:27 -0000	1.73
+++ gedit.spec	15 Feb 2006 05:29:35 -0000	1.74
@@ -15,8 +15,8 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.13.90
-Release: 	3.1	
+Version: 	2.13.91
+Release: 	1	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.90-3.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	30 Jan 2006 20:35:54 -0000	1.36
+++ sources	15 Feb 2006 05:29:35 -0000	1.37
@@ -1 +1 @@
-62973491fe639ebf17ed0d11139ceb1b  gedit-2.13.90.tar.bz2
+34a6a189eab50e61f56daded62d691b0  gedit-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:38:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:38:48 -0500
Subject: rpms/evolution-connector/devel
	evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch,
	NONE, 1.1 .cvsignore, 1.26, 1.27 evolution-connector.spec,
	1.52, 1.53 sources, 1.26, 1.27
Message-ID: <200602150538.k1F5cmVE029623@cvs.devel.redhat.com>

Author: dmalcolm

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29531

Modified Files:
	.cvsignore evolution-connector.spec sources 
Added Files:
	evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch 
Log Message:
* Wed Feb 15 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
- 2.5.91
- fix missing declarations (patch 301)



evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch:
 camel-exchange-store.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch ---
--- evolution-exchange-2.5.91/camel/camel-exchange-store.c.fix-missing-declarations-2.5.91	2006-02-15 00:31:36.000000000 -0500
+++ evolution-exchange-2.5.91/camel/camel-exchange-store.c	2006-02-15 00:31:48.000000000 -0500
@@ -29,6 +29,7 @@
 
 #include "camel-exchange-store.h"
 #include "camel-exchange-folder.h"
+#include "camel-exchange-summary.h"
 #include <camel/camel-session.h>
 
 #define SUBFOLDER_DIR_NAME     "subfolders"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 Jan 2006 03:40:24 -0000	1.26
+++ .cvsignore	15 Feb 2006 05:38:45 -0000	1.27
@@ -1 +1 @@
-evolution-exchange-2.5.9.0.tar.bz2
+evolution-exchange-2.5.91.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- evolution-connector.spec	13 Feb 2006 18:39:23 -0000	1.52
+++ evolution-connector.spec	15 Feb 2006 05:38:45 -0000	1.53
@@ -6,8 +6,8 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.5.9.0
-Release: 2.2.1
+Version: 2.5.91
+Release: 1
 License: GPL
 Group: Applications/Productivity
 URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/
@@ -26,7 +26,7 @@
 
 # Other patches:
 Patch300: evolution-exchange-2.5.3-fix-marshaller.patch
-
+Patch301: evolution-exchange-2.5.91-fix-missing-declarations-2.5.91.patch
 BuildRequires: evolution >= %{evolution_version}
 BuildRequires: evolution-devel >= %{evolution_version}
 BuildRequires: evolution-data-server-devel
@@ -55,6 +55,7 @@
 
 # Other patches:
 %patch300 -p1 -b .fix-marshaller
+%patch301 -p1 -b .fix-missing-declarations-2.5.91
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration -DLDAP_DEPRECATED"; export CFLAGS
@@ -95,6 +96,10 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Feb 15 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
+- 2.5.91
+- fix missing declarations (patch 301)
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 2.5.9.0-2.2.1
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	31 Jan 2006 03:40:24 -0000	1.26
+++ sources	15 Feb 2006 05:38:45 -0000	1.27
@@ -1 +1 @@
-f4a0893159dad3603b33f2c99616a121  evolution-exchange-2.5.9.0.tar.bz2
+7a4ce9e2fd0db863258d30b0463e7414  evolution-exchange-2.5.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:42:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:42:51 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch,
	1.1, 1.2
Message-ID: <200602150542.k1F5gpM4031068@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch 
Log Message:
fix patch


gnome-panel-2.13.91-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   60 ++++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   38 ++
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 737 insertions(+), 14 deletions(-)

Index: gnome-panel-2.13.91-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.91-gpm-integration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:26:02 -0000	1.1
+++ gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:42:48 -0000	1.2
@@ -1,5 +1,5 @@
 --- gnome-panel-2.13.91/gnome-panel/Makefile.am.gpm-integration	2006-02-12 14:07:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:31:14.000000000 -0500
 @@ -116,6 +116,7 @@
  	panel-addto.c		\
  	panel-logout.c		\
@@ -16,8 +16,8 @@
  	$(EGG_RECENT_FILES_H)	\
  	$(NULL)
  
---- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:21:03.000000000 -0500
+--- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:31:14.000000000 -0500
 @@ -32,6 +32,7 @@
  
  #include "panel-logout.h"
@@ -114,8 +114,8 @@
  					       _("_Suspend"),
  					       PANEL_LOGOUT_RESPONSE_STD);
 --- gnome-panel-2.13.91/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:24:35.000000000 -0500
-@@ -47,10 +47,15 @@
++++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:42:37.000000000 -0500
+@@ -47,10 +47,16 @@
  #include "panel-lockdown.h"
  #include "panel-logout.h"
  #include "panel-compatibility.h"
@@ -125,13 +125,14 @@
  #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
  
 +static gboolean panel_action_can_suspend (void);
++static gboolean panel_action_logout_is_disabled (void);
 +static gboolean panel_action_suspend_is_disabled (void);
 +static void panel_action_suspend (GtkWidget *widget);
 +
  enum {
  	PROP_0,
  	PROP_ACTION_TYPE,
-@@ -77,6 +82,7 @@
+@@ -77,6 +83,7 @@
  	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
  	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
  	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
@@ -139,12 +140,12 @@
  	/* compatibility with GNOME < 2.13.90 */
  	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
  	{ 0,                           NULL             },
-@@ -158,6 +164,13 @@
+@@ -158,6 +165,13 @@
  			  gtk_get_current_event_time ());
  }
  
 +static gboolean
-+panel_action_shutdown_is_disabled (void)
++panel_action_logout_is_disabled (void)
 +{
 +  return panel_action_can_suspend () ||
 +	 panel_lockdown_get_disable_log_out ();
@@ -153,7 +154,7 @@
  static void
  panel_action_shutdown (GtkWidget *widget)
  {
-@@ -173,6 +186,39 @@
+@@ -173,6 +187,39 @@
  		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
  }
  
@@ -193,12 +194,12 @@
  /* Run Application
   */
  static void
-@@ -308,7 +354,17 @@
+@@ -308,7 +355,17 @@
  		"gospanel-20",
  		"ACTION:logout:NEW",
  		panel_action_logout, NULL, NULL,
 -		panel_lockdown_get_disable_log_out
-+                panel_action_shutdown_is_disabled
++                panel_action_logout_is_disabled
 +        },
 +        {
 +                PANEL_ACTION_SUSPEND,
@@ -212,7 +213,7 @@
  	},
  	{
  		PANEL_ACTION_RUN,
-@@ -861,6 +917,7 @@
+@@ -861,6 +918,7 @@
  		actions [button->priv->type].invoke_menu (button, callback_name);
  }
  
@@ -221,7 +222,7 @@
  panel_action_button_load_from_drag (PanelToplevel *toplevel,
  				    int            position,
 --- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:31:14.000000000 -0500
 @@ -0,0 +1,83 @@
 +/* panel-power-manager.h - functions for powering down, restarting, and
 + *                         suspending the computer
@@ -307,7 +308,7 @@
 +G_END_DECLS
 +#endif /* PANEL_POWER_MANAGER_H */
 --- gnome-panel-2.13.91/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:31:14.000000000 -0500
 @@ -96,6 +96,7 @@
  	PANEL_ACTION_FORCE_QUIT,
  	PANEL_ACTION_CONNECT_SERVER,
@@ -316,8 +317,8 @@
  	/* compatibility with GNOME < 2.13.90 */
          PANEL_ACTION_SCREENSHOT,
          PANEL_ACTION_LAST
---- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:21:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:21:03.000000000 -0500
+--- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:31:14.000000000 -0500
 @@ -49,6 +49,7 @@
  #include "panel-recent.h"
  #include "panel-stock-icons.h"
@@ -326,7 +327,26 @@
  
  #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
  #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -1011,8 +1012,21 @@
+@@ -633,9 +634,15 @@
+ 
+ 	add_menu_separator (places_menu);
+ 
+-	panel_menu_items_append_from_desktop (places_menu,
+-					      "gnome-search-tool.desktop",
+-					      NULL);
++        if (panel_is_program_in_path ("beagle-search")) {
++              panel_menu_items_append_from_desktop (places_menu,
++                                                    "gnome-beagle-search.desktop",
++                                                    NULL);
++        } else {
++              panel_menu_items_append_from_desktop (places_menu,
++                                                    "gnome-search-tool.desktop",
++                                                    NULL);
++        }
+ 
+ 	*recent_view = panel_recent_append_documents_menu (places_menu,
+ 							   *recent_view);
+@@ -1011,8 +1018,21 @@
  
  	menuitem->priv->append_lock_logout = append_lock_logout;
  	if (append_lock_logout)
@@ -350,7 +370,7 @@
  
  	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
  	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
-@@ -1118,6 +1132,14 @@
+@@ -1118,6 +1138,14 @@
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	}
  
@@ -366,7 +386,7 @@
  	if (item != NULL) {
  		if (!separator_inserted)
 --- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:31:14.000000000 -0500
 @@ -0,0 +1,533 @@
 +/* panel-power-manager.c - functions for powering down, restarting, and
 + *                         suspending the computer
@@ -902,7 +922,7 @@
 +}
 +#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
 --- gnome-panel-2.13.91/configure.in.gpm-integration	2006-02-13 13:30:38.000000000 -0500
-+++ gnome-panel-2.13.91/configure.in	2006-02-15 00:21:03.000000000 -0500
++++ gnome-panel-2.13.91/configure.in	2006-02-15 00:31:14.000000000 -0500
 @@ -58,10 +58,12 @@
  LIBECAL_REQUIRED=0.0.97
  LIBEDATASERVERUI_REQUIRED=1.2.0



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:46:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:46:44 -0500
Subject: rpms/gnome-utils/devel .cvsignore, 1.38, 1.39 gnome-utils.spec, 1.92,
	1.93 sources, 1.41, 1.42
Message-ID: <200602150546.k1F5kiP1012911@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
updates



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	12 Feb 2006 20:07:47 -0000	1.38
+++ .cvsignore	15 Feb 2006 05:46:42 -0000	1.39
@@ -7,3 +7,5 @@
 gnome-utils-2.13.91.tar.bz2
 gucharmap-1.5.1.tar.bz2
 gnome-utils-2.13.92.tar.bz2
+gcalctool-5.7.29.tar.bz2
+gucharmap-1.5.2.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- gnome-utils.spec	12 Feb 2006 20:14:28 -0000	1.92
+++ gnome-utils.spec	15 Feb 2006 05:46:42 -0000	1.93
@@ -11,8 +11,8 @@
 
 %define po_package gnome-utils-2.0
 
-%define gcalctool_version 5.7.28
-%define gucharmap_version 1.5.1
+%define gcalctool_version 5.7.29
+%define gucharmap_version 1.5.2
 %define zenity_version 2.13.90
 
 %define dbus_version 0.60
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.92
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -211,6 +211,10 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
+- Update to gucharmap 1.5.2
+- Update to gcalctool 5.7.29
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> 2.13.92-1
 - Update to gnome-utils 2.13.92
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	12 Feb 2006 20:07:47 -0000	1.41
+++ sources	15 Feb 2006 05:46:42 -0000	1.42
@@ -1,4 +1,4 @@
-8bb1ea99ed59184b2b49c192a80fc64d  gcalctool-5.7.28.tar.bz2
 a5f7d3d6524f7f2da0978541c74aa40b  zenity-2.13.90.tar.bz2
-7ae1df29812ac27379858ffc02cfc318  gucharmap-1.5.1.tar.bz2
 c2d1a341a5722d7fc4f8ed56248c5123  gnome-utils-2.13.92.tar.bz2
+f9d4cb8177abfbd17e53908bad65404e  gcalctool-5.7.29.tar.bz2
+a6b7578e887676aacee5cd48d84456d1  gucharmap-1.5.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:48:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:48:32 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch,
	1.2, 1.3
Message-ID: <200602150548.k1F5mWPs013920@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch 
Log Message:
patch fix


gnome-panel-2.13.91-gpm-integration.patch:
 configure.in                      |    4 
 gnome-panel/Makefile.am           |    2 
 gnome-panel/panel-action-button.c |   60 ++++
 gnome-panel/panel-enums.h         |    1 
 gnome-panel/panel-logout.c        |   30 +-
 gnome-panel/panel-menu-items.c    |   26 +
 gnome-panel/panel-power-manager.c |  533 ++++++++++++++++++++++++++++++++++++++
 gnome-panel/panel-power-manager.h |   83 +++++
 8 files changed, 728 insertions(+), 11 deletions(-)

Index: gnome-panel-2.13.91-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.91-gpm-integration.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:42:48 -0000	1.2
+++ gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:48:28 -0000	1.3
@@ -327,25 +327,6 @@
  
  #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
  #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -633,9 +634,15 @@
- 
- 	add_menu_separator (places_menu);
- 
--	panel_menu_items_append_from_desktop (places_menu,
--					      "gnome-search-tool.desktop",
--					      NULL);
-+        if (panel_is_program_in_path ("beagle-search")) {
-+              panel_menu_items_append_from_desktop (places_menu,
-+                                                    "gnome-beagle-search.desktop",
-+                                                    NULL);
-+        } else {
-+              panel_menu_items_append_from_desktop (places_menu,
-+                                                    "gnome-search-tool.desktop",
-+                                                    NULL);
-+        }
- 
- 	*recent_view = panel_recent_append_documents_menu (places_menu,
- 							   *recent_view);
 @@ -1011,8 +1018,21 @@
  
  	menuitem->priv->append_lock_logout = append_lock_logout;



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:52:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:52:10 -0500
Subject: rpms/file-roller/devel .cvsignore, 1.31, 1.32 file-roller.spec, 1.48,
	1.49 sources, 1.32, 1.33
Message-ID: <200602150552.k1F5qAbj015731@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15681

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Jan 2006 05:04:19 -0000	1.31
+++ .cvsignore	15 Feb 2006 05:52:08 -0000	1.32
@@ -17,3 +17,4 @@
 file-roller-2.13.3.tar.bz2
 file-roller-2.13.4.tar.bz2
 file-roller-2.13.90.tar.bz2
+file-roller-2.13.91.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- file-roller.spec	12 Feb 2006 17:06:44 -0000	1.48
+++ file-roller.spec	15 Feb 2006 05:52:08 -0000	1.49
@@ -9,8 +9,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
-Version:	2.13.90
-Release: 	2
+Version:	2.13.91
+Release: 	1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -105,6 +105,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 2.13.90-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	31 Jan 2006 05:04:19 -0000	1.32
+++ sources	15 Feb 2006 05:52:08 -0000	1.33
@@ -1 +1 @@
-1cb49e953060cf4b1cb9836e466aca17  file-roller-2.13.90.tar.bz2
+272802ba8186129f170e97f9b44061ae  file-roller-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 05:59:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 00:59:04 -0500
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.93,1.94
Message-ID: <200602150559.k1F5x4ZH018711@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
fix %%post



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-utils.spec	15 Feb 2006 05:46:42 -0000	1.93
+++ gnome-utils.spec	15 Feb 2006 05:58:57 -0000	1.94
@@ -177,10 +177,16 @@
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
+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
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
+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 all.lang
 %defattr(-, root, root)
@@ -199,6 +205,7 @@
 %{_datadir}/gdict-1.0
 %{_datadir}/gnome-dictionary
 %{_datadir}/gtk-doc/html/gdict
+%{_datadir}/icons/hicolor/48x48/apps/*
 %{_libdir}/pkgconfig/*
 %{_bindir}/*
 %{_libexecdir}/*



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:03:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:03:43 -0500
Subject: rpms/gthumb/devel .cvsignore, 1.18, 1.19 gthumb.spec, 1.32,
	1.33 sources, 1.18, 1.19
Message-ID: <200602150603.k1F63hJN019009@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18956

Modified Files:
	.cvsignore gthumb.spec sources 
Log Message:
2.7.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	5 Jan 2006 04:33:37 -0000	1.18
+++ .cvsignore	15 Feb 2006 06:03:08 -0000	1.19
@@ -9,3 +9,4 @@
 gthumb-2.6.8.tar.bz2
 gthumb-2.7.1.tar.bz2
 gthumb-2.7.2.tar.bz2
+gthumb-2.7.3.tar.bz2


Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gthumb.spec	11 Feb 2006 03:21:33 -0000	1.32
+++ gthumb.spec	15 Feb 2006 06:03:22 -0000	1.33
@@ -8,8 +8,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.7.2
-Release: 2.2
+Version: 2.7.3
+Release: 1
 URL: http://gthumb.sourceforge.net
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2
 License: GPL
@@ -92,6 +92,9 @@
 %{_datadir}/pixmaps
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.2-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Jan 2006 04:33:37 -0000	1.18
+++ sources	15 Feb 2006 06:03:22 -0000	1.19
@@ -1 +1 @@
-4a9db0c1087f71dfa7fdd80f0307c4a5  gthumb-2.7.2.tar.bz2
+3791412add993ad938f0fe4df021c88b  gthumb-2.7.3.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:08:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:08:18 -0500
Subject: rpms/control-center/devel .cvsignore, 1.36, 1.37 control-center.spec,
	1.126, 1.127 sources, 1.39, 1.40
Message-ID: <200602150608.k1F68I0T019808@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19740

Modified Files:
	.cvsignore control-center.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore	9 Feb 2006 04:57:41 -0000	1.36
+++ .cvsignore	15 Feb 2006 06:08:15 -0000	1.37
@@ -9,3 +9,4 @@
 control-center-2.13.90.tar.bz2
 control-center-2.12.3.tar.bz2
 control-center-2.13.91.tar.bz2
+control-center-2.13.92.tar.bz2


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- control-center.spec	11 Feb 2006 02:19:06 -0000	1.126
+++ control-center.spec	15 Feb 2006 06:08:15 -0000	1.127
@@ -20,8 +20,8 @@
 
 Summary: GNOME Control Center.
 Name: control-center
-Version: 2.13.91
-Release: 1.1
+Version: 2.13.92
+Release: 1
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -228,6 +228,9 @@
 # (also its headers)
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.91-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	9 Feb 2006 04:57:41 -0000	1.39
+++ sources	15 Feb 2006 06:08:15 -0000	1.40
@@ -1,2 +1,2 @@
 e8f57ec1852d08d421016732b605a615  control-center-2.12.3.tar.bz2
-205c4a6ace4747e4ffb9db44868e755d  control-center-2.13.91.tar.bz2
+eba22b935cfad8660a8ee1a4a0b1e47d  control-center-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:13:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:13:37 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.33,1.34
Message-ID: <200602150613.k1F6Dbqk022323@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22246

Modified Files:
	gthumb.spec 
Log Message:
Update requires



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gthumb.spec	15 Feb 2006 06:03:22 -0000	1.33
+++ gthumb.spec	15 Feb 2006 06:13:35 -0000	1.34
@@ -5,6 +5,7 @@
 %define desktop_file_utils_version 0.9
 %define libgnomeprint_version 2.6.0
 %define libgnomeprintui_version 2.6.0
+%define libgphoto_version 2.1.3
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
@@ -26,6 +27,7 @@
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libpng-devel
 BuildRequires: gettext
+BuildRequires: libgphoto2 >= %{libgphoto_version}
 
 # Needed or features are missing
 BuildRequires: gphoto2-devel
@@ -94,6 +96,7 @@
 %changelog
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.3-1
 - Update to 2.7.3
+- BuildRequire libgphoto2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.2-2.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:16:56 -0500
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.26,
	1.27 nautilus-cd-burner.spec, 1.47, 1.48 sources, 1.26, 1.27
Message-ID: <200602150616.k1F6GtYP003813@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2293

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 Jan 2006 04:27:40 -0000	1.26
+++ .cvsignore	15 Feb 2006 06:16:50 -0000	1.27
@@ -17,3 +17,4 @@
 nautilus-cd-burner-2.13.4.tar.bz2
 nautilus-cd-burner-2.13.5.tar.bz2
 nautilus-cd-burner-2.13.90.tar.bz2
+nautilus-cd-burner-2.13.91.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nautilus-cd-burner.spec	11 Feb 2006 04:42:14 -0000	1.47
+++ nautilus-cd-burner.spec	15 Feb 2006 06:16:50 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.13.90
-Release: 1.2
+Version: 2.13.91
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	31 Jan 2006 04:27:40 -0000	1.26
+++ sources	15 Feb 2006 06:16:50 -0000	1.27
@@ -1 +1 @@
-081beaac05a88f6d2079de9c1ef898f6  nautilus-cd-burner-2.13.90.tar.bz2
+ce3a04bee9dc21730bc03c7c7359b322  nautilus-cd-burner-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:17:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:17:51 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.34,1.35
Message-ID: <200602150617.k1F6HpU4004226@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4175

Modified Files:
	gthumb.spec 
Log Message:
Fix fix



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gthumb.spec	15 Feb 2006 06:13:35 -0000	1.34
+++ gthumb.spec	15 Feb 2006 06:17:49 -0000	1.35
@@ -5,7 +5,7 @@
 %define desktop_file_utils_version 0.9
 %define libgnomeprint_version 2.6.0
 %define libgnomeprintui_version 2.6.0
-%define libgphoto_version 2.1.3
+%define gphoto_version 2.1.3
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
@@ -27,7 +27,7 @@
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libpng-devel
 BuildRequires: gettext
-BuildRequires: libgphoto2 >= %{libgphoto_version}
+BuildRequires: gphoto2-devel >= %{libgphoto_version}
 
 # Needed or features are missing
 BuildRequires: gphoto2-devel



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:23:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:23:31 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.35,1.36
Message-ID: <200602150623.k1F6NVkH006866@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6814

Modified Files:
	gthumb.spec 
Log Message:
fix build



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gthumb.spec	15 Feb 2006 06:17:49 -0000	1.35
+++ gthumb.spec	15 Feb 2006 06:23:27 -0000	1.36
@@ -27,7 +27,7 @@
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libpng-devel
 BuildRequires: gettext
-BuildRequires: gphoto2-devel >= %{libgphoto_version}
+BuildRequires: gphoto2-devel >= %{gphoto_version}
 
 # Needed or features are missing
 BuildRequires: gphoto2-devel
@@ -45,7 +45,10 @@
 
 %build
 
-%configure
+%ifarch s390 s390x
+%define ghoto_flags --disable-gphoto2
+%endif
+%configure %{gphoto_flags}
 make
 
 %install



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:24:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:24:58 -0500
Subject: rpms/gnome-media/devel .cvsignore, 1.25, 1.26 gnome-media.spec, 1.59,
	1.60 sources, 1.25, 1.26
Message-ID: <200602150624.k1F6OwqU007585@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	31 Jan 2006 03:18:02 -0000	1.25
+++ .cvsignore	15 Feb 2006 06:24:54 -0000	1.26
@@ -3,3 +3,4 @@
 gnome-media-2.13.5.tar.bz2
 gnome-media-2.13.7.tar.bz2
 gnome-media-2.13.91.tar.bz2
+gnome-media-2.13.92.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-media.spec	11 Feb 2006 03:14:31 -0000	1.59
+++ gnome-media.spec	15 Feb 2006 06:24:54 -0000	1.60
@@ -10,8 +10,8 @@
 
 Summary:        GNOME media programs.
 Name:           gnome-media
-Version:        2.13.91
-Release:        2.2
+Version:        2.13.92
+Release:        1
 License:        GPL
 Group:          Applications/Multimedia
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.91-2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	31 Jan 2006 03:18:02 -0000	1.25
+++ sources	15 Feb 2006 06:24:54 -0000	1.26
@@ -1 +1 @@
-cb39341ac416a7844f8059fc6a6a8511  gnome-media-2.13.91.tar.bz2
+faa1f6e68b49b37e2b8b075bd74f03c7  gnome-media-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:31:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:31:41 -0500
Subject: rpms/gthumb/devel gthumb.spec,1.36,1.37
Message-ID: <200602150631.k1F6Vf9K009510@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gthumb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9479

Modified Files:
	gthumb.spec 
Log Message:
fix fix



Index: gthumb.spec
===================================================================
RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gthumb.spec	15 Feb 2006 06:23:27 -0000	1.36
+++ gthumb.spec	15 Feb 2006 06:31:29 -0000	1.37
@@ -46,7 +46,7 @@
 %build
 
 %ifarch s390 s390x
-%define ghoto_flags --disable-gphoto2
+%define gphoto_flags --disable-gphoto2
 %endif
 %configure %{gphoto_flags}
 make



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:35:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:35:40 -0500
Subject: rpms/eog/devel .cvsignore, 1.25, 1.26 eog.spec, 1.40, 1.41 sources,
	1.25, 1.26
Message-ID: <200602150635.k1F6Zeqn009945@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9890

Modified Files:
	.cvsignore eog.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	30 Jan 2006 20:33:18 -0000	1.25
+++ .cvsignore	15 Feb 2006 06:35:37 -0000	1.26
@@ -12,3 +12,4 @@
 eog-2.13.4.tar.bz2
 eog-2.13.5.tar.bz2
 eog-2.13.90.tar.bz2
+eog-2.13.91.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- eog.spec	13 Feb 2006 15:48:07 -0000	1.40
+++ eog.spec	15 Feb 2006 06:35:37 -0000	1.41
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.13.90
-Release: 2
+Version: 2.13.91
+Release: 1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -97,6 +97,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-2
 - Append NoDisplay=true to the right file
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	30 Jan 2006 20:33:19 -0000	1.25
+++ sources	15 Feb 2006 06:35:37 -0000	1.26
@@ -1 +1 @@
-26fd268929bdb96d1d669ee361db496f  eog-2.13.90.tar.bz2
+ced2bda133914373bc41827765227363  eog-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:40:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:40:07 -0500
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.13.91-lock-dialog.patch, NONE,
	1.1 .cvsignore, 1.14, 1.15 gnome-screensaver.spec, 1.56,
	1.57 sources, 1.16, 1.17
Message-ID: <200602150640.k1F6e7Qp011992@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Added Files:
	gnome-screensaver-2.13.91-lock-dialog.patch 
Log Message:
fix patch


gnome-screensaver-2.13.91-lock-dialog.patch:
 configure           |    4 -
 configure.ac        |    1 
 src/gs-job.c        |    1 
 src/gs-lock-plug.c  |  130 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/gs-manager.c    |    2 
 src/gs-window-x11.c |    1 
 6 files changed, 134 insertions(+), 5 deletions(-)

--- NEW FILE gnome-screensaver-2.13.91-lock-dialog.patch ---
--- gnome-screensaver-2.13.91/src/gs-lock-plug.c.lock-dialog	2006-02-14 14:41:02.000000000 -0500
+++ gnome-screensaver-2.13.91/src/gs-lock-plug.c	2006-02-15 01:39:07.000000000 -0500
@@ -36,6 +36,7 @@
 #include <gdk/gdkx.h>
 #include <X11/XKBlib.h>
 #include <gtk/gtk.h>
+#include <glade/glade-xml.h>
 
 /* for fast user switching */
 #include <libgnomevfs/gnome-vfs-init.h>
@@ -184,6 +185,9 @@
 
         plug = GS_LOCK_PLUG (widget);
 
+        if (!plug->vbox)
+                return;
+
         gtk_container_set_border_width (GTK_CONTAINER (plug->vbox), 24);
         gtk_box_set_spacing (GTK_BOX (plug->vbox), 12);
 
@@ -271,7 +275,8 @@
 set_status_text (GSLockPlug *plug,
                  const char *text)
 {
-        gtk_label_set_text (GTK_LABEL (plug->priv->status_label), text);
+        if (plug->priv->status_label)
+                gtk_label_set_text (GTK_LABEL (plug->priv->status_label), text);
 }
 
 static void
@@ -344,7 +349,10 @@
         }
 
         if (response_id == GS_LOCK_PLUG_RESPONSE_OK) {
-                gint current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (plug->priv->notebook));
+                gint current_page = AUTH_PAGE;
+
+                if (plug->priv->notebook)
+                        current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (plug->priv->notebook));
 
                 if (current_page == AUTH_PAGE) {
                         set_dialog_sensitive (plug, FALSE);
@@ -415,6 +423,9 @@
 
         plug->priv->caps_lock_on = is_on;
 
+        if (!plug->priv->capslock_label)
+	        return;
+
         if (is_on) {
                 gtk_label_set_text (GTK_LABEL (plug->priv->capslock_label),
                                     _("You have the Caps Lock key on."));
@@ -483,6 +494,7 @@
 gs_lock_plug_size_request (GtkWidget      *widget,
                            GtkRequisition *requisition)
 {
+        GSLockPlug *plug = GS_LOCK_PLUG (widget);
         int mod_width;
         int mod_height;
 
@@ -490,6 +502,10 @@
                 GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
         }
 
+        /* don't constrain size when themed */
+        if (plug->vbox == NULL)
+               return;
+
         mod_width = requisition->height * 1.3;
         mod_height = requisition->width / 1.6;
         if (requisition->width < mod_width) {
@@ -499,7 +515,6 @@
                 /* if the dialog is wide fill out the height */
                 requisition->height = mod_height;
         }
-
 }
 
 static void
@@ -515,6 +530,9 @@
         plug->priv->logout_enabled = logout_enabled;
         g_object_notify (G_OBJECT (plug), "logout-enabled");
 
+        if (!plug->priv->logout_button)
+                return;
+
         if (logout_enabled) {
                 gtk_widget_show (plug->priv->logout_button);
         } else {
@@ -1644,6 +1662,105 @@
         profile_end ("end", "buttons");
 }
 
+
+static void
+unlock_button_clicked (GtkButton  *button,
+                       GSLockPlug *plug)
+{
+        gs_lock_plug_response (plug, GS_LOCK_PLUG_RESPONSE_OK);
+}
+
+static void
+cancel_button_clicked (GtkButton  *button,
+                       GSLockPlug *plug)
+{
+        gs_lock_plug_response (plug, GS_LOCK_PLUG_RESPONSE_CANCEL);
+}
+
+static gboolean
+load_theme (GSLockPlug *plug)
+{
+        const gchar *theme;
+        gchar *glade;
+        gchar *rc;
+        GladeXML *xml;
+        GtkWidget *lock_dialog;
+        GtkWidget *unlock_button;
+        const gchar themedir[] = "/usr/share/gnome-screensaver/themes/";
+        gchar *str;
+
+        theme = g_getenv ("GNOME_SCREENSAVER_THEME");
+
+        if (!theme)
+                return FALSE;
+        
+	/* FIXME use prefix here */
+        glade = g_strconcat (themedir, theme, "-lock-dialog.glade", NULL);
+        if (!g_file_test (glade, G_FILE_TEST_IS_REGULAR)) {
+                g_free (glade);
+                return FALSE;
+        }
+
+        rc = g_strconcat (themedir, theme, "-lock-dialog.gtkrc", NULL);
+        if (g_file_test (rc, G_FILE_TEST_IS_REGULAR))
+                gtk_rc_parse (rc);
+        g_free (rc);
+        
+        xml = glade_xml_new (glade, "lock-dialog", NULL);
+
+        if (!xml) {
+                g_warning ("Failed to load '%s'\n", glade);
+                g_free (glade);
+                return FALSE;
+        }
+        g_free (glade);
+
+        lock_dialog = glade_xml_get_widget (xml, "lock-dialog");
+        gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
+        gtk_widget_show_all (lock_dialog);
+
+        plug->vbox = NULL;
+        plug->action_area = glade_xml_get_widget (xml, "action-area");
+        plug->priv->notebook = NULL;
+        plug->priv->username_label = glade_xml_get_widget (xml, "username-label");
+        plug->priv->password_entry = glade_xml_get_widget (xml, "password-entry");
+        plug->priv->password_entry = glade_xml_get_widget (xml, "password-entry");
+        plug->priv->capslock_label = glade_xml_get_widget (xml, "capslock-label");
+        plug->priv->status_label = glade_xml_get_widget (xml, "status-label");
+        plug->priv->user_treeview = NULL;
+        plug->priv->ok_button = NULL;
+        plug->priv->cancel_button = glade_xml_get_widget (xml, "cancel-button");
+        plug->priv->logout_button = glade_xml_get_widget (xml, "logout-button");
+        plug->priv->switch_button = NULL;
+        unlock_button = glade_xml_get_widget (xml, "unlock-button");
+	gtk_widget_grab_default (unlock_button);
+
+        /* FIXME should let the theme determine the font size */
+	str = g_strdup_printf ("<big><big><big><big><big>%s</big></big></big></big></big>", g_get_user_name ());
+        gtk_label_set_markup (GTK_LABEL (plug->priv->username_label), str);
+        g_free (str);
+
+        plug->priv->timeout = DIALOG_TIMEOUT_MSEC;
+
+        g_signal_connect (plug->priv->password_entry, "button_press_event",
+                          G_CALLBACK (entry_button_press), NULL);
+
+        g_signal_connect (plug->priv->password_entry, "key_press_event",
+                          G_CALLBACK (entry_key_press), plug);
+
+        g_signal_connect (unlock_button, "clicked",
+                          G_CALLBACK (unlock_button_clicked), plug);
+
+        g_signal_connect (plug->priv->cancel_button, "clicked",
+                          G_CALLBACK (cancel_button_clicked), plug);
+
+        if (plug->priv->logout_button)
+                g_signal_connect (plug->priv->logout_button, "clicked",
+                                  G_CALLBACK (logout_button_clicked), plug);
+
+        return TRUE;
+}
+
 static void
 gs_lock_plug_init (GSLockPlug *plug)
 {
@@ -1653,6 +1770,13 @@
 
         plug->priv->fusa_manager = NULL;
 
+        if (load_theme (plug)) {
+
+                profile_end ("end", NULL);
+                
+                return;
+        }
+
         /* Dialog emulation */
 
         plug->vbox = gtk_vbox_new (FALSE, 0);
--- gnome-screensaver-2.13.91/src/gs-manager.c.lock-dialog	2006-02-13 18:18:25.000000000 -0500
+++ gnome-screensaver-2.13.91/src/gs-manager.c	2006-02-15 01:27:36.000000000 -0500
@@ -907,6 +907,8 @@
         job = gs_job_new_for_widget (GTK_WIDGET (window));
 
         theme = select_theme (manager);
+	/* FIXME: quick hack using an env var to communicate */
+        g_setenv ("GNOME_SCREENSAVER_THEME", theme, TRUE);
         gs_job_set_theme (job, theme, NULL);
 
         manager_add_job_for_window (manager, window, job);
--- gnome-screensaver-2.13.91/src/gs-job.c.lock-dialog	2006-02-13 15:56:04.000000000 -0500
+++ gnome-screensaver-2.13.91/src/gs-job.c	2006-02-15 01:27:36.000000000 -0500
@@ -571,6 +571,7 @@
                 "XAUTHORITY",
                 "XAUTHLOCALHOSTNAME",
                 "LANG",
+		"GNOME_SCREENSAVER_THEME",
                 "LANGUAGE"
         };
 
--- gnome-screensaver-2.13.91/src/gs-window-x11.c.lock-dialog	2006-02-10 17:46:37.000000000 -0500
+++ gnome-screensaver-2.13.91/src/gs-window-x11.c	2006-02-15 01:27:36.000000000 -0500
@@ -559,6 +559,7 @@
                 "XAUTHORITY",
                 "XAUTHLOCALHOSTNAME",
                 "LANG",
+		"GNOME_SCREENSAVER_THEME",
                 "LANGUAGE"
         };
 
--- gnome-screensaver-2.13.91/configure.lock-dialog	2006-01-31 16:27:31.000000000 -0500
+++ gnome-screensaver-2.13.91/configure	2006-02-15 01:27:36.000000000 -0500
@@ -23697,7 +23697,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_SCREENSAVER_DIALOG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_GNOME_SCREENSAVER_DIALOG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION libglade-2.0 >= $GLADE_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -23711,7 +23711,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_SCREENSAVER_DIALOG_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_GNOME_SCREENSAVER_DIALOG_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION libglade-2.0 >= $GLADE_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
--- gnome-screensaver-2.13.91/configure.ac.lock-dialog	2006-01-30 14:51:10.000000000 -0500
+++ gnome-screensaver-2.13.91/configure.ac	2006-02-15 01:27:36.000000000 -0500
@@ -60,6 +60,7 @@
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
 
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
+        libglade-2.0 >= $GLADE_REQUIRED_VERSION
         gtk+-2.0 >= $GTK_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_DIALOG_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	31 Jan 2006 04:44:30 -0000	1.14
+++ .cvsignore	15 Feb 2006 06:40:04 -0000	1.15
@@ -5,3 +5,4 @@
 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


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-screensaver.spec	14 Feb 2006 05:46:26 -0000	1.56
+++ gnome-screensaver.spec	15 Feb 2006 06:40:04 -0000	1.57
@@ -13,8 +13,8 @@
 
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
-Version: 2.13.90
-Release: 5
+Version: 2.13.91
+Release: 1
 License: GPL
 Group: Amusement/Graphics
 Source0: %{name}-%{version}.tar.bz2
@@ -24,7 +24,7 @@
 Source4: fedoralogo-floaters.desktop
 Source5: gnome-logo-white.svg
 
-Patch0: gnome-screensaver-2.13.90-lock-dialog.patch
+Patch0: gnome-screensaver-2.13.91-lock-dialog.patch
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
 Patch2: gnome-screensaver-2.13.90-shrink-em.patch
 
@@ -161,6 +161,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.90-4
 - migrate xscreensaver screensavers in %%post as well as the
   triggers already there (bug 180984)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	31 Jan 2006 04:44:30 -0000	1.16
+++ sources	15 Feb 2006 06:40:04 -0000	1.17
@@ -1,2 +1,2 @@
 661b1551a16e6aa948248b2443bad117  fedoralogo-floaters-lock-dialog.tar.gz
-8ff40bd9914a6272d6a9ace15edea207  gnome-screensaver-2.13.90.tar.bz2
+8e0658fb0a5d6aa443ffb3713d05b7a9  gnome-screensaver-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:44:50 -0500
Subject: rpms/gnome-screensaver/devel
	gnome-screensaver-2.13.91-shrink-em.patch, NONE,
	1.1 gnome-screensaver.spec, 1.57, 1.58
Message-ID: <200602150644.k1F6ioLU014186@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.13.91-shrink-em.patch 
Log Message:
fix patches


gnome-screensaver-2.13.91-shrink-em.patch:
 floaters.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-screensaver-2.13.91-shrink-em.patch ---
--- gnome-screensaver-2.13.91/savers/floaters.c.shrink-em	2006-02-14 11:29:48.000000000 -0500
+++ gnome-screensaver-2.13.91/savers/floaters.c	2006-02-15 01:43:30.000000000 -0500
@@ -54,7 +54,7 @@
 #define FLOATER_MIN_SIZE (16.0)
 #endif
 #ifndef FLOATER_DEFAULT_COUNT
-#define FLOATER_DEFAULT_COUNT (9)
+#define FLOATER_DEFAULT_COUNT (5)
 #endif
 
 #ifndef SMALL_ANGLE
@@ -984,7 +984,7 @@
   for (tmp = screen_saver->floaters; tmp != NULL; tmp = tmp->next)
     {
       ScreenSaverFloater *floater;
-#ifdef CULL_FLOATERS
+#ifdef CULL_FLOATERS || 1
       GdkRectangle rect;
       gint size;
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-screensaver.spec	15 Feb 2006 06:40:04 -0000	1.57
+++ gnome-screensaver.spec	15 Feb 2006 06:44:47 -0000	1.58
@@ -26,7 +26,7 @@
 
 Patch0: gnome-screensaver-2.13.91-lock-dialog.patch
 Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch
-Patch2: gnome-screensaver-2.13.90-shrink-em.patch
+Patch2: gnome-screensaver-2.13.91-shrink-em.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 URL: http://www.gnome.org



From fedora-cvs-commits at redhat.com  Wed Feb 15 06:53:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 01:53:42 -0500
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.25,
	1.26 gnome-icon-theme.spec, 1.39, 1.40 sources, 1.27, 1.28
Message-ID: <200602150653.k1F6rgn8021298@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21283

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
Add small epiphany icon



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	12 Feb 2006 06:11:16 -0000	1.25
+++ .cvsignore	15 Feb 2006 06:53:39 -0000	1.26
@@ -1 +1,2 @@
 gnome-icon-theme-2.14.0.tar.bz2
+web-browser.png


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnome-icon-theme.spec	12 Feb 2006 06:11:16 -0000	1.39
+++ gnome-icon-theme.spec	15 Feb 2006 06:53:40 -0000	1.40
@@ -1,8 +1,10 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.14.0
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
+# missing 24x24 version of epiphany icon
+Source1: web-browser.png
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -24,11 +26,13 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+cp %{SOURCE1} $RPM_BUILD_ROOT/usr/share/icons/gnome/24x24/apps
+
 ## remove these bogus files
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
 
-for i in 48x48 24x24; do 
 ## create symlinks so the all icon themes know some extra icons we've added
+for i in 48x48 24x24; do 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
 cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
 
@@ -66,6 +70,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-2
+- Add small epiphany icon (again!!)
+
 * Sun Feb 12 2006 Ray Strode <rstrode at redhat.com> 2.14.0-1
 - Update to 2.14.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	12 Feb 2006 06:11:16 -0000	1.27
+++ sources	15 Feb 2006 06:53:40 -0000	1.28
@@ -1 +1,2 @@
 4eb273a0d51acc0340fcfc59a9214553  gnome-icon-theme-2.14.0.tar.bz2
+88a5d07c629eaaa366d2a19ec07df4d4  web-browser.png



From fedora-cvs-commits at redhat.com  Wed Feb 15 07:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 02:14:15 -0500
Subject: rpms/nss/devel nss-bug180726.patch,NONE,1.1 nss.spec,1.9,1.10
Message-ID: <200602150714.k1F7EFAo021571@cvs.devel.redhat.com>

Author: kengert

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21556

Modified Files:
	nss.spec 
Added Files:
	nss-bug180726.patch 
Log Message:
fix bug 180726


nss-bug180726.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nss-bug180726.patch ---
--- mozilla/security/nss/lib/freebl/Makefile.fix180726	2006-02-15 07:19:21.000000000 +0100
+++ mozilla/security/nss/lib/freebl/Makefile	2006-02-15 07:19:25.000000000 +0100
@@ -134,7 +134,7 @@
 ifeq ($(OS_TARGET),Linux)
 ifeq ($(CPU_ARCH),x86_64)
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
-    ASFLAGS += -march=opteron -m64 -fPIC
+    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
     DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
     DEFINES += -DNSS_USE_COMBA
     MPI_SRCS += mpi_amd64.c mp_comba.c


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nss.spec	11 Feb 2006 04:47:28 -0000	1.9
+++ nss.spec	15 Feb 2006 07:14:13 -0000	1.10
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11
-Release:          3.2
+Release:          4
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -20,6 +20,7 @@
 Source2:          nss-config.in
 
 Patch1:           nss-3.11-zdefs.patch
+Patch2:           nss-bug180726.patch
 
 
 %description
@@ -71,6 +72,7 @@
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p0
 
 %build
 
@@ -308,6 +310,9 @@
 
 
 %changelog
+* Wed Feb 15 2006 Kai Engert <kengert at redhat.com> - 3.11-4
+- add --noexecstack when compiling assembler on x86_64
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.11-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 08:22:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 03:22:33 -0500
Subject: rpms/netpbm/FC-4 netpbm-10.31-xwdfix.patch, NONE, 1.1 netpbm.spec,
	1.42, 1.43
Message-ID: <200602150822.k1F8MXrO023368@cvs.devel.redhat.com>

Author: jnovy

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

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.31-xwdfix.patch 
Log Message:
* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4.2
- make xwdtopnm work on x86_64 (#181001)


netpbm-10.31-xwdfix.patch:
 xwdtopnm.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-10.31-xwdfix.patch ---
--- netpbm-10.31/converter/other/xwdtopnm.c.xwdfix	2006-02-14 15:13:58.000000000 +0100
+++ netpbm-10.31/converter/other/xwdtopnm.c	2006-02-14 15:15:37.000000000 +0100
@@ -985,7 +985,7 @@ getpix(pixelReader * const rdrP) {
             unsigned long const bitsToTakeMask = lsbmask[nBitsToTake];
                 /* E.g. if nbitsToTake is 4, this is 0x0000000F */
 
-            unsigned long bitsToTake;
+            unsigned int bitsToTake;
 
             assert(nBitsToTake <= 32);
             


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- netpbm.spec	10 Feb 2006 12:44:49 -0000	1.42
+++ netpbm.spec	15 Feb 2006 08:22:30 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 1.FC4.1
+Release: 1.FC4.2
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -20,6 +20,7 @@
 Patch10: netpbm-10.28-CAN-2005-2471.patch
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
+Patch13: netpbm-10.31-xwdfix.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
 Obsoletes: libgr
@@ -76,6 +77,7 @@
 %patch10 -p1 -b .CAN-2005-2471
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
+%patch13 -p1 -b .xwdfix
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -173,6 +175,9 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4.2
+- make xwdtopnm work on x86_64 (#181001)
+
 * Fri Feb 10 2006 Jindrich Novy <jnovy at redhat.com> 10.31-1.FC4.1
 - fix segfault caused by usage of uninitialized variables while
   parsing cmdline arguments in pnmtopng (#179645)



From fedora-cvs-commits at redhat.com  Wed Feb 15 08:31:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 03:31:17 -0500
Subject: rpms/openoffice.org/devel
 openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch, NONE,
 1.1 openoffice.org-2.0.2.ooo62030.solenv._version.patch, NONE,
 1.1 workspace.systemjava.patch, NONE, 1.1 workspace.targetedaot.patch, NONE,
 1.1 .cvsignore, 1.95,
 1.96 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.2,
 1.3 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.4,
 1.5 openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.9,
 1.10 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.4,
 1.5 openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.2,
 1.3 openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch, 1.5,
 1.6 openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch, 1.3,
 1.4 openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch, 1.5,
 1.6 openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch, 1.5,
 1.6 openoffice.org.spec, 1.619, 1.620 sources, 1.152,
 1.153 workspace.atkbridge.patch, 1.5, 1.6 workspace.dmake43p01.patch, 1.8,
 1.9 workspace.jaxpapi.patch, 1.7, 1.8 !
 openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch, 1.1,
 NONE openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.21,
 NONE openoffice.org-1.9.122.oooXXXXX.systemxalan.patch, 1.4,
 NONE openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch, 1.1,
 NONE openoffice.org-1.9.125.ooo54586.nfslock.sal.patch, 1.2,
 NONE openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch, 1.10,
 NONE openoffice.org-1.9.88.NONE.gcc3gcj4.patch, 1.6,
 NONE openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch, 1.1,
 NONE openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch, 1.3,
 NONE openoffice.org-2.0.1.ooo58798.parallel.patch, 1.1,
 NONE openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch, 1.2,
 NONE openoffice.org-2.0.1.ooo59537.config_office.nss.patch, 1.1,
 NONE openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch, 1.1,
 NONE openoffice.org-2.0.2.ooo61178.ucb.neon25.patch, 1.1,
 NONE workspace.cmcfixes20.patch, 1.2, NONE workspace.cmcfixes21.patch, 1.4,
 NONE workspace.cmcfixes22.patch, 1.1, NONE workspace.cmcfi!
 xes23.patch,1.2,NONE workspace.dbwizardpp1.patch,1.1,NONE work!
 space.ep
Message-ID: <200602150831.k1F8VHYv026369@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26306

Modified Files:
	.cvsignore openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
	openoffice.org-1.9.129.ooo54603.fontconfig.patch 
	openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 
	openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch 
	openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch 
	openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch 
	openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch 
	openoffice.org.spec sources workspace.atkbridge.patch 
	workspace.dmake43p01.patch workspace.jaxpapi.patch 
Added Files:
	openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch 
	openoffice.org-2.0.2.ooo62030.solenv._version.patch 
	workspace.systemjava.patch workspace.targetedaot.patch 
Removed Files:
	openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch 
	openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 
	openoffice.org-1.9.122.oooXXXXX.systemxalan.patch 
	openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch 
	openoffice.org-1.9.125.ooo54586.nfslock.sal.patch 
	openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch 
	openoffice.org-1.9.88.NONE.gcc3gcj4.patch 
	openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch 
	openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch 
	openoffice.org-2.0.1.ooo58798.parallel.patch 
	openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 
	openoffice.org-2.0.1.ooo59537.config_office.nss.patch 
	openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch 
	openoffice.org-2.0.2.ooo61178.ucb.neon25.patch 
	workspace.cmcfixes20.patch workspace.cmcfixes21.patch 
	workspace.cmcfixes22.patch workspace.cmcfixes23.patch 
	workspace.dbwizardpp1.patch workspace.epspreview.patch 
	workspace.hroloader.patch workspace.sb41.patch 
	workspace.systemagg.patch 
Log Message:
2.0.2

openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch:
 inc/outfont.hxx                            |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   19 ++++++++++++++
 psprint/source/fontmanager/fontconfig.cxx  |   33 +++++++++++++++++++++++++
 psprint/source/fontmanager/fontmanager.cxx |    6 +++-
 source/gdi/pdfwriter_impl.cxx              |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/pspgraphics.cxx             |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |   28 ++++++++++++---------
 vcl/inc/vclenum.hxx                        |   14 ++++++++++
 vcl/source/gdi/pdfwriter_impl.cxx          |    4 +++
 vcl/source/glyphs/gcach_ftyp.cxx           |   37 ++++++++++++++++++-----------
 vcl/source/glyphs/gcach_ftyp.hxx           |    7 ++++-
 vcl/unx/source/gdi/pspgraphics.cxx         |   26 ++++++++++++++++++++
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +++
 vcl/win/source/gdi/salgdi3.cxx             |   10 +++++++
 win/source/gdi/salgdi3.cxx                 |    0 
 19 files changed, 157 insertions(+), 31 deletions(-)

--- NEW FILE openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch ---
Index: inc/outfont.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/outfont.hxx,v
retrieving revision 1.19
diff -u -r1.19 outfont.hxx
--- openoffice.org.orig/vcl/inc/outfont.hxx	17 Oct 2005 14:49:15 -0000	1.19
+++ openoffice.org/vcl/inc/outfont.hxx	7 Feb 2006 10:12:22 -0000
@@ -112,20 +112,24 @@
 class ImplDevFontAttributes : public ImplFontAttributes
 {
 public: // TODO: create matching interface class
-    const String&   GetAliasNames() const   { return maMapNames; }
-    int             GetQuality() const      { return mnQuality; }
-    bool            IsRotatable() const     { return mbOrientation; }
-    bool            IsDeviceFont() const    { return mbDevice; }
-    bool            IsEmbeddable() const    { return mbEmbeddable; }
-    bool            IsSubsettable() const   { return mbSubsettable; }
+    const String&      GetAliasNames() const     { return maMapNames; }
+    int                GetQuality() const        { return mnQuality; }
+    bool               IsRotatable() const       { return mbOrientation; }
+    bool               IsDeviceFont() const      { return mbDevice; }
+    bool               IsEmbeddable() const      { return mbEmbeddable; }
+    bool               IsSubsettable() const     { return mbSubsettable; }
+    FontEmbeddedBitmap UseEmbeddedBitmap() const { return meEmbeddedBitmap; }
+    FontAntiAlias      UseAntiAlias() const      { return meAntiAlias; }
 
 public: // TODO: hide members behind accessor methods
-    String          maMapNames;     // List of family name aliass separated with ';'
-    int             mnQuality;      // Quality (used when similar fonts compete)
-    bool            mbOrientation;  // true: physical font can be rotated
-    bool            mbDevice;       // true: built in font
-    bool            mbSubsettable;  // true: a subset of the font can be created
-    bool            mbEmbeddable;   // true: the font can be embedded
+    String             maMapNames;       // List of family name aliass separated with ';'
+    int                mnQuality;        // Quality (used when similar fonts compete)
+    bool               mbOrientation;    // true: physical font can be rotated
+    bool               mbDevice;         // true: built in font
+    bool               mbSubsettable;    // true: a subset of the font can be created
+    bool               mbEmbeddable;     // true: the font can be embedded
+    FontEmbeddedBitmap meEmbeddedBitmap; // whether the embedded bitmaps should be used
+    FontAntiAlias      meAntiAlias;      // whether the font should be antialiased
 };
 
 // ----------------
Index: inc/vclenum.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/vclenum.hxx,v
retrieving revision 1.6
diff -u -r1.6 vclenum.hxx
--- openoffice.org.orig/vcl/inc/vclenum.hxx	9 Sep 2005 11:34:53 -0000	1.6
+++ openoffice.org/vcl/inc/vclenum.hxx	7 Feb 2006 10:12:39 -0000
@@ -275,6 +275,20 @@
 
 #endif
 
+#ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
+#define ENUM_FONTEMBEDDEDBITMAP_DECLARED
+
+enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
+
+#endif
+
+#ifndef ENUM_FONTANTIALIAS_DECLARED
+#define ENUM_FONTANTIALIAS_DECLARED
+
+enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
+
+#endif
+
 // ------------------------------------------------------------
 
 #ifndef ENUM_KEYFUNCTYPE_DECLARED
Index: source/gdi/pdfwriter_impl.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/pdfwriter_impl.cxx,v
retrieving revision 1.86
diff -u -r1.86 pdfwriter_impl.cxx
--- openoffice.org.orig/vcl/source/gdi/pdfwriter_impl.cxx	25 Nov 2005 10:02:34 -0000	1.86
+++ openoffice.org/vcl/source/gdi/pdfwriter_impl.cxx	7 Feb 2006 10:14:20 -0000
@@ -1406,6 +1406,10 @@
     aDFA.mnQuality      = 50000;
     aDFA.mbSubsettable  = false;
     aDFA.mbEmbeddable   = false;
+
+    aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+    aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+
     return aDFA;
 }
 
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.118
diff -u -r1.118 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	14 Dec 2005 09:11:46 -0000	1.118
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	7 Feb 2006 10:14:34 -0000
@@ -153,9 +153,9 @@
 // if (AA prio <= AH prio) => antialias + autohint
 // if (AH<AA) => do not autohint when antialiasing
 // if (EB<AH) => do not autohint for monochrome
-static int nPrioEmbedded    = 2;
-static int nPrioAutoHint    = 1;
-static int nPrioAntiAlias   = 1;
+static int nDefaultPrioEmbedded    = 2;
+static int nDefaultPrioAutoHint    = 1;
+static int nDefaultPrioAntiAlias   = 1;
 
 // =======================================================================
 // FreetypeManager
@@ -470,7 +470,7 @@
     // requested by env var below because it crashes StarOffice on RH9
     // TODO: investigate
     if( nFTVERSION == 2103 )
-        nPrioEmbedded = 0;
+        nDefaultPrioEmbedded = 0;
 
 #else // RTLD_DEFAULT
     // assume systems where dlsym is not possible use supplied library
@@ -481,13 +481,13 @@
     char* pEnv;
     pEnv = ::getenv( "SAL_EMBEDDED_BITMAP_PRIORITY" );
     if( pEnv )
-        nPrioEmbedded  = pEnv[0] - '0';
+        nDefaultPrioEmbedded  = pEnv[0] - '0';
     pEnv = ::getenv( "SAL_ANTIALIASED_TEXT_PRIORITY" );
     if( pEnv )
-        nPrioAntiAlias = pEnv[0] - '0';
+        nDefaultPrioAntiAlias = pEnv[0] - '0';
     pEnv = ::getenv( "SAL_AUTOHINTING_PRIORITY" );
     if( pEnv )
-        nPrioAutoHint  = pEnv[0] - '0';
+        nDefaultPrioAutoHint  = pEnv[0] - '0';
 
     InitGammaTable();
 }
@@ -593,6 +593,9 @@
             aDFA.mbSubsettable= false;
             aDFA.mbEmbeddable = false;
 
+            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+            aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+
             FT_Done_Face( aFaceFT );
             AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
             ++nCount;
@@ -687,6 +690,7 @@
 
 FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
 :   ServerFont( rFSD ),
+    mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
     mpFontInfo( pFI ),
     maFaceFT( NULL ),
     maSizeFT( NULL ),
@@ -831,8 +835,13 @@
         mnLoadFlags |= FT_LOAD_NO_HINTING;
     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
 
+    if (mpFontInfo->DontUseAntiAlias())
+        mnPrioAntiAlias = 0;
+    if (mpFontInfo->DontUseEmbeddedBitmaps())
+        mnPrioEmbedded = 0;
+
 #if (FTVERSION >= 2005) || defined(TT_CONFIG_OPTION_BYTECODE_INTERPRETER)
-    if( nPrioAutoHint <= 0 )
+    if( nDefaultPrioAutoHint <= 0 )
 #endif
         mnLoadFlags |= FT_LOAD_NO_HINTING;
 
@@ -842,7 +851,7 @@
         mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
 #endif
 
-    if( ((mnCos != 0) && (mnSin != 0)) || (nPrioEmbedded <= 0) )
+    if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
         mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
@@ -1273,7 +1282,7 @@
 
 bool FreetypeServerFont::GetAntialiasAdvice( void ) const
 {
-    if( GetFontSelData().mbNonAntialiased || (nPrioAntiAlias<=0) )
+    if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) )
         return false;
     bool bAdviseAA = true;
     // TODO: also use GASP info
@@ -1298,11 +1307,11 @@
 #if (FTVERSION >= 2002)
     // for 0/90/180/270 degree fonts enable autohinting even if not advisable
     // non-hinted and non-antialiased bitmaps just look too ugly
-    if( (mnCos==0 || mnSin==0) && (nPrioAutoHint > 0) )
+    if( (mnCos==0 || mnSin==0) && (nDefaultPrioAutoHint > 0) )
         nLoadFlags &= ~FT_LOAD_NO_HINTING;
 #endif
 
-    if( nPrioEmbedded <= nPrioAutoHint )
+    if( mnPrioEmbedded <= nDefaultPrioAutoHint )
         nLoadFlags |= FT_LOAD_NO_BITMAP;
 
     FT_Error rc = -1;
@@ -1449,11 +1458,11 @@
     // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
     nLoadFlags |= FT_LOAD_NO_HINTING;
 #else
-    if( (nGlyphFlags & GF_UNHINTED) || (nPrioAutoHint < nPrioAntiAlias) )
+    if( (nGlyphFlags & GF_UNHINTED) || (nDefaultPrioAutoHint < mnPrioAntiAlias) )
         nLoadFlags |= FT_LOAD_NO_HINTING;
 #endif
 
-    if( nPrioEmbedded <= nPrioAntiAlias )
+    if( mnPrioEmbedded <= mnPrioAntiAlias )
         nLoadFlags |= FT_LOAD_NO_BITMAP;
 
     FT_Error rc = -1;
Index: source/glyphs/gcach_ftyp.hxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v
retrieving revision 1.33
diff -u -r1.33 gcach_ftyp.hxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx	14 Dec 2005 09:12:02 -0000	1.33
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx	7 Feb 2006 10:14:35 -0000
@@ -93,7 +93,10 @@
     int                   GetFaceNum() const        { return mnFaceNum; }
     int                   GetSynthetic() const      { return mnSynthetic; }
     int                   GetFontId() const         { return mnFontId; }
-
+    bool                  DontUseAntiAlias() const  
+        { return maDevFontAttributes.UseAntiAlias() == ANTIALIAS_FALSE; }
+    bool                  DontUseEmbeddedBitmaps() const 
+        { return maDevFontAttributes.UseEmbeddedBitmap() == EMBEDDEDBITMAP_FALSE; }
     bool                  IsSymbolFont() const      { return maDevFontAttributes.IsSymbolFont(); }
     const ImplFontAttributes& GetFontAttributes() const { return maDevFontAttributes; }
 
@@ -207,6 +210,8 @@
 
 private:
     int                         mnWidth;
+    int                         mnPrioEmbedded;
+    int                         mnPrioAntiAlias;
     FtFontInfo*                 mpFontInfo;
     FT_Int                      mnLoadFlags;
     double                      mfStretch;
Index: unx/source/gdi/pspgraphics.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/pspgraphics.cxx,v
retrieving revision 1.13
diff -u -r1.13 pspgraphics.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx	2 Nov 2005 13:34:27 -0000	1.13
+++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx	7 Feb 2006 10:16:18 -0000
@@ -1226,6 +1226,32 @@
     aDFA.mePitch        = ToFontPitch (rInfo.m_ePitch);
     aDFA.mbSymbolFlag   = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
 
+    switch (rInfo.m_eEmbeddedbitmap)
+    {
+        default:
+            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+            break;
+        case psp::fcstatus::istrue:
+            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_TRUE;
+            break;
+        case psp::fcstatus::isfalse:
+            aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_FALSE;
+            break;
+    }
+
+    switch (rInfo.m_eAntialias)
+    {
+        default:
+            aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+            break;
+        case psp::fcstatus::istrue:
+            aDFA.meAntiAlias = ANTIALIAS_TRUE;
+            break;
+        case psp::fcstatus::isfalse:
+            aDFA.meAntiAlias = ANTIALIAS_FALSE;
+            break;
+    }
+
     // special case for the ghostscript fonts
     if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
         aDFA.maName = aDFA.maName.Copy( 4 );
Index: unx/source/gdi/xlfd_extd.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/gdi/xlfd_extd.cxx,v
retrieving revision 1.25
diff -u -r1.25 xlfd_extd.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/xlfd_extd.cxx	1 Nov 2005 10:40:06 -0000	1.25
+++ openoffice.org/vcl/unx/source/gdi/xlfd_extd.cxx	7 Feb 2006 10:16:26 -0000
@@ -113,6 +113,10 @@
     mbDevice       = false;
     mbSubsettable  = false;
     mbEmbeddable   = false;
+
+    meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+    meAntiAlias = ANTIALIAS_DONTKNOW;
+
     mnQuality      = -1;
 }
 
Index: win/source/gdi/salgdi3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/win/source/gdi/salgdi3.cxx,v
retrieving revision 1.74
diff -u -r1.74 salgdi3.cxx
--- openoffice.org.orig/vcl/win/source/gdi/salgdi3.cxx	3 Nov 2005 16:34:10 -0000	1.74
+++ openoffice.org/vcl/win/source/gdi/salgdi3.cxx	7 Feb 2006 10:17:01 -0000
@@ -407,7 +407,10 @@
         ||  aDFA.maName.EqualsAscii( "ZapfChancery" )
         ||  aDFA.maName.EqualsAscii( "ZapfDingbats" ) )
             aDFA.mnQuality += 500;
-    }        
+    }    
+
+    aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+    aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
     
     // TODO: add alias names
 
@@ -488,6 +491,9 @@
             aDFA.mnQuality += 500;
     }
 
+    aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+    aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+
     // TODO: add alias names
     return aDFA;
 }
@@ -1870,6 +1876,8 @@
     aDFA.mePitch      = PITCH_DONTKNOW;;
     aDFA.mbSubsettable= false;
     aDFA.mbEmbeddable = false;
+    aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+    aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
 
     /*
 	// TODO: improve ImplDevFontAttributes using "FONTRES:" from *.fot file
diff -ru psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx	2006-02-08 09:48:58.000000000 +0000
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx	2006-02-08 09:49:28.000000000 +0000
@@ -146,6 +146,15 @@
 };
 }
 
+namespace fcstatus 
+{
+enum type { 
+    istrue,
+    isunset,
+    isfalse 
+};
+}
+
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually
@@ -171,6 +180,8 @@
     weight::type            			m_eWeight;
     pitch::type             			m_ePitch;
     rtl_TextEncoding        			m_aEncoding;
+    fcstatus::type                      m_eEmbeddedbitmap;
+    fcstatus::type                      m_eAntialias;
 
     FastPrintFontInfo() :
             m_nID( 0 ),
@@ -180,7 +191,9 @@
             m_eWidth( width::Unknown ),
             m_eWeight( weight::Unknown ),
             m_ePitch( pitch::Unknown ),
-            m_aEncoding( RTL_TEXTENCODING_DONTKNOW )
+            m_aEncoding( RTL_TEXTENCODING_DONTKNOW ),
+            m_eEmbeddedbitmap( fcstatus::isunset ),
+            m_eAntialias( fcstatus::isunset )
     {}
 };
 
@@ -294,6 +307,10 @@
         int											m_nYMax;
         bool										m_bHaveVerticalSubstitutedGlyphs;
         bool                                        m_bUserOverride;
+
+        fcstatus::type                              m_eEmbeddedbitmap;
+        fcstatus::type                              m_eAntialias;
+
         std::map< sal_Unicode, sal_Int32 >			m_aEncodingVector;
         std::map< sal_Unicode, rtl::OString >		m_aNonEncoded;
 
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx	2006-02-08 09:48:58.000000000 +0000
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx	2006-02-08 09:58:20.000000000 +0000
@@ -379,6 +379,10 @@
     }
 }
 
+#ifndef FC_EMBEDDED_BITMAP
+#define FC_EMBEDDED_BITMAP "embeddedbitmap"
+#endif
+
 /*
  * PrintFontManager::initFontconfig
  */
@@ -407,7 +411,7 @@
             int weight = 0;
             int spacing = 0;
             int nCollectionEntry = -1;
-            FcBool outline = false;
+            FcBool outline = false, embitmap = true, antialias = true;
             
             FcResult eFileRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
             FcResult eFamilyRes	= rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FAMILY, 0, &family );
@@ -417,6 +421,24 @@
             FcResult eSpacRes	= rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
             FcResult eOutRes	= rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
             FcResult eIndexRes = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );            
+
+            FcResult eEmbeddedBitmap = FcResultNoMatch;
+            FcResult eAntialias = FcResultNoMatch;
+
+			if (eFamilyRes == FcResultMatch)
+			{
+			    FcPattern *pMatch = rWrapper.FcPatternCreate();
+    			rWrapper.FcPatternAddString(pMatch, FC_FAMILY, family);
+    			rWrapper.FcConfigSubstitute( NULL, pMatch, FcMatchPattern );
+    			FcResult eResult;
+    			if (FcPattern* pResult = rWrapper.FcFontSetMatch( NULL, &pFSet, 1, pMatch, &eResult ))
+    			{
+                	eEmbeddedBitmap = rWrapper.FcPatternGetBool( pResult, FC_EMBEDDED_BITMAP, 0, &embitmap );
+    	            eAntialias = rWrapper.FcPatternGetBool( pResult, FC_ANTIALIAS, 0, &antialias );
+    				rWrapper.FcPatternDestroy(pResult);
+    			}
+    			rWrapper.FcPatternDestroy(pMatch);
+   			}
             
             if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                 continue;
@@ -554,6 +576,15 @@
                 {
                     pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
                 }
+                if( eEmbeddedBitmap == FcResultMatch )
+                {
+                  pUpdate->m_eEmbeddedbitmap = embitmap ? fcstatus::istrue : fcstatus::isfalse;
+                }
+                if( eAntialias == FcResultMatch )
+                {
+                  pUpdate->m_eAntialias = antialias ? fcstatus::istrue : fcstatus::isfalse;
+                }
+
                 
                 // update font cache
                 m_pFontCache->updateFontCacheEntry( pUpdate, false );
diff -ru psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx	2006-02-08 09:48:58.000000000 +0000
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx	2006-02-08 09:49:28.000000000 +0000
@@ -379,7 +379,9 @@
         m_nXMax( 0 ),
         m_nYMax( 0 ),
         m_bHaveVerticalSubstitutedGlyphs( false ),
-        m_bUserOverride( false )
+        m_bUserOverride( false ),
+        m_eEmbeddedbitmap( fcstatus::isunset ),
+        m_eAntialias( fcstatus::isunset )
 {
 }
 
@@ -2592,6 +2594,8 @@
     rInfo.m_eWeight         = pFont->m_eWeight;
     rInfo.m_ePitch          = pFont->m_ePitch;
     rInfo.m_aEncoding       = pFont->m_aEncoding;
+    rInfo.m_eEmbeddedbitmap = pFont->m_eEmbeddedbitmap;
+    rInfo.m_eAntialias      = pFont->m_eAntialias;
     rInfo.m_aAliases.clear();
     for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
         rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );

openoffice.org-2.0.2.ooo62030.solenv._version.patch:
 target.mk |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo62030.solenv._version.patch ---
--- OOB680_m1.orig/solenv/inc/target.mk	2005-12-14 15:37:20.000000000 +0000
+++ OOB680_m1/solenv/inc/target.mk	2006-02-14 09:35:12.000000000 +0000
@@ -2649,7 +2655,6 @@
 	@+echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
 	@+echo $(EMQ)#define _RSCREVISION $(EMQ)"$(USQ)$(RSCREVISION)$(USQ)$(EMQ)" >> $(VERSIONTMP)
 	@+echo $(EMQ)#define _INPATH $(EMQ)"$(INPATH)$(EMQ)"           >> $(VERSIONTMP)
-	@+-$(RM) $@ >& $(NULLDEV)
 	@+-$(RENAME) $(VERSIONTMP) $@
 
 .IF "$(MAKEFILERC)"==""

workspace.systemjava.patch:
 XmlSearch/src/com/sun/xmlsearch/makefile.mk                             |   14 
 bin/modules/installer/profiles.pm                                       |    0 
 com/sun/star/sdbcx/comp/hsqldb/makefile.mk                              |    0 
 com/sun/star/wizards/common/MANIFEST.MF                                 |    0 
 com/sun/star/wizards/makefile.mk                                        |    0 
 com/sun/star/wizards/web/MANIFEST.MF                                    |    0 
 com/sun/star/wizards/web/data/makefile.mk                               |    0 
 com/sun/star/wizards/web/export/makefile.mk                             |    0 
 com/sun/star/wizards/web/makefile.mk                                    |    0 
 config/ssrc680.ini                                                      |    0 
 config_office/configure.in                                              |  196 +++++++++-
 config_office/set_soenv.in                                              |   10 
 connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk                 |    7 
 connectivity/prj/build.lst                                              |    2 
 filter/source/config/fragments/makefile.mk                              |    3 
 filter/source/config/tools/utils/makefile.mk                            |   16 
 filter/source/xsltfilter/makefile.mk                                    |   24 +
 filter/source/xsltvalidate/makefile.mk                                  |   15 
 helpcontent2/settings.pmk                                               |   12 
 inc/tg_config.mk                                                        |    0 
 inc/tg_jar.mk                                                           |    0 
 java/build.xml                                                          |    0 
 prj/build.lst                                                           |    0 
 readlicense_oo/util/makefile.pmk                                        |    4 
 rhino/prj/build.lst                                                     |    2 
 scp2/source/ooo/file_ooo.scp                                            |   17 
 scp2/source/ooo/makefile.mk                                             |   22 +
 scp2/source/ooo/profileitem_ooo.scp                                     |   44 ++
 scripting/java/build.xml                                                |    5 
 scripting/prj/build.lst                                                 |    2 
 solenv/bin/modules/installer/profiles.pm                                |    6 
 solenv/config/ssrc680.ini                                               |    2 
 solenv/inc/tg_config.mk                                                 |   31 -
 solenv/inc/tg_jar.mk                                                    |   22 +
 source/com/sun/star/help/makefile.mk                                    |    0 
 source/config/fragments/makefile.mk                                     |    0 
 source/config/tools/utils/makefile.mk                                   |    0 
 source/ooo/file_ooo.scp                                                 |    0 
 source/ooo/makefile.mk                                                  |    0 
 source/ooo/profileitem_ooo.scp                                          |    0 
 source/xmerge/build.xml                                                 |    0 
 source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml        |    0 
 source/xsltfilter/makefile.mk                                           |    0 
 source/xsltvalidate/makefile.mk                                         |    0 
 src/com/sun/xmlsearch/makefile.mk                                       |    0 
 util/build.xml                                                          |    0 
 util/makefile.pmk                                                       |    0 
 wizards/com/sun/star/wizards/common/MANIFEST.MF                         |    2 
 wizards/com/sun/star/wizards/makefile.mk                                |   20 -
 wizards/com/sun/star/wizards/web/MANIFEST.MF                            |    2 
 wizards/com/sun/star/wizards/web/data/makefile.mk                       |   20 -
 wizards/com/sun/star/wizards/web/export/makefile.mk                     |   20 -
 wizards/com/sun/star/wizards/web/makefile.mk                            |   21 +
 workben/build.xml                                                       |    0 
 xmerge/source/xmerge/build.xml                                          |   43 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml |    8 
 xmerge/util/build.xml                                                   |    8 
 xmerge/workben/build.xml                                                |    8 
 xmlhelp/source/com/sun/star/help/makefile.mk                            |   30 +
 59 files changed, 565 insertions(+), 73 deletions(-)

--- NEW FILE workspace.systemjava.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.148
diff -u -r1.148 configure.in
--- openoffice.org.orig/config_office/configure.in	13 Jan 2006 16:37:01 -0000	1.148
+++ openoffice.org/config_office/configure.in	27 Jan 2006 14:45:06 -0000
@@ -239,6 +239,41 @@
 [  --with-db-jar=JARFILE   Specify path to jarfile manually ],
 [ DB_JAR="$withval"
 ])
+AC_ARG_WITH(system-hsqldb,
+[  --with-system-hsqldb    Use hsqldb already on system
+],,)
+AC_ARG_WITH(hsqldb-jar,
+[  --with-hsqldb-jar=JARFILE   Specify path to jarfile manually ],
+[ HSQLDB_JAR="$withval"
+])
+AC_ARG_WITH(system-beanshell,
+[  --with-system-beanshell Use beanshell already on system
+],,)
+AC_ARG_WITH(beanshell-jar,
+[  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
+[ BSH_JAR="$withval"
+])
+AC_ARG_WITH(system-xml-apis,
+[  --with-system-xml-apis  Use xml-apis already on system
+],,)
+AC_ARG_WITH(xml-apis-jar,
+[  --with-xml-apis-jar=JARFILE   Specify path to jarfile manually ],
+[ XML_APIS_JAR="$withval"
+])
+AC_ARG_WITH(system-xerces,
+[  --with-system-xerces    Use xerces already on system
+],,)
+AC_ARG_WITH(xerces-jar,
+[  --with-xerces-jar=JARFILE   Specify path to jarfile manually ],
+[ XERCES_JAR="$withval"
+])
+AC_ARG_WITH(system-xalan,
+[  --with-system-xalan     Use xalan already on system
+],,)
+AC_ARG_WITH(xalan-jar,
+[  --with-xalan-jar=JARFILE   Specify path to jarfile manually ],
+[ XALAN_JAR="$withval"
+])
 AC_ARG_WITH(system-sablot,
 [  --with-system-sablot    Use sablot already on system
 ],,)
@@ -2678,6 +2713,165 @@
 fi
 AC_SUBST(SYSTEM_LIBXSLT)
 
+dnl ===================================================================
+dnl Check for system hsqldb
+dnl ===================================================================
+AC_MSG_CHECKING([which hsqldb to use])
+if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
+       test "$with_system_hsqldb" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_HSQLDB=YES
+        if test -z $HSQLDB_JAR; then
+               HSQLDB_JAR=/usr/share/java/hsqldb.jar
+        fi
+        AC_CHECK_FILE($HSQLDB_JAR, [],
+               [AC_MSG_ERROR(hsqldb.jar not found.)], [])
+        AC_MSG_CHECKING([whether hsqldb is >= 1.8.0])
+        export HSQLDB_JAR
+        if $PERL -e 'use Archive::Zip;
+            my $file = "$ENV{'HSQLDB_JAR'}";
+            my $zip = Archive::Zip->new( $file );
+            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+               exit 0;
+            } else {
+               exit 1;
+            }'; then
+            AC_MSG_RESULT([yes])
+         else
+            AC_MSG_ERROR([no, hsqldb >= 1.8.0 is needed])
+         fi
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_HSQLDB=NO
+    BUILD_TYPE="$BUILD_TYPE HSQLDB"
+fi
+AC_SUBST(SYSTEM_HSQLDB)
+AC_SUBST(HSQLDB_JAR)
+
+dnl ===================================================================
+dnl Check for system beanshell
+dnl ===================================================================
+AC_MSG_CHECKING([which beanshell to use])
+if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
+       test "$with_system_beanshell" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_BSH=YES
+        if test -z $BSH_JAR; then
+               BSH_JAR=/usr/share/java/bsh.jar
+        fi
+        AC_CHECK_FILE($BSH_JAR, [],
+               [AC_MSG_ERROR(bsh.jar not found.)], [])
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_BSH=NO
+    BUILD_TYPE="$BUILD_TYPE BSH"
+fi
+AC_SUBST(SYSTEM_BSH)
+AC_SUBST(BSH_JAR)
+
+dnl ===================================================================
+dnl Check for system xml-apis
+dnl ===================================================================
+AC_MSG_CHECKING([which xml-apis to use])
+if test -n "$with_system_xml_apis" -o -n "$with_system_libs" && \
+       test "$with_system_xml_apis" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_XML_APIS=YES
+        if test -z $XML_APIS_JAR; then
+          AC_CHECK_FILE(/usr/share/java/xml-commons-apis.jar, 
+            [ XML_APIS_JAR=/usr/share/java/xml-commons-apis.jar ],
+            [
+              AC_CHECK_FILE(/usr/share/java/xml-apis.jar, 
+                [ XML_APIS_JAR=/usr/share/java/xml-apis.jar ],
+                [ AC_CHECK_FILE(/usr/share/java/jaxp-1.2.jar,
+                    [ XML_APIS_JAR=/usr/share/java/jaxp-1.2.jar ],
+                    [ AC_MSG_ERROR(xml-apis.jar replacement not found)]
+                  )
+                ]
+              )
+            ]
+          )
+        else
+          AC_CHECK_FILE($XML_APIS_JAR, [],
+               [AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
+        fi
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_XML_APIS=NO
+    NEED_XALAN=TRUE
+fi
+AC_SUBST(SYSTEM_XML_APIS)
+AC_SUBST(XML_APIS_JAR)
+
+dnl ===================================================================
+dnl Check for system xerces
+dnl ===================================================================
+AC_MSG_CHECKING([which xerces to use])
+if test -n "$with_system_xerces" -o -n "$with_system_libs" && \
+       test "$with_system_xerces" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_XERCES=YES
+        if test -z $XERCES_JAR; then
+          AC_CHECK_FILE(/usr/share/java/xerces-j2.jar, 
+            [ XERCES_JAR=/usr/share/java/xerces-j2.jar ],
+            [
+              AC_CHECK_FILE(/usr/share/java/xercesImpl.jar, 
+                [ XERCES_JAR=/usr/share/java/xercesImpl.jar ],
+                [ AC_MSG_ERROR(xercesImpl.jar replacement not found)]
+              )
+            ]
+          )
+        else
+          AC_CHECK_FILE($XERCES_JAR, [],
+               [AC_MSG_ERROR(xercesImpl.jar replacement not found.)], [])
+        fi
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_XERCES=NO
+    NEED_XALAN=TRUE
+fi
+AC_SUBST(SYSTEM_XERCES)
+AC_SUBST(XERCES_JAR)
+
+dnl ===================================================================
+dnl Check for system xalan
+dnl ===================================================================
+AC_MSG_CHECKING([which xalan to use])
+if test -n "$with_system_xalan" -o -n "$with_system_libs" && \
+       test "$with_system_xalan" != "no"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_XALAN=YES
+        if test -z $XALAN_JAR; then
+          AC_CHECK_FILE(/usr/share/java/xalan-j2.jar, 
+            [ XALAN_JAR=/usr/share/java/xalan-j2.jar ],
+            [
+              AC_CHECK_FILE(/usr/share/java/xalan2.jar, 
+                [ XALAN_JAR=/usr/share/java/xalan2.jar ],
+                [ AC_CHECK_FILE(/usr/share/java/xalan.jar,
+                    [ XALAN_JAR=/usr/share/java/xalan.jar ],
+                    [ AC_MSG_ERROR(xalan.jar replacement not found)]
+                  )
+                ]
+              )
+            ]
+          )
+        else
+          AC_CHECK_FILE($XALAN_JAR, [],
+               [AC_MSG_ERROR(xml-apis.jar replacement not found.)], [])
+        fi
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_XALAN=NO
+    NEED_XALAN=TRUE
+fi
+AC_SUBST(SYSTEM_XALAN)
+AC_SUBST(XALAN_JAR)
+
+if test -n "$NEED_XALAN"; then
+BUILD_TYPE="$BUILD_TYPE XALAN"
+fi
+
 if test "$SYSTEM_LIBXSLT" == "NO"; then
 dnl ===================================================================
 dnl Check for system sablot
@@ -4359,8 +4553,6 @@
 fi
 AC_SUBST(LOCAL_SOLVER)
 
-BUILD_TYPE="$BUILD_TYPE XALAN"
-
 AC_SUBST(BUILD_TYPE)
 
 # make sure config.guess is +x; we execute config.guess, so it has to be so; 
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.86
diff -u -r1.86 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	13 Jan 2006 16:37:16 -0000	1.86
+++ openoffice.org/config_office/set_soenv.in	27 Jan 2006 14:45:11 -0000
@@ -1766,6 +1766,16 @@
 ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
 ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
 ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
+ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
+ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
+ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
+ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
+ToFile( "SYSTEM_XML_APIS",   "@SYSTEM_XML_APIS@",  "e" );
+ToFile( "XML_APIS_JAR",      "@XML_APIS_JAR@",     "e" );
+ToFile( "SYSTEM_XERCES",     "@SYSTEM_XERCES@",    "e" );
+ToFile( "XERCES_JAR",        "@XERCES_JAR@",       "e" );
+ToFile( "SYSTEM_XALAN",      "@SYSTEM_XALAN@",     "e" );
+ToFile( "XALAN_JAR",         "@XALAN_JAR@",        "e" );
 ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
 ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
 ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
Index: com/sun/star/sdbcx/comp/hsqldb/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk,v
retrieving revision 1.6
diff -u -r1.6 makefile.mk
--- openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk	8 Sep 2005 04:56:11 -0000	1.6
+++ openoffice.org/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk	26 Jan 2006 17:08:46 -0000
@@ -43,7 +43,12 @@
 # --- Files --------------------------------------------------------  
 
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar hsqldb.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR)
+.ELSE
+JARFILES+= hsqldb.jar
+.ENDIF
 JAVAFILES =\
 	NativeInputStreamHelper.java\
 	NativeOutputStreamHelper.java\
Index: prj/build.lst
===================================================================
RCS file: /cvs/dba/connectivity/prj/build.lst,v
retrieving revision 1.27
diff -u -r1.27 build.lst
--- openoffice.org.orig/connectivity/prj/build.lst	21 Dec 2005 14:05:01 -0000	1.27
+++ openoffice.org/connectivity/prj/build.lst	26 Jan 2006 17:09:01 -0000
@@ -1,4 +1,4 @@
-cn	connectivity	:	comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper hsqldb NULL
+cn	connectivity	:	comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil jurt javaunohelper HSQLDB:hsqldb NULL
 cn	connectivity							usr1	-	all	cn_mkout NULL
 cn	connectivity\com\sun\star\sdbcx\comp\hsqldb	nmake	-	all	cn_jhsqldbdb cn_hsqldb NULL
 cn	connectivity\source\types			nmake	-	all	cn_types NULL
Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.16.16.1
diff -u -r1.16.16.1 makefile.mk
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+++ openoffice.org/filter/source/config/fragments/makefile.mk	27 Jan 2006 14:18:37 -0000
@@ -156,7 +156,8 @@
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
 MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
-PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
+PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
 .ENDIF
 
 # -----------------------------------------------------------------------------
Index: source/config/tools/utils/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
retrieving revision 1.5.92.1
diff -u -r1.5.92.1 makefile.mk
--- openoffice.org.orig/filter/source/config/tools/utils/makefile.mk	17 Jan 2006 11:03:44 -0000	1.5.92.1
+++ openoffice.org/filter/source/config/tools/utils/makefile.mk	27 Jan 2006 14:18:49 -0000
@@ -50,9 +50,19 @@
                     jurt.jar        \
                     juh.jar         \
                     jut.jar         \
-                    java_uno.jar    \
-                    xml-apis.jar    \
-                    xercesImpl.jar
+                    java_uno.jar
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
 
 JAVACLASSFILES  =   \
                     $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class              \
Index: source/xsltfilter/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/xsltfilter/makefile.mk,v
retrieving revision 1.15
diff -u -r1.15 makefile.mk
--- openoffice.org.orig/filter/source/xsltfilter/makefile.mk	25 Oct 2005 12:53:22 -0000	1.15
+++ openoffice.org/filter/source/xsltfilter/makefile.mk	27 Jan 2006 14:19:01 -0000
@@ -70,12 +70,28 @@
 
 #USE_UDK_EXTENDED_MANIFESTFILE=TRUE
 #USE_EXTENDED_MANIFESTFILE=TRUE
-JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar xalan.jar xercesImpl.jar xml-apis.jar
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 CUSTOMMANIFESTFILE = Manifest  
-#JARMANIFEST = Manifest
-
-#JARDIR=$(CLASSDIR)
 
 JARCOMPRESS		= TRUE  
 JARCLASSDIRS	= XSLTFilter*.class XSLTransformer*.class XSLTFilterOLEExtracter*.class
Index: source/xsltvalidate/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/xsltvalidate/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- openoffice.org.orig/filter/source/xsltvalidate/makefile.mk	25 Oct 2005 11:23:33 -0000	1.10
+++ openoffice.org/filter/source/xsltvalidate/makefile.mk	27 Jan 2006 14:19:01 -0000
@@ -44,7 +44,20 @@
 CLASSDIR!:=$(CLASSDIR)$/$(TARGET)
 #USE_UDK_EXTENDED_MANIFESTFILE=TRUE
 #USE_EXTENDED_MANIFESTFILE=TRUE
-JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar xalan.jar xml-apis.jar crimson.jar
+JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar crimson.jar
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
 JAVAFILES		= $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 CUSTOMMANIFESTFILE = Manifest  
 #JARMANIFEST = Manifest
Index: settings.pmk
===================================================================
RCS file: /cvs/documentation/helpcontent2/settings.pmk,v
retrieving revision 1.5.106.1
diff -u -r1.5.106.1 settings.pmk
--- openoffice.org.orig/helpcontent2/settings.pmk	17 Jan 2006 12:52:53 -0000	1.5.106.1
+++ openoffice.org/helpcontent2/settings.pmk	27 Jan 2006 10:03:21 -0000
@@ -1,13 +1,9 @@
+XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
+XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
+DB_JAR*=$(SOLARBINDIR)$/db.jar
 
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
-
-.IF "$(SYSTEM_DB)" == "YES"
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
-.ELSE
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar
-.ENDIF
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar$(PATH_SEPERATOR)$(DB_JAR)
 
 .INCLUDE : $(INCCOM)$/aux_langs.mk
 
 aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
-
Index: util/makefile.pmk
===================================================================
RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
retrieving revision 1.10.12.1
diff -u -r1.10.12.1 makefile.pmk
--- openoffice.org.orig/readlicense_oo/util/makefile.pmk	17 Jan 2006 11:15:07 -0000	1.10.12.1
+++ openoffice.org/readlicense_oo/util/makefile.pmk	27 Jan 2006 10:02:23 -0000
@@ -70,7 +70,7 @@
 $(MISC)$/readme%.html :
     @+-$(MKDIR) $(@:d)
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
 .ELSE
 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
 	         --stringparam os1 $(OS) \
@@ -86,7 +86,7 @@
 $(MISC)$/readme%.txt :
     @+-$(MKDIR) $(@:d)
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
 .ELSE
 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
 	         --stringparam os1 $(OS) \
Index: prj/build.lst
===================================================================
RCS file: /cvs/external/rhino/prj/build.lst,v
retrieving revision 1.2
diff -u -r1.2 build.lst
--- openoffice.org.orig/rhino/prj/build.lst	25 Oct 2005 11:32:19 -0000	1.2
+++ openoffice.org/rhino/prj/build.lst	27 Jan 2006 14:26:02 -0000
@@ -1,3 +1,3 @@
-xh	rhino	:	soltools xalan NULL
+xh	rhino	:	soltools XALAN:xalan NULL
 xh	rhino		usr1	-	all	xh_mkout NULL
 xh	rhino      nmake	-	all	xh_rhino NULL
Index: source/ooo/file_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
retrieving revision 1.134
diff -u -r1.134 file_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_ooo.scp	5 Jan 2006 14:55:20 -0000	1.134
+++ openoffice.org/scp2/source/ooo/file_ooo.scp	27 Jan 2006 15:35:45 -0000
@@ -631,9 +631,9 @@
 #endif
 
 #ifdef SOLAR_JAVA
-
+#ifndef SYSTEM_BSH
 STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
-
+#endif
 #endif
 
 #ifdef SOLAR_JAVA
@@ -729,7 +729,9 @@
 #endif
 
 #ifdef SOLAR_JAVA
+#ifndef SYSTEM_HSQLDB
 STD_JAR_FILE_PATCH( gid_File_Jar_Hsqldb, hsqldb )
+#endif
 STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
 #endif
 
@@ -754,14 +756,14 @@
 #endif
 
 #ifdef SOLAR_JAVA
-
+#ifndef GCJ
 File gid_File_Jar_Sandbox
     TXT_FILE_BODY;
     Name = JARFILENAME(sandbox);
     Dir = gid_Dir_Classes;
     Styles = (PACKED,PATCH);
 End
-
+#endif
 #endif
 
 #ifdef SOLAR_JAVA
@@ -783,15 +785,16 @@
 #endif
 
 #ifdef SOLAR_JAVA
-
 STD_JAR_FILE( gid_File_Jar_Xt, xt )
-
 #ifndef SYSTEM_XALAN
 STD_JAR_FILE( gid_File_Jar_Xalan, xalan )
+#endif
+#ifndef SYSTEM_XERCES
 STD_JAR_FILE( gid_File_Jar_XercesImpl, xercesImpl )
+#endif
+#ifndef SYSTEM_XML_APIS
 STD_JAR_FILE( gid_File_Jar_Xml_Apis, xml-apis )
 #endif
-
 #endif
 
 File gid_File_Mod_Chart
Index: source/ooo/makefile.mk
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v
retrieving revision 1.38
diff -u -r1.38 makefile.mk
--- openoffice.org.orig/scp2/source/ooo/makefile.mk	10 Jan 2006 14:34:23 -0000	1.38
+++ openoffice.org/scp2/source/ooo/makefile.mk	27 Jan 2006 15:35:59 -0000
@@ -139,8 +139,28 @@
 SCPDEFS+=-DSYSTEM_HUNSPELL
 .ENDIF
 
-.IF "$(SYSTEM_XALAN)" == "YES"
+.IF "$(SYSTEM_BSH)" == "YES"
+SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
+.ENDIF
+
+.IF "$(SYSTEM_HSQLDB)" == "YES" 
+SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
+.ENDIF 
+
+.IF "$(SYSTEM_XML_APIS)" == "YES" 
+SCPDEFS+=-DSYSTEM_XML_APIS
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES" 
+SCPDEFS+=-DSYSTEM_XERCES
+.ENDIF
+
+.IF "$(SYSTEM_XALAN)" == "YES" 
 SCPDEFS+=-DSYSTEM_XALAN
+.ENDIF
+
+.IF "$(JDK)" == "gcj"
+SCPDEFS+=-DGCJ
 .ENDIF
 
 SCPDEFS+=\
Index: source/ooo/profileitem_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v
retrieving revision 1.31
diff -u -r1.31 profileitem_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp	11 Jan 2006 13:05:10 -0000	1.31
+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp	27 Jan 2006 15:36:00 -0000
@@ -758,6 +758,46 @@
     Section = "Bootstrap";
     Order = 7;
     Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
-    Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $O!
RIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
+    Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH}";
+    ValueList1  = "${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
+    ValueList2  = "$ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar";
+    ValueList3  = "$ORIGIN/classes/java_uno.jar";
+#ifndef GCJ
+    ValueList4  = "$ORIGIN/classes/sandbox.jar";
+#endif
+#ifdef SYSTEM_BSH
+    ValueList5  = BSH_JAR;
+#else
+    ValueList6  = "$ORIGIN/classes/bsh.jar";
+#endif
+    ValueList7  = "$ORIGIN/classes/classes.jar";
+    ValueList8  = "$ORIGIN/classes/commonwizards.jar";
+    ValueList9  = "$ORIGIN/classes/htmlsoff.jar";
+    ValueList10  = "$ORIGIN/classes/java_uno_accessbridge.jar";
+    ValueList11 = "$ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar";
+    ValueList12 = "$ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar";
+    ValueList13 = "$ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar";
+    ValueList14 = "$ORIGIN/classes/report.jar";
+    ValueList15 = "$ORIGIN/classes/ScriptFramework.jar";
+    ValueList16 = "$ORIGIN/classes/ScriptProviderForBeanShell.jar";
+    ValueList17 = "$ORIGIN/classes/ScriptProviderForJava.jar";
+    ValueList18 = "$ORIGIN/classes/ScriptProviderForJavaScript.jar";
+    ValueList10 = "$ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar";
+    ValueList20 = "$ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar";
+    ValueList21 = "$ORIGIN/classes/XMergeBridge.jar";
+    ValueList22 = "$ORIGIN/classes/XSLTFilter.jar";
+    ValueList23 = "$ORIGIN/classes/XSLTValidate.jar";
+    ValueList24 = "$ORIGIN/classes/xt.jar";
+    ValueList25 = "$ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar";
+    ValueList26 = "$ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar";
+    ValueList27 = "$ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar";
+    ValueList28 = "$ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar";
+    ValueList29 = "$ORIGIN/classes/mail.jar";
+#ifdef SYSTEM_HSQLDB
+    ValueList30 = HSQLDB_JAR;
+#else
+    ValueList31 = "$ORIGIN/classes/hsqldb.jar";
+#endif
+    ValueList32 = "$ORIGIN/classes/sdbc_hsqldb.jar";
+    ValueList33 = "file:///usr/share/java/xerces-j2.jar file:///usr/share/java/xalan-j2.jar file:///usr/share/java/xml-commons-apis-1.0.jar";
 End
-
Index: java/build.xml
===================================================================
RCS file: /cvs/framework/scripting/java/build.xml,v
retrieving revision 1.32
diff -u -r1.32 build.xml
--- openoffice.org.orig/scripting/java/build.xml	9 Sep 2005 01:54:21 -0000	1.32
+++ openoffice.org/scripting/java/build.xml	26 Jan 2006 17:08:24 -0000
@@ -50,6 +50,9 @@
        Not needed in default build -->
   <property name="netbeans.install.path" value="/export/home/netbeans"/>
 
+  <property environment="env"/>
+  <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
+
   <!-- ==================== classpath setting ============================ -->
   <path id="idlclasspath">
     <pathelement location="${solar.jar}/jurt.jar"/>
@@ -58,7 +61,7 @@
     <pathelement location="${solar.jar}/juh.jar"/>
     <pathelement location="${solar.jar}/java_uno.jar"/>
     <pathelement location="${solar.jar}/ridl.jar"/>
-    <pathelement location="${solar.jar}/bsh.jar"/>
+    <pathelement location="${env.BSH_JAR}"/>
     <pathelement location="${solar.jar}/js.jar"/>
     <pathelement location="${jardir}"/>
   </path> 
Index: prj/build.lst
===================================================================
RCS file: /cvs/framework/scripting/prj/build.lst,v
retrieving revision 1.13
diff -u -r1.13 build.lst
--- openoffice.org.orig/scripting/prj/build.lst	11 Oct 2004 13:31:56 -0000	1.13
+++ openoffice.org/scripting/prj/build.lst	26 Jan 2006 17:09:00 -0000
@@ -1,4 +1,4 @@
-tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL
+tc	scripting	:	bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL
 tc	scripting									usr1	-	all	tc_mkout NULL
 tc	scripting\source\provider				nmake	-	all	tc_scriptingprovider NULL
 tc	scripting\source\basprov				nmake	-	all	tc_scriptingbasprov NULL
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.89
diff -u -r1.89 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	10 Jan 2006 14:32:25 -0000	1.89
+++ openoffice.org/solenv/config/ssrc680.ini	27 Jan 2006 12:25:32 -0000
@@ -108,7 +108,7 @@
 			BIG_SVX TRUE
 			BIG_GOODIES TRUE
 			BMP_WRITES_FLAG TRUE
-            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG
+            BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG
 			RES_ENUS TRUE
 			RES_GER TRUE
 			NO_REC_RES TRUE
Index: inc/tg_config.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
retrieving revision 1.6.184.1
diff -u -r1.6.184.1 tg_config.mk
--- openoffice.org.orig/solenv/inc/tg_config.mk	17 Jan 2006 11:10:09 -0000	1.6.184.1
+++ openoffice.org/solenv/inc/tg_config.mk	27 Jan 2006 12:25:39 -0000
@@ -57,17 +57,20 @@
                 $(XSLDIR)$/schema_trim.xsl 
 .ENDIF
 
+XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
+XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
+
 $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs
     @+echo -------------+ validating and stripping schema files
 	-$(MKDIRHIER) $(@:d)
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
 # xsltproc already validates against the dtd.  For additional validation,
 # org.openoffice.configuration.Inspector should be replaced and the
@@ -101,7 +104,7 @@
     @+echo -------------+ creating locale dependent resource bundles
 	-$(MKDIRHIER) $(@:d)
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
 .ELSE
 	$(XSLTPROC) -o $@ \
 	            --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
@@ -129,11 +132,11 @@
 	-$(MKDIRHIER) $(@:d) 
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
 .IF "$(NO_INSPECTION)"==""
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
 .ENDIF			# "$(NO_INSPECTION)"==""
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
 # xsltproc already validates against the dtd.  For additional validation,
 # org.openoffice.configuration.Inspector should be replaced and the
@@ -170,8 +173,8 @@
     @+echo -------------+ creating locale dependent entries
 	-$(MKDIRHIER) $(@:d)
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
 .ELSE
 	$(XSLTPROC) -o $(@:d)$*.tmp \
 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
@@ -206,8 +209,8 @@
     @+echo -------------+ creating a module file
 	-$(MKDIRHIER) $(@:d) 
 .IF "$(XSLTPROC)"=="NO_XSLTPROC"
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
+	$(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
 .ELSE
 	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \
Index: inc/tg_jar.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.18
diff -u -r1.18 tg_jar.mk
--- openoffice.org.orig/solenv/inc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
+++ openoffice.org/solenv/inc/tg_jar.mk	27 Jan 2006 12:25:39 -0000
@@ -51,10 +51,28 @@
 
 CUSTOMMANIFESTFILEDEP:=$(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f)
 
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XML_APIS_SUBST=$(XML_APIS_JAR)
+.ELSE
+XML_APIS_SUBST=xml-apis.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XERCES_SUBST=$(XERCES_JAR)
+.ELSE
+XERCES_SUBST=xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XALAN_SUBST=$(XALAN_JAR)
+.ELSE
+XALAN_SUBST=xalan.jar
+.ENDIF
+
+
 $(MISC)$/$(TARGET)_$(CUSTOMMANIFESTFILE:f) : $(subst,/,$/ $(DMAKE_WORK_DIR))$/$(CUSTOMMANIFESTFILE)
 	+-$(RM) $@
-#>& $(NULLDEV)
-	+$(COPY) $< $@
+	+$(TYPE) $< | $(SED) s,xml-apis.jar,$(XML_APIS_SUBST),g | $(SED) s,xercesImpl.jar,$(XERCES_SUBST),g | $(SED) s,xalan.jar,$(XALAN_SUBST),g > $@
 .ENDIF			# "$(CUSTOMMANIFESTFILE)"!=""
 
 $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
Index: bin/modules/installer/profiles.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/profiles.pm,v
retrieving revision 1.5
diff -u -r1.5 profiles.pm
--- openoffice.org.orig/solenv/bin/modules/installer/profiles.pm	8 Sep 2005 09:08:48 -0000	1.5
+++ openoffice.org/solenv/bin/modules/installer/profiles.pm	27 Jan 2006 15:54:48 -0000
@@ -187,6 +187,12 @@
 				my $section = $oneprofileitem->{'Section'};
 				my $key = $oneprofileitem->{'Key'};
 				my $value = $oneprofileitem->{'Value'};
+				for (my $j = 1; $j <= 50; $j++)
+				{
+					my $key = "ValueList" . $j;
+					if ( $oneprofileitem->{$key} ) 
+						{ $value = $value . " " . $oneprofileitem->{$key} }
+				}
 				my $order = $oneprofileitem->{'Order'};	# ignoring order at the moment
 
 				my $line = "[" . $section . "]" . "\n";
Index: com/sun/star/wizards/makefile.mk
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/wizards/com/sun/star/wizards/makefile.mk	28 Dec 2005 17:14:04 -0000	1.11
+++ openoffice.org/wizards/com/sun/star/wizards/makefile.mk	27 Jan 2006 12:24:44 -0000
@@ -42,7 +42,25 @@
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge xalan.jar xercesImp.jar xml-apis.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge 
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
 
 JARCLASSDIRS	=                                               \
 	com$/sun$/star$/wizards$/common	       	 		\
Index: com/sun/star/wizards/common/MANIFEST.MF
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/common/MANIFEST.MF,v
retrieving revision 1.2
diff -u -r1.2 MANIFEST.MF
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/MANIFEST.MF	28 Jan 2005 15:55:47 -0000	1.2
+++ openoffice.org/wizards/com/sun/star/wizards/common/MANIFEST.MF	27 Jan 2006 12:24:52 -0000
@@ -1 +1 @@
-Class-Path: xalan.jar xercesImp.jar xml-apis.jar
+Class-Path: xalan.jar xercesImpl.jar xml-apis.jar
Index: com/sun/star/wizards/web/MANIFEST.MF
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/MANIFEST.MF,v
retrieving revision 1.3
diff -u -r1.3 MANIFEST.MF
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/MANIFEST.MF	28 Jan 2005 15:56:04 -0000	1.3
+++ openoffice.org/wizards/com/sun/star/wizards/web/MANIFEST.MF	27 Jan 2006 12:25:53 -0000
@@ -1,2 +1,2 @@
 RegistrationClassName: com.sun.star.wizards.web.CallWizard
-Class-Path: xalan.jar xercesImp.jar xml-apis.jar
+Class-Path: xalan.jar xercesImpl.jar xml-apis.jar
Index: com/sun/star/wizards/web/makefile.mk
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/makefile.mk	9 Sep 2005 09:59:40 -0000	1.8
+++ openoffice.org/wizards/com/sun/star/wizards/web/makefile.mk	27 Jan 2006 12:25:59 -0000
@@ -42,7 +42,26 @@
 
 .INCLUDE : settings.mk
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar xalan.jar xercesImp.jar xml-apis.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
 CUSTOMMANIFESTFILE= MANIFEST.MF
 
 JARCLASSDIRS	= com$/sun$/star$/wizards$/web
Index: com/sun/star/wizards/web/data/makefile.mk
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/data/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/data/makefile.mk	9 Sep 2005 10:03:15 -0000	1.8
+++ openoffice.org/wizards/com/sun/star/wizards/web/data/makefile.mk	27 Jan 2006 12:26:00 -0000
@@ -43,7 +43,25 @@
 .INCLUDE : settings.mk
 
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar xalan.jar xercesImp.jar xml-apis.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
 
 #JARCLASSDIRS	= com$/sun$/star$/wizards$/web
 #JARTARGET		= $(TARGET).jar
Index: com/sun/star/wizards/web/export/makefile.mk
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/export/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/export/makefile.mk	9 Sep 2005 10:04:04 -0000	1.7
+++ openoffice.org/wizards/com/sun/star/wizards/web/export/makefile.mk	27 Jan 2006 12:26:00 -0000
@@ -43,7 +43,25 @@
 .INCLUDE : settings.mk
 
 #.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar xalan.jar xercesImp.jar xml-apis.jar
+JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
+
+.IF "$(SYSTEM_XALAN)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
+.ELSE
+JARFILES += xalan.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
 
 #JARCLASSDIRS	= com$/sun$/star$/wizards$/web
 #JARTARGET		= $(TARGET).jar
Index: source/xmerge/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 build.xml
--- openoffice.org.orig/xmerge/source/xmerge/build.xml	17 Jan 2006 10:54:44 -0000	1.2.4.1
+++ openoffice.org/xmerge/source/xmerge/build.xml	27 Jan 2006 14:05:46 -0000
@@ -56,10 +56,14 @@
 <project name="xmerge" default="all" basedir=".">
 
     <property file="../inc/antbuild.properties"/>
+
+    <property environment="env"/>
+    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
+    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
         
     <path id="classpath">
-        <pathelement location="${solar.jar}/xml-apis.jar"/>
-        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
+        <pathelement location="${env.XML_APIS_JAR}"/>
+        <pathelement location="${env.XERCES_JAR}"/>
         <pathelement location="${solar.jar}/unoil.jar"/>
         <pathelement location="${solar.jar}/ridl.jar"/>
         <pathelement location="${solar.jar}/jurt.jar"/>
@@ -81,9 +85,40 @@
             <classpath refid="classpath"/>
         </javac>
     </target>
+
+    <target name="makeclasspath_xmlapis">
+        <condition property="makeclasspath_xmlapis_true">
+            <equals arg1="${env.SYSTEM_XML_APIS}" arg2="YES" />
+        </condition>
+    </target>
+
+    <target name="makeclasspath_xmlapis_if" depends="makeclasspath_xmlapis" if="makeclasspath_xmlapis_true">
+    	<property name="xml_apis_manifest" value="${env.XML_APIS_JAR}"/>
+    </target>
+
+    <target name="makeclasspath_xmlapis_else" depends="makeclasspath_xmlapis" unless="makeclasspath_xmlapis_true">
+    	<property name="xml_apis_manifest" value="xml-apis.jar"/>
+    </target>
+
+    <target name="makeclasspath_xerces">
+        <condition property="makeclasspath_xerces_true">
+            <equals arg1="${env.SYSTEM_XERCES}" arg2="YES" />
+        </condition>
+    </target>
+
+    <target name="makeclasspath_xerces_if" depends="makeclasspath_xerces" if="makeclasspath_xerces_true">
+    	<property name="xerces_manifest" value="${env.XERCES_JAR}"/>
+    </target>
+
+    <target name="makeclasspath_xerces_else" depends="makeclasspath_xerces" unless="makeclasspath_xerces_true">
+    	<property name="xerces_manifest" value="xercesImpl.jar"/>
+    </target>
+
+    <target name="makeclasspath" 
+	depends="makeclasspath_xmlapis_if,makeclasspath_xmlapis_else,makeclasspath_xerces_if,makeclasspath_xerces_else"/>
     
     <!-- package to jar -->
-    <target name="jar" depends="compile">
+    <target name="jar" depends="compile,makeclasspath">
         <jar destfile="${target.jar}">
             <fileset dir="${target.dir}"
                          includes="**/*.class" />
@@ -95,7 +130,7 @@
                 <attribute name="Specification-Vendor" value="OpenOffice.org"/>
                 <attribute name="Specification-Version" value="0.6.0"/>
                 <attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
-                <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar"/>
+                <attribute name="Class-Path" value="${xml_apis_manifest} ${xerces_manifest}"/>
             </manifest>
          </jar>
     </target>
Index: source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml,v
retrieving revision 1.2.4.1
diff -u -r1.2.4.1 build.xml
--- openoffice.org.orig/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	17 Jan 2006 10:55:00 -0000	1.2.4.1
+++ openoffice.org/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	27 Jan 2006 14:05:48 -0000
@@ -76,11 +76,15 @@
     <!-- define how to handle CLASSPATH environment -->
     <property name="build.sysclasspath" value="ignore"/>
 
+    <property environment="env"/>
+    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
+    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
+
     <!-- classpath settings for javac tasks -->
     <path id="classpath">
         <pathelement location="${build.class}"/>
-        <pathelement location="${solar.jar}/xml-apis.jar"/>
-        <pathelement location="${solar.jar}/xercesImpl.jar"/>
+        <pathelement location="${env.XML_APIS_JAR}"/>
+        <pathelement location="${env.XERCES_JAR}"/>
     </path>
 
     <!-- set whether we want to compile with or without deprecation -->
Index: util/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/util/build.xml,v
retrieving revision 1.9.4.1
diff -u -r1.9.4.1 build.xml
--- openoffice.org.orig/xmerge/util/build.xml	17 Jan 2006 10:55:05 -0000	1.9.4.1
+++ openoffice.org/xmerge/util/build.xml	27 Jan 2006 14:05:48 -0000
@@ -37,10 +37,14 @@
     <property file="../source/inc/antbuild.properties"/>
     
     <property name="javadoc.dir" location="${build.dir}/javadoc"/>
+
+    <property environment="env"/>
+    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
+    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
     
     <path id="classpath">
-        <pathelement location="${solar.jar}/xml-apis.jar"/>
-        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
+        <pathelement location="${env.XML_APIS_JAR}"/>
+        <pathelement location="${env.XERCES_JAR}"/>
         <pathelement location="${solar.jar}/unoil.jar"/>
         <pathelement location="${solar.jar}/ridl.jar"/>
         <pathelement location="${solar.jar}/jurt.jar"/>
Index: workben/build.xml
===================================================================
RCS file: /cvs/xml/xmerge/workben/build.xml,v
retrieving revision 1.3.8.1
diff -u -r1.3.8.1 build.xml
--- openoffice.org.orig/xmerge/workben/build.xml	17 Jan 2006 10:55:13 -0000	1.3.8.1
+++ openoffice.org/xmerge/workben/build.xml	27 Jan 2006 14:05:48 -0000
@@ -57,11 +57,15 @@
     <!-- define how to handle CLASSPATH environment -->
     <property name="build.sysclasspath" value="ignore"/>
 
+    <property environment="env"/>
+    <property name="env.XML_APIS_JAR" value="${solar.jar}/xml-apis.jar"/>
+    <property name="env.XERCES_JAR" value="${solar.jar}/xercesImpl.jar"/>
+
     <!-- classpath settings for javac tasks -->
     <path id="classpath">
         <pathelement location="${build.class}"/>
-        <pathelement location="${solar.jar}/xml-apis.jar"/>
-        <pathelement location="${solar.jar}/xercesImpl.jar"/>
+        <pathelement location="${env.XML_APIS_JAR}"/>
+        <pathelement location="${env.XERCES_JAR}"/>
     </path>
 
     <!-- set wether we want to compile with or without deprecation -->
Index: source/com/sun/star/help/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
retrieving revision 1.21.2.1
diff -u -r1.21.2.1 makefile.mk
--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
+++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk	27 Jan 2006 12:38:13 -0000
@@ -42,17 +42,41 @@
 
 .INCLUDE : settings.mk
 
-JARFILES 		= xml-apis.jar xercesImpl.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
+JARFILES 	= xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
 EXTRAJARFILES 	= 
 
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+.IF "$(XCLASSPATH)" != ""
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+XCLASSPATH!:=$(XML_APIS_JAR)
+.ENDIF
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+.IF "$(XCLASSPATH)" != ""
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+XCLASSPATH!:=$(XERCES_JAR)
+.ENDIF
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
+
 .IF "$(SYSTEM_DB)" == "YES"
+.IF "$(XCLASSPATH)" != ""
 XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR)
 .ELSE
-JARFILES+= db.jar
+XCLASSPATH!:=$(DB_JAR)
+.ENDIF
+.ELSE
+JARFILES += db.jar
 .ENDIF
 
 CLASSGENDIR		= $(OUT)$/classgen
-RDB		 		= $(SOLARBINDIR)$/types.rdb
+RDB	 		= $(SOLARBINDIR)$/types.rdb
 JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
 # --- Files --------------------------------------------------------
Index: src/com/sun/xmlsearch/makefile.mk
===================================================================
RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/makefile.mk,v
retrieving revision 1.5.6.1
diff -u -r1.5.6.1 makefile.mk
--- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/makefile.mk	17 Jan 2006 10:54:03 -0000	1.5.6.1
+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/makefile.mk	27 Jan 2006 10:04:30 -0000
@@ -21,7 +21,19 @@
 
 .INCLUDE : settings.mk
 
-JARFILES 		=  xpi-apis.jar xercesImpl.jar xt.jar
+JARFILES 		=  xt.jar
+
+.IF "$(SYSTEM_XML_APIS)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
+.ELSE
+JARFILES += xml-apis.jar
+.ENDIF
+
+.IF "$(SYSTEM_XERCES)" == "YES"
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.ELSE
+JARFILES += xercesImpl.jar
+.ENDIF
 
 JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 filter/source/config/fragments/makefile.mk   |    4 ++++
 filter/source/config/tools/merge/makefile.mk |    3 +++
 helpcontent2/util/target.pmk                 |   10 +++++++++-
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 -------------------
 solenv/inc/settings.mk                       |    2 +-
 solenv/inc/target.mk                         |    6 ++++++
 solenv/inc/tg_jar.mk                         |   14 ++++++++++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 +
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +++
 18 files changed, 41 insertions(+), 21 deletions(-)

--- NEW FILE workspace.targetedaot.patch ---
Index: source/config/fragments/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.16.16.1
diff -u -r1.16.16.1 makefile.mk
--- openoffice.org.orig/filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+++ openoffice.org/filter/source/config/fragments/makefile.mk	26 Jan 2006 11:09:31 -0000
@@ -155,7 +155,11 @@
 #cmc, hack to workaround the java build requirement
 MERGE:=python ../tools/merge/pyAltFCFGMerge
 .ELSE
+.IF "$(JAVACACHE)" != ""
+MERGE    := $(BIN)$/FCFGMerge
+.ELSE
 MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+.ENDIF
 XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
 PACKLANG := $(JAVAI) $(JAVACPS) $(XALAN_JAR) org.apache.xalan.xslt.Process -XSL langfilter.xsl
 .ENDIF
Index: source/config/tools/merge/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk	8 Sep 2005 21:35:57 -0000	1.5
+++ openoffice.org/filter/source/config/tools/merge/makefile.mk	26 Jan 2006 11:09:33 -0000
@@ -75,6 +75,9 @@
 
 JARTARGET       =   $(TARGET).jar
 
+AOTCLASSNAME = com.sun.star.filter.config.tools.merge.FCFGMerge
+AOTTARGET = FCFGMerge
+
 JARCOMPRESS     =   TRUE
 
 # --- targets -----------------------------------------------------
Index: util/target.pmk
===================================================================
RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
retrieving revision 1.12
diff -u -r1.12 target.pmk
--- openoffice.org.orig/helpcontent2/util/target.pmk	5 Jan 2006 14:44:39 -0000	1.12
+++ openoffice.org/helpcontent2/util/target.pmk	26 Jan 2006 11:11:17 -0000
@@ -42,6 +42,11 @@
 
 .IF "$(SYSTEM_DB)" != "YES"
 JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+.ELSE
+.IF "$(JAVACACHE)" != ""
+CLASSPATH!:=$(my_cp)
+.EXPORT : CLASSPATH
+.ENDIF
 .ENDIF
 
 .IF "$(JDK)" != "gcj"
@@ -50,5 +55,8 @@
 
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
 	@+-$(MKDIR) -p $(@:d)
+.IF "$(JAVACACHE)" != ""
+	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ELSE
 	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-
+.ENDIF
Index: bin/deliver.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.98
diff -u -r1.98 deliver.pl
--- openoffice.org.orig/solenv/bin/deliver.pl	13 Jan 2006 16:36:04 -0000	1.98
+++ openoffice.org/solenv/bin/deliver.pl	26 Jan 2006 11:09:09 -0000
@@ -744,19 +744,6 @@
     return $rc;
 };
 
-sub cachejar {
-    if (defined($ENV{JAVACACHE}) && $ENV{JAVACACHE} ne '') {
-        my $file = shift;
-        my $to = $file.".so";
-        my $JAVALINKER = "$ENV{JAVACOMPILER} -shared -fPIC -Wl,-Bsymbolic -O2 -findirect-dispatch -fjni -o";
-        print "CACHEJAR: $file -> $to with $ENV{GCJ_DATABASE}\n";
-        print "Caching 1/2: $JAVALINKER $to $file\n";
-        system("$JAVALINKER $to $file");
-        print "Caching 2/2: $ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to\n";
-        system("$ENV{JAVACACHE} -a $ENV{GCJ_DATABASE} $file $to");
-    }
-};
-
 sub copy_if_newer 
 {
     # return 0 if file is unchanged ( for whatever reason )
@@ -783,9 +770,6 @@
         # hard link if possible
         if( link($from, $to) ){
             print "LINK: $from -> $to\n";
-            if ($ENV{JDK} eq 'gcj' && is_jar($from)) {
-                cachejar($to);
-            }
             return 1;
         }
     }
@@ -819,9 +803,6 @@
         fix_file_permissions($$from_stat_ref[2], $temp_file);
         $rc = rename($temp_file, $to);
         if ( $rc ) {
-            if (defined($ENV{JDK}) && $ENV{JDK} eq 'gcj' && is_jar($from)) {
-                cachejar($to);
-            }
             # handle special packaging of *.dylib files for Mac OS X
             if ( $^O eq 'darwin' )
             {
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.184
diff -u -r1.184 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk	13 Jan 2006 16:36:21 -0000	1.184
+++ openoffice.org/solenv/inc/settings.mk	26 Jan 2006 11:09:10 -0000
@@ -188,7 +188,7 @@
 #required arguments
 .IF "$(JAVACACHE)" != ""
 JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
-JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
+JAVAI=$(JAVAINTERPRETER)
 .ELSE
 JAVAC=$(JAVACOMPILER)
 JAVAI=$(JAVAINTERPRETER)
Index: inc/target.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/target.mk,v
retrieving revision 1.162
diff -u -r1.162 target.mk
--- openoffice.org.orig/solenv/inc/target.mk	14 Dec 2005 15:37:20 -0000	1.162
+++ openoffice.org/solenv/inc/target.mk	26 Jan 2006 11:09:12 -0000
@@ -437,6 +437,11 @@
 JARTARGETDEP=$(JARTARGET).dep
 JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
 .ENDIF			# "$(NOJARDEP)$(NEW_JAR_PACK)"==""
+.IF "$(AOTTARGET)"!=""
+.IF "$(JAVACACHE)" != ""
+AOTTARGETN=$(SOLARBINDIR)$/$(AOTTARGET)
+.ENDIF			# "$(JAVACACHE)" != ""
+.ENDIF			# "$(AOTTARGET)"!=""
 .ENDIF			# "$(JARTARGET)"!=""
 .ELSE			# "$(SOLAR_JAVA)"!=""
 JAVACLASSFILES:=
@@ -1791,6 +1796,7 @@
 		$(APP1TARGETN)	$(APP2TARGETN)	$(APP3TARGETN)		\
 		$(APP4TARGETN)	$(APP5TARGETN)	$(APP6TARGETN)		\
 		$(APP7TARGETN)	$(APP8TARGETN)	$(APP9TARGETN)		\
+		$(AOTTARGETN)	\
 		$(JARTARGETN)	\
 		$(JARTARGETDEPN)	\
 		$(SRC1TARGET)	\
Index: inc/tg_jar.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.18
diff -u -r1.18 tg_jar.mk
--- openoffice.org.orig/solenv/inc/tg_jar.mk	14 Dec 2005 15:37:35 -0000	1.18
+++ openoffice.org/solenv/inc/tg_jar.mk	26 Jan 2006 11:09:12 -0000
@@ -90,5 +108,19 @@
 	+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
 .ENDIF			# "$(JARMANIFEST)"!=""
 	+cd $(CLASSDIR) && zip -u -rX $(@:f) $(subst,\,/ $(JARCLASSDIRS)) $(CHECKZIPRESULT)
+
+.IF "$(AOTTARGETN)"!=""
+AOTFILES = $(foreach,i,$(NEWCLASS) $(SOLARLIBDIR)$/lib$(i:b).jar.so)
+AOTLINKFLAGS=$(subst,.so, $(subst,$(SOLARLIBDIR)$/lib,-l $(AOTFILES)))
+
+$(SOLARLIBDIR)$/lib%.jar.so : $(SOLARBINDIR)$/%.jar
+	$(JAVACOMPILER) -shared -fPIC -Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni -o $@ $<
+
+$(AOTTARGETN) : $(JARTARGETN) $(AOTFILES)
+	$(JAVACOMPILER) --main=$(AOTCLASSNAME) -o $(BIN)$/$(AOTTARGET) \
+		-Wl,-Bsymbolic -O2 --no-bounds-check -fno-store-check -findirect-dispatch -fjni \
+		$(JAVACPS) $(CLASSPATH) $(JARTARGETN) $(SOLARLIB) -L$(LB) \
+		$(AOTLINKFLAGS)
 .ENDIF
 
+.ENDIF
Index: prj/d.lst
===================================================================
RCS file: /cvs/util/xmlhelp/prj/d.lst,v
retrieving revision 1.13
diff -u -r1.13 d.lst
--- openoffice.org.orig/xmlhelp/prj/d.lst	16 Jan 2006 12:34:13 -0000	1.13
+++ openoffice.org/xmlhelp/prj/d.lst	26 Jan 2006 10:57:58 -0000
@@ -1,4 +1,5 @@
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.*
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.*
Index: source/com/sun/star/help/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
retrieving revision 1.21.2.1
diff -u -r1.21.2.1 makefile.mk
--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
+++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk	26 Jan 2006 10:57:59 -0000
@@ -96,6 +96,9 @@
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
 
+AOTCLASSNAME = com.sun.star.help.HelpLinker
+AOTTARGET = HelpLinker
+
 
 # --- Targets ------------------------------------------------------
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	31 Jan 2006 10:15:00 -0000	1.95
+++ .cvsignore	15 Feb 2006 08:30:43 -0000	1.96
@@ -156,3 +156,4 @@
 documentation.openoffice.org-templates.tar.gz
 redhat-templates.tar.gz
 Tigert-templates.tar.gz
+OOB680_m1.tar.bz2

openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
 desktop/scripts/soffice.sh |   98 ++-------------------------------------------
 scripts/soffice.sh         |    0 
 2 files changed, 5 insertions(+), 93 deletions(-)

Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch	15 Nov 2005 16:50:45 -0000	1.2
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch	15 Feb 2006 08:30:43 -0000	1.3
@@ -5,7 +5,7 @@
 diff -u -p -r1.17 soffice.sh
 --- openoffice.org.orig/desktop/scripts/soffice.sh	15 Jun 2005 08:16:47 -0000	1.17
 +++ openoffice.org/desktop/scripts/soffice.sh	5 Jul 2005 07:49:51 -0000
-@@ -73,82 +73,6 @@
+@@ -71,82 +71,6 @@ sd_inst="`pwd`"
  # change back directory
  cd "$sd_cwd"
  
@@ -19,9 +19,9 @@
 -
 -# set search path for shared libraries
 -sd_platform=`uname -s`
--moz_lib=
+-add_moz_lib=
 -for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
--	test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break;
+-	test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
 -done
 -case $sd_platform in
 -  AIX)
@@ -29,9 +29,9 @@
 -    if [ $LIBPATH ]; then
 -      SYSTEM_LIBPATH=$LIBPATH
 -      export SYSTEM_LIBPATH
--      LIBPATH="$sd_prog:$moz_lib":$LIBPATH
+-      LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
 -    else
--      LIBPATH="$sd_prog:$moz_lib"
+-      LIBPATH="$sd_prog$add_moz_lib"
 -    fi
 -    export LIBPATH
 -    ;;
@@ -41,9 +41,9 @@
 -    if [ $DYLD_LIBRARY_PATH ]; then 
 -      SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
 -      export SYSTEM_DYLD_LIBRARY_PATH
--      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH
+-      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
 -    else
--      DYLD_LIBRARY_PATH="$sd_prog:$moz_lib"
+-      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
 -    fi
 -    export DYLD_LIBRARY_PATH
 -    ;;
@@ -53,9 +53,9 @@
 -    if [ $SHLIB_PATH ]; then
 -      SYSTEM_SHLIB_PATH=$SHLIB_PATH
 -      export SYSTEM_SHLIB_PATH
--      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH
+-      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
 -    else
--      SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib
+-      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
 -    fi
 -    export SHLIB_PATH
 -    ;;
@@ -65,9 +65,9 @@
 -    if [ $LD_LIBRARYN32_PATH ]; then
 -       SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
 -       export SYSTEM_LD_LIBRARYN32_PATH
--       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH
+-       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
 -    else
--       LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib"
+-       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
 -    fi
 -    export LD_LIBRARYN32_PATH
 -    ;;
@@ -77,9 +77,9 @@
 -    if [ $LD_LIBRARY_PATH ]; then
 -      SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 -      export SYSTEM_LD_LIBRARY_PATH
--      LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH
+-      LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
 -    else
--      LD_LIBRARY_PATH="$sd_prog:$moz_lib"
+-      LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
 -    fi
 -    export LD_LIBRARY_PATH
 -    ;;
@@ -88,7 +88,7 @@
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
  for arg in $@
-@@ -162,23 +86,11 @@
+@@ -160,23 +84,11 @@ done
  if [ -x "$sd_prog/javaldx" ] ; then
      java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
      if [ "$java_ld_library_path" != "" ] ; then

openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
 config_office/configure.in                       |   20 ++
 config_office/set_soenv.in                       |    1 
 source/cxxhelp/provider/makefile.mk              |    0 
 source/cxxhelp/provider/urlparameter.cxx         |    0 
 util/makefile.mk                                 |    0 
 xmlhelp/source/cxxhelp/provider/makefile.mk      |    6 
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |  220 +++++++++++++++++++----
 xmlhelp/util/makefile.mk                         |   12 +
 8 files changed, 222 insertions(+), 37 deletions(-)

Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	23 Nov 2005 10:20:14 -0000	1.4
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch	15 Feb 2006 08:30:43 -0000	1.5
@@ -44,14 +44,14 @@
 diff -u config_office.orig/set_soenv.in config_office/set_soenv.in
 --- openoffice.org.orig/config_office/set_soenv.in	2005-08-30 15:45:40.000000000 +0100
 +++ openoffice.org/config_office/set_soenv.in	2005-08-30 15:50:51.000000000 +0100
-@@ -1767,6 +1767,7 @@
- ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
- ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
- ToFile( "BSH_JAR",           "@BSH_JAR@",          "e" );
-+ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
+@@ -1769,6 +1769,7 @@ ToFile( "DB_JAR",            "@DB_JAR@",
  ToFile( "SYSTEM_SABLOT",     "@SYSTEM_SABLOT@",    "e" );
  ToFile( "SABLOT_LIBS",       "@SABLOT_LIBS@",      "e" );
  ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
++ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
+ ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
+ ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
+ ToFile( "SYSTEM_CURL",       "@SYSTEM_CURL@",      "e" );
 Index: source/cxxhelp/provider/makefile.mk
 ===================================================================
 RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v
@@ -431,7 +431,7 @@
 diff -u -p -u -r1.7 makefile.mk
 --- openoffice.org.orig/xmlhelp/util/makefile.mk	30 Mar 2005 08:38:50 -0000	1.7
 +++ openoffice.org/xmlhelp/util/makefile.mk	30 Aug 2005 15:10:03 -0000
-@@ -89,6 +89,11 @@ SABLOT3RDLIB=sablot.lib
+@@ -62,6 +62,11 @@
  .ENDIF # wnt
  .ENDIF # sablot3rdlib
  
@@ -443,21 +443,23 @@
  # --- Shared-Library ---------------------------------------------------
  
  SHL1TARGET=$(TARGET)$(UCP_VERSION)
-@@ -102,11 +107,15 @@ SHL1STDLIBS=                     \
+@@ -75,13 +80,18 @@
  	$(CPPULIB)               \
  	$(SALLIB)                \
  	$(VOSLIB)                \
 -	$(SABLOT3RDLIB)          \
  	$(EXPATASCII3RDLIB)      \
  	$(UCBHELPERLIB)          \
+ 	$(SVLLIB)             \
  	$(BERKELEYLIB)
--#	$(BERKELEYCPPLIB)
-+
+ #	$(BERKELEYCPPLIB)
+ 
 +.IF "$(SYSTEM_LIBXSLT)" == "YES"
-+	SHL1STDLIBS+=$(PKGCONFIG_LIBS)
++      SHL1STDLIBS+=$(PKGCONFIG_LIBS)
 +.ELSE
-+	SHL1STDLIBS+=$(SABLOT3RDLIB)
++      SHL1STDLIBS+=$(SABLOT3RDLIB)
 +.ENDIF
- 
++
  SHL1LIBS =                       \
  	$(SLB)$/jaqe.lib         \
+ 	$(SLB)$/jautil.lib       \

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/collator_unicode.hxx                       |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   22 ++++--
 i18npool/source/breakiterator/makefile.mk               |    8 +-
 i18npool/source/collator/collator_unicode.cxx           |    7 +-
 inc/collator_unicode.hxx                                |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |    6 +
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 19 files changed, 72 insertions(+), 72 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	24 Nov 2005 19:16:34 -0000	1.9
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	15 Feb 2006 08:30:43 -0000	1.10
@@ -136,12 +136,11 @@
 diff -u -p -u -r1.7 collator_unicode.cxx
 --- openoffice.org.orig/i18npool/source/collator/collator_unicode.cxx	30 Jul 2004 14:39:21 -0000	1.7
 +++ openoffice.org/i18npool/source/collator/collator_unicode.cxx	13 Sep 2005 13:49:44 -0000
-@@ -74,12 +76,14 @@ Collator_Unicode::Collator_Unicode()
+@@ -48,11 +48,13 @@ Collator_Unicode::Collator_Unicode()
  {
  	implementationName = "com.sun.star.i18n.Collator_Unicode";
  	collator = NULL;
 +	ucacollator = NULL;
-     rulesImage = NULL;
  }
  
  Collator_Unicode::~Collator_Unicode()
@@ -151,18 +150,18 @@
  }
  
  sal_Int32 SAL_CALL
-@@ -103,7 +107,10 @@ Collator_Unicode::loadCollatorAlgorithm(
-         // load ICU collator
-         UErrorCode status = U_ZERO_ERROR;
-         if (rulesImage) {
--            collator = new RuleBasedCollator(rulesImage, status);
-+            ucacollator = (RuleBasedCollator*) icu::Collator::createInstance("", status);
-+         if (! U_SUCCESS(status))
-+            	throw RuntimeException();
-+            collator = new RuleBasedCollator(rulesImage, -1, ucacollator, status);
-         } else {
-            // load ICU collator
-             /** ICU collators are loaded using a locale only.
+@@ -108,7 +110,10 @@ Collator_Unicode::loadCollatorAlgorithm(
+                 }
+                 if (func) {
+                     const sal_uInt8* ruleImage=func();
+-                    collator = new RuleBasedCollator(ruleImage, status);
++                    ucacollator = (RuleBasedCollator*) icu::Collator::createInstance("", status);
++                    if (! U_SUCCESS(status))
++                        throw RuntimeException();
++                    collator = new RuleBasedCollator(ruleImage, -1, ucacollator, status);
+                     if (! U_SUCCESS(status))
+                         throw RuntimeException();
+                 }
 Index: source/hhconvdic.cxx
 ===================================================================
 RCS file: /cvs/sw/linguistic/source/hhconvdic.cxx,v

openoffice.org-1.9.129.ooo54603.fontconfig.patch:
 fontmanager/fontcache.cxx                 |    2 
 fontmanager/fontmanager.cxx               |    9 
 inc/psprint/fontmanager.hxx               |    0 
 psprint/fontmanager.hxx                   |    9 
 psprint/source/fontmanager/fontconfig.cxx |  269 ++++++++++++++++++-----
 source/fontmanager/fontcache.cxx          |    0 
 source/fontmanager/fontconfig.cxx         |    0 
 source/fontmanager/fontmanager.cxx        |    0 
 vcl/inc/outdev.h                          |    3 
 vcl/inc/outfont.hxx                       |   15 +
 vcl/source/gdi/outdev3.cxx                |  339 +++++++++++++++++++++---------
 vcl/source/window/window.cxx              |    5 
 vcl/util/makefile.mk                      |    2 
 13 files changed, 485 insertions(+), 168 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch	3 Jan 2006 17:23:53 -0000	1.4
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch	15 Feb 2006 08:30:43 -0000	1.5
@@ -203,7 +203,7 @@
          DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
          aFontSelData.maSearchName = pFontFamily->GetSearchName();
  
-@@ -3014,115 +3139,101 @@ ImplDevFontListData* ImplDevFontList::Im
+@@ -3014,116 +3139,101 @@ ImplDevFontListData* ImplDevFontList::Im
  // -----------------------------------------------------------------------
  
  ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
@@ -246,6 +246,7 @@
 -            "david", "nachlieli", "lucidagrande", "",
 -            "norasi", "angsanaupc", "",
 -            "khmerossystem", "",
+-	    "phetsarathot", "",
 -            0
 -        };
 -
@@ -530,19 +531,6 @@
          
      rtl::OString getAfmFile( PrintFont* pFont ) const;
      rtl::OString getFontFile( PrintFont* pFont ) const;
-@@ -504,10 +508,10 @@
-     const rtl::OUString& getPSName( fontID nFontID ) const;
- 
-     // get a specific fonts style family
--    family::type PrintFontManager::getFontFamilyType( fontID nFontID ) const;
-+    family::type getFontFamilyType( fontID nFontID ) const;
- 
-     // get a specific fonts family name aliases
--    void PrintFontManager::getFontFamilyAliases( fontID nFontID ) const;
-+    void getFontFamilyAliases( fontID nFontID ) const;
-         
-     // get a specific fonts type
-     fonttype::type getFontType( fontID nFontID ) const
 @@ -729,6 +733,11 @@
      false else
       */
@@ -838,7 +826,7 @@
      if( m_pLib )
          osl_unloadModule( (oslModule)m_pLib );
  }
-@@ -319,19 +391,8 @@ bool PrintFontManager::initFontconfig()
+@@ -319,18 +391,7 @@ bool PrintFontManager::initFontconfig()
      if( ! rWrapper.isValid() )
          return false;
  
@@ -854,12 +842,11 @@
 -                                                    (void *) NULL );
 -    FcPattern* pPattern = rWrapper.FcPatternCreate();
 -    FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
-     rtl_TextEncoding aThreadTextEncoding = osl_getThreadTextEncoding();
 +    FcFontSet* pFSet = rWrapper.getFontSet();
  
      if( pFSet )
      {
-@@ -374,6 +434,8 @@ bool PrintFontManager::initFontconfig()
+@@ -373,6 +434,8 @@ bool PrintFontManager::initFontconfig()
                       );
  #endif
  
@@ -868,7 +855,7 @@
              // only outline fonts are usable to psprint anyway
              if( eOutRes == FcResultMatch && ! outline )
                  continue;
-@@ -516,14 +578,6 @@ bool PrintFontManager::initFontconfig()
+@@ -515,14 +578,6 @@ bool PrintFontManager::initFontconfig()
          }
      }
      
@@ -883,7 +870,7 @@
      // how does one get rid of the config ?
  #if OSL_DEBUG_LEVEL > 1
      fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
-@@ -537,39 +591,14 @@ void PrintFontManager::deinitFontconfig(
+@@ -536,39 +591,14 @@ void PrintFontManager::deinitFontconfig(
      FontCfgWrapper::release();
  }
  
@@ -927,7 +914,7 @@
          {
              case italic::Italic:	 	nSlant = FC_SLANT_ITALIC;break;
              case italic::Oblique:	 	nSlant = FC_SLANT_OBLIQUE;break;
-@@ -578,10 +607,10 @@ bool PrintFontManager::matchFont( FastPr
+@@ -577,10 +607,10 @@ bool PrintFontManager::matchFont( FastPr
          }
          rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant );
      }
@@ -940,7 +927,7 @@
          {
              case weight::Thin:			nWeight = FC_WEIGHT_THIN;break;
              case weight::UltraLight:	nWeight = FC_WEIGHT_ULTRALIGHT;break;
-@@ -598,10 +627,10 @@ bool PrintFontManager::matchFont( FastPr
+@@ -597,10 +627,10 @@ bool PrintFontManager::matchFont( FastPr
          }
          rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight );
      }
@@ -953,7 +940,7 @@
          {
              case width::UltraCondensed:	nWidth = FC_WIDTH_ULTRACONDENSED;break;
              case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-@@ -617,10 +646,10 @@ bool PrintFontManager::matchFont( FastPr
+@@ -616,10 +646,10 @@ bool PrintFontManager::matchFont( FastPr
          }
          rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth );
      }
@@ -966,13 +953,13 @@
          {
              case pitch::Fixed:			nSpacing = FC_MONO;break;
              case pitch::Variable:		nSpacing = FC_PROPORTIONAL;break;
-@@ -628,12 +657,123 @@ bool PrintFontManager::matchFont( FastPr
+@@ -627,12 +657,123 @@ bool PrintFontManager::matchFont( FastPr
                  break;
          }
          rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing );
 +        if (nSpacing == FC_MONO)
 +            rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)"monospace");
-     }
++    }
 +#endif
 +}
 +
@@ -1032,8 +1019,8 @@
 +        // info: destroying the pSet destroys pResult implicitly
 +        // since pResult was "added" to pSet
 +        rWrapper.FcFontSetAdd( pSet, pResult );
-+    }
-+
+     }
+ 
 +    if( pSet )
 +    {
 +        if( pSet->nfont > 0 )
@@ -1081,7 +1068,7 @@
 +        rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() );
 +
 +    addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
- 
++
      rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
      rWrapper.FcDefaultSubstitute( pPattern );
      FcResult eResult = FcResultNoMatch;

openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch:
 HelpDatabases.java    |   80 +++++++++++++++++++++++++++-----------------------
 HelpIndexer.java      |   57 ++++++++++++++++++++---------------
 HelpKeyword.java      |   10 +++---
 HelpLinker.java       |   45 +++++++++++++++-------------
 HelpURLParameter.java |   32 ++++++++++----------
 StringDbt.java        |   24 +++++++--------
 6 files changed, 134 insertions(+), 114 deletions(-)

Index: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch	7 Nov 2005 12:18:22 -0000	1.2
+++ openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch	15 Feb 2006 08:30:43 -0000	1.3
@@ -91,153 +91,9 @@
       	if( b != null )
        	{
  			int sizeOfTitle = ( int ) b[  2 + b[0] +  ( int ) b[ 1+ ( int ) b[0] ] ];
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/CreateDb.java.ark	2005-07-23 01:11:47.000000000 +0200
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/CreateDb.java	2005-07-23 02:06:04.000000000 +0200
-@@ -18,26 +18,31 @@
- 	}
- 
- 	void iterate(String dbName) {
--		Db table = null;
-+		DatabaseConfig cfg = DatabaseConfig.DEFAULT;
-+		cfg.setReadOnly(true);
-+		cfg.setType(DatabaseType.BTREE);
-+		cfg.setErrorStream(System.err);
-+		cfg.setErrorPrefix("HelpAccess");
-+		Database table = null;
- 		try {
--			table = new Db(null, 0);
--		} catch (DbException e) {
-+			table = new Database(dbName, null, cfg);
-+		} catch (DatabaseException e) {
- 			System.out.println("Error initializing database");
-+		} catch (FileNotFoundException fnfe) {
-+			System.err.println("HelpAccess: " + fnfe.toString());
-+			System.exit(1);
- 		}
- 
--		table.set_error_stream(System.err);
--		table.set_errpfx("HelpAccess");
- 		try {
--			table.open(null,dbName, null, Db.DB_BTREE, Db.DB_RDONLY, 0644);
--			Dbc cursor = table.cursor(null, 0);
-+			Cursor cursor = table.openCursor(null, CursorConfig.DEFAULT);
- 
- 			StringDbt key = new StringDbt();
- 			StringDbt data = new StringDbt();
- 			//
- 			boolean first = true;
--			key.set_flags(Db.DB_DBT_MALLOC);
-+			key.setReuseBuffer(false);
- 			// The cursor must allocate the necessary memory
--			data.set_flags(Db.DB_DBT_MALLOC);
-+			data.setReuseBuffer(false);
- 			String filePrefix =
- 				System.getProperty("com.sun.star.help.Directory");
- 			File outFile = new File("e:/helpdata/test1/filelist");
-@@ -54,7 +59,7 @@
- 				e.printStackTrace();
- 			}
- 
--			while (Db.DB_NOTFOUND != cursor.get(key, data, Db.DB_NEXT)) {
-+			while (OperationStatus.NOTFOUND != cursor.getNext(key, data, LockMode.DEFAULT)) {
- 				// String keyStr = new String( key.get_data(),0,key.get_size() );
- 				// String dataStr = new String( data.get_data(),0,data.get_size() );
- 
-@@ -80,14 +85,14 @@
- 					outStream.write(keyStr + " " + dataStr);
- 				}
- 				if (first) {
--					key.set_flags(Db.DB_DBT_REALLOC);
--					data.set_flags(Db.DB_DBT_REALLOC);
-+					key.setReuseBuffer(true);
-+					data.setReuseBuffer(true);
- 					first = false;
- 				}
- 			}
--		} catch (DbRunRecoveryException e) {
-+		} catch (RunRecoveryException e) {
- 			System.out.println("Not able to create cursor: " + e.getMessage());
--		} catch (DbException dbe) {
-+		} catch (DatabaseException dbe) {
- 			System.err.println("HelpAccess: " + dbe.toString());
- 			System.exit(1);
- 		} catch (FileNotFoundException fnfe) {
-@@ -107,24 +112,21 @@
- 		String data3 = "dumm/testpage.xml";
- 
- 		try {
--			Db table = new Db(null, 0);
--			table.set_error_stream(System.err);
--			table.set_errpfx("AccessExample");
--			table.open(
--                null,
--				"e:/rvp603b/help/helpaccess.db",
--				null,
--				Db.DB_HASH,
--				Db.DB_CREATE,
--				0644);
-+			DatabaseConfig cfg = DatabaseConfig.DEFAULT;
-+			cfg.setErrorStream(System.err);
-+			cfg.setErrorPrefix("AccessExample");
-+			cfg.setType(DatabaseType.HASH);
-+			cfg.setMode(0644);
-+			cfg.setAllowCreate(true);
-+			Database table = new Database("e:/rvp603b/help/helpaccess.db", null, cfg);
- 			StringDbt key = new StringDbt(key1);
- 			StringDbt data = new StringDbt(data1);
- 			try {
--				int err;
--				if ((err = table.put(null, key, data, 0)) == Db.DB_KEYEXIST) {
-+				OperationStatus err;
-+				if ((err = table.put(null, key, data)) == OperationStatus.KEYEXIST) {
- 					System.out.println("Key " + " already exists.");
- 				}
--			} catch (DbException dbe) {
-+			} catch (DatabaseException dbe) {
- 				System.out.println(dbe.toString());
- 			}
- 			System.out.println(" inserted first key ");
-@@ -132,11 +134,11 @@
- 			key = new StringDbt(key2);
- 			data = new StringDbt(data2);
- 			try {
--				int err;
--				if ((err = table.put(null, key, data, 0)) == Db.DB_KEYEXIST) {
-+				OperationStatus err;
-+				if ((err = table.put(null, key, data)) == OperationStatus.KEYEXIST) {
- 					System.out.println("Key " + " already exists.");
- 				}
--			} catch (DbException dbe) {
-+			} catch (DatabaseException dbe) {
- 				System.out.println(dbe.toString());
- 			}
- 			System.out.println(" inserted second key ");
-@@ -144,17 +146,17 @@
- 			key = new StringDbt(key3);
- 			data = new StringDbt(data3);
- 			try {
--				int err;
--				if ((err = table.put(null, key, data, 0)) == Db.DB_KEYEXIST) {
-+				OperationStatus err;
-+				if ((err = table.put(null, key, data)) == OperationStatus.KEYEXIST) {
- 					System.out.println("Key " + " already exists.");
- 				}
--			} catch (DbException dbe) {
-+			} catch (DatabaseException dbe) {
- 				System.out.println(dbe.toString());
- 			}
- 			System.out.println(" inserted third key ");
- 
--			table.close(0);
--		} catch (DbException dbe) {
-+			table.close(false);
-+		} catch (DatabaseException dbe) {
- 			System.err.println("AccessExample: " + dbe.toString());
- 			System.exit(1);
- 		} catch (FileNotFoundException fnfe) {
 --- openoffice.org.orig/xmlhelp/source/com/sun/star/help/HelpKeyword.java.ark	2005-07-23 01:21:45.000000000 +0200
 +++ openoffice.org/xmlhelp/source/com/sun/star/help/HelpKeyword.java	2005-07-23 02:06:20.000000000 +0200
-@@ -9,8 +9,8 @@ package com.sun.star.help;
+@@ -9,8 +9,8 @@
  import java.util.Enumeration;
  import java.util.Hashtable;
  
@@ -248,16 +104,10 @@
  
  /**
   * @author ab106281
-@@ -58,7 +58,7 @@ public class HelpKeyword {
- 		data.append(id);
- 	}
- 
+@@ -61,1 +61,1 @@
 -	void dump(Db table) {
 +	void dump(Database table) {
- 		Enumeration enumer = _hash.keys();
- 		int j = 0;
- 		String[] list = new String[_hash.size()];
-@@ -71,8 +71,8 @@ public class HelpKeyword {
+@@ -71,8 +71,8 @@
  			StringDbt key = new StringDbt(list[i]);
  			StringDbt value = new StringDbt(data.getString());
  			try {
@@ -642,38 +492,32 @@
  import com.sun.xmlsearch.util.PrefixTranslator;
  import com.sun.xmlsearch.xml.indexer.XmlIndexBuilder;
  
-@@ -394,27 +396,29 @@
- 		// cleanup tmp file even if exiting by exception
+@@ -394,20 +396,23 @@
+ 		File helpTextFile = File.createTempFile("helptext", ".ht");
+ 		helpTextFile.deleteOnExit();
  		String helpTextFileName = helpTextFile.getAbsolutePath();
- 		// reopen the helptext file as a Berkeley DB
 -		Db helpText = new Db(null, 0);
- 		helpTextFile.delete();
--		helpText.open(null,helpTextFileName, null, Db.DB_BTREE, Db.DB_CREATE, 0644);
+-		helpText.open(null,helpTextFileName, null, Db.DB_BTREE, Db.DB_TRUNCATE, 0644);
 +		DatabaseConfig cfg=DatabaseConfig.DEFAULT;
 +		cfg.setType(DatabaseType.BTREE);
 +		cfg.setAllowCreate(true);
++		cfg.setTruncate(true);
 +		cfg.setReadOnly(false);
 +		cfg.setMode(0644);
 +		Database helpText = new Database(helpTextFileName, null, cfg);
  
  		File dbBaseFile = File.createTempFile("database", "db");
  		dbBaseFile.deleteOnExit();
- 		// cleanup tmp file even if exiting by exception
  		String dbBaseFileName = dbBaseFile.getAbsolutePath();
- 		// reopen the database file as a Berkeley DB
 -		Db dbBase = new Db(null, 0);
- 		dbBaseFile.delete();
--		dbBase.open(null,dbBaseFileName, null, Db.DB_BTREE, Db.DB_CREATE, 0644);
+-		dbBase.open(null,dbBaseFileName, null, Db.DB_BTREE, Db.DB_TRUNCATE, 0644);
 +		Database dbBase = new Database(dbBaseFileName, null, cfg);
  
  		File keyWordFile = File.createTempFile("keybase", "key");
  		keyWordFile.deleteOnExit();
- 		// cleanup tmp file even if exiting by exception
  		String keyWordFileName = keyWordFile.getAbsolutePath();
- 		// reopen the database file as a Berkeley DB
 -		Db keyWord = new Db(null, 0);
- 		keyWordFile.delete();
--		keyWord.open(null,keyWordFileName, null, Db.DB_BTREE, Db.DB_CREATE, 0644);
+-		keyWord.open(null,keyWordFileName, null, Db.DB_BTREE, Db.DB_TRUNCATE, 0644);
 +		Database keyWord = new Database(keyWordFileName, null, cfg);
  		HelpKeyword helpKeyword = new HelpKeyword();
  

openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch:
 dictionaries/prj/build.lst                                         |    3 
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |   37 +++++++--
 lingucomponent/source/spellcheck/spell/sspellimp.cxx               |   40 ++++++++--
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx                |   39 ++++++++-
 prj/build.lst                                                      |    0 
 source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx                |    0 
 source/spellcheck/spell/sspellimp.cxx                              |    0 
 source/thesaurus/libnth/nthesimp.cxx                               |    0 
 8 files changed, 100 insertions(+), 19 deletions(-)

Index: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch	15 Nov 2005 17:01:10 -0000	1.5
+++ openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch	15 Feb 2006 08:30:43 -0000	1.6
@@ -283,5 +283,5 @@
  di	dictionaries\ru_RU	nmake	-	all	di_ru_RU di_diclst NULL
  di      dictionaries\th_TH      nmake   -       all     di_th_TH di_diclst NULL
  di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ di_diclst NULL
--di      dictionaries\util       nmake   -       all     di_util di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
-+di      dictionaries\util       nmake   -       all     di_util di_contrib di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
+-di      dictionaries\util       nmake   -       all     di_util di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_hu_HU di_it_IT di_nl_NL di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
++di      dictionaries\util       nmake   -       all     di_util di_contrib di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_hu_HU di_it_IT di_nl_NL di_ru_RU di_th_TH di_sw_TZ di_diclst NULL

openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch:
 scp2/source/ooo/profileitem_ooo.scp |    2 +-
 source/ooo/profileitem_ooo.scp      |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch	29 Jun 2005 09:38:01 -0000	1.3
+++ openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch	15 Feb 2006 08:30:43 -0000	1.4
@@ -5,12 +5,9 @@
 diff -u -p -u -r1.23 profileitem_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp	17 Jun 2005 14:15:05 -0000	1.23
 +++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp	22 Jun 2005 07:52:24 -0000
-@@ -161,9 +161,9 @@ ProfileItem gid_Profileitem_Bootstrap_Us
-     Order = 3;
-     Key = "UserInstallation";
-   #ifdef WNT
--    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
-+    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME2.0";
+@@ -95,7 +95,7 @@
+   #elif defined MACOSX
+     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME%20%PRODUCTVERSION";
    #else
 -    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME%USERDIRPRODUCTVERSION";
 +    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME2.0";

openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch:
 desktop/scripts/soffice.sh |    2 ++
 scripts/soffice.sh         |    0 
 2 files changed, 2 insertions(+)

Index: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch	8 Nov 2005 13:08:32 -0000	1.5
+++ openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch	15 Feb 2006 08:30:43 -0000	1.6
@@ -10,7 +10,7 @@
  #*************************************************************************
  
 +if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
-+
++export SAL_ENABLE_NATIVE_XFONTS=0
  #
  # STAR_PROFILE_LOCKING_DISABLED=1
  # export STAR_PROFILE_LOCKING_DISABLED

openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch:
 connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx                 |   37 +
 officecfg/registry/data/org/openoffice/Office/Writer.xcu                 |   27 
 openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx               |   11 
 openoffice.org/connectivity/source/drivers/evoab2/EApi.h                 |  161 ++---
 openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx           |   26 
 openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx           |    5 
 openoffice.org/connectivity/source/drivers/evoab2/NColumns.cxx           |  106 +++
 openoffice.org/connectivity/source/drivers/evoab2/NColumns.hxx           |   73 ++
 openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx  |  286 ++++++----
 openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx |    5 
 openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx         |  195 ++++++
 openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx |   40 +
 openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx |   11 
 openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx         |   14 
 openoffice.org/connectivity/source/drivers/evoab2/NTable.cxx             |  108 +++
 openoffice.org/connectivity/source/drivers/evoab2/NTable.hxx             |   84 ++
 openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx            |   19 
 openoffice.org/connectivity/source/drivers/evoab2/makefile.mk            |    2 
 openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx                     |   19 
 openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx                       |    6 
 openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc                    |   10 
 openoffice.org/dbaccess/source/ui/misc/dbumiscres.src                    |   34 -
 openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx                      |   16 
 openoffice.org/extensions/source/abpilot/abpresid.hrc                    |    7 
 openoffice.org/extensions/source/abpilot/abspilot.cxx                    |    6 
 openoffice.org/extensions/source/abpilot/abspilot.src                    |   14 
 openoffice.org/extensions/source/abpilot/addresssettings.hxx             |    1 
 openoffice.org/extensions/source/abpilot/datasourcehandling.cxx          |    8 
 openoffice.org/extensions/source/abpilot/datasourcehandling.hxx          |    3 
 openoffice.org/extensions/source/abpilot/typeselectionpage.cxx           |    9 
 openoffice.org/extensions/source/abpilot/typeselectionpage.hxx           |    1 
 source/drivers/evoab2/NDatabaseMetaData.hxx                              |    0 
 32 files changed, 1058 insertions(+), 286 deletions(-)

Index: openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch	15 Dec 2005 22:10:48 -0000	1.5
+++ openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch	15 Feb 2006 08:30:43 -0000	1.6
@@ -1,210 +1,3 @@
-Index: source/ui/dlg/dbwizsetup.cxx
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx,v
-retrieving revision 1.13
-diff -u -r1.13 dbwizsetup.cxx
---- openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx	8 Sep 2005 14:57:34 -0000	1.13
-+++ openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx	15 Dec 2005 14:44:15 -0000
-@@ -242,10 +242,11 @@
- #define OUTLOOK_PATH           14
- #define MOZILLA_PATH           15
- #define EVOLUTION_PATH         16
--#define THUNDERBIRD_PATH       17
--#define CREATENEW_PATH         18
--#define USERDEFINED_PATH       19
--#define OPEN_DOC_PATH          20
-+#define EVOLUTION_PATH_LOCAL   17
-+#define THUNDERBIRD_PATH       18
-+#define CREATENEW_PATH         19
-+#define USERDEFINED_PATH       20
-+#define OPEN_DOC_PATH          21
- 
- OFinalDBPageSetup*          pFinalPage;
- 
-@@ -388,6 +389,14 @@
-     else
-         declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
- 
-+if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LOCAL))
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+    else
-+        declarePath( EVOLUTION_PATH_LOCAL, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+ if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP))
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+    else
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-     if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
-         declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-     else
-@@ -534,6 +543,8 @@
-             { DST_MOZILLA,      MOZILLA_PATH        },
-             { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
-             { DST_EVOLUTION,    EVOLUTION_PATH      },
-+            { DST_EVOLUTION_LOCAL,    EVOLUTION_PATH_LOCAL      },
-+            { DST_EVOLUTION_LDAP,    EVOLUTION_PATH      },
-             { DST_USERDEFINE1,  USERDEFINED_PATH    },
- 		    { DST_USERDEFINE2,  USERDEFINED_PATH    },
- 		    { DST_USERDEFINE3,  USERDEFINED_PATH    },
-@@ -605,6 +616,8 @@
- 	switch ( m_eType )
-     {
-         case DST_EVOLUTION:
-+        case DST_EVOLUTION_LOCAL:
-+        case DST_EVOLUTION_LDAP:
-         case DST_OUTLOOK:
-         case DST_OUTLOOKEXP:
- 		case DST_MOZILLA:
-Index: source/ui/inc/dsntypes.hxx
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/inc/dsntypes.hxx,v
-retrieving revision 1.19
-diff -u -r1.19 dsntypes.hxx
---- openoffice.org.orig/dbaccess/source/ui/inc/dsntypes.hxx	24 Oct 2005 08:31:59 -0000	1.19
-+++ openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx	15 Dec 2005 14:44:15 -0000
-@@ -76,7 +76,9 @@
- 	DST_OUTLOOK		=	15,	
- 	DST_OUTLOOKEXP	=	16,	
- 	DST_EVOLUTION	=	17,
--	DST_EMBEDDED	=	18,
-+        DST_EVOLUTION_LOCAL =   18,
-+        DST_EVOLUTION_LDAP  =   19,
-+	DST_EMBEDDED	=	20,
- 
- 	DST_USERDEFINE1,	/// first user defined driver
- 	DST_USERDEFINE2,
-Index: source/ui/misc/dbumiscres.hrc
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/misc/dbumiscres.hrc,v
-retrieving revision 1.7
-diff -u -r1.7 dbumiscres.hrc
---- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.hrc	8 Sep 2005 16:13:11 -0000	1.7
-+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc	15 Dec 2005 14:44:15 -0000
-@@ -54,9 +54,11 @@
- #define STR_LDAP				13
- #define STR_OUTLOOK				14
- #define STR_OUTLOOKEXP			15
--#define STR_EVOLUTION			16 
--#define STR_EMBEDDED			17
--#define STR_THUNDERBIRD			18
-+#define STR_EVOLUTION_GROUPWISE       16
-+#define STR_EVOLUTION_LOCAL           17
-+#define STR_EVOLUTION_LDAP            18
-+#define STR_EMBEDDED			19
-+#define STR_THUNDERBIRD			20
- 
- #define STR_END					STR_THUNDERBIRD + 1
- 
-Index: source/ui/misc/dbumiscres.src
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/misc/dbumiscres.src,v
-retrieving revision 1.69
-diff -u -r1.69 dbumiscres.src
---- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.src	23 Sep 2005 14:17:42 -0000	1.69
-+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.src	15 Dec 2005 14:44:15 -0000
-@@ -107,9 +107,17 @@
- 	{
- 		Text  ="sdbc:address:outlookexp";
- 	};
--	String STR_EVOLUTION
--	{
--		Text  ="sdbc:address:evolution";
-+        String STR_EVOLUTION_LOCAL
-+        {
-+               Text  ="sdbc:address:evolution:local";
-+        };
-+        String STR_EVOLUTION_LDAP
-+        {
-+                Text  ="sdbc:address:evolution:ldap";
-+        };
-+        String STR_EVOLUTION_GROUPWISE
-+        {
-+                Text  ="sdbc:address:evolution:groupwise";
- 	};	
- 	String STR_EMBEDDED
- 	{
-@@ -195,11 +203,21 @@
- 		Text [ de ] = "Microsoft Windows Adressbuch";
- 		Text[ en-US ] = "Microsoft Windows Address Book";
- 	};
--	String STR_EVOLUTION
--	{
--		Text [ de ] = "Evolution Adressbuch";
--		Text[ en-US ] = "Evolution Address Book";
--	};
-+        String STR_EVOLUTION_LOCAL
-+        {
-+                Text [ de ] = "Evolution Local Adressbuch";
-+                Text[ en-US ] = "Evolution Local";
-+        };
-+        String STR_EVOLUTION_LDAP
-+        {
-+               Text [ de ] = "Evolution LDAP Adressbuch";
-+               Text[ en-US ] = "Evolution LDAP";
-+        };
-+        String STR_EVOLUTION_GROUPWISE
-+        {
-+                Text [ de ] = "Groupwise Adressbuch";
-+                Text[ en-US ] = "Groupwise";
-+        };
- 	String STR_EMBEDDED
- 	{
- 		Text [ de ] = "Interne Datenbank";
-Index: source/ui/misc/dsntypes.cxx
-===================================================================
-RCS file: /cvs/dba/dbaccess/source/ui/misc/dsntypes.cxx,v
-retrieving revision 1.27
-diff -u -r1.27 dsntypes.cxx
---- openoffice.org.orig/dbaccess/source/ui/misc/dsntypes.cxx	23 Sep 2005 12:39:42 -0000	1.27
-+++ openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx	15 Dec 2005 14:44:15 -0000
-@@ -387,6 +387,8 @@
- 			case DST_OUTLOOKEXP:
- 			case DST_FLAT:
-             case DST_EVOLUTION:
-+            case DST_EVOLUTION_LOCAL:
-+            case DST_EVOLUTION_LDAP:
- 	 		case DST_THUNDERBIRD:
- 			case DST_CALC:
-                 bSupportsTableCreation = FALSE;
-@@ -432,6 +434,8 @@
- 		case DST_OUTLOOKEXP:
- 		case DST_JDBC:
-         case DST_EVOLUTION:
-+        case DST_EVOLUTION_LOCAL:
-+        case DST_EVOLUTION_LDAP:
- 			bEnableBrowseButton = FALSE;
- 			break;
- 		default:
-@@ -466,12 +470,14 @@
- 		case DST_ADO:
- 		case DST_LDAP:
-         case DST_CALC:
-+		case DST_EVOLUTION:
-+		case DST_EVOLUTION_LDAP:
- 			return sal_True;
- 			break;
- 		case DST_MSACCESS:
- 		case DST_MOZILLA:
- 		case DST_THUNDERBIRD:
--		case DST_EVOLUTION:
-+		case DST_EVOLUTION_LOCAL:
- 		case DST_OUTLOOK:
-         case DST_OUTLOOKEXP: //????
- 		case DST_DBASE:
-@@ -548,8 +554,12 @@
- 			return DST_OUTLOOK;
- 		if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator))
- 			return DST_OUTLOOKEXP;
--		if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator))
--			return DST_EVOLUTION;
-+        if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator))
-+            return DST_EVOLUTION_LDAP;
-+        if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator))
-+            return DST_EVOLUTION;
-+        if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator))
-+            return DST_EVOLUTION_LOCAL;
- 	}
- 
- 	// find third :
 --- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-04-18 20:39:35.000000000 +0530
 +++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-05-10 17:30:14.000000000 +0530
 @@ -74,6 +74,33 @@
@@ -625,13 +418,9 @@
 +	m_pTable->refreshColumns();
 +}
 
-Index: source/drivers/evoab2/EApi.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/EApi.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 EApi.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx	8 Sep 2005 05:48:53 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	2006-01-18 13:08:40.000000000 +0000
 @@ -36,13 +36,14 @@
  #include <rtl/ustring.hxx>
  #include <osl/module.h>
@@ -677,13 +466,9 @@
  	    osl_unloadModule( aModule );
  	}
      }
-Index: source/drivers/evoab2/EApi.h
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/EApi.h,v
-retrieving revision 1.3
-diff -u -r1.3 EApi.h
---- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.h	8 Sep 2005 05:49:08 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.h	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.h openoffice.org/connectivity/source/drivers/evoab2/EApi.h
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.h	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/EApi.h	2006-01-18 13:08:40.000000000 +0000
 @@ -51,52 +51,41 @@
  // We attempt to define a minimum API that we use:
  
@@ -878,13 +663,21 @@
  G_END_DECLS
  #endif
 +
-Index: source/drivers/evoab2/NCatalog.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NCatalog.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NCatalog.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.cxx	8 Sep 2005 05:49:21 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/makefile.mk openoffice.org/connectivity/source/drivers/evoab2/makefile.mk
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/makefile.mk	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/makefile.mk	2006-01-18 13:08:51.000000000 +0000
+@@ -58,6 +58,8 @@
+ 
+ EXCEPTIONSFILES=\
+ 	$(SLO)$/NDriver.obj \
++        $(SLO)$/NTable.obj \
++        $(SLO)$/NColumns.obj \
+ 	$(SLO)$/NTables.obj \
+ 	$(SLO)$/NCatalog.obj \
+ 	$(SLO)$/NConnection.obj \
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.cxx openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx	2006-01-18 13:08:40.000000000 +0000
 @@ -72,7 +72,7 @@
  {
  	TStringVector aVector;
@@ -922,13 +715,9 @@
 +        return m_pTables;
 +}
 +
-Index: source/drivers/evoab2/NCatalog.hxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NCatalog.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 NCatalog.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.hxx	8 Sep 2005 05:49:37 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.hxx openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.hxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx	2006-01-18 13:08:41.000000000 +0000
 @@ -51,11 +51,14 @@
              ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
  		public:
@@ -945,29 +734,9 @@
  		};
  	}
  }
-Index: source/drivers/evoab2/NConnection.hxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NConnection.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 NConnection.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NConnection.hxx	8 Sep 2005 05:50:04 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NConnection.hxx	15 Dec 2005 14:45:24 -0000
-@@ -117,7 +117,7 @@
- 			inline const OEvoabDriver*	getDriver()				const { return static_cast< const OEvoabDriver* >( m_pDriver );			}
- 			
- 			SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;}
--			SDBCAddress::sdbc_address_type setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
-+			void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
- 						
- 			// OComponentHelper
- 			virtual void SAL_CALL disposing(void);
-Index: source/drivers/evoab2/NDatabaseMetaData.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NDatabaseMetaData.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	8 Sep 2005 05:50:17 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -89,129 +89,191 @@
  		static sal_Int32    const s_nNULLABLE = 1;
  		static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
@@ -981,6 +750,84 @@
 -		"id",
 -		"list-show-addresses"
 -};
+-
+-static void
+-initFields()
+-{
+-	if( !pFields )
+-	{
+-		::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+-		if( !pFields )
+-		{
+-			guint        nProps;
+-			GParamSpec **pProps;
+-			GParamSpec **pToBeFields;
+-			pProps = g_object_class_list_properties
+-					( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
+-					  &nProps );
+-			pToBeFields = g_new0( GParamSpec *, nProps );
+-
+-			for ( guint i = 0; i < nProps; i++ )
+-			{
+-				switch (pProps[i]->value_type)
+-				{
+-				case G_TYPE_STRING:
+-				case G_TYPE_BOOLEAN:
+-				{
+-					bool bAdd = true;
+-					const char *pName = g_param_spec_get_name( pProps[i] );
+-					for (int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
+-					{
+-						if( !strcmp( pBlackList[j], pName ) )
+-						{
+-							bAdd = false;
+-							break;
+-						}
+-					}
+-					if( bAdd )
+-						pToBeFields[ nFields++ ] = g_param_spec_ref( pProps[i] );
+-					break;
+-				}
+-				default:
+-					break;
+-				}
+-			}
+-			pFields = pToBeFields;
+-		}
+-	}
+-}
+-
+-guint
+-getFieldCount()
+-{
+-	initFields();
+-	return nFields;
+-}
+-
+-const GParamSpec *
+-getField(guint n)
+-{
+-	initFields();
+-	if( n < nFields )
+-		return pFields[n];
+-	else
+-		return NULL;
+-}
+-
+-sal_Int32
+-getFieldType( sal_Int32 nCol )
+-{
+-	sal_Int32 nType = DataType::VARCHAR;
+-	initFields();
+-	if (nCol >= 0 && nCol < nFields )
+-	{
+-		if( pFields[nCol]->value_type == G_TYPE_STRING )
+-			nType = DataType::VARCHAR;
+-		else 
+-			nType = DataType::BIT;
+-	}
+-	return nType;
+-}
 +        static const char *pBlackList[] = 
 +        {
 +            "id",
@@ -1109,88 +956,10 @@
 +        rtl::OUString aName;
 +        initFields();
  
--static void
--initFields()
+-rtl::OUString
+-getFieldTypeName( sal_Int32 nCol )
 -{
--	if( !pFields )
--	{
--		::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
--		if( !pFields )
--		{
--			guint        nProps;
--			GParamSpec **pProps;
--			GParamSpec **pToBeFields;
--			pProps = g_object_class_list_properties
--					( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
--					  &nProps );
--			pToBeFields = g_new0( GParamSpec *, nProps );
--
--			for ( guint i = 0; i < nProps; i++ )
--			{
--				switch (pProps[i]->value_type)
--				{
--				case G_TYPE_STRING:
--				case G_TYPE_BOOLEAN:
--				{
--					bool bAdd = true;
--					const char *pName = g_param_spec_get_name( pProps[i] );
--					for (int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
--					{
--						if( !strcmp( pBlackList[j], pName ) )
--						{
--							bAdd = false;
--							break;
--						}
--					}
--					if( bAdd )
--						pToBeFields[ nFields++ ] = g_param_spec_ref( pProps[i] );
--					break;
--				}
--				default:
--					break;
--				}
--			}
--			pFields = pToBeFields;
--		}
--	}
--}
--
--guint
--getFieldCount()
--{
--	initFields();
--	return nFields;
--}
--
--const GParamSpec *
--getField(guint n)
--{
--	initFields();
--	if( n < nFields )
--		return pFields[n];
--	else
--		return NULL;
--}
--
--sal_Int32
--getFieldType( sal_Int32 nCol )
--{
--	sal_Int32 nType = DataType::VARCHAR;
--	initFields();
--	if (nCol >= 0 && nCol < nFields )
--	{
--		if( pFields[nCol]->value_type == G_TYPE_STRING )
--			nType = DataType::VARCHAR;
--		else 
--			nType = DataType::BIT;
--	}
--	return nType;
--}
--
--rtl::OUString
--getFieldTypeName( sal_Int32 nCol )
--{
--	switch( getFieldType( nCol ) )
+-	switch( getFieldType( nCol ) )
 -	{
 -	case DataType::BIT:
 -			return ::rtl::OUString::createFromAscii( "BIT" );
@@ -1280,64 +1049,9 @@
  			// COLUMN_NAME
  			aRow[4] = new ORowSetValueDecorator( getFieldName( i ) );
  			// ORDINAL_POSITION
-Index: source/drivers/evoab2/NDatabaseMetaData.hxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 NDatabaseMetaData.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	8 Sep 2005 05:50:31 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	15 Dec 2005 14:45:24 -0000
-@@ -60,13 +60,37 @@
- 		//**************************************************************
- 		//************ Class: OEvoabDatabaseMetaData
- 		//**************************************************************
-+		typedef struct{
-+			gboolean bIsSplittedValue;
-+			GParamSpec *pField;
-+		}ColumnProperty;
- 
--		const GParamSpec *getField(guint n);
--		guint             getFieldCount() G_GNUC_CONST;
--		sal_Int32		 getFieldType(sal_Int32 nCol) G_GNUC_CONST;
--		rtl::OUString	 getFieldTypeName(sal_Int32 nCol) G_GNUC_CONST;
--		rtl::OUString     getFieldName(sal_Int32 nCol) G_GNUC_CONST;
--		
-+		typedef enum {
-+            DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP,
-+		    WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP,
-+            HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP,
-+		    OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP
-+		}ColumnNumber;
-+ 		sal_Int32        findEvoabField(const rtl::OUString& aColName);
-+        typedef  struct {
-+			const gchar *pColumnName;
-+			ColumnNumber value;
-+		}SplitEvoColumns;
-+
-+		static SplitEvoColumns evo_addr[] = {
-+            {"addr-line1",DEFAULT_ADDR_LINE1},{"addr-line2",DEFAULT_ADDR_LINE2},{"city",DEFAULT_CITY},{"state",DEFAULT_STATE},{"country",DEFAULT_COUNTRY},{"zip",DEFAULT_ZIP},
-+			{"work-addr-line1",WORK_ADDR_LINE1},{"work-addr-line2",WORK_ADDR_LINE2},{"work-city",WORK_CITY},{"work-state",WORK_STATE},{"work-country",WORK_COUNTRY},{"work-zip",WORK_ZIP},
-+			{"home-addr-line1",HOME_ADDR_LINE1},{"home-addr-line2",HOME_ADDR_LINE2},{"home-addr-City",HOME_CITY},{"home-state",HOME_STATE},{"home-country",HOME_COUNTRY},{"home-zip",HOME_ZIP},                      
-+			{"other-addr-line1",OTHER_ADDR_LINE1},{"other-addr-line2",OTHER_ADDR_LINE2},{"other-addr-city",OTHER_CITY},{"other-addr-state",OTHER_STATE},{"other-addr-country",OTHER_COUNTRY},{"other-addr-zip",OTHER_ZIP}
-+			};
-+
-+		const ColumnProperty *getField(guint n);
-+		guint            getFieldCount();
-+		sal_Int32	 getFieldType(sal_Int32 nCol);
-+		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
-+		rtl::OUString    getFieldName(sal_Int32 nCol);
-+
-+		void free_column_resources();
- 		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
- 		{
- 			OEvoabConnection*	                   m_pConnection;
-Index: source/drivers/evoab2/NPreparedStatement.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NPreparedStatement.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NPreparedStatement.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	8 Sep 2005 05:51:42 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NPreparedStatement.cxx openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -121,9 +121,8 @@
  	::osl::MutexGuard aGuard( m_aMutex );
  	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -1358,13 +1072,9 @@
  }
  // -------------------------------------------------------------------------
  
-Index: source/drivers/evoab2/NResultSet.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSet.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NResultSet.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx	8 Sep 2005 05:52:10 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -276,6 +276,7 @@
  			m_pConnection->setPassword( aPassword );
  		}
@@ -1642,13 +1352,9 @@
  	}
  	OSL_TRACE("In/Out: OEvoabResultSet::close" );
  	dispose();
-Index: source/drivers/evoab2/NResultSetMetaData.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NResultSetMetaData.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	8 Sep 2005 05:52:42 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -45,6 +45,7 @@
  #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
  #include <com/sun/star/sdbc/DataType.hpp>
@@ -1736,13 +1442,9 @@
  	rtl::OUString aLabel;
  
  	if( pSpec )
-Index: source/drivers/evoab2/NResultSetMetaData.hxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 NResultSetMetaData.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	8 Sep 2005 05:52:57 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	2006-01-18 13:08:51.000000000 +0000
 @@ -46,6 +46,9 @@
  #ifndef _CONNECTIVITY_EVOAB_CONNECTION_HXX_
  #include "NConnection.hxx"
@@ -1772,13 +1474,9 @@
  		  /// Avoid ambigous cast error from the compiler.
  		  inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
  		  { return this; }
-Index: source/drivers/evoab2/NStatement.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NStatement.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NStatement.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NStatement.cxx	8 Sep 2005 05:53:24 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NStatement.cxx openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NStatement.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -195,8 +195,7 @@
  EBookQuery *
  OStatement_Base::createTrue()
@@ -1811,13 +1509,9 @@
  	}
  	m_xResultSet = xRS;
  	
-Index: source/drivers/evoab2/NTables.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NTables.cxx,v
-retrieving revision 1.3
-diff -u -r1.3 NTables.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NTables.cxx	8 Sep 2005 05:53:50 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx	15 Dec 2005 14:45:24 -0000
+diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NTables.cxx openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NTables.cxx	2006-01-18 12:56:36.000000000 +0000
++++ openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx	2006-01-18 13:08:51.000000000 +0000
 @@ -78,7 +78,9 @@
  #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
  #include "NDebug.hxx"
@@ -1860,153 +1554,293 @@
  	::comphelper::disposeComponent(xResult);
  
  	return xRet;
-Index: source/drivers/evoab2/makefile.mk
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/makefile.mk,v
-retrieving revision 1.3
-diff -u -r1.3 makefile.mk
---- openoffice.org.orig/connectivity/source/drivers/evoab2/makefile.mk	8 Sep 2005 05:54:17 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/makefile.mk	15 Dec 2005 14:45:24 -0000
-@@ -58,6 +58,8 @@
+diff -ru openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx
+--- openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx	2006-01-18 12:52:01.000000000 +0000
++++ openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx	2006-01-18 13:10:23.000000000 +0000
+@@ -244,9 +244,10 @@
+ #define EVOLUTION_PATH         16
+ #define KAB_PATH               17
+ #define THUNDERBIRD_PATH       18
+-#define CREATENEW_PATH         19
+-#define USERDEFINED_PATH       20
+-#define OPEN_DOC_PATH          21
++#define EVOLUTION_PATH_LOCAL   19
++#define CREATENEW_PATH         20
++#define USERDEFINED_PATH       21
++#define OPEN_DOC_PATH          22
  
- EXCEPTIONSFILES=\
- 	$(SLO)$/NDriver.obj \
-+        $(SLO)$/NTable.obj \
-+        $(SLO)$/NColumns.obj \
- 	$(SLO)$/NTables.obj \
- 	$(SLO)$/NCatalog.obj \
- 	$(SLO)$/NConnection.obj \
-Index: officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu,v
-retrieving revision 1.14
-diff -u -p -u -r1.14 DataAccess.xcu
---- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	25 Jul 2003 08:26:19 -0000	1.14
-+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	10 Mar 2004 15:48:18 -0000
-@@ -1539,7 +1539,7 @@
-     <node oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
-       <node oor:name="EvolutionPreferences">
-         <prop oor:name="FullPathExportingCommand">
--          <value>file:///usr/share/evolution/*/evolution-addressbook-export</value>
-+          <value>evolution-addressbook-export</value>
-         </prop>
-       </node>
-       <node oor:name="ColumnAliases">
-Index: source/abpilot/abpresid.hrc
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/abpresid.hrc,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 abpresid.hrc
---- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc	29 Sep 2005 10:38:40 -0000	1.9
-+++ openoffice.org/extensions/source/abpilot/abpresid.hrc	15 Dec 2005 13:25:37 -0000
-@@ -170,9 +170,10 @@
- #define RB_THUNDERBIRD          2
+ OFinalDBPageSetup*          pFinalPage;
+ 
+@@ -389,6 +390,14 @@
+     else
+         declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+ 
++if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LOCAL))
++        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
++    else
++        declarePath( EVOLUTION_PATH_LOCAL, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
++ if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP))
++        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
++    else
++        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+     if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
+         declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+     else
+@@ -540,6 +549,8 @@
+             { DST_MOZILLA,      MOZILLA_PATH        },
+             { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
+             { DST_EVOLUTION,    EVOLUTION_PATH      },
++            { DST_EVOLUTION_LOCAL,    EVOLUTION_PATH_LOCAL      },
++            { DST_EVOLUTION_LDAP,    EVOLUTION_PATH      },
+             { DST_KAB,          KAB_PATH            },
+             { DST_USERDEFINE1,  USERDEFINED_PATH    },
+ 		    { DST_USERDEFINE2,  USERDEFINED_PATH    },
+@@ -613,6 +624,8 @@
+     {
+ 		case DST_KAB:
+         case DST_EVOLUTION:
++        case DST_EVOLUTION_LOCAL:
++        case DST_EVOLUTION_LDAP:
+         case DST_OUTLOOK:
+         case DST_OUTLOOKEXP:
+ 		case DST_MOZILLA:
+diff -ru openoffice.org.orig/dbaccess/source/ui/inc/dsntypes.hxx openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx
+--- openoffice.org.orig/dbaccess/source/ui/inc/dsntypes.hxx	2006-01-18 12:51:57.000000000 +0000
++++ openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx	2006-01-18 13:11:03.000000000 +0000
+@@ -76,8 +76,10 @@
+ 	DST_OUTLOOK		=	15,	
+ 	DST_OUTLOOKEXP	=	16,	
+ 	DST_EVOLUTION	=	17,
+-	DST_KAB			=	18,
+-	DST_EMBEDDED	=	19,
++        DST_EVOLUTION_LOCAL =   18,
++        DST_EVOLUTION_LDAP  =   19,
++	DST_KAB			=	20,
++	DST_EMBEDDED	=	21,
+ 
+ 	DST_USERDEFINE1,	/// first user defined driver
+ 	DST_USERDEFINE2,
+diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.hrc openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc
+--- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.hrc	2006-01-18 12:51:58.000000000 +0000
++++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc	2006-01-18 13:12:15.000000000 +0000
+@@ -54,10 +54,12 @@
+ #define STR_LDAP				13
+ #define STR_OUTLOOK				14
+ #define STR_OUTLOOKEXP			15
+-#define STR_EVOLUTION			16 
+-#define STR_KAB					17
+-#define STR_EMBEDDED			18
+-#define STR_THUNDERBIRD			19
++#define STR_EVOLUTION_GROUPWISE       16
++#define STR_EVOLUTION_LOCAL           17
++#define STR_EVOLUTION_LDAP            18
++#define STR_KAB					19
++#define STR_EMBEDDED			20
++#define STR_THUNDERBIRD			21
+ 
+ #define STR_END					STR_THUNDERBIRD + 1
+ 
+diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.src openoffice.org/dbaccess/source/ui/misc/dbumiscres.src
+--- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.src	2006-01-18 12:51:58.000000000 +0000
++++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.src	2006-01-18 13:13:54.000000000 +0000
+@@ -107,9 +107,17 @@
+ 	{
+ 		Text  ="sdbc:address:outlookexp";
+ 	};
+-	String STR_EVOLUTION
+-	{
+-		Text  ="sdbc:address:evolution";
++        String STR_EVOLUTION_LOCAL
++        {
++               Text  ="sdbc:address:evolution:local";
++        };
++        String STR_EVOLUTION_LDAP
++        {
++                Text  ="sdbc:address:evolution:ldap";
++        };
++        String STR_EVOLUTION_GROUPWISE
++        {
++                Text  ="sdbc:address:evolution:groupwise";
+ 	};	
+ 	String STR_KAB
+ 	{
+@@ -199,11 +207,21 @@
+ 		Text [ de ] = "Microsoft Windows Adressbuch";
+ 		Text[ en-US ] = "Microsoft Windows Address Book";
+ 	};
+-	String STR_EVOLUTION
+-	{
+-		Text [ de ] = "Evolution Adressbuch";
+-		Text[ en-US ] = "Evolution Address Book";
+-	};
++        String STR_EVOLUTION_LOCAL
++        {
++                Text [ de ] = "Evolution Local Adressbuch";
++                Text[ en-US ] = "Evolution Local";
++        };
++        String STR_EVOLUTION_LDAP
++        {
++               Text [ de ] = "Evolution LDAP Adressbuch";
++               Text[ en-US ] = "Evolution LDAP";
++        };
++        String STR_EVOLUTION_GROUPWISE
++        {
++                Text [ de ] = "Groupwise Adressbuch";
++                Text[ en-US ] = "Groupwise";
++        };
+ 	String STR_KAB
+ 	{
+ 		Text [ de ] = "KDE Adressbuch";
+diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dsntypes.cxx openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx
+--- openoffice.org.orig/dbaccess/source/ui/misc/dsntypes.cxx	2006-01-18 12:51:58.000000000 +0000
++++ openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx	2006-01-18 13:17:07.000000000 +0000
+@@ -387,6 +387,8 @@
+ 			case DST_OUTLOOKEXP:
+ 			case DST_FLAT:
+             case DST_EVOLUTION:
++            case DST_EVOLUTION_LOCAL:
++            case DST_EVOLUTION_LDAP:
+             case DST_KAB:
+ 	 		case DST_THUNDERBIRD:
+ 			case DST_CALC:
+@@ -434,6 +436,8 @@
+ 		case DST_JDBC:
+         case DST_EVOLUTION:
+         case DST_KAB:
++        case DST_EVOLUTION_LOCAL:
++        case DST_EVOLUTION_LDAP:
+ 			bEnableBrowseButton = FALSE;
+ 			break;
+ 		default:
+@@ -468,15 +472,17 @@
+ 		case DST_ADO:
+ 		case DST_LDAP:
+         case DST_CALC:
++               case DST_EVOLUTION:
++               case DST_EVOLUTION_LDAP:
+ 			return sal_True;
+ 			break;
+ 		case DST_MSACCESS:
+ 		case DST_MOZILLA:
+ 		case DST_THUNDERBIRD:
+-		case DST_EVOLUTION:
+ 		case DST_KAB:
+ 		case DST_OUTLOOK:
+         case DST_OUTLOOKEXP: //????
++                case DST_EVOLUTION_LOCAL:
+ 		case DST_DBASE:
+ 		case DST_FLAT:
+ 		case DST_EMBEDDED:
+@@ -551,8 +557,12 @@
+ 			return DST_OUTLOOK;
+ 		if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator))
+ 			return DST_OUTLOOKEXP;
+-		if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator))
+-			return DST_EVOLUTION;
++         if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator))
++             return DST_EVOLUTION_LDAP;
++         if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator))
++             return DST_EVOLUTION;
++         if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator))
++             return DST_EVOLUTION_LOCAL;
+ 		if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator))
+ 			return DST_KAB;
+ 	}
+diff -ru openoffice.org.orig/extensions/source/abpilot/abpresid.hrc openoffice.org/extensions/source/abpilot/abpresid.hrc
+--- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/abpresid.hrc	2006-01-18 13:19:35.000000000 +0000
+@@ -171,9 +171,10 @@
  #define RB_EVOLUTION			3
- #define RB_LDAP					4
--#define RB_OUTLOOK				5
--#define RB_OUTLOOKEXPRESS		6
--#define RB_OTHER				7
-+#define RB_EVOLUTION_LDAP	    5
-+#define RB_OUTLOOK				6
-+#define RB_OUTLOOKEXPRESS		7
-+#define RB_OTHER				8
+ #define RB_KAB					4
+ #define RB_LDAP					5
+-#define RB_OUTLOOK				6
+-#define RB_OUTLOOKEXPRESS		7
+-#define RB_OTHER				8
++#define RB_EVOLUTION_LDAP			6
++#define RB_OUTLOOK				7
++#define RB_OUTLOOKEXPRESS		8
++#define RB_OTHER				9
  
  //........................................................................
  #define ET_DATASOURCENAME		1
-Index: source/abpilot/abspilot.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/abspilot.cxx,v
-retrieving revision 1.12
-diff -u -p -u -r1.12 abspilot.cxx
---- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	29 Sep 2005 10:39:01 -0000	1.12
-+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	15 Dec 2005 13:25:37 -0000
-@@ -152,7 +152,7 @@ namespace abp
- 
+diff -ru openoffice.org.orig/extensions/source/abpilot/abspilot.cxx openoffice.org/extensions/source/abpilot/abspilot.cxx
+--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/abspilot.cxx	2006-01-18 13:08:52.000000000 +0000
+@@ -153,7 +153,7 @@
  		// some initial settings
+ #ifdef WITH_MOZILLA
  #ifdef UNX
 -		m_aSettings.eType = AST_MORK;
 +		m_aSettings.eType = AST_EVOLUTION;
  #else
  		m_aSettings.eType = AST_OE;
  #endif
-@@ -404,6 +404,10 @@ namespace abp
- 
- 			case AST_EVOLUTION:
+@@ -410,6 +410,10 @@
  				m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
-+				break;
-+
+ 				break;
+ 
 +			case AST_EVOLUTION_LDAP:
 +				m_aNewDataSource = aContext.createNewEvolutionLDAP( m_aSettings.sDataSourceName );
++				break;
++
+ 			case AST_KAB:
+ 				m_aNewDataSource = aContext.createNewKab( m_aSettings.sDataSourceName );
  				break;
- 
- 			case AST_LDAP:
-Index: source/abpilot/abspilot.src
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/abspilot.src,v
-retrieving revision 1.52
-diff -u -p -u -r1.52 abspilot.src
---- openoffice.org.orig/extensions/source/abpilot/abspilot.src	29 Sep 2005 10:39:25 -0000	1.52
-+++ openoffice.org/extensions/source/abpilot/abspilot.src	15 Dec 2005 13:25:37 -0000
-@@ -153,17 +153,25 @@ TabPage RID_PAGE_SELECTABTYPE
+diff -ru openoffice.org.orig/extensions/source/abpilot/abspilot.src openoffice.org/extensions/source/abpilot/abspilot.src
+--- openoffice.org.orig/extensions/source/abpilot/abspilot.src	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/abspilot.src	2006-01-18 13:22:07.000000000 +0000
+@@ -161,9 +161,17 @@
  		Text [ de ] = "LDAP Adress-Bestand";
  		Text [ en-US ] = "LDAP address data";
  	};
--	RadioButton RB_OUTLOOK
-+	RadioButton RB_EVOLUTION_LDAP
++       RadioButton RB_EVOLUTION_LDAP
++        {
++                Pos             = MAP_APPFONT ( 15, 123 ) ;
++                Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++               Text [ de ] = "Evolution LDAP";
++               Text [ en-US ] = "Evolution LDAP";
++       };
+ 	RadioButton RB_OUTLOOK
  	{
- 		Pos		= MAP_APPFONT ( 15, 111 ) ;
+-		Pos		= MAP_APPFONT ( 15, 123 ) ;
++		Pos		= MAP_APPFONT ( 15, 134 ) ;
  		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
  
-+		Text [ de ] = "Evolution LDAP";
-+		Text [ en-US ] = "Evolution LDAP";
-+	};
-+	RadioButton RB_OUTLOOK
-+	{
-+		Pos		= MAP_APPFONT ( 15, 123 ) ;
-+		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-+
  		Text [ de ] = "Outlook Adressbuch";
- 		Text [ en-US ] = "Outlook address book";
+@@ -171,7 +179,7 @@
  	};
  	RadioButton RB_OUTLOOKEXPRESS
  	{
--		Pos		= MAP_APPFONT ( 15,123 ) ;
-+		Pos		= MAP_APPFONT ( 15,134 ) ;
+-		Pos		= MAP_APPFONT ( 15,134 ) ;
++		Pos		= MAP_APPFONT ( 15,145 ) ;
  		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
  
  		Text [ de ] = "Windows System-Adressbuch";
-@@ -171,7 +179,7 @@ TabPage RID_PAGE_SELECTABTYPE
+@@ -179,7 +187,7 @@
  	};
  	RadioButton RB_OTHER
  	{
--		Pos		= MAP_APPFONT ( 15, 134 ) ;
-+		Pos		= MAP_APPFONT ( 15, 145 ) ;
+-		Pos		= MAP_APPFONT ( 15, 145 ) ;
++		Pos		= MAP_APPFONT ( 15, 156 ) ;
  		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
  
  		Text [ de ] = "andere externe Datenquelle";
-Index: source/abpilot/addresssettings.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/addresssettings.hxx,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 addresssettings.hxx
---- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx	29 Sep 2005 10:39:58 -0000	1.6
-+++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	15 Dec 2005 13:25:37 -0000
-@@ -57,6 +57,7 @@ namespace abp
-         AST_THUNDERBIRD,
+diff -ru openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx openoffice.org/extensions/source/abpilot/addresssettings.hxx
+--- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	2006-01-18 13:08:52.000000000 +0000
+@@ -58,6 +58,7 @@
  		AST_EVOLUTION,
+ 		AST_KAB,
  		AST_LDAP,
 +		AST_EVOLUTION_LDAP,
  		AST_OUTLOOK,
  		AST_OE,
  
-Index: source/abpilot/datasourcehandling.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 datasourcehandling.cxx
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx	29 Sep 2005 10:40:22 -0000	1.8
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	15 Dec 2005 13:25:38 -0000
-@@ -332,7 +332,13 @@ namespace abp
+diff -ru openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx openoffice.org/extensions/source/abpilot/datasourcehandling.cxx
+--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	2006-01-18 13:08:52.000000000 +0000
+@@ -332,7 +332,13 @@
  	//---------------------------------------------------------------------
  	ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
  	{
@@ -2021,16 +1855,12 @@
  	}
  
  	//---------------------------------------------------------------------
-Index: source/abpilot/datasourcehandling.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.hxx,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 datasourcehandling.hxx
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx	29 Sep 2005 10:40:46 -0000	1.6
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	15 Dec 2005 13:25:38 -0000
-@@ -92,6 +92,9 @@ namespace abp
- 		/// creates a new Evolution data source
- 		ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+diff -ru openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx openoffice.org/extensions/source/abpilot/datasourcehandling.hxx
+--- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	2006-01-18 13:08:52.000000000 +0000
+@@ -95,6 +95,9 @@
+ 		/// creates a new KDE address book data source
+ 		ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
  
 +		/// creates a new Evolution LDAP data source
 +		ODataSource createNewEvolutionLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
@@ -2038,85 +1868,53 @@
  		/// creates a new LDAP data source
  		ODataSource	createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
  
-Index: source/abpilot/typeselectionpage.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 typeselectionpage.cxx
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx	29 Sep 2005 10:41:08 -0000	1.8
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	15 Dec 2005 13:25:40 -0000
-@@ -67,6 +67,7 @@ namespace abp
- 		,m_aThunderbird     (this,  ResId(RB_THUNDERBIRD))
+diff -ru openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx openoffice.org/extensions/source/abpilot/typeselectionpage.cxx
+--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	2006-01-18 13:26:06.000000000 +0000
+@@ -107,6 +107,7 @@
  		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
+ 		,m_aKab				(this,	ResId(RB_KAB))
  		,m_aLDAP			(this,	ResId(RB_LDAP))
 +		,m_aEvolutionLDAP		(this,	ResId(RB_EVOLUTION_LDAP))
  		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
  		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
  		,m_aOther			(this,	ResId(RB_OTHER))
-@@ -78,10 +79,26 @@ namespace abp
- 		m_aThunderbird.SetClickHdl( aTypeSelectionHandler );
- 		m_aEvolution.SetClickHdl( aTypeSelectionHandler );
- 		m_aLDAP.SetClickHdl( aTypeSelectionHandler );
-+		m_aEvolutionLDAP.SetClickHdl( aTypeSelectionHandler );
- 		m_aOutlook.SetClickHdl( aTypeSelectionHandler );
- 		m_aOE.SetClickHdl( aTypeSelectionHandler );
- 		m_aOther.SetClickHdl( aTypeSelectionHandler );
- 
-+#if 1
-+		Point aTopOne = m_aMORK.GetPosPixel();
-+		Point aTopTwo = m_aThunderbird.GetPosPixel();
-+		Point aTopThree = m_aEvolution.GetPosPixel();
-+
-+		m_aMORK.Hide();
-+		m_aThunderbird.Hide();
-+		m_aEvolution.SetPosPixel(aTopOne);
-+		m_aLDAP.Hide();
-+		m_aEvolutionLDAP.SetPosPixel(aTopTwo);
-+		m_aOutlook.Hide();
-+		m_aOE.Hide();
-+		m_aOther.SetPosPixel(aTopThree);
-+
-+#else
- #ifndef UNX
- 		sal_Int32 nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
- 		m_aEvolution.Hide();
-@@ -109,7 +126,7 @@ namespace abp
- 		m_aOther.SetPosPixel( aPos );
- 
- 		Reference< ::com::sun::star::sdbc::XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
--		if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))).is()))
-+		if(!(xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))).is()))
- 		{
- 			nMoveControlsUp = m_aLDAP.GetPosPixel().Y() - m_aEvolution.GetPosPixel().Y();
- 			m_aEvolution.Hide();
-@@ -123,6 +140,7 @@ namespace abp
- 			m_aOther.SetPosPixel( aPos );
- 		}
- #endif
-+#endif
- 	}
+@@ -120,6 +121,7 @@
+ 		allTypes.push_back( &m_aEvolution );
+ 		allTypes.push_back( &m_aKab );
+ 		allTypes.push_back( &m_aLDAP );
++		allTypes.push_back( &m_aEvolutionLDAP );
+ 		allTypes.push_back( &m_aOutlook );
+ 		allTypes.push_back( &m_aOE );
+ 		allTypes.push_back( &m_aOther );
+@@ -148,7 +150,7 @@
+ 		Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
+ 
+ 		// check whether Evolution is available
+-		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))) );
++		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
+ 		if ( !xDriver.is() )
+ 		    lcl_hideChoice( allTypes, m_aEvolution );
  
- 	//---------------------------------------------------------------------
-@@ -131,7 +149,8 @@ namespace abp
+@@ -172,7 +174,7 @@
  		AddressBookSourcePage::ActivatePage();
  
          RadioButton* pOptions[] = {
--            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
-+            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aLDAP, &m_aEvolutionLDAP, 
-+	    &m_aOutlook, &m_aOE, &m_aOther, NULL
+-            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
++            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aEvolutionLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
          };
          for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
              if ( (*pCheck)->IsChecked() )
-@@ -157,6 +176,7 @@ namespace abp
- 		m_aThunderbird.Check(AST_THUNDERBIRD == _eType);
+@@ -199,6 +201,7 @@
  		m_aEvolution.Check(AST_EVOLUTION == _eType);
+ 		m_aKab.Check(AST_KAB == _eType);
  		m_aLDAP.Check(AST_LDAP == _eType);
 +		m_aEvolutionLDAP.Check(AST_EVOLUTION_LDAP == _eType);
  		m_aOutlook.Check(AST_OUTLOOK == _eType);
  		m_aOE.Check(AST_OE == _eType);
  		m_aOther.Check(AST_OTHER == _eType);
-@@ -173,6 +193,8 @@ namespace abp
- 			return AST_EVOLUTION;
+@@ -217,6 +220,8 @@
+ 			return AST_KAB;
  		else if (m_aLDAP.IsChecked())
  			return AST_LDAP;
 +		else if (m_aEvolutionLDAP.IsChecked())
@@ -2124,18 +1922,65 @@
  		else if (m_aOutlook.IsChecked())
  			return AST_OUTLOOK;
  		else if (m_aOE.IsChecked())
-Index: source/abpilot/typeselectionpage.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 typeselectionpage.hxx
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx	29 Sep 2005 10:41:35 -0000	1.7
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	15 Dec 2005 13:25:40 -0000
-@@ -63,6 +63,7 @@ namespace abp
- 		RadioButton		m_aThunderbird;
+diff -ru openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx openoffice.org/extensions/source/abpilot/typeselectionpage.hxx
+--- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx	2006-01-18 12:51:04.000000000 +0000
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	2006-01-18 13:08:52.000000000 +0000
+@@ -64,6 +64,7 @@
  		RadioButton		m_aEvolution;
+ 		RadioButton		m_aKab;
  		RadioButton		m_aLDAP;
 +		RadioButton		m_aEvolutionLDAP;
  		RadioButton		m_aOutlook;
  		RadioButton		m_aOE;
  		RadioButton		m_aOther;
+Index: source/drivers/evoab2/NDatabaseMetaData.hxx
+===================================================================
+RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 NDatabaseMetaData.hxx
+--- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	8 Sep 2005 05:50:31 -0000	1.3
++++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	15 Dec 2005 14:45:24 -0000
+@@ -61,11 +61,38 @@ namespace connectivity
+ 		//************ Class: OEvoabDatabaseMetaData
+ 		//**************************************************************
+ 
+-		const GParamSpec *getField(guint n);
+-		guint             getFieldCount();
+-		sal_Int32		 getFieldType(sal_Int32 nCol);
+-		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
+-		rtl::OUString     getFieldName(sal_Int32 nCol);
++ 		typedef struct{
++ 			gboolean bIsSplittedValue;
++ 			GParamSpec *pField;
++ 		}ColumnProperty;
++ 
++ 		typedef enum {
++             DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP,
++ 		    WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP,
++             HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP,
++ 		    OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP
++ 		}ColumnNumber;
++  		sal_Int32        findEvoabField(const rtl::OUString& aColName);
++         typedef  struct {
++ 			const gchar *pColumnName;
++ 			ColumnNumber value;
++ 		}SplitEvoColumns;
++ 
++ 		static SplitEvoColumns evo_addr[] = {
++             {"addr-line1",DEFAULT_ADDR_LINE1},{"addr-line2",DEFAULT_ADDR_LINE2},{"city",DEFAULT_CITY},{"state",DEFAULT_STATE},{"country",DEFAULT_COUNTRY},{"zip",DEFAULT_ZIP},
++ 			{"work-addr-line1",WORK_ADDR_LINE1},{"work-addr-line2",WORK_ADDR_LINE2},{"work-city",WORK_CITY},{"work-state",WORK_STATE},{"work-country",WORK_COUNTRY},{"work-zip",WORK_ZIP},
++ 			{"home-addr-line1",HOME_ADDR_LINE1},{"home-addr-line2",HOME_ADDR_LINE2},{"home-addr-City",HOME_CITY},{"home-state",HOME_STATE},{"home-country",HOME_COUNTRY},{"home-zip",HOME_ZIP},                      
++ 			{"other-addr-line1",OTHER_ADDR_LINE1},{"other-addr-line2",OTHER_ADDR_LINE2},{"other-addr-city",OTHER_CITY},{"other-addr-state",OTHER_STATE},{"other-addr-country",OTHER_COUNTRY},{"other-addr-zip",OTHER_ZIP}
++ 			};
++ 
++ 		const ColumnProperty *getField(guint n);
++ 		guint            getFieldCount();
++ 		sal_Int32	 getFieldType(sal_Int32 nCol);
++ 		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
++ 		rtl::OUString    getFieldName(sal_Int32 nCol);
++ 
++ 		void free_column_resources();
++
+ 		
+ 		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
+ 		{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -r1.619 -r1.620
--- openoffice.org.spec	11 Feb 2006 04:51:16 -0000	1.619
+++ openoffice.org.spec	15 Feb 2006 08:30:43 -0000	1.620
@@ -1,6 +1,6 @@
-%define oootag OOA680
+%define oootag OOB680
 %define ooomilestone 1
-%define rh_rpm_release 11
+%define rh_rpm_release 1
 
 %define build_fc5 1
 %define build_fc4 0
@@ -12,7 +12,7 @@
 %define langpacks 1
 
 %if %{build_rhel4}
-%define usegcc3 1
+%define forcegcc4 1
 %define rh_rpm_extension 0
 %define internalxmlsec 1
 %define internalicu 1
@@ -25,7 +25,7 @@
 %define fc5langpack 1
 %endif
 %if %{build_fc4}
-%define usegcc3 0
+%define forcegcc4 0
 %define rh_rpm_extension 1
 %define internalxmlsec 1
 %define internalicu 1
@@ -38,7 +38,7 @@
 %define fc5langpack 0
 %endif
 %if %{build_fc5}
-%define usegcc3 0
+%define forcegcc4 0
 %define rh_rpm_extension 2
 %define internalxmlsec 0
 %define internalicu 0
@@ -51,7 +51,7 @@
 %define fc5langpack 1
 %endif
 
-%if %{usegcc3}
+%if %{forcegcc4}
 %define gij gij4
 %define libgcj libgcj4
 %define libgcjdevel libgcj4-devel
@@ -72,10 +72,10 @@
 %define xmlsecflags --with-system-xmlsec
 %endif
 %if %{internaljavabits}
-%define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db
+%define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
 %define includingexternals 1
 %else
-%define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db
+%define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan
 %endif
 %if %{internalicu}
 %define icuflags --without-system-icu
@@ -119,8 +119,8 @@
 ExclusiveArch:  %{ix86} ppc
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        2.0.1.%{ooomilestone}
-Release: 	%{rh_rpm_release}.%{rh_rpm_extension}.2
+Version:        2.0.2
+Release: 	%{ooomilestone}.%{rh_rpm_release}.%{rh_rpm_extension}
 Epoch:		1
 License:	LGPL
 Group:		Applications/Productivity
@@ -135,9 +135,9 @@
 Source6:	GSI_ga.sdf
 Source7:	gcj-sed.sh
 Source8:	evolocal.odb
-Source9:        Tigert-templates.tar.gz
-Source10:       documentation.openoffice.org-templates.tar.gz
-Source11:       redhat-templates.tar.gz
+Source9:	Tigert-templates.tar.gz
+Source10:	documentation.openoffice.org-templates.tar.gz
+Source11:	redhat-templates.tar.gz
 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
@@ -175,50 +175,32 @@
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
 Patch9:  openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch10: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch11: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch12: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch13: workspace.hroloader.patch
-Patch14: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch15: workspace.epspreview.patch
-Patch16: openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch
-Patch17: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch18: workspace.dbwizardpp1.patch
-Patch19: workspace.cmcfixes21.patch
-Patch20: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch21: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch22: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch23: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch24: openoffice.org-1.9.122.oooXXXXX.systemxalan.patch
-Patch25: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch26: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch27: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch28: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch29: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch30: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch31: workspace.dmake43p01.patch
-Patch32: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch33: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch34: workspace.atkbridge.patch
-Patch35: workspace.cmcfixes20.patch
-Patch36: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch37: workspace.jaxpapi.patch
-Patch38: workspace.cmcfixes22.patch
-Patch39: workspace.cmcfixes23.patch
-Patch40: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch41: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch42: openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch
-Patch43: openoffice.org-2.0.1.ooo58798.parallel.patch
-Patch44: workspace.sb41.patch
-Patch45: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch
-Patch46: workspace.systemagg.patch
-Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch48: openoffice.org-2.0.1.ooo59537.config_office.nss.patch
-Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch
-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.2.ooo61178.ucb.neon25.patch
+Patch10: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch11: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch12: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch13: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch15: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch17: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch18: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch19: workspace.dmake43p01.patch
+Patch20: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch21: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch22: workspace.atkbridge.patch
+Patch23: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch24: workspace.jaxpapi.patch
+Patch25: workspace.systemjava.patch
+Patch26: workspace.targetedaot.patch
+Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -843,61 +825,39 @@
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
 %patch9  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch10 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch11 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch12 -p1 -b .ooo54603.fontconfig.patch
-%patch13 -p1 -b .workspace.hroloader.patch
-%patch14 -p1 -b .NONE.gcc3gcj4.patch
-%patch15 -p1 -b .workspace.epspreview.patch
-%patch16 -p1 -b .ooo50857.gtkslowunderkde.vcl.patch
-%patch17 -p1 -b .ooo51931.systemxmlsec.patch
-%patch18 -p1 -b .workspace.dbwizardpp1.patch
-%patch19 -p1 -b .workspace.cmcfixes21.patch
-%patch20 -p1 -b .ooo52428.execshield.bridges.patch
+%patch10 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch11 -p1 -b .ooo54603.fontconfig.patch
+%patch12 -p1 -b .ooo51931.systemxmlsec.patch
+%patch13 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch21 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch
-%patch23 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch24 -p1 -b .oooXXXXX.systemxalan.patch
+%patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %else
-%patch25 -p1 -b .ooo51718.rpath.patch
+%patch15 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch26 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch27 -p1 -b .ooo54586.nfslock.sal.patch
-%patch28 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch29 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch30 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch31 -p1 -b .dmake43p01.patch
+%patch16 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch17 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch18 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch19 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch32 -p1 -b .ooo54479.systemicu.patch
-%endif
-%patch33 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch34 -p1 -b .workspace.atkbridge.patch
-%patch35 -p1 -b .workspace.cmcfixes20.patch
-%patch36 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch37 -p1 -b .workspace.jaxpapi.patch
-%patch38 -p1 -b .workspace.cmcfixes22.patch
-%patch39 -p1 -b .workspace.cmcfixes23.patch
-%patch40 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch41 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch42 -p1 -b .ooo58618.sfx2.interactionhandler.patch
-%patch43 -p1 -b .ooo58798.parallel.patch
-%patch44 -p1 -b .workspace.sb41.patch
-%patch45 -p1 -b .ooo59129.vcl.readonlyentry.patch
-%if ! %{internalagg}
-%patch46 -p1 -b .workspace.systemagg.patch
+%patch20 -p1 -b .ooo54479.systemicu.patch
 %endif
+%patch21 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch22 -p1 -b .workspace.atkbridge.patch
+%patch23 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch24 -p0 -b .workspace.jaxpapi.patch
+%patch25 -p1 -b .workspace.systemjava.patch
+%patch26 -p1 -b .workspace.targetedaot.patch
+%patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch28 -p1 -b .ooo58606.sw.pre-edit.patch
 %if %{build_fc4}
-%patch47 -p1 -b .gcc25199.bitfieldaccess.patch
-%endif
-%if %{build_fc5}
-%patch48 -p1 -b .ooo59537.config_office.nss.patch
+%patch29 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
-%patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch
-%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch53 -p1 -b .ooo61178.ucb.neon25.patch
+%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch33 -p1 -b .ooo61875.sd.compile.patch
+%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch35 -p1 -b .ooo62030.solenv._version.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -935,6 +895,10 @@
 fi
 cd config_office
 autoconf
+%if %{forcegcc4}
+export CC=gcc4
+export CXX=g++4
+%endif
 %configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --with-images=industrial %{extraflags} %{withlang}
 cd ..
 ./bootstrap
@@ -954,24 +918,13 @@
 fi
 #we'll build with at least build -P2 so we can do something useful while
 #helpcontent2 is wasting our time
-export MAXBUILDS=$RPM_BUILD_NCPUS
-if [ $MAXBUILDS -lt 2 ]; then
-	export MAXBUILDS=2
-fi
-#make no rpms in sysui for menus
-export RPM=true
+export MAXBUILDS=$[RPM_BUILD_NCPUS*2]
 #Set the "This product has been created by..." in Help->About
 export USER="Red Hat, Inc."
 unset USERNAME
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 
-%if %{usegcc3}
-#this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
-export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
-export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
-%endif
-
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in
@@ -993,54 +946,63 @@
 export TRUEJAVACOMPILER=$JAVACOMPILER
 export JAVACOMPILER=`pwd`/solenv/bin/gcj
 
-rm -rf external/common/jaxp.jar external/common/parser.jar
-
-%if ! %{internaljavabits}
-export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
-export SYSTEM_XALAN="YES"
-export BUILD_TYPE=${BUILD_TYPE/XALAN}
-%else
-export BUILD_TYPE="$BUILD_TYPE xalan"
+%if %{internaljavabits}
 export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing"
 %endif
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed
 cd transex3/prj
-build --dlv_switch link --all -P$MAXBUILDS
-deliver
+build --dlv_switch -link --all -P$MAXBUILDS -- -s
+deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
 cd ../..
 
 cd instsetoo_native/util
-if ! build --dlv_switch link --since transex3 -P$MAXBUILDS; then
+if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
     echo parallel build failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
     unset MAXPROCESS
-    build --dlv_switch link --all
+    build --dlv_switch -link --all
 fi
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 #getting an unpackaged install
-unset MAXPROCESS
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 echo start en-US install time is `date`
 if ! dmake openoffice_en-US; then
-    echo en_US langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting dmake...
-    dmake openoffice_en-US
+    echo parallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
+    echo - ---dump log start---
+    cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+    echo - ---dump log end---
+    unset MAXPROCESS
+    if ! dmake openoffice_en-US; then
+        echo unparallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - trying one last time...
+        echo - ---dump log start---
+        cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+        echo - ---dump log end---
+        dmake openoffice_en-US
+    fi
 fi
-echo - ---dump log start---
-cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
-echo - ---dump log end---
 echo end en-US install time is `date`
 %if %{langpacks}
 echo start langpack install time is `date`
 if ! dmake ooolanguagepack; then
-    echo langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting dmake...
+    echo parallel ooolanguagepack failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
+    unset MAXPROCESS
     dmake ooolanguagepack
 fi
 echo end langpack install time is `date`, diskspace: `df -h . | tail -n 1`
 %endif
 cd ../..
 
+#make no rpms in sysui for menus, but do generate the icons
+cd sysui
+export RPM=true
+export PKGFORMAT=rpm
+build
+deliver -link
+unset PKGFORMAT
+cd ..
+
 #start of jakub based suggestion on prelink optimization 
 cd desktop/source/app
 sed -i -e "s/OBJ/SLO/" makefile.mk
@@ -1220,6 +1182,7 @@
 %endif
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
 cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
+cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
 cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
 
@@ -1321,6 +1284,8 @@
 %files langpack-ca_ES
 %defattr(-,root,root)
 %dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ca
 %dir %{instdir}/share
 %{instdir}/program/resource/*680ca.res
 %dir %{instdir}/share/dict
@@ -1417,6 +1382,7 @@
 %dir %{instdir}/share/dict
 %dir %{instdir}/share/dict/ooo
 %{instdir}/share/dict/ooo/*de_*
+%{instdir}/share/dict/ooo/INSTALL_de.txt
 %{instdir}/share/readme/LICENSE_de*
 %{instdir}/share/readme/README_de*
 %dir %{instdir}/share/registry
@@ -2300,7 +2266,6 @@
 %{instdir}/program/classes/officebean.jar
 %{instdir}/program/classes/report.jar
 %{instdir}/program/classes/ridl.jar
-%{instdir}/program/classes/sandbox.jar
 %{instdir}/program/classes/sdbc_hsqldb.jar
 %{instdir}/program/classes/ScriptFramework.jar
 %{instdir}/program/classes/ScriptProviderForBeanShell.jar
@@ -2370,6 +2335,7 @@
 %{instdir}/program/libbindet680*.so
 %{instdir}/program/libcached1.so
 %{instdir}/program/libcanvastools680*.so
+%{instdir}/program/libcollator_data.so
 %{instdir}/program/libcomphelp4gcc3.so
 %{instdir}/program/libcppcanvas680*.so
 %{instdir}/program/libcppu.so
@@ -2410,6 +2376,7 @@
 %{instdir}/program/libicg680*.so
 %{instdir}/program/libidx680*.so
 %{instdir}/program/libime680*.so
+%{instdir}/program/libindex_data.so
 %{instdir}/program/libipb680*.so
 %{instdir}/program/libipd680*.so
 %{instdir}/program/libips680*.so
@@ -2431,6 +2398,7 @@
 %{instdir}/program/libgcc3_uno.so
 %{instdir}/program/libgo680*.so
 %{instdir}/program/libhsqldb2.so
+%{instdir}/program/libhunspell.so
 %{instdir}/program/libhyphen680*.so
 %{instdir}/program/libi18nregexpgcc3.so
 %{instdir}/program/libi18nutilgcc3.so
@@ -2451,7 +2419,6 @@
 %{instdir}/program/liblocaledata_euro.so
 %{instdir}/program/liblocaledata_others.so
 %{instdir}/program/libmcnttype.so
-%{instdir}/program/libmyspell.so
 %{instdir}/program/libmysql2.so
 %{instdir}/program/libnpsoplugin.so
 %{instdir}/program/libodbc2.so
@@ -2499,6 +2466,7 @@
 %{instdir}/program/libsvt680*.so
 %{instdir}/program/libsvx680*.so
 %{instdir}/program/libsw680*.so
+%{instdir}/program/libtextconv_dict.so
 %{instdir}/program/libtextconversiondlgs680*.so
 %{instdir}/program/libtfu680*.so
 %{instdir}/program/libtk680*.so
@@ -2665,6 +2633,8 @@
 %{instdir}/share/basic
 %dir %{instdir}/share/config
 %{instdir}/share/config/images.zip
+%{instdir}/share/config/images_crystal.zip
+%{instdir}/share/config/images_hicontrast.zip
 %{instdir}/share/config/images_industrial.zip
 %{instdir}/share/config/javavendors.xml
 %{instdir}/share/config/psetup.xpm
@@ -2875,6 +2845,8 @@
 #icons and mime
 #%{_datadir}/application-registry
 %{_datadir}/icons
+%dir %{_datadir}/mime-info
+%{_datadir}/mime-info/*
 %if ! %{fc5langpack}
 %{instdir}/share/dict/ooo/*ga_IE*
 %endif
@@ -3375,6 +3347,44 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.1
+- 2.0.2 previews
+- hunspell replaces myspell
+- Catalan help documentation available
+- add sestatus details to crash_reporter
+- nl_NL dictionaries upstreamed
+- hu_HU dictionaries upstreamed
+- workspace.epspreview.patch integrated
+- workspace.dbwizardpp1.patch integrated
+- workspace.cmcfixes20.patch integrated
+- workspace.cmcfixes21.patch integrated
+- workspace.cmcfixes22.patch integrated
+- workspace.cmcfixes23.patch integrated
+- workspace.gcc41.patch integrated
+- workspace.sb41.patch integrated
+- workspace.systemagg.patch integrated
+- workspace.hro02.patch integrated
+- openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch integrated
+- openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch integrated
+- openoffice.org-2.0.1.ooo58798.parallel.patch integrated
+- openoffice.org-2.0.1.ooo59537.config_office.nss.patch integrated
+- openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch integrated
+- openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch integrated
+- openoffice.org-2.0.1.ooo61098.vcl.readonlyentry.patch integrated
+- openoffice.org-2.0.2.ooo61178.ucb.neon25.patch integrated
+- drop openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+- drop openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch
+- drop openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+- drop empty sandbox.jar
+- deliver link flag syntax changed
+- new workspace.jaxpapi.patch
+- replace fasterhelpcontent2.patch with workspace.targetedaot.patch
+- replace ooo52974.systemhsqldbbeanshell.patch and oooXXXXX.systemxalan.patch 
+  with workspace.systemjava.patch
+- rh#178670# drop PROT_EXEC
+- add openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch for rh#179692#
+- add openoffice.org-2.0.2.ooo62030.solenv._version.patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- sources	9 Feb 2006 15:47:34 -0000	1.152
+++ sources	15 Feb 2006 08:30:44 -0000	1.153
@@ -4,9 +4,9 @@
 33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
-374c6a2d4d846acf171d0fd212d4d7af  OOA680_m1.tar.bz2
-9296ac8fa8e4f85cfdacfdaeeac6547f  openoffice.org-myspell-contrib.tar.gz
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 8bc013e30e432ce3927e402e9aaa8c9f  redhat-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
-92c2b4d5ec968071f9722fa61277058a  openoffice.org-simple-crash_report.sh
+7d819e432c243e299d75196890c58f24  OOB680_m1.tar.bz2
+fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
+0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh

workspace.atkbridge.patch:
 SRC680_m130/desktop/scripts/soffice.sh                |    4 
 comphelper/source/misc/accessiblewrapper.cxx          |    5 
 openoffice.org/vcl/unx/gtk/a11y/TODO                  |   49 +
 openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx         |   93 ++
 openoffice.org/vcl/unx/gtk/a11y/atkcomponent.cxx      |  206 +++++
 openoffice.org/vcl/unx/gtk/a11y/atkeditabletext.cxx   |   96 ++
 openoffice.org/vcl/unx/gtk/a11y/atkfactory.cxx        |  203 +++++
 openoffice.org/vcl/unx/gtk/a11y/atkhypertext.cxx      |  230 ++++++
 openoffice.org/vcl/unx/gtk/a11y/atkimage.cxx          |   59 +
 openoffice.org/vcl/unx/gtk/a11y/atklistener.cxx       |  387 ++++++++++
 openoffice.org/vcl/unx/gtk/a11y/atklistener.hxx       |   88 ++
 openoffice.org/vcl/unx/gtk/a11y/atkselection.cxx      |  120 +++
 openoffice.org/vcl/unx/gtk/a11y/atktable.cxx          |  331 ++++++++
 openoffice.org/vcl/unx/gtk/a11y/atktext.cxx           |  226 ++++++
 openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx           |  425 +++++++++++
 openoffice.org/vcl/unx/gtk/a11y/atkutil.hxx           |   45 +
 openoffice.org/vcl/unx/gtk/a11y/atkvalue.cxx          |   69 +
 openoffice.org/vcl/unx/gtk/a11y/atkwrapper.cxx        |  676 ++++++++++++++++++
 openoffice.org/vcl/unx/gtk/a11y/atkwrapper.hxx        |   84 ++
 openoffice.org/vcl/unx/gtk/a11y/makefile.mk           |  108 ++
 openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx |   51 +
 vcl/prj/build.lst                                     |    3 
 vcl/source/app/svapp.cxx                              |   10 
 vcl/source/window/menu.cxx                            |    9 
 vcl/unx/gtk/app/gtkinst.cxx                           |    1 
 vcl/unx/gtk/window/gtkframe.cxx                       |  193 +++++
 vcl/unx/inc/plugins/gtk/gtkframe.hxx                  |    8 
 vcl/util/makefile.mk                                  |    1 
 28 files changed, 3765 insertions(+), 15 deletions(-)

Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- workspace.atkbridge.patch	8 Nov 2005 12:54:41 -0000	1.5
+++ workspace.atkbridge.patch	15 Feb 2006 08:30:44 -0000	1.6
@@ -4116,14 +4116,14 @@
  			$(SLB)$/gtkwin.lib
 --- SRC680_m130/desktop/scripts/soffice.gail.sh	2005-09-30 15:34:21.000000000 +0100
 +++ SRC680_m130/desktop/scripts/soffice.sh	2005-09-30 15:34:56.000000000 +0100
-@@ -35,6 +35,10 @@
- #*************************************************************************
+@@ -36,6 +36,10 @@
  
  if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
+ export SAL_ENABLE_NATIVE_XFONTS=0
 +if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then
 +export GTK_MODULES="gail:atk-bridge $GTK_MODULES"
 +fi
 +export SAL_IGNOREXERRORS=true
- 
  #
  # STAR_PROFILE_LOCKING_DISABLED=1
+ # export STAR_PROFILE_LOCKING_DISABLED

workspace.dmake43p01.patch:
 dmake/ChangeLog                            | 2340 ++++++++++++++++++++++++++++-
 dmake/Makefile.am                          |   12 
 dmake/Makefile.in                          |   93 -
 dmake/NEWS                                 |   74 
 dmake/acinclude.m4                         |   13 
 dmake/aclocal.m4                           |  435 +----
 dmake/autogen.sh                           |   37 
 dmake/config.guess                         |  799 +++++----
 dmake/config.h.in                          |   17 
 dmake/config.sub                           |  642 ++++++-
 dmake/configure                            |  397 ++--
 dmake/configure.in                         |  168 +-
 dmake/dag.c                                |    9 
 dmake/dbug/dbug/dbug.c                     |   13 
 dmake/dbug/dbug/readme                     |   56 
 dmake/dmake.c                              |   61 
 dmake/dmake.h                              |   13 
 dmake/dmakeroot.h.in                       |    6 
 dmake/dmdump.c                             |    5 
 dmake/expand.c                             |   99 +
 dmake/extern.h                             |    6 
 dmake/function.c                           |  171 +-
 dmake/getinp.c                             |  109 -
 dmake/imacs.c                              |    7 
 dmake/infer.c                              |   32 
 dmake/mac/public.h                         |    5 
 dmake/mac/ruletab.c                        |    2 
 dmake/make.c                               |  171 +-
 dmake/makefile.mk                          |    8 
 dmake/man/dmake.nc                         | 2117 +++++++++++++-------------
 dmake/man/dmake.tf                         |  164 +-
 dmake/msdos/Makefile.in                    |   19 
 dmake/msdos/borland/bcc30/public.h         |    5 
 dmake/msdos/borland/bcc40/public.h         |    5 
 dmake/msdos/borland/bcc45/public.h         |    5 
 dmake/msdos/borland/bcc50/public.h         |    5 
 dmake/msdos/borland/tcc20/public.h         |    5 
 dmake/msdos/microsft/msc51/public.h        |    5 
 dmake/msdos/microsft/msc60/public.h        |    5 
 dmake/msdos/ruletab.c                      |    2 
 dmake/msdos/runargv.c                      |    7 
 dmake/msdos/startup.h                      |    2 
 dmake/msdos/zortech/public.h               |    5 
 dmake/msdos/zortech/startup.mk             |    8 
 dmake/os2/ibm/icc/public.h                 |    5 
 dmake/os2/ibm/icc3/public.h                |    5 
 dmake/os2/ruletab.c                        |    2 
 dmake/parse.c                              |    7 
 dmake/posix.h                              |    3 
 dmake/qssl/public.h                        |    5 
 dmake/qssl/ruletab.c                       |    2 
 dmake/qssl/startup.h                       |    3 
 dmake/quit.c                               |    9 
 dmake/readme/read1st.txt                   |   13 
 dmake/rulparse.c                           |   47 
 dmake/startup/Makefile.am                  |    6 
 dmake/startup/Makefile.in                  |   50 
 dmake/startup/msdos/macros.mk              |    6 
 dmake/startup/os2/macros.mk                |    6 
 dmake/startup/startup.mk                   |    4 
 dmake/startup/unix/Makefile.am             |    2 
 dmake/startup/unix/Makefile.in             |   41 
 dmake/startup/unix/cygwin/Makefile.in      |   17 
 dmake/startup/unix/linux/Makefile.in       |   17 
 dmake/startup/unix/macosx/Makefile.in      |   17 
 dmake/startup/unix/solaris/Makefile.in     |   17 
 dmake/startup/unix/sysvr4/Makefile.in      |   17 
 dmake/startup/win95/macros.mk              |    6 
 dmake/startup/winnt/Makefile.am            |    2 
 dmake/startup/winnt/Makefile.in            |   41 
 dmake/startup/winnt/macros.mk              |    6 
 dmake/startup/winnt/mingw/Makefile.in      |   17 
 dmake/startup/winnt/msvc6/Makefile.in      |   17 
 dmake/stdmacs.h                            |    3 
 dmake/sysintf.c                            |  148 +
 dmake/tos/public.h                         |    7 
 dmake/tos/ruletab.c                        |    2 
 dmake/tos/startup.h                        |    3 
 dmake/unix/386ix/public.h                  |    7 
 dmake/unix/Makefile.in                     |   19 
 dmake/unix/arlib.c                         |    4 
 dmake/unix/bsd43/public.h                  |    7 
 dmake/unix/bsd43/uw/public.h               |    7 
 dmake/unix/bsd43/vf/public.h               |    7 
 dmake/unix/bsdarm32/public.h               |    7 
 dmake/unix/coherent/ver40/public.h         |    7 
 dmake/unix/coherent/ver42/public.h         |    7 
 dmake/unix/cygwin/public.h                 |   86 -
 dmake/unix/dcache.c                        |    3 
 dmake/unix/linux/gnu/public.h              |    9 
 dmake/unix/macosx/gnu/public.h             |    7 
 dmake/unix/ruletab.c                       |    2 
 dmake/unix/runargv.c                       |  105 +
 dmake/unix/solaris/gnu/public.h            |    7 
 dmake/unix/solaris/public.h                |    7 
 dmake/unix/sysvr1/public.h                 |    7 
 dmake/unix/sysvr3/gnu/public.h             |    7 
 dmake/unix/sysvr3/public.h                 |    7 
 dmake/unix/sysvr3/pwd/public.h             |    7 
 dmake/unix/sysvr4/public.h                 |    7 
 dmake/unix/xenix/public.h                  |    7 
 dmake/unix/xenix/pwd/public.h              |    7 
 dmake/vextern.h                            |   13 
 dmake/win95/Makefile.in                    |   39 
 dmake/win95/borland/bcc50/public.h         |    5 
 dmake/win95/borland/ruletab.c              |    4 
 dmake/win95/borland/sysintf.h              |    4 
 dmake/win95/microsft/Makefile.in           |   19 
 dmake/win95/microsft/config.h              |    9 
 dmake/win95/microsft/config.mk             |    7 
 dmake/win95/microsft/ruletab.c             |    4 
 dmake/win95/microsft/sysintf.h             |    2 
 dmake/win95/microsft/vpp40/mk.bat          |   70 
 dmake/win95/microsft/vpp40/public.h        |    5 
 dmake/win95/startup.h                      |    2 
 dmake/winnt/borland/bcc50/public.h         |    5 
 dmake/winnt/borland/ruletab.c              |    4 
 dmake/winnt/borland/sysintf.h              |    4 
 dmake/winnt/microsft/config.h              |   11 
 dmake/winnt/microsft/ruletab.c             |    4 
 dmake/winnt/microsft/sysintf.h             |    4 
 dmake/winnt/microsft/vpp40/public.h        |    5 
 dmake/winnt/mingw/public.h                 |    5 
 dmake/winnt/mingw/sysintf.h                |    2 
 dmake/winnt/msvc6/public.h                 |    5 
 dmake/winnt/startup.h                      |    2 
 openoffice.org/dmake//dev/null             |  138 -
 openoffice.org/dmake/dbug/dbug/dbug.txt    | 1452 +++++++++++++++++
 openoffice.org/dmake/dbug/dbug/example1.c  |   12 
 openoffice.org/dmake/dbug/dbug/example2.c  |   17 
 openoffice.org/dmake/dbug/dbug/example3.c  |   16 
 openoffice.org/dmake/dbug/dbug/factorial.c |   15 
 openoffice.org/dmake/dbug/dbug/main.c      |   27 
 openoffice.org/dmake/dbug/dbug/makeman.sh  |   18 
 openoffice.org/dmake/dbug/dbug/user.r      |  938 +++++++++++
 openoffice.org/dmake/startup/config.mk.in  |    5 
 136 files changed, 9092 insertions(+), 2839 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.8 -r 1.9 workspace.dmake43p01.patch
Index: workspace.dmake43p01.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.dmake43p01.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- workspace.dmake43p01.patch	19 Sep 2005 07:20:04 -0000	1.8
+++ workspace.dmake43p01.patch	15 Feb 2006 08:30:44 -0000	1.9
@@ -2,12 +2,353 @@
 ===================================================================
 RCS file: /cvs/tools/dmake/ChangeLog,v
 retrieving revision 1.2
-retrieving revision 1.2.2.13
-diff -u -r1.2 -r1.2.2.13
+retrieving revision 1.2.2.19
+diff -u -p -u -r1.2 -r1.2.2.19
 --- openoffice.org.orig/dmake/ChangeLog	22 Oct 2004 08:01:58 -0000	1.2
-+++ openoffice.org/dmake/ChangeLog	2 Sep 2005 00:25:32 -0000	1.2.2.13
-@@ -1 +1,1998 @@
++++ openoffice.org/dmake/ChangeLog	2 Feb 2006 04:53:05 -0000	1.2.2.19
+@@ -1 +1,2339 @@
 -Use cvs log to obtain detailed change logs.
++2006-02-01 23:50  vq
++
++	* dmake.c:
++
++	#i47919# Fix typo.
++
++2006-02-01 23:39  vq
++
++	* dmake.c, quit.c, sysintf.c, mac/public.h,
++	  msdos/borland/bcc30/public.h, msdos/borland/bcc40/public.h,
++	  msdos/borland/bcc45/public.h, msdos/borland/bcc50/public.h,
++	  msdos/borland/tcc20/public.h, msdos/microsft/msc51/public.h,
++	  msdos/microsft/msc60/public.h, msdos/zortech/public.h,
++	  os2/ibm/icc/public.h, os2/ibm/icc3/public.h, qssl/public.h,
++	  tos/public.h, unix/386ix/public.h, unix/bsd43/public.h,
++	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
++	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
++	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
++	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
++	  unix/solaris/public.h, unix/solaris/gnu/public.h,
++	  unix/sysvr1/public.h, unix/sysvr3/public.h,
++	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
++	  unix/sysvr4/public.h, unix/xenix/public.h,
++	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
++	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
++	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
++	  winnt/msvc6/public.h:
++
++	#i47919# Use the correct handler function for the signal() handling.
++
++2006-02-01 18:37  vq
++
++	* man/dmake.nc:
++
++	#i60948# Regenerate plain text version of the dmake man page.
++
++2006-02-01 18:28  vq
++
++	* Makefile.in, NEWS, config.h.in, configure, configure.in, dmake.c,
++	  dmake.h, function.c, make.c, sysintf.c, vextern.h, mac/public.h,
++	  man/dmake.tf, msdos/runargv.c, msdos/borland/bcc30/public.h,
++	  msdos/borland/bcc40/public.h, msdos/borland/bcc45/public.h,
++	  msdos/borland/bcc50/public.h, msdos/borland/tcc20/public.h,
++	  msdos/microsft/msc51/public.h, msdos/microsft/msc60/public.h,
++	  msdos/zortech/public.h, os2/ibm/icc/public.h,
++	  os2/ibm/icc3/public.h, qssl/public.h, tos/public.h,
++	  unix/runargv.c, unix/386ix/public.h, unix/bsd43/public.h,
++	  unix/bsd43/uw/public.h, unix/bsd43/vf/public.h,
++	  unix/bsdarm32/public.h, unix/coherent/ver40/public.h,
++	  unix/coherent/ver42/public.h, unix/cygwin/public.h,
++	  unix/linux/gnu/public.h, unix/macosx/gnu/public.h,
++	  unix/solaris/public.h, unix/solaris/gnu/public.h,
++	  unix/sysvr1/public.h, unix/sysvr3/public.h,
++	  unix/sysvr3/gnu/public.h, unix/sysvr3/pwd/public.h,
++	  unix/sysvr4/public.h, unix/xenix/public.h,
++	  unix/xenix/pwd/public.h, win95/borland/bcc50/public.h,
++	  win95/microsft/vpp40/public.h, winnt/borland/bcc50/public.h,
++	  winnt/microsft/vpp40/public.h, winnt/mingw/public.h,
++	  winnt/msvc6/public.h:
++
++	#i60948# Add -m option family to generate timing information for targets
++	and/or recipes. (Autotools files were regenerated.)
++
++2006-02-01 17:08  vq
++
++	* tos/public.h, unix/arlib.c, unix/386ix/public.h,
++	  unix/bsd43/public.h, unix/bsd43/uw/public.h,
++	  unix/bsd43/vf/public.h, unix/bsdarm32/public.h,
++	  unix/coherent/ver40/public.h, unix/coherent/ver42/public.h,
++	  unix/cygwin/public.h, unix/linux/gnu/public.h,
++	  unix/macosx/gnu/public.h, unix/solaris/public.h,
++	  unix/solaris/gnu/public.h, unix/sysvr1/public.h,
++	  unix/sysvr3/public.h, unix/sysvr3/gnu/public.h,
++	  unix/sysvr3/pwd/public.h, unix/sysvr4/public.h,
++	  unix/xenix/public.h, unix/xenix/pwd/public.h:
++
++	#i61390# Add missing prototypes.
++
++2006-01-31 23:18  vq
++
++	* man/dmake.tf:
++
++	#i10000# Small documentation fix.
++
++2006-01-30 15:28  vq
++
++	* quit.c, unix/cygwin/public.h:
++
++	#i61390# Add some missing prototypes to dmake/unix/cygwin/public.h and
++	also revert the copyright disclaimer to the original version. This file
++	is supposed to be auto generated and identical to:
++	dmake/unix/linux/gnu/cygwin/public.h.
++
++2006-01-26 20:22  vq
++
++	* tests/: Makefile.am, Makefile.in, macros-2:
++
++	#i61170# Add testcase and regenerate autotools files.
++
++2006-01-26 20:16  vq
++
++	* make.c:
++
++	#i61170# Add micro optimization as usually PWD is equal to MAKEDIR.
++
++2006-01-25 21:54  vq
++
++	* Makefile.in, config.h.in, configure, configure.in, make.c:
++
++	#i61170# Fix TMD macro and regenerate autotool files.
++
++2006-01-25 21:09  vq
++
++	* configure.in:
++
++	#i53148# Treat MinGW build like MSVC build.
++
++2006-01-11 12:46  rene
++
++	* config.guess, config.sub:
++
++	#i60375# update config.{sub,guess}
++
++2006-01-08 17:20  vq
++
++	* Makefile.in, configure, configure.in:
++
++	#i60168# Expand internal configure variable before using it and
++	regenerate autotool files.
++
++2006-01-08 16:44  vq
++
++	* Makefile.in, configure:
++
++	#i60168# Regenerate autotool files.
++
++2006-01-08 16:37  vq
++
++	* configure.in:
++
++	#i60168# Use the --datadir swich to determine where the startup dir is
++	placed and adapt the default DMAKEROOT macro setting accordingly.
++
++2006-01-05 20:35  vq
++
++	* tests/Makefile.in:
++
++	#i58259# Regenerate autotool files.
++
++2006-01-05 20:24  vq
++
++	* tests/: misc-6, Makefile.am:
++
++	#i58259# Add testcase.
++
++2006-01-03 23:07  vq
++
++	* make.c:
++
++	#i58259# Fix thinko and solve the problems with all testcases from the
++	issue.
++
++2006-01-03 21:13  vq
++
++	* make.c, dmake.h:
++
++	#i58259# Partial fix. This fixes the use of dp after it was freed.
++
++2005-12-15 15:04  vq
++
++	* sysintf.c:
++
++	#i58391# Create better temporary filenames when .NET2003 or newer are used.
++
++2005-10-25 13:19  vq
++
++	* Makefile.in, config.h.in, configure, configure.in, function.c:
++
[...17442 lines suppressed...]
 @@ -32,9 +32,9 @@
@@ -10527,10 +18954,10 @@
 RCS file: /cvs/tools/dmake/winnt/borland/sysintf.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -u -r1.1.1.1 -r1.1.1.1.132.1
 --- openoffice.org.orig/dmake/winnt/borland/sysintf.h	22 Sep 2000 15:33:37 -0000	1.1.1.1
 +++ openoffice.org/dmake/winnt/borland/sysintf.h	17 Apr 2005 16:47:04 -0000	1.1.1.1.132.1
-@@ -48,9 +48,9 @@
+@@ -48,9 +48,9 @@ extern char * getcwd();
  #ifdef _POSIX_NAME_MAX
  #undef  _POSIX_NAME_MAX
  #endif
@@ -10542,12 +18969,44 @@
  #endif
 -#define _POSIX_PATH_MAX 64
 +#define _POSIX_PATH_MAX _MAX_PATH
+Index: winnt/borland/bcc50/public.h
+===================================================================
+RCS file: /cvs/tools/dmake/winnt/borland/bcc50/public.h,v
+retrieving revision 1.5
+retrieving revision 1.5.30.2
+diff -u -p -u -r1.5 -r1.5.30.2
+--- openoffice.org.orig/dmake/winnt/borland/bcc50/public.h	17 Dec 2003 16:18:08 -0000	1.5
++++ openoffice.org/dmake/winnt/borland/bcc50/public.h	2 Feb 2006 04:40:18 -0000	1.5.30.2
+@@ -111,12 +111,13 @@ time_t Do_stat ANSI((char *, char *, cha
+ int Do_touch ANSI((char *, char *, char **));
+ void Void_lib_cache ANSI((char *, char *));
+ time_t Do_time ANSI(());
++void Do_profile_output ANSI((char *, uint16, CELLPTR));
+ int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
+ char ** Pack_argv ANSI((int, int, char *));
+ char *Read_env_string ANSI((char *));
+ int Write_env_string ANSI((char *, char *));
+ void ReadEnvironment ANSI(());
+-void Catch_signals ANSI((void (*)()));
++void Catch_signals ANSI((void (*)(int)));
+ void Clear_signals ANSI(());
+ void Prolog ANSI((int, char* []));
+ void Epilog ANSI((int));
+@@ -136,7 +137,7 @@ void Parse ANSI((FILE *));
+ int Get_line ANSI((char *, FILE *));
+ char *Do_comment ANSI((char *, char **, int));
+ char *Get_token ANSI((TKSTRPTR, char *, int));
+-void Quit ANSI(());
++void Quit ANSI((int));
+ void Read_state ANSI(());
+ void Write_state ANSI(());
+ int Check_state ANSI((CELLPTR, STRINGPTR *, int));
 Index: winnt/microsft/config.h
 ===================================================================
 RCS file: /cvs/tools/dmake/winnt/microsft/config.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -u -r1.1.1.1 -r1.1.1.1.132.2
 --- openoffice.org.orig/dmake/winnt/microsft/config.h	22 Sep 2000 15:33:37 -0000	1.1.1.1
 +++ openoffice.org/dmake/winnt/microsft/config.h	22 Apr 2005 04:22:30 -0000	1.1.1.1.132.2
 @@ -25,6 +25,11 @@
@@ -10580,7 +19039,7 @@
 RCS file: /cvs/tools/dmake/winnt/microsft/ruletab.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.1.1.1.132.2
-diff -u -r1.1.1.1 -r1.1.1.1.132.2
+diff -u -p -u -r1.1.1.1 -r1.1.1.1.132.2
 --- openoffice.org.orig/dmake/winnt/microsft/ruletab.c	22 Sep 2000 15:33:37 -0000	1.1.1.1
 +++ openoffice.org/dmake/winnt/microsft/ruletab.c	15 Apr 2005 23:55:46 -0000	1.1.1.1.132.2
 @@ -32,10 +32,10 @@
@@ -10601,10 +19060,10 @@
 RCS file: /cvs/tools/dmake/winnt/microsft/sysintf.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.1.1.1.132.1
-diff -u -r1.1.1.1 -r1.1.1.1.132.1
+diff -u -p -u -r1.1.1.1 -r1.1.1.1.132.1
 --- openoffice.org.orig/dmake/winnt/microsft/sysintf.h	22 Sep 2000 15:33:37 -0000	1.1.1.1
 +++ openoffice.org/dmake/winnt/microsft/sysintf.h	17 Apr 2005 16:47:05 -0000	1.1.1.1.132.1
-@@ -50,9 +50,9 @@
+@@ -50,9 +50,9 @@ extern char * getcwd();
  #ifdef _POSIX_NAME_MAX
  #undef  _POSIX_NAME_MAX
  #endif
@@ -10616,15 +19075,79 @@
  #endif
 -#define _POSIX_PATH_MAX 64
 +#define _POSIX_PATH_MAX _MAX_PATH
+Index: winnt/microsft/vpp40/public.h
+===================================================================
+RCS file: /cvs/tools/dmake/winnt/microsft/vpp40/public.h,v
+retrieving revision 1.5
+retrieving revision 1.5.30.2
+diff -u -p -u -r1.5 -r1.5.30.2
+--- openoffice.org.orig/dmake/winnt/microsft/vpp40/public.h	17 Dec 2003 16:18:29 -0000	1.5
++++ openoffice.org/dmake/winnt/microsft/vpp40/public.h	2 Feb 2006 04:40:19 -0000	1.5.30.2
+@@ -111,12 +111,13 @@ time_t Do_stat ANSI((char *, char *, cha
+ int Do_touch ANSI((char *, char *, char **));
+ void Void_lib_cache ANSI((char *, char *));
+ time_t Do_time ANSI(());
++void Do_profile_output ANSI((char *, uint16, CELLPTR));
+ int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
+ char ** Pack_argv ANSI((int, int, char *));
+ char *Read_env_string ANSI((char *));
+ int Write_env_string ANSI((char *, char *));
+ void ReadEnvironment ANSI(());
+-void Catch_signals ANSI((void (*)()));
++void Catch_signals ANSI((void (*)(int)));
+ void Clear_signals ANSI(());
+ void Prolog ANSI((int, char* []));
+ void Epilog ANSI((int));
+@@ -136,7 +137,7 @@ void Parse ANSI((FILE *));
+ int Get_line ANSI((char *, FILE *));
+ char *Do_comment ANSI((char *, char **, int));
+ char *Get_token ANSI((TKSTRPTR, char *, int));
+-void Quit ANSI(());
++void Quit ANSI((int));
+ void Read_state ANSI(());
+ void Write_state ANSI(());
+ int Check_state ANSI((CELLPTR, STRINGPTR *, int));
+Index: winnt/mingw/public.h
+===================================================================
+RCS file: /cvs/tools/dmake/winnt/mingw/public.h,v
+retrieving revision 1.3
+retrieving revision 1.3.30.2
+diff -u -p -u -r1.3 -r1.3.30.2
+--- openoffice.org.orig/dmake/winnt/mingw/public.h	17 Dec 2003 16:18:50 -0000	1.3
++++ openoffice.org/dmake/winnt/mingw/public.h	2 Feb 2006 04:40:19 -0000	1.3.30.2
+@@ -111,12 +111,13 @@ time_t Do_stat ANSI((char *, char *, cha
+ int Do_touch ANSI((char *, char *, char **));
+ void Void_lib_cache ANSI((char *, char *));
+ time_t Do_time ANSI(());
++void Do_profile_output ANSI((char *, uint16, CELLPTR));
+ int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
+ char ** Pack_argv ANSI((int, int, char *));
+ char *Read_env_string ANSI((char *));
+ int Write_env_string ANSI((char *, char *));
+ void ReadEnvironment ANSI(());
+-void Catch_signals ANSI((void (*)()));
++void Catch_signals ANSI((void (*)(int)));
+ void Clear_signals ANSI(());
+ void Prolog ANSI((int, char* []));
+ void Epilog ANSI((int));
+@@ -136,7 +137,7 @@ void Parse ANSI((FILE *));
+ int Get_line ANSI((char *, FILE *));
+ char *Do_comment ANSI((char *, char **, int));
+ char *Get_token ANSI((TKSTRPTR, char *, int));
+-void Quit ANSI(());
++void Quit ANSI((int));
+ void Read_state ANSI(());
+ void Write_state ANSI(());
+ int Check_state ANSI((CELLPTR, STRINGPTR *, int));
 Index: winnt/mingw/sysintf.h
 ===================================================================
 RCS file: /cvs/tools/dmake/winnt/mingw/sysintf.h,v
 retrieving revision 1.2
 retrieving revision 1.2.80.1
-diff -u -r1.2 -r1.2.80.1
+diff -u -p -u -r1.2 -r1.2.80.1
 --- openoffice.org.orig/dmake/winnt/mingw/sysintf.h	25 Mar 2003 14:02:56 -0000	1.2
 +++ openoffice.org/dmake/winnt/mingw/sysintf.h	17 Apr 2005 16:47:05 -0000	1.2.80.1
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ extern char * getcwd();
  #ifdef _POSIX_NAME_MAX
  #undef  _POSIX_NAME_MAX
  #endif
@@ -10633,3 +19156,35 @@
  
  #ifdef _POSIX_PATH_MAX
  #undef _POSIX_PATH_MAX
+Index: winnt/msvc6/public.h
+===================================================================
+RCS file: /cvs/tools/dmake/winnt/msvc6/public.h,v
+retrieving revision 1.3
+retrieving revision 1.3.30.2
+diff -u -p -u -r1.3 -r1.3.30.2
+--- openoffice.org.orig/dmake/winnt/msvc6/public.h	17 Dec 2003 16:19:17 -0000	1.3
++++ openoffice.org/dmake/winnt/msvc6/public.h	2 Feb 2006 04:40:20 -0000	1.3.30.2
+@@ -111,12 +111,13 @@ time_t Do_stat ANSI((char *, char *, cha
+ int Do_touch ANSI((char *, char *, char **));
+ void Void_lib_cache ANSI((char *, char *));
+ time_t Do_time ANSI(());
++void Do_profile_output ANSI((char *, uint16, CELLPTR));
+ int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
+ char ** Pack_argv ANSI((int, int, char *));
+ char *Read_env_string ANSI((char *));
+ int Write_env_string ANSI((char *, char *));
+ void ReadEnvironment ANSI(());
+-void Catch_signals ANSI((void (*)()));
++void Catch_signals ANSI((void (*)(int)));
+ void Clear_signals ANSI(());
+ void Prolog ANSI((int, char* []));
+ void Epilog ANSI((int));
+@@ -136,7 +137,7 @@ void Parse ANSI((FILE *));
+ int Get_line ANSI((char *, FILE *));
+ char *Do_comment ANSI((char *, char **, int));
+ char *Get_token ANSI((TKSTRPTR, char *, int));
+-void Quit ANSI(());
++void Quit ANSI((int));
+ void Read_state ANSI(());
+ void Write_state ANSI(());
+ int Check_state ANSI((CELLPTR, STRINGPTR *, int));

workspace.jaxpapi.patch:
 XmlSearch/src/com/sun/xmlsearch/makefile.mk                             |    3 
 XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java                   |   21 
 XmlSearch/src/com/sun/xmlsearch/util/Configuration.java                 |   15 
 XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java        |   22 
 XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java             |    2 
 external/prj/d.lst                                                      |    2 
 filter/source/config/fragments/makefile.mk                              |    6 
 filter/source/config/tools/utils/makefile.mk                            |    4 
 helpcontent2/settings.pmk                                               |    2 
 officecfg/org/openoffice/configuration/FileHelper.java                  |    2 
 officecfg/org/openoffice/configuration/Generator.java                   |    2 
 officecfg/org/openoffice/configuration/XMLDefaultGenerator.java         |    4 
 readlicense_oo/util/makefile.pmk                                        |    4 
 scripting/java/build.xml                                                |    4 
 solenv/bin/modules/installer/javainstaller.pm                           |    6 
 solenv/inc/tg_config.mk                                                 |   30 
 toolkit/test/accessibility/jawb.mf                                      |    2 
 xmerge/source/xmerge/build.xml                                          |    7 
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml |    5 
 xmerge/util/build.xml                                                   |    5 
 xmerge/util/xmerge.mf                                                   |    2 
 xmerge/workben/build.xml                                                |    5 
 xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java           |    4 
 xmlhelp/source/com/sun/star/help/HelpCompiler.java                      |  335 ++++++----
 xmlhelp/source/com/sun/star/help/HelpIndexer.java                       |    6 
 xmlhelp/source/com/sun/star/help/makefile.mk                            |    2 
 26 files changed, 312 insertions(+), 190 deletions(-)

Index: workspace.jaxpapi.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.jaxpapi.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.jaxpapi.patch	14 Nov 2005 18:06:01 -0000	1.7
+++ workspace.jaxpapi.patch	15 Feb 2006 08:30:58 -0000	1.8
@@ -1,11 +1,322 @@
-Index: source/com/sun/star/help/HelpCompiler.java
+Index: source/config/fragments/makefile.mk
 ===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpCompiler.java,v
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.16
+retrieving revision 1.16.16.1
+diff -u -r1.16 -r1.16.16.1
+--- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
++++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
+@@ -156,11 +156,7 @@
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
+-.IF "$(JDK)" == "gcj"
+-XALANCLASS=$(SOLARBINDIR)/xalan.jar
+-CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+-.ENDIF
+-PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ 
+ # -----------------------------------------------------------------------------
+Index: source/config/tools/utils/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
+retrieving revision 1.5
+retrieving revision 1.5.92.1
+diff -u -r1.5 -r1.5.92.1
+--- filter/source/config/tools/utils/makefile.mk	8 Sep 2005 21:39:14 -0000	1.5
++++ filter/source/config/tools/utils/makefile.mk	17 Jan 2006 11:03:44 -0000	1.5.92.1
+@@ -51,8 +51,8 @@
+                     juh.jar         \
+                     jut.jar         \
+                     java_uno.jar    \
+-                    jaxp.jar        \
+-                    parser.jar
++                    xml-apis.jar    \
++                    xercesImpl.jar
+ 
+ JAVACLASSFILES  =   \
+                     $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class              \
+Index: helpcontent2/settings.pmk
+===================================================================
+RCS file: /cvs/documentation/helpcontent2/settings.pmk,v
+retrieving revision 1.5
+retrieving revision 1.5.106.1
+diff -u -p -u -p -r1.5 -r1.5.106.1
+--- helpcontent2/settings.pmk	29 Apr 2005 09:14:07 -0000	1.5
++++ helpcontent2/settings.pmk	17 Jan 2006 12:52:53 -0000	1.5.106.1
+@@ -1,5 +1,5 @@
+ 
+-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
++my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
+ 
+ .IF "$(SYSTEM_DB)" == "YES"
+ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
+Index: solenv/bin/modules/installer/javainstaller.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/javainstaller.pm,v
+retrieving revision 1.22
+retrieving revision 1.21.184.2
+diff -u -p -u -p -r1.22 -r1.21.184.2
+--- solenv/bin/modules/installer/javainstaller.pm	13 Jan 2006 15:01:29 -0000	1.22
++++ solenv/bin/modules/installer/javainstaller.pm	18 Jan 2006 12:05:44 -0000	1.21.184.2
+@@ -494,14 +494,14 @@ sub set_classpath_for_install_sdk
+ 
+ 	# The variable CLASSPATH has to contain:
+ 	# $installsdk/classes:$installsdk/classes/setupsdk.jar:
+-	# $installsdk/classes/parser.jar:$installsdk/classes/jaxp.jar:
++	# $installsdk/classes/xercesImpl.jar:$installsdk/classes/xml-apis.jar:
+ 	# $installsdk/classes/ldapjdk.jar:$directory
+ 	
+ 	my @additional_classpath = ();
+ 	push(@additional_classpath, "$installsdk\/classes");
+ 	push(@additional_classpath, "$installsdk\/installsdk.jar");
+-	push(@additional_classpath, "$installsdk\/classes\/parser.jar");
+-	push(@additional_classpath, "$installsdk\/classes\/jaxp.jar");
++	push(@additional_classpath, "$installsdk\/classes\/xml-apis.jar");
++	push(@additional_classpath, "$installsdk\/classes\/xercesImpl.jar");
+ 	push(@additional_classpath, "$directory");
+ 
+ 	my $newclasspathstring = "";
+Index: solenv/inc/tg_config.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
+retrieving revision 1.6
+retrieving revision 1.6.184.1
+diff -u -p -u -p -r1.6 -r1.6.184.1
+--- solenv/inc/tg_config.mk	8 Sep 2005 09:42:41 -0000	1.6
++++ solenv/inc/tg_config.mk	17 Jan 2006 11:10:09 -0000	1.6.184.1
+@@ -1,4 +1,4 @@
+-#*************************************************************************
++#************************************************************************
+ #
+ #   OpenOffice.org - a multi-platform office productivity suite
+ #
+@@ -62,12 +62,12 @@ $(PROCESSOUT)$/registry$/schema$/$(PACKA
+ 	-$(MKDIRHIER) $(@:d)
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ .IF "$(NO_INSPECTION)"==""
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ .ENDIF			# "$(NO_INSPECTION)"==""
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+ .ELSE
+ # xsltproc already validates against the dtd.  For additional validation,
+ # org.openoffice.configuration.Inspector should be replaced and the
+@@ -101,7 +101,7 @@ $(PROCESSOUT)$/registry$/res$/{$(alllang
+     @+echo -------------+ creating locale dependent resource bundles
+ 	-$(MKDIRHIER) $(@:d)
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
+ .ELSE
+ 	$(XSLTPROC) -o $@ \
+ 	            --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
+@@ -129,11 +129,11 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGE
+ 	-$(MKDIRHIER) $(@:d) 
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+ .IF "$(NO_INSPECTION)"==""
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
+ .ENDIF			# "$(NO_INSPECTION)"==""
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+ .ELSE
+ # xsltproc already validates against the dtd.  For additional validation,
+ # org.openoffice.configuration.Inspector should be replaced and the
+@@ -170,8 +170,8 @@ $(PROCESSOUT)$/registry$/res$/{$(alllang
+     @+echo -------------+ creating locale dependent entries
+ 	-$(MKDIRHIER) $(@:d)
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
+ .ELSE
+ 	$(XSLTPROC) -o $(@:d)$*.tmp \
+ 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
+@@ -206,8 +206,8 @@ $(PROCESSOUT)$/registry$/spool$/$(PACKAG
+     @+echo -------------+ creating a module file
+ 	-$(MKDIRHIER) $(@:d) 
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
+ .ELSE
+ 	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
+ 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \
+Index: readlicense_oo/util/makefile.pmk
+===================================================================
+RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
 retrieving revision 1.10
-diff -u -p -u -r1.10 HelpCompiler.java
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/HelpCompiler.java	9 Sep 2005 12:15:19 -0000	1.10
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/HelpCompiler.java	9 Nov 2005 13:19:49 -0000
-@@ -44,6 +44,7 @@ package com.sun.star.help;
+retrieving revision 1.10.12.1
+diff -u -p -u -p -r1.10 -r1.10.12.1
+--- readlicense_oo/util/makefile.pmk	25 Oct 2005 10:43:44 -0000	1.10
++++ readlicense_oo/util/makefile.pmk	17 Jan 2006 11:15:07 -0000	1.10.12.1
+@@ -70,7 +70,7 @@ $(MISC)$/$(GUI)$/readme% : $(MISC)$/read
+ $(MISC)$/readme%.html :
+     @+-$(MKDIR) $(@:d)
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
+ .ELSE
+ 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
+ 	         --stringparam os1 $(OS) \
+@@ -86,7 +86,7 @@ $(MISC)$/readme%.html :
+ $(MISC)$/readme%.txt :
+     @+-$(MKDIR) $(@:d)
+ .IF "$(XSLTPROC)"=="NO_XSLTPROC"
+-	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
++	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
+ .ELSE
+ 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
+ 	         --stringparam os1 $(OS) \
+Index: officecfg/org/openoffice/configuration/FileHelper.java
+===================================================================
+RCS file: /cvs/util/officecfg/org/openoffice/configuration/FileHelper.java,v
+retrieving revision 1.2
+retrieving revision 1.2.88.1
+diff -u -p -u -p -r1.2 -r1.2.88.1
+--- officecfg/org/openoffice/configuration/FileHelper.java	8 Sep 2005 14:42:51 -0000	1.2
++++ officecfg/org/openoffice/configuration/FileHelper.java	17 Jan 2006 11:28:49 -0000	1.2.88.1
+@@ -62,7 +62,7 @@ public class FileHelper extends Object
+ 		File aFile = new File(sSource);
+ 		
+ 		try {
+-			absPath = aFile.getAbsoluteFile().toURL().toString();
++			absPath = aFile.getAbsolutePath();
+ 		} catch (Exception e)
+         {
+             e.printStackTrace();            
+Index: officecfg/org/openoffice/configuration/Generator.java
+===================================================================
+RCS file: /cvs/util/officecfg/org/openoffice/configuration/Generator.java,v
+retrieving revision 1.2
+retrieving revision 1.2.902.1
+diff -u -p -u -p -r1.2 -r1.2.902.1
+--- officecfg/org/openoffice/configuration/Generator.java	5 Jul 2001 08:04:36 -0000	1.2
++++ officecfg/org/openoffice/configuration/Generator.java	17 Jan 2006 11:28:50 -0000	1.2.902.1
+@@ -18,7 +18,7 @@ public class Generator {
+     public Generator() throws Exception
+     {
+         // set the driver for xt
+-        System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser");
++        System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser");
+     }    
+ 
+ 	/**
+Index: officecfg/org/openoffice/configuration/XMLDefaultGenerator.java
+===================================================================
+RCS file: /cvs/util/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java,v
+retrieving revision 1.4
+retrieving revision 1.4.88.1
+diff -u -p -u -p -r1.4 -r1.4.88.1
+--- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	8 Sep 2005 14:43:34 -0000	1.4
++++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	17 Jan 2006 11:28:50 -0000	1.4.88.1
+@@ -36,12 +36,10 @@ package org.openoffice.configuration;
+ 
+ import org.xml.sax.*;
+ import org.w3c.dom.*;
+-import com.sun.xml.tree.XmlDocument;
+ import org.xml.sax.SAXException;
+ import org.xml.sax.SAXParseException;
+ import javax.xml.parsers.SAXParserFactory;
+ import javax.xml.parsers.SAXParser;
+-import com.sun.xml.tree.*;
+ import java.util.*;
+ import java.io.*;
+ import com.jclark.xsl.sax.Driver;
+@@ -65,7 +63,7 @@ public class XMLDefaultGenerator {
+ 	public XMLDefaultGenerator(String sourceFile) throws Exception
+     {
+         // set the driver for xt
+-        System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser");
++        System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser");
+         evaluateSchema(sourceFile);
+     }
+ 
+Index: toolkit/test/accessibility/jawb.mf
+===================================================================
+RCS file: /cvs/gsl/toolkit/test/accessibility/jawb.mf,v
+retrieving revision 1.4
+retrieving revision 1.4.178.1
+diff -u -p -u -p -r1.4 -r1.4.178.1
+--- toolkit/test/accessibility/jawb.mf	23 Jul 2004 14:26:57 -0000	1.4
++++ toolkit/test/accessibility/jawb.mf	17 Jan 2006 11:03:18 -0000	1.4.178.1
+@@ -1,3 +1,3 @@
+ Manifest-Version: 1.0
+ Main-Class: AccessibilityWorkBench
+-Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
++Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar xml-apis.jar
+Index: scripting/java/build.xml
+===================================================================
+RCS file: /cvs/framework/scripting/java/build.xml,v
+retrieving revision 1.32
+retrieving revision 1.32.18.1
+diff -u -p -u -p -r1.32 -r1.32.18.1
+--- scripting/java/build.xml	9 Sep 2005 01:54:21 -0000	1.32
++++ scripting/java/build.xml	17 Jan 2006 11:15:56 -0000	1.32.18.1
+@@ -65,15 +65,11 @@
+ 
+   <path id="idesupport.class.path">
+     <pathelement path="${jardir}"/>
+-    <!-- <pathelement path="${solar.jar}/jaxp.jar"/>
+-    <pathelement path="${solar.jar}/parser.jar"/>
+-    <pathelement path="${install.dir}/xerces.jar"/> -->
+   </path>
+ 
+   <path id="openide.class.path">
+     <pathelement path="${jardir}"/>
+     <pathelement path="${solar.jar}/openide.jar"/>
+-    <!-- <pathelement path="${install.dir}/xerces.jar"/> -->
+   </path>
+     
+   <path id="netbeans.editor.support.classpath">
+Index: xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java,v
+retrieving revision 1.2
+retrieving revision 1.2.2.1
+diff -u -p -u -p -r1.2 -r1.2.2.1
+--- xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	16 Jan 2006 12:35:17 -0000	1.2
++++ xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	19 Jan 2006 09:43:59 -0000	1.2.2.1
+@@ -43,12 +43,12 @@ import java.net.URL;
+ import java.net.URLConnection;
+ import java.util.HashMap;
+ 
+-public class FileURLStreamHandler
++public class GCJFileURLStreamHandler
+ 	extends gnu.java.net.protocol.file.Handler {
+ 
+ 	private static HashMap cache = new HashMap();
+ 
+-	FileURLStreamHandler() {
++	GCJFileURLStreamHandler() {
+ 	}
+ 
+ 	public URLConnection openConnection(URL url) throws IOException {
+Index: xmlhelp/source/com/sun/star/help/HelpCompiler.java
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpCompiler.java,v
+retrieving revision 1.12
+retrieving revision 1.11.4.2
+diff -u -p -u -p -r1.12 -r1.11.4.2
+--- xmlhelp/source/com/sun/star/help/HelpCompiler.java	16 Jan 2006 12:35:49 -0000	1.12
++++ xmlhelp/source/com/sun/star/help/HelpCompiler.java	18 Jan 2006 12:08:35 -0000	1.11.4.2
+@@ -38,6 +38,7 @@ package com.sun.star.help;
  import java.io.ByteArrayInputStream;
  import java.io.File;
  import java.io.IOException;
@@ -13,7 +324,7 @@
  import java.io.InputStreamReader;
  import java.io.UnsupportedEncodingException;
  import java.net.MalformedURLException;
-@@ -55,16 +56,20 @@ import java.util.Iterator;
+@@ -49,16 +50,20 @@ import java.util.Iterator;
  import java.util.LinkedList;
  import java.util.List;
  
@@ -34,11 +345,11 @@
 -import com.sun.xml.tree.TreeWalker;
 -import com.sun.xml.tree.XmlDocument;
 -
- public class HelpCompiler implements HelpURLStreamHandlerFactory.Notify {
+ public class HelpCompiler {
  
  	private static final String makeRelPrefix = ".." + File.separator;
-@@ -113,24 +118,24 @@ public class HelpCompiler implements Hel
- 		urlHandler.setNotify(this);
+@@ -98,25 +103,25 @@ public class HelpCompiler {
+ 
  	}
  
 -	private Object[] switchFind(Node node) {
@@ -50,7 +361,7 @@
 -			Element el = (Element) next;
 -			if (!el.getAttribute("select").equals("appl"))
 -				continue;
- 
+-
 -			NodeList nl = el.getChildNodes();
 -			for (int i = 0; i < nl.getLength(); ++i) {
 -				if (nl.item(i).getNodeName().equals("caseinline")) {
@@ -60,106 +371,64 @@
 -					hs.add("DEFAULT");
 -				}
 -			}
-+		NodeList nodelist = doc.getElementsByTagName("switchinline");
+-		}
++
++                NodeList nodelist = doc.getElementsByTagName("switchinline");
 +
 +		for (int j = 0; j < nodelist.getLength(); ++j) {
-+		    Element el = (Element) nodelist.item(j);
-+		    if (el.getAttribute("select").equals("appl")) {
-+		        NodeList nl = el.getChildNodes();
-+		        for (int i = 0; i < nl.getLength(); ++i) {
-+			        if (nl.item(i).getNodeName().equals("caseinline")) {
-+				        String appl = ((Element) nl.item(i)).getAttribute("select");
-+				        hs.add(appl);
-+			        } else if (nl.item(i).getNodeName().equals("defaultinline")) {
-+				        hs.add("DEFAULT");
-+			        }
++			Element el = (Element) nodelist.item(j);
++			if (el.getAttribute("select").equals("appl")) {
++				NodeList nl = el.getChildNodes();
++                       		for (int i = 0; i < nl.getLength(); ++i) {
++                               		if (nl.item(i).getNodeName().equals("caseinline")) {
++                                       		String appl = ((Element) nl.item(i)).getAttribute("select");
++                                       		hs.add(appl);
++                               		} else if (nl.item(i).getNodeName().equals("defaultinline")) {
++                                       		hs.add("DEFAULT");
++					}
++                               	}
++                	}
 +                }
-+            }
- 		}
  
  		hs.add("DEFAULT");
-@@ -144,6 +149,9 @@ public class HelpCompiler implements Hel
+ 		return hs.toArray();
+@@ -129,6 +134,9 @@ public class HelpCompiler {
  		NodeList nl = node.getChildNodes();
  		for (int i = 0; i < nl.getLength(); ++i) {
  			Node n = nl.item(i);
-+			if (n == null) {
-+				continue;
-+			}
++                        if (n == null) {
++                                continue;
++                        }
  			if ((n.getNodeName().equals("switchinline")
  				|| n.getNodeName().equals("switch"))
  				&& ((Element) n).getAttribute("select").equals("appl")) {
-@@ -183,89 +191,125 @@ public class HelpCompiler implements Hel
+@@ -168,93 +176,119 @@ public class HelpCompiler {
  		return parent;
  	}
  
 -	public boolean compile() throws UnsupportedEncodingException {
 -		// we now have the jaroutputstream, which will contain the document.
 -		// now determine the document as a dom tree in variable docResolved
--		String absolutePath;
--		String sourcePath;
 -		File inputFil = new File(inputFile);
--		try {
--			absolutePath = inputFil.getCanonicalPath();
--		} catch (IOException e3) {
--			absolutePath = inputFil.getAbsolutePath();
--		}
--		try {
--			sourcePath = new File(src).getCanonicalPath();
--		} catch (IOException e3) {
--			sourcePath = new File(inputFile).getAbsolutePath();
--		}
-+    static byte[] docToBytes(Document doc)
-+        throws IOException {
- 
--		byte[] embResolved = null;
--		try {
--			embResolved = getSourceDocument(inputFil.toURL().toExternalForm());
--		} catch (MalformedURLException e4) {
--			System.err.println(
--				"ERROR: malformed URL '" + inputFile + "': " + e4.getMessage());
--			return false;
--		}
-+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
- 
--		// now add path to the document
--		// resolve the dom
--		if (embResolved == null) {
--			System.err.println("ERROR: file not existing: " + sourcePath);
--			System.exit(1);
--		}
--
--		ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
--		InputStreamReader inread;
--		try {
--			inread = new InputStreamReader(inByte, "UTF8");
--		} catch (UnsupportedEncodingException e) {
--			System.err.println(
--				"ERROR: unsupported Encoding '"
--					+ inputFile
--					+ "': "
--					+ e.getMessage());
--			return false;
--		}
--
--		InputSource inputSource = new InputSource(inread);
--		inputSource.setEncoding("UTF8");
--		Document docResolvedOrg = null;
--		try {
--			docResolvedOrg = XmlDocument.createXmlDocument(inputSource, false);
--		} catch (Exception e) {
--			System.err.println(
--				"ERROR: XmlDocument.createXmlDocument() failed for '"
--					+ inputFile
--					+ "': "
--					+ e.getMessage());
--			return false;
--		}
-+        java.lang.reflect.Constructor con;
-+        java.lang.reflect.Method meth;
-+        
-+        String domImpl = doc.getClass().getName();
- 
--		// now find all applications for which one has to compile
+-        
+-        // HelpCompiler.getSourceDocument() takes a string that resembles an URL. 
+-        // Using inputFil.toURL() is way to expensive here, 
+-        // because it checks the filesystem to find out if inputFil
+-        // might be a directory. This takes a lot of time if working from
+-        // Windows via NFS on remote volumes. We "know" that inputfil is
+-        // a file anyway.
+-        String path;
+-        if ( File.separatorChar == '\\' ) {
+-            path = "file:/";
+-            path += inputFil.getAbsolutePath();
+-            path = path.replace('\\','/');
++	static byte[] docToBytes(Document doc) throws IOException {
++		ByteArrayOutputStream baos = new ByteArrayOutputStream();
++
++		java.lang.reflect.Constructor con;
++		java.lang.reflect.Method meth;
++		String domImpl = doc.getClass().getName();
++
 +        /*
 +         * We may have multiple XML parsers in the Classpath.
 +         * Depending on which one is first, the actual type of
@@ -169,91 +438,143 @@
 +        try {
 +            // First of all try for JAXP 1.0
 +            if (domImpl.equals("com.sun.xml.tree.XmlDocument")) {
-+                
 +                Class jaxpDoc = Class.forName("com.sun.xml.tree.XmlDocument");
-+            
++
 +                // The method is in the XMLDocument class itself, not a helper
-+                meth = jaxpDoc.getMethod("write", 
++                meth = jaxpDoc.getMethod("write",
 +                            new Class[] { Class.forName("java.io.OutputStream") } );
-+                                     
++
 +                meth.invoke(doc, new Object [] { baos } );
 +         }
-+	     else if (domImpl.equals("org.apache.crimson.tree.XmlDocument")) {
-+		        Class crimsonDoc = Class.forName("org.apache.crimson.tree.XmlDocument");
-+		        // The method is in the XMLDocument class itself, not a helper
-+                meth = crimsonDoc.getMethod("write", 
++         else if (domImpl.equals("org.apache.crimson.tree.XmlDocument")) {
++                       Class crimsonDoc = Class.forName("org.apache.crimson.tree.XmlDocument");
++                       // The method is in the XMLDocument class itself, not a helper
++                meth = crimsonDoc.getMethod("write",
 +                            new Class[] { Class.forName("java.io.OutputStream") } );
-+                                     
-+                meth.invoke(doc, new Object [] { baos } );  
-+	     }
++
++                meth.invoke(doc, new Object [] { baos } );
++         }
 +         else if (domImpl.equals("gnu.xml.dom.DomDocument")) {
 +                Class gnuSer = Class.forName("gnu.xml.dom.ls.DomLSSerializer");
-+                
++
 +                // Get the serialize method
-+                meth = gnuSer.getMethod("serialize", 
++                meth = gnuSer.getMethod("serialize",
 +                            new Class [] { Class.forName("org.w3c.dom.Node"),
-+							Class.forName("java.io.OutputStream") } );                                           
-+                                           
++                                                       Class.forName("java.io.OutputStream") } );
++
 +                // Get an instance
-+				Object serializer = gnuSer.newInstance();
-+                
++                               Object serializer = gnuSer.newInstance();
++
 +                // Now call serialize to write the document
 +                meth.invoke(serializer, new Object [] { doc, baos } );
 +         }
-+         else if (domImpl.equals("org.apache.xerces.dom.DocumentImpl") 
++         else if (domImpl.equals("org.apache.xerces.dom.DocumentImpl")
 +            || domImpl.equals("org.apache.xerces.dom.DeferredDocumentImpl")) {
-+                
 +                // Try for Xerces
-+                Class xercesSer = 
++                Class xercesSer =
 +                        Class.forName("org.apache.xml.serialize.XMLSerializer");
-+                
++
 +                // Get the OutputStream constructor
 +                // May want to use the OutputFormat parameter at some stage too
-+                con = xercesSer.getConstructor(new Class [] 
++                con = xercesSer.getConstructor(new Class []
 +                        { Class.forName("java.io.OutputStream"),
 +                          Class.forName("org.apache.xml.serialize.OutputFormat") } );
-+                              
-+                
++
++
 +                // Get the serialize method
-+                meth = xercesSer.getMethod("serialize", 
-+                            new Class [] { Class.forName("org.w3c.dom.Document") } );                                           
-+                                           
-+                          
++                meth = xercesSer.getMethod("serialize",
++                            new Class [] { Class.forName("org.w3c.dom.Document") } );
++
++
 +                // Get an instance
 +                Object serializer = con.newInstance(new Object [] { baos, null } );
-+                
-+                
++
++
 +                // Now call serialize to write the document
 +                meth.invoke(serializer, new Object [] { doc } );
 +            }
 +            else {
-+                // We don't have another parser  
++                // We don't have another parser
 +                throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl);
 +            }
 +        }
 +        catch (ClassNotFoundException cnfe) {
 +            throw new IOException(cnfe.toString());
-+        }
+         }
+-        else {
+-            path = "file:" + inputFil.getAbsolutePath();
 +        catch (Exception e) {
 +            // We may get some other errors, but the bottom line is that
 +            // the steps being executed no longer work
 +            throw new IOException(e.toString());
-+        }
-+
+         }
+-		byte[] embResolved = getSourceDocument(path);
+ 
+-		// now add path to the document
+-		// resolve the dom
+-		if (embResolved == null) {
+-            String sourcePath;
+-    		try {
+-	    		sourcePath = inputFil.getCanonicalPath();
+-    		} catch (IOException e3) {
+-    			sourcePath = inputFil.getAbsolutePath();
+-	    	}
+-			System.err.println("ERROR: file not existing: " + sourcePath);
+-			System.exit(1);
+-		}
 +        byte bytes[] = baos.toByteArray();
-+
+ 
+-		ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
+-		InputStreamReader inread;
+-		try {
+-			inread = new InputStreamReader(inByte, "UTF8");
+-		} catch (UnsupportedEncodingException e) {
+-			System.err.println(
+-				"ERROR: unsupported Encoding '"
+-					+ inputFile
+-					+ "': "
+-					+ e.getMessage());
+-			return false;
+-		}
 +        return bytes;
 +    }
-+
-+
-+	public class myparser {
-+		HashSet hidlist = null;
-+		HashSet extendedHelpText = null;
-+		Hashtable keywords = null;
-+		Hashtable helptexts = null;
- 		String documentId = null;
- 		String fileName = null;
- 		String title = null;
+ 
+-		InputSource inputSource = new InputSource(inread);
+-		inputSource.setEncoding("UTF8");
+-		Document docResolvedOrg = null;
+-		try {
+-			docResolvedOrg = XmlDocument.createXmlDocument(inputSource, false);
+-		} catch (Exception e) {
+-			System.err.println(
+-				"ERROR: XmlDocument.createXmlDocument() failed for '"
+-					+ inputFile
+-					+ "': "
+-					+ e.getMessage());
+-			return false;
+-		}
++    public class myparser {
++    	HashSet hidlist = null;
++        HashSet extendedHelpText = null;
++        Hashtable keywords = null;
++        Hashtable helptexts = null;
++        String documentId = null;
++        String fileName = null;
++        String title = null;
++
++        public myparser(String indocumentId, String infileName, String intitle) {
++            hidlist = new HashSet();
++            extendedHelpText = new HashSet();
++            keywords = new Hashtable();
++            helptexts = new Hashtable();
++            documentId = indocumentId;
++            fileName = infileName;
++        	title = intitle;
++        }
+ 
+-		// now find all applications for which one has to compile
+-		String documentId = null;
+-		String fileName = null;
+-		String title = null;
 -		// returns all applications for which one has to compile
 -		Object[] applications = switchFind(docResolvedOrg);
 -        
@@ -273,117 +594,108 @@
 -			Hashtable helptexts = new Hashtable();
 -            
 -			while ((test = treewalker.getNext()) != null) {
-+
-+		public myparser(String indocumentId, String infileName, String intitle) {
-+				hidlist = new HashSet();
-+				extendedHelpText = new HashSet();
-+				keywords = new Hashtable();
-+				helptexts = new Hashtable();
-+				documentId = indocumentId;
-+				fileName = infileName;
-+				title = intitle;
-+		}
-+
-+		public void traverse( Node parentNode ) {
-+			// traverse all nodes that belong to the parent
+-				if (fileName == null
+-					&& test.getNodeName().equals("filename")) {
++        public void traverse( Node parentNode ) {
++            // traverse all nodes that belong to the parent
 +			for(Node test=parentNode.getFirstChild(); test!=null; test=test.getNextSibling()) {
-+
- 				if (fileName == null
- 					&& test.getNodeName().equals("filename")) {
++				if (fileName == null && test.getNodeName().equals("filename")) {
  					NodeList list = test.getChildNodes();
-@@ -345,15 +389,102 @@ public class HelpCompiler implements Hel
+ 					Node node = list.item(0);
+ 					if (node.getNodeType() == Node.TEXT_NODE)
+@@ -332,15 +366,102 @@ public class HelpCompiler {
  					if (!extendedHelpText.isEmpty())
  						extendedHelpText = new HashSet();
  				}
 -			} // now save the info
-+			  // traverse children
-+			  traverse(test);
-+			}
-+		  }
-+	}
-+
-+	public boolean compile() throws UnsupportedEncodingException, java.io.IOException {
-+		// we now have the jaroutputstream, which will contain the document.
-+		// now determine the document as a dom tree in variable docResolved
-+		String absolutePath;
-+		String sourcePath;
-+		File inputFil = new File(inputFile);
-+		try {
-+			absolutePath = inputFil.getCanonicalPath();
-+		} catch (IOException e3) {
-+			absolutePath = inputFil.getAbsolutePath();
-+		}
-+		try {
-+			sourcePath = new File(src).getCanonicalPath();
-+		} catch (IOException e3) {
-+			sourcePath = new File(inputFile).getAbsolutePath();
-+		}
-+
-+		byte[] embResolved = null;
-+		try {
-+			embResolved = getSourceDocument(inputFil.toURL().toExternalForm());
-+		} catch (MalformedURLException e4) {
-+			System.err.println(
-+				"ERROR: malformed URL '" + inputFile + "': " + e4.getMessage());
-+			return false;
-+		}
-+
-+		// now add path to the document
-+		// resolve the dom
-+		if (embResolved == null) {
-+			System.err.println("ERROR: file not existing: " + sourcePath);
-+			System.exit(1);
-+		}
-+
-+		ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
-+		InputStreamReader inread;
-+		try {
-+			inread = new InputStreamReader(inByte, "UTF8");
-+		} catch (UnsupportedEncodingException e) {
-+			System.err.println(
-+				"ERROR: unsupported Encoding '"
-+					+ inputFile
-+					+ "': "
-+					+ e.getMessage());
-+			return false;
-+		}
-+
-+		InputSource inputSource = new InputSource(inread);
-+		inputSource.setEncoding("UTF8");
-+		Document docResolvedOrg = null;
-+		try {
-+			//System.err.println("Compiling " + inputFile);
-+			DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+			dFactory.setValidating(false);
-+			DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+			docResolvedOrg = dBuilder.parse(inputSource);
-+		} catch (Exception e) {
-+			System.err.println(
-+				"ERROR: XmlDocument.createXmlDocument() failed for '"
-+					+ inputFile
-+					+ "': "
-+					+ e.getMessage());
-+			return false;
-+		}
-+
-+		// now find all applications for which one has to compile
-+		String documentId = null;
-+		String fileName = null;
-+		String title = null;
-+		// returns all applications for which one has to compile
-+		Object[] applications = switchFind(docResolvedOrg);
-+        
-+        for (int i = 0; i < applications.length; ++i) {
-+			String appl = (String) applications[i];
-+            // returns a clone of the document with swich-cases resolved
-+			Element docResolved =
-+				(Element) clone(docResolvedOrg.getDocumentElement(), appl);
-+
-+			myparser aparser = new myparser(documentId, fileName, title);
-+			aparser.traverse(docResolved);
-+			documentId = aparser.documentId;
-+			fileName = aparser.fileName;
-+			title = aparser.title;
++                  // traverse children
++                  traverse(test);
++                }
++          }
++    }
++
++    public boolean compile() throws UnsupportedEncodingException, java.io.IOException {
++           // we now have the jaroutputstream, which will contain the document.
++           // now determine the document as a dom tree in variable docResolved
++           String absolutePath;
++           String sourcePath;
++           File inputFil = new File(inputFile);
++           try {
++                   absolutePath = inputFil.getCanonicalPath();
++           } catch (IOException e3) {
++                   absolutePath = inputFil.getAbsolutePath();
++           }
++           try {
++                   sourcePath = new File(src).getCanonicalPath();
++           } catch (IOException e3) {
++                   sourcePath = new File(inputFile).getAbsolutePath();
++           }
++
++           byte[] embResolved = null;
++           try {
++                   embResolved = getSourceDocument(inputFil.toURL().toExternalForm());
++           } catch (MalformedURLException e4) {
++                   System.err.println(
++                           "ERROR: malformed URL '" + inputFile + "': " + e4.getMessage());
++                   return false;
++           }
++
++           // now add path to the document
++           // resolve the dom
++           if (embResolved == null) {
++                   System.err.println("ERROR: file not existing: " + sourcePath);
++                   System.exit(1);
++           }
++
++           ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
++           InputStreamReader inread;
++           try {
++                   inread = new InputStreamReader(inByte, "UTF8");
++           } catch (UnsupportedEncodingException e) {
++                   System.err.println(
++                           "ERROR: unsupported Encoding '"
++                                   + inputFile
++                                   + "': "
++                                   + e.getMessage());
++                   return false;
++		   }
++
++           InputSource inputSource = new InputSource(inread);
++           inputSource.setEncoding("UTF8");
++           Document docResolvedOrg = null;
++           try {
++                   //System.err.println("Compiling " + inputFile);
++                   DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
++                   dFactory.setValidating(false);
++                   DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
++                   docResolvedOrg = dBuilder.parse(inputSource);
++           } catch (Exception e) {
++                   System.err.println(
++                           "ERROR: XmlDocument.createXmlDocument() failed for '"
++                                   + inputFile
++                                   + "': "
++                                   + e.getMessage());
++                   return false;
++           }
++
++           // now find all applications for which one has to compile
++           String documentId = null;
++           String fileName = null;
++           String title = null;
++           // returns all applications for which one has to compile
++           Object[] applications = switchFind(docResolvedOrg);
++
++		   for (int i = 0; i < applications.length; ++i) {
++               String appl = (String) applications[i];
++               // returns a clone of the document with swich-cases resolved
++               Element docResolved =
++                       (Element) clone(docResolvedOrg.getDocumentElement(), appl);
++
++               myparser aparser = new myparser(documentId, fileName, title);
++               aparser.traverse(docResolved);
++               documentId = aparser.documentId;
++               fileName = aparser.fileName;
++               title = aparser.title;
  
  			addEntryToJarFile(
  				appl,
@@ -392,35 +704,21 @@
 -			addEntryToJarFile(appl, "hidlist", hidlist);
 -			addEntryToJarFile(appl, "helptexts", helptexts);
 -			addEntryToJarFile(appl, "keywords", keywords);
-+				docToBytes(docResolved.getOwnerDocument()));
-+			addEntryToJarFile(appl, "hidlist", aparser.hidlist);
-+			addEntryToJarFile(appl, "helptexts", aparser.helptexts);
-+			addEntryToJarFile(appl, "keywords", aparser.keywords);
++                docToBytes(docResolved.getOwnerDocument()));
++            addEntryToJarFile(appl, "hidlist", aparser.hidlist);
++            addEntryToJarFile(appl, "helptexts", aparser.helptexts);
++            addEntryToJarFile(appl, "keywords", aparser.keywords);
  		} // end iteration over all applications
  
  		try {
-Index: source/com/sun/star/help/PreTransformer.java
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/PreTransformer.java,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 PreTransformer.java
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/PreTransformer.java	25 Jan 2005 15:29:16 -0000	1.6
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/PreTransformer.java	9 Nov 2005 13:19:52 -0000
-@@ -8,7 +8,6 @@ import java.util.zip.CRC32;
- import java.util.zip.ZipEntry;
- 
- import org.w3c.dom.*;
--import com.sun.xml.tree.*;
- import org.xml.sax.*;
- import javax.xml.parsers.*;
- import com.jclark.xsl.sax.*;
-Index: source/com/sun/star/help/HelpIndexer.java
+Index: xmlhelp/source/com/sun/star/help/HelpIndexer.java
 ===================================================================
 RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpIndexer.java,v
 retrieving revision 1.16
-diff -u -p -u -r1.16 HelpIndexer.java
---- openoffice.org.orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java	25 Oct 2005 11:24:55 -0000	1.16
-+++ openoffice.org/xmlhelp/source/com/sun/star/help/HelpIndexer.java	9 Nov 2005 13:24:14 -0000
+retrieving revision 1.16.20.1
+diff -u -p -u -p -r1.16 -r1.16.20.1
+--- xmlhelp/source/com/sun/star/help/HelpIndexer.java	25 Oct 2005 11:24:55 -0000	1.16
++++ xmlhelp/source/com/sun/star/help/HelpIndexer.java	17 Jan 2006 11:20:47 -0000	1.16.20.1
 @@ -46,7 +46,6 @@ import java.net.URL;
  import java.util.*;
  
@@ -429,63 +727,166 @@
  import org.xml.sax.*;
  import javax.xml.parsers.*;
  import com.jclark.xsl.sax.*;
-@@ -246,7 +247,10 @@ public class HelpIndexer {
+@@ -246,7 +245,10 @@ public class HelpIndexer {
  					in.setEncoding("UTF8");
  					Document docResolved = null;
  					try {
 -						docResolved = XmlDocument.createXmlDocument(in, false);
-+       					DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+                        dFactory.setValidating(false);
-+                        DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+                        docResolved = dBuilder.parse(in);
++						DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
++						dFactory.setValidating(false);
++						DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
++						docResolved = dBuilder.parse(in);
  					} catch (Exception e) {
  						if (docResolved == null)
  							System.err.println("Nullpointer");
-Index: org/openoffice/configuration/XMLDefaultGenerator.java
+Index: xmlhelp/source/com/sun/star/help/makefile.mk
 ===================================================================
-RCS file: /cvs/util/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java,v
-retrieving revision 1.4
-diff -u -r1.4 XMLDefaultGenerator.java
---- openoffice.org.orig/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	8 Sep 2005 14:43:34 -0000	1.4
-+++ openoffice.org/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	11 Nov 2005 11:03:10 -0000
-@@ -36,12 +36,10 @@
+RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
+retrieving revision 1.21
+retrieving revision 1.21.2.1
+diff -u -p -u -p -r1.21 -r1.21.2.1
+--- xmlhelp/source/com/sun/star/help/makefile.mk	16 Jan 2006 12:42:15 -0000	1.21
++++ xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
+@@ -42,7 +42,7 @@ TARGET  = com_sun_star_help
  
- import org.xml.sax.*;
- import org.w3c.dom.*;
--import com.sun.xml.tree.XmlDocument;
- import org.xml.sax.SAXException;
- import org.xml.sax.SAXParseException;
- import javax.xml.parsers.SAXParserFactory;
- import javax.xml.parsers.SAXParser;
--import com.sun.xml.tree.*;
- import java.util.*;
- import java.io.*;
- import com.jclark.xsl.sax.Driver;
-Index: src/com/sun/xmlsearch/makefile.mk
+ .INCLUDE : settings.mk
+ 
+-JARFILES 		= jaxp.jar parser.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
++JARFILES 		= xml-apis.jar xercesImpl.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
+ EXTRAJARFILES 	= 
+ 
+ .IF "$(SYSTEM_DB)" == "YES"
+Index: xmerge/source/xmerge/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
+retrieving revision 1.2
+retrieving revision 1.2.4.1
+diff -u -p -u -p -r1.2 -r1.2.4.1
+--- xmerge/source/xmerge/build.xml	24 Oct 2005 17:57:33 -0000	1.2
++++ xmerge/source/xmerge/build.xml	17 Jan 2006 10:54:44 -0000	1.2.4.1
+@@ -58,9 +58,8 @@
+     <property file="../inc/antbuild.properties"/>
+         
+     <path id="classpath">
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
+-        <pathelement location="${solar.jar}/xerces.jar"/>    
++        <pathelement location="${solar.jar}/xml-apis.jar"/>
++        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
+         <pathelement location="${solar.jar}/unoil.jar"/>
+         <pathelement location="${solar.jar}/ridl.jar"/>
+         <pathelement location="${solar.jar}/jurt.jar"/>
+@@ -96,7 +95,7 @@
+                 <attribute name="Specification-Vendor" value="OpenOffice.org"/>
+                 <attribute name="Specification-Version" value="0.6.0"/>
+                 <attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
+-                <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
++                <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar"/>
+             </manifest>
+          </jar>
+     </target>
+Index: xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml,v
+retrieving revision 1.2
+retrieving revision 1.2.4.1
+diff -u -p -u -p -r1.2 -r1.2.4.1
+--- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	24 Oct 2005 18:23:20 -0000	1.2
++++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	17 Jan 2006 10:55:00 -0000	1.2.4.1
+@@ -79,9 +79,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
+-        <pathelement location="${solar.jar}/xerces.jar"/>
++        <pathelement location="${solar.jar}/xml-apis.jar"/>
++        <pathelement location="${solar.jar}/xercesImpl.jar"/>
+     </path>
+ 
+     <!-- set whether we want to compile with or without deprecation -->
+Index: xmerge/util/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/util/build.xml,v
+retrieving revision 1.9
+retrieving revision 1.9.4.1
+diff -u -p -u -p -r1.9 -r1.9.4.1
+--- xmerge/util/build.xml	24 Oct 2005 18:23:52 -0000	1.9
++++ xmerge/util/build.xml	17 Jan 2006 10:55:05 -0000	1.9.4.1
+@@ -39,9 +39,8 @@
+     <property name="javadoc.dir" location="${build.dir}/javadoc"/>
+     
+     <path id="classpath">
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
+-        <pathelement location="${solar.jar}/xerces.jar"/>    
++        <pathelement location="${solar.jar}/xml-apis.jar"/>
++        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
+         <pathelement location="${solar.jar}/unoil.jar"/>
+         <pathelement location="${solar.jar}/ridl.jar"/>
+         <pathelement location="${solar.jar}/jurt.jar"/>
+Index: xmerge/util/xmerge.mf
+===================================================================
+RCS file: /cvs/xml/xmerge/util/xmerge.mf,v
+retrieving revision 1.1
+retrieving revision 1.1.24.1
+diff -u -p -u -p -r1.1 -r1.1.24.1
+--- xmerge/util/xmerge.mf	7 Mar 2002 16:45:23 -0000	1.1
++++ xmerge/util/xmerge.mf	17 Jan 2006 10:55:11 -0000	1.1.24.1
+@@ -1,6 +1,6 @@
+ Manifest-Version: 1.0
+ Main-Class: org.openoffice.xmerge.test.Driver
+-Class-Path: jaxp.jar parser.jar
++Class-Path: xml-apis.jar xercesImpl.jar
+ Specification-Title: OpenOffice XMerge Framework
+ Specification-Vendor: OpenOffice.org
+ Specification-Version: 0.6.0
+Index: xmerge/workben/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/workben/build.xml,v
+retrieving revision 1.3
+retrieving revision 1.3.8.1
+diff -u -p -u -p -r1.3 -r1.3.8.1
+--- xmerge/workben/build.xml	9 Sep 2005 11:50:54 -0000	1.3
++++ xmerge/workben/build.xml	17 Jan 2006 10:55:13 -0000	1.3.8.1
+@@ -60,9 +60,8 @@
+     <!-- classpath settings for javac tasks -->
+     <path id="classpath">
+         <pathelement location="${build.class}"/>
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
+-        <pathelement location="${solar.jar}/xerces.jar"/>
++        <pathelement location="${solar.jar}/xml-apis.jar"/>
++        <pathelement location="${solar.jar}/xercesImpl.jar"/>
+     </path>
+ 
+     <!-- set wether we want to compile with or without deprecation -->
+Index: XmlSearch/src/com/sun/xmlsearch/makefile.mk
 ===================================================================
 RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/makefile.mk,v
 retrieving revision 1.5
-diff -u -p -u -r1.5 makefile.mk
---- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/makefile.mk	25 Oct 2005 11:11:58 -0000	1.5
-+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/makefile.mk	14 Nov 2005 14:22:22 -0000
-@@ -21,6 +21,10 @@ TARGET  = com_sun_xmlsearch
+retrieving revision 1.5.6.1
+diff -u -p -u -p -r1.5 -r1.5.6.1
+--- XmlSearch/src/com/sun/xmlsearch/makefile.mk	25 Oct 2005 11:11:58 -0000	1.5
++++ XmlSearch/src/com/sun/xmlsearch/makefile.mk	17 Jan 2006 10:54:03 -0000	1.5.6.1
+@@ -21,8 +21,7 @@ TARGET  = com_sun_xmlsearch
  
  .INCLUDE : settings.mk
  
-+.IF "$(XML_CLASSPATH)" != ""
-+XCLASSPATH+=:$(XML_CLASSPATH)
-+.ENDIF
-+
- JARFILES 		=  jaxp.jar parser.jar xt.jar
- #EXTRAJARFILES 		=  jaxp.jar parser.jar xt.jar  
+-JARFILES 		=  jaxp.jar parser.jar xt.jar
+-#EXTRAJARFILES 		=  jaxp.jar parser.jar xt.jar  
++JARFILES 		=  xpi-apis.jar xercesImpl.jar xt.jar
+ 
+ JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
  
-Index: src/com/sun/xmlsearch/tree/TreeBuilder.java
+Index: XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java
 ===================================================================
 RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java,v
 retrieving revision 1.2
-diff -u -p -u -r1.2 TreeBuilder.java
---- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	9 Sep 2005 16:41:49 -0000	1.2
-+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	14 Nov 2005 14:22:25 -0000
+retrieving revision 1.2.12.1
+diff -u -p -u -p -r1.2 -r1.2.12.1
+--- XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	9 Sep 2005 16:41:49 -0000	1.2
++++ XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	17 Jan 2006 10:54:04 -0000	1.2.12.1
 @@ -46,7 +46,8 @@ import javax.swing.tree.TreeNode;
  import org.xml.sax.HandlerBase;
  import org.xml.sax.AttributeList;
@@ -541,13 +942,14 @@
  			/*
  			  System.out.println((System.currentTimeMillis()-start)
  			  +" msec parse");
-Index: src/com/sun/xmlsearch/util/Configuration.java
+Index: XmlSearch/src/com/sun/xmlsearch/util/Configuration.java
 ===================================================================
 RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/util/Configuration.java,v
 retrieving revision 1.2
-diff -u -p -u -r1.2 Configuration.java
---- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	9 Sep 2005 16:45:09 -0000	1.2
-+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	14 Nov 2005 14:22:25 -0000
+retrieving revision 1.2.12.1
+diff -u -p -u -p -r1.2 -r1.2.12.1
+--- XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	9 Sep 2005 16:45:09 -0000	1.2
++++ XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	17 Jan 2006 10:54:05 -0000	1.2.12.1
 @@ -40,8 +40,8 @@ import java.io.ByteArrayInputStream;
  import java.util.Vector;
  import java.net.URL;
@@ -555,7 +957,7 @@
 -import com.sun.xml.tree.XmlDocument;
 -import com.sun.xml.parser.Resolver;
 +import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory;
++import javax.xml.parsers.DocumentBuilderFactory; 
  import org.xml.sax.InputSource;
  
  public final class Configuration {
@@ -566,29 +968,30 @@
 -	InputSource input = Resolver.createInputSource(location, true);
 -	XmlDocument document = XmlDocument.createXmlDocument(input, false);
 +	DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+	dFactory.setValidating(false);
-+	DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+	Document document = dBuilder.parse(location.openStream());
++        dFactory.setValidating(false);
++        DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
++        Document document = dBuilder.parse(location.openStream());
  	return document.getDocumentElement();
      }
  
      public static Element parse(byte[] xmlBytes) throws Exception {
  	ByteArrayInputStream input = new ByteArrayInputStream(xmlBytes);
 -	XmlDocument document = XmlDocument.createXmlDocument(input, false);
-+	DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+	dFactory.setValidating(false);
-+	DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+	Document document = dBuilder.parse(input);
++        DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
++        dFactory.setValidating(false);
++        DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
++        Document document = dBuilder.parse(input);
  	return document.getDocumentElement();
      }
  
-Index: src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java
+Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java
 ===================================================================
 RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java,v
 retrieving revision 1.7
-diff -u -p -u -r1.7 XmlIndexBuilder.java
---- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	9 Sep 2005 16:52:56 -0000	1.7
-+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	14 Nov 2005 14:22:26 -0000
+retrieving revision 1.7.12.1
+diff -u -p -u -p -r1.7 -r1.7.12.1
+--- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	9 Sep 2005 16:52:56 -0000	1.7
++++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	17 Jan 2006 10:54:06 -0000	1.7.12.1
 @@ -42,15 +42,17 @@ import java.util.Enumeration;
  import java.net.URL;
  import org.xml.sax.InputSource;
@@ -611,42 +1014,40 @@
  
  import com.jclark.xsl.om.*;
  import com.jclark.xsl.sax.*;
-@@ -465,8 +467,11 @@ public final class XmlIndexBuilder {
+@@ -465,8 +467,10 @@ public final class XmlIndexBuilder {
  	public void indexDocument(URL docURL, String title) throws Exception {
  		InputSource source = new InputSource(docURL.openStream());
  		source.setSystemId(docURL.toString());
 -		Parser sourceParser = new Parser();
 -		sourceParser.setFastStandalone(true);
-+        	SAXParserFactory spf = SAXParserFactory.newInstance();
-+		spf.setValidating(false);
-+		SAXParser saxParser = spf.newSAXParser();
-+		Parser sourceParser = saxParser.getParser();
-+
++                SAXParserFactory spf = SAXParserFactory.newInstance();
++                spf.setValidating(false);
++                SAXParser saxParser = spf.newSAXParser();
++                Parser sourceParser = saxParser.getParser();
  		XMLProcessorEx sourceLoader = new XMLProcessorImpl(sourceParser);
  		//	long start = System.currentTimeMillis();
  		Node root =
-@@ -545,8 +550,12 @@ public final class XmlIndexBuilder {
+@@ -545,8 +549,10 @@ public final class XmlIndexBuilder {
  		}
  		// System.out.println(stylesheetUrl.toString());
  		InputStream stylesheetStream = stylesheetUrl.openStream();
 -		XmlDocument sheet =
 -			XmlDocument.createXmlDocument(stylesheetStream, false);
-+
-+		DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+		dFactory.setValidating(false);
-+		DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+		Document sheet = dBuilder.parse(stylesheetStream);
-+
++                DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
++                dFactory.setValidating(false);
++                DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
++                Document sheet = dBuilder.parse(stylesheetStream);
  		return _transformEngine.createTransform(sheet);
  	}
  
-Index: src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java
+Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java
 ===================================================================
 RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java,v
 retrieving revision 1.2
-diff -u -p -u -r1.2 XmlIndexer.java
---- openoffice.org.orig/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	9 Sep 2005 16:53:09 -0000	1.2
-+++ openoffice.org/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	14 Nov 2005 14:22:27 -0000
+retrieving revision 1.2.12.1
+diff -u -p -u -p -r1.2 -r1.2.12.1
+--- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	9 Sep 2005 16:53:09 -0000	1.2
++++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	17 Jan 2006 10:54:07 -0000	1.2.12.1
 @@ -39,8 +39,6 @@ import java.net.MalformedURLException;
  import java.io.*;
  import java.util.*;
@@ -656,3 +1057,20 @@
  import org.w3c.dom.*;
  import org.xml.sax.InputSource;
  import org.xml.sax.SAXException;
+Index: external/prj/d.lst
+===================================================================
+RCS file: /cvs/util/external/prj/d.lst,v
+retrieving revision 1.21
+retrieving revision 1.21.18.1
+diff -u -p -u -p -r1.21 -r1.21.18.1
+--- external/prj/d.lst	24 Nov 2004 15:13:13 -0000	1.21
++++ external/prj/d.lst	17 Jan 2006 10:39:46 -0000	1.21.18.1
+@@ -24,8 +24,6 @@ mkdir: %_DEST%\pck%_EXT%
+ ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
+ ..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
+-..\common\jaxp.jar %_DEST%\bin%_EXT%\jaxp.jar
+-..\common\parser.jar %_DEST%\bin%_EXT%\parser.jar
+ 
+ ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
+ ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*


--- openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch DELETED ---


--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch DELETED ---


--- openoffice.org-1.9.122.oooXXXXX.systemxalan.patch DELETED ---


--- openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch DELETED ---


--- openoffice.org-1.9.125.ooo54586.nfslock.sal.patch DELETED ---


--- openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch DELETED ---


--- openoffice.org-1.9.88.NONE.gcc3gcj4.patch DELETED ---


--- openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch DELETED ---


--- openoffice.org-2.0.1.ooo58618.sfx2.interactionhandler.patch DELETED ---


--- openoffice.org-2.0.1.ooo58798.parallel.patch DELETED ---


--- openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch DELETED ---


--- openoffice.org-2.0.1.ooo59537.config_office.nss.patch DELETED ---


--- openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch DELETED ---


--- openoffice.org-2.0.2.ooo61178.ucb.neon25.patch DELETED ---


--- workspace.cmcfixes20.patch DELETED ---


--- workspace.cmcfixes21.patch DELETED ---


--- workspace.cmcfixes22.patch DELETED ---


--- workspace.cmcfixes23.patch DELETED ---


--- workspace.dbwizardpp1.patch DELETED ---


--- workspace.epspreview.patch DELETED ---


--- workspace.hroloader.patch DELETED ---


--- workspace.sb41.patch DELETED ---


--- workspace.systemagg.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 09:07:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 04:07:05 -0500
Subject: rpms/cdrtools/devel cdrtools.spec,1.41,1.42
Message-ID: <200602150907.k1F975Yo010479@cvs.devel.redhat.com>

Author: harald

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

Modified Files:
	cdrtools.spec 
Log Message:
rebuild


Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cdrtools.spec	11 Feb 2006 02:14:40 -0000	1.41
+++ cdrtools.spec	15 Feb 2006 09:07:02 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A collection of CD/DVD utilities.
 Name: cdrtools
 Version: 2.01.01.0.a03
-Release: 2.2
+Release: 3
 %define tarversion 2.01.01a03
 License: GPL
 Group: Applications/System
@@ -229,6 +229,9 @@
 %{_mandir}/man1/cdda2wav.1*
 
 %changelog
+* 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
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 09:12:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 04:12:56 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo61875.sd.compile.patch, NONE, 1.1
Message-ID: <200602150912.k1F9Cu6c010583@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10570

Added Files:
	openoffice.org-2.0.2.ooo61875.sd.compile.patch 
Log Message:
add openoffice.org-2.0.2.ooo61875.sd.compile.patch

openoffice.org-2.0.2.ooo61875.sd.compile.patch:
 sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |    2 +-
 source/ui/slidesorter/cache/SlsQueueProcessor.hxx    |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo61875.sd.compile.patch ---
Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
retrieving revision 1.10
diff -u -p -u -r1.10 SlsQueueProcessor.hxx
--- openoffice.org.orig/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	19 Jan 2006 12:52:20 -0000	1.10
+++ openoffice.org/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	26 Jan 2006 08:29:38 -0000
@@ -164,7 +164,7 @@ template <class Queue, class RequestData
     while ( ! mrQueue.IsEmpty())
     {
         // Determine whether the system is idle.
-        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
+        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
         if (nIdleState != tools::IdleDetection::IDET_IDLE)
         {
             if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)



From fedora-cvs-commits at redhat.com  Wed Feb 15 09:51:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 04:51:41 -0500
Subject: rpms/beagle/devel beagle.spec,1.28,1.29
Message-ID: <200602150951.k1F9pfU3003253@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3240

Modified Files:
	beagle.spec 
Log Message:
+* Wed Feb 15 2006 Alexander Larsson <alexl at redhat.com> 0.2.1-6
+- Make all dlls exectuable to correctly pick up dependencies
+




Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- beagle.spec	13 Feb 2006 18:57:15 -0000	1.28
+++ beagle.spec	15 Feb 2006 09:51:39 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        5
+Release:        6
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -109,6 +109,7 @@
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.a
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/python*/site-packages/*.la
 
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*/*.dll
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.dll
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.exe
 
@@ -157,6 +158,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Wed Feb 15 2006 Alexander Larsson <alexl at redhat.com> 0.2.1-6
+- Make all dlls exectuable to correctly pick up dependencies
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.2.1-4
 - remove preferences from accessories menu
 - hide holmes (gnome-panel shows it in places now)



From fedora-cvs-commits at redhat.com  Wed Feb 15 10:53:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 05:53:13 -0500
Subject: rpms/less/devel less-394-search.patch,NONE,1.1 less.spec,1.29,1.30
Message-ID: <200602151053.k1FArD7E024693@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/less/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24205

Modified Files:
	less.spec 
Added Files:
	less-394-search.patch 
Log Message:
add patch for search problem (search did not find string which occurs in a line after '\0')


less-394-search.patch:
 line.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)

--- NEW FILE less-394-search.patch ---
--- less-394/line.c.search	2005-12-03 21:20:32.000000000 +0100
+++ less-394/line.c	2006-02-15 11:23:25.308694376 +0100
@@ -1125,6 +1125,14 @@
 				break;
 			}
 		}
+		if (c == '\0')
+		{
+			/* 
+			 * Pretend the line ended here
+			 */
+			new_pos = ch_tell();
+			break;
+		}
 		linebuf[n++] = c;
 		c = ch_forw_get();
 	}
@@ -1198,6 +1206,14 @@
 				*to = *fm;
 			n = size_linebuf - old_size_linebuf;
 		}
+		if (c == '\0')
+		{
+			/*
+			 * Pretend the line ended here
+			 */
+			new_pos = ch_tell() + 1;
+			break;
+		}
 		linebuf[--n] = c;
 	}
 	if (linep != NULL)


Index: less.spec
===================================================================
RCS file: /cvs/dist/rpms/less/devel/less.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- less.spec	11 Feb 2006 03:51:25 -0000	1.29
+++ less.spec	15 Feb 2006 10:53:11 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 394
-Release: 2.2
+Release: 3
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -10,6 +10,8 @@
 Source3: less.csh
 Patch0:	less-382-fixline.patch
 Patch1:	less-392-Foption.patch
+Patch2: less-394-search.patch
+
 
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-root
@@ -29,6 +31,7 @@
 %setup -q
 %patch0 -p1 -b .fixline
 %patch1 -p1 -b .Foption
+%patch2 -p1 -b .search
 chmod -R a+w *
 
 %build
@@ -54,6 +57,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 15 2006 Ivana Varekova <varekova at redhat.com> - 394-3
+- add patch for search problem (search did not find string which
+  occurs in a line after '\0')
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 394-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 11:06:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 06:06:33 -0500
Subject: rpms/db4/devel db-4.3.29-lfs.patch,NONE,1.1 db4.spec,1.30,1.31
Message-ID: <200602151106.k1FB6Wmk028165@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28124

Modified Files:
	db4.spec 
Added Files:
	db-4.3.29-lfs.patch 
Log Message:
* Wed Feb 15 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
- don't package /usr/share/doc/images in the main db4 package
  and move it to db4-devel (#33328)
- make db4 LFS capable (#33849)
- move db4-devel, db4-tcl, db4-java to Development/Libraries
  group instead of System Environment/Libraries (#54320)
- BuildPrereq -> BuildRequires
- don't use RPM_SOURCE_DIR
- Obsoletes db3, db2


db-4.3.29-lfs.patch:
 os_config.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE db-4.3.29-lfs.patch ---
--- db-4.3.29/os/os_config.c.lfs	2004-01-28 04:36:18.000000000 +0100
+++ db-4.3.29/os/os_config.c	2006-02-15 11:11:06.000000000 +0100
@@ -11,6 +11,7 @@
 
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
+#include <fcntl.h>
 #endif
 
 #include "db_int.h"


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- db4.spec	11 Feb 2006 02:23:09 -0000	1.30
+++ db4.spec	15 Feb 2006 11:06:29 -0000	1.31
@@ -11,11 +11,12 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 1.2.1
+Release: 2
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
 Patch1: db-4.3.21-java.patch
+Patch2: db-4.3.29-lfs.patch
 Patch4: db-4.2.52-gcj.patch
 Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
 Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
@@ -25,12 +26,12 @@
 URL: http://www.sleepycat.com/
 License: GPL
 Group: System Environment/Libraries
-Obsoletes: db1, db1-devel
-BuildPreReq: perl, libtool, ed, tcl-devel >= 8.4.4
+Obsoletes: db1, db2, db3
+BuildRequires: perl, libtool, ed, tcl-devel >= 8.4.4
 %ifarch %{java_arches}
-BuildPreReq: gcc-java
-BuildPreReq: java-1.4.2-gcj-compat
-BuildPreReq: java-1.4.2-gcj-compat-devel
+BuildRequires: gcc-java
+BuildRequires: java-1.4.2-gcj-compat
+BuildRequires: java-1.4.2-gcj-compat-devel
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -48,7 +49,7 @@
 Summary: Command line tools for managing Berkeley DB (version 4) databases.
 Group: Applications/Databases
 Requires: db4 = %{version}-%{release}
-Obsoletes: db2-utils, db3-utils
+Obsoletes: db1-utils, db2-utils, db3-utils
 
 %description utils
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -63,9 +64,9 @@
 
 %package devel
 Summary: Development files for the Berkeley DB (version 4) library.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: db4 = %{version}-%{release}
-Obsoletes: db2-devel, db3-devel
+Obsoletes: db1-devel, db2-devel, db3-devel
 
 %description devel
 The Berkeley Database (Berkeley DB) is a programmatic toolkit that
@@ -76,7 +77,7 @@
 
 %package tcl
 Summary: Development files for using the Berkeley DB (version 4) with tcl.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description tcl
@@ -87,7 +88,7 @@
 
 %package java
 Summary: Development files for using the Berkeley DB (version 4) with Java.
-Group: System Environment/Libraries
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description java
@@ -99,6 +100,7 @@
 %prep
 %setup -q -n db-%{version} -a 1
 %patch1 -p1 -b .java
+%patch2 -p1 -b .lfs
 %patch4 -p1 -b .gcj
 
 pushd dist
@@ -138,8 +140,8 @@
             -e 's,="ref/,="../%{name}-devel-%{version}/ref/,g' \
             -e 's,="../sleepycat/,="../../%{name}-devel-%{version}/sleepycat/,g' \
             -e 's,="sleepycat/,="../%{name}-devel-%{version}/sleepycat/,g' \
-            -e 's,="../images/,="../../%{name}-%{version}/images/,g' \
-            -e 's,="images/,="../%{name}-%{version}/images/,g' \
+            -e 's,="../images/,="../../%{name}-devel-%{version}/images/,g' \
+            -e 's,="images/,="../%{name}-devel-%{version}/images/,g' \
             -e 's,="../utility/,="../../%{name}-utils-%{version}/utility/,g' \
             -e 's,="utility/,="../%{name}-utils-%{version}/utility/,g' ${doc} > ${doc}.new
         touch -r ${doc} ${doc}.new
@@ -221,7 +223,7 @@
 unset nptl_s nptl_lo
 case %{_os} in
 linux|Linux)
-	nptl_s=$RPM_SOURCE_DIR/nptl-abi-note.S
+	nptl_s=%{SOURCE2}
 	nptl_lo=nptl-abi-note.lo
 	;;
 esac
@@ -306,7 +308,7 @@
 
 %files
 %defattr(-,root,root)
-%doc LICENSE README docs/images
+%doc LICENSE README
 /%{_lib}/libdb-%{__soversion}.so
 %{_libdir}/libdb-%{__soversion}.so
 %{_libdir}/libdb_cxx-%{__soversion}.so
@@ -329,7 +331,7 @@
 %files devel
 %defattr(-,root,root)
 %doc	docs/api_c docs/api_cxx docs/api_tcl docs/index.html
-%doc	docs/ref docs/sleepycat
+%doc	docs/ref docs/sleepycat docs/images
 %doc	examples_c examples_cxx
 %{_libdir}/libdb.so
 %{_libdir}/libdb_cxx.so
@@ -356,6 +358,16 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
+- don't package /usr/share/doc/images in the main db4 package
+  and move it to db4-devel (#33328)
+- make db4 LFS capable (#33849)
+- move db4-devel, db4-tcl, db4-java to Development/Libraries
+  group instead of System Environment/Libraries (#54320)
+- BuildPrereq -> BuildRequires
+- don't use RPM_SOURCE_DIR
+- Obsoletes db3, db2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.3.29-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 11:14:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 06:14:05 -0500
Subject: rpms/autoconf/devel autoconf-2.59-intrinsic.patch, 1.1,
	1.2 autoconf.spec, 1.19, 1.20
Message-ID: <200602151114.k1FBE5lK031192@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31157

Modified Files:
	autoconf-2.59-intrinsic.patch autoconf.spec 
Log Message:
- XrmInitialize takes no argument (#181340)

autoconf-2.59-intrinsic.patch:
 libs.m4 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: autoconf-2.59-intrinsic.patch
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf-2.59-intrinsic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autoconf-2.59-intrinsic.patch	6 Feb 2006 10:27:58 -0000	1.1
+++ autoconf-2.59-intrinsic.patch	15 Feb 2006 11:14:01 -0000	1.2
@@ -25,7 +25,7 @@
 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Intrinsic.h>],
 -				  [XtMalloc (0)])],
 +  AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <X11/Xlib.h>],
-+				  [XrmInitialize (0)])],
++				  [XrmInitialize ()])],
  		 [LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=],


Index: autoconf.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- autoconf.spec	6 Feb 2006 10:27:58 -0000	1.19
+++ autoconf.spec	15 Feb 2006 11:14:01 -0000	1.20
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf
 Version:	2.59
-Release:    6
+Release:    7
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
@@ -69,6 +69,9 @@
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 2.59-7
+- XrmInitialize takes no argument (#181340)
+
 * Mon Feb 06 2006 Karsten Hopp <karsten at redhat.de> 2.59-6
 - check for Xlib.h instead of Intrinsic.h to find X11 headers
   (#176379)



From fedora-cvs-commits at redhat.com  Wed Feb 15 11:19:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 06:19:41 -0500
Subject: rpms/a2ps/devel a2ps-tmpdir.patch,NONE,1.1 a2ps.spec,1.31,1.32
Message-ID: <200602151119.k1FBJfak013700@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/a2ps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13652

Modified Files:
	a2ps.spec 
Added Files:
	a2ps-tmpdir.patch 
Log Message:
* Wed Feb 15 2006 Tim Waugh <twaugh at redhat.com> 4.13b-49
- Use mktemp in scripts.


a2ps-tmpdir.patch:
 fixps.in    |    2 +-
 pdiff.in    |    2 +-
 psmandup.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE a2ps-tmpdir.patch ---
--- a2ps-4.13/contrib/psmandup.in.tmpdir	2006-02-15 11:03:50.000000000 +0000
+++ a2ps-4.13/contrib/psmandup.in	2006-02-15 11:03:50.000000000 +0000
@@ -36,7 +36,7 @@
 message=
 psselect=${PSSELECT:-psselect}
 psset=${PSSET:-psset}
-tmpdir=/tmp/$program.$$
+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
 
 # These two must be kept in synch.  They are opposed.
 verbose=echo
--- a2ps-4.13/contrib/fixps.in.tmpdir	2006-02-15 11:06:07.000000000 +0000
+++ a2ps-4.13/contrib/fixps.in	2006-02-15 11:06:33.000000000 +0000
@@ -38,7 +38,7 @@
 run_gs=0
 # What action to perform: fixps, cat, check, and gs
 task=fixps
-tmpdir=/tmp/$program.$$
+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
 verbose=echo
 
 # The version/usage strings
--- a2ps-4.13/contrib/pdiff.in.tmpdir	2006-02-15 11:05:44.000000000 +0000
+++ a2ps-4.13/contrib/pdiff.in	2006-02-15 11:05:56.000000000 +0000
@@ -34,7 +34,7 @@
 diff_options='-u'
 file=
 output=
-tmpdir=/tmp/$program.$$
+tmpdir=$(mktemp -d /tmp/$program.XXXXXX)
 verbose=echo
 wdiff_prog=${WDIFF:-wdiff}
 wdiff_options='-w[wd- -x-wd] -y{wd+ -z+wd}'


Index: a2ps.spec
===================================================================
RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- a2ps.spec	11 Feb 2006 02:41:22 -0000	1.31
+++ a2ps.spec	15 Feb 2006 11:19:38 -0000	1.32
@@ -1,5 +1,5 @@
 %define	ver	4.13b
-%define rel 	48.3
+%define rel 	49
 
 Summary: Converts text and other types of files to PostScript(TM).
 Name: a2ps
@@ -15,6 +15,7 @@
 Patch3: a2ps-4.13-security.patch
 Patch4: a2ps-4.13-glibcpaper.patch
 Patch5: a2ps-4.13-varargs.patch
+Patch6: a2ps-tmpdir.patch
 # EUC-JP support
 Patch10: a2ps-4.13-eucjp.patch.bz2
 Patch11: a2ps-4.13-autoenc.patch
@@ -59,6 +60,7 @@
 %patch3 -p1 -b .security
 %patch4 -p1 -b .glibcpaper
 %patch5 -p1
+%patch6 -p1 -b .tmpdir
 
 %patch10 -p1 -b .euc
 %patch11 -p1 -b .ae
@@ -226,6 +228,9 @@
 %dir %{_datadir}/a2ps
 
 %changelog
+* Wed Feb 15 2006 Tim Waugh <twaugh at redhat.com> 4.13b-49
+- Use mktemp in scripts.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.13b-48.3
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 11:46:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 06:46:10 -0500
Subject: rpms/openoffice.org/devel sources,1.153,1.154
Message-ID: <200602151146.k1FBkApq017227@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16767

Modified Files:
	sources 
Log Message:
forced to twiddle the ga translations


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- sources	15 Feb 2006 08:30:44 -0000	1.153
+++ sources	15 Feb 2006 11:46:07 -0000	1.154
@@ -1,7 +1,6 @@
 a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
-33abf0fa04f7ec90b49ba4a8072713b6  GSI_ga.sdf
 1825a3b182fd46e08075a42257cfc6aa  gcj-sed.sh
 16cb79cb018c6311e9797e85bd2461b2  evolocal.odb
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
@@ -10,3 +9,4 @@
 7d819e432c243e299d75196890c58f24  OOB680_m1.tar.bz2
 fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
 0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh
+0fc9c0b585e2c92a7ac05adebeb4caf2  GSI_ga.sdf



From fedora-cvs-commits at redhat.com  Wed Feb 15 13:13:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 08:13:38 -0500
Subject: rpms/kdebase/FC-4 kdebase-3.5.1-keyboardlayout.patch, 1.1,
	1.2 kdebase.spec, 1.116, 1.117
Message-ID: <200602151313.k1FDDctC019113@cvs.devel.redhat.com>

Author: than

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

Modified Files:
	kdebase-3.5.1-keyboardlayout.patch kdebase.spec 
Log Message:
apply patch to fix regression in keyboard layout #181054


kdebase-3.5.1-keyboardlayout.patch:
 extension.cpp |    2 -
 extension.h   |    2 -
 kcmlayout.cpp |   84 ++++++++++++++++++++++--------------------------------
 kcmlayout.h   |    4 --
 kxkb.cpp      |   44 ++++++++++++++++------------
 kxkb.h        |    4 +-
 rules.cpp     |   89 ++++++++++++++--------------------------------------------
 rules.h       |    4 --
 8 files changed, 88 insertions(+), 145 deletions(-)

Index: kdebase-3.5.1-keyboardlayout.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase-3.5.1-keyboardlayout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.1-keyboardlayout.patch	7 Feb 2006 10:14:25 -0000	1.1
+++ kdebase-3.5.1-keyboardlayout.patch	15 Feb 2006 13:13:34 -0000	1.2
@@ -1,20 +1,524 @@
---- kdebase-3.5.1/kxkb/rules.cpp.orig	2006-02-03 11:14:24.000000000 +0100
-+++ kdebase-3.5.1/kxkb/rules.cpp	2006-02-03 11:05:24.000000000 +0100
-@@ -300,7 +300,7 @@
-  */
- const QString KeyRules::getLayout(const QString &layvar) const
+diff -Nur kdebase-3.5.1.orig/kxkb/extension.cpp kdebase-3.5.1/kxkb/extension.cpp
+--- kdebase-3.5.1.orig/kxkb/extension.cpp	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/extension.cpp	2006-02-15 13:38:08.000000000 +0100
+@@ -87,7 +87,7 @@
+ }
+ 
+ bool XKBExtension::setLayout(const QString& model, 
+-		const QString& layout, const QString& variant, unsigned int group,
++		const QString& layout, const char* variant, unsigned int group,
+ 		const char* baseGr)
  {
--  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
-+  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(LAYOUT_PATTERN);
-   int pos = rx.search(varLine, 0);
-@@ -318,7 +318,7 @@
-  */
- const QString KeyRules::getVariant(const QString &layvar) const
+     if (/*rule.isEmpty() ||*/ model.isEmpty() || layout.isEmpty())
+diff -Nur kdebase-3.5.1.orig/kxkb/extension.h kdebase-3.5.1/kxkb/extension.h
+--- kdebase-3.5.1.orig/kxkb/extension.h	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/extension.h	2006-02-15 13:38:14.000000000 +0100
+@@ -15,7 +15,7 @@
+     bool init();
+ 
+     static bool setXkbOptions(const QString& options, bool resetOldOptions);
+-    bool setLayout(const QString& model, const QString& layout, const QString& variant, unsigned int group,
++    bool setLayout(const QString& model, const QString& layout, const char* variant, unsigned int group,
+ 				const char* baseGr);
+     bool setGroup(unsigned int group);
+     unsigned int getGroup();
+diff -Nur kdebase-3.5.1.orig/kxkb/kcmlayout.cpp kdebase-3.5.1/kxkb/kcmlayout.cpp
+--- kdebase-3.5.1.orig/kxkb/kcmlayout.cpp	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/kcmlayout.cpp	2006-02-15 13:38:08.000000000 +0100
+@@ -53,19 +53,6 @@
+   return QString::null;
+ }
+ 
+-static QListViewItem* copyLVI(const QListViewItem* src, QListView* parent)
+-{
+-    QListViewItem* ret = new QListViewItem(parent);
+-    for(int i = 0; i < 3; i++)
+-    {
+-        ret->setText(i, src->text(i));
+-        if ( src->pixmap(i) )
+-            ret->setPixmap(i, *src->pixmap(i));
+-    }
+-    
+-    return ret;
+-}
+-
+ OptionListItem::OptionListItem( OptionListItem *parent, const QString &text,
+     Type tt, const QString &optionName )
+     : QCheckListItem( parent, text, tt ), m_OptionName( optionName )
+@@ -159,24 +146,16 @@
+     widget->spinStickyDepth->setMaxValue( (layoutsCnt<=2) ? 2 : layoutsCnt - 1);
+ }
+ 
+-const QString LayoutConfig::itemVariant(QListViewItem *item)
+-{
+-    return m_variants[QString::number((ptrdiff_t)item, 16)];
+-}
+-
+ void LayoutConfig::add()
+ {
+     QListViewItem* sel = widget->listLayoutsSrc->selectedItem();
+     if( sel == 0 )
+ 	return;
+     
+-    // Create a copy of the sel widget, as one might add the same layout more
+-    // than one time, with different variants.
+-    QListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst);
+-    
+-    widget->listLayoutsDst->insertItem(toadd);
++    widget->listLayoutsSrc->takeItem(sel);
++    widget->listLayoutsDst->insertItem(sel);
+     if( widget->listLayoutsDst->childCount() > 1 )
+-	toadd->moveItem(widget->listLayoutsDst->lastItem());
++	sel->moveItem(widget->listLayoutsDst->lastItem());
+ // disabling temporary: does not work reliable in Qt :(
+ //    widget->listLayoutsSrc->setSelected(sel, true);
+ //    layoutSelChanged(sel);
+@@ -199,7 +178,8 @@
+     if( sel->itemAbove() )
+ 	newSel = sel->itemAbove();
+ 
+-    delete sel;
++    widget->listLayoutsDst->takeItem(sel);
++    widget->listLayoutsSrc->insertItem(sel);
+     if( newSel )
+ 	widget->listLayoutsSrc->setSelected(newSel, true);
+     layoutSelChanged(newSel);
+@@ -242,7 +222,7 @@
+     }
+ 
+     QString kbdLayout = lookupLocalized( m_rules->layouts(), selLayout->text(1) );
+-    m_variants.replace(QString::number((ptrdiff_t)selLayout, 16), widget->comboVariant->currentText());
++    m_variants.replace(kbdLayout, widget->comboVariant->currentText().latin1());
+ }
+ 
+ void LayoutConfig::latinChanged()
+@@ -297,14 +277,15 @@
+         return;
+     }
+ 
++    char* variant = m_variants[kbdLayout];
+     widget->comboVariant->insertStringList(vars);
+ 
+-    if( ! itemVariant(sel).isNull() ) {
+-      widget->comboVariant->setCurrentText(itemVariant(sel));
++    if( variant ) {
++      widget->comboVariant->setCurrentText(variant);
+     }
+     else {
+       widget->comboVariant->setCurrentItem(0);
+-      m_variants.insert(QString::number((ptrdiff_t)sel, 16), widget->comboVariant->currentText().latin1());
++      m_variants.insert(kbdLayout, widget->comboVariant->currentText().latin1());
+     }
+ 
+     updateLayoutCommand();
+@@ -401,6 +382,7 @@
+ 
+   if( sel ) {
+     QString kbdLayout = lookupLocalized(m_rules->layouts(), sel->text(1));
++//    char* variant = m_variants[kbdLayout];
+     QString variant = widget->comboVariant->currentText();
+ 
+     setxkbmap = "setxkbmap"; //-rules " + m_rule
+@@ -450,30 +432,32 @@
+   QString m_name = m_rules->models()[model];
+   widget->comboModel->setCurrentText(i18n(m_name.local8Bit()));
+ 
+-  QString layvar = config->readEntry("Layout", "us(basic)");
+-  QString l_name = m_rules->layouts()[m_rules->getLayout(layvar)];
++  QString layout = config->readEntry("Layout", "us");
++  QString l_name = m_rules->layouts()[layout];
+ 
+   QStringList otherLayouts = config->readListEntry("Additional");
+   if( !l_name.isEmpty() ) {
+-    otherLayouts.prepend(layvar);
++    otherLayouts.prepend(layout);
+   }
+ // to optimize we should have gone from it.end to it.begin
+   for ( QStringList::Iterator it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) {
+     QListViewItemIterator src_it( widget->listLayoutsSrc );
+     for ( ; src_it.current(); ++src_it ) {
+ 	QListViewItem* srcItem = src_it.current();
+-	if ( m_rules->getLayout(*it) == lookupLocalized(m_rules->layouts(), src_it.current()->text(1)) ) {
+-    	    QListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst);
+-    	    widget->listLayoutsDst->insertItem(newItem);
+-	    newItem->moveItem(widget->listLayoutsDst->lastItem());
+-	    
+-	    m_variants[QString::number((ptrdiff_t)newItem, 16)] = 
+-	      m_rules->getVariant(*it, m_rules->getLayout(*it));
++	if ( *it == lookupLocalized(m_rules->layouts(), src_it.current()->text(1)) ) {
++    	    widget->listLayoutsSrc->takeItem(srcItem);
++    	    widget->listLayoutsDst->insertItem(srcItem);
++	    srcItem->moveItem(widget->listLayoutsDst->lastItem());
+ 	    break;
+ 	}
+     }
+   }
+ 
++// reading variants
++  QStringList vars = config->readListEntry("Variants");
++  m_rules->parseVariants(vars, m_variants);
++//  m_rules->parseVariants( vars, m_variants );
++
+   QStringList incs = config->readListEntry( "Includes" );
+   m_rules->parseVariants( incs, m_includes, false );
+ 
+@@ -641,12 +625,7 @@
+   if( item ) {
+     layout = lookupLocalized(m_rules->layouts(), item->text(1));
+     if( !layout.isEmpty() )
+-    {
+-        if ( !itemVariant(item).isNull() )
+-            config->writeEntry("Layout", layout + "(" + itemVariant(item) + ")");
+-        else
+-	    config->writeEntry("Layout", layout);
+-    }
++	config->writeEntry("Layout", layout);
+     item = item->nextSibling();
+   }
+   else {
+@@ -654,10 +633,8 @@
+   }
+ 
+   while (item) {
+-      QString layout = lookupLocalized(m_rules->layouts(), item->text(1));
+-      if ( !itemVariant(item).isNull() )
+-          layout += "(" + itemVariant(item) + ")";
+-      otherLayouts.append(layout);
++	QString layout = lookupLocalized(m_rules->layouts(), item->text(1));
++	otherLayouts.append(layout);
+       item = item->nextSibling();
+   }
+   config->writeEntry("Additional", otherLayouts);
+@@ -675,10 +652,19 @@
+         inc += ")";
+         incList.append(  inc );
+     }
++    if( m_variants[ layout ] && m_variants[ layout ][ 0 ] != '\0' )
++    {
++	QString var = layout;
++	var += "(";
++	var += m_variants[ layout ];
++	var += ")";
++	varList.append( var );
++    }
+ 
+     item = item->nextSibling();
+   }
+   config->writeEntry( "Includes", incList );
++  config->writeEntry("Variants", varList);
+ 
+   config->writeEntry("Use", widget->chkEnable->isChecked());
+   config->writeEntry("ShowSingle", widget->chkShowSingle->isChecked());
+diff -Nur kdebase-3.5.1.orig/kxkb/kcmlayout.h kdebase-3.5.1/kxkb/kcmlayout.h
+--- kdebase-3.5.1.orig/kxkb/kcmlayout.h	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/kcmlayout.h	2006-02-15 13:38:14.000000000 +0100
+@@ -69,15 +69,13 @@
+   LayoutConfigWidget* widget;
+ 
+   QDict<OptionListItem> m_optionGroups;
+-  QMap<QString, QString> m_variants;
++  QDict<char> m_variants;
+   QDict<char> m_includes;
+ //  QString m_rule;
+   KeyRules *m_rules;
+ 
+   QWidget* makeOptionsTab();
+   void updateStickyLimit();
+-  
+-  const QString itemVariant(QListViewItem *item);
+ };
+ 
+ 
+diff -Nur kdebase-3.5.1.orig/kxkb/kxkb.cpp kdebase-3.5.1/kxkb/kxkb.cpp
+--- kdebase-3.5.1.orig/kxkb/kxkb.cpp	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/kxkb.cpp	2006-02-15 13:38:08.000000000 +0100
+@@ -71,10 +71,10 @@
+ }
+ 
+ 
+-void TrayWindow::setCurrentLayout(const QString& layout, const QString &variant)
++void TrayWindow::setCurrentLayout(const QString& layout)
+ {
+     QToolTip::remove(this);
+-    QToolTip::add(this, mDescriptionMap[layout] + (variant.isNull()? "" : " (" + variant + ")" ) );
++    QToolTip::add(this, mDescriptionMap[layout]);
+ 
+     KIconEffect iconeffect;
+ 
+@@ -105,9 +105,9 @@
+     QStringList::ConstIterator it;
+     for (it=layouts.begin(); it != layouts.end(); ++it)
+     {
+-        const QPixmap pix = iconeffect.apply(LayoutIcon::findPixmap(rules.getLayout(*it), m_showFlag), KIcon::Small, KIcon::DefaultState);
+-        contextMenu()->insertItem(pix, i18n((rules.layouts()[rules.getLayout(*it)])) + " (" + rules.getVariant(*it) + ")", cnt++);
+-        mDescriptionMap.insert(rules.getLayout(*it), i18n((rules.layouts()[rules.getLayout(*it)])));
++        const QPixmap pix = iconeffect.apply(LayoutIcon::findPixmap(*it, m_showFlag), KIcon::Small, KIcon::DefaultState);
++        contextMenu()->insertItem(pix, i18n((rules.layouts()[*it])), cnt++);
++        mDescriptionMap.insert(*it, i18n((rules.layouts()[*it])));
+     }    
+ 
+     contextMenu()->insertItem(SmallIcon("configure"), i18n("Configure..."), cnt++);
+@@ -228,13 +228,19 @@
+     m_layout = config->readEntry("Layout", "");
+     m_defaultLayout = m_layout;
+ 
++
+     m_list = config->readListEntry("Additional");
+-    m_list.prepend(m_layout);
++    if (!m_list.contains(m_layout))
++    {
++        m_list.prepend(m_layout);
++    }
+ 
+     kdDebug() << "found " << m_list.count() << " layouts" << endl;
+ 
+ // reading variants
+     m_variants.clear();
++    QStringList vars = config->readListEntry("Variants");
++    m_rules->parseVariants(vars, m_variants);
+ 
+     m_includes.clear();
+     if( m_rules->isXFree_v43() ) {
+@@ -246,9 +252,9 @@
+ 	precompileLayouts();
+     }
+     else {
+-	int group = m_rules->getGroup(m_rules->getLayout(m_layout), m_includes[m_rules->getLayout(m_layout)]);
+-        if( !m_extension->setLayout(m_model, m_rules->getLayout(m_layout), m_rules->getVariant(m_layout, QString::null), group, m_includes[m_rules->getLayout(m_layout)]) ) {
+-	    kdDebug() << "Error switching to single layout " << m_rules->getLayout(m_layout) << endl;
++	int group = m_rules->getGroup(m_layout, m_includes[m_layout]);
++        if( !m_extension->setLayout(m_model, m_layout, m_variants[m_layout], group, m_includes[m_layout]) ) {
++	    kdDebug() << "Error switching to single layout " << m_layout << endl;
+ // kapp->quit();
+ 	}
+ 	bool showSingle = config->readBoolEntry("ShowSingle", false);
+@@ -272,7 +278,7 @@
+     bool showFlag = config->readBoolEntry("ShowFlag", true);
+     m_tray->setShowFlag(showFlag);
+     m_tray->setLayouts(m_list, *m_rules);
+-    m_tray->setCurrentLayout(m_rules->getLayout(m_layout), m_rules->getVariant(m_layout, QString::null));
++    m_tray->setCurrentLayout(m_layout);
+     m_tray->show();
+ 
+     delete config;
+@@ -295,7 +301,7 @@
+ bool KXKBApp::setLayout(const QString& layout)
  {
+     bool res = false;
+-    const char* baseGr = m_includes[m_rules->getLayout(layout)];
++    const char* baseGr = m_includes[layout]; 
+     m_group = m_rules->getGroup(layout, baseGr);
+ 
+     if ( m_compiledLayoutFileNames.contains(layout) && !m_forceSetXKBMap )
+@@ -308,7 +314,7 @@
+ 
+     if ( !res ) // try not compiled layout, store compiled if success
+     {
+-        res = m_extension->setLayout(m_model, m_rules->getLayout(layout), m_rules->getVariant(layout, QString::null), m_group, baseGr);
++        res = m_extension->setLayout(m_model, layout, m_variants[layout], m_group, baseGr);
+ //	kdDebug() << "setting non-compiled for " << layout << ": " << res << endl;
+         if( res )
+             m_extension->getCompiledLayout(m_compiledLayoutFileNames[layout]);
+@@ -319,7 +325,7 @@
+     
+     if (m_tray) {
+ 	if( res ) {
+-	    m_tray->setCurrentLayout(m_rules->getLayout(layout), m_rules->getVariant(layout));
++	    m_tray->setCurrentLayout(layout);
+ 	}
+ 	else  
+ 	    m_tray->setError(layout);
+@@ -344,9 +350,9 @@
+ //	const char* baseGr = m_includes[layout]; 
+ //	int group = m_rules->getGroup(layout, baseGr);
+ //    	if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) {
+-    	    QString compiledLayoutFileName = tempDir + m_rules->getLayout(layout) + ".xkm";
++    	    QString compiledLayoutFileName = tempDir + layout + ".xkm";
+ //    	    if( m_extension->getCompiledLayout(compiledLayoutFileName) )
+-    		m_compiledLayoutFileNames[m_rules->getLayout(layout)] = compiledLayoutFileName;
++    		m_compiledLayoutFileNames[layout] = compiledLayoutFileName;
+ //	}
+ //	else {
+ //    	    kdDebug() << "Error precompiling layout " << layout << endl;
+@@ -390,7 +396,7 @@
+ 		}
+ 	    }
+ 	}
+-	m_lastLayout->enqueue(new QString(m_rules->getLayout(m_layout)));
++	m_lastLayout->enqueue(new QString(m_layout));
+ 	
+ 	// shrink queue if m_stickySwitchingDepth has been decremented
+ 	
+@@ -421,7 +427,7 @@
+     
+     if( prevWinId ) {	// saving layout/group from previous window
+ 			// this will not work for the window activated before kxkb start :(
+-	    LayoutInfo layoutInfo(m_rules->getLayout(m_layout), group, m_lastLayout);
++	    LayoutInfo layoutInfo(m_layout, group, m_lastLayout);
+ 	    m_layoutOwnerMap.setLayout(prevWinId, layoutInfo);
+     }
+     
+@@ -439,7 +445,7 @@
+ 
+     m_lastLayout = layoutInfo.getLastLayout();
+ 	
+-    if( layoutInfo.layout != m_rules->getLayout(m_layout) ) {
++    if( layoutInfo.layout != m_layout ) {
+ 	m_layout = layoutInfo.layout;
+         layoutApply();	// we have to add group parameter to settingApply() ??
+ 	m_extension->setGroup(layoutInfo.group);
+@@ -458,7 +464,7 @@
+ 	{
+ 	    if ((int)m_lastLayout->count() >= m_stickySwitchingDepth)
+ 		delete m_lastLayout->dequeue();
+-	    m_lastLayout->enqueue(new QString(m_rules->getLayout(m_layout)));
++	    m_lastLayout->enqueue(new QString(m_layout));
+ 	}
+ 
+         m_layout = m_list[id];
+diff -Nur kdebase-3.5.1.orig/kxkb/kxkb.h kdebase-3.5.1/kxkb/kxkb.h
+--- kdebase-3.5.1.orig/kxkb/kxkb.h	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/kxkb.h	2006-02-15 13:38:14.000000000 +0100
+@@ -1,6 +1,6 @@
+ /*
+     Copyright (C) 2001, S.R.Haque <srhaque at iee.org>. Derived from an
+-    original by Matthias H???zer-Klpfel released under the QPL.
++    original by Matthias H?lzer-Kl?pfel released under the QPL.
+     This file is part of the KDE project
+ 
+     This library is free software; you can redistribute it and/or
+@@ -51,7 +51,7 @@
+     TrayWindow(QWidget *parent=0, const char *name=0);
+ 
+     void setLayouts(const QStringList& layouts, const KeyRules& rule);
+-    void setCurrentLayout(const QString& layout, const QString &variant);
++    void setCurrentLayout(const QString& layout);
+     void setError(const QString& layout="");
+     void setShowFlag(bool showFlag) { m_showFlag = showFlag; }
+ 
+diff -Nur kdebase-3.5.1.orig/kxkb/rules.cpp kdebase-3.5.1/kxkb/rules.cpp
+--- kdebase-3.5.1.orig/kxkb/rules.cpp	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/rules.cpp	2006-02-15 13:38:08.000000000 +0100
+@@ -34,16 +34,13 @@
+     return;
+   }
+ 
+-// AR: 2006.01.18: removed this check as it does not work on some SuSE's
+-// - will assume XFree 4.3 or later (BUG: 117468)
+-
+   // ugly check for XFree 4.3 or older
+-//  if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) {
++  if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) {
+ 	m_xfree43 = true;
+-//  }
+-//  else {
+-//	m_xfree43 = false;
+-//  }
++  }
++  else {
++	m_xfree43 = false;
++  }
+ 
+   QString rulesFile;
+   Display *dpy = qt_xdisplay();
+@@ -293,68 +290,28 @@
+     return *result;
+ }
+ 
+-/**
+- * @brief Gets the single layout part of a layout(variant) string
+- * @param[in] layvar String in form layout(variant) to parse
+- * @return The layout found in the string
+- */
+-const QString KeyRules::getLayout(const QString &layvar) const
+-{
+-  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
+-  QString varLine = layvar.stripWhiteSpace();
+-  QRegExp rx(LAYOUT_PATTERN);
+-  int pos = rx.search(varLine, 0);
+-  int len = rx.matchedLength();
+-  // check for errors
+-  if( pos < 0 || len < 2 )
+-    return QString::null;
+-  return varLine.mid(pos, len);
+-}
+-
+-/**
+- * @brief Gets the single variant part of a layout(variant) string
+- * @param[in] layvar String in form layout(variant) to parse
+- * @return The variant found in the string, no check is performed
+- */
+-const QString KeyRules::getVariant(const QString &layvar) const
+-{
 -  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
-+  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(VARIANT_PATTERN);
-   int pos = rx.search(varLine, 0);
+-  QString varLine = layvar.stripWhiteSpace();
+-  QRegExp rx(VARIANT_PATTERN);
+-  int pos = rx.search(varLine, 0);
+-  int len = rx.matchedLength();
+-  // check for errors
+-  if( pos < 2 || len < 2 )
+-    return QString::null;
+-  return varLine.mid(pos+1, len-2);
+-}
+-
+-/**
+- * @brief Gets the single variant part of a layout(variant) string
+- * @param[in] layvar String in form layout(variant) to parse
+- * @param[in] layout When validating the variant, use this as layout to check
+- *   against. Use QString::null to avoid validating.
+- * @return The variant found in the string, or "basic" if the variant does not
+- *   exists and layout is non-null.
+- */
+-const QString KeyRules::getVariant(const QString &layvar, const QString &layout)
+-{
+-  QString variant_ = getVariant(layvar);
+-  
+-  if ( ! layout.isNull() )
+-  {
+-    QStringList addVars = getVariants(layout);
+-    if( !addVars.contains(variant_) )
+-      variant_ = "basic";
+-  }
+-  return variant_;
+-}
+-
+ void KeyRules::parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars)
+ {
++  static const char* LAYOUT_PATTERN = "[a-z0-9_]*";
++  static const char* VARIANT_PATTERN = "\\([a-z0-9_]*\\)";
+   for (QStringList::ConstIterator it = vars.begin(); it != vars.end(); ++it)
+   {
+-      QString layout = getLayout(*it), variant_ = getVariant(*it, QString::null);
++      QString varLine = (*it).stripWhiteSpace();
++      QRegExp rx(LAYOUT_PATTERN);
++      int pos = rx.search(varLine, 0);
++      int len = rx.matchedLength();
++  // check for errors
++      if( pos < 0 || len < 2 )
++        continue;
++      QString layout = varLine.mid(pos, len);
++      rx.setPattern(VARIANT_PATTERN);
++      pos = rx.search(varLine, pos+len);
++      len = rx.matchedLength();
++  // check for errors
++      if( pos < 2 || len < 2 )
++        continue;
++      QString variant_ = varLine.mid(pos+1, len-2);
++
+ 
+       QStringList addVars = getVariants(layout);
+       if( !chkVars || (!variant_.isEmpty() && addVars.contains(variant_)) )
+diff -Nur kdebase-3.5.1.orig/kxkb/rules.h kdebase-3.5.1/kxkb/rules.h
+--- kdebase-3.5.1.orig/kxkb/rules.h	2006-01-19 18:02:18.000000000 +0100
++++ kdebase-3.5.1/kxkb/rules.h	2006-02-15 13:38:14.000000000 +0100
+@@ -16,10 +16,6 @@
+   const QDict<char> &layouts() const { return m_layouts; };
+   const QDict<char> &options() const { return m_options; };
+ 
+-  const QString getLayout(const QString &layvar) const;
+-  const QString getVariant(const QString &layvar) const;
+-  const QString getVariant(const QString &layvar, const QString &layout);
+-
+   void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true);
+ //  static QStringList rules(QString path = QString::null);
+ 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdebase.spec	7 Feb 2006 10:14:25 -0000	1.116
+++ kdebase.spec	15 Feb 2006 13:13:34 -0000	1.117
@@ -408,8 +408,8 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
-* Tue Feb 07 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
-- apply patch to fix broken xx_XX layouts in kxkb
+* Wed Feb 15 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
+- apply patch to fix regression in keyboard layout #181054
 
 * Fri Jan 27 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1



From fedora-cvs-commits at redhat.com  Wed Feb 15 13:41:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 08:41:43 -0500
Subject: rpms/gnome-utils/devel gnome-utils.spec,1.94,1.95
Message-ID: <200602151341.k1FDfhXf030992@cvs.devel.redhat.com>

Author: mclasen

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

Modified Files:
	gnome-utils.spec 
Log Message:
Fix %%post



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gnome-utils.spec	15 Feb 2006 05:58:57 -0000	1.94
+++ gnome-utils.spec	15 Feb 2006 13:41:41 -0000	1.95
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.92
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -178,14 +178,18 @@
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then   gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi
+if [ -x /usr/bin/gtk-update-icon-cache ]; then 
+  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+fi
 
 
 %postun
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then   gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi
+if [ -x /usr/bin/gtk-update-icon-cache ]; then 
+  /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
+fi
 
 
 %files -f all.lang
@@ -218,6 +222,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-3
+- Fix %%post 
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
 - Update to gucharmap 1.5.2
 - Update to gcalctool 5.7.29



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:03:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:03:47 -0500
Subject: rpms/ksh/devel ksh-20060124-iffedebug.patch, NONE,
	1.1 ksh-20060124-syntax.patch, 1.1, 1.2 ksh.spec, 1.22, 1.23
Message-ID: <200602151403.k1FE3k1e021719@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ksh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21700

Modified Files:
	ksh-20060124-syntax.patch ksh.spec 
Added Files:
	ksh-20060124-iffedebug.patch 
Log Message:
next attempt to make it build in a chroot

ksh-20060124-iffedebug.patch:
 cmd/ksh93/Mamfile  |   30 ++++++++---------
 lib/libast/Mamfile |   90 ++++++++++++++++++++++++++---------------------------
 lib/libcmd/Mamfile |    8 ++--
 lib/libdll/Mamfile |    2 -
 4 files changed, 65 insertions(+), 65 deletions(-)

--- NEW FILE ksh-20060124-iffedebug.patch ---
diff -urN ksh-20060124_old/src/cmd/ksh93/Mamfile ksh-20060124_new/src/cmd/ksh93/Mamfile
--- ksh-20060124_old/src/cmd/ksh93/Mamfile	2006-01-24 18:16:51.000000000 -0500
+++ ksh-20060124_new/src/cmd/ksh93/Mamfile	2006-02-14 07:35:58.000000000 -0500
@@ -205,7 +205,7 @@
 done +lintl dontcare virtual
 make ${mam_libdl}
 done ${mam_libdl} dontcare virtual
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/time
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/time
 make ${PACKAGE_ast_INCLUDE}/times.h implicit
 make ${PACKAGE_ast_INCLUDE}/ast_time.h implicit
 done ${PACKAGE_ast_INCLUDE}/ast_time.h dontcare
@@ -225,7 +225,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/dynamic
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/dynamic
 make ${PACKAGE_ast_INCLUDE}/fs3d.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
@@ -241,7 +241,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/options
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/options
 done FEATURE/options dontcare generated
 prev ${PACKAGE_ast_INCLUDE}/option.h implicit
 done include/builtins.h
@@ -265,7 +265,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/sigfeatures
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/sigfeatures
 done FEATURE/sigfeatures dontcare generated
 make FEATURE/setjmp implicit
 meta FEATURE/setjmp features/%>FEATURE/% features/setjmp setjmp
@@ -277,7 +277,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/setjmp
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/setjmp
 done FEATURE/setjmp dontcare generated
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
@@ -313,7 +313,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def acct
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def acct
 done FEATURE/acct dontcare generated
 prev include/nval.h implicit
 prev FEATURE/options implicit
@@ -387,7 +387,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/ttys
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/ttys
 done FEATURE/ttys dontcare generated
 done include/terminal.h dontcare
 prev FEATURE/setjmp implicit
@@ -402,7 +402,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/locale
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/locale
 done FEATURE/locale dontcare generated
 prev FEATURE/options implicit
 done include/edit.h dontcare
@@ -506,7 +506,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/poll
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/poll
 make cell_sys_headers.h implicit
 done cell_sys_headers.h dontcare virtual
 done FEATURE/poll generated
@@ -549,7 +549,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/externs
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/externs
 done FEATURE/externs generated
 prev include/builtins.h implicit
 prev include/test.h implicit
@@ -591,7 +591,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/rlimits
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/rlimits
 done FEATURE/rlimits dontcare generated
 prev FEATURE/time implicit
 done include/ulimit.h
@@ -658,7 +658,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def execargs
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def execargs
 done FEATURE/execargs generated
 make FEATURE/pstat implicit
 meta FEATURE/pstat >FEATURE/%  pstat
@@ -668,7 +668,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def pstat
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : def pstat
 done FEATURE/pstat generated
 prev FEATURE/time implicit
 make include/timeout.h implicit
@@ -1194,7 +1194,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/math
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/math
 done FEATURE/math generated
 prev FEATURE/options implicit
 done data/strdata.c
@@ -1271,7 +1271,7 @@
 prev ${mam_libsecdb}
 prev +lintl
 prev ${mam_libdl}
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/cmds
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} : run features/cmds
 done FEATURE/cmds dontcare generated
 prev include/jobs.h implicit
 prev include/builtins.h implicit
diff -urN ksh-20060124_old/src/lib/libast/Mamfile ksh-20060124_new/src/lib/libast/Mamfile
--- ksh-20060124_old/src/lib/libast/Mamfile	2006-02-14 07:29:07.000000000 -0500
+++ ksh-20060124_new/src/lib/libast/Mamfile	2006-02-14 07:32:47.000000000 -0500
@@ -44,14 +44,14 @@
 meta FEATURE/standards features/%>FEATURE/% features/standards standards
 make features/standards
 done features/standards
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/standards
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/standards
 done FEATURE/standards generated
 make ast_common.h
 make FEATURE/common
 meta FEATURE/common features/%>FEATURE/% features/common common
 make features/common
 done features/common
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/common
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/common
 done FEATURE/common generated
 exec - cmp 2>/dev/null -s FEATURE/common ast_common.h || { rm -f ast_common.h; silent test -d . || mkdir .; ${STDCP} FEATURE/common ast_common.h; }
 done ast_common.h generated
@@ -107,7 +107,7 @@
 meta FEATURE/wait features/%>FEATURE/% features/wait wait
 make features/wait
 done features/wait
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/wait
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/wait
 done FEATURE/wait generated
 done conflib.h
 prev conflim.h
@@ -132,13 +132,13 @@
 meta FEATURE/param features/%.sh>FEATURE/% features/param.sh param
 make features/param.sh
 done features/param.sh
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/param.sh
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/param.sh
 make error?--?old?ethernet?address?at?wrong?offset implicit
 done error?--?old?ethernet?address?at?wrong?offset dontcare virtual
 done FEATURE/param generated
 make FEATURE/unistd.lcl implicit
 meta FEATURE/unistd.lcl >FEATURE/%  unistd.lcl
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def unistd.lcl
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def unistd.lcl
 make comp/re_comp.h implicit
 done comp/re_comp.h dontcare
 make comp/getopt.h implicit
@@ -151,11 +151,11 @@
 meta FEATURE/lib features/%>FEATURE/% features/lib lib
 make features/lib
 done features/lib
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/lib
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/lib
 done FEATURE/lib generated
 make FEATURE/limits.lcl implicit
 meta FEATURE/limits.lcl >FEATURE/%  limits.lcl
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def limits.lcl
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def limits.lcl
 done FEATURE/limits.lcl generated
 make std/stdio.h implicit
 make ast_stdio.h implicit
@@ -163,7 +163,7 @@
 meta FEATURE/stdio features/%>FEATURE/% features/stdio stdio
 make features/stdio
 done features/stdio
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/stdio
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/stdio
 make include/sfio_s.h implicit
 done include/sfio_s.h dontcare
 prev ast_common.h implicit
@@ -175,7 +175,7 @@
 done std/stdio.h
 prev FEATURE/standards implicit
 done features/limits.c
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/limits.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/limits.c
 done FEATURE/limits generated
 exec - cmp 2>/dev/null -s FEATURE/limits ast_limits.h || { rm -f ast_limits.h; silent test -d . || mkdir .; ${STDCP} FEATURE/limits ast_limits.h; }
 done ast_limits.h generated
@@ -185,7 +185,7 @@
 meta FEATURE/nl_types features/%>FEATURE/% features/nl_types nl_types
 make features/nl_types
 done features/nl_types
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/nl_types
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/nl_types
 make std/limits.h implicit
 prev ast_limits.h implicit
 done std/limits.h dontcare
@@ -198,7 +198,7 @@
 meta FEATURE/wchar features/%>FEATURE/% features/wchar wchar
 make features/wchar
 done features/wchar
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/wchar
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/wchar
 prev std/stdio.h implicit
 prev std/stdio.h implicit
 prev std/stdio.h implicit
@@ -274,12 +274,12 @@
 make features/types
 done features/types
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/types
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/types
 done FEATURE/types generated
 prev FEATURE/lib implicit
 done features/botch.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  ${LDFLAGS} '   run features/botch.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  ${LDFLAGS} '   run features/botch.c
 done FEATURE/botch generated
 exec - cmp 2>/dev/null -s FEATURE/botch ast_botch.h || { rm -f ast_botch.h; silent test -d . || mkdir .; ${STDCP} FEATURE/botch ast_botch.h; }
 done ast_botch.h dontcare generated
@@ -297,7 +297,7 @@
 prev FEATURE/standards implicit
 done features/unistd.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/unistd.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/unistd.c
 done FEATURE/unistd generated
 exec - cmp 2>/dev/null -s FEATURE/unistd ast_unistd.h || { rm -f ast_unistd.h; silent test -d . || mkdir .; ${STDCP} FEATURE/unistd ast_unistd.h; }
 done ast_unistd.h dontcare generated
@@ -310,26 +310,26 @@
 make features/tty
 done features/tty
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tty
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tty
 done FEATURE/tty generated
 make FEATURE/fs implicit
 meta FEATURE/fs features/%>FEATURE/% features/fs fs
 make features/fs
 done features/fs
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/fs
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/fs
 done FEATURE/fs generated
 prev FEATURE/unistd.lcl implicit
 make FEATURE/fcntl.lcl implicit
 meta FEATURE/fcntl.lcl >FEATURE/%  fcntl.lcl
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def fcntl.lcl
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   def fcntl.lcl
 done FEATURE/fcntl.lcl generated
 prev FEATURE/lib implicit
 prev std/stdio.h implicit
 done features/fcntl.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/fcntl.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  ${LDFLAGS} '   run features/fcntl.c
 make include/ls.h implicit
 make ast_mode.h implicit
 make FEATURE/mode
@@ -342,7 +342,7 @@
 prev std/stdio.h implicit
 done features/mode.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/mode.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/mode.c
 done FEATURE/mode generated
 exec - cmp 2>/dev/null -s FEATURE/mode ast_mode.h || { rm -f ast_mode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/mode ast_mode.h; }
 done ast_mode.h dontcare generated
@@ -371,20 +371,20 @@
 make features/vmalloc
 done features/vmalloc
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/vmalloc
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/vmalloc
 make FEATURE/mmap implicit
 meta FEATURE/mmap features/%>FEATURE/% features/mmap mmap
 make features/mmap
 done features/mmap
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/mmap
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/mmap
 done FEATURE/mmap dontcare generated
 done FEATURE/vmalloc generated
 prev FEATURE/mmap implicit
 prev std/stdio.h implicit
 done features/map.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/map.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/map.c
 done FEATURE/map generated
 exec - cmp 2>/dev/null -s FEATURE/map ast_map.h || { rm -f ast_map.h; silent test -d . || mkdir .; ${STDCP} FEATURE/map ast_map.h; }
 done ast_map.h dontcare generated
@@ -396,7 +396,7 @@
 make features/hdr
 done features/hdr
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/hdr
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/hdr
 done FEATURE/hdr generated
 exec - cmp 2>/dev/null -s FEATURE/hdr ast_hdr.h || { rm -f ast_hdr.h; silent test -d . || mkdir .; ${STDCP} FEATURE/hdr ast_hdr.h; }
 done ast_hdr.h dontcare generated
@@ -442,7 +442,7 @@
 make features/dirent
 done features/dirent
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/dirent
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/dirent
 prev include/ast_std.h implicit
 done FEATURE/dirent generated
 exec - cmp 2>/dev/null -s FEATURE/dirent ast_dirent.h || { rm -f ast_dirent.h; silent test -d . || mkdir .; ${STDCP} FEATURE/dirent ast_dirent.h; }
@@ -662,7 +662,7 @@
 make features/ccode
 done features/ccode
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/ccode
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/ccode
 done FEATURE/ccode generated
 exec - cmp 2>/dev/null -s FEATURE/ccode ast_ccode.h || { rm -f ast_ccode.h; silent test -d . || mkdir .; ${STDCP} FEATURE/ccode ast_ccode.h; }
 done ast_ccode.h dontcare generated
@@ -931,7 +931,7 @@
 make features/time
 done features/time
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/time
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/time
 done FEATURE/time generated
 exec - cmp 2>/dev/null -s FEATURE/time ast_time.h || { rm -f ast_time.h; silent test -d . || mkdir .; ${STDCP} FEATURE/time ast_time.h; }
 done ast_time.h dontcare generated
@@ -1012,7 +1012,7 @@
 make features/preroot.sh
 done features/preroot.sh
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/preroot.sh
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/preroot.sh
 done FEATURE/preroot generated
 exec - cmp 2>/dev/null -s FEATURE/preroot preroot.h || { rm -f preroot.h; silent test -d . || mkdir .; ${STDCP} FEATURE/preroot preroot.h; }
 done preroot.h generated
@@ -1298,7 +1298,7 @@
 make features/sig.sh
 done features/sig.sh
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/sig.sh
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/sig.sh
 done FEATURE/sig generated
 exec - cmp 2>/dev/null -s FEATURE/sig sig.h || { rm -f sig.h; silent test -d . || mkdir .; ${STDCP} FEATURE/sig sig.h; }
 done sig.h generated
@@ -1405,7 +1405,7 @@
 make features/iconv
 done features/iconv
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/iconv
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/iconv
 prev include/ccode.h implicit
 prev ast_common.h implicit
 done FEATURE/iconv generated
@@ -1468,7 +1468,7 @@
 make features/float
 done features/float
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/float
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/float
 prev ast_common.h implicit
 done FEATURE/float dontcare generated
 make mman.h implicit
@@ -1498,7 +1498,7 @@
 make features/sfio
 done features/sfio
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/sfio
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/sfio
 done FEATURE/sfio dontcare generated
 done sfio/sfhdr.h
 done port/mc.c
@@ -1764,7 +1764,7 @@
 make features/tv
 done features/tv
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tv
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tv
 prev include/ast.h implicit
 done FEATURE/tv generated
 exec - cmp 2>/dev/null -s FEATURE/tv tv.h || { rm -f tv.h; silent test -d . || mkdir .; ${STDCP} FEATURE/tv tv.h; }
@@ -1777,7 +1777,7 @@
 prev FEATURE/common implicit
 done features/tmx
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tmx
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tmx
 prev tv.h implicit
 prev include/tm.h implicit
 done FEATURE/tmx generated
@@ -1871,7 +1871,7 @@
 prev FEATURE/common implicit
 done features/align.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  ${LDFLAGS} '   run features/align.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  ${LDFLAGS} '   run features/align.c
 done FEATURE/align generated
 exec - cmp 2>/dev/null -s FEATURE/align align.h || { rm -f align.h; silent test -d . || mkdir .; ${STDCP} FEATURE/align align.h; }
 done align.h generated
@@ -1926,7 +1926,7 @@
 prev std/stdio.h implicit
 done features/signal.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/signal.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/signal.c
 done FEATURE/signal generated
 prev sig.h implicit
 prev include/ast.h implicit
@@ -2056,7 +2056,7 @@
 make features/tmlib
 done features/tmlib
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tmlib
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tmlib
 done FEATURE/tmlib generated
 prev include/namval.h implicit
 prev include/tm.h implicit
@@ -2277,7 +2277,7 @@
 make features/tvlib
 done features/tvlib
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tvlib
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/tvlib
 done FEATURE/tvlib generated
 prev include/tm.h implicit
 prev tv.h implicit
@@ -2707,7 +2707,7 @@
 make features/errno
 done features/errno
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/errno
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/errno
 done FEATURE/errno generated
 prev include/error.h implicit
 prev include/ast.h implicit
@@ -2791,7 +2791,7 @@
 make features/vfork
 done features/vfork
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/vfork
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/vfork
 done FEATURE/vfork generated
 exec - cmp 2>/dev/null -s FEATURE/vfork ast_vfork.h || { rm -f ast_vfork.h; silent test -d . || mkdir .; ${STDCP} FEATURE/vfork ast_vfork.h; }
 done ast_vfork.h dontcare generated
@@ -2888,7 +2888,7 @@
 make features/eaccess
 done features/eaccess
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/eaccess
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/eaccess
 done FEATURE/eaccess generated
 prev include/ls.h implicit
 prev include/ast.h implicit
@@ -2906,7 +2906,7 @@
 make features/hack
 done features/hack
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/hack
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/hack
 done FEATURE/hack generated
 prev include/ls.h implicit
 prev include/ast.h implicit
@@ -2925,7 +2925,7 @@
 make features/omitted
 done features/omitted
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/omitted
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/omitted
 done FEATURE/omitted generated
 prev include/tm.h implicit
 prev include/error.h implicit
@@ -4271,7 +4271,7 @@
 prev std/stdio.h implicit
 done features/sfinit.c
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/sfinit.c
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  ${LDFLAGS} '   run features/sfinit.c
 done FEATURE/sfinit generated
 prev FEATURE/float implicit
 prev sfio/sfhdr.h implicit
@@ -5327,7 +5327,7 @@
 make features/libpath.sh
 done features/libpath.sh
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/libpath.sh
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/libpath.sh
 done FEATURE/libpath generated
 prev conftab.h implicit
 prev confmap.h implicit
@@ -5603,7 +5603,7 @@
 make features/uwin
 done features/uwin
 prev ast.req
-exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/uwin
+exec - iffe -v -d 3 -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   run features/uwin
 done FEATURE/uwin generated
 done uwin/a64l.c
 meta a64l.o %.c>%.o uwin/a64l.c a64l
diff -urN ksh-20060124_old/src/lib/libcmd/Mamfile ksh-20060124_new/src/lib/libcmd/Mamfile
--- ksh-20060124_old/src/lib/libcmd/Mamfile	2006-01-24 18:17:33.000000000 -0500
+++ ksh-20060124_new/src/lib/libcmd/Mamfile	2006-02-14 07:33:46.000000000 -0500
@@ -186,7 +186,7 @@
 done features/symlink
 prev cmd.req
 bind -last
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/symlink
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/symlink
 done FEATURE/symlink generated
 prev ${PACKAGE_ast_INCLUDE}/fts.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ls.h implicit
@@ -267,7 +267,7 @@
 make features/sockets
 done features/sockets
 prev cmd.req
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/sockets
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/sockets
 done FEATURE/sockets generated
 prev ${PACKAGE_ast_INCLUDE}/ls.h implicit
 prev cmdlib.h implicit
@@ -294,7 +294,7 @@
 make features/ids
 done features/ids
 prev cmd.req
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/ids
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/ids
 done FEATURE/ids generated
 prev cmdlib.h implicit
 done id.c
@@ -374,7 +374,7 @@
 make features/utsname
 done features/utsname
 prev cmd.req
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/utsname
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/utsname
 done FEATURE/utsname generated
 prev ${PACKAGE_ast_INCLUDE}/proc.h implicit
 prev cmdlib.h implicit
diff -urN ksh-20060124_old/src/lib/libdll/Mamfile ksh-20060124_new/src/lib/libdll/Mamfile
--- ksh-20060124_old/src/lib/libdll/Mamfile	2006-01-24 18:17:36.000000000 -0500
+++ ksh-20060124_new/src/lib/libdll/Mamfile	2006-02-14 07:34:07.000000000 -0500
@@ -159,7 +159,7 @@
 done features/dll
 prev dll.req
 bind -last
-exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/dll
+exec - iffe -v -d 3 -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libast} : run features/dll
 done FEATURE/dll generated
 exec - cmp 2>/dev/null -s FEATURE/dll dlldefs.h || { rm -f dlldefs.h; silent test -d . || mkdir .; cp FEATURE/dll dlldefs.h; }
 done dlldefs.h generated

ksh-20060124-syntax.patch:
 ksh-20060124/src/cmd/ksh93/Mamfile             |    4 ++--
 ksh-20060124_new/src/lib/libast/Mamfile        |    6 +++---
 ksh-20060124_new/src/lib/libast/features/stdio |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

Index: ksh-20060124-syntax.patch
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh-20060124-syntax.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksh-20060124-syntax.patch	14 Feb 2006 09:56:14 -0000	1.1
+++ ksh-20060124-syntax.patch	15 Feb 2006 14:03:31 -0000	1.2
@@ -28,3 +28,37 @@
  exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
  exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x
  exec - 	then	rm -f 1.${COTEMP}.x
+--- ksh-20060124_new/src/lib/libast/features/stdio.rh1	2006-02-15 07:18:01.000000000 -0500
++++ ksh-20060124_new/src/lib/libast/features/stdio	2006-02-15 07:18:25.000000000 -0500
+@@ -269,7 +269,9 @@
+ 		printf("#define getw		_ast_getw\n");
+ 		printf("#define pclose		_ast_pclose\n");
+ 		printf("#define popen		_ast_popen\n");
++/*
+ 		printf("#define printf		_ast_printf\n");
++*/
+ 		printf("#define puts		_ast_puts\n");
+ 		printf("#define putw		_ast_putw\n");
+ 		printf("#define rewind		_ast_rewind\n");
+--- ksh-20060124/src/cmd/ksh93/Mamfile.iffedebug        2006-01-24 18:16:51.000000000 -0500
++++ ksh-20060124/src/cmd/ksh93/Mamfile  2006-02-14 09:54:18.000000000 -0500
+@@ -1356,7 +1356,7 @@
+ prev ${mam_libsecdb}
+ prev +lintl
+ prev ${mam_libdl}
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} -L. -L../../../lib ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libast}
+ done ksh generated
+ make shcomp
+ make shcomp.o
+--- ksh-20060124/src/cmd/ksh93/Mamfile.rh1      2006-02-14 10:25:47.000000000 -0500
++++ ksh-20060124/src/cmd/ksh93/Mamfile  2006-02-14 10:26:32.000000000 -0500
+@@ -1403,7 +1403,7 @@
+ prev +lintl
+ prev ${mam_libdl}
+ setv CC.DLL -UCC.DLL
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} -L. -L../../../lib ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libast}
+ done suid_exec generated
+ make shell
+ prev libshell.a archive


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ksh.spec	14 Feb 2006 09:57:37 -0000	1.22
+++ ksh.spec	15 Feb 2006 14:03:31 -0000	1.23
@@ -1,3 +1,4 @@
+#ExclusiveArch:  x86_64
 %define       releasedate   2006-01-24
 #ExcludeArch:  ia64
 
@@ -16,6 +17,7 @@
 Patch2:       ksh-20050202-path.patch
 Patch3:       ksh-20050202-uname.patch
 Patch4:       ksh-20060124-syntax.patch
+Patch5:       ksh-20060124-iffedebug.patch
 
 #   build information
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
@@ -38,6 +40,7 @@
 #patch2 -p1 -b .path
 %patch3 -p1 -b .uname
 %patch4 -p1 -b .syntax
+#%patch5 -p1 -b .iffedebug
 
 %build
 ./bin/package "read" ||:



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:25:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:25:29 -0500
Subject: rpms/kernel/FC-4 3703-b44-fix-laptop-carrier-detect.txt, NONE,
 1.1.2.1 3704-s2io-scatter-gather-fix.txt, NONE,
 1.1.2.1 3706-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt, NONE,
 1.1.2.1 3707-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt, NONE,
 1.1.2.1 3708-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt, NONE,
 1.1.2.1 3710-mv643xx_eth-Fix-spinlock-recursion-bug.txt, NONE,
 1.1.2.1 3711-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt, NONE,
 1.1.2.1 3714-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt, NONE,
 1.1.2.1 3717-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt,
 NONE, 1.1.2.1 3718-mv643xx_eth-use-MII-library-for-PHY-management.txt, NONE,
 1.1.2.1 3721-bcm43xx-sync-with-svn.berlios.de.txt, NONE,
 1.1.2.1 3722-bcm43xx-remove-linux-version-compatibility-code.txt, NONE,
 1.1.2.1 3727-orinoco_cs-tweak-Vcc-debugging-messages.txt, NONE,
 1.1.2.1 3728-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt,
 NONE, 1.1.2.1 3729-ieee80211-Fix-iwlist-scan-can-only-show-about-2!
 0-APs.txt, NONE,
 1.1.2.1 3730-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt, NONE,
 1.1.2.1
 3732-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt, NONE,
 1.1.2.1 3733-ieee80211-Log-if-netif_rx-drops-the-packet.txt, NONE,
 1.1.2.1 3734-ieee80211-Add-LEAP-authentication-type.txt, NONE,
 1.1.2.1 3735-ieee80211-add-flags-for-all-geo-channels.txt, NONE,
 1.1.2.1 3736-ieee80211-Add-spectrum-management-information.txt, NONE,
 1.1.2.1 3737-ieee80211-kmalloc-memset-kzalloc-cleanups.txt, NONE,
 1.1.2.1 3738-ieee80211-TIM-information-element-parsing.txt, NONE,
 1.1.2.1 3739-ieee80211-Add-TKIP-crypt-build_iv.txt, NONE,
 1.1.2.1 3740-ieee80211-Add-802.11h-data-type-and-structures.txt, NONE,
 1.1.2.1 3741-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt, NONE,
 1.1.2.1 3742-ieee80211-Add-802.11h-information-element-parsing.txt, NONE,
 1.1.2.1 3747-r8169-prevent-excessive-busy-waiting.txt, NONE,
 1.1.2.1 3748-arcnet-probing-cleanups-and-fixes.txt, NONE,
 1.1.2.1 3749-ibm_emac-sparse-annotations.txt, NONE, 1!
 .1.2.1 3750-appletalk-cops.h-missing-const-in-struct-ltfirmwar!
 e.txt,NO
Message-ID: <200602151425.k1FEPTQP009726@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9618

Added Files:
      Tag: private-linville-netdev-fc4-10-branch
	3703-b44-fix-laptop-carrier-detect.txt 
	3704-s2io-scatter-gather-fix.txt 
	3706-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt 
	3707-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt 
	3708-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt 
	3710-mv643xx_eth-Fix-spinlock-recursion-bug.txt 
	3711-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt 
	3714-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt 
	3717-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt 
	3718-mv643xx_eth-use-MII-library-for-PHY-management.txt 
	3721-bcm43xx-sync-with-svn.berlios.de.txt 
	3722-bcm43xx-remove-linux-version-compatibility-code.txt 
	3727-orinoco_cs-tweak-Vcc-debugging-messages.txt 
	3728-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt 
	3729-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt 
	3730-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt 
	3732-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt 
	3733-ieee80211-Log-if-netif_rx-drops-the-packet.txt 
	3734-ieee80211-Add-LEAP-authentication-type.txt 
	3735-ieee80211-add-flags-for-all-geo-channels.txt 
	3736-ieee80211-Add-spectrum-management-information.txt 
	3737-ieee80211-kmalloc-memset-kzalloc-cleanups.txt 
	3738-ieee80211-TIM-information-element-parsing.txt 
	3739-ieee80211-Add-TKIP-crypt-build_iv.txt 
	3740-ieee80211-Add-802.11h-data-type-and-structures.txt 
	3741-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt 
	3742-ieee80211-Add-802.11h-information-element-parsing.txt 
	3747-r8169-prevent-excessive-busy-waiting.txt 
	3748-arcnet-probing-cleanups-and-fixes.txt 
	3749-ibm_emac-sparse-annotations.txt 
	3750-appletalk-cops.h-missing-const-in-struct-ltfirmware.txt 
	3751-macsonic.c-missed-s-driver_unregister-platform_driver_unregister.txt 
	3752-missing-include-of-asm-irq.h-in-drivers-net.txt 
	3753-bogus-include-of-linux-irq.h-in-7990.c.txt 
	3754-wrong-ifdefs-in-82596.c.txt 
	3755-dead-code-removed-in-hp100.txt 
	3780-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt 
	3782-ipw2100-Fix-setting-txpower-failed-problem.txt 
	3783-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt 
	3784-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt 
	3785-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt 
	3786-Typo-corrections-for-ieee80211.txt 
	3787-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt 
	3790-SCTP-correct-the-number-of-INIT-retransmissions.txt 
	3791-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt 
	3796-AIRO-_CS-CRYPTO-fixes.txt 
	3797-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt 
	3798-drivers-net-wireless-ipw2200-possible-cleanups.txt 
	3799-ieee80211-trivial-fix-for-misplaced-s.txt 
	3800-ipw2100-Add-LEAP-authentication-algorithm-support.txt 
	3801-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt 
	3802-ipw2100-Add-generic-geo-information.txt 
	3803-ipw2100-remove-white-space-and-better-format-the-code.txt 
	3804-increase-ipw2100-driver-version-to-git-1.1.4.txt 
	3805-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt 
	3806-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt 
	3807-ipw2200-Add-LEAP-authentication-algorithm-support.txt 
	3808-ipw2200-Bluetooth-coexistence-support.txt 
	3810-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt 
	3811-ipw2200-add-module-parameter-to-enable-disable-roaming.txt 
	3812-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt 
	3813-ipw2200-stack-reduction.txt 
	3814-ipw2200-Fix-qos_cmd-param-switch-bug.txt 
	3815-ipw2200-increase-ipw2200-driver-version.txt 
	3818-ipw2200-Disable-hwcrypto-by-default.txt 
	3820-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt 
	3821-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt 
	3822-IPV4-igmp-remove-pointless-printk.txt 
	3823-TCP-H-TCP-Fix-accounting.txt 
	3828-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt 
	3829-Add-two-management-functions-to-ieee80211_rx.c.txt 
	3830-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt 
	3831-r8169-fix-forced-mode-link-settings.txt 
	3834-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt 
	3863-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt 
	3866-SUNGEM-Unbreak-Sun-GEM-chips.txt 
	3928-IPV4-Always-set-fl.proto-in-ip_route_newports.txt 
	3929-BRIDGE-Fix-device-delete-race.txt 
	3930-NET-Do-not-export-inet_bind_bucket_create-twice.txt 
	3931-IPV6-tcp_v6_send_synack-release-the-destination.txt 
	3932-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt 
	3986-lp486e-remove-SLOW_DOWN_IO.txt 
	3996-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt 
	4129-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt 
	4135-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt 
	4138-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt 
	4146-dscc4-fix-dscc4_init_dummy_skb-check.txt 
	4147-8139too-fix-a-TX-timeout-watchdog-thread-against-NAPI-softirq-race.txt 
	4149-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt 
	4159-bcm43xx-Remove-function-bcm43xx_channel_is_allowed-.-Geographical-restriction-should-become-part-of-the-80211-stack-so-every-driver-does-not-have-to-duplicate-it.txt 
	4160-bcm43xx-patch-basic-ethtool-support.txt 
	4161-bcm43xx-Wireless-Ext-update.txt 
	4181-NET-snap-needs-hardware-checksum-fix.txt 
	4182-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt 
	4183-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt 
	4184-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt 
	4185-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt 
	4187-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt 
	4189-TG3-Flush-tg3_reset_task.txt 
	4190-TG3-Update-driver-version-and-release-date.txt 
	4191-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt 
	4213-3c59x-collision-statistic-fix.txt 
	4327-ICMP-Fix-extra-dst-release-when-ip_options_echo-fails.txt 
	4328-NETFILTER-ctnetlink-Fix-subsystem-used-for-expectation-events.txt 
	4329-NETFILTER-ctnetlink-add-MODULE_ALIAS-for-expectation-subsystem.txt 
	4330-NETFILTER-nf_conntrack-check-address-family-when-finding-protocol-module.txt 
	4331-NETFILTER-ULOG-nfnetlink_log-Use-better-default-value-for-nlbufsiz.txt 
	4332-NETFILTER-Fix-undersized-skb-allocation-in-ipt_ULOG-ebt_ulog-nfnetlink_log.txt 
	4333-NETFILTER-nfnetlink_queue-fix-packet-marking-over-netlink.txt 
	4334-NETFILTER-Fix-missing-src-port-initialization-in-tftp-expectation-mask.txt 
	4336-NETFILTER-nf_conntrack-fix-incorrect-memset-size-in-FTP-helper.txt 
	4338-NETFILTER-Check-policy-length-in-policy-match-strict-mode.txt 
	4339-NETFILTER-Fix-ip6t_policy-address-matching.txt 
	4340-NETFILTER-Prepare-ipt-ip6t-_policy-match-for-x_tables-unification.txt 
	4341-NETFILTER-Fix-check-whether-dst_entry-needs-to-be-released-after-NAT.txt 
	4378-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt 
	4379-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt 
	4380-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt 
	4381-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt 
	4382-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt 
	4383-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt 
	4384-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt 
	4385-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt 
	4386-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt 
	4387-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt 
	4388-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt 
	4389-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt 
	4390-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt 
	4391-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt 
	4392-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt 
	4393-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt 
	4394-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt 
	4395-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt 
	4396-IPV6-ROUTE-Try-finding-the-next-best-route.txt 
	4397-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt 
	4398-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt 
	4399-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt 
	4400-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt 
	4401-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt 
	4402-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt 
	4403-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt 
	4404-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt 
	4405-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt 
	4412-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt 
	4414-DCCP-ackvec-Ditch-dccpav_buf_len.txt 
	4415-DCCP-Fix-error-handling-in-dccp_init.txt 
	4416-DCCP-ackvec-Introduce-dccp_ackvec_slab.txt 
	4418-IPV4-Use-RCU-locking-in-fib_rules.txt 
	4420-DCCP-ackvec-Introduce-ack-vector-records.txt 
	4421-DCCP-CCID-Allow-ccid_-init-exit-to-be-NULL.txt 
	4422-DCCP-ackvec-Delete-all-the-ack-vector-records-in-dccp_ackvec_free.txt 
	4423-DCCP-Don-t-alloc-ack-vector-for-the-control-sock.txt 
	4424-DCCP-CCID3-Set-the-no_feedback_timer-fields-near-init_timer.txt 
	4425-DCCP-CCID2-Initial-CCID2-TCP-Like-implementation.txt 
	4426-DCCP-Initial-feature-negotiation-implementation.txt 
	4427-IPCOMP6-don-t-check-vfree-argument-for-NULL.txt 
	4428-IPV4-fib_rules.c-make-struct-fib_rules-static-again.txt 
	4429-TG3-Add-support-for-5714S-and-5715S.txt 
	4430-TG3-Enable-TSO-by-default.txt 
	4431-TG3-Support-shutdown-WoL.txt 
	4432-TG3-Update-version-and-reldate.txt 
	4433-BNX2-Reduce-register-test-size.txt 
	4434-BNX2-Add-ethtool-d-support.txt 
	4435-BNX2-Fix-bug-when-rx-ring-is-full.txt 
	4436-BNX2-Support-larger-rx-ring-sizes-part-1.txt 
	4437-BNX2-Support-larger-rx-ring-sizes-part-2.txt 
	4438-BNX2-Update-version.txt 
	4439-PPP-Fixed-hardware-RX-checksum-handling.txt 
	4440-TCP-MTU-probing.txt 
	4465-e100-remove-init_hw-call-to-fix-panic.txt 
	4466-sis900-remove-cfgpmcsr-I-O-space-register-define.txt 
	4467-sky2-power-management-fix.txt 
	4468-sky2-pci-config-space-checking.txt 
	4469-sky2-ethtool-rx_coalesce-settings-fix.txt 
	4470-sky2-set-mac-address-fix.txt 4471-sky2-clear-irq-race.txt 
	4472-sky2-add-irq-to-entropy-pool.txt 
	4473-sky2-support-msi-interrupt-revised.txt 
	4474-sky2-version-0.15-update.txt 
	4475-bonding-allow-bond-to-use-TSO-if-slaves-support-it.txt 
	4476-bonding-Sparse-warnings-fix.txt 
	4478-gianfar-Fix-sparse-warnings.txt 
	4481-uli526x-warning-fix.txt 
	4604-remove-bogus-asm-bug.h-includes.txt 
	4605-bogus-asm-delay.h-includes.txt 
	4607-missing-includes-in-drivers-net-mv643xx_eth.c.txt 
	4615-ipv4-NULL-noise-removal.txt 
	4629-net-ipv6-mcast.c-NULL-noise-removal.txt 
	4650-type-safe-min-in-prism54.txt 
	4692-IPV6-Address-autoconfiguration-does-not-work-after-device-down-up-cycle.txt 
	4695-update-copyright-in-softmac.txt 
	4696-trivial-fixes-to-softmac.txt 
	4697-softmac-update-deauth-handler-to-quiet-warning.txt 
	4698-softmac-add-reassociation-code.txt 
	4699-softmac-remove-dead-code.txt 4700-Fix-softmac-scan.txt 
	4701-wrong-firmware-location-in-IPW2100-Kconfig-entry.txt 
	4702-wireless-atmel-fix-setting-TX-key-only-in-ENCODEEXT.txt 
	4703-wireless-atmel-fix-Open-System-authentication-process-bugs.txt 
	4704-wireless-airo-fix-setting-TX-key-index-plus-key-in-ENCODEEXT.txt 
	4705-let-IPW2-1-2-00-select-IEEE80211.txt 
	4706-wireless-atmel-convert-constants-to-ieee80211-layer-equivalents.txt 
	4707-ipw2200-add-monitor-and-qos-entries-to-Kconfig.txt 
	4720-NETLINK-Fix-a-severe-bug.txt 
	4721-NETLINK-illegal-use-of-pid-in-rtnetlink.txt 
	4722-IRDA-Set-proper-IrLAP-device-address-length.txt 
	4723-IRDA-out-of-range-array-access.txt 
	4724-TCP-rcvbuf-lock-when-tcp_moderate_rcvbuf-enabled.txt 
	4725-BRIDGE-fix-for-RCU-and-deadlock-on-device-removal.txt 
	4726-BRIDGE-netfilter-handle-RCU-during-removal.txt 
	4746-BNX2-include-linux-vmalloc.h.txt 
	4777-netfilter-fix-build-error-due-to-missing-has_bridge_parent-macro.txt 
	4779-orinoco-support-smc2532w.txt 
	4785-Bluetooth-Reduce-L2CAP-MTU-for-RFCOMM-connections.txt 
	4786-Bluetooth-Fix-NULL-pointer-dereferences-of-the-HCI-socket.txt 
	4791-Sync-bcm43xx_phy_initb6-with-specs.txt 
	4792-IRDA-Ratelimit-messages.txt 
	4793-ATM-Ratelimit-atmsvc-failure-messages.txt 
	4794-IPV4-ICMP-Invert-default-for-invalid-icmp-msgs-sysctl.txt 
	4795-P8023-Fix-tainting-of-kernel.txt 
	4797-BRIDGE-Better-fix-for-netfilter-missing-symbol-has_bridge_parent.txt 
	4798-NETLINK-genetlink-Fix-bugs-spotted-by-Andrew-Morton.txt 
	4800-IPV6-Don-t-store-dst_entry-for-RAW-socket.txt 
	4801-IPSEC-Fix-strange-IPsec-freeze.txt 
	4802-NET-Revert-skb_copy_datagram_iovec-recursion-elimination.txt 
	4803-ieee80211-Use-IWEVGENIE-to-set-WPA-IE.txt 
	4804-ipw2200-Fix-WPA-network-selection-problem.txt 
Log Message:



--- NEW FILE 3703-b44-fix-laptop-carrier-detect.txt ---
Subject: [PATCH] b44: fix laptop carrier detect
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1137820397 -0800

On my laptop, the b44 device is created and the carrier state defaults
to ON when created by alloc_etherdev. This means tools like NetworkManager
see the carrier as On and try and bring the device up.  The correct thing
to do is mark the carrier as Off when device is created.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/b44.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

applies-to: 956eced6edc00738c1a4919f17e272e9db3d0fd9
c35ca399e09828f3f6b40c0007a95a6582d90347
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index df9d6e8..c3267e4 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1399,7 +1399,6 @@ static int b44_open(struct net_device *d
 	b44_init_rings(bp);
 	b44_init_hw(bp);
 
-	netif_carrier_off(dev);
 	b44_check_phy(bp);
 
 	err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
@@ -1464,7 +1463,7 @@ static int b44_close(struct net_device *
 #endif
 	b44_halt(bp);
 	b44_free_rings(bp);
-	netif_carrier_off(bp->dev);
+	netif_carrier_off(dev);
 
 	spin_unlock_irq(&bp->lock);
 
@@ -2000,6 +1999,8 @@ static int __devinit b44_init_one(struct
 	dev->irq = pdev->irq;
 	SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
 
+	netif_carrier_off(dev);
+
 	err = b44_get_invariants(bp);
 	if (err) {
 		printk(KERN_ERR PFX "Problem fetching invariants of chip, "
---
0.99.8.GIT


--- NEW FILE 3704-s2io-scatter-gather-fix.txt ---
Subject: [PATCH] s2io: scatter-gather fix
From: Ananda Raju <Ananda.Raju at neterion.com>
Date: 1137697914 -0500

	There is a problem with fragmented skb in s2io driver version 2.0.9.4
	available in 2.6.16-rc1 kernel. The adapter will fail to transmit if
	any scatter-gather skb arrives.  This patch provides fix for the above
	described problem.

Signed-off-by: Ananda Raju <ananda.raju at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/s2io.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 4606c4f3680be2e699562750bcd74896445a4883
efd51b5c6798d103e3aa683464aebb2019b62119
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 89c4678..49b597c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3586,7 +3586,7 @@ static int s2io_xmit(struct sk_buff *skb
 		txdp->Buffer_Pointer = (u64) pci_map_page
 		    (sp->pdev, frag->page, frag->page_offset,
 		     frag->size, PCI_DMA_TODEVICE);
-		txdp->Control_1 |= TXD_BUFFER0_SIZE(frag->size);
+		txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
 		if (skb_shinfo(skb)->ufo_size)
 			txdp->Control_1 |= TXD_UFO_EN;
 	}
---
0.99.8.GIT


--- NEW FILE 3706-BUG_ON-Conversion-in-net-tulip-xircom_cb.c.txt ---
Subject: [PATCH] BUG_ON() Conversion in net/tulip/xircom_cb.c
From: Eric Sesterhenn / snakebyte <snakebyte at gmx.de>
Date: 1138309371 +0100

hi,

this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/tulip/xircom_cb.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

applies-to: 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b
a707cd6e2d0a8c21dd8aeef8e4a0c0ccf8774fa9
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 60d1e05..c5c738a 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -598,10 +598,8 @@ static void setup_descriptors(struct xir
 	enter("setup_descriptors");
 
 
-	if (card->rx_buffer == NULL)
-		BUG();
-	if (card->tx_buffer == NULL)
-		BUG();
+	BUG_ON(card->rx_buffer == NULL);
+	BUG_ON(card->tx_buffer == NULL);
 
 	/* Receive descriptors */
 	memset(card->rx_buffer, 0, 128);	/* clear the descriptors */
---
0.99.8.GIT


--- NEW FILE 3707-BUG_ON-Conversion-in-net-tulip-de2104x.c.txt ---
Subject: [PATCH] BUG_ON() Conversion in net/tulip/de2104x.c
From: Eric Sesterhenn / snakebyte <snakebyte at gmx.de>
Date: 1138309363 +0100

hi,

this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

One of the if()s contains a call to de_is_running(),
which seems to be safe to replace, but someone with more
knownledge of the code might want to verify this...

Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/tulip/de2104x.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

applies-to: f28ad3ea7984cb8c69228a6665fbb57368017218
7e0b58f32fb5e9c958078a6d722a7d0b230346a7
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index d7fb3ff..d6c3d52 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -402,8 +402,7 @@ static void de_rx (struct de_private *de
 		unsigned copying_skb, buflen;
 
 		skb = de->rx_skb[rx_tail].skb;
-		if (!skb)
-			BUG();
+		BUG_ON(!skb);
 		rmb();
 		status = le32_to_cpu(de->rx_ring[rx_tail].opts1);
 		if (status & DescOwn)
@@ -545,8 +544,7 @@ static void de_tx (struct de_private *de
 			break;
 
 		skb = de->tx_skb[tx_tail].skb;
-		if (!skb)
-			BUG();
+		BUG_ON(!skb);
 		if (unlikely(skb == DE_DUMMY_SKB))
 			goto next;
 
@@ -789,8 +787,7 @@ static void __de_set_rx_mode (struct net
 
 	de->tx_head = NEXT_TX(entry);
 
-	if (TX_BUFFS_AVAIL(de) < 0)
-		BUG();
+	BUG_ON(TX_BUFFS_AVAIL(de) < 0);
 	if (TX_BUFFS_AVAIL(de) == 0)
 		netif_stop_queue(dev);
 
@@ -916,8 +913,7 @@ static void de_set_media (struct de_priv
 	unsigned media = de->media_type;
 	u32 macmode = dr32(MacMode);
 
-	if (de_is_running(de))
-		BUG();
+	BUG_ON(de_is_running(de));
 
 	if (de->de21040)
 		dw32(CSR11, FULL_DUPLEX_MAGIC);
@@ -1153,8 +1149,7 @@ static void de_media_interrupt (struct d
 		return;
 	}
 	
-	if (!(status & LinkFail))
-		BUG();
+	BUG_ON(!(status & LinkFail));
 
 	if (netif_carrier_ok(de->dev)) {
 		de_link_down(de);
@@ -2092,8 +2087,7 @@ static void __exit de_remove_one (struct
 	struct net_device *dev = pci_get_drvdata(pdev);
 	struct de_private *de = dev->priv;
 
-	if (!dev)
-		BUG();
+	BUG_ON(!dev);
 	unregister_netdev(dev);
 	kfree(de->ee_data);
 	iounmap(de->regs);
---
0.99.8.GIT


--- NEW FILE 3708-BUG_ON-Conversion-in-net-tulip-winbond-840.c.txt ---
Subject: [PATCH] BUG_ON() Conversion in net/tulip/winbond-840.c
From: Eric Sesterhenn / snakebyte <snakebyte at gmx.de>
Date: 1138309369 +0100

hi,

this changes if() BUG(); constructs to BUG_ON() which is
cleaner and can better optimized away

Signed-off-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/tulip/winbond-840.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 7bc1545f382d267f1768526e50beb8ab934ac06c
cca4aa83c79bcd571b06c83c50ea63cb75f1c2bb
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 5b1af39..ba05ded 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1645,7 +1645,7 @@ static int w840_suspend (struct pci_dev 
 
 		/* no more hardware accesses behind this line. */
 
-		if (np->csr6) BUG();
+		BUG_ON(np->csr6);
 		if (ioread32(ioaddr + IntrEnable)) BUG();
 
 		/* pci_power_off(pdev, -1); */
---
0.99.8.GIT


--- NEW FILE 3710-mv643xx_eth-Fix-spinlock-recursion-bug.txt ---
Subject: [PATCH] mv643xx_eth: Fix spinlock recursion bug
From: Dale Farnsworth <dale at farnsworth.org>
Date: 1138348925 -0700

This patch eliminates a spinlock recursion bug introduced recently.
Since eth_port_send() is always called with the lock held, we simply
remove the locking inside the function itself.

Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/mv643xx_eth.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

applies-to: 6fc73a21929fbce1bc4050b8b90a9312a0bfa99e
c7cd9014e6ea620bf9e1b52a22fadd7618b53276
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 40ae36b..9eeb8db 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2617,7 +2617,6 @@ static ETH_FUNC_RET_STATUS eth_port_send
 	struct eth_tx_desc *current_descriptor;
 	struct eth_tx_desc *first_descriptor;
 	u32 command;
-	unsigned long flags;
 
 	/* Do not process Tx ring in case of Tx ring resource error */
 	if (mp->tx_resource_err)
@@ -2634,8 +2633,6 @@ static ETH_FUNC_RET_STATUS eth_port_send
 		return ETH_ERROR;
 	}
 
-	spin_lock_irqsave(&mp->lock, flags);
-
 	mp->tx_ring_skbs++;
 	BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
 
@@ -2685,15 +2682,11 @@ static ETH_FUNC_RET_STATUS eth_port_send
 		mp->tx_resource_err = 1;
 		mp->tx_curr_desc_q = tx_first_desc;
 
-		spin_unlock_irqrestore(&mp->lock, flags);
-
 		return ETH_QUEUE_LAST_RESOURCE;
 	}
 
 	mp->tx_curr_desc_q = tx_next_desc;
 
-	spin_unlock_irqrestore(&mp->lock, flags);
-
 	return ETH_OK;
 }
 #else
@@ -2704,14 +2697,11 @@ static ETH_FUNC_RET_STATUS eth_port_send
 	int tx_desc_used;
 	struct eth_tx_desc *current_descriptor;
 	unsigned int command_status;
-	unsigned long flags;
 
 	/* Do not process Tx ring in case of Tx ring resource error */
 	if (mp->tx_resource_err)
 		return ETH_QUEUE_FULL;
 
-	spin_lock_irqsave(&mp->lock, flags);
-
 	mp->tx_ring_skbs++;
 	BUG_ON(mp->tx_ring_skbs > mp->tx_ring_size);
 
@@ -2742,12 +2732,9 @@ static ETH_FUNC_RET_STATUS eth_port_send
 	/* Check for ring index overlap in the Tx desc ring */
 	if (tx_desc_curr == tx_desc_used) {
 		mp->tx_resource_err = 1;
-
-		spin_unlock_irqrestore(&mp->lock, flags);
 		return ETH_QUEUE_LAST_RESOURCE;
 	}
 
-	spin_unlock_irqrestore(&mp->lock, flags);
 	return ETH_OK;
 }
 #endif
---
0.99.8.GIT


--- NEW FILE 3711-mv643xx_eth-Update-dev-last_rx-on-packet-receive.txt ---
Subject: [PATCH] mv643xx_eth: Update dev->last_rx on packet receive
From: Paolo Galtieri <pgaltieri at mvista.com>
Date: 1138349018 -0700

Update dev->last_rx on packet receive

This fix corrects errors seen during configuration of the bonding driver.

Signed-off-by: Paolo Galtieri <pgaltieri at mvista.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/mv643xx_eth.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 4cf3c30c2c035934c6c25388462e7c2f2f904a59
12ad74f88f6a2276901d416f7533f0a115ba6a15
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 9eeb8db..f1e708a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -444,6 +444,7 @@ static int mv643xx_eth_receive_queue(str
 			netif_rx(skb);
 #endif
 		}
+		dev->last_rx = jiffies;
 	}
 
 	return received_packets;
---
0.99.8.GIT


--- NEW FILE 3714-mv643xx_eth-Remove-needless-mp-port_mac_addr.txt ---
Subject: [PATCH] mv643xx_eth: Remove needless mp->port_mac_addr
From: Dale Farnsworth <dale at farnsworth.org>
Date: 1138349198 -0700

mp->port_mac_addr is just a redundant copy of dev->dev_addr, so remove it.

Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/mv643xx_eth.c |   18 +++++++-----------
 drivers/net/mv643xx_eth.h |    3 +--
 2 files changed, 8 insertions(+), 13 deletions(-)

applies-to: 97b034ecc70b3d37e774137789b8d18d7fb965d7
ed9b5d457668392182659747a734b38e86820adb
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 7ef4b04..af9bbe6 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -243,8 +243,7 @@ static void mv643xx_eth_update_mac_addre
 	unsigned int port_num = mp->port_num;
 
 	eth_port_init_mac_tables(port_num);
-	memcpy(mp->port_mac_addr, dev->dev_addr, 6);
-	eth_port_uc_addr_set(port_num, mp->port_mac_addr);
+	eth_port_uc_addr_set(port_num, dev->dev_addr);
 }
 
 /*
@@ -320,7 +319,7 @@ static void mv643xx_eth_tx_timeout_task(
 
 	netif_device_detach(dev);
 	eth_port_reset(mp->port_num);
-	eth_port_start(mp);
+	eth_port_start(dev);
 	netif_device_attach(dev);
 }
 
@@ -751,9 +750,6 @@ static int mv643xx_eth_open(struct net_d
 	/* Stop RX Queues */
 	mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
 
-	/* Set the MAC Address */
-	memcpy(mp->port_mac_addr, dev->dev_addr, 6);
-
 	eth_port_init(mp);
 
 	INIT_WORK(&mp->rx_task, (void (*)(void *))mv643xx_eth_rx_task, dev);
@@ -839,7 +835,7 @@ static int mv643xx_eth_open(struct net_d
 
 	mv643xx_eth_rx_task(dev);	/* Fill RX ring with skb's */
 
-	eth_port_start(mp);
+	eth_port_start(dev);
 
 	/* Interrupt Coalescing */
 
@@ -1706,7 +1702,6 @@ MODULE_DESCRIPTION("Ethernet driver for 
  *	Prior to calling the initialization routine eth_port_init() the user
  *	must set the following fields under mv643xx_private struct:
  *	port_num		User Ethernet port number.
- *	port_mac_addr[6]	User defined port MAC address.
  *	port_config		User port configuration value.
  *	port_config_extend	User port config extend value.
  *	port_sdma_config	User port SDMA config value.
@@ -1796,7 +1791,7 @@ static void eth_port_init(struct mv643xx
  *	and ether_init_rx_desc_ring for Rx queues).
  *
  * INPUT:
- *	struct mv643xx_private *mp	Ethernet port control struct
+ *	dev - a pointer to the required interface
  *
  * OUTPUT:
  *	Ethernet port is ready to receive and transmit.
@@ -1804,8 +1799,9 @@ static void eth_port_init(struct mv643xx
  * RETURN:
  *	None.
  */
-static void eth_port_start(struct mv643xx_private *mp)
+static void eth_port_start(struct net_device *dev)
 {
+	struct mv643xx_private *mp = netdev_priv(dev);
 	unsigned int port_num = mp->port_num;
 	int tx_curr_desc, rx_curr_desc;
 
@@ -1820,7 +1816,7 @@ static void eth_port_start(struct mv643x
 		(u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
 
 	/* Add the assigned Ethernet address to the port's address table */
-	eth_port_uc_addr_set(port_num, mp->port_mac_addr);
+	eth_port_uc_addr_set(port_num, dev->dev_addr);
 
 	/* Assign port configuration and command. */
 	mv_write(MV643XX_ETH_PORT_CONFIG_REG(port_num), mp->port_config);
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index f769f9b..c83bcbd 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -324,7 +324,6 @@ struct mv643xx_mib_counters {
 
 struct mv643xx_private {
 	int port_num;			/* User Ethernet port number	*/
-	u8 port_mac_addr[6];		/* User defined port MAC address.*/
 	u32 port_config;		/* User port configuration value*/
 	u32 port_config_extend;		/* User port config extend value*/
 	u32 port_sdma_config;		/* User port SDMA config value	*/
@@ -405,7 +404,7 @@ struct mv643xx_private {
 /* Port operation control routines */
 static void eth_port_init(struct mv643xx_private *mp);
 static void eth_port_reset(unsigned int eth_port_num);
-static void eth_port_start(struct mv643xx_private *mp);
+static void eth_port_start(struct net_device *dev);
 
 /* Port MAC address routines */
 static void eth_port_uc_addr_set(unsigned int eth_port_num,
---
0.99.8.GIT


--- NEW FILE 3717-mv643xx_eth-Make-port-queue-enable-disable-code-consistent.txt ---
Subject: [PATCH] mv643xx_eth: Make port queue enable/disable code consistent
From: Dale Farnsworth <dale at farnsworth.org>
Date: 1138349447 -0700

Add and use the following functions:
	mv643xx_eth_port_enable_tx()
	mv643xx_eth_port_enable_rx()
	mv643xx_eth_port_disable_tx()
	mv643xx_eth_port_disable_rx()

so that ports are enabled/disabled consistently.

Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/mv643xx_eth.c |  133 +++++++++++++++++++++++++++------------------
 1 files changed, 79 insertions(+), 54 deletions(-)

applies-to: cdad08d70b682bc36225a0a74cb5f49101bef6a3
9f8dd319459bb5ab9efcc1c345bed7895cc41768
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 73c766b..2daa9b9 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -83,6 +83,12 @@ static int eth_port_link_is_up(unsigned 
 static void eth_port_uc_addr_get(struct net_device *dev,
 						unsigned char *MacAddr);
 static void eth_port_set_multicast_list(struct net_device *);
+static void mv643xx_eth_port_enable_tx(unsigned int port_num,
+						unsigned int channels);
+static void mv643xx_eth_port_enable_rx(unsigned int port_num,
+						unsigned int channels);
+static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num);
+static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num);
 static int mv643xx_eth_open(struct net_device *);
 static int mv643xx_eth_stop(struct net_device *);
 static int mv643xx_eth_change_mtu(struct net_device *, int);
@@ -535,8 +541,7 @@ static irqreturn_t mv643xx_eth_int_handl
 			netif_carrier_on(dev);
 			netif_wake_queue(dev);
 			/* Start TX queue */
-			mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG
-								(port_num), 1);
+			mv643xx_eth_port_enable_tx(port_num, mp->port_tx_queue_command);
 		} else {
 			netif_carrier_off(dev);
 			netif_stop_queue(dev);
@@ -668,8 +673,8 @@ static void ether_init_rx_desc_ring(stru
 
 	mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
 
-	/* Add the queue to the list of RX queues of this port */
-	mp->port_rx_queue_command |= 1;
+	/* Enable queue 0 for this port */
+	mp->port_rx_queue_command = 1;
 }
 
 /*
@@ -715,8 +720,8 @@ static void ether_init_tx_desc_ring(stru
 
 	mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
 
-	/* Add the queue to the list of Tx queues of this port */
-	mp->port_tx_queue_command |= 1;
+	/* Enable queue 0 for this port */
+	mp->port_tx_queue_command = 1;
 }
 
 /*
@@ -747,9 +752,6 @@ static int mv643xx_eth_open(struct net_d
 		return -EAGAIN;
 	}
 
-	/* Stop RX Queues */
-	mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
-
 	eth_port_init(mp);
 
 	INIT_WORK(&mp->rx_task, (void (*)(void *))mv643xx_eth_rx_task, dev);
@@ -877,7 +879,7 @@ static void mv643xx_eth_free_tx_rings(st
 	struct sk_buff *skb;
 
 	/* Stop Tx Queues */
-	mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
+	mv643xx_eth_port_disable_tx(port_num);
 
 	/* Free outstanding skb's on TX rings */
 	for (curr = 0; mp->tx_desc_count && curr < mp->tx_ring_size; curr++) {
@@ -907,7 +909,7 @@ static void mv643xx_eth_free_rx_rings(st
 	int curr;
 
 	/* Stop RX Queues */
-	mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), 0x0000ff00);
+	mv643xx_eth_port_disable_rx(port_num);
 
 	/* Free preallocated skb's on RX rings */
 	for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
@@ -1719,13 +1721,6 @@ MODULE_DESCRIPTION("Ethernet driver for 
  *		return_info	Tx/Rx user resource return information.
  */
 
-/* defines */
-/* SDMA command macros */
-#define ETH_ENABLE_TX_QUEUE(eth_port) \
-	mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(eth_port), 1)
-
-/* locals */
-
 /* PHY routines */
 static int ethernet_phy_get(unsigned int eth_port_num);
 static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
@@ -1759,9 +1754,6 @@ static void eth_port_set_filter_table_en
  */
 static void eth_port_init(struct mv643xx_private *mp)
 {
-	mp->port_rx_queue_command = 0;
-	mp->port_tx_queue_command = 0;
-
 	mp->rx_resource_err = 0;
 	mp->tx_resource_err = 0;
 
@@ -1842,8 +1834,7 @@ static void eth_port_start(struct net_de
 							mp->port_sdma_config);
 
 	/* Enable port Rx. */
-	mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-						mp->port_rx_queue_command);
+	mv643xx_eth_port_enable_rx(port_num, mp->port_rx_queue_command);
 
 	/* Disable port bandwidth limits by clearing MTU register */
 	mv_write(MV643XX_ETH_MAXIMUM_TRANSMIT_UNIT(port_num), 0);
@@ -2320,6 +2311,67 @@ static void ethernet_phy_reset(unsigned 
 	eth_port_write_smi_reg(eth_port_num, 0, phy_reg_data);
 }
 
+static void mv643xx_eth_port_enable_tx(unsigned int port_num,
+					unsigned int channels)
+{
+	mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num), channels);
+}
+
+static void mv643xx_eth_port_enable_rx(unsigned int port_num,
+					unsigned int channels)
+{
+	mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num), channels);
+}
+
+static unsigned int mv643xx_eth_port_disable_tx(unsigned int port_num)
+{
+	u32 channels;
+
+	/* Stop Tx port activity. Check port Tx activity. */
+	channels = mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
+							& 0xFF;
+	if (channels) {
+		/* Issue stop command for active channels only */
+		mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
+							(channels << 8));
+
+		/* Wait for all Tx activity to terminate. */
+		/* Check port cause register that all Tx queues are stopped */
+		while (mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
+							& 0xFF)
+			udelay(PHY_WAIT_MICRO_SECONDS);
+
+		/* Wait for Tx FIFO to empty */
+		while (mv_read(MV643XX_ETH_PORT_STATUS_REG(port_num)) &
+							ETH_PORT_TX_FIFO_EMPTY)
+			udelay(PHY_WAIT_MICRO_SECONDS);
+	}
+
+	return channels;
+}
+
+static unsigned int mv643xx_eth_port_disable_rx(unsigned int port_num)
+{
+	u32 channels;
+
+	/* Stop Rx port activity. Check port Rx activity. */
+	channels = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num)
+							& 0xFF);
+	if (channels) {
+		/* Issue stop command for active channels only */
+		mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
+							(channels << 8));
+
+		/* Wait for all Rx activity to terminate. */
+		/* Check port cause register that all Rx queues are stopped */
+		while (mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
+							& 0xFF)
+			udelay(PHY_WAIT_MICRO_SECONDS);
+	}
+
+	return channels;
+}
+
 /*
  * eth_port_reset - Reset Ethernet port
  *
@@ -2342,35 +2394,8 @@ static void eth_port_reset(unsigned int 
 {
 	unsigned int reg_data;
 
-	/* Stop Tx port activity. Check port Tx activity. */
-	reg_data = mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num));
-
-	if (reg_data & 0xFF) {
-		/* Issue stop command for active channels only */
-		mv_write(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num),
-							(reg_data << 8));
-
-		/* Wait for all Tx activity to terminate. */
-		/* Check port cause register that all Tx queues are stopped */
-		while (mv_read(MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port_num))
-									& 0xFF)
-			udelay(10);
-	}
-
-	/* Stop Rx port activity. Check port Rx activity. */
-	reg_data = mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num));
-
-	if (reg_data & 0xFF) {
-		/* Issue stop command for active channels only */
-		mv_write(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num),
-							(reg_data << 8));
-
-		/* Wait for all Rx activity to terminate. */
-		/* Check port cause register that all Rx queues are stopped */
-		while (mv_read(MV643XX_ETH_RECEIVE_QUEUE_COMMAND_REG(port_num))
-									& 0xFF)
-			udelay(10);
-	}
+	mv643xx_eth_port_disable_tx(port_num);
+	mv643xx_eth_port_disable_rx(port_num);
 
 	/* Clear all MIB counters */
 	eth_clear_mib_counters(port_num);
@@ -2599,7 +2624,7 @@ static ETH_FUNC_RET_STATUS eth_port_send
 		first_descriptor->cmd_sts = mp->tx_first_command;
 
 		wmb();
-		ETH_ENABLE_TX_QUEUE(mp->port_num);
+		mv643xx_eth_port_enable_tx(mp->port_num, mp->port_tx_queue_command);
 
 		/*
 		 * Finish Tx packet. Update first desc in case of Tx resource
@@ -2652,7 +2677,7 @@ static ETH_FUNC_RET_STATUS eth_port_send
 			ETH_BUFFER_OWNED_BY_DMA | ETH_TX_ENABLE_INTERRUPT;
 
 	wmb();
-	ETH_ENABLE_TX_QUEUE(mp->port_num);
+	mv643xx_eth_port_enable_tx(mp->port_num, mp->port_tx_queue_command);
 
 	/* Finish Tx packet. Update first desc in case of Tx resource error */
 	tx_desc_curr = (tx_desc_curr + 1) % mp->tx_ring_size;
---
0.99.8.GIT


--- NEW FILE 3718-mv643xx_eth-use-MII-library-for-PHY-management.txt ---
Subject: [PATCH] mv643xx_eth: use MII library for PHY management
From: James Chapman <jchapman at katalix.com>
Date: 1138349595 -0700

Modify link up/down handling to use the functions from the MII
library.  Note that I track link state using the MII PHY registers
rather than the mv643xx chip's link state registers because I think
it's cleaner to use the MII library code rather than writing local
driver support code. It is also useful to make the actual MII
registers available to the user with maskable kernel printk messages
so the MII registers are being read anyway

Signed-off-by: James Chapman <jchapman at katalix.com>
Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/mv643xx_eth.c |   64 +++++++++++++++++++++++++++++----------------
 drivers/net/mv643xx_eth.h |    2 +
 2 files changed, 43 insertions(+), 23 deletions(-)

applies-to: 017ea7b2ca60f29110b8e43afbd6560737824489
c28a4f8947f1b08996502967e348dc88363749a7
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 2daa9b9..bca7257 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -79,7 +79,6 @@
 #define PHY_WAIT_MICRO_SECONDS	10
 
 /* Static function declarations */
-static int eth_port_link_is_up(unsigned int eth_port_num);
 static void eth_port_uc_addr_get(struct net_device *dev,
 						unsigned char *MacAddr);
 static void eth_port_set_multicast_list(struct net_device *);
@@ -97,8 +96,11 @@ static void eth_port_init_mac_tables(uns
 #ifdef MV643XX_NAPI
 static int mv643xx_poll(struct net_device *dev, int *budget);
 #endif
+static int ethernet_phy_get(unsigned int eth_port_num);
 static void ethernet_phy_set(unsigned int eth_port_num, int phy_addr);
 static int ethernet_phy_detect(unsigned int eth_port_num);
+static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
+static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
 static struct ethtool_ops mv643xx_ethtool_ops;
 
 static char mv643xx_driver_name[] = "mv643xx_eth";
@@ -537,14 +539,17 @@ static irqreturn_t mv643xx_eth_int_handl
 	}
 	/* PHY status changed */
 	if (eth_int_cause_ext & (BIT16 | BIT20)) {
-		if (eth_port_link_is_up(port_num)) {
-			netif_carrier_on(dev);
-			netif_wake_queue(dev);
-			/* Start TX queue */
-			mv643xx_eth_port_enable_tx(port_num, mp->port_tx_queue_command);
-		} else {
-			netif_carrier_off(dev);
+		if (mii_link_ok(&mp->mii)) {
+			if (!netif_carrier_ok(dev)) {
+				netif_carrier_on(dev);
+				netif_wake_queue(dev);
+				/* Start TX queue */
+				mv643xx_eth_port_enable_tx(port_num,
+						mp->port_tx_queue_command);
+			}
+		} else if (netif_carrier_ok(dev)) {
 			netif_stop_queue(dev);
+			netif_carrier_off(dev);
 		}
 	}
 
@@ -1434,6 +1439,14 @@ static int mv643xx_eth_probe(struct plat
 		}
 	}
 
+	/* Hook up MII support for ethtool */
+	mp->mii.dev = dev;
+	mp->mii.mdio_read = mv643xx_mdio_read;
+	mp->mii.mdio_write = mv643xx_mdio_write;
+	mp->mii.phy_id = ethernet_phy_get(port_num);
+	mp->mii.phy_id_mask = 0x3f;
+	mp->mii.reg_num_mask = 0x1f;
+
 	err = ethernet_phy_detect(port_num);
 	if (err) {
 		pr_debug("MV643xx ethernet port %d: "
@@ -1442,6 +1455,8 @@ static int mv643xx_eth_probe(struct plat
 		return err;
 	}
 
+	mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
+
 	err = register_netdev(dev);
 	if (err)
 		goto out;
@@ -2416,21 +2431,6 @@ static int eth_port_autoneg_supported(un
 	return phy_reg_data0 & 0x1000;
 }
 
-static int eth_port_link_is_up(unsigned int eth_port_num)
-{
-	unsigned int phy_reg_data1;
-
-	eth_port_read_smi_reg(eth_port_num, 1, &phy_reg_data1);
-
-	if (eth_port_autoneg_supported(eth_port_num)) {
-		if (phy_reg_data1 & 0x20)	/* auto-neg complete */
-			return 1;
-	} else if (phy_reg_data1 & 0x4)		/* link up */
-		return 1;
-
-	return 0;
-}
-
 /*
  * eth_port_read_smi_reg - Read PHY registers
  *
@@ -2536,6 +2536,24 @@ out:
 }
 
 /*
+ * Wrappers for MII support library.
+ */
+static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
+{
+	int val;
+	struct mv643xx_private *mp = netdev_priv(dev);
+
+	eth_port_read_smi_reg(mp->port_num, location, &val);
+	return val;
+}
+
+static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
+{
+	struct mv643xx_private *mp = netdev_priv(dev);
+	eth_port_write_smi_reg(mp->port_num, location, val);
+}
+
+/*
  * eth_port_send - Send an Ethernet packet
  *
  * DESCRIPTION:
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 345f970..f2e5da7 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -5,6 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/mii.h>
 
 #include <linux/mv643xx.h>
 
@@ -393,6 +394,7 @@ struct mv643xx_private {
 
 	u32 rx_int_coal;
 	u32 tx_int_coal;
+	struct mii_if_info mii;
 };
 
 /* ethernet.h API list */
---
0.99.8.GIT


--- NEW FILE 3721-bcm43xx-sync-with-svn.berlios.de.txt ---
Subject: [PATCH] [bcm43xx] sync with svn.berlios.de
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138379180 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/bcm43xx_dma.c   |  196 ++++++++++++--------------
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h   |   11 +
 drivers/net/wireless/bcm43xx/bcm43xx_main.c  |    7 -
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c   |    2 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c |    8 +
 5 files changed, 101 insertions(+), 123 deletions(-)

applies-to: 2ebd23d8f459e97b9c63a663298677b01ba699a6
b2ca6a7b0602473b3763a1f1e37cc89289a1c82a
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index df19fbf..af5c27f 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -214,7 +214,9 @@ static int alloc_ringmemory(struct bcm43
 		return -ENOMEM;
 	}
 	if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) {
-		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RINGMEMORY >1G\n");
+		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RINGMEMORY >1G "
+				    "(0x%08x, len: %lu)\n",
+		       ring->dmabase, BCM43xx_DMA_RINGMEMSIZE);
 		dma_free_coherent(dev, BCM43xx_DMA_RINGMEMSIZE,
 				  ring->vbase, ring->dmabase);
 		return -ENOMEM;
@@ -261,13 +263,6 @@ int bcm43xx_dmacontroller_rx_reset(struc
 	return 0;
 }
 
-static inline int dmacontroller_rx_reset(struct bcm43xx_dmaring *ring)
-{
-	assert(!ring->tx);
-
-	return bcm43xx_dmacontroller_rx_reset(ring->bcm, ring->mmio_base);
-}
-
 /* Reset the RX DMA channel */
 int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
 				   u16 mmio_base)
@@ -308,13 +303,6 @@ int bcm43xx_dmacontroller_tx_reset(struc
 	return 0;
 }
 
-static inline int dmacontroller_tx_reset(struct bcm43xx_dmaring *ring)
-{
-	assert(ring->tx);
-
-	return bcm43xx_dmacontroller_tx_reset(ring->bcm, ring->mmio_base);
-}
-
 static int setup_rx_descbuffer(struct bcm43xx_dmaring *ring,
 			       struct bcm43xx_dmadesc *desc,
 			       struct bcm43xx_dmadesc_meta *meta,
@@ -337,7 +325,9 @@ static int setup_rx_descbuffer(struct bc
 	if (unlikely(dmaaddr + ring->rx_buffersize > BCM43xx_DMA_BUSADDRMAX)) {
 		unmap_descbuffer(ring, dmaaddr, ring->rx_buffersize, 0);
 		dev_kfree_skb_any(skb);
-		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RX SKB >1G\n");
+		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA RX SKB >1G "
+				    "(0x%08x, len: %u)\n",
+		       dmaaddr, ring->rx_buffersize);
 		return -ENOMEM;
 	}
 	meta->skb = skb;
@@ -365,7 +355,7 @@ static int setup_rx_descbuffer(struct bc
 static int alloc_initial_descbuffers(struct bcm43xx_dmaring *ring)
 {
 	int i, err = -ENOMEM;
-	struct bcm43xx_dmadesc *desc = NULL;
+	struct bcm43xx_dmadesc *desc;
 	struct bcm43xx_dmadesc_meta *meta;
 
 	for (i = 0; i < ring->nr_slots; i++) {
@@ -375,24 +365,20 @@ static int alloc_initial_descbuffers(str
 		err = setup_rx_descbuffer(ring, desc, meta, GFP_KERNEL);
 		if (err)
 			goto err_unwind;
-
-		assert(ring->used_slots <= ring->nr_slots);
 	}
 	ring->used_slots = ring->nr_slots;
-
 	err = 0;
 out:
 	return err;
 
 err_unwind:
-	for ( ; i >= 0; i--) {
+	for (i--; i >= 0; i--) {
 		desc = ring->vbase + i;
 		meta = ring->meta + i;
 
 		unmap_descbuffer(ring, meta->dmaaddr, ring->rx_buffersize, 0);
 		dev_kfree_skb(meta->skb);
 	}
-	ring->used_slots = 0;
 	goto out;
 }
 
@@ -442,13 +428,13 @@ out:
 static void dmacontroller_cleanup(struct bcm43xx_dmaring *ring)
 {
 	if (ring->tx) {
-		dmacontroller_tx_reset(ring);
+		bcm43xx_dmacontroller_tx_reset(ring->bcm, ring->mmio_base);
 		/* Zero out Transmit Descriptor ring address. */
 		bcm43xx_write32(ring->bcm,
 				ring->mmio_base + BCM43xx_DMA_TX_DESC_RING,
 				0x00000000);
 	} else {
-		dmacontroller_rx_reset(ring);
+		bcm43xx_dmacontroller_rx_reset(ring->bcm, ring->mmio_base);
 		/* Zero out Receive Descriptor ring address. */
 		bcm43xx_write32(ring->bcm,
 				ring->mmio_base + BCM43xx_DMA_RX_DESC_RING,
@@ -508,9 +494,7 @@ struct bcm43xx_dmaring * bcm43xx_setup_d
 	if (bcm->pci_dev->bus->number == 0)
 		ring->memoffset = 0;
 #endif
-	
-	
-	spin_lock_init(&ring->lock);
+
 	ring->bcm = bcm;
 	ring->nr_slots = nr_descriptor_slots;
 	ring->suspend_mark = ring->nr_slots * BCM43xx_TXSUSPEND_PERCENT / 100;
@@ -578,22 +562,25 @@ static void bcm43xx_destroy_dmaring(stru
 
 void bcm43xx_dma_free(struct bcm43xx_private *bcm)
 {
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->rx_ring1);
-	bcm->current_core->dma->rx_ring1 = NULL;
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->rx_ring0);
-	bcm->current_core->dma->rx_ring0 = NULL;
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring3);
-	bcm->current_core->dma->tx_ring3 = NULL;
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring2);
-	bcm->current_core->dma->tx_ring2 = NULL;
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring1);
-	bcm->current_core->dma->tx_ring1 = NULL;
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring0);
-	bcm->current_core->dma->tx_ring0 = NULL;
+	struct bcm43xx_dma *dma = bcm->current_core->dma;
+
+	bcm43xx_destroy_dmaring(dma->rx_ring1);
+	dma->rx_ring1 = NULL;
+	bcm43xx_destroy_dmaring(dma->rx_ring0);
+	dma->rx_ring0 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring3);
+	dma->tx_ring3 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring2);
+	dma->tx_ring2 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring1);
+	dma->tx_ring1 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring0);
+	dma->tx_ring0 = NULL;
 }
 
 int bcm43xx_dma_init(struct bcm43xx_private *bcm)
 {
+	struct bcm43xx_dma *dma = bcm->current_core->dma;
 	struct bcm43xx_dmaring *ring;
 	int err = -ENOMEM;
 
@@ -602,39 +589,39 @@ int bcm43xx_dma_init(struct bcm43xx_priv
 				     BCM43xx_TXRING_SLOTS, 1);
 	if (!ring)
 		goto out;
-	bcm->current_core->dma->tx_ring0 = ring;
+	dma->tx_ring0 = ring;
 
 	ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA2_BASE,
 				     BCM43xx_TXRING_SLOTS, 1);
 	if (!ring)
 		goto err_destroy_tx0;
-	bcm->current_core->dma->tx_ring1 = ring;
+	dma->tx_ring1 = ring;
 
 	ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA3_BASE,
 				     BCM43xx_TXRING_SLOTS, 1);
 	if (!ring)
 		goto err_destroy_tx1;
-	bcm->current_core->dma->tx_ring2 = ring;
+	dma->tx_ring2 = ring;
 
 	ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA4_BASE,
 				     BCM43xx_TXRING_SLOTS, 1);
 	if (!ring)
 		goto err_destroy_tx2;
-	bcm->current_core->dma->tx_ring3 = ring;
+	dma->tx_ring3 = ring;
 
 	/* setup RX DMA channels. */
 	ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA1_BASE,
 				     BCM43xx_RXRING_SLOTS, 0);
 	if (!ring)
 		goto err_destroy_tx3;
-	bcm->current_core->dma->rx_ring0 = ring;
+	dma->rx_ring0 = ring;
 
 	if (bcm->current_core->rev < 5) {
 		ring = bcm43xx_setup_dmaring(bcm, BCM43xx_MMIO_DMA4_BASE,
 					     BCM43xx_RXRING_SLOTS, 0);
 		if (!ring)
 			goto err_destroy_rx0;
-		bcm->current_core->dma->rx_ring1 = ring;
+		dma->rx_ring1 = ring;
 	}
 
 	dprintk(KERN_INFO PFX "DMA initialized\n");
@@ -643,27 +630,26 @@ out:
 	return err;
 
 err_destroy_rx0:
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->rx_ring0);
-	bcm->current_core->dma->rx_ring0 = NULL;
+	bcm43xx_destroy_dmaring(dma->rx_ring0);
+	dma->rx_ring0 = NULL;
 err_destroy_tx3:
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring3);
-	bcm->current_core->dma->tx_ring3 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring3);
+	dma->tx_ring3 = NULL;
 err_destroy_tx2:
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring2);
-	bcm->current_core->dma->tx_ring2 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring2);
+	dma->tx_ring2 = NULL;
 err_destroy_tx1:
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring1);
-	bcm->current_core->dma->tx_ring1 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring1);
+	dma->tx_ring1 = NULL;
 err_destroy_tx0:
-	bcm43xx_destroy_dmaring(bcm->current_core->dma->tx_ring0);
-	bcm->current_core->dma->tx_ring0 = NULL;
+	bcm43xx_destroy_dmaring(dma->tx_ring0);
+	dma->tx_ring0 = NULL;
 	goto out;
 }
 
 /* Generate a cookie for the TX header. */
-static inline
-u16 generate_cookie(struct bcm43xx_dmaring *ring,
-		    int slot)
+static u16 generate_cookie(struct bcm43xx_dmaring *ring,
+			   int slot)
 {
 	u16 cookie = 0x0000;
 
@@ -693,24 +679,25 @@ u16 generate_cookie(struct bcm43xx_dmari
 }
 
 /* Inspect a cookie and find out to which controller/slot it belongs. */
-static inline
+static
 struct bcm43xx_dmaring * parse_cookie(struct bcm43xx_private *bcm,
 				      u16 cookie, int *slot)
 {
+	struct bcm43xx_dma *dma = bcm->current_core->dma;
 	struct bcm43xx_dmaring *ring = NULL;
 
 	switch (cookie & 0xF000) {
 	case 0x0000:
-		ring = bcm->current_core->dma->tx_ring0;
+		ring = dma->tx_ring0;
 		break;
 	case 0x1000:
-		ring = bcm->current_core->dma->tx_ring1;
+		ring = dma->tx_ring1;
 		break;
 	case 0x2000:
-		ring = bcm->current_core->dma->tx_ring2;
+		ring = dma->tx_ring2;
 		break;
 	case 0x3000:
-		ring = bcm->current_core->dma->tx_ring3;
+		ring = dma->tx_ring3;
 		break;
 	default:
 		assert(0);
@@ -721,8 +708,8 @@ struct bcm43xx_dmaring * parse_cookie(st
 	return ring;
 }
 
-static inline void dmacontroller_poke_tx(struct bcm43xx_dmaring *ring,
-					 int slot)
+static void dmacontroller_poke_tx(struct bcm43xx_dmaring *ring,
+				  int slot)
 {
 	/* Everything is ready to start. Buffers are DMA mapped and
 	 * associated with slots.
@@ -736,11 +723,10 @@ static inline void dmacontroller_poke_tx
 			(u32)(slot * sizeof(struct bcm43xx_dmadesc)));
 }
 
-static inline
-int dma_tx_fragment(struct bcm43xx_dmaring *ring,
-		    struct sk_buff *skb,
-		    struct ieee80211_txb *txb,
-		    u8 cur_frag)
+static int dma_tx_fragment(struct bcm43xx_dmaring *ring,
+			   struct sk_buff *skb,
+			   struct ieee80211_txb *txb,
+			   u8 cur_frag)
 {
 	int slot;
 	struct bcm43xx_dmadesc *desc;
@@ -777,7 +763,9 @@ int dma_tx_fragment(struct bcm43xx_dmari
 	meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
 	if (unlikely(meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) {
 		return_slot(ring, slot);
-		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA TX SKB >1G\n");
+		printk(KERN_ERR PFX ">>>FATAL ERROR<<<  DMA TX SKB >1G "
+				    "(0x%08x, len: %u)\n",
+		       meta->dmaaddr, skb->len);
 		return -ENOMEM;
 	}
 
@@ -797,14 +785,15 @@ int dma_tx_fragment(struct bcm43xx_dmari
 	return 0;
 }
 
-static inline int dma_transfer_txb(struct bcm43xx_dmaring *ring,
-				   struct ieee80211_txb *txb)
+int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
+		   struct ieee80211_txb *txb)
 {
 	/* We just received a packet from the kernel network subsystem.
 	 * Add headers and DMA map the memory. Poke
 	 * the device to send the stuff.
 	 * Note that this is called from atomic context.
 	 */
+	struct bcm43xx_dmaring *ring = bcm->current_core->dma->tx_ring1;
 	u8 i;
 	struct sk_buff *skb;
 
@@ -818,8 +807,6 @@ static inline int dma_transfer_txb(struc
 		return -ENOMEM;
 	}
 
-	assert(irqs_disabled());
-	spin_lock(&ring->lock);
 	for (i = 0; i < txb->nr_frags; i++) {
 		skb = txb->fragments[i];
 		/* We do not free the skb, as it is freed as
@@ -829,22 +816,12 @@ static inline int dma_transfer_txb(struc
 		dma_tx_fragment(ring, skb, txb, i);
 		//TODO: handle failure of dma_tx_fragment
 	}
-	spin_unlock(&ring->lock);
 
 	return 0;
 }
 
-int fastcall
-bcm43xx_dma_transfer_txb(struct bcm43xx_private *bcm,
-			 struct ieee80211_txb *txb)
-{
-	return dma_transfer_txb(bcm->current_core->dma->tx_ring1,
-				txb);
-}
-
-void fastcall
-bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
-			      struct bcm43xx_xmitstatus *status)
+void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
+				   struct bcm43xx_xmitstatus *status)
 {
 	struct bcm43xx_dmaring *ring;
 	struct bcm43xx_dmadesc *desc;
@@ -855,9 +832,6 @@ bcm43xx_dma_handle_xmitstatus(struct bcm
 	ring = parse_cookie(bcm, status->cookie, &slot);
 	assert(ring);
 	assert(ring->tx);
-	assert(irqs_disabled());
-	spin_lock(&ring->lock);
-
 	assert(get_desc_ctl(ring->vbase + slot) & BCM43xx_DMADTOR_FRAMESTART);
 	while (1) {
 		assert(slot >= 0 && slot < ring->nr_slots);
@@ -877,13 +851,10 @@ bcm43xx_dma_handle_xmitstatus(struct bcm
 		slot = next_slot(ring, slot);
 	}
 	bcm->stats.last_tx = jiffies;
-
-	spin_unlock(&ring->lock);
 }
 
-static inline
-void dma_rx(struct bcm43xx_dmaring *ring,
-	    int *slot)
+static void dma_rx(struct bcm43xx_dmaring *ring,
+		   int *slot)
 {
 	struct bcm43xx_dmadesc *desc;
 	struct bcm43xx_dmadesc_meta *meta;
@@ -928,8 +899,12 @@ void dma_rx(struct bcm43xx_dmaring *ring
 			barrier();
 			len = le16_to_cpu(rxhdr->frame_length);
 		} while (len == 0 && i++ < 5);
-		if (len == 0)
+		if (unlikely(len == 0)) {
+			/* recycle the descriptor buffer. */
+			sync_descbuffer_for_device(ring, meta->dmaaddr,
+						   ring->rx_buffersize);
 			goto drop;
+		}
 	}
 	if (unlikely(len > ring->rx_buffersize)) {
 		/* The data did not fit into one descriptor buffer
@@ -937,15 +912,24 @@ void dma_rx(struct bcm43xx_dmaring *ring
 		 * This should never happen, as we try to allocate buffers
 		 * big enough. So simply ignore this packet.
 		 */
-		int cnt = 1;
-		s32 tmp = len - ring->rx_buffersize;
+		int cnt = 0;
+		s32 tmp = len;
 
-		for ( ; tmp > 0; tmp -= ring->rx_buffersize) {
+		while (1) {
+			desc = ring->vbase + *slot;
+			meta = ring->meta + *slot;
+			/* recycle the descriptor buffer. */
+			sync_descbuffer_for_device(ring, meta->dmaaddr,
+						   ring->rx_buffersize);
 			*slot = next_slot(ring, *slot);
 			cnt++;
+			tmp -= ring->rx_buffersize;
+			if (tmp <= 0)
+				break;
 		}
-		printkl(KERN_ERR PFX "DMA RX buffer too small. %d dropped.\n",
-		        cnt);
+		printkl(KERN_ERR PFX "DMA RX buffer too small "
+				     "(len: %u, buffer: %u, nr-dropped: %d)\n",
+		        len, ring->rx_buffersize, cnt);
 		goto drop;
 	}
 	len -= IEEE80211_FCS_LEN;
@@ -954,6 +938,8 @@ void dma_rx(struct bcm43xx_dmaring *ring
 	err = setup_rx_descbuffer(ring, desc, meta, GFP_ATOMIC);
 	if (unlikely(err)) {
 		dprintkl(KERN_ERR PFX "DMA RX: setup_rx_descbuffer() failed\n");
+		sync_descbuffer_for_device(ring, dmaaddr,
+					   ring->rx_buffersize);
 		goto drop;
 	}
 
@@ -971,8 +957,7 @@ drop:
 	return;
 }
 
-void fastcall
-bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
+void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring)
 {
 	u32 status;
 	u16 descptr;
@@ -982,9 +967,6 @@ bcm43xx_dma_rx(struct bcm43xx_dmaring *r
 #endif
 
 	assert(!ring->tx);
-	assert(irqs_disabled());
-	spin_lock(&ring->lock);
-
 	status = bcm43xx_read32(ring->bcm, ring->mmio_base + BCM43xx_DMA_RX_STATUS);
 	descptr = (status & BCM43xx_DMA_RXSTAT_DPTR_MASK);
 	current_slot = descptr / sizeof(struct bcm43xx_dmadesc);
@@ -1002,8 +984,6 @@ bcm43xx_dma_rx(struct bcm43xx_dmaring *r
 			ring->mmio_base + BCM43xx_DMA_RX_DESC_INDEX,
 			(u32)(slot * sizeof(struct bcm43xx_dmadesc)));
 	ring->current_slot = slot;
-
-	spin_unlock(&ring->lock);
 }
 
 /* vim: set ts=8 sw=8 sts=8: */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
index e32cf68..93e99d6 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
@@ -122,7 +122,6 @@ struct bcm43xx_dmadesc_meta {
 };
 
 struct bcm43xx_dmaring {
-	spinlock_t lock;
 	struct bcm43xx_private *bcm;
 	/* Kernel virtual base address of the ring memory. */
 	struct bcm43xx_dmadesc *vbase;
@@ -166,11 +165,11 @@ int bcm43xx_dmacontroller_rx_reset(struc
 int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm,
 				   u16 dmacontroller_mmio_base);
 
-int FASTCALL(bcm43xx_dma_transfer_txb(struct bcm43xx_private *bcm,
-				      struct ieee80211_txb *txb));
-void FASTCALL(bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
-					    struct bcm43xx_xmitstatus *status));
+void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm,
+				   struct bcm43xx_xmitstatus *status);
 
-void FASTCALL(bcm43xx_dma_rx(struct bcm43xx_dmaring *ring));
+int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
+		   struct ieee80211_txb *txb);
+void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring);
 
 #endif /* BCM43xx_DMA_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index be60a65..4b4e60a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -4097,7 +4097,6 @@ int fastcall bcm43xx_rx(struct bcm43xx_p
 	}
 
 	frame_ctl = le16_to_cpu(wlhdr->frame_ctl);
-	
 	if ((frame_ctl & IEEE80211_FCTL_PROTECTED) && !bcm->ieee->host_decrypt) {
 		frame_ctl &= ~IEEE80211_FCTL_PROTECTED;
 		wlhdr->frame_ctl = cpu_to_le16(frame_ctl);		
@@ -4113,12 +4112,12 @@ int fastcall bcm43xx_rx(struct bcm43xx_p
 			skb_trim(skb, skb->len - 4);
 			stats.len -= 8;
 		}
-		/* do _not_ use wlhdr again without reassigning it */
+		wlhdr = (struct ieee80211_hdr_4addr *)(skb->data);
 	}
 	
 	switch (WLAN_FC_GET_TYPE(frame_ctl)) {
 	case IEEE80211_FTYPE_MGMT:
-		ieee80211_rx_mgt(bcm->ieee, skb->data, &stats);
+		ieee80211_rx_mgt(bcm->ieee, wlhdr, &stats);
 		break;
 	case IEEE80211_FTYPE_DATA:
 		if (is_packet_for_us)
@@ -4143,7 +4142,7 @@ static inline int bcm43xx_tx(struct bcm4
 	if (bcm->pio_mode)
 		err = bcm43xx_pio_transfer_txb(bcm, txb);
 	else
-		err = bcm43xx_dma_transfer_txb(bcm, txb);
+		err = bcm43xx_dma_tx(bcm, txb);
 
 	return err;
 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index 41b9cd7..f5e7a6a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -1161,7 +1161,7 @@ void bcm43xx_phy_lo_b_measure(struct bcm
 	phy->minlowsigpos[1] += 0x0101;
 
 	bcm43xx_phy_write(bcm, 0x002F, phy->minlowsigpos[1]);
-	if (radio->version == 2053) {
+	if (radio->version == 0x2053) {
 		bcm43xx_phy_write(bcm, 0x000A, regstack[2]);
 		bcm43xx_phy_write(bcm, 0x002A, regstack[3]);
 		bcm43xx_phy_write(bcm, 0x0035, regstack[4]);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 1e65658..5ce6ace 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -467,8 +467,8 @@ static void bcm43xx_calc_nrssi_offset(st
 		bcm43xx_phy_write(bcm, 0x0003,
 				  (bcm43xx_phy_read(bcm, 0x0003) & 0xFF9F)
 				  | 0x0040);
-		bcm43xx_phy_write(bcm, 0x007A,
-				  bcm43xx_phy_read(bcm, 0x007A) | 0x000F);
+		bcm43xx_radio_write16(bcm, 0x007A,
+				      bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
 		bcm43xx_set_all_gains(bcm, 3, 0, 1);
 		bcm43xx_radio_write16(bcm, 0x0043,
 				      (bcm43xx_radio_read16(bcm, 0x0043)
@@ -761,8 +761,8 @@ void bcm43xx_calc_nrssi_slope(struct bcm
 		bcm43xx_phy_write(bcm, 0x0802,
 				  bcm43xx_phy_read(bcm, 0x0802) | (0x0001 | 0x0002));
 		bcm43xx_set_original_gains(bcm);
-		bcm43xx_phy_write(bcm, 0x0802,
-				  bcm43xx_phy_read(bcm, 0x0802) | 0x8000);
+		bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
+				  bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
 		if (phy->rev >= 3) {
 			bcm43xx_phy_write(bcm, 0x0801, backup[14]);
 			bcm43xx_phy_write(bcm, 0x0060, backup[15]);
---
0.99.8.GIT


--- NEW FILE 3722-bcm43xx-remove-linux-version-compatibility-code.txt ---
Subject: [PATCH] [bcm43xx] remove linux version compatibility code.
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138379595 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/bcm43xx.h |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

applies-to: d4970f5c1fd38daf14c85cd7b05534d10792b856
4015e17319bd2947b349cfca1ca7fbd181bbc632
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index aca1601..38e75ed 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -935,27 +935,4 @@ int bcm43xx_pci_write_config32(struct bc
 	 	__value;				\
 	})
 
-
-/*
- * Compatibility stuff follows
- */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
-# error "The bcm43xx driver does not support kernels < 2.6.15"
-# error "The driver will _NOT_ compile on your kernel. Please upgrade to the latest 2.6 kernel."
-# error "DO NOT COMPLAIN ABOUT BUGS. UPDATE FIRST AND TRY AGAIN."
-#else
-# if !defined(CONFIG_IEEE80211_MODULE) && !defined(CONFIG_IEEE80211)
-#  error "Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211) not available."
-# endif
-#endif
-#ifdef IEEE80211SOFTMAC_API
-# if IEEE80211SOFTMAC_API != 0
-#  warning "Incompatible SoftMAC subsystem installed."
-# endif
-#else
-# error "The bcm43xx driver requires the SoftMAC subsystem."
-# error "SEE >>>>>>    http://softmac.sipsolutions.net/    <<<<<<"
-#endif
-
 #endif /* BCM43xx_H_ */
---
0.99.8.GIT


--- NEW FILE 3727-orinoco_cs-tweak-Vcc-debugging-messages.txt ---
Subject: [PATCH] orinoco_cs: tweak Vcc debugging messages
From: Valdis.Kletnieks at vt.edu <Valdis.Kletnieks at vt.edu>
Date: 1137654467 -0500

The current orinoco_cs.c can issue the exact same error message for
2 different tests that can fail.  Alter them so we can tell which
one of the two failed.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks at vt.edu>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/orinoco_cs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 9c33668d0838ef48a36d8913814db645f108246e
4f95af5bb546a9e7f46ed10f5e0dbe1e42a77884
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index b664708..3c128b6 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -261,13 +261,13 @@ orinoco_cs_config(dev_link_t *link)
 		/* Note that the CIS values need to be rescaled */
 		if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
 			if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
+				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n",  conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
 				if (!ignore_cis_vcc)
 					goto next_entry;
 			}
 		} else if (dflt.vcc.present & (1 << CISTPL_POWER_VNOM)) {
 			if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM] / 10000) {
-				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
+				DEBUG(2, "orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n",  conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM] / 10000);
 				if(!ignore_cis_vcc)
 					goto next_entry;
 			}
---
0.99.8.GIT


--- NEW FILE 3728-ieee80211-Fix-problem-with-not-decrypting-broadcast-packets.txt ---
Subject: [PATCH] ieee80211: Fix problem with not decrypting broadcast packets
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658842 +0800

The code for pulling the key to use for decrypt was correctly using
the host_mc_decrypt flag.  The code that actually decrypted,
however, was based on host_decrypt.  This patch changes this
behavior.

Signed-off-by: Etay Bogner <etay.bogner at gmail.com>
Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

applies-to: 3ce51cc5dca3d18b3cebddb1c87ce30f3faa4f05
b6daa25d653f23252b340cbd7d2153d0b338e44c
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 7a12180..695d047 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -350,6 +350,7 @@ int ieee80211_rx(struct ieee80211_device
 	u8 src[ETH_ALEN];
 	struct ieee80211_crypt_data *crypt = NULL;
 	int keyidx = 0;
+	int can_be_decrypted = 0;
 
 	hdr = (struct ieee80211_hdr_4addr *)skb->data;
 	stats = &ieee->stats;
@@ -410,12 +411,23 @@ int ieee80211_rx(struct ieee80211_device
 		return 1;
 	}
 
-	if (is_multicast_ether_addr(hdr->addr1)
-	    ? ieee->host_mc_decrypt : ieee->host_decrypt) {
+	can_be_decrypted = (is_multicast_ether_addr(hdr->addr1) ||
+			    is_broadcast_ether_addr(hdr->addr2)) ?
+	    ieee->host_mc_decrypt : ieee->host_decrypt;
+
+	if (can_be_decrypted) {
 		int idx = 0;
-		if (skb->len >= hdrlen + 3)
+		if (skb->len >= hdrlen + 3) {
+			/* Top two-bits of byte 3 are the key index */
 			idx = skb->data[hdrlen + 3] >> 6;
+		}
+
+		/* ieee->crypt[] is WEP_KEY (4) in length.  Given that idx
+		 * is only allowed 2-bits of storage, no value of idx can
+		 * be provided via above code that would result in idx
+		 * being out of range */
 		crypt = ieee->crypt[idx];
+
 #ifdef NOT_YET
 		sta = NULL;
 
@@ -553,7 +565,7 @@ int ieee80211_rx(struct ieee80211_device
 
 	/* skb: hdr + (possibly fragmented, possibly encrypted) payload */
 
-	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
+	if ((fc & IEEE80211_FCTL_PROTECTED) && can_be_decrypted &&
 	    (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
 		goto rx_dropped;
 
@@ -617,7 +629,7 @@ int ieee80211_rx(struct ieee80211_device
 
 	/* skb: hdr + (possible reassembled) full MSDU payload; possibly still
 	 * encrypted/authenticated */
-	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
+	if ((fc & IEEE80211_FCTL_PROTECTED) && can_be_decrypted &&
 	    ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
 		goto rx_dropped;
 
---
0.99.8.GIT


--- NEW FILE 3729-ieee80211-Fix-iwlist-scan-can-only-show-about-20-APs.txt ---
Subject: [PATCH] ieee80211: Fix iwlist scan can only show about 20 APs
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658859 +0800

Limit the amount of output given to iwlist scan.

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_wx.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

applies-to: d043a32ab5a7c15fa5e7b5c162cdd031c4b2ced6
55cd94aa1df8e575ab3236641d29d63ecdde5012
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 23e1630..f87c6b8 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -232,15 +232,18 @@ static char *ipw2100_translate_scan(stru
 	return start;
 }
 
+#define SCAN_ITEM_SIZE 128
+
 int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
 			  struct iw_request_info *info,
 			  union iwreq_data *wrqu, char *extra)
 {
 	struct ieee80211_network *network;
 	unsigned long flags;
+	int err = 0;
 
 	char *ev = extra;
-	char *stop = ev + IW_SCAN_MAX_DATA;
+	char *stop = ev + wrqu->data.length;
 	int i = 0;
 
 	IEEE80211_DEBUG_WX("Getting scan\n");
@@ -249,6 +252,11 @@ int ieee80211_wx_get_scan(struct ieee802
 
 	list_for_each_entry(network, &ieee->network_list, list) {
 		i++;
+		if (stop - ev < SCAN_ITEM_SIZE) {
+			err = -E2BIG;
+			break;
+		}
+
 		if (ieee->scan_age == 0 ||
 		    time_after(network->last_scanned + ieee->scan_age, jiffies))
 			ev = ipw2100_translate_scan(ieee, ev, stop, network);
@@ -270,7 +278,7 @@ int ieee80211_wx_get_scan(struct ieee802
 
 	IEEE80211_DEBUG_WX("exit: %d networks returned.\n", i);
 
-	return 0;
+	return err;
 }
 
 int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
---
0.99.8.GIT


--- NEW FILE 3730-ieee80211-Fix-A-band-min-and-max-channel-definitions.txt ---
Subject: [PATCH] ieee80211: Fix A band min and max channel definitions
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658879 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 include/net/ieee80211.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: e8c4e7629494d3bb53044390ad31478173ce12aa
4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index df05f46..9a92aef 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -803,9 +803,9 @@ enum ieee80211_state {
 #define IEEE80211_24GHZ_MAX_CHANNEL 14
 #define IEEE80211_24GHZ_CHANNELS    14
 
-#define IEEE80211_52GHZ_MIN_CHANNEL 36
+#define IEEE80211_52GHZ_MIN_CHANNEL 34
 #define IEEE80211_52GHZ_MAX_CHANNEL 165
-#define IEEE80211_52GHZ_CHANNELS    32
+#define IEEE80211_52GHZ_CHANNELS    131
 
 enum {
 	IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
---
0.99.8.GIT


--- NEW FILE 3732-WEP-fields-are-incorrectly-shown-to-be-INSIDE-snap-in-the-doc.txt ---
Subject: [PATCH] WEP fields are incorrectly shown to be INSIDE snap in the doc
From: Denis Vlasenko <vda at ilport.com.ua>
Date: 1137578553 +0200

>If encryption is enabled, each fragment payload size is reduced by enough space
>to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP)
>So if you have 1500 bytes of payload with ieee->fts set to 500 without
>encryption it will take 3 frames.  With WEP it will take 4 frames as the
>payload of each frame is reduced to 492 bytes.

Text is correct, but in picture (IV,payload,ICV) sits inside SNAP.
Patch corrects this.

Signed-Off-By: Denis Vlasenko <vda at ilport.com.ua>
Acked-By: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_tx.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

applies-to: e29b70bf15d4320037f319fffe08af8d934add2c
44d7a8cfbdc1112fd80546591fd6f5c831ea0363
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 8fdd943..0949803 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -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
---
0.99.8.GIT


--- NEW FILE 3733-ieee80211-Log-if-netif_rx-drops-the-packet.txt ---
Subject: [PATCH] ieee80211: Log if netif_rx() drops the packet
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658849 +0800

Log to wireless network stats if netif_rx() drops the packet.

(also trailing whitespace and Lindent cleanups as part of patch-apply
process)

Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_crypt.c |   11 +++++------
 net/ieee80211/ieee80211_rx.c    |    9 ++++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

applies-to: 87e0b6360f041847e519cd25aaa2dbc4b48cbde0
d65292375154085feb7217ed8fccc8edf163c6b2
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index ecc9bb1..cb71d79 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -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;
 
 	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;
 
@@ -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;
 }
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 695d047..3ae9111 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -754,7 +754,14 @@ int ieee80211_rx(struct ieee80211_device
 		memset(skb->cb, 0, sizeof(skb->cb));
 		skb->dev = dev;
 		skb->ip_summed = CHECKSUM_NONE;	/* 802.11 crc not sufficient */
-		netif_rx(skb);
+		if (netif_rx(skb) == NET_RX_DROP) {
+			/* netif_rx always succeeds, but it might drop
+			 * the packet.  If it drops the packet, we log that
+			 * in our stats. */
+			IEEE80211_DEBUG_DROP
+			    ("RX: netif_rx dropped the packet\n");
+			stats->rx_dropped++;
+		}
 	}
 
       rx_exit:
---
0.99.8.GIT


--- NEW FILE 3734-ieee80211-Add-LEAP-authentication-type.txt ---
Subject: [PATCH] ieee80211: Add LEAP authentication type
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658869 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 include/net/ieee80211.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 952ec92d86fd48285580d6bd7e9c4d0ad9d43209
24056bec086aaa99923b21c0e1a0e993bb1c7e2a
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 9a92aef..3424a3e 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -220,6 +220,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
 
---
0.99.8.GIT


--- NEW FILE 3735-ieee80211-add-flags-for-all-geo-channels.txt ---
Subject: [PATCH] ieee80211: add flags for all geo channels
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658905 +0800

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_geo.c |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

applies-to: f346787ae101c10185849c44bbbcd42d8d461a9a
d128f6c176bff9c4929476e13132804321a6d5c5
diff --git a/net/ieee80211/ieee80211_geo.c b/net/ieee80211/ieee80211_geo.c
index 610cc5c..3027153 100644
--- a/net/ieee80211/ieee80211_geo.c
+++ b/net/ieee80211/ieee80211_geo.c
@@ -58,13 +58,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;
@@ -133,6 +135,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);
---
0.99.8.GIT


--- NEW FILE 3736-ieee80211-Add-spectrum-management-information.txt ---
Subject: [PATCH] ieee80211: Add spectrum management information
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658914 +0800

Add spectrum management information and use stat.signal to provide
signal level information.

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_wx.c |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

applies-to: 6c48f08712a5a81501fea7c317faa9f517d70520
7bd64366044565d6861783613db191c8aaec691e
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index f87c6b8..9496918 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -149,9 +149,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 +177,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;
@@ -229,6 +234,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;
 }
 
---
0.99.8.GIT


--- NEW FILE 3737-ieee80211-kmalloc-memset-kzalloc-cleanups.txt ---
Subject: [PATCH] ieee80211: kmalloc+memset -> kzalloc cleanups
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658927 +0800

kmalloc+memset -> kzalloc cleanups in ieee80211_crypt_tkip

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_crypt_tkip.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

applies-to: 2a75f5bda5df503c532e7c12f53b9be9bd47401e
8aa914b747b650fc1735f3a3171753ac15ed93ab
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index e098832..de56a47 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -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;
 
---
0.99.8.GIT


--- NEW FILE 3738-ieee80211-TIM-information-element-parsing.txt ---
Subject: [PATCH] ieee80211: TIM information element parsing
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658943 +0800

Added partial support of TIM information element parsing

Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

applies-to: 71bdea3b0d816345c3c1fe8bccaa7122788abc49
41a25c616b3140c388ff6009a1cb0b6b06a10f29
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 3ae9111..de402b7 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1047,7 +1047,9 @@ static int ieee80211_parse_info_param(st
 			break;
 
 		case MFIE_TYPE_TIM:
-			IEEE80211_DEBUG_MGMT("MFIE_TYPE_TIM: ignored\n");
+			network->tim.tim_count = info_element->data[0];
+			network->tim.tim_period = info_element->data[1];
+			IEEE80211_DEBUG_MGMT("MFIE_TYPE_TIM: partially ignored\n");
 			break;
 
 		case MFIE_TYPE_ERP_INFO:
@@ -1276,6 +1278,7 @@ static void update_network(struct ieee80
 	dst->listen_interval = src->listen_interval;
 	dst->atim_window = src->atim_window;
 	dst->erp_value = src->erp_value;
+	dst->tim = src->tim;
 
 	memcpy(dst->wpa_ie, src->wpa_ie, src->wpa_ie_len);
 	dst->wpa_ie_len = src->wpa_ie_len;
---
0.99.8.GIT


--- NEW FILE 3739-ieee80211-Add-TKIP-crypt-build_iv.txt ---
Subject: [PATCH] ieee80211: Add TKIP crypt->build_iv
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658952 +0800

This patch adds ieee80211 TKIP build_iv() method to support hardwares
that can do TKIP encryption but relies on ieee80211 layer to build
the IV. It also changes the build_iv() interface to return the key
if possible after the IV is built (this is required by TKIP).

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 include/net/ieee80211_crypt.h        |    3 +-
 net/ieee80211/ieee80211_crypt_ccmp.c |    8 ++++-
 net/ieee80211/ieee80211_crypt_tkip.c |   53 +++++++++++++++++-----------------
 net/ieee80211/ieee80211_crypt_wep.c  |    5 ++-
 net/ieee80211/ieee80211_tx.c         |    4 ++-
 5 files changed, 41 insertions(+), 32 deletions(-)

applies-to: c5c7758ba0f98cf58e89731d830a4176381b49f1
9184d9348a7a0e60d70d5f4c23de79fdbc72b9a3
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h
index cd82c3e..eb47641 100644
--- a/include/net/ieee80211_crypt.h
+++ b/include/net/ieee80211_crypt.h
@@ -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
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 4702217..097bcea 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -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;
 
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index de56a47..93def94 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -270,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);
@@ -308,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));
 		}
@@ -342,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;
 }
 
@@ -378,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));
 		}
@@ -694,6 +694,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,
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index f8dca31..649e581 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -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 */
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 0949803..8b4332f 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -470,7 +470,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);
 		}
 
---
0.99.8.GIT


--- NEW FILE 3740-ieee80211-Add-802.11h-data-type-and-structures.txt ---
Subject: [PATCH] ieee80211: Add 802.11h data type and structures
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658887 +0800

Add 802.11h data types and structure definitions to ieee80211.h.

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 include/net/ieee80211.h      |  168 +++++++++++++++++++++++++++++++++++++++++-
 net/ieee80211/ieee80211_rx.c |    2 -
 2 files changed, 166 insertions(+), 4 deletions(-)

applies-to: e7211258e23f29de34c39866cfa0933e5d10d2f7
b79e20b60997e427b701055a2c69fb0c1d507aa9
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 3424a3e..ff6ef9e 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -300,6 +300,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)
@@ -378,6 +395,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
@@ -609,6 +628,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;
@@ -693,7 +734,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
@@ -749,6 +798,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;
+	u8 count;
+} __attribute__ ((packed));
+
+struct ieee80211_quiet {
+	u8 count;
+	u8 period;
+	u8 duration;
+	u8 offset;
+} __attribute__ ((packed));
+
 struct ieee80211_network {
 	/* These entries are used to identify a unique network */
 	u8 bssid[ETH_ALEN];
@@ -768,7 +902,7 @@ struct ieee80211_network {
 	u8 rates_ex_len;
 	unsigned long last_scanned;
 	u8 mode;
-	u8 flags;
+	u32 flags;
 	u32 last_associate;
 	u32 time_stamp[2];
 	u16 beacon_interval;
@@ -780,6 +914,25 @@ struct ieee80211_network {
 	u8 rsn_ie[MAX_WPA_IE_LEN];
 	size_t rsn_ie_len;
 	struct ieee80211_tim_parameters tim;
+
+	/* 802.11h info */
+
+	/* Power Constraint - mandatory if spctrm mgmt required */
+	u8 power_constraint;
+
+	/* TPC Report - mandatory if spctrm mgmt required */
+	struct ieee80211_tpc_report tpc_report;
+
+	/* IBSS DFS - mandatory if spctrm mgmt required and IBSS
+	 * NOTE: This is variable length and so must be allocated dynamically */
+	struct ieee80211_ibss_dfs *ibss_dfs;
+
+	/* Channel Switch Announcement - optional if spctrm mgmt required */
+	struct ieee80211_csa csa;
+
+	/* Quiet - optional if spctrm mgmt required */
+	struct ieee80211_quiet quiet;
+
 	struct list_head list;
 };
 
@@ -925,7 +1078,10 @@ struct ieee80211_device {
 	int (*handle_auth) (struct net_device * dev,
 			    struct ieee80211_auth * auth);
 	int (*handle_deauth) (struct net_device * dev,
-			      struct ieee80211_auth * auth);
+			      struct ieee80211_deauth * auth);
+	int (*handle_action) (struct net_device * dev,
+			      struct ieee80211_action * action,
+			      struct ieee80211_rx_stats * stats);
 	int (*handle_disassoc) (struct net_device * dev,
 				struct ieee80211_disassoc * assoc);
 	int (*handle_beacon) (struct net_device * dev,
@@ -1094,6 +1250,7 @@ extern int ieee80211_rx(struct ieee80211
 extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
 			     struct ieee80211_hdr_4addr *header,
 			     struct ieee80211_rx_stats *stats);
+extern void ieee80211_network_reset(struct ieee80211_network *network);
 
 /* ieee80211_geo.c */
 extern const struct ieee80211_geo *ieee80211_get_geo(struct ieee80211_device
@@ -1106,6 +1263,11 @@ extern int ieee80211_is_valid_channel(st
 extern int ieee80211_channel_to_index(struct ieee80211_device *ieee,
 				      u8 channel);
 extern u8 ieee80211_freq_to_channel(struct ieee80211_device *ieee, u32 freq);
+extern u8 ieee80211_get_channel_flags(struct ieee80211_device *ieee,
+				      u8 channel);
+extern const struct ieee80211_channel *ieee80211_get_channel(struct
+							     ieee80211_device
+							     *ieee, u8 channel);
 
 /* ieee80211_wx.c */
 extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index de402b7..4165da7 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1514,7 +1514,7 @@ void ieee80211_rx_mgt(struct ieee80211_d
 	case IEEE80211_STYPE_DEAUTH:
 		printk("DEAUTH from AP\n");
 		if (ieee->handle_deauth != NULL)
-			ieee->handle_deauth(ieee->dev, (struct ieee80211_auth *)
+			ieee->handle_deauth(ieee->dev, (struct ieee80211_deauth *)
 					    header);
 		break;
 	default:
---
0.99.8.GIT


--- NEW FILE 3741-ieee80211-Add-helpers-for-IBSS-DFS-handling.txt ---
Subject: [PATCH] ieee80211: Add helpers for IBSS DFS handling
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658895 +0800

To support IEEE 802.11h in IBSS, an ibss_dfs field is added to struct
ieee80211_network. In IBSS, if one STA sends a beacon with DFS info
(for radar detection), all the other STAs should receive and store
this DFS.  All STAs should send the DFS as one of the information
element in the beacon they are scheduled to send (if possible) in
the future.

Since the ibss_dfs has variable length, it must be allocated
dynamically. ieee80211_network_reset() is added to clear the ibss_dfs
field. ieee80211_network_free() is also updated to free the ibss_dfs
field if it is not NULL.

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_module.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

applies-to: 318bf28699ed6042c667f01c8017c3d9d73c9f7d
15f385982e3a4782fe8ed71a9a6beb64a2160c30
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index 90d18b7..5f67c68 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -82,10 +82,28 @@ static int ieee80211_networks_allocate(s
 	return 0;
 }
 
+void ieee80211_network_reset(struct ieee80211_network *network)
+{
+	if (!network)
+		return;
+
+	if (network->ibss_dfs) {
+		kfree(network->ibss_dfs);
+		network->ibss_dfs = NULL;
+	}
+}
+
 static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
 {
+	int i;
+
 	if (!ieee->networks)
 		return;
+
+	for (i = 0; i < MAX_NETWORK_COUNT; i++)
+		if (ieee->networks[i].ibss_dfs)
+			kfree(ieee->networks[i].ibss_dfs);
+
 	kfree(ieee->networks);
 	ieee->networks = NULL;
 }
---
0.99.8.GIT


--- NEW FILE 3742-ieee80211-Add-802.11h-information-element-parsing.txt ---
Subject: [PATCH] ieee80211: Add 802.11h information element parsing
From: Zhu Yi <yi.zhu at intel.com>
Date: 1137658935 +0800

Added default handlers for various 802.11h DFS and TPC information
elements.  Moved all information elements into single location (called
from two places).  Added debug message with information on unparsed IEs
if debug_level set.  Added code to reset network IBSS DFS information
when appropriate.  Added code to invoke driver callback for 802.11h
ACTION STYPE.  Changed a few printk's to IEEE80211_DEBUG_MGMT.

Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |  109 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 103 insertions(+), 6 deletions(-)

applies-to: d33236c0ed68d8a255c88e3e3279f876c67575c6
d1b46b0fba8c1049135ee5d60910b04463dccc95
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 4165da7..a4ebc22 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -937,6 +937,45 @@ static int ieee80211_parse_qos_info_para
 	return rc;
 }
 
+#ifdef CONFIG_IEEE80211_DEBUG
+#define MFIE_STRING(x) case MFIE_TYPE_ ##x: return #x
+
+static const char *get_info_element_string(u16 id)
+{
+	switch (id) {
+		MFIE_STRING(SSID);
+		MFIE_STRING(RATES);
+		MFIE_STRING(FH_SET);
+		MFIE_STRING(DS_SET);
+		MFIE_STRING(CF_SET);
+		MFIE_STRING(TIM);
+		MFIE_STRING(IBSS_SET);
+		MFIE_STRING(COUNTRY);
+		MFIE_STRING(HOP_PARAMS);
+		MFIE_STRING(HOP_TABLE);
+		MFIE_STRING(REQUEST);
+		MFIE_STRING(CHALLENGE);
+		MFIE_STRING(POWER_CONSTRAINT);
+		MFIE_STRING(POWER_CAPABILITY);
+		MFIE_STRING(TPC_REQUEST);
+		MFIE_STRING(TPC_REPORT);
+		MFIE_STRING(SUPP_CHANNELS);
+		MFIE_STRING(CSA);
+		MFIE_STRING(MEASURE_REQUEST);
+		MFIE_STRING(MEASURE_REPORT);
+		MFIE_STRING(QUIET);
+		MFIE_STRING(IBSS_DFS);
+		MFIE_STRING(ERP_INFO);
+		MFIE_STRING(RSN);
+		MFIE_STRING(RATES_EX);
+		MFIE_STRING(GENERIC);
+		MFIE_STRING(QOS_PARAMETER);
+	default:
+		return "UNKNOWN";
+	}
+}
+#endif
+
 static int ieee80211_parse_info_param(struct ieee80211_info_element
 				      *info_element, u16 length,
 				      struct ieee80211_network *network)
@@ -1100,10 +1139,49 @@ static int ieee80211_parse_info_param(st
 			printk(KERN_ERR
 			       "QoS Error need to parse QOS_PARAMETER IE\n");
 			break;
+			/* 802.11h */
+		case MFIE_TYPE_POWER_CONSTRAINT:
+			network->power_constraint = info_element->data[0];
+			network->flags |= NETWORK_HAS_POWER_CONSTRAINT;
+			break;
+
+		case MFIE_TYPE_CSA:
+			network->power_constraint = info_element->data[0];
+			network->flags |= NETWORK_HAS_CSA;
+			break;
+
+		case MFIE_TYPE_QUIET:
+			network->quiet.count = info_element->data[0];
+			network->quiet.period = info_element->data[1];
+			network->quiet.duration = info_element->data[2];
+			network->quiet.offset = info_element->data[3];
+			network->flags |= NETWORK_HAS_QUIET;
+			break;
+
+		case MFIE_TYPE_IBSS_DFS:
+			if (network->ibss_dfs)
+				break;
+			network->ibss_dfs =
+			    kmalloc(info_element->len, GFP_ATOMIC);
+			if (!network->ibss_dfs)
+				return 1;
+			memcpy(network->ibss_dfs, info_element->data,
+			       info_element->len);
+			network->flags |= NETWORK_HAS_IBSS_DFS;
+			break;
+
+		case MFIE_TYPE_TPC_REPORT:
+			network->tpc_report.transmit_power =
+			    info_element->data[0];
+			network->tpc_report.link_margin = info_element->data[1];
+			network->flags |= NETWORK_HAS_TPC_REPORT;
+			break;
 
 		default:
-			IEEE80211_DEBUG_MGMT("unsupported IE %d\n",
-					     info_element->id);
+			IEEE80211_DEBUG_MGMT
+			    ("Unsupported info element: %s (%d)\n",
+			     get_info_element_string(info_element->id),
+			     info_element->id);
 			break;
 		}
 
@@ -1119,7 +1197,9 @@ static int ieee80211_parse_info_param(st
 static int ieee80211_handle_assoc_resp(struct ieee80211_device *ieee, struct ieee80211_assoc_response
 				       *frame, struct ieee80211_rx_stats *stats)
 {
-	struct ieee80211_network network_resp;
+	struct ieee80211_network network_resp = {
+		.ibss_dfs = NULL,
+	};
 	struct ieee80211_network *network = &network_resp;
 	struct net_device *dev = ieee->dev;
 
@@ -1262,6 +1342,9 @@ static void update_network(struct ieee80
 	int qos_active;
 	u8 old_param;
 
+	ieee80211_network_reset(dst);
+	dst->ibss_dfs = src->ibss_dfs;
+
 	memcpy(&dst->stats, &src->stats, sizeof(struct ieee80211_rx_stats));
 	dst->capability = src->capability;
 	memcpy(dst->rates, src->rates, src->rates_len);
@@ -1323,7 +1406,9 @@ static void ieee80211_process_probe_resp
 						    *stats)
 {
 	struct net_device *dev = ieee->dev;
-	struct ieee80211_network network;
+	struct ieee80211_network network = {
+		.ibss_dfs = NULL,
+	};
 	struct ieee80211_network *target;
 	struct ieee80211_network *oldest = NULL;
 #ifdef CONFIG_IEEE80211_DEBUG
@@ -1398,6 +1483,7 @@ static void ieee80211_process_probe_resp
 					     escape_essid(target->ssid,
 							  target->ssid_len),
 					     MAC_ARG(target->bssid));
+			ieee80211_network_reset(target);
 		} else {
 			/* Otherwise just pull from the free list */
 			target = list_entry(ieee->network_free_list.next,
@@ -1416,6 +1502,7 @@ static void ieee80211_process_probe_resp
 				     "BEACON" : "PROBE RESPONSE");
 #endif
 		memcpy(target, &network, sizeof(*target));
+		network.ibss_dfs = NULL;
 		list_add_tail(&target->list, &ieee->network_list);
 	} else {
 		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
@@ -1427,6 +1514,7 @@ static void ieee80211_process_probe_resp
 						frame_ctl)) ?
 				     "BEACON" : "PROBE RESPONSE");
 		update_network(target, &network);
+		network.ibss_dfs = NULL;
 	}
 
 	spin_unlock_irqrestore(&ieee->lock, flags);
@@ -1511,10 +1599,19 @@ void ieee80211_rx_mgt(struct ieee80211_d
 					      header);
 		break;
 
+	case IEEE80211_STYPE_ACTION:
+		IEEE80211_DEBUG_MGMT("ACTION\n");
+		if (ieee->handle_action)
+			ieee->handle_action(ieee->dev,
+					    (struct ieee80211_action *)
+					    header, stats);
+		break;
+
 	case IEEE80211_STYPE_DEAUTH:
-		printk("DEAUTH from AP\n");
+		IEEE80211_DEBUG_MGMT("DEAUTH\n");
 		if (ieee->handle_deauth != NULL)
-			ieee->handle_deauth(ieee->dev, (struct ieee80211_deauth *)
+			ieee->handle_deauth(ieee->dev,
+					    (struct ieee80211_deauth *)
 					    header);
 		break;
 	default:
---
0.99.8.GIT


--- NEW FILE 3747-r8169-prevent-excessive-busy-waiting.txt ---
Subject: [PATCH] r8169: prevent excessive busy-waiting
From: Francois Romieu <romieu at fr.zoreil.com>
Date: 1138492149 +0100

The MII registers read/write function blindly busy waits for an
amount of 1000 us (1 ms), then up to 200 ms. These functions are
called from irq disabled context. Depending on the clock management,
it triggers lost ticks events. Since the value is way above the
standard delay required for mii register access, it strangely looks
like a bandaid against posted writes.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=5947

Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>

---

 drivers/net/r8169.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

applies-to: 9c33668d0838ef48a36d8913814db645f108246e
2371408c021f961b92fd2c42480cfddc9c6254f0
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 2e1bed1..a81338b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -484,13 +484,12 @@ static void mdio_write(void __iomem *ioa
 	int i;
 
 	RTL_W32(PHYAR, 0x80000000 | (RegAddr & 0xFF) << 16 | value);
-	udelay(1000);
 
-	for (i = 2000; i > 0; i--) {
+	for (i = 20; i > 0; i--) {
 		/* Check if the RTL8169 has completed writing to the specified MII register */
 		if (!(RTL_R32(PHYAR) & 0x80000000)) 
 			break;
-		udelay(100);
+		udelay(25);
 	}
 }
 
@@ -499,15 +498,14 @@ static int mdio_read(void __iomem *ioadd
 	int i, value = -1;
 
 	RTL_W32(PHYAR, 0x0 | (RegAddr & 0xFF) << 16);
-	udelay(1000);
 
-	for (i = 2000; i > 0; i--) {
+	for (i = 20; i > 0; i--) {
 		/* Check if the RTL8169 has completed retrieving data from the specified MII register */
 		if (RTL_R32(PHYAR) & 0x80000000) {
 			value = (int) (RTL_R32(PHYAR) & 0xFFFF);
 			break;
 		}
-		udelay(100);
+		udelay(25);
 	}
 	return value;
 }
---
0.99.8.GIT


--- NEW FILE 3748-arcnet-probing-cleanups-and-fixes.txt ---
Subject: [PATCH] arcnet probing cleanups and fixes
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133513684 -0500

make arcnet probing do request_mem_region() for all iomem it's going to
access, clean the code up.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/arcnet/arc-rimi.c |   68 +++++++++++++++------
 drivers/net/arcnet/com90xx.c  |  132 +++++++++++++++++++++++++++++------------
 2 files changed, 143 insertions(+), 57 deletions(-)

applies-to: 9c33668d0838ef48a36d8913814db645f108246e
d0f6ecad39266f87913539c52dc624f75cc4b914
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c
index 38c3f03..8c8d6c4 100644
--- a/drivers/net/arcnet/arc-rimi.c
+++ b/drivers/net/arcnet/arc-rimi.c
@@ -97,25 +97,44 @@ static int __init arcrimi_probe(struct n
 		       "must specify the shmem and irq!\n");
 		return -ENODEV;
 	}
+	if (dev->dev_addr[0] == 0) {
+		BUGMSG(D_NORMAL, "You need to specify your card's station "
+		       "ID!\n");
+		return -ENODEV;
+	}
 	/*
-	 * Grab the memory region at mem_start for BUFFER_SIZE bytes.
+	 * Grab the memory region at mem_start for MIRROR_SIZE bytes.
 	 * Later in arcrimi_found() the real size will be determined
 	 * and this reserve will be released and the correct size
 	 * will be taken.
 	 */
-	if (!request_mem_region(dev->mem_start, BUFFER_SIZE, "arcnet (90xx)")) {
+	if (!request_mem_region(dev->mem_start, MIRROR_SIZE, "arcnet (90xx)")) {
 		BUGMSG(D_NORMAL, "Card memory already allocated\n");
 		return -ENODEV;
 	}
-	if (dev->dev_addr[0] == 0) {
-		release_mem_region(dev->mem_start, BUFFER_SIZE);
-		BUGMSG(D_NORMAL, "You need to specify your card's station "
-		       "ID!\n");
-		return -ENODEV;
-	}
 	return arcrimi_found(dev);
 }
 
+static int check_mirror(unsigned long addr, size_t size)
+{
+	void __iomem *p;
+	int res = -1;
+
+	if (!request_mem_region(addr, size, "arcnet (90xx)"))
+		return -1;
+
+	p = ioremap(addr, size);
+	if (p) {
+		if (readb(p) == TESTvalue)
+			res = 1;
+		else
+			res = 0;
+		iounmap(p);
+	}
+
+	release_mem_region(addr, size);
+	return res;
+}
 
 /*
  * Set up the struct net_device associated with this card.  Called after
@@ -125,19 +144,28 @@ static int __init arcrimi_found(struct n
 {
 	struct arcnet_local *lp;
 	unsigned long first_mirror, last_mirror, shmem;
+	void __iomem *p;
 	int mirror_size;
 	int err;
 
+	p = ioremap(dev->mem_start, MIRROR_SIZE);
+	if (!p) {
+		release_mem_region(dev->mem_start, MIRROR_SIZE);
+		BUGMSG(D_NORMAL, "Can't ioremap\n");
+		return -ENODEV;
+	}
+
 	/* reserve the irq */
 	if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) {
-		release_mem_region(dev->mem_start, BUFFER_SIZE);
+		iounmap(p);
+		release_mem_region(dev->mem_start, MIRROR_SIZE);
 		BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
 		return -ENODEV;
 	}
 
 	shmem = dev->mem_start;
-	isa_writeb(TESTvalue, shmem);
-	isa_writeb(dev->dev_addr[0], shmem + 1);	/* actually the node ID */
+	writeb(TESTvalue, p);
+	writeb(dev->dev_addr[0], p + 1);	/* actually the node ID */
 
 	/* find the real shared memory start/end points, including mirrors */
 
@@ -146,17 +174,18 @@ static int __init arcrimi_found(struct n
 	 * 2k (or there are no mirrors at all) but on some, it's 4k.
 	 */
 	mirror_size = MIRROR_SIZE;
-	if (isa_readb(shmem) == TESTvalue
-	    && isa_readb(shmem - mirror_size) != TESTvalue
-	    && isa_readb(shmem - 2 * mirror_size) == TESTvalue)
-		mirror_size *= 2;
+	if (readb(p) == TESTvalue
+	    && check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0
+	    && check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1)
+		mirror_size = 2 * MIRROR_SIZE;
 
-	first_mirror = last_mirror = shmem;
-	while (isa_readb(first_mirror) == TESTvalue)
+	first_mirror = shmem - mirror_size;
+	while (check_mirror(first_mirror, mirror_size) == 1)
 		first_mirror -= mirror_size;
 	first_mirror += mirror_size;
 
-	while (isa_readb(last_mirror) == TESTvalue)
+	last_mirror = shmem + mirror_size;
+	while (check_mirror(last_mirror, mirror_size) == 1)
 		last_mirror += mirror_size;
 	last_mirror -= mirror_size;
 
@@ -181,7 +210,8 @@ static int __init arcrimi_found(struct n
 	 * with the correct size.  There is a VERY slim chance this could
 	 * fail.
 	 */
-	release_mem_region(shmem, BUFFER_SIZE);
+	iounmap(p);
+	release_mem_region(shmem, MIRROR_SIZE);
 	if (!request_mem_region(dev->mem_start,
 				dev->mem_end - dev->mem_start + 1,
 				"arcnet (90xx)")) {
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 6c2c9b9..43150b2 100644
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -53,7 +53,7 @@
 
 
 /* Internal function declarations */
-static int com90xx_found(int ioaddr, int airq, u_long shmem);
+static int com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *);
 static void com90xx_command(struct net_device *dev, int command);
 static int com90xx_status(struct net_device *dev);
 static void com90xx_setmask(struct net_device *dev, int mask);
@@ -116,14 +116,26 @@ static void __init com90xx_probe(void)
 	unsigned long airqmask;
 	int ports[(0x3f0 - 0x200) / 16 + 1] =
 	{0};
-	u_long shmems[(0xFF800 - 0xA0000) / 2048 + 1] =
-	{0};
+	unsigned long *shmems;
+	void __iomem **iomem;
 	int numports, numshmems, *port;
 	u_long *p;
+	int index;
 
 	if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
 		return;
 
+	shmems = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(unsigned long),
+			 GFP_KERNEL);
+	if (!shmems)
+		return;
+	iomem = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(void __iomem *),
+			 GFP_KERNEL);
+	if (!iomem) {
+		kfree(shmems);
+		return;
+	}
+
 	BUGLVL(D_NORMAL) printk(VERSION);
 
 	/* set up the arrays where we'll store the possible probe addresses */
@@ -179,6 +191,8 @@ static void __init com90xx_probe(void)
 
 	if (!numports) {
 		BUGMSG2(D_NORMAL, "S1: No ARCnet cards found.\n");
+		kfree(shmems);
+		kfree(iomem);
 		return;
 	}
 	/* Stage 2: we have now reset any possible ARCnet cards, so we can't
@@ -202,8 +216,8 @@ static void __init com90xx_probe(void)
 	 * 0xD1 byte in the right place, or are read-only.
 	 */
 	numprint = -1;
-	for (p = &shmems[0]; p < shmems + numshmems; p++) {
-		u_long ptr = *p;
+	for (index = 0, p = &shmems[0]; index < numshmems; p++, index++) {
+		void __iomem *base;
 
 		numprint++;
 		numprint %= 8;
@@ -213,38 +227,49 @@ static void __init com90xx_probe(void)
 		}
 		BUGMSG2(D_INIT, "%lXh ", *p);
 
-		if (!request_mem_region(*p, BUFFER_SIZE, "arcnet (90xx)")) {
+		if (!request_mem_region(*p, MIRROR_SIZE, "arcnet (90xx)")) {
 			BUGMSG2(D_INIT_REASONS, "(request_mem_region)\n");
 			BUGMSG2(D_INIT_REASONS, "Stage 3: ");
 			BUGLVL(D_INIT_REASONS) numprint = 0;
-			*p-- = shmems[--numshmems];
-			continue;
+			goto out;
+		}
+		base = ioremap(*p, MIRROR_SIZE);
+		if (!base) {
+			BUGMSG2(D_INIT_REASONS, "(ioremap)\n");
+			BUGMSG2(D_INIT_REASONS, "Stage 3: ");
+			BUGLVL(D_INIT_REASONS) numprint = 0;
+			goto out1;
 		}
-		if (isa_readb(ptr) != TESTvalue) {
+		if (readb(base) != TESTvalue) {
 			BUGMSG2(D_INIT_REASONS, "(%02Xh != %02Xh)\n",
-				isa_readb(ptr), TESTvalue);
+				readb(base), TESTvalue);
 			BUGMSG2(D_INIT_REASONS, "S3: ");
 			BUGLVL(D_INIT_REASONS) numprint = 0;
-			release_mem_region(*p, BUFFER_SIZE);
-			*p-- = shmems[--numshmems];
-			continue;
+			goto out2;
 		}
 		/* By writing 0x42 to the TESTvalue location, we also make
 		 * sure no "mirror" shmem areas show up - if they occur
 		 * in another pass through this loop, they will be discarded
 		 * because *cptr != TESTvalue.
 		 */
-		isa_writeb(0x42, ptr);
-		if (isa_readb(ptr) != 0x42) {
+		writeb(0x42, base);
+		if (readb(base) != 0x42) {
 			BUGMSG2(D_INIT_REASONS, "(read only)\n");
 			BUGMSG2(D_INIT_REASONS, "S3: ");
-			release_mem_region(*p, BUFFER_SIZE);
-			*p-- = shmems[--numshmems];
-			continue;
+			goto out2;
 		}
 		BUGMSG2(D_INIT_REASONS, "\n");
 		BUGMSG2(D_INIT_REASONS, "S3: ");
 		BUGLVL(D_INIT_REASONS) numprint = 0;
+		iomem[index] = base;
+		continue;
+	out2:
+		iounmap(base);
+	out1:
+		release_mem_region(*p, MIRROR_SIZE);
+	out:
+		*p-- = shmems[--numshmems];
+		index--;
 	}
 	BUGMSG2(D_INIT, "\n");
 
@@ -252,6 +277,8 @@ static void __init com90xx_probe(void)
 		BUGMSG2(D_NORMAL, "S3: No ARCnet cards found.\n");
 		for (port = &ports[0]; port < ports + numports; port++)
 			release_region(*port, ARCNET_TOTAL_SIZE);
+		kfree(shmems);
+		kfree(iomem);
 		return;
 	}
 	/* Stage 4: something of a dummy, to report the shmems that are
@@ -351,30 +378,32 @@ static void __init com90xx_probe(void)
 			mdelay(RESETtime);
 		} else {
 			/* just one shmem and port, assume they match */
-			isa_writeb(TESTvalue, shmems[0]);
+			writeb(TESTvalue, iomem[0]);
 		}
 #else
 		inb(_RESET);
 		mdelay(RESETtime);
 #endif
 
-		for (p = &shmems[0]; p < shmems + numshmems; p++) {
-			u_long ptr = *p;
+		for (index = 0; index < numshmems; index++) {
+			u_long ptr = shmems[index];
+			void __iomem *base = iomem[index];
 
-			if (isa_readb(ptr) == TESTvalue) {	/* found one */
+			if (readb(base) == TESTvalue) {	/* found one */
 				BUGMSG2(D_INIT, "%lXh)\n", *p);
 				openparen = 0;
 
 				/* register the card */
-				if (com90xx_found(*port, airq, *p) == 0)
+				if (com90xx_found(*port, airq, ptr, base) == 0)
 					found = 1;
 				numprint = -1;
 
 				/* remove shmem from the list */
-				*p = shmems[--numshmems];
+				shmems[index] = shmems[--numshmems];
+				iomem[index] = iomem[numshmems];
 				break;	/* go to the next I/O port */
 			} else {
-				BUGMSG2(D_INIT_REASONS, "%Xh-", isa_readb(ptr));
+				BUGMSG2(D_INIT_REASONS, "%Xh-", readb(base));
 			}
 		}
 
@@ -391,17 +420,40 @@ static void __init com90xx_probe(void)
 	BUGLVL(D_INIT_REASONS) printk("\n");
 
 	/* Now put back TESTvalue on all leftover shmems. */
-	for (p = &shmems[0]; p < shmems + numshmems; p++) {
-		isa_writeb(TESTvalue, *p);
-		release_mem_region(*p, BUFFER_SIZE);
+	for (index = 0; index < numshmems; index++) {
+		writeb(TESTvalue, iomem[index]);
+		iounmap(iomem[index]);
+		release_mem_region(shmems[index], MIRROR_SIZE);
 	}
+	kfree(shmems);
+	kfree(iomem);
 }
 
+static int check_mirror(unsigned long addr, size_t size)
+{
+	void __iomem *p;
+	int res = -1;
+
+	if (!request_mem_region(addr, size, "arcnet (90xx)"))
+		return -1;
+
+	p = ioremap(addr, size);
+	if (p) {
+		if (readb(p) == TESTvalue)
+			res = 1;
+		else
+			res = 0;
+		iounmap(p);
+	}
+
+	release_mem_region(addr, size);
+	return res;
+}
 
 /* Set up the struct net_device associated with this card.  Called after
  * probing succeeds.
  */
-static int __init com90xx_found(int ioaddr, int airq, u_long shmem)
+static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *p)
 {
 	struct net_device *dev = NULL;
 	struct arcnet_local *lp;
@@ -412,7 +464,8 @@ static int __init com90xx_found(int ioad
 	dev = alloc_arcdev(device);
 	if (!dev) {
 		BUGMSG2(D_NORMAL, "com90xx: Can't allocate device!\n");
-		release_mem_region(shmem, BUFFER_SIZE);
+		iounmap(p);
+		release_mem_region(shmem, MIRROR_SIZE);
 		return -ENOMEM;
 	}
 	lp = dev->priv;
@@ -423,24 +476,27 @@ static int __init com90xx_found(int ioad
 	 * 2k (or there are no mirrors at all) but on some, it's 4k.
 	 */
 	mirror_size = MIRROR_SIZE;
-	if (isa_readb(shmem) == TESTvalue
-	    && isa_readb(shmem - mirror_size) != TESTvalue
-	    && isa_readb(shmem - 2 * mirror_size) == TESTvalue)
-		mirror_size *= 2;
+	if (readb(p) == TESTvalue &&
+	    check_mirror(shmem - MIRROR_SIZE, MIRROR_SIZE) == 0 &&
+	    check_mirror(shmem - 2 * MIRROR_SIZE, MIRROR_SIZE) == 1)
+		mirror_size = 2 * MIRROR_SIZE;
 
-	first_mirror = last_mirror = shmem;
-	while (isa_readb(first_mirror) == TESTvalue)
+	first_mirror = shmem - mirror_size;
+	while (check_mirror(first_mirror, mirror_size) == 1)
 		first_mirror -= mirror_size;
 	first_mirror += mirror_size;
 
-	while (isa_readb(last_mirror) == TESTvalue)
+	last_mirror = shmem + mirror_size;
+	while (check_mirror(last_mirror, mirror_size) == 1)
 		last_mirror += mirror_size;
 	last_mirror -= mirror_size;
 
 	dev->mem_start = first_mirror;
 	dev->mem_end = last_mirror + MIRROR_SIZE - 1;
 
-	release_mem_region(shmem, BUFFER_SIZE);
+	iounmap(p);
+	release_mem_region(shmem, MIRROR_SIZE);
+
 	if (!request_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1, "arcnet (90xx)"))
 		goto err_free_dev;
 
---
0.99.8.GIT


--- NEW FILE 3749-ibm_emac-sparse-annotations.txt ---
Subject: [PATCH] ibm_emac sparse annotations
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133450121 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/ibm_emac/ibm_emac_core.c  |   40 ++++++++++++++++-----------------
 drivers/net/ibm_emac/ibm_emac_core.h  |    2 +-
 drivers/net/ibm_emac/ibm_emac_debug.c |    2 +-
 drivers/net/ibm_emac/ibm_emac_rgmii.h |    2 +-
 drivers/net/ibm_emac/ibm_emac_zmii.c  |    7 ++----
 drivers/net/ibm_emac/ibm_emac_zmii.h  |    2 +-
 6 files changed, 26 insertions(+), 29 deletions(-)

applies-to: c2c674495d0d13241779ed6fbeeff16b4523e2e0
b43de2d8db7655d1c520bf6eac7071d8f6d0b864
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 591c586..7e49522 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -204,7 +204,7 @@ static inline int emac_phy_gpcs(int phy_
 
 static inline void emac_tx_enable(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	u32 r;
 
@@ -220,7 +220,7 @@ static inline void emac_tx_enable(struct
 
 static void emac_tx_disable(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	u32 r;
 
@@ -244,7 +244,7 @@ static void emac_tx_disable(struct ocp_e
 
 static void emac_rx_enable(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	u32 r;
 
@@ -275,7 +275,7 @@ static void emac_rx_enable(struct ocp_en
 
 static void emac_rx_disable(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	u32 r;
 
@@ -299,7 +299,7 @@ static void emac_rx_disable(struct ocp_e
 
 static inline void emac_rx_disable_async(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	u32 r;
 
@@ -315,7 +315,7 @@ static inline void emac_rx_disable_async
 
 static int emac_reset(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	unsigned long flags;
 	int n = 20;
 
@@ -348,7 +348,7 @@ static int emac_reset(struct ocp_enet_pr
 
 static void emac_hash_mc(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	u16 gaht[4] = { 0 };
 	struct dev_mc_list *dmi;
 
@@ -393,7 +393,7 @@ static inline int emac_opb_mhz(void)
 /* BHs disabled */
 static int emac_configure(struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	struct net_device *ndev = dev->ndev;
 	int gige;
 	u32 r;
@@ -555,7 +555,7 @@ static void emac_full_tx_reset(struct ne
 
 static int __emac_mdio_read(struct ocp_enet_private *dev, u8 id, u8 reg)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	u32 r;
 	int n;
 
@@ -604,7 +604,7 @@ static int __emac_mdio_read(struct ocp_e
 static void __emac_mdio_write(struct ocp_enet_private *dev, u8 id, u8 reg,
 			      u16 val)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	int n;
 
 	DBG2("%d: mdio_write(%02x,%02x,%04x)" NL, dev->def->index, id, reg,
@@ -666,7 +666,7 @@ static void emac_mdio_write(struct net_d
 static void emac_set_multicast_list(struct net_device *ndev)
 {
 	struct ocp_enet_private *dev = ndev->priv;
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	u32 rmr = emac_iff2rmr(ndev);
 
 	DBG("%d: multicast %08x" NL, dev->def->index, rmr);
@@ -825,7 +825,7 @@ static void emac_clean_rx_ring(struct oc
 }
 
 static inline int emac_alloc_rx_skb(struct ocp_enet_private *dev, int slot,
-				    int flags)
+				    gfp_t flags)
 {
 	struct sk_buff *skb = alloc_skb(dev->rx_skb_size, flags);
 	if (unlikely(!skb))
@@ -1047,7 +1047,7 @@ static inline u16 emac_tx_csum(struct oc
 
 static inline int emac_xmit_finish(struct ocp_enet_private *dev, int len)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	struct net_device *ndev = dev->ndev;
 
 	/* Send the packet out */
@@ -1519,7 +1519,7 @@ static void emac_rxde(void *param)
 static irqreturn_t emac_irq(int irq, void *dev_instance, struct pt_regs *regs)
 {
 	struct ocp_enet_private *dev = dev_instance;
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 	struct ibm_emac_error_stats *st = &dev->estats;
 
 	u32 isr = in_be32(&p->isr);
@@ -1619,17 +1619,17 @@ static void emac_remove(struct ocp_devic
 
 	DBG("%d: remove" NL, dev->def->index);
 
-	ocp_set_drvdata(ocpdev, 0);
+	ocp_set_drvdata(ocpdev, NULL);
 	unregister_netdev(dev->ndev);
 
 	tah_fini(dev->tah_dev);
 	rgmii_fini(dev->rgmii_dev, dev->rgmii_input);
 	zmii_fini(dev->zmii_dev, dev->zmii_input);
 
-	emac_dbg_register(dev->def->index, 0);
+	emac_dbg_register(dev->def->index, NULL);
 
 	mal_unregister_commac(dev->mal, &dev->commac);
-	iounmap((void *)dev->emacp);
+	iounmap(dev->emacp);
 	kfree(dev->ndev);
 }
 
@@ -2048,9 +2048,7 @@ static int __init emac_probe(struct ocp_
 		goto out4;
 
 	/* Map EMAC regs */
-	dev->emacp =
-	    (struct emac_regs *)ioremap(dev->def->paddr,
-					sizeof(struct emac_regs));
+	dev->emacp = ioremap(dev->def->paddr, sizeof(struct emac_regs));
 	if (!dev->emacp) {
 		printk(KERN_ERR "emac%d: could not ioremap device registers!\n",
 		       dev->def->index);
@@ -2210,7 +2208,7 @@ static int __init emac_probe(struct ocp_
 
 	return 0;
       out6:
-	iounmap((void *)dev->emacp);
+	iounmap(dev->emacp);
       out5:
 	tah_fini(dev->tah_dev);
       out4:
diff --git a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h
index 911abba..f61273b 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.h
+++ b/drivers/net/ibm_emac/ibm_emac_core.h
@@ -155,7 +155,7 @@ struct ibm_emac_error_stats {
 
 struct ocp_enet_private {
 	struct net_device		*ndev;		/* 0 */
-	struct emac_regs		*emacp;
+	struct emac_regs		__iomem *emacp;
 	
 	struct mal_descriptor		*tx_desc;
 	int				tx_cnt;
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.c b/drivers/net/ibm_emac/ibm_emac_debug.c
index 75d3b86..c7e1ecf 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.c
+++ b/drivers/net/ibm_emac/ibm_emac_debug.c
@@ -58,7 +58,7 @@ static void emac_desc_dump(int idx, stru
 
 static void emac_mac_dump(int idx, struct ocp_enet_private *dev)
 {
-	struct emac_regs *p = dev->emacp;
+	struct emac_regs __iomem *p = dev->emacp;
 
 	printk("** EMAC%d registers **\n"
 	       "MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index a1ffb8a..7f03d53 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -31,7 +31,7 @@ struct rgmii_regs {
 
 /* RGMII device */
 struct ibm_ocp_rgmii {
-	struct rgmii_regs *base;
+	struct rgmii_regs __iomem *base;
 	int users;		/* number of EMACs using this RGMII bridge */
 };
 
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.c b/drivers/net/ibm_emac/ibm_emac_zmii.c
index 35c1185..e129e0a 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.c
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.c
@@ -80,7 +80,7 @@ static inline u32 zmii_mode_mask(int mod
 static int __init zmii_init(struct ocp_device *ocpdev, int input, int *mode)
 {
 	struct ibm_ocp_zmii *dev = ocp_get_drvdata(ocpdev);
-	struct zmii_regs *p;
+	struct zmii_regs __iomem *p;
 
 	ZMII_DBG("%d: init(%d, %d)" NL, ocpdev->def->index, input, *mode);
 
@@ -94,8 +94,7 @@ static int __init zmii_init(struct ocp_d
 		}
 		dev->mode = PHY_MODE_NA;
 
-		p = (struct zmii_regs *)ioremap(ocpdev->def->paddr,
-						sizeof(struct zmii_regs));
+		p = ioremap(ocpdev->def->paddr, sizeof(struct zmii_regs));
 		if (!p) {
 			printk(KERN_ERR
 			       "zmii%d: could not ioremap device registers!\n",
@@ -231,7 +230,7 @@ void __exit __zmii_fini(struct ocp_devic
 	if (!--dev->users) {
 		/* Free everything if this is the last user */
 		ocp_set_drvdata(ocpdev, NULL);
-		iounmap((void *)dev->base);
+		iounmap(dev->base);
 		kfree(dev);
 	}
 }
diff --git a/drivers/net/ibm_emac/ibm_emac_zmii.h b/drivers/net/ibm_emac/ibm_emac_zmii.h
index 0bb2606..92c8544 100644
--- a/drivers/net/ibm_emac/ibm_emac_zmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_zmii.h
@@ -32,7 +32,7 @@ struct zmii_regs {
 
 /* ZMII device */
 struct ibm_ocp_zmii {
-	struct zmii_regs *base;
+	struct zmii_regs __iomem *base;
 	int mode;		/* subset of PHY_MODE_XXXX */
 	int users;		/* number of EMACs using this ZMII bridge */
 	u32 fer_save;		/* FER value left by firmware */
---
0.99.8.GIT


--- NEW FILE 3750-appletalk-cops.h-missing-const-in-struct-ltfirmware.txt ---
Subject: [PATCH] appletalk/cops.h: missing const in struct ltfirmware
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133866965 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/appletalk/cops.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 72de2f56444a6a167fa61dff14946d1aa90b3bc8
976345cc0fb34d677233b5b22d4819dc7ac92ef1
diff --git a/drivers/net/appletalk/cops.h b/drivers/net/appletalk/cops.h
index c68ba9c..aca47f3 100644
--- a/drivers/net/appletalk/cops.h
+++ b/drivers/net/appletalk/cops.h
@@ -51,7 +51,7 @@
 struct ltfirmware
 {
         unsigned int length;
-        unsigned char * data;
+        const unsigned char * data;
 };
 
 #define DAYNA 1
---
0.99.8.GIT


--- NEW FILE 3751-macsonic.c-missed-s-driver_unregister-platform_driver_unregister.txt ---
Subject: [PATCH] macsonic.c: missed s/driver_unregister/platform_driver_unregister/
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133681320 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/macsonic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 65d54cce8bb4ebe6c79f49eccf9c790b3ef9a9c7
ded5ca1f3b9ffa464fe5d4744fd09bba753ff4b7
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index 02d5c68..f6f3daf 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -622,7 +622,7 @@ static int __init mac_sonic_init_module(
 	return 0;
 
 out_unregister:
-	driver_unregister(&mac_sonic_driver);
+	platform_driver_unregister(&mac_sonic_driver);
 
 	return -ENOMEM;
 }
---
0.99.8.GIT


--- NEW FILE 3752-missing-include-of-asm-irq.h-in-drivers-net.txt ---
Subject: [PATCH] missing include of asm/irq.h in drivers/net
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133866384 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/tulip/xircom_cb.c  |    3 +++
 drivers/net/wan/hostess_sv11.c |    1 +
 drivers/net/wan/sealevel.c     |    1 +
 3 files changed, 5 insertions(+), 0 deletions(-)

applies-to: 6755ae998e3b1710ed1d30643aff4582c1960a4b
82729971e0f8ccf1f15567cc4f2c5389e0659eb2
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 60d1e05..42e9ffb 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -32,6 +32,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#ifdef CONFIG_NET_POLL_CONTROLLER
+#include <asm/irq.h>
+#endif
 
 #ifdef DEBUG
 #define enter(x)   printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 7db1d1d..cf5c805 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -29,6 +29,7 @@
 #include <linux/ioport.h>
 #include <net/arp.h>
 
+#include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 5380ddf..050e854 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <net/arp.h>
 
+#include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
---
0.99.8.GIT


--- NEW FILE 3753-bogus-include-of-linux-irq.h-in-7990.c.txt ---
Subject: [PATCH] bogus include of linux/irq.h in 7990.c
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133437495 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/7990.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 1618283083d7b6b5c035e183b555aaa8a90f8480
3c13958620f08c8082a2694e51dec32592438388
diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 18b027e..86633c5 100644
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/skbuff.h>
-#include <linux/irq.h>
+#include <asm/irq.h>
 /* Used for the temporal inet entries and routing */
 #include <linux/socket.h>
 #include <linux/bitops.h>
---
0.99.8.GIT


--- NEW FILE 3754-wrong-ifdefs-in-82596.c.txt ---
Subject: [PATCH] wrong ifdefs in 82596.c
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133438039 -0500

ifdefs around variable declaration would better match those around its uses...

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/82596.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 8b14e1b6a4e7f7a884f4f558206d35dccd10c1ba
0018dfa48e171315ce7f0ea689e34b67af926e19
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 13b745b..da0c878 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -614,7 +614,7 @@ static void rebuild_rx_bufs(struct net_d
 static int init_i596_mem(struct net_device *dev)
 {
 	struct i596_private *lp = dev->priv;
-#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) || defined(ENABLE_APRICOT)
 	short ioaddr = dev->base_addr;
 #endif
 	unsigned long flags;
---
0.99.8.GIT


--- NEW FILE 3755-dead-code-removed-in-hp100.txt ---
Subject: [PATCH] dead code removed in hp100
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1135281172 -0500

for mode 2 (memory-mapped) we always set ->mem_ptr_virt; dead code removed.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/hp100.c |   30 ++++++++----------------------
 1 files changed, 8 insertions(+), 22 deletions(-)

applies-to: 02d3671f79172ea5ff00c173f41620202a7cde36
450d86dff3fc4780fd5c2d1654402ab7ffec9c38
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 55c7ed6..7ba87b7 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1718,17 +1718,10 @@ static int hp100_start_xmit(struct sk_bu
 	hp100_outw(i, FRAGMENT_LEN);	/* and first/only fragment length    */
 
 	if (lp->mode == 2) {	/* memory mapped */
-		if (lp->mem_ptr_virt) {	/* high pci memory was remapped */
-			/* Note: The J2585B needs alignment to 32bits here!  */
-			memcpy_toio(lp->mem_ptr_virt, skb->data, (skb->len + 3) & ~3);
-			if (!ok_flag)
-				memset_io(lp->mem_ptr_virt, 0, HP100_MIN_PACKET_SIZE - skb->len);
-		} else {
-			/* Note: The J2585B needs alignment to 32bits here!  */
-			isa_memcpy_toio(lp->mem_ptr_phys, skb->data, (skb->len + 3) & ~3);
-			if (!ok_flag)
-				isa_memset_io(lp->mem_ptr_phys, 0, HP100_MIN_PACKET_SIZE - skb->len);
-		}
+		/* Note: The J2585B needs alignment to 32bits here!  */
+		memcpy_toio(lp->mem_ptr_virt, skb->data, (skb->len + 3) & ~3);
+		if (!ok_flag)
+			memset_io(lp->mem_ptr_virt, 0, HP100_MIN_PACKET_SIZE - skb->len);
 	} else {		/* programmed i/o */
 		outsl(ioaddr + HP100_REG_DATA32, skb->data,
 		      (skb->len + 3) >> 2);
@@ -1798,10 +1791,7 @@ static void hp100_rx(struct net_device *
 		/* First we get the header, which contains information about the */
 		/* actual length of the received packet. */
 		if (lp->mode == 2) {	/* memory mapped mode */
-			if (lp->mem_ptr_virt)	/* if memory was remapped */
-				header = readl(lp->mem_ptr_virt);
-			else
-				header = isa_readl(lp->mem_ptr_phys);
+			header = readl(lp->mem_ptr_virt);
 		} else		/* programmed i/o */
 			header = hp100_inl(DATA32);
 
@@ -1833,13 +1823,9 @@ static void hp100_rx(struct net_device *
 			ptr = skb->data;
 
 			/* Now transfer the data from the card into that area */
-			if (lp->mode == 2) {
-				if (lp->mem_ptr_virt)
-					memcpy_fromio(ptr, lp->mem_ptr_virt,pkt_len);
-				/* Note alignment to 32bit transfers */
-				else
-					isa_memcpy_fromio(ptr, lp->mem_ptr_phys, pkt_len);
-			} else	/* io mapped */
+			if (lp->mode == 2)
+				memcpy_fromio(ptr, lp->mem_ptr_virt,pkt_len);
+			else	/* io mapped */
 				insl(ioaddr + HP100_REG_DATA32, ptr, pkt_len >> 2);
 
 			skb->protocol = eth_type_trans(skb, dev);
---
0.99.8.GIT


--- NEW FILE 3780-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt ---
Subject: [PATCH] [bcm43xx] add DEBUG Kconfig option. Also fix indention.
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138639400 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/Kconfig |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

applies-to: 40412e240a5440253ccc5aaa06203d7adb7c1767
a6e9abe0c39612a79acdf648702ae074138c4fe1
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 06bfeab..feb7fa2 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -488,12 +488,21 @@ source "drivers/net/wireless/hostap/Kcon
 source "drivers/net/wireless/tiacx/Kconfig"
 
 config BCM43XX
-       tristate "Broadcom BCM43xx wireless support"
-       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
+	tristate "Broadcom BCM43xx wireless support"
+	depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
 	select FW_LOADER
-       ---help---
-	This is an experimental driver for the Broadcom 43xx wireless chip,
-	found in the Apple Airport Extreme and various other devices.
+	---help---
+	  This is an experimental driver for the Broadcom 43xx wireless chip,
+	  found in the Apple Airport Extreme and various other devices.
+
+config BCM43XX_DEBUG
+	bool "Broadcom BCM43xx debugging (RECOMMENDED)"
+	depends on BCM43XX
+	default y
+	---help---
+	  Broadcom 43xx debugging messages.
+	  Say Y, because the driver is still very experimental and
+	  this will help you get it running.
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
---
0.99.8.GIT


--- NEW FILE 3782-ipw2100-Fix-setting-txpower-failed-problem.txt ---
Subject: [PATCH] ipw2100: Fix setting txpower failed problem
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138081772 +0800

The ipw2100 driver misunderstood the parameter of txpower.
Tx Power off means turn off the radio, but the driver interpret it as
"can't set txpower". So when getting the txpower, it sets disabled=1 to
the iwconifg tool in managed mode. And the tool will display "Tx Power off"
when disabled=1.

Now, in managed mode, iwconfig will not show "TX Power" if the radio is not
switched off. It will only display "Tx Power off" only if the radio is killed.

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

applies-to: b09b68bccc5d2bb695475b75094170c35370fb91
b6e4da72342cb075a2742c79e693c8edc1d55389
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 027352a..6290c9f 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -7114,11 +7114,17 @@ static int ipw2100_wx_set_txpow(struct n
 {
 	struct ipw2100_priv *priv = ieee80211_priv(dev);
 	int err = 0, value;
+	
+	if (ipw_radio_kill_sw(priv, wrqu->txpower.disabled))
+		return -EINPROGRESS;
 
 	if (priv->ieee->iw_mode != IW_MODE_ADHOC)
+		return 0;
+
+	if ((wrqu->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM)
 		return -EINVAL;
 
-	if (wrqu->txpower.disabled == 1 || wrqu->txpower.fixed == 0)
+	if (wrqu->txpower.fixed == 0)
 		value = IPW_TX_POWER_DEFAULT;
 	else {
 		if (wrqu->txpower.value < IPW_TX_POWER_MIN_DBM ||
@@ -7153,24 +7159,19 @@ static int ipw2100_wx_get_txpow(struct n
 
 	struct ipw2100_priv *priv = ieee80211_priv(dev);
 
-	if (priv->ieee->iw_mode != IW_MODE_ADHOC) {
-		wrqu->power.disabled = 1;
-		return 0;
-	}
+	wrqu->txpower.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
 
 	if (priv->tx_power == IPW_TX_POWER_DEFAULT) {
-		wrqu->power.fixed = 0;
-		wrqu->power.value = IPW_TX_POWER_MAX_DBM;
-		wrqu->power.disabled = 1;
+		wrqu->txpower.fixed = 0;
+		wrqu->txpower.value = IPW_TX_POWER_MAX_DBM;
 	} else {
-		wrqu->power.disabled = 0;
-		wrqu->power.fixed = 1;
-		wrqu->power.value = priv->tx_power;
+		wrqu->txpower.fixed = 1;
+		wrqu->txpower.value = priv->tx_power;
 	}
 
-	wrqu->power.flags = IW_TXPOW_DBM;
+	wrqu->txpower.flags = IW_TXPOW_DBM;
 
-	IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->power.value);
+	IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->txpower.value);
 
 	return 0;
 }
---
0.99.8.GIT


--- NEW FILE 3783-ipw2200-Fix-iwspy-ethx-off-causes-kernel-panic.txt ---
Subject: [PATCH] ipw2200: Fix "iwspy ethx off" causes kernel panic
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091782 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: c21c089c15328273ceb350ea0d71c928e4c0277f
f73cb83f1ace1a4bd3c57ae33f5c6c8bac9c0946
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 4c28e33..877fdaf 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -11035,7 +11035,6 @@ static int ipw_pci_probe(struct pci_dev 
 	net_dev->set_multicast_list = ipw_net_set_multicast_list;
 	net_dev->set_mac_address = ipw_net_set_mac_address;
 	priv->wireless_data.spy_data = &priv->ieee->spy_data;
-	priv->wireless_data.ieee80211 = priv->ieee;
 	net_dev->wireless_data = &priv->wireless_data;
 	net_dev->wireless_handlers = &ipw_wx_handler_def;
 	net_dev->ethtool_ops = &ipw_ethtool_ops;
---
0.99.8.GIT


--- NEW FILE 3784-ipw2200-Fix-sw_reset-doesn-t-clear-the-static-essid-problem.txt ---
Subject: [PATCH] ipw2200: Fix sw_reset doesn't clear the static essid problem
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091791 +0800

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

applies-to: ce9a268bbcbcc2c130355e98b6cf5383c2b145e9
17ed081deed479702ee4896f6de40aa32ecd6644
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 877fdaf..bc18bcb 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -8012,6 +8012,10 @@ static int ipw_sw_reset(struct ipw_priv 
 	else
 		IPW_DEBUG_INFO("Auto adhoc creation disabled.\n");
 
+	priv->config &= ~CFG_STATIC_ESSID;
+	priv->essid_len = 0;
+	memset(priv->essid, 0, IW_ESSID_MAX_SIZE);
+
 	if (disable) {
 		priv->status |= STATUS_RF_KILL_SW;
 		IPW_DEBUG_INFO("Radio disabled.\n");
---
0.99.8.GIT


--- NEW FILE 3785-ipw2200-Fix-a-variable-referenced-after-kfree-bug.txt ---
Subject: [PATCH] ipw2200: Fix a variable referenced after kfree() bug
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091861 +0800

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: c45447aed379c000bd14ae21c63a947641ad53d4
489f4458cd98592d0bc527d4a5ac1c1393aaf254
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index bc18bcb..916b24c 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -11124,8 +11124,8 @@ static void ipw_pci_remove(struct pci_de
 	/* Free MAC hash list for ADHOC */
 	for (i = 0; i < IPW_IBSS_MAC_HASH_SIZE; i++) {
 		list_for_each_safe(p, q, &priv->ibss_mac_hash[i]) {
-			kfree(list_entry(p, struct ipw_ibss_seq, list));
 			list_del(p);
+			kfree(list_entry(p, struct ipw_ibss_seq, list));
 		}
 	}
 
---
0.99.8.GIT


--- NEW FILE 3786-Typo-corrections-for-ieee80211.txt ---
Subject: [PATCH] Typo corrections for ieee80211
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: 1138635744 -0600

This patch, generated against 2.6.16-rc1-git4, corrects two typographical
errors in ieee80211_rx.c and adds the facility name to a bare printk.

Signed-Off-By: Larry Finger <Larry.Finger at lwfinger.net>

Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: a051e20f92bb9e67471940637a6dfba7c2cf946c
1a1fedf4d3e27c920b8de92a429011fb11c89028
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 695d047..960aa78 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1451,7 +1451,7 @@ void ieee80211_rx_mgt(struct ieee80211_d
 		break;
 
 	case IEEE80211_STYPE_PROBE_REQ:
-		IEEE80211_DEBUG_MGMT("recieved auth (%d)\n",
+		IEEE80211_DEBUG_MGMT("received auth (%d)\n",
 				     WLAN_FC_GET_STYPE(le16_to_cpu
 						       (header->frame_ctl)));
 
@@ -1485,7 +1485,7 @@ void ieee80211_rx_mgt(struct ieee80211_d
 		break;
 	case IEEE80211_STYPE_AUTH:
 
-		IEEE80211_DEBUG_MGMT("recieved auth (%d)\n",
+		IEEE80211_DEBUG_MGMT("received auth (%d)\n",
 				     WLAN_FC_GET_STYPE(le16_to_cpu
 						       (header->frame_ctl)));
 
---
0.99.8.GIT


--- NEW FILE 3787-PCMCIA-m-HOSTAP_CS-y-is-not-a-legal-configuration.txt ---
Subject: [PATCH] PCMCIA=m, HOSTAP_CS=y is not a legal configuration
From: Adrian Bunk <bunk at stusta.de>
Date: 1138645397 +0100

CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile.

Reported by "Gabriel C." <crazy at pimpmylinux.org>.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/hostap/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: cfc243d60289014cf64a8cc49c2609242601b03a
ae7ec20582de0867abda66ad06d468ce12b231f2
diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/hostap/Kconfig
index c8f6286..308f773 100644
--- a/drivers/net/wireless/hostap/Kconfig
+++ b/drivers/net/wireless/hostap/Kconfig
@@ -75,7 +75,7 @@ config HOSTAP_PCI
 
 config HOSTAP_CS
 	tristate "Host AP driver for Prism2/2.5/3 PC Cards"
-	depends on PCMCIA!=n && HOSTAP
+	depends on PCMCIA && HOSTAP
 	---help---
 	Host AP driver's version for Prism2/2.5/3 PC Cards.
 
---
0.99.8.GIT


--- NEW FILE 3790-SCTP-correct-the-number-of-INIT-retransmissions.txt ---
Subject: [PATCH] [SCTP]: correct the number of INIT retransmissions
From: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: 1138665594 -0800

We currently count the initial INIT/COOKIE_ECHO chunk toward the
retransmit count and thus sends a total of sctp_max_retrans_init chunks.
The correct behavior is to retransmit the chunk sctp_max_retrans_init in
addition to sending the original.

Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: Sridhar Samudrala <sri at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/sctp/sm_statefuns.c |    6 +++---
 net/sctp/socket.c       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

applies-to: 84cf4e20ce5038cb701373c6d9f97195dfd23dfc
81845c21dc1ec7ce2bf12845dbc01e4880f9ea9a
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 71c9a96..018f169 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -2122,7 +2122,7 @@ static sctp_disposition_t sctp_sf_do_5_2
 	struct sctp_bind_addr *bp;
 	int attempts = asoc->init_err_counter + 1;
 
-	if (attempts >= asoc->max_init_attempts) {
+	if (attempts > asoc->max_init_attempts) {
 		sctp_add_cmd_sf(commands, SCTP_CMD_INIT_FAILED,
 				SCTP_U32(SCTP_ERROR_STALE_COOKIE));
 		return SCTP_DISPOSITION_DELETE_TCB;
@@ -4640,7 +4640,7 @@ sctp_disposition_t sctp_sf_t1_init_timer
 
 	SCTP_DEBUG_PRINTK("Timer T1 expired (INIT).\n");
 
-	if (attempts < asoc->max_init_attempts) {
+	if (attempts <= asoc->max_init_attempts) {
 		bp = (struct sctp_bind_addr *) &asoc->base.bind_addr;
 		repl = sctp_make_init(asoc, bp, GFP_ATOMIC, 0);
 		if (!repl)
@@ -4697,7 +4697,7 @@ sctp_disposition_t sctp_sf_t1_cookie_tim
 
 	SCTP_DEBUG_PRINTK("Timer T1 expired (COOKIE-ECHO).\n");
 
-	if (attempts < asoc->max_init_attempts) {
+	if (attempts <= asoc->max_init_attempts) {
 		repl = sctp_make_cookie_echo(asoc, NULL);
 		if (!repl)
 			return SCTP_DISPOSITION_NOMEM;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index fb1821d..0ea947e 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5426,7 +5426,7 @@ out:
 	return err;
 
 do_error:
-	if (asoc->init_err_counter + 1 >= asoc->max_init_attempts)
+	if (asoc->init_err_counter + 1 > asoc->max_init_attempts)
 		err = -ETIMEDOUT;
 	else
 		err = -ECONNREFUSED;
---
0.99.8.GIT


--- NEW FILE 3791-SCTP-heartbeats-exceed-maximum-retransmssion-limit.txt ---
Subject: [PATCH] [SCTP]: heartbeats exceed maximum retransmssion limit
From: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: 1138665640 -0800

The number of HEARTBEAT chunks that an association may transmit is
limited by Association.Max.Retrans count; however, the code allows
us to send one extra heartbeat.

This patch limits the number of heartbeats to the maximum count.

Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: Sridhar Samudrala <sri at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/sctp/sm_statefuns.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 70bcfbad6cb4076b16da72f7c7f31be65b7e7dfc
e2c2fc2c8f3750e1f7ffbb3ac2b885a49416110c
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 018f169..2b9a832 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -884,7 +884,7 @@ sctp_disposition_t sctp_sf_sendbeat_8_3(
 {
 	struct sctp_transport *transport = (struct sctp_transport *) arg;
 
-	if (asoc->overall_error_count > asoc->max_retrans) {
+	if (asoc->overall_error_count >= asoc->max_retrans) {
 		/* CMD_ASSOC_FAILED calls CMD_DELETE_TCB. */
 		sctp_add_cmd_sf(commands, SCTP_CMD_ASSOC_FAILED,
 				SCTP_U32(SCTP_ERROR_NO_ERROR));
---
0.99.8.GIT


--- NEW FILE 3796-AIRO-_CS-CRYPTO-fixes.txt ---
Subject: [PATCH] AIRO{,_CS} <-> CRYPTO fixes
From: Adrian Bunk <bunk at stusta.de>
Date: 1137803715 +0100

CRYPTO is a helper variable, and to make it easier for users, it should
therefore select'ed and not be listed in the dependencies.

drivers/net/wireless/airo.c requires CONFIG_CRYPTO for compilations.

Therefore, AIRO_CS also has to CRYPTO.

Additionally, this patch removes the #ifdef's for the non-compiling
CRYPTO=n case from drivers/net/wireless/airo.c.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/Kconfig |    4 ++-
 drivers/net/wireless/airo.c  |   55 ++----------------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)

applies-to: 8b63a48c3c063a5cdebeef29f05e698c7143bdf7
a39d3e796cd2df8576c0418faa2c3833153bb3a9
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 9ccfec5..3de5f1d 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -240,7 +240,8 @@ config IPW2200_DEBUG
 
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
-	depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN)
+ 	depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)
+	select CRYPTO
 	---help---
 	  This is the standard Linux driver to support Cisco/Aironet ISA and
 	  PCI 802.11 wireless cards.
@@ -388,6 +389,7 @@ config PCMCIA_SPECTRUM
 config AIRO_CS
 	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
 	depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
+	select CRYPTO
 	---help---
 	  This is the standard Linux driver to support Cisco/Aironet PCMCIA
 	  802.11 wireless cards.  This driver is the same as the Aironet
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index a4c7ae9..9c577f7 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -36,6 +36,7 @@
 #include <linux/in.h>
 #include <linux/bitops.h>
 #include <linux/scatterlist.h>
+#include <linux/crypto.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
@@ -87,14 +88,6 @@ static struct pci_driver airo_driver = {
 #include <linux/delay.h>
 #endif
 
-/* Support Cisco MIC feature */
-#define MICSUPPORT
-
-#if defined(MICSUPPORT) && !defined(CONFIG_CRYPTO)
-#warning MIC support requires Crypto API
-#undef MICSUPPORT
-#endif
-
 /* Hack to do some power saving */
 #define POWER_ON_DOWN
 
@@ -1118,7 +1111,6 @@ static int readrids(struct net_device *d
 static int writerids(struct net_device *dev, aironet_ioctl *comp);
 static int flashcard(struct net_device *dev, aironet_ioctl *comp);
 #endif /* CISCO_EXT */
-#ifdef MICSUPPORT
 static void micinit(struct airo_info *ai);
 static int micsetup(struct airo_info *ai);
 static int encapsulate(struct airo_info *ai, etherHead *pPacket, MICBuffer *buffer, int len);
@@ -1127,9 +1119,6 @@ static int decapsulate(struct airo_info 
 static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid, u8 rssi);
 static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid, u8 dbm);
 
-#include <linux/crypto.h>
-#endif
-
 struct airo_info {
 	struct net_device_stats	stats;
 	struct net_device             *dev;
@@ -1190,12 +1179,10 @@ struct airo_info {
 	unsigned long		scan_timestamp;	/* Time started to scan */
 	struct iw_spy_data	spy_data;
 	struct iw_public_data	wireless_data;
-#ifdef MICSUPPORT
 	/* MIC stuff */
 	struct crypto_tfm	*tfm;
 	mic_module		mod[2];
 	mic_statistics		micstats;
-#endif
 	HostRxDesc rxfids[MPI_MAX_FIDS]; // rx/tx/config MPI350 descriptors
 	HostTxDesc txfids[MPI_MAX_FIDS];
 	HostRidDesc config_desc;
@@ -1229,7 +1216,6 @@ static int flashgchar(struct airo_info *
 static int flashputbuf(struct airo_info *ai);
 static int flashrestart(struct airo_info *ai,struct net_device *dev);
 
-#ifdef MICSUPPORT
 /***********************************************************************
  *                              MIC ROUTINES                           *
  ***********************************************************************
@@ -1686,7 +1672,6 @@ static void emmh32_final(emmh32_context 
 	digest[2] = (val>>8) & 0xFF;
 	digest[3] = val & 0xFF;
 }
-#endif
 
 static int readBSSListRid(struct airo_info *ai, int first,
 		      BSSListRid *list) {
@@ -2005,7 +1990,6 @@ static int mpi_send_packet (struct net_d
 	 * Firmware automaticly puts 802 header on so
 	 * we don't need to account for it in the length
 	 */
-#ifdef MICSUPPORT
 	if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled &&
 		(ntohs(((u16 *)buffer)[6]) != 0x888E)) {
 		MICBuffer pMic;
@@ -2022,9 +2006,7 @@ static int mpi_send_packet (struct net_d
 		memcpy (sendbuf, &pMic, sizeof(pMic));
 		sendbuf += sizeof(pMic);
 		memcpy (sendbuf, buffer, len - sizeof(etherHead));
-	} else
-#endif
-	{
+	} else {
 		*payloadLen = cpu_to_le16(len - sizeof(etherHead));
 
 		dev->trans_start = jiffies;
@@ -2400,9 +2382,7 @@ void stop_airo_card( struct net_device *
 				ai->shared, ai->shared_dma);
 		}
         }
-#ifdef MICSUPPORT
 	crypto_free_tfm(ai->tfm);
-#endif
 	del_airo_dev( dev );
 	free_netdev( dev );
 }
@@ -2726,9 +2706,7 @@ static struct net_device *_init_airo_car
 	ai->thr_pid = kernel_thread(airo_thread, dev, CLONE_FS | CLONE_FILES);
 	if (ai->thr_pid < 0)
 		goto err_out_free;
-#ifdef MICSUPPORT
 	ai->tfm = NULL;
-#endif
 	rc = add_airo_dev( dev );
 	if (rc)
 		goto err_out_thr;
@@ -2969,10 +2947,8 @@ static int airo_thread(void *data) {
 			airo_read_wireless_stats(ai);
 		else if (test_bit(JOB_PROMISC, &ai->flags))
 			airo_set_promisc(ai);
-#ifdef MICSUPPORT
 		else if (test_bit(JOB_MIC, &ai->flags))
 			micinit(ai);
-#endif
 		else if (test_bit(JOB_EVENT, &ai->flags))
 			airo_send_event(dev);
 		else if (test_bit(JOB_AUTOWEP, &ai->flags))
@@ -3010,12 +2986,10 @@ static irqreturn_t airo_interrupt ( int 
 
 		if ( status & EV_MIC ) {
 			OUT4500( apriv, EVACK, EV_MIC );
-#ifdef MICSUPPORT
 			if (test_bit(FLAG_MIC_CAPABLE, &apriv->flags)) {
 				set_bit(JOB_MIC, &apriv->flags);
 				wake_up_interruptible(&apriv->thr_wait);
 			}
-#endif
 		}
 		if ( status & EV_LINK ) {
 			union iwreq_data	wrqu;
@@ -3194,11 +3168,8 @@ static irqreturn_t airo_interrupt ( int 
 				}
 				bap_read (apriv, buffer + hdrlen/2, len, BAP0);
 			} else {
-#ifdef MICSUPPORT
 				MICBuffer micbuf;
-#endif
 				bap_read (apriv, buffer, ETH_ALEN*2, BAP0);
-#ifdef MICSUPPORT
 				if (apriv->micstats.enabled) {
 					bap_read (apriv,(u16*)&micbuf,sizeof(micbuf),BAP0);
 					if (ntohs(micbuf.typelen) > 0x05DC)
@@ -3211,15 +3182,10 @@ static irqreturn_t airo_interrupt ( int 
 						skb_trim (skb, len + hdrlen);
 					}
 				}
-#endif
 				bap_read(apriv,buffer+ETH_ALEN,len,BAP0);
-#ifdef MICSUPPORT
 				if (decapsulate(apriv,&micbuf,(etherHead*)buffer,len)) {
 badmic:
 					dev_kfree_skb_irq (skb);
-#else
-				if (0) {
-#endif
 badrx:
 					OUT4500( apriv, EVACK, EV_RX);
 					goto exitrx;
@@ -3430,10 +3396,8 @@ static void mpi_receive_802_3(struct air
 	int len = 0;
 	struct sk_buff *skb;
 	char *buffer;
-#ifdef MICSUPPORT
 	int off = 0;
 	MICBuffer micbuf;
-#endif
 
 	memcpy_fromio(&rxd, ai->rxfids[0].card_ram_off, sizeof(rxd));
 	/* Make sure we got something */
@@ -3448,7 +3412,6 @@ static void mpi_receive_802_3(struct air
 			goto badrx;
 		}
 		buffer = skb_put(skb,len);
-#ifdef MICSUPPORT
 		memcpy(buffer, ai->rxfids[0].virtual_host_addr, ETH_ALEN * 2);
 		if (ai->micstats.enabled) {
 			memcpy(&micbuf,
@@ -3470,9 +3433,6 @@ badmic:
 			dev_kfree_skb_irq (skb);
 			goto badrx;
 		}
-#else
-		memcpy(buffer, ai->rxfids[0].virtual_host_addr, len);
-#endif
 #ifdef WIRELESS_SPY
 		if (ai->spy_data.spy_number > 0) {
 			char *sa;
@@ -3689,13 +3649,11 @@ static u16 setup_card(struct airo_info *
 		ai->config.authType = AUTH_OPEN;
 		ai->config.modulation = MOD_CCK;
 
-#ifdef MICSUPPORT
 		if ((cap_rid.len>=sizeof(cap_rid)) && (cap_rid.extSoftCap&1) &&
 		    (micsetup(ai) == SUCCESS)) {
 			ai->config.opmode |= MODE_MIC;
 			set_bit(FLAG_MIC_CAPABLE, &ai->flags);
 		}
-#endif
 
 		/* Save off the MAC */
 		for( i = 0; i < ETH_ALEN; i++ ) {
@@ -4170,15 +4128,12 @@ static int transmit_802_3_packet(struct 
 	}
 	len -= ETH_ALEN * 2;
 
-#ifdef MICSUPPORT
 	if (test_bit(FLAG_MIC_CAPABLE, &ai->flags) && ai->micstats.enabled && 
 	    (ntohs(((u16 *)pPacket)[6]) != 0x888E)) {
 		if (encapsulate(ai,(etherHead *)pPacket,&pMic,len) != SUCCESS)
 			return ERROR;
 		miclen = sizeof(pMic);
 	}
-#endif
-
 	// packet is destination[6], source[6], payload[len-12]
 	// write the payload length and dst/src/payload
 	if (bap_setup(ai, txFid, 0x0036, BAP1) != SUCCESS) return ERROR;
@@ -7270,13 +7225,11 @@ static int readrids(struct net_device *d
 	case AIROGSTAT:     ridcode = RID_STATUS;       break;
 	case AIROGSTATSD32: ridcode = RID_STATSDELTA;   break;
 	case AIROGSTATSC32: ridcode = RID_STATS;        break;
-#ifdef MICSUPPORT
 	case AIROGMICSTATS:
 		if (copy_to_user(comp->data, &ai->micstats,
 				 min((int)comp->len,(int)sizeof(ai->micstats))))
 			return -EFAULT;
 		return 0;
-#endif
 	case AIRORRID:      ridcode = comp->ridnum;     break;
 	default:
 		return -EINVAL;
@@ -7308,9 +7261,7 @@ static int readrids(struct net_device *d
 static int writerids(struct net_device *dev, aironet_ioctl *comp) {
 	struct airo_info *ai = dev->priv;
 	int  ridcode;
-#ifdef MICSUPPORT
         int  enabled;
-#endif
 	Resp      rsp;
 	static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
 	unsigned char *iobuf;
@@ -7367,11 +7318,9 @@ static int writerids(struct net_device *
 
 		PC4500_readrid(ai,RID_STATSDELTACLEAR,iobuf,RIDSIZE, 1);
 
-#ifdef MICSUPPORT
 		enabled = ai->micstats.enabled;
 		memset(&ai->micstats,0,sizeof(ai->micstats));
 		ai->micstats.enabled = enabled;
-#endif
 
 		if (copy_to_user(comp->data, iobuf,
 				 min((int)comp->len, (int)RIDSIZE))) {
---
0.99.8.GIT


--- NEW FILE 3797-drivers-net-wireless-ipw2100.c-make-ipw2100_wpa_assoc_frame-static.txt ---
Subject: [PATCH] drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
From: Adrian Bunk <bunk at stusta.de>
Date: 1137803796 +0100

This patch makes the needlessly global ipw2100_wpa_assoc_frame() static.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 6427f50efb949d7cd9a96a39183d643ccf111768
3c398b8612b210a159ec7ba5e5c3c341fb0d5eab
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 6290c9f..31c262c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5771,8 +5771,8 @@ static int ipw2100_wpa_set_auth_algs(str
 	return ret;
 }
 
-void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
-			     char *wpa_ie, int wpa_ie_len)
+static void ipw2100_wpa_assoc_frame(struct ipw2100_priv *priv,
+				    char *wpa_ie, int wpa_ie_len)
 {
 
 	struct ipw2100_wpa_assoc_frame frame;
---
0.99.8.GIT


--- NEW FILE 3798-drivers-net-wireless-ipw2200-possible-cleanups.txt ---
Subject: [PATCH] drivers/net/wireless/ipw2200: possible cleanups
From: Adrian Bunk <bunk at stusta.de>
Date: 1137803982 +0100

This patch contains the following possible cleanups:
- make needlessly global functions static
- "extern inline" -> "static inline"
- #if 0 the unused global function ipw_led_activity_on()

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |   33 ++++++++++++++++++---------------
 drivers/net/wireless/ipw2200.h |    4 ++--
 2 files changed, 20 insertions(+), 17 deletions(-)

applies-to: b026cc1cd7c7323a2cf16db76dfef5cdc65fbeea
a73e22b286bd162d10526521b34f2d6f37aac635
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 916b24c..2a834de 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -701,7 +701,7 @@ static void ipw_init_ordinals(struct ipw
 
 }
 
-u32 ipw_register_toggle(u32 reg)
+static u32 ipw_register_toggle(u32 reg)
 {
 	reg &= ~IPW_START_STANDBY;
 	if (reg & IPW_GATE_ODMA)
@@ -726,7 +726,7 @@ u32 ipw_register_toggle(u32 reg)
 #define LD_TIME_LINK_OFF 2700
 #define LD_TIME_ACT_ON 250
 
-void ipw_led_link_on(struct ipw_priv *priv)
+static void ipw_led_link_on(struct ipw_priv *priv)
 {
 	unsigned long flags;
 	u32 led;
@@ -769,7 +769,7 @@ static void ipw_bg_led_link_on(void *dat
 	up(&priv->sem);
 }
 
-void ipw_led_link_off(struct ipw_priv *priv)
+static void ipw_led_link_off(struct ipw_priv *priv)
 {
 	unsigned long flags;
 	u32 led;
@@ -847,6 +847,7 @@ static void __ipw_led_activity_on(struct
 	}
 }
 
+#if 0
 void ipw_led_activity_on(struct ipw_priv *priv)
 {
 	unsigned long flags;
@@ -854,8 +855,9 @@ void ipw_led_activity_on(struct ipw_priv
 	__ipw_led_activity_on(priv);
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
+#endif  /*  0  */
 
-void ipw_led_activity_off(struct ipw_priv *priv)
+static void ipw_led_activity_off(struct ipw_priv *priv)
 {
 	unsigned long flags;
 	u32 led;
@@ -890,7 +892,7 @@ static void ipw_bg_led_activity_off(void
 	up(&priv->sem);
 }
 
-void ipw_led_band_on(struct ipw_priv *priv)
+static void ipw_led_band_on(struct ipw_priv *priv)
 {
 	unsigned long flags;
 	u32 led;
@@ -925,7 +927,7 @@ void ipw_led_band_on(struct ipw_priv *pr
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-void ipw_led_band_off(struct ipw_priv *priv)
+static void ipw_led_band_off(struct ipw_priv *priv)
 {
 	unsigned long flags;
 	u32 led;
@@ -948,24 +950,24 @@ void ipw_led_band_off(struct ipw_priv *p
 	spin_unlock_irqrestore(&priv->lock, flags);
 }
 
-void ipw_led_radio_on(struct ipw_priv *priv)
+static void ipw_led_radio_on(struct ipw_priv *priv)
 {
 	ipw_led_link_on(priv);
 }
 
-void ipw_led_radio_off(struct ipw_priv *priv)
+static void ipw_led_radio_off(struct ipw_priv *priv)
 {
 	ipw_led_activity_off(priv);
 	ipw_led_link_off(priv);
 }
 
-void ipw_led_link_up(struct ipw_priv *priv)
+static void ipw_led_link_up(struct ipw_priv *priv)
 {
 	/* Set the Link Led on for all nic types */
 	ipw_led_link_on(priv);
 }
 
-void ipw_led_link_down(struct ipw_priv *priv)
+static void ipw_led_link_down(struct ipw_priv *priv)
 {
 	ipw_led_activity_off(priv);
 	ipw_led_link_off(priv);
@@ -974,7 +976,7 @@ void ipw_led_link_down(struct ipw_priv *
 		ipw_led_radio_off(priv);
 }
 
-void ipw_led_init(struct ipw_priv *priv)
+static void ipw_led_init(struct ipw_priv *priv)
 {
 	priv->nic_type = priv->eeprom[EEPROM_NIC_TYPE];
 
@@ -1025,7 +1027,7 @@ void ipw_led_init(struct ipw_priv *priv)
 	}
 }
 
-void ipw_led_shutdown(struct ipw_priv *priv)
+static void ipw_led_shutdown(struct ipw_priv *priv)
 {
 	ipw_led_activity_off(priv);
 	ipw_led_link_off(priv);
@@ -6204,7 +6206,8 @@ static int ipw_wpa_set_auth_algs(struct 
 	return ret;
 }
 
-void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie, int wpa_ie_len)
+static void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie,
+				int wpa_ie_len)
 {
 	/* make sure WPA is enabled */
 	ipw_wpa_enable(priv, 1);
@@ -10059,7 +10062,7 @@ static void ipw_bg_rf_kill(void *data)
 	up(&priv->sem);
 }
 
-void ipw_link_up(struct ipw_priv *priv)
+static void ipw_link_up(struct ipw_priv *priv)
 {
 	priv->last_seq_num = -1;
 	priv->last_frag_num = -1;
@@ -10094,7 +10097,7 @@ static void ipw_bg_link_up(void *data)
 	up(&priv->sem);
 }
 
-void ipw_link_down(struct ipw_priv *priv)
+static void ipw_link_down(struct ipw_priv *priv)
 {
 	ipw_led_link_down(priv);
 	netif_carrier_off(priv->net_dev);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index e65620a..e2afa76 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -852,7 +852,7 @@ struct ipw_scan_request_ext {
 	u16 dwell_time[IPW_SCAN_TYPES];
 } __attribute__ ((packed));
 
-extern inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
+static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
 {
 	if (index % 2)
 		return scan->scan_type[index / 2] & 0x0F;
@@ -860,7 +860,7 @@ extern inline u8 ipw_get_scan_type(struc
 		return (scan->scan_type[index / 2] & 0xF0) >> 4;
 }
 
-extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
+static inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
 				     u8 index, u8 scan_type)
 {
 	if (index % 2)
---
0.99.8.GIT


--- NEW FILE 3799-ieee80211-trivial-fix-for-misplaced-s.txt ---
Subject: [PATCH] ieee80211: trivial fix for misplaced ()'s
From: Denis Vlasenko <vda at ilport.com.ua>
Date: 1137931030 +0200

Patch fixes misplaced (). Diffed against wireless-2.6.git

Signed-off-by: Denis Vlasenko <vda at ilport.com.ua>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 728562af8aa42a145cf9b591382b044a31e94fb4
9eafe76b8a5e1420cd6105bc11830914d90bddb4
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index e2f1553..c032b82 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -574,7 +574,7 @@ int ieee80211_rx(struct ieee80211_device
 	/* skb: hdr + (possibly fragmented) plaintext payload */
 	// PR: FIXME: hostap has additional conditions in the "if" below:
 	// ieee->host_decrypt && (fc & IEEE80211_FCTL_PROTECTED) &&
-	if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
+	if ((frag != 0) || (fc & IEEE80211_FCTL_MOREFRAGS)) {
 		int flen;
 		struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr);
 		IEEE80211_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);
---
0.99.8.GIT


--- NEW FILE 3800-ipw2100-Add-LEAP-authentication-algorithm-support.txt ---
Subject: [PATCH] ipw2100: Add LEAP authentication algorithm support
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138081733 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |   12 +++++++++---
 drivers/net/wireless/ipw2100.h |    6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

applies-to: ccee0929ee13ebd46d92811688b08d3f355b21e4
cbbdd03fadeddd02efec05ccfd4e6870ed913762
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 31c262c..b73af77 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5365,9 +5365,12 @@ static int ipw2100_configure_security(st
 						     SEC_LEVEL_0, 0, 1);
 	} else {
 		auth_mode = IPW_AUTH_OPEN;
-		if ((priv->ieee->sec.flags & SEC_AUTH_MODE) &&
-		    (priv->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY))
-			auth_mode = IPW_AUTH_SHARED;
+		if (priv->ieee->sec.flags & SEC_AUTH_MODE) {
+			if (priv->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY)
+				auth_mode = IPW_AUTH_SHARED;
+			else if (priv->ieee->sec.auth_mode == WLAN_AUTH_LEAP)
+				auth_mode = IPW_AUTH_LEAP_CISCO_ID;
+		}
 
 		sec_level = SEC_LEVEL_0;
 		if (priv->ieee->sec.flags & SEC_LEVEL)
@@ -5760,6 +5763,9 @@ static int ipw2100_wpa_set_auth_algs(str
 	} else if (value & IW_AUTH_ALG_OPEN_SYSTEM) {
 		sec.auth_mode = WLAN_AUTH_OPEN;
 		ieee->open_wep = 1;
+	} else if (value & IW_AUTH_ALG_LEAP) {
+		sec.auth_mode = WLAN_AUTH_LEAP;
+		ieee->open_wep = 1;
 	} else
 		return -EINVAL;
 
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index f6c5144..5136091 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -392,8 +392,10 @@ struct ipw2100_notification {
 #define IPW_WEP104_CIPHER (1<<5)
 #define IPW_CKIP_CIPHER   (1<<6)
 
-#define	IPW_AUTH_OPEN     0
-#define	IPW_AUTH_SHARED   1
+#define	IPW_AUTH_OPEN     	0
+#define	IPW_AUTH_SHARED   	1
+#define IPW_AUTH_LEAP	  	2
+#define IPW_AUTH_LEAP_CISCO_ID	0x80
 
 struct statistic {
 	int value;
---
0.99.8.GIT


--- NEW FILE 3801-ipw2100-Make-iwconfig-txpower-setting-consistent-with-user-input.txt ---
Subject: [PATCH] ipw2100: Make iwconfig txpower setting consistent with user input
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138081741 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

applies-to: 7624f3cf850dda8fbb1f9f5a7e0d2108cdac1384
3173ca0b76879be1fb7af826ae4ce7ee733159ce
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index b73af77..80bfc1c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5107,12 +5107,13 @@ static int ipw2100_set_tx_power(struct i
 		.host_command_length = 4
 	};
 	int err = 0;
+	u32 tmp = tx_power;
 
 	if (tx_power != IPW_TX_POWER_DEFAULT)
-		tx_power = (tx_power - IPW_TX_POWER_MIN_DBM) * 16 /
-		    (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+		tmp = (tx_power - IPW_TX_POWER_MIN_DBM) * 16 /
+		      (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
 
-	cmd.host_command_parameters[0] = tx_power;
+	cmd.host_command_parameters[0] = tmp;
 
 	if (priv->ieee->iw_mode == IW_MODE_ADHOC)
 		err = ipw2100_hw_send_command(priv, &cmd);
---
0.99.8.GIT


--- NEW FILE 3802-ipw2100-Add-generic-geo-information.txt ---
Subject: [PATCH] ipw2100: Add generic geo information
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138081748 +0800

This patch fixes a BUG_ON for the latest ieee80211 change.

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

applies-to: fedfdd8e491e6a4496ee9dc78d55b3851aca1ae8
be6b3b15b511aededd89d1ebbc7b25d0edd1ccd3
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 80bfc1c..b560f5c 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1672,6 +1672,18 @@ static int ipw2100_start_scan(struct ipw
 	return err;
 }
 
+static const struct ieee80211_geo ipw_geos[] = {
+	{			/* Restricted */
+	 "---",
+	 .bg_channels = 14,
+	 .bg = {{2412, 1}, {2417, 2}, {2422, 3},
+		{2427, 4}, {2432, 5}, {2437, 6},
+		{2442, 7}, {2447, 8}, {2452, 9},
+		{2457, 10}, {2462, 11}, {2467, 12},
+		{2472, 13}, {2484, 14}},
+	 },
+};
+
 static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
 {
 	unsigned long flags;
@@ -1727,6 +1739,13 @@ static int ipw2100_up(struct ipw2100_pri
 		goto exit;
 	}
 
+	/* Initialize the geo */
+	if (ieee80211_set_geo(priv->ieee, &ipw_geos[0])) {
+		printk(KERN_WARNING DRV_NAME "Could not set geo\n");
+		return 0;
+	}
+	priv->ieee->freq_band = IEEE80211_24GHZ_BAND;
+
 	lock = LOCK_NONE;
 	if (ipw2100_set_ordinal(priv, IPW_ORD_PERS_DB_LOCK, &lock, &ord_len)) {
 		printk(KERN_ERR DRV_NAME
---
0.99.8.GIT


--- NEW FILE 3803-ipw2100-remove-white-space-and-better-format-the-code.txt ---
Subject: [PATCH] ipw2100: remove white space and better format the code
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138081760 +0800

Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: fcc97e33b4f4735bad76eb77a2e4e92ac171677f
8ed55a482e2f044bfb044295ee86ecd5744c9911
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index b560f5c..8393512 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -3769,7 +3769,7 @@ static ssize_t store_memory(struct devic
 	struct net_device *dev = priv->net_dev;
 	const char *p = buf;
 
-	(void) dev; /* kill unused-var warning for debug-only code */
+	(void)dev;		/* kill unused-var warning for debug-only code */
 
 	if (count < 1)
 		return count;
@@ -4089,7 +4089,7 @@ static ssize_t store_scan_age(struct dev
 	unsigned long val;
 	char *p = buffer;
 
-	(void) dev; /* kill unused-var warning for debug-only code */
+	(void)dev;		/* kill unused-var warning for debug-only code */
 
 	IPW_DEBUG_INFO("enter\n");
 
---
0.99.8.GIT


--- NEW FILE 3804-increase-ipw2100-driver-version-to-git-1.1.4.txt ---
Subject: [PATCH] increase ipw2100 driver version to git-1.1.4
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138090135 +0800

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2100.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: bcb5e3d219dc51d4aa2de069ec29bd983a44d22e
71aa122d8a510b79338e28e2d56326574642d000
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 8393512..eb79198 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -167,7 +167,7 @@ that only one external action is invoked
 
 #include "ipw2100.h"
 
-#define IPW2100_VERSION "1.1.3"
+#define IPW2100_VERSION "git-1.1.4"
 
 #define DRV_NAME	"ipw2100"
 #define DRV_VERSION	IPW2100_VERSION
---
0.99.8.GIT


--- NEW FILE 3805-ipw2200-Fix-indirect-SRAM-register-8-16-bit-write-routines.txt ---
Subject: [PATCH] ipw2200: Fix indirect SRAM/register 8/16-bit write routines
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091796 +0800

The indirect SRAM/register 8/16-bit write routines are broken for
non-dword-aligned destination addresses.

Fortunately, these routines are, so far, not used for non-dword-aligned
destinations, but here's a patch that fixes them, anyway.

The attached patch also adds comments for all direct/indirect I/O routine
variations.

Signed-off-by: Ben M Cahill <ben.m.cahill at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |   86 +++++++++++++++++++++++++++++++++-------
 drivers/net/wireless/ipw2200.h |   13 +++---
 2 files changed, 76 insertions(+), 23 deletions(-)

applies-to: 5f15ae085d4e1ef654ac8c409b0a13f6a0320e60
c8fe6679086a983c4c95a441f3246c7aaecab80a
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 2a834de..d7d24b6 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -227,12 +227,15 @@ static int snprintk_buf(u8 * output, siz
 	return total;
 }
 
+/* alias for 32-bit indirect read (for SRAM/reg above 4K), with debug wrapper */
 static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg);
 #define ipw_read_reg32(a, b) _ipw_read_reg32(a, b)
 
+/* alias for 8-bit indirect read (for SRAM/reg above 4K), with debug wrapper */
 static u8 _ipw_read_reg8(struct ipw_priv *ipw, u32 reg);
 #define ipw_read_reg8(a, b) _ipw_read_reg8(a, b)
 
+/* 8-bit indirect write (for SRAM/reg above 4K), with debug wrapper */
 static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value);
 static inline void ipw_write_reg8(struct ipw_priv *a, u32 b, u8 c)
 {
@@ -241,6 +244,7 @@ static inline void ipw_write_reg8(struct
 	_ipw_write_reg8(a, b, c);
 }
 
+/* 16-bit indirect write (for SRAM/reg above 4K), with debug wrapper */
 static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value);
 static inline void ipw_write_reg16(struct ipw_priv *a, u32 b, u16 c)
 {
@@ -249,6 +253,7 @@ static inline void ipw_write_reg16(struc
 	_ipw_write_reg16(a, b, c);
 }
 
+/* 32-bit indirect write (for SRAM/reg above 4K), with debug wrapper */
 static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value);
 static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c)
 {
@@ -257,48 +262,76 @@ static inline void ipw_write_reg32(struc
 	_ipw_write_reg32(a, b, c);
 }
 
+/* 8-bit direct write (low 4K) */
 #define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs))
+
+/* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */
 #define ipw_write8(ipw, ofs, val) \
  IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
  _ipw_write8(ipw, ofs, val)
 
+
+/* 16-bit direct write (low 4K) */
 #define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))
+
+/* 16-bit direct write (for low 4K of SRAM/regs), with debug wrapper */
 #define ipw_write16(ipw, ofs, val) \
  IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
  _ipw_write16(ipw, ofs, val)
 
+
+/* 32-bit direct write (low 4K) */
 #define _ipw_write32(ipw, ofs, val) writel((val), (ipw)->hw_base + (ofs))
+
+/* 32-bit direct write (for low 4K of SRAM/regs), with debug wrapper */
 #define ipw_write32(ipw, ofs, val) \
  IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
  _ipw_write32(ipw, ofs, val)
 
+
+/* 8-bit direct read (low 4K) */
 #define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))
+
+/* 8-bit direct read (low 4K), with debug wrapper */
 static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
 {
 	IPW_DEBUG_IO("%s %d: read_direct8(0x%08X)\n", f, l, (u32) (ofs));
 	return _ipw_read8(ipw, ofs);
 }
 
+/* alias to 8-bit direct read (low 4K of SRAM/regs), with debug wrapper */
 #define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)
 
+
+/* 16-bit direct read (low 4K) */
 #define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))
+
+/* 16-bit direct read (low 4K), with debug wrapper */
 static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
 {
 	IPW_DEBUG_IO("%s %d: read_direct16(0x%08X)\n", f, l, (u32) (ofs));
 	return _ipw_read16(ipw, ofs);
 }
 
+/* alias to 16-bit direct read (low 4K of SRAM/regs), with debug wrapper */
 #define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)
 
+
+/* 32-bit direct read (low 4K) */
 #define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))
+
+/* 32-bit direct read (low 4K), with debug wrapper */
 static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs)
 {
 	IPW_DEBUG_IO("%s %d: read_direct32(0x%08X)\n", f, l, (u32) (ofs));
 	return _ipw_read32(ipw, ofs);
 }
 
+/* alias to 32-bit direct read (low 4K of SRAM/regs), with debug wrapper */
 #define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)
 
+
+/* multi-byte read (above 4K), with debug wrapper */
 static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);
 static inline void __ipw_read_indirect(const char *f, int l,
 				       struct ipw_priv *a, u32 b, u8 * c, int d)
@@ -308,15 +341,17 @@ static inline void __ipw_read_indirect(c
 	_ipw_read_indirect(a, b, c, d);
 }
 
+/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */
 #define ipw_read_indirect(a, b, c, d) __ipw_read_indirect(__FILE__, __LINE__, a, b, c, d)
 
+/* alias to multi-byte read (SRAM/regs above 4K), with debug wrapper */
 static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * data,
 				int num);
 #define ipw_write_indirect(a, b, c, d) \
 	IPW_DEBUG_IO("%s %d: write_indirect(0x%08X) %d bytes\n", __FILE__, __LINE__, (u32)(b), d); \
 	_ipw_write_indirect(a, b, c, d)
 
-/* indirect write s */
+/* 32-bit indirect write (above 4K) */
 static void _ipw_write_reg32(struct ipw_priv *priv, u32 reg, u32 value)
 {
 	IPW_DEBUG_IO(" %p : reg = 0x%8X : value = 0x%8X\n", priv, reg, value);
@@ -324,22 +359,30 @@ static void _ipw_write_reg32(struct ipw_
 	_ipw_write32(priv, IPW_INDIRECT_DATA, value);
 }
 
+/* 8-bit indirect write (above 4K) */
 static void _ipw_write_reg8(struct ipw_priv *priv, u32 reg, u8 value)
 {
+	u32 aligned_addr = reg & IPW_INDIRECT_ADDR_MASK; /* dword align */
+	u32 dif_len = reg - aligned_addr;
+
 	IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
-	_ipw_write32(priv, IPW_INDIRECT_ADDR, reg & IPW_INDIRECT_ADDR_MASK);
-	_ipw_write8(priv, IPW_INDIRECT_DATA, value);
+	_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
+	_ipw_write8(priv, IPW_INDIRECT_DATA + dif_len, value);
 }
 
+/* 16-bit indirect write (above 4K) */
 static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value)
 {
+	u32 aligned_addr = reg & IPW_INDIRECT_ADDR_MASK; /* dword align */
+	u32 dif_len = (reg - aligned_addr) & (~0x1ul);
+
 	IPW_DEBUG_IO(" reg = 0x%8X : value = 0x%8X\n", reg, value);
-	_ipw_write32(priv, IPW_INDIRECT_ADDR, reg & IPW_INDIRECT_ADDR_MASK);
-	_ipw_write16(priv, IPW_INDIRECT_DATA, value);
+	_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
+	_ipw_write16(priv, IPW_INDIRECT_DATA + dif_len, value);
 }
 
-/* indirect read s */
 
+/* 8-bit indirect read (above 4K) */
 static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
 {
 	u32 word;
@@ -349,6 +392,7 @@ static u8 _ipw_read_reg8(struct ipw_priv
 	return (word >> ((reg & 0x3) * 8)) & 0xff;
 }
 
+/* 32-bit indirect read (above 4K) */
 static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
 {
 	u32 value;
@@ -361,11 +405,12 @@ static u32 _ipw_read_reg32(struct ipw_pr
 	return value;
 }
 
-/* iterative/auto-increment 32 bit reads and writes */
+/* General purpose, no alignment requirement, iterative (multi-byte) read, */
+/*    for area above 1st 4K of SRAM/reg space */
 static void _ipw_read_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
 			       int num)
 {
-	u32 aligned_addr = addr & IPW_INDIRECT_ADDR_MASK;
+	u32 aligned_addr = addr & IPW_INDIRECT_ADDR_MASK; /* dword align */
 	u32 dif_len = addr - aligned_addr;
 	u32 i;
 
@@ -375,7 +420,7 @@ static void _ipw_read_indirect(struct ip
 		return;
 	}
 
-	/* Read the first nibble byte by byte */
+	/* Read the first dword (or portion) byte by byte */
 	if (unlikely(dif_len)) {
 		_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
 		/* Start reading at aligned_addr + dif_len */
@@ -384,11 +429,12 @@ static void _ipw_read_indirect(struct ip
 		aligned_addr += 4;
 	}
 
+	/* Read all of the middle dwords as dwords, with auto-increment */
 	_ipw_write32(priv, IPW_AUTOINC_ADDR, aligned_addr);
 	for (; num >= 4; buf += 4, aligned_addr += 4, num -= 4)
 		*(u32 *) buf = _ipw_read32(priv, IPW_AUTOINC_DATA);
 
-	/* Copy the last nibble */
+	/* Read the last dword (or portion) byte by byte */
 	if (unlikely(num)) {
 		_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
 		for (i = 0; num > 0; i++, num--)
@@ -396,10 +442,12 @@ static void _ipw_read_indirect(struct ip
 	}
 }
 
+/* General purpose, no alignment requirement, iterative (multi-byte) write, */
+/*    for area above 1st 4K of SRAM/reg space */
 static void _ipw_write_indirect(struct ipw_priv *priv, u32 addr, u8 * buf,
 				int num)
 {
-	u32 aligned_addr = addr & IPW_INDIRECT_ADDR_MASK;
+	u32 aligned_addr = addr & IPW_INDIRECT_ADDR_MASK; /* dword align */
 	u32 dif_len = addr - aligned_addr;
 	u32 i;
 
@@ -409,20 +457,21 @@ static void _ipw_write_indirect(struct i
 		return;
 	}
 
-	/* Write the first nibble byte by byte */
+	/* Write the first dword (or portion) byte by byte */
 	if (unlikely(dif_len)) {
 		_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
-		/* Start reading at aligned_addr + dif_len */
+		/* Start writing at aligned_addr + dif_len */
 		for (i = dif_len; ((i < 4) && (num > 0)); i++, num--, buf++)
 			_ipw_write8(priv, IPW_INDIRECT_DATA + i, *buf);
 		aligned_addr += 4;
 	}
 
+	/* Write all of the middle dwords as dwords, with auto-increment */
 	_ipw_write32(priv, IPW_AUTOINC_ADDR, aligned_addr);
 	for (; num >= 4; buf += 4, aligned_addr += 4, num -= 4)
 		_ipw_write32(priv, IPW_AUTOINC_DATA, *(u32 *) buf);
 
-	/* Copy the last nibble */
+	/* Write the last dword (or portion) byte by byte */
 	if (unlikely(num)) {
 		_ipw_write32(priv, IPW_INDIRECT_ADDR, aligned_addr);
 		for (i = 0; num > 0; i++, num--, buf++)
@@ -430,17 +479,21 @@ static void _ipw_write_indirect(struct i
 	}
 }
 
+/* General purpose, no alignment requirement, iterative (multi-byte) write, */
+/*    for 1st 4K of SRAM/regs space */
 static void ipw_write_direct(struct ipw_priv *priv, u32 addr, void *buf,
 			     int num)
 {
 	memcpy_toio((priv->hw_base + addr), buf, num);
 }
 
+/* Set bit(s) in low 4K of SRAM/regs */
 static inline void ipw_set_bit(struct ipw_priv *priv, u32 reg, u32 mask)
 {
 	ipw_write32(priv, reg, ipw_read32(priv, reg) | mask);
 }
 
+/* Clear bit(s) in low 4K of SRAM/regs */
 static inline void ipw_clear_bit(struct ipw_priv *priv, u32 reg, u32 mask)
 {
 	ipw_write32(priv, reg, ipw_read32(priv, reg) & ~mask);
@@ -1076,6 +1129,7 @@ static DRIVER_ATTR(debug_level, S_IWUSR 
 
 static inline u32 ipw_get_event_log_len(struct ipw_priv *priv)
 {
+	/* length = 1st dword in log */
 	return ipw_read_reg32(priv, ipw_read32(priv, IPW_EVENT_LOG));
 }
 
@@ -2892,8 +2946,8 @@ static int ipw_load_ucode(struct ipw_pri
 	mdelay(1);
 
 	/* enable ucode store */
-	ipw_write_reg8(priv, DINO_CONTROL_REG, 0x0);
-	ipw_write_reg8(priv, DINO_CONTROL_REG, DINO_ENABLE_CS);
+	ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, 0x0);
+	ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, DINO_ENABLE_CS);
 	mdelay(1);
 
 	/* write ucode */
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index e2afa76..44ff763 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1406,13 +1406,6 @@ do { if (ipw_debug_level & (level)) \
 * Register bit definitions
 */
 
-/* Dino control registers bits */
-
-#define DINO_ENABLE_SYSTEM 0x80
-#define DINO_ENABLE_CS     0x40
-#define DINO_RXFIFO_DATA   0x01
-#define DINO_CONTROL_REG   0x00200000
-
 #define IPW_INTA_RW       0x00000008
 #define IPW_INTA_MASK_R   0x0000000C
 #define IPW_INDIRECT_ADDR 0x00000010
@@ -1459,6 +1452,12 @@ do { if (ipw_debug_level & (level)) \
 #define IPW_DOMAIN_0_END 0x1000
 #define CLX_MEM_BAR_SIZE 0x1000
 
+
+/* Dino/baseband control registers bits */
+
+#define DINO_ENABLE_SYSTEM 0x80   /* 1 = baseband processor on, 0 = reset */
+#define DINO_ENABLE_CS     0x40   /* 1 = enable ucode load */
+#define DINO_RXFIFO_DATA   0x01   /* 1 = data available */
 #define IPW_BASEBAND_CONTROL_STATUS	0X00200000
 #define IPW_BASEBAND_TX_FIFO_WRITE	0X00200004
 #define IPW_BASEBAND_RX_FIFO_READ	0X00200004
---
0.99.8.GIT


--- NEW FILE 3806-ipw2200-Mask-out-the-WEP_KEY-command-dump-from-debug-log-for-security-reason.txt ---
Subject: [PATCH] ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091804 +0800

Signed-off-by: Nick Kralevich <nick.ipw2200 at kralevich.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

applies-to: e218762630b2d321e4d970417835b70949fe8c65
f516dbcd7df76d468be98c343bc22e86ab7207fc
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index d7d24b6..b40bfa0 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1953,7 +1953,14 @@ static int ipw_send_cmd(struct ipw_priv 
 	IPW_DEBUG_HC("%s command (#%d) %d bytes: 0x%08X\n",
 		     get_cmd_string(cmd->cmd), cmd->cmd, cmd->len,
 		     priv->status);
-	printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);
+
+#ifndef DEBUG_CMD_WEP_KEY
+	if (cmd->cmd == IPW_CMD_WEP_KEY)
+		IPW_DEBUG_HC("WEP_KEY command masked out for secure.\n");
+	else
+#endif
+		printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);
+
 
 	rc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);
 	if (rc) {
---
0.99.8.GIT


--- NEW FILE 3807-ipw2200-Add-LEAP-authentication-algorithm-support.txt ---
Subject: [PATCH] ipw2200: Add LEAP authentication algorithm support
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091812 +0800

Signed-off-by: Hong Liu <hong.liu at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |   18 ++++++++++++------
 drivers/net/wireless/ipw2200.h |    7 ++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

applies-to: e13557dad21e95ff192d5df6036d36f3425b64e1
3e234b4e5768b4f783fc45f20be8c6515b875f17
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index b40bfa0..6716318 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6256,6 +6256,9 @@ static int ipw_wpa_set_auth_algs(struct 
 	} else if (value & IW_AUTH_ALG_OPEN_SYSTEM) {
 		sec.auth_mode = WLAN_AUTH_OPEN;
 		ieee->open_wep = 1;
+	} else if (value & IW_AUTH_ALG_LEAP) {
+		sec.auth_mode = WLAN_AUTH_LEAP;
+		ieee->open_wep = 1;
 	} else
 		return -EINVAL;
 
@@ -7116,19 +7119,22 @@ static int ipw_associate_network(struct 
 
 	memset(&priv->assoc_request, 0, sizeof(priv->assoc_request));
 	priv->assoc_request.channel = network->channel;
+	priv->assoc_request.auth_key = 0;
+
 	if ((priv->capability & CAP_PRIVACY_ON) &&
-	    (priv->capability & CAP_SHARED_KEY)) {
+	    (priv->ieee->sec.auth_mode == WLAN_AUTH_SHARED_KEY)) {
 		priv->assoc_request.auth_type = AUTH_SHARED_KEY;
 		priv->assoc_request.auth_key = priv->ieee->sec.active_key;
 
-		if ((priv->capability & CAP_PRIVACY_ON) &&
-		    (priv->ieee->sec.level == SEC_LEVEL_1) &&
+		if ((priv->ieee->sec.level == SEC_LEVEL_1) &&
 		    !(priv->ieee->host_encrypt || priv->ieee->host_decrypt))
 			ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP);
-	} else {
+
+	} else if ((priv->capability & CAP_PRIVACY_ON) &&
+		   (priv->ieee->sec.auth_mode == WLAN_AUTH_LEAP))
+		priv->assoc_request.auth_type = AUTH_LEAP;
+	else
 		priv->assoc_request.auth_type = AUTH_OPEN;
-		priv->assoc_request.auth_key = 0;
-	}
 
 	if (priv->ieee->wpa_ie_len) {
 		priv->assoc_request.policy_support = 0x02;	/* RSN active */
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 44ff763..5f32834 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1657,9 +1657,10 @@ enum {
 	IPW_FW_ERROR_FATAL_ERROR
 };
 
-#define AUTH_OPEN       0
-#define AUTH_SHARED_KEY 1
-#define AUTH_IGNORE     3
+#define AUTH_OPEN	0
+#define AUTH_SHARED_KEY	1
+#define AUTH_LEAP	2
+#define AUTH_IGNORE	3
 
 #define HC_ASSOCIATE      0
 #define HC_REASSOCIATE    1
---
0.99.8.GIT


--- NEW FILE 3808-ipw2200-Bluetooth-coexistence-support.txt ---
Subject: [PATCH] ipw2200: Bluetooth coexistence support
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091819 +0800

I've added a new module param "bt_coexist" which defaults to OFF.

This does not seem to fix the firmware restarts, but it does do "the
right thing" and disables something that we were enabling by default:
signaling the Bluetooth h/w which channel we're on (whether or not the
BT h/w was out there).

Signed-off-by: Ben M Cahill <ben.m.cahill at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |   20 +++++++++++++++++++-
 drivers/net/wireless/ipw2200.h |   35 +++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 15 deletions(-)

applies-to: f4c52593b5a7bb92dcdb966066c8d73b99209b4e
810dabd466fe70869b66ab64dd326b6153cef645
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 6716318..e6a23c2 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -55,6 +55,7 @@ static int associate = 1;
 static int auto_create = 1;
 static int led = 0;
 static int disable = 0;
+static int bt_coexist = 0;
 static int hwcrypto = 1;
 static const char ipw_modes[] = {
 	'a', 'b', 'g', '?'
@@ -9656,7 +9657,7 @@ static struct iw_statistics *ipw_get_wir
 static  void init_sys_config(struct ipw_sys_config *sys_config)
 {
 	memset(sys_config, 0, sizeof(struct ipw_sys_config));
-	sys_config->bt_coexistence = 1;	/* We may need to look into prvStaBtConfig */
+	sys_config->bt_coexistence = 0;
 	sys_config->answer_broadcast_ssid_probe = 0;
 	sys_config->accept_all_data_frames = 0;
 	sys_config->accept_non_directed_frames = 1;
@@ -10362,6 +10363,20 @@ static int ipw_config(struct ipw_priv *p
 
 	/* set basic system config settings */
 	init_sys_config(&priv->sys_config);
+
+	/* Support Bluetooth if we have BT h/w on board, and user wants to.
+	 * Does not support BT priority yet (don't abort or defer our Tx) */
+	if (bt_coexist) {
+		unsigned char bt_caps = priv->eeprom[EEPROM_SKU_CAPABILITY];	
+
+		if (bt_caps & EEPROM_SKU_CAP_BT_CHANNEL_SIG)
+			priv->sys_config.bt_coexistence
+				|= CFG_BT_COEXISTENCE_SIGNAL_CHNL;
+		if (bt_caps & EEPROM_SKU_CAP_BT_OOB)
+			priv->sys_config.bt_coexistence
+				|= CFG_BT_COEXISTENCE_OOB;
+	}
+
 	if (priv->ieee->iw_mode == IW_MODE_ADHOC)
 		priv->sys_config.answer_broadcast_ssid_probe = 1;
 	else
@@ -11351,6 +11366,9 @@ module_param(mode, int, 0444);
 MODULE_PARM_DESC(mode, "network mode (0=BSS,1=IBSS)");
 #endif
 
+module_param(bt_coexist, int, 0444);
+MODULE_PARM_DESC(bt_coexist, "enable bluetooth coexistence (default off)");
+
 module_param(hwcrypto, int, 0444);
 MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)");
 
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 5f32834..d6d7d9d 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1566,13 +1566,18 @@ do { if (ipw_debug_level & (level)) \
 #define EEPROM_BSS_CHANNELS_BG  (GET_EEPROM_ADDR(0x2c,LSB))	/* 2 bytes  */
 #define EEPROM_HW_VERSION       (GET_EEPROM_ADDR(0x72,LSB))	/* 2 bytes  */
 
-/* NIC type as found in the one byte EEPROM_NIC_TYPE  offset*/
+/* NIC type as found in the one byte EEPROM_NIC_TYPE offset */
 #define EEPROM_NIC_TYPE_0 0
 #define EEPROM_NIC_TYPE_1 1
 #define EEPROM_NIC_TYPE_2 2
 #define EEPROM_NIC_TYPE_3 3
 #define EEPROM_NIC_TYPE_4 4
 
+/* Bluetooth Coexistence capabilities as found in EEPROM_SKU_CAPABILITY */
+#define EEPROM_SKU_CAP_BT_CHANNEL_SIG  0x01 /* we can tell BT our channel # */
+#define EEPROM_SKU_CAP_BT_PRIORITY     0x02 /* BT can take priority over us */
+#define EEPROM_SKU_CAP_BT_OOB          0x04 /* we can signal BT out-of-band */
+
 #define FW_MEM_REG_LOWER_BOUND          0x00300000
 #define FW_MEM_REG_EEPROM_ACCESS        (FW_MEM_REG_LOWER_BOUND + 0x40)
 #define IPW_EVENT_REG                   (FW_MEM_REG_LOWER_BOUND + 0x04)
@@ -1869,21 +1874,23 @@ struct ipw_cmd_log {
 	struct host_cmd cmd;
 };
 
-#define CFG_BT_COEXISTENCE_MIN                  0x00
-#define CFG_BT_COEXISTENCE_DEFER                0x02
-#define CFG_BT_COEXISTENCE_KILL                 0x04
-#define CFG_BT_COEXISTENCE_WME_OVER_BT          0x08
-#define CFG_BT_COEXISTENCE_OOB                  0x10
-#define CFG_BT_COEXISTENCE_MAX                  0xFF
-#define CFG_BT_COEXISTENCE_DEF                  0x80	/* read Bt from EEPROM */
-
-#define CFG_CTS_TO_ITSELF_ENABLED_MIN	0x0
-#define CFG_CTS_TO_ITSELF_ENABLED_MAX	0x1
+/* SysConfig command parameters ... */
+/* bt_coexistence param */
+#define CFG_BT_COEXISTENCE_SIGNAL_CHNL  0x01 /* tell BT our chnl # */
+#define CFG_BT_COEXISTENCE_DEFER        0x02 /* defer our Tx if BT traffic */
+#define CFG_BT_COEXISTENCE_KILL         0x04 /* kill our Tx if BT traffic */
+#define CFG_BT_COEXISTENCE_WME_OVER_BT  0x08 /* multimedia extensions */
+#define CFG_BT_COEXISTENCE_OOB          0x10 /* signal BT via out-of-band */
+
+/* clear-to-send to self param */
+#define CFG_CTS_TO_ITSELF_ENABLED_MIN	0x00
+#define CFG_CTS_TO_ITSELF_ENABLED_MAX	0x01
 #define CFG_CTS_TO_ITSELF_ENABLED_DEF	CFG_CTS_TO_ITSELF_ENABLED_MIN
 
-#define CFG_SYS_ANTENNA_BOTH                      0x000
-#define CFG_SYS_ANTENNA_A                         0x001
-#define CFG_SYS_ANTENNA_B                         0x003
+/* Antenna diversity param (h/w can select best antenna, based on signal) */
+#define CFG_SYS_ANTENNA_BOTH            0x00 /* NIC selects best antenna */
+#define CFG_SYS_ANTENNA_A               0x01 /* force antenna A */
+#define CFG_SYS_ANTENNA_B               0x03 /* force antenna B */
 
 /*
  * The definitions below were lifted off the ipw2100 driver, which only
---
0.99.8.GIT


--- NEW FILE 3810-ipw2200-Make-LED-blinking-frequency-independent-of-HZ.txt ---
Subject: [PATCH] ipw2200: Make LED blinking frequency independent of HZ
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091830 +0800

Signed-off-by: Clemens Buchacher <drizzd at aon.at>.
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

applies-to: cf3b78c439b0c84f114702be7275280664a5ca9a
ede6111cae6a83fbb0b6b621b4333d1a3983c089
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index d3aa59d..37cd71c 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -776,9 +776,9 @@ static u32 ipw_register_toggle(u32 reg)
  * - On radio OFF, turn off any LEDs started during radio on
  *
  */
-#define LD_TIME_LINK_ON 300
-#define LD_TIME_LINK_OFF 2700
-#define LD_TIME_ACT_ON 250
+#define LD_TIME_LINK_ON msecs_to_jiffies(300)
+#define LD_TIME_LINK_OFF msecs_to_jiffies(2700)
+#define LD_TIME_ACT_ON msecs_to_jiffies(250)
 
 static void ipw_led_link_on(struct ipw_priv *priv)
 {
---
0.99.8.GIT


--- NEW FILE 3811-ipw2200-add-module-parameter-to-enable-disable-roaming.txt ---
Subject: [PATCH] ipw2200: add module parameter to enable/disable roaming
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091836 +0800

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

applies-to: e1471e6b1b95d1a3fe468f02dc60fe9afacd459b
4bfdb91dcff0dd4b70922de263ccffffb8fb1d16
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 37cd71c..624f295 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -57,6 +57,7 @@ static int led = 0;
 static int disable = 0;
 static int bt_coexist = 0;
 static int hwcrypto = 1;
+static int roaming = 1;
 static const char ipw_modes[] = {
 	'a', 'b', 'g', '?'
 };
@@ -4187,8 +4188,9 @@ static void ipw_handle_missed_beacon(str
 		return;
 	}
 
-	if (missed_count > priv->roaming_threshold &&
-	    missed_count <= priv->disassociate_threshold) {
+	if (roaming &&
+	    (missed_count > priv->roaming_threshold &&
+	     missed_count <= priv->disassociate_threshold)) {
 		/* If we are not already roaming, set the ROAM
 		 * bit in the status and kick off a scan.
 		 * This can happen several times before we reach
@@ -4216,7 +4218,6 @@ static void ipw_handle_missed_beacon(str
 	}
 
 	IPW_DEBUG_NOTIF("Missed beacon: %d\n", missed_count);
-
 }
 
 /**
@@ -11378,5 +11379,8 @@ module_param(cmdlog, int, 0444);
 MODULE_PARM_DESC(cmdlog,
 		 "allocate a ring buffer for logging firmware commands");
 
+module_param(roaming, int, 0444);
+MODULE_PARM_DESC(roaming, "enable roaming support (default on)");
+
 module_exit(ipw_exit);
 module_init(ipw_init);
---
0.99.8.GIT


--- NEW FILE 3812-ipw2200-Scale-firmware-loading-watchdog-with-the-firmware-size.txt ---
Subject: [PATCH] ipw2200: Scale firmware loading watchdog with the firmware size
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091842 +0800

I can't really help with why restarts happen, but the following patch
greatly increases the likelihood that a firmware reload will succeed
afterward on my thinkpad. It addresses two issues. First, sysfs module
loading and hotplug are asynchronous, and as such file operations on the
"loading" and "data" files are racy when you load 2 firmwares in quick
succession. Second, the timeout for DMAing the firmware needs to scale
with the size of the firmware being loaded. That is, the watchdog needs
to be on throughput, not on time alone.

I no longer get the firmware load errors, though this is at best a hacky
workaround for a racy interface. (Obviously, this does nothing to address
the fatal errors in firmware which cause reloads; it just causes the
initial loading and the reloads to work more often.)

Signed-off-by: Peter Jones <pjones at redhat.com>
Signed-off-by: Ben M Cahill <ben.m.cahill at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |  114 ++++++++++++++++++++++------------------
 1 files changed, 63 insertions(+), 51 deletions(-)

applies-to: 6755f4f008dbe8880b128cab6ebd9ae8b13ddc22
397ae121ee0116d3b4125d621f0ef528d1d52580
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 624f295..c42eb54 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2772,22 +2772,25 @@ static int ipw_fw_dma_add_buffer(struct 
 
 static int ipw_fw_dma_wait(struct ipw_priv *priv)
 {
-	u32 current_index = 0;
+	u32 current_index = 0, previous_index;
 	u32 watchdog = 0;
 
 	IPW_DEBUG_FW(">> : \n");
 
 	current_index = ipw_fw_dma_command_block_index(priv);
-	IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%8X\n",
+	IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%08X\n",
 			  (int)priv->sram_desc.last_cb_index);
 
 	while (current_index < priv->sram_desc.last_cb_index) {
 		udelay(50);
+		previous_index = current_index;
 		current_index = ipw_fw_dma_command_block_index(priv);
 
-		watchdog++;
-
-		if (watchdog > 400) {
+		if (previous_index < current_index) {
+			watchdog = 0;
+			continue;
+		}
+		if (++watchdog > 400) {
 			IPW_DEBUG_FW_INFO("Timeout\n");
 			ipw_fw_dma_dump_command_block(priv);
 			ipw_fw_dma_abort(priv);
@@ -3276,55 +3279,31 @@ static int ipw_load(struct ipw_priv *pri
 	const struct firmware *firmware = NULL;
 	const struct firmware *ucode = NULL;
 #endif
+	char *ucode_name;
+	char *fw_name;
 	int rc = 0, retries = 3;
 
-#ifdef CONFIG_PM
-	if (!fw_loaded) {
-#endif
-		rc = ipw_get_fw(priv, &bootfw, IPW_FW_NAME("boot"));
-		if (rc)
-			goto error;
-
-		switch (priv->ieee->iw_mode) {
-		case IW_MODE_ADHOC:
-			rc = ipw_get_fw(priv, &ucode,
-					IPW_FW_NAME("ibss_ucode"));
-			if (rc)
-				goto error;
-
-			rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("ibss"));
-			break;
-
+	switch (priv->ieee->iw_mode) {
+	case IW_MODE_ADHOC:
+		ucode_name = IPW_FW_NAME("ibss_ucode");
+		fw_name = IPW_FW_NAME("ibss");
+		break;
 #ifdef CONFIG_IPW2200_MONITOR
-		case IW_MODE_MONITOR:
-			rc = ipw_get_fw(priv, &ucode,
-					IPW_FW_NAME("sniffer_ucode"));
-			if (rc)
-				goto error;
-
-			rc = ipw_get_fw(priv, &firmware,
-					IPW_FW_NAME("sniffer"));
-			break;
+	case IW_MODE_MONITOR:
+		ucode_name = IPW_FW_NAME("sniffer_ucode");
+		fw_name = IPW_FW_NAME("sniffer");
+		break;
 #endif
-		case IW_MODE_INFRA:
-			rc = ipw_get_fw(priv, &ucode, IPW_FW_NAME("bss_ucode"));
-			if (rc)
-				goto error;
-
-			rc = ipw_get_fw(priv, &firmware, IPW_FW_NAME("bss"));
-			break;
-
-		default:
-			rc = -EINVAL;
-		}
-
-		if (rc)
-			goto error;
-
-#ifdef CONFIG_PM
-		fw_loaded = 1;
+	case IW_MODE_INFRA:
+		ucode_name = IPW_FW_NAME("bss_ucode");
+		fw_name = IPW_FW_NAME("bss");
+		break;
+	default:
+		rc = -EINVAL;
 	}
-#endif
+
+	if (rc < 0)
+		goto error;
 
 	if (!priv->rxq)
 		priv->rxq = ipw_rx_queue_alloc(priv);
@@ -3346,7 +3325,7 @@ static int ipw_load(struct ipw_priv *pri
 	ipw_stop_nic(priv);
 
 	rc = ipw_reset_nic(priv);
-	if (rc) {
+	if (rc < 0) {
 		IPW_ERROR("Unable to reset NIC\n");
 		goto error;
 	}
@@ -3354,6 +3333,15 @@ static int ipw_load(struct ipw_priv *pri
 	ipw_zero_memory(priv, IPW_NIC_SRAM_LOWER_BOUND,
 			IPW_NIC_SRAM_UPPER_BOUND - IPW_NIC_SRAM_LOWER_BOUND);
 
+#ifdef CONFIG_PM
+	if (!fw_loaded) {
+#endif
+		rc = ipw_get_fw(priv, &bootfw, IPW_FW_NAME("boot"));
+		if (rc < 0)
+			goto error;
+#ifdef CONFIG_PM
+	}
+#endif
 	/* DMA the initial boot firmware into the device */
 	rc = ipw_load_firmware(priv, bootfw->data + sizeof(struct fw_header),
 			       bootfw->size - sizeof(struct fw_header));
@@ -3377,6 +3365,16 @@ static int ipw_load(struct ipw_priv *pri
 	/* ack fw init done interrupt */
 	ipw_write32(priv, IPW_INTA_RW, IPW_INTA_BIT_FW_INITIALIZATION_DONE);
 
+#ifdef CONFIG_PM
+	if (!fw_loaded) {
+#endif
+		rc = ipw_get_fw(priv, &ucode, ucode_name);
+		if (rc < 0)
+			goto error;
+#ifdef CONFIG_PM
+	}
+#endif
+			
 	/* DMA the ucode into the device */
 	rc = ipw_load_ucode(priv, ucode->data + sizeof(struct fw_header),
 			    ucode->size - sizeof(struct fw_header));
@@ -3388,6 +3386,16 @@ static int ipw_load(struct ipw_priv *pri
 	/* stop nic */
 	ipw_stop_nic(priv);
 
+#ifdef CONFIG_PM
+	if (!fw_loaded) {
+#endif
+		rc = ipw_get_fw(priv, &firmware, fw_name);
+		if (rc < 0)
+			goto error;
+#ifdef CONFIG_PM
+	}
+#endif
+
 	/* DMA bss firmware into the device */
 	rc = ipw_load_firmware(priv, firmware->data +
 			       sizeof(struct fw_header),
@@ -3397,10 +3405,14 @@ static int ipw_load(struct ipw_priv *pri
 		goto error;
 	}
 
+#ifdef CONFIG_PM
+	fw_loaded = 1;
+#endif
+
 	ipw_write32(priv, IPW_EEPROM_LOAD_DISABLE, 0);
 
 	rc = ipw_queue_reset(priv);
-	if (rc) {
+	if (rc < 0) {
 		IPW_ERROR("Unable to initialize queues\n");
 		goto error;
 	}
---
0.99.8.GIT


--- NEW FILE 3813-ipw2200-stack-reduction.txt ---
Subject: [PATCH] ipw2200: stack reduction
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091848 +0800

Checking the stack usage of my kernel, showed that ipw2200 had a few bad
offenders. This is on i386 32-bit:

0x00002876 ipw_send_associate:                          544
0x000028ee ipw_send_associate:                          544
0x000027dc ipw_send_scan_request_ext:                   520
0x00002864 ipw_set_sensitivity:                         520
0x00005eac ipw_set_rsn_capa:                            520

The reason is the host_cmd structure is large (500 bytes). All other
functions currently using ipw_send_cmd() suffer from the same problem.
This patch introduces ipw_send_cmd_simple() for commands with no data
transfer, and ipw_send_cmd_pdu() for commands with a data payload and
makes the payload a pointer to the buffer passed in from the caller.

As an added bonus, the diffstat looks like this:

 ipw2200.c |  260 +++++++++++++++++++++-----------------------------------------
 ipw2200.h |    2
 2 files changed, 92 insertions(+), 170 deletions(-)

and it shrinks the module a lot as well:

Before:

   text    data     bss     dec     hex filename
  75177    2472      44   77693   12f7d drivers/net/wireless/ipw2200.ko

After:

   text    data     bss     dec     hex filename
  61363    2488      44   63895    f997 drivers/net/wireless/ipw2200.ko

So about a ~18% reduction in module size.

Signed-off-by: Jens Axboe <axboe at suse.de>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |  253 ++++++++++++++--------------------------
 drivers/net/wireless/ipw2200.h |    2 
 2 files changed, 91 insertions(+), 164 deletions(-)

applies-to: b4de052ca78d6c8b4c05494a4a297aac9e88190e
0a7bcf261ea584c87a9cee4523023fa74168de4a
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index c42eb54..2fe1e04 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -1928,7 +1928,8 @@ static char *get_cmd_string(u8 cmd)
 }
 
 #define HOST_COMPLETE_TIMEOUT HZ
-static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
+
+static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
 {
 	int rc = 0;
 	unsigned long flags;
@@ -1964,7 +1965,7 @@ static int ipw_send_cmd(struct ipw_priv 
 		printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);
 
 
-	rc = ipw_queue_tx_hcmd(priv, cmd->cmd, &cmd->param, cmd->len, 0);
+	rc = ipw_queue_tx_hcmd(priv, cmd->cmd, cmd->param, cmd->len, 0);
 	if (rc) {
 		priv->status &= ~STATUS_HCMD_ACTIVE;
 		IPW_ERROR("Failed to send %s: Reason %d\n",
@@ -1999,7 +2000,7 @@ static int ipw_send_cmd(struct ipw_priv 
 		goto exit;
 	}
 
-      exit:
+exit:
 	if (priv->cmdlog) {
 		priv->cmdlog[priv->cmdlog_pos++].retcode = rc;
 		priv->cmdlog_pos %= priv->cmdlog_len;
@@ -2007,61 +2008,62 @@ static int ipw_send_cmd(struct ipw_priv 
 	return rc;
 }
 
-static int ipw_send_host_complete(struct ipw_priv *priv)
+static int ipw_send_cmd_simple(struct ipw_priv *priv, u8 command)
+{
+	struct host_cmd cmd = {
+		.cmd = command,
+	};
+
+	return __ipw_send_cmd(priv, &cmd);
+}
+
+static int ipw_send_cmd_pdu(struct ipw_priv *priv, u8 command, u8 len,
+			    void *data)
 {
 	struct host_cmd cmd = {
-		.cmd = IPW_CMD_HOST_COMPLETE,
-		.len = 0
+		.cmd = command,
+		.len = len,
+		.param = data,
 	};
 
+	return __ipw_send_cmd(priv, &cmd);
+}
+
+static int ipw_send_host_complete(struct ipw_priv *priv)
+{
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_simple(priv, IPW_CMD_HOST_COMPLETE);
 }
 
 static int ipw_send_system_config(struct ipw_priv *priv,
 				  struct ipw_sys_config *config)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SYSTEM_CONFIG,
-		.len = sizeof(*config)
-	};
-
 	if (!priv || !config) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, config, sizeof(*config));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SYSTEM_CONFIG, sizeof(*config),
+					config);
 }
 
 static int ipw_send_ssid(struct ipw_priv *priv, u8 * ssid, int len)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SSID,
-		.len = min(len, IW_ESSID_MAX_SIZE)
-	};
-
 	if (!priv || !ssid) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, ssid, cmd.len);
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SSID, min(len, IW_ESSID_MAX_SIZE),
+					ssid);
 }
 
 static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_ADAPTER_ADDRESS,
-		.len = ETH_ALEN
-	};
-
 	if (!priv || !mac) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
@@ -2070,8 +2072,8 @@ static int ipw_send_adapter_address(stru
 	IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",
 		       priv->net_dev->name, MAC_ARG(mac));
 
-	memcpy(cmd.param, mac, ETH_ALEN);
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN,
+					mac);
 }
 
 /*
@@ -2130,51 +2132,40 @@ static void ipw_bg_scan_check(void *data
 static int ipw_send_scan_request_ext(struct ipw_priv *priv,
 				     struct ipw_scan_request_ext *request)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SCAN_REQUEST_EXT,
-		.len = sizeof(*request)
-	};
-
-	memcpy(cmd.param, request, sizeof(*request));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SCAN_REQUEST_EXT,
+					sizeof(*request), request);
 }
 
 static int ipw_send_scan_abort(struct ipw_priv *priv)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SCAN_ABORT,
-		.len = 0
-	};
-
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_simple(priv, IPW_CMD_SCAN_ABORT);
 }
 
 static int ipw_set_sensitivity(struct ipw_priv *priv, u16 sens)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SENSITIVITY_CALIB,
-		.len = sizeof(struct ipw_sensitivity_calib)
+	struct ipw_sensitivity_calib calib = {
+		.beacon_rssi_raw = sens,
 	};
-	struct ipw_sensitivity_calib *calib = (struct ipw_sensitivity_calib *)
-	    &cmd.param;
-	calib->beacon_rssi_raw = sens;
-	return ipw_send_cmd(priv, &cmd);
+
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SENSITIVITY_CALIB, sizeof(calib),
+					&calib);
 }
 
 static int ipw_send_associate(struct ipw_priv *priv,
 			      struct ipw_associate *associate)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_ASSOCIATE,
-		.len = sizeof(*associate)
-	};
-
 	struct ipw_associate tmp_associate;
+
+	if (!priv || !associate) {
+		IPW_ERROR("Invalid args\n");
+		return -1;
+	}
+
 	memcpy(&tmp_associate, associate, sizeof(*associate));
 	tmp_associate.policy_support =
 	    cpu_to_le16(tmp_associate.policy_support);
@@ -2187,80 +2178,56 @@ static int ipw_send_associate(struct ipw
 	    cpu_to_le16(tmp_associate.beacon_interval);
 	tmp_associate.atim_window = cpu_to_le16(tmp_associate.atim_window);
 
-	if (!priv || !associate) {
-		IPW_ERROR("Invalid args\n");
-		return -1;
-	}
-
-	memcpy(cmd.param, &tmp_associate, sizeof(*associate));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_ASSOCIATE, sizeof(tmp_associate),
+					&tmp_associate);
 }
 
 static int ipw_send_supported_rates(struct ipw_priv *priv,
 				    struct ipw_supported_rates *rates)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SUPPORTED_RATES,
-		.len = sizeof(*rates)
-	};
-
 	if (!priv || !rates) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, rates, sizeof(*rates));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SUPPORTED_RATES, sizeof(*rates),
+					rates);
 }
 
 static int ipw_set_random_seed(struct ipw_priv *priv)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_SEED_NUMBER,
-		.len = sizeof(u32)
-	};
+	u32 val;
 
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	get_random_bytes(&cmd.param, sizeof(u32));
+	get_random_bytes(&val, sizeof(val));
 
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_SEED_NUMBER, sizeof(val), &val);
 }
 
 static int ipw_send_card_disable(struct ipw_priv *priv, u32 phy_off)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_CARD_DISABLE,
-		.len = sizeof(u32)
-	};
-
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	*((u32 *) & cmd.param) = phy_off;
-
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_CARD_DISABLE, sizeof(phy_off),
+					&phy_off);
 }
 
 static int ipw_send_tx_power(struct ipw_priv *priv, struct ipw_tx_power *power)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_TX_POWER,
-		.len = sizeof(*power)
-	};
-
 	if (!priv || !power) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, power, sizeof(*power));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_TX_POWER, sizeof(*power),
+					power);
 }
 
 static int ipw_set_tx_power(struct ipw_priv *priv)
@@ -2312,18 +2279,14 @@ static int ipw_send_rts_threshold(struct
 	struct ipw_rts_threshold rts_threshold = {
 		.rts_threshold = rts,
 	};
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_RTS_THRESHOLD,
-		.len = sizeof(rts_threshold)
-	};
 
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, &rts_threshold, sizeof(rts_threshold));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_RTS_THRESHOLD,
+				sizeof(rts_threshold), &rts_threshold);
 }
 
 static int ipw_send_frag_threshold(struct ipw_priv *priv, u16 frag)
@@ -2331,27 +2294,19 @@ static int ipw_send_frag_threshold(struc
 	struct ipw_frag_threshold frag_threshold = {
 		.frag_threshold = frag,
 	};
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_FRAG_THRESHOLD,
-		.len = sizeof(frag_threshold)
-	};
 
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, &frag_threshold, sizeof(frag_threshold));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_FRAG_THRESHOLD,
+				sizeof(frag_threshold), &frag_threshold);
 }
 
 static int ipw_send_power_mode(struct ipw_priv *priv, u32 mode)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_POWER_MODE,
-		.len = sizeof(u32)
-	};
-	u32 *param = (u32 *) (&cmd.param);
+	u32 param;
 
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
@@ -2362,17 +2317,18 @@ static int ipw_send_power_mode(struct ip
 	 * level */
 	switch (mode) {
 	case IPW_POWER_BATTERY:
-		*param = IPW_POWER_INDEX_3;
+		param = IPW_POWER_INDEX_3;
 		break;
 	case IPW_POWER_AC:
-		*param = IPW_POWER_MODE_CAM;
+		param = IPW_POWER_MODE_CAM;
 		break;
 	default:
-		*param = mode;
+		param = mode;
 		break;
 	}
 
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_POWER_MODE, sizeof(param),
+					&param);
 }
 
 static int ipw_send_retry_limit(struct ipw_priv *priv, u8 slimit, u8 llimit)
@@ -2381,18 +2337,14 @@ static int ipw_send_retry_limit(struct i
 		.short_retry_limit = slimit,
 		.long_retry_limit = llimit
 	};
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_RETRY_LIMIT,
-		.len = sizeof(retry_limit)
-	};
 
 	if (!priv) {
 		IPW_ERROR("Invalid args\n");
 		return -1;
 	}
 
-	memcpy(cmd.param, &retry_limit, sizeof(retry_limit));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_RETRY_LIMIT, sizeof(retry_limit),
+					&retry_limit);
 }
 
 /*
@@ -5750,54 +5702,44 @@ static void ipw_adhoc_create(struct ipw_
 
 static void ipw_send_tgi_tx_key(struct ipw_priv *priv, int type, int index)
 {
-	struct ipw_tgi_tx_key *key;
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_TGI_TX_KEY,
-		.len = sizeof(*key)
-	};
+	struct ipw_tgi_tx_key key;
 
 	if (!(priv->ieee->sec.flags & (1 << index)))
 		return;
 
-	key = (struct ipw_tgi_tx_key *)&cmd.param;
-	key->key_id = index;
-	memcpy(key->key, priv->ieee->sec.keys[index], SCM_TEMPORAL_KEY_LENGTH);
-	key->security_type = type;
-	key->station_index = 0;	/* always 0 for BSS */
-	key->flags = 0;
+	key.key_id = index;
+	memcpy(key.key, priv->ieee->sec.keys[index], SCM_TEMPORAL_KEY_LENGTH);
+	key.security_type = type;
+	key.station_index = 0;	/* always 0 for BSS */
+	key.flags = 0;
 	/* 0 for new key; previous value of counter (after fatal error) */
-	key->tx_counter[0] = 0;
-	key->tx_counter[1] = 0;
+	key.tx_counter[0] = 0;
+	key.tx_counter[1] = 0;
 
-	ipw_send_cmd(priv, &cmd);
+	ipw_send_cmd_pdu(priv, IPW_CMD_TGI_TX_KEY, sizeof(key), &key);
 }
 
 static void ipw_send_wep_keys(struct ipw_priv *priv, int type)
 {
-	struct ipw_wep_key *key;
+	struct ipw_wep_key key;
 	int i;
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_WEP_KEY,
-		.len = sizeof(*key)
-	};
 
-	key = (struct ipw_wep_key *)&cmd.param;
-	key->cmd_id = DINO_CMD_WEP_KEY;
-	key->seq_num = 0;
+	key.cmd_id = DINO_CMD_WEP_KEY;
+	key.seq_num = 0;
 
 	/* Note: AES keys cannot be set for multiple times.
 	 * Only set it at the first time. */
 	for (i = 0; i < 4; i++) {
-		key->key_index = i | type;
+		key.key_index = i | type;
 		if (!(priv->ieee->sec.flags & (1 << i))) {
-			key->key_size = 0;
+			key.key_size = 0;
 			continue;
 		}
 
-		key->key_size = priv->ieee->sec.key_sizes[i];
-		memcpy(key->key, priv->ieee->sec.keys[i], key->key_size);
+		key.key_size = priv->ieee->sec.key_sizes[i];
+		memcpy(key.key, priv->ieee->sec.keys[i], key.key_size);
 
-		ipw_send_cmd(priv, &cmd);
+		ipw_send_cmd_pdu(priv, IPW_CMD_WEP_KEY, sizeof(key), &key);
 	}
 }
 
@@ -6298,15 +6240,10 @@ static void ipw_wpa_assoc_frame(struct i
 static int ipw_set_rsn_capa(struct ipw_priv *priv,
 			    char *capabilities, int length)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_RSN_CAPABILITIES,
-		.len = length,
-	};
-
 	IPW_DEBUG_HC("HOST_CMD_RSN_CAPABILITIES\n");
 
-	memcpy(cmd.param, capabilities, length);
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_RSN_CAPABILITIES, length,
+					capabilities);
 }
 
 /*
@@ -7093,25 +7030,15 @@ static int ipw_handle_assoc_response(str
 static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_qos_parameters
 				       *qos_param)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_QOS_PARAMETERS,
-		.len = (sizeof(struct ieee80211_qos_parameters) * 3)
-	};
-
-	memcpy(cmd.param, qos_param, sizeof(*qos_param) * 3);
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS, qos_param,
+					sizeof(*qos_param) * 3);
 }
 
 static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element
 				     *qos_param)
 {
-	struct host_cmd cmd = {
-		.cmd = IPW_CMD_WME_INFO,
-		.len = sizeof(*qos_param)
-	};
-
-	memcpy(cmd.param, qos_param, sizeof(*qos_param));
-	return ipw_send_cmd(priv, &cmd);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, qos_param,
+					sizeof(*qos_param));
 }
 
 #endif				/* CONFIG_IPW_QOS */
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 04a0c26..c09888b 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -1866,7 +1866,7 @@ struct host_cmd {
 	u8 cmd;
 	u8 len;
 	u16 reserved;
-	u32 param[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
+	u32 *param;
 } __attribute__ ((packed));
 
 struct ipw_cmd_log {
---
0.99.8.GIT


--- NEW FILE 3814-ipw2200-Fix-qos_cmd-param-switch-bug.txt ---
Subject: [PATCH] ipw2200: Fix qos_cmd param switch bug
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091856 +0800

The patch fixes a couple of errors regarding QoS, which results in
compile warnings and malfunction of the driver.

Signed-off-by: Henrik Brix Andersen <brix at gentoo.org>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

applies-to: f5ccb4cf6b3e376bbb16a1a0cb12b700b58ba928
4e22699fa264b88084210ceaa63747b8352bd517
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 2fe1e04..072746c 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7030,15 +7030,15 @@ static int ipw_handle_assoc_response(str
 static int ipw_send_qos_params_command(struct ipw_priv *priv, struct ieee80211_qos_parameters
 				       *qos_param)
 {
-	return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS, qos_param,
-					sizeof(*qos_param) * 3);
+	return ipw_send_cmd_pdu(priv, IPW_CMD_QOS_PARAMETERS,
+				sizeof(*qos_param) * 3, qos_param);
 }
 
 static int ipw_send_qos_info_command(struct ipw_priv *priv, struct ieee80211_qos_information_element
 				     *qos_param)
 {
-	return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, qos_param,
-					sizeof(*qos_param));
+	return ipw_send_cmd_pdu(priv, IPW_CMD_WME_INFO, sizeof(*qos_param),
+				qos_param);
 }
 
 #endif				/* CONFIG_IPW_QOS */
---
0.99.8.GIT


--- NEW FILE 3815-ipw2200-increase-ipw2200-driver-version.txt ---
Subject: [PATCH] ipw2200: increase ipw2200 driver version
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091867 +0800

increase ipw2200 driver version to git-1.0.10

Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: f70b393f51d8c627cd45aeba09345f75b61f7ee6
7c97eb3f1dd09548fe7167e684da4fc94580aceb
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 072746c..7d61257 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -33,7 +33,7 @@
 #include "ipw2200.h"
 #include <linux/version.h>
 
-#define IPW2200_VERSION "git-1.0.8"
+#define IPW2200_VERSION "git-1.0.10"
 #define DRV_DESCRIPTION	"Intel(R) PRO/Wireless 2200/2915 Network Driver"
 #define DRV_COPYRIGHT	"Copyright(c) 2003-2005 Intel Corporation"
 #define DRV_VERSION     IPW2200_VERSION
---
0.99.8.GIT


--- NEW FILE 3818-ipw2200-Disable-hwcrypto-by-default.txt ---
Subject: [PATCH] ipw2200: Disable hwcrypto by default
From: Zhu Yi <yi.zhu at intel.com>
Date: 1138091888 +0800

After looking at the mailing list (and experiencing permanent driver lockups
while using hwcrypto=1) I think that disabling this option by default would
be better than otherwise.

Signed-off-by: Andreas Happe <andreashappe at snikt.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 9771f6008d3a20b673a3203ae2aa0a7f2a3734bc
bde37d037715bef4a67d58d00fecbe4c71836cab
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index fdb8065..18e00fe 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -56,7 +56,7 @@ static int auto_create = 1;
 static int led = 0;
 static int disable = 0;
 static int bt_coexist = 0;
-static int hwcrypto = 1;
+static int hwcrypto = 0;
 static int roaming = 1;
 static const char ipw_modes[] = {
 	'a', 'b', 'g', '?'
@@ -11304,7 +11304,7 @@ module_param(bt_coexist, int, 0444);
 MODULE_PARM_DESC(bt_coexist, "enable bluetooth coexistence (default off)");
 
 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,
---
0.99.8.GIT


--- NEW FILE 3820-wireless-airo-add-IWENCODEEXT-and-IWAUTH-support.txt ---
Subject: [PATCH] wireless/airo: add IWENCODEEXT and IWAUTH support
From: Dan Williams <dcbw at redhat.com>
Date: 1138640280 -0500

This patch adds IWENCODEEXT and IWAUTH support to the airo driver for
WEP and unencrypted operation.  No WPA though.  It allows the driver to
operate more willingly with wpa_supplicant and NetworkManager.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/airo.c |  276 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 274 insertions(+), 2 deletions(-)

applies-to: 5c6bcb9a6cb50d42c4bf17b41785622dfcc04314
4be757dd4c00ddabff2d6faf639466bb5d76bc79
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 9c577f7..ef6495b 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5756,11 +5756,13 @@ static int airo_set_wap(struct net_devic
 	Cmd cmd;
 	Resp rsp;
 	APListRid APList_rid;
-	static const unsigned char bcast[ETH_ALEN] = { 255, 255, 255, 255, 255, 255 };
+	static const u8 any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+	static const u8 off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 	if (awrq->sa_family != ARPHRD_ETHER)
 		return -EINVAL;
-	else if (!memcmp(bcast, awrq->sa_data, ETH_ALEN)) {
+	else if (!memcmp(any, awrq->sa_data, ETH_ALEN) ||
+	         !memcmp(off, awrq->sa_data, ETH_ALEN)) {
 		memset(&cmd, 0, sizeof(cmd));
 		cmd.cmd=CMD_LOSE_SYNC;
 		if (down_interruptible(&local->sem))
@@ -6251,6 +6253,267 @@ static int airo_get_encode(struct net_de
 
 /*------------------------------------------------------------------*/
 /*
+ * Wireless Handler : set extended Encryption parameters
+ */
+static int airo_set_encodeext(struct net_device *dev,
+			   struct iw_request_info *info,
+			    union iwreq_data *wrqu,
+			    char *extra)
+{
+	struct airo_info *local = dev->priv;
+	struct iw_point *encoding = &wrqu->encoding;
+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+	CapabilityRid cap_rid;		/* Card capability info */
+	int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 );
+	u16 currentAuthType = local->config.authType;
+	int idx, key_len, alg = ext->alg;	/* Check encryption mode */
+	wep_key_t key;
+
+	/* Is WEP supported ? */
+	readCapabilityRid(local, &cap_rid, 1);
+	/* Older firmware doesn't support this...
+	if(!(cap_rid.softCap & 2)) {
+		return -EOPNOTSUPP;
+	} */
+	readConfigRid(local, 1);
+
+	/* Determine and validate the key index */
+	idx = encoding->flags & IW_ENCODE_INDEX;
+	if (idx) {
+		if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1))
+			return -EINVAL;
+		idx--;
+	} else
+		idx = get_wep_key(local, 0xffff);
+
+	if (encoding->flags & IW_ENCODE_DISABLED)
+		alg = IW_ENCODE_ALG_NONE;
+
+	/* Just setting the transmit key? */
+	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
+		set_wep_key(local, idx, NULL, 0, perm, 1);
+	} else {
+		/* Set the requested key first */
+		memset(key.key, 0, MAX_KEY_SIZE);
+		switch (alg) {
+		case IW_ENCODE_ALG_NONE:
+			key.len = 0;
+			break;
+		case IW_ENCODE_ALG_WEP:
+			if (ext->key_len > MIN_KEY_SIZE) {
+				key.len = MAX_KEY_SIZE;
+			} else if (ext->key_len > 0) {
+				key.len = MIN_KEY_SIZE;
+			} else {
+				return -EINVAL;
+			}
+			key_len = min (ext->key_len, key.len);
+			memcpy(key.key, ext->key, key_len);
+			break;
+		default:
+			return -EINVAL;
+		}
+		/* Send the key to the card */
+		set_wep_key(local, idx, key.key, key.len, perm, 1);
+	}
+
+	/* Read the flags */
+	if(encoding->flags & IW_ENCODE_DISABLED)
+		local->config.authType = AUTH_OPEN;	// disable encryption
+	if(encoding->flags & IW_ENCODE_RESTRICTED)
+		local->config.authType = AUTH_SHAREDKEY;	// Only Both
+	if(encoding->flags & IW_ENCODE_OPEN)
+		local->config.authType = AUTH_ENCRYPT;	// Only Wep
+	/* Commit the changes to flags if needed */
+	if (local->config.authType != currentAuthType)
+		set_bit (FLAG_COMMIT, &local->flags);
+
+	return -EINPROGRESS;
+}
+
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get extended Encryption parameters
+ */
+static int airo_get_encodeext(struct net_device *dev,
+			    struct iw_request_info *info,
+			    union iwreq_data *wrqu,
+			    char *extra)
+{
+	struct airo_info *local = dev->priv;
+	struct iw_point *encoding = &wrqu->encoding;
+	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
+	CapabilityRid cap_rid;		/* Card capability info */
+	int idx, max_key_len;
+
+	/* Is it supported ? */
+	readCapabilityRid(local, &cap_rid, 1);
+	if(!(cap_rid.softCap & 2)) {
+		return -EOPNOTSUPP;
+	}
+	readConfigRid(local, 1);
+
+	max_key_len = encoding->length - sizeof(*ext);
+	if (max_key_len < 0)
+		return -EINVAL;
+
+	idx = encoding->flags & IW_ENCODE_INDEX;
+	if (idx) {
+		if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1))
+			return -EINVAL;
+		idx--;
+	} else
+		idx = get_wep_key(local, 0xffff);
+
+	encoding->flags = idx + 1;
+	memset(ext, 0, sizeof(*ext));
+
+	/* Check encryption mode */
+	switch(local->config.authType) {
+		case AUTH_ENCRYPT:
+			encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED;
+			break;
+		case AUTH_SHAREDKEY:
+			encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED;
+			break;
+		default:
+		case AUTH_OPEN:
+			encoding->flags = IW_ENCODE_ALG_NONE | IW_ENCODE_DISABLED;
+			break;
+	}
+	/* We can't return the key, so set the proper flag and return zero */
+	encoding->flags |= IW_ENCODE_NOKEY;
+	memset(extra, 0, 16);
+	
+	/* Copy the key to the user buffer */
+	ext->key_len = get_wep_key(local, idx);
+	if (ext->key_len > 16) {
+		ext->key_len=0;
+	}
+
+	return 0;
+}
+
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : set extended authentication parameters
+ */
+static int airo_set_auth(struct net_device *dev,
+			       struct iw_request_info *info,
+			       union iwreq_data *wrqu, char *extra)
+{
+	struct airo_info *local = dev->priv;
+	struct iw_param *param = &wrqu->param;
+	u16 currentAuthType = local->config.authType;
+
+	switch (param->flags & IW_AUTH_INDEX) {
+	case IW_AUTH_WPA_VERSION:
+	case IW_AUTH_CIPHER_PAIRWISE:
+	case IW_AUTH_CIPHER_GROUP:
+	case IW_AUTH_KEY_MGMT:
+	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
+	case IW_AUTH_PRIVACY_INVOKED:
+		/*
+		 * airo does not use these parameters
+		 */
+		break;
+
+	case IW_AUTH_DROP_UNENCRYPTED:
+		if (param->value) {
+			/* Only change auth type if unencrypted */
+			if (currentAuthType == AUTH_OPEN)
+				local->config.authType = AUTH_ENCRYPT;
+		} else {
+			local->config.authType = AUTH_OPEN;
+		}
+
+		/* Commit the changes to flags if needed */
+		if (local->config.authType != currentAuthType)
+			set_bit (FLAG_COMMIT, &local->flags);
+		break;
+
+	case IW_AUTH_80211_AUTH_ALG: {
+			/* FIXME: What about AUTH_OPEN?  This API seems to
+			 * disallow setting our auth to AUTH_OPEN.
+			 */
+			if (param->value & IW_AUTH_ALG_SHARED_KEY) {
+				local->config.authType = AUTH_SHAREDKEY;
+			} else if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) {
+				local->config.authType = AUTH_ENCRYPT;
+			} else
+				return -EINVAL;
+			break;
+
+			/* Commit the changes to flags if needed */
+			if (local->config.authType != currentAuthType)
+				set_bit (FLAG_COMMIT, &local->flags);
+		}
+
+	case IW_AUTH_WPA_ENABLED:
+		/* Silently accept disable of WPA */
+		if (param->value > 0)
+			return -EOPNOTSUPP;
+		break;
+
+	default:
+		return -EOPNOTSUPP;
+	}
+	return -EINPROGRESS;
+}
+
+
+/*------------------------------------------------------------------*/
+/*
+ * Wireless Handler : get extended authentication parameters
+ */
+static int airo_get_auth(struct net_device *dev,
+			       struct iw_request_info *info,
+			       union iwreq_data *wrqu, char *extra)
+{
+	struct airo_info *local = dev->priv;
+	struct iw_param *param = &wrqu->param;
+	u16 currentAuthType = local->config.authType;
+
+	switch (param->flags & IW_AUTH_INDEX) {
+	case IW_AUTH_DROP_UNENCRYPTED:
+		switch (currentAuthType) {
+		case AUTH_SHAREDKEY:
+		case AUTH_ENCRYPT:
+			param->value = 1;
+			break;
+		default:
+			param->value = 0;
+			break;
+		}
+		break;
+
+	case IW_AUTH_80211_AUTH_ALG:
+		switch (currentAuthType) {
+		case AUTH_SHAREDKEY:
+			param->value = IW_AUTH_ALG_SHARED_KEY;
+			break;
+		case AUTH_ENCRYPT:
+		default:
+			param->value = IW_AUTH_ALG_OPEN_SYSTEM;
+			break;
+		}
+		break;
+
+	case IW_AUTH_WPA_ENABLED:
+		param->value = 0;
+		break;
+
+	default:
+		return -EOPNOTSUPP;
+	}
+	return 0;
+}
+
+
+/*------------------------------------------------------------------*/
+/*
  * Wireless Handler : set Tx-Power
  */
 static int airo_set_txpow(struct net_device *dev,
@@ -7005,6 +7268,15 @@ static const iw_handler		airo_handler[] 
 	(iw_handler) airo_get_encode,		/* SIOCGIWENCODE */
 	(iw_handler) airo_set_power,		/* SIOCSIWPOWER */
 	(iw_handler) airo_get_power,		/* SIOCGIWPOWER */
+	(iw_handler) NULL,			/* -- hole -- */
+	(iw_handler) NULL,			/* -- hole -- */
+	(iw_handler) NULL,			/* SIOCSIWGENIE */
+	(iw_handler) NULL,			/* SIOCGIWGENIE */
+	(iw_handler) airo_set_auth,		/* SIOCSIWAUTH */
+	(iw_handler) airo_get_auth,		/* SIOCGIWAUTH */
+	(iw_handler) airo_set_encodeext,	/* SIOCSIWENCODEEXT */
+	(iw_handler) airo_get_encodeext,	/* SIOCGIWENCODEEXT */
+	(iw_handler) NULL,			/* SIOCSIWPMKSA */
 };
 
 /* Note : don't describe AIROIDIFC and AIROOLDIDIFC in here.
---
0.99.8.GIT


--- NEW FILE 3821-wireless-ipw2200-support-WE-18-WPA-enc_capa.txt ---
Subject: [PATCH] wireless/ipw2200: support WE-18 WPA enc_capa
From: Dan Williams <dcbw at redhat.com>
Date: 1138647536 -0500

This patch allows ipw2100 driver to advertise the WPA-related encryption
options that it does really support.  It's necessary to work correctly
with NetworkManager and other programs that actually check driver & card
capabilities.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

applies-to: 2b8d8bc23889da7c78db7592db2f791ef13bcf43
f1b50863aa6a96c61a57e3b3a5e76e67b38c5c3e
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 18e00fe..734d2cb 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -8392,7 +8392,7 @@ static int ipw_wx_get_range(struct net_d
 
 	/* Set the Wireless Extension versions */
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 16;
+	range->we_version_source = 18;
 
 	i = 0;
 	if (priv->ieee->mode & (IEEE_B | IEEE_G)) {
@@ -8424,6 +8424,9 @@ static int ipw_wx_get_range(struct net_d
 				IW_EVENT_CAPA_MASK(SIOCGIWAP));
 	range->event_capa[1] = IW_EVENT_CAPA_K_1;
 
+	range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+		IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
 	IPW_DEBUG_WX("GET Range\n");
 	return 0;
 }
---
0.99.8.GIT


--- NEW FILE 3822-IPV4-igmp-remove-pointless-printk.txt ---
Subject: [PATCH] [IPV4] igmp: remove pointless printk
From: Dave Jones <davej at redhat.com>
Date: 1138681637 -0800

This is easily triggerable by sending bogus packets,
allowing a malicious user to flood remote logs.

Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/igmp.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: 26aff65b275398addfe4cd8013b9efea3ff42016
c5d90e000437a463440c1fe039011a02583a9ee5
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index d8ce713..f70ba62 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -970,7 +970,6 @@ int igmp_rcv(struct sk_buff *skb)
 	case IGMP_MTRACE_RESP:
 		break;
 	default:
-		NETDEBUG(KERN_DEBUG "New IGMP type=%d, why we do not know about it?\n", ih->type);
 	}
 
 drop:
---
0.99.8.GIT


--- NEW FILE 3823-TCP-H-TCP-Fix-accounting.txt ---
Subject: [PATCH] [TCP] H-TCP: Fix accounting
From: Baruch Even <baruch at ev-en.org>
Date: 1138683279 -0800

This fixes the accounting in H-TCP, the ccount variable is also
adjusted a few lines above this one.

This line was not supposed to be there and wasn't there in the patches
originally submitted, the four patches submitted were merged to one
and in that merge the bug was introduced.

Signed-Off-By: Baruch Even <baruch at ev-en.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/tcp_htcp.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: d9b335bf132b089ea4036f7d19bcdd9cc490aaf9
2c74088e4104a2a82bd773f79ae0344c22eceb8c
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 3284cfb..128de4d 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -230,7 +230,6 @@ static void htcp_cong_avoid(struct sock 
 			if (tp->snd_cwnd < tp->snd_cwnd_clamp)
 				tp->snd_cwnd++;
 			tp->snd_cwnd_cnt = 0;
-			ca->ccount++;
 		}
 	}
 }
---
0.99.8.GIT


--- NEW FILE 3828-ieee80211_rx_any-filter-out-packets-call-ieee80211_rx-or-ieee80211_rx_mgt.txt ---
Subject: [PATCH] ieee80211_rx_any: filter out packets, call ieee80211_rx or ieee80211_rx_mgt
From: Denis Vlasenko <vda at ilport.com.ua>
Date: 1138114631 +0200

Version 2 of the patch. Added checks for version 0
and proper from/to DS bits. Even in promisc
mode we won't receive packets from another BSSes.

bcm43xx_rx() contains code to filter out packets from
foreign BSSes and decide whether to call ieee80211_rx
or ieee80211_rx_mgt. This is not bcm specific.

Patch adapts that code and adds it to 80211
as ieee80211_rx_any() function.

Signed-off-by: Denis Vlasenko <vda at ilport.com.ua>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |   74 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)

applies-to: 489f4660b05a5db76c1d96c021c318285d122c47
b8fe1d1451180ccf1696ff6625b75ff9bf0f1233
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index cbb4358..c31ae23 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -761,6 +761,80 @@ int ieee80211_rx(struct ieee80211_device
 	return 0;
 }
 
+/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
+int ieee80211_rx_any(struct ieee80211_device *ieee,
+		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
+{
+	struct ieee80211_hdr_4addr *hdr;
+	int is_packet_for_us;
+	u16 fc;
+
+	if (ieee->iw_mode == IW_MODE_MONITOR)
+		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
+
+	hdr = (struct ieee80211_hdr_4addr *)skb->data;
+	fc = le16_to_cpu(hdr->frame_ctl);
+
+	if ((fc & IEEE80211_FCTL_VERS) != 0)
+		return -EINVAL;
+		
+	switch (fc & IEEE80211_FCTL_FTYPE) {
+	case IEEE80211_FTYPE_MGMT:
+		ieee80211_rx_mgt(ieee, hdr, stats);
+		return 0;
+	case IEEE80211_FTYPE_DATA:
+		break;
+	case IEEE80211_FTYPE_CTL:
+		return 0;
+	default:
+		return -EINVAL;
+	}
+
+	is_packet_for_us = 0;
+	switch (ieee->iw_mode) {
+	case IW_MODE_ADHOC:
+		/* our BSS and not from/to DS */
+		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
+		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
+			/* promisc: get all */
+			if (ieee->dev->flags & IFF_PROMISC)
+				is_packet_for_us = 1;
+			/* to us */
+			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
+				is_packet_for_us = 1;
+			/* mcast */
+			else if (is_multicast_ether_addr(hdr->addr1))
+				is_packet_for_us = 1;
+		}
+		break;
+	case IW_MODE_INFRA:
+		/* our BSS (== from our AP) and from DS */
+		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
+		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
+			/* promisc: get all */
+			if (ieee->dev->flags & IFF_PROMISC)
+				is_packet_for_us = 1;
+			/* to us */
+			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
+				is_packet_for_us = 1;
+			/* mcast */
+			else if (is_multicast_ether_addr(hdr->addr1)) {
+				/* not our own packet bcasted from AP */
+				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
+					is_packet_for_us = 1;
+			}
+		}
+		break;
+	default:
+		/* ? */
+		break;
+	}
+
+	if (is_packet_for_us)
+		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
+	return 0;
+}
+
 #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
 
 static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
---
0.99.8.GIT


--- NEW FILE 3829-Add-two-management-functions-to-ieee80211_rx.c.txt ---
Subject: [PATCH] Add two management functions to ieee80211_rx.c
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: 1138685110 -0600

On my system, I get unhandled management functions corresponding
to IEEE80211_STYPE_REASSOC_REQ and IEEE80211_STYPE_ASSOC_REQ. The
attached patch adds the logic to pass these requests off to a user
stack. The patches to implement these requests in softmac have already
been sent to Johannes Berg.

Signed-Off-By: Larry Finger <Larry.Finger at lwfinger.net>

Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_rx.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

applies-to: 9582287de5d5c9cf42a120e4103e2c6b849a2992
2f633db5e9c57e07a971b65e9a72f090f59fd5f6
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index c032b82..fcf4382 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1607,6 +1607,30 @@ void ieee80211_rx_mgt(struct ieee80211_d
 					    header, stats);
 		break;
 
+	case IEEE80211_STYPE_REASSOC_REQ:
+		IEEE80211_DEBUG_MGMT("received reassoc (%d)\n",
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
+
+		IEEE80211_WARNING("%s: IEEE80211_REASSOC_REQ received\n",
+				  ieee->dev->name);
+		if (ieee->handle_reassoc_request != NULL)
+			ieee->handle_reassoc_request(ieee->dev,
+						    (struct ieee80211_reassoc_request *)
+						     header);
+		break;
+
+	case IEEE80211_STYPE_ASSOC_REQ:
+		IEEE80211_DEBUG_MGMT("received assoc (%d)\n",
+				     WLAN_FC_GET_STYPE(le16_to_cpu
+						       (header->frame_ctl)));
+
+		IEEE80211_WARNING("%s: IEEE80211_ASSOC_REQ received\n",
+				  ieee->dev->name);
+		if (ieee->handle_assoc_request != NULL)
+			ieee->handle_assoc_request(ieee->dev);
+		break;
+
 	case IEEE80211_STYPE_DEAUTH:
 		IEEE80211_DEBUG_MGMT("DEAUTH\n");
 		if (ieee->handle_deauth != NULL)
---
0.99.8.GIT


--- NEW FILE 3830-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt ---
Subject: [PATCH] Clarify help text of SKGE/SK98LIN/SKY2
From: Daniel Drake <dsd at gentoo.org>
Date: 1137872134 +0000

Some users have commented that it is unclear which driver they should be
using for their Marvell/SysKonnect network adapter, and which ones
are/aren't interchangable.

This patch attempts to reduce the confusion.

Signed-off-by: Daniel Drake <dsd at gentoo.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/Kconfig |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

applies-to: d0d99f78b46051cabd1e75ce5269b6d1a40f7a12
c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 626508a..6a6a084 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2034,13 +2034,28 @@ config SKGE
 	  It does not support the link failover and network management 
 	  features that "portable" vendor supplied sk98lin driver does.
 
+	  This driver supports adapters based on the original Yukon chipset:
+	  Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
+	  Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
+
+	  It does not support the newer Yukon2 chipset: a separate driver,
+	  sky2, is provided for Yukon2-based adapters.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called skge.  This is recommended.
 
 config SKY2
 	tristate "SysKonnect Yukon2 support (EXPERIMENTAL)"
 	depends on PCI && EXPERIMENTAL
 	select CRC32
 	---help---
-	  This driver support the Marvell Yukon 2 Gigabit Ethernet adapter.
+	  This driver supports Gigabit Ethernet adapters based on the the
+	  Marvell Yukon 2 chipset:
+	  Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
+	  88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
+
+	  This driver does not support the original Yukon chipset: a seperate
+	  driver, skge, is provided for Yukon-based adapters.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called sky2.  This is recommended.
@@ -2050,8 +2065,15 @@ config SK98LIN
 	depends on PCI
 	---help---
 	  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-	  compliant Gigabit Ethernet Adapter. The following adapters are supported
-	  by this driver:
+	  compliant Gigabit Ethernet Adapter.
+
+	  This driver supports the original Yukon chipset. A cleaner driver is 
+	  also available (skge) which seems to work better than this one.
+
+	  This driver does not support the newer Yukon2 chipset. A seperate
+	  driver, sky2, is provided to support Yukon2-based adapters.
+
+	  The following adapters are supported by this driver:
 	    - 3Com 3C940 Gigabit LOM Ethernet Adapter
 	    - 3Com 3C941 Gigabit LOM Ethernet Adapter
 	    - Allied Telesyn AT-2970LX Gigabit Ethernet Adapter
---
0.99.8.GIT


--- NEW FILE 3831-r8169-fix-forced-mode-link-settings.txt ---
Subject: [PATCH] r8169: fix forced-mode link settings
From: Andy Gospodarek <andy at greyhouse.net>
Date: 1138731412 +0100

Allow the r8169 driver to set devices to be full-duplex only when
auto-negotiate is disabled.

Signed-off-by: Andy Gospodarek <andy at greyhouse.net>
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>

---

 drivers/net/r8169.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

applies-to: a3a1af14f9048a3492faf1ce044caea5236f84e1
726ecdcf688314aa8d4a4841f5f126c2cb4ecbf5
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a81338b..6e10184 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -675,6 +675,9 @@ static int rtl8169_set_speed_xmii(struct
 
 		if (duplex == DUPLEX_HALF)
 			auto_nego &= ~(PHY_Cap_10_Full | PHY_Cap_100_Full);
+
+		if (duplex == DUPLEX_FULL)
+			auto_nego &= ~(PHY_Cap_10_Half | PHY_Cap_100_Half);
 	}
 
 	tp->phy_auto_nego_reg = auto_nego;
---
0.99.8.GIT


--- NEW FILE 3834-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt ---
Subject: [PATCH] [bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138734698 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/Makefile          |   87 +-----------------------
 drivers/net/wireless/bcm43xx/bcm43xx.h         |    6 --
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |    8 +-
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    |   11 +--
 4 files changed, 14 insertions(+), 98 deletions(-)

applies-to: bfe4f4ead31e74f0c0f3bb4286ae63de95ad23b6
bfe4a2f57d4835eb9a5ec87860201b779ce94a11
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
index 98d4efb..3e5ed77 100644
--- a/drivers/net/wireless/bcm43xx/Makefile
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -1,87 +1,8 @@
-# Makefile for bcm43xx driver
+obj-$(CONFIG_BCM43XX) += bcm43xx.o
+bcm43xx-obj-$(CONFIG_BCM43XX_DEBUG) += bcm43xx_debugfs.o
 
-VERSION		:= 0.0.1
-RELEASE_NAME	:= bcm43xx-$(VERSION)
-
-# Optional path, where the SoftMAC subsystem is located.
-# You may set SOFTMAC_DIR in your bashrc, for example.
-SOFTMAC_DIR	?= 
-
-KVER		:= $(shell uname -r)
-KDIR		?= /lib/modules/$(KVER)/build
-PWD		:= $(shell pwd)
-MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
-
-# Comment/uncomment to enable/disable debugging
-DEBUG = y
-
-
-ifeq ($(DEBUG),y)
-DEBUGFS_OBJ = bcm43xx_debugfs.o
-CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
-else
-DEBUGFS_OBJ =
-CFLAGS += -O2
-endif
-
-CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
-ifneq ($(SOFTMAC_DIR),)
-CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
-endif
-
-ifneq ($(KERNELRELEASE),)
-# call from kernel build system
-
-obj-m := bcm43xx.o
-bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o \
 		bcm43xx_radio.o bcm43xx_phy.o \
 		bcm43xx_power.o bcm43xx_wx.o \
 		bcm43xx_pio.o bcm43xx_ilt.o \
-		bcm43xx_leds.o
-
-else
-
-default: modules
-
-modules:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-install: bcm43xx.ko
-	install -d $(MODPATH)
-	install -m 644 -c bcm43xx.ko $(MODPATH)
-	/sbin/depmod -a
-
-uninstall:
-	rm -rf $(MODPATH)
-	/sbin/depmod -a
-
-endif
-
-clean:
-	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
-		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
-		-print | xargs rm -Rf
-
-depend .depend dep:
-	$(CC) $(CFLAGS) -M *.c > .depend
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
-
-DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
-DISTDIR = $(RELEASE_NAME)
-
-release: clean
-	@rm -rf $(DISTDIR)
-	@mkdir $(DISTDIR)
-	@chmod 777 $(DISTDIR)
-	@for file in $(DISTFILES); do                   \
-                if test -d $$file; then                 \
-                        mkdir $(DISTDIR)/$$file;        \
-                else                                    \
-                        cp -p $$file $(DISTDIR)/$$file; \
-                fi;                                     \
-        done
-	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
-	@rm -rf $(DISTDIR)
+		bcm43xx_leds.o $(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 38e75ed..7b97d8b 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -17,14 +17,10 @@
 #include "bcm43xx_leds.h"
 
 
-#define DRV_NAME			__stringify(KBUILD_MODNAME)
-#define DRV_VERSION			__stringify(BCM43xx_VERSION)
-#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
-#define PFX				DRV_NAME ": "
+#define PFX				KBUILD_MODNAME ": "
 
 #define BCM43xx_SWITCH_CORE_MAX_RETRIES	10
 #define BCM43xx_IRQWAIT_MAX_RETRIES	50
-#define BCM43xx_TX_TIMEOUT		(10 * HZ)
 
 #define BCM43xx_IO_SIZE			8192
 #define BCM43xx_REG_ACTIVE_CORE		0x80
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index f8cfc84..5a7dc43 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -141,7 +141,7 @@ static ssize_t drvinfo_read_file(struct 
 	down(&big_buffer_sem);
 
 	/* This is where the information is written to the "driver" file */
-	fappend(BCM43xx_DRIVER_NAME "\n");
+	fappend(KBUILD_MODNAME " driver\n");
 	fappend("Compiled at: %s %s\n", __DATE__, __TIME__);
 
 	res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
@@ -433,12 +433,12 @@ void bcm43xx_debugfs_log_txstat(struct b
 void bcm43xx_debugfs_init(void)
 {
 	memset(&fs, 0, sizeof(fs));
-	fs.root = debugfs_create_dir(DRV_NAME, NULL);
+	fs.root = debugfs_create_dir(KBUILD_MODNAME, NULL);
 	if (!fs.root)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "\" subdir failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "\" subdir failed!\n");
 	fs.dentry_driverinfo = debugfs_create_file("driver", 0444, fs.root, NULL, &drvinfo_fops);
 	if (!fs.dentry_driverinfo)
-		printk(KERN_ERR PFX "debugfs: creating \"" DRV_NAME "/driver\" failed!\n");
+		printk(KERN_ERR PFX "debugfs: creating \"" KBUILD_MODNAME "/driver\" failed!\n");
 }
 
 void bcm43xx_debugfs_exit(void)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 4b4e60a..cfb0f0a 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2471,7 +2471,7 @@ static int bcm43xx_initialize_irq(struct
 	}
 #endif
 	res = request_irq(bcm->irq, bcm43xx_interrupt_handler,
-			  SA_SHIRQ, DRV_NAME, bcm);
+			  SA_SHIRQ, KBUILD_MODNAME, bcm);
 	if (res) {
 		printk(KERN_ERR PFX "Cannot register IRQ%d\n", bcm->irq);
 		return -EFAULT;
@@ -3809,7 +3809,7 @@ static int bcm43xx_attach_board(struct b
 	}
 #endif
 
-	err = pci_request_regions(pci_dev, DRV_NAME);
+	err = pci_request_regions(pci_dev, KBUILD_MODNAME);
 	if (err) {
 		printk(KERN_ERR PFX
 		       "could not access PCI resources (%i)\n", err);
@@ -4389,12 +4389,11 @@ static int __devinit bcm43xx_init_one(st
 #endif
 	net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
 	net_dev->irq = pdev->irq;
-	net_dev->watchdog_timeo = BCM43xx_TX_TIMEOUT;
 
 	/* initialize the bcm43xx_private struct */
 	bcm = bcm43xx_priv(net_dev);
 	memset(bcm, 0, sizeof(*bcm));
-	wq = create_workqueue(DRV_NAME "_wq");
+	wq = create_workqueue(KBUILD_MODNAME "_wq");
 	if (!wq) {
 		err = -ENOMEM;
 		goto err_free_netdev;
@@ -4567,7 +4566,7 @@ static int bcm43xx_resume(struct pci_dev
 #endif				/* CONFIG_PM */
 
 static struct pci_driver bcm43xx_pci_driver = {
-	.name = BCM43xx_DRIVER_NAME,
+	.name = KBUILD_MODNAME,
 	.id_table = bcm43xx_pci_tbl,
 	.probe = bcm43xx_init_one,
 	.remove = __devexit_p(bcm43xx_remove_one),
@@ -4579,7 +4578,7 @@ static struct pci_driver bcm43xx_pci_dri
 
 static int __init bcm43xx_init(void)
 {
-	printk(KERN_INFO BCM43xx_DRIVER_NAME "\n");
+	printk(KERN_INFO KBUILD_MODNAME " driver\n");
 	bcm43xx_debugfs_init();
 	return pci_register_driver(&bcm43xx_pci_driver);
 }
---
0.99.8.GIT


--- NEW FILE 3863-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt ---
Subject: [PATCH] Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
From: Linus Torvalds <torvalds at g5.osdl.org>
Date: 1138741901 -0800

Modern versions of gcc do not like case statements at the end of a block
statement: you need at least an empty statement.  Using just a "break;"
is preferred for visual style.

Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 net/ipv4/igmp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 25ea330c4fced145290f6f5cfb1b06a1cf8402c0
dd1c1853e2742f4938b271dbe0cee735e2ffa3d9
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index f70ba62..0b4e95f 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -970,6 +970,7 @@ int igmp_rcv(struct sk_buff *skb)
 	case IGMP_MTRACE_RESP:
 		break;
 	default:
+		break;
 	}
 
 drop:
---
0.99.8.GIT


--- NEW FILE 3866-SUNGEM-Unbreak-Sun-GEM-chips.txt ---
Subject: [PATCH] [SUNGEM]: Unbreak Sun GEM chips.
From: David S. Miller <davem at sunset.davemloft.net>
Date: 1138756160 -0800

Revert: 40727198bfb2ce5842a6e8c7f89cf8a40ff7bf14

These PHY changes hang the sungem driver on startup with Sun chips on
sparc64.  Hopefully we can redo these changes in a way that doesn't
break non-Apple systems.

Signed-off-by: David S. Miller <davem at davemloft.net>

---

 arch/powerpc/platforms/powermac/feature.c |    6 +--
 drivers/net/sungem.c                      |   55 +++++++++++++----------------
 2 files changed, 27 insertions(+), 34 deletions(-)

applies-to: 6a71aea65a6854f6ab16dc2f8cadf885f01b927e
7fb76aa07facce5cb9c8d26a0de09001a31eed0c
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 2296f3d..558dd06 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -910,18 +910,16 @@ core99_gmac_phy_reset(struct device_node
 	    macio->type != macio_intrepid)
 		return -ENODEV;
 
-	printk(KERN_DEBUG "Hard reset of PHY chip ...\n");
-
 	LOCK(flags);
 	MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE);
 	(void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET);
 	UNLOCK(flags);
-	msleep(10);
+	mdelay(10);
 	LOCK(flags);
 	MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */
 		KEYLARGO_GPIO_OUTOUT_DATA);
 	UNLOCK(flags);
-	msleep(10);
+	mdelay(10);
 
 	return 0;
 }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 55f3b85..28ce47a 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1653,40 +1653,36 @@ static void gem_init_rings(struct gem *g
 /* Init PHY interface and start link poll state machine */
 static void gem_init_phy(struct gem *gp)
 {
-	u32 mif_cfg;
+	u32 mifcfg;
 
 	/* Revert MIF CFG setting done on stop_phy */
-	mif_cfg = readl(gp->regs + MIF_CFG);
-	mif_cfg &= ~(MIF_CFG_PSELECT|MIF_CFG_POLL|MIF_CFG_BBMODE|MIF_CFG_MDI1);
-	mif_cfg |= MIF_CFG_MDI0;
-	writel(mif_cfg, gp->regs + MIF_CFG);
-	writel(PCS_DMODE_MGM, gp->regs + PCS_DMODE);
-	writel(MAC_XIFCFG_OE, gp->regs + MAC_XIFCFG);
+	mifcfg = readl(gp->regs + MIF_CFG);
+	mifcfg &= ~MIF_CFG_BBMODE;
+	writel(mifcfg, gp->regs + MIF_CFG);
 	
 	if (gp->pdev->vendor == PCI_VENDOR_ID_APPLE) {
 		int i;
-		u16 ctrl;
 
+		/* Those delay sucks, the HW seem to love them though, I'll
+		 * serisouly consider breaking some locks here to be able
+		 * to schedule instead
+		 */
+		for (i = 0; i < 3; i++) {
 #ifdef CONFIG_PPC_PMAC
-		pmac_call_feature(PMAC_FTR_GMAC_PHY_RESET, gp->of_node, 0, 0);
+			pmac_call_feature(PMAC_FTR_GMAC_PHY_RESET, gp->of_node, 0, 0);
+			msleep(20);
 #endif
-
-		/* Some PHYs used by apple have problem getting back
-		 * to us, we do an additional reset here
-		 */
-		phy_write(gp, MII_BMCR, BMCR_RESET);
-		for (i = 0; i < 50; i++) {
-			if ((phy_read(gp, MII_BMCR) & BMCR_RESET) == 0)
+			/* Some PHYs used by apple have problem getting back to us,
+			 * we do an additional reset here
+			 */
+			phy_write(gp, MII_BMCR, BMCR_RESET);
+			msleep(20);
+			if (phy_read(gp, MII_BMCR) != 0xffff)
 				break;
-			msleep(10);
+			if (i == 2)
+				printk(KERN_WARNING "%s: GMAC PHY not responding !\n",
+				       gp->dev->name);
 		}
-		if (i == 50)
-			printk(KERN_WARNING "%s: GMAC PHY not responding !\n",
-			       gp->dev->name);
-		/* Make sure isolate is off */
-		ctrl = phy_read(gp, MII_BMCR);
-		if (ctrl & BMCR_ISOLATE)
-			phy_write(gp, MII_BMCR, ctrl & ~BMCR_ISOLATE);
 	}
 
 	if (gp->pdev->vendor == PCI_VENDOR_ID_SUN &&
@@ -2123,7 +2119,7 @@ static void gem_reinit_chip(struct gem *
 /* Must be invoked with no lock held. */
 static void gem_stop_phy(struct gem *gp, int wol)
 {
-	u32 mif_cfg;
+	u32 mifcfg;
 	unsigned long flags;
 
 	/* Let the chip settle down a bit, it seems that helps
@@ -2134,9 +2130,9 @@ static void gem_stop_phy(struct gem *gp,
 	/* Make sure we aren't polling PHY status change. We
 	 * don't currently use that feature though
 	 */
-	mif_cfg = readl(gp->regs + MIF_CFG);
-	mif_cfg &= ~MIF_CFG_POLL;
-	writel(mif_cfg, gp->regs + MIF_CFG);
+	mifcfg = readl(gp->regs + MIF_CFG);
+	mifcfg &= ~MIF_CFG_POLL;
+	writel(mifcfg, gp->regs + MIF_CFG);
 
 	if (wol && gp->has_wol) {
 		unsigned char *e = &gp->dev->dev_addr[0];
@@ -2186,8 +2182,7 @@ static void gem_stop_phy(struct gem *gp,
 		/* According to Apple, we must set the MDIO pins to this begnign
 		 * state or we may 1) eat more current, 2) damage some PHYs
 		 */
-		mif_cfg = 0;
-		writel(mif_cfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
+		writel(mifcfg | MIF_CFG_BBMODE, gp->regs + MIF_CFG);
 		writel(0, gp->regs + MIF_BBCLK);
 		writel(0, gp->regs + MIF_BBDATA);
 		writel(0, gp->regs + MIF_BBOENAB);
---
0.99.8.GIT


--- NEW FILE 3928-IPV4-Always-set-fl.proto-in-ip_route_newports.txt ---
Subject: [PATCH] [IPV4]: Always set fl.proto in ip_route_newports
From: Patrick McHardy <kaber at trash.net>
Date: 1138757735 -0800

ip_route_newports uses the struct flowi from the struct rtable returned
by ip_route_connect for the new route lookup and just replaces the port
numbers if they have changed. If an IPsec policy exists which doesn't match
port 0 the struct flowi won't have the proto field set and no xfrm lookup
is done for the changed ports.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/route.h |    5 +++--
 net/dccp/ipv4.c     |    3 ++-
 net/ipv4/tcp_ipv4.c |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

applies-to: 0f5077e2da5cfe608b5394c1ba973b04879e5ce4
5d39a795bfa217b5f7637028c83ab5cb291f37bf
diff --git a/include/net/route.h b/include/net/route.h
index e3e5436..9c04f15 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -170,8 +170,8 @@ static inline int ip_route_connect(struc
 	return ip_route_output_flow(rp, &fl, sk, 0);
 }
 
-static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport,
-				    struct sock *sk)
+static inline int ip_route_newports(struct rtable **rp, u8 protocol,
+				    u16 sport, u16 dport, struct sock *sk)
 {
 	if (sport != (*rp)->fl.fl_ip_sport ||
 	    dport != (*rp)->fl.fl_ip_dport) {
@@ -180,6 +180,7 @@ static inline int ip_route_newports(stru
 		memcpy(&fl, &(*rp)->fl, sizeof(fl));
 		fl.fl_ip_sport = sport;
 		fl.fl_ip_dport = dport;
+		fl.proto = protocol;
 		ip_rt_put(*rp);
 		*rp = NULL;
 		return ip_route_output_flow(rp, &fl, sk, 0);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 00f9832..dc0487b 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -119,7 +119,8 @@ int dccp_v4_connect(struct sock *sk, str
 	if (err != 0)
 		goto failure;
 
-	err = ip_route_newports(&rt, inet->sport, inet->dport, sk);
+	err = ip_route_newports(&rt, IPPROTO_DCCP, inet->sport, inet->dport,
+	                        sk);
 	if (err != 0)
 		goto failure;
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 6ea3539..1ac35a6 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -236,7 +236,7 @@ int tcp_v4_connect(struct sock *sk, stru
 	if (err)
 		goto failure;
 
-	err = ip_route_newports(&rt, inet->sport, inet->dport, sk);
+	err = ip_route_newports(&rt, IPPROTO_TCP, inet->sport, inet->dport, sk);
 	if (err)
 		goto failure;
 
---
0.99.8.GIT


--- NEW FILE 3929-BRIDGE-Fix-device-delete-race.txt ---
Subject: [PATCH] [BRIDGE]: Fix device delete race.
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138758247 -0800

This is a simpler fix for the two races in bridge device removal.
The Xen race of delif and notify is managed now by a new deleted flag.
No need for barriers or other locking because of rtnl mutex.

The del_timer_sync()'s are unnecessary, because br_stp_disable_port
delete's the timers, and they will finish running before RCU callback.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/br_if.c      |   21 +++++++++++++++------
 net/bridge/br_private.h |    1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

applies-to: 025bee4ea9c90b5fac7a7c939664a89120303170
3f4cfc2d11c9e29709e6f0f3add54039614d847a
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index ba44288..da687c8 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -104,6 +104,7 @@ static void destroy_nbp(struct net_bridg
 {
 	struct net_device *dev = p->dev;
 
+	dev->br_port = NULL;
 	p->br = NULL;
 	p->dev = NULL;
 	dev_put(dev);
@@ -118,13 +119,24 @@ static void destroy_nbp_rcu(struct rcu_h
 	destroy_nbp(p);
 }
 
-/* called with RTNL */
+/* Delete port(interface) from bridge is done in two steps.
+ * via RCU. First step, marks device as down. That deletes
+ * all the timers and stops new packets from flowing through.
+ *
+ * Final cleanup doesn't occur until after all CPU's finished
+ * processing packets.
+ *
+ * Protected from multiple admin operations by RTNL mutex
+ */
 static void del_nbp(struct net_bridge_port *p)
 {
 	struct net_bridge *br = p->br;
 	struct net_device *dev = p->dev;
 
-	dev->br_port = NULL;
+	/* Race between RTNL notify and RCU callback */
+	if (p->deleted)
+		return;
+
 	dev_set_promiscuity(dev, -1);
 
 	cancel_delayed_work(&p->carrier_check);
@@ -132,16 +144,13 @@ static void del_nbp(struct net_bridge_po
 
 	spin_lock_bh(&br->lock);
 	br_stp_disable_port(p);
+	p->deleted = 1;
 	spin_unlock_bh(&br->lock);
 
 	br_fdb_delete_by_port(br, p);
 
 	list_del_rcu(&p->list);
 
-	del_timer_sync(&p->message_age_timer);
-	del_timer_sync(&p->forward_delay_timer);
-	del_timer_sync(&p->hold_timer);
-	
 	call_rcu(&p->rcu, destroy_nbp_rcu);
 }
 
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index c5bd631..e330b17 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -68,6 +68,7 @@ struct net_bridge_port
 	/* STP */
 	u8				priority;
 	u8				state;
+	u8				deleted;
 	u16				port_no;
 	unsigned char			topology_change_ack;
 	unsigned char			config_pending;
---
0.99.8.GIT


--- NEW FILE 3930-NET-Do-not-export-inet_bind_bucket_create-twice.txt ---
Subject: [PATCH] [NET]: Do not export inet_bind_bucket_create twice.
From: Sam Ravnborg <sam at ravnborg.org>
Date: 1138758422 -0800

inet_bind_bucket_create was exported twice.  Keep the export in the
file where inet_bind_bucket_create is defined.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/tcp_ipv4.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: fe3131288787952d95b578f151dbbf20791951b7
f9d9516db71eb3a8547948cdddc139eb1c1b9aee
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1ac35a6..233bdf2 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1845,7 +1845,6 @@ void __init tcp_v4_init(struct net_proto
 }
 
 EXPORT_SYMBOL(ipv4_specific);
-EXPORT_SYMBOL(inet_bind_bucket_create);
 EXPORT_SYMBOL(tcp_hashinfo);
 EXPORT_SYMBOL(tcp_prot);
 EXPORT_SYMBOL(tcp_unhash);
---
0.99.8.GIT


--- NEW FILE 3931-IPV6-tcp_v6_send_synack-release-the-destination.txt ---
Subject: [PATCH] [IPV6] tcp_v6_send_synack: release the destination
From: Eric W. Biederman <ebiederm at xmission.com>
Date: 1138758704 -0800

This patch fix dst reference counting in tcp_v6_send_synack

Analysis:
Currently tcp_v6_send_synack is never called with a dst entry
so dst always comes in as NULL.

ip6_dst_lookup calls ip6_route_output which calls dst_hold
before it returns the dst entry.   Neither xfrm_lookup
nor tcp_make_synack consume the dst entry so we still have
a dst_entry with a bumped refrence count at the end of
this function.

Therefore we need to call dst_release just before we return
just like tcp_v4_send_synack does.

Signed-off-by: Eric W. Biederman <ebiederm at xmission.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/tcp_ipv6.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 22c160b1b992b6741d326f334237f99efa7e0b1c
78b910429e2c037533d2a7bd9e95b4f94f905ef8
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 66d0400..ca9cf68 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -515,6 +515,7 @@ static int tcp_v6_send_synack(struct soc
 done:
         if (opt && opt != np->opt)
 		sock_kfree_s(sk, opt, opt->tot_len);
+	dst_release(dst);
 	return err;
 }
 
---
0.99.8.GIT


--- NEW FILE 3932-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt ---
Subject: [PATCH] [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
From: David S. Miller <davem at sunset.davemloft.net>
Date: 1138758817 -0800

It was copy&pasted from tcp_v6_send_synack() which has
a DST leak recently fixed by Eric W. Biederman.

So dccp_v6_send_response() needs the same fix too.

Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/dccp/ipv6.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 39d48ffb6b297ceae30a577f198b3de785785a68
0cbd782507c502428c8ab3e91bee3940c19ac4d4
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index df07425..80c4d04 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -468,6 +468,7 @@ static int dccp_v6_send_response(struct 
 done:
         if (opt && opt != np->opt)
 		sock_kfree_s(sk, opt, opt->tot_len);
+	dst_release(dst);
 	return err;
 }
 
---
0.99.8.GIT


--- NEW FILE 3986-lp486e-remove-SLOW_DOWN_IO.txt ---
Subject: [PATCH] lp486e: remove SLOW_DOWN_IO
From: Alexey Dobriyan <adobriyan at gmail.com>
Date: 1138791888 -0800

It's not used. Fix the following on alpha-eb66 as a side effect:

In file included from drivers/net/lp486e.c:75:
include/asm/io.h:20:1: warning: "SLOW_DOWN_IO" redefined
drivers/net/lp486e.c:59:1: warning: this is the location of the previous definition

Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 drivers/net/lp486e.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

applies-to: 66d02def41d4f65f9b8ae2f4b52e4f21056f4f13
4ff0c007b2854b9ca4dca3a104ee3e4c146c02d6
diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 6139f06..94d5ea1 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -56,8 +56,6 @@ PORT  SIZE ACTION MEANING
 All other communication is through memory!
 */
 
-#define SLOW_DOWN_IO udelay(5)
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/delay.h>
---
0.99.8.GIT


--- NEW FILE 3996-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt ---
Subject: [PATCH] ipw2200: fix ->eeprom[EEPROM_VERSION] check
From: Alexey Dobriyan <adobriyan at gmail.com>
Date: 1138791897 -0800

priv->eeprom is a pointer.

Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Acked-by: Yi Zhu <yi.zhu at intel.com>
Cc: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 drivers/net/wireless/ipw2200.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: f9e5a21e8683f0a69a01a3988f9beb3846b5fd95
386093ef9a6c88576d8b418bf1c8616d5e410a20
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 916b24c..14beab4 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2456,7 +2456,7 @@ static void ipw_eeprom_init_sram(struct 
 	   copy.  Otherwise let the firmware know to perform the operation
 	   on it's own
 	 */
-	if ((priv->eeprom + EEPROM_VERSION) != 0) {
+	if (priv->eeprom[EEPROM_VERSION] != 0) {
 		IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
 
 		/* write the eeprom data to sram */
---
0.99.8.GIT


--- NEW FILE 4129-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt ---
Subject: [PATCH] DocBook: fix some kernel-doc comments in net/sunrpc
From: Martin Waitz <tali at admingilde.org>
Date: 1138792016 -0800

Fix the syntax of some kernel-doc comments

Signed-off-by: Martin Waitz <tali at admingilde.org>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 net/sunrpc/sched.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

applies-to: 85c60f2a303ff4c057a0332aff94d2cc9aa9f389
99acf0442111cc452ac1b93868dde8f6ff37a989
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 7415406..802d4fe 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -908,10 +908,10 @@ void rpc_release_task(struct rpc_task *t
 
 /**
  * rpc_run_task - Allocate a new RPC task, then run rpc_execute against it
- * @clnt - pointer to RPC client
- * @flags - RPC flags
- * @ops - RPC call ops
- * @data - user call data
+ * @clnt: pointer to RPC client
+ * @flags: RPC flags
+ * @ops: RPC call ops
+ * @data: user call data
  */
 struct rpc_task *rpc_run_task(struct rpc_clnt *clnt, int flags,
 					const struct rpc_call_ops *ops,
@@ -930,6 +930,7 @@ EXPORT_SYMBOL(rpc_run_task);
 /**
  * rpc_find_parent - find the parent of a child task.
  * @child: child task
+ * @parent: parent task
  *
  * Checks that the parent task is still sleeping on the
  * queue 'childq'. If so returns a pointer to the parent.
---
0.99.8.GIT


--- NEW FILE 4135-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt ---
Subject: [PATCH] SUNRPC: Fix a lock recursion in the auth_gss downcall
From: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: 1138814316 -0500

 When we look up a new cred in the auth_gss downcall so that we can stuff
 the credcache, we do not want that lookup to queue up an upcall in order
 to initialise it. To do an upcall here not only redundant, but since we
 are already holding the inode->i_mutex, it will trigger a lock recursion.

 This patch allows rpcauth cache searches to indicate that they can cope
 with uninitialised credentials.

 Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

---

 include/linux/sunrpc/auth.h    |    5 +++++
 net/sunrpc/auth.c              |   17 ++++++++++-------
 net/sunrpc/auth_gss/auth_gss.c |   25 +++++++++++++++++++------
 net/sunrpc/auth_unix.c         |    6 +++---
 4 files changed, 37 insertions(+), 16 deletions(-)

applies-to: dba6fb715156d9bc8fdf0ff57d9151e67fc1322c
8a3177604b729ec3b80e43790ee978863ac7551b
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index b68c11a..bfc5fb2 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -50,6 +50,7 @@ struct rpc_cred {
 };
 #define RPCAUTH_CRED_LOCKED	0x0001
 #define RPCAUTH_CRED_UPTODATE	0x0002
+#define RPCAUTH_CRED_NEW	0x0004
 
 #define RPCAUTH_CRED_MAGIC	0x0f4aa4f0
 
@@ -87,6 +88,10 @@ struct rpc_auth {
 						 * uid/gid, fs[ug]id, gids)
 						 */
 
+/* Flags for rpcauth_lookupcred() */
+#define RPCAUTH_LOOKUP_NEW		0x01	/* Accept an uninitialised cred */
+#define RPCAUTH_LOOKUP_ROOTCREDS	0x02	/* This really ought to go! */
+
 /*
  * Client authentication ops
  */
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 9ac1b8c..1ca89c3 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -184,7 +184,7 @@ rpcauth_gc_credcache(struct rpc_auth *au
  */
 struct rpc_cred *
 rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred,
-		int taskflags)
+		int flags)
 {
 	struct rpc_cred_cache *cache = auth->au_credcache;
 	HLIST_HEAD(free);
@@ -193,7 +193,7 @@ rpcauth_lookup_credcache(struct rpc_auth
 			*cred = NULL;
 	int		nr = 0;
 
-	if (!(taskflags & RPC_TASK_ROOTCREDS))
+	if (!(flags & RPCAUTH_LOOKUP_ROOTCREDS))
 		nr = acred->uid & RPC_CREDCACHE_MASK;
 retry:
 	spin_lock(&rpc_credcache_lock);
@@ -202,7 +202,7 @@ retry:
 	hlist_for_each_safe(pos, next, &cache->hashtable[nr]) {
 		struct rpc_cred *entry;
 	       	entry = hlist_entry(pos, struct rpc_cred, cr_hash);
-		if (entry->cr_ops->crmatch(acred, entry, taskflags)) {
+		if (entry->cr_ops->crmatch(acred, entry, flags)) {
 			hlist_del(&entry->cr_hash);
 			cred = entry;
 			break;
@@ -224,7 +224,7 @@ retry:
 	rpcauth_destroy_credlist(&free);
 
 	if (!cred) {
-		new = auth->au_ops->crcreate(auth, acred, taskflags);
+		new = auth->au_ops->crcreate(auth, acred, flags);
 		if (!IS_ERR(new)) {
 #ifdef RPC_DEBUG
 			new->cr_magic = RPCAUTH_CRED_MAGIC;
@@ -238,7 +238,7 @@ retry:
 }
 
 struct rpc_cred *
-rpcauth_lookupcred(struct rpc_auth *auth, int taskflags)
+rpcauth_lookupcred(struct rpc_auth *auth, int flags)
 {
 	struct auth_cred acred = {
 		.uid = current->fsuid,
@@ -250,7 +250,7 @@ rpcauth_lookupcred(struct rpc_auth *auth
 	dprintk("RPC:     looking up %s cred\n",
 		auth->au_ops->au_name);
 	get_group_info(acred.group_info);
-	ret = auth->au_ops->lookup_cred(auth, &acred, taskflags);
+	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
 	put_group_info(acred.group_info);
 	return ret;
 }
@@ -265,11 +265,14 @@ rpcauth_bindcred(struct rpc_task *task)
 		.group_info = current->group_info,
 	};
 	struct rpc_cred *ret;
+	int flags = 0;
 
 	dprintk("RPC: %4d looking up %s cred\n",
 		task->tk_pid, task->tk_auth->au_ops->au_name);
 	get_group_info(acred.group_info);
-	ret = auth->au_ops->lookup_cred(auth, &acred, task->tk_flags);
+	if (task->tk_flags & RPC_TASK_ROOTCREDS)
+		flags |= RPCAUTH_LOOKUP_ROOTCREDS;
+	ret = auth->au_ops->lookup_cred(auth, &acred, flags);
 	if (!IS_ERR(ret))
 		task->tk_msg.rpc_cred = ret;
 	else
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 8d78228..03affcb 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -158,6 +158,7 @@ gss_cred_set_ctx(struct rpc_cred *cred, 
 	old = gss_cred->gc_ctx;
 	gss_cred->gc_ctx = ctx;
 	cred->cr_flags |= RPCAUTH_CRED_UPTODATE;
+	cred->cr_flags &= ~RPCAUTH_CRED_NEW;
 	write_unlock(&gss_ctx_lock);
 	if (old)
 		gss_put_ctx(old);
@@ -580,7 +581,7 @@ gss_pipe_downcall(struct file *filp, con
 	} else {
 		struct auth_cred acred = { .uid = uid };
 		spin_unlock(&gss_auth->lock);
-		cred = rpcauth_lookup_credcache(clnt->cl_auth, &acred, 0);
+		cred = rpcauth_lookup_credcache(clnt->cl_auth, &acred, RPCAUTH_LOOKUP_NEW);
 		if (IS_ERR(cred)) {
 			err = PTR_ERR(cred);
 			goto err_put_ctx;
@@ -758,13 +759,13 @@ gss_destroy_cred(struct rpc_cred *rc)
  * Lookup RPCSEC_GSS cred for the current process
  */
 static struct rpc_cred *
-gss_lookup_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags)
+gss_lookup_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
 {
-	return rpcauth_lookup_credcache(auth, acred, taskflags);
+	return rpcauth_lookup_credcache(auth, acred, flags);
 }
 
 static struct rpc_cred *
-gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags)
+gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags)
 {
 	struct gss_auth *gss_auth = container_of(auth, struct gss_auth, rpc_auth);
 	struct gss_cred	*cred = NULL;
@@ -785,13 +786,17 @@ gss_create_cred(struct rpc_auth *auth, s
 	 */
 	cred->gc_flags = 0;
 	cred->gc_base.cr_ops = &gss_credops;
+	cred->gc_base.cr_flags = RPCAUTH_CRED_NEW;
 	cred->gc_service = gss_auth->service;
+	/* Is the caller prepared to initialise the credential? */
+	if (flags & RPCAUTH_LOOKUP_NEW)
+		goto out;
 	do {
 		err = gss_create_upcall(gss_auth, cred);
 	} while (err == -EAGAIN);
 	if (err < 0)
 		goto out_err;
-
+out:
 	return &cred->gc_base;
 
 out_err:
@@ -801,13 +806,21 @@ out_err:
 }
 
 static int
-gss_match(struct auth_cred *acred, struct rpc_cred *rc, int taskflags)
+gss_match(struct auth_cred *acred, struct rpc_cred *rc, int flags)
 {
 	struct gss_cred *gss_cred = container_of(rc, struct gss_cred, gc_base);
 
+	/*
+	 * If the searchflags have set RPCAUTH_LOOKUP_NEW, then
+	 * we don't really care if the credential has expired or not,
+	 * since the caller should be prepared to reinitialise it.
+	 */
+	if ((flags & RPCAUTH_LOOKUP_NEW) && (rc->cr_flags & RPCAUTH_CRED_NEW))
+		goto out;
 	/* Don't match with creds that have expired. */
 	if (gss_cred->gc_ctx && time_after(jiffies, gss_cred->gc_ctx->gc_expiry))
 		return 0;
+out:
 	return (rc->cr_uid == acred->uid);
 }
 
diff --git a/net/sunrpc/auth_unix.c b/net/sunrpc/auth_unix.c
index 1b3ed4f..df14b6b 100644
--- a/net/sunrpc/auth_unix.c
+++ b/net/sunrpc/auth_unix.c
@@ -75,7 +75,7 @@ unx_create_cred(struct rpc_auth *auth, s
 
 	atomic_set(&cred->uc_count, 1);
 	cred->uc_flags = RPCAUTH_CRED_UPTODATE;
-	if (flags & RPC_TASK_ROOTCREDS) {
+	if (flags & RPCAUTH_LOOKUP_ROOTCREDS) {
 		cred->uc_uid = 0;
 		cred->uc_gid = 0;
 		cred->uc_gids[0] = NOGROUP;
@@ -108,12 +108,12 @@ unx_destroy_cred(struct rpc_cred *cred)
  * request root creds (e.g. for NFS swapping).
  */
 static int
-unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int taskflags)
+unx_match(struct auth_cred *acred, struct rpc_cred *rcred, int flags)
 {
 	struct unx_cred	*cred = (struct unx_cred *) rcred;
 	int		i;
 
-	if (!(taskflags & RPC_TASK_ROOTCREDS)) {
+	if (!(flags & RPCAUTH_LOOKUP_ROOTCREDS)) {
 		int groups;
 
 		if (cred->uc_uid != acred->uid
---
0.99.8.GIT


--- NEW FILE 4138-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt ---
Subject: [PATCH] SUNRPC: Move upcall out of auth->au_ops->crcreate()
From: Trond Myklebust <Trond.Myklebust at netapp.com>
Date: 1138814367 -0500

 This fixes a bug whereby if two processes try to look up the same auth_gss
 credential, they may end up creating two creds, and triggering two upcalls
 because the upcall is performed before the credential is added to the
 credcache.

 Signed-off-by: Trond Myklebust <Trond.Myklebust at netapp.com>

---

 include/linux/sunrpc/auth.h    |    1 +
 net/sunrpc/auth.c              |    8 ++++++++
 net/sunrpc/auth_gss/auth_gss.c |   23 ++++++++++++++---------
 3 files changed, 23 insertions(+), 9 deletions(-)

applies-to: 10e2ff8eaac2c27bc6fda48528ea1c65cf2e7ecc
fba3bad488a2eec2d76c067edb7a5ff92ef42431
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h
index bfc5fb2..2647798 100644
--- a/include/linux/sunrpc/auth.h
+++ b/include/linux/sunrpc/auth.h
@@ -110,6 +110,7 @@ struct rpc_authops {
 
 struct rpc_credops {
 	const char *		cr_name;	/* Name of the auth flavour */
+	int			(*cr_init)(struct rpc_auth *, struct rpc_cred *);
 	void			(*crdestroy)(struct rpc_cred *);
 
 	int			(*crmatch)(struct auth_cred *, struct rpc_cred *, int);
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 1ca89c3..8d6f1a1 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -232,6 +232,14 @@ retry:
 			goto retry;
 		} else
 			cred = new;
+	} else if ((cred->cr_flags & RPCAUTH_CRED_NEW)
+			&& cred->cr_ops->cr_init != NULL
+			&& !(flags & RPCAUTH_LOOKUP_NEW)) {
+		int res = cred->cr_ops->cr_init(auth, cred);
+		if (res < 0) {
+			put_rpccred(cred);
+			cred = ERR_PTR(res);
+		}
 	}
 
 	return (struct rpc_cred *) cred;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 03affcb..bb46efd 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -788,15 +788,6 @@ gss_create_cred(struct rpc_auth *auth, s
 	cred->gc_base.cr_ops = &gss_credops;
 	cred->gc_base.cr_flags = RPCAUTH_CRED_NEW;
 	cred->gc_service = gss_auth->service;
-	/* Is the caller prepared to initialise the credential? */
-	if (flags & RPCAUTH_LOOKUP_NEW)
-		goto out;
-	do {
-		err = gss_create_upcall(gss_auth, cred);
-	} while (err == -EAGAIN);
-	if (err < 0)
-		goto out_err;
-out:
 	return &cred->gc_base;
 
 out_err:
@@ -806,6 +797,19 @@ out_err:
 }
 
 static int
+gss_cred_init(struct rpc_auth *auth, struct rpc_cred *cred)
+{
+	struct gss_auth *gss_auth = container_of(auth, struct gss_auth, rpc_auth);
+	struct gss_cred *gss_cred = container_of(cred,struct gss_cred, gc_base);
+	int err;
+
+	do {
+		err = gss_create_upcall(gss_auth, gss_cred);
+	} while (err == -EAGAIN);
+	return err;
+}
+
+static int
 gss_match(struct auth_cred *acred, struct rpc_cred *rc, int flags)
 {
 	struct gss_cred *gss_cred = container_of(rc, struct gss_cred, gc_base);
@@ -1254,6 +1258,7 @@ static struct rpc_authops authgss_ops = 
 static struct rpc_credops gss_credops = {
 	.cr_name	= "AUTH_GSS",
 	.crdestroy	= gss_destroy_cred,
+	.cr_init	= gss_cred_init,
 	.crmatch	= gss_match,
 	.crmarshal	= gss_marshal,
 	.crrefresh	= gss_refresh,
---
0.99.8.GIT


--- NEW FILE 4146-dscc4-fix-dscc4_init_dummy_skb-check.txt ---
Subject: [PATCH] dscc4: fix dscc4_init_dummy_skb check
From: Alexey Dobriyan <adobriyan at gmail.com>
Date: 1138580636 +0100

It returns a pointer.

Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>

---

 drivers/net/wan/dscc4.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 60135898b5f8b584bcb4925b450b2f1b4b60ac38
8351538db6613f40089789ec90e1b58304eb7ffd
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 2f61a47..1ff5de0 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -1943,7 +1943,7 @@ static int dscc4_init_ring(struct net_de
 					(++i%TX_RING_SIZE)*sizeof(*tx_fd));
 	} while (i < TX_RING_SIZE);
 
-	if (dscc4_init_dummy_skb(dpriv) < 0)
+	if (!dscc4_init_dummy_skb(dpriv))
 		goto err_free_dma_tx;
 
 	memset(dpriv->rx_skbuff, 0, sizeof(struct sk_buff *)*RX_RING_SIZE);
---
0.99.8.GIT


--- NEW FILE 4147-8139too-fix-a-TX-timeout-watchdog-thread-against-NAPI-softirq-race.txt ---
Subject: [PATCH] 8139too: fix a TX timeout watchdog thread against NAPI softirq race
From: Francois Romieu <romieu at fr.zoreil.com>
Date: 1138665873 +0100

Ingo's stealth lock validator detected that both thread acquire
dev->xmit_lock and tp->rx_lock in reverse order.

Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>

---

 drivers/net/8139too.c |   38 ++++++++++++++++++++++++++------------
 1 files changed, 26 insertions(+), 12 deletions(-)

applies-to: e52f19bff0847a2aa5a35d23588efd7df61a79e0
371e8bc2af11b0571982390932bc07b5ffed9aba
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index adfba44..2beac55 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -586,6 +586,7 @@ struct rtl8139_private {
 	dma_addr_t tx_bufs_dma;
 	signed char phys[4];		/* MII device addresses. */
 	char twistie, twist_row, twist_col;	/* Twister tune state. */
+	unsigned int watchdog_fired : 1;
 	unsigned int default_port : 4;	/* Last dev->if_port value. */
 	unsigned int have_thread : 1;
 	spinlock_t lock;
@@ -638,6 +639,7 @@ static void rtl8139_set_rx_mode (struct 
 static void __set_rx_mode (struct net_device *dev);
 static void rtl8139_hw_start (struct net_device *dev);
 static void rtl8139_thread (void *_data);
+static void rtl8139_tx_timeout_task(void *_data);
 static struct ethtool_ops rtl8139_ethtool_ops;
 
 /* write MMIO register, with flush */
@@ -1598,13 +1600,14 @@ static void rtl8139_thread (void *_data)
 {
 	struct net_device *dev = _data;
 	struct rtl8139_private *tp = netdev_priv(dev);
-	unsigned long thr_delay;
+	unsigned long thr_delay = next_tick;
 
-	if (rtnl_shlock_nowait() == 0) {
+	if (tp->watchdog_fired) {
+		tp->watchdog_fired = 0;
+		rtl8139_tx_timeout_task(_data);
+	} else if (rtnl_shlock_nowait() == 0) {
 		rtl8139_thread_iter (dev, tp, tp->mmio_addr);
 		rtnl_unlock ();
-
-		thr_delay = next_tick;
 	} else {
 		/* unlikely race.  mitigate with fast poll. */
 		thr_delay = HZ / 2;
@@ -1631,7 +1634,8 @@ static void rtl8139_stop_thread(struct r
 	if (tp->have_thread) {
 		cancel_rearming_delayed_work(&tp->thread);
 		tp->have_thread = 0;
-	}
+	} else
+		flush_scheduled_work();
 }
 
 static inline void rtl8139_tx_clear (struct rtl8139_private *tp)
@@ -1642,14 +1646,13 @@ static inline void rtl8139_tx_clear (str
 	/* XXX account for unsent Tx packets in tp->stats.tx_dropped */
 }
 
-
-static void rtl8139_tx_timeout (struct net_device *dev)
+static void rtl8139_tx_timeout_task (void *_data)
 {
+	struct net_device *dev = _data;
 	struct rtl8139_private *tp = netdev_priv(dev);
 	void __iomem *ioaddr = tp->mmio_addr;
 	int i;
 	u8 tmp8;
-	unsigned long flags;
 
 	printk (KERN_DEBUG "%s: Transmit timeout, status %2.2x %4.4x %4.4x "
 		"media %2.2x.\n", dev->name, RTL_R8 (ChipCmd),
@@ -1670,23 +1673,34 @@ static void rtl8139_tx_timeout (struct n
 	if (tmp8 & CmdTxEnb)
 		RTL_W8 (ChipCmd, CmdRxEnb);
 
-	spin_lock(&tp->rx_lock);
+	spin_lock_bh(&tp->rx_lock);
 	/* Disable interrupts by clearing the interrupt mask. */
 	RTL_W16 (IntrMask, 0x0000);
 
 	/* Stop a shared interrupt from scavenging while we are. */
-	spin_lock_irqsave (&tp->lock, flags);
+	spin_lock_irq(&tp->lock);
 	rtl8139_tx_clear (tp);
-	spin_unlock_irqrestore (&tp->lock, flags);
+	spin_unlock_irq(&tp->lock);
 
 	/* ...and finally, reset everything */
 	if (netif_running(dev)) {
 		rtl8139_hw_start (dev);
 		netif_wake_queue (dev);
 	}
-	spin_unlock(&tp->rx_lock);
+	spin_unlock_bh(&tp->rx_lock);
 }
 
+static void rtl8139_tx_timeout (struct net_device *dev)
+{
+	struct rtl8139_private *tp = netdev_priv(dev);
+
+	if (!tp->have_thread) {
+		INIT_WORK(&tp->thread, rtl8139_tx_timeout_task, dev);
+		schedule_delayed_work(&tp->thread, next_tick);
+	} else
+		tp->watchdog_fired = 1;
+
+}
 
 static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
---
0.99.8.GIT


--- NEW FILE 4149-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt ---
Subject: [PATCH] [bcm43xx] Add more initvals sanity checks and error out, if one sanity check fails.
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138828192 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/bcm43xx_main.c |   62 +++++++++++++++++++--------
 1 files changed, 43 insertions(+), 19 deletions(-)

applies-to: 79bbe5b6e6f029f61e779109b285626b666398c7
e7e04ef35e0655d6b2dbf18b82a3918333fa1984
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index cfb0f0a..521777f 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2229,9 +2229,9 @@ static irqreturn_t bcm43xx_interrupt_han
 	return IRQ_HANDLED;
 }
 
-static void bcm43xx_release_firmware(struct bcm43xx_private *bcm)
+static void bcm43xx_release_firmware(struct bcm43xx_private *bcm, int force)
 {
-	if (bcm->firmware_norelease)
+	if (bcm->firmware_norelease && !force)
 		return; /* Suspending or controller reset. */
 	release_firmware(bcm->ucode);
 	bcm->ucode = NULL;
@@ -2361,7 +2361,7 @@ static int bcm43xx_request_firmware(stru
 out:
 	return err;
 error:
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 err_noinitval:
 	printk(KERN_ERR PFX "Error: No InitVals available!\n");
@@ -2409,9 +2409,9 @@ static void bcm43xx_upload_microcode(str
 #endif
 }
 
-static void bcm43xx_write_initvals(struct bcm43xx_private *bcm,
-				   const struct bcm43xx_initval *data,
-				   const unsigned int len)
+static int bcm43xx_write_initvals(struct bcm43xx_private *bcm,
+				  const struct bcm43xx_initval *data,
+				  const unsigned int len)
 {
 	u16 offset, size;
 	u32 value;
@@ -2422,35 +2422,54 @@ static void bcm43xx_write_initvals(struc
 		size = be16_to_cpu(data[i].size);
 		value = be32_to_cpu(data[i].value);
 
-		if (size == 2)
-			bcm43xx_write16(bcm, offset, value);
-		else if (size == 4)
+		if (unlikely(offset >= 0x1000))
+			goto err_format;
+		if (size == 2) {
+			if (unlikely(value & 0xFFFF0000))
+				goto err_format;
+			bcm43xx_write16(bcm, offset, (u16)value);
+		} else if (size == 4) {
 			bcm43xx_write32(bcm, offset, value);
-		else
-			printk(KERN_ERR PFX "InitVals fileformat error.\n");
+		} else
+			goto err_format;
 	}
+
+	return 0;
+
+err_format:
+	printk(KERN_ERR PFX "InitVals (bcm43xx_initvalXX.fw) file-format error. "
+			    "Please fix your bcm43xx firmware files.\n");
+	return -EPROTO;
 }
 
-static void bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
+static int bcm43xx_upload_initvals(struct bcm43xx_private *bcm)
 {
+	int err;
+
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_enable(bcm);
 #else
 	bcm43xx_mmioprint_disable(bcm);
 #endif
 
-	bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
-			       bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals0->data,
+				     bcm->initvals0->size / sizeof(struct bcm43xx_initval));
+	if (err)
+		goto out;
 	if (bcm->initvals1) {
-		bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
-				       bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		err = bcm43xx_write_initvals(bcm, (struct bcm43xx_initval *)bcm->initvals1->data,
+					     bcm->initvals1->size / sizeof(struct bcm43xx_initval));
+		if (err)
+			goto out;
 	}
 
+out:
 #ifdef DEBUG_ENABLE_UCODE_MMIO_PRINT
 	bcm43xx_mmioprint_disable(bcm);
 #else
 	bcm43xx_mmioprint_enable(bcm);
 #endif
+	return err;
 }
 
 static int bcm43xx_initialize_irq(struct bcm43xx_private *bcm)
@@ -2683,7 +2702,7 @@ static void bcm43xx_chip_cleanup(struct 
 		bcm43xx_leds_exit(bcm);
 	bcm43xx_gpio_cleanup(bcm);
 	free_irq(bcm->irq, bcm);
-	bcm43xx_release_firmware(bcm);
+	bcm43xx_release_firmware(bcm, 0);
 }
 
 /* Initialize the chip
@@ -2708,13 +2727,15 @@ static int bcm43xx_chip_init(struct bcm4
 
 	err = bcm43xx_initialize_irq(bcm);
 	if (err)
-		goto out;
+		goto err_release_fw;
 
 	err = bcm43xx_gpio_init(bcm);
 	if (err)
 		goto err_free_irq;
 
-	bcm43xx_upload_initvals(bcm);
+	err = bcm43xx_upload_initvals(bcm);
+	if (err)
+		goto err_gpio_cleanup;
 	bcm43xx_radio_turn_on(bcm);
 
 	if (modparam_noleds)
@@ -2813,9 +2834,12 @@ out:
 
 err_radio_off:
 	bcm43xx_radio_turn_off(bcm);
+err_gpio_cleanup:
 	bcm43xx_gpio_cleanup(bcm);
 err_free_irq:
 	free_irq(bcm->irq, bcm);
+err_release_fw:
+	bcm43xx_release_firmware(bcm, 1);
 	goto out;
 }
 	
---
0.99.8.GIT


--- NEW FILE 4159-bcm43xx-Remove-function-bcm43xx_channel_is_allowed-.-Geographical-restriction-should-become-part-of-the-80211-stack-so-every-driver-does-not-have-to-duplicate-it.txt ---
Subject: [PATCH] [bcm43xx] Remove function bcm43xx_channel_is_allowed(). Geographical restriction should become part of the 80211 stack, so every driver does not have to duplicate it.
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138902205 +0100

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/bcm43xx_main.c |  166 ---------------------------
 1 files changed, 1 insertions(+), 165 deletions(-)

applies-to: 3e66acf2fca7ba3fe38d39aca916b60fc4b37c5d
3f661008dab714e8728717c3dcef7faad907b891
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 521777f..c0ec503 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -82,10 +82,6 @@ static int modparam_locale = -1;
 module_param_named(locale, modparam_locale, int, 0444);
 MODULE_PARM_DESC(country, "Select LocaleCode 0-11 (For travelers)");
 
-static int modparam_outdoor;
-module_param_named(outdoor, modparam_outdoor, int, 0444);
-MODULE_PARM_DESC(outdoor, "Set to 1, if you are using the device outdoor, 0 otherwise.");
-
 static int modparam_noleds;
 module_param_named(noleds, modparam_noleds, int, 0444);
 MODULE_PARM_DESC(noleds, "Turn off all LED activity");
@@ -1088,163 +1084,13 @@ static int bcm43xx_read_sprom(struct bcm
 	return 0;
 }
 
-static int bcm43xx_channel_is_allowed(struct bcm43xx_private *bcm, u8 channel,
-				      u8 *max_power, u8 *flags)
-{
-	/* THIS FUNCTION DOES _NOT_ ENFORCE REGULATORY DOMAIN COMPLIANCE.
-	 * It is only a helper function to make life easier to
-	 * select legal channels and transmission powers.
-	 */
-
-	u8 phytype = bcm->current_core->phy->type;
-	int allowed = 0;
-
-	*max_power = 0;
-	*flags = 0;
-
-	//FIXME: Set max_power and maybe flags
-	/*FIXME: Allowed channels are sometimes different for outdoor
-	 *       or indoor use. See modparam_outdoor.
-	 */
-	/* From b specs Max Power BPHY:
-	 *	USA:	1000mW
-	 *	Europe:	100mW
-	 *	Japan:	10mW/MHz
-	 */
-
-	switch (bcm->sprom.locale) {
-	case BCM43xx_LOCALE_WORLD:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_THAILAND:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ISRAEL:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		} else {
-			if (channel >= 5 && channel <= 7)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JORDAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 10 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_CHINA:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			//FIXME: This seems to be wrong.
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_CANADA_ANZ:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_EUROPE:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_USA_LOW:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			if (channel >= 1 && channel <= 13)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 11)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_JAPAN_HIGH:
-		if (phytype == BCM43xx_PHYTYPE_A) {
-			allowed = 1;//FIXME
-		} else if (phytype == BCM43xx_PHYTYPE_B) {
-			//FIXME?
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		} else {
-			if (channel >= 1 && channel <= 14)
-				allowed = 1;
-		}
-		break;
-	case BCM43xx_LOCALE_ALL:
-		allowed = 1;
-		break;
-	case BCM43xx_LOCALE_NONE:
-		break;
-	default:
-		assert(0);
-	}
-
-	return allowed;
-}
-
 static void bcm43xx_geo_init(struct bcm43xx_private *bcm)
 {
 	struct ieee80211_geo geo;
 	struct ieee80211_channel *chan;
 	int have_a = 0, have_bg = 0;
 	int i, num80211;
-	u8 channel, flags, max_power;
+	u8 channel;
 	struct bcm43xx_phyinfo *phy;
 	const char *iso_country;
 
@@ -1268,27 +1114,17 @@ static void bcm43xx_geo_init(struct bcm4
 
  	if (have_a) {
 		for (i = 0, channel = 0; channel < 201; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.a[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.a_channels = i;
 	}
 	if (have_bg) {
 		for (i = 0, channel = 1; channel < 15; channel++) {
-			if (!bcm43xx_channel_is_allowed(bcm, channel,
-							&max_power, &flags))
-				continue;
 			chan = &geo.bg[i++];
 			chan->freq = bcm43xx_channel_to_freq(bcm, channel);
 			chan->channel = channel;
-			chan->flags = flags;
-			chan->max_power = max_power;
 		}
 		geo.bg_channels = i;
 	}
---
0.99.8.GIT


--- NEW FILE 4160-bcm43xx-patch-basic-ethtool-support.txt ---
Subject: [PATCH] [bcm43xx] [patch] basic ethtool support
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138903868 +0100

This patch contains the beginnings of ethtool support for bcm43xx.

It only implements get_drvinfo and get_link, but that's enough for
ifplugd to use ethtool to know whether we're associated or not and then
start or stop dhcp as necessary.

Signed-off-by: Jason Lunz <lunz at falooley.org>
Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/Makefile          |    3 +
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 ++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 ++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    |    2 +
 4 files changed, 62 insertions(+), 1 deletions(-)
 create mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
 create mode 100644 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h

applies-to: 3359463fbdf74c576233abe7ab22ccd9d702a367
83a8eaf2be25d43bb93438a2ab96d35c72d813a5
diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
index 3e5ed77..e025e9f 100644
--- a/drivers/net/wireless/bcm43xx/Makefile
+++ b/drivers/net/wireless/bcm43xx/Makefile
@@ -5,4 +5,5 @@ bcm43xx-objs := bcm43xx_main.o bcm43xx_d
 		bcm43xx_radio.o bcm43xx_phy.o \
 		bcm43xx_power.o bcm43xx_wx.o \
 		bcm43xx_pio.o bcm43xx_ilt.o \
-		bcm43xx_leds.o $(bcm43xx-obj-y)
+		bcm43xx_leds.o bcm43xx_ethtool.o \
+		$(bcm43xx-obj-y)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
new file mode 100644
index 0000000..b3ffcf5
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
@@ -0,0 +1,50 @@
+/*
+
+  Broadcom BCM43xx wireless driver
+
+  ethtool support
+
+  Copyright (c) 2006 Jason Lunz <lunz at falooley.org>
+
+  Some code in this file is derived from the 8139too.c driver
+  Copyright (C) 2002 Jeff Garzik
+
+  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; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include "bcm43xx.h"
+#include "bcm43xx_ethtool.h"
+
+#include <linux/netdevice.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/version.h>
+
+
+static void bcm43xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
+{
+	struct bcm43xx_private *bcm = bcm43xx_priv(dev);
+
+	strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+	strncpy(info->version, UTS_RELEASE, sizeof(info->version));
+	strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
+}
+
+struct ethtool_ops bcm43xx_ethtool_ops = {
+	.get_drvinfo = bcm43xx_get_drvinfo,
+	.get_link = ethtool_op_get_link,
+};
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
new file mode 100644
index 0000000..8137049
--- /dev/null
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h
@@ -0,0 +1,8 @@
+#ifndef BCM43xx_ETHTOOL_H_
+#define BCM43xx_ETHTOOL_H_
+
+#include <linux/ethtool.h>
+
+extern struct ethtool_ops bcm43xx_ethtool_ops;
+
+#endif /* BCM43xx_ETHTOOL_H_ */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index c0ec503..1051a49 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -49,6 +49,7 @@
 #include "bcm43xx_pio.h"
 #include "bcm43xx_power.h"
 #include "bcm43xx_wx.h"
+#include "bcm43xx_ethtool.h"
 
 
 MODULE_DESCRIPTION("Broadcom BCM43xx wireless driver");
@@ -4249,6 +4250,7 @@ static int __devinit bcm43xx_init_one(st
 #endif
 	net_dev->wireless_handlers = &bcm43xx_wx_handlers_def;
 	net_dev->irq = pdev->irq;
+	SET_ETHTOOL_OPS(net_dev, &bcm43xx_ethtool_ops);
 
 	/* initialize the bcm43xx_private struct */
 	bcm = bcm43xx_priv(net_dev);
---
0.99.8.GIT


--- NEW FILE 4161-bcm43xx-Wireless-Ext-update.txt ---
Subject: [PATCH] [bcm43xx] Wireless Ext update:
From: Michael Buesch <mbuesch at freenet.de>
Date: 1138906155 +0100
update we_version_source
set enc_capa

Signed-off-by: Michael Buesch <mbuesch at freenet.de>

---

 drivers/net/wireless/bcm43xx/bcm43xx_wx.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

applies-to: c0329adbb5d842e2dd996c200006f74fc510b207
c439da2c634894f950362934e8a97cfecc3f7700
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index fe6409a..c1d788d 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -41,6 +41,11 @@
 #include "bcm43xx_main.h"
 #include "bcm43xx_radio.h"
 
+
+/* The WIRELESS_EXT version, which is implemented by this driver. */
+#define BCM43xx_WX_VERSION	18
+
+
 /* Define to enable a printk on each wx handler function invocation */
 //#define BCM43xx_WX_DEBUG
 
@@ -282,7 +287,12 @@ static int bcm43xx_wx_get_rangeparams(st
 	range->max_encoding_tokens = WEP_KEYS;
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 16;
+	range->we_version_source = BCM43xx_WX_VERSION;
+
+	range->enc_capa = IW_ENC_CAPA_WPA |
+			  IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP |
+			  IW_ENC_CAPA_CIPHER_CCMP;
 
 	spin_lock_irqsave(&bcm->lock, flags);
 
---
0.99.8.GIT


--- NEW FILE 4181-NET-snap-needs-hardware-checksum-fix.txt ---
Subject: [PATCH] [NET] snap: needs hardware checksum fix
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138928006 -0800

The SNAP code pops off it's 5 byte header, but doesn't adjust
the checksum. This would cause problems when using device that
does IP over SNAP and hardware receive checksums.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/802/psnap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

applies-to: 632a2eded0668e9ce925ccae721feaf387364cff
42c5e15f18d63c1ecf79d52bdaf4ea31cd22416d
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 4d63894..34e4296 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -59,8 +59,10 @@ static int snap_rcv(struct sk_buff *skb,
 	proto = find_snap_client(skb->h.raw);
 	if (proto) {
 		/* Pass the frame on. */
+		u8 *hdr = skb->data;
 		skb->h.raw  += 5;
 		skb_pull(skb, 5);
+		skb_postpull_rcsum(skb, hdr, 5);
 		rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
 	} else {
 		skb->sk = NULL;
---
0.99.8.GIT


--- NEW FILE 4182-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt ---
Subject: [PATCH] [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1138928145 -0800

Currently the logic in ipv6_ifa_notify is to hold an extra reference
count for addrconf dst's that get added to the routing table.  Thus,
when addrconf dst entries are taken out of the routing table, we need
to drop that dst.  However, addrconf dst entries may be removed from
the routing table by means other than __ipv6_ifa_notify.

So we're faced with the choice of either fixing up all places where
addrconf dst entries are removed, or dropping the extra reference count
altogether.

I chose the latter because the ifp itself always holds a dst reference
count of 1 while it's alive.  This is dropped just before we kfree the
ifp object.  Therefore we know that in __ipv6_ifa_notify we will always
hold that count.

This bug was found by Eric W. Biederman.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/addrconf.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

applies-to: 1f93d1430321312857a93157276aa94c2b5db14d
4641e7a334adf6856300a98e7296dfc886c446af
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d328d59..1db5048 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3321,9 +3321,7 @@ static void __ipv6_ifa_notify(int event,
 
 	switch (event) {
 	case RTM_NEWADDR:
-		dst_hold(&ifp->rt->u.dst);
-		if (ip6_ins_rt(ifp->rt, NULL, NULL, NULL))
-			dst_release(&ifp->rt->u.dst);
+		ip6_ins_rt(ifp->rt, NULL, NULL, NULL);
 		if (ifp->idev->cnf.forwarding)
 			addrconf_join_anycast(ifp);
 		break;
@@ -3334,8 +3332,6 @@ static void __ipv6_ifa_notify(int event,
 		dst_hold(&ifp->rt->u.dst);
 		if (ip6_del_rt(ifp->rt, NULL, NULL, NULL))
 			dst_free(&ifp->rt->u.dst);
-		else
-			dst_release(&ifp->rt->u.dst);
 		break;
 	}
 }
---
0.99.8.GIT


--- NEW FILE 4183-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt ---
Subject: [PATCH] [SCTP]: Fix 'fast retransmit' to send a TSN only once.
From: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: 1138928251 -0800

SCTP used to "fast retransmit" a TSN every time we hit the number
of missing reports for the TSN.  However the Implementers Guide
specifies that we should only "fast retransmit" a given TSN once.
Subsequent retransmits should be timeouts only. Also change the
number of missing reports to 3 as per the latest IG(similar to TCP).

Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: Sridhar Samudrala <sri at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/sctp/structs.h |    2 +-
 net/sctp/output.c          |    2 +-
 net/sctp/outqueue.c        |   12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

applies-to: 39030c280f6fbfa183c2ce5a0db37118ce5a7810
27852c26baab8b95fc9a2b3e8a18770ecd553f10
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8c522ae..072f407 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -700,7 +700,7 @@ struct sctp_chunk {
 	__u8 ecn_ce_done;	/* Have we processed the ECN CE bit? */
 	__u8 pdiscard;		/* Discard the whole packet now? */
 	__u8 tsn_gap_acked;	/* Is this chunk acked by a GAP ACK? */
-	__u8 fast_retransmit;	 /* Is this chunk fast retransmitted? */
+	__s8 fast_retransmit;	 /* Is this chunk fast retransmitted? */
 	__u8 tsn_missing_report; /* Data chunk missing counter. */
 };
 
diff --git a/net/sctp/output.c b/net/sctp/output.c
index a40991e..437cba7 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -608,7 +608,7 @@ static sctp_xmit_t sctp_packet_append_da
 	 *    When a Fast Retransmit is being performed the sender SHOULD
 	 *    ignore the value of cwnd and SHOULD NOT delay retransmission.
 	 */
-	if (!chunk->fast_retransmit)
+	if (chunk->fast_retransmit <= 0)
 		if (transport->flight_size >= transport->cwnd) {
 			retval = SCTP_XMIT_RWND_FULL;
 			goto finish;
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index efb72fa..f148f95 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -406,7 +406,7 @@ void sctp_retransmit_mark(struct sctp_ou
 		 * chunks that are not yet acked should be added to the
 		 * retransmit queue.
 		 */
-		if ((fast_retransmit && chunk->fast_retransmit) ||
+		if ((fast_retransmit && (chunk->fast_retransmit > 0)) ||
 		   (!fast_retransmit && !chunk->tsn_gap_acked)) {
 			/* RFC 2960 6.2.1 Processing a Received SACK
 			 *
@@ -603,7 +603,8 @@ static int sctp_outq_flush_rtx(struct sc
 			/* Mark the chunk as ineligible for fast retransmit 
 			 * after it is retransmitted.
 			 */
-			chunk->fast_retransmit = 0;
+			if (chunk->fast_retransmit > 0)
+				chunk->fast_retransmit = -1;
 
 			*start_timer = 1;
 			q->empty = 0;
@@ -621,7 +622,8 @@ static int sctp_outq_flush_rtx(struct sc
 			list_for_each(lchunk1, lqueue) {
 				chunk1 = list_entry(lchunk1, struct sctp_chunk,
 						    transmitted_list);
-				chunk1->fast_retransmit = 0;
+				if (chunk1->fast_retransmit > 0)
+					chunk1->fast_retransmit = -1;
 			}
 		}
 	}
@@ -1562,11 +1564,11 @@ static void sctp_mark_missing(struct sct
 		/*
 		 * M4) If any DATA chunk is found to have a
 		 * 'TSN.Missing.Report'
-		 * value larger than or equal to 4, mark that chunk for
+		 * value larger than or equal to 3, mark that chunk for
 		 * retransmission and start the fast retransmit procedure.
 		 */
 
-		if (chunk->tsn_missing_report >= 4) {
+		if (chunk->tsn_missing_report >= 3) {
 			chunk->fast_retransmit = 1;
 			do_fast_retransmit = 1;
 		}
---
0.99.8.GIT


--- NEW FILE 4184-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt ---
Subject: [PATCH] [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1138928356 -0800

The spin locks in multipath_wrandom may be obtained from either process
context or softirq context depending on whether the packet is locally
or remotely generated.  Therefore we need to disable BH processing when
taking these locks.

This bug was found by Ingo's lock validator.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/multipath_wrandom.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

applies-to: f07d3c696598ce6e7181ee30344bce899971e062
f8addb3215bf58154f189017d934dfc06b62c75e
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c
index d34a9fa..342d0b9 100644
--- a/net/ipv4/multipath_wrandom.c
+++ b/net/ipv4/multipath_wrandom.c
@@ -228,7 +228,7 @@ static void wrandom_set_nhinfo(__u32 net
 	struct multipath_dest *d, *target_dest = NULL;
 
 	/* store the weight information for a certain route */
-	spin_lock(&state[state_idx].lock);
+	spin_lock_bh(&state[state_idx].lock);
 
 	/* find state entry for gateway or add one if necessary */
 	list_for_each_entry_rcu(r, &state[state_idx].head, list) {
@@ -276,7 +276,7 @@ static void wrandom_set_nhinfo(__u32 net
 	 * we are finished
 	 */
 
-	spin_unlock(&state[state_idx].lock);
+	spin_unlock_bh(&state[state_idx].lock);
 }
 
 static void __multipath_free(struct rcu_head *head)
@@ -302,7 +302,7 @@ static void wrandom_flush(void)
 	for (i = 0; i < MULTIPATH_STATE_SIZE; ++i) {
 		struct multipath_route *r;
 
-		spin_lock(&state[i].lock);
+		spin_lock_bh(&state[i].lock);
 		list_for_each_entry_rcu(r, &state[i].head, list) {
 			struct multipath_dest *d;
 			list_for_each_entry_rcu(d, &r->dests, list) {
@@ -315,7 +315,7 @@ static void wrandom_flush(void)
 				 __multipath_free);
 		}
 
-		spin_unlock(&state[i].lock);
+		spin_unlock_bh(&state[i].lock);
 	}
 }
 
---
0.99.8.GIT


--- NEW FILE 4185-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt ---
Subject: [PATCH] [IPV6]: Fix illegal dst locking in softirq context.
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1138928473 -0800

On Tue, Jan 31, 2006 at 10:24:32PM +0100, Ingo Molnar wrote:
>
>  [<c04de9e8>] _write_lock+0x8/0x10
>  [<c0499015>] inet6_destroy_sock+0x25/0x100
>  [<c04b8672>] tcp_v6_destroy_sock+0x12/0x20
>  [<c046bbda>] inet_csk_destroy_sock+0x4a/0x150
>  [<c047625c>] tcp_rcv_state_process+0xd4c/0xdd0
>  [<c047d8e9>] tcp_v4_do_rcv+0xa9/0x340
>  [<c047eabb>] tcp_v4_rcv+0x8eb/0x9d0

OK this is definitely broken.  We should never touch the dst lock in
softirq context.  Since inet6_destroy_sock may be called from that
context due to the asynchronous nature of sockets, we can't take the
lock there.

In fact this sk_dst_reset is totally redundant since all IPv6 sockets
use inet_sock_destruct as their socket destructor which always cleans
up the dst anyway.  So the solution is to simply remove the call.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/af_inet6.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

applies-to: 408ad5d1eac85858c44b68b957ae235a4ce41eed
6f4b6ec1cffcbb12cc47244381496d59b6a5a790
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 064ffab..6c9711a 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -369,12 +369,6 @@ int inet6_destroy_sock(struct sock *sk)
 	struct sk_buff *skb;
 	struct ipv6_txoptions *opt;
 
-	/*
-	 *	Release destination entry
-	 */
-
-	sk_dst_reset(sk);
-
 	/* Release rx options */
 
 	if ((skb = xchg(&np->pktoptions, NULL)) != NULL)
---
0.99.8.GIT


--- NEW FILE 4187-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt ---
Subject: [PATCH] [IPV4]: Remove suprious use of goto out: in icmp_reply
From: Horms <horms at verge.net.au>
Date: 1138928598 -0800

This seems to be an artifact of the follwoing commit in February '02.

e7e173af42dbf37b1d946f9ee00219cb3b2bea6a

In a nutshell, goto out and return actually do the same thing,
and both are called in this function. This patch removes out.

Signed-Off-By: Horms <horms at verge.net.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/icmp.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

applies-to: 47b6d056cba5339643ac39775864aeb904f0f848
f00c401b9b5f0a90e2eb05705f5988fbda0b082b
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 105039e..6bc0887 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -385,7 +385,7 @@ static void icmp_reply(struct icmp_bxm *
 	u32 daddr;
 
 	if (ip_options_echo(&icmp_param->replyopts, skb))
-		goto out;
+		return;
 
 	if (icmp_xmit_lock())
 		return;
@@ -416,7 +416,6 @@ static void icmp_reply(struct icmp_bxm *
 	ip_rt_put(rt);
 out_unlock:
 	icmp_xmit_unlock();
-out:;
 }
 
 
---
0.99.8.GIT


--- NEW FILE 4189-TG3-Flush-tg3_reset_task.txt ---
Subject: [PATCH] [TG3]: Flush tg3_reset_task()
From: Michael Chan <mchan at broadcom.com>
Date: 1138930168 -0800

Make sure tg3_reset_task() is flushed in the close and suspend paths
as noted by Jeff Garzik.

In the close path, calling flush_scheduled_work() may cause deadlock
if linkwatch_event() is on the workqueue. linkwatch_event() will try
to get the rtnl_lock() which is already held by tg3_close(). So
instead, we set a flag in tg3_reset_task() and tg3_close() polls
the flag until it is cleared.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c |   26 ++++++++++++++++++++++++--
 drivers/net/tg3.h |    1 +
 2 files changed, 25 insertions(+), 2 deletions(-)

applies-to: 177b1a3f213410bc526fda0cdb1b0568ea282d82
7faa006f94fda56a587242b2a22fa19abf840222
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f2d1daf..6fb29ca 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3482,6 +3482,17 @@ static void tg3_reset_task(void *_data)
 	struct tg3 *tp = _data;
 	unsigned int restart_timer;
 
+	tg3_full_lock(tp, 0);
+	tp->tg3_flags |= TG3_FLAG_IN_RESET_TASK;
+
+	if (!netif_running(tp->dev)) {
+		tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK;
+		tg3_full_unlock(tp);
+		return;
+	}
+
+	tg3_full_unlock(tp);
+
 	tg3_netif_stop(tp);
 
 	tg3_full_lock(tp, 1);
@@ -3494,10 +3505,12 @@ static void tg3_reset_task(void *_data)
 
 	tg3_netif_start(tp);
 
-	tg3_full_unlock(tp);
-
 	if (restart_timer)
 		mod_timer(&tp->timer, jiffies + 1);
+
+	tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK;
+
+	tg3_full_unlock(tp);
 }
 
 static void tg3_tx_timeout(struct net_device *dev)
@@ -6786,6 +6799,13 @@ static int tg3_close(struct net_device *
 {
 	struct tg3 *tp = netdev_priv(dev);
 
+	/* Calling flush_scheduled_work() may deadlock because
+	 * linkwatch_event() may be on the workqueue and it will try to get
+	 * the rtnl_lock which we are holding.
+	 */
+	while (tp->tg3_flags & TG3_FLAG_IN_RESET_TASK)
+		msleep(1);
+
 	netif_stop_queue(dev);
 
 	del_timer_sync(&tp->timer);
@@ -10880,6 +10900,7 @@ static void __devexit tg3_remove_one(str
 	if (dev) {
 		struct tg3 *tp = netdev_priv(dev);
 
+		flush_scheduled_work();
 		unregister_netdev(dev);
 		if (tp->regs) {
 			iounmap(tp->regs);
@@ -10901,6 +10922,7 @@ static int tg3_suspend(struct pci_dev *p
 	if (!netif_running(dev))
 		return 0;
 
+	flush_scheduled_work();
 	tg3_netif_stop(tp);
 
 	del_timer_sync(&tp->timer);
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index e824330..7f4b7f6 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2162,6 +2162,7 @@ struct tg3 {
 #define TG3_FLAG_JUMBO_RING_ENABLE	0x00800000
 #define TG3_FLAG_10_100_ONLY		0x01000000
 #define TG3_FLAG_PAUSE_AUTONEG		0x02000000
+#define TG3_FLAG_IN_RESET_TASK		0x04000000
 #define TG3_FLAG_BROKEN_CHECKSUMS	0x10000000
 #define TG3_FLAG_GOT_SERDES_FLOWCTL	0x20000000
 #define TG3_FLAG_SPLIT_MODE		0x40000000
---
0.99.8.GIT


--- NEW FILE 4190-TG3-Update-driver-version-and-release-date.txt ---
Subject: [PATCH] [TG3]: Update driver version and release date.
From: David S. Miller <davem at sunset.davemloft.net>
Date: 1138930199 -0800

Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: b1354b391829bc3f1d83fd3121167318f8472147
6e2be3ea4fab4d1c02e369719311e8d7ae6cc7c1
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6fb29ca..e7dc653 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -69,8 +69,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.48"
-#define DRV_MODULE_RELDATE	"Jan 16, 2006"
+#define DRV_MODULE_VERSION	"3.49"
+#define DRV_MODULE_RELDATE	"Feb 2, 2006"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
---
0.99.8.GIT


--- NEW FILE 4191-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt ---
Subject: [PATCH] [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138941609 -0800

If you are on a hostile network, or are running protocol tests, you can
easily get the logged swamped by messages about bad UDP and ICMP packets.
This turns those messages off unless a config option is enabled.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Acked-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/sock.h |    8 ++++----
 net/Kconfig        |    7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

applies-to: e8f036af13821f9e5ee5062fa50f3c30a5c4ebee
0dec456d1fe73e0539625f0973ee8ef8fb805943
diff --git a/include/net/sock.h b/include/net/sock.h
index 1806e5b..3075803 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1354,12 +1354,12 @@ extern int sock_get_timestamp(struct soc
  *	Enable debug/info messages 
  */
 
-#if 0
-#define NETDEBUG(fmt, args...)	do { } while (0)
-#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
-#else
+#ifdef CONFIG_NETDEBUG
 #define NETDEBUG(fmt, args...)	printk(fmt,##args)
 #define LIMIT_NETDEBUG(fmt, args...) do { if (net_ratelimit()) printk(fmt,##args); } while(0)
+#else
+#define NETDEBUG(fmt, args...)	do { } while (0)
+#define LIMIT_NETDEBUG(fmt, args...) do { } while(0)
 #endif
 
 /*
diff --git a/net/Kconfig b/net/Kconfig
index bc603d9..5126f58 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -27,6 +27,13 @@ if NET
 
 menu "Networking options"
 
+config NETDEBUG
+	bool "Network packet debugging"
+	help
+	  You can say Y here if you want to get additional messages useful in
+	  debugging bad packets, but can overwhelm logs under denial of service
+	  attacks.
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
---
0.99.8.GIT


--- NEW FILE 4213-3c59x-collision-statistic-fix.txt ---
Subject: [PATCH] 3c59x: collision statistic fix
From: Steffen Klassert <klassert at mathematik.tu-chemnitz.de>
Date: 1138964637 -0800

Count the total number of packets with collisions during transmission in
vp->stats.collisions.

Signed-off-by: Steffen Klassert <klassert at mathematik.tu-chemnitz.de>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 drivers/net/3c59x.c |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

applies-to: 909deca0ac2476a839b446de382a4866dccf0196
8d1d0340da3fc7d1a8d9198e74e97d2db6c3f86f
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 7488ee7..7f47124 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -753,9 +753,11 @@ enum tx_desc_status {
 enum ChipCaps { CapBusMaster=0x20, CapPwrMgmt=0x2000 };
 
 struct vortex_extra_stats {
-        unsigned long tx_deferred;
-        unsigned long tx_multiple_collisions;
-        unsigned long rx_bad_ssd;
+	unsigned long tx_deferred;
+	unsigned long tx_max_collisions;
+	unsigned long tx_multiple_collisions;
+	unsigned long tx_single_collisions;
+	unsigned long rx_bad_ssd;
 };
 
 struct vortex_private {
@@ -863,12 +865,14 @@ static struct {
 	const char str[ETH_GSTRING_LEN];
 } ethtool_stats_keys[] = {
 	{ "tx_deferred" },
+	{ "tx_max_collisions" },
 	{ "tx_multiple_collisions" },
+	{ "tx_single_collisions" },
 	{ "rx_bad_ssd" },
 };
 
 /* number of ETHTOOL_GSTATS u64's */
-#define VORTEX_NUM_STATS     3
+#define VORTEX_NUM_STATS    5
 
 static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
 				   int chip_idx, int card_idx);
@@ -2108,9 +2112,12 @@ vortex_error(struct net_device *dev, int
 		iowrite8(0, ioaddr + TxStatus);
 		if (tx_status & 0x30) {			/* txJabber or txUnderrun */
 			do_tx_reset = 1;
-		} else if ((tx_status & 0x08) && (vp->drv_flags & MAX_COLLISION_RESET)) {	/* maxCollisions */
-			do_tx_reset = 1;
-			reset_mask = 0x0108;		/* Reset interface logic, but not download logic */
+		} else if (tx_status & 0x08) {	/* maxCollisions */
+			vp->xstats.tx_max_collisions++;
+			if (vp->drv_flags & MAX_COLLISION_RESET) {
+				do_tx_reset = 1;
+				reset_mask = 0x0108;		/* Reset interface logic, but not download logic */
+			}
 		} else {						/* Merely re-enable the transmitter. */
 			iowrite16(TxEnable, ioaddr + EL3_CMD);
 		}
@@ -2926,7 +2933,6 @@ static void update_stats(void __iomem *i
 	EL3WINDOW(6);
 	vp->stats.tx_carrier_errors		+= ioread8(ioaddr + 0);
 	vp->stats.tx_heartbeat_errors		+= ioread8(ioaddr + 1);
-	vp->stats.collisions			+= ioread8(ioaddr + 3);
 	vp->stats.tx_window_errors		+= ioread8(ioaddr + 4);
 	vp->stats.rx_fifo_errors		+= ioread8(ioaddr + 5);
 	vp->stats.tx_packets			+= ioread8(ioaddr + 6);
@@ -2939,10 +2945,15 @@ static void update_stats(void __iomem *i
 	vp->stats.tx_bytes 			+= ioread16(ioaddr + 12);
 	/* Extra stats for get_ethtool_stats() */
 	vp->xstats.tx_multiple_collisions	+= ioread8(ioaddr + 2);
+	vp->xstats.tx_single_collisions         += ioread8(ioaddr + 3);
 	vp->xstats.tx_deferred			+= ioread8(ioaddr + 8);
 	EL3WINDOW(4);
 	vp->xstats.rx_bad_ssd			+= ioread8(ioaddr + 12);
 
+	vp->stats.collisions = vp->xstats.tx_multiple_collisions
+		+ vp->xstats.tx_single_collisions
+		+ vp->xstats.tx_max_collisions;
+
 	{
 		u8 up = ioread8(ioaddr + 13);
 		vp->stats.rx_bytes += (up & 0x0f) << 16;
@@ -3036,8 +3047,10 @@ static void vortex_get_ethtool_stats(str
 	spin_unlock_irqrestore(&vp->lock, flags);
 
 	data[0] = vp->xstats.tx_deferred;
-	data[1] = vp->xstats.tx_multiple_collisions;
-	data[2] = vp->xstats.rx_bad_ssd;
+	data[1] = vp->xstats.tx_max_collisions;
+	data[2] = vp->xstats.tx_multiple_collisions;
+	data[3] = vp->xstats.tx_single_collisions;
+	data[4] = vp->xstats.rx_bad_ssd;
 }
 
 
---
0.99.8.GIT


--- NEW FILE 4327-ICMP-Fix-extra-dst-release-when-ip_options_echo-fails.txt ---
Subject: [PATCH] [ICMP]: Fix extra dst release when ip_options_echo fails
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1139047774 -0800

When two ip_route_output_key lookups in icmp_send were combined I
forgot to change the error path for ip_options_echo to not drop the
dst reference since it now sits before the dst lookup.  To fix it we
simply jump past the ip_rt_put call.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/icmp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 39d6a2b1644e4c5ab17da7e82a09f37a65211b23
fa60cf7f64a00c16e95717e8dccdb128877e342a
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 6bc0887..4d1c409 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -524,7 +524,7 @@ void icmp_send(struct sk_buff *skb_in, i
 					  iph->tos;
 
 	if (ip_options_echo(&icmp_param.replyopts, skb_in))
-		goto ende;
+		goto out_unlock;
 
 
 	/*
---
0.99.8.GIT


--- NEW FILE 4328-NETFILTER-ctnetlink-Fix-subsystem-used-for-expectation-events.txt ---
Subject: [PATCH] [NETFILTER]: ctnetlink: Fix subsystem used for expectation events
From: Marcus Sundberg <marcus at ingate.com>
Date: 1139047869 -0800

The ctnetlink expectation events should use the NFNL_SUBSYS_CTNETLINK_EXP
subsystem, not NFNL_SUBSYS_CTNETLINK.

Signed-off-by: Marcus Sundberg <marcus at ingate.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/netfilter/ip_conntrack_netlink.c |    2 +-
 net/netfilter/nf_conntrack_netlink.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

applies-to: ec8ca75f79971c6bd2b3754b6207a4adce51e37c
b633ad5fbf9e534142208700c58a530a4091eaab
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index c9ebbe0..b62518b 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -1216,7 +1216,7 @@ static int ctnetlink_expect_event(struct
 
 	b = skb->tail;
 
-	type |= NFNL_SUBSYS_CTNETLINK << 8;
+	type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
 	nlh   = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
 	nfmsg = NLMSG_DATA(nlh);
 
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 73ab16b..e98d00c 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1232,7 +1232,7 @@ static int ctnetlink_expect_event(struct
 
 	b = skb->tail;
 
-	type |= NFNL_SUBSYS_CTNETLINK << 8;
+	type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
 	nlh   = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
 	nfmsg = NLMSG_DATA(nlh);
 
---
0.99.8.GIT


--- NEW FILE 4329-NETFILTER-ctnetlink-add-MODULE_ALIAS-for-expectation-subsystem.txt ---
Subject: [PATCH] [NETFILTER]: ctnetlink: add MODULE_ALIAS for expectation subsystem
From: Pablo Neira Ayuso <pablo at netfilter.org>
Date: 1139047901 -0800

Add load-on-demand support for expectation request. eg. conntrack -L expect

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/netfilter/ip_conntrack_netlink.c |    1 +
 net/netfilter/nf_conntrack_netlink.c      |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

applies-to: e848b88ce0b820bd1193c8a3d0ecea4eb5a39be0
34f9a2e4deb760ddcb94cd0cd4f9ce18070d53d9
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index b62518b..e0b5926 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -1567,6 +1567,7 @@ static struct nfnetlink_subsystem ctnl_e
 };
 
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK);
+MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK_EXP);
 
 static int __init ctnetlink_init(void)
 {
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index e98d00c..9ff3463 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1589,6 +1589,7 @@ static struct nfnetlink_subsystem ctnl_e
 };
 
 MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK);
+MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK_EXP);
 
 static int __init ctnetlink_init(void)
 {
---
0.99.8.GIT


--- NEW FILE 4330-NETFILTER-nf_conntrack-check-address-family-when-finding-protocol-module.txt ---
Subject: [PATCH] [NETFILTER]: nf_conntrack: check address family when finding protocol module
From: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
Date: 1139047934 -0800

__nf_conntrack_{l3}proto_find() doesn't check the passed protocol family,
then it's possible to touch out of the array which has only AF_MAX items.

Spotted by Pablo Neira Ayuso.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/netfilter/nf_conntrack_l3proto.h |   15 +++++++++------
 net/netfilter/nf_conntrack_core.c            |    2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

applies-to: 8ab1f53445e3b422b72987e2e99d13ffe13dab0c
ddc8d029ac6813827849801bce2d8c8813070db6
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 67856eb..dac43b1 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -88,12 +88,6 @@ extern struct nf_conntrack_l3proto *nf_c
 extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
 extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
 
-static inline struct nf_conntrack_l3proto *
-__nf_ct_l3proto_find(u_int16_t l3proto)
-{
-	return nf_ct_l3protos[l3proto];
-}
-
 extern struct nf_conntrack_l3proto *
 nf_ct_l3proto_find_get(u_int16_t l3proto);
 
@@ -103,4 +97,13 @@ extern void nf_ct_l3proto_put(struct nf_
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;
+
+static inline struct nf_conntrack_l3proto *
+__nf_ct_l3proto_find(u_int16_t l3proto)
+{
+	if (unlikely(l3proto >= AF_MAX))
+		return &nf_conntrack_generic_l3proto;
+	return nf_ct_l3protos[l3proto];
+}
+
 #endif /*_NF_CONNTRACK_L3PROTO_H*/
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 62bb509..0ce337a 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -188,7 +188,7 @@ extern struct nf_conntrack_protocol nf_c
 struct nf_conntrack_protocol *
 __nf_ct_proto_find(u_int16_t l3proto, u_int8_t protocol)
 {
-	if (unlikely(nf_ct_protos[l3proto] == NULL))
+	if (unlikely(l3proto >= AF_MAX || nf_ct_protos[l3proto] == NULL))
 		return &nf_conntrack_generic_protocol;
 
 	return nf_ct_protos[l3proto][protocol];
---
0.99.8.GIT


--- NEW FILE 4331-NETFILTER-ULOG-nfnetlink_log-Use-better-default-value-for-nlbufsiz.txt ---
Subject: [PATCH] [NETFILTER]: ULOG/nfnetlink_log: Use better default value for 'nlbufsiz'
From: Holger Eitzenberger <heitzenberger at astaro.com>
Date: 1139047994 -0800

Performance tests showed that ULOG may fail on heavy loaded systems
because of failed order-N allocations (N >= 1).

The default value of 4096 is not optimal in the sense that it actually
allocates _two_ contigous physical pages.  Reasoning: ULOG uses
alloc_skb(), which adds another ~300 bytes for skb_shared_info.

This patch sets the default value to NLMSG_GOODSIZE and adds some
documentation at the top.

Signed-off-by: Holger Eitzenberger <heitzenberger at astaro.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/netfilter/ebt_ulog.c |    2 +-
 net/ipv4/netfilter/ipt_ULOG.c   |    6 +++++-
 net/netfilter/nfnetlink_log.c   |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

applies-to: f0ae3607018873a8ed3594b9d81f155aed75b906
c2db292438c20c3f13db6e5563e0ce5b449bedac
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index ce617b3..dbbf9f6 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -46,7 +46,7 @@
 #define PRINTR(format, args...) do { if (net_ratelimit()) \
                                 printk(format , ## args); } while (0)
 
-static unsigned int nlbufsiz = 4096;
+static unsigned int nlbufsiz = NLMSG_GOODSIZE;
 module_param(nlbufsiz, uint, 0600);
 MODULE_PARM_DESC(nlbufsiz, "netlink buffer size (number of bytes) "
                            "(defaults to 4096)");
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 641dbc4..2fe6413 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -35,6 +35,10 @@
  * each nlgroup you are using, so the total kernel memory usage increases
  * by that factor.
  *
+ * Actually you should use nlbufsiz a bit smaller than PAGE_SIZE, since
+ * nlbufsiz is used with alloc_skb, which adds another
+ * sizeof(struct skb_shared_info).  Use NLMSG_GOODSIZE instead.
+ *
  * flushtimeout:
  *   Specify, after how many hundredths of a second the queue should be
  *   flushed even if it is not full yet.
@@ -76,7 +80,7 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NE
 
 #define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
 
-static unsigned int nlbufsiz = 4096;
+static unsigned int nlbufsiz = NLMSG_GOODSIZE;
 module_param(nlbufsiz, uint, 0400);
 MODULE_PARM_DESC(nlbufsiz, "netlink buffer size");
 
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index e10512e..50787af 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -37,7 +37,7 @@
 #include "../bridge/br_private.h"
 #endif
 
-#define NFULNL_NLBUFSIZ_DEFAULT	4096
+#define NFULNL_NLBUFSIZ_DEFAULT	NLMSG_GOODSIZE
 #define NFULNL_TIMEOUT_DEFAULT 	100	/* every second */
 #define NFULNL_QTHRESH_DEFAULT 	100	/* 100 packets */
 
---
0.99.8.GIT


--- NEW FILE 4332-NETFILTER-Fix-undersized-skb-allocation-in-ipt_ULOG-ebt_ulog-nfnetlink_log.txt ---
Subject: [PATCH] [NETFILTER]: Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log
From: Patrick McHardy <kaber at trash.net>
Date: 1139048037 -0800

The skb allocated is always of size nlbufsize, even if that is smaller than
the size needed for the current packet.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/netfilter/ebt_ulog.c |    8 +++++---
 net/ipv4/netfilter/ipt_ULOG.c   |   22 +++++++++++++---------
 net/netfilter/nfnetlink_log.c   |   20 ++++++++++++--------
 3 files changed, 30 insertions(+), 20 deletions(-)

applies-to: 775c7aa2e2e6069cb238833e5328a7b42b23041a
ad2ad0f96546d6d56b2665bcc863c33ae57c49c4
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index dbbf9f6..802baf7 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -98,12 +98,14 @@ static void ulog_timer(unsigned long dat
 static struct sk_buff *ulog_alloc_skb(unsigned int size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
-	skb = alloc_skb(nlbufsiz, GFP_ATOMIC);
+	n = max(size, nlbufsiz);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
 		PRINTR(KERN_ERR "ebt_ulog: can't alloc whole buffer "
-		       "of size %ub!\n", nlbufsiz);
-		if (size < nlbufsiz) {
+		       "of size %ub!\n", n);
+		if (n > size) {
 			/* try to allocate only as much as we need for
 			 * current packet */
 			skb = alloc_skb(size, GFP_ATOMIC);
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 2fe6413..180a9ea 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -147,22 +147,26 @@ static void ulog_timer(unsigned long dat
 static struct sk_buff *ulog_alloc_skb(unsigned int size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
 	/* alloc skb which should be big enough for a whole
 	 * multipart message. WARNING: has to be <= 131000
 	 * due to slab allocator restrictions */
 
-	skb = alloc_skb(nlbufsiz, GFP_ATOMIC);
+	n = max(size, nlbufsiz);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
-		PRINTR("ipt_ULOG: can't alloc whole buffer %ub!\n",
-			nlbufsiz);
+		PRINTR("ipt_ULOG: can't alloc whole buffer %ub!\n", n);
 
-		/* try to allocate only as much as we need for 
-		 * current packet */
-
-		skb = alloc_skb(size, GFP_ATOMIC);
-		if (!skb)
-			PRINTR("ipt_ULOG: can't even allocate %ub\n", size);
+		if (n > size) {
+			/* try to allocate only as much as we need for 
+			 * current packet */
+
+			skb = alloc_skb(size, GFP_ATOMIC);
+			if (!skb)
+				PRINTR("ipt_ULOG: can't even allocate %ub\n",
+				       size);
+		}
 	}
 
 	return skb;
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 50787af..3b3c781 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -314,24 +314,28 @@ static struct sk_buff *nfulnl_alloc_skb(
 					unsigned int pkt_size)
 {
 	struct sk_buff *skb;
+	unsigned int n;
 
 	UDEBUG("entered (%u, %u)\n", inst_size, pkt_size);
 
 	/* alloc skb which should be big enough for a whole multipart
 	 * message.  WARNING: has to be <= 128k due to slab restrictions */
 
-	skb = alloc_skb(inst_size, GFP_ATOMIC);
+	n = max(inst_size, pkt_size);
+	skb = alloc_skb(n, GFP_ATOMIC);
 	if (!skb) {
 		PRINTR("nfnetlink_log: can't alloc whole buffer (%u bytes)\n",
 			inst_size);
 
-		/* try to allocate only as much as we need for current
-		 * packet */
-
-		skb = alloc_skb(pkt_size, GFP_ATOMIC);
-		if (!skb)
-			PRINTR("nfnetlink_log: can't even alloc %u bytes\n",
-				pkt_size);
+		if (n > pkt_size) {
+			/* try to allocate only as much as we need for current
+			 * packet */
+
+			skb = alloc_skb(pkt_size, GFP_ATOMIC);
+			if (!skb)
+				PRINTR("nfnetlink_log: can't even alloc %u "
+				       "bytes\n", pkt_size);
+		}
 	}
 
 	return skb;
---
0.99.8.GIT


--- NEW FILE 4333-NETFILTER-nfnetlink_queue-fix-packet-marking-over-netlink.txt ---
Subject: [PATCH] [NETFILTER]: nfnetlink_queue: fix packet marking over netlink
From: Patrick McHardy <kaber at trash.net>
Date: 1139048064 -0800

The packet marked is the netlink skb, not the queued skb.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/netfilter/nfnetlink_queue.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

applies-to: 9c5f6357bd7a0ecb4748acfaf19a04ea3149707b
a706124d0a4d9daaf6b705d01de3aff18deecea8
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 18ed9c5..cac38b2 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -825,7 +825,8 @@ nfqnl_recv_verdict(struct sock *ctnl, st
 	}
 
 	if (nfqa[NFQA_MARK-1])
-		skb->nfmark = ntohl(*(u_int32_t *)NFA_DATA(nfqa[NFQA_MARK-1]));
+		entry->skb->nfmark = ntohl(*(u_int32_t *)
+		                           NFA_DATA(nfqa[NFQA_MARK-1]));
 		
 	issue_verdict(entry, verdict);
 	instance_put(queue);
---
0.99.8.GIT


--- NEW FILE 4334-NETFILTER-Fix-missing-src-port-initialization-in-tftp-expectation-mask.txt ---
Subject: [PATCH] [NETFILTER]: Fix missing src port initialization in tftp expectation mask
From: Patrick McHardy <kaber at trash.net>
Date: 1139048091 -0800

Reported by David Ahern <dahern at avaya.com>, netfilter bugzilla #426.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/netfilter/ip_conntrack_tftp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: f462b07dabcc529267afbf417acb16b08aded47d
6f169300787ddb07326cc0338434a162dbab8539
diff --git a/net/ipv4/netfilter/ip_conntrack_tftp.c b/net/ipv4/netfilter/ip_conntrack_tftp.c
index d3c5a37..4ba4463 100644
--- a/net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -71,6 +71,7 @@ static int tftp_help(struct sk_buff **ps
 
 		exp->tuple = ct->tuplehash[IP_CT_DIR_REPLY].tuple;
 		exp->mask.src.ip = 0xffffffff;
+		exp->mask.src.u.udp.port = 0;
 		exp->mask.dst.ip = 0xffffffff;
 		exp->mask.dst.u.udp.port = 0xffff;
 		exp->mask.dst.protonum = 0xff;
---
0.99.8.GIT


--- NEW FILE 4336-NETFILTER-nf_conntrack-fix-incorrect-memset-size-in-FTP-helper.txt ---
Subject: [PATCH] [NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper
From: Samir Bellabes <sbellabes at mandriva.com>
Date: 1139048166 -0800

This memset() is executing with a bad size. According to Yasuyuki Kozakai,
this memset() can be deleted, as 'ftp' is declared in global area.

Signed-off-by: Samir Bellabes <sbellabes at mandriva.com>
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/netfilter/nf_conntrack_ftp.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

applies-to: b8dcef5684d443cb83c745129facec8f00b5a048
df4e9574a36748c3a4d9b03ffca6b42321a797a9
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index ab0c920..6f210f3 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -657,8 +657,6 @@ static int __init init(void)
 	/* FIXME should be configurable whether IPv4 and IPv6 FTP connections
 		 are tracked or not - YK */
 	for (i = 0; i < ports_c; i++) {
-		memset(&ftp[i], 0, sizeof(struct nf_conntrack_helper));
-
 		ftp[i][0].tuple.src.l3num = PF_INET;
 		ftp[i][1].tuple.src.l3num = PF_INET6;
 		for (j = 0; j < 2; j++) {
---
0.99.8.GIT


--- NEW FILE 4338-NETFILTER-Check-policy-length-in-policy-match-strict-mode.txt ---
Subject: [PATCH] [NETFILTER]: Check policy length in policy match strict mode
From: Patrick McHardy <kaber at trash.net>
Date: 1139048246 -0800

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/netfilter/ipt_policy.c  |    2 +-
 net/ipv6/netfilter/ip6t_policy.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 85a6ba60fc5782d77779f466f1ad5f2ec4330914
e55f1bc5dcb60a47764f6eabd1501d2cb98fb2c4
diff --git a/net/ipv4/netfilter/ipt_policy.c b/net/ipv4/netfilter/ipt_policy.c
index 18ca825..a48949a 100644
--- a/net/ipv4/netfilter/ipt_policy.c
+++ b/net/ipv4/netfilter/ipt_policy.c
@@ -89,7 +89,7 @@ match_policy_out(const struct sk_buff *s
 			return 0;
 	}
 
-	return strict ? 1 : 0;
+	return strict ? i == info->len : 0;
 }
 
 static int match(const struct sk_buff *skb,
diff --git a/net/ipv6/netfilter/ip6t_policy.c b/net/ipv6/netfilter/ip6t_policy.c
index afe1cc4..9f38cd0 100644
--- a/net/ipv6/netfilter/ip6t_policy.c
+++ b/net/ipv6/netfilter/ip6t_policy.c
@@ -91,7 +91,7 @@ match_policy_out(const struct sk_buff *s
 			return 0;
 	}
 
-	return strict ? 1 : 0;
+	return strict ? i == info->len : 0;
 }
 
 static int match(const struct sk_buff *skb,
---
0.99.8.GIT


--- NEW FILE 4339-NETFILTER-Fix-ip6t_policy-address-matching.txt ---
Subject: [PATCH] [NETFILTER]: Fix ip6t_policy address matching
From: Patrick McHardy <kaber at trash.net>
Date: 1139048275 -0800

Fix two bugs in ip6t_policy address matching:
- misorder arguments to ip6_masked_addrcmp, mask must be the second argument
- inversion incorrectly applied to the entire expression instead of just
  the address comparison

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/netfilter/ip6t_policy.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

applies-to: e1737c03ad3d4843601d2eeef99f46d9064abfe0
878c41ce5747e1b417bdd92a694c33dc4bd6ec02
diff --git a/net/ipv6/netfilter/ip6t_policy.c b/net/ipv6/netfilter/ip6t_policy.c
index 9f38cd0..1d0f482 100644
--- a/net/ipv6/netfilter/ip6t_policy.c
+++ b/net/ipv6/netfilter/ip6t_policy.c
@@ -26,8 +26,9 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e)
 {
-#define MATCH_ADDR(x,y,z)	(!e->match.x || \
-				 ((ip6_masked_addrcmp((z), &e->x, &e->y)) == 0) ^ e->invert.x)
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				 \
+				 ((!ip6_masked_addrcmp(&e->x, &e->y, z)) \
+				  ^ e->invert.x))
 #define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 	
 	return MATCH_ADDR(saddr, smask, (struct in6_addr *)&x->props.saddr.a6) &&
---
0.99.8.GIT


--- NEW FILE 4340-NETFILTER-Prepare-ipt-ip6t-_policy-match-for-x_tables-unification.txt ---
Subject: [PATCH] [NETFILTER]: Prepare {ipt,ip6t}_policy match for x_tables unification
From: Patrick McHardy <kaber at trash.net>
Date: 1139048349 -0800

The IPv4 and IPv6 version of the policy match are identical besides address
comparison and the data structure used for userspace communication. Unify
the data structures to break compatiblity now (before it is released), so
we can port it to x_tables in 2.6.17.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/linux/netfilter_ipv4/ipt_policy.h  |   22 ++++++++++++++--------
 include/linux/netfilter_ipv6/ip6t_policy.h |   22 ++++++++++++++--------
 net/ipv4/netfilter/ipt_policy.c            |    9 ++++++---
 net/ipv6/netfilter/ip6t_policy.c           |    4 ++--
 4 files changed, 36 insertions(+), 21 deletions(-)

applies-to: fac206db8511afd50f8486dd8de8a4a3a7528c74
0047c65a60fa3b6607b55e058ea6a89f39cb3f28
diff --git a/include/linux/netfilter_ipv4/ipt_policy.h b/include/linux/netfilter_ipv4/ipt_policy.h
index 7fd1bec..a3f6eff 100644
--- a/include/linux/netfilter_ipv4/ipt_policy.h
+++ b/include/linux/netfilter_ipv4/ipt_policy.h
@@ -27,16 +27,22 @@ struct ipt_policy_spec
 			reqid:1;
 };
 
+union ipt_policy_addr
+{
+	struct in_addr	a4;
+	struct in6_addr	a6;
+};
+
 struct ipt_policy_elem
 {
-	u_int32_t	saddr;
-	u_int32_t	smask;
-	u_int32_t	daddr;
-	u_int32_t	dmask;
-	u_int32_t	spi;
-	u_int32_t	reqid;
-	u_int8_t	proto;
-	u_int8_t	mode;
+	union ipt_policy_addr	saddr;
+	union ipt_policy_addr	smask;
+	union ipt_policy_addr	daddr;
+	union ipt_policy_addr	dmask;
+	u_int32_t		spi;
+	u_int32_t		reqid;
+	u_int8_t		proto;
+	u_int8_t		mode;
 
 	struct ipt_policy_spec	match;
 	struct ipt_policy_spec	invert;
diff --git a/include/linux/netfilter_ipv6/ip6t_policy.h b/include/linux/netfilter_ipv6/ip6t_policy.h
index 5a93afc..671bd81 100644
--- a/include/linux/netfilter_ipv6/ip6t_policy.h
+++ b/include/linux/netfilter_ipv6/ip6t_policy.h
@@ -27,16 +27,22 @@ struct ip6t_policy_spec
 			reqid:1;
 };
 
+union ip6t_policy_addr
+{
+	struct in_addr	a4;
+	struct in6_addr	a6;
+};
+
 struct ip6t_policy_elem
 {
-	struct in6_addr	saddr;
-	struct in6_addr	smask;
-	struct in6_addr	daddr;
-	struct in6_addr	dmask;
-	u_int32_t	spi;
-	u_int32_t	reqid;
-	u_int8_t	proto;
-	u_int8_t	mode;
+	union ip6t_policy_addr	saddr;
+	union ip6t_policy_addr	smask;
+	union ip6t_policy_addr	daddr;
+	union ip6t_policy_addr	dmask;
+	u_int32_t		spi;
+	u_int32_t		reqid;
+	u_int8_t		proto;
+	u_int8_t		mode;
 
 	struct ip6t_policy_spec	match;
 	struct ip6t_policy_spec	invert;
diff --git a/net/ipv4/netfilter/ipt_policy.c b/net/ipv4/netfilter/ipt_policy.c
index a48949a..5a7a265 100644
--- a/net/ipv4/netfilter/ipt_policy.c
+++ b/net/ipv4/netfilter/ipt_policy.c
@@ -26,10 +26,13 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ipt_policy_elem *e)
 {
-#define MATCH(x,y)	(!e->match.x || ((e->x == (y)) ^ e->invert.x))
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				     \
+		                 ((e->x.a4.s_addr == (e->y.a4.s_addr & (z))) \
+				  ^ e->invert.x))
+#define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 
-	return MATCH(saddr, x->props.saddr.a4 & e->smask) &&
-	       MATCH(daddr, x->id.daddr.a4 & e->dmask) &&
+	return MATCH_ADDR(saddr, smask, x->props.saddr.a4) &&
+	       MATCH_ADDR(daddr, dmask, x->id.daddr.a4) &&
 	       MATCH(proto, x->id.proto) &&
 	       MATCH(mode, x->props.mode) &&
 	       MATCH(spi, x->id.spi) &&
diff --git a/net/ipv6/netfilter/ip6t_policy.c b/net/ipv6/netfilter/ip6t_policy.c
index 1d0f482..3d39ec9 100644
--- a/net/ipv6/netfilter/ip6t_policy.c
+++ b/net/ipv6/netfilter/ip6t_policy.c
@@ -26,8 +26,8 @@ MODULE_LICENSE("GPL");
 static inline int
 match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e)
 {
-#define MATCH_ADDR(x,y,z)	(!e->match.x ||				 \
-				 ((!ip6_masked_addrcmp(&e->x, &e->y, z)) \
+#define MATCH_ADDR(x,y,z)	(!e->match.x ||				       \
+				 ((!ip6_masked_addrcmp(&e->x.a6, &e->y.a6, z)) \
 				  ^ e->invert.x))
 #define MATCH(x,y)		(!e->match.x || ((e->x == (y)) ^ e->invert.x))
 	
---
0.99.8.GIT


--- NEW FILE 4341-NETFILTER-Fix-check-whether-dst_entry-needs-to-be-released-after-NAT.txt ---
Subject: [PATCH] [NETFILTER]: Fix check whether dst_entry needs to be released after NAT
From: Patrick McHardy <kaber at trash.net>
Date: 1139048386 -0800

After DNAT the original dst_entry needs to be released if present
so the packet doesn't skip input routing with its new address. The
current check for DNAT in ip_nat_in is reversed and checks for SNAT.

Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/netfilter/ip_nat_standalone.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 27fd894c370f7930e38c9e0e83cf9b572b51f4ba
7918d212df31fb7ddfb317c5a8dccdcec647d754
diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
index ad438fb..92c5499 100644
--- a/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -209,8 +209,8 @@ ip_nat_in(unsigned int hooknum,
 	    && (ct = ip_conntrack_get(*pskb, &ctinfo)) != NULL) {
 		enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
 
-		if (ct->tuplehash[dir].tuple.src.ip !=
-		    ct->tuplehash[!dir].tuple.dst.ip) {
+		if (ct->tuplehash[dir].tuple.dst.ip !=
+		    ct->tuplehash[!dir].tuple.src.ip) {
 			dst_release((*pskb)->dst);
 			(*pskb)->dst = NULL;
 		}
---
0.99.8.GIT


--- NEW FILE 4378-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt ---
Subject: [PATCH] [IPV6]: TUNNEL6: Don't try to add multicast route twice.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825363 +0900

Since addrconf_add_dev() has already called addrconf_add_mroute()
to added route for multicast prefix, there's no point to call it
again in addrconf_ip6_tnl_config().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/addrconf.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: baaa6598d79f94decad1d29857b5fcbfaea20d97
bec9a273e762875828629cda18ef103e23531415
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 1db5048..e6edc33 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2143,7 +2143,6 @@ static void addrconf_ip6_tnl_config(stru
 		return;
 	}
 	ip6_tnl_add_linklocal(idev);
-	addrconf_add_mroute(dev);
 }
 
 static int addrconf_notify(struct notifier_block *this, unsigned long event, 
---
0.99.8.GIT


--- NEW FILE 4379-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt ---
Subject: [PATCH] [NET]: NEIGHBOUR: Ensure to record time to neigh->updated when neighbour's state changed.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825364 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/core/neighbour.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

applies-to: 2cad3a30e064ed2ee0c91df714677d60023a940d
ec1ca6961bbd7f98fdece1ac61aa9b741049614c
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e68700f..e98975a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -750,11 +750,13 @@ static void neigh_timer_handler(unsigned
 					  neigh->used + neigh->parms->delay_probe_time)) {
 			NEIGH_PRINTK2("neigh %p is delayed.\n", neigh);
 			neigh->nud_state = NUD_DELAY;
+			neigh->updated = jiffies;
 			neigh_suspect(neigh);
 			next = now + neigh->parms->delay_probe_time;
 		} else {
 			NEIGH_PRINTK2("neigh %p is suspected.\n", neigh);
 			neigh->nud_state = NUD_STALE;
+			neigh->updated = jiffies;
 			neigh_suspect(neigh);
 		}
 	} else if (state & NUD_DELAY) {
@@ -762,11 +764,13 @@ static void neigh_timer_handler(unsigned
 				   neigh->confirmed + neigh->parms->delay_probe_time)) {
 			NEIGH_PRINTK2("neigh %p is now reachable.\n", neigh);
 			neigh->nud_state = NUD_REACHABLE;
+			neigh->updated = jiffies;
 			neigh_connect(neigh);
 			next = neigh->confirmed + neigh->parms->reachable_time;
 		} else {
 			NEIGH_PRINTK2("neigh %p is probed.\n", neigh);
 			neigh->nud_state = NUD_PROBE;
+			neigh->updated = jiffies;
 			atomic_set(&neigh->probes, 0);
 			next = now + neigh->parms->retrans_time;
 		}
@@ -780,6 +784,7 @@ static void neigh_timer_handler(unsigned
 		struct sk_buff *skb;
 
 		neigh->nud_state = NUD_FAILED;
+		neigh->updated = jiffies; 
 		notify = 1;
 		NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed);
 		NEIGH_PRINTK2("neigh %p is failed.\n", neigh);
@@ -843,10 +848,12 @@ int __neigh_event_send(struct neighbour 
 		if (neigh->parms->mcast_probes + neigh->parms->app_probes) {
 			atomic_set(&neigh->probes, neigh->parms->ucast_probes);
 			neigh->nud_state     = NUD_INCOMPLETE;
+			neigh->updated = jiffies;
 			neigh_hold(neigh);
 			neigh_add_timer(neigh, now + 1);
 		} else {
 			neigh->nud_state = NUD_FAILED;
+			neigh->updated = jiffies;
 			write_unlock_bh(&neigh->lock);
 
 			if (skb)
@@ -857,6 +864,7 @@ int __neigh_event_send(struct neighbour 
 		NEIGH_PRINTK2("neigh %p is delayed.\n", neigh);
 		neigh_hold(neigh);
 		neigh->nud_state = NUD_DELAY;
+		neigh->updated = jiffies;
 		neigh_add_timer(neigh,
 				jiffies + neigh->parms->delay_probe_time);
 	}
---
0.99.8.GIT


--- NEW FILE 4380-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt ---
Subject: [PATCH] [IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825365 +0900

RFC 3041 describes an algorithm to generate random interface
identifier.  In RFC 3041bis, it is allowed to use different
algorithm than one described in RFC 3041.

So, let's use our standard pseudo random algorithm to simplify
our implementation.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 include/net/if_inet6.h |    3 ---
 net/ipv6/Kconfig       |    7 ++++---
 net/ipv6/addrconf.c    |   45 +--------------------------------------------
 3 files changed, 5 insertions(+), 50 deletions(-)

applies-to: 6b5144aea35d6cb7632f59be3a8ee6393540eed4
a9916dac9a6812b4b9e0b8035459e5f566588877
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index eb8afe3..e459e1a 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -180,11 +180,8 @@ struct inet6_dev 
 
 #ifdef CONFIG_IPV6_PRIVACY
 	u8			rndid[8];
-	u8			entropy[8];
 	struct timer_list	regen_timer;
 	struct inet6_ifaddr	*tempaddr_list;
-	__u8			work_eui64[8];
-	__u8			work_digest[16];
 #endif
 
 	struct neigh_parms	*nd_parms;
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ab7a912..22efb8a 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -6,8 +6,6 @@
 config IPV6
 	tristate "The IPv6 protocol"
 	default m
-	select CRYPTO if IPV6_PRIVACY
-	select CRYPTO_MD5 if IPV6_PRIVACY
 	---help---
 	  This is complemental support for the IP version 6.
 	  You will still be able to do traditional IPv4 networking as well.
@@ -22,7 +20,7 @@ config IPV6
 	  module will be called ipv6.
 
 config IPV6_PRIVACY
-	bool "IPv6: Privacy Extensions (RFC 3041) support"
+	bool "IPv6: Privacy Extensions support"
 	depends on IPV6
 	---help---
 	  Privacy Extensions for Stateless Address Autoconfiguration in IPv6
@@ -30,6 +28,9 @@ config IPV6_PRIVACY
 	  pseudo-random global-scope unicast address(es) will assigned to
 	  your interface(s).
 	
+	  We use our standard pseudo random algorithm to generate randomized
+	  interface identifier, instead of one described in RFC 3041.
+	
 	  By default, kernel do not generate temporary addresses.
 	  To use temporary addresses, do
 	
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e6edc33..79ab530 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -78,8 +78,6 @@
 
 #ifdef CONFIG_IPV6_PRIVACY
 #include <linux/random.h>
-#include <linux/crypto.h>
-#include <linux/scatterlist.h>
 #endif
 
 #include <asm/uaccess.h>
@@ -110,8 +108,6 @@ static int __ipv6_try_regen_rndid(struct
 static void ipv6_regen_rndid(unsigned long data);
 
 static int desync_factor = MAX_DESYNC_FACTOR * HZ;
-static struct crypto_tfm *md5_tfm;
-static DEFINE_SPINLOCK(md5_tfm_lock);
 #endif
 
 static int ipv6_count_addresses(struct inet6_dev *idev);
@@ -371,8 +367,6 @@ static struct inet6_dev * ipv6_add_dev(s
 		in6_dev_hold(ndev);
 
 #ifdef CONFIG_IPV6_PRIVACY
-		get_random_bytes(ndev->rndid, sizeof(ndev->rndid));
-		get_random_bytes(ndev->entropy, sizeof(ndev->entropy));
 		init_timer(&ndev->regen_timer);
 		ndev->regen_timer.function = ipv6_regen_rndid;
 		ndev->regen_timer.data = (unsigned long) ndev;
@@ -1376,34 +1370,9 @@ static int ipv6_inherit_eui64(u8 *eui, s
 /* (re)generation of randomized interface identifier (RFC 3041 3.2, 3.5) */
 static int __ipv6_regen_rndid(struct inet6_dev *idev)
 {
-	struct net_device *dev;
-	struct scatterlist sg[2];
-
-	sg_set_buf(&sg[0], idev->entropy, 8);
-	sg_set_buf(&sg[1], idev->work_eui64, 8);
-
-	dev = idev->dev;
-
-	if (ipv6_generate_eui64(idev->work_eui64, dev)) {
-		printk(KERN_INFO
-			"__ipv6_regen_rndid(idev=%p): cannot get EUI64 identifier; use random bytes.\n",
-			idev);
-		get_random_bytes(idev->work_eui64, sizeof(idev->work_eui64));
-	}
 regen:
-	spin_lock(&md5_tfm_lock);
-	if (unlikely(md5_tfm == NULL)) {
-		spin_unlock(&md5_tfm_lock);
-		return -1;
-	}
-	crypto_digest_init(md5_tfm);
-	crypto_digest_update(md5_tfm, sg, 2);
-	crypto_digest_final(md5_tfm, idev->work_digest);
-	spin_unlock(&md5_tfm_lock);
-
-	memcpy(idev->rndid, &idev->work_digest[0], 8);
+	get_random_bytes(idev->rndid, sizeof(idev->rndid));
 	idev->rndid[0] &= ~0x02;
-	memcpy(idev->entropy, &idev->work_digest[8], 8);
 
 	/*
 	 * <draft-ietf-ipngwg-temp-addresses-v2-00.txt>:
@@ -3756,13 +3725,6 @@ int __init addrconf_init(void)
 
 	register_netdevice_notifier(&ipv6_dev_notf);
 
-#ifdef CONFIG_IPV6_PRIVACY
-	md5_tfm = crypto_alloc_tfm("md5", 0);
-	if (unlikely(md5_tfm == NULL))
-		printk(KERN_WARNING
-			"failed to load transform for md5\n");
-#endif
-
 	addrconf_verify(0);
 	rtnetlink_links[PF_INET6] = inet6_rtnetlink_table;
 #ifdef CONFIG_SYSCTL
@@ -3825,11 +3787,6 @@ void __exit addrconf_cleanup(void)
 
 	rtnl_unlock();
 
-#ifdef CONFIG_IPV6_PRIVACY
-	crypto_free_tfm(md5_tfm);
-	md5_tfm = NULL;
-#endif
-
 #ifdef CONFIG_PROC_FS
 	proc_net_remove("if_inet6");
 #endif
---
0.99.8.GIT


--- NEW FILE 4381-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt ---
Subject: [PATCH] [IPV6]: ADDRCONF: Split up ipv6_generate_eui64() by device type.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825367 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/addrconf.c |   91 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 53 insertions(+), 38 deletions(-)

applies-to: 4172b1685052ed03154fbc796cffbb4430838a9d
3f44bf0ec4e37fc9eddba14d741f9e8bc57f600b
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 79ab530..030c8a9 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1299,52 +1299,67 @@ static void addrconf_leave_anycast(struc
 	__ipv6_dev_ac_dec(ifp->idev, &addr);
 }
 
+static int addrconf_ifid_eui48(u8 *eui, struct net_device *dev)
+{
+	if (dev->addr_len != ETH_ALEN)
+		return -1;
+	memcpy(eui, dev->dev_addr, 3);
+	memcpy(eui + 5, dev->dev_addr + 3, 3);
+
+	/*
+	 * The zSeries OSA network cards can be shared among various
+	 * OS instances, but the OSA cards have only one MAC address.
+	 * This leads to duplicate address conflicts in conjunction
+	 * with IPv6 if more than one instance uses the same card.
+	 * 
+	 * The driver for these cards can deliver a unique 16-bit
+	 * identifier for each instance sharing the same card.  It is
+	 * placed instead of 0xFFFE in the interface identifier.  The
+	 * "u" bit of the interface identifier is not inverted in this
+	 * case.  Hence the resulting interface identifier has local
+	 * scope according to RFC2373.
+	 */
+	if (dev->dev_id) {
+		eui[3] = (dev->dev_id >> 8) & 0xFF;
+		eui[4] = dev->dev_id & 0xFF;
+	} else {
+		eui[3] = 0xFF;
+		eui[4] = 0xFE;
+		eui[0] ^= 2;
+	}
+	return 0;
+}
+
+static int addrconf_ifid_arcnet(u8 *eui, struct net_device *dev)
+{
+	/* XXX: inherit EUI-64 from other interface -- yoshfuji */
+	if (dev->addr_len != ARCNET_ALEN)
+		return -1;
+	memset(eui, 0, 7);
+	eui[7] = *(u8*)dev->dev_addr;
+	return 0;
+}
+
+static int addrconf_ifid_infiniband(u8 *eui, struct net_device *dev)
+{
+	if (dev->addr_len != INFINIBAND_ALEN)
+		return -1;
+	memcpy(eui, dev->dev_addr + 12, 8);
+	eui[0] |= 2;
+	return 0;
+}
+
 static int ipv6_generate_eui64(u8 *eui, struct net_device *dev)
 {
 	switch (dev->type) {
 	case ARPHRD_ETHER:
 	case ARPHRD_FDDI:
 	case ARPHRD_IEEE802_TR:
-		if (dev->addr_len != ETH_ALEN)
-			return -1;
-		memcpy(eui, dev->dev_addr, 3);
-		memcpy(eui + 5, dev->dev_addr + 3, 3);
-
-		/*
-		 * The zSeries OSA network cards can be shared among various
-		 * OS instances, but the OSA cards have only one MAC address.
-		 * This leads to duplicate address conflicts in conjunction
-		 * with IPv6 if more than one instance uses the same card.
-		 * 
-		 * The driver for these cards can deliver a unique 16-bit
-		 * identifier for each instance sharing the same card.  It is
-		 * placed instead of 0xFFFE in the interface identifier.  The
-		 * "u" bit of the interface identifier is not inverted in this
-		 * case.  Hence the resulting interface identifier has local
-		 * scope according to RFC2373.
-		 */
-		if (dev->dev_id) {
-			eui[3] = (dev->dev_id >> 8) & 0xFF;
-			eui[4] = dev->dev_id & 0xFF;
-		} else {
-			eui[3] = 0xFF;
-			eui[4] = 0xFE;
-			eui[0] ^= 2;
-		}
-		return 0;
+		return addrconf_ifid_eui48(eui, dev);
 	case ARPHRD_ARCNET:
-		/* XXX: inherit EUI-64 from other interface -- yoshfuji */
-		if (dev->addr_len != ARCNET_ALEN)
-			return -1;
-		memset(eui, 0, 7);
-		eui[7] = *(u8*)dev->dev_addr;
-		return 0;
+		return addrconf_ifid_arcnet(eui, dev);
 	case ARPHRD_INFINIBAND:
-		if (dev->addr_len != INFINIBAND_ALEN)
-			return -1;
-		memcpy(eui, dev->dev_addr + 12, 8);
-		eui[0] |= 2;
-		return 0;
+		return addrconf_ifid_infiniband(eui, dev);
 	}
 	return -1;
 }
---
0.99.8.GIT


--- NEW FILE 4382-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add accept_ra_defrtr sysctl.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825368 +0900

This controls whether we accept default router information
in RAs.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 Documentation/networking/ip-sysctl.txt |    6 ++++++
 include/linux/ipv6.h                   |    2 ++
 include/linux/sysctl.h                 |    1 +
 net/ipv6/addrconf.c                    |   11 +++++++++++
 net/ipv6/ndisc.c                       |    7 ++++++-
 5 files changed, 26 insertions(+), 1 deletions(-)

applies-to: 1352c2fc8b166cadb2f5acc7ea3b181252dc31c3
6bbb6f6b894c37741637bc6c6f7f093202d77d85
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 26364d0..8001faa 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -717,6 +717,12 @@ accept_ra - BOOLEAN
 	Functional default: enabled if local forwarding is disabled.
 			    disabled if local forwarding is enabled.
 
+accept_ra_defrtr - BOOLEAN
+	Learn default router in Router Advertisement.
+
+	Functional default: enabled if accept_ra is enabled.
+			    disabled if accept_ra is disabled.
+
 accept_redirects - BOOLEAN
 	Accept Redirects.
 
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 9c8f4c9..c5131a0 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -145,6 +145,7 @@ struct ipv6_devconf {
 	__s32		max_desync_factor;
 #endif
 	__s32		max_addresses;
+	__s32		accept_ra_defrtr;
 	void		*sysctl;
 };
 
@@ -167,6 +168,7 @@ enum {
 	DEVCONF_MAX_DESYNC_FACTOR,
 	DEVCONF_MAX_ADDRESSES,
 	DEVCONF_FORCE_MLD_VERSION,
+	DEVCONF_ACCEPT_RA_DEFRTR,
 	DEVCONF_MAX
 };
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 32a4139..e16cfe1 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -529,6 +529,7 @@ enum {
 	NET_IPV6_MAX_DESYNC_FACTOR=15,
 	NET_IPV6_MAX_ADDRESSES=16,
 	NET_IPV6_FORCE_MLD_VERSION=17,
+	NET_IPV6_ACCEPT_RA_DEFRTR=18,
 	__NET_IPV6_MAX
 };
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 030c8a9..035ffb0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -165,6 +165,7 @@ struct ipv6_devconf ipv6_devconf = {
 	.max_desync_factor	= MAX_DESYNC_FACTOR,
 #endif
 	.max_addresses		= IPV6_MAX_ADDRESSES,
+	.accept_ra_defrtr	= 1,
 };
 
 static struct ipv6_devconf ipv6_devconf_dflt = {
@@ -186,6 +187,7 @@ static struct ipv6_devconf ipv6_devconf_
 	.max_desync_factor	= MAX_DESYNC_FACTOR,
 #endif
 	.max_addresses		= IPV6_MAX_ADDRESSES,
+	.accept_ra_defrtr	= 1,
 };
 
 /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
@@ -3113,6 +3115,7 @@ static void inline ipv6_store_devconf(st
 	array[DEVCONF_MAX_DESYNC_FACTOR] = cnf->max_desync_factor;
 #endif
 	array[DEVCONF_MAX_ADDRESSES] = cnf->max_addresses;
+	array[DEVCONF_ACCEPT_RA_DEFRTR] = cnf->accept_ra_defrtr;
 }
 
 static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev, 
@@ -3566,6 +3569,14 @@ static struct addrconf_sysctl_table
 			.proc_handler	=	&proc_dointvec,
 		},
 		{
+			.ctl_name	=	NET_IPV6_ACCEPT_RA_DEFRTR,
+			.procname	=	"accept_ra_defrtr",
+         		.data		=	&ipv6_devconf.accept_ra_defrtr,
+			.maxlen		=	sizeof(int),
+			.mode		=	0644,
+         		.proc_handler	=	&proc_dointvec,
+		},
+		{
 			.ctl_name	=	0,	/* sentinel */
 		}
 	},
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index cb8856b..e171167 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1019,7 +1019,7 @@ static void ndisc_router_discovery(struc
         struct ra_msg *ra_msg = (struct ra_msg *) skb->h.raw;
 	struct neighbour *neigh = NULL;
 	struct inet6_dev *in6_dev;
-	struct rt6_info *rt;
+	struct rt6_info *rt = NULL;
 	int lifetime;
 	struct ndisc_options ndopts;
 	int optlen;
@@ -1081,6 +1081,9 @@ static void ndisc_router_discovery(struc
 				(ra_msg->icmph.icmp6_addrconf_other ?
 					IF_RA_OTHERCONF : 0);
 
+	if (!in6_dev->cnf.accept_ra_defrtr)
+		goto skip_defrtr;
+
 	lifetime = ntohs(ra_msg->icmph.icmp6_rt_lifetime);
 
 	rt = rt6_get_dflt_router(&skb->nh.ipv6h->saddr, skb->dev);
@@ -1128,6 +1131,8 @@ static void ndisc_router_discovery(struc
 			rt->u.dst.metrics[RTAX_HOPLIMIT-1] = ra_msg->icmph.icmp6_hop_limit;
 	}
 
+skip_defrtr:
+
 	/*
 	 *	Update Reachable Time and Retrans Timer
 	 */
---
0.99.8.GIT


--- NEW FILE 4383-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt ---
Subject: [PATCH] [IPV6]: ADDRCONF: Add accept_ra_pinfo sysctl.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825369 +0900

This controls whether we accept Prefix Information in RAs.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 Documentation/networking/ip-sysctl.txt |   10 ++++++++--
 include/linux/ipv6.h                   |    2 ++
 include/linux/sysctl.h                 |    1 +
 net/ipv6/addrconf.c                    |   11 +++++++++++
 net/ipv6/ndisc.c                       |    2 +-
 5 files changed, 23 insertions(+), 3 deletions(-)

applies-to: fc15c7c273fa3f62e7bd23a17d87e9c34333fd98
e33fea75479da39eea82207df26f5d93399a082d
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 8001faa..404afac 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -723,6 +723,12 @@ accept_ra_defrtr - BOOLEAN
 	Functional default: enabled if accept_ra is enabled.
 			    disabled if accept_ra is disabled.
 
+accept_ra_pinfo - BOOLEAN
+	Learn Prefix Inforamtion in Router Advertisement.
+
+	Functional default: enabled if accept_ra is enabled.
+			    disabled if accept_ra is disabled.
+
 accept_redirects - BOOLEAN
 	Accept Redirects.
 
@@ -733,8 +739,8 @@ autoconf - BOOLEAN
 	Autoconfigure addresses using Prefix Information in Router 
 	Advertisements.
 
-	Functional default: enabled if accept_ra is enabled.
-			    disabled if accept_ra is disabled.
+	Functional default: enabled if accept_ra_pinfo is enabled.
+			    disabled if accept_ra_pinfo is disabled.
 
 dad_transmits - INTEGER
 	The amount of Duplicate Address Detection probes to send.
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c5131a0..2c3b799 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -146,6 +146,7 @@ struct ipv6_devconf {
 #endif
 	__s32		max_addresses;
 	__s32		accept_ra_defrtr;
+	__s32		accept_ra_pinfo;
 	void		*sysctl;
 };
 
@@ -169,6 +170,7 @@ enum {
 	DEVCONF_MAX_ADDRESSES,
 	DEVCONF_FORCE_MLD_VERSION,
 	DEVCONF_ACCEPT_RA_DEFRTR,
+	DEVCONF_ACCEPT_RA_PINFO,
 	DEVCONF_MAX
 };
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index e16cfe1..70c612b 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -530,6 +530,7 @@ enum {
 	NET_IPV6_MAX_ADDRESSES=16,
 	NET_IPV6_FORCE_MLD_VERSION=17,
 	NET_IPV6_ACCEPT_RA_DEFRTR=18,
+	NET_IPV6_ACCEPT_RA_PINFO=19,
 	__NET_IPV6_MAX
 };
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 035ffb0..150bddf 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -166,6 +166,7 @@ struct ipv6_devconf ipv6_devconf = {
 #endif
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
+	.accept_ra_pinfo	= 1,
 };
 
 static struct ipv6_devconf ipv6_devconf_dflt = {
@@ -188,6 +189,7 @@ static struct ipv6_devconf ipv6_devconf_
 #endif
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
+	.accept_ra_pinfo	= 1,
 };
 
 /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
@@ -3116,6 +3118,7 @@ static void inline ipv6_store_devconf(st
 #endif
 	array[DEVCONF_MAX_ADDRESSES] = cnf->max_addresses;
 	array[DEVCONF_ACCEPT_RA_DEFRTR] = cnf->accept_ra_defrtr;
+	array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo;
 }
 
 static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev, 
@@ -3577,6 +3580,14 @@ static struct addrconf_sysctl_table
          		.proc_handler	=	&proc_dointvec,
 		},
 		{
+			.ctl_name	=	NET_IPV6_ACCEPT_RA_PINFO,
+			.procname	=	"accept_ra_pinfo",
+         		.data		=	&ipv6_devconf.accept_ra_pinfo,
+			.maxlen		=	sizeof(int),
+			.mode		=	0644,
+         		.proc_handler	=	&proc_dointvec,
+		},
+		{
 			.ctl_name	=	0,	/* sentinel */
 		}
 	},
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index e171167..3b56be8 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1191,7 +1191,7 @@ skip_defrtr:
 			     NEIGH_UPDATE_F_ISROUTER);
 	}
 
-	if (ndopts.nd_opts_pi) {
+	if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
 		struct nd_opt_hdr *p;
 		for (p = ndopts.nd_opts_pi;
 		     p;
---
0.99.8.GIT


--- NEW FILE 4384-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Split up rt6_cow() for future changes.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825370 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

applies-to: 44b10a80f495d339e3381c46000c4b380f94a34f
ba3553dcb260670a9423d085f3c9227a4508043a
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e0d3ad0..e885570 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -401,10 +401,9 @@ int ip6_ins_rt(struct rt6_info *rt, stru
    with dst->error set to errno value.
  */
 
-static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
-				struct in6_addr *saddr, struct netlink_skb_parms *req)
+static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *daddr,
+				      struct in6_addr *saddr)
 {
-	int err;
 	struct rt6_info *rt;
 
 	/*
@@ -435,18 +434,29 @@ static struct rt6_info *rt6_cow(struct r
 
 		rt->rt6i_nexthop = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
 
-		dst_hold(&rt->u.dst);
+	}
 
-		err = ip6_ins_rt(rt, NULL, NULL, req);
-		if (err == 0)
-			return rt;
+	return rt;
+}
 
-		rt->u.dst.error = err;
+static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
+				struct in6_addr *saddr, struct netlink_skb_parms *req)
+{
+	struct rt6_info *rt = rt6_alloc_cow(ort, daddr, saddr);
+	int err;
 
-		return rt;
+	if (!rt) {
+		dst_hold(&ip6_null_entry.u.dst);
+		return &ip6_null_entry;
 	}
-	dst_hold(&ip6_null_entry.u.dst);
-	return &ip6_null_entry;
+
+	dst_hold(&rt->u.dst);
+
+	err = ip6_ins_rt(rt, NULL, NULL, req);
+	if (err)
+		rt->u.dst.error = err;
+
+	return rt;
 }
 
 #define BACKTRACK() \
---
0.99.8.GIT


--- NEW FILE 4385-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Set appropriate information before inserting a route.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825372 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

applies-to: 86b8df11cfc7abe8ee9be638d2e2ea34fc62b162
3c35bbd06cfba8b9607f046db313eb58e2ea775a
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e885570..c224dcd 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1221,21 +1221,24 @@ void rt6_pmtu_discovery(struct in6_addr 
 	   2. It is gatewayed route or NONEXTHOP route. Action: clone it.
 	 */
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
-		nrt = rt6_cow(rt, daddr, saddr, NULL);
-		if (!nrt->u.dst.error) {
-			nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
-			if (allfrag)
-				nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
-			/* According to RFC 1981, detecting PMTU increase shouldn't be
-			   happened within 5 mins, the recommended timer is 10 mins.
-			   Here this route expiration time is set to ip6_rt_mtu_expires
-			   which is 10 mins. After 10 mins the decreased pmtu is expired
-			   and detecting PMTU increase will be automatically happened.
-			 */
-			dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
-			nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
-		}
-		dst_release(&nrt->u.dst);
+		nrt = rt6_alloc_cow(rt, daddr, saddr);
+		if (!nrt)
+			goto out;
+
+		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
+		if (allfrag)
+			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
+		
+		/* According to RFC 1981, detecting PMTU increase shouldn't be
+		 * happened within 5 mins, the recommended timer is 10 mins.
+		 * Here this route expiration time is set to ip6_rt_mtu_expires
+		 * which is 10 mins. After 10 mins the decreased pmtu is expired
+		 * and detecting PMTU increase will be automatically happened.
+		 */
+		dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
+		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
+
+		ip6_ins_rt(nrt, NULL, NULL, NULL);
 	} else {
 		nrt = ip6_rt_copy(rt);
 		if (nrt == NULL)
---
0.99.8.GIT


--- NEW FILE 4386-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Copy u.dst.error for RTF_REJECT routes when cloning.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825373 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

applies-to: 85f263f063f5f28e72b265cbf39d426f8ba0c3c8
dc8df78d0f7fbacc2207fafafa9d82693e574c1e
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index c224dcd..856b36d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1249,6 +1249,8 @@ void rt6_pmtu_discovery(struct in6_addr 
 		nrt->rt6i_nexthop = neigh_clone(rt->rt6i_nexthop);
 		dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
 		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_CACHE|RTF_EXPIRES;
+		if (nrt->rt6i_flags & RTF_REJECT)
+			nrt->u.dst.error = rt->u.dst.error;
 		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
 		if (allfrag)
 			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
---
0.99.8.GIT


--- NEW FILE 4387-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add rt6_alloc_clone() for cloning route allocation.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825374 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

applies-to: 6cfb6867c2a63f0ff25c3ac4b7cd0a522a5cddde
640d8dee123ebbc4fad3a3f2b7fa8398a3d51415
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 856b36d..51dded7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -459,6 +459,21 @@ static struct rt6_info *rt6_cow(struct r
 	return rt;
 }
 
+static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *daddr)
+{
+	struct rt6_info *rt = ip6_rt_copy(ort);
+	if (rt) {
+		ipv6_addr_copy(&rt->rt6i_dst.addr, daddr);
+		rt->rt6i_dst.plen = 128;
+		rt->rt6i_flags |= RTF_CACHE;
+		if (rt->rt6i_flags & RTF_REJECT)
+			rt->u.dst.error = ort->u.dst.error;
+		rt->u.dst.flags |= DST_HOST;
+		rt->rt6i_nexthop = neigh_clone(ort->rt6i_nexthop);
+	}
+	return rt;
+}
+
 #define BACKTRACK() \
 if (rt == &ip6_null_entry && strict) { \
        while ((fn = fn->parent) != NULL) { \
@@ -1240,17 +1255,11 @@ void rt6_pmtu_discovery(struct in6_addr 
 
 		ip6_ins_rt(nrt, NULL, NULL, NULL);
 	} else {
-		nrt = ip6_rt_copy(rt);
-		if (nrt == NULL)
+		nrt = rt6_alloc_clone(rt, daddr);
+		if (!nrt)
 			goto out;
-		ipv6_addr_copy(&nrt->rt6i_dst.addr, daddr);
-		nrt->rt6i_dst.plen = 128;
-		nrt->u.dst.flags |= DST_HOST;
-		nrt->rt6i_nexthop = neigh_clone(rt->rt6i_nexthop);
 		dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
-		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_CACHE|RTF_EXPIRES;
-		if (nrt->rt6i_flags & RTF_REJECT)
-			nrt->u.dst.error = rt->u.dst.error;
+		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
 		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
 		if (allfrag)
 			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
---
0.99.8.GIT


--- NEW FILE 4388-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Unify two code paths for pmtu disc.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825375 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

applies-to: f535754458324d92d3bbf6d62d2fbc69958218c9
1422fff2c7f034b2428cf3026c3e9d94b4805212
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 51dded7..995a769 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1235,11 +1235,12 @@ void rt6_pmtu_discovery(struct in6_addr 
 	   1. It is connected route. Action: COW
 	   2. It is gatewayed route or NONEXTHOP route. Action: clone it.
 	 */
-	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
+	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP))
 		nrt = rt6_alloc_cow(rt, daddr, saddr);
-		if (!nrt)
-			goto out;
+	else
+		nrt = rt6_alloc_clone(rt, daddr);
 
+	if (nrt) {
 		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
 		if (allfrag)
 			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
@@ -1254,18 +1255,7 @@ void rt6_pmtu_discovery(struct in6_addr 
 		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
 
 		ip6_ins_rt(nrt, NULL, NULL, NULL);
-	} else {
-		nrt = rt6_alloc_clone(rt, daddr);
-		if (!nrt)
-			goto out;
-		dst_set_expires(&nrt->u.dst, ip6_rt_mtu_expires);
-		nrt->rt6i_flags |= RTF_DYNAMIC|RTF_EXPIRES;
-		nrt->u.dst.metrics[RTAX_MTU-1] = pmtu;
-		if (allfrag)
-			nrt->u.dst.metrics[RTAX_FEATURES-1] |= RTAX_FEATURE_ALLFRAG;
-		ip6_ins_rt(nrt, NULL, NULL, NULL);
 	}
-
 out:
 	dst_release(&rt->u.dst);
 }
---
0.99.8.GIT


--- NEW FILE 4389-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Clean up reference counting / unlocking for returning object.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825376 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

applies-to: 22906028ff0bc4d1e3aec1bdeddfc6c593af0264
27fc8ced0db48e4224cba23fe4a5d27b5dd13aa7
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 995a769..79f102c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -478,7 +478,6 @@ static struct rt6_info *rt6_alloc_clone(
 if (rt == &ip6_null_entry && strict) { \
        while ((fn = fn->parent) != NULL) { \
 		if (fn->fn_flags & RTN_ROOT) { \
-			dst_hold(&rt->u.dst); \
 			goto out; \
 		} \
 		if (fn->fn_flags & RTN_RTINFO) \
@@ -508,17 +507,17 @@ restart:
 	if ((rt->rt6i_flags & RTF_CACHE)) {
 		rt = rt6_device_match(rt, skb->dev->ifindex, strict);
 		BACKTRACK();
-		dst_hold(&rt->u.dst);
 		goto out;
 	}
 
 	rt = rt6_device_match(rt, skb->dev->ifindex, strict);
 	BACKTRACK();
 
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
+
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
 		struct rt6_info *nrt;
-		dst_hold(&rt->u.dst);
-		read_unlock_bh(&rt6_lock);
 
 		nrt = rt6_cow(rt, &skb->nh.ipv6h->daddr,
 			      &skb->nh.ipv6h->saddr,
@@ -536,14 +535,16 @@ restart:
 		dst_release(&rt->u.dst);
 		goto relookup;
 	}
-	dst_hold(&rt->u.dst);
 
-out:
-	read_unlock_bh(&rt6_lock);
 out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
 	skb->dst = (struct dst_entry *) rt;
+	return;
+out:
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
+	goto out2;
 }
 
 struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
@@ -566,7 +567,6 @@ restart:
 	if ((rt->rt6i_flags & RTF_CACHE)) {
 		rt = rt6_device_match(rt, fl->oif, strict);
 		BACKTRACK();
-		dst_hold(&rt->u.dst);
 		goto out;
 	}
 	if (rt->rt6i_flags & RTF_DEFAULT) {
@@ -577,10 +577,11 @@ restart:
 		BACKTRACK();
 	}
 
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
+
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
 		struct rt6_info *nrt;
-		dst_hold(&rt->u.dst);
-		read_unlock_bh(&rt6_lock);
 
 		nrt = rt6_cow(rt, &fl->fl6_dst, &fl->fl6_src, NULL);
 
@@ -596,14 +597,14 @@ restart:
 		dst_release(&rt->u.dst);
 		goto relookup;
 	}
-	dst_hold(&rt->u.dst);
-
-out:
-	read_unlock_bh(&rt6_lock);
 out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
 	return &rt->u.dst;
+out:
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
+	goto out2;
 }
 
 
---
0.99.8.GIT


--- NEW FILE 4390-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Convert rt6_cow() to rt6_alloc_cow().
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825378 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   57 ++++++++++++++++++++++++------------------------------
 1 files changed, 25 insertions(+), 32 deletions(-)

applies-to: c40a2d6fc4890f9a1c8154a610a0ea642439f436
6cb62171ab64db059bb07a98b543f00a1881e76e
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 79f102c..53425e9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -397,10 +397,6 @@ int ip6_ins_rt(struct rt6_info *rt, stru
 	return err;
 }
 
-/* No rt6_lock! If COW failed, the function returns dead route entry
-   with dst->error set to errno value.
- */
-
 static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *daddr,
 				      struct in6_addr *saddr)
 {
@@ -439,26 +435,6 @@ static struct rt6_info *rt6_alloc_cow(st
 	return rt;
 }
 
-static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
-				struct in6_addr *saddr, struct netlink_skb_parms *req)
-{
-	struct rt6_info *rt = rt6_alloc_cow(ort, daddr, saddr);
-	int err;
-
-	if (!rt) {
-		dst_hold(&ip6_null_entry.u.dst);
-		return &ip6_null_entry;
-	}
-
-	dst_hold(&rt->u.dst);
-
-	err = ip6_ins_rt(rt, NULL, NULL, req);
-	if (err)
-		rt->u.dst.error = err;
-
-	return rt;
-}
-
 static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *daddr)
 {
 	struct rt6_info *rt = ip6_rt_copy(ort);
@@ -518,15 +494,23 @@ restart:
 
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
 		struct rt6_info *nrt;
+		int err;
 
-		nrt = rt6_cow(rt, &skb->nh.ipv6h->daddr,
-			      &skb->nh.ipv6h->saddr,
-			      &NETLINK_CB(skb));
+		nrt = rt6_alloc_cow(rt, &skb->nh.ipv6h->daddr,
+				    &skb->nh.ipv6h->saddr);
 
 		dst_release(&rt->u.dst);
-		rt = nrt;
+		rt = nrt ? : &ip6_null_entry;
+
+		dst_hold(&rt->u.dst);
+		if (nrt) {
+			err = ip6_ins_rt(nrt, NULL, NULL,
+					 &NETLINK_CB(skb));
+			if (!err)
+				goto out2;
+		}
 
-		if (rt->u.dst.error != -EEXIST || --attempts <= 0)
+		if (--attempts <= 0)
 			goto out2;
 
 		/* Race condition! In the gap, when rt6_lock was
@@ -582,13 +566,21 @@ restart:
 
 	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
 		struct rt6_info *nrt;
+		int err;
 
-		nrt = rt6_cow(rt, &fl->fl6_dst, &fl->fl6_src, NULL);
+		nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src);
 
 		dst_release(&rt->u.dst);
-		rt = nrt;
+		rt = nrt ? : &ip6_null_entry;
 
-		if (rt->u.dst.error != -EEXIST || --attempts <= 0)
+		dst_hold(&rt->u.dst);
+		if (nrt) {
+			err = ip6_ins_rt(nrt, NULL, NULL, NULL);
+			if (!err)
+				goto out2;
+		}
+
+		if (--attempts <= 0)
 			goto out2;
 
 		/* Race condition! In the gap, when rt6_lock was
@@ -597,6 +589,7 @@ restart:
 		dst_release(&rt->u.dst);
 		goto relookup;
 	}
+
 out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
---
0.99.8.GIT


--- NEW FILE 4391-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Clean-up cow'ing in ip6_route_{intput,output}().
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825379 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |  113 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 60 insertions(+), 53 deletions(-)

applies-to: 632fdc20394cdb0e06e4364e6289e098f7fde0c8
8b212b7042c3a40cc511ae011d96b9952ea3cd8d
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 53425e9..684a457 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -72,6 +72,7 @@
 #define RT6_TRACE(x...) do { ; } while (0)
 #endif
 
+#define CLONE_OFFLINK_ROUTE 0
 
 static int ip6_rt_max_size = 4096;
 static int ip6_rt_gc_min_interval = HZ / 2;
@@ -465,9 +466,10 @@ if (rt == &ip6_null_entry && strict) { \
 void ip6_route_input(struct sk_buff *skb)
 {
 	struct fib6_node *fn;
-	struct rt6_info *rt;
+	struct rt6_info *rt, *nrt;
 	int strict;
 	int attempts = 3;
+	int err;
 
 	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
 
@@ -492,51 +494,53 @@ restart:
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
 
-	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
-		struct rt6_info *nrt;
-		int err;
-
-		nrt = rt6_alloc_cow(rt, &skb->nh.ipv6h->daddr,
-				    &skb->nh.ipv6h->saddr);
-
-		dst_release(&rt->u.dst);
-		rt = nrt ? : &ip6_null_entry;
+	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP))
+		nrt = rt6_alloc_cow(rt, &skb->nh.ipv6h->daddr, &skb->nh.ipv6h->saddr);
+	else {
+#if CLONE_OFFLINK_ROUTE 
+		nrt = rt6_alloc_clone(rt, &skb->nh.ipv6h->daddr);
+#else
+		goto out2;
+#endif
+	}
 
-		dst_hold(&rt->u.dst);
-		if (nrt) {
-			err = ip6_ins_rt(nrt, NULL, NULL,
-					 &NETLINK_CB(skb));
-			if (!err)
-				goto out2;
-		}
+	dst_release(&rt->u.dst);
+	rt = nrt ? : &ip6_null_entry;
 
-		if (--attempts <= 0)
+	dst_hold(&rt->u.dst);
+	if (nrt) {
+		err = ip6_ins_rt(nrt, NULL, NULL, &NETLINK_CB(skb));
+		if (!err)
 			goto out2;
-
-		/* Race condition! In the gap, when rt6_lock was
-		   released someone could insert this route.  Relookup.
-		*/
-		dst_release(&rt->u.dst);
-		goto relookup;
 	}
 
+	if (--attempts <= 0)
+		goto out2;
+
+	/*
+	 * Race condition! In the gap, when rt6_lock was
+	 * released someone could insert this route.  Relookup.
+	 */
+	dst_release(&rt->u.dst);
+	goto relookup;
+
+out:
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
 out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
 	skb->dst = (struct dst_entry *) rt;
 	return;
-out:
-	dst_hold(&rt->u.dst);
-	read_unlock_bh(&rt6_lock);
-	goto out2;
 }
 
 struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
 {
 	struct fib6_node *fn;
-	struct rt6_info *rt;
+	struct rt6_info *rt, *nrt;
 	int strict;
 	int attempts = 3;
+	int err;
 
 	strict = ipv6_addr_type(&fl->fl6_dst) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
 
@@ -564,40 +568,43 @@ restart:
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
 
-	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP)) {
-		struct rt6_info *nrt;
-		int err;
-
+	if (!rt->rt6i_nexthop && !(rt->rt6i_flags & RTF_NONEXTHOP))
 		nrt = rt6_alloc_cow(rt, &fl->fl6_dst, &fl->fl6_src);
+	else {
+#if CLONE_OFFLINK_ROUTE
+		nrt = rt6_alloc_clone(rt, &fl->fl6_dst);
+#else
+		goto out2;
+#endif
+	}
 
-		dst_release(&rt->u.dst);
-		rt = nrt ? : &ip6_null_entry;
-
-		dst_hold(&rt->u.dst);
-		if (nrt) {
-			err = ip6_ins_rt(nrt, NULL, NULL, NULL);
-			if (!err)
-				goto out2;
-		}
+	dst_release(&rt->u.dst);
+	rt = nrt ? : &ip6_null_entry;
 
-		if (--attempts <= 0)
+	dst_hold(&rt->u.dst);
+	if (nrt) {
+		err = ip6_ins_rt(nrt, NULL, NULL, NULL);
+		if (!err)
 			goto out2;
-
-		/* Race condition! In the gap, when rt6_lock was
-		   released someone could insert this route.  Relookup.
-		*/
-		dst_release(&rt->u.dst);
-		goto relookup;
 	}
 
+	if (--attempts <= 0)
+		goto out2;
+
+	/*
+	 * Race condition! In the gap, when rt6_lock was
+	 * released someone could insert this route.  Relookup.
+	 */
+	dst_release(&rt->u.dst);
+	goto relookup;
+
+out:
+	dst_hold(&rt->u.dst);
+	read_unlock_bh(&rt6_lock);
 out2:
 	rt->u.dst.lastuse = jiffies;
 	rt->u.dst.__use++;
 	return &rt->u.dst;
-out:
-	dst_hold(&rt->u.dst);
-	read_unlock_bh(&rt6_lock);
-	goto out2;
 }
 
 
---
0.99.8.GIT


--- NEW FILE 4392-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Eliminate lock for default route pointer.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825380 +0900

And prepare for more advanced router selection.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 include/net/ip6_route.h |    2 
 net/ipv6/ip6_fib.c      |    1 
 net/ipv6/route.c        |  197 ++++++++++++++++-------------------------------
 3 files changed, 69 insertions(+), 131 deletions(-)

applies-to: 1bc9e12e47f83fb66eded5359364cbda0f9d9cbc
3aed04a3e0b47615c976aa115281b5d8bf45412f
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 1f2e428..01acca0 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -91,8 +91,6 @@ extern struct rt6_info *	rt6_add_dflt_ro
 
 extern void			rt6_purge_dflt_routers(void);
 
-extern void			rt6_reset_dflt_pointer(struct rt6_info *rt);
-
 extern void			rt6_redirect(struct in6_addr *dest,
 					     struct in6_addr *saddr,
 					     struct neighbour *neigh,
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 1bf6d9a..2cb6149 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1105,7 +1105,6 @@ static int fib6_age(struct rt6_info *rt,
 	if (rt->rt6i_flags&RTF_EXPIRES && rt->rt6i_expires) {
 		if (time_after(now, rt->rt6i_expires)) {
 			RT6_TRACE("expiring %p\n", rt);
-			rt6_reset_dflt_pointer(rt);
 			return -1;
 		}
 		gc_args.more++;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 684a457..84aae0e 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -74,6 +74,9 @@
 
 #define CLONE_OFFLINK_ROUTE 0
 
+#define RT6_SELECT_F_IFACE	0x1
+#define RT6_SELECT_F_REACHABLE	0x2
+
 static int ip6_rt_max_size = 4096;
 static int ip6_rt_gc_min_interval = HZ / 2;
 static int ip6_rt_gc_timeout = 60*HZ;
@@ -216,148 +219,89 @@ static __inline__ struct rt6_info *rt6_d
 }
 
 /*
- *	pointer to the last default router chosen. BH is disabled locally.
+ * Default Router Selection (RFC 2461 6.3.6)
  */
-static struct rt6_info *rt6_dflt_pointer;
-static DEFINE_SPINLOCK(rt6_dflt_lock);
+static int inline rt6_check_dev(struct rt6_info *rt, int oif)
+{
+	struct net_device *dev = rt->rt6i_dev;
+	if (!oif || dev->ifindex == oif)
+		return 2;
+	if ((dev->flags & IFF_LOOPBACK) &&
+	    rt->rt6i_idev && rt->rt6i_idev->dev->ifindex == oif)
+		return 1;
+	return 0;
+}
 
-void rt6_reset_dflt_pointer(struct rt6_info *rt)
+static int inline rt6_check_neigh(struct rt6_info *rt)
 {
-	spin_lock_bh(&rt6_dflt_lock);
-	if (rt == NULL || rt == rt6_dflt_pointer) {
-		RT6_TRACE("reset default router: %p->NULL\n", rt6_dflt_pointer);
-		rt6_dflt_pointer = NULL;
+	struct neighbour *neigh = rt->rt6i_nexthop;
+	int m = 0;
+	if (neigh) {
+		read_lock_bh(&neigh->lock);
+		if (neigh->nud_state & NUD_VALID)
+			m = 1;
+		read_unlock_bh(&neigh->lock);
 	}
-	spin_unlock_bh(&rt6_dflt_lock);
+	return m;
 }
 
-/* Default Router Selection (RFC 2461 6.3.6) */
-static struct rt6_info *rt6_best_dflt(struct rt6_info *rt, int oif)
+static int rt6_score_route(struct rt6_info *rt, int oif,
+			   int strict)
 {
-	struct rt6_info *match = NULL;
-	struct rt6_info *sprt;
-	int mpri = 0;
+	int m = rt6_check_dev(rt, oif);
+	if (!m && (strict & RT6_SELECT_F_IFACE))
+		return -1;
+	if (rt6_check_neigh(rt))
+		m |= 4;
+	else if (strict & RT6_SELECT_F_REACHABLE)
+		return -1;
+	return m;
+}
 
-	for (sprt = rt; sprt; sprt = sprt->u.next) {
-		struct neighbour *neigh;
-		int m = 0;
-
-		if (!oif ||
-		    (sprt->rt6i_dev &&
-		     sprt->rt6i_dev->ifindex == oif))
-			m += 8;
+static struct rt6_info *rt6_select(struct rt6_info **head, int oif,
+				   int strict)
+{
+	struct rt6_info *match = NULL, *last = NULL;
+	struct rt6_info *rt, *rt0 = *head;
+	u32 metric;
+	int mpri = -1;
 
-		if (rt6_check_expired(sprt))
+	RT6_TRACE("%s(head=%p(*head=%p), oif=%d)\n",
+		  __FUNCTION__, head, head ? *head : NULL, oif);
+
+	for (rt = rt0, metric = rt0->rt6i_metric;
+	     rt && rt->rt6i_metric == metric;
+	     rt = rt->u.next) {
+		int m;
+
+		if (rt6_check_expired(rt))
 			continue;
 
-		if (sprt == rt6_dflt_pointer)
-			m += 4;
+		last = rt;
 
-		if ((neigh = sprt->rt6i_nexthop) != NULL) {
-			read_lock_bh(&neigh->lock);
-			switch (neigh->nud_state) {
-			case NUD_REACHABLE:
-				m += 3;
-				break;
-
-			case NUD_STALE:
-			case NUD_DELAY:
-			case NUD_PROBE:
-				m += 2;
-				break;
-
-			case NUD_NOARP:
-			case NUD_PERMANENT:
-				m += 1;
-				break;
-
-			case NUD_INCOMPLETE:
-			default:
-				read_unlock_bh(&neigh->lock);
-				continue;
-			}
-			read_unlock_bh(&neigh->lock);
-		} else {
+		m = rt6_score_route(rt, oif, strict);
+		if (m < 0)
 			continue;
-		}
 
-		if (m > mpri || m >= 12) {
-			match = sprt;
+		if (m > mpri) {
+			match = rt;
 			mpri = m;
-			if (m >= 12) {
-				/* we choose the last default router if it
-				 * is in (probably) reachable state.
-				 * If route changed, we should do pmtu
-				 * discovery. --yoshfuji
-				 */
-				break;
-			}
 		}
 	}
 
-	spin_lock(&rt6_dflt_lock);
-	if (!match) {
-		/*
-		 *	No default routers are known to be reachable.
-		 *	SHOULD round robin
-		 */
-		if (rt6_dflt_pointer) {
-			for (sprt = rt6_dflt_pointer->u.next;
-			     sprt; sprt = sprt->u.next) {
-				if (sprt->u.dst.obsolete <= 0 &&
-				    sprt->u.dst.error == 0 &&
-				    !rt6_check_expired(sprt)) {
-					match = sprt;
-					break;
-				}
-			}
-			for (sprt = rt;
-			     !match && sprt;
-			     sprt = sprt->u.next) {
-				if (sprt->u.dst.obsolete <= 0 &&
-				    sprt->u.dst.error == 0 &&
-				    !rt6_check_expired(sprt)) {
-					match = sprt;
-					break;
-				}
-				if (sprt == rt6_dflt_pointer)
-					break;
-			}
-		}
-	}
-
-	if (match) {
-		if (rt6_dflt_pointer != match)
-			RT6_TRACE("changed default router: %p->%p\n",
-				  rt6_dflt_pointer, match);
-		rt6_dflt_pointer = match;
+	if (!match &&
+	    (strict & RT6_SELECT_F_REACHABLE) &&
+	    last && last != rt0) {
+		/* no entries matched; do round-robin */
+		*head = rt0->u.next;
+		rt0->u.next = last->u.next;
+		last->u.next = rt0;
 	}
-	spin_unlock(&rt6_dflt_lock);
 
-	if (!match) {
-		/*
-		 * Last Resort: if no default routers found, 
-		 * use addrconf default route.
-		 * We don't record this route.
-		 */
-		for (sprt = ip6_routing_table.leaf;
-		     sprt; sprt = sprt->u.next) {
-			if (!rt6_check_expired(sprt) &&
-			    (sprt->rt6i_flags & RTF_DEFAULT) &&
-			    (!oif ||
-			     (sprt->rt6i_dev &&
-			      sprt->rt6i_dev->ifindex == oif))) {
-				match = sprt;
-				break;
-			}
-		}
-		if (!match) {
-			/* no default route.  give up. */
-			match = &ip6_null_entry;
-		}
-	}
+	RT6_TRACE("%s() => %p, score=%d\n",
+		  __FUNCTION__, match, mpri);
 
-	return match;
+	return (match ? match : &ip6_null_entry);
 }
 
 struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr,
@@ -542,7 +486,7 @@ struct dst_entry * ip6_route_output(stru
 	int attempts = 3;
 	int err;
 
-	strict = ipv6_addr_type(&fl->fl6_dst) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
+	strict = ipv6_addr_type(&fl->fl6_dst) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL) ? RT6_SELECT_F_IFACE : 0;
 
 relookup:
 	read_lock_bh(&rt6_lock);
@@ -558,8 +502,9 @@ restart:
 		goto out;
 	}
 	if (rt->rt6i_flags & RTF_DEFAULT) {
-		if (rt->rt6i_metric >= IP6_RT_PRIO_ADDRCONF)
-			rt = rt6_best_dflt(rt, fl->oif);
+		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
+		if (rt == &ip6_null_entry)
+			rt = rt6_select(&fn->leaf, fl->oif, strict);
 	} else {
 		rt = rt6_device_match(rt, fl->oif, strict);
 		BACKTRACK();
@@ -1025,8 +970,6 @@ int ip6_del_rt(struct rt6_info *rt, stru
 
 	write_lock_bh(&rt6_lock);
 
-	rt6_reset_dflt_pointer(NULL);
-
 	err = fib6_del(rt, nlh, _rtattr, req);
 	dst_release(&rt->u.dst);
 
@@ -1341,8 +1284,6 @@ restart:
 		if (rt->rt6i_flags & (RTF_DEFAULT | RTF_ADDRCONF)) {
 			dst_hold(&rt->u.dst);
 
-			rt6_reset_dflt_pointer(NULL);
-
 			read_unlock_bh(&rt6_lock);
 
 			ip6_del_rt(rt, NULL, NULL, NULL);
---
0.99.8.GIT


--- NEW FILE 4393-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt ---
Subject: [PATCH] [IPV6]: ROUTE: More strict check for default routers in rt6_get_dflt_router().
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825381 +0900

Check RTF_ADDRCONF|RTF_DEFAULT in rt6_get_dflt_router().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 672412f119944470166a753d0c8fe3f87bf807df
163845215d5967a31fd12445670047c6f20bb2b7
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 84aae0e..ddbe3ab 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1248,6 +1248,7 @@ struct rt6_info *rt6_get_dflt_router(str
 	write_lock_bh(&rt6_lock);
 	for (rt = fn->leaf; rt; rt=rt->u.next) {
 		if (dev == rt->rt6i_dev &&
+		    ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) &&
 		    ipv6_addr_equal(&rt->rt6i_gateway, addr))
 			break;
 	}
---
0.99.8.GIT


--- NEW FILE 4394-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Try selecting better route for non-default routes as well.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825383 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

applies-to: c59df396b86445369830cb5800bd0d2acc2067ba
3692bcfe86df0c8fe9345c806f3594a0e9ae6cda
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ddbe3ab..202e446 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -415,7 +415,7 @@ void ip6_route_input(struct sk_buff *skb
 	int attempts = 3;
 	int err;
 
-	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL);
+	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL) ? RT6_SELECT_F_IFACE : 0;
 
 relookup:
 	read_lock_bh(&rt6_lock);
@@ -427,12 +427,16 @@ restart:
 	rt = fn->leaf;
 
 	if ((rt->rt6i_flags & RTF_CACHE)) {
-		rt = rt6_device_match(rt, skb->dev->ifindex, strict);
+		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
+		if (rt == &ip6_null_entry)
+			rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
 		BACKTRACK();
 		goto out;
 	}
 
-	rt = rt6_device_match(rt, skb->dev->ifindex, strict);
+	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
+	if (rt == &ip6_null_entry)
+		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
 	BACKTRACK();
 
 	dst_hold(&rt->u.dst);
@@ -497,7 +501,9 @@ restart:
 	rt = fn->leaf;
 
 	if ((rt->rt6i_flags & RTF_CACHE)) {
-		rt = rt6_device_match(rt, fl->oif, strict);
+		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
+		if (rt == &ip6_null_entry)
+			rt = rt6_select(&fn->leaf, fl->oif, strict);
 		BACKTRACK();
 		goto out;
 	}
@@ -506,7 +512,9 @@ restart:
 		if (rt == &ip6_null_entry)
 			rt = rt6_select(&fn->leaf, fl->oif, strict);
 	} else {
-		rt = rt6_device_match(rt, fl->oif, strict);
+		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
+		if (rt == &ip6_null_entry)
+			rt = rt6_select(&fn->leaf, fl->oif, strict);
 		BACKTRACK();
 	}
 
---
0.99.8.GIT


--- NEW FILE 4395-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Clean up rt6_select() code path in ip6_route_{intput,output}().
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825384 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   33 +++++++--------------------------
 1 files changed, 7 insertions(+), 26 deletions(-)

applies-to: bad708d5c4587d10130d1dbe185492c95a75abf0
85ffbd5103fea8c612435e025dbe4634b6094786
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 202e446..7e0746d 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -426,18 +426,12 @@ relookup:
 restart:
 	rt = fn->leaf;
 
-	if ((rt->rt6i_flags & RTF_CACHE)) {
-		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
-		if (rt == &ip6_null_entry)
-			rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
-		BACKTRACK();
-		goto out;
-	}
-
 	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
 	if (rt == &ip6_null_entry)
 		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
 	BACKTRACK();
+	if ((rt->rt6i_flags & RTF_CACHE))
+		goto out;
 
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
@@ -498,25 +492,12 @@ relookup:
 	fn = fib6_lookup(&ip6_routing_table, &fl->fl6_dst, &fl->fl6_src);
 
 restart:
-	rt = fn->leaf;
-
-	if ((rt->rt6i_flags & RTF_CACHE)) {
-		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
-		if (rt == &ip6_null_entry)
-			rt = rt6_select(&fn->leaf, fl->oif, strict);
-		BACKTRACK();
+	rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
+	if (rt == &ip6_null_entry)
+		rt = rt6_select(&fn->leaf, fl->oif, strict);
+	BACKTRACK();
+	if ((rt->rt6i_flags & RTF_CACHE))
 		goto out;
-	}
-	if (rt->rt6i_flags & RTF_DEFAULT) {
-		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
-		if (rt == &ip6_null_entry)
-			rt = rt6_select(&fn->leaf, fl->oif, strict);
-	} else {
-		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
-		if (rt == &ip6_null_entry)
-			rt = rt6_select(&fn->leaf, fl->oif, strict);
-		BACKTRACK();
-	}
 
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
---
0.99.8.GIT


--- NEW FILE 4396-IPV6-ROUTE-Try-finding-the-next-best-route.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Try finding the next best route.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825385 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 81d528e3da418e178309db20ab3502c483e8f099
8329407f124cffc7b321139724142d4696cc8491
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 7e0746d..58703b7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -396,7 +396,7 @@ static struct rt6_info *rt6_alloc_clone(
 }
 
 #define BACKTRACK() \
-if (rt == &ip6_null_entry && strict) { \
+if (rt == &ip6_null_entry) { \
        while ((fn = fn->parent) != NULL) { \
 		if (fn->fn_flags & RTN_ROOT) { \
 			goto out; \
---
0.99.8.GIT


--- NEW FILE 4397-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Handle finding the next best route in reachability in BACKTRACK().
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825386 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

applies-to: 5d24349b3893ea10fb2f98ec2f4edc9019318c36
b7cf3132b15b509518db04f2dc10f13beca82c1e
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 58703b7..24d588c 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -414,23 +414,22 @@ void ip6_route_input(struct sk_buff *skb
 	int strict;
 	int attempts = 3;
 	int err;
+	int reachable = RT6_SELECT_F_REACHABLE;
 
 	strict = ipv6_addr_type(&skb->nh.ipv6h->daddr) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL) ? RT6_SELECT_F_IFACE : 0;
 
 relookup:
 	read_lock_bh(&rt6_lock);
 
+restart_2:
 	fn = fib6_lookup(&ip6_routing_table, &skb->nh.ipv6h->daddr,
 			 &skb->nh.ipv6h->saddr);
 
 restart:
-	rt = fn->leaf;
-
-	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
-	if (rt == &ip6_null_entry)
-		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
+	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | reachable);
 	BACKTRACK();
-	if ((rt->rt6i_flags & RTF_CACHE))
+	if (rt == &ip6_null_entry ||
+	    rt->rt6i_flags & RTF_CACHE)
 		goto out;
 
 	dst_hold(&rt->u.dst);
@@ -467,6 +466,10 @@ restart:
 	goto relookup;
 
 out:
+	if (reachable) {
+		reachable = 0;
+		goto restart_2;
+	}
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
 out2:
@@ -483,20 +486,21 @@ struct dst_entry * ip6_route_output(stru
 	int strict;
 	int attempts = 3;
 	int err;
+	int reachable = RT6_SELECT_F_REACHABLE;
 
 	strict = ipv6_addr_type(&fl->fl6_dst) & (IPV6_ADDR_MULTICAST|IPV6_ADDR_LINKLOCAL) ? RT6_SELECT_F_IFACE : 0;
 
 relookup:
 	read_lock_bh(&rt6_lock);
 
+restart_2:
 	fn = fib6_lookup(&ip6_routing_table, &fl->fl6_dst, &fl->fl6_src);
 
 restart:
-	rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
-	if (rt == &ip6_null_entry)
-		rt = rt6_select(&fn->leaf, fl->oif, strict);
+	rt = rt6_select(&fn->leaf, fl->oif, strict | reachable);
 	BACKTRACK();
-	if ((rt->rt6i_flags & RTF_CACHE))
+	if (rt == &ip6_null_entry ||
+	    rt->rt6i_flags & RTF_CACHE)
 		goto out;
 
 	dst_hold(&rt->u.dst);
@@ -533,6 +537,10 @@ restart:
 	goto relookup;
 
 out:
+	if (reachable) {
+		reachable = 0;
+		goto restart_2;
+	}
 	dst_hold(&rt->u.dst);
 	read_unlock_bh(&rt6_lock);
 out2:
---
0.99.8.GIT


--- NEW FILE 4398-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add support for Router Preference (RFC4191).
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825387 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 include/linux/icmpv6.h     |   11 +++++++++--
 include/linux/ipv6_route.h |    8 ++++++++
 include/net/ip6_route.h    |    3 ++-
 net/ipv6/Kconfig           |   11 +++++++++++
 net/ipv6/ndisc.c           |   12 +++++++++++-
 net/ipv6/route.c           |   11 ++++++++---
 6 files changed, 49 insertions(+), 7 deletions(-)

applies-to: 92681cff623a642c03746e5cdfad7a48fe80ea03
c9897cdfd6d16003534c1780c468a24288440f47
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index 0cf6c8b..c771a7d 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -40,14 +40,16 @@ struct icmp6hdr {
                 struct icmpv6_nd_ra {
 			__u8		hop_limit;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
-			__u8		reserved:6,
+			__u8		reserved:4,
+					router_pref:2,
 					other:1,
 					managed:1;
 
 #elif defined(__BIG_ENDIAN_BITFIELD)
 			__u8		managed:1,
 					other:1,
-					reserved:6;
+					router_pref:2,
+					reserved:4;
 #else
 #error	"Please fix <asm/byteorder.h>"
 #endif
@@ -70,8 +72,13 @@ struct icmp6hdr {
 #define icmp6_addrconf_managed	icmp6_dataun.u_nd_ra.managed
 #define icmp6_addrconf_other	icmp6_dataun.u_nd_ra.other
 #define icmp6_rt_lifetime	icmp6_dataun.u_nd_ra.rt_lifetime
+#define icmp6_router_pref	icmp6_dataun.u_nd_ra.router_pref
 };
 
+#define ICMPV6_ROUTER_PREF_LOW		0x3
+#define ICMPV6_ROUTER_PREF_MEDIUM	0x0
+#define ICMPV6_ROUTER_PREF_HIGH		0x1
+#define ICMPV6_ROUTER_PREF_INVALID	0x2
 
 #define ICMPV6_DEST_UNREACH		1
 #define ICMPV6_PKT_TOOBIG		2
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index d7c41d1..f4b085c 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -27,8 +27,16 @@
 #define RTF_FLOW	0x02000000	/* flow significant route	*/
 #define RTF_POLICY	0x04000000	/* policy route			*/
 
+#define RTF_PREF(pref)	((pref) << 27)
+#define RTF_PREF_MASK	0x18000000
+
 #define RTF_LOCAL	0x80000000
 
+#ifdef __KERNEL__
+#define IPV6_EXTRACT_PREF(flag)	(((flag) & RTF_PREF_MASK) >> 27)
+#define IPV6_DECODE_PREF(pref)	((pref) ^ 2)	/* 1:low,2:med,3:high */
+#endif
+
 struct in6_rtmsg {
 	struct in6_addr		rtmsg_dst;
 	struct in6_addr		rtmsg_src;
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 01acca0..5016132 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -87,7 +87,8 @@ extern struct rt6_info *addrconf_dst_all
 extern struct rt6_info *	rt6_get_dflt_router(struct in6_addr *addr,
 						    struct net_device *dev);
 extern struct rt6_info *	rt6_add_dflt_router(struct in6_addr *gwaddr,
-						    struct net_device *dev);
+						    struct net_device *dev,
+						    unsigned int pref);
 
 extern void			rt6_purge_dflt_routers(void);
 
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 22efb8a..a7d9ff5 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -38,6 +38,17 @@ config IPV6_PRIVACY
 
 	  See <file:Documentation/networking/ip-sysctl.txt> for details.
 
+config IPV6_ROUTER_PREF
+	bool "IPv6: Router Preference (RFC 4191) support"
+	depends on IPV6
+	---help---
+	  Router Preference is an optional extension to the Router
+	  Advertisement message to improve the ability of hosts
+	  to pick more appropriate router, especially when the hosts
+	  is placed in a multi-homed network.
+
+	  If unsure, say N.
+
 config INET6_AH
 	tristate "IPv6: AH transformation"
 	depends on IPV6
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 3b56be8..966ab6b 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1023,6 +1023,7 @@ static void ndisc_router_discovery(struc
 	int lifetime;
 	struct ndisc_options ndopts;
 	int optlen;
+	unsigned int pref = 0;
 
 	__u8 * opt = (__u8 *)(ra_msg + 1);
 
@@ -1086,6 +1087,13 @@ static void ndisc_router_discovery(struc
 
 	lifetime = ntohs(ra_msg->icmph.icmp6_rt_lifetime);
 
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	pref = ra_msg->icmph.icmp6_router_pref;
+	/* 10b is handled as if it were 00b (medium) */
+	if (pref == ICMPV6_ROUTER_PREF_INVALID)
+		pref = ICMPV6_ROUTER_PREF_MEDIUM;
+#endif
+
 	rt = rt6_get_dflt_router(&skb->nh.ipv6h->saddr, skb->dev);
 
 	if (rt)
@@ -1101,7 +1109,7 @@ static void ndisc_router_discovery(struc
 		ND_PRINTK3(KERN_DEBUG
 			   "ICMPv6 RA: adding default router.\n");
 
-		rt = rt6_add_dflt_router(&skb->nh.ipv6h->saddr, skb->dev);
+		rt = rt6_add_dflt_router(&skb->nh.ipv6h->saddr, skb->dev, pref);
 		if (rt == NULL) {
 			ND_PRINTK0(KERN_ERR
 				   "ICMPv6 RA: %s() failed to add default route.\n",
@@ -1120,6 +1128,8 @@ static void ndisc_router_discovery(struc
 			return;
 		}
 		neigh->flags |= NTF_ROUTER;
+	} else if (rt) {
+		rt->rt6i_flags |= (rt->rt6i_flags & ~RTF_PREF_MASK) | RTF_PREF(pref);
 	}
 
 	if (rt)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 24d588c..d80010a 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -251,8 +251,11 @@ static int rt6_score_route(struct rt6_in
 	int m = rt6_check_dev(rt, oif);
 	if (!m && (strict & RT6_SELECT_F_IFACE))
 		return -1;
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(rt->rt6i_flags)) << 2;
+#endif
 	if (rt6_check_neigh(rt))
-		m |= 4;
+		m |= 16;
 	else if (strict & RT6_SELECT_F_REACHABLE)
 		return -1;
 	return m;
@@ -1256,7 +1259,8 @@ struct rt6_info *rt6_get_dflt_router(str
 }
 
 struct rt6_info *rt6_add_dflt_router(struct in6_addr *gwaddr,
-				     struct net_device *dev)
+				     struct net_device *dev,
+				     unsigned int pref)
 {
 	struct in6_rtmsg rtmsg;
 
@@ -1264,7 +1268,8 @@ struct rt6_info *rt6_add_dflt_router(str
 	rtmsg.rtmsg_type = RTMSG_NEWROUTE;
 	ipv6_addr_copy(&rtmsg.rtmsg_gateway, gwaddr);
 	rtmsg.rtmsg_metric = 1024;
-	rtmsg.rtmsg_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_DEFAULT | RTF_UP | RTF_EXPIRES;
+	rtmsg.rtmsg_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_DEFAULT | RTF_UP | RTF_EXPIRES |
+			    RTF_PREF(pref);
 
 	rtmsg.rtmsg_ifindex = dev->ifindex;
 
---
0.99.8.GIT


--- NEW FILE 4399-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add Router Reachability Probing (RFC4191).
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825389 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

applies-to: 92e0bd85f669974f47b65678243704c16e4f5b74
704df97d60bd37a823d738cfdf87419d1414ddd7
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d80010a..e292c17 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -218,6 +218,42 @@ static __inline__ struct rt6_info *rt6_d
 	return rt;
 }
 
+#ifdef CONFIG_IPV6_ROUTER_PREF
+static void rt6_probe(struct rt6_info *rt)
+{
+	struct neighbour *neigh = rt ? rt->rt6i_nexthop : NULL;
+	/*
+	 * Okay, this does not seem to be appropriate
+	 * for now, however, we need to check if it
+	 * is really so; aka Router Reachability Probing.
+	 *
+	 * Router Reachability Probe MUST be rate-limited
+	 * to no more than one per minute.
+	 */
+	if (!neigh || (neigh->nud_state & NUD_VALID))
+		return;
+	read_lock_bh(&neigh->lock);
+	if (!(neigh->nud_state & NUD_VALID) &&
+	    time_after(jiffies, neigh->updated + 60 * HZ)) {
+		struct in6_addr mcaddr;
+		struct in6_addr *target;
+
+		neigh->updated = jiffies;
+		read_unlock_bh(&neigh->lock);
+
+		target = (struct in6_addr *)&neigh->primary_key;
+		addrconf_addr_solict_mult(target, &mcaddr);
+		ndisc_send_ns(rt->rt6i_dev, NULL, target, &mcaddr, NULL);
+	} else
+		read_unlock_bh(&neigh->lock);
+}
+#else
+static inline void rt6_probe(struct rt6_info *rt)
+{
+	return;
+}
+#endif
+
 /*
  * Default Router Selection (RFC 2461 6.3.6)
  */
@@ -287,8 +323,11 @@ static struct rt6_info *rt6_select(struc
 			continue;
 
 		if (m > mpri) {
+			rt6_probe(match);
 			match = rt;
 			mpri = m;
+		} else {
+			rt6_probe(rt);
 		}
 	}
 
---
0.99.8.GIT


--- NEW FILE 4400-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add accept_ra_rtr_pref sysctl.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825390 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 Documentation/networking/ip-sysctl.txt |    6 ++++++
 include/linux/ipv6.h                   |    4 ++++
 include/linux/sysctl.h                 |    1 +
 net/ipv6/addrconf.c                    |   19 +++++++++++++++++++
 net/ipv6/ndisc.c                       |    3 ++-
 5 files changed, 32 insertions(+), 1 deletions(-)

applies-to: e25781d2f37a6c9d81136db2abe82eec50cdd965
078fe970b7382489b05749034d1e3516cf322bc0
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 404afac..87bbd77 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -729,6 +729,12 @@ accept_ra_pinfo - BOOLEAN
 	Functional default: enabled if accept_ra is enabled.
 			    disabled if accept_ra is disabled.
 
+accept_ra_rtr_pref - BOOLEAN
+	Accept Router Preference in RA.
+
+	Functional default: enabled if accept_ra is enabled.
+			    disabled if accept_ra is disabled.
+
 accept_redirects - BOOLEAN
 	Accept Redirects.
 
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 2c3b799..108b75d 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -147,6 +147,9 @@ struct ipv6_devconf {
 	__s32		max_addresses;
 	__s32		accept_ra_defrtr;
 	__s32		accept_ra_pinfo;
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	__s32		accept_ra_rtr_pref;
+#endif
 	void		*sysctl;
 };
 
@@ -171,6 +174,7 @@ enum {
 	DEVCONF_FORCE_MLD_VERSION,
 	DEVCONF_ACCEPT_RA_DEFRTR,
 	DEVCONF_ACCEPT_RA_PINFO,
+	DEVCONF_ACCEPT_RA_RTR_PREF,
 	DEVCONF_MAX
 };
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 70c612b..06607e8 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -531,6 +531,7 @@ enum {
 	NET_IPV6_FORCE_MLD_VERSION=17,
 	NET_IPV6_ACCEPT_RA_DEFRTR=18,
 	NET_IPV6_ACCEPT_RA_PINFO=19,
+	NET_IPV6_ACCEPT_RA_RTR_PREF=20,
 	__NET_IPV6_MAX
 };
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 150bddf..294e820 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -167,6 +167,9 @@ struct ipv6_devconf ipv6_devconf = {
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
 	.accept_ra_pinfo	= 1,
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	.accept_ra_rtr_pref	= 1,
+#endif
 };
 
 static struct ipv6_devconf ipv6_devconf_dflt = {
@@ -190,6 +193,9 @@ static struct ipv6_devconf ipv6_devconf_
 	.max_addresses		= IPV6_MAX_ADDRESSES,
 	.accept_ra_defrtr	= 1,
 	.accept_ra_pinfo	= 1,
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	.accept_ra_rtr_pref	= 1,
+#endif
 };
 
 /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */
@@ -3119,6 +3125,9 @@ static void inline ipv6_store_devconf(st
 	array[DEVCONF_MAX_ADDRESSES] = cnf->max_addresses;
 	array[DEVCONF_ACCEPT_RA_DEFRTR] = cnf->accept_ra_defrtr;
 	array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo;
+#ifdef CONFIG_IPV6_ROUTER_PREF
+	array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref;
+#endif
 }
 
 static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev, 
@@ -3587,6 +3596,16 @@ static struct addrconf_sysctl_table
 			.mode		=	0644,
          		.proc_handler	=	&proc_dointvec,
 		},
+#ifdef CONFIG_IPV6_ROUTER_PREF
+		{
+			.ctl_name	=	NET_IPV6_ACCEPT_RA_RTR_PREF,
+			.procname	=	"accept_ra_rtr_pref",
+			.data		=	&ipv6_devconf.accept_ra_rtr_pref,
+			.maxlen		=	sizeof(int),
+			.mode		=	0644,
+			.proc_handler	=	&proc_dointvec,
+		},
+#endif
 		{
 			.ctl_name	=	0,	/* sentinel */
 		}
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 966ab6b..f4462ee 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1090,7 +1090,8 @@ static void ndisc_router_discovery(struc
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	pref = ra_msg->icmph.icmp6_router_pref;
 	/* 10b is handled as if it were 00b (medium) */
-	if (pref == ICMPV6_ROUTER_PREF_INVALID)
+	if (pref == ICMPV6_ROUTER_PREF_INVALID ||
+	    in6_dev->cnf.accept_ra_rtr_pref)
 		pref = ICMPV6_ROUTER_PREF_MEDIUM;
 #endif
 
---
0.99.8.GIT


--- NEW FILE 4401-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add router_probe_interval sysctl.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825391 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 Documentation/networking/ip-sysctl.txt |    6 ++++++
 include/linux/ipv6.h                   |    2 ++
 include/linux/sysctl.h                 |    1 +
 net/ipv6/addrconf.c                    |   12 ++++++++++++
 net/ipv6/route.c                       |    2 +-
 5 files changed, 22 insertions(+), 1 deletions(-)

applies-to: e54f71b4d17d05761ca16dafb250b39342bac187
3439e162018e45b4f67d267fb195582f1b8be6d3
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 87bbd77..88efed0 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -789,6 +789,12 @@ mtu - INTEGER
 	Default Maximum Transfer Unit
 	Default: 1280 (IPv6 required minimum)
 
+router_probe_interval - INTEGER
+	Minimum interval (in seconds) between Router Probing described
+	in RFC4191.
+
+	Default: 60
+
 router_solicitation_delay - INTEGER
 	Number of seconds to wait after interface is brought up
 	before sending Router Solicitations.
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 108b75d..c609cc7 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -149,6 +149,7 @@ struct ipv6_devconf {
 	__s32		accept_ra_pinfo;
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	__s32		accept_ra_rtr_pref;
+	__s32		rtr_probe_interval;
 #endif
 	void		*sysctl;
 };
@@ -175,6 +176,7 @@ enum {
 	DEVCONF_ACCEPT_RA_DEFRTR,
 	DEVCONF_ACCEPT_RA_PINFO,
 	DEVCONF_ACCEPT_RA_RTR_PREF,
+	DEVCONF_RTR_PROBE_INTERVAL,
 	DEVCONF_MAX
 };
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 06607e8..85c5b03 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -532,6 +532,7 @@ enum {
 	NET_IPV6_ACCEPT_RA_DEFRTR=18,
 	NET_IPV6_ACCEPT_RA_PINFO=19,
 	NET_IPV6_ACCEPT_RA_RTR_PREF=20,
+	NET_IPV6_RTR_PROBE_INTERVAL=21,
 	__NET_IPV6_MAX
 };
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 294e820..e74e70b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -169,6 +169,7 @@ struct ipv6_devconf ipv6_devconf = {
 	.accept_ra_pinfo	= 1,
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
+	.rtr_probe_interval	= 60 * HZ,
 #endif
 };
 
@@ -195,6 +196,7 @@ static struct ipv6_devconf ipv6_devconf_
 	.accept_ra_pinfo	= 1,
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
+	.rtr_probe_interval	= 60 * HZ,
 #endif
 };
 
@@ -3127,6 +3129,7 @@ static void inline ipv6_store_devconf(st
 	array[DEVCONF_ACCEPT_RA_PINFO] = cnf->accept_ra_pinfo;
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref;
+	array[DEVCONF_RTR_PROBE_INTERVAL] = cnf->rtr_probe_interval;
 #endif
 }
 
@@ -3605,6 +3608,15 @@ static struct addrconf_sysctl_table
 			.mode		=	0644,
 			.proc_handler	=	&proc_dointvec,
 		},
+		{
+			.ctl_name	=	NET_IPV6_RTR_PROBE_INTERVAL,
+			.procname	=	"router_probe_interval",
+			.data		=	&ipv6_devconf.rtr_probe_interval,
+			.maxlen		=	sizeof(int),
+			.mode		=	0644,
+			.proc_handler	=	&proc_dointvec_jiffies,
+			.strategy	=	&sysctl_jiffies,
+		},
 #endif
 		{
 			.ctl_name	=	0,	/* sentinel */
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e292c17..327a476 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -234,7 +234,7 @@ static void rt6_probe(struct rt6_info *r
 		return;
 	read_lock_bh(&neigh->lock);
 	if (!(neigh->nud_state & NUD_VALID) &&
-	    time_after(jiffies, neigh->updated + 60 * HZ)) {
+	    time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
 		struct in6_addr mcaddr;
 		struct in6_addr *target;
 
---
0.99.8.GIT


--- NEW FILE 4402-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825393 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 include/linux/ipv6_route.h |    2 +
 include/net/ip6_route.h    |   21 +++++++
 include/net/ndisc.h        |    2 +
 net/ipv6/Kconfig           |    8 +++
 net/ipv6/ndisc.c           |   25 ++++++++
 net/ipv6/route.c           |  134 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 191 insertions(+), 1 deletions(-)

applies-to: 76915bec89283ce6f2e94a91fb274888a3106674
b31bb7186fc9fd4e7a5e1be6f9b32e9d4469f05d
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index f4b085c..b323ff5 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -23,6 +23,8 @@
 #define RTF_NONEXTHOP	0x00200000	/* route with no nexthop	*/
 #define RTF_EXPIRES	0x00400000
 
+#define RTF_ROUTEINFO	0x00800000	/* route information - RA	*/
+
 #define RTF_CACHE	0x01000000	/* cache entry			*/
 #define RTF_FLOW	0x02000000	/* flow significant route	*/
 #define RTF_POLICY	0x04000000	/* policy route			*/
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 5016132..a398ae5 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -7,6 +7,23 @@
 #define IP6_RT_PRIO_KERN	512
 #define IP6_RT_FLOW_MASK	0x00ff
 
+struct route_info {
+	__u8			type;
+	__u8			length;
+	__u8			prefix_len;
+#if defined(__BIG_ENDIAN_BITFIELD)
+	__u8			reserved_h:3,
+				route_pref:2,
+				reserved_l:3;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+	__u8			reserved_l:3,
+				route_pref:2,
+				reserved_h:3;
+#endif
+	__u32			lifetime;
+	__u8			prefix[0];	/* 0,8 or 16 */
+};
+
 #ifdef __KERNEL__
 
 #include <net/flow.h>
@@ -92,6 +109,10 @@ extern struct rt6_info *	rt6_add_dflt_ro
 
 extern void			rt6_purge_dflt_routers(void);
 
+extern int			rt6_route_rcv(struct net_device *dev,
+					      u8 *opt, int len,
+					      struct in6_addr *gwaddr);
+
 extern void			rt6_redirect(struct in6_addr *dest,
 					     struct in6_addr *saddr,
 					     struct neighbour *neigh,
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index bbac87e..91fa271 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -22,6 +22,8 @@ enum {
 	ND_OPT_PREFIX_INFO = 3,		/* RFC2461 */
 	ND_OPT_REDIRECT_HDR = 4,	/* RFC2461 */
 	ND_OPT_MTU = 5,			/* RFC2461 */
+	__ND_OPT_ARRAY_MAX,
+	ND_OPT_ROUTE_INFO = 24,		/* RFC4191 */
 	__ND_OPT_MAX
 };
 
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index a7d9ff5..163ab31 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -49,6 +49,14 @@ config IPV6_ROUTER_PREF
 
 	  If unsure, say N.
 
+config IPV6_ROUTE_INFO
+	bool "IPv6: Route Information (RFC 4191) support (EXPERIMENTAL)"
+	depends on IPV6_ROUTER_PREF && EXPERIMENTAL
+	---help---
+	  This is experimental support of Route Information.
+
+	  If unsure, say N.
+
 config INET6_AH
 	tristate "IPv6: AH transformation"
 	depends on IPV6
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index f4462ee..1f62569 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -156,7 +156,11 @@ struct neigh_table nd_tbl = {
 
 /* ND options */
 struct ndisc_options {
-	struct nd_opt_hdr *nd_opt_array[__ND_OPT_MAX];
+	struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX];
+#ifdef CONFIG_IPV6_ROUTE_INFO
+	struct nd_opt_hdr *nd_opts_ri;
+	struct nd_opt_hdr *nd_opts_ri_end;
+#endif
 };
 
 #define nd_opts_src_lladdr	nd_opt_array[ND_OPT_SOURCE_LL_ADDR]
@@ -255,6 +259,13 @@ static struct ndisc_options *ndisc_parse
 			if (ndopts->nd_opt_array[nd_opt->nd_opt_type] == 0)
 				ndopts->nd_opt_array[nd_opt->nd_opt_type] = nd_opt;
 			break;
+#ifdef CONFIG_IPV6_ROUTE_INFO
+		case ND_OPT_ROUTE_INFO:
+			ndopts->nd_opts_ri_end = nd_opt;
+			if (!ndopts->nd_opts_ri)
+				ndopts->nd_opts_ri = nd_opt;
+			break;
+#endif
 		default:
 			/*
 			 * Unknown options must be silently ignored,
@@ -1202,6 +1213,18 @@ skip_defrtr:
 			     NEIGH_UPDATE_F_ISROUTER);
 	}
 
+#ifdef CONFIG_IPV6_ROUTE_INFO
+	if (ndopts.nd_opts_ri) {
+		struct nd_opt_hdr *p;
+		for (p = ndopts.nd_opts_ri;
+		     p;
+		     p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
+			rt6_route_rcv(skb->dev, (u8*)p, (p->nd_opt_len) << 3,
+				      &skb->nh.ipv6h->saddr);
+		}
+	}
+#endif
+
 	if (in6_dev->cnf.accept_ra_pinfo && ndopts.nd_opts_pi) {
 		struct nd_opt_hdr *p;
 		for (p = ndopts.nd_opts_pi;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 327a476..e577945 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -98,6 +98,14 @@ static int		ip6_pkt_discard_out(struct s
 static void		ip6_link_failure(struct sk_buff *skb);
 static void		ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu);
 
+#ifdef CONFIG_IPV6_ROUTE_INFO
+static struct rt6_info *rt6_add_route_info(struct in6_addr *prefix, int prefixlen,
+					   struct in6_addr *gwaddr, int ifindex,
+					   unsigned pref);
+static struct rt6_info *rt6_get_route_info(struct in6_addr *prefix, int prefixlen,
+					   struct in6_addr *gwaddr, int ifindex);
+#endif
+
 static struct dst_ops ip6_dst_ops = {
 	.family			=	AF_INET6,
 	.protocol		=	__constant_htons(ETH_P_IPV6),
@@ -346,6 +354,84 @@ static struct rt6_info *rt6_select(struc
 	return (match ? match : &ip6_null_entry);
 }
 
+#ifdef CONFIG_IPV6_ROUTE_INFO
+int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,
+		  struct in6_addr *gwaddr)
+{
+	struct route_info *rinfo = (struct route_info *) opt;
+	struct in6_addr prefix_buf, *prefix;
+	unsigned int pref;
+	u32 lifetime;
+	struct rt6_info *rt;
+
+	if (len < sizeof(struct route_info)) {
+		return -EINVAL;
+	}
+
+	/* Sanity check for prefix_len and length */
+	if (rinfo->length > 3) {
+		return -EINVAL;
+	} else if (rinfo->prefix_len > 128) {
+		return -EINVAL;
+	} else if (rinfo->prefix_len > 64) {
+		if (rinfo->length < 2) {
+			return -EINVAL;
+		}
+	} else if (rinfo->prefix_len > 0) {
+		if (rinfo->length < 1) {
+			return -EINVAL;
+		}
+	}
+
+	pref = rinfo->route_pref;
+	if (pref == ICMPV6_ROUTER_PREF_INVALID)
+		pref = ICMPV6_ROUTER_PREF_MEDIUM;
+
+	lifetime = htonl(rinfo->lifetime);
+	if (lifetime == 0xffffffff) {
+		/* infinity */
+	} else if (lifetime > 0x7fffffff/HZ) {
+		/* Avoid arithmetic overflow */
+		lifetime = 0x7fffffff/HZ - 1;
+	}
+
+	if (rinfo->length == 3)
+		prefix = (struct in6_addr *)rinfo->prefix;
+	else {
+		/* this function is safe */
+		ipv6_addr_prefix(&prefix_buf,
+				 (struct in6_addr *)rinfo->prefix,
+				 rinfo->prefix_len);
+		prefix = &prefix_buf;
+	}
+
+	rt = rt6_get_route_info(prefix, rinfo->prefix_len, gwaddr, dev->ifindex);
+
+	if (rt && !lifetime) {
+		ip6_del_rt(rt, NULL, NULL, NULL);
+		rt = NULL;
+	}
+
+	if (!rt && lifetime)
+		rt = rt6_add_route_info(prefix, rinfo->prefix_len, gwaddr, dev->ifindex,
+					pref);
+	else if (rt)
+		rt->rt6i_flags = RTF_ROUTEINFO |
+				 (rt->rt6i_flags & ~RTF_PREF_MASK) | RTF_PREF(pref);
+
+	if (rt) {
+		if (lifetime == 0xffffffff) {
+			rt->rt6i_flags &= ~RTF_EXPIRES;
+		} else {
+			rt->rt6i_expires = jiffies + HZ * lifetime;
+			rt->rt6i_flags |= RTF_EXPIRES;
+		}
+		dst_release(&rt->u.dst);
+	}
+	return 0;
+}
+#endif
+
 struct rt6_info *rt6_lookup(struct in6_addr *daddr, struct in6_addr *saddr,
 			    int oif, int strict)
 {
@@ -1277,6 +1363,54 @@ static struct rt6_info * ip6_rt_copy(str
 	return rt;
 }
 
+#ifdef CONFIG_IPV6_ROUTE_INFO
+static struct rt6_info *rt6_get_route_info(struct in6_addr *prefix, int prefixlen,
+					   struct in6_addr *gwaddr, int ifindex)
+{
+	struct fib6_node *fn;
+	struct rt6_info *rt = NULL;
+
+	write_lock_bh(&rt6_lock);
+	fn = fib6_locate(&ip6_routing_table, prefix ,prefixlen, NULL, 0);
+	if (!fn)
+		goto out;
+
+	for (rt = fn->leaf; rt; rt = rt->u.next) {
+		if (rt->rt6i_dev->ifindex != ifindex)
+			continue;
+		if ((rt->rt6i_flags & (RTF_ROUTEINFO|RTF_GATEWAY)) != (RTF_ROUTEINFO|RTF_GATEWAY))
+			continue;
+		if (!ipv6_addr_equal(&rt->rt6i_gateway, gwaddr))
+			continue;
+		dst_hold(&rt->u.dst);
+		break;
+	}
+out:
+	write_unlock_bh(&rt6_lock);
+	return rt;
+}
+
+static struct rt6_info *rt6_add_route_info(struct in6_addr *prefix, int prefixlen,
+					   struct in6_addr *gwaddr, int ifindex,
+					   unsigned pref)
+{
+	struct in6_rtmsg rtmsg;
+
+	memset(&rtmsg, 0, sizeof(rtmsg));
+	rtmsg.rtmsg_type = RTMSG_NEWROUTE;
+	ipv6_addr_copy(&rtmsg.rtmsg_dst, prefix);
+	rtmsg.rtmsg_dst_len = prefixlen;
+	ipv6_addr_copy(&rtmsg.rtmsg_gateway, gwaddr);
+	rtmsg.rtmsg_metric = 1024;
+	rtmsg.rtmsg_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_ROUTEINFO | RTF_UP | RTF_PREF(pref);
+	rtmsg.rtmsg_ifindex = ifindex;
+
+	ip6_route_add(&rtmsg, NULL, NULL, NULL);
+
+	return rt6_get_route_info(prefix, prefixlen, gwaddr, ifindex);
+}
+#endif
+	
 struct rt6_info *rt6_get_dflt_router(struct in6_addr *addr, struct net_device *dev)
 {	
 	struct rt6_info *rt;
---
0.99.8.GIT


--- NEW FILE 4403-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Flag RTF_DEFAULT for Route Infomation for ::/0.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825394 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

applies-to: 9dd8d23ebb0e0292ba6d9a307da6a79421c5c6cd
3cef153c103b5b8329167a8a83204a393f4ccae8
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e577945..cce5323 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1403,6 +1403,9 @@ static struct rt6_info *rt6_add_route_in
 	ipv6_addr_copy(&rtmsg.rtmsg_gateway, gwaddr);
 	rtmsg.rtmsg_metric = 1024;
 	rtmsg.rtmsg_flags = RTF_GATEWAY | RTF_ADDRCONF | RTF_ROUTEINFO | RTF_UP | RTF_PREF(pref);
+	/* We should treat it as a default route if prefix length is 0. */
+	if (!prefixlen)
+		rtmsg.rtmsg_flags |= RTF_DEFAULT;
 	rtmsg.rtmsg_ifindex = ifindex;
 
 	ip6_route_add(&rtmsg, NULL, NULL, NULL);
---
0.99.8.GIT


--- NEW FILE 4404-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Add accept_ra_rt_info_max_plen sysctl.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825395 +0900

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 Documentation/networking/ip-sysctl.txt |    9 +++++++++
 include/linux/ipv6.h                   |    4 ++++
 include/linux/sysctl.h                 |    1 +
 net/ipv6/addrconf.c                    |   19 +++++++++++++++++++
 net/ipv6/ndisc.c                       |    4 +++-
 5 files changed, 36 insertions(+), 1 deletions(-)

applies-to: 8babe2d9cb63a2101995cdca5f58d3b1d13329f6
f61f070fa6449dd8debd6253af5b0ca9dcbb0c8b
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 88efed0..35aed1c 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -729,6 +729,15 @@ accept_ra_pinfo - BOOLEAN
 	Functional default: enabled if accept_ra is enabled.
 			    disabled if accept_ra is disabled.
 
+accept_ra_rt_info_max_plen - INTEGER
+	Maximum prefix length of Route Information in RA.
+
+	Route Information w/ prefix larger than or equal to this
+	variable shall be ignored.
+
+	Functional default: 0 if accept_ra_rtr_pref is enabled.
+			    -1 if accept_ra_rtr_pref is disabled.
+
 accept_ra_rtr_pref - BOOLEAN
 	Accept Router Preference in RA.
 
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index c609cc7..1263d8c 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -150,6 +150,9 @@ struct ipv6_devconf {
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	__s32		accept_ra_rtr_pref;
 	__s32		rtr_probe_interval;
+#ifdef CONFIG_IPV6_ROUTE_INFO
+	__s32		accept_ra_rt_info_max_plen;
+#endif
 #endif
 	void		*sysctl;
 };
@@ -177,6 +180,7 @@ enum {
 	DEVCONF_ACCEPT_RA_PINFO,
 	DEVCONF_ACCEPT_RA_RTR_PREF,
 	DEVCONF_RTR_PROBE_INTERVAL,
+	DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN,
 	DEVCONF_MAX
 };
 
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 85c5b03..1afe3ba 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -533,6 +533,7 @@ enum {
 	NET_IPV6_ACCEPT_RA_PINFO=19,
 	NET_IPV6_ACCEPT_RA_RTR_PREF=20,
 	NET_IPV6_RTR_PROBE_INTERVAL=21,
+	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN=22,
 	__NET_IPV6_MAX
 };
 
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index e74e70b..d6d97c1 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -170,6 +170,9 @@ struct ipv6_devconf ipv6_devconf = {
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
 	.rtr_probe_interval	= 60 * HZ,
+#ifdef CONFIG_IPV6_ROUTE_INFO
+	.accept_ra_rt_info_max_plen = 0,
+#endif
 #endif
 };
 
@@ -197,6 +200,9 @@ static struct ipv6_devconf ipv6_devconf_
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	.accept_ra_rtr_pref	= 1,
 	.rtr_probe_interval	= 60 * HZ,
+#ifdef CONFIG_IPV6_ROUTE_INFO
+	.accept_ra_rt_info_max_plen = 0,
+#endif
 #endif
 };
 
@@ -3130,6 +3136,9 @@ static void inline ipv6_store_devconf(st
 #ifdef CONFIG_IPV6_ROUTER_PREF
 	array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref;
 	array[DEVCONF_RTR_PROBE_INTERVAL] = cnf->rtr_probe_interval;
+#ifdef CONFIV_IPV6_ROUTE_INFO
+	array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen;
+#endif
 #endif
 }
 
@@ -3617,6 +3626,16 @@ static struct addrconf_sysctl_table
 			.proc_handler	=	&proc_dointvec_jiffies,
 			.strategy	=	&sysctl_jiffies,
 		},
+#ifdef CONFIV_IPV6_ROUTE_INFO
+		{
+			.ctl_name	=	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,
+			.procname	=	"accept_ra_rt_info_max_plen",
+			.data		=	&ipv6_devconf.accept_ra_rt_info_max_plen,
+			.maxlen		=	sizeof(int),
+			.mode		=	0644,
+			.proc_handler	=	&proc_dointvec,
+		},
+#endif
 #endif
 		{
 			.ctl_name	=	0,	/* sentinel */
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 1f62569..dfa20d3 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1214,11 +1214,13 @@ skip_defrtr:
 	}
 
 #ifdef CONFIG_IPV6_ROUTE_INFO
-	if (ndopts.nd_opts_ri) {
+	if (in6_dev->cnf.accept_ra_rtr_pref && ndopts.nd_opts_ri) {
 		struct nd_opt_hdr *p;
 		for (p = ndopts.nd_opts_ri;
 		     p;
 		     p = ndisc_next_option(p, ndopts.nd_opts_ri_end)) {
+			if (((struct route_info *)p)->prefix_len > in6_dev->cnf.accept_ra_rt_info_max_plen)
+				continue;
 			rt6_route_rcv(skb->dev, (u8*)p, (p->nd_opt_len) << 3,
 				      &skb->nh.ipv6h->saddr);
 		}
---
0.99.8.GIT


--- NEW FILE 4405-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt ---
Subject: [PATCH] [IPV6]: ROUTE: Ensure to accept redirects from nexthop for the target.
From: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: 1136825397 +0900

It is possible to get redirects from nexthop of "more-specific"
routes.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>

---

 net/ipv6/route.c |   90 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 47 insertions(+), 43 deletions(-)

applies-to: 41a1dbb3e1803ccceda5d5048639d881f1629b3d
de45361b34ddb6a929521282229916d6e95394b5
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index cce5323..074c49f 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1144,59 +1144,63 @@ static int ip6_route_del(struct in6_rtms
 void rt6_redirect(struct in6_addr *dest, struct in6_addr *saddr,
 		  struct neighbour *neigh, u8 *lladdr, int on_link)
 {
-	struct rt6_info *rt, *nrt;
-
-	/* Locate old route to this destination. */
-	rt = rt6_lookup(dest, NULL, neigh->dev->ifindex, 1);
-
-	if (rt == NULL)
-		return;
-
-	if (neigh->dev != rt->rt6i_dev)
-		goto out;
+	struct rt6_info *rt, *nrt = NULL;
+	int strict;
+	struct fib6_node *fn;
 
 	/*
-	 * Current route is on-link; redirect is always invalid.
-	 * 
-	 * Seems, previous statement is not true. It could
-	 * be node, which looks for us as on-link (f.e. proxy ndisc)
-	 * But then router serving it might decide, that we should
-	 * know truth 8)8) --ANK (980726).
+	 * Get the "current" route for this destination and
+	 * check if the redirect has come from approriate router.
+	 *
+	 * RFC 2461 specifies that redirects should only be
+	 * accepted if they come from the nexthop to the target.
+	 * Due to the way the routes are chosen, this notion
+	 * is a bit fuzzy and one might need to check all possible
+	 * routes.
 	 */
-	if (!(rt->rt6i_flags&RTF_GATEWAY))
-		goto out;
+	strict = ipv6_addr_type(dest) & (IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL);
 
-	/*
-	 *	RFC 2461 specifies that redirects should only be
-	 *	accepted if they come from the nexthop to the target.
-	 *	Due to the way default routers are chosen, this notion
-	 *	is a bit fuzzy and one might need to check all default
-	 *	routers.
-	 */
-	if (!ipv6_addr_equal(saddr, &rt->rt6i_gateway)) {
-		if (rt->rt6i_flags & RTF_DEFAULT) {
-			struct rt6_info *rt1;
-
-			read_lock(&rt6_lock);
-			for (rt1 = ip6_routing_table.leaf; rt1; rt1 = rt1->u.next) {
-				if (ipv6_addr_equal(saddr, &rt1->rt6i_gateway)) {
-					dst_hold(&rt1->u.dst);
-					dst_release(&rt->u.dst);
-					read_unlock(&rt6_lock);
-					rt = rt1;
-					goto source_ok;
-				}
-			}
-			read_unlock(&rt6_lock);
+	read_lock_bh(&rt6_lock);
+	fn = fib6_lookup(&ip6_routing_table, dest, NULL);
+restart:
+	for (rt = fn->leaf; rt; rt = rt->u.next) {
+		/*
+		 * Current route is on-link; redirect is always invalid.
+		 * 
+		 * Seems, previous statement is not true. It could
+		 * be node, which looks for us as on-link (f.e. proxy ndisc)
+		 * But then router serving it might decide, that we should
+		 * know truth 8)8) --ANK (980726).
+		 */
+		if (rt6_check_expired(rt))
+			continue;
+		if (!(rt->rt6i_flags & RTF_GATEWAY))
+			continue;
+		if (neigh->dev != rt->rt6i_dev)
+			continue;
+		if (!ipv6_addr_equal(saddr, &rt->rt6i_gateway))
+			continue;
+		break;
+	}
+	if (rt)
+		dst_hold(&rt->u.dst);
+	else if (strict) {
+		while ((fn = fn->parent) != NULL) {
+			if (fn->fn_flags & RTN_ROOT)
+				break;
+			if (fn->fn_flags & RTN_RTINFO)
+				goto restart;
 		}
+	}
+	read_unlock_bh(&rt6_lock);
+	
+	if (!rt) {
 		if (net_ratelimit())
 			printk(KERN_DEBUG "rt6_redirect: source isn't a valid nexthop "
 			       "for redirect target\n");
-		goto out;
+		return;
 	}
 
-source_ok:
-
 	/*
 	 *	We have finally decided to accept it.
 	 */
---
0.99.8.GIT


--- NEW FILE 4412-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt ---
Subject: [PATCH] [NETFILTER] nfnetlink_log: add sequence numbers for log events
From: Harald Welte <laforge at netfilter.org>
Date: 1138665009 -0800

By using a sequence number for every logged netfilter event, we can
determine from userspace whether logging information was lots somewhere
downstream.

The user has a choice of either having per-instance local sequence
counters, or using a global sequence counter, or both.

Signed-off-by: Harald Welte <laforge at netfilter.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/linux/netfilter/nfnetlink_log.h |    6 ++++
 net/netfilter/nfnetlink_log.c           |   46 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)

applies-to: dbfb54f2d94867cc5e6fc81be539ef116478a927
80f86b4f08bfab3e64f87f231770771a056f725f
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index b04b038..a7497c7 100644
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -47,6 +47,8 @@ enum nfulnl_attr_type {
 	NFULA_PAYLOAD,			/* opaque data payload */
 	NFULA_PREFIX,			/* string prefix */
 	NFULA_UID,			/* user id of socket */
+	NFULA_SEQ,			/* instance-local sequence number */
+	NFULA_SEQ_GLOBAL,		/* global sequence number */
 
 	__NFULA_MAX
 };
@@ -77,6 +79,7 @@ enum nfulnl_attr_config {
 	NFULA_CFG_NLBUFSIZ,		/* u_int32_t buffer size */
 	NFULA_CFG_TIMEOUT,		/* u_int32_t in 1/100 s */
 	NFULA_CFG_QTHRESH,		/* u_int32_t */
+	NFULA_CFG_FLAGS,		/* u_int16_t */
 	__NFULA_CFG_MAX
 };
 #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
@@ -85,4 +88,7 @@ enum nfulnl_attr_config {
 #define NFULNL_COPY_META	0x01
 #define NFULNL_COPY_PACKET	0x02
 
+#define NFULNL_CFG_F_SEQ	0x0001
+#define NFULNL_CFG_F_SEQ_GLOBAL	0x0002
+
 #endif /* _NFNETLINK_LOG_H */
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 3b3c781..dfb25fd 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -11,6 +11,10 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
+ * 2006-01-26 Harald Welte <laforge at netfilter.org>
+ * 	- Add optional local and global sequence number to detect lost 
+ * 	  events from userspace
+ *
  */
 #include <linux/module.h>
 #include <linux/skbuff.h>
@@ -68,11 +72,14 @@ struct nfulnl_instance {
 	unsigned int nlbufsiz;		/* netlink buffer allocation size */
 	unsigned int qthreshold;	/* threshold of the queue */
 	u_int32_t copy_range;
+	u_int32_t seq;			/* instance-local sequential counter */
 	u_int16_t group_num;		/* number of this queue */
+	u_int16_t flags;
 	u_int8_t copy_mode;	
 };
 
 static DEFINE_RWLOCK(instances_lock);
+static atomic_t global_seq;
 
 #define INSTANCE_BUCKETS	16
 static struct hlist_head instance_table[INSTANCE_BUCKETS];
@@ -310,6 +317,16 @@ nfulnl_set_qthresh(struct nfulnl_instanc
 	return 0;
 }
 
+static int
+nfulnl_set_flags(struct nfulnl_instance *inst, u_int16_t flags)
+{
+	spin_lock_bh(&inst->lock);
+	inst->flags = ntohs(flags);
+	spin_unlock_bh(&inst->lock);
+
+	return 0;
+}
+
 static struct sk_buff *nfulnl_alloc_skb(unsigned int inst_size, 
 					unsigned int pkt_size)
 {
@@ -377,6 +394,8 @@ static void nfulnl_timer(unsigned long d
 	spin_unlock_bh(&inst->lock);
 }
 
+/* This is an inline function, we don't really care about a long
+ * list of arguments */
 static inline int 
 __build_packet_message(struct nfulnl_instance *inst,
 			const struct sk_buff *skb, 
@@ -515,6 +534,17 @@ __build_packet_message(struct nfulnl_ins
 			read_unlock_bh(&skb->sk->sk_callback_lock);
 	}
 
+	/* local sequence number */
+	if (inst->flags & NFULNL_CFG_F_SEQ) {
+		tmp_uint = htonl(inst->seq++);
+		NFA_PUT(inst->skb, NFULA_SEQ, sizeof(tmp_uint), &tmp_uint);
+	}
+	/* global sequence number */
+	if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) {
+		tmp_uint = atomic_inc_return(&global_seq);
+		NFA_PUT(inst->skb, NFULA_SEQ_GLOBAL, sizeof(tmp_uint), &tmp_uint);
+	}
+
 	if (data_len) {
 		struct nfattr *nfa;
 		int size = NFA_LENGTH(data_len);
@@ -607,6 +637,11 @@ nfulnl_log_packet(unsigned int pf,
 
 	spin_lock_bh(&inst->lock);
 
+	if (inst->flags & NFULNL_CFG_F_SEQ)
+		size += NFA_SPACE(sizeof(u_int32_t));
+	if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
+		size += NFA_SPACE(sizeof(u_int32_t));
+
 	qthreshold = inst->qthreshold;
 	/* per-rule qthreshold overrides per-instance */
 	if (qthreshold > li->u.ulog.qthreshold)
@@ -736,10 +771,14 @@ static const int nfula_min[NFULA_MAX] = 
 	[NFULA_TIMESTAMP-1]	= sizeof(struct nfulnl_msg_packet_timestamp),
 	[NFULA_IFINDEX_INDEV-1]	= sizeof(u_int32_t),
 	[NFULA_IFINDEX_OUTDEV-1]= sizeof(u_int32_t),
+	[NFULA_IFINDEX_PHYSINDEV-1]	= sizeof(u_int32_t),
+	[NFULA_IFINDEX_PHYSOUTDEV-1]	= sizeof(u_int32_t),
 	[NFULA_HWADDR-1]	= sizeof(struct nfulnl_msg_packet_hw),
 	[NFULA_PAYLOAD-1]	= 0,
 	[NFULA_PREFIX-1]	= 0,
 	[NFULA_UID-1]		= sizeof(u_int32_t),
+	[NFULA_SEQ-1]		= sizeof(u_int32_t),
+	[NFULA_SEQ_GLOBAL-1]	= sizeof(u_int32_t),
 };
 
 static const int nfula_cfg_min[NFULA_CFG_MAX] = {
@@ -748,6 +787,7 @@ static const int nfula_cfg_min[NFULA_CFG
 	[NFULA_CFG_TIMEOUT-1]	= sizeof(u_int32_t),
 	[NFULA_CFG_QTHRESH-1]	= sizeof(u_int32_t),
 	[NFULA_CFG_NLBUFSIZ-1]	= sizeof(u_int32_t),
+	[NFULA_CFG_FLAGS-1]	= sizeof(u_int16_t),
 };
 
 static int
@@ -859,6 +899,12 @@ nfulnl_recv_config(struct sock *ctnl, st
 		nfulnl_set_qthresh(inst, ntohl(qthresh));
 	}
 
+	if (nfula[NFULA_CFG_FLAGS-1]) {
+		u_int16_t flags =
+			*(u_int16_t *)NFA_DATA(nfula[NFULA_CFG_FLAGS-1]);
+		nfulnl_set_flags(inst, ntohl(flags));
+	}
+
 out_put:
 	instance_put(inst);
 	return ret;
---
0.99.8.GIT


--- NEW FILE 4414-DCCP-ackvec-Ditch-dccpav_buf_len.txt ---
Subject: [PATCH] [DCCP] ackvec: Ditch dccpav_buf_len
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138881941 -0200

Simplifying the code a bit as we're always using DCCP_MAX_ACKVEC_LEN.

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ackvec.c    |   24 ++++++++++--------------
 net/dccp/ackvec.h    |   10 +++-------
 net/dccp/ipv4.c      |    3 +--
 net/dccp/minisocks.c |    3 +--
 4 files changed, 15 insertions(+), 25 deletions(-)

applies-to: b3b95916522d21b7056096affafece0b0b7684ce
8466461c84119ff3fa8d16d96c699c614a0278fe
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 2c77daf..3483740 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -20,6 +20,10 @@
 int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 {
 	struct dccp_sock *dp = dccp_sk(sk);
+#ifdef CONFIG_IP_DCCP_DEBUG
+	const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?
+				"CLIENT tx: " : "server tx: ";
+#endif
 	struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec;
 	int len = av->dccpav_vec_len + 2;
 	struct timeval now;
@@ -90,21 +94,13 @@ int dccp_insert_option_ackvec(struct soc
 	return -1;
 }
 
-struct dccp_ackvec *dccp_ackvec_alloc(const unsigned int len,
-				      const gfp_t priority)
+struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
 {
-	struct dccp_ackvec *av;
-
-	BUG_ON(len == 0);
-
-	if (len > DCCP_MAX_ACKVEC_LEN)
-		return NULL;
+	struct dccp_ackvec *av = kmalloc(sizeof(*av), priority);
 
-	av = kmalloc(sizeof(*av) + len, priority);
 	if (av != NULL) {
-		av->dccpav_buf_len	= len;
 		av->dccpav_buf_head	=
-			av->dccpav_buf_tail = av->dccpav_buf_len - 1;
+			av->dccpav_buf_tail = DCCP_MAX_ACKVEC_LEN - 1;
 		av->dccpav_buf_ackno	=
 			av->dccpav_ack_ackno = av->dccpav_ack_seqno = ~0LLU;
 		av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0;
@@ -146,7 +142,7 @@ static inline int dccp_ackvec_set_buf_he
 	unsigned int gap;
 	long new_head;
 
-	if (av->dccpav_vec_len + packets > av->dccpav_buf_len)
+	if (av->dccpav_vec_len + packets > DCCP_MAX_ACKVEC_LEN)
 		return -ENOBUFS;
 
 	gap	 = packets - 1;
@@ -158,7 +154,7 @@ static inline int dccp_ackvec_set_buf_he
 			       gap + new_head + 1);
 			gap = -new_head;
 		}
-		new_head += av->dccpav_buf_len;
+		new_head += DCCP_MAX_ACKVEC_LEN;
 	} 
 
 	av->dccpav_buf_head = new_head;
@@ -251,7 +247,7 @@ int dccp_ackvec_add(struct dccp_ackvec *
 				goto out_duplicate;
 
 			delta -= len + 1;
-			if (++index == av->dccpav_buf_len)
+			if (++index == DCCP_MAX_ACKVEC_LEN)
 				index = 0;
 		}
 	}
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h
index f7dfb5f..f083daf 100644
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
@@ -49,7 +49,6 @@
  * 		       (HC-Sender seqno)
  * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.
  *
- * @dccpav_buf_len	- circular buffer length
  * @dccpav_time		- the time in usecs
  * @dccpav_buf - circular buffer of acknowledgeable packets
  */
@@ -63,18 +62,16 @@ struct dccp_ackvec {
 	u8		dccpav_ack_ptr;
 	u8		dccpav_sent_len;
 	u8		dccpav_vec_len;
-	u8		dccpav_buf_len;
 	u8		dccpav_buf_nonce;
 	u8		dccpav_ack_nonce;
-	u8		dccpav_buf[0];
+	u8		dccpav_buf[DCCP_MAX_ACKVEC_LEN];
 };
 
 struct sock;
 struct sk_buff;
 
 #ifdef CONFIG_IP_DCCP_ACKVEC
-extern struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len,
-					  const gfp_t priority);
+extern struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority);
 extern void dccp_ackvec_free(struct dccp_ackvec *av);
 
 extern int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,
@@ -92,8 +89,7 @@ static inline int dccp_ackvec_pending(co
 	return av->dccpav_sent_len != av->dccpav_vec_len;
 }
 #else /* CONFIG_IP_DCCP_ACKVEC */
-static inline struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len,
-					   const gfp_t priority)
+static inline struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
 {
 	return NULL;
 }
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index dc0487b..f8df565 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1042,8 +1042,7 @@ int dccp_v4_init_sock(struct sock *sk)
 	do_gettimeofday(&dp->dccps_epoch);
 
 	if (dp->dccps_options.dccpo_send_ack_vector) {
-		dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(DCCP_MAX_ACKVEC_LEN,
-							   GFP_KERNEL);
+		dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
 		if (dp->dccps_hc_rx_ackvec == NULL)
 			return -ENOMEM;
 	}
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 29261fc..a60a3e9 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -116,8 +116,7 @@ struct sock *dccp_create_openreq_child(s
 
 		if (newdp->dccps_options.dccpo_send_ack_vector) {
 			newdp->dccps_hc_rx_ackvec =
-				dccp_ackvec_alloc(DCCP_MAX_ACKVEC_LEN,
-						  GFP_ATOMIC);
+						dccp_ackvec_alloc(GFP_ATOMIC);
 			/*
 			 * XXX: We're using the same CCIDs set on the parent,
 			 * i.e. sk_clone copied the master sock and left the
---
0.99.8.GIT


--- NEW FILE 4415-DCCP-Fix-error-handling-in-dccp_init.txt ---
Subject: [PATCH] [DCCP]: Fix error handling in dccp_init
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138888350 -0200

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/proto.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

applies-to: 19cd4173c87ae395b06d3e06f281cc01f647743b
f182587ae43142b0a232f05d36e3e319dc165a17
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 65b11ea..568d266 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -799,6 +799,7 @@ static int __init dccp_init(void)
 	if (rc)
 		goto out;
 
+	rc = -ENOBUFS;
 	dccp_hashinfo.bind_bucket_cachep =
 		kmem_cache_create("dccp_bind_bucket",
 				  sizeof(struct inet_bind_bucket), 0,
@@ -866,7 +867,8 @@ static int __init dccp_init(void)
 		INIT_HLIST_HEAD(&dccp_hashinfo.bhash[i].chain);
 	}
 
-	if (init_dccp_v4_mibs())
+	rc = init_dccp_v4_mibs();
+	if (rc)
 		goto out_free_dccp_bhash;
 
 	rc = -EAGAIN;
---
0.99.8.GIT


--- NEW FILE 4416-DCCP-ackvec-Introduce-dccp_ackvec_slab.txt ---
Subject: [PATCH] [DCCP] ackvec: Introduce dccp_ackvec_slab
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138893615 -0200

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ackvec.c |   34 ++++++++++++++++++++++++++++++++--
 net/dccp/ackvec.h |   12 ++++++++++++
 net/dccp/proto.c  |    9 ++++++++-
 3 files changed, 52 insertions(+), 3 deletions(-)

applies-to: a059e383318fd4ddcc45592efe549eaf4d6c2f6d
0c137fb9bfabac7011924b5475fff9093122c3dd
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 3483740..6440825 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -13,10 +13,16 @@
 #include "dccp.h"
 
 #include <linux/dccp.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 
 #include <net/sock.h>
 
+static kmem_cache_t *dccp_ackvec_slab;
+
 int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 {
 	struct dccp_sock *dp = dccp_sk(sk);
@@ -96,7 +102,7 @@ int dccp_insert_option_ackvec(struct soc
 
 struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
 {
-	struct dccp_ackvec *av = kmalloc(sizeof(*av), priority);
+	struct dccp_ackvec *av = kmem_cache_alloc(dccp_ackvec_slab, priority);
 
 	if (av != NULL) {
 		av->dccpav_buf_head	=
@@ -115,7 +121,7 @@ struct dccp_ackvec *dccp_ackvec_alloc(co
 
 void dccp_ackvec_free(struct dccp_ackvec *av)
 {
-	kfree(av);
+	kmem_cache_free(dccp_ackvec_slab, av);
 }
 
 static inline u8 dccp_ackvec_state(const struct dccp_ackvec *av,
@@ -420,3 +426,27 @@ int dccp_ackvec_parse(struct sock *sk, c
 				        len, value);
 	return 0;
 }
+
+static char dccp_ackvec_slab_msg[] __initdata =
+	KERN_CRIT "DCCP: Unable to create ack vectors slab cache\n";
+
+int __init dccp_ackvec_init(void)
+{
+	dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
+					     sizeof(struct dccp_ackvec), 0,
+					     SLAB_HWCACHE_ALIGN, NULL, NULL);
+	if (dccp_ackvec_slab == NULL) {
+		printk(dccp_ackvec_slab_msg);
+		return -ENOBUFS;
+	}
+
+	return 0;
+}
+
+void dccp_ackvec_exit(void)
+{
+	if (dccp_ackvec_slab != NULL) {
+		kmem_cache_destroy(dccp_ackvec_slab);
+		dccp_ackvec_slab = NULL;
+	}
+}
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h
index f083daf..470bae8 100644
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
@@ -71,6 +71,9 @@ struct sock;
 struct sk_buff;
 
 #ifdef CONFIG_IP_DCCP_ACKVEC
+extern int dccp_ackvec_init(void);
+extern void dccp_ackvec_exit(void);
+
 extern struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority);
 extern void dccp_ackvec_free(struct dccp_ackvec *av);
 
@@ -89,6 +92,15 @@ static inline int dccp_ackvec_pending(co
 	return av->dccpav_sent_len != av->dccpav_vec_len;
 }
 #else /* CONFIG_IP_DCCP_ACKVEC */
+static inline int dccp_ackvec_init(void)
+{
+	return 0;
+}
+
+static inline void dccp_ackvec_exit(void)
+{
+}
+
 static inline struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
 {
 	return NULL;
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 568d266..81ad249 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -877,11 +877,17 @@ static int __init dccp_init(void)
 
 	inet_register_protosw(&dccp_v4_protosw);
 
-	rc = dccp_ctl_sock_init();
+	rc = dccp_ackvec_init();
 	if (rc)
 		goto out_unregister_protosw;
+
+	rc = dccp_ctl_sock_init();
+	if (rc)
+		goto out_ackvec_exit;
 out:
 	return rc;
+out_ackvec_exit:
+	dccp_ackvec_exit();
 out_unregister_protosw:
 	inet_unregister_protosw(&dccp_v4_protosw);
 	inet_del_protocol(&dccp_protocol, IPPROTO_DCCP);
@@ -923,6 +929,7 @@ static void __exit dccp_fini(void)
 			     sizeof(struct inet_ehash_bucket)));
 	kmem_cache_destroy(dccp_hashinfo.bind_bucket_cachep);
 	proto_unregister(&dccp_prot);
+	dccp_ackvec_exit();
 }
 
 module_init(dccp_init);
---
0.99.8.GIT


--- NEW FILE 4418-IPV4-Use-RCU-locking-in-fib_rules.txt ---
Subject: [PATCH] [IPV4]: Use RCU locking in fib_rules.
From: Robert Olsson <robert.olsson at its.uu.se>
Date: 1138930295 -0800

Signed-off-by: Robert Olsson <robert.olsson at its.uu.se>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/fib_rules.c |  115 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 69 insertions(+), 46 deletions(-)

applies-to: ff7b439bc74eca8af09852767902d17122b8a9ec
2b82c4ef2389d39f835bf52fb5623420a4e909ee
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 0dd4d06..41b6173 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -40,6 +40,8 @@
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/init.h>
+#include <linux/list.h>
+#include <linux/rcupdate.h>
 
 #include <net/ip.h>
 #include <net/protocol.h>
@@ -52,7 +54,7 @@
 
 struct fib_rule
 {
-	struct fib_rule *r_next;
+	struct hlist_node hlist;
 	atomic_t	r_clntref;
 	u32		r_preference;
 	unsigned char	r_table;
@@ -75,6 +77,7 @@ struct fib_rule
 #endif
 	char		r_ifname[IFNAMSIZ];
 	int		r_dead;
+	struct		rcu_head rcu;
 };
 
 static struct fib_rule default_rule = {
@@ -85,7 +88,6 @@ static struct fib_rule default_rule = {
 };
 
 static struct fib_rule main_rule = {
-	.r_next =	&default_rule,
 	.r_clntref =	ATOMIC_INIT(2),
 	.r_preference =	0x7FFE,
 	.r_table =	RT_TABLE_MAIN,
@@ -93,23 +95,24 @@ static struct fib_rule main_rule = {
 };
 
 static struct fib_rule local_rule = {
-	.r_next =	&main_rule,
 	.r_clntref =	ATOMIC_INIT(2),
 	.r_table =	RT_TABLE_LOCAL,
 	.r_action =	RTN_UNICAST,
 };
 
-static struct fib_rule *fib_rules = &local_rule;
-static DEFINE_RWLOCK(fib_rules_lock);
+struct hlist_head fib_rules;
+
+/* writer func called from netlink -- rtnl_sem hold*/
 
 int inet_rtm_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
 	struct rtattr **rta = arg;
 	struct rtmsg *rtm = NLMSG_DATA(nlh);
-	struct fib_rule *r, **rp;
+	struct fib_rule *r;
+	struct hlist_node *node;
 	int err = -ESRCH;
 
-	for (rp=&fib_rules; (r=*rp) != NULL; rp=&r->r_next) {
+	hlist_for_each_entry(r, node, &fib_rules, hlist) {
 		if ((!rta[RTA_SRC-1] || memcmp(RTA_DATA(rta[RTA_SRC-1]), &r->r_src, 4) == 0) &&
 		    rtm->rtm_src_len == r->r_src_len &&
 		    rtm->rtm_dst_len == r->r_dst_len &&
@@ -126,10 +129,8 @@ int inet_rtm_delrule(struct sk_buff *skb
 			if (r == &local_rule)
 				break;
 
-			write_lock_bh(&fib_rules_lock);
-			*rp = r->r_next;
+			hlist_del_rcu(&r->hlist);			
 			r->r_dead = 1;
-			write_unlock_bh(&fib_rules_lock);
 			fib_rule_put(r);
 			err = 0;
 			break;
@@ -150,21 +151,30 @@ static struct fib_table *fib_empty_table
 	return NULL;
 }
 
+static inline void fib_rule_put_rcu(struct rcu_head *head)
+{
+	struct fib_rule *r = container_of(head, struct fib_rule, rcu);
+	kfree(r);
+}
+
 void fib_rule_put(struct fib_rule *r)
 {
 	if (atomic_dec_and_test(&r->r_clntref)) {
 		if (r->r_dead)
-			kfree(r);
+			call_rcu(&r->rcu, fib_rule_put_rcu);
 		else
 			printk("Freeing alive rule %p\n", r);
 	}
 }
 
+/* writer func called from netlink -- rtnl_sem hold*/
+
 int inet_rtm_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
 {
 	struct rtattr **rta = arg;
 	struct rtmsg *rtm = NLMSG_DATA(nlh);
-	struct fib_rule *r, *new_r, **rp;
+	struct fib_rule *r, *new_r, *last = NULL;
+	struct hlist_node *node = NULL;
 	unsigned char table_id;
 
 	if (rtm->rtm_src_len > 32 || rtm->rtm_dst_len > 32 ||
@@ -188,6 +198,7 @@ int inet_rtm_newrule(struct sk_buff *skb
 	if (!new_r)
 		return -ENOMEM;
 	memset(new_r, 0, sizeof(*new_r));
+
 	if (rta[RTA_SRC-1])
 		memcpy(&new_r->r_src, RTA_DATA(rta[RTA_SRC-1]), 4);
 	if (rta[RTA_DST-1])
@@ -220,28 +231,28 @@ int inet_rtm_newrule(struct sk_buff *skb
 	if (rta[RTA_FLOW-1])
 		memcpy(&new_r->r_tclassid, RTA_DATA(rta[RTA_FLOW-1]), 4);
 #endif
+	r = container_of(fib_rules.first, struct fib_rule, hlist);
 
-	rp = &fib_rules;
 	if (!new_r->r_preference) {
-		r = fib_rules;
-		if (r && (r = r->r_next) != NULL) {
-			rp = &fib_rules->r_next;
+		if (r && r->hlist.next != NULL) {
+			r = container_of(r->hlist.next, struct fib_rule, hlist);
 			if (r->r_preference)
 				new_r->r_preference = r->r_preference - 1;
 		}
 	}
-
-	while ( (r = *rp) != NULL ) {
+	
+	hlist_for_each_entry(r, node, &fib_rules, hlist) {
 		if (r->r_preference > new_r->r_preference)
 			break;
-		rp = &r->r_next;
+		last = r;
 	}
-
-	new_r->r_next = r;
 	atomic_inc(&new_r->r_clntref);
-	write_lock_bh(&fib_rules_lock);
-	*rp = new_r;
-	write_unlock_bh(&fib_rules_lock);
+
+	if (last)
+		hlist_add_after_rcu(&last->hlist, &new_r->hlist);
+	else
+		hlist_add_before_rcu(&new_r->hlist, &r->hlist);
+
 	return 0;
 }
 
@@ -254,30 +265,30 @@ u32 fib_rules_tclass(struct fib_result *
 }
 #endif
 
+/* callers should hold rtnl semaphore */
 
 static void fib_rules_detach(struct net_device *dev)
 {
+	struct hlist_node *node;
 	struct fib_rule *r;
 
-	for (r=fib_rules; r; r=r->r_next) {
-		if (r->r_ifindex == dev->ifindex) {
-			write_lock_bh(&fib_rules_lock);
+	hlist_for_each_entry(r, node, &fib_rules, hlist) {
+		if (r->r_ifindex == dev->ifindex) 
 			r->r_ifindex = -1;
-			write_unlock_bh(&fib_rules_lock);
-		}
+		
 	}
 }
 
+/* callers should hold rtnl semaphore */
+
 static void fib_rules_attach(struct net_device *dev)
 {
+	struct hlist_node *node;
 	struct fib_rule *r;
 
-	for (r=fib_rules; r; r=r->r_next) {
-		if (r->r_ifindex == -1 && strcmp(dev->name, r->r_ifname) == 0) {
-			write_lock_bh(&fib_rules_lock);
+	hlist_for_each_entry(r, node, &fib_rules, hlist) {
+		if (r->r_ifindex == -1 && strcmp(dev->name, r->r_ifname) == 0) 
 			r->r_ifindex = dev->ifindex;
-			write_unlock_bh(&fib_rules_lock);
-		}
 	}
 }
 
@@ -286,14 +297,17 @@ int fib_lookup(const struct flowi *flp, 
 	int err;
 	struct fib_rule *r, *policy;
 	struct fib_table *tb;
+	struct hlist_node *node;
 
 	u32 daddr = flp->fl4_dst;
 	u32 saddr = flp->fl4_src;
 
 FRprintk("Lookup: %u.%u.%u.%u <- %u.%u.%u.%u ",
 	NIPQUAD(flp->fl4_dst), NIPQUAD(flp->fl4_src));
-	read_lock(&fib_rules_lock);
-	for (r = fib_rules; r; r=r->r_next) {
+
+	rcu_read_lock();
+
+	hlist_for_each_entry_rcu(r, node, &fib_rules, hlist) {
 		if (((saddr^r->r_src) & r->r_srcmask) ||
 		    ((daddr^r->r_dst) & r->r_dstmask) ||
 		    (r->r_tos && r->r_tos != flp->fl4_tos) ||
@@ -309,14 +323,14 @@ FRprintk("tb %d r %d ", r->r_table, r->r
 			policy = r;
 			break;
 		case RTN_UNREACHABLE:
-			read_unlock(&fib_rules_lock);
+			rcu_read_unlock();
 			return -ENETUNREACH;
 		default:
 		case RTN_BLACKHOLE:
-			read_unlock(&fib_rules_lock);
+			rcu_read_unlock();
 			return -EINVAL;
 		case RTN_PROHIBIT:
-			read_unlock(&fib_rules_lock);
+			rcu_read_unlock();
 			return -EACCES;
 		}
 
@@ -327,16 +341,16 @@ FRprintk("tb %d r %d ", r->r_table, r->r
 			res->r = policy;
 			if (policy)
 				atomic_inc(&policy->r_clntref);
-			read_unlock(&fib_rules_lock);
+			rcu_read_unlock();
 			return 0;
 		}
 		if (err < 0 && err != -EAGAIN) {
-			read_unlock(&fib_rules_lock);
+			rcu_read_unlock();
 			return err;
 		}
 	}
 FRprintk("FAILURE\n");
-	read_unlock(&fib_rules_lock);
+	rcu_read_unlock();
 	return -ENETUNREACH;
 }
 
@@ -414,20 +428,25 @@ rtattr_failure:
 	return -1;
 }
 
+/* callers should hold rtnl semaphore */
+
 int inet_dump_rules(struct sk_buff *skb, struct netlink_callback *cb)
 {
-	int idx;
+	int idx = 0;
 	int s_idx = cb->args[0];
 	struct fib_rule *r;
+	struct hlist_node *node;
+
+	rcu_read_lock();
+	hlist_for_each_entry(r, node, &fib_rules, hlist) {
 
-	read_lock(&fib_rules_lock);
-	for (r=fib_rules, idx=0; r; r = r->r_next, idx++) {
 		if (idx < s_idx)
 			continue;
 		if (inet_fill_rule(skb, r, cb, NLM_F_MULTI) < 0)
 			break;
+		idx++;
 	}
-	read_unlock(&fib_rules_lock);
+	rcu_read_unlock();
 	cb->args[0] = idx;
 
 	return skb->len;
@@ -435,5 +454,9 @@ int inet_dump_rules(struct sk_buff *skb,
 
 void __init fib_rules_init(void)
 {
+	INIT_HLIST_HEAD(&fib_rules);
+	hlist_add_head(&local_rule.hlist, &fib_rules);
+	hlist_add_after(&local_rule.hlist, &main_rule.hlist);
+	hlist_add_after(&main_rule.hlist, &default_rule.hlist);
 	register_netdevice_notifier(&fib_rules_notifier);
 }
---
0.99.8.GIT


--- NEW FILE 4420-DCCP-ackvec-Introduce-ack-vector-records.txt ---
Subject: [PATCH] [DCCP] ackvec: Introduce ack vector records
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138971876 -0200

Based on a patch by Andrea Bittau.

Signed-off-by: Andrea Bittau <a.bittau at cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ackvec.c |  240 +++++++++++++++++++++++++++++++++--------------------
 net/dccp/ackvec.h |   31 ++++++-
 2 files changed, 173 insertions(+), 98 deletions(-)

applies-to: be2179fdbeafbdca7b95d45805e90935131418d8
10db97358ec72904821bae42269e74deccddb4b7
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 6440825..2a82acc 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -22,6 +22,47 @@
 #include <net/sock.h>
 
 static kmem_cache_t *dccp_ackvec_slab;
+static kmem_cache_t *dccp_ackvec_record_slab;
+
+static struct dccp_ackvec_record *dccp_ackvec_record_new(void)
+{
+	struct dccp_ackvec_record *avr =
+			kmem_cache_alloc(dccp_ackvec_record_slab, GFP_ATOMIC);
+
+	if (avr != NULL)
+		INIT_LIST_HEAD(&avr->dccpavr_node);
+
+	return avr;
+}
+
+static void dccp_ackvec_record_delete(struct dccp_ackvec_record *avr)
+{
+	if (unlikely(avr == NULL))
+		return;
+	/* Check if deleting a linked record */
+	WARN_ON(!list_empty(&avr->dccpavr_node));
+	kmem_cache_free(dccp_ackvec_record_slab, avr);
+}
+ 
+static void dccp_ackvec_insert_avr(struct dccp_ackvec *av, 
+				   struct dccp_ackvec_record *avr)
+{
+	/*
+	 * AVRs are sorted by seqno. Since we are sending them in order, we
+	 * just add the AVR at the head of the list.
+	 * -sorbo.
+	 */
+	if (!list_empty(&av->dccpav_records)) {
+		const struct dccp_ackvec_record *head =
+					list_entry(av->dccpav_records.next,
+						   struct dccp_ackvec_record,
+						   dccpavr_node);
+		BUG_ON(before48(avr->dccpavr_ack_seqno,
+				head->dccpavr_ack_seqno));
+	}
+
+	list_add(&avr->dccpavr_node, &av->dccpav_records);
+}
 
 int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 {
@@ -35,6 +76,14 @@ int dccp_insert_option_ackvec(struct soc
 	struct timeval now;
 	u32 elapsed_time;
 	unsigned char *to, *from;
+	struct dccp_ackvec_record *avr;
+
+	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
+		return -1;
+
+	avr = dccp_ackvec_record_new();
+	if (avr == NULL)
+		return -1;
 
 	dccp_timestamp(sk, &now);
 	elapsed_time = timeval_delta(&now, &av->dccpav_time) / 10;
@@ -42,19 +91,6 @@ int dccp_insert_option_ackvec(struct soc
 	if (elapsed_time != 0)
 		dccp_insert_option_elapsed_time(sk, skb, elapsed_time);
 
-	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)
-		return -1;
-
-	/*
-	 * XXX: now we have just one ack vector sent record, so
-	 * we have to wait for it to be cleared.
-	 *
-	 * Of course this is not acceptable, but this is just for
-	 * basic testing now.
-	 */
-	if (av->dccpav_ack_seqno != DCCP_MAX_SEQNO + 1)
-		return -1;
-
 	DCCP_SKB_CB(skb)->dccpd_opt_len += len;
 
 	to    = skb_push(skb, len);
@@ -65,8 +101,8 @@ int dccp_insert_option_ackvec(struct soc
 	from = av->dccpav_buf + av->dccpav_buf_head;
 
 	/* Check if buf_head wraps */
-	if ((int)av->dccpav_buf_head + len > av->dccpav_vec_len) {
-		const u32 tailsize = av->dccpav_vec_len - av->dccpav_buf_head;
+	if ((int)av->dccpav_buf_head + len > DCCP_MAX_ACKVEC_LEN) {
+		const u32 tailsize = DCCP_MAX_ACKVEC_LEN - av->dccpav_buf_head;
 
 		memcpy(to, from, tailsize);
 		to   += tailsize;
@@ -83,21 +119,21 @@ int dccp_insert_option_ackvec(struct soc
 	 *	sequence number it used for the ack packet; ack_ptr will equal
 	 *	buf_head; ack_ackno will equal buf_ackno; and ack_nonce will
 	 *	equal buf_nonce.
-	 *
-	 * This implemention uses just one ack record for now.
 	 */
-	av->dccpav_ack_seqno = DCCP_SKB_CB(skb)->dccpd_seq;
-	av->dccpav_ack_ptr   = av->dccpav_buf_head;
-	av->dccpav_ack_ackno = av->dccpav_buf_ackno;
-	av->dccpav_ack_nonce = av->dccpav_buf_nonce;
-	av->dccpav_sent_len  = av->dccpav_vec_len;
+	avr->dccpavr_ack_seqno = DCCP_SKB_CB(skb)->dccpd_seq;
+	avr->dccpavr_ack_ptr   = av->dccpav_buf_head;
+	avr->dccpavr_ack_ackno = av->dccpav_buf_ackno;
+	avr->dccpavr_ack_nonce = av->dccpav_buf_nonce;
+	avr->dccpavr_sent_len  = av->dccpav_vec_len;
+
+	dccp_ackvec_insert_avr(av, avr);
 
 	dccp_pr_debug("%sACK Vector 0, len=%d, ack_seqno=%llu, "
 		      "ack_ackno=%llu\n",
-		      debug_prefix, av->dccpav_sent_len,
-		      (unsigned long long)av->dccpav_ack_seqno,
-		      (unsigned long long)av->dccpav_ack_ackno);
-	return -1;
+		      debug_prefix, avr->dccpavr_sent_len,
+		      (unsigned long long)avr->dccpavr_ack_seqno,
+		      (unsigned long long)avr->dccpavr_ack_ackno);
+	return 0;
 }
 
 struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority)
@@ -107,13 +143,13 @@ struct dccp_ackvec *dccp_ackvec_alloc(co
 	if (av != NULL) {
 		av->dccpav_buf_head	=
 			av->dccpav_buf_tail = DCCP_MAX_ACKVEC_LEN - 1;
-		av->dccpav_buf_ackno	=
-			av->dccpav_ack_ackno = av->dccpav_ack_seqno = ~0LLU;
+		av->dccpav_buf_ackno	= DCCP_MAX_SEQNO + 1;
 		av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0;
 		av->dccpav_ack_ptr	= 0;
 		av->dccpav_time.tv_sec	= 0;
 		av->dccpav_time.tv_usec	= 0;
 		av->dccpav_sent_len	= av->dccpav_vec_len = 0;
+		INIT_LIST_HEAD(&av->dccpav_records);
 	}
 
 	return av;
@@ -121,6 +157,9 @@ struct dccp_ackvec *dccp_ackvec_alloc(co
 
 void dccp_ackvec_free(struct dccp_ackvec *av)
 {
+	if (unlikely(av == NULL))
+		return;
+	WARN_ON(!list_empty(&av->dccpav_records));
 	kmem_cache_free(dccp_ackvec_slab, av);
 }
 
@@ -299,44 +338,50 @@ void dccp_ackvec_print(const struct dccp
 }
 #endif
 
-static void dccp_ackvec_throw_away_ack_record(struct dccp_ackvec *av)
+static void dccp_ackvec_throw_record(struct dccp_ackvec *av,
+				     struct dccp_ackvec_record *avr)
 {
-	/*
-	 * As we're keeping track of the ack vector size (dccpav_vec_len) and
-	 * the sent ack vector size (dccpav_sent_len) we don't need
-	 * dccpav_buf_tail at all, but keep this code here as in the future
-	 * we'll implement a vector of ack records, as suggested in
-	 * draft-ietf-dccp-spec-11.txt Appendix A. -acme
-	 */
-#if 0
-	u32 new_buf_tail = av->dccpav_ack_ptr + 1;
-	if (new_buf_tail >= av->dccpav_vec_len)
-		new_buf_tail -= av->dccpav_vec_len;
-	av->dccpav_buf_tail = new_buf_tail;
-#endif
-	av->dccpav_vec_len -= av->dccpav_sent_len;
+	struct dccp_ackvec_record *next;
+
+	av->dccpav_buf_tail = avr->dccpavr_ack_ptr - 1;
+	if (av->dccpav_buf_tail == 0)
+		av->dccpav_buf_tail = DCCP_MAX_ACKVEC_LEN - 1;
+
+	av->dccpav_vec_len -= avr->dccpavr_sent_len;
+
+	/* free records */
+	list_for_each_entry_safe_from(avr, next, &av->dccpav_records,
+				      dccpavr_node) {
+		list_del_init(&avr->dccpavr_node);
+		dccp_ackvec_record_delete(avr);
+	}
 }
 
 void dccp_ackvec_check_rcv_ackno(struct dccp_ackvec *av, struct sock *sk,
 				 const u64 ackno)
 {
-	/* Check if we actually sent an ACK vector */
-	if (av->dccpav_ack_seqno == DCCP_MAX_SEQNO + 1)
-		return;
+	struct dccp_ackvec_record *avr;
 
-	if (ackno == av->dccpav_ack_seqno) {
+	/*
+	 * If we traverse backwards, it should be faster when we have large
+	 * windows. We will be receiving ACKs for stuff we sent a while back
+	 * -sorbo.
+	 */
+	list_for_each_entry_reverse(avr, &av->dccpav_records, dccpavr_node) {
+		if (ackno == avr->dccpavr_ack_seqno) {
 #ifdef CONFIG_IP_DCCP_DEBUG
-		struct dccp_sock *dp = dccp_sk(sk);
-		const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?
-					"CLIENT rx ack: " : "server rx ack: ";
+			struct dccp_sock *dp = dccp_sk(sk);
+			const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?
+						"CLIENT rx ack: " : "server rx ack: ";
 #endif
-		dccp_pr_debug("%sACK packet 0, len=%d, ack_seqno=%llu, "
-			      "ack_ackno=%llu, ACKED!\n",
-			      debug_prefix, 1,
-			      (unsigned long long)av->dccpav_ack_seqno,
-			      (unsigned long long)av->dccpav_ack_ackno);
-		dccp_ackvec_throw_away_ack_record(av);
-		av->dccpav_ack_seqno = DCCP_MAX_SEQNO + 1;
+			dccp_pr_debug("%sACK packet 0, len=%d, ack_seqno=%llu, "
+				      "ack_ackno=%llu, ACKED!\n",
+				      debug_prefix, 1,
+				      (unsigned long long)avr->dccpavr_ack_seqno,
+				      (unsigned long long)avr->dccpavr_ack_ackno);
+			dccp_ackvec_throw_record(av, avr);
+			break;
+		}
 	}
 }
 
@@ -346,28 +391,20 @@ static void dccp_ackvec_check_rcv_ackvec
 					    const unsigned char *vector)
 {
 	unsigned char i;
+	struct dccp_ackvec_record *avr;
 
 	/* Check if we actually sent an ACK vector */
-	if (av->dccpav_ack_seqno == DCCP_MAX_SEQNO + 1)
+	if (list_empty(&av->dccpav_records))
 		return;
-	/*
-	 * We're in the receiver half connection, so if the received an ACK
-	 * vector ackno (e.g. 50) before dccpav_ack_seqno (e.g. 52), we're
-	 * not interested.
-	 *
-	 * Extra explanation with example:
-	 * 
-	 * if we received an ACK vector with ackno 50, it can only be acking
-	 * 50, 49, 48, etc, not 52 (the seqno for the ACK vector we sent).
-	 */
-	/* dccp_pr_debug("is %llu < %llu? ", ackno, av->dccpav_ack_seqno); */
-	if (before48(ackno, av->dccpav_ack_seqno)) {
-		/* dccp_pr_debug_cat("yes\n"); */
-		return;
-	}
-	/* dccp_pr_debug_cat("no\n"); */
 
 	i = len;
+	/*
+	 * XXX
+	 * I think it might be more efficient to work backwards. See comment on
+	 * rcv_ackno. -sorbo.
+	 */
+	avr = list_entry(av->dccpav_records.next, struct dccp_ackvec_record,
+			 dccpavr_node);
 	while (i--) {
 		const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;
 		u64 ackno_end_rl;
@@ -375,14 +412,20 @@ static void dccp_ackvec_check_rcv_ackvec
 		dccp_set_seqno(&ackno_end_rl, ackno - rl);
 
 		/*
-		 * dccp_pr_debug("is %llu <= %llu <= %llu? ", ackno_end_rl,
-		 * av->dccpav_ack_seqno, ackno);
+		 * If our AVR sequence number is greater than the ack, go
+		 * forward in the AVR list until it is not so.
 		 */
-		if (between48(av->dccpav_ack_seqno, ackno_end_rl, ackno)) {
+		list_for_each_entry_from(avr, &av->dccpav_records,
+					 dccpavr_node) {
+			if (!after48(avr->dccpavr_ack_seqno, ackno))
+				goto found;
+		}
+		/* End of the dccpav_records list, not found, exit */
+		break;
+found:
+		if (between48(avr->dccpavr_ack_seqno, ackno_end_rl, ackno)) {
 			const u8 state = (*vector &
 					  DCCP_ACKVEC_STATE_MASK) >> 6;
-			/* dccp_pr_debug_cat("yes\n"); */
-
 			if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED) {
 #ifdef CONFIG_IP_DCCP_DEBUG
 				struct dccp_sock *dp = dccp_sk(sk);
@@ -395,19 +438,16 @@ static void dccp_ackvec_check_rcv_ackvec
 					      "ACKED!\n",
 					      debug_prefix, len,
 					      (unsigned long long)
-					      av->dccpav_ack_seqno,
+					      avr->dccpavr_ack_seqno,
 					      (unsigned long long)
-					      av->dccpav_ack_ackno);
-				dccp_ackvec_throw_away_ack_record(av);
+					      avr->dccpavr_ack_ackno);
+				dccp_ackvec_throw_record(av, avr);
 			}
 			/*
-			 * If dccpav_ack_seqno was not received, no problem
-			 * we'll send another ACK vector.
+			 * If it wasn't received, continue scanning... we might
+			 * find another one.
 			 */
-			av->dccpav_ack_seqno = DCCP_MAX_SEQNO + 1;
-			break;
 		}
-		/* dccp_pr_debug_cat("no\n"); */
 
 		dccp_set_seqno(&ackno, ackno_end_rl - 1);
 		++vector;
@@ -428,19 +468,31 @@ int dccp_ackvec_parse(struct sock *sk, c
 }
 
 static char dccp_ackvec_slab_msg[] __initdata =
-	KERN_CRIT "DCCP: Unable to create ack vectors slab cache\n";
+	KERN_CRIT "DCCP: Unable to create ack vectors slab caches\n";
 
 int __init dccp_ackvec_init(void)
 {
 	dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
 					     sizeof(struct dccp_ackvec), 0,
 					     SLAB_HWCACHE_ALIGN, NULL, NULL);
-	if (dccp_ackvec_slab == NULL) {
-		printk(dccp_ackvec_slab_msg);
-		return -ENOBUFS;
-	}
+	if (dccp_ackvec_slab == NULL)
+		goto out_err;
+
+	dccp_ackvec_record_slab =
+			kmem_cache_create("dccp_ackvec_record",
+					  sizeof(struct dccp_ackvec_record),
+					  0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+	if (dccp_ackvec_record_slab == NULL)
+		goto out_destroy_slab;
 
 	return 0;
+
+out_destroy_slab:
+	kmem_cache_destroy(dccp_ackvec_slab);
+	dccp_ackvec_slab = NULL;
+out_err:
+	printk(dccp_ackvec_slab_msg);
+	return -ENOBUFS;
 }
 
 void dccp_ackvec_exit(void)
@@ -449,4 +501,8 @@ void dccp_ackvec_exit(void)
 		kmem_cache_destroy(dccp_ackvec_slab);
 		dccp_ackvec_slab = NULL;
 	}
+	if (dccp_ackvec_record_slab != NULL) {
+		kmem_cache_destroy(dccp_ackvec_record_slab);
+		dccp_ackvec_record_slab = NULL;
+	}
 }
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h
index 470bae8..1d9ec4a 100644
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
@@ -13,6 +13,7 @@
 
 #include <linux/config.h>
 #include <linux/compiler.h>
+#include <linux/list.h>
 #include <linux/time.h>
 #include <linux/types.h>
 
@@ -42,11 +43,8 @@
  * Ack Vectors it has recently sent. For each packet sent carrying an
  * Ack Vector, it remembers four variables:
  *
- * @dccpav_ack_seqno - the Sequence Number used for the packet
- * 		       (HC-Receiver seqno)
  * @dccpav_ack_ptr - the value of buf_head at the time of acknowledgement.
- * @dccpav_ack_ackno - the Acknowledgement Number used for the packet
- * 		       (HC-Sender seqno)
+ * @dccpav_records - list of dccp_ackvec_record
  * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.
  *
  * @dccpav_time		- the time in usecs
@@ -54,8 +52,7 @@
  */
 struct dccp_ackvec {
 	u64		dccpav_buf_ackno;
-	u64		dccpav_ack_seqno;
-	u64		dccpav_ack_ackno;
+	struct list_head dccpav_records;
 	struct timeval	dccpav_time;
 	u8		dccpav_buf_head;
 	u8		dccpav_buf_tail;
@@ -67,6 +64,28 @@ struct dccp_ackvec {
 	u8		dccpav_buf[DCCP_MAX_ACKVEC_LEN];
 };
 
+/** struct dccp_ackvec_record - ack vector record
+ *
+ * ACK vector record as defined in Appendix A of spec. 
+ *
+ * The list is sorted by dccpavr_ack_seqno
+ *
+ * @dccpavr_node - node in dccpav_records
+ * @dccpavr_ack_seqno - sequence number of the packet this record was sent on
+ * @dccpavr_ack_ackno - sequence number being acknowledged
+ * @dccpavr_ack_ptr - pointer into dccpav_buf where this record starts
+ * @dccpavr_ack_nonce - dccpav_ack_nonce at the time this record was sent
+ * @dccpavr_sent_len - lenght of the record in dccpav_buf
+ */
+struct dccp_ackvec_record {
+	struct list_head dccpavr_node;
+	u64		 dccpavr_ack_seqno;
+	u64		 dccpavr_ack_ackno;
+	u8		 dccpavr_ack_ptr;
+	u8		 dccpavr_ack_nonce;
+	u8		 dccpavr_sent_len;
+};
+
 struct sock;
 struct sk_buff;
 
---
0.99.8.GIT


--- NEW FILE 4421-DCCP-CCID-Allow-ccid_-init-exit-to-be-NULL.txt ---
Subject: [PATCH] [DCCP] CCID: Allow ccid_{init,exit} to be NULL
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138987435 -0200

Testing if the ccid being instantiated has these methods in
ccid_init().

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ccid.c        |    5 +----
 net/dccp/ccids/ccid3.c |   11 -----------
 2 files changed, 1 insertions(+), 15 deletions(-)

applies-to: de0168814176d316e54293eb2578c05f6339698e
d9c237ac462b8f53fdf637191bcaad6e3af258d5
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index 9d8fc0e..06b191a 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -59,9 +59,6 @@ int ccid_register(struct ccid *ccid)
 {
 	int err;
 
-	if (ccid->ccid_init == NULL)
-		return -1;
-
 	ccids_write_lock();
 	err = -EEXIST;
 	if (ccids[ccid->ccid_id] == NULL) {
@@ -106,7 +103,7 @@ struct ccid *ccid_init(unsigned char id,
 	if (!try_module_get(ccid->ccid_owner))
 		goto out_err;
 
-	if (ccid->ccid_init(sk) != 0)
+	if (ccid->ccid_init != NULL && ccid->ccid_init(sk) != 0)
 		goto out_module_put;
 out:
 	ccids_read_unlock();
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index aa68e0a..c539c33 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -76,15 +76,6 @@ static struct dccp_tx_hist *ccid3_tx_his
 static struct dccp_rx_hist *ccid3_rx_hist;
 static struct dccp_li_hist *ccid3_li_hist;
 
-static int ccid3_init(struct sock *sk)
-{
-	return 0;
-}
-
-static void ccid3_exit(struct sock *sk)
-{
-}
-
 /* TFRC sender states */
 enum ccid3_hc_tx_states {
        	TFRC_SSTATE_NO_SENT = 1,
@@ -1178,8 +1169,6 @@ static struct ccid ccid3 = {
 	.ccid_id		   = 3,
 	.ccid_name		   = "ccid3",
 	.ccid_owner		   = THIS_MODULE,
-	.ccid_init		   = ccid3_init,
-	.ccid_exit		   = ccid3_exit,
 	.ccid_hc_tx_init	   = ccid3_hc_tx_init,
 	.ccid_hc_tx_exit	   = ccid3_hc_tx_exit,
 	.ccid_hc_tx_send_packet	   = ccid3_hc_tx_send_packet,
---
0.99.8.GIT


--- NEW FILE 4422-DCCP-ackvec-Delete-all-the-ack-vector-records-in-dccp_ackvec_free.txt ---
Subject: [PATCH] [DCCP] ackvec: Delete all the ack vector records in dccp_ackvec_free
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138987721 -0200

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ackvec.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

applies-to: aa92681c0db0451b3b7ee97860b1adfc0249b211
27737d52978d1682b048fec8b4479c3483fd6202
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 2a82acc..08b1b08 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -159,7 +159,17 @@ void dccp_ackvec_free(struct dccp_ackvec
 {
 	if (unlikely(av == NULL))
 		return;
-	WARN_ON(!list_empty(&av->dccpav_records));
+
+	if (!list_empty(&av->dccpav_records)) {
+		struct dccp_ackvec_record *avr, *next;
+
+		list_for_each_entry_safe(avr, next, &av->dccpav_records,
+					 dccpavr_node) {
+			list_del_init(&avr->dccpavr_node);
+			dccp_ackvec_record_delete(avr);
+		}
+	}
+
 	kmem_cache_free(dccp_ackvec_slab, av);
 }
 
---
0.99.8.GIT


--- NEW FILE 4423-DCCP-Don-t-alloc-ack-vector-for-the-control-sock.txt ---
Subject: [PATCH] [DCCP]: Don't alloc ack vector for the control sock
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138987845 -0200

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ipv4.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

applies-to: 75b8660e535e4e5e7c3190e1f513a0ec739e3dee
88f542e044ce469de5953b312062778333bcf568
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index f8df565..2ab6f0e 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1041,12 +1041,6 @@ int dccp_v4_init_sock(struct sock *sk)
 	dccp_options_init(&dp->dccps_options);
 	do_gettimeofday(&dp->dccps_epoch);
 
-	if (dp->dccps_options.dccpo_send_ack_vector) {
-		dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
-		if (dp->dccps_hc_rx_ackvec == NULL)
-			return -ENOMEM;
-	}
-
 	/*
 	 * FIXME: We're hardcoding the CCID, and doing this at this point makes
 	 * the listening (master) sock get CCID control blocks, which is not
@@ -1055,6 +1049,11 @@ int dccp_v4_init_sock(struct sock *sk)
 	 * setsockopt(CCIDs-I-want/accept). -acme
 	 */
 	if (likely(!dccp_ctl_socket_init)) {
+		if (dp->dccps_options.dccpo_send_ack_vector) {
+			dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
+			if (dp->dccps_hc_rx_ackvec == NULL)
+				return -ENOMEM;
+		}
 		dp->dccps_hc_rx_ccid = ccid_init(dp->dccps_options.dccpo_rx_ccid,
 						 sk);
 		dp->dccps_hc_tx_ccid = ccid_init(dp->dccps_options.dccpo_tx_ccid,
---
0.99.8.GIT


--- NEW FILE 4424-DCCP-CCID3-Set-the-no_feedback_timer-fields-near-init_timer.txt ---
Subject: [PATCH] [DCCP] CCID3: Set the no_feedback_timer fields near init_timer
From: Arnaldo Carvalho de Melo <acme at mandriva.com>
Date: 1138988954 -0200

Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 net/dccp/ccids/ccid3.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

applies-to: 1a7a72291f84619b313931f4aed0cd5f1aa2ee65
17c943adb4c84429595e76a491e1b05ce1bf9eb6
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index c539c33..165fc40 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -307,8 +307,6 @@ static int ccid3_hc_tx_send_packet(struc
 
 	switch (hctx->ccid3hctx_state) {
 	case TFRC_SSTATE_NO_SENT:
-		hctx->ccid3hctx_no_feedback_timer.function = ccid3_hc_tx_no_feedback_timer;
-		hctx->ccid3hctx_no_feedback_timer.data     = (unsigned long)sk;
 		sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
 			       jiffies + usecs_to_jiffies(TFRC_INITIAL_TIMEOUT));
 		hctx->ccid3hctx_last_win_count	 = 0;
@@ -672,6 +670,9 @@ static int ccid3_hc_tx_init(struct sock 
 	hctx->ccid3hctx_t_rto = USEC_PER_SEC;
 	hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
 	INIT_LIST_HEAD(&hctx->ccid3hctx_hist);
+
+	hctx->ccid3hctx_no_feedback_timer.function = ccid3_hc_tx_no_feedback_timer;
+	hctx->ccid3hctx_no_feedback_timer.data     = (unsigned long)sk;
 	init_timer(&hctx->ccid3hctx_no_feedback_timer);
 
 	return 0;
---
0.99.8.GIT


--- NEW FILE 4425-DCCP-CCID2-Initial-CCID2-TCP-Like-implementation.txt ---
Subject: [PATCH] [DCCP] CCID2: Initial CCID2 (TCP-Like) implementation
From: Andrea Bittau <a.bittau at cs.ucl.ac.uk>
Date: 1138989401 -0200

Original work by Andrea Bittau, Arnaldo Melo cleaned up and fixed several
issues on the merge process.

For now CCID2 was turned the default for all SOCK_DCCP connections, but this
will be remedied soon with the merge of the feature negotiation code.

Signed-off-by: Andrea Bittau <a.bittau at cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 include/linux/dccp.h    |    8 
 net/dccp/Kconfig        |    4 
 net/dccp/ccids/Kconfig  |   39 ++
 net/dccp/ccids/Makefile |    4 
 net/dccp/ccids/ccid2.c  |  838 +++++++++++++++++++++++++++++++++++++++++++++++
 net/dccp/ccids/ccid2.h  |   69 ++++
 net/dccp/ipv4.c         |    1 
 7 files changed, 957 insertions(+), 6 deletions(-)
 create mode 100644 net/dccp/ccids/ccid2.c
 create mode 100644 net/dccp/ccids/ccid2.h

applies-to: a4cabfb344f733c124d80288d8f491024bdea877
057184f56752b9d1f4c6ea38b5ad750c0b6d4692
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 088529f..268b457 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -314,9 +314,9 @@ static inline unsigned int dccp_hdr_len(
 
 /* initial values for each feature */
 #define DCCPF_INITIAL_SEQUENCE_WINDOW		100
-/* FIXME: for now we're using CCID 3 (TFRC) */
-#define DCCPF_INITIAL_CCID			3
-#define DCCPF_INITIAL_SEND_ACK_VECTOR		0
+/* FIXME: for now we're using CCID 2 (TCP-Like) */
+#define DCCPF_INITIAL_CCID			2
+#define DCCPF_INITIAL_SEND_ACK_VECTOR		1
 /* FIXME: for now we're default to 1 but it should really be 0 */
 #define DCCPF_INITIAL_SEND_NDP_COUNT		1
 
@@ -430,6 +430,8 @@ struct dccp_sock {
 	struct timeval			dccps_timestamp_time;
 	__u32				dccps_timestamp_echo;
 	__u32				dccps_packet_size;
+	__u16				dccps_l_ack_ratio;
+	__u16				dccps_r_ack_ratio;
 	unsigned long			dccps_ndp_count;
 	__u32				dccps_mss_cache;
 	struct dccp_options		dccps_options;
diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index 187ac18..24a6981 100644
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -24,6 +24,10 @@ config INET_DCCP_DIAG
 	def_tristate y if (IP_DCCP = y && INET_DIAG = y)
 	def_tristate m
 
+config IP_DCCP_ACKVEC
+	depends on IP_DCCP
+	def_bool N
+
 source "net/dccp/ccids/Kconfig"
 
 menu "DCCP Kernel Hacking"
diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 7684d83..422af19 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -1,6 +1,34 @@
 menu "DCCP CCIDs Configuration (EXPERIMENTAL)"
 	depends on IP_DCCP && EXPERIMENTAL
 
+config IP_DCCP_CCID2
+	tristate "CCID2 (TCP) (EXPERIMENTAL)"
+	depends on IP_DCCP
+	select IP_DCCP_ACKVEC
+	---help---
+	  CCID 2, TCP-like Congestion Control, denotes Additive Increase,
+	  Multiplicative Decrease (AIMD) congestion control with behavior
+	  modelled directly on TCP, including congestion window, slow start,
+	  timeouts, and so forth [RFC 2581].  CCID 2 achieves maximum
+	  bandwidth over the long term, consistent with the use of end-to-end
+	  congestion control, but halves its congestion window in response to
+	  each congestion event.  This leads to the abrupt rate changes
+	  typical of TCP.  Applications should use CCID 2 if they prefer
+	  maximum bandwidth utilization to steadiness of rate.  This is often
+	  the case for applications that are not playing their data directly
+	  to the user.  For example, a hypothetical application that
+	  transferred files over DCCP, using application-level retransmissions
+	  for lost packets, would prefer CCID 2 to CCID 3.  On-line games may
+	  also prefer CCID 2.
+
+	  CCID 2 is further described in:
+	  http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid2-10.txt
+
+	  This text was extracted from:
+	  http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
+
+	  If in doubt, say M.
+
 config IP_DCCP_CCID3
 	tristate "CCID3 (TFRC) (EXPERIMENTAL)"
 	depends on IP_DCCP
@@ -15,10 +43,15 @@ config IP_DCCP_CCID3
 	  suitable than CCID 2 for applications such streaming media where a
 	  relatively smooth sending rate is of importance.
 
-	  CCID 3 is further described in [CCID 3 PROFILE]. The TFRC
-	  congestion control algorithms were initially described in RFC 3448.
+	  CCID 3 is further described in:
+
+	  http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid3-11.txt.
+
+	  The TFRC congestion control algorithms were initially described in
+	  RFC 3448.
 
-	  This text was extracted from draft-ietf-dccp-spec-11.txt.
+	  This text was extracted from:
+	  http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
 	  
 	  If in doubt, say M.
 
diff --git a/net/dccp/ccids/Makefile b/net/dccp/ccids/Makefile
index 956f79f..438f20b 100644
--- a/net/dccp/ccids/Makefile
+++ b/net/dccp/ccids/Makefile
@@ -2,4 +2,8 @@ obj-$(CONFIG_IP_DCCP_CCID3) += dccp_ccid
 
 dccp_ccid3-y := ccid3.o
 
+obj-$(CONFIG_IP_DCCP_CCID2) += dccp_ccid2.o
+
+dccp_ccid2-y := ccid2.o
+
 obj-y += lib/
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
new file mode 100644
index 0000000..5495980
--- /dev/null
+++ b/net/dccp/ccids/ccid2.c
@@ -0,0 +1,838 @@
+/*
+ *  net/dccp/ccids/ccid2.c
+ *
+ *  Copyright (c) 2005, 2006 Andrea Bittau <a.bittau at cs.ucl.ac.uk>
+ *
+ *  Changes to meet Linux coding standards, and DCCP infrastructure fixes.
+ *
+ *  Copyright (c) 2006 Arnaldo Carvalho de Melo <acme at conectiva.com.br>
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * This implementation should follow: draft-ietf-dccp-ccid2-10.txt
+ *
+ * BUGS:
+ * - sequence number wrapping
+ * - jiffies wrapping
+ */
+
+#include <linux/config.h>
+#include "../ccid.h"
+#include "../dccp.h"
+#include "ccid2.h"
+
+static int ccid2_debug;
+
+#if 0
+#define CCID2_DEBUG
+#endif
+
+#ifdef CCID2_DEBUG
+#define ccid2_pr_debug(format, a...) \
+        do { if (ccid2_debug) \
+                printk(KERN_DEBUG "%s: " format, __FUNCTION__, ##a); \
+        } while (0)
+#else
+#define ccid2_pr_debug(format, a...)
+#endif
+
+static const int ccid2_seq_len = 128;
+
+static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)
+{
+	return dccp_sk(sk)->dccps_hc_tx_ccid_private;
+}
+
+static inline struct ccid2_hc_rx_sock *ccid2_hc_rx_sk(const struct sock *sk)
+{
+	return dccp_sk(sk)->dccps_hc_rx_ccid_private;
+}
+
+#ifdef CCID2_DEBUG
+static void ccid2_hc_tx_check_sanity(const struct ccid2_hc_tx_sock *hctx)
+{
+	int len = 0;
+	struct ccid2_seq *seqp;
+	int pipe = 0;
+
+	seqp = hctx->ccid2hctx_seqh;
+
+	/* there is data in the chain */
+	if (seqp != hctx->ccid2hctx_seqt) {
+		seqp = seqp->ccid2s_prev;
+		len++;
+		if (!seqp->ccid2s_acked)
+			pipe++;
+	
+		while (seqp != hctx->ccid2hctx_seqt) {
+			struct ccid2_seq *prev;
+
+			prev = seqp->ccid2s_prev;
+			len++;
+			if (!prev->ccid2s_acked)
+				pipe++;
+
+			/* packets are sent sequentially */
+			BUG_ON(seqp->ccid2s_seq <= prev->ccid2s_seq);
+			BUG_ON(seqp->ccid2s_sent < prev->ccid2s_sent);
+			BUG_ON(len > ccid2_seq_len);
+
+			seqp = prev;
+		}
+	}
+
+	BUG_ON(pipe != hctx->ccid2hctx_pipe);
+	ccid2_pr_debug("len of chain=%d\n", len);
+
+	do {
+		seqp = seqp->ccid2s_prev;
+		len++;
+		BUG_ON(len > ccid2_seq_len);
+	} while(seqp != hctx->ccid2hctx_seqh);
+
+	BUG_ON(len != ccid2_seq_len);
+	ccid2_pr_debug("total len=%d\n", len);
+}
+#else
+#define ccid2_hc_tx_check_sanity(hctx) do {} while (0)
+#endif
+
+static int ccid2_hc_tx_send_packet(struct sock *sk,
+				   struct sk_buff *skb, int len)
+{
+	struct ccid2_hc_tx_sock *hctx;
+	
+	switch (DCCP_SKB_CB(skb)->dccpd_type) {
+	case 0: /* XXX data packets from userland come through like this */
+	case DCCP_PKT_DATA:
+	case DCCP_PKT_DATAACK:
+		break;
+	/* No congestion control on other packets */
+	default:
+		return 0;
+	}
+
+        hctx = ccid2_hc_tx_sk(sk);
+
+	ccid2_pr_debug("pipe=%d cwnd=%d\n", hctx->ccid2hctx_pipe,
+		       hctx->ccid2hctx_cwnd);
+	
+	if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd) {
+		/* OK we can send... make sure previous packet was sent off */
+		if (!hctx->ccid2hctx_sendwait) {
+			hctx->ccid2hctx_sendwait = 1;
+			return 0;
+		}
+	}
+
+	return 100; /* XXX */
+}
+
+static void ccid2_change_l_ack_ratio(struct sock *sk, int val)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	/*
+	 * XXX I don't really agree with val != 2.  If cwnd is 1, ack ratio
+	 * should be 1... it shouldn't be allowed to become 2.
+	 * -sorbo.
+	 */
+	if (val != 2) {
+		struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+		int max = hctx->ccid2hctx_cwnd / 2;
+
+		/* round up */
+		if (hctx->ccid2hctx_cwnd & 1)
+			max++;
+
+		if (val > max)
+			val = max;
+	}
+
+	ccid2_pr_debug("changing local ack ratio to %d\n", val);
+	WARN_ON(val <= 0);
+	dp->dccps_l_ack_ratio = val;
+}
+
+static void ccid2_change_cwnd(struct sock *sk, int val)
+{
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+
+	if (val == 0)
+		val = 1;
+
+	/* XXX do we need to change ack ratio? */
+	ccid2_pr_debug("change cwnd to %d\n", val);
+	
+	BUG_ON(val < 1);
+	hctx->ccid2hctx_cwnd = val;
+}
+
+static void ccid2_start_rto_timer(struct sock *sk);
+
+static void ccid2_hc_tx_rto_expire(unsigned long data)
+{
+	struct sock *sk = (struct sock *)data;
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+	long s;
+
+	/* XXX I don't think i'm locking correctly
+	 * -sorbo.
+	 */
+	bh_lock_sock(sk);
+	if (sock_owned_by_user(sk)) {
+		sk_reset_timer(sk, &hctx->ccid2hctx_rtotimer,
+			       jiffies + HZ / 5);
+		goto out;
+	}
+
+	ccid2_pr_debug("RTO_EXPIRE\n");
+
+	ccid2_hc_tx_check_sanity(hctx);
+
+	/* back-off timer */
+	hctx->ccid2hctx_rto <<= 1;
+
+	s = hctx->ccid2hctx_rto / HZ;
+	if (s > 60)
+		hctx->ccid2hctx_rto = 60 * HZ;
+
+	ccid2_start_rto_timer(sk);
+
+	/* adjust pipe, cwnd etc */
+	hctx->ccid2hctx_pipe = 0;
+	hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd >> 1;
+	if (hctx->ccid2hctx_ssthresh < 2)
+		hctx->ccid2hctx_ssthresh = 2;
+	ccid2_change_cwnd(sk, 1);
+
+	/* clear state about stuff we sent */
+	hctx->ccid2hctx_seqt	= hctx->ccid2hctx_seqh;
+	hctx->ccid2hctx_ssacks	= 0;
+	hctx->ccid2hctx_acks	= 0;
+	hctx->ccid2hctx_sent	= 0;
+
+	/* clear ack ratio state. */
+	hctx->ccid2hctx_arsent	 = 0;
+	hctx->ccid2hctx_ackloss  = 0;
+	hctx->ccid2hctx_rpseq	 = 0;
+	hctx->ccid2hctx_rpdupack = -1;
+	ccid2_change_l_ack_ratio(sk, 1);
+	ccid2_hc_tx_check_sanity(hctx);
+out:
+	bh_unlock_sock(sk);
+/*	sock_put(sk); */
+}
+
+static void ccid2_start_rto_timer(struct sock *sk)
+{
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+
+	ccid2_pr_debug("setting RTO timeout=%ld\n", hctx->ccid2hctx_rto);
+
+	BUG_ON(timer_pending(&hctx->ccid2hctx_rtotimer));
+	sk_reset_timer(sk, &hctx->ccid2hctx_rtotimer,
+		       jiffies + hctx->ccid2hctx_rto);
+}
+
+static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, int len)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+	u64 seq;
+
+	ccid2_hc_tx_check_sanity(hctx);
+
+	BUG_ON(!hctx->ccid2hctx_sendwait);
+	hctx->ccid2hctx_sendwait = 0;
+	hctx->ccid2hctx_pipe++;
+	BUG_ON(hctx->ccid2hctx_pipe < 0);
+
+	/* There is an issue.  What if another packet is sent between
+	 * packet_send() and packet_sent().  Then the sequence number would be
+	 * wrong.
+	 * -sorbo.
+	 */
+	seq = dp->dccps_gss;
+
+	hctx->ccid2hctx_seqh->ccid2s_seq   = seq;
+	hctx->ccid2hctx_seqh->ccid2s_acked = 0;
+	hctx->ccid2hctx_seqh->ccid2s_sent  = jiffies;
+	hctx->ccid2hctx_seqh = hctx->ccid2hctx_seqh->ccid2s_next;
+
+	ccid2_pr_debug("cwnd=%d pipe=%d\n", hctx->ccid2hctx_cwnd, 
+		       hctx->ccid2hctx_pipe);
+	
+	if (hctx->ccid2hctx_seqh == hctx->ccid2hctx_seqt) {
+		/* XXX allocate more space */
+		WARN_ON(1);
+	}
+
+	hctx->ccid2hctx_sent++;
+
+	/* Ack Ratio.  Need to maintain a concept of how many windows we sent */
+	hctx->ccid2hctx_arsent++;
+	/* We had an ack loss in this window... */
+	if (hctx->ccid2hctx_ackloss) {
+		if (hctx->ccid2hctx_arsent >= hctx->ccid2hctx_cwnd) {
+			hctx->ccid2hctx_arsent = 0;
+			hctx->ccid2hctx_ackloss = 0;
+		}
+	}
+	/* No acks lost up to now... */
+	else {
+		/* decrease ack ratio if enough packets were sent */
+		if (dp->dccps_l_ack_ratio > 1) {
+			/* XXX don't calculate denominator each time */
+			int denom;
+
+			denom = dp->dccps_l_ack_ratio * dp->dccps_l_ack_ratio - 
+				dp->dccps_l_ack_ratio;
+			denom = hctx->ccid2hctx_cwnd * hctx->ccid2hctx_cwnd / denom;
+
+			if (hctx->ccid2hctx_arsent >= denom) {
+				ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio - 1);
+				hctx->ccid2hctx_arsent = 0;
+			}
+		}
+		/* we can't increase ack ratio further [1] */
+		else {
+			hctx->ccid2hctx_arsent = 0; /* or maybe set it to cwnd*/
+		}
+	}
+
+	/* setup RTO timer */
+	if (!timer_pending(&hctx->ccid2hctx_rtotimer)) {
+		ccid2_start_rto_timer(sk);
+	}
+#ifdef CCID2_DEBUG
+	ccid2_pr_debug("pipe=%d\n", hctx->ccid2hctx_pipe);
+	ccid2_pr_debug("Sent: seq=%llu\n", seq);
+	do {
+		struct ccid2_seq *seqp = hctx->ccid2hctx_seqt;
+
+		while (seqp != hctx->ccid2hctx_seqh) {
+			ccid2_pr_debug("out seq=%llu acked=%d time=%lu\n",
+			       	       seqp->ccid2s_seq, seqp->ccid2s_acked, 
+				       seqp->ccid2s_sent);
+			seqp = seqp->ccid2s_next;
+		}
+	} while(0);
+	ccid2_pr_debug("=========\n");
+	ccid2_hc_tx_check_sanity(hctx);
+#endif
+}
+
+/* XXX Lame code duplication!
+ * returns -1 if none was found.
+ * else returns the next offset to use in the function call.
+ */
+static int ccid2_ackvector(struct sock *sk, struct sk_buff *skb, int offset,
+			   unsigned char **vec, unsigned char *veclen)
+{
+        const struct dccp_hdr *dh = dccp_hdr(skb);
+        unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb);
+        unsigned char *opt_ptr;
+        const unsigned char *opt_end = (unsigned char *)dh +
+                                        (dh->dccph_doff * 4);
+        unsigned char opt, len;
+        unsigned char *value;
+
+	BUG_ON(offset < 0);
+	options += offset;
+	opt_ptr = options;
+	if (opt_ptr >= opt_end)
+		return -1;
+
+	while (opt_ptr != opt_end) {
+                opt   = *opt_ptr++;
+                len   = 0;
+                value = NULL;
+
+                /* Check if this isn't a single byte option */
+                if (opt > DCCPO_MAX_RESERVED) {
+                        if (opt_ptr == opt_end)
+                                goto out_invalid_option;
+
+                        len = *opt_ptr++;
+                        if (len < 3)
+                                goto out_invalid_option;
+                        /*
+                         * Remove the type and len fields, leaving
+                         * just the value size
+                         */
+                        len     -= 2;
+                        value   = opt_ptr;
+                        opt_ptr += len;
+
+                        if (opt_ptr > opt_end)
+                                goto out_invalid_option;
+                }
+
+		switch (opt) {
+		case DCCPO_ACK_VECTOR_0:
+		case DCCPO_ACK_VECTOR_1:
+			*vec	= value;
+			*veclen = len;
+			return offset + (opt_ptr - options);
+			break;
+		}
+	}
+
+	return -1;
+	
+out_invalid_option:
+	BUG_ON(1); /* should never happen... options were previously parsed ! */
+	return -1;
+}
+
+static void ccid2_hc_tx_kill_rto_timer(struct ccid2_hc_tx_sock *hctx)
+{
+	if (del_timer(&hctx->ccid2hctx_rtotimer))
+		ccid2_pr_debug("deleted RTO timer\n");
+}
+
+static inline void ccid2_new_ack(struct sock *sk, 
+			         struct ccid2_seq *seqp,
+				 unsigned int *maxincr)
+{
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+
+	/* slow start */
+	if (hctx->ccid2hctx_cwnd < hctx->ccid2hctx_ssthresh) {
+		hctx->ccid2hctx_acks = 0;
+
+		/* We can increase cwnd at most maxincr [ack_ratio/2] */
+		if (*maxincr) {
+			/* increase every 2 acks */
+			hctx->ccid2hctx_ssacks++;
+			if (hctx->ccid2hctx_ssacks == 2) {
+				ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd + 1);
+				hctx->ccid2hctx_ssacks = 0;
+				*maxincr = *maxincr - 1;
+			}
+		}
+		/* increased cwnd enough for this single ack */
+		else {
+			hctx->ccid2hctx_ssacks = 0;
+		}
+	}
+	else {
+		hctx->ccid2hctx_ssacks = 0;
+		hctx->ccid2hctx_acks++;
+
+		if (hctx->ccid2hctx_acks >= hctx->ccid2hctx_cwnd) {
+			ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd + 1);
+			hctx->ccid2hctx_acks = 0;
+		}
+	}
+
+	/* update RTO */
+	if (hctx->ccid2hctx_srtt == -1 ||
+	    (jiffies - hctx->ccid2hctx_lastrtt) >= hctx->ccid2hctx_srtt) {
+		unsigned long r = jiffies - seqp->ccid2s_sent;
+		int s;
+
+		/* first measurement */
+		if (hctx->ccid2hctx_srtt == -1) {
+			ccid2_pr_debug("R: %lu Time=%lu seq=%llu\n", 
+			       	       r, jiffies, seqp->ccid2s_seq);
+			hctx->ccid2hctx_srtt = r;
+			hctx->ccid2hctx_rttvar = r >> 1;
+		}
+		else {
+			/* RTTVAR */
+			long tmp = hctx->ccid2hctx_srtt - r;
+			if (tmp < 0)
+				tmp *= -1;
+			
+			tmp >>= 2;
+			hctx->ccid2hctx_rttvar *= 3;
+			hctx->ccid2hctx_rttvar >>= 2;
+			hctx->ccid2hctx_rttvar += tmp;
+
+			/* SRTT */
+			hctx->ccid2hctx_srtt *= 7;
+			hctx->ccid2hctx_srtt >>= 3;
+			tmp = r >> 3;
+			hctx->ccid2hctx_srtt += tmp;
+		}
+		s = hctx->ccid2hctx_rttvar << 2;
+		/* clock granularity is 1 when based on jiffies */
+		if (!s)
+			s = 1;
+		hctx->ccid2hctx_rto = hctx->ccid2hctx_srtt + s;
+
+		/* must be at least a second */
+		s = hctx->ccid2hctx_rto / HZ;
+		/* DCCP doesn't require this [but I like it cuz my code sux] */
+#if 1
+		if (s < 1)
+			hctx->ccid2hctx_rto = HZ;
+#endif			
+		/* max 60 seconds */	
+		if (s > 60)
+			hctx->ccid2hctx_rto = HZ * 60;
+
+		hctx->ccid2hctx_lastrtt = jiffies;
+
+		ccid2_pr_debug("srtt: %ld rttvar: %ld rto: %ld (HZ=%d) R=%lu\n",
+		       	       hctx->ccid2hctx_srtt, hctx->ccid2hctx_rttvar,
+		       	       hctx->ccid2hctx_rto, HZ, r);
+		hctx->ccid2hctx_sent = 0;
+	}
+
+	/* we got a new ack, so re-start RTO timer */
+	ccid2_hc_tx_kill_rto_timer(hctx);
+	ccid2_start_rto_timer(sk);
+}
+
+static void ccid2_hc_tx_dec_pipe(struct ccid2_hc_tx_sock *hctx)
+{
+	hctx->ccid2hctx_pipe--;
+	BUG_ON(hctx->ccid2hctx_pipe < 0);
+
+	if (hctx->ccid2hctx_pipe == 0)
+		ccid2_hc_tx_kill_rto_timer(hctx);
+}
+
+static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
+	u64 ackno, seqno;
+	struct ccid2_seq *seqp;
+	unsigned char *vector;
+	unsigned char veclen;
+	int offset = 0;
+	int done = 0;
+	int loss = 0;
+	unsigned int maxincr = 0;
+
+	ccid2_hc_tx_check_sanity(hctx);
+	/* check reverse path congestion */
+	seqno = DCCP_SKB_CB(skb)->dccpd_seq;
+
+	/* XXX this whole "algorithm" is broken.  Need to fix it to keep track
+	 * of the seqnos of the dupacks so that rpseq and rpdupack are correct
+	 * -sorbo.
+	 */
+	/* need to bootstrap */
+	if (hctx->ccid2hctx_rpdupack == -1) {
+		hctx->ccid2hctx_rpdupack = 0;
+		hctx->ccid2hctx_rpseq = seqno;
+	}
+	else {
+		/* check if packet is consecutive */
+		if ((hctx->ccid2hctx_rpseq + 1) == seqno) {
+			hctx->ccid2hctx_rpseq++;
+		}
+		/* it's a later packet */
+		else if (after48(seqno, hctx->ccid2hctx_rpseq)) {
+			hctx->ccid2hctx_rpdupack++;
+			
+			/* check if we got enough dupacks */
+			if (hctx->ccid2hctx_rpdupack >=
+			    hctx->ccid2hctx_numdupack) {
+
+				hctx->ccid2hctx_rpdupack = -1; /* XXX lame */
+				hctx->ccid2hctx_rpseq = 0;
+
+				ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio << 1);
+			}
+		}
+	}
+
+	/* check forward path congestion */
+	/* still didn't send out new data packets */
+	if (hctx->ccid2hctx_seqh == hctx->ccid2hctx_seqt)
+		return;
+
+	switch (DCCP_SKB_CB(skb)->dccpd_type) {
+	case DCCP_PKT_ACK:
+	case DCCP_PKT_DATAACK:
+		break;
+	
+	default:
+		return;
+	}
+
+	ackno = DCCP_SKB_CB(skb)->dccpd_ack_seq;
+	seqp = hctx->ccid2hctx_seqh->ccid2s_prev;
+
+	/* If in slow-start, cwnd can increase at most Ack Ratio / 2 packets for
+	 * this single ack.  I round up.
+	 * -sorbo.
+	 */
+	maxincr = dp->dccps_l_ack_ratio >> 1;
+	maxincr++;
+
+	/* go through all ack vectors */
+	while ((offset = ccid2_ackvector(sk, skb, offset, 
+					 &vector, &veclen)) != -1) {
+		/* go through this ack vector */
+		while (veclen--) {
+			const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;
+			u64 ackno_end_rl;
+
+			dccp_set_seqno(&ackno_end_rl, ackno - rl);
+			ccid2_pr_debug("ackvec start:%llu end:%llu\n", ackno, 
+				       ackno_end_rl);
+			/* if the seqno we are analyzing is larger than the
+			 * current ackno, then move towards the tail of our
+			 * seqnos.
+			 */
+			while (after48(seqp->ccid2s_seq, ackno)) {
+				if (seqp == hctx->ccid2hctx_seqt) {
+					done = 1;
+					break;
+				}
+				seqp = seqp->ccid2s_prev;
+			}
+			if (done)
+				break;
+
+			/* check all seqnos in the range of the vector
+			 * run length 
+			 */
+			while (between48(seqp->ccid2s_seq,ackno_end_rl,ackno)) {
+				const u8 state = (*vector & 
+						  DCCP_ACKVEC_STATE_MASK) >> 6;
+			
+				/* new packet received or marked */
+				if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED &&
+				    !seqp->ccid2s_acked) {
+				    	if (state == 
+					    DCCP_ACKVEC_STATE_ECN_MARKED) {
+						loss = 1;
+					}
+					else {
+						ccid2_new_ack(sk, seqp,
+							      &maxincr);
+					}
+
+					seqp->ccid2s_acked = 1;
+					ccid2_pr_debug("Got ack for %llu\n",
+					       	       seqp->ccid2s_seq);
+					ccid2_hc_tx_dec_pipe(hctx);
+				}
+				if (seqp == hctx->ccid2hctx_seqt) {
+					done = 1;
+					break;
+				}
+				seqp = seqp->ccid2s_next;
+			}
+			if (done)
+				break;
+			       
+
+			dccp_set_seqno(&ackno, ackno_end_rl - 1);
+			vector++;
+		}
+		if (done)
+			break;
+	}
+
+	/* The state about what is acked should be correct now
+	 * Check for NUMDUPACK
+	 */
+	seqp = hctx->ccid2hctx_seqh->ccid2s_prev;
+	done = 0;
+	while (1) {
+		if (seqp->ccid2s_acked) {
+			done++;
+			if (done == hctx->ccid2hctx_numdupack) {
+				break;
+			}	
+		}
+		if (seqp == hctx->ccid2hctx_seqt) {
+			break;
+		}
+		seqp = seqp->ccid2s_prev;
+	}
+
+	/* If there are at least 3 acknowledgements, anything unacknowledged
+	 * below the last sequence number is considered lost
+	 */
+	if (done == hctx->ccid2hctx_numdupack) {
+		struct ccid2_seq *last_acked = seqp;
+
+		/* check for lost packets */
+		while (1) {
+			if (!seqp->ccid2s_acked) {
+				loss = 1;
+				ccid2_hc_tx_dec_pipe(hctx);
+			}
+			if (seqp == hctx->ccid2hctx_seqt)
+				break;
+			seqp = seqp->ccid2s_prev;
+		}
+
+		hctx->ccid2hctx_seqt = last_acked;
+	}
+
+	/* trim acked packets in tail */
+	while (hctx->ccid2hctx_seqt != hctx->ccid2hctx_seqh) {
+		if (!hctx->ccid2hctx_seqt->ccid2s_acked)
+			break;
+		
+		hctx->ccid2hctx_seqt = hctx->ccid2hctx_seqt->ccid2s_next;
+	}
+
+	if (loss) {
+		/* XXX do bit shifts guarantee a 0 as the new bit? */
+		ccid2_change_cwnd(sk, hctx->ccid2hctx_cwnd >> 1);
+		hctx->ccid2hctx_ssthresh = hctx->ccid2hctx_cwnd;
+		if (hctx->ccid2hctx_ssthresh < 2)
+			hctx->ccid2hctx_ssthresh = 2;
+	}
+
+	ccid2_hc_tx_check_sanity(hctx);
+}
+
+static int ccid2_hc_tx_init(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+        struct ccid2_hc_tx_sock *hctx;
+	int seqcount = ccid2_seq_len;
+	int i;
+
+        dp->dccps_hc_tx_ccid_private = kzalloc(sizeof(*hctx), gfp_any());
+        if (dp->dccps_hc_tx_ccid_private == NULL)
+                return -ENOMEM;
+
+        hctx = ccid2_hc_tx_sk(sk);
+
+	/* XXX init variables with proper values */
+	hctx->ccid2hctx_cwnd	  = 1;
+	hctx->ccid2hctx_ssthresh  = 10;
+	hctx->ccid2hctx_numdupack = 3;
+
+	/* XXX init ~ to window size... */
+	hctx->ccid2hctx_seqbuf = kmalloc(sizeof(*hctx->ccid2hctx_seqbuf) *
+					 seqcount, gfp_any());
+	if (hctx->ccid2hctx_seqbuf == NULL) {
+		kfree(dp->dccps_hc_tx_ccid_private);
+		dp->dccps_hc_tx_ccid_private = NULL;
+		return -ENOMEM;
+	}
+	for (i = 0; i < (seqcount - 1); i++) {
+		hctx->ccid2hctx_seqbuf[i].ccid2s_next = 
+					&hctx->ccid2hctx_seqbuf[i + 1];
+		hctx->ccid2hctx_seqbuf[i + 1].ccid2s_prev = 
+					&hctx->ccid2hctx_seqbuf[i];
+	}
+	hctx->ccid2hctx_seqbuf[seqcount - 1].ccid2s_next =
+					hctx->ccid2hctx_seqbuf;
+	hctx->ccid2hctx_seqbuf->ccid2s_prev =
+					&hctx->ccid2hctx_seqbuf[seqcount - 1];
+
+	hctx->ccid2hctx_seqh	 = hctx->ccid2hctx_seqbuf;
+	hctx->ccid2hctx_seqt	 = hctx->ccid2hctx_seqh;
+	hctx->ccid2hctx_sent	 = 0;
+	hctx->ccid2hctx_rto	 = 3 * HZ;
+	hctx->ccid2hctx_srtt	 = -1;
+	hctx->ccid2hctx_rttvar	 = -1;
+	hctx->ccid2hctx_lastrtt  = 0;
+	hctx->ccid2hctx_rpdupack = -1;
+
+	hctx->ccid2hctx_rtotimer.function = &ccid2_hc_tx_rto_expire;
+	hctx->ccid2hctx_rtotimer.data	  = (unsigned long)sk;
+	init_timer(&hctx->ccid2hctx_rtotimer);
+
+	ccid2_hc_tx_check_sanity(hctx);
+	return 0;
+}
+
+static void ccid2_hc_tx_exit(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+        struct ccid2_hc_tx_sock *hctx = dp->dccps_hc_tx_ccid_private;
+
+	ccid2_hc_tx_kill_rto_timer(hctx);
+
+	kfree(hctx->ccid2hctx_seqbuf);
+
+	kfree(dp->dccps_hc_tx_ccid_private);
+	dp->dccps_hc_tx_ccid_private = NULL;
+}
+
+static void ccid2_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
+{
+	const struct dccp_sock *dp = dccp_sk(sk);
+	struct ccid2_hc_rx_sock *hcrx = ccid2_hc_rx_sk(sk);
+
+	switch (DCCP_SKB_CB(skb)->dccpd_type) {
+	case DCCP_PKT_DATA:
+	case DCCP_PKT_DATAACK:
+		hcrx->ccid2hcrx_data++;
+		if (hcrx->ccid2hcrx_data >= dp->dccps_r_ack_ratio) {
+			dccp_send_ack(sk);
+			hcrx->ccid2hcrx_data = 0;
+		}
+		break;
+	}
+}
+
+static int ccid2_hc_rx_init(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+        dp->dccps_hc_rx_ccid_private = kzalloc(sizeof(struct ccid2_hc_rx_sock),
+					       gfp_any());
+        return dp->dccps_hc_rx_ccid_private == NULL ? -ENOMEM : 0;
+}
+
+static void ccid2_hc_rx_exit(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+
+	kfree(dp->dccps_hc_rx_ccid_private);
+	dp->dccps_hc_rx_ccid_private = NULL;
+}
+
+static struct ccid ccid2 = {
+	.ccid_id		= 2,
+	.ccid_name		= "ccid2",
+	.ccid_owner		= THIS_MODULE,
+	.ccid_hc_tx_init	= ccid2_hc_tx_init,
+	.ccid_hc_tx_exit	= ccid2_hc_tx_exit,
+	.ccid_hc_tx_send_packet	= ccid2_hc_tx_send_packet,
+	.ccid_hc_tx_packet_sent	= ccid2_hc_tx_packet_sent,
+	.ccid_hc_tx_packet_recv	= ccid2_hc_tx_packet_recv,
+	.ccid_hc_rx_init	= ccid2_hc_rx_init,
+	.ccid_hc_rx_exit	= ccid2_hc_rx_exit,
+	.ccid_hc_rx_packet_recv	= ccid2_hc_rx_packet_recv,
+};
+
+module_param(ccid2_debug, int, 0444);
+MODULE_PARM_DESC(ccid2_debug, "Enable debug messages");
+ 
+static __init int ccid2_module_init(void)
+{
+	return ccid_register(&ccid2);
+}
+module_init(ccid2_module_init);
+
+static __exit void ccid2_module_exit(void)
+{
+	ccid_unregister(&ccid2);
+}
+module_exit(ccid2_module_exit);
+
+MODULE_AUTHOR("Andrea Bittau <a.bittau at cs.ucl.ac.uk>");
+MODULE_DESCRIPTION("DCCP TCP CCID2 CCID");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("net-dccp-ccid-2");
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
new file mode 100644
index 0000000..0b08c90
--- /dev/null
+++ b/net/dccp/ccids/ccid2.h
@@ -0,0 +1,69 @@
+/*
+ *  net/dccp/ccids/ccid2.h
+ *
+ *  Copyright (c) 2005 Andrea Bittau <a.bittau at cs.ucl.ac.uk>
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef _DCCP_CCID2_H_
+#define _DCCP_CCID2_H_
+
+struct ccid2_seq {
+	u64			ccid2s_seq;
+	unsigned long		ccid2s_sent;
+	int			ccid2s_acked;
+	struct ccid2_seq	*ccid2s_prev;
+	struct ccid2_seq	*ccid2s_next;
+};
+
+/** struct ccid2_hc_tx_sock - CCID2 TX half connection
+ *
+ * @ccid2hctx_ssacks - ACKs recv in slow start
+ * @ccid2hctx_acks - ACKS recv in AI phase
+ * @ccid2hctx_sent - packets sent in this window
+ * @ccid2hctx_lastrtt -time RTT was last measured
+ * @ccid2hctx_arsent - packets sent [ack ratio]
+ * @ccid2hctx_ackloss - ack was lost in this win
+ * @ccid2hctx_rpseq - last consecutive seqno
+ * @ccid2hctx_rpdupack - dupacks since rpseq
+*/
+struct ccid2_hc_tx_sock {
+	int			ccid2hctx_cwnd;
+	int			ccid2hctx_ssacks;
+	int			ccid2hctx_acks;
+	int			ccid2hctx_ssthresh;
+	int			ccid2hctx_pipe;
+	int			ccid2hctx_numdupack;
+	struct ccid2_seq	*ccid2hctx_seqbuf;
+	struct ccid2_seq	*ccid2hctx_seqh;
+	struct ccid2_seq	*ccid2hctx_seqt;
+	long			ccid2hctx_rto;
+	long			ccid2hctx_srtt;
+	long			ccid2hctx_rttvar;
+	int			ccid2hctx_sent;
+	unsigned long		ccid2hctx_lastrtt;
+	struct timer_list	ccid2hctx_rtotimer;
+	unsigned long		ccid2hctx_arsent;
+	int			ccid2hctx_ackloss;
+	u64			ccid2hctx_rpseq;
+	int			ccid2hctx_rpdupack;
+	int			ccid2hctx_sendwait;
+};
+
+struct ccid2_hc_rx_sock {
+	int	ccid2hcrx_data;
+};
+
+#endif /* _DCCP_CCID2_H_ */
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 2ab6f0e..38321ad 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1081,6 +1081,7 @@ int dccp_v4_init_sock(struct sock *sk)
 	dp->dccps_mss_cache = 536;
 	dp->dccps_role = DCCP_ROLE_UNDEFINED;
 	dp->dccps_service = DCCP_SERVICE_INVALID_VALUE;
+	dp->dccps_l_ack_ratio = dp->dccps_r_ack_ratio = 1;
 
 	return 0;
 }
---
0.99.8.GIT


--- NEW FILE 4426-DCCP-Initial-feature-negotiation-implementation.txt ---
Subject: [PATCH] [DCCP]: Initial feature negotiation implementation
From: Andrea Bittau <a.bittau at cs.ucl.ac.uk>
Date: 1139087417 -0200

Still needs more work, but boots and doesn't crashes, even
does some negotiation!

18:38:52.174934  127.0.0.1.43458 > 127.0.0.1.5001: request <change_l ack_ratio 2, change_r ccid 2, change_l ccid 2>
18:38:52.218526  127.0.0.1.5001 > 127.0.0.1.43458: response <nop, nop, change_l ack_ratio 2, confirm_r ccid 2 2, confirm_l ccid 2 2, confirm_r ack_ratio 2>
18:38:52.185398  127.0.0.1.43458 > 127.0.0.1.5001: <nop, confirm_r ack_ratio 2, ack_vector0 0x00, elapsed_time 212>

:-)

Signed-off-by: Andrea Bittau <a.bittau at cs.ucl.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme at mandriva.com>

---

 include/linux/dccp.h |   35 +++
 net/dccp/Makefile    |    2 
 net/dccp/feat.c      |  554 ++++++++++++++++++++++++++++++++++++++++++++++++++
 net/dccp/feat.h      |   28 +++
 net/dccp/input.c     |    3 
 net/dccp/ipv4.c      |   19 ++
 net/dccp/minisocks.c |    4 
 net/dccp/options.c   |  139 ++++++++++++-
 net/dccp/output.c    |    4 
 net/dccp/proto.c     |   53 +++++
 net/dccp/timer.c     |   12 +
 11 files changed, 847 insertions(+), 6 deletions(-)
 create mode 100644 net/dccp/feat.c
 create mode 100644 net/dccp/feat.h

applies-to: ed435145e2f0fc98e632a1d5b8c9b52ee0d02ad7
ec331fa6d35c5f4249c1fdd03438b43fd655f9a1
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 268b457..f91c8a6 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -154,6 +154,10 @@ enum {
 	DCCPO_MANDATORY = 1,
 	DCCPO_MIN_RESERVED = 3,
 	DCCPO_MAX_RESERVED = 31,
+	DCCPO_CHANGE_L = 32,
+	DCCPO_CONFIRM_L = 33,
+	DCCPO_CHANGE_R = 34,
+	DCCPO_CONFIRM_R = 35,
 	DCCPO_NDP_COUNT = 37,
 	DCCPO_ACK_VECTOR_0 = 38,
 	DCCPO_ACK_VECTOR_1 = 39,
@@ -168,7 +172,9 @@ enum {
 /* DCCP features */
 enum {
 	DCCPF_RESERVED = 0,
+	DCCPF_CCID = 1,
 	DCCPF_SEQUENCE_WINDOW = 3,
+	DCCPF_ACK_RATIO = 5,
 	DCCPF_SEND_ACK_VECTOR = 6,
 	DCCPF_SEND_NDP_COUNT = 7,
 	/* 10-127 reserved */
@@ -176,9 +182,18 @@ enum {
 	DCCPF_MAX_CCID_SPECIFIC = 255,
 };
 
+/* this structure is argument to DCCP_SOCKOPT_CHANGE_X */
+struct dccp_so_feat {
+	__u8 dccpsf_feat;
+	__u8 *dccpsf_val;
+	__u8 dccpsf_len;
+};
+
 /* DCCP socket options */
 #define DCCP_SOCKOPT_PACKET_SIZE	1
 #define DCCP_SOCKOPT_SERVICE		2
+#define DCCP_SOCKOPT_CHANGE_L		3
+#define DCCP_SOCKOPT_CHANGE_R		4
 #define DCCP_SOCKOPT_CCID_RX_INFO	128
 #define DCCP_SOCKOPT_CCID_TX_INFO	192
 
@@ -314,8 +329,8 @@ static inline unsigned int dccp_hdr_len(
 
 /* initial values for each feature */
 #define DCCPF_INITIAL_SEQUENCE_WINDOW		100
-/* FIXME: for now we're using CCID 2 (TCP-Like) */
 #define DCCPF_INITIAL_CCID			2
+#define DCCPF_INITIAL_ACK_RATIO			2
 #define DCCPF_INITIAL_SEND_ACK_VECTOR		1
 /* FIXME: for now we're default to 1 but it should really be 0 */
 #define DCCPF_INITIAL_SEND_NDP_COUNT		1
@@ -335,6 +350,24 @@ struct dccp_options {
 	__u8	dccpo_tx_ccid;
 	__u8	dccpo_send_ack_vector;
 	__u8	dccpo_send_ndp_count;
+	__u8			dccpo_ack_ratio;
+	struct list_head	dccpo_pending;
+	struct list_head	dccpo_conf;
+};
+
+struct dccp_opt_conf {
+	__u8			*dccpoc_val;
+	__u8			dccpoc_len;
+};
+
+struct dccp_opt_pend {
+	struct list_head	dccpop_node;
+	__u8			dccpop_type;
+	__u8			dccpop_feat;
+	__u8		        *dccpop_val;
+	__u8			dccpop_len;
+	int			dccpop_conf;
+	struct dccp_opt_conf    *dccpop_sc;
 };
 
 extern void __dccp_options_init(struct dccp_options *dccpo);
diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 87b27ff..5736ace 100644
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -4,7 +4,7 @@ dccp_ipv6-y := ipv6.o
 
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
-dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
+dccp-y := ccid.o feat.o input.o ipv4.o minisocks.o options.o output.o proto.o \
 	  timer.o
 
 dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
new file mode 100644
index 0000000..fb74260
--- /dev/null
+++ b/net/dccp/feat.c
@@ -0,0 +1,554 @@
+/*
+ *  net/dccp/feat.c
+ *
+ *  An implementation of the DCCP protocol
+ *  Andrea Bittau <a.bittau at cs.ucl.ac.uk>
+ *
+ *      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/module.h>
+
+#include "dccp.h"
+#include "feat.h"
+
+#define DCCP_FEAT_SP_NOAGREE (-123)
+
+int dccp_feat_change(struct sock *sk, u8 type, u8 feature, u8 *val, u8 len,
+		     gfp_t gfp)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct dccp_opt_pend *opt;
+	
+	dccp_pr_debug("feat change type=%d feat=%d\n", type, feature);
+
+	/* check if that feature is already being negotiated */
+	list_for_each_entry(opt, &dp->dccps_options.dccpo_pending,
+			    dccpop_node) {
+		/* ok we found a negotiation for this option already */
+		if (opt->dccpop_feat == feature && opt->dccpop_type == type) {
+			dccp_pr_debug("Replacing old\n");
+			/* replace */
+			BUG_ON(opt->dccpop_val == NULL);
+			kfree(opt->dccpop_val);
+			opt->dccpop_val	 = val;
+			opt->dccpop_len	 = len;
+			opt->dccpop_conf = 0;
+			return 0;
+		}
+	}
+
+	/* negotiation for a new feature */
+	opt = kmalloc(sizeof(*opt), gfp);
+	if (opt == NULL)
+		return -ENOMEM;
+
+	opt->dccpop_type = type;
+	opt->dccpop_feat = feature;
+	opt->dccpop_len	 = len;
+	opt->dccpop_val	 = val;
+	opt->dccpop_conf = 0;
+	opt->dccpop_sc	 = NULL;
+
+	BUG_ON(opt->dccpop_val == NULL);
+
+	list_add_tail(&opt->dccpop_node, &dp->dccps_options.dccpo_pending);
+	return 0;
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_change);
+
+/* XXX taking only u8 vals */
+static int dccp_feat_update(struct sock *sk, u8 type, u8 feat, u8 val)
+{
+	/* FIXME implement */
+	dccp_pr_debug("changing [%d] feat %d to %d\n", type, feat, val);
+	return 0;
+}
+
+static int dccp_feat_reconcile(struct sock *sk, struct dccp_opt_pend *opt,
+			       u8 *rpref, u8 rlen)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	u8 *spref, slen, *res = NULL;
+	int i, j, rc, agree = 1;
+
+	BUG_ON(rpref == NULL);
+
+	/* check if we are the black sheep */
+	if (dp->dccps_role == DCCP_ROLE_CLIENT) {
+		spref = rpref;
+		slen  = rlen;
+		rpref = opt->dccpop_val;
+		rlen  = opt->dccpop_len;
+	} else {
+		spref = opt->dccpop_val;
+		slen  = opt->dccpop_len;
+	}
+	/*
+	 * Now we have server preference list in spref and client preference in
+	 * rpref
+	 */
+	BUG_ON(spref == NULL);
+	BUG_ON(rpref == NULL);
+
+	/* FIXME sanity check vals */
+
+	/* Are values in any order?  XXX Lame "algorithm" here */
+	/* XXX assume values are 1 byte */
+	for (i = 0; i < slen; i++) {
+		for (j = 0; j < rlen; j++) {
+			if (spref[i] == rpref[j]) {
+				res = &spref[i];
+				break;
+			}	
+		}
+		if (res)
+			break;
+	}
+
+	/* we didn't agree on anything */
+	if (res == NULL) {
+		/* confirm previous value */
+		switch (opt->dccpop_feat) {
+		case DCCPF_CCID:
+			/* XXX did i get this right? =P */
+			if (opt->dccpop_type == DCCPO_CHANGE_L)
+				res = &dp->dccps_options.dccpo_tx_ccid;
+			else
+				res = &dp->dccps_options.dccpo_rx_ccid;
+			break;
+
+		default:
+			WARN_ON(1); /* XXX implement res */
+			return -EFAULT;
+		}
+		
+		dccp_pr_debug("Don't agree... reconfirming %d\n", *res);
+		agree = 0; /* this is used for mandatory options... */
+	}
+
+	/* need to put result and our preference list */
+	/* XXX assume 1 byte vals */
+	rlen = 1 + opt->dccpop_len;
+	rpref = kmalloc(rlen, GFP_ATOMIC);
+	if (rpref == NULL)
+		return -ENOMEM;
+
+	*rpref = *res;
+	memcpy(&rpref[1], opt->dccpop_val, opt->dccpop_len);
+
+	/* put it in the "confirm queue" */
+	if (opt->dccpop_sc == NULL) {
+		opt->dccpop_sc = kmalloc(sizeof(*opt->dccpop_sc), GFP_ATOMIC);
+		if (opt->dccpop_sc == NULL) {
+			kfree(rpref);
+			return -ENOMEM;
+		}
+	} else {
+		/* recycle the confirm slot */
+		BUG_ON(opt->dccpop_sc->dccpoc_val == NULL);
+		kfree(opt->dccpop_sc->dccpoc_val);
+		dccp_pr_debug("recycling confirm slot\n");
+	}
+	memset(opt->dccpop_sc, 0, sizeof(*opt->dccpop_sc));
+
+	opt->dccpop_sc->dccpoc_val = rpref;
+	opt->dccpop_sc->dccpoc_len = rlen;
+	
+	/* update the option on our side [we are about to send the confirm] */
+	rc = dccp_feat_update(sk, opt->dccpop_type, opt->dccpop_feat, *res);
+	if (rc) {
+		kfree(opt->dccpop_sc->dccpoc_val);
+		kfree(opt->dccpop_sc);
+		opt->dccpop_sc = 0;
+		return rc;
+	}
+	
+	dccp_pr_debug("Will confirm %d\n", *rpref);
+
+	/* say we want to change to X but we just got a confirm X, suppress our
+	 * change
+	 */
+	if (!opt->dccpop_conf) {
+		if (*opt->dccpop_val == *res)
+			opt->dccpop_conf = 1;
+		dccp_pr_debug("won't ask for change of same feature\n");
+	}
+
+	return agree ? 0 : DCCP_FEAT_SP_NOAGREE; /* used for mandatory opts */
+}
+
+static int dccp_feat_sp(struct sock *sk, u8 type, u8 feature, u8 *val, u8 len)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct dccp_opt_pend *opt;
+	int rc = 1;
+	u8 t;
+
+	/*
+	 * We received a CHANGE.  We gotta match it against our own preference
+	 * list.  If we got a CHANGE_R it means it's a change for us, so we need
+	 * to compare our CHANGE_L list.
+	 */
+	if (type == DCCPO_CHANGE_L)
+		t = DCCPO_CHANGE_R;
+	else
+		t = DCCPO_CHANGE_L;
+	
+	/* find our preference list for this feature */
+	list_for_each_entry(opt, &dp->dccps_options.dccpo_pending,
+			    dccpop_node) {
+		if (opt->dccpop_type != t || opt->dccpop_feat != feature)
+			continue;
+		
+		/* find the winner from the two preference lists */
+		rc = dccp_feat_reconcile(sk, opt, val, len);
+		break;
+	}
+
+	/* We didn't deal with the change.  This can happen if we have no
+	 * preference list for the feature.  In fact, it just shouldn't
+	 * happen---if we understand a feature, we should have a preference list
+	 * with at least the default value.
+	 */
+	BUG_ON(rc == 1);
+
+	return rc;
+}
+
+static int dccp_feat_nn(struct sock *sk, u8 type, u8 feature, u8 *val, u8 len)
+{
+	struct dccp_opt_pend *opt;
+	struct dccp_sock *dp = dccp_sk(sk);
+	u8 *copy;
+	int rc;
+
+	/* NN features must be change L */
+	if (type == DCCPO_CHANGE_R) {
+		dccp_pr_debug("received CHANGE_R %d for NN feat %d\n",
+			      type, feature);
+		return -EFAULT;
+	}
+
+	/* XXX sanity check opt val */
+
+	/* copy option so we can confirm it */
+	opt = kzalloc(sizeof(*opt), GFP_ATOMIC);
+	if (opt == NULL)
+		return -ENOMEM;
+
+	copy = kmalloc(len, GFP_ATOMIC);
+	if (copy == NULL) {
+		kfree(opt);
+		return -ENOMEM;
+	}
+	memcpy(copy, val, len);
+
+	opt->dccpop_type = DCCPO_CONFIRM_R; /* NN can only confirm R */
+	opt->dccpop_feat = feature;
+	opt->dccpop_val	 = copy;
+	opt->dccpop_len	 = len;
+
+	/* change feature */
+	rc = dccp_feat_update(sk, type, feature, *val);
+	if (rc) {
+		kfree(opt->dccpop_val);
+		kfree(opt);
+		return rc;
+	}
+
+	dccp_pr_debug("Confirming NN feature %d (val=%d)\n", feature, *copy);
+	list_add_tail(&opt->dccpop_node, &dp->dccps_options.dccpo_conf);
+
+	return 0;
+}
+
+static void dccp_feat_empty_confirm(struct sock *sk, u8 type, u8 feature)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	/* XXX check if other confirms for that are queued and recycle slot */
+	struct dccp_opt_pend *opt = kzalloc(sizeof(*opt), GFP_ATOMIC);
+
+	if (opt == NULL) {
+		/* XXX what do we do?  Ignoring should be fine.  It's a change
+		 * after all =P
+		 */
+		return;
+	}
+	
+	opt->dccpop_type = type == DCCPO_CHANGE_L ? DCCPO_CONFIRM_R :
+						    DCCPO_CONFIRM_L;
+	opt->dccpop_feat = feature;
+	opt->dccpop_val	 = 0;
+	opt->dccpop_len	 = 0;
+
+	/* change feature */
+	dccp_pr_debug("Empty confirm feature %d type %d\n", feature, type);
+	list_add_tail(&opt->dccpop_node, &dp->dccps_options.dccpo_conf);
+}
+
+static void dccp_feat_flush_confirm(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	/* Check if there is anything to confirm in the first place */
+	int yes = !list_empty(&dp->dccps_options.dccpo_conf);
+
+	if (!yes) {
+		struct dccp_opt_pend *opt;
+
+		list_for_each_entry(opt, &dp->dccps_options.dccpo_pending,
+				    dccpop_node) {
+			if (opt->dccpop_conf) {
+				yes = 1;
+				break;
+			}
+		}
+	}
+
+	if (!yes)
+		return;
+
+	/* OK there is something to confirm... */
+	/* XXX check if packet is in flight?  Send delayed ack?? */
+	if (sk->sk_state == DCCP_OPEN)
+		dccp_send_ack(sk);
+}
+
+int dccp_feat_change_recv(struct sock *sk, u8 type, u8 feature, u8 *val, u8 len)
+{
+	int rc;
+
+	dccp_pr_debug("got feat change type=%d feat=%d\n", type, feature);
+
+	/* figure out if it's SP or NN feature */
+	switch (feature) {
+	/* deal with SP features */
+	case DCCPF_CCID:
+		rc = dccp_feat_sp(sk, type, feature, val, len);
+		break;
+
+	/* deal with NN features */
+	case DCCPF_ACK_RATIO:
+		rc = dccp_feat_nn(sk, type, feature, val, len);
+		break;
+
+	/* XXX implement other features */
+	default:
+		rc = -EFAULT;
+		break;
+	}
+
+	/* check if there were problems changing features */
+	if (rc) {
+		/* If we don't agree on SP, we sent a confirm for old value.
+		 * However we propagate rc to caller in case option was
+		 * mandatory
+		 */
+		if (rc != DCCP_FEAT_SP_NOAGREE)
+			dccp_feat_empty_confirm(sk, type, feature);
+	}
+
+	/* generate the confirm [if required] */
+	dccp_feat_flush_confirm(sk);
+
+	return rc;
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_change_recv);
+
+int dccp_feat_confirm_recv(struct sock *sk, u8 type, u8 feature,
+			   u8 *val, u8 len)
+{
+	u8 t;
+	struct dccp_opt_pend *opt;
+	struct dccp_sock *dp = dccp_sk(sk);
+	int rc = 1;
+	int all_confirmed = 1;
+
+	dccp_pr_debug("got feat confirm type=%d feat=%d\n", type, feature);
+
+	/* XXX sanity check type & feat */
+
+	/* locate our change request */
+	t = type == DCCPO_CONFIRM_L ? DCCPO_CHANGE_R : DCCPO_CHANGE_L;
+
+	list_for_each_entry(opt, &dp->dccps_options.dccpo_pending,
+			    dccpop_node) {
+		if (!opt->dccpop_conf && opt->dccpop_type == t &&
+		    opt->dccpop_feat == feature) {
+			/* we found it */
+			/* XXX do sanity check */
+			
+			opt->dccpop_conf = 1;
+
+			/* We got a confirmation---change the option */
+			dccp_feat_update(sk, opt->dccpop_type,
+					 opt->dccpop_feat, *val);
+
+			dccp_pr_debug("feat %d type %d confirmed %d\n",
+				      feature, type, *val);
+			rc = 0;
+			break;
+		}
+
+		if (!opt->dccpop_conf)
+			all_confirmed = 0;
+	}
+
+	/* fix re-transmit timer */
+	/* XXX gotta make sure that no option negotiation occurs during
+	 * connection shutdown.  Consider that the CLOSEREQ is sent and timer is
+	 * on.  if all options are confirmed it might kill timer which should
+	 * remain alive until close is received.
+	 */
+	if (all_confirmed) {
+		dccp_pr_debug("clear feat negotiation timer %p\n", sk);
+		inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
+	}
+
+	if (rc)
+		dccp_pr_debug("feat %d type %d never requested\n",
+			      feature, type);
+	return 0;
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_confirm_recv);
+
+void dccp_feat_clean(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct dccp_opt_pend *opt, *next;
+
+	list_for_each_entry_safe(opt, next, &dp->dccps_options.dccpo_pending,
+				 dccpop_node) {
+                BUG_ON(opt->dccpop_val == NULL);
+                kfree(opt->dccpop_val);
+		
+		if (opt->dccpop_sc != NULL) {
+			BUG_ON(opt->dccpop_sc->dccpoc_val == NULL);
+			kfree(opt->dccpop_sc->dccpoc_val);
+			kfree(opt->dccpop_sc);
+		}	
+
+                kfree(opt);
+        }
+	INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending);
+
+	list_for_each_entry_safe(opt, next, &dp->dccps_options.dccpo_conf,
+				 dccpop_node) {
+		BUG_ON(opt == NULL);
+		if (opt->dccpop_val != NULL)
+			kfree(opt->dccpop_val);
+		kfree(opt);
+	}
+	INIT_LIST_HEAD(&dp->dccps_options.dccpo_conf);
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_clean);
+
+/* this is to be called only when a listening sock creates its child.  It is
+ * assumed by the function---the confirm is not duplicated, but rather it is
+ * "passed on".
+ */
+int dccp_feat_clone(struct sock *oldsk, struct sock *newsk)
+{
+	struct dccp_sock *olddp = dccp_sk(oldsk);
+	struct dccp_sock *newdp = dccp_sk(newsk);
+	struct dccp_opt_pend *opt;
+	int rc = 0;
+
+	INIT_LIST_HEAD(&newdp->dccps_options.dccpo_pending);
+	INIT_LIST_HEAD(&newdp->dccps_options.dccpo_conf);
+
+	list_for_each_entry(opt, &olddp->dccps_options.dccpo_pending,
+			    dccpop_node) {
+		struct dccp_opt_pend *newopt;
+		/* copy the value of the option */
+		u8 *val = kmalloc(opt->dccpop_len, GFP_ATOMIC);
+
+		if (val == NULL)
+			goto out_clean;
+		memcpy(val, opt->dccpop_val, opt->dccpop_len);
+
+		newopt = kmalloc(sizeof(*newopt), GFP_ATOMIC);
+		if (newopt == NULL) {
+			kfree(val);
+			goto out_clean;
+		}
+
+		/* insert the option */	
+		memcpy(newopt, opt, sizeof(*newopt));
+		newopt->dccpop_val = val;
+		list_add_tail(&newopt->dccpop_node, 
+			      &newdp->dccps_options.dccpo_pending);
+		
+		/* XXX what happens with backlogs and multiple connections at
+		 * once...
+		 */
+		/* the master socket no longer needs to worry about confirms */
+		opt->dccpop_sc = 0; /* it's not a memleak---new socket has it */
+		
+		/* reset state for a new socket */
+		opt->dccpop_conf = 0;
+	}
+
+	/* XXX not doing anything about the conf queue */
+
+out:
+	return rc;
+
+out_clean:
+	dccp_feat_clean(newsk);
+	rc = -ENOMEM;
+	goto out;
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_clone);
+
+static int __dccp_feat_init(struct sock *sk, u8 type, u8 feat, u8 *val, u8 len)
+{
+	int rc = -ENOMEM;
+	u8 *copy = kmalloc(len, GFP_KERNEL);
+
+	if (copy != NULL) {
+		memcpy(copy, val, len);
+		rc = dccp_feat_change(sk, type, feat, copy, len, GFP_KERNEL);
+		if (rc)
+			kfree(copy);
+	}
+	return rc;
+}
+
+int dccp_feat_init(struct sock *sk)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	int rc;
+
+	INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending);
+	INIT_LIST_HEAD(&dp->dccps_options.dccpo_conf);
+
+	/* CCID L */
+	rc = __dccp_feat_init(sk, DCCPO_CHANGE_L, DCCPF_CCID,
+			      &dp->dccps_options.dccpo_tx_ccid, 1);
+	if (rc)
+		goto out;
+
+	/* CCID R */
+	rc = __dccp_feat_init(sk, DCCPO_CHANGE_R, DCCPF_CCID,
+			      &dp->dccps_options.dccpo_rx_ccid, 1);
+	if (rc)
+		goto out;
+
+	/* Ack ratio */
+	rc = __dccp_feat_init(sk, DCCPO_CHANGE_L, DCCPF_ACK_RATIO,
+			      &dp->dccps_options.dccpo_ack_ratio, 1);
+out:
+	return rc;
+}
+
+EXPORT_SYMBOL_GPL(dccp_feat_init);
diff --git a/net/dccp/feat.h b/net/dccp/feat.h
new file mode 100644
index 0000000..f7c73a3
--- /dev/null
+++ b/net/dccp/feat.h
@@ -0,0 +1,28 @@
+#ifndef _DCCP_FEAT_H
+#define _DCCP_FEAT_H
+/*
+ *  net/dccp/feat.h
+ *
+ *  An implementation of the DCCP protocol
+ *  Copyright (c) 2005 Andrea Bittau <a.bittau at cs.ucl.ac.uk>
+ *
+ *	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.
+ */
+
+#include <linux/types.h>
+
+struct sock;
+
+extern int  dccp_feat_change(struct sock *sk, u8 type, u8 feature, 
+			     u8 *val, u8 len, gfp_t gfp);
+extern int  dccp_feat_change_recv(struct sock *sk, u8 type, u8 feature,
+				  u8 *val, u8 len);
+extern int  dccp_feat_confirm_recv(struct sock *sk, u8 type, u8 feature,
+				   u8 *val, u8 len);
+extern void dccp_feat_clean(struct sock *sk);
+extern int  dccp_feat_clone(struct sock *oldsk, struct sock *newsk);
+extern int  dccp_feat_init(struct sock *sk);
+
+#endif /* _DCCP_FEAT_H */
diff --git a/net/dccp/input.c b/net/dccp/input.c
index b6cba72..4b6d43d 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -300,6 +300,9 @@ static int dccp_rcv_request_sent_state_p
 			goto out_invalid_packet;
 		}
 
+		if (dccp_parse_options(sk, skb))
+			goto out_invalid_packet;
+
                 if (dp->dccps_options.dccpo_send_ack_vector &&
                     dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,
                                     DCCP_SKB_CB(skb)->dccpd_seq,
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 38321ad..14adcf9 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -28,6 +28,7 @@
 #include "ackvec.h"
 #include "ccid.h"
 #include "dccp.h"
+#include "feat.h"
 
 struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {
 	.lhash_lock	= RW_LOCK_UNLOCKED,
@@ -535,7 +536,8 @@ int dccp_v4_conn_request(struct sock *sk
 	if (req == NULL)
 		goto drop;
 
-	/* FIXME: process options */
+	if (dccp_parse_options(sk, skb))
+		goto drop;
 
 	dccp_openreq_init(req, &dp, skb);
 
@@ -1049,6 +1051,8 @@ int dccp_v4_init_sock(struct sock *sk)
 	 * setsockopt(CCIDs-I-want/accept). -acme
 	 */
 	if (likely(!dccp_ctl_socket_init)) {
+		int rc;
+
 		if (dp->dccps_options.dccpo_send_ack_vector) {
 			dp->dccps_hc_rx_ackvec = dccp_ackvec_alloc(GFP_KERNEL);
 			if (dp->dccps_hc_rx_ackvec == NULL)
@@ -1069,8 +1073,16 @@ int dccp_v4_init_sock(struct sock *sk)
 			dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;
 			return -ENOMEM;
 		}
-	} else
+
+		rc = dccp_feat_init(sk);
+		if (rc)
+			return rc;
+	} else {
+		/* control socket doesn't need feat nego */
+		INIT_LIST_HEAD(&dp->dccps_options.dccpo_pending);
+		INIT_LIST_HEAD(&dp->dccps_options.dccpo_conf);
 		dccp_ctl_socket_init = 0;
+	}	
 
 	dccp_init_xmit_timers(sk);
 	icsk->icsk_rto = DCCP_TIMEOUT_INIT;
@@ -1118,6 +1130,9 @@ int dccp_v4_destroy_sock(struct sock *sk
 	ccid_exit(dp->dccps_hc_tx_ccid, sk);
 	dp->dccps_hc_rx_ccid = dp->dccps_hc_tx_ccid = NULL;
 
+	/* clean up feature negotiation state */
+	dccp_feat_clean(sk);
+
 	return 0;
 }
 
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index a60a3e9..9e1de59 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -22,6 +22,7 @@
 #include "ackvec.h"
 #include "ccid.h"
 #include "dccp.h"
+#include "feat.h"
 
 struct inet_timewait_death_row dccp_death_row = {
 	.sysctl_max_tw_buckets = NR_FILE * 2,
@@ -114,6 +115,9 @@ struct sock *dccp_create_openreq_child(s
 		newicsk->icsk_rto	   = DCCP_TIMEOUT_INIT;
 		do_gettimeofday(&newdp->dccps_epoch);
 
+		if (dccp_feat_clone(sk, newsk))
+			goto out_free;
+
 		if (newdp->dccps_options.dccpo_send_ack_vector) {
 			newdp->dccps_hc_rx_ackvec =
 						dccp_ackvec_alloc(GFP_ATOMIC);
diff --git a/net/dccp/options.c b/net/dccp/options.c
index 0a76426..7f99306 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -21,12 +21,14 @@
 #include "ackvec.h"
 #include "ccid.h"
 #include "dccp.h"
+#include "feat.h"
 
 /* stores the default values for new connection. may be changed with sysctl */
 static const struct dccp_options dccpo_default_values = {
 	.dccpo_sequence_window	  = DCCPF_INITIAL_SEQUENCE_WINDOW,
 	.dccpo_rx_ccid		  = DCCPF_INITIAL_CCID,
 	.dccpo_tx_ccid		  = DCCPF_INITIAL_CCID,
+	.dccpo_ack_ratio	  = DCCPF_INITIAL_ACK_RATIO,
 	.dccpo_send_ack_vector	  = DCCPF_INITIAL_SEND_ACK_VECTOR,
 	.dccpo_send_ndp_count	  = DCCPF_INITIAL_SEND_NDP_COUNT,
 };
@@ -69,6 +71,8 @@ int dccp_parse_options(struct sock *sk, 
 	unsigned char opt, len;
 	unsigned char *value;
 	u32 elapsed_time;
+	int rc;
+	int mandatory = 0;
 
 	memset(opt_recv, 0, sizeof(*opt_recv));
 
@@ -100,6 +104,11 @@ int dccp_parse_options(struct sock *sk, 
 		switch (opt) {
 		case DCCPO_PADDING:
 			break;
+		case DCCPO_MANDATORY:
+			if (mandatory)
+				goto out_invalid_option;
+			mandatory = 1;
+			break;
 		case DCCPO_NDP_COUNT:
 			if (len > 3)
 				goto out_invalid_option;
@@ -108,6 +117,31 @@ int dccp_parse_options(struct sock *sk, 
 			dccp_pr_debug("%sNDP count=%d\n", debug_prefix,
 				      opt_recv->dccpor_ndp);
 			break;
+		case DCCPO_CHANGE_L:
+			/* fall through */
+		case DCCPO_CHANGE_R:
+			if (len < 2)
+				goto out_invalid_option;
+			rc = dccp_feat_change_recv(sk, opt, *value, value + 1,
+						   len - 1);
+			/*
+			 * When there is a change error, change_recv is
+			 * responsible for dealing with it.  i.e. reply with an
+			 * empty confirm.
+			 * If the change was mandatory, then we need to die.
+			 */
+			if (rc && mandatory)
+				goto out_invalid_option;
+			break;
+		case DCCPO_CONFIRM_L:
+			/* fall through */
+		case DCCPO_CONFIRM_R:
+			if (len < 2)
+				goto out_invalid_option;
+			if (dccp_feat_confirm_recv(sk, opt, *value,
+						   value + 1, len - 1))
+				goto out_invalid_option;
+			break;
 		case DCCPO_ACK_VECTOR_0:
 		case DCCPO_ACK_VECTOR_1:
 			if (pkt_type == DCCP_PKT_DATA)
@@ -208,6 +242,9 @@ int dccp_parse_options(struct sock *sk, 
 				sk, opt, len);
 			break;
 	        }
+
+		if (opt != DCCPO_MANDATORY)
+			mandatory = 0;
 	}
 
 	return 0;
@@ -356,7 +393,7 @@ void dccp_insert_option_timestamp(struct
 {
 	struct timeval tv;
 	u32 now;
-	
+
 	dccp_timestamp(sk, &tv);
 	now = timeval_usecs(&tv) / 10;
 	/* yes this will overflow but that is the point as we want a
@@ -402,7 +439,7 @@ static void dccp_insert_option_timestamp
 	tstamp_echo = htonl(dp->dccps_timestamp_echo);
 	memcpy(to, &tstamp_echo, 4);
 	to += 4;
-	
+
 	if (elapsed_time_len == 2) {
 		const u16 var16 = htons((u16)elapsed_time);
 		memcpy(to, &var16, 2);
@@ -421,6 +458,93 @@ static void dccp_insert_option_timestamp
 	dp->dccps_timestamp_time.tv_usec = 0;
 }
 
+static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat,
+			        u8 *val, u8 len)
+{
+	u8 *to;
+
+	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len + 3 > DCCP_MAX_OPT_LEN) {
+		LIMIT_NETDEBUG(KERN_INFO "DCCP: packet too small"
+			       " to insert feature %d option!\n", feat);
+		return -1;
+	}
+
+	DCCP_SKB_CB(skb)->dccpd_opt_len += len + 3;
+
+	to    = skb_push(skb, len + 3);
+	*to++ = type;
+	*to++ = len + 3;
+	*to++ = feat;
+
+	if (len)
+		memcpy(to, val, len);
+	dccp_pr_debug("option %d feat %d len %d\n", type, feat, len);
+
+	return 0;
+}
+
+static void dccp_insert_feat(struct sock *sk, struct sk_buff *skb)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	struct dccp_opt_pend *opt, *next;
+	int change = 0;
+
+	/* confirm any options [NN opts] */
+	list_for_each_entry_safe(opt, next, &dp->dccps_options.dccpo_conf,
+				 dccpop_node) {
+		dccp_insert_feat_opt(skb, opt->dccpop_type,
+				     opt->dccpop_feat, opt->dccpop_val,
+				     opt->dccpop_len);
+		/* fear empty confirms */
+		if (opt->dccpop_val)
+			kfree(opt->dccpop_val);
+		kfree(opt);
+	}
+	INIT_LIST_HEAD(&dp->dccps_options.dccpo_conf);
+
+	/* see which features we need to send */
+	list_for_each_entry(opt, &dp->dccps_options.dccpo_pending,
+			    dccpop_node) {
+		/* see if we need to send any confirm */
+		if (opt->dccpop_sc) {
+			dccp_insert_feat_opt(skb, opt->dccpop_type + 1,
+					     opt->dccpop_feat,
+					     opt->dccpop_sc->dccpoc_val,
+					     opt->dccpop_sc->dccpoc_len);
+
+			BUG_ON(!opt->dccpop_sc->dccpoc_val);
+			kfree(opt->dccpop_sc->dccpoc_val);
+			kfree(opt->dccpop_sc);
+			opt->dccpop_sc = NULL;
+		}
+
+		/* any option not confirmed, re-send it */
+		if (!opt->dccpop_conf) {
+			dccp_insert_feat_opt(skb, opt->dccpop_type,
+					     opt->dccpop_feat, opt->dccpop_val,
+					     opt->dccpop_len);
+			change++;
+		}
+	}
+
+	/* Retransmit timer.
+	 * If this is the master listening sock, we don't set a timer on it.  It
+	 * should be fine because if the dude doesn't receive our RESPONSE
+	 * [which will contain the CHANGE] he will send another REQUEST which
+	 * will "retrnasmit" the change.
+	 */
+	if (change && dp->dccps_role != DCCP_ROLE_LISTEN) {
+		dccp_pr_debug("reset feat negotiation timer %p\n", sk);
+
+		/* XXX don't reset the timer on re-transmissions.  I.e. reset it
+		 * only when sending new stuff i guess.  Currently the timer
+		 * never backs off because on re-transmission it just resets it!
+		 */
+		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
+					  inet_csk(sk)->icsk_rto, DCCP_RTO_MAX);
+	}
+}
+
 void dccp_insert_options(struct sock *sk, struct sk_buff *skb)
 {
 	struct dccp_sock *dp = dccp_sk(sk);
@@ -447,6 +571,17 @@ void dccp_insert_options(struct sock *sk
 		dp->dccps_hc_tx_insert_options = 0;
 	}
 
+	/* Feature negotiation */
+	switch(DCCP_SKB_CB(skb)->dccpd_type) {
+		/* Data packets can't do feat negotiation */
+	case DCCP_PKT_DATA:
+	case DCCP_PKT_DATAACK:
+		break;
+	default:
+		dccp_insert_feat(sk, skb);
+		break;
+	}
+
 	/* XXX: insert other options when appropriate */
 
 	if (DCCP_SKB_CB(skb)->dccpd_opt_len != 0) {
diff --git a/net/dccp/output.c b/net/dccp/output.c
index efd7ffb..0cc2bcf 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -64,6 +64,10 @@ static int dccp_transmit_skb(struct sock
 		case DCCP_PKT_DATAACK:
 			break;
 
+		case DCCP_PKT_REQUEST:
+			set_ack = 0;
+			/* fall through */
+
 		case DCCP_PKT_SYNC:
 		case DCCP_PKT_SYNCACK:
 			ackno = dcb->dccpd_seq;
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 81ad249..ae2ab50 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -37,6 +37,7 @@
 
 #include "ccid.h"
 #include "dccp.h"
+#include "feat.h"
 
 DEFINE_SNMP_STAT(struct dccp_mib, dccp_statistics) __read_mostly;
 
@@ -255,6 +256,39 @@ static int dccp_setsockopt_service(struc
 	return 0;
 }
 
+/* byte 1 is feature.  the rest is the preference list */
+static int dccp_setsockopt_change(struct sock *sk, int type,
+				  struct dccp_so_feat __user *optval)
+{
+	struct dccp_so_feat opt;
+	u8 *val;
+	int rc;
+
+	if (copy_from_user(&opt, optval, sizeof(opt)))
+		return -EFAULT;
+
+	val = kmalloc(opt.dccpsf_len, GFP_KERNEL);
+	if (!val)
+		return -ENOMEM;
+	
+	if (copy_from_user(val, opt.dccpsf_val, opt.dccpsf_len)) {
+		rc = -EFAULT;
+		goto out_free_val;
+	}
+
+	rc = dccp_feat_change(sk, type, opt.dccpsf_feat, val, opt.dccpsf_len,
+			      GFP_KERNEL);
+	if (rc)
+		goto out_free_val;
+
+out:
+	return rc;
+
+out_free_val:
+	kfree(val);
+	goto out;
+}
+
 int dccp_setsockopt(struct sock *sk, int level, int optname,
 		    char __user *optval, int optlen)
 {
@@ -284,6 +318,25 @@ int dccp_setsockopt(struct sock *sk, int
 	case DCCP_SOCKOPT_PACKET_SIZE:
 		dp->dccps_packet_size = val;
 		break;
+
+	case DCCP_SOCKOPT_CHANGE_L:
+		if (optlen != sizeof(struct dccp_so_feat))
+			err = -EINVAL;
+		else
+			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,
+					             (struct dccp_so_feat *)
+						     optval);
+		break;
+
+	case DCCP_SOCKOPT_CHANGE_R:
+		if (optlen != sizeof(struct dccp_so_feat))
+			err = -EINVAL;
+		else
+			err = dccp_setsockopt_change(sk, DCCPO_CHANGE_R,
+						     (struct dccp_so_feat *)
+						     optval);
+		break;
+
 	default:
 		err = -ENOPROTOOPT;
 		break;
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index aa34b57..d7c7866 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -141,6 +141,17 @@ static void dccp_retransmit_timer(struct
 {
 	struct inet_connection_sock *icsk = inet_csk(sk);
 
+	/* retransmit timer is used for feature negotiation throughout
+	 * connection.  In this case, no packet is re-transmitted, but rather an
+	 * ack is generated and pending changes are splaced into its options.
+	 */
+	if (sk->sk_send_head == NULL) {
+		dccp_pr_debug("feat negotiation retransmit timeout %p\n", sk);
+		if (sk->sk_state == DCCP_OPEN)
+			dccp_send_ack(sk);
+		goto backoff;
+	}
+
 	/*
 	 * sk->sk_send_head has to have one skb with
 	 * DCCP_SKB_CB(skb)->dccpd_type set to one of the retransmittable DCCP
@@ -177,6 +188,7 @@ static void dccp_retransmit_timer(struct
 		goto out;
 	}
 
+backoff:
 	icsk->icsk_backoff++;
 	icsk->icsk_retransmits++;
 
---
0.99.8.GIT


--- NEW FILE 4427-IPCOMP6-don-t-check-vfree-argument-for-NULL.txt ---
Subject: [PATCH] [IPCOMP6]: don't check vfree() argument for NULL.
From: Jesper Juhl <jesper.juhl at gmail.com>
Date: 1139097027 -0800

vfree does it's own NULL checking, so checking a pointer before
handing it to vfree is pointless.

Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/ipcomp6.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 3425086705298d6a130a92470100cd5fee8be4da
6c5a258f773cce164662fc88ff62d2764eec398b
diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index d511a88..6107592 100644
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -286,8 +286,8 @@ static void ipcomp6_free_scratches(void)
 
 	for_each_cpu(i) {
 		void *scratch = *per_cpu_ptr(scratches, i);
-		if (scratch)
-			vfree(scratch);
+
+		vfree(scratch);
 	}
 
 	free_percpu(scratches);
---
0.99.8.GIT


--- NEW FILE 4428-IPV4-fib_rules.c-make-struct-fib_rules-static-again.txt ---
Subject: [PATCH] [IPV4] fib_rules.c: make struct fib_rules static again
From: Adrian Bunk <bunk at stusta.de>
Date: 1139097084 -0800

struct fib_rules became global for no good reason.

Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/fib_rules.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 7f4fec51a521556e24044cad81df6f06eff357aa
e7d06140499657a8c76c3f696dd7ea12df721984
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 41b6173..d5ddcda 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -100,7 +100,7 @@ static struct fib_rule local_rule = {
 	.r_action =	RTN_UNICAST,
 };
 
-struct hlist_head fib_rules;
+static struct hlist_head fib_rules;
 
 /* writer func called from netlink -- rtnl_sem hold*/
 
---
0.99.8.GIT


--- NEW FILE 4429-TG3-Add-support-for-5714S-and-5715S.txt ---
Subject: [PATCH] [TG3]: Add support for 5714S and 5715S
From: Michael Chan <mchan at broadcom.com>
Date: 1139185597 -0800

Add support for 5714S and 5715S.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c       |   35 ++++++++++++++++++++++++++++++++++-
 include/linux/pci_ids.h |    2 ++
 2 files changed, 36 insertions(+), 1 deletions(-)

applies-to: be14cb73f3f8108b5d9e856aaa4328b48210ca65
2acd34c87fda44f10266883377118c7324223f32
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e7dc653..c847b3e 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -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,
@@ -2680,6 +2684,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 +2758,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 +5585,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 +6100,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;
@@ -6459,7 +6490,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.
 		 */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 92a619b..37ab970 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1852,12 +1852,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
---
0.99.8.GIT


--- NEW FILE 4430-TG3-Enable-TSO-by-default.txt ---
Subject: [PATCH] [TG3]: Enable TSO by default
From: Michael Chan <mchan at broadcom.com>
Date: 1139185622 -0800

Enable TSO by default on newer chips that support TSO in hardware.
Leave TSO off by default on older chips that do firmware TSO because
performance is slightly lower.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

applies-to: 38b88e15e29a51920dff43393fda4544c366aa41
e61bab3fd86b1d0eed5f8b25c2057e8f4ce24813
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c847b3e..fdf1cfe 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10804,11 +10804,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
 
---
0.99.8.GIT


--- NEW FILE 4431-TG3-Support-shutdown-WoL.txt ---
Subject: [PATCH] [TG3]: Support shutdown WoL.
From: Michael Chan <mchan at broadcom.com>
Date: 1139185657 -0800

Support WoL during shutdown by calling
tg3_set_power_state(tp, PCI_D3hot) during tg3_close().

Change the power state parameter to pci_power_t type and use
constants defined in pci.h.

Certain ethtool operations cannot be performed after tg3_close()
because the device will go to low power state. Add return -EAGAIN
in such cases where appropriate.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 11 deletions(-)

applies-to: ddee518caa46de90ac9259b290243e26e00bd216
f53f4abb514cb1b07f66738b2964255786bf6fdc
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index fdf1cfe..e435b24 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -1042,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 ||
@@ -1135,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;
@@ -1154,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,
@@ -1167,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;
 
@@ -6189,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;
 
@@ -6476,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;
 
@@ -6855,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);
 
@@ -6872,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;
 }
 
@@ -7190,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))
@@ -7264,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;
@@ -7325,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;
 
@@ -8245,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) {
@@ -8302,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)
@@ -8321,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);
@@ -8337,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);
@@ -9751,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));
@@ -11002,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;
 
---
0.99.8.GIT


--- NEW FILE 4432-TG3-Update-version-and-reldate.txt ---
Subject: [PATCH] [TG3]: Update version and reldate
From: Michael Chan <mchan at broadcom.com>
Date: 1139185820 -0800

Update version to 3.50.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/tg3.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: efb52b5cbabb1fd865f81735217a4fba5df33824
a9215c5c856a156562246de5f5c3f75137171af7
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index e435b24..f147d73 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -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
---
0.99.8.GIT


--- NEW FILE 4433-BNX2-Reduce-register-test-size.txt ---
Subject: [PATCH] [BNX2]: Reduce register test size
From: Michael Chan <mchan at broadcom.com>
Date: 1139191696 -0800

Eliminate some of the registers in ethtool register test to reduce
driver size.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |  254 ----------------------------------------------------
 1 files changed, 0 insertions(+), 254 deletions(-)

applies-to: b9efd55c3c10076d86ee47f08a4cac8bbf9c5a2b
d6b5cbaef96284548de32a785434b73606dc8b2f
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index a24200d..af80b04 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3506,74 +3506,9 @@ bnx2_test_registers(struct bnx2 *bp)
 		{ 0x0c00, 0, 0x00000000, 0x00000001 },
 		{ 0x0c04, 0, 0x00000000, 0x03ff0001 },
 		{ 0x0c08, 0, 0x0f0ff073, 0x00000000 },
-		{ 0x0c0c, 0, 0x00ffffff, 0x00000000 },
-		{ 0x0c30, 0, 0x00000000, 0xffffffff },
-		{ 0x0c34, 0, 0x00000000, 0xffffffff },
-		{ 0x0c38, 0, 0x00000000, 0xffffffff },
-		{ 0x0c3c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c40, 0, 0x00000000, 0xffffffff },
-		{ 0x0c44, 0, 0x00000000, 0xffffffff },
-		{ 0x0c48, 0, 0x00000000, 0x0007ffff },
-		{ 0x0c4c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c50, 0, 0x00000000, 0xffffffff },
-		{ 0x0c54, 0, 0x00000000, 0xffffffff },
-		{ 0x0c58, 0, 0x00000000, 0xffffffff },
-		{ 0x0c5c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c60, 0, 0x00000000, 0xffffffff },
-		{ 0x0c64, 0, 0x00000000, 0xffffffff },
-		{ 0x0c68, 0, 0x00000000, 0xffffffff },
-		{ 0x0c6c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c70, 0, 0x00000000, 0xffffffff },
-		{ 0x0c74, 0, 0x00000000, 0xffffffff },
-		{ 0x0c78, 0, 0x00000000, 0xffffffff },
-		{ 0x0c7c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c80, 0, 0x00000000, 0xffffffff },
-		{ 0x0c84, 0, 0x00000000, 0xffffffff },
-		{ 0x0c88, 0, 0x00000000, 0xffffffff },
-		{ 0x0c8c, 0, 0x00000000, 0xffffffff },
-		{ 0x0c90, 0, 0x00000000, 0xffffffff },
-		{ 0x0c94, 0, 0x00000000, 0xffffffff },
-		{ 0x0c98, 0, 0x00000000, 0xffffffff },
-		{ 0x0c9c, 0, 0x00000000, 0xffffffff },
-		{ 0x0ca0, 0, 0x00000000, 0xffffffff },
-		{ 0x0ca4, 0, 0x00000000, 0xffffffff },
-		{ 0x0ca8, 0, 0x00000000, 0x0007ffff },
-		{ 0x0cac, 0, 0x00000000, 0xffffffff },
-		{ 0x0cb0, 0, 0x00000000, 0xffffffff },
-		{ 0x0cb4, 0, 0x00000000, 0xffffffff },
-		{ 0x0cb8, 0, 0x00000000, 0xffffffff },
-		{ 0x0cbc, 0, 0x00000000, 0xffffffff },
-		{ 0x0cc0, 0, 0x00000000, 0xffffffff },
-		{ 0x0cc4, 0, 0x00000000, 0xffffffff },
-		{ 0x0cc8, 0, 0x00000000, 0xffffffff },
-		{ 0x0ccc, 0, 0x00000000, 0xffffffff },
-		{ 0x0cd0, 0, 0x00000000, 0xffffffff },
-		{ 0x0cd4, 0, 0x00000000, 0xffffffff },
-		{ 0x0cd8, 0, 0x00000000, 0xffffffff },
-		{ 0x0cdc, 0, 0x00000000, 0xffffffff },
-		{ 0x0ce0, 0, 0x00000000, 0xffffffff },
-		{ 0x0ce4, 0, 0x00000000, 0xffffffff },
-		{ 0x0ce8, 0, 0x00000000, 0xffffffff },
-		{ 0x0cec, 0, 0x00000000, 0xffffffff },
-		{ 0x0cf0, 0, 0x00000000, 0xffffffff },
-		{ 0x0cf4, 0, 0x00000000, 0xffffffff },
-		{ 0x0cf8, 0, 0x00000000, 0xffffffff },
-		{ 0x0cfc, 0, 0x00000000, 0xffffffff },
-		{ 0x0d00, 0, 0x00000000, 0xffffffff },
-		{ 0x0d04, 0, 0x00000000, 0xffffffff },
 
 		{ 0x1000, 0, 0x00000000, 0x00000001 },
 		{ 0x1004, 0, 0x00000000, 0x000f0001 },
-		{ 0x1044, 0, 0x00000000, 0xffc003ff },
-		{ 0x1080, 0, 0x00000000, 0x0001ffff },
-		{ 0x1084, 0, 0x00000000, 0xffffffff },
-		{ 0x1088, 0, 0x00000000, 0xffffffff },
-		{ 0x108c, 0, 0x00000000, 0xffffffff },
-		{ 0x1090, 0, 0x00000000, 0xffffffff },
-		{ 0x1094, 0, 0x00000000, 0xffffffff },
-		{ 0x1098, 0, 0x00000000, 0xffffffff },
-		{ 0x109c, 0, 0x00000000, 0xffffffff },
-		{ 0x10a0, 0, 0x00000000, 0xffffffff },
 
 		{ 0x1408, 0, 0x01c00800, 0x00000000 },
 		{ 0x149c, 0, 0x8000ffff, 0x00000000 },
@@ -3585,111 +3520,9 @@ bnx2_test_registers(struct bnx2 *bp)
 		{ 0x14c4, 0, 0x00003fff, 0x00000000 },
 		{ 0x14cc, 0, 0x00000000, 0x00000001 },
 		{ 0x14d0, 0, 0xffffffff, 0x00000000 },
-		{ 0x1500, 0, 0x00000000, 0xffffffff },
-		{ 0x1504, 0, 0x00000000, 0xffffffff },
-		{ 0x1508, 0, 0x00000000, 0xffffffff },
-		{ 0x150c, 0, 0x00000000, 0xffffffff },
-		{ 0x1510, 0, 0x00000000, 0xffffffff },
-		{ 0x1514, 0, 0x00000000, 0xffffffff },
-		{ 0x1518, 0, 0x00000000, 0xffffffff },
-		{ 0x151c, 0, 0x00000000, 0xffffffff },
-		{ 0x1520, 0, 0x00000000, 0xffffffff },
-		{ 0x1524, 0, 0x00000000, 0xffffffff },
-		{ 0x1528, 0, 0x00000000, 0xffffffff },
-		{ 0x152c, 0, 0x00000000, 0xffffffff },
-		{ 0x1530, 0, 0x00000000, 0xffffffff },
-		{ 0x1534, 0, 0x00000000, 0xffffffff },
-		{ 0x1538, 0, 0x00000000, 0xffffffff },
-		{ 0x153c, 0, 0x00000000, 0xffffffff },
-		{ 0x1540, 0, 0x00000000, 0xffffffff },
-		{ 0x1544, 0, 0x00000000, 0xffffffff },
-		{ 0x1548, 0, 0x00000000, 0xffffffff },
-		{ 0x154c, 0, 0x00000000, 0xffffffff },
-		{ 0x1550, 0, 0x00000000, 0xffffffff },
-		{ 0x1554, 0, 0x00000000, 0xffffffff },
-		{ 0x1558, 0, 0x00000000, 0xffffffff },
-		{ 0x1600, 0, 0x00000000, 0xffffffff },
-		{ 0x1604, 0, 0x00000000, 0xffffffff },
-		{ 0x1608, 0, 0x00000000, 0xffffffff },
-		{ 0x160c, 0, 0x00000000, 0xffffffff },
-		{ 0x1610, 0, 0x00000000, 0xffffffff },
-		{ 0x1614, 0, 0x00000000, 0xffffffff },
-		{ 0x1618, 0, 0x00000000, 0xffffffff },
-		{ 0x161c, 0, 0x00000000, 0xffffffff },
-		{ 0x1620, 0, 0x00000000, 0xffffffff },
-		{ 0x1624, 0, 0x00000000, 0xffffffff },
-		{ 0x1628, 0, 0x00000000, 0xffffffff },
-		{ 0x162c, 0, 0x00000000, 0xffffffff },
-		{ 0x1630, 0, 0x00000000, 0xffffffff },
-		{ 0x1634, 0, 0x00000000, 0xffffffff },
-		{ 0x1638, 0, 0x00000000, 0xffffffff },
-		{ 0x163c, 0, 0x00000000, 0xffffffff },
-		{ 0x1640, 0, 0x00000000, 0xffffffff },
-		{ 0x1644, 0, 0x00000000, 0xffffffff },
-		{ 0x1648, 0, 0x00000000, 0xffffffff },
-		{ 0x164c, 0, 0x00000000, 0xffffffff },
-		{ 0x1650, 0, 0x00000000, 0xffffffff },
-		{ 0x1654, 0, 0x00000000, 0xffffffff },
 
 		{ 0x1800, 0, 0x00000000, 0x00000001 },
 		{ 0x1804, 0, 0x00000000, 0x00000003 },
-		{ 0x1840, 0, 0x00000000, 0xffffffff },
-		{ 0x1844, 0, 0x00000000, 0xffffffff },
-		{ 0x1848, 0, 0x00000000, 0xffffffff },
-		{ 0x184c, 0, 0x00000000, 0xffffffff },
-		{ 0x1850, 0, 0x00000000, 0xffffffff },
-		{ 0x1900, 0, 0x7ffbffff, 0x00000000 },
-		{ 0x1904, 0, 0xffffffff, 0x00000000 },
-		{ 0x190c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1914, 0, 0xffffffff, 0x00000000 },
-		{ 0x191c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1924, 0, 0xffffffff, 0x00000000 },
-		{ 0x192c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1934, 0, 0xffffffff, 0x00000000 },
-		{ 0x193c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1944, 0, 0xffffffff, 0x00000000 },
-		{ 0x194c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1954, 0, 0xffffffff, 0x00000000 },
-		{ 0x195c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1964, 0, 0xffffffff, 0x00000000 },
-		{ 0x196c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1974, 0, 0xffffffff, 0x00000000 },
-		{ 0x197c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1980, 0, 0x0700ffff, 0x00000000 },
-
-		{ 0x1c00, 0, 0x00000000, 0x00000001 },
-		{ 0x1c04, 0, 0x00000000, 0x00000003 },
-		{ 0x1c08, 0, 0x0000000f, 0x00000000 },
-		{ 0x1c40, 0, 0x00000000, 0xffffffff },
-		{ 0x1c44, 0, 0x00000000, 0xffffffff },
-		{ 0x1c48, 0, 0x00000000, 0xffffffff },
-		{ 0x1c4c, 0, 0x00000000, 0xffffffff },
-		{ 0x1c50, 0, 0x00000000, 0xffffffff },
-		{ 0x1d00, 0, 0x7ffbffff, 0x00000000 },
-		{ 0x1d04, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d0c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d14, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d1c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d24, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d2c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d34, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d3c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d44, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d4c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d54, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d5c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d64, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d6c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d74, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d7c, 0, 0xffffffff, 0x00000000 },
-		{ 0x1d80, 0, 0x0700ffff, 0x00000000 },
-
-		{ 0x2004, 0, 0x00000000, 0x0337000f },
-		{ 0x2008, 0, 0xffffffff, 0x00000000 },
-		{ 0x200c, 0, 0xffffffff, 0x00000000 },
-		{ 0x2010, 0, 0xffffffff, 0x00000000 },
-		{ 0x2014, 0, 0x801fff80, 0x00000000 },
-		{ 0x2018, 0, 0x000003ff, 0x00000000 },
 
 		{ 0x2800, 0, 0x00000000, 0x00000001 },
 		{ 0x2804, 0, 0x00000000, 0x00003f01 },
@@ -3707,16 +3540,6 @@ bnx2_test_registers(struct bnx2 *bp)
 		{ 0x2c00, 0, 0x00000000, 0x00000011 },
 		{ 0x2c04, 0, 0x00000000, 0x00030007 },
 
-		{ 0x3000, 0, 0x00000000, 0x00000001 },
-		{ 0x3004, 0, 0x00000000, 0x007007ff },
-		{ 0x3008, 0, 0x00000003, 0x00000000 },
-		{ 0x300c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3010, 0, 0xffffffff, 0x00000000 },
-		{ 0x3014, 0, 0xffffffff, 0x00000000 },
-		{ 0x3034, 0, 0xffffffff, 0x00000000 },
-		{ 0x3038, 0, 0xffffffff, 0x00000000 },
-		{ 0x3050, 0, 0x00000001, 0x00000000 },
-
 		{ 0x3c00, 0, 0x00000000, 0x00000001 },
 		{ 0x3c04, 0, 0x00000000, 0x00070000 },
 		{ 0x3c08, 0, 0x00007f71, 0x07f00000 },
@@ -3726,88 +3549,11 @@ bnx2_test_registers(struct bnx2 *bp)
 		{ 0x3c18, 0, 0x00000000, 0xffffffff },
 		{ 0x3c1c, 0, 0xfffff000, 0x00000000 },
 		{ 0x3c20, 0, 0xffffff00, 0x00000000 },
-		{ 0x3c24, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c28, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c2c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c30, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c34, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c38, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c3c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c40, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c44, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c48, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c4c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c50, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c54, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c58, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c5c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c60, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c64, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c68, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c6c, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c70, 0, 0xffffffff, 0x00000000 },
-		{ 0x3c74, 0, 0x0000003f, 0x00000000 },
-		{ 0x3c78, 0, 0x00000000, 0x00000000 },
-		{ 0x3c7c, 0, 0x00000000, 0x00000000 },
-		{ 0x3c80, 0, 0x3fffffff, 0x00000000 },
-		{ 0x3c84, 0, 0x0000003f, 0x00000000 },
-		{ 0x3c88, 0, 0x00000000, 0xffffffff },
-		{ 0x3c8c, 0, 0x00000000, 0xffffffff },
-
-		{ 0x4000, 0, 0x00000000, 0x00000001 },
-		{ 0x4004, 0, 0x00000000, 0x00030000 },
-		{ 0x4008, 0, 0x00000ff0, 0x00000000 },
-		{ 0x400c, 0, 0xffffffff, 0x00000000 },
-		{ 0x4088, 0, 0x00000000, 0x00070303 },
-
-		{ 0x4400, 0, 0x00000000, 0x00000001 },
-		{ 0x4404, 0, 0x00000000, 0x00003f01 },
-		{ 0x4408, 0, 0x7fff00ff, 0x00000000 },
-		{ 0x440c, 0, 0xffffffff, 0x00000000 },
-		{ 0x4410, 0, 0xffff,     0x0000 },
-		{ 0x4414, 0, 0xffff,     0x0000 },
-		{ 0x4418, 0, 0xffff,     0x0000 },
-		{ 0x441c, 0, 0xffff,     0x0000 },
-		{ 0x4428, 0, 0xffffffff, 0x00000000 },
-		{ 0x442c, 0, 0xffffffff, 0x00000000 },
-		{ 0x4430, 0, 0xffffffff, 0x00000000 },
-		{ 0x4434, 0, 0xffffffff, 0x00000000 },
-		{ 0x4438, 0, 0xffffffff, 0x00000000 },
-		{ 0x443c, 0, 0xffffffff, 0x00000000 },
-		{ 0x4440, 0, 0xffffffff, 0x00000000 },
-		{ 0x4444, 0, 0xffffffff, 0x00000000 },
-
-		{ 0x4c00, 0, 0x00000000, 0x00000001 },
-		{ 0x4c04, 0, 0x00000000, 0x0000003f },
-		{ 0x4c08, 0, 0xffffffff, 0x00000000 },
-		{ 0x4c0c, 0, 0x0007fc00, 0x00000000 },
-		{ 0x4c10, 0, 0x80003fe0, 0x00000000 },
-		{ 0x4c14, 0, 0xffffffff, 0x00000000 },
-		{ 0x4c44, 0, 0x00000000, 0x9fff9fff },
-		{ 0x4c48, 0, 0x00000000, 0xb3009fff },
-		{ 0x4c4c, 0, 0x00000000, 0x77f33b30 },
-		{ 0x4c50, 0, 0x00000000, 0xffffffff },
 
 		{ 0x5004, 0, 0x00000000, 0x0000007f },
 		{ 0x5008, 0, 0x0f0007ff, 0x00000000 },
 		{ 0x500c, 0, 0xf800f800, 0x07ff07ff },
 
-		{ 0x5400, 0, 0x00000008, 0x00000001 },
-		{ 0x5404, 0, 0x00000000, 0x0000003f },
-		{ 0x5408, 0, 0x0000001f, 0x00000000 },
-		{ 0x540c, 0, 0xffffffff, 0x00000000 },
-		{ 0x5410, 0, 0xffffffff, 0x00000000 },
-		{ 0x5414, 0, 0x0000ffff, 0x00000000 },
-		{ 0x5418, 0, 0x0000ffff, 0x00000000 },
-		{ 0x541c, 0, 0x0000ffff, 0x00000000 },
-		{ 0x5420, 0, 0x0000ffff, 0x00000000 },
-		{ 0x5428, 0, 0x000000ff, 0x00000000 },
-		{ 0x542c, 0, 0xff00ffff, 0x00000000 },
-		{ 0x5430, 0, 0x001fff80, 0x00000000 },
-		{ 0x5438, 0, 0xffffffff, 0x00000000 },
-		{ 0x543c, 0, 0xffffffff, 0x00000000 },
-		{ 0x5440, 0, 0xf800f800, 0x07ff07ff },
-
 		{ 0x5c00, 0, 0x00000000, 0x00000001 },
 		{ 0x5c04, 0, 0x00000000, 0x0003000f },
 		{ 0x5c08, 0, 0x00000003, 0x00000000 },
---
0.99.8.GIT


--- NEW FILE 4434-BNX2-Add-ethtool-d-support.txt ---
Subject: [PATCH] [BNX2]: Add ethtool -d support
From: Michael Chan <mchan at broadcom.com>
Date: 1139191735 -0800

Add ETHTOOL_GREGS support.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

applies-to: 7c17b9209e73524acf965bdf0fd9d08fe799d03f
b97f7e16ec6dc5f9e054845c3e808abe4ad35d9b
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index af80b04..7560893 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -4540,6 +4540,64 @@ bnx2_get_drvinfo(struct net_device *dev,
 	info->fw_version[5] = 0;
 }
 
+#define BNX2_REGDUMP_LEN		(32 * 1024)
+
+static int
+bnx2_get_regs_len(struct net_device *dev)
+{
+	return BNX2_REGDUMP_LEN;
+}
+
+static void
+bnx2_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
+{
+	u32 *p = _p, i, offset;
+	u8 *orig_p = _p;
+	struct bnx2 *bp = netdev_priv(dev);
+	u32 reg_boundaries[] = { 0x0000, 0x0098, 0x0400, 0x045c,
+				 0x0800, 0x0880, 0x0c00, 0x0c10,
+				 0x0c30, 0x0d08, 0x1000, 0x101c,
+				 0x1040, 0x1048, 0x1080, 0x10a4,
+				 0x1400, 0x1490, 0x1498, 0x14f0,
+				 0x1500, 0x155c, 0x1580, 0x15dc,
+				 0x1600, 0x1658, 0x1680, 0x16d8,
+				 0x1800, 0x1820, 0x1840, 0x1854,
+				 0x1880, 0x1894, 0x1900, 0x1984,
+				 0x1c00, 0x1c0c, 0x1c40, 0x1c54,
+				 0x1c80, 0x1c94, 0x1d00, 0x1d84,
+				 0x2000, 0x2030, 0x23c0, 0x2400,
+				 0x2800, 0x2820, 0x2830, 0x2850,
+				 0x2b40, 0x2c10, 0x2fc0, 0x3058,
+				 0x3c00, 0x3c94, 0x4000, 0x4010,
+				 0x4080, 0x4090, 0x43c0, 0x4458,
+				 0x4c00, 0x4c18, 0x4c40, 0x4c54,
+				 0x4fc0, 0x5010, 0x53c0, 0x5444,
+				 0x5c00, 0x5c18, 0x5c80, 0x5c90,
+				 0x5fc0, 0x6000, 0x6400, 0x6428,
+				 0x6800, 0x6848, 0x684c, 0x6860,
+				 0x6888, 0x6910, 0x8000 };
+
+	regs->version = 0;
+
+	memset(p, 0, BNX2_REGDUMP_LEN);
+
+	if (!netif_running(bp->dev))
+		return;
+
+	i = 0;
+	offset = reg_boundaries[0];
+	p += offset;
+	while (offset < BNX2_REGDUMP_LEN) {
+		*p++ = REG_RD(bp, offset);
+		offset += 4;
+		if (offset == reg_boundaries[i + 1]) {
+			offset = reg_boundaries[i + 2];
+			p = (u32 *) (orig_p + offset);
+			i += 2;
+		}
+	}
+}
+
 static void
 bnx2_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
@@ -5106,6 +5164,8 @@ static struct ethtool_ops bnx2_ethtool_o
 	.get_settings		= bnx2_get_settings,
 	.set_settings		= bnx2_set_settings,
 	.get_drvinfo		= bnx2_get_drvinfo,
+	.get_regs_len		= bnx2_get_regs_len,
+	.get_regs		= bnx2_get_regs,
 	.get_wol		= bnx2_get_wol,
 	.set_wol		= bnx2_set_wol,
 	.nway_reset		= bnx2_nway_reset,
---
0.99.8.GIT


--- NEW FILE 4435-BNX2-Fix-bug-when-rx-ring-is-full.txt ---
Subject: [PATCH] [BNX2]: Fix bug when rx ring is full
From: Michael Chan <mchan at broadcom.com>
Date: 1139191769 -0800

Fix the rx code path that does not handle the full rx ring correctly.

When the rx ring is set to the max. size (i.e. 255), the consumer and
producer indices will be the same when completing an rx packet. Fix
the rx code to handle this condition properly.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)

applies-to: c619ea4fae8f34993ed8e8f9c7b23e3370d6d75e
f01eb69fb4843a13ced4c389ace4fe12b4ebc6d8
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7560893..27ad2f7 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1656,23 +1656,30 @@ static inline void
 bnx2_reuse_rx_skb(struct bnx2 *bp, struct sk_buff *skb,
 	u16 cons, u16 prod)
 {
-	struct sw_bd *cons_rx_buf = &bp->rx_buf_ring[cons];
-	struct sw_bd *prod_rx_buf = &bp->rx_buf_ring[prod];
-	struct rx_bd *cons_bd = &bp->rx_desc_ring[cons];
-	struct rx_bd *prod_bd = &bp->rx_desc_ring[prod];
+	struct sw_bd *cons_rx_buf, *prod_rx_buf;
+	struct rx_bd *cons_bd, *prod_bd;
+
+	cons_rx_buf = &bp->rx_buf_ring[cons];
+	prod_rx_buf = &bp->rx_buf_ring[prod];
 
 	pci_dma_sync_single_for_device(bp->pdev,
 		pci_unmap_addr(cons_rx_buf, mapping),
 		bp->rx_offset + RX_COPY_THRESH, PCI_DMA_FROMDEVICE);
 
-	prod_rx_buf->skb = cons_rx_buf->skb;
-	pci_unmap_addr_set(prod_rx_buf, mapping,
-			pci_unmap_addr(cons_rx_buf, mapping));
+	bp->rx_prod_bseq += bp->rx_buf_use_size;
 
-	memcpy(prod_bd, cons_bd, 8);
+	prod_rx_buf->skb = skb;
 
-	bp->rx_prod_bseq += bp->rx_buf_use_size;
+	if (cons == prod)
+		return;
 
+	pci_unmap_addr_set(prod_rx_buf, mapping,
+			pci_unmap_addr(cons_rx_buf, mapping));
+
+	cons_bd = &bp->rx_desc_ring[cons];
+	prod_bd = &bp->rx_desc_ring[prod];
+	prod_bd->rx_bd_haddr_hi = cons_bd->rx_bd_haddr_hi;
+	prod_bd->rx_bd_haddr_lo = cons_bd->rx_bd_haddr_lo;
 }
 
 static int
@@ -1699,14 +1706,19 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
 		u32 status;
 		struct sw_bd *rx_buf;
 		struct sk_buff *skb;
+		dma_addr_t dma_addr;
 
 		sw_ring_cons = RX_RING_IDX(sw_cons);
 		sw_ring_prod = RX_RING_IDX(sw_prod);
 
 		rx_buf = &bp->rx_buf_ring[sw_ring_cons];
 		skb = rx_buf->skb;
-		pci_dma_sync_single_for_cpu(bp->pdev,
-			pci_unmap_addr(rx_buf, mapping),
+
+		rx_buf->skb = NULL;
+
+		dma_addr = pci_unmap_addr(rx_buf, mapping);
+
+		pci_dma_sync_single_for_cpu(bp->pdev, dma_addr,
 			bp->rx_offset + RX_COPY_THRESH, PCI_DMA_FROMDEVICE);
 
 		rx_hdr = (struct l2_fhdr *) skb->data;
@@ -1747,8 +1759,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
 			skb = new_skb;
 		}
 		else if (bnx2_alloc_rx_skb(bp, sw_ring_prod) == 0) {
-			pci_unmap_single(bp->pdev,
-				pci_unmap_addr(rx_buf, mapping),
+			pci_unmap_single(bp->pdev, dma_addr,
 				bp->rx_buf_use_size, PCI_DMA_FROMDEVICE);
 
 			skb_reserve(skb, bp->rx_offset);
@@ -1794,8 +1805,6 @@ reuse_rx:
 		rx_pkt++;
 
 next_rx:
-		rx_buf->skb = NULL;
-
 		sw_cons = NEXT_RX_BD(sw_cons);
 		sw_prod = NEXT_RX_BD(sw_prod);
 
@@ -3360,7 +3369,7 @@ bnx2_init_rx_ring(struct bnx2 *bp)
 	val = (u64) bp->rx_desc_mapping & 0xffffffff;
 	CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_NX_BDHADDR_LO, val);
 
-	for ( ;ring_prod < bp->rx_ring_size; ) {
+	for (i = 0; i < bp->rx_ring_size; i++) {
 		if (bnx2_alloc_rx_skb(bp, ring_prod) < 0) {
 			break;
 		}
---
0.99.8.GIT


--- NEW FILE 4436-BNX2-Support-larger-rx-ring-sizes-part-1.txt ---
Subject: [PATCH] [BNX2]: Support larger rx ring sizes (part 1)
From: Michael Chan <mchan at broadcom.com>
Date: 1139191801 -0800

Increase maximum receive ring size from 255 to 1020 by supporting
up to 4 linked pages of receive descriptors. To accomodate the
higher memory usage, each physical descriptor page is allocated
separately and the software ring that keeps track of the SKBs and the
DMA addresses is allocated using vmalloc.

Some of the receive-related fields in the bp structure are re-
organized a bit for better locality of reference.

The max. was reduced to 1020 from 4080 after discussion with David
Miller.

This patch contains ring init code changes only. This next patch
contains rx data path code changes.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |  115 ++++++++++++++++++++++++++++++++++++++--------------
 drivers/net/bnx2.h |   36 ++++++++++------
 2 files changed, 106 insertions(+), 45 deletions(-)

applies-to: f1bb5f17fc96397fd40b94a2e59f9412bf75ce10
66c19fb0b2af2bcf6f5d12767531201ad7c45413
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 27ad2f7..547c491 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -360,6 +360,8 @@ bnx2_netif_start(struct bnx2 *bp)
 static void
 bnx2_free_mem(struct bnx2 *bp)
 {
+	int i;
+
 	if (bp->stats_blk) {
 		pci_free_consistent(bp->pdev, sizeof(struct statistics_block),
 				    bp->stats_blk, bp->stats_blk_mapping);
@@ -378,19 +380,23 @@ bnx2_free_mem(struct bnx2 *bp)
 	}
 	kfree(bp->tx_buf_ring);
 	bp->tx_buf_ring = NULL;
-	if (bp->rx_desc_ring) {
-		pci_free_consistent(bp->pdev,
-				    sizeof(struct rx_bd) * RX_DESC_CNT,
-				    bp->rx_desc_ring, bp->rx_desc_mapping);
-		bp->rx_desc_ring = NULL;
+	for (i = 0; i < bp->rx_max_ring; i++) {
+		if (bp->rx_desc_ring[i])
+			pci_free_consistent(bp->pdev,
+					    sizeof(struct rx_bd) * RX_DESC_CNT,
+					    bp->rx_desc_ring[i],
+					    bp->rx_desc_mapping[i]);
+		bp->rx_desc_ring[i] = NULL;
 	}
-	kfree(bp->rx_buf_ring);
+	vfree(bp->rx_buf_ring);
 	bp->rx_buf_ring = NULL;
 }
 
 static int
 bnx2_alloc_mem(struct bnx2 *bp)
 {
+	int i;
+
 	bp->tx_buf_ring = kmalloc(sizeof(struct sw_bd) * TX_DESC_CNT,
 				     GFP_KERNEL);
 	if (bp->tx_buf_ring == NULL)
@@ -404,18 +410,23 @@ bnx2_alloc_mem(struct bnx2 *bp)
 	if (bp->tx_desc_ring == NULL)
 		goto alloc_mem_err;
 
-	bp->rx_buf_ring = kmalloc(sizeof(struct sw_bd) * RX_DESC_CNT,
-				     GFP_KERNEL);
+	bp->rx_buf_ring = vmalloc(sizeof(struct sw_bd) * RX_DESC_CNT *
+				  bp->rx_max_ring);
 	if (bp->rx_buf_ring == NULL)
 		goto alloc_mem_err;
 
-	memset(bp->rx_buf_ring, 0, sizeof(struct sw_bd) * RX_DESC_CNT);
-	bp->rx_desc_ring = pci_alloc_consistent(bp->pdev,
-					        sizeof(struct rx_bd) *
-						RX_DESC_CNT,
-						&bp->rx_desc_mapping);
-	if (bp->rx_desc_ring == NULL)
-		goto alloc_mem_err;
+	memset(bp->rx_buf_ring, 0, sizeof(struct sw_bd) * RX_DESC_CNT *
+				   bp->rx_max_ring);
+
+	for (i = 0; i < bp->rx_max_ring; i++) {
+		bp->rx_desc_ring[i] =
+			pci_alloc_consistent(bp->pdev,
+					     sizeof(struct rx_bd) * RX_DESC_CNT,
+					     &bp->rx_desc_mapping[i]);
+		if (bp->rx_desc_ring[i] == NULL)
+			goto alloc_mem_err;
+
+	}
 
 	bp->status_blk = pci_alloc_consistent(bp->pdev,
 					      sizeof(struct status_block),
@@ -1520,7 +1531,7 @@ bnx2_alloc_rx_skb(struct bnx2 *bp, u16 i
 	struct sk_buff *skb;
 	struct sw_bd *rx_buf = &bp->rx_buf_ring[index];
 	dma_addr_t mapping;
-	struct rx_bd *rxbd = &bp->rx_desc_ring[index];
+	struct rx_bd *rxbd = &bp->rx_desc_ring[RX_RING(index)][RX_IDX(index)];
 	unsigned long align;
 
 	skb = dev_alloc_skb(bp->rx_buf_size);
@@ -3349,24 +3360,32 @@ bnx2_init_rx_ring(struct bnx2 *bp)
 	bp->hw_rx_cons = 0;
 	bp->rx_prod_bseq = 0;
 		
-	rxbd = &bp->rx_desc_ring[0];
-	for (i = 0; i < MAX_RX_DESC_CNT; i++, rxbd++) {
-		rxbd->rx_bd_len = bp->rx_buf_use_size;
-		rxbd->rx_bd_flags = RX_BD_FLAGS_START | RX_BD_FLAGS_END;
-	}
+	for (i = 0; i < bp->rx_max_ring; i++) {
+		int j;
 
-	rxbd->rx_bd_haddr_hi = (u64) bp->rx_desc_mapping >> 32;
-	rxbd->rx_bd_haddr_lo = (u64) bp->rx_desc_mapping & 0xffffffff;
+		rxbd = &bp->rx_desc_ring[i][0];
+		for (j = 0; j < MAX_RX_DESC_CNT; j++, rxbd++) {
+			rxbd->rx_bd_len = bp->rx_buf_use_size;
+			rxbd->rx_bd_flags = RX_BD_FLAGS_START | RX_BD_FLAGS_END;
+		}
+		if (i == (bp->rx_max_ring - 1))
+			j = 0;
+		else
+			j = i + 1;
+		rxbd->rx_bd_haddr_hi = (u64) bp->rx_desc_mapping[j] >> 32;
+		rxbd->rx_bd_haddr_lo = (u64) bp->rx_desc_mapping[j] &
+				       0xffffffff;
+	}
 
 	val = BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE;
 	val |= BNX2_L2CTX_CTX_TYPE_SIZE_L2;
 	val |= 0x02 << 8;
 	CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_CTX_TYPE, val);
 
-	val = (u64) bp->rx_desc_mapping >> 32;
+	val = (u64) bp->rx_desc_mapping[0] >> 32;
 	CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_NX_BDHADDR_HI, val);
 
-	val = (u64) bp->rx_desc_mapping & 0xffffffff;
+	val = (u64) bp->rx_desc_mapping[0] & 0xffffffff;
 	CTX_WR(bp, GET_CID_ADDR(RX_CID), BNX2_L2CTX_NX_BDHADDR_LO, val);
 
 	for (i = 0; i < bp->rx_ring_size; i++) {
@@ -3384,6 +3403,29 @@ bnx2_init_rx_ring(struct bnx2 *bp)
 }
 
 static void
+bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size)
+{
+	u32 num_rings, max;
+
+	bp->rx_ring_size = size;
+	num_rings = 1;
+	while (size > MAX_RX_DESC_CNT) {
+		size -= MAX_RX_DESC_CNT;
+		num_rings++;
+	}
+	/* round to next power of 2 */
+	max = MAX_RX_RINGS;
+	while ((max & num_rings) == 0)
+		max >>= 1;
+
+	if (num_rings != max)
+		max <<= 1;
+
+	bp->rx_max_ring = max;
+	bp->rx_max_ring_idx = (bp->rx_max_ring * RX_DESC_CNT) - 1;
+}
+
+static void
 bnx2_free_tx_skbs(struct bnx2 *bp)
 {
 	int i;
@@ -3428,7 +3470,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
 	if (bp->rx_buf_ring == NULL)
 		return;
 
-	for (i = 0; i < RX_DESC_CNT; i++) {
+	for (i = 0; i < bp->rx_max_ring_idx; i++) {
 		struct sw_bd *rx_buf = &bp->rx_buf_ring[i];
 		struct sk_buff *skb = rx_buf->skb;
 
@@ -4792,7 +4834,7 @@ bnx2_get_ringparam(struct net_device *de
 {
 	struct bnx2 *bp = netdev_priv(dev);
 
-	ering->rx_max_pending = MAX_RX_DESC_CNT;
+	ering->rx_max_pending = MAX_TOTAL_RX_DESC_CNT;
 	ering->rx_mini_max_pending = 0;
 	ering->rx_jumbo_max_pending = 0;
 
@@ -4809,17 +4851,28 @@ bnx2_set_ringparam(struct net_device *de
 {
 	struct bnx2 *bp = netdev_priv(dev);
 
-	if ((ering->rx_pending > MAX_RX_DESC_CNT) ||
+	if ((ering->rx_pending > MAX_TOTAL_RX_DESC_CNT) ||
 		(ering->tx_pending > MAX_TX_DESC_CNT) ||
 		(ering->tx_pending <= MAX_SKB_FRAGS)) {
 
 		return -EINVAL;
 	}
-	bp->rx_ring_size = ering->rx_pending;
+	if (netif_running(bp->dev)) {
+		bnx2_netif_stop(bp);
+		bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET);
+		bnx2_free_skbs(bp);
+		bnx2_free_mem(bp);
+	}
+
+	bnx2_set_rx_ring_size(bp, ering->rx_pending);
 	bp->tx_ring_size = ering->tx_pending;
 
 	if (netif_running(bp->dev)) {
-		bnx2_netif_stop(bp);
+		int rc;
+
+		rc = bnx2_alloc_mem(bp);
+		if (rc)
+			return rc;
 		bnx2_init_nic(bp);
 		bnx2_netif_start(bp);
 	}
@@ -5493,7 +5546,7 @@ bnx2_init_board(struct pci_dev *pdev, st
 	bp->mac_addr[5] = (u8) reg;
 
 	bp->tx_ring_size = MAX_TX_DESC_CNT;
-	bp->rx_ring_size = 100;
+	bnx2_set_rx_ring_size(bp, 100);
 
 	bp->rx_csum = 1;
 
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 9f691cb..beb2e8b 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -3792,8 +3792,10 @@ struct l2_fhdr {
 #define TX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct tx_bd))
 #define MAX_TX_DESC_CNT (TX_DESC_CNT - 1)
 
+#define MAX_RX_RINGS	4
 #define RX_DESC_CNT  (BCM_PAGE_SIZE / sizeof(struct rx_bd))
 #define MAX_RX_DESC_CNT (RX_DESC_CNT - 1)
+#define MAX_TOTAL_RX_DESC_CNT (MAX_RX_DESC_CNT * MAX_RX_RINGS)
 
 #define NEXT_TX_BD(x) (((x) & (MAX_TX_DESC_CNT - 1)) ==			\
 		(MAX_TX_DESC_CNT - 1)) ?				\
@@ -3805,8 +3807,10 @@ struct l2_fhdr {
 		(MAX_RX_DESC_CNT - 1)) ?				\
 	(x) + 2 : (x) + 1
 
-#define RX_RING_IDX(x) ((x) & MAX_RX_DESC_CNT)
+#define RX_RING_IDX(x) ((x) & bp->rx_max_ring_idx)
 
+#define RX_RING(x) (((x) & ~MAX_RX_DESC_CNT) >> 8)
+#define RX_IDX(x) ((x) & MAX_RX_DESC_CNT)
 
 /* Context size. */
 #define CTX_SHIFT                   7
@@ -3903,6 +3907,15 @@ struct bnx2 {
 	struct status_block	*status_blk;
 	u32 			last_status_idx;
 
+	u32			flags;
+#define PCIX_FLAG			1
+#define PCI_32BIT_FLAG			2
+#define ONE_TDMA_FLAG			4	/* no longer used */
+#define NO_WOL_FLAG			8
+#define USING_DAC_FLAG			0x10
+#define USING_MSI_FLAG			0x20
+#define ASF_ENABLE_FLAG			0x40
+
 	struct tx_bd		*tx_desc_ring;
 	struct sw_bd		*tx_buf_ring;
 	u32			tx_prod_bseq;
@@ -3920,19 +3933,22 @@ struct bnx2 {
 	u32			rx_offset;
 	u32			rx_buf_use_size;	/* useable size */
 	u32			rx_buf_size;		/* with alignment */
-	struct rx_bd		*rx_desc_ring;
-	struct sw_bd		*rx_buf_ring;
+	u32			rx_max_ring_idx;
+
 	u32			rx_prod_bseq;
 	u16			rx_prod;
 	u16			rx_cons;
 
 	u32			rx_csum;
 
+	struct sw_bd		*rx_buf_ring;
+	struct rx_bd		*rx_desc_ring[MAX_RX_RINGS];
+
 	/* Only used to synchronize netif_stop_queue/wake_queue when tx */
 	/* ring is full */
 	spinlock_t		tx_lock;
 
-	/* End of fileds used in the performance code paths. */
+	/* End of fields used in the performance code paths. */
 
 	char			*name;
 
@@ -3945,15 +3961,6 @@ struct bnx2 {
 	/* Used to synchronize phy accesses. */
 	spinlock_t		phy_lock;
 
-	u32			flags;
-#define PCIX_FLAG			1
-#define PCI_32BIT_FLAG			2
-#define ONE_TDMA_FLAG			4	/* no longer used */
-#define NO_WOL_FLAG			8
-#define USING_DAC_FLAG			0x10
-#define USING_MSI_FLAG			0x20
-#define ASF_ENABLE_FLAG			0x40
-
 	u32			phy_flags;
 #define PHY_SERDES_FLAG			1
 #define PHY_CRC_FIX_FLAG		2
@@ -4004,8 +4011,9 @@ struct bnx2 {
 	dma_addr_t		tx_desc_mapping;
 
 
+	int			rx_max_ring;
 	int			rx_ring_size;
-	dma_addr_t		rx_desc_mapping;
+	dma_addr_t		rx_desc_mapping[MAX_RX_RINGS];
 
 	u16			tx_quick_cons_trip;
 	u16			tx_quick_cons_trip_int;
---
0.99.8.GIT


--- NEW FILE 4437-BNX2-Support-larger-rx-ring-sizes-part-2.txt ---
Subject: [PATCH] [BNX2]: Support larger rx ring sizes (part 2)
From: Michael Chan <mchan at broadcom.com>
Date: 1139191829 -0800

Support bigger rx ring sizes (up to 1020) in the rx fast path.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 0b82312a8165b021ce66a4ded23acc6e5b63ffab
1757bf951cc7bf8b570c442529aed666f01ae936
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 547c491..ee9f58f 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -1687,8 +1687,8 @@ bnx2_reuse_rx_skb(struct bnx2 *bp, struc
 	pci_unmap_addr_set(prod_rx_buf, mapping,
 			pci_unmap_addr(cons_rx_buf, mapping));
 
-	cons_bd = &bp->rx_desc_ring[cons];
-	prod_bd = &bp->rx_desc_ring[prod];
+	cons_bd = &bp->rx_desc_ring[RX_RING(cons)][RX_IDX(cons)];
+	prod_bd = &bp->rx_desc_ring[RX_RING(prod)][RX_IDX(prod)];
 	prod_bd->rx_bd_haddr_hi = cons_bd->rx_bd_haddr_hi;
 	prod_bd->rx_bd_haddr_lo = cons_bd->rx_bd_haddr_lo;
 }
---
0.99.8.GIT


--- NEW FILE 4438-BNX2-Update-version.txt ---
Subject: [PATCH] [BNX2]: Update version
From: Michael Chan <mchan at broadcom.com>
Date: 1139191856 -0800

Update version to 1.4.37.

Add missing flush_scheduled_work() in bnx2_suspend as noted by Jeff
Garzik.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

applies-to: afb869210d5a64bb59aa03ef650bb5b35c26c5f7
02eaa3d3c84eeac4c22b79a930aff0a22a0a472e
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ee9f58f..630281b 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -14,8 +14,8 @@
 
 #define DRV_MODULE_NAME		"bnx2"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"1.4.31"
-#define DRV_MODULE_RELDATE	"January 19, 2006"
+#define DRV_MODULE_VERSION	"1.4.37"
+#define DRV_MODULE_RELDATE	"February 1, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -5765,6 +5765,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_me
 	if (!netif_running(dev))
 		return 0;
 
+	flush_scheduled_work();
 	bnx2_netif_stop(bp);
 	netif_device_detach(dev);
 	del_timer_sync(&bp->timer);
---
0.99.8.GIT


--- NEW FILE 4439-PPP-Fixed-hardware-RX-checksum-handling.txt ---
Subject: [PATCH] [PPP]: Fixed hardware RX checksum handling
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1139199813 -0800

When we pull the PPP protocol off the skb, we forgot to update the
hardware RX checksum.  This may lead to messages such as

	dsl0: hw csum failure.

Similarly, we need to clear the hardware checksum flag when we use
the existing packet to store the decompressed result.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/ppp_generic.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

applies-to: baaa6598d79f94decad1d29857b5fcbfaea20d97
e3f749c4af69c4344d89f11e2293e3790eb4eaca
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 1c6d328..0245e40 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp,
 		}
 		else if (!pskb_may_pull(skb, skb->len))
 			goto err;
+		else
+			skb->ip_summed = CHECKSUM_NONE;
 
 		len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
 		if (len <= 0) {
@@ -1690,6 +1692,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp,
 			kfree_skb(skb);
 		} else {
 			skb_pull(skb, 2);	/* chop off protocol */
+			skb_postpull_rcsum(skb, skb->data - 2, 2);
 			skb->dev = ppp->dev;
 			skb->protocol = htons(npindex_to_ethertype[npi]);
 			skb->mac.raw = skb->data;
---
0.99.8.GIT


--- NEW FILE 4440-TCP-MTU-probing.txt ---
Subject: [PATCH] [TCP]: MTU probing
From: John Heffner <jheffner at psc.edu>
Date: 1139206493 -0800

Implementation of packetization layer path mtu discovery for TCP, based on
the internet-draft currently found at
<http://www.ietf.org/internet-drafts/draft-ietf-pmtud-method-05.txt>.

Signed-off-by: John Heffner <jheffner at psc.edu>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/linux/sysctl.h             |    2 
 include/net/inet_connection_sock.h |   13 ++
 include/net/tcp.h                  |    9 +
 net/ipv4/sysctl_net_ipv4.c         |   16 ++
 net/ipv4/tcp_input.c               |   49 +++++++
 net/ipv4/tcp_ipv4.c                |    1 
 net/ipv4/tcp_output.c              |  240 +++++++++++++++++++++++++++++++++---
 net/ipv4/tcp_timer.c               |   36 ++---
 net/ipv6/tcp_ipv6.c                |    1 
 9 files changed, 328 insertions(+), 39 deletions(-)

applies-to: 6c837d355efca7716fed7907ecb89d1114d3c68b
55bb045aa49d5e5234c6213d1ed0bfef0c636971
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 1afe3ba..8f3fb04 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -395,6 +395,8 @@ enum
 	NET_TCP_CONG_CONTROL=110,
 	NET_TCP_ABC=111,
 	NET_IPV4_IPFRAG_MAX_DIST=112,
+ 	NET_TCP_MTU_PROBING=113,
+	NET_TCP_BASE_MSS=114,
 };
 
 enum {
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index fa587c9..103e9a1 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -72,6 +72,7 @@ struct inet_connection_sock_af_ops {
  * @icsk_probes_out:	   unanswered 0 window probes
  * @icsk_ext_hdr_len:	   Network protocol overhead (IP/IPv6 options)
  * @icsk_ack:		   Delayed ACK control data
+ * @icsk_mtup;		   MTU probing control data
  */
 struct inet_connection_sock {
 	/* inet_sock has to be the first member! */
@@ -104,6 +105,18 @@ struct inet_connection_sock {
 		__u16		  last_seg_size; /* Size of last incoming segment	   */
 		__u16		  rcv_mss;	 /* MSS used for delayed ACK decisions	   */ 
 	} icsk_ack;
+	struct {
+		int		  enabled;
+		
+		/* Range of MTUs to search */
+		int		  search_high;
+		int		  search_low;
+		
+		/* Information on the current probe. */
+		int		  probe_size;
+		__u32		  probe_seq_start;
+		__u32		  probe_seq_end;
+	} icsk_mtup;
 	u32			  icsk_ca_priv[16];
 #define ICSK_CA_PRIV_SIZE	(16 * sizeof(u32))
 };
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 77f21c6..16879fa 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -60,6 +60,9 @@ extern void tcp_time_wait(struct sock *s
 /* Minimal RCV_MSS. */
 #define TCP_MIN_RCVMSS		536U
 
+/* The least MTU to use for probing */
+#define TCP_BASE_MSS		512
+
 /* After receiving this amount of duplicate ACKs fast retransmit starts. */
 #define TCP_FASTRETRANS_THRESH 3
 
@@ -219,6 +222,8 @@ extern int sysctl_tcp_nometrics_save;
 extern int sysctl_tcp_moderate_rcvbuf;
 extern int sysctl_tcp_tso_win_divisor;
 extern int sysctl_tcp_abc;
+extern int sysctl_tcp_mtu_probing;
+extern int sysctl_tcp_base_mss;
 
 extern atomic_t tcp_memory_allocated;
 extern atomic_t tcp_sockets_allocated;
@@ -447,6 +452,10 @@ extern int tcp_read_sock(struct sock *sk
 
 extern void tcp_initialize_rcv_mss(struct sock *sk);
 
+extern int tcp_mtu_to_mss(struct sock *sk, int pmtu);
+extern int tcp_mss_to_mtu(struct sock *sk, int mss);
+extern void tcp_mtup_init(struct sock *sk);
+
 static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd)
 {
 	tp->pred_flags = htonl((tp->tcp_header_len << 26) |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 16984d4..ebf2e0b 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -664,6 +664,22 @@ ctl_table ipv4_table[] = {
 		.mode		= 0644,
 		.proc_handler	= &proc_dointvec,
 	},
+	{
+		.ctl_name	= NET_TCP_MTU_PROBING,
+		.procname	= "tcp_mtu_probing",
+		.data		= &sysctl_tcp_mtu_probing,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
+	},
+	{
+		.ctl_name	= NET_TCP_BASE_MSS,
+		.procname	= "tcp_base_mss",
+		.data		= &sysctl_tcp_base_mss,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= &proc_dointvec,
+	},
 
 	{ .ctl_name = 0 }
 };
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index a97ed54..7b1a695 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1890,6 +1890,34 @@ static void tcp_try_to_open(struct sock 
 	}
 }
 
+static void tcp_mtup_probe_failed(struct sock *sk)
+{
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	
+	icsk->icsk_mtup.search_high = icsk->icsk_mtup.probe_size - 1;
+	icsk->icsk_mtup.probe_size = 0;
+}
+
+static void tcp_mtup_probe_success(struct sock *sk, struct sk_buff *skb)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	
+	/* FIXME: breaks with very large cwnd */
+	tp->prior_ssthresh = tcp_current_ssthresh(sk);
+	tp->snd_cwnd = tp->snd_cwnd *
+		       tcp_mss_to_mtu(sk, tp->mss_cache) /
+		       icsk->icsk_mtup.probe_size;
+	tp->snd_cwnd_cnt = 0;
+	tp->snd_cwnd_stamp = tcp_time_stamp;
+	tp->rcv_ssthresh = tcp_current_ssthresh(sk);
+	
+	icsk->icsk_mtup.search_low = icsk->icsk_mtup.probe_size;
+	icsk->icsk_mtup.probe_size = 0;
+	tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
+}
+
+
 /* Process an event, which can update packets-in-flight not trivially.
  * Main goal of this function is to calculate new estimate for left_out,
  * taking into account both packets sitting in receiver's buffer and
@@ -2022,6 +2050,17 @@ tcp_fastretrans_alert(struct sock *sk, u
 			return;
 		}
 
+		/* MTU probe failure: don't reduce cwnd */
+		if (icsk->icsk_ca_state < TCP_CA_CWR &&
+		    icsk->icsk_mtup.probe_size &&
+		    tp->snd_una == icsk->icsk_mtup.probe_seq_start) {
+			tcp_mtup_probe_failed(sk);
+			/* Restores the reduction we did in tcp_mtup_probe() */
+			tp->snd_cwnd++;
+			tcp_simple_retransmit(sk);
+			return;
+		}
+
 		/* Otherwise enter Recovery state */
 
 		if (IsReno(tp))
@@ -2241,6 +2280,13 @@ static int tcp_clean_rtx_queue(struct so
 			acked |= FLAG_SYN_ACKED;
 			tp->retrans_stamp = 0;
 		}
+		
+		/* MTU probing checks */
+		if (icsk->icsk_mtup.probe_size) {
+			if (!after(icsk->icsk_mtup.probe_seq_end, TCP_SKB_CB(skb)->end_seq)) {
+				tcp_mtup_probe_success(sk, skb);
+			}
+		}
 
 		if (sacked) {
 			if (sacked & TCPCB_RETRANS) {
@@ -4100,6 +4146,7 @@ static int tcp_rcv_synsent_state_process
 		if (tp->rx_opt.sack_ok && sysctl_tcp_fack)
 			tp->rx_opt.sack_ok |= 2;
 
+		tcp_mtup_init(sk);
 		tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
 		tcp_initialize_rcv_mss(sk);
 
@@ -4210,6 +4257,7 @@ discard:
 		if (tp->ecn_flags&TCP_ECN_OK)
 			sock_set_flag(sk, SOCK_NO_LARGESEND);
 
+		tcp_mtup_init(sk);
 		tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
 		tcp_initialize_rcv_mss(sk);
 
@@ -4398,6 +4446,7 @@ int tcp_rcv_state_process(struct sock *s
 				 */
 				tp->lsndtime = tcp_time_stamp;
 
+				tcp_mtup_init(sk);
 				tcp_initialize_rcv_mss(sk);
 				tcp_init_buffer_space(sk);
 				tcp_fast_path_on(tp);
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 233bdf2..57e7a26 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -900,6 +900,7 @@ struct sock *tcp_v4_syn_recv_sock(struct
 		inet_csk(newsk)->icsk_ext_hdr_len = newinet->opt->optlen;
 	newinet->id = newtp->write_seq ^ jiffies;
 
+	tcp_mtup_init(newsk);
 	tcp_sync_mss(newsk, dst_mtu(dst));
 	newtp->advmss = dst_metric(dst, RTAX_ADVMSS);
 	tcp_initialize_rcv_mss(newsk);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a7623ea..bd7e996 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -51,6 +51,12 @@ int sysctl_tcp_retrans_collapse = 1;
  */
 int sysctl_tcp_tso_win_divisor = 3;
 
+int sysctl_tcp_mtu_probing = 0;
+int sysctl_tcp_base_mss = 512;
+
+EXPORT_SYMBOL(sysctl_tcp_mtu_probing);
+EXPORT_SYMBOL(sysctl_tcp_base_mss);
+
 static void update_send_head(struct sock *sk, struct tcp_sock *tp,
 			     struct sk_buff *skb)
 {
@@ -681,6 +687,62 @@ int tcp_trim_head(struct sock *sk, struc
 	return 0;
 }
 
+/* Not accounting for SACKs here. */
+int tcp_mtu_to_mss(struct sock *sk, int pmtu)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	int mss_now;
+
+	/* Calculate base mss without TCP options:
+	   It is MMS_S - sizeof(tcphdr) of rfc1122
+	 */
+	mss_now = pmtu - icsk->icsk_af_ops->net_header_len - sizeof(struct tcphdr);
+
+	/* Clamp it (mss_clamp does not include tcp options) */
+	if (mss_now > tp->rx_opt.mss_clamp)
+		mss_now = tp->rx_opt.mss_clamp;
+
+	/* Now subtract optional transport overhead */
+	mss_now -= icsk->icsk_ext_hdr_len;
+
+	/* Then reserve room for full set of TCP options and 8 bytes of data */
+	if (mss_now < 48)
+		mss_now = 48;
+
+	/* Now subtract TCP options size, not including SACKs */
+	mss_now -= tp->tcp_header_len - sizeof(struct tcphdr);
+	
+	return mss_now;
+}
+
+/* Inverse of above */
+int tcp_mss_to_mtu(struct sock *sk, int mss)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	int mtu;
+	
+	mtu = mss +
+	      tp->tcp_header_len +
+	      icsk->icsk_ext_hdr_len +
+	      icsk->icsk_af_ops->net_header_len;
+	
+	return mtu;
+}
+
+void tcp_mtup_init(struct sock *sk)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	
+	icsk->icsk_mtup.enabled = sysctl_tcp_mtu_probing > 1;
+	icsk->icsk_mtup.search_high = tp->rx_opt.mss_clamp + sizeof(struct tcphdr) +
+	                       icsk->icsk_af_ops->net_header_len;
+	icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, sysctl_tcp_base_mss);
+	icsk->icsk_mtup.probe_size = 0;
+}
+
 /* This function synchronize snd mss to current pmtu/exthdr set.
 
    tp->rx_opt.user_mss is mss set by user by TCP_MAXSEG. It does NOT counts
@@ -708,25 +770,12 @@ unsigned int tcp_sync_mss(struct sock *s
 {
 	struct tcp_sock *tp = tcp_sk(sk);
 	struct inet_connection_sock *icsk = inet_csk(sk);
-	/* Calculate base mss without TCP options:
-	   It is MMS_S - sizeof(tcphdr) of rfc1122
-	 */
-	int mss_now = (pmtu - icsk->icsk_af_ops->net_header_len -
-		       sizeof(struct tcphdr));
-
-	/* Clamp it (mss_clamp does not include tcp options) */
-	if (mss_now > tp->rx_opt.mss_clamp)
-		mss_now = tp->rx_opt.mss_clamp;
-
-	/* Now subtract optional transport overhead */
-	mss_now -= icsk->icsk_ext_hdr_len;
+	int mss_now;
 
-	/* Then reserve room for full set of TCP options and 8 bytes of data */
-	if (mss_now < 48)
-		mss_now = 48;
+	if (icsk->icsk_mtup.search_high > pmtu)
+		icsk->icsk_mtup.search_high = pmtu;
 
-	/* Now subtract TCP options size, not including SACKs */
-	mss_now -= tp->tcp_header_len - sizeof(struct tcphdr);
+	mss_now = tcp_mtu_to_mss(sk, pmtu);
 
 	/* Bound mss with half of window */
 	if (tp->max_window && mss_now > (tp->max_window>>1))
@@ -734,6 +783,8 @@ unsigned int tcp_sync_mss(struct sock *s
 
 	/* And store cached results */
 	icsk->icsk_pmtu_cookie = pmtu;
+	if (icsk->icsk_mtup.enabled)
+		mss_now = min(mss_now, tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low));
 	tp->mss_cache = mss_now;
 
 	return mss_now;
@@ -1059,6 +1110,140 @@ static int tcp_tso_should_defer(struct s
 	return 1;
 }
 
+/* Create a new MTU probe if we are ready.
+ * Returns 0 if we should wait to probe (no cwnd available),
+ *         1 if a probe was sent,
+ *         -1 otherwise */
+static int tcp_mtu_probe(struct sock *sk)
+{
+	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	struct sk_buff *skb, *nskb, *next;
+	int len;
+	int probe_size;
+	unsigned int pif;
+	int copy;
+	int mss_now;
+	
+	/* Not currently probing/verifying,
+	 * not in recovery,
+	 * have enough cwnd, and
+	 * not SACKing (the variable headers throw things off) */
+	if (!icsk->icsk_mtup.enabled ||
+	    icsk->icsk_mtup.probe_size ||
+	    inet_csk(sk)->icsk_ca_state != TCP_CA_Open ||
+	    tp->snd_cwnd < 11 ||
+	    tp->rx_opt.eff_sacks)
+		return -1;
+	
+	/* Very simple search strategy: just double the MSS. */
+	mss_now = tcp_current_mss(sk, 0);
+	probe_size = 2*tp->mss_cache;
+	if (probe_size > tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_high)) {
+		/* TODO: set timer for probe_converge_event */
+		return -1;
+	}
+
+	/* Have enough data in the send queue to probe? */
+	len = 0;
+	if ((skb = sk->sk_send_head) == NULL)
+		return -1;
+	while ((len += skb->len) < probe_size && !tcp_skb_is_last(sk, skb))
+		skb = skb->next;
+	if (len < probe_size)
+		return -1;
+	
+	/* Receive window check. */
+	if (after(TCP_SKB_CB(skb)->seq + probe_size, tp->snd_una + tp->snd_wnd)) {
+		if (tp->snd_wnd < probe_size)
+			return -1;
+		else
+			return 0;
+	}
+	
+	/* Do we need to wait to drain cwnd? */
+	pif = tcp_packets_in_flight(tp);
+	if (pif + 2 > tp->snd_cwnd) {
+		/* With no packets in flight, don't stall. */
+		if (pif == 0)
+			return -1;
+		else
+			return 0;
+	}
+	
+	/* We're allowed to probe.  Build it now. */
+	if ((nskb = sk_stream_alloc_skb(sk, probe_size, GFP_ATOMIC)) == NULL)
+		return -1;
+	sk_charge_skb(sk, nskb);
+	
+	skb = sk->sk_send_head;
+	__skb_insert(nskb, skb->prev, skb, &sk->sk_write_queue);
+	sk->sk_send_head = nskb;
+	
+	TCP_SKB_CB(nskb)->seq = TCP_SKB_CB(skb)->seq;
+	TCP_SKB_CB(nskb)->end_seq = TCP_SKB_CB(skb)->seq + probe_size;
+	TCP_SKB_CB(nskb)->flags = TCPCB_FLAG_ACK;
+	TCP_SKB_CB(nskb)->sacked = 0;
+	nskb->csum = 0;
+	if (skb->ip_summed == CHECKSUM_HW)
+		nskb->ip_summed = CHECKSUM_HW;
+	
+	len = 0;
+	while (len < probe_size) {
+		next = skb->next;
+		
+		copy = min_t(int, skb->len, probe_size - len);
+		if (nskb->ip_summed)
+			skb_copy_bits(skb, 0, skb_put(nskb, copy), copy);
+		else
+			nskb->csum = skb_copy_and_csum_bits(skb, 0,
+			                 skb_put(nskb, copy), copy, nskb->csum);
+		
+		if (skb->len <= copy) {
+			/* We've eaten all the data from this skb.
+			 * Throw it away. */
+			TCP_SKB_CB(nskb)->flags |= TCP_SKB_CB(skb)->flags;
+			__skb_unlink(skb, &sk->sk_write_queue);
+			sk_stream_free_skb(sk, skb);
+		} else {
+			TCP_SKB_CB(nskb)->flags |= TCP_SKB_CB(skb)->flags &
+			                           ~(TCPCB_FLAG_FIN|TCPCB_FLAG_PSH);
+			if (!skb_shinfo(skb)->nr_frags) {
+				skb_pull(skb, copy);
+				if (skb->ip_summed != CHECKSUM_HW)
+					skb->csum = csum_partial(skb->data, skb->len, 0);
+			} else {
+				__pskb_trim_head(skb, copy);
+				tcp_set_skb_tso_segs(sk, skb, mss_now);
+			}
+			TCP_SKB_CB(skb)->seq += copy;
+		}
+		
+		len += copy;
+		skb = next;
+	}
+	tcp_init_tso_segs(sk, nskb, nskb->len);
+	
+	/* We're ready to send.  If this fails, the probe will
+	 * be resegmented into mss-sized pieces by tcp_write_xmit(). */
+	TCP_SKB_CB(nskb)->when = tcp_time_stamp;
+	if (!tcp_transmit_skb(sk, nskb, 1, GFP_ATOMIC)) {
+		/* Decrement cwnd here because we are sending 
+		* effectively two packets. */
+		tp->snd_cwnd--;
+		update_send_head(sk, tp, nskb);
+		
+		icsk->icsk_mtup.probe_size = tcp_mss_to_mtu(sk, nskb->len);
+		icsk->icsk_mtup.probe_seq_start = TCP_SKB_CB(nskb)->seq;
+		icsk->icsk_mtup.probe_seq_end = TCP_SKB_CB(nskb)->end_seq;
+		
+		return 1;
+	}
+	
+	return -1;
+}
+
+
 /* This routine writes packets to the network.  It advances the
  * send_head.  This happens as incoming acks open up the remote
  * window for us.
@@ -1072,6 +1257,7 @@ static int tcp_write_xmit(struct sock *s
 	struct sk_buff *skb;
 	unsigned int tso_segs, sent_pkts;
 	int cwnd_quota;
+	int result;
 
 	/* If we are closed, the bytes will have to remain here.
 	 * In time closedown will finish, we empty the write queue and all
@@ -1081,12 +1267,20 @@ static int tcp_write_xmit(struct sock *s
 		return 0;
 
 	sent_pkts = 0;
+	
+	/* Do MTU probing. */
+	if ((result = tcp_mtu_probe(sk)) == 0) {
+		return 0;
+	} else if (result > 0) {
+		sent_pkts = 1;
+	}
+	
 	while ((skb = sk->sk_send_head)) {
 		unsigned int limit;
 
 		tso_segs = tcp_init_tso_segs(sk, skb, mss_now);
 		BUG_ON(!tso_segs);
-
+		
 		cwnd_quota = tcp_cwnd_test(tp, skb);
 		if (!cwnd_quota)
 			break;
@@ -1451,9 +1645,15 @@ void tcp_simple_retransmit(struct sock *
 int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
 {
 	struct tcp_sock *tp = tcp_sk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
  	unsigned int cur_mss = tcp_current_mss(sk, 0);
 	int err;
-
+	
+	/* Inconslusive MTU probe */
+	if (icsk->icsk_mtup.probe_size) {
+		icsk->icsk_mtup.probe_size = 0;
+	}
+	
 	/* Do not sent more than we queued. 1/4 is reserved for possible
 	 * copying overhead: fragmentation, tunneling, mangling etc.
 	 */
@@ -1879,6 +2079,7 @@ static void tcp_connect_init(struct sock
 	if (tp->rx_opt.user_mss)
 		tp->rx_opt.mss_clamp = tp->rx_opt.user_mss;
 	tp->max_window = 0;
+	tcp_mtup_init(sk);
 	tcp_sync_mss(sk, dst_mtu(dst));
 
 	if (!tp->window_clamp)
@@ -2176,3 +2377,4 @@ EXPORT_SYMBOL(tcp_make_synack);
 EXPORT_SYMBOL(tcp_simple_retransmit);
 EXPORT_SYMBOL(tcp_sync_mss);
 EXPORT_SYMBOL(sysctl_tcp_tso_win_divisor);
+EXPORT_SYMBOL(tcp_mtup_init);
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index e188095..7c1bde3 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -119,8 +119,10 @@ static int tcp_orphan_retries(struct soc
 /* A write timeout has occurred. Process the after effects. */
 static int tcp_write_timeout(struct sock *sk)
 {
-	const struct inet_connection_sock *icsk = inet_csk(sk);
+	struct inet_connection_sock *icsk = inet_csk(sk);
+	struct tcp_sock *tp = tcp_sk(sk);
 	int retry_until;
+	int mss;
 
 	if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
 		if (icsk->icsk_retransmits)
@@ -128,25 +130,19 @@ static int tcp_write_timeout(struct sock
 		retry_until = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;
 	} else {
 		if (icsk->icsk_retransmits >= sysctl_tcp_retries1) {
-			/* NOTE. draft-ietf-tcpimpl-pmtud-01.txt requires pmtu black
-			   hole detection. :-(
-
-			   It is place to make it. It is not made. I do not want
-			   to make it. It is disgusting. It does not work in any
-			   case. Let me to cite the same draft, which requires for
-			   us to implement this:
-
-   "The one security concern raised by this memo is that ICMP black holes
-   are often caused by over-zealous security administrators who block
-   all ICMP messages.  It is vitally important that those who design and
-   deploy security systems understand the impact of strict filtering on
-   upper-layer protocols.  The safest web site in the world is worthless
-   if most TCP implementations cannot transfer data from it.  It would
-   be far nicer to have all of the black holes fixed rather than fixing
-   all of the TCP implementations."
-
-                           Golden words :-).
-		   */
+			/* Black hole detection */
+			if (sysctl_tcp_mtu_probing) {
+				if (!icsk->icsk_mtup.enabled) {
+					icsk->icsk_mtup.enabled = 1;
+					tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
+				} else {
+					mss = min(sysctl_tcp_base_mss,
+					          tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2);
+					mss = max(mss, 68 - tp->tcp_header_len);
+					icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
+					tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
+				}
+			}
 
 			dst_negative_advice(&sk->sk_dst_cache);
 		}
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index ca9cf68..14de503 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -987,6 +987,7 @@ static struct sock * tcp_v6_syn_recv_soc
 		inet_csk(newsk)->icsk_ext_hdr_len = (newnp->opt->opt_nflen +
 						     newnp->opt->opt_flen);
 
+	tcp_mtup_init(newsk);
 	tcp_sync_mss(newsk, dst_mtu(dst));
 	newtp->advmss = dst_metric(dst, RTAX_ADVMSS);
 	tcp_initialize_rcv_mss(newsk);
---
0.99.8.GIT


--- NEW FILE 4465-e100-remove-init_hw-call-to-fix-panic.txt ---
Subject: [PATCH] e100: remove init_hw call to fix panic
From: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date: 1139295045 -0500

e100 seems to have had a long standing bug where e100_init_hw was being
called when it should not have been.  This caused a panic due to recent
changes that rely on correct set up in the driver, and more robust error
paths.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/e100.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

applies-to: 57ff0b44a412b78fe598a49cc28b3cebf51f1154
471ef051bc3b980e2f38cbe9112eac7bfe4d6633
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index bf1fd2b..24253c8 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2752,8 +2752,6 @@ static int e100_resume(struct pci_dev *p
 	retval = pci_enable_wake(pdev, 0, 0);
 	if (retval)
 		DPRINTK(PROBE,ERR, "Error clearing wake events\n");
-	if(e100_hw_init(nic))
-		DPRINTK(HW, ERR, "e100_hw_init failed\n");
 
 	netif_device_attach(netdev);
 	if(netif_running(netdev))
---
0.99.8.GIT


--- NEW FILE 4466-sis900-remove-cfgpmcsr-I-O-space-register-define.txt ---
Subject: [PATCH] sis900: remove cfgpmcsr I/O space register define
From: Lennert Buytenhek <buytenh at wantstofly.org>
Date: 1138563232 +0100

sis900 defines 'cfgpmcsr' as an I/O space register, but CFGPMCSR is
in fact a config space register, and there is no register at offset
0x44 in I/O space, so delete the enum.

Signed-off-by: Lennert Buytenhek <buytenh at wantstofly.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sis900.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

applies-to: 05f8ab666ba3c3ff7964b8a6551707977ada9177
d561514f616504c0962f22d51d165f7b6e1bae1b
diff --git a/drivers/net/sis900.h b/drivers/net/sis900.h
index 4233ea5..5032394 100644
--- a/drivers/net/sis900.h
+++ b/drivers/net/sis900.h
@@ -33,7 +33,6 @@ enum sis900_registers {
         rxcfg=0x34,             //Receive Configuration Register
         flctrl=0x38,            //Flow Control Register
         rxlen=0x3c,             //Receive Packet Length Register
-        cfgpmcsr=0x44,          //Configuration Power Management Control/Status Register
         rfcr=0x48,              //Receive Filter Control Register
         rfdr=0x4C,              //Receive Filter Data Register
         pmctrl=0xB0,            //Power Management Control Register
---
0.99.8.GIT


--- NEW FILE 4467-sky2-power-management-fix.txt ---
Subject: [PATCH] sky2: power management fix
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649874 -0800

Fix suspend/resume for sky2. The status ring was getting reallocated
and a bunch of other mistakes. Also, check return from power_state
on resume.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 deletions(-)

applies-to: fb79eab1de9a8e97eb2c02adea5f5dac0a1e711b
08c06d8a9063c81f6a21c9f275aa1ee49d4bf380
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index f8b973a..c236c59 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -26,7 +26,6 @@
 /*
  * TOTEST
  *	- speed setting
- *	- suspend/resume
  */
 
 #include <linux/config.h>
@@ -198,7 +197,7 @@ static int sky2_set_power_state(struct s
 	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 
 	pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_PMC, &power_control);
-	vaux = (sky2_read8(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
+	vaux = (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL) &&
 		(power_control & PCI_PM_CAP_PME_D3cold);
 
 	pci_read_config_word(hw->pdev, hw->pm_cap + PCI_PM_CTRL, &power_control);
@@ -2141,14 +2140,12 @@ static inline u32 sky2_clk2us(const stru
 
 static int sky2_reset(struct sky2_hw *hw)
 {
-	u32 ctst;
 	u16 status;
 	u8 t8, pmd_type;
 	int i;
 
-	ctst = sky2_read32(hw, B0_CTST);
-
 	sky2_write8(hw, B0_CTST, CS_RST_CLR);
+
 	hw->chip_id = sky2_read8(hw, B2_CHIP_ID);
 	if (hw->chip_id < CHIP_ID_YUKON_XL || hw->chip_id > CHIP_ID_YUKON_FE) {
 		printk(KERN_ERR PFX "%s: unsupported chip type 0x%x\n",
@@ -2156,12 +2153,6 @@ static int sky2_reset(struct sky2_hw *hw
 		return -EOPNOTSUPP;
 	}
 
-	/* ring for status responses */
-	hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES,
-					 &hw->st_dma);
-	if (!hw->st_le)
-		return -ENOMEM;
-
 	/* disable ASF */
 	if (hw->chip_id <= CHIP_ID_YUKON_EC) {
 		sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
@@ -3135,6 +3126,12 @@ static int __devinit sky2_probe(struct p
 	}
 	hw->pm_cap = pm_cap;
 
+	/* ring for status responses */
+	hw->st_le = pci_alloc_consistent(hw->pdev, STATUS_LE_BYTES,
+					 &hw->st_dma);
+	if (!hw->st_le)
+		goto err_out_iounmap;
+
 	err = sky2_reset(hw);
 	if (err)
 		goto err_out_iounmap;
@@ -3263,25 +3260,33 @@ static int sky2_suspend(struct pci_dev *
 static int sky2_resume(struct pci_dev *pdev)
 {
 	struct sky2_hw *hw = pci_get_drvdata(pdev);
-	int i;
+	int i, err;
 
 	pci_restore_state(pdev);
 	pci_enable_wake(pdev, PCI_D0, 0);
-	sky2_set_power_state(hw, PCI_D0);
+	err = sky2_set_power_state(hw, PCI_D0);
+	if (err)
+		goto out;
 
-	sky2_reset(hw);
+	err = sky2_reset(hw);
+	if (err)
+		goto out;
 
 	for (i = 0; i < 2; i++) {
 		struct net_device *dev = hw->dev[i];
-		if (dev) {
-			if (netif_running(dev)) {
-				netif_device_attach(dev);
-				if (sky2_up(dev))
-					dev_close(dev);
+		if (dev && netif_running(dev)) {
+			netif_device_attach(dev);
+			err = sky2_up(dev);
+			if (err) {
+				printk(KERN_ERR PFX "%s: could not up: %d\n",
+				       dev->name, err);
+				dev_close(dev);
+				break;
 			}
 		}
 	}
-	return 0;
+out:
+	return err;
 }
 #endif
 
---
0.99.8.GIT


--- NEW FILE 4468-sky2-pci-config-space-checking.txt ---
Subject: [PATCH] sky2: pci config space checking
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649875 -0800

There were bugs in mmconfig access to PCI space, up to and
include 2.6.16-rc1. These prevented the sky2 driver from being
able to clear PCI express errors.

This patch makes the driver check (during probe), for errors
in PCI config access and fail.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |   31 ++++++++++++++++++++++---------
 drivers/net/sky2.h |    8 --------
 2 files changed, 22 insertions(+), 17 deletions(-)

applies-to: 342a3ee4bee534bdf3a836a85c08d8d853bd1255
2d42d21f11c20b94ea0222637e20e2630845afe4
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index c236c59..e04c4f4 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2142,7 +2142,7 @@ static int sky2_reset(struct sky2_hw *hw
 {
 	u16 status;
 	u8 t8, pmd_type;
-	int i;
+	int i, err;
 
 	sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
@@ -2164,19 +2164,24 @@ static int sky2_reset(struct sky2_hw *hw
 	sky2_write8(hw, B0_CTST, CS_RST_CLR);
 
 	/* clear PCI errors, if any */
-	pci_read_config_word(hw->pdev, PCI_STATUS, &status);
+	err = pci_read_config_word(hw->pdev, PCI_STATUS, &status);
+	if (err)
+		goto pci_err;
+
 	sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
-	pci_write_config_word(hw->pdev, PCI_STATUS,
-			      status | PCI_STATUS_ERROR_BITS);
+	err = pci_write_config_word(hw->pdev, PCI_STATUS,
+				    status | PCI_STATUS_ERROR_BITS);
+	if (err)
+		goto pci_err;
 
 	sky2_write8(hw, B0_CTST, CS_MRST_CLR);
 
 	/* clear any PEX errors */
-	if (is_pciex(hw)) {
-		u16 lstat;
-		pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
-				       0xffffffffUL);
-		pci_read_config_word(hw->pdev, PEX_LNK_STAT, &lstat);
+	if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) {
+		err = pci_write_config_dword(hw->pdev, PEX_UNC_ERR_STAT,
+						 0xffffffffUL);
+		if (err)
+			goto pci_err;
 	}
 
 	pmd_type = sky2_read8(hw, B2_PMD_TYP);
@@ -2288,6 +2293,14 @@ static int sky2_reset(struct sky2_hw *hw
 	sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
 
 	return 0;
+
+pci_err:
+	/* This is to catch a BIOS bug workaround where
+	 * mmconfig table doesn't have other buses.
+	 */
+	printk(KERN_ERR PFX "%s: can't access PCI config space\n",
+	       pci_name(hw->pdev));
+	return err;
 }
 
 static u32 sky2_supported_modes(const struct sky2_hw *hw)
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 9551892..70525ac 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1867,14 +1867,6 @@ static inline u8 sky2_read8(const struct
 	return readb(hw->regs + reg);
 }
 
-/* This should probably go away, bus based tweeks suck */
-static inline int is_pciex(const struct sky2_hw *hw)
-{
-	u32 status;
-	pci_read_config_dword(hw->pdev, PCI_DEV_STATUS, &status);
-	return (status & PCI_OS_PCI_X) == 0;
-}
-
 static inline void sky2_write32(const struct sky2_hw *hw, unsigned reg, u32 val)
 {
 	writel(val, hw->regs + reg);
---
0.99.8.GIT


--- NEW FILE 4469-sky2-ethtool-rx_coalesce-settings-fix.txt ---
Subject: [PATCH] sky2: ethtool rx_coalesce settings fix
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649876 -0800

This fixes setting rx_coalesce_usecs_irq via ethtool in sky2.
The write was directed to the wrong register.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: ed740ea45977801bb9017291449a8c8fa57bb4fe
d28d4870279c5d184804b6ac1775b130972ffecd
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index e04c4f4..12ff1c8 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2847,7 +2847,7 @@ static int sky2_set_coalesce(struct net_
 	if (ecmd->rx_coalesce_usecs_irq == 0)
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_STOP);
 	else {
-		sky2_write32(hw, STAT_TX_TIMER_INI,
+		sky2_write32(hw, STAT_ISR_TIMER_INI,
 			     sky2_us2clk(hw, ecmd->rx_coalesce_usecs_irq));
 		sky2_write8(hw, STAT_ISR_TIMER_CTRL, TIM_START);
 	}
---
0.99.8.GIT


--- NEW FILE 4470-sky2-set-mac-address-fix.txt ---
Subject: [PATCH] sky2: set mac address fix
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649877 -0800

Using the sky2 driver with bonding can result in oopses related to
reinitializing the PHY when the MAC address is changed (which bonding
is wont to do).  This patch changes sky2_set_mac_address to take less
drastic measures.

This is analagous to the skge patch here:

	http://lkml.org/lkml/2005/9/29/399

which fixed the issue here:

	http://bugzilla.kernel.org/show_bug.cgi?id=5271

Signed-off-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

applies-to: 5d90ca3cb1dc15b3131ad519ecf4ebba01b9fc97
a8ab1ec0c3ef4ce2033abe3441d032fe1490a71a
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 12ff1c8..6cd075e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2555,19 +2555,24 @@ static struct net_device_stats *sky2_get
 static int sky2_set_mac_address(struct net_device *dev, void *p)
 {
 	struct sky2_port *sky2 = netdev_priv(dev);
-	struct sockaddr *addr = p;
+	struct sky2_hw *hw = sky2->hw;
+	unsigned port = sky2->port;
+	const struct sockaddr *addr = p;
 
 	if (!is_valid_ether_addr(addr->sa_data))
 		return -EADDRNOTAVAIL;
 
 	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-	memcpy_toio(sky2->hw->regs + B2_MAC_1 + sky2->port * 8,
+	memcpy_toio(hw->regs + B2_MAC_1 + port * 8,
 		    dev->dev_addr, ETH_ALEN);
-	memcpy_toio(sky2->hw->regs + B2_MAC_2 + sky2->port * 8,
+	memcpy_toio(hw->regs + B2_MAC_2 + port * 8,
 		    dev->dev_addr, ETH_ALEN);
 
-	if (netif_running(dev))
-		sky2_phy_reinit(sky2);
+	/* virtual address for data */
+	gma_set_addr(hw, port, GM_SRC_ADDR_2L, dev->dev_addr);
+
+	/* physical address: used for pause frames */
+	gma_set_addr(hw, port, GM_SRC_ADDR_1L, dev->dev_addr);
 
 	return 0;
 }
---
0.99.8.GIT


--- NEW FILE 4471-sky2-clear-irq-race.txt ---
Subject: [PATCH] sky2: clear irq race
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649878 -0800

Move the interrupt clear to before processing, this avoids a
possible races with status delaying.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

applies-to: 0f21945a91501921dfed6f891e05c2fe70b1865c
f9a66c7f5fa2262656a1a38ae9b57a2a89980f36
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6cd075e..aff7b9d 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1833,6 +1833,8 @@ static int sky2_poll(struct net_device *
 	u16 hwidx;
 	u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS };
 
+	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
+
 	hwidx = sky2_read16(hw, STAT_PUT_IDX);
 	BUG_ON(hwidx >= STATUS_RING_SIZE);
 	rmb();
@@ -1912,12 +1914,10 @@ static int sky2_poll(struct net_device *
 	}
 
 exit_loop:
-	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
-
 	sky2_tx_check(hw, 0, tx_done[0]);
 	sky2_tx_check(hw, 1, tx_done[1]);
 
-	if (sky2_read16(hw, STAT_PUT_IDX) == hw->st_idx) {
+	if (likely(work_done < to_do)) {
 		/* need to restart TX timer */
 		if (is_ec_a1(hw)) {
 			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
---
0.99.8.GIT


--- NEW FILE 4472-sky2-add-irq-to-entropy-pool.txt ---
Subject: [PATCH] sky2: add irq to entropy pool
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649879 -0800

The sky2 interrupt can be used to add entropy.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

applies-to: 84c9b58afbeaabc9d8468b6783d7bc827f7eeeae
db992c970dcfbbf24e6a681e66d22ddda62452c4
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index aff7b9d..62733a6 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3184,7 +3184,8 @@ static int __devinit sky2_probe(struct p
 		}
 	}
 
-	err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw);
+	err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
+			  DRV_NAME, hw);
 	if (err) {
 		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
 		       pci_name(pdev), pdev->irq);
---
0.99.8.GIT


--- NEW FILE 4473-sky2-support-msi-interrupt-revised.txt ---
Subject: [PATCH] sky2: support msi interrupt (revised)
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649880 -0800

This hardware supports Message Signaled interrupts.
When setting up, use software interrupt to check for bad hardware.

Signed-off-by: Stephen Hemminger <shemminger @osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/sky2.h |    1 +
 2 files changed, 78 insertions(+), 0 deletions(-)

applies-to: 1a3186762cf68745e346bb55f9453bcdf3753602
4d52b48b43d0d1d5959fa722ee0046e3542e5e1b
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 62733a6..8ed4bd1 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -101,6 +101,10 @@ static int copybreak __read_mostly = 256
 module_param(copybreak, int, 0);
 MODULE_PARM_DESC(copybreak, "Receive copy threshold");
 
+static int disable_msi = 0;
+module_param(disable_msi, int, 0);
+MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
+
 static const struct pci_device_id sky2_id_table[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
@@ -3064,6 +3068,61 @@ static void __devinit sky2_show_addr(str
 		       dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
 }
 
+/* Handle software interrupt used during MSI test */
+static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id,
+					    struct pt_regs *regs)
+{
+	struct sky2_hw *hw = dev_id;
+	u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2);
+
+	if (status == 0)
+		return IRQ_NONE;
+
+	if (status & Y2_IS_IRQ_SW) {
+		sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
+		hw->msi = 1;
+	}
+	sky2_write32(hw, B0_Y2_SP_ICR, 2);
+
+	sky2_read32(hw, B0_IMSK);
+	return IRQ_HANDLED;
+}
+
+/* Test interrupt path by forcing a a software IRQ */
+static int __devinit sky2_test_msi(struct sky2_hw *hw)
+{
+	struct pci_dev *pdev = hw->pdev;
+	int i, err;
+
+	sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW);
+
+	err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw);
+	if (err) {
+		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
+		       pci_name(pdev), pdev->irq);
+		return err;
+	}
+
+	sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ);
+	wmb();
+
+	for (i = 0; i < 10; i++) {
+		barrier();
+		if (hw->msi)
+			goto found;
+		mdelay(1);
+	}
+
+	err = -EOPNOTSUPP;
+	sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ);
+ found:
+	sky2_write32(hw, B0_IMSK, 0);
+
+	free_irq(pdev->irq, hw);
+
+	return err;
+}
+
 static int __devinit sky2_probe(struct pci_dev *pdev,
 				const struct pci_device_id *ent)
 {
@@ -3184,6 +3243,20 @@ static int __devinit sky2_probe(struct p
 		}
 	}
 
+	if (!disable_msi && pci_enable_msi(pdev) == 0) {
+		err = sky2_test_msi(hw);
+		if (err == -EOPNOTSUPP) {
+			/* MSI test failed, go back to INTx mode */
+			printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, "
+			       "switching to INTx mode. Please report this failure to "
+			       "the PCI maintainer and include system chipset information.\n",
+			       pci_name(pdev));
+			pci_disable_msi(pdev);
+		}
+		else if (err)
+			goto err_out_unregister;
+	}
+
 	err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM,
 			  DRV_NAME, hw);
 	if (err) {
@@ -3200,6 +3273,8 @@ static int __devinit sky2_probe(struct p
 	return 0;
 
 err_out_unregister:
+	if (hw->msi)
+		pci_disable_msi(pdev);
 	if (dev1) {
 		unregister_netdev(dev1);
 		free_netdev(dev1);
@@ -3242,6 +3317,8 @@ static void __devexit sky2_remove(struct
 	sky2_read8(hw, B0_CTST);
 
 	free_irq(pdev->irq, hw);
+	if (hw->msi)
+		pci_disable_msi(pdev);
 	pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 70525ac..fd12c28 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -1841,6 +1841,7 @@ struct sky2_hw {
 	struct net_device    *dev[2];
 
 	int		     pm_cap;
+	int		     msi;
 	u8	     	     chip_id;
 	u8		     chip_rev;
 	u8		     copper;
---
0.99.8.GIT


--- NEW FILE 4474-sky2-version-0.15-update.txt ---
Subject: [PATCH] sky2: version 0.15 update
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1138649881 -0800

Increase version, and get rid of out-dated comment.
Speed setting has worked for quite a while.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/sky2.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

applies-to: ce8c99092e5039e2827d072a0ecbb5013f16f8e0
fa8d3549b591b6da943bad2928f994de07eaecef
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 8ed4bd1..cae2edf 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -23,11 +23,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/*
- * TOTEST
- *	- speed setting
- */
-
 #include <linux/config.h>
 #include <linux/crc32.h>
 #include <linux/kernel.h>
@@ -56,7 +51,7 @@
 #include "sky2.h"
 
 #define DRV_NAME		"sky2"
-#define DRV_VERSION		"0.13"
+#define DRV_VERSION		"0.15"
 #define PFX			DRV_NAME " "
 
 /*
---
0.99.8.GIT


--- NEW FILE 4475-bonding-allow-bond-to-use-TSO-if-slaves-support-it.txt ---
Subject: [PATCH] bonding: allow bond to use TSO if slaves support it
From: Jay Vosburgh <fubar at us.ibm.com>
Date: 1138664459 -0800

Add NETIF_F_TSO (NETIF_F_UFO) to BOND_INTERSECT_FEATURES so that it can
be used by a bonding device iff all its slave devices support TSO (UFO).

Signed-off-by: Arthur Kepner <akepner at sgi.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/bonding/bond_main.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

applies-to: 0d12dcf9228a4cd9523e4e60358a8b1b01292255
a0de3adf8f4e5618c5bd62db08ed293042c8e454
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4ff006c..e0f51af 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1145,7 +1145,8 @@ int bond_sethwaddr(struct net_device *bo
 }
 
 #define BOND_INTERSECT_FEATURES \
-	(NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM)
+	(NETIF_F_SG|NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM|\
+	NETIF_F_TSO|NETIF_F_UFO)
 
 /* 
  * Compute the common dev->feature set available to all slaves.  Some
@@ -1168,6 +1169,16 @@ static int bond_compute_features(struct 
 			  NETIF_F_HW_CSUM)))
 		features &= ~NETIF_F_SG;
 
+	/* 
+	 * features will include NETIF_F_TSO (NETIF_F_UFO) iff all 
+	 * slave devices support NETIF_F_TSO (NETIF_F_UFO), which 
+	 * implies that all slaves also support scatter-gather 
+	 * (NETIF_F_SG), which implies that features also includes 
+	 * NETIF_F_SG. So no need to check whether we have an  
+	 * illegal combination of NETIF_F_{TSO,UFO} and 
+	 * !NETIF_F_SG 
+	 */
+
 	features |= (bond_dev->features & ~BOND_INTERSECT_FEATURES);
 	bond_dev->features = features;
 
@@ -4080,6 +4091,8 @@ static void bond_ethtool_get_drvinfo(str
 
 static struct ethtool_ops bond_ethtool_ops = {
 	.get_tx_csum		= ethtool_op_get_tx_csum,
+	.get_tso		= ethtool_op_get_tso,
+	.get_ufo		= ethtool_op_get_ufo,
 	.get_sg			= ethtool_op_get_sg,
 	.get_drvinfo		= bond_ethtool_get_drvinfo,
 };
---
0.99.8.GIT


--- NEW FILE 4476-bonding-Sparse-warnings-fix.txt ---
Subject: [PATCH] bonding: Sparse warnings fix
From: Luiz Fernando Capitulino <lcapitulino at mandriva.com.br>
Date: 1138784074 -0800

drivers/net/bonding/bond_sysfs.c:263:27: warning: Using plain integer as NULL pointer
drivers/net/bonding/bond_sysfs.c:998:26: warning: Using plain integer as NULL pointer
drivers/net/bonding/bond_sysfs.c:1126:26: warning: Using plain integer as NULL pointer

Signed-off-by: Luiz Capitulino <lcapitulino at mandriva.com.br>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/bonding/bond_sysfs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

applies-to: 1cdca0a48abfb24d07919bbeb8db5c3a592f6e89
3418db7cfacffcf120996b10a785b7315bf0df82
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 32d13da..041bcc5 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -260,7 +260,7 @@ static ssize_t bonding_store_slaves(stru
 	char *ifname;
 	int i, res, found, ret = count;
 	struct slave *slave;
-	struct net_device *dev = 0;
+	struct net_device *dev = NULL;
 	struct bonding *bond = to_bond(cd);
 
 	/* Quick sanity check -- is the bond interface up? */
@@ -995,7 +995,7 @@ static ssize_t bonding_store_primary(str
 			printk(KERN_INFO DRV_NAME
 			       ": %s: Setting primary slave to None.\n",
 			       bond->dev->name);
-			bond->primary_slave = 0;
+			bond->primary_slave = NULL;
 				bond_select_active_slave(bond);
 		} else {
 			printk(KERN_INFO DRV_NAME
@@ -1123,7 +1123,7 @@ static ssize_t bonding_store_active_slav
 			printk(KERN_INFO DRV_NAME
 			       ": %s: Setting active slave to None.\n",
 			       bond->dev->name);
-			bond->primary_slave = 0;
+			bond->primary_slave = NULL;
 				bond_select_active_slave(bond);
 		} else {
 			printk(KERN_INFO DRV_NAME
---
0.99.8.GIT


--- NEW FILE 4478-gianfar-Fix-sparse-warnings.txt ---
Subject: [PATCH] gianfar: Fix sparse warnings
From: Kumar Gala <galak at kernel.crashing.org>
Date: 1138828683 -0600

Fixed sparse warnings mainly due to lack of __iomem.

Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/gianfar.c         |   24 +++++++++++-------------
 drivers/net/gianfar.h         |    8 ++++----
 drivers/net/gianfar_ethtool.c |    8 ++++----
 drivers/net/gianfar_mii.c     |   17 ++++++++---------
 4 files changed, 27 insertions(+), 30 deletions(-)

applies-to: 849b5a705ec79ffab2be7acd59b463c325f8319d
cc8c6e379ca30a18cb18553abeb15fe19120bf7b
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 0c18dbd..0e8e3fc 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -199,8 +199,7 @@ static int gfar_probe(struct platform_de
 
 	/* get a pointer to the register memory */
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	priv->regs = (struct gfar *)
-		ioremap(r->start, sizeof (struct gfar));
+	priv->regs = ioremap(r->start, sizeof (struct gfar));
 
 	if (NULL == priv->regs) {
 		err = -ENOMEM;
@@ -369,7 +368,7 @@ static int gfar_probe(struct platform_de
 	return 0;
 
 register_fail:
-	iounmap((void *) priv->regs);
+	iounmap(priv->regs);
 regs_fail:
 	free_netdev(dev);
 	return err;
@@ -382,7 +381,7 @@ static int gfar_remove(struct platform_d
 
 	platform_set_drvdata(pdev, NULL);
 
-	iounmap((void *) priv->regs);
+	iounmap(priv->regs);
 	free_netdev(dev);
 
 	return 0;
@@ -454,8 +453,7 @@ static void init_registers(struct net_de
 
 	/* Zero out the rmon mib registers if it has them */
 	if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) {
-		memset((void *) &(priv->regs->rmon), 0,
-		       sizeof (struct rmon_mib));
+		memset_io(&(priv->regs->rmon), 0, sizeof (struct rmon_mib));
 
 		/* Mask off the CAM interrupts */
 		gfar_write(&priv->regs->rmon.cam1, 0xffffffff);
@@ -477,7 +475,7 @@ static void init_registers(struct net_de
 void gfar_halt(struct net_device *dev)
 {
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	u32 tempval;
 
 	/* Mask all interrupts */
@@ -507,7 +505,7 @@ void gfar_halt(struct net_device *dev)
 void stop_gfar(struct net_device *dev)
 {
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	unsigned long flags;
 
 	phy_stop(priv->phydev);
@@ -590,7 +588,7 @@ static void free_skb_resources(struct gf
 void gfar_start(struct net_device *dev)
 {
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	u32 tempval;
 
 	/* Enable Rx and Tx in MACCFG1 */
@@ -624,7 +622,7 @@ int startup_gfar(struct net_device *dev)
 	unsigned long vaddr;
 	int i;
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	int err = 0;
 	u32 rctrl = 0;
 	u32 attrs = 0;
@@ -1622,7 +1620,7 @@ static irqreturn_t gfar_interrupt(int ir
 static void adjust_link(struct net_device *dev)
 {
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	unsigned long flags;
 	struct phy_device *phydev = priv->phydev;
 	int new_state = 0;
@@ -1703,7 +1701,7 @@ static void gfar_set_multi(struct net_de
 {
 	struct dev_mc_list *mc_ptr;
 	struct gfar_private *priv = netdev_priv(dev);
-	struct gfar *regs = priv->regs;
+	struct gfar __iomem *regs = priv->regs;
 	u32 tempval;
 
 	if(dev->flags & IFF_PROMISC) {
@@ -1842,7 +1840,7 @@ static void gfar_set_mac_for_addr(struct
 	int idx;
 	char tmpbuf[MAC_ADDR_LEN];
 	u32 tempval;
-	u32 *macptr = &priv->regs->macstnaddr1;
+	u32 __iomem *macptr = &priv->regs->macstnaddr1;
 
 	macptr += num*2;
 
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index cb9d66a..d37d540 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -682,8 +682,8 @@ struct gfar_private {
 	struct rxbd8 *cur_rx;           /* Next free rx ring entry */
 	struct txbd8 *cur_tx;	        /* Next free ring entry */
 	struct txbd8 *dirty_tx;		/* The Ring entry to be freed. */
-	struct gfar *regs;	/* Pointer to the GFAR memory mapped Registers */
-	u32 *hash_regs[16];
+	struct gfar __iomem *regs;	/* Pointer to the GFAR memory mapped Registers */
+	u32 __iomem *hash_regs[16];
 	int hash_width;
 	struct net_device_stats stats; /* linux network statistics */
 	struct gfar_extra_stats extra_stats;
@@ -718,14 +718,14 @@ struct gfar_private {
 	uint32_t msg_enable;
 };
 
-static inline u32 gfar_read(volatile unsigned *addr)
+static inline u32 gfar_read(volatile unsigned __iomem *addr)
 {
 	u32 val;
 	val = in_be32(addr);
 	return val;
 }
 
-static inline void gfar_write(volatile unsigned *addr, u32 val)
+static inline void gfar_write(volatile unsigned __iomem *addr, u32 val)
 {
 	out_be32(addr, val);
 }
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 765e810..5de7b2e 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -144,11 +144,11 @@ static void gfar_fill_stats(struct net_d
 	u64 *extra = (u64 *) & priv->extra_stats;
 
 	if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) {
-		u32 *rmon = (u32 *) & priv->regs->rmon;
+		u32 __iomem *rmon = (u32 __iomem *) & priv->regs->rmon;
 		struct gfar_stats *stats = (struct gfar_stats *) buf;
 
 		for (i = 0; i < GFAR_RMON_LEN; i++)
-			stats->rmon[i] = (u64) (rmon[i]);
+			stats->rmon[i] = (u64) gfar_read(&rmon[i]);
 
 		for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++)
 			stats->extra[i] = extra[i];
@@ -221,11 +221,11 @@ static void gfar_get_regs(struct net_dev
 {
 	int i;
 	struct gfar_private *priv = netdev_priv(dev);
-	u32 *theregs = (u32 *) priv->regs;
+	u32 __iomem *theregs = (u32 __iomem *) priv->regs;
 	u32 *buf = (u32 *) regbuf;
 
 	for (i = 0; i < sizeof (struct gfar) / sizeof (u32); i++)
-		buf[i] = theregs[i];
+		buf[i] = gfar_read(&theregs[i]);
 }
 
 /* Convert microseconds to ethernet clock ticks, which changes
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index 74e52fc..c6b7255 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -50,7 +50,7 @@
  * All PHY configuration is done through the TSEC1 MIIM regs */
 int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value)
 {
-	struct gfar_mii *regs = bus->priv;
+	struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
 
 	/* Set the PHY address and the register address we want to write */
 	gfar_write(&regs->miimadd, (mii_id << 8) | regnum);
@@ -70,7 +70,7 @@ int gfar_mdio_write(struct mii_bus *bus,
  * configuration has to be done through the TSEC1 MIIM regs */
 int gfar_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
 {
-	struct gfar_mii *regs = bus->priv;
+	struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
 	u16 value;
 
 	/* Set the PHY address and the register address we want to read */
@@ -94,7 +94,7 @@ int gfar_mdio_read(struct mii_bus *bus, 
 /* Reset the MIIM registers, and wait for the bus to free */
 int gfar_mdio_reset(struct mii_bus *bus)
 {
-	struct gfar_mii *regs = bus->priv;
+	struct gfar_mii __iomem *regs = (void __iomem *)bus->priv;
 	unsigned int timeout = PHY_INIT_TIMEOUT;
 
 	spin_lock_bh(&bus->mdio_lock);
@@ -126,7 +126,7 @@ int gfar_mdio_probe(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct gianfar_mdio_data *pdata;
-	struct gfar_mii *regs;
+	struct gfar_mii __iomem *regs;
 	struct mii_bus *new_bus;
 	struct resource *r;
 	int err = 0;
@@ -155,15 +155,14 @@ int gfar_mdio_probe(struct device *dev)
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
 	/* Set the PHY base address */
-	regs = (struct gfar_mii *) ioremap(r->start,
-			sizeof (struct gfar_mii));
+	regs = ioremap(r->start, sizeof (struct gfar_mii));
 
 	if (NULL == regs) {
 		err = -ENOMEM;
 		goto reg_map_fail;
 	}
 
-	new_bus->priv = regs;
+	new_bus->priv = (void __force *)regs;
 
 	new_bus->irq = pdata->irq;
 
@@ -181,7 +180,7 @@ int gfar_mdio_probe(struct device *dev)
 	return 0;
 
 bus_register_fail:
-	iounmap((void *) regs);
+	iounmap(regs);
 reg_map_fail:
 	kfree(new_bus);
 
@@ -197,7 +196,7 @@ int gfar_mdio_remove(struct device *dev)
 
 	dev_set_drvdata(dev, NULL);
 
-	iounmap((void *) (&bus->priv));
+	iounmap((void __iomem *)bus->priv);
 	bus->priv = NULL;
 	kfree(bus);
 
---
0.99.8.GIT


--- NEW FILE 4481-uli526x-warning-fix.txt ---
Subject: [PATCH] uli526x warning fix
From: Andrew Morton <akpm at osdl.org>
Date: 1138959920 -0800

drivers/net/tulip/uli526x.c: In function `__check_mode':
drivers/net/tulip/uli526x.c:1693: warning: return from incompatible pointer type

Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Jeff Garzik <jgarzik at pobox.com>

---

 drivers/net/tulip/uli526x.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 73e0e3b3fe0e381ec9f7e511dcd99326fe4d89f6
99bb25793e4bb8e9b633ea001dd7312b5967385a
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 9839816..238e9c7 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -214,7 +214,7 @@ static u32 uli526x_cr6_user_set;
 /* For module input parameter */
 static int debug;
 static u32 cr6set;
-static unsigned char mode = 8;
+static int mode = 8;
 
 /* function declaration ------------------------------------- */
 static int uli526x_open(struct net_device *);
---
0.99.8.GIT


--- NEW FILE 4604-remove-bogus-asm-bug.h-includes.txt ---
Subject: [PATCH] remove bogus asm/bug.h includes.
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1134626823 -0500

A bunch of asm/bug.h includes are both not needed (since it will get
pulled anyway) and bogus (since they are done too early).  Removed.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 crypto/scatterwalk.c                |    1 -
 drivers/cdrom/viocd.c               |    2 --
 drivers/net/hamradio/baycom_par.c   |    1 -
 drivers/tc/tc.c                     |    1 -
 drivers/video/backlight/backlight.c |    1 -
 drivers/video/backlight/lcd.c       |    1 -
 drivers/video/pmag-ba-fb.c          |    1 -
 drivers/video/pmagb-b-fb.c          |    1 -
 fs/reiserfs/hashes.c                |    1 -
 include/asm-mips/io.h               |    1 -
 include/asm-powerpc/dma-mapping.h   |    1 -
 include/linux/cpumask.h             |    1 -
 include/linux/dcache.h              |    1 -
 include/linux/jbd.h                 |    1 -
 include/linux/mtd/map.h             |    1 -
 include/linux/nodemask.h            |    1 -
 include/linux/smp.h                 |    1 -
 kernel/compat.c                     |    1 -
 net/dccp/ccids/lib/tfrc_equation.c  |    1 -
 net/ipv4/xfrm4_policy.c             |    1 -
 net/ipv6/raw.c                      |    1 -
 net/ipv6/xfrm6_policy.c             |    1 -
 net/xfrm/xfrm_policy.c              |    1 -
 23 files changed, 0 insertions(+), 24 deletions(-)

applies-to: da556ca2f8afa1b43ca0626c9426f6634c64d32d
1b8623545b42c03eb92e51b28c84acf4b8ba00a3
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index 47ac90e..2953e2c 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -17,7 +17,6 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
-#include <asm/bug.h>
 #include <asm/scatterlist.h>
 #include "internal.h"
 #include "scatterwalk.h"
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 193446e..e276172 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -42,8 +42,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
-#include <asm/bug.h>
-
 #include <asm/vio.h>
 #include <asm/scatterlist.h>
 #include <asm/iseries/hv_types.h>
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 3b1bef1..77411a0 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -86,7 +86,6 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
-#include <asm/bug.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index a0e5af6..4a51e56 100644
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
-#include <asm/bug.h>
 #include <asm/errno.h>
 #include <asm/io.h>
 #include <asm/paccess.h>
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 9d5015e..bd39bbd 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -13,7 +13,6 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
-#include <asm/bug.h>
 
 static ssize_t backlight_show_power(struct class_device *cdev, char *buf)
 {
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 68c6906..9e32485 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -13,7 +13,6 @@
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/fb.h>
-#include <asm/bug.h>
 
 static ssize_t lcd_show_power(struct class_device *cdev, char *buf)
 {
diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index f3927b6..f5361cd 100644
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#include <asm/bug.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index 25148de..eeeac92 100644
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -27,7 +27,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 
-#include <asm/bug.h>
 #include <asm/io.h>
 #include <asm/system.h>
 
diff --git a/fs/reiserfs/hashes.c b/fs/reiserfs/hashes.c
index a3ec238..e664ac1 100644
--- a/fs/reiserfs/hashes.c
+++ b/fs/reiserfs/hashes.c
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/reiserfs_fs.h>
 #include <asm/types.h>
-#include <asm/bug.h>
 
 #define DELTA 0x9E3779B9
 #define FULLROUNDS 10		/* 32 is overkill, 16 is strong crypto */
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index d426857..a9fa125 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -18,7 +18,6 @@
 #include <linux/types.h>
 
 #include <asm/addrspace.h>
-#include <asm/bug.h>
 #include <asm/byteorder.h>
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>
diff --git a/include/asm-powerpc/dma-mapping.h b/include/asm-powerpc/dma-mapping.h
index 837756a..2ac63f5 100644
--- a/include/asm-powerpc/dma-mapping.h
+++ b/include/asm-powerpc/dma-mapping.h
@@ -15,7 +15,6 @@
 #include <linux/mm.h>
 #include <asm/scatterlist.h>
 #include <asm/io.h>
-#include <asm/bug.h>
 
 #define DMA_ERROR_CODE		(~(dma_addr_t)0x0)
 
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
index 13e9f4a..20b446f 100644
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
@@ -84,7 +84,6 @@
 #include <linux/kernel.h>
 #include <linux/threads.h>
 #include <linux/bitmap.h>
-#include <asm/bug.h>
 
 typedef struct { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;
 extern cpumask_t _unused_cpumask_arg_;
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index a3f0994..4361f37 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -8,7 +8,6 @@
 #include <linux/spinlock.h>
 #include <linux/cache.h>
 #include <linux/rcupdate.h>
-#include <asm/bug.h>
 
 struct nameidata;
 struct vfsmount;
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index 751bb38..0fe4aa8 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -239,7 +239,6 @@ typedef struct journal_superblock_s
 
 #include <linux/fs.h>
 #include <linux/sched.h>
-#include <asm/bug.h>
 
 #define JBD_ASSERTIONS
 #ifdef JBD_ASSERTIONS
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index fedfbc8..7dfd6e1 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -15,7 +15,6 @@
 #include <asm/unaligned.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bug.h>
 
 #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1
 #define map_bankwidth(map) 1
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 4726ef7..b959a45 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -84,7 +84,6 @@
 #include <linux/threads.h>
 #include <linux/bitmap.h>
 #include <linux/numa.h>
-#include <asm/bug.h>
 
 typedef struct { DECLARE_BITMAP(bits, MAX_NUMNODES); } nodemask_t;
 extern nodemask_t _unused_nodemask_arg_;
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 9dfa3ee..44153fd 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -17,7 +17,6 @@ extern void cpu_idle(void);
 #include <linux/compiler.h>
 #include <linux/thread_info.h>
 #include <asm/smp.h>
-#include <asm/bug.h>
 
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
diff --git a/kernel/compat.c b/kernel/compat.c
index 1867290..8c9cd88 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -23,7 +23,6 @@
 #include <linux/security.h>
 
 #include <asm/uaccess.h>
-#include <asm/bug.h>
 
 int get_compat_timespec(struct timespec *ts, const struct compat_timespec __user *cts)
 {
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c
index d2b5933..add3cae 100644
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -15,7 +15,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 
-#include <asm/bug.h>
 #include <asm/div64.h>
 
 #include "tfrc.h"
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 42196ba..45f7ae5 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -8,7 +8,6 @@
  * 	
  */
 
-#include <asm/bug.h>
 #include <linux/compiler.h>
 #include <linux/config.h>
 #include <linux/inetdevice.h>
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 66f1d12..738376c 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -35,7 +35,6 @@
 #include <linux/skbuff.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
-#include <asm/bug.h>
 
 #include <net/ip.h>
 #include <net/sock.h>
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 69bd957..91cce8b 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -11,7 +11,6 @@
  * 
  */
 
-#include <asm/bug.h>
 #include <linux/compiler.h>
 #include <linux/config.h>
 #include <linux/netdevice.h>
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 077bbf9..dbf4620 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include <asm/bug.h>
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>
---
0.99.8.GIT


--- NEW FILE 4605-bogus-asm-delay.h-includes.txt ---
Subject: [PATCH] bogus asm/delay.h includes
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1133412425 -0500

asm/delay.h is non-portable; linux/delay.h should be used in generic code.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/wan/pci200syn.c    |    2 +-
 drivers/net/wan/wanxl.c        |    2 +-
 drivers/scsi/aacraid/commsup.c |    2 +-
 sound/oss/emu10k1/recmgr.c     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

applies-to: 071045ad9c60d2697292c523c77322a70a248fb9
164006da316a22eaaa9fbe36f835a01606436c66
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 8dea07b..eba8e5c 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -29,7 +29,7 @@
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
 #include <linux/pci.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 
 #include "hd64572.h"
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 9c1e106..9d3b51c 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -27,8 +27,8 @@
 #include <linux/hdlc.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/delay.h>
 #include <asm/io.h>
-#include <asm/delay.h>
 
 #include "wanxl.h"
 
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 38d6d00..014cc8d 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -38,10 +38,10 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <asm/semaphore.h>
-#include <asm/delay.h>
 
 #include "aacraid.h"
 
diff --git a/sound/oss/emu10k1/recmgr.c b/sound/oss/emu10k1/recmgr.c
index 67c3fd0..2ce5618 100644
--- a/sound/oss/emu10k1/recmgr.c
+++ b/sound/oss/emu10k1/recmgr.c
@@ -29,7 +29,7 @@
  **********************************************************************
  */
 
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include "8010.h"
 #include "recmgr.h"
 
---
0.99.8.GIT


--- NEW FILE 4607-missing-includes-in-drivers-net-mv643xx_eth.c.txt ---
Subject: [PATCH] missing includes in drivers/net/mv643xx_eth.c
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1137630954 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/mv643xx_eth.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

applies-to: d10d90be7cb8fef4d6358f52d6a6fe6b59d2e6af
b6298c22c5e9f698812e2520003ee178aad50c10
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 7ef4b04..c0998ef 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -32,6 +32,8 @@
  */
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/in.h>
+#include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/etherdevice.h>
---
0.99.8.GIT


--- NEW FILE 4615-ipv4-NULL-noise-removal.txt ---
Subject: [PATCH] ipv4 NULL noise removal
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1138791275 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 net/ipv4/igmp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: c07b5f010d244cb11afeb50becdb1d7256a8560d
76edc6051e02186fe664ab880447e2d1f96fd884
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 0b4e95f..64ce52b 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -1578,7 +1578,7 @@ static int sf_setstate(struct ip_mc_list
 			new_in = psf->sf_count[MCAST_INCLUDE] != 0;
 		if (new_in) {
 			if (!psf->sf_oldin) {
-				struct ip_sf_list *prev = 0;
+				struct ip_sf_list *prev = NULL;
 
 				for (dpsf=pmc->tomb; dpsf; dpsf=dpsf->sf_next) {
 					if (dpsf->sf_inaddr == psf->sf_inaddr)
---
0.99.8.GIT


--- NEW FILE 4629-net-ipv6-mcast.c-NULL-noise-removal.txt ---
Subject: [PATCH] net/ipv6/mcast.c NULL noise removal
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1139015403 -0500

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 net/ipv6/mcast.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 8a51cebf64b1130c4f5d6d97c43e2ac87276c00f
e80e28b6b67ecc25fa89c9129a5f70de6389b2a6
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 4420948..807c021 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1978,7 +1978,7 @@ static int sf_setstate(struct ifmcaddr6 
 			new_in = psf->sf_count[MCAST_INCLUDE] != 0;
 		if (new_in) {
 			if (!psf->sf_oldin) {
-				struct ip6_sf_list *prev = 0;
+				struct ip6_sf_list *prev = NULL;
 
 				for (dpsf=pmc->mca_tomb; dpsf;
 				     dpsf=dpsf->sf_next) {
---
0.99.8.GIT


--- NEW FILE 4650-type-safe-min-in-prism54.txt ---
Subject: [PATCH] type-safe min() in prism54
From: Al Viro <viro at zeniv.linux.org.uk>
Date: 1138794148 -0500

we do min() on u8 and small integer constant; cast the latter to u8.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 drivers/net/wireless/prism54/isl_ioctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 8b8a2eb0be8e2a114d257476922915cca49558ca
bf82a44949339c9af7bd61bb58847774e42e531e
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index c5cd61c..e5bb9f5 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -748,7 +748,7 @@ prism54_get_essid(struct net_device *nde
 	if (essid->length) {
 		dwrq->flags = 1;	/* set ESSID to ON for Wireless Extensions */
 		/* if it is to big, trunk it */
-		dwrq->length = min(IW_ESSID_MAX_SIZE, essid->length);
+		dwrq->length = min((u8)IW_ESSID_MAX_SIZE, essid->length);
 	} else {
 		dwrq->flags = 0;
 		dwrq->length = 0;
---
0.99.8.GIT


--- NEW FILE 4692-IPV6-Address-autoconfiguration-does-not-work-after-device-down-up-cycle.txt ---
Subject: [PATCH] [IPV6]: Address autoconfiguration does not work after device down/up cycle
From: Kristian Slavov <kristian.slavov at nomadiclab.com>
Date: 1139443853 -0800

If you set network interface down and up again, the IPv6 address
autoconfiguration does not work. 'ip addr' shows that the link-local
address is in tentative state. We don't even react to periodical router
advertisements.

During NETDEV_DOWN we clear IF_READY, and we don't set it back in
NETDEV_UP. While starting to perform DAD on the link-local address, we
notice that the device is not in IF_READY, and we abort autoconfiguration
process (which would eventually send router solicitations).

Acked-by: Juha-Matti Tapio <jmtapio at verkkotelakka.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/addrconf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

applies-to: 006c9594aa26a8ee6805b337901ecf7823c17dd9
9908104935325bd6beba67d637b6f5396d47075c
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 1db5048..b7d8822 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2165,6 +2165,9 @@ static int addrconf_notify(struct notifi
 					dev->name);
 				break;
 			}
+
+			if (idev)
+				idev->if_flags |= IF_READY;
 		} else {
 			if (!netif_carrier_ok(dev)) {
 				/* device is still not ready. */
---
0.99.8.GIT


--- NEW FILE 4695-update-copyright-in-softmac.txt ---
Subject: [PATCH] update copyright in softmac
From: Johannes Berg <johannes at sipsolutions.net>
Date: 1138732301 +0100

This patch updates the copyright statements in softmac that I
erroneously added for 2005 only (when we already had 2006).

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_assoc.c  |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_auth.c   |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_event.c  |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_module.c |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_priv.h   |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_scan.c   |   10 +++++-----
 net/ieee80211/softmac/ieee80211softmac_wx.c     |   10 +++++-----
 7 files changed, 35 insertions(+), 35 deletions(-)

applies-to: 9c309adddff78b6181a7efa9bba0d0a4f4a657bd
6ac4f7e560f9f1bc4e82e63667a05099aaf9ecc4
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index b29fb1c..755b612 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -1,11 +1,11 @@
 /*
  * This file contains the softmac's association logic.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index 84ad029..ccbb51c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -1,11 +1,11 @@
 /*
  * This file contains the softmac's authentication logic.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_event.c b/net/ieee80211/softmac/ieee80211softmac_event.c
index 0ed8e30..0a52bbd 100644
--- a/net/ieee80211/softmac/ieee80211softmac_event.c
+++ b/net/ieee80211/softmac/ieee80211softmac_event.c
@@ -2,11 +2,11 @@
  * Event system
  * Also see comments in public header file and longer explanation below.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index 671f83b..aa65d5a 100644
--- a/net/ieee80211/softmac/ieee80211softmac_module.c
+++ b/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -1,11 +1,11 @@
 /*
  * Contains some basic softmac functions along with module registration code etc.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index 5b98c3e..0b35a2d 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -1,11 +1,11 @@
 /*
  * Internal softmac API definitions.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c
index d90d31f..46c08a9 100644
--- a/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -3,11 +3,11 @@
  *
  * These are not exported because they're assigned to the function pointers.
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c
index 17d30f4..e1a9bc6 100644
--- a/net/ieee80211/softmac/ieee80211softmac_wx.c
+++ b/net/ieee80211/softmac/ieee80211softmac_wx.c
@@ -1,11 +1,11 @@
 /*
  * This file contains our _wx handlers. Make sure you EXPORT_SYMBOL_GPL them
  *
- * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
- *                    Joseph Jezak <josejx at gentoo.org>
- *                    Larry Finger <Larry.Finger at lwfinger.net>
- *                    Danny van Dyk <kugelfang at gentoo.org>
- *                    Michael Buesch <mbuesch at freenet.de>
+ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
+ *                          Joseph Jezak <josejx at gentoo.org>
+ *                          Larry Finger <Larry.Finger at lwfinger.net>
+ *                          Danny van Dyk <kugelfang at gentoo.org>
+ *                          Michael Buesch <mbuesch at freenet.de>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
---
0.99.8.GIT


--- NEW FILE 4696-trivial-fixes-to-softmac.txt ---
Subject: [PATCH] trivial fixes to softmac
From: Johannes Berg <johannes at sipsolutions.net>
Date: 1138732514 +0100

This patch removes a blank line that shouldn't be there and fixes a
spelling error in softmac.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_auth.c |    2 +-
 net/ieee80211/softmac/ieee80211softmac_scan.c |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

applies-to: 2b2fc631727b3a53b0af4961810bb1a47c11b48c
84cff66e23a39866a32d0acdfa322bf6f2448c0f
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index ccbb51c..dd5fb0f 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -358,7 +358,7 @@ ieee80211softmac_deauth_resp(struct net_
 	net = ieee80211softmac_get_network_by_bssid(mac, auth->header.addr2);
 	
 	if (net == NULL) {
-		printkl(KERN_DEBUG PFX "Recieved deauthentication packet from "MAC_FMT", but that network is unknown.\n",
+		printkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n",
 			MAC_ARG(auth->header.addr2));
 		return 0;
 	}
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c
index 46c08a9..846c62d 100644
--- a/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -233,5 +233,4 @@ void ieee80211softmac_scan_finished(stru
 	
 	ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL);
 }
-
 EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished);
---
0.99.8.GIT


--- NEW FILE 4697-softmac-update-deauth-handler-to-quiet-warning.txt ---
Subject: [PATCH] softmac: update deauth handler to quiet warning
From: Johannes Berg <johannes at sipsolutions.net>
Date: 1138733286 +0100

Recently the deauth packet handler was updated to use a deauth packet
struct (identical to the auth packet struct) and this now gives a
warning. This patch updates the code to properly use a deauth struct and
deauth variable.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_auth.c |    8 ++++----
 net/ieee80211/softmac/ieee80211softmac_priv.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

applies-to: 8f888142b9f04bfe17e7e0a9a99a819ee475790b
21176d611fc0b3742542b6ba0f4daaf4004eb2fd
diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c
index dd5fb0f..ac09e0c 100644
--- a/net/ieee80211/softmac/ieee80211softmac_auth.c
+++ b/net/ieee80211/softmac/ieee80211softmac_auth.c
@@ -342,7 +342,7 @@ ieee80211softmac_deauth_req(struct ieee8
  * This should be registered with ieee80211 as handle_deauth
  */
 int 
-ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_auth *auth)
+ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *deauth)
 {
 	
 	struct ieee80211softmac_network *net = NULL;
@@ -350,16 +350,16 @@ ieee80211softmac_deauth_resp(struct net_
 	
 	function_enter();
 	
-	if (!auth) {
+	if (!deauth) {
 		dprintk("deauth without deauth packet. eek!\n");
 		return 0;
 	}
 
-	net = ieee80211softmac_get_network_by_bssid(mac, auth->header.addr2);
+	net = ieee80211softmac_get_network_by_bssid(mac, deauth->header.addr2);
 	
 	if (net == NULL) {
 		printkl(KERN_DEBUG PFX "Received deauthentication packet from "MAC_FMT", but that network is unknown.\n",
-			MAC_ARG(auth->header.addr2));
+			MAC_ARG(deauth->header.addr2));
 		return 0;
 	}
 
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index 0b35a2d..db0017a 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -147,7 +147,7 @@ int ieee80211softmac_deauth_req(struct i
 
 /* for use by _module.c to assign to the callbacks */
 int ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth);
-int ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_auth *auth);
+int ieee80211softmac_deauth_resp(struct net_device *dev, struct ieee80211_deauth *deauth);
 
 /*** prototypes from _assoc.c */
 void ieee80211softmac_assoc_work(void *d);
---
0.99.8.GIT


--- NEW FILE 4698-softmac-add-reassociation-code.txt ---
Subject: [PATCH] softmac: add reassociation code
From: Johannes Berg <johannes at sipsolutions.net>
Date: 1138733382 +0100

This patch adds handling of reassociation to softmac when the AP
requests it. Patch from Larry Finger.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_assoc.c  |   18 ++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |    1 +
 net/ieee80211/softmac/ieee80211softmac_priv.h   |    2 ++
 3 files changed, 21 insertions(+), 0 deletions(-)

applies-to: 1358c2522ffa717bfb6ea50099e5b7c0bc07d490
7ebe535eafd124b3f7006eb4f0f88a75ae1a07fe
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index 755b612..c6124fc 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -390,3 +390,21 @@ ieee80211softmac_handle_disassoc(struct 
 	
 	return 0;
 }
+
+int
+ieee80211softmac_handle_reassoc_req(struct net_device * dev,
+				    struct ieee80211_reassoc_request * resp)
+{
+	struct ieee80211softmac_device *mac = ieee80211_priv(dev);
+	struct ieee80211softmac_network *network;
+
+	function_enter();
+
+	network = ieee80211softmac_get_network_by_bssid(mac, resp->header.addr3);
+	if (!network) {
+		dprintkl(KERN_INFO PFX "reassoc request from unknown network\n");
+		return 0;
+	}
+	ieee80211softmac_assoc(mac, network);
+	return 0;
+}
diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c
index aa65d5a..6f99f78 100644
--- a/net/ieee80211/softmac/ieee80211softmac_module.c
+++ b/net/ieee80211/softmac/ieee80211softmac_module.c
@@ -41,6 +41,7 @@ struct net_device *alloc_ieee80211softma
 	softmac->ieee->handle_auth = ieee80211softmac_auth_resp;
 	softmac->ieee->handle_deauth = ieee80211softmac_deauth_resp;
 	softmac->ieee->handle_assoc_response = ieee80211softmac_handle_assoc_response;
+	softmac->ieee->handle_reassoc_request = ieee80211softmac_handle_reassoc_req;
 	softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc;
 	softmac->scaninfo = NULL;
 
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h
index db0017a..258da14 100644
--- a/net/ieee80211/softmac/ieee80211softmac_priv.h
+++ b/net/ieee80211/softmac/ieee80211softmac_priv.h
@@ -156,6 +156,8 @@ int ieee80211softmac_handle_assoc_respon
 					   struct ieee80211_network * network);
 int ieee80211softmac_handle_disassoc(struct net_device * dev,
 				     struct ieee80211_disassoc * disassoc);
+int ieee80211softmac_handle_reassoc_req(struct net_device * dev,
+				        struct ieee80211_reassoc_request * reassoc);
 void ieee80211softmac_assoc_timeout(void *d);
 
 /* some helper functions */
---
0.99.8.GIT


--- NEW FILE 4699-softmac-remove-dead-code.txt ---
Subject: [PATCH] softmac: remove dead code
From: Johannes Berg <johannes at sipsolutions.net>
Date: 1138735738 +0100

This patch removes ieee80211softmac_reassoc which is neither implemented
nor used nor necessary.

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_assoc.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

applies-to: de5ec26ee4deafa3313f0d02c7a5d2d51409c5c2
b4ac6ea98d1aefdb2f1aa7cbfec4aac60c9f65fb
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c
index c6124fc..c788377 100644
--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -83,13 +83,6 @@ ieee80211softmac_assoc_timeout(void *d)
 	ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_TIMEOUT, NULL);
 }
 
-static void
-ieee80211softmac_reassoc(struct ieee80211softmac_device *mac)
-{
-	function_enter();
-}
-
-
 /* Sends out a disassociation request to the desired AP */
 static void
 ieee80211softmac_disassoc(struct ieee80211softmac_device *mac, u16 reason)
---
0.99.8.GIT


--- NEW FILE 4700-Fix-softmac-scan.txt ---
Subject: [PATCH] Fix softmac scan
From: Larry Finger <Larry.Finger at lwfinger.net>
Date: 1139347252 -0600

Softmac scanning fails because the stop flag is not cleared before scanning is started. The attached
one-line patch fixes this.

Signed-Off-By: Larry Finger <Larry.Finger at lwfinger.net>

Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/softmac/ieee80211softmac_scan.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: 760e6290ff0e46a94adb3f07fee99b9cdc6423a3
fdec41698b92a85f108d01f37944c216151e35ac
diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c
index 846c62d..290ddb0 100644
--- a/net/ieee80211/softmac/ieee80211softmac_scan.c
+++ b/net/ieee80211/softmac/ieee80211softmac_scan.c
@@ -178,6 +178,7 @@ int ieee80211softmac_start_scan_implemen
 	dprintk(PFX "Scanning %d channels\n", sm->scaninfo->number_channels);
 	sm->scaninfo->current_channel_idx = 0;
 	sm->scaninfo->started = 1;
+	sm->scaninfo->stop = 0;
 	INIT_COMPLETION(sm->scaninfo->finished);
 	schedule_work(&sm->scaninfo->softmac_scan);
 	spin_unlock_irqrestore(&sm->lock, flags);
---
0.99.8.GIT


--- NEW FILE 4701-wrong-firmware-location-in-IPW2100-Kconfig-entry.txt ---
Subject: [PATCH] wrong firmware location in IPW2100 Kconfig entry
From: Jesper Juhl <jesper.juhl at gmail.com>
Date: 1138723884 +0100

Firmware should go into /lib/firmware, not /etc/firmware.

Found by Alejandro Bonilla.

Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 71826f43c0e7cf087983baf3b731b2fb51683446
78b4f480e8567fc502f06206640fcc3b2a495af2
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 3de5f1d..a1ede41 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -149,7 +149,7 @@ config IPW2100
 	  In order to use this driver, you will need a firmware image for it.
           You can obtain the firmware from
 	  <http://ipw2100.sf.net/>.  Once you have the firmware image, you 
-	  will need to place it in /etc/firmware.
+	  will need to place it in /lib/firmware.
 
           You will also very likely need the Wireless Tools in order to
           configure your card:
---
0.99.8.GIT


--- NEW FILE 4702-wireless-atmel-fix-setting-TX-key-only-in-ENCODEEXT.txt ---
Subject: [PATCH] wireless/atmel: fix setting TX key only in ENCODEEXT
From: Dan Williams <dcbw at redhat.com>
Date: 1139179941 -0500

The previous patch that added ENCODEEXT and AUTH support to the atmel
driver contained a slight error which would cause just setting the TX
key index to also set the encryption key again.  This patch allows any
combination of setting the TX key index and setting an encryption key.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/atmel.c |   61 ++++++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 29 deletions(-)

applies-to: 2c578ad6d8b9b02f133a33779cb3ff085cea041b
d861a616c0ea671bdf781f4a8be807afda6c68c5
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 98a76f1..c1c27e1 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1872,7 +1872,7 @@ static int atmel_set_encodeext(struct ne
 	struct atmel_private *priv = netdev_priv(dev);
 	struct iw_point *encoding = &wrqu->encoding;
 	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-	int idx, key_len;
+	int idx, key_len, alg = ext->alg, set_key = 1;
 
 	/* Determine and validate the key index */
 	idx = encoding->flags & IW_ENCODE_INDEX;
@@ -1883,39 +1883,42 @@ static int atmel_set_encodeext(struct ne
 	} else
 		idx = priv->default_key;
 
-	if ((encoding->flags & IW_ENCODE_DISABLED) ||
-	    ext->alg == IW_ENCODE_ALG_NONE) {
-		priv->wep_is_on = 0;
-		priv->encryption_level = 0;
-		priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
-	}
+	if (encoding->flags & IW_ENCODE_DISABLED)
+	    alg = IW_ENCODE_ALG_NONE;
 
-	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
+	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
 		priv->default_key = idx;
+		set_key = ext->key_len > 0 ? 1 : 0;
+	}
 
-	/* Set the requested key */
-	switch (ext->alg) {
-	case IW_ENCODE_ALG_NONE:
-		break;
-	case IW_ENCODE_ALG_WEP:
-		if (ext->key_len > 5) {
-			priv->wep_key_len[idx] = 13;
-			priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
-			priv->encryption_level = 2;
-		} else if (ext->key_len > 0) {
-			priv->wep_key_len[idx] = 5;
-			priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
-			priv->encryption_level = 1;
-		} else {
+	if (set_key) {
+		/* Set the requested key first */
+		switch (alg) {
+		case IW_ENCODE_ALG_NONE:
+			priv->wep_is_on = 0;
+			priv->encryption_level = 0;
+			priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
+			break;
+		case IW_ENCODE_ALG_WEP:
+			if (ext->key_len > 5) {
+				priv->wep_key_len[idx] = 13;
+				priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
+				priv->encryption_level = 2;
+			} else if (ext->key_len > 0) {
+				priv->wep_key_len[idx] = 5;
+				priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
+				priv->encryption_level = 1;
+			} else {
+				return -EINVAL;
+			}
+			priv->wep_is_on = 1;
+			memset(priv->wep_keys[idx], 0, 13);
+			key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
+			memcpy(priv->wep_keys[idx], ext->key, key_len);
+			break;
+		default:
 			return -EINVAL;
 		}
-		priv->wep_is_on = 1;
-		memset(priv->wep_keys[idx], 0, 13);
-		key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
-		memcpy(priv->wep_keys[idx], ext->key, key_len);
-		break;
-	default:
-		return -EINVAL;
 	}
 
 	return -EINPROGRESS;
---
0.99.8.GIT


--- NEW FILE 4703-wireless-atmel-fix-Open-System-authentication-process-bugs.txt ---
Subject: [PATCH] wireless/atmel: fix Open System authentication process bugs
From: Dan Williams <dcbw at redhat.com>
Date: 1139180116 -0500

This patch fixes a number of bugs in the authentication process:

1) When falling back to Shared Key authentication mode from Open System,
a missing 'return' would cause the auth request to be sent, but would
drop the card into Management Error state.  When falling back, the
driver should also indicate that it is switching to Shared Key mode by
setting exclude_unencrypted.

2) Initial authentication modes were apparently wrong in some cases,
causing the driver to attempt Shared Key authentication mode when in
fact the access point didn't support that mode or even had WEP disabled.
The driver should set the correct initial authentication mode based on
wep_is_on and exclude_unencrypted.

3) Authentication response packets from the access point in Open System
mode were getting ignored because the driver was expecting the sequence
number of a Shared Key mode response.  The patch separates the OS and SK
mode handling to provide the correct behavior.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/atmel.c |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

applies-to: 68c0bcfcdb1b76ce4900eafa318655286c91f781
dade22d9fbd2d7a742859c794130058387afbff6
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index c1c27e1..dfc2401 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3064,17 +3064,26 @@ static void authenticate(struct atmel_pr
 	}
 
 	if (status == C80211_MGMT_SC_Success && priv->wep_is_on) {
+		int should_associate = 0;
 		/* WEP */
 		if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum)
 			return;
 
-		if (trans_seq_no == 0x0002 &&
-		    auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
-			send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
-			return;
+		if (system == C80211_MGMT_AAN_OPENSYSTEM) {
+			if (trans_seq_no == 0x0002) {
+				should_associate = 1;
+			}
+		} else if (system == C80211_MGMT_AAN_SHAREDKEY) {
+			if (trans_seq_no == 0x0002 &&
+			    auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
+				send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
+				return;
+			} else if (trans_seq_no == 0x0004) {
+				should_associate = 1;
+			}
 		}
 
-		if (trans_seq_no == 0x0004) {
+		if (should_associate) {
 			if(priv->station_was_associated) {
 				atmel_enter_state(priv, STATION_STATE_REASSOCIATING);
 				send_association_request(priv, 1);
@@ -3087,11 +3096,13 @@ static void authenticate(struct atmel_pr
 		}
 	}
 
-	if (status == C80211_MGMT_SC_AuthAlgNotSupported) {
+	if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) {
 		/* Do opensystem first, then try sharedkey */
-		if (system ==  C80211_MGMT_AAN_OPENSYSTEM) {
+		if (system == WLAN_AUTH_OPEN) {
 			priv->CurrentAuthentTransactionSeqNum = 0x001;
-			send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+			priv->exclude_unencrypted = 1;
+			send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0);
+			return;
 		} else if (priv->connect_to_any_BSS) {
 			int bss_index;
 
@@ -3442,10 +3453,13 @@ static void atmel_management_timer(u_lon
 			priv->AuthenticationRequestRetryCnt = 0;
 			restart_search(priv);
 		} else {
+			int auth = C80211_MGMT_AAN_OPENSYSTEM;
 			priv->AuthenticationRequestRetryCnt++;
 			priv->CurrentAuthentTransactionSeqNum = 0x0001;
 			mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
-			send_authentication_request(priv, C80211_MGMT_AAN_OPENSYSTEM, NULL, 0);
+			if (priv->wep_is_on && priv->exclude_unencrypted)
+				auth = C80211_MGMT_AAN_SHAREDKEY;
+			send_authentication_request(priv, auth, NULL, 0);
 	  }
 	  break;
 
@@ -3544,12 +3558,15 @@ static void atmel_command_irq(struct atm
 				priv->station_was_associated = priv->station_is_associated;
 				atmel_enter_state(priv, STATION_STATE_READY);
 			} else {
+				int auth = C80211_MGMT_AAN_OPENSYSTEM;
 				priv->AuthenticationRequestRetryCnt = 0;
 				atmel_enter_state(priv, STATION_STATE_AUTHENTICATING);
 
 				mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
 				priv->CurrentAuthentTransactionSeqNum = 0x0001;
-				send_authentication_request(priv, C80211_MGMT_AAN_SHAREDKEY, NULL, 0);
+				if (priv->wep_is_on && priv->exclude_unencrypted)
+					auth = C80211_MGMT_AAN_SHAREDKEY;
+				send_authentication_request(priv, auth, NULL, 0);
 			}
 			return;
 		}
---
0.99.8.GIT


--- NEW FILE 4704-wireless-airo-fix-setting-TX-key-index-plus-key-in-ENCODEEXT.txt ---
Subject: [PATCH] wireless/airo: fix setting TX key index plus key in ENCODEEXT
From: Dan Williams <dcbw at redhat.com>
Date: 1139180430 -0500

The previous patch that added ENCODEEXT and AUTH support to the airo
driver contained a slight error which would cause setting the TX
key index ignore a valid key-set request at the same time.  This patch
allows any combination of setting the TX key index and setting an
encryption key.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/airo.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

applies-to: 298e9cfee9843933cbbf2dabd1a8194e9257b1d0
fe45f58a19768c5fd182c90030ab73a0a343e3b4
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index ef6495b..b96b6db 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -6266,7 +6266,7 @@ static int airo_set_encodeext(struct net
 	CapabilityRid cap_rid;		/* Card capability info */
 	int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 );
 	u16 currentAuthType = local->config.authType;
-	int idx, key_len, alg = ext->alg;	/* Check encryption mode */
+	int idx, key_len, alg = ext->alg, set_key = 1;
 	wep_key_t key;
 
 	/* Is WEP supported ? */
@@ -6289,10 +6289,15 @@ static int airo_set_encodeext(struct net
 	if (encoding->flags & IW_ENCODE_DISABLED)
 		alg = IW_ENCODE_ALG_NONE;
 
-	/* Just setting the transmit key? */
 	if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
+		/* Only set transmit key index here, actual
+		 * key is set below if needed.
+		 */
 		set_wep_key(local, idx, NULL, 0, perm, 1);
-	} else {
+		set_key = ext->key_len > 0 ? 1 : 0;
+	}
+
+	if (set_key) {
 		/* Set the requested key first */
 		memset(key.key, 0, MAX_KEY_SIZE);
 		switch (alg) {
---
0.99.8.GIT


--- NEW FILE 4705-let-IPW2-1-2-00-select-IEEE80211.txt ---
Subject: [PATCH] let IPW2{1,2}00 select IEEE80211
From: Jan Niehusmann <jan at gondor.com>
Date: 1139152402 +0100

This patch makes the IPW2100 and IPW2200 options available in
the configuration menu even if IEEE80211 has not been selected before.
This behaviour is more intuitive for people which are not familiar with
the driver internals.
The suggestion for this change was made by Alejandro Bonilla Beeche.

Signed-off-by: Jan Niehusmann <jan at gondor.com>
Signed-off-by: Adrian Bunk <bunk at stusta.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/Kconfig |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

applies-to: eb46cc32cb82ada5ad59fb05add691c863f04072
5f9e2473760b8b596daafa301a45967e212dc1e8
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index a1ede41..7587df7 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -136,8 +136,9 @@ comment "Wireless 802.11b ISA/PCI cards 
 
 config IPW2100
 	tristate "Intel PRO/Wireless 2100 Network Connection"
-	depends on NET_RADIO && PCI && IEEE80211
+	depends on NET_RADIO && PCI
 	select FW_LOADER
+	select IEEE80211
 	---help---
           A driver for the Intel PRO/Wireless 2100 Network 
 	  Connection 802.11b wireless network adapter.
@@ -189,8 +190,9 @@ config IPW2100_DEBUG
 
 config IPW2200
 	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
-	depends on NET_RADIO && IEEE80211 && PCI
+	depends on NET_RADIO && PCI
 	select FW_LOADER
+	select IEEE80211
 	---help---
           A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
 	  Connection adapters. 
---
0.99.8.GIT


--- NEW FILE 4706-wireless-atmel-convert-constants-to-ieee80211-layer-equivalents.txt ---
Subject: [PATCH] wireless/atmel: convert constants to ieee80211 layer equivalents
From: Dan Williams <dcbw at redhat.com>
Date: 1139180256 -0500

This patch converts the Atmel driver-only IEEE 802.11 constants to their
equivalents from the kernel's ieee80211 layer headers.

Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/atmel.c |  110 ++++++++++++++----------------------------
 1 files changed, 36 insertions(+), 74 deletions(-)

applies-to: 3be8403a33d125cb0110982985c57285bf7375cf
a428bf8c9f170c0b44327431e4ab31079d6ac2b4
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index dfc2401..87afa68 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -137,44 +137,6 @@ static struct {
 #define MAC_BOOT_COMPLETE       0x0010        // MAC boot has been completed
 #define MAC_INIT_OK             0x0002        // MAC boot has been completed
 
-#define C80211_SUBTYPE_MGMT_ASS_REQUEST                 0x00
-#define C80211_SUBTYPE_MGMT_ASS_RESPONSE                0x10
-#define C80211_SUBTYPE_MGMT_REASS_REQUEST               0x20
-#define C80211_SUBTYPE_MGMT_REASS_RESPONSE              0x30
-#define C80211_SUBTYPE_MGMT_ProbeRequest                0x40
-#define C80211_SUBTYPE_MGMT_ProbeResponse               0x50
-#define C80211_SUBTYPE_MGMT_BEACON                      0x80
-#define C80211_SUBTYPE_MGMT_ATIM                        0x90
-#define C80211_SUBTYPE_MGMT_DISASSOSIATION              0xA0
-#define C80211_SUBTYPE_MGMT_Authentication              0xB0
-#define C80211_SUBTYPE_MGMT_Deauthentication    0xC0
-
-#define C80211_MGMT_AAN_OPENSYSTEM              0x0000
-#define C80211_MGMT_AAN_SHAREDKEY               0x0001
-
-#define C80211_MGMT_CAPABILITY_ESS              0x0001  // see 802.11 p.58
-#define C80211_MGMT_CAPABILITY_IBSS             0x0002  //      - " -
-#define C80211_MGMT_CAPABILITY_CFPollable       0x0004  //      - " -
-#define C80211_MGMT_CAPABILITY_CFPollRequest    0x0008  //      - " -
-#define C80211_MGMT_CAPABILITY_Privacy          0x0010  //      - " -
-
-#define C80211_MGMT_SC_Success                  0
-#define C80211_MGMT_SC_Unspecified              1
-#define C80211_MGMT_SC_SupportCapabilities      10
-#define C80211_MGMT_SC_ReassDenied              11
-#define C80211_MGMT_SC_AssDenied                12
-#define C80211_MGMT_SC_AuthAlgNotSupported      13
-#define C80211_MGMT_SC_AuthTransSeqNumError     14
-#define C80211_MGMT_SC_AuthRejectChallenge      15
-#define C80211_MGMT_SC_AuthRejectTimeout        16
-#define C80211_MGMT_SC_AssDeniedHandleAP        17
-#define C80211_MGMT_SC_AssDeniedBSSRate         18
-
-#define C80211_MGMT_ElementID_SSID              0
-#define C80211_MGMT_ElementID_SupportedRates    1
-#define C80211_MGMT_ElementID_ChallengeText     16
-#define C80211_MGMT_CAPABILITY_ShortPreamble    0x0020
-
 #define MIB_MAX_DATA_BYTES    212
 #define MIB_HEADER_SIZE       4    /* first four fields */
 
@@ -2835,7 +2797,7 @@ static void handle_beacon_probe(struct a
 				u8 channel)
 {
 	int rejoin = 0;
-	int new = capability  & C80211_MGMT_CAPABILITY_ShortPreamble ?
+	int new = capability & MFIE_TYPE_POWER_CONSTRAINT ?
 		SHORT_PREAMBLE : LONG_PREAMBLE;
 
 	if (priv->preamble != new) {
@@ -2921,11 +2883,11 @@ static void send_association_request(str
 	memcpy(header.addr2, priv->dev->dev_addr, 6);
 	memcpy(header.addr3, priv->CurrentBSSID, 6);
 
-	body.capability = cpu_to_le16(C80211_MGMT_CAPABILITY_ESS);
+	body.capability = cpu_to_le16(WLAN_CAPABILITY_ESS);
 	if (priv->wep_is_on)
-		body.capability |= cpu_to_le16(C80211_MGMT_CAPABILITY_Privacy);
+		body.capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
 	if (priv->preamble == SHORT_PREAMBLE)
-		body.capability |= cpu_to_le16(C80211_MGMT_CAPABILITY_ShortPreamble);
+		body.capability |= cpu_to_le16(MFIE_TYPE_POWER_CONSTRAINT);
 
 	body.listen_interval = cpu_to_le16(priv->listen_interval * priv->beacon_period);
 
@@ -2939,10 +2901,10 @@ static void send_association_request(str
 		bodysize = 12 + priv->SSID_size;
 	}
 
-	ssid_el_p[0] = C80211_MGMT_ElementID_SSID;
+	ssid_el_p[0] = MFIE_TYPE_SSID;
 	ssid_el_p[1] = priv->SSID_size;
 	memcpy(ssid_el_p + 2, priv->SSID, priv->SSID_size);
-	ssid_el_p[2 + priv->SSID_size] = C80211_MGMT_ElementID_SupportedRates;
+	ssid_el_p[2 + priv->SSID_size] = MFIE_TYPE_RATES;
 	ssid_el_p[3 + priv->SSID_size] = 4; /* len of suported rates */
 	memcpy(ssid_el_p + 4 + priv->SSID_size, atmel_basic_rates, 4);
 
@@ -3004,7 +2966,7 @@ static void store_bss_info(struct atmel_
 			   u16 beacon_period, u8 channel, u8 rssi, u8 ssid_len,
 			   u8 *ssid, int is_beacon)
 {
-	u8 *bss = capability & C80211_MGMT_CAPABILITY_ESS ? header->addr2 : header->addr3;
+	u8 *bss = capability & WLAN_CAPABILITY_ESS ? header->addr2 : header->addr3;
 	int i, index;
 
 	for (index = -1, i = 0; i < priv->BSS_list_entries; i++)
@@ -3030,16 +2992,16 @@ static void store_bss_info(struct atmel_
 
 	priv->BSSinfo[index].channel = channel;
 	priv->BSSinfo[index].beacon_period = beacon_period;
-	priv->BSSinfo[index].UsingWEP = capability & C80211_MGMT_CAPABILITY_Privacy;
+	priv->BSSinfo[index].UsingWEP = capability & WLAN_CAPABILITY_PRIVACY;
 	memcpy(priv->BSSinfo[index].SSID, ssid, ssid_len);
 	priv->BSSinfo[index].SSIDsize = ssid_len;
 
-	if (capability & C80211_MGMT_CAPABILITY_IBSS)
+	if (capability & WLAN_CAPABILITY_IBSS)
 		priv->BSSinfo[index].BSStype = IW_MODE_ADHOC;
-	else if (capability & C80211_MGMT_CAPABILITY_ESS)
+	else if (capability & WLAN_CAPABILITY_ESS)
 		priv->BSSinfo[index].BSStype =IW_MODE_INFRA;
 
-	priv->BSSinfo[index].preamble = capability & C80211_MGMT_CAPABILITY_ShortPreamble ?
+	priv->BSSinfo[index].preamble = capability & MFIE_TYPE_POWER_CONSTRAINT ?
 		SHORT_PREAMBLE : LONG_PREAMBLE;
 }
 
@@ -3050,7 +3012,7 @@ static void authenticate(struct atmel_pr
 	u16 trans_seq_no = le16_to_cpu(auth->trans_seq);
 	u16 system = le16_to_cpu(auth->alg);
 
-	if (status == C80211_MGMT_SC_Success && !priv->wep_is_on) {
+	if (status == WLAN_STATUS_SUCCESS && !priv->wep_is_on) {
 		/* no WEP */
 		if (priv->station_was_associated) {
 			atmel_enter_state(priv, STATION_STATE_REASSOCIATING);
@@ -3063,19 +3025,19 @@ static void authenticate(struct atmel_pr
 		}
 	}
 
-	if (status == C80211_MGMT_SC_Success && priv->wep_is_on) {
+	if (status == WLAN_STATUS_SUCCESS && priv->wep_is_on) {
 		int should_associate = 0;
 		/* WEP */
 		if (trans_seq_no != priv->ExpectedAuthentTransactionSeqNum)
 			return;
 
-		if (system == C80211_MGMT_AAN_OPENSYSTEM) {
+		if (system == WLAN_AUTH_OPEN) {
 			if (trans_seq_no == 0x0002) {
 				should_associate = 1;
 			}
-		} else if (system == C80211_MGMT_AAN_SHAREDKEY) {
+		} else if (system == WLAN_AUTH_SHARED_KEY) {
 			if (trans_seq_no == 0x0002 &&
-			    auth->el_id == C80211_MGMT_ElementID_ChallengeText) {
+			    auth->el_id == MFIE_TYPE_CHALLENGE) {
 				send_authentication_request(priv, system, auth->chall_text, auth->chall_text_len);
 				return;
 			} else if (trans_seq_no == 0x0004) {
@@ -3140,8 +3102,8 @@ static void associate(struct atmel_priva
 	if (frame_len < 8 + rates_len)
 		return;
 
-	if (status == C80211_MGMT_SC_Success) {
-		if (subtype == C80211_SUBTYPE_MGMT_ASS_RESPONSE)
+	if (status == WLAN_STATUS_SUCCESS) {
+		if (subtype == IEEE80211_STYPE_ASSOC_RESP)
 			priv->AssociationRequestRetryCnt = 0;
 		else
 			priv->ReAssociationRequestRetryCnt = 0;
@@ -3178,9 +3140,9 @@ static void associate(struct atmel_priva
 		return;
 	}
 
-	if (subtype == C80211_SUBTYPE_MGMT_ASS_RESPONSE &&
-	    status != C80211_MGMT_SC_AssDeniedBSSRate &&
-	    status != C80211_MGMT_SC_SupportCapabilities &&
+	if (subtype == IEEE80211_STYPE_ASSOC_RESP &&
+	    status != WLAN_STATUS_ASSOC_DENIED_RATES &&
+	    status != WLAN_STATUS_CAPS_UNSUPPORTED &&
 	    priv->AssociationRequestRetryCnt < MAX_ASSOCIATION_RETRIES) {
 		mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
 		priv->AssociationRequestRetryCnt++;
@@ -3188,9 +3150,9 @@ static void associate(struct atmel_priva
 		return;
 	}
 
-	if (subtype == C80211_SUBTYPE_MGMT_REASS_RESPONSE &&
-	    status != C80211_MGMT_SC_AssDeniedBSSRate &&
-	    status != C80211_MGMT_SC_SupportCapabilities &&
+	if (subtype == IEEE80211_STYPE_REASSOC_RESP &&
+	    status != WLAN_STATUS_ASSOC_DENIED_RATES &&
+	    status != WLAN_STATUS_CAPS_UNSUPPORTED &&
 	    priv->AssociationRequestRetryCnt < MAX_ASSOCIATION_RETRIES) {
 		mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
 		priv->ReAssociationRequestRetryCnt++;
@@ -3325,8 +3287,8 @@ static void atmel_management_frame(struc
 
 	subtype = le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_STYPE;
 	switch (subtype) {
-	case C80211_SUBTYPE_MGMT_BEACON:
-	case C80211_SUBTYPE_MGMT_ProbeResponse:
+	case IEEE80211_STYPE_BEACON:
+	case IEEE80211_STYPE_PROBE_RESP:
 
 		/* beacon frame has multiple variable-length fields -
 		   never let an engineer loose with a data structure design. */
@@ -3384,19 +3346,19 @@ static void atmel_management_frame(struc
 					       beacon_interval, channel, rssi,
 					       ssid_length,
 					       &beacon->rates_el_id,
-					       subtype == C80211_SUBTYPE_MGMT_BEACON);
+					       subtype == IEEE80211_STYPE_BEACON);
 		}
 		break;
 
-	case C80211_SUBTYPE_MGMT_Authentication:
+	case IEEE80211_STYPE_AUTH:
 
 		if (priv->station_state == STATION_STATE_AUTHENTICATING)
 			authenticate(priv, frame_len);
 
 		break;
 
-	case C80211_SUBTYPE_MGMT_ASS_RESPONSE:
-	case C80211_SUBTYPE_MGMT_REASS_RESPONSE:
+	case IEEE80211_STYPE_ASSOC_RESP:
+	case IEEE80211_STYPE_REASSOC_RESP:
 
 		if (priv->station_state == STATION_STATE_ASSOCIATING ||
 		    priv->station_state == STATION_STATE_REASSOCIATING)
@@ -3404,7 +3366,7 @@ static void atmel_management_frame(struc
 
 		break;
 
-	case C80211_SUBTYPE_MGMT_DISASSOSIATION:
+	case IEEE80211_STYPE_DISASSOC:
 		if (priv->station_is_associated &&
 		    priv->operating_mode == IW_MODE_INFRA &&
 		    is_frame_from_current_bss(priv, header)) {
@@ -3417,7 +3379,7 @@ static void atmel_management_frame(struc
 
 		break;
 
-	case C80211_SUBTYPE_MGMT_Deauthentication:
+	case IEEE80211_STYPE_DEAUTH:
 		if (priv->operating_mode == IW_MODE_INFRA &&
 		    is_frame_from_current_bss(priv, header)) {
 			priv->station_was_associated = 0;
@@ -3453,12 +3415,12 @@ static void atmel_management_timer(u_lon
 			priv->AuthenticationRequestRetryCnt = 0;
 			restart_search(priv);
 		} else {
-			int auth = C80211_MGMT_AAN_OPENSYSTEM;
+			int auth = WLAN_AUTH_OPEN;
 			priv->AuthenticationRequestRetryCnt++;
 			priv->CurrentAuthentTransactionSeqNum = 0x0001;
 			mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
 			if (priv->wep_is_on && priv->exclude_unencrypted)
-				auth = C80211_MGMT_AAN_SHAREDKEY;
+				auth = WLAN_AUTH_SHARED_KEY;
 			send_authentication_request(priv, auth, NULL, 0);
 	  }
 	  break;
@@ -3558,14 +3520,14 @@ static void atmel_command_irq(struct atm
 				priv->station_was_associated = priv->station_is_associated;
 				atmel_enter_state(priv, STATION_STATE_READY);
 			} else {
-				int auth = C80211_MGMT_AAN_OPENSYSTEM;
+				int auth = WLAN_AUTH_OPEN;
 				priv->AuthenticationRequestRetryCnt = 0;
 				atmel_enter_state(priv, STATION_STATE_AUTHENTICATING);
 
 				mod_timer(&priv->management_timer, jiffies + MGMT_JIFFIES);
 				priv->CurrentAuthentTransactionSeqNum = 0x0001;
 				if (priv->wep_is_on && priv->exclude_unencrypted)
-					auth = C80211_MGMT_AAN_SHAREDKEY;
+					auth = WLAN_AUTH_SHARED_KEY;
 				send_authentication_request(priv, auth, NULL, 0);
 			}
 			return;
---
0.99.8.GIT


--- NEW FILE 4707-ipw2200-add-monitor-and-qos-entries-to-Kconfig.txt ---
Subject: [PATCH] ipw2200: add monitor and qos entries to Kconfig
From: Andreas Happe <andreashappe at snikt.net>
Date: 1136486407 +0100

I have made a stupid copy&paste error: QoS option is named IPW_QOS not
IPW2200_MONITOR. Spotted by Daniel Paschka, thanks.

Add the following config entries for the ipw2200 driver to
drivers/net/wireless/Kconfig
 * IPW2200_MONITOR
   enables Monitor mode
 * IPW_QOS
   enables QoS feature - this is under development right now, so it depends
upon EXPERIMENTAL

Signed-off-by: Andreas Happe <andreashappe at snikt.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/Kconfig |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

applies-to: 7b476c729496958af5ac9e62ced13bd6a6151ea4
028e41ff60bf15943d267322d15584908980ee93
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 7587df7..f389467 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -216,6 +216,19 @@ config IPW2200
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2200.ko.
 
+config IPW2200_MONITOR
+        bool "Enable promiscuous mode"
+        depends on IPW2200
+        ---help---
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to 
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
+config IPW_QOS
+        bool "Enable QoS support"
+        depends on IPW2200 && EXPERIMENTAL
+
 config IPW2200_DEBUG
 	bool "Enable full debugging output in IPW2200 module."
 	depends on IPW2200
---
0.99.8.GIT


--- NEW FILE 4720-NETLINK-Fix-a-severe-bug.txt ---
Subject: [PATCH] [NETLINK]: Fix a severe bug
From: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
Date: 1139532011 -0800

netlink overrun was broken while improvement of netlink.
Destination socket is used in the place where it was meant to be source socket,
so that now overrun is never sent to user netlink sockets, when it should be,
and it even can be set on kernel socket, which results in complete deadlock
of rtnetlink.

Suggested fix is to restore status quo passing source socket as additional
argument to netlink_attachskb().

A little explanation: overrun is set on a socket, when it failed
to receive some message and sender of this messages does not or even
have no way to handle this error. This happens in two cases:
1. when kernel sends something. Kernel never retransmits and cannot
   wait for buffer space.
2. when user sends a broadcast and the message was not delivered
   to some recipients.

Signed-off-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/linux/netlink.h  |    3 ++-
 ipc/mqueue.c             |    3 ++-
 net/netlink/af_netlink.c |    7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

applies-to: 315363d4002ee449a8a754628c2f26d324157caf
a70ea994a0d83fd0151a070be72b87d014ef0a7e
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 6a2ccf7..c256ebe 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -160,7 +160,8 @@ extern int netlink_unregister_notifier(s
 
 /* finegrained unicast helpers: */
 struct sock *netlink_getsockbyfilp(struct file *filp);
-int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo);
+int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
+		long timeo, struct sock *ssk);
 void netlink_detachskb(struct sock *sk, struct sk_buff *skb);
 int netlink_sendskb(struct sock *sk, struct sk_buff *skb, int protocol);
 
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 59302fc..fd2e26b 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1018,7 +1018,8 @@ retry:
 				goto out;
 			}
 
-			ret = netlink_attachskb(sock, nc, 0, MAX_SCHEDULE_TIMEOUT);
+			ret = netlink_attachskb(sock, nc, 0,
+					MAX_SCHEDULE_TIMEOUT, NULL);
 			if (ret == 1)
 		       		goto retry;
 			if (ret) {
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 2101b45..6b9772d 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -702,7 +702,8 @@ struct sock *netlink_getsockbyfilp(struc
  * 0: continue
  * 1: repeat lookup - reference dropped while waiting for socket memory.
  */
-int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock, long timeo)
+int netlink_attachskb(struct sock *sk, struct sk_buff *skb, int nonblock,
+		long timeo, struct sock *ssk)
 {
 	struct netlink_sock *nlk;
 
@@ -712,7 +713,7 @@ int netlink_attachskb(struct sock *sk, s
 	    test_bit(0, &nlk->state)) {
 		DECLARE_WAITQUEUE(wait, current);
 		if (!timeo) {
-			if (!nlk->pid)
+			if (!ssk || nlk_sk(ssk)->pid == 0)
 				netlink_overrun(sk);
 			sock_put(sk);
 			kfree_skb(skb);
@@ -797,7 +798,7 @@ retry:
 		kfree_skb(skb);
 		return PTR_ERR(sk);
 	}
-	err = netlink_attachskb(sk, skb, nonblock, timeo);
+	err = netlink_attachskb(sk, skb, nonblock, timeo, ssk);
 	if (err == 1)
 		goto retry;
 	if (err)
---
0.99.8.GIT


--- NEW FILE 4721-NETLINK-illegal-use-of-pid-in-rtnetlink.txt ---
Subject: [PATCH] [NETLINK]: illegal use of pid in rtnetlink
From: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
Date: 1139532058 -0800

When a netlink message is not related to a netlink socket,
it is issued by kernel socket with pid 0. Netlink "pid" has nothing
to do with current->pid. I called it incorrectly, if it was named "port",
the confusion would be avoided.

Signed-off-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/core/rtnetlink.c     |    2 +-
 net/ipv4/devinet.c       |    2 +-
 net/ipv4/fib_semantics.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

applies-to: 40e3bf28a3fa36f20b4625c241ca14abb0c1a00d
28633514afd68afa77ed2fa34fa53626837bf2d5
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 8700379..eca2976 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -455,7 +455,7 @@ void rtmsg_ifinfo(int type, struct net_d
 	if (!skb)
 		return;
 
-	if (rtnetlink_fill_ifinfo(skb, dev, type, current->pid, 0, change, 0) < 0) {
+	if (rtnetlink_fill_ifinfo(skb, dev, type, 0, 0, change, 0) < 0) {
 		kfree_skb(skb);
 		return;
 	}
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 95b9d81..3ffa60d 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1135,7 +1135,7 @@ static void rtmsg_ifa(int event, struct 
 
 	if (!skb)
 		netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, ENOBUFS);
-	else if (inet_fill_ifaddr(skb, ifa, current->pid, 0, event, 0) < 0) {
+	else if (inet_fill_ifaddr(skb, ifa, 0, 0, event, 0) < 0) {
 		kfree_skb(skb);
 		netlink_set_err(rtnl, 0, RTNLGRP_IPV4_IFADDR, EINVAL);
 	} else {
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index ef4724d..0f4145b 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1045,7 +1045,7 @@ fib_convert_rtentry(int cmd, struct nlms
 	}
 
 	nl->nlmsg_flags = NLM_F_REQUEST;
-	nl->nlmsg_pid = current->pid;
+	nl->nlmsg_pid = 0;
 	nl->nlmsg_seq = 0;
 	nl->nlmsg_len = NLMSG_LENGTH(sizeof(*rtm));
 	if (cmd == SIOCDELRT) {
---
0.99.8.GIT


--- NEW FILE 4722-IRDA-Set-proper-IrLAP-device-address-length.txt ---
Subject: [PATCH] [IRDA]: Set proper IrLAP device address length
From: Samuel Ortiz <samuel.ortiz at nokia.com>
Date: 1139533126 -0800

This patch set IrDA's addr_len properly, i.e to 4 bytes, the size of the
IrLAP device address.

Signed-off-by: Samuel Ortiz <samuel.ortiz at nokia.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/irda/irlap.h |    3 +++
 net/irda/irda_device.c   |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

applies-to: 5f816a81d5aad85521b0c092885bd2b735bafd1d
d93077fb0e7cb9d4f4094a649501d840c55fdc8b
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h
index f55e86e..2127cae 100644
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
@@ -50,6 +50,9 @@
 /* May be different when we get VFIR */
 #define LAP_MAX_HEADER (LAP_ADDR_HEADER + LAP_CTRL_HEADER)
 
+/* Each IrDA device gets a random 32 bits IRLAP device address */
+#define LAP_ALEN 4
+
 #define BROADCAST  0xffffffff /* Broadcast device address */
 #define CBROADCAST 0xfe       /* Connection broadcast address */
 #define XID_FORMAT 0x01       /* Discovery XID format */
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 890bac0..e3debbd 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -343,12 +343,12 @@ static void irda_task_timer_expired(void
 static void irda_device_setup(struct net_device *dev)
 {
         dev->hard_header_len = 0;
-        dev->addr_len        = 0;
+        dev->addr_len        = LAP_ALEN;
 
         dev->type            = ARPHRD_IRDA;
         dev->tx_queue_len    = 8; /* Window size + 1 s-frame */
 
-	memset(dev->broadcast, 0xff, 4);
+	memset(dev->broadcast, 0xff, LAP_ALEN);
 
 	dev->mtu = 2048;
 	dev->flags = IFF_NOARP;
---
0.99.8.GIT


--- NEW FILE 4723-IRDA-out-of-range-array-access.txt ---
Subject: [PATCH] [IRDA]: out of range array access
From: David Binderman <dcb314 at hotmail.com>
Date: 1139533188 -0800

This patch fixes an out of range array access in irnet_irda.c.

Author: David Binderman <dcb314 at hotmail.com>
Signed-off-by: Samuel Ortiz <samuel.ortiz at nokia.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/irda/irnet/irnet_irda.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 4786704b28bdddd2696e2791ea1dc641bf134cb3
80ba250e59ced808a8c9b79560938bbe4509c0a7
diff --git a/net/irda/irnet/irnet_irda.c b/net/irda/irnet/irnet_irda.c
index 07ec326..f65c7a8 100644
--- a/net/irda/irnet/irnet_irda.c
+++ b/net/irda/irnet/irnet_irda.c
@@ -696,7 +696,7 @@ irnet_daddr_to_dname(irnet_socket *	self
 	{
 	  /* Yes !!! Get it.. */
 	  strlcpy(self->rname, discoveries[i].info, sizeof(self->rname));
-	  self->rname[NICKNAME_MAX_LEN + 1] = '\0';
+	  self->rname[sizeof(self->rname) - 1] = '\0';
 	  DEBUG(IRDA_SERV_INFO, "Device 0x%08x is in fact ``%s''.\n",
 		self->daddr, self->rname);
 	  kfree(discoveries);
---
0.99.8.GIT


--- NEW FILE 4724-TCP-rcvbuf-lock-when-tcp_moderate_rcvbuf-enabled.txt ---
Subject: [PATCH] [TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled
From: John Heffner <jheffner at psc.edu>
Date: 1139533617 -0800

The rcvbuf lock should probably be honored here.

Signed-off-by: John Heffner <jheffner at psc.edu>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/tcp_input.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

applies-to: 017c64acb3a5d5a43a495ea1e58b2dc270e2441e
6fcf9412de64056238a6295f21db7aa9c37a532e
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index a97ed54..e9a54ae 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -456,7 +456,8 @@ void tcp_rcv_space_adjust(struct sock *s
 
 		tp->rcvq_space.space = space;
 
-		if (sysctl_tcp_moderate_rcvbuf) {
+		if (sysctl_tcp_moderate_rcvbuf &&
+		    !(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
 			int new_clamp = space;
 
 			/* Receive space grows, normalize in order to
---
0.99.8.GIT


--- NEW FILE 4725-BRIDGE-fix-for-RCU-and-deadlock-on-device-removal.txt ---
Subject: [PATCH] [BRIDGE]: fix for RCU and deadlock on device removal
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1139533732 -0800

Change Bridge receive path to correctly handle RCU removal of device
from bridge.  Also fixes deadlock between carrier_check and del_nbp.
This replaces the previous deleted flag fix.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/br_if.c       |   21 +++++++++++----------
 net/bridge/br_input.c    |   19 ++++++++++++-------
 net/bridge/br_private.h  |    1 -
 net/bridge/br_stp_bpdu.c |   30 ++++++++++++++++++------------
 4 files changed, 41 insertions(+), 30 deletions(-)

applies-to: 06cd8f20551ce8173e8cccb8ecd628f955f7db6e
b3f1be4b5412e34647764457bec901e06b03e624
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index da687c8..70b7ef9 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -79,9 +79,14 @@ static int port_cost(struct net_device *
  */
 static void port_carrier_check(void *arg)
 {
-	struct net_bridge_port *p = arg;
+	struct net_device *dev = arg;
+	struct net_bridge_port *p;
 
 	rtnl_lock();
+	p = dev->br_port;
+	if (!p)
+		goto done;
+
 	if (netif_carrier_ok(p->dev)) {
 		u32 cost = port_cost(p->dev);
 
@@ -97,6 +102,7 @@ static void port_carrier_check(void *arg
 			br_stp_disable_port(p);
 		spin_unlock_bh(&p->br->lock);
 	}
+done:
 	rtnl_unlock();
 }
 
@@ -104,7 +110,6 @@ static void destroy_nbp(struct net_bridg
 {
 	struct net_device *dev = p->dev;
 
-	dev->br_port = NULL;
 	p->br = NULL;
 	p->dev = NULL;
 	dev_put(dev);
@@ -133,24 +138,20 @@ static void del_nbp(struct net_bridge_po
 	struct net_bridge *br = p->br;
 	struct net_device *dev = p->dev;
 
-	/* Race between RTNL notify and RCU callback */
-	if (p->deleted)
-		return;
-
 	dev_set_promiscuity(dev, -1);
 
 	cancel_delayed_work(&p->carrier_check);
-	flush_scheduled_work();
 
 	spin_lock_bh(&br->lock);
 	br_stp_disable_port(p);
-	p->deleted = 1;
 	spin_unlock_bh(&br->lock);
 
 	br_fdb_delete_by_port(br, p);
 
 	list_del_rcu(&p->list);
 
+	rcu_assign_pointer(dev->br_port, NULL);
+
 	call_rcu(&p->rcu, destroy_nbp_rcu);
 }
 
@@ -254,11 +255,10 @@ static struct net_bridge_port *new_nbp(s
 	p->dev = dev;
 	p->path_cost = port_cost(dev);
  	p->priority = 0x8000 >> BR_PORT_BITS;
-	dev->br_port = p;
 	p->port_no = index;
 	br_init_port(p);
 	p->state = BR_STATE_DISABLED;
-	INIT_WORK(&p->carrier_check, port_carrier_check, p);
+	INIT_WORK(&p->carrier_check, port_carrier_check, dev);
 	kobject_init(&p->kobj);
 
 	return p;
@@ -397,6 +397,7 @@ int br_add_if(struct net_bridge *br, str
 	else if ((err = br_sysfs_addif(p)))
 		del_nbp(p);
 	else {
+		rcu_assign_pointer(dev->br_port, p);
 		dev_set_promiscuity(dev, 1);
 
 		list_add_rcu(&p->list, &br->port_list);
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index e3a73ce..4eef837 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -45,18 +45,20 @@ static void br_pass_frame_up(struct net_
 int br_handle_frame_finish(struct sk_buff *skb)
 {
 	const unsigned char *dest = eth_hdr(skb)->h_dest;
-	struct net_bridge_port *p = skb->dev->br_port;
-	struct net_bridge *br = p->br;
+	struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+	struct net_bridge *br;
 	struct net_bridge_fdb_entry *dst;
 	int passedup = 0;
 
+	if (!p || p->state == BR_STATE_DISABLED)
+		goto drop;
+
 	/* insert into forwarding database after filtering to avoid spoofing */
-	br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
+	br = p->br;
+	br_fdb_update(br, p, eth_hdr(skb)->h_source);
 
-	if (p->state == BR_STATE_LEARNING) {
-		kfree_skb(skb);
-		goto out;
-	}
+	if (p->state == BR_STATE_LEARNING)
+		goto drop;
 
 	if (br->dev->flags & IFF_PROMISC) {
 		struct sk_buff *skb2;
@@ -93,6 +95,9 @@ int br_handle_frame_finish(struct sk_buf
 
 out:
 	return 0;
+drop:
+	kfree_skb(skb);
+	goto out;
 }
 
 /*
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index e330b17..c5bd631 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -68,7 +68,6 @@ struct net_bridge_port
 	/* STP */
 	u8				priority;
 	u8				state;
-	u8				deleted;
 	u16				port_no;
 	unsigned char			topology_change_ack;
 	unsigned char			config_pending;
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c
index d071f1c..296f6a4 100644
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -133,29 +133,35 @@ void br_send_tcn_bpdu(struct net_bridge_
 
 static const unsigned char header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
 
-/* NO locks */
+/* NO locks, but rcu_read_lock (preempt_disabled)  */
 int br_stp_handle_bpdu(struct sk_buff *skb)
 {
-	struct net_bridge_port *p = skb->dev->br_port;
-	struct net_bridge *br = p->br;
+	struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+	struct net_bridge *br;
 	unsigned char *buf;
 
+	if (!p)
+		goto err;
+
+	br = p->br;
+	spin_lock(&br->lock);
+
+	if (p->state == BR_STATE_DISABLED || !(br->dev->flags & IFF_UP))
+		goto out;
+
 	/* insert into forwarding database after filtering to avoid spoofing */
-	br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
+	br_fdb_update(br, p, eth_hdr(skb)->h_source);
+
+	if (!br->stp_enabled)
+		goto out;
 
 	/* need at least the 802 and STP headers */
 	if (!pskb_may_pull(skb, sizeof(header)+1) ||
 	    memcmp(skb->data, header, sizeof(header)))
-		goto err;
+		goto out;
 
 	buf = skb_pull(skb, sizeof(header));
 
-	spin_lock_bh(&br->lock);
-	if (p->state == BR_STATE_DISABLED 
-	    || !(br->dev->flags & IFF_UP)
-	    || !br->stp_enabled)
-		goto out;
-
 	if (buf[0] == BPDU_TYPE_CONFIG) {
 		struct br_config_bpdu bpdu;
 
@@ -201,7 +207,7 @@ int br_stp_handle_bpdu(struct sk_buff *s
 		br_received_tcn_bpdu(p);
 	}
  out:
-	spin_unlock_bh(&br->lock);
+	spin_unlock(&br->lock);
  err:
 	kfree_skb(skb);
 	return 0;
---
0.99.8.GIT


--- NEW FILE 4726-BRIDGE-netfilter-handle-RCU-during-removal.txt ---
Subject: [PATCH] [BRIDGE]: netfilter handle RCU during removal
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1139533778 -0800

Bridge netfilter code needs to handle the case where device is
removed from bridge while packet in process. In these cases the
bridge_parent can become null while processing.

This should fix: http://bugzilla.kernel.org/show_bug.cgi?id=5803

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/br_netfilter.c |   53 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 15 deletions(-)

applies-to: b3f1529ff0882ebb5aed190d8a61b52f703503ce
5dce971acf2ae20c80d5e9d1f6bbf17376870911
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 7cac3fb..b501816 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -51,9 +51,6 @@
 #define store_orig_dstaddr(skb)	 (skb_origaddr(skb) = (skb)->nh.iph->daddr)
 #define dnat_took_place(skb)	 (skb_origaddr(skb) != (skb)->nh.iph->daddr)
 
-#define has_bridge_parent(device)	((device)->br_port != NULL)
-#define bridge_parent(device)		((device)->br_port->br->dev)
-
 #ifdef CONFIG_SYSCTL
 static struct ctl_table_header *brnf_sysctl_header;
 static int brnf_call_iptables = 1;
@@ -98,6 +95,12 @@ static struct rtable __fake_rtable = {
 	.rt_flags	= 0,
 };
 
+static inline struct net_device *bridge_parent(const struct net_device *dev)
+{
+	struct net_bridge_port *port = rcu_dereference(dev->br_port);
+
+	return port ? port->br->dev : NULL;
+}
 
 /* PF_BRIDGE/PRE_ROUTING *********************************************/
 /* Undo the changes made for ip6tables PREROUTING and continue the
@@ -189,11 +192,15 @@ static int br_nf_pre_routing_finish_brid
 	skb->nf_bridge->mask ^= BRNF_NF_BRIDGE_PREROUTING;
 
 	skb->dev = bridge_parent(skb->dev);
-	if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
-		skb_pull(skb, VLAN_HLEN);
-		skb->nh.raw += VLAN_HLEN;
+	if (!skb->dev)
+		kfree_skb(skb);
+	else {
+		if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+			skb_pull(skb, VLAN_HLEN);
+			skb->nh.raw += VLAN_HLEN;
+		}
+		skb->dst->output(skb);
 	}
-	skb->dst->output(skb);
 	return 0;
 }
 
@@ -270,7 +277,7 @@ bridged_dnat:
 }
 
 /* Some common code for IPv4/IPv6 */
-static void setup_pre_routing(struct sk_buff *skb)
+static struct net_device *setup_pre_routing(struct sk_buff *skb)
 {
 	struct nf_bridge_info *nf_bridge = skb->nf_bridge;
 
@@ -282,6 +289,8 @@ static void setup_pre_routing(struct sk_
 	nf_bridge->mask |= BRNF_NF_BRIDGE_PREROUTING;
 	nf_bridge->physindev = skb->dev;
 	skb->dev = bridge_parent(skb->dev);
+
+	return skb->dev;
 }
 
 /* We only check the length. A bridge shouldn't do any hop-by-hop stuff anyway */
@@ -376,7 +385,8 @@ static unsigned int br_nf_pre_routing_ip
  	nf_bridge_put(skb->nf_bridge);
 	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
 		return NF_DROP;
-	setup_pre_routing(skb);
+	if (!setup_pre_routing(skb))
+		return NF_DROP;
 
 	NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL,
 		br_nf_pre_routing_finish_ipv6);
@@ -465,7 +475,8 @@ static unsigned int br_nf_pre_routing(un
  	nf_bridge_put(skb->nf_bridge);
 	if ((nf_bridge = nf_bridge_alloc(skb)) == NULL)
 		return NF_DROP;
-	setup_pre_routing(skb);
+	if (!setup_pre_routing(skb))
+		return NF_DROP;
 	store_orig_dstaddr(skb);
 
 	NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, skb->dev, NULL,
@@ -539,11 +550,16 @@ static unsigned int br_nf_forward_ip(uns
 	struct sk_buff *skb = *pskb;
 	struct nf_bridge_info *nf_bridge;
 	struct vlan_ethhdr *hdr = vlan_eth_hdr(skb);
+	struct net_device *parent;
 	int pf;
 
 	if (!skb->nf_bridge)
 		return NF_ACCEPT;
 
+	parent = bridge_parent(out);
+	if (!parent)
+		return NF_DROP;
+
 	if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP)
 		pf = PF_INET;
 	else
@@ -564,8 +580,8 @@ static unsigned int br_nf_forward_ip(uns
 	nf_bridge->mask |= BRNF_BRIDGED;
 	nf_bridge->physoutdev = skb->dev;
 
-	NF_HOOK(pf, NF_IP_FORWARD, skb, bridge_parent(in),
-		bridge_parent(out), br_nf_forward_finish);
+	NF_HOOK(pf, NF_IP_FORWARD, skb, bridge_parent(in), parent,
+		br_nf_forward_finish);
 
 	return NF_STOLEN;
 }
@@ -688,6 +704,8 @@ static unsigned int br_nf_local_out(unsi
 		goto out;
 	}
 	realoutdev = bridge_parent(skb->dev);
+	if (!realoutdev)
+		return NF_DROP;
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 	/* iptables should match -o br0.x */
@@ -701,9 +719,11 @@ static unsigned int br_nf_local_out(unsi
 	/* IP forwarded traffic has a physindev, locally
 	 * generated traffic hasn't. */
 	if (realindev != NULL) {
-		if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT) &&
-		    has_bridge_parent(realindev))
-			realindev = bridge_parent(realindev);
+		if (!(nf_bridge->mask & BRNF_DONT_TAKE_PARENT) ) {
+			struct net_device *parent = bridge_parent(realindev);
+			if (parent)
+				realindev = parent;
+		}
 
 		NF_HOOK_THRESH(pf, NF_IP_FORWARD, skb, realindev,
 			       realoutdev, br_nf_local_out_finish,
@@ -743,6 +763,9 @@ static unsigned int br_nf_post_routing(u
 	if (!nf_bridge)
 		return NF_ACCEPT;
 
+	if (!realoutdev)
+		return NF_DROP;
+
 	if (skb->protocol == __constant_htons(ETH_P_IP) || IS_VLAN_IP)
 		pf = PF_INET;
 	else
---
0.99.8.GIT


--- NEW FILE 4746-BNX2-include-linux-vmalloc.h.txt ---
Subject: [PATCH] [BNX2]: include <linux/vmalloc.h>
From: Michael Chan <mchan at broadcom.com>
Date: 1139611693 -0800

Include <linux/vmalloc.h> so that it compiles properly on all archs.

Update version to 1.4.38.

Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 drivers/net/bnx2.c |    4 ++--
 drivers/net/bnx2.h |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

applies-to: b2025a6950fb103a92b3e00dc461da5e7e04ceb4
b14652393ae4ea569e655c2b36158aeb74531a52
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 630281b..fc19fb8 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -14,8 +14,8 @@
 
 #define DRV_MODULE_NAME		"bnx2"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"1.4.37"
-#define DRV_MODULE_RELDATE	"February 1, 2006"
+#define DRV_MODULE_VERSION	"1.4.38"
+#define DRV_MODULE_RELDATE	"February 10, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index beb2e8b..fd4b7f2 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -23,6 +23,7 @@
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
+#include <linux/vmalloc.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
---
0.99.8.GIT


--- NEW FILE 4777-netfilter-fix-build-error-due-to-missing-has_bridge_parent-macro.txt ---
Subject: [PATCH] netfilter: fix build error due to missing has_bridge_parent macro
From: Jesper Juhl <jesper.juhl at gmail.com>
Date: 1139783693 -0800

net/bridge/br_netfilter.c: In function `br_nf_post_routing':
net/bridge/br_netfilter.c:808: warning: implicit declaration of function `has_bridge_parent'

Signed-off-by: Jesper Juhl <jesper.juhl at gmail.com>
Cc: Harald Welte <laforge at netfilter.org>
Cc: "David S. Miller" <davem at davemloft.net>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 net/bridge/br_netfilter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: de36710d694c9deb7a167d0da28de43835bd4577
3c791925da0e6108cda15e3c2c7bfaebcd9ab9cf
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index b501816..c06cb09 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(u
 print_error:
 	if (skb->dev != NULL) {
 		printk("[%s]", skb->dev->name);
-		if (has_bridge_parent(skb->dev))
+		if (bridge_parent(skb->dev))
 			printk("[%s]", bridge_parent(skb->dev)->name);
 	}
 	printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
---
0.99.8.GIT


--- NEW FILE 4779-orinoco-support-smc2532w.txt ---
Subject: [PATCH] orinoco: support smc2532w
From: Jesse Allen <the3dfxdude at gmail.com>
Date: 1139783696 -0800

The orinoco wireless driver can support the SMC 2532W-B PC Card, so add the
id for it.

Signed-off-by: Jesse Allen <the3dfxdude at gmail.com>
Cc: Pavel Roskin <proski at gnu.org>
Cc: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: Linus Torvalds <torvalds at osdl.org>

---

 drivers/net/wireless/orinoco_cs.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

applies-to: abe4ceb1f1d5e59a6e090e255f9330d7100d8e5a
8f6da52aeff1fd7272ff5082552a39c050565b57
diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 3c128b6..ec6f2a4 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -590,6 +590,7 @@ static struct pcmcia_device_id orinoco_c
 	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
 	PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
 	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
+	PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757),
 	PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a),
 	PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),
 	PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
---
0.99.8.GIT


--- NEW FILE 4785-Bluetooth-Reduce-L2CAP-MTU-for-RFCOMM-connections.txt ---
Subject: [PATCH] [Bluetooth] Reduce L2CAP MTU for RFCOMM connections
From: Marcel Holtmann <marcel at holtmann.org>
Date: 1139827197 +0100

This patch reduces the default L2CAP MTU for all RFCOMM connections
from 1024 to 1013 to improve the interoperability with some broken
RFCOMM implementations. To make this more flexible the L2CAP MTU
becomes also a module parameter and so it can changed at runtime.

Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

---

 include/net/bluetooth/rfcomm.h |    2 +-
 net/bluetooth/rfcomm/core.c    |   13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

applies-to: 554808e3e49d6c89016b0c6e4d56b7a590725d3e
56f3a40a5e7586043260669cc794e56fa58339e1
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index bbfac86..89d743c 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -33,7 +33,7 @@
 #define RFCOMM_DEFAULT_MTU	127
 #define RFCOMM_DEFAULT_CREDITS	7
 
-#define RFCOMM_MAX_L2CAP_MTU	1024
+#define RFCOMM_MAX_L2CAP_MTU	1013
 #define RFCOMM_MAX_CREDITS	40
 
 #define RFCOMM_SKB_HEAD_RESERVE	8
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 0d89d64..5b4253c 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -46,13 +46,15 @@
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/rfcomm.h>
 
-#define VERSION "1.6"
-
 #ifndef CONFIG_BT_RFCOMM_DEBUG
 #undef  BT_DBG
 #define BT_DBG(D...)
 #endif
 
+#define VERSION "1.7"
+
+static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU;
+
 static struct task_struct *rfcomm_thread;
 
 static DECLARE_MUTEX(rfcomm_sem);
@@ -623,7 +625,7 @@ static struct rfcomm_session *rfcomm_ses
 	/* Set L2CAP options */
 	sk = sock->sk;
 	lock_sock(sk);
-	l2cap_pi(sk)->imtu = RFCOMM_MAX_L2CAP_MTU;
+	l2cap_pi(sk)->imtu = l2cap_mtu;
 	release_sock(sk);
 
 	s = rfcomm_session_add(sock, BT_BOUND);
@@ -1868,7 +1870,7 @@ static int rfcomm_add_listener(bdaddr_t 
 	/* Set L2CAP options */
 	sk = sock->sk;
 	lock_sock(sk);
-	l2cap_pi(sk)->imtu = RFCOMM_MAX_L2CAP_MTU;
+	l2cap_pi(sk)->imtu = l2cap_mtu;
 	release_sock(sk);
 
 	/* Start listening on the socket */
@@ -2070,6 +2072,9 @@ static void __exit rfcomm_exit(void)
 module_init(rfcomm_init);
 module_exit(rfcomm_exit);
 
+module_param(l2cap_mtu, uint, 0644);
+MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection");
+
 MODULE_AUTHOR("Maxim Krasnyansky <maxk at qualcomm.com>, Marcel Holtmann <marcel at holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION);
 MODULE_VERSION(VERSION);
---
0.99.8.GIT


--- NEW FILE 4786-Bluetooth-Fix-NULL-pointer-dereferences-of-the-HCI-socket.txt ---
Subject: [PATCH] [Bluetooth] Fix NULL pointer dereferences of the HCI socket
From: Marcel Holtmann <marcel at holtmann.org>
Date: 1139827203 +0100

This patch fixes the two NULL pointer dereferences found by the sfuzz
tool from Ilja van Sprundel. The first one was a call of getsockname()
for an unbound socket and the second was calling accept() while this
operation isn't implemented for the HCI socket interface.

Signed-off-by: Marcel Holtmann <marcel at holtmann.org>

---

 net/bluetooth/hci_sock.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

applies-to: a2a756d86f8ff9da8d5668d2dfbf51f5107c53ce
7b005bd34c895ebeefd1c62f90a329730b88946b
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index bdb6458..97bdec7 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -143,13 +143,15 @@ void hci_send_to_sock(struct hci_dev *hd
 static int hci_sock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
-	struct hci_dev *hdev = hci_pi(sk)->hdev;
+	struct hci_dev *hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
 	if (!sk)
 		return 0;
 
+	hdev = hci_pi(sk)->hdev;
+
 	bt_sock_unlink(&hci_sk_list, sk);
 
 	if (hdev) {
@@ -311,14 +313,18 @@ static int hci_sock_getname(struct socke
 {
 	struct sockaddr_hci *haddr = (struct sockaddr_hci *) addr;
 	struct sock *sk = sock->sk;
+	struct hci_dev *hdev = hci_pi(sk)->hdev;
 
 	BT_DBG("sock %p sk %p", sock, sk);
 
+	if (!hdev)
+		return -EBADFD;
+
 	lock_sock(sk);
 
 	*addr_len = sizeof(*haddr);
 	haddr->hci_family = AF_BLUETOOTH;
-	haddr->hci_dev    = hci_pi(sk)->hdev->id;
+	haddr->hci_dev    = hdev->id;
 
 	release_sock(sk);
 	return 0;
---
0.99.8.GIT


--- NEW FILE 4791-Sync-bcm43xx_phy_initb6-with-specs.txt ---
Subject: [PATCH] Sync bcm43xx_phy_initb6() with specs
From: Danny van Dyk <kugelfang at gentoo.org>
Date: 1138750985 +0100

Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/bcm43xx/bcm43xx_phy.c   |   15 ++++++++++-----
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c |    2 +-
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h |    1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

applies-to: 664aa184ff0fbd921e6c8088a66285b4c9010b21
8e5408a3a206ab8054bdd9825cef25d1f39d5ace
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index f5e7a6a..d90f207 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bc
 	bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
 	if ((bcm->current_core->radio->manufact == 0x17F) &&
 	    (bcm->current_core->radio->version == 0x2050) &&
-	    (bcm->current_core->radio->revision == 2)) {
+	    (bcm->current_core->radio->revision <= 2)) {
 		bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
 		bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
 		bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
@@ -984,10 +984,15 @@ static void bcm43xx_phy_initb6(struct bc
 		bcm43xx_write16(bcm, 0x03E4, 0x0009);
 	if (phy->type == BCM43xx_PHYTYPE_B) {
 		bcm43xx_write16(bcm, 0x03E6, 0x8140);
-		bcm43xx_phy_write(bcm, 0x0016, 0x5410);
-		bcm43xx_phy_write(bcm, 0x0017, 0xA820);
-		bcm43xx_phy_write(bcm, 0x0007, 0x0062);
-		TODO();//TODO: calibrate stuff.
+		bcm43xx_phy_write(bcm, 0x0016, 0x0410);
+		bcm43xx_phy_write(bcm, 0x0017, 0x0820);
+		bcm43xx_phy_write(bcm, 0x0062, 0x0007);
+		(void) bcm43xx_radio_calibrationvalue(bcm);
+		bcm43xx_phy_lo_b_measure(bcm);
+		if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
+			bcm43xx_calc_nrssi_slope(bcm);
+			bcm43xx_calc_nrssi_threshold(bcm);
+		}
 		bcm43xx_phy_init_pctl(bcm);
 	} else
 		bcm43xx_write16(bcm, 0x03E6, 0x0);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 5ce6ace..3901aa9 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitig
 	return 0;
 }
 
-static u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
 {
 	u16 reg, index, ret;
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
index 89fe292..a5d2e10 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
@@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm4
 void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm);
 
 void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm);
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm);
 
 #endif /* BCM43xx_RADIO_H_ */
---
0.99.8.GIT


--- NEW FILE 4792-IRDA-Ratelimit-messages.txt ---
Subject: [PATCH] [IRDA]: Ratelimit messages.
From: Joe Perches <joe at perches.com>
Date: 1139873651 -0800

From: Joe Perches <joe at perches.com>

Based upon a patch by Dave Jones.

Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 include/net/irda/irda.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

applies-to: 42c793ae47f694ebfbd6b2feb26c8c93280d5978
7a11c4d0635d9f6995736390b8c3346fe6f63d57
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index 05a8408..1880e46 100644
--- a/include/net/irda/irda.h
+++ b/include/net/irda/irda.h
@@ -82,9 +82,9 @@ do { if(!(expr)) { \
 #define IRDA_ASSERT_LABEL(label)
 #endif /* CONFIG_IRDA_DEBUG */
 
-#define IRDA_WARNING(args...) printk(KERN_WARNING args)
-#define IRDA_MESSAGE(args...) printk(KERN_INFO args)
-#define IRDA_ERROR(args...)   printk(KERN_ERR args)
+#define IRDA_WARNING(args...) do { if (net_ratelimit()) printk(KERN_WARNING args); } while (0)
+#define IRDA_MESSAGE(args...) do { if (net_ratelimit()) printk(KERN_INFO args); } while (0)
+#define IRDA_ERROR(args...)   do { if (net_ratelimit()) printk(KERN_ERR args); } while (0)
 
 /*
  *  Magic numbers used by Linux-IrDA. Random numbers which must be unique to 
---
0.99.8.GIT


--- NEW FILE 4793-ATM-Ratelimit-atmsvc-failure-messages.txt ---
Subject: [PATCH] [ATM]: Ratelimit atmsvc failure messages
From: Dave Jones <davej at redhat.com>
Date: 1139873698 -0800

This seems to be trivial to trigger.

Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/atm/signaling.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

applies-to: 462aa4a17b5ef59350f726ca39035c513bd2e5a5
bf3883c12fece9189ab4f7bb6e2690451db1366e
diff --git a/net/atm/signaling.c b/net/atm/signaling.c
index e7211a7..93ad59a 100644
--- a/net/atm/signaling.c
+++ b/net/atm/signaling.c
@@ -56,7 +56,8 @@ static void sigd_put_skb(struct sk_buff 
 	remove_wait_queue(&sigd_sleep,&wait);
 #else
 	if (!sigd) {
-		printk(KERN_WARNING "atmsvc: no signaling demon\n");
+		if (net_ratelimit())
+			printk(KERN_WARNING "atmsvc: no signaling demon\n");
 		kfree_skb(skb);
 		return;
 	}
---
0.99.8.GIT


--- NEW FILE 4794-IPV4-ICMP-Invert-default-for-invalid-icmp-msgs-sysctl.txt ---
Subject: [PATCH] [IPV4] ICMP: Invert default for invalid icmp msgs sysctl
From: Dave Jones <davej at redhat.com>
Date: 1139873781 -0800

isic can trigger these msgs to be spewed at a very high rate.
There's already a sysctl to turn them off. Given these messages
aren't useful for most people, this patch disables them by
default.

Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv4/icmp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 044a6678fff7b3325169794d2a06f2d25ef95616
77decfc716d460b3f7037bb19bd4eb12cd0dc996
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 4d1c409..e7bbff4 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -192,7 +192,7 @@ int sysctl_icmp_echo_ignore_all;
 int sysctl_icmp_echo_ignore_broadcasts = 1;
 
 /* Control parameter - ignore bogus broadcast responses? */
-int sysctl_icmp_ignore_bogus_error_responses;
+int sysctl_icmp_ignore_bogus_error_responses = 1;
 
 /*
  * 	Configurable global rate limit.
---
0.99.8.GIT


--- NEW FILE 4795-P8023-Fix-tainting-of-kernel.txt ---
Subject: [PATCH] [P8023]: Fix tainting of kernel.
From: Dave Jones <davej at redhat.com>
Date: 1139873922 -0800

Missing license tag.
I've assumed this is GPL.  (It could also use a MODULE_AUTHOR)

Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/802/p8023.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

applies-to: e6fca07597e12c07af4bd90cfffc80a3f694387e
99e382afd297d91ab150ae46c28c4585f925818c
diff --git a/net/802/p8023.c b/net/802/p8023.c
index d23e906..53cf057 100644
--- a/net/802/p8023.c
+++ b/net/802/p8023.c
@@ -59,3 +59,5 @@ void destroy_8023_client(struct datalink
 
 EXPORT_SYMBOL(destroy_8023_client);
 EXPORT_SYMBOL(make_8023_client);
+
+MODULE_LICENSE("GPL");
---
0.99.8.GIT


--- NEW FILE 4797-BRIDGE-Better-fix-for-netfilter-missing-symbol-has_bridge_parent.txt ---
Subject: [PATCH] [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent
From: Stephen Hemminger <shemminger at osdl.org>
Date: 1139874238 -0800

Horms patch was the best of the three fixes. Dave, already applied
Harald's version, so this patch converts that to the better one.

Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/bridge/br_netfilter.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: c622476fd8a0092710dd325d5154c2b49fc7a898
178a3259f2508e786fb1bd6538365a167cee35c1
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index c06cb09..6bb0c7e 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -805,8 +805,8 @@ static unsigned int br_nf_post_routing(u
 print_error:
 	if (skb->dev != NULL) {
 		printk("[%s]", skb->dev->name);
-		if (bridge_parent(skb->dev))
-			printk("[%s]", bridge_parent(skb->dev)->name);
+		if (realoutdev)
+			printk("[%s]", realoutdev->name);
 	}
 	printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
 					      skb->data);
---
0.99.8.GIT


--- NEW FILE 4798-NETLINK-genetlink-Fix-bugs-spotted-by-Andrew-Morton.txt ---
Subject: [PATCH] [NETLINK] genetlink: Fix bugs spotted by Andrew Morton.
From: Jamal Hadi Salim <hadi at cyberus.ca>
Date: 1139874684 -0800

- panic() doesn't return.

- Don't forget to unlock on genl_register_family() error path

- genl_rcv_msg() is called via pointer so there's no point in declaring it
  `inline'.

Notes:

genl_ctrl_event() ignores the genlmsg_multicast() return value.

lots of things ignore the genl_ctrl_event() return value.

Signed-off-by: Jamal Hadi Salim <hadi at cyberus.ca>
Signed-off-by: Andrew Morton <akpm at osdl.org>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/netlink/genetlink.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

applies-to: 3736fd620ecdec6193b52505982e8fa12698c695
e200bd8065e4db6297cd8db071a9188cf9aa6b56
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 4ae1538..43e7241 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -238,7 +238,7 @@ int genl_register_family(struct genl_fam
 					sizeof(struct nlattr *), GFP_KERNEL);
 		if (family->attrbuf == NULL) {
 			err = -ENOMEM;
-			goto errout;
+			goto errout_locked;
 		}
 	} else
 		family->attrbuf = NULL;
@@ -288,7 +288,7 @@ int genl_unregister_family(struct genl_f
 	return -ENOENT;
 }
 
-static inline int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
+static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
 			       int *errp)
 {
 	struct genl_ops *ops;
@@ -375,7 +375,7 @@ static void genl_rcv(struct sock *sk, in
 	do {
 		if (genl_trylock())
 			return;
-		netlink_run_queue(sk, &qlen, &genl_rcv_msg);
+		netlink_run_queue(sk, &qlen, genl_rcv_msg);
 		genl_unlock();
 	} while (qlen && genl_sock && genl_sock->sk_receive_queue.qlen);
 }
@@ -549,10 +549,8 @@ static int __init genl_init(void)
 	netlink_set_nonroot(NETLINK_GENERIC, NL_NONROOT_RECV);
 	genl_sock = netlink_kernel_create(NETLINK_GENERIC, GENL_MAX_ID,
 					  genl_rcv, THIS_MODULE);
-	if (genl_sock == NULL) {
+	if (genl_sock == NULL)
 		panic("GENL: Cannot initialize generic netlink\n");
-		return -ENOMEM;
-	}
 
 	return 0;
 
@@ -560,7 +558,6 @@ errout_register:
 	genl_unregister_family(&genl_ctrl);
 errout:
 	panic("GENL: Cannot register controller: %d\n", err);
-	return err;
 }
 
 subsys_initcall(genl_init);
---
0.99.8.GIT


--- NEW FILE 4800-IPV6-Don-t-store-dst_entry-for-RAW-socket.txt ---
Subject: [PATCH] [IPV6] Don't store dst_entry for RAW socket
From: Nicolas DICHTEL <nicolas.dichtel at 6wind.com>
Date: 1139874973 -0800

Signed-off-by: Nicolas DICHTEL <nicolas.dichtel at 6wind.com>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/ipv6/raw.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

applies-to: 0330cc2c63332eb5d0a561447f505324de14ae56
6d3e85ecf22a5e3610df47b9c3fb2fc32cfd35bf
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 738376c..ae20a0e 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -803,10 +803,7 @@ back_from_confirm:
 			err = rawv6_push_pending_frames(sk, &fl, rp);
 	}
 done:
-	ip6_dst_store(sk, dst,
-		      ipv6_addr_equal(&fl.fl6_dst, &np->daddr) ?
-		      &np->daddr : NULL);
-
+	dst_release(dst);
 	release_sock(sk);
 out:	
 	fl6_sock_release(flowlabel);
---
0.99.8.GIT


--- NEW FILE 4801-IPSEC-Fix-strange-IPsec-freeze.txt ---
Subject: [PATCH] [IPSEC]: Fix strange IPsec freeze.
From: Herbert Xu <herbert at gondor.apana.org.au>
Date: 1139875287 -0800

Problem discovered and initial patch by Olaf Kirch:

	there's a problem with IPsec that has been bugging some of our users
	for the last couple of kernel revs. Every now and then, IPsec will
	freeze the machine completely. This is with openswan user land,
	and with kernels up to and including 2.6.16-rc2.

	I managed to debug this a little, and what happens is that we end
	up looping in xfrm_lookup, and never get out. With a bit of debug
	printks added, I can this happening:

		ip_route_output_flow calls xfrm_lookup

		xfrm_find_bundle returns NULL (apparently we're in the
			middle of negotiating a new SA or something)

		We therefore call xfrm_tmpl_resolve. This returns EAGAIN
			We go to sleep, waiting for a policy update.
			Then we loop back to the top

		Apparently, the dst_orig that was passed into xfrm_lookup
			has been dropped from the routing table (obsolete=2)
			This leads to the endless loop, because we now create
			a new bundle, check the new bundle and find it's stale
			(stale_bundle -> xfrm_bundle_ok -> dst_check() return 0)

	People have been testing with the patch below, which seems to fix the
	problem partially. They still see connection hangs however (things
	only clear up when they start a new ping or new ssh). So the patch
	is obvsiouly not sufficient, and something else seems to go wrong.

	I'm grateful for any hints you may have...

I suggest that we simply bail out always.  If the dst decides to die
on us later on, the packet will be dropped anyway.  So there is no
great urgency to retry here.  Once we have the proper resolution
queueing, we can then do the retry again.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Acked-by: Olaf Kirch <okir at suse.de>
Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/xfrm/xfrm_policy.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

applies-to: d82d346f7b4c03f1e323cec0df8ee74052f0a31c
00de651d14baabc5c1d2f32c49d9a984d8891c8e
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index dbf4620..98ec53b 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -889,7 +889,9 @@ restart:
 			xfrm_pol_put(policy);
 			if (dst)
 				dst_free(dst);
-			goto restart;
+
+			err = -EHOSTUNREACH;
+			goto error;
 		}
 		dst->next = policy->bundles;
 		policy->bundles = dst;
---
0.99.8.GIT


--- NEW FILE 4802-NET-Revert-skb_copy_datagram_iovec-recursion-elimination.txt ---
Subject: [PATCH] [NET]: Revert skb_copy_datagram_iovec() recursion elimination.
From: David S. Miller <davem at sunset.davemloft.net>
Date: 1139875570 -0800

Revert the following changeset:

bc8dfcb93970ad7139c976356bfc99d7e251deaf

Recursive SKB frag lists are really possible and disallowing
them breaks things.

Noticed by: Jesse Brandeburg <jesse.brandeburg at intel.com>

Signed-off-by: David S. Miller <davem at davemloft.net>

---

 net/core/datagram.c |   81 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 53 insertions(+), 28 deletions(-)

applies-to: dee86291586baf00e9c34dd8f4545088a36877ef
b4d9eda028e8becbb5057b554e63eea12e496a88
diff --git a/net/core/datagram.c b/net/core/datagram.c
index f8d322e..b8ce6bf 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -247,49 +247,74 @@ EXPORT_SYMBOL(skb_kill_datagram);
 int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
 			    struct iovec *to, int len)
 {
-	int i, err, fraglen, end = 0;
-	struct sk_buff *next = skb_shinfo(skb)->frag_list;
+	int start = skb_headlen(skb);
+	int i, copy = start - offset;
 
-	if (!len)
-		return 0;
+	/* Copy header. */
+	if (copy > 0) {
+		if (copy > len)
+			copy = len;
+		if (memcpy_toiovec(to, skb->data + offset, copy))
+			goto fault;
+		if ((len -= copy) == 0)
+			return 0;
+		offset += copy;
+	}
 
-next_skb:
-	fraglen = skb_headlen(skb);
-	i = -1;
+	/* Copy paged appendix. Hmm... why does this look so complicated? */
+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+		int end;
 
-	while (1) {
-		int start = end;
+		BUG_TRAP(start <= offset + len);
 
-		if ((end += fraglen) > offset) {
-			int copy = end - offset, o = offset - start;
+		end = start + skb_shinfo(skb)->frags[i].size;
+		if ((copy = end - offset) > 0) {
+			int err;
+			u8  *vaddr;
+			skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+			struct page *page = frag->page;
 
 			if (copy > len)
 				copy = len;
-			if (i == -1)
-				err = memcpy_toiovec(to, skb->data + o, copy);
-			else {
-				skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-				struct page *page = frag->page;
-				void *p = kmap(page) + frag->page_offset + o;
-				err = memcpy_toiovec(to, p, copy);
-				kunmap(page);
-			}
+			vaddr = kmap(page);
+			err = memcpy_toiovec(to, vaddr + frag->page_offset +
+					     offset - start, copy);
+			kunmap(page);
 			if (err)
 				goto fault;
 			if (!(len -= copy))
 				return 0;
 			offset += copy;
 		}
-		if (++i >= skb_shinfo(skb)->nr_frags)
-			break;
-		fraglen = skb_shinfo(skb)->frags[i].size;
+		start = end;
 	}
-	if (next) {
-		skb = next;
-		BUG_ON(skb_shinfo(skb)->frag_list);
-		next = skb->next;
-		goto next_skb;
+
+	if (skb_shinfo(skb)->frag_list) {
+		struct sk_buff *list = skb_shinfo(skb)->frag_list;
+
+		for (; list; list = list->next) {
+			int end;
+
+			BUG_TRAP(start <= offset + len);
+
+			end = start + list->len;
+			if ((copy = end - offset) > 0) {
+				if (copy > len)
+					copy = len;
+				if (skb_copy_datagram_iovec(list,
+							    offset - start,
+							    to, copy))
+					goto fault;
+				if ((len -= copy) == 0)
+					return 0;
+				offset += copy;
+			}
+			start = end;
+		}
 	}
+	if (!len)
+		return 0;
+
 fault:
 	return -EFAULT;
 }
---
0.99.8.GIT


--- NEW FILE 4803-ieee80211-Use-IWEVGENIE-to-set-WPA-IE.txt ---
Subject: [PATCH] ieee80211: Use IWEVGENIE to set WPA IE
From: Zhu Yi <yi.zhu at intel.com>
Date: 1139809023 +0800

It replaces returning WPA/RSN IEs as custom events with returning them
as IWEVGENIE events. I have tested that it returns proper information
with both Xsupplicant, and the latest development version of the Linux
wireless tools.

Signed-off-by: Chris Hessing <Chris.Hessing at utah.edu>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 net/ieee80211/ieee80211_wx.c |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

applies-to: bc256a02b2667c1b6b3c04a5558aedf17901ef1e
0f747567b3d115987c5d0cdba80af480c9a56a72
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index e8c55a4..af7f9bb 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -193,33 +193,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);
 	}
 
---
0.99.8.GIT


--- NEW FILE 4804-ipw2200-Fix-WPA-network-selection-problem.txt ---
Subject: [PATCH] ipw2200: Fix WPA network selection problem
From: Stefan Rompf <stefan at loplof.de>
Date: 1139254943 +0800

Do not avoid APs with wpa_ie or rsn_ie if !ieee->wpa_enabled
There are broken APs out there that fill these elements even
though encryption is disnabled. Also, this breaks legit WEP to
WPA migration scenarious.

We add a checking to prohibite WPA configured STA trying to
associate with non-WPA supported APs.

Signed-off-by: Stefan Rompf <stefan at loplof.de>
Signed-off-by: James Ketrenos <jketreno at linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>

---

 drivers/net/wireless/ipw2200.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

applies-to: 5e0a6c27884af6f6d24a3e3ef92d828ffb641585
d92f525dbaced8ae82635fdf3cdfa0ade831916d
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 0702f0e..02d2dae 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -5533,8 +5533,8 @@ static int ipw_best_network(struct ipw_p
 		return 0;
 	}
 
-	if (!priv->ieee->wpa_enabled && (network->wpa_ie_len > 0 ||
-					 network->rsn_ie_len > 0)) {
+	if (priv->ieee->wpa_enabled &&
+	    network->wpa_ie_len == 0 && network->rsn_ie_len == 0) {
 		IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
 				"because of WPA capability mismatch.\n",
 				escape_essid(network->ssid, network->ssid_len),
---
0.99.8.GIT



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:28:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:28:47 -0500
Subject: rpms/vim/devel 6.4.007, NONE, 1.1 README.patches, 1.39,
	1.40 vim.spec, 1.96, 1.97
Message-ID: <200602151428.k1FESlJx011258@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11194

Modified Files:
	README.patches vim.spec 
Added Files:
	6.4.007 
Log Message:
- fix vim.csh script (#180429)
- patchlevel 7



--- NEW FILE 6.4.007 ---
To: vim-dev at vim.org
Subject: Patch 6.4.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 6.4.007
Problem:    Crash when expanding a file name argument in backticks. (Adri
	    Verhoef)
Solution:   Check for the NUL after the expansion result.
Files:	    src/os_unix.c


*** ../vim-6.4.006/src/os_unix.c	Sat Oct  8 16:39:10 2005
--- src/os_unix.c	Thu Feb  2 12:48:28 2006
***************
*** 5051,5057 ****
  	/* Space or NL separates */
  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
  	{
! 	    while (!(shell_style == STYLE_ECHO && *p == ' ') && *p != '\n')
  		++p;
  	    if (p == buffer + len)		/* last entry */
  		*p = NUL;
--- 5051,5058 ----
  	/* Space or NL separates */
  	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
  	{
! 	    while (!(shell_style == STYLE_ECHO && *p == ' ')
! 						   && *p != '\n' && *p != NUL)
  		++p;
  	    if (p == buffer + len)		/* last entry */
  		*p = NUL;
*** ../vim-6.4.006/src/version.c	Thu Dec 22 22:39:11 2005
--- src/version.c	Wed Feb  8 11:10:30 2006
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
"My particular problem is with registry entries, which seem to just accumulate
like plastic coffee cups..."           -- Paul Moore

 /// 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://www.ICCF.nl         ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- README.patches	2 Jan 2006 12:12:52 -0000	1.39
+++ README.patches	15 Feb 2006 14:28:45 -0000	1.40
@@ -31,3 +31,4 @@
   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


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- vim.spec	11 Feb 2006 05:57:20 -0000	1.96
+++ vim.spec	15 Feb 2006 14:28:45 -0000	1.97
@@ -20,12 +20,12 @@
 
 %define baseversion 6.4
 %define vimdir vim64
-%define patchlevel 006
+%define patchlevel 007
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1.2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -58,6 +58,7 @@
 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
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -188,6 +189,7 @@
 %patch004 -p0
 %patch005 -p0
 %patch006 -p0
+%patch007 -p0
 
 
 %patch3000 -p1
@@ -391,8 +393,7 @@
 EOF
 cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
 [ -x /usr/bin/id ] || exit
-[ \`/usr/bin/id -u\` -le 100 ] && exit
-alias vi vim
+[ \`/usr/bin/id -u\` -gt 100 ] && alias vi vim
 EOF
 chmod 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@@ -488,6 +489,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* 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)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:36:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:36:28 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch,
	1.3, 1.4 gnome-panel.spec, 1.113, 1.114
Message-ID: <200602151436.k1FEaSsd012872@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12814

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch gnome-panel.spec 
Log Message:
fix up gpm integration


gnome-panel-2.13.91-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        |   30 +-
 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(+), 12 deletions(-)

Index: gnome-panel-2.13.91-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.91-gpm-integration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 05:48:28 -0000	1.3
+++ gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 14:36:24 -0000	1.4
@@ -1,375 +1,82 @@
---- gnome-panel-2.13.91/gnome-panel/Makefile.am.gpm-integration	2006-02-12 14:07:03.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 00:31:14.000000000 -0500
-@@ -116,6 +116,7 @@
- 	panel-addto.c		\
- 	panel-logout.c		\
- 	panel-gdm.c		\
-+	panel-power-manager.c   \
- 	$(EGG_RECENT_FILES_C)	\
- 	$(NULL)
+--- gnome-panel-2.13.91/configure.in.gpm-integration	2006-02-13 13:30:38.000000000 -0500
++++ gnome-panel-2.13.91/configure.in	2006-02-15 09:25:21.000000000 -0500
+@@ -58,10 +58,12 @@
+ LIBECAL_REQUIRED=0.0.97
+ LIBEDATASERVERUI_REQUIRED=1.2.0
+ CAIRO_REQUIRED=1.0.0
++DBUS_REQUIRED=0.60
++DBUS_GLIB_REQUIRED=0.60
  
-@@ -164,6 +165,7 @@
- 	panel-addto.h		\
- 	panel-logout.h		\
- 	panel-gdm.h		\
-+	panel-power-manager.h	\
- 	$(EGG_RECENT_FILES_H)	\
- 	$(NULL)
+ dnl pkg-config dependency checks
  
---- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 00:31:14.000000000 -0500
-@@ -32,6 +32,7 @@
+-PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED)
++PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
  
- #include "panel-logout.h"
- #include "panel-gdm.h"
+--- gnome-panel-2.13.91/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 09:25:21.000000000 -0500
+@@ -96,6 +96,7 @@
+ 	PANEL_ACTION_FORCE_QUIT,
+ 	PANEL_ACTION_CONNECT_SERVER,
+         PANEL_ACTION_SHUTDOWN,
++	PANEL_ACTION_SUSPEND,
+ 	/* compatibility with GNOME < 2.13.90 */
+         PANEL_ACTION_SCREENSHOT,
+         PANEL_ACTION_LAST
+--- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 09:25:21.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 09:25:21.000000000 -0500
+@@ -49,6 +49,7 @@
+ #include "panel-recent.h"
+ #include "panel-stock-icons.h"
+ #include "panel-util.h"
 +#include "panel-power-manager.h"
- #include "panel-session.h"
- 
- #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
-@@ -49,6 +50,7 @@
- 
- struct _PanelLogoutDialogPrivate {
- 	PanelLogoutDialogType type;
-+	PanelPowerManager *power_manager;
- 
- 	int                   timeout;
- 	unsigned int          timeout_id;
-@@ -60,7 +62,7 @@
- 
- static void panel_logout_destroy (PanelLogoutDialog *logout_dialog,
- 				  gpointer           data);
--static void panel_logout_response (GtkWidget *logout_dialog,
-+static void panel_logout_response (PanelLogoutDialog *logout_dialog,
- 				   guint      response_id,
- 				   gpointer   data);
- 
-@@ -137,6 +139,8 @@
- 	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
- 	gtk_window_stick (GTK_WINDOW (logout_dialog));
  
-+	logout_dialog->priv->power_manager = panel_get_power_manager ();
-+
- 	g_signal_connect (logout_dialog, "destroy",
- 			  G_CALLBACK (panel_logout_destroy), NULL);
- 	g_signal_connect (logout_dialog, "response",
-@@ -151,15 +155,21 @@
- 		g_source_remove (logout_dialog->priv->timeout_id);
- 	logout_dialog->priv->timeout_id = 0;
+ #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
+ #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
+@@ -1011,8 +1012,21 @@
  
-+	g_object_unref (logout_dialog->priv->power_manager);
-+	logout_dialog->priv->power_manager = NULL;
+ 	menuitem->priv->append_lock_logout = append_lock_logout;
+ 	if (append_lock_logout)
+-		panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
+-					   menuitem);
++	  {
++	    PanelPowerManager *manager;
 +
- 	current_dialog = NULL;
- }
- 
- static void
--panel_logout_response (GtkWidget *logout_dialog,
-+panel_logout_response (PanelLogoutDialog *logout_dialog,
- 		       guint      response_id,
- 		       gpointer   data)
- {
--	gtk_widget_destroy (logout_dialog);
-+	PanelPowerManager *power_manager;
++	    panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
++	                               menuitem);
 +
-+	power_manager = g_object_ref (logout_dialog->priv->power_manager);
-+	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
- 
- 	switch (response_id) {
- 	case GTK_RESPONSE_CANCEL:
-@@ -180,11 +190,15 @@
- 		panel_session_request_logout ();
- 		break;
- 	case PANEL_LOGOUT_RESPONSE_STD:
--		gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
--		panel_session_request_logout ();
-+	        if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) 
-+	          gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
-+	        else if (panel_power_manager_can_sleep_and_power_down (power_manager))
-+	          panel_power_manager_request_sleep_and_power_down (power_manager);
++	    manager = panel_get_power_manager ();
 +
- 		break;
- 	case PANEL_LOGOUT_RESPONSE_STR:
--		//FIXME
-+	        if (panel_power_manager_can_sleep (power_manager))
-+	          panel_power_manager_request_sleep (power_manager);
- 		break;
- 	case GTK_RESPONSE_NONE:
- 	case GTK_RESPONSE_DELETE_EVENT:
-@@ -192,6 +206,7 @@
- 	default:
- 		g_assert_not_reached ();
- 	}
-+	g_object_unref (power_manager);
- }
- 
- static gboolean
-@@ -323,7 +338,8 @@
- 		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
- 		//FIXME see previous FIXME
- 
--		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND))
-+		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND) ||
-+	            panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager))
- 			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- 					       _("_Suspend"),
- 					       PANEL_LOGOUT_RESPONSE_STD);
---- gnome-panel-2.13.91/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 00:42:37.000000000 -0500
-@@ -47,10 +47,16 @@
- #include "panel-lockdown.h"
- #include "panel-logout.h"
- #include "panel-compatibility.h"
-+#include "panel-power-manager.h"
- #include "panel-gdm.h"
- 
- #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
- 
-+static gboolean panel_action_can_suspend (void);
-+static gboolean panel_action_logout_is_disabled (void);
-+static gboolean panel_action_suspend_is_disabled (void);
-+static void panel_action_suspend (GtkWidget *widget);
++	    g_signal_connect_swapped (manager, "notify::is-connected",
++	                              G_CALLBACK
++	                              (panel_desktop_menu_item_recreate_menu), 
++	                              menuitem);
 +
- enum {
- 	PROP_0,
- 	PROP_ACTION_TYPE,
-@@ -77,6 +83,7 @@
- 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
- 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
- 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
-+	{ PANEL_ACTION_SUSPEND,        "suspend"       },
- 	/* compatibility with GNOME < 2.13.90 */
- 	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
- 	{ 0,                           NULL             },
-@@ -158,6 +165,13 @@
- 			  gtk_get_current_event_time ());
- }
++	        g_object_unref (manager);
++	  }
  
-+static gboolean
-+panel_action_logout_is_disabled (void)
-+{
-+  return panel_action_can_suspend () ||
-+	 panel_lockdown_get_disable_log_out ();
-+}
-+
- static void
- panel_action_shutdown (GtkWidget *widget)
- {
-@@ -173,6 +187,39 @@
- 		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
- }
+ 	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
+ 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
+@@ -1118,6 +1132,14 @@
+ 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ 	}
  
-+static gboolean
-+panel_action_can_suspend (void)
-+{
-+  PanelPowerManager *manager;
-+  gboolean can_suspend;
-+
-+  manager = panel_get_power_manager ();
-+
-+  can_suspend = panel_power_manager_can_sleep (manager);
-+
-+  g_object_unref (manager);
-+
-+  return can_suspend;
-+}
-+
-+static gboolean
-+panel_action_suspend_is_disabled (void)
-+{
-+  return !panel_action_can_suspend ();
-+}
-+
-+static void
-+panel_action_suspend (GtkWidget *widget)
-+{
-+  PanelPowerManager *manager;
-+
-+  manager = panel_get_power_manager ();
-+
-+  panel_power_manager_request_sleep (manager);
-+
-+  g_object_unref (manager);
-+}
++	item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND);
++	if (item != NULL) {
++		if (!separator_inserted)
++			add_menu_separator (menu);
 +
- /* Run Application
-  */
- static void
-@@ -308,7 +355,17 @@
- 		"gospanel-20",
- 		"ACTION:logout:NEW",
- 		panel_action_logout, NULL, NULL,
--		panel_lockdown_get_disable_log_out
-+                panel_action_logout_is_disabled
-+        },
-+        {
-+                PANEL_ACTION_SUSPEND,
-+                "screensaver",
-+                N_("Suspend"),
-+                N_("Suspend the computer"),
-+                "gospanel-20",
-+                "ACTION:suspend:NEW",
-+                panel_action_suspend, NULL, NULL,
-+                panel_action_suspend_is_disabled
- 	},
- 	{
- 		PANEL_ACTION_RUN,
-@@ -861,6 +918,7 @@
- 		actions [button->priv->type].invoke_menu (button, callback_name);
- }
- 
++		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
++	}
 +
- gboolean
- panel_action_button_load_from_drag (PanelToplevel *toplevel,
- 				    int            position,
---- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 00:31:14.000000000 -0500
-@@ -0,0 +1,83 @@
-+/* panel-power-manager.h - functions for powering down, restarting, and
-+ *                         suspending the computer
-+ *
-+ * Copyright (C) 2006 Ray Strode <rstrode 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 PANEL_POWER_MANAGER_H
-+#define PANEL_POWER_MANAGER_H
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ())
-+#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager))
-+#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
-+#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER))
-+#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER))
-+#define PANEL_POWER_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
-+#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ())
-+typedef struct _PanelPowerManager PanelPowerManager;
-+typedef struct _PanelPowerManagerClass PanelPowerManagerClass;
-+typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate;
-+typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest;
-+typedef enum _PanelPowerManagerError PanelPowerManagerError;
-+
-+struct _PanelPowerManager
-+{
-+  GObject parent;
-+
-+  /*< private > */
-+  PanelPowerManagerPrivate *priv;
-+};
-+
-+struct _PanelPowerManagerClass
-+{
-+  GObjectClass parent_class;
-+
-+  /* signals */
-+  void (* request_failed) (PanelPowerManager *manager, 
-+	                   GError *error);
-+};
-+
-+enum _PanelPowerManagerError
-+{
-+  PANEL_POWER_MANAGER_ERROR_SLEEPING = 0,
-+  PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN
-+};
-+
-+GType panel_power_manager_get_type (void);
-+GQuark panel_power_manager_error_quark (void);
-+
-+PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC;
-+
-+gboolean panel_power_manager_can_sleep (PanelPowerManager *manager);
-+gboolean panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager);
-+gboolean panel_power_manager_can_power_down (PanelPowerManager *manager);
-+gboolean panel_power_manager_can_restart (PanelPowerManager *manager);
-+
-+PanelPowerManagerRequest *panel_power_manager_request_sleep (PanelPowerManager *manager);
-+PanelPowerManagerRequest *panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager);
-+
-+void panel_power_manager_cancel_request (PanelPowerManager *manager, 
-+	                                 PanelPowerManagerRequest *request);
-+
-+
-+PanelPowerManager *panel_get_power_manager (void);
-+G_END_DECLS
-+#endif /* PANEL_POWER_MANAGER_H */
---- gnome-panel-2.13.91/gnome-panel/panel-enums.h.gpm-integration	2006-01-22 07:08:24.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-enums.h	2006-02-15 00:31:14.000000000 -0500
-@@ -96,6 +96,7 @@
- 	PANEL_ACTION_FORCE_QUIT,
- 	PANEL_ACTION_CONNECT_SERVER,
-         PANEL_ACTION_SHUTDOWN,
-+	PANEL_ACTION_SUSPEND,
- 	/* compatibility with GNOME < 2.13.90 */
-         PANEL_ACTION_SCREENSHOT,
-         PANEL_ACTION_LAST
---- gnome-panel-2.13.91/gnome-panel/panel-menu-items.c.gpm-integration	2006-02-15 00:31:14.000000000 -0500
-+++ gnome-panel-2.13.91/gnome-panel/panel-menu-items.c	2006-02-15 00:31:14.000000000 -0500
-@@ -49,6 +49,7 @@
- #include "panel-recent.h"
- #include "panel-stock-icons.h"
- #include "panel-util.h"
-+#include "panel-power-manager.h"
- 
- #define BOOKMARKS_FILENAME      ".gtk-bookmarks"
- #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
-@@ -1011,8 +1018,21 @@
- 
- 	menuitem->priv->append_lock_logout = append_lock_logout;
- 	if (append_lock_logout)
--		panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
--					   menuitem);
-+	  {
-+	    PanelPowerManager *manager;
-+
-+	    panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu),
-+	                               menuitem);
-+
-+	    manager = panel_get_power_manager ();
-+
-+	    g_signal_connect_swapped (manager, "notify::is-connected",
-+	                              G_CALLBACK
-+	                              (panel_desktop_menu_item_recreate_menu), 
-+	                              menuitem);
-+
-+	        g_object_unref (manager);
-+	  }
- 
- 	menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem);
- 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
-@@ -1118,6 +1138,14 @@
- 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
- 	}
- 
-+	item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND);
-+	if (item != NULL) {
-+		if (!separator_inserted)
-+			add_menu_separator (menu);
-+
-+		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+	}
-+
- 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
- 	if (item != NULL) {
- 		if (!separator_inserted)
---- /dev/null	2004-06-24 14:04:38.000000000 -0400
-+++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 00:31:14.000000000 -0500
-@@ -0,0 +1,533 @@
-+/* panel-power-manager.c - functions for powering down, restarting, and
+ 	item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
+ 	if (item != NULL) {
+ 		if (!separator_inserted)
+--- /dev/null	2006-02-08 10:31:40.758374500 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.c	2006-02-15 09:25:21.000000000 -0500
+@@ -0,0 +1,533 @@
++/* panel-power-manager.c - functions for powering down, restarting, and
 + *                         suspending the computer
 + *
 + * Copyright (C) 2006 Ray Strode <rstrode at redhat.com>
@@ -902,19 +609,315 @@
 +  return exit_code;
 +}
 +#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */
---- gnome-panel-2.13.91/configure.in.gpm-integration	2006-02-13 13:30:38.000000000 -0500
-+++ gnome-panel-2.13.91/configure.in	2006-02-15 00:31:14.000000000 -0500
-@@ -58,10 +58,12 @@
- LIBECAL_REQUIRED=0.0.97
- LIBEDATASERVERUI_REQUIRED=1.2.0
- CAIRO_REQUIRED=1.0.0
-+DBUS_REQUIRED=0.60
-+DBUS_GLIB_REQUIRED=0.60
+--- gnome-panel-2.13.91/gnome-panel/Makefile.am.gpm-integration	2006-02-12 14:07:03.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/Makefile.am	2006-02-15 09:25:21.000000000 -0500
+@@ -116,6 +116,7 @@
+ 	panel-addto.c		\
+ 	panel-logout.c		\
+ 	panel-gdm.c		\
++	panel-power-manager.c   \
+ 	$(EGG_RECENT_FILES_C)	\
+ 	$(NULL)
  
- dnl pkg-config dependency checks
+@@ -164,6 +165,7 @@
+ 	panel-addto.h		\
+ 	panel-logout.h		\
+ 	panel-gdm.h		\
++	panel-power-manager.h	\
+ 	$(EGG_RECENT_FILES_H)	\
+ 	$(NULL)
  
--PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED)
-+PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
+--- gnome-panel-2.13.91/gnome-panel/panel-action-button.c.gpm-integration	2006-02-12 07:36:56.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-action-button.c	2006-02-15 09:33:27.000000000 -0500
+@@ -47,10 +47,16 @@
+ #include "panel-lockdown.h"
+ #include "panel-logout.h"
+ #include "panel-compatibility.h"
++#include "panel-power-manager.h"
+ #include "panel-gdm.h"
+ 
+ #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate))
+ 
++static gboolean panel_action_can_suspend (void);
++static gboolean panel_action_logout_is_disabled (void);
++static gboolean panel_action_suspend_is_disabled (void);
++static void panel_action_suspend (GtkWidget *widget);
++
+ enum {
+ 	PROP_0,
+ 	PROP_ACTION_TYPE,
+@@ -77,6 +83,7 @@
+ 	{ PANEL_ACTION_FORCE_QUIT,     "force-quit"     },
+ 	{ PANEL_ACTION_CONNECT_SERVER, "connect-server" },
+ 	{ PANEL_ACTION_SHUTDOWN,       "shutdown"       },
++	{ PANEL_ACTION_SUSPEND,        "suspend"       },
+ 	/* compatibility with GNOME < 2.13.90 */
+ 	{ PANEL_ACTION_SCREENSHOT,     "screenshot"     },
+ 	{ 0,                           NULL             },
+@@ -167,12 +174,47 @@
+ }
+ 
+ static gboolean
++panel_action_can_suspend (void)
++{
++  PanelPowerManager *manager;
++  gboolean can_suspend;
++
++  manager = panel_get_power_manager ();
++
++  can_suspend = panel_power_manager_can_sleep (manager);
++
++  g_object_unref (manager);
++
++  return can_suspend;
++}
++
++static gboolean
+ panel_action_shutdown_is_disabled (void)
+ {
+ 	return (panel_lockdown_get_disable_log_out() ||
++		panel_action_can_suspend() ||
+ 		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
+ }
+ 
++
++static gboolean
++panel_action_suspend_is_disabled (void)
++{
++  return !panel_action_can_suspend ();
++}
++
++static void
++panel_action_suspend (GtkWidget *widget)
++{
++  PanelPowerManager *manager;
++
++  manager = panel_get_power_manager ();
++
++  panel_power_manager_request_sleep (manager);
++
++  g_object_unref (manager);
++}
++
+ /* Run Application
+  */
+ static void
+@@ -308,8 +350,8 @@
+ 		"gospanel-20",
+ 		"ACTION:logout:NEW",
+ 		panel_action_logout, NULL, NULL,
+-		panel_lockdown_get_disable_log_out
+-	},
++                panel_lockdown_get_disable_log_out
++        },
+ 	{
+ 		PANEL_ACTION_RUN,
+ 		PANEL_RUN_ICON,
+@@ -358,6 +400,16 @@
+ 		panel_action_shutdown, NULL, NULL,
+ 		panel_action_shutdown_is_disabled
+ 	},
++        {
++                PANEL_ACTION_SUSPEND,
++                "screensaver",
++                N_("Suspend"),
++                N_("Suspend the computer"),
++                "gospanel-20",
++                "ACTION:suspend:NEW",
++                panel_action_suspend, NULL, NULL,
++                panel_action_suspend_is_disabled
++	},
+ 	/* deprecated actions */
+ 	{
+ 		PANEL_ACTION_SCREENSHOT,
+@@ -861,6 +913,7 @@
+ 		actions [button->priv->type].invoke_menu (button, callback_name);
+ }
+ 
++
+ gboolean
+ panel_action_button_load_from_drag (PanelToplevel *toplevel,
+ 				    int            position,
+--- /dev/null	2006-02-08 10:31:40.758374500 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-power-manager.h	2006-02-15 09:25:21.000000000 -0500
+@@ -0,0 +1,83 @@
++/* panel-power-manager.h - functions for powering down, restarting, and
++ *                         suspending the computer
++ *
++ * Copyright (C) 2006 Ray Strode <rstrode 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 PANEL_POWER_MANAGER_H
++#define PANEL_POWER_MANAGER_H
++
++#include <glib.h>
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ())
++#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager))
++#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
++#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER))
++#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER))
++#define PANEL_POWER_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass))
++#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ())
++typedef struct _PanelPowerManager PanelPowerManager;
++typedef struct _PanelPowerManagerClass PanelPowerManagerClass;
++typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate;
++typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest;
++typedef enum _PanelPowerManagerError PanelPowerManagerError;
++
++struct _PanelPowerManager
++{
++  GObject parent;
++
++  /*< private > */
++  PanelPowerManagerPrivate *priv;
++};
++
++struct _PanelPowerManagerClass
++{
++  GObjectClass parent_class;
++
++  /* signals */
++  void (* request_failed) (PanelPowerManager *manager, 
++	                   GError *error);
++};
++
++enum _PanelPowerManagerError
++{
++  PANEL_POWER_MANAGER_ERROR_SLEEPING = 0,
++  PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN
++};
++
++GType panel_power_manager_get_type (void);
++GQuark panel_power_manager_error_quark (void);
++
++PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC;
++
++gboolean panel_power_manager_can_sleep (PanelPowerManager *manager);
++gboolean panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager);
++gboolean panel_power_manager_can_power_down (PanelPowerManager *manager);
++gboolean panel_power_manager_can_restart (PanelPowerManager *manager);
++
++PanelPowerManagerRequest *panel_power_manager_request_sleep (PanelPowerManager *manager);
++PanelPowerManagerRequest *panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager);
++
++void panel_power_manager_cancel_request (PanelPowerManager *manager, 
++	                                 PanelPowerManagerRequest *request);
++
++
++PanelPowerManager *panel_get_power_manager (void);
++G_END_DECLS
++#endif /* PANEL_POWER_MANAGER_H */
+--- gnome-panel-2.13.91/gnome-panel/panel-logout.c.gpm-integration	2006-02-15 09:25:21.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/panel-logout.c	2006-02-15 09:25:21.000000000 -0500
+@@ -32,6 +32,7 @@
+ 
+ #include "panel-logout.h"
+ #include "panel-gdm.h"
++#include "panel-power-manager.h"
+ #include "panel-session.h"
+ 
+ #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
+@@ -49,6 +50,7 @@
+ 
+ struct _PanelLogoutDialogPrivate {
+ 	PanelLogoutDialogType type;
++	PanelPowerManager *power_manager;
  
+ 	int                   timeout;
+ 	unsigned int          timeout_id;
+@@ -60,7 +62,7 @@
+ 
+ static void panel_logout_destroy (PanelLogoutDialog *logout_dialog,
+ 				  gpointer           data);
+-static void panel_logout_response (GtkWidget *logout_dialog,
++static void panel_logout_response (PanelLogoutDialog *logout_dialog,
+ 				   guint      response_id,
+ 				   gpointer   data);
+ 
+@@ -137,6 +139,8 @@
+ 	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+ 	gtk_window_stick (GTK_WINDOW (logout_dialog));
+ 
++	logout_dialog->priv->power_manager = panel_get_power_manager ();
++
+ 	g_signal_connect (logout_dialog, "destroy",
+ 			  G_CALLBACK (panel_logout_destroy), NULL);
+ 	g_signal_connect (logout_dialog, "response",
+@@ -151,15 +155,21 @@
+ 		g_source_remove (logout_dialog->priv->timeout_id);
+ 	logout_dialog->priv->timeout_id = 0;
+ 
++	g_object_unref (logout_dialog->priv->power_manager);
++	logout_dialog->priv->power_manager = NULL;
++
+ 	current_dialog = NULL;
+ }
+ 
+ static void
+-panel_logout_response (GtkWidget *logout_dialog,
++panel_logout_response (PanelLogoutDialog *logout_dialog,
+ 		       guint      response_id,
+ 		       gpointer   data)
+ {
+-	gtk_widget_destroy (logout_dialog);
++	PanelPowerManager *power_manager;
++
++	power_manager = g_object_ref (logout_dialog->priv->power_manager);
++	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+ 
+ 	switch (response_id) {
+ 	case GTK_RESPONSE_CANCEL:
+@@ -180,11 +190,15 @@
+ 		panel_session_request_logout ();
+ 		break;
+ 	case PANEL_LOGOUT_RESPONSE_STD:
+-		gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
+-		panel_session_request_logout ();
++	        if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) 
++	          gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND);
++	        else if (panel_power_manager_can_sleep_and_power_down (power_manager))
++	          panel_power_manager_request_sleep_and_power_down (power_manager);
++
+ 		break;
+ 	case PANEL_LOGOUT_RESPONSE_STR:
+-		//FIXME
++	        if (panel_power_manager_can_sleep (power_manager))
++	          panel_power_manager_request_sleep (power_manager);
+ 		break;
+ 	case GTK_RESPONSE_NONE:
+ 	case GTK_RESPONSE_DELETE_EVENT:
+@@ -192,6 +206,7 @@
+ 	default:
+ 		g_assert_not_reached ();
+ 	}
++	g_object_unref (power_manager);
+ }
+ 
+ static gboolean
+@@ -323,7 +338,8 @@
+ 		logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN;
+ 		//FIXME see previous FIXME
+ 
+-		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND))
++		if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND) ||
++	            panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager))
+ 			gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ 					       _("_Suspend"),
+ 					       PANEL_LOGOUT_RESPONSE_STD);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gnome-panel.spec	15 Feb 2006 05:26:02 -0000	1.113
+++ gnome-panel.spec	15 Feb 2006 14:36:24 -0000	1.114
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.91
-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
@@ -206,6 +206,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
+- fix up the gnome-power-manager integration patch
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:38:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:38:54 -0500
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.33,1.34
Message-ID: <200602151438.k1FEcsS9013655@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13606

Modified Files:
	lm_sensors.spec 
Log Message:
- Added missing dependency to chkconfig



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lm_sensors.spec	10 Feb 2006 14:12:38 -0000	1.33
+++ lm_sensors.spec	15 Feb 2006 14:38:52 -0000	1.34
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 2.9.2
-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
@@ -17,7 +17,7 @@
 Group: Applications/System
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
-Requires: /usr/sbin/dmidecode
+Requires: /usr/sbin/dmidecode chkconfig
 BuildPrereq: kernel-headers >= 2.2.16, bison
 ExclusiveArch: alpha %{ix86} x86_64
 
@@ -105,6 +105,9 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Feb 15 2006 Phil Knirsch <pknirsch at redhat.com> 2.9.2-2
+- Added missing dependency to chkconfig
+
 * Fri Feb 10 2006 Phil Knirsch <pknirsch at redhat.com> 2.9.2-1
 - Update to lm_sensors-2.9.2
 - Fixed wrong subsys locking (#176965)



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:42:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:42:59 -0500
Subject: rpms/control-center/devel control-center.spec,1.127,1.128
Message-ID: <200602151442.k1FEgxqh015502@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15442

Modified Files:
	control-center.spec 
Log Message:
Add buildrequires



Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- control-center.spec	15 Feb 2006 06:08:15 -0000	1.127
+++ control-center.spec	15 Feb 2006 14:42:57 -0000	1.128
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center.
 Name: control-center
 Version: 2.13.92
-Release: 1
+Release: 2
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -80,6 +80,7 @@
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 # For intltool:
 BuildRequires: perl-XML-Parser >= 2.31-16
+BuildRequires: evolution-data-server-devel
 
 %description
 GNOME (the GNU Network Object Model Environment) is an attractive and
@@ -228,6 +229,9 @@
 # (also its headers)
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
+- Add a missing BuildRequires
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:45:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:45:50 -0500
Subject: rpms/libsoup/devel libsoup.spec,1.29,1.30
Message-ID: <200602151445.k1FEjoNe019965@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libsoup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18297

Modified Files:
	libsoup.spec 
Log Message:
Cut back requires



Index: libsoup.spec
===================================================================
RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libsoup.spec	11 Feb 2006 04:13:36 -0000	1.29
+++ libsoup.spec	15 Feb 2006 14:45:47 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
 Version: 2.2.7
-Release: 1.2.1
+Release: 2
 License: LGPL
 Group: Development/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2
@@ -26,7 +26,7 @@
 Summary: Header files for the Soup library
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: glib2-devel, pkgconfig, gtk-doc, gnutls-devel, libxml2-devel
+Requires: glib2-devel, gnutls-devel, libxml2-devel
 
 %description devel
 Libsoup is an HTTP library implementation in C. This package allows 
@@ -66,6 +66,9 @@
 %{_datadir}/gtk-doc/html/libsoup
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.7-2
+- Remove excessive Requires for the -devel package
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 14:50:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 09:50:02 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.53.6.1 config-x86-generic, 1.19,
	1.19.6.1 config-x86_64-generic, 1.16, 1.16.8.1
Message-ID: <200602151450.k1FEo2U2031137@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv31101/configs

Modified Files:
      Tag: private-linville-netdev-fc4-10-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.53.6.1
diff -u -r1.53 -r1.53.6.1
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	15 Feb 2006 14:49:58 -0000	1.53.6.1
@@ -588,6 +588,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NETDEBUG=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -645,6 +646,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
@@ -655,6 +658,7 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -693,6 +697,7 @@
 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_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -754,6 +759,7 @@
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -789,6 +795,36 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=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_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=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
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=n
+CONFIG_TIPC_DEBUG=y
+
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
@@ -820,6 +856,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
 
@@ -1040,6 +1077,7 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_SKGE=m
+CONFIG_SKY2=m
 CONFIG_TIGON3=m
 
 #
@@ -1098,11 +1136,16 @@
 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_IPW_DEBUG is not set
+# CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100_PROMISC is not set
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1112,6 +1155,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
@@ -1127,6 +1172,7 @@
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
 #
@@ -2526,6 +2572,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.19.6.1
diff -u -r1.19 -r1.19.6.1
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	15 Feb 2006 14:49:58 -0000	1.19.6.1
@@ -241,12 +241,16 @@
 CONFIG_IEEE80211_WPA=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 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_IPW2200_DEBUG=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.16
retrieving revision 1.16.8.1
diff -u -r1.16 -r1.16.8.1
--- config-x86_64-generic	6 Jan 2006 23:35:07 -0000	1.16
+++ config-x86_64-generic	15 Feb 2006 14:49:58 -0000	1.16.8.1
@@ -103,10 +103,14 @@
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
+CONFIG_IPW2200_DEBUG=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:21:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:21:39 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.26,
	1.27 selinux-policy-targeted.spec, 1.359, 1.360
Message-ID: <200602151521.k1FFLdte022005@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21972

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.24
- Zebra wants to listen on router_port_t


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   12 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   65 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    6 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   15 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   15 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1685 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20050916.patch	10 Feb 2006 17:08:28 -0000	1.26
+++ policy-20050916.patch	15 Feb 2006 15:21:35 -0000	1.27
@@ -2234,7 +2234,7 @@
  
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/postfix.te policy-1.27.1/domains/program/unused/postfix.te
 --- nsapolicy/domains/program/unused/postfix.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/postfix.te	2005-11-30 16:42:28.000000000 -0500
++++ policy-1.27.1/domains/program/unused/postfix.te	2006-02-13 12:12:48.000000000 -0500
 @@ -54,6 +54,8 @@
  allow postfix_$1_t proc_net_t:dir search;
  allow postfix_$1_t proc_net_t:file { getattr read };
@@ -2413,7 +2413,13 @@
  
  postfix_public_domain(pickup)
  allow postfix_pickup_t postfix_public_t:fifo_file rw_file_perms;
-@@ -329,7 +351,8 @@
+@@ -325,11 +347,14 @@
+ allow postfix_pipe_t self:fifo_file { read write };
+ allow postfix_pipe_t postfix_private_t:dir search;
+ allow postfix_pipe_t postfix_private_t:sock_file write;
++allow postfix_pipe_t postfix_public_t:fifo_file { getattr write };
++
+ ifdef(`procmail.te', `
  domain_auto_trans(postfix_pipe_t, procmail_exec_t, procmail_t)
  ')
  ifdef(`sendmail.te', `
@@ -2423,7 +2429,7 @@
  ')
  
  # Program for creating database files
-@@ -348,5 +371,3 @@
+@@ -348,5 +373,3 @@
  dontaudit postfix_map_t var_t:dir search;
  can_network_server(postfix_map_t)
  allow postfix_map_t port_type:tcp_socket name_connect;
@@ -3099,7 +3105,7 @@
 +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms;
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te
 --- nsapolicy/domains/program/unused/zebra.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-10 12:07:40.000000000 -0500
++++ policy-1.27.1/domains/program/unused/zebra.te	2006-02-15 10:20:03.000000000 -0500
 @@ -8,7 +8,7 @@
  type zebra_conf_t, file_type, sysadmfile;
  r_dir_file({ initrc_t zebra_t }, zebra_conf_t)
@@ -3109,13 +3115,14 @@
  can_ypbind(zebra_t)
  allow zebra_t { etc_t etc_runtime_t }:file { getattr read };
  
-@@ -24,8 +24,9 @@
+@@ -24,8 +24,10 @@
  allow zebra_t self:unix_dgram_socket create_socket_perms;
  allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms };
  allow zebra_t self:rawip_socket create_socket_perms;
 -allow zebra_t self:netlink_route_socket r_netlink_socket_perms;
 +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms;
  allow zebra_t zebra_port_t:tcp_socket name_bind;
++allow zebra_t router_port_t:tcp_socket name_bind;
 +allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect };
  
  allow zebra_t proc_t:file { getattr read };
@@ -4948,8 +4955,14 @@
  #
 diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts
 --- nsapolicy/net_contexts	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/net_contexts	2006-02-09 08:58:02.000000000 -0500
-@@ -50,6 +50,10 @@
++++ policy-1.27.1/net_contexts	2006-02-15 10:19:23.000000000 -0500
+@@ -45,11 +45,16 @@
+ portcon tcp 465 system_u:object_r:smtp_port_t
+ portcon tcp 587 system_u:object_r:smtp_port_t
+ 
++portcon udp 520 system_u:object_r:router_port_t
+ portcon udp 500 system_u:object_r:isakmp_port_t
+ portcon udp 53 system_u:object_r:dns_port_t
  portcon tcp 53 system_u:object_r:dns_port_t
  
  portcon udp 67  system_u:object_r:dhcpd_port_t
@@ -4960,7 +4973,7 @@
  portcon udp 68  system_u:object_r:dhcpc_port_t
  portcon udp 70 system_u:object_r:gopher_port_t
  portcon tcp 70 system_u:object_r:gopher_port_t
-@@ -61,6 +65,7 @@
+@@ -61,6 +66,7 @@
  portcon tcp 443  system_u:object_r:http_port_t
  portcon tcp 488  system_u:object_r:http_port_t
  portcon tcp 8008  system_u:object_r:http_port_t
@@ -4968,7 +4981,7 @@
  
  portcon tcp 106 system_u:object_r:pop_port_t
  portcon tcp 109 system_u:object_r:pop_port_t
-@@ -111,8 +116,6 @@
+@@ -111,8 +117,6 @@
  portcon tcp 749 system_u:object_r:kerberos_admin_port_t
  portcon tcp 750 system_u:object_r:kerberos_port_t
  portcon udp 750 system_u:object_r:kerberos_port_t
@@ -4977,7 +4990,7 @@
  portcon tcp 783 system_u:object_r:spamd_port_t
  portcon tcp 540 system_u:object_r:uucpd_port_t
  portcon tcp 2401 system_u:object_r:cvs_port_t
-@@ -145,7 +148,9 @@
+@@ -145,7 +149,9 @@
  portcon udp 4569 system_u:object_r:asterisk_port_t
  portcon udp 5060 system_u:object_r:asterisk_port_t
  portcon tcp 2000 system_u:object_r:mail_port_t
@@ -4987,7 +5000,7 @@
  portcon tcp 2628 system_u:object_r:dict_port_t
  portcon tcp 3306 system_u:object_r:mysqld_port_t
  portcon tcp 3632 system_u:object_r:distccd_port_t
-@@ -161,9 +166,14 @@
+@@ -161,9 +167,14 @@
  portcon tcp 5432 system_u:object_r:postgresql_port_t
  portcon tcp 5666 system_u:object_r:inetd_child_port_t
  portcon tcp 5703 system_u:object_r:ptal_port_t
@@ -5254,8 +5267,8 @@
 +
 diff --exclude-from=exclude -N -u -r nsapolicy/types/network.te policy-1.27.1/types/network.te
 --- nsapolicy/types/network.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/types/network.te	2006-02-09 08:58:32.000000000 -0500
-@@ -18,7 +18,7 @@
++++ policy-1.27.1/types/network.te	2006-02-15 10:19:44.000000000 -0500
+@@ -18,11 +18,12 @@
  type dhcpd_port_t, port_type, reserved_port_type;
  type smbd_port_t, port_type, reserved_port_type;
  type nmbd_port_t, port_type, reserved_port_type;
@@ -5264,7 +5277,12 @@
  type http_port_t, port_type, reserved_port_type;
  type ipp_port_t, port_type, reserved_port_type;
  type gopher_port_t, port_type, reserved_port_type;
-@@ -45,7 +45,6 @@
+ type isakmp_port_t, port_type, reserved_port_type;
++type router_port_t, port_type, reserved_port_type;
+ 
+ allow web_client_domain { http_cache_port_t http_port_t }:tcp_socket name_connect;
+ type pop_port_t, port_type, reserved_port_type;
+@@ -45,7 +46,6 @@
  #
  type kerberos_port_t, port_type, reserved_port_type;
  type kerberos_admin_port_t, port_type, reserved_port_type;
@@ -5272,7 +5290,7 @@
  
  #
  # Ports used to communicate with portmap server
-@@ -105,7 +104,7 @@
+@@ -105,7 +105,7 @@
  type printer_port_t, port_type, reserved_port_type;
  type mysqld_port_t, port_type;
  type postgresql_port_t, port_type;
@@ -5281,7 +5299,7 @@
  type howl_port_t, port_type;
  type dict_port_t, port_type;
  type syslogd_port_t, port_type, reserved_port_type;
-@@ -117,14 +116,17 @@
+@@ -117,14 +117,17 @@
  type dhcpc_port_t, port_type, reserved_port_type;
  type ntp_port_t, port_type, reserved_port_type;
  type stunnel_port_t, port_type;
@@ -5301,7 +5319,7 @@
  type postgrey_port_t, port_type;
  type asterisk_port_t, port_type;
  type utcpserver_port_t, port_type;
-@@ -157,7 +159,7 @@
+@@ -157,7 +160,7 @@
  type telnetd_port_t, port_type, reserved_port_type;
  type comsat_port_t, port_type, reserved_port_type;
  type cvs_port_t, port_type;


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- selinux-policy-targeted.spec	10 Feb 2006 17:08:28 -0000	1.359
+++ selinux-policy-targeted.spec	15 Feb 2006 15:21:35 -0000	1.360
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.23
+Release: 2.24
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,6 +234,9 @@
 exit 0
 
 %changelog
+* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.24
+- Zebra wants to listen on router_port_t
+
 * Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
 - Now zebra wants to listen on bgp
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:39:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:39:49 -0500
Subject: rpms/GConf2/devel GConf2-2.8.1-reload.patch, 1.2, 1.3 GConf2.spec,
	1.37, 1.38
Message-ID: <200602151539.k1FFdnT1020111@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20096

Modified Files:
	GConf2-2.8.1-reload.patch GConf2.spec 
Log Message:
* Wed Feb 15 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-4
- Send SIGTERM instead of SIGHUP to gconfd


GConf2-2.8.1-reload.patch:
 gconftool.c |    4 ++++
 1 files changed, 4 insertions(+)

Index: GConf2-2.8.1-reload.patch
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2-2.8.1-reload.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GConf2-2.8.1-reload.patch	2 Feb 2006 17:39:51 -0000	1.2
+++ GConf2-2.8.1-reload.patch	15 Feb 2006 15:39:45 -0000	1.3
@@ -16,7 +16,7 @@
        
        gconf_engine_unref (conf);
  
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
 +
        return retval;
      }
@@ -31,7 +31,7 @@
        
        gconf_engine_unref (conf);
 +
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -HUP " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
  
        return retval;
      }


Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- GConf2.spec	13 Feb 2006 18:39:55 -0000	1.37
+++ GConf2.spec	15 Feb 2006 15:39:45 -0000	1.38
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 3.2.1
+Release: 4
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -101,13 +101,16 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.2.1
+* Wed Feb 15 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-4
+- Send SIGTERM instead of SIGHUP to gconfd
+
+* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> 2.13.5-3.2.1
 - rebump for build order issues during double-long bump
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.2
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 2.13.5-3.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-3.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 2.13.5-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Thu Feb  2 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-3



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:41:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:41:30 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1591.4.1,1.1591.4.2
Message-ID: <200602151541.k1FFfUTu020195@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20182

Modified Files:
      Tag: private-linville-netdev-fc4-10-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.4.1
retrieving revision 1.1591.4.2
diff -u -r1.1591.4.1 -r1.1591.4.2
--- kernel-2.6.spec	15 Feb 2006 14:18:08 -0000	1.1591.4.1
+++ kernel-2.6.spec	15 Feb 2006 15:41:27 -0000	1.1591.4.2
@@ -2761,7 +2761,7 @@
 # r8169: fix forced-mode link settings
 %patch20589 -p1
 # [bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
-%patch20590 -p1
+#%patch20590 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
 %patch20591 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
@@ -2795,7 +2795,7 @@
 # [bcm43xx] Remove function bcm43xx_channel_is_allowed(). Geographical restriction should become part of the 80211 stack, so every driver does not have to duplicate it.
 %patch20606 -p1
 # [bcm43xx] [patch] basic ethtool support
-%patch20607 -p1
+#%patch20607 -p1
 # [bcm43xx] Wireless Ext update:
 %patch20608 -p1
 # [NET] snap: needs hardware checksum fix
@@ -2911,11 +2911,11 @@
 # [IPV4]: Use RCU locking in fib_rules.
 %patch20664 -p1
 # [DCCP] ackvec: Introduce ack vector records
-%patch20665 -p1
+#%patch20665 -p1
 # [DCCP] CCID: Allow ccid_{init,exit} to be NULL
 %patch20666 -p1
 # [DCCP] ackvec: Delete all the ack vector records in dccp_ackvec_free
-%patch20667 -p1
+#%patch20667 -p1
 # [DCCP]: Don't alloc ack vector for the control sock
 %patch20668 -p1
 # [DCCP] CCID3: Set the no_feedback_timer fields near init_timer



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:43:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:43:00 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1591.4.2,1.1591.4.3
Message-ID: <200602151543.k1FFh0AP020223@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20210

Modified Files:
      Tag: private-linville-netdev-fc4-10-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.4.2
retrieving revision 1.1591.4.3
diff -u -r1.1591.4.2 -r1.1591.4.3
--- kernel-2.6.spec	15 Feb 2006 15:41:27 -0000	1.1591.4.2
+++ kernel-2.6.spec	15 Feb 2006 15:42:57 -0000	1.1591.4.3
@@ -969,160 +969,156 @@
 Patch20587: 3829-Add-two-management-functions-to-ieee80211_rx.c.txt
 Patch20588: 3830-Clarify-help-text-of-SKGE-SK98LIN-SKY2.txt
 Patch20589: 3831-r8169-fix-forced-mode-link-settings.txt
-Patch20590: 3834-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt
-Patch20591: 3863-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
-Patch20592: 3866-SUNGEM-Unbreak-Sun-GEM-chips.txt
-Patch20593: 3928-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
-Patch20594: 3929-BRIDGE-Fix-device-delete-race.txt
-Patch20595: 3930-NET-Do-not-export-inet_bind_bucket_create-twice.txt
-Patch20596: 3931-IPV6-tcp_v6_send_synack-release-the-destination.txt
-Patch20597: 3932-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
-Patch20598: 3986-lp486e-remove-SLOW_DOWN_IO.txt
-Patch20599: 3996-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
-Patch20600: 4129-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
-Patch20601: 4135-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
-Patch20602: 4138-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
-Patch20603: 4146-dscc4-fix-dscc4_init_dummy_skb-check.txt
-Patch20604: 4147-8139too-fix-a-TX-timeout-watchdog-thread-against-NAPI-softirq-race.txt
-Patch20605: 4149-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt
-Patch20606: 4159-bcm43xx-Remove-function-bcm43xx_channel_is_allowed-.-Geographical-restriction-should-become-part-of-the-80211-stack-so-every-driver-does-not-have-to-duplicate-it.txt
-Patch20607: 4160-bcm43xx-patch-basic-ethtool-support.txt
-Patch20608: 4161-bcm43xx-Wireless-Ext-update.txt
-Patch20609: 4181-NET-snap-needs-hardware-checksum-fix.txt
-Patch20610: 4182-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
-Patch20611: 4183-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
-Patch20612: 4184-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
-Patch20613: 4185-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
-Patch20614: 4187-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
-Patch20615: 4189-TG3-Flush-tg3_reset_task.txt
-Patch20616: 4190-TG3-Update-driver-version-and-release-date.txt
-Patch20617: 4191-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
-Patch20618: 4213-3c59x-collision-statistic-fix.txt
-Patch20619: 4327-ICMP-Fix-extra-dst-release-when-ip_options_echo-fails.txt
-Patch20620: 4328-NETFILTER-ctnetlink-Fix-subsystem-used-for-expectation-events.txt
-Patch20621: 4329-NETFILTER-ctnetlink-add-MODULE_ALIAS-for-expectation-subsystem.txt
-Patch20622: 4330-NETFILTER-nf_conntrack-check-address-family-when-finding-protocol-module.txt
-Patch20623: 4331-NETFILTER-ULOG-nfnetlink_log-Use-better-default-value-for-nlbufsiz.txt
-Patch20624: 4332-NETFILTER-Fix-undersized-skb-allocation-in-ipt_ULOG-ebt_ulog-nfnetlink_log.txt
-Patch20625: 4333-NETFILTER-nfnetlink_queue-fix-packet-marking-over-netlink.txt
-Patch20626: 4334-NETFILTER-Fix-missing-src-port-initialization-in-tftp-expectation-mask.txt
-Patch20627: 4336-NETFILTER-nf_conntrack-fix-incorrect-memset-size-in-FTP-helper.txt
-Patch20628: 4338-NETFILTER-Check-policy-length-in-policy-match-strict-mode.txt
-Patch20629: 4339-NETFILTER-Fix-ip6t_policy-address-matching.txt
-Patch20630: 4340-NETFILTER-Prepare-ipt-ip6t-_policy-match-for-x_tables-unification.txt
-Patch20631: 4341-NETFILTER-Fix-check-whether-dst_entry-needs-to-be-released-after-NAT.txt
-Patch20632: 4378-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt
-Patch20633: 4379-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt
-Patch20634: 4380-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt
-Patch20635: 4381-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt
-Patch20636: 4382-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt
-Patch20637: 4383-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt
-Patch20638: 4384-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt
-Patch20639: 4385-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt
-Patch20640: 4386-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt
-Patch20641: 4387-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt
-Patch20642: 4388-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt
-Patch20643: 4389-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt
-Patch20644: 4390-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt
-Patch20645: 4391-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt
-Patch20646: 4392-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt
-Patch20647: 4393-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt
-Patch20648: 4394-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt
-Patch20649: 4395-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt
-Patch20650: 4396-IPV6-ROUTE-Try-finding-the-next-best-route.txt
-Patch20651: 4397-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt
-Patch20652: 4398-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt
-Patch20653: 4399-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt
-Patch20654: 4400-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt
-Patch20655: 4401-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt
-Patch20656: 4402-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt
-Patch20657: 4403-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt
-Patch20658: 4404-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt
-Patch20659: 4405-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt
-Patch20660: 4412-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
-Patch20661: 4414-DCCP-ackvec-Ditch-dccpav_buf_len.txt
-Patch20662: 4415-DCCP-Fix-error-handling-in-dccp_init.txt
-Patch20663: 4416-DCCP-ackvec-Introduce-dccp_ackvec_slab.txt
-Patch20664: 4418-IPV4-Use-RCU-locking-in-fib_rules.txt
-Patch20665: 4420-DCCP-ackvec-Introduce-ack-vector-records.txt
-Patch20666: 4421-DCCP-CCID-Allow-ccid_-init-exit-to-be-NULL.txt
-Patch20667: 4422-DCCP-ackvec-Delete-all-the-ack-vector-records-in-dccp_ackvec_free.txt
-Patch20668: 4423-DCCP-Don-t-alloc-ack-vector-for-the-control-sock.txt
-Patch20669: 4424-DCCP-CCID3-Set-the-no_feedback_timer-fields-near-init_timer.txt
-Patch20670: 4425-DCCP-CCID2-Initial-CCID2-TCP-Like-implementation.txt
-Patch20671: 4426-DCCP-Initial-feature-negotiation-implementation.txt
-Patch20672: 4427-IPCOMP6-don-t-check-vfree-argument-for-NULL.txt
-Patch20673: 4428-IPV4-fib_rules.c-make-struct-fib_rules-static-again.txt
-Patch20674: 4429-TG3-Add-support-for-5714S-and-5715S.txt
-Patch20675: 4430-TG3-Enable-TSO-by-default.txt
-Patch20676: 4431-TG3-Support-shutdown-WoL.txt
-Patch20677: 4432-TG3-Update-version-and-reldate.txt
-Patch20678: 4433-BNX2-Reduce-register-test-size.txt
-Patch20679: 4434-BNX2-Add-ethtool-d-support.txt
-Patch20680: 4435-BNX2-Fix-bug-when-rx-ring-is-full.txt
-Patch20681: 4436-BNX2-Support-larger-rx-ring-sizes-part-1.txt
-Patch20682: 4437-BNX2-Support-larger-rx-ring-sizes-part-2.txt
-Patch20683: 4438-BNX2-Update-version.txt
-Patch20684: 4439-PPP-Fixed-hardware-RX-checksum-handling.txt
-Patch20685: 4440-TCP-MTU-probing.txt
-Patch20686: 4465-e100-remove-init_hw-call-to-fix-panic.txt
-Patch20687: 4466-sis900-remove-cfgpmcsr-I-O-space-register-define.txt
-Patch20688: 4467-sky2-power-management-fix.txt
-Patch20689: 4468-sky2-pci-config-space-checking.txt
-Patch20690: 4469-sky2-ethtool-rx_coalesce-settings-fix.txt
-Patch20691: 4470-sky2-set-mac-address-fix.txt
-Patch20692: 4471-sky2-clear-irq-race.txt
-Patch20693: 4472-sky2-add-irq-to-entropy-pool.txt
-Patch20694: 4473-sky2-support-msi-interrupt-revised.txt
-Patch20695: 4474-sky2-version-0.15-update.txt
-Patch20696: 4475-bonding-allow-bond-to-use-TSO-if-slaves-support-it.txt
-Patch20697: 4476-bonding-Sparse-warnings-fix.txt
-Patch20698: 4478-gianfar-Fix-sparse-warnings.txt
-Patch20699: 4481-uli526x-warning-fix.txt
-Patch20700: 4604-remove-bogus-asm-bug.h-includes.txt
-Patch20701: 4605-bogus-asm-delay.h-includes.txt
-Patch20702: 4607-missing-includes-in-drivers-net-mv643xx_eth.c.txt
-Patch20703: 4615-ipv4-NULL-noise-removal.txt
-Patch20704: 4629-net-ipv6-mcast.c-NULL-noise-removal.txt
-Patch20705: 4650-type-safe-min-in-prism54.txt
-Patch20706: 4692-IPV6-Address-autoconfiguration-does-not-work-after-device-down-up-cycle.txt
-Patch20707: 4695-update-copyright-in-softmac.txt
-Patch20708: 4696-trivial-fixes-to-softmac.txt
-Patch20709: 4697-softmac-update-deauth-handler-to-quiet-warning.txt
-Patch20710: 4698-softmac-add-reassociation-code.txt
-Patch20711: 4699-softmac-remove-dead-code.txt
-Patch20712: 4700-Fix-softmac-scan.txt
-Patch20713: 4701-wrong-firmware-location-in-IPW2100-Kconfig-entry.txt
-Patch20714: 4702-wireless-atmel-fix-setting-TX-key-only-in-ENCODEEXT.txt
-Patch20715: 4703-wireless-atmel-fix-Open-System-authentication-process-bugs.txt
-Patch20716: 4704-wireless-airo-fix-setting-TX-key-index-plus-key-in-ENCODEEXT.txt
-Patch20717: 4705-let-IPW2-1-2-00-select-IEEE80211.txt
-Patch20718: 4706-wireless-atmel-convert-constants-to-ieee80211-layer-equivalents.txt
-Patch20719: 4707-ipw2200-add-monitor-and-qos-entries-to-Kconfig.txt
-Patch20720: 4720-NETLINK-Fix-a-severe-bug.txt
-Patch20721: 4721-NETLINK-illegal-use-of-pid-in-rtnetlink.txt
-Patch20722: 4722-IRDA-Set-proper-IrLAP-device-address-length.txt
-Patch20723: 4723-IRDA-out-of-range-array-access.txt
-Patch20724: 4724-TCP-rcvbuf-lock-when-tcp_moderate_rcvbuf-enabled.txt
-Patch20725: 4725-BRIDGE-fix-for-RCU-and-deadlock-on-device-removal.txt
-Patch20726: 4726-BRIDGE-netfilter-handle-RCU-during-removal.txt
-Patch20727: 4746-BNX2-include-linux-vmalloc.h.txt
-Patch20728: 4777-netfilter-fix-build-error-due-to-missing-has_bridge_parent-macro.txt
-Patch20729: 4779-orinoco-support-smc2532w.txt
-Patch20730: 4785-Bluetooth-Reduce-L2CAP-MTU-for-RFCOMM-connections.txt
-Patch20731: 4786-Bluetooth-Fix-NULL-pointer-dereferences-of-the-HCI-socket.txt
-Patch20732: 4791-Sync-bcm43xx_phy_initb6-with-specs.txt
-Patch20733: 4792-IRDA-Ratelimit-messages.txt
-Patch20734: 4793-ATM-Ratelimit-atmsvc-failure-messages.txt
-Patch20735: 4794-IPV4-ICMP-Invert-default-for-invalid-icmp-msgs-sysctl.txt
-Patch20736: 4795-P8023-Fix-tainting-of-kernel.txt
-Patch20737: 4797-BRIDGE-Better-fix-for-netfilter-missing-symbol-has_bridge_parent.txt
-Patch20738: 4798-NETLINK-genetlink-Fix-bugs-spotted-by-Andrew-Morton.txt
-Patch20739: 4800-IPV6-Don-t-store-dst_entry-for-RAW-socket.txt
-Patch20740: 4801-IPSEC-Fix-strange-IPsec-freeze.txt
-Patch20741: 4802-NET-Revert-skb_copy_datagram_iovec-recursion-elimination.txt
-Patch20742: 4803-ieee80211-Use-IWEVGENIE-to-set-WPA-IE.txt
-Patch20743: 4804-ipw2200-Fix-WPA-network-selection-problem.txt
+Patch20590: 3863-Fix-ipv4-igmp.c-compile-with-gcc-4-and-IP_MULTICAST.txt
+Patch20591: 3866-SUNGEM-Unbreak-Sun-GEM-chips.txt
+Patch20592: 3928-IPV4-Always-set-fl.proto-in-ip_route_newports.txt
+Patch20593: 3929-BRIDGE-Fix-device-delete-race.txt
+Patch20594: 3930-NET-Do-not-export-inet_bind_bucket_create-twice.txt
+Patch20595: 3931-IPV6-tcp_v6_send_synack-release-the-destination.txt
+Patch20596: 3932-DCCP-ipv6-dccp_v6_send_response-has-a-DST-leak-too.txt
+Patch20597: 3986-lp486e-remove-SLOW_DOWN_IO.txt
+Patch20598: 3996-ipw2200-fix-eeprom-EEPROM_VERSION-check.txt
+Patch20599: 4129-DocBook-fix-some-kernel-doc-comments-in-net-sunrpc.txt
+Patch20600: 4135-SUNRPC-Fix-a-lock-recursion-in-the-auth_gss-downcall.txt
+Patch20601: 4138-SUNRPC-Move-upcall-out-of-auth-au_ops-crcreate.txt
+Patch20602: 4146-dscc4-fix-dscc4_init_dummy_skb-check.txt
+Patch20603: 4147-8139too-fix-a-TX-timeout-watchdog-thread-against-NAPI-softirq-race.txt
+Patch20604: 4149-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt
+Patch20605: 4159-bcm43xx-Remove-function-bcm43xx_channel_is_allowed-.-Geographical-restriction-should-become-part-of-the-80211-stack-so-every-driver-does-not-have-to-duplicate-it.txt
+Patch20606: 4161-bcm43xx-Wireless-Ext-update.txt
+Patch20607: 4181-NET-snap-needs-hardware-checksum-fix.txt
+Patch20608: 4182-IPV6-Don-t-hold-extra-ref-count-in-ipv6_ifa_notify.txt
+Patch20609: 4183-SCTP-Fix-fast-retransmit-to-send-a-TSN-only-once.txt
+Patch20610: 4184-IPV4-multipath_wrandom-Fix-softirq-unsafe-spin-lock-usage.txt
+Patch20611: 4185-IPV6-Fix-illegal-dst-locking-in-softirq-context.txt
+Patch20612: 4187-IPV4-Remove-suprious-use-of-goto-out-in-icmp_reply.txt
+Patch20613: 4189-TG3-Flush-tg3_reset_task.txt
+Patch20614: 4190-TG3-Update-driver-version-and-release-date.txt
+Patch20615: 4191-NET-Add-CONFIG_NETDEBUG-to-suppress-bad-packet-messages.txt
+Patch20616: 4213-3c59x-collision-statistic-fix.txt
+Patch20617: 4327-ICMP-Fix-extra-dst-release-when-ip_options_echo-fails.txt
+Patch20618: 4328-NETFILTER-ctnetlink-Fix-subsystem-used-for-expectation-events.txt
+Patch20619: 4329-NETFILTER-ctnetlink-add-MODULE_ALIAS-for-expectation-subsystem.txt
+Patch20620: 4330-NETFILTER-nf_conntrack-check-address-family-when-finding-protocol-module.txt
+Patch20621: 4331-NETFILTER-ULOG-nfnetlink_log-Use-better-default-value-for-nlbufsiz.txt
+Patch20622: 4332-NETFILTER-Fix-undersized-skb-allocation-in-ipt_ULOG-ebt_ulog-nfnetlink_log.txt
+Patch20623: 4333-NETFILTER-nfnetlink_queue-fix-packet-marking-over-netlink.txt
+Patch20624: 4334-NETFILTER-Fix-missing-src-port-initialization-in-tftp-expectation-mask.txt
+Patch20625: 4336-NETFILTER-nf_conntrack-fix-incorrect-memset-size-in-FTP-helper.txt
+Patch20626: 4338-NETFILTER-Check-policy-length-in-policy-match-strict-mode.txt
+Patch20627: 4339-NETFILTER-Fix-ip6t_policy-address-matching.txt
+Patch20628: 4340-NETFILTER-Prepare-ipt-ip6t-_policy-match-for-x_tables-unification.txt
+Patch20629: 4341-NETFILTER-Fix-check-whether-dst_entry-needs-to-be-released-after-NAT.txt
+Patch20630: 4378-IPV6-TUNNEL6-Don-t-try-to-add-multicast-route-twice.txt
+Patch20631: 4379-NET-NEIGHBOUR-Ensure-to-record-time-to-neigh-updated-when-neighbour-s-state-changed.txt
+Patch20632: 4380-IPV6-ADDRCONF-Use-our-standard-algorithm-for-randomized-ifid.txt
+Patch20633: 4381-IPV6-ADDRCONF-Split-up-ipv6_generate_eui64-by-device-type.txt
+Patch20634: 4382-IPV6-ROUTE-Add-accept_ra_defrtr-sysctl.txt
+Patch20635: 4383-IPV6-ADDRCONF-Add-accept_ra_pinfo-sysctl.txt
+Patch20636: 4384-IPV6-ROUTE-Split-up-rt6_cow-for-future-changes.txt
+Patch20637: 4385-IPV6-ROUTE-Set-appropriate-information-before-inserting-a-route.txt
+Patch20638: 4386-IPV6-ROUTE-Copy-u.dst.error-for-RTF_REJECT-routes-when-cloning.txt
+Patch20639: 4387-IPV6-ROUTE-Add-rt6_alloc_clone-for-cloning-route-allocation.txt
+Patch20640: 4388-IPV6-ROUTE-Unify-two-code-paths-for-pmtu-disc.txt
+Patch20641: 4389-IPV6-ROUTE-Clean-up-reference-counting-unlocking-for-returning-object.txt
+Patch20642: 4390-IPV6-ROUTE-Convert-rt6_cow-to-rt6_alloc_cow.txt
+Patch20643: 4391-IPV6-ROUTE-Clean-up-cow-ing-in-ip6_route_-intput-output.txt
+Patch20644: 4392-IPV6-ROUTE-Eliminate-lock-for-default-route-pointer.txt
+Patch20645: 4393-IPV6-ROUTE-More-strict-check-for-default-routers-in-rt6_get_dflt_router.txt
+Patch20646: 4394-IPV6-ROUTE-Try-selecting-better-route-for-non-default-routes-as-well.txt
+Patch20647: 4395-IPV6-ROUTE-Clean-up-rt6_select-code-path-in-ip6_route_-intput-output.txt
+Patch20648: 4396-IPV6-ROUTE-Try-finding-the-next-best-route.txt
+Patch20649: 4397-IPV6-ROUTE-Handle-finding-the-next-best-route-in-reachability-in-BACKTRACK.txt
+Patch20650: 4398-IPV6-ROUTE-Add-support-for-Router-Preference-RFC4191.txt
+Patch20651: 4399-IPV6-ROUTE-Add-Router-Reachability-Probing-RFC4191.txt
+Patch20652: 4400-IPV6-ROUTE-Add-accept_ra_rtr_pref-sysctl.txt
+Patch20653: 4401-IPV6-ROUTE-Add-router_probe_interval-sysctl.txt
+Patch20654: 4402-IPV6-ROUTE-Add-experimental-support-for-Route-Information-Option-in-RA-RFC4191.txt
+Patch20655: 4403-IPV6-ROUTE-Flag-RTF_DEFAULT-for-Route-Infomation-for-0.txt
+Patch20656: 4404-IPV6-ROUTE-Add-accept_ra_rt_info_max_plen-sysctl.txt
+Patch20657: 4405-IPV6-ROUTE-Ensure-to-accept-redirects-from-nexthop-for-the-target.txt
+Patch20658: 4412-NETFILTER-nfnetlink_log-add-sequence-numbers-for-log-events.txt
+Patch20659: 4414-DCCP-ackvec-Ditch-dccpav_buf_len.txt
+Patch20660: 4415-DCCP-Fix-error-handling-in-dccp_init.txt
+Patch20661: 4416-DCCP-ackvec-Introduce-dccp_ackvec_slab.txt
+Patch20662: 4418-IPV4-Use-RCU-locking-in-fib_rules.txt
+Patch20663: 4421-DCCP-CCID-Allow-ccid_-init-exit-to-be-NULL.txt
+Patch20664: 4423-DCCP-Don-t-alloc-ack-vector-for-the-control-sock.txt
+Patch20665: 4424-DCCP-CCID3-Set-the-no_feedback_timer-fields-near-init_timer.txt
+Patch20666: 4425-DCCP-CCID2-Initial-CCID2-TCP-Like-implementation.txt
+Patch20667: 4426-DCCP-Initial-feature-negotiation-implementation.txt
+Patch20668: 4427-IPCOMP6-don-t-check-vfree-argument-for-NULL.txt
+Patch20669: 4428-IPV4-fib_rules.c-make-struct-fib_rules-static-again.txt
+Patch20670: 4429-TG3-Add-support-for-5714S-and-5715S.txt
+Patch20671: 4430-TG3-Enable-TSO-by-default.txt
+Patch20672: 4431-TG3-Support-shutdown-WoL.txt
+Patch20673: 4432-TG3-Update-version-and-reldate.txt
+Patch20674: 4433-BNX2-Reduce-register-test-size.txt
+Patch20675: 4434-BNX2-Add-ethtool-d-support.txt
+Patch20676: 4435-BNX2-Fix-bug-when-rx-ring-is-full.txt
+Patch20677: 4436-BNX2-Support-larger-rx-ring-sizes-part-1.txt
+Patch20678: 4437-BNX2-Support-larger-rx-ring-sizes-part-2.txt
+Patch20679: 4438-BNX2-Update-version.txt
+Patch20680: 4439-PPP-Fixed-hardware-RX-checksum-handling.txt
+Patch20681: 4440-TCP-MTU-probing.txt
+Patch20682: 4465-e100-remove-init_hw-call-to-fix-panic.txt
+Patch20683: 4466-sis900-remove-cfgpmcsr-I-O-space-register-define.txt
+Patch20684: 4467-sky2-power-management-fix.txt
+Patch20685: 4468-sky2-pci-config-space-checking.txt
+Patch20686: 4469-sky2-ethtool-rx_coalesce-settings-fix.txt
+Patch20687: 4470-sky2-set-mac-address-fix.txt
+Patch20688: 4471-sky2-clear-irq-race.txt
+Patch20689: 4472-sky2-add-irq-to-entropy-pool.txt
+Patch20690: 4473-sky2-support-msi-interrupt-revised.txt
+Patch20691: 4474-sky2-version-0.15-update.txt
+Patch20692: 4475-bonding-allow-bond-to-use-TSO-if-slaves-support-it.txt
+Patch20693: 4476-bonding-Sparse-warnings-fix.txt
+Patch20694: 4478-gianfar-Fix-sparse-warnings.txt
+Patch20695: 4481-uli526x-warning-fix.txt
+Patch20696: 4604-remove-bogus-asm-bug.h-includes.txt
+Patch20697: 4605-bogus-asm-delay.h-includes.txt
+Patch20698: 4607-missing-includes-in-drivers-net-mv643xx_eth.c.txt
+Patch20699: 4615-ipv4-NULL-noise-removal.txt
+Patch20700: 4629-net-ipv6-mcast.c-NULL-noise-removal.txt
+Patch20701: 4650-type-safe-min-in-prism54.txt
+Patch20702: 4692-IPV6-Address-autoconfiguration-does-not-work-after-device-down-up-cycle.txt
+Patch20703: 4695-update-copyright-in-softmac.txt
+Patch20704: 4696-trivial-fixes-to-softmac.txt
+Patch20705: 4697-softmac-update-deauth-handler-to-quiet-warning.txt
+Patch20706: 4698-softmac-add-reassociation-code.txt
+Patch20707: 4699-softmac-remove-dead-code.txt
+Patch20708: 4700-Fix-softmac-scan.txt
+Patch20709: 4701-wrong-firmware-location-in-IPW2100-Kconfig-entry.txt
+Patch20710: 4702-wireless-atmel-fix-setting-TX-key-only-in-ENCODEEXT.txt
+Patch20711: 4703-wireless-atmel-fix-Open-System-authentication-process-bugs.txt
+Patch20712: 4704-wireless-airo-fix-setting-TX-key-index-plus-key-in-ENCODEEXT.txt
+Patch20713: 4705-let-IPW2-1-2-00-select-IEEE80211.txt
+Patch20714: 4706-wireless-atmel-convert-constants-to-ieee80211-layer-equivalents.txt
+Patch20715: 4707-ipw2200-add-monitor-and-qos-entries-to-Kconfig.txt
+Patch20716: 4720-NETLINK-Fix-a-severe-bug.txt
+Patch20717: 4721-NETLINK-illegal-use-of-pid-in-rtnetlink.txt
+Patch20718: 4722-IRDA-Set-proper-IrLAP-device-address-length.txt
+Patch20719: 4723-IRDA-out-of-range-array-access.txt
+Patch20720: 4724-TCP-rcvbuf-lock-when-tcp_moderate_rcvbuf-enabled.txt
+Patch20721: 4725-BRIDGE-fix-for-RCU-and-deadlock-on-device-removal.txt
+Patch20722: 4726-BRIDGE-netfilter-handle-RCU-during-removal.txt
+Patch20723: 4746-BNX2-include-linux-vmalloc.h.txt
+Patch20724: 4777-netfilter-fix-build-error-due-to-missing-has_bridge_parent-macro.txt
+Patch20725: 4779-orinoco-support-smc2532w.txt
+Patch20726: 4785-Bluetooth-Reduce-L2CAP-MTU-for-RFCOMM-connections.txt
+Patch20727: 4786-Bluetooth-Fix-NULL-pointer-dereferences-of-the-HCI-socket.txt
+Patch20728: 4791-Sync-bcm43xx_phy_initb6-with-specs.txt
+Patch20729: 4792-IRDA-Ratelimit-messages.txt
+Patch20730: 4793-ATM-Ratelimit-atmsvc-failure-messages.txt
+Patch20731: 4794-IPV4-ICMP-Invert-default-for-invalid-icmp-msgs-sysctl.txt
+Patch20732: 4795-P8023-Fix-tainting-of-kernel.txt
+Patch20733: 4797-BRIDGE-Better-fix-for-netfilter-missing-symbol-has_bridge_parent.txt
+Patch20734: 4798-NETLINK-genetlink-Fix-bugs-spotted-by-Andrew-Morton.txt
+Patch20735: 4800-IPV6-Don-t-store-dst_entry-for-RAW-socket.txt
+Patch20736: 4801-IPSEC-Fix-strange-IPsec-freeze.txt
+Patch20737: 4802-NET-Revert-skb_copy_datagram_iovec-recursion-elimination.txt
+Patch20738: 4803-ieee80211-Use-IWEVGENIE-to-set-WPA-IE.txt
+Patch20739: 4804-ipw2200-Fix-WPA-network-selection-problem.txt
 
 # END OF PATCH DEFINITIONS
 
@@ -2760,314 +2756,306 @@
 %patch20588 -p1
 # r8169: fix forced-mode link settings
 %patch20589 -p1
-# [bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
-#%patch20590 -p1
 # Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
-%patch20591 -p1
+%patch20590 -p1
 # [SUNGEM]: Unbreak Sun GEM chips.
-%patch20592 -p1
+%patch20591 -p1
 # [IPV4]: Always set fl.proto in ip_route_newports
-%patch20593 -p1
+%patch20592 -p1
 # [BRIDGE]: Fix device delete race.
-%patch20594 -p1
+%patch20593 -p1
 # [NET]: Do not export inet_bind_bucket_create twice.
-%patch20595 -p1
+%patch20594 -p1
 # [IPV6] tcp_v6_send_synack: release the destination
-%patch20596 -p1
+%patch20595 -p1
 # [DCCP] ipv6: dccp_v6_send_response() has a DST leak too.
-%patch20597 -p1
+%patch20596 -p1
 # lp486e: remove SLOW_DOWN_IO
-%patch20598 -p1
+%patch20597 -p1
 # ipw2200: fix ->eeprom[EEPROM_VERSION] check
-%patch20599 -p1
+%patch20598 -p1
 # DocBook: fix some kernel-doc comments in net/sunrpc
-%patch20600 -p1
+%patch20599 -p1
 # SUNRPC: Fix a lock recursion in the auth_gss downcall
-%patch20601 -p1
+%patch20600 -p1
 # SUNRPC: Move upcall out of auth->au_ops->crcreate()
-%patch20602 -p1
+%patch20601 -p1
 # dscc4: fix dscc4_init_dummy_skb check
-%patch20603 -p1
+%patch20602 -p1
 # 8139too: fix a TX timeout watchdog thread against NAPI softirq race
-%patch20604 -p1
+%patch20603 -p1
 # [bcm43xx] Add more initvals sanity checks and error out, if one sanity check fails.
-%patch20605 -p1
+%patch20604 -p1
 # [bcm43xx] Remove function bcm43xx_channel_is_allowed(). Geographical restriction should become part of the 80211 stack, so every driver does not have to duplicate it.
-%patch20606 -p1
-# [bcm43xx] [patch] basic ethtool support
-#%patch20607 -p1
+%patch20605 -p1
 # [bcm43xx] Wireless Ext update:
-%patch20608 -p1
+%patch20606 -p1
 # [NET] snap: needs hardware checksum fix
-%patch20609 -p1
+%patch20607 -p1
 # [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
-%patch20610 -p1
+%patch20608 -p1
 # [SCTP]: Fix 'fast retransmit' to send a TSN only once.
-%patch20611 -p1
+%patch20609 -p1
 # [IPV4] multipath_wrandom: Fix softirq-unsafe spin lock usage
-%patch20612 -p1
+%patch20610 -p1
 # [IPV6]: Fix illegal dst locking in softirq context.
-%patch20613 -p1
+%patch20611 -p1
 # [IPV4]: Remove suprious use of goto out: in icmp_reply
-%patch20614 -p1
+%patch20612 -p1
 # [TG3]: Flush tg3_reset_task()
-%patch20615 -p1
+%patch20613 -p1
 # [TG3]: Update driver version and release date.
-%patch20616 -p1
+%patch20614 -p1
 # [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages.
-%patch20617 -p1
+%patch20615 -p1
 # 3c59x: collision statistic fix
-%patch20618 -p1
+%patch20616 -p1
 # [ICMP]: Fix extra dst release when ip_options_echo fails
-%patch20619 -p1
+%patch20617 -p1
 # [NETFILTER]: ctnetlink: Fix subsystem used for expectation events
-%patch20620 -p1
+%patch20618 -p1
 # [NETFILTER]: ctnetlink: add MODULE_ALIAS for expectation subsystem
-%patch20621 -p1
+%patch20619 -p1
 # [NETFILTER]: nf_conntrack: check address family when finding protocol module
-%patch20622 -p1
+%patch20620 -p1
 # [NETFILTER]: ULOG/nfnetlink_log: Use better default value for 'nlbufsiz'
-%patch20623 -p1
+%patch20621 -p1
 # [NETFILTER]: Fix undersized skb allocation in ipt_ULOG/ebt_ulog/nfnetlink_log
-%patch20624 -p1
+%patch20622 -p1
 # [NETFILTER]: nfnetlink_queue: fix packet marking over netlink
-%patch20625 -p1
+%patch20623 -p1
 # [NETFILTER]: Fix missing src port initialization in tftp expectation mask
-%patch20626 -p1
+%patch20624 -p1
 # [NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper
-%patch20627 -p1
+%patch20625 -p1
 # [NETFILTER]: Check policy length in policy match strict mode
-%patch20628 -p1
+%patch20626 -p1
 # [NETFILTER]: Fix ip6t_policy address matching
-%patch20629 -p1
+%patch20627 -p1
 # [NETFILTER]: Prepare {ipt,ip6t}_policy match for x_tables unification
-%patch20630 -p1
+%patch20628 -p1
 # [NETFILTER]: Fix check whether dst_entry needs to be released after NAT
-%patch20631 -p1
+%patch20629 -p1
 # [IPV6]: TUNNEL6: Don't try to add multicast route twice.
-%patch20632 -p1
+%patch20630 -p1
 # [NET]: NEIGHBOUR: Ensure to record time to neigh->updated when neighbour's state changed.
-%patch20633 -p1
+%patch20631 -p1
 # [IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.
-%patch20634 -p1
+%patch20632 -p1
 # [IPV6]: ADDRCONF: Split up ipv6_generate_eui64() by device type.
-%patch20635 -p1
+%patch20633 -p1
 # [IPV6]: ROUTE: Add accept_ra_defrtr sysctl.
-%patch20636 -p1
+%patch20634 -p1
 # [IPV6]: ADDRCONF: Add accept_ra_pinfo sysctl.
-%patch20637 -p1
+%patch20635 -p1
 # [IPV6]: ROUTE: Split up rt6_cow() for future changes.
-%patch20638 -p1
+%patch20636 -p1
 # [IPV6]: ROUTE: Set appropriate information before inserting a route.
-%patch20639 -p1
+%patch20637 -p1
 # [IPV6]: ROUTE: Copy u.dst.error for RTF_REJECT routes when cloning.
-%patch20640 -p1
+%patch20638 -p1
 # [IPV6]: ROUTE: Add rt6_alloc_clone() for cloning route allocation.
-%patch20641 -p1
+%patch20639 -p1
 # [IPV6]: ROUTE: Unify two code paths for pmtu disc.
-%patch20642 -p1
+%patch20640 -p1
 # [IPV6]: ROUTE: Clean up reference counting / unlocking for returning object.
-%patch20643 -p1
+%patch20641 -p1
 # [IPV6]: ROUTE: Convert rt6_cow() to rt6_alloc_cow().
-%patch20644 -p1
+%patch20642 -p1
 # [IPV6]: ROUTE: Clean-up cow'ing in ip6_route_{intput,output}().
-%patch20645 -p1
+%patch20643 -p1
 # [IPV6]: ROUTE: Eliminate lock for default route pointer.
-%patch20646 -p1
+%patch20644 -p1
 # [IPV6]: ROUTE: More strict check for default routers in rt6_get_dflt_router().
-%patch20647 -p1
+%patch20645 -p1
 # [IPV6]: ROUTE: Try selecting better route for non-default routes as well.
-%patch20648 -p1
+%patch20646 -p1
 # [IPV6]: ROUTE: Clean up rt6_select() code path in ip6_route_{intput,output}().
-%patch20649 -p1
+%patch20647 -p1
 # [IPV6]: ROUTE: Try finding the next best route.
-%patch20650 -p1
+%patch20648 -p1
 # [IPV6]: ROUTE: Handle finding the next best route in reachability in BACKTRACK().
-%patch20651 -p1
+%patch20649 -p1
 # [IPV6]: ROUTE: Add support for Router Preference (RFC4191).
-%patch20652 -p1
+%patch20650 -p1
 # [IPV6]: ROUTE: Add Router Reachability Probing (RFC4191).
-%patch20653 -p1
+%patch20651 -p1
 # [IPV6]: ROUTE: Add accept_ra_rtr_pref sysctl.
-%patch20654 -p1
+%patch20652 -p1
 # [IPV6]: ROUTE: Add router_probe_interval sysctl.
-%patch20655 -p1
+%patch20653 -p1
 # [IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).
-%patch20656 -p1
+%patch20654 -p1
 # [IPV6]: ROUTE: Flag RTF_DEFAULT for Route Infomation for ::/0.
-%patch20657 -p1
+%patch20655 -p1
 # [IPV6]: ROUTE: Add accept_ra_rt_info_max_plen sysctl.
-%patch20658 -p1
+%patch20656 -p1
 # [IPV6]: ROUTE: Ensure to accept redirects from nexthop for the target.
-%patch20659 -p1
+%patch20657 -p1
 # [NETFILTER] nfnetlink_log: add sequence numbers for log events
-%patch20660 -p1
+%patch20658 -p1
 # [DCCP] ackvec: Ditch dccpav_buf_len
-%patch20661 -p1
+%patch20659 -p1
 # [DCCP]: Fix error handling in dccp_init
-%patch20662 -p1
+%patch20660 -p1
 # [DCCP] ackvec: Introduce dccp_ackvec_slab
-%patch20663 -p1
+%patch20661 -p1
 # [IPV4]: Use RCU locking in fib_rules.
-%patch20664 -p1
-# [DCCP] ackvec: Introduce ack vector records
-#%patch20665 -p1
+%patch20662 -p1
 # [DCCP] CCID: Allow ccid_{init,exit} to be NULL
-%patch20666 -p1
-# [DCCP] ackvec: Delete all the ack vector records in dccp_ackvec_free
-#%patch20667 -p1
+%patch20663 -p1
 # [DCCP]: Don't alloc ack vector for the control sock
-%patch20668 -p1
+%patch20664 -p1
 # [DCCP] CCID3: Set the no_feedback_timer fields near init_timer
-%patch20669 -p1
+%patch20665 -p1
 # [DCCP] CCID2: Initial CCID2 (TCP-Like) implementation
-%patch20670 -p1
+%patch20666 -p1
 # [DCCP]: Initial feature negotiation implementation
-%patch20671 -p1
+%patch20667 -p1
 # [IPCOMP6]: don't check vfree() argument for NULL.
-%patch20672 -p1
+%patch20668 -p1
 # [IPV4] fib_rules.c: make struct fib_rules static again
-%patch20673 -p1
+%patch20669 -p1
 # [TG3]: Add support for 5714S and 5715S
-%patch20674 -p1
+%patch20670 -p1
 # [TG3]: Enable TSO by default
-%patch20675 -p1
+%patch20671 -p1
 # [TG3]: Support shutdown WoL.
-%patch20676 -p1
+%patch20672 -p1
 # [TG3]: Update version and reldate
-%patch20677 -p1
+%patch20673 -p1
 # [BNX2]: Reduce register test size
-%patch20678 -p1
+%patch20674 -p1
 # [BNX2]: Add ethtool -d support
-%patch20679 -p1
+%patch20675 -p1
 # [BNX2]: Fix bug when rx ring is full
-%patch20680 -p1
+%patch20676 -p1
 # [BNX2]: Support larger rx ring sizes (part 1)
-%patch20681 -p1
+%patch20677 -p1
 # [BNX2]: Support larger rx ring sizes (part 2)
-%patch20682 -p1
+%patch20678 -p1
 # [BNX2]: Update version
-%patch20683 -p1
+%patch20679 -p1
 # [PPP]: Fixed hardware RX checksum handling
-%patch20684 -p1
+%patch20680 -p1
 # [TCP]: MTU probing
-%patch20685 -p1
+%patch20681 -p1
 # e100: remove init_hw call to fix panic
-%patch20686 -p1
+%patch20682 -p1
 # sis900: remove cfgpmcsr I/O space register define
-%patch20687 -p1
+%patch20683 -p1
 # sky2: power management fix
-%patch20688 -p1
+%patch20684 -p1
 # sky2: pci config space checking
-%patch20689 -p1
+%patch20685 -p1
 # sky2: ethtool rx_coalesce settings fix
-%patch20690 -p1
+%patch20686 -p1
 # sky2: set mac address fix
-%patch20691 -p1
+%patch20687 -p1
 # sky2: clear irq race
-%patch20692 -p1
+%patch20688 -p1
 # sky2: add irq to entropy pool
-%patch20693 -p1
+%patch20689 -p1
 # sky2: support msi interrupt (revised)
-%patch20694 -p1
+%patch20690 -p1
 # sky2: version 0.15 update
-%patch20695 -p1
+%patch20691 -p1
 # bonding: allow bond to use TSO if slaves support it
-%patch20696 -p1
+%patch20692 -p1
 # bonding: Sparse warnings fix
-%patch20697 -p1
+%patch20693 -p1
 # gianfar: Fix sparse warnings
-%patch20698 -p1
+%patch20694 -p1
 # uli526x warning fix
-%patch20699 -p1
+%patch20695 -p1
 # remove bogus asm/bug.h includes.
-%patch20700 -p1
+%patch20696 -p1
 # bogus asm/delay.h includes
-%patch20701 -p1
+%patch20697 -p1
 # missing includes in drivers/net/mv643xx_eth.c
-%patch20702 -p1
+%patch20698 -p1
 # ipv4 NULL noise removal
-%patch20703 -p1
+%patch20699 -p1
 # net/ipv6/mcast.c NULL noise removal
-%patch20704 -p1
+%patch20700 -p1
 # type-safe min() in prism54
-%patch20705 -p1
+%patch20701 -p1
 # [IPV6]: Address autoconfiguration does not work after device down/up cycle
-%patch20706 -p1
+%patch20702 -p1
 # update copyright in softmac
-%patch20707 -p1
+%patch20703 -p1
 # trivial fixes to softmac
-%patch20708 -p1
+%patch20704 -p1
 # softmac: update deauth handler to quiet warning
-%patch20709 -p1
+%patch20705 -p1
 # softmac: add reassociation code
-%patch20710 -p1
+%patch20706 -p1
 # softmac: remove dead code
-%patch20711 -p1
+%patch20707 -p1
 # Fix softmac scan
-%patch20712 -p1
+%patch20708 -p1
 # wrong firmware location in IPW2100 Kconfig entry
-%patch20713 -p1
+%patch20709 -p1
 # wireless/atmel: fix setting TX key only in ENCODEEXT
-%patch20714 -p1
+%patch20710 -p1
 # wireless/atmel: fix Open System authentication process bugs
-%patch20715 -p1
+%patch20711 -p1
 # wireless/airo: fix setting TX key index plus key in ENCODEEXT
-%patch20716 -p1
+%patch20712 -p1
 # let IPW2{1,2}00 select IEEE80211
-%patch20717 -p1
+%patch20713 -p1
 # wireless/atmel: convert constants to ieee80211 layer equivalents
-%patch20718 -p1
+%patch20714 -p1
 # ipw2200: add monitor and qos entries to Kconfig
-%patch20719 -p1
+%patch20715 -p1
 # [NETLINK]: Fix a severe bug
-%patch20720 -p1
+%patch20716 -p1
 # [NETLINK]: illegal use of pid in rtnetlink
-%patch20721 -p1
+%patch20717 -p1
 # [IRDA]: Set proper IrLAP device address length
-%patch20722 -p1
+%patch20718 -p1
 # [IRDA]: out of range array access
-%patch20723 -p1
+%patch20719 -p1
 # [TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled
-%patch20724 -p1
+%patch20720 -p1
 # [BRIDGE]: fix for RCU and deadlock on device removal
-%patch20725 -p1
+%patch20721 -p1
 # [BRIDGE]: netfilter handle RCU during removal
-%patch20726 -p1
+%patch20722 -p1
 # [BNX2]: include <linux/vmalloc.h>
-%patch20727 -p1
+%patch20723 -p1
 # netfilter: fix build error due to missing has_bridge_parent macro
-%patch20728 -p1
+%patch20724 -p1
 # orinoco: support smc2532w
-%patch20729 -p1
+%patch20725 -p1
 # [Bluetooth] Reduce L2CAP MTU for RFCOMM connections
-%patch20730 -p1
+%patch20726 -p1
 # [Bluetooth] Fix NULL pointer dereferences of the HCI socket
-%patch20731 -p1
+%patch20727 -p1
 # Sync bcm43xx_phy_initb6() with specs
-%patch20732 -p1
+%patch20728 -p1
 # [IRDA]: Ratelimit messages.
-%patch20733 -p1
+%patch20729 -p1
 # [ATM]: Ratelimit atmsvc failure messages
-%patch20734 -p1
+%patch20730 -p1
 # [IPV4] ICMP: Invert default for invalid icmp msgs sysctl
-%patch20735 -p1
+%patch20731 -p1
 # [P8023]: Fix tainting of kernel.
-%patch20736 -p1
+%patch20732 -p1
 # [BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent
-%patch20737 -p1
+%patch20733 -p1
 # [NETLINK] genetlink: Fix bugs spotted by Andrew Morton.
-%patch20738 -p1
+%patch20734 -p1
 # [IPV6] Don't store dst_entry for RAW socket
-%patch20739 -p1
+%patch20735 -p1
 # [IPSEC]: Fix strange IPsec freeze.
-%patch20740 -p1
+%patch20736 -p1
 # [NET]: Revert skb_copy_datagram_iovec() recursion elimination.
-%patch20741 -p1
+%patch20737 -p1
 # ieee80211: Use IWEVGENIE to set WPA IE
-%patch20742 -p1
+%patch20738 -p1
 # ipw2200: Fix WPA network selection problem
-%patch20743 -p1
+%patch20739 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -4097,7 +4085,6 @@
 - Add two management functions to ieee80211_rx.c
 - Clarify help text of SKGE/SK98LIN/SKY2
 - r8169: fix forced-mode link settings
-- [bcm43xx] Fix makefile. Remove all the "out-of-tree" stuff.
 - Fix ipv4/igmp.c compile with gcc-4 and IP_MULTICAST
 - [SUNGEM]: Unbreak Sun GEM chips.
 - [IPV4]: Always set fl.proto in ip_route_newports
@@ -4114,7 +4101,6 @@
 - 8139too: fix a TX timeout watchdog thread against NAPI softirq race
 - [bcm43xx] Add more initvals sanity checks and error out, if one sanity check fails.
 - [bcm43xx] Remove function bcm43xx_channel_is_allowed(). Geographical restriction should become part of the 80211 stack, so every driver does not have to duplicate it.
-- [bcm43xx] [patch] basic ethtool support
 - [bcm43xx] Wireless Ext update:
 - [NET] snap: needs hardware checksum fix
 - [IPV6]: Don't hold extra ref count in ipv6_ifa_notify
@@ -4172,9 +4158,7 @@
 - [DCCP]: Fix error handling in dccp_init
 - [DCCP] ackvec: Introduce dccp_ackvec_slab
 - [IPV4]: Use RCU locking in fib_rules.
-- [DCCP] ackvec: Introduce ack vector records
 - [DCCP] CCID: Allow ccid_{init,exit} to be NULL
-- [DCCP] ackvec: Delete all the ack vector records in dccp_ackvec_free
 - [DCCP]: Don't alloc ack vector for the control sock
 - [DCCP] CCID3: Set the no_feedback_timer fields near init_timer
 - [DCCP] CCID2: Initial CCID2 (TCP-Like) implementation



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:44:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:44:40 -0500
Subject: rpms/gkrellm/devel gkrellm.spec,1.29,1.30
Message-ID: <200602151544.k1FFietI020298@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20285

Modified Files:
	gkrellm.spec 
Log Message:
- fix chkconfig requires


Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gkrellm.spec	11 Feb 2006 03:09:25 -0000	1.29
+++ gkrellm.spec	15 Feb 2006 15:44:38 -0000	1.30
@@ -2,7 +2,7 @@
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
 Version:	2.2.7
-Release: 5.2.1
+Release:    6
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -38,6 +38,7 @@
 %package daemon
 Summary: 	The GNU Krell Monitors Server
 Group: 		System Environment/Daemons
+Requires:   /sbin/chkconfig
 
 %description daemon
 gkrellmd listens for connections from gkrellm clients. When a gkrellm
@@ -47,7 +48,7 @@
 %package 	devel
 Summary: 	Development files for the GNU Krell Monitors
 Group: 		Development/System
-Requires: 	%{name} = %{version}-%{release}, gtk2-devel, /sbin/chkconfig
+Requires: 	%{name} = %{version}-%{release}, gtk2-devel
 
 %description devel
 Development files for the GNU Krell Monitors.
@@ -183,6 +184,9 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 2.2.7-6
+- fix chkconfig requires
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.7-5.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 15:48:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 10:48:54 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1591.4.3,1.1591.4.4
Message-ID: <200602151548.k1FFmsp3000418@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv404

Modified Files:
      Tag: private-linville-netdev-fc4-10-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1591.4.3
retrieving revision 1.1591.4.4
diff -u -r1.1591.4.3 -r1.1591.4.4
--- kernel-2.6.spec	15 Feb 2006 15:42:57 -0000	1.1591.4.3
+++ kernel-2.6.spec	15 Feb 2006 15:48:51 -0000	1.1591.4.4
@@ -19,7 +19,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .netdev.10
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
 %define signmodules 0
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:03:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:03:31 -0500
Subject: rpms/lsof/devel lsof_4.72-rh-eventpoll.patch, NONE, 1.1 lsof.spec,
	1.24, 1.25
Message-ID: <200602151603.k1FG3Vhs011257@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11216

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.72-rh-eventpoll.patch 
Log Message:
add eventpoll hack

lsof_4.72-rh-eventpoll.patch:
 dnode.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE lsof_4.72-rh-eventpoll.patch ---
--- lsof_4.72-rh/dialects/linux/dnode.c.eventpoll	2006-02-15 16:22:33.000000000 +0100
+++ lsof_4.72-rh/dialects/linux/dnode.c	2006-02-15 16:22:13.000000000 +0100
@@ -449,13 +449,22 @@
 		tn = "LINK";
 		break;
 	    default:
-		if (type > 9999)
-		    (void) snpf(Lf->type, sizeof(Lf->type), "*%03d",
-				type % 1000);
-		else
-		    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
-		(void) snpf(Namech, Namechl, "unknown inode type");
-		tn = (char *)NULL;
+		/* eventpoll hack */
+		if (p && strncmp(p, "eventpoll", 9)==0)
+		{
+			tn = "epoll";
+			(void) snpf(Namech, Namechl, "%s", "eventpoll");
+		}
+		else 
+		{
+			if (type > 9999)
+		    		(void) snpf(Lf->type, sizeof(Lf->type), "*%03d",
+					type % 1000);
+			else
+			    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
+			(void) snpf(Namech, Namechl, "unknown inode type");
+			tn = (char *)NULL;
+		}
 	    }
 	} else
 	    tn = "unknown";


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lsof.spec	11 Feb 2006 04:25:43 -0000	1.24
+++ lsof.spec	15 Feb 2006 16:03:01 -0000	1.25
@@ -1,11 +1,12 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.76
-Release: 1.2.1
+Release: 2
 License: Free
 %define lsofrh lsof_%{version}-rh
 Group: Development/Debuggers
 Source0: %{lsofrh}.tar.bz2
+Patch1: lsof_4.72-rh-eventpoll.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -16,7 +17,7 @@
 
 %prep
 %setup -q -n %{lsofrh}
-
+%patch1 -p1 -b .eventpoll
 
 %build
 #LINUX_KERNEL=`pwd`/../linux LSOF_INCLUDE=`pwd`/../linux/include \
@@ -43,6 +44,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Feb 15 2006 Karel Zak <kzak at redhat.com> 4.76-2
+- fix #175568 - lsof prints 'unknown inode type' for epoll
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.76-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:03:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:03:31 -0500
Subject: rpms/kernel/devel jwltest-e1000-7_0_33-k2.patch, NONE,
	1.1.6.1 jwltest-ipw2200-hwcrypto-off.patch, NONE,
	1.1.4.1 jwltest-sk98lin-neuter.patch, NONE,
	1.1.12.1 linux-2.6-bcm43xx-git.patch, 1.1,
	1.1.12.1 linux-2.6-softmac-git.patch, 1.6,
	1.6.12.1 linux-2.6-bcm43xx-git-mb.patch, 1.1, NONE
Message-ID: <200602151603.k1FG3Vhj011263@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11215

Modified Files:
      Tag: private-linville-jwltest-fc5-10-branch
	linux-2.6-bcm43xx-git.patch linux-2.6-softmac-git.patch 
Added Files:
      Tag: private-linville-jwltest-fc5-10-branch
	jwltest-e1000-7_0_33-k2.patch 
	jwltest-ipw2200-hwcrypto-off.patch 
	jwltest-sk98lin-neuter.patch 
Removed Files:
      Tag: private-linville-jwltest-fc5-10-branch
	linux-2.6-bcm43xx-git-mb.patch 
Log Message:


jwltest-e1000-7_0_33-k2.patch:
 e1000.h         |   52 +--
 e1000_ethtool.c |  113 +++----
 e1000_hw.c      |  861 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 e1000_hw.h      |  366 ++++++++++++++++++++++-
 e1000_main.c    |  674 +++++++++++++++++++------------------------
 e1000_osdep.h   |    4 
 e1000_param.c   |   78 +----
 7 files changed, 1508 insertions(+), 640 deletions(-)

--- NEW FILE jwltest-e1000-7_0_33-k2.patch ---
--- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig	2006-02-13 11:48:40.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c	2006-02-13 11:54:16.000000000 -0500
@@ -44,10 +44,19 @@
  */
 
 #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when e1000_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+
 #define E1000_PARAM(X, desc) \
-	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-	static int num_##X = 0; \
-	module_param_array_named(X, X, int, &num_##X, 0); \
+	static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+	MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \
 	MODULE_PARM_DESC(X, desc);
 
 /* Transmit Descriptor Count
@@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct
 		BUG();
 	}
 
-	DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n",
+	DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n",
 	       opt->name, *value, opt->err);
 	*value = opt->def;
 	return -1;
@@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter
 		DPRINTK(PROBE, NOTICE,
 		       "Warning: no configuration for board #%i\n", bd);
 		DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
+		bd = E1000_MAX_NIC;
 	}
 
 	{ /* Transmit Descriptor Count */
@@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		if (num_TxDescriptors > bd) {
 			tx_ring->count = TxDescriptors[bd];
 			e1000_validate_option(&tx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(tx_ring->count,
 						REQ_TX_DESCRIPTOR_MULTIPLE);
-		} else {
-			tx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		if (num_RxDescriptors > bd) {
 			rx_ring->count = RxDescriptors[bd];
 			e1000_validate_option(&rx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(rx_ring->count,
 						REQ_RX_DESCRIPTOR_MULTIPLE);
-		} else {
-			rx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		if (num_XsumRX > bd) {
 			int rx_csum = XsumRX[bd];
 			e1000_validate_option(&rx_csum, &opt, adapter);
 			adapter->rx_csum = rx_csum;
-		} else {
-			adapter->rx_csum = opt.def;
-		}
 	}
 	{ /* Flow Control */
 
@@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		if (num_FlowControl > bd) {
 			int fc = FlowControl[bd];
 			e1000_validate_option(&fc, &opt, adapter);
 			adapter->hw.fc = adapter->hw.original_fc = fc;
-		} else {
-			adapter->hw.fc = adapter->hw.original_fc = opt.def;
-		}
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		if (num_TxIntDelay > bd) {
 			adapter->tx_int_delay = TxIntDelay[bd];
 			e1000_validate_option(&adapter->tx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_int_delay = opt.def;
-		}
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		if (num_TxAbsIntDelay > bd) {
 			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		if (num_RxIntDelay > bd) {
 			adapter->rx_int_delay = RxIntDelay[bd];
 			e1000_validate_option(&adapter->rx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		if (num_RxAbsIntDelay > bd) {
 			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		if (num_InterruptThrottleRate > bd) {
 			adapter->itr = InterruptThrottleRate[bd];
 			switch (adapter->itr) {
 			case 0:
@@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter
 					adapter);
 				break;
 			}
-		} else {
-			adapter->itr = opt.def;
-		}
 	}
 
 	switch (adapter->hw.media_type) {
@@ -518,17 +492,18 @@ static void __devinit
 e1000_check_fiber_options(struct e1000_adapter *adapter)
 {
 	int bd = adapter->bd_number;
-	if (num_Speed > bd) {
+	bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd;
+	if ((Speed[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if (num_Duplex > bd) {
+	if ((Duplex[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
+	if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) {
 		DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
 				 "not valid for fiber adapters, "
 				 "parameter ignored\n");
@@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_
 {
 	int speed, dplx, an;
[...3966 lines suppressed...]
-
 	rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
 	rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
 		E1000_MAX_RXD : E1000_MAX_82544_RXD));
@@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
+	case e1000_80003es2lan:
 		toggle = 0x7FFFF3FF;
 		break;
 	case e1000_82573:
@@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
 		/* autoneg off */
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
+	} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
+		e1000_write_phy_reg(&adapter->hw,
+		                    GG82563_PHY_KMRN_MODE_CTRL,
+		                    0x1CE);
 	}
 	/* force 1000, set loopback */
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);
@@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap
 	case e1000_82571:
 	case e1000_82572:
 	case e1000_82573:
+	case e1000_80003es2lan:
 		return e1000_integrated_phy_loopback(adapter);
 		break;
 
@@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap
 	case e1000_82546_rev_3:
 	default:
 		hw->autoneg = TRUE;
+		if (hw->phy_type == e1000_phy_gg82563) {
+			e1000_write_phy_reg(hw,
+					    GG82563_PHY_KMRN_MODE_CTRL,
+					    0x180);
+		}
 		e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
 		if (phy_reg & MII_CR_LOOPBACK) {
 			phy_reg &= ~MII_CR_LOOPBACK;
@@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 		wol->supported = 0;
 		wol->wolopts   = 0;
 		return;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a) {
+			wol->supported = 0;
+			return;
+		}
+		/* KSP3 does not suppport UCAST wake-ups for any interface */
+		wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
+
+		if (adapter->wol & E1000_WUFC_EX)
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+		wol->wolopts = 0;
+		goto do_defaults;
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
+
+do_defaults:
 		if (adapter->wol & E1000_WUFC_EX)
 			wol->wolopts |= WAKE_UCAST;
 		if (adapter->wol & E1000_WUFC_MC)
@@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82543GC_COPPER:
 	case E1000_DEV_ID_82544EI_FIBER:
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
 		return wol->wolopts ? -EOPNOTSUPP : 0;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a)
+			return wol->wolopts ? -EOPNOTSUPP : 0;
+
+		if (wol->wolopts & WAKE_UCAST) {
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+			return -EOPNOTSUPP;
+		}
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev,
 			adapter->wol |= E1000_WUFC_BC;
 		if (wol->wolopts & WAKE_MAGIC)
 			adapter->wol |= E1000_WUFC_MAG;
+
 	}
 
 	return 0;
@@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic
 		struct ethtool_stats *stats, uint64_t *data)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_E1000_MQ
-	uint64_t *queue_stat;
-	int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t);
-	int j, k;
-#endif
 	int i;
 
 	e1000_update_stats(adapter);
@@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic
 		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
 			sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
 	}
-#ifdef CONFIG_E1000_MQ
-	for (j = 0; j < adapter->num_tx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-	for (j = 0; j < adapter->num_rx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-#endif
 /*	BUG_ON(i != E1000_STATS_LEN); */
 }
 
 static void
 e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
 {
-#ifdef CONFIG_E1000_MQ
-	struct e1000_adapter *adapter = netdev_priv(netdev);
-#endif
 	uint8_t *p = data;
 	int i;
 
@@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net
 			       ETH_GSTRING_LEN);
 			p += ETH_GSTRING_LEN;
 		}
-#ifdef CONFIG_E1000_MQ
-		for (i = 0; i < adapter->num_tx_queues; i++) {
-			sprintf(p, "tx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "tx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-		for (i = 0; i < adapter->num_rx_queues; i++) {
-			sprintf(p, "rx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "rx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-#endif
 /*		BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
 		break;
 	}
@@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum		= e1000_get_tx_csum,
+	.get_tx_csum            = e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
+#ifdef ETHTOOL_GPERMADDR
+	.get_perm_addr  	= ethtool_op_get_perm_addr,
+#endif
 };
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
+  
+void set_ethtool_ops(struct net_device *netdev)
 {
 	SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
 }

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-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,

linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |   17 
 drivers/net/wireless/Makefile                  |    3 
 drivers/net/wireless/bcm43xx/Makefile          |    9 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  934 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  175 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 ++
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  261 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4457 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2127 +++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  592 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |   88 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 ++
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 +++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   94 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1109 ++++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 net/ieee80211/ieee80211_rx.c                   |   74 
 28 files changed, 14655 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.1.12.1 linux-2.6-bcm43xx-git.patch
Index: linux-2.6-bcm43xx-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- linux-2.6-bcm43xx-git.patch	6 Feb 2006 15:33:08 -0000	1.1
+++ linux-2.6-bcm43xx-git.patch	15 Feb 2006 16:03:02 -0000	1.1.12.1
@@ -1,8 +1,5 @@
-diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
-new file mode 100644
-index 0000000..64d9022
---- /dev/null
-+++ b/Documentation/networking/bcm43xx.txt
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt	2006-02-14 17:01:37.000000000 -0500
 @@ -0,0 +1,36 @@
 +
 +			BCM43xx Linux Driver Project
@@ -40,136 +37,48 @@
 +	binary driver files. It supports driver files from Windows, MacOS and 
 +	Linux. You can get fwcutter from http://bcm43xx.berlios.de/.
 +	Also, fwcutter comes with a README file for further instructions.
-diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
-index 233a4f6..32744ea 100644
---- a/drivers/net/wireless/Kconfig
-+++ b/drivers/net/wireless/Kconfig
-@@ -473,6 +473,14 @@ config PRISM54
- 
- source "drivers/net/wireless/hostap/Kconfig"
- 
-+config BCM43XX
-+       tristate "Broadcom BCM43xx wireless support"
-+       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
-+	select FW_LOADER
-+       ---help---
-+	This is an experimental driver for the Broadcom 43xx wireless chip,
-+	found in the Apple Airport Extreme and various other devices.
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h	2006-02-14 17:02:06.000000000 -0500
+@@ -0,0 +1,36 @@
++/*
 +
- # yes, this works even when no drivers are selected
- config NET_WIRELESS
- 	bool
-diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
-index 3a6f7ba..c867798 100644
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel
- obj-$(CONFIG_PRISM54)		+= prism54/
- 
- obj-$(CONFIG_HOSTAP)		+= hostap/
-+obj-$(CONFIG_BCM43XX)		+= bcm43xx/
- 
- # 16-bit wireless PCMCIA client drivers
- obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
-diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
-new file mode 100644
-index 0000000..98d4efb
---- /dev/null
-+++ b/drivers/net/wireless/bcm43xx/Makefile
-@@ -0,0 +1,87 @@
-+# Makefile for bcm43xx driver
-+
-+VERSION		:= 0.0.1
-+RELEASE_NAME	:= bcm43xx-$(VERSION)
-+
-+# Optional path, where the SoftMAC subsystem is located.
-+# You may set SOFTMAC_DIR in your bashrc, for example.
-+SOFTMAC_DIR	?= 
-+
-+KVER		:= $(shell uname -r)
-+KDIR		?= /lib/modules/$(KVER)/build
-+PWD		:= $(shell pwd)
-+MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
-+
-+# Comment/uncomment to enable/disable debugging
-+DEBUG = y
-+
-+
-+ifeq ($(DEBUG),y)
-+DEBUGFS_OBJ = bcm43xx_debugfs.o
-+CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
-+else
-+DEBUGFS_OBJ =
-+CFLAGS += -O2
-+endif
-+
-+CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
-+ifneq ($(SOFTMAC_DIR),)
-+CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
-+endif
++  Broadcom BCM43xx wireless driver
 +
-+ifneq ($(KERNELRELEASE),)
-+# call from kernel build system
++  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
++                     Stefano Brivio <st3 at riseup.net>
++                     Michael Buesch <mbuesch at freenet.de>
++                     Danny van Dyk <kugelfang at gentoo.org>
++                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
 +
-+obj-m := bcm43xx.o
-+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
-+		bcm43xx_radio.o bcm43xx_phy.o \
-+		bcm43xx_power.o bcm43xx_wx.o \
-+		bcm43xx_pio.o bcm43xx_ilt.o \
-+		bcm43xx_leds.o
++  Some parts of the code in this file are derived from the ipw2200
++  driver  Copyright(c) 2003 - 2004 Intel Corporation.
++
++  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.
 +
-+else
++  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; see the file COPYING.  If not, write to
++  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
++  Boston, MA 02110-1301, USA.
++
++*/
 +
-+default: modules
++#ifndef BCM43xx_WX_H_
++#define BCM43xx_WX_H_
 +
-+modules:
-+	$(MAKE) -C $(KDIR) M=$(PWD) modules
++extern const struct iw_handler_def bcm43xx_wx_handlers_def;
 +
-+install: bcm43xx.ko
-+	install -d $(MODPATH)
-+	install -m 644 -c bcm43xx.ko $(MODPATH)
-+	/sbin/depmod -a
-+
-+uninstall:
-+	rm -rf $(MODPATH)
-+	/sbin/depmod -a
-+
-+endif
-+
-+clean:
-+	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
-+		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
-+		-print | xargs rm -Rf
-+
-+depend .depend dep:
-+	$(CC) $(CFLAGS) -M *.c > .depend
-+
-+ifeq (.depend,$(wildcard .depend))
-+include .depend
-+endif
-+
-+DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
-+DISTDIR = $(RELEASE_NAME)
-+
-+release: clean
-+	@rm -rf $(DISTDIR)
-+	@mkdir $(DISTDIR)
-+	@chmod 777 $(DISTDIR)
-+	@for file in $(DISTFILES); do                   \
-+                if test -d $$file; then                 \
-+                        mkdir $(DISTDIR)/$$file;        \
-+                else                                    \
-+                        cp -p $$file $(DISTDIR)/$$file; \
-+                fi;                                     \
-+        done
-+	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
-+	@rm -rf $(DISTDIR)
-diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
-new file mode 100644
-index 0000000..38e75ed
---- /dev/null
-+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
-@@ -0,0 +1,938 @@
++#endif /* BCM43xx_WX_H_ */
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h	2006-02-14 17:02:06.000000000 -0500
+@@ -0,0 +1,934 @@
 +#ifndef BCM43xx_H_
 +#define BCM43xx_H_
 +
@@ -189,14 +98,10 @@
 +#include "bcm43xx_leds.h"
 +
 +
-+#define DRV_NAME			__stringify(KBUILD_MODNAME)
-+#define DRV_VERSION			__stringify(BCM43xx_VERSION)
-+#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
-+#define PFX				DRV_NAME ": "
++#define PFX				KBUILD_MODNAME ": "
[...25199 lines suppressed...]
++				       (description));				\
++	} while (0)
 +
-+  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
-+                     Stefano Brivio <st3 at riseup.net>
-+                     Michael Buesch <mbuesch at freenet.de>
-+                     Danny van Dyk <kugelfang at gentoo.org>
-+                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
++#else /* CONFIG_BCM43XX_DEBUG*/
 +
-+  Some parts of the code in this file are derived from the ipw2200
-+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
++static inline
++void bcm43xx_debugfs_init(void) { }
++static inline
++void bcm43xx_debugfs_exit(void) { }
++static inline
++void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm) { }
++static inline
++void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm) { }
++static inline
++void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
++				struct bcm43xx_xmitstatus *status) { }
 +
-+  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.
++static inline
++void bcm43xx_printk_dump(const char *data,
++			 size_t size,
++			 const char *description)
++{
++}
++static inline
++void bcm43xx_printk_bitdump(const unsigned char *data,
++			    size_t bytes, int msb_to_lsb,
++			    const char *description)
++{
++}
++#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description)  do { /* nothing */ } while (0)
 +
-+  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.
++#endif /* CONFIG_BCM43XX_DEBUG*/
 +
-+  You should have received a copy of the GNU General Public License
-+  along with this program; see the file COPYING.  If not, write to
-+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-+  Boston, MA 02110-1301, USA.
++/* Ugly helper macros to make incomplete code more verbose on runtime */
++#ifdef TODO
++# undef TODO
++#endif
++#define TODO()  \
++	do {										\
++		printk(KERN_INFO PFX "TODO: Incomplete code in %s() at %s:%d\n",	\
++		       __FUNCTION__, __FILE__, __LINE__);				\
++	} while (0)
 +
-+*/
++#ifdef FIXME
++# undef FIXME
++#endif
++#define FIXME()  \
++	do {										\
++		printk(KERN_INFO PFX "FIXME: Possibly broken code in %s() at %s:%d\n",	\
++		       __FUNCTION__, __FILE__, __LINE__);				\
++	} while (0)
 +
-+#ifndef BCM43xx_WX_H_
-+#define BCM43xx_WX_H_
++#endif /* BCM43xx_DEBUGFS_H_ */
+--- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig	2006-02-14 17:01:26.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/Makefile	2006-02-14 17:02:17.000000000 -0500
+@@ -33,8 +33,11 @@ obj-$(CONFIG_PCI_ATMEL)         += atmel
+ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
+ 
+ obj-$(CONFIG_PRISM54)		+= prism54/
++obj-$(CONFIG_PRISM54_USB)	+= prism54usb/
+ 
+ obj-$(CONFIG_HOSTAP)		+= hostap/
++obj-$(CONFIG_BCM43XX)		+= bcm43xx/
++obj-$(CONFIG_ACX)		+= tiacx/
+ 
+ # 16-bit wireless PCMCIA client drivers
+ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
+--- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig	2006-02-14 17:01:26.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig	2006-02-14 17:02:17.000000000 -0500
+@@ -471,6 +489,23 @@ config PRISM54
+ 	  will be called prism54.ko.
+ 
+ source "drivers/net/wireless/hostap/Kconfig"
 +
-+extern const struct iw_handler_def bcm43xx_wx_handlers_def;
++config BCM43XX
++	tristate "Broadcom BCM43xx wireless support"
++	depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
++	select FW_LOADER
++	---help---
++	  This is an experimental driver for the Broadcom 43xx wireless chip,
++	  found in the Apple Airport Extreme and various other devices.
++
++config BCM43XX_DEBUG
++	bool "Broadcom BCM43xx debugging (RECOMMENDED)"
++	depends on BCM43XX
++	default y
++	---help---
++	  Broadcom 43xx debugging messages.
++	  Say Y, because the driver is still very experimental and
++	  this will help you get it running.
+ 
+ # yes, this works even when no drivers are selected
+ config NET_WIRELESS
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-02-14 16:59:31.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c	2006-02-14 17:01:12.000000000 -0500
+@@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device
+ 	return 0;
+ }
+ 
++/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
++int ieee80211_rx_any(struct ieee80211_device *ieee,
++		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
++{
++	struct ieee80211_hdr_4addr *hdr;
++	int is_packet_for_us;
++	u16 fc;
 +
-+#endif /* BCM43xx_WX_H_ */
++	if (ieee->iw_mode == IW_MODE_MONITOR)
++		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
++
++	hdr = (struct ieee80211_hdr_4addr *)skb->data;
++	fc = le16_to_cpu(hdr->frame_ctl);
++
++	if ((fc & IEEE80211_FCTL_VERS) != 0)
++		return -EINVAL;
++		
++	switch (fc & IEEE80211_FCTL_FTYPE) {
++	case IEEE80211_FTYPE_MGMT:
++		ieee80211_rx_mgt(ieee, hdr, stats);
++		return 0;
++	case IEEE80211_FTYPE_DATA:
++		break;
++	case IEEE80211_FTYPE_CTL:
++		return 0;
++	default:
++		return -EINVAL;
++	}
++
++	is_packet_for_us = 0;
++	switch (ieee->iw_mode) {
++	case IW_MODE_ADHOC:
++		/* our BSS and not from/to DS */
++		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1))
++				is_packet_for_us = 1;
++		}
++		break;
++	case IW_MODE_INFRA:
++		/* our BSS (== from our AP) and from DS */
++		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1)) {
++				/* not our own packet bcasted from AP */
++				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
++					is_packet_for_us = 1;
++			}
++		}
++		break;
++	default:
++		/* ? */
++		break;
++	}
++
++	if (is_packet_for_us)
++		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
++	return 0;
++}
++
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+ static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |    4 
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  403 ++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  457 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  239 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3264 insertions(+), 3 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.6.12.1 linux-2.6-softmac-git.patch
Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -u -r1.6 -r1.6.12.1
--- linux-2.6-softmac-git.patch	7 Feb 2006 22:17:20 -0000	1.6
+++ linux-2.6-softmac-git.patch	15 Feb 2006 16:03:03 -0000	1.6.12.1
@@ -1,7 +1,102 @@
-diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
-index df05f46..c1cb23a 100644
---- a/include/net/ieee80211.h
-+++ b/include/net/ieee80211.h
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211softmac_wx.h	2006-02-15 10:04:26.000000000 -0500
+@@ -0,0 +1,94 @@
++/*
++ * This file contains the prototypes for the wireless extension
++ * handlers that the softmac API provides. Include this file to
++ * use the wx handlers, you can assign these directly.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ *                    Joseph Jezak <josejx at gentoo.org>
++ *                    Larry Finger <Larry.Finger at lwfinger.net>
++ *                    Danny van Dyk <kugelfang at gentoo.org>
++ *                    Michael Buesch <mbuesch at freenet.de>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of version 2 of the GNU General Public License as
++ * published by the Free Software Foundation.
++ *
++ * 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 St, Fifth Floor, Boston, MA  02110-1301 USA
++ *
++ * The full GNU General Public License is included in this distribution in the
++ * file called COPYING.
++ */
++
++#ifndef _IEEE80211SOFTMAC_WX_H
++#define _IEEE80211SOFTMAC_WX_H
++
++#include <net/ieee80211softmac.h>
++#include <net/iw_handler.h>
++
++extern int
++ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
++				 struct iw_request_info *info,
++				 union iwreq_data *data,
++				 char *extra);
++
++extern int
++ieee80211softmac_wx_get_scan_results(struct net_device *net_dev,
++				     struct iw_request_info *info,
++				     union iwreq_data *data,
++				     char *extra);
++
++extern int
++ieee80211softmac_wx_set_essid(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_get_essid(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_rate(struct net_device *net_dev,
++			     struct iw_request_info *info,
++			     union iwreq_data *data,
++			     char *extra);
++
++extern int
++ieee80211softmac_wx_get_rate(struct net_device *net_dev,
++			     struct iw_request_info *info,
++			     union iwreq_data *data,
++			     char *extra);
++
++extern int
++ieee80211softmac_wx_get_wap(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_wap(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_genie(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_get_genie(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu,
++			      char *extra);
++#endif /* _IEEE80211SOFTMAC_WX */
+--- linux-2.6.15.noarch/include/net/ieee80211.h.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211.h	2006-02-15 09:58:21.000000000 -0500
 @@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st
  extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
  				      struct iw_request_info *info,
@@ -17,11 +112,8 @@
  
  static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
  {
-diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
-new file mode 100644
-index 0000000..b971d8c
---- /dev/null
-+++ b/include/net/ieee80211softmac.h
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211softmac.h	2006-02-15 10:04:26.000000000 -0500
 @@ -0,0 +1,292 @@
 +/*
 + * ieee80211softmac.h - public interface to the softmac
@@ -315,22 +407,28 @@
 +ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm);
 +
 +#endif /* IEEE80211SOFTMAC_H_ */
-diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h
-new file mode 100644
-index 0000000..3e0be45
---- /dev/null
-+++ b/include/net/ieee80211softmac_wx.h
-@@ -0,0 +1,94 @@
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c	2006-02-15 09:58:21.000000000 -0500
+@@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d
+ 
+ static int debug = 0;
+ u32 ieee80211_debug_level = 0;
+-struct proc_dir_entry *ieee80211_proc = NULL;
++static struct proc_dir_entry *ieee80211_proc = NULL;
+ 
+ static int show_debug_level(char *page, char **start, off_t offset,
+ 			    int count, int *eof, void *data)
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c	2006-02-15 10:34:17.000000000 -0500
+@@ -0,0 +1,376 @@
 +/*
-+ * This file contains the prototypes for the wireless extension
-+ * handlers that the softmac API provides. Include this file to
-+ * use the wx handlers, you can assign these directly.
++ * This file contains the softmac's authentication logic.
 + *
-+ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
-+ *                    Joseph Jezak <josejx at gentoo.org>
-+ *                    Larry Finger <Larry.Finger at lwfinger.net>
-+ *                    Danny van Dyk <kugelfang at gentoo.org>
-+ *                    Michael Buesch <mbuesch at freenet.de>
++ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
++ *                          Joseph Jezak <josejx at gentoo.org>
++ *                          Larry Finger <Larry.Finger at lwfinger.net>
++ *                          Danny van Dyk <kugelfang at gentoo.org>
++ *                          Michael Buesch <mbuesch at freenet.de>
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of version 2 of the GNU General Public License as
@@ -349,348 +447,367 @@
 + * file called COPYING.
 + */
 +
-+#ifndef _IEEE80211SOFTMAC_WX_H
-+#define _IEEE80211SOFTMAC_WX_H
-+
-+#include <net/ieee80211softmac.h>
-+#include <net/iw_handler.h>
-+
-+extern int
-+ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
-+				 struct iw_request_info *info,
-+				 union iwreq_data *data,
-+				 char *extra);
-+
-+extern int
-+ieee80211softmac_wx_get_scan_results(struct net_device *net_dev,
-+				     struct iw_request_info *info,
-+				     union iwreq_data *data,
-+				     char *extra);
++#include "ieee80211softmac_priv.h"
 +
-+extern int
-+ieee80211softmac_wx_set_essid(struct net_device *net_dev,
-+			      struct iw_request_info *info,
-+			      union iwreq_data *data,
-+			      char *extra);
[...5317 lines suppressed...]
-+				goto out;
++/* private -- calling all callbacks that were specified */
++void
++ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int event, void *event_ctx)
++{
++	struct ieee80211softmac_event *eventptr, *tmp;
++	union iwreq_data wrqu;
++	char *msg;
++	
++	if (event >= 0) {
++		msg = event_descriptions[event];
++		wrqu.data.length = strlen(msg);
++		wireless_send_event(mac->dev, IWEVCUSTOM, &wrqu, msg);
++	}
++
++	if (!list_empty(&mac->events))
++		list_for_each_entry_safe(eventptr, tmp, &mac->events, list) {
++			if ((eventptr->event_type == event || eventptr->event_type == -1)
++				&& (eventptr->event_context == NULL || eventptr->event_context == event_ctx)) {
++				list_del(&eventptr->list);
++				schedule_work(&eventptr->work);
 +			}
-+			kfree(mac->wpa.IE);
-+			mac->wpa.IE = buf;
-+			mac->wpa.IEbuflen = wrqu->data.length;
 +		}
-+		memcpy(mac->wpa.IE, extra, wrqu->data.length);
-+		dprintk(KERN_INFO PFX "generic IE set to ");
-+		for (i=0;i<wrqu->data.length;i++)
-+			dprintk("%.2x", mac->wpa.IE[i]);
-+		dprintk("\n");
-+		mac->wpa.IElen = wrqu->data.length;
-+	} else {
-+		kfree(mac->wpa.IE);
-+		mac->wpa.IE = NULL;
-+		mac->wpa.IElen = 0;
-+		mac->wpa.IEbuflen = 0;
-+	}
++}
++
++void
++ieee80211softmac_call_events(struct ieee80211softmac_device *mac, int event, void *event_ctx)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&mac->lock, flags);
++	ieee80211softmac_call_events_locked(mac, event, event_ctx);
 +
-+ out:	
 +	spin_unlock_irqrestore(&mac->lock, flags);
++}
+--- linux-2.6.15.noarch/net/ieee80211/Makefile.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/Makefile	2006-02-15 09:58:21.000000000 -0500
+@@ -10,3 +10,4 @@ ieee80211-objs := \
+ 	ieee80211_wx.o \
+ 	ieee80211_geo.o
+ 
++obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c	2006-02-15 10:21:29.000000000 -0500
+@@ -1375,9 +1375,9 @@ static void update_network(struct ieee80
+ 	/* dst->last_associate is not overwritten */
+ }
+ 
+-static inline int is_beacon(int fc)
++static inline int is_beacon(__be16 fc)
+ {
+-	return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON);
++	return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON);
+ }
+ 
+ static void ieee80211_process_probe_response(struct ieee80211_device
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c	2006-02-15 09:58:21.000000000 -0500
+@@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie
+ 	return 0;
+ }
+ 
++int ieee80211_wx_set_auth(struct net_device *dev,
++			  struct iw_request_info *info,
++			  union iwreq_data *wrqu,
++			  char *extra)
++{
++	struct ieee80211_device *ieee = netdev_priv(dev);
++	unsigned long flags;
++	int err = 0;
++
++	spin_lock_irqsave(&ieee->lock, flags);
++	
++	switch (wrqu->param.flags & IW_AUTH_INDEX) {
++	case IW_AUTH_WPA_VERSION:
++	case IW_AUTH_CIPHER_PAIRWISE:
++	case IW_AUTH_CIPHER_GROUP:
++	case IW_AUTH_KEY_MGMT:
++		/*
++		 * Host AP driver does not use these parameters and allows
++		 * wpa_supplicant to control them internally.
++		 */
++		break;
++	case IW_AUTH_TKIP_COUNTERMEASURES:
++		break;		/* FIXME */
++	case IW_AUTH_DROP_UNENCRYPTED:
++		ieee->drop_unencrypted = !!wrqu->param.value;
++		break;
++	case IW_AUTH_80211_AUTH_ALG:
++		break;		/* FIXME */
++	case IW_AUTH_WPA_ENABLED:
++		ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value;
++		break;
++	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++		ieee->ieee802_1x = !!wrqu->param.value;
++		break;
++	case IW_AUTH_PRIVACY_INVOKED:
++		ieee->privacy_invoked = !!wrqu->param.value;
++		break;
++	default:
++		err = -EOPNOTSUPP;
++		break;
++	}
++	spin_unlock_irqrestore(&ieee->lock, flags);
 +	return err;
 +}
-+EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie);
 +
-+int
-+ieee80211softmac_wx_get_genie(struct net_device *dev,
-+			      struct iw_request_info *info,
-+			      union iwreq_data *wrqu,
-+			      char *extra)
++int ieee80211_wx_get_auth(struct net_device *dev,
++			  struct iw_request_info *info,
++			  union iwreq_data *wrqu,
++			  char *extra)
 +{
-+	struct ieee80211softmac_device *mac = ieee80211_priv(dev);
++	struct ieee80211_device *ieee = netdev_priv(dev);
 +	unsigned long flags;
 +	int err = 0;
-+	int space = wrqu->data.length;
-+	
-+	spin_lock_irqsave(&mac->lock, flags);
-+	
-+	wrqu->data.length = 0;
++
++	spin_lock_irqsave(&ieee->lock, flags);
 +	
-+	if (mac->wpa.IE && mac->wpa.IElen) {
-+		wrqu->data.length = mac->wpa.IElen;
-+		if (mac->wpa.IElen <= space)
-+			memcpy(extra, mac->wpa.IE, mac->wpa.IElen);
-+		else
-+			err = -E2BIG;
++	switch (wrqu->param.flags & IW_AUTH_INDEX) {
++	case IW_AUTH_WPA_VERSION:
++	case IW_AUTH_CIPHER_PAIRWISE:
++	case IW_AUTH_CIPHER_GROUP:
++	case IW_AUTH_KEY_MGMT:
++	case IW_AUTH_TKIP_COUNTERMEASURES:		/* FIXME */
++	case IW_AUTH_80211_AUTH_ALG:			/* FIXME */
++		/*
++		 * Host AP driver does not use these parameters and allows
++		 * wpa_supplicant to control them internally.
++		 */
++		err = -EOPNOTSUPP;
++		break;
++	case IW_AUTH_DROP_UNENCRYPTED:
++		wrqu->param.value = ieee->drop_unencrypted;
++		break;
++	case IW_AUTH_WPA_ENABLED:
++		wrqu->param.value = ieee->wpa_enabled;
++		break;
++	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++		wrqu->param.value = ieee->ieee802_1x;
++		break;
++	default:
++		err = -EOPNOTSUPP;
++		break;
 +	}
-+	spin_unlock_irqrestore(&mac->lock, flags);
++	spin_unlock_irqrestore(&ieee->lock, flags);
 +	return err;
 +}
-+EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie);
 +
+ EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
+ EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
+ 
+ EXPORT_SYMBOL(ieee80211_wx_get_scan);
+ EXPORT_SYMBOL(ieee80211_wx_set_encode);
+ EXPORT_SYMBOL(ieee80211_wx_get_encode);
++
++EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth);
++EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth);
+--- linux-2.6.15.noarch/net/ieee80211/Kconfig.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/Kconfig	2006-02-15 09:58:21.000000000 -0500
+@@ -66,3 +66,4 @@ config IEEE80211_CRYPT_TKIP
+ 	This can be compiled as a modules and it will be called
+ 	"ieee80211_crypt_tkip".
+ 
++source "net/ieee80211/softmac/Kconfig"


--- linux-2.6-bcm43xx-git-mb.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:05:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:05:06 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1950,1.1950.2.1
Message-ID: <200602151605.k1FG56Dj011637@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11613

Modified Files:
      Tag: private-linville-jwltest-fc5-10-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.1950
retrieving revision 1.1950.2.1
diff -u -r1.1950 -r1.1950.2.1
--- kernel-2.6.spec	15 Feb 2006 00:01:33 -0000	1.1950
+++ kernel-2.6.spec	15 Feb 2006 16:05:03 -0000	1.1950.2.1
@@ -22,7 +22,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.10
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -160,7 +161,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -243,6 +245,7 @@
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -333,6 +336,9 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
+Patch1303: jwltest-sk98lin-neuter.patch
+Patch1304: jwltest-e1000-7_0_33-k2.patch
+Patch1305: jwltest-ipw2200-hwcrypto-off.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -387,8 +393,7 @@
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
-Patch5002: linux-2.6-bcm43xx-git-mb.patch
-Patch5003: linux-2.6-bcm-warnings.patch
+Patch5002: linux-2.6-bcm-warnings.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -880,6 +885,12 @@
 %patch1301 -p1
 # Goodies for wireless drivers to make NetworkManager work
 %patch1302 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1303 -p1
+# update e1000 to 7.0.33-k2(-pre)
+%patch1304 -p1
+# disable hwcrypto in ipw2200 by default (avoid firmware resets)
+%patch1305 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -968,14 +979,12 @@
 # be merged upstream
 #
 
-# Import softmac code from git tree
+# Import softmac code from wireless-2.6 tree
 %patch5000 -p1
-# ... and bcm43xx driver too from jwl's tree
+# ... and bcm43xx driver too
 %patch5001 -p1
-# ... and Michael Buesch's updates (2006-02-03)
-%patch5002 -p1
 # warning fix.
-%patch5003 -p1
+%patch5002 -p1
 
 #
 # final stuff



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:19:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:19:01 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git4.bz2.sign, NONE,
	1.1 .cvsignore, 1.351, 1.352 kernel-2.6.spec, 1.1950,
	1.1951 sources, 1.293, 1.294 upstream, 1.268,
	1.269 patch-2.6.16-rc3-git3.bz2.sign, 1.1, NONE
Message-ID: <200602151619.k1FGJ1JX029681@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29560

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc3-git4.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git3.bz2.sign 
Log Message:
git4



--- NEW FILE patch-2.6.16-rc3-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD8tHsyGugalF9Dw4RAmZwAJ9N9fs+obtaNcNv+HFoeeBD+dqrHQCaA+Fk
5AsxdyT0hY4eE93roS7gyJQ=
=jebX
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- .cvsignore	14 Feb 2006 23:31:51 -0000	1.351
+++ .cvsignore	15 Feb 2006 16:18:58 -0000	1.352
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git3.bz2
+patch-2.6.16-rc3-git4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1950
retrieving revision 1.1951
diff -u -r1.1950 -r1.1951
--- kernel-2.6.spec	15 Feb 2006 00:01:33 -0000	1.1950
+++ kernel-2.6.spec	15 Feb 2006 16:18:58 -0000	1.1951
@@ -216,7 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git3.bz2
+Patch2: patch-2.6.16-rc3-git4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1577,7 +1577,10 @@
 %endif
 
 %changelog
-* Mon Feb 13 2006 Dave Jones <davej at redhat.com>
+* Wed Feb 15 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc3-git4
+
+* Tue Feb 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git2 & -git3
 - Disable PCI message signalled interrupts.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- sources	14 Feb 2006 23:31:53 -0000	1.293
+++ sources	15 Feb 2006 16:18:58 -0000	1.294
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-8be664aa41987bb0323b47e828856362  patch-2.6.16-rc3-git3.bz2
+2def407b045799a76eeee18274222f0d  patch-2.6.16-rc3-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- upstream	14 Feb 2006 23:31:59 -0000	1.268
+++ upstream	15 Feb 2006 16:18:58 -0000	1.269
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git3.bz2
+patch-2.6.16-rc3-git4.bz2


--- patch-2.6.16-rc3-git3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:19:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:19:43 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.8,
	1.9 selinux-policy.spec, 1.109, 1.110
Message-ID: <200602151619.k1FGJhqS030068@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30031

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                  |    2 -
 Rules.modular                             |    2 -
 policy/global_tunables                    |    8 ++++
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/amanda.if            |   37 ++++++++++++++++++++++
 policy/modules/admin/amanda.te            |    2 -
 policy/modules/apps/java.fc               |    1 
 policy/modules/apps/java.if               |   24 ++++++++++++++
 policy/modules/apps/java.te               |   11 ++++++
 policy/modules/apps/wine.if               |    1 
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.if          |   19 +++++++++++
 policy/modules/kernel/mls.if              |   19 +++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/services/automount.te      |    2 -
 policy/modules/services/avahi.te          |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/hal.te            |    5 ++-
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    3 +
 policy/modules/services/networkmanager.te |    2 -
 policy/modules/services/postfix.te        |    4 ++
 policy/modules/services/spamassassin.te   |    9 ++++-
 policy/modules/services/zebra.te          |    1 
 policy/modules/system/fstools.te          |    5 +++
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/init.te             |    2 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/libraries.if        |    1 
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 ++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   50 ++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.if       |    3 +
 policy/modules/system/unconfined.te       |    4 ++
 policy/modules/system/userdomain.te       |    7 ++++
 support/Makefile.devel                    |   12 ++++++-
 36 files changed, 288 insertions(+), 16 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- policy-20060207.patch	14 Feb 2006 22:48:01 -0000	1.8
+++ policy-20060207.patch	15 Feb 2006 16:19:41 -0000	1.9
@@ -55,6 +55,139 @@
  
  define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
  link unlink rename relabelfrom relabelto }')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.2.15/policy/modules/admin/amanda.if
+--- nsaserefpolicy/policy/modules/admin/amanda.if	2006-02-10 21:34:11.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/admin/amanda.if	2006-02-15 11:03:13.000000000 -0500
+@@ -90,3 +90,40 @@
+ 
+ 	dontaudit $1 amanda_dumpdates_t:file { getattr read };
+ ')
++
++########################################
++## <summary>
++##	Allow read/writing /etc/dumpdates.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to allow
++##	</summary>
++## </param>
++#
++interface(`amanda_rw_dumpdates_files',`
++	gen_require(`
++		type amanda_dumpdates_t;
++	')
++
++	allow $1 amanda_dumpdates_t:file rw_file_perms;
++')
++########################################
++## <summary>
++##	Allow read/writing amanda logs
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to allow
++##	</summary>
++## </param>
++#
++interface(`amanda_append_log_files',`
++	gen_require(`
++		type amanda_log_t;
++	')
++
++	allow $1 amanda_log_t:file ra_file_perms;
++')
++
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.15/policy/modules/admin/amanda.te
+--- nsaserefpolicy/policy/modules/admin/amanda.te	2006-02-03 15:45:54.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/admin/amanda.te	2006-02-15 10:29:35.000000000 -0500
+@@ -86,7 +86,7 @@
+ # Amanda local policy
+ #
+ 
+-allow amanda_t self:capability { chown dac_override setuid };
++allow amanda_t self:capability { chown dac_override setuid kill };
+ allow amanda_t self:process { setpgid signal };
+ allow amanda_t self:fifo_file { getattr read write ioctl lock };
+ allow amanda_t self:unix_stream_socket create_stream_socket_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.15/policy/modules/apps/java.fc
+--- nsaserefpolicy/policy/modules/apps/java.fc	2006-01-17 13:22:13.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/apps/java.fc	2006-02-15 11:11:42.000000000 -0500
+@@ -3,3 +3,4 @@
+ #
+ /usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
+ /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
++/usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.15/policy/modules/apps/java.if
+--- nsaserefpolicy/policy/modules/apps/java.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/apps/java.if	2006-02-15 11:14:35.000000000 -0500
+@@ -182,3 +182,27 @@
+ 	x_client_domain($1_javaplugin, $2) 
+ 	') dnl end TODO
+ ')
++
++########################################
++## <summary>
++##	Execute the java program in the java domain.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`java_domtrans',`
++	gen_require(`
++		type java_t, java_exec_t;
++	')
++
++	corecmd_search_bin($1)
++	domain_auto_trans($1, java_exec_t, java_t)
++
++	allow $1 java_t:fd use;
++	allow java_t $1:fd use;
++	allow java_t $1:fifo_file rw_file_perms;
++	allow java_t $1:process sigchld;
++')
+\ No newline at end of file
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.15/policy/modules/apps/java.te
+--- nsaserefpolicy/policy/modules/apps/java.te	2006-01-12 18:28:45.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/apps/java.te	2006-02-15 11:10:52.000000000 -0500
+@@ -8,3 +8,14 @@
+ 
+ type java_exec_t;
+ files_type(java_exec_t)
++
++########################################
++#
++# Local policy
++#
++
++ifdef(`targeted_policy',`
++	allow java_t self:process { execstack execmem };
++	unconfined_domain_noaudit(java_t)
++	role system_r types java_t;
++')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.2.15/policy/modules/apps/wine.if
+--- nsaserefpolicy/policy/modules/apps/wine.if	2006-02-10 21:34:12.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/apps/wine.if	2006-02-15 11:14:04.000000000 -0500
+@@ -23,3 +23,4 @@
+ 	allow wine_t $1:fifo_file rw_file_perms;
+ 	allow wine_t $1:process sigchld;
+ ')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.15/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/kernel/corenetwork.te.in	2006-02-15 10:14:55.000000000 -0500
+@@ -73,6 +73,7 @@
+ network_port(imaze, tcp,5323,s0, udp,5323,s0)
+ network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
+ network_port(innd, tcp,119,s0)
++network_port(router, udp,520,s0)
+ network_port(ipp, tcp,631,s0, udp,631,s0)
+ network_port(ircd, tcp,6667,s0)
+ network_port(isakmp, udp,500,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.15/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
 +++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 17:21:40.000000000 -0500
@@ -118,6 +251,29 @@
  
  ########################################
  #
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.15/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/automount.te	2006-02-15 11:18:22.000000000 -0500
+@@ -92,7 +92,7 @@
+ 
+ files_dontaudit_write_var_dirs(automount_t)
+ files_search_var_lib(automount_t)
+-files_search_mnt(automount_t)
++files_list_mnt(automount_t)
+ files_getattr_home_dir(automount_t)
+ files_read_etc_files(automount_t)
+ files_read_etc_runtime_files(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.15/policy/modules/services/avahi.te
+--- nsaserefpolicy/policy/modules/services/avahi.te	2006-02-03 08:55:53.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/avahi.te	2006-02-15 11:03:43.000000000 -0500
+@@ -63,6 +63,7 @@
+ domain_use_wide_inherit_fd(avahi_t)
+ 
+ files_read_etc_files(avahi_t)
++files_read_etc_runtime_files(avahi_t)
+ 
+ init_use_fd(avahi_t)
+ init_use_script_ptys(avahi_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.15/policy/modules/services/bluetooth.te
 --- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
 +++ serefpolicy-2.2.15/policy/modules/services/bluetooth.te	2006-02-14 16:49:49.000000000 -0500
@@ -224,16 +380,18 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.15/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-14 07:20:28.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-14 16:49:49.000000000 -0500
-@@ -78,6 +78,7 @@
++++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-15 10:11:01.000000000 -0500
+@@ -77,7 +77,9 @@
+ # DnsResolver.pm module which binds to
  # random ports >= 1024.
  corenet_udp_bind_generic_port(spamd_t)
++corenet_udp_bind_imaze_port(spamd_t)
  corenet_tcp_connect_razor_port(spamd_t)
 +sysnet_use_ldap(spamd_t)
  
  dev_read_sysfs(spamd_t)
  dev_read_urand(spamd_t)
-@@ -122,8 +123,11 @@
+@@ -122,8 +124,11 @@
  	term_dontaudit_use_unallocated_ttys(spamd_t)
  	term_dontaudit_use_generic_ptys(spamd_t)
  	files_dontaudit_read_root_files(spamd_t)
@@ -247,6 +405,29 @@
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.15/policy/modules/services/zebra.te
+--- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-14 07:20:29.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/services/zebra.te	2006-02-15 10:15:21.000000000 -0500
+@@ -73,6 +73,7 @@
+ corenet_tcp_bind_all_nodes(zebra_t)
+ corenet_udp_bind_all_nodes(zebra_t)
+ corenet_tcp_bind_zebra_port(zebra_t)
++corenet_udp_bind_router_port(zebra_t)
+ 
+ dev_associate_usbfs(zebra_var_run_t)
+ dev_list_all_dev_nodes(zebra_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.15/policy/modules/system/fstools.te
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-14 07:20:29.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/fstools.te	2006-02-15 11:18:56.000000000 -0500
+@@ -162,3 +162,8 @@
+ optional_policy(`nis',`
+ 	nis_use_ypbind(fsadm_t)
+ ')
++
++optional_policy(`amanda',`
++	amanda_rw_dumpdates_files(fsadm_t)
++	amanda_append_log_files(fsadm_t)
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.15/policy/modules/system/init.fc
 --- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
 +++ serefpolicy-2.2.15/policy/modules/system/init.fc	2006-02-14 16:49:49.000000000 -0500
@@ -455,6 +636,20 @@
  	')
  
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.15/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-14 07:20:31.000000000 -0500
++++ serefpolicy-2.2.15/policy/modules/system/unconfined.te	2006-02-15 11:15:14.000000000 -0500
+@@ -157,6 +157,10 @@
+ 		wine_domtrans(unconfined_t)
+ 	')
+ 
++	optional_policy(`java',`
++		java_domtrans(unconfined_t)
++	')
++
+ 	optional_policy(`xserver',`
+ 		xserver_domtrans_xdm_xserver(unconfined_t)
+ 	')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.15/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-14 07:20:31.000000000 -0500
 +++ serefpolicy-2.2.15/policy/modules/system/userdomain.te	2006-02-14 16:49:49.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- selinux-policy.spec	14 Feb 2006 22:48:01 -0000	1.109
+++ selinux-policy.spec	15 Feb 2006 16:19:41 -0000	1.110
@@ -6,7 +6,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.15
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -297,6 +297,11 @@
 
 %changelog
 
+* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-4
+- Add router port for zebra
+- Add imaze port for spamd
+- Fixes for amanda and java
+
 * Tue Feb 14 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-3
 - Fix bluetooth handling of usb devices
 - Fix spamd reading of ~/



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:20:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:20:42 -0500
Subject: rpms/kernel/devel linux-2.6-bcm43xx-git.patch,1.1.12.1,1.1.12.2
Message-ID: <200602151620.k1FGKgjL030538@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30493

Modified Files:
      Tag: private-linville-jwltest-fc5-10-branch
	linux-2.6-bcm43xx-git.patch 
Log Message:


linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |   17 
 drivers/net/wireless/Makefile                  |    1 
 drivers/net/wireless/bcm43xx/Makefile          |    9 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  934 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  175 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 ++
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  261 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4457 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2127 +++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  592 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |   88 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 ++
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 +++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   94 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1109 ++++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 net/ieee80211/ieee80211_rx.c                   |   74 
 28 files changed, 14653 insertions(+)

Index: linux-2.6-bcm43xx-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v
retrieving revision 1.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- linux-2.6-bcm43xx-git.patch	15 Feb 2006 16:03:02 -0000	1.1.12.1
+++ linux-2.6-bcm43xx-git.patch	15 Feb 2006 16:20:37 -0000	1.1.12.2
@@ -14636,15 +14636,11 @@
 +#endif /* BCM43xx_DEBUGFS_H_ */
 --- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig	2006-02-14 17:01:26.000000000 -0500
 +++ linux-2.6.15.noarch/drivers/net/wireless/Makefile	2006-02-14 17:02:17.000000000 -0500
-@@ -33,8 +33,11 @@ obj-$(CONFIG_PCI_ATMEL)         += atmel
- obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
- 
+@@ -35,6 +35,7 @@ obj-$(CONFIG_PCI_ATMEL)         += atmel
  obj-$(CONFIG_PRISM54)		+= prism54/
-+obj-$(CONFIG_PRISM54_USB)	+= prism54usb/
  
  obj-$(CONFIG_HOSTAP)		+= hostap/
 +obj-$(CONFIG_BCM43XX)		+= bcm43xx/
-+obj-$(CONFIG_ACX)		+= tiacx/
  
  # 16-bit wireless PCMCIA client drivers
  obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o



From fedora-cvs-commits at redhat.com  Wed Feb 15 16:26:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 11:26:01 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch,1.9,1.10
Message-ID: <200602151626.k1FGQ1pq000581@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv546

Modified Files:
	policy-20060207.patch 
Log Message:


policy-20060207.patch:
 Makefile                                  |    2 -
 Rules.modular                             |    2 -
 policy/global_tunables                    |    8 ++++
 policy/mcs                                |   13 ++++++-
 policy/modules/admin/amanda.if            |   37 ++++++++++++++++++++++
 policy/modules/admin/amanda.te            |    2 -
 policy/modules/apps/java.fc               |    1 
 policy/modules/apps/java.if               |   24 ++++++++++++++
 policy/modules/apps/java.te               |   14 ++++++++
 policy/modules/apps/wine.if               |    1 
 policy/modules/kernel/corenetwork.te.in   |    1 
 policy/modules/kernel/devices.if          |   19 +++++++++++
 policy/modules/kernel/mls.if              |   19 +++++++++++
 policy/modules/kernel/mls.te              |    1 
 policy/modules/services/automount.te      |    2 -
 policy/modules/services/avahi.te          |    1 
 policy/modules/services/bluetooth.te      |    1 
 policy/modules/services/hal.te            |    5 ++-
 policy/modules/services/mta.if            |    1 
 policy/modules/services/mta.te            |    3 +
 policy/modules/services/networkmanager.te |    2 -
 policy/modules/services/postfix.te        |    4 ++
 policy/modules/services/spamassassin.te   |    9 ++++-
 policy/modules/services/zebra.te          |    1 
 policy/modules/system/fstools.te          |    5 +++
 policy/modules/system/init.fc             |    3 +
 policy/modules/system/init.te             |    2 +
 policy/modules/system/libraries.fc        |    2 -
 policy/modules/system/libraries.if        |    1 
 policy/modules/system/selinuxutil.fc      |    3 +
 policy/modules/system/selinuxutil.if      |   42 ++++++++++++++++++++++++-
 policy/modules/system/selinuxutil.te      |   50 ++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.if       |    3 +
 policy/modules/system/unconfined.te       |    4 ++
 policy/modules/system/userdomain.te       |    7 ++++
 support/Makefile.devel                    |   12 ++++++-
 36 files changed, 291 insertions(+), 16 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- policy-20060207.patch	15 Feb 2006 16:19:41 -0000	1.9
+++ policy-20060207.patch	15 Feb 2006 16:25:59 -0000	1.10
@@ -153,9 +153,14 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.15/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2006-01-12 18:28:45.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/apps/java.te	2006-02-15 11:10:52.000000000 -0500
-@@ -8,3 +8,14 @@
++++ serefpolicy-2.2.15/policy/modules/apps/java.te	2006-02-15 11:22:56.000000000 -0500
+@@ -6,5 +6,19 @@
+ # Declarations
+ #
  
++type java_t;
++domain_type(java_t)
++
  type java_exec_t;
  files_type(java_exec_t)
 +



From fedora-cvs-commits at redhat.com  Wed Feb 15 17:01:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 12:01:09 -0500
Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec, 1.46,
	1.47 gst-plugins-0.8.8-execshield.patch, 1.1,
	NONE gst-plugins-0.8.8-gnomevfs.patch, 1.1,
	NONE gst-plugins-0.8.8-unknown_filetype_segv.patch, 1.1, NONE
Message-ID: <200602151701.k1FH195F025782@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv25742

Modified Files:
	gstreamer-plugins.spec 
Removed Files:
	gst-plugins-0.8.8-execshield.patch 
	gst-plugins-0.8.8-gnomevfs.patch 
	gst-plugins-0.8.8-unknown_filetype_segv.patch 
Log Message:
- Removed unknown_file_type patch
- Removed gnome-vfs patch
- Removed execshield patch




Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gstreamer-plugins.spec	14 Feb 2006 22:58:35 -0000	1.46
+++ gstreamer-plugins.spec	15 Feb 2006 17:00:48 -0000	1.47
@@ -17,9 +17,6 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch1: gstreamer-plugins-0.8.7-alsa.patch
-Patch2: gst-plugins-0.8.8-unknown_filetype_segv.patch
-Patch3: gst-plugins-0.8.8-gnomevfs.patch
-Patch4: gst-plugins-0.8.8-execshield.patch
 
 Requires: glib2 >= %_glib2
 Requires: gstreamer >= %{version}
@@ -89,9 +86,6 @@
 %prep
 %setup -q -n gst-plugins-%{version} -a 4
 %patch1 -p1 -b .alsa
-%patch2 -p1 -b .unknown_filetype_segv
-%patch3 -p1 -b .gnomevfs
-%patch4 -p0 -b .execshield
 
 mkdir gst-libs/ext/ffmpeg
 
@@ -317,8 +311,11 @@
 %{_libdir}/*so
 
 %changelog
-* Tue Feb 14 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-1
+* Tue Feb 15 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-1
 - Updated to upstream version
+- Removed unknown_file_type patch
+- Removed gnome-vfs patch
+- Removed execshield patch
 
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and


--- gst-plugins-0.8.8-execshield.patch DELETED ---


--- gst-plugins-0.8.8-gnomevfs.patch DELETED ---


--- gst-plugins-0.8.8-unknown_filetype_segv.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 17:18:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 12:18:38 -0500
Subject: rpms/kernel/devel linux-2.6-suspend-lvm.patch, NONE,
	1.1 kernel-2.6.spec, 1.1951, 1.1952
Message-ID: <200602151718.k1FHIcnK011515@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11380

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-suspend-lvm.patch 
Log Message:
fix suspend to lvm.


linux-2.6-suspend-lvm.patch:
 swsusp.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE linux-2.6-suspend-lvm.patch ---

>  Your recent commit "improve handling of swap partitions" actually
> broke the default setup we have in FC5, where the swap partition lives
> on an LVM setup.

Sorry for that.

I think I understand what's up now.  If I'm right, the appended (untested)
patch should fix this particular issue.

Greetings,
Rafael


 kernel/power/swsusp.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

Index: linux-2.6.16-rc3/kernel/power/swsusp.c
===================================================================
--- linux-2.6.16-rc3.orig/kernel/power/swsusp.c
+++ linux-2.6.16-rc3/kernel/power/swsusp.c
@@ -153,13 +153,11 @@ static int swsusp_swap_check(void) /* Th
 {
 	int i;
 
-	if (!swsusp_resume_device)
-		return -ENODEV;
 	spin_lock(&swap_lock);
 	for (i = 0; i < MAX_SWAPFILES; i++) {
 		if (!(swap_info[i].flags & SWP_WRITEOK))
 			continue;
-		if (is_resume_device(swap_info + i)) {
+		if (!swsusp_resume_device || is_resume_device(swap_info + i)) {
 			spin_unlock(&swap_lock);
 			root_swap = i;
 			return 0;



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1951
retrieving revision 1.1952
diff -u -r1.1951 -r1.1952
--- kernel-2.6.spec	15 Feb 2006 16:18:58 -0000	1.1951
+++ kernel-2.6.spec	15 Feb 2006 17:18:36 -0000	1.1952
@@ -370,6 +370,7 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
+Patch1860: linux-2.6-suspend-lvm.patch
 Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -944,6 +945,8 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
+# Fix suspend on lvm
+%patch1860 -p1
 # Only print migration info on SMP
 %patch1890 -p1
 
@@ -1579,6 +1582,7 @@
 %changelog
 * Wed Feb 15 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git4
+- Hopefully fix suspend to swap-on-LVM
 
 * Tue Feb 14 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git2 & -git3



From fedora-cvs-commits at redhat.com  Wed Feb 15 17:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 12:44:56 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1952,
	1.1953 linux-2.6-execshield-fixes.patch, 1.4,
	1.5 linux-2.6-x86_64-generic-sigsuspend.patch, 1.1,
	NONE linux-2.6-x86_64-tif-restore-sigmask.patch, 1.1,
	NONE linux-2.6-xen-additional.patch, 1.1, NONE
Message-ID: <200602151744.k1FHiurM009381@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9336

Modified Files:
	kernel-2.6.spec linux-2.6-execshield-fixes.patch 
Removed Files:
	linux-2.6-x86_64-generic-sigsuspend.patch 
	linux-2.6-x86_64-tif-restore-sigmask.patch 
	linux-2.6-xen-additional.patch 
Log Message:
remove old patches




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -r1.1952 -r1.1953
--- kernel-2.6.spec	15 Feb 2006 17:18:36 -0000	1.1952
+++ kernel-2.6.spec	15 Feb 2006 17:44:53 -0000	1.1953
@@ -229,12 +229,9 @@
 Patch203: linux-2.6-intel-cache-build.patch
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
-Patch206: linux-2.6-x86_64-tif-restore-sigmask.patch
-Patch207: linux-2.6-x86_64-generic-sigsuspend.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6.15-cell-numa-init.patch
-#Patch304: linux-2.6.15-mv643xx-fixes.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
@@ -723,18 +720,12 @@
 %patch204 -p1
 # Reboot thru bios on HP laptops.
 %patch205 -p1
-# Implement TIF_RESTORE_SIGMASK
-#%patch206 -p1
-# Generic sys_rt_sigsuspend()
-#%patch207 -p1
 
 # 
 # ppc64
 #
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
-# Fix the MV643xx Gigabit Ethernet driver
-#%patch304 -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.

linux-2.6-execshield-fixes.patch:
 linux-2.6.15.i686/include/asm-i386/desc.h         |    2 +-
 linux-exec-shield-curr.q/arch/i386/kernel/traps.c |    2 +-
 linux-exec-shield-curr.q/fs/proc/base.c           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-execshield-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-execshield-fixes.patch	13 Feb 2006 21:17:47 -0000	1.4
+++ linux-2.6-execshield-fixes.patch	15 Feb 2006 17:44:53 -0000	1.5
@@ -1,5 +1,5 @@
+
  arch/i386/kernel/traps.c       |    2 +-
- arch/x86_64/ia32/ia32_binfmt.c |    2 +-
  fs/proc/base.c                 |    2 +-
  include/asm-i386/desc.h        |    2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)


--- linux-2.6-x86_64-generic-sigsuspend.patch DELETED ---


--- linux-2.6-x86_64-tif-restore-sigmask.patch DELETED ---


--- linux-2.6-xen-additional.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 18:00:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 13:00:57 -0500
Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.5,1.6
Message-ID: <200602151800.k1FI0iUm032261@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-Telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32223

Modified Files:
	perl-Net-Telnet.spec 
Log Message:
fix bug 180591: correct URL: tag


Index: perl-Net-Telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-Telnet.spec	3 Feb 2006 20:13:59 -0000	1.5
+++ perl-Net-Telnet.spec	15 Feb 2006 18:00:24 -0000	1.6
@@ -5,7 +5,7 @@
 
 Group: 	 	Development/Libraries
 License: 	distributable
-URL: 		http://www.cpan.org/~jrogers/Net-Telnet-3.03/lib/Net/Telnet.pm
+URL: 		http://search.cpan.org/dist/Net-Telnet/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: 	noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Feb 15 2006 Jason Vas Dias <jvdias at redhat.com> - 3.03-4.3
+- fix bug 180591: correct URL: tag
+
 * Fri Feb 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3.03-4.2
 - rebuild for new perl-5.8.8
 - modify .spec file to conform to Fedora spectemplate-perl.spec



From fedora-cvs-commits at redhat.com  Wed Feb 15 18:03:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 13:03:40 -0500
Subject: rpms/perl-Net-Telnet/devel perl-Net-Telnet.spec,1.6,1.7
Message-ID: <200602151803.k1FI3e8w032439@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-Net-Telnet/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32424

Modified Files:
	perl-Net-Telnet.spec 
Log Message:
fix bug 180591: correct URL: tag


Index: perl-Net-Telnet.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-Net-Telnet/devel/perl-Net-Telnet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-Telnet.spec	15 Feb 2006 18:00:24 -0000	1.6
+++ perl-Net-Telnet.spec	15 Feb 2006 18:03:23 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Net-Telnet
 Version: 	3.03
-Release: 	4.2
+Release: 	4.3
 Summary: 	Net-Telnet Perl module
 
 Group: 	 	Development/Libraries



From fedora-cvs-commits at redhat.com  Wed Feb 15 18:13:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 13:13:05 -0500
Subject: rpms/kdebase/devel .cvsignore, 1.46, 1.47 kdebase-3.5.1-redhat.patch,
	1.1, 1.2 kdebase.spec, 1.151, 1.152 sources, 1.65, 1.66
Message-ID: <200602151813.k1FID5eM003111@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3014

Modified Files:
	.cvsignore kdebase-3.5.1-redhat.patch kdebase.spec sources 
Log Message:
apply patch to launch kde scripts in shutdown,env directories #178326



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	1 Feb 2006 13:36:56 -0000	1.46
+++ .cvsignore	15 Feb 2006 18:13:01 -0000	1.47
@@ -20,3 +20,4 @@
 kdebase-3.5.0.tar.bz2
 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.1-redhat.patch:
 kdebase-3.4.91/kde.pamd |   16 +++++++----
 kdebase-3.5.1/startkde  |   68 +++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 69 insertions(+), 15 deletions(-)

Index: kdebase-3.5.1-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase-3.5.1-redhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.1-redhat.patch	1 Feb 2006 13:36:56 -0000	1.1
+++ kdebase-3.5.1-redhat.patch	15 Feb 2006 18:13:01 -0000	1.2
@@ -18,8 +18,8 @@
 +session    optional	pam_timestamp.so
 +session    optional    pam_selinux.so
 +session    optional	pam_console.so
---- kdebase-3.4.91/startkde.redhat	2005-09-10 15:03:40.000000000 +0200
-+++ kdebase-3.4.91/startkde	2005-09-29 16:16:19.000000000 +0200
+--- 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
  #
@@ -101,3 +101,39 @@
  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' | grep -v "^$(kde-config --prefix)"`
++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/devel/kdebase.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- kdebase.spec	14 Feb 2006 16:05:03 -0000	1.151
+++ kdebase.spec	15 Feb 2006 18:13:01 -0000	1.152
@@ -31,7 +31,7 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.1.tar.bz2
+Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
 Source5: kde-np
 Source7: mailsettings.cc
 
@@ -419,8 +419,10 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
-* Tue Feb 14 2006 Than Ngo <than at redhat.com> 6:3.5.1-3
-- kscreensaver/kdm/kcheckpass use a separate PAM config file
+* Wed Feb 15 2006 Than Ngo <than at redhat.com> 6:3.5.1-3
+- kscreensaver/kdm/kcheckpass use a separate PAM config file #66902
+- cleanup kdm config file #166388 
+- apply patch to launch kde scripts in shutdown,env directories #178326
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.2
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/sources,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sources	1 Feb 2006 13:36:56 -0000	1.65
+++ sources	15 Feb 2006 18:13:01 -0000	1.66
@@ -1,2 +1,2 @@
-d351ffd0919753c89302401a862bf501  kde-redhat-config-3.5-fc5-0.1.tar.bz2
 484c7b3895ce4f95173f4789571eb1cc  kdebase-3.5.1.tar.bz2
+a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:17:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:17:39 -0500
Subject: rpms/rhpl/devel .cvsignore, 1.55, 1.56 rhpl.spec, 1.67, 1.68 sources,
	1.60, 1.61
Message-ID: <200602151917.k1FJHdHi031280@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31213

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	9 Feb 2006 20:37:18 -0000	1.55
+++ .cvsignore	15 Feb 2006 19:17:36 -0000	1.56
@@ -3,3 +3,4 @@
 rhpl-0.179.tar.gz
 rhpl-0.180.tar.gz
 rhpl-0.181.tar.gz
+rhpl-0.182.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- rhpl.spec	11 Feb 2006 05:34:06 -0000	1.67
+++ rhpl.spec	15 Feb 2006 19:17:36 -0000	1.68
@@ -1,7 +1,7 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.181
-Release: 2.1
+Version: 0.182
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Libraries
@@ -39,11 +39,8 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.181-2.1
-- bump again for double-long bug on ppc(64)
-
-* Thu Feb  9 2006 Jeremy Katz <katzj at redhat.com> - 0.181-2
-- rebuild
+* Wed Feb 15 2006 David Cantrell <dcantrell at redhat.com> - 0.182-1
+- setxkbmap corrections for loading X keymaps (#179845)
 
 * Thu Dec 22 2005 Jeremy Katz <katzj at redhat.com> - 0.181-1
 - Clean up spacing and use current widgets for exception dialog


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	9 Feb 2006 20:37:18 -0000	1.60
+++ sources	15 Feb 2006 19:17:36 -0000	1.61
@@ -1,2 +1 @@
-4a82709c3a0343e45035643d54d18c49  rhpl-0.180.tar.gz
-fd72a66dcbe5aebbab7dfc0f027b9f0c  rhpl-0.181.tar.gz
+80d2de9f42bb24007bfe1b9e537b4dbf  rhpl-0.182.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:21:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:21:19 -0500
Subject: rpms/kdebase/devel kdebase-3.x-shortcuts.patch, NONE,
	1.1 logrotate-kdm, NONE, 1.1 kdebase.spec, 1.152,
	1.153 kdebase-3.0-shortcuts.patch, 1.1, NONE
Message-ID: <200602151921.k1FJLJgP000531@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv477

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.x-shortcuts.patch logrotate-kdm 
Removed Files:
	kdebase-3.0-shortcuts.patch 
Log Message:
- kdm.log logrotate-enabled #178328
- add konqueror webshortcuts for fedora project #178366


kdebase-3.x-shortcuts.patch:
 Makefile.am      |    2 ++
 bugzilla.desktop |    6 ++++++
 fedora.desktop   |    8 ++++++++
 3 files changed, 16 insertions(+)

--- NEW FILE kdebase-3.x-shortcuts.patch ---
--- /dev/null	2006-02-15 14:04:20.595741250 +0100
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugzilla.desktop	2006-02-01 15:04:12.000000000 +0100
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Service
+Name=Red Hat bug tracking system
+ServiceTypes=SearchProvider
+Keys=rhbug,bz
+Query=http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=\\1
--- kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/fedora.desktop.shortcuts	2006-02-15 19:44:30.000000000 +0100
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/fedora.desktop	2006-02-15 19:44:16.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Hidden=false
+Keys=fp,fedora
+Name=fedoraproject
+Query=http://fedoraproject.org/wiki/?action=fullsearch&context=180&value=\\{@}&titlesearch=Titles
+ServiceTypes=SearchProvider
+Type=Service
+
--- kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.am.shortcuts	2005-10-10 17:03:45.000000000 +0200
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.am	2006-02-15 19:41:59.000000000 +0100
@@ -11,6 +11,7 @@
 		backports.desktop \
 		bugft.desktop \
 		bugno.desktop \
+		bugzilla.desktop \
 		call.desktop \
 		cia.desktop \
 		citeseer.desktop \
@@ -32,6 +33,7 @@
 		excite.desktop \
 		feedster.desktop \
 		foldoc.desktop \
+		fedora.desktop \
 		fr2de.desktop \
 		fr2en.desktop \
 		freedb.desktop \


--- NEW FILE logrotate-kdm ---
/var/log/kdm.log {
    weekly
    notifempty
    missingok
}


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdebase.spec	15 Feb 2006 18:13:01 -0000	1.152
+++ kdebase.spec	15 Feb 2006 19:21:16 -0000	1.153
@@ -33,12 +33,13 @@
 Source3: kde.desktop
 Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
 Source5: kde-np
+Source6: logrotate-kdm
 Source7: mailsettings.cc
 
 Patch0: kde-libtool.patch
 Patch1: kdebase-3.5.1-redhat.patch
 Patch2: kdebase-3.3.92-vroot.patch
-Patch3: kdebase-3.0-shortcuts.patch
+Patch3: kdebase-3.x-shortcuts.patch
 Patch4: kdebase-3.2.0-keymap.patch
 Patch5: kdebase-3.1-startpage.patch
 Patch6: kdebase-3.1.3-konsole-double-esc.patch
@@ -248,8 +249,6 @@
 # Nuke man2html - we get it from man
 find $RPM_BUILD_ROOT -name "man2html*" | xargs rm -rf
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-
 # install gdm session support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/
@@ -262,6 +261,10 @@
 find etc/skel/.kde -type d | xargs chmod 0755
 popd
 
+# install logrotate script
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/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
@@ -367,6 +370,7 @@
 %dir /etc/skel/.kde
 /etc/skel/.kde/*
 /etc/xdg/menus/*
+%config /etc/logrotate.d/kdm
 %config %{_datadir}/xsessions/*
 %config /etc/kderc
 %config /etc/X11/xdm/kdmrc
@@ -423,6 +427,8 @@
 - kscreensaver/kdm/kcheckpass use a separate PAM config file #66902
 - cleanup kdm config file #166388 
 - apply patch to launch kde scripts in shutdown,env directories #178326
+- kdm.log logrotate-enabled #178328
+- add konqueror webshortcuts for fedora project #178366
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.2
 - bump again for double-long bug on ppc(64)


--- kdebase-3.0-shortcuts.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:23:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:23:13 -0500
Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.27,
	1.28 selinux-policy-targeted.spec, 1.360, 1.361
Message-ID: <200602151923.k1FJNDgk001503@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1461

Modified Files:
	policy-20050916.patch selinux-policy-targeted.spec 
Log Message:
* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.25
- Zebra wants to listen on router_port_t
- auditctl wants to read proc


policy-20050916.patch:
 Makefile                                 |   26 +-
 attrib.te                                |  100 +++++++++-
 domains/admin.te                         |    2 
 domains/misc/kernel.te                   |    2 
 domains/program/crond.te                 |    2 
 domains/program/fsadm.te                 |    9 
 domains/program/getty.te                 |    2 
 domains/program/hostname.te              |    2 
 domains/program/ifconfig.te              |   10 -
 domains/program/init.te                  |    2 
 domains/program/initrc.te                |   26 ++
 domains/program/ldconfig.te              |    3 
 domains/program/load_policy.te           |   11 -
 domains/program/login.te                 |   23 +-
 domains/program/logrotate.te             |    2 
 domains/program/modutil.te               |   27 +-
 domains/program/mount.te                 |    6 
 domains/program/netutils.te              |    3 
 domains/program/newrole.te               |    4 
 domains/program/passwd.te                |    2 
 domains/program/restorecon.te            |    6 
 domains/program/setfiles.te              |    4 
 domains/program/ssh.te                   |    6 
 domains/program/su.te                    |   12 +
 domains/program/syslogd.te               |    7 
 domains/program/tmpreaper.te             |    2 
 domains/program/unused/NetworkManager.te |   13 +
 domains/program/unused/alsa.te           |    2 
 domains/program/unused/amanda.te         |   74 +------
 domains/program/unused/anaconda.te       |    5 
 domains/program/unused/apache.te         |   27 +-
 domains/program/unused/apmd.te           |   25 ++
 domains/program/unused/auditd.te         |   14 +
 domains/program/unused/automount.te      |    4 
 domains/program/unused/avahi.te          |   31 +++
 domains/program/unused/bluetooth.te      |   72 +++++++
 domains/program/unused/cups.te           |   24 +-
 domains/program/unused/cvs.te            |    2 
 domains/program/unused/cyrus.te          |   10 -
 domains/program/unused/dbusd.te          |    4 
 domains/program/unused/dcc.te            |    5 
 domains/program/unused/dhcpc.te          |    6 
 domains/program/unused/dhcpd.te          |    4 
 domains/program/unused/dovecot.te        |    6 
 domains/program/unused/exim.te           |  309 +++++++++++++++++++++++++++++++
 domains/program/unused/ftpd.te           |    6 
 domains/program/unused/hald.te           |    5 
 domains/program/unused/hotplug.te        |   10 -
 domains/program/unused/hwclock.te        |    1 
 domains/program/unused/ipsec.te          |    2 
 domains/program/unused/kudzu.te          |    5 
 domains/program/unused/mta.te            |    7 
 domains/program/unused/mysqld.te         |   10 -
 domains/program/unused/named.te          |   27 ++
 domains/program/unused/nscd.te           |    1 
 domains/program/unused/ntpd.te           |   10 -
 domains/program/unused/openct.te         |   16 +
 domains/program/unused/pamconsole.te     |    4 
 domains/program/unused/pegasus.te        |   36 +++
 domains/program/unused/ping.te           |    2 
 domains/program/unused/postfix.te        |   65 ++++--
 domains/program/unused/postgresql.te     |   11 -
 domains/program/unused/pppd.te           |   23 +-
 domains/program/unused/privoxy.te        |    2 
 domains/program/unused/procmail.te       |   16 +
 domains/program/unused/radius.te         |    3 
 domains/program/unused/readahead.te      |   21 ++
 domains/program/unused/rlogind.te        |    4 
 domains/program/unused/roundup.te        |   29 ++
 domains/program/unused/rpcd.te           |   18 +
 domains/program/unused/rpm.te            |    4 
 domains/program/unused/rsync.te          |    3 
 domains/program/unused/samba.te          |   15 +
 domains/program/unused/saslauthd.te      |    1 
 domains/program/unused/sendmail.te       |    3 
 domains/program/unused/slapd.te          |   28 ++
 domains/program/unused/snmpd.te          |    6 
 domains/program/unused/spamd.te          |   28 --
 domains/program/unused/squid.te          |    4 
 domains/program/unused/udev.te           |   10 -
 domains/program/unused/utempter.te       |    2 
 domains/program/unused/webalizer.te      |    3 
 domains/program/unused/winbind.te        |    1 
 domains/program/unused/xdm.te            |    3 
 domains/program/unused/yppasswdd.te      |   40 ++++
 domains/program/unused/ypserv.te         |    9 
 domains/program/unused/zebra.te          |    6 
 domains/program/useradd.te               |    5 
 file_contexts/distros.fc                 |    2 
 file_contexts/program/apache.fc          |    3 
 file_contexts/program/bluetooth.fc       |    3 
 file_contexts/program/compat.fc          |    4 
 file_contexts/program/dhcpc.fc           |    2 
 file_contexts/program/dhcpd.fc           |    5 
 file_contexts/program/ftpd.fc            |    5 
 file_contexts/program/games.fc           |   11 -
 file_contexts/program/innd.fc            |   15 -
 file_contexts/program/ipsec.fc           |    1 
 file_contexts/program/openct.fc          |    2 
 file_contexts/program/pegasus.fc         |    9 
 file_contexts/program/pppd.fc            |    2 
 file_contexts/program/privoxy.fc         |    1 
 file_contexts/program/readahead.fc       |    1 
 file_contexts/program/roundup.fc         |    2 
 file_contexts/program/rpm.fc             |    4 
 file_contexts/program/rshd.fc            |    1 
 file_contexts/program/rsync.fc           |    2 
 file_contexts/program/slapd.fc           |   12 +
 file_contexts/program/squid.fc           |    3 
 file_contexts/program/xdm.fc             |    2 
 file_contexts/program/yppasswdd.fc       |    2 
 file_contexts/program/ypserv.fc          |    1 
 file_contexts/types.fc                   |    6 
 genfs_contexts                           |    3 
 macros/base_user_macros.te               |    7 
 macros/core_macros.te                    |    9 
 macros/global_macros.te                  |   35 ++-
 macros/home_macros.te                    |    9 
 macros/network_macros.te                 |   19 +
 macros/program/apache_macros.te          |   13 +
 macros/program/bonobo_macros.te          |    2 
 macros/program/cdrecord_macros.te        |    6 
 macros/program/chkpwd_macros.te          |    8 
 macros/program/crontab_macros.te         |    2 
 macros/program/dbusd_macros.te           |    7 
 macros/program/gconf_macros.te           |    2 
 macros/program/gift_macros.te            |    2 
 macros/program/gpg_macros.te             |    2 
 macros/program/i18n_input_macros.te      |   21 ++
 macros/program/lpr_macros.te             |    2 
 macros/program/mta_macros.te             |    4 
 macros/program/newrole_macros.te         |    2 
 macros/program/pyzor_macros.te           |    2 
 macros/program/razor_macros.te           |    2 
 macros/program/su_macros.te              |    4 
 macros/program/uml_macros.te             |    2 
 macros/program/xdm_macros.te             |    2 
 macros/program/ypbind_macros.te          |    1 
 macros/user_macros.te                    |    7 
 man/man8/ftpd_selinux.8                  |   19 +
 man/man8/httpd_selinux.8                 |    9 
 man/man8/rsync_selinux.8                 |   12 -
 man/man8/samba_selinux.8                 |    9 
 mcs                                      |  210 ++++++++-------------
 mls                                      |  270 ++++++++++-----------------
 net_contexts                             |   15 +
 targeted/appconfig/root_default_contexts |    4 
 targeted/assert.te                       |    2 
 targeted/domains/program/compat.te       |    1 
 targeted/domains/program/sendmail.te     |    1 
 targeted/domains/program/ssh.te          |    3 
 targeted/domains/program/xdm.te          |    4 
 targeted/domains/unconfined.te           |   15 +
 tunables/distro.tun                      |    2 
 tunables/tunable.tun                     |    4 
 types/device.te                          |    4 
 types/devpts.te                          |    4 
 types/file.te                            |   48 +---
 types/network.te                         |   15 -
 types/nfs.te                             |    1 
 types/security.te                        |    6 
 161 files changed, 1687 insertions(+), 690 deletions(-)

Index: policy-20050916.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policy-20050916.patch	15 Feb 2006 15:21:35 -0000	1.27
+++ policy-20050916.patch	15 Feb 2006 19:23:10 -0000	1.28
@@ -1087,7 +1087,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.27.1/domains/program/unused/auditd.te
 --- nsapolicy/domains/program/unused/auditd.te	2005-09-16 11:17:27.000000000 -0400
-+++ policy-1.27.1/domains/program/unused/auditd.te	2006-02-02 13:55:10.000000000 -0500
++++ policy-1.27.1/domains/program/unused/auditd.te	2006-02-15 14:11:11.000000000 -0500
 @@ -12,6 +12,12 @@
  
  daemon_domain(auditd)
@@ -1101,7 +1101,16 @@
  allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
  allow auditd_t self:unix_dgram_socket create_socket_perms;
  allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource };
-@@ -58,10 +64,16 @@
+@@ -36,6 +42,8 @@
+ uses_shlib(auditctl_t)
+ allow auditctl_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv };
+ allow auditctl_t self:capability { audit_write audit_control };
++r_dir_file(auditctl_t, self)
++
+ allow auditctl_t etc_t:file { getattr read };
+ allow auditctl_t admin_tty_type:chr_file rw_file_perms;
+ 
+@@ -58,10 +66,16 @@
  
  dontaudit auditctl_t local_login_t:fd use;
  allow auditctl_t proc_t:dir search;


Index: selinux-policy-targeted.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- selinux-policy-targeted.spec	15 Feb 2006 15:21:35 -0000	1.360
+++ selinux-policy-targeted.spec	15 Feb 2006 19:23:10 -0000	1.361
@@ -9,7 +9,7 @@
 Summary: SELinux %{type} policy configuration
 Name: selinux-policy-%{type}
 Version: 1.27.1
-Release: 2.24
+Release: 2.25
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz
@@ -234,8 +234,9 @@
 exit 0
 
 %changelog
-* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.24
+* Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.25
 - Zebra wants to listen on router_port_t
+- auditctl wants to read proc
 
 * Fri Feb 10 2006 Dan Walsh <dwalsh at redhat.com> 1.27.1-2.23
 - Now zebra wants to listen on bgp



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:26:50 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.53.8.1 config-ia64-generic, 1.6, 1.6.20.1 config-x86-generic,
	1.19, 1.19.8.1 config-x86_64-generic, 1.17, 1.17.2.1
Message-ID: <200602151926.k1FJQoW6003284@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv3227/configs

Modified Files:
      Tag: private-linville-jwltest-fc4-31-branch
	config-generic config-ia64-generic config-x86-generic 
	config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.53.8.1
diff -u -r1.53 -r1.53.8.1
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	15 Feb 2006 19:26:47 -0000	1.53.8.1
@@ -1035,6 +1035,8 @@
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
+CONFIG_SKY2=m
+CONFIG_SKY2_EC_A1=y
 CONFIG_R8169=m
 CONFIG_R8169_NAPI=y
 CONFIG_R8169_VLAN=y


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v
retrieving revision 1.6
retrieving revision 1.6.20.1
diff -u -r1.6 -r1.6.20.1
--- config-ia64-generic	6 Dec 2005 23:12:21 -0000	1.6
+++ config-ia64-generic	15 Feb 2006 19:26:47 -0000	1.6.20.1
@@ -124,6 +124,7 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_INITRD=y
 CONFIG_SERIAL_SGI_L1_CONSOLE=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.19.8.1
diff -u -r1.19 -r1.19.8.1
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	15 Feb 2006 19:26:47 -0000	1.19.8.1
@@ -150,6 +150,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 CONFIG_PNPACPI=y
 
 #


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- config-x86_64-generic	10 Feb 2006 02:02:47 -0000	1.17
+++ config-x86_64-generic	15 Feb 2006 19:26:47 -0000	1.17.2.1
@@ -79,6 +79,7 @@
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_IBM=m
+CONFIG_ACPI_INITRD=y
 
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_FAKE is not set



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:26:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:26:50 -0500
Subject: rpms/kernel/FC-4 jwltest-acpi-dsdt-initrd.patch, NONE,
	1.1.50.1 jwltest-ipw2200-hwcrypto-off.patch, NONE,
	1.1.2.1 jwltest-mii-force_media.patch, NONE,
	1.1.6.1 jwltest-rhine-mdelay-undo.patch, NONE,
	1.1.4.1 jwltest-sky2.patch, NONE,
	1.1.18.1 jwltest-tulip-last_irq.patch, NONE,
	1.1.8.1 jwltest-via-velocity-tx_csum.patch, NONE,
	1.1.16.1 kernel-2.6.spec, 1.1599, 1.1599.2.1
Message-ID: <200602151926.k1FJQoDW003270@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3227

Modified Files:
      Tag: private-linville-jwltest-fc4-31-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc4-31-branch
	jwltest-acpi-dsdt-initrd.patch 
	jwltest-ipw2200-hwcrypto-off.patch 
	jwltest-mii-force_media.patch jwltest-rhine-mdelay-undo.patch 
	jwltest-sky2.patch jwltest-tulip-last_irq.patch 
	jwltest-via-velocity-tx_csum.patch 
Log Message:


jwltest-acpi-dsdt-initrd.patch:
 drivers/acpi/Kconfig        |   13 +++++
 drivers/acpi/osl.c          |  104 +++++++++++++++++++++++++++++++++++++++-----
 drivers/acpi/tables/tbget.c |    5 ++
 init/main.c                 |   16 +++---
 4 files changed, 120 insertions(+), 18 deletions(-)

--- NEW FILE jwltest-acpi-dsdt-initrd.patch ---
--- linux-2.6.14/drivers/acpi/Kconfig.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/drivers/acpi/Kconfig	2005-11-07 15:45:27.000000000 -0500
@@ -341,4 +341,17 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 endif	# ACPI
 
+config ACPI_INITRD
+	bool "Read DSDT from initrd or initramfs"
+	depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT
+	default n
+	help
+	  The DSDT (Differentiated System Description Table) often needs to be
+	  overridden because of broken BIOS implementations. If you want to use
+	  a customized DSDT, please use the mkinitrd tool (mkinitrd package) to 
+	  attach the DSDT to the initrd or initramfs 
+	  (see http://gaugusch.at/kernel.shtml for details)
+	  If there is no DSDT found in the initrd, the DSDT from the BIOS is
+	  used. It is save to say yes here.
+
 endmenu
--- linux-2.6.14/drivers/acpi/osl.c.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/drivers/acpi/osl.c	2005-11-07 15:45:27.000000000 -0500
@@ -44,6 +44,10 @@
 #include <asm/uaccess.h>
 
 #include <linux/efi.h>
+#ifdef CONFIG_ACPI_INITRD
+#include<linux/syscalls.h>
+#include <linux/initrd.h>
+#endif
 
 #define _COMPONENT		ACPI_OS_SERVICES
 ACPI_MODULE_NAME("osl")
@@ -244,24 +248,104 @@ acpi_os_predefined_override(const struct
 	return AE_OK;
 }
 
+#ifdef CONFIG_ACPI_INITRD
+static char *
+acpi_find_dsdt_initrd(void)
+{
+	static const char signature[] = "INITRDDSDT123DSDT123";
+	char *dsdt_start = NULL;
+	char *dsdt_buffer = NULL;
+	unsigned long len = 0, len2 = 0;
+	int fd;
+	char ramfs_dsdt_name[10] = "/DSDT.aml";
+	struct kstat stat;
+
+	/* try to get dsdt from tail of initrd */
+	if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) {
+		if (initrd_start) {
+			char *data = (char *)initrd_start;
+
+			printk(KERN_INFO PREFIX "Looking for DSDT in initrd...");
+
+			/* Search for the start signature */
+			while (data < (char *)initrd_end - sizeof(signature) - 4) {
+				if (!memcmp(data, signature, sizeof(signature))) {
+					data += sizeof(signature);
+					if (!memcmp(data, "DSDT", 4))
+						dsdt_start = data;
+					break;
+				}
+				data++;
+			}
+
+			if (dsdt_start){
+				printk(PREFIX " found at offset %zu",
+				       dsdt_start - (char *)initrd_start);
+				len = (char*) initrd_end - dsdt_start;
+				printk(", size: %zu bytes\n", len);
+				dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1);
+				memcpy(dsdt_buffer, dsdt_start, len);
+				*(dsdt_buffer + len + 1)= '\0';
+			}					
+			else
+				printk(" not found!\n");
+		}
+	}
+	/* get dsdt from initramfs */
+	else{
+		printk(KERN_INFO PREFIX "Looking for DSDT in initramfs...");
+		if (vfs_stat(ramfs_dsdt_name, &stat) < 0){
+			printk ("error getting stats for file %s\n", ramfs_dsdt_name);
+			return NULL;
+		}
+		
+		len = stat.size;
+		dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1);
+		if (!dsdt_buffer) {
+			printk("Could not allocate %lu bytes of memory\n", len);
+			return NULL;
+		}
+		printk (" found %s ...", ramfs_dsdt_name);
+		
+		len2 = sys_read (fd, (char __user *) dsdt_buffer, len);
+		if (len2 < len ){
+			printk(PREFIX "\nError trying to read %lu bytes from %s\n", 
+			       len, ramfs_dsdt_name);
+			ACPI_MEM_FREE (dsdt_buffer);
+			dsdt_buffer = NULL;
+		}
+		else{
+			printk(" successfully read %lu bytes from %s\n", 
+			       len, ramfs_dsdt_name);
+			*(dsdt_buffer + len + 1) = '\0';
+		}
+	}
+	if (!dsdt_buffer)
+	    printk(" not found!\n");
+	return dsdt_buffer;
+}
+#endif
+	
 acpi_status
-acpi_os_table_override(struct acpi_table_header * existing_table,
-		       struct acpi_table_header ** new_table)
+acpi_os_table_override (struct acpi_table_header *existing_table,
+			struct acpi_table_header **new_table)
 {
 	if (!existing_table || !new_table)
 		return AE_BAD_PARAMETER;
-
-#ifdef CONFIG_ACPI_CUSTOM_DSDT
-	if (strncmp(existing_table->signature, "DSDT", 4) == 0)
-		*new_table = (struct acpi_table_header *)AmlCode;
-	else
-		*new_table = NULL;
-#else
+		
 	*new_table = NULL;
+	if (strncmp(existing_table->signature, "DSDT", 4) == 0) {
+#ifdef CONFIG_ACPI_CUSTOM_DSDT
+		*new_table = (struct acpi_table_header*)AmlCode;
+#elif defined(CONFIG_ACPI_INITRD)
+		*new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd();
 #endif
+		if (*new_table)
+			printk(KERN_INFO PREFIX "Using customized DSDT\n");
+	}
 	return AE_OK;
 }
-
+ 
 static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
 	return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE;
--- linux-2.6.14/drivers/acpi/tables/tbget.c.orig	2005-11-07 15:46:15.000000000 -0500
+++ linux-2.6.14/drivers/acpi/tables/tbget.c	2005-11-07 15:46:08.000000000 -0500
@@ -283,6 +283,11 @@ acpi_tb_table_override(struct acpi_table
 	ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n",
 			  table_info->pointer->signature));
 
+#ifdef CONFIG_ACPI_INITRD
+	if (new_table)
+	    ACPI_MEM_FREE(new_table);
+#endif
+
 	return_ACPI_STATUS(AE_OK);
 }
 
--- linux-2.6.14/init/main.c.orig	2005-11-07 15:45:19.000000000 -0500
+++ linux-2.6.14/init/main.c	2005-11-07 15:45:27.000000000 -0500
@@ -540,8 +540,6 @@ asmlinkage void __init start_kernel(void
 
 	check_bugs();
 
-	acpi_early_init(); /* before LAPIC and SMP init */
-
 	/* Do the rest non-__init'ed, we're now alive */
 	rest_init();
 }
@@ -671,6 +669,14 @@ static int init(void * unused)
 	 */
 	child_reaper = current;
 
+	/*
+	 * Do this before initcalls, because some drivers want to access
+	 * firmware files.
+	 */
+	populate_rootfs();
+
+	acpi_early_init(); /* before LAPIC and SMP init */
+
 	/* Sets up cpus_possible() */
 	smp_prepare_cpus(max_cpus);
 
@@ -682,12 +688,6 @@ static int init(void * unused)
 
 	cpuset_init_smp();
 
-	/*
-	 * Do this before initcalls, because some drivers want to access
-	 * firmware files.
-	 */
-	populate_rootfs();
-
 	do_basic_setup();
 
 	/*

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/drivers/net/wireless/ipw2200.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/wireless/ipw2200.c	2006-02-15 14:15:59.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', '?'
 };
@@ -7059,8 +7059,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;
@@ -11287,7 +11286,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-mii-force_media.patch:
 mii.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE jwltest-mii-force_media.patch ---
--- linux-2.6.15/drivers/net/mii.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/mii.c	2006-01-09 13:49:32.000000000 -0500
@@ -266,10 +266,6 @@ unsigned int mii_check_media (struct mii
 	int advertise, lpa, media, duplex;
 	int lpa2 = 0;
 
-	/* if forced media, go no further */
-	if (mii->force_media)
-		return 0; /* duplex did not change */
-
 	/* check current and old link status */
 	old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0;
 	new_carrier = (unsigned int) mii_link_ok(mii);
@@ -293,6 +289,13 @@ unsigned int mii_check_media (struct mii
 	 */
 	netif_carrier_on(mii->dev);
 
+	/* if forced media, go no further */
+	if (mii->force_media) {
+		if (ok_to_print)
+			printk(KERN_INFO "%s: link up\n", mii->dev->name);
+		return 0; /* duplex did not change */
+	}
+
 	/* get MII advertise and LPA values */
 	if ((!init_media) && (mii->advertising))
 		advertise = mii->advertising;

jwltest-rhine-mdelay-undo.patch:
 via-rhine.c |   34 +++-------------------------------
 1 files changed, 3 insertions(+), 31 deletions(-)

--- NEW FILE jwltest-rhine-mdelay-undo.patch ---
--- linux-2.6.15/drivers/net/via-rhine.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/via-rhine.c	2006-02-09 10:52:37.000000000 -0500
@@ -490,8 +490,6 @@ struct rhine_private {
 	u8 tx_thresh, rx_thresh;
 
 	struct mii_if_info mii_if;
-	struct work_struct tx_timeout_task;
-	struct work_struct check_media_task;
 	void __iomem *base;
 };
 
@@ -499,8 +497,6 @@ static int  mdio_read(struct net_device 
 static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
 static int  rhine_open(struct net_device *dev);
 static void rhine_tx_timeout(struct net_device *dev);
-static void rhine_tx_timeout_task(struct net_device *dev);
-static void rhine_check_media_task(struct net_device *dev);
 static int  rhine_start_tx(struct sk_buff *skb, struct net_device *dev);
 static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
 static void rhine_tx(struct net_device *dev);
@@ -855,12 +851,6 @@ static int __devinit rhine_init_one(stru
 	if (rp->quirks & rqRhineI)
 		dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
 
-	INIT_WORK(&rp->tx_timeout_task,
-		  (void (*)(void *))rhine_tx_timeout_task, dev);
-
-	INIT_WORK(&rp->check_media_task,
-		  (void (*)(void *))rhine_check_media_task, dev);
-
 	/* dev->name not defined before register_netdev()! */
 	rc = register_netdev(dev);
 	if (rc)
@@ -1087,11 +1077,6 @@ static void rhine_check_media(struct net
 		   ioaddr + ChipCmd1);
 }
 
-static void rhine_check_media_task(struct net_device *dev)
-{
-	rhine_check_media(dev, 0);
-}
-
 static void init_registers(struct net_device *dev)
 {
 	struct rhine_private *rp = netdev_priv(dev);
@@ -1145,8 +1130,8 @@ static void rhine_disable_linkmon(void _
 	if (quirks & rqRhineI) {
 		iowrite8(0x01, ioaddr + MIIRegAddr);	// MII_BMSR
 
-		/* Do not call from ISR! */
-		msleep(1);
+		/* Can be called from ISR. Evil. */
+		mdelay(1);
 
 		/* 0x80 must be set immediately before turning it off */
 		iowrite8(0x80, ioaddr + MIICmd);
@@ -1236,16 +1221,6 @@ static int rhine_open(struct net_device 
 static void rhine_tx_timeout(struct net_device *dev)
 {
 	struct rhine_private *rp = netdev_priv(dev);
-
-	/*
-	 * Move bulk of work outside of interrupt context
-	 */
-	schedule_work(&rp->tx_timeout_task);
-}
-
-static void rhine_tx_timeout_task(struct net_device *dev)
-{
-	struct rhine_private *rp = netdev_priv(dev);
 	void __iomem *ioaddr = rp->base;
 
 	printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status "
@@ -1651,7 +1626,7 @@ static void rhine_error(struct net_devic
 	spin_lock(&rp->lock);
 
 	if (intr_status & IntrLinkChange)
-		schedule_work(&rp->check_media_task);
+		rhine_check_media(dev, 0);
 	if (intr_status & IntrStatsMax) {
 		rp->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs);
 		rp->stats.rx_missed_errors += ioread16(ioaddr + RxMissed);
@@ -1899,9 +1874,6 @@ static int rhine_close(struct net_device
 	spin_unlock_irq(&rp->lock);
 
 	free_irq(rp->pdev->irq, dev);
-
-	flush_scheduled_work();
-
 	free_rbufs(dev);
 	free_tbufs(dev);
 	free_ring(dev);

jwltest-sky2.patch:
 Kconfig       |   18 
 Makefile      |    1 
 sky2.c        | 3040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sky2.h        | 1910 ++++++++++++++++++++++++++++++++++++
 sky2_compat.h |    6 
 5 files changed, 4975 insertions(+)

--- NEW FILE jwltest-sky2.patch ---
--- linux-2.6.14/drivers/net/sky2.h.orig	2005-11-14 09:45:48.000000000 -0500
+++ linux-2.6.14/drivers/net/sky2.h	2005-11-14 09:45:56.000000000 -0500
@@ -0,0 +1,1910 @@
+/*
+ * Definitions for the new Marvell Yukon 2 driver.
+ */
+#ifndef _SKY2_H
+#define _SKY2_H
+
+/* PCI config registers */
+#define PCI_DEV_REG1	0x40
+#define PCI_DEV_REG2	0x44
+#define PCI_DEV_STATUS  0x7c
+#define PCI_OS_PCI_X    (1<<26)
+
+#define PEX_LNK_STAT	0xf2
+#define PEX_UNC_ERR_STAT 0x104
+#define PEX_DEV_CTRL	0xe8
+
+/* Yukon-2 */
+enum pci_dev_reg_1 {
+	PCI_Y2_PIG_ENA	 = 1<<31, /* Enable Plug-in-Go (YUKON-2) */
+	PCI_Y2_DLL_DIS	 = 1<<30, /* Disable PCI DLL (YUKON-2) */
+	PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */
+	PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */
+	PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */
+	PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */
+};
+
+enum pci_dev_reg_2 {
+	PCI_VPD_WR_THR	= 0xffL<<24,	/* Bit 31..24:	VPD Write Threshold */
+	PCI_DEV_SEL	= 0x7fL<<17,	/* Bit 23..17:	EEPROM Device Select */
+	PCI_VPD_ROM_SZ	= 7L<<14,	/* Bit 16..14:	VPD ROM Size	*/
+
+	PCI_PATCH_DIR	= 0xfL<<8,	/* Bit 11.. 8:	Ext Patches dir 3..0 */
+	PCI_EXT_PATCHS	= 0xfL<<4,	/* Bit	7.. 4:	Extended Patches 3..0 */
+	PCI_EN_DUMMY_RD	= 1<<3,		/* Enable Dummy Read */
+	PCI_REV_DESC	= 1<<2,		/* Reverse Desc. Bytes */
+
+	PCI_USEDATA64	= 1<<0,		/* Use 64Bit Data bus ext */
+};
+
+
+#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
+			       PCI_STATUS_SIG_SYSTEM_ERROR | \
+			       PCI_STATUS_REC_MASTER_ABORT | \
+			       PCI_STATUS_REC_TARGET_ABORT | \
+			       PCI_STATUS_PARITY)
+
+enum pex_dev_ctrl {
+	PEX_DC_MAX_RRS_MSK	= 7<<12, /* Bit 14..12:	Max. Read Request Size */
+	PEX_DC_EN_NO_SNOOP	= 1<<11,/* Enable No Snoop */
+	PEX_DC_EN_AUX_POW	= 1<<10,/* Enable AUX Power */
+	PEX_DC_EN_PHANTOM	= 1<<9,	/* Enable Phantom Functions */
+	PEX_DC_EN_EXT_TAG	= 1<<8,	/* Enable Extended Tag Field */
+	PEX_DC_MAX_PLS_MSK	= 7<<5,	/* Bit  7.. 5:	Max. Payload Size Mask */
+	PEX_DC_EN_REL_ORD	= 1<<4,	/* Enable Relaxed Ordering */
+	PEX_DC_EN_UNS_RQ_RP	= 1<<3,	/* Enable Unsupported Request Reporting */
+	PEX_DC_EN_FAT_ER_RP	= 1<<2,	/* Enable Fatal Error Reporting */
+	PEX_DC_EN_NFA_ER_RP	= 1<<1,	/* Enable Non-Fatal Error Reporting */
+	PEX_DC_EN_COR_ER_RP	= 1<<0,	/* Enable Correctable Error Reporting */
+};
+#define  PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK)
+
+/* PEX_UNC_ERR_STAT	 PEX Uncorrectable Errors Status Register (Yukon-2) */
+enum pex_err {
+	PEX_UNSUP_REQ 	= 1<<20, /* Unsupported Request Error */
+
+	PEX_MALFOR_TLP	= 1<<18, /* Malformed TLP */
+
+	PEX_UNEXP_COMP	= 1<<16, /* Unexpected Completion */
+
+	PEX_COMP_TO	= 1<<14, /* Completion Timeout */
+	PEX_FLOW_CTRL_P	= 1<<13, /* Flow Control Protocol Error */
+	PEX_POIS_TLP	= 1<<12, /* Poisoned TLP */
+
+	PEX_DATA_LINK_P = 1<<4,	/* Data Link Protocol Error */
+	PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P),
+};
+
+
+enum csr_regs {
+	B0_RAP		= 0x0000,
+	B0_CTST		= 0x0004,
+	B0_Y2LED	= 0x0005,
+	B0_POWER_CTRL	= 0x0007,
+	B0_ISRC		= 0x0008,
+	B0_IMSK		= 0x000c,
+	B0_HWE_ISRC	= 0x0010,
+	B0_HWE_IMSK	= 0x0014,
+
+	/* Special ISR registers (Yukon-2 only) */
+	B0_Y2_SP_ISRC2	= 0x001c,
+	B0_Y2_SP_ISRC3	= 0x0020,
+	B0_Y2_SP_EISR	= 0x0024,
+	B0_Y2_SP_LISR	= 0x0028,
+	B0_Y2_SP_ICR	= 0x002c,
+
+	B2_MAC_1	= 0x0100,
+	B2_MAC_2	= 0x0108,
+	B2_MAC_3	= 0x0110,
+	B2_CONN_TYP	= 0x0118,
+	B2_PMD_TYP	= 0x0119,
+	B2_MAC_CFG	= 0x011a,
+	B2_CHIP_ID	= 0x011b,
+	B2_E_0		= 0x011c,
+
+	B2_Y2_CLK_GATE  = 0x011d,
+	B2_Y2_HW_RES	= 0x011e,
+	B2_E_3		= 0x011f,
+	B2_Y2_CLK_CTRL	= 0x0120,
+
+	B2_TI_INI	= 0x0130,
+	B2_TI_VAL	= 0x0134,
+	B2_TI_CTRL	= 0x0138,
+	B2_TI_TEST	= 0x0139,
+
+	B2_TST_CTRL1	= 0x0158,
+	B2_TST_CTRL2	= 0x0159,
+	B2_GP_IO	= 0x015c,
+
+	B2_I2C_CTRL	= 0x0160,
+	B2_I2C_DATA	= 0x0164,
+	B2_I2C_IRQ	= 0x0168,
+	B2_I2C_SW	= 0x016c,
+
+	B3_RAM_ADDR	= 0x0180,
+	B3_RAM_DATA_LO	= 0x0184,
+	B3_RAM_DATA_HI	= 0x0188,
+
+/* RAM Interface Registers */
+/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */
+/*
+ * The HW-Spec. calls this registers Timeout Value 0..11. But this names are
+ * not usable in SW. Please notice these are NOT real timeouts, these are
+ * the number of qWords transferred continuously.
+ */
+#define RAM_BUFFER(port, reg)	(reg | (port <<6))
+
+	B3_RI_WTO_R1	= 0x0190,
+	B3_RI_WTO_XA1	= 0x0191,
+	B3_RI_WTO_XS1	= 0x0192,
+	B3_RI_RTO_R1	= 0x0193,
+	B3_RI_RTO_XA1	= 0x0194,
+	B3_RI_RTO_XS1	= 0x0195,
+	B3_RI_WTO_R2	= 0x0196,
+	B3_RI_WTO_XA2	= 0x0197,
+	B3_RI_WTO_XS2	= 0x0198,
+	B3_RI_RTO_R2	= 0x0199,
+	B3_RI_RTO_XA2	= 0x019a,
+	B3_RI_RTO_XS2	= 0x019b,
+	B3_RI_TO_VAL	= 0x019c,
+	B3_RI_CTRL	= 0x01a0,
+	B3_RI_TEST	= 0x01a2,
+	B3_MA_TOINI_RX1	= 0x01b0,
+	B3_MA_TOINI_RX2	= 0x01b1,
+	B3_MA_TOINI_TX1	= 0x01b2,
+	B3_MA_TOINI_TX2	= 0x01b3,
+	B3_MA_TOVAL_RX1	= 0x01b4,
+	B3_MA_TOVAL_RX2	= 0x01b5,
+	B3_MA_TOVAL_TX1	= 0x01b6,
+	B3_MA_TOVAL_TX2	= 0x01b7,
+	B3_MA_TO_CTRL	= 0x01b8,
+	B3_MA_TO_TEST	= 0x01ba,
+	B3_MA_RCINI_RX1	= 0x01c0,
+	B3_MA_RCINI_RX2	= 0x01c1,
+	B3_MA_RCINI_TX1	= 0x01c2,
+	B3_MA_RCINI_TX2	= 0x01c3,
+	B3_MA_RCVAL_RX1	= 0x01c4,
+	B3_MA_RCVAL_RX2	= 0x01c5,
+	B3_MA_RCVAL_TX1	= 0x01c6,
+	B3_MA_RCVAL_TX2	= 0x01c7,
+	B3_MA_RC_CTRL	= 0x01c8,
+	B3_MA_RC_TEST	= 0x01ca,
+	B3_PA_TOINI_RX1	= 0x01d0,
+	B3_PA_TOINI_RX2	= 0x01d4,
+	B3_PA_TOINI_TX1	= 0x01d8,
+	B3_PA_TOINI_TX2	= 0x01dc,
+	B3_PA_TOVAL_RX1	= 0x01e0,
+	B3_PA_TOVAL_RX2	= 0x01e4,
+	B3_PA_TOVAL_TX1	= 0x01e8,
+	B3_PA_TOVAL_TX2	= 0x01ec,
+	B3_PA_CTRL	= 0x01f0,
+	B3_PA_TEST	= 0x01f2,
+
+	Y2_CFG_SPC	= 0x1c00,
+};
+
+/*	B0_CTST			16 bit	Control/Status register */
+enum {
+	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */
+	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */
+	Y2_ASF_ENABLE	= 1<<13,/* ASF Unit Enable (YUKON-2 only) */
+	Y2_ASF_DISABLE	= 1<<12,/* ASF Unit Disable (YUKON-2 only) */
+	Y2_CLK_RUN_ENA	= 1<<11,/* CLK_RUN Enable  (YUKON-2 only) */
+	Y2_CLK_RUN_DIS	= 1<<10,/* CLK_RUN Disable (YUKON-2 only) */
+	Y2_LED_STAT_ON	= 1<<9, /* Status LED On  (YUKON-2 only) */
+	Y2_LED_STAT_OFF	= 1<<8, /* Status LED Off (YUKON-2 only) */
+
[...4603 lines suppressed...]
+		goto err_out_free_regions;
+	}
+
+	memset(hw, 0, sizeof(*hw));
+	hw->pdev = pdev;
+	spin_lock_init(&hw->phy_lock);
+
+	hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000);
+	if (!hw->regs) {
+		printk(KERN_ERR PFX "%s: cannot map device registers\n",
+		       pci_name(pdev));
+		goto err_out_free_hw;
+	}
+	hw->pm_cap = pm_cap;
+
+	err = sky2_reset(hw);
+	if (err)
+		goto err_out_iounmap;
+
+	printk(KERN_INFO PFX "addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n",
+	       pci_resource_start(pdev, 0), pdev->irq,
+	       yukon_name[hw->chip_id - CHIP_ID_YUKON],
+	       hw->chip_id, hw->chip_rev);
+
+	dev = sky2_init_netdev(hw, 0, using_dac);
+	if (!dev)
+		goto err_out_free_pci;
+
+	err = register_netdev(dev);
+	if (err) {
+		printk(KERN_ERR PFX "%s: cannot register net device\n",
+		       pci_name(pdev));
+		goto err_out_free_netdev;
+	}
+
+	sky2_show_addr(dev);
+
+	if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) {
+		if (register_netdev(dev1) == 0)
+			sky2_show_addr(dev1);
+		else {
+			/* Failure to register second port need not be fatal */
+			printk(KERN_WARNING PFX
+			       "register of second port failed\n");
+			hw->dev[1] = NULL;
+			free_netdev(dev1);
+		}
+	}
+
+	err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw);
+	if (err) {
+		printk(KERN_ERR PFX "%s: cannot assign irq %d\n",
+		       pci_name(pdev), pdev->irq);
+		goto err_out_unregister;
+	}
+
+	hw->intr_mask = Y2_IS_BASE;
+	sky2_write32(hw, B0_IMSK, hw->intr_mask);
+
+	pci_set_drvdata(pdev, hw);
+
+	return 0;
+
+err_out_unregister:
+	if (dev1) {
+		unregister_netdev(dev1);
+		free_netdev(dev1);
+	}
+	unregister_netdev(dev);
+err_out_free_netdev:
+	free_netdev(dev);
+err_out_free_pci:
+	sky2_write8(hw, B0_CTST, CS_RST_SET);
+	pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+err_out_iounmap:
+	iounmap(hw->regs);
+err_out_free_hw:
+	kfree(hw);
+err_out_free_regions:
+	pci_release_regions(pdev);
+	pci_disable_device(pdev);
+err_out:
+	return err;
+}
+
+static void __devexit sky2_remove(struct pci_dev *pdev)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	struct net_device *dev0, *dev1;
+
+	if (!hw)
+		return;
+
+	dev0 = hw->dev[0];
+	dev1 = hw->dev[1];
+	if (dev1)
+		unregister_netdev(dev1);
+	unregister_netdev(dev0);
+
+	sky2_write32(hw, B0_IMSK, 0);
+	sky2_set_power_state(hw, PCI_D3hot);
+	sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
+	sky2_write8(hw, B0_CTST, CS_RST_SET);
+	sky2_read8(hw, B0_CTST);
+
+	free_irq(pdev->irq, hw);
+	pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma);
+	pci_release_regions(pdev);
+	pci_disable_device(pdev);
+
+	if (dev1)
+		free_netdev(dev1);
+	free_netdev(dev0);
+	iounmap(hw->regs);
+	kfree(hw);
+
+	pci_set_drvdata(pdev, NULL);
+}
+
+#ifdef CONFIG_PM
+static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	int i;
+
+	for (i = 0; i < 2; i++) {
+		struct net_device *dev = hw->dev[i];
+
+		if (dev) {
+			if (!netif_running(dev))
+				continue;
+
+			sky2_down(dev);
+			netif_device_detach(dev);
+		}
+	}
+
+	return sky2_set_power_state(hw, pci_choose_state(pdev, state));
+}
+
+static int sky2_resume(struct pci_dev *pdev)
+{
+	struct sky2_hw *hw = pci_get_drvdata(pdev);
+	int i;
+
+	pci_restore_state(pdev);
+	pci_enable_wake(pdev, PCI_D0, 0);
+	sky2_set_power_state(hw, PCI_D0);
+
+	sky2_reset(hw);
+
+	for (i = 0; i < 2; i++) {
+		struct net_device *dev = hw->dev[i];
+		if (dev) {
+			if (netif_running(dev)) {
+				netif_device_attach(dev);
+				sky2_up(dev);
+			}
+		}
+	}
+	return 0;
+}
+#endif
+
+static struct pci_driver sky2_driver = {
+	.name = DRV_NAME,
+	.id_table = sky2_id_table,
+	.probe = sky2_probe,
+	.remove = __devexit_p(sky2_remove),
+#ifdef CONFIG_PM
+	.suspend = sky2_suspend,
+	.resume = sky2_resume,
+#endif
+};
+
+static int __init sky2_init_module(void)
+{
+	return pci_module_init(&sky2_driver);
+}
+
+static void __exit sky2_cleanup_module(void)
+{
+	pci_unregister_driver(&sky2_driver);
+}
+
+module_init(sky2_init_module);
+module_exit(sky2_cleanup_module);
+
+MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver");
+MODULE_AUTHOR("Stephen Hemminger <shemminger at osdl.org>");
+MODULE_LICENSE("GPL");
--- linux-2.6.14/drivers/net/sky2_compat.h.orig	2005-11-14 09:56:09.000000000 -0500
+++ linux-2.6.14/drivers/net/sky2_compat.h	2005-11-14 09:56:02.000000000 -0500
@@ -0,0 +1,6 @@
+#ifndef __SKY2_COMPAT_H__
+#define __SKY2_COMPAT_H__
+
+#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev)
+
+#endif /* __SKY2_COMPAT_H__ */

jwltest-tulip-last_irq.patch:
 tulip_core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jwltest-tulip-last_irq.patch ---
--- linux-2.6.14/drivers/net/tulip/tulip_core.c.orig	2005-12-13 15:31:26.000000000 -0500
+++ linux-2.6.14/drivers/net/tulip/tulip_core.c	2005-12-13 15:31:20.000000000 -0500
@@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str
 			    dev->dev_addr, 6);
 		}
 #endif
-#if defined(__i386__)		/* Patch up x86 BIOS bug. */
+#if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */
 		if (last_irq)
 			irq = last_irq;
 #endif

jwltest-via-velocity-tx_csum.patch:
 via-velocity.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jwltest-via-velocity-tx_csum.patch ---
--- linux-2.6.14/drivers/net/via-velocity.c.orig	2005-11-29 15:41:12.000000000 -0500
+++ linux-2.6.14/drivers/net/via-velocity.c	2005-11-29 15:41:47.000000000 -0500
@@ -792,7 +792,7 @@ static int __devinit velocity_found1(str
 #endif
 
 	if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) {
-		dev->features |= NETIF_F_HW_CSUM;
+		dev->features |= NETIF_F_IP_CSUM;
 	}
 
 	ret = register_netdev(dev);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1599
retrieving revision 1.1599.2.1
diff -u -r1.1599 -r1.1599.2.1
--- kernel-2.6.spec	10 Feb 2006 08:26:29 -0000	1.1599
+++ kernel-2.6.spec	15 Feb 2006 19:26:47 -0000	1.1599.2.1
@@ -312,6 +312,7 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
+Patch1302: jwltest-ipw2200-hwcrypto-off.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -721,6 +722,8 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
+# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+%patch1302 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:31:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:31:16 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1599.2.1,1.1599.2.2
Message-ID: <200602151931.k1FJVGQQ030200@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30186

Modified Files:
      Tag: private-linville-jwltest-fc4-31-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1599.2.1
retrieving revision 1.1599.2.2
diff -u -r1.1599.2.1 -r1.1599.2.2
--- kernel-2.6.spec	15 Feb 2006 19:26:47 -0000	1.1599.2.1
+++ kernel-2.6.spec	15 Feb 2006 19:30:52 -0000	1.1599.2.2
@@ -19,7 +19,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.31
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -157,7 +158,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -230,6 +232,7 @@
 Patch306: linux-2.6-powerpc64-fpexc.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -312,7 +315,12 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
-Patch1302: jwltest-ipw2200-hwcrypto-off.patch
+Patch1302: jwltest-sky2.patch
+Patch1303: jwltest-via-velocity-tx_csum.patch
+Patch1304: jwltest-tulip-last_irq.patch
+Patch1305: jwltest-mii-force_media.patch
+Patch1306: jwltest-rhine-mdelay-undo.patch
+Patch1307: jwltest-ipw2200-hwcrypto-off.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -372,6 +380,8 @@
 # ACPI patches.
 Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch
 
+Patch2200: jwltest-acpi-dsdt-initrd.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. 
@@ -593,6 +603,10 @@
 %patch305 -p1
 %patch306 -p1
 
+# 
+# ia64
+#
+
 #
 # Xen
 #
@@ -722,8 +736,18 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
-# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+# add sky2 driver from upstream
 %patch1302 -p1
+# via-velocity tx_csum only works for IPv4
+%patch1303 -p1
+# apply bios work-around for tulip to x86_64 as well as i386
+%patch1304 -p1
+# fix link state change bug w/ generic mii
+%patch1305 -p1
+# undo via-rhine mdelay elimination patch
+%patch1306 -p1
+# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+%patch1307 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -822,6 +846,9 @@
 # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.
 %patch2100 -p1
 
+# Add DSDT override from initrd
+%patch2200 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:33:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:33:48 -0500
Subject: rpms/kernel/devel linux-2.6-ipw2200-hwcrypto.patch, NONE,
	1.1 kernel-2.6.spec, 1.1953,
	1.1954 linux-2.6-bcm43xx-git.patch, 1.1,
	1.2 linux-2.6-softmac-git.patch, 1.6,
	1.7 linux-2.6-bcm43xx-git-mb.patch, 1.1, NONE
Message-ID: <200602151933.k1FJXmmo030298@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30270

Modified Files:
	kernel-2.6.spec linux-2.6-bcm43xx-git.patch 
	linux-2.6-softmac-git.patch 
Added Files:
	linux-2.6-ipw2200-hwcrypto.patch 
Removed Files:
	linux-2.6-bcm43xx-git-mb.patch 
Log Message:
update softmac/bcm43xx, set ipw2200 hwcrypt=0

linux-2.6-ipw2200-hwcrypto.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ipw2200-hwcrypto.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,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1953
retrieving revision 1.1954
diff -u -r1.1953 -r1.1954
--- kernel-2.6.spec	15 Feb 2006 17:44:53 -0000	1.1953
+++ kernel-2.6.spec	15 Feb 2006 19:33:23 -0000	1.1954
@@ -330,6 +330,7 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
+Patch1303: linux-2.6-ipw2200-hwcrypto.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -385,8 +386,7 @@
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
-Patch5002: linux-2.6-bcm43xx-git-mb.patch
-Patch5003: linux-2.6-bcm-warnings.patch
+Patch5002: linux-2.6-bcm-warnings.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -872,6 +872,8 @@
 %patch1301 -p1
 # Goodies for wireless drivers to make NetworkManager work
 %patch1302 -p1
+# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+%patch1303 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -962,14 +964,12 @@
 # be merged upstream
 #
 
-# Import softmac code from git tree
+# Import softmac code from wireless-2.6 tree
 %patch5000 -p1
-# ... and bcm43xx driver too from jwl's tree
+# ... and bcm43xx driver too
 %patch5001 -p1
-# ... and Michael Buesch's updates (2006-02-03)
-%patch5002 -p1
 # warning fix.
-%patch5003 -p1
+%patch5002 -p1
 
 #
 # final stuff
@@ -1571,6 +1571,10 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 John W. Linville <linville at redhat.com>
+- Update to current softmac/bcm43xx code.
+- Set ipw2200 hwcrypto option to 0 to avoid firmware restarts.
+
 * Wed Feb 15 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git4
 - Hopefully fix suspend to swap-on-LVM

linux-2.6-bcm43xx-git.patch:
 Documentation/networking/bcm43xx.txt           |   36 
 drivers/net/wireless/Kconfig                   |   17 
 drivers/net/wireless/Makefile                  |    1 
 drivers/net/wireless/bcm43xx/Makefile          |    9 
 drivers/net/wireless/bcm43xx/bcm43xx.h         |  934 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c |  503 ++
 drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h |  117 
 drivers/net/wireless/bcm43xx/bcm43xx_dma.c     |  989 +++++
 drivers/net/wireless/bcm43xx/bcm43xx_dma.h     |  175 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c |   50 
 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h |    8 
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c     |  367 ++
 drivers/net/wireless/bcm43xx/bcm43xx_ilt.h     |   34 
 drivers/net/wireless/bcm43xx/bcm43xx_leds.c    |  261 +
 drivers/net/wireless/bcm43xx/bcm43xx_leds.h    |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_main.c    | 4457 +++++++++++++++++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_main.h    |  283 +
 drivers/net/wireless/bcm43xx/bcm43xx_phy.c     | 2127 +++++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_phy.h     |   74 
 drivers/net/wireless/bcm43xx/bcm43xx_pio.c     |  592 +++
 drivers/net/wireless/bcm43xx/bcm43xx_pio.h     |   88 
 drivers/net/wireless/bcm43xx/bcm43xx_power.c   |  358 ++
 drivers/net/wireless/bcm43xx/bcm43xx_power.h   |   47 
 drivers/net/wireless/bcm43xx/bcm43xx_radio.c   | 1766 +++++++++
 drivers/net/wireless/bcm43xx/bcm43xx_radio.h   |   94 
 drivers/net/wireless/bcm43xx/bcm43xx_wx.c      | 1109 ++++++
 drivers/net/wireless/bcm43xx/bcm43xx_wx.h      |   36 
 net/ieee80211/ieee80211_rx.c                   |   74 
 28 files changed, 14653 insertions(+)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 linux-2.6-bcm43xx-git.patch
Index: linux-2.6-bcm43xx-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-bcm43xx-git.patch	6 Feb 2006 15:33:08 -0000	1.1
+++ linux-2.6-bcm43xx-git.patch	15 Feb 2006 19:33:35 -0000	1.2
@@ -1,8 +1,5 @@
-diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt
-new file mode 100644
-index 0000000..64d9022
---- /dev/null
-+++ b/Documentation/networking/bcm43xx.txt
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt	2006-02-14 17:01:37.000000000 -0500
 @@ -0,0 +1,36 @@
 +
 +			BCM43xx Linux Driver Project
@@ -40,136 +37,48 @@
 +	binary driver files. It supports driver files from Windows, MacOS and 
 +	Linux. You can get fwcutter from http://bcm43xx.berlios.de/.
 +	Also, fwcutter comes with a README file for further instructions.
-diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
-index 233a4f6..32744ea 100644
---- a/drivers/net/wireless/Kconfig
-+++ b/drivers/net/wireless/Kconfig
-@@ -473,6 +473,14 @@ config PRISM54
- 
- source "drivers/net/wireless/hostap/Kconfig"
- 
-+config BCM43XX
-+       tristate "Broadcom BCM43xx wireless support"
-+       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
-+	select FW_LOADER
-+       ---help---
-+	This is an experimental driver for the Broadcom 43xx wireless chip,
-+	found in the Apple Airport Extreme and various other devices.
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h	2006-02-14 17:02:06.000000000 -0500
+@@ -0,0 +1,36 @@
++/*
 +
- # yes, this works even when no drivers are selected
- config NET_WIRELESS
- 	bool
-diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
-index 3a6f7ba..c867798 100644
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL)      += atmel
- obj-$(CONFIG_PRISM54)		+= prism54/
- 
- obj-$(CONFIG_HOSTAP)		+= hostap/
-+obj-$(CONFIG_BCM43XX)		+= bcm43xx/
- 
- # 16-bit wireless PCMCIA client drivers
- obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
-diff --git a/drivers/net/wireless/bcm43xx/Makefile b/drivers/net/wireless/bcm43xx/Makefile
-new file mode 100644
-index 0000000..98d4efb
---- /dev/null
-+++ b/drivers/net/wireless/bcm43xx/Makefile
-@@ -0,0 +1,87 @@
-+# Makefile for bcm43xx driver
-+
-+VERSION		:= 0.0.1
-+RELEASE_NAME	:= bcm43xx-$(VERSION)
-+
-+# Optional path, where the SoftMAC subsystem is located.
-+# You may set SOFTMAC_DIR in your bashrc, for example.
-+SOFTMAC_DIR	?= 
-+
-+KVER		:= $(shell uname -r)
-+KDIR		?= /lib/modules/$(KVER)/build
-+PWD		:= $(shell pwd)
-+MODPATH		:= $(DESTDIR)/lib/modules/$(KVER)/kernel/drivers/net/bcm43xx
-+
-+# Comment/uncomment to enable/disable debugging
-+DEBUG = y
-+
-+
-+ifeq ($(DEBUG),y)
-+DEBUGFS_OBJ = bcm43xx_debugfs.o
-+CFLAGS += -O2 -DCONFIG_BCM43XX_DEBUG
-+else
-+DEBUGFS_OBJ =
-+CFLAGS += -O2
-+endif
-+
-+CFLAGS += -DBCM43xx_VERSION=$(VERSION) -I/lib/modules/$(KVER)/include
-+ifneq ($(SOFTMAC_DIR),)
-+CPPFLAGS := -I$(SOFTMAC_DIR) $(CPPFLAGS)
-+endif
++  Broadcom BCM43xx wireless driver
 +
-+ifneq ($(KERNELRELEASE),)
-+# call from kernel build system
++  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
++                     Stefano Brivio <st3 at riseup.net>
++                     Michael Buesch <mbuesch at freenet.de>
++                     Danny van Dyk <kugelfang at gentoo.org>
++                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
 +
-+obj-m := bcm43xx.o
-+bcm43xx-objs := bcm43xx_main.o bcm43xx_dma.o $(DEBUGFS_OBJ) \
-+		bcm43xx_radio.o bcm43xx_phy.o \
-+		bcm43xx_power.o bcm43xx_wx.o \
-+		bcm43xx_pio.o bcm43xx_ilt.o \
-+		bcm43xx_leds.o
++  Some parts of the code in this file are derived from the ipw2200
++  driver  Copyright(c) 2003 - 2004 Intel Corporation.
++
++  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.
 +
-+else
++  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; see the file COPYING.  If not, write to
++  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
++  Boston, MA 02110-1301, USA.
++
++*/
 +
-+default: modules
++#ifndef BCM43xx_WX_H_
++#define BCM43xx_WX_H_
 +
-+modules:
-+	$(MAKE) -C $(KDIR) M=$(PWD) modules
++extern const struct iw_handler_def bcm43xx_wx_handlers_def;
 +
-+install: bcm43xx.ko
-+	install -d $(MODPATH)
-+	install -m 644 -c bcm43xx.ko $(MODPATH)
-+	/sbin/depmod -a
-+
-+uninstall:
-+	rm -rf $(MODPATH)
-+	/sbin/depmod -a
-+
-+endif
-+
-+clean:
-+	find . \( -name '*.ko' -o -name '*.o' -o -name '.tmp_versions' -o -name '*~' -o -name '.*.cmd' \
-+		-o -name '*.mod.c' -o -name '*.tar.bz2' -o -name '*.rej' -o -name '*.orig' \)\
-+		-print | xargs rm -Rf
-+
-+depend .depend dep:
-+	$(CC) $(CFLAGS) -M *.c > .depend
-+
-+ifeq (.depend,$(wildcard .depend))
-+include .depend
-+endif
-+
-+DISTFILES =  $(shell find . \( -not -name '.' \) -print | grep -v "\.tar\.bz2" | grep -v "\/\." )
-+DISTDIR = $(RELEASE_NAME)
-+
-+release: clean
-+	@rm -rf $(DISTDIR)
-+	@mkdir $(DISTDIR)
-+	@chmod 777 $(DISTDIR)
-+	@for file in $(DISTFILES); do                   \
-+                if test -d $$file; then                 \
-+                        mkdir $(DISTDIR)/$$file;        \
-+                else                                    \
-+                        cp -p $$file $(DISTDIR)/$$file; \
-+                fi;                                     \
-+        done
-+	@tar -c $(DISTDIR) | bzip2 -9 > $(RELEASE_NAME).tar.bz2
-+	@rm -rf $(DISTDIR)
-diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
-new file mode 100644
-index 0000000..38e75ed
---- /dev/null
-+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
-@@ -0,0 +1,938 @@
++#endif /* BCM43xx_WX_H_ */
+--- /dev/null	2006-01-05 13:17:15.134352320 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h	2006-02-14 17:02:06.000000000 -0500
+@@ -0,0 +1,934 @@
 +#ifndef BCM43xx_H_
 +#define BCM43xx_H_
 +
@@ -189,14 +98,10 @@
 +#include "bcm43xx_leds.h"
 +
 +
-+#define DRV_NAME			__stringify(KBUILD_MODNAME)
-+#define DRV_VERSION			__stringify(BCM43xx_VERSION)
-+#define BCM43xx_DRIVER_NAME		DRV_NAME " driver " DRV_VERSION
-+#define PFX				DRV_NAME ": "
++#define PFX				KBUILD_MODNAME ": "
[...24617 lines suppressed...]
++	do {									\
++		bcm43xx_printk_bitdump((const unsigned char *)(pointer),	\
++				       sizeof(*(pointer)),			\
++				       (msb_to_lsb),				\
++				       (description));				\
++	} while (0)
 +
-+  Copyright (c) 2005 Martin Langer <martin-langer at gmx.de>,
-+                     Stefano Brivio <st3 at riseup.net>
-+                     Michael Buesch <mbuesch at freenet.de>
-+                     Danny van Dyk <kugelfang at gentoo.org>
-+                     Andreas Jaggi <andreas.jaggi at waterwave.ch>
++#else /* CONFIG_BCM43XX_DEBUG*/
 +
-+  Some parts of the code in this file are derived from the ipw2200
-+  driver  Copyright(c) 2003 - 2004 Intel Corporation.
++static inline
++void bcm43xx_debugfs_init(void) { }
++static inline
++void bcm43xx_debugfs_exit(void) { }
++static inline
++void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm) { }
++static inline
++void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm) { }
++static inline
++void bcm43xx_debugfs_log_txstat(struct bcm43xx_private *bcm,
++				struct bcm43xx_xmitstatus *status) { }
 +
-+  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.
++static inline
++void bcm43xx_printk_dump(const char *data,
++			 size_t size,
++			 const char *description)
++{
++}
++static inline
++void bcm43xx_printk_bitdump(const unsigned char *data,
++			    size_t bytes, int msb_to_lsb,
++			    const char *description)
++{
++}
++#define bcm43xx_printk_bitdumpt(pointer, msb_to_lsb, description)  do { /* nothing */ } while (0)
 +
-+  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.
++#endif /* CONFIG_BCM43XX_DEBUG*/
 +
-+  You should have received a copy of the GNU General Public License
-+  along with this program; see the file COPYING.  If not, write to
-+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-+  Boston, MA 02110-1301, USA.
++/* Ugly helper macros to make incomplete code more verbose on runtime */
++#ifdef TODO
++# undef TODO
++#endif
++#define TODO()  \
++	do {										\
++		printk(KERN_INFO PFX "TODO: Incomplete code in %s() at %s:%d\n",	\
++		       __FUNCTION__, __FILE__, __LINE__);				\
++	} while (0)
 +
-+*/
++#ifdef FIXME
++# undef FIXME
++#endif
++#define FIXME()  \
++	do {										\
++		printk(KERN_INFO PFX "FIXME: Possibly broken code in %s() at %s:%d\n",	\
++		       __FUNCTION__, __FILE__, __LINE__);				\
++	} while (0)
 +
-+#ifndef BCM43xx_WX_H_
-+#define BCM43xx_WX_H_
++#endif /* BCM43xx_DEBUGFS_H_ */
+--- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig	2006-02-14 17:01:26.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/Makefile	2006-02-14 17:02:17.000000000 -0500
+@@ -35,6 +35,7 @@ obj-$(CONFIG_PCI_ATMEL)         += atmel
+ obj-$(CONFIG_PRISM54)		+= prism54/
+ 
+ obj-$(CONFIG_HOSTAP)		+= hostap/
++obj-$(CONFIG_BCM43XX)		+= bcm43xx/
+ 
+ # 16-bit wireless PCMCIA client drivers
+ obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
+--- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig	2006-02-14 17:01:26.000000000 -0500
++++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig	2006-02-14 17:02:17.000000000 -0500
+@@ -471,6 +489,23 @@ config PRISM54
+ 	  will be called prism54.ko.
+ 
+ source "drivers/net/wireless/hostap/Kconfig"
 +
-+extern const struct iw_handler_def bcm43xx_wx_handlers_def;
++config BCM43XX
++	tristate "Broadcom BCM43xx wireless support"
++	depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL
++	select FW_LOADER
++	---help---
++	  This is an experimental driver for the Broadcom 43xx wireless chip,
++	  found in the Apple Airport Extreme and various other devices.
++
++config BCM43XX_DEBUG
++	bool "Broadcom BCM43xx debugging (RECOMMENDED)"
++	depends on BCM43XX
++	default y
++	---help---
++	  Broadcom 43xx debugging messages.
++	  Say Y, because the driver is still very experimental and
++	  this will help you get it running.
+ 
+ # yes, this works even when no drivers are selected
+ config NET_WIRELESS
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-02-14 16:59:31.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c	2006-02-14 17:01:12.000000000 -0500
+@@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device
+ 	return 0;
+ }
+ 
++/* Filter out unrelated packets, call ieee80211_rx[_mgt] */
++int ieee80211_rx_any(struct ieee80211_device *ieee,
++		     struct sk_buff *skb, struct ieee80211_rx_stats *stats)
++{
++	struct ieee80211_hdr_4addr *hdr;
++	int is_packet_for_us;
++	u16 fc;
 +
-+#endif /* BCM43xx_WX_H_ */
++	if (ieee->iw_mode == IW_MODE_MONITOR)
++		return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL;
++
++	hdr = (struct ieee80211_hdr_4addr *)skb->data;
++	fc = le16_to_cpu(hdr->frame_ctl);
++
++	if ((fc & IEEE80211_FCTL_VERS) != 0)
++		return -EINVAL;
++		
++	switch (fc & IEEE80211_FCTL_FTYPE) {
++	case IEEE80211_FTYPE_MGMT:
++		ieee80211_rx_mgt(ieee, hdr, stats);
++		return 0;
++	case IEEE80211_FTYPE_DATA:
++		break;
++	case IEEE80211_FTYPE_CTL:
++		return 0;
++	default:
++		return -EINVAL;
++	}
++
++	is_packet_for_us = 0;
++	switch (ieee->iw_mode) {
++	case IW_MODE_ADHOC:
++		/* our BSS and not from/to DS */
++		if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1))
++				is_packet_for_us = 1;
++		}
++		break;
++	case IW_MODE_INFRA:
++		/* our BSS (== from our AP) and from DS */
++		if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0)
++		if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) {
++			/* promisc: get all */
++			if (ieee->dev->flags & IFF_PROMISC)
++				is_packet_for_us = 1;
++			/* to us */
++			else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0)
++				is_packet_for_us = 1;
++			/* mcast */
++			else if (is_multicast_ether_addr(hdr->addr1)) {
++				/* not our own packet bcasted from AP */
++				if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN))
++					is_packet_for_us = 1;
++			}
++		}
++		break;
++	default:
++		/* ? */
++		break;
++	}
++
++	if (is_packet_for_us)
++		return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL);
++	return 0;
++}
++
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+ static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };

linux-2.6-softmac-git.patch:
 include/net/ieee80211.h                         |    8 
 include/net/ieee80211softmac.h                  |  292 ++++++++++++++
 include/net/ieee80211softmac_wx.h               |   94 ++++
 net/ieee80211/Kconfig                           |    1 
 net/ieee80211/Makefile                          |    1 
 net/ieee80211/ieee80211_module.c                |    2 
 net/ieee80211/ieee80211_rx.c                    |    4 
 net/ieee80211/ieee80211_wx.c                    |   89 ++++
 net/ieee80211/softmac/Kconfig                   |   10 
 net/ieee80211/softmac/Makefile                  |    9 
 net/ieee80211/softmac/ieee80211softmac_assoc.c  |  403 ++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_auth.c   |  376 +++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_event.c  |  159 ++++++++
 net/ieee80211/softmac/ieee80211softmac_io.c     |  474 ++++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_module.c |  457 +++++++++++++++++++++++
 net/ieee80211/softmac/ieee80211softmac_priv.h   |  239 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_scan.c   |  237 ++++++++++++
 net/ieee80211/softmac/ieee80211softmac_wx.c     |  412 ++++++++++++++++++++
 18 files changed, 3264 insertions(+), 3 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 linux-2.6-softmac-git.patch
Index: linux-2.6-softmac-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-softmac-git.patch	7 Feb 2006 22:17:20 -0000	1.6
+++ linux-2.6-softmac-git.patch	15 Feb 2006 19:33:36 -0000	1.7
@@ -1,7 +1,102 @@
-diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
-index df05f46..c1cb23a 100644
---- a/include/net/ieee80211.h
-+++ b/include/net/ieee80211.h
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211softmac_wx.h	2006-02-15 10:04:26.000000000 -0500
+@@ -0,0 +1,94 @@
++/*
++ * This file contains the prototypes for the wireless extension
++ * handlers that the softmac API provides. Include this file to
++ * use the wx handlers, you can assign these directly.
++ *
++ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
++ *                    Joseph Jezak <josejx at gentoo.org>
++ *                    Larry Finger <Larry.Finger at lwfinger.net>
++ *                    Danny van Dyk <kugelfang at gentoo.org>
++ *                    Michael Buesch <mbuesch at freenet.de>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of version 2 of the GNU General Public License as
++ * published by the Free Software Foundation.
++ *
++ * 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 St, Fifth Floor, Boston, MA  02110-1301 USA
++ *
++ * The full GNU General Public License is included in this distribution in the
++ * file called COPYING.
++ */
++
++#ifndef _IEEE80211SOFTMAC_WX_H
++#define _IEEE80211SOFTMAC_WX_H
++
++#include <net/ieee80211softmac.h>
++#include <net/iw_handler.h>
++
++extern int
++ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
++				 struct iw_request_info *info,
++				 union iwreq_data *data,
++				 char *extra);
++
++extern int
++ieee80211softmac_wx_get_scan_results(struct net_device *net_dev,
++				     struct iw_request_info *info,
++				     union iwreq_data *data,
++				     char *extra);
++
++extern int
++ieee80211softmac_wx_set_essid(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_get_essid(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_rate(struct net_device *net_dev,
++			     struct iw_request_info *info,
++			     union iwreq_data *data,
++			     char *extra);
++
++extern int
++ieee80211softmac_wx_get_rate(struct net_device *net_dev,
++			     struct iw_request_info *info,
++			     union iwreq_data *data,
++			     char *extra);
++
++extern int
++ieee80211softmac_wx_get_wap(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_wap(struct net_device *net_dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *data,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_set_genie(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu,
++			      char *extra);
++
++extern int
++ieee80211softmac_wx_get_genie(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu,
++			      char *extra);
++#endif /* _IEEE80211SOFTMAC_WX */
+--- linux-2.6.15.noarch/include/net/ieee80211.h.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211.h	2006-02-15 09:58:21.000000000 -0500
 @@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st
  extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee,
  				      struct iw_request_info *info,
@@ -17,11 +112,8 @@
  
  static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
  {
-diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
-new file mode 100644
-index 0000000..b971d8c
---- /dev/null
-+++ b/include/net/ieee80211softmac.h
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/include/net/ieee80211softmac.h	2006-02-15 10:04:26.000000000 -0500
 @@ -0,0 +1,292 @@
 +/*
 + * ieee80211softmac.h - public interface to the softmac
@@ -315,22 +407,28 @@
 +ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm);
 +
 +#endif /* IEEE80211SOFTMAC_H_ */
-diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h
-new file mode 100644
-index 0000000..3e0be45
---- /dev/null
-+++ b/include/net/ieee80211softmac_wx.h
-@@ -0,0 +1,94 @@
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c	2006-02-15 09:58:21.000000000 -0500
+@@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d
+ 
+ static int debug = 0;
+ u32 ieee80211_debug_level = 0;
+-struct proc_dir_entry *ieee80211_proc = NULL;
++static struct proc_dir_entry *ieee80211_proc = NULL;
+ 
+ static int show_debug_level(char *page, char **start, off_t offset,
+ 			    int count, int *eof, void *data)
+--- /dev/null	2006-02-15 08:17:09.135048168 -0500
++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c	2006-02-15 10:34:17.000000000 -0500
+@@ -0,0 +1,376 @@
 +/*
-+ * This file contains the prototypes for the wireless extension
-+ * handlers that the softmac API provides. Include this file to
-+ * use the wx handlers, you can assign these directly.
++ * This file contains the softmac's authentication logic.
 + *
-+ * Copyright (c) 2005 Johannes Berg <johannes at sipsolutions.net>
-+ *                    Joseph Jezak <josejx at gentoo.org>
-+ *                    Larry Finger <Larry.Finger at lwfinger.net>
-+ *                    Danny van Dyk <kugelfang at gentoo.org>
-+ *                    Michael Buesch <mbuesch at freenet.de>
++ * Copyright (c) 2005, 2006 Johannes Berg <johannes at sipsolutions.net>
++ *                          Joseph Jezak <josejx at gentoo.org>
++ *                          Larry Finger <Larry.Finger at lwfinger.net>
++ *                          Danny van Dyk <kugelfang at gentoo.org>
++ *                          Michael Buesch <mbuesch at freenet.de>
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms of version 2 of the GNU General Public License as
@@ -349,348 +447,367 @@
 + * file called COPYING.
 + */
 +
-+#ifndef _IEEE80211SOFTMAC_WX_H
-+#define _IEEE80211SOFTMAC_WX_H
-+
-+#include <net/ieee80211softmac.h>
-+#include <net/iw_handler.h>
-+
-+extern int
-+ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
-+				 struct iw_request_info *info,
-+				 union iwreq_data *data,
-+				 char *extra);
-+
-+extern int
-+ieee80211softmac_wx_get_scan_results(struct net_device *net_dev,
-+				     struct iw_request_info *info,
-+				     union iwreq_data *data,
-+				     char *extra);
++#include "ieee80211softmac_priv.h"
 +
-+extern int
-+ieee80211softmac_wx_set_essid(struct net_device *net_dev,
-+			      struct iw_request_info *info,
-+			      union iwreq_data *data,
-+			      char *extra);
[...5317 lines suppressed...]
-+				goto out;
++/* private -- calling all callbacks that were specified */
++void
++ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int event, void *event_ctx)
++{
++	struct ieee80211softmac_event *eventptr, *tmp;
++	union iwreq_data wrqu;
++	char *msg;
++	
++	if (event >= 0) {
++		msg = event_descriptions[event];
++		wrqu.data.length = strlen(msg);
++		wireless_send_event(mac->dev, IWEVCUSTOM, &wrqu, msg);
++	}
++
++	if (!list_empty(&mac->events))
++		list_for_each_entry_safe(eventptr, tmp, &mac->events, list) {
++			if ((eventptr->event_type == event || eventptr->event_type == -1)
++				&& (eventptr->event_context == NULL || eventptr->event_context == event_ctx)) {
++				list_del(&eventptr->list);
++				schedule_work(&eventptr->work);
 +			}
-+			kfree(mac->wpa.IE);
-+			mac->wpa.IE = buf;
-+			mac->wpa.IEbuflen = wrqu->data.length;
 +		}
-+		memcpy(mac->wpa.IE, extra, wrqu->data.length);
-+		dprintk(KERN_INFO PFX "generic IE set to ");
-+		for (i=0;i<wrqu->data.length;i++)
-+			dprintk("%.2x", mac->wpa.IE[i]);
-+		dprintk("\n");
-+		mac->wpa.IElen = wrqu->data.length;
-+	} else {
-+		kfree(mac->wpa.IE);
-+		mac->wpa.IE = NULL;
-+		mac->wpa.IElen = 0;
-+		mac->wpa.IEbuflen = 0;
-+	}
++}
++
++void
++ieee80211softmac_call_events(struct ieee80211softmac_device *mac, int event, void *event_ctx)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&mac->lock, flags);
++	ieee80211softmac_call_events_locked(mac, event, event_ctx);
 +
-+ out:	
 +	spin_unlock_irqrestore(&mac->lock, flags);
++}
+--- linux-2.6.15.noarch/net/ieee80211/Makefile.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/Makefile	2006-02-15 09:58:21.000000000 -0500
+@@ -10,3 +10,4 @@ ieee80211-objs := \
+ 	ieee80211_wx.o \
+ 	ieee80211_geo.o
+ 
++obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c	2006-02-15 10:21:29.000000000 -0500
+@@ -1375,9 +1375,9 @@ static void update_network(struct ieee80
+ 	/* dst->last_associate is not overwritten */
+ }
+ 
+-static inline int is_beacon(int fc)
++static inline int is_beacon(__be16 fc)
+ {
+-	return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON);
++	return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON);
+ }
+ 
+ static void ieee80211_process_probe_response(struct ieee80211_device
+--- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c	2006-02-15 09:58:21.000000000 -0500
+@@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie
+ 	return 0;
+ }
+ 
++int ieee80211_wx_set_auth(struct net_device *dev,
++			  struct iw_request_info *info,
++			  union iwreq_data *wrqu,
++			  char *extra)
++{
++	struct ieee80211_device *ieee = netdev_priv(dev);
++	unsigned long flags;
++	int err = 0;
++
++	spin_lock_irqsave(&ieee->lock, flags);
++	
++	switch (wrqu->param.flags & IW_AUTH_INDEX) {
++	case IW_AUTH_WPA_VERSION:
++	case IW_AUTH_CIPHER_PAIRWISE:
++	case IW_AUTH_CIPHER_GROUP:
++	case IW_AUTH_KEY_MGMT:
++		/*
++		 * Host AP driver does not use these parameters and allows
++		 * wpa_supplicant to control them internally.
++		 */
++		break;
++	case IW_AUTH_TKIP_COUNTERMEASURES:
++		break;		/* FIXME */
++	case IW_AUTH_DROP_UNENCRYPTED:
++		ieee->drop_unencrypted = !!wrqu->param.value;
++		break;
++	case IW_AUTH_80211_AUTH_ALG:
++		break;		/* FIXME */
++	case IW_AUTH_WPA_ENABLED:
++		ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value;
++		break;
++	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++		ieee->ieee802_1x = !!wrqu->param.value;
++		break;
++	case IW_AUTH_PRIVACY_INVOKED:
++		ieee->privacy_invoked = !!wrqu->param.value;
++		break;
++	default:
++		err = -EOPNOTSUPP;
++		break;
++	}
++	spin_unlock_irqrestore(&ieee->lock, flags);
 +	return err;
 +}
-+EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie);
 +
-+int
-+ieee80211softmac_wx_get_genie(struct net_device *dev,
-+			      struct iw_request_info *info,
-+			      union iwreq_data *wrqu,
-+			      char *extra)
++int ieee80211_wx_get_auth(struct net_device *dev,
++			  struct iw_request_info *info,
++			  union iwreq_data *wrqu,
++			  char *extra)
 +{
-+	struct ieee80211softmac_device *mac = ieee80211_priv(dev);
++	struct ieee80211_device *ieee = netdev_priv(dev);
 +	unsigned long flags;
 +	int err = 0;
-+	int space = wrqu->data.length;
-+	
-+	spin_lock_irqsave(&mac->lock, flags);
-+	
-+	wrqu->data.length = 0;
++
++	spin_lock_irqsave(&ieee->lock, flags);
 +	
-+	if (mac->wpa.IE && mac->wpa.IElen) {
-+		wrqu->data.length = mac->wpa.IElen;
-+		if (mac->wpa.IElen <= space)
-+			memcpy(extra, mac->wpa.IE, mac->wpa.IElen);
-+		else
-+			err = -E2BIG;
++	switch (wrqu->param.flags & IW_AUTH_INDEX) {
++	case IW_AUTH_WPA_VERSION:
++	case IW_AUTH_CIPHER_PAIRWISE:
++	case IW_AUTH_CIPHER_GROUP:
++	case IW_AUTH_KEY_MGMT:
++	case IW_AUTH_TKIP_COUNTERMEASURES:		/* FIXME */
++	case IW_AUTH_80211_AUTH_ALG:			/* FIXME */
++		/*
++		 * Host AP driver does not use these parameters and allows
++		 * wpa_supplicant to control them internally.
++		 */
++		err = -EOPNOTSUPP;
++		break;
++	case IW_AUTH_DROP_UNENCRYPTED:
++		wrqu->param.value = ieee->drop_unencrypted;
++		break;
++	case IW_AUTH_WPA_ENABLED:
++		wrqu->param.value = ieee->wpa_enabled;
++		break;
++	case IW_AUTH_RX_UNENCRYPTED_EAPOL:
++		wrqu->param.value = ieee->ieee802_1x;
++		break;
++	default:
++		err = -EOPNOTSUPP;
++		break;
 +	}
-+	spin_unlock_irqrestore(&mac->lock, flags);
++	spin_unlock_irqrestore(&ieee->lock, flags);
 +	return err;
 +}
-+EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie);
 +
+ EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
+ EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
+ 
+ EXPORT_SYMBOL(ieee80211_wx_get_scan);
+ EXPORT_SYMBOL(ieee80211_wx_set_encode);
+ EXPORT_SYMBOL(ieee80211_wx_get_encode);
++
++EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth);
++EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth);
+--- linux-2.6.15.noarch/net/ieee80211/Kconfig.orig	2006-02-15 09:58:15.000000000 -0500
++++ linux-2.6.15.noarch/net/ieee80211/Kconfig	2006-02-15 09:58:21.000000000 -0500
+@@ -66,3 +66,4 @@ config IEEE80211_CRYPT_TKIP
+ 	This can be compiled as a modules and it will be called
+ 	"ieee80211_crypt_tkip".
+ 
++source "net/ieee80211/softmac/Kconfig"


--- linux-2.6-bcm43xx-git-mb.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 15 19:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 14:58:35 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.94, 1.95 mkinitrd.spec, 1.105,
	1.106 sources, 1.101, 1.102
Message-ID: <200602151958.k1FJwZqI020828@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20770

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.26-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- .cvsignore	14 Feb 2006 23:17:58 -0000	1.94
+++ .cvsignore	15 Feb 2006 19:58:33 -0000	1.95
@@ -1 +1 @@
-mkinitrd-5.0.25.tar.bz2
+mkinitrd-5.0.26.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mkinitrd.spec	14 Feb 2006 23:17:58 -0000	1.105
+++ mkinitrd.spec	15 Feb 2006 19:58:33 -0000	1.106
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.25
+Version: 5.0.26
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,12 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Wed Feb 15 2006 Peter Jones <pjones at redhat.com> - 5.0.26-1
+- fix detection of floppy devices, don't probe them for labels
+- fix grubby to use the same label scanning code as nash
+- senseless rewriting of makefiles so that grubby can use nash's .o's, uh,
+  "more easily".
+
 * Tue Feb 14 2006 Peter Jones <pjones at redhat.com> - 5.0.25-1
 - rework hotplug control fds (#181515)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- sources	14 Feb 2006 23:17:58 -0000	1.101
+++ sources	15 Feb 2006 19:58:33 -0000	1.102
@@ -1 +1 @@
-f2596fde549856470459b2ebd6964b94  mkinitrd-5.0.25.tar.bz2
+8a2ab27eba7186b08a88adfc85e31569  mkinitrd-5.0.26.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 15 20:29:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 15:29:11 -0500
Subject: rpms/kernel/devel linux-2.6.15-xen-module-fault.patch, NONE,
	1.1 kernel-2.6.spec, 1.1954, 1.1955
Message-ID: <200602152029.k1FKTBeO011698@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11589

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.15-xen-module-fault.patch 
Log Message:
We need to handle spurious page faults in the kernel's module VA range
in order to avoid OOPSing on modular x86_64 SMP builds.



linux-2.6.15-xen-module-fault.patch:
 fault-xen.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.15-xen-module-fault.patch ---
We need to handle spurious page faults in the kernel's module VA range
in order to avoid OOPSing on modular x86_64 SMP builds.

Signed-off-by: Stephen Tweedie <sct at redhat.com>

--- linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c~	2006-02-14 11:12:11.000000000 -0500
+++ linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c	2006-02-15 14:45:53.000000000 -0500
@@ -367,12 +367,14 @@
 	 */
 	if (unlikely(address >= TASK_SIZE64)) {
 		/*
-		 * Don't check for the module range here: its PML4
+		 * Even the module range needs checked here: its PML4
 		 * is always initialized because it's shared with the main
-		 * kernel text. Only vmalloc may need PML4 syncups.
+		 * kernel text, but the writable pagetable code can still
+		 * result in spurious faults.
 		 */
 		if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
-		      ((address >= VMALLOC_START && address < VMALLOC_END))) {
+		    ((address >= VMALLOC_START && address < VMALLOC_END) ||
+		     (address >= MODULES_VADDR && address < MODULES_END))) {
 			if (vmalloc_fault(address) < 0)
 				goto bad_area_nosemaphore;
 			return;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1954
retrieving revision 1.1955
diff -u -r1.1954 -r1.1955
--- kernel-2.6.spec	15 Feb 2006 19:33:23 -0000	1.1954
+++ kernel-2.6.spec	15 Feb 2006 20:29:07 -0000	1.1955
@@ -253,6 +253,7 @@
 Patch707: linux-2.6-xen-acpi.patch
 Patch708: linux-2.6-xen-x86_64-fixes.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
+Patch710: linux-2.6.15-xen-module-fault.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -753,6 +754,7 @@
 %patch707 -p1
 %patch708 -p2
 %patch709 -p1
+%patch710 -p1
 %endif
 
 #
@@ -1571,6 +1573,9 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 Stephen Tweedie <sct at redhat.com>
+- Fix module oopses on x86_64 SMP xen dom0
+
 * Wed Feb 15 2006 John W. Linville <linville at redhat.com>
 - Update to current softmac/bcm43xx code.
 - Set ipw2200 hwcrypto option to 0 to avoid firmware restarts.



From fedora-cvs-commits at redhat.com  Wed Feb 15 21:08:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 16:08:15 -0500
Subject: rpms/gdm/devel gdm-2.13.0.8-malloc-freed-memory.patch, NONE,
	1.1 gdm.spec, 1.131, 1.132
Message-ID: <200602152108.k1FL8ECO003771@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3690

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.13.0.8-malloc-freed-memory.patch 
Log Message:
fix a double free crash


gdm-2.13.0.8-malloc-freed-memory.patch:
 gdmsetup.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gdm-2.13.0.8-malloc-freed-memory.patch ---
--- gdm-2.13.0.8/gui/gdmsetup.c	2006-02-15 14:24:58.000000000 -0500
+++ gdm-2.13.0.8/gui/gdmsetup.c	2006-02-15 14:22:14.000000000 -0500
@@ -3122,7 +3122,7 @@ setup_accessibility_tab (void)
 static char *
 get_theme_dir (void)
 {
-	char *theme_dir = gdm_config_get_string (GDM_KEY_GRAPHICAL_THEME_DIR);
+	char *theme_dir = g_strdup (gdm_config_get_string (GDM_KEY_GRAPHICAL_THEME_DIR));
 
 	if (theme_dir == NULL ||
 	    theme_dir[0] == '\0' ||
@@ -5420,7 +5420,7 @@ background_filechooser_response (GtkWidg
 	 * value to the default in this case seems to work around this.
 	 */
 	if (filename == NULL && !ve_string_empty (value))
-		filename = value;
+		filename = g_strdup (value);
 
 	if (filename != NULL &&
 	   (strcmp (ve_sure_string (value), ve_sure_string (filename)) != 0)) {
@@ -5463,7 +5463,7 @@ logo_filechooser_response (GtkWidget *fi
 	if (filename == NULL) {
 		value    = gdm_config_get_string (GDM_KEY_CHOOSER_BUTTON_LOGO);
 		if (!ve_string_empty (value))
-			filename = value;
+			filename = g_strdup (value);
 	}
 
 	if (gtk_notebook_get_current_page (GTK_NOTEBOOK (setup_notebook)) == LOCAL_TAB) {


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gdm.spec	13 Feb 2006 23:10:26 -0000	1.131
+++ gdm.spec	15 Feb 2006 21:08:12 -0000	1.132
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.8
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -44,6 +44,7 @@
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
 Patch20: gdm-2.13.0.4-add-locale-header.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
+Patch23: gdm-2.13.0.8-malloc-freed-memory.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -116,6 +117,7 @@
 %patch19 -p1 -b .add-gnome-cflags
 %patch20 -p1 -b .add-locale-header
 %patch22 -p1 -b .pam_stack
+%patch23 -p1 -b .malloc-freed-memory
 
 # 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
@@ -304,6 +306,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Wed Feb 15 2006 Ray <rstrode at redhat.com> and Matthias <mclasen at redhat.com> - 1:2.13.0.8-2
+- malloc memory that is later freed
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-1
 - update to 2.13.0.8
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 21:10:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 16:10:32 -0500
Subject: rpms/fedora-release/devel .cvsignore, 1.8, 1.9 fedora-release.spec,
	1.22, 1.23 sources, 1.15, 1.16
Message-ID: <200602152110.k1FLAWp9004810@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4756

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
update to 4.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Jan 2006 19:01:34 -0000	1.8
+++ .cvsignore	15 Feb 2006 21:10:30 -0000	1.9
@@ -2,3 +2,5 @@
 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


Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fedora-release.spec	11 Jan 2006 19:01:34 -0000	1.22
+++ fedora-release.spec	15 Feb 2006 21:10:30 -0000	1.23
@@ -1,4 +1,4 @@
-%define release_version 4.91
+%define release_version 4.92
 %define release_name Pre-FC5
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide
@@ -20,7 +20,6 @@
 BuildRoot: %{_tmppath}/fedora-release-root
 BuildArchitectures: noarch
 BuildRequires: xmlto
-BuildRequires: elinks
 
 %description
 Fedora Core release file
@@ -31,13 +30,11 @@
 %build
 MAINDIR=`pwd`
 pushd release-notes
-links -dump RELEASE-NOTES-en.html > RELEASE-NOTES-en.txt
-links -dump README-en.html > README-en.txt
 cp RELEASE-NOTES-en.txt $MAINDIR/RELEASE-NOTES
 cp README-en.txt $MAINDIR/README
 cp -af README-* $MAINDIR
 cp -af RELEASE-NOTES-* $MAINDIR
-cp -r *.css stylesheet-images ../
+cp -r *.css figs stylesheet-images ../
 popd
 rm -f */*.eps
 make index.html
@@ -61,7 +58,7 @@
 done
 
 mkdir -p -m 755 $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
-cp -ap *.css *.html img css stylesheet-images \
+cp -ap figs *.css *.html img css stylesheet-images \
   $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML
 install -m 644 index.html $RPM_BUILD_ROOT/%{_defaultdocdir}/HTML/index.html
 
@@ -96,7 +93,7 @@
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/sysconfig/rhn/sources
 %config(noreplace) /etc/yum.repos.d/*
-%doc R* stylesheet-images *.css
+%doc R* stylesheet-images figs *.css
 %doc eula.txt GPL autorun-template
 %config %attr(0644,root,root) /etc/issue
 %config %attr(0644,root,root) /etc/issue.net


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Jan 2006 19:01:35 -0000	1.15
+++ sources	15 Feb 2006 21:10:30 -0000	1.16
@@ -1,2 +1,2 @@
-08ea01593d6add2fa4d060ffeb2f23cd  fedora-release-4.91.tar.gz
-083cc450ee4e8e0cc21580118158aa58  fedora-release-notes-4.91.tar.gz
+62553b2c0e51371033f7f3896110b3e1  fedora-release-notes-4.92.tar.gz
+b58af944f6465482c05739ae00570699  fedora-release-4.92.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 15 21:51:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 16:51:27 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.107, 1.108 kudzu.spec, 1.122,
	1.123 sources, 1.121, 1.122
Message-ID: <200602152151.k1FLpRGj032652@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32637

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- .cvsignore	14 Feb 2006 18:41:36 -0000	1.107
+++ .cvsignore	15 Feb 2006 21:51:24 -0000	1.108
@@ -1 +1 @@
-kudzu-1.2.29.tar.gz
+kudzu-1.2.30.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kudzu.spec	14 Feb 2006 18:41:36 -0000	1.122
+++ kudzu.spec	15 Feb 2006 21:51:25 -0000	1.123
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.29
+Version: 1.2.30
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,10 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Feb 15 2006 Bill Nottingham <notting at redhat.com> - 1.2.30-1
+- revert changes for video probing classes - some correct devices are
+  0380
+
 * Tue Feb 14 2006 Bill Nottingham <notting at redhat.com> - 1.2.29-1
 - silence!
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- sources	14 Feb 2006 18:41:36 -0000	1.121
+++ sources	15 Feb 2006 21:51:25 -0000	1.122
@@ -1 +1 @@
-4253c8846b4f07dc508ed4d2c3ff2c83  kudzu-1.2.29.tar.gz
+b27c980a664a0cb85ad725bc7408994e  kudzu-1.2.30.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 15 21:53:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 16:53:27 -0500
Subject: rpms/rhpxl/devel .cvsignore, 1.17, 1.18 rhpxl.spec, 1.19,
	1.20 sources, 1.19, 1.20
Message-ID: <200602152153.k1FLrRaL032739@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32724

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Feb 2006 17:13:24 -0000	1.17
+++ .cvsignore	15 Feb 2006 21:53:25 -0000	1.18
@@ -1,5 +1 @@
-rhpxl-0.10.tar.gz
-rhpxl-0.11.tar.gz
-rhpxl-0.12.tar.gz
-rhpxl-0.13.tar.gz
-rhpxl-0.14.tar.gz
+rhpxl-0.15.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rhpxl.spec	8 Feb 2006 17:13:24 -0000	1.19
+++ rhpxl.spec	15 Feb 2006 21:53:25 -0000	1.20
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.14
+Version: 0.15
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Feb 15 2006 Bill Nottingham <notting at redhat.com> 0.15-1
+- order non-vesa videocards before vesa (#176978)
+
 * Wed Feb 08 2006 Chris Lumens <clumens at redhat.com> 0.14-1
 - Remove modes data since this is now in the X server package.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	8 Feb 2006 17:13:24 -0000	1.19
+++ sources	15 Feb 2006 21:53:25 -0000	1.20
@@ -1 +1 @@
-d1d567541b573e7c8395235933055397  rhpxl-0.14.tar.gz
+d363a87c242cd4160017e4ab6fbb0210  rhpxl-0.15.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 15 22:15:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 17:15:28 -0500
Subject: rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.3,
	1.4 libbonobo.spec, 1.34, 1.35
Message-ID: <200602152215.k1FMFSSL015025@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/libbonobo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14940

Modified Files:
	libbonobo-2.13.1-multishlib.patch libbonobo.spec 
Log Message:
- yet another iteration of the shlib patch


libbonobo-2.13.1-multishlib.patch:
 Makefile.am |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

Index: libbonobo-2.13.1-multishlib.patch
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo-2.13.1-multishlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libbonobo-2.13.1-multishlib.patch	26 Jan 2006 20:37:20 -0000	1.3
+++ libbonobo-2.13.1-multishlib.patch	15 Feb 2006 22:15:25 -0000	1.4
@@ -1,57 +1,14 @@
---- libbonobo-2.13.1/configure.in.multishlib	2006-01-16 13:58:48.000000000 -0500
-+++ libbonobo-2.13.1/configure.in	2006-01-26 14:40:41.000000000 -0500
-@@ -233,6 +233,40 @@
- AC_SUBST(IF_BSD_PS)
- AC_SUBST(IF_POSIX_PS)
- 
-+multilib_server_files="no"
-+AC_MSG_CHECKING(for multi-arch bonobo server paths)
-+
-+# hack stolen from dbus to expand libdir out
-+if test "x$prefix" = "xNONE"; then
-+  deduced_prefix=$ac_default_prefix
-+else
-+  deduced_prefix=$prefix
-+fi
-+
-+old_prefix=$prefix
-+prefix=$deduced_prefix
-+
-+if test "x$exec_prefix" = xNONE ; then
-+   deduced_exec_prefix=$deduced_prefix
-+else
-+   deduced_exec_prefix=$exec_prefix
-+fi
-+old_exec_prefix=$exec_prefix
-+exec_prefix=$deduced_exec_prefix
-+expanded_libdir=`eval echo $libdir`
-+prefix=$old_prefix
-+
-+if test "${exec_prefix}/lib" != "${expanded_libdir}"; then
-+    multilib_server_files="yes"
-+    AC_MSG_RESULT(yes)
-+else
-+    multilib_server_files="no"
-+    AC_MSG_RESULT(no)
-+fi
-+exec_prefix=$old_exec_prefix
-+
-+AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "${multilib_server_files}" = "yes")
-+
- AC_OUTPUT([
- Makefile
- libbonobo-zip
 --- libbonobo-2.13.1/activation-server/Makefile.am.multishlib	2005-07-04 18:05:49.000000000 -0400
 +++ libbonobo-2.13.1/activation-server/Makefile.am	2006-01-26 14:39:22.000000000 -0500
 @@ -6,13 +6,20 @@
  libexec_PROGRAMS=bonobo-activation-server
  noinst_PROGRAMS=test-performance
  
-+serverinfolibdir = $(libdir)/bonobo/servers
++serverinfolibdir = $(libdir)/bonobo/servers:$(exec_prefix)/lib/bonobo/servers
++
++
++
 +
-+if MULTILIB_SERVER_FILES
-+	serverinfolibdir := $(exec_prefix)/lib/bonobo/servers
-+endif
 +
 +
  INCLUDES=					\


Index: libbonobo.spec
===================================================================
RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libbonobo.spec	11 Feb 2006 03:52:45 -0000	1.34
+++ libbonobo.spec	15 Feb 2006 22:15:25 -0000	1.35
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.13.1
-Release: 8.2
+Release: 9
 URL: http://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -47,7 +47,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+
+%ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib
+%endif
 
 %build
 intltoolize -f
@@ -113,6 +116,9 @@
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Wed Feb 15 2006 Ray Strode <rstrode at redhat.com> 2.13.1-9
+- yet another iteration of the shlib patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.1-8.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 22:18:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 17:18:26 -0500
Subject: rpms/kdebase/devel kdebase-3.5.1-kdm-readme.patch, NONE,
	1.1 kdebase.spec, 1.153, 1.154
Message-ID: <200602152218.k1FMIQfv028353@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28287

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-kdm-readme.patch 
Log Message:
don't include unnecessary README #169331


kdebase-3.5.1-kdm-readme.patch:
 Makefile.am            |    3 ---
 kfrontend/genkdmconf.c |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE kdebase-3.5.1-kdm-readme.patch ---
--- kdebase-3.5.1/kdm/kfrontend/genkdmconf.c.tn	2006-02-15 22:57:04.000000000 +0100
+++ kdebase-3.5.1/kdm/kfrontend/genkdmconf.c	2006-02-15 23:05:31.000000000 +0100
@@ -2845,7 +2845,7 @@
 	f = Create( newkdmrc, kdmrcmode );
 	wrconf( f );
 	fclose( f );
-
+#if 0
 	ASPrintf( &nname, "%s/README", newdir );
 	f = Create( nname, 0644 );
 	fprintf( f,
@@ -2894,6 +2894,6 @@
 "\nTry 'genkdmconf --help' if you want to generate another configuration.\n"
 "\nYou may delete this README.\n" );
 	fclose( f );
-
+#endif
 	return 0;
 }
--- kdebase-3.5.1/kdm/Makefile.am.tn	2006-02-15 22:56:02.000000000 +0100
+++ kdebase-3.5.1/kdm/Makefile.am	2006-02-15 22:55:56.000000000 +0100
@@ -4,9 +4,6 @@
 
 noinst_DATA=config.ci
 
-kdmdocdir = $(datadir)/doc/kdm
-kdmdoc_DATA = README
-
 install-data-local:
 	- at test -n "$(DESTDIR)" || test -z "$(PAM)" || { $(top_srcdir)/mkpamserv $(PAM) && $(top_srcdir)/mkpamserv -P $(PAM)-np; }
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- kdebase.spec	15 Feb 2006 19:21:16 -0000	1.153
+++ kdebase.spec	15 Feb 2006 22:18:23 -0000	1.154
@@ -49,6 +49,7 @@
 Patch10: kdebase-3.4.2-kdesktop-konsole.patch
 Patch11: kdebase-3.4.0-xdg.patch
 Patch12: kdebase-3.5.1-dbus.patch
+Patch13: kdebase-3.5.1-kdm-readme.patch
 
 # upstream patches
 Patch100: kdebase-3.5.1-keyboardlayout.patch
@@ -133,6 +134,7 @@
 %patch10 -p1 -b .kdestop-konsole
 %patch11 -p1 -b .xdg
 %patch12 -p1 -b .dbus
+%patch13 -p1 -b .kdm-readme
 
 # upstream patches
 %patch100 -p1 -b .keyboardlayout
@@ -364,7 +366,6 @@
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
-%doc %{_docdir}/kdm
 %config(noreplace) /etc/ksysguarddrc
 /etc/kde
 %dir /etc/skel/.kde
@@ -429,7 +430,8 @@
 - apply patch to launch kde scripts in shutdown,env directories #178326
 - kdm.log logrotate-enabled #178328
 - add konqueror webshortcuts for fedora project #178366
-
+- don't include unnecessary README #169331
+ 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 22:22:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 17:22:03 -0500
Subject: rpms/lsof/devel lsof_4.72-rh-eventpoll.patch,1.1,1.2
Message-ID: <200602152222.k1FMM3EL029987@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29957

Modified Files:
	lsof_4.72-rh-eventpoll.patch 
Log Message:
improve eventpoll patch by upstream devel version

lsof_4.72-rh-eventpoll.patch:
 dnode.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Index: lsof_4.72-rh-eventpoll.patch
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof_4.72-rh-eventpoll.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lsof_4.72-rh-eventpoll.patch	15 Feb 2006 16:03:02 -0000	1.1
+++ lsof_4.72-rh-eventpoll.patch	15 Feb 2006 22:22:01 -0000	1.2
@@ -1,6 +1,6 @@
---- lsof_4.72-rh/dialects/linux/dnode.c.eventpoll	2006-02-15 16:22:33.000000000 +0100
-+++ lsof_4.72-rh/dialects/linux/dnode.c	2006-02-15 16:22:13.000000000 +0100
-@@ -449,13 +449,22 @@
+--- lsof_4.76-rh/dialects/linux/dnode.c.eventpoll	2005-08-29 12:23:38.000000000 +0200
++++ lsof_4.76-rh/dialects/linux/dnode.c	2006-02-15 22:45:36.000000000 +0100
+@@ -467,12 +467,8 @@
  		tn = "LINK";
  		break;
  	    default:
@@ -10,23 +10,8 @@
 -		else
 -		    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
 -		(void) snpf(Namech, Namechl, "unknown inode type");
--		tn = (char *)NULL;
-+		/* eventpoll hack */
-+		if (p && strncmp(p, "eventpoll", 9)==0)
-+		{
-+			tn = "epoll";
-+			(void) snpf(Namech, Namechl, "%s", "eventpoll");
-+		}
-+		else 
-+		{
-+			if (type > 9999)
-+		    		(void) snpf(Lf->type, sizeof(Lf->type), "*%03d",
-+					type % 1000);
-+			else
-+			    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
-+			(void) snpf(Namech, Namechl, "unknown inode type");
-+			tn = (char *)NULL;
-+		}
++		(void) snpf(Lf->type, sizeof(Lf->type), "%04o",
++		    ((type >> 12) & 0xf));
+ 		tn = (char *)NULL;
  	    }
  	} else
- 	    tn = "unknown";



From fedora-cvs-commits at redhat.com  Wed Feb 15 22:24:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 17:24:36 -0500
Subject: rpms/lftp/devel lftp-3.4.2-fix-redirect-coredump.patch,NONE,1.1
Message-ID: <200602152224.k1FMOajH031183@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30902

Added Files:
	lftp-3.4.2-fix-redirect-coredump.patch 
Log Message:
fix bug 181694


lftp-3.4.2-fix-redirect-coredump.patch:
 Http.cc |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE lftp-3.4.2-fix-redirect-coredump.patch ---
--- lftp-3.4.2/src/Http.cc.redirect_coredump	2006-02-06 05:57:25.000000000 -0500
+++ lftp-3.4.2/src/Http.cc	2006-02-15 16:19:23.000000000 -0500
@@ -1525,6 +1525,15 @@
       }
       if(mode==CHANGE_DIR)
       {
+	 if( new_cwd == 0L )
+	 {
+	     char *new_location = xstrdup(GetConnectURL());
+	     xfree(location);
+	     location=new_location;	     
+	     SetError(FILE_MOVED);
+	     state= DONE;
+	     return MOVED;
+	 }
 	 cwd.Set(new_cwd);
 	 state=DONE;
 	 return MOVED;



From fedora-cvs-commits at redhat.com  Wed Feb 15 22:29:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 17:29:44 -0500
Subject: rpms/lftp/devel lftp.spec,1.40,1.41
Message-ID: <200602152229.k1FMTiED000804@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv778

Modified Files:
	lftp.spec 
Log Message:
fix bug 181694: segfault on redirection to non-existent location


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- lftp.spec	11 Feb 2006 03:51:36 -0000	1.40
+++ lftp.spec	15 Feb 2006 22:29:33 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.2
-Release: 	1.1
+Release: 	2
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -11,6 +11,7 @@
 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
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -24,6 +25,7 @@
 #^- now fixed upstream
 #%patch2 -p1 -b .dont_core
 #^- now fixed upstream
+%patch181694 -p1 -b .bz181694
 
 %build
 if pkg-config openssl ; then
@@ -71,6 +73,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Wed Feb 15 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.2-2
+- fix bug 181694: segfault on redirection to non-existent location
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.4.2-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:11:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:11:40 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.126,1.127
Message-ID: <200602152311.k1FNBeJM026057@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26030

Modified Files:
	gnbd-kernel.spec 
Log Message:
Build for xen.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- gnbd-kernel.spec	14 Feb 2006 17:37:52 -0000	1.126
+++ gnbd-kernel.spec	15 Feb 2006 23:11:36 -0000	1.127
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1948_FC5
 %define subversion 2
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:12:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:12:02 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.137,1.138
Message-ID: <200602152312.k1FNC2N0026151@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26116

Modified Files:
	cman-kernel.spec 
Log Message:
Build for xen.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- cman-kernel.spec	14 Feb 2006 17:21:42 -0000	1.137
+++ cman-kernel.spec	15 Feb 2006 23:11:59 -0000	1.138
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1948_FC5
 %define subversion 20051219.162641.FC5
  



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:12:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:12:09 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.111,1.112
Message-ID: <200602152312.k1FNC9eU026225@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26187

Modified Files:
	dlm-kernel.spec 
Log Message:
Build for xen.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- dlm-kernel.spec	14 Feb 2006 17:22:04 -0000	1.111
+++ dlm-kernel.spec	15 Feb 2006 23:12:07 -0000	1.112
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1948_FC5
 %define subversion 20051219.162641.FC5
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:12:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:12:16 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.132,1.133
Message-ID: <200602152312.k1FNCG19026286@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26257

Modified Files:
	GFS-kernel.spec 
Log Message:
Build for xen.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- GFS-kernel.spec	14 Feb 2006 17:24:38 -0000	1.132
+++ GFS-kernel.spec	15 Feb 2006 23:12:13 -0000	1.133
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1948_FC5
 %define subversion 2
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:12:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:12:39 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.138,1.139
Message-ID: <200602152312.k1FNCdAZ026467@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26435

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- cman-kernel.spec	15 Feb 2006 23:11:59 -0000	1.138
+++ cman-kernel.spec	15 Feb 2006 23:12:37 -0000	1.139
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.1948_FC5
+%define kernel_version 2.6.15-1.1955_FC5
 %define subversion 20051219.162641.FC5
  
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.5
+Release: 20051219.162641.FC5.11.6
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:12:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:12:52 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.127,1.128
Message-ID: <200602152312.k1FNCq6J026604@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26574

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gnbd-kernel.spec	15 Feb 2006 23:11:36 -0000	1.127
+++ gnbd-kernel.spec	15 Feb 2006 23:12:50 -0000	1.128
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.1948_FC5
+%define kernel_version 2.6.15-1.1955_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.1
+Release: 5.FC5.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  Wed Feb 15 23:13:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:13:08 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.112,1.113
Message-ID: <200602152313.k1FND8Ml026749@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26731

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- dlm-kernel.spec	15 Feb 2006 23:12:07 -0000	1.112
+++ dlm-kernel.spec	15 Feb 2006 23:13:05 -0000	1.113
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.1948_FC5
+%define kernel_version 2.6.15-1.1955_FC5
 %define subversion 20051219.162641.FC5
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.4
+Release: 20051219.162641.FC5.9.5
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:13:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:13:32 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.133,1.134
Message-ID: <200602152313.k1FNDWY9026914@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26877

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- GFS-kernel.spec	15 Feb 2006 23:12:13 -0000	1.133
+++ GFS-kernel.spec	15 Feb 2006 23:13:24 -0000	1.134
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 1
-%define kernel_version 2.6.15-1.1948_FC5
+%define kernel_version 2.6.15-1.1955_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 5.FC5.0
+Release: 5.FC5.1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:20:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:20:34 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.128,1.129
Message-ID: <200602152320.k1FNKYPW009758@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9727

Modified Files:
	gnbd-kernel.spec 
Log Message:
Fixed support for xen.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- gnbd-kernel.spec	15 Feb 2006 23:12:50 -0000	1.128
+++ gnbd-kernel.spec	15 Feb 2006 23:20:30 -0000	1.129
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.2
+Release: 5.FC5.3
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -33,8 +33,8 @@
 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}
+BuildRequires: kernel-xen-guest-devel = %{kernel_version}
+BuildRequires: kernel-xen-hypervisor-devel = %{kernel_version}
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: kernel = %{kernel_version}
@@ -70,27 +70,27 @@
 %endif
 
 %if %{buildxen}
-%package -n gnbd-kernel-xenU
+%package -n gnbd-kernel-xen-guest
 Group: System Environment/Kernel
-Summary: gnbd-kernel-xenU - The kernel module for GFS's Network Block Device
-Requires: kernel-xenU = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}xenU
+Summary: gnbd-kernel-xen-guest - The kernel module for GFS's Network Block Device
+Requires: kernel-xen-guest = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}guest
 Provides: gnbd-kernel-modules = %{version}-%{release}
 Provides: kernel-modules
 
-%description -n gnbd-kernel-xenU
-gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
+%description -n gnbd-kernel-xen-guest
+gnbd-kernel-xen-guest - The xen-guest kernel module for GFS's Network Block Device
 
-%package -n gnbd-kernel-xen0
+%package -n gnbd-kernel-xen-hypervisor
 Group: System Environment/Kernel
-Summary: gnbd-kernel-xen0 - The kernel module for GFS's Network Block Device
-Requires: kernel-xen0 = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}xen0
+Summary: gnbd-kernel-xen-hypservisor - The kernel module for GFS's Network Block Device
+Requires: kernel-xen-hypservisor = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}hypervisor
 Provides: kernel-modules
 Provides: gnbd-kernel-modules = %{version}-%{release}
 
-%description -n gnbd-kernel-xen0
-gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
+%description -n gnbd-kernel-xen-hypervisor
+gnbd-kernel-xen-hypervisor - The xen-hypervisor kernel module for GFS's Network Block Device
 
 %endif
 ################################################################################
@@ -186,10 +186,10 @@
 %endif
 
 %if %{buildxen}
-%post xenU
-/sbin/depmod -e %{kernel_version}xenU
-%post xen0
-/sbin/depmod -a %{kernel_version}xen0
+%post xen-guest
+/sbin/depmod -e %{kernel_version}guest
+%post xen-hypervisor
+/sbin/depmod -a %{kernel_version}hypervisor
 %endif
 
 %files
@@ -203,13 +203,13 @@
 %endif
 
 %if %{buildxen}
-%files -n gnbd-kernel-xenU
+%files -n gnbd-kernel-xen-guest
 %defattr(-,root,root,-)
-/lib/modules/%{kernel_version}xenU/kernel/drivers/block/gnbd/gnbd.ko
+/lib/modules/%{kernel_version}guest/kernel/drivers/block/gnbd/gnbd.ko
 
-%files -n gnbd-kernel-xen0
+%files -n gnbd-kernel-xen-hypervisor
 %defattr(-,root,root,-)
-/lib/modules/%{kernel_version}xen0/kernel/drivers/block/gnbd/gnbd.ko
+/lib/modules/%{kernel_version}hypervisor/kernel/drivers/block/gnbd/gnbd.ko
 %endif
 
 %files -n gnbd-kernheaders



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:24:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:24:17 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.129,1.130
Message-ID: <200602152324.k1FNOHfk011193@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11157

Modified Files:
	gnbd-kernel.spec 
Log Message:
Fixed more xen issues.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- gnbd-kernel.spec	15 Feb 2006 23:20:30 -0000	1.129
+++ gnbd-kernel.spec	15 Feb 2006 23:24:14 -0000	1.130
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.3
+Release: 5.FC5.4
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -106,8 +106,8 @@
 BUILD_TOPDIR=`pwd`
 
 cp -r `pwd` ../smp
-cp -r `pwd` ../xenU
-cp -r `pwd` ../xen0
+cp -r `pwd` ../xen-guest
+cp -r `pwd` ../xen-hypervisor
 
 Build_gnbd(){
 	cpu_type=$1
@@ -124,7 +124,7 @@
 		exit 1
 	fi
         ./configure --kernel_src=$kernel_src --incdir=%{_includedir}
-        if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then
+        if [ "$flavor" == "xen-guest" -o "$flavor" == "xen-hypervisor" ]; then
                 make ARCH=xen %{?_smp_mflags}
         else
                 make %{?_smp_mflags}
@@ -141,11 +141,11 @@
 %endif
 
 %if %{buildxen}
-cd ../xenU
-Build_gnbd %{_target_cpu} xenU
+cd ../xen-guest
+Build_gnbd %{_target_cpu} xen-guest
 
-cd ../xen0
-Build_gnbd %{_target_cpu} xen0
+cd ../xen-hypervisor
+Build_gnbd %{_target_cpu} xen-hypervisor
 %endif
 
 ################################################################################
@@ -164,9 +164,9 @@
 %endif
 
 %if %{buildxen}
-cd ../xenU
+cd ../xen-guest
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
-cd ../xen0
+cd ../xen-hypervisor
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
 %endif
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:25:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:25:10 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.130,1.131
Message-ID: <200602152325.k1FNPApA011570@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11540

Modified Files:
	gnbd-kernel.spec 
Log Message:
Fixed more xen issues.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnbd-kernel.spec	15 Feb 2006 23:24:14 -0000	1.130
+++ gnbd-kernel.spec	15 Feb 2006 23:25:08 -0000	1.131
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.4
+Release: 5.FC5.5
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -106,8 +106,8 @@
 BUILD_TOPDIR=`pwd`
 
 cp -r `pwd` ../smp
-cp -r `pwd` ../xen-guest
-cp -r `pwd` ../xen-hypervisor
+cp -r `pwd` ../guest
+cp -r `pwd` ../hypervisor
 
 Build_gnbd(){
 	cpu_type=$1
@@ -141,11 +141,11 @@
 %endif
 
 %if %{buildxen}
-cd ../xen-guest
-Build_gnbd %{_target_cpu} xen-guest
+cd ../guest
+Build_gnbd %{_target_cpu} guest
 
-cd ../xen-hypervisor
-Build_gnbd %{_target_cpu} xen-hypervisor
+cd ../hypervisor
+Build_gnbd %{_target_cpu} hypervisor
 %endif
 
 ################################################################################
@@ -164,9 +164,9 @@
 %endif
 
 %if %{buildxen}
-cd ../xen-guest
+cd ../guest
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
-cd ../xen-hypervisor
+cd ../hypervisor
 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
 %endif
 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:29:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:29:33 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.131,1.132
Message-ID: <200602152329.k1FNTXO8013241@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13208

Modified Files:
	gnbd-kernel.spec 
Log Message:
Fixed more xen issues.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnbd-kernel.spec	15 Feb 2006 23:25:08 -0000	1.131
+++ gnbd-kernel.spec	15 Feb 2006 23:29:30 -0000	1.132
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.5
+Release: 5.FC5.6
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
@@ -33,8 +33,8 @@
 BuildRequires: kernel-smp = %{kernel_version}
 BuildRequires: kernel-devel = %{kernel_version}
 BuildRequires: kernel-smp-devel = %{kernel_version}
-BuildRequires: kernel-xen-guest-devel = %{kernel_version}
-BuildRequires: kernel-xen-hypervisor-devel = %{kernel_version}
+BuildRequires: kernel-xen-guest = %{kernel_version}
+BuildRequires: kernel-xen-hypervisor = %{kernel_version}
 Conflicts: GFS <= 6.0
 Conflicts: GFS-modules
 Requires: kernel = %{kernel_version}



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:33:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:33:35 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.132,1.133
Message-ID: <200602152333.k1FNXZcV013944@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13926

Modified Files:
	gnbd-kernel.spec 
Log Message:
Disable xen for now.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gnbd-kernel.spec	15 Feb 2006 23:29:30 -0000	1.132
+++ gnbd-kernel.spec	15 Feb 2006 23:33:30 -0000	1.133
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
 %define subversion 2
 
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.6
+Release: 5.FC5.7
 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 Feb 15 23:33:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:33:58 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.139,1.140
Message-ID: <200602152333.k1FNXwwE014016@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13992

Modified Files:
	cman-kernel.spec 
Log Message:
Disable xen for now.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- cman-kernel.spec	15 Feb 2006 23:12:37 -0000	1.139
+++ cman-kernel.spec	15 Feb 2006 23:33:55 -0000	1.140
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
 %define subversion 20051219.162641.FC5
  
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.6
+Release: 20051219.162641.FC5.11.7
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:34:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:34:54 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.113,1.114
Message-ID: <200602152334.k1FNYsiS014203@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14174

Modified Files:
	dlm-kernel.spec 
Log Message:
Disable xen for now.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- dlm-kernel.spec	15 Feb 2006 23:13:05 -0000	1.113
+++ dlm-kernel.spec	15 Feb 2006 23:34:48 -0000	1.114
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
 %define subversion 20051219.162641.FC5
 
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.5
+Release: 20051219.162641.FC5.9.6
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:36:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:36:04 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.134,1.135
Message-ID: <200602152336.k1FNa4DL014449@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14421

Modified Files:
	GFS-kernel.spec 
Log Message:
Disable xen for now.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- GFS-kernel.spec	15 Feb 2006 23:13:24 -0000	1.134
+++ GFS-kernel.spec	15 Feb 2006 23:35:58 -0000	1.135
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
 %define subversion 2
 
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 5.FC5.1
+Release: 5.FC5.2
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:50:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:50:33 -0500
Subject: rpms/vixie-cron/devel vixie-cron.spec,1.67,1.68
Message-ID: <200602152350.k1FNoXFa022570@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22546

Modified Files:
	vixie-cron.spec 
Log Message:
fix bug 181702


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vixie-cron.spec	14 Feb 2006 21:02:14 -0000	1.67
+++ vixie-cron.spec	15 Feb 2006 23:50:19 -0000	1.68
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 52.FC5
+Release: 54.FC5
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -79,10 +79,11 @@
 %endif
 %if %{WITH_PAM}
 Requires: pam >= 0.77-66.8
-Buildrequires: pam-devel
+Buildrequires: pam-devel >= 0.77-66.8
 %endif
 %if %{WITH_AUDIT}
-Requires: audit >= 1.0.3
+Requires: audit-libs >= 1.0.3
+Buildrequires: audit-libs >= 1.0.3
 %endif
 
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
@@ -223,6 +224,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Wed Feb 15 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-54.FC5
+- fix bug 181702: Requires:audit-libs, not Requires:audit
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 4:4.1-52.FC5
 - fix bug 181439: enable easier selection of optional 'WITH_*'
   compilation features



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:51:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:51:39 -0500
Subject: rpms/kernel/devel linux-2.6.14-usb-techscan.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.1955, 1.1955.2.1
Message-ID: <200602152351.k1FNpd8D022699@cvs.devel.redhat.com>

Author: zaitcev

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22633

Modified Files:
      Tag: private-zaitcev-bz167520
	kernel-2.6.spec 
Added Files:
      Tag: private-zaitcev-bz167520
	linux-2.6.14-usb-techscan.patch 
Log Message:
Test for bz167520


linux-2.6.14-usb-techscan.patch:
 hid-core.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6.14-usb-techscan.patch ---
diff -urp -X dontdiff linux-2.6.14/drivers/usb/input/hid-core.c linux-2.6.14-lem/drivers/usb/input/hid-core.c
--- linux-2.6.14/drivers/usb/input/hid-core.c	2005-10-28 19:12:01.000000000 -0700
+++ linux-2.6.14-lem/drivers/usb/input/hid-core.c	2005-12-19 22:35:00.000000000 -0800
@@ -1378,6 +1378,7 @@ void hid_init_reports(struct hid_device 
 #define USB_DEVICE_ID_CYPRESS_MOUSE	0x0001
 #define USB_DEVICE_ID_CYPRESS_HIDCOM	0x5500
 #define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE	0x7417
+#define USB_DEVICE_ID_TECHSCAN_KOREA	0x0100
 
 #define USB_VENDOR_ID_BERKSHIRE		0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD	0x1140
@@ -1554,6 +1555,7 @@ static struct hid_blacklist {
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
 	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
 	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE, HID_QUIRK_2WHEEL_MOUSE_HACK_5 },
+	{ USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_TECHSCAN_KOREA, HID_QUIRK_NOGET },
 
 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_GAMEPAD, HID_QUIRK_BADPAD },
 	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1955
retrieving revision 1.1955.2.1
diff -u -r1.1955 -r1.1955.2.1
--- kernel-2.6.spec	15 Feb 2006 20:29:07 -0000	1.1955
+++ kernel-2.6.spec	15 Feb 2006 23:51:35 -0000	1.1955.2.1
@@ -23,7 +23,8 @@
 %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%{rhbsys}
+%define release 1.1955_FC5.bz167520.1
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -160,7 +161,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86}
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -359,6 +361,7 @@
 Patch1730: linux-2.6-ide-cd-shutup.patch
 Patch1740: linux-2.6-block-reduce-stack.patch
 Patch1750: linux-2.6-ub.patch
+Patch1751: linux-2.6.14-usb-techscan.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
 Patch1780: linux-2.6-firmware-loader-timeout.patch
@@ -921,6 +924,8 @@
 #%patch1740 -p1
 # Enable USB storage,UB & libusual magick.
 #%patch1750 -p1
+# Test for bz167520
+%patch1751 -p1
 # Enable SATA ATAPI by default.
 %patch1760 -p1
 # 



From fedora-cvs-commits at redhat.com  Wed Feb 15 23:54:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 18:54:19 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1955.2.1,1.1955.2.2
Message-ID: <200602152354.k1FNsJ66023013@cvs.devel.redhat.com>

Author: zaitcev

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22990

Modified Files:
      Tag: private-zaitcev-bz167520
	kernel-2.6.spec 
Log Message:
Ran make tag before commit by mistake, have to bump.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1955.2.1
retrieving revision 1.1955.2.2
diff -u -r1.1955.2.1 -r1.1955.2.2
--- kernel-2.6.spec	15 Feb 2006 23:51:35 -0000	1.1955.2.1
+++ kernel-2.6.spec	15 Feb 2006 23:54:17 -0000	1.1955.2.2
@@ -24,7 +24,7 @@
 %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 1.1955_FC5.bz167520.1
+%define release 1.1955_FC5.bz167520.2
 %define signmodules 0
 %define make_target bzImage
 %define kernel_image x86
@@ -1578,6 +1578,9 @@
 %endif
 
 %changelog
+* Wed Feb 15 2006 Pete Zaitcev <zaitcev at redhat.com>
+- Test build for bz#167520 (on a branch)
+
 * Wed Feb 15 2006 Stephen Tweedie <sct at redhat.com>
 - Fix module oopses on x86_64 SMP xen dom0
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 00:05:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 19:05:51 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.114,1.115
Message-ID: <200602160005.k1G05pa7023330@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23317

Modified Files:
	dlm-kernel.spec 
Log Message:
Bumped rev.


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- dlm-kernel.spec	15 Feb 2006 23:34:48 -0000	1.114
+++ dlm-kernel.spec	16 Feb 2006 00:05:49 -0000	1.115
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.6
+Release: 20051219.162641.FC5.9.7
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Thu Feb 16 00:19:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 19:19:35 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.135,1.136
Message-ID: <200602160019.k1G0JZs7003631@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3618

Modified Files:
	GFS-kernel.spec 
Log Message:
Bumped rev.


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- GFS-kernel.spec	15 Feb 2006 23:35:58 -0000	1.135
+++ GFS-kernel.spec	16 Feb 2006 00:19:32 -0000	1.136
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 5.FC5.2
+Release: 5.FC5.4
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Thu Feb 16 03:32:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 22:32:42 -0500
Subject: rpms/eog/devel eog-2.13.91-spew.patch,NONE,1.1 eog.spec,1.41,1.42
Message-ID: <200602160332.k1G3Wgtf015535@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15503

Modified Files:
	eog.spec 
Added Files:
	eog-2.13.91-spew.patch 
Log Message:
stop spew


eog-2.13.91-spew.patch:
 eog-job.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eog-2.13.91-spew.patch ---
--- eog-2.13.91/libeog/eog-job.c.spew	2006-02-15 22:28:21.000000000 -0500
+++ eog-2.13.91/libeog/eog-job.c	2006-02-15 22:28:26.000000000 -0500
@@ -7,7 +7,7 @@
 #include "eog-job.h"
 
 static guint last_job_id = 0;
-#define DEBUG_EOG_JOB 1
+#define DEBUG_EOG_JOB 0
 
 enum {
 	PROP_0,


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- eog.spec	15 Feb 2006 06:35:37 -0000	1.41
+++ eog.spec	16 Feb 2006 03:32:24 -0000	1.42
@@ -13,7 +13,7 @@
 Summary: Eye of GNOME image viewer
 Name:    eog
 Version: 2.13.91
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -39,12 +39,16 @@
 # Needed for gconftool
 Prereq: GConf2
 
+Patch0: eog-2.13.91-spew.patch
+
 %description
 
 Eye of GNOME (EOG) is an image viewer component used by Nautilus.
 
 %prep
 %setup -q
+%patch0 -p1 -b .spew
+
 echo "NoDisplay=true" >> eog.desktop.in.in
 
 %build
@@ -97,6 +101,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
+- silence excessive debug output
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 03:38:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 22:38:14 -0500
Subject: rpms/eog/devel eog-2.13.91-spew.patch,1.1,1.2 eog.spec,1.42,1.43
Message-ID: <200602160338.k1G3cEhb017184@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17112

Modified Files:
	eog-2.13.91-spew.patch eog.spec 
Log Message:
more silencing


eog-2.13.91-spew.patch:
 libeog/eog-job-manager.c |    2 +-
 libeog/eog-job.c         |    2 +-
 shell/eog-window.c       |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Index: eog-2.13.91-spew.patch
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog-2.13.91-spew.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eog-2.13.91-spew.patch	16 Feb 2006 03:32:24 -0000	1.1
+++ eog-2.13.91-spew.patch	16 Feb 2006 03:38:09 -0000	1.2
@@ -1,3 +1,16 @@
+--- eog-2.13.91/shell/eog-window.c.spew	2006-02-15 22:36:43.000000000 -0500
++++ eog-2.13.91/shell/eog-window.c	2006-02-15 22:37:31.000000000 -0500
+@@ -96,8 +96,8 @@
+ #define EOG_STOCK_FLIP_HORIZONTAL "eog-stock-flip-horizontal"
+ #define EOG_STOCK_FLIP_VERTICAL   "eog-stock-flip-vertical"
+ 
+-#define DEBUG
+-#define SAVE_DEBUG
++#undef DEBUG
++#undef SAVE_DEBUG
+ 
+ /* Private part of the Window structure */
+ struct _EogWindowPrivate {
 --- eog-2.13.91/libeog/eog-job.c.spew	2006-02-15 22:28:21.000000000 -0500
 +++ eog-2.13.91/libeog/eog-job.c	2006-02-15 22:28:26.000000000 -0500
 @@ -7,7 +7,7 @@
@@ -9,3 +22,14 @@
  
  enum {
  	PROP_0,
+--- eog-2.13.91/libeog/eog-job-manager.c.spew	2006-02-15 22:36:10.000000000 -0500
++++ eog-2.13.91/libeog/eog-job-manager.c	2006-02-15 22:36:17.000000000 -0500
+@@ -10,7 +10,7 @@
+ } ThreadData;
+ 
+ #define MAX_THREADS  2
+-#define DEBUG_JOB_MANAGER 1
++#define DEBUG_JOB_MANAGER 0
+ GMutex        *mutex       = NULL;
+ static GCond  *cond        = NULL;
+ static GQueue *job_list    = NULL;


Index: eog.spec
===================================================================
RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- eog.spec	16 Feb 2006 03:32:24 -0000	1.42
+++ eog.spec	16 Feb 2006 03:38:09 -0000	1.43
@@ -39,6 +39,7 @@
 # Needed for gconftool
 Prereq: GConf2
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=331362
 Patch0: eog-2.13.91-spew.patch
 
 %description



From fedora-cvs-commits at redhat.com  Thu Feb 16 03:44:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 15 Feb 2006 22:44:56 -0500
Subject: rpms/GConf/devel GConf.spec,1.13,1.14
Message-ID: <200602160344.k1G3iuj2020223@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20081

Modified Files:
	GConf.spec 
Log Message:
remove some harmless (?) spew



Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GConf.spec	13 Feb 2006 18:39:38 -0000	1.13
+++ GConf.spec	16 Feb 2006 03:44:53 -0000	1.14
@@ -82,10 +82,6 @@
 
 %postun -p /sbin/ldconfig
 
-warning: File listed twice: /etc/gconf/1/path
-warning: File listed twice: /usr/lib/libgconf-1.so.1.0.4
-warning: File listed twice: /usr/lib/libgconf-gtk-1.so.1.0.0
-
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README



From fedora-cvs-commits at redhat.com  Thu Feb 16 05:04:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 00:04:04 -0500
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.10,
	1.11 gnome-power-manager.spec, 1.22, 1.23 sources, 1.10, 1.11
Message-ID: <200602160504.k1G544Jk012846@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12805

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.13.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	7 Feb 2006 19:28:50 -0000	1.10
+++ .cvsignore	16 Feb 2006 05:03:57 -0000	1.11
@@ -1 +1,2 @@
 gnome-power-manager-2.13.5.0.20060207.tar.bz2
+gnome-power-manager-2.13.90.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-power-manager.spec	13 Feb 2006 09:23:47 -0000	1.22
+++ gnome-power-manager.spec	16 Feb 2006 05:03:57 -0000	1.23
@@ -4,8 +4,8 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.13.5.0.20060207
-Release: 2
+Version: 2.13.90
+Release: 1
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -22,6 +22,7 @@
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
+Requires: dbus-x11 >= %{dbus_version}
 Requires: scrollkeeper
 Patch0: gnome-power-manager-2.13.5.0.20060207-panel-integration.patch
 
@@ -82,6 +83,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
+- Update to 2.13.90
+- Require dbus-x11 (#176656)
+
 * Sun Feb 13 2006 Ray Strode <rstrode at redhat.com> - 2.13.5.0.20060207-2
 - remove Hibernate and Suspend from menus as part of
   panel/g-p-m integration effort


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	7 Feb 2006 19:28:50 -0000	1.10
+++ sources	16 Feb 2006 05:03:57 -0000	1.11
@@ -1 +1 @@
-0c5b78d9015dd59ff6f4e05d8d08d3e7  gnome-power-manager-2.13.5.0.20060207.tar.bz2
+7ae17a222d83fc8bc04765bfd02287aa  gnome-power-manager-2.13.90.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 16 05:12:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 00:12:56 -0500
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.23,1.24
Message-ID: <200602160512.k1G5CuFX014588@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14531

Modified Files:
	gnome-power-manager.spec 
Log Message:
fix file lists



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-power-manager.spec	16 Feb 2006 05:03:57 -0000	1.23
+++ gnome-power-manager.spec	16 Feb 2006 05:12:51 -0000	1.24
@@ -76,9 +76,7 @@
 %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf
 %{_sysconfdir}/xdg/autostart/*
 %{_datadir}/dbus-1/services/gnome-power-manager.service
-%{_datadir}/gnome/help/gnome-power-manager/C/figures/pref-main.png
-%{_datadir}/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
-%{_datadir}/gnome/help/gnome-power-manager/C/legal.xml
+%{_datadir}/gnome/help/gnome-power-manager/*
 %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf
 %{_datadir}/applications/gnome-power-preferences.desktop
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 05:17:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 00:17:08 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git5.bz2.sign, NONE,
	1.1 .cvsignore, 1.352, 1.353 kernel-2.6.spec, 1.1955,
	1.1956 sources, 1.294, 1.295 upstream, 1.269,
	1.270 patch-2.6.16-rc3-git4.bz2.sign, 1.1, NONE
Message-ID: <200602160517.k1G5H8cW016028@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15469

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc3-git5.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git4.bz2.sign 
Log Message:
git5



--- NEW FILE patch-2.6.16-rc3-git5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD83qryGugalF9Dw4RApHTAJ4yEB3BFQIlQZRc+DT6qnkgcESNkgCfZfkm
j2SRfXzGwYKC7RSHqTt/Op8=
=C8V/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- .cvsignore	15 Feb 2006 16:18:58 -0000	1.352
+++ .cvsignore	16 Feb 2006 05:17:03 -0000	1.353
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git4.bz2
+patch-2.6.16-rc3-git5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -r1.1955 -r1.1956
--- kernel-2.6.spec	15 Feb 2006 20:29:07 -0000	1.1955
+++ kernel-2.6.spec	16 Feb 2006 05:17:03 -0000	1.1956
@@ -216,7 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git4.bz2
+Patch2: patch-2.6.16-rc3-git5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1573,6 +1573,9 @@
 %endif
 
 %changelog
+* Thu Feb 16 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc3-git5
+
 * Wed Feb 15 2006 Stephen Tweedie <sct at redhat.com>
 - Fix module oopses on x86_64 SMP xen dom0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- sources	15 Feb 2006 16:18:58 -0000	1.294
+++ sources	16 Feb 2006 05:17:04 -0000	1.295
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-2def407b045799a76eeee18274222f0d  patch-2.6.16-rc3-git4.bz2
+a9e09e0acc82821e84c189cf64dd065c  patch-2.6.16-rc3-git5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- upstream	15 Feb 2006 16:18:58 -0000	1.269
+++ upstream	16 Feb 2006 05:17:04 -0000	1.270
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git4.bz2
+patch-2.6.16-rc3-git5.bz2


--- patch-2.6.16-rc3-git4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 16 05:47:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 00:47:58 -0500
Subject: rpms/hal/devel hal.spec,1.83,1.84
Message-ID: <200602160547.k1G5lwGb015313@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15182

Modified Files:
	hal.spec 
Log Message:
fix directory ownership; don't ship .a



Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- hal.spec	13 Feb 2006 18:40:39 -0000	1.83
+++ hal.spec	16 Feb 2006 05:47:54 -0000	1.84
@@ -18,7 +18,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 0.cvs20060213.1.1
+Release: 0.cvs20060213.2
 URL: http://www.freedesktop.org/Software/hal
 Source0: %{name}-%{version}-0.cvs20060213.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
@@ -91,6 +91,7 @@
 cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
 rm -rf %{buildroot}
@@ -144,6 +145,9 @@
 %dir %{_datadir}/hal
 %dir %{_datadir}/hal/fdi
 %dir %{_datadir}/hal/scripts
+%dir %{_datadir}/doc/hal-%{version}
+%dir %{_datadir}/doc/hal-%{version}/conf
+
 %{_datadir}/hal/scripts/*
 %{_datadir}/hal/fdi/*
 %{_datadir}/locale/*
@@ -155,7 +159,8 @@
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
+%dir %{_datadir}/doc/hal-%{version}/api
+
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -171,6 +176,10 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Thu Feb 16 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-0.cvs20060213.2
+- fix directory ownership
+- don't ship static libraries
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.5.7-0.cvs20060213.1.1
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 05:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 00:48:20 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1956,
	1.1957 linux-2.6-selinux-mprotect-checks.patch, 1.4, 1.5
Message-ID: <200602160548.k1G5mK98015559@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15390

Modified Files:
	kernel-2.6.spec linux-2.6-selinux-mprotect-checks.patch 
Log Message:
Enable exec* checking on all architectures. (#178747)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1956
retrieving revision 1.1957
diff -u -r1.1956 -r1.1957
--- kernel-2.6.spec	16 Feb 2006 05:17:03 -0000	1.1956
+++ kernel-2.6.spec	16 Feb 2006 05:48:18 -0000	1.1957
@@ -1575,6 +1575,7 @@
 %changelog
 * Thu Feb 16 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git5
+- Enable exec* checking on all architectures. (#178747)
 
 * Wed Feb 15 2006 Stephen Tweedie <sct at redhat.com>
 - Fix module oopses on x86_64 SMP xen dom0

linux-2.6-selinux-mprotect-checks.patch:
 hooks.c |    4 ----
 1 files changed, 4 deletions(-)

Index: linux-2.6-selinux-mprotect-checks.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-mprotect-checks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-selinux-mprotect-checks.patch	10 Feb 2006 03:07:11 -0000	1.4
+++ linux-2.6-selinux-mprotect-checks.patch	16 Feb 2006 05:48:18 -0000	1.5
@@ -1,5 +1,5 @@
---- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-09 22:05:47.000000000 -0500
-+++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-09 22:06:13.000000000 -0500
+--- linux-2.6.16-rc3/security/selinux/hooks.c	2006-02-13 13:19:09.000000000 -0500
++++ linux-2.6.16-rc3-x/security/selinux/hooks.c	2006-02-14 14:44:48.000000000 -0500
 @@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil
  
  static int file_map_prot_check(struct file *file, unsigned long prot, int shared)
@@ -24,15 +24,7 @@
  	if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) {
  		rc = 0;
  		if (vma->vm_start >= vma->vm_mm->start_brk &&
-@@ -2442,13 +2439,14 @@ static int selinux_file_mprotect(struct 
- 			 * modified content.  This typically should only
- 			 * occur for text relocations.
- 			 */
-+#if !defined(CONFIG_IA64)
- 			rc = file_has_perm(current, vma->vm_file,
- 					   FILE__EXECMOD);
-+#endif
- 		}
+@@ -2448,7 +2445,6 @@ static int selinux_file_mprotect(struct 
  		if (rc)
  			return rc;
  	}



From fedora-cvs-commits at redhat.com  Thu Feb 16 09:45:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 04:45:16 -0500
Subject: rpms/lm_sensors/devel lm_sensors.spec,1.34,1.35
Message-ID: <200602160945.k1G9jGY7004956@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/lm_sensors/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4789

Modified Files:
	lm_sensors.spec 
Log Message:
- chkconfig is of course a prereq, not a normal requires.



Index: lm_sensors.spec
===================================================================
RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lm_sensors.spec	15 Feb 2006 14:38:52 -0000	1.34
+++ lm_sensors.spec	16 Feb 2006 09:45:12 -0000	1.35
@@ -17,7 +17,8 @@
 Group: Applications/System
 License: GPL
 Buildroot: %{_tmppath}/%{name}-root
-Requires: /usr/sbin/dmidecode chkconfig
+Requires: /usr/sbin/dmidecode
+PreReq: chkconfig
 BuildPrereq: kernel-headers >= 2.2.16, bison
 ExclusiveArch: alpha %{ix86} x86_64
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 11:41:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 06:41:12 -0500
Subject: rpms/kdebase/devel kdebase-3.5.1-kwin-systray.patch, NONE,
	1.1 kdebase.spec, 1.154, 1.155
Message-ID: <200602161141.k1GBfCp8023031@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22935

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-kwin-systray.patch 
Log Message:
Systray icons not docked sometimes, apply patch to fix this issue #180314


kdebase-3.5.1-kwin-systray.patch:
 events.cpp |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE kdebase-3.5.1-kwin-systray.patch ---
--- kdebase-3.5.1/kwin/events.cpp.tn	2006-02-16 12:29:09.000000000 +0100
+++ kdebase-3.5.1/kwin/events.cpp	2006-02-16 12:30:26.000000000 +0100
@@ -323,17 +323,7 @@
             return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt
             }
         case MapNotify:
-            {
-#if KDE_IS_VERSION( 3, 9, 90 )
-#warning Consider dumping this workaround.
-#endif
-            // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
-            // necessary when X.org with that fix becomes available and it's an unnecessary
-            // X roundtrip for an experimental unstable feature.
-            if( addSystemTrayWin( e->xmap.window ))
-                return true;
             return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
-            }
         case ReparentNotify:
             {
         //do not confuse Qt with these events. After all, _we_ are the


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- kdebase.spec	15 Feb 2006 22:18:23 -0000	1.154
+++ kdebase.spec	16 Feb 2006 11:41:09 -0000	1.155
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 3
+Release: 4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -50,6 +50,7 @@
 Patch11: kdebase-3.4.0-xdg.patch
 Patch12: kdebase-3.5.1-dbus.patch
 Patch13: kdebase-3.5.1-kdm-readme.patch
+Patch14: kdebase-3.5.1-kwin-systray.patch
 
 # upstream patches
 Patch100: kdebase-3.5.1-keyboardlayout.patch
@@ -135,6 +136,7 @@
 %patch11 -p1 -b .xdg
 %patch12 -p1 -b .dbus
 %patch13 -p1 -b .kdm-readme
+%patch14 -p1 -b .systray
 
 # upstream patches
 %patch100 -p1 -b .keyboardlayout
@@ -424,6 +426,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Thu Feb 16 2006 Than Ngo <than at redhat.com> 6:3.5.1-4
+- Systray icons not docked sometimes, apply patch to fix this issue #180314
+
 * Wed Feb 15 2006 Than Ngo <than at redhat.com> 6:3.5.1-3
 - kscreensaver/kdm/kcheckpass use a separate PAM config file #66902
 - cleanup kdm config file #166388 



From fedora-cvs-commits at redhat.com  Thu Feb 16 13:30:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 08:30:06 -0500
Subject: rpms/openobex/devel openobex-1.1-inc.patch, NONE, 1.1 openobex.spec,
	1.12, 1.13 openobex-1.0.0-bigendian.patch, 1.1,
	NONE openobex-1.0.0-include.patch, 1.1,
	NONE openobex-1.0.1-export.patch, 1.1, NONE
Message-ID: <200602161330.k1GDU6WG007169@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7137

Modified Files:
	openobex.spec 
Added Files:
	openobex-1.1-inc.patch 
Removed Files:
	openobex-1.0.0-bigendian.patch openobex-1.0.0-include.patch 
	openobex-1.0.1-export.patch 
Log Message:
version 1.1

openobex-1.1-inc.patch:
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openobex-1.1-inc.patch ---
--- openobex-1.1/include/Makefile.am.inc	2006-02-16 13:39:07.000000000 +0100
+++ openobex-1.1/include/Makefile.am	2006-02-16 13:39:33.000000000 +0100
@@ -1,7 +1,7 @@
 
-includedir = @includedir@/openobex
+myincludedir = $(pkgincludedir)
 
-include_HEADERS = obex.h obex_const.h
+myinclude_HEADERS = obex.h obex_const.h
 
 MAINTAINERCLEANFILES = Makefile.in
 


Index: openobex.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/openobex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openobex.spec	11 Feb 2006 04:50:41 -0000	1.12
+++ openobex.spec	16 Feb 2006 13:30:02 -0000	1.13
@@ -1,16 +1,14 @@
 Summary: Library for using OBEX
 Name: openobex
-Version: 1.0.1
-Release: 4.2.1
+Version: 1.1
+Release: 1
 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.0.0-include.patch
-Patch2: openobex-1.0.1-export.patch
-#Patch1: openobex-1.0.0-bigendian.patch
+Patch: openobex-1.1-inc.patch
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel
+BuildRequires: autoconf >= 0:2.57, docbook-utils >= 0:0.6.13, bluez-libs-devel sed
 ExcludeArch: s390 s390x
 
 %description
@@ -29,13 +27,13 @@
 
 %setup -q
 %patch -p1
-%patch2 -p1
+sed -i -e 's#includedir=@includedir@#includedir=@includedir@/openobex#g' openobex.pc.in
 
 %build
 autoreconf --install --force
 %configure
 make
-make -C doc html
+make -C doc 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -52,19 +50,21 @@
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README doc/openobex
 %{_libdir}/libopenobex*.so.*
 
 %files devel
 %defattr(-, root, root)
-%doc doc/openobex
+%doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/libopenobex*.so
 %{_libdir}/libopenobex*.a
-%{_bindir}/openobex-config
 %{_datadir}/aclocal/openobex.m4
-%{_includedir}/openobex/
+%{_includedir}/openobex/*.h
+%{_libdir}/pkgconfig/openobex.pc
 
 %changelog
+* Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 1.1-1
+- version 1.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2.1
 - bump again for double-long bug on ppc(64)
 


--- openobex-1.0.0-bigendian.patch DELETED ---


--- openobex-1.0.0-include.patch DELETED ---


--- openobex-1.0.1-export.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 16 13:35:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 08:35:16 -0500
Subject: rpms/openobex/devel .cvsignore,1.3,1.4 sources,1.3,1.4
Message-ID: <200602161335.k1GDZGcb007596@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7542

Modified Files:
	.cvsignore sources 
Log Message:
version 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Sep 2004 14:44:48 -0000	1.3
+++ .cvsignore	16 Feb 2006 13:35:11 -0000	1.4
@@ -1 +1 @@
-openobex-1.0.1.tar.gz
+openobex-1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openobex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Sep 2004 14:44:48 -0000	1.3
+++ sources	16 Feb 2006 13:35:12 -0000	1.4
@@ -1 +1 @@
-3742666bb98259face76be49b73ea89d  openobex-1.0.1.tar.gz
+c93327b636333d58e1d6ac362970ac21  openobex-1.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 16 13:42:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 08:42:10 -0500
Subject: rpms/openobex-apps/devel openobex-apps.spec,1.10,1.11
Message-ID: <200602161342.k1GDgA1m010201@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10169

Modified Files:
	openobex-apps.spec 
Log Message:
rebuilt


Index: openobex-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex-apps/devel/openobex-apps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openobex-apps.spec	11 Feb 2006 04:51:06 -0000	1.10
+++ openobex-apps.spec	16 Feb 2006 13:41:52 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Applications for using OBEX
 Name: openobex-apps
 Version: 1.0.0
-Release: 8.2.1
+Release: 9
 License: GPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net
@@ -11,7 +11,7 @@
 Patch3: openobex-apps-flush.patch
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: openobex >= 0:1.0.1, bluez-libs
-BuildRequires: openobex-devel >= 0:1.0.1-2, bluez-libs-devel
+BuildRequires: openobex-devel >= 0:1.1, bluez-libs-devel
 BuildRequires: autoconf >= 0:2.57
 Excludearch: s390x s390
 
@@ -19,6 +19,9 @@
 Open OBEX Applications
 
 %changelog
+* Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> - 1.0.0-9
+- rebuilt for openobex-1.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0-8.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:05:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:05:31 -0500
Subject: rpms/libbtctl/devel .cvsignore, 1.4, 1.5 libbtctl.spec, 1.22,
	1.23 sources, 1.4, 1.5
Message-ID: <200602161405.k1GE5VTS030450@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30427

Modified Files:
	.cvsignore libbtctl.spec sources 
Log Message:
version 0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Sep 2005 07:36:21 -0000	1.4
+++ .cvsignore	16 Feb 2006 14:05:26 -0000	1.5
@@ -1 +1 @@
-libbtctl-0.5.0.tar.bz2
+libbtctl-0.6.0.tar.bz2


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libbtctl.spec	11 Feb 2006 03:53:22 -0000	1.22
+++ libbtctl.spec	16 Feb 2006 14:05:26 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
-Version: 0.5.0
-Release: 1.2.1
+Version: 0.6.0
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -9,7 +9,8 @@
 %define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 Requires: python-abi = %{pyver}
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.0.1 python pygtk2-devel gtk2-devel
+BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.1 python pygtk2-devel gtk2-devel
+BuildRequires: mono-devel
 ExcludeArch: s390 s390x
 Patch2: libbtctl-0.4.1-pydir.patch
 
@@ -37,7 +38,8 @@
 autoconf
 
 %build
-%configure
+%configure 
+#--disable-mono
 make
 
 %install
@@ -74,6 +76,9 @@
 
 
 %changelog
+* Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 0.6.0-1
+- version 0.6.0
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Sep 2005 07:36:22 -0000	1.4
+++ sources	16 Feb 2006 14:05:26 -0000	1.5
@@ -1 +1 @@
-997e91fc08c9e57ddf7d9d6e42aed91f  libbtctl-0.5.0.tar.bz2
+d58b47204794628e7fd674ece8e6e631  libbtctl-0.6.0.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:05:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:05:49 -0500
Subject: rpms/chkfontpath/devel .cvsignore, 1.7, 1.8 chkfontpath.spec, 1.14,
	1.15 sources, 1.7, 1.8
Message-ID: <200602161405.k1GE5n2d030586@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/chkfontpath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30515/devel

Modified Files:
	.cvsignore chkfontpath.spec sources 
Log Message:
auto-import chkfontpath-1.10.1-1 on branch devel from chkfontpath-1.10.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Sep 2004 03:48:20 -0000	1.7
+++ .cvsignore	16 Feb 2006 14:05:46 -0000	1.8
@@ -1 +1 @@
-chkfontpath-1.10.0.tar.gz
+chkfontpath-1.10.1.tar.gz


Index: chkfontpath.spec
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/chkfontpath.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- chkfontpath.spec	11 Feb 2006 02:15:42 -0000	1.14
+++ chkfontpath.spec	16 Feb 2006 14:05:46 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Simple interface for editing the font path for the X font server.
 Name: chkfontpath
-Version: 1.10.0
-Release: 4.2.1
+Version: 1.10.1
+Release: 1
 License: GPL
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -41,6 +41,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 1.10.1-1
+- Implemented new --listfp option for bug (#153324).
+- Fix stderr output redirection bug in kill invocation (#176444).
+- Check return code from realloc() and exit on failure.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.10.0-4.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkfontpath/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2004 03:48:20 -0000	1.7
+++ sources	16 Feb 2006 14:05:46 -0000	1.8
@@ -1 +1 @@
-4e195982006ff27a177cb73b25f13013  chkfontpath-1.10.0.tar.gz
+e216cfc446f4112b80bd8e79bae025f1  chkfontpath-1.10.1.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:15:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:15:56 -0500
Subject: rpms/openobex-apps/devel openobex-apps.spec,1.11,1.12
Message-ID: <200602161415.k1GEFuTf001970@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1939

Modified Files:
	openobex-apps.spec 
Log Message:
rebuilt


Index: openobex-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex-apps/devel/openobex-apps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openobex-apps.spec	16 Feb 2006 13:41:52 -0000	1.11
+++ openobex-apps.spec	16 Feb 2006 14:15:52 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: Applications for using OBEX
 Name: openobex-apps
 Version: 1.0.0
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Libraries
 URL: http://openobex.sourceforge.net



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:22:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:22:12 -0500
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth-0.7.0-pydir.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 gnome-bluetooth.spec, 1.27,
	1.28 sources, 1.4, 1.5 gnome-bluetooth-0.5.1-pydir.patch, 1.8, NONE
Message-ID: <200602161422.k1GEMCMv016265@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16135

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Added Files:
	gnome-bluetooth-0.7.0-pydir.patch 
Removed Files:
	gnome-bluetooth-0.5.1-pydir.patch 
Log Message:
version 0.7.0

gnome-bluetooth-0.7.0-pydir.patch:
 acinclude.m4                      |  126 --------------------------------------
 python/gnome-bluetooth-manager.in |    7 +-
 2 files changed, 7 insertions(+), 126 deletions(-)

--- NEW FILE gnome-bluetooth-0.7.0-pydir.patch ---
--- gnome-bluetooth-0.7.0/acinclude.m4.pydir	2005-11-21 23:13:25.000000000 +0100
+++ gnome-bluetooth-0.7.0/acinclude.m4	2006-02-16 11:26:49.000000000 +0100
@@ -27,108 +27,6 @@
 # doesn't meet the requirement.  MINIMUM-VERSION should consist of
 # numbers and dots only.
 
-
-AC_DEFUN([AM_PATH_PYTHON],
- [
-  dnl Find a version of Python.  I could check for python versions 1.4
-  dnl or earlier, but the default installation locations changed from
-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
-  dnl in 1.5, and I don't want to maintain that logic.
-
-  AC_PATH_PROG(PYTHON, python python2.1 python2.0 python1.6 python1.5)
-
-  dnl should we do the version check?
-  ifelse([$1],[],,[
-    AC_MSG_CHECKING(if Python version >= $1)
-    changequote(<<, >>)dnl
-    prog="
-import sys, string
-minver = '$1'
-pyver = string.split(sys.version)[0]  # first word is version string
-# split strings by '.' and convert to numeric
-minver = map(string.atoi, string.split(minver, '.'))
-pyver = map(string.atoi, string.split(pyver, '.'))
-# we can now do comparisons on the two lists:
-if pyver >= minver:
-	sys.exit(0)
-else:
-	sys.exit(1)"
-    changequote([, ])dnl
-    if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-    then
-      AC_MSG_RESULT(okay)
-    else
-      AC_MSG_ERROR(too old)
-    fi
-  ])
-
-  AC_MSG_CHECKING([local Python configuration])
-
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.  Need to change quote character because of [:3]
-
-  AC_SUBST(PYTHON_VERSION)
-  changequote(<<, >>)dnl
-  PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
-  changequote([, ])dnl
-
-
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
-
-  AC_SUBST(PYTHON_PREFIX)
-  changequote(<<, >>)dnl
-  PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
-  changequote([, ])dnl
-
-  AC_SUBST(PYTHON_EXEC_PREFIX)
-  PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
-
-  AC_SUBST(PYTHON_PLATFORM)
-  PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"`
-
-
-  dnl Set up 4 directories:
-
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behaviour
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl
-  dnl Also, if the package prefix isn't the same as python's prefix,
-  dnl then the old $(pythondir) was pretty useless.
-
-  AC_SUBST(pythondir)
-  pythondir=$PYTHON_PREFIX${libdir##$prefix}"/python"$PYTHON_VERSION"/site-packages"
-
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
-  dnl   Maybe this should be put in python.am?
-
-  AC_SUBST(pkgpythondir)
-  pkgpythondir=\${pythondir}/$PACKAGE
-
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
-
-  AC_SUBST(pyexecdir)
-  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
-
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-  dnl   Maybe this should be put in python.am?
-
-  AC_SUBST(pkgpyexecdir)
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-  AC_MSG_RESULT([looks good])
-])
 dnl -- taken from gnome-python -- thanks james henstridge
 dnl a macro to check for ability to create python extensions
 dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
@@ -141,7 +39,8 @@
 py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
 PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
 if test "$py_prefix" != "$py_exec_prefix"; then
-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_V
+ERSION}"
 fi
 AC_SUBST(PYTHON_INCLUDES)
 dnl check if the headers exist:
@@ -155,27 +54,6 @@
 CPPFLAGS="$save_CPPFLAGS"
 ])
 
-dnl
-dnl JH_ADD_CFLAG(FLAG)
-dnl checks whether the C compiler supports the given flag, and if so, adds
-dnl it to $CFLAGS.  If the flag is already present in the list, then the
-dnl check is not performed.
-AC_DEFUN([JH_ADD_CFLAG],
-[
-case " $CFLAGS " in
-*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-  ;;
-*)
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-  AC_MSG_CHECKING([whether [$]CC understands $1])
-  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-  AC_MSG_RESULT($jh_has_option)
-  if test $jh_has_option = no; then
-    CFLAGS="$save_CFLAGS"
-  fi
-  ;;
-esac])
 dnl Configure paths for libsdp
 dnl Edd Dumbill <edd at usefulinc.com>
 dnl Shamelessly stolen from Jack Moffitt, who stole
--- gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in.pydir	2005-11-19 20:02:14.000000000 +0100
+++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-02-16 11:40:39.000000000 +0100
@@ -1,4 +1,7 @@
 #!/bin/sh
-PYTHONPATH=@pythondir@:$PYTHONPATH
+PYEXECDIR=$(/usr/bin/python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='/usr')")
+
+PYTHONPATH="$PYEXECDIR:$PYTHONPATH"
 export PYTHONPATH
-exec @PYTHON@ @pythondir@/gnomebt/manager.py
+exec /usr/bin/python $PYEXECDIR/gnomebt/manager.py
+


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Sep 2005 12:24:13 -0000	1.4
+++ .cvsignore	16 Feb 2006 14:22:08 -0000	1.5
@@ -1 +1 @@
-gnome-bluetooth-0.6.0.tar.bz2
+gnome-bluetooth-0.7.0.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-bluetooth.spec	11 Feb 2006 03:12:57 -0000	1.27
+++ gnome-bluetooth.spec	16 Feb 2006 14:22:08 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
-Version: 0.6.0
-Release: 2.2.1
+Version: 0.7.0
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -11,13 +11,13 @@
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
 BuildRequires: libgnomeui-devel >= 2.2 libbonobo-devel >= 2.0
 BuildRequires: GConf2-devel >= 2.0 librsvg2-devel
-BuildRequires: libbtctl-devel >= 0.5.0
+BuildRequires: libbtctl-devel >= 0.6.0
 BuildRequires: gob2 openobex-devel >= 1.0.1
 BuildRequires: pygtk2-devel python-devel
 Requires: %{name}-libs = %{version}-%{release}
 ExcludeArch: s390 s390x
 
-Patch1: gnome-bluetooth-0.5.1-pydir.patch
+Patch1: gnome-bluetooth-0.7.0-pydir.patch
 
 %description
 This package contains a Bonobo server to control Bluetooth devices,
@@ -50,11 +50,6 @@
 %setup -q
 %patch1 -p1 -b .pydir
 
-perl -pi -e 's|^Icon=.*|Icon=%{_datadir}/pixmaps/blueradio.png|g' \
-    */*.desktop.in
-#perl -pi -e 's#-DGTK_DISABLE_DEPRECATED##g' $(find libegg -name Makefile.in)
-#sed -i.bool -e 's#gtk.TRUE#True#g;s#gtk.FALSE#False#g' python/*.py
-
 aclocal
 automake -a
 autoconf
@@ -68,9 +63,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 ./libtool --finish $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules
-mkdir -p %{buildroot}%{_datadir}/pixmaps/
-cp -a %{buildroot}%{_datadir}/gnome-bluetooth/pixmaps/blueradio-48.png \
-      %{buildroot}%{_datadir}/pixmaps/blueradio.png
 
 # we do not want .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -95,7 +87,7 @@
 %{_datadir}/applications/gnome-obex-server.desktop
 %{_datadir}/applications/gnome-bluetooth-manager.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/pixmaps/blueradio.png
+%{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas
 
 %files libs
@@ -110,6 +102,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-1
+- version 0.7.0
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.0-2.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Sep 2005 12:24:13 -0000	1.4
+++ sources	16 Feb 2006 14:22:08 -0000	1.5
@@ -1 +1 @@
-d661d950a559865c06aa8ad836708dde  gnome-bluetooth-0.6.0.tar.bz2
+90614d7a757cf30054021f0666308fe2  gnome-bluetooth-0.7.0.tar.bz2


--- gnome-bluetooth-0.5.1-pydir.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:33:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:33:10 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo34909.dbaccess.patch, NONE,
	1.1 openoffice.org-2.0.2.ooo62138.extensions.patch, NONE,
	1.1 workspace.evo2fixes.patch, NONE,
	1.1 openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch,
	1.6, 1.7 openoffice.org.spec, 1.620, 1.621
Message-ID: <200602161433.k1GEXAqb019871@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19855

Modified Files:
	openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo34909.dbaccess.patch 
	openoffice.org-2.0.2.ooo62138.extensions.patch 
	workspace.evo2fixes.patch 
Log Message:
update and fix evo stuff

openoffice.org-2.0.2.ooo34909.dbaccess.patch:
 dlg/dbwizsetup.cxx  |   23 ++++++++++++++++++-----
 inc/dsntypes.hxx    |    6 ++++--
 misc/dbumiscres.hrc |   10 ++++++----
 misc/dbumiscres.src |   34 ++++++++++++++++++++++++++--------
 misc/dsntypes.cxx   |   24 +++++++++++++++++-------
 5 files changed, 71 insertions(+), 26 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo34909.dbaccess.patch ---
--- openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx.bakj	2005-04-06 18:15:46.000000000 +0530
+++ openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx	2005-04-06 18:21:11.000000000 +0530
@@ -268,11 +268,12 @@
 #define OUTLOOK_PATH           14
 #define MOZILLA_PATH           15
 #define EVOLUTION_PATH         16
-#define KAB_PATH               17
-#define THUNDERBIRD_PATH       18
-#define CREATENEW_PATH         19
-#define USERDEFINED_PATH       20
-#define OPEN_DOC_PATH          21
+#define EVOLUTION_PATH_LOCAL   17
+#define KAB_PATH               18
+#define THUNDERBIRD_PATH       19
+#define CREATENEW_PATH         20
+#define USERDEFINED_PATH       21
+#define OPEN_DOC_PATH          22
 
 OFinalDBPageSetup*          pFinalPage;
 
@@ -411,6 +412,14 @@
     else
         declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
 
+if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LOCAL))
+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+    else
+        declarePath( EVOLUTION_PATH_LOCAL, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+ if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP))
+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
+    else
+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
     if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
         declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
     else
@@ -566,6 +566,8 @@ void ODbTypeWizDialogSetup::activateData
             { DST_MOZILLA,      MOZILLA_PATH        },
             { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
             { DST_EVOLUTION,    EVOLUTION_PATH      },
+            { DST_EVOLUTION_LOCAL,    EVOLUTION_PATH_LOCAL      },
+            { DST_EVOLUTION_LDAP,    EVOLUTION_PATH      },
             { DST_KAB,          KAB_PATH            },
             { DST_USERDEFINE1,  USERDEFINED_PATH    },
                    { DST_USERDEFINE2,  USERDEFINED_PATH    },
@@ -639,6 +639,8 @@
     {
 		case DST_KAB:
         case DST_EVOLUTION:
+        case DST_EVOLUTION_LOCAL:
+        case DST_EVOLUTION_LDAP:
         case DST_OUTLOOK:
         case DST_OUTLOOKEXP:
 		case DST_MOZILLA:
--- openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx.bakj	2005-04-06 18:05:46.000000000 +0530
+++ openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx	2005-04-06 18:07:10.000000000 +0530
@@ -101,7 +101,9 @@
 	DST_OUTLOOKEXP	=	16,	
 	DST_EVOLUTION	=	17,
- 	DST_KAB         =	18,
- 	DST_EMBEDDED	=	19,
+	DST_EVOLUTION_LOCAL =	18,
+	DST_EVOLUTION_LDAP  =	19,
+ 	DST_KAB         =	20,
+ 	DST_EMBEDDED	=	21,
 
 	DST_USERDEFINE1,	/// first user defined driver
 	DST_USERDEFINE2,

--- openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx.bakj	2005-04-06 17:57:59.000000000 +0530
+++ openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx	2005-04-06 18:05:24.000000000 +0530
@@ -412,8 +412,10 @@
 			case DST_OUTLOOK:
 			case DST_OUTLOOKEXP:
 			case DST_FLAT:
-            case DST_EVOLUTION:
-            case DST_KAB:
+            		case DST_EVOLUTION:
+			case DST_EVOLUTION_LOCAL:
+			case DST_EVOLUTION_LDAP:
+			case DST_KAB:
 	 		case DST_THUNDERBIRD:
 			case DST_CALC:
                 bSupportsTableCreation = FALSE;
@@ -458,8 +458,10 @@
 		case DST_OUTLOOK:
 		case DST_OUTLOOKEXP:
 		case DST_JDBC:
-        case DST_EVOLUTION:
-        case DST_KAB:
+		case DST_EVOLUTION:
+		case DST_EVOLUTION_LOCAL:
+		case DST_EVOLUTION_LDAP:
+		case DST_KAB:
 			bEnableBrowseButton = FALSE;
 			break;
 		default:
@@ -493,12 +493,14 @@
		case DST_ADO:
		case DST_LDAP:
        case DST_CALC:
+		case DST_EVOLUTION_LDAP:
+		case DST_EVOLUTION:
 			return sal_True;
 			break;
 		case DST_MSACCESS:
 		case DST_MOZILLA:
 		case DST_THUNDERBIRD:
-		case DST_EVOLUTION:
+		case DST_EVOLUTION_LOCAL:
 		case DST_KAB:
 		case DST_OUTLOOK:
         case DST_OUTLOOKEXP: //????
@@ -577,8 +577,12 @@
 			return DST_OUTLOOK;
 		if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator))
 			return DST_OUTLOOKEXP;
-		if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator))
-			return DST_EVOLUTION;
+		if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator))
+			return DST_EVOLUTION_LDAP;
+		if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator))
+			return DST_EVOLUTION;
+		if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator))
+			return DST_EVOLUTION_LOCAL;
 		if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator))
 			return DST_KAB;
 	}
--- openoffice.org/dbaccess/source/ui/misc/dbumiscres.src.bakj	2005-04-06 18:11:26.000000000 +0530
+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.src	2005-04-06 18:15:20.000000000 +0530
@@ -133,9 +133,17 @@
 	{
 		Text  ="sdbc:address:outlookexp";
 	};
-	String STR_EVOLUTION
-	{
-		Text  ="sdbc:address:evolution";
+        String STR_EVOLUTION_LOCAL
+        {
+               Text  ="sdbc:address:evolution:local";
+        };
+        String STR_EVOLUTION_LDAP
+        {
+                Text  ="sdbc:address:evolution:ldap";
+        };
+        String STR_EVOLUTION_GROUPWISE
+        {
+                Text  ="sdbc:address:evolution:groupwise";
 	};	
 	String STR_KAB
 	{
@@ -221,11 +229,21 @@
 		Text [ de ] = "Microsoft Windows Adressbuch";
 		Text[ en-US ] = "Microsoft Windows Address Book";
 	};
-	String STR_EVOLUTION
-	{
-		Text [ de ] = "Evolution Adressbuch";
-		Text[ en-US ] = "Evolution Address Book";
-	};
+        String STR_EVOLUTION_LOCAL
+        {
+                Text [ de ] = "Evolution Local Adressbuch";
+                Text[ en-US ] = "Evolution Local";
+        };
+        String STR_EVOLUTION_LDAP
+        {
+               Text [ de ] = "Evolution LDAP Adressbuch";
+               Text[ en-US ] = "Evolution LDAP";
+        };
+        String STR_EVOLUTION_GROUPWISE
+        {
+                Text [ de ] = "Groupwise Adressbuch";
+                Text[ en-US ] = "Groupwise";
+        };
 	String STR_KAB
 	{
		Text [ de ] = "KDE Adressbuch";
--- openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc.bakj	2005-04-06 18:07:39.000000000 +0530
+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc	2005-04-06 18:11:00.000000000 +0530
@@ -80,10 +80,12 @@
 #define STR_LDAP				13
 #define STR_OUTLOOK				14
 #define STR_OUTLOOKEXP			15
-#define STR_EVOLUTION			16 
-#define STR_KAB					17
-#define STR_EMBEDDED			18
-#define STR_THUNDERBIRD			19
+#define STR_EVOLUTION_GROUPWISE	16 
+#define STR_EVOLUTION_LOCAL		17
+#define STR_EVOLUTION_LDAP		18
+#define STR_KAB					19
+#define STR_EMBEDDED			20
+#define STR_THUNDERBIRD			21
 
 #define STR_END					STR_THUNDERBIRD + 1
 

openoffice.org-2.0.2.ooo62138.extensions.patch:
 extensions/source/abpilot/abpresid.hrc                          |    0 
 extensions/source/abpilot/abspilot.cxx                          |    0 
 extensions/source/abpilot/abspilot.src                          |    0 
 extensions/source/abpilot/addresssettings.hxx                   |    0 
 extensions/source/abpilot/datasourcehandling.cxx                |    0 
 extensions/source/abpilot/datasourcehandling.hxx                |    0 
 extensions/source/abpilot/typeselectionpage.cxx                 |    0 
 extensions/source/abpilot/typeselectionpage.hxx                 |    0 
 openoffice.org/extensions/source/abpilot/abpresid.hrc           |    2 
 openoffice.org/extensions/source/abpilot/abspilot.cxx           |   15 
 openoffice.org/extensions/source/abpilot/abspilot.src           |   17 
 openoffice.org/extensions/source/abpilot/addresssettings.hxx    |    2 
 openoffice.org/extensions/source/abpilot/datasourcehandling.cxx |   12 
 openoffice.org/extensions/source/abpilot/datasourcehandling.hxx |    8 
 openoffice.org/extensions/source/abpilot/typeselectionpage.cxx  |  173 +++-------
 openoffice.org/extensions/source/abpilot/typeselectionpage.hxx  |   18 +
 16 files changed, 134 insertions(+), 113 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo62138.extensions.patch ---
Index: extensions/source/abpilot/abpresid.hrc
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/abpresid.hrc,v
retrieving revision 1.10
diff -u -p -u -r1.10 abpresid.hrc
--- openoffice.org/extensions/source/abpilot/abpresid.hrc	19 Dec 2005 17:26:07 -0000	1.10
+++ openoffice.org/extensions/source/abpilot/abpresid.hrc	16 Feb 2006 12:45:37 -0000
@@ -174,6 +174,8 @@
 #define RB_OUTLOOK				6
 #define RB_OUTLOOKEXPRESS		7
 #define RB_OTHER				8
+#define RB_EVOLUTION_GROUPWISE  9
+#define RB_EVOLUTION_LDAP		10
 
 //........................................................................
 #define ET_DATASOURCENAME		1
Index: extensions/source/abpilot/abspilot.cxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/abspilot.cxx,v
retrieving revision 1.13
diff -u -p -u -r1.13 abspilot.cxx
--- openoffice.org/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
@@ -151,12 +151,9 @@ namespace abp
 		m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
 
 		// some initial settings
-#ifdef WITH_MOZILLA
 #ifdef UNX
-		m_aSettings.eType = AST_MORK;
-#else
-		m_aSettings.eType = AST_OE;
-#endif
+// FIXME: if KDE use KAB instead
+		m_aSettings.eType = AST_EVOLUTION;
 #else
 		m_aSettings.eType = AST_OTHER;
 #endif
@@ -410,6 +407,14 @@ namespace abp
 				m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
 				break;
 
+			case AST_EVOLUTION_GROUPWISE:
+				m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
+				break;
+
+			case AST_EVOLUTION_LDAP:
+				m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
+				break;
+
 			case AST_KAB:
 				m_aNewDataSource = aContext.createNewKab( m_aSettings.sDataSourceName );
 				break;
Index: extensions/source/abpilot/abspilot.src
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/abspilot.src,v
retrieving revision 1.54
diff -u -p -u -r1.54 abspilot.src
--- openoffice.org/extensions/source/abpilot/abspilot.src	21 Dec 2005 18:07:05 -0000	1.54
+++ openoffice.org/extensions/source/abpilot/abspilot.src	16 Feb 2006 12:45:38 -0000
@@ -129,6 +129,7 @@ TabPage RID_PAGE_SELECTABTYPE
 		Text [ de ] = "Mozilla / Netscape";
 		Text [ en-US ] = "Mozilla / Netscape";
 	};
+// All position & size/height data below this is not used
 	RadioButton RB_THUNDERBIRD
 	{
 		Pos		= MAP_APPFONT ( 15, 79 ) ;
@@ -145,6 +146,22 @@ TabPage RID_PAGE_SELECTABTYPE
 		Text [ de ] = "Evolution";
 		Text [ en-US ] = "Evolution";
 	};
+	RadioButton RB_EVOLUTION_GROUPWISE
+ 	{
+ 		Pos		= MAP_APPFONT ( 15, 90 ) ;
+ 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+		Text [ de ] = "Groupwise";
+		Text [ en-US ] = "Groupwise";
+	};
+	RadioButton RB_EVOLUTION_LDAP
+ 	{
+ 		Pos		= MAP_APPFONT ( 15, 90 ) ;
+ 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
+
+		Text [ de ] = "Evolution LDAP";
+		Text [ en-US ] = "Evolution LDAP";
+	};
 	RadioButton RB_KAB
  	{
  		Pos		= MAP_APPFONT ( 15, 101 ) ;
Index: extensions/source/abpilot/addresssettings.hxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/addresssettings.hxx,v
retrieving revision 1.7
diff -u -p -u -r1.7 addresssettings.hxx
--- openoffice.org/extensions/source/abpilot/addresssettings.hxx	19 Dec 2005 17:27:17 -0000	1.7
+++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	16 Feb 2006 12:45:38 -0000
@@ -56,6 +56,8 @@ namespace abp
 		AST_MORK,
         AST_THUNDERBIRD,
 		AST_EVOLUTION,
+		AST_EVOLUTION_GROUPWISE,
+		AST_EVOLUTION_LDAP,
 		AST_KAB,
 		AST_LDAP,
 		AST_OUTLOOK,
Index: extensions/source/abpilot/datasourcehandling.cxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.cxx,v
retrieving revision 1.9
diff -u -p -u -r1.9 datasourcehandling.cxx
--- openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	19 Dec 2005 17:27:30 -0000	1.9
+++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	16 Feb 2006 12:45:38 -0000
@@ -330,9 +330,19 @@ namespace abp
 	}
 
 	//---------------------------------------------------------------------
+	ODataSource	ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
+	{
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
+	}
+	//---------------------------------------------------------------------
+	ODataSource	ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
+	{
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
+	}
+	//---------------------------------------------------------------------
 	ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
 	{
-		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution" );
+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
 	}
 
 	//---------------------------------------------------------------------
Index: extensions/source/abpilot/datasourcehandling.hxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.hxx,v
retrieving revision 1.7
diff -u -p -u -r1.7 datasourcehandling.hxx
--- openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	19 Dec 2005 17:27:42 -0000	1.7
+++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	16 Feb 2006 12:45:38 -0000
@@ -89,9 +89,15 @@ namespace abp
 		/// creates a new Thunderbird data source
 		ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
-		/// creates a new Evolution data source
+		/// creates a new Evolution local data source
 		ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
+		/// creates a new Evolution LDAP data source
+		ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
+		/// creates a new Evolution GROUPWISE data source
+		ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
 		/// creates a new KDE address book data source
 		ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
Index: extensions/source/abpilot/typeselectionpage.cxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
retrieving revision 1.9
diff -u -p -u -r1.9 typeselectionpage.cxx
--- openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	19 Dec 2005 17:28:09 -0000	1.9
+++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	16 Feb 2006 12:45:38 -0000
@@ -57,43 +57,6 @@ namespace abp
 	using namespace ::com::sun::star::uno;
 	using namespace ::com::sun::star::sdbc;
 
-    //---------------------------------------------------------------------
-    namespace
-    {
-        void lcl_hideChoice( ::std::vector< RadioButton* >& _allTypes, RadioButton& _typeToHide )
-        {
-            for (   ::std::vector< RadioButton* >::iterator loop = _allTypes.begin();
-                    loop != _allTypes.end();
-                    ++loop
-                )
-            {
-                if ( *loop == &_typeToHide )
-                {
-                    // remove the element from the allTypes array
-                    ::std::copy( loop + 1, _allTypes.end(), loop );
-                    _allTypes.resize( _allTypes.size() - 1 );
-
-                    // hide the control in question
-                    _typeToHide.Hide();
-
-                    // change position of all subsequent controls
-                    if ( loop != _allTypes.end() )
-                    {
-                        sal_Int32 nMoveUp = (*loop)->GetPosPixel().Y() - _typeToHide.GetPosPixel().Y();
-                        do
-                        {
-                            Point aPos = (*loop)->GetPosPixel();
-                            aPos.Y() -= nMoveUp;
-                            (*loop)->SetPosPixel( aPos );
-                        }
-                        while ( ++loop != _allTypes.end() );
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
 	//=====================================================================
 	//= TypeSelectionPage
 	//=====================================================================
@@ -105,65 +68,73 @@ namespace abp
 		,m_aMORK			(this,	ResId(RB_MORK))
 		,m_aThunderbird     (this,  ResId(RB_THUNDERBIRD))
 		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
+		,m_aEvolutionGroupwise (this,	ResId(RB_EVOLUTION_GROUPWISE))
+		,m_aEvolutionLdap	   (this,	ResId(RB_EVOLUTION_LDAP))
 		,m_aKab				(this,	ResId(RB_KAB))
 		,m_aLDAP			(this,	ResId(RB_LDAP))
 		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
 		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
 		,m_aOther			(this,	ResId(RB_OTHER))
 	{
+		Point aTopLeft;
+		Size  aItemSize;
+
 		FreeResource();
 
-		::std::vector< RadioButton* > allTypes;
-		    // must be sorted by ascending y-coordinate
-		allTypes.push_back( &m_aMORK );
-		allTypes.push_back( &m_aThunderbird );
-		allTypes.push_back( &m_aEvolution );
-		allTypes.push_back( &m_aKab );
-		allTypes.push_back( &m_aLDAP );
-		allTypes.push_back( &m_aOutlook );
-		allTypes.push_back( &m_aOE );
-		allTypes.push_back( &m_aOther );
+		aTopLeft = m_aMORK.GetPosPixel();
+		aItemSize = m_aMORK.GetSizePixel();
+
+		bool bWithMozilla = true, bUnx = true;
+		bool bHaveEvolution = true, bHaveKab = true;
 
 #ifndef WITH_MOZILLA
-		// the following 5 types are provided by the Mozilla-based database driver. If we're compiled without
-		// without Mozilla support, then they're not available.
-		lcl_hideChoice( allTypes, m_aMORK );
-		lcl_hideChoice( allTypes, m_aThunderbird );
-		lcl_hideChoice( allTypes, m_aLDAP );
-		lcl_hideChoice( allTypes, m_aOutlook );
-		lcl_hideChoice( allTypes, m_aOE );
+		bWithMozilla = false
 #endif
-
 #ifndef UNX
-		// no Evolution nor KDE address book on Windows systems
-		lcl_hideChoice( allTypes, m_aEvolution );
-		lcl_hideChoice( allTypes, m_aKab );
-#endif
-
-#ifdef UNX
-		// no Outlook / Outlook Express for ~NIX systems
-		lcl_hideChoice( allTypes, m_aOutlook );
-		lcl_hideChoice( allTypes, m_aOE );
-
+		bUnx = false;
+		bHaveEvolution = false;
+		bHaveKab = false;
+#else
 		Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
 
 		// check whether Evolution is available
-		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))) );
+		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
 		if ( !xDriver.is() )
-		    lcl_hideChoice( allTypes, m_aEvolution );
+			bHaveEvolution = false;
 
 		// check whether KDE address book is available
 		xDriver = xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab")));
 		if ( !xDriver.is() )
-		    lcl_hideChoice( allTypes, m_aKab );
+			bHaveKab = false;
 #endif
 
+		// Items are displayed in list order
+		m_aAllTypes.push_back( ButtonItem( &m_aEvolution, AST_EVOLUTION, bHaveEvolution ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK, bWithMozilla ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aThunderbird, AST_THUNDERBIRD, bWithMozilla ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aLDAP, AST_LDAP, bWithMozilla ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, bWithMozilla && !bUnx ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && !bUnx ) );
+		m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) );
+
 		Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
-		for (   ::std::vector< RadioButton* >::const_iterator loop = allTypes.begin();
-		        loop != allTypes.end();
-		        ++loop
-		    )
-			(*loop)->SetClickHdl( aTypeSelectionHandler );
+		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
+			  loop != m_aAllTypes.end(); ++loop )
+		{
+			ButtonItem aItem = *loop;
+			if (!aItem.m_bVisible)
+				aItem.m_pItem->Hide();
+			else
+			{
+				aItem.m_pItem->SetPosPixel( aTopLeft );
+				aTopLeft.Y() += (aItemSize.Height() * 5) / 4;
+				aItem.m_pItem->SetClickHdl( aTypeSelectionHandler );
+				aItem.m_pItem->Show();
+			}
+		}
 	}
 
 	//---------------------------------------------------------------------
@@ -171,15 +145,16 @@ namespace abp
 	{
 		AddressBookSourcePage::ActivatePage();
 
-        RadioButton* pOptions[] = {
-            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
-        };
-        for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
-            if ( (*pCheck)->IsChecked() )
-            {
-                (*pCheck)->GrabFocus();
+		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
+			  loop != m_aAllTypes.end(); ++loop )
+		{
+			ButtonItem aItem = (*loop);
+			if( aItem.m_pItem->IsChecked() && aItem.m_bVisible )
+			{
+				aItem.m_pItem->GrabFocus();
                 break;
             }
+		}
 
         getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
 	}
@@ -194,35 +169,24 @@ namespace abp
 	//---------------------------------------------------------------------
 	void TypeSelectionPage::selectType( AddressSourceType _eType )
 	{
-		m_aMORK.Check(AST_MORK == _eType);
-		m_aThunderbird.Check(AST_THUNDERBIRD == _eType);
-		m_aEvolution.Check(AST_EVOLUTION == _eType);
-		m_aKab.Check(AST_KAB == _eType);
-		m_aLDAP.Check(AST_LDAP == _eType);
-		m_aOutlook.Check(AST_OUTLOOK == _eType);
-		m_aOE.Check(AST_OE == _eType);
-		m_aOther.Check(AST_OTHER == _eType);
+		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
+			  loop != m_aAllTypes.end(); ++loop )
+		{
+			ButtonItem aItem = (*loop);
+			aItem.m_pItem->Check( _eType == aItem.m_eType );
+		}
 	}
 
 	//---------------------------------------------------------------------
-	AddressSourceType TypeSelectionPage::getSelectedType( )
-	{
-		if (m_aMORK.IsChecked())
-			return AST_MORK;
-		else if (m_aThunderbird.IsChecked())
-			return AST_THUNDERBIRD;
-		else if (m_aEvolution.IsChecked())
-			return AST_EVOLUTION;
-		else if (m_aKab.IsChecked())
-			return AST_KAB;
-		else if (m_aLDAP.IsChecked())
-			return AST_LDAP;
-		else if (m_aOutlook.IsChecked())
-			return AST_OUTLOOK;
-		else if (m_aOE.IsChecked())
-			return AST_OE;
-		else if (m_aOther.IsChecked())
-			return AST_OTHER;
+	AddressSourceType TypeSelectionPage::getSelectedType()
+	{
+		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
+			  loop != m_aAllTypes.end(); ++loop )
+		{
+			ButtonItem aItem = (*loop);
+			if ( aItem.m_pItem->IsChecked() )
+				return aItem.m_eType;
+		}
 
 		return AST_INVALID;
 	}
Index: extensions/source/abpilot/typeselectionpage.hxx
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
retrieving revision 1.8
diff -u -p -u -r1.8 typeselectionpage.hxx
--- openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	19 Dec 2005 17:28:44 -0000	1.8
+++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	16 Feb 2006 12:45:38 -0000
@@ -61,6 +61,8 @@ namespace abp
 		FixedLine		m_aTypeSep;
 		RadioButton		m_aMORK;
 		RadioButton		m_aThunderbird;
+		RadioButton		m_aEvolutionGroupwise;
+		RadioButton		m_aEvolutionLdap;
 		RadioButton		m_aEvolution;
 		RadioButton		m_aKab;
 		RadioButton		m_aLDAP;
@@ -68,6 +70,22 @@ namespace abp
 		RadioButton		m_aOE;
 		RadioButton		m_aOther;
 
+		struct ButtonItem {
+			RadioButton *m_pItem;
+			AddressSourceType m_eType;
+			bool         m_bVisible;
+
+			ButtonItem( RadioButton *pItem,
+						AddressSourceType eType,
+						bool         bVisible ) :
+					m_pItem( pItem ),
+					m_eType( eType ),
+					m_bVisible( bVisible )
+			{}
+		};
+
+		::std::vector< ButtonItem > m_aAllTypes;
+
 	public:
 		TypeSelectionPage( OAddessBookSourcePilot* _pParent );
 

workspace.evo2fixes.patch:
 EApi.cxx               |   21 ++---
 EApi.h                 |  135 ++++++++++++----------------------
 NCatalog.cxx           |   26 ++++++
 NCatalog.hxx           |    5 +
 NColumns.cxx           |  106 ++++++++++++++++++++++++++
 NColumns.hxx           |   73 ++++++++++++++++++
 NDatabaseMetaData.cxx  |   86 ++++++++++++++++++---
 NDatabaseMetaData.hxx  |   28 ++++++-
 NPreparedStatement.cxx |    5 -
 NResultSet.cxx         |  194 +++++++++++++++++++++++++++++++++++++++++++++----
 NResultSetMetaData.cxx |   41 ++++++++--
 NResultSetMetaData.hxx |   11 ++
 NStatement.cxx         |   33 ++++++--
 NTable.cxx             |  108 +++++++++++++++++++++++++++
 NTable.hxx             |   84 +++++++++++++++++++++
 NTables.cxx            |   17 +++-
 makefile.mk            |    2 
 17 files changed, 829 insertions(+), 146 deletions(-)

--- NEW FILE workspace.evo2fixes.patch ---
Index: connectivity/source/drivers/evoab2/EApi.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/EApi.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	8 Sep 2005 05:48:53 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	15 Feb 2006 12:15:24 -0000	1.3.74.1
@@ -36,17 +36,14 @@
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
 #include <stdio.h>
-#define _EVOLUTION_ALREADY_DEFINED_ 1
+#define  DECLARE_FN_POINTERS 1
 #ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
 #include "EApi.h"
 #endif
 static char *eBookLibNames[] = {
 	"libebook.so.8",	// evolution-2.0
-	"libebook-1.2.so.3"	// evolution-2.2
-	// FIXME: ask JPR about ABI compatibility going forwards
-	// "libebook-1.3.so.0",
-	// "libebook-1.4.so.0",
-	// "libebook-1.5.so.0"
+	"libebook-1.2.so.3", // evolution-2.2
+	"libebook-1.2.so.5"	 // evolution-2.4 and 2.6+
 };
 
 typedef void (*SymbolFunc) (void);
@@ -56,6 +53,8 @@ typedef void (*SymbolFunc) (void);
 	const char *sym_name;
 	SymbolFunc *ref_value;
     } aApiMap[] = {
+	SYM_MAP( e_contact_field_name ),
+	SYM_MAP( e_contact_get ),
 	SYM_MAP( e_contact_get_type ),
 	SYM_MAP( e_contact_field_id ),
 	SYM_MAP( e_source_peek_name ),
@@ -74,6 +73,7 @@ typedef void (*SymbolFunc) (void);
 	SYM_MAP( e_book_query_or ),
 	SYM_MAP( e_book_query_not ),
 	SYM_MAP( e_book_query_unref ),
+	SYM_MAP( e_book_query_from_string ),
 	SYM_MAP( e_book_query_to_string ),
 	SYM_MAP( e_book_query_field_exists ),
 	SYM_MAP( e_source_group_peek_base_uri)
@@ -121,13 +121,14 @@ bool EApiInit()
 
 #if 0
 
-  Test code - enable & 
+/*
+ * Test code - enable & 
  *
  * Compile with ( after source LinuxIntelEnv.Set.sh )
-   gcc $SOLARDEF -I $SOLARSRC/sal/inc -I $SOLARSRC/sal/unxlngi4.pro/inc \
+   gcc $SOLARDEF -I $SOLARVER/$UPD/$INPATH/inc \
      -I. `pkg-config --cflags --libs gobject-2.0` \
-     -L $SOLARSRC/sal/unxlngi4.pro/lib -luno_sal -lstdc++ EApi.cxx
- 
+     -L $SOLARVER/$UPD/$INPATH/lib -luno_sal -lstdc++ EApi.cxx
+ */ 
 
 int main( int argc, char **argv)
 {
Index: connectivity/source/drivers/evoab2/EApi.h
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/EApi.h,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/EApi.h	8 Sep 2005 05:49:08 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.h	15 Feb 2006 12:15:25 -0000	1.3.74.1
@@ -51,52 +51,41 @@ G_BEGIN_DECLS
 // We attempt to define a minimum API that we use:
 
 // e-contact.h
+#ifdef DECLARE_FN_POINTERS
+#define EAPI_EXTERN
+#else
+#define EAPI_EXTERN extern
+#endif
+
+
 typedef void EContact;
 #define E_CONTACT(a) ((EContact *)(a))
 #define E_TYPE_CONTACT (e_contact_get_type())
 typedef int EContactField;
 
+EAPI_EXTERN const char      *(*e_contact_field_name)   ( EContactField field_id);
+EAPI_EXTERN gpointer      	(*e_contact_get)   (EContact *contact, EContactField field_id);
+EAPI_EXTERN const gpointer  (*e_contact_get_const)   (EContact *contact, EContactField field_id);
 // e-source.h
 typedef void ESource;
 #define E_SOURCE(a) ((ESource *)(a))
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-const char  *(*e_source_peek_name)    (ESource *source);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-const gchar *(*e_source_get_property) (ESource *source,
+EAPI_EXTERN const char  *(*e_source_peek_name)    (ESource *source);
+EAPI_EXTERN const gchar *(*e_source_get_property) (ESource *source,
 				       const gchar *property);
 
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-GType         (*e_contact_get_type) (void);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EContactField (*e_contact_field_id) (const char *field_name);
+EAPI_EXTERN GType         (*e_contact_get_type) (void);
+EAPI_EXTERN EContactField (*e_contact_field_id) (const char *field_name);
 
 // e-source-list.h
 typedef void ESourceList;
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-GSList *(*e_source_list_peek_groups) (ESourceList *list);
+EAPI_EXTERN GSList *(*e_source_list_peek_groups) (ESourceList *list);
 
 // e-source-group.h
 typedef void ESourceGroup;
 #define E_SOURCE_GROUP(a) ((ESourceGroup *)(a))
 
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-GSList  *(*e_source_group_peek_sources) (ESourceGroup *group);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-const char *(*e_source_group_peek_base_uri)  (ESourceGroup *group);
+EAPI_EXTERN GSList  *(*e_source_group_peek_sources) (ESourceGroup *group);
+EAPI_EXTERN const char *(*e_source_group_peek_base_uri)  (ESourceGroup *group);
 // e-book.h
 typedef enum {
   E_BOOK_QUERY_IS,
@@ -108,76 +97,54 @@ typedef enum {
 typedef void EBook;
 typedef void EBookQuery;
 
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBook      *(*e_book_new)                     (ESource      *source,
+EAPI_EXTERN EBook      *(*e_book_new) 		(ESource      *source,
 					       GError      **error);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-gboolean    (*e_book_open)                    (EBook       *book,
+
+EAPI_EXTERN gboolean    (*e_book_open)		(EBook       *book,
 					       gboolean     only_if_exists,
 					       GError     **error);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-const char *(*e_book_get_uri)                 (EBook        *book);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-ESource    *(*e_book_get_source)              (EBook        *book);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-gboolean    (*e_book_get_addressbooks)        (ESourceList **addressbook_sources,
+
+EAPI_EXTERN const char *(*e_book_get_uri)	(EBook        *book);
+EAPI_EXTERN ESource    *(*e_book_get_source)(EBook        *book);
+
+EAPI_EXTERN gboolean    (*e_book_get_addressbooks)        (ESourceList **addressbook_sources,
 					       GError      **error);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-gboolean    (*e_book_get_contacts)            (EBook        *book,
+
+EAPI_EXTERN gboolean    (*e_book_get_contacts)            (EBook        *book,
 					       EBookQuery   *query,
 					       GList       **contacts,
 					       GError      **error);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-gboolean    (*e_book_authenticate_user)       (EBook        *book,
+
+EAPI_EXTERN gboolean    (*e_book_authenticate_user)       (EBook        *book,
 					       const char   *user,
 					       const char   *passwd,
 					       const char   *auth_method,
 					       GError      **error);
 
 // e-book-query.h
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBookQuery* (*e_book_query_field_exists) (EContactField   field);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBookQuery* (*e_book_query_field_test)   (EContactField   field,
+EAPI_EXTERN EBookQuery* (*e_book_query_field_exists) (EContactField   field);
+EAPI_EXTERN EBookQuery* (*e_book_query_field_test)   (EContactField   field,
 					  EBookQueryTest     test,
 					  const char        *value);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBookQuery* (*e_book_query_and)          (int nqs, EBookQuery **qs, gboolean unref);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBookQuery* (*e_book_query_or)           (int nqs, EBookQuery **qs, gboolean unref);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-EBookQuery* (*e_book_query_not)          (EBookQuery *q, gboolean unref);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-void        (*e_book_query_unref)        (EBookQuery *q);
-#ifndef _EVOLUTION_ALREADY_DEFINED_
-extern
-#endif
-char*       (*e_book_query_to_string)    (EBookQuery *q);
+EAPI_EXTERN EBookQuery* (*e_book_query_and)          (int nqs, EBookQuery **qs, gboolean unref);
+EAPI_EXTERN EBookQuery* (*e_book_query_or)           (int nqs, EBookQuery **qs, gboolean unref);
+EAPI_EXTERN EBookQuery* (*e_book_query_not)          (EBookQuery *q, gboolean unref);
+EAPI_EXTERN void        (*e_book_query_unref)        (EBookQuery *q);
+EAPI_EXTERN char*       (*e_book_query_to_string)    (EBookQuery *q);
+EAPI_EXTERN EBookQuery* (*e_book_query_from_string)   (const char *query_string);
+
+typedef struct {
+        char *address_format; /* the two letter country code that
+                                 determines the format/meaning of the
+                                 following fields */
+        char *po;
+        char *ext;
+        char *street;
+        char *locality;
+        char *region;
+        char *code;
+        char *country;
+} EContactAddress;
 G_END_DECLS
 #endif
+
Index: connectivity/source/drivers/evoab2/NCatalog.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NCatalog.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx	8 Sep 2005 05:49:21 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx	15 Feb 2006 12:15:26 -0000	1.3.74.1
@@ -72,7 +72,7 @@ void OEvoabCatalog::refreshTables()
 {
 	TStringVector aVector;
 	Sequence< ::rtl::OUString > aTypes(1);
-	aTypes[0] = ::rtl::OUString::createFromAscii("%");
+	aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
 	Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
 		::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
 
@@ -92,3 +92,27 @@ void OEvoabCatalog::refreshTables()
 	else
 		m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector);
 }
+// XTablesSupplier
+Reference< XNameAccess > SAL_CALL  OEvoabCatalog::getTables(  ) throw(RuntimeException)
+{
+        ::osl::MutexGuard aGuard(m_aMutex);
+
+        try
+        {
+                if (!m_pTables) {
+                        refreshTables();
+                        }
+        }
+        catch( const RuntimeException& )
+        {
+                // allowed to leave this method
+                throw;
+        }
+        catch( const Exception& )
+        {
+                // allowed
+        }
+
+        return m_pTables;
+}
+
Index: connectivity/source/drivers/evoab2/NCatalog.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NCatalog.hxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx	8 Sep 2005 05:49:37 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx	15 Feb 2006 12:15:26 -0000	1.3.74.1
@@ -51,11 +51,14 @@ namespace connectivity
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
 		public:
 			OEvoabCatalog(OEvoabConnection *_pCon);
-
+			inline OEvoabConnection* getConnection() const { return m_pConnection; }
 			virtual void refreshTables();
 			virtual void refreshViews() {}
 			virtual void refreshGroups() {}
 			virtual void refreshUsers() {}
+ // XTablesSupplier
+                        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables(
+                                        ) throw(::com::sun::star::uno::RuntimeException);
 		};
 	}
 }
Index: connectivity/source/drivers/evoab2/NColumns.cxx
===================================================================
RCS file: connectivity/source/drivers/evoab2/NColumns.cxx
diff -N connectivity/source/drivers/evoab2/NColumns.cxx
--- openoffice.org//dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org/connectivity/source/drivers/evoab2/NColumns.cxx	15 Feb 2006 12:15:28 -0000	1.1.2.1
@@ -0,0 +1,106 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: cws-evo2fixes.diff,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: michael $ $Date: 2006/02/16 11:12:13 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser 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
+ *
+ *    Contributor(s): Jayant Madavi_______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "NColumns.hxx"
+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
+#include "NTable.hxx"
+#endif
+#ifndef _CONNECTIVITY_EVOAB_TABLES_HXX_
+#include "NTables.hxx"
+#endif
+#ifndef _CONNECTIVITY_EVOAB_CATALOG_HXX_
+#include "NCatalog.hxx"
+#endif
+
+#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
+#include "connectivity/sdbcx/VColumn.hxx"
+#endif
+
+using namespace connectivity::sdbcx;
+using namespace connectivity;
+using namespace ::comphelper;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace connectivity::evoab;
+
+// -------------------------------------------------------------------------
+sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
+{
+	Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
+		Any(),
+		m_pTable->getSchema(),
+		m_pTable->getTableName(),
+		_rName);
+
+	sdbcx::ObjectType xRet = NULL;
+	if (xResult.is())
+	{
+		Reference< XRow > xRow(xResult,UNO_QUERY);
+
+		while (xResult->next())
+		{
+			if (xRow->getString(4) == _rName)
+			{
+				OColumn* pRet = new OColumn(
+						_rName,
+						xRow->getString(6),
+						xRow->getString(13),
+						xRow->getInt(11),
+						xRow->getInt(7),
+						xRow->getInt(9),
+						xRow->getInt(5),
+						sal_False,
+						sal_False,
+						sal_False,
+						sal_True);
+				xRet = pRet;
+				break;
+			}
+		}
+	}
+
+	return xRet;
+}
+// -------------------------------------------------------------------------
+void OEvoabColumns::impl_refresh() throw(RuntimeException)
+{
+	m_pTable->refreshColumns();
+}
Index: connectivity/source/drivers/evoab2/NColumns.hxx
===================================================================
RCS file: connectivity/source/drivers/evoab2/NColumns.hxx
diff -N connectivity/source/drivers/evoab2/NColumns.hxx
--- openoffice.org//dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org/connectivity/source/drivers/evoab2/NColumns.hxx	15 Feb 2006 12:15:29 -0000	1.1.2.1
@@ -0,0 +1,73 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: cws-evo2fixes.diff,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: michael $ $Date: 2006/02/16 11:12:13 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser 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
+ *
+ *    Contributor(s): Jayant Madavi_______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _CONNECTIVITY_EVOAB_COLUMNS_HXX_
+#define _CONNECTIVITY_EVOAB_COLUMNS_HXX_
+
+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
+#include "NTable.hxx"
+#endif
+
+#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
+#include "connectivity/sdbcx/VCollection.hxx"
+#endif
+
+namespace connectivity
+{
+	namespace evoab
+	{
+		class OEvoabColumns : public sdbcx::OCollection
+		{
+		protected:
+			OEvoabTable*	m_pTable;
+
+			virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+			virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
+
+		public:
+			OEvoabColumns(	OEvoabTable* _pTable,
+						::osl::Mutex& _rMutex,
+						const TStringVector &_rVector
+						) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector),
+							m_pTable(_pTable)
+			{ }
+		};
+	}
+}
+
+#endif // _CONNECTIVITY_EVOAB_COLUMNS_HXX_
Index: connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	8 Sep 2005 05:50:17 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	15 Feb 2006 12:15:29 -0000	1.3.74.1
@@ -89,15 +89,31 @@ namespace connectivity
 		static sal_Int32    const s_nNULLABLE = 1;
 		static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
 
-static GParamSpec **pFields = NULL;
+		static ColumnProperty **pFields=NULL;
 static guint        nFields = 0;
 
-static const char *pBlackList[] = {
+        static const char *pBlackList[] = 
+        {
 		"id",
-		"list-show-addresses"
+            "list-show-addresses",
+            "address-label-home",
+            "address-label-work",
+            "address-label-other"
 };
 
 static void
+    splitColumn (ColumnProperty **pToBeFields)
+    {
+        for (int i = 0; i < OTHER_ZIP; i++) 
+        {
+            pToBeFields[nFields] = g_new0(ColumnProperty,1);
+            pToBeFields[nFields]->bIsSplittedValue = true;
+            pToBeFields[nFields]->pField = g_param_spec_ref(g_param_spec_string (evo_addr[i].pColumnName,evo_addr[i].pColumnName,"",NULL,G_PARAM_WRITABLE));
+            nFields++;
+        }
+    }
+
+    static void
 initFields()
 {
 	if( !pFields )
@@ -106,13 +122,13 @@ initFields()
 		if( !pFields )
 		{
 			guint        nProps;
+                ColumnProperty **pToBeFields;
 			GParamSpec **pProps;
-			GParamSpec **pToBeFields;
+                nFields = 0;
 			pProps = g_object_class_list_properties
 					( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
 					  &nProps );
-			pToBeFields = g_new0( GParamSpec *, nProps );
-
+                pToBeFields = g_new0(ColumnProperty  *, (nProps + OTHER_ZIP)/* new column(s)*/ );
 			for ( guint i = 0; i < nProps; i++ )
 			{
 				switch (pProps[i]->value_type)
@@ -131,18 +147,25 @@ initFields()
 						}
 					}
 					if( bAdd )
-						pToBeFields[ nFields++ ] = g_param_spec_ref( pProps[i] );
+                            {
+                                pToBeFields[nFields]= g_new0(ColumnProperty,1);
+                                pToBeFields[nFields]->bIsSplittedValue=false;
+                                pToBeFields[ nFields++ ]->pField = g_param_spec_ref( pProps[i] );
+                            }
 					break;
 				}
 				default:
 					break;
 				}
 			}
+			
+                splitColumn(pToBeFields);
 			pFields = pToBeFields;
 		}
 	}
 }
 
+
 guint
 getFieldCount()
 {
@@ -150,7 +173,7 @@ getFieldCount()
 	return nFields;
 }
 
-const GParamSpec *
+    const ColumnProperty *
 getField(guint n)
 {
 	initFields();
@@ -167,7 +190,7 @@ getFieldType( sal_Int32 nCol )
 	initFields();
 	if (nCol >= 0 && nCol < nFields )
 	{
-		if( pFields[nCol]->value_type == G_TYPE_STRING )
+            if( ((GParamSpec *)pFields[nCol]->pField)->value_type == G_TYPE_STRING )
 			nType = DataType::VARCHAR;
 		else 
 			nType = DataType::BIT;
@@ -175,6 +198,23 @@ getFieldType( sal_Int32 nCol )
 	return nType;
 }
 
+    sal_Int32 findEvoabField(const rtl::OUString& aColName)
+    {
+        sal_Int32 nRet = -1;	
+        sal_Bool bFound = sal_False;
+        initFields();
+        for (int i=0;(i < nFields) && !bFound;i++)
+        {
+            rtl::OUString aName = getFieldName(i);
+            if (aName == aColName)
+            {
+                nRet = i;
+                bFound = sal_True;
+            }
+        }
+        return nRet;
+    }
+
 rtl::OUString
 getFieldTypeName( sal_Int32 nCol )
 {
@@ -193,8 +233,9 @@ getFieldTypeName( sal_Int32 nCol )
 rtl::OUString
 getFieldName( sal_Int32 nCol )
 {
-	const GParamSpec *pSpec = getField( nCol );
+        const GParamSpec *pSpec = getField( nCol )->pField;
 	rtl::OUString aName;
+        initFields();
 
 	if( pSpec )
 			aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ),
@@ -203,15 +244,36 @@ getFieldName( sal_Int32 nCol )
 	return aName;
 }
 
+    void  
+    free_column_resources()
+    {
+        for (int i=nFields-1;i > 0;i--) 
+        {
+            if (pFields && pFields[i] ) 
+            {
+                if (pFields[i]->pField) 
+                    g_param_spec_unref(pFields[i]->pField);
+                g_free(pFields[i]);
+            }
+        }
+       if(pFields) 
+        {
+            g_free(pFields);
+            pFields=NULL;
+        }
+	
 	}
+
+
 }
+}
+
 
 OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon)
 	: ::connectivity::ODatabaseMetaDataBase(_pCon)
 	,m_pConnection(_pCon)
 {
 	OSL_ENSURE(m_pConnection,"OEvoabDatabaseMetaData::OEvoabDatabaseMetaData: No connection set!");
-	//construct();
 }
 void OEvoabDatabaseMetaData::construct()
 {
@@ -272,7 +334,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_C
 			aRow[5] = new ORowSetValueDecorator( static_cast<sal_Int16>( getFieldType( i ) ) );
 			aRow[6] = new ORowSetValueDecorator( getFieldTypeName( i ) );
 
-			OSL_TRACE( "   ColumnName = '%s'", g_param_spec_get_name( pFields[i] ) );
+			OSL_TRACE( "   ColumnName = '%s'", g_param_spec_get_name( pFields[i]->pField ) );
 			// COLUMN_NAME
 			aRow[4] = new ORowSetValueDecorator( getFieldName( i ) );
 			// ORDINAL_POSITION
Index: connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx,v
retrieving revision 1.5
retrieving revision 1.5.24.1
diff -u -p -u -p -w -r1.5 -r1.5.24.1
--- openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	19 Jan 2006 17:18:17 -0000	1.5
+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	15 Feb 2006 12:15:30 -0000	1.5.24.1
@@ -60,12 +60,38 @@ namespace connectivity
 		//**************************************************************
 		//************ Class: OEvoabDatabaseMetaData
 		//**************************************************************
+		typedef struct{
+			gboolean bIsSplittedValue;
+			GParamSpec *pField;
+		}ColumnProperty;
+
+		typedef enum {
+			DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP,
+			WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP,
+			HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP,
+			OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP
+		}ColumnNumber;
+
+		typedef struct {
+			const gchar *pColumnName;
+			ColumnNumber value;
+		}SplitEvoColumns;
+
+		static SplitEvoColumns evo_addr[] = {
+			{"addr-line1",DEFAULT_ADDR_LINE1},{"addr-line2",DEFAULT_ADDR_LINE2},{"city",DEFAULT_CITY},{"state",DEFAULT_STATE},{"country",DEFAULT_COUNTRY},{"zip",DEFAULT_ZIP},
+			{"work-addr-line1",WORK_ADDR_LINE1},{"work-addr-line2",WORK_ADDR_LINE2},{"work-city",WORK_CITY},{"work-state",WORK_STATE},{"work-country",WORK_COUNTRY},{"work-zip",WORK_ZIP},
+			{"home-addr-line1",HOME_ADDR_LINE1},{"home-addr-line2",HOME_ADDR_LINE2},{"home-addr-City",HOME_CITY},{"home-state",HOME_STATE},{"home-country",HOME_COUNTRY},{"home-zip",HOME_ZIP},
+			{"other-addr-line1",OTHER_ADDR_LINE1},{"other-addr-line2",OTHER_ADDR_LINE2},{"other-addr-city",OTHER_CITY},{"other-addr-state",OTHER_STATE},{"other-addr-country",OTHER_COUNTRY},{"other-addr-zip",OTHER_ZIP}
+		};
 
-		const GParamSpec *getField(guint n);
+		const ColumnProperty *getField(guint n);
 		guint             getFieldCount();
 		sal_Int32		 getFieldType(sal_Int32 nCol);
 		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
 		rtl::OUString     getFieldName(sal_Int32 nCol);
+		sal_Int32             findEvoabField(const rtl::OUString& aColName);
+		
+		void free_column_resources();
 		
 		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
 		{
Index: connectivity/source/drivers/evoab2/NPreparedStatement.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NPreparedStatement.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	8 Sep 2005 05:51:42 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	15 Feb 2006 12:15:31 -0000	1.3.74.1
@@ -121,9 +121,8 @@ void SAL_CALL OEvoabPreparedStatement::c
 	::osl::MutexGuard aGuard( m_aMutex );
 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 		
-
+	free_column_resources();
 	// Reset last warning message
-
 	try {
 		clearWarnings ();
 		OStatement_BASE2::close();
@@ -132,8 +131,6 @@ void SAL_CALL OEvoabPreparedStatement::c
 		// If we get an error, ignore
 	}
 
-	// Remove this Statement object from the Connection object's
-	// list
 }
 // -------------------------------------------------------------------------
 
Index: connectivity/source/drivers/evoab2/NResultSet.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSet.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx	8 Sep 2005 05:52:10 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx	15 Feb 2006 12:15:32 -0000	1.3.74.1
@@ -110,7 +110,6 @@ using namespace com::sun::star::io;
 using namespace ::com::sun::star::util;
 
 //------------------------------------------------------------------------------
-//	IMPLEMENT_SERVICE_INFO(OEvoabResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 ::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)	\
 {
 	return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet");
@@ -276,6 +275,7 @@ void OEvoabResultSet::construct( EBookQu
 			m_pConnection->setPassword( aPassword );
 		}
 		m_nLength = g_list_length( m_pContacts );
+
 		OSL_TRACE( "Query return %d records", m_nLength );
 		m_nIndex = -1;
 	}
@@ -310,35 +310,195 @@ Any SAL_CALL OEvoabResultSet::queryInter
 	return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
 
+static int 
+whichAddress(int value)
+{
+	int fieldEnum;
+	switch (value) 
+	{
+		case HOME_ADDR_LINE1:
+		case HOME_ADDR_LINE2:
+		case HOME_CITY:
+		case HOME_STATE:
+		case HOME_COUNTRY:
+		case HOME_ZIP: 
+			fieldEnum = e_contact_field_id("address_home");
+			break;
+
+		case WORK_ADDR_LINE1:
+		case WORK_ADDR_LINE2:
+		case WORK_CITY:
+		case WORK_STATE:
+		case WORK_COUNTRY:
+		case WORK_ZIP: 
+			fieldEnum = e_contact_field_id("address_work");
+			break;
+
+		case OTHER_ADDR_LINE1:
+		case OTHER_ADDR_LINE2:
+		case OTHER_CITY:
+		case OTHER_STATE:
+		case OTHER_COUNTRY:
+		case OTHER_ZIP: 
+			fieldEnum = e_contact_field_id("address_other");
+			break;
+
+	    	default: fieldEnum = e_contact_field_id("address_home");
+	  }
+	return fieldEnum;
+}
+
+/*
+* This function decides the default column values based on the first field of EContactAddress.
+* The search order is Work->Home->other(defaults).
+*/
+static EContactAddress * 
+getDefaultContactAddress(EContact *pContact,int *value) 
+{
+	EContactAddress *ec = (EContactAddress *)e_contact_get(pContact,whichAddress(WORK_ADDR_LINE1));
+	if ( ec && (strlen(ec->street)>0) ) 
+	{
+		*value= *value +WORK_ADDR_LINE1 -1;
+		return ec;	
+	}
+	else  
+		{
+			ec = (EContactAddress *)e_contact_get(pContact,whichAddress(HOME_ADDR_LINE1));
+			if ( ec && (strlen(ec->street)>0) ) 
+			{ 
+				*value=*value+HOME_ADDR_LINE1-1;
+				return ec;
+			}
+		}
+
+	*value=*value+OTHER_ADDR_LINE1-1;
+	return (EContactAddress *)e_contact_get(pContact,whichAddress(OTHER_ADDR_LINE1));
+}
+
+static EContactAddress* 
+getContactAddress(EContact *pContact, int * address_enum) 
+{ 
+	EContactAddress *ec = NULL;
+    switch (*address_enum) {
+	
+        case DEFAULT_ADDR_LINE1:
+        case DEFAULT_ADDR_LINE2:
+        case DEFAULT_CITY:
+        case DEFAULT_STATE:
+        case DEFAULT_COUNTRY:
+        case DEFAULT_ZIP:
+			ec = getDefaultContactAddress(pContact,address_enum);break;
+   		default:
+			ec = (EContactAddress *)e_contact_get(pContact,whichAddress(*address_enum));
+    }
+	return ec;
+}
+
+static bool 
+handleSplitAddress(EContact *pContact,GValue *pStackValue,int value) 
+{
+
+	EContactAddress *ec = getContactAddress(pContact,&value) ;
+
+	if (ec==NULL)
+		return true;
+
+	switch (value) {
+    	case WORK_ADDR_LINE1:
+		    g_value_set_string(pStackValue,ec->street ); break;
+	    case WORK_ADDR_LINE2:
+		    g_value_set_string(pStackValue,ec->po ); break;
+    	case WORK_CITY: 
+	    	g_value_set_string(pStackValue,ec->locality ); break;
+    	case WORK_STATE:
+ 	    	g_value_set_string(pStackValue,ec->region ); break;
+    	case WORK_COUNTRY:
+	    	g_value_set_string(pStackValue,ec->country ); break;
+    	case WORK_ZIP:
+	    	g_value_set_string(pStackValue,ec->code ); break;
+
+        case HOME_ADDR_LINE1:
+			g_value_set_string(pStackValue,ec->street ); break;
+        case HOME_ADDR_LINE2:
+			g_value_set_string(pStackValue,ec->po ); break;
+        case HOME_CITY:
+			g_value_set_string(pStackValue,ec->locality ); break;
+        case HOME_STATE:
+			g_value_set_string(pStackValue,ec->region ); break;
+        case HOME_COUNTRY:
+			g_value_set_string(pStackValue,ec->country ); break;
+        case HOME_ZIP:
+			g_value_set_string(pStackValue,ec->code ); break;
+
+        case OTHER_ADDR_LINE1:
+			g_value_set_string(pStackValue,ec->street ); break;
+        case OTHER_ADDR_LINE2:
+			g_value_set_string(pStackValue,ec->po ); break;
+        case OTHER_CITY:
+			g_value_set_string(pStackValue,ec->locality ); break;
+        case OTHER_STATE:
+			g_value_set_string(pStackValue,ec->region ); break;
+        case OTHER_COUNTRY:
+			g_value_set_string(pStackValue,ec->country ); break;
+        case OTHER_ZIP:
+			g_value_set_string(pStackValue,ec->code ); break;
+
+	}
+
+return false;
+}
 // -------------------------------------------------------------------------
 // XRow Interface 
 
 bool
 OEvoabResultSet::getValue( sal_Int32 nColumnNum, GType nType, GValue *pStackValue)
 {
-	const GParamSpec *pSpec = evoab::getField (nColumnNum - 1);
+	const ColumnProperty * pSpecs = evoab::getField (nColumnNum );
+	if (!pSpecs) 
+		return sal_False;
+	GParamSpec *pSpec = pSpecs->pField;
+	gboolean bIsSplittedColumn=pSpecs->bIsSplittedValue;
 	EContact *pContact = getCur();
 	
 	m_bWasNull = true;
-	if (!pSpec || !pContact)
+	if (!pSpec || !pContact) {
 		return false;
-
+	}
 	if (G_PARAM_SPEC_VALUE_TYPE (pSpec) != nType)
 	{
-		g_warning ("Wrong type");
+#ifdef DEBUG
+		g_warning ("Wrong type (0x%x) (0x%x) '%s'",
+				   (int)G_PARAM_SPEC_VALUE_TYPE (pSpec), (int) nType,
+				   pSpec->name ? pSpec->name : "<noname>");
+#endif
 		return false;
 	}
 	g_value_init (pStackValue, nType);
+	if (bIsSplittedColumn)
+	{
+		for (int i=0;i<OTHER_ZIP;i++)
+		{
+			if (0 == strcmp (g_param_spec_get_name ((GParamSpec *)pSpec), evo_addr[i].pColumnName))
+			{
+				m_bWasNull = handleSplitAddress (pContact, pStackValue, evo_addr[i].value);
+				return true;
+			}
+		}
+	}
+	else
+	{
 	g_object_get_property (G_OBJECT (pContact),
 						   g_param_spec_get_name ((GParamSpec *) pSpec),
 						   pStackValue);
 	if (G_VALUE_TYPE (pStackValue) != nType)
 	{
+#ifdef DEBUG
 		g_warning ("Fetched type mismatch");
+#endif
 		g_value_unset (pStackValue);
 		return false;
 	}
-
+	}
 	m_bWasNull = false;
 	return true;
 }
@@ -355,15 +515,19 @@ OEvoabResultSet::getValue( sal_Int32 nCo
 	::osl::MutexGuard aGuard( m_aMutex );
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 	rtl::OUString aResult;
-
+	if ( m_xMetaData.is())
+        {
+                OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get();
+                sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum);
 	GValue aValue = { 0, };
-	if (getValue (nColumnNum, G_TYPE_STRING, &aValue))
+		if (getValue (nFieldNumber, G_TYPE_STRING, &aValue))
 	{
 		const char *pStr = g_value_get_string (&aValue);
 		rtl::OString aStr (pStr ? pStr : "");
 		aResult = rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 );
 		g_value_unset (&aValue);
 	}
+	}
 	return aResult;
 }
 // -------------------------------------------------------------------------
@@ -373,12 +537,17 @@ sal_Bool SAL_CALL OEvoabResultSet::getBo
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 	sal_Bool bResult = sal_False;
 
+	if ( m_xMetaData.is())
+        {
+                OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get();
+                sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum);
 	GValue aValue = { 0, };
-	if (getValue (nColumnNum, G_TYPE_BOOLEAN, &aValue))
+		if (getValue (nFieldNumber, G_TYPE_BOOLEAN, &aValue))
 	{
 		bResult = g_value_get_boolean (&aValue);
 		g_value_unset (&aValue);
 	}
+	}
 	return bResult ? sal_True : sal_False;
 }
 // -------------------------------------------------------------------------
@@ -606,6 +775,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 	m_nIndex = 0;
+	return true;
 }
 // -------------------------------------------------------------------------
 
@@ -615,6 +785,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last(
 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 	m_nIndex = m_nLength - 1;
+	return true;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
@@ -711,7 +882,6 @@ void SAL_CALL OEvoabResultSet::close(  )
 	{
 		::osl::MutexGuard aGuard( m_aMutex );
 		checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-
 	}
 	OSL_TRACE("In/Out: OEvoabResultSet::close" );
 	dispose();
@@ -795,9 +965,7 @@ sal_Bool OEvoabResultSet::convertFastPro
 // -------------------------------------------------------------------------
 void OEvoabResultSet::setFastPropertyValue_NoBroadcast(
 								sal_Int32 nHandle,
-								const Any& rValue
-												 )
-												 throw (Exception)
+								const Any& rValue) throw (Exception)
 {
 	switch(nHandle)
 	{
Index: connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	8 Sep 2005 05:52:42 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	15 Feb 2006 12:15:32 -0000	1.3.74.1
@@ -45,6 +45,7 @@
 #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
 #include <com/sun/star/sdbc/DataType.hpp>
 #endif
+#include "NDebug.hxx"
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
@@ -52,7 +53,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
 OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) 
-	: m_aTableName(_aTableName)
+	: m_aTableName(_aTableName),
+	  m_aEvoabFields()
 {
 
 }
@@ -61,6 +63,27 @@ OEvoabResultSetMetaData::~OEvoabResultSe
 {
 }
 // -------------------------------------------------------------------------
+void OEvoabResultSetMetaData::setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+{
+        OSQLColumns::const_iterator aIter;
+        static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
+
+        for (aIter = xColumns->begin(); aIter != xColumns->end(); ++aIter)
+        {
+                ::rtl::OUString aFieldName;
+                sal_uInt32 nFieldNumber;
+
+                (*aIter)->getPropertyValue(aName) >>= aFieldName;
+                nFieldNumber = findEvoabField(aFieldName);
+		if (nFieldNumber == -1)
+		::dbtools::throwGenericSQLException(
+			::rtl::OUString::createFromAscii("Invalid column name: ") + aFieldName,
+			NULL);
+                m_aEvoabFields.push_back(nFieldNumber);
+        }
+}
+
+// -------------------------------------------------------------------------
 void OEvoabResultSetMetaData::checkColumnIndex(sal_Int32 nColumnNum)  throw(SQLException, RuntimeException)
 {
 	if( nColumnNum <= 0 || nColumnNum > getColumnCount() )
@@ -74,12 +97,13 @@ sal_Int32 SAL_CALL OEvoabResultSetMetaDa
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
-	return evoab::getFieldType (nColumnNum - 1);
+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
+	return evoab::getFieldType (nField);
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
-	return evoab::getFieldCount();
+	return m_aEvoabFields.size();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
@@ -94,17 +118,22 @@ sal_Bool SAL_CALL OEvoabResultSetMetaDat
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
-	return evoab::getFieldName( nColumnNum - 1 );
+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
+        return evoab::getFieldName( nField );
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
-	return evoab::getFieldTypeName( nColumnNum - 1 );
+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
+	return evoab::getFieldTypeName( nField );
 }
 // -------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
-	const GParamSpec *pSpec = getField( nColumnNum - 1 );
+	
+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
+	const ColumnProperty *pSpecs = getField(nField); 
+	GParamSpec *pSpec = pSpecs->pField;
 	rtl::OUString aLabel;
 
 	if( pSpec )
Index: connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	8 Sep 2005 05:52:57 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	15 Feb 2006 12:15:33 -0000	1.3.74.1
@@ -46,6 +46,9 @@
 #ifndef _CONNECTIVITY_EVOAB_CONNECTION_HXX_
 #include "NConnection.hxx"
 #endif 
+#ifndef _VOS_REF_HXX_
+#include <vos/ref.hxx>
+#endif
 #include <com/sun/star/connection/XConnection.hpp>
 namespace connectivity
 {
@@ -59,11 +62,17 @@ namespace connectivity
 		class OEvoabResultSetMetaData :	public 	OResultSetMetaData_BASE
 		{
 		  ::rtl::OUString       m_aTableName;
+                  ::std::vector<sal_Int32>        m_aEvoabFields;
+
 		protected:
 			virtual ~OEvoabResultSetMetaData();
 		public:
 		  OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName);
-
+		  void setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
+		  inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
+                        { return m_aEvoabFields[columnIndex - 1]; }
+		  inline sal_Int32 getFieldSize() const 
+			{return m_aEvoabFields.size();}
 		  /// Avoid ambigous cast error from the compiler.
 		  inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
 		  { return this; }
Index: connectivity/source/drivers/evoab2/NStatement.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NStatement.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx	8 Sep 2005 05:53:24 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx	15 Feb 2006 12:15:33 -0000	1.3.74.1
@@ -195,8 +195,7 @@ void OStatement_Base::clearMyResultSet (
 EBookQuery *
 OStatement_Base::createTrue()
 { // Not the world's most efficient unconditional true but ...
-//FIXME: make enum hack to make it gud integer (E_CONTACT_FULL_NAME);
-return  e_book_query_field_exists (3);
+	return e_book_query_from_string("(exists \"full_name\")");
 }
 
 EBookQuery *
@@ -380,19 +379,28 @@ EBookQuery *OStatement_Base::whereAnalys
 			else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) )
 			{   // One occurance of '%'  matches...
                 if ( aMatchString.indexOf ( WILDCARD ) == 0 )
-					pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH, aMatchString.copy( 1 ) );
+					pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) );
 
                 else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 )
-					pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
+					pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH, aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
 
 				else
-				{
 					::dbtools::throwGenericSQLException(
-						::rtl::OUString::createFromAscii( "like statement contains too many wildcards" ), NULL );
-				}
+						::rtl::OUString::createFromAscii( "like statement contains wildcard in the middle" ), NULL );
+					
+
 				if( pResult && bNotLike )
 					pResult = e_book_query_not( pResult, TRUE );
             }
+			else if( aMatchString.getLength() >= 3 &&
+					 aMatchString.indexOf ( WILDCARD ) == 0 &&
+					 aMatchString.indexOf ( WILDCARD, 1) == aMatchString.getLength() - 1 ) {
+				// one '%' at the start and another at the end
+				pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, aMatchString.copy (1, aMatchString.getLength() - 2) );
+			}
+			else
+				::dbtools::throwGenericSQLException(
+					::rtl::OUString::createFromAscii( "like statement contains too many wildcards" ), NULL );
 		}
 		else
 				OSL_ASSERT( "Serious internal error" );
@@ -485,11 +493,20 @@ Reference< XResultSet > SAL_CALL OStatem
 	g_message( "Parsed SQL to sexpr '%s'\n", pSexpr );
 	g_free( pSexpr );
 #endif
-
+ 	::vos::ORef<connectivity::OSQLColumns> xColumns;
 	if (pQuery)
 	{
 		pResult->construct( pQuery, aTable, bIsWithoutWhere );
 		e_book_query_unref( pQuery );
+		xColumns = m_aSQLIterator.getSelectColumns();
+		if (!xColumns.isValid())
+		{
+			::dbtools::throwGenericSQLException(
+				::rtl::OUString::createFromAscii("Invalid selection of columns"),
+				NULL);
+		}
+		OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) pResult->getMetaData().get();
+		pMeta->setEvoabFields(xColumns);
 	}
 	m_xResultSet = xRS;
 	
Index: connectivity/source/drivers/evoab2/NTable.cxx
===================================================================
RCS file: connectivity/source/drivers/evoab2/NTable.cxx
diff -N connectivity/source/drivers/evoab2/NTable.cxx
--- openoffice.org//dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org/connectivity/source/drivers/evoab2/NTable.cxx	15 Feb 2006 12:15:35 -0000	1.1.2.1
@@ -0,0 +1,108 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: cws-evo2fixes.diff,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: michael $ $Date: 2006/02/16 11:12:13 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser 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
+ *
+ *    Contributor(s): Jayant Madavi_______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "NTable.hxx"
+#ifndef _CONNECTIVITY_EVOAB_TABLES_HXX_
+#include "NTables.hxx"
+#endif
+#ifndef _CONNECTIVITY_EVOAB_COLUMNS_HXX_
+#include "NColumns.hxx"
+#endif
+#ifndef _CONNECTIVITY_EVOAB_CATALOG_HXX__
+#include "NCatalog.hxx"
+#endif
+
+using namespace connectivity;
+using namespace ::comphelper;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::lang;
+using namespace connectivity::evoab;
+// -------------------------------------------------------------------------
+OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection) 
+	: OEvoabTable_TYPEDEF(_pTables, sal_True),
+	m_pConnection(_pConnection)
+{
+	construct();
+}
+// -------------------------------------------------------------------------
+OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
+	            OEvoabConnection* _pConnection,
+	            const ::rtl::OUString& _Name,
+	            const ::rtl::OUString& _Type,
+	            const ::rtl::OUString& _Description ,
+	            const ::rtl::OUString& _SchemaName,
+	            const ::rtl::OUString& _CatalogName
+	            ) : OEvoabTable_TYPEDEF(_pTables,sal_True,
+	                              _Name,
+	                              _Type,
+	                              _Description,
+	                              _SchemaName,
+	                              _CatalogName),
+	                m_pConnection(_pConnection)
+{
+	construct();
+}
+// -------------------------------------------------------------------------
+void OEvoabTable::refreshColumns()
+{
+	TStringVector aVector;
+
+	if (!isNew())
+	{
+	    Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(
+				Any(),
+				m_SchemaName,
+				m_Name,
+				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
+
+	    if (xResult.is())
+	    {
+		Reference< XRow > xRow(xResult, UNO_QUERY);
+		while (xResult->next())
+				aVector.push_back(xRow->getString(4));
+	    }
+	}
+	if (m_pColumns)
+	    m_pColumns->reFill(aVector);
+	else
+	    m_pColumns  = new OEvoabColumns(this,m_aMutex,aVector);
+}
Index: connectivity/source/drivers/evoab2/NTable.hxx
===================================================================
RCS file: connectivity/source/drivers/evoab2/NTable.hxx
diff -N connectivity/source/drivers/evoab2/NTable.hxx
--- openoffice.org//dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org/connectivity/source/drivers/evoab2/NTable.hxx	15 Feb 2006 12:15:36 -0000	1.1.2.1
@@ -0,0 +1,84 @@
+ /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: cws-evo2fixes.diff,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: michael $ $Date: 2006/02/16 11:12:13 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser 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
+ *
+ *    Contributor(s): Jayant Madavi_______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
+#define _CONNECTIVITY_EVOAB_TABLE_HXX_
+
+#ifndef _CONNECTIVITY_EVOAB_CONNECTION_HXX_
+#include "NConnection.hxx"
+#endif
+
+#ifndef _CONNECTIVITY_SDBCX_TABLE_HXX_
+#include "connectivity/sdbcx/VTable.hxx"
+#endif
+
+namespace connectivity
+{
+	namespace evoab
+	{
+		typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF;
+
+		::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
+
+		class OEvoabTable : public OEvoabTable_TYPEDEF
+		{
+			::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+			OEvoabConnection* m_pConnection;
+
+		public:
+			OEvoabTable(	sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection);
+			OEvoabTable(	sdbcx::OCollection* _pTables, 
+					OEvoabConnection* _pConnection,
+					const ::rtl::OUString& _Name,
+					const ::rtl::OUString& _Type,
+					const ::rtl::OUString& _Description = ::rtl::OUString(),
+					const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
+					const ::rtl::OUString& _CatalogName = ::rtl::OUString()
+				);
+
+			OEvoabConnection* getConnection() { return m_pConnection;}
+
+			virtual void refreshColumns();
+
+			::rtl::OUString getTableName() const { return m_Name; }
+			::rtl::OUString getSchema() const { return m_SchemaName; }
+		};
+	}
+}
+
+#endif // _CONNECTIVITY_EVOAB_TABLE_HXX_
Index: connectivity/source/drivers/evoab2/NTables.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NTables.cxx,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx	8 Sep 2005 05:53:50 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx	15 Feb 2006 12:15:37 -0000	1.3.74.1
@@ -78,7 +78,9 @@
 #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
 #include "NDebug.hxx"
 #endif
-
+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
+#include "NTable.hxx"
+#endif
 using namespace ::comphelper;
 
 using namespace ::cppu;
@@ -98,7 +100,7 @@ ObjectType OEvoabTables::createObject(co
 	::rtl::OUString aSchema = ::rtl::OUString::createFromAscii("%");
 
     Sequence< ::rtl::OUString > aTypes(1);
-	aTypes[0] = ::rtl::OUString::createFromAscii("%");
+	aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
 	::rtl::OUString sEmpty;
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
@@ -109,12 +111,17 @@ ObjectType OEvoabTables::createObject(co
         Reference< XRow > xRow(xResult,UNO_QUERY);
 		if(xResult->next()) // there can be only one table with this name
 		{
-			OTable* pRet = new OTable( this, sal_True,
-									   aName, xRow->getString( 4 ),
-									   xRow->getString( 5 ), sEmpty );
+			OEvoabTable* pRet = new OEvoabTable(
+					this,
+					(OEvoabConnection *)static_cast<OEvoabCatalog&>(m_rParent).getConnection(),
+					aName,
+					xRow->getString(4),
+					xRow->getString(5),
+					sEmpty);
 			xRet = pRet;
 		}
 	}
+
 	::comphelper::disposeComponent(xResult);
 
 	return xRet;
Index: connectivity/source/drivers/evoab2/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/evoab2/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.74.1
diff -u -p -u -p -w -r1.3 -r1.3.74.1
--- openoffice.org/connectivity/source/drivers/evoab2/makefile.mk	8 Sep 2005 05:54:17 -0000	1.3
+++ openoffice.org/connectivity/source/drivers/evoab2/makefile.mk	15 Feb 2006 12:15:37 -0000	1.3.74.1
@@ -58,6 +58,8 @@ CFLAGS+=$(GOBJECT_CFLAGS)
 
 EXCEPTIONSFILES=\
 	$(SLO)$/NDriver.obj \
+	$(SLO)$/NTable.obj \
+	$(SLO)$/NColumns.obj \
 	$(SLO)$/NTables.obj \
 	$(SLO)$/NCatalog.obj \
 	$(SLO)$/NConnection.obj \

openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch:
 extras/source/database/makefile.mk                           |    4 -
 officecfg/registry/data/org/openoffice/Office/DataAccess.xcu |    8 +++
 officecfg/registry/data/org/openoffice/Office/Writer.xcu     |   27 +++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)

Index: openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch	15 Feb 2006 08:30:43 -0000	1.6
+++ openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch	16 Feb 2006 14:33:08 -0000	1.7
@@ -1,4 +1,4 @@
---- openoffice.org.orig/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-04-18 20:39:35.000000000 +0530
+--- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig	2005-04-18 20:39:35.000000000 +0530
 +++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-05-10 17:30:14.000000000 +0530
 @@ -74,6 +74,33 @@
        <value xml:lang="en-US" oor:separator=";">To whom it may concern,;Dear Friends,;Dear Sir or Madam,;Hello,</value>
@@ -34,1953 +34,33 @@
      <prop oor:name="EMailSupported" install:module="javamail">
       <value>true</value>
      </prop>
---- /dev/null	2005-10-24 08:58:06.240378500 +0530
-+++ openoffice.org/connectivity/source/drivers/evoab2/NTable.hxx	2005-10-22 11:36:33.000000000 +0530
-@@ -0,0 +1,84 @@
-+ /*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser 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
-+ *
-+ *    Contributor(s): Jayant Madavi_______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
-+#define _CONNECTIVITY_EVOAB_TABLE_HXX_
-+
-+#ifndef _CONNECTIVITY_EVOAB_CONNECTION_HXX_
-+#include "NConnection.hxx"
-+#endif
-+
-+#ifndef _CONNECTIVITY_SDBCX_TABLE_HXX_
-+#include "connectivity/sdbcx/VTable.hxx"
-+#endif
-+
-+namespace connectivity
-+{
-+	namespace evoab
-+	{
-+		typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF;
-+
-+		::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
-+
-+		class OEvoabTable : public OEvoabTable_TYPEDEF
-+		{
-+			::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
-+			OEvoabConnection* m_pConnection;
-+
-+		public:
-+			OEvoabTable(	sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection);
-+			OEvoabTable(	sdbcx::OCollection* _pTables, 
-+					OEvoabConnection* _pConnection,
-+					const ::rtl::OUString& _Name,
-+					const ::rtl::OUString& _Type,
-+					const ::rtl::OUString& _Description = ::rtl::OUString(),
-+					const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
-+					const ::rtl::OUString& _CatalogName = ::rtl::OUString()
-+				);
-+
-+			OEvoabConnection* getConnection() { return m_pConnection;}
-+
-+			virtual void refreshColumns();
-+
-+			::rtl::OUString getTableName() const { return m_Name; }
-+			::rtl::OUString getSchema() const { return m_SchemaName; }
-+		};
-+	}
-+}
-+
-+#endif // _CONNECTIVITY_EVOAB_TABLE_HXX_
---- /dev/null	2005-10-24 08:58:06.240378500 +0530
-+++ openoffice.org/connectivity/source/drivers/evoab2/NTable.cxx	2005-10-22 12:02:52.000000000 +0530
-@@ -0,0 +1,108 @@
-+ /*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser 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
-+ *
-+ *    Contributor(s): Jayant Madavi_______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include "NTable.hxx"
-+#ifndef _CONNECTIVITY_EVOAB_TABLES_HXX_
-+#include "NTables.hxx"
-+#endif
-+#ifndef _CONNECTIVITY_EVOAB_COLUMNS_HXX_
-+#include "NColumns.hxx"
-+#endif
-+#ifndef _CONNECTIVITY_EVOAB_CATALOG_HXX__
-+#include "NCatalog.hxx"
-+#endif
-+
-+using namespace connectivity;
-+using namespace ::comphelper;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::beans;
-+using namespace ::com::sun::star::sdbcx;
-+using namespace ::com::sun::star::sdbc;
-+using namespace ::com::sun::star::container;
-+using namespace ::com::sun::star::lang;
-+using namespace connectivity::evoab;
-+// -------------------------------------------------------------------------
-+OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection) 
-+	: OEvoabTable_TYPEDEF(_pTables, sal_True),
-+	m_pConnection(_pConnection)
-+{
-+	construct();
-+}
-+// -------------------------------------------------------------------------
-+OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
-+	            OEvoabConnection* _pConnection,
-+	            const ::rtl::OUString& _Name,
-+	            const ::rtl::OUString& _Type,
-+	            const ::rtl::OUString& _Description ,
-+	            const ::rtl::OUString& _SchemaName,
-+	            const ::rtl::OUString& _CatalogName
-+	            ) : OEvoabTable_TYPEDEF(_pTables,sal_True,
-+	                              _Name,
-+	                              _Type,
-+	                              _Description,
-+	                              _SchemaName,
-+	                              _CatalogName),
-+	                m_pConnection(_pConnection)
-+{
-+	construct();
-+}
-+// -------------------------------------------------------------------------
-+void OEvoabTable::refreshColumns()
-+{
-+	TStringVector aVector;
-+
-+	if (!isNew())
-+	{
-+	    Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(
-+				Any(),
-+				m_SchemaName,
-+				m_Name,
-+				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")));
-+
-+	    if (xResult.is())
-+	    {
-+		Reference< XRow > xRow(xResult, UNO_QUERY);
-+		while (xResult->next())
-+				aVector.push_back(xRow->getString(4));
-+	    }
-+	}
-+	if (m_pColumns)
-+	    m_pColumns->reFill(aVector);
-+	else
-+	    m_pColumns  = new OEvoabColumns(this,m_aMutex,aVector);
-+}
---- /dev/null	2005-10-24 08:58:06.240378500 +0530
-+++ openoffice.org/connectivity/source/drivers/evoab2/NColumns.hxx	2005-10-22 11:37:26.000000000 +0530
-@@ -0,0 +1,73 @@
-+ /*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser 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
-+ *
-+ *    Contributor(s): Jayant Madavi_______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#ifndef _CONNECTIVITY_EVOAB_COLUMNS_HXX_
-+#define _CONNECTIVITY_EVOAB_COLUMNS_HXX_
-+
-+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
-+#include "NTable.hxx"
-+#endif
-+
-+#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
-+#include "connectivity/sdbcx/VCollection.hxx"
-+#endif
-+
-+namespace connectivity
-+{
-+	namespace evoab
-+	{
-+		class OEvoabColumns : public sdbcx::OCollection
-+		{
-+		protected:
-+			OEvoabTable*	m_pTable;
-+
-+			virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
-+			virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
-+
-+		public:
-+			OEvoabColumns(	OEvoabTable* _pTable,
-+						::osl::Mutex& _rMutex,
-+						const TStringVector &_rVector
-+						) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector),
-+							m_pTable(_pTable)
-+			{ }
-+		};
-+	}
-+}
-+
-+#endif // _CONNECTIVITY_EVOAB_COLUMNS_HXX_
---- /dev/null	2005-10-24 08:58:06.240378500 +0530
-+++ openoffice.org/connectivity/source/drivers/evoab2/NColumns.cxx	2005-10-22 11:38:07.000000000 +0530
-@@ -0,0 +1,106 @@
-+ /*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile$
-+ *
-+ *  $Revision$
-+ *
-+ *  last change: $Author$ $Date$
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library 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
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser 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
-+ *
-+ *    Contributor(s): Jayant Madavi_______________________________________
-+ *
-+ *
-+ ************************************************************************/
-+
-+#include "NColumns.hxx"
-+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
-+#include "NTable.hxx"
-+#endif
-+#ifndef _CONNECTIVITY_EVOAB_TABLES_HXX_
-+#include "NTables.hxx"
-+#endif
-+#ifndef _CONNECTIVITY_EVOAB_CATALOG_HXX_
-+#include "NCatalog.hxx"
-+#endif
-+
-+#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_
-+#include "connectivity/sdbcx/VColumn.hxx"
-+#endif
-+
-+using namespace connectivity::sdbcx;
-+using namespace connectivity;
-+using namespace ::comphelper;
-+using namespace ::com::sun::star::uno;
-+using namespace ::com::sun::star::beans;
-+using namespace ::com::sun::star::sdbc;
-+using namespace ::com::sun::star::container;
-+using namespace ::com::sun::star::lang;
-+using namespace connectivity::evoab;
-+
-+// -------------------------------------------------------------------------
-+sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
-+{
-+	Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
-+		Any(),
-+		m_pTable->getSchema(),
-+		m_pTable->getTableName(),
-+		_rName);
-+
-+	sdbcx::ObjectType xRet = NULL;
-+	if (xResult.is())
-+	{
-+		Reference< XRow > xRow(xResult,UNO_QUERY);
-+
-+		while (xResult->next())
-+		{
-+			if (xRow->getString(4) == _rName)
-+			{
-+				OColumn* pRet = new OColumn(
-+						_rName,
-+						xRow->getString(6),
-+						xRow->getString(13),
-+						xRow->getInt(11),
-+						xRow->getInt(7),
-+						xRow->getInt(9),
-+						xRow->getInt(5),
-+						sal_False,
-+						sal_False,
-+						sal_False,
-+						sal_True);
-+				xRet = pRet;
-+				break;
-+			}
-+		}
-+	}
-+
-+	return xRet;
-+}
-+// -------------------------------------------------------------------------
-+void OEvoabColumns::impl_refresh() throw(RuntimeException)
-+{
-+	m_pTable->refreshColumns();
-+}
-
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx	2006-01-18 13:08:40.000000000 +0000
-@@ -36,13 +36,14 @@
- #include <rtl/ustring.hxx>
- #include <osl/module.h>
- #include <stdio.h>
--#define _EVOLUTION_ALREADY_DEFINED_ 1
-+#define  DECLARE_FN_POINTERS 1
- #ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
- #include "EApi.h"
- #endif
- static char *eBookLibNames[] = {
- 	"libebook.so.8",	// evolution-2.0
--	"libebook-1.2.so.3"	// evolution-2.2
-+	"libebook-1.2.so.3",	// evolution-2.2
-+	"libebook-1.2.so.5"	// evolution-2.4
- 	// FIXME: ask JPR about ABI compatibility going forwards
- 	// "libebook-1.3.so.0",
- 	// "libebook-1.4.so.0",
-@@ -56,6 +57,8 @@
- 	const char *sym_name;
- 	SymbolFunc *ref_value;
-     } aApiMap[] = {
-+	SYM_MAP( e_contact_field_name ),
-+	SYM_MAP( e_contact_get ),
- 	SYM_MAP( e_contact_get_type ),
- 	SYM_MAP( e_contact_field_id ),
- 	SYM_MAP( e_source_peek_name ),
-@@ -74,6 +77,7 @@
- 	SYM_MAP( e_book_query_or ),
- 	SYM_MAP( e_book_query_not ),
- 	SYM_MAP( e_book_query_unref ),
-+	SYM_MAP( e_book_query_from_string ),
- 	SYM_MAP( e_book_query_to_string ),
- 	SYM_MAP( e_book_query_field_exists ),
- 	SYM_MAP( e_source_group_peek_base_uri)
-@@ -110,8 +114,9 @@
- 				  SAL_LOADMODULE_DEFAULT );
- 	if( aModule)
- 	{
--	    if ( tryLink( aModule, eBookLibNames[ j ] ) )
-+	    if ( tryLink( aModule, eBookLibNames[ j ] ) ) {
- 		return true;
-+		}
- 	    osl_unloadModule( aModule );
- 	}
-     }
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.h openoffice.org/connectivity/source/drivers/evoab2/EApi.h
---- openoffice.org.orig/connectivity/source/drivers/evoab2/EApi.h	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/EApi.h	2006-01-18 13:08:40.000000000 +0000
-@@ -51,52 +51,41 @@
- // We attempt to define a minimum API that we use:
- 
- // e-contact.h
-+#ifdef DECLARE_FN_POINTERS
-+#define EAPI_EXTERN
-+#else
-+#define EAPI_EXTERN extern
-+#endif
-+
-+
- typedef void EContact;
- #define E_CONTACT(a) ((EContact *)(a))
- #define E_TYPE_CONTACT (e_contact_get_type())
- typedef int EContactField;
- 
-+EAPI_EXTERN const char      *(*e_contact_field_name)   ( EContactField field_id);
-+EAPI_EXTERN gpointer      	(*e_contact_get)   (EContact *contact, EContactField field_id);
-+EAPI_EXTERN const gpointer  (*e_contact_get_const)   (EContact *contact, EContactField field_id);
- // e-source.h
- typedef void ESource;
- #define E_SOURCE(a) ((ESource *)(a))
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--const char  *(*e_source_peek_name)    (ESource *source);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--const gchar *(*e_source_get_property) (ESource *source,
-+EAPI_EXTERN const char  *(*e_source_peek_name)    (ESource *source);
-+EAPI_EXTERN const gchar *(*e_source_get_property) (ESource *source,
- 				       const gchar *property);
- 
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--GType         (*e_contact_get_type) (void);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EContactField (*e_contact_field_id) (const char *field_name);
-+EAPI_EXTERN GType         (*e_contact_get_type) (void);
-+EAPI_EXTERN EContactField (*e_contact_field_id) (const char *field_name);
- 
- // e-source-list.h
- typedef void ESourceList;
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--GSList *(*e_source_list_peek_groups) (ESourceList *list);
-+EAPI_EXTERN GSList *(*e_source_list_peek_groups) (ESourceList *list);
- 
- // e-source-group.h
- typedef void ESourceGroup;
- #define E_SOURCE_GROUP(a) ((ESourceGroup *)(a))
- 
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--GSList  *(*e_source_group_peek_sources) (ESourceGroup *group);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--const char *(*e_source_group_peek_base_uri)  (ESourceGroup *group);
-+EAPI_EXTERN GSList  *(*e_source_group_peek_sources) (ESourceGroup *group);
-+EAPI_EXTERN const char *(*e_source_group_peek_base_uri)  (ESourceGroup *group);
- // e-book.h
- typedef enum {
-   E_BOOK_QUERY_IS,
-@@ -108,76 +97,54 @@
- typedef void EBook;
- typedef void EBookQuery;
- 
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBook      *(*e_book_new)                     (ESource      *source,
--					       GError      **error);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--gboolean    (*e_book_open)                    (EBook       *book,
--					       gboolean     only_if_exists,
--					       GError     **error);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--const char *(*e_book_get_uri)                 (EBook        *book);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--ESource    *(*e_book_get_source)              (EBook        *book);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--gboolean    (*e_book_get_addressbooks)        (ESourceList **addressbook_sources,
--					       GError      **error);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--gboolean    (*e_book_get_contacts)            (EBook        *book,
--					       EBookQuery   *query,
--					       GList       **contacts,
--					       GError      **error);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--gboolean    (*e_book_authenticate_user)       (EBook        *book,
--					       const char   *user,
--					       const char   *passwd,
--					       const char   *auth_method,
--					       GError      **error);
-+EAPI_EXTERN EBook      *(*e_book_new) 		(ESource      *source,
-+								       		 GError      **error);
-+
-+EAPI_EXTERN gboolean    (*e_book_open)		(EBook       *book,
-+					       				 	 gboolean     only_if_exists,
-+				                         	 GError     **error);
-+
-+EAPI_EXTERN const char *(*e_book_get_uri)	(EBook        *book);
-+EAPI_EXTERN ESource    *(*e_book_get_source)(EBook        *book);
-+
-+EAPI_EXTERN gboolean    (*e_book_get_addressbooks)        (ESourceList **addressbook_sources,
-+													       GError      **error);
-+
-+EAPI_EXTERN gboolean    (*e_book_get_contacts)            (EBook        *book,
-+													       EBookQuery   *query,
-+													       GList       **contacts,
-+													       GError      **error);
-+
-+EAPI_EXTERN gboolean    (*e_book_authenticate_user)       (EBook        *book,
-+													       const char   *user,
-+													       const char   *passwd,
-+													       const char   *auth_method,
-+													       GError      **error);
- 
- // e-book-query.h
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBookQuery* (*e_book_query_field_exists) (EContactField   field);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBookQuery* (*e_book_query_field_test)   (EContactField   field,
--					  EBookQueryTest     test,
--					  const char        *value);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBookQuery* (*e_book_query_and)          (int nqs, EBookQuery **qs, gboolean unref);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBookQuery* (*e_book_query_or)           (int nqs, EBookQuery **qs, gboolean unref);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--EBookQuery* (*e_book_query_not)          (EBookQuery *q, gboolean unref);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--void        (*e_book_query_unref)        (EBookQuery *q);
--#ifndef _EVOLUTION_ALREADY_DEFINED_
--extern
--#endif
--char*       (*e_book_query_to_string)    (EBookQuery *q);
-+EAPI_EXTERN EBookQuery* (*e_book_query_field_exists) (EContactField   field);
-+EAPI_EXTERN EBookQuery* (*e_book_query_field_test)   (EContactField   field,
-+					  								  EBookQueryTest     test,
-+													  const char        *value);
-+EAPI_EXTERN EBookQuery* (*e_book_query_and)          (int nqs, EBookQuery **qs, gboolean unref);
-+EAPI_EXTERN EBookQuery* (*e_book_query_or)           (int nqs, EBookQuery **qs, gboolean unref);
-+EAPI_EXTERN EBookQuery* (*e_book_query_not)          (EBookQuery *q, gboolean unref);
-+EAPI_EXTERN void        (*e_book_query_unref)        (EBookQuery *q);
-+EAPI_EXTERN char*       (*e_book_query_to_string)    (EBookQuery *q);
-+EAPI_EXTERN EBookQuery* (*e_book_query_from_string)   (const char *query_string);
-+
-+typedef struct {
-+        char *address_format; /* the two letter country code that
-+                                 determines the format/meaning of the
-+                                 following fields */
-+        char *po;
-+        char *ext;
-+        char *street;
-+        char *locality;
-+        char *region;
-+        char *code;
-+        char *country;
-+} EContactAddress;
- G_END_DECLS
- #endif
-+
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/makefile.mk openoffice.org/connectivity/source/drivers/evoab2/makefile.mk
---- openoffice.org.orig/connectivity/source/drivers/evoab2/makefile.mk	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/makefile.mk	2006-01-18 13:08:51.000000000 +0000
-@@ -58,6 +58,8 @@
- 
- EXCEPTIONSFILES=\
- 	$(SLO)$/NDriver.obj \
-+        $(SLO)$/NTable.obj \
-+        $(SLO)$/NColumns.obj \
- 	$(SLO)$/NTables.obj \
- 	$(SLO)$/NCatalog.obj \
- 	$(SLO)$/NConnection.obj \
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.cxx openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx	2006-01-18 13:08:40.000000000 +0000
-@@ -72,7 +72,7 @@
- {
- 	TStringVector aVector;
- 	Sequence< ::rtl::OUString > aTypes(1);
--	aTypes[0] = ::rtl::OUString::createFromAscii("%");
-+	aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
- 	Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- 		::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes);
- 
-@@ -92,3 +92,27 @@
- 	else
- 		m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector);
- }
-+// XTablesSupplier
-+Reference< XNameAccess > SAL_CALL  OEvoabCatalog::getTables(  ) throw(RuntimeException)
-+{
-+        ::osl::MutexGuard aGuard(m_aMutex);
-+
-+        try
-+        {
-+                if (!m_pTables) {
-+                        refreshTables();
-+                        }
-+        }
-+        catch( const RuntimeException& )
-+        {
-+                // allowed to leave this method
-+                throw;
-+        }
-+        catch( const Exception& )
-+        {
-+                // allowed
-+        }
-+
-+        return m_pTables;
-+}
-+
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.hxx openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NCatalog.hxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx	2006-01-18 13:08:41.000000000 +0000
-@@ -51,11 +51,14 @@
-             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
- 		public:
- 			OEvoabCatalog(OEvoabConnection *_pCon);
--
-+			inline OEvoabConnection* getConnection() const { return m_pConnection; }
- 			virtual void refreshTables();
- 			virtual void refreshViews() {}
- 			virtual void refreshGroups() {}
- 			virtual void refreshUsers() {}
-+ // XTablesSupplier
-+                        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables(
-+                                        ) throw(::com::sun::star::uno::RuntimeException);
- 		};
- 	}
- }
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -89,129 +89,191 @@
- 		static sal_Int32    const s_nNULLABLE = 1;
- 		static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
- 
--static GParamSpec **pFields = NULL;
--static guint        nFields = 0;
-+		static ColumnProperty **pFields=NULL;
-+		static guint        nFields = 0;
- 
--static const char *pBlackList[] = {
--		"id",
--		"list-show-addresses"
--};
--
--static void
--initFields()
--{
--	if( !pFields )
--	{
--		::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
--		if( !pFields )
--		{
--			guint        nProps;
--			GParamSpec **pProps;
--			GParamSpec **pToBeFields;
--			pProps = g_object_class_list_properties
--					( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
--					  &nProps );
--			pToBeFields = g_new0( GParamSpec *, nProps );
--
--			for ( guint i = 0; i < nProps; i++ )
--			{
--				switch (pProps[i]->value_type)
--				{
--				case G_TYPE_STRING:
--				case G_TYPE_BOOLEAN:
--				{
--					bool bAdd = true;
--					const char *pName = g_param_spec_get_name( pProps[i] );
--					for (int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
--					{
--						if( !strcmp( pBlackList[j], pName ) )
--						{
--							bAdd = false;
--							break;
--						}
--					}
--					if( bAdd )
--						pToBeFields[ nFields++ ] = g_param_spec_ref( pProps[i] );
--					break;
--				}
--				default:
--					break;
--				}
--			}
--			pFields = pToBeFields;
--		}
--	}
--}
--
--guint
--getFieldCount()
--{
--	initFields();
--	return nFields;
--}
--
--const GParamSpec *
--getField(guint n)
--{
--	initFields();
--	if( n < nFields )
--		return pFields[n];
--	else
--		return NULL;
--}
--
--sal_Int32
--getFieldType( sal_Int32 nCol )
--{
--	sal_Int32 nType = DataType::VARCHAR;
--	initFields();
--	if (nCol >= 0 && nCol < nFields )
--	{
--		if( pFields[nCol]->value_type == G_TYPE_STRING )
--			nType = DataType::VARCHAR;
--		else 
--			nType = DataType::BIT;
--	}
--	return nType;
--}
-+        static const char *pBlackList[] = 
-+        {
-+            "id",
-+            "list-show-addresses",
-+            "address-label-home",
-+            "address-label-work",
-+            "address-label-other"
-+        };
-+
-+    static void 
-+    splitColumn (ColumnProperty **pToBeFields)
-+    {
-+        for (int i = 0; i < OTHER_ZIP; i++) 
-+        {
-+            pToBeFields[nFields] = g_new0(ColumnProperty,1);
-+            pToBeFields[nFields]->bIsSplittedValue = true;
-+            pToBeFields[nFields]->pField = g_param_spec_ref(g_param_spec_string (evo_addr[i].pColumnName,evo_addr[i].pColumnName,"",NULL,G_PARAM_WRITABLE));
-+            nFields++;
-+        }
-+    }
-+
-+    static void
-+    initFields()
-+    {
-+        if( !pFields )
-+        {
-+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-+            if( !pFields )
-+            {
-+                guint        nProps;
-+                ColumnProperty **pToBeFields;
-+                GParamSpec **pProps;
-+                nFields = 0;
-+                pProps = g_object_class_list_properties
-+                    ( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
-+                         &nProps );
-+                pToBeFields = g_new0(ColumnProperty  *, (nProps + OTHER_ZIP)/* new column(s)*/ );
-+                for ( guint i = 0; i < nProps; i++ )
-+                {
-+                    switch (pProps[i]->value_type)
-+                    {
-+                        case G_TYPE_STRING:
-+                        case G_TYPE_BOOLEAN:
-+                        {
-+                            bool bAdd = true;
-+                            const char *pName = g_param_spec_get_name( pProps[i] );
-+                            for (int j = 0; j < G_N_ELEMENTS( pBlackList ); j++ )
-+                            {
-+                                if( !strcmp( pBlackList[j], pName ) )
-+                                {
-+                                    bAdd = false;
-+                                    break;
-+                                }
-+                            }
-+                            if( bAdd ) 
-+                            {
-+                                pToBeFields[nFields]= g_new0(ColumnProperty,1);
-+                                pToBeFields[nFields]->bIsSplittedValue=false;
-+                                pToBeFields[ nFields++ ]->pField = g_param_spec_ref( pProps[i] );
-+                            }
-+                            break;
-+                        }
-+                        default:
-+                            break;
-+                    }
-+                }
-+			
-+                splitColumn(pToBeFields);
-+                pFields = pToBeFields;
-+            }
-+        }
-+    }
-+
-+
-+    guint
-+    getFieldCount()
-+    {
-+        initFields();
-+        return nFields;
-+    }
-+
-+    const ColumnProperty *
-+    getField(guint n)
-+    {
-+        initFields();
-+        if( n < nFields )
-+            return pFields[n];
-+    	else
-+            return NULL;
-+    }
-+
-+    sal_Int32
-+    getFieldType( sal_Int32 nCol )
-+    {
-+        sal_Int32 nType = DataType::VARCHAR;
-+        initFields();
-+        if (nCol >= 0 && nCol < nFields )
-+        {
-+            if( ((GParamSpec *)pFields[nCol]->pField)->value_type == G_TYPE_STRING )
-+                nType = DataType::VARCHAR;
-+            else 
-+                nType = DataType::BIT;
-+        }
-+        return nType;
-+    }
-+
-+    rtl::OUString
-+    getFieldTypeName( sal_Int32 nCol )
-+    {
-+        switch( getFieldType( nCol ) )
-+        {
-+            case DataType::BIT:
-+                return ::rtl::OUString::createFromAscii( "BIT" );
-+            case DataType::VARCHAR:
-+                return ::rtl::OUString::createFromAscii( "VARCHAR" );
-+            default:
-+                break;
-+        }
-+        return ::rtl::OUString();
-+    }
-+
-+    rtl::OUString
-+    getFieldName( sal_Int32 nCol )
-+    {
-+        const GParamSpec *pSpec = getField( nCol )->pField;
-+        rtl::OUString aName;
-+        initFields();
- 
--rtl::OUString
--getFieldTypeName( sal_Int32 nCol )
--{
--	switch( getFieldType( nCol ) )
--	{
--	case DataType::BIT:
--			return ::rtl::OUString::createFromAscii( "BIT" );
--	case DataType::VARCHAR:
--			return ::rtl::OUString::createFromAscii( "VARCHAR" );
--	default:
--			break;
--	}
--	return ::rtl::OUString();
--}
-+        if( pSpec )
-+            aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ),
-+											RTL_TEXTENCODING_UTF8 );
-+            aName = aName.replace( '-', '_' );
-+        return aName;
-+    }
-+
-+    sal_Int32 findEvoabField(const rtl::OUString& aColName)
-+    {
-+        sal_Int32 nRet = -1;
-+        sal_Bool bFound = sal_False;
-+        initFields();
-+        for (int i=0;(i < nFields) && !bFound;i++)
-+        {
-+            rtl::OUString aName = getFieldName(i);
-+            if (aName == aColName)
-+            {
-+                nRet = i;
-+                bFound = sal_True;
-+            }
-+        }
-+        return nRet;
-+    }
-+
-+    void  
-+    free_column_resources()
-+    {
-+        for (int i=nFields-1;i > 0;i--) 
-+        {
-+            if (pFields && pFields[i] ) 
-+            {
-+                if (pFields[i]->pField) 
-+                    g_param_spec_unref(pFields[i]->pField);
-+                g_free(pFields[i]);
-+            }
-+        }
-+       if(pFields) 
-+        {
-+            g_free(pFields);
-+            pFields=NULL;
-+        }
-+	
-+    }
- 
--rtl::OUString
--getFieldName( sal_Int32 nCol )
--{
--	const GParamSpec *pSpec = getField( nCol );
--	rtl::OUString aName;
- 
--	if( pSpec )
--			aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ),
--											RTL_TEXTENCODING_UTF8 );
--	aName = aName.replace( '-', '_' );
--	return aName;
-+    }
- }
- 
--	}
--}
- 
- OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon)
- 	: ::connectivity::ODatabaseMetaDataBase(_pCon)
- 	,m_pConnection(_pCon)
- {
- 	OSL_ENSURE(m_pConnection,"OEvoabDatabaseMetaData::OEvoabDatabaseMetaData: No connection set!");
--	//construct();
- }
- void OEvoabDatabaseMetaData::construct()
- {
-@@ -272,7 +334,7 @@
- 			aRow[5] = new ORowSetValueDecorator( static_cast<sal_Int16>( getFieldType( i ) ) );
- 			aRow[6] = new ORowSetValueDecorator( getFieldTypeName( i ) );
- 
--			OSL_TRACE( "   ColumnName = '%s'", g_param_spec_get_name( pFields[i] ) );
-+			OSL_TRACE( "   ColumnName = '%s'", g_param_spec_get_name( pFields[i]->pField ) );
- 			// COLUMN_NAME
- 			aRow[4] = new ORowSetValueDecorator( getFieldName( i ) );
- 			// ORDINAL_POSITION
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NPreparedStatement.cxx openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -121,9 +121,8 @@
- 	::osl::MutexGuard aGuard( m_aMutex );
- 	checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- 		
--
-+	free_column_resources();
- 	// Reset last warning message
--
- 	try {
- 		clearWarnings ();
- 		OStatement_BASE2::close();
-@@ -132,8 +131,6 @@
- 		// If we get an error, ignore
- 	}
- 
--	// Remove this Statement object from the Connection object's
--	// list
- }
- // -------------------------------------------------------------------------
- 
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSet.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -276,6 +276,7 @@
- 			m_pConnection->setPassword( aPassword );
- 		}
- 		m_nLength = g_list_length( m_pContacts );
-+
- 		OSL_TRACE( "Query return %d records", m_nLength );
- 		m_nIndex = -1;
- 	}
-@@ -289,7 +290,7 @@
- 	::osl::MutexGuard aGuard(m_aMutex);
- 
- 	m_pStatement	= NULL;
--	m_xMetaData		= NULL;
-+	m_xMetaData	= NULL;
- }
- // -------------------------------------------------------------------------
- Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
-@@ -310,13 +311,149 @@
- 	return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
- }
- 
-+static int 
-+whichAddress(int value)
-+{
-+	int fieldEnum;
-+	switch (value) 
-+	{
-+		case HOME_ADDR_LINE1:
-+		case HOME_ADDR_LINE2:
-+		case HOME_CITY:
-+		case HOME_STATE:
-+		case HOME_COUNTRY:
-+		case HOME_ZIP:
-+			fieldEnum = e_contact_field_id("address_home"); break; 
-+		case WORK_ADDR_LINE1:
-+		case WORK_ADDR_LINE2:
-+		case WORK_CITY:
-+		case WORK_STATE:
-+		case WORK_COUNTRY:
-+		case WORK_ZIP: 
-+			fieldEnum = e_contact_field_id("address_work"); break;
-+		case OTHER_ADDR_LINE1:
-+		case OTHER_ADDR_LINE2:
-+		case OTHER_CITY:
-+		case OTHER_STATE:
-+		case OTHER_COUNTRY:
-+		case OTHER_ZIP:
-+			fieldEnum = e_contact_field_id("address_other"); break;
-+    	default: fieldEnum = e_contact_field_id("address_home");
-+	  }
-+	return fieldEnum;
-+}
-+
-+/*
-+* This function decides the default column values based on the first field of EContactAddress.
-+* The search order is Work->Home->other(defaults).
-+*/
-+static EContactAddress * 
-+getDefaultContactAddress(EContact *pContact,int *value) 
-+{
-+	EContactAddress *ec = (EContactAddress *)e_contact_get(pContact,whichAddress(WORK_ADDR_LINE1));
-+	if ( ec && (strlen(ec->street)>0) ) 
-+	{
-+		*value= *value +WORK_ADDR_LINE1 -1;
-+		return ec;	
-+	}
-+	else  
-+		{
-+			ec = (EContactAddress *)e_contact_get(pContact,whichAddress(HOME_ADDR_LINE1));
-+			if ( ec && (strlen(ec->street)>0) ) 
-+			{ 
-+				*value=*value+HOME_ADDR_LINE1-1;
-+				return ec;
-+			}
-+		}
-+
-+	*value=*value+OTHER_ADDR_LINE1-1;
-+	return (EContactAddress *)e_contact_get(pContact,whichAddress(OTHER_ADDR_LINE1));
-+}
-+
-+static EContactAddress* 
-+getContactAddress(EContact *pContact, int * address_enum) 
-+{ 
-+	EContactAddress *ec = NULL;
-+    switch (*address_enum) {
-+	
-+        case DEFAULT_ADDR_LINE1:
-+        case DEFAULT_ADDR_LINE2:
-+        case DEFAULT_CITY:
-+        case DEFAULT_STATE:
-+        case DEFAULT_COUNTRY:
-+        case DEFAULT_ZIP:
-+			ec = getDefaultContactAddress(pContact,address_enum);break;
-+   		default:
-+			ec = (EContactAddress *)e_contact_get(pContact,whichAddress(*address_enum));
-+    }
-+	return ec;
-+}
-+
-+static bool 
-+handleSplitAddress(EContact *pContact,GValue *pStackValue,int value) 
-+{
-+
-+	EContactAddress *ec = getContactAddress(pContact,&value) ;
-+
-+	if (ec==NULL)
-+		return true;
-+
-+	switch (value) {
-+    	case WORK_ADDR_LINE1:
-+		    g_value_set_string(pStackValue,ec->street ); break;
-+	    case WORK_ADDR_LINE2:
-+		    g_value_set_string(pStackValue,ec->po ); break;
-+    	case WORK_CITY: 
-+	    	g_value_set_string(pStackValue,ec->locality ); break;
-+    	case WORK_STATE:
-+ 	    	g_value_set_string(pStackValue,ec->region ); break;
-+    	case WORK_COUNTRY:
-+	    	g_value_set_string(pStackValue,ec->country ); break;
-+    	case WORK_ZIP:
-+	    	g_value_set_string(pStackValue,ec->code ); break;
-+
-+        case HOME_ADDR_LINE1:
-+			g_value_set_string(pStackValue,ec->street ); break;
-+        case HOME_ADDR_LINE2:
-+			g_value_set_string(pStackValue,ec->po ); break;
-+        case HOME_CITY:
-+			g_value_set_string(pStackValue,ec->locality ); break;
-+        case HOME_STATE:
-+			g_value_set_string(pStackValue,ec->region ); break;
-+        case HOME_COUNTRY:
-+			g_value_set_string(pStackValue,ec->country ); break;
-+        case HOME_ZIP:
-+			g_value_set_string(pStackValue,ec->code ); break;
-+
-+        case OTHER_ADDR_LINE1:
-+			g_value_set_string(pStackValue,ec->street ); break;
-+        case OTHER_ADDR_LINE2:
-+			g_value_set_string(pStackValue,ec->po ); break;
-+        case OTHER_CITY:
-+			g_value_set_string(pStackValue,ec->locality ); break;
-+        case OTHER_STATE:
-+			g_value_set_string(pStackValue,ec->region ); break;
-+        case OTHER_COUNTRY:
-+			g_value_set_string(pStackValue,ec->country ); break;
-+        case OTHER_ZIP:
-+			g_value_set_string(pStackValue,ec->code ); break;
-+
-+	}
-+
-+return false;
-+}
-+
-+
- // -------------------------------------------------------------------------
- // XRow Interface 
- 
- bool
- OEvoabResultSet::getValue( sal_Int32 nColumnNum, GType nType, GValue *pStackValue)
- {
--	const GParamSpec *pSpec = evoab::getField (nColumnNum - 1);
-+        const ColumnProperty * pSpecs = evoab::getField (nColumnNum - 1);
-+        GParamSpec *pSpec = pSpecs->pField;
-+        gboolean bIsSplittedColumn=pSpecs->bIsSplittedValue;
-+
- 	EContact *pContact = getCur();
- 	
- 	m_bWasNull = true;
-@@ -325,20 +462,34 @@
- 
- 	if (G_PARAM_SPEC_VALUE_TYPE (pSpec) != nType)
- 	{
-+#ifdef DEBUG
- 		g_warning ("Wrong type");
-+#endif
- 		return false;
- 	}
- 	g_value_init (pStackValue, nType);
-+ 	if (bIsSplittedColumn) {
-+ 		for (int i=0;i<OTHER_ZIP;i++) {
-+ 			if (0==strcmp(g_param_spec_get_name(( GParamSpec * )pSpec),evo_addr[i].pColumnName)) {
-+ 				m_bWasNull = handleSplitAddress(pContact,pStackValue,evo_addr[i].value);
-+ 				return true;
-+ 			}
-+ 		}
-+ 	}
-+ 	else {
-+
- 	g_object_get_property (G_OBJECT (pContact),
- 						   g_param_spec_get_name ((GParamSpec *) pSpec),
- 						   pStackValue);
- 	if (G_VALUE_TYPE (pStackValue) != nType)
- 	{
-+#ifdef DEBUG
- 		g_warning ("Fetched type mismatch");
-+#endif
- 		g_value_unset (pStackValue);
- 		return false;
- 	}
--
-+	}
- 	m_bWasNull = false;
- 	return true;
- }
-@@ -355,14 +506,18 @@
- 	::osl::MutexGuard aGuard( m_aMutex );
- 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- 	rtl::OUString aResult;
--
--	GValue aValue = { 0, };
--	if (getValue (nColumnNum, G_TYPE_STRING, &aValue))
--	{
--		const char *pStr = g_value_get_string (&aValue);
--		rtl::OString aStr (pStr ? pStr : "");
--		aResult = rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 );
--		g_value_unset (&aValue);
-+	if ( m_xMetaData.is())
-+        {
-+                OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get();
-+                sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum);
-+		GValue aValue = { 0, };
-+		if (getValue (nFieldNumber, G_TYPE_STRING, &aValue))
-+		{
-+			const char *pStr = g_value_get_string (&aValue);
-+			rtl::OString aStr (pStr ? pStr : "");
-+			aResult = rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 );
-+			g_value_unset (&aValue);
-+		}
- 	}
- 	return aResult;
- }
-@@ -373,11 +528,16 @@
- 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- 	sal_Bool bResult = sal_False;
- 
--	GValue aValue = { 0, };
--	if (getValue (nColumnNum, G_TYPE_BOOLEAN, &aValue))
--	{
--		bResult = g_value_get_boolean (&aValue);
--		g_value_unset (&aValue);
-+	if ( m_xMetaData.is())
-+        {
-+                OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get();
-+                sal_Int32 nFieldNumber = pMeta->fieldAtColumn(nColumnNum);
-+		GValue aValue = { 0, };
-+		if (getValue (nFieldNumber, G_TYPE_STRING, &aValue))
-+		{
-+			bResult = g_value_get_boolean (&aValue);
-+			g_value_unset (&aValue);
-+		}
- 	}
- 	return bResult ? sal_True : sal_False;
- }
-@@ -606,6 +766,7 @@
- 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- 
- 	m_nIndex = 0;
-+	return true;
- }
- // -------------------------------------------------------------------------
- 
-@@ -615,6 +776,7 @@
- 	checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
- 
- 	m_nIndex = m_nLength - 1;
-+	return true;
- }
- // -------------------------------------------------------------------------
- sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
-@@ -711,7 +873,6 @@
- 	{
- 		::osl::MutexGuard aGuard( m_aMutex );
- 		checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
--
- 	}
- 	OSL_TRACE("In/Out: OEvoabResultSet::close" );
- 	dispose();
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -45,6 +45,7 @@
- #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
- #include <com/sun/star/sdbc/DataType.hpp>
- #endif
-+#include "NDebug.hxx"
- 
- using namespace connectivity::evoab;
- using namespace com::sun::star::uno;
-@@ -52,7 +53,8 @@
- using namespace com::sun::star::sdbc;
- 
- OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) 
--	: m_aTableName(_aTableName)
-+	: m_aTableName(_aTableName),
-+	  m_aEvoabFields()
- {
- 
- }
-@@ -61,6 +63,27 @@
- {
- }
- // -------------------------------------------------------------------------
-+void OEvoabResultSetMetaData::setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException)
-+{
-+        OSQLColumns::const_iterator aIter;
-+        static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
-+
-+        for (aIter = xColumns->begin(); aIter != xColumns->end(); ++aIter)
-+        {
-+                ::rtl::OUString aFieldName;
-+                sal_uInt32 nFieldNumber;
-+
-+                (*aIter)->getPropertyValue(aName) >>= aFieldName;
-+                nFieldNumber = findEvoabField(aFieldName);
-+		if (nFieldNumber == -1)
-+		::dbtools::throwGenericSQLException(
-+			::rtl::OUString::createFromAscii("Invalid column name: ") + aFieldName,
-+			NULL);
-+                m_aEvoabFields.push_back(nFieldNumber);
-+        }
-+}
-+
-+// -------------------------------------------------------------------------
- void OEvoabResultSetMetaData::checkColumnIndex(sal_Int32 nColumnNum)  throw(SQLException, RuntimeException)
- {
- 	if( nColumnNum <= 0 || nColumnNum > getColumnCount() )
-@@ -74,12 +97,13 @@
- // -------------------------------------------------------------------------
- sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
- {
--	return evoab::getFieldType (nColumnNum - 1);
-+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
-+	return evoab::getFieldType (nField);
- }
- // -------------------------------------------------------------------------
- sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
- {
--	return evoab::getFieldCount();
-+	return m_aEvoabFields.size();
- }
- // -------------------------------------------------------------------------
- sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
-@@ -94,17 +118,21 @@
- // -------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
- {
--	return evoab::getFieldName( nColumnNum - 1 );
-+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
-+        return evoab::getFieldName( nField );
- }
- // -------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
- {
--	return evoab::getFieldTypeName( nColumnNum - 1 );
-+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
-+        return evoab::getFieldTypeName( nField );
- }
- // -------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
- {
--	const GParamSpec *pSpec = getField( nColumnNum - 1 );
-+        sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
-+        const ColumnProperty *pSpecs = getField(nField);
-+	GParamSpec *pSpec = pSpecs->pField;
- 	rtl::OUString aLabel;
- 
- 	if( pSpec )
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx	2006-01-18 13:08:51.000000000 +0000
-@@ -46,6 +46,9 @@
- #ifndef _CONNECTIVITY_EVOAB_CONNECTION_HXX_
- #include "NConnection.hxx"
- #endif 
-+#ifndef _VOS_REF_HXX_
-+#include <vos/ref.hxx>
-+#endif
- #include <com/sun/star/connection/XConnection.hpp>
- namespace connectivity
- {
-@@ -59,11 +62,17 @@
- 		class OEvoabResultSetMetaData :	public 	OResultSetMetaData_BASE
- 		{
- 		  ::rtl::OUString       m_aTableName;
-+                  ::std::vector<sal_Int32>        m_aEvoabFields;
-+
- 		protected:
- 			virtual ~OEvoabResultSetMetaData();
- 		public:
- 		  OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName);
--
-+		  void setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
-+		  inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
-+                        { return m_aEvoabFields[columnIndex - 1]; }
-+		  inline sal_Int32 getFieldSize() const 
-+			{return m_aEvoabFields.size();}
- 		  /// Avoid ambigous cast error from the compiler.
- 		  inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
- 		  { return this; }
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NStatement.cxx openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NStatement.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -195,8 +195,7 @@
- EBookQuery *
- OStatement_Base::createTrue()
- { // Not the world's most efficient unconditional true but ...
--//FIXME: make enum hack to make it gud integer (E_CONTACT_FULL_NAME);
--return  e_book_query_field_exists (3);
-+	return e_book_query_from_string("(exists \"full_name\")");
- }
- 
- EBookQuery *
-@@ -485,11 +484,20 @@
- 	g_message( "Parsed SQL to sexpr '%s'\n", pSexpr );
- 	g_free( pSexpr );
- #endif
--
-+ 	::vos::ORef<connectivity::OSQLColumns> xColumns;
- 	if (pQuery)
- 	{
- 		pResult->construct( pQuery, aTable, bIsWithoutWhere );
- 		e_book_query_unref( pQuery );
-+		xColumns = m_aSQLIterator.getSelectColumns();
-+		if (!xColumns.isValid())
-+		{
-+			::dbtools::throwGenericSQLException(
-+				::rtl::OUString::createFromAscii("Invalid selection of columns"),
-+				NULL);
-+		}
-+		OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) pResult->getMetaData().get();
-+		pMeta->setEvoabFields(xColumns);
- 	}
- 	m_xResultSet = xRS;
- 	
-diff -ru openoffice.org.orig/connectivity/source/drivers/evoab2/NTables.cxx openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NTables.cxx	2006-01-18 12:56:36.000000000 +0000
-+++ openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx	2006-01-18 13:08:51.000000000 +0000
-@@ -78,7 +78,9 @@
- #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX
- #include "NDebug.hxx"
- #endif
--
-+#ifndef _CONNECTIVITY_EVOAB_TABLE_HXX_
-+#include "NTable.hxx"
-+#endif
- using namespace ::comphelper;
- 
- using namespace ::cppu;
-@@ -98,7 +100,7 @@
- 	::rtl::OUString aSchema = ::rtl::OUString::createFromAscii("%");
- 
-     Sequence< ::rtl::OUString > aTypes(1);
--	aTypes[0] = ::rtl::OUString::createFromAscii("%");
-+	aTypes[0] = ::rtl::OUString::createFromAscii("TABLE");
- 	::rtl::OUString sEmpty;
- 
-     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
-@@ -109,12 +111,17 @@
-         Reference< XRow > xRow(xResult,UNO_QUERY);
- 		if(xResult->next()) // there can be only one table with this name
- 		{
--			OTable* pRet = new OTable( this, sal_True,
--									   aName, xRow->getString( 4 ),
--									   xRow->getString( 5 ), sEmpty );
--			xRet = pRet;
-+			OEvoabTable* pRet = new OEvoabTable(
-+					this,
-+					(OEvoabConnection *)static_cast<OEvoabCatalog&>(m_rParent).getConnection(),
-+					aName,
-+					xRow->getString(4),
-+					xRow->getString(5),
-+					sEmpty);
-+					xRet = pRet;
- 		}
- 	}
-+
- 	::comphelper::disposeComponent(xResult);
- 
- 	return xRet;
-diff -ru openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx
---- openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx	2006-01-18 12:52:01.000000000 +0000
-+++ openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx	2006-01-18 13:10:23.000000000 +0000
-@@ -244,9 +244,10 @@
- #define EVOLUTION_PATH         16
- #define KAB_PATH               17
- #define THUNDERBIRD_PATH       18
--#define CREATENEW_PATH         19
--#define USERDEFINED_PATH       20
--#define OPEN_DOC_PATH          21
-+#define EVOLUTION_PATH_LOCAL   19
-+#define CREATENEW_PATH         20
-+#define USERDEFINED_PATH       21
-+#define OPEN_DOC_PATH          22
- 
- OFinalDBPageSetup*          pFinalPage;
- 
-@@ -389,6 +390,14 @@
-     else
-         declarePath( THUNDERBIRD_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
- 
-+if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LOCAL))
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+    else
-+        declarePath( EVOLUTION_PATH_LOCAL, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+ if ( m_pCollection->hasAuthentication(DST_EVOLUTION_LDAP))
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-+    else
-+        declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-     if ( m_pCollection->hasAuthentication(DST_EVOLUTION))
-         declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE);
-     else
-@@ -540,6 +549,8 @@
-             { DST_MOZILLA,      MOZILLA_PATH        },
-             { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
-             { DST_EVOLUTION,    EVOLUTION_PATH      },
-+            { DST_EVOLUTION_LOCAL,    EVOLUTION_PATH_LOCAL      },
-+            { DST_EVOLUTION_LDAP,    EVOLUTION_PATH      },
-             { DST_KAB,          KAB_PATH            },
-             { DST_USERDEFINE1,  USERDEFINED_PATH    },
- 		    { DST_USERDEFINE2,  USERDEFINED_PATH    },
-@@ -613,6 +624,8 @@
-     {
- 		case DST_KAB:
-         case DST_EVOLUTION:
-+        case DST_EVOLUTION_LOCAL:
-+        case DST_EVOLUTION_LDAP:
-         case DST_OUTLOOK:
-         case DST_OUTLOOKEXP:
- 		case DST_MOZILLA:
-diff -ru openoffice.org.orig/dbaccess/source/ui/inc/dsntypes.hxx openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx
---- openoffice.org.orig/dbaccess/source/ui/inc/dsntypes.hxx	2006-01-18 12:51:57.000000000 +0000
-+++ openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx	2006-01-18 13:11:03.000000000 +0000
-@@ -76,8 +76,10 @@
- 	DST_OUTLOOK		=	15,	
- 	DST_OUTLOOKEXP	=	16,	
- 	DST_EVOLUTION	=	17,
--	DST_KAB			=	18,
--	DST_EMBEDDED	=	19,
-+        DST_EVOLUTION_LOCAL =   18,
-+        DST_EVOLUTION_LDAP  =   19,
-+	DST_KAB			=	20,
-+	DST_EMBEDDED	=	21,
- 
- 	DST_USERDEFINE1,	/// first user defined driver
- 	DST_USERDEFINE2,
-diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.hrc openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc
---- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.hrc	2006-01-18 12:51:58.000000000 +0000
-+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.hrc	2006-01-18 13:12:15.000000000 +0000
-@@ -54,10 +54,12 @@
- #define STR_LDAP				13
- #define STR_OUTLOOK				14
- #define STR_OUTLOOKEXP			15
--#define STR_EVOLUTION			16 
--#define STR_KAB					17
--#define STR_EMBEDDED			18
--#define STR_THUNDERBIRD			19
-+#define STR_EVOLUTION_GROUPWISE       16
-+#define STR_EVOLUTION_LOCAL           17
-+#define STR_EVOLUTION_LDAP            18
-+#define STR_KAB					19
-+#define STR_EMBEDDED			20
-+#define STR_THUNDERBIRD			21
- 
- #define STR_END					STR_THUNDERBIRD + 1
- 
-diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.src openoffice.org/dbaccess/source/ui/misc/dbumiscres.src
---- openoffice.org.orig/dbaccess/source/ui/misc/dbumiscres.src	2006-01-18 12:51:58.000000000 +0000
-+++ openoffice.org/dbaccess/source/ui/misc/dbumiscres.src	2006-01-18 13:13:54.000000000 +0000
-@@ -107,9 +107,17 @@
- 	{
- 		Text  ="sdbc:address:outlookexp";
- 	};
--	String STR_EVOLUTION
--	{
--		Text  ="sdbc:address:evolution";
-+        String STR_EVOLUTION_LOCAL
-+        {
-+               Text  ="sdbc:address:evolution:local";
-+        };
-+        String STR_EVOLUTION_LDAP
-+        {
-+                Text  ="sdbc:address:evolution:ldap";
-+        };
-+        String STR_EVOLUTION_GROUPWISE
-+        {
-+                Text  ="sdbc:address:evolution:groupwise";
- 	};	
- 	String STR_KAB
- 	{
-@@ -199,11 +207,21 @@
- 		Text [ de ] = "Microsoft Windows Adressbuch";
- 		Text[ en-US ] = "Microsoft Windows Address Book";
- 	};
--	String STR_EVOLUTION
--	{
--		Text [ de ] = "Evolution Adressbuch";
--		Text[ en-US ] = "Evolution Address Book";
--	};
-+        String STR_EVOLUTION_LOCAL
-+        {
-+                Text [ de ] = "Evolution Local Adressbuch";
-+                Text[ en-US ] = "Evolution Local";
-+        };
-+        String STR_EVOLUTION_LDAP
-+        {
-+               Text [ de ] = "Evolution LDAP Adressbuch";
-+               Text[ en-US ] = "Evolution LDAP";
-+        };
-+        String STR_EVOLUTION_GROUPWISE
-+        {
-+                Text [ de ] = "Groupwise Adressbuch";
-+                Text[ en-US ] = "Groupwise";
-+        };
- 	String STR_KAB
- 	{
- 		Text [ de ] = "KDE Adressbuch";
-diff -ru openoffice.org.orig/dbaccess/source/ui/misc/dsntypes.cxx openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx
---- openoffice.org.orig/dbaccess/source/ui/misc/dsntypes.cxx	2006-01-18 12:51:58.000000000 +0000
-+++ openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx	2006-01-18 13:17:07.000000000 +0000
-@@ -387,6 +387,8 @@
- 			case DST_OUTLOOKEXP:
- 			case DST_FLAT:
-             case DST_EVOLUTION:
-+            case DST_EVOLUTION_LOCAL:
-+            case DST_EVOLUTION_LDAP:
-             case DST_KAB:
- 	 		case DST_THUNDERBIRD:
- 			case DST_CALC:
-@@ -434,6 +436,8 @@
- 		case DST_JDBC:
-         case DST_EVOLUTION:
-         case DST_KAB:
-+        case DST_EVOLUTION_LOCAL:
-+        case DST_EVOLUTION_LDAP:
- 			bEnableBrowseButton = FALSE;
- 			break;
- 		default:
-@@ -468,15 +472,17 @@
- 		case DST_ADO:
- 		case DST_LDAP:
-         case DST_CALC:
-+               case DST_EVOLUTION:
-+               case DST_EVOLUTION_LDAP:
- 			return sal_True;
- 			break;
- 		case DST_MSACCESS:
- 		case DST_MOZILLA:
- 		case DST_THUNDERBIRD:
--		case DST_EVOLUTION:
- 		case DST_KAB:
- 		case DST_OUTLOOK:
-         case DST_OUTLOOKEXP: //????
-+                case DST_EVOLUTION_LOCAL:
- 		case DST_DBASE:
- 		case DST_FLAT:
- 		case DST_EMBEDDED:
-@@ -551,8 +557,12 @@
- 			return DST_OUTLOOK;
- 		if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator))
- 			return DST_OUTLOOKEXP;
--		if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator))
--			return DST_EVOLUTION;
-+         if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator))
-+             return DST_EVOLUTION_LDAP;
-+         if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator))
-+             return DST_EVOLUTION;
-+         if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator))
-+             return DST_EVOLUTION_LOCAL;
- 		if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator))
- 			return DST_KAB;
- 	}
-diff -ru openoffice.org.orig/extensions/source/abpilot/abpresid.hrc openoffice.org/extensions/source/abpilot/abpresid.hrc
---- openoffice.org.orig/extensions/source/abpilot/abpresid.hrc	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/abpresid.hrc	2006-01-18 13:19:35.000000000 +0000
-@@ -171,9 +171,10 @@
- #define RB_EVOLUTION			3
- #define RB_KAB					4
- #define RB_LDAP					5
--#define RB_OUTLOOK				6
--#define RB_OUTLOOKEXPRESS		7
--#define RB_OTHER				8
-+#define RB_EVOLUTION_LDAP			6
-+#define RB_OUTLOOK				7
-+#define RB_OUTLOOKEXPRESS		8
-+#define RB_OTHER				9
- 
- //........................................................................
- #define ET_DATASOURCENAME		1
-diff -ru openoffice.org.orig/extensions/source/abpilot/abspilot.cxx openoffice.org/extensions/source/abpilot/abspilot.cxx
---- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	2006-01-18 13:08:52.000000000 +0000
-@@ -153,7 +153,7 @@
- 		// some initial settings
- #ifdef WITH_MOZILLA
- #ifdef UNX
--		m_aSettings.eType = AST_MORK;
-+		m_aSettings.eType = AST_EVOLUTION;
- #else
- 		m_aSettings.eType = AST_OE;
- #endif
-@@ -410,6 +410,10 @@
- 				m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
- 				break;
- 
-+			case AST_EVOLUTION_LDAP:
-+				m_aNewDataSource = aContext.createNewEvolutionLDAP( m_aSettings.sDataSourceName );
-+				break;
-+
- 			case AST_KAB:
- 				m_aNewDataSource = aContext.createNewKab( m_aSettings.sDataSourceName );
- 				break;
-diff -ru openoffice.org.orig/extensions/source/abpilot/abspilot.src openoffice.org/extensions/source/abpilot/abspilot.src
---- openoffice.org.orig/extensions/source/abpilot/abspilot.src	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/abspilot.src	2006-01-18 13:22:07.000000000 +0000
-@@ -161,9 +161,17 @@
- 		Text [ de ] = "LDAP Adress-Bestand";
- 		Text [ en-US ] = "LDAP address data";
- 	};
-+       RadioButton RB_EVOLUTION_LDAP
-+        {
-+                Pos             = MAP_APPFONT ( 15, 123 ) ;
-+                Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-+
-+               Text [ de ] = "Evolution LDAP";
-+               Text [ en-US ] = "Evolution LDAP";
-+       };
- 	RadioButton RB_OUTLOOK
- 	{
--		Pos		= MAP_APPFONT ( 15, 123 ) ;
-+		Pos		= MAP_APPFONT ( 15, 134 ) ;
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
- 
- 		Text [ de ] = "Outlook Adressbuch";
-@@ -171,7 +179,7 @@
- 	};
- 	RadioButton RB_OUTLOOKEXPRESS
- 	{
--		Pos		= MAP_APPFONT ( 15,134 ) ;
-+		Pos		= MAP_APPFONT ( 15,145 ) ;
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
- 
- 		Text [ de ] = "Windows System-Adressbuch";
-@@ -179,7 +187,7 @@
- 	};
- 	RadioButton RB_OTHER
- 	{
--		Pos		= MAP_APPFONT ( 15, 145 ) ;
-+		Pos		= MAP_APPFONT ( 15, 156 ) ;
- 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
- 
- 		Text [ de ] = "andere externe Datenquelle";
-diff -ru openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx openoffice.org/extensions/source/abpilot/addresssettings.hxx
---- openoffice.org.orig/extensions/source/abpilot/addresssettings.hxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	2006-01-18 13:08:52.000000000 +0000
-@@ -58,6 +58,7 @@
- 		AST_EVOLUTION,
- 		AST_KAB,
- 		AST_LDAP,
-+		AST_EVOLUTION_LDAP,
- 		AST_OUTLOOK,
- 		AST_OE,
- 
-diff -ru openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx openoffice.org/extensions/source/abpilot/datasourcehandling.cxx
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.cxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	2006-01-18 13:08:52.000000000 +0000
-@@ -332,7 +332,13 @@
- 	//---------------------------------------------------------------------
- 	ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
- 	{
--		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution" );
-+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
-+	}
-+
-+	//---------------------------------------------------------------------
-+	ODataSource	ODataSourceContext::createNewEvolutionLDAP( const ::rtl::OUString& _rName) SAL_THROW (( ))
-+	{
-+		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
- 	}
- 
- 	//---------------------------------------------------------------------
-diff -ru openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx openoffice.org/extensions/source/abpilot/datasourcehandling.hxx
---- openoffice.org.orig/extensions/source/abpilot/datasourcehandling.hxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	2006-01-18 13:08:52.000000000 +0000
-@@ -95,6 +95,9 @@
- 		/// creates a new KDE address book data source
- 		ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
- 
-+		/// creates a new Evolution LDAP data source
-+		ODataSource createNewEvolutionLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
-+
- 		/// creates a new LDAP data source
- 		ODataSource	createNewLDAP( const ::rtl::OUString& _rName ) SAL_THROW (( ));
- 
-diff -ru openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx openoffice.org/extensions/source/abpilot/typeselectionpage.cxx
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.cxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	2006-01-18 13:26:06.000000000 +0000
-@@ -107,6 +107,7 @@
- 		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
- 		,m_aKab				(this,	ResId(RB_KAB))
- 		,m_aLDAP			(this,	ResId(RB_LDAP))
-+		,m_aEvolutionLDAP		(this,	ResId(RB_EVOLUTION_LDAP))
- 		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
- 		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
- 		,m_aOther			(this,	ResId(RB_OTHER))
-@@ -120,6 +121,7 @@
- 		allTypes.push_back( &m_aEvolution );
- 		allTypes.push_back( &m_aKab );
- 		allTypes.push_back( &m_aLDAP );
-+		allTypes.push_back( &m_aEvolutionLDAP );
- 		allTypes.push_back( &m_aOutlook );
- 		allTypes.push_back( &m_aOE );
- 		allTypes.push_back( &m_aOther );
-@@ -148,7 +150,7 @@
- 		Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
- 
- 		// check whether Evolution is available
--		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))) );
-+		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
- 		if ( !xDriver.is() )
- 		    lcl_hideChoice( allTypes, m_aEvolution );
- 
-@@ -172,7 +174,7 @@
- 		AddressBookSourcePage::ActivatePage();
- 
-         RadioButton* pOptions[] = {
--            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
-+            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aEvolutionLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
-         };
-         for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
-             if ( (*pCheck)->IsChecked() )
-@@ -199,6 +201,7 @@
- 		m_aEvolution.Check(AST_EVOLUTION == _eType);
- 		m_aKab.Check(AST_KAB == _eType);
- 		m_aLDAP.Check(AST_LDAP == _eType);
-+		m_aEvolutionLDAP.Check(AST_EVOLUTION_LDAP == _eType);
- 		m_aOutlook.Check(AST_OUTLOOK == _eType);
- 		m_aOE.Check(AST_OE == _eType);
- 		m_aOther.Check(AST_OTHER == _eType);
-@@ -217,6 +220,8 @@
- 			return AST_KAB;
- 		else if (m_aLDAP.IsChecked())
- 			return AST_LDAP;
-+		else if (m_aEvolutionLDAP.IsChecked())
-+			return AST_EVOLUTION_LDAP;
- 		else if (m_aOutlook.IsChecked())
- 			return AST_OUTLOOK;
- 		else if (m_aOE.IsChecked())
-diff -ru openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx openoffice.org/extensions/source/abpilot/typeselectionpage.hxx
---- openoffice.org.orig/extensions/source/abpilot/typeselectionpage.hxx	2006-01-18 12:51:04.000000000 +0000
-+++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	2006-01-18 13:08:52.000000000 +0000
-@@ -64,6 +64,7 @@
- 		RadioButton		m_aEvolution;
- 		RadioButton		m_aKab;
- 		RadioButton		m_aLDAP;
-+		RadioButton		m_aEvolutionLDAP;
- 		RadioButton		m_aOutlook;
- 		RadioButton		m_aOE;
- 		RadioButton		m_aOther;
-Index: source/drivers/evoab2/NDatabaseMetaData.hxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx,v
-retrieving revision 1.3
-diff -u -r1.3 NDatabaseMetaData.hxx
---- openoffice.org.orig/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	8 Sep 2005 05:50:31 -0000	1.3
-+++ openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx	15 Dec 2005 14:45:24 -0000
-@@ -61,11 +61,38 @@ namespace connectivity
- 		//************ Class: OEvoabDatabaseMetaData
- 		//**************************************************************
- 
--		const GParamSpec *getField(guint n);
--		guint             getFieldCount();
--		sal_Int32		 getFieldType(sal_Int32 nCol);
--		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
--		rtl::OUString     getFieldName(sal_Int32 nCol);
-+ 		typedef struct{
-+ 			gboolean bIsSplittedValue;
-+ 			GParamSpec *pField;
-+ 		}ColumnProperty;
-+ 
-+ 		typedef enum {
-+             DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP,
-+ 		    WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP,
-+             HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP,
-+ 		    OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP
-+ 		}ColumnNumber;
-+  		sal_Int32        findEvoabField(const rtl::OUString& aColName);
-+         typedef  struct {
-+ 			const gchar *pColumnName;
-+ 			ColumnNumber value;
-+ 		}SplitEvoColumns;
-+ 
-+ 		static SplitEvoColumns evo_addr[] = {
-+             {"addr-line1",DEFAULT_ADDR_LINE1},{"addr-line2",DEFAULT_ADDR_LINE2},{"city",DEFAULT_CITY},{"state",DEFAULT_STATE},{"country",DEFAULT_COUNTRY},{"zip",DEFAULT_ZIP},
-+ 			{"work-addr-line1",WORK_ADDR_LINE1},{"work-addr-line2",WORK_ADDR_LINE2},{"work-city",WORK_CITY},{"work-state",WORK_STATE},{"work-country",WORK_COUNTRY},{"work-zip",WORK_ZIP},
-+ 			{"home-addr-line1",HOME_ADDR_LINE1},{"home-addr-line2",HOME_ADDR_LINE2},{"home-addr-City",HOME_CITY},{"home-state",HOME_STATE},{"home-country",HOME_COUNTRY},{"home-zip",HOME_ZIP},                      
-+ 			{"other-addr-line1",OTHER_ADDR_LINE1},{"other-addr-line2",OTHER_ADDR_LINE2},{"other-addr-city",OTHER_CITY},{"other-addr-state",OTHER_STATE},{"other-addr-country",OTHER_COUNTRY},{"other-addr-zip",OTHER_ZIP}
-+ 			};
-+ 
-+ 		const ColumnProperty *getField(guint n);
-+ 		guint            getFieldCount();
-+ 		sal_Int32	 getFieldType(sal_Int32 nCol);
-+ 		rtl::OUString	 getFieldTypeName(sal_Int32 nCol);
-+ 		rtl::OUString    getFieldName(sal_Int32 nCol);
-+ 
-+ 		void free_column_resources();
-+
- 		
- 		class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase
- 		{
+--- openoffice.org/extras/source/database/makefile.mk.bakj	2005-03-16 18:49:33.251075928 +0530
++++ openoffice.org/extras/source/database/makefile.mk	2005-03-16 18:50:38.651285353 +0530
+@@ -72,8 +72,8 @@
+ 
+ ZIP1TARGET      = $(DATABASE_USER_TARGET)
+ 
+-ZIP1LIST        = biblio.odb
+-
++ZIP1LIST        = biblio.odb \
++		  evolocal.odb	
+ ZIP2TARGET      = $(DATABASE_USER_BIBLIO_TARGET)
+ 
+ ZIP2LIST        = biblio.dbf biblio.dbt
+--- openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj	2005-03-16 18:51:43.777536725 +0530
++++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	2005-03-16 18:52:51.471404727 +0530
+@@ -187,6 +187,14 @@
+     </node>
+   </node>
+   <node oor:name="RegisteredNames">
++    <node oor:name="EvolutionLocal" oor:op="replace">
++		<prop oor:name="Location" oor:type="xs:string">
++			<value>$(userurl)/database/evolocal.odb</value>
++		</prop>
++		<prop oor:name="Name" oor:type="xs:string">
++			<value>EvolutionLocal</value>
++		</prop>
++	</node>
+     <node oor:name="Bibliography" oor:op="replace">
+ 		<prop oor:name="Location" oor:type="xs:string">
+ 			<value>$(userurl)/database/biblio.odb</value>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.620
retrieving revision 1.621
diff -u -r1.620 -r1.621
--- openoffice.org.spec	15 Feb 2006 08:30:43 -0000	1.620
+++ openoffice.org.spec	16 Feb 2006 14:33:08 -0000	1.621
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 1
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 %define build_fc5 1
 %define build_fc4 0
@@ -174,33 +174,36 @@
 Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
-Patch9:  openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch10: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch11: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch12: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch13: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch15: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch17: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch18: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch19: workspace.dmake43p01.patch
-Patch20: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch21: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch22: workspace.atkbridge.patch
-Patch23: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch24: workspace.jaxpapi.patch
-Patch25: workspace.systemjava.patch
-Patch26: workspace.targetedaot.patch
-Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch9:  openoffice.org-2.0.2.ooo62138.extensions.patch
+Patch10: openoffice.org-2.0.2.ooo34909.dbaccess.patch
+Patch11: workspace.evo2fixes.patch
+Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch15: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch16: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch18: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch20: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch21: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch22: workspace.dmake43p01.patch
+Patch23: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch24: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch25: workspace.atkbridge.patch
+Patch26: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch27: workspace.jaxpapi.patch
+Patch28: workspace.systemjava.patch
+Patch29: workspace.targetedaot.patch
+Patch30: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch31: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch32: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch33: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch34: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch35: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch36: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -824,40 +827,43 @@
 %endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
-%patch9  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch10 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch11 -p1 -b .ooo54603.fontconfig.patch
-%patch12 -p1 -b .ooo51931.systemxmlsec.patch
-%patch13 -p1 -b .ooo52428.execshield.bridges.patch
+%patch9  -p1 -b .ooo62138.extensions.patch
+%patch10 -p1 -b .ooo34909.dbaccess.patch
+%patch11 -p1 -b .workspace.evo2fixes.patch
+%patch12  -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch14 -p1 -b .ooo54603.fontconfig.patch
+%patch15 -p1 -b .ooo51931.systemxmlsec.patch
+%patch16 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %else
-%patch15 -p1 -b .ooo51718.rpath.patch
+%patch18 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch16 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch17 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch18 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch19 -p1 -b .dmake43p01.patch
+%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch20 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch21 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch22 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch20 -p1 -b .ooo54479.systemicu.patch
+%patch23 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch21 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch22 -p1 -b .workspace.atkbridge.patch
-%patch23 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch24 -p0 -b .workspace.jaxpapi.patch
-%patch25 -p1 -b .workspace.systemjava.patch
-%patch26 -p1 -b .workspace.targetedaot.patch
-%patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch28 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch24 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch25 -p1 -b .workspace.atkbridge.patch
+%patch26 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch27 -p0 -b .workspace.jaxpapi.patch
+%patch28 -p1 -b .workspace.systemjava.patch
+%patch29 -p1 -b .workspace.targetedaot.patch
+%patch30 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch31 -p1 -b .ooo58606.sw.pre-edit.patch
 %if %{build_fc4}
-%patch29 -p1 -b .gcc25199.bitfieldaccess.patch
+%patch32 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
-%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch33 -p1 -b .ooo61875.sd.compile.patch
-%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch35 -p1 -b .ooo62030.solenv._version.patch
+%patch33 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch34 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch35 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch36 -p1 -b .ooo61875.sd.compile.patch
+%patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch38 -p1 -b .ooo62030.solenv._version.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3347,6 +3353,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Feb 16 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.2
+- update and split evo patches to match upstream segmentation
+
 * Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.1
 - 2.0.2 previews
 - hunspell replaces myspell



From fedora-cvs-commits at redhat.com  Thu Feb 16 14:48:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:48:16 -0500
Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.15,1.16
Message-ID: <200602161448.k1GEmGRe026760@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xinit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26747

Modified Files:
	xorg-x11-xinit.spec 
Log Message:
* 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)



Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xinit.spec	11 Feb 2006 06:27:51 -0000	1.15
+++ xorg-x11-xinit.spec	16 Feb 2006 14:48:14 -0000	1.16
@@ -3,13 +3,13 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
 Source10: xinitrc-common
 Source11: xinitrc
 Source12: Xclients
@@ -26,8 +26,8 @@
 Requires: xauth
 
 # NOTE: xinit, startx moved to xorg-x11-xinit during the X.Org X11R7
-# modularization.  These Conflicts lines ensure upgrades work smoothly.
-Conflicts: XFree86, xorg-x11
+# modularization.  These Obsoletes lines ensure upgrades work smoothly.
+Obsoletes: XFree86, xorg-x11
 
 # NOTE: Most of the xinitrc scripts/config files are now in xorg-x11-xinit,
 # so the xinitrc package became unnecessary.  The xdm configs/scripts move
@@ -73,7 +73,6 @@
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_bindir}
 %{_bindir}/startx
 %{_bindir}/xinit
 %dir %{_sysconfdir}/X11
@@ -87,12 +86,14 @@
 %{_sysconfdir}/X11/xinit/Xsession
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/startx.1x*
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* 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)
+
 * 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 Feb 16 14:52:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 09:52:40 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo34909.dbaccess.patch, 1.1, 1.2
Message-ID: <200602161452.k1GEqeXW026874@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26859

Modified Files:
	openoffice.org-2.0.2.ooo34909.dbaccess.patch 
Log Message:
fix patch

openoffice.org-2.0.2.ooo34909.dbaccess.patch:
 dlg/dbwizsetup.cxx  |   23 ++++++++++++++++++-----
 inc/dsntypes.hxx    |    6 ++++--
 misc/dbumiscres.hrc |   10 ++++++----
 misc/dbumiscres.src |   34 ++++++++++++++++++++++++++--------
 misc/dsntypes.cxx   |   22 ++++++++++++++++------
 5 files changed, 70 insertions(+), 25 deletions(-)

Index: openoffice.org-2.0.2.ooo34909.dbaccess.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo34909.dbaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.ooo34909.dbaccess.patch	16 Feb 2006 14:33:08 -0000	1.1
+++ openoffice.org-2.0.2.ooo34909.dbaccess.patch	16 Feb 2006 14:52:36 -0000	1.2
@@ -53,22 +53,22 @@
  		case DST_MOZILLA:
 --- openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx.bakj	2005-04-06 18:05:46.000000000 +0530
 +++ openoffice.org/dbaccess/source/ui/inc/dsntypes.hxx	2005-04-06 18:07:10.000000000 +0530
-@@ -101,7 +101,9 @@
+@@ -76,8 +76,10 @@
+ 	DST_OUTLOOK		=	15,	
  	DST_OUTLOOKEXP	=	16,	
  	DST_EVOLUTION	=	17,
-- 	DST_KAB         =	18,
-- 	DST_EMBEDDED	=	19,
-+	DST_EVOLUTION_LOCAL =	18,
-+	DST_EVOLUTION_LDAP  =	19,
-+ 	DST_KAB         =	20,
-+ 	DST_EMBEDDED	=	21,
+-	DST_KAB			=	18,
+-	DST_EMBEDDED	=	19,
++        DST_EVOLUTION_LOCAL =   18,
++        DST_EVOLUTION_LDAP  =   19,
++        DST_KAB         =       20,
++        DST_EMBEDDED    =       21,
  
  	DST_USERDEFINE1,	/// first user defined driver
  	DST_USERDEFINE2,
-
 --- openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx.bakj	2005-04-06 17:57:59.000000000 +0530
 +++ openoffice.org/dbaccess/source/ui/misc/dsntypes.cxx	2005-04-06 18:05:24.000000000 +0530
-@@ -412,8 +412,10 @@
+@@ -386,8 +386,10 @@
  			case DST_OUTLOOK:
  			case DST_OUTLOOKEXP:
  			case DST_FLAT:
@@ -81,7 +81,7 @@
  	 		case DST_THUNDERBIRD:
  			case DST_CALC:
                  bSupportsTableCreation = FALSE;
-@@ -458,8 +458,10 @@
+@@ -432,8 +434,10 @@
  		case DST_OUTLOOK:
  		case DST_OUTLOOKEXP:
  		case DST_JDBC:
@@ -94,12 +94,12 @@
  			bEnableBrowseButton = FALSE;
  			break;
  		default:
-@@ -493,12 +493,14 @@
-		case DST_ADO:
-		case DST_LDAP:
-        case DST_CALC:
-+		case DST_EVOLUTION_LDAP:
-+		case DST_EVOLUTION:
+@@ -468,12 +472,14 @@
+ 		case DST_ADO:
+ 		case DST_LDAP:
+         case DST_CALC:
++                case DST_EVOLUTION_LDAP:
++                case DST_EVOLUTION:
  			return sal_True;
  			break;
  		case DST_MSACCESS:
@@ -110,16 +110,15 @@
  		case DST_KAB:
  		case DST_OUTLOOK:
          case DST_OUTLOOKEXP: //????
-@@ -577,8 +577,12 @@
+@@ -551,8 +557,12 @@
  			return DST_OUTLOOK;
  		if (_rDsn.EqualsIgnoreCaseAscii("outlookexp", nSeparator,_rDsn.Len() - nSeparator))
  			return DST_OUTLOOKEXP;
 -		if (_rDsn.EqualsIgnoreCaseAscii("evolution", nSeparator,_rDsn.Len() - nSeparator))
--			return DST_EVOLUTION;
 +		if (_rDsn.EqualsIgnoreCaseAscii("evolution:ldap", nSeparator,_rDsn.Len() - nSeparator))
 +			return DST_EVOLUTION_LDAP;
 +		if (_rDsn.EqualsIgnoreCaseAscii("evolution:groupwise", nSeparator,_rDsn.Len() - nSeparator))
-+			return DST_EVOLUTION;
+ 			return DST_EVOLUTION;
 +		if (_rDsn.EqualsIgnoreCaseAscii("evolution:local", nSeparator,_rDsn.Len() - nSeparator))
 +			return DST_EVOLUTION_LOCAL;
  		if (_rDsn.EqualsIgnoreCaseAscii("kab", nSeparator,_rDsn.Len() - nSeparator))



From fedora-cvs-commits at redhat.com  Thu Feb 16 16:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 11:46:49 -0500
Subject: rpms/lftp/devel lftp-3.4.2-fix-redirect-coredump.patch, 1.1,
	1.2 lftp.spec, 1.41, 1.42
Message-ID: <200602161646.k1GGknji014837@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14822

Modified Files:
	lftp-3.4.2-fix-redirect-coredump.patch lftp.spec 
Log Message:
Apply upstream fix for bug 181694

lftp-3.4.2-fix-redirect-coredump.patch:
 FileAccess.cc |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: lftp-3.4.2-fix-redirect-coredump.patch
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp-3.4.2-fix-redirect-coredump.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lftp-3.4.2-fix-redirect-coredump.patch	15 Feb 2006 22:24:33 -0000	1.1
+++ lftp-3.4.2-fix-redirect-coredump.patch	16 Feb 2006 16:46:46 -0000	1.2
@@ -1,18 +1,11 @@
---- lftp-3.4.2/src/Http.cc.redirect_coredump	2006-02-06 05:57:25.000000000 -0500
-+++ lftp-3.4.2/src/Http.cc	2006-02-15 16:19:23.000000000 -0500
-@@ -1525,6 +1525,15 @@
-       }
-       if(mode==CHANGE_DIR)
-       {
-+	 if( new_cwd == 0L )
-+	 {
-+	     char *new_location = xstrdup(GetConnectURL());
-+	     xfree(location);
-+	     location=new_location;	     
-+	     SetError(FILE_MOVED);
-+	     state= DONE;
-+	     return MOVED;
-+	 }
- 	 cwd.Set(new_cwd);
- 	 state=DONE;
- 	 return MOVED;
+--- lftp-3.4.2/src/FileAccess.cc.bz181694	2006-02-06 06:03:58.000000000 -0500
++++ lftp-3.4.2/src/FileAccess.cc	2006-02-16 11:34:44.000000000 -0500
+@@ -690,7 +690,7 @@
+ 
+ void FileAccess::PathVerify(const Path &p)
+ {
+-   delete new_cwd;
++   Close();
+    new_cwd=new Path(p);
+    Open(new_cwd->path,CHANGE_DIR);
+ }


Index: lftp.spec
===================================================================
RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- lftp.spec	15 Feb 2006 22:29:33 -0000	1.41
+++ lftp.spec	16 Feb 2006 16:46:46 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.4.2
-Release: 	2
+Release: 	4
 License: 	GPL
 Group: 		Applications/Internet
 Source0: 	http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2
@@ -13,6 +13,8 @@
 Patch2:		lftp-3.4.1-dont_core.patch
 Patch181694:    lftp-3.4.2-fix-redirect-coredump.patch
 
+#%define debug_package %{nil}
+
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
 control and uses the readline library for input. It has bookmarks, built-in
@@ -47,6 +49,8 @@
 # Remove files from $RPM_BUILD_ROOT that we aren't shipping.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a
 %find_lang %{name}
+#/usr/lib/rpm/brp-compress
+#exit 0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +77,9 @@
 %{_libdir}/lftp/%{version}/proto-sftp.so
 
 %changelog
+* Thu Feb 16 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.2-4
+- Apply upstream fix for bug 181694.
+
 * Wed Feb 15 2006 Jason Vas Dias<jvdias at redhat.com> - 3.4.2-2
 - fix bug 181694: segfault on redirection to non-existent location
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 18:08:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 13:08:14 -0500
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth-0.7.0-path.patch, NONE,
	1.1 gnome-bluetooth.spec, 1.28, 1.29
Message-ID: <200602161808.k1GI8EdV006286@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6238

Modified Files:
	gnome-bluetooth.spec 
Added Files:
	gnome-bluetooth-0.7.0-path.patch 
Log Message:
fixed pixmap loading path

gnome-bluetooth-0.7.0-path.patch:
 manager.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnome-bluetooth-0.7.0-path.patch ---
--- gnome-bluetooth-0.7.0/python/manager.py.path	2006-02-16 18:48:02.000000000 +0100
+++ gnome-bluetooth-0.7.0/python/manager.py	2006-02-16 18:48:25.000000000 +0100
@@ -265,7 +265,7 @@
         dialog.show ()
 
     def image_file (self, fname):
-        for d in [os.path.join (__datadir__, "pixmaps"), "../pixmaps"]:
+        for d in [os.path.join (__datadir__, "pixmaps"), "../pixmaps", "/usr/share/pixmaps"]:
             if os.path.isfile (os.path.join (d, fname)):
                 return os.path.join (d, fname)
         return None


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-bluetooth.spec	16 Feb 2006 14:22:08 -0000	1.28
+++ gnome-bluetooth.spec	16 Feb 2006 18:07:53 -0000	1.29
@@ -18,6 +18,7 @@
 ExcludeArch: s390 s390x
 
 Patch1: gnome-bluetooth-0.7.0-pydir.patch
+Patch2: gnome-bluetooth-0.7.0-path.patch
 
 %description
 This package contains a Bonobo server to control Bluetooth devices,
@@ -49,11 +50,15 @@
 
 %setup -q
 %patch1 -p1 -b .pydir
+%patch2 -p1 -b .path
 
 aclocal
 automake -a
 autoconf
 
+perl -pi -e 's|^Icon=.*|Icon=%{_datadir}/pixmaps/blueradio-48.png|g' \
+    */*.desktop.in
+
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Thu Feb 16 18:39:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 13:39:59 -0500
Subject: rpms/kernel/FC-4 linux-2.6-ipw2200-hwcrypto.patch, NONE,
	1.1 kernel-2.6.spec, 1.1599, 1.1600
Message-ID: <200602161839.k1GIdxFW023525@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23507

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ipw2200-hwcrypto.patch 
Log Message:
set ipw2200 hwcrypto option off by default

linux-2.6-ipw2200-hwcrypto.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-ipw2200-hwcrypto.patch ---
--- linux-2.6.15/drivers/net/wireless/ipw2200.c.orig	2006-01-02 22:21:10.000000000 -0500
+++ linux-2.6.15/drivers/net/wireless/ipw2200.c	2006-02-15 14:15:59.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', '?'
 };
@@ -7059,8 +7059,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;
@@ -11287,7 +11286,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,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1599
retrieving revision 1.1600
diff -u -r1.1599 -r1.1600
--- kernel-2.6.spec	10 Feb 2006 08:26:29 -0000	1.1599
+++ kernel-2.6.spec	16 Feb 2006 18:39:57 -0000	1.1600
@@ -312,6 +312,7 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
+Patch1302: linux-2.6-ipw2200-hwcrypto.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -721,6 +722,8 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
+# ipw2200 hwcrypto=0 by default to avoid firmware restarts
+%patch1302 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -1272,6 +1275,9 @@
 %endif
 
 %changelog
+* Fri Feb 16 2006 John W. Linville <linville at redhat.com>
+- Set ipw2200 hwcrypto option to 0 to avoid firmware restarts.
+
 * Fri Feb 10 2006 Dave Jones <davej at redhat.com> [2.6.15-1.1832_FC4]
 - 2.6.15.4
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 18:40:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 13:40:48 -0500
Subject: rpms/libsepol/devel .cvsignore, 1.85, 1.86 libsepol.spec, 1.111,
	1.112 sources, 1.86, 1.87
Message-ID: <200602161840.k1GIemIg023554@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23538

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> 1.11.17-1
- Upgrade to latest from NSA
	* Merged nodes, ports: always prepend patch from Ivan Gyurdiev.
	* Merged bug fix patch from Ivan Gyurdiev.
	* Added a defined flag to level_datum_t for use by checkpolicy.
	* Merged nodecon support patch from Ivan Gyurdiev.
	* Merged cleanups patch from Ivan Gyurdiev.	



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore	13 Feb 2006 15:50:33 -0000	1.85
+++ .cvsignore	16 Feb 2006 18:40:45 -0000	1.86
@@ -83,3 +83,4 @@
 libsepol-1.11.12.tgz
 libsepol-1.11.13.tgz
 libsepol-1.11.14.tgz
+libsepol-1.11.17.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- libsepol.spec	13 Feb 2006 20:57:55 -0000	1.111
+++ libsepol.spec	16 Feb 2006 18:40:45 -0000	1.112
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.11.14
-Release: 2
+Version: 1.11.17
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,6 +80,14 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> 1.11.17-1
+- Upgrade to latest from NSA
+	* Merged nodes, ports: always prepend patch from Ivan Gyurdiev.
+	* Merged bug fix patch from Ivan Gyurdiev.
+	* Added a defined flag to level_datum_t for use by checkpolicy.
+	* Merged nodecon support patch from Ivan Gyurdiev.
+	* Merged cleanups patch from Ivan Gyurdiev.	
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.11.14-2
 - Fix post install not to fire if /dev/initctr does not exist
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sources	13 Feb 2006 15:50:33 -0000	1.86
+++ sources	16 Feb 2006 18:40:45 -0000	1.87
@@ -1 +1 @@
-a0a338a20690e7fef163865ac93d05a1  libsepol-1.11.14.tgz
+ff1ac6cc6f395873b6114dc3527816a8  libsepol-1.11.17.tgz



From fedora-cvs-commits at redhat.com  Thu Feb 16 18:44:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 13:44:04 -0500
Subject: rpms/libsemanage/devel .cvsignore, 1.52, 1.53 libsemanage.spec, 1.75,
	1.76 sources, 1.54, 1.55
Message-ID: <200602161844.k1GIi4O0023640@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23621

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.26-1
- Upgrade to latest from NSA
	* Merged paths array patch from Ivan Gyurdiev.
	* Merged bug fix patch from Ivan Gyurdiev.
	* Merged improve bindings patch from Ivan Gyurdiev.
	* Merged use PyList patch from Ivan Gyurdiev.	
	* Merged memory leak fix patch from Ivan Gyurdiev.
	* Merged nodecon support patch from Ivan Gyurdiev.
	* Merged cleanups patch from Ivan Gyurdiev.
	* Merged split swig patch from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore	13 Feb 2006 19:31:13 -0000	1.52
+++ .cvsignore	16 Feb 2006 18:44:02 -0000	1.53
@@ -55,3 +55,4 @@
 libsemanage-1.5.20.tgz
 libsemanage-1.5.21.tgz
 libsemanage-1.5.23.tgz
+libsemanage-1.5.26.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- libsemanage.spec	13 Feb 2006 19:31:13 -0000	1.75
+++ libsemanage.spec	16 Feb 2006 18:44:02 -0000	1.76
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.14-1
+%define libsepolver 1.11.17-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.23
+Version: 1.5.26
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,17 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.26-1
+- Upgrade to latest from NSA
+	* Merged paths array patch from Ivan Gyurdiev.
+	* Merged bug fix patch from Ivan Gyurdiev.
+	* Merged improve bindings patch from Ivan Gyurdiev.
+	* Merged use PyList patch from Ivan Gyurdiev.	
+	* Merged memory leak fix patch from Ivan Gyurdiev.
+	* Merged nodecon support patch from Ivan Gyurdiev.
+	* Merged cleanups patch from Ivan Gyurdiev.
+	* Merged split swig patch from Ivan Gyurdiev.
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.23-1
 - Upgrade to latest from NSA
 	* Merged optionals in base patch from Joshua Brindle.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	13 Feb 2006 19:31:17 -0000	1.54
+++ sources	16 Feb 2006 18:44:02 -0000	1.55
@@ -1 +1 @@
-0484ae69e477977a298a64e5084f8856  libsemanage-1.5.23.tgz
+a843bab0bdfee3026330d8727a3630cc  libsemanage-1.5.26.tgz



From fedora-cvs-commits at redhat.com  Thu Feb 16 18:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 13:44:17 -0500
Subject: rpms/checkpolicy/devel .cvsignore, 1.56, 1.57 checkpolicy.spec, 1.92,
	1.93 sources, 1.57, 1.58
Message-ID: <200602161844.k1GIiHn3023702@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23644

Modified Files:
	.cvsignore checkpolicy.spec sources 
Log Message:
* Fri Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.4-1
- Latest upgrade from NSA
	* Added a check for failure to declare each sensitivity in
	  a level definition.
	* Changed to clone level data for aliased sensitivities to
	  avoid double free upon sens_destroy.  Bug reported by Kevin
	  Carr of Tresys Technology.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	13 Feb 2006 19:31:16 -0000	1.56
+++ .cvsignore	16 Feb 2006 18:44:15 -0000	1.57
@@ -39,3 +39,4 @@
 checkpolicy-1.28.tgz
 checkpolicy-1.29.1.tgz
 checkpolicy-1.29.2.tgz
+checkpolicy-1.29.4.tgz


Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- checkpolicy.spec	13 Feb 2006 19:31:16 -0000	1.92
+++ checkpolicy.spec	16 Feb 2006 18:44:15 -0000	1.93
@@ -1,7 +1,7 @@
-%define libsepolver 1.11.14-1
+%define libsepolver 1.11.17-1
 Summary: SELinux policy compiler
 Name: checkpolicy
-Version: 1.29.2
+Version: 1.29.4
 Release: 1
 License: GPL
 Group: Development/System
@@ -47,6 +47,14 @@
 %{_mandir}/man8/checkmodule.8.gz
 
 %changelog
+* Fri Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.4-1
+- Latest upgrade from NSA
+	* Added a check for failure to declare each sensitivity in
+	  a level definition.
+	* Changed to clone level data for aliased sensitivities to
+	  avoid double free upon sens_destroy.  Bug reported by Kevin
+	  Carr of Tresys Technology.
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.2-1
 - Latest upgrade from NSA
 	* Merged optionals in base patch from Joshua Brindle.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	13 Feb 2006 19:31:17 -0000	1.57
+++ sources	16 Feb 2006 18:44:15 -0000	1.58
@@ -1 +1 @@
-763c11f38e568daa8cf154341d1dd195  checkpolicy-1.29.2.tgz
+ccc15309265965702935f2a2f5107389  checkpolicy-1.29.4.tgz



From fedora-cvs-commits at redhat.com  Thu Feb 16 19:04:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 14:04:19 -0500
Subject: rpms/bash/devel bash31-008,NONE,1.1 bash.spec,1.108,1.109
Message-ID: <200602161904.k1GJ4JfL014523@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14477

Modified Files:
	bash.spec 
Added Files:
	bash31-008 
Log Message:
* Thu Feb 16 2006 Tim Waugh <twaugh at redhat.com> 3.1-7
- Patchlevel 8.



--- NEW FILE bash31-008 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-008

Bug-Reported-by: Ingemar Nilsson <init at kth.se>
Bug-Reference-ID: <43C38D35.7020404 at kth.se>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00044.html

Bug-Description:

In some cases, bash inappropriately allows SIGINT from the terminal to
reach background processes.

Patch:

*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
--- jobs.c	Wed Feb  1 13:55:38 2006
***************
*** 2199,2203 ****
    wait_sigint_received = 0;
    if (job_control == 0)
!     old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
  
    termination_state = last_command_exit_value;
--- 2298,2306 ----
    wait_sigint_received = 0;
    if (job_control == 0)
!     {
!       old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
!       if (old_sigint_handler == SIG_IGN)
! 	set_signal_handler (SIGINT, old_sigint_handler);
!     }
  
    termination_state = last_command_exit_value;
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 7
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 8
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- bash.spec	11 Feb 2006 02:04:58 -0000	1.108
+++ bash.spec	16 Feb 2006 19:04:04 -0000	1.109
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 6.2
+Release: 7
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -18,6 +18,7 @@
 Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-005
 Patch6: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-006
 Patch7: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-007
+Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-008
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -63,6 +64,7 @@
 %patch5 -p0 -b .005
 %patch6 -p0 -b .006
 %patch7 -p0 -b .007
+%patch8 -p0 -b .008
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -214,6 +216,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Feb 16 2006 Tim Waugh <twaugh at redhat.com> 3.1-7
+- Patchlevel 8.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1-6.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 19:04:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 14:04:39 -0500
Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.8,1.9
Message-ID: <200602161904.k1GJ4YPE014555@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/xorg-x11-drivers/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14478

Modified Files:
	xorg-x11-drivers.spec 
Log Message:
uncomment empty file section so that binary rpms are built
make the buildroot in %install, to clean up harmless warnings



Index: xorg-x11-drivers.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drivers.spec	11 Feb 2006 06:14:15 -0000	1.8
+++ xorg-x11-drivers.spec	16 Feb 2006 19:04:29 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.0
-Release: 1.1
+Release: 2
 License: MIT/X11
 Group: User Interface/X Hardware Support
 URL: http://www.redhat.com
@@ -262,15 +262,19 @@
 %build
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%files
-#%defattr(-,root,root,-)
-#%doc
+%files
+%defattr(-,root,root,-)
+%doc
 
 %changelog
+* 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
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 16 20:37:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 15:37:37 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1957,
	1.1958 linux-2.6-module_version.patch, 1.1, 1.2
Message-ID: <200602162037.k1GKbbEp013079@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13064

Modified Files:
	kernel-2.6.spec linux-2.6-module_version.patch 
Log Message:
stop adding duplicate MODULE_VERSION line to tg3


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1957
retrieving revision 1.1958
diff -u -r1.1957 -r1.1958
--- kernel-2.6.spec	16 Feb 2006 05:48:18 -0000	1.1957
+++ kernel-2.6.spec	16 Feb 2006 20:37:26 -0000	1.1958
@@ -1573,6 +1573,9 @@
 %endif
 
 %changelog
+* Thu Feb 16 2006 John W. Linville <linville at redhat.com>
+- stop adding duplicate MODULE_VERSION line to tg3
+
 * Thu Feb 16 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc3-git5
 - Enable exec* checking on all architectures. (#178747)

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/devel/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	16 Oct 2005 22:23:45 -0000	1.1
+++ linux-2.6-module_version.patch	16 Feb 2006 20:37:27 -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



From fedora-cvs-commits at redhat.com  Thu Feb 16 21:08:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 16:08:56 -0500
Subject: rpms/kernel/devel jwltest-e1000-7_0_33-k2.patch, NONE,
	1.1.8.1 jwltest-ipw2200-hwcrypto-off.patch, NONE,
	1.1.6.1 jwltest-sk98lin-neuter.patch, NONE,
	1.1.14.1 jwltest-tg3-3_50.patch, NONE, 1.1.2.1 kernel-2.6.spec,
	1.1958, 1.1958.2.1
Message-ID: <200602162108.k1GL8uIJ004623@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4550

Modified Files:
      Tag: private-linville-jwltest-fc5-11-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-linville-jwltest-fc5-11-branch
	jwltest-e1000-7_0_33-k2.patch 
	jwltest-ipw2200-hwcrypto-off.patch 
	jwltest-sk98lin-neuter.patch jwltest-tg3-3_50.patch 
Log Message:


jwltest-e1000-7_0_33-k2.patch:
 e1000.h         |   52 +--
 e1000_ethtool.c |  113 +++----
 e1000_hw.c      |  861 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 e1000_hw.h      |  366 ++++++++++++++++++++++-
 e1000_main.c    |  674 +++++++++++++++++++------------------------
 e1000_osdep.h   |    4 
 e1000_param.c   |   78 +----
 7 files changed, 1508 insertions(+), 640 deletions(-)

--- NEW FILE jwltest-e1000-7_0_33-k2.patch ---
--- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig	2006-02-13 11:48:40.000000000 -0500
+++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c	2006-02-13 11:54:16.000000000 -0500
@@ -44,10 +44,19 @@
  */
 
 #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
+/* Module Parameters are always initialized to -1, so that the driver
+ * can tell the difference between no user specified value or the
+ * user asking for the default value.
+ * The true default values are loaded in when e1000_check_options is called.
+ *
+ * This is a GCC extension to ANSI C.
+ * See the item "Labeled Elements in Initializers" in the section
+ * "Extensions to the C Language Family" of the GCC documentation.
+ */
+
 #define E1000_PARAM(X, desc) \
-	static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
-	static int num_##X = 0; \
-	module_param_array_named(X, X, int, &num_##X, 0); \
+	static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
+	MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \
 	MODULE_PARM_DESC(X, desc);
 
 /* Transmit Descriptor Count
@@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct
 		BUG();
 	}
 
-	DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n",
+	DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n",
 	       opt->name, *value, opt->err);
 	*value = opt->def;
 	return -1;
@@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter
 		DPRINTK(PROBE, NOTICE,
 		       "Warning: no configuration for board #%i\n", bd);
 		DPRINTK(PROBE, NOTICE, "Using defaults for all values\n");
+		bd = E1000_MAX_NIC;
 	}
 
 	{ /* Transmit Descriptor Count */
@@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ?
 			E1000_MAX_TXD : E1000_MAX_82544_TXD;
 
-		if (num_TxDescriptors > bd) {
 			tx_ring->count = TxDescriptors[bd];
 			e1000_validate_option(&tx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(tx_ring->count,
 						REQ_TX_DESCRIPTOR_MULTIPLE);
-		} else {
-			tx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_tx_queues; i++)
 			tx_ring[i].count = tx_ring->count;
 	}
@@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter
 		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
 			E1000_MAX_82544_RXD;
 
-		if (num_RxDescriptors > bd) {
 			rx_ring->count = RxDescriptors[bd];
 			e1000_validate_option(&rx_ring->count, &opt, adapter);
 			E1000_ROUNDUP(rx_ring->count,
 						REQ_RX_DESCRIPTOR_MULTIPLE);
-		} else {
-			rx_ring->count = opt.def;
-		}
 		for (i = 0; i < adapter->num_rx_queues; i++)
 			rx_ring[i].count = rx_ring->count;
 	}
@@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter
 			.def  = OPTION_ENABLED
 		};
 
-		if (num_XsumRX > bd) {
 			int rx_csum = XsumRX[bd];
 			e1000_validate_option(&rx_csum, &opt, adapter);
 			adapter->rx_csum = rx_csum;
-		} else {
-			adapter->rx_csum = opt.def;
-		}
 	}
 	{ /* Flow Control */
 
@@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter
 					 .p = fc_list }}
 		};
 
-		if (num_FlowControl > bd) {
 			int fc = FlowControl[bd];
 			e1000_validate_option(&fc, &opt, adapter);
 			adapter->hw.fc = adapter->hw.original_fc = fc;
-		} else {
-			adapter->hw.fc = adapter->hw.original_fc = opt.def;
-		}
 	}
 	{ /* Transmit Interrupt Delay */
 		struct e1000_option opt = {
@@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXDELAY }}
 		};
 
-		if (num_TxIntDelay > bd) {
 			adapter->tx_int_delay = TxIntDelay[bd];
 			e1000_validate_option(&adapter->tx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_int_delay = opt.def;
-		}
 	}
 	{ /* Transmit Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_TXABSDELAY }}
 		};
 
-		if (num_TxAbsIntDelay > bd) {
 			adapter->tx_abs_int_delay = TxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->tx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->tx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Interrupt Delay */
 		struct e1000_option opt = {
@@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXDELAY }}
 		};
 
-		if (num_RxIntDelay > bd) {
 			adapter->rx_int_delay = RxIntDelay[bd];
 			e1000_validate_option(&adapter->rx_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_int_delay = opt.def;
-		}
 	}
 	{ /* Receive Absolute Interrupt Delay */
 		struct e1000_option opt = {
@@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_RXABSDELAY }}
 		};
 
-		if (num_RxAbsIntDelay > bd) {
 			adapter->rx_abs_int_delay = RxAbsIntDelay[bd];
 			e1000_validate_option(&adapter->rx_abs_int_delay, &opt,
 								adapter);
-		} else {
-			adapter->rx_abs_int_delay = opt.def;
-		}
 	}
 	{ /* Interrupt Throttling Rate */
 		struct e1000_option opt = {
@@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter
 					 .max = MAX_ITR }}
 		};
 
-		if (num_InterruptThrottleRate > bd) {
 			adapter->itr = InterruptThrottleRate[bd];
 			switch (adapter->itr) {
 			case 0:
@@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter
 					adapter);
 				break;
 			}
-		} else {
-			adapter->itr = opt.def;
-		}
 	}
 
 	switch (adapter->hw.media_type) {
@@ -518,17 +492,18 @@ static void __devinit
 e1000_check_fiber_options(struct e1000_adapter *adapter)
 {
 	int bd = adapter->bd_number;
-	if (num_Speed > bd) {
+	bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd;
+	if ((Speed[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if (num_Duplex > bd) {
+	if ((Duplex[bd] != OPTION_UNSET)) {
 		DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, "
 		       "parameter ignored\n");
 	}
 
-	if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) {
+	if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) {
 		DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is "
 				 "not valid for fiber adapters, "
 				 "parameter ignored\n");
@@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_
 {
 	int speed, dplx, an;
[...3966 lines suppressed...]
-
 	rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
 	rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
 		E1000_MAX_RXD : E1000_MAX_82544_RXD));
@@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada
 	/* there are several bits on newer hardware that are r/w */
 	case e1000_82571:
 	case e1000_82572:
+	case e1000_80003es2lan:
 		toggle = 0x7FFFF3FF;
 		break;
 	case e1000_82573:
@@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
 		/* autoneg off */
 		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
+	} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
+		e1000_write_phy_reg(&adapter->hw,
+		                    GG82563_PHY_KMRN_MODE_CTRL,
+		                    0x1CE);
 	}
 	/* force 1000, set loopback */
 	e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);
@@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap
 	case e1000_82571:
 	case e1000_82572:
 	case e1000_82573:
+	case e1000_80003es2lan:
 		return e1000_integrated_phy_loopback(adapter);
 		break;
 
@@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap
 	case e1000_82546_rev_3:
 	default:
 		hw->autoneg = TRUE;
+		if (hw->phy_type == e1000_phy_gg82563) {
+			e1000_write_phy_reg(hw,
+					    GG82563_PHY_KMRN_MODE_CTRL,
+					    0x180);
+		}
 		e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
 		if (phy_reg & MII_CR_LOOPBACK) {
 			phy_reg &= ~MII_CR_LOOPBACK;
@@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 		wol->supported = 0;
 		wol->wolopts   = 0;
 		return;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a) {
+			wol->supported = 0;
+			return;
+		}
+		/* KSP3 does not suppport UCAST wake-ups for any interface */
+		wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC;
+
+		if (adapter->wol & E1000_WUFC_EX)
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+		wol->wolopts = 0;
+		goto do_defaults;
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev,
 	default:
 		wol->supported = WAKE_UCAST | WAKE_MCAST |
 				 WAKE_BCAST | WAKE_MAGIC;
-
 		wol->wolopts = 0;
+
+do_defaults:
 		if (adapter->wol & E1000_WUFC_EX)
 			wol->wolopts |= WAKE_UCAST;
 		if (adapter->wol & E1000_WUFC_MC)
@@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev,
 	case E1000_DEV_ID_82543GC_COPPER:
 	case E1000_DEV_ID_82544EI_FIBER:
 	case E1000_DEV_ID_82546EB_QUAD_COPPER:
+	case E1000_DEV_ID_82546GB_QUAD_COPPER:
 	case E1000_DEV_ID_82545EM_FIBER:
 	case E1000_DEV_ID_82545EM_COPPER:
 		return wol->wolopts ? -EOPNOTSUPP : 0;
 
+	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
+		/* device id 10B5 port-A supports wol */
+		if (!adapter->ksp3_port_a)
+			return wol->wolopts ? -EOPNOTSUPP : 0;
+
+		if (wol->wolopts & WAKE_UCAST) {
+			DPRINTK(DRV, ERR, "Interface does not support "
+		        "directed (unicast) frame wake-up packets\n");
+			return -EOPNOTSUPP;
+		}
+
 	case E1000_DEV_ID_82546EB_FIBER:
 	case E1000_DEV_ID_82546GB_FIBER:
 	case E1000_DEV_ID_82571EB_FIBER:
@@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev,
 			adapter->wol |= E1000_WUFC_BC;
 		if (wol->wolopts & WAKE_MAGIC)
 			adapter->wol |= E1000_WUFC_MAG;
+
 	}
 
 	return 0;
@@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic
 		struct ethtool_stats *stats, uint64_t *data)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
-#ifdef CONFIG_E1000_MQ
-	uint64_t *queue_stat;
-	int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t);
-	int j, k;
-#endif
 	int i;
 
 	e1000_update_stats(adapter);
@@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic
 		data[i] = (e1000_gstrings_stats[i].sizeof_stat ==
 			sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
 	}
-#ifdef CONFIG_E1000_MQ
-	for (j = 0; j < adapter->num_tx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-	for (j = 0; j < adapter->num_rx_queues; j++) {
-		queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats;
-		for (k = 0; k < stat_count; k++)
-			data[i + k] = queue_stat[k];
-		i += k;
-	}
-#endif
 /*	BUG_ON(i != E1000_STATS_LEN); */
 }
 
 static void
 e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data)
 {
-#ifdef CONFIG_E1000_MQ
-	struct e1000_adapter *adapter = netdev_priv(netdev);
-#endif
 	uint8_t *p = data;
 	int i;
 
@@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net
 			       ETH_GSTRING_LEN);
 			p += ETH_GSTRING_LEN;
 		}
-#ifdef CONFIG_E1000_MQ
-		for (i = 0; i < adapter->num_tx_queues; i++) {
-			sprintf(p, "tx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "tx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-		for (i = 0; i < adapter->num_rx_queues; i++) {
-			sprintf(p, "rx_queue_%u_packets", i);
-			p += ETH_GSTRING_LEN;
-			sprintf(p, "rx_queue_%u_bytes", i);
-			p += ETH_GSTRING_LEN;
-		}
-#endif
 /*		BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */
 		break;
 	}
@@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_
 	.set_pauseparam		= e1000_set_pauseparam,
 	.get_rx_csum		= e1000_get_rx_csum,
 	.set_rx_csum		= e1000_set_rx_csum,
-	.get_tx_csum		= e1000_get_tx_csum,
+	.get_tx_csum            = e1000_get_tx_csum,
 	.set_tx_csum		= e1000_set_tx_csum,
 	.get_sg			= ethtool_op_get_sg,
 	.set_sg			= ethtool_op_set_sg,
@@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_
 	.phys_id                = e1000_phys_id,
 	.get_stats_count        = e1000_get_stats_count,
 	.get_ethtool_stats      = e1000_get_ethtool_stats,
-	.get_perm_addr		= ethtool_op_get_perm_addr,
+#ifdef ETHTOOL_GPERMADDR
+	.get_perm_addr  	= ethtool_op_get_perm_addr,
+#endif
 };
-
-void e1000_set_ethtool_ops(struct net_device *netdev)
+  
+void set_ethtool_ops(struct net_device *netdev)
 {
 	SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
 }

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-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;
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1958
retrieving revision 1.1958.2.1
diff -u -r1.1958 -r1.1958.2.1
--- kernel-2.6.spec	16 Feb 2006 20:37:26 -0000	1.1958
+++ kernel-2.6.spec	16 Feb 2006 21:08:49 -0000	1.1958.2.1
@@ -22,7 +22,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.11
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -160,7 +161,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -240,6 +242,7 @@
 Patch317: linux-2.6-ppc-iseries-input-layer.patch
 
 # 400 - 499   ia64
+
 # 500 - 599   s390(x)
 # 600 - 699   sparc(64)
 
@@ -332,6 +335,9 @@
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
 Patch1303: linux-2.6-ipw2200-hwcrypto.patch
+Patch1304: jwltest-sk98lin-neuter.patch
+Patch1305: jwltest-e1000-7_0_33-k2.patch
+Patch1306: jwltest-tg3-3_50.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -876,6 +882,12 @@
 %patch1302 -p1
 # ipw2200 hwcrypto=0 by default to avoid firmware restarts
 %patch1303 -p1
+# neuter sk98lin (as far as userland is concerned)
+%patch1304 -p1
+# update e1000 to 7.0.33-k2(-pre)
+%patch1305 -p1
+# update tg3 to 3.50
+%patch1306 -p1
 
 # Squashfs
 %patch1400 -p1



From fedora-cvs-commits at redhat.com  Thu Feb 16 21:16:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 16:16:37 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.353, 1.354 kernel-2.6.spec, 1.1958,
	1.1959 sources, 1.295, 1.296 upstream, 1.270,
	1.271 patch-2.6.16-rc3-git5.bz2.sign, 1.1, NONE
Message-ID: <200602162116.k1GLGbeN011218@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9056

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc3-git7.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git5.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.16-rc3-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD9MwryGugalF9Dw4RApCDAJ9yVN6jlQR4YJlUryzAsY8WI9IZTgCfZZX1
mrx3Dn9gaCh0a5nysNkSdg0=
=nc/a
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- .cvsignore	16 Feb 2006 05:17:03 -0000	1.353
+++ .cvsignore	16 Feb 2006 21:16:34 -0000	1.354
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git5.bz2
+patch-2.6.16-rc3-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -r1.1958 -r1.1959
--- kernel-2.6.spec	16 Feb 2006 20:37:26 -0000	1.1958
+++ kernel-2.6.spec	16 Feb 2006 21:16:34 -0000	1.1959
@@ -216,7 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git5.bz2
+Patch2: patch-2.6.16-rc3-git7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1577,7 +1577,7 @@
 - stop adding duplicate MODULE_VERSION line to tg3
 
 * Thu Feb 16 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc3-git5
+- 2.6.16rc3-git5, git6 & git7
 - Enable exec* checking on all architectures. (#178747)
 
 * Wed Feb 15 2006 Stephen Tweedie <sct at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- sources	16 Feb 2006 05:17:04 -0000	1.295
+++ sources	16 Feb 2006 21:16:35 -0000	1.296
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-a9e09e0acc82821e84c189cf64dd065c  patch-2.6.16-rc3-git5.bz2
+7c12dc48a57665767f16c02cdc1022fa  patch-2.6.16-rc3-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- upstream	16 Feb 2006 05:17:04 -0000	1.270
+++ upstream	16 Feb 2006 21:16:35 -0000	1.271
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git5.bz2
+patch-2.6.16-rc3-git7.bz2


--- patch-2.6.16-rc3-git5.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 16 22:37:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 17:37:47 -0500
Subject: rpms/kernel/devel linux-2.6-ide-tune-locking.patch,1.1,1.2
Message-ID: <200602162237.k1GMblV3012257@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7681

Modified Files:
	linux-2.6-ide-tune-locking.patch 
Log Message:
add comment


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/devel/linux-2.6-ide-tune-locking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ide-tune-locking.patch	12 Jul 2005 21:23:33 -0000	1.1
+++ linux-2.6-ide-tune-locking.patch	16 Feb 2006 22:37:45 -0000	1.2
@@ -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 @@



From fedora-cvs-commits at redhat.com  Thu Feb 16 23:12:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 18:12:02 -0500
Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.9, 1.10 sources, 1.8,
	1.9 xorg-x11-proto-devel.spec, 1.18, 1.19
Message-ID: <200602162312.k1GNC2w1027080@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27016

Modified Files:
	.cvsignore sources xorg-x11-proto-devel.spec 
Log Message:
* Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 7.0-3
- Update to glproto-1.4.4
- Drop glproto-texture-from-drawable patch, which is integrated now.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Dec 2005 04:54:48 -0000	1.9
+++ .cvsignore	16 Feb 2006 23:11:58 -0000	1.10
@@ -28,3 +28,4 @@
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.4.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
+glproto-1.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Dec 2005 04:54:48 -0000	1.8
+++ sources	16 Feb 2006 23:11:58 -0000	1.9
@@ -6,7 +6,7 @@
 cc8916ab773525e9d16061edbd1c2472  fixesproto-3.0.2.tar.bz2
 60df6b625074a9790e28543dcea71651  fontcacheproto-0.1.2.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
-5512bec5613ae5e00995eba5075a2115  glproto-1.4.3.tar.bz2
+151a7df5535157bcdd92e47dbddd13aa  glproto-1.4.4.tar.bz2
 e0b7df0fc69f0712aa7f2161faa94e1d  inputproto-1.3.2.tar.bz2
 3ae193c317a3621966c3c53d83a254f4  kbproto-1.0.2.tar.bz2
 0f4e7982c6d4ec3b2cf38502dd1293a3  printproto-1.0.3.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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-proto-devel.spec	11 Feb 2006 06:57:13 -0000	1.18
+++ xorg-x11-proto-devel.spec	16 Feb 2006 23:11:59 -0000	1.19
@@ -6,11 +6,11 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 2.3
+Release: 3
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-%define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything
+%define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0/src/everything
 Source0:  %{sourceurl}/bigreqsproto-1.0.2.tar.bz2
 Source1:  %{sourceurl}/compositeproto-0.2.2.tar.bz2
 Source2:  %{sourceurl}/damageproto-1.0.3.tar.bz2
@@ -19,7 +19,7 @@
 Source5:  %{sourceurl}/fixesproto-3.0.2.tar.bz2
 Source6:  %{sourceurl}/fontcacheproto-0.1.2.tar.bz2
 Source7:  %{sourceurl}/fontsproto-2.0.2.tar.bz2
-Source8:  %{sourceurl}/glproto-1.4.3.tar.bz2
+Source8:  %{sourceurl}/glproto-1.4.4.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
@@ -44,8 +44,6 @@
 Source29: %{sourceurl}/xproto-7.0.4.tar.bz2
 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
 
-Patch1: glproto-texture-from-drawable.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -69,11 +67,6 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
-# Sigh... /me wants %patch to understand -d
-# pushd glproto-1.4.3
-# %patch1 -p0 -b .glproto-texture-from-drawable
-# popd
-
 %build
 #ls -al
 
@@ -245,7 +238,6 @@
 %{_includedir}/X11/fonts/fsmasks.h
 %{_includedir}/X11/keysym.h
 %{_includedir}/X11/keysymdef.h
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/bigreqsproto.pc
 %{_libdir}/pkgconfig/compositeproto.pc
 %{_libdir}/pkgconfig/damageproto.pc
@@ -278,10 +270,14 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.3
+* Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 7.0-3
+- Update to glproto-1.4.4
+- Drop glproto-texture-from-drawable patch, which is integrated now.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 7.0-2.3
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 7.0-2.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 7.0-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Fri Jan 27 2006 Kristian H??gsberg <krh at redhat.com> 7.0-2



From fedora-cvs-commits at redhat.com  Fri Feb 17 01:25:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 16 Feb 2006 20:25:04 -0500
Subject: rpms/metacity/devel libcm-0.0.16.0.2006.02.16-include-glxext.patch,
	NONE, 1.1 metacity-2.13.89.0.2006.02.16-fix-type.patch, NONE,
	1.1 metacity-2.13.89.0.2006.02.16-static-cm.patch, NONE,
	1.1 .cvsignore, 1.31, 1.32 metacity.spec, 1.53, 1.54 sources,
	1.31, 1.32 metacity-2.11.2-truncate-long-window-titles.patch,
	1.1, NONE
Message-ID: <200602170125.k1H1P4LX000789@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv691

Modified Files:
	.cvsignore metacity.spec sources 
Added Files:
	libcm-0.0.16.0.2006.02.16-include-glxext.patch 
	metacity-2.13.89.0.2006.02.16-fix-type.patch 
	metacity-2.13.89.0.2006.02.16-static-cm.patch 
Removed Files:
	metacity-2.11.2-truncate-long-window-titles.patch 
Log Message:
- Update to cvs snapshot to add the ability to 
  runtime enable compositor
- change %%makeinstall to make install DESTDIR=..


libcm-0.0.16.0.2006.02.16-include-glxext.patch:
 wsint.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE libcm-0.0.16.0.2006.02.16-include-glxext.patch ---
--- libcm-0.0.16.0.2006.02.16/src/wsint.h.include-glxext	2006-02-16 20:01:36.000000000 -0500
+++ libcm-0.0.16.0.2006.02.16/src/wsint.h	2006-02-16 20:02:34.000000000 -0500
@@ -3,6 +3,7 @@
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
 #include <GL/glx.h>
+#include <GL/glxext.h>
 
 #include "ws.h"
 

metacity-2.13.89.0.2006.02.16-fix-type.patch:
 metacity.schemas.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE metacity-2.13.89.0.2006.02.16-fix-type.patch ---
--- metacity-2.13.89.0.2006.02.16/src/metacity.schemas.in.fix-type	2006-02-16 19:51:13.000000000 -0500
+++ metacity-2.13.89.0.2006.02.16/src/metacity.schemas.in	2006-02-16 19:51:22.000000000 -0500
@@ -272,7 +272,7 @@
       <key>/schemas/apps/metacity/general/compositing_manager</key>
       <applyto>/apps/metacity/general/compositing_manager</applyto>
       <owner>metacity</owner>
-      <type>boolean</type>
+      <type>bool</type>
       <default>FALSE</default>
       <locale name="C">
          <short>Compositing Manager</short>

metacity-2.13.89.0.2006.02.16-static-cm.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE metacity-2.13.89.0.2006.02.16-static-cm.patch ---
--- metacity-2.13.89.0.2006.02.16/configure.in.static-cm	2006-02-07 02:11:17.000000000 -0500
+++ metacity-2.13.89.0.2006.02.16/configure.in	2006-02-07 02:11:52.000000000 -0500
@@ -222,7 +222,7 @@
 
 if test x$have_xcomposite = xyes; then
   echo "Building with CompositeExt"
-  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage cm"
+  METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
   AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
 
   ## force on render also


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Feb 2006 20:09:57 -0000	1.31
+++ .cvsignore	17 Feb 2006 01:25:02 -0000	1.32
@@ -1,4 +1,2 @@
-metacity-2.13.21.tar.bz2
-metacity-2.13.34.tar.bz2
-metacity-2.13.55.tar.bz2
-metacity-2.13.89.tar.bz2
+metacity-2.13.89.0.2006.02.16.tar.bz2
+libcm-0.0.16.0.2006.02.16.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- metacity.spec	13 Feb 2006 20:09:57 -0000	1.53
+++ metacity.spec	17 Feb 2006 01:25:02 -0000	1.54
@@ -1,11 +1,16 @@
 %define gettext_package metacity
 
+%define snapshot_date 2006.02.16
+%define libcm_version 0.0.16
+%define metacity_version 2.13.89
+
 Summary: Metacity window manager
 Name: metacity
-Version: 2.13.89
+Version: %{metacity_version}.0.%{snapshot_date}
 Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: %{name}-%{version}.tar.bz2
+Source0: metacity-%{metacity_version}.0.%{snapshot_date}.tar.bz2
+Source1: libcm-%{libcm_version}.0.%{snapshot_date}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -18,11 +23,19 @@
 BuildRequires: intltool >= 0.22
 BuildRequires: startup-notification-devel >= 0.7
 BuildRequires: libtool automake14 autoconf
-Requires: startup-notification >= 0.7
+BuildRequires: xorg-x11-proto-devel >= 7.0-3
+BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
+BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
+BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, 
+BuildRequires: libXcomposite-devel
 
+Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62
 
 Patch0: metacity-2.4.13.90-ctrlaltdel.patch
+Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch
+Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
+Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
 
 %description
 
@@ -30,30 +43,41 @@
 GNOME 2.
 
 %prep
-%setup -q
+%setup -q -n metacity-%{metacity_version}.0.%{snapshot_date}
+%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{snapshot_date}
 
 %patch0 -p1 -b .ctrlaltdel
+%patch1 -p1 -b .static-cm
+%patch2 -p1 -b .fix-type
+
+pushd libcm-%{libcm_version}.0.%{snapshot_date}
+%patch3 -p1 -b .include-glxext
+popd
 
 %build
+pushd libcm-%{libcm_version}.0.%{snapshot_date}
+%configure
+make
+make install DESTDIR=$RPM_BUILD_ROOT 
+popd
 
-#libtoolize --copy --force
-#aclocal-1.4
-#automake-1.4
-#autoconf
+LIBS="$LIBS -lGL -lGLU"
+LIBS="$LIBS -lICE -lSM"
+LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
+LIBS="$LIBS -lXrender -lXcursor"
+LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
+LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{snapshot_date}/src/.libs/libcm.a"
+export LIBS
 
-export LIBS="-lXext -lX11"
-%configure
+CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
+export CPPFLAGS
 
-## intltool munges metacity.schemas in UTF-8 locale
-## http://bugzilla.gnome.org/show_bug.cgi?id=91289
-## force regeneration with intltool in non-UTF-8 locale
-#rm -f src/metacity.schemas
-#rm -f po/.intltool-merge-cache
-#LANG=en_US.ISO-8859-1 make ## %{?_smp_mflags}
+autoconf
+%configure --enable-compositor
 
 make
 
-SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
+SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSIONS"
 
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
@@ -70,7 +94,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -106,6 +130,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Feb 16 2006 Ray Strode <rstrode at redhat.com> - 2.13.89.0.2006.02.16-1
+- Update to cvs snapshot to add the ability to 
+  runtime enable compositor
+- change %%makeinstall to make install DESTDIR=..
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.89-1
 - Update to 2.13.89
 
@@ -121,7 +150,7 @@
 * Thu Jan 26 2006 Matthias Clasen <mclasen at redhat.com> 2.13.34-1
 - Update to 2.13.34
 
-* Mon Jan 16 2006 Ray Strode at redhat.com> 2.13.21-1
+* Mon Jan 16 2006 Ray Strode <rstrode at redhat.com> 2.13.21-1
 - Update to 2.13.21
 
 * Fri Jan 13 2006 Matthias Clasen <mclasen at redhat.com> 2.13.13-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Feb 2006 20:09:57 -0000	1.31
+++ sources	17 Feb 2006 01:25:02 -0000	1.32
@@ -1 +1,2 @@
-836cf722209c59babff98075498193b9  metacity-2.13.89.tar.bz2
+6e8e728e55756dd689c2cb26a16fa764  metacity-2.13.89.0.2006.02.16.tar.bz2
+72896fe1209ee3c85944ef52c373eb14  libcm-0.0.16.0.2006.02.16.tar.bz2


--- metacity-2.11.2-truncate-long-window-titles.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 07:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 02:42:53 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.354, 1.355 kernel-2.6.spec, 1.1959,
	1.1960 linux-2.6-random-patches.patch, 1.2, 1.3 sources, 1.296,
	1.297 upstream, 1.271, 1.272 patch-2.6.16-rc3-git7.bz2.sign,
	1.1, NONE
Message-ID: <200602170742.k1H7grVV009148@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9130

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-random-patches.patch 
	sources upstream 
Added Files:
	patch-2.6.16-rc3-git8.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git7.bz2.sign 
Log Message:
git8



--- NEW FILE patch-2.6.16-rc3-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD9XTsyGugalF9Dw4RAgMbAJ4zG5fJcSCo+o4veXbwtRVBGXme3wCbB7Or
oSG865z6vf8UIMbRYJDx9e8=
=8Mt4
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- .cvsignore	16 Feb 2006 21:16:34 -0000	1.354
+++ .cvsignore	17 Feb 2006 07:42:44 -0000	1.355
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git7.bz2
+patch-2.6.16-rc3-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1959
retrieving revision 1.1960
diff -u -r1.1959 -r1.1960
--- kernel-2.6.spec	16 Feb 2006 21:16:34 -0000	1.1959
+++ kernel-2.6.spec	17 Feb 2006 07:42:45 -0000	1.1960
@@ -216,7 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git7.bz2
+Patch2: patch-2.6.16-rc3-git8.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1573,6 +1573,9 @@
 %endif
 
 %changelog
+* Fri Feb 17 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc3-git8
+
 * Thu Feb 16 2006 John W. Linville <linville at redhat.com>
 - stop adding duplicate MODULE_VERSION line to tg3
 

linux-2.6-random-patches.patch:
 linux-2.6.15.noarch/drivers/char/dtlk.c                    |    2 +-
 linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c        |    3 +--
 linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c      |    2 +-
 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.15.noarch/drivers/media/video/cpia.c             |    2 +-
 linux-2.6.15/kernel/power/snapshot.c                       |    3 ++-
 9 files changed, 10 insertions(+), 13 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-random-patches.patch	2 Feb 2006 21:20:36 -0000	1.2
+++ linux-2.6-random-patches.patch	17 Feb 2006 07:42:45 -0000	1.3
@@ -118,29 +118,6 @@
  
  	spin_lock_init(&sc1200wdt_lock);
  	sema_init(&open_sem, 1);
-megaraid.ko and megaraid_mbox.ko both have the same pci_driver kobject
-name, which means this happens..
-
-kobject_register failed for megaraid (-17)
- [<c01d3eee>] kobject_register+0x31/0x47     [<c023a732>] bus_add_driver+0x4a/0xfd
- [<c01de36d>] __pci_register_driver+0x82/0xa4     [<d0c77069>] megaraid_init+0x69/0xa9 [megaraid]
- [<c013bdea>] sys_init_module+0x167b/0x1822     [<c0163427>] do_sync_read+0xb8/0xf3
- [<c0133fbf>] autoremove_wake_function+0x0/0x2d     [<c01453cc>] audit_syscall_entry+0x118/0x13f
- [<c0106ada>] do_syscall_trace+0x104/0x14a     [<c0103d21>] syscall_call+0x7/0xb
-
-Signed-off-by: Dave Jones <davej at redhat.com>
-
---- linux-2.6.15.noarch/drivers/scsi/megaraid.c~	2006-02-01 22:13:23.000000000 -0500
-+++ linux-2.6.15.noarch/drivers/scsi/megaraid.c	2006-02-01 22:13:30.000000000 -0500
-@@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci
- MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
- 
- static struct pci_driver megaraid_pci_driver = {
--	.name		= "megaraid",
-+	.name		= "megaraid_legacy",
- 	.id_table	= megaraid_pci_tbl,
- 	.probe		= megaraid_probe_one,
- 	.remove		= __devexit_p(megaraid_remove_one),
 
 Before:
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- sources	16 Feb 2006 21:16:35 -0000	1.296
+++ sources	17 Feb 2006 07:42:45 -0000	1.297
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-7c12dc48a57665767f16c02cdc1022fa  patch-2.6.16-rc3-git7.bz2
+ddea3173167a1a8334456254cc59f32e  patch-2.6.16-rc3-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- upstream	16 Feb 2006 21:16:35 -0000	1.271
+++ upstream	17 Feb 2006 07:42:45 -0000	1.272
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git7.bz2
+patch-2.6.16-rc3-git8.bz2


--- patch-2.6.16-rc3-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 10:38:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 05:38:18 -0500
Subject: rpms/tar/FC-4 tar-1.15.1-heapOverflow.patch, NONE, 1.1 tar.spec,
	1.26, 1.27
Message-ID: <200602171038.k1HAcIju022648@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22633

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.1-heapOverflow.patch 
Log Message:
fix heap overlfow bug CVE-2006-0300 (#181773)


tar-1.15.1-heapOverflow.patch:
 xheader.c |   58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 14 deletions(-)

--- NEW FILE tar-1.15.1-heapOverflow.patch ---
--- src/xheader.c.orig	2004-09-06 06:31:14.000000000 -0500
+++ src/xheader.c	2006-02-08 16:59:46.000000000 -0500
@@ -783,6 +783,32 @@ code_num (uintmax_t value, char const *k
   xheader_print (xhdr, keyword, sbuf);
 }
 
+static bool
+decode_num (uintmax_t *num, char const *arg, uintmax_t maxval,
+        char const *keyword)
+{
+  uintmax_t u;
+  char *arg_lim;
+
+  if (! (ISDIGIT (*arg)
+     && (errno = 0, u = strtoumax (arg, &arg_lim, 10), !*arg_lim)))
+    {
+      ERROR ((0, 0, _("Malformed extended header: invalid %s=%s"),
+          keyword, arg));
+      return false;
+    }
+
+  if (! (u <= maxval && errno != ERANGE))
+    {
+      ERROR ((0, 0, _("Extended header %s=%s is out of range"),
+        keyword, arg));
+      return false;
+    }
+
+  *num = u;
+  return true;
+}
+
 static void
 dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)),
 	     char const *keyword __attribute__ ((unused)),
@@ -821,7 +847,7 @@ static void
 gid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (gid_t), "gid"))
     st->stat.st_gid = u;
 }
 
@@ -903,7 +929,7 @@ static void
 size_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "size"))
     st->archive_file_size = st->stat.st_size = u;
 }
 
@@ -918,7 +944,7 @@ static void
 uid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (uid_t), "uid"))
     st->stat.st_uid = u;
 }
 
@@ -946,7 +972,7 @@ static void
 sparse_size_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.size"))
     st->stat.st_size = u;
 }
 
@@ -962,10 +988,10 @@ static void
 sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numblocks"))
     {
       st->sparse_map_size = u;
-      st->sparse_map = calloc(st->sparse_map_size, sizeof(st->sparse_map[0]));
+      st->sparse_map = xcalloc (u, sizeof st->sparse_map[0]);
       st->sparse_map_avail = 0;
     }
 }
@@ -982,8 +1008,14 @@ static void
 sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.offset"))
+    {
+      if (st->sparse_map_avail < st->sparse_map_size)
     st->sparse_map[st->sparse_map_avail].offset = u;
+      else
+    ERROR ((0, 0, _("Malformed extended header: excess %s=%s"),
+        "GNU.sparse.offset", arg));
+    }
 }
 
 static void
@@ -998,15 +1030,13 @@ static void
 sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numbytes"))
     {
       if (st->sparse_map_avail == st->sparse_map_size)
-	{
-	  st->sparse_map_size *= 2;
-	  st->sparse_map = xrealloc (st->sparse_map,
-				     st->sparse_map_size
-				     * sizeof st->sparse_map[0]);
-	}
+        st->sparse_map = x2nrealloc (st->sparse_map,
+                                    &st->sparse_map_size,
+                                    sizeof st->sparse_map[0]);
+
       st->sparse_map[st->sparse_map_avail++].numbytes = u;
     }
 }


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/FC-4/tar.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tar.spec	4 Nov 2005 09:44:44 -0000	1.26
+++ tar.spec	17 Feb 2006 10:38:16 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 11.FC4
+Release: 12.FC4
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -16,6 +16,7 @@
 Patch12: tar-1.15.1-sparseTotals.patch
 Patch13: tar-1.15.1-newerOption.patch
 Patch14: tar-1.15.1-padCorrectly.patch
+Patch15: tar-1.15.1-heapOverflow.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -43,6 +44,7 @@
 %patch12 -p1 -b .sparseTotals
 %patch13 -p1 -b .newerOption
 %patch14 -p1 -b .padCorrectly
+%patch15 -p0 -b .heapOverflow
 
 %build
 
@@ -113,6 +115,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Feb 17 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-12.FC4
+- fix heap overlfow bug CVE-2006-0300 (#181773)
+
 * Fri Nov 04 2005 Peter Vrabec <pvrabec at redhat.com> 1.15.1-11.FC4
 - correctly pad archive members that shrunk during archiving (#172373)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 10:52:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 05:52:25 -0500
Subject: rpms/tar/devel tar-1.15.1-heapOverflow.patch, NONE, 1.1 tar.spec,
	1.31, 1.32
Message-ID: <200602171052.k1HAqP8v002876@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/tar/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2860

Modified Files:
	tar.spec 
Added Files:
	tar-1.15.1-heapOverflow.patch 
Log Message:
fix heap overlfow bug CVE-2006-0300 (#181773)


tar-1.15.1-heapOverflow.patch:
 xheader.c |   58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 44 insertions(+), 14 deletions(-)

--- NEW FILE tar-1.15.1-heapOverflow.patch ---
--- src/xheader.c.orig	2004-09-06 06:31:14.000000000 -0500
+++ src/xheader.c	2006-02-08 16:59:46.000000000 -0500
@@ -783,6 +783,32 @@ code_num (uintmax_t value, char const *k
   xheader_print (xhdr, keyword, sbuf);
 }
 
+static bool
+decode_num (uintmax_t *num, char const *arg, uintmax_t maxval,
+        char const *keyword)
+{
+  uintmax_t u;
+  char *arg_lim;
+
+  if (! (ISDIGIT (*arg)
+     && (errno = 0, u = strtoumax (arg, &arg_lim, 10), !*arg_lim)))
+    {
+      ERROR ((0, 0, _("Malformed extended header: invalid %s=%s"),
+          keyword, arg));
+      return false;
+    }
+
+  if (! (u <= maxval && errno != ERANGE))
+    {
+      ERROR ((0, 0, _("Extended header %s=%s is out of range"),
+        keyword, arg));
+      return false;
+    }
+
+  *num = u;
+  return true;
+}
+
 static void
 dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)),
 	     char const *keyword __attribute__ ((unused)),
@@ -821,7 +847,7 @@ static void
 gid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (gid_t), "gid"))
     st->stat.st_gid = u;
 }
 
@@ -903,7 +929,7 @@ static void
 size_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "size"))
     st->archive_file_size = st->stat.st_size = u;
 }
 
@@ -918,7 +944,7 @@ static void
 uid_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (uid_t), "uid"))
     st->stat.st_uid = u;
 }
 
@@ -946,7 +972,7 @@ static void
 sparse_size_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.size"))
     st->stat.st_size = u;
 }
 
@@ -962,10 +988,10 @@ static void
 sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numblocks"))
     {
       st->sparse_map_size = u;
-      st->sparse_map = calloc(st->sparse_map_size, sizeof(st->sparse_map[0]));
+      st->sparse_map = xcalloc (u, sizeof st->sparse_map[0]);
       st->sparse_map_avail = 0;
     }
 }
@@ -982,8 +1008,14 @@ static void
 sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, TYPE_MAXIMUM (off_t), "GNU.sparse.offset"))
+    {
+      if (st->sparse_map_avail < st->sparse_map_size)
     st->sparse_map[st->sparse_map_avail].offset = u;
+      else
+    ERROR ((0, 0, _("Malformed extended header: excess %s=%s"),
+        "GNU.sparse.offset", arg));
+    }
 }
 
 static void
@@ -998,15 +1030,13 @@ static void
 sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
 {
   uintmax_t u;
-  if (xstrtoumax (arg, NULL, 10, &u, "") == LONGINT_OK)
+  if (decode_num (&u, arg, SIZE_MAX, "GNU.sparse.numbytes"))
     {
       if (st->sparse_map_avail == st->sparse_map_size)
-	{
-	  st->sparse_map_size *= 2;
-	  st->sparse_map = xrealloc (st->sparse_map,
-				     st->sparse_map_size
-				     * sizeof st->sparse_map[0]);
-	}
+        st->sparse_map = x2nrealloc (st->sparse_map,
+                                    &st->sparse_map_size,
+                                    sizeof st->sparse_map[0]);
+
       st->sparse_map[st->sparse_map_avail++].numbytes = u;
     }
 }


Index: tar.spec
===================================================================
RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tar.spec	11 Feb 2006 05:47:33 -0000	1.31
+++ tar.spec	17 Feb 2006 10:52:23 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A GNU file archiving program.
 Name: tar
 Version: 1.15.1
-Release: 12.2
+Release: 13
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -17,6 +17,7 @@
 Patch13: tar-1.15.1-newerOption.patch
 Patch14: tar-1.15.1-padCorrectly.patch
 Patch15: tar-1.15.1-vfatTruncate.patch
+Patch16: tar-1.15.1-heapOverflow.patch
 
 Prereq: info
 BuildRequires: autoconf automake gzip
@@ -45,6 +46,7 @@
 %patch13 -p1 -b .newerOption
 %patch14 -p1 -b .padCorrectly
 %patch15 -p1 -b .vfatTruncate
+%patch16 -p0 -b .heapOverflow
 
 %build
 
@@ -115,6 +117,9 @@
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Feb 17 2006 Peter Vrabec <pvrabec at redhat.com> 1.15.1-13
+- fix heap overlfow bug CVE-2006-0300 (#181773)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.15.1-12.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 11:01:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 06:01:20 -0500
Subject: rpms/agg/devel agg.spec,1.9,1.10
Message-ID: <200602171101.k1HB1KHG013337@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13227

Modified Files:
	agg.spec 
Log Message:
- add BuildRequires freetype-devel for ft2build.h


Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- agg.spec	13 Feb 2006 12:31:58 -0000	1.9
+++ agg.spec	17 Feb 2006 11:00:51 -0000	1.10
@@ -1,13 +1,13 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.3
-Release: 3
+Release: 4
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: MIT
 Source:  http://www.antigrain.com/%{name}23.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: automake, libtool, libX11-devel
+BuildRequires: automake, libtool, libX11-devel, freetype-devel
 Patch1: agg23-optional-gpc.patch
 
 %description
@@ -56,6 +56,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 2.3-4
+- add BuildRequires freetype-devel for ft2build.h
+
 * Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 2.3-3
 - BuildRequires
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 11:51:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 06:51:02 -0500
Subject: rpms/kdebase/FC-4 kdebase-3.5.1-kdm-readme.patch, NONE,
	1.1 kdebase-3.5.1-kwin-systray.patch, NONE,
	1.1 kdebase-3.5.1-pam.patch, NONE,
	1.1 kdebase-3.5.1-startkde.patch, NONE,
	1.1 kdebase-3.x-shortcuts.patch, NONE, 1.1 logrotate-kdm, NONE,
	1.1 .cvsignore, 1.39, 1.40 kdebase.spec, 1.117, 1.118 sources,
	1.59, 1.60 kdebase-3.0-shortcuts.patch, 1.1,
	NONE kdebase-3.0.4-kdesukonsole.patch, 1.1,
	NONE kdebase-3.4.1-pam.patch, 1.1,
	NONE kdebase-3.5.1-redhat.patch, 1.1, NONE
Message-ID: <200602171151.k1HBp2LY024055@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23825

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.5.1-kdm-readme.patch 
	kdebase-3.5.1-kwin-systray.patch kdebase-3.5.1-pam.patch 
	kdebase-3.5.1-startkde.patch kdebase-3.x-shortcuts.patch 
	logrotate-kdm 
Removed Files:
	kdebase-3.0-shortcuts.patch kdebase-3.0.4-kdesukonsole.patch 
	kdebase-3.4.1-pam.patch kdebase-3.5.1-redhat.patch 
Log Message:
- Systray icons not docked sometimes, apply patch to fix this issue #180314
- kscreensaver/kdm/kcheckpass use a separate PAM config file
- clean up kdm config file #166388
- apply patch to launch kde scripts in shutdown,env directories #178326
- kdm.log logrotate-enabled #178328
- add konqueror webshortcuts for fedora project #178366


kdebase-3.5.1-kdm-readme.patch:
 Makefile.am            |    3 ---
 kfrontend/genkdmconf.c |    4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE kdebase-3.5.1-kdm-readme.patch ---
--- kdebase-3.5.1/kdm/kfrontend/genkdmconf.c.tn	2006-02-15 22:57:04.000000000 +0100
+++ kdebase-3.5.1/kdm/kfrontend/genkdmconf.c	2006-02-15 23:05:31.000000000 +0100
@@ -2845,7 +2845,7 @@
 	f = Create( newkdmrc, kdmrcmode );
 	wrconf( f );
 	fclose( f );
-
+#if 0
 	ASPrintf( &nname, "%s/README", newdir );
 	f = Create( nname, 0644 );
 	fprintf( f,
@@ -2894,6 +2894,6 @@
 "\nTry 'genkdmconf --help' if you want to generate another configuration.\n"
 "\nYou may delete this README.\n" );
 	fclose( f );
-
+#endif
 	return 0;
 }
--- kdebase-3.5.1/kdm/Makefile.am.tn	2006-02-15 22:56:02.000000000 +0100
+++ kdebase-3.5.1/kdm/Makefile.am	2006-02-15 22:55:56.000000000 +0100
@@ -4,9 +4,6 @@
 
 noinst_DATA=config.ci
 
-kdmdocdir = $(datadir)/doc/kdm
-kdmdoc_DATA = README
-
 install-data-local:
 	- at test -n "$(DESTDIR)" || test -z "$(PAM)" || { $(top_srcdir)/mkpamserv $(PAM) && $(top_srcdir)/mkpamserv -P $(PAM)-np; }
 

kdebase-3.5.1-kwin-systray.patch:
 events.cpp |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE kdebase-3.5.1-kwin-systray.patch ---
--- kdebase-3.5.1/kwin/events.cpp.tn	2006-02-16 12:29:09.000000000 +0100
+++ kdebase-3.5.1/kwin/events.cpp	2006-02-16 12:30:26.000000000 +0100
@@ -323,17 +323,7 @@
             return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt
             }
         case MapNotify:
-            {
-#if KDE_IS_VERSION( 3, 9, 90 )
-#warning Consider dumping this workaround.
-#endif
-            // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
-            // necessary when X.org with that fix becomes available and it's an unnecessary
-            // X roundtrip for an experimental unstable feature.
-            if( addSystemTrayWin( e->xmap.window ))
-                return true;
             return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
-            }
         case ReparentNotify:
             {
         //do not confuse Qt with these events. After all, _we_ are the

kdebase-3.5.1-pam.patch:
 kde.pamd |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE kdebase-3.5.1-pam.patch ---
diff -Nur kdebase-3.5.1.orig/kde.pamd kdebase-3.5.1/kde.pamd
--- kdebase-3.5.1.orig/kde.pamd	2005-09-10 10:26:16.000000000 +0200
+++ kdebase-3.5.1/kde.pamd	2006-02-17 12:16:40.000000000 +0100
@@ -1,7 +1,10 @@
 #%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       required	pam_stack.so service=system-auth
+auth       required	pam_nologin.so
+auth       sufficient	pam_timestamp.so
+account    required	pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
+session    required	pam_stack.so service=system-auth
+session    required  pam_loginuid.so
+session    optional	pam_timestamp.so
+session    optional	pam_console.so

kdebase-3.5.1-startkde.patch:
 startkde |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-3.5.1-startkde.patch ---
diff -Nur kdebase-3.5.1.orig/startkde kdebase-3.5.1/startkde
--- kdebase-3.5.1.orig/startkde	2006-01-19 18:03:19.000000000 +0100
+++ kdebase-3.5.1/startkde	2006-02-17 12:35:01.000000000 +0100
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.1 )
+#  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=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`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

kdebase-3.x-shortcuts.patch:
 Makefile.am      |    2 ++
 bugzilla.desktop |    6 ++++++
 fedora.desktop   |    8 ++++++++
 3 files changed, 16 insertions(+)

--- NEW FILE kdebase-3.x-shortcuts.patch ---
--- /dev/null	2006-02-15 14:04:20.595741250 +0100
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugzilla.desktop	2006-02-01 15:04:12.000000000 +0100
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Service
+Name=Red Hat bug tracking system
+ServiceTypes=SearchProvider
+Keys=rhbug,bz
+Query=http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=\\1
--- kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/fedora.desktop.shortcuts	2006-02-15 19:44:30.000000000 +0100
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/fedora.desktop	2006-02-15 19:44:16.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Hidden=false
+Keys=fp,fedora
+Name=fedoraproject
+Query=http://fedoraproject.org/wiki/?action=fullsearch&context=180&value=\\{@}&titlesearch=Titles
+ServiceTypes=SearchProvider
+Type=Service
+
--- kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.am.shortcuts	2005-10-10 17:03:45.000000000 +0200
+++ kdebase-3.5.1/kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.am	2006-02-15 19:41:59.000000000 +0100
@@ -11,6 +11,7 @@
 		backports.desktop \
 		bugft.desktop \
 		bugno.desktop \
+		bugzilla.desktop \
 		call.desktop \
 		cia.desktop \
 		citeseer.desktop \
@@ -32,6 +33,7 @@
 		excite.desktop \
 		feedster.desktop \
 		foldoc.desktop \
+		fedora.desktop \
 		fr2de.desktop \
 		fr2en.desktop \
 		freedb.desktop \


--- NEW FILE logrotate-kdm ---
/var/log/kdm.log {
    weekly
    notifempty
    missingok
}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	27 Jan 2006 23:34:12 -0000	1.39
+++ .cvsignore	17 Feb 2006 11:50:59 -0000	1.40
@@ -14,3 +14,4 @@
 kdebase-3.4.1.tar.bz2
 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


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdebase.spec	15 Feb 2006 13:13:34 -0000	1.117
+++ kdebase.spec	17 Feb 2006 11:50:59 -0000	1.118
@@ -21,7 +21,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.1
-Release: 0.2.fc4
+Release: 0.3.fc4
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -32,24 +32,26 @@
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
+Source4: kde-redhat-config-3.5-fc5-0.2.tar.bz2
 Source5: kde-np
+Source6: logrotate-kdm
 Source7: mailsettings.cc
 
-Patch0: kdebase-3.5.1-redhat.patch
-Patch3: kdebase-3.3.92-vroot.patch
-Patch4: kdebase-3.0-shortcuts.patch
-Patch40: kdebase-3.2.0-keymap.patch
-Patch48: kdebase-3.0.4-kdesukonsole.patch
-Patch56: kde-libtool.patch
-Patch57: kdebase-3.1-startpage.patch
-Patch71: kdebase-3.1.3-konsole-double-esc.patch
-Patch74: kdebase-3.3.92-kpersonalizer.patch
-Patch80: kdebase-3.2.92-logo.patch 
-Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
-Patch91: kdebase-3.4.2-kdesktop-konsole.patch
-Patch92: kdebase-3.4.0-xdg.patch
-Patch93: kdebase-3.4.1-pam.patch
+Patch0: kde-libtool.patch
+Patch1: kdebase-3.5.1-startkde.patch
+Patch2: kdebase-3.3.92-vroot.patch
+Patch3: kdebase-3.x-shortcuts.patch
+Patch4: kdebase-3.2.0-keymap.patch
+Patch5: kdebase-3.1-startpage.patch
+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.4.0-xdg.patch
+Patch12: kdebase-3.5.1-pam.patch
+Patch13: kdebase-3.5.1-kdm-readme.patch
+Patch14: kdebase-3.5.1-kwin-systray.patch
 
 # upstream patches
 Patch100: kdebase-3.5.1-keyboardlayout.patch
@@ -64,6 +66,7 @@
 Requires: cdparanoia-libs
 Requires(post,postun): /sbin/ldconfig
 Requires(pre,post): fileutils sh-utils
+Requires(post,postun): desktop-file-utils
 Requires(post): xfs
 Requires: pam >= 0.79-6
 
@@ -116,20 +119,21 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .redhat
-%patch3 -p1 -b .vroot
-%patch4 -p1 -b .shortcuts
-%patch40 -p1 -b .keymap
-%patch48 -p1 -b .kdesukonsole
-%patch56 -p1 -b .libtool
-%patch57 -p1
-%patch71 -p1 -b .konsole
-%patch74 -p1 -b .kper
-%patch80 -p1 -b .logo
-%patch81 -p1 -b .im
-%patch91 -p1 -b .kdestop-konsole
-%patch92 -p1 -b .xdg
-%patch93 -p1 -b .loginuid
+%patch0 -p1 -b .libtool
+%patch1 -p1 -b .redhat
+%patch2 -p1 -b .vroot
+%patch3 -p1 -b .shortcuts
+%patch4 -p1 -b .keymap
+%patch5 -p1
+%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 .pam
+%patch13 -p1 -b .kdm-readme
+%patch14 -p1 -b .systray
 
 # upstream patches
 %patch100 -p1 -b .keyboardlayout
@@ -165,7 +169,13 @@
    --with-xdmdir=%{_sysconfdir}/X11/xdm \
    --with-motif-includes=/usr/X11R6/include \
    --with-motif-libraries=/usr/X11R6/%{_lib} \
-   --with-pam=%{pamservice} \
+   --with-pam=yes \
+   --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 \
@@ -204,10 +214,12 @@
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/kcheckpass
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/kdesud
 
-#install pam configuration file
+# install pam configuration file
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-install -m 644 kde.pamd $RPM_BUILD_ROOT/etc/pam.d/%{pamservice}
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/%{pamservice}-np
+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
 
 # fix kappfinder script for relocatability and run it through consolehelper
 %if %{include_kappfinder}
@@ -237,22 +249,6 @@
 # Nuke man2html - we get it from man
 find $RPM_BUILD_ROOT -name "man2html*" | xargs rm -rf
 
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-
-# move to bitmap fonts package
-%if %{redhatify}
-   rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts
-%else
-   mkdir -p $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts
-   mv $RPM_BUILD_ROOT%{_datadir}/fonts/*pcf* \
-      $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/
-
-   rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts/fonts.dir \
-          $RPM_BUILD_ROOT%{_datadir}/fonts/override
-
-   gunzip $RPM_BUILD_ROOT%{_datadir}/fonts/bitmap-fonts/*.gz
-%endif
-
 # install gdm session support
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions
 install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/
@@ -265,6 +261,10 @@
 find etc/skel/.kde -type d | xargs chmod 0755
 popd
 
+# install logrotate script
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/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
@@ -351,12 +351,12 @@
 %files
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
-%doc %{_docdir}/kdm
 %config(noreplace) /etc/ksysguarddrc
 /etc/kde
 %dir /etc/skel/.kde
 /etc/skel/.kde/*
 /etc/xdg/menus/*
+%config /etc/logrotate.d/kdm
 %config %{_datadir}/xsessions/*
 %config /etc/kderc
 %config /etc/X11/xdm/kdmrc
@@ -394,6 +394,7 @@
 %{_datadir}/sounds
 %{_datadir}/templates
 %{_datadir}/wallpapers
+%exclude %{_datadir}/fonts/override/fonts.dir
 
 %files devel
 %defattr(-,root,root)
@@ -408,6 +409,14 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Feb 17 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.3.fc4
+- Systray icons not docked sometimes, apply patch to fix this issue #180314
+- kscreensaver/kdm/kcheckpass use a separate PAM config file
+- clean up kdm config file #166388
+- apply patch to launch kde scripts in shutdown,env directories #178326
+- kdm.log logrotate-enabled #178328
+- add konqueror webshortcuts for fedora project #178366
+
 * Wed Feb 15 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
 - apply patch to fix regression in keyboard layout #181054
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	27 Jan 2006 23:34:12 -0000	1.59
+++ sources	17 Feb 2006 11:50:59 -0000	1.60
@@ -1,2 +1,2 @@
-889e9b46e762950a4a78dec0d5cb91f4  kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
 484c7b3895ce4f95173f4789571eb1cc  kdebase-3.5.1.tar.bz2
+a53556b00f950797b9b32848cace66c9  kde-redhat-config-3.5-fc5-0.2.tar.bz2


--- kdebase-3.0-shortcuts.patch DELETED ---


--- kdebase-3.0.4-kdesukonsole.patch DELETED ---


--- kdebase-3.4.1-pam.patch DELETED ---


--- kdebase-3.5.1-redhat.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 12:13:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 07:13:52 -0500
Subject: rpms/compat-db/FC-4 db4-db_load.patch, NONE, 1.1 compat-db.spec,
	1.13, 1.14
Message-ID: <200602171213.k1HCDqeA032024@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/compat-db/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31901

Modified Files:
	compat-db.spec 
Added Files:
	db4-db_load.patch 
Log Message:
* Fri Feb 17 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-2.FC4
- add ed BuildRequires (#163025)
- clarify pointer usage in db_load.c (#110697)


db4-db_load.patch:
 db-4.1.25/db_load/db_load.c               |    2 +-
 db-4.2.52/build_vxworks/db_load/db_load.c |    2 +-
 db-4.2.52/db_load/db_load.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE db4-db_load.patch ---
--- compat-db-4.2.52/db-4.1.25/db_load/db_load.c.db_load	2002-08-08 06:26:54.000000000 +0200
+++ compat-db-4.2.52/db-4.1.25/db_load/db_load.c	2006-02-14 14:53:35.000000000 +0100
@@ -895,7 +895,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/db_load/db_load.c.db_load	2003-10-16 19:51:08.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/db_load/db_load.c	2006-02-14 14:53:02.000000000 +0100
@@ -939,7 +939,7 @@ convprintable(dbenv, instr, outstrp)
 				continue;
 			}
 			c = digitize(dbenv, *instr, &e1) << 4;
-			c |= digitize(dbenv, *++instr, &e2);
+			c |= digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				badend(dbenv);
 				return (EINVAL);
--- compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c.db_load	2003-10-22 05:23:34.000000000 +0200
+++ compat-db-4.2.52/db-4.2.52/build_vxworks/db_load/db_load.c	2006-02-14 14:51:41.000000000 +0100
@@ -954,7 +954,7 @@ db_load_convprintable(dbenv, instr, outs
 				continue;
 			}
 			c = db_load_digitize(dbenv, *instr, &e1) << 4;
-			c |= db_load_digitize(dbenv, *++instr, &e2);
+			c |= db_load_digitize(dbenv, *(++instr), &e2);
 			if (e1 || e2) {
 				db_load_badend(dbenv);
 				return (EINVAL);


Index: compat-db.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-db/FC-4/compat-db.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- compat-db.spec	16 Nov 2004 21:40:23 -0000	1.13
+++ compat-db.spec	17 Feb 2006 12:13:50 -0000	1.14
@@ -16,12 +16,14 @@
 Summary: The Berkeley DB database library for Red Hat Linux 7.x compatibility.
 Name: compat-db
 Version: 4.2.52
-Release: 2
+Release: 2.FC4
 # Tarball taken from glibc 2.1.3  
 #Source0: http://www.sleepycat.com/update/2.7.7/db-2.7.7.tar.gz  
 Source0: http://www.sleepycat.com/update/4.1.25/db-4.1.25.tar.gz
 Source1: http://www.sleepycat.com/update/4.2.52/db-4.2.52.tar.gz
 
+Patch1: db4-db_load.patch
+
 Patch17: patch.4.1.25.1
 Patch18: patch.4.1.25.2
 
@@ -36,7 +38,7 @@
 URL: http://www.sleepycat.com/
 License: BSDish
 Group: System Environment/Libraries
-BuildPreReq: findutils, libtool, perl, sed
+BuildRequires: findutils, libtool, perl, sed, ed
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -48,6 +50,8 @@
 %prep
 %setup -q -c -a 1
 
+%patch1 -p1 -b .db_load
+
 pushd db-4.1.25
 %patch17 -p0
 %patch18 -p0
@@ -168,6 +172,10 @@
 %{_bindir}/db*_verify
 
 %changelog
+* Fri Feb 17 2006 Jindrich Novy <jnovy at redhat.com> 4.2.52-2.FC4
+- add ed BuildRequires (#163025)
+- clarify pointer usage in db_load.c (#110697)
+
 * Tue Nov 16 2004 Jeff Johnson <jbj at redhat.com> 4.2.52-2
 - link libdb-4.1.so against -lpthread (#114150).
 - link libdb-4.2.so against -lpthread (#139487).



From fedora-cvs-commits at redhat.com  Fri Feb 17 12:21:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 07:21:50 -0500
Subject: rpms/util-linux/devel util-linux-2.13-pre6-nfsmount-fsc.patch, NONE,
	1.1.2.1 util-linux.spec, 1.106, 1.106.2.1
Message-ID: <200602171221.k1HCLoMm015731@cvs.devel.redhat.com>

Author: steved

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15547

Modified Files:
      Tag: private-util-linux-2_13-pre6-nfsmount_fsc
	util-linux.spec 
Added Files:
      Tag: private-util-linux-2_13-pre6-nfsmount_fsc
	util-linux-2.13-pre6-nfsmount-fsc.patch 
Log Message:
Added 'fsc' mount option to turn on Filesystem caching for both
nfs and nfs4


util-linux-2.13-pre6-nfsmount-fsc.patch:
 nfs.5        |    6 ++++++
 nfs4_mount.h |    1 +
 nfs4mount.c  |   10 +++++++---
 nfs_mount4.h |    1 +
 nfsmount.c   |    4 ++++
 5 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE util-linux-2.13-pre6-nfsmount-fsc.patch ---
--- util-linux-2.13-pre6/mount/nfs_mount4.h.fsc	2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs_mount4.h	2006-02-17 06:23:25.000000000 -0500
@@ -57,6 +57,7 @@ struct nfs_mount_data {
 #define NFS_MOUNT_NONLM		0x0200	/* 3 */
 #define NFS_MOUNT_BROKEN_SUID	0x0400	/* 4 */
 #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
+#define NFS_MOUNT_FSCACHE		0x4000
 
 /* security pseudoflavors */
 
--- util-linux-2.13-pre6/mount/nfsmount.c.fsc	2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfsmount.c	2006-02-17 06:23:25.000000000 -0500
@@ -836,6 +836,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)
--- util-linux-2.13-pre6/mount/nfs4mount.c.fsc	2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs4mount.c	2006-02-17 06:23:25.000000000 -0500
@@ -77,7 +77,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
 #endif
 
 extern int clnt_ping(struct sockaddr_in *, const u_long, const u_long, const u_int);
-extern void rpc_strerror();
+extern void rpc_strerror(void);
 
 struct {
 	char    *flavour;
@@ -208,7 +208,7 @@ int nfs4mount(const char *spec, const ch
 	char *s;
 	int val;
 	int bg, soft, intr;
-	int nocto, noac;
+	int nocto, noac, fscache;
 	int retry;
 	int retval;
 
@@ -258,6 +258,7 @@ int nfs4mount(const char *spec, const ch
 	intr = NFS4_MOUNT_INTR;
 	nocto = 0;
 	noac = 0;
+	fscache = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
 
 	/*
@@ -337,6 +338,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"))
@@ -354,7 +357,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
--- util-linux-2.13-pre6/mount/nfs4_mount.h.fsc	2006-02-17 06:19:51.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs4_mount.h	2006-02-17 06:23:25.000000000 -0500
@@ -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	0x2000	/* 1 */
 #define NFS4_MOUNT_FLAGMASK	0xFFFF
 
 /* pseudoflavors: */
--- util-linux-2.13-pre6/mount/nfs.5.fsc	2006-02-17 06:19:52.000000000 -0500
+++ util-linux-2.13-pre6/mount/nfs.5	2006-02-17 06:36:09.000000000 -0500
@@ -267,6 +267,9 @@ 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
+Make use of Filesystem Caching, if available.
 .P
 All of the non-value options have corresponding nooption forms.
 For example, nointr means don't allow file operations to be
@@ -421,6 +424,9 @@ 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
+Make use of Filesystem Caching, if available.
 .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.106
retrieving revision 1.106.2.1
diff -u -r1.106 -r1.106.2.1
--- util-linux.spec	11 Feb 2006 05:56:30 -0000	1.106
+++ util-linux.spec	17 Feb 2006 12:21:46 -0000	1.106.2.1
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.15.1
+Release: 0.15.1.fsc
 License: distributable
 Group: System Environment/Base
 
@@ -109,6 +109,7 @@
 Patch172: util-linux-2.12a-nfsmount-overflow.patch
 Patch173: util-linux-2.12a-nfsmount-reservp.patch
 Patch174: util-linux-2.12p-nfsmount-rollback.patch
+Patch175: util-linux-2.13-pre6-nfsmount-fsc.patch
 
 # Makeing /var/log/lastlog (#151635)
 Patch180: util-linux-2.12p-login-lastlog.patch
@@ -215,6 +216,7 @@
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
+%patch175 -p1
 %patch180 -p1
 %patch181 -p1
 %patch182 -p1
@@ -627,6 +629,10 @@
 /sbin/losetup
 
 %changelog
+* Fri Feb 17 2006 Steve Dickson <steved at redhat.com> - 2.13-0.15.1.fsc
+- Added 'fsc' mount option to turn on Filesystem caching for both
+  nfs and nfs4
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 13:35:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 08:35:21 -0500
Subject: rpms/vconfig/devel vconfig.spec,1.12,1.13
Message-ID: <200602171335.k1HDZLI7025791@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/vconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25709

Modified Files:
	vconfig.spec 
Log Message:
- Fix build problems and cleaned up files in archive properly



Index: vconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/vconfig/devel/vconfig.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vconfig.spec	11 Feb 2006 05:57:09 -0000	1.12
+++ vconfig.spec	17 Feb 2006 13:35:18 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Linux 802.1q VLAN configuration utility
 Name: vconfig
 Version: 1.9
-Release: 1.1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.gz
@@ -14,10 +14,11 @@
 
 %prep
 %setup -q -n vlan
-rm -rf contrib/CVS/
 
 %build
-make CCFLAGS="%{optflags}"
+make clean
+rm -f vconfig
+make CCFLAGS="%{optflags}" vconfig
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -34,6 +35,9 @@
 %{_mandir}/man8/vconfig.8*
 
 %changelog
+* Fri Feb 17 2006 Phil Knirsch <pknirsch at redhat.com> - 1.9-2
+- Fix build problems and cleaned up files in archive properly
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 14:05:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 09:05:21 -0500
Subject: rpms/vte/devel vte-0.11.18-paste.patch,NONE,1.1 vte.spec,1.60,1.61
Message-ID: <200602171405.k1HE5Lhc016895@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16861

Modified Files:
	vte.spec 
Added Files:
	vte-0.11.18-paste.patch 
Log Message:
fix Shift-Insert


vte-0.11.18-paste.patch:
 vte.c |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

--- NEW FILE vte-0.11.18-paste.patch ---
--- vte-0.11.18/src/vte.c.paste	2006-02-17 08:48:14.000000000 -0500
+++ vte-0.11.18/src/vte.c	2006-02-17 08:53:43.000000000 -0500
@@ -3918,16 +3918,22 @@
 			break;
 		case GDK_KP_Insert:
 		case GDK_Insert:
-			if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
-				vte_terminal_paste_clipboard(terminal);
-				handled = TRUE;
-				suppress_meta_esc = TRUE;
-			} else if (terminal->pvt->modifiers & GDK_CONTROL_MASK) {
-				vte_terminal_copy_clipboard(terminal);
-				handled = TRUE;
-				suppress_meta_esc = TRUE;
-			}
-			break;
+                        if (terminal->pvt->modifiers & GDK_SHIFT_MASK) {
+                                if (terminal->pvt->modifiers & GDK_CONTROL_MASK) {
+                                        vte_terminal_paste_clipboard(terminal);
+                                        handled = TRUE;
+                                        suppress_meta_esc = TRUE;
+                                } else {
+                                        vte_terminal_paste_primary(terminal);
+                                        handled = TRUE;
+                                        suppress_meta_esc = TRUE;
+                                }
+                        } else if (terminal->pvt->modifiers & GDK_CONTROL_MASK) {
+                                vte_terminal_copy_clipboard(terminal);
+                                handled = TRUE;
+                                suppress_meta_esc = TRUE;
+                        }
+                        break;
 		/* Keypad/motion keys. */
 		case GDK_KP_Page_Up:
 		case GDK_Page_Up:


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vte.spec	11 Feb 2006 20:54:01 -0000	1.60
+++ vte.spec	17 Feb 2006 14:05:08 -0000	1.61
@@ -1,6 +1,6 @@
 Name: vte
 Version: 0.11.18
-Release: 1.fc5.1
+Release: 1.fc5.2
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -12,6 +12,9 @@
 # initscripts creates the utmp group
 Prereq: initscripts 
 
+# already in upstream cvs
+Patch0: vte-0.11.18-paste.patch
+
 %description
 VTE is an experimental terminal emulator widget for use with GTK+ 2.0.
 
@@ -26,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .paste
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -98,6 +102,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> 0.11.18-2
+- Change Shift-Insert back to insert PRIMARY 
+
 * Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> 0.11.18-1
 - Update to 0.11.18
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 14:57:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 09:57:24 -0500
Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.28,1.29
Message-ID: <200602171457.k1HEvO4a021365@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/OpenIPMI/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21232

Modified Files:
	OpenIPMI.spec 
Log Message:
- Added missing prereq to chkconfig



Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- OpenIPMI.spec	13 Feb 2006 18:42:58 -0000	1.28
+++ OpenIPMI.spec	17 Feb 2006 14:57:21 -0000	1.29
@@ -2,7 +2,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 1.4.14
-Release: 18.2.1
+Release: 19
 License: GPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -14,6 +14,7 @@
 Patch2: OpenIPMI-1.4.14-oob.patch
 Patch3: OpenIPMI-1.4.14-warnings.patch
 BuildRoot: /var/tmp/%{name}-%{version}-root
+PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel openssl-devel
 
 %description
@@ -131,6 +132,9 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Feb 17 2006 Phil Knirsch <pknirsch at redhat.com> 1.4.14-19
+- Added missing PreReq for chkconfig
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.4.14-18.2.1
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 15:08:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 10:08:17 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.245,1.246
Message-ID: <200602171508.k1HF8HMk023305@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23279

Modified Files:
	eclipse.spec 
Log Message:
- Try build on ppc64 (rh#172172, rh#181846).


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- eclipse.spec	11 Feb 2006 02:29:01 -0000	1.245
+++ eclipse.spec	17 Feb 2006 15:08:14 -0000	1.246
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_7fc
+Release:        1jpp_8fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -113,9 +113,9 @@
 Patch49:	%{name}-ecj-rpmdebuginfo.patch
 
 %if %{gcj_support}
-ExcludeArch: ppc64 s390 s390x
+ExcludeArch: s390 s390x
 %else
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -1279,6 +1279,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 17 2006 Andrew Overholt <overholt at redhat.com> - 1:3.1.2-1jpp_8fc
+- Try build on ppc64 (rh#172172, rh#181846).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.1.2-1jpp_7fc
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 15:21:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 10:21:56 -0500
Subject: rpms/pango/devel pango-split.patch, NONE, 1.1 private-api.patch,
	NONE, 1.1 pango.spec, 1.60, 1.61
Message-ID: <200602171521.k1HFLuwA009269@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9198

Modified Files:
	pango.spec 
Added Files:
	pango-split.patch private-api.patch 
Log Message:
Some upstream fixes


pango-split.patch:
 ellipsize.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE pango-split.patch ---
Index: pango/ellipsize.c
===================================================================
RCS file: /cvs/gnome/pango/pango/ellipsize.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pango/ellipsize.c	29 Jan 2006 23:06:59 -0000	1.7
+++ pango/ellipsize.c	17 Feb 2006 08:11:02 -0000	1.8
@@ -126,7 +126,6 @@
   start_offset = g_utf8_strlen (line->layout->text,
 				line->start_index);
 
-  start_offset = 0;
   state->total_width = 0;
   for (l = line->runs, i = 0; l; l = l->next, i++)
     {

private-api.patch:
 pango-font.h  |    7 +++++++
 pango-types.h |    4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

--- NEW FILE private-api.patch ---
Index: pango/pango-types.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-types.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pango/pango-types.h	5 Feb 2006 03:11:58 -0000	1.31
+++ pango/pango-types.h	17 Feb 2006 07:26:17 -0000	1.32
@@ -45,10 +45,6 @@
  */
 typedef guint32 PangoGlyph;
 
-#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
-#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
-#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
-
 /* A rectangle. Used to store logical and physical extents of glyphs,
  * runs, strings, etc.
  */
Index: pango/pango-font.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-font.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pango/pango-font.h	2 Feb 2006 12:07:17 -0000	1.33
+++ pango/pango-font.h	17 Feb 2006 07:26:16 -0000	1.34
@@ -365,6 +365,13 @@
 
 #endif /* PANGO_ENABLE_BACKEND */
 
+#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND)
+#define PANGO_GLYPH_EMPTY           ((PangoGlyph)0x0FFFFFFF)
+#define PANGO_GLYPH_UNKNOWN_FLAG    ((PangoGlyph)0x10000000)
+#define PANGO_GET_UNKNOWN_GLYPH(wc) ((PangoGlyph)(wc)|PANGO_GLYPH_UNKNOWN_FLAG)
+#endif
+
+
 G_END_DECLS
 
 #endif /* __PANGO_FONT_H__ */


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pango.spec	11 Feb 2006 20:45:37 -0000	1.60
+++ pango.spec	17 Feb 2006 15:21:53 -0000	1.61
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text
 Name: pango
 Version: 1.11.5
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -37,6 +37,11 @@
 # Look for pango.modules in an arch-specific directory
 Patch5: pango-1.2.5-lib64.patch
 
+# already in upstream cvs
+Patch6: private-api.patch
+# already in upstream cvs
+Patch7: pango-split.patch
+
 %description
 Pango is a system for layout and rendering of internationalized text.
 
@@ -68,6 +73,9 @@
 %patch1 -p1 -b .slighthint
 %patch5 -p1 -b .lib64
 
+%patch6 -p0 -b .private-api
+%patch7 -p0 -b .pango-split
+
 %build
 
 %configure --disable-gtk-doc
@@ -188,6 +196,10 @@
 
 
 %changelog
+* Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-2
+- Fix a crash in pango_split
+- Hide some private API
+
 * Mon Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-1
 - Update to 1.11.5
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 15:31:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 10:31:29 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.34,1.35
Message-ID: <200602171531.k1HFVTD9012543@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12523

Modified Files:
	dmraid.spec 
Log Message:
Added doc/dmraid_design.txt to %doc


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dmraid.spec	11 Feb 2006 02:26:51 -0000	1.34
+++ dmraid.spec	17 Feb 2006 15:31:16 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc9
-Release: FC5_5.2
+Release: FC5_5.3
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -86,7 +86,7 @@
 
 %files
 %defattr(-,root,root)
-%doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO
+%doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt
 /%{_mandir}/man8/*
 /sbin/*
 %if "%{dmraid_build_dso}" == "1"
@@ -104,6 +104,10 @@
 %endif
 
 %changelog
+* Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc9-FC5_5.3
+- add doc/dmraid_design.txt to %doc (#181885)
+- not build yet
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 15:48:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 10:48:11 -0500
Subject: rpms/tcl/devel tcl.spec,1.18,1.19
Message-ID: <200602171548.k1HFmBwS030998@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30925

Modified Files:
	tcl.spec 
Log Message:
Enable threads support in Tcl.



Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- tcl.spec	11 Feb 2006 05:47:44 -0000	1.18
+++ tcl.spec	17 Feb 2006 15:48:09 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Tcl scripting language development environment
 Name: tcl
 Version: %{majorver}.12
-Release: 3.2
+Release: 4
 License: BSD
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -75,7 +75,7 @@
 
 %build
 cd %{name}%{version}/unix
-%configure
+%configure --enable-threads
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 # run "make test" by default
@@ -150,6 +150,9 @@
 %doc %{name}%{version}/html/*
 
 %changelog
+* Fri Feb 17 2006 David Cantrell <dcantrell at redhat.com> - 8.4.12-4
+- Enable threads (#181871)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.4.12-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 15:56:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 10:56:30 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.35,1.36
Message-ID: <200602171556.k1HFuUbO002401@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2372

Modified Files:
	dmraid.spec 
Log Message:
Added --enable-libselinux to configure


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dmraid.spec	17 Feb 2006 15:31:16 -0000	1.35
+++ dmraid.spec	17 Feb 2006 15:56:27 -0000	1.36
@@ -52,11 +52,11 @@
 %patch7 -p2 -b .owner
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug -enable-libselinux --enable-static_link
 make DESTDIR=$RPM_BUILD_ROOT
 mv tools/dmraid tools/dmraid.static
 make clean
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --disable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug -enable-libselinux --disable-static_link
 %if "%{dmraid_build_dso}" == "1"
 (cd lib ; make DESTDIR=$RPM_BUILD_ROOT libdmraid.so)
 make DESTDIR=$RPM_BUILD_ROOT
@@ -106,6 +106,7 @@
 %changelog
 * Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc9-FC5_5.3
 - add doc/dmraid_design.txt to %doc (#181885)
+- add --enable-libselinux to configure
 - not build yet
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.2



From fedora-cvs-commits at redhat.com  Fri Feb 17 16:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 11:28:16 -0500
Subject: rpms/avahi/devel avahi.spec,1.39,1.40
Message-ID: <200602171628.k1HGSGRH019400@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19384

Modified Files:
	avahi.spec 
Log Message:
checking for python module gtk... no
configure: error: Could not find Python module gtk

Add BuildRequires: pygtk2






Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- avahi.spec	11 Feb 2006 02:03:58 -0000	1.39
+++ avahi.spec	17 Feb 2006 16:28:13 -0000	1.40
@@ -4,13 +4,13 @@
 %endif
 Name:           avahi
 Version:        0.6.6
-Release: 	3.1
+Release: 	4
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 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
+BuildRequires:  doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel pygtk2
 %if %{WITH_MONO}
 BuildRequires: mono-devel >= 1.1.13
 %endif
@@ -302,6 +302,9 @@
 %endif
 
 %changelog
+* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 0.6.6-4
+- BuildRequires pygtk2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-3.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 16:31:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 11:31:25 -0500
Subject: rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.41,1.42
Message-ID: <200602171631.k1HGVPgx019492@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse-bugzilla/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19475

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
Test release bump



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- eclipse-bugzilla.spec	14 Feb 2006 22:45:12 -0000	1.41
+++ eclipse-bugzilla.spec	17 Feb 2006 16:31:22 -0000	1.42
@@ -22,7 +22,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}
-Release:	2
+Release:	3
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		



From fedora-cvs-commits at redhat.com  Fri Feb 17 16:35:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 11:35:25 -0500
Subject: rpms/glibc/devel .cvsignore, 1.138, 1.139 glibc-fedora.patch, 1.134,
	1.135 glibc.spec, 1.222, 1.223 sources, 1.160, 1.161
Message-ID: <200602171635.k1HGZPrZ019621@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19594/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.3.90-38 on branch devel from glibc-2.3.90-38.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- .cvsignore	13 Feb 2006 07:56:52 -0000	1.138
+++ .cvsignore	17 Feb 2006 16:35:19 -0000	1.139
@@ -1,2 +1,2 @@
-glibc-20060213T0650.tar.bz2
-glibc-fedora-20060213T0650.tar.bz2
+glibc-20060217T1609.tar.bz2
+glibc-fedora-20060217T1609.tar.bz2

glibc-fedora.patch:
 ChangeLog                                           |   72 ++++
 ChangeLog.11                                        |   21 +
 ChangeLog.12                                        |   12 
 ChangeLog.15                                        |   45 ++
 csu/elf-init.c                                      |   17 
 debug/tst-chk1.c                                    |    7 
 elf/ldconfig.c                                      |   38 +-
 elf/tst-stackguard1.c                               |    8 
 iconv/iconvconfig.c                                 |   55 +--
 include/atomic.h                                    |   37 ++
 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 -
 manual/filesys.texi                                 |    2 
 nptl/ChangeLog                                      |   31 +
 nptl/Makefile                                       |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h   |   61 +++
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h    |   71 ++++
 nptl/sysdeps/unix/sysv/linux/kernel-features.h      |    6 
 nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c   |   95 +++++
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h |   82 +++-
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h    |   73 ++++
 nptl/tst-stackguard1.c                              |    8 
 nscd/connections.c                                  |   15 
 nscd/nscd.c                                         |    4 
 nscd/nscd.conf                                      |    4 
 nscd/nscd.init                                      |   19 -
 nscd/selinux.c                                      |    2 
 posix/Makefile                                      |   19 -
 posix/getconf.speclist.h                            |   15 
 sysdeps/generic/dl-cache.h                          |    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, 1200 insertions(+), 489 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- glibc-fedora.patch	13 Feb 2006 09:40:11 -0000	1.134
+++ glibc-fedora.patch	17 Feb 2006 16:35:19 -0000	1.135
@@ -1,6 +1,14 @@
---- glibc-20060213T0650/ChangeLog	12 Feb 2006 21:41:44 -0000	1.9989
-+++ glibc-20060213T0650-fedora/ChangeLog	13 Feb 2006 07:30:01 -0000	1.8782.2.162
-@@ -73,6 +73,11 @@
+--- glibc-20060217T1609/ChangeLog	15 Feb 2006 18:14:59 -0000	1.9991
++++ glibc-20060217T1609-fedora/ChangeLog	17 Feb 2006 16:18:18 -0000	1.8782.2.164
+@@ -1,3 +1,7 @@
++2006-02-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* include/atomic.h (atomic_and, atomic_or): Define.
++
+ 2006-02-15  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	* sysdeps/unix/sysv/linux/sparc/bits/mman.h: Define MADV_DONTFORK
+@@ -94,6 +98,11 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
  
@@ -12,7 +20,7 @@
  2006-02-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]
-@@ -132,6 +137,11 @@
+@@ -153,6 +162,11 @@
  	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.
  	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.
  
@@ -24,7 +32,7 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
-@@ -2558,6 +2568,10 @@
+@@ -2579,6 +2593,10 @@
  
  	* elf/order2mod2.c (init): Cast ignored value to void.
  
@@ -35,7 +43,7 @@
  2005-12-27  Ulrich Drepper  <drepper at redhat.com>
  
  	* elf/tst-tls13.c (do_test): Avoid using the library path when
-@@ -2841,6 +2855,26 @@
+@@ -2862,6 +2880,26 @@
  	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
  	use sysdeps/unix/time.c implementation.
  
@@ -62,7 +70,7 @@
  2005-12-19  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #1955]
-@@ -5959,6 +5993,11 @@
+@@ -5980,6 +6018,11 @@
  	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
  	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
  
@@ -74,7 +82,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -6953,6 +6992,12 @@
+@@ -6974,6 +7017,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -87,7 +95,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -7077,6 +7122,17 @@
+@@ -7098,6 +7147,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -105,7 +113,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -10137,6 +10193,18 @@
+@@ -10158,6 +10218,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -124,8 +132,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20060213T0650/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20060213T0650-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060217T1609/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20060217T1609-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.
@@ -175,8 +183,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-20060213T0650/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20060213T0650-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20060217T1609/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20060217T1609-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.
@@ -203,8 +211,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20060213T0650/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20060213T0650-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20060217T1609/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20060217T1609-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>
@@ -285,8 +293,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20060213T0650/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20060213T0650-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20060217T1609/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20060217T1609-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;
@@ -311,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20060213T0650/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20060213T0650-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20060217T1609/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20060217T1609-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -341,8 +349,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20060213T0650/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
-+++ glibc-20060213T0650-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
+--- glibc-20060217T1609/elf/ldconfig.c	1 Jan 2006 19:15:56 -0000	1.52
++++ glibc-20060217T1609-fedora/elf/ldconfig.c	2 Jan 2006 10:52:50 -0000	1.47.2.7
 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
  #endif
  	      !is_hwcap_platform (direntry->d_name)))
@@ -444,8 +452,8 @@
      }
  
    search_dirs ();
---- glibc-20060213T0650/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20060213T0650-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20060217T1609/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20060217T1609-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;
@@ -470,8 +478,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060213T0650/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
-+++ glibc-20060213T0650-fedora/iconv/iconvconfig.c	2 Jan 2006 10:52:50 -0000	1.19.2.6
+--- glibc-20060217T1609/iconv/iconvconfig.c	1 Jan 2006 19:15:56 -0000	1.25
++++ glibc-20060217T1609-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)
@@ -548,8 +556,59 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20060213T0650/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
-+++ glibc-20060213T0650-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
+--- glibc-20060217T1609/include/atomic.h	20 Aug 2005 01:14:07 -0000	1.16
++++ glibc-20060217T1609-fedora/include/atomic.h	17 Feb 2006 16:18:19 -0000	1.15.2.2
+@@ -1,5 +1,5 @@
+ /* Internal macros for atomic operations for GNU C Library.
+-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper at redhat.com>, 2002.
+ 
+@@ -273,6 +273,41 @@
+      __oldval & __mask; })
+ #endif
+ 
++/* Atomically *mem &= mask and return the old value of *mem.  */
++#ifndef atomic_and
++# define atomic_and(mem, mask) \
++  ({ __typeof (*(mem)) __oldval;					      \
++     __typeof (mem) __memp = (mem);					      \
++     __typeof (*(mem)) __mask = (mask);					      \
++									      \
++     do									      \
++       __oldval = (*__memp);						      \
++     while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp,   \
++								    __oldval  \
++								    & __mask, \
++								    __oldval),\
++			      0));					      \
++									      \
++     __oldval; })
++#endif
++
++/* Atomically *mem |= mask and return the old value of *mem.  */
++#ifndef atomic_or
++# define atomic_or(mem, mask) \
++  ({ __typeof (*(mem)) __oldval;					      \
++     __typeof (mem) __memp = (mem);					      \
++     __typeof (*(mem)) __mask = (mask);					      \
++									      \
++     do									      \
++       __oldval = (*__memp);						      \
++     while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp,   \
++								    __oldval  \
++								    | __mask, \
++								    __oldval),\
++			      0));					      \
++									      \
++     __oldval; })
++#endif
+ 
+ #ifndef atomic_full_barrier
+ # define atomic_full_barrier() __asm ("" ::: "memory")
+--- glibc-20060217T1609/include/features.h	5 Jan 2006 12:25:35 -0000	1.42
++++ glibc-20060217T1609-fedora/include/features.h	6 Jan 2006 09:23:23 -0000	1.35.2.11
 @@ -275,7 +275,13 @@
  #endif
  
@@ -565,16 +624,16 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20060213T0650/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060217T1609/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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-20060213T0650/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20060217T1609/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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-20060213T0650/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20060213T0650-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20060217T1609/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20060217T1609-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
@@ -584,8 +643,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20060213T0650/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
-+++ glibc-20060213T0650-fedora/libio/stdio.h	30 Jan 2006 09:29:46 -0000	1.78.2.8
+--- glibc-20060217T1609/libio/stdio.h	16 Jan 2006 20:12:21 -0000	1.86
++++ glibc-20060217T1609-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.  */
@@ -599,8 +658,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20060213T0650/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20060213T0650-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20060217T1609/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20060217T1609-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);
@@ -631,8 +690,8 @@
  
  #endif
  
---- glibc-20060213T0650/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20060213T0650-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20060217T1609/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20060217T1609-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -724,8 +783,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20060213T0650/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20060213T0650-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20060217T1609/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20060217T1609-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,
  	}
      }
@@ -769,8 +828,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20060213T0650/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20060213T0650-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20060217T1609/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20060217T1609-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -779,8 +838,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20060213T0650/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20060213T0650-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20060217T1609/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20060217T1609-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -822,8 +881,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20060213T0650/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20060213T0650-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20060217T1609/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20060217T1609-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>"
@@ -838,8 +897,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20060213T0650/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20060213T0650-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20060217T1609/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20060217T1609-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>"
@@ -851,8 +910,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-20060213T0650/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20060217T1609/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -923,8 +982,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20060213T0650/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20060213T0650-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20060217T1609/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20060217T1609-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -952,8 +1011,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20060213T0650/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20060213T0650-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20060217T1609/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20060217T1609-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>
@@ -1029,8 +1088,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20060213T0650/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20060213T0650-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20060217T1609/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20060217T1609-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)
@@ -1086,8 +1145,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20060213T0650/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
-+++ glibc-20060213T0650-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
+--- glibc-20060217T1609/manual/filesys.texi	31 Dec 2005 13:11:27 -0000	1.99
++++ glibc-20060217T1609-fedora/manual/filesys.texi	3 Feb 2006 09:43:54 -0000	1.96.2.4
 @@ -2806,7 +2806,7 @@ function.
  
  @comment sys/time.h
@@ -1097,34 +1156,25 @@
  This function is like @code{utimes}, except that it takes an open file
  descriptor as an argument instead of a file name.  @xref{Low-Level
  I/O}.  This function comes from FreeBSD, and is not available on all
---- glibc-20060213T0650/nptl/ChangeLog	13 Feb 2006 01:27:41 -0000	1.860
-+++ glibc-20060213T0650-fedora/nptl/ChangeLog	13 Feb 2006 08:21:20 -0000	1.706.2.77
-@@ -1,3 +1,24 @@
-+2006-02-13  Jakub Jelinek  <jakub at redhat.com>
-+
-+	* sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
-+	(__pthread_list_t): New typedef.
-+	(pthread_mutex_t): Replace __next and __prev fields with __list.
-+	* sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h
-+	(__pthread_list_t): New typedef.
-+	(pthread_mutex_t): Replace __next and __prev fields with __list.
-+	* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
-+	(__pthread_list_t, __pthread_slist_t): New typedefs.
-+	(pthread_mutex_t): Replace __next and __prev fields with __list.
-+	* sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
-+	(__pthread_list_t, __pthread_slist_t): New typedefs.
-+	(pthread_mutex_t): Replace __next and __prev fields with __list.
-+	* sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h
-+	(__pthread_list_t, __pthread_slist_t): New typedefs.
-+	(pthread_mutex_t): Replace __next and __prev fields with __list.
-+	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
-+	(__pthread_slist_t): New typedef.
-+	(pthread_mutex_t): Replace __next field with __list.
+--- glibc-20060217T1609/nptl/ChangeLog	17 Feb 2006 15:37:51 -0000	1.864
++++ glibc-20060217T1609-fedora/nptl/ChangeLog	17 Feb 2006 16:18:19 -0000	1.706.2.79
+@@ -1,3 +1,15 @@
++2006-02-17  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/unix/sysv/linux/alpha/lowlevellock.h (lll_robust_mutex_dead,
++	lll_robust_mutex_trylock, lll_robust_mutex_lock,
++	lll_robust_mutex_cond_lock, lll_robust_mutex_timedlock,
++	lll_robust_mutex_unlock): New macros.
++	(__lll_robust_lock_wait, __lll_robust_timedlock_wait): New prototypes.
++	* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
++	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise.
++	* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise.
++	* sysdeps/unix/sysv/linux/lowlevelrobustlock.c: New file.
 +
- 2006-02-12  Ulrich Drepper  <drepper at redhat.com>
+ 2006-02-17  Kaz Kojima  <kkojima at rr.iij4u.or.jp>
  
- 	* allocatestack.c (allocate_stack): Initialize robust_list.
-@@ -519,6 +540,15 @@
+ 	* sysdeps/unix/sysv/linux/sh/lowlevellock.h: Add lll_robust_mutex_*
+@@ -582,6 +594,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1140,7 +1190,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -1255,6 +1285,11 @@
+@@ -1318,6 +1339,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1152,7 +1202,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -3329,6 +3364,11 @@
+@@ -3392,6 +3418,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1164,8 +1214,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20060213T0650/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
-+++ glibc-20060213T0650-fedora/nptl/Makefile	30 Jan 2006 09:29:47 -0000	1.157.2.17
+--- glibc-20060217T1609/nptl/Makefile	15 Feb 2006 16:52:28 -0000	1.177
++++ glibc-20060217T1609-fedora/nptl/Makefile	17 Feb 2006 16:15:52 -0000	1.157.2.18
 @@ -514,15 +514,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1188,8 +1238,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20060213T0650/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20060213T0650-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20060217T1609/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20060217T1609-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;
@@ -1214,8 +1264,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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>
 +
@@ -1223,207 +1273,619 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.11
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.7.2.5
-@@ -43,6 +43,13 @@ typedef union
- } pthread_attr_t;
- 
- 
-+typedef struct __pthread_internal_list
-+{
-+  struct __pthread_internal_list *__prev;
-+  struct __pthread_internal_list *__next;
-+} __pthread_list_t;
-+
-+
- /* Data structures for mutex handling.  The structure of the attribute
-    type is deliberately not exposed.  */
- typedef union
-@@ -57,8 +64,7 @@ typedef union
-        binary compatibility.  */
-     int __kind;
-     int __spins;
--    struct __pthread_mutex_s *__next;
--    struct __pthread_mutex_s *__prev;
-+    __pthread_list_t __list;
- #define __PTHREAD_MUTEX_HAVE_PREV	1
-   } __data;
-   char __size[__SIZEOF_PTHREAD_MUTEX_T];
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	6 Jan 2006 21:37:18 -0000	1.16
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.13.2.4
-@@ -43,6 +43,13 @@ typedef union
- } pthread_attr_t;
- 
- 
-+typedef struct __pthread_internal_list
-+{
-+  struct __pthread_internal_list *__prev;
-+  struct __pthread_internal_list *__next;
-+} __pthread_list_t;
-+
-+
- /* Data structures for mutex handling.  The structure of the attribute
-    type is not exposed on purpose.  */
- typedef union
-@@ -57,8 +64,7 @@ typedef union
-        binary compatibility.  */
-     int __kind;
-     int __spins;
--    struct __pthread_mutex_s *__next;
--    struct __pthread_mutex_s *__prev;
-+    __pthread_list_t __list;
- #define __PTHREAD_MUTEX_HAVE_PREV	1
-   } __data;
-   char __size[__SIZEOF_PTHREAD_MUTEX_T];
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	9 Jan 2006 21:12:31 -0000	1.18
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.14.2.5
-@@ -58,6 +58,20 @@ typedef union
- } pthread_attr_t;
- 
- 
-+#if __WORDSIZE == 64
-+typedef struct __pthread_internal_list
-+{
-+  struct __pthread_internal_list *__prev;
-+  struct __pthread_internal_list *__next;
-+} __pthread_list_t;
-+#else
-+typedef struct __pthread_internal_slist
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c	17 Feb 2006 16:18:19 -0000	1.1.2.1
+@@ -0,0 +1,95 @@
++/* Copyright (C) 2006 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Jakub Jelinek <jakub at redhat.com>, 2006.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library 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
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <errno.h>
++#include <sysdep.h>
++#include <lowlevellock.h>
++#include <sys/time.h>
++#include <pthreadP.h>
++
++
++int
++__lll_robust_lock_wait (int *futex)
 +{
-+  struct __pthread_internal_slist *__next;
-+} __pthread_slist_t;
-+#endif
++  int oldval = *futex;
++  int tid = THREAD_GETMEM (THREAD_SELF, tid);
 +
++  do
++    {
++      if (__builtin_expect (oldval & FUTEX_OWNER_DIED, 0))
++	return oldval;
 +
- /* Data structures for mutex handling.  The structure of the attribute
-    type is deliberately not exposed.  */
- typedef union
-@@ -75,15 +89,14 @@ typedef union
-     int __kind;
- #if __WORDSIZE == 64
-     int __spins;
--    struct __pthread_mutex_s *__next;
--    struct __pthread_mutex_s *__prev;
-+    __pthread_list_t __list;
- # define __PTHREAD_MUTEX_HAVE_PREV	1
- #else
-     unsigned int __nusers;
-     __extension__ union
-     {
-       int __spins;
--      struct __pthread_mutex_s *__next;
-+      __pthread_slist_t __list;
-     };
- #endif
-   } __data;
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	9 Jan 2006 21:12:31 -0000	1.17
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.13.2.5
-@@ -57,6 +57,20 @@ typedef union
- } pthread_attr_t;
++      int newval = oldval | FUTEX_WAITERS;
++      if (oldval != newval
++	  && atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
++	continue;
++
++      lll_futex_wait (futex, newval);
++    }
++  while ((oldval = atomic_compare_and_exchange_val_acq (futex, tid, 0)) != 0);
++  return 0;
++}
++
++
++int
++__lll_robust_timedlock_wait (int *futex, const struct timespec *abstime)
++{
++  /* Reject invalid timeouts.  */
++  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
++    return EINVAL;
++
++  int tid = THREAD_GETMEM (THREAD_SELF, tid);
++
++  do
++    {
++      struct timeval tv;
++      struct timespec rt;
++
++      /* Get the current time.  */
++      (void) __gettimeofday (&tv, NULL);
++
++      /* Compute relative timeout.  */
++      rt.tv_sec = abstime->tv_sec - tv.tv_sec;
++      rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000;
++      if (rt.tv_nsec < 0)
++	{
++	  rt.tv_nsec += 1000000000;
++	  --rt.tv_sec;
++	}
++
++      /* Already timed out?  */
++      if (rt.tv_sec < 0)
++	return ETIMEDOUT;
++
++      /* Wait.  */
++      int oldval = *futex;
++      if (__builtin_expect (oldval & FUTEX_OWNER_DIED, 0))
++	return oldval;
++
++      int newval = oldval | FUTEX_WAITERS;
++      if (oldval != newval
++	  && atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
++	continue;
++
++      lll_futex_timed_wait (futex, newval, &rt);
++    }
++  while (atomic_compare_and_exchange_bool_acq (futex, tid, 0));
++
++  return 0;
++}
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h	8 Sep 2005 17:39:04 -0000	1.6
++++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h	17 Feb 2006 16:18:19 -0000	1.5.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -64,6 +64,15 @@
+     INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret : __ret;		      \
+   })
+ 
++#define lll_robust_mutex_dead(futexv) \
++  do									      \
++    {									      \
++      int *__futexp = &(futexv);					      \
++      atomic_or (__futexp, FUTEX_OWNER_DIED);				      \
++      lll_futex_wake (__futexp, 1);					      \
++    }									      \
++  while (0)
++
+ /* Returns non-zero if error happened, zero if success.  */
+ #define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val) \
+   ({									      \
+@@ -106,7 +115,16 @@ __lll_mutex_cond_trylock(int *futex)
+ #define lll_mutex_cond_trylock(lock)	__lll_mutex_cond_trylock (&(lock))
  
  
-+#if __WORDSIZE == 64
-+typedef struct __pthread_internal_list
-+{
-+  struct __pthread_internal_list *__prev;
-+  struct __pthread_internal_list *__next;
-+} __pthread_list_t;
-+#else
-+typedef struct __pthread_internal_slist
++static inline int __attribute__((always_inline))
++__lll_robust_mutex_trylock(int *futex, int id)
 +{
-+  struct __pthread_internal_slist *__next;
-+} __pthread_slist_t;
-+#endif
++  return atomic_compare_and_exchange_val_acq (futex, id, 0) != 0;
++}
++#define lll_robust_mutex_trylock(lock, id) \
++  __lll_robust_mutex_trylock (&(lock), id)
 +
+ extern void __lll_lock_wait (int *futex) attribute_hidden;
++extern int __lll_robust_lock_wait (int *futex) attribute_hidden;
+ 
+ static inline void __attribute__((always_inline))
+ __lll_mutex_lock(int *futex)
+@@ -117,6 +135,18 @@ __lll_mutex_lock(int *futex)
+ #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex))
+ 
+ 
++static inline int __attribute__ ((always_inline))
++__lll_robust_mutex_lock (int *futex, int id)
++{
++  int result = 0;
++  if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
++    result = __lll_robust_lock_wait (futex);
++  return result;
++}
++#define lll_robust_mutex_lock(futex, id) \
++  __lll_robust_mutex_lock (&(futex), id)
 +
- /* Data structures for mutex handling.  The structure of the attribute
-    type is not exposed on purpose.  */
- typedef union
-@@ -74,15 +88,14 @@ typedef union
-     int __kind;
- #if __WORDSIZE == 64
-     int __spins;
--    struct __pthread_mutex_s *__next;
--    struct __pthread_mutex_s *__prev;
-+    __pthread_list_t __list;
- # define __PTHREAD_MUTEX_HAVE_PREV	1
- #else
-     unsigned int __nusers;
-     __extension__ union
-     {
-       int __spins;
--      struct __pthread_mutex_s *__next;
-+      __pthread_slist_t __list;
-     };
- #endif
-   } __data;
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.14
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.10.2.5
-@@ -44,6 +44,12 @@ typedef union
- } pthread_attr_t;
++
+ static inline void __attribute__ ((always_inline))
+ __lll_mutex_cond_lock (int *futex)
+ {
+@@ -126,8 +156,14 @@ __lll_mutex_cond_lock (int *futex)
+ #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex))
  
  
-+typedef struct __pthread_internal_slist
++#define lll_robust_mutex_cond_lock(futex, id) \
++  __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS)
++
++
+ extern int __lll_timedlock_wait (int *futex, const struct timespec *)
+ 	attribute_hidden;
++extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *)
++	attribute_hidden;
+ 
+ static inline int __attribute__ ((always_inline))
+ __lll_mutex_timedlock (int *futex, const struct timespec *abstime)
+@@ -141,6 +177,19 @@ __lll_mutex_timedlock (int *futex, const
+   __lll_mutex_timedlock (&(futex), abstime)
+ 
+ 
++static inline int __attribute__ ((always_inline))
++__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime,
++			      int id)
 +{
-+  struct __pthread_internal_slist *__next;
-+} __pthread_slist_t;
++  int result = 0;
++  if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
++    result = __lll_robust_timedlock_wait (futex, abstime);
++  return result;
++}
++#define lll_robust_mutex_timedlock(futex, abstime, id) \
++  __lll_robust_mutex_timedlock (&(futex), abstime, id)
 +
 +
- /* Data structures for mutex handling.  The structure of the attribute
-    type is not exposed on purpose.  */
- typedef union
-@@ -60,7 +66,7 @@ typedef union
-     __extension__ union
-     {
-       int __spins;
--      struct __pthread_mutex_s *__next;
-+      __pthread_slist_t __list;
-     };
-   } __data;
-   char __size[__SIZEOF_PTHREAD_MUTEX_T];
---- glibc-20060213T0650/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	9 Jan 2006 23:38:27 -0000	1.11
-+++ glibc-20060213T0650-fedora/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	13 Feb 2006 08:21:21 -0000	1.7.2.5
-@@ -58,6 +58,20 @@ typedef union
- } pthread_attr_t;
- 
- 
-+#if __WORDSIZE == 64
-+typedef struct __pthread_internal_list
-+{
-+  struct __pthread_internal_list *__prev;
-+  struct __pthread_internal_list *__next;
-+} __pthread_list_t;
-+#else
-+typedef struct __pthread_internal_slist
+ static inline void __attribute__ ((always_inline))
+ __lll_mutex_unlock (int *futex)
+ {
+@@ -152,6 +201,16 @@ __lll_mutex_unlock (int *futex)
+ 
+ 
+ static inline void __attribute__ ((always_inline))
++__lll_robust_mutex_unlock (int *futex)
 +{
-+  struct __pthread_internal_slist *__next;
-+} __pthread_slist_t;
-+#endif
++  int val = atomic_exchange_rel (futex, 0);
++  if (__builtin_expect (val & FUTEX_WAITERS, 0))
++    lll_futex_wake (futex, 1);
++}
++#define lll_robust_mutex_unlock(futex) __lll_robust_mutex_unlock(&(futex))
 +
 +
- /* Data structures for mutex handling.  The structure of the attribute
-    type is deliberately not exposed.  */
- typedef union
-@@ -75,15 +89,14 @@ typedef union
-     int __kind;
- #if __WORDSIZE == 64
-     int __spins;
--    struct __pthread_mutex_s *__next;
--    struct __pthread_mutex_s *__prev;
-+    __pthread_list_t __list;
- # define __PTHREAD_MUTEX_HAVE_PREV	1
- #else
-     unsigned int __nusers;
-     __extension__ union
-     {
-       int __spins;
--      struct __pthread_mutex_s *__next;
-+      __pthread_slist_t __list;
-     };
++static inline void __attribute__ ((always_inline))
+ __lll_mutex_unlock_force (int *futex)
+ {
+   (void) atomic_exchange_rel (futex, 0);
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h	8 Sep 2005 17:39:05 -0000	1.18
++++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h	17 Feb 2006 16:18:19 -0000	1.17.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Jakub Jelinek <jakub at redhat.com>, 2003.
+ 
+@@ -55,6 +55,15 @@
+    _r10 == -1 ? -_retval : _retval;					\
+ })
+ 
++#define lll_robust_mutex_dead(futexv)					\
++do									\
++  {									\
++    int *__futexp = &(futexv);						\
++    atomic_or (__futexp, FUTEX_OWNER_DIED);				\
++    DO_INLINE_SYSCALL(futex, 3, (long) __futexp, FUTEX_WAKE, 1);	\
++  }									\
++while (0)
++
+ /* Returns non-zero if error happened, zero if success.  */
+ #define lll_futex_requeue(ftx, nr_wake, nr_move, mutex, val)		     \
+ ({									     \
+@@ -79,12 +88,19 @@
+ #define lll_mutex_trylock(futex) __lll_mutex_trylock (&(futex))
+ 
+ 
++#define __lll_robust_mutex_trylock(futex, id) \
++  (atomic_compare_and_exchange_val_acq (futex, id, 0) != 0)
++#define lll_robust_mutex_trylock(futex, id) \
++  __lll_robust_mutex_trylock (&(futex), id)
++
++
+ #define __lll_mutex_cond_trylock(futex) \
+   (atomic_compare_and_exchange_val_acq (futex, 2, 0) != 0)
+ #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex))
+ 
+ 
+ extern void __lll_lock_wait (int *futex) attribute_hidden;
++extern int __lll_robust_lock_wait (int *futex) attribute_hidden;
+ 
+ 
+ #define __lll_mutex_lock(futex)						\
+@@ -96,6 +112,18 @@ extern void __lll_lock_wait (int *futex)
+ #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex))
+ 
+ 
++#define __lll_robust_mutex_lock(futex, id)				\
++  ({									\
++    int *__futex = (futex);						\
++    int __val = 0;							\
++									\
++    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
++      __val = __lll_robust_lock_wait (__futex);				\
++    __val;								\
++  }))
++#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id)
++
++
+ #define __lll_mutex_cond_lock(futex)					\
+   ((void) ({								\
+     int *__futex = (futex);						\
+@@ -105,8 +133,24 @@ extern void __lll_lock_wait (int *futex)
+ #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex))
+ 
+ 
++#define __lll_robust_mutex_cond_lock(futex, id)				\
++  ({									\
++    int *__futex = (futex);						\
++    int __val = 0;							\
++    int __id = (id) | FUTEX_WAITERS;					\
++									\
++    if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0)	\
++      __val = __lll_robust_lock_wait (__futex);				\
++    __val;								\
++  }))
++#define lll_robust_mutex_cond_lock(futex, id) \
++  __lll_robust_mutex_cond_lock (&(futex), id)
++
++
+ extern int __lll_timedlock_wait (int *futex, const struct timespec *)
+      attribute_hidden;
++extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *)
++     attribute_hidden;
+ 
+ 
+ #define __lll_mutex_timedlock(futex, abstime)				\
+@@ -122,6 +166,19 @@ extern int __lll_timedlock_wait (int *fu
+   __lll_mutex_timedlock (&(futex), abstime)
+ 
+ 
++#define __lll_robust_mutex_timedlock(futex, abstime, id)		\
++  ({									\
++    int *__futex = (futex);						\
++    int __val = 0;							\
++									\
++    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
++      __val = __lll_robust_timedlock_wait (__futex, abstime);		\
++    __val;								\
++  }))
++#define lll_robust_mutex_timedlock(futex, abstime, id) \
++  __lll_robust_mutex_timedlock (&(futex), abstime, id)
++
++
+ #define __lll_mutex_unlock(futex)			\
+   ((void) ({						\
+     int *__futex = (futex);				\
+@@ -134,6 +191,18 @@ extern int __lll_timedlock_wait (int *fu
+   __lll_mutex_unlock(&(futex))
+ 
+ 
++#define __lll_robust_mutex_unlock(futex)		\
++  ((void) ({						\
++    int *__futex = (futex);				\
++    int __val = atomic_exchange_rel (__futex, 0);	\
++							\
++    if (__builtin_expect (__val & FUTEX_WAITERS, 0))	\
++      lll_futex_wake (__futex, 1);			\
++  }))
++#define lll_robust_mutex_unlock(futex) \
++  __lll_robust_mutex_unlock(&(futex))
++
++
+ #define __lll_mutex_unlock_force(futex)		\
+   ((void) ({					\
+     int *__futex = (futex);			\
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h	8 Sep 2005 17:39:06 -0000	1.20
++++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h	17 Feb 2006 16:18:19 -0000	1.18.2.3
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Paul Mackerras <paulus at au.ibm.com>, 2003.
+ 
+@@ -69,6 +69,17 @@
+     INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret;		      \
+   })
+ 
++#define lll_robust_mutex_dead(futexv) \
++  do									      \
++    {									      \
++      INTERNAL_SYSCALL_DECL (__err);					      \
++      int *__futexp = &(futexv);					      \
++									      \
++      atomic_or (__futexp, FUTEX_OWNER_DIED);				      \
++      INTERNAL_SYSCALL (futex, __err, 4, __futexp, FUTEX_WAKE, 1, 0);	      \
++    }									      \
++  while (0)
++
+ /* Returns non-zero if error happened, zero if success.  */
+ #define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val) \
+   ({									      \
+@@ -102,8 +113,8 @@
+ # define __lll_rel_instr	"sync"
  #endif
-   } __data;
---- glibc-20060213T0650/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
-+++ glibc-20060213T0650-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
+ 
+-/* Set *futex to 1 if it is 0, atomically.  Returns the old value */
+-#define __lll_trylock(futex) \
++/* Set *futex to ID if it is 0, atomically.  Returns the old value */
++#define __lll_robust_trylock(futex, id) \
+   ({ int __val;								      \
+      __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
+ 		       "	cmpwi	0,%0,0\n"			      \
+@@ -112,31 +123,26 @@
+ 		       "	bne-	1b\n"				      \
+ 		       "2:	" __lll_acq_instr			      \
+ 		       : "=&r" (__val), "=m" (*futex)			      \
+-		       : "r" (futex), "r" (1), "m" (*futex)		      \
++		       : "r" (futex), "r" (id), "m" (*futex)		      \
+ 		       : "cr0", "memory");				      \
+      __val;								      \
+   })
+ 
++#define lll_robust_mutex_trylock(lock, id) __lll_robust_trylock (&(lock), id)
++
++/* Set *futex to 1 if it is 0, atomically.  Returns the old value */
++#define __lll_trylock(futex) __lll_robust_trylock (futex, 1)
++
+ #define lll_mutex_trylock(lock)	__lll_trylock (&(lock))
+ 
+ /* Set *futex to 2 if it is 0, atomically.  Returns the old value */
+-#define __lll_cond_trylock(futex) \
+-  ({ int __val;								      \
+-     __asm __volatile ("1:	lwarx	%0,0,%2\n"			      \
+-		       "	cmpwi	0,%0,0\n"			      \
+-		       "	bne	2f\n"				      \
+-		       "	stwcx.	%3,0,%2\n"			      \
+-		       "	bne-	1b\n"				      \
+-		       "2:	" __lll_acq_instr			      \
+-		       : "=&r" (__val), "=m" (*futex)			      \
+-		       : "r" (futex), "r" (2), "m" (*futex)		      \
+-		       : "cr0", "memory");				      \
+-     __val;								      \
+-  })
++#define __lll_cond_trylock(futex) __lll_robust_trylock (futex, 2)
++
+ #define lll_mutex_cond_trylock(lock)	__lll_cond_trylock (&(lock))
+ 
+ 
+ extern void __lll_lock_wait (int *futex) attribute_hidden;
++extern int __lll_robust_lock_wait (int *futex) attribute_hidden;
+ 
+ #define lll_mutex_lock(lock) \
+   (void) ({								      \
+@@ -146,6 +152,16 @@ extern void __lll_lock_wait (int *futex)
+       __lll_lock_wait (__futex);					      \
+   })
+ 
++#define lll_robust_mutex_lock(lock, id) \
++  ({									      \
++    int *__futex = &(lock);						      \
++    int __val = 0;							      \
++    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
++								0), 0))	      \
++      __val = __lll_robust_lock_wait (__futex);				      \
++    __val;								      \
++  })
++
+ #define lll_mutex_cond_lock(lock) \
+   (void) ({								      \
+     int *__futex = &(lock);						      \
+@@ -154,8 +170,22 @@ extern void __lll_lock_wait (int *futex)
+       __lll_lock_wait (__futex);					      \
+   })
+ 
++#define lll_robust_mutex_cond_lock(lock, id) \
++  ({									      \
++    int *__futex = &(lock);						      \
++    int __val = 0;							      \
++    int __id = id | FUTEX_WAITERS;					      \
++    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, __id,\
++								0), 0))	      \
++      __val = __lll_robust_lock_wait (__futex);				      \
++    __val;								      \
++  })
++
++
+ extern int __lll_timedlock_wait
+   (int *futex, const struct timespec *) attribute_hidden;
++extern int __lll_robust_timedlock_wait
++  (int *futex, const struct timespec *) attribute_hidden;
+ 
+ #define lll_mutex_timedlock(lock, abstime) \
+   ({									      \
+@@ -167,6 +197,16 @@ extern int __lll_timedlock_wait
+     __val;								      \
+   })
+ 
++#define lll_robust_mutex_timedlock(lock, abstime, id) \
++  ({									      \
++    int *__futex = &(lock);						      \
++    int __val = 0;							      \
++    if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id,  \
++								0), 0))	      \
++      __val = __lll_robust_timedlock_wait (__futex, abstime);		      \
++    __val;								      \
++  })
++
+ #define lll_mutex_unlock(lock) \
+   ((void) ({								      \
+     int *__futex = &(lock);						      \
+@@ -175,6 +215,14 @@ extern int __lll_timedlock_wait
+       lll_futex_wake (__futex, 1);					      \
+   }))
+ 
++#define lll_robust_mutex_unlock(lock) \
++  ((void) ({								      \
++    int *__futex = &(lock);						      \
++    int __val = atomic_exchange_rel (__futex, 0);			      \
++    if (__builtin_expect (__val & FUTEX_WAITERS, 0))			      \
++      lll_futex_wake (__futex, 1);					      \
++  }))
++
+ #define lll_mutex_unlock_force(lock) \
+   ((void) ({								      \
+     int *__futex = &(lock);						      \
+--- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h	8 Sep 2005 17:39:06 -0000	1.13
++++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h	17 Feb 2006 16:18:21 -0000	1.12.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Martin Schwidefsky <schwidefsky at de.ibm.com>, 2003.
+ 
+@@ -85,6 +85,17 @@
+   })
+ 
+ 
++#define lll_robust_mutex_dead(futexv) \
++  do									      \
++    {									      \
++      int *__futexp = &(futexv);					      \
++									      \
++      atomic_or (__futexp, FUTEX_OWNER_DIED);				      \
++      lll_futex_wake (__futexp, 1);					      \
++    }									      \
++  while (0)
++
++
+ /* Returns non-zero if error happened, zero if success.  */
+ #define lll_futex_requeue(futex, nr_wake, nr_move, mutex, val) \
+   ({									      \
+@@ -167,7 +178,23 @@ __lll_mutex_cond_trylock (int *futex)
+ #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex))
+ 
+ 
++static inline int
++__attribute__ ((always_inline))
++__lll_robust_mutex_trylock (int *futex, int id)
++{
++    unsigned int old;
++
++    __asm __volatile ("cs %0,%3,%1"
++		       : "=d" (old), "=Q" (*futex)
++		       : "0" (0), "d" (id), "m" (*futex) : "cc", "memory" );
++    return old != 0;
++}
++#define lll_robust_mutex_trylock(futex, id) \
++  __lll_robust_mutex_trylock (&(futex), id)
++
++
+ extern void __lll_lock_wait (int *futex) attribute_hidden;
++extern int __lll_robust_lock_wait (int *futex) attribute_hidden;
+ 
+ static inline void
+ __attribute__ ((always_inline))
+@@ -178,6 +205,17 @@ __lll_mutex_lock (int *futex)
+ }
+ #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex))
+ 
++static inline int
++__attribute__ ((always_inline))
++__lll_robust_mutex_lock (int *futex, int id)
++{
++  int result = 0;
++  if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
++    result = __lll_robust_lock_wait (futex);
++  return result;
++}
++#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id)
++
+ static inline void
+ __attribute__ ((always_inline))
+ __lll_mutex_cond_lock (int *futex)
+@@ -187,8 +225,13 @@ __lll_mutex_cond_lock (int *futex)
+ }
+ #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex))
+ 
++#define lll_robust_mutex_cond_lock(futex, id) \
++  __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS)
++
+ extern int __lll_timedlock_wait
+   (int *futex, const struct timespec *) attribute_hidden;
++extern int __lll_robust_timedlock_wait
++  (int *futex, const struct timespec *) attribute_hidden;
+ 
+ static inline int
+ __attribute__ ((always_inline))
+@@ -202,6 +245,19 @@ __lll_mutex_timedlock (int *futex, const
+ #define lll_mutex_timedlock(futex, abstime) \
+   __lll_mutex_timedlock (&(futex), abstime)
+ 
++static inline int
++__attribute__ ((always_inline))
++__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime,
++			      int id)
++{
++  int result = 0;
++  if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
++    result = __lll_robust_timedlock_wait (futex, abstime);
++  return result;
++}
++#define lll_robust_mutex_timedlock(futex, abstime, id) \
++  __lll_robust_mutex_timedlock (&(futex), abstime, id)
++
+ 
+ static inline void
+ __attribute__ ((always_inline))
+@@ -220,6 +276,21 @@ __lll_mutex_unlock (int *futex)
+ 
+ static inline void
+ __attribute__ ((always_inline))
++__lll_robust_mutex_unlock (int *futex)
++{
++  int oldval;
++  int newval = 0;
++
++  lll_compare_and_swap (futex, oldval, newval, "slr %2,%2");
++  if (oldval & FUTEX_WAITERS)
++    lll_futex_wake (futex, 1);
++}
++#define lll_robust_mutex_unlock(futex) \
++  __lll_robust_mutex_unlock(&(futex))
++
++
++static inline void
++__attribute__ ((always_inline))
+ __lll_mutex_unlock_force (int *futex)
+ {
+   *futex = 0;
+--- glibc-20060217T1609/nscd/connections.c	3 Jan 2006 21:26:28 -0000	1.82
++++ glibc-20060217T1609-fedora/nscd/connections.c	4 Jan 2006 07:58:21 -0000	1.55.2.19
 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void)
        exit (4);
      }
@@ -1443,8 +1905,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20060213T0650/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
-+++ glibc-20060213T0650-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
+--- glibc-20060217T1609/nscd/nscd.c	1 Jan 2006 19:15:56 -0000	1.51
++++ glibc-20060217T1609-fedora/nscd/nscd.c	2 Jan 2006 10:52:53 -0000	1.38.2.11
 @@ -119,6 +119,9 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1463,8 +1925,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20060213T0650/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20060213T0650-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20060217T1609/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20060217T1609-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
 @@ -32,8 +32,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1476,8 +1938,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20060213T0650/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20060213T0650-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20060217T1609/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20060217T1609-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
@@ -1518,8 +1980,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20060213T0650/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
-+++ glibc-20060213T0650-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
+--- glibc-20060217T1609/nscd/selinux.c	29 Dec 2005 00:44:09 -0000	1.6
++++ glibc-20060217T1609-fedora/nscd/selinux.c	2 Jan 2006 10:52:53 -0000	1.1.2.6
 @@ -147,7 +147,7 @@ audit_init (void)
    if (audit_fd < 0
        /* If kernel doesn't support audit, bail out */
@@ -1529,8 +1991,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20060213T0650/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
-+++ glibc-20060213T0650-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
+--- glibc-20060217T1609/posix/Makefile	8 Jan 2006 09:39:15 -0000	1.188
++++ glibc-20060217T1609-fedora/posix/Makefile	9 Jan 2006 21:55:00 -0000	1.171.2.16
 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1564,8 +2026,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20060213T0650/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20060217T1609/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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 =
@@ -1582,8 +2044,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20060213T0650/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20060213T0650-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20060217T1609/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20060217T1609-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
@@ -1599,8 +2061,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-20060213T0650/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20060213T0650-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20060217T1609/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20060217T1609-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))
@@ -1612,8 +2074,8 @@
  endif
  endif
  
---- glibc-20060213T0650/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20060213T0650-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20060217T1609/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20060217T1609-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.  */
@@ -1965,8 +2427,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20060213T0650/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060217T1609/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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.
@@ -2052,8 +2514,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20060213T0650/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20060213T0650-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20060217T1609/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20060217T1609-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);
      }
@@ -2068,8 +2530,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	9 Jan 2006 21:55:08 -0000	1.14.2.8
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Jan 2006 08:21:15 -0000	1.22
++++ glibc-20060217T1609-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.  */
  
@@ -2118,8 +2580,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20060217T1609-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;
@@ -2162,8 +2624,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20060217T1609-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"
@@ -2173,8 +2635,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20060217T1609-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;
@@ -2220,8 +2682,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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.
@@ -2282,8 +2744,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20060217T1609-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)
@@ -2316,71 +2778,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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-20060213T0650/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20060217T1609-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-20060213T0650/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20060213T0650-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20060217T1609-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/nptl/descr.h	2006-02-13 07:51:37.000000000 +0100
-+++ libc/nptl/descr.h	2006-02-13 10:17:59.000000000 +0100
-@@ -166,7 +166,7 @@ struct pthread
-   do {									      \
-     __pthread_slist_t *runp = THREAD_GETMEM (THREAD_SELF, robust_list.__next);\
-     if (runp == &mutex->__data.__list)					      \
--      THREAD_SETMEM (THREAD_SELF, robust_list, runp->__next);		      \
-+      THREAD_SETMEM (THREAD_SELF, robust_list.__next, runp->__next);	      \
-     else								      \
-       {									      \
- 	while (runp->__next != &mutex->__data.__list)			      \
---- libc/sysdeps/unix/sysv/linux/not-cancel.h	13 Feb 2006 07:30:05 -0000	1.5.2.1
-+++ libc/sysdeps/unix/sysv/linux/not-cancel.h	13 Feb 2006 09:39:09 -0000
-@@ -28,18 +28,26 @@
-    INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
- 
- /* Uncancelable openat.  */
--extern int __openat_not_cancel (int fd, const char *fname, int oflag,
-+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
-+extern int __openat_nocancel (int fd, const char *fname, int oflag,
-+			      mode_t mode) attribute_hidden;
-+extern int __openat64_nocancel (int fd, const char *fname, int oflag,
- 				mode_t mode) attribute_hidden;
-+#else
-+# define __openat_nocancel(fd, fname, oflag, mode) \
-+  openat (fd, fname, oflag, mode)
-+# define __openat64_nocancel(fd, fname, oflag, mode) \
-+  openat64 (fd, fname, oflag, mode)
-+#endif
-+
- #define openat_not_cancel(fd, fname, oflag, mode) \
--  __openat_not_cancel (fd, fname, oflag, mode)
-+  __openat_nocancel (fd, fname, oflag, mode)
- #define openat_not_cancel_3(fd, fname, oflag) \
--  __openat_not_cancel (fd, fname, oflag, 0)
--extern int __openat64_not_cancel (int fd, const char *fname, int oflag,
--				  mode_t mode) attribute_hidden;
-+  __openat_nocancel (fd, fname, oflag, 0)
- #define openat64_not_cancel(fd, fname, oflag, mode) \
--  __openat64_not_cancel (fd, fname, oflag, mode)
-+  __openat64_nocancel (fd, fname, oflag, mode)
- #define openat64_not_cancel_3(fd, fname, oflag) \
--  __openat64_not_cancel (fd, fname, oflag, 0)
-+  __openat64_nocancel (fd, fname, oflag, 0)
- 
- /* Uncancelable close.  */
- #define close_not_cancel(fd) \


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- glibc.spec	13 Feb 2006 09:06:50 -0000	1.222
+++ glibc.spec	17 Feb 2006 16:35:20 -0000	1.223
@@ -1,9 +1,9 @@
-%define glibcdate 20060213T0650
+%define glibcdate 20060217T1609
 %define glibcname glibc
-%define glibcsrcdir glibc-20060213T0650
+%define glibcsrcdir glibc-20060217T1609
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 37
+%define glibcrelease 38
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -631,10 +631,6 @@
 #undef __NR_newfstatat
 #undef __NR_fstatat64
 %endif
-%ifarch s390 s390x
-/* FIXME: Handle pselect6 on s390/s390x.  */
-#undef __NR_pselect6
-%endif
 #endif
 EOF
 cat > override_headers/asm/errno.h <<EOF
@@ -1341,6 +1337,10 @@
 %endif
 
 %changelog
+* Fri Feb 17 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-38
+- update from CVS
+  - robust mutexes rewrite
+
 * Mon Feb 13 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-37
 - update from CVS
   - *at fixes


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- sources	13 Feb 2006 07:56:52 -0000	1.160
+++ sources	17 Feb 2006 16:35:21 -0000	1.161
@@ -1,2 +1,2 @@
-3890e2c531cd1703fdb4380270c0cd4d  glibc-20060213T0650.tar.bz2
-fdd94d9838442e2aa66ee81750f1d4aa  glibc-fedora-20060213T0650.tar.bz2
+febd796b074b3b97004e3714f8ea27db  glibc-20060217T1609.tar.bz2
+57911b3ed8d1af371b288d2cf55be3db  glibc-fedora-20060217T1609.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 17 16:39:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 11:39:49 -0500
Subject: rpms/glibc/devel glibc.spec,1.223,1.224
Message-ID: <200602171639.k1HGdnit019761@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19747

Modified Files:
	glibc.spec 
Log Message:
2.3.90-38



Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- glibc.spec	17 Feb 2006 16:35:20 -0000	1.223
+++ glibc.spec	17 Feb 2006 16:39:46 -0000	1.224
@@ -631,6 +631,10 @@
 #undef __NR_newfstatat
 #undef __NR_fstatat64
 %endif
+%ifarch s390 s390x
+/* FIXME: Handle pselect6 on s390/s390x.  */
+#undef __NR_pselect6
+%endif
 #endif
 EOF
 cat > override_headers/asm/errno.h <<EOF



From fedora-cvs-commits at redhat.com  Fri Feb 17 16:57:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 11:57:18 -0500
Subject: rpms/sendmail/devel sendmail-8.13.4-libmilter-sigwait.patch, NONE,
	1.1 sendmail-redhat.mc, 1.13, 1.14 sendmail.init, 1.13,
	1.14 sendmail.spec, 1.64, 1.65
Message-ID: <200602171657.k1HGvIat009629@cvs.devel.redhat.com>

Author: twoerner

Update of /cvs/dist/rpms/sendmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9552

Modified Files:
	sendmail-redhat.mc sendmail.init sendmail.spec 
Added Files:
	sendmail-8.13.4-libmilter-sigwait.patch 
Log Message:
[tw]
- fixed selinuxenabled path in initscript
- fixed error handling with sigwait (#137709)
  Thanks to Jonathan Kamens for the patch
- fixed prereq for cyrus-sasl: now using /usr/sbin/saslauthd
- appended 'dnl' to cert tags in sendmail.mc



sendmail-8.13.4-libmilter-sigwait.patch:
 signal.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

--- NEW FILE sendmail-8.13.4-libmilter-sigwait.patch ---
--- libmilter/signal.c.sigwait	2004-08-20 17:10:30.000000000 -0400
+++ libmilter/signal.c	2005-05-29 01:24:28.000000000 -0400
@@ -90,7 +90,7 @@
 mi_signal_thread(name)
 	void *name;
 {
-	int sig, errs;
+	int sig, errs, ret;
 	sigset_t set;
 
 	(void) sigemptyset(&set);
@@ -107,15 +107,18 @@
 #if defined(SOLARIS) || defined(__svr5__)
 		if ((sig = sigwait(&set)) < 0)
 #else /* defined(SOLARIS) || defined(__svr5__) */
-		if (sigwait(&set, &sig) != 0)
+		if ((ret = sigwait(&set, &sig)) != 0)
 #endif /* defined(SOLARIS) || defined(__svr5__) */
 		{
 			/* this can happen on OSF/1 (at least) */
-			if (errno == EINTR)
+			/* sigwait returns errno on some Linux
+			   versions, contrary to its documentation and
+			   the spec. */
+			if (errno == EINTR || (! errno && (ret == EINTR)))
 				continue;
 			smi_log(SMI_LOG_ERR,
-				"%s: sigwait returned error: %d",
-				(char *)name, errno);
+				"%s: sigwait returned error: %d (retval %d)",
+				(char *)name, errno, ret);
 			if (++errs > MAX_FAILS_T)
 			{
 				mi_stop_milters(MILTER_ABRT);


Index: sendmail-redhat.mc
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail-redhat.mc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sendmail-redhat.mc	6 May 2005 12:29:19 -0000	1.13
+++ sendmail-redhat.mc	17 Feb 2006 16:57:15 -0000	1.14
@@ -53,10 +53,10 @@
 dnl # Complete usage:
 dnl #     make -C /usr/share/ssl/certs usage
 dnl #
-dnl define(`confCACERT_PATH',`/etc/pki/tls/certs')
-dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')
-dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')
-dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')
+dnl define(`confCACERT_PATH',`/etc/pki/tls/certs')dnl
+dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')dnl
+dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')dnl
+dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')dnl
 dnl #
 dnl # This allows sendmail to use a keyfile that is shared with OpenLDAP's
 dnl # slapd, which requires the file to be readble by group ldap


Index: sendmail.init
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sendmail.init	9 Sep 2004 12:27:14 -0000	1.13
+++ sendmail.init	17 Feb 2006 16:57:15 -0000	1.14
@@ -58,7 +58,7 @@
 	echo -n $"Starting sm-client: "
 	touch /var/run/sm-client.pid
 	chown smmsp:smmsp /var/run/sm-client.pid
-	if [ -x /usr/bin/selinuxenabled ] && /usr/bin/selinuxenabled; then
+	if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
 	    /sbin/restorecon /var/run/sm-client.pid
 	fi
 	daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \


Index: sendmail.spec
===================================================================
RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sendmail.spec	11 Feb 2006 05:40:55 -0000	1.64
+++ sendmail.spec	17 Feb 2006 16:57:15 -0000	1.65
@@ -18,7 +18,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.13.5
-Release: 2.2.1
+Release: 3
 License: Sendmail
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -42,6 +42,7 @@
 Patch10: sendmail-8.12.7-manpage.patch
 Patch11: sendmail-8.13.4-dynamic.patch
 Patch12: sendmail-8.13.0-cyrus.patch
+Patch13: sendmail-8.13.4-libmilter-sigwait.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: tcp_wrappers
 BuildRequires: db4-devel
@@ -70,7 +71,7 @@
 %endif
 %if "%{with_sasl1}" == "yes" || "%{with_sasl2}" == "yes"
 BuildRequires:  cyrus-sasl-devel, openssl-devel
-PreReq:       cyrus-sasl, openssl
+PreReq:       /usr/sbin/saslauthd, openssl
 %endif
 %if "%{with_ldap}" == "yes"
 BuildRequires:  openldap-devel, openssl-devel
@@ -136,6 +137,7 @@
 %patch10 -p1 -b .manpage
 %patch11 -p1 -b .dynamic
 %patch12 -p1 -b .cyrus
+%patch13 -p0 -b .libmilter-sigwait
 
 %build
 # generate redhat config file
@@ -156,6 +158,11 @@
 define(\`confLIBSEARCH', \`db resolv 44bsd')
 EOF
 
+# block mail from http proxies
+#cat >> redhat.config.m4 << EOF
+#APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_BLOCK_PROXIES')
+#EOF
+
 %ifarch ppc ppc64 s390x
 cat >> redhat.config.m4 << EOF
 APPENDDEF(\`confOPTIMIZE', \`-DSM_CONF_SHM=0')
@@ -572,6 +579,13 @@
 %{_docdir}/sendmail
 
 %changelog
+* Fri Feb 17 2006 Thomas Woerner <twoerner at redhat.com> 8.13.5-3
+- fixed selinuxenabled path in initscript
+- fixed error handling with sigwait (#137709)
+  Thanks to Jonathan Kamens for the patch
+- fixed prereq for cyrus-sasl: now using /usr/sbin/saslauthd
+- appended 'dnl' to cert tags in sendmail.mc
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.13.5-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:01:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:01:21 -0500
Subject: rpms/glibc/devel glibc-fedora.patch,1.135,1.136
Message-ID: <200602171701.k1HH1L7a010586@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10476

Modified Files:
	glibc-fedora.patch 
Log Message:
2.3.90-38


glibc-fedora.patch:
 ChangeLog                                           |   72 ++++
 ChangeLog.11                                        |   21 +
 ChangeLog.12                                        |   12 
 ChangeLog.15                                        |   45 ++
 csu/elf-init.c                                      |   17 
 debug/tst-chk1.c                                    |    7 
 elf/ldconfig.c                                      |   38 +-
 elf/tst-stackguard1.c                               |    8 
 iconv/iconvconfig.c                                 |   55 +--
 include/atomic.h                                    |   37 ++
 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 -
 manual/filesys.texi                                 |    2 
 nptl/ChangeLog                                      |   31 +
 nptl/Makefile                                       |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h   |   62 +++
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h    |   71 ++++
 nptl/sysdeps/unix/sysv/linux/kernel-features.h      |    6 
 nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c   |   95 +++++
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h |   82 +++-
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h    |   73 ++++
 nptl/tst-stackguard1.c                              |    8 
 nscd/connections.c                                  |   15 
 nscd/nscd.c                                         |    4 
 nscd/nscd.conf                                      |    4 
 nscd/nscd.init                                      |   19 -
 nscd/selinux.c                                      |    2 
 posix/Makefile                                      |   19 -
 posix/getconf.speclist.h                            |   15 
 sysdeps/generic/dl-cache.h                          |    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, 1201 insertions(+), 489 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- glibc-fedora.patch	17 Feb 2006 16:35:19 -0000	1.135
+++ glibc-fedora.patch	17 Feb 2006 17:00:52 -0000	1.136
@@ -1466,17 +1466,18 @@
  static inline void __attribute__ ((always_inline))
  __lll_mutex_unlock (int *futex)
  {
-@@ -152,6 +201,16 @@ __lll_mutex_unlock (int *futex)
+@@ -152,6 +201,17 @@ __lll_mutex_unlock (int *futex)
  
  
  static inline void __attribute__ ((always_inline))
-+__lll_robust_mutex_unlock (int *futex)
++__lll_robust_mutex_unlock (int *futex, int mask)
 +{
 +  int val = atomic_exchange_rel (futex, 0);
-+  if (__builtin_expect (val & FUTEX_WAITERS, 0))
++  if (__builtin_expect (val & mask, 0))
 +    lll_futex_wake (futex, 1);
 +}
-+#define lll_robust_mutex_unlock(futex) __lll_robust_mutex_unlock(&(futex))
++#define lll_robust_mutex_unlock(futex) \
++  __lll_robust_mutex_unlock(&(futex), FUTEX_WAITERS)
 +
 +
 +static inline void __attribute__ ((always_inline))
@@ -1866,17 +1867,17 @@
  
  static inline void
  __attribute__ ((always_inline))
-+__lll_robust_mutex_unlock (int *futex)
++__lll_robust_mutex_unlock (int *futex, int mask)
 +{
 +  int oldval;
 +  int newval = 0;
 +
 +  lll_compare_and_swap (futex, oldval, newval, "slr %2,%2");
-+  if (oldval & FUTEX_WAITERS)
++  if (oldval & mask)
 +    lll_futex_wake (futex, 1);
 +}
 +#define lll_robust_mutex_unlock(futex) \
-+  __lll_robust_mutex_unlock(&(futex))
++  __lll_robust_mutex_unlock(&(futex), FUTEX_WAITERS)
 +
 +
 +static inline void



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:21:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:21:22 -0500
Subject: rpms/glibc/devel glibc-fedora.patch,1.136,1.137
Message-ID: <200602171721.k1HHLM0G030181@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30056

Modified Files:
	glibc-fedora.patch 
Log Message:
2.3.90-38


glibc-fedora.patch:
 ChangeLog                                           |   72 ++++
 ChangeLog.11                                        |   21 +
 ChangeLog.12                                        |   12 
 ChangeLog.15                                        |   45 ++
 csu/elf-init.c                                      |   17 
 debug/tst-chk1.c                                    |    7 
 elf/ldconfig.c                                      |   38 +-
 elf/tst-stackguard1.c                               |    8 
 iconv/iconvconfig.c                                 |   55 +--
 include/atomic.h                                    |   37 ++
 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 -
 manual/filesys.texi                                 |    2 
 nptl/ChangeLog                                      |   31 +
 nptl/Makefile                                       |    8 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h   |   62 +++
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h    |   71 ++++
 nptl/sysdeps/unix/sysv/linux/kernel-features.h      |    6 
 nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c   |   95 +++++
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h |   82 +++-
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h    |   73 ++++
 nptl/tst-stackguard1.c                              |    8 
 nscd/connections.c                                  |   15 
 nscd/nscd.c                                         |    4 
 nscd/nscd.conf                                      |    4 
 nscd/nscd.init                                      |   19 -
 nscd/selinux.c                                      |    2 
 posix/Makefile                                      |   19 -
 posix/getconf.speclist.h                            |   15 
 sysdeps/generic/dl-cache.h                          |    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, 1201 insertions(+), 489 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- glibc-fedora.patch	17 Feb 2006 17:00:52 -0000	1.136
+++ glibc-fedora.patch	17 Feb 2006 17:21:19 -0000	1.137
@@ -1540,7 +1540,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
 +      __val = __lll_robust_lock_wait (__futex);				\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id)
 +
 +
@@ -1560,7 +1560,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0)	\
 +      __val = __lll_robust_lock_wait (__futex);				\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_cond_lock(futex, id) \
 +  __lll_robust_mutex_cond_lock (&(futex), id)
 +
@@ -1584,7 +1584,7 @@
 +    if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0)	\
 +      __val = __lll_robust_timedlock_wait (__futex, abstime);		\
 +    __val;								\
-+  }))
++  })
 +#define lll_robust_mutex_timedlock(futex, abstime, id) \
 +  __lll_robust_mutex_timedlock (&(futex), abstime, id)
 +



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:32:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:32:40 -0500
Subject: rpms/avahi/devel avahi-0.6.7-initscript.patch,NONE,1.1
Message-ID: <200602171732.k1HHWe4P001439@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1413

Added Files:
	avahi-0.6.7-initscript.patch 
Log Message:
avahi-dnsconfd initscript fixes

avahi-0.6.7-initscript.patch:
 avahi-dnsconfd.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE avahi-0.6.7-initscript.patch ---
--- avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in.initscript	2006-02-09 16:55:06.000000000 -0500
+++ avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in	2006-02-17 12:16:10.000000000 -0500
@@ -23,7 +23,7 @@
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 test -x $AVAHI_BIN || exit 5
 
-LOCKFILE=/var/lock/subsys/avahi-daemon
+LOCKFILE=/var/lock/subsys/avahi-dnsconfd
 
 start() {
 	echo -n $"Starting Avahi DNS daemon... "
@@ -40,7 +40,7 @@
 }
 
 stop() {
-        echo -n "Shutting down Avahi DNS daemon: "
+        echo -n $"Shutting down Avahi DNS daemon: "
         $AVAHI_BIN -k
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
@@ -50,7 +50,7 @@
 }
 
 reload() {
-        echo -n "Reloading Avahi DNS daemon... "
+        echo -n $"Reloading Avahi DNS daemon... "
         $AVAHI_BIN -r
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
@@ -76,7 +76,7 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
+	[ $? = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
 	;;
   restart)
 	restart



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:38:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:38:44 -0500
Subject: rpms/avahi/devel avahi-0.6.7-initscript.patch,1.1,1.2
Message-ID: <200602171738.k1HHciax003263@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3231

Modified Files:
	avahi-0.6.7-initscript.patch 
Log Message:
avahi-dnsconfd initscript fixes

avahi-0.6.7-initscript.patch:
 avahi-dnsconfd.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: avahi-0.6.7-initscript.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.7-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.7-initscript.patch	17 Feb 2006 17:32:25 -0000	1.1
+++ avahi-0.6.7-initscript.patch	17 Feb 2006 17:38:41 -0000	1.2
@@ -1,5 +1,14 @@
 --- avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in.initscript	2006-02-09 16:55:06.000000000 -0500
-+++ avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in	2006-02-17 12:16:10.000000000 -0500
++++ avahi-0.6.7/initscript/fedora/avahi-dnsconfd.in	2006-02-17 12:33:03.000000000 -0500
+@@ -2,7 +2,7 @@
+ #
+ # avahi-daemon:       Starts the Avahi dns configuration daemon
+ #
+-# chkconfig: - 34 98 02
++# chkconfig: - 98 02
+ # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
+ #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
+ #       on the local LAN. This is useful for configuring unicast DNS servers in
 @@ -23,7 +23,7 @@
  AVAHI_BIN=@sbindir@/avahi-dnsconfd
  test -x $AVAHI_BIN || exit 5



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:39:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:39:34 -0500
Subject: rpms/avahi/devel .cvsignore, 1.8, 1.9 avahi.spec, 1.40, 1.41 sources,
	1.8, 1.9
Message-ID: <200602171739.k1HHdY2W003679@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3647

Modified Files:
	.cvsignore avahi.spec sources 
Log Message:
upgrade to 0.6.7; fix avahi-dnsconfd initscript


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Feb 2006 23:04:20 -0000	1.8
+++ .cvsignore	17 Feb 2006 17:39:31 -0000	1.9
@@ -5,3 +5,4 @@
 avahi-0.6.4.tar.gz
 avahi-0.6.5.tar.gz
 avahi-0.6.6.tar.gz
+avahi-0.6.7.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- avahi.spec	17 Feb 2006 16:28:13 -0000	1.40
+++ avahi.spec	17 Feb 2006 17:39:31 -0000	1.41
@@ -3,8 +3,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.6
-Release: 	4
+Version:        0.6.7
+Release: 	1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -29,6 +29,7 @@
 Patch9: 	avahi-0.6.4-localtime.patch
 Patch10:	avahi-0.6.4-bz178784.patch
 Patch11:        avahi-0.6.5-bz179448.patch
+Patch12:	avahi-0.6.7-initscript.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -115,19 +116,28 @@
 %setup -q
 #%patch1 -p1 -b .fedora
 #^- this patch now upstream
-%patch2 -p1 -b .start_after_dbus
-%patch3 -p1 -b .initscript_status
+#%patch2 -p1 -b .start_after_dbus
+#^- this patch now upstream
+#%patch3 -p1 -b .initscript_status
+#^- this patch now upstream
 #%patch4 -p1 -b .dbus-0.6
 #^- this patch now upstream
-%patch5 -p1 -b .bz177148
+#%patch5 -p1 -b .bz177148
+#^- this patch now upstream
 %if %{WITH_MONO}
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
-%patch7 -p1 -b .i18n
-%patch8 -p1 -b .lockfile
-%patch9 -p1 -b .localtime
-%patch10 -p1 -b .bz178746
-%patch11 -p1 -b .bz179448
+#%patch7 -p1 -b .i18n
+#^- this patch now upstream
+#%patch8 -p1 -b .lockfile
+#^- this patch now upstream
+#%patch9 -p1 -b .localtime
+#^- this patch now upstream
+#%patch10 -p1 -b .bz178746
+#^- this patch now upstream
+#%patch11 -p1 -b .bz179448
+#^- this patch now upstream
+%patch12 -p1 -b .initscript
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -192,6 +202,11 @@
    # if user has not configured avahi service at all 
 	/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
    fi;
+   if ! /sbin/chkconfig --list avahi-dnsconfd >/dev/null 2>&1 ; then
+   # avahi-dnsconfd NOT run by default in any runlevel; add it
+   # so system-config-services can see it
+	/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1
+   fi;
 #  We should realy make dbus reload the system.d config here. Dunno how though.
 #  kill -HUP `cat /var/run/messagebus.pid` ? 
    if [ -s /etc/localtime ]; then
@@ -207,6 +222,7 @@
 #  so it got started AFTER messagebus ( 97 ) and was unable to start.
 #  It now has 'chkconfig: 345 98 02'.
    /sbin/service avahi-daemon condrestart >/dev/null 2>&1
+   /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
 fi;
 
 %postun -p /sbin/ldconfig
@@ -215,6 +231,8 @@
 if [ "$1" -eq 0 ]; then
     service avahi-daemon stop > /dev/null 2>&1
     /sbin/chkconfig --del avahi-daemon
+    service avahi-dnsconfd stop >/dev/null 2>&1
+    /sbin/chkconfig --del avahi-dnsconfd
 fi
 
 %post glib -p /sbin/ldconfig
@@ -232,6 +250,7 @@
 %dir %{_sysconfdir}/avahi
 %dir %{_sysconfdir}/avahi/etc
 %ghost %{_sysconfdir}/avahi/etc/localtime
+%{_sysconfdir}/avahi/hosts
 %dir %{_sysconfdir}/avahi/services
 %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
@@ -302,6 +321,9 @@
 %endif
 
 %changelog
+* Fri Feb 17 2006 Jason Vas Dias <jvdias at redhat.com> 0.6.7-1
+- Upgrade to upstream version 0.6.7
+
 * Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 0.6.6-4
 - BuildRequires pygtk2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Feb 2006 23:04:20 -0000	1.8
+++ sources	17 Feb 2006 17:39:31 -0000	1.9
@@ -1 +1 @@
-c7fd8c4a4c3715fa7f9cc2f939ef122d  avahi-0.6.6.tar.gz
+4cfb24b5c9063180f9eee2ef30beac53  avahi-0.6.7.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 17 17:46:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 12:46:07 -0500
Subject: rpms/kdebase/FC-3 post-3.4.2-kdebase-kcheckpass.diff, NONE,
	1.1 kdebase.spec, 1.88, 1.89
Message-ID: <200602171746.k1HHk7KP013082@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv12032

Modified Files:
	kdebase.spec 
Added Files:
	post-3.4.2-kdebase-kcheckpass.diff 
Log Message:
migrated changes into the FC-3 branch



post-3.4.2-kdebase-kcheckpass.diff:
 kcheckpass.c |   96 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 67 insertions(+), 29 deletions(-)

--- NEW FILE post-3.4.2-kdebase-kcheckpass.diff ---
Index: kcheckpass.c
===================================================================
--- kcheckpass.c	(revision 453871)
+++ kcheckpass.c	(working copy)
@@ -14,7 +14,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.
+ * Software Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *
  *	kcheckpass is a simple password checker. Just invoke and
@@ -264,8 +264,13 @@
 
   va_start(ap, fmt);
   vfprintf(stderr, fmt, ap);
+  va_end(ap);
 }
 
+#ifndef O_NOFOLLOW
+# define O_NOFOLLOW 0
+#endif
+
 static void ATTR_NORETURN
 usage(int exitval)
 {
@@ -286,6 +291,14 @@
   exit(exitval);
 }
 
+static int exclusive_lock(int fd)
+{
+  struct flock lk;
+  lk.l_type = F_WRLCK;
+  lk.l_whence = SEEK_SET;
+  lk.l_start = lk.l_len = 0;
+  return fcntl(fd, F_SETLKW, &lk);
+}
 
 int
 main(int argc, char **argv)
@@ -299,10 +312,13 @@
   char		*p;
 #endif
   struct passwd	*pw;
-  int		c, nfd, lfd, numtries;
+  int		c, nfd, tfd, lfd;
   uid_t		uid;
-  long		lasttime;
+  time_t	lasttime;
   AuthReturn	ret;
+  char tmpname[64], fname[64], fcont[64];
+  time_t left = 3;
+  lfd = tfd = 0;
 
 #ifdef HAVE_OSF_C2_PASSWD
   initialize_osf_security(argc, argv);
@@ -371,6 +387,41 @@
       return AuthError;
     }
   }
+
+  /* see if we had already a failed attempt */
+  if ( uid != geteuid() ) {
+    strcpy(tmpname, "/var/lock/kcheckpass.tmp.XXXXXX");
+    if ((tfd=mkstemp(tmpname)) < 0)
+      return AuthError;
+
+    /* try locking out concurrent kcheckpass processes */
+    exclusive_lock(tfd);
+    
+    write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
+    (void) lseek(tfd, 0, SEEK_SET);
+
+    sprintf(fname, "/var/lock/kcheckpass.%d", uid );
+
+    if ((lfd = open(fname, O_RDWR | O_NOFOLLOW)) >= 0) {
+      if (exclusive_lock(lfd) == 0) {
+        if ((c = read(lfd, fcont, sizeof(fcont)-1)) > 0 &&
+	    (fcont[c] = '\0', sscanf(fcont, "%ld", &lasttime) == 1))
+	  {
+            time_t ct = time(0);
+
+	    /* in case we were killed early, sleep the remaining time
+	     * to properly enforce invocation throttling and make sure
+	     * that users can't use kcheckpass for bruteforcing password
+             */
+            if(lasttime > ct && lasttime < ct + left)
+              sleep (lasttime - ct);
+          }
+      }
+      close(lfd);
+    }
+    rename(tmpname, fname);
+  }
+
   /* Now do the fandango */
   ret = Authenticate(
 #ifdef HAVE_PAM
@@ -379,35 +430,21 @@
                      method,
                      username, 
                      sfd < 0 ? conv_legacy : conv_server);
+
   if (ret == AuthOk || ret == AuthBad) {
     /* Security: Don't undermine the shadow system. */
     if (uid != geteuid()) {
-      char fname[32], fcont[32];
-      sprintf(fname, "/var/lock/kcheckpass.%d", uid);
-      if ((lfd = open(fname, O_RDWR | O_CREAT)) >= 0) {
-        struct flock lk;
-        lk.l_type = F_WRLCK;
-        lk.l_whence = SEEK_SET;
-        lk.l_start = lk.l_len = 0;
-	if (fcntl(lfd, F_SETLKW, &lk))
-          return AuthError;
-        if ((c = read(lfd, fcont, sizeof(fcont))) > 0 &&
-            (fcont[c] = 0, sscanf(fcont, "%ld %d\n", &lasttime, &numtries) == 2))
-        {
-          time_t left = lasttime - time(0);
-          if (numtries < 20)
-            numtries++;
-          left += 2 << (numtries > 10 ? numtries - 10 : 0);
-          if (left > 0)
-            sleep(left);
-        } else
-          numtries = 0;
-        if (ret == AuthBad) {
-          lseek(lfd, 0, SEEK_SET);
-          write(lfd, fcont, sprintf(fcont, "%ld %d\n", time(0), numtries));
-        } else
-          unlink(fname);
-      }
+      if (ret == AuthBad) {
+        write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
+      } else
+        unlink(fname);
+	
+      unlink(tmpname);
+
+      if (ret == AuthBad)
+        sleep(left);  
+
+      close(tfd);
     }
     if (ret == AuthBad) {
       message("Authentication failure\n");
@@ -417,6 +454,7 @@
       }
     }
   }
+
   return ret;
 }
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-3/kdebase.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kdebase.spec	23 Aug 2005 08:53:06 -0000	1.88
+++ kdebase.spec	17 Feb 2006 17:46:04 -0000	1.89
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.4.2
-Release: 0.fc3.3
+Release: 0.fc3.5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -60,6 +60,9 @@
 Patch91: kdebase-3.4.0-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
 
+# security fixes
+Patch200: post-3.4.2-kdebase-kcheckpass.diff
+
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
 Requires: /etc/X11/xdm/Xaccess
@@ -146,6 +149,10 @@
 %patch91 -p1 -b .kdestop-konsole
 %patch92 -p1 -b .xdg
 
+pushd kcheckpass
+%patch200 -p0 -b .CAN-2005-2494
+popd
+
 %if %{rhel}
   rm -rf kdeprint/kdeprintfax
   perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
@@ -428,6 +435,12 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Fri Feb 17 2006 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.5
+- migrated changes into the FC-3 branch
+
+* Thu Sep 01 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.4
+- apply patch to fix local root vulnerability in kcheckpass #166997
+
 * Mon Aug 15 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.3
 - Bluecurve theme for KDM #165867
 - enable switching users #166112



From fedora-cvs-commits at redhat.com  Fri Feb 17 18:34:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 13:34:12 -0500
Subject: rpms/eclipse/devel eclipse.spec,1.246,1.247
Message-ID: <200602171834.k1HIYCDP008199@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8186

Modified Files:
	eclipse.spec 
Log Message:
Try to build on ppc64


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- eclipse.spec	17 Feb 2006 15:08:14 -0000	1.246
+++ eclipse.spec	17 Feb 2006 18:33:57 -0000	1.247
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_8fc
+Release:        1jpp_9fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1279,6 +1279,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 17 2006 Igor Foox <ifoox at redhat.com> - 1:3.1.2-1jpp_9fc
+- Try build on ppc64.
+
 * Fri Feb 17 2006 Andrew Overholt <overholt at redhat.com> - 1:3.1.2-1jpp_8fc
 - Try build on ppc64 (rh#172172, rh#181846).
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 18:48:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 13:48:37 -0500
Subject: rpms/beagle/devel beagle.spec,1.29,1.30
Message-ID: <200602171848.k1HImb1a020937@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20922

Modified Files:
	beagle.spec 
Log Message:
mock errors:
checking for UIGLUE... configure: error: Package requirements (gtk+-2.0 >= 2.6.0 librsvg-2.0) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

added BuildRequires
fix minor typo



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- beagle.spec	15 Feb 2006 09:51:39 -0000	1.29
+++ beagle.spec	17 Feb 2006 18:48:35 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        6
+Release:        7
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -18,6 +18,8 @@
 BuildRequires:  libXScrnSaver-devel
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libgnome-devel
+BuildRequires:  gtk2-devel >= 2.6.0
+BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
 Requires: zip mono-core poppler-utils
 Patch0: beagle-0.2.0-security-fix.patch
@@ -158,8 +160,11 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 0.2.1-7
+- add BuildRequires
+
 * Wed Feb 15 2006 Alexander Larsson <alexl at redhat.com> 0.2.1-6
-- Make all dlls exectuable to correctly pick up dependencies
+- Make all dlls executable to correctly pick up dependencies
 
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 0.2.1-4
 - remove preferences from accessories menu



From fedora-cvs-commits at redhat.com  Fri Feb 17 18:52:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 13:52:53 -0500
Subject: rpms/kernel/FC-4 linux-2.6-net-nat-pmtu.patch, NONE,
	1.1 kernel-2.6.spec, 1.1600, 1.1601
Message-ID: <200602171852.k1HIqrdl021016@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20998

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-nat-pmtu.patch 
Log Message:
fix nat pmtu bug


linux-2.6-net-nat-pmtu.patch:
 ip_nat_core.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-net-nat-pmtu.patch ---

----- Forwarded message from Patrick McHardy <kaber at trash.net> -----

Patrick McHardy wrote:
> Al Viro wrote:
> 
>>At which point we have the following:
>>	source: 10.1.1.5
>>	target: YYY.YYY.YYY.YYY
>>	quoted target: XXX.XXX.XXX.XXX
>>
>>Guess how many intermediate routers are going to be unhappy with the source
>>of that packet...  And unlike the "Me Og.  Me see ICMP.  Me drop ICMP" case,
>>they actually have a point.  For other kinds of ICMP errors it wouldn't be
>>a big deal; however, with code 4 it gives PMTUD blackholes.
> 
> 
> That case should actually be handled, at least there's a big comment in
> icmp_reply_translation() in ip_nat_core.c. I can't spot the error right
> now, but I'm going to look into it.

I found the problem, the source address is only changed if it equals
the source of the connection, which doesn't make much sense for ICMP
frag. required messages. With this patch ICMP errors should always
be NATed the same way as original connection, please try if it helps.

diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c
index c1a6146..1741d55 100644
--- a/net/ipv4/netfilter/ip_nat_core.c
+++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -434,6 +434,7 @@ int ip_nat_icmp_reply_translation(struct
 	} *inside;
 	struct ip_conntrack_tuple inner, target;
 	int hdrlen = (*pskb)->nh.iph->ihl * 4;
+	unsigned long statusbit;
 
 	if (!skb_make_writable(pskb, hdrlen + sizeof(*inside)))
 		return 0;
@@ -495,17 +496,16 @@ int ip_nat_icmp_reply_translation(struct
 
 	/* Change outer to look the reply to an incoming packet
 	 * (proto 0 means don't invert per-proto part). */
+	if (manip == IP_NAT_MANIP_SRC)
+		statusbit = IPS_SRC_NAT;
+	else
+		statusbit = IPS_DST_NAT;
+
+	/* Invert if this is reply dir. */
+	if (dir == IP_CT_DIR_REPLY)
+		statusbit ^= IPS_NAT_MASK;
 
-	/* Obviously, we need to NAT destination IP, but source IP
-	   should be NAT'ed only if it is from a NAT'd host.
-
-	   Explanation: some people use NAT for anonymizing.  Also,
-	   CERT recommends dropping all packets from private IP
-	   addresses (although ICMP errors from internal links with
-	   such addresses are not too uncommon, as Alan Cox points
-	   out) */
-	if (manip != IP_NAT_MANIP_SRC
-	    || ((*pskb)->nh.iph->saddr == ct->tuplehash[dir].tuple.src.ip)) {
+	if (ct->status & statusbit) {
 		invert_tuplepr(&target, &ct->tuplehash[!dir].tuple);
 		if (!manip_pkt(0, pskb, 0, &target, manip))
 			return 0;




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1600
retrieving revision 1.1601
diff -u -r1.1600 -r1.1601
--- kernel-2.6.spec	16 Feb 2006 18:39:57 -0000	1.1600
+++ kernel-2.6.spec	17 Feb 2006 18:52:50 -0000	1.1601
@@ -352,6 +352,7 @@
 Patch1810: linux-2.6-pwc-powerup-by-default.patch
 Patch1820: linux-2.6-net-acenic-use-after-free.patch
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
+Patch1840: linux-2.6-net-nat-pmtu.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
 Patch1870: linux-2.6-usb-find-interface.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
@@ -793,6 +794,8 @@
 %patch1820 -p1
 # PNP support for smsc-ircc2
 %patch1830 -p1
+# Fix PMTU breakage with NAT
+%patch1840 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
 # Fix idiocy in usb_find_interface()
@@ -1275,6 +1278,9 @@
 %endif
 
 %changelog
+* Fri Feb 16 2006 Dave Jones <davej at redhat.com>
+- Fix PMTU NAT bug.
+
 * Fri Feb 16 2006 John W. Linville <linville at redhat.com>
 - Set ipw2200 hwcrypto option to 0 to avoid firmware restarts.
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 18:54:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 13:54:27 -0500
Subject: rpms/busybox/devel busybox.spec,1.31,1.32
Message-ID: <200602171854.k1HIsRkm029150@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/busybox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21027

Modified Files:
	busybox.spec 
Log Message:
mock errors:

ar -ro /builddir/build/BUILD/busybox-1.01/selinux/selinux.a /builddir/build/BUILD/busybox-1.01/selinux/load_policy.o
ar: creating /builddir/build/BUILD/busybox-1.01/selinux/selinux.a
gcc -Wl,-warn-common --static -o .......... builddir/build/BUILD/busybox-1.01/selinux/selinux.a -lselinux -lsepol -lm -Wl,--end-group
/usr/bin/ld: cannot find -lsepol

Add BuildRequires libsepol-devel




Index: busybox.spec
===================================================================
RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- busybox.spec	11 Feb 2006 02:12:48 -0000	1.31
+++ busybox.spec	17 Feb 2006 18:54:23 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.01
-Release: 2.2.1
+Release: 3
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -12,6 +12,7 @@
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: libselinux-devel >= 1.27.7-2
+BuildRequires: libsepol-devel
 
 %package anaconda
 Group: System Environment/Shells



From fedora-cvs-commits at redhat.com  Fri Feb 17 18:58:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 13:58:37 -0500
Subject: rpms/bug-buddy/devel bug-buddy.spec,1.46,1.47
Message-ID: <200602171858.k1HIwbA8031110@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30361

Modified Files:
	bug-buddy.spec 
Log Message:
mock error:
(cd es/ && \
  `which xml2po` -e -p \
    "${d}es/es.po" \
    "${d}C/bug-buddy.xml" > bug-buddy.xml.tmp && \
    cp bug-buddy.xml.tmp bug-buddy.xml && rm -f bug-buddy.xml.tmp)
/bin/sh: which: command not found
/bin/sh: -e: command not found
make[2]: *** [es/bug-buddy.xml] Error 127


Add BuildRequires: which
Maybe the sources should be changed to use 'type -path'




Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- bug-buddy.spec	11 Feb 2006 02:12:37 -0000	1.46
+++ bug-buddy.spec	17 Feb 2006 18:58:35 -0000	1.47
@@ -5,7 +5,7 @@
 
 Name: bug-buddy
 Version: 2.13.0
-Release: 1.2
+Release: 2
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -37,6 +37,7 @@
 BuildRequires: libgnome-devel
 BuildRequires: gnome-menus-devel
 BuildRequires: libglade2-devel
+BuildRequires: which
 # Needed by intltool
 BuildRequires: perl-XML-Parser
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
@@ -107,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 2.13.0-2
+- BuildRequires: which
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.13.0-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:07:37 -0500
Subject: rpms/kernel/devel linux-2.6-debug-must_check.patch, NONE,
	1.1 kernel-2.6.spec, 1.1960, 1.1961
Message-ID: <200602171907.k1HJ7bgS031935@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31867

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-must_check.patch 
Log Message:
Add some checks.


linux-2.6-debug-must_check.patch:
 bitmap.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-debug-must_check.patch ---
--- linux-2.6.15.noarch/include/linux/bitmap.h~	2006-02-17 14:05:18.000000000 -0500
+++ linux-2.6.15.noarch/include/linux/bitmap.h	2006-02-17 14:06:14.000000000 -0500
@@ -196,7 +196,7 @@ static inline void bitmap_complement(uns
 		__bitmap_complement(dst, src, nbits);
 }
 
-static inline int bitmap_equal(const unsigned long *src1,
+static inline int __must_check bitmap_equal(const unsigned long *src1,
 			const unsigned long *src2, int nbits)
 {
 	if (nbits <= BITS_PER_LONG)
@@ -205,7 +205,7 @@ static inline int bitmap_equal(const uns
 		return __bitmap_equal(src1, src2, nbits);
 }
 
-static inline int bitmap_intersects(const unsigned long *src1,
+static inline int __must_check bitmap_intersects(const unsigned long *src1,
 			const unsigned long *src2, int nbits)
 {
 	if (nbits <= BITS_PER_LONG)
@@ -214,7 +214,7 @@ static inline int bitmap_intersects(cons
 		return __bitmap_intersects(src1, src2, nbits);
 }
 
-static inline int bitmap_subset(const unsigned long *src1,
+static inline int __must_check bitmap_subset(const unsigned long *src1,
 			const unsigned long *src2, int nbits)
 {
 	if (nbits <= BITS_PER_LONG)
@@ -223,7 +223,7 @@ static inline int bitmap_subset(const un
 		return __bitmap_subset(src1, src2, nbits);
 }
 
-static inline int bitmap_empty(const unsigned long *src, int nbits)
+static inline int __must_check bitmap_empty(const unsigned long *src, int nbits)
 {
 	if (nbits <= BITS_PER_LONG)
 		return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
@@ -231,7 +231,7 @@ static inline int bitmap_empty(const uns
 		return __bitmap_empty(src, nbits);
 }
 
-static inline int bitmap_full(const unsigned long *src, int nbits)
+static inline int __must_check bitmap_full(const unsigned long *src, int nbits)
 {
 	if (nbits <= BITS_PER_LONG)
 		return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
@@ -239,7 +239,7 @@ static inline int bitmap_full(const unsi
 		return __bitmap_full(src, nbits);
 }
 
-static inline int bitmap_weight(const unsigned long *src, int nbits)
+static inline int __must_check bitmap_weight(const unsigned long *src, int nbits)
 {
 	return __bitmap_weight(src, nbits);
 }


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1960
retrieving revision 1.1961
diff -u -r1.1960 -r1.1961
--- kernel-2.6.spec	17 Feb 2006 07:42:45 -0000	1.1960
+++ kernel-2.6.spec	17 Feb 2006 19:07:25 -0000	1.1961
@@ -305,6 +305,7 @@
 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
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -825,6 +826,7 @@
 #%patch1030 -p1
 %patch1031 -p1
 %patch1032 -p1
+%patch1033 -p1
 
 #
 # Make /dev/mem a need-to-know function 



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:12:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:12:58 -0500
Subject: rpms/f-spot/devel f-spot-0.1.9-security-fix.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 f-spot.spec, 1.14, 1.15 sources, 1.4,
	1.5 f-spot-0.1.5-security-fix.patch, 1.1, NONE
Message-ID: <200602171912.k1HJCwT1001846@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1813

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	f-spot-0.1.9-security-fix.patch 
Removed Files:
	f-spot-0.1.5-security-fix.patch 
Log Message:
* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.1.9-1
- Update to 0.1.9


f-spot-0.1.9-security-fix.patch:
 f-spot.in |    8 +-------
 1 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE f-spot-0.1.9-security-fix.patch ---
--- f-spot-0.1.9/src/f-spot.in.security-fix	2006-02-10 13:43:02.000000000 -0500
+++ f-spot-0.1.9/src/f-spot.in	2006-02-17 14:07:02.000000000 -0500
@@ -4,12 +4,6 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 
-if [ -e ./f-spot.exe ] && [ -e ./Makefile ] && [ -e ./Defines.cs ]; then
-    echo "*** Running uninstalled f-spot ***"
-    EXE_TO_RUN="./f-spot.exe"
-    export MONO_PATH=../FlickrNet:../libgphoto2-sharp:../semweb:$MONO_PATH
-else
-    EXE_TO_RUN="$libdir/f-spot/f-spot.exe"
-fi
+EXE_TO_RUN="$libdir/f-spot/f-spot.exe"
 
 exec -a @PACKAGE@ mono $EXE_TO_RUN "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Feb 2006 00:29:18 -0000	1.4
+++ .cvsignore	17 Feb 2006 19:12:56 -0000	1.5
@@ -1,2 +1,3 @@
 f-spot-0.1.5.tar.bz2
 f-spot-0.1.8.tar.bz2
+f-spot-0.1.9.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- f-spot.spec	13 Feb 2006 04:08:39 -0000	1.14
+++ f-spot.spec	17 Feb 2006 19:12:56 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           f-spot
-Version:        0.1.8
-Release:        3
+Version:        0.1.9
+Release:        1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -24,7 +24,7 @@
 # No libgphoto etc on s390
 ExcludeArch: s390
 
-Patch0: f-spot-0.1.5-security-fix.patch
+Patch0: f-spot-0.1.9-security-fix.patch
 Patch1: f-spot-0.1.3-sqlite3.patch
 
 %description
@@ -68,6 +68,9 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.1.9-1
+- Update to 0.1.9
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.1.8-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Feb 2006 00:29:18 -0000	1.4
+++ sources	17 Feb 2006 19:12:56 -0000	1.5
@@ -1 +1 @@
-280ed570a2ed816084434408b8a8cc16  f-spot-0.1.8.tar.bz2
+653928852d4198676e440e3183fd72df  f-spot-0.1.9.tar.bz2


--- f-spot-0.1.5-security-fix.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:24:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:24:02 -0500
Subject: rpms/kdelibs/FC-3 devices.protocol, NONE, 1.1 kde-applications.menu,
	NONE, 1.1 kdelibs-3.3.2-ppc.patch, NONE,
	1.1 kdelibs-3.3.92-buildroot.patch, NONE,
	1.1 kdelibs-3.3.92-defaultstyle.patch, NONE,
	1.1 kdelibs-3.4.0-fonts.patch, NONE,
	1.1 kdelibs-3.4.0-menu.patch, NONE,
	1.1 kdelibs-3.4.0-qtdoc.patch, NONE,
	1.1 post-3.2.3-kdelibs-kjs.diff, NONE, 1.1 kdelibs.spec, 1.73,
	1.74 sources, 1.33, 1.34 kdelibs-3.1-defaultstyle.patch, 1.1,
	NONE kdelibs-3.1-kio.patch, 1.1,
	NONE kdelibs-3.1.95-buildroot.patch, 1.1,
	NONE kdelibs-3.2.2-kate-setInputMethodEnabled-20040525.diff,
	1.1, NONE kdelibs-3.3.0-trash.patch, 1.1,
	NONE kdelibs-3.3.1-cvs.patch, 1.2,
	NONE kdelibs-3.3.1-java.patch, 1.1,
	NONE kdelibs-3.3.1-xml.patch, 1.1,
	NONE post-3.3.1-kdelibs-khtml.diff, 1.2,
	NONE post-3.3.1-kdelibs-kio.diff, 1.1,
	NONE post-3.3.2-kdelibs-htmlframes2.patch, 1.1,
	NONE post-3.3.2-kdelibs-kioslave.patch, 1.1, NONE
Message-ID: <200602171924.k1HJO2Tv019376@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv19307

Modified Files:
	kdelibs.spec sources 
Added Files:
	devices.protocol kde-applications.menu kdelibs-3.3.2-ppc.patch 
	kdelibs-3.3.92-buildroot.patch 
	kdelibs-3.3.92-defaultstyle.patch kdelibs-3.4.0-fonts.patch 
	kdelibs-3.4.0-menu.patch kdelibs-3.4.0-qtdoc.patch 
	post-3.2.3-kdelibs-kjs.diff 
Removed Files:
	kdelibs-3.1-defaultstyle.patch kdelibs-3.1-kio.patch 
	kdelibs-3.1.95-buildroot.patch 
	kdelibs-3.2.2-kate-setInputMethodEnabled-20040525.diff 
	kdelibs-3.3.0-trash.patch kdelibs-3.3.1-cvs.patch 
	kdelibs-3.3.1-java.patch kdelibs-3.3.1-xml.patch 
	post-3.3.1-kdelibs-khtml.diff post-3.3.1-kdelibs-kio.diff 
	post-3.3.2-kdelibs-htmlframes2.patch 
	post-3.3.2-kdelibs-kioslave.patch 
Log Message:
migrated changes into the FC-3 branch



--- NEW FILE devices.protocol ---
[Protocol]
exec=kio_media
protocol=devices
input=none
output=filesystem
listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
reading=true
writing=true
makedir=true
deleting=true
linking=true
moving=true
Icon=system
maxInstances=4
#TODO DocPath=kioslave/file.html
Class=:local
deleteRecursive=true
fileNameUsedForCopying=Name


--- NEW FILE kde-applications.menu ---
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
 "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">

<Menu>

  <Name>Applications</Name>
  <Directory>Applications.directory</Directory>

  <!-- Scan legacy dirs first, as later items take priority -->
  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
  <KDELegacyDirs/>
  <LegacyDir>/etc/X11/applnk</LegacyDir>

  <!-- Read standard .directory and .desktop file locations -->
  <DefaultAppDirs/>
  <DefaultDirectoryDirs/>

  <!-- Read in overrides and child menus from applications.d -->
  <DefaultMergeDirs/>

  <!-- Merge in these other files as submenus -->
  <Menu>
    <Name>Preferences</Name>
    <MergeFile>preferences.menu</MergeFile>
  </Menu>

  <Menu>
    <Name>System Settings</Name>
    <MergeFile>system-settings.menu</MergeFile>
  </Menu>

  <!-- Menu items to include in the toplevel -->
  <Include>
    <And>
      <Category>Core</Category>
      <Not>
        <Category>Merged</Category>
      </Not>
    </And>
  </Include>

  <!-- Accessories submenu -->
  <Menu>
    <Name>Accessories</Name>
    <Directory>Accessories.directory</Directory>
    <Include>
      <And>
         <Or>
           <Category>Utility</Category>
           <Category>TextEditor</Category>
         </Or>
         <Not>
           <Category>System</Category>
           <Category>Development</Category>
         </Not>
      </And>
    </Include>
  </Menu> <!-- End Accessories -->

  <!-- Development Tools -->
  <Menu>
    <Name>Development</Name>
    <Directory>Development.directory</Directory>
    <Include>
      <And>
        <Category>Development</Category>
      </And>
      <Filename>emacs.desktop</Filename>
    </Include>
  </Menu> <!-- End Development Tools -->

  <!-- Edutainment -->
  <Menu>
    <Name>Edutainment</Name>
    <Directory>Edutainment.directory</Directory>
    <Include>
      <And>
        <Category>Education</Category>
      </And>
    </Include>
  </Menu> <!-- End Edutainment -->

  <!-- Games -->
  <Menu>
    <Name>Games</Name>
    <Directory>Games.directory</Directory>
    <Include>
      <And>
        <Category>Game</Category>
      </And>
    </Include>
  </Menu> <!-- End Games -->

  <!-- Graphics -->
  <Menu>
    <Name>Graphics</Name>
    <Directory>Graphics.directory</Directory>
    <Include>
      <And>
        <Category>Graphics</Category>
      </And>
      <Filename>dia.desktop</Filename>
      <Filename>drawing.desktop</Filename>
    </Include>
  </Menu> <!-- End Graphics -->

  <!-- Internet -->
  <Menu>
    <Name>Internet</Name>
    <Directory>Internet.directory</Directory>
    <Include>
      <And>
        <Category>Network</Category>
      </And>
    </Include>
  </Menu>   <!-- End Internet -->

  <!-- Multimedia -->
  <Menu>
    <Name>Multimedia</Name>
    <Directory>Multimedia.directory</Directory>
    <Include>
      <And>
        <Category>AudioVideo</Category>
      </And>
    </Include>
  </Menu>   <!-- End Multimedia -->

  <!-- Office -->
  <Menu>
    <Name>Office</Name>
    <Directory>Office.directory</Directory>
    <Include>
      <And>
        <Category>Office</Category>
      </And>
    </Include>
  </Menu> <!-- End Office -->

  <!-- System Tools-->
  <Menu>
    <Name>System</Name>
    <Directory>System.directory</Directory>
    <Include>
      <And>
        <Category>System</Category>
        <Not><Category>Screensaver</Category></Not>
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
        <Not><Category>SystemSetup</Category></Not>
      </And>
    </Include>

    <Exclude>
      <Filename>redhat-authconfig.desktop</Filename>
      <Filename>system-config-date.desktop</Filename>
      <Filename>system-config-keyboard.desktop</Filename>
      <Filename>system-config-language.desktop</Filename>
      <Filename>system-config-mouse.desktop</Filename>
      <Filename>system-config-nfs.desktop</Filename>
      <Filename>system-config-packages.desktop</Filename>
      <Filename>system-config-rootpassword.desktop</Filename>
      <Filename>system-config-securitylevel.desktop</Filename>
      <Filename>system-config-services.desktop</Filename>
      <Filename>system-config-soundcard.desktop</Filename>
      <Filename>system-config-users.desktop</Filename>
      <Filename>redhat-neat.desktop</Filename>
      <Filename>redhat-printconf-gui.desktop</Filename>
      <Filename>redhat-rhn-up2date-config.desktop</Filename>
      <Filename>redhat-switchdesk.desktop</Filename>
      <Filename>redhat-switchmail.desktop</Filename>
      <Filename>redhat-switch-printer.desktop</Filename>
    </Exclude>
  </Menu>   <!-- End System Tools -->

  <!-- Other -->
  <Menu>
    <Name>Other</Name>
    <Directory>Other.directory</Directory>
    <OnlyUnallocated/>
    <Include>
      <And>
        <Category>Application</Category>
        <Not><Category>Core</Category></Not>
        <Not><Category>Settings</Category></Not>
        <Not><Category>SystemSetup</Category></Not>
        <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
      </And>
    </Include>
  </Menu> <!-- End Other -->

  <MergeFile>applications-kmenuedit.menu</MergeFile>

</Menu> <!-- End Applications -->

kdelibs-3.3.2-ppc.patch:
 kcpuinfo.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdelibs-3.3.2-ppc.patch ---
--- kdelibs-3.3.2/kdefx/kcpuinfo.cpp.orig	2004-12-15 11:17:53.549403872 -0500
+++ kdelibs-3.3.2/kdefx/kcpuinfo.cpp	2004-12-15 11:18:26.312348696 -0500
@@ -30,6 +30,7 @@
 #include <config.h>
 #include "kcpuinfo.h"
 
+#undef HAVE_PPC_ALTIVEC
 
 #if defined(__GNUC__) || defined(__INTEL_COMPILER)
 #  define HAVE_GNU_INLINE_ASM

kdelibs-3.3.92-buildroot.patch:
 kdecore/Makefile.am       |    8 --------
 kio/misc/kpac/Makefile.am |    3 ---
 2 files changed, 11 deletions(-)

--- NEW FILE kdelibs-3.3.92-buildroot.patch ---
--- kdelibs-3.3.92/kdecore/Makefile.am.buildroot	2005-02-14 18:07:16.418462362 +0100
+++ kdelibs-3.3.92/kdecore/Makefile.am	2005-02-14 18:07:39.792008558 +0100
@@ -167,14 +167,6 @@
 kgrantpty_LDFLAGS = -pie $(KDE_RPATH) $(all_libraries)
 kgrantpty_LDADD = ./libkdefakes.la
 
-# kgrantpty needs to be installed setuid root
-install-exec-hook: 
-	@(chown 0 $(DESTDIR)$(bindir)/kgrantpty && chmod 4755 $(DESTDIR)$(bindir)/kgrantpty) || echo "Please make kgrantpty setuid root" >&2
-	@echo ""
-	@echo "kgrantpty is by default installed with a set SETUID root bit!"
-	@echo "This is needed for konsole, etc. to ensure that they can't be eavesdroped."
-	@echo ""
-
 DISTCLEANFILES = kde-config.cpp
 
 DOXYGEN_REFERENCES = dcop kdeui kparts kio
--- kdelibs-3.3.92/kio/misc/kpac/Makefile.am.buildroot	2005-02-14 17:58:47.552655164 +0100
+++ kdelibs-3.3.92/kio/misc/kpac/Makefile.am	2005-02-14 17:58:47.564653391 +0100
@@ -24,6 +24,3 @@
 
 proxyscoutdatadir = $(kde_datadir)/proxyscout
 proxyscoutdata_DATA = eventsrc
-
-install-exec-local:
-	@(chown root $(DESTDIR)$(bindir)/kpac_dhcp_helper && chmod 4755 $(DESTDIR)$(bindir)/kpac_dhcp_helper) || echo "Please make kpac_dhcp_helper setuid root"

kdelibs-3.3.92-defaultstyle.patch:
 kstyle.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.3.92-defaultstyle.patch ---
--- kdelibs-3.3.92/kdefx/kstyle.cpp.defaultstyle	2004-11-18 00:54:47.000000000 +0100
+++ kdelibs-3.3.92/kdefx/kstyle.cpp	2005-02-14 18:13:11.584981009 +0100
@@ -238,7 +238,7 @@
 QString KStyle::defaultStyle()
 {
 	if (QPixmap::defaultDepth() > 8)
-	   return QString("plastik");
+	   return QString("Bluecurve");
 	else
 	   return QString("light, 3rd revision");
 }

kdelibs-3.4.0-fonts.patch:
 kdecore/kglobalsettings.cpp |   18 +++++++++---------
 khtml/khtmldefaults.h       |   12 ++++++------
 khtml/khtmlview.cpp         |    2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

--- NEW FILE kdelibs-3.4.0-fonts.patch ---
--- kdelibs-3.4.0/kdecore/kglobalsettings.cpp.tn	2005-03-10 14:09:04.583832012 +0100
+++ kdelibs-3.4.0/kdecore/kglobalsettings.cpp	2005-03-10 14:11:08.303522776 +0100
@@ -321,8 +321,8 @@
         return *_generalFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _generalFont = new QFont("helvetica", 12);
-    _generalFont->setPointSize(12);
+    _generalFont = new QFont("Sans", 10);
+    _generalFont->setPointSize(10);
     _generalFont->setStyleHint(QFont::SansSerif);
 
     KConfigGroup g( KGlobal::config(), "General" );
@@ -337,7 +337,7 @@
         return *_fixedFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _fixedFont = new QFont("courier", 12);
+    _fixedFont = new QFont("Monospace", 10);
     _fixedFont->setPointSize(12);
     _fixedFont->setStyleHint(QFont::TypeWriter);
 
@@ -353,7 +353,7 @@
         return *_toolBarFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _toolBarFont = new QFont("helvetica", 10);
+    _toolBarFont = new QFont("Sans", 10);
     _toolBarFont->setPointSize(10);
     _toolBarFont->setStyleHint(QFont::SansSerif);
 
@@ -369,7 +369,7 @@
         return *_menuFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _menuFont = new QFont("helvetica", 12);
+    _menuFont = new QFont("Sans", 10);
     _menuFont->setPointSize(12);
     _menuFont->setStyleHint(QFont::SansSerif);
 
@@ -385,8 +385,8 @@
         return *_windowTitleFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _windowTitleFont = new QFont("helvetica", 12, QFont::Bold);
-    _windowTitleFont->setPointSize(12);
+    _windowTitleFont = new QFont("Sans", 10, QFont::Bold);
+    _windowTitleFont->setPointSize(10);
     _windowTitleFont->setStyleHint(QFont::SansSerif);
 
     KConfigGroup g( KGlobal::config(), "WM" );
@@ -401,8 +401,8 @@
         return *_taskbarFont;
 
     // Sync default with kdebase/kcontrol/fonts/fonts.cpp
-    _taskbarFont = new QFont("helvetica", 11);
-    _taskbarFont->setPointSize(11);
+    _taskbarFont = new QFont("Sans", 10);
+    _taskbarFont->setPointSize(10);
     _taskbarFont->setStyleHint(QFont::SansSerif);
 
     KConfigGroup g( KGlobal::config(), "General" );
--- kdelibs-3.4.0/khtml/khtmlview.cpp.tn	2005-03-10 14:05:56.305695232 +0100
+++ kdelibs-3.4.0/khtml/khtmlview.cpp	2005-03-10 14:06:10.051660971 +0100
@@ -2362,7 +2362,7 @@
         bool printHeader = (printer->option("app-khtml-printheader") == "true");
 
         int headerHeight = 0;
-        QFont headerFont("helvetica", 8);
+        QFont headerFont("Sans", 8);
 
         QString headerLeft = KGlobal::locale()->formatDate(QDate::currentDate(),true);
         QString headerMid = docname;
--- kdelibs-3.4.0/khtml/khtmldefaults.h.tn	2005-03-10 14:07:02.341922552 +0100
+++ kdelibs-3.4.0/khtml/khtmldefaults.h	2005-03-10 14:08:32.434589768 +0100
@@ -26,12 +26,12 @@
 
 // KEEP IN SYNC WITH konqdefaults.h in kdebase/libkonq!
 // lets be modern .. -- Bernd
-#define HTML_DEFAULT_VIEW_FONT "helvetica"
-#define HTML_DEFAULT_VIEW_FIXED_FONT "courier"
+#define HTML_DEFAULT_VIEW_FONT "Sans"
+#define HTML_DEFAULT_VIEW_FIXED_FONT "Monospace"
 // generic CSS fonts. Since usual X distributions don't have a good set of fonts, this
 // is quite conservative...
-#define HTML_DEFAULT_VIEW_SERIF_FONT "times"
-#define HTML_DEFAULT_VIEW_SANSSERIF_FONT "helvetica"
-#define HTML_DEFAULT_VIEW_CURSIVE_FONT "helvetica"
-#define HTML_DEFAULT_VIEW_FANTASY_FONT "helvetica"
+#define HTML_DEFAULT_VIEW_SERIF_FONT "Serif"
+#define HTML_DEFAULT_VIEW_SANSSERIF_FONT "Sans"
+#define HTML_DEFAULT_VIEW_CURSIVE_FONT "Sans"
+#define HTML_DEFAULT_VIEW_FANTASY_FONT "Sans"
 #define HTML_DEFAULT_MIN_FONT_SIZE 7 // everything smaller is usually unreadable.

kdelibs-3.4.0-menu.patch:
 kbuildsycoca.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.4.0-menu.patch ---
--- kdelibs-3.4.0/kded/kbuildsycoca.cpp.menu	2005-02-22 18:20:55.000000000 +0100
+++ kdelibs-3.4.0/kded/kbuildsycoca.cpp	2005-04-07 21:11:02.000000000 +0200
@@ -378,7 +378,11 @@
      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
              this, SLOT(slotCreateEntry(const QString &, KService **)));
              
-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+     VFolderMenu::SubMenu *kdeMenu;
+     if ( QFile::exists( "/etc/xdg/menus/kde-applications.menu" ) )
+        kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+     else
+        kdeMenu = g_vfolder->parseMenu("applications.menu", true);
 
      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
      entry->setLayoutInfo(kdeMenu->layoutList);

kdelibs-3.4.0-qtdoc.patch:
 acinclude.m4.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-3.4.0-qtdoc.patch ---
--- kdelibs-3.4.0/admin/acinclude.m4.in.orig	2005-04-01 19:01:33.000000000 +0200
+++ kdelibs-3.4.0/admin/acinclude.m4.in	2005-04-01 19:03:15.000000000 +0200
@@ -5317,7 +5317,7 @@
   kde_qtdir="$with_qt_dir"
 fi
 
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDOC/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
 AC_MSG_RESULT($QTDOCDIR)
 
 AC_SUBST(QTDOCDIR)

post-3.2.3-kdelibs-kjs.diff:
 function.cpp |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE post-3.2.3-kdelibs-kjs.diff ---
diff -urN kdelibs-3.4.2/kjs/function.cpp kdelibs-3.4.2_new/kjs/function.cpp
--- kdelibs-3.4.2/kjs/function.cpp	2005-05-23 14:16:34.000000000 +0200
+++ kdelibs-3.4.2_new/kjs/function.cpp	2006-01-11 16:24:43.000000000 +0100
@@ -77,7 +77,8 @@
       }
       else if (C.uc >= 0xD800 && C.uc <= 0xDBFF) {
 
-	if (k == string.size()) {
+    // we need two chars
+	if (k + 1 >= string.size()) {
 	  Object err = Error::create(exec,URIError);
 	  exec->setException(err);
 	  free(encbuf);
@@ -197,6 +198,10 @@
     }
 
     k += 2;
+
+    if (decbufLen+2 >= decbufAlloc)
+      decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
+
     if ((B & 0x80) == 0) {
       // Single-byte character
       C = B;
@@ -257,6 +262,12 @@
 	assert(n == 4);
 	unsigned long uuuuu = ((octets[0] & 0x07) << 2) | ((octets[1] >> 4) & 0x03);
 	unsigned long vvvv = uuuuu-1;
+    if (vvvv > 0x0F) {
+      Object err = Error::create(exec,URIError);
+      exec->setException(err);
+      free(decbuf);
+      return UString();
+    }
 	unsigned long wwww = octets[1] & 0x0F;
 	unsigned long xx = (octets[2] >> 4) & 0x03;
 	unsigned long yyyy = octets[2] & 0x0F;
@@ -270,8 +281,6 @@
     }
 
     if (reservedSet.find(C) < 0) {
-      if (decbufLen+1 >= decbufAlloc)
-	decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
       decbuf[decbufLen++] = C;
     }
     else {


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-3/kdelibs.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- kdelibs.spec	21 Jan 2005 14:04:20 -0000	1.73
+++ kdelibs.spec	17 Feb 2006 19:23:59 -0000	1.74
@@ -3,11 +3,16 @@
 %define debug 0
 %define final 0
 
-%define qt_version 3.3.3
-%define arts_version 1.3.0
+%define qt_epoch 1
+%define arts_epoch 8
+%define cups_epoch 1
+
+%define qt_version 3.3.4
+%define arts_version 1.4.2
 %define kde_major_version 3
+%define qtdocdir %{_docdir}/qt-devel-%{qt_version}
 
-%define libtool 1
+%define make_cvs 1
 %define fam 1
 %define dnotify 1
 %define pcre 1
@@ -15,58 +20,46 @@
 %define pie 1
 %define arts 1
 
-Version: 3.3.1
-Release: 2.6.FC3
+Version: 3.4.2
+Release: 0.fc3.4
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
 Epoch: 6
 Group: System Environment/Libraries
 License: LGPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
 Source2: kde.csh
+Source3: kde-applications.menu
+Source4: devices.protocol
 
 Patch1: kdelibs-3.2.2-pie.patch
 Patch2: kdelibs-3.0.0-ndebug.patch
 Patch3: kdelibs-3.2.0-icon.patch
 Patch4: kdelibs-3.0.4-ksyscoca.patch
 Patch5: kdelibs-3.3.0-openssl.patch
-Patch15: kdelibs-3.1.95-buildroot.patch
+Patch6: kdelibs-3.4.0-fonts.patch
+Patch7: kdelibs-3.4.0-menu.patch
+Patch15: kdelibs-3.3.92-buildroot.patch
 Patch16: kdelibs-3.1-ssl-krb5.patch
-Patch20: kdelibs-3.1-defaultstyle.patch
-Patch22: kdelibs-3.1-kio.patch
+Patch20: kdelibs-3.3.92-defaultstyle.patch
 Patch24: kdelibs-3.1-libtool.patch
-Patch31: kdelibs-3.2.2-kate-setInputMethodEnabled-20040525.diff
 Patch32: kdelibs-3.2.3-cups.patch
-Patch33: kdelibs-3.3.0-trash.patch
-
-# CVS fixes
-Patch100: kdelibs-3.3.1-cvs.patch
-Patch101: kdelibs-3.3.1-xml.patch
-
-# security fixes
-# Patch200, Patch201: KDE Security Advisory: plain text password exposure
-Patch200: post-3.3.1-kdelibs-khtml.diff
-Patch201: post-3.3.1-kdelibs-kio.diff
-
-# Patch202: KDE Security Advisory: Konqueror Window Injection Vulnerability
-Patch202: post-3.3.2-kdelibs-htmlframes2.patch
+Patch33: kdelibs-3.3.2-ppc.patch
+Patch34: kdelibs-3.4.0-qtdoc.patch
 
-# Source3: KDE Security Advisory: Konqueror Java Vulnerability
-Patch203: kdelibs-3.3.1-java.patch
-
-# FTP command injection vulnerability, CAN-2004-1165
-Patch204: post-3.3.2-kdelibs-kioslave.patch
+# CVE-2006-0019, kjs encodeuri/decodeuri heap overflow vulnerability
+Patch100: post-3.2.3-kdelibs-kjs.diff
 
 %if %{arts}
-Requires: arts >= 8:%{arts_version}
+Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
-Requires: qt >= 1:%{qt_version}
+Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: openssl = 0.9.7a
-Requires: cups-libs >= 1:1.1.12
+Requires: cups-libs >= %{cups_epoch}:1.1.12
 
 %if %{redhatify}
 Requires: desktop-backgrounds-basic
@@ -89,7 +82,7 @@
 %endif
 
 BuildRequires: cups-devel >= 1:1.1.20
-BuildRequires: qt-devel >= 1:%{qt_version}
+BuildRequires: qt-devel >= %{qt_version}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel >= 1.1.2
@@ -103,7 +96,7 @@
 BuildRequires: zlib-devel
 BuildRequires: libidn-devel
 %if %{arts}
-BuildRequires: arts-devel >= 8:%{arts_version}
+BuildRequires: arts-devel >= %{arts_version}
 %endif
 BuildRequires: audiofile-devel
 BuildRequires: openssl-devel
@@ -132,7 +125,7 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Requires: qt-devel >= 1:%{qt_version}
+Requires: qt-devel >= %{qt_epoch}:%{qt_version}
 Requires: %{name} = %{epoch}:%{version}-%{release}
 %if %{arts}
 Requires: arts-devel
@@ -169,29 +162,18 @@
 %endif
 %patch4 -p1 -b .ksyscoca
 %patch5 -p1 -b .openssl
+%patch6 -p1 -b .fonts
+%patch7 -p1 -b .menu
 %patch15 -p1 -b .buildroot
 %patch16 -p1 -b .ssl-krb5
 %patch20 -p1 -b .defaultstyle
-%patch22 -p1 -b .kio
 %patch24 -p1 -b .libtool
-%patch31 -p1 -b .im
 %patch32 -p1 -b .cups
-%patch33 -p1 -b .trash
+%patch33 -p1 -b .ppc
+%patch34 -p1 -b .qtdoc
 
-# CVS fixes
-%patch100 -p1 -b .ccs
-%patch101 -p1 -b .xml
-
-# security fixes
-pushd khtml
-%patch200 -p0 -b .smb
-popd
-pushd kio
-%patch201 -p0 -b .smb
-popd
-%patch202 -p0 -b .html2
-%patch203 -p1 -b .java
-%patch204 -p0 -b .CAN-2004-1165
+# Security patches
+%patch100 -p1 -b .CVE-2006-0019
 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
@@ -200,8 +182,10 @@
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
+export QTDOC=%{qtdocdir}
+export libltdl_cv_shlibext=".so"
 
-%if %{libtool}
+%if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
 
@@ -286,6 +270,7 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/services/
 
 pushd $RPM_BUILD_ROOT%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
@@ -309,8 +294,40 @@
 popd
 
 %if %{redhatify}
+   pushd $RPM_BUILD_ROOT%{_datadir}/icons/crystalsvg
+    for s in 16x16 22x22 32x32 48x48 64x64 128x128; do
+      pushd $s/apps/ || continue
+       # package icons
+       ln -sf package_wordprocessing.png redhat-office.png
+       ln -sf package_network.png redhat-internet.png
+       ln -sf package_applications.png redhat-accessories.png
+       ln -sf package_graphics.png redhat-graphics.png
+       ln -sf package_games.png redhat-games.png
+       ln -sf multimedia.png redhat-sound_video.png
+       ln -sf package_settings.png redhat-preferences.png
+       ln -sf package_development.png redhat-programming.png
+       ln -sf ../filesystems/server.png redhat-network-server.png
+       ln -sf ../filesystems/server.png redhat-server_settings.png
+       ln -sf package_utilities.png redhat-system_tools.png
+       ln -sf package_system.png redhat-system_settings.png
+       ln -sf package_utilities.png redhat-tools.png
+       # app icons
+       ln -sf kmail.png redhat-email.png
+       ln -sf konqueror.png redhat-web-browser.png
+       ln -sf kfm.png redhat-filemanager.png
+       ln -sf kfm_home.png redhat-home.png
+       ln -sf kviewshell.png redhat-logviewer.png
+       # system settings
+       ln -sf multimedia.png system-config-soundcard.png
+      popd
+    done
+   popd
    rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
-   mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde
+   rm -f $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu
+   install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xdg/menus/
+   pushd $RPM_BUILD_ROOT/etc/xdg/menus/
+     ln -s applications-merged kde-applications-merged
+   popd
    echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kresources.desktop
 %endif
 
@@ -331,65 +348,12 @@
 
 %files
 %defattr(-,root,root)
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
-%attr(4755,root,root) %{_bindir}/kgrantpty
 /etc/profile.d/*
 /etc/xdg/menus/*
-%{_bindir}/ghns
-%{_bindir}/fileshareset
-%{_bindir}/khotnewstuff
-%{_bindir}/makekdewidgets
-%if %{arts}
-%{_bindir}/artsmessage
-%endif
-%{_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}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_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}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/kimage_concat
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/ksvgtopng
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/meinproc
-%{_bindir}/preparetips
+%{_bindir}/*
+%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
+%attr(4755,root,root) %{_bindir}/kgrantpty
+%exclude %{_bindir}/dcopidl*
 %{_libdir}/lib*
 %{_libdir}/kde3
 %{_datadir}/applications
@@ -397,6 +361,7 @@
 %{_datadir}/locale/all_languages
 %dir %{_datadir}/config
 %config(noreplace) %{_datadir}/config/*
+%{_datadir}/emoticons
 %{_datadir}/icons
 %{_datadir}/mimelnk
 %{_datadir}/autostart
@@ -415,6 +380,50 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Fri Feb 17 2006 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.4
+- migrated changes into the FC-3 branch
+
+* Wed Jan 11 2006 Karsten Hopp <karsten at redhat.de> 6:3.4.2-0.fc3.3
+- fix kjs encodeuri/decodeuri heap overflow vulnerability, CVE-2006-0019
+
+* Tue Aug 02 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.2 
+- typo fixes
+
+* Tue Aug 02 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.1
+- update to 3.4.2
+
+* Tue Jul 12 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.14.FC3
+- Kate backup file permission leak, apply patch to fix this vulnerabilities
+  CAN-2005-1920
+- apply cvs patch to get rid of warning "Mutex destroy failure", #160922
+
+* Wed May 04 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.13.FC3
+- new patch to fix kimgio input validation vulnerabilities, CAN-2005-1046
+
+* Tue Apr 19 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.12.FC3
+- apply patch to fix gcc warning #117938
+
+* Tue Apr 19 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.11.FC3
+- add missing kde documents #152307
+- apply patch to fix kimgio input validation vulnerabilities, CAN-2005-1046
+- add hack for loading of *.so shared object files #142244 
+
+* Mon Apr 18 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.10.FC3
+- backport the patch to fix kimgio input validation vulnerabilities,
+  CAN-2005-1046, #152093, thanks to KDE security team
+
+* Wed Mar 23 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.9.FC3
+- Applied patch to fix konqueror international domain name spoofing,
+  CAN-2005-0237, #147405
+- get rid of broken AltiVec instructions on ppc
+
+* Wed Mar 02 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.8.FC3
+- Applied patch to fix DCOP DoS, CAN-2005-0396, #150092
+  thanks KDE security team
+
+* Wed Feb 16 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.7.FC3
+- Applied patch to fix dcopidlng insecure temporary file usage, CAN-2005-0365, #148823
+
 * Fri Jan 21 2005 Than Ngo <than at redhat.com> 6:3.3.1-2.6.FC3
 - Applied patch to fix ftp kioslave command injection, CAN-2004-1165
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-3/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	21 Dec 2004 15:33:49 -0000	1.33
+++ sources	17 Feb 2006 19:23:59 -0000	1.34
@@ -1 +1 @@
-8636c93405b20eceadb12af5c5483508  kdelibs-3.3.1.tar.bz2
+fe69f2f5c66dffd8fc741dcff221b80c  kdelibs-3.4.2.tar.bz2


--- kdelibs-3.1-defaultstyle.patch DELETED ---


--- kdelibs-3.1-kio.patch DELETED ---


--- kdelibs-3.1.95-buildroot.patch DELETED ---


--- kdelibs-3.2.2-kate-setInputMethodEnabled-20040525.diff DELETED ---


--- kdelibs-3.3.0-trash.patch DELETED ---


--- kdelibs-3.3.1-cvs.patch DELETED ---


--- kdelibs-3.3.1-java.patch DELETED ---


--- kdelibs-3.3.1-xml.patch DELETED ---


--- post-3.3.1-kdelibs-khtml.diff DELETED ---


--- post-3.3.1-kdelibs-kio.diff DELETED ---


--- post-3.3.2-kdelibs-htmlframes2.patch DELETED ---


--- post-3.3.2-kdelibs-kioslave.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:30:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:30:55 -0500
Subject: rpms/tomboy/devel tomboy-0.3.5-wrapper.patch, NONE, 1.1 tomboy.spec,
	1.14, 1.15
Message-ID: <200602171930.k1HJUtgi021890@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/tomboy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21859

Modified Files:
	tomboy.spec 
Added Files:
	tomboy-0.3.5-wrapper.patch 
Log Message:
* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-3
- Don't run tomboy in the current working directory


tomboy-0.3.5-wrapper.patch:
 tomboy.in |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

--- NEW FILE tomboy-0.3.5-wrapper.patch ---
--- tomboy-0.3.5/Tomboy/tomboy.in.wrapper	2006-02-17 14:25:00.000000000 -0500
+++ tomboy-0.3.5/Tomboy/tomboy.in	2006-02-17 14:25:39.000000000 -0500
@@ -1,18 +1,9 @@
 #!/bin/sh
 
-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
-    echo "*** Running uninstalled @target@ ***"
+export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
+export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 
-    export LD_LIBRARY_PATH="../libtomboy/.libs:$LD_LIBRARY_PATH"
-    export TOMBOY_WRAPPER_PATH="$PWD/@wrapper@"
-
-    THIS_EXE="--debug ./@target@"
-else
-    export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH"
-    export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
-
-    THIS_EXE="@pkglibdir@/@target@"
-fi
+THIS_EXE="@pkglibdir@/@target@"
 
 if [ -n "@extragac@" ]; then
     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"


Index: tomboy.spec
===================================================================
RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tomboy.spec	13 Feb 2006 04:09:39 -0000	1.14
+++ tomboy.spec	17 Feb 2006 19:30:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           tomboy
 Version:        0.3.5
-Release:        2
+Release:        3
 Summary:        Tomboy is a desktop note-taking application for Linux and Unix. 
 
 Group:          User Interface/Desktops
@@ -11,6 +11,8 @@
 Source2:      	tomboy-32.png
 Source3:      	tomboy-24.png
 Source4:      	tomboy-16.png
+Patch1:         tomboy-0.3.5-wrapper.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.2.3 atk-devel >= 1.2.4 gnome-panel-devel gtkspell-devel gtk-sharp dbus-sharp gmime-sharp
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .wrapper
 cp %SOURCE3 data/images/tintin.png
 
 %build
@@ -93,6 +96,9 @@
 %{_sysconfdir}/gconf/schemas/tomboy.schemas
 
 %changelog
+* Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-3
+- Don't run tomboy in the current working directory
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 0.3.5-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:47:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:47:45 -0500
Subject: rpms/libsepol/devel .cvsignore, 1.86, 1.87 libsepol.spec, 1.112,
	1.113 sources, 1.87, 1.88
Message-ID: <200602171947.k1HJljPw008019@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7983

Modified Files:
	.cvsignore libsepol.spec sources 
Log Message:
* Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-1
- Upgrade to latest from NSA
	* Merged node_expand_addr bugfix and node_compare* change from
	  Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- .cvsignore	16 Feb 2006 18:40:45 -0000	1.86
+++ .cvsignore	17 Feb 2006 19:47:41 -0000	1.87
@@ -84,3 +84,4 @@
 libsepol-1.11.13.tgz
 libsepol-1.11.14.tgz
 libsepol-1.11.17.tgz
+libsepol-1.11.18.tgz


Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- libsepol.spec	16 Feb 2006 18:40:45 -0000	1.112
+++ libsepol.spec	17 Feb 2006 19:47:41 -0000	1.113
@@ -1,6 +1,6 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
-Version: 1.11.17
+Version: 1.11.18
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -80,6 +80,11 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-1
+- Upgrade to latest from NSA
+	* Merged node_expand_addr bugfix and node_compare* change from
+	  Ivan Gyurdiev.
+
 * Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> 1.11.17-1
 - Upgrade to latest from NSA
 	* Merged nodes, ports: always prepend patch from Ivan Gyurdiev.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/sources,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sources	16 Feb 2006 18:40:45 -0000	1.87
+++ sources	17 Feb 2006 19:47:41 -0000	1.88
@@ -1 +1 @@
-ff1ac6cc6f395873b6114dc3527816a8  libsepol-1.11.17.tgz
+0390cbb550f2c99e179f9f93ac4969df  libsepol-1.11.18.tgz



From fedora-cvs-commits at redhat.com  Fri Feb 17 19:50:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 14:50:38 -0500
Subject: rpms/kdelibs/FC-2 kdelibs-3.2.2-dcopidlng-CAN-2005-0365.patch, NONE,
	1.1 post-3.2.3-kdelibs-dcop.patch, NONE, 1.1 kdelibs.spec,
	1.59, 1.60
Message-ID: <200602171950.k1HJocep009382@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-2
In directory cvs.devel.redhat.com:/tmp/cvs-serv9321

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.2.2-dcopidlng-CAN-2005-0365.patch 
	post-3.2.3-kdelibs-dcop.patch 
Log Message:
migrated changes into the FC-2 branch


kdelibs-3.2.2-dcopidlng-CAN-2005-0365.patch:
 dcopidlng |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.2.2-dcopidlng-CAN-2005-0365.patch ---
--- kdelibs-3.2.2/dcop/dcopidlng/dcopidlng.orig	2004-02-28 10:49:37.000000000 +0100
+++ kdelibs-3.2.2/dcop/dcopidlng/dcopidlng	2005-02-16 14:09:27.446764848 +0100
@@ -3,11 +3,14 @@
     KDECONFIG=kde-config
 fi
 LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
-perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>/tmp/dcopidlng.stderr.$$
+trap "rm -f $tmpfile; exit 1" 1 2 3 5 15
+tmpfile=`/bin/mktemp 2>/dev/null`
+[ $? -eq 0 ] || exit 1
+perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>$tmpfile
 RET=$?
 if [ $RET -ne 0 ]
 then
-   cat /tmp/dcopidlng.stderr.$$ >&2
+   cat $tmpfile >&2
 fi
-rm /tmp/dcopidlng.stderr.$$
+rm $tmpfile
 exit $RET

post-3.2.3-kdelibs-dcop.patch:
 KDE-ICE/Xtranssock.c |    5 +----
 dcopserver.cpp       |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE post-3.2.3-kdelibs-dcop.patch ---
Index: dcop/dcopserver.cpp
===================================================================
RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
retrieving revision 1.160.2.4
diff -u -p -r1.160.2.4 dcopserver.cpp
--- dcop/dcopserver.cpp	6 Aug 2004 11:16:30 -0000	1.160.2.4
+++ dcop/dcopserver.cpp	2 Mar 2005 13:17:09 -0000
@@ -984,7 +984,7 @@ DCOPServer::DCOPServer(bool _suicide)
 	}
 
     char errormsg[256];
-    int orig_umask = umask(0); /*old libICE's don't reset the umask() they set */
+    int orig_umask = umask(077); /*old libICE's don't reset the umask() they set */
     if (!IceListenForConnections (&numTransports, &listenObjs,
 				  256, errormsg))
 	{
Index: dcop/KDE-ICE/Xtranssock.c
===================================================================
RCS file: /home/kde/kdelibs/dcop/KDE-ICE/Xtranssock.c,v
retrieving revision 1.9
diff -u -p -r1.9 Xtranssock.c
--- dcop/KDE-ICE/Xtranssock.c	19 Mar 2003 18:35:52 -0000	1.9
+++ dcop/KDE-ICE/Xtranssock.c	2 Mar 2005 13:17:10 -0000
@@ -937,6 +937,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
 #endif
 
     unlink (sockname.sun_path);
+    (void) umask (oldUmask);
 
     if ((status = TRANS(SocketCreateListener) (ciptr,
 	(struct sockaddr *) &sockname, namelen)) < 0)
@@ -944,7 +945,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
 	PRMSG (1,
     "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
 	    0, 0, 0);
-	(void) umask (oldUmask);
 	return status;
     }
 
@@ -962,7 +962,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
         PRMSG (1,
         "SocketUNIXCreateListener: Can't allocate space for the addr\n",
 	    0, 0, 0);
-	(void) umask (oldUmask);
         return TRANS_CREATE_LISTENER_FAILED;
     }
 
@@ -970,8 +969,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
     ciptr->addrlen = namelen;
     memcpy (ciptr->addr, &sockname, ciptr->addrlen);
 
-    (void) umask (oldUmask);
-
     return 0;
 }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-2/kdelibs.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kdelibs.spec	21 Jan 2005 14:35:55 -0000	1.59
+++ kdelibs.spec	17 Feb 2006 19:50:35 -0000	1.60
@@ -20,14 +20,14 @@
 %define alsa 1
 
 Version: 3.2.2
-Release: 12.FC2
+Release: 15.FC2
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
 Epoch: 6
 Group: System Environment/Libraries
 License: LGPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kde.sh
@@ -74,6 +74,13 @@
 # FTP command injection vulnerability, CAN-2004-1165
 Patch109: post-3.2.3-kdelibs-kioslave.patch
 
+# Patch205: CAN-2005-0365 dcopidlng insecure temporary file usage
+Patch110: kdelibs-3.2.2-dcopidlng-CAN-2005-0365.patch
+
+
+# CAN-2005-0396, Local DCOP denial of service vulnerability
+Patch111: post-3.2.3-kdelibs-dcop.patch
+
 # Source3: KDE Security Advisory: Konqueror Java Vulnerability
 Source3: post-3.2.2-kdelibs-khtml-java.tar.bz2
 
@@ -193,6 +200,8 @@
 %patch108 -p0 -b .smb
 popd
 %patch109 -p0 -b .CAN-2004-1165
+%patch110 -p1 -b .CAN-2005-0365
+%patch111 -p0 -b .CAN-2005-0396
 
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
@@ -399,6 +408,16 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Fri Feb 17 2006 Than Ngo <than at redhat.com> 6:3.2.2-15.FC2
+- migrated changes into the FC-2 branch
+
+* Wed Mar 02 2005 Than Ngo <than at redhat.com> 6:3.2.2-14.FC2
+- Applied patch to fix DCOP DoS, CAN-2005-0396, #150090
+  thanks KDE security team
+
+* Wed Feb 16 2005 Than Ngo <than at redhat.com> 3.2.2-13.FC2
+- Applied patch to fix dcopidlng insecure temporary file usage, CAN-2005-0365, #148823
+
 * Fri Jan 21 2005 Than Ngo <than at redhat.com> 3.2.2-12.FC2
 - Applied patch to fix ftp kioslave command injection, CAN-2004-1165
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:00:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:00:11 -0500
Subject: rpms/checkpolicy/devel checkpolicy.spec,1.93,1.94
Message-ID: <200602172000.k1HK0B17013403@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/checkpolicy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13342

Modified Files:
	checkpolicy.spec 
Log Message:
* Fri Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.29.4-1
- Latest upgrade from NSA
	* Added a check for failure to declare each sensitivity in
	  a level definition.
	* Changed to clone level data for aliased sensitivities to
	  avoid double free upon sens_destroy.  Bug reported by Kevin
	  Carr of Tresys Technology.



Index: checkpolicy.spec
===================================================================
RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- checkpolicy.spec	16 Feb 2006 18:44:15 -0000	1.93
+++ checkpolicy.spec	17 Feb 2006 20:00:08 -0000	1.94
@@ -1,4 +1,4 @@
-%define libsepolver 1.11.17-1
+%define libsepolver 1.11.18-1
 Summary: SELinux policy compiler
 Name: checkpolicy
 Version: 1.29.4



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:00:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:00:57 -0500
Subject: rpms/libsemanage/devel .cvsignore, 1.53, 1.54 libsemanage.spec, 1.76,
	1.77 sources, 1.55, 1.56
Message-ID: <200602172000.k1HK0vCr013446@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13409

Modified Files:
	.cvsignore libsemanage.spec sources 
Log Message:
* Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.28-1
- Upgrade to latest from NSA
	* Merged bug fix for fcontext validate handler from Ivan Gyurdiev.
	* Merged base_merge_components changes from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	16 Feb 2006 18:44:02 -0000	1.53
+++ .cvsignore	17 Feb 2006 20:00:24 -0000	1.54
@@ -56,3 +56,4 @@
 libsemanage-1.5.21.tgz
 libsemanage-1.5.23.tgz
 libsemanage-1.5.26.tgz
+libsemanage-1.5.28.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libsemanage.spec	16 Feb 2006 18:44:02 -0000	1.76
+++ libsemanage.spec	17 Feb 2006 20:00:24 -0000	1.77
@@ -1,8 +1,8 @@
-%define libsepolver 1.11.17-1
+%define libsepolver 1.11.18-1
 %define libselinuxver 1.29.6-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.5.26
+Version: 1.5.28
 Release: 1
 License: GPL
 Group: System Environment/Libraries
@@ -75,6 +75,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.28-1
+- Upgrade to latest from NSA
+	* Merged bug fix for fcontext validate handler from Ivan Gyurdiev.
+	* Merged base_merge_components changes from Ivan Gyurdiev.
+
 * Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> - 1.5.26-1
 - Upgrade to latest from NSA
 	* Merged paths array patch from Ivan Gyurdiev.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	16 Feb 2006 18:44:02 -0000	1.55
+++ sources	17 Feb 2006 20:00:24 -0000	1.56
@@ -1 +1 @@
-a843bab0bdfee3026330d8727a3630cc  libsemanage-1.5.26.tgz
+42110b5a329e91eb8aff0c2cad7e2b72  libsemanage-1.5.28.tgz



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:20:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:20:58 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.36,1.37
Message-ID: <200602172020.k1HKKwhd032106@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32070

Modified Files:
	dmraid.spec 
Log Message:
add --enable-libsepol to configure


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dmraid.spec	17 Feb 2006 15:56:27 -0000	1.36
+++ dmraid.spec	17 Feb 2006 20:20:56 -0000	1.37
@@ -52,11 +52,11 @@
 %patch7 -p2 -b .owner
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug -enable-libselinux --enable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
 make DESTDIR=$RPM_BUILD_ROOT
 mv tools/dmraid tools/dmraid.static
 make clean
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug -enable-libselinux --disable-static_link
+%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link
 %if "%{dmraid_build_dso}" == "1"
 (cd lib ; make DESTDIR=$RPM_BUILD_ROOT libdmraid.so)
 make DESTDIR=$RPM_BUILD_ROOT
@@ -106,7 +106,7 @@
 %changelog
 * Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc9-FC5_5.3
 - add doc/dmraid_design.txt to %doc (#181885)
-- add --enable-libselinux to configure
+- add --enable-libselinux --enable-libsepol to configure
 - not build yet
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.2



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:39:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:39:57 -0500
Subject: rpms/dmraid/devel sources,1.14,1.15 dmraid.spec,1.37,1.38
Message-ID: <200602172039.k1HKdvmJ029760@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29747

Modified Files:
	sources dmraid.spec 
Log Message:
1.0.0.rc10-FC5_6 rebuilt


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	10 Nov 2005 22:08:09 -0000	1.14
+++ sources	17 Feb 2006 20:39:53 -0000	1.15
@@ -1 +1 @@
-09084ba1d7a229f9aa416a5f3b371546  dmraid-1.0.0.rc9.tar.bz2
+0206f8166bfdc370c4ee8efcb35af111  dmraid-1.0.0.rc10.tar.bz2


Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dmraid.spec	17 Feb 2006 20:20:56 -0000	1.37
+++ dmraid.spec	17 Feb 2006 20:39:53 -0000	1.38
@@ -1,27 +1,19 @@
 #
-# Copyright (C)  Heinz Mauelshagen, 2004 Red Hat GmbH. All rights reserved.
+# Copyright (C)  Heinz Mauelshagen, 2004-2006 Red Hat GmbH. All rights reserved.
 #
 # See file LICENSE at the top of this source tree for license information.
 #
 
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
-Version: 1.0.0.rc9
-Release: FC5_5.3
+Version: 1.0.0.rc10
+Release: FC5_6
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
 Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2
-Patch0: dmraid-1.0.0.rc9-selinux.patch
-Patch1: dmraid-1.0.0.rc9-install.patch
-Patch2: dmraid-1.0.0.rc9-dupes.patch
-Patch3: dmraid-1.0.0.rc9-exports.patch
-Patch4: dmraid-1.0.0.rc9-table.patch
-Patch5: dmraid-1.0.0.rc9-destdir.patch
-Patch6: dmraid-1.0.0.rc9-counts.patch
-Patch7: dmraid-1.0.0.rc9-owner.patch
 
 ExcludeArch:	s390
 ExcludeArch:	s390x
@@ -42,14 +34,6 @@
 
 %prep
 %setup -q -n dmraid/%{version}
-%patch0 -p2 -b .selinux
-%patch1 -p2 -b .install
-%patch2 -p2 -b .dupes
-%patch3 -p2 -b .exports
-%patch4 -p2 -b .table
-%patch5 -p2 -b .destdir
-%patch6 -p2 -b .counts
-%patch7 -p2 -b .owner
 
 %build
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link
@@ -104,10 +88,10 @@
 %endif
 
 %changelog
-* Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc9-FC5_5.3
+* Fri Feb 17 2006 Heinz Mauelshagen <jheinzm at redhat.com> - 1.0.0.rc10-FC5_6
 - add doc/dmraid_design.txt to %doc (#181885)
 - add --enable-libselinux --enable-libsepol to configure
-- not build yet
+- rebuilt
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.rc9-FC5_5.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:41:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:41:06 -0500
Subject: rpms/dmraid/devel .cvsignore,1.7,1.8
Message-ID: <200602172041.k1HKf6EQ029820@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29806

Modified Files:
	.cvsignore 
Log Message:
1.0.0.rc10-FC5_6 rebuilt


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Nov 2005 22:08:09 -0000	1.7
+++ .cvsignore	17 Feb 2006 20:40:56 -0000	1.8
@@ -1 +1 @@
-dmraid-1.0.0.rc9.tar.bz2
+dmraid-1.0.0.rc10.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:43:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:43:28 -0500
Subject: rpms/dmraid/devel dmraid.spec,1.38,1.39
Message-ID: <200602172043.k1HKhS7R029910@cvs.devel.redhat.com>

Author: heinzm

Update of /cvs/dist/rpms/dmraid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29897

Modified Files:
	dmraid.spec 
Log Message:



Index: dmraid.spec
===================================================================
RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- dmraid.spec	17 Feb 2006 20:39:53 -0000	1.38
+++ dmraid.spec	17 Feb 2006 20:43:26 -0000	1.39
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc10
-Release: FC5_6
+Release: FC5_6.1
 License: GPL
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid



From fedora-cvs-commits at redhat.com  Fri Feb 17 20:48:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 15:48:04 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.21, 1.22 pykickstart.spec, 1.21,
	1.22 sources, 1.22, 1.23
Message-ID: <200602172048.k1HKm43r010092@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10073

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Feb 2006 21:17:17 -0000	1.21
+++ .cvsignore	17 Feb 2006 20:48:02 -0000	1.22
@@ -10,3 +10,4 @@
 pykickstart-0.18.tar.gz
 pykickstart-0.19.tar.gz
 pykickstart-0.20.tar.gz
+pykickstart-0.21.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- pykickstart.spec	13 Feb 2006 21:17:17 -0000	1.21
+++ pykickstart.spec	17 Feb 2006 20:48:02 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.20
+Version: 0.21
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,10 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Fri Feb 17 2006 Chris Lumens <clumens at redhat.com> 0.21-1
+- Provide an option to not traceback on missing include files (#181760).
+- Update programming documentation.
+
 * Mon Feb 13 2006 Chris Lumens <clumens at redhat.com> 0.20-1
 - Correctly set --noformat and --useexisting on lvm and raid.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	13 Feb 2006 21:17:17 -0000	1.22
+++ sources	17 Feb 2006 20:48:02 -0000	1.23
@@ -1 +1 @@
-ba07f292ce3fc3a767e401c3ad9b84be  pykickstart-0.20.tar.gz
+237fd29ebd783e34f875d79cc2da495e  pykickstart-0.21.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:02:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:02:59 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc3-git9.bz2.sign, NONE,
	1.1 .cvsignore, 1.355, 1.356 kernel-2.6.spec, 1.1961,
	1.1962 sources, 1.297, 1.298 upstream, 1.272,
	1.273 patch-2.6.16-rc3-git8.bz2.sign, 1.1, NONE
Message-ID: <200602172202.k1HM2xwi002028@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1957

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc3-git9.bz2.sign 
Removed Files:
	patch-2.6.16-rc3-git8.bz2.sign 
Log Message:
git9



--- NEW FILE patch-2.6.16-rc3-git9.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD9h2ryGugalF9Dw4RAv0WAJ4soOutJ5PDQQjdri2EJ/I0EKeQ/gCfWryx
dfpaknc7uHJ8kOhpE8XgHlo=
=SGjj
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -r1.355 -r1.356
--- .cvsignore	17 Feb 2006 07:42:44 -0000	1.355
+++ .cvsignore	17 Feb 2006 22:02:26 -0000	1.356
@@ -5,3 +5,4 @@
 patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc3-git8.bz2
+patch-2.6.16-rc3-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1961
retrieving revision 1.1962
diff -u -r1.1961 -r1.1962
--- kernel-2.6.spec	17 Feb 2006 19:07:25 -0000	1.1961
+++ kernel-2.6.spec	17 Feb 2006 22:02:39 -0000	1.1962
@@ -216,7 +216,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git8.bz2
+Patch2: patch-2.6.16-rc3-git9.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1576,7 +1576,7 @@
 
 %changelog
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc3-git8
+- 2.6.16rc3-git8 & git9
 
 * Thu Feb 16 2006 John W. Linville <linville at redhat.com>
 - stop adding duplicate MODULE_VERSION line to tg3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- sources	17 Feb 2006 07:42:45 -0000	1.297
+++ sources	17 Feb 2006 22:02:39 -0000	1.298
@@ -2,3 +2,4 @@
 ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 ddea3173167a1a8334456254cc59f32e  patch-2.6.16-rc3-git8.bz2
+e32a660a1073a737ec819ab687940e06  patch-2.6.16-rc3-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- upstream	17 Feb 2006 07:42:45 -0000	1.272
+++ upstream	17 Feb 2006 22:02:39 -0000	1.273
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git8.bz2
+patch-2.6.16-rc3-git9.bz2


--- patch-2.6.16-rc3-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:05:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:05:12 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch, NONE, 1.1 eclipse.spec,
	1.247, 1.248
Message-ID: <200602172205.k1HM5CJr002156@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2108

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-ppc64.patch 
Log Message:
* Fri Feb 17 2006 Igor Foox <ifoox at redhat.com> - 1:3.1.2-1jpp_10fc
- Added patch for ppc64.


eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.all.xml                                                                   |    3 ++
 build                                                                                              |    4 +--
 features/org.eclipse.jdt.source/build.xml                                                          |    2 +
 features/org.eclipse.jdt/build.xml                                                                 |    6 +++++
 features/org.eclipse.pde.source/build.xml                                                          |    2 +
 features/org.eclipse.pde/build.xml                                                                 |    2 +
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 +--
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 -
 features/org.eclipse.platform.launchers/library/gtk/build.sh                                       |    4 +++
 features/org.eclipse.platform/build.xml                                                            |   12 ++++++++++
 features/org.eclipse.sdk/build.xml                                                                 |    4 +++
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 +
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 +++++
 13 files changed, 48 insertions(+), 5 deletions(-)

--- NEW FILE eclipse-ppc64.patch ---
diff -uNr assemble.org.eclipse.sdk.all.xml assemble.org.eclipse.sdk.all.xml
--- assemble.org.eclipse.sdk.all.xml	2006-02-17 15:38:51.000000000 -0500
+++ assemble.org.eclipse.sdk.all.xml	2006-02-17 15:40:11.000000000 -0500
@@ -19,6 +19,9 @@
 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ia64">
 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.ia64.xml"/>
 		</ant>
+		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ppc64">
+			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.ppc64.xml"/>
+		</ant>
 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86">
 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/>
 		</ant>
diff -uNr build build
--- build	2006-01-18 16:14:30.000000000 -0500
+++ build	2006-02-17 15:44:16.000000000 -0500
@@ -52,7 +52,7 @@
 	exit 1
 fi
 
-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ]
+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ]
 then
 		 ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH		 
 		 ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
@@ -63,4 +63,4 @@
 		 else
 		 		 echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
  		 exit 1
- fi
\ No newline at end of file
+ fi
diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
--- features/org.eclipse.jdt/build.xml	2006-01-18 16:09:14.000000000 -0500
+++ features/org.eclipse.jdt/build.xml	2006-02-17 15:49:17.000000000 -0500
@@ -164,6 +164,12 @@
 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
 		</copy>
 	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
+		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+		</copy>
+	</target>
 	<target name="rootFileslinux_motif_x86">
 		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
diff -uNr features/org.eclipse.jdt.source/build.xml features/org.eclipse.jdt.source/build.xml
--- features/org.eclipse.jdt.source/build.xml	2006-01-18 16:09:16.000000000 -0500
+++ features/org.eclipse.jdt.source/build.xml	2006-02-17 15:52:04.000000000 -0500
@@ -95,6 +95,8 @@
 	</target>
 	<target name="rootFileslinux_gtk_ia64">
 	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+	</target>
 	<target name="rootFileslinux_motif_x86">
 	</target>
 	<target name="rootFilessolaris_motif_sparc">
diff -uNr features/org.eclipse.pde/build.xml features/org.eclipse.pde/build.xml
--- features/org.eclipse.pde/build.xml	2006-01-18 16:09:16.000000000 -0500
+++ features/org.eclipse.pde/build.xml	2006-02-17 15:53:27.000000000 -0500
@@ -115,6 +115,8 @@
 	</target>
 	<target name="rootFileslinux_gtk_ia64">
 	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+	</target>
 	<target name="rootFileslinux_motif_x86">
 	</target>
 	<target name="rootFilessolaris_motif_sparc">
diff -uNr features/org.eclipse.pde.source/build.xml features/org.eclipse.pde.source/build.xml
--- features/org.eclipse.pde.source/build.xml	2006-01-18 16:09:14.000000000 -0500
+++ features/org.eclipse.pde.source/build.xml	2006-02-17 15:54:46.000000000 -0500
@@ -85,6 +85,8 @@
 	</target>
 	<target name="rootFileslinux_gtk_ia64">
 	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+	</target>
 	<target name="rootFileslinux_motif_x86">
 	</target>
 	<target name="rootFilessolaris_motif_sparc">
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
--- features/org.eclipse.platform/build.xml	2006-02-17 15:33:29.000000000 -0500
+++ features/org.eclipse.platform/build.xml	2006-02-17 15:58:47.000000000 -0500
@@ -435,6 +435,18 @@
 		<antcall target="copybuiltlauncher" />
 		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
 	</target>
+	<target name="rootFileslinux_gtk_ppc64">
+		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
+		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/ppc64" includes="**"			/>
+			<fileset dir="${basedir}/gtk" includes="**"			/>
+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+		</copy>
+		<!-- Copy the launcher that we built over the pre-built binary -->
+		<antcall target="copybuiltlauncher" />
+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
+	</target>
 	<target name="rootFileslinux_motif_x86">
 		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
diff -uNr features/org.eclipse.platform.launchers/build.xml features/org.eclipse.platform.launchers/build.xml
--- features/org.eclipse.platform.launchers/build.xml	2006-01-18 16:09:16.000000000 -0500
+++ features/org.eclipse.platform.launchers/build.xml	2006-02-17 16:00:51.000000000 -0500
@@ -55,7 +55,7 @@
 		<delete dir="${feature.temp.folder}"/>
 		<mkdir dir="${feature.temp.folder}"/>
 		<antcall target="gather.bin.parts" inheritAll="false">
-			<param name="arch" value="x86_64,ia64,PA_RISC,ppc,sparc,x86"/>
+			<param name="arch" value="x86_64,ia64,PA_RISC,ppc,sparc,x86,ppc64"/>
 			<param name="ws" value="carbon,gtk,motif,photon,win32"/>
 			<param name="nl" value="*"/>
 			<param name="os" value="aix,hpux,linux,macosx,qnx,solaris,win32"/>
@@ -81,7 +81,7 @@
 		<delete dir="${feature.temp.folder}"/>
 		<mkdir dir="${feature.temp.folder}"/>
 		<antcall target="gather.bin.parts">
-			<param name="arch" value="x86_64,ia64,PA_RISC,ppc,sparc,x86"/>
+			<param name="arch" value="x86_64,ia64,PA_RISC,ppc,sparc,x86,ppc64"/>
 			<param name="ws" value="carbon,gtk,motif,photon,win32"/>
 			<param name="nl" value="*"/>
 			<param name="include.children" value="true"/>
diff -uNr features/org.eclipse.platform.launchers/feature.xml features/org.eclipse.platform.launchers/feature.xml
--- features/org.eclipse.platform.launchers/feature.xml	2006-01-18 16:12:14.000000000 -0500
+++ features/org.eclipse.platform.launchers/feature.xml	2006-02-17 16:02:25.000000000 -0500
@@ -5,7 +5,7 @@
       version="3.1.0"
       os="aix,hpux,linux,macosx,qnx,solaris,win32"
       ws="carbon,gtk,motif,photon,win32"
-      arch="x86_64,ia64,PA_RISC,ppc,sparc,x86">
+      arch="x86_64,ia64,PA_RISC,ppc,sparc,x86,ppc64">
 
    <description>
       %description
diff -uNr features/org.eclipse.platform.launchers/library/gtk/build.sh features/org.eclipse.platform.launchers/library/gtk/build.sh
--- features/org.eclipse.platform.launchers/library/gtk/build.sh	2006-01-18 16:10:39.000000000 -0500
+++ features/org.eclipse.platform.launchers/library/gtk/build.sh	2006-02-17 16:03:21.000000000 -0500
@@ -62,6 +62,10 @@
 				defaultOSArch="ia64"
 				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
 				;;
+			"ppc64")
+				defaultOSArch="ppc64"
+				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+				;;
 			*)
 				echo "*** Unknown MODEL <${MODEL}>"
 				;;
diff -uNr features/org.eclipse.sdk/build.xml features/org.eclipse.sdk/build.xml
--- features/org.eclipse.sdk/build.xml	2006-01-18 16:09:14.000000000 -0500
+++ features/org.eclipse.sdk/build.xml	2006-02-17 16:09:06.000000000 -0500
@@ -98,6 +98,10 @@
 		</copy>
 	</target>
 	<target name="rootFileslinux_gtk_ppc64">
+		<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
+		<copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/gtk" includes="**"			/>
+		</copy>
 	</target>
 	<target name="rootFileslinux_gtk_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
diff -uNr plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases
--- plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2006-01-18 16:12:40.000000000 -0500
+++ plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases	2006-02-17 16:13:17.000000000 -0500
@@ -21,4 +21,6 @@
 Sparc                                   # SUN
 x86 pentium i386 i486 i586 i686         # Intel
 s390                                    # IBM System 390
+ppc64                                   # Motorola/IBM Power PC (64-bit)
+

diff -uNr plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java
--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2006-01-18 16:10:49.000000000 -0500
+++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java	2006-02-17 16:18:27.000000000 -0500
@@ -106,6 +106,12 @@
 	public static final String ARCH_AMD64 = ARCH_X86_64;
 
 	/**
+	 * Constant string (value "ppc64") indicating the platform is running on a
+	 * PowerPC 64-based architecture.
+	 */
+	public static final String ARCH_PPC64 = "ppc64"; //$NON-NLS-1$
+
+	/**
 	 * Constant string (value "ia64") indicating the platform is running on an
 	 * IA64-based architecture.
 	 */



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- eclipse.spec	17 Feb 2006 18:33:57 -0000	1.247
+++ eclipse.spec	17 Feb 2006 22:05:00 -0000	1.248
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_9fc
+Release:        1jpp_10fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -111,6 +111,9 @@
 Patch48:	%{name}-javadoclinks.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
 
 %if %{gcj_support}
 ExcludeArch: s390 s390x
@@ -433,6 +436,8 @@
 sed --in-place "s:/usr/share/:%{_datadir}/:g" platformOptions
 popd
 %patch49 -p0
+pwd
+%patch51 -p0
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -1279,6 +1284,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Fri Feb 17 2006 Igor Foox <ifoox at redhat.com> - 1:3.1.2-1jpp_10fc
+- Added patch for ppc64.
+
 * Fri Feb 17 2006 Igor Foox <ifoox at redhat.com> - 1:3.1.2-1jpp_9fc
 - Try build on ppc64.
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:09:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:09:32 -0500
Subject: rpms/metacity/devel .cvsignore, 1.32, 1.33 metacity.spec, 1.54,
	1.55 sources, 1.32, 1.33
Message-ID: <200602172209.k1HM9WXk003472@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3358

Modified Files:
	.cvsignore metacity.spec sources 
Log Message:
- Update to latest cvs snapshot to give meaningful failure error
  messages
- Don't remove build root in install, because it triggers a
  rebuild of metacity



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	17 Feb 2006 01:25:02 -0000	1.32
+++ .cvsignore	17 Feb 2006 22:09:29 -0000	1.33
@@ -1,2 +1,2 @@
-metacity-2.13.89.0.2006.02.16.tar.bz2
+metacity-2.13.89.0.2006.02.17.tar.bz2
 libcm-0.0.16.0.2006.02.16.tar.bz2


Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- metacity.spec	17 Feb 2006 01:25:02 -0000	1.54
+++ metacity.spec	17 Feb 2006 22:09:29 -0000	1.55
@@ -1,16 +1,17 @@
 %define gettext_package metacity
 
-%define snapshot_date 2006.02.16
 %define libcm_version 0.0.16
+%define libcm_snapshot_date 2006.02.16
 %define metacity_version 2.13.89
+%define metacity_snapshot_date 2006.02.17
 
 Summary: Metacity window manager
 Name: metacity
-Version: %{metacity_version}.0.%{snapshot_date}
+Version: %{metacity_version}.0.%{metacity_snapshot_date}
 Release: 1
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: metacity-%{metacity_version}.0.%{snapshot_date}.tar.bz2
-Source1: libcm-%{libcm_version}.0.%{snapshot_date}.tar.bz2
+Source0: metacity-%{metacity_version}.0.%{metacity_snapshot_date}.tar.bz2
+Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -43,19 +44,20 @@
 GNOME 2.
 
 %prep
-%setup -q -n metacity-%{metacity_version}.0.%{snapshot_date}
-%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{snapshot_date}
+%setup -q -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
+%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{metacity_snapshot_date}
 
 %patch0 -p1 -b .ctrlaltdel
 %patch1 -p1 -b .static-cm
 %patch2 -p1 -b .fix-type
 
-pushd libcm-%{libcm_version}.0.%{snapshot_date}
+pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
 %patch3 -p1 -b .include-glxext
 popd
 
 %build
-pushd libcm-%{libcm_version}.0.%{snapshot_date}
+rm -rf $RPM_BUILD_ROOT
+pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
 %configure
 make
 make install DESTDIR=$RPM_BUILD_ROOT 
@@ -66,17 +68,15 @@
 LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
 LIBS="$LIBS -lXrender -lXcursor"
 LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
-LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{snapshot_date}/src/.libs/libcm.a"
+LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a"
 export LIBS
 
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
-autoconf
+autoreconf
 %configure --enable-compositor
 
-make
-
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSIONS"
 
 for I in $SHOULD_HAVE_DEFINED; do
@@ -90,8 +90,10 @@
   fi
 done
 
+make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS"
+
 %install
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -130,6 +132,12 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 17 2006 Ray Strode <rstrode at redhat.com> - 2.13.89.0.2006.02.17-1
+- Update to latest cvs snapshot to give meaningful failure error
+  messages
+- Don't remove build root in install, because it triggers a
+  rebuild of metacity
+
 * Thu Feb 16 2006 Ray Strode <rstrode at redhat.com> - 2.13.89.0.2006.02.16-1
 - Update to cvs snapshot to add the ability to 
   runtime enable compositor


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	17 Feb 2006 01:25:02 -0000	1.32
+++ sources	17 Feb 2006 22:09:29 -0000	1.33
@@ -1,2 +1,2 @@
-6e8e728e55756dd689c2cb26a16fa764  metacity-2.13.89.0.2006.02.16.tar.bz2
+4c8a668019049dd6a4321ad0d0fc93ae  metacity-2.13.89.0.2006.02.17.tar.bz2
 72896fe1209ee3c85944ef52c373eb14  libcm-0.0.16.0.2006.02.16.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:24:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:24:50 -0500
Subject: rpms/gcc/devel gcc41-pr26334.patch, NONE, 1.1 .cvsignore, 1.134,
	1.135 gcc41.spec, 1.36, 1.37 sources, 1.136,
	1.137 gcc41-fortran-finclude.patch, 1.2,
	NONE gcc41-pr22275.patch, 1.1, NONE gcc41-pr26151.patch, 1.1,
	NONE gcc41-pr26209.patch, 1.2, NONE
Message-ID: <200602172224.k1HMOoIo022915@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22834

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-pr26334.patch 
Removed Files:
	gcc41-fortran-finclude.patch gcc41-pr22275.patch 
	gcc41-pr26151.patch gcc41-pr26209.patch 
Log Message:
4.1.0-0.28


gcc41-pr26334.patch:
 stmt.c                                       |    1 +
 testsuite/gcc.c-torture/compile/20060217-1.c |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

--- NEW FILE gcc41-pr26334.patch ---
2006-02-17  Jakub Jelinek  <jakub at redhat.com>

	PR middle-end/26334
	* stmt.c (decl_overlaps_hard_reg_set_p): Only look at
	DECL_RTL of DECL_REGISTER if DECL_ASSEMBLER_NAME_SET_P.

	* gcc.c-torture/compile/20060217-1.c: New test.

--- gcc/stmt.c.jj	2006-02-15 10:05:18.000000000 +0100
+++ gcc/stmt.c	2006-02-17 11:36:30.000000000 +0100
@@ -571,6 +571,7 @@ decl_overlaps_hard_reg_set_p (tree *decl
   if (TREE_CODE (decl) == VAR_DECL || TREE_CODE (decl) == PARM_DECL)
     {
       if (DECL_REGISTER (decl)
+	  && DECL_ASSEMBLER_NAME_SET_P (decl)
 	  && REG_P (DECL_RTL (decl))
 	  && REGNO (DECL_RTL (decl)) < FIRST_PSEUDO_REGISTER)
 	{
--- gcc/testsuite/gcc.c-torture/compile/20060217-1.c.jj	2006-02-17 11:37:29.000000000 +0100
+++ gcc/testsuite/gcc.c-torture/compile/20060217-1.c	2006-02-17 11:37:56.000000000 +0100
@@ -0,0 +1,25 @@
+/* PR middle-end/26334 */
+
+struct U
+{
+  unsigned int u[256];
+};
+
+struct S
+{
+  int u, v, w, x;
+  int s[255];
+};
+
+int
+foo (struct U *x, struct S *y)
+{
+  register int i;
+  for (i = 0; i < 255; i++)
+    {
+      unsigned int v;
+      __asm__ ("" : "=r" (v) : "0" (x->u[i + 1]) : "cc");
+      y->s[i] = v;
+    }
+  return 0;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- .cvsignore	14 Feb 2006 17:04:22 -0000	1.134
+++ .cvsignore	17 Feb 2006 22:24:47 -0000	1.135
@@ -1 +1 @@
-gcc-4.1.0-20060214.tar.bz2
+gcc-4.1.0-20060217.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gcc41.spec	15 Feb 2006 01:24:58 -0000	1.36
+++ gcc41.spec	17 Feb 2006 22:24:47 -0000	1.37
@@ -1,6 +1,6 @@
-%define DATE 20060214
+%define DATE 20060217
 %define gcc_version 4.1.0
-%define gcc_release 0.27
+%define gcc_release 0.28
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -103,18 +103,15 @@
 Patch6: gcc41-ada-pr18302.patch
 Patch7: gcc41-ada-tweaks.patch
 Patch8: gcc41-java-slow_pthread_self.patch
-Patch9: gcc41-fortran-finclude.patch
-Patch10: gcc41-ppc32-retaddr.patch
-Patch11: gcc41-sparc64-g7.patch
-Patch12: gcc41-fortran-where.patch
-Patch13: gcc41-expr_nonzero_p.patch
-Patch14: gcc41-libstdc++-bitset.patch
-Patch15: gcc41-mmintrin.patch
-Patch16: gcc41-pr22275.patch
-Patch17: gcc41-pr25626.patch
-Patch18: gcc41-pr26151.patch
-Patch19: gcc41-pr26209.patch
-Patch20: gcc41-vrp.patch
+Patch9: gcc41-ppc32-retaddr.patch
+Patch10: gcc41-sparc64-g7.patch
+Patch11: gcc41-fortran-where.patch
+Patch12: gcc41-expr_nonzero_p.patch
+Patch13: gcc41-libstdc++-bitset.patch
+Patch14: gcc41-mmintrin.patch
+Patch15: gcc41-pr25626.patch
+Patch16: gcc41-vrp.patch
+Patch17: gcc41-pr26334.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -402,18 +399,15 @@
 %patch6 -p0 -b .ada-pr18302~
 %patch7 -p0 -b .ada-tweaks~
 %patch8 -p0 -b .java-slow_pthread_self~
-%patch9 -p0 -b .fortran-finclude~
-%patch10 -p0 -b .ppc32-retaddr~
-%patch11 -p0 -b .sparc64-g7~
-%patch12 -p0 -b .fortran-where~
-%patch13 -p0 -b .expr_nonzero_p~
-%patch14 -p0 -b .libstdc++-bitset~
-%patch15 -p0 -b .mmintrin~
-%patch16 -p0 -b .pr22275~
-%patch17 -p0 -b .pr25626~
-%patch18 -p0 -b .pr26151~
-%patch19 -p0 -b .pr26209~
-%patch20 -p0 -b .vrp~
+%patch9 -p0 -b .ppc32-retaddr~
+%patch10 -p0 -b .sparc64-g7~
+%patch11 -p0 -b .fortran-where~
+%patch12 -p0 -b .expr_nonzero_p~
+%patch13 -p0 -b .libstdc++-bitset~
+%patch14 -p0 -b .mmintrin~
+%patch15 -p0 -b .pr25626~
+%patch16 -p0 -b .vrp~
+%patch17 -p0 -b .pr26334~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -713,8 +707,6 @@
 
 mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/
 mv -f $RPM_BUILD_ROOT%{_prefix}/include/omp.h $FULLPATH/include/
-mkdir -p $FULLPATH/finclude
-mv -f $RPM_BUILD_ROOT%{_prefix}/include/omp_lib* $FULLPATH/finclude/
 
 %if %{build_ada}
 mv -f $FULLPATH/adalib/libgnarl-*.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}/
@@ -1432,6 +1424,21 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Fri Feb 17 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.28
+- update from gcc-4_1-branch (-r110978:111179)
+  - PRs ada/20753, bootstrap/16787, bootstrap/26053, fortran/25806,
+	libfortran/15234, libgfortran/25949, middle-end/25335,
+	target/25259, target/26255
+  - fix ICE with shift by -1 (#181586, PR middle-end/26300)
+- merge gomp changes from trunk (-r110983:110984, -r111017:111018,
+  -r111152:111153 and -r111204:111205)
+  - PRs bootstrap/26161, fortran/26224, libgomp/25938, libgomp/25984
+- don't define _REENTRANT in gthr*.h (#176278, PR libstdc++/11953)
+- define _REENTRANT if -pthread and _POSIX_SOURCE if -posix on s390{,x}
+  and ia64
+- fix ICE with register variable and __asm statement (#181731,
+  PR middle-end/26334)
+
 * Tue Feb 14 2006 Alexandre Oliva <aoliva at redhat.com> 4.1.0-0.27
 - merge fix by Zdenek Dvorak for regression introduced by patch for PR
   tree-optimization/26209


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- sources	14 Feb 2006 17:04:24 -0000	1.136
+++ sources	17 Feb 2006 22:24:47 -0000	1.137
@@ -1 +1 @@
-c492d5acbe9bade087754f9216d87d13  gcc-4.1.0-20060214.tar.bz2
+12c833736a6a751792fa9f2b2e548da3  gcc-4.1.0-20060217.tar.bz2


--- gcc41-fortran-finclude.patch DELETED ---


--- gcc41-pr22275.patch DELETED ---


--- gcc41-pr26151.patch DELETED ---


--- gcc41-pr26209.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:31:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:31:44 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.1,1.2
Message-ID: <200602172231.k1HMViBX018499@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18482

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Fixed up ppc64patch

eclipse-ppc64.patch:
 build                                                                                              |    4 ++--
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 ++--
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 +-
 features/org.eclipse.sdk/build.xml                                                                 |    4 ++++
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 ++
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 ++++++
 6 files changed, 17 insertions(+), 5 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-ppc64.patch	17 Feb 2006 22:05:00 -0000	1.1
+++ eclipse-ppc64.patch	17 Feb 2006 22:31:27 -0000	1.2
@@ -1,16 +1,3 @@
-diff -uNr assemble.org.eclipse.sdk.all.xml assemble.org.eclipse.sdk.all.xml
---- assemble.org.eclipse.sdk.all.xml	2006-02-17 15:38:51.000000000 -0500
-+++ assemble.org.eclipse.sdk.all.xml	2006-02-17 15:40:11.000000000 -0500
-@@ -19,6 +19,9 @@
- 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ia64">
- 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.ia64.xml"/>
- 		</ant>
-+		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ppc64">
-+			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.ppc64.xml"/>
-+		</ant>
- 		<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86">
- 			<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/>
- 		</ant>
 diff -uNr build build
 --- build	2006-01-18 16:14:30.000000000 -0500
 +++ build	2006-02-17 15:44:16.000000000 -0500
@@ -30,80 +17,6 @@
 - fi
 \ No newline at end of file
 + fi
-diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
---- features/org.eclipse.jdt/build.xml	2006-01-18 16:09:14.000000000 -0500
-+++ features/org.eclipse.jdt/build.xml	2006-02-17 15:49:17.000000000 -0500
-@@ -164,6 +164,12 @@
- 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
- 		</copy>
- 	</target>
-+	<target name="rootFileslinux_gtk_ppc64">
-+		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
-+		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
-+		</copy>
-+	</target>
- 	<target name="rootFileslinux_motif_x86">
- 		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
- 		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
-diff -uNr features/org.eclipse.jdt.source/build.xml features/org.eclipse.jdt.source/build.xml
---- features/org.eclipse.jdt.source/build.xml	2006-01-18 16:09:16.000000000 -0500
-+++ features/org.eclipse.jdt.source/build.xml	2006-02-17 15:52:04.000000000 -0500
-@@ -95,6 +95,8 @@
- 	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 	</target>
-+	<target name="rootFileslinux_gtk_ppc64">
-+	</target>
- 	<target name="rootFileslinux_motif_x86">
- 	</target>
- 	<target name="rootFilessolaris_motif_sparc">
-diff -uNr features/org.eclipse.pde/build.xml features/org.eclipse.pde/build.xml
---- features/org.eclipse.pde/build.xml	2006-01-18 16:09:16.000000000 -0500
-+++ features/org.eclipse.pde/build.xml	2006-02-17 15:53:27.000000000 -0500
-@@ -115,6 +115,8 @@
- 	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 	</target>
-+	<target name="rootFileslinux_gtk_ppc64">
-+	</target>
- 	<target name="rootFileslinux_motif_x86">
- 	</target>
- 	<target name="rootFilessolaris_motif_sparc">
-diff -uNr features/org.eclipse.pde.source/build.xml features/org.eclipse.pde.source/build.xml
---- features/org.eclipse.pde.source/build.xml	2006-01-18 16:09:14.000000000 -0500
-+++ features/org.eclipse.pde.source/build.xml	2006-02-17 15:54:46.000000000 -0500
-@@ -85,6 +85,8 @@
- 	</target>
- 	<target name="rootFileslinux_gtk_ia64">
- 	</target>
-+	<target name="rootFileslinux_gtk_ppc64">
-+	</target>
- 	<target name="rootFileslinux_motif_x86">
- 	</target>
- 	<target name="rootFilessolaris_motif_sparc">
-diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml	2006-02-17 15:33:29.000000000 -0500
-+++ features/org.eclipse.platform/build.xml	2006-02-17 15:58:47.000000000 -0500
-@@ -435,6 +435,18 @@
- 		<antcall target="copybuiltlauncher" />
- 		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
- 	</target>
-+	<target name="rootFileslinux_gtk_ppc64">
-+		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
-+		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
-+			<fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/linux/ppc64" includes="**"			/>
-+			<fileset dir="${basedir}/gtk" includes="**"			/>
-+			<fileset dir="${basedir}/rootfiles" includes="**"			/>
-+			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
-+		</copy>
-+		<!-- Copy the launcher that we built over the pre-built binary -->
-+		<antcall target="copybuiltlauncher" />
-+		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
-+	</target>
- 	<target name="rootFileslinux_motif_x86">
- 		<mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/>
- 		<copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true">
 diff -uNr features/org.eclipse.platform.launchers/build.xml features/org.eclipse.platform.launchers/build.xml
 --- features/org.eclipse.platform.launchers/build.xml	2006-01-18 16:09:16.000000000 -0500
 +++ features/org.eclipse.platform.launchers/build.xml	2006-02-17 16:00:51.000000000 -0500
@@ -137,20 +50,6 @@
  
     <description>
        %description
-diff -uNr features/org.eclipse.platform.launchers/library/gtk/build.sh features/org.eclipse.platform.launchers/library/gtk/build.sh
---- features/org.eclipse.platform.launchers/library/gtk/build.sh	2006-01-18 16:10:39.000000000 -0500
-+++ features/org.eclipse.platform.launchers/library/gtk/build.sh	2006-02-17 16:03:21.000000000 -0500
-@@ -62,6 +62,10 @@
- 				defaultOSArch="ia64"
- 				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
-+			"ppc64")
-+				defaultOSArch="ppc64"
-+				OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
- 			*)
- 				echo "*** Unknown MODEL <${MODEL}>"
- 				;;
 diff -uNr features/org.eclipse.sdk/build.xml features/org.eclipse.sdk/build.xml
 --- features/org.eclipse.sdk/build.xml	2006-01-18 16:09:14.000000000 -0500
 +++ features/org.eclipse.sdk/build.xml	2006-02-17 16:09:06.000000000 -0500



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:32:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:32:20 -0500
Subject: rpms/lam/devel lam.module.in, NONE, 1.1 lam.pc.in, NONE,
	1.1 relpath.sh, NONE, 1.1 lam.spec, 1.31, 1.32
Message-ID: <200602172232.k1HMWKKY018532@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18493

Modified Files:
	lam.spec 
Added Files:
	lam.module.in lam.pc.in relpath.sh 
Log Message:
Enable co-existence with OpenMPI


--- NEW FILE lam.module.in ---
#%Module 1.0
#
#  LAM module for use with 'environment-modules' package:
# 
prepend-path 		PATH 		@DATADIR@/@NAME@/bin
prepend-path 		LD_LIBRARY_PATH @DATADIR@/@NAME@/lib
prepend-path 		MANPATH         @DATADIR@/@NAME@/man
setenv			CFLAGS		-I at DATADIR@/@NAME@/include
setenv			LDFLAGS		-L at DATADIR@/@NAME@/lib


--- NEW FILE lam.pc.in ---
# pkg-config file for lam
Name: 		lam
Description:	The LAM (Local Area Multicomputer) programming environment.
URL:		http://www.lam-mpi.org/
Version:	@VERSION@
Libs:		-L at LIBDIR@ -lmpi
Cflags: 	-I at INCLUDEDIR@


--- NEW FILE relpath.sh ---
#!/bin/bash
#
# Function to convert absolute path $2 to a relative path to $1
#
# There should be some builtin / utility which does this, 
# but I can't think of one at the moment...
#
# Copyright(C) Jason Vas Dias <jvdias at redhat.com>, Red Hat, Inc. 2006 
# Freely distributable under the terms of the GNU Public License(GPL)
#
function relpath()
{
    local IFS=/;
    local a=($1);
    local b=($2);
    unset IFS;
    a=(${a[@]});
    b=(${b[@]});
    local p='';
    for p in ${a[@]}; do
	[ ${b[0]} != $p ] && break;
	b[0]='';
	b=(${b[@]});
	a[0]='';
	a=(${a[@]});
    done
    local r='';
    for p in ${b[@]}; do
	r=../${r};
    done
    r=${r%/};
    for p in ${a[@]}; do
	r=$r/$p;
    done
    echo $r;
 }
 

Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lam.spec	11 Feb 2006 03:50:48 -0000	1.31
+++ lam.spec	17 Feb 2006 22:32:02 -0000	1.32
@@ -1,19 +1,22 @@
-%define _sysconfdir /etc/lam
-
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 8.FC5.2.1
+Release: 10.FC5
 License: BSD
 Epoch: 2
 Group: Development/Libraries
 Source: http://www.lam-mpi.org/download/files/lam-%{version}.tar.bz2
+Source1: relpath.sh
+Source2: lam.pc.in
+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
 Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
 Patch0: lam-7.1.1-f77-f95.patch
 
+%{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
+
 %description 
 LAM (Local Area Multicomputer) is an Message-Passing Interface (MPI)
 programming environment and development system for heterogeneous
@@ -53,12 +56,12 @@
 autoconf
 export FC=f95
 %ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --with-trillium --enable-shared
+%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/lam --includedir=%{_includedir}/lam --sysconfdir=%{_sysconfdir}/lam --with-trillium --enable-shared
 %else
 #
 # Disable TotalView on non-32 bit architectures.
 #
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir} --disable-tv --disable-tv-dll --with-trillium --enable-shared
+%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
 %endif
 
 make %{?_smp_mflags} all
@@ -82,10 +85,52 @@
 ln -f romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz 
 ln -f romio/README_LAM romio/ROMIO-README_LAM
 
-# FIXME: sanitize /usr/include/lam_config.h for bi-arch
+# FIXME: sanitize /usr/include/lam_config.h for bi-arch - huh ?
+
+# Remove .la files:
+find ${RPM_BUILD_ROOT}%{_libdir} -name \*.la | xargs rm
 
 # Remove wrong doc directory location (files shipped in %doc): 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/lam
+#
+#
+# Make LAM coexist with OpenMPI:
+#
+# Make /usr/share/lam environment-modules directory:
+. %SOURCE1
+# ^- provides "relpath" function
+rpath=`relpath ${RPM_BUILD_ROOT}/%{_bindir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin`;
+mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin;
+ln -s `relpath ${RPM_BUILD_ROOT}/%{_libdir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lib;
+ln -s `relpath ${RPM_BUILD_ROOT}/%{_includedir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/include;
+# Links: (mpiCC,mpicxx)->mpicc,  (mpiexec,mpirun)->orterun
+# Clashes with OpenMPI: mpic++ mpicc mpif77 mpiexec mpirun
+for b in mpirun mpiexec mpicc mpic++ mpif77 ; do
+  mv $RPM_BUILD_ROOT/%{_bindir}/$b $RPM_BUILD_ROOT/%{_bindir}/%{LAMbinpfx}$b; 
+  ln -s ./%{LAMbinpfx}$b $RPM_BUILD_ROOT/%{_bindir}/$b;
+  ln -s ${rpath}/%{LAMbinpfx}${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
+done;
+# Create the binaries in /usr/share/lam/bin for environment-modules environment:
+(cd ${RPM_BUILD_ROOT}/%{_bindir}; ls) | egrep -v '^(mpirun mpiexec mpicc mpic\+\+ mpif77)$' |
+while read b; do
+  ln -s ${rpath}/${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
+done;
+# Create the /usr/lib/*.so links for existing software that links with LAM 
+# - only libmpi.so actually clashes with OpenMPI, which can be made into an alternative(8):
+#(cd ${RPM_BUILD_ROOT}/%{_libdir}/%{name}; ls *.so) | while read l; do
+#    ln -s ./%{name}/$l $RPM_BUILD_ROOT/%{_libdir}/$l;
+#done;
+# 
+# Create the ldconfig file for LAM:
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
+echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+# Create the lam.pc pkgconfig file:
+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig
+sed 's#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}.pc;
+# Move man pages to /usr/share/lam/man :
+mv ${RPM_BUILD_ROOT}/%{_mandir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/man
+sed 's#@DATADIR@#'%{_datadir}/%{name}'#;s#@NAME@#'%{name}'#' < %SOURCE3 > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/%{name}.module
+:;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,22 +141,18 @@
 %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) /etc/lam
-
+%config(noreplace) %{_sysconfdir}/lam
+%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
+%config %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/*
-%{_libdir}/*.so*
-%{_mandir}/*/*
-%{_includedir}/*
-%{_libdir}/*a
-
-#
-# TotalView libs on 32-bit arches
-#
-%ifarch i386 s390 ppc
-%{_libdir}/lam/*
-%endif
+%{_includedir}/%{name}
+%{_libdir}/%{name}
+%{_datadir}/%{name}
 
 %changelog
+* Thu Feb 16 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.1-10.FC5
+- Enable co-existence with OpenMPI
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:7.1.1-8.FC5.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 17 22:43:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 17:43:05 -0500
Subject: rpms/gcc/devel gcc41-pr26334.patch,1.1,1.2
Message-ID: <200602172243.k1HMh54u018880@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18865

Modified Files:
	gcc41-pr26334.patch 
Log Message:
4.1.0-0.28


gcc41-pr26334.patch:
 stmt.c                                       |    2 +-
 testsuite/gcc.c-torture/compile/20060217-1.c |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

Index: gcc41-pr26334.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr26334.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc41-pr26334.patch	17 Feb 2006 22:24:47 -0000	1.1
+++ gcc41-pr26334.patch	17 Feb 2006 22:43:01 -0000	1.2
@@ -8,11 +8,11 @@
 
 --- gcc/stmt.c.jj	2006-02-15 10:05:18.000000000 +0100
 +++ gcc/stmt.c	2006-02-17 11:36:30.000000000 +0100
-@@ -571,6 +571,7 @@ decl_overlaps_hard_reg_set_p (tree *decl
+@@ -571,6 +571,6 @@ decl_overlaps_hard_reg_set_p (tree *decl
    if (TREE_CODE (decl) == VAR_DECL || TREE_CODE (decl) == PARM_DECL)
      {
-       if (DECL_REGISTER (decl)
-+	  && DECL_ASSEMBLER_NAME_SET_P (decl)
+-      if (DECL_REGISTER (decl)
++      if (DECL_HARD_REGISTER (decl)
  	  && REG_P (DECL_RTL (decl))
  	  && REGNO (DECL_RTL (decl)) < FIRST_PSEUDO_REGISTER)
  	{



From fedora-cvs-commits at redhat.com  Fri Feb 17 23:06:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 18:06:21 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc4.bz2.sign, NONE, 1.1 .cvsignore,
	1.356, 1.357 kernel-2.6.spec, 1.1962, 1.1963 sources, 1.298,
	1.299 upstream, 1.273, 1.274 linux-2.6-suspend-lvm.patch, 1.1,
	NONE patch-2.6.16-rc3-git9.bz2.sign, 1.1,
	NONE patch-2.6.16-rc3.bz2.sign, 1.1, NONE
Message-ID: <200602172306.k1HN6Lbs010087@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10029

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc4.bz2.sign 
Removed Files:
	linux-2.6-suspend-lvm.patch patch-2.6.16-rc3-git9.bz2.sign 
	patch-2.6.16-rc3.bz2.sign 
Log Message:
rc4



--- NEW FILE patch-2.6.16-rc4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD9lMlyGugalF9Dw4RAonWAKCNbZ16NF25HiUf35J6z0u+Vcn9sgCeN8cy
5xMunNNvXerx/4Y02dT3xnE=
=Y7us
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- .cvsignore	17 Feb 2006 22:02:26 -0000	1.356
+++ .cvsignore	17 Feb 2006 23:06:18 -0000	1.357
@@ -2,7 +2,5 @@
 temp-*
 kernel-2.6.15
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc3.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc3-git8.bz2
-patch-2.6.16-rc3-git9.bz2
+patch-2.6.16-rc4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1962
retrieving revision 1.1963
diff -u -r1.1962 -r1.1963
--- kernel-2.6.spec	17 Feb 2006 22:02:39 -0000	1.1962
+++ kernel-2.6.spec	17 Feb 2006 23:06:18 -0000	1.1963
@@ -215,8 +215,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc3.bz2
-Patch2: patch-2.6.16-rc3-git9.bz2
+Patch1: patch-2.6.16-rc4.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -370,7 +369,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-suspend-lvm.patch
 Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -688,7 +686,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -942,8 +939,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# Fix suspend on lvm
-%patch1860 -p1
 # Only print migration info on SMP
 %patch1890 -p1
 
@@ -1576,6 +1571,7 @@
 
 %changelog
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4
 - 2.6.16rc3-git8 & git9
 
 * Thu Feb 16 2006 John W. Linville <linville at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- sources	17 Feb 2006 22:02:39 -0000	1.298
+++ sources	17 Feb 2006 23:06:18 -0000	1.299
@@ -1,5 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
-ecfd157754bfdfa6dd03d28c8dc9b369  patch-2.6.16-rc3.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-ddea3173167a1a8334456254cc59f32e  patch-2.6.16-rc3-git8.bz2
-e32a660a1073a737ec819ab687940e06  patch-2.6.16-rc3-git9.bz2
+732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- upstream	17 Feb 2006 22:02:39 -0000	1.273
+++ upstream	17 Feb 2006 23:06:18 -0000	1.274
@@ -1,3 +1,2 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc3.bz2
-patch-2.6.16-rc3-git9.bz2
+patch-2.6.16-rc4.bz2


--- linux-2.6-suspend-lvm.patch DELETED ---


--- patch-2.6.16-rc3-git9.bz2.sign DELETED ---


--- patch-2.6.16-rc3.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 17 23:58:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 18:58:35 -0500
Subject: rpms/kexec-tools/devel kdump.init, 1.2, 1.3 kdump.sysconfig, 1.1,
	1.2 kexec-tools.spec, 1.9, 1.10
Message-ID: <200602172358.k1HNwZfq023480@cvs.devel.redhat.com>

Author: jmoyer

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23336

Modified Files:
	kdump.init kdump.sysconfig kexec-tools.spec 
Log Message:
- Fix the service stop case.  It was previously unloading the wrong kernel.
- Implement the "restart" function.
- Add the "irqpoll" option as a default kdump kernel commandline parameter.
- Create a default kernel command line in the sysconfig file upon rpm install.




Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.init	22 Nov 2005 21:52:53 -0000	1.2
+++ kdump.init	17 Feb 2006 23:58:33 -0000	1.3
@@ -75,6 +75,7 @@
 	if [ -z "$KDUMP_COMMANDLINE" ]; then
 		KDUMP_COMMANDLINE=`cat /proc/cmdline`
 		KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+		KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} irqpoll"
 	fi
 
 	$KEXEC $KEXEC_ARGS $standard_kexec_args $KEXEC_HEADERS \
@@ -92,13 +93,14 @@
 	fi
 	;;
   stop)
-	$KEXEC -u
+	$KEXEC -u -p
 	;;
   status)
 	echo "not implemented"
 	;;
   restart)
-	echo "not implemented"
+	$KEXEC -u -p
+	load_kdump
 	;;
   condrestart)
 	;;


Index: kdump.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.sysconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdump.sysconfig	23 Sep 2005 21:04:31 -0000	1.1
+++ kdump.sysconfig	17 Feb 2006 23:58:33 -0000	1.2
@@ -9,7 +9,7 @@
 #   KDUMP_COMMANDLINE="ro root=LABEL=/"
 # If a command line is not specified, the default will be taken from
 # /proc/cmdline
-KDUMP_COMMANDLINE=""
+KDUMP_COMMANDLINE="REPLACEME"
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kexec-tools.spec	7 Feb 2006 12:26:54 -0000	1.9
+++ kexec-tools.spec	17 Feb 2006 23:58:33 -0000	1.10
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 7.1.1
+Release: 8
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -64,6 +64,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+KDUMP_COMMANDLINE=`cat /proc/cmdline`
+KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+export KDUMP_COMMANDLINE
+sed -i -e "s|REPLACEME|$KDUMP_COMMANDLINE irqpoll|g" /etc/sysconfig/kdump
 chkconfig --add kdump
 
 %postun
@@ -92,6 +96,12 @@
 %doc TODO
 
 %changelog
+* Fri Feb 17 2006 Jeff Moyer <jmoyer at redhat.com> - 1.101-8
+- Fix the service stop case.  It was previously unloading the wrong kernel.
+- Implement the "restart" function.
+- Add the "irqpoll" option as a default kdump kernel commandline parameter.
+- Create a default kernel command line in the sysconfig file upon rpm install.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.101-7.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Sat Feb 18 00:44:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 19:44:31 -0500
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.12,1.13
Message-ID: <200602180044.k1I0iVZX007207@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7193

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
* Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
  mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7
  binaries.  This will provide backward compatibilty for Fedora Core 5, however
  3rd party developers and rpm package maintainers should update to using the
  new X11R7 locations immediately, as these compatibility links are temporary,
  and will be removed from a future OS release.
- Remove system directories from file manifest to appease the banshees.



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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-font-utils.spec	11 Feb 2006 06:24:41 -0000	1.12
+++ xorg-x11-font-utils.spec	18 Feb 2006 00:44:29 -0000	1.13
@@ -1,11 +1,20 @@
 %define pkgname font-utils
 
+# NOTE: When enabled, this provides symbolic links in /usr/X11R6/bin which
+# provide backward compatibility for utilities/scripts that hard code paths
+# to /usr/X11R6/bin/mkfontdir et al.  This compatibility support will be
+# disabled and removed in a future OS release, so 3rd party application
+# developers and package maintainers should update their software as soon
+# as possible.
+%define with_X11R6_compat 1
+%define _x11r6bindir /usr/X11R6/bin
+
 Summary: X.Org X11 font utilities
 Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.1
-Release: 1.2
+Release: 2
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -57,9 +66,9 @@
 Conflicts: XFree86
 # NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to
 # xorg-x11-font-utils in 6.7.99.903-3
-Conflicts: xorg-x11-base-fonts <= 6.7.99.903-3
+Obsoletes: xorg-x11-base-fonts <= 6.7.99.903-3
 # NOTE: ucs2any moved from xorg-x11-tools to xorg-x11-font-utils in 6.7.99.903-3
-Conflicts: xorg-x11-tools <= 6.7.99.903-3
+Obsoletes: xorg-x11-tools <= 6.7.99.903-3
 
 %description
 X.Org X11 font utilities required for font installation, conversion,
@@ -98,29 +107,44 @@
    done
 }
 
+%if %{with_X11R6_compat}
+{
+   mkdir -p $RPM_BUILD_ROOT%{_x11r6bindir}
+
+   for util in mkfontdir mkfontscale ; do
+      ln -sf ../../..%{_bindir}/$util $RPM_BUILD_ROOT%{_x11r6bindir}/$util
+   done
+}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+# FIXME: Include missing docs sometime
 %doc
-%dir %{_bindir}
 %{_bindir}/bdftopcf
 %{_bindir}/bdftruncate
 %{_bindir}/fonttosfnt
 %{_bindir}/mkfontdir
 %{_bindir}/mkfontscale
 %{_bindir}/ucs2any
-%dir %{_datadir}
+# NOTE: These compat symlinks will be removed in a future OS release.
+# Developers and package maintainers should update their software to handle
+# the X11R7 changes in a clean manner.
+%if %{with_X11R6_compat}
+%dir %{_x11r6bindir}
+%{_x11r6bindir}/mkfontdir
+%{_x11r6bindir}/mkfontscale
+%endif
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/fonts
 %dir %{_datadir}/X11/fonts/util
 %{_datadir}/X11/fonts/util/map-*
 %{_datadir}/aclocal/fontutil.m4
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/fontutil.pc
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/bdftopcf.1x*
 %{_mandir}/man1/bdftruncate.1x*
 %{_mandir}/man1/fonttosfnt.1x*
@@ -129,10 +153,19 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.1-1.2
+* Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
+- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
+  mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7
+  binaries.  This will provide backward compatibilty for Fedora Core 5, however
+  3rd party developers and rpm package maintainers should update to using the
+  new X11R7 locations immediately, as these compatibility links are temporary,
+  and will be removed from a future OS release.
+- Remove system directories from file manifest to appease the banshees.
+
+* 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
+* 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 18 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
@@ -170,16 +203,16 @@
 * Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 6.99.99.902-2
 - require newer filesystem (#172610)
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.902-1
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.902-1
 - Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
   X11R7 RC1.
 
-* Wed Nov 9 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-3
+* Wed Nov 09 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-3
 - Glob util/map-* files in file manifest.
 - Added missing "Obsoletes: xorg-x11-font-utils".
 - Added "BuildRequires: pkgconfig".
 
-* Sun Nov 6 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-2
+* Sun Nov 06 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.901-2
 - Added font-util-0.99.1 to package, from X11R7 RC1 release, which provides
   ucs2any, bdftruncate.
 



From fedora-cvs-commits at redhat.com  Sat Feb 18 01:01:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 17 Feb 2006 20:01:27 -0500
Subject: rpms/redhat-artwork/devel .cvsignore, 1.69, 1.70 redhat-artwork.spec,
	1.123, 1.124 sources, 1.71, 1.72
Message-ID: <200602180101.k1I11Rwt030236@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30204

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
0.239



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	9 Feb 2006 14:31:30 -0000	1.69
+++ .cvsignore	18 Feb 2006 01:01:19 -0000	1.70
@@ -6,3 +6,4 @@
 redhat-artwork-0.236.tar.gz
 redhat-artwork-0.237.tar.gz
 redhat-artwork-0.238.tar.gz
+redhat-artwork-0.239.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- redhat-artwork.spec	11 Feb 2006 05:31:00 -0000	1.123
+++ redhat-artwork.spec	18 Feb 2006 01:01:19 -0000	1.124
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.238
-Release: 1.1
+Version: 0.239
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -154,6 +154,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.239-1
+- Make the login screen adapt to label width
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.238-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources	9 Feb 2006 14:51:04 -0000	1.71
+++ sources	18 Feb 2006 01:01:19 -0000	1.72
@@ -1,4 +1,4 @@
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-5eaa09532af562bea59c10c28356928d  redhat-artwork-0.238.tar.gz
+7d055864ddb0ab7ea4f50844080215c7  redhat-artwork-0.239.tar.gz



From fedora-cvs-commits at redhat.com  Sat Feb 18 05:52:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 00:52:37 -0500
Subject: rpms/gnome-applets/devel gnome-applets-2.13.4-warning.patch, NONE,
	1.1 gnome-applets.spec, 1.113, 1.114
Message-ID: <200602180552.k1I5qbp1009198@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9103

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.13.4-warning.patch 
Log Message:
Avoid a warning in the stock ticker applet


gnome-applets-2.13.4-warning.patch:
 gtik.c |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE gnome-applets-2.13.4-warning.patch ---
--- gnome-applets-2.13.4/gtik/gtik.c.warning	2006-02-18 00:49:15.000000000 -0500
+++ gnome-applets-2.13.4/gtik/gtik.c	2006-02-18 00:49:35.000000000 -0500
@@ -154,7 +154,6 @@
 
 	/* accessibility funcs and vars */
 	static GtkWidget *access_drawing_area;
-	static GtkWidget *access_stock;
 
 	extern void set_relation (GtkWidget *widget, GtkLabel *label);
 	static void setup_refchild_nchildren(GtkWidget * vbox);
@@ -1687,7 +1686,6 @@
 		panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
 		
 		stockdata = g_new0 (StockData, 1);
-		access_stock = GTK_WIDGET (stockdata);
 
 		stockdata->applet = GTK_WIDGET (applet);
 		stockdata->timeout = 0;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gnome-applets.spec	15 Feb 2006 05:12:07 -0000	1.113
+++ gnome-applets.spec	18 Feb 2006 05:52:34 -0000	1.114
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.4
-Release:  	2
+Release:  	3
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -28,6 +28,8 @@
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
+Patch5:	        gnome-applets-2.13.4-warning.patch
+
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -65,10 +67,10 @@
 Source10:	cpufreq-selector.app
 Source11:	cpufreq-selector.pam
 
-
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
+
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
@@ -80,6 +82,7 @@
 %patch0 -p1 -b .use-old-modemlights
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
+%patch5 -p1 -b .warning
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -175,6 +178,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Feb 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-3
+- Remove a warning from the stock ticker applet
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-2
 - Build with --enable-mini-commander
 



From fedora-cvs-commits at redhat.com  Sat Feb 18 05:57:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 00:57:28 -0500
Subject: rpms/kernel/devel/configs config-generic,1.151,1.152
Message-ID: <200602180557.k1I5vSb7011425@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv11350/configs

Modified Files:
	config-generic 
Log Message:
reename EMI26



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- config-generic	15 Feb 2006 00:01:54 -0000	1.151
+++ config-generic	18 Feb 2006 05:57:25 -0000	1.152
@@ -2145,7 +2145,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



From fedora-cvs-commits at redhat.com  Sat Feb 18 05:57:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 00:57:28 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1963,1.1964
Message-ID: <200602180557.k1I5vRPf011417@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11350

Modified Files:
	kernel-2.6.spec 
Log Message:
reename EMI26



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1963
retrieving revision 1.1964
diff -u -r1.1963 -r1.1964
--- kernel-2.6.spec	17 Feb 2006 23:06:18 -0000	1.1963
+++ kernel-2.6.spec	18 Feb 2006 05:57:24 -0000	1.1964
@@ -1570,6 +1570,9 @@
 %endif
 
 %changelog
+* Sat Feb 18 2006 Dave Jones <davej at redhat.com>
+- Reenable EMI26 driver. (#181813)
+
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4
 - 2.6.16rc3-git8 & git9



From fedora-cvs-commits at redhat.com  Sat Feb 18 20:46:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 15:46:48 -0500
Subject: rpms/kernel/devel linux-2.6-x86-microcode-hotplug-cpu.patch, NONE,
	1.1 kernel-2.6.spec, 1.1964, 1.1965
Message-ID: <200602182046.k1IKkmwT012114@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12062

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-x86-microcode-hotplug-cpu.patch 
Log Message:
Fix counting of hotplug cpu's in x86 microcode driver



linux-2.6-x86-microcode-hotplug-cpu.patch:
 microcode.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-x86-microcode-hotplug-cpu.patch ---

This driver loops over 'num_online_cpus', but it doesn't account
for holes in the online map created by offlined cpus, and assumes
that the cpu numbers stay linear.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/arch/i386/kernel/microcode.c~	2006-02-18 14:41:09.000000000 -0500
+++ linux-2.6.15.noarch/arch/i386/kernel/microcode.c	2006-02-18 14:45:42.000000000 -0500
@@ -250,8 +250,8 @@ static int find_matching_ucodes (void) 
 			error = -EINVAL;
 			goto out;
 		}
-		
-		for (cpu_num = 0; cpu_num < num_online_cpus(); cpu_num++) {
+
+		for_each_online_cpu(cpu_num) {
 			struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
 			if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/
 				continue;
@@ -293,7 +293,7 @@ static int find_matching_ucodes (void) 
 					error = -EFAULT;
 					goto out;
 				}
-				for (cpu_num = 0; cpu_num < num_online_cpus(); cpu_num++) {
+				for_each_online_cpu(cpu_num) {
 					struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
 					if (uci->err != MC_NOTFOUND) /* already found a match or not an online cpu*/
 						continue;
@@ -304,7 +304,9 @@ static int find_matching_ucodes (void) 
 			}
 		}
 		/* now check if any cpu has matched */
-		for (cpu_num = 0, allocated_flag = 0, sum = 0; cpu_num < num_online_cpus(); cpu_num++) {
+		allocated_flag = 0;
+		sum = 0;
+		for_each_online_cpu(cpu_num) {
 			if (ucode_cpu_info[cpu_num].err == MC_MARKED) { 
 				struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;
 				if (!allocated_flag) {
@@ -415,12 +415,12 @@ static int do_microcode_update (void)
 	}
 
 out_free:
-	for (i = 0; i < num_online_cpus(); i++) {
+	for_each_online_cpu(i) {
 		if (ucode_cpu_info[i].mc) {
 			int j;
 			void *tmp = ucode_cpu_info[i].mc;
 			vfree(tmp);
-			for (j = i; j < num_online_cpus(); j++) {
+			for_each_online_cpu(j) {
 				if (ucode_cpu_info[j].mc == tmp)
 					ucode_cpu_info[j].mc = NULL;
 			}


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -r1.1964 -r1.1965
--- kernel-2.6.spec	18 Feb 2006 05:57:24 -0000	1.1964
+++ kernel-2.6.spec	18 Feb 2006 20:46:44 -0000	1.1965
@@ -228,6 +228,7 @@
 Patch203: linux-2.6-intel-cache-build.patch
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
+Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6.15-cell-numa-init.patch
@@ -719,6 +720,8 @@
 %patch204 -p1
 # Reboot thru bios on HP laptops.
 %patch205 -p1
+# Microcode driver hotplug cpu issue.
+%patch206 -p1
 
 # 
 # ppc64
@@ -1572,6 +1575,7 @@
 %changelog
 * Sat Feb 18 2006 Dave Jones <davej at redhat.com>
 - Reenable EMI26 driver. (#181813)
+- Fix counting of hotplug cpu's in x86 microcode driver
 
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4



From fedora-cvs-commits at redhat.com  Sat Feb 18 21:23:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 16:23:51 -0500
Subject: rpms/kernel/devel linux-2.6-audit-allocation-in-atomic.patch, NONE,
	1.1 kernel-2.6.spec, 1.1965, 1.1966
Message-ID: <200602182123.k1ILNpcP005438@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5231

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-audit-allocation-in-atomic.patch 
Log Message:
GFP_KERNEL allocations in atomic (auditsc)



linux-2.6-audit-allocation-in-atomic.patch:
 auditsc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-audit-allocation-in-atomic.patch ---
Subject: [PATCH] GFP_KERNEL allocations in atomic (auditsc)

audit_log_exit() is called from atomic contexts and gets explicit
gfp_mask argument; it should use it for all allocations rather
than doing some with gfp_mask and some with GFP_KERNEL.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 kernel/auditsc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

ef20c8c197df9b8d5bd4af0679123826da028861
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 685c251..d7e7e63 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -841,7 +841,7 @@ static void audit_log_exit(struct audit_
 
 	for (aux = context->aux; aux; aux = aux->next) {
 
-		ab = audit_log_start(context, GFP_KERNEL, aux->type);
+		ab = audit_log_start(context, gfp_mask, aux->type);
 		if (!ab)
 			continue; /* audit_panic has been called */
 
@@ -878,14 +878,14 @@ static void audit_log_exit(struct audit_
 	}
 
 	if (context->pwd && context->pwdmnt) {
-		ab = audit_log_start(context, GFP_KERNEL, AUDIT_CWD);
+		ab = audit_log_start(context, gfp_mask, AUDIT_CWD);
 		if (ab) {
 			audit_log_d_path(ab, "cwd=", context->pwd, context->pwdmnt);
 			audit_log_end(ab);
 		}
 	}
 	for (i = 0; i < context->name_count; i++) {
-		ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);
+		ab = audit_log_start(context, gfp_mask, AUDIT_PATH);
 		if (!ab)
 			continue; /* audit_panic has been called */
 
-- 
0.99.9.GIT


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1965
retrieving revision 1.1966
diff -u -r1.1965 -r1.1966
--- kernel-2.6.spec	18 Feb 2006 20:46:44 -0000	1.1965
+++ kernel-2.6.spec	18 Feb 2006 21:23:48 -0000	1.1966
@@ -370,6 +370,7 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
+Patch1860: linux-2.6-audit-allocation-in-atomic.patch
 Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -942,6 +943,8 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
+# GFP_KERNEL allocations in atomic (auditsc)
+%patch1860 -p1
 # Only print migration info on SMP
 %patch1890 -p1
 
@@ -1576,6 +1579,7 @@
 * Sat Feb 18 2006 Dave Jones <davej at redhat.com>
 - Reenable EMI26 driver. (#181813)
 - Fix counting of hotplug cpu's in x86 microcode driver
+- Fix syscall auditting doing allocations whilst atomic.
 
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4



From fedora-cvs-commits at redhat.com  Sat Feb 18 23:34:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 18:34:46 -0500
Subject: rpms/kernel/devel
	linux-2.6-selinux-disable-attributes-no-policy.patch, NONE,
	1.1 kernel-2.6.spec, 1.1966, 1.1967
Message-ID: <200602182334.k1INYkkv020030@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20008

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-selinux-disable-attributes-no-policy.patch 
Log Message:
- Disable setting of security attributes on new inodes when
  no policy is loaded. (#180296)



linux-2.6-selinux-disable-attributes-no-policy.patch:
 hooks.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-selinux-disable-attributes-no-policy.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180296

Disable setting of security attributes on new inodes when no policy is loaded

--- linux-2.6.15.noarch/security/selinux/hooks.c~	2006-02-18 18:31:02.000000000 -0500
+++ linux-2.6.15.noarch/security/selinux/hooks.c	2006-02-18 18:31:17.000000000 -0500
@@ -1957,7 +1957,7 @@ static int selinux_inode_init_security(s
 
 	inode_security_set_sid(inode, newsid);
 
-	if (sbsec->behavior == SECURITY_FS_USE_MNTPOINT)
+	if (!ss_initialized || sbsec->behavior == SECURITY_FS_USE_MNTPOINT)
 		return -EOPNOTSUPP;
 
 	if (name) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1966
retrieving revision 1.1967
diff -u -r1.1966 -r1.1967
--- kernel-2.6.spec	18 Feb 2006 21:23:48 -0000	1.1966
+++ kernel-2.6.spec	18 Feb 2006 23:34:22 -0000	1.1967
@@ -357,6 +357,7 @@
 Patch1710: linux-2.6-autofs-pathlookup.patch
 Patch1720: linux-2.6-selinux-hush.patch
 Patch1721: linux-2.6-selinux-mprotect-checks.patch
+Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
 Patch1730: linux-2.6-ide-cd-shutup.patch
 Patch1740: linux-2.6-block-reduce-stack.patch
 Patch1750: linux-2.6-ub.patch
@@ -918,6 +919,8 @@
 %patch1720 -p1
 # Fix the SELinux mprotect checks on executable mappings
 %patch1721 -p1
+# Disable setting of security attributes on new inodes when no policy is loaded
+%patch1722 -p1
 # Silence noisy CD drive spew
 %patch1730 -p1
 # Reduce stack usage in block layer
@@ -1580,6 +1583,8 @@
 - Reenable EMI26 driver. (#181813)
 - Fix counting of hotplug cpu's in x86 microcode driver
 - Fix syscall auditting doing allocations whilst atomic.
+- Disable setting of security attributes on new inodes when
+  no policy is loaded. (#180296)
 
 * Fri Feb 17 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4



From fedora-cvs-commits at redhat.com  Sun Feb 19 01:54:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 20:54:30 -0500
Subject: rpms/frysk/devel frysk.spec,1.26,1.27
Message-ID: <200602190154.k1J1sUc0027546@cvs.devel.redhat.com>

Author: cagney

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27423

Modified Files:
	frysk.spec 
Log Message:
* Sat Feb 18 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.1
- Remove eclipse-cdt >= 3.0.0 from BuildRequires.  From Wu Zhou
  woodzltc at ibm.



Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- frysk.spec	12 Feb 2006 21:27:50 -0000	1.26
+++ frysk.spec	19 Feb 2006 01:54:27 -0000	1.27
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.02.12
-Release:	0.FC5.0
+Release:	0.FC5.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -16,7 +16,6 @@
 BuildRequires:  antlr >= 2.7.4 
 BuildRequires:	transfig >= 3.2.0 
 BuildRequires:	jdom >= 1.0
-BuildRequires:  eclipse-cdt >= 3.0.0
 BuildRequires:  libgtk-java-devel >= 2.8.0
 BuildRequires:	libglade-java-devel >= 2.12.0
 BuildRequires:  cairo-java-devel >= 1.0.0
@@ -87,6 +86,10 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Sat Feb 18 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.1
+- Remove eclipse-cdt >= 3.0.0 from BuildRequires.  From Wu Zhou
+  woodzltc at ibm.
+
 * Sun Feb 12 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.0
 - Import frysk 0.0.1.2006.02.12.
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 02:07:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 21:07:11 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1967, 1.1968 linux-2.6-ub.patch,
	1.7, NONE
Message-ID: <200602190207.k1J27Bj4030302@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30246

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-ub.patch 
Log Message:
remove dead patch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1967
retrieving revision 1.1968
diff -u -r1.1967 -r1.1968
--- kernel-2.6.spec	18 Feb 2006 23:34:22 -0000	1.1967
+++ kernel-2.6.spec	19 Feb 2006 02:06:58 -0000	1.1968
@@ -360,7 +360,6 @@
 Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
 Patch1730: linux-2.6-ide-cd-shutup.patch
 Patch1740: linux-2.6-block-reduce-stack.patch
-Patch1750: linux-2.6-ub.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
 Patch1780: linux-2.6-firmware-loader-timeout.patch
@@ -925,8 +924,6 @@
 %patch1730 -p1
 # Reduce stack usage in block layer
 #%patch1740 -p1
-# Enable USB storage,UB & libusual magick.
-#%patch1750 -p1
 # Enable SATA ATAPI by default.
 %patch1760 -p1
 # 


--- linux-2.6-ub.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 19 04:58:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 18 Feb 2006 23:58:36 -0500
Subject: rpms/tcsh/FC-4 tcsh-6.14.00-sigint.patch, NONE, 1.1 tcsh.spec, 1.27,
	1.28
Message-ID: <200602190458.k1J4waeD029871@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29780

Modified Files:
	tcsh.spec 
Added Files:
	tcsh-6.14.00-sigint.patch 
Log Message:
* Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.1
- Block SIGINT while waiting for children (#177366)


tcsh-6.14.00-sigint.patch:
 sh.proc.c |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

--- NEW FILE tcsh-6.14.00-sigint.patch ---
--- tcsh-6.14.00/sh.proc.c.sigint	2006-02-19 05:07:32.000000000 +0100
+++ tcsh-6.14.00/sh.proc.c	2006-02-19 05:29:52.000000000 +0100
@@ -543,9 +543,7 @@
 {
     struct process *fp;
     int     jobflags, reason;
-#ifdef BSDSIGS
-    sigmask_t omask;
-#endif /* BSDSIGS */
+    sigset_t omask, pause_mask;
 #ifdef UNRELSIGS
     signalfun_t inthandler;
 #endif /* UNRELSIGS */
@@ -562,17 +560,16 @@
      * target process, or any of its friends, are running
      */
     fp = pp;
-#ifdef BSDSIGS
-    omask = sigblock(sigmask(SIGCHLD));
-#endif /* BSDSIGS */
+    sigprocmask(SIG_BLOCK, NULL, &omask);
+    sighold(SIGINT);
+    sigprocmask(SIG_BLOCK, NULL, &pause_mask);
+    sighold(SIGCHLD);
+    sigdelset(&pause_mask, SIGCHLD);
 #ifdef UNRELSIGS
     if (setintr)
         inthandler = signal(SIGINT, SIG_IGN);
 #endif /* UNRELSIGS */
     for (;;) {
-#ifndef BSDSIGS
-	(void) sighold(SIGCHLD);
-#endif /* !BSDSIGS */
 	jobflags = 0;
 	do
 	    jobflags |= fp->p_flags;
@@ -583,21 +580,12 @@
 	xprintf("%d starting to sigpause for SIGCHLD on %d\n",
 		getpid(), fp->p_procid);
 #endif /* JOBDEBUG */
-#ifdef BSDSIGS
-	/* (void) sigpause(sigblock((sigmask_t) 0) &~ sigmask(SIGCHLD)); */
-	(void) sigpause(omask & ~sigmask(SIGCHLD));
-#else /* !BSDSIGS */
-	(void) sigpause(SIGCHLD);
-#endif /* !BSDSIGS */
+	sigsuspend(&pause_mask);
     }
 #ifdef JOBDEBUG
 	xprintf("%d returned from sigpause loop\n", getpid());
 #endif /* JOBDEBUG */
-#ifdef BSDSIGS
-    (void) sigsetmask(omask);
-#else /* !BSDSIGS */
-    (void) sigrelse(SIGCHLD);
-#endif /* !BSDSIGS */
+    sigprocmask(SIG_SETMASK, &omask, NULL);
 #ifdef UNRELSIGS
     if (setintr)
         (void) signal(SIGINT, inthandler);


Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/FC-4/tcsh.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tcsh.spec	25 Mar 2005 23:26:17 -0000	1.27
+++ tcsh.spec	19 Feb 2006 04:58:34 -0000	1.28
@@ -3,13 +3,14 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 1
+Release: 1.fc4.1
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
 Patch0: tcsh-6.14.00-config.patch
 Patch1: tcsh-6.14.00-closem.patch
 Patch2: tcsh-6.14.00-iconv.patch
+Patch3: tcsh-6.14.00-sigint.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -29,6 +30,7 @@
 %patch0 -p1 -b .config
 %patch1 -p1 -b .closem
 %patch2 -p1 -b .iconv
+%patch3 -p1 -b .sigint
 
 nroff -me eight-bit.me > eight-bit.txt
 
@@ -96,6 +98,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.1
+- Block SIGINT while waiting for children (#177366)
+
 * Fri Mar 25 2005 Miloslav Trmac <mitr at redhat.com> - 6.14-1
 - Update to tcsh-6.14.00
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 05:21:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 00:21:24 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1601,1.1602
Message-ID: <200602190521.k1J5LO9q008783@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv8241

Modified Files:
	kernel-2.6.spec 
Log Message:
Bump minimum requirements for module-init-tools & udev




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1601
retrieving revision 1.1602
diff -u -r1.1601 -r1.1602
--- kernel-2.6.spec	17 Feb 2006 18:52:50 -0000	1.1601
+++ kernel-2.6.spec	19 Feb 2006 05:21:10 -0000	1.1602
@@ -125,7 +125,7 @@
 # First the general kernel 2.6 required versions as per
 # Documentation/Changes
 #
-%define kernel_dot_org_conflicts  ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev < 071-0.FC4.1
+%define kernel_dot_org_conflicts  ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev < 071-0.FC4.2
 
 # 
 # Then a series of requirements that are distribution specific, either 
@@ -150,7 +150,7 @@
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 4.2.15-1
+%define kernel_prereq fileutils, module-init-tools >= 3.2-0.pre9.0.FC4.1, initscripts >= 5.83, mkinitrd >= 4.2.15-1
 
 Name: kernel
 Group: System Environment/Kernel
@@ -1278,6 +1278,9 @@
 %endif
 
 %changelog
+* Sun Feb 19 2006 Dave Jones <davej at redhat.com>
+- Bump minimum requirements for module-init-tools & udev
+
 * Fri Feb 16 2006 Dave Jones <davej at redhat.com>
 - Fix PMTU NAT bug.
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 05:34:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 00:34:24 -0500
Subject: rpms/kernel/FC-4 linux-2.6-8250-16c950-faster.patch, NONE,
	1.1 kernel-2.6.spec, 1.1602, 1.1603
Message-ID: <200602190534.k1J5YOhO016312@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16277

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-8250-16c950-faster.patch 
Log Message:
Make 16C950 UARTs work.



linux-2.6-8250-16c950-faster.patch:
 8250.c |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-8250-16c950-faster.patch ---

http://marc.theaimsgroup.com/?l=linux-kernel&m=112687270832687&w=2

I've reworked the patch a little. Now it should enable both the 230400 and
the 460800 baud rates on any serial port which is using a 16C95x UART.
However as my 16C950 device is part of a Bluetooth dongle I couldn't
test the 460800 baud rate myself (I am able to set this rate with stty
though).
Please, could someone who owns such a UART try this out?
Any other comments?

Regards
Mathias



--- linux-2.6.13-org/drivers/serial/8250.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13/drivers/serial/8250.c	2005-09-16 12:18:14.000000000 +0200
@@ -7,6 +7,9 @@
  *
  *  Copyright (C) 2001 Russell King.
  *
+ *  2005/09/16: Enabled higher baud rates for 16C95x.
+ *		(Mathias Adam <a2 at adamis.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
@@ -1652,6 +1655,14 @@
 	else if ((port->flags & UPF_MAGIC_MULTIPLIER) &&
 		 baud == (port->uartclk/8))
 		quot = 0x8002;
+	/*
+	 * For 16C950s UART_TCR is used in combination with divisor==1
+	 * to achieve baud rates up to baud_base*4.
+	 */
+	else if ((port->type == PORT_16C950) &&
+		 baud > (port->uartclk/16))
+		quot = 1;
+
 	else
 		quot = uart_get_divisor(port, baud);
 
@@ -1665,7 +1676,7 @@
 	struct uart_8250_port *up = (struct uart_8250_port *)port;
 	unsigned char cval, fcr = 0;
 	unsigned long flags;
-	unsigned int baud, quot;
+	unsigned int baud, quot, max_baud;
 
 	switch (termios->c_cflag & CSIZE) {
 	case CS5:
@@ -1697,7 +1708,8 @@
 	/*
 	 * Ask the core to calculate the divisor for us.
 	 */
-	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
+	max_baud = (up->port.type == PORT_16C950 ? port->uartclk/4 : port->uartclk/16);
+	baud = uart_get_baud_rate(port, termios, old, 0, max_baud); 
 	quot = serial8250_get_divisor(port, baud);
 
 	/*
@@ -1733,6 +1745,19 @@
 	 */
 	spin_lock_irqsave(&up->port.lock, flags);
 
+	/* 
+	 * 16C950 supports additional prescaler ratios between 1:16 and 1:4
+	 * thus increasing max baud rate to uartclk/4.
+	 */
+	if (up->port.type == PORT_16C950) {
+		if (baud == port->uartclk/4)
+			serial_icr_write(up, UART_TCR, 0x4);
+		else if (baud == port->uartclk/8)
+			serial_icr_write(up, UART_TCR, 0x8);
+		else
+			serial_icr_write(up, UART_TCR, 0);
+	}
+	
 	/*
 	 * Update the per-port timeout.
 	 */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1602
retrieving revision 1.1603
diff -u -r1.1602 -r1.1603
--- kernel-2.6.spec	19 Feb 2006 05:21:10 -0000	1.1602
+++ kernel-2.6.spec	19 Feb 2006 05:34:11 -0000	1.1603
@@ -353,6 +353,7 @@
 Patch1820: linux-2.6-net-acenic-use-after-free.patch
 Patch1830: linux-2.6-smsc-ircc2-pnp.patch
 Patch1840: linux-2.6-net-nat-pmtu.patch
+Patch1850: linux-2.6-8250-16c950-faster.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
 Patch1870: linux-2.6-usb-find-interface.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
@@ -796,6 +797,8 @@
 %patch1830 -p1
 # Fix PMTU breakage with NAT
 %patch1840 -p1
+# Make 16C950 UARTs work
+%patch1850 -p1
 # Fix posix-cpu-timers sched_time accumulation
 %patch1860 -p1
 # Fix idiocy in usb_find_interface()
@@ -1280,6 +1283,7 @@
 %changelog
 * Sun Feb 19 2006 Dave Jones <davej at redhat.com>
 - Bump minimum requirements for module-init-tools & udev
+- Make 16C950 UARTs work.
 
 * Fri Feb 16 2006 Dave Jones <davej at redhat.com>
 - Fix PMTU NAT bug.



From fedora-cvs-commits at redhat.com  Sun Feb 19 05:43:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 00:43:03 -0500
Subject: rpms/mesa/devel mesa-6.4.1-radeon-use-right-texture-format.patch,
	NONE, 1.1 mesa.spec, 1.41, 1.42
Message-ID: <200602190543.k1J5h3GN008392@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24575

Modified Files:
	mesa.spec 
Added Files:
	mesa-6.4.1-radeon-use-right-texture-format.patch 
Log Message:
- enable texture-from-drawable patch
- add glut-devel dependency


mesa-6.4.1-radeon-use-right-texture-format.patch:
 radeon_tex.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE mesa-6.4.1-radeon-use-right-texture-format.patch ---
--- Mesa-6.4.1/src/mesa/drivers/dri/radeon/radeon_tex.c	7 Oct 2004 23:30:30 -0000	1.15
+++ Mesa-6.4.1/src/mesa/drivers/dri/radeon/radeon_tex.c	27 Jan 2006 18:17:07 -0000
@@ -267,7 +267,6 @@ static radeonTexObjPtr radeonAllocTexObj
    return t;
 }
 
-
 static const struct gl_texture_format *
 radeonChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
                            GLenum format, GLenum type )
@@ -294,7 +293,7 @@ radeonChooseTextureFormat( GLcontext *ct
       case GL_UNSIGNED_SHORT_1_5_5_5_REV:
 	 return _dri_texformat_argb1555;
       default:
-         return do32bpt ? _dri_texformat_rgba8888 : _dri_texformat_argb4444;
+         return do32bpt ? _dri_texformat_argb8888 : _dri_texformat_rgb565;
       }
 
    case 3:
@@ -311,7 +310,7 @@ radeonChooseTextureFormat( GLcontext *ct
       case GL_UNSIGNED_SHORT_5_6_5_REV:
 	 return _dri_texformat_rgb565;
       default:
-         return do32bpt ? _dri_texformat_rgba8888 : _dri_texformat_rgb565;
+         return do32bpt ? _dri_texformat_argb8888 : _dri_texformat_rgb565;
       }
 
    case GL_RGBA8:


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mesa.spec	11 Feb 2006 04:30:56 -0000	1.41
+++ mesa.spec	19 Feb 2006 05:43:00 -0000	1.42
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 2.1
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -81,11 +81,14 @@
 
 # Red Hat custom patches, feature development
 Patch200: mesa-6.4.1-texture-from-drawable.patch
+Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libdrm-devel >= 2.0-1
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel
+BuildRequires: xorg-x11-proto-devel >= 7.0-3
+BuildRequires: glut-devel
 
 %if %{with_motif}
 BuildRequires: openmotif-devel
@@ -240,7 +243,11 @@
 
 # NOT NEEDED NOW%patch100 -p1 -b .amd64-assyntax-fix
 
-#%patch200 -p0 -b .texture-from-drawable
+%patch200 -p0 -b .texture-from-drawable
+# 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...
+#%patch201 -p1 -b .radeon-use-right-format
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
 # license and are not open source/free software, so we remove them.
@@ -431,6 +438,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> 6.4.2-3
+- enable texture-from-drawable patch
+- add glut-devel dependency
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.4.2-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 05:45:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 00:45:46 -0500
Subject: rpms/g-wrap/devel g-wrap-glib2.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 g-wrap.spec, 1.18, 1.19 sources, 1.4,
	1.5 g-wrap-1.3.4-arch.patch, 1.1, NONE g-wrap.m4.diff, 1.1, NONE
Message-ID: <200602190545.k1J5jk52016675@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13441

Modified Files:
	.cvsignore g-wrap.spec sources 
Added Files:
	g-wrap-glib2.patch 
Removed Files:
	g-wrap-1.3.4-arch.patch g-wrap.m4.diff 
Log Message:
update to 1.9.6


g-wrap-glib2.patch:
 configure |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE g-wrap-glib2.patch ---
--- g-wrap-1.9.6/configure.glib2	2006-02-18 15:10:25.000000000 -0500
+++ g-wrap-1.9.6/configure	2006-02-18 15:11:39.000000000 -0500
@@ -21699,8 +21699,8 @@
   if test "x$ac_cv_env_GLIB_CFLAGS_set" = "xset"; then
 	pkg_cv_GLIB_CFLAGS=$ac_cv_env_GLIB_CFLAGS_value
 elif test -n "$PKG_CONFIG"; then
-	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
-		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
+	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
+		pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -21718,8 +21718,8 @@
   if test "x$ac_cv_env_GLIB_LIBS_set" = "xset"; then
 	pkg_cv_GLIB_LIBS=$ac_cv_env_GLIB_LIBS_value
 elif test -n "$PKG_CONFIG"; then
-	if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
-		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
+	if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
+		pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -21731,7 +21731,7 @@
 echo "${ECHO_T}$pkg_cv_GLIB_LIBS" >&6
 
 if test $pkg_failed = yes; then
-	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
+	GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" 1>&5
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 04:55:04 -0000	1.4
+++ .cvsignore	19 Feb 2006 05:45:44 -0000	1.5
@@ -1 +1 @@
-g-wrap-1.3.4.tar.gz
+g-wrap-1.9.6.tar.gz


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- g-wrap.spec	11 Feb 2006 03:24:05 -0000	1.18
+++ g-wrap.spec	19 Feb 2006 05:45:44 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
-Version: 1.3.4
-Release: 9.2.1
+Version: 1.9.6
+Release: 1
 Group: Development/Libraries
 License: GPL
 Requires: guile
@@ -9,9 +9,8 @@
 Prereq: /sbin/ldconfig
 Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
 Patch0: g-wrap-info.patch
-Patch1: g-wrap-1.3.4-arch.patch
-Patch2: g-wrap.m4.diff
-BuildPrereq: guile-devel umb-scheme gtk+-devel
+Patch1: g-wrap-glib2.patch
+BuildPrereq: guile-devel slib glib-devel pkgconfig
 
 %description
 This is a tool for specifying types, functions, and constants to
@@ -22,7 +21,7 @@
 Summary: Include files and libraries needed for g-wrap development.
 Group: Development/Libraries
 Prereq: /sbin/install-info
-Requires: g-wrap = %{version}, guile-devel
+Requires: g-wrap = %{version}, guile-devel, pkgconfig
 
 %description devel
 g-wrap-devel contains development libraries and headers for g-wrap.
@@ -38,26 +37,25 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
+#%patch1 -p1
 
 %build
-#cp /usr/share/libtool/config.{sub,guess} .
 
-find . -name Makefile.in -exec sed -i 's|-Werror||g' {} \;
-%configure
+%configure --disable-static
 make
 
-%ifnarch s390x ppc64 x86_64
-make check
-%endif
-
 %install
 rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=%{buildroot}
 
-/sbin/ldconfig -n %{buildroot}/usr/share/guile/g-wrapped
+# Move ffi headers out of standard locations to avoid apps picking
+# them up, and remove the .so.
 
+mv %{buildroot}/%{_includedir}/ffi* %{buildroot}/%{_includedir}/g-wrap
+rm -f %{buildroot}/%{_libdir}/libffi.{so,la}
+sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
+sed -i "s|<ffi|<g-wrap/ffi|g"  %{buildroot}/%{_includedir}/g-wrap/*.h
+sed -i "s|%{_libdir}/libffi.la||g" %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/usr/share/info/dir
 
 %clean
@@ -82,19 +80,21 @@
 %doc AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README THANKS
 %{_libdir}/*.so.*
 %{_libdir}/*.la
-%{_datadir}/guile/g-wrap
-%{_datadir}/guile/*.scm
+%{_datadir}/guile/site/*
 
 %files devel
 %defattr(-,root,root)
 %{_bindir}/*
 %{_libdir}/*.so
-%{_libdir}/*.a
 %{_includedir}/*
-%{_datadir}/aclocal/g-wrap.m4
+%{_libdir}/pkgconfig/*
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Sat Feb 18 2006 Bill Nottingham <notting at redhat.com> 1.9.6-1
+- update to 1.9.6, to fix incompatiblity with gcc-4.x
+- disable static libs
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.4-9.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 04:55:04 -0000	1.4
+++ sources	19 Feb 2006 05:45:44 -0000	1.5
@@ -1 +1 @@
-bf29b8b563cc27d9f7fd90a6243653aa  g-wrap-1.3.4.tar.gz
+4d83964f51376500eedced538c1620cb  g-wrap-1.9.6.tar.gz


--- g-wrap-1.3.4-arch.patch DELETED ---


--- g-wrap.m4.diff DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 19 06:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 01:47:34 -0500
Subject: rpms/metacity/devel metacity.spec,1.55,1.56
Message-ID: <200602190647.k1J6lYkA001930@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1696

Modified Files:
	metacity.spec 
Log Message:
- add a buildrequires on recent mesa 



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- metacity.spec	17 Feb 2006 22:09:29 -0000	1.55
+++ metacity.spec	19 Feb 2006 06:47:32 -0000	1.56
@@ -29,6 +29,7 @@
 BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
 BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, 
 BuildRequires: libXcomposite-devel
+BuildRequires: mesa-libGL-devel >= 6.4.2-3
 
 Requires: startup-notification >= 0.7
 Requires: redhat-artwork >= 0.62



From fedora-cvs-commits at redhat.com  Sun Feb 19 07:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 02:17:13 -0500
Subject: rpms/gdm/devel gdm-2.13.0.8-change-defaults.patch, NONE,
	1.1 gdm.spec, 1.132, 1.133 gdm-2.13.0.4-change-defaults.patch,
	1.3, NONE gdm-2.13.0.7-change-defaults.patch, 1.1, NONE
Message-ID: <200602190717.k1J7HD4b024038@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23928

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.13.0.8-change-defaults.patch 
Removed Files:
	gdm-2.13.0.4-change-defaults.patch 
	gdm-2.13.0.7-change-defaults.patch 
Log Message:
- add server entry for accel-indirect branch of xorg


gdm-2.13.0.8-change-defaults.patch:
 gdm.conf.in |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

--- NEW FILE gdm-2.13.0.8-change-defaults.patch ---
--- gdm-2.13.0.8/config/gdm.conf.in.change-defaults	2006-02-09 15:04:13.000000000 -0500
+++ gdm-2.13.0.8/config/gdm.conf.in	2006-02-19 02:13:55.000000000 -0500
@@ -59,9 +59,9 @@
 # should leave this alone.
 #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser
 
-# The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
-# get the new graphical greeter.
-#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin
+# The greeter for local (non-xdmcp) logins.  Change gdmgreeter to gdmlogin to
+# get the boring greeter.
+Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
 # greeter here so it's better to leave this with gdmlogin
@@ -78,11 +78,11 @@
 # Default path to set.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin
 # Default path for root.  The profile scripts will likely override this value.
 # This value will be overridden with the value from /etc/default/login if it
 # contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
 
 # If you are having trouble with using a single server for a long time and want
 # GDM to kill/restart the server, turn this on.  On Solaris, this value is
@@ -118,22 +118,22 @@
 XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-#RebootCommand=@REBOOT_COMMAND@
-#HaltCommand=@HALT_COMMAND@
+RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot
+HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff
 #SuspendCommand=@SUSPEND_COMMAND@
 # Probably should not touch the below this is the standard setup.
 ServAuthDir=@EXPANDED_AUTHDIR@
 # This is our standard startup script.  A bit different from a normal X
 # session, but it shares a lot of stuff with that.  See the provided default
 # for more information.
-BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/Xsession
+BaseXsession=/etc/X11/xinit/Xsession
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
 # with KDM.  Note that <sysconfdir>/dm/Sessions is there for backwards
 # compatibility reasons with 2.4.4.x.
 #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
 # like /tmp if you don't want the authorizations to be in home directories.
@@ -282,7 +282,7 @@
 #GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc
 
 # The GTK+ theme to use for the GUI.
-#GtkTheme=Default
+GtkTheme=Clearlooks
 # If to allow changing the GTK+ (widget) theme from the greeter.  Currently
 # this only affects the standard greeter as the graphical greeter does not yet
 # have this ability.
@@ -303,7 +303,7 @@
 # themed login (gdmgreeter).
 #
 # The standard login has a title bar that the user can move.
-#TitleBar=true
+TitleBar=false
 # Don't allow user to move the standard login window.  Only makes sense if
 # TitleBar is on.
 #LockPosition=false
@@ -327,7 +327,7 @@
 # User ID's less than the MinimalUID value will not be included in the face
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=500
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
 # by commas.
@@ -353,7 +353,7 @@
 # file, although GDM will be able to read a standard locale.alias file as well.
 #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias
 # Logo shown in the standard greeter.
-#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png
+Logo=
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png
 # The standard greeter should shake if a user entered the wrong username or
@@ -400,8 +400,8 @@
 # The Standard greeter (gdmlogin) uses BackgroundColor as the background
 # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor
 # as the background color.
-BackgroundColor=#76848F
-GraphicalThemedColor=#76848F
+BackgroundColor=#20305a
+GraphicalThemedColor=#000000
 # XDMCP session should only get a color, this is the sanest setting since you
 # don't want to take up too much bandwidth
 #BackgroundRemoteOnlyColor=true
@@ -416,7 +416,7 @@
 # Show the Failsafe sessions.  These are much MUCH nicer (focus for xterm for
 # example) and more failsafe then those supplied by scripts so distros should
 # use this rather then just running an xterm from a script.
-#ShowGnomeFailsafeSession=true
+ShowGnomeFailsafeSession=false
 #ShowXtermFailsafeSession=true
 # Normally there is a session type called 'Last' that is shown which refers to
 # the last session the user used.  If off, we will be in 'switchdesk' mode
@@ -436,7 +436,7 @@
 # list then provide a list that is delimited by /: to the GraphicalThemes
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
+GraphicalTheme=FedoraBubbles
 #GraphicalThemes=circles/:happygnome
 GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
 GraphicalThemeRand=false
@@ -577,3 +577,10 @@
 # Run the chooser instead of the greeter.  When the user chooses a machine they
 # will get this same server but run with "-terminate -query hostname".
 chooser=true
+
+# Experimental build of Xorg with accelerated indirect rendering
+# support
+[server-aiglx]
+name=Accelerated Indirect Rendering server
+command=/usr/bin/Xair @X_CONFIG_OPTIONS@
+flexible=false


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gdm.spec	15 Feb 2006 21:08:12 -0000	1.132
+++ gdm.spec	19 Feb 2006 07:17:10 -0000	1.133
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.8
-Release: 2
+Release: 4
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -25,7 +25,7 @@
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
 
-Patch1: gdm-2.13.0.7-change-defaults.patch
+Patch1: gdm-2.13.0.8-change-defaults.patch
 Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch
 Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch
 Patch5: gdm-2.13.0.4-update-switchdesk-location.patch
@@ -306,6 +306,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-3
+- add server entry for accel-indirect branch of xorg
+
 * Wed Feb 15 2006 Ray <rstrode at redhat.com> and Matthias <mclasen at redhat.com> - 1:2.13.0.8-2
 - malloc memory that is later freed
 


--- gdm-2.13.0.4-change-defaults.patch DELETED ---


--- gdm-2.13.0.7-change-defaults.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 19 09:33:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 04:33:36 -0500
Subject: rpms/findutils/devel findutils.spec,1.45,1.46
Message-ID: <200602190933.k1J9XaIu020564@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/findutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20483

Modified Files:
	findutils.spec 
Log Message:
* Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 1:4.2.27-4
- Report the correct directory when hard link count is inconsistent (#182001)



Index: findutils.spec
===================================================================
RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- findutils.spec	11 Feb 2006 02:43:52 -0000	1.45
+++ findutils.spec	19 Feb 2006 09:33:31 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs).
 Name: findutils
 Version: 4.2.27
-Release: 3.2
+Release: 4
 Epoch: 1
 License: GPL
 Group: Applications/File
@@ -9,6 +9,7 @@
 Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
 Patch1: findutils-no-locate.patch
 Patch2: findutils-selinux.patch
+Patch3: findutils-4.2.27-linkcount.patch
 
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -31,6 +32,7 @@
 %setup -q
 %patch1 -p1 -b .no-locate
 %patch2 -p1 -b .selinux
+%patch3 -p1 -b .linkcount
 
 autoreconf
 
@@ -71,6 +73,9 @@
 %{_infodir}/find.info*
 
 %changelog
+* Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 1:4.2.27-4
+- Report the correct directory when hard link count is inconsistent (#182001)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.2.27-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 09:35:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 04:35:09 -0500
Subject: rpms/findutils/devel findutils-4.2.27-linkcount.patch,NONE,1.1
Message-ID: <200602190935.k1J9Z9VA020842@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/findutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20653

Added Files:
	findutils-4.2.27-linkcount.patch 
Log Message:
* Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 1:4.2.27-4
- Report the correct directory when hard link count is inconsistent (#182001)


findutils-4.2.27-linkcount.patch:
 find.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE findutils-4.2.27-linkcount.patch ---
--- findutils-4.2.27/find/find.c.linkcount	2006-02-19 09:54:13.000000000 +0100
+++ findutils-4.2.27/find/find.c	2006-02-19 09:54:26.000000000 +0100
@@ -2044,7 +2044,7 @@
 		   * In the latter case, -noleaf should be used routinely.
 		   */
 		  error(0, 0, _("WARNING: Hard link count is wrong for %s: this may be a bug in your filesystem driver.  Automatically turning on find's -noleaf option.  Earlier results may have failed to include directories that should have been searched."),
-			parent);
+			pathname);
 		  state.exit_status = 1; /* We know the result is wrong, now */
 		  options.no_leaf_check = true;	/* Don't make same
 						   mistake again */



From fedora-cvs-commits at redhat.com  Sun Feb 19 09:51:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 04:51:28 -0500
Subject: rpms/kernel/devel linux-2.6-debug-driver_register.patch, NONE,
	1.1 kernel-2.6.spec, 1.1968, 1.1969
Message-ID: <200602190951.k1J9pSaM007381@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7323

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-driver_register.patch 
Log Message:
debugging info.


linux-2.6-debug-driver_register.patch:
 driver.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE linux-2.6-debug-driver_register.patch ---

--- linux-2.6.15.noarch/drivers/base/driver.c~	2006-02-19 04:47:46.000000000 -0500
+++ linux-2.6.15.noarch/drivers/base/driver.c	2006-02-19 04:50:13.000000000 -0500
@@ -175,6 +175,10 @@ int driver_register(struct device_driver
 	    (drv->bus->remove && drv->remove) ||
 	    (drv->bus->shutdown && drv->shutdown)) {
 		printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
+		printk(KERN_WARNING "  drv->bus->probe=%p drv->probe=%p\n",drv->bus->probe, drv->probe);
+		printk(KERN_WARNING "  drv->bus->remove=%p drv->remove=%p\n",drv->bus->remove, drv->remove);
+		printk(KERN_WARNING "  drv->bus->shutdown=%p drv->shutdown=%p\n",drv->bus->shutdown, drv->shutdown)
+		dump_stack();
 	}
 	klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);
 	init_completion(&drv->unloaded);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1968
retrieving revision 1.1969
diff -u -r1.1968 -r1.1969
--- kernel-2.6.spec	19 Feb 2006 02:06:58 -0000	1.1968
+++ kernel-2.6.spec	19 Feb 2006 09:51:24 -0000	1.1969
@@ -306,6 +306,7 @@
 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-driver_register.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -828,6 +829,7 @@
 %patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
+%patch1034 -p1
 
 #
 # Make /dev/mem a need-to-know function 



From fedora-cvs-commits at redhat.com  Sun Feb 19 09:58:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 04:58:44 -0500
Subject: rpms/kernel/devel linux-2.6-debug-driver_register.patch,1.1,1.2
Message-ID: <200602190958.k1J9wild003762@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3747

Modified Files:
	linux-2.6-debug-driver_register.patch 
Log Message:
fix typo


linux-2.6-debug-driver_register.patch:
 driver.c |    4 ++++
 1 files changed, 4 insertions(+)

Index: linux-2.6-debug-driver_register.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-driver_register.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-driver_register.patch	19 Feb 2006 09:51:24 -0000	1.1
+++ linux-2.6-debug-driver_register.patch	19 Feb 2006 09:58:40 -0000	1.2
@@ -7,7 +7,7 @@
  		printk(KERN_WARNING "Driver '%s' needs updating - please use bus_type methods\n", drv->name);
 +		printk(KERN_WARNING "  drv->bus->probe=%p drv->probe=%p\n",drv->bus->probe, drv->probe);
 +		printk(KERN_WARNING "  drv->bus->remove=%p drv->remove=%p\n",drv->bus->remove, drv->remove);
-+		printk(KERN_WARNING "  drv->bus->shutdown=%p drv->shutdown=%p\n",drv->bus->shutdown, drv->shutdown)
++		printk(KERN_WARNING "  drv->bus->shutdown=%p drv->shutdown=%p\n",drv->bus->shutdown, drv->shutdown);
 +		dump_stack();
  	}
  	klist_init(&drv->klist_devices, klist_devices_get, klist_devices_put);



From fedora-cvs-commits at redhat.com  Sun Feb 19 12:17:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 07:17:17 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.39,
	1.40 booleans-targeted.conf, 1.5, 1.6 modules-mls.conf, 1.13,
	1.14 modules-strict.conf, 1.5, 1.6 modules-targeted.conf, 1.14,
	1.15 policy-20060207.patch, 1.10, 1.11 selinux-policy.spec,
	1.110, 1.111 sources, 1.43, 1.44
Message-ID: <200602191217.k1JCHHjO003222@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3207

Modified Files:
	.cvsignore booleans-targeted.conf modules-mls.conf 
	modules-strict.conf modules-targeted.conf 
	policy-20060207.patch selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	14 Feb 2006 17:11:59 -0000	1.39
+++ .cvsignore	19 Feb 2006 12:17:14 -0000	1.40
@@ -40,3 +40,4 @@
 serefpolicy-2.2.13.tgz
 serefpolicy-2.2.14.tgz
 serefpolicy-2.2.15.tgz
+serefpolicy-2.2.16.tgz


Index: booleans-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- booleans-targeted.conf	12 Dec 2005 20:59:12 -0000	1.5
+++ booleans-targeted.conf	19 Feb 2006 12:17:15 -0000	1.6
@@ -8,7 +8,7 @@
 
 # Allow making the stack executable via mprotect.Also requires allow_execmem.
 # 
-allow_execstack = false
+allow_execstack = true
 
 # Allow ftp servers to modify public filesused for public file transfer services.
 # 


Index: modules-mls.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- modules-mls.conf	13 Feb 2006 15:55:10 -0000	1.13
+++ modules-mls.conf	19 Feb 2006 12:17:15 -0000	1.14
@@ -60,6 +60,14 @@
 mls = base
 
 # Layer: kernel
+# Module: mcs
+# Required in base
+#
+# MultiCategory security policy
+# 
+mcs = base
+
+# Layer: kernel
 # Module: selinux
 # Required in base
 #


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modules-strict.conf	13 Feb 2006 15:55:10 -0000	1.5
+++ modules-strict.conf	19 Feb 2006 12:17:15 -0000	1.6
@@ -81,11 +81,19 @@
 # Module: mls
 # Required in base
 #
-# Multilevel security policy
+# MultiCategory security policy
 # 
 mls = base
 
 # Layer: kernel
+# Module: mcs
+# Required in base
+#
+# Multilevel security policy
+# 
+mcs = base
+
+# Layer: kernel
 # Module: selinux
 # Required in base
 #


Index: modules-targeted.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modules-targeted.conf	31 Jan 2006 00:35:32 -0000	1.14
+++ modules-targeted.conf	19 Feb 2006 12:17:15 -0000	1.15
@@ -60,6 +60,14 @@
 mls = base
 
 # Layer: kernel
+# Module: mcs
+# Required in base
+#
+# MultiCategory security policy
+# 
+mcs = base
+
+# Layer: kernel
 # Module: selinux
 # Required in base
 #

policy-20060207.patch:
 policy/global_tunables                  |    8 +++++
 policy/modules/admin/amanda.if          |   37 +++++++++++++++++++++++
 policy/modules/admin/amanda.te          |    2 -
 policy/modules/admin/vpn.te             |    2 +
 policy/modules/apps/java.fc             |    1 
 policy/modules/apps/java.if             |   25 ++++++++++++++++
 policy/modules/apps/java.te             |   14 ++++++++
 policy/modules/kernel/corenetwork.te.in |    1 
 policy/modules/services/automount.te    |    2 -
 policy/modules/services/avahi.te        |    1 
 policy/modules/services/fetchmail.te    |    1 
 policy/modules/services/hal.te          |    2 -
 policy/modules/services/ktalk.fc        |    2 -
 policy/modules/services/spamassassin.te |    9 ++++-
 policy/modules/services/xserver.fc      |    1 
 policy/modules/services/zebra.te        |    1 
 policy/modules/system/fstools.te        |    7 +++-
 policy/modules/system/libraries.fc      |    2 -
 policy/modules/system/modutils.if       |    2 -
 policy/modules/system/selinuxutil.fc    |    2 +
 policy/modules/system/selinuxutil.if    |   27 ++++++++++++++++-
 policy/modules/system/selinuxutil.te    |   50 ++++++++++++++++++++++++++++++++
 policy/modules/system/unconfined.te     |    8 +++++
 policy/modules/system/userdomain.te     |    2 +
 support/Makefile.devel                  |   12 ++++++-
 25 files changed, 209 insertions(+), 12 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- policy-20060207.patch	15 Feb 2006 16:25:59 -0000	1.10
+++ policy-20060207.patch	19 Feb 2006 12:17:15 -0000	1.11
@@ -1,19 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.15/Makefile
---- nsaserefpolicy/Makefile	2006-02-14 07:20:17.000000000 -0500
-+++ serefpolicy-2.2.15/Makefile	2006-02-14 16:49:49.000000000 -0500
-@@ -45,7 +45,7 @@
- AWK ?= gawk
- GREP ?= egrep
- M4 ?= m4
--PYTHON ?= python
-+PYTHON ?= /usr/bin/python
- SED ?= sed
- SH ?= sh
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.15/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.15/policy/global_tunables	2006-02-14 16:49:59.000000000 -0500
-@@ -461,3 +461,11 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.16/policy/global_tunables
+--- nsaserefpolicy/policy/global_tunables	2006-02-16 09:05:13.000000000 -0500
++++ serefpolicy-2.2.16/policy/global_tunables	2006-02-19 07:09:54.000000000 -0500
+@@ -469,3 +469,11 @@
  ## </desc>
  gen_tunable(xdm_sysadm_login,false)
  ')
@@ -25,39 +13,9 @@
 +## </desc>
 +gen_tunable(spamd_enable_home_dirs,true)
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.15/policy/mcs
---- nsaserefpolicy/policy/mcs	2006-01-09 11:32:53.000000000 -0500
-+++ serefpolicy-2.2.15/policy/mcs	2006-02-14 16:49:49.000000000 -0500
-@@ -137,15 +137,24 @@
- # Only files are constrained by MCS at this stage.
- #
- mlsconstrain file { write setattr append unlink link rename
--		    create ioctl lock execute } (h1 dom h2);
-+		    ioctl lock execute relabelfrom } (h1 dom h2);
-+
-+mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2));
- 
- mlsconstrain file { read } ((h1 dom h2) or 
- 			    ( t1 == mlsfileread ));
- 
- 
- # new file labels must be dominated by the relabeling subject clearance
--mlsconstrain { dir file lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom relabelto }
-+mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom }
- 	( h1 dom h2 );
-+mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { create relabelto }
-+	(( h1 dom h2 ) and ( l2 eq h2 ));
-+
-+mlsconstrain process { ptrace } ( h1 dom h2 );
-+
-+mlsconstrain process { sigkill sigstop } ( h1 dom h2 ) or
-+		( t1 == mlskillall );
- 
- define(`nogetattr_file_perms', `{ create ioctl read lock write setattr append 
- link unlink rename relabelfrom relabelto }')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.2.15/policy/modules/admin/amanda.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.2.16/policy/modules/admin/amanda.if
 --- nsaserefpolicy/policy/modules/admin/amanda.if	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/admin/amanda.if	2006-02-15 11:03:13.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/admin/amanda.if	2006-02-19 07:09:54.000000000 -0500
 @@ -90,3 +90,40 @@
  
  	dontaudit $1 amanda_dumpdates_t:file { getattr read };
@@ -99,9 +57,9 @@
 +')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.15/policy/modules/admin/amanda.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.16/policy/modules/admin/amanda.te
 --- nsaserefpolicy/policy/modules/admin/amanda.te	2006-02-03 15:45:54.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/admin/amanda.te	2006-02-15 10:29:35.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/admin/amanda.te	2006-02-19 07:09:54.000000000 -0500
 @@ -86,7 +86,7 @@
  # Amanda local policy
  #
@@ -111,20 +69,39 @@
  allow amanda_t self:process { setpgid signal };
  allow amanda_t self:fifo_file { getattr read write ioctl lock };
  allow amanda_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.15/policy/modules/apps/java.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.16/policy/modules/admin/vpn.te
+--- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-16 16:42:39.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/admin/vpn.te	2006-02-19 07:13:16.000000000 -0500
+@@ -11,6 +11,7 @@
+ 
+ type vpnc_exec_t;
+ domain_entry_file(vpnc_t,vpnc_exec_t)
++role system_r types vpnc_t;
+ 
+ type vpnc_tmp_t;
+ files_tmp_file(vpnc_tmp_t)
+@@ -69,6 +70,7 @@
+ dev_read_sysfs(vpnc_t)
+ 
+ fs_getattr_xattr_fs(vpnc_t)
++fs_getattr_tmpfs(vpnc_t)
+ 
+ term_use_all_user_ptys(vpnc_t)
+ term_use_all_user_ttys(vpnc_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.16/policy/modules/apps/java.fc
 --- nsaserefpolicy/policy/modules/apps/java.fc	2006-01-17 13:22:13.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/apps/java.fc	2006-02-15 11:11:42.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/apps/java.fc	2006-02-19 07:09:54.000000000 -0500
 @@ -3,3 +3,4 @@
  #
  /usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
  /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
 +/usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.15/policy/modules/apps/java.if
---- nsaserefpolicy/policy/modules/apps/java.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/apps/java.if	2006-02-15 11:14:35.000000000 -0500
-@@ -182,3 +182,27 @@
- 	x_client_domain($1_javaplugin, $2) 
- 	') dnl end TODO
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.16/policy/modules/apps/java.if
+--- nsaserefpolicy/policy/modules/apps/java.if	2006-02-16 09:05:14.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/apps/java.if	2006-02-19 07:09:54.000000000 -0500
+@@ -178,3 +178,28 @@
+ 		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
+ 	')
  ')
 +
 +########################################
@@ -150,10 +127,10 @@
 +	allow java_t $1:fifo_file rw_file_perms;
 +	allow java_t $1:process sigchld;
 +')
-\ No newline at end of file
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.15/policy/modules/apps/java.te
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.16/policy/modules/apps/java.te
 --- nsaserefpolicy/policy/modules/apps/java.te	2006-01-12 18:28:45.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/apps/java.te	2006-02-15 11:22:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/apps/java.te	2006-02-19 07:09:54.000000000 -0500
 @@ -6,5 +6,19 @@
  # Declarations
  #
@@ -174,17 +151,9 @@
 +	unconfined_domain_noaudit(java_t)
 +	role system_r types java_t;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.2.15/policy/modules/apps/wine.if
---- nsaserefpolicy/policy/modules/apps/wine.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/apps/wine.if	2006-02-15 11:14:04.000000000 -0500
-@@ -23,3 +23,4 @@
- 	allow wine_t $1:fifo_file rw_file_perms;
- 	allow wine_t $1:process sigchld;
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.15/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.16/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/corenetwork.te.in	2006-02-15 10:14:55.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/kernel/corenetwork.te.in	2006-02-19 07:09:54.000000000 -0500
 @@ -73,6 +73,7 @@
  network_port(imaze, tcp,5323,s0, udp,5323,s0)
  network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
@@ -193,72 +162,9 @@
  network_port(ipp, tcp,631,s0, udp,631,s0)
  network_port(ircd, tcp,6667,s0)
  network_port(isakmp, udp,500,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.15/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/devices.if	2006-02-14 17:21:40.000000000 -0500
-@@ -2656,3 +2656,22 @@
- 	typeattribute $1 memory_raw_write, memory_raw_read;
- ')
- 
-+
-+########################################
-+## <summary>
-+##	Read and write the USB device.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_rw_usb',`
-+	gen_require(`
-+		type usb_device_t;
-+	')
-+
-+	allow $1 device_t:dir r_dir_perms;
-+	allow $1 usb_device_t:chr_file rw_file_perms;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.2.15/policy/modules/kernel/mls.if
---- nsaserefpolicy/policy/modules/kernel/mls.if	2006-02-10 21:34:12.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/mls.if	2006-02-14 16:49:49.000000000 -0500
-@@ -214,3 +214,22 @@
- 
- 	typeattribute $1 mlstrustedobject;
- ')
-+
-+########################################
-+## <summary>
-+##	This domain is allowed to sigkill and sigstop 
-+##	all domains regardless of sensitivity level
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain target for user exemption.
-+##	</summary>
-+## </param>
-+#
-+interface(`mls_killall',`
-+	gen_require(`
-+		attribute mlskillall;
-+	')
-+
-+	typeattribute $1 mlskillall;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.15/policy/modules/kernel/mls.te
---- nsaserefpolicy/policy/modules/kernel/mls.te	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/kernel/mls.te	2006-02-14 16:49:49.000000000 -0500
-@@ -46,6 +46,7 @@
- 
- attribute privrangetrans;
- attribute mlsrangetrans;
-+attribute mlskillall;
- 
- ########################################
- #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.15/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.16/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/automount.te	2006-02-15 11:18:22.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/automount.te	2006-02-19 07:09:54.000000000 -0500
 @@ -92,7 +92,7 @@
  
  files_dontaudit_write_var_dirs(automount_t)
@@ -268,9 +174,9 @@
  files_getattr_home_dir(automount_t)
  files_read_etc_files(automount_t)
  files_read_etc_runtime_files(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.15/policy/modules/services/avahi.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.16/policy/modules/services/avahi.te
 --- nsaserefpolicy/policy/modules/services/avahi.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/avahi.te	2006-02-15 11:03:43.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/avahi.te	2006-02-19 07:09:54.000000000 -0500
 @@ -63,6 +63,7 @@
  domain_use_wide_inherit_fd(avahi_t)
  
@@ -279,20 +185,20 @@
  
  init_use_fd(avahi_t)
  init_use_script_ptys(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.15/policy/modules/services/bluetooth.te
---- nsaserefpolicy/policy/modules/services/bluetooth.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/bluetooth.te	2006-02-14 16:49:49.000000000 -0500
-@@ -101,6 +101,7 @@
- 
- dev_read_sysfs(bluetooth_t)
- dev_rw_usbfs(bluetooth_t)
-+dev_rw_usb(bluetooth_t)
- dev_read_urand(bluetooth_t)
- 
- fs_getattr_all_fs(bluetooth_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.15/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/hal.te	2006-02-14 16:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.16/policy/modules/services/fetchmail.te
+--- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-14 07:20:26.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/fetchmail.te	2006-02-19 07:09:54.000000000 -0500
+@@ -67,6 +67,7 @@
+ 
+ files_read_etc_files(fetchmail_t)
+ files_read_etc_runtime_files(fetchmail_t)
++files_dontaudit_search_home(fetchmail_t)
+ 
+ fs_getattr_all_fs(fetchmail_t)
+ fs_search_auto_mountpoints(fetchmail_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.16/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-02-16 14:46:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/hal.te	2006-02-19 07:09:54.000000000 -0500
 @@ -22,7 +22,7 @@
  #
  
@@ -302,90 +208,16 @@
  dontaudit hald_t self:capability sys_tty_config;
  allow hald_t self:process signal_perms;
  allow hald_t self:fifo_file rw_file_perms;
-@@ -97,6 +97,8 @@
- 
- mls_file_read_up(hald_t)
- 
-+modutils_domtrans_insmod(hald_t)
-+
- selinux_get_fs_mount(hald_t)
- selinux_validate_context(hald_t)
- selinux_compute_access_vector(hald_t)
-@@ -128,6 +130,7 @@
- libs_exec_lib_files(hald_t)
- 
- logging_send_syslog_msg(hald_t)
-+logging_search_logs(hald_t)
- 
- miscfiles_read_localization(hald_t)
- miscfiles_read_hwdata(hald_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.2.15/policy/modules/services/mta.if
---- nsaserefpolicy/policy/modules/services/mta.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/mta.if	2006-02-14 16:49:49.000000000 -0500
-@@ -458,6 +458,7 @@
- 
- 	allow $1 sendmail_exec_t:lnk_file r_file_perms;
- 	domain_auto_trans($1, sendmail_exec_t, system_mail_t)
-+	domain_entry_file($1,sendmail_exec_t)
- 
- 	allow $1 system_mail_t:fd use;
- 	allow system_mail_t $1:fd use;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.2.15/policy/modules/services/mta.te
---- nsaserefpolicy/policy/modules/services/mta.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/mta.te	2006-02-14 16:49:49.000000000 -0500
-@@ -30,6 +30,9 @@
- 
- mta_base_mail_template(system)
- role system_r types system_mail_t;
-+# newalias required this, not sure if it is needed in 'if' file
-+allow system_mail_t self:capability { dac_override };
-+
- 
- # cjp: need to resolve this, but require{}
- # does not work in the else part of the optional
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.15/policy/modules/services/networkmanager.te
---- nsaserefpolicy/policy/modules/services/networkmanager.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/networkmanager.te	2006-02-14 16:49:49.000000000 -0500
-@@ -22,7 +22,7 @@
- dontaudit NetworkManager_t self:capability sys_tty_config;
- allow NetworkManager_t self:process { setcap getsched signal_perms };
- allow NetworkManager_t self:fifo_file rw_file_perms;
--allow NetworkManager_t self:unix_dgram_socket create_socket_perms;
-+allow NetworkManager_t self:unix_dgram_socket { sendto create_socket_perms };
- allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms;
- allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms;
- allow NetworkManager_t self:tcp_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.15/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/postfix.te	2006-02-14 16:49:49.000000000 -0500
-@@ -273,6 +273,8 @@
- corecmd_exec_shell(postfix_local_t)
- corecmd_exec_bin(postfix_local_t)
- 
-+files_read_etc_files(postfix_local_t)
-+
- mta_read_aliases(postfix_local_t)
- mta_delete_spool(postfix_local_t)
- # For reading spamassasin
-@@ -394,6 +396,7 @@
- 
- allow postfix_pipe_t postfix_private_t:dir search;
- allow postfix_pipe_t postfix_private_t:sock_file write;
-+allow postfix_pipe_t postfix_public_t:fifo_file { getattr write };
- 
- allow postfix_pipe_t postfix_spool_t:dir search;
- allow postfix_pipe_t postfix_spool_t:file rw_file_perms;
-@@ -425,6 +428,7 @@
- term_dontaudit_use_all_user_ttys(postfix_postdrop_t)
- 
- sysnet_dns_name_resolve(postfix_postdrop_t)
-+sysnet_dontaudit_read_config(postfix_postdrop_t)
- 
- mta_rw_user_mail_stream_sockets(postfix_postdrop_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.15/policy/modules/services/spamassassin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.16/policy/modules/services/ktalk.fc
+--- nsaserefpolicy/policy/modules/services/ktalk.fc	2005-11-14 18:24:08.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/ktalk.fc	2006-02-19 07:10:20.000000000 -0500
+@@ -1,2 +1,2 @@
+-
+ /usr/bin/ktalkd		--	gen_context(system_u:object_r:ktalkd_exec_t,s0)
++/usr/bin/in.talkd		--	gen_context(system_u:object_r:ktalkd_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.16/policy/modules/services/spamassassin.te
 --- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-14 07:20:28.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/spamassassin.te	2006-02-15 10:11:01.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/spamassassin.te	2006-02-19 07:09:54.000000000 -0500
 @@ -77,7 +77,9 @@
  # DnsResolver.pm module which binds to
  # random ports >= 1024.
@@ -410,9 +242,20 @@
  ')
  
  tunable_policy(`use_nfs_home_dirs',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.15/policy/modules/services/zebra.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.16/policy/modules/services/xserver.fc
+--- nsaserefpolicy/policy/modules/services/xserver.fc	2006-02-07 10:43:26.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/xserver.fc	2006-02-19 07:09:54.000000000 -0500
+@@ -54,6 +54,7 @@
+ /usr/bin/iceauth		--	gen_context(system_u:object_r:iceauth_exec_t,s0)
+ /usr/bin/xauth    	--      gen_context(system_u:object_r:xauth_exec_t,s0)
+ /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
++/usr/bin/Xair		--	gen_context(system_u:object_r:xserver_exec_t,s0)
+ 
+ /usr/lib(64)?/qt-.*/etc/settings(/.*)?	gen_context(system_u:object_r:xdm_var_run_t,s0)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.16/policy/modules/services/zebra.te
 --- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-14 07:20:29.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/services/zebra.te	2006-02-15 10:15:21.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/services/zebra.te	2006-02-19 07:09:54.000000000 -0500
 @@ -73,6 +73,7 @@
  corenet_tcp_bind_all_nodes(zebra_t)
  corenet_udp_bind_all_nodes(zebra_t)
@@ -421,9 +264,18 @@
  
  dev_associate_usbfs(zebra_var_run_t)
  dev_list_all_dev_nodes(zebra_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.15/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.16/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-14 07:20:29.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/fstools.te	2006-02-15 11:18:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/fstools.te	2006-02-19 07:09:54.000000000 -0500
+@@ -15,7 +15,7 @@
+ type fsadm_tmp_t;
+ files_tmp_file(fsadm_tmp_t)
+ 
+-type swapfile_t;
++type swapfile_t; # customizable
+ files_type(swapfile_t)
+ 
+ ########################################
 @@ -162,3 +162,8 @@
  optional_policy(`nis',`
  	nis_use_ypbind(fsadm_t)
@@ -433,41 +285,9 @@
 +	amanda_rw_dumpdates_files(fsadm_t)
 +	amanda_append_log_files(fsadm_t)
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.15/policy/modules/system/init.fc
---- nsaserefpolicy/policy/modules/system/init.fc	2006-01-16 22:19:19.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/init.fc	2006-02-14 16:49:49.000000000 -0500
-@@ -22,7 +22,8 @@
- #
- # /sbin
- #
--/sbin/init		--	gen_context(system_u:object_r:init_exec_t,s0)
-+/sbin/init(ng)?		--	gen_context(system_u:object_r:init_exec_t,s0)
-+
- 
- ifdef(`distro_gentoo', `
- /sbin/rc			--	gen_context(system_u:object_r:initrc_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.15/policy/modules/system/init.te
---- nsaserefpolicy/policy/modules/system/init.te	2006-02-08 10:03:08.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/init.te	2006-02-14 16:49:49.000000000 -0500
-@@ -157,6 +157,7 @@
- 
- mls_file_read_up(init_t)
- mls_file_write_down(init_t)
-+mls_killall(init_t)
- mls_rangetrans_target(init_t)
- 
- seutil_read_config(init_t)
-@@ -362,6 +363,7 @@
- 
- mls_file_read_up(initrc_t)
- mls_file_write_down(initrc_t)
-+mls_killall(initrc_t)
- mls_process_read_up(initrc_t)
- mls_process_write_down(initrc_t)
- mls_rangetrans_source(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.15/policy/modules/system/libraries.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.16/policy/modules/system/libraries.fc
 --- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/libraries.fc	2006-02-14 16:49:49.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/libraries.fc	2006-02-19 07:09:54.000000000 -0500
 @@ -62,7 +62,7 @@
  /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
  /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
@@ -477,61 +297,31 @@
  /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
  /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.if serefpolicy-2.2.15/policy/modules/system/libraries.if
---- nsaserefpolicy/policy/modules/system/libraries.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/libraries.if	2006-02-14 16:49:49.000000000 -0500
-@@ -283,6 +283,7 @@
- 
- 	allow $1 lib_t:dir search_dir_perms;
- 	allow $1 lib_t:file manage_file_perms;
-+	allow $1 lib_t:lnk_file unlink;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-2.2.16/policy/modules/system/modutils.if
+--- nsaserefpolicy/policy/modules/system/modutils.if	2006-02-10 21:34:15.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/modutils.if	2006-02-19 07:09:55.000000000 -0500
+@@ -204,7 +204,7 @@
+ 	')
+ 
+ 	modutils_domtrans_depmod($1)
+-	role $2 types insmod_t;
++	role $2 types depmod_t;
+ 	allow insmod_t $3:chr_file rw_term_perms;
  ')
  
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.16/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.fc	2006-02-14 16:49:49.000000000 -0500
-@@ -10,6 +10,7 @@
- /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
- 
- /etc/selinux/([^/]*/)?policy(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
-+/etc/selinux/([^/]*/)?modules(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
- /etc/selinux/([^/]*/)?seusers	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
- /etc/selinux/([^/]*/)?users(/.*)?	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
- 
-@@ -39,3 +40,5 @@
++++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.fc	2006-02-19 07:09:55.000000000 -0500
+@@ -39,3 +39,5 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
  ')
 +
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.15/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.if	2006-02-14 16:49:49.000000000 -0500
-@@ -587,6 +587,22 @@
- 
- ########################################
- #
-+# seutil_rw_file_contexts(domain)
-+#
-+interface(`seutil_rw_file_contexts',`
-+	gen_require(`
-+		type selinux_config_t, file_context_t;
-+	')
-+
-+	files_search_etc($1)
-+	allow $1 selinux_config_t:dir search;
-+	allow $1 file_context_t:dir r_dir_perms;
-+	allow $1 file_context_t:file rw_file_perms;
-+	allow $1 file_context_t:lnk_file { getattr read };
-+')
-+
-+########################################
-+#
- # seutil_read_bin_policy(domain)
- #
- interface(`seutil_read_bin_policy',`
-@@ -649,7 +665,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.16/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-16 14:46:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.if	2006-02-19 07:09:55.000000000 -0500
+@@ -671,7 +671,7 @@
  
  	files_search_etc($1)
  	allow $1 selinux_config_t:dir search;
@@ -540,10 +330,11 @@
  	allow $1 policy_config_t:file create_file_perms;
  	typeattribute $1 can_write_binary_policy;
  ')
-@@ -684,3 +700,27 @@
+@@ -705,3 +705,28 @@
+ 	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
  ')
- 
++
 +########################################
 +## <summary>
 +##	Execute a domain transition to run semodule.
@@ -568,9 +359,9 @@
 +	allow semodule_t $1:fifo_file rw_file_perms;
 +	allow semodule_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.15/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/selinuxutil.te	2006-02-14 16:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.16/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-16 14:46:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.te	2006-02-19 07:09:55.000000000 -0500
 @@ -535,3 +535,53 @@
  # scripts will put things in a state such that setfiles can not be run!
  allow setfiles_t lib_t:file { read execute };
@@ -625,26 +416,10 @@
 +seutil_use_newrole_fd(semodule_t)
 +
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.15/policy/modules/system/unconfined.if
---- nsaserefpolicy/policy/modules/system/unconfined.if	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/unconfined.if	2006-02-14 16:49:49.000000000 -0500
-@@ -55,10 +55,11 @@
- 	tunable_policy(`allow_execmem && allow_execstack',`
- 		# Allow making the stack executable via mprotect.
- 		allow $1 self:process execstack;
-+		auditallow $1 self:process execstack;
- 	', `
- 		# These are fairly common but seem to be harmless
- 		# caused by using shared libraries built with old tool chains
--		dontaudit $1 self:process execstack;
-+		#dontaudit $1 self:process execstack;
- 	')
- 
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.15/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/unconfined.te	2006-02-15 11:15:14.000000000 -0500
-@@ -157,6 +157,10 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.16/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-16 14:46:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/unconfined.te	2006-02-19 07:09:55.000000000 -0500
+@@ -157,6 +157,14 @@
  		wine_domtrans(unconfined_t)
  	')
  
@@ -652,49 +427,28 @@
 +		java_domtrans(unconfined_t)
 +	')
 +
++	optional_policy(`vpn',`
++		vpn_domtrans(unconfined_t)
++	')
++
  	optional_policy(`xserver',`
  		xserver_domtrans_xdm_xserver(unconfined_t)
  	')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.15/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.15/policy/modules/system/userdomain.te	2006-02-14 16:49:49.000000000 -0500
-@@ -168,7 +168,11 @@
- 		logging_read_audit_log(secadm_t)
- 		logging_domtrans_auditctl(secadm_t)
- 		mls_process_read_up(secadm_t)
-+		mls_file_write_down(secadm_t)
-+		mls_file_upgrade(secadm_t)
-+		mls_file_downgrade(secadm_t)
- 		userdom_dontaudit_append_staff_home_files(secadm_t)
-+		corecmd_exec_shell(sysadm_t)
- 	', `
- 		logging_domtrans_auditctl(sysadm_t)
- 		logging_read_audit_log(sysadm_t)
-@@ -354,6 +358,9 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.16/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-16 14:46:56.000000000 -0500
++++ serefpolicy-2.2.16/policy/modules/system/userdomain.te	2006-02-19 07:09:55.000000000 -0500
+@@ -358,6 +358,8 @@
  			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
 +			semodule_domtrans(secadm_t)
 +			role secadm_r types semodule_t;
-+			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
+ 			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
  		', `
  			selinux_set_enforce_mode(sysadm_t)
- 			selinux_set_boolean(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.15/Rules.modular
---- nsaserefpolicy/Rules.modular	2006-02-14 07:20:18.000000000 -0500
-+++ serefpolicy-2.2.15/Rules.modular	2006-02-14 16:49:49.000000000 -0500
-@@ -83,7 +83,7 @@
- #
- $(BASE_PKG): tmp/base.mod $(BASE_FC)
- 	@echo "Creating $(NAME) base module package"
--	$(verbose) $(SEMOD_PKG) -o $@ -m tmp/base.mod -f $(BASE_FC)
-+	$(verbose) $(SEMOD_PKG) $(USER_EXTRAS) -o $@ -m tmp/base.mod -f $(BASE_FC)
- 
- tmp/base.mod: base.conf
- 	@echo "Compiling $(NAME) base module"
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.15/support/Makefile.devel
---- nsaserefpolicy/support/Makefile.devel	2006-02-10 17:05:19.000000000 -0500
-+++ serefpolicy-2.2.15/support/Makefile.devel	2006-02-14 16:49:49.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.16/support/Makefile.devel
+--- nsaserefpolicy/support/Makefile.devel	2006-02-16 16:42:39.000000000 -0500
++++ serefpolicy-2.2.16/support/Makefile.devel	2006-02-19 07:09:55.000000000 -0500
 @@ -1,3 +1,6 @@
 +# installation paths
 +SHAREDIR := $(PREFIX)/share/selinux


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- selinux-policy.spec	15 Feb 2006 16:19:41 -0000	1.110
+++ selinux-policy.spec	19 Feb 2006 12:17:15 -0000	1.111
@@ -5,28 +5,22 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.15
-Release: 4
+Version: 2.2.16
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060207.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
-Source3: seusers-targeted
 Source4: setrans-targeted.conf
 Source5: modules-mls.conf
-Source6: booleans-mls.conf
-Source7: seusers-mls
+Source6: booleans-mls.conf	
 Source8: setrans-mls.conf
 Source9: modules-strict.conf
 Source10: booleans-strict.conf
-Source11: seusers-strict
 Source12: setrans-strict.conf
 Source13: policygentool
-Source14: users_extra-targeted
-Source15: users_extra-strict
-Source16: users_extra-mls
 
 Url: http://serefpolicy.sourceforge.net
 BuildRoot: %{_tmppath}/serefpolicy-buildroot
@@ -56,18 +50,19 @@
 
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} conf \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
 %define installCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} USER_EXTRAS="-u ${RPM_SOURCE_DIR}/users_extra-%1" base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} modules \
-%{__mkdir} -p $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
-%{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT install \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT install-appconfig \
+#%{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/policy \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT install-appconfig \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} enableaudit \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
@@ -78,7 +73,6 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
-install -m0644 ${RPM_SOURCE_DIR}/seusers-%1 ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/modules/active/seusers \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/setrans.conf \
 %nil
 
@@ -94,7 +88,7 @@
 %ghost %{_sysconfdir}/selinux/%1/seusers \
 %dir %{_sysconfdir}/selinux/%1/modules \
 %attr(700,root,root) %dir %{_sysconfdir}/selinux/%1/modules/active \
-%verify(not md5 size mtime) %attr(600,root,root) %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
+#%verify(not md5 size mtime) %attr(600,root,root) %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
 %dir %{_sysconfdir}/selinux/%1/policy/ \
 %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \
 %dir %{_sysconfdir}/selinux/%1/contexts \
@@ -145,31 +139,22 @@
 	
 %install
 # Build targeted policy
-make conf
 %{__rm} -fR $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -m 644 man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
-
-
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-make clean
-make conf
 %setupCmds targeted targeted-mcs y
 %installCmds targeted targeted-mcs y
 
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
-make clean
-make conf
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} bare 
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} conf
 %installCmds strict strict-mcs y
 
 # Build mls policy
-make clean
-make conf
 %setupCmds mls strict-mls n
 %installCmds mls strict-mls n
 
@@ -211,7 +196,7 @@
 
 " > /etc/selinux/config
 
-	ln -sf /etc/selinux/config /etc/sysconfig/selinux 
+	ln -sf ../selinux/config /etc/sysconfig/selinux 
 	restorecon /etc/selinux/config 2> /dev/null
 else
 	# if first time update booleans.local needs to be copied to sandbox
@@ -297,6 +282,10 @@
 
 %changelog
 
+* Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> 2.2.16-1
+- Update to upstream 
+- fix sysconfig/selinux link
+
 * Wed Feb 15 2006 Dan Walsh <dwalsh at redhat.com> 2.2.15-4
 - Add router port for zebra
 - Add imaze port for spamd


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	14 Feb 2006 17:11:59 -0000	1.43
+++ sources	19 Feb 2006 12:17:15 -0000	1.44
@@ -1 +1 @@
-6018f8b9cf975dadf25e4051d0ed36d4  serefpolicy-2.2.15.tgz
+cf0c73ab94eb55f86f8843bfd585302b  serefpolicy-2.2.16.tgz



From fedora-cvs-commits at redhat.com  Sun Feb 19 19:12:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 14:12:11 -0500
Subject: rpms/metacity/devel metacity.spec,1.56,1.57
Message-ID: <200602191912.k1JJCBPL032545@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32399

Modified Files:
	metacity.spec 
Log Message:
Exclude some arches temporarily



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- metacity.spec	19 Feb 2006 06:47:32 -0000	1.56
+++ metacity.spec	19 Feb 2006 19:12:09 -0000	1.57
@@ -39,6 +39,8 @@
 Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
 Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
 
+ExcludeArch: s390x ppc64
+
 %description
 
 Metacity is a simple window manager that integrates nicely with 



From fedora-cvs-commits at redhat.com  Sun Feb 19 19:33:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 14:33:21 -0500
Subject: rpms/metacity/devel metacity.spec,1.57,1.58
Message-ID: <200602191933.k1JJXLMv020201@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20181

Modified Files:
	metacity.spec 
Log Message:
- exclude one more



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- metacity.spec	19 Feb 2006 19:12:09 -0000	1.57
+++ metacity.spec	19 Feb 2006 19:33:17 -0000	1.58
@@ -39,7 +39,7 @@
 Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
 Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
 
-ExcludeArch: s390x ppc64
+ExcludeArch: s390 s390x ppc64
 
 %description
 



From fedora-cvs-commits at redhat.com  Sun Feb 19 19:45:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 14:45:59 -0500
Subject: rpms/metacity/devel metacity.spec,1.58,1.59
Message-ID: <200602191945.k1JJjxR0029681@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26844

Modified Files:
	metacity.spec 
Log Message:
- disable compositor on s390 s390x and ppc64



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- metacity.spec	19 Feb 2006 19:33:17 -0000	1.58
+++ metacity.spec	19 Feb 2006 19:45:56 -0000	1.59
@@ -39,8 +39,6 @@
 Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch
 Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch
 
-ExcludeArch: s390 s390x ppc64
-
 %description
 
 Metacity is a simple window manager that integrates nicely with 
@@ -60,25 +58,34 @@
 
 %build
 rm -rf $RPM_BUILD_ROOT
+%ifnarch s390 s390x ppc64
 pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date}
 %configure
 make
 make install DESTDIR=$RPM_BUILD_ROOT 
 popd
+%endif
 
 LIBS="$LIBS -lGL -lGLU"
 LIBS="$LIBS -lICE -lSM"
 LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
 LIBS="$LIBS -lXrender -lXcursor"
 LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
+%ifnarch s390 s390x ppc64
 LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a"
+%endif
 export LIBS
 
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
 autoreconf
+
+%ifnarch s390 s390x ppc64
 %configure --enable-compositor
+%else
+%configure
+%endif
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSIONS"
 
@@ -135,6 +142,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 2.13.89.0.2006.02.17-2
+- disable compositor on s390 s390x and ppc64
+
 * Fri Feb 17 2006 Ray Strode <rstrode at redhat.com> - 2.13.89.0.2006.02.17-1
 - Update to latest cvs snapshot to give meaningful failure error
   messages



From fedora-cvs-commits at redhat.com  Sun Feb 19 19:46:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 14:46:36 -0500
Subject: rpms/metacity/devel metacity.spec,1.59,1.60
Message-ID: <200602191946.k1JJkaRH002808@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1702

Modified Files:
	metacity.spec 
Log Message:
rev release



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- metacity.spec	19 Feb 2006 19:45:56 -0000	1.59
+++ metacity.spec	19 Feb 2006 19:46:34 -0000	1.60
@@ -8,7 +8,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}.0.%{metacity_snapshot_date}
-Release: 1
+Release: 2
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: metacity-%{metacity_version}.0.%{metacity_snapshot_date}.tar.bz2
 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 19 19:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 14:53:46 -0500
Subject: rpms/metacity/devel metacity.spec,1.60,1.61
Message-ID: <200602191953.k1JJrkrZ008629@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/metacity/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8399

Modified Files:
	metacity.spec 
Log Message:
- don't include HAVE_COMPOSITE_EXTENSIONS in post configure
check for architectures where we don't need it



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- metacity.spec	19 Feb 2006 19:46:34 -0000	1.60
+++ metacity.spec	19 Feb 2006 19:53:43 -0000	1.61
@@ -87,7 +87,11 @@
 %configure
 %endif
 
-SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSIONS"
+SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
+
+%ifnarch s390 s390x ppc64
+SHOULD_HAVE_DEFINED="$SHOULD_HAVE_DEFINED HAVE_COMPOSITE_EXTENSIONS"
+%endif
 
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then



From fedora-cvs-commits at redhat.com  Sun Feb 19 20:01:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 15:01:54 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1969,
	1.1970 linux-2.6-debug-driver_register.patch, 1.2, NONE
Message-ID: <200602192001.k1JK1sTD003294@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3248

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-debug-driver_register.patch 
Log Message:
dead patch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1969
retrieving revision 1.1970
diff -u -r1.1969 -r1.1970
--- kernel-2.6.spec	19 Feb 2006 09:51:24 -0000	1.1969
+++ kernel-2.6.spec	19 Feb 2006 20:00:58 -0000	1.1970
@@ -306,7 +306,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-driver_register.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -829,7 +828,6 @@
 %patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
 
 #
 # Make /dev/mem a need-to-know function 


--- linux-2.6-debug-driver_register.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 19 22:48:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 17:48:04 -0500
Subject: rpms/gcc/devel .cvsignore, 1.135, 1.136 gcc41.spec, 1.37,
	1.38 sources, 1.137, 1.138 gcc41-pr26334.patch, 1.2, NONE
Message-ID: <200602192248.k1JMm4L7031386@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31305

Modified Files:
	.cvsignore gcc41.spec sources 
Removed Files:
	gcc41-pr26334.patch 
Log Message:
4.1.0-0.29



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- .cvsignore	17 Feb 2006 22:24:47 -0000	1.135
+++ .cvsignore	19 Feb 2006 22:48:01 -0000	1.136
@@ -1 +1 @@
-gcc-4.1.0-20060217.tar.bz2
+gcc-4.1.0-20060219.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gcc41.spec	17 Feb 2006 22:24:47 -0000	1.37
+++ gcc41.spec	19 Feb 2006 22:48:02 -0000	1.38
@@ -1,6 +1,6 @@
-%define DATE 20060217
+%define DATE 20060219
 %define gcc_version 4.1.0
-%define gcc_release 0.28
+%define gcc_release 0.29
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -111,7 +111,6 @@
 Patch14: gcc41-mmintrin.patch
 Patch15: gcc41-pr25626.patch
 Patch16: gcc41-vrp.patch
-Patch17: gcc41-pr26334.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -407,7 +406,6 @@
 %patch14 -p0 -b .mmintrin~
 %patch15 -p0 -b .pr25626~
 %patch16 -p0 -b .vrp~
-%patch17 -p0 -b .pr26334~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1424,6 +1422,13 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Sun Feb 19 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.29
+- update from gcc-4_1-branch (-r111179:111278)
+  - PRs ada/13408, c++/26266, target/22209, target/26189
+  - fix ppc32 -fpic reload problem with extenddftf2 pattern
+    (David Edelsohn, #181625, PR target/26350)
+  - fix the PR middle-end/26334 patch
+
 * Fri Feb 17 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.28
 - update from gcc-4_1-branch (-r110978:111179)
   - PRs ada/20753, bootstrap/16787, bootstrap/26053, fortran/25806,


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- sources	17 Feb 2006 22:24:47 -0000	1.137
+++ sources	19 Feb 2006 22:48:02 -0000	1.138
@@ -1 +1 @@
-12c833736a6a751792fa9f2b2e548da3  gcc-4.1.0-20060217.tar.bz2
+a2796ec8b629416c40b1ac08b0ca5960  gcc-4.1.0-20060219.tar.bz2


--- gcc41-pr26334.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 19 23:18:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 18:18:31 -0500
Subject: rpms/gcc/devel gcc41-c++-parser.patch, NONE, 1.1 gcc41.spec, 1.38,
	1.39
Message-ID: <200602192318.k1JNIVKe021599@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21532

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-c++-parser.patch 
Log Message:
4.1.0-0.29


gcc41-c++-parser.patch:
 parser.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gcc41-c++-parser.patch ---
2006-02-19  Jakub Jelinek  <jakub at redhat.com>

	* parser.c (cp_parser_omp_for_loop): Adjust cp_finish_decl caller.

--- gcc/cp/parser.c.jj	2006-02-19 23:28:18.000000000 +0100
+++ gcc/cp/parser.c	2006-02-20 00:15:54.000000000 +0100
@@ -18449,8 +18449,8 @@ cp_parser_omp_for_loop (cp_parser *parse
 
 	      init = cp_parser_assignment_expression (parser, false);
 
-	      cp_finish_decl (decl, NULL_TREE, asm_specification,
-			      LOOKUP_ONLYCONVERTING);
+	      cp_finish_decl (decl, NULL_TREE, /*init_const_expr_p=*/false,
+			      asm_specification, LOOKUP_ONLYCONVERTING);
 
 	      if (pushed_scope)
 		pop_scope (pushed_scope);


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gcc41.spec	19 Feb 2006 22:48:02 -0000	1.38
+++ gcc41.spec	19 Feb 2006 23:18:28 -0000	1.39
@@ -111,6 +111,7 @@
 Patch14: gcc41-mmintrin.patch
 Patch15: gcc41-pr25626.patch
 Patch16: gcc41-vrp.patch
+Patch17: gcc41-c++-parser.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -406,6 +407,7 @@
 %patch14 -p0 -b .mmintrin~
 %patch15 -p0 -b .pr25626~
 %patch16 -p0 -b .vrp~
+%patch17 -p0 -b .c++-parser~
 
 sed -i -e 's/4\.1\.0/4.1.0/' 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  Sun Feb 19 23:52:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 18:52:15 -0500
Subject: rpms/gnome-panel/devel gnome-panel-2.13.91-gpm-integration.patch,
	1.4, 1.5 gnome-panel.spec, 1.114, 1.115
Message-ID: <200602192352.k1JNqFEB014197@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14081

Modified Files:
	gnome-panel-2.13.91-gpm-integration.patch gnome-panel.spec 
Log Message:
- bring back shutdown menu item


gnome-panel-2.13.91-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        |   30 +-
 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(+), 12 deletions(-)

Index: gnome-panel-2.13.91-gpm-integration.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.91-gpm-integration.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-panel-2.13.91-gpm-integration.patch	15 Feb 2006 14:36:24 -0000	1.4
+++ gnome-panel-2.13.91-gpm-integration.patch	19 Feb 2006 23:52:11 -0000	1.5
@@ -676,7 +676,7 @@
  panel_action_shutdown_is_disabled (void)
  {
  	return (panel_lockdown_get_disable_log_out() ||
-+		panel_action_can_suspend() ||
++		/* panel_action_can_suspend() || */
  		!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN));
  }
  


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-panel.spec	15 Feb 2006 14:36:24 -0000	1.114
+++ gnome-panel.spec	19 Feb 2006 23:52:11 -0000	1.115
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.91
-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
@@ -206,6 +206,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-3
+- bring back shutdown menu item
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
 - fix up the gnome-power-manager integration patch
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 00:51:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 19:51:46 -0500
Subject: rpms/xorg-x11-proto-devel/devel
	xorg-x11-proto-devel-7.0-buffer-values.patch, NONE,
	1.1 xorg-x11-proto-devel.spec, 1.19, 1.20
Message-ID: <200602200051.k1K0pk4g002840@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2825

Modified Files:
	xorg-x11-proto-devel.spec 
Added Files:
	xorg-x11-proto-devel-7.0-buffer-values.patch 
Log Message:
- Add back part of glproto-texture-from-drawable patch that didn't
  get integrated for some reason


xorg-x11-proto-devel-7.0-buffer-values.patch:
 glxtokens.h |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-proto-devel-7.0-buffer-values.patch ---
--- xorg-x11-proto-devel-7.0/glproto-1.4.3/glxtokens.h 30 Jun 2004 20:06:52 -0000      1.4
+++ xorg-x11-proto-devel-7.0/glproto-1.4.3/glxtokens.h 7 Feb 2006 05:24:33 -0000
@@ -156,6 +156,8 @@ extern "C" {
 /* #define GLX_RENDER_TYPE               0x8011 */
 #define GLX_SCREEN                     0x800C
 
+#define GLX_FRONT_LEFT_EXT                 0x6005
+
 /* glXSelectEvent event mask bits */
 #define GLX_PBUFFER_CLOBBER_MASK       0x08000000


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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-proto-devel.spec	16 Feb 2006 23:11:59 -0000	1.19
+++ xorg-x11-proto-devel.spec	20 Feb 2006 00:51:44 -0000	1.20
@@ -6,7 +6,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.0
-Release: 3
+Release: 4
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -44,6 +44,8 @@
 Source29: %{sourceurl}/xproto-7.0.4.tar.bz2
 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2
 
+Patch0: xorg-x11-proto-devel-7.0-buffer-values.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
@@ -67,6 +69,8 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
+%patch -p1 -b .buffer-values
+
 %build
 #ls -al
 
@@ -270,6 +274,10 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> 7.0-4
+- Add back part of glproto-texture-from-drawable patch that didn't
+  get integrated for some reason
+
 * Thu Feb 16 2006 Mike A. Harris <mharris at redhat.com> 7.0-3
 - Update to glproto-1.4.4
 - Drop glproto-texture-from-drawable patch, which is integrated now.



From fedora-cvs-commits at redhat.com  Mon Feb 20 00:57:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 19 Feb 2006 19:57:54 -0500
Subject: rpms/xorg-x11-proto-devel/devel
	xorg-x11-proto-devel-7.0-buffer-values.patch, 1.1, 1.2
Message-ID: <200602200057.k1K0vsJm012585@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12374

Modified Files:
	xorg-x11-proto-devel-7.0-buffer-values.patch 
Log Message:
- frob patch path to match current version of glproto


xorg-x11-proto-devel-7.0-buffer-values.patch:
 glxtokens.h |    2 ++
 1 files changed, 2 insertions(+)

Index: xorg-x11-proto-devel-7.0-buffer-values.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel-7.0-buffer-values.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-proto-devel-7.0-buffer-values.patch	20 Feb 2006 00:51:44 -0000	1.1
+++ xorg-x11-proto-devel-7.0-buffer-values.patch	20 Feb 2006 00:57:50 -0000	1.2
@@ -1,5 +1,5 @@
---- xorg-x11-proto-devel-7.0/glproto-1.4.3/glxtokens.h 30 Jun 2004 20:06:52 -0000      1.4
-+++ xorg-x11-proto-devel-7.0/glproto-1.4.3/glxtokens.h 7 Feb 2006 05:24:33 -0000
+--- xorg-x11-proto-devel-7.0/glproto-1.4.4/glxtokens.h 30 Jun 2004 20:06:52 -0000      1.4
++++ xorg-x11-proto-devel-7.0/glproto-1.4.4/glxtokens.h 7 Feb 2006 05:24:33 -0000
 @@ -156,6 +156,8 @@ extern "C" {
  /* #define GLX_RENDER_TYPE               0x8011 */
  #define GLX_SCREEN                     0x800C



From fedora-cvs-commits at redhat.com  Mon Feb 20 08:42:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 03:42:40 -0500
Subject: rpms/logwatch/devel logwatch-7.1-http2.patch, NONE,
	1.1 logwatch.spec, 1.34, 1.35
Message-ID: <200602200842.k1K8geUF004160@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4006

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.1-http2.patch 
Log Message:
- fix http exploit problem #181802


logwatch-7.1-http2.patch:
 http |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.1-http2.patch ---
--- logwatch-7.1/scripts/services/http.pom	2006-02-20 09:24:32.000000000 +0100
+++ logwatch-7.1/scripts/services/http	2006-02-20 09:26:01.498935680 +0100
@@ -263,7 +263,7 @@
 #   what to look for as an attack  USE LOWER CASE!!!!!!
 #
 my @exploits = (
-   'null',
+   '^null$',
    '/\.\./\.\./\.\./',
    '\.\./\.\./config\.sys',
    '/\.\./\.\./\.\./autoexec\.bat',


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- logwatch.spec	20 Jan 2006 12:03:31 -0000	1.34
+++ logwatch.spec	20 Feb 2006 08:42:37 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.1
-Release: 7
+Release: 8
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -15,6 +15,7 @@
 Patch8: logwatch-7.1-audit.patch
 Patch9: logwatch-7.1-http.patch
 Patch10: logwatch-7.1-pam_unix.patch
+Patch11: logwatch-7.1-http2.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -37,6 +38,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1 
+%patch11 -p1
 
 %install
 
@@ -138,6 +140,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Feb 20 2006 Ivana Varekova <varekova at redhat.com> 7.1-8
+- fix http exploit problem #181802
+
 * Fri Jan 20 2006 Ivana Varekova <varekova at redhat.com> 7.1-7
 - extended pam_unix patch (fix sshd service)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 10:04:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 05:04:25 -0500
Subject: rpms/psacct/devel psacct-6.3.2-LargeFile.patch, NONE,
	1.1 psacct.spec, 1.20, 1.21
Message-ID: <200602201004.k1KA4PGM020600@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20508

Modified Files:
	psacct.spec 
Added Files:
	psacct-6.3.2-LargeFile.patch 
Log Message:
 add large file support


psacct-6.3.2-LargeFile.patch:
 INSTALL   |    2 +-
 configure |    6 +++---
 file_rd.c |   12 +++++++-----
 file_rd.h |    7 +++++--
 4 files changed, 16 insertions(+), 11 deletions(-)

--- NEW FILE psacct-6.3.2-LargeFile.patch ---
--- acct-6.3.2/configure.pom	1998-03-10 19:10:13.000000000 +0100
+++ acct-6.3.2/configure	2005-06-08 14:24:04.624175432 +0200
@@ -930,11 +930,11 @@
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
+    CFLAGS="$ac_save_CFLAGS -D_FILE_OFFSET_BITS=64"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g -O2 -D_FILE_OFFSET_BITS=64"
   else
-    CFLAGS="-O2"
+    CFLAGS="-O2 -D_FILE_OFFSET_BITS=64"
   fi
 else
   GCC=
--- acct-6.3.2/file_rd.c.pom	1997-10-14 02:28:36.000000000 +0200
+++ acct-6.3.2/file_rd.c	2005-06-08 14:24:04.624175432 +0200
@@ -5,6 +5,8 @@
 
 #include "config.h"
 
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
 #include <stdio.h>
 
 #ifdef HAVE_STRING_H
@@ -106,9 +108,9 @@
 	  
 	  if (fri->backwards)
 	    {
-	      long offset, max_recs, recs_to_read;
+	      off_t offset, max_recs, recs_to_read;
 
-	      if ((offset = ftell (fri->fp)) <= 0)
+	      if ((offset = ftello (fri->fp)) <= 0)
 		goto no_more_records;
 
 	      /* Read as many records as possible, up to
@@ -127,8 +129,8 @@
       
 	      if (debugging_enabled)
 		{
-		  long new_offset = ftell (fri->fp);
-		  fprintf (stddebug, "Did seek in file %ld --> %ld\n",
+		  off_t new_offset = ftello (fri->fp);
+		  fprintf (stddebug, "Did seek in file %lld --> %lld\n",
 			   offset, new_offset);
 		}
       
@@ -137,7 +139,7 @@
 		fatal ("get_entry: couldn't read from file");
       
 	      if (debugging_enabled)
-		fprintf (stddebug, "Got %ld records from file\n",
+		fprintf (stddebug, "Got %lld records from file\n",
 			 recs_to_read);
   
 	      /* don't need to check this, because the above read was fine */
--- acct-6.3.2/file_rd.h.pom	1997-10-14 02:28:36.000000000 +0200
+++ acct-6.3.2/file_rd.h	2005-06-08 14:24:04.625175280 +0200
@@ -3,6 +3,9 @@
  * data structures and routines for reading/writing binary
  * record-oriented files. */
 
+#define __USE_XOPEN
+#include <unistd.h>
+
 struct file_list {
   char *name;
   struct file_list *next;
@@ -15,8 +18,8 @@
 				   because we close files as soon as
 				   we find their ends and free their
 				   entries from the linked list */
-  int recs_read;		/* how many records are in our buffer? */
-  int recs_left;		/* how many records are left in the
+  off_t recs_read;		/* how many records are in our buffer? */
+  off_t recs_left;		/* how many records are left in the
 				   buffer to be used? */
   void *buffer;			/* the buffer for the data */
   int buffered_records;		/* how many records to buffer */
--- acct-6.3.2/INSTALL.pom	1997-09-29 23:02:02.000000000 +0200
+++ acct-6.3.2/INSTALL	2005-06-08 14:24:04.625175280 +0200
@@ -59,7 +59,7 @@
 initial values for variables by setting them in the environment.  Using
 a Bourne-compatible shell, you can do that on the command line like
 this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+     CC=c89 CFLAGS="-O2 -D_FILE_OFFSET_BITS=64" LIBS=-lposix ./configure
 
 Or on systems that have the `env' program, you can do it like this:
      env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure


Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- psacct.spec	11 Feb 2006 05:18:30 -0000	1.20
+++ psacct.spec	20 Feb 2006 10:04:22 -0000	1.21
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 38.2
+Release: 39
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -27,6 +27,7 @@
 Patch4: acct-6.3.2-pts.patch
 Patch5: psacct-6.3.2-strictmatch.patch
 Patch6: psacct-6.3.2-sa-manfix.patch
+Patch7: psacct-6.3.2-LargeFile.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/install-info
@@ -57,6 +58,7 @@
 %patch4 -p1 -b .pts
 %patch5 -p1 -b .strictmatch
 %patch6 -p1 -b .tio-avio
+%patch7 -p1 -b .lfs
 
 %build
 %if ! %{FHS_compliant}
@@ -125,6 +127,7 @@
   }
   /sbin/install-info %{_infodir}/accounting.info.gz %{_infodir}/dir --entry="* accounting: (accounting).            The GNU Process Accounting Suite."
 fi
+touch %{accounting_logdir}/pacct
 
 %preun
 if [ $1 = 0 ]; then
@@ -139,7 +142,7 @@
 %dir /var/account
 %endif
 /etc/rc.d/init.d/psacct
-%attr(0600,root,root)	%config %{accounting_logdir}/pacct
+%attr(0600,root,root)	%ghost %config %{accounting_logdir}/pacct
 %attr(0644,root,root)	%config(noreplace) /etc/logrotate.d/*
 /sbin/accton
 %{_sbindir}/accton
@@ -161,6 +164,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Mon Feb 20 2006 Ivana Varekova <varekova at redhat.com> - 6.3.2-39
+- add Large File Support 
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.3.2-38.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 10:58:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 05:58:09 -0500
Subject: rpms/vim/devel vim.spec,1.97,1.98
Message-ID: <200602201058.k1KAw9Ih000700@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv632

Modified Files:
	vim.spec 
Log Message:
- gtk-update-icon-cache --ignore-theme-index
  (avoids %%post failures when hicolor-icon-theme isn't installed)




Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- vim.spec	15 Feb 2006 14:28:45 -0000	1.97
+++ vim.spec	20 Feb 2006 10:58:06 -0000	1.98
@@ -25,7 +25,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -408,13 +408,13 @@
 %post X11
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor
 fi
 
 %postun X11
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  gtk-update-icon-cache --ignore-theme-index -q %{_datadir}/icons/hicolor
 fi
 
 %clean
@@ -489,6 +489,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* 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



From fedora-cvs-commits at redhat.com  Mon Feb 20 11:05:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 06:05:22 -0500
Subject: rpms/netpbm/devel netpbm-10.31-msbmp.patch, NONE, 1.1 netpbm.spec,
	1.54, 1.55
Message-ID: <200602201105.k1KB5Mbk001970@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1895

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.31-msbmp.patch 
Log Message:
* Mon Feb 20 2006 Jindrich Novy <jnovy at redhat.com> 10.31-5
- add missing flex BuildRequires
- fix anytopnm to recognize ms-bmp files (#182060)


netpbm-10.31-msbmp.patch:
 anytopnm |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE netpbm-10.31-msbmp.patch ---
--- netpbm-10.31/converter/other/anytopnm.msbmp	2006-02-14 15:21:56.000000000 +0100
+++ netpbm-10.31/converter/other/anytopnm	2006-02-20 10:19:13.000000000 +0100
@@ -82,6 +82,9 @@ computeTypeFromMimeType () {
         image/bmp )
             filetype="bmp"
             ;;
+        image/x-ms-bmp )
+            filetype="bmp"
+            ;;
         image/png )
             filetype="png"
             ;;


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- netpbm.spec	14 Feb 2006 14:25:38 -0000	1.54
+++ netpbm.spec	20 Feb 2006 11:05:18 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
 Version: 10.31
-Release: 4
+Release: 5
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -21,8 +21,9 @@
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
 Patch13: netpbm-10.31-xwdfix.patch
+Patch14: netpbm-10.31-msbmp.patch
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
+BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
 Obsoletes: libgr
 
 %description
@@ -78,6 +79,7 @@
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
 %patch13 -p1 -b .xwdfix
+%patch14 -p1 -b .msbmp
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -176,6 +178,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Feb 20 2006 Jindrich Novy <jnovy at redhat.com> 10.31-5
+- add missing flex BuildRequires
+- fix anytopnm to recognize ms-bmp files (#182060)
+
 * Tue Feb 14 2006 Jindrich Novy <jnovy at redhat.com> 10.31-4
 - make xwdtopnm work on x86_64 (#181001)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 11:39:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 06:39:19 -0500
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.51,1.52
Message-ID: <200602201139.k1KBdJru016883@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16871

Modified Files:
	desktop-printing.spec 
Log Message:
eggcups-ec-job-list.o eggcups-ec-tray-icon.o eggcups-eggtrayicon.o eggcups-ec-driver-prompt.o eggcups-ec-driver-prompt-dialog.o -pthread  -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lpangoft2-1.0 -lgnomevfs-2 -lbonobo-2 -lbonobo-activation -lgnome-keyring -ldbus-glib-1 -lgnomecups-1.0 -lssl -lcrypto -lnsl -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lz -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgconf-2 -lORBit-2 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lhal -ldbus-1 -L/usr/X11R6/lib -lXss -lcups
/usr/bin/ld: cannot find -lXss
collect2: ld returned 1 exit status
make[2]: *** [eggcups] Error 1


- added BuildRequires: libXScrnSaver-devel



Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- desktop-printing.spec	11 Feb 2006 02:24:53 -0000	1.51
+++ desktop-printing.spec	20 Feb 2006 11:39:16 -0000	1.52
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 5.2 
+Release: 6
 License: GPL
 Group: Applications/File
 # total lie
@@ -26,6 +26,7 @@
 BuildRequires: desktop-file-utils, intltool, cups-devel
 BuildRequires: libgnomecups-devel >= 0.1.12
 BuildRequires: gnome-keyring-devel 
+BuildRequires: libXScrnSaver-devel
 
 %description
 Desktop-printing contains eggcups, a program for user print job
@@ -87,6 +88,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 0.19-6
+- BuildRequire libXScrnSaver-devel for libXss
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.19-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 11:43:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 06:43:48 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo62318.extensions.mozab.patch, NONE,
	1.1 .cvsignore, 1.96, 1.97 openoffice.org.spec, 1.621,
	1.622 sources, 1.154, 1.155 workspace.atkbridge.patch, 1.6, 1.7
Message-ID: <200602201143.k1KBhlTF016983@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16963

Modified Files:
	.cvsignore openoffice.org.spec sources 
	workspace.atkbridge.patch 
Added Files:
	openoffice.org-2.0.2.ooo62318.extensions.mozab.patch 
Log Message:
next release candidate

openoffice.org-2.0.2.ooo62318.extensions.mozab.patch:
 extensions/source/abpilot/makefile.mk |    4 +++-
 source/abpilot/makefile.mk            |    0 
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.ooo62318.extensions.mozab.patch ---
Index: source/abpilot/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/abpilot/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/abpilot/makefile.mk	19 Dec 2005 17:27:56 -0000	1.9
+++ openoffice.org/extensions/source/abpilot/makefile.mk	20 Feb 2006 11:35:26 -0000
@@ -69,8 +69,10 @@
 		$(EXCEPTIONSFILES)
 
 
-.IF "WITH_MOZILLA" != ""
+.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(SYSTEM_MOZILLA)" != "YES"
 CDEFS+=-DWITH_MOZILLA
+.ENDIF
 .ENDIF
 
 SRS1NAME=$(TARGET)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	15 Feb 2006 08:30:43 -0000	1.96
+++ .cvsignore	20 Feb 2006 11:43:43 -0000	1.97
@@ -157,3 +157,4 @@
 redhat-templates.tar.gz
 Tigert-templates.tar.gz
 OOB680_m1.tar.bz2
+OOB680_m2.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- openoffice.org.spec	16 Feb 2006 14:33:08 -0000	1.621
+++ openoffice.org.spec	20 Feb 2006 11:43:43 -0000	1.622
@@ -1,6 +1,6 @@
 %define oootag OOB680
-%define ooomilestone 1
-%define rh_rpm_release 2
+%define ooomilestone 2
+%define rh_rpm_release 1
 
 %define build_fc5 1
 %define build_fc4 0
@@ -204,6 +204,7 @@
 Patch36: openoffice.org-2.0.2.ooo61875.sd.compile.patch
 Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
 Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch39: openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -848,7 +849,7 @@
 %patch23 -p1 -b .ooo54479.systemicu.patch
 %endif
 %patch24 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch25 -p1 -b .workspace.atkbridge.patch
+%patch25 -p0 -b .workspace.atkbridge.patch
 %patch26 -p1 -b .ooo56651.sw.rtfcrash.patch
 %patch27 -p0 -b .workspace.jaxpapi.patch
 %patch28 -p1 -b .workspace.systemjava.patch
@@ -864,6 +865,7 @@
 %patch36 -p1 -b .ooo61875.sd.compile.patch
 %patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
 %patch38 -p1 -b .ooo62030.solenv._version.patch
+%patch39 -p1 -b .ooo62318.extensions.mozab.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -905,7 +907,7 @@
 export CC=gcc4
 export CXX=g++4
 %endif
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --with-images=industrial %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --enable-atkbridge --with-images=industrial %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -3353,11 +3355,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Feb 16 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.2
-- update and split evo patches to match upstream segmentation
-
-* Mon Feb 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-1.1
-- 2.0.2 previews
+* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-2.1
 - hunspell replaces myspell
 - Catalan help documentation available
 - add sestatus details to crash_reporter
@@ -3393,6 +3391,9 @@
 - rh#178670# drop PROT_EXEC
 - add openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch for rh#179692#
 - add openoffice.org-2.0.2.ooo62030.solenv._version.patch
+- rh#181876# update workspace.atkbridge.patch
+- update and split evo patches to match upstream segmentation
+- ooo#62318# mozab not available with system mozilla
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:2.0.1.1-11.2.2
 - bump again for double-long bug on ppc(64)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- sources	15 Feb 2006 11:46:07 -0000	1.154
+++ sources	20 Feb 2006 11:43:44 -0000	1.155
@@ -6,7 +6,7 @@
 b54bcc9fdb23389e961b281508d9110c  documentation.openoffice.org-templates.tar.gz
 8bc013e30e432ce3927e402e9aaa8c9f  redhat-templates.tar.gz
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
-7d819e432c243e299d75196890c58f24  OOB680_m1.tar.bz2
 fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
 0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh
 0fc9c0b585e2c92a7ac05adebeb4caf2  GSI_ga.sdf
+fe9bcbc54e3b23ba1c28a418c696f2b2  OOB680_m2.tar.bz2

workspace.atkbridge.patch:
 comphelper/source/misc/accessiblewrapper.cxx                   |    6 
 config_office/configure.in                                     |   18 
 config_office/set_soenv.in                                     |    4 
 fpicker/source/unx/gnome/FPentry.cxx                           |    3 
 svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx |    1 
 svtools/source/Accessibility/accessiblelistboxentry.cxx        |    1 
 svtools/source/Accessibility/accessibletabbar.cxx              |    9 
 svtools/source/Accessibility/accessibletabbarpage.cxx          |   21 
 svtools/source/Accessibility/accessibletabbarpagelist.cxx      |   31 
 svtools/source/brwbox/brwbox3.cxx                              |    3 
 svtools/source/contnr/svtabbx.cxx                              |    3 
 svtools/source/control/valueacc.cxx                            |    2 
 svtools/source/edit/textwindowaccessibility.cxx                |    2 
 svx/source/accessibility/AccessibleContextBase.cxx             |    1 
 svx/source/accessibility/AccessibleControlShape.cxx            |    1 
 svx/source/accessibility/AccessibleEditableTextPara.cxx        |    1 
 svx/source/accessibility/AccessibleFrameSelector.cxx           |    3 
 svx/source/accessibility/AccessibleImageBullet.cxx             |    1 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx         |    1 
 svx/source/accessibility/charmapacc.cxx                        |    8 
 svx/source/accessibility/svxrectctaccessiblecontext.cxx        |    2 
 toolkit/source/awt/accessiblemenubasecomponent.cxx             |   15 
 toolkit/source/awt/accessiblemenucomponent.cxx                 |    3 
 toolkit/source/awt/accessiblemenuitemcomponent.cxx             |    3 
 toolkit/source/awt/vclxaccessiblecomponent.cxx                 |   10 
 toolkit/source/awt/vclxaccessiblelistitem.cxx                  |    1 
 toolkit/source/awt/vclxaccessiblemenuitem.cxx                  |    8 
 toolkit/source/awt/vclxaccessiblestatusbaritem.cxx             |    1 
 toolkit/source/awt/vclxaccessibletabpage.cxx                   |    1 
 toolkit/source/awt/vclxaccessibletoolboxitem.cxx               |   19 
 vcl/inc/menu.hxx                                               |    3 
 vcl/inc/svapp.hxx                                              |    2 
 vcl/prj/build.lst                                              |    3 
 vcl/source/app/makefile.mk                                     |    4 
 vcl/source/app/svapp.cxx                                       |   17 
 vcl/source/window/menu.cxx                                     |   35 
 vcl/unx/gtk/a11y/TODO                                          |   49 
 vcl/unx/gtk/a11y/atkaction.cxx                                 |  287 +++
 vcl/unx/gtk/a11y/atkbridge.cxx                                 |   56 
 vcl/unx/gtk/a11y/atkcomponent.cxx                              |  362 ++++
 vcl/unx/gtk/a11y/atkeditabletext.cxx                           |  207 ++
 vcl/unx/gtk/a11y/atkfactory.cxx                                |  166 ++
 vcl/unx/gtk/a11y/atkfactory.hxx                                |   49 
 vcl/unx/gtk/a11y/atkhypertext.cxx                              |  295 +++
 vcl/unx/gtk/a11y/atkimage.cxx                                  |  144 +
 vcl/unx/gtk/a11y/atklistener.cxx                               |  470 +++++
 vcl/unx/gtk/a11y/atklistener.hxx                               |   92 +
 vcl/unx/gtk/a11y/atkselection.cxx                              |  200 ++
 vcl/unx/gtk/a11y/atktable.cxx                                  |  594 +++++++
 vcl/unx/gtk/a11y/atktext.cxx                                   |  547 ++++++
 vcl/unx/gtk/a11y/atktextattributes.cxx                         |  572 +++++++
 vcl/unx/gtk/a11y/atktextattributes.hxx                         |   60 
 vcl/unx/gtk/a11y/atkutil.cxx                                   |  580 +++++++
 vcl/unx/gtk/a11y/atkutil.hxx                                   |   45 
 vcl/unx/gtk/a11y/atkvalue.cxx                                  |  152 +
 vcl/unx/gtk/a11y/atkwindow.cxx                                 |  112 +
 vcl/unx/gtk/a11y/atkwindow.hxx                                 |   45 
 vcl/unx/gtk/a11y/atkwrapper.cxx                                |  809 ++++++++++
 vcl/unx/gtk/a11y/atkwrapper.hxx                                |  125 +
 vcl/unx/gtk/a11y/makefile.mk                                   |  101 +
 vcl/unx/gtk/app/gtkinst.cxx                                    |   26 
 vcl/unx/gtk/app/makefile.mk                                    |    4 
 vcl/unx/gtk/window/gtkframe.cxx                                |  133 +
 vcl/unx/gtk/window/makefile.mk                                 |    4 
 vcl/unx/inc/plugins/gtk/atkbridge.hxx                          |   45 
 vcl/unx/inc/plugins/gtk/gtkframe.hxx                           |   24 
 vcl/util/makefile.mk                                           |    5 
 67 files changed, 6550 insertions(+), 57 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 workspace.atkbridge.patch
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.atkbridge.patch	15 Feb 2006 08:30:44 -0000	1.6
+++ workspace.atkbridge.patch	20 Feb 2006 11:43:44 -0000	1.7
@@ -1,32 +1,608 @@
-Index: source/misc/accessiblewrapper.cxx
-===================================================================
-RCS file: /cvs/util/comphelper/source/misc/accessiblewrapper.cxx,v
-retrieving revision 1.9
-retrieving revision 1.8.156.2
-diff -u -p -r1.9 -r1.8.156.2
---- openoffice.org.orig/comphelper/source/misc/accessiblewrapper.cxx	8 Sep 2005 02:48:04 -0000	1.9
-+++ openoffice.org/comphelper/source/misc/accessiblewrapper.cxx	21 Sep 2005 05:53:29 -0000	1.8.156.2
-@@ -150,6 +150,11 @@ namespace comphelper
- 		const Reference< XAccessible >& _rxKey,	sal_Bool _bCreate )
+diff -Nur m154/comphelper/source/misc/accessiblewrapper.cxx atkbridge/comphelper/source/misc/accessiblewrapper.cxx
+--- comphelper/source/misc/accessiblewrapper.cxx	2005-09-08 04:48:04.000000000 +0200
++++ comphelper/source/misc/accessiblewrapper.cxx	2005-09-21 07:53:29.000000000 +0200
+@@ -151,6 +151,12 @@
  	{
  		Reference< XAccessible > xValue;
-+
+ 
 +		if( !_rxKey.is() )
 +		{
++//			fprintf( stderr, "It was this path that was crashing stuff\n" );
 +			return xValue;
 +		}
- 
++
  		// do we have this child in the cahce?
  		AccessibleMap::const_iterator aPos = m_aChildrenMap.find( _rxKey );
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/vcl/prj/build.lst,v
-retrieving revision 1.42
-retrieving revision 1.41.72.2
-diff -u -p -r1.42 -r1.41.72.2
---- openoffice.org.orig/vcl/prj/build.lst	30 Aug 2005 09:37:21 -0000	1.42
-+++ openoffice.org/vcl/prj/build.lst	21 Sep 2005 07:13:26 -0000	1.41.72.2
-@@ -18,6 +18,7 @@ vc	vcl\unx\source\gdi						nmake	-	u	vc_
+ 		if ( m_aChildrenMap.end() != aPos )
+diff -Nur m154/config_office/configure.in atkbridge/config_office/configure.in
+--- config_office/configure.in	2006-01-20 14:28:25.000000000 +0100
++++ config_office/configure.in	2006-01-30 16:07:32.000000000 +0100
+@@ -142,6 +142,11 @@
+ [  --enable-vctk           Tell configure to check for the MS VC Toolkit 2003.
+                           ( This is experimental! )
+ ],,)
++AC_ARG_ENABLE(atkbridge,
++[  --enable-atkbridge      Enable support for direct ATK accessibility bridge
++			   under UNIX, instead of via the existing Java bridge
++                          ( This is experimental! )
++],,)
+ AC_ARG_ENABLE(gtk,
+ [  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
+                           where Gtk+ is available.
+@@ -3847,6 +3852,19 @@
+ 	AC_MSG_RESULT([$R])
+ fi
+ 
++AC_MSG_CHECKING([Whether ATK bridge can be built])
++EXPERIMENTAL_ATKBRIDGE=
++if test "x$enable_atkbridge" = "xyes"; then
++   if test "x$ENABLE_GTK" != "xTRUE"; then
++	AC_MSG_ERROR([ATK bridge requires gtk+])
++   else
++	AC_MSG_RESULT([yes])
++   fi
++   
++   EXPERIMENTAL_ATKBRIDGE=TRUE
++fi
++AC_SUBST(EXPERIMENTAL_ATKBRIDGE)
++
+ dnl ===================================================================
+ dnl Gnome VFS check
+ dnl ===================================================================
+diff -Nur m154/config_office/set_soenv.in atkbridge/config_office/set_soenv.in
+--- config_office/set_soenv.in	2006-01-13 17:37:16.000000000 +0100
++++ config_office/set_soenv.in	2006-01-30 16:07:51.000000000 +0100
+@@ -1519,6 +1519,10 @@
+ ToFile( "ENABLE_KAB",        "@ENABLE_KAB@",       "e" );
+ ToFile( "MOC",               "@MOC@",              "e" );
+ ToFile( "PSPRINT",           "TRUE",             "e" );
++
++# Experimental pieces
++ToFile( "EXPERIMENTAL_ATKBRIDGE",      "@EXPERIMENTAL_ATKBRIDGE@",   "e" );
++
+ # [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this.
+ # There may be a better way to do this, like splitting unxmacxp into two, but
+ # hopefully this hack will work for now...
+diff -Nur m154/fpicker/source/unx/gnome/FPentry.cxx atkbridge/fpicker/source/unx/gnome/FPentry.cxx
+--- fpicker/source/unx/gnome/FPentry.cxx	2005-09-09 01:34:31.000000000 +0200
++++ fpicker/source/unx/gnome/FPentry.cxx	2005-12-07 15:37:07.000000000 +0100
+@@ -158,8 +158,7 @@
+ 	{
+ 			if (
+ 				 /* crude gtkplug check */ !g_type_from_name( "GdkDisplay" ) || 
+-				 /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 ) ||
+-				 /* #i42429# */ Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()
++				 /* old version */ !( gtk_major_version >= 2 && gtk_minor_version >= 4 ) 
+ 			   )
+ 			{
+ 					return 0;
+diff -Nur m154/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx atkbridge/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx
+--- svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx	2005-09-08 16:25:23.000000000 +0200
++++ svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx	2005-12-06 09:41:55.000000000 +0100
+@@ -441,6 +441,7 @@
+ 	       	pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ 	       	pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+ 	       	pStateSetHelper->AddState( AccessibleStateType::ENABLED );
++            pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+ 			if ( IsShowing_Impl() )
+ 			{
+ 	        	pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+diff -Nur m154/svtools/source/Accessibility/accessiblelistboxentry.cxx atkbridge/svtools/source/Accessibility/accessiblelistboxentry.cxx
+--- svtools/source/Accessibility/accessiblelistboxentry.cxx	2005-09-08 16:25:58.000000000 +0200
++++ svtools/source/Accessibility/accessiblelistboxentry.cxx	2005-12-06 09:41:55.000000000 +0100
+@@ -503,6 +503,7 @@
+ 	       	pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+ 	       	pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+ 	       	pStateSetHelper->AddState( AccessibleStateType::ENABLED );
++            pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+ 			if ( getListBox()->IsInplaceEditingEnabled() )
+ 		       	pStateSetHelper->AddState( AccessibleStateType::EDITABLE );
+ 			if ( IsShowing_Impl() )
+diff -Nur m154/svtools/source/Accessibility/accessibletabbar.cxx atkbridge/svtools/source/Accessibility/accessibletabbar.cxx
+--- svtools/source/Accessibility/accessibletabbar.cxx	2005-09-27 14:54:20.000000000 +0200
++++ svtools/source/Accessibility/accessibletabbar.cxx	2005-12-06 09:41:56.000000000 +0100
+@@ -148,6 +148,8 @@
+ 		{
+ 			case VCLEVENT_WINDOW_ENABLED:
+ 			{
++                aNewValue <<= AccessibleStateType::SENSITIVE;
++                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ 				aNewValue <<= AccessibleStateType::ENABLED;
+ 				NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ 			}
+@@ -156,6 +158,8 @@
+ 			{
+ 				aOldValue <<= AccessibleStateType::ENABLED;
+ 				NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
++                aOldValue <<= AccessibleStateType::SENSITIVE;
++                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ 			}
+ 			break;
+ 			case VCLEVENT_WINDOW_GETFOCUS:
+@@ -205,7 +209,10 @@
+ 		if ( m_pTabBar )
+ 		{
+ 			if ( m_pTabBar->IsEnabled() )
+-				rStateSet.AddState( AccessibleStateType::ENABLED );
++            {
++                rStateSet.AddState( AccessibleStateType::ENABLED );
++                rStateSet.AddState( AccessibleStateType::SENSITIVE );
++            }
+ 
+ 			rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+ 
+diff -Nur m154/svtools/source/Accessibility/accessibletabbarpage.cxx atkbridge/svtools/source/Accessibility/accessibletabbarpage.cxx
+--- svtools/source/Accessibility/accessibletabbarpage.cxx	2005-09-08 16:26:46.000000000 +0200
++++ svtools/source/Accessibility/accessibletabbarpage.cxx	2005-12-06 09:41:56.000000000 +0100
+@@ -150,13 +150,21 @@
+ 	{
+ 		if ( m_bEnabled != bEnabled )
+ 		{
+-			Any aOldValue, aNewValue;
++            Any aOldValue[2], aNewValue[2];
+ 			if ( m_bEnabled )
+-				aOldValue <<= AccessibleStateType::ENABLED;
+-			else
+-				aNewValue <<= AccessibleStateType::ENABLED;
++            {
++                aOldValue[0] <<= AccessibleStateType::SENSITIVE;
++                aOldValue[1] <<= AccessibleStateType::ENABLED;
++            }
++            else
++            {
++
++                aNewValue[0] <<= AccessibleStateType::ENABLED;
++                aNewValue[1] <<= AccessibleStateType::SENSITIVE;
++            }
+ 			m_bEnabled = bEnabled;
+-			NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
++            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
++            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
+ 		}
+ 	}
+ 
+@@ -211,7 +219,10 @@
+ 	void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+ 	{
+ 		if ( IsEnabled() )
++        {
+ 			rStateSet.AddState( AccessibleStateType::ENABLED );
++            rStateSet.AddState( AccessibleStateType::SENSITIVE );
[...6850 lines suppressed...]
-+        // FIXME: handle this internally
-+        else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::WINDOW )
-+        {
-+            Window *pChild = pWindow->GetChild( 0 );
-+            if( pChild )
-+            {
-+                uno::Reference< accessibility::XAccessible > xAccessible(pChild->GetAccessible( bCreate ));
-+                if( xAccessible.is() )
-+                {
-+//                    uno::Reference< accessibility::XAccessibleContext > xContext(xAccessible->getAccessibleContext());
-+//                    if( xContext.is() &&
-+//                        xContext->getAccessibleRole() == accessibility::AccessibleRole::POPUP_MENU )
-+//                    {
-+                        return xAccessible;
-+//                    }
-+                }
-+            }
-+        }
-+        else
-+        {
-+            return pWindow->GetAccessible( bCreate );
-+        }
++        pWindow = pWindow->GetAccessibleChildWindow( 0 );
++        g_return_val_if_fail( pWindow != NULL, NULL );
 +    }
++    // replace the top-level role Dialog with something more appropriate ..
++    else if( pWindow->GetAccessibleRole() == accessibility::AccessibleRole::DIALOG )
++        pWindow->SetAccessibleRole(accessibility::AccessibleRole::OPTION_PANE);
 +    
-+    return uno::Reference< accessibility::XAccessible >();
++    return pWindow->GetAccessible( bCreate );
 +}
 +
++#endif // EXPERIMENTAL_ATKBRIDGE
++
  void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
  {
      if( nStyle & SAL_FRAME_STYLE_DEFAULT ) // ensure default style
-@@ -473,7 +665,8 @@ void GtkSalFrame::Init( SalFrame* pParen
-         nStyle &= ~SAL_FRAME_STYLE_FLOAT;
+@@ -590,6 +721,8 @@
      }
  
--    m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
-+    m_pWindow = createWindow( this, nStyle );
+     m_pWindow = GTK_WINDOW( gtk_widget_new( GTK_TYPE_WINDOW, "type", ((nStyle & SAL_FRAME_STYLE_FLOAT) && ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL, "visible", FALSE, NULL ) );
++	g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
 +
      m_pParent = static_cast<GtkSalFrame*>(pParent);
      m_pForeignParent = NULL;
      m_aForeignParentWindow = None;
-Index: unx/inc/plugins/gtk/atkfactory.hxx
-===================================================================
-RCS file: unx/inc/plugins/gtk/atkfactory.hxx
-diff -N unx/inc/plugins/gtk/atkfactory.hxx
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx	28 Sep 2005 07:24:17 -0000	1.1.2.2
-@@ -0,0 +1,51 @@
+diff -Nur m154/vcl/unx/gtk/window/makefile.mk atkbridge/vcl/unx/gtk/window/makefile.mk
+--- vcl/unx/gtk/window/makefile.mk	2005-09-09 14:38:24.000000000 +0200
++++ vcl/unx/gtk/window/makefile.mk	2005-11-04 15:56:29.000000000 +0100
+@@ -49,6 +49,10 @@
+ 
+ # --- Files --------------------------------------------------------
+ 
++.IF "$(EXPERIMENTAL_ATKBRIDGE)" != ""
++CFLAGS += -DEXPERIMENTAL_ATKBRIDGE
++.ENDIF
++
+ .IF "$(GUIBASE)"!="unx"
+ 
+ dummy:
+diff -Nur m154/vcl/unx/inc/plugins/gtk/atkbridge.hxx atkbridge/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+--- vcl/unx/inc/plugins/gtk/atkbridge.hxx	1970-01-01 01:00:00.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/atkbridge.hxx	2006-01-12 14:57:32.000000000 +0100
+@@ -0,0 +1,45 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -4052,78 +7303,70 @@
 + *
 + ************************************************************************/
 +
-+#ifndef __ATK_FACTORY_HXX__
-+#define __ATK_FACTORY_HXX__
-+
-+#include <atk/atk.h>
++#ifndef __ATK_BRIDGE_HXX__
++#define __ATK_BRIDGE_HXX__
 +
-+void RegisterAtkFactory( GType nWindowType );
++#ifndef _VCL_DLLAPI_H
++#include <dllapi.h>
++#endif
 +
-+extern "C" {
-+    
-+#define GAIL_WINDOW_WRAPPER_FACTORY_TYPE    (gail_window_wrapper_factory_get_type())
-+    
-+    GType gail_window_wrapper_factory_get_type (void);
-+    
-+}; // extern "C"
++void VCL_DLLPUBLIC InitAtkBridge(void);
 +
 +#endif
-Index: unx/inc/plugins/gtk/gtkframe.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx,v
-retrieving revision 1.17
-retrieving revision 1.14.22.5
-diff -u -p -r1.17 -r1.14.22.5
---- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx	9 Sep 2005 12:51:27 -0000	1.17
-+++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx	28 Sep 2005 07:24:18 -0000	1.14.22.5
-@@ -43,6 +43,9 @@
+diff -Nur m154/vcl/unx/inc/plugins/gtk/gtkframe.hxx atkbridge/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+--- vcl/unx/inc/plugins/gtk/gtkframe.hxx	2006-01-19 19:27:42.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx	2006-01-30 17:21:20.000000000 +0100
+@@ -43,6 +43,11 @@
  #include <gdk/gdkkeysyms.h>
  #include <postx.h>
  
-+#include <com/sun/star/uno/Reference.hxx>
-+#include <com/sun/star/accessibility/XAccessible.hdl>
++#ifdef EXPERIMENTAL_ATKBRIDGE
++#  include <com/sun/star/uno/Reference.hxx>
++#  include <com/sun/star/accessibility/XAccessible.hdl>
++#endif // EXPERIMENTAL_ATKBRIDGE
 +
  #ifndef _SV_SALFRAME_HXX
  #include <salframe.hxx>
  #endif
-@@ -351,6 +354,11 @@ public:
+@@ -355,7 +360,26 @@
      virtual bool                SetPluginParent( SystemParentData* pNewParent );
  
      virtual void                SetBackgroundBitmap( SalBitmap* );
 +
++#ifdef EXPERIMENTAL_ATKBRIDGE
 +	static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 +	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible( bool bCreate = true );
 +    
 +    static AtkRole              GetAtkRole( GtkWindow* window );
++#endif // EXPERIMENTAL_ATKBRIDGE
  };
  
  
-Index: util/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/util/makefile.mk,v
-retrieving revision 1.74
-retrieving revision 1.65.110.6
-diff -u -p -r1.74 -r1.65.110.6
---- openoffice.org.orig/vcl/util/makefile.mk	9 Sep 2005 13:53:03 -0000	1.74
-+++ openoffice.org/vcl/util/makefile.mk	21 Sep 2005 09:56:00 -0000	1.65.110.6
-@@ -352,6 +352,7 @@ PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
- 
- LIB4TARGET=$(SLB)$/igtk_plug_
- LIB4FILES=\
-+			$(SLB)$/gtka11y.lib\
++#ifdef EXPERIMENTAL_ATKBRIDGE
++
++#define OOO_TYPE_FIXED ooo_fixed_get_type()
++
++extern "C" {
++
++GType ooo_fixed_get_type( void );
++
++} // extern "C"
++
++#endif // EXPERIMENTAL_ATKBRIDGE
++
+ #endif //_VCL_GTKFRAME_HXX
+diff -Nur m154/vcl/util/makefile.mk atkbridge/vcl/util/makefile.mk
+--- vcl/util/makefile.mk	2005-12-19 18:21:56.000000000 +0100
++++ vcl/util/makefile.mk	2006-01-09 14:02:58.000000000 +0100
+@@ -359,6 +359,11 @@
  			$(SLB)$/gtkapp.lib\
  			$(SLB)$/gtkgdi.lib\
  			$(SLB)$/gtkwin.lib
---- SRC680_m130/desktop/scripts/soffice.gail.sh	2005-09-30 15:34:21.000000000 +0100
-+++ SRC680_m130/desktop/scripts/soffice.sh	2005-09-30 15:34:56.000000000 +0100
-@@ -36,6 +36,10 @@
- 
- if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
- export SAL_ENABLE_NATIVE_XFONTS=0
-+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then
-+export GTK_MODULES="gail:atk-bridge $GTK_MODULES"
-+fi
-+export SAL_IGNOREXERRORS=true
- #
- # STAR_PROFILE_LOCKING_DISABLED=1
- # export STAR_PROFILE_LOCKING_DISABLED
++
++.IF "$(EXPERIMENTAL_ATKBRIDGE)" != ""
++LIB4FILES+= $(SLB)$/gtka11y.lib
++.ENDIF
++
+ SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX)
+ SHL4IMPLIB=igtk_plug_
+ SHL4LIBS=$(LIB4TARGET)



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:00:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:00:46 -0500
Subject: rpms/devhelp/devel devhelp.spec,1.37,1.38
Message-ID: <200602201200.k1KC0kOm007558@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/devhelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7318

Modified Files:
	devhelp.spec 
Log Message:
 BuildRequires:       glib2-devel >= 2.9.5
 BuildRequires:       libwnck-devel >= 2.10.0
 BuildRequires:       GConf2-devel >= 2.6.0

 mock errors:
checking for LIBDEVHELP... configure: error: Package requirements (
    gthread-2.0 >= 2.6.0
    gtk+-2.0 >= 2.6.0
    libglade-2.0 >= 2.4.0
    libwnck-1.0 >= 2.10.0
    gconf-2.0 >= 2.6.0
) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively you may set the LIBDEVHELP_CFLAGS and LIBDEVHELP_LIBS environment variables
to avoid the need to call pkg-config.  See the pkg-config man page for
more details.
error: Bad exit status from /var/tmp/rpm-tmp.60160 (%build)




Index: devhelp.spec
===================================================================
RCS file: /cvs/dist/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- devhelp.spec	13 Feb 2006 04:38:21 -0000	1.37
+++ devhelp.spec	20 Feb 2006 12:00:43 -0000	1.38
@@ -3,7 +3,7 @@
 Summary:             API document browser
 Name:                devhelp
 Version:             0.11
-Release:             2
+Release:             3
 License:             GPL
 Group:               Development/Tools
 Url:                 http://ftp.gnome.org/pub/gnome/sources/devhelp/
@@ -24,6 +24,10 @@
 BuildRequires:       mozilla-devel = %mozver
 BuildRequires:       intltool
 BuildRequires:       gettext
+BuildRequires:       glib2-devel >= 2.9.5
+BuildRequires:       libwnck-devel >= 2.10.0
+BuildRequires:       GConf2-devel >= 2.6.0
+
 
 %description
 An API document browser for GNOME 2.



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:02:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:02:39 -0500
Subject: rpms/dasher/devel dasher.spec,1.31,1.32
Message-ID: <200602201202.k1KC2dTZ007836@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7732

Modified Files:
	dasher.spec 
Log Message:
BuildRequires: libXtst-devel

mock error:
checking for -lXtst in NONE... no
configure: error: Couldn't find the Xtst library. Check config.log for details
error: Bad exit status from /var/tmp/rpm-tmp.22795 (%build)




Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dasher.spec	12 Feb 2006 20:00:21 -0000	1.31
+++ dasher.spec	20 Feb 2006 12:02:37 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 3.99.4
-Release: 1
+Release: 2
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -15,6 +15,7 @@
 BuildRequires: expat-devel
 BuildRequires: scrollkeeper
 BuildRequires: libwnck-devel >= 2.9.92
+BuildRequires: libXtst-devel
 
 Requires: gnome-speech
 
@@ -80,6 +81,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 3.99.4-2
+- BuildRequires: libXtst-devel
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 3.99.4-1
 - Update to 3.99.4
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:05:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:05:38 -0500
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.21, 1.22
Message-ID: <200602201205.k1KC5chI008281@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8210

Modified Files:
	device-mapper-multipath.spec 
Log Message:
BuildRequires: libselinux-devel

mock error:
cc main.o ../libmultipath/libmultipath-glibc.a ../libcheckers/libcheckers-glibc.a -o multipath.static -static -ldevmapper -lsysfs -lselinux -lsepol
/usr/bin/ld: cannot find -lselinux
collect2: ld returned 1 exit status
make[1]: *** [glibc] Error 1



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- device-mapper-multipath.spec	11 Feb 2006 02:25:14 -0000	1.21
+++ device-mapper-multipath.spec	20 Feb 2006 12:05:35 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 12.0.1
+Release: 12.1
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -10,6 +10,7 @@
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: sysfsutils-devel, device-mapper >= 1.02.02-2
+BuildRequires: libselinux-devel
 
 %description
 %{name} provides tools to manage multipath devices by instructing the 
@@ -62,6 +63,9 @@
 /var/cache/multipath
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 0.4.5-12.1
+- BuildRequires: libselinux-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.4.5-12.0.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:08:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:08:33 -0500
Subject: rpms/dictd/devel dictd.spec,1.21,1.22
Message-ID: <200602201208.k1KC8Xkw008962@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/dictd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8935

Modified Files:
	dictd.spec 
Log Message:
BuildRequires: byacc


Index: dictd.spec
===================================================================
RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dictd.spec	11 Feb 2006 02:26:07 -0000	1.21
+++ dictd.spec	20 Feb 2006 12:08:22 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: DICT protocol (RFC 2229) command-line client
 Name: dictd
 Version: 1.9.15
-Release: 5.2
+Release: 6
 License: GPL
 Group: Applications/Internet
 Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@
 URL: http://www.dict.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: chkconfig
-BuildRequires: flex bison libtool libtool-libs libtool-ltdl-devel
+BuildRequires: flex bison libtool libtool-libs libtool-ltdl-devel byacc
 
 %description
 Command-line client for the DICT protocol.  The Dictionary Server
@@ -59,6 +59,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.9.15-6
+- BuildRequires: byacc
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.9.15-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:12:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:12:40 -0500
Subject: rpms/diskdumputils/devel diskdumputils.spec,1.18,1.19
Message-ID: <200602201212.k1KCCebB010629@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/diskdumputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10295

Modified Files:
	diskdumputils.spec 
Log Message:
BuildRequires: zlib-devel

mock error:
cc -g -O -Wall `pkg-config --cflags glib-2.0` -Wall -D_FILE_OFFSET_BITS=64   -c -o savecore.o savecore.c
savecore.c:38:18: error: zlib.h: No such file or directory
savecore.c:450: error: 'Z_OK' undeclared (first use in this function)
savecore.c:450: error: (Each undeclared identifier is reported only once
savecore.c:450: error: for each function it appears in.)
make: *** [savecore.o] Error 1



Index: diskdumputils.spec
===================================================================
RCS file: /cvs/dist/rpms/diskdumputils/devel/diskdumputils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- diskdumputils.spec	14 Feb 2006 21:02:24 -0000	1.18
+++ diskdumputils.spec	20 Feb 2006 12:12:37 -0000	1.19
@@ -1,12 +1,13 @@
 Summary: diskdump utilities
 Name: diskdumputils
 Version: 1.2.8
-Release: 3
+Release: 4
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/System
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel
+BuildRequires: zlib-devel
 Requires: glib2
 ExclusiveArch: i386 ia64 x86_64 ppc64
 
@@ -63,6 +64,9 @@
 /etc/diskdump/mail_template.us
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.2.8-4
+- BuildRequires: zlib-devel
+
 * Tue Feb 14 2006 Dave Anderson <anderson at redhat.com> - 1.2.8-3
 - Updated source package to diskdumputils-1.2.8.tar.gz.
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 12:17:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 07:17:22 -0500
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.17,1.18
Message-ID: <200602201217.k1KCHMFB025205@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22877

Modified Files:
	cryptsetup-luks.spec 
Log Message:
BuildRequires: libselinux-devel

mock error:
gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -o cryptsetup -static cryptsetup.o  -lpopt ../lib/.libs/libcryptsetup.a -ldevmapper -lselinux -lsepol -L/usr/lib64 -lgcrypt -lgpg-error -luuid
/usr/bin/ld: cannot find -lselinux
collect2: ld returned 1 exit status
make[2]: *** [cryptsetup] Error 1



Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cryptsetup-luks.spec	11 Feb 2006 02:20:27 -0000	1.17
+++ cryptsetup-luks.spec	20 Feb 2006 12:17:20 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.1
-Release: 4.2.1
+Release: 5
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libgcrypt-devel >= 1.1.42, popt, device-mapper
 BuildRequires: libgpg-error-devel, e2fsprogs-devel, libsepol-devel
+BuildRequires: libselinux-devel
 Provides: cryptsetup = %{version}-%{release}
 Obsoletes: cryptsetup <= 0.1
 
@@ -66,6 +67,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-5
+- BuildRequires: libselinux-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-4.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 13:54:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 08:54:03 -0500
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.46,1.47
Message-ID: <200602201354.k1KDs3ZU016984@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16951

Modified Files:
	e2fsprogs.spec 
Log Message:
BuildRequires: gettext-devel

mock error:
+ aclocal
aclocal:configure.in:530: warning: macro `AM_GNU_GETTEXT' not found in library
+ autoconf
configure.in:530: error: possibly undefined macro: AM_GNU_GETTEXT
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- e2fsprogs.spec	11 Feb 2006 02:28:30 -0000	1.46
+++ e2fsprogs.spec	20 Feb 2006 13:54:00 -0000	1.47
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 6.2
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -30,7 +30,8 @@
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
-BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel, libsepol-devel
+BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel
+BuildRequires: libsepol-devel, gettext-devel
 BuildRequires: device-mapper >= 1.02.02-3
 
 %define ext2resize_basever 1.1.17
@@ -296,6 +297,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.38-7
+- BuildRequires: gettext-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.38-6.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 14:36:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 09:36:57 -0500
Subject: rpms/grep/devel grep-2.5.1-w.patch,1.1,1.2 grep.spec,1.59,1.60
Message-ID: <200602201436.k1KEavhV017729@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/grep/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17678

Modified Files:
	grep-2.5.1-w.patch grep.spec 
Log Message:
* Mon Feb 20 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-53
- Applied Tim Robbins' patch for 'grep -w' (bug #179698).


grep-2.5.1-w.patch:
 search.c |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 108 insertions(+), 4 deletions(-)

Index: grep-2.5.1-w.patch
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep-2.5.1-w.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grep-2.5.1-w.patch	7 Jan 2005 17:03:06 -0000	1.1
+++ grep-2.5.1-w.patch	20 Feb 2006 14:36:53 -0000	1.2
@@ -1,32 +1,6 @@
---- grep-2.5.1a/src/search.c.w	2005-01-07 15:04:18.766280754 +0000
-+++ grep-2.5.1a/src/search.c	2005-01-07 16:59:19.287275172 +0000
-@@ -330,6 +330,7 @@
-   static int use_dfa;
-   static int use_dfa_checked = 0;
- #ifdef MBS_SUPPORT
-+  const char *last_char = NULL;
-   int mb_cur_max = MB_CUR_MAX;
-   mbstate_t mbs;
-   memset (&mbs, '\0', sizeof (mbstate_t));
-@@ -385,6 +386,8 @@
- 		  while (bytes_left)
- 		    {
- 		      size_t mlen = mbrlen (beg, bytes_left, &mbs);
-+
-+		      last_char = beg;
- 		      if (mlen == (size_t) -1 || mlen == 0)
- 			{
- 			  /* Incomplete character: treat as single-byte. */
-@@ -445,6 +448,8 @@
- 		  while (bytes_left)
- 		    {
- 		      size_t mlen = mbrlen (beg, bytes_left, &mbs);
-+
-+		      last_char = beg;
- 		      if (mlen == (size_t) -1 || mlen == 0)
- 			{
- 			  /* Incomplete character: treat as single-byte. */
-@@ -507,10 +512,84 @@
+--- grep-2.5.1a/src/search.c.w	2006-02-20 14:27:27.000000000 +0000
++++ grep-2.5.1a/src/search.c	2006-02-20 14:32:07.000000000 +0000
+@@ -507,10 +507,114 @@
  	      if (match_words)
  		while (start >= 0)
  		  {
@@ -44,11 +18,16 @@
 +			if (mb_cur_max > 1)
 +			  {
 +			    const char *s;
-+			    int mr;
++			    size_t mr;
 +			    wchar_t pwc;
 +
++			    /* Locate the start of the multibyte character
++			       before the match position (== beg + start). */
 +			    if (using_utf8)
 +			      {
++				/* UTF-8 is a special case: scan backwards
++				   until we find a 7-bit character or a
++				   lead byte. */
 +				s = beg + start - 1;
 +				while (s > buf
 +				       && (unsigned char) *s >= 0x80
@@ -56,15 +35,40 @@
 +				  --s;
 +			      }
 +			    else
-+			      s = last_char;
-+			    mr = mbtowc (&pwc, s, beg + start - s);
-+			    if (mr <= 0)
++			      {
++				/* Scan forwards to find the start of the
++				   last complete character before the
++				   match position.  */
++				size_t bytes_left = start - 1;
++				s = beg;
++				while (bytes_left > 0)
++				  {
++				    mr = mbrlen (s, bytes_left, &mbs);
++				    if (mr == (size_t) -1 || mr == 0)
++				      {
++					memset (&mbs, '\0', sizeof (mbs));
++					s++;
++					bytes_left--;
++					continue;
++				      }
++				    if (mr == (size_t) -2)
++				      {
++					memset (&mbs, '\0', sizeof (mbs));
++					break;
++				      }
++				    s += mr;
++				    bytes_left -= mr;
++				  }
++			      }
++			    mr = mbrtowc (&pwc, s, beg + start - s, &mbs);
++			    if (mr == (size_t) -2 || mr == (size_t) -1 ||
++				mr == 0)
 +			      {
 +				memset (&mbs, '\0', sizeof (mbstate_t));
 +				lword_match = 1;
 +			      }
 +			    else if (!(iswalnum (pwc) || pwc == L'_')
-+				     && mr == (int) (beg + start - s))
++				     && mr == beg + start - s)
 +			      lword_match = 1;
 +			  }
 +			else


Index: grep.spec
===================================================================
RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- grep.spec	11 Feb 2006 03:20:45 -0000	1.59
+++ grep.spec	20 Feb 2006 14:36:53 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
-Release: 52.2
+Release: 53
 License: GPL
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
@@ -94,6 +94,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Feb 20 2006 Tim Waugh <twaugh at redhat.com> 2.5.1-53
+- Applied Tim Robbins' patch for 'grep -w' (bug #179698).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.1-52.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 15:03:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:03:04 -0500
Subject: rpms/ekiga/devel ekiga.spec,1.10,1.11
Message-ID: <200602201503.k1KF34Kr007537@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ekiga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7512

Modified Files:
	ekiga.spec 
Log Message:
Buildrequires: gnome-doc-utils

mock error:
checking for GDU_MODULE_VERSION_CHECK... configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met:
No package 'gnome-doc-utils' found
...
error: Bad exit status from /var/tmp/rpm-tmp.7387 (%build)





Index: ekiga.spec
===================================================================
RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ekiga.spec	13 Feb 2006 15:35:56 -0000	1.10
+++ ekiga.spec	20 Feb 2006 15:03:02 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 1.99.1
-Release: 1
+Release: 2
 URL: http://www.ekiga.org/
 Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz
 License: GPL
@@ -29,6 +29,7 @@
 BuildRequires: alsa-lib-devel
 BuildRequires: gettext
 BuildRequires: evolution-data-server-devel
+BuildRequires: gnome-doc-utils >= 0.3.2
 Obsoletes: gnomemeeting
 
 %description
@@ -84,6 +85,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.99.1-2
+- Buildrequires: gnome-doc-utils
+
 * Mon Feb 13 2006 Daniel Veillard <veillard at redhat.com> - 1.99.1-1
 - new beta release issued
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 15:33:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:33:26 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo62138.extensions.patch, 1.1, 1.2
Message-ID: <200602201533.k1KFXQ51029739@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29704

Modified Files:
	openoffice.org-2.0.2.ooo62138.extensions.patch 
Log Message:
dammit

openoffice.org-2.0.2.ooo62138.extensions.patch:
 extensions/source/abpilot/abpresid.hrc                          |    0 
 extensions/source/abpilot/abspilot.cxx                          |    0 
 extensions/source/abpilot/abspilot.src                          |    0 
 extensions/source/abpilot/addresssettings.hxx                   |    0 
 extensions/source/abpilot/datasourcehandling.cxx                |    0 
 extensions/source/abpilot/datasourcehandling.hxx                |    0 
 extensions/source/abpilot/typeselectionpage.cxx                 |    0 
 extensions/source/abpilot/typeselectionpage.hxx                 |    0 
 openoffice.org/extensions/source/abpilot/abpresid.hrc           |    2 
 openoffice.org/extensions/source/abpilot/abspilot.cxx           |   15 
 openoffice.org/extensions/source/abpilot/abspilot.src           |   17 
 openoffice.org/extensions/source/abpilot/addresssettings.hxx    |    2 
 openoffice.org/extensions/source/abpilot/datasourcehandling.cxx |   12 
 openoffice.org/extensions/source/abpilot/datasourcehandling.hxx |    8 
 openoffice.org/extensions/source/abpilot/typeselectionpage.cxx  |  173 +++-------
 openoffice.org/extensions/source/abpilot/typeselectionpage.hxx  |   18 +
 16 files changed, 134 insertions(+), 113 deletions(-)

Index: openoffice.org-2.0.2.ooo62138.extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo62138.extensions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.ooo62138.extensions.patch	16 Feb 2006 14:33:08 -0000	1.1
+++ openoffice.org-2.0.2.ooo62138.extensions.patch	20 Feb 2006 15:33:24 -0000	1.2
@@ -249,7 +249,7 @@
 -		lcl_hideChoice( allTypes, m_aLDAP );
 -		lcl_hideChoice( allTypes, m_aOutlook );
 -		lcl_hideChoice( allTypes, m_aOE );
-+		bWithMozilla = false
++		bWithMozilla = false;
  #endif
 -
  #ifndef UNX



From fedora-cvs-commits at redhat.com  Mon Feb 20 15:42:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:42:45 -0500
Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.116,1.117
Message-ID: <200602201542.k1KFgjVK024436@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24423

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- cman-kernel.spec	30 Jan 2006 20:03:23 -0000	1.116
+++ cman-kernel.spec	20 Feb 2006 15:42:43 -0000	1.117
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.14-1.1656_FC4
+%define kernel_version 2.6.15-1.1831_FC4
 %define subversion 20050601.152643.FC4
  
 %ifnarch i686 x86_64
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.11.5
-Release: %{subversion}.21
+Release: %{subversion}.22
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Mon Feb 20 15:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:42:53 -0500
Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.98,1.99
Message-ID: <200602201542.k1KFgr3R024491@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24478

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnbd-kernel.spec	30 Jan 2006 20:00:31 -0000	1.98
+++ gnbd-kernel.spec	20 Feb 2006 15:42:51 -0000	1.99
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.14-1.1656_FC4
+%define kernel_version 2.6.15-1.1831_FC4
 %define subversion 20050420.133124.FC4
 
 %ifnarch i686 x86_64
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.11.2
-Release: %{subversion}.56
+Release: %{subversion}.57
 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 Feb 20 15:43:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:43:01 -0500
Subject: rpms/dlm-kernel/FC-4 dlm-kernel.spec,1.92,1.93
Message-ID: <200602201543.k1KFh1x6024546@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24533

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/FC-4/dlm-kernel.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- dlm-kernel.spec	30 Jan 2006 20:04:50 -0000	1.92
+++ dlm-kernel.spec	20 Feb 2006 15:42:59 -0000	1.93
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.14-1.1656_FC4
+%define kernel_version 2.6.15-1.1831_FC4
 %define subversion 20050601.152643.FC4
 
 %ifnarch i686 x86_64
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.11.5
-Release: %{subversion}.20
+Release: %{subversion}.21
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Mon Feb 20 15:43:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 10:43:09 -0500
Subject: rpms/GFS-kernel/FC-4 GFS-kernel.spec,1.113,1.114
Message-ID: <200602201543.k1KFh9aG024601@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24588

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/FC-4/GFS-kernel.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- GFS-kernel.spec	30 Jan 2006 19:58:35 -0000	1.113
+++ GFS-kernel.spec	20 Feb 2006 15:43:07 -0000	1.114
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.14-1.1656_FC4
+%define kernel_version 2.6.15-1.1831_FC4
 %define subversion 20050601.152643.FC4
 
 %ifnarch i686 x86_64
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.11.8
-Release: %{subversion}.23
+Release: %{subversion}.24
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Mon Feb 20 16:13:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 11:13:57 -0500
Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.9,
	1.10
Message-ID: <200602201613.k1KGDvdk017482@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gstreamer-plugins-base/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17425

Modified Files:
	gstreamer-plugins-base.spec 
Log Message:
- Obsolete gstreamer-plugins (Bug #182098)



Index: gstreamer-plugins-base.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gstreamer-plugins-base.spec	11 Feb 2006 03:11:24 -0000	1.9
+++ gstreamer-plugins-base.spec	20 Feb 2006 16:13:54 -0000	1.10
@@ -5,7 +5,7 @@
 
 Name: 		%{gstreamer}-plugins-base
 Version: 	0.10.3
-Release: 	1
+Release:  	2	
 Summary: 	GStreamer streaming media framework base plug-ins
 
 Group: 		Applications/Multimedia
@@ -29,6 +29,7 @@
 BuildRequires:  alsa-lib-devel
 BuildRequires:  pango-devel
 BuildRequires:  libXv-devel
+Obsoletes: gstreamer-plugins
 
 # documentation
 BuildRequires:  gtk-doc >= 1.3
@@ -124,6 +125,7 @@
 Summary: 	GStreamer Base Plugins Development files
 Group: 		Development/Libraries
 Requires: 	%{gstreamer}-plugins-base = %{version}
+Obsoletes: gstreamer-plugins-devel
 
 %description devel
 GStreamer Base Plugins library development and header files.
@@ -187,6 +189,9 @@
 %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 
 %changelog
+* Mon Feb 20 2006 John (J5) Palmieri <johnp at redhat.com> - 0.10.3-2
+- Obsolete gstreamer-plugins (Bug #182098)
+
 * Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 0.10.3-1
 - Update to 0.10.3
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 16:44:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 11:44:08 -0500
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.32,1.33
Message-ID: <200602201644.k1KGi81S008353@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8321

Modified Files:
	alsa-utils.spec 
Log Message:
removed autoreconf


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- alsa-utils.spec	11 Feb 2006 01:34:47 -0000	1.32
+++ alsa-utils.spec	20 Feb 2006 16:44:06 -0000	1.33
@@ -3,7 +3,7 @@
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
 Version: 	1.0.11
-Release: 	2.rc2.2
+Release: 	3.rc2
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -15,9 +15,7 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
-BuildRequires:	gettext-devel
 Conflicts:	udev < 062
-BuildRequires:	autoconf
 
 %description
 This package contains command line utilities for the Advanced Linux Sound
@@ -27,7 +25,7 @@
 %setup -q -n %{name}-%{version}%{?prever}
 
 %build
-autoreconf -f -i
+#autoreconf -f -i
 %configure CFLAGS="$RPM_OPT_FLAGS" --sbindir=/sbin 
 %{__make} %{?_smp_mflags}
 %{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
@@ -69,6 +67,9 @@
 /usr/share/locale/*
 
 %changelog
+* Mon Feb 20 2006 Martin Stransky <stransky at redhat.com> 1.0.11-3.rc2
+- removed autoreconf
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.11-2.rc2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 16:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 11:53:40 -0500
Subject: rpms/alsa-utils/devel alsa-utils.spec,1.33,1.34
Message-ID: <200602201653.k1KGreO0025179@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25149

Modified Files:
	alsa-utils.spec 
Log Message:
added gettext back


Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- alsa-utils.spec	20 Feb 2006 16:44:06 -0000	1.33
+++ alsa-utils.spec	20 Feb 2006 16:53:36 -0000	1.34
@@ -15,6 +15,7 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
+BuildRequires:	gettext-devel
 Conflicts:	udev < 062
 
 %description



From fedora-cvs-commits at redhat.com  Mon Feb 20 17:44:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 12:44:07 -0500
Subject: rpms/frysk/FC-4 cairo-1.0.2-embedded-bitmaps.patch, NONE,
	1.1 cairo-1.0.2-fix-build.patch, NONE,
	1.1 fontconfig-2.3.93.cvs20060131-move-user-cache.patch, NONE,
	1.1 frysk-Makefile-rules-noxmltest.patch, NONE,
	1.1 gtk+-2.8.11-double-free.patch, NONE,
	1.1 render-avoid-repeat.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 frysk.spec, 1.4, 1.5 pango-skip-cairo-check.patch, 1.1,
	1.2 sources, 1.2, 1.3 update.sh, 1.3, 1.4
Message-ID: <200602201744.k1KHi7AF013586@cvs.devel.redhat.com>

Author: cagney

Update of /cvs/dist/rpms/frysk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13562

Modified Files:
	.cvsignore frysk.spec pango-skip-cairo-check.patch sources 
	update.sh 
Added Files:
	cairo-1.0.2-embedded-bitmaps.patch cairo-1.0.2-fix-build.patch 
	fontconfig-2.3.93.cvs20060131-move-user-cache.patch 
	frysk-Makefile-rules-noxmltest.patch 
	gtk+-2.8.11-double-free.patch render-avoid-repeat.patch 
Log Message:
Sync with 0.0.1.2006.02.19.rh1-0.EL4.1.


cairo-1.0.2-embedded-bitmaps.patch:
 cairo-ft-font.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

--- NEW FILE cairo-1.0.2-embedded-bitmaps.patch ---
--- cairo-1.0.2/src/cairo-ft-font.c.orig	2005-12-20 10:56:08.000000000 +1000
+++ cairo-1.0.2/src/cairo-ft-font.c	2005-12-20 11:01:03.000000000 +1000
@@ -1328,7 +1328,9 @@
 static int
 _get_pattern_load_flags (FcPattern *pattern)
 {
-    FcBool antialias, vertical_layout, hinting, autohint;
+    FcBool antialias, vertical_layout, hinting, autohint, bitmap;
+    FcBool transform;
+    FcMatrix *font_matrix;
     int rgba;
 #ifdef FC_HINT_STYLE    
     int hintstyle;
@@ -1336,14 +1338,30 @@
     int load_flags = 0;
     int target_flags = 0;
 
+#ifndef FC_EMBEDDED_BITMAP
+#define FC_EMBEDDED_BITMAP "embeddedbitmap"
+#endif
+
+    if (FcPatternGetMatrix (pattern,
+			    FC_MATRIX, 0, &font_matrix) != FcResultMatch)
+	font_matrix = NULL;
+
+    transform = (font_matrix && (font_matrix->xx != 1 || font_matrix->xy != 0 ||
+				 font_matrix->yx != 0 || font_matrix->yy != 1));
+
+    /* Check whether to use embedded bitmap forcely */
+    if (FcPatternGetBool (pattern,
+			  FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch)
+	bitmap = FcFalse;
+
     /* disable antialiasing if requested */
     if (FcPatternGetBool (pattern,
 			  FC_ANTIALIAS, 0, &antialias) != FcResultMatch)
 	antialias = FcTrue;
 
-    if (antialias)
+    if ((!bitmap && antialias) || transform)
 	load_flags |= FT_LOAD_NO_BITMAP;
-    else
+    else if (!antialias)
 	load_flags |= FT_LOAD_MONOCHROME;
     
     /* disable hinting if requested */


cairo-1.0.2-fix-build.patch:
 pixman-remap.h |    2 --
 1 files changed, 2 deletions(-)

--- NEW FILE cairo-1.0.2-fix-build.patch ---
--- cairo-1.0.2/pixman/src/pixman-remap.h.orig	2006-01-17 10:52:03.000000000 +1000
+++ cairo-1.0.2/pixman/src/pixman-remap.h	2006-01-17 10:52:33.000000000 +1000
@@ -1,9 +1,7 @@
 #define pixman_add_trapezoids _cairo_pixman_add_trapezoids
-#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define composeFunctions _cairo_pixman_compose_functions
 #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
-#define INT_pixman_composite _cairo_pixman_composite
 #define pixman_composite _cairo_pixman_composite
 #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
 #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx


fontconfig-2.3.93.cvs20060131-move-user-cache.patch:
 fontconfig/fontconfig.h |    3 ++-
 src/fccache.c           |   18 +++++++++++++++++-
 src/fccfg.c             |    2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

--- NEW FILE fontconfig-2.3.93.cvs20060131-move-user-cache.patch ---
--- fontconfig-2.3.93.cvs20060131/src/fccache.c.move-user-cache	2006-02-03 15:15:29.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/src/fccache.c	2006-02-03 15:15:29.000000000 -0500
@@ -446,7 +446,23 @@
 	return FcFalse;
 
     if (!FcAtomicLock (atomic))
-	goto bail1;
+    {
+      FcChar8 *cache_dir;
+
+      cache_dir = FcStrDirname (cache_file);
+
+      /* quick last ditch effort to try to make the dir in the
+       * off chance it doesn't exist.  This doesn't support
+       * making more than one component of the path and is
+       * broken in the WIN32 case.
+       */
+      mkdir ((char *) cache_dir, 0777);
+      FcStrFree (cache_dir);
+
+      if (!FcAtomicLock (atomic))
+        goto bail1;
+    }
+
     fd = open ((char *) FcAtomicNewFile(atomic), O_RDWR | O_CREAT, 
 	       S_IRUSR | S_IWUSR);
     if (fd == -1)
--- fontconfig-2.3.93.cvs20060131/src/fccfg.c.move-user-cache	2006-02-03 15:15:29.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/src/fccfg.c	2006-02-03 15:15:29.000000000 -0500
@@ -79,7 +79,7 @@
 
     config->cache = 0;
     if (FcConfigHome())
-	if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_FILE)))
+	if (!FcConfigSetCache (config, (FcChar8 *) ("~/" FC_USER_CACHE_DIR "/" FC_USER_CACHE_FILE)))
 	    goto bail8;
 
 #ifdef _WIN32
--- fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h.move-user-cache	2006-01-27 09:36:11.000000000 -0500
+++ fontconfig-2.3.93.cvs20060131/fontconfig/fontconfig.h	2006-02-03 15:16:10.000000000 -0500
@@ -106,7 +106,8 @@
 
 #define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
 #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
-#define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
+#define FC_USER_CACHE_DIR	    ".rh-fontconfig"
+#define FC_USER_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
 
 /* Adjust outline rasterizer */
 #define FC_CHAR_WIDTH	    "charwidth"	/* Int */

frysk-Makefile-rules-noxmltest.patch:
 Makefile.rules |   22 ----------------------
 1 files changed, 22 deletions(-)

--- NEW FILE frysk-Makefile-rules-noxmltest.patch ---
Index: frysk-gui/common/Makefile.rules
===================================================================
RCS file: /cvs/frysk/frysk-common/Makefile.rules,v
retrieving revision 1.102
diff -u -r1.102 Makefile.rules
--- frysk-gui/common/Makefile.rules	10 Feb 2006 16:54:05 -0000	1.102
+++ frysk-gui/common/Makefile.rules	20 Feb 2006 03:46:44 -0000
@@ -521,25 +521,3 @@
 clean-local: clean-ecj-dir
 clean-ecj-dir:
 	rm -rf ecj
-
-# Run through the glade files and check to see that they don't contain
-# references to glade libraries
-
-all-local: glade.checked
-glade.checked: $(glade_DATA)
-	for f in $(glade_DATA) ; do \
-		test $$f = x && continue; \
-		echo checking $(srcdir)/$$f; \
-		if xmllint --noout --valid $(srcdir)/$$f; then \
-			if grep 'lib="gnome"' $(srcdir)/$$f; then \
-				echo Gnome library found in $(srcdir)/$$f;\
-				exit 1; \
-			fi; \
-		else \
-			echo Malformed glade xml file: $(srcdir)/$$f; \
-			exit 1; \
-		fi; \
-	done 
-	touch glade.checked
-
-CLEANFILES += glade.checked

gtk+-2.8.11-double-free.patch:
 gtkfilesystem.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gtk+-2.8.11-double-free.patch ---
--- gtk+-2.8.11/gtk/gtkfilesystem.c.double-free	2006-02-08 13:43:19.000000000 -0500
+++ gtk+-2.8.11/gtk/gtkfilesystem.c	2006-02-08 13:43:44.000000000 -0500
@@ -86,6 +86,8 @@
   new_info = g_memdup (info, sizeof (GtkFileInfo));
   if (new_info->display_name)
     new_info->display_name = g_strdup (new_info->display_name);
+  if (new_info->display_key)
+    new_info->display_key = g_strdup (new_info->display_key);
   if (new_info->mime_type)
     new_info->mime_type = g_strdup (new_info->mime_type);
 

render-avoid-repeat.patch:
 gdkwindow.c |  127 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 102 insertions(+), 25 deletions(-)

--- NEW FILE render-avoid-repeat.patch ---
--- gtk+-2.8.11/gdk/gdkwindow.c.render-avoid-repeat	2005-09-26 16:28:34.000000000 -0400
+++ gtk+-2.8.11/gdk/gdkwindow.c	2006-02-06 12:32:27.000000000 -0500
@@ -1725,43 +1725,86 @@
   RESTORE_GC (gc);
 }
 
+typedef struct {
+  cairo_t *cr; /* if non-null, it means use this cairo context */
+  GdkGC *gc;   /* if non-null, it means use this GC instead */
+} BackingRectMethod;
+
 static void
-gdk_window_set_bg_pattern (GdkWindow      *window,
-			   cairo_t        *cr,
-			   int             x_offset,
-			   int             y_offset)
+setup_backing_rect_method (BackingRectMethod *method, GdkWindow *window, GdkWindowPaint *paint, int x_offset_cairo, int y_offset_cairo)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
 
   if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG && private->parent)
     {
-      x_offset += private->x;
-      y_offset += private->y;
-      gdk_window_set_bg_pattern (GDK_WINDOW (private->parent), cr,
-				 x_offset, y_offset);
-    }
-  else if (private->bg_pixmap && 
-           private->bg_pixmap != GDK_PARENT_RELATIVE_BG && 
-           private->bg_pixmap != GDK_NO_BG)
-    {
+      GdkWindowPaint tmp_paint;
+
+      tmp_paint = *paint;
+      tmp_paint.x_offset += private->x;
+      tmp_paint.y_offset += private->y;
+
+      x_offset_cairo += private->x;
+      y_offset_cairo += private->y;
+
+      setup_backing_rect_method (method, GDK_WINDOW (private->parent), &tmp_paint, x_offset_cairo, y_offset_cairo);
+    }
+  else if (private->bg_pixmap &&
+	   private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
+	   private->bg_pixmap != GDK_NO_BG)
+    {
+/* This is a workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320.
+ * In it, using a pixmap as a repeating pattern in Cairo, and painting it to a
+ * pixmap destination surface, can be very slow (on the order of seconds for a
+ * whole-screen copy).  The workaround is to use pretty much the same code that
+ * we used in GTK+ 2.6 (pre-Cairo), which clears the double-buffer pixmap with
+ * a tiled GC XFillRectangle().
+ */
+
+/* Actually computing this flag is left as an exercise for the reader */
+#if defined (G_OS_UNIX)
+#  define GDK_CAIRO_REPEAT_IS_FAST 0
+#else
+#  define GDK_CAIRO_REPEAT_IS_FAST 1
+#endif
+
+#if GDK_CAIRO_REPEAT_IS_FAST
       cairo_surface_t *surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap);
       cairo_pattern_t *pattern = cairo_pattern_create_for_surface (surface);
       cairo_surface_destroy (surface);
 
-      if (x_offset != 0 || y_offset != 0)
+      if (x_offset_cairo != 0 || y_offset_cairo != 0)
 	{
 	  cairo_matrix_t matrix;
-	  cairo_matrix_init_translate (&matrix, x_offset, y_offset);
+	  cairo_matrix_init_translate (&matrix, x_offset_cairo, y_offset_cairo);
 	  cairo_pattern_set_matrix (pattern, &matrix);
 	}
 
       cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-      cairo_set_source (cr, pattern);
+
+      method->cr = cairo_create (paint->surface);
+      method->gc = NULL;
+
+      cairo_set_source (method->cr, pattern);
       cairo_pattern_destroy (pattern);
+#else
+      guint gc_mask;
+      GdkGCValues gc_values;
+
+      gc_values.fill = GDK_TILED;
+      gc_values.tile = private->bg_pixmap;
+      gc_values.ts_x_origin = -x_offset_cairo;
+      gc_values.ts_y_origin = -y_offset_cairo;
+
+      gc_mask = GDK_GC_FILL | GDK_GC_TILE | GDK_GC_TS_X_ORIGIN | GDK_GC_TS_Y_ORIGIN;
+
+      method->gc = gdk_gc_new_with_values (paint->pixmap, &gc_values, gc_mask);
+#endif
     }
   else
     {
-      gdk_cairo_set_source_color (cr, &private->bg_color);
+      method->cr = cairo_create (paint->surface);
+
+      gdk_cairo_set_source_color (method->cr, &private->bg_color);
     }
 }
 
@@ -1774,22 +1817,56 @@
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
   GdkWindowPaint *paint = private->paint_stack->data;
-  cairo_t *cr;
+  BackingRectMethod method;
+#if 0
+  GTimer *timer;
+  double elapsed;
+#endif
 
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  cr = cairo_create (paint->surface);
+#if 0
+  timer = g_timer_new ();
+#endif
+
+  method.cr = NULL;
+  method.gc = NULL;
+  setup_backing_rect_method (&method, window, paint, 0, 0);
+
+  if (method.cr)
+    {
+      g_assert (method.gc == NULL);
+
+      cairo_rectangle (method.cr, x, y, width, height);
+      cairo_clip (method.cr);
 
-  gdk_window_set_bg_pattern (window, cr, 0, 0);
+      gdk_cairo_region (method.cr, paint->region);
+      cairo_fill (method.cr);
 
-  cairo_rectangle (cr, x, y, width, height);
-  cairo_clip (cr);
+      cairo_destroy (method.cr);
+#if 0
+      elapsed = g_timer_elapsed (timer, NULL);
+      g_print ("Draw the background with Cairo: %fs\n", elapsed);
+#endif
+    }
+  else
+    {
+      g_assert (method.gc != NULL);
 
-  gdk_cairo_region (cr, paint->region);
-  cairo_fill (cr);
+      gdk_gc_set_clip_region (method.gc, paint->region);
+      gdk_draw_rectangle (window, method.gc, TRUE, x, y, width, height);
+      g_object_unref (method.gc);
+
+#if 0
+      elapsed = g_timer_elapsed (timer, NULL);
+      g_print ("Draw the background with GDK: %fs\n", elapsed);
+#endif
+    }
 
-  cairo_destroy (cr);
+#if 0
+  g_timer_destroy (timer);
+#endif
 }
 
 /**


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jan 2006 15:46:46 -0000	1.2
+++ .cvsignore	20 Feb 2006 17:44:05 -0000	1.3
@@ -1,16 +1,16 @@
 glib-2.9.5.tar.bz2
-glib-java-0.2.2.tar.gz
-fontconfig-2.3.93.cvs20060124.tar.gz
+glib-java-0.2.3.tar.gz
+fontconfig-2.3.93.cvs20060208.tar.gz
 cairo-1.0.2.tar.gz
 cairo-java-1.0.2.tar.gz
-pango-1.11.2.tar.bz2
+pango-1.11.4.tar.bz2
 update-scripts.tar.gz
 gtk+-2.8.11.tar.bz2
 atk-1.11.2.tar.bz2
-libgtk-java-2.8.2.tar.gz
+libgtk-java-2.8.3.tar.gz
 libglade-2.5.1.tar.bz2
-libglade-java-2.12.1.tar.gz
+libglade-java-2.12.2.tar.gz
 libvte-java-0.11.11.tar.gz
-frysk-0.0.1.2006.01.28.tar.bz2
 antlr-2.7.5.tar.gz
 jdom-1.0.tar.gz
+frysk-0.0.1.2006.02.19.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- frysk.spec	30 Jan 2006 15:46:46 -0000	1.4
+++ frysk.spec	20 Feb 2006 17:44:05 -0000	1.5
@@ -3,9 +3,9 @@
 # enable and then modify this:
 
 #define frysk_gcc_prefix /usr/bin/
-#define frysk_gcc_suffix 4
+%define frysk_gcc_suffix %{nil}
 
-%define gcc_prefix %{?frysk_gcc_prefix:%{frysk_gcc_prefix}}%{!?frysk_gcc_prefix:/usr/bin}
+%define gcc_prefix %{?frysk_gcc_prefix:%{frysk_gcc_prefix}}%{!?frysk_gcc_prefix:/usr/bin/}
 %define gcc_suffix %{?frysk_gcc_suffix:%{frysk_gcc_suffix}}%{!?frysk_gcc_suffix:4}
 
 # Sometimes just the libraries are wanted; sometimes not everything
@@ -39,8 +39,8 @@
 
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.01.28
-Release:	0.FC4.2
+Version:	0.0.1.2006.02.19.rh1
+Release:	0.FC4.1
 License:	GPL
 Group:		Development/System
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -48,6 +48,8 @@
 
 %define frysk %{name}-%{version}
 Source0:	%{name}-%{version}.tar.bz2
+# frysk local: Build system can end up with corrupt xmllint files.
+Patch99:	frysk-Makefile-rules-noxmltest.patch
 
 %define antlr_version 2.7.5
 %define antlr antlr-%{antlr_version}
@@ -61,6 +63,8 @@
 %define cairo_version 1.0.2
 %define cairo cairo-%{cairo_version}
 Source300:	%{cairo}.tar.gz
+Patch300: cairo-1.0.2-embedded-bitmaps.patch
+Patch301: cairo-1.0.2-fix-build.patch
 
 %define cairo_java_version 1.0.2
 %define cairo_java cairo-java-%{cairo_java_version}
@@ -68,17 +72,14 @@
 # frysk local: frysk-2022: allow overriding of datadir (containing .jars)
 Patch499:	cairo-java-pkg-dir.patch
 
-%define fontconfig_version 2.3.93.cvs20060124
+%define fontconfig_version 2.3.93.cvs20060208
 %define fontconfig fontconfig-%{fontconfig_version}
 Source500:	%{fontconfig}.tar.gz
 # see -install
 Source501:	40-blacklist-fonts.conf
 Source502:	50-no-hint-fonts.conf
 Patch501: fontconfig-2.3.93-defaultconfig.patch
-# fix globar dir handling (Mike Fabian)
-Patch502: fontconfig-2.3.93-globaldir.patch
-# normalize path in fc-cache (Mike Fabian)
-Patch504: fontconfig-2.3.93-normalize.patch
+Patch502: fontconfig-2.3.93.cvs20060131-move-user-cache.patch
 
 %define glib2_version 2.9.5
 %define glib2 glib-%{glib2_version}
@@ -86,7 +87,7 @@
 Source602:	glib2.sh
 Source603:	glib2.csh
 
-%define glib_java_version 0.2.2
+%define glib_java_version 0.2.3
 %define glib_java glib-java-%{glib_java_version}
 Source700:	%{glib_java}.tar.gz
 # frysk local: frysk-2144: replace hard-wired <<gcj>> with $GCJ
@@ -102,6 +103,12 @@
 # Backported from 2.10
 Patch801:	gtk+-2.8.6-inputmethod.patch
 Patch803:	gtk+-2.8.10-set-invisible-char-to-bullet.patch
+# Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=4320
+# fixed in 2.8.12
+Patch804: render-avoid-repeat.patch
+# Fix a double free in the file chooser
+# fixed in 2.8.12
+Patch805: gtk+-2.8.11-double-free.patch
 
 # frysk local: just assume glib and pango
 Patch890:	gtk+-skip-glib-check.patch
@@ -111,7 +118,7 @@
 # frysk local: frysk-2031: Try to make themes work
 Patch894:	gtk+-2.8.6-frysk-theme-fix.patch
 
-%define libgtk_java_version 2.8.2
+%define libgtk_java_version 2.8.3
 %define libgtk_java libgtk-java-%{libgtk_java_version}
 Source900:	%{libgtk_java}.tar.gz
 # frysk local: frysk-2022: allow overriding of datadir (containing .jars)
@@ -123,15 +130,13 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=121025
 Patch1101: libglade-2.0.1-nowarning.patch
 
-%define libglade_java_version 2.12.1
+%define libglade_java_version 2.12.2
 %define libglade_java libglade-java-%{libglade_java_version}
 Source1200:	%{libglade_java}.tar.gz
-# frysk local: frysk-2213: fix 64-bit miscompile.
-Patch1290:	libglade-java-20060125-fix-64bit-miscompilation.patch
 # frysk local: frysk-2022: allow overriding of datadir (containing .jars)
 Patch1299:	libglade-java-pkg-dir.patch
 
-%define pango_version 1.11.2
+%define pango_version 1.11.4
 %define pango pango-%{pango_version}
 Source1300:	%{pango}.tar.bz2
 Patch1301:	pango-slighthint.patch
@@ -161,6 +166,7 @@
 BuildRequires: transfig
 BuildRequires: gcc4 gcc4-java gcc4-c++
 BuildRequires: autoconf automake automake17
+BuildRequires: xmlto
 #---- glib2
 BuildRequires: /sbin/ldconfig
 #---- gtk2
@@ -193,7 +199,7 @@
 Requires: vte
 
 # Limit build to platforms that build: i386 ...
-ExclusiveArch: %{ix86} x86_64 ppc64
+ExclusiveArch: %{ix86}
 
 %description
 Frysk is an execution-analysis technology implemented using native Java and C++.
@@ -215,6 +221,7 @@
 # -D: disable default of first deleting unpack-directory
 
 %setup -n %{frysk} -q -T -b0
+%patch99 -p0 -b .noxmltest
 ./autogen.sh
 
 %setup -n %{glib2} -q -T -b600
@@ -230,12 +237,13 @@
 
 %setup -n %{fontconfig} -q -T -b500
 %patch501 -p1 -b .defaultconfig
-%patch502 -p1 -b .crosscheck
-%patch504 -p1 -b .normalize
+%patch502 -p1 -b .move-user-cache
 
 %setup -n %{atk} -q -T -b200
 
 %setup -n %{cairo} -q -T -b300
+%patch300 -p1 -b .embedded-bitmaps
+%patch301 -p1 -b .fix-build
 
 %setup -n %{cairo_java} -q -T -b400
 %patch499 -p1 -b .pkg-dir
@@ -246,7 +254,7 @@
 %setup -n %{pango} -q -T -b1300
 %patch1301 -p1 -b .slighthint
 %patch1305 -p1 -b .lib64
-%patch1390 -p2 -b .skip-cairo-check
+%patch1390 -p0 -b .skip-cairo-check
 autoconf
 automake-1.7
 
@@ -254,6 +262,8 @@
 %patch800 -p1 -b .lib64
 %patch801 -p1 -b .inputmethod
 %patch803 -p1 -b .set-invisible-char-to-bullet
+%patch804 -p1 -b .render-avoid-repeat
+%patch805 -p1 -b .double-free
 # %patch890 -p2 -b .skip-glib-check
 %patch891 -p0 -b .skip-pango-check
 %patch892 -p0 -b .libgdk-lm
@@ -276,7 +286,6 @@
 # autoconf
 
 %setup -n %{libglade_java} -q -T -b1200
-%patch1290 -p0 -b .fix-64bit-miscompilation
 %patch1299 -p1 -b .pkg-dir
 aclocal -I ../%{glib_java}/macros -I ../%{libgtk_java}/macros
 autoconf
@@ -574,9 +583,9 @@
 %define jgjava_cflags JGJAVA_CFLAGS = %{JGJAVA_CFLAGS}
 %define GLIB_JAVA_CFLAGS %{JGJAVA_CFLAGS}
 
-%define JGJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2-0.2.2.jar
+%define JGJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2.jar
 %define jgjar JGJAR = %{JGJAR}
-%define GLIB_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2-0.2.2.jar
+%define GLIB_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glib0.2.jar
 
 %define lib_glibjava %{glib_java_builddir}/libglibjava.la
 %define lib_glibjni %{glib_java_builddir}/libglibjni.la
@@ -604,8 +613,8 @@
 	INSTALL %{fontconfig}
 	install -m 0644 %{SOURCE501} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 	install -m 0644 %{SOURCE502} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-	rm $RPM_BUILD_ROOT%{__frysk_libdir}/*.la
-	rm $RPM_BUILD_ROOT%{_localstatedir}/cache/fontconfig/stamp
+	rm -f $RPM_BUILD_ROOT%{__frysk_libdir}/*.la
+	rm -f $RPM_BUILD_ROOT%{_localstatedir}/cache/fontconfig/stamp
 fi
 
 %define lib_fontconfig %{fontconfig_builddir}/src/libfontconfig.la
@@ -671,7 +680,7 @@
 BUILD %{cairo_java} %{?_smp_mflags} %{cairo_java_makeflags}
 INSTALL %{cairo_java}
 
-%define CAIROJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/cairo1.0-1.0.2.jar
+%define CAIROJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/cairo1.0.jar
 %define cairojar CAIROJAR = %{CAIROJAR}
 
 %define CAIRO_JAVA_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-java
@@ -762,9 +771,9 @@
 BUILD %{libgtk_java} %{?_smp_mflags} %{libgtk_java_makeflags}
 INSTALL %{libgtk_java}
 
-%define GTKJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8-2.8.2.jar
+%define GTKJAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8.jar
 %define gtkjar GTKJAR = %{GTKJAR}
-%define GTK2_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8-2.8.2.jar
+%define GTK2_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/gtk2.8.jar
 
 %define GTKJAVA_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/libgtk-java -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-java -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include
 %define gtkjava_cflags GTKJAVA_CFLAGS = %{GTKJAVA_CFLAGS}
@@ -786,6 +795,8 @@
 	--without-javadocs \
 	--disable-gtktest \
 	--without-gnome \
+	--without-xml-catalog \
+	--disable-gtk-doc \
 	%{__frysk_libs_configure}
 BUILD %{libglade2} %{?_smp_mflags} %{libglade2_makeflags}
 INSTALL %{libglade2}
@@ -899,7 +910,7 @@
 
 %define frysk_rpaths -Djava.library.path=%{__frysk_libdir}: -Wl,-rpath,%{__frysk_libdir}:
 
-%define frysk_makeflags "FRYSK_GTK_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GTK_CLASSPATH = %{GTK2_JAR}:%{GLIB_JAVA_JAR}" "FRYSK_GTK_JARS = %{GTK2_JAR} %{GLIB_JAVA_JAR}" "FRYSK_GTK_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lglibjava" "FRYSK_GUI_JARS = %{GTK2_JAR} %{GLADE_JAR} %{GLIB_JAVA_JAR} %{VTE_JAVA_JAR}" "FRYSK_GUI_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GUI_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lglade-2.0 -lgladejava -lvtejava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.!
0 -ldl -lglib-2.0 -lglibjava" "frysk_bindir_frysk_LDFLAGS = --main=frysk.bindir.frysk %{frysk_rpaths}" "frysk_bindir_fstack_LDFLAGS = --main=frysk.bindir.fstack %{frysk_rpaths}" "frysk_bindir_ftrace_LDFLAGS = --main=frysk.bindir.ftrace %{frysk_rpaths}"
+%define frysk_makeflags "FRYSK_GTK_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GTK_CLASSPATH = %{GTK2_JAR}:%{GLIB_JAVA_JAR}" "FRYSK_GTK_JARS = %{GTK2_JAR} %{GLIB_JAVA_JAR}" "FRYSK_GTK_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lglibjava" "FRYSK_GUI_JARS = %{GTK2_JAR} %{GLADE_JAR} %{GLIB_JAVA_JAR} %{CAIROJAR} %{VTE_JAVA_JAR}" "FRYSK_GUI_CFLAGS = %{GTK_CFLAGS} %{ATK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} %{GLIB_CFLAGS} %{GTK_CFLAGS} %{GLIB_JAVA_CFLAGS} %{GTKJAVA_CFLAGS}" "FRYSK_GUI_LIBS = -L$RPM_BUILD_ROOT/%{__frysk_libdir} -lgtkjava -lcairojava -lglade-2.0 -lgladejava -lvtejava -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 !
-lgmodule-2.0 -ldl -lglib-2.0 -lglibjava" "GEN_CORE_RPATH_FLAGS = %{frysk_rpaths}" "GEN_GUI_RPATH_FLAGS = %{frysk_rpaths}"
 
 export FRYSK_GTK_JARS="XXX: ignored"
 export FRYSK_GUI_JARS="XXX: ignored"
@@ -931,11 +942,11 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%{_mandir}/*/frysk-*
+%{_mandir}/*/*
 %{_includedir}/frysk/*
 %{_libdir}/frysk/*
 %{_datadir}/frysk/*
-%{_sysconfdir}/*
+%verify(not md5 size mtime) %{_sysconfdir}/*
 %if %{build_frysk}
 %{_libdir}/libEggTrayIcon.so
 %{_libdir}/libfrysk-*.so
@@ -944,10 +955,63 @@
 %{_datadir}/java/ftk.jar
 %{_datadir}/applications/frysk.desktop
 %{_datadir}/pixmaps/fryskTrayIcon48.png
+%{_libexecdir}/frysk/*
 %endif
 
 %changelog
-* Sat Jan 28 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.2
+* Sun Feb 19 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.19.rh1-0.EL4.1
+- Add --without-xml-catalog, and --disable-gtk-doc to libglade.
+- Add -verify(t md5 size mtime) to /etc/frysk/* files; from jml.
+- Add frysk-Makefile-rules-noxmltest.patch, remove's xml check; from
+  pmuldoon.
+
+* Sun Feb 19 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.19.rh1-0.EL4.0
+- Import frysk 0.0.1.2006.02.19.rh1 -- cvs snapshot from middle of day.
+- Leave frysk gui on desktop.
+
+* Fri Feb 17 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.16.rh1-0.EL4.1
+- Move frysk gui to libexec dir, remove from desktop.
+
+* Thu Feb 16 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.02.16.rh1-0.EL4.0
+- Added cairo-java jars to frysk buildpath.
+- Uploaded new frysk tarball.
+
+* Thu Feb 16 2006 Sami Wagiaalla <swagiaal at redhat.com> 0.0.1.2006.02.16-0.EL4.0
+- Uploaded new frysk tarball.
+
+* Mon Feb 13 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.EL4.1
+- Limit arches to just x86 - for errata.
+
+* Sun Feb 12 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.EL4.0
+- Import frysk 0.0.1.2006.02.12.
+
+* Thu Feb 9 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.09-0.EL4.0
+                 Adam Jocksch <ajocksch at redhat.com>
+- For frysk's make, replace per-program LDFLAGS with
+  GEN_CORE_RPATH_FLAGS, and GEN_GUI_RPATH_FLAGS.
+- Add %{_libexecdir}/frysk/*, and wild-carded man pages, to -files.
+- NOTE: frysk 0.0.1.2006.02.09 is not yet imported.
+
+* Thu Feb 9 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.01.28-0.EL4.4
+- Changed jar macros to use symlinked .jar files rather than ones hardcoded
+  with minor version number.
+
+* Wed Feb 8 2006 Adam Jocksch <ajocksch at redhat.com> 0.0.1.2006.01.28-0.EL4.4
+- Removed 64bit miscompilation patch since this is now upstream.
+- Fixed pango-skip-cairo-check.patch to match current configure.in.
+- Added embedded-pixmaps and fix-build for cairo.
+- Imported fontconfig_version 2.3.93.cvs20060208, removed patches 502, 504
+  and added move-user-cache patch.
+- Imported glib-java version 0.2.3.
+- Added render-avoid-repeat and double-free patches for gtk2.
+- Imported libgtk-java version 2.8.3.
+- Imported libglade-java version 2.12.2.
+- Imported pango version 1.11.4.
+
+* Thu Feb 2 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.3
+- Add xmlto to frysk's BuildRequires.
+
+* Mon Jan 30 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.28-0.EL4.2
 - Check for previous definitions of frysk_gcc_prefix, and
   frysk_gcc_suffix to allow overriding from ~/.rpmmacros.
 

pango-skip-cairo-check.patch:
 configure.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: pango-skip-cairo-check.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/pango-skip-cairo-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pango-skip-cairo-check.patch	24 Jan 2006 00:33:58 -0000	1.1
+++ pango-skip-cairo-check.patch	20 Feb 2006 17:44:05 -0000	1.2
@@ -1,12 +1,12 @@
---- frysk-0.0.0.20051211.1/pango-1.10.0/configure.in.skip-cairo-check	2005-12-11 14:15:50.000000000 -0500
-+++ frysk-0.0.0.20051211.1/pango-1.10.0/configure.in	2005-12-11 14:15:55.000000000 -0500
-@@ -286,7 +286,8 @@
-   if $have_cairo_win32 && $have_win32; then
+--- configure.in.old	2006-02-08 16:20:07.000000000 -0500
++++ configure.in	2006-02-08 16:20:38.000000000 -0500
+@@ -329,7 +329,8 @@
      AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo uses the Win32 GDI for fonts])
-   else			  
--    AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
-+    # AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
-+    have_cairo_freetype=true
-     if $have_cairo_freetype && $have_freetype ; then
-       AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo uses FreeType for fonts])
-     else
+     have_cairo=true
+   fi
+-  AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
++  #AC_CHECK_LIB(cairo, cairo_ft_scaled_font_lock_face, have_cairo_freetype=true, :)
++  have_cairo_freetype=true
+   if $have_cairo_freetype && $have_freetype ; then
+     AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo uses FreeType for fonts])
+     have_cairo=true


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jan 2006 15:46:46 -0000	1.2
+++ sources	20 Feb 2006 17:44:05 -0000	1.3
@@ -1,16 +1,19 @@
 d92467e6a644341d704a5d0e3af8c06f  glib-2.9.5.tar.bz2
 46052b2c2aed6698275c54b7bd51cb38  glib-java-0.2.2.tar.gz
-b365d99c503ed19dbe2019f3df90945d  fontconfig-2.3.93.cvs20060124.tar.gz
+dabe425330fe2474d5e28afc08835a57  glib-java-0.2.3.tar.gz
+b5580c9698cec1382955e9cebcf4a636  fontconfig-2.3.93.cvs20060208.tar.gz
 d0b7111a14f90ec3afa777ec40c44984  cairo-1.0.2.tar.gz
 cc2c90fec19cdcafd177463e85595120  cairo-java-1.0.2.tar.gz
-3e1a72b0324a03f8710b9cd13f98c81f  pango-1.11.2.tar.bz2
+eb605a207bcc44ad7554c56c073aa17b  pango-1.11.4.tar.bz2
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
 921ba85da341e52f0994f8fb569f1c61  gtk+-2.8.11.tar.bz2
 fd1f2349ece8a63257c7ffedfa6316af  atk-1.11.2.tar.bz2
 76e5048d11a71060a7cc08df8ef7018e  libgtk-java-2.8.2.tar.gz
+0bcf838a3220fdfa685c55c22d664874  libgtk-java-2.8.3.tar.gz
 e4734a59f1f2308d7714dc0ebf8163f1  libglade-2.5.1.tar.bz2
 44a223d1c6d66f15288360bbd2ed0c22  libglade-java-2.12.1.tar.gz
+a0b11f2b7ed7c9f998e860212ed3a400  libglade-java-2.12.2.tar.gz
 a81b9d7ca9a5dfbcbbb7524ca900cf69  libvte-java-0.11.11.tar.gz
-33147ede6bf8335e69471077442f6723  frysk-0.0.1.2006.01.28.tar.bz2
 1ef201f29283179c8e5ab618529cac78  antlr-2.7.5.tar.gz
 ce29ecc05d63fdb419737fd00c04c281  jdom-1.0.tar.gz
+b00e05b17b5d255411e726a8d23f20d1  frysk-0.0.1.2006.02.19.rh1.tar.bz2


Index: update.sh
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/update.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- update.sh	30 Jan 2006 15:46:46 -0000	1.3
+++ update.sh	20 Feb 2006 17:44:05 -0000	1.4
@@ -2,7 +2,7 @@
 
 # Update <<upstream>>
 
-( cd ../RHEL-4 && cvs update )
+( cd ../RHEL-4 && cvs update && make sources )
 
 # Make a list of files that need to be pulled over
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 17:50:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 12:50:43 -0500
Subject: rpms/frysk/devel .cvsignore, 1.9, 1.10 frysk.spec, 1.27,
	1.28 sources, 1.9, 1.10
Message-ID: <200602201750.k1KHohNn026273@cvs.devel.redhat.com>

Author: cagney

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26250

Modified Files:
	.cvsignore frysk.spec sources 
Log Message:
* Mon Feb 20 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.19.rh1-0.FC5.0
- Import frysk 0.0.1.2006.02.19.rh1 -- snapshot from middle of that day.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2006 21:27:50 -0000	1.9
+++ .cvsignore	20 Feb 2006 17:50:41 -0000	1.10
@@ -1 +1 @@
-frysk-0.0.1.2006.02.12.tar.bz2
+frysk-0.0.1.2006.02.19.rh1.tar.bz2


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- frysk.spec	19 Feb 2006 01:54:27 -0000	1.27
+++ frysk.spec	20 Feb 2006 17:50:41 -0000	1.28
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
-Version:	0.0.1.2006.02.12
-Release:	0.FC5.1
+Version:	0.0.1.2006.02.19.rh1
+Release:	0.FC5.0
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -86,6 +86,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Mon Feb 20 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.19.rh1-0.FC5.0
+- Import frysk 0.0.1.2006.02.19.rh1 -- snapshot from middle of that day.
+
 * Sat Feb 18 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.12-0.FC5.1
 - Remove eclipse-cdt >= 3.0.0 from BuildRequires.  From Wu Zhou
   woodzltc at ibm.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2006 21:27:50 -0000	1.9
+++ sources	20 Feb 2006 17:50:41 -0000	1.10
@@ -1 +1 @@
-c206058152c140ce99288e94c9ef4872  frysk-0.0.1.2006.02.12.tar.bz2
+b00e05b17b5d255411e726a8d23f20d1  frysk-0.0.1.2006.02.19.rh1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 20 17:51:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 12:51:23 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.2,1.3
Message-ID: <200602201751.k1KHpNbw026334@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26318

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Added plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml to ppc64 patch.

eclipse-ppc64.patch:
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++++++++++
 7 files changed, 122 insertions(+), 5 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-ppc64.patch	17 Feb 2006 22:31:27 -0000	1.2
+++ eclipse-ppc64.patch	20 Feb 2006 17:51:21 -0000	1.3
@@ -91,3 +91,112 @@
  	 * IA64-based architecture.
  	 */
 
+diff -uNr /dev/null plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml
+--- /dev/null	2004-06-24 14:04:38.000000000 -0400
++++ plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml	2006-02-20 12:48:54.000000000 -0500
+@@ -0,0 +1,105 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="org.eclipse.rcp.source.linux.gtk.ppc64" default="build.jars" basedir=".">
++
++	<property name="basews" value="${ws}"/>
++	<property name="baseos" value="${os}"/>
++	<property name="basearch" value="${arch}"/>
++	<property name="basenl" value="${nl}"/>
++
++	<!-- Compiler settings. -->
++	<property name="javacFailOnError" value="false"/>
++	<property name="javacDebugInfo" value="on"/>
++	<property name="javacVerbose" value="true"/>
++	<property name="javacSource" value="1.3"/>
++	<property name="javacTarget" value="1.2"/>
++	<property name="compilerArg" value=""/>
++	<path id="path_bootclasspath">
++		<fileset dir="${java.home}/lib">
++			<include name="*.jar"/>
++		</fileset>
++	</path>
++	<property name="bootclasspath" refid="path_bootclasspath"/>
++
++	<target name="init" depends="properties">
++		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
++			<isset property="buildTempFolder"/>
++		</condition>
++		<property name="pluginTemp" value="${basedir}"/>
++		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.rcp.source.linux.gtk.ppc64">
++			<isset property="buildTempFolder"/>
++		</condition>
++		<property name="build.result.folder" value="${basedir}"/>
++		<property name="temp.folder" value="${basedir}/temp.folder"/>
++		<property name="plugin.destination" value="${basedir}"/>
++	</target>
++
++	<target name="properties" if="eclipse.running">
++		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++
++	</target>
++
++	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.rcp.source.linux.gtk.ppc64 for an update site.">
++		<delete dir="${temp.folder}"/>
++		<mkdir dir="${temp.folder}"/>
++		<antcall target="build.jars"/>
++		<antcall target="gather.bin.parts">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<zip destfile="${plugin.destination}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2.jar" basedir="${temp.folder}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2" filesonly="false" whenempty="skip" update="false"/>
++		<delete dir="${temp.folder}"/>
++	</target>
++	<target name="build.jars">
++		<ant antfile="build.xml" dir="../org.eclipse.swt.gtk.linux.ppc64" target="build.sources"/>
++		<ant antfile="build.xml" dir="../org.eclipse.swt.gtk.linux.ppc64" target="gather.sources">
++			<property name="destination.temp.folder" value="${basedir}/src"/>
++		</ant>
++	</target>
++	<target name="build.sources">
++	</target>
++
++	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
++		<mkdir dir="${destination.temp.folder}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2"/>
++		<copy todir="${destination.temp.folder}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2" failonerror="true" overwrite="false">
++			<fileset dir="${basedir}" includes="about.html,fragment.xml,src/**,META-INF/"			/>
++		</copy>
++	</target>
++
++	<target name="build.zips" depends="init">
++	</target>
++
++	<target name="gather.sources" depends="init" if="destination.temp.folder">
++	</target>
++
++	<target name="gather.logs" depends="init" if="destination.temp.folder">
++	</target>
++
++	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.rcp.source.linux.gtk.ppc64 of all the zips, jars and logs created.">
++		<delete file="${plugin.destination}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2.jar"/>
++		<delete file="${plugin.destination}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2.zip"/>
++		<delete dir="${temp.folder}"/>
++	</target>
++
++	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
++		<eclipse.convertPath fileSystemPath="/builds/M/src/plugins/org.eclipse.rcp.source.linux.gtk.ppc64" property="resourcePath"/>
++		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
++	</target>
++
++	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.rcp.source.linux.gtk.ppc64.">
++		<delete dir="${temp.folder}"/>
++		<mkdir dir="${temp.folder}"/>
++		<antcall target="build.jars"/>
++		<antcall target="build.sources"/>
++		<antcall target="gather.bin.parts">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<antcall target="gather.sources">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<delete>
++			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
++		</delete>
++		<zip destfile="${plugin.destination}/org.eclipse.rcp.source.linux.gtk.ppc64_3.1.2.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++		<delete dir="${temp.folder}"/>
++	</target>
++
++</project>



From fedora-cvs-commits at redhat.com  Mon Feb 20 18:25:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 13:25:31 -0500
Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec,1.47,1.48
Message-ID: <200602201825.k1KIPVX4025500@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv25399

Modified Files:
	gstreamer-plugins.spec 
Log Message:
- Added libgstdvdsubdec.so, libgstfreeze.so, libgstimagemixer.so, 
  libgstvideo4linuxradio.so




Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gstreamer-plugins.spec	15 Feb 2006 17:00:48 -0000	1.47
+++ gstreamer-plugins.spec	20 Feb 2006 18:25:28 -0000	1.48
@@ -302,6 +302,10 @@
 %{_libdir}/gstreamer-%{majmin}/libgstpuzzle.*
 %{_libdir}/gstreamer-%{majmin}/libgstrfbsrc.*
 %{_libdir}/gstreamer-%{majmin}/libgstsubparse.*
+%{_libdir}/gstreamer-%{majmin}/libgstdvdsubdec.*
+%{_libdir}/gstreamer-%{majmin}/libgstfreeze.*
+%{_libdir}/gstreamer-%{majmin}/libgstimagemixer.*
+%{_libdir}/gstreamer-%{majmin}/libgstvideo4linuxradio.*
 %{_mandir}/man*/*
 
 %files devel
@@ -316,7 +320,9 @@
 - Removed unknown_file_type patch
 - Removed gnome-vfs patch
 - Removed execshield patch
-
+- Added libgstdvdsubdec.so, libgstfreeze.so, libgstimagemixer.so, 
+  libgstvideo4linuxradio.so
+ 
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and
   add arjan's patch for fixing the execshield bug



From fedora-cvs-commits at redhat.com  Mon Feb 20 18:48:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 13:48:39 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.3,1.4
Message-ID: <200602201848.k1KImdIq013426@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13395

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Adding the plugins/org.eclipse.swt.gtk.linux.ppc64 directory to the ppc64 patch

eclipse-ppc64.patch:
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  301 +++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 15 files changed, 1557 insertions(+), 5 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-ppc64.patch	20 Feb 2006 17:51:21 -0000	1.3
+++ eclipse-ppc64.patch	20 Feb 2006 18:48:36 -0000	1.4
@@ -200,3 +200,1471 @@
 +	</target>
 +
 +</project>
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/.projec tplugins/org.eclipse.swt.gtk.linux.ppc64/.project
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/.project	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/.project	2006-02-20 13:39:08.000000000 -0500
+@@ -0,0 +1,22 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<projectDescription>
++	<name>org.eclipse.swt.gtk.linux.ppc64</name>
++	<comment></comment>
++	<projects>
++	</projects>
++	<buildSpec>
++		<buildCommand>
++			<name>org.eclipse.pde.ManifestBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++		<buildCommand>
++			<name>org.eclipse.pde.SchemaBuilder</name>
++			<arguments>
++			</arguments>
++		</buildCommand>
++	</buildSpec>
++	<natures>
++		<nature>org.eclipse.pde.PluginNature</nature>
++	</natures>
++</projectDescription>
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF	2006-02-20 13:39:19.000000000 -0500
+@@ -0,0 +1,17 @@
++Manifest-Version: 1.0
++Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
++Bundle-Name: %fragmentName
++Bundle-Vendor: %providerName
++Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64; singleton:=true
++Bundle-Version: 3.1.1
++Bundle-ManifestVersion: 2
++Bundle-Localization: fragment
++Export-Package: 
++ org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
++ org.eclipse.swt.internal.cairo; x-internal:=true,
++ org.eclipse.swt.internal.cde; x-internal:=true,
++ org.eclipse.swt.internal.gnome; x-internal:=true,
++ org.eclipse.swt.internal.gtk; x-internal:=true,
++ org.eclipse.swt.internal.mozilla; x-internal:=true
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64))
++
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/about.html plugins/org.eclipse.swt.gtk.linux.ppc64/about.html
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/about.html		1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/about.html		2006-02-20 13:37:23.000000000 -0500
+@@ -0,0 +1,96 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
++<html>
++<head>
++<title>About</title>
++</head>
++<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
++<body lang="EN-US">
++<h2>About This Content</h2>
++
++<p>June 21, 2005</p>	
++<h3>License</h3>
++
++<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Except for the files listed below, all Content shall be defined as the "SWT" and are provided to you
++under the terms and conditions of the Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at
++<a href="http://www.eclipse.org/legal/epl-v10.html" target="_blank">http://www.eclipse.org/legal/epl-v10.html</a>.  For purposes of the EPL, &quot;Program&quot; shall mean the SWT.</p>
++
++<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
++apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
++indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
++
++<h3>Third Party Content</h3>
++
++<h4>Gnome Binding</h4>
++
++<p>The &quot;Gnome Binding&quot; is a binding to the Gnome API.  The Content may include any or all of the following files:</p>
++
++<p>The following files in the plug-in JAR shall be defined as the native code portion of the Gnome Binding:</p>
++<ul>
++	<li>libswt-gnome-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
++</ul>
++
++<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Gnome Binding:</p>
++<ul>
++	<li>The contents of the directory org/eclipse/swt/internal/gnome (but not including any sub-directories)</li>
++</ul>
++
++<p>The Gnome Binding contains portions of Gnome (&quot;Library&quot;).  Gnome is made available by The Free Software Foundation.  Use of the Library is governed by the terms and
++conditions of the GNU Lesser General Public License Version 2.1 (&quot;LGPL&quot;).  Use of the Gnome Binding on a standalone
++basis, is also governed by the terms and conditions of the LGPL.  A copy of the LGPL is provided with the Content (<a href="about_files/lgpl-v21.txt" target="_blank">about_files/lgpl-v21.txt</a>) and is also available at
++<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>.</p>
++
++<p>In accordance with Section 6 of the LGPL, you may combine or link a "work that uses the Library" (e.g. the SWT) with the Library to produce a work
++containing portions of the Library (e.g. the Gnome Binding) and distribute that work under the terms of your choice (e.g. the EPL) provided you comply with all
++other terms and conditions of Section 6 as well as other Sections of the LGPL.  Please note, if you modify the Gnome Binding such modifications shall be
++governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
++work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
++
++<h4>GTK+ Binding</h4>
++
++<p>The &quot;GTK+ Binding&quot; is a binding to the GTK+ API.  The Content may include any or all of the following files:</p>
++
++<p>The following files in the plug-in JAR shall be defined as the native code portion of the GTK+ Binding:</p>
++<ul>
++	<li>libswt-atk-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
++	<li>libswt-pi-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
++</ul>
++
++<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the GTK+ Binding:</p>
++<ul>
++	<li>The contents of the directory org/eclipse/swt/internal/accessibility/gtk (but not including any sub-directories)</li>
++	<li>The contents of the directory org/eclipse/swt/internal/cde (but not including any sub-directories)</li>
++	<li>The contents of the directory org/eclipse/swt/internal/gtk (but not including any sub-directories)</li>
++	<li>The contents of the directory org/eclipse/swt/internal/kde (but not including any sub-directories)</li>				
++</ul>
++
++<p>The GTK+ Binding contains portions of GTK+ (&quot;Library&quot;).  GTK+ is made available by The Free Software Foundation.  Use of the Library is governed by the terms and
++conditions of the GNU Lesser General Public License Version 2.1 (&quot;LGPL&quot;).  Use of the GTK+ Binding on a standalone
++basis, is also governed by the terms and conditions of the LGPL.  A copy of the LGPL is provided with the Content (<a href="about_files/lgpl-v21.txt" target="_blank">about_files/lgpl-v21.txt</a>) and is also available at
++<a href="http://www.gnu.org/licenses/lgpl.html" target="_blank">http://www.gnu.org/licenses/lgpl.html</a>.</p>
++
++<p>In accordance with Section 6 of the LGPL, you may combine or link a "work that uses the Library" (e.g. the SWT) with the Library to produce a work
++containing portions of the Library (e.g. the GTK+ Binding) and distribute that work under the terms of your choice (e.g. the EPL) provided you comply with all
++other terms and conditions of Section 6 as well as other Sections of the LGPL.  Please note, if you modify the GTK+ Binding such modifications shall be
++governed by the terms and conditions of the LGPL.  Also note, the terms of the EPL permit you to modify the combined work and the source code of the combined
++work is provided for debugging purposes so there is no need to reverse engineer the combined work.</p>
++
++<h4>Mozilla Binding</h4>
++
++<p>The &quot;Mozilla Binding&quot; is a binding to the Mozilla API.  The Content may include any or all of the following files:</p>
++
++<p>The following files in the plug-in JAR shall be defined as the native code portion of the Mozilla Binding:</p>
++<ul>
++	<li>libswt-mozilla-gtk-xxxx.so (where &quot;xxxx&quot; is the version number)</li>
++</ul>
++
++<p>The following files in both the plug-in JAR and the src.zip shall be defined respectively as the bytecode and source code portions of the Mozilla Binding:</p>
++<ul>
++	<li>The contents of the directory org/eclipse/swt/internal/mozilla (but not including any sub-directories)</li>
++</ul>
++
++<p>The Mozilla Binding contains portions of Mozilla (&quot;Mozilla&quot;).  Mozilla is made available by Mozilla.org.  Use of Mozilla is governed by the terms and
++conditions of the Mozilla Public License Version 1.1 (&quot;MPL&quot;).  A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">about_files/mpl-v11.txt</a>) and is also available at
++<a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p>
++
++</body>
++</html>
+\ No newline at end of file
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt 	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt	2006-02-20 13:37:23.000000000 -0500
+@@ -0,0 +1,506 @@
++		  GNU LESSER GENERAL PUBLIC LICENSE
++		       Version 2.1, February 1999
++
++ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
++     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++[This is the first released version of the Lesser GPL.  It also counts
++ as the successor of the GNU Library Public License, version 2, hence
++ the version number 2.1.]
++
++			    Preamble
++
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++Licenses are intended to guarantee your freedom to share and change
++free software--to make sure the software is free for all its users.
++
++  This license, the Lesser General Public License, applies to some
++specially designated software packages--typically libraries--of the
++Free Software Foundation and other authors who decide to use it.  You
++can use it too, but we suggest you first think carefully about whether
++this license or the ordinary General Public License is the better
++strategy to use in any particular case, based on the explanations below.
++
++  When we speak of free software, we are referring to freedom of use,
++not price.  Our General Public Licenses are designed to make sure that
++you have the freedom to distribute copies of free software (and charge
++for this service if you wish); that you receive source code or can get
++it if you want it; that you can change the software and use pieces of
++it in new free programs; and that you are informed that you can do
++these things.
++
++  To protect your rights, we need to make restrictions that forbid
++distributors to deny you these rights or to ask you to surrender these
++rights.  These restrictions translate to certain responsibilities for
++you if you distribute copies of the library or if you modify it.
++
++  For example, if you distribute copies of the library, whether gratis
++or for a fee, you must give the recipients all the rights that we gave
++you.  You must make sure that they, too, receive or can get the source
++code.  If you link other code with the library, you must provide
++complete object files to the recipients, so that they can relink them
++with the library after making changes to the library and recompiling
++it.  And you must show them these terms so they know their rights.
++
++  We protect your rights with a two-step method: (1) we copyright the
++library, and (2) we offer you this license, which gives you legal
++permission to copy, distribute and/or modify the library.
++
++  To protect each distributor, we want to make it very clear that
++there is no warranty for the free library.  Also, if the library is
++modified by someone else and passed on, the recipients should know
++that what they have is not the original version, so that the original
++author's reputation will not be affected by problems that might be
++introduced by others.
++
++  Finally, software patents pose a constant threat to the existence of
++any free program.  We wish to make sure that a company cannot
++effectively restrict the users of a free program by obtaining a
++restrictive license from a patent holder.  Therefore, we insist that
++any patent license obtained for a version of the library must be
++consistent with the full freedom of use specified in this license.
++
++  Most GNU software, including some libraries, is covered by the
++ordinary GNU General Public License.  This license, the GNU Lesser
++General Public License, applies to certain designated libraries, and
++is quite different from the ordinary General Public License.  We use
++this license for certain libraries in order to permit linking those
++libraries into non-free programs.
++
++  When a program is linked with a library, whether statically or using
++a shared library, the combination of the two is legally speaking a
++combined work, a derivative of the original library.  The ordinary
++General Public License therefore permits such linking only if the
++entire combination fits its criteria of freedom.  The Lesser General
++Public License permits more lax criteria for linking other code with
++the library.
++
++  We call this license the "Lesser" General Public License because it
++does Less to protect the user's freedom than the ordinary General
++Public License.  It also provides other free software developers Less
++of an advantage over competing non-free programs.  These disadvantages
++are the reason we use the ordinary General Public License for many
++libraries.  However, the Lesser license provides advantages in certain
++special circumstances.
++
++  For example, on rare occasions, there may be a special need to
++encourage the widest possible use of a certain library, so that it becomes
++a de-facto standard.  To achieve this, non-free programs must be
++allowed to use the library.  A more frequent case is that a free
++library does the same job as widely used non-free libraries.  In this
++case, there is little to gain by limiting the free library to free
++software only, so we use the Lesser General Public License.
++
++  In other cases, permission to use a particular library in non-free
++programs enables a greater number of people to use a large body of
++free software.  For example, permission to use the GNU C Library in
++non-free programs enables many more people to use the whole GNU
++operating system, as well as its variant, the GNU/Linux operating
++system.
++
++  Although the Lesser General Public License is Less protective of the
++users' freedom, it does ensure that the user of a program that is
++linked with the Library has the freedom and the wherewithal to run
++that program using a modified version of the Library.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.  Pay close attention to the difference between a
++"work based on the library" and a "work that uses the library".  The
++former contains code derived from the library, whereas the latter must
++be combined with the library in order to run.
++
++		  GNU LESSER GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++  0. This License Agreement applies to any software library or other
++program which contains a notice placed by the copyright holder or
++other authorized party saying it may be distributed under the terms of
++this Lesser General Public License (also called "this License").
++Each licensee is addressed as "you".
++
++  A "library" means a collection of software functions and/or data
++prepared so as to be conveniently linked with application programs
++(which use some of those functions and data) to form executables.
++
++  The "Library", below, refers to any such software library or work
++which has been distributed under these terms.  A "work based on the
++Library" means either the Library or any derivative work under
++copyright law: that is to say, a work containing the Library or a
++portion of it, either verbatim or with modifications and/or translated
++straightforwardly into another language.  (Hereinafter, translation is
++included without limitation in the term "modification".)
++
++  "Source code" for a work means the preferred form of the work for
++making modifications to it.  For a library, complete source code means
++all the source code for all modules it contains, plus any associated
++interface definition files, plus the scripts used to control compilation
++and installation of the library.
++
++  Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running a program using the Library is not restricted, and output from
++such a program is covered only if its contents constitute a work based
++on the Library (independent of the use of the Library in a tool for
++writing it).  Whether that is true depends on what the Library does
++and what the program that uses the Library does.
++  
++  1. You may copy and distribute verbatim copies of the Library's
++complete source code as you receive it, in any medium, provided that
++you conspicuously and appropriately publish on each copy an
++appropriate copyright notice and disclaimer of warranty; keep intact
++all the notices that refer to this License and to the absence of any
++warranty; and distribute a copy of this License along with the
++Library.
++
++  You may charge a fee for the physical act of transferring a copy,
++and you may at your option offer warranty protection in exchange for a
++fee.
++
++  2. You may modify your copy or copies of the Library or any portion
++of it, thus forming a work based on the Library, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++    a) The modified work must itself be a software library.
++
++    b) You must cause the files modified to carry prominent notices
++    stating that you changed the files and the date of any change.
++
++    c) You must cause the whole of the work to be licensed at no
++    charge to all third parties under the terms of this License.
++
++    d) If a facility in the modified Library refers to a function or a
++    table of data to be supplied by an application program that uses
++    the facility, other than as an argument passed when the facility
++    is invoked, then you must make a good faith effort to ensure that,
++    in the event an application does not supply such function or
++    table, the facility still operates, and performs whatever part of
++    its purpose remains meaningful.
++
++    (For example, a function in a library to compute square roots has
++    a purpose that is entirely well-defined independent of the
++    application.  Therefore, Subsection 2d requires that any
++    application-supplied function or table used by this function must
++    be optional: if the application does not supply it, the square
++    root function must still compute square roots.)
++
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Library,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Library, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote
++it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Library.
++
++In addition, mere aggregation of another work not based on the Library
++with the Library (or with a work based on the Library) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++  3. You may opt to apply the terms of the ordinary GNU General Public
++License instead of this License to a given copy of the Library.  To do
++this, you must alter all the notices that refer to this License, so
++that they refer to the ordinary GNU General Public License, version 2,
++instead of to this License.  (If a newer version than version 2 of the
++ordinary GNU General Public License has appeared, then you can specify
++that version instead if you wish.)  Do not make any other change in
++these notices.
++
++  Once this change is made in a given copy, it is irreversible for
++that copy, so the ordinary GNU General Public License applies to all
++subsequent copies and derivative works made from that copy.
++
++  This option is useful when you wish to copy part of the code of
++the Library into a program that is not a library.
++
++  4. You may copy and distribute the Library (or a portion or
++derivative of it, under Section 2) in object code or executable form
++under the terms of Sections 1 and 2 above provided that you accompany
++it with the complete corresponding machine-readable source code, which
++must be distributed under the terms of Sections 1 and 2 above on a
++medium customarily used for software interchange.
++
++  If distribution of object code is made by offering access to copy
++from a designated place, then offering equivalent access to copy the
++source code from the same place satisfies the requirement to
++distribute the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++  5. A program that contains no derivative of any portion of the
++Library, but is designed to work with the Library by being compiled or
++linked with it, is called a "work that uses the Library".  Such a
++work, in isolation, is not a derivative work of the Library, and
++therefore falls outside the scope of this License.
++
++  However, linking a "work that uses the Library" with the Library
++creates an executable that is a derivative of the Library (because it
++contains portions of the Library), rather than a "work that uses the
++library".  The executable is therefore covered by this License.
++Section 6 states terms for distribution of such executables.
++
++  When a "work that uses the Library" uses material from a header file
++that is part of the Library, the object code for the work may be a
++derivative work of the Library even though the source code is not.
++Whether this is true is especially significant if the work can be
++linked without the Library, or if the work is itself a library.  The
++threshold for this to be true is not precisely defined by law.
++
++  If such an object file uses only numerical parameters, data
++structure layouts and accessors, and small macros and small inline
++functions (ten lines or less in length), then the use of the object
++file is unrestricted, regardless of whether it is legally a derivative
++work.  (Executables containing this object code plus portions of the
++Library will still fall under Section 6.)
++
++  Otherwise, if the work is a derivative of the Library, you may
++distribute the object code for the work under the terms of Section 6.
++Any executables containing that work also fall under Section 6,
++whether or not they are linked directly with the Library itself.
++
++  6. As an exception to the Sections above, you may also combine or
++link a "work that uses the Library" with the Library to produce a
++work containing portions of the Library, and distribute that work
++under terms of your choice, provided that the terms permit
++modification of the work for the customer's own use and reverse
++engineering for debugging such modifications.
++
++  You must give prominent notice with each copy of the work that the
++Library is used in it and that the Library and its use are covered by
++this License.  You must supply a copy of this License.  If the work
++during execution displays copyright notices, you must include the
++copyright notice for the Library among them, as well as a reference
++directing the user to the copy of this License.  Also, you must do one
++of these things:
++
++    a) Accompany the work with the complete corresponding
++    machine-readable source code for the Library including whatever
++    changes were used in the work (which must be distributed under
++    Sections 1 and 2 above); and, if the work is an executable linked
++    with the Library, with the complete machine-readable "work that
++    uses the Library", as object code and/or source code, so that the
++    user can modify the Library and then relink to produce a modified
++    executable containing the modified Library.  (It is understood
++    that the user who changes the contents of definitions files in the
++    Library will not necessarily be able to recompile the application
++    to use the modified definitions.)
++
++    b) Use a suitable shared library mechanism for linking with the
++    Library.  A suitable mechanism is one that (1) uses at run time a
++    copy of the library already present on the user's computer system,
++    rather than copying library functions into the executable, and (2)
++    will operate properly with a modified version of the library, if
++    the user installs one, as long as the modified version is
++    interface-compatible with the version that the work was made with.
++
++    c) Accompany the work with a written offer, valid for at
++    least three years, to give the same user the materials
++    specified in Subsection 6a, above, for a charge no more
++    than the cost of performing this distribution.
++
++    d) If distribution of the work is made by offering access to copy
++    from a designated place, offer equivalent access to copy the above
++    specified materials from the same place.
++
++    e) Verify that the user has already received a copy of these
++    materials or that you have already sent this user a copy.
++
++  For an executable, the required form of the "work that uses the
++Library" must include any data and utility programs needed for
++reproducing the executable from it.  However, as a special exception,
++the materials to be distributed need not include anything that is
++normally distributed (in either source or binary form) with the major
++components (compiler, kernel, and so on) of the operating system on
++which the executable runs, unless that component itself accompanies
++the executable.
++
++  It may happen that this requirement contradicts the license
++restrictions of other proprietary libraries that do not normally
++accompany the operating system.  Such a contradiction means you cannot
++use both them and the Library together in an executable that you
++distribute.
++
++  7. You may place library facilities that are a work based on the
++Library side-by-side in a single library together with other library
++facilities not covered by this License, and distribute such a combined
++library, provided that the separate distribution of the work based on
++the Library and of the other library facilities is otherwise
++permitted, and provided that you do these two things:
++
++    a) Accompany the combined library with a copy of the same work
++    based on the Library, uncombined with any other library
++    facilities.  This must be distributed under the terms of the
++    Sections above.
++
++    b) Give prominent notice with the combined library of the fact
++    that part of it is a work based on the Library, and explaining
++    where to find the accompanying uncombined form of the same work.
++
++  8. You may not copy, modify, sublicense, link with, or distribute
++the Library except as expressly provided under this License.  Any
++attempt otherwise to copy, modify, sublicense, link with, or
++distribute the Library is void, and will automatically terminate your
++rights under this License.  However, parties who have received copies,
++or rights, from you under this License will not have their licenses
++terminated so long as such parties remain in full compliance.
++
++  9. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Library or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Library (or any work based on the
++Library), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Library or works based on it.
++
++  10. Each time you redistribute the Library (or any work based on the
++Library), the recipient automatically receives a license from the
++original licensor to copy, distribute, link with or modify the Library
++subject to these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties with
++this License.
++
++  11. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Library at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Library by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Library.
++
++If any portion of this section is held invalid or unenforceable under any
++particular circumstance, the balance of the section is intended to apply,
++and the section as a whole is intended to apply in other circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  12. If the distribution and/or use of the Library is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Library under this License may add
++an explicit geographical distribution limitation excluding those countries,
++so that distribution is permitted only in or among countries not thus
++excluded.  In such case, this License incorporates the limitation as if
++written in the body of this License.
++
++  13. The Free Software Foundation may publish revised and/or new
++versions of the Lesser General Public License from time to time.
++Such new versions will be similar in spirit to the present version,
++but may differ in detail to address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Library
++specifies a version number of this License which applies to it and
++"any later version", you have the option of following the terms and
++conditions either of that version or of any later version published by
++the Free Software Foundation.  If the Library does not specify a
++license version number, you may choose any version ever published by
++the Free Software Foundation.
++
++  14. If you wish to incorporate parts of the Library into other free
++programs whose distribution conditions are incompatible with these,
++write to the author to ask for permission.  For software which is
++copyrighted by the Free Software Foundation, write to the Free
++Software Foundation; we sometimes make exceptions for this.  Our
++decision will be guided by the two goals of preserving the free status
++of all derivatives of our free software and of promoting the sharing
++and reuse of software generally.
++
++			    NO WARRANTY
++
++  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
++OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
++LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
++DAMAGES.
++
++		     END OF TERMS AND CONDITIONS
++
++           How to Apply These Terms to Your New Libraries
++
++  If you develop a new library, and you want it to be of the greatest
++possible use to the public, we recommend making it free software that
++everyone can redistribute and change.  You can do so by permitting
++redistribution under these terms (or, alternatively, under the terms of the
++ordinary General Public License).
++
++  To apply these terms, attach the following notices to the library.  It is
++safest to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least the
++"copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the library's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library 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
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser 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
++
++Also add information on how to contact you by electronic and paper mail.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the library, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the
++  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
++
++  <signature of Ty Coon>, 1 April 1990
++  Ty Coon, President of Vice
++
++That's all there is to it!
++
++
++
++
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt	2006-02-20 13:37:23.000000000 -0500
+@@ -0,0 +1,470 @@
++                          MOZILLA PUBLIC LICENSE
++                                Version 1.1
++
++                              ---------------
++
++1. Definitions.
++
++     1.0.1. "Commercial Use" means distribution or otherwise making the
++     Covered Code available to a third party.
++
++     1.1. "Contributor" means each entity that creates or contributes to
++     the creation of Modifications.
++
++     1.2. "Contributor Version" means the combination of the Original
++     Code, prior Modifications used by a Contributor, and the Modifications
++     made by that particular Contributor.
++
++     1.3. "Covered Code" means the Original Code or Modifications or the
++     combination of the Original Code and Modifications, in each case
++     including portions thereof.
++
++     1.4. "Electronic Distribution Mechanism" means a mechanism generally
++     accepted in the software development community for the electronic
++     transfer of data.
++
++     1.5. "Executable" means Covered Code in any form other than Source
++     Code.
++
++     1.6. "Initial Developer" means the individual or entity identified
++     as the Initial Developer in the Source Code notice required by Exhibit
++     A.
++
++     1.7. "Larger Work" means a work which combines Covered Code or
++     portions thereof with code not governed by the terms of this License.
++
++     1.8. "License" means this document.
++
++     1.8.1. "Licensable" means having the right to grant, to the maximum
++     extent possible, whether at the time of the initial grant or
++     subsequently acquired, any and all of the rights conveyed herein.
++
++     1.9. "Modifications" means any addition to or deletion from the
++     substance or structure of either the Original Code or any previous
++     Modifications. When Covered Code is released as a series of files, a
++     Modification is:
++          A. Any addition to or deletion from the contents of a file
++          containing Original Code or previous Modifications.
++
++          B. Any new file that contains any part of the Original Code or
++          previous Modifications.
++
++     1.10. "Original Code" means Source Code of computer software code
++     which is described in the Source Code notice required by Exhibit A as
++     Original Code, and which, at the time of its release under this
++     License is not already Covered Code governed by this License.
++
++     1.10.1. "Patent Claims" means any patent claim(s), now owned or
++     hereafter acquired, including without limitation,  method, process,
++     and apparatus claims, in any patent Licensable by grantor.
++
++     1.11. "Source Code" means the preferred form of the Covered Code for
++     making modifications to it, including all modules it contains, plus
++     any associated interface definition files, scripts used to control
++     compilation and installation of an Executable, or source code
++     differential comparisons against either the Original Code or another
++     well known, available Covered Code of the Contributor's choice. The
++     Source Code can be in a compressed or archival form, provided the
++     appropriate decompression or de-archiving software is widely available
++     for no charge.
++
++     1.12. "You" (or "Your")  means an individual or a legal entity
++     exercising rights under, and complying with all of the terms of, this
++     License or a future version of this License issued under Section 6.1.
++     For legal entities, "You" includes any entity which controls, is
++     controlled by, or is under common control with You. For purposes of
++     this definition, "control" means (a) the power, direct or indirect,
++     to cause the direction or management of such entity, whether by
++     contract or otherwise, or (b) ownership of more than fifty percent
++     (50%) of the outstanding shares or beneficial ownership of such
++     entity.
++
++2. Source Code License.
++
++     2.1. The Initial Developer Grant.
++     The Initial Developer hereby grants You a world-wide, royalty-free,
++     non-exclusive license, subject to third party intellectual property
++     claims:
++          (a)  under intellectual property rights (other than patent or
++          trademark) Licensable by Initial Developer to use, reproduce,
++          modify, display, perform, sublicense and distribute the Original
++          Code (or portions thereof) with or without Modifications, and/or
++          as part of a Larger Work; and
++
++          (b) under Patents Claims infringed by the making, using or
++          selling of Original Code, to make, have made, use, practice,
++          sell, and offer for sale, and/or otherwise dispose of the
++          Original Code (or portions thereof).
++
++          (c) the licenses granted in this Section 2.1(a) and (b) are
++          effective on the date Initial Developer first distributes
++          Original Code under the terms of this License.
++
++          (d) Notwithstanding Section 2.1(b) above, no patent license is
++          granted: 1) for code that You delete from the Original Code; 2)
++          separate from the Original Code;  or 3) for infringements caused
++          by: i) the modification of the Original Code or ii) the
++          combination of the Original Code with other software or devices.
++
++     2.2. Contributor Grant.
++     Subject to third party intellectual property claims, each Contributor
++     hereby grants You a world-wide, royalty-free, non-exclusive license
++
++          (a)  under intellectual property rights (other than patent or
++          trademark) Licensable by Contributor, to use, reproduce, modify,
++          display, perform, sublicense and distribute the Modifications
++          created by such Contributor (or portions thereof) either on an
++          unmodified basis, with other Modifications, as Covered Code
++          and/or as part of a Larger Work; and
++
++          (b) under Patent Claims infringed by the making, using, or
++          selling of  Modifications made by that Contributor either alone
++          and/or in combination with its Contributor Version (or portions
++          of such combination), to make, use, sell, offer for sale, have
++          made, and/or otherwise dispose of: 1) Modifications made by that
++          Contributor (or portions thereof); and 2) the combination of
++          Modifications made by that Contributor with its Contributor
++          Version (or portions of such combination).
++
++          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
++          effective on the date Contributor first makes Commercial Use of
++          the Covered Code.
++
++          (d)    Notwithstanding Section 2.2(b) above, no patent license is
++          granted: 1) for any code that Contributor has deleted from the
++          Contributor Version; 2)  separate from the Contributor Version;
++          3)  for infringements caused by: i) third party modifications of
++          Contributor Version or ii)  the combination of Modifications made
++          by that Contributor with other software  (except as part of the
++          Contributor Version) or other devices; or 4) under Patent Claims
++          infringed by Covered Code in the absence of Modifications made by
++          that Contributor.
++
++3. Distribution Obligations.
++
++     3.1. Application of License.
++     The Modifications which You create or to which You contribute are
++     governed by the terms of this License, including without limitation
++     Section 2.2. The Source Code version of Covered Code may be
++     distributed only under the terms of this License or a future version
++     of this License released under Section 6.1, and You must include a
++     copy of this License with every copy of the Source Code You
++     distribute. You may not offer or impose any terms on any Source Code
++     version that alters or restricts the applicable version of this
++     License or the recipients' rights hereunder. However, You may include
++     an additional document offering the additional rights described in
++     Section 3.5.
++
++     3.2. Availability of Source Code.
++     Any Modification which You create or to which You contribute must be
++     made available in Source Code form under the terms of this License
++     either on the same media as an Executable version or via an accepted
++     Electronic Distribution Mechanism to anyone to whom you made an
++     Executable version available; and if made available via Electronic
++     Distribution Mechanism, must remain available for at least twelve (12)
++     months after the date it initially became available, or at least six
++     (6) months after a subsequent version of that particular Modification
++     has been made available to such recipients. You are responsible for
++     ensuring that the Source Code version remains available even if the
++     Electronic Distribution Mechanism is maintained by a third party.
++
++     3.3. Description of Modifications.
++     You must cause all Covered Code to which You contribute to contain a
++     file documenting the changes You made to create that Covered Code and
++     the date of any change. You must include a prominent statement that
++     the Modification is derived, directly or indirectly, from Original
++     Code provided by the Initial Developer and including the name of the
++     Initial Developer in (a) the Source Code, and (b) in any notice in an
++     Executable version or related documentation in which You describe the
++     origin or ownership of the Covered Code.
++
++     3.4. Intellectual Property Matters
++          (a) Third Party Claims.
++          If Contributor has knowledge that a license under a third party's
++          intellectual property rights is required to exercise the rights
++          granted by such Contributor under Sections 2.1 or 2.2,
++          Contributor must include a text file with the Source Code
++          distribution titled "LEGAL" which describes the claim and the
++          party making the claim in sufficient detail that a recipient will
++          know whom to contact. If Contributor obtains such knowledge after
++          the Modification is made available as described in Section 3.2,
++          Contributor shall promptly modify the LEGAL file in all copies
++          Contributor makes available thereafter and shall take other steps
++          (such as notifying appropriate mailing lists or newsgroups)
++          reasonably calculated to inform those who received the Covered
++          Code that new knowledge has been obtained.
++
++          (b) Contributor APIs.
++          If Contributor's Modifications include an application programming
++          interface and Contributor has knowledge of patent licenses which
++          are reasonably necessary to implement that API, Contributor must
++          also include this information in the LEGAL file.
++
++               (c)    Representations.
++          Contributor represents that, except as disclosed pursuant to
++          Section 3.4(a) above, Contributor believes that Contributor's
++          Modifications are Contributor's original creation(s) and/or
++          Contributor has sufficient rights to grant the rights conveyed by
++          this License.
++
++     3.5. Required Notices.
++     You must duplicate the notice in Exhibit A in each file of the Source
++     Code.  If it is not possible to put such notice in a particular Source
++     Code file due to its structure, then You must include such notice in a
++     location (such as a relevant directory) where a user would be likely
++     to look for such a notice.  If You created one or more Modification(s)
++     You may add your name as a Contributor to the notice described in
++     Exhibit A.  You must also duplicate this License in any documentation
++     for the Source Code where You describe recipients' rights or ownership
++     rights relating to Covered Code.  You may choose to offer, and to
++     charge a fee for, warranty, support, indemnity or liability
++     obligations to one or more recipients of Covered Code. However, You
++     may do so only on Your own behalf, and not on behalf of the Initial
++     Developer or any Contributor. You must make it absolutely clear than
++     any such warranty, support, indemnity or liability obligation is
++     offered by You alone, and You hereby agree to indemnify the Initial
++     Developer and every Contributor for any liability incurred by the
++     Initial Developer or such Contributor as a result of warranty,
++     support, indemnity or liability terms You offer.
++
++     3.6. Distribution of Executable Versions.
++     You may distribute Covered Code in Executable form only if the
++     requirements of Section 3.1-3.5 have been met for that Covered Code,
++     and if You include a notice stating that the Source Code version of
++     the Covered Code is available under the terms of this License,
++     including a description of how and where You have fulfilled the
++     obligations of Section 3.2. The notice must be conspicuously included
++     in any notice in an Executable version, related documentation or
++     collateral in which You describe recipients' rights relating to the
++     Covered Code. You may distribute the Executable version of Covered
++     Code or ownership rights under a license of Your choice, which may
++     contain terms different from this License, provided that You are in
++     compliance with the terms of this License and that the license for the
++     Executable version does not attempt to limit or alter the recipient's
++     rights in the Source Code version from the rights set forth in this
++     License. If You distribute the Executable version under a different
++     license You must make it absolutely clear that any terms which differ
++     from this License are offered by You alone, not by the Initial
++     Developer or any Contributor. You hereby agree to indemnify the
++     Initial Developer and every Contributor for any liability incurred by
++     the Initial Developer or such Contributor as a result of any such
++     terms You offer.
++
++     3.7. Larger Works.
++     You may create a Larger Work by combining Covered Code with other code
++     not governed by the terms of this License and distribute the Larger
++     Work as a single product. In such a case, You must make sure the
++     requirements of this License are fulfilled for the Covered Code.
++
++4. Inability to Comply Due to Statute or Regulation.
++
++     If it is impossible for You to comply with any of the terms of this
++     License with respect to some or all of the Covered Code due to
++     statute, judicial order, or regulation then You must: (a) comply with
++     the terms of this License to the maximum extent possible; and (b)
++     describe the limitations and the code they affect. Such description
++     must be included in the LEGAL file described in Section 3.4 and must
++     be included with all distributions of the Source Code. Except to the
++     extent prohibited by statute or regulation, such description must be
++     sufficiently detailed for a recipient of ordinary skill to be able to
++     understand it.
++
++5. Application of this License.
++
++     This License applies to code to which the Initial Developer has
++     attached the notice in Exhibit A and to related Covered Code.
++
++6. Versions of the License.
++
++     6.1. New Versions.
++     Netscape Communications Corporation ("Netscape") may publish revised
++     and/or new versions of the License from time to time. Each version
++     will be given a distinguishing version number.
++
++     6.2. Effect of New Versions.
++     Once Covered Code has been published under a particular version of the
++     License, You may always continue to use it under the terms of that
++     version. You may also choose to use such Covered Code under the terms
++     of any subsequent version of the License published by Netscape. No one
++     other than Netscape has the right to modify the terms applicable to
++     Covered Code created under this License.
++
++     6.3. Derivative Works.
++     If You create or use a modified version of this License (which you may
++     only do in order to apply it to code which is not already Covered Code
++     governed by this License), You must (a) rename Your license so that
++     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
++     "MPL", "NPL" or any confusingly similar phrase do not appear in your
++     license (except to note that your license differs from this License)
++     and (b) otherwise make it clear that Your version of the license
++     contains terms which differ from the Mozilla Public License and
++     Netscape Public License. (Filling in the name of the Initial
++     Developer, Original Code or Contributor in the notice described in
++     Exhibit A shall not of themselves be deemed to be modifications of
++     this License.)
++
++7. DISCLAIMER OF WARRANTY.
++
++     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
++     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
++     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
++     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
++     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
++     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
++     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
++     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
++     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
++     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
++
++8. TERMINATION.
++
++     8.1.  This License and the rights granted hereunder will terminate
++     automatically if You fail to comply with terms herein and fail to cure
++     such breach within 30 days of becoming aware of the breach. All
++     sublicenses to the Covered Code which are properly granted shall
++     survive any termination of this License. Provisions which, by their
++     nature, must remain in effect beyond the termination of this License
++     shall survive.
++
++     8.2.  If You initiate litigation by asserting a patent infringement
++     claim (excluding declatory judgment actions) against Initial Developer
++     or a Contributor (the Initial Developer or Contributor against whom
++     You file such action is referred to as "Participant")  alleging that:
++
++     (a)  such Participant's Contributor Version directly or indirectly
++     infringes any patent, then any and all rights granted by such
++     Participant to You under Sections 2.1 and/or 2.2 of this License
++     shall, upon 60 days notice from Participant terminate prospectively,
++     unless if within 60 days after receipt of notice You either: (i)
++     agree in writing to pay Participant a mutually agreeable reasonable
++     royalty for Your past and future use of Modifications made by such
++     Participant, or (ii) withdraw Your litigation claim with respect to
++     the Contributor Version against such Participant.  If within 60 days
++     of notice, a reasonable royalty and payment arrangement are not
++     mutually agreed upon in writing by the parties or the litigation claim
++     is not withdrawn, the rights granted by Participant to You under
++     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
++     the 60 day notice period specified above.
++
++     (b)  any software, hardware, or device, other than such Participant's
++     Contributor Version, directly or indirectly infringes any patent, then
++     any rights granted to You by such Participant under Sections 2.1(b)
++     and 2.2(b) are revoked effective as of the date You first made, used,
++     sold, distributed, or had made, Modifications made by that
++     Participant.
++
++     8.3.  If You assert a patent infringement claim against Participant
++     alleging that such Participant's Contributor Version directly or
++     indirectly infringes any patent where such claim is resolved (such as
++     by license or settlement) prior to the initiation of patent
++     infringement litigation, then the reasonable value of the licenses
++     granted by such Participant under Sections 2.1 or 2.2 shall be taken
++     into account in determining the amount or value of any payment or
++     license.
++
++     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
++     all end user license agreements (excluding distributors and resellers)
++     which have been validly granted by You or any distributor hereunder
++     prior to termination shall survive termination.
++
++9. LIMITATION OF LIABILITY.
++
++     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
++     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
++     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
++     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
++     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
++     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
++     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
++     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
++     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
++     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
++     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
++     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
++     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
++     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
++
++10. U.S. GOVERNMENT END USERS.
++
++     The Covered Code is a "commercial item," as that term is defined in
++     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
++     software" and "commercial computer software documentation," as such
++     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
++     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
++     all U.S. Government End Users acquire Covered Code with only those
++     rights set forth herein.
++
++11. MISCELLANEOUS.
++
++     This License represents the complete agreement concerning subject
++     matter hereof. If any provision of this License is held to be
++     unenforceable, such provision shall be reformed only to the extent
++     necessary to make it enforceable. This License shall be governed by
++     California law provisions (except to the extent applicable law, if
++     any, provides otherwise), excluding its conflict-of-law provisions.
++     With respect to disputes in which at least one party is a citizen of,
++     or an entity chartered or registered to do business in the United
++     States of America, any litigation relating to this License shall be
++     subject to the jurisdiction of the Federal Courts of the Northern
++     District of California, with venue lying in Santa Clara County,
++     California, with the losing party responsible for costs, including
++     without limitation, court costs and reasonable attorneys' fees and
++     expenses. The application of the United Nations Convention on
++     Contracts for the International Sale of Goods is expressly excluded.
++     Any law or regulation which provides that the language of a contract
++     shall be construed against the drafter shall not apply to this
++     License.
++
++12. RESPONSIBILITY FOR CLAIMS.
++
++     As between Initial Developer and the Contributors, each party is
++     responsible for claims and damages arising, directly or indirectly,
++     out of its utilization of rights under this License and You agree to
++     work with Initial Developer and Contributors to distribute such
++     responsibility on an equitable basis. Nothing herein is intended or
++     shall be deemed to constitute any admission of liability.
++
++13. MULTIPLE-LICENSED CODE.
++
++     Initial Developer may designate portions of the Covered Code as
++     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
++     Developer permits you to utilize portions of the Covered Code under
++     Your choice of the NPL or the alternative licenses, if any, specified
++     by the Initial Developer in the file described in Exhibit A.
++
++EXHIBIT A -Mozilla Public License.
++
++     ``The contents of this file are subject to the Mozilla Public License
++     Version 1.1 (the "License"); you may not use this file except in
++     compliance with the License. You may obtain a copy of the License at
++     http://www.mozilla.org/MPL/
++
++     Software distributed under the License is distributed on an "AS IS"
++     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
++     License for the specific language governing rights and limitations
++     under the License.
++
++     The Original Code is ______________________________________.
++
++     The Initial Developer of the Original Code is ________________________.
++     Portions created by ______________________ are Copyright (C) ______
++     _______________________. All Rights Reserved.
++
++     Contributor(s): ______________________________________.
++
++     Alternatively, the contents of this file may be used under the terms
++     of the _____ license (the  "[___] License"), in which case the
++     provisions of [______] License are applicable instead of those
++     above.  If you wish to allow use of your version of this file only
++     under the terms of the [____] License and not to allow others to use
++     your version of this file under the MPL, indicate your decision by
++     deleting  the provisions above and replace  them with the notice and
++     other provisions required by the [___] License.  If you do not delete
++     the provisions above, a recipient may use your version of this file
++     under either the MPL or the [___] License."
++
++     [NOTE: The text of this Exhibit A may differ slightly from the text of
++     the notices in the Source Code files of the Original Code. You should
++     use the text of this Exhibit A rather than the text found in the
++     Original Code Source Code for Your Modifications.]
++
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/build.propertiess plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties	2006-02-20 13:37:23.000000000 -0500
+@@ -0,0 +1,11 @@
++###############################################################################
++# Copyright (c) 2000, 2003 IBM Corporation and others.
++# All rights reserved. This program and the accompanying materials
++# are made available under the terms of the Eclipse Public License v1.0
++# which accompanies this distribution, and is available at
++# http://www.eclipse.org/legal/epl-v10.html
++#
++# Contributors:
++#     IBM Corporation - initial API and implementation
++###############################################################################
++custom = true
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml	2006-02-20 13:38:47.000000000 -0500
+@@ -0,0 +1,301 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="org.eclipse.swt.gtk.linux.ppc64" default="build.jars" basedir=".">
++
++	<target name="init" depends="properties">
++		<property name="ws" value="gtk"/>
++		<property name="os" value="linux"/>
++		<property name="arch" value="ppc64"/>
++		<property name="fragment" value="org.eclipse.swt.${ws}.${os}.${arch}"/>
++		<property name="version.suffix" value="_3.1.1"/>
++		<property name="full.name" value="${fragment}${version.suffix}"/>
++		<property name="temp.folder" value="${basedir}/temp.folder"/>
++		<property name="plugin.destination" value="${basedir}"/>
++		<property name="build.result.folder" value="${basedir}"/>
++		<property name="destination" value="${basedir}"/>
++		<property name="plugindir" value="../org.eclipse.swt"/>
++		<property name="bootclasspath" value=""/>
++		<property name="toolsplugindir" value="../org.eclipse.swt.tools"/>
++		<property name="javacVerbose" value="true"/>
++	</target>
++
++	<target name="properties" if="eclipse.running">
++		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++	</target>
++
++	<target name="build.update.jar" depends="init">
++		<delete dir="${temp.folder}"/>
++		<mkdir dir="${temp.folder}"/>
++		<antcall target="build.jars"/>
++		<antcall target="gather.bin.parts">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
++		<delete dir="${temp.folder}"/>
++	</target>
++
++	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
++		<property name="destdir" value="${temp.folder}/@dot.bin"/>
++		<delete dir="${temp.folder}/@dot.bin"/>
++		<mkdir dir="${temp.folder}/@dot.bin"/>
++		<javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
++			<src path="${basedir}/src/Eclipse SWT/cairo/"/>
++			<src path="${basedir}/src/Eclipse SWT/common/"/>
++			<src path="${basedir}/src/Eclipse SWT/common_j2se/"/>
++			<src path="${basedir}/src/Eclipse SWT/emulated/bidi/"/>
++			<src path="${basedir}/src/Eclipse SWT/emulated/coolbar/"/>
++			<src path="${basedir}/src/Eclipse SWT/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Accessibility/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Accessibility/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT AWT/common/"/>
++			<src path="${basedir}/src/Eclipse SWT AWT/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Browser/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Browser/mozilla/"/>
++			<src path="${basedir}/src/Eclipse SWT Custom Widgets/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Drag and Drop/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Drag and Drop/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Mozilla/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Mozilla/common/"/>
++			<src path="${basedir}/src/Eclipse SWT PI/cairo/"/>
++			<src path="${basedir}/src/Eclipse SWT PI/common/"/>
++			<src path="${basedir}/src/Eclipse SWT PI/common_j2se/"/>
++			<src path="${basedir}/src/Eclipse SWT PI/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Printing/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Printing/gtk/"/>
++			<src path="${basedir}/src/Eclipse SWT Program/cde/"/>
++			<src path="${basedir}/src/Eclipse SWT Program/common/"/>
++			<src path="${basedir}/src/Eclipse SWT Program/gnome/"/>
++			<src path="${basedir}/src/Eclipse SWT Program/gtk/"/>
++		</javac>
++        <property name="includes" value=""/>
++        <property name="excludes" value="**/*.java,**/library/,**/package.htm*"/>
++		<copy todir="${temp.folder}/@dot.bin">
++			<fileset dir="${basedir}/src/Eclipse SWT/cairo/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common_j2se/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/emulated/bidi/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/emulated/coolbar/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Accessibility/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Accessibility/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Browser/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Browser/mozilla/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Custom Widgets/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Drag and Drop/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Drag and Drop/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common_j2se/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Printing/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Printing/gtk/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/common/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gtk/" includes="${includes}" excludes="${excludes}"/>
++		</copy>
++
++		<mkdir dir="${build.result.folder}/@dot"/>
++		<copy todir="${build.result.folder}/@dot" failonerror="true">
++			<fileset dir="${temp.folder}/@dot.bin"/>
++		</copy>
++		<!-- prepare a jar file solely for the download target -->
++		<jar jarfile="${build.result.folder}/swt.jar" basedir="${temp.folder}/@dot.bin"/>
++		<delete dir="${temp.folder}/@dot.bin"/>
++	</target>
++
++	<target name="build.jars" depends="init">
++		<available property="@dot" file="${build.result.folder}/@dot"/>
++		<available property="source.present" file="${basedir}/src" type="dir" />
++		<antcall target="copy.source" />
++		<antcall target="@dot"/>
++	</target>
++
++	<target name="copy.source" unless="source.present">
++			<echo>Copying source from org.eclipse.swt project to folder ${basedir}/src folder ${temp.folder}.</echo>
++			<delete dir="${basedir}/src"/>
++			<mkdir dir="${basedir}/src"/>
++		
++			<!-- Copy the existing 32 bit SWT source folders to the 64 bit source folder -->
++			<copy todir="${basedir}/src">
++				<fileset dir="${plugindir}" includes="Eclipse*/**"/>
++			</copy>
++	</target>
++	
++	<target name="src.zip" depends="init" unless="src.zip">
++		<mkdir dir="${build.result.folder}/"/>
++		<zip zipfile="${build.result.folder}/src.zip">
++			<fileset dir="${basedir}/src/Eclipse SWT/cairo/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common_j2se/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/emulated/bidi/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/emulated/coolbar/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Accessibility/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Accessibility/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Browser/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Browser/mozilla/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Custom Widgets/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Drag and Drop/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Drag and Drop/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/common_j2se/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Printing/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Printing/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/common/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gtk/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/" includes="**/*.java" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library/"/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common_j2se/" includes="**/*.properties" excludes=""/>
++			<fileset dir="${basedir}/src/Eclipse SWT/common/" includes="**/version.txt" excludes=""/>
++			<fileset dir="${basedir}" includes="about.html,about_files/" excludes=""/>
++		</zip>
++	</target>
++
++	<target name="build.sources" depends="build.cfiles">
++		<available property="src.zip" file="${build.result.folder}/src.zip"/>
++		<antcall target="src.zip"/>
++	</target>
++
++	<target name="build.cfiles" depends="build.jars">
++		<!--compile the jar in org.eclipse.swt.tools-->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
++
++		<!-- generate the C code from the SWT PI java classes -->
++		<!-- assumes the swttools.jar has already been built  -->
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gnome.GNOME"/><arg value="${basedir}/src/Eclipse SWT Program/gnome/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cde.CDE"/><arg value="${basedir}/src/Eclipse SWT Program/cde/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.mozilla.XPCOM"/><arg value="${basedir}/src/Eclipse SWT Mozilla/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
++
++		<!-- copy all the files into /library folders into a temporary bin/library folder  -->
++		<!-- since this is the structure assumed by the native makefile and given that     -->
++		<!-- this script needs to work outside of the Eclipse workspace without modifying  -->
++		<!-- the content of the org.eclipse.swt project.                                   -->
++		<mkdir dir="${basedir}/src/bin/library"/>
++		<copy todir="${basedir}/src/bin/library">
++			<fileset dir="${basedir}/src/Eclipse SWT/common/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
++			<fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/>
++		</copy>
++	</target>
++
++	<target name="build.nativeLibraries" depends="build.cfiles" description="Build native libraries without changing the content of org.eclipse.swt">
++		<property name="sourcedir" value="${basedir}/src/bin/library" />
++	    <property name="lib_destdir" value="${sourcedir}/../../../../${fragment}" />
++		<tstamp/>
++		<exec dir="${sourcedir}" executable="sh">
++			<arg line="./build.sh"/>
++			<arg line="clean"/>
++		</exec>
++		<mkdir dir="${lib_destdir}" />
++		<exec dir="${sourcedir}" executable="sh">
++			<arg line="./build.sh"/>
++			<arg line="all"/>
++		</exec>
++		<copy todir="${lib_destdir}">
++			<fileset dir="${sourcedir}/" includes="*.so"/>
++		</copy>
++	</target>
++
++	<target name="build.zips" depends="init">
++	</target>
++
++	<target name="gather.sources" depends="init" if="destination.temp.folder">
++		<mkdir dir="${destination.temp.folder}/${full.name}"/>
++		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/${full.name}/"/>
++		<copy todir="${destination.temp.folder}/${full.name}">
++			<fileset dir="${basedir}" includes="about.html,about_files/"/>
++		</copy>
++	</target>
++
++	<target name="gather.logs" depends="init" if="destination.temp.folder">
++		<mkdir dir="${destination.temp.folder}/${full.name}"/>
++		<copy file="${temp.folder}/@dot.bin.log" todir="${destination.temp.folder}/${full.name}/"/>
++	</target>
++
++	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
++		<mkdir dir="${destination.temp.folder}/${full.name}"/>
++		<copy todir="${destination.temp.folder}/${full.name}" failonerror="true">
++			<fileset dir="${build.result.folder}/@dot" includes="**"/>
++		</copy>
++		<copy todir="${destination.temp.folder}/${full.name}">
++			<fileset dir="${basedir}" includes="fragment.properties,about.html,about_files/,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,META-INF/"/> 
++		</copy>
++	  	<chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib" />
++	</target>
++	
++	<target name="swtdownload" depends="init">	
++		<delete dir="${temp.folder}"/>
++		<mkdir dir="${temp.folder}/swtdownload/"/>
++		<antcall target="build.jars"/>
++		<copy file="${build.result.folder}/swt.jar" todir="${temp.folder}/swtdownload"/>
++		<antcall target="build.sources"/>
++		<copy file="${build.result.folder}/src.zip" todir="${temp.folder}/swtdownload"/>
++		<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload"/>
++		<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload"/>
++		<copy todir="${temp.folder}/swtdownload">
++			<fileset dir="${basedir}" includes="about.html,about_files/"/>
++			<fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2"/>
++		</copy>
++		<chmod dir="${temp.folder}/swtdownload" perm="755" includes="**/lib*"/>
++		<exec dir="${temp.folder}/swtdownload" executable="zip">
++			<arg line="-r -q -y ${destination}/swt-${buildid}-${ws}-${os}-${arch}.zip ."/>
++		</exec>
++		<delete dir="${temp.folder}"/>
++	</target>
++
++	<target name="clean" depends="init">
++		<delete dir="${build.result.folder}/@dot"/>
++		<delete file="${build.result.folder}/src.zip"/>
++		<delete file="${plugin.destination}/${full.name}.jar"/>
++		<delete file="${plugin.destination}/${full.name}.zip"/>
++		<delete dir="${temp.folder}"/>
++		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++	</target>
++
++	<target name="refresh" depends="init" if="eclipse.running">
++		<eclipse.refreshLocal resource="${fragment}" depth="infinite"/>
++	</target>
++
++	<target name="zip.plugin" depends="init">
++		<delete dir="${temp.folder}"/>
++		<mkdir dir="${temp.folder}"/>
++		<antcall target="build.jars"/>
++		<antcall target="build.sources"/>
++		<antcall target="gather.bin.parts">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<antcall target="gather.sources">
++			<param name="destination.temp.folder" value="${temp.folder}/"/>
++		</antcall>
++		<delete>
++			<fileset dir="${temp.folder}" includes="**/*.bin.log"/>
++		</delete>
++		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
++		<delete dir="${temp.folder}"/>
++	</target>
++</project>
+diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties
+--- plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties	1969-12-31 19:00:00.000000000 -0500
++++ plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties	2006-02-20 13:37:23.000000000 -0500
+@@ -0,0 +1,12 @@
++###############################################################################
++# Copyright (c) 2000, 2004 IBM Corporation and others.
++# All rights reserved. This program and the accompanying materials
++# are made available under the terms of the Eclipse Public License v1.0
++# which accompanies this distribution, and is available at
++# http://www.eclipse.org/legal/epl-v10.html
++#
++# Contributors:
++#     IBM Corporation - initial API and implementation
++###############################################################################
++fragmentName = Standard Widget Toolkit for GTK 2.0
++providerName = Eclipse.org



From fedora-cvs-commits at redhat.com  Mon Feb 20 18:51:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 13:51:27 -0500
Subject: rpms/g-wrap/devel g-wrap-staticffi.patch, NONE, 1.1 g-wrap.spec,
	1.19, 1.20
Message-ID: <200602201851.k1KIpRXC014769@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14679

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-staticffi.patch 
Log Message:
ffi is an implementation detail - build it statically


g-wrap-staticffi.patch:
 configure |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE g-wrap-staticffi.patch ---
--- g-wrap-1.9.6/libffi/configure.foo	2006-02-20 13:42:58.000000000 -0500
+++ g-wrap-1.9.6/libffi/configure	2006-02-20 13:43:37.000000000 -0500
@@ -3287,6 +3287,7 @@
 else
   enable_shared=yes
 fi;
+enable_shared=no
 
 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
@@ -3311,6 +3312,7 @@
 else
   enable_static=yes
 fi;
+enable_static=yes
 
 # Check whether --enable-fast-install or --disable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- g-wrap.spec	19 Feb 2006 05:45:44 -0000	1.19
+++ g-wrap.spec	20 Feb 2006 18:51:25 -0000	1.20
@@ -10,6 +10,7 @@
 Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
 Patch0: g-wrap-info.patch
 Patch1: g-wrap-glib2.patch
+Patch2: g-wrap-staticffi.patch
 BuildPrereq: guile-devel slib glib-devel pkgconfig
 
 %description
@@ -38,7 +39,7 @@
 %setup -q
 %patch0 -p1
 #%patch1 -p1
-
+%patch2 -p1
 %build
 
 %configure --disable-static
@@ -52,7 +53,8 @@
 # them up, and remove the .so.
 
 mv %{buildroot}/%{_includedir}/ffi* %{buildroot}/%{_includedir}/g-wrap
-rm -f %{buildroot}/%{_libdir}/libffi.{so,la}
+
+rm -f %{buildroot}/%{_libdir}/libffi.*
 sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/*
 sed -i "s|<ffi|<g-wrap/ffi|g"  %{buildroot}/%{_includedir}/g-wrap/*.h
 sed -i "s|%{_libdir}/libffi.la||g" %{buildroot}/%{_libdir}/*.la



From fedora-cvs-commits at redhat.com  Mon Feb 20 19:07:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 14:07:01 -0500
Subject: rpms/kernel/devel linux-2.6-selinux-selinuxfs-hard-link-count.patch,
	NONE, 1.1 kernel-2.6.spec, 1.1970, 1.1971
Message-ID: <200602201907.k1KJ71cA018737@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18716

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-selinux-selinuxfs-hard-link-count.patch 
Log Message:
* Sun Feb 20 2006 Dave Jones <davej at redhat.com>
- Fix incorrect hardlink count in selinuxfs (#182001)


linux-2.6-selinux-selinuxfs-hard-link-count.patch:
 selinuxfs.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE linux-2.6-selinux-selinuxfs-hard-link-count.patch ---
Fix the hard link count for selinuxfs directories.

Signed-off-by: James Morris <jmorris at redhat.com>

---

 security/selinux/selinuxfs.c |    4 ++++
 1 files changed, 4 insertions(+)

diff -purN -X dontdiff linux-2.6.16-rc4.o/security/selinux/selinuxfs.c linux-2.6.16-rc4.w/security/selinux/selinuxfs.c
--- linux-2.6.16-rc4.o/security/selinux/selinuxfs.c	2006-02-17 17:23:45.000000000 -0500
+++ linux-2.6.16-rc4.w/security/selinux/selinuxfs.c	2006-02-19 17:48:41.000000000 -0500
@@ -1198,6 +1198,8 @@ static int sel_make_dir(struct super_blo
 	}
 	inode->i_op = &simple_dir_inode_operations;
 	inode->i_fop = &simple_dir_operations;
+	/* directory inodes start off with i_nlink == 2 (for "." entry) */
+	inode->i_nlink++;
 	d_add(dentry, inode);
 out:
 	return ret;
@@ -1239,6 +1241,8 @@ static int sel_fill_super(struct super_b
 		goto out;
 	inode->i_op = &simple_dir_inode_operations;
 	inode->i_fop = &simple_dir_operations;
+	/* directory inodes start off with i_nlink == 2 (for "." entry) */
+	inode->i_nlink++;
 	d_add(dentry, inode);
 	bool_dir = dentry;
 	ret = sel_make_bools();


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1970
retrieving revision 1.1971
diff -u -r1.1970 -r1.1971
--- kernel-2.6.spec	19 Feb 2006 20:00:58 -0000	1.1970
+++ kernel-2.6.spec	20 Feb 2006 19:06:58 -0000	1.1971
@@ -358,6 +358,7 @@
 Patch1720: linux-2.6-selinux-hush.patch
 Patch1721: linux-2.6-selinux-mprotect-checks.patch
 Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
+Patch1723: linux-2.6-selinux-selinuxfs-hard-link-count.patch
 Patch1730: linux-2.6-ide-cd-shutup.patch
 Patch1740: linux-2.6-block-reduce-stack.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
@@ -920,6 +921,9 @@
 %patch1721 -p1
 # Disable setting of security attributes on new inodes when no policy is loaded
 %patch1722 -p1
+# Fix incorrect hardlink count in selinuxfs
+%patch1723 -p1
+
 # Silence noisy CD drive spew
 %patch1730 -p1
 # Reduce stack usage in block layer
@@ -1576,6 +1580,9 @@
 %endif
 
 %changelog
+* Sun Feb 20 2006 Dave Jones <davej at redhat.com>
+- Fix incorrect hardlink count in selinuxfs (#182001)
+
 * Sat Feb 18 2006 Dave Jones <davej at redhat.com>
 - Reenable EMI26 driver. (#181813)
 - Fix counting of hotplug cpu's in x86 microcode driver



From fedora-cvs-commits at redhat.com  Mon Feb 20 19:13:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 14:13:31 -0500
Subject: rpms/g-wrap/devel .cvsignore, 1.5, 1.6 g-wrap.spec, 1.20,
	1.21 sources, 1.5, 1.6
Message-ID: <200602201913.k1KJDVA8021586@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21434

Modified Files:
	.cvsignore g-wrap.spec sources 
Log Message:
when we suck in our own copy of ffi, let's leave targets out. brilliant!



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Feb 2006 05:45:44 -0000	1.5
+++ .cvsignore	20 Feb 2006 19:13:29 -0000	1.6
@@ -1 +1,2 @@
 g-wrap-1.9.6.tar.gz
+ia64.tar.gz


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- g-wrap.spec	20 Feb 2006 18:51:25 -0000	1.20
+++ g-wrap.spec	20 Feb 2006 19:13:29 -0000	1.21
@@ -8,6 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/ldconfig
 Source: ftp://ftp.gnucash.org/pub/g-wrap/g-wrap-%{version}.tar.gz
+Source1: ia64.tar.gz
 Patch0: g-wrap-info.patch
 Patch1: g-wrap-glib2.patch
 Patch2: g-wrap-staticffi.patch
@@ -36,7 +37,7 @@
 need to use g-wrap C<->Scheme functionality
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Feb 2006 05:45:44 -0000	1.5
+++ sources	20 Feb 2006 19:13:29 -0000	1.6
@@ -1 +1,2 @@
 4d83964f51376500eedced538c1620cb  g-wrap-1.9.6.tar.gz
+b5b26075d8bf6d6ef615334a45a7c806  ia64.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 20 19:41:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 14:41:46 -0500
Subject: rpms/g-wrap/devel g-wrap.spec,1.21,1.22
Message-ID: <200602201941.k1KJfkEf002017@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2002

Modified Files:
	g-wrap.spec 
Log Message:
fix build



Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- g-wrap.spec	20 Feb 2006 19:13:29 -0000	1.21
+++ g-wrap.spec	20 Feb 2006 19:41:43 -0000	1.22
@@ -43,6 +43,7 @@
 %patch2 -p1
 %build
 
+export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --disable-static
 make
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 19:56:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 14:56:53 -0500
Subject: rpms/kernel/devel linux-2.6-audit-fix-operators.patch, NONE,
	1.1.2.1 linux-2.6-audit-git.patch, NONE,
	1.1.10.1 linux-2.6-audit-inotify-api.patch, NONE,
	1.1.4.1 linux-2.6-audit-no-rules-speedup.patch, NONE,
	1.1.2.1 linux-2.6-audit-promisc.patch, NONE,
	1.1.6.1 linux-2.6-audit-rule-log.patch, NONE,
	1.1.6.1 linux-2.6-audit-string-1.patch, NONE,
	1.1.6.1 linux-2.6-audit-string-2.patch, NONE,
	1.1.6.1 linux-2.6-audit-tty.patch, NONE,
	1.1.6.1 linux-2.6-audit_log_exit-gfp_mask.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.1959, 1.1959.2.1
Message-ID: <200602201956.k1KJurN2023948@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23829

Modified Files:
      Tag: private-fc5-lspp-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-fc5-lspp-branch
	linux-2.6-audit-fix-operators.patch linux-2.6-audit-git.patch 
	linux-2.6-audit-inotify-api.patch 
	linux-2.6-audit-no-rules-speedup.patch 
	linux-2.6-audit-promisc.patch linux-2.6-audit-rule-log.patch 
	linux-2.6-audit-string-1.patch linux-2.6-audit-string-2.patch 
	linux-2.6-audit-tty.patch 
	linux-2.6-audit_log_exit-gfp_mask.patch 
Log Message:
Patches for lspp9 kernel


linux-2.6-audit-fix-operators.patch:
 auditfilter.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-audit-fix-operators.patch ---
>From dustin.kirkland at us.ibm.com Thu Feb 16 14:40:01 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, 16 Feb 2006 14:40:31 -0500
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 k1GJeVi7015183;
	Thu, 16 Feb 2006 14:40:31 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1GJeN124283;
	Thu, 16 Feb 2006 14:40:23 -0500
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 k1GJeISC009512;
	Thu, 16 Feb 2006 14:40:18 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 5FA4A73083; Thu, 16 Feb 2006 14:40:18 -0500 (EST)
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
	k1GJeGRW016720 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 16 Feb 2006 14:40:16 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1GJeF124129
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:15 -0500
Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k1GJeFU3032558
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:15 -0500
Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com
	[9.17.195.106])
	by e33.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id k1GJe5Ls030154
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:05 -0500
Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170])
	by d03relay04.boulder.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id
	k1GJgbM7180628
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:42:39 -0700
Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1])
	by d03av04.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id
	k1GJe3Uo012219
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:40:03 -0700
Received: from kirkland1.austin.ibm.com (kirkland1.austin.ibm.com [9.53.40.52])
	by d03av04.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id
	k1GJe2mY012185
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:40:02 -0700
From: Dustin Kirkland <dustin.kirkland at us.ibm.com>
To: Linux Audit Discussion <linux-audit at redhat.com>
Content-Type: text/plain
Date: Thu, 16 Feb 2006 13:40:01 -0600
Message-Id: <1140118802.3083.97.camel at kirkland1.austin.ibm.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0.261 
X-loop: linux-audit at redhat.com
Subject: [PATCH] Fix audit operators
X-BeenThere: linux-audit at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: dustin.kirkland at us.ibm.com
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: 6684
X-UID: 49954

Darrel Goeddel initiated a discussion on IRC regarding the possibility
of audit_comparator() returning -EINVAL signaling an invalid operator.

It is possible when creating the rule to assure that the operator is one
of the 6 sane values.  Here's a snip from include/linux/audit.h  Note
that 0 (nonsense) and 7 (all operators) are not valid values for an
operator.

...
#define AUDIT_NEGATE                    0x80000000

/* These are the supported operators.
 *      4  2  1
 *      =  >  <
 *      -------
 *      0  0  0         0       nonsense
 *      0  0  1         1       <
 *      0  1  0         2       >
 *      0  1  1         3       !=
 *      1  0  0         4       =
 *      1  0  1         5       <=
 *      1  1  0         6       >=
 *      1  1  1         7       all operators
 */
#define AUDIT_LESS_THAN                 0x10000000
#define AUDIT_GREATER_THAN              0x20000000
#define AUDIT_NOT_EQUAL                 0x30000000
#define AUDIT_EQUAL                     0x40000000
#define AUDIT_LESS_THAN_OR_EQUAL        (AUDIT_LESS_THAN|AUDIT_EQUAL)
#define AUDIT_GREATER_THAN_OR_EQUAL     (AUDIT_GREATER_THAN|AUDIT_EQUAL)
#define AUDIT_OPERATORS                 (AUDIT_EQUAL|AUDIT_NOT_EQUAL)
...

Furthermore, prior to adding these extended operators, flagging the
AUDIT_NEGATE bit implied !=, and otherwise == was assumed.

The following code forces the operator to be != if the AUDIT_NEGATE bit
was flipped on.  And if no operator was specified, == is assumed.  The
only invalid condition is if the AUDIT_NEGATE bit is off and all of the
AUDIT_EQUAL, AUDIT_LESS_THAN, and AUDIT_GREATER_THAN bits are
on--clearly a nonsensical operator.

Now that this is handled at rule insertion time, the default -EINVAL
return of audit_comparator() is eliminated such that the function can
only return 1 or 0.

If this is acceptable, let's get this applied to the current tree.

:-Dustin

--

diff -urpN a/kernel/auditfilter.c b/kernel/auditfilter.c
--- a/kernel/auditfilter.c	2006-02-16 11:57:17.000000000 -0600
+++ b/kernel/auditfilter.c	2006-02-16 13:30:33.000000000 -0600
@@ -139,11 +139,17 @@ static struct audit_entry *audit_rule_to
 		f->val = rule->values[i];
 
 		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
+
+		/* Support for legacy operators where
+		 * AUDIT_NEGATE bit signifies != and otherwise assumes == */
 		if (f->op & AUDIT_NEGATE)
-			f->op |= AUDIT_NOT_EQUAL;
-		else if (!(f->op & AUDIT_OPERATORS))
-			f->op |= AUDIT_EQUAL;
-		f->op &= ~AUDIT_NEGATE;
+			f->op = AUDIT_NOT_EQUAL;
+		else if (!f->op)
+			f->op = AUDIT_EQUAL;
+		else if (f->op == AUDIT_OPERATORS) {
+			err = -EINVAL;
+			goto exit_free;
+		}
 	}
 
 exit_nofree:
@@ -537,8 +543,6 @@ int audit_comparator(const u32 left, con
 		return (left > right);
 	case AUDIT_GREATER_THAN_OR_EQUAL:
 		return (left >= right);
-	default:
-		return -EINVAL;
 	}
 }
 


--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-git.patch:
 arch/ia64/kernel/ptrace.c      |   10 
 fs/namei.c                     |   14 
 fs/open.c                      |    8 
 fs/xattr.c                     |   11 
 include/linux/audit.h          |   98 ++++-
 include/linux/fsnotify.h       |   14 
 include/linux/security.h       |   33 +
 ipc/msg.c                      |    5 
 ipc/sem.c                      |    5 
 ipc/shm.c                      |    4 
 ipc/util.c                     |    2 
 kernel/Makefile                |    2 
 kernel/audit.c                 |  142 +++++--
 kernel/audit.h                 |   70 +++
 kernel/auditfilter.c           |  375 +++++++++++++++++++
 kernel/auditsc.c               |  786 +++++++++++++++++++++--------------------
 security/dummy.c               |   14 
 security/selinux/hooks.c       |   98 ++---
 security/selinux/nlmsgtab.c    |    6 
 security/selinux/selinuxfs.c   |   11 
 security/selinux/ss/services.c |   15 
 21 files changed, 1204 insertions(+), 519 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 4b19d04..49fd3f6 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1663,8 +1663,14 @@ syscall_trace_leave (long arg0, long arg
 		     long arg4, long arg5, long arg6, long arg7,
 		     struct pt_regs regs)
 {
-	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8);
+	if (unlikely(current->audit_context)) {
+		int success = AUDITSC_RESULT(regs.r10);
+		long result = regs.r8;
+
+		if (success != AUDITSC_SUCCESS)
+			result = -result;
+		audit_syscall_exit(current, success, result);
+	}
 
 	if (test_thread_flag(TIF_SYSCALL_TRACE)
 	    && (current->ptrace & PT_PTRACED))
diff --git a/fs/namei.c b/fs/namei.c
index 6dbbd42..55798c3 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1126,8 +1126,7 @@ int fastcall path_lookup(const char *nam
 	retval = link_path_walk(name, nd);
 out:
	if (likely(retval == 0)) {
-		if (unlikely(current->audit_context && nd && nd->dentry &&
-				nd->dentry->d_inode))
+		if (nd && nd->dentry && nd->dentry->d_inode)
 		audit_inode(name, nd->dentry->d_inode, flags);
	}
 	return retval;
@@ -1301,6 +1300,7 @@ static inline int may_delete(struct inod
 		return -ENOENT;
 
 	BUG_ON(victim->d_parent->d_inode != dir);
+	audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino);
 
 	error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
 	if (error)
@@ -1420,7 +1420,7 @@ int vfs_create(struct inode *dir, struct
 	DQUOT_INIT(dir);
 	error = dir->i_op->create(dir, dentry, mode, nd);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1739,7 +1739,7 @@ int vfs_mknod(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mknod(dir, dentry, mode, dev);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1810,7 +1810,7 @@ int vfs_mkdir(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mkdir(dir, dentry, mode);
 	if (!error)
-		fsnotify_mkdir(dir, dentry->d_name.name);
+		fsnotify_mkdir(dir, dentry);
 	return error;
 }
 
@@ -2047,7 +2047,7 @@ int vfs_symlink(struct inode *dir, struc
 	DQUOT_INIT(dir);
 	error = dir->i_op->symlink(dir, dentry, oldname);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -2118,7 +2118,7 @@ int vfs_link(struct dentry *old_dentry, 
 	error = dir->i_op->link(old_dentry, dir, new_dentry);
 	up(&old_dentry->d_inode->i_sem);
 	if (!error)
-		fsnotify_create(dir, new_dentry->d_name.name);
+		fsnotify_create(dir, new_dentry);
 	return error;
 }
 
diff --git a/fs/open.c b/fs/open.c
index f53a5b9..3231a67 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -25,6 +25,7 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
+#include <linux/audit.h>
 
 #include <asm/unistd.h>
 
@@ -613,6 +614,8 @@ asmlinkage long sys_fchmod(unsigned int 
 	dentry = file->f_dentry;
 	inode = dentry->d_inode;
 
+	audit_inode(NULL, inode, 0);
+
 	err = -EROFS;
 	if (IS_RDONLY(inode))
 		goto out_putf;
@@ -736,7 +739,10 @@ asmlinkage long sys_fchown(unsigned int 
 
 	file = fget(fd);
 	if (file) {
-		error = chown_common(file->f_dentry, user, group);
+		struct dentry * dentry;
+		dentry = file->f_dentry;
+		audit_inode(NULL, dentry->d_inode, 0);
+		error = chown_common(dentry, user, group);
 		fput(file);
 	}
 	return error;
diff --git a/fs/xattr.c b/fs/xattr.c
index bcc2156..8f40edf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -17,6 +17,7 @@
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/fsnotify.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 
 /*
@@ -113,12 +114,15 @@ sys_fsetxattr(int fd, char __user *name,
 	      size_t size, int flags)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = setxattr(f->f_dentry, name, value, size, flags);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = setxattr(dentry, name, value, size, flags);
 	fput(f);
 	return error;
 }
@@ -365,12 +369,15 @@ asmlinkage long
 sys_fremovexattr(int fd, char __user *name)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = removexattr(f->f_dentry, name);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = removexattr(dentry, name);
 	fput(f);
 	return error;
 }
diff --git a/include/linux/audit.h b/include/linux/audit.h
index da3c019..a485639 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -33,11 +33,20 @@
  * 1200 - 1299 messages internal to the audit daemon
  * 1300 - 1399 audit event messages
  * 1400 - 1499 SE Linux use
- * 1500 - 1999 future use
- * 2000 is for otherwise unclassified kernel audit messages
+ * 1500 - 1599 kernel LSPP events
+ * 1600 - 1699 kernel crypto events
+ * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 2000 is for otherwise unclassified kernel audit messages (legacy)
+ * 2001 - 2099 unused (kernel)
+ * 2100 - 2199 user space anomaly records
+ * 2200 - 2299 user space actions taken in response to anomalies
+ * 2300 - 2399 user space generated LSPP events
+ * 2400 - 2499 user space crypto events
+ * 2500 - 2999 future user space (maybe integrity labels and related events)
  *
- * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user
- * space. Anything over that is kernel --> user space communication.
+ * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
+ * exclusively user space. 1300-2099 is kernel --> user space 
+ * communication.
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
@@ -54,6 +63,8 @@
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
[...2439 lines suppressed...]
-		rc = -EOPNOTSUPP;
-		goto out;
-	}
-
-	rc = security_sid_to_context(isec->sid, &context, &len);
-	if (rc)
-		goto out;
-
-	/* Probe for required buffer size */
-	if (!buffer || !size) {
-		rc = len;
-		goto out_free;
-	}
 
-	if (size < len) {
-		rc = -ERANGE;
-		goto out_free;
-	}
+	if (strcmp(name, XATTR_SELINUX_SUFFIX))
+		return -EOPNOTSUPP;
 
-	if (err > 0) {
-		if ((len == err) && !(memcmp(context, buffer, len))) {
-			/* Don't need to canonicalize value */
-			rc = err;
-			goto out_free;
-		}
-		memset(buffer, 0, size);
-	}
-	memcpy(buffer, context, len);
-	rc = len;
-out_free:
-	kfree(context);
-out:
-	return rc;
+	return selinux_getsecurity(isec->sid, buffer, size);
 }
 
 static int selinux_inode_setsecurity(struct inode *inode, const char *name,
@@ -4054,6 +4052,13 @@ static int selinux_ipc_permission(struct
 	return ipc_has_perm(ipcp, av);
 }
 
+static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size)
+{
+	struct ipc_security_struct *isec = ipcp->security;
+
+	return selinux_getsecurity(isec->sid, buffer, size);
+}
+
 /* module stacking operations */
 static int selinux_register_security (const char *name, struct security_operations *ops)
 {
@@ -4095,8 +4100,7 @@ static int selinux_getprocattr(struct ta
 			       char *name, void *value, size_t size)
 {
 	struct task_security_struct *tsec;
-	u32 sid, len;
-	char *context;
+	u32 sid;
 	int error;
 
 	if (current != p) {
@@ -4105,9 +4109,6 @@ static int selinux_getprocattr(struct ta
 			return error;
 	}
 
-	if (!size)
-		return -ERANGE;
-
 	tsec = p->security;
 
 	if (!strcmp(name, "current"))
@@ -4124,16 +4125,7 @@ static int selinux_getprocattr(struct ta
 	if (!sid)
 		return 0;
 
-	error = security_sid_to_context(sid, &context, &len);
-	if (error)
-		return error;
-	if (len > size) {
-		kfree(context);
-		return -ERANGE;
-	}
-	memcpy(value, context, len);
-	kfree(context);
-	return len;
+	return selinux_getsecurity(sid, value, size);
 }
 
 static int selinux_setprocattr(struct task_struct *p,
@@ -4291,6 +4283,7 @@ static struct security_operations selinu
 	.inode_getxattr =		selinux_inode_getxattr,
 	.inode_listxattr =		selinux_inode_listxattr,
 	.inode_removexattr =		selinux_inode_removexattr,
+	.inode_xattr_getsuffix =        selinux_inode_xattr_getsuffix,
 	.inode_getsecurity =            selinux_inode_getsecurity,
 	.inode_setsecurity =            selinux_inode_setsecurity,
 	.inode_listsecurity =           selinux_inode_listsecurity,
@@ -4328,6 +4321,7 @@ static struct security_operations selinu
 	.task_to_inode =                selinux_task_to_inode,
 
 	.ipc_permission =		selinux_ipc_permission,
+	.ipc_getsecurity =		selinux_ipc_getsecurity,
 
 	.msg_msg_alloc_security =	selinux_msg_msg_alloc_security,
 	.msg_msg_free_security =	selinux_msg_msg_free_security,
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index 69b9329..d7c0e91 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -148,8 +148,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16
 		break;
 
 	case SECCLASS_NETLINK_AUDIT_SOCKET:
-		if (nlmsg_type >= AUDIT_FIRST_USER_MSG &&
-		    nlmsg_type <= AUDIT_LAST_USER_MSG) {
+		if ((nlmsg_type >= AUDIT_FIRST_USER_MSG &&
+		     nlmsg_type <= AUDIT_LAST_USER_MSG) ||
+		    (nlmsg_type >= AUDIT_FIRST_USER_MSG2 &&
+                     nlmsg_type <= AUDIT_LAST_USER_MSG2)) {
 			*perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY;
 		} else {
 			err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms,
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 0e1352a..e64923b 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -21,6 +21,7 @@
 #include <linux/major.h>
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
@@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct 
 		length = task_has_security(current, SECURITY__SETENFORCE);
 		if (length)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"enforcing=%d old_enforcing=%d auid=%u", new_value, 
+			selinux_enforcing,
+			audit_get_loginuid(current->audit_context));
 		selinux_enforcing = new_value;
 		if (selinux_enforcing)
 			avc_ss_reset(0);
@@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct 
 		length = selinux_disable();
 		if (length < 0)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"selinux=0 auid=%u",
+			audit_get_loginuid(current->audit_context));
 	}
 
 	length = count;
@@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil
 		length = ret;
 	else
 		length = count;
+	audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
+		"policy loaded auid=%u",
+		audit_get_loginuid(current->audit_context));
 out:
 	up(&sel_sem);
 	vfree(data);
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 44eb4d7..2311255 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val
 		goto out;
 	}
 
-	printk(KERN_INFO "security: committed booleans { ");
 	for (i = 0; i < len; i++) {
+		if (!!values[i] != policydb.bool_val_to_struct[i]->state) {
+			audit_log(current->audit_context, GFP_ATOMIC,
+				AUDIT_MAC_CONFIG_CHANGE,
+				"bool=%s val=%d old_val=%d auid=%u",
+				policydb.p_bool_val_to_name[i],
+				!!values[i],
+				policydb.bool_val_to_struct[i]->state,
+				audit_get_loginuid(current->audit_context));
+		}
 		if (values[i]) {
 			policydb.bool_val_to_struct[i]->state = 1;
 		} else {
 			policydb.bool_val_to_struct[i]->state = 0;
 		}
-		if (i != 0)
-			printk(", ");
-		printk("%s:%d", policydb.p_bool_val_to_name[i],
-		       policydb.bool_val_to_struct[i]->state);
 	}
-	printk(" }\n");
 
 	for (cur = policydb.cond_list; cur != NULL; cur = cur->next) {
 		rc = evaluate_cond_node(&policydb, cur);

linux-2.6-audit-inotify-api.patch:
 fs/inotify.c             |  395 +++++++++++++++++++++++++++++------------------
 include/linux/fsnotify.h |   29 +--
 include/linux/inotify.h  |   17 +-
 3 files changed, 279 insertions(+), 162 deletions(-)

--- NEW FILE linux-2.6-audit-inotify-api.patch ---
>From amy.griffis at hp.com Thu Feb  9 14:07:59 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, 09 Feb 2006 14:08:27 -0500
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 k19J8QQo003353;
	Thu, 9 Feb 2006 14:08:27 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8N110283;
	Thu, 9 Feb 2006 14:08:23 -0500
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 k19J8Imo011143;
	Thu, 9 Feb 2006 14:08:18 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 67C5573351; Thu,  9 Feb 2006 14:08:18 -0500 (EST)
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
	k19J8GKS020511 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8G110252; 
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k19J85qE016990;
	Thu, 9 Feb 2006 14:08:05 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id CA77434016;
	Thu,  9 Feb 2006 14:08:01 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id 5E6F03405E;
	Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 44F1C38448A3; Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Date: Thu, 9 Feb 2006 14:07:59 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060209190759.GB9652 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com, aviro at redhat.com
References: <200602091009.16523.sgrubb at redhat.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200602091009.16523.sgrubb at redhat.com>
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
Cc: aviro at redhat.com
Subject: Re: git tree
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: 25658
X-UID: 48537
Status: RO
X-Status: ORC
X-KMail-EncryptionState: N
X-KMail-SignatureState: N
X-KMail-MDN-Sent:  

Hi Al,

Steve Grubb wrote:     [Thu Feb 09 2006, 10:09:16AM EST]
> >From Al:
> 
>        OK...  Untangling the mess around ppoll/unshare for backport to
> 2.6.15-based tree turns out to be just too messy.  Therefore,
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git/
> contains the tree based on Linus' current.  Branches:
>         * origin = mainline
>         * audit = ported stuff, that's where everything got to settle
> 
> Amy, I've moved 3 of 4 patches to current tree; please see if they
> are OK (the 3rd might be worth a look)

Looks good, except in 3rd patch fs/inotify.c should have:

#@@ -628,7 +628,7 @@ s32 inotify_add_watch(struct inotify_dev
# 		mask_add = 1;
# 
# 	/* don't let user-space set invalid bits: we don't want flags set */
#-	mask &= IN_ALL_EVENTS;
#+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
# 	if (unlikely(!mask)) {
# 		ret = -EINVAL;
# 		goto out;

Here's the full diff with this change:

diff --git a/fs/inotify.c b/fs/inotify.c
index 3041503..ab57df6 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -85,14 +85,18 @@ struct inotify_device {
 	wait_queue_head_t 	wq;		/* wait queue for i/o */
 	struct idr		idr;		/* idr mapping wd -> watch */
 	struct semaphore	sem;		/* protects this bad boy */
-	struct list_head 	events;		/* list of queued events */
 	struct list_head	watches;	/* list of watches */
 	atomic_t		count;		/* reference count */
+	u32			last_wd;	/* the last wd allocated */
+	/* userland consumer API */
+	struct list_head 	events;		/* list of queued events */
 	struct user_struct	*user;		/* user who opened this dev */
 	unsigned int		queue_size;	/* size of the queue (bytes) */
 	unsigned int		event_count;	/* number of pending events */
 	unsigned int		max_events;	/* maximum number of events */
-	u32			last_wd;	/* the last wd allocated */
+	/* kernel consumer API */
+	void (*callback)(struct inotify_event *, const char *, struct inode *,
+			 void *);		/* event callback */
 };
 
 /*
@@ -124,6 +128,7 @@ struct inotify_watch {
 	struct inode		*inode;	/* associated inode */
 	s32 			wd;	/* watch descriptor */
 	u32			mask;	/* event mask for this watch */
+	void		*callback_arg;	/* callback argument - kernel API */
 };
 
 #ifdef CONFIG_SYSCTL
@@ -175,8 +180,10 @@ static inline void get_inotify_dev(struc
 static inline void put_inotify_dev(struct inotify_device *dev)
 {
 	if (atomic_dec_and_test(&dev->count)) {
-		atomic_dec(&dev->user->inotify_devs);
-		free_uid(dev->user);
+		if (dev->user) {
+			atomic_dec(&dev->user->inotify_devs);
+			free_uid(dev->user);
+		}
 		idr_destroy(&dev->idr);
 		kfree(dev);
 	}
@@ -344,6 +351,24 @@ static void inotify_dev_event_dequeue(st
 }
 
 /*
+ * inotify_callback_event - notify kernel consumers of events
+ */
+static void inotify_callback_event(struct inotify_device *dev,
+				   struct inotify_watch *watch,
+				   u32 mask, u32 cookie, const char *name,
+				   struct inode *inode)
+{
+	struct inotify_event event;
+
+	event.wd = watch->wd;
+	event.mask = mask;
+	event.cookie = cookie;
+	event.len = 0; /* kernel consumers don't need length */
+
+	dev->callback(&event, name, inode, watch->callback_arg);
+}
+
+/*
  * inotify_dev_get_wd - returns the next WD for use by the given dev
  *
  * Callers must hold dev->sem.  This function can sleep.
@@ -387,12 +412,13 @@ static int find_inode(const char __user 
  * Both 'dev' and 'inode' (by way of nameidata) need to be pinned.
  */
 static struct inotify_watch *create_watch(struct inotify_device *dev,
-					  u32 mask, struct inode *inode)
+					  u32 mask, struct inode *inode,
+					  void *callback_arg)
 {
 	struct inotify_watch *watch;
 	int ret;
 
-	if (atomic_read(&dev->user->inotify_watches) >=
+	if (dev->user && atomic_read(&dev->user->inotify_watches) >=
 			inotify_max_user_watches)
 		return ERR_PTR(-ENOSPC);
 
@@ -408,6 +434,7 @@ static struct inotify_watch *create_watc
 
 	dev->last_wd = watch->wd;
 	watch->mask = mask;
+	watch->callback_arg = callback_arg;
 	atomic_set(&watch->count, 0);
 	INIT_LIST_HEAD(&watch->d_list);
 	INIT_LIST_HEAD(&watch->i_list);
@@ -425,7 +452,8 @@ static struct inotify_watch *create_watc
 	/* bump our own count, corresponding to our entry in dev->watches */
 	get_inotify_watch(watch);
 
-	atomic_inc(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_inc(&dev->user->inotify_watches);
 	atomic_inc(&inotify_watches);
 
 	return watch;
@@ -458,7 +486,8 @@ static void remove_watch_no_event(struct
 	list_del(&watch->i_list);
 	list_del(&watch->d_list);
 
-	atomic_dec(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_dec(&dev->user->inotify_watches);
 	atomic_dec(&inotify_watches);
 	idr_remove(&dev->idr, watch->wd);
 	put_inotify_watch(watch);
@@ -477,7 +506,10 @@ static void remove_watch_no_event(struct
  */
 static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev)
 {
-	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
+	if (dev->callback)
+		inotify_callback_event(dev, watch, IN_IGNORED, 0, NULL, NULL);
+	else
+		inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
 	remove_watch_no_event(watch, dev);
 }
 
@@ -490,7 +522,190 @@ static inline int inotify_inode_watched(
 	return !list_empty(&inode->inotify_watches);
 }
 
-/* Kernel API */
+/* Kernel consumer API */
+
+/**
+ * inotify_init - allocates and initializes an inotify device
+ * @callback: kernel consumer's event callback
+ */
+struct inotify_device *inotify_init(void (*callback)(struct inotify_event *,
+						     const char *,
+						     struct inode *, void *))
+{
+	struct inotify_device *dev;
+
+	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	if (unlikely(!dev))
+		return NULL;
+
+	idr_init(&dev->idr);
+	INIT_LIST_HEAD(&dev->events);
+	INIT_LIST_HEAD(&dev->watches);
+	init_waitqueue_head(&dev->wq);
+	sema_init(&dev->sem, 1);
+	dev->event_count = 0;
+	dev->queue_size = 0;
+	dev->max_events = inotify_max_queued_events;
+	dev->user = NULL;	/* set in sys_inotify_init */
+	dev->last_wd = 0;
+	dev->callback = callback;
+	atomic_set(&dev->count, 0);
+	get_inotify_dev(dev);
+
+	return dev;
+}
+EXPORT_SYMBOL_GPL(inotify_init);
+
+/**
+ * inotify_free - clean up and free an inotify device
+ * @dev: inotify device to free
+ */
+int inotify_free(struct inotify_device *dev)
+{
+	/*
+	 * Destroy all of the watches on this device.  Unfortunately, not very
+	 * pretty.  We cannot do a simple iteration over the list, because we
+	 * do not know the inode until we iterate to the watch.  But we need to
+	 * hold inode->inotify_sem before dev->sem.  The following works.
+	 */
+	while (1) {
+		struct inotify_watch *watch;
+		struct list_head *watches;
+		struct inode *inode;
+
+		down(&dev->sem);
+		watches = &dev->watches;
+		if (list_empty(watches)) {
+			up(&dev->sem);
+			break;
+		}
+		watch = list_entry(watches->next, struct inotify_watch, d_list);
+		get_inotify_watch(watch);
+		up(&dev->sem);
+
+		inode = watch->inode;
+		down(&inode->inotify_sem);
+		down(&dev->sem);
+		remove_watch_no_event(watch, dev);
+		up(&dev->sem);
+		up(&inode->inotify_sem);
+		put_inotify_watch(watch);
+	}
+
+	/* destroy all of the events on this device */
+	down(&dev->sem);
+	while (!list_empty(&dev->events))
+		inotify_dev_event_dequeue(dev);
+	up(&dev->sem);
+
+	/* free this device: the put matching the get in inotify_init() */
+	put_inotify_dev(dev);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(inotify_free);
+
+/**
+ * inotify_inotify_add_watch - add a watch to this inotify device
+ * @dev: inotify device
+ * @inode: inode to watch for events
+ * @mask: filesystem event mask
+ * @callback_arg - ptr to data that kernel consumer associates with this watch
+ *
+ * Caller must pin the inode in question, e.g. by calling path_lookup.
+ */
+s32 inotify_add_watch(struct inotify_device *dev, struct inode *inode,
+		      u32 mask, void *callback_arg)
+{
+	int mask_add = 0;
+	struct inotify_watch *watch, *old;
+	int ret;
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	if (mask & IN_MASK_ADD)
+		mask_add = 1;
+
+	/* don't let user-space set invalid bits: we don't want flags set */
+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
+	if (unlikely(!mask)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/*
+	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
+	 * are already watching.  We just update the mask and callback_arg and
+	 * return its wd.
+	 */
+	old = inode_find_dev(inode, dev);
+	if (unlikely(old)) {
+		if (mask_add)
+			old->mask |= mask;
+		else
+			old->mask = mask;
+		old->callback_arg = callback_arg;
+		ret = old->wd;
+		goto out;
+	}
+
+	watch = create_watch(dev, mask, inode, callback_arg);
+	if (unlikely(IS_ERR(watch))) {
+		ret = PTR_ERR(watch);
+		goto out;
+	}
+
+	/* Add the watch to the device's and the inode's list */
+	list_add(&watch->d_list, &dev->watches);
+	list_add(&watch->i_list, &inode->inotify_watches);
+	ret = watch->wd;
+
+out:
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(inotify_add_watch);
+
+/**
+ * inotify_ignore - remove a given wd from this inotify device
+ * @dev: inotify device
+ * @wd: watch descriptor to remove
+ */
+int inotify_ignore(struct inotify_device *dev, s32 wd)
+{
+	struct inotify_watch *watch;
+	struct inode *inode;
+
+	down(&dev->sem);
+	watch = idr_find(&dev->idr, wd);
+	if (unlikely(!watch)) {
+		up(&dev->sem);
+		return -EINVAL;
+	}
+	get_inotify_watch(watch);
+	inode = watch->inode;
+	up(&dev->sem);
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	/* make sure that we did not race */
+	watch = idr_find(&dev->idr, wd);
+	if (likely(watch))
+		remove_watch(watch, dev);
+
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	put_inotify_watch(watch);
+
+	return 0;
+
+}
+EXPORT_SYMBOL_GPL(inotify_ignore);
+
+/* Kernel producer API */
 
 /**
  * inotify_inode_queue_event - queue an event to all watches on this inode
@@ -498,9 +713,10 @@ static inline int inotify_inode_watched(
  * @mask: event mask describing this event
  * @cookie: cookie for synchronization, or zero
  * @name: filename, if any
+ * @cinode: child inode, used for events on directories
  */
 void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,
-			       const char *name)
+			       const char *name, struct inode *cinode)
 {
 	struct inotify_watch *watch, *next;
 
@@ -514,7 +730,12 @@ void inotify_inode_queue_event(struct in
 			struct inotify_device *dev = watch->dev;
 			get_inotify_watch(watch);
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, mask, cookie, name);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, mask,
+						       cookie, name, cinode);
+			else
+				inotify_dev_queue_event(dev, watch, mask,
+							cookie, name);
 			if (watch_mask & IN_ONESHOT)
 				remove_watch_no_event(watch, dev);
 			up(&dev->sem);
@@ -548,7 +769,8 @@ void inotify_dentry_parent_queue_event(s
 	if (inotify_inode_watched(inode)) {
 		dget(parent);
 		spin_unlock(&dentry->d_lock);
-		inotify_inode_queue_event(inode, mask, cookie, name);
+		inotify_inode_queue_event(inode, mask, cookie, name,
+					  dentry->d_inode);
 		dput(parent);
 	} else
 		spin_unlock(&dentry->d_lock);
@@ -631,7 +853,12 @@ void inotify_unmount_inodes(struct list_
 		list_for_each_entry_safe(watch, next_w, watches, i_list) {
 			struct inotify_device *dev = watch->dev;
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, IN_UNMOUNT,
+						       0, NULL, NULL);
+			else
+				inotify_dev_queue_event(dev, watch, IN_UNMOUNT,
+							0, NULL);
 			remove_watch(watch, dev);
 			up(&dev->sem);
 		}
@@ -757,83 +984,7 @@ static ssize_t inotify_read(struct file 
 
 static int inotify_release(struct inode *ignored, struct file *file)
 {
-	struct inotify_device *dev = file->private_data;
-
-	/*
-	 * Destroy all of the watches on this device.  Unfortunately, not very
-	 * pretty.  We cannot do a simple iteration over the list, because we
-	 * do not know the inode until we iterate to the watch.  But we need to
-	 * hold inode->inotify_sem before dev->sem.  The following works.
-	 */
-	while (1) {
-		struct inotify_watch *watch;
-		struct list_head *watches;
-		struct inode *inode;
-
-		down(&dev->sem);
-		watches = &dev->watches;
-		if (list_empty(watches)) {
-			up(&dev->sem);
-			break;
-		}
-		watch = list_entry(watches->next, struct inotify_watch, d_list);
-		get_inotify_watch(watch);
-		up(&dev->sem);
-
-		inode = watch->inode;
-		down(&inode->inotify_sem);
-		down(&dev->sem);
-		remove_watch_no_event(watch, dev);
-		up(&dev->sem);
-		up(&inode->inotify_sem);
-		put_inotify_watch(watch);
-	}
-
-	/* destroy all of the events on this device */
-	down(&dev->sem);
-	while (!list_empty(&dev->events))
-		inotify_dev_event_dequeue(dev);
-	up(&dev->sem);
-
-	/* free this device: the put matching the get in inotify_init() */
-	put_inotify_dev(dev);
-
-	return 0;
-}
-
-/*
- * inotify_ignore - remove a given wd from this inotify instance.
- *
- * Can sleep.
- */
-static int inotify_ignore(struct inotify_device *dev, s32 wd)
-{
-	struct inotify_watch *watch;
-	struct inode *inode;
-
-	down(&dev->sem);
-	watch = idr_find(&dev->idr, wd);
-	if (unlikely(!watch)) {
-		up(&dev->sem);
-		return -EINVAL;
-	}
-	get_inotify_watch(watch);
-	inode = watch->inode;
-	up(&dev->sem);
-
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	/* make sure that we did not race */
-	watch = idr_find(&dev->idr, wd);
-	if (likely(watch))
-		remove_watch(watch, dev);
-
-	up(&dev->sem);
-	up(&inode->inotify_sem);
-	put_inotify_watch(watch);
-
-	return 0;
+	return inotify_free(file->private_data);
 }
 
 static long inotify_ioctl(struct file *file, unsigned int cmd,
@@ -887,12 +1038,15 @@ asmlinkage long sys_inotify_init(void)
 		goto out_free_uid;
 	}
 
-	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	dev = inotify_init(NULL);
 	if (unlikely(!dev)) {
 		ret = -ENOMEM;
 		goto out_free_uid;
 	}
 
+	dev->user = user;
+	atomic_inc(&user->inotify_devs);
+
 	filp->f_op = &inotify_fops;
 	filp->f_vfsmnt = mntget(inotify_mnt);
 	filp->f_dentry = dget(inotify_mnt->mnt_root);
@@ -901,20 +1055,6 @@ asmlinkage long sys_inotify_init(void)
 	filp->f_flags = O_RDONLY;
 	filp->private_data = dev;
 
-	idr_init(&dev->idr);
-	INIT_LIST_HEAD(&dev->events);
-	INIT_LIST_HEAD(&dev->watches);
-	init_waitqueue_head(&dev->wq);
-	sema_init(&dev->sem, 1);
-	dev->event_count = 0;
-	dev->queue_size = 0;
-	dev->max_events = inotify_max_queued_events;
-	dev->user = user;
-	dev->last_wd = 0;
-	atomic_set(&dev->count, 0);
-
-	get_inotify_dev(dev);
-	atomic_inc(&user->inotify_devs);
 	fd_install(fd, filp);
 
 	return fd;
@@ -928,13 +1068,11 @@ out_put_fd:
 
 asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
 {
-	struct inotify_watch *watch, *old;
 	struct inode *inode;
 	struct inotify_device *dev;
 	struct nameidata nd;
 	struct file *filp;
 	int ret, fput_needed;
-	int mask_add = 0;
 	unsigned flags = 0;
 
 	filp = fget_light(fd, &fput_needed);
@@ -960,46 +1098,7 @@ asmlinkage long sys_inotify_add_watch(in
 	inode = nd.dentry->d_inode;
 	dev = filp->private_data;
 
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	if (mask & IN_MASK_ADD)
-		mask_add = 1;
-
-	/* don't let user-space set invalid bits: we don't want flags set */
-	mask &= IN_ALL_EVENTS | IN_ONESHOT;
-	if (unlikely(!mask)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	/*
-	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
-	 * are already watching.  We just update the mask and return its wd.
-	 */
-	old = inode_find_dev(inode, dev);
-	if (unlikely(old)) {
-		if (mask_add)
-			old->mask |= mask;
-		else
-			old->mask = mask;
-		ret = old->wd;
-		goto out;
-	}
-
-	watch = create_watch(dev, mask, inode);
-	if (unlikely(IS_ERR(watch))) {
-		ret = PTR_ERR(watch);
-		goto out;
-	}
-
-	/* Add the watch to the device's and the inode's list */
-	list_add(&watch->d_list, &dev->watches);
-	list_add(&watch->i_list, &inode->inotify_watches);
-	ret = watch->wd;
-out:
-	up(&dev->sem);
-	up(&inode->inotify_sem);
+	ret = inotify_add_watch(dev, inode, mask, NULL);
 	path_release(&nd);
 fput_and_out:
 	fput_light(filp, fput_needed);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 94919c3..606b875 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -35,16 +35,18 @@ static inline void fsnotify_move(struct 
 
 	if (isdir)
 		isdir = IN_ISDIR;
-	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
-	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
+	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, cookie,
+				  old_name, NULL);
+	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie,
+				  new_name, source);
 
 	if (target) {
-		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
+		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL,NULL);
 		inotify_inode_is_dead(target);
 	}
 
 	if (source) {
-		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
+		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);
@@ -66,7 +68,7 @@ static inline void fsnotify_nameremove(s
  */
 static inline void fsnotify_inoderemove(struct inode *inode)
 {
-	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);
+	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL);
 	inotify_inode_is_dead(inode);
 }
 
@@ -76,7 +78,8 @@ static inline void fsnotify_inoderemove(
 static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 {
 	inode_dir_notify(inode, DN_CREATE);
-	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name);
+	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
+				  dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -87,7 +90,7 @@ static inline void fsnotify_mkdir(struct
 {
 	inode_dir_notify(inode, DN_CREATE);
 	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, 
-				  dentry->d_name.name);
+				  dentry->d_name.name, dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -104,7 +107,7 @@ static inline void fsnotify_access(struc
 
 	dnotify_parent(dentry, DN_ACCESS);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -120,7 +123,7 @@ static inline void fsnotify_modify(struc
 
 	dnotify_parent(dentry, DN_MODIFY);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -135,7 +138,7 @@ static inline void fsnotify_open(struct 
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);	
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -153,7 +156,7 @@ static inline void fsnotify_close(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -168,7 +171,7 @@ static inline void fsnotify_xattr(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -215,7 +218,7 @@ static inline void fsnotify_change(struc
 	if (in_mask) {
 		if (S_ISDIR(inode->i_mode))
 			in_mask |= IN_ISDIR;
-		inotify_inode_queue_event(inode, in_mask, 0, NULL);
+		inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL);
 		inotify_dentry_parent_queue_event(dentry, in_mask, 0,
 						  dentry->d_name.name);
 	}
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index 267c88b..2a8d1bd 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -14,6 +14,9 @@
  *
  * When you are watching a directory, you will receive the filename for events
  * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ *
+ * When using inotify from the kernel, len will always be zero.  Instead you
+ * should check the path for non-NULL in your callback.
  */
 struct inotify_event {
 	__s32		wd;		/* watch descriptor */
@@ -71,8 +74,19 @@ struct inotify_event {
 
 #ifdef CONFIG_INOTIFY
 
+/* Kernel consumer API */
+
+extern struct inotify_device *inotify_init(void (*)(struct inotify_event *,
+						    const char *,
+						    struct inode *, void *));
+extern int inotify_free(struct inotify_device *);
+extern __s32 inotify_add_watch(struct inotify_device *, struct inode *, __u32,
+			       void *);
+extern int inotify_ignore(struct inotify_device *, __s32);
+
+/* Kernel producer API */
 extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
-				      const char *);
+				      const char *, struct inode *);
 extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
 					      const char *);
 extern void inotify_unmount_inodes(struct list_head *);
@@ -81,6 +95,7 @@ extern u32 inotify_get_cookie(void);
 
 #else
 
+/* Kernel producer API stubs */
 static inline void inotify_inode_queue_event(struct inode *inode,
 					     __u32 mask, __u32 cookie,
 					     const char *filename)

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-no-rules-speedup.patch:
 arch/i386/kernel/ptrace.c    |    6 ++--
 arch/ia64/kernel/ptrace.c    |    4 +-
 arch/mips/kernel/ptrace.c    |    4 +-
 arch/powerpc/kernel/ptrace.c |    4 +-
 arch/s390/kernel/ptrace.c    |    4 +-
 arch/sparc64/kernel/ptrace.c |    4 +-
 arch/um/kernel/ptrace.c      |    2 -
 arch/x86_64/kernel/ptrace.c  |    4 +-
 include/linux/audit.h        |    3 ++
 kernel/auditfilter.c         |   13 ++++++++
 kernel/auditsc.c             |   64 +++++++++++++++++++++++++++----------------
 11 files changed, 73 insertions(+), 39 deletions(-)

--- NEW FILE linux-2.6-audit-no-rules-speedup.patch ---
diff -urP linux-2.6.15.x86_64.orig/arch/i386/kernel/ptrace.c linux-2.6.15.x86_64/arch/i386/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/i386/kernel/ptrace.c	2006-02-16 15:55:06.000000000 -0500
+++ linux-2.6.15.x86_64/arch/i386/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -670,7 +670,7 @@
 		secure_computing(regs->orig_eax);
 
 	if (unlikely(current->audit_context)) {
-		if (entryexit)
+		if (n_audit_rules && entryexit)
 			audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
 						regs->eax);
 		/* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
@@ -719,14 +719,14 @@
 	}
 	ret = is_sysemu;
 out:
-	if (unlikely(current->audit_context) && !entryexit)
+	if (unlikely(current->audit_context) && n_audit_rules && !entryexit)
 		audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
 				    regs->ebx, regs->ecx, regs->edx, regs->esi);
 	if (ret == 0)
 		return 0;
 
 	regs->orig_eax = -1; /* force skip of syscall restarting */
-	if (unlikely(current->audit_context))
+	if (unlikely(current->audit_context) && n_audit_rules)
 		audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
 				regs->eax);
 	return 1;
diff -urP linux-2.6.15.x86_64.orig/arch/ia64/kernel/ptrace.c linux-2.6.15.x86_64/arch/ia64/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/ia64/kernel/ptrace.c	2006-02-16 15:55:10.000000000 -0500
+++ linux-2.6.15.x86_64/arch/ia64/kernel/ptrace.c	2006-02-16 15:38:37.000000000 -0500
@@ -1632,7 +1632,7 @@
 	    && (current->ptrace & PT_PTRACED))
 		syscall_trace();
 
-	if (unlikely(current->audit_context)) {
+	if (unlikely(current->audit_context) && n_audit_rules) {
 		long syscall;
 		int arch;
 
@@ -1656,7 +1656,7 @@
 		     long arg4, long arg5, long arg6, long arg7,
 		     struct pt_regs regs)
 {
-	if (unlikely(current->audit_context)) {
+	if (unlikely(current->audit_context) && n_audit_rules) {
 		int success = AUDITSC_RESULT(regs.r10);
 		long result = regs.r8;
 
diff -urP linux-2.6.15.x86_64.orig/arch/mips/kernel/ptrace.c linux-2.6.15.x86_64/arch/mips/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/mips/kernel/ptrace.c	2006-02-16 15:55:11.000000000 -0500
+++ linux-2.6.15.x86_64/arch/mips/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -468,7 +468,7 @@
  */
 asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
-	if (unlikely(current->audit_context) && entryexit)
+	if (unlikely(current->audit_context) && n_audit_rules && entryexit)
 		audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]),
 		                   regs->regs[2]);
 
@@ -492,7 +492,7 @@
 		current->exit_code = 0;
 	}
  out:
-	if (unlikely(current->audit_context) && !entryexit)
+	if (unlikely(current->audit_context) && n_audit_rules && !entryexit)
 		audit_syscall_entry(current, audit_arch(), regs->regs[2],
 				    regs->regs[4], regs->regs[5],
 				    regs->regs[6], regs->regs[7]);
diff -urP linux-2.6.15.x86_64.orig/arch/powerpc/kernel/ptrace.c linux-2.6.15.x86_64/arch/powerpc/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/powerpc/kernel/ptrace.c	2006-02-16 15:55:12.000000000 -0500
+++ linux-2.6.15.x86_64/arch/powerpc/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -537,7 +537,7 @@
 	    && (current->ptrace & PT_PTRACED))
 		do_syscall_trace();
 
-	if (unlikely(current->audit_context))
+	if (unlikely(current->audit_context) && n_audit_rules)
 		audit_syscall_entry(current,
 #ifdef CONFIG_PPC32
 				    AUDIT_ARCH_PPC,
@@ -555,7 +555,7 @@
 	secure_computing(regs->gpr[0]);
 #endif
 
-	if (unlikely(current->audit_context))
+	if (unlikely(current->audit_context) && n_audit_rules)
 		audit_syscall_exit(current,
 				   (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
 				   regs->result);
diff -urP linux-2.6.15.x86_64.orig/arch/s390/kernel/ptrace.c linux-2.6.15.x86_64/arch/s390/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/s390/kernel/ptrace.c	2006-02-16 15:55:09.000000000 -0500
+++ linux-2.6.15.x86_64/arch/s390/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -733,7 +733,7 @@
 asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
-	if (unlikely(current->audit_context) && entryexit)
+	if (unlikely(current->audit_context) && n_audit_rules && entryexit)
 		audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
 
 	if (!test_thread_flag(TIF_SYSCALL_TRACE))
@@ -760,7 +760,7 @@
 		current->exit_code = 0;
 	}
  out:
-	if (unlikely(current->audit_context) && !entryexit)
+	if (unlikely(current->audit_contex) && n_audit_rules && !entryexit)
 		audit_syscall_entry(current, 
 				    test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
 				    regs->gprs[2], regs->orig_gpr2, regs->gprs[3],
diff -urP linux-2.6.15.x86_64.orig/arch/sparc64/kernel/ptrace.c linux-2.6.15.x86_64/arch/sparc64/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/sparc64/kernel/ptrace.c	2006-02-16 15:55:05.000000000 -0500
+++ linux-2.6.15.x86_64/arch/sparc64/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -620,7 +620,7 @@
 	/* do the secure computing check first */
 	secure_computing(regs->u_regs[UREG_G1]);
 
-	if (unlikely(current->audit_context) && syscall_exit_p) {
+	if (unlikely(current->audit_context) && n_audit_rules && syscall_exit_p) {
 		unsigned long tstate = regs->tstate;
 		int result = AUDITSC_SUCCESS;
 
@@ -650,7 +650,7 @@
 	}
 
 out:
-	if (unlikely(current->audit_context) && !syscall_exit_p)
+	if (unlikely(current->audit_context) && n_audit_rules && !syscall_exit_p)
 		audit_syscall_entry(current,
 				    (test_thread_flag(TIF_32BIT) ?
 				     AUDIT_ARCH_SPARC :
diff -urP linux-2.6.15.x86_64.orig/arch/um/kernel/ptrace.c linux-2.6.15.x86_64/arch/um/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/um/kernel/ptrace.c	2006-02-16 15:55:09.000000000 -0500
+++ linux-2.6.15.x86_64/arch/um/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -267,7 +267,7 @@
 	int is_singlestep = (current->ptrace & PT_DTRACE) && entryexit;
 	int tracesysgood;
 
-	if (unlikely(current->audit_context)) {
+	if (unlikely(current->audit_context) && n_audit_rules) {
 		if (!entryexit)
 			audit_syscall_entry(current,
                                             HOST_AUDIT_ARCH,
diff -urP linux-2.6.15.x86_64.orig/arch/x86_64/kernel/ptrace.c linux-2.6.15.x86_64/arch/x86_64/kernel/ptrace.c
--- linux-2.6.15.x86_64.orig/arch/x86_64/kernel/ptrace.c	2006-02-16 15:55:06.000000000 -0500
+++ linux-2.6.15.x86_64/arch/x86_64/kernel/ptrace.c	2006-02-16 15:26:43.000000000 -0500
@@ -603,7 +603,7 @@
 	    && (current->ptrace & PT_PTRACED))
 		syscall_trace(regs);
 
-	if (unlikely(current->audit_context)) {
+	if (unlikely(current->audit_context) && n_audit_rules) {
 		if (test_thread_flag(TIF_IA32)) {
 			audit_syscall_entry(current, AUDIT_ARCH_I386,
 					    regs->orig_rax,
@@ -620,7 +620,7 @@
 
 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
 {
-	if (unlikely(current->audit_context))
+	if (unlikely(current->audit_context) && n_audit_rules)
 		audit_syscall_exit(current, AUDITSC_RESULT(regs->rax), regs->rax);
 
 	if ((test_thread_flag(TIF_SYSCALL_TRACE)
diff -urP linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-02-16 15:55:37.000000000 -0500
+++ linux-2.6.15.x86_64/include/linux/audit.h	2006-02-16 16:34:15.000000000 -0500
@@ -83,6 +83,7 @@
 #define AUDIT_CONFIG_CHANGE	1305	/* Audit system configuration change */
 #define AUDIT_SOCKADDR		1306	/* sockaddr copied as syscall arg */
 #define AUDIT_CWD		1307	/* Current working directory */
+#define AUDIT_SYSCALL_PARTIAL	1310	/* Partial syscall event */
 
 #define AUDIT_AVC		1400	/* SE Linux avc denial or grant */
 #define AUDIT_SELINUX_ERR	1401	/* Internal SE Linux Errors */
@@ -370,6 +371,7 @@
 extern int audit_filter_type(int type);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
 				 void *data, size_t datasz, uid_t loginuid);
+extern int n_audit_rules;
 #else
 #define audit_log(c,g,t,f,...) do { ; } while (0)
 #define audit_log_start(c,g,t) ({ NULL; })
@@ -380,6 +382,7 @@
 #define audit_log_untrustedstring(a,s) do { ; } while (0)
 #define audit_log_d_path(b,p,d,v) do { ; } while (0)
 #define audit_panic(m) do { ; } while (0)
+#define n_audit_rules 0
 #endif
 #endif
 #endif
diff -urP linux-2.6.15.x86_64.orig/kernel/auditfilter.c linux-2.6.15.x86_64/kernel/auditfilter.c
--- linux-2.6.15.x86_64.orig/kernel/auditfilter.c	2006-02-16 15:55:47.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditfilter.c	2006-02-16 16:29:43.000000000 -0500
@@ -42,6 +42,9 @@
 #endif
 };
 
+/* number of audit rules */
+int n_audit_rules = 0;
+
 static inline void audit_free_watch(struct audit_watch *watch)
 {
 	kfree(watch->path);
@@ -419,11 +422,16 @@
 
 	if (entry->rule.watch)
 		audit_add_watch(&entry->rule);
+	/* If either of these, don't count towards total */
+	else if (entry->rule.listnr == AUDIT_FILTER_USER ||
+		 entry->rule.listnr == AUDIT_FILTER_TYPE)
+		n_audit_rules--;
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
 		list_add_rcu(&entry->list, list);
 	} else {
 		list_add_tail_rcu(&entry->list, list);
 	}
+	n_audit_rules++;
 
 	return 0;
 }
@@ -456,7 +464,12 @@
 			list_del_rcu(&e->list);
 			if (e->rule.watch)
 				audit_detach_watch(&e->rule);
+			/* If either of these, don't count towards total */
+			else if (entry->rule.listnr == AUDIT_FILTER_USER ||
+				 entry->rule.listnr == AUDIT_FILTER_TYPE)
+				n_audit_rules++;
 			call_rcu(&e->rcu, audit_free_rule_rcu);
+			n_audit_rules--;
 			return 0;
 		}
 	}
diff -urP linux-2.6.15.x86_64.orig/kernel/auditsc.c linux-2.6.15.x86_64/kernel/auditsc.c
--- linux-2.6.15.x86_64.orig/kernel/auditsc.c	2006-02-16 15:55:47.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditsc.c	2006-02-16 17:15:45.000000000 -0500
@@ -569,37 +569,55 @@
 	struct audit_aux_data *aux;
 	const char *tty;
 
-	ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL);
+	ab = audit_log_start(context, gfp_mask,
+			n_audit_rules ? AUDIT_SYSCALL :	AUDIT_SYSCALL_PARTIAL);
 	if (!ab)
 		return;		/* audit_panic has been called */
-	audit_log_format(ab, "arch=%x syscall=%d",
+	if (current->signal->tty && current->signal->tty->name)
+		tty = current->signal->tty->name;
+	else
+		tty = "(none)";
+	if (n_audit_rules) {
+		audit_log_format(ab, "arch=%x syscall=%d",
 			 context->arch, context->major);
+	}
 	if (context->personality != PER_LINUX)
 		audit_log_format(ab, " per=%lx", context->personality);
 	if (context->return_valid)
 		audit_log_format(ab, " success=%s exit=%ld", 
-				 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
+			 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
 				 context->return_code);
-	if (current->signal->tty && current->signal->tty->name)
-		tty = current->signal->tty->name;
-	else
-		tty = "(none)";
-	audit_log_format(ab,
-		  " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
-		  " pid=%d auid=%u uid=%u gid=%u"
-		  " euid=%u suid=%u fsuid=%u"
-		  " egid=%u sgid=%u fsgid=%u tty=%s",
-		  context->argv[0],
-		  context->argv[1],
-		  context->argv[2],
-		  context->argv[3],
-		  context->name_count,
-		  context->pid,
-		  context->loginuid,
-		  context->uid,
-		  context->gid,
-		  context->euid, context->suid, context->fsuid,
-		  context->egid, context->sgid, context->fsgid, tty);
+	if (n_audit_rules) {
+		audit_log_format(ab,
+			  " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
+			  " pid=%d auid=%u uid=%u gid=%u"
+			  " euid=%u suid=%u fsuid=%u"
+			  " egid=%u sgid=%u fsgid=%u tty=%s",
+			  context->argv[0],
+			  context->argv[1],
+			  context->argv[2],
+			  context->argv[3],
+			  context->name_count,
+			  context->pid,
+			  context->loginuid,
+			  context->uid,
+			  context->gid,
+			  context->euid, context->suid, context->fsuid,
+			  context->egid, context->sgid, context->fsgid, tty);
+	} else {
+		audit_log_format(ab,
+			  " items=%d"
+			  " pid=%d auid=%u uid=%u gid=%u"
+			  " euid=%u suid=%u fsuid=%u"
+			  " egid=%u sgid=%u fsgid=%u tty=%s",
+			  context->name_count,
+			  context->pid,
+			  context->loginuid,
+			  context->uid,
+			  context->gid,
+			  context->euid, context->suid, context->fsuid,
+			  context->egid, context->sgid, context->fsgid, tty);
+	}
 	audit_log_task_info(ab, gfp_mask);
 	audit_log_end(ab);
 

linux-2.6-audit-promisc.patch:
 include/linux/audit.h |    7 ++++++-
 net/core/dev.c        |    7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-audit-promisc.patch ---
>From linux-audit-bounces at redhat.com Sat Dec  3 13:39:07 2005
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 03 Dec 2005 13:39:07 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbW-0003Ra-S4 for dwmw2 at baythorne.infradead.org; Sat, 03 Dec 2005
	13:39:07 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbU-0006dw-2W for dwmw2 at infradead.org; Sat, 03 Dec 2005 13:39:06 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 18B39732FF; Sat,
	 3 Dec 2005 08:39:03 -0500 (EST)
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 jB3Dd1du018704; Sat, 3 Dec 2005 08:39:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	jB3Dd1V16833; Sat, 3 Dec 2005 08:39:01 -0500
Received: from vpn83-123.boston.redhat.com (vpn83-123.boston.redhat.com
	[172.16.83.123]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	jB3Dd0EW010094;  Sat, 3 Dec 2005 08:39:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
To: Linux Audit Discussion <linux-audit at redhat.com>
Date: Sat, 3 Dec 2005 08:39:35 -0500
User-Agent: KMail/1.7.2
MIME-Version: 1.0
Content-Type: Multipart/Mixed; boundary="Boundary-00=_XAakD2Qt0krjnKY"
Message-Id: <200512030839.35344.sgrubb at redhat.com>
X-loop: linux-audit at redhat.com
Cc: lspp-list <redhat-lspp at redhat.com>
Subject: [PATCH] promiscuous mode
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Hi,

When a network interface goes into promiscuous mode, its an important security 
issue. The attached patch is intended to capture that action and send an 
event to the audit system.

The patch carves out a new block of numbers for kernel detected anomalies. 
These are events that may indicate suspicious activity. Other examples of 
potential kernel anomalies would be: exceeding disk quota, rlimit violations, 
changes to syscall entry table.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/x-diff; charset="us-ascii"; name="linux-2.6.14-audit-promiscuous.patch"
Content-Disposition: attachment; filename="linux-2.6.14-audit-promiscuous.patch"
Content-Transfer-Encoding: 8bit

diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h
--- linux-2.6.14.orig/include/linux/audit.h	2005-12-02 15:28:34.000000000 -0500
+++ linux-2.6.14/include/linux/audit.h	2005-12-02 15:28:22.000000000 -0500
@@ -35,7 +35,8 @@
  * 1400 - 1499 SE Linux use
  * 1500 - 1599 kernel LSPP events
  * 1600 - 1699 kernel crypto events
- * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 1700 - 1799 kernel anomaly records
+ * 1800 - 1999 future kernel use (maybe integrity labels and related events)
  * 2000 is for otherwise unclassified kernel audit messages (legacy)
  * 2001 - 2099 unused (kernel)
  * 2100 - 2199 user space anomaly records
@@ -87,6 +88,10 @@
 #define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */
 #define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */
 
+#define AUDIT_FIRST_KERN_ANOM_MSG   1700
+#define AUDIT_LAST_KERN_ANOM_MSG    1799
+#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
+
 #define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
 
 /* Rule flags */
diff -urp linux-2.6.14.orig/net/core/dev.c linux-2.6.14/net/core/dev.c
--- linux-2.6.14.orig/net/core/dev.c	2005-12-02 14:22:10.000000000 -0500
+++ linux-2.6.14/net/core/dev.c	2005-12-02 15:23:27.000000000 -0500
@@ -114,6 +114,7 @@
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
 #include <asm/current.h>
+#include <linux/audit.h>
 
 /*
  *	The list of packet types we will receive (as opposed to discard)
@@ -2121,6 +2122,12 @@ void dev_set_promiscuity(struct net_devi
 		printk(KERN_INFO "device %s %s promiscuous mode\n",
 		       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
 		       					       "left");
+		audit_log(current->audit_context, GFP_ATOMIC,
+			AUDIT_ANOM_PROMISCUOUS,
+			"dev=%s prom=%d old_prom=%d auid=%u",
+			dev->name, (dev->flags & IFF_PROMISC),
+			(old_flags & IFF_PROMISC),
+			audit_get_loginuid(current->audit_context)); 
 	}
 }
 

--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
--Boundary-00=_XAakD2Qt0krjnKY--

linux-2.6-audit-rule-log.patch:
 include/linux/audit.h |    2 +-
 kernel/auditfilter.c  |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-audit-rule-log.patch ---
diff -ur linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-02-14 10:50:56.000000000 -0500
+++ linux-2.6.15.x86_64/include/linux/audit.h	2006-02-14 10:51:41.000000000 -0500
@@ -246,7 +246,7 @@
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
 	__u32		field_count;
-	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
 	__u32		fields[AUDIT_MAX_FIELDS];
 	__u32		values[AUDIT_MAX_FIELDS];
 	__u32		fieldflags[AUDIT_MAX_FIELDS];
diff -ur linux-2.6.15.x86_64.orig/kernel/auditfilter.c linux-2.6.15.x86_64/kernel/auditfilter.c
--- linux-2.6.15.x86_64.orig/kernel/auditfilter.c	2006-02-14 10:51:25.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditfilter.c	2006-02-14 10:52:54.000000000 -0500
@@ -586,10 +586,11 @@
 
 		err = audit_add_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u added an audit rule\n", loginuid);
-		else {
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u add rule to list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
+		if (err) {
 			if (entry->rule.watch)
 				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
@@ -606,9 +607,10 @@
 
 		err = audit_del_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u removed an audit rule\n", loginuid);
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u remove rule from list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
 		if (entry->rule.watch)
 			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);

linux-2.6-audit-string-1.patch:
 include/linux/audit.h       |   31 ++
 kernel/audit.c              |   19 +
 kernel/audit.h              |   23 +-
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++-----------
 kernel/auditsc.c            |   50 ++--
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

--- NEW FILE linux-2.6-audit-string-1.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:05:27 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; Tue, 07 Feb 2006 12:05:54 -0500
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 k17H5rQo013224;
	Tue, 7 Feb 2006 12:05:53 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5o125027;
	Tue, 7 Feb 2006 12:05:50 -0500
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 k17H5jmt006474;
	Tue, 7 Feb 2006 12:05:45 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 4C2D472F6F; Tue,  7 Feb 2006 12:05:45 -0500 (EST)
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
	k17H5hnh005461 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:05:43 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5g124983
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:42 -0500
Received: from ccerelbas04.cce.hp.com (ccerelbas04.cce.hp.com [161.114.21.107])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H5fMr025186
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:41 -0500
Received: from ccerelint01.cce.cpqcorp.net (ccerelint01.cce.cpqcorp.net
	[16.110.74.103])
	by ccerelbas04.cce.hp.com (Postfix) with ESMTP id 0523834129
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by ccerelint01.cce.cpqcorp.net (Postfix) with ESMTP id A3CB134021
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 4289738448A2; Tue,  7 Feb 2006 12:05:27 -0500 (EST)
Date: Tue, 7 Feb 2006 12:05:27 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170527.GB2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190231.GB24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190231.GB24489 at zk3.dec.com>
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: Re: [PATCH 1/2] audit string fields interface + consumer
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: 32646
X-UID: 48007

Updated patch to dynamically allocate audit rule fields in kernel's
internal representation.  Added unlikely() calls for testing memory
allocation result.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:02:31PM EST]
> Modify audit's kernel-userspace interface to allow the specification
> of string fields in audit rules.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h       |   31 +++
 kernel/audit.c              |   19 ++
 kernel/audit.h              |   23 ++
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++----------
 kernel/auditsc.c            |   50 ++---
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

b5d36f87ed2ce86a306e3ae709805e892211f870
diff --git a/include/linux/audit.h b/include/linux/audit.h
index a485639..c208554 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -50,15 +50,18 @@
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
-#define AUDIT_LIST		1002	/* List syscall filtering rules */
-#define AUDIT_ADD		1003	/* Add syscall filtering rule */
-#define AUDIT_DEL		1004	/* Delete syscall filtering rule */
+#define AUDIT_LIST		1002	/* List syscall rules -- deprecated */
+#define AUDIT_ADD		1003	/* Add syscall rule -- deprecated */
+#define AUDIT_DEL		1004	/* Delete syscall rule -- deprecated */
 #define AUDIT_USER		1005	/* Message from userspace -- deprecated */
 #define AUDIT_LOGIN		1006	/* Define the login id and information */
 #define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
 #define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
 #define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
 #define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
+#define AUDIT_ADD_RULE		1011	/* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012	/* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013	/* List syscall filtering rules */
 
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
@@ -229,6 +232,26 @@ struct audit_status {
 	__u32		backlog;	/* messages waiting in queue */
 };
 
+/* audit_rule_data supports filter rules with both integer and string
+ * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
+ * AUDIT_LIST_RULES requests.
+ */
+struct audit_rule_data {
+	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
+	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
+	__u32		field_count;
+	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		fields[AUDIT_MAX_FIELDS];
+	__u32		values[AUDIT_MAX_FIELDS];
+	__u32		fieldflags[AUDIT_MAX_FIELDS];
+	__u32		buflen;	/* total length of string fields */
+	char		buf[0];	/* string fields buffer */
+};
+
+/* audit_rule is supported to maintain backward compatibility with
+ * userspace.  It supports integer fields only and corresponds to
+ * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests.
+ */
 struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
@@ -340,7 +363,7 @@ extern void		    audit_log_d_path(struct
 extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
 extern int audit_filter_type(int type);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
-				 void *data, uid_t loginuid);
+				 void *data, size_t datasz, uid_t loginuid);
 #else
 #define audit_log(c,g,t,f,...) do { ; } while (0)
 #define audit_log_start(c,g,t) ({ NULL; })
diff --git a/kernel/audit.c b/kernel/audit.c
index d95efd6..bdda766 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -52,6 +52,7 @@
 #include <linux/audit.h>
 
 #include <net/sock.h>
+#include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 
@@ -361,9 +362,12 @@ static int audit_netlink_ok(kernel_cap_t
 	switch (msg_type) {
 	case AUDIT_GET:
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 	case AUDIT_SET:
 	case AUDIT_ADD:
+	case AUDIT_ADD_RULE:
 	case AUDIT_DEL:
+	case AUDIT_DEL_RULE:
 	case AUDIT_SIGNAL_INFO:
 		if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL))
 			err = -EPERM;
@@ -470,12 +474,23 @@ static int audit_receive_msg(struct sk_b
 		break;
 	case AUDIT_ADD:
 	case AUDIT_DEL:
-		if (nlh->nlmsg_len < sizeof(struct audit_rule))
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule))
 			return -EINVAL;
 		/* fallthrough */
 	case AUDIT_LIST:
 		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
-					   uid, seq, data, loginuid);
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
+		break;
+	case AUDIT_ADD_RULE:
+	case AUDIT_DEL_RULE:
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule_data))
+			return -EINVAL;
+		/* fallthrough */
+	case AUDIT_LIST_RULES:
+		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
 		break;
 	case AUDIT_SIGNAL_INFO:
 		sig_data.uid = audit_sig_uid;
diff --git a/kernel/audit.h b/kernel/audit.h
index 7643e46..4b602cd 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,10 +52,27 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_field {
+	u32			type;
+	u32			val;
+	u32			op;
+};
+
+struct audit_krule {
+	int			vers_ops;
+	u32			flags;
+	u32			listnr;
+	u32			action;
+	u32			mask[AUDIT_BITMASK_SIZE];
+	u32			buflen; /* for data alloc on list rules */
+	u32			field_count;
+	struct audit_field	*fields;
+};
+
 struct audit_entry {
-	struct list_head  list;
-	struct rcu_head   rcu;
-	struct audit_rule rule;
+	struct list_head	list;
+	struct rcu_head		rcu;
+	struct audit_krule	rule;
 };
 
 
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index a3a3275..5735acd 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -40,52 +40,279 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
-/* Copy rule from user-space to kernel-space.  Called from 
- * audit_add_rule during AUDIT_ADD. */
-static inline int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
+static inline void audit_free_rule(struct audit_entry *e)
 {
+	kfree(e->rule.fields);
+	kfree(e);
+}
+
+static inline void audit_free_rule_rcu(struct rcu_head *head)
+{
+	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
+	audit_free_rule(e);
+}
+
+/* Unpack a filter field's string representation from user-space
+ * buffer. */
+static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
+{
+	char *str;
+
+	if (!*bufp || (len == 0) || (len > *remain))
+		return ERR_PTR(-EINVAL);
+
+	/* Of the currently implemented string fields, PATH_MAX
+	 * defines the longest valid length.
+	 */
+	if (len > PATH_MAX)
+		return ERR_PTR(-ENAMETOOLONG);
+
+	str = kmalloc(len + 1, GFP_KERNEL);
+	if (unlikely(!str))
+		return ERR_PTR(-ENOMEM);
+
+	memcpy(str, *bufp, len);
+	str[len] = 0;
+	*bufp += len;
+	*remain -= len;
+
+	return str;
+}
+
+/* Common user-space to kernel rule translation. */
+static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
+{
+	unsigned listnr;
+	struct audit_entry *entry;
+	struct audit_field *fields;
+	int i, err;
+
+	err = -EINVAL;
+	listnr = rule->flags & ~AUDIT_FILTER_PREPEND;
+	switch(listnr) {
+	default:
+		goto exit_err;
+	case AUDIT_FILTER_USER:
+	case AUDIT_FILTER_TYPE:
+#ifdef CONFIG_AUDITSYSCALL
+	case AUDIT_FILTER_ENTRY:
+	case AUDIT_FILTER_EXIT:
+	case AUDIT_FILTER_TASK:
+#endif
+		;
+	}
+	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE &&
+	    rule->action != AUDIT_ALWAYS)
+		goto exit_err;
+	if (rule->field_count > AUDIT_MAX_FIELDS)
+		goto exit_err;
+
+	err = -ENOMEM;
+	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+	if (unlikely(!entry))
+		goto exit_err;
+	fields = kmalloc(sizeof(*fields) * rule->field_count, GFP_KERNEL);
+	if (unlikely(!fields)) {
+		kfree(entry);
+		goto exit_err;
+	}
+
+	memset(&entry->rule, 0, sizeof(struct audit_krule));
+	memset(fields, 0, sizeof(struct audit_field));
+
+	entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND;
+	entry->rule.listnr = listnr;
+	entry->rule.action = rule->action;
+	entry->rule.field_count = rule->field_count;
+	entry->rule.fields = fields;
+
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
+		entry->rule.mask[i] = rule->mask[i];
+
+	return entry;
+
+exit_err:
+	return ERR_PTR(err);
+}
+
+/* Translate struct audit_rule to kernel's rule respresentation.
+ * Exists for backward compatibility with userspace. */
+static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
+{
+	struct audit_entry *entry;
+	int err = 0;
 	int i;
 
-	if (s->action != AUDIT_NEVER
-	    && s->action != AUDIT_POSSIBLE
-	    && s->action != AUDIT_ALWAYS)
-		return -1;
-	if (s->field_count < 0 || s->field_count > AUDIT_MAX_FIELDS)
-		return -1;
-	if ((s->flags & ~AUDIT_FILTER_PREPEND) >= AUDIT_NR_FILTERS)
-		return -1;
-
-	d->flags	= s->flags;
-	d->action	= s->action;
-	d->field_count	= s->field_count;
-	for (i = 0; i < d->field_count; i++) {
-		d->fields[i] = s->fields[i];
-		d->values[i] = s->values[i];
+	entry = audit_to_entry_common(rule);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	for (i = 0; i < rule->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
+		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->val = rule->values[i];
+
+		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
+		if (f->op & AUDIT_NEGATE)
+			f->op |= AUDIT_NOT_EQUAL;
+		else if (!(f->op & AUDIT_OPERATORS))
+			f->op |= AUDIT_EQUAL;
+		f->op &= ~AUDIT_NEGATE;
 	}
-	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) d->mask[i] = s->mask[i];
-	return 0;
+
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
 }
 
-/* Check to see if two rules are identical.  It is called from
- * audit_add_rule during AUDIT_ADD and 
- * audit_del_rule during AUDIT_DEL. */
-static int audit_compare_rule(struct audit_rule *a, struct audit_rule *b)
+/* Translate struct audit_rule_data to kernel's rule respresentation. */
+static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
+					       size_t datasz)
 {
+	int err = 0;
+	struct audit_entry *entry;
+	void *bufp;
+	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
 	int i;
 
-	if (a->flags != b->flags)
-		return 1;
+	entry = audit_to_entry_common((struct audit_rule *)data);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	bufp = data->buf;
+	entry->rule.vers_ops = 2;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		err = -EINVAL;
+		if (!(data->fieldflags[i] & AUDIT_OPERATORS) ||
+		    data->fieldflags[i] & ~AUDIT_OPERATORS)
+			goto exit_free;
+
+		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
+		f->type = data->fields[i];
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			f->val = data->values[i];
+		}
+	}
 
-	if (a->action != b->action)
-		return 1;
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
+}
+
+/* Pack a filter field's string representation into data block. */
+static inline size_t audit_pack_string(void **bufp, char *str)
+{
+	size_t len = strlen(str);
+
+	memcpy(*bufp, str, len);
+	*bufp += len;
+
+	return len;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule.
+ * Exists for backward compatibility with userspace. */
+static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule)
+{
+	struct audit_rule *rule;
+	int i;
+
+	rule = kmalloc(sizeof(*rule), GFP_KERNEL);
+	if (unlikely(!rule))
+		return ERR_PTR(-ENOMEM);
+	memset(rule, 0, sizeof(*rule));
+
+	rule->flags = krule->flags | krule->listnr;
+	rule->action = krule->action;
+	rule->field_count = krule->field_count;
+	for (i = 0; i < rule->field_count; i++) {
+		rule->values[i] = krule->fields[i].val;
+		rule->fields[i] = krule->fields[i].type;
+
+		if (krule->vers_ops == 1) {
+			if (krule->fields[i].op & AUDIT_NOT_EQUAL)
+				rule->fields[i] |= AUDIT_NEGATE;
+		} else {
+			rule->fields[i] |= krule->fields[i].op;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) rule->mask[i] = krule->mask[i];
 
-	if (a->field_count != b->field_count)
+	return rule;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule_data. */
+static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
+{
+	struct audit_rule_data *data;
+	void *bufp;
+	int i;
+
+	data = kmalloc(sizeof(*data) + krule->buflen, GFP_KERNEL);
+	if (unlikely(!data))
+		return ERR_PTR(-ENOMEM);
+	memset(data, 0, sizeof(*data));
+
+	data->flags = krule->flags | krule->listnr;
+	data->action = krule->action;
+	data->field_count = krule->field_count;
+	bufp = data->buf;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &krule->fields[i];
+
+		data->fields[i] = f->type;
+		data->fieldflags[i] = f->op;
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			data->values[i] = f->val;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) data->mask[i] = krule->mask[i];
+
+	return data;
+}
+
+/* Compare two rules in kernel format.  Considered success if rules
+ * don't match. */
+static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
+{
+	int i;
+
+	if (a->flags != b->flags ||
+	    a->listnr != b->listnr ||
+	    a->action != b->action ||
+	    a->field_count != b->field_count)
 		return 1;
 
 	for (i = 0; i < a->field_count; i++) {
-		if (a->fields[i] != b->fields[i]
-		    || a->values[i] != b->values[i])
+		if (a->fields[i].type != b->fields[i].type ||
+		    a->fields[i].op != b->fields[i].op)
 			return 1;
+
+		switch(a->fields[i].type) {
+		/* call type-specific comparison routines here */
+		default:
+			if (a->fields[i].val != b->fields[i].val)
+				return 1;
+		}
 	}
 
 	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
@@ -95,41 +322,21 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
-static inline int audit_add_rule(struct audit_rule *rule,
+static inline int audit_add_rule(struct audit_entry *entry,
 				  struct list_head *list)
 {
-	struct audit_entry  *entry;
-	int i;
+	struct audit_entry *e;
 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * addition routine. */
-	list_for_each_entry(entry, list, list) {
-		if (!audit_compare_rule(rule, &entry->rule))
+	list_for_each_entry(e, list, list) {
+		if (!audit_compare_rule(&entry->rule, &e->rule))
 			return -EEXIST;
 	}
 
-	for (i = 0; i < rule->field_count; i++) {
-		if (rule->fields[i] & AUDIT_UNUSED_BITS)
-			return -EINVAL;
-		if ( rule->fields[i] & AUDIT_NEGATE)
-			rule->fields[i] |= AUDIT_NOT_EQUAL;
-		else if ( (rule->fields[i] & AUDIT_OPERATORS) == 0 )
-			rule->fields[i] |= AUDIT_EQUAL;
-		rule->fields[i] &= ~AUDIT_NEGATE;
-	}
-
-	if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL)))
-		return -ENOMEM;
-	if (audit_copy_rule(&entry->rule, rule)) {
-		kfree(entry);
-		return -EINVAL;
-	}
-
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
-		entry->rule.flags &= ~AUDIT_FILTER_PREPEND;
 		list_add_rcu(&entry->list, list);
 	} else {
 		list_add_tail_rcu(&entry->list, list);
@@ -138,16 +345,9 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
-static inline void audit_free_rule(struct rcu_head *head)
-{
-	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
-	kfree(e);
-}
-
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
-static inline int audit_del_rule(struct audit_rule *rule,
+static inline int audit_del_rule(struct audit_entry *entry,
 				 struct list_head *list)
 {
 	struct audit_entry  *e;
@@ -155,16 +355,18 @@ static inline int audit_del_rule(struct 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * deletion routine. */
 	list_for_each_entry(e, list, list) {
-		if (!audit_compare_rule(rule, &e->rule)) {
+		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
-			call_rcu(&e->rcu, audit_free_rule);
+			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
 	}
 	return -ENOENT;		/* No matching rule */
 }
 
-static int audit_list_rules(void *_dest)
+/* List rules using struct audit_rule.  Exists for backward
+ * compatibility with userspace. */
+static int audit_list(void *_dest)
 {
 	int pid, seq;
 	int *dest = _dest;
@@ -180,9 +382,16 @@ static int audit_list_rules(void *_dest)
 	/* The *_rcu iterators not needed here because we are
 	   always called with audit_netlink_sem held. */
 	for (i=0; i<AUDIT_NR_FILTERS; i++) {
-		list_for_each_entry(entry, &audit_filter_list[i], list)
+		list_for_each_entry(entry, &audit_filter_list[i], list) {
+			struct audit_rule *rule;
+
+			rule = audit_krule_to_rule(&entry->rule);
+			if (unlikely(!rule))
+				break;
 			audit_send_reply(pid, seq, AUDIT_LIST, 0, 1,
-					 &entry->rule, sizeof(entry->rule));
+					 rule, sizeof(*rule));
+			kfree(rule);
+		}
 	}
 	audit_send_reply(pid, seq, AUDIT_LIST, 1, 1, NULL, 0);
 	
@@ -190,6 +399,40 @@ static int audit_list_rules(void *_dest)
 	return 0;
 }
 
+/* List rules using struct audit_rule_data. */
+static int audit_list_rules(void *_dest)
+{
+	int pid, seq;
+	int *dest = _dest;
+	struct audit_entry *e;
+	int i;
+
+	pid = dest[0];
+	seq = dest[1];
+	kfree(dest);
+
+	down(&audit_netlink_sem);
+
+	/* The *_rcu iterators not needed here because we are
+	   always called with audit_netlink_sem held. */
+	for (i=0; i<AUDIT_NR_FILTERS; i++) {
+		list_for_each_entry(e, &audit_filter_list[i], list) {
+			struct audit_rule_data *data;
+
+			data = audit_krule_to_data(&e->rule);
+			if (unlikely(!data))
+				break;
+			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
+					 data, sizeof(*data));
+			kfree(data);
+		}
+	}
+	audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
+
+	up(&audit_netlink_sem);
+	return 0;
+}
+
 /**
  * audit_receive_filter - apply all rules to the specified message type
  * @type: audit message type
@@ -197,18 +440,20 @@ static int audit_list_rules(void *_dest)
  * @uid: target uid for netlink audit messages
  * @seq: netlink audit message sequence (serial) number
  * @data: payload data
+ * @datasz: size of payload data
  * @loginuid: loginuid of sender
  */
 int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
-							uid_t loginuid)
+			 size_t datasz, uid_t loginuid)
 {
 	struct task_struct *tsk;
 	int *dest;
-	int		   err = 0;
-	unsigned listnr;
+	int err = 0;
+	struct audit_entry *entry;
 
 	switch (type) {
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 		/* We can't just spew out the rules here because we might fill
 		 * the available socket buffer space and deadlock waiting for
 		 * auditctl to read from it... which isn't ever going to
@@ -221,41 +466,48 @@ int audit_receive_filter(int type, int p
 		dest[0] = pid;
 		dest[1] = seq;
 
-		tsk = kthread_run(audit_list_rules, dest, "audit_list_rules");
+		if (type == AUDIT_LIST)
+			tsk = kthread_run(audit_list, dest, "audit_list");
+		else
+			tsk = kthread_run(audit_list_rules, dest,
+					  "audit_list_rules");
 		if (IS_ERR(tsk)) {
 			kfree(dest);
 			err = PTR_ERR(tsk);
 		}
 		break;
 	case AUDIT_ADD:
-		listnr = ((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		switch(listnr) {
-		default:
-			return -EINVAL;
+	case AUDIT_ADD_RULE:
+		if (type == AUDIT_ADD)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		case AUDIT_FILTER_USER:
-		case AUDIT_FILTER_TYPE:
-#ifdef CONFIG_AUDITSYSCALL
-		case AUDIT_FILTER_ENTRY:
-		case AUDIT_FILTER_EXIT:
-		case AUDIT_FILTER_TASK:
-#endif
-			;
-		}
-		err = audit_add_rule(data, &audit_filter_list[listnr]);
+		err = audit_add_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
+		else
+			audit_free_rule(entry);
 		break;
 	case AUDIT_DEL:
-		listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		if (listnr >= AUDIT_NR_FILTERS)
-			return -EINVAL;
+	case AUDIT_DEL_RULE:
+		if (type == AUDIT_DEL)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		err = audit_del_rule(data, &audit_filter_list[listnr]);
+		err = audit_del_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		audit_free_rule(entry);
 		break;
 	default:
 		return -EINVAL;
@@ -287,29 +539,27 @@ int audit_comparator(const u32 left, con
 
 
 static int audit_filter_user_rules(struct netlink_skb_parms *cb,
-				   struct audit_rule *rule,
+				   struct audit_krule *rule,
 				   enum audit_state *state)
 {
 	int i;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(cb->creds.pid, op, value);
+			result = audit_comparator(cb->creds.pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(cb->creds.uid, op, value);
+			result = audit_comparator(cb->creds.uid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(cb->creds.gid, op, value);
+			result = audit_comparator(cb->creds.gid, f->op, f->val);
 			break;
 		case AUDIT_LOGINUID:
-			result = audit_comparator(cb->loginuid, op, value);
+			result = audit_comparator(cb->loginuid, f->op, f->val);
 			break;
 		}
 
@@ -354,14 +604,11 @@ int audit_filter_type(int type)
 
 	list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TYPE],
 				list) {
-		struct audit_rule *rule = &e->rule;
 		int i;
-		for (i = 0; i < rule->field_count; i++) {
-			u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-			u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-			u32 value  = rule->values[i];
-			if ( field == AUDIT_MSGTYPE ) {
-				result = audit_comparator(type, op, value); 
+		for (i = 0; i < e->rule.field_count; i++) {
+			struct audit_field *f = &e->rule.fields[i];
+			if (f->type == AUDIT_MSGTYPE) {
+				result = audit_comparator(type, f->op, f->val);
 				if (!result)
 					break;
 			}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8f0a61c..e4f7096 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -161,70 +161,68 @@ struct audit_context {
 /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
  * otherwise. */
 static int audit_filter_rules(struct task_struct *tsk,
-			      struct audit_rule *rule,
+			      struct audit_krule *rule,
 			      struct audit_context *ctx,
 			      enum audit_state *state)
 {
 	int i, j;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(tsk->pid, op, value);
+			result = audit_comparator(tsk->pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(tsk->uid, op, value);
+			result = audit_comparator(tsk->uid, f->op, f->val);
 			break;
 		case AUDIT_EUID:
-			result = audit_comparator(tsk->euid, op, value);
+			result = audit_comparator(tsk->euid, f->op, f->val);
 			break;
 		case AUDIT_SUID:
-			result = audit_comparator(tsk->suid, op, value);
+			result = audit_comparator(tsk->suid, f->op, f->val);
 			break;
 		case AUDIT_FSUID:
-			result = audit_comparator(tsk->fsuid, op, value);
+			result = audit_comparator(tsk->fsuid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(tsk->gid, op, value);
+			result = audit_comparator(tsk->gid, f->op, f->val);
 			break;
 		case AUDIT_EGID:
-			result = audit_comparator(tsk->egid, op, value);
+			result = audit_comparator(tsk->egid, f->op, f->val);
 			break;
 		case AUDIT_SGID:
-			result = audit_comparator(tsk->sgid, op, value);
+			result = audit_comparator(tsk->sgid, f->op, f->val);
 			break;
 		case AUDIT_FSGID:
-			result = audit_comparator(tsk->fsgid, op, value);
+			result = audit_comparator(tsk->fsgid, f->op, f->val);
 			break;
 		case AUDIT_PERS:
-			result = audit_comparator(tsk->personality, op, value);
+			result = audit_comparator(tsk->personality, f->op, f->val);
 			break;
 		case AUDIT_ARCH:
  			if (ctx)
-				result = audit_comparator(ctx->arch, op, value);
+				result = audit_comparator(ctx->arch, f->op, f->val);
 			break;
 
 		case AUDIT_EXIT:
 			if (ctx && ctx->return_valid)
-				result = audit_comparator(ctx->return_code, op, value);
+				result = audit_comparator(ctx->return_code, f->op, f->val);
 			break;
 		case AUDIT_SUCCESS:
 			if (ctx && ctx->return_valid) {
-				if (value)
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_SUCCESS);
+				if (f->val)
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_SUCCESS);
 				else
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_FAILURE);
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_FAILURE);
 			}
 			break;
 		case AUDIT_DEVMAJOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MAJOR(ctx->names[j].dev),	op, value)) {
+					if (audit_comparator(MAJOR(ctx->names[j].dev),	f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -234,7 +232,7 @@ static int audit_filter_rules(struct tas
 		case AUDIT_DEVMINOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MINOR(ctx->names[j].dev), op, value)) {
+					if (audit_comparator(MINOR(ctx->names[j].dev), f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -244,8 +242,8 @@ static int audit_filter_rules(struct tas
 		case AUDIT_INODE:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(ctx->names[j].ino, op, value) ||
-					    audit_comparator(ctx->names[j].pino, op, value)) {
+					if (audit_comparator(ctx->names[j].ino, f->op, f->val) ||
+					    audit_comparator(ctx->names[j].pino, f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -255,14 +253,14 @@ static int audit_filter_rules(struct tas
 		case AUDIT_LOGINUID:
 			result = 0;
 			if (ctx)
-				result = audit_comparator(ctx->loginuid, op, value);
+				result = audit_comparator(ctx->loginuid, f->op, f->val);
 			break;
 		case AUDIT_ARG0:
 		case AUDIT_ARG1:
 		case AUDIT_ARG2:
 		case AUDIT_ARG3:
 			if (ctx)
-				result = audit_comparator(ctx->argv[field-AUDIT_ARG0], op, value);
+				result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val);
 			break;
 		}
 
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index d7c0e91..7315824 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per
 	{ AUDIT_LIST,		NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
 	{ AUDIT_ADD,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_DEL,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_LIST_RULES,	NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
+	{ AUDIT_ADD_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_DEL_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_USER,		NETLINK_AUDIT_SOCKET__NLMSG_RELAY    },
 	{ AUDIT_SIGNAL_INFO,	NETLINK_AUDIT_SOCKET__NLMSG_READ     },
 };
-- 
0.99.9n

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-string-2.patch:
 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 +++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 -
 4 files changed, 128 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-audit-string-2.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:06:57 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; Tue, 07 Feb 2006 12:07:15 -0500
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 k17H7FQo013463;
	Tue, 7 Feb 2006 12:07:15 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H7C125794;
	Tue, 7 Feb 2006 12:07:12 -0500
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 k17H7635006635;
	Tue, 7 Feb 2006 12:07:06 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id B388872F9D; Tue,  7 Feb 2006 12:07:06 -0500 (EST)
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
	k17H74IH005569 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:07:04 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H74125739
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:04 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H732a025911
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:03 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id E699034111
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:07:00 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id DE9C63401D
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id CC89C38448A2; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Date: Tue, 7 Feb 2006 12:06:57 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170657.GC2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190453.GC24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190453.GC24489 at zk3.dec.com>
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: Re: [PATCH 2/2] audit string fields interface + consumer
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: 13244
X-UID: 48008

Merge updates to patch 1/2 of this set.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:04:53PM EST]
> Add AUDIT_WATCH field type and associated helpers.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 ++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 +
 4 files changed, 128 insertions(+), 14 deletions(-)

237afe663373e4f908cb1d0a188fd8b5216069e9
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c208554..d76fa58 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -148,6 +148,7 @@
 #define AUDIT_INODE	102
 #define AUDIT_EXIT	103
 #define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
+#define AUDIT_WATCH	105
 
 #define AUDIT_ARG0      200
 #define AUDIT_ARG1      (AUDIT_ARG0+1)
diff --git a/kernel/audit.h b/kernel/audit.h
index 4b602cd..eb33354 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,6 +52,12 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_watch {
+	char			*path;	 /* watch insertion path */
+	struct list_head	mlist;	 /* entry in master_watchlist */
+	struct list_head	rules;	 /* associated rules */
+};
+
 struct audit_field {
 	u32			type;
 	u32			val;
@@ -67,6 +73,8 @@ struct audit_krule {
 	u32			buflen; /* for data alloc on list rules */
 	u32			field_count;
 	struct audit_field	*fields;
+	struct audit_watch	*watch;	 /* associated watch */
+	struct list_head	rlist;	 /* entry in audit_watch.rules list */
 };
 
 struct audit_entry {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 5735acd..5e9f650 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/audit.h>
 #include <linux/kthread.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/netlink.h>
 #include "audit.h"
 
@@ -40,6 +42,12 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
+static inline void audit_free_watch(struct audit_watch *watch)
+{
+	kfree(watch->path);
+	kfree(watch);
+}
+
 static inline void audit_free_rule(struct audit_entry *e)
 {
 	kfree(e->rule.fields);
@@ -52,6 +60,8 @@ static inline void audit_free_rule_rcu(s
 	audit_free_rule(e);
 }
 
+static LIST_HEAD(master_watchlist);
+
 /* Unpack a filter field's string representation from user-space
  * buffer. */
 static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
@@ -79,6 +89,33 @@ static char *audit_unpack_string(void **
 	return str;
 }
 
+/* Translate a watch string to kernel respresentation. */
+static int audit_to_watch(char *path, struct audit_krule *krule, int fidx)
+{
+	struct audit_field *f = &krule->fields[fidx];
+	struct nameidata nd;
+	struct audit_watch *watch;
+
+	if (path[0] != '/' || path[f->val-1] == '/' ||
+	    krule->listnr != AUDIT_FILTER_EXIT ||
+	    f->op & ~AUDIT_EQUAL)
+		return -EINVAL;
+
+	if (path_lookup(path, 0, &nd) == 0)
+		f->val = nd.dentry->d_inode->i_ino;
+	else
+		f->val = (unsigned int)-1;
+	path_release(&nd);
+
+	watch = kmalloc(sizeof(*watch), GFP_KERNEL);
+	if (unlikely(!watch))
+		return -ENOMEM;
+	watch->path = path;
+	krule->watch = watch;
+
+	return 0;
+}
+
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 {
@@ -150,15 +187,16 @@ static struct audit_entry *audit_rule_to
 	for (i = 0; i < rule->field_count; i++) {
 		struct audit_field *f = &entry->rule.fields[i];
 
-		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
-			err = -EINVAL;
-			goto exit_free;
-		}
-
 		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->val = rule->values[i];
 
+		if (f->type & AUDIT_UNUSED_BITS ||
+		    f->type == AUDIT_WATCH) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
 		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
 		if (f->op & AUDIT_NEGATE)
 			f->op |= AUDIT_NOT_EQUAL;
@@ -182,8 +220,9 @@ static struct audit_entry *audit_data_to
 	int err = 0;
 	struct audit_entry *entry;
 	void *bufp;
-	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
+	size_t remain = datasz - sizeof(struct audit_rule_data);
 	int i;
+	char *path;
 
 	entry = audit_to_entry_common((struct audit_rule *)data);
 	if (IS_ERR(entry))
@@ -201,10 +240,20 @@ static struct audit_entry *audit_data_to
 
 		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
 		f->type = data->fields[i];
+		f->val = data->values[i];
 		switch(f->type) {
-		/* call type-specific conversion routines here */
-		default:
-			f->val = data->values[i];
+		case AUDIT_WATCH:
+			path = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(path))
+				goto exit_free;
+			entry->rule.buflen += f->val;
+
+			err = audit_to_watch(path, &entry->rule, i);
+			if (err) {
+				kfree(path);
+				goto exit_free;
+			}
+			break;
 		}
 	}
 
@@ -280,7 +329,10 @@ static struct audit_rule_data *audit_kru
 		data->fields[i] = f->type;
 		data->fieldflags[i] = f->op;
 		switch(f->type) {
-		/* call type-specific conversion routines here */
+		case AUDIT_WATCH:
+			data->buflen += data->values[i] =
+				audit_pack_string(&bufp, krule->watch->path);
+			break;
 		default:
 			data->values[i] = f->val;
 		}
@@ -290,6 +342,12 @@ static struct audit_rule_data *audit_kru
 	return data;
 }
 
+/* Compare two watches.  Considered success if rules don't match. */
+static inline int audit_compare_watch(struct audit_watch *a, struct audit_watch *b)
+{
+	return strcmp(a->path, b->path);
+}
+
 /* Compare two rules in kernel format.  Considered success if rules
  * don't match. */
 static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
@@ -308,7 +366,10 @@ static int audit_compare_rule(struct aud
 			return 1;
 
 		switch(a->fields[i].type) {
-		/* call type-specific comparison routines here */
+		case AUDIT_WATCH:
+			if (audit_compare_watch(a->watch, b->watch))
+				return 1;
+			break;
 		default:
 			if (a->fields[i].val != b->fields[i].val)
 				return 1;
@@ -322,6 +383,26 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
+/* Attach krule's watch to master_watchlist, using existing watches
+ * when possible. */
+static inline void audit_add_watch(struct audit_krule *krule)
+{
+	struct audit_watch *w;
+
+	list_for_each_entry(w, &master_watchlist, mlist) {
+		if (audit_compare_watch(w, krule->watch))
+			continue;
+
+		audit_free_watch(krule->watch);
+		krule->watch = w;
+		list_add(&krule->rlist, &w->rules);
+		return;
+	}
+	INIT_LIST_HEAD(&krule->watch->rules);
+	list_add(&krule->rlist, &krule->watch->rules);
+	list_add(&krule->watch->mlist, &master_watchlist);
+}
+
 /* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
 static inline int audit_add_rule(struct audit_entry *entry,
@@ -336,6 +417,8 @@ static inline int audit_add_rule(struct 
 			return -EEXIST;
 	}
 
+	if (entry->rule.watch)
+		audit_add_watch(&entry->rule);
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
 		list_add_rcu(&entry->list, list);
 	} else {
@@ -345,6 +428,20 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
+/* Detach watch from krule, freeing if it has no associated rules. */
+static inline void audit_detach_watch(struct audit_krule *krule)
+{
+	struct audit_watch *watch = krule->watch;
+
+	list_del(&krule->rlist);
+	krule->watch = NULL;
+
+	if (list_empty(&watch->rules)) {
+		list_del(&watch->mlist);
+		audit_free_watch(watch);
+	}
+}
+
 /* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
 static inline int audit_del_rule(struct audit_entry *entry,
@@ -357,6 +454,8 @@ static inline int audit_del_rule(struct 
 	list_for_each_entry(e, list, list) {
 		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
+			if (e->rule.watch)
+				audit_detach_watch(&e->rule);
 			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
@@ -423,7 +522,7 @@ static int audit_list_rules(void *_dest)
 			if (unlikely(!data))
 				break;
 			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
-					 data, sizeof(*data));
+					 data, sizeof(*data) + data->buflen);
 			kfree(data);
 		}
 	}
@@ -490,8 +589,11 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
-		else
+		else {
+			if (entry->rule.watch)
+				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
+		}
 		break;
 	case AUDIT_DEL:
 	case AUDIT_DEL_RULE:
@@ -507,6 +609,8 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		if (entry->rule.watch)
+			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);
 		break;
 	default:
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e4f7096..8e98b65 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -240,7 +240,8 @@ static int audit_filter_rules(struct tas
 			}
 			break;
 		case AUDIT_INODE:
-			if (ctx) {
+		case AUDIT_WATCH:
+			if (ctx && f->val != (unsigned int)-1) {
 				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)) {
-- 
0.99.9n

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-tty.patch:
 auditsc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-tty.patch ---
>From linux-audit-bounces at redhat.com Sun Jan  1 19:07:06 2006
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sun, 01 Jan 2006 19:07:06 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xq-0006yT-4F for dwmw2 at baythorne.infradead.org; Sun, 01 Jan 2006
	19:07:06 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xo-0000N4-CS for dwmw2 at infradead.org; Sun, 01 Jan 2006 19:07:05 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 2C86D72EB7; Sun,
	 1 Jan 2006 14:07:02 -0500 (EST)
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 k01J71MX011720 for <linux-audit at listman.util.phx.redhat.com>; Sun, 1 Jan
	2006 14:07:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	k01J70127937 for <linux-audit at int-mx1.corp.redhat.com>; Sun, 1 Jan 2006
	14:07:00 -0500
Received: from vpn50-34.rdu.redhat.com (vpn50-34.rdu.redhat.com
	[172.16.50.34]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	k01J6xa3016921 for <linux-audit at redhat.com>; Sun, 1 Jan 2006 14:07:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
Organization: Red Hat
To: linux-audit at redhat.com
Date: Sun, 1 Jan 2006 14:07:00 -0500
User-Agent: KMail/1.9
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Message-Id: <200601011407.00175.sgrubb at redhat.com>
X-MIME-Autoconverted: from quoted-printable to 8bit by
	listman.util.phx.redhat.com id k01J71MX011720
X-loop: linux-audit at redhat.com
Subject: Add tty to syscall audit records
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

Hi,

>From the RBAC specs:

FAU_SAR.1.1 The TSF shall provide the set of authorized 
RBAC administrators with the capability to read the following
audit information from the audit records:

<snip>
(e) The User Session Identifier or Terminal Type 

A patch adding the tty for all syscalls is included in this email.
Please apply.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>



diff -urp linux-2.6.14.orig/kernel/auditsc.c linux-2.6.14/kernel/auditsc.c
--- linux-2.6.14.orig/kernel/auditsc.c	2005-12-28 10:39:04.000000000 -0500
+++ linux-2.6.14/kernel/auditsc.c	2005-12-28 10:40:28.000000000 -0500
@@ -56,6 +56,7 @@
 #include <asm/unistd.h>
 #include <linux/security.h>
 #include <linux/list.h>
+#include <linux/tty.h>
 
 #include "audit.h"
 
@@ -567,6 +568,7 @@ static void audit_log_exit(struct audit_
 	int i;
 	struct audit_buffer *ab;
 	struct audit_aux_data *aux;
+	const char *tty;
 
 	ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL);
 	if (!ab)
@@ -579,11 +581,15 @@ static void audit_log_exit(struct audit_
 		audit_log_format(ab, " success=%s exit=%ld", 
 				 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
 				 context->return_code);
+	if (current->signal->tty && current->signal->tty->name)
+		tty = current->signal->tty->name;
+	else
+		tty = "(none)";
 	audit_log_format(ab,
 		  " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
 		  " pid=%d auid=%u uid=%u gid=%u"
 		  " euid=%u suid=%u fsuid=%u"
-		  " egid=%u sgid=%u fsgid=%u",
+		  " egid=%u sgid=%u fsgid=%u tty=%s",
 		  context->argv[0],
 		  context->argv[1],
 		  context->argv[2],
@@ -594,7 +600,7 @@ static void audit_log_exit(struct audit_
 		  context->uid,
 		  context->gid,
 		  context->euid, context->suid, context->fsuid,
-		  context->egid, context->sgid, context->fsgid);
+		  context->egid, context->sgid, context->fsgid, tty);
 	audit_log_task_info(ab);
 	audit_log_end(ab);
 

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

linux-2.6-audit_log_exit-gfp_mask.patch:
 auditsc.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-audit_log_exit-gfp_mask.patch ---
>From aviro at redhat.com Wed Feb 15 17:14:11 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; Wed, 15 Feb 2006 17:14:21 -0500
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 k1FMEKi7012958;
	Wed, 15 Feb 2006 17:14:21 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1FMEI100895;
	Wed, 15 Feb 2006 17:14:18 -0500
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 k1FMEDiK022652;
	Wed, 15 Feb 2006 17:14:13 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id F186E7341E; Wed, 15 Feb 2006 17:14:12 -0500 (EST)
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
	k1FMEB2n013835 for <linux-audit at listman.util.phx.redhat.com>;
	Wed, 15 Feb 2006 17:14:11 -0500
Received: from devserv.devel.redhat.com (devserv.devel.redhat.com
	[172.16.58.1])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1FMEB100869
	for <linux-audit at redhat.com>; Wed, 15 Feb 2006 17:14:11 -0500
Received: from devserv.devel.redhat.com (localhost.localdomain [127.0.0.1])
	by devserv.devel.redhat.com (8.12.11/8.12.11) with ESMTP id
	k1FMEBP7003338
	for <linux-audit at redhat.com>; Wed, 15 Feb 2006 17:14:11 -0500
Received: (from aviro at localhost)
	by devserv.devel.redhat.com (8.12.11/8.12.11/Submit) id k1FMEBaK003335
	for linux-audit at redhat.com; Wed, 15 Feb 2006 17:14:11 -0500
Date: Wed, 15 Feb 2006 17:14:11 -0500
From: Alexander Viro <aviro at redhat.com>
To: linux-audit at redhat.com
Message-ID: <20060215221411.GX20691 at devserv.devel.redhat.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-loop: linux-audit at redhat.com
Subject: [PATCH] pass gfp_mask to kmalloc() done from audit_log_exit()
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: 5978
X-UID: 49739

When caller tells us that there are constraints on allocations we are allowed
to do, we'd better follow those for more than the first allocation.

Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

---

 kernel/auditsc.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

483cfcd5b5076acedd1729b23f84a901ab165baf
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8b92132..a9e991b 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -503,7 +503,7 @@ static inline void audit_free_context(st
 		printk(KERN_ERR "audit: freed %d contexts\n", count);
 }
 
-static void audit_log_task_context(struct audit_buffer *ab)
+static void audit_log_task_context(struct audit_buffer *ab, gfp_t gfp_mask)
 {
 	char *ctx = NULL;
 	ssize_t len = 0;
@@ -515,7 +515,7 @@ static void audit_log_task_context(struc
 		return;
 	}
 
-	ctx = kmalloc(len, GFP_KERNEL);
+	ctx = kmalloc(len, gfp_mask);
 	if (!ctx)
 		goto error_path;
 
@@ -533,7 +533,7 @@ error_path:
 	return;
 }
 
-static void audit_log_task_info(struct audit_buffer *ab)
+static void audit_log_task_info(struct audit_buffer *ab, gfp_t gfp_mask)
 {
 	char name[sizeof(current->comm)];
 	struct mm_struct *mm = current->mm;
@@ -546,6 +546,10 @@ static void audit_log_task_info(struct a
 	if (!mm)
 		return;
 
+	/*
+	 * this is brittle; all callers that pass GFP_ATOMIC will have
+	 * NULL current->mm and we won't get here.
+	 */
 	down_read(&mm->mmap_sem);
 	vma = mm->mmap;
 	while (vma) {
@@ -559,7 +563,7 @@ static void audit_log_task_info(struct a
 		vma = vma->vm_next;
 	}
 	up_read(&mm->mmap_sem);
-	audit_log_task_context(ab);
+	audit_log_task_context(ab, gfp_mask);
 }
 
 static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask)
@@ -595,12 +599,12 @@ static void audit_log_exit(struct audit_
 		  context->gid,
 		  context->euid, context->suid, context->fsuid,
 		  context->egid, context->sgid, context->fsgid, tty);
-	audit_log_task_info(ab);
+	audit_log_task_info(ab, gfp_mask);
 	audit_log_end(ab);
 
 	for (aux = context->aux; aux; aux = aux->next) {
 
-		ab = audit_log_start(context, GFP_KERNEL, aux->type);
+		ab = audit_log_start(context, gfp_mask, aux->type);
 		if (!ab)
 			continue; /* audit_panic has been called */
 
@@ -637,7 +641,7 @@ static void audit_log_exit(struct audit_
 	}
 
 	if (context->pwd && context->pwdmnt) {
-		ab = audit_log_start(context, GFP_KERNEL, AUDIT_CWD);
+		ab = audit_log_start(context, gfp_mask, AUDIT_CWD);
 		if (ab) {
 			audit_log_d_path(ab, "cwd=", context->pwd, context->pwdmnt);
 			audit_log_end(ab);
@@ -647,7 +651,7 @@ static void audit_log_exit(struct audit_
 		unsigned long ino  = context->names[i].ino;
 		unsigned long pino = context->names[i].pino;
 
-		ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH);
+		ab = audit_log_start(context, gfp_mask, AUDIT_PATH);
 		if (!ab)
 			continue; /* audit_panic has been called */
 
-- 
0.99.9.GIT

--
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.1959
retrieving revision 1.1959.2.1
diff -u -r1.1959 -r1.1959.2.1
--- kernel-2.6.spec	16 Feb 2006 21:16:34 -0000	1.1959
+++ kernel-2.6.spec	20 Feb 2006 19:56:50 -0000	1.1959.2.1
@@ -22,7 +22,7 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .lspp.9 
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -403,6 +403,18 @@
 
 Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch
 
+# Audit patches
+Patch20010: linux-2.6-audit-git.patch
+Patch20011: linux-2.6-audit-promisc.patch
+Patch20012: linux-2.6-audit-tty.patch
+Patch20013: linux-2.6-vm86-audit_syscall_exit.patch
+Patch20014: linux-2.6-audit-string-1.patch
+Patch20015: linux-2.6-audit-string-2.patch
+Patch20016: linux-2.6-audit-inotify-api.patch
+Patch20017: linux-2.6-audit-rule-log.patch
+Patch20018: linux-2.6-audit_log_exit-gfp_mask.patch
+Patch20019: linux-2.6-audit-fix-operators.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -933,7 +945,7 @@
 %patch1800 -p1
 # PNP support for smsc-ircc2
 %patch1810 -p1
-%patch1820 -p1
+#%patch1820 -p1
 # Silence debug messages in w1
 %patch1830 -p1
 # Reboot through BIOS on HP laptops.
@@ -985,6 +997,17 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+%patch20010 -p1
+%patch20011 -p1
+%patch20012 -p1
+%patch20013 -p1
+%patch20014 -p1
+%patch20015 -p1
+%patch20016 -p1
+%patch20017 -p1
+%patch20018 -p1
+%patch20019 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1573,6 +1596,9 @@
 %endif
 
 %changelog
+* Mon Feb 20 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp9 kernel
+
 * Thu Feb 16 2006 John W. Linville <linville at redhat.com>
 - stop adding duplicate MODULE_VERSION line to tg3
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 19:57:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 14:57:04 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.4,1.5
Message-ID: <200602201957.k1KJv4Fe024078@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24031

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Added changes to features/org.eclipse.rcp.source/feature.xml and features/org.eclipse.rcp.source/build.xml for ppc64 patch

eclipse-ppc64.patch:
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  301 +++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 17 files changed, 1564 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-ppc64.patch	20 Feb 2006 18:48:36 -0000	1.4
+++ eclipse-ppc64.patch	20 Feb 2006 19:56:59 -0000	1.5
@@ -1668,3 +1668,36 @@
 +###############################################################################
 +fragmentName = Standard Widget Toolkit for GTK 2.0
 +providerName = Eclipse.org
+--- features/org.eclipse.rcp.source/feature.xml.new	2006-02-20 14:44:38.000000000 -0500
++++ features/org.eclipse.rcp.source/feature.xml	2006-02-20 14:44:58.000000000 -0500
+@@ -14,6 +14,7 @@
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="ia64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ia64" version="3.1.2"/>
+ 	<plugin ws="photon"  os="qnx" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.qnx.photon.x86" version="3.1.2"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc" version="3.1.2"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.1.2"/>
+ 	<plugin ws="motif"  os="hpux" fragment="true" arch="PA_RISC" download-size="0" install-size="0" id="org.eclipse.rcp.source.hpux.motif.PA_RISC" version="3.1.2"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.x86_64" version="3.1.2"/>
+ 	<plugin ws="gtk"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.gtk.sparc" version="3.1.2"/>
+--- features/org.eclipse.rcp.source/build.xml.new	2006-02-20 14:46:42.000000000 -0500
++++ features/org.eclipse.rcp.source/build.xml	2006-02-20 14:47:54.000000000 -0500
+@@ -67,6 +67,11 @@
+ 			<property name="os" value="linux"/>
+ 			<property name="ws" value="gtk"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.ppc64" target="${target}">
++			<property name="arch" value="ppc64"/>
++			<property name="os" value="linux"/>
++			<property name="ws" value="gtk"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.hpux.motif.ia64_32" target="${target}">
+ 			<property name="arch" value="ia64_32"/>
+ 			<property name="os" value="hpux"/>
+@@ -135,7 +140,7 @@
+ 		<copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.2" failonerror="true" overwrite="false">
+ 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
+ 		</copy>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.2,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.2,org.eclipse.rcp.source.linux.gtk.ia64,3.1.2,org.eclipse.rcp.source.qnx.photon.x86,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.ppc64,3.1.2,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.2,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.2,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.2,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.2,org.eclipse.rcp.source.linux.gtk.x86,3.1.2,org.eclipse.rcp.source.aix.motif.ppc,3.1.2,org.eclipse.rcp.source.win32.win32.x86,3.1.2,org.eclipse.rcp.source.solaris.motif.sparc,3.1.2,org.eclipse.rcp.source.linux.motif.x86,3.1.2,"/>
+ 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
+ 	</target>
+ 	<target name="rootFileswin32_win32_x86">



From fedora-cvs-commits at redhat.com  Mon Feb 20 20:07:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:07:35 -0500
Subject: rpms/scim/devel scim.spec,1.23,1.24
Message-ID: <200602202007.k1KK7ZGr025819@cvs.devel.redhat.com>

Author: wtogami

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25788

Modified Files:
	scim.spec 
Log Message:
- Add epoch to iiimf Obsoletes so it actually removes it (#173071)
  NOTE: The goal of these Obsoletes are for the official supported
  upgrade path to work smoothly.  If users want to use iiimf, they
  are free to do so but their package must be compatible.



Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scim.spec	11 Feb 2006 05:38:56 -0000	1.23
+++ scim.spec	20 Feb 2006 20:07:33 -0000	1.24
@@ -4,7 +4,7 @@
 
 Name:      scim
 Version:   1.4.4
-Release:   4.1
+Release:   5
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -21,7 +21,7 @@
 %if %{with_libstdc_preview}
 Buildrequires: libstdc++so7-devel
 %endif
-Obsoletes: iiimf-gtk <= 12.2, iiimf-gnome-im-switcher <= 12.2, iiimf-server <= 12.2, iiimf-x <= 12.2
+Obsoletes: iiimf-gtk <= 1:12.2, iiimf-gnome-im-switcher <= 1:12.2, iiimf-server <= 1:12.2, iiimf-x <= 1:12.2
 Patch1:    scim-add-restart.patch
 Patch2:    gtkimm-clear-preedit-on-reset-174143.patch
 Patch3:    rawcode-unicode-maxlength.patch
@@ -37,7 +37,7 @@
 Group:      Development/Libraries
 Requires:   %{name}-libs = %{version}-%{release}
 Requires:   gtk2-devel
-Obsoletes:  iiimf-libs-devel <= 12.2
+Obsoletes:  iiimf-libs-devel <= 1:12.2
 
 %description devel
 The scim-devel package includes the header files for the scim package.
@@ -47,7 +47,7 @@
 %package doc
 Summary:    Smart Common Input Method platform documentation
 Group:      Documentation
-Obsoletes:  iiimf-docs <= 12.2
+Obsoletes:  iiimf-docs <= 1:12.2
 
 %description doc
 SCIM development documentation files generated from the sourcecode.
@@ -56,7 +56,7 @@
 %package libs
 Summary:    Smart Common Input Method libraries
 Group:      System Environment/Libraries
-Obsoletes:  iiimf-libs <= 12.2
+Obsoletes:  iiimf-libs <= 1:12.2
 
 %description libs
 This package provides the libraries and GTK input method module for SCIM.
@@ -184,6 +184,12 @@
 
 
 %changelog
+* Mon Feb 20 2006 Warren Togami <wtogami at redhat.com> - 1.4.4-5
+- Add epoch to iiimf Obsoletes so it actually removes it (#173071)
+  NOTE: The goal of these Obsoletes are for the official supported 
+  upgrade path to work smoothly.  If users want to use iiimf, they
+  are free to do so but their package must be compatible.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.4-4.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 20:14:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:14:12 -0500
Subject: rpms/gnucash/devel gnucash.spec,1.24,1.25
Message-ID: <200602202014.k1KKECma028674@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28631

Modified Files:
	gnucash.spec 
Log Message:
bump



Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnucash.spec	11 Feb 2006 03:18:50 -0000	1.24
+++ gnucash.spec	20 Feb 2006 20:14:09 -0000	1.25
@@ -3,7 +3,7 @@
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
 Version: 1.8.12
-Release: 2.2
+Release: 3
 License: GPL/GFDL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz
@@ -106,6 +106,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Feb 20 2006 Bill Nottingham <notting at redhat.com> - 1.8.12-3
+- rebuild against g-wrap-1.9.6
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8.12-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 20 20:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:19:44 -0500
Subject: rpms/kernel/devel linux-2.6-vm86-audit_syscall_exit.patch, NONE,
	1.1.4.1
Message-ID: <200602202019.k1KKJiZM011075@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10908

Added Files:
      Tag: private-fc5-lspp-branch
	linux-2.6-vm86-audit_syscall_exit.patch 
Log Message:
Adding patch to lspp kernel


linux-2.6-vm86-audit_syscall_exit.patch:
 arch/i386/kernel/vm86.c |   12 ++++++++++--
 kernel/auditsc.c        |    5 -----
 2 files changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-vm86-audit_syscall_exit.patch ---
>From jbaron at redhat.com Tue Jan 31 16:56:28 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; Tue, 31 Jan 2006 16:59:43 -0500
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 k0VLxhVB011796;
	Tue, 31 Jan 2006 16:59:43 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLxe113090;
	Tue, 31 Jan 2006 16:59:40 -0500
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 k0VLxYad021818;
	Tue, 31 Jan 2006 16:59:34 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id DB408734FD; Tue, 31 Jan 2006 16:59:34 -0500 (EST)
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
	k0VLm1KO030358 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLm1108246
	for <linux-audit at int-mx1.corp.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from dhcp83-105.boston.redhat.com
	(IDENT:U2FsdGVkX1/BG9Gb/rarNGoKwgdY7GXxe/iR5tDmvQU at dhcp83-105.boston.redhat.com
	[172.16.83.105])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k0VLm0VC010704; 
	Tue, 31 Jan 2006 16:48:00 -0500
Date: Tue, 31 Jan 2006 16:56:28 -0500 (EST)
From: Jason Baron <jbaron at redhat.com>
X-X-Sender: jbaron at dhcp83-105.boston.redhat.com
To: linux-audit at redhat.com
Message-ID: <Pine.LNX.4.61.0601311642220.14617 at dhcp83-105.boston.redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN;
  charset=US-ASCII
X-loop: linux-audit at redhat.com
X-Mailman-Approved-At: Tue, 31 Jan 2006 16:59:33 -0500
Cc: dwmw2 at infradead.org,
 viro at zeniv.linux.org.uk
Subject: make vm86 call audit_syscall_exit
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: 6338
X-UID: 46889


hi,

The motivation behind the patch below was to address messages in 
/var/log/messages such as:

Jan 31 10:54:15 mets kernel: audit(:0): major=252 name_count=0: freeing 
multiple contexts (1)
Jan 31 10:54:15 mets kernel: audit(:0): major=113 name_count=0: freeing 
multiple contexts (2)

I can reproduce by running 'get-edid' from:
http://john.fremlin.de/programs/linux/read-edid/. 

These messages come about in the log b/c the vm86 calls do not exit via 
the normal system call exit paths and thus do not call 
'audit_syscall_exit'. The next system call will then free the context for 
itself and for the vm86 context, thus generating the above messages. This 
patch addresses the issue by simply adding a call to 'audit_syscall_exit' 
from the vm86 code.

Besides fixing the above error messages the patch also now allows vm86 
system calls to become auditable. This is useful since strace does not 
appear to properly record the return values from sys_vm86.

I think this patch is also a step in the right direction in terms of 
cleaning up some core auditing code. If we can correct any other paths 
that do not properly call the audit exit and entries points, then we can 
also eliminate the notion of context chaining.

I've tested this patch by verifying that the log messages no longer 
appear, and that the audit records for sys_vm86 appear to be correct. 
Also, 'read_edid' produces itentical output.

thanks,

Jason

Signed-off-by: Jason Baron <jbaron at redhat.com>


--- linux-2.6/kernel/auditsc.c.bak
+++ linux-2.6/kernel/auditsc.c
@@ -981,11 +981,6 @@ void audit_syscall_entry(struct task_str
 	if (context && context->in_syscall) {
 		struct audit_context *newctx;
 
-#if defined(__NR_vm86) && defined(__NR_vm86old)
-		/* vm86 mode should only be entered once */
-		if (major == __NR_vm86 || major == __NR_vm86old)
-			return;
-#endif
 #if AUDIT_DEBUG
 		printk(KERN_ERR
 		       "audit(:%d) pid=%d in syscall=%d;"
--- linux-2.6/arch/i386/kernel/vm86.c.bak	2006-01-31 12:19:56.000000000 -0500
+++ linux-2.6/arch/i386/kernel/vm86.c	2006-01-31 12:24:52.000000000 -0500
@@ -42,6 +42,7 @@
 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -251,6 +252,7 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
 	struct tss_struct *tss;
+	long eax;
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
@@ -304,13 +306,19 @@ static void do_sys_vm86(struct kernel_vm
 	tsk->thread.screen_bitmap = info->screen_bitmap;
 	if (info->flags & VM86_SCREEN_BITMAP)
 		mark_screen_rdonly(tsk->mm);
+	__asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t");
+	__asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax));
+	
+	/*call audit_syscall_exit since we do not exit via the normal paths */
+	if (unlikely(current->audit_context))
+		audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+
 	__asm__ __volatile__(
-		"xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
 		"movl %0,%%esp\n\t"
 		"movl %1,%%ebp\n\t"
 		"jmp resume_userspace"
 		: /* no outputs */
-		:"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
+		:"r" (&info->regs), "r" (task_thread_info(tsk)));
 	/* we never return here */
 }
 

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit




From fedora-cvs-commits at redhat.com  Mon Feb 20 20:28:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:28:13 -0500
Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec,1.48,1.49
Message-ID: <200602202028.k1KKSDap015060@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14934

Modified Files:
	gstreamer-plugins.spec 
Log Message:
- Added libgstspc.so to x86



Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gstreamer-plugins.spec	20 Feb 2006 18:25:28 -0000	1.48
+++ gstreamer-plugins.spec	20 Feb 2006 20:28:05 -0000	1.49
@@ -175,6 +175,9 @@
 %ifarch %{ix86} ia64 ppc ppc64 x86_64
 %{_libdir}/gstreamer-%{majmin}/libgst1394.*
 %endif
+%ifarch %{ix86} 
+%{_libdir}/gstreamer-%{majmin}/libgstspc.*
+%endif
 %{_libdir}/gstreamer-%{majmin}/libgstac3parse.*
 %{_libdir}/gstreamer-%{majmin}/libgstadder.*
 %{_libdir}/gstreamer-%{majmin}/libgstalpha.*
@@ -322,6 +325,7 @@
 - Removed execshield patch
 - Added libgstdvdsubdec.so, libgstfreeze.so, libgstimagemixer.so, 
   libgstvideo4linuxradio.so
+- Added libgstspc.so to x86
  
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and



From fedora-cvs-commits at redhat.com  Mon Feb 20 20:31:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:31:56 -0500
Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.7,
	1.8 perl-HTML-Parser.spec, 1.18, 1.19 sources, 1.7, 1.8
Message-ID: <200602202031.k1KKVug2015670@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15626

Modified Files:
	.cvsignore perl-HTML-Parser.spec sources 
Log Message:
upgrade to 3.50


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Dec 2005 19:43:27 -0000	1.7
+++ .cvsignore	20 Feb 2006 20:31:24 -0000	1.8
@@ -2,3 +2,4 @@
 HTML-Parser-3.45.tar.gz
 HTML-Parser-3.46.tar.gz
 HTML-Parser-3.48.tar.gz
+HTML-Parser-3.50.tar.gz


Index: perl-HTML-Parser.spec
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- perl-HTML-Parser.spec	11 Feb 2006 05:05:11 -0000	1.18
+++ perl-HTML-Parser.spec	20 Feb 2006 20:31:38 -0000	1.19
@@ -4,8 +4,8 @@
 
 Summary: Perl module for parsing HTML
 Name: perl-%{real_name}
-Version: 3.48
-Release: 1.1.2
+Version: 3.50
+Release: 1
 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 Feb 20 2006 Jason Vas Dias <jvdias at redhat.com> - 3.50-1
+- upgrade to 3.50
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.48-1.1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Dec 2005 19:43:27 -0000	1.7
+++ sources	20 Feb 2006 20:31:38 -0000	1.8
@@ -1 +1,2 @@
 3fe8ca230ff8efc55327a12d94193a58  HTML-Parser-3.48.tar.gz
+4848c5eaac5576d1412578f480fdf22d  HTML-Parser-3.50.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 20 20:33:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 15:33:37 -0500
Subject: rpms/perl-HTML-Parser/devel sources,1.8,1.9
Message-ID: <200602202033.k1KKXbst015773@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/perl-HTML-Parser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15731

Modified Files:
	sources 
Log Message:
upgrade to 3.50


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Feb 2006 20:31:38 -0000	1.8
+++ sources	20 Feb 2006 20:33:23 -0000	1.9
@@ -1,2 +1 @@
-3fe8ca230ff8efc55327a12d94193a58  HTML-Parser-3.48.tar.gz
 4848c5eaac5576d1412578f480fdf22d  HTML-Parser-3.50.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 20 21:04:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 16:04:01 -0500
Subject: rpms/authconfig/devel .cvsignore, 1.40, 1.41 authconfig.spec, 1.54,
	1.55 sources, 1.47, 1.48
Message-ID: <200602202104.k1KL41T1006768@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6689

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Feb 20 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.1-1
- don't crash in TUI when some options aren't set (#182151)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	3 Feb 2006 22:39:22 -0000	1.40
+++ .cvsignore	20 Feb 2006 21:03:14 -0000	1.41
@@ -1 +1 @@
-authconfig-5.2.0.tar.bz2
+authconfig-5.2.1.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- authconfig.spec	11 Feb 2006 01:59:57 -0000	1.54
+++ authconfig.spec	20 Feb 2006 21:03:31 -0000	1.55
@@ -1,9 +1,9 @@
 Summary: Text-mode tool for setting up NIS and shadow passwords.
 Name: authconfig
-Version: 5.2.0
+Version: 5.2.1
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
-Release: 1.2
+Release: 1
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -94,11 +94,8 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.2.0-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5.2.0-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Mon Feb 20 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.1-1
+- don't crash in TUI when some options aren't set (#182151)
 
 * Fri Feb  3 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.0-1
 - redesigned GUI (#178112)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	3 Feb 2006 22:58:00 -0000	1.47
+++ sources	20 Feb 2006 21:03:31 -0000	1.48
@@ -1 +1 @@
-c4764dfe173cd9d29e00a85d871e414a  authconfig-5.2.0.tar.bz2
+025322138bc856ee42464a238f410cb0  authconfig-5.2.1.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 20 21:33:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 16:33:51 -0500
Subject: rpms/gnucash/devel .cvsignore, 1.12.2.4, 1.12.2.5 gnucash.spec,
	1.18.2.14, 1.18.2.15 sources, 1.12.2.4, 1.12.2.5
Message-ID: <200602202133.k1KLXpDx029343@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/gnucash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29323

Modified Files:
      Tag: gnucash-g2-branch
	.cvsignore gnucash.spec sources 
Log Message:
update to 1.9.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- .cvsignore	10 Feb 2006 20:36:08 -0000	1.12.2.4
+++ .cvsignore	20 Feb 2006 21:33:47 -0000	1.12.2.5
@@ -1,10 +1,2 @@
-gnucash-1.8.11.tar.gz
-gnucash-docs-1.8.5.tar.gz
-gnucash-docs-1.9.0.svn12279.tar.gz
-gnucash-1.9.0.svn12279.tar.gz
-gnucash-1.9.0.svn12307.tar.bz2
-gnucash-docs-1.9.0.svn12307.tar.bz2
-gnucash-1.9.0.svn12955.tar.bz2
-gnucash-docs-1.9.0.svn12955.tar.bz2
-gnucash-1.9.0.tar.gz
-gnucash-docs-1.9.0.svn13195.tar.bz2
+gnucash-docs-1.9.1.svn13331.tar.bz2
+gnucash-1.9.1.tar.gz


Index: gnucash.spec
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.18.2.14
retrieving revision 1.18.2.15
diff -u -r1.18.2.14 -r1.18.2.15
--- gnucash.spec	10 Feb 2006 21:25:18 -0000	1.18.2.14
+++ gnucash.spec	20 Feb 2006 21:33:47 -0000	1.18.2.15
@@ -1,16 +1,25 @@
-%define svnrev 13195
+%define svnrev 13331
+
+%define buildsvn 0
 
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: 1.9.0
+Version: 1.9.1
+%if %{buildsvn}
+Release: 1.svn%{svnrev}.1
+%else
 Release: 1
-# Release: 1.svn%{svnrev}.1
+%endif
 License: GPL/GFDL
 Group: Applications/Productivity
-Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/%{name}-%{version}.tar.gz
-#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz
-#Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
-Source1: gnucash-docs-1.9.0.svn%{svnrev}.tar.bz2
+%if %{buildsvn}
+Source: gnucash-%{version}.svn%{svnrev}.tar.bz2
+Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
+%else
+Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/gnucash-%{version}.tar.gz
+#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz
+Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2
+%endif
 Patch3: gnucash-1.8.11-icon.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 Patch5: gnucash-1.8.12-aq.patch
@@ -34,13 +43,20 @@
 balanced books.
 
 %prep
+%if %{buildsvn}
+%setup -q -a 1 -n gnucash
+%else
 %setup -q -a 1
+%endif
+
 #%patch3 -p1 -b .icon
 %patch4 -p1 -b .64bit
 #%patch5 -p1 -b .aq
 
 %build
-#./autogen.sh --prefix=/usr
+%if %{buildsvn}
+./autogen.sh
+%endif
 %configure --disable-sql --enable-error-on-warning=no \
 	--enable-ofx \
 	--enable-hbci \
@@ -70,7 +86,7 @@
   --add-category X-Red-Hat-Extra                      \
   --add-category Application                         \
   --add-category Office                               \
-  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gnucash.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop
 echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop
 
 rm -rf $RPM_BUILD_ROOT/%{_infodir} \
@@ -120,6 +136,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Mon Feb 20 2006 Bill Nottingham <notting at redhat.com> 1.9.1-1
+- 1.9.1
+
 * Fri Feb 10 2006 Bill Nottingham <notting at redhat.com> 1.9.0-1
 - update to official 1.9.0
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnucash/devel/sources,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -r1.12.2.4 -r1.12.2.5
--- sources	10 Feb 2006 20:36:08 -0000	1.12.2.4
+++ sources	20 Feb 2006 21:33:47 -0000	1.12.2.5
@@ -1,2 +1,2 @@
-4b3dd389c9ee007dae1307f1bc2696e0  gnucash-1.9.0.tar.gz
-81ee8609a14ac0bd1cf8d601e3a4ae8e  gnucash-docs-1.9.0.svn13195.tar.bz2
+0632996dc637dcbf84d085177d72bdd7  gnucash-docs-1.9.1.svn13331.tar.bz2
+fd1ba54948cf6a91faf1328f2051677d  gnucash-1.9.1.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 20 22:11:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 17:11:44 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.40, 1.41 modules-strict.conf,
	1.6, 1.7 policy-20060207.patch, 1.11, 1.12 selinux-policy.spec,
	1.111, 1.112 sources, 1.44, 1.45
Message-ID: <200602202211.k1KMBiLw017224@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17190

Modified Files:
	.cvsignore modules-strict.conf policy-20060207.patch 
	selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	19 Feb 2006 12:17:14 -0000	1.40
+++ .cvsignore	20 Feb 2006 22:11:40 -0000	1.41
@@ -41,3 +41,4 @@
 serefpolicy-2.2.14.tgz
 serefpolicy-2.2.15.tgz
 serefpolicy-2.2.16.tgz
+serefpolicy-2.2.17.tgz


Index: modules-strict.conf
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modules-strict.conf	19 Feb 2006 12:17:15 -0000	1.6
+++ modules-strict.conf	20 Feb 2006 22:11:40 -0000	1.7
@@ -1048,14 +1048,14 @@
 #
 # Common policy for authentication and user login.
 # 
-authlogin = module
+authlogin = base
 
 # Layer: system
 # Module: libraries
 #
 # Policy for system libraries.
 # 
-libraries = module
+libraries = base
 
 # Layer: system
 # Module: raid

policy-20060207.patch:
 policy/modules/admin/su.if              |   19 ++----
 policy/modules/apps/slocate.te          |    2 
 policy/modules/kernel/devices.if        |   39 ++++++++++++++
 policy/modules/services/cron.if         |    2 
 policy/modules/services/cron.te         |    4 +
 policy/modules/services/cups.if         |   19 ++++++
 policy/modules/services/spamassassin.te |    1 
 policy/modules/services/ssh.if          |    2 
 policy/modules/system/authlogin.te      |    2 
 policy/modules/system/mount.te          |    2 
 policy/modules/system/selinuxutil.fc    |    7 ++
 policy/modules/system/selinuxutil.if    |   87 ++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te    |   72 ++++++++++++++++++++++++--
 policy/modules/system/userdomain.if     |   24 ++++++++
 policy/modules/system/userdomain.te     |    2 
 support/Makefile.devel                  |   12 +++-
 16 files changed, 277 insertions(+), 19 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- policy-20060207.patch	19 Feb 2006 12:17:15 -0000	1.11
+++ policy-20060207.patch	20 Feb 2006 22:11:40 -0000	1.12
@@ -1,112 +1,134 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.16/policy/global_tunables
---- nsaserefpolicy/policy/global_tunables	2006-02-16 09:05:13.000000000 -0500
-+++ serefpolicy-2.2.16/policy/global_tunables	2006-02-19 07:09:54.000000000 -0500
-@@ -469,3 +469,11 @@
- ## </desc>
- gen_tunable(xdm_sysadm_login,false)
- ')
-+
-+## <desc>
-+## <p>
-+## Allow spammd to read/write user home directories.
-+## </p>
-+## </desc>
-+gen_tunable(spamd_enable_home_dirs,true)
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.2.16/policy/modules/admin/amanda.if
---- nsaserefpolicy/policy/modules/admin/amanda.if	2006-02-10 21:34:11.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/admin/amanda.if	2006-02-19 07:09:54.000000000 -0500
-@@ -90,3 +90,40 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.17/policy/modules/admin/su.if
+--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-14 07:20:23.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/admin/su.if	2006-02-20 16:22:06.000000000 -0500
+@@ -220,6 +220,14 @@
+ 		nscd_socket_use($1_su_t)
+ 	')
  
- 	dontaudit $1 amanda_dumpdates_t:file { getattr read };
- ')
++	# Modify .Xauthority file (via xauth program).
++	optional_policy(`xserver',`
++#		file_type_auto_trans($1_su_t, staff_home_dir_t, staff_xauth_home_t, file)
++#		file_type_auto_trans($1_su_t, user_home_dir_t, user_xauth_home_t, file)
++#		file_type_auto_trans($1_su_t, sysadm_home_dir_t, sysadm_xauth_home_t, file)
++		xserver_domtrans_user_xauth($1, $1_su_t)
++	')
 +
-+########################################
-+## <summary>
-+##	Allow read/writing /etc/dumpdates.
+ 	ifdef(`TODO',`
+ 	# Caused by su - init scripts
+ 	dontaudit $1_su_t initrc_devpts_t:chr_file { getattr ioctl };
+@@ -235,17 +243,6 @@
+ 	dontaudit $1_su_t home_dir_type:dir { search write };
+ 	')
+ 
+-	# Modify .Xauthority file (via xauth program).
+-	ifdef(`xauth.te', `
+-	file_type_auto_trans($1_su_t, staff_home_dir_t, staff_xauth_home_t, file)
+-	file_type_auto_trans($1_su_t, user_home_dir_t, user_xauth_home_t, file)
+-	file_type_auto_trans($1_su_t, sysadm_home_dir_t, sysadm_xauth_home_t, file)
+-	domain_auto_trans($1_su_t, xauth_exec_t, $1_xauth_t)
+-	')
+-
+-	ifdef(`cyrus.te', `
+-	allow $1_su_t cyrus_var_lib_t:dir search;
+-	')
+ 	ifdef(`ssh.te', `
+ 	# Access sshd cookie files.
+ 	allow $1_su_t sshd_tmp_t:file rw_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.17/policy/modules/apps/slocate.te
+--- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/apps/slocate.te	2006-02-20 16:22:06.000000000 -0500
+@@ -36,6 +36,8 @@
+ 
+ files_list_all(locate_t)
+ files_getattr_all_files(locate_t)
++# mls Higher level directories will be refused, so dontaudit
++files_dontaudit_getattr_all_dirs(locate_t)
+ files_read_etc_runtime_files(locate_t)
+ files_read_etc_files(locate_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.17/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-20 14:07:36.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/kernel/devices.if	2006-02-20 16:22:06.000000000 -0500
+@@ -1115,6 +1115,45 @@
+ 
+ ########################################
+ ## <summary>
++##	Setattr the dri devices.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain to allow
++##	Domain allowed access.
 +##	</summary>
 +## </param>
 +#
-+interface(`amanda_rw_dumpdates_files',`
++interface(`dev_setattr_dri_dev',`
 +	gen_require(`
-+		type amanda_dumpdates_t;
++		type device_t, dri_device_t;
 +	')
 +
-+	allow $1 amanda_dumpdates_t:file rw_file_perms;
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 dri_device_t:chr_file setattr;
 +')
++
 +########################################
 +## <summary>
-+##	Allow read/writing amanda logs
++##	getattr the dri devices.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain to allow
++##	Domain allowed access.
 +##	</summary>
 +## </param>
 +#
-+interface(`amanda_append_log_files',`
++interface(`dev_getattr_dri_dev',`
 +	gen_require(`
-+		type amanda_log_t;
++		type device_t, dri_device_t;
 +	')
 +
-+	allow $1 amanda_log_t:file ra_file_perms;
++	allow $1 device_t:dir r_dir_perms;
++	allow $1 dri_device_t:chr_file getattr;
 +')
 +
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.2.16/policy/modules/admin/amanda.te
---- nsaserefpolicy/policy/modules/admin/amanda.te	2006-02-03 15:45:54.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/admin/amanda.te	2006-02-19 07:09:54.000000000 -0500
-@@ -86,7 +86,7 @@
- # Amanda local policy
- #
- 
--allow amanda_t self:capability { chown dac_override setuid };
-+allow amanda_t self:capability { chown dac_override setuid kill };
- allow amanda_t self:process { setpgid signal };
- allow amanda_t self:fifo_file { getattr read write ioctl lock };
- allow amanda_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.16/policy/modules/admin/vpn.te
---- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-16 16:42:39.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/admin/vpn.te	2006-02-19 07:13:16.000000000 -0500
-@@ -11,6 +11,7 @@
- 
- type vpnc_exec_t;
- domain_entry_file(vpnc_t,vpnc_exec_t)
-+role system_r types vpnc_t;
- 
- type vpnc_tmp_t;
- files_tmp_file(vpnc_tmp_t)
-@@ -69,6 +70,7 @@
- dev_read_sysfs(vpnc_t)
- 
- fs_getattr_xattr_fs(vpnc_t)
-+fs_getattr_tmpfs(vpnc_t)
- 
- term_use_all_user_ptys(vpnc_t)
- term_use_all_user_ttys(vpnc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.2.16/policy/modules/apps/java.fc
---- nsaserefpolicy/policy/modules/apps/java.fc	2006-01-17 13:22:13.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/apps/java.fc	2006-02-19 07:09:54.000000000 -0500
-@@ -3,3 +3,4 @@
- #
- /usr(/.*)?/bin/java.* 	--	gen_context(system_u:object_r:java_exec_t,s0)
- /usr/bin/gij		--	gen_context(system_u:object_r:java_exec_t,s0)
-+/usr/bin/gcj-dbtool	--	gen_context(system_u:object_r:java_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.16/policy/modules/apps/java.if
---- nsaserefpolicy/policy/modules/apps/java.if	2006-02-16 09:05:14.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/apps/java.if	2006-02-19 07:09:54.000000000 -0500
-@@ -178,3 +178,28 @@
- 		xserver_user_client_template($1,$1_javaplugin_t,$1_javaplugin_tmpfs_t)
- 	')
- ')
-+
 +########################################
 +## <summary>
-+##	Execute the java program in the java domain.
+ ##	Read input event devices (/dev/input).
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.17/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-02-20 14:07:37.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/services/cron.if	2006-02-20 16:22:06.000000000 -0500
+@@ -544,7 +544,7 @@
+ 		type system_crond_t;
+ 	')
+ 
+-	allow $1 system_crond_t:file rw_file_perms;
++	allow $1 system_crond_t:fifo_file rw_file_perms;
+ ')
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.17/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-20 14:07:37.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/services/cron.te	2006-02-20 16:22:06.000000000 -0500
+@@ -398,6 +398,10 @@
+ 		prelink_delete_cache(system_crond_t)
+ 	')
+ 
++	optional_policy(`postfix',`
++		postfix_read_config(system_crond_t)
++	')	
++
+ 	optional_policy(`samba',`
+ 		samba_read_config(system_crond_t)
+ 		samba_read_log(system_crond_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.17/policy/modules/services/cups.if
+--- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/services/cups.if	2006-02-20 16:22:06.000000000 -0500
+@@ -169,6 +169,25 @@
+ 
+ ########################################
+ ## <summary>
++##	write cups log files.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -114,223 +136,86 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`java_domtrans',`
++interface(`cups_write_log',`
 +	gen_require(`
-+		type java_t, java_exec_t;
++		type cupsd_log_t;
 +	')
 +
-+	corecmd_search_bin($1)
-+	domain_auto_trans($1, java_exec_t, java_t)
-+
-+	allow $1 java_t:fd use;
-+	allow java_t $1:fd use;
-+	allow java_t $1:fifo_file rw_file_perms;
-+	allow java_t $1:process sigchld;
++	logging_search_logs($1)
++	allow $1 cupsd_log_t:file write;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.16/policy/modules/apps/java.te
---- nsaserefpolicy/policy/modules/apps/java.te	2006-01-12 18:28:45.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/apps/java.te	2006-02-19 07:09:54.000000000 -0500
-@@ -6,5 +6,19 @@
- # Declarations
- #
- 
-+type java_t;
-+domain_type(java_t)
-+
- type java_exec_t;
- files_type(java_exec_t)
-+
 +########################################
-+#
-+# Local policy
-+#
-+
-+ifdef(`targeted_policy',`
-+	allow java_t self:process { execstack execmem };
-+	unconfined_domain_noaudit(java_t)
-+	role system_r types java_t;
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.16/policy/modules/kernel/corenetwork.te.in
---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/kernel/corenetwork.te.in	2006-02-19 07:09:54.000000000 -0500
-@@ -73,6 +73,7 @@
- network_port(imaze, tcp,5323,s0, udp,5323,s0)
- network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0)
- network_port(innd, tcp,119,s0)
-+network_port(router, udp,520,s0)
- network_port(ipp, tcp,631,s0, udp,631,s0)
- network_port(ircd, tcp,6667,s0)
- network_port(isakmp, udp,500,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.16/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/automount.te	2006-02-19 07:09:54.000000000 -0500
-@@ -92,7 +92,7 @@
- 
- files_dontaudit_write_var_dirs(automount_t)
- files_search_var_lib(automount_t)
--files_search_mnt(automount_t)
-+files_list_mnt(automount_t)
- files_getattr_home_dir(automount_t)
- files_read_etc_files(automount_t)
- files_read_etc_runtime_files(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/avahi.te serefpolicy-2.2.16/policy/modules/services/avahi.te
---- nsaserefpolicy/policy/modules/services/avahi.te	2006-02-03 08:55:53.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/avahi.te	2006-02-19 07:09:54.000000000 -0500
-@@ -63,6 +63,7 @@
- domain_use_wide_inherit_fd(avahi_t)
- 
- files_read_etc_files(avahi_t)
-+files_read_etc_runtime_files(avahi_t)
- 
- init_use_fd(avahi_t)
- init_use_script_ptys(avahi_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.2.16/policy/modules/services/fetchmail.te
---- nsaserefpolicy/policy/modules/services/fetchmail.te	2006-02-14 07:20:26.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/fetchmail.te	2006-02-19 07:09:54.000000000 -0500
-@@ -67,6 +67,7 @@
- 
- files_read_etc_files(fetchmail_t)
- files_read_etc_runtime_files(fetchmail_t)
-+files_dontaudit_search_home(fetchmail_t)
- 
- fs_getattr_all_fs(fetchmail_t)
- fs_search_auto_mountpoints(fetchmail_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.16/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/hal.te	2006-02-19 07:09:54.000000000 -0500
-@@ -22,7 +22,7 @@
- #
- 
- # execute openvt which needs setuid
--allow hald_t self:capability { setuid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio };
-+allow hald_t self:capability { setuid setgid kill net_admin sys_admin sys_nice dac_override dac_read_search mknod sys_rawio };
- dontaudit hald_t self:capability sys_tty_config;
- allow hald_t self:process signal_perms;
- allow hald_t self:fifo_file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.16/policy/modules/services/ktalk.fc
---- nsaserefpolicy/policy/modules/services/ktalk.fc	2005-11-14 18:24:08.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/ktalk.fc	2006-02-19 07:10:20.000000000 -0500
-@@ -1,2 +1,2 @@
--
- /usr/bin/ktalkd		--	gen_context(system_u:object_r:ktalkd_exec_t,s0)
-+/usr/bin/in.talkd		--	gen_context(system_u:object_r:ktalkd_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.16/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-14 07:20:28.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/spamassassin.te	2006-02-19 07:09:54.000000000 -0500
-@@ -77,7 +77,9 @@
- # DnsResolver.pm module which binds to
- # random ports >= 1024.
- corenet_udp_bind_generic_port(spamd_t)
-+corenet_udp_bind_imaze_port(spamd_t)
- corenet_tcp_connect_razor_port(spamd_t)
-+sysnet_use_ldap(spamd_t)
- 
- dev_read_sysfs(spamd_t)
- dev_read_urand(spamd_t)
-@@ -122,8 +124,11 @@
- 	term_dontaudit_use_unallocated_ttys(spamd_t)
++## <summary>
+ ##	Connect to ptal over an unix domain stream socket.
+ ## </summary>
+ ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.17/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-20 14:07:37.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/services/spamassassin.te	2006-02-20 16:22:06.000000000 -0500
+@@ -124,6 +124,7 @@
  	term_dontaudit_use_generic_ptys(spamd_t)
  	files_dontaudit_read_root_files(spamd_t)
--	userdom_manage_generic_user_home_dirs(spamd_t)
--	userdom_manage_generic_user_home_files(spamd_t)
-+	tunable_policy(`spamd_enable_home_dirs',`
-+		userdom_manage_generic_user_home_dirs(spamd_t)
-+		userdom_manage_generic_user_home_files(spamd_t)
-+		userdom_manage_generic_user_home_symlinks(spamd_t)
-+	')
+ 	tunable_policy(`spamd_enable_home_dirs',`
++		userdom_search_unpriv_user_home_dirs(spamd_t)
+ 		userdom_manage_generic_user_home_dirs(spamd_t)
+ 		userdom_manage_generic_user_home_files(spamd_t)
+ 		userdom_manage_generic_user_home_symlinks(spamd_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.17/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-16 09:05:14.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/services/ssh.if	2006-02-20 16:22:06.000000000 -0500
+@@ -279,6 +279,8 @@
+ 
+ 	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
+ 
++	allow $1_ssh_agent_t $1_ssh_agent_t:unix_stream_socket { connectto rw_socket_perms };
++
+ 	allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
+ 
+ 	# for ssh-add
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.17/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-03 08:55:55.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/system/authlogin.te	2006-02-20 16:22:06.000000000 -0500
+@@ -153,6 +153,8 @@
+ dev_read_sysfs(pam_console_t)
+ dev_getattr_apm_bios_dev(pam_console_t)
+ dev_setattr_apm_bios_dev(pam_console_t)
++dev_getattr_dri_dev(pam_console_t)
++dev_setattr_dri_dev(pam_console_t)
+ dev_getattr_framebuffer_dev(pam_console_t)
+ dev_setattr_framebuffer_dev(pam_console_t)
+ dev_getattr_misc_dev(pam_console_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.17/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-02-14 07:20:31.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/system/mount.te	2006-02-20 16:22:06.000000000 -0500
+@@ -137,6 +137,8 @@
+ 	samba_domtrans_smbmount(mount_t)
  ')
  
- tunable_policy(`use_nfs_home_dirs',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.16/policy/modules/services/xserver.fc
---- nsaserefpolicy/policy/modules/services/xserver.fc	2006-02-07 10:43:26.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/xserver.fc	2006-02-19 07:09:54.000000000 -0500
-@@ -54,6 +54,7 @@
- /usr/bin/iceauth		--	gen_context(system_u:object_r:iceauth_exec_t,s0)
- /usr/bin/xauth    	--      gen_context(system_u:object_r:xauth_exec_t,s0)
- /usr/bin/Xorg		--	gen_context(system_u:object_r:xserver_exec_t,s0)
-+/usr/bin/Xair		--	gen_context(system_u:object_r:xserver_exec_t,s0)
- 
- /usr/lib(64)?/qt-.*/etc/settings(/.*)?	gen_context(system_u:object_r:xdm_var_run_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/zebra.te serefpolicy-2.2.16/policy/modules/services/zebra.te
---- nsaserefpolicy/policy/modules/services/zebra.te	2006-02-14 07:20:29.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/services/zebra.te	2006-02-19 07:09:54.000000000 -0500
-@@ -73,6 +73,7 @@
- corenet_tcp_bind_all_nodes(zebra_t)
- corenet_udp_bind_all_nodes(zebra_t)
- corenet_tcp_bind_zebra_port(zebra_t)
-+corenet_udp_bind_router_port(zebra_t)
- 
- dev_associate_usbfs(zebra_var_run_t)
- dev_list_all_dev_nodes(zebra_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.16/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-14 07:20:29.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/fstools.te	2006-02-19 07:09:54.000000000 -0500
-@@ -15,7 +15,7 @@
- type fsadm_tmp_t;
- files_tmp_file(fsadm_tmp_t)
- 
--type swapfile_t;
-+type swapfile_t; # customizable
- files_type(swapfile_t)
- 
- ########################################
-@@ -162,3 +162,8 @@
- optional_policy(`nis',`
- 	nis_use_ypbind(fsadm_t)
- ')
++userdom_mounton_generic_user_home_dir(mount_t)
 +
-+optional_policy(`amanda',`
-+	amanda_rw_dumpdates_files(fsadm_t)
-+	amanda_append_log_files(fsadm_t)
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.16/policy/modules/system/libraries.fc
---- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/libraries.fc	2006-02-19 07:09:54.000000000 -0500
-@@ -62,7 +62,7 @@
- /usr/lib(64)?/im/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- /usr/lib(64)?/iiim/.*\.so.*		--	gen_context(system_u:object_r:shlib_t,s0)
- 
--/usr/lib(64)?/libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
-+/usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
- /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.if serefpolicy-2.2.16/policy/modules/system/modutils.if
---- nsaserefpolicy/policy/modules/system/modutils.if	2006-02-10 21:34:15.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/modutils.if	2006-02-19 07:09:55.000000000 -0500
-@@ -204,7 +204,7 @@
- 	')
- 
- 	modutils_domtrans_depmod($1)
--	role $2 types insmod_t;
-+	role $2 types depmod_t;
- 	allow insmod_t $3:chr_file rw_term_perms;
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.16/policy/modules/system/selinuxutil.fc
+ ifdef(`TODO',`
+ # TODO: Need to examine this further. Not sure how to handle this
+ #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.17/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.fc	2006-02-19 07:09:55.000000000 -0500
-@@ -39,3 +39,5 @@
++++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.fc	2006-02-20 17:04:24.000000000 -0500
+@@ -39,3 +39,10 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
  ')
 +
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.16/policy/modules/system/selinuxutil.if
++
++/etc/selinux([^/]*/)?modules    -d	gen_context(system_u:object_r:selinux_config_t,s0)
++/etc/selinux([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semodule_store_t,s0)
++/etc/selinux([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
++/etc/selinux([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
+\ No newline at end of file
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.17/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.if	2006-02-19 07:09:55.000000000 -0500
-@@ -671,7 +671,7 @@
- 
- 	files_search_etc($1)
- 	allow $1 selinux_config_t:dir search;
--	allow $1 policy_config_t:dir rw_dir_perms;
-+	allow $1 policy_config_t:dir create_dir_perms;
- 	allow $1 policy_config_t:file create_file_perms;
- 	typeattribute $1 can_write_binary_policy;
- ')
-@@ -705,3 +705,28 @@
++++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.if	2006-02-20 17:01:53.000000000 -0500
+@@ -705,3 +705,90 @@
  	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
  ')
@@ -359,14 +244,87 @@
 +	allow semodule_t $1:fifo_file rw_file_perms;
 +	allow semodule_t $1:process sigchld;
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.16/policy/modules/system/selinuxutil.te
++
++
++
++########################################
++## <summary>
++##	Create, read, write, and delete files in
++##	/etc/selinux/*/modules/*
++##	such as mtab.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`seutil_manage_module_store_files',`
++	gen_require(`
++		type semodule_store_t;
++	')
++
++	allow $1 semodule_store_t:dir rw_dir_perms;
++	allow $1 semodule_store_t:file create_file_perms;
++	type_transition $1 selinux_config_t:dir semodule_store_t;
++')
++
++
++#######################################
++## <summary>
++##	Get read lock on module store
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`seutil_module_get_read_lock',`
++	gen_require(`
++		type semodule_read_lock_t;
++	')
++
++	allow $1 semodule_read_lock_t:file rw_file_perms;
++')
++
++#######################################
++## <summary>
++##	Get trans lock on module store
++## </summary>
++## <param name="domain">
++##	<summary>
++##	The type of the process performing this action.
++##	</summary>
++## </param>
++#
++interface(`seutil_module_get_trans_lock',`
++	gen_require(`
++		type semodule_trans_lock_t;
++	')
++
++	allow $1 semodule_trans_lock_t:file rw_file_perms;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.17/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/selinuxutil.te	2006-02-19 07:09:55.000000000 -0500
-@@ -535,3 +535,53 @@
- # scripts will put things in a state such that setfiles can not be run!
- allow setfiles_t lib_t:file { read execute };
- ') dnl endif TODO
++++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.te	2006-02-20 17:08:53.000000000 -0500
+@@ -526,12 +526,74 @@
+ 
+ miscfiles_read_localization(setfiles_t)
+ 
++seutil_module_get_trans_lock(setfiles_t)
++seutil_module_get_read_lock(setfiles_t)
 +
+ userdom_use_all_users_fd(setfiles_t)
+ # for config files in a home directory
+ userdom_read_all_user_files(setfiles_t)
+ 
+-ifdef(`TODO',`
+-# for upgrading glibc and other shared objects - without this the upgrade
+-# scripts will put things in a state such that setfiles can not be run!
+-allow setfiles_t lib_t:file { read execute };
+-') dnl endif TODO
 +########################################
 +#
 +# Declarations
@@ -374,10 +332,20 @@
 +
 +type semodule_t;
 +domain_type(semodule_t)
++
 +type semodule_exec_t;
 +domain_entry_file(semodule_t, semodule_exec_t)
 +role system_r types semodule_t;
 +
++type semodule_store_t;
++files_type(semodule_store_t)
++
++type semodule_read_lock_t;
++files_type(semodule_read_lock_t)
++
++type semodule_trans_lock_t; 
++files_type(semodule_trans_lock_t)
++
 +term_use_all_terms(semodule_t)
 +allow semodule_t policy_config_t:file { read write };
 +
@@ -401,6 +369,7 @@
 +libs_use_shared_libs(semodule_t)
 +libs_use_lib_files(semodule_t)
 +
++mls_file_write_down(semodule_t)
 +mls_rangetrans_target(semodule_t)
 +
 +optional_policy(`selinux', `
@@ -416,27 +385,58 @@
 +seutil_use_newrole_fd(semodule_t)
 +
 +allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.16/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/unconfined.te	2006-02-19 07:09:55.000000000 -0500
-@@ -157,6 +157,14 @@
- 		wine_domtrans(unconfined_t)
++
++seutil_manage_module_store_files(semodule_t)
++seutil_module_get_trans_lock(semodule_t)
++seutil_module_get_read_lock(semodule_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.17/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-20 14:07:38.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/system/userdomain.if	2006-02-20 16:22:06.000000000 -0500
+@@ -145,6 +145,7 @@
+ 	allow $1_t unpriv_userdomain:fd use;
+ 
+ 	kernel_read_kernel_sysctls($1_t)
++	kernel_read_net_sysctls($1_t)
+ 	kernel_dontaudit_list_unlabeled($1_t)
+ 	kernel_dontaudit_getattr_unlabeled_files($1_t)
+ 	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
+@@ -414,6 +415,8 @@
+ 	optional_policy(`rpm',`
+ 		files_getattr_var_lib_dirs($1_t)
+ 		files_search_var_lib($1_t)
++		rpm_read_db($1_t)
++		rpm_dontaudit_manage_db($1_t)
  	')
  
-+	optional_policy(`java',`
-+		java_domtrans(unconfined_t)
-+	')
+ 	optional_policy(`samba',`
+@@ -4423,3 +4426,24 @@
+ 	allow $1 user_home_dir_t:dir create_dir_perms;
+ 	files_filetrans_home($1,user_home_dir_t)
+ ')
 +
-+	optional_policy(`vpn',`
-+		vpn_domtrans(unconfined_t)
++
++########################################
++## <summary>
++##	mounton generic user home directories.
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain allowed access.
++##	</summary>
++## </param>
++#
++interface(`userdom_mounton_generic_user_home_dir',`
++	gen_require(`
++		attribute user_home_dir_type, user_home_type;
 +	')
 +
- 	optional_policy(`xserver',`
- 		xserver_domtrans_xdm_xserver(unconfined_t)
- 	')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.16/policy/modules/system/userdomain.te
++	allow $1 user_home_dir_type:dir mounton;
++	allow $1 user_home_type:dir mounton;
++')
++
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.17/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.16/policy/modules/system/userdomain.te	2006-02-19 07:09:55.000000000 -0500
++++ serefpolicy-2.2.17/policy/modules/system/userdomain.te	2006-02-20 16:22:06.000000000 -0500
 @@ -358,6 +358,8 @@
  			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
@@ -446,9 +446,9 @@
  			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
  		', `
  			selinux_set_enforce_mode(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.16/support/Makefile.devel
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.17/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-16 16:42:39.000000000 -0500
-+++ serefpolicy-2.2.16/support/Makefile.devel	2006-02-19 07:09:55.000000000 -0500
++++ serefpolicy-2.2.17/support/Makefile.devel	2006-02-20 16:22:06.000000000 -0500
 @@ -1,3 +1,6 @@
 +# installation paths
 +SHAREDIR := $(PREFIX)/share/selinux


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- selinux-policy.spec	19 Feb 2006 12:17:15 -0000	1.111
+++ selinux-policy.spec	20 Feb 2006 22:11:40 -0000	1.112
@@ -1,11 +1,14 @@
 %define distro redhat
 %define monolithic n
+%define BUILD_STRICT 0
+%define BUILD_TARGETED 0
+%define BUILD_MLS 1
 %define POLICYVER 20
 %define POLICYCOREUTILSVER 1.29.18-1
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.16
+Version: 2.2.17
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -36,18 +39,6 @@
 %{_mandir}/man8/*
 %doc /usr/share/doc/%{name}-%{version}
 
-%package targeted
-Summary: SELinux targeted base policy
-Group: System Environment/Base
-Provides: selinux-policy-base
-Obsoletes: selinux-policy-targeted-sources
-Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
-Prereq: coreutils
-Prereq: selinux-policy = %{version}-%{release}
-
-%description targeted
-SELinux Reference policy targeted base module.
-
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} conf \
@@ -63,6 +54,8 @@
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/policy \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
+touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} enableaudit \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
@@ -87,6 +80,8 @@
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
 %dir %{_sysconfdir}/selinux/%1/modules \
+%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
+%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \
 %attr(700,root,root) %dir %{_sysconfdir}/selinux/%1/modules/active \
 #%verify(not md5 size mtime) %attr(600,root,root) %config(noreplace) %{_sysconfdir}/selinux/%1/modules/active/seusers \
 %dir %{_sysconfdir}/selinux/%1/policy/ \
@@ -143,6 +138,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -m 644 man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
+%if 0
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
 %setupCmds targeted targeted-mcs y
@@ -153,6 +149,7 @@
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} bare 
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} conf
 %installCmds strict strict-mcs y
+%endif
 
 # Build mls policy
 %setupCmds mls strict-mls n
@@ -168,6 +165,19 @@
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
 
+%if 0
+%package targeted
+Summary: SELinux targeted base policy
+Group: System Environment/Base
+Provides: selinux-policy-base
+Obsoletes: selinux-policy-targeted-sources
+Prereq: policycoreutils >= %{POLICYCOREUTILSVER}
+Prereq: coreutils
+Prereq: selinux-policy = %{version}-%{release}
+
+%description targeted
+SELinux Reference policy targeted base module.
+
 %files targeted
 %fileList targeted
 
@@ -212,6 +222,7 @@
 
 %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
 %rebuildpolicy targeted
+%endif
 
 %package mls 
 Summary: SELinux mls base policy
@@ -238,6 +249,7 @@
 %files mls
 %fileList mls
 
+%if 0
 %package strict 
 Summary: SELinux strict base policy
 Group: System Environment/Base
@@ -263,6 +275,8 @@
 %files strict
 %fileList strict
 
+%endif
+
 %package devel
 Summary: SELinux policy devel sources
 Group: System Environment/Base


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	19 Feb 2006 12:17:15 -0000	1.44
+++ sources	20 Feb 2006 22:11:40 -0000	1.45
@@ -1 +1 @@
-cf0c73ab94eb55f86f8843bfd585302b  serefpolicy-2.2.16.tgz
+13c8e375555ca342df487f40e9d8217e  serefpolicy-2.2.17.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 20 22:15:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 17:15:03 -0500
Subject: rpms/dhcp/devel dhcp-3.0.3-bz176615.patch, 1.1, 1.2 dhcp.spec, 1.86,
	1.87
Message-ID: <200602202215.k1KMF3P9018764@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18728

Modified Files:
	dhcp-3.0.3-bz176615.patch dhcp.spec 
Log Message:
Apply upstream fix for bug 176615 / ISC RT#15811

dhcp-3.0.3-bz176615.patch:
 tables.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: dhcp-3.0.3-bz176615.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.3-bz176615.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.3-bz176615.patch	16 Jan 2006 21:12:00 -0000	1.1
+++ dhcp-3.0.3-bz176615.patch	20 Feb 2006 22:14:58 -0000	1.2
@@ -1,24 +1,38 @@
---- dhcp-3.0.3/server/dhcp.c.bz176615	2006-01-09 15:17:10.000000000 -0500
-+++ dhcp-3.0.3/server/dhcp.c	2006-01-16 15:41:11.000000000 -0500
-@@ -193,8 +193,19 @@
-  	 */
-   	if ((oc = lookup_option (&dhcp_universe, packet -> options,
-   				 DHO_HOST_NAME))) {
--  		if (!oc -> expression)
-- 			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+		if (!oc -> expression)
-+		{
-+			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+			if ( (!ms_nulltp) && (oc->data.data[ oc->data.len - 1 ] == '\0') )
-+			{
-+				while (oc -> data.len &&
-+				       oc -> data.data [oc -> data.len - 1] == 0) {
-+					ms_nulltp = 1;
-+					oc -> flags |= OPTION_HAD_NULLS;
-+					oc -> data.len--;
-+				}
-+			}
-+		}
-   	}
-   
-  	/* Classify the client. */
+--- dhcp-3.0.3/common/tables.c.bz176615	2006-02-20 16:55:41.000000000 -0500
++++ dhcp-3.0.3/common/tables.c	2006-02-20 16:57:18.000000000 -0500
+@@ -102,7 +102,7 @@
+ 	{ "lpr-servers", "IA",				&dhcp_universe, 9 },
+ 	{ "impress-servers", "IA",			&dhcp_universe, 10 },
+ 	{ "resource-location-servers", "IA",		&dhcp_universe, 11 },
+-	{ "host-name", "X",				&dhcp_universe, 12 },
++	{ "host-name", "t",				&dhcp_universe, 12 },
+ 	{ "boot-size", "S",				&dhcp_universe, 13 },
+ 	{ "merit-dump", "t",				&dhcp_universe, 14 },
+ 	{ "domain-name", "t",				&dhcp_universe, 15 },
+@@ -152,7 +152,7 @@
+ 	{ "dhcp-rebinding-time", "L",			&dhcp_universe, 59 },
+ 	{ "vendor-class-identifier", "X",		&dhcp_universe, 60 },
+ 	{ "dhcp-client-identifier", "X",		&dhcp_universe, 61 },
+-	{ "nwip-domain", "X",				&dhcp_universe, 62 },
++	{ "nwip-domain", "t",				&dhcp_universe, 62 },
+ 	{ "nwip-suboptions", "Enwip.",			&dhcp_universe, 63 },
+ 	{ "nisplus-domain", "t",			&dhcp_universe, 64 },
+ 	{ "nisplus-servers", "IA",			&dhcp_universe, 65 },
+@@ -176,7 +176,7 @@
+ 	{ "unknown-83", "X",				&dhcp_universe, 83 },
+ 	{ "unknown-84", "X",				&dhcp_universe, 84 },
+ 	{ "nds-servers", "IA",				&dhcp_universe, 85 },
+-	{ "nds-tree-name", "X",				&dhcp_universe, 86 },
++	{ "nds-tree-name", "t",				&dhcp_universe, 86 },
+ 	{ "nds-context", "X",				&dhcp_universe, 87 },
+ 	{ "unknown-88", "X",				&dhcp_universe, 88 },
+ 	{ "unknown-89", "X",				&dhcp_universe, 89 },
+@@ -208,7 +208,7 @@
+ 	{ "unknown-115", "X",				&dhcp_universe, 115 },
+ 	{ "unknown-116", "X",				&dhcp_universe, 116 },
+ 	{ "unknown-117", "X",				&dhcp_universe, 117 },
+-	{ "subnet-selection", "X",			&dhcp_universe, 118 },
++	{ "subnet-selection", "I",			&dhcp_universe, 118 },
+ 	{ "unknown-119", "X",				&dhcp_universe, 119 },
+ 	{ "unknown-120", "X",				&dhcp_universe, 120 },
+ 	{ "unknown-121", "X",				&dhcp_universe, 121 },


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- dhcp.spec	14 Feb 2006 18:23:46 -0000	1.86
+++ dhcp.spec	20 Feb 2006 22:14:58 -0000	1.87
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.3
-Release: 22
+Release: 24
 Epoch:   11
 License: distributable
 Group: System Environment/Daemons
@@ -327,6 +327,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 20 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-24
+- Apply upstream fix for bug 176615 / ISC RT#15811
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.3-22
 - fix bug 181482: resolv.conf not updated on RENEW :
   since dhcp-3.0.1rc12-RHScript.patch: "$new_domain_servers" should have



From fedora-cvs-commits at redhat.com  Mon Feb 20 22:45:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 17:45:07 -0500
Subject: rpms/dhcp/FC-4 dhcp-3.0.2-bz176615.patch, 1.1, 1.2 dhcp.spec, 1.69,
	1.70
Message-ID: <200602202245.k1KMj7HT010190@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10053

Modified Files:
	dhcp-3.0.2-bz176615.patch dhcp.spec 
Log Message:
apply upstream patch for bug 176615 / ISC RT#15811

dhcp-3.0.2-bz176615.patch:
 tables.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: dhcp-3.0.2-bz176615.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp-3.0.2-bz176615.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.2-bz176615.patch	16 Jan 2006 21:31:04 -0000	1.1
+++ dhcp-3.0.2-bz176615.patch	20 Feb 2006 22:45:05 -0000	1.2
@@ -1,24 +1,38 @@
---- dhcp-3.0.2/server/dhcp.c.bz176615	2006-01-16 16:20:45.000000000 -0500
-+++ dhcp-3.0.2/server/dhcp.c	2006-01-16 16:21:23.000000000 -0500
-@@ -193,8 +193,19 @@
-  	 */
-   	if ((oc = lookup_option (&dhcp_universe, packet -> options,
-   				 DHO_HOST_NAME))) {
--  		if (!oc -> expression)
-- 			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+		if (!oc -> expression)
-+		{
-+			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+			if ( (!ms_nulltp) && (oc->data.data[ oc->data.len - 1 ] == '\0') )
-+			{
-+				while (oc -> data.len &&
-+				       oc -> data.data [oc -> data.len - 1] == 0) {
-+					ms_nulltp = 1;
-+					oc -> flags |= OPTION_HAD_NULLS;
-+					oc -> data.len--;
-+				}
-+			}
-+		}
-   	}
- 
- 	/* Classify the client. */
+--- dhcp-3.0.2/common/tables.c.bz176615	2006-02-20 17:37:26.000000000 -0500
++++ dhcp-3.0.2/common/tables.c	2006-02-20 17:39:06.000000000 -0500
+@@ -102,7 +102,7 @@
+ 	{ "lpr-servers", "IA",				&dhcp_universe, 9 },
+ 	{ "impress-servers", "IA",			&dhcp_universe, 10 },
+ 	{ "resource-location-servers", "IA",		&dhcp_universe, 11 },
+-	{ "host-name", "X",				&dhcp_universe, 12 },
++	{ "host-name", "t",				&dhcp_universe, 12 },
+ 	{ "boot-size", "S",				&dhcp_universe, 13 },
+ 	{ "merit-dump", "t",				&dhcp_universe, 14 },
+ 	{ "domain-name", "t",				&dhcp_universe, 15 },
+@@ -152,7 +152,7 @@
+ 	{ "dhcp-rebinding-time", "L",			&dhcp_universe, 59 },
+ 	{ "vendor-class-identifier", "X",		&dhcp_universe, 60 },
+ 	{ "dhcp-client-identifier", "X",		&dhcp_universe, 61 },
+-	{ "nwip-domain", "X",				&dhcp_universe, 62 },
++	{ "nwip-domain", "t",				&dhcp_universe, 62 },
+ 	{ "nwip-suboptions", "Enwip.",			&dhcp_universe, 63 },
+ 	{ "nisplus-domain", "t",			&dhcp_universe, 64 },
+ 	{ "nisplus-servers", "IA",			&dhcp_universe, 65 },
+@@ -176,7 +176,7 @@
+ 	{ "unknown-83", "X",				&dhcp_universe, 83 },
+ 	{ "unknown-84", "X",				&dhcp_universe, 84 },
+ 	{ "nds-servers", "IA",				&dhcp_universe, 85 },
+-	{ "nds-tree-name", "X",				&dhcp_universe, 86 },
++	{ "nds-tree-name", "t",				&dhcp_universe, 86 },
+ 	{ "nds-context", "X",				&dhcp_universe, 87 },
+ 	{ "unknown-88", "X",				&dhcp_universe, 88 },
+ 	{ "unknown-89", "X",				&dhcp_universe, 89 },
+@@ -208,7 +208,7 @@
+ 	{ "unknown-115", "X",				&dhcp_universe, 115 },
+ 	{ "unknown-116", "X",				&dhcp_universe, 116 },
+ 	{ "unknown-117", "X",				&dhcp_universe, 117 },
+-	{ "subnet-selection", "X",			&dhcp_universe, 118 },
++	{ "subnet-selection", "I",			&dhcp_universe, 118 },
+ 	{ "unknown-119", "X",				&dhcp_universe, 119 },
+ 	{ "unknown-120", "X",				&dhcp_universe, 120 },
+ 	{ "unknown-121", "X",				&dhcp_universe, 121 },


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dhcp.spec	14 Feb 2006 18:37:17 -0000	1.69
+++ dhcp.spec	20 Feb 2006 22:45:05 -0000	1.70
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.2
-Release: 32.FC4
+Release: 34.FC4
 Epoch:   10
 License: distributable
 Group: System Environment/Daemons
@@ -311,6 +311,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 20 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-34
+- Apply upstream fix for bug 176615 / ISC RT#15811
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-32
 - fix bug 181482: resolv.conf not updated on RENEW :
   since dhcp-3.0.1rc12-RHScript.patch: "$new_domain_servers" should have



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:07:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:07:42 -0500
Subject: rpms/cpuspeed/devel cpuspeed.init,1.5,1.6 cpuspeed.spec,1.30,1.31
Message-ID: <200602210207.k1L27eRc024080@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24020

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
Some ACPI BIOSes start counting CPUs at 0, some at 1. *sigh*  (#181673)




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpuspeed.init	15 Nov 2005 03:42:16 -0000	1.5
+++ cpuspeed.init	21 Feb 2006 02:07:36 -0000	1.6
@@ -26,7 +26,7 @@
 				# 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 /proc/acpi/processor/CPU0/throttling`
+					thr=`head -n1 -q /proc/acpi/processor/CPU*/throttling | uniq`
 					if [ "$thr" != "<not supported>" ]; then
 						/sbin/modprobe acpi-cpufreq
 					fi


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cpuspeed.spec	11 Feb 2006 21:38:27 -0000	1.30
+++ cpuspeed.spec	21 Feb 2006 02:07:36 -0000	1.31
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Mon Feb 20 2006 Dave Jones <davej at redhat.com>
+- Some ACPI BIOSes start counting CPUs at 0, some at 1. *sigh*  (#181673)
+
 * Sat Feb 11 2006 Dave Jones <davej at redhat.com>
 - rebuild.
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:08:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:08:51 -0500
Subject: rpms/cpuspeed/FC-4 cpuspeed.init,1.3,1.4 cpuspeed.spec,1.24,1.25
Message-ID: <200602210208.k1L28pZK024378@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24333

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
Some ACPI BIOSes start counting CPUs at 0, some at 1. *sigh*  (#181673)




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-4/cpuspeed.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cpuspeed.init	23 Dec 2005 07:42:04 -0000	1.3
+++ cpuspeed.init	21 Feb 2006 02:08:39 -0000	1.4
@@ -26,7 +26,7 @@
 				# 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 /proc/acpi/processor/CPU0/throttling`
+					thr=`head -n1 -q /proc/acpi/processor/CPU*/throttling | uniq`
 					if [ "$thr" != "<not supported>" ]; then
 						/sbin/modprobe acpi-cpufreq
 					fi


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-4/cpuspeed.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cpuspeed.spec	23 Dec 2005 07:42:04 -0000	1.24
+++ cpuspeed.spec	21 Feb 2006 02:08:39 -0000	1.25
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Mon Feb 20 2006 Dave Jones <davej at redhat.com>
+- Some ACPI BIOSes start counting CPUs at 0, some at 1. *sigh*  (#181673)
+
 * Fri Dec 23 2005 Dave Jones <davej at redhat.com>
 - Reset speed to max on deamon exit.
 - Don't load acpi-cpufreq if no throttling states exist.



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:35:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:35:47 -0500
Subject: rpms/kernel/FC-4 linux-2.6-net-ipw2200-monitor.patch, NONE,
	1.1 kernel-2.6.spec, 1.1603, 1.1604
Message-ID: <200602210235.k1L2ZlXL012883@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12625

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-ipw2200-monitor.patch 
Log Message:
enable ipw2200 monitor mode


linux-2.6-net-ipw2200-monitor.patch:
 Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6-net-ipw2200-monitor.patch ---
--- linux-2.6.15/drivers/net/wireless/Kconfig~	2006-02-20 21:30:24.000000000 -0500
+++ linux-2.6.15/drivers/net/wireless/Kconfig	2006-02-20 21:30:41.000000000 -0500
@@ -241,6 +241,15 @@ config IPW_DEBUG
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config IPW2200_MONITOR
+       bool "Enable promiscuous mode"
+       depends on IPW2200
+       ---help---
+         Enables promiscuous/monitor mode support for the ipw2200 driver.
+         With this feature compiled into the driver, you can switch to
+         promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+         mode, no packets can be sent.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
 	depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1603
retrieving revision 1.1604
diff -u -r1.1603 -r1.1604
--- kernel-2.6.spec	19 Feb 2006 05:34:11 -0000	1.1603
+++ kernel-2.6.spec	21 Feb 2006 02:35:44 -0000	1.1604
@@ -313,6 +313,7 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-ipw2200-hwcrypto.patch
+Patch1303: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -726,6 +727,8 @@
 %patch1301 -p1
 # ipw2200 hwcrypto=0 by default to avoid firmware restarts
 %patch1302 -p1
+# Make monitor mode work for ipw2200
+%patch1303 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -1281,6 +1284,9 @@
 %endif
 
 %changelog
+* Mon Feb 20 2006 Dave Jones <davej at redhat.com>
+- Make monitor mode work for ipw2200
+
 * Sun Feb 19 2006 Dave Jones <davej at redhat.com>
 - Bump minimum requirements for module-init-tools & udev
 - Make 16C950 UARTs work.



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:35:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:35:49 -0500
Subject: rpms/kernel/FC-4/configs config-x86-generic, 1.19,
	1.20 config-x86_64-generic, 1.17, 1.18
Message-ID: <200602210235.k1L2ZnMR012897@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv12625/configs

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
enable ipw2200 monitor mode



Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	21 Feb 2006 02:35:46 -0000	1.20
@@ -247,6 +247,7 @@
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-x86_64-generic	10 Feb 2006 02:02:47 -0000	1.17
+++ config-x86_64-generic	21 Feb 2006 02:35:46 -0000	1.18
@@ -108,6 +108,7 @@
 CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW_DEBUG is not set
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:38:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:38:34 -0500
Subject: rpms/kernel/FC-4 linux-2.6-usb-unusual-devices.patch, NONE,
	1.1 kernel-2.6.spec, 1.1604, 1.1605
Message-ID: <200602210238.k1L2cY1n013754@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13711

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-usb-unusual-devices.patch 
Log Message:
Add another mp3 player to the usb unusual device list. (#176584)



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/FC-4/kernel-2.6.spec,v
retrieving revision 1.1604
retrieving revision 1.1605
diff -u -r1.1604 -r1.1605
--- kernel-2.6.spec	21 Feb 2006 02:35:44 -0000	1.1604
+++ kernel-2.6.spec	21 Feb 2006 02:38:30 -0000	1.1605
@@ -357,6 +357,7 @@
 Patch1850: linux-2.6-8250-16c950-faster.patch
 Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch
 Patch1870: linux-2.6-usb-find-interface.patch
+Patch1871: linux-2.6-usb-unusual-devices.patch
 Patch1880: linux-2.6-i2c-it87-reboot.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -806,6 +807,8 @@
 %patch1860 -p1
 # Fix idiocy in usb_find_interface()
 %patch1870 -p1
+# Add another mp3 player to the usb unusual device list.
+%patch1871 -p1
 # Some it87 probing causes reboots on some systems.
 %patch1880 -p1
 
@@ -1286,6 +1289,7 @@
 %changelog
 * Mon Feb 20 2006 Dave Jones <davej at redhat.com>
 - Make monitor mode work for ipw2200
+- Add another mp3 player to the usb unusual device list. (#176584)
 
 * Sun Feb 19 2006 Dave Jones <davej at redhat.com>
 - Bump minimum requirements for module-init-tools & udev



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:39:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:39:26 -0500
Subject: rpms/kernel/FC-4 linux-2.6-usb-find-interface.patch,1.1,1.2
Message-ID: <200602210239.k1L2dQ40014032@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13993

Modified Files:
	linux-2.6-usb-find-interface.patch 
Log Message:
trim


linux-2.6-usb-find-interface.patch:
 usb.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

Index: linux-2.6-usb-find-interface.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-usb-find-interface.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-usb-find-interface.patch	9 Feb 2006 10:58:04 -0000	1.1
+++ linux-2.6-usb-find-interface.patch	21 Feb 2006 02:39:22 -0000	1.2
@@ -1,63 +1,8 @@
-From bugzilla at redhat.com Wed Dec 21 19:27:47 2005
-Return-path: <apache at redhat.com>
-Delivery-date: Wed, 21 Dec 2005 19:27:47 +0000
-Received: from [172.16.58.1] (helo=devserv.devel.redhat.com) by
-	hades.cambridge.redhat.com with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
-	1Ep9cp-0002hs-5p for dwmw2 at cambridge.redhat.com; Wed, 21 Dec 2005 19:27:47
-	+0000
-Received: from dwmw2 by devserv.devel.redhat.com with local (Exim 4.41 #1
-	(Red Hat Linux)) id 1Ep9c1-00009U-Aa for dwmw2 at cambridge.redhat.com; Wed,
-	21 Dec 2005 14:26:57 -0500
-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
-	[172.16.52.254]) by devserv.devel.redhat.com (8.12.11/8.12.11) with ESMTP
-	id jBLJQu1m000575 for <dwmw2 at devserv.devel.redhat.com>; Wed, 21 Dec 2005
-	14:26:56 -0500
-Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by
-	int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id jBLJQu116063 for
-	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:26:56 -0500
-Received: from www.beta.redhat.com (beta.redhat.com [172.16.48.203]) by
-	mx1.redhat.com (8.12.11/8.12.11) with ESMTP id jBLJQuRu016509 for
-	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:26:56 -0500
-Received: from www.beta.redhat.com (localhost.localdomain [127.0.0.1]) by
-	www.beta.redhat.com (8.12.11/8.12.10) with ESMTP id jBLJNERi006601 for
-	<dwmw2 at redhat.com>; Wed, 21 Dec 2005 14:23:14 -0500
-Received: (from apache at localhost) by www.beta.redhat.com
-	(8.12.11/8.12.11/Submit) id jBLJNEA5006599; Wed, 21 Dec 2005 14:23:14 -0500
-Date: Wed, 21 Dec 2005 14:23:14 -0500
-Message-Id: <200512211923.jBLJNEA5006599 at www.beta.redhat.com>
-From: bugzilla at redhat.com
-To: dwmw2 at redhat.com
-Subject: [Bug 176333] Cannot use second USB printer
-Content-type: text/plain; charset=utf-8
-In-Reply-To: <bug-176333-23438 at bugzilla.redhat.com>
-X-Loop: bugzilla at redhat.com
-X-BeenThere: bugzilla at redhat.com
-X-Bugzilla-Product: Fedora Core
-X-Bugzilla-Version: fc4
-X-Bugzilla-Component: kernel
-X-Bugzilla-Comment: Public
-X-Bugzilla-Reason: Reporter
-X-Bugzilla-Changed-Fields: Comment
-X-Evolution-Source: imap://dwmw2 at invincible.cambridge.redhat.com/
-Content-Transfer-Encoding: 8bit
-Mime-Version: 1.0
-
-Please do not reply directly to this email. All additional
-comments should be made in the comments box of this bug report.
 
 Summary: Cannot use second USB printer
 
-
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176333
 
-
-
-
-
-------- Additional Comments From zaitcev at redhat.com  2005-12-21 14:23 EST -------
-What a horrible shit. Written by Pat Mochel, no less.
-Please try this instead:
-
 --- linux-2.6.14/drivers/usb/core/usb.c	2005-10-28 19:12:01.000000000 -0700
 +++ linux-2.6.14-lem/drivers/usb/core/usb.c	2005-12-21 11:19:00.000000000 -0800
 @@ -478,20 +477,23 @@ usb_match_id(struct usb_interface *inter
@@ -109,9 +54,3 @@
  static int usb_device_match (struct device *dev, struct device_driver *drv)
 
 
--- 
-Configure bugmail: https://bugzilla.redhat.com/bugzilla/userprefs.cgi?tab=email
-------- You are receiving this mail because: -------
-You reported the bug, or are watching the reporter.
-
-



From fedora-cvs-commits at redhat.com  Tue Feb 21 02:59:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 21:59:45 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1971,1.1972
Message-ID: <200602210259.k1L2xj02002941@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2905

Modified Files:
	kernel-2.6.spec 
Log Message:
make it possible to disable xen and kdump builds


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971
retrieving revision 1.1972
diff -u -r1.1971 -r1.1972
--- kernel-2.6.spec	20 Feb 2006 19:06:58 -0000	1.1971
+++ kernel-2.6.spec	21 Feb 2006 02:59:42 -0000	1.1972
@@ -5,11 +5,13 @@
 
 %define buildup 1
 %define buildsmp 1
+# Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
-# includexenPAE requieres includexen enabled
-%define includexenPAE 0
+# Whether to build the Xen kernels, disable if you want.
+%define buildxen 1
+%define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 0
+%define buildkdump 1
 
 # Versions of various parts
 
@@ -42,21 +44,23 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
+# Xen and kdump only build on i686 and x86_64 ...
+%ifnarch i686 x86_64
+%define buildxen 0
+%define buildkdump 0
+%endif
+
+# ... and XenPAE only on i686
+%ifnarch i686
+%define buildxenPAE 0
+%endif
+
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch i586
 %define buildsmp 0
 %endif
 
-%ifarch i686
-%define buildxen %{includexen}
-%define buildxenPAE %{includexenPAE}
-%define buildkdump 1
-%else
-%define buildxen 0
-%define buildxenPAE 0
-%endif
-
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
@@ -65,8 +69,6 @@
 
 %ifarch x86_64
 %define buildsmp 0
-%define buildkdump 1
-%define buildxen %{includexen}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1



From fedora-cvs-commits at redhat.com  Tue Feb 21 03:32:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 22:32:53 -0500
Subject: rpms/libsepol/devel libsepol.spec,1.113,1.114
Message-ID: <200602210332.k1L3Wr8V025736@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/libsepol/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25698

Modified Files:
	libsepol.spec 
Log Message:
* Mon Feb 20 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-2
- Rebuild for fc5-head
* Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-1
- Upgrade to latest from NSA
	* Merged node_expand_addr bugfix and node_compare* change from
	  Ivan Gyurdiev.



Index: libsepol.spec
===================================================================
RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- libsepol.spec	17 Feb 2006 19:47:41 -0000	1.113
+++ libsepol.spec	21 Feb 2006 03:32:41 -0000	1.114
@@ -1,7 +1,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 1.11.18
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@@ -80,6 +80,8 @@
 %{_includedir}/sepol/policydb/*.h
 
 %changelog
+* Mon Feb 20 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-2
+- Rebuild for fc5-head
 * Fri Feb 17 2006 Dan Walsh <dwalsh at redhat.com> 1.11.18-1
 - Upgrade to latest from NSA
 	* Merged node_expand_addr bugfix and node_compare* change from



From fedora-cvs-commits at redhat.com  Tue Feb 21 03:59:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 22:59:20 -0500
Subject: rpms/gnome-utils/devel logview-close-crash.patch, NONE,
	1.1 gnome-utils.spec, 1.95, 1.96
Message-ID: <200602210359.k1L3xKUO010497@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10440

Modified Files:
	gnome-utils.spec 
Added Files:
	logview-close-crash.patch 
Log Message:
Fix a crash in gnome-system-log


logview-close-crash.patch:
 logrtns.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE logview-close-crash.patch ---
--- gnome-utils-2.13.92/logview/logrtns.c.logview-close	2005-11-23 14:30:00.000000000 -0500
+++ gnome-utils-2.13.92/logview/logrtns.c	2006-02-20 22:39:56.000000000 -0500
@@ -205,7 +205,7 @@
        return NULL;
 
    g_date_set_year (date, current_year);
-   day = g_new (Day, 1);
+   day = g_new0 (Day, 1);
    days = g_slist_append (days, day);
 
    day->date = date;
@@ -270,7 +270,7 @@
            }
            
            date = newdate;
-           day = g_new (Day, 1);
+           day = g_new0 (Day, 1);
            days = g_slist_append (days, day);
            
            day->date = date;
@@ -554,7 +554,7 @@
    g_return_if_fail (log);
    
    /* Close archive logs if there's some */
-   for (i = 0; i < log->versions; i++)
+   for (i = 1; i < log->versions; i++)
        log_close (log->older_logs[i]);
 
    /* Close file - this should not be needed */
@@ -563,7 +563,9 @@
 	   log->mon_file_handle = NULL;
    }
 
-   g_object_unref (log->model);
+   if (log->model)
+	   g_object_unref (log->model);
+
    g_strfreev (log->lines);
 
    if (log->days != NULL) {


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gnome-utils.spec	15 Feb 2006 13:41:41 -0000	1.95
+++ gnome-utils.spec	21 Feb 2006 03:59:16 -0000	1.96
@@ -20,7 +20,7 @@
 Summary: GNOME utility programs.
 Name: gnome-utils
 Version: 2.13.92
-Release: 3
+Release: 4
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -33,6 +33,7 @@
 
 Patch0: gnome-utils-2.11.90-schemasdir.patch
 Patch1: gcalctool-flex-crap.patch
+Patch2: logview-close-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome
@@ -88,6 +89,8 @@
 %patch1 -p2 -b .flex-crap
 popd
 
+%patch2 -p1 -b .logview-close
+
 %build
 pushd gcalctool-%{gcalctool_version}
 %configure
@@ -222,6 +225,9 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Mon Feb 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-4
+- Fix a crash in gnome-system-log when closing logs
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-3
 - Fix %%post 
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 04:40:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 23:40:30 -0500
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.14,
	1.15 gnome-doc-utils.spec, 1.17, 1.18 sources, 1.14, 1.15
Message-ID: <200602210440.k1L4eU2J003651@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3575

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.5.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Feb 2006 01:21:49 -0000	1.14
+++ .cvsignore	21 Feb 2006 04:40:27 -0000	1.15
@@ -11,3 +11,4 @@
 gnome-doc-utils-0.5.3.tar.bz2
 gnome-doc-utils-0.5.4.tar.bz2
 gnome-doc-utils-0.5.5.tar.bz2
+gnome-doc-utils-0.5.6.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome-doc-utils.spec	13 Feb 2006 01:21:49 -0000	1.17
+++ gnome-doc-utils.spec	21 Feb 2006 04:40:27 -0000	1.18
@@ -1,6 +1,6 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
-Version: 0.5.5
+Version: 0.5.6
 Release: 1
 License: LGPL
 Group: Development/Tools
@@ -53,6 +53,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Mon Feb 20 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.6-1
+- Update to 0.5.6
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.5-1
 - Update to 0.5.5
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Feb 2006 01:21:49 -0000	1.14
+++ sources	21 Feb 2006 04:40:27 -0000	1.15
@@ -1 +1 @@
-ce9a4787afb9aac91ce55bbee2127d43  gnome-doc-utils-0.5.5.tar.bz2
+fb59fdb7874593f8ed6f5a248b149236  gnome-doc-utils-0.5.6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 04:51:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 20 Feb 2006 23:51:25 -0500
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.112,1.113
Message-ID: <200602210451.k1L4pPtP021099@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21068

Modified Files:
	selinux-policy.spec 
Log Message:



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- selinux-policy.spec	20 Feb 2006 22:11:40 -0000	1.112
+++ selinux-policy.spec	21 Feb 2006 04:51:22 -0000	1.113
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.17
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -138,7 +138,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -m 644 man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
-%if 0
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
 %setupCmds targeted targeted-mcs y
@@ -149,7 +148,6 @@
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} bare 
 make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} conf
 %installCmds strict strict-mcs y
-%endif
 
 # Build mls policy
 %setupCmds mls strict-mls n
@@ -165,7 +163,6 @@
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
 
-%if 0
 %package targeted
 Summary: SELinux targeted base policy
 Group: System Environment/Base
@@ -222,7 +219,6 @@
 
 %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7
 %rebuildpolicy targeted
-%endif
 
 %package mls 
 Summary: SELinux mls base policy
@@ -249,7 +245,6 @@
 %files mls
 %fileList mls
 
-%if 0
 %package strict 
 Summary: SELinux strict base policy
 Group: System Environment/Base
@@ -275,8 +270,6 @@
 %files strict
 %fileList strict
 
-%endif
-
 %package devel
 Summary: SELinux policy devel sources
 Group: System Environment/Base
@@ -296,6 +289,10 @@
 
 %changelog
 
+* Mon Feb 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.17-2
+- Update to upstream
+- Fix semoudle polcy
+
 * Thu Feb 16 2006 Dan Walsh <dwalsh at redhat.com> 2.2.16-1
 - Update to upstream 
 - fix sysconfig/selinux link



From fedora-cvs-commits at redhat.com  Tue Feb 21 05:06:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 00:06:09 -0500
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.10,
	1.11 gnome-user-docs.spec, 1.13, 1.14 sources, 1.10, 1.11
Message-ID: <200602210506.k1L569pX025426@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25395

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.13.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Oct 2004 17:42:10 -0000	1.10
+++ .cvsignore	21 Feb 2006 05:06:06 -0000	1.11
@@ -1,3 +1,4 @@
 gnome2-user-docs-2.6.0.1.tar.bz2
 gnome2-user-docs-2.8.0-1.tar.bz2
 gnome2-user-docs-2.8.1.tar.bz2
+gnome-user-docs-2.13.1.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-user-docs.spec	9 Dec 2005 22:40:44 -0000	1.13
+++ gnome-user-docs.spec	21 Feb 2006 05:06:06 -0000	1.14
@@ -1,13 +1,11 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.8.1
-Release: 2.1
+Version:        2.13.1
+Release:	1 
 License:        FDL
 Source:         gnome2-user-docs-%{version}.tar.bz2
 Group:          Documentation
 
-Patch1:		gnome2-user-docs-2.8.1-no-menu-edit.patch 
-
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Obsoletes:      gnome-users-guide
@@ -22,8 +20,6 @@
 %prep
 %setup -q -n gnome2-user-docs-%{version}
 
-%patch1 -p1 -b .no-menu-edit
-
 %build
 %configure
 make 
@@ -52,6 +48,9 @@
 %{_datadir}/omf
 
 %changelog
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 2.13.1-1
+- Update to 2.13.1
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Oct 2004 17:42:10 -0000	1.10
+++ sources	21 Feb 2006 05:06:06 -0000	1.11
@@ -1 +1 @@
-90bdd21ea3e3e794f641dd805216f275  gnome2-user-docs-2.8.1.tar.bz2
+8bf65d9218f985488e2d763d8b00600a  gnome-user-docs-2.13.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 05:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 00:22:58 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch,1.12,1.13
Message-ID: <200602210522.k1L5Mw6j004492@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4255

Modified Files:
	policy-20060207.patch 
Log Message:


policy-20060207.patch:
 policy/modules/admin/su.if              |   19 ++----
 policy/modules/apps/slocate.te          |    2 
 policy/modules/kernel/devices.if        |   39 ++++++++++++++
 policy/modules/services/cron.if         |    2 
 policy/modules/services/cron.te         |    4 +
 policy/modules/services/cups.if         |   19 ++++++
 policy/modules/services/spamassassin.te |    1 
 policy/modules/services/ssh.if          |    2 
 policy/modules/system/authlogin.te      |    2 
 policy/modules/system/mount.te          |    2 
 policy/modules/system/selinuxutil.fc    |    7 ++
 policy/modules/system/selinuxutil.if    |   87 ++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te    |   74 +++++++++++++++++++++++++--
 policy/modules/system/userdomain.if     |   24 ++++++++
 policy/modules/system/userdomain.te     |    2 
 support/Makefile.devel                  |   12 +++-
 16 files changed, 278 insertions(+), 20 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- policy-20060207.patch	20 Feb 2006 22:11:40 -0000	1.12
+++ policy-20060207.patch	21 Feb 2006 05:22:50 -0000	1.13
@@ -308,34 +308,27 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.17/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.te	2006-02-20 17:08:53.000000000 -0500
-@@ -526,12 +526,74 @@
++++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.te	2006-02-21 00:09:26.000000000 -0500
+@@ -1,5 +1,5 @@
  
- miscfiles_read_localization(setfiles_t)
+-policy_module(selinuxutil,1.1.5)
++policy_module(selinuxutil,1.1.6)
  
-+seutil_module_get_trans_lock(setfiles_t)
-+seutil_module_get_read_lock(setfiles_t)
-+
- userdom_use_all_users_fd(setfiles_t)
- # for config files in a home directory
- userdom_read_all_user_files(setfiles_t)
- 
--ifdef(`TODO',`
--# for upgrading glibc and other shared objects - without this the upgrade
--# scripts will put things in a state such that setfiles can not be run!
--allow setfiles_t lib_t:file { read execute };
--') dnl endif TODO
-+########################################
-+#
-+# Declarations
+ gen_require(`
+ 	bool secure_mode;
+@@ -103,6 +103,27 @@
+ 
+ ########################################
+ #
++# semodule Declarations
 +#
 +
 +type semodule_t;
 +domain_type(semodule_t)
++role system_r types semodule_t;
 +
 +type semodule_exec_t;
 +domain_entry_file(semodule_t, semodule_exec_t)
-+role system_r types semodule_t;
 +
 +type semodule_store_t;
 +files_type(semodule_store_t)
@@ -346,13 +339,35 @@
 +type semodule_trans_lock_t; 
 +files_type(semodule_trans_lock_t)
 +
-+term_use_all_terms(semodule_t)
-+allow semodule_t policy_config_t:file { read write };
++########################################
++#
+ # Checkpolicy local policy
+ #
+ 
+@@ -526,12 +547,53 @@
+ 
+ miscfiles_read_localization(setfiles_t)
+ 
++seutil_module_get_trans_lock(setfiles_t)
++seutil_module_get_read_lock(setfiles_t)
 +
+ userdom_use_all_users_fd(setfiles_t)
+ # for config files in a home directory
+ userdom_read_all_user_files(setfiles_t)
+ 
+-ifdef(`TODO',`
+-# for upgrading glibc and other shared objects - without this the upgrade
+-# scripts will put things in a state such that setfiles can not be run!
+-allow setfiles_t lib_t:file { read execute };
+-') dnl endif TODO
 +########################################
 +#
 +# semodule local policy
 +#
++term_use_all_terms(semodule_t)
++allow semodule_t policy_config_t:file { read write };
++allow semodule_t self:unix_stream_socket create_stream_socket_perms;
++
 +corecmd_exec_bin(semodule_t)
 +corecmd_exec_sbin(semodule_t)
 +
@@ -372,10 +387,6 @@
 +mls_file_write_down(semodule_t)
 +mls_rangetrans_target(semodule_t)
 +
-+optional_policy(`selinux', `
-+	selinux_get_enforce_mode(semodule_t)
-+')
-+
 +seutil_search_default_contexts(semodule_t)
 +seutil_rw_file_contexts(semodule_t)
 +seutil_domtrans_setfiles(semodule_t)
@@ -384,11 +395,14 @@
 +seutil_manage_bin_policy(semodule_t)
 +seutil_use_newrole_fd(semodule_t)
 +
-+allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-+
 +seutil_manage_module_store_files(semodule_t)
 +seutil_module_get_trans_lock(semodule_t)
 +seutil_module_get_read_lock(semodule_t)
++
++optional_policy(`selinux', `
++	selinux_get_enforce_mode(semodule_t)
++')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.17/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-20 14:07:38.000000000 -0500
 +++ serefpolicy-2.2.17/policy/modules/system/userdomain.if	2006-02-20 16:22:06.000000000 -0500



From fedora-cvs-commits at redhat.com  Tue Feb 21 05:46:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 00:46:51 -0500
Subject: rpms/at-spi/devel .cvsignore, 1.19, 1.20 at-spi.spec, 1.28,
	1.29 sources, 1.19, 1.20
Message-ID: <200602210546.k1L5kpci020496@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20481

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	31 Jan 2006 12:57:52 -0000	1.19
+++ .cvsignore	21 Feb 2006 05:46:48 -0000	1.20
@@ -9,3 +9,4 @@
 at-spi-1.7.2.tar.bz2
 at-spi-1.7.3.tar.bz2
 at-spi-1.7.4.tar.bz2
+at-spi-1.7.5.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- at-spi.spec	11 Feb 2006 01:58:27 -0000	1.28
+++ at-spi.spec	21 Feb 2006 05:46:48 -0000	1.29
@@ -6,8 +6,8 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.4
-Release: 1.2
+Version: 1.7.5
+Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -58,6 +58,8 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+%find_lang at-spi
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
@@ -67,7 +69,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f at-spi.lang
 %defattr(-,root,root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -87,6 +89,9 @@
 %{_includedir}/* 
 
 %changelog
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.5-1
+- Update to 1.7.5 
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.7.4-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	31 Jan 2006 12:57:52 -0000	1.19
+++ sources	21 Feb 2006 05:46:48 -0000	1.20
@@ -1 +1 @@
-c1bd2652d96c8f628bc203367e3ae58f  at-spi-1.7.4.tar.bz2
+571faa3a1766047b0faae607ab883e89  at-spi-1.7.5.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 05:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 00:47:02 -0500
Subject: rpms/kernel/FC-4 linux-2.6-debug-boot-delay.patch, NONE,
	1.1 kernel-2.6.spec, 1.1605, 1.1606
Message-ID: <200602210547.k1L5l2DS020563@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20507

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-boot-delay.patch 
Log Message:
Add boot delay debug patch.



linux-2.6-debug-boot-delay.patch:
 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   35 +++++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-debug-boot-delay.patch ---

This one delays each printk() during boot by a variable time
(from kernel command line), while system_state == SYSTEM_BOOTING.
Caveat:  it's not terribly SMP safe or SMP nice.
Any ideas for improvements (esp. in the SMP area) are appreciated.

---

From: Randy Dunlap <rdunlap at xenotime.net>

Optionally add a boot delay after each kernel printk() call,
crudely measured in milliseconds, with a maximum delay of
10 seconds per printk.

Enable CONFIG_BOOT_DELAY=y and then add (e.g.):
"lpj=loops_per_jiffy boot_delay=100"
to the kernel command line.

Signed-off-by: Randy Dunlap <rdunlap at xenotime.net>
---

 init/calibrate.c  |    2 +-
 init/main.c       |   25 +++++++++++++++++++++++++
 kernel/printk.c   |   33 +++++++++++++++++++++++++++++++++
 lib/Kconfig.debug |   18 ++++++++++++++++++
 4 files changed, 77 insertions(+), 1 deletion(-)

--- linux-2615-work.orig/init/main.c
+++ linux-2615-work/init/main.c
@@ -557,6 +557,31 @@ static int __init initcall_debug_setup(c
 }
 __setup("initcall_debug", initcall_debug_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+unsigned int boot_delay = 0; /* msecs delay after each printk during bootup */
+extern long preset_lpj;
+unsigned long long printk_delay_msec = 0; /* per msec, based on boot_delay */
+
+static int __init boot_delay_setup(char *str)
+{
+	unsigned long lpj = preset_lpj ? preset_lpj : 1000000; /* some guess */
+	unsigned long long loops_per_msec = lpj / 1000 * CONFIG_HZ;
+
+	get_option(&str, &boot_delay);
+	if (boot_delay > 10 * 1000)
+		boot_delay = 0;
+
+	printk_delay_msec = loops_per_msec;
+	printk("boot_delay: %u, preset_lpj: %ld, lpj: %lu, CONFIG_HZ: %d, printk_delay_msec: %llu\n",
+		boot_delay, preset_lpj, lpj, CONFIG_HZ, printk_delay_msec);
+
+	return 1;
+}
+__setup("boot_delay=", boot_delay_setup);
+
+#endif
+
 struct task_struct *child_reaper = &init_task;
 
 extern initcall_t __initcall_start[], __initcall_end[];
--- linux-2615-work.orig/init/calibrate.c
+++ linux-2615-work/init/calibrate.c
@@ -10,7 +10,7 @@
 
 #include <asm/timex.h>
 
-static unsigned long preset_lpj;
+unsigned long preset_lpj;
 static int __init lpj_setup(char *str)
 {
 	preset_lpj = simple_strtoul(str,NULL,0);
--- linux-2615-work.orig/kernel/printk.c
+++ linux-2615-work/kernel/printk.c
@@ -23,6 +23,8 @@
 #include <linux/smp_lock.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/nmi.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>			/* For in_interrupt() */
 #include <linux/config.h>
@@ -201,6 +202,34 @@ out:
 
 __setup("log_buf_len=", log_buf_len_setup);
 
+#ifdef CONFIG_BOOT_DELAY
+
+extern unsigned int boot_delay; /* msecs to delay after each printk during bootup */
+extern long preset_lpj;
+extern unsigned long long printk_delay_msec;
+
+static void boot_delay_msec(int millisecs)
+{
+	unsigned long long k = printk_delay_msec * millisecs;
+	unsigned long timeout;
+
+	timeout = jiffies + msecs_to_jiffies(millisecs);
+	while (k) {
+		k--;
+		cpu_relax();
+		/*
+		 * use (volatile) jiffies to prevent
+		 * compiler reduction; loop termination via jiffies
+		 * is secondary and may or may not happen.
+		 */
+		if (time_after(jiffies, timeout))
+			break;
+		touch_nmi_watchdog();
+	}
+}
+
+#endif
+
 /*
  * Commands to do_syslog:
  *
@@ -520,6 +548,11 @@ asmlinkage int printk(const char *fmt, .
 	r = vprintk(fmt, args);
 	va_end(args);
 
+#ifdef CONFIG_BOOT_DELAY
+	if (boot_delay && system_state == SYSTEM_BOOTING)
+		boot_delay_msec(boot_delay);
+#endif
+
 	return r;
 }
 
--- linux-2615-work.orig/lib/Kconfig.debug
+++ linux-2615-work/lib/Kconfig.debug
@@ -186,6 +186,24 @@ config FRAME_POINTER
 	  some architectures or if you use external debuggers.
 	  If you don't debug the kernel, you can say N.
 
+config BOOT_DELAY
+	bool "Delay each boot message by N milliseconds"
+	depends on DEBUG_KERNEL
+	help
+	  This build option allows you to read kernel boot messages
+	  by inserting a short delay after each one.  The delay is
+	  specified in milliseconds on the kernel command line,
+	  using "boot_delay=N".
+
+	  It is likely that you would also need to use "lpj=M" to preset
+	  the "loops per jiffie" value.
+	  See a previous boot log for the "lpj" value to use for your
+	  system, and then set "lpj=M" before setting "boot_delay=N".
+	  NOTE:  Using this option may adversely affect SMP systems.
+	  I.e., processors other than the first one may not boot up.
+	  BOOT_DELAY also may cause DETECT_SOFTLOCKUP to detect
+	  what it believes to be lockup conditions.
+
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1605
retrieving revision 1.1606
diff -u -r1.1605 -r1.1606
--- kernel-2.6.spec	21 Feb 2006 02:38:30 -0000	1.1605
+++ kernel-2.6.spec	21 Feb 2006 05:46:59 -0000	1.1606
@@ -286,6 +286,7 @@
 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
+Patch1032: linux-2.6-debug-boot-delay.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -678,6 +679,7 @@
 #%patch1026 -p1
 %patch1027 -p1
 %patch1028 -p1
+%patch1032 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -1287,6 +1289,9 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Dave Jones <davej at redhat.com>
+- Add boot delay debug patch.
+
 * Mon Feb 20 2006 Dave Jones <davej at redhat.com>
 - Make monitor mode work for ipw2200
 - Add another mp3 player to the usb unusual device list. (#176584)



From fedora-cvs-commits at redhat.com  Tue Feb 21 05:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 00:47:02 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.54 config-s390-generic, 1.3, 1.4
Message-ID: <200602210547.k1L5l2aY020574@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv20507/configs

Modified Files:
	config-generic config-s390-generic 
Log Message:
Add boot delay debug patch.




Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	21 Feb 2006 05:47:00 -0000	1.54
@@ -2661,3 +2661,5 @@
 # CONFIG_DEBUG_VM is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 
+CONFIG_BOOT_DELAY=y
+


Index: config-s390-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-s390-generic,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-s390-generic	29 Sep 2005 23:07:41 -0000	1.3
+++ config-s390-generic	21 Feb 2006 05:47:00 -0000	1.4
@@ -164,3 +164,5 @@
 
 CONFIG_VMCP=m
 
+# CONFIG_BOOT_DELAY is not set
+



From fedora-cvs-commits at redhat.com  Tue Feb 21 06:08:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 01:08:14 -0500
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.11,
	1.12 gnome-power-manager.spec, 1.24, 1.25 sources, 1.11, 1.12
Message-ID: <200602210608.k1L68EeU020777@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20748

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
2.13.91



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	16 Feb 2006 05:03:57 -0000	1.11
+++ .cvsignore	21 Feb 2006 06:08:11 -0000	1.12
@@ -1,2 +1,3 @@
 gnome-power-manager-2.13.5.0.20060207.tar.bz2
 gnome-power-manager-2.13.90.tar.bz2
+gnome-power-manager-2.13.91.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnome-power-manager.spec	16 Feb 2006 05:12:51 -0000	1.24
+++ gnome-power-manager.spec	21 Feb 2006 06:08:11 -0000	1.25
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.13.90
+Version: 2.13.91
 Release: 1
 License: GPL
 Group: Applications/System
@@ -24,7 +24,6 @@
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
 Requires: scrollkeeper
-Patch0: gnome-power-manager-2.13.5.0.20060207-panel-integration.patch
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL 
@@ -34,10 +33,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .panel-integration
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --disable-actions-menu
 make
 
 %install
@@ -81,6 +79,10 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
+- Update to 2.13.91
+- Drop upstreamed patch
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 - Require dbus-x11 (#176656)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	16 Feb 2006 05:03:57 -0000	1.11
+++ sources	21 Feb 2006 06:08:11 -0000	1.12
@@ -1 +1 @@
-7ae17a222d83fc8bc04765bfd02287aa  gnome-power-manager-2.13.90.tar.bz2
+41f4e3f5cf11f8444ba37e7469d8680a  gnome-power-manager-2.13.91.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 07:21:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 02:21:59 -0500
Subject: rpms/udev/FC-4 udev.rules,1.29,1.30 udev.spec,1.94,1.95
Message-ID: <200602210721.k1L7Lxfp021195@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21109

Modified Files:
	udev.rules udev.spec 
Log Message:
- fixed pktcdvd device nameing (bz #161268)
- fixed dvb permissions (bz #179993)
- fixed pilot symlink creation
- removed last_rule from ttyUSB, ttyS, ttyACM
- conflicts with old module-init-tools



Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-4/udev.rules,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- udev.rules	31 Jan 2006 16:05:27 -0000	1.29
+++ udev.rules	21 Feb 2006 07:21:56 -0000	1.30
@@ -26,13 +26,15 @@
 KERNEL=="vc/s*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
 
 # serial+dialup devices
-KERNEL=="ttyS*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
-KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ttyS*",		GROUP="uucp", MODE="0660"
+KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660"
 KERNEL=="ippp*",		MODE="0660"
 KERNEL=="isdn*",		MODE="0660"
 KERNEL=="isdnctrl*",		MODE="0660"
-KERNEL=="capi*",		MODE="0660"
+SYSFS{dev}=="191:[0-9]*",        NAME="capi/%n", MODE="0660"
+SYSFS{dev}=="68:0",              NAME="capi20", MODE="0660"
+
 KERNEL=="dcbri*",		MODE="0660"
 KERNEL=="ircomm*",		GROUP="uucp", MODE="0660"
 KERNEL=="tts/[0-9]*",		GROUP="uucp", MODE="0660"
@@ -80,14 +82,17 @@
 KERNEL=="sndstat",		MODE="0660"
 
 # pilot/palm devices
-KERNEL=="pilot",		GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
+KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot"
 
 # lp devices
+BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
 KERNEL=="lp*",			GROUP="lp", MODE="0660"
 KERNEL=="parport*",		GROUP="lp", MODE="0660"
 KERNEL=="irlpt*",		GROUP="lp", MODE="0660"
 KERNEL=="usblp*",		GROUP="lp", MODE="0660"
 KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
+KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
 
 # tape devices
 KERNEL=="ht*",			GROUP="disk", MODE="0660"
@@ -142,9 +147,9 @@
 KERNEL=="z90crypt",		MODE="0666"
 
 # DVB
-KERNEL=="dvb/*",		MODE="0660"
-KERNEL=="dvb",			MODE="0660"
-KERNEL=="dvb/adapter*",		MODE="0660"
+# DVB
+KERNEL=="dvb",                  MODE="0660"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0660"  
 
 # create a symlink named after the device map name
 # note devmap_name comes with extras/multipath
@@ -175,9 +180,6 @@
 
 KERNEL=="raw[0-9]*",		NAME="raw/%k"
 
-KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
-BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
-
 KERNEL=="microcode",		NAME="cpu/%k"
 KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr"
 KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpuid"
@@ -221,28 +223,54 @@
 KERNEL=="zappseudo",  		NAME="zap/pseudo"
 KERNEL=="zap[0-9]*",  		NAME="zap/%n"
 
-BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
-
-# do not seperate the next 2 lines!!
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
+KERNEL="pktcdvd", NAME="%k/control"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+# workaround for devices which do not report media changes
+BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
+        ENV{ID_MODEL}=="IOMEGA_ZIP*", \
+	NAME{ignore_remove, all_partitions}="%k", \
+	GOTO="check_media_end"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
+# do not seperate the next 2 lines!!
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+	PROGRAM=="/etc/udev/scripts/ide-media.sh %k", \
+	RESULT=="floppy", SYMLINK+="floppy%e", \
+	NAME{ignore_remove, all_partitions}="%k", \
+	GOTO="check_media_end"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+	RESULT=="cdrom", SYMLINK+="cdrom%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+	PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+	PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+	PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", \
+	SYMLINK+="cdwriter%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+	PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", \
+	SYMLINK+="cdwriter%e"
+
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \
+	PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", \
+	SYMLINK+="dvdwriter%e"
+
+KERNEL=="sr[0-9]*", BUS=="scsi", \
+	PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD-R", \
+	SYMLINK+="dvdwriter%e"
 
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+LABEL="check_media_end"
 
 # rename sr* to scd*
 KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
 KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
 
-KERNEL=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
-
 #######################################
 # Persistent block device stuff - begin
 #######################################


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/FC-4/udev.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- udev.spec	31 Jan 2006 16:05:27 -0000	1.94
+++ udev.spec	21 Feb 2006 07:21:56 -0000	1.95
@@ -5,11 +5,12 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 071
-Release: 0.FC4.2
+Release: 0.FC4.3
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
 Obsoletes: udev-persistent < 0:030-5
+Conflicts: module-init-tools < 0:3.2-0.pre9.0.FC4.2
 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
 Source1: udev.rules
 Source3: udev.conf
@@ -266,6 +267,13 @@
 %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
 
 %changelog
+* Tue Feb 21 2006 Harald Hoyer <harald at redhat.com> - 071-0.FC4.3
+- fixed pktcdvd device nameing (bz #161268)
+- fixed dvb permissions (bz #179993)
+- fixed pilot symlink creation
+- removed last_rule from ttyUSB, ttyS, ttyACM
+- conflicts with old module-init-tools
+
 * Tue Jan 31 2006 Harald Hoyer <harald at redhat.com> - 071-0.FC4.2
 - removed firmware_helper rule, which conflicts with hotplug firmware helper
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 08:10:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 03:10:44 -0500
Subject: rpms/NetworkManager/devel .cvsignore, 1.29, 1.30 NetworkManager.spec,
	1.89, 1.90 sources, 1.45, 1.46
Message-ID: <200602210810.k1L8Aioc009151@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9133

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Tue Feb 21 2006 Dan Williams <dcbw at redhat.com> 0.5.1-13.cvs20060221
- Add BuildRequires: libnl-devel (#rh179438#)
- Fix libnm_glib to not clobber an application's existing dbus connection
	(#rh177546#, gnome.org #326572)
- libnotify support
- AP compatibility fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Feb 2006 18:54:24 -0000	1.29
+++ .cvsignore	21 Feb 2006 08:10:40 -0000	1.30
@@ -8,3 +8,4 @@
 NetworkManager-0.5.1.cvs20060131.tar.gz
 NetworkManager-0.5.1.cvs20060205.tar.gz
 NetworkManager-0.5.1.cvs20060213.tar.gz
+NetworkManager-0.5.1.cvs20060221.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- NetworkManager.spec	13 Feb 2006 18:54:24 -0000	1.89
+++ NetworkManager.spec	21 Feb 2006 08:10:41 -0000	1.90
@@ -9,13 +9,13 @@
 %define bind_version 24:9.3.1-20
 
 %if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060213
+%define nm_cvs_version	.cvs20060221
 %endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 12%{?nm_cvs_version}
+Release: 13%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -35,6 +35,7 @@
 Requires: dhclient >= 3.0.2-12
 Requires: bind >= %{bind_version}
 Requires: wpa_supplicant
+Requires: libnotify >= 0.3
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: hal-devel >= %{hal_version}
@@ -50,6 +51,8 @@
 BuildRequires: pkgconfig
 BuildRequires: dhcdbd
 BuildRequires: wpa_supplicant
+BuildRequires: libnl-devel
+BuildRequires: libnotify-devel >= 0.3
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -116,7 +119,7 @@
 %patch0 -p0 -b .madwifi
 
 %build
-%configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named
+%configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes
 make
 
 
@@ -209,6 +212,13 @@
 
 
 %changelog
+* Tue Feb 21 2006 Dan Williams <dcbw at redhat.com> 0.5.1-13.cvs20060221
+- Add BuildRequires: libnl-devel (#rh179438#)
+- Fix libnm_glib to not clobber an application's existing dbus connection
+	(#rh177546#, gnome.org #326572)
+- libnotify support
+- AP compatibility fixes
+
 * Mon Feb 13 2006 Dan Williams <dcbw at redhat.com> 0.5.1-12.cvs20060213
 - Minor bug fixes
 - Update to VPN dbus API for passing user-defined routes to vpn service
@@ -219,7 +229,6 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.5.1-10.cvs20060205.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
->>>>>>> 1.88
 * Sun Feb  5 2006 Dan Williams <dcbw at redhat.com> 0.5.1-10.cvs20060205
 - Workarounds for madwifi/Atheros cards
 - Do better with non-SSID-broadcasting access points


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	13 Feb 2006 18:54:24 -0000	1.45
+++ sources	21 Feb 2006 08:10:41 -0000	1.46
@@ -1 +1 @@
-8e383b8c13ba254f030b70f09c5dd30b  NetworkManager-0.5.1.cvs20060213.tar.gz
+3d86df735e4396bfa59a36bab4a5cc56  NetworkManager-0.5.1.cvs20060221.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 09:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 04:53:37 -0500
Subject: rpms/epic/devel epic4-2.2-fuzzTest.patch, NONE, 1.1 epic.spec, 1.18,
	1.19
Message-ID: <200602210953.k1L9rbWI001010@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/epic/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv939

Modified Files:
	epic.spec 
Added Files:
	epic4-2.2-fuzzTest.patch 
Log Message:
fix fuzz test fail (#181036)


epic4-2.2-fuzzTest.patch:
 numbers.c |    5 ++++-
 who.c     |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

--- NEW FILE epic4-2.2-fuzzTest.patch ---
--- epic4-2.2/source/numbers.c.fuzzTest	2004-12-03 12:24:11.000000000 -0500
+++ epic4-2.2/source/numbers.c	2006-02-21 10:08:03.000000000 -0500
@@ -183,6 +183,10 @@
 	/* All numerics must have a target (our nickname) */
 	if (!comm || !*comm)
 		{ rfc1459_odd(from, comm, ArgList); return; }
+	numeric = atol(comm);
+  	if (numeric < 0 || numeric > 999)
+  		{ rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!(target = ArgList[0]))
 		{ rfc1459_odd(from, comm, ArgList); return; }
 	ArgList++;
@@ -193,7 +197,6 @@
 	else
 		message_from(NULL, LOG_CRAP);
 
-	numeric = atol(comm);
 	current_numeric = -numeric;	/* must be negative of numeric! */
 
 	/*
--- epic4-2.2/source/who.c.fuzzTest	2006-02-21 10:17:14.000000000 -0500
+++ epic4-2.2/source/who.c	2006-02-21 10:25:29.000000000 -0500
@@ -635,6 +635,9 @@
 {
 	WhoEntry *new_w = who_queue_top(refnum);
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!new_w)
 	{
 		new_w = get_new_who_entry();
@@ -663,6 +666,9 @@
 	WhoEntry 	*new_w = who_queue_top(refnum);
 	char 		buffer[1025];
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	PasteArgs(ArgList, 0);
 
 	if (who_whine)
@@ -913,6 +919,8 @@
 void	ison_returned (int refnum, const char *from, const char *comm, const char **ArgList)
 {
 	IsonEntry *new_i = ison_queue_top(refnum);
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
 
 	if (!new_i)
 	{
@@ -1166,6 +1174,9 @@
 	char *ptr;
 	char *results;
 
+	if (!(ArgList[0]))
+  	                 { rfc1459_odd(from, comm, ArgList); return; }
+
 	if (!top)
 	{
 		yell("### Please don't /quote a server command that returns the 302 numeric.");


Index: epic.spec
===================================================================
RCS file: /cvs/dist/rpms/epic/devel/epic.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- epic.spec	11 Feb 2006 02:38:32 -0000	1.18
+++ epic.spec	21 Feb 2006 09:53:34 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: An ircII chat client.
 Name: epic
 Version: 2.2
-Release: 2.2.1
+Release: 3
 Epoch: 4
 License: Distributable
 Group: Applications/Communications
@@ -15,6 +15,7 @@
 Source7: http://splitfire.sourceforge.net/schemes/sf-light-scheme.irc.gz
 Source8: http://splitfire.sourceforge.net/schemes/sf-perry-scheme.irc.gz
 Patch0: epic-default.patch
+Patch1: epic4-2.2-fuzzTest.patch
 URL: http://www.epicsol.org/
 Buildroot: /var/tmp/%{name}-%{version}-%{release}
 
@@ -27,7 +28,8 @@
 rm -rf $RPM_BUILD_DIR/ircii-EPIC%{prog_version}
 
 %setup -q -n epic4-%{version} -a 1
-%patch -p0 -b .default
+%patch0 -p0 -b .default
+%patch1 -p1 -b .fuzzTest
 
 %build
 %configure
@@ -78,6 +80,9 @@
 %{_datadir}/epic/help/*
 
 %changelog
+* Tue Feb 21 2006 Peter Vrabec <pvrabec at redhat.com> 4:2.2-3
+- fix fuzz test fail (#181036)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4:2.2-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 10:09:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 05:09:22 -0500
Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.13,1.14
Message-ID: <200602211009.k1LA9Mb7029085@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/evolution-sharp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29073

Modified Files:
	evolution-sharp.spec 
Log Message:
BuildRequire gtk-sharp2

mock error:
checking for GTK_SHARP... configure: error: Package requirements (gtk-sharp-2.0 >= 1.9.5) were not met:
No package 'gtk-sharp-2.0' found
...
error: Bad exit status from /var/tmp/rpm-tmp.26717 (%build)




Index: evolution-sharp.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- evolution-sharp.spec	12 Feb 2006 17:04:48 -0000	1.13
+++ evolution-sharp.spec	21 Feb 2006 10:09:19 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           evolution-sharp
 Version:        0.10.2
-Release:        8
+Release:        9
 Summary:        Evolution Data Server Mono Bindings
 
 Group:          System Environment/Libraries
@@ -14,7 +14,7 @@
 
 BuildRequires:  evolution-data-server-devel evolution-devel
 BuildRequires:  mono-devel gtk-sharp2-gapi
-BuildRequires:  automake, libtool
+BuildRequires:  automake, libtool, gtk-sharp2
 Requires:       evolution-data-server
 
 
@@ -58,6 +58,9 @@
 %{_prefix}/share/gapi-2.0/*
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 0.10.2-9
+- BuildRequire gtk-sharp2
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.10.2-8
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 10:22:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 05:22:27 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.622,1.623
Message-ID: <200602211022.k1LAMR2R009244@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9231

Modified Files:
	openoffice.org.spec 
Log Message:
add db4-devel BuildRequires


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.622
retrieving revision 1.623
diff -u -r1.622 -r1.623
--- openoffice.org.spec	20 Feb 2006 11:43:43 -0000	1.622
+++ openoffice.org.spec	21 Feb 2006 10:22:25 -0000	1.623
@@ -149,6 +149,7 @@
 BuildRequires: 	libidn-devel, libwpd-devel >= 0.8.0, sane-backends-devel
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
 BuildRequires:	evolution-data-server-devel, libxslt-devel, unixODBC-devel
+BuildRequires:	db4-devel
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif



From fedora-cvs-commits at redhat.com  Tue Feb 21 10:29:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 05:29:28 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.623,1.624
Message-ID: <200602211029.k1LATSKg019353@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19324

Modified Files:
	openoffice.org.spec 
Log Message:
libXaw-devel BuildRequire (for configure test only)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- openoffice.org.spec	21 Feb 2006 10:22:25 -0000	1.623
+++ openoffice.org.spec	21 Feb 2006 10:29:25 -0000	1.624
@@ -149,7 +149,7 @@
 BuildRequires: 	libidn-devel, libwpd-devel >= 0.8.0, sane-backends-devel
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
 BuildRequires:	evolution-data-server-devel, libxslt-devel, unixODBC-devel
-BuildRequires:	db4-devel
+BuildRequires:	db4-devel, libXaw-devel
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif



From fedora-cvs-commits at redhat.com  Tue Feb 21 10:36:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 05:36:45 -0500
Subject: rpms/bash/devel bash31-009, NONE, 1.1 bash31-010, NONE,
	1.1 bash.spec, 1.109, 1.110
Message-ID: <200602211036.k1LAajTO020366@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20320

Modified Files:
	bash.spec 
Added Files:
	bash31-009 bash31-010 
Log Message:
* Tue Feb 21 2006 Tim Waugh <twaugh at redhat.com> 3.1-8
- Patchlevel 10.



--- NEW FILE bash31-009 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-009

Bug-Reported-by: Joshua Neuheisel <jneuheisel at gmail.com>
Bug-Reference-ID: <25d873330601140820v4ad8efd2t8bf683b073c138b3 at mail.gmail.com>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00062.html

Bug-Description:

Under some circumstances, background (asynchronous) jobs can set the terminal
process group incorrectly.  This can cause a foreground process (including
the foreground shell) to get read errors and exit.

Patch:

*** ../bash-3.1/jobs.c	Fri Nov 11 23:13:27 2005
--- jobs.c	Wed Feb  1 13:55:38 2006
***************
*** 620,625 ****
  	   * the parent gives it away.
  	   *
  	   */
! 	  if (job_control && newjob->pgrp)
  	    give_terminal_to (newjob->pgrp, 0);
  	}
--- 634,642 ----
  	   * the parent gives it away.
  	   *
+ 	   * Don't give the terminal away if this shell is an asynchronous
+ 	   * subshell.
+ 	   *
  	   */
! 	  if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
  	    give_terminal_to (newjob->pgrp, 0);
  	}
***************
*** 1656,1660 ****
  	     shell's process group (we could be in the middle of a
  	     pipeline, for example). */
! 	  if (async_p == 0 && pipeline_pgrp != shell_pgrp)
  	    give_terminal_to (pipeline_pgrp, 0);
  
--- 1743,1747 ----
  	     shell's process group (we could be in the middle of a
  	     pipeline, for example). */
! 	  if (async_p == 0 && pipeline_pgrp != shell_pgrp && ((subshell_environment&SUBSHELL_ASYNC) == 0))
  	    give_terminal_to (pipeline_pgrp, 0);
  
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 8
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 9
  
  #endif /* _PATCHLEVEL_H_ */


--- NEW FILE bash31-010 ---
			     BASH PATCH REPORT
			     =================

Bash-Release: 3.1
Patch-ID: bash31-010

Bug-Reported-by: vw at vonwolff.de
Bug-Reference-ID: <20060123135234.1AC2F1D596 at wst07.vonwolff.de>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00090.html

Bug-Description:

There is a difference in behavior between bash-3.0 and bash-3.1 involving
parsing of single- and double-quoted strings occurring in old-style
command substitution.  The difference has to do with how backslashes are
processed.  This patch restores a measure of backwards compatibility while
the question of POSIX conformance and ultimately correct behavior is discussed.

Patch:

*** ../bash-3.1/parse.y	Fri Nov 11 23:14:18 2005
--- parse.y	Wed Jan 25 14:55:18 2006
***************
*** 2899,2903 ****
        else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
  	{
! 	  nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags);
  	  goto add_nestret;
  	}
--- 2901,2909 ----
        else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0)
  	{
! 	  /* Add P_ALLOWESC so backslash quotes the next character and
! 	     shell_getc does the right thing with \<newline>.  We do this for
! 	     a measure  of backwards compatibility -- it's not strictly the
! 	     right POSIX thing. */
! 	  nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_ALLOWESC);
  	  goto add_nestret;
  	}
*** ../bash-3.1/patchlevel.h	Wed Jul 20 13:58:20 2005
--- patchlevel.h	Wed Dec  7 13:48:42 2005
***************
*** 26,30 ****
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 9
  
  #endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
     looks for to find the patch level (for the sccs version string). */
  
! #define PATCHLEVEL 10
  
  #endif /* _PATCHLEVEL_H_ */


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- bash.spec	16 Feb 2006 19:04:04 -0000	1.109
+++ bash.spec	21 Feb 2006 10:36:42 -0000	1.110
@@ -1,7 +1,7 @@
 Version: 3.1
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 7
+Release: 8
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -19,6 +19,8 @@
 Patch6: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-006
 Patch7: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-007
 Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-008
+Patch9: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-009
+Patch10: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-010
 # Other patches
 Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
@@ -65,6 +67,8 @@
 %patch6 -p0 -b .006
 %patch7 -p0 -b .007
 %patch8 -p0 -b .008
+%patch9 -p0 -b .009
+%patch10 -p0 -b .010
 
 # Other patches
 %patch100 -p1 -b .paths
@@ -216,6 +220,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Tue Feb 21 2006 Tim Waugh <twaugh at redhat.com> 3.1-8
+- Patchlevel 10.
+
 * Thu Feb 16 2006 Tim Waugh <twaugh at redhat.com> 3.1-7
 - Patchlevel 8.
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 10:55:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 05:55:36 -0500
Subject: rpms/file-roller/devel file-roller.spec,1.49,1.50
Message-ID: <200602211055.k1LAtapn008535@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8058

Modified Files:
	file-roller.spec 
Log Message:
- BuildRequire: gnome-doc-utils

mock error:
checking for GDU_MODULE_VERSION_CHECK... configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met.
error: Bad exit status from /var/tmp/rpm-tmp.12190 (%build)




Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- file-roller.spec	15 Feb 2006 05:52:08 -0000	1.49
+++ file-roller.spec	21 Feb 2006 10:55:33 -0000	1.50
@@ -6,11 +6,12 @@
 %define libgnomeprintui_version 2.2.0
 %define desktop_file_utils_version 0.9
 %define nautilus_version 2.9.0
+%define gnome_doc_utils_version 0.3.2
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
 Version:	2.13.91
-Release: 	1
+Release: 	2
 
 License:	GPL
 Group:		Applications/Archiving
@@ -32,6 +33,7 @@
 BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: libtool
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -105,6 +107,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 2.13.91-2
+- BuildRequire: gnome-doc-utils
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 11:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 06:01:52 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.624,1.625
Message-ID: <200602211101.k1LB1qid010441@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10383

Modified Files:
	openoffice.org.spec 
Log Message:
more Build-Requires


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -r1.624 -r1.625
--- openoffice.org.spec	21 Feb 2006 10:29:25 -0000	1.624
+++ openoffice.org.spec	21 Feb 2006 11:01:32 -0000	1.625
@@ -149,7 +149,7 @@
 BuildRequires: 	libidn-devel, libwpd-devel >= 0.8.0, sane-backends-devel
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
 BuildRequires:	evolution-data-server-devel, libxslt-devel, unixODBC-devel
-BuildRequires:	db4-devel, libXaw-devel
+BuildRequires:	db4-devel, libXaw-devel, libXt-devel, libICE-devel
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif



From fedora-cvs-commits at redhat.com  Tue Feb 21 11:24:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 06:24:38 -0500
Subject: rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.11,1.12
Message-ID: <200602211124.k1LBOcpa030891@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/fonts-ISO8859-2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30523

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
BuildRequire xorg-x11-font-utils

mock error:
...
/bin/sh: bdftopcf: command not found
/bin/sh: mkfontdir: command not found
make: *** [misc.done] Error 127





Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fonts-ISO8859-2.spec	9 Dec 2005 22:40:26 -0000	1.11
+++ fonts-ISO8859-2.spec	21 Feb 2006 11:24:35 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 16.1
+Release: 17
 License: Freely distributable
 Source: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
 %if %{include_ulT1mo}
@@ -18,6 +18,7 @@
 BuildArch: noarch
 Group: User Interface/X
 Summary: Central European language fonts for the X Window System.
+Buildrequires: xorg-x11-font-utils
 Requires: mkfontdir, chkfontpath
  
 %description
@@ -186,6 +187,9 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 1.0-17
+- BuildRequire xorg-x11-font-utils
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 12:55:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 07:55:21 -0500
Subject: rpms/f-spot/devel f-spot.spec,1.15,1.16
Message-ID: <200602211255.k1LCtLMK028395@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27870

Modified Files:
	f-spot.spec 
Log Message:
- add BuildRequires  libgnome-devel libgnomeui-devel
  gtk2-devel mono-devel libjpeg-devel sqlite-devel

error was:
checking for F... configure: error: Package requirements (libgnome-2.0 >= 2.2 libgnomeui-2.0 >= 2.2 libexif >= 0.5.7 libexif < 0.7.0 gtkhtml-sharp-2.0 >= 2.7 gconf-sharp-2.0 >= 2.7 glade-sharp-2.0 >= 2.7 gnome-vfs-sharp-2.0 >= 2.7 gtk+-2.0 >= 2.6 mono >= 1.1.7 dbus-sharp >= 0.23) were not met.
error: Bad exit status from /var/tmp/rpm-tmp.33140 (%build)



Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- f-spot.spec	17 Feb 2006 19:12:56 -0000	1.15
+++ f-spot.spec	21 Feb 2006 12:55:18 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.1.9
-Release:        1
+Release:        2
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -11,7 +11,8 @@
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
 BuildRequires:  libexif-devel gphoto2-devel >= 2.1.4 dbus-sharp
-BuildRequires:  gtk-sharp2 >= 2.7
+BuildRequires:  gtk-sharp2 >= 2.7 libgnome-devel libgnomeui-devel
+BuildRequires:  gtk2-devel mono-devel libjpeg-devel sqlite-devel >= 3.3.1
 Requires:       sqlite >= 3.3.1
 Requires:       lcms
 
@@ -68,6 +69,10 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 0.1.9-2
+- add BuildRequires  libgnome-devel libgnomeui-devel
+  gtk2-devel mono-devel libjpeg-devel sqlite-devel
+
 * Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 0.1.9-1
 - Update to 0.1.9
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:01:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:01:42 -0500
Subject: rpms/frysk/devel frysk.spec,1.28,1.29
Message-ID: <200602211301.k1LD1gBq030307@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30160

Modified Files:
	frysk.spec 
Log Message:
- BuildRequires: xmlto

error was:
checking for xmlto... no
configure: error: no xmlto binary found in ${PATH)
configure: error: /bin/sh './configure' failed for frysk-imports
error: Bad exit status from /var/tmp/rpm-tmp.9496 (%build)



Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- frysk.spec	20 Feb 2006 17:50:41 -0000	1.28
+++ frysk.spec	21 Feb 2006 13:01:22 -0000	1.29
@@ -1,7 +1,7 @@
 Summary:	Frysk execution analysis tool
 Name:		frysk
 Version:	0.0.1.2006.02.19.rh1
-Release:	0.FC5.0
+Release:	0.FC5.1
 License:	GPL
 Group:		Development/System
 URL:		http://sourceware.org/frysk
@@ -23,6 +23,7 @@
 BuildRequires:  gtk2-devel >= 2.8.0
 BuildRequires:	libvte-java-devel >= 0.11.11
 BuildRequires:  vte-devel >= 0.11.11
+BuildRequires:  xmlto
 
 # We can only build on i386 for now
 ExclusiveArch: i386
@@ -86,6 +87,9 @@
 %{_libexecdir}/frysk/*
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 0.0.1.2006.02.19.rh1-0.FC5.1
+- BuildRequires: xmlto
+
 * Mon Feb 20 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.02.19.rh1-0.FC5.0
 - Import frysk 0.0.1.2006.02.19.rh1 -- snapshot from middle of that day.
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:11:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:11:34 -0500
Subject: rpms/gnome-user-docs/devel .cvsignore, 1.11,
	1.12 gnome-user-docs.spec, 1.14, 1.15 sources, 1.11, 1.12
Message-ID: <200602211311.k1LDBY35032340@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32276

Modified Files:
	.cvsignore gnome-user-docs.spec sources 
Log Message:
2.13.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Feb 2006 05:06:06 -0000	1.11
+++ .cvsignore	21 Feb 2006 13:11:31 -0000	1.12
@@ -2,3 +2,4 @@
 gnome2-user-docs-2.8.0-1.tar.bz2
 gnome2-user-docs-2.8.1.tar.bz2
 gnome-user-docs-2.13.1.tar.bz2
+gnome-user-docs-2.13.1.1.tar.bz2


Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-user-docs.spec	21 Feb 2006 05:06:06 -0000	1.14
+++ gnome-user-docs.spec	21 Feb 2006 13:11:31 -0000	1.15
@@ -1,6 +1,6 @@
 Summary:        GNOME User Documentation
 Name:           gnome-user-docs
-Version:        2.13.1
+Version:        2.13.1.1
 Release:	1 
 License:        FDL
 Source:         gnome2-user-docs-%{version}.tar.bz2
@@ -48,8 +48,8 @@
 %{_datadir}/omf
 
 %changelog
-* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 2.13.1-1
-- Update to 2.13.1
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 2.13.1.1-1
+- Update to 2.13.1.1
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	21 Feb 2006 05:06:06 -0000	1.11
+++ sources	21 Feb 2006 13:11:31 -0000	1.12
@@ -1 +1 @@
-8bf65d9218f985488e2d763d8b00600a  gnome-user-docs-2.13.1.tar.bz2
+fb7a9fb0ba82d03f4067ffaed205f002  gnome-user-docs-2.13.1.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:16:56 -0500
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.15,1.16
Message-ID: <200602211316.k1LDGuaL012874@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5961

Modified Files:
	gnome-user-docs.spec 
Log Message:
fix tarball names



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-user-docs.spec	21 Feb 2006 13:11:31 -0000	1.15
+++ gnome-user-docs.spec	21 Feb 2006 13:16:53 -0000	1.16
@@ -3,7 +3,7 @@
 Version:        2.13.1.1
 Release:	1 
 License:        FDL
-Source:         gnome2-user-docs-%{version}.tar.bz2
+Source:         gnome-user-docs-%{version}.tar.bz2
 Group:          Documentation
 
 BuildArch:      noarch
@@ -18,7 +18,7 @@
 environment.
 
 %prep
-%setup -q -n gnome2-user-docs-%{version}
+%setup -q -n gnome-user-docs-%{version}
 
 %build
 %configure



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:24:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:24:16 -0500
Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.16,1.17
Message-ID: <200602211324.k1LDOGWs018193@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-user-docs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18032

Modified Files:
	gnome-user-docs.spec 
Log Message:
disable scrollkeeper



Index: gnome-user-docs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-user-docs.spec	21 Feb 2006 13:16:53 -0000	1.16
+++ gnome-user-docs.spec	21 Feb 2006 13:24:14 -0000	1.17
@@ -12,6 +12,7 @@
 
 Requires: scrollkeeper >= 0.3.11
 BuildRequires: scrollkeeper
+BuildRequires: gnome-doc-utils >= 0.5.6
 
 %description
 This package contains end user documentation for the GNOME desktop 
@@ -21,7 +22,7 @@
 %setup -q -n gnome-user-docs-%{version}
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make 
 
 %install
@@ -29,8 +30,6 @@
 
 %makeinstall
 
-rm -r $RPM_BUILD_ROOT/var/scrollkeeper
-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:27:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:27:49 -0500
Subject: rpms/xorg-x11-drv-ati/devel xorg-x11-drv-ati.spec,1.12,1.13
Message-ID: <200602211327.k1LDRnlO019807@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19772

Modified Files:
	xorg-x11-drv-ati.spec 
Log Message:
* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-4
- Added xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch from CVS HEAD.



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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-ati.spec	11 Feb 2006 06:15:26 -0000	1.12
+++ xorg-x11-drv-ati.spec	21 Feb 2006 13:27:46 -0000	1.13
@@ -13,15 +13,17 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   3.2
+Release:   4
 URL:       http://www.x.org
+License:   MIT/X11
+Group:     User Interface/X Hardware Support
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ati.xinf
 Source2:   r128.xinf
 Source3:   radeon.xinf
-License:   MIT/X11
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:    xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
@@ -39,6 +41,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p2 -b .radeon-metamodes-SEGV-fix
 
 %build
 %configure --disable-static
@@ -82,18 +85,21 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-4
+- Added xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch from CVS HEAD.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 6.5.7.3-3.2
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6.5.7.3-3.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sun Feb  5 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-3
+* Sun Feb 05 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-3
 - Updated radeon.xinf to be up to date with the xf86PciInfo.h from the Xorg
   X server 1.0.1-1 source.  This should account for all supported Radeon
   models now modulo errors/omissions.
 
-* Thu Feb  2 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-2
+* Thu Feb 02 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-2
 - Added r128.xinf and radeon.xinf videoalias files to fix bug (#174101).
 - Added "BuildRequires: libdrm-devel >= 2.0-1" to fix bug (#178613)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:34:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:34:44 -0500
Subject: rpms/freeglut/devel freeglut.spec,1.16,1.17
Message-ID: <200602211334.k1LDYiGB020693@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/freeglut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20558

Modified Files:
	freeglut.spec 
Log Message:
- BuildRequires: libGLU-devel

In file included from ../include/GL/freeglut.h:17, from
freeglut_callbacks.c:28: ../include/GL/freeglut_std.h:115:20: error: GL/glu.h:
No such file or directory make[2]: ***
[libglut_la-freeglut_callbacks.lo] Error 1



Index: freeglut.spec
===================================================================
RCS file: /cvs/dist/rpms/freeglut/devel/freeglut.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- freeglut.spec	11 Feb 2006 02:45:40 -0000	1.16
+++ freeglut.spec	21 Feb 2006 13:34:41 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:   A freely licensed alternative to the GLUT library
 Name:      freeglut
 Version:   2.4.0
-Release:   3.2
+Release:   4
 URL:       http://freeglut.sourceforge.net
 Source0:   %{name}-%{version}.tar.gz
 License:   MIT
@@ -10,6 +10,7 @@
 
 BuildRequires: /sbin/ldconfig
 BuildRequires: pkgconfig
+BuildRequires: libGLU-devel
 
 BuildRequires: libGL-devel
 
@@ -87,6 +88,9 @@
 %{_libdir}/libglut.so
 
 %changelog
+* Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 2.4.0-4
+- BuildRequires: libGLU-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.4.0-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:47:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:47:29 -0500
Subject: rpms/xorg-x11-drv-ati/devel
	xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch, NONE, 1.1
Message-ID: <200602211347.k1LDlTiB006112@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6082

Added Files:
	xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch 
Log Message:
Adding xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch

xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch:
 radeon_driver.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch ---
Index: driver/xf86-video-ati/src/radeon_driver.c
diff -u driver/xf86-video-ati/src/radeon_driver.c:1.83 driver/xf86-video-ati/src/radeon_driver.c:1.84
--- driver/xf86-video-ati/src/radeon_driver.c:1.83	Wed Dec 14 11:41:28 2005
+++ driver/xf86-video-ati/src/radeon_driver.c	Thu Jan 12 17:02:01 2006
@@ -1,4 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.117 2004/02/19 22:38:12 tsi Exp $ */
+/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.84 2006/01/13 01:02:01 alanc Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -4185,6 +4186,7 @@
 	        xfree(info->CRT2pScrn->monitor);
 	     }
              xfree(info->CRT2pScrn);
+	     info->CRT2pScrn = NULL;
 	  }
 	  pScrn->modes = info->CRT1Modes;
 	  info->CRT1Modes = NULL;



From fedora-cvs-commits at redhat.com  Tue Feb 21 13:49:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 08:49:00 -0500
Subject: rpms/aspell/devel aspell-0.60.3-fileconflict.patch, NONE,
	1.1 aspell.spec, 1.28, 1.29
Message-ID: <200602211349.k1LDn0ds006876@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/aspell/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6778

Modified Files:
	aspell.spec 
Added Files:
	aspell-0.60.3-fileconflict.patch 
Log Message:
- fix multilib file conflict


aspell-0.60.3-fileconflict.patch:
 Makefile.in |    3 ++-
 configure   |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE aspell-0.60.3-fileconflict.patch ---
--- aspell-0.60.3/configure.pom	2006-02-21 11:38:50.668963136 +0100
+++ aspell-0.60.3/configure	2006-02-21 11:38:50.717955688 +0100
@@ -463,7 +463,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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT pkgdocdir pkgdatadir pkglibdir CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE a!
m__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED PERLPROG COMPILE_IN_FILTERS_TRUE COMPILE_IN_FILTERS_FALSE PSPELL_COMPATIBILITY_TRUE PSPELL_COMPATIBILITY_FALSE INCREMENTED_SONAME_TRUE INCREMENTED_SONAME_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_LIB CURSES_LIB CURSES_INCLUDE 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT pkgdocdir pkgdatadir pkgdatadir2 pkglibdir CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fast!
depCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SED PERLPROG COMPILE_IN_FILTERS_TRUE COMPILE_IN_FILTERS_FALSE PSPELL_COMPATIBILITY_TRUE PSPELL_COMPATIBILITY_FALSE INCREMENTED_SONAME_TRUE INCREMENTED_SONAME_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PTHREAD_LIB CURSES_LIB CURSES_INCLUDE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2106,6 +2106,8 @@
   pkgdatadir=\${libdir}/aspell-0.60
 fi
 
+pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
+
 
 
 
@@ -24361,6 +24363,7 @@
 s, at MAINT@,$MAINT,;t t
 s, at pkgdocdir@,$pkgdocdir,;t t
 s, at pkgdatadir@,$pkgdatadir,;t t
+s, at pkgdatadir2@,$pkgdatadir2,;t t
 s, at pkglibdir@,$pkglibdir,;t t
 s, at CXX@,$CXX,;t t
 s, at CXXFLAGS@,$CXXFLAGS,;t t
--- aspell-0.60.3/Makefile.in.pom	2005-06-27 11:54:58.000000000 +0200
+++ aspell-0.60.3/Makefile.in	2006-02-21 11:42:20.040133880 +0100
@@ -318,6 +318,7 @@
 
 # These are needed due to a bug in Automake
 pkgdatadir = @pkgdatadir@
+pkgdatadir2 = @pkgdatadir2@
 pkglibdir = @pkglibdir@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -1875,7 +1876,7 @@
 	cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir}  ${sysconfdir} >  dirs.h
 
 scripts/run-with-aspell: scripts/run-with-aspell.create
-	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
+	sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
 	chmod 755 scripts/run-with-aspell
 @PSPELL_COMPATIBILITY_TRUE at scripts/pspell-config: scripts/mkconfig
 @PSPELL_COMPATIBILITY_TRUE@	sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}


Index: aspell.spec
===================================================================
RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- aspell.spec	11 Feb 2006 01:39:07 -0000	1.28
+++ aspell.spec	21 Feb 2006 13:48:58 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A spelling checker.
 Name: aspell
 Version: 0.60.3
-Release: 3.2
+Release: 4
 Epoch: 12
 License: LGPL
 Group: Applications/Text
@@ -11,6 +11,7 @@
 Patch2: aspell-0.60.3-long_gettext.patch
 Patch3: aspell-0.60.3-install_info.patch
 Patch4: aspell-0.60.3-gcc41.patch
+Patch5: aspell-0.60.3-fileconflict.patch
 Requires: aspell-en
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext, ncurses-devel
@@ -46,6 +47,7 @@
 %patch2 -p1 -b .long
 %patch3 -p1 -b .iinfo
 %patch4 -p1 -b .gcc41
+%patch5 -p1 -b .fc
 
 %build
 %configure
@@ -119,6 +121,9 @@
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Tue Feb 21 2006 Ivana Varekova <varekova at redhat.com> - 12:0.60.3-4
+- fix multilib file conflict
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 12:0.60.3-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 14:07:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 09:07:37 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch, NONE,
	1.1 openoffice.org.spec, 1.625, 1.626
Message-ID: <200602211407.k1LE7bpI004208@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4192

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch 
Log Message:
damn you to hell ppc

openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch:
 globals.pm |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch ---
--- OOB680_m1.orig/solenv/bin/modules/installer/globals.pm	2006-02-21 14:04:59.000000000 +0000
+++ OOB680_m1/solenv/bin/modules/installer/globals.pm	2006-02-21 14:05:18.000000000 +0000
@@ -199,7 +199,7 @@
 	$nopatchfilecollector = "";
 	
 	$unomaxservices = 25;
-	$javamaxservices = 15;
+	$javamaxservices = 1;
 	
 	$one_cab_file = 0;
 	$fix_number_of_cab_files = 1;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- openoffice.org.spec	21 Feb 2006 11:01:32 -0000	1.625
+++ openoffice.org.spec	21 Feb 2006 14:07:34 -0000	1.626
@@ -206,6 +206,7 @@
 Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
 Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 Patch39: openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
+Patch40: openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -867,6 +868,7 @@
 %patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
 %patch38 -p1 -b .ooo62030.solenv._version.patch
 %patch39 -p1 -b .ooo62318.extensions.mozab.patch
+%patch40 -p1 -b .rhXXXXXX.solenv.gcjproblem.patch
 
 %if %{includingexternals}
 #start ludicrous workaround



From fedora-cvs-commits at redhat.com  Tue Feb 21 14:14:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 09:14:27 -0500
Subject: rpms/setarch/devel setarch.spec,1.13,1.14
Message-ID: <200602211414.k1LEERww004299@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/setarch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4285

Modified Files:
	setarch.spec 
Log Message:
* Tue Feb 21 2006 Jindrich Novy <jnovy at redhat.com> 1.9-1
- applied some features proposed by Mike Frysinger (#182219)
- add mips arch support, add sparc32
- Obsoletes sparc32
- add '-h' option to display more comprehensive help
- add linux64 helper



Index: setarch.spec
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/setarch.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- setarch.spec	11 Feb 2006 05:41:04 -0000	1.13
+++ setarch.spec	21 Feb 2006 14:14:25 -0000	1.14
@@ -1,11 +1,14 @@
 Summary: Personality setter
 Name: setarch
-Version: 1.8
-Release: 1.2.1
+Version: 1.9
+Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: System Environment/Kernel
 BuildRoot: %{_tmppath}/%{name}-root
+%ifarch sparc sparc64
+Obsoletes: sparc32
+%endif
 
 %description
 This utility tells the kernel to report a different architecture than the 
@@ -24,7 +27,7 @@
 install -m444 setarch.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install -m555 setarch $RPM_BUILD_ROOT%{_bindir}
 
-LINKS="linux32"
+LINKS="linux32 linux64"
 %ifarch s390 s390x
 LINKS="$LINKS s390 s390x"
 %endif
@@ -37,6 +40,9 @@
 %ifarch sparc sparc64
 LINKS="$LINKS sparc sparc64 sparc32"
 %endif
+%ifarch mips mips64
+LINKS="$LINKS mips mips64 mips32"
+%endif
 %ifarch ia64
 LINKS="$LINKS i386 ia64"
 %endif
@@ -54,6 +60,13 @@
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Feb 21 2006 Jindrich Novy <jnovy at redhat.com> 1.9-1
+- applied some features proposed by Mike Frysinger (#182219)
+- add mips arch support, add sparc32
+- Obsoletes sparc32
+- add '-h' option to display more comprehensive help
+- add linux64 helper
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.8-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 14:25:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 09:25:14 -0500
Subject: rpms/setarch/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200602211425.k1LEPErw025365@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/setarch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25253

Modified Files:
	.cvsignore sources 
Log Message:
- upload the new tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Jun 2005 08:54:23 -0000	1.7
+++ .cvsignore	21 Feb 2006 14:25:12 -0000	1.8
@@ -2,3 +2,4 @@
 setarch-1.5.tar.gz
 setarch-1.7.tar.gz
 setarch-1.8.tar.gz
+setarch-1.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setarch/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Jun 2005 08:54:23 -0000	1.7
+++ sources	21 Feb 2006 14:25:12 -0000	1.8
@@ -1 +1 @@
-dda9d220e6934dd0a9c1e3faf0829a00  setarch-1.8.tar.gz
+4c66c066f3c7a3ff1edc573b44e5b730  setarch-1.9.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 14:34:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 09:34:09 -0500
Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.124,1.125
Message-ID: <200602211434.k1LEY95o027916@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27869

Modified Files:
	redhat-artwork.spec 
Log Message:
link KDE upstream icon names to the redhat ones in bluecurve



Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- redhat-artwork.spec	18 Feb 2006 01:01:19 -0000	1.124
+++ redhat-artwork.spec	21 Feb 2006 14:34:06 -0000	1.125
@@ -4,7 +4,7 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 0.239
-Release: 1
+Release: 2
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -120,6 +120,32 @@
 cd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/48x48/filesystems
 ln -s ../mimetypes/fileshare.png gnome-fs-ftp.png
 
+# link upstream icon names to the redhat ones in bluecurve
+pushd $RPM_BUILD_ROOT%{_datadir}/icons/Bluecurve/
+  for s in 16x16 22x22 32x32 48x48 128x128; do
+    pushd $s/apps/ 2> /dev/null || continue
+      ln -sf redhat-office.png package_wordprocessing.png
+      ln -sf redhat-internet.png package_network.png
+      ln -sf redhat-accessories.png package_applications.png
+      ln -sf redhat-graphics.png package_graphics.png
+      ln -sf redhat-games.png package_games.png
+      ln -sf redhat-sound_video.png multimedia.png
+      ln -sf redhat-preferences.png package_settings.png
+      ln -sf redhat-programming.png package_development.png
+      ln -sf redhat-system_tools.png package_utilities.png
+      ln -sf redhat-system_settings.png package_system.png
+      ln -sf redhat-tools.png package_utilities.png
+      # app icons
+      ln -sf redhat-email.png kmail.png
+      ln -sf redhat-web-browser.png konqueror.png
+      ln -sf redhat-filemanager.png kfm.png
+      ln -sf redhat-home.png kfm_home.png
+      ln -sf redhat-logviewer.png kviewshell.png
+      # system settings
+      ln -sf system-config-soundcard.png multimedia.png
+    popd
+  done
+popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,6 +180,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Tue Feb 21 2006 Than Ngo <than at redhat.com> 0.239-2
+- link KDE upstream icon names to the redhat ones in bluecurve
+
 * Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.239-1
 - Make the login screen adapt to label width
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 14:36:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 09:36:30 -0500
Subject: rpms/pango/devel .cvsignore, 1.28, 1.29 pango.spec, 1.61,
	1.62 sources, 1.28, 1.29
Message-ID: <200602211436.k1LEaUYB028421@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28346

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.11.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	11 Feb 2006 20:45:37 -0000	1.28
+++ .cvsignore	21 Feb 2006 14:36:27 -0000	1.29
@@ -12,3 +12,4 @@
 pango-1.11.3.tar.bz2
 pango-1.11.4.tar.bz2
 pango-1.11.5.tar.bz2
+pango-1.11.6.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- pango.spec	17 Feb 2006 15:21:53 -0000	1.61
+++ pango.spec	21 Feb 2006 14:36:27 -0000	1.62
@@ -7,8 +7,8 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.11.5
-Release: 2
+Version: 1.11.6
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -37,11 +37,6 @@
 # Look for pango.modules in an arch-specific directory
 Patch5: pango-1.2.5-lib64.patch
 
-# already in upstream cvs
-Patch6: private-api.patch
-# already in upstream cvs
-Patch7: pango-split.patch
-
 %description
 Pango is a system for layout and rendering of internationalized text.
 
@@ -73,9 +68,6 @@
 %patch1 -p1 -b .slighthint
 %patch5 -p1 -b .lib64
 
-%patch6 -p0 -b .private-api
-%patch7 -p0 -b .pango-split
-
 %build
 
 %configure --disable-gtk-doc
@@ -196,6 +188,10 @@
 
 
 %changelog
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.6-1
+- Upate to 1.11.6
+- Drop upstreamed patches
+
 * Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.5-2
 - Fix a crash in pango_split
 - Hide some private API


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	11 Feb 2006 20:45:37 -0000	1.28
+++ sources	21 Feb 2006 14:36:27 -0000	1.29
@@ -1 +1 @@
-f3b0d6211679664720d20410069757a4  pango-1.11.5.tar.bz2
+ade68b98792417cf4295d86c80054864  pango-1.11.6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 15:36:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 10:36:22 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.41,
	1.42 policy-20060207.patch, 1.13, 1.14 selinux-policy.spec,
	1.113, 1.114 sources, 1.45, 1.46
Message-ID: <200602211536.k1LFaMNR009289@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9233

Modified Files:
	.cvsignore policy-20060207.patch selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	20 Feb 2006 22:11:40 -0000	1.41
+++ .cvsignore	21 Feb 2006 15:36:13 -0000	1.42
@@ -42,3 +42,4 @@
 serefpolicy-2.2.15.tgz
 serefpolicy-2.2.16.tgz
 serefpolicy-2.2.17.tgz
+serefpolicy-2.2.18.tgz

policy-20060207.patch:
 policy/modules/admin/su.if              |   19 ++----
 policy/modules/admin/vpn.te             |    4 +
 policy/modules/apps/slocate.te          |    2 
 policy/modules/kernel/devices.if        |   39 ++++++++++++++
 policy/modules/services/cron.te         |    4 +
 policy/modules/services/cups.if         |   19 ++++++
 policy/modules/services/spamassassin.te |    1 
 policy/modules/services/ssh.if          |    2 
 policy/modules/system/authlogin.te      |    2 
 policy/modules/system/mount.te          |    2 
 policy/modules/system/selinuxutil.fc    |    7 ++
 policy/modules/system/selinuxutil.if    |   87 ++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te    |   72 ++++++++++++++++++++++++--
 policy/modules/system/userdomain.if     |   24 ++++++++
 policy/modules/system/userdomain.te     |    2 
 support/Makefile.devel                  |   12 +++-
 16 files changed, 280 insertions(+), 18 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- policy-20060207.patch	21 Feb 2006 05:22:50 -0000	1.13
+++ policy-20060207.patch	21 Feb 2006 15:36:14 -0000	1.14
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.17/policy/modules/admin/su.if
---- nsaserefpolicy/policy/modules/admin/su.if	2006-02-14 07:20:23.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/admin/su.if	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.18/policy/modules/admin/su.if
+--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 09:18:47.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/admin/su.if	2006-02-21 09:36:37.000000000 -0500
 @@ -220,6 +220,14 @@
  		nscd_socket_use($1_su_t)
  	')
@@ -34,9 +34,23 @@
  	ifdef(`ssh.te', `
  	# Access sshd cookie files.
  	allow $1_su_t sshd_tmp_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.17/policy/modules/apps/slocate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.18/policy/modules/admin/vpn.te
+--- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 09:18:47.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/admin/vpn.te	2006-02-21 09:37:37.000000000 -0500
+@@ -106,6 +106,10 @@
+ 
+ optional_policy(`dbus',`
+ 	dbus_system_bus_client_template(vpnc,vpnc_t)
++	dbus_send_system_bus(vpnc_t)
++	optional_policy(`networkmanager',`
++		networkmanager_dbus_chat(vpnc_t)
++	')
+ ')
+ 
+ optional_policy(`mount',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.18/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/apps/slocate.te	2006-02-20 16:22:06.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/apps/slocate.te	2006-02-21 09:36:37.000000000 -0500
 @@ -36,6 +36,8 @@
  
  files_list_all(locate_t)
@@ -46,9 +60,9 @@
  files_read_etc_runtime_files(locate_t)
  files_read_etc_files(locate_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.17/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.18/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-20 14:07:36.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/kernel/devices.if	2006-02-20 16:22:06.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/kernel/devices.if	2006-02-21 09:36:37.000000000 -0500
 @@ -1115,6 +1115,45 @@
  
  ########################################
@@ -95,21 +109,9 @@
  ##	Read input event devices (/dev/input).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.17/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-02-20 14:07:37.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/services/cron.if	2006-02-20 16:22:06.000000000 -0500
-@@ -544,7 +544,7 @@
- 		type system_crond_t;
- 	')
- 
--	allow $1 system_crond_t:file rw_file_perms;
-+	allow $1 system_crond_t:fifo_file rw_file_perms;
- ')
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.17/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-20 14:07:37.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/services/cron.te	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.18/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 09:18:48.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/services/cron.te	2006-02-21 09:36:37.000000000 -0500
 @@ -398,6 +398,10 @@
  		prelink_delete_cache(system_crond_t)
  	')
@@ -121,9 +123,9 @@
  	optional_policy(`samba',`
  		samba_read_config(system_crond_t)
  		samba_read_log(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.17/policy/modules/services/cups.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.18/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/services/cups.if	2006-02-20 16:22:06.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/services/cups.if	2006-02-21 09:36:37.000000000 -0500
 @@ -169,6 +169,25 @@
  
  ########################################
@@ -150,20 +152,20 @@
  ##	Connect to ptal over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.17/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-20 14:07:37.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/services/spamassassin.te	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.18/policy/modules/services/spamassassin.te
+--- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-21 09:18:49.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/services/spamassassin.te	2006-02-21 10:30:41.000000000 -0500
 @@ -124,6 +124,7 @@
  	term_dontaudit_use_generic_ptys(spamd_t)
  	files_dontaudit_read_root_files(spamd_t)
  	tunable_policy(`spamd_enable_home_dirs',`
-+		userdom_search_unpriv_user_home_dirs(spamd_t)
++		userdom_search_generic_user_home_dir(spamd_t)
  		userdom_manage_generic_user_home_dirs(spamd_t)
  		userdom_manage_generic_user_home_files(spamd_t)
  		userdom_manage_generic_user_home_symlinks(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.17/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-16 09:05:14.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/services/ssh.if	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.18/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 09:18:49.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/services/ssh.if	2006-02-21 09:36:37.000000000 -0500
 @@ -279,6 +279,8 @@
  
  	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
@@ -173,9 +175,9 @@
  	allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
  
  	# for ssh-add
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.17/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-03 08:55:55.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/authlogin.te	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.18/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 09:18:49.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/authlogin.te	2006-02-21 09:36:37.000000000 -0500
 @@ -153,6 +153,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
@@ -185,9 +187,9 @@
  dev_getattr_framebuffer_dev(pam_console_t)
  dev_setattr_framebuffer_dev(pam_console_t)
  dev_getattr_misc_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.17/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-02-14 07:20:31.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/mount.te	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.18/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 09:18:50.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/mount.te	2006-02-21 09:36:37.000000000 -0500
 @@ -137,6 +137,8 @@
  	samba_domtrans_smbmount(mount_t)
  ')
@@ -197,9 +199,9 @@
  ifdef(`TODO',`
  # TODO: Need to examine this further. Not sure how to handle this
  #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.17/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.18/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.fc	2006-02-20 17:04:24.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.fc	2006-02-21 09:36:37.000000000 -0500
 @@ -39,3 +39,10 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
@@ -212,9 +214,9 @@
 +/etc/selinux([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
 +/etc/selinux([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
 \ No newline at end of file
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.17/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.if	2006-02-20 17:01:53.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.18/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 09:18:50.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.if	2006-02-21 09:36:37.000000000 -0500
 @@ -705,3 +705,90 @@
  	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
@@ -306,16 +308,9 @@
 +	allow $1 semodule_trans_lock_t:file rw_file_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.17/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/selinuxutil.te	2006-02-21 00:09:26.000000000 -0500
-@@ -1,5 +1,5 @@
- 
--policy_module(selinuxutil,1.1.5)
-+policy_module(selinuxutil,1.1.6)
- 
- gen_require(`
- 	bool secure_mode;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.18/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 09:18:50.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.te	2006-02-21 09:45:42.000000000 -0500
 @@ -103,6 +103,27 @@
  
  ########################################
@@ -351,9 +346,9 @@
 +seutil_module_get_trans_lock(setfiles_t)
 +seutil_module_get_read_lock(setfiles_t)
 +
- userdom_use_all_users_fd(setfiles_t)
+ userdom_use_all_users_fds(setfiles_t)
  # for config files in a home directory
- userdom_read_all_user_files(setfiles_t)
+ userdom_read_all_users_home_files(setfiles_t)
  
 -ifdef(`TODO',`
 -# for upgrading glibc and other shared objects - without this the upgrade
@@ -393,7 +388,7 @@
 +seutil_domtrans_loadpolicy(semodule_t)
 +seutil_read_config(semodule_t)
 +seutil_manage_bin_policy(semodule_t)
-+seutil_use_newrole_fd(semodule_t)
++seutil_use_newrole_fds(semodule_t)
 +
 +seutil_manage_module_store_files(semodule_t)
 +seutil_module_get_trans_lock(semodule_t)
@@ -403,9 +398,9 @@
 +	selinux_get_enforce_mode(semodule_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.17/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-20 14:07:38.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/userdomain.if	2006-02-20 16:22:06.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.18/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 09:18:50.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/userdomain.if	2006-02-21 09:36:37.000000000 -0500
 @@ -145,6 +145,7 @@
  	allow $1_t unpriv_userdomain:fd use;
  
@@ -423,7 +418,7 @@
  	')
  
  	optional_policy(`samba',`
-@@ -4423,3 +4426,24 @@
+@@ -4425,3 +4428,24 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
  	files_filetrans_home($1,user_home_dir_t)
  ')
@@ -448,9 +443,9 @@
 +	allow $1 user_home_type:dir mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.17/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.18/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.17/policy/modules/system/userdomain.te	2006-02-20 16:22:06.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/system/userdomain.te	2006-02-21 09:36:37.000000000 -0500
 @@ -358,6 +358,8 @@
  			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
@@ -460,9 +455,9 @@
  			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
  		', `
  			selinux_set_enforce_mode(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.17/support/Makefile.devel
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.18/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-16 16:42:39.000000000 -0500
-+++ serefpolicy-2.2.17/support/Makefile.devel	2006-02-20 16:22:06.000000000 -0500
++++ serefpolicy-2.2.18/support/Makefile.devel	2006-02-21 09:36:37.000000000 -0500
 @@ -1,3 +1,6 @@
 +# installation paths
 +SHAREDIR := $(PREFIX)/share/selinux


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- selinux-policy.spec	21 Feb 2006 04:51:22 -0000	1.113
+++ selinux-policy.spec	21 Feb 2006 15:36:15 -0000	1.114
@@ -8,8 +8,8 @@
 %define CHECKPOLICYVER 1.28-3
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.17
-Release: 2
+Version: 2.2.18
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -289,6 +289,9 @@
 
 %changelog
 
+* Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.18-1
+- Fix vpnc policy to work from NetworkManager
+
 * Mon Feb 20 2006 Dan Walsh <dwalsh at redhat.com> 2.2.17-2
 - Update to upstream
 - Fix semoudle polcy


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	20 Feb 2006 22:11:40 -0000	1.45
+++ sources	21 Feb 2006 15:36:15 -0000	1.46
@@ -1 +1 @@
-13c8e375555ca342df487f40e9d8217e  serefpolicy-2.2.17.tgz
+9b0ad611d57d43cac048eed20b8f3ab8  serefpolicy-2.2.18.tgz



From fedora-cvs-commits at redhat.com  Tue Feb 21 16:00:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 11:00:59 -0500
Subject: rpms/openssh/devel openssh-4.3p2-scp-print-err.patch, NONE,
	1.1 openssh.spec, 1.87, 1.88
Message-ID: <200602211600.k1LG0x7v024831@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24811

Modified Files:
	openssh.spec 
Added Files:
	openssh-4.3p2-scp-print-err.patch 
Log Message:
* Tue Feb 21 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-2
- print error from scp if not remote (patch by Bjorn Augustsson #178923)


openssh-4.3p2-scp-print-err.patch:
 scp.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE openssh-4.3p2-scp-print-err.patch ---
--- openssh-4.3p2/scp.c.print-err	2006-02-13 15:06:01.000000000 +0100
+++ openssh-4.3p2/scp.c	2006-02-21 16:47:04.000000000 +0100
@@ -1097,15 +1097,15 @@
 	va_list ap;
 
 	++errs;
-	if (fp == NULL && !(fp = fdopen(remout, "w")))
-		return;
-	(void) fprintf(fp, "%c", 0x01);
-	(void) fprintf(fp, "scp: ");
-	va_start(ap, fmt);
-	(void) vfprintf(fp, fmt, ap);
-	va_end(ap);
-	(void) fprintf(fp, "\n");
-	(void) fflush(fp);
+	if (fp != NULL || (fp = fdopen(remout, "w"))) {
+		(void) fprintf(fp, "%c", 0x01);
+		(void) fprintf(fp, "scp: ");
+		va_start(ap, fmt);
+		(void) vfprintf(fp, fmt, ap);
+		va_end(ap);
+		(void) fprintf(fp, "\n");
+		(void) fflush(fp);
+	}
 
 	if (!iamremote) {
 		va_start(ap, fmt);


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- openssh.spec	13 Feb 2006 14:11:40 -0000	1.87
+++ openssh.spec	21 Feb 2006 16:00:42 -0000	1.88
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p2
-%define rel 1
+%define rel 2
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -83,6 +83,7 @@
 Patch22: openssh-3.9p1-askpass-keep-above.patch
 Patch23: openssh-3.9p1-no-log-signal.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
+Patch25: openssh-4.3p2-scp-print-err.patch
 Patch27: openssh-4.2p1-pam-no-stack.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
@@ -205,6 +206,7 @@
 %patch22 -p1 -b .keep-above
 %patch23 -p1 -b .signal
 %patch24 -p1 -b .fromto-remote
+%patch25 -p1 -b .print-err
 %patch27 -p1 -b .stack
 %patch30 -p1 -b .exit-deadlock
 %patch31 -p1 -b .skip-used
@@ -450,6 +452,9 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-2
+- print error from scp if not remote (patch by Bjorn Augustsson #178923)
+
 * Mon Feb 13 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-1
 - new version
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 16:11:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 11:11:55 -0500
Subject: rpms/xorg-x11-server/devel xorg-server-1.0.1-backtrace.patch, NONE,
	1.1 xorg-x11-server.spec, 1.41, 1.42
Message-ID: <200602211611.k1LGBtSq025229@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25215

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-server-1.0.1-backtrace.patch 
Log Message:
* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com>
- Added xorg-server-1.0.1-backtrace.patch which enables the Xorg server's
  built in backtrace support by default, as it was inadvertently disabled in
  7.0.


xorg-server-1.0.1-backtrace.patch:
 xorg-config.h.in |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xorg-server-1.0.1-backtrace.patch ---
Patch to enable backtrace support, which should be enabled by default in 7.0 but
was inadvertently not enabled.  The 6.9.0 release did have it enabled properly
however, and all the other distros shipping 7.0 seem to have enabled this patch
as well.   -- mharris at redhat.com

===================================================================
RCS file: /cvs/xorg/xserver/xorg/include/xorg-config.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- include/xorg-config.h.in	2005/12/02 06:02:44	1.12
+++ include/xorg-config.h.in	2006/01/26 00:23:44	1.13
@@ -106,4 +106,7 @@
 /* System has wscons console */
 #undef WSCONS_SUPPORT
 
+/* Has backtrace support */
+#undef HAVE_BACKTRACE
+
 #endif /* _XORG_CONFIG_H_ */


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-server.spec	11 Feb 2006 06:25:24 -0000	1.41
+++ xorg-x11-server.spec	21 Feb 2006 16:11:49 -0000	1.42
@@ -20,6 +20,7 @@
 Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
 Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
 Patch4:    xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
+Patch5:    xorg-server-1.0.1-backtrace.patch
 
 # Patches taken from xserver/xorg CVS HEAD, post-1.0.1
 Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
@@ -235,6 +236,7 @@
 #%patch2 -p0 -b .rgb.txt-dix-config-fix
 %patch3 -p0 -b .parser-add-missing-headers-to-sdk
 %patch4 -p0 -b .composite-fastpath-fdo4320
+%patch5 -p0 -b .backtrace
 
 %patch100 -p2 -b .fbpict-fix-rounding
 %patch101 -p2 -b .SEGV-on-null-interface
@@ -513,7 +515,12 @@
 # -------------------------------------------------------------------
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-6.1
+* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com>
+- Added xorg-server-1.0.1-backtrace.patch which enables the Xorg server's
+  built in backtrace support by default, as it was inadvertently disabled in
+  7.0.
+
+* 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



From fedora-cvs-commits at redhat.com  Tue Feb 21 16:23:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 11:23:16 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.5,1.6
Message-ID: <200602211623.k1LGNG1F005423@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5408

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Changed plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml to a 64 build file based on the x86_64 build file (instead of the ppc 32-bit one).

eclipse-ppc64.patch:
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 17 files changed, 1584 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-ppc64.patch	20 Feb 2006 19:56:59 -0000	1.5
+++ eclipse-ppc64.patch	21 Feb 2006 16:23:12 -0000	1.6
@@ -1350,9 +1350,9 @@
 diff -uNr plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
 --- plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml	1969-12-31 19:00:00.000000000 -0500
 +++ plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml	2006-02-20 13:38:47.000000000 -0500
-@@ -0,0 +1,301 @@
+@@ -0,0 +1,321 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+<project name="org.eclipse.swt.gtk.linux.ppc64" default="build.jars" basedir=".">
++<project name="org.eclipse.swt.gtk.linux.ppc64" default="build.nativeLibraries" basedir=".">
 +
 +	<target name="init" depends="properties">
 +		<property name="ws" value="gtk"/>
@@ -1367,6 +1367,7 @@
 +		<property name="destination" value="${basedir}"/>
 +		<property name="plugindir" value="../org.eclipse.swt"/>
 +		<property name="bootclasspath" value=""/>
++		<property name="temp.folder.64" value="${basedir}/temp.folder/64"/>
 +		<property name="toolsplugindir" value="../org.eclipse.swt.tools"/>
 +		<property name="javacVerbose" value="true"/>
 +	</target>
@@ -1476,8 +1477,22 @@
 +			<copy todir="${basedir}/src">
 +				<fileset dir="${plugindir}" includes="Eclipse*/**"/>
 +			</copy>
++			<!-- Convert SWT 32 bit java source to 64 bit  -->
++			<replace dir="${basedir}/src" includes="**/*.java" token="int /*long*/" value="long /*int*/"/>
 +	</target>
 +	
++	<target name="replace.32.to.64" depends="init">
++			<echo>Converting java files to 64 bit in org.eclipse.swt project</echo>
++			<!-- Convert SWT 32 bit java source to 64 bit  -->
++			<replace dir="${plugindir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/>
++	</target>
++
++	<target name="replace.64.to.32" depends="init">
++			<echo>Converting java files to 32 bit in org.eclipse.swt project</echo>
++			<!-- Convert SWT 64 bit java source to 32 bit  -->
++			<replace dir="${plugindir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/>
++	</target>
++
 +	<target name="src.zip" depends="init" unless="src.zip">
 +		<mkdir dir="${build.result.folder}/"/>
 +		<zip zipfile="${build.result.folder}/src.zip">
@@ -1530,7 +1545,7 @@
 +		<!--compile the jar in org.eclipse.swt.tools-->
 +		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
 +
-+		<!-- generate the C code from the SWT PI java classes -->
++		<!-- generate the C code from the (64 bit) SWT PI java classes -->
 +		<!-- assumes the swttools.jar has already been built  -->
 +		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
 +		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
@@ -1555,7 +1570,7 @@
 +		</copy>
 +	</target>
 +
-+	<target name="build.nativeLibraries" depends="build.cfiles" description="Build native libraries without changing the content of org.eclipse.swt">
++	<target name="build.nativeLibraries" depends="build.cfiles" description="Build 64 bit native libraries without changing the content of org.eclipse.swt">
 +		<property name="sourcedir" value="${basedir}/src/bin/library" />
 +	    <property name="lib_destdir" value="${sourcedir}/../../../../${fragment}" />
 +		<tstamp/>
@@ -1580,7 +1595,9 @@
 +		<mkdir dir="${destination.temp.folder}/${full.name}"/>
 +		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/${full.name}/"/>
 +		<copy todir="${destination.temp.folder}/${full.name}">
-+			<fileset dir="${basedir}" includes="about.html,about_files/"/>
++			<fileset dir="${basedir}" includes="about.html"/>
++			<fileset dir="${basedir}" includes="about_files/lgpl-v21.txt"/>
++			<fileset dir="${basedir}" includes="about_files/mpl-v11.txt"/>
 +		</copy>
 +	</target>
 +
@@ -1595,7 +1612,10 @@
 +			<fileset dir="${build.result.folder}/@dot" includes="**"/>
 +		</copy>
 +		<copy todir="${destination.temp.folder}/${full.name}">
-+			<fileset dir="${basedir}" includes="fragment.properties,about.html,about_files/,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,META-INF/"/> 
++			<fileset dir="${basedir}" includes="fragment.properties,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,META-INF/"/> 
++			<fileset dir="${basedir}" includes="about.html"/>
++			<fileset dir="${basedir}" includes="about_files/lgpl-v21.txt"/>
++			<fileset dir="${basedir}" includes="about_files/mpl-v11.txt"/>
 +		</copy>
 +	  	<chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib" />
 +	</target>
@@ -1610,8 +1630,8 @@
 +		<copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload"/>
 +		<copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload"/>
 +		<copy todir="${temp.folder}/swtdownload">
++			<fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2,libcairo.so.1"/>
 +			<fileset dir="${basedir}" includes="about.html,about_files/"/>
-+			<fileset dir="${basedir}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2"/>
 +		</copy>
 +		<chmod dir="${temp.folder}/swtdownload" perm="755" includes="**/lib*"/>
 +		<exec dir="${temp.folder}/swtdownload" executable="zip">



From fedora-cvs-commits at redhat.com  Tue Feb 21 16:23:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 11:23:40 -0500
Subject: rpms/kernel/devel linux-2.6-xen-cpusteal-hv.patch, NONE,
	1.1 linux-2.6-xen-cpusteal-kernel.patch, NONE,
	1.1 kernel-2.6.spec, 1.1972, 1.1973
Message-ID: <200602211623.k1LGNe2T005482@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5463

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-xen-cpusteal-hv.patch 
	linux-2.6-xen-cpusteal-kernel.patch 
Log Message:
- Make it possible to disable xen and kdump builds.
- Add Xen cpu steal accounting code.


linux-2.6-xen-cpusteal-hv.patch:
 common/domain.c       |   16 ++++++++++++++++
 include/public/vcpu.h |    8 ++++++++
 2 files changed, 24 insertions(+)

--- NEW FILE linux-2.6-xen-cpusteal-hv.patch ---
Allow guest domains to get information from the hypervisor on how much
cpu time their virtual cpus have used.  This is needed to estimate the
cpu steal time.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- xen/include/public/vcpu.h.steal	2006-02-07 18:01:41.000000000 -0500
+++ xen/include/public/vcpu.h	2006-02-17 13:51:45.000000000 -0500
@@ -51,6 +51,14 @@
 /* Returns 1 if the given VCPU is up. */
 #define VCPUOP_is_up                3
 
+/*
+ * Get information on how much CPU time this VCPU has used, etc...
+ *
+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
+ *               of which filled in with scheduler info.
+ */
+#define VCPUOP_cpu_info             4
+
 #endif /* __XEN_PUBLIC_VCPU_H__ */
 
 /*
--- xen/common/domain.c.steal	2006-02-07 18:01:40.000000000 -0500
+++ xen/common/domain.c	2006-02-17 13:52:44.000000000 -0500
@@ -451,8 +451,24 @@
     case VCPUOP_is_up:
         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
         break;
+
+    case VCPUOP_cpu_info:
+	{
+	    struct dom0_getvcpuinfo vi = { 0, };
+	    vi.online = !test_bit(_VCPUF_down, &v->vcpu_flags);
+	    vi.blocked = test_bit(_VCPUF_blocked, &v->vcpu_flags);
+	    vi.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
+	    vi.cpu_time = v->cpu_time;
+	    vi.cpu = v->processor;
+	    rc = 0;
+
+	    if ( copy_to_user(arg, &vi, sizeof(dom0_getvcpuinfo_t)) )
+		rc = -EFAULT;
+	    break;
+	}
     }
 
+
     return rc;
 }
 

linux-2.6-xen-cpusteal-kernel.patch:
 arch/i386/kernel/time-xen.c  |   38 ++++++++++++++++++++++++++++++++++++++
 include/xen/interface/vcpu.h |    8 ++++++++
 2 files changed, 46 insertions(+)

--- NEW FILE linux-2.6-xen-cpusteal-kernel.patch ---
Estimate and account for the CPU steal time.  That is, the time during
which we wanted to run, but the hypervisor scheduled in another
process instead.  This can be used to help administrators in capacity
planning, by clearly being able to distinguish whether the system is
too slow or this guest is simply not getting enough CPU time.

This is the i386 version, I'll send the implementation for x86_64 soon.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- linux-2.6.15.i686/arch/i386/kernel/time-xen.c.steal	2006-02-17 16:44:40.000000000 -0500
+++ linux-2.6.15.i686/arch/i386/kernel/time-xen.c	2006-02-20 18:31:26.000000000 -0500
@@ -48,6 +48,7 @@
 #include <linux/mca.h>
 #include <linux/sysctl.h>
 #include <linux/percpu.h>
+#include <linux/kernel_stat.h>
 
 #include <asm/io.h>
 #include <asm/smp.h>
@@ -77,6 +78,7 @@
 #include <asm/arch_hooks.h>
 
 #include <xen/evtchn.h>
+#include <xen/interface/vcpu.h>
 
 #if defined (__i386__)
 #include <asm/i8259.h>
@@ -624,7 +626,43 @@ irqreturn_t timer_interrupt(int irq, voi
          * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
          * if there is risk of deadlock if we do (since update_process_times
          * may do scheduler rebalancing work and thus acquire runqueue locks).
+	 *
+	 * If we have not run for a while, chances are this vcpu got scheduled
+	 * away.  Try to estimate how much time was stolen.
          */
+	if (delta_cpu > (s64)(2 * NS_PER_TICK)) {
+		dom0_getvcpuinfo_t vcpu = { 0, };
+		cputime64_t total;	/* In jiffies, not nanoseconds. */
+		s64 cputicks, deltaticks, steal;
+
+		if (HYPERVISOR_vcpu_op(VCPUOP_cpu_info, cpu, &vcpu) == 0) {
+			total = kstat_cpu(cpu).cpustat.user +
+				kstat_cpu(cpu).cpustat.nice +
+				kstat_cpu(cpu).cpustat.system +
+				kstat_cpu(cpu).cpustat.softirq +
+				kstat_cpu(cpu).cpustat.irq;
+
+			/* do_div modifies the variable in place. YUCK */
+			deltaticks = delta_cpu;
+			cputicks = vcpu.cpu_time;
+			do_div(cputicks, NS_PER_TICK);
+			do_div(deltaticks, NS_PER_TICK);
+
+			steal = total + deltaticks - cputicks;
+			if (unlikely(steal < 0))
+				steal = 0;
+			else if (unlikely(steal > deltaticks))
+				steal = deltaticks;
+
+			if (steal > 0) {
+				delta_cpu -= steal * NS_PER_TICK;
+				per_cpu(processed_system_time, cpu) +=
+							steal * NS_PER_TICK;
+				account_steal_time(current, (cputime_t)steal);
+			}
+		}
+	}
+
 	while (delta_cpu >= NS_PER_TICK) {
 		delta_cpu -= NS_PER_TICK;
 		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
--- linux-2.6.15.i686/include/xen/interface/vcpu.h.steal	2006-02-17 16:14:17.000000000 -0500
+++ linux-2.6.15.i686/include/xen/interface/vcpu.h	2006-02-17 16:14:52.000000000 -0500
@@ -51,6 +51,14 @@
 /* Returns 1 if the given VCPU is up. */
 #define VCPUOP_is_up                3
 
+/*
+ * Get information on how much CPU time this VCPU has used, etc...
+ *
+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
+ *               of which filled in with scheduler info.
+ */
+#define VCPUOP_cpu_info             4
+
 #endif /* __XEN_PUBLIC_VCPU_H__ */
 
 /*


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1972
retrieving revision 1.1973
diff -u -r1.1972 -r1.1973
--- kernel-2.6.spec	21 Feb 2006 02:59:42 -0000	1.1972
+++ kernel-2.6.spec	21 Feb 2006 16:23:38 -0000	1.1973
@@ -256,6 +256,7 @@
 Patch708: linux-2.6-xen-x86_64-fixes.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
 Patch710: linux-2.6.15-xen-module-fault.patch
+Patch711: linux-2.6-xen-cpusteal-kernel.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -406,6 +407,7 @@
 Patch10001: linux-2.6-random-patches.patch
 
 Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch
+Patch20010: linux-2.6-xen-cpusteal-hv.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -685,6 +687,7 @@
 %if %{buildxen}
 cd xen
 %patch20000 -p1
+%patch20010 -p1
 cd ..
 %endif
 cd linux-%{kversion}.%{_target_cpu}
@@ -760,6 +763,7 @@
 %patch708 -p2
 %patch709 -p1
 %patch710 -p1
+%patch711 -p1
 %endif
 
 #
@@ -1582,6 +1586,10 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Rik van Riel <riel at redhat.com>
+- Make it possible to disable xen and kdump builds.
+- Add Xen cpu steal accounting code.
+
 * Sun Feb 20 2006 Dave Jones <davej at redhat.com>
 - Fix incorrect hardlink count in selinuxfs (#182001)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 17:05:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 12:05:38 -0500
Subject: rpms/libuser/devel .cvsignore, 1.35, 1.36 libuser.spec, 1.49,
	1.50 sources, 1.37, 1.38
Message-ID: <200602211705.k1LH5cYq007437@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libuser/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7392

Modified Files:
	.cvsignore libuser.spec sources 
Log Message:
* Tue Feb 21 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.5-1
- Fix multilib conflict on libuser.conf.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Feb 2006 17:07:15 -0000	1.35
+++ .cvsignore	21 Feb 2006 17:05:03 -0000	1.36
@@ -1 +1 @@
-libuser-0.54.4.tar.gz
+libuser-0.54.5.tar.gz


Index: libuser.spec
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/libuser.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libuser.spec	13 Feb 2006 17:07:15 -0000	1.49
+++ libuser.spec	21 Feb 2006 17:05:20 -0000	1.50
@@ -4,7 +4,7 @@
 %define python %(%{__python} -c "import sys; print sys.version[:3]")
 
 Name: libuser
-Version: 0.54.4
+Version: 0.54.5
 Release: 1
 Group: System Environment/Base
 License: LGPL
@@ -96,6 +96,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Feb 21 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.5-1
+- Fix multilib conflict on libuser.conf.5
+
 * Mon Feb 13 2006 Miloslav Trmac <mitr at redhat.com> - 0.54.4-1
 - New release with updated translations
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libuser/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	13 Feb 2006 17:07:15 -0000	1.37
+++ sources	21 Feb 2006 17:05:20 -0000	1.38
@@ -1 +1 @@
-9df2502283bbd5657d8d1c600b798ee5  libuser-0.54.4.tar.gz
+2178d68f43869e88adcfa223f7852f7c  libuser-0.54.5.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 17:25:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 12:25:10 -0500
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.4, 1.5 cryptsetup-luks.spec,
	1.18, 1.19 sources, 1.4, 1.5 cryptsetup-luks-1.0.1-help.patch,
	1.1, NONE
Message-ID: <200602211725.k1LHPArx027945@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27854

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Removed Files:
	cryptsetup-luks-1.0.1-help.patch 
Log Message:
update to 1.0.2 (#176726)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Jul 2005 18:03:09 -0000	1.4
+++ .cvsignore	21 Feb 2006 17:25:08 -0000	1.5
@@ -1 +1 @@
-cryptsetup-luks-1.0.1.tar.bz2
+cryptsetup-luks-1.0.2.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cryptsetup-luks.spec	20 Feb 2006 12:17:20 -0000	1.18
+++ cryptsetup-luks.spec	21 Feb 2006 17:25:08 -0000	1.19
@@ -1,13 +1,12 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.1
-Release: 5
+Version: 1.0.2
+Release: 1
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
 Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}.tar.bz2
 Patch: cryptsetup-luks-1.0.1-proto.patch
-Patch1: cryptsetup-luks-1.0.1-help.patch
 Patch2: cryptsetup-luks-1.0.1-sepol.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libgcrypt-devel >= 1.1.42, popt, device-mapper
@@ -34,7 +33,6 @@
 %prep
 %setup -q
 %patch -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -67,6 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 21 2006 Bill Nottingham <notting at redhat.com> 1.0.2-1
+- update to 1.0.2, fix incompatiblity with old cryptsetup (#176726)
+
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.0.1-5
 - BuildRequires: libselinux-devel
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Jul 2005 18:03:09 -0000	1.4
+++ sources	21 Feb 2006 17:25:08 -0000	1.5
@@ -1 +1 @@
-b2415f67ceed3ad2c7dd2e878cf7787d  cryptsetup-luks-1.0.1.tar.bz2
+cd6899ecf517c3414386476bd97f97d3  cryptsetup-luks-1.0.2.tar.bz2


--- cryptsetup-luks-1.0.1-help.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 21 18:25:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 13:25:55 -0500
Subject: rpms/desktop-printing/devel desktop-printing.spec,1.52,1.53
Message-ID: <200602211825.k1LIPtN5003026@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/desktop-printing/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2960

Modified Files:
	desktop-printing.spec 
Log Message:
only show in GNOME




Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- desktop-printing.spec	20 Feb 2006 11:39:16 -0000	1.52
+++ desktop-printing.spec	21 Feb 2006 18:25:51 -0000	1.53
@@ -5,7 +5,7 @@
 Summary: Desktop print icon
 Name: desktop-printing
 Version: 0.19
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/File
 # total lie
@@ -61,6 +61,8 @@
 
 %find_lang eggcups
 
+echo "OnlyShowIn=GNOME;" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-default-printer.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,6 +90,9 @@
 %{_sysconfdir}/gconf/*
 
 %changelog
+* Tue Feb 21 2006 Than Ngo <than at redhat.com> 0.19-7
+- only show in GNOME
+
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 0.19-6
 - BuildRequire libXScrnSaver-devel for libXss
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 18:57:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 13:57:55 -0500
Subject: rpms/kdebase/devel kdebase-3.5.1-konsole-fonts.patch, NONE,
	1.1 kdebase.spec, 1.156, 1.157
Message-ID: <200602211857.k1LIvtu1027552@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27464

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-konsole-fonts.patch 
Log Message:
- fixed rpm file conflict


kdebase-3.5.1-konsole-fonts.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.1-konsole-fonts.patch ---
--- kdebase-3.5.1/konsole/Makefile.am.orig	2006-02-21 19:52:27.000000000 +0100
+++ kdebase-3.5.1/konsole/Makefile.am	2006-02-21 19:52:32.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = konsole other doc fonts
+SUBDIRS = konsole other doc
 
 xdg_apps_DATA = konsole.desktop konsolesu.desktop
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kdebase.spec	21 Feb 2006 15:42:05 -0000	1.156
+++ kdebase.spec	21 Feb 2006 18:57:52 -0000	1.157
@@ -51,6 +51,7 @@
 Patch12: kdebase-3.5.1-dbus.patch
 Patch13: kdebase-3.5.1-kdm-readme.patch
 Patch14: kdebase-3.5.1-kwin-systray.patch
+Patch15: kdebase-3.5.1-fonts.patch
 
 # upstream patches
 Patch100: kdebase-3.5.1-keyboardlayout.patch
@@ -427,7 +428,8 @@
 
 %changelog
 * Tue Feb 21 2006 Than Ngo <than at redhat.com> 6:3.5.1-5
-- add missing Category X-KDE-LookNFeel
+- fixed rpm file conflict
+- added missing Category X-KDE-LookNFeel
 
 * Thu Feb 16 2006 Than Ngo <than at redhat.com> 6:3.5.1-4
 - Systray icons not docked sometimes, apply patch to fix this issue #180314



From fedora-cvs-commits at redhat.com  Tue Feb 21 18:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 13:58:58 -0500
Subject: rpms/kdebase/devel kdebase.spec,1.157,1.158
Message-ID: <200602211858.k1LIwwFr028040@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27974

Modified Files:
	kdebase.spec 
Log Message:
apply the patch 



Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kdebase.spec	21 Feb 2006 18:57:52 -0000	1.157
+++ kdebase.spec	21 Feb 2006 18:58:55 -0000	1.158
@@ -138,6 +138,7 @@
 %patch12 -p1 -b .dbus
 %patch13 -p1 -b .kdm-readme
 %patch14 -p1 -b .systray
+%patch15 -p1 -b .konsole-fonts
 
 # upstream patches
 %patch100 -p1 -b .keyboardlayout



From fedora-cvs-commits at redhat.com  Tue Feb 21 19:01:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 14:01:59 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.6,1.7
Message-ID: <200602211901.k1LJ1xTB028262@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28154

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Added patch for assemble.org.eclipse.sdk.linux.gtk.ppc64.xml to ppc64 patch.

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 18 files changed, 1600 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-ppc64.patch	21 Feb 2006 16:23:12 -0000	1.6
+++ eclipse-ppc64.patch	21 Feb 2006 19:01:10 -0000	1.7
@@ -1721,3 +1721,56 @@
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">
+--- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-01-18 16:09:17.000000000 -0500
++++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2006-01-18 16:09:17.000000000 -0500
+@@ -76,6 +76,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.build" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.ppc64" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.osgi.util" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -85,6 +88,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.linux.gtk.ppc64" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.configurator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -157,6 +163,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.isv" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp.source.linux.gtk.ppc64" target="gather.bin.parts">
++			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
++		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -337,6 +343,9 @@
+ 		<ant antfile="build.xml" dir="features/org.eclipse.jdt/" target="gather.bin.parts">
+ 			<property name="feature.base" value="${eclipse.base}"/>
+ 		</ant>
++		<ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
++			<property name="feature.base" value="${eclipse.base}"/>
++		</ant>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jdt.core_3.1.2"/>
+@@ -371,6 +380,10 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
++			<param name="elementName" value="org.eclipse.swt.gtk.linux.ppc64_3.1.1"/>
++		</antcall>
++		<antcall target="jarUp">
++			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.osgi.util_3.1.1"/>
+ 		</antcall>
+ 		<antcall target="jarUp">



From fedora-cvs-commits at redhat.com  Tue Feb 21 19:09:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 14:09:20 -0500
Subject: rpms/policycoreutils/devel .cvsignore, 1.102,
	1.103 policycoreutils-rhat.patch, 1.163,
	1.164 policycoreutils.spec, 1.236, 1.237 sources, 1.106, 1.107
Message-ID: <200602211909.k1LJ9K5M029210@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29163

Modified Files:
	.cvsignore policycoreutils-rhat.patch policycoreutils.spec 
	sources 
Log Message:
* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-1
- Update from upstream
	* Merged semanage bug fix patch from Ivan Gyurdiev.
	* Merged improve bindings patch from Ivan Gyurdiev.
	* Merged semanage usage patch from Ivan Gyurdiev.
	* Merged use PyList patch from Ivan Gyurdiev.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	13 Feb 2006 19:54:09 -0000	1.102
+++ .cvsignore	21 Feb 2006 19:09:17 -0000	1.103
@@ -91,3 +91,4 @@
 policycoreutils-1.29.19.tgz
 policycoreutils-1.29.20.tgz
 policycoreutils-1.29.23.tgz
+policycoreutils-1.29.26.tgz

policycoreutils-rhat.patch:
 audit2allow/audit2allow   |  180 ++++++++++++++-
 audit2allow/audit2allow.1 |    3 
 semanage/semanage         |   11 
 semanage/semanage.8       |    4 
 semanage/seobject.py      |  528 +++++++++++++++++++++++++++-------------------
 5 files changed, 499 insertions(+), 227 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- policycoreutils-rhat.patch	13 Feb 2006 19:54:09 -0000	1.163
+++ policycoreutils-rhat.patch	21 Feb 2006 19:09:17 -0000	1.164
@@ -1,20 +1,437 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.20/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
-+++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-10 11:48:59.000000000 -0500
-@@ -21,8 +21,11 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.29.26/audit2allow/audit2allow
+--- nsapolicycoreutils/audit2allow/audit2allow	2005-12-08 12:52:44.000000000 -0500
++++ policycoreutils-1.29.26/audit2allow/audit2allow	2006-02-21 13:48:01.000000000 -0500
+@@ -25,6 +25,118 @@
+ #
+ #  
+ import commands, sys, os, pwd, string, getopt, re, selinux
++
++obj="(\{[^\}]*\}|[^ \t:]*)"
++allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj)
++
++awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\
++        IFACEFILE=FILENAME\n\
++	IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\
++	IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\
++}\n\
++\n\
++/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\
++\n\
++  if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\
++		ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\
++		ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\
++		print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\
++	}\n\
++}\
++'
++
++class accessTrans:
++    def __init__(self):
++        self.dict={}
++	try:
++		fd=open("/usr/share/selinux/refpolicy/include/support/obj_perm_sets.spt")
++	except IOError, error:
++		raise IOError("Reference policy generation requires the policy development package.\n%s" % error)
++        records=fd.read().split("\n")
++        regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'"
++        for r in records:
++            m=re.match(regexp,r)
++            if m!=None:
++                self.dict[m.groups()[0]] = m.groups()[1].split()
++        fd.close()
++    def get(self, var):
++        l=[]
++        for v in var:
++            if v in self.dict.keys():
++                l += self.dict[v]
++            else:
++                if v not in ("{", "}"):
++                    l.append(v)
++        return l
++
++class interfaces:
++    def __init__(self):
++        self.dict={}
++        trans=accessTrans()
++	(input, output) = os.popen2("awk -f - /usr/share/selinux/refpolicy/include/*/*.if 2> /dev/null")
++	input.write(awk_script)
++	input.close()
++	records=output.read().split("\n")
++	input.close()
++        if len(records) > 0:
++            regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp
++            for r in records:
++                m=re.match(regexp,r)
++                if m==None:
++                    continue
++                else:
++                    val=m.groups()
++                file=os.path.basename(val[0]).split(".")[0]
++                iface=val[1]
++                Scon=val[2].split()
++                Tcon=val[3].split()
++                Class=val[4].split()
++                Access=trans.get(val[5].split())
++                for s in Scon:
++                    for t in Tcon:
++                        for c in Class:
++                            if (s, t, c) not in self.dict.keys():
++                                self.dict[(s, t, c)]=[]
++                            self.dict[(s, t, c)].append((Access, file, iface))
++    def out(self):
++        keys=self.dict.keys()
++        keys.sort()
++        for k in keys:
++            print k
++            for i in self.dict[k]:
++                print "\t", i
++                
++    def match(self, Scon, Tcon, Class, Access):
++        keys=self.dict.keys()
++        ret=[]
++        if (Scon, Tcon, Class) in keys:
++            for i in self.dict[(Scon, Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if ("$1", Tcon, Class) in keys:
++            for i in self.dict[("$1", Tcon, Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        if (Scon, "$1", Class) in keys:
++            for i in self.dict[(Scon, "$1", Class)]:
++                if Access in i[0]:
++                    if i[2].find(Access) >= 0:
++                        ret.insert(0, i)
++                    else:
++                        ret.append(i)
++            return ret
++        else:
++            return ret
++        
++
+ class serule:
+ 	def __init__(self, type, source, target, seclass):
+ 		self.type=type
+@@ -32,6 +144,8 @@
+ 		self.target=target
+ 		self.seclass=seclass
+ 		self.avcinfo={}
++		self.iface=None
++		
+ 	def add(self, avc):
+ 		for a in avc[0]:
+ 			if a not in self.avcinfo.keys():
+@@ -67,6 +181,33 @@
+ 					ret=ret + " : " + i 
+ 		return ret
+ 		
++	def gen_reference_policy(self, iface):
++		ret=""
++		Scon=self.source
++		Tcon=self.gettarget()
++		Class=self.seclass
++		Access=self.getAccess()
++		m=iface.match(Scon,Tcon,Class,Access)
++		if len(m)==0:
++			return self.out()
++		else:
++			file=m[0][1]
++			ret="\n#%s\n"% self.out()
++			ret += "optional_policy(`%s', `\n" % m[0][1]
++			first=True
++			for i in m:
++				if file != i[1]:
++					ret += "')\ngen_require(`%s', `\n" % i[1]
++					file = i[1]
++					first=True
++				if first:
++					ret += "\t%s(%s)\n" % (i[2], Scon)
++					first=False
++				else:
++					ret += "#\t%s(%s)\n" % (i[2], Scon)
++			ret += "');"
++		return ret
++		
+ 	def gettarget(self):
+ 		if self.source == self.target:
+ 			return "self"
+@@ -81,7 +222,12 @@
+ 		self.types=[]
+ 		self.roles=[]
+ 		self.load(input, te_ind)
+-		
++		self.gen_ref_policy = False
++
++	def gen_reference_policy(self):
++		self.gen_ref_policy = True
++		self.iface=interfaces()
++
+ 	def warning(self, error):
+ 		sys.stderr.write("%s: " % sys.argv[0])
+ 		sys.stderr.write("%s\n" % error)
+@@ -104,7 +250,8 @@
+ 			while line:
+ 				rec=line.split()
+ 				for i in rec:
+-					if i=="avc:" or i=="message=avc:":
++					if i=="avc:" or i=="message=avc:" or i=="msg='avc:":
++
+ 						found=1
+ 					else:
+ 						avc.append(i)
+@@ -182,9 +329,10 @@
+ 		if "security_compute_sid" in avc:
+ 			return
+ 		
++		if "load_policy" in avc and self.last_reload:
++			self.seRules={}
++
+ 		if "granted" in avc:
+-			if "load_policy" in avc and self.last_reload:
+-				self.seRules={}
+ 			return
+ 		try:
+ 			for i in range (0, len(avc)):
+@@ -292,7 +440,10 @@
+ 		keys=self.seRules.keys()
+ 		keys.sort()
+ 		for i in keys:
+-			rec += self.seRules[i].out(verbose)+"\n"
++			if self.gen_ref_policy:
++				rec += self.seRules[i].gen_reference_policy(self.iface)+"\n"
++			else:
++				rec += self.seRules[i].out(verbose)+"\n"
+ 		return rec
+ 
+ if __name__ == '__main__':
+@@ -342,11 +493,12 @@
+ 		buildPP=0
+ 		input_ind=0
+ 		output_ind=0
++		ref_ind=False
+ 		te_ind=0
+ 
+ 		fc_file=""
+ 		gopts, cmds = getopt.getopt(sys.argv[1:],
+-					    'adf:hi:lm:M:o:rtv',
++					    'adf:hi:lm:M:o:rtvR',
+ 					    ['all',
+ 					     'dmesg',
+ 					     'fcfile=',
+@@ -356,6 +508,7 @@
+ 					     'module=',
+ 					     'output=',
+ 					     'requires',
++					     'reference',
+ 					     'tefile',
+ 					     'verbose'
+ 					     ])
+@@ -397,6 +550,9 @@
+ 				if auditlogs:
+ 					usage()
+ 				te_ind=1
++			if o == "-R" or o == "--reference":
++				ref_ind=True
++				
+ 			if o == "-o" or o == "--output":
+ 				if module != ""  or a[0]=="-":
+ 					usage()
+@@ -413,6 +569,10 @@
+ 			
+ 		out=seruleRecords(input, last_reload, verbose, te_ind)
+ 
++
++		if ref_ind:
++			out.gen_reference_policy()
++
+ 		if auditlogs:
+ 			input=os.popen("ausearch -m avc")
+ 			out.load(input)
+@@ -423,15 +583,15 @@
+ 		output.flush()
+ 		if buildPP:
+ 			cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module)
+-			print "Compiling policy: %s" % cmd
++			print "Compiling policy"
++			print cmd
+ 			rc=commands.getstatusoutput(cmd)
+ 			if rc[0]==0:
+ 				cmd="semodule_package -o %s.pp -m %s.mod" % (module, module)
+-				print cmd
+ 				if fc_file != "":
+ 					cmd = "%s -f %s" % (cmd, fc_file)
+ 					
+-				print "Building package: %s" % cmd
++				print cmd
+ 				rc=commands.getstatusoutput(cmd)
+ 				if rc[0]==0:
+ 					print ("\n******************** IMPORTANT ***********************\n")
+@@ -446,6 +606,6 @@
+ 	except ValueError, error:
+ 		errorExit(error.args[0])
+ 	except IOError, error:
+-		errorExit(error.args[1])
++		errorExit(error)
+ 	except KeyboardInterrupt, error:
+ 		sys.exit(0)
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.29.26/audit2allow/audit2allow.1
+--- nsapolicycoreutils/audit2allow/audit2allow.1	2005-12-01 10:11:27.000000000 -0500
++++ policycoreutils-1.29.26/audit2allow/audit2allow.1	2006-02-21 13:48:54.000000000 -0500
+@@ -65,6 +65,9 @@
+ .B "\-r" | "\-\-requires"
+ Generate require output syntax for loadable modules.
+ .TP
++.B "\-R" | "\-\-reference"
++Generate reference policy using installed macros
++.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.
+ .TP
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.26/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage	2006-02-16 13:35:28.000000000 -0500
++++ policycoreutils-1.29.26/semanage/semanage	2006-02-21 13:57:04.000000000 -0500
+@@ -22,6 +22,9 @@
+ #  
+ import os, sys, getopt
+ import seobject
++import selinux
++
++is_mls_enabled=selinux.is_selinux_mls_enabled()
+ 
+ if __name__ == '__main__':
+ 
+@@ -57,13 +60,13 @@
+ 		-p (named pipe) \n\n\
+ \
+ 	-p, --proto      Port protocol (tcp or udp)\n\
+-	-L, --level      Default SELinux Level\n\
++	-L, --level      Default SELinux Level (MLS/MCS Systems only)\n\
+ 	-R, --roles      SELinux Roles (ex: "sysadm_r staff_r")\n\
+ 	-T, --trans      SELinux Level Translation\n\n\
+ \
+ 	-s, --seuser     SELinux User Name\n\
+ 	-t, --type       SELinux Type for the object\n\
+-	-r, --range      MLS/MCS Security Range\n\
++	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only\n\
+ '
+ 		print message
+ 		sys.exit(1)
+@@ -167,12 +170,16 @@
+ 				modify = 1
+ 				
+ 			if o == "-r" or o == '--range':
++				if is_mls_enabled == 0:
++					errorExit("range not supported on Non MLS machines")
+ 				serange = a
+ 
+ 			if o == "-l" or o == "--list":
+ 				list = 1
+ 
+ 			if o == "-L" or o == '--level':
++				if is_mls_enabled == 0:
++					errorExit("range not supported on Non MLS machines")
+ 				selevel = a
+ 
+ 			if o == "-p" or o == '--proto':
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.26/semanage/semanage.8
+--- nsapolicycoreutils/semanage/semanage.8	2006-01-27 01:16:33.000000000 -0500
++++ policycoreutils-1.29.26/semanage/semanage.8	2006-02-20 23:21:37.000000000 -0500
+@@ -46,7 +46,7 @@
+ List the OBJECTS
+ .TP
+ .I                \-L, \-\-level
+-Default SELinux Level for SELinux use. (s0)
++Default SELinux Level for SELinux use, s0 Default. (MLS/MCS Systems only)
+ .TP
+ .I                \-m, \-\-modify     
+ Modify a OBJECT record NAME
+@@ -58,7 +58,7 @@
+ Protocol for the specified port (tcp|udp).
+ .TP
+ .I                \-r, \-\-range      
+-MLS/MCS Security Range
++MLS/MCS Security Range (MLS/MCS Systems only)
+ .TP
+ .I                \-R, \-\-role
+ SELinux Roles.  You must enclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times.
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.26/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py	2006-02-16 13:35:28.000000000 -0500
++++ policycoreutils-1.29.26/semanage/seobject.py	2006-02-20 23:21:42.000000000 -0500
+@@ -21,9 +21,43 @@
  #
  #  
  
 -import pwd, string, selinux, tempfile, os, re
 +import pwd, string, selinux, tempfile, os, re, sys
  from semanage import *;
-+import audit
-+
-+audit_fd=audit.audit_open()
  
++is_mls_enabled=selinux.is_selinux_mls_enabled()
++import syslog
++try:
++	import audit
++	class logger:
++		def __init__(self):
++			self.audit_fd=audit.audit_open()
++
++		def log(self, success, msg, name="", sename="", serole="", serange="", old_sename="", old_serole="", old_serange=""):
++			audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],msg, name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success);
++except:
++	class logger:
++		def log(self, success, msg, name="", sename="", serole="", serange="", old_sename="", old_serole="", old_serange=""):
++			if success == 1:
++				message = "Successful: "
++			else:
++				message = "Failed: "
++			message += " %s name=%s" % (msg,name)
++			if sename != "":
++				message += " sename=" + sename
++			if old_sename != "":
++				message += " old_sename=" + old_sename
++			if serole != "":
++				message += " role=" + serole
++			if old_serole != "":
++				message += " old_role=" + old_serole
++			if serange != "":
++				message += " MLSRange=" + serange
++			if old_serange != "":
++				message += " old_MLSRange=" + old_serange
++			syslog.syslog(message);
++			
++mylog=logger()		
++
  def validate_level(raw):
  	sensitivity="s([0-9]|1[0-5])"
-@@ -170,119 +173,145 @@
+ 	category="c(1?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])"
+@@ -143,6 +177,7 @@
+ 	def __init__(self):
+ 		self.sh = semanage_handle_create()
+ 		self.semanaged = semanage_is_managed(self.sh)
++
+ 		if not self.semanaged:
+ 			semanage_handle_destroy(self.sh)
+ 			raise ValueError("SELinux policy is not managed or store cannot be accessed.")
+@@ -162,127 +197,154 @@
+ 		semanageRecords.__init__(self)
+ 
+ 	def add(self, name, sename, serange):
+-		if serange == "":
+-			serange = "s0"
+-		else:
+-			serange = untranslate(serange)
++		if is_mls_enabled == 1:
++			if serange == "":
++				serange = "s0"
++			else:
++				serange = untranslate(serange)
+ 			
  		if sename == "":
  			sename = "user_u"
  			
@@ -96,10 +513,10 @@
 +				raise ValueError("Could not add login mapping for %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user mapping", name, 0, sename, "", serange, "", "", "", "", "", "", 0);
++			mylog.log(0, "add SELinux user mapping", name, sename, "", serange);
 +			raise error
 +		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user mapping", name, 0, sename, "", serange, "", "", "", "", "", "", 1);
++		mylog.log(1, "add SELinux user mapping", name, sename, "", serange);
  		semanage_seuser_key_free(k)
  		semanage_seuser_free(u)
  
@@ -175,10 +592,10 @@
 +				raise ValueError("Could not modify login mapping for %s" % name)
  
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping", name, 0, sename, "", serange, "", oldsename, "", oldserange, "", "", "", 0);
++			mylog.log(0,"modify selinux user mapping", name, sename, "", serange, "", oldsename, "", oldserange);
 +			raise error
 +		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify selinux user mapping", name, 0, sename, "", serange, oldsename, "", oldserange, "", 1);
++		mylog.log(1,"modify selinux user mapping", name, sename, "", serange, "", oldsename, "", oldserange);
  		semanage_seuser_key_free(k)
  		semanage_seuser_free(u)
  
@@ -237,17 +654,55 @@
 +				raise ValueError("Could not delete login mapping for %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user mapping", name, 0, name, "", "", "", "", "", "", "", "", 0);
++			mylog.log(0,"delete SELinux user mapping", name);
 +			raise error
 +		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user mapping", name, 0, name, "", "", "", "", "", "", "", "", 1);
++		mylog.log(1,"delete SELinux user mapping", name);
  		semanage_seuser_key_free(k)
  
  		
-@@ -322,127 +351,145 @@
- 		else:
- 			selevel = untranslate(selevel)
+@@ -298,150 +360,179 @@
+ 		return ddict
  
+ 	def list(self,heading=1):
+-		if heading:
+-			print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range")
+ 		ddict=self.get_all()
+ 		keys=ddict.keys()
+ 		keys.sort()
+-		for k in keys:
+-			print "%-25s %-25s %-25s" % (k, ddict[k][0], translate(ddict[k][1]))
++		if is_mls_enabled == 1:
++			if heading:
++				print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range")
++			for k in keys:
++				print "%-25s %-25s %-25s" % (k, ddict[k][0], translate(ddict[k][1]))
++		else:
++			if heading:
++				print "\n%-25s %-25s\n" % ("Login Name", "SELinux User")
++			for k in keys:
++				print "%-25s %-25s %-25s" % (k, ddict[k][0])
+ 
+ class seluserRecords(semanageRecords):
+ 	def __init__(self):
+ 		semanageRecords.__init__(self)
+ 
+ 	def add(self, name, roles, selevel, serange):
+-		if serange == "":
+-			serange = "s0"
+-		else:
+-			serange = untranslate(serange)
++		if is_mls_enabled == 1:
++			if serange == "":
++				serange = "s0"
++			else:
++				serange = untranslate(serange)
+ 			
+-		if selevel == "":
+-			selevel = "s0"
+-		else:
+-			selevel = untranslate(selevel)
+-
 -		(rc,k) = semanage_user_key_create(self.sh, name)
 -		if rc < 0:
 -			raise ValueError("Could not create a key for %s" % name)
@@ -257,87 +712,94 @@
 -			raise ValueError("Could not check if SELinux user %s is defined" % name)
 -		if exists:
 -			raise ValueError("SELinux user %s is already defined" % name)
+-
+-		(rc,u) = semanage_user_create(self.sh)
+-		if rc < 0:
+-			raise ValueError("Could not create SELinux user for %s" % name)
++			if selevel == "":
++				selevel = "s0"
++			else:
++				selevel = untranslate(selevel)
++			
 +		seroles=" ".join(roles)
 +		try:
 +			(rc,k) = semanage_user_key_create(self.sh, name)
 +			if rc < 0:
 +				raise ValueError("Could not create a key for %s" % name)
  
--		(rc,u) = semanage_user_create(self.sh)
+-		rc = semanage_user_set_name(self.sh, u, name)
 -		if rc < 0:
--			raise ValueError("Could not create SELinux user for %s" % name)
+-			raise ValueError("Could not set name for %s" % name)
 +			(rc,exists) = semanage_user_exists(self.sh, k)
 +			if rc < 0:
 +				raise ValueError("Could not check if SELinux user %s is defined" % name)
 +			if exists:
 +				raise ValueError("SELinux user %s is already defined" % name)
  
--		rc = semanage_user_set_name(self.sh, u, name)
--		if rc < 0:
--			raise ValueError("Could not set name for %s" % name)
-+			(rc,u) = semanage_user_create(self.sh)
-+			if rc < 0:
-+				raise ValueError("Could not create SELinux user for %s" % name)
- 
 -		for r in roles:
 -			rc = semanage_user_add_role(self.sh, u, r)
-+			rc = semanage_user_set_name(self.sh, u, name)
++			(rc,u) = semanage_user_create(self.sh)
  			if rc < 0:
 -				raise ValueError("Could not add role %s for %s" % (r, name))
-+				raise ValueError("Could not set name for %s" % name)
++				raise ValueError("Could not create SELinux user for %s" % name)
  
 -		rc = semanage_user_set_mlsrange(self.sh, u, serange)
 -		if rc < 0:
 -			raise ValueError("Could not set MLS range for %s" % name)
-+			for r in roles:
-+				rc = semanage_user_add_role(self.sh, u, r)
-+				if rc < 0:
-+					raise ValueError("Could not add role %s for %s" % (r, name))
++			rc = semanage_user_set_name(self.sh, u, name)
++			if rc < 0:
++				raise ValueError("Could not set name for %s" % name)
  
 -		rc = semanage_user_set_mlslevel(self.sh, u, selevel)
 -		if rc < 0:
 -			raise ValueError("Could not set MLS level for %s" % name)
-+			rc = semanage_user_set_mlsrange(self.sh, u, serange)
-+			if rc < 0:
-+				raise ValueError("Could not set MLS range for %s" % name)
++			for r in roles:
++				rc = semanage_user_add_role(self.sh, u, r)
++				if rc < 0:
++					raise ValueError("Could not add role %s for %s" % (r, name))
++
++			if is_mls_enabled == 1:
++				rc = semanage_user_set_mlsrange(self.sh, u, serange)
++				if rc < 0:
++					raise ValueError("Could not set MLS range for %s" % name)
++
++				rc = semanage_user_set_mlslevel(self.sh, u, selevel)
++				if rc < 0:
++					raise ValueError("Could not set MLS level for %s" % name)
  
 -		(rc,key) = semanage_user_key_extract(self.sh,u)
 -		if rc < 0:
 -			raise ValueError("Could not extract key for %s" % name)
-+			rc = semanage_user_set_mlslevel(self.sh, u, selevel)
++			(rc,key) = semanage_user_key_extract(self.sh,u)
 +			if rc < 0:
-+				raise ValueError("Could not set MLS level for %s" % name)
++				raise ValueError("Could not extract key for %s" % name)
  
 -		rc = semanage_begin_transaction(self.sh)
 -		if rc < 0:
 -			raise ValueError("Could not start semanage transaction")
-+			(rc,key) = semanage_user_key_extract(self.sh,u)
++			rc = semanage_begin_transaction(self.sh)
 +			if rc < 0:
-+				raise ValueError("Could not extract key for %s" % name)
++				raise ValueError("Could not start semanage transaction")
  
 -		rc = semanage_user_modify_local(self.sh, k, u)
 -		if rc < 0:
 -			raise ValueError("Could not add SELinux user %s" % name)
-+			rc = semanage_begin_transaction(self.sh)
++			rc = semanage_user_modify_local(self.sh, k, u)
 +			if rc < 0:
-+				raise ValueError("Could not start semanage transaction")
++				raise ValueError("Could not add SELinux user %s" % name)
  
 -		rc = semanage_commit(self.sh)
 -		if rc < 0:
 -			raise ValueError("Could not add SELinux user %s" % name)
-+			rc = semanage_user_modify_local(self.sh, k, u)
-+			if rc < 0:
-+				raise ValueError("Could not add SELinux user %s" % name)
-+
 +			rc = semanage_commit(self.sh)
 +			if rc < 0:
 +				raise ValueError("Could not add SELinux user %s" % name)
  
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user record", name, 0, name, seroles, serange, "", "", "", "", "", "", 0);
++			mylog.log(0,"add SELinux user record", name, name, seroles, serange)
 +			raise error
 +		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"add SELinux user record", name, 0, name, seroles, serange, "", "", "", "", "", "", 1);
++		mylog.log(1,"add SELinux user record", name, name, seroles, serange)
  		semanage_user_key_free(k)
  		semanage_user_free(u)
  
@@ -346,7 +808,10 @@
 -			raise ValueError("Requires roles, level or range")
 +		try:
 +			if len(roles) == 0  and serange == "" and selevel == "":
-+				raise ValueError("Requires roles, level or range")
++				if is_mls_enabled == 1:
++					raise ValueError("Requires roles, level or range")
++				else:
++					raise ValueError("Requires roles")
  
 -		(rc,k) = semanage_user_key_create(self.sh, name)
 -		if rc < 0:
@@ -413,10 +878,10 @@
 +				raise ValueError("Could not modify SELinux user %s" % name)
 +
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify SELinux user record", name, 0, seuser, seroles, serange, oldseuser, oldseroles, olrserange, "", 0);
++			mylog.log(0,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
 +			raise error
  		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"modify SELinux user record", name, 0, seuser, seroles, serange, oldseuser, oldseroles, olrserange, "", 1);
++		mylog.log(1,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange)
  		semanage_user_key_free(k)
  		semanage_user_free(u)
  
@@ -473,10 +938,101 @@
 +			if rc < 0:
 +				raise ValueError("Could not delete SELinux user %s" % name)
 +		except ValueError, error:
-+			audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user record", name, 0, "", "", "", "", "", "", "", "", "", 0);
++			mylog.log(0,"delete SELinux user record", name)
 +			raise error
  		
-+		audit.audit_log_semanage_message(audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],"delete SELinux user record", name, 0, "", "", "", "", "", "", "", "", "", 1);
++		mylog.log(1,"delete SELinux user record", name)
  		semanage_user_key_free(k)		
  
  	def get_all(self):
+@@ -462,14 +553,20 @@
+ 		return ddict
+ 
+ 	def list(self, heading=1):
+-		if heading:
+-			print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/")
+-			print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles")
+ 		ddict=self.get_all()
+ 		keys=ddict.keys()
+ 		keys.sort()
+-		for k in keys:
+-			print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2])
++		if is_mls_enabled == 1:
++			if heading:
++				print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/")
++				print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles")
++			for k in keys:
++				print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2])
++		else:
++			if heading:
++				print "%-15s %s\n" % ("SELinux User", "SELinux Roles")
++			for k in keys:
++				print "%-15s %s" % (k, ddict[k][2])
+ 
+ class portRecords(semanageRecords):
+ 	def __init__(self):
+@@ -500,10 +597,11 @@
+ 		return ( k, proto_d, low, high )
+ 
+ 	def add(self, port, proto, serange, type):
+-		if serange == "":
+-			serange="s0"
+-		else:
+-			serange=untranslate(serange)
++		if is_mls_enabled == 1:
++			if serange == "":
++				serange="s0"
++			else:
++				serange=untranslate(serange)
+ 			
+ 		if type == "":
+ 			raise ValueError("Type is required")
+@@ -564,7 +662,10 @@
+ 
+ 	def modify(self, port, proto, serange, setype):
+ 		if serange == "" and setype == "":
+-			raise ValueError("Requires setype or serange")
++			if is_mls_enabled == 1:
++				raise ValueError("Requires setype or serange")
++			else:
++				raise ValueError("Requires setype")
+ 
+ 		( k, proto_d, low, high ) = self.__genkey(port, proto)
+ 
+@@ -688,10 +789,11 @@
+ 		semanageRecords.__init__(self)
+ 
+ 	def add(self, interface, serange, ctype):
+-		if serange == "":
+-			serange="s0"
+-		else:
+-			serange=untranslate(serange)
++		if is_mls_enabled == 1:
++			if serange == "":
++				serange="s0"
++			else:
++				serange=untranslate(serange)
+ 			
+ 		if ctype == "":
+ 			raise ValueError("SELinux Type is required")
+@@ -869,14 +971,14 @@
+ 		self.file_types["named pipe"] = SEMANAGE_FCONTEXT_PIPE;
+ 		
+ 		
+-	def add(self, target, type, ftype="", serange="s0", seuser="system_u"):
++	def add(self, target, type, ftype="", serange="", seuser="system_u"):
+ 		if seuser == "":
+ 			seuser="system_u"
+-			
+-		if serange == "":
+-			serange="s0"
+-		else:
+-			serange=untranslate(serange)
++		if is_mls_enabled == 1:
++			if serange == "":
++				serange="s0"
++			else:
++				serange=untranslate(serange)
+ 			
+ 		if type == "":
+ 			raise ValueError("SELinux Type is required")


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- policycoreutils.spec	13 Feb 2006 19:54:09 -0000	1.236
+++ policycoreutils.spec	21 Feb 2006 19:09:17 -0000	1.237
@@ -1,10 +1,10 @@
 %define libauditver 1.1.4-3
-%define libsepolver 1.11.14-1
-%define libsemanagever 1.5.23-1
+%define libsepolver 1.11.18-1
+%define libsemanagever 1.5.28-1
 %define libselinuxver 1.29.7-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.23
+Version: 1.29.26
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -98,6 +98,13 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-1
+- Update from upstream
+	* Merged semanage bug fix patch from Ivan Gyurdiev.
+	* Merged improve bindings patch from Ivan Gyurdiev.
+	* Merged semanage usage patch from Ivan Gyurdiev.
+	* Merged use PyList patch from Ivan Gyurdiev.
+
 * Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.23-1
 - Update from upstream
 	* Merged newrole -V/--version support from Glauber de Oliveira Costa.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	13 Feb 2006 19:54:09 -0000	1.106
+++ sources	21 Feb 2006 19:09:17 -0000	1.107
@@ -1 +1 @@
-b57167cc3ee8d8d49cbb848ebe5628d5  policycoreutils-1.29.23.tgz
+58fe44013f3515957fc626d0c11baf7c  policycoreutils-1.29.26.tgz



From fedora-cvs-commits at redhat.com  Tue Feb 21 19:16:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 14:16:56 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.14,
	1.15 selinux-policy.spec, 1.114, 1.115
Message-ID: <200602211916.k1LJGuDO012680@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10997

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 policy/modules/admin/su.if              |   19 ++----
 policy/modules/admin/vpn.te             |    4 +
 policy/modules/apps/java.if             |    8 --
 policy/modules/apps/slocate.te          |    2 
 policy/modules/kernel/devices.if        |   39 ++++++++++++++
 policy/modules/services/apache.if       |   55 ++++++++++++++++++++
 policy/modules/services/cron.te         |    7 ++
 policy/modules/services/cups.if         |   19 ++++++
 policy/modules/services/spamassassin.te |    1 
 policy/modules/services/ssh.if          |    2 
 policy/modules/system/authlogin.te      |    2 
 policy/modules/system/mount.te          |    2 
 policy/modules/system/selinuxutil.fc    |    7 ++
 policy/modules/system/selinuxutil.if    |   87 ++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te    |   72 ++++++++++++++++++++++++--
 policy/modules/system/userdomain.if     |   24 ++++++++
 policy/modules/system/userdomain.te     |    2 
 support/Makefile.devel                  |   12 +++-
 18 files changed, 340 insertions(+), 24 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- policy-20060207.patch	21 Feb 2006 15:36:14 -0000	1.14
+++ policy-20060207.patch	21 Feb 2006 19:16:52 -0000	1.15
@@ -48,6 +48,25 @@
  ')
  
  optional_policy(`mount',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.18/policy/modules/apps/java.if
+--- nsaserefpolicy/policy/modules/apps/java.if	2006-02-20 14:07:36.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/apps/java.if	2006-02-21 10:42:08.000000000 -0500
+@@ -149,13 +149,9 @@
+ 	userdom_manage_user_home_sockets($1,$1_javaplugin_t)
+ 	userdom_filetrans_user_home($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
+ 
+-	# libdeploy.so legacy
+-	tunable_policy(`allow_execmem',`
+-		allow $1_javaplugin_t self:process execmem;
+-	')
+-	
++	allow $1_javaplugin_t self:process execmem;
+ 	tunable_policy(`allow_java_execstack',`
+-		allow $1_javaplugin_t self:process { execmem execstack };
++		allow $1_javaplugin_t self:process execstack;
+ 
+ 		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.18/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
 +++ serefpolicy-2.2.18/policy/modules/apps/slocate.te	2006-02-21 09:36:37.000000000 -0500
@@ -109,10 +128,82 @@
  ##	Read input event devices (/dev/input).
  ## </summary>
  ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.18/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 09:18:48.000000000 -0500
++++ serefpolicy-2.2.18/policy/modules/services/apache.if	2006-02-21 10:44:07.000000000 -0500
+@@ -798,3 +798,58 @@
+ 
+ 	allow $1 httpd_sys_script_t:dir search;
+ ')
++
++
++########################################
++## <summary>
++##	Read apache config files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`apache_read_config',`
++	gen_require(`
++		type httpd_config_t;
++	')
++
++	allow $1 httpd_config_t:file { getattr read };
++')
++
++########################################
++## <summary>
++##	Read apache log files
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`apache_read_log',`
++	gen_require(`
++		type httpd_log_t;
++	')
++
++	allow $1 httpd_log_t:file { getattr read };
++')
++
++########################################
++## <summary>
++##	Read apache system content
++## </summary>
++## <param name="domain">
++##	<summary>
++##	Domain to not audit.
++##	</summary>
++## </param>
++#
++interface(`apache_read_sys_content',`
++	gen_require(`
++		type httpd_sys_content_t;
++	')
++	allow $1 httpd_sys_content_t:dir r_dir_perms;
++	allow $1 httpd_sys_content_t:file { getattr read };
++')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.18/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 09:18:48.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/cron.te	2006-02-21 09:36:37.000000000 -0500
-@@ -398,6 +398,10 @@
++++ serefpolicy-2.2.18/policy/modules/services/cron.te	2006-02-21 10:44:26.000000000 -0500
+@@ -360,6 +360,9 @@
+ 	optional_policy(`apache',`
+ 		# Needed	 for certwatch
+ 		apache_exec_modules(system_crond_t)
++		apache_read_config(system_crond_t)
++		apache_read_log(system_crond_t)
++		apache_read_sys_content(system_crond_t)
+ 	')
+ 
+ 	optional_policy(`cyrus',`
+@@ -398,6 +401,10 @@
  		prelink_delete_cache(system_crond_t)
  	')
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- selinux-policy.spec	21 Feb 2006 15:36:15 -0000	1.114
+++ selinux-policy.spec	21 Feb 2006 19:16:52 -0000	1.115
@@ -4,8 +4,8 @@
 %define BUILD_TARGETED 0
 %define BUILD_MLS 1
 %define POLICYVER 20
-%define POLICYCOREUTILSVER 1.29.18-1
-%define CHECKPOLICYVER 1.28-3
+%define POLICYCOREUTILSVER 1.29.26-1
+%define CHECKPOLICYVER 1.29.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.18
@@ -289,6 +289,9 @@
 
 %changelog
 
+* Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.18-2
+- allow cron to read apache files
+
 * Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.18-1
 - Fix vpnc policy to work from NetworkManager
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 19:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 14:17:29 -0500
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.115,1.116
Message-ID: <200602211917.k1LJHTB6013024@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12988

Modified Files:
	selinux-policy.spec 
Log Message:



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- selinux-policy.spec	21 Feb 2006 19:16:52 -0000	1.115
+++ selinux-policy.spec	21 Feb 2006 19:17:26 -0000	1.116
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.18
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz



From fedora-cvs-commits at redhat.com  Tue Feb 21 19:32:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 14:32:01 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.108, 1.109 kudzu.spec, 1.123,
	1.124 sources, 1.122, 1.123
Message-ID: <200602211932.k1LJW1ld018504@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18468

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- .cvsignore	15 Feb 2006 21:51:24 -0000	1.108
+++ .cvsignore	21 Feb 2006 19:31:27 -0000	1.109
@@ -1 +1 @@
-kudzu-1.2.30.tar.gz
+kudzu-1.2.31.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- kudzu.spec	15 Feb 2006 21:51:25 -0000	1.123
+++ kudzu.spec	21 Feb 2006 19:31:27 -0000	1.124
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.30
+Version: 1.2.31
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Feb 21 2006 Bill Nottingham <notting at redhat.com> - 1.2.31-1
+- further x86emu-related fixes (#181467)
+
 * Wed Feb 15 2006 Bill Nottingham <notting at redhat.com> - 1.2.30-1
 - revert changes for video probing classes - some correct devices are
   0380


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- sources	15 Feb 2006 21:51:25 -0000	1.122
+++ sources	21 Feb 2006 19:31:27 -0000	1.123
@@ -1 +1 @@
-b27c980a664a0cb85ad725bc7408994e  kudzu-1.2.30.tar.gz
+2703e03258a6b4b8ba7a5eeaca366487  kudzu-1.2.31.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 20:06:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:06:34 -0500
Subject: rpms/beagle/devel beagle-0.2.1-crawl.patch, NONE, 1.1 .cvsignore,
	1.6, 1.7 beagle.spec, 1.30, 1.31 sources, 1.6, 1.7
Message-ID: <200602212006.k1LK6YIu002937@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2920

Modified Files:
	.cvsignore beagle.spec sources 
Added Files:
	beagle-0.2.1-crawl.patch 
Log Message:
fix a number of things


beagle-0.2.1-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    4 ++--
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE beagle-0.2.1-crawl.patch ---
--- beagle-0.2.1/tools/Makefile.in.crawl	2006-02-21 14:47:41.000000000 -0500
+++ beagle-0.2.1/tools/Makefile.in	2006-02-21 14:47:50.000000000 -0500
@@ -364,7 +364,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.1/tools/Makefile.am.crawl	2006-02-21 14:47:17.000000000 -0500
+++ beagle-0.2.1/tools/Makefile.am	2006-02-21 14:47:33.000000000 -0500
@@ -36,7 +36,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.1/tools/crawl-rules/crawl-applications.crawl	2006-02-21 14:43:39.000000000 -0500
+++ beagle-0.2.1/tools/crawl-rules/crawl-applications	2006-02-21 14:43:56.000000000 -0500
@@ -2,10 +2,10 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/shared/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications
 
 CRAWL_RECURSIVE="yes"
 
 CRAWL_DISABLE_FILTERING="no"
 
-CRAWL_CACHE_TEXT="no"
\ No newline at end of file
+CRAWL_CACHE_TEXT="no"
--- beagle-0.2.1/tools/crawl-rules/crawl-documentation.crawl	2006-02-21 14:44:06.000000000 -0500
+++ beagle-0.2.1/tools/crawl-rules/crawl-documentation	2006-02-21 14:45:17.000000000 -0500
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help"
+CRAWL_PATHS="/usr/share/doc /usr/share/gnome/help /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Jan 2006 20:37:14 -0000	1.6
+++ .cvsignore	21 Feb 2006 20:06:06 -0000	1.7
@@ -1,2 +1,4 @@
 beagle-0.2.0.tar.bz2
 beagle-0.2.1.tar.bz2
+beagle.desktop
+beagle-crawl-system.cron


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- beagle.spec	17 Feb 2006 18:48:35 -0000	1.30
+++ beagle.spec	21 Feb 2006 20:06:07 -0000	1.31
@@ -1,12 +1,14 @@
 Name:           beagle
 Version:        0.2.1
-Release:        7
+Release:        8
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://beagle-project.org/
 Source0:        %{name}-%{version}.tar.bz2
+Source1:	beagle.desktop
+Source2:	beagle-crawl-system.cron
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-data mono-data-sqlite
@@ -21,11 +23,12 @@
 BuildRequires:  gtk2-devel >= 2.6.0
 BuildRequires:  librsvg2-devel >= 2.0
 Requires: sqlite >= 3.3.1
-Requires: zip mono-core poppler-utils
+Requires: zip unzip sed grep mono-core poppler-utils
 Patch0: beagle-0.2.0-security-fix.patch
 Patch1: beagle-0.2.1-sqlite3.patch
+Patch2: beagle-0.2.1-crawl.patch
 
-# Mono only availible on these:
+# Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
 
 %description
@@ -59,13 +62,14 @@
 %setup -q
 %patch0 -p1 -b .security-fix
 %patch1 -p1 -b .sqlite3
+%patch2 -p1 -b .crawl
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make %{?_smp_mflags}
 
-# Generate the beagle.xpi for mozilla/firefix
+# Generate the beagle.xpi for mozilla/firefox
 pushd .
 cd mozilla-extension
 make
@@ -75,13 +79,21 @@
 rm -rf $RPM_BUILD_ROOT
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 
-# Fix up evolution directory LD_LIBRARY_PATH
-sed -i s,/opt/gnome/lib/evolution/2.0,%{_libdir}/evolution/2.4,g beagled/beagled
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/var/cache/beagle/indexes
 
+# Add an autostart file so beagled gets run by default
+mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart
+cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart
+
+# use anacron instead of cron, so beagle-crawl-system has 
+# a reasonable chance to run
+rm -rf $RPM_BUILD_ROOT/etc/cron.d
+mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
+cp %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
+chmod +x $RPM_BUILD_ROOT/etc/cron.daily/beagle-crawl-system.cron
+
 # TODO: Isn't there a better place to install this?
 install -m 644 mozilla-extension/beagle.xpi $RPM_BUILD_ROOT%{_libdir}/beagle/
 
@@ -125,14 +137,43 @@
 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || :
 /usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
 
+%post 
+if rpm -q firefox; then
+# install the firefox extension
+# note that this code is duplicated below in a trigger
+  latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
+  cd /usr/lib/firefox-$latest/extensions
+  mkdir beagle-extension
+  unzip -q -d beagle-extension /usr/lib/beagle/beagle.xpi
+  id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+  if [ -e "$id" ]; then
+    rm -rf beagle-extension
+  else
+    mv beagle-extension "$id"
+  fi
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- firefox
+# install the firefox extension
+latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
+cd /usr/lib/firefox-$latest/extensions
+mkdir beagle-extension
+unzip -q -d beagle-extension /usr/lib/beagle/beagle.xpi
+id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+if [ -e "$id" ]; then
+  rm -rf beagle-extension
+else
+  mv beagle-extension "$id"
+fi
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_sysconfdir}/cron.d/*
+%{_sysconfdir}/cron.daily/*
 %{_sysconfdir}/beagle
 %{_bindir}/*
 %{_sbindir}/*
@@ -145,6 +186,7 @@
 %{_mandir}/*/*
 %dir %attr(-,beagleindex,beagleindex) /var/cache/beagle
 %dir %attr(-,beagleindex,beagleindex) /var/cache/beagle/indexes
+%{_sysconfdir}/xdg/autostart/beagle.desktop
 
 %files -n libbeagle
 %defattr(-, root, root)
@@ -160,6 +202,14 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-8
+- Autostart beagled by default
+- Use anacron
+- Install the firefox extension
+- Add a trigger to reinstall the firefox extension 
+  on firefox updates
+- Adapt crawl-rules to Fedora
+
 * Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 0.2.1-7
 - add BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Jan 2006 20:37:14 -0000	1.6
+++ sources	21 Feb 2006 20:06:07 -0000	1.7
@@ -1 +1,3 @@
 325ed91dc66fb6be060d0a5f4c8f56dd  beagle-0.2.1.tar.bz2
+6f0f121a9269662071eb5c260b54f86f  beagle.desktop
+777250265dc910964f5acd9da29cc64c  beagle-crawl-system.cron



From fedora-cvs-commits at redhat.com  Tue Feb 21 20:37:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:37:20 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.15,
	1.16 selinux-policy.spec, 1.116, 1.117
Message-ID: <200602212037.k1LKbK7T015898@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15884

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 policy/modules/admin/logwatch.te     |    2 
 policy/modules/admin/su.if           |   19 +++----
 policy/modules/admin/vpn.te          |    4 +
 policy/modules/apps/java.if          |    8 ---
 policy/modules/apps/slocate.te       |    2 
 policy/modules/kernel/devices.if     |   39 +++++++++++++++
 policy/modules/services/apache.if    |   55 ++++++++++++++++++++++
 policy/modules/services/cron.te      |    7 ++
 policy/modules/services/cups.if      |   19 +++++++
 policy/modules/services/ssh.if       |    2 
 policy/modules/system/authlogin.te   |    2 
 policy/modules/system/mount.te       |    2 
 policy/modules/system/selinuxutil.fc |    7 ++
 policy/modules/system/selinuxutil.if |   87 +++++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te |   76 ++++++++++++++++++++++++++----
 policy/modules/system/userdomain.if  |   24 +++++++++
 policy/modules/system/userdomain.te  |    4 +
 support/Makefile.devel               |   12 ++++
 18 files changed, 342 insertions(+), 29 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- policy-20060207.patch	21 Feb 2006 19:16:52 -0000	1.15
+++ policy-20060207.patch	21 Feb 2006 20:37:13 -0000	1.16
@@ -1,6 +1,18 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.18/policy/modules/admin/su.if
---- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 09:18:47.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/admin/su.if	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.19/policy/modules/admin/logwatch.te
+--- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/logwatch.te	2006-02-21 15:02:45.000000000 -0500
+@@ -71,6 +71,8 @@
+ 
+ selinux_dontaudit_getattr_dir(logwatch_t)
+ 
++sysnet_dns_name_resolve(logwatch_t)
++
+ userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
+ userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.19/policy/modules/admin/su.if
+--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 14:40:22.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/su.if	2006-02-21 14:42:09.000000000 -0500
 @@ -220,6 +220,14 @@
  		nscd_socket_use($1_su_t)
  	')
@@ -34,9 +46,9 @@
  	ifdef(`ssh.te', `
  	# Access sshd cookie files.
  	allow $1_su_t sshd_tmp_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.18/policy/modules/admin/vpn.te
---- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 09:18:47.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/admin/vpn.te	2006-02-21 09:37:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.19/policy/modules/admin/vpn.te
+--- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/vpn.te	2006-02-21 14:42:09.000000000 -0500
 @@ -106,6 +106,10 @@
  
  optional_policy(`dbus',`
@@ -48,12 +60,12 @@
  ')
  
  optional_policy(`mount',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.18/policy/modules/apps/java.if
---- nsaserefpolicy/policy/modules/apps/java.if	2006-02-20 14:07:36.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/apps/java.if	2006-02-21 10:42:08.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.19/policy/modules/apps/java.if
+--- nsaserefpolicy/policy/modules/apps/java.if	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/apps/java.if	2006-02-21 14:42:09.000000000 -0500
 @@ -149,13 +149,9 @@
- 	userdom_manage_user_home_sockets($1,$1_javaplugin_t)
- 	userdom_filetrans_user_home($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
+ 	userdom_manage_user_home_content_sockets($1,$1_javaplugin_t)
+ 	userdom_user_home_dir_filetrans_user_home_content($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
  
 -	# libdeploy.so legacy
 -	tunable_policy(`allow_execmem',`
@@ -67,9 +79,9 @@
  
  		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.18/policy/modules/apps/slocate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.19/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/apps/slocate.te	2006-02-21 09:36:37.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/apps/slocate.te	2006-02-21 14:42:09.000000000 -0500
 @@ -36,6 +36,8 @@
  
  files_list_all(locate_t)
@@ -79,9 +91,9 @@
  files_read_etc_runtime_files(locate_t)
  files_read_etc_files(locate_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.18/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-20 14:07:36.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/kernel/devices.if	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.19/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/kernel/devices.if	2006-02-21 14:42:09.000000000 -0500
 @@ -1115,6 +1115,45 @@
  
  ########################################
@@ -128,9 +140,9 @@
  ##	Read input event devices (/dev/input).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.18/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 09:18:48.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/apache.if	2006-02-21 10:44:07.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.19/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-21 14:42:09.000000000 -0500
 @@ -798,3 +798,58 @@
  
  	allow $1 httpd_sys_script_t:dir search;
@@ -190,9 +202,9 @@
 +	allow $1 httpd_sys_content_t:dir r_dir_perms;
 +	allow $1 httpd_sys_content_t:file { getattr read };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.18/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 09:18:48.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/cron.te	2006-02-21 10:44:26.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.19/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/cron.te	2006-02-21 14:42:09.000000000 -0500
 @@ -360,6 +360,9 @@
  	optional_policy(`apache',`
  		# Needed	 for certwatch
@@ -214,9 +226,9 @@
  	optional_policy(`samba',`
  		samba_read_config(system_crond_t)
  		samba_read_log(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.18/policy/modules/services/cups.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.19/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/cups.if	2006-02-21 09:36:37.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/cups.if	2006-02-21 14:42:09.000000000 -0500
 @@ -169,6 +169,25 @@
  
  ########################################
@@ -243,20 +255,9 @@
  ##	Connect to ptal over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.2.18/policy/modules/services/spamassassin.te
---- nsaserefpolicy/policy/modules/services/spamassassin.te	2006-02-21 09:18:49.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/spamassassin.te	2006-02-21 10:30:41.000000000 -0500
-@@ -124,6 +124,7 @@
- 	term_dontaudit_use_generic_ptys(spamd_t)
- 	files_dontaudit_read_root_files(spamd_t)
- 	tunable_policy(`spamd_enable_home_dirs',`
-+		userdom_search_generic_user_home_dir(spamd_t)
- 		userdom_manage_generic_user_home_dirs(spamd_t)
- 		userdom_manage_generic_user_home_files(spamd_t)
- 		userdom_manage_generic_user_home_symlinks(spamd_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.18/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 09:18:49.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/services/ssh.if	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.19/policy/modules/services/ssh.if
+--- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/ssh.if	2006-02-21 14:42:09.000000000 -0500
 @@ -279,6 +279,8 @@
  
  	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
@@ -266,9 +267,9 @@
  	allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
  
  	# for ssh-add
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.18/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 09:18:49.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/authlogin.te	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.19/policy/modules/system/authlogin.te
+--- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/authlogin.te	2006-02-21 14:42:09.000000000 -0500
 @@ -153,6 +153,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
@@ -278,9 +279,9 @@
  dev_getattr_framebuffer_dev(pam_console_t)
  dev_setattr_framebuffer_dev(pam_console_t)
  dev_getattr_misc_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.18/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 09:18:50.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/mount.te	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.19/policy/modules/system/mount.te
+--- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/mount.te	2006-02-21 14:42:09.000000000 -0500
 @@ -137,6 +137,8 @@
  	samba_domtrans_smbmount(mount_t)
  ')
@@ -290,9 +291,9 @@
  ifdef(`TODO',`
  # TODO: Need to examine this further. Not sure how to handle this
  #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.18/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.fc	2006-02-21 09:36:37.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc	2006-02-21 14:42:09.000000000 -0500
 @@ -39,3 +39,10 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
@@ -305,10 +306,10 @@
 +/etc/selinux([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
 +/etc/selinux([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
 \ No newline at end of file
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.18/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 09:18:50.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.if	2006-02-21 09:36:37.000000000 -0500
-@@ -705,3 +705,90 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.19/policy/modules/system/selinuxutil.if
+--- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.if	2006-02-21 14:42:09.000000000 -0500
+@@ -778,3 +778,90 @@
  	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
  ')
@@ -399,9 +400,9 @@
 +	allow $1 semodule_trans_lock_t:file rw_file_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.18/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 09:18:50.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/selinuxutil.te	2006-02-21 09:45:42.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.19/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-21 14:49:25.000000000 -0500
 @@ -103,6 +103,27 @@
  
  ########################################
@@ -430,16 +431,27 @@
  # Checkpolicy local policy
  #
  
-@@ -526,12 +547,53 @@
+@@ -303,10 +324,6 @@
+ 	nscd_socket_use(newrole_t)
+ ')
+ 
+-ifdef(`TODO',`
+-ifdef(`gnome-pty-helper.te', `allow newrole_t gphdomain:fd use;')
+-') dnl ifdef TODO
+-
+ ########################################
+ #
+ # Restorecon local policy
+@@ -525,12 +542,53 @@
  
  miscfiles_read_localization(setfiles_t)
  
 +seutil_module_get_trans_lock(setfiles_t)
 +seutil_module_get_read_lock(setfiles_t)
-+
++ 
  userdom_use_all_users_fds(setfiles_t)
  # for config files in a home directory
- userdom_read_all_users_home_files(setfiles_t)
+ userdom_read_all_users_home_content_files(setfiles_t)
  
 -ifdef(`TODO',`
 -# for upgrading glibc and other shared objects - without this the upgrade
@@ -489,9 +501,9 @@
 +	selinux_get_enforce_mode(semodule_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.18/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 09:18:50.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/userdomain.if	2006-02-21 09:36:37.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.19/policy/modules/system/userdomain.if
+--- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/userdomain.if	2006-02-21 14:42:09.000000000 -0500
 @@ -145,6 +145,7 @@
  	allow $1_t unpriv_userdomain:fd use;
  
@@ -511,7 +523,7 @@
  	optional_policy(`samba',`
 @@ -4425,3 +4428,24 @@
  	allow $1 user_home_dir_t:dir create_dir_perms;
- 	files_filetrans_home($1,user_home_dir_t)
+ 	files_home_filetrans($1,user_home_dir_t)
  ')
 +
 +
@@ -534,10 +546,19 @@
 +	allow $1 user_home_type:dir mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.18/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-16 14:46:56.000000000 -0500
-+++ serefpolicy-2.2.18/policy/modules/system/userdomain.te	2006-02-21 09:36:37.000000000 -0500
-@@ -358,6 +358,8 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.19/policy/modules/system/userdomain.te
+--- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/userdomain.te	2006-02-21 14:54:57.000000000 -0500
+@@ -75,7 +75,7 @@
+ 	files_associate_tmp(user_home_t)
+ 	fs_associate_tmpfs(user_home_t)
+ 
+-	type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, home_dir_type, home_type;
++	type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, user_home_dir_type, home_dir_type, home_type;
+ 	files_type(user_home_dir_t)
+ 	files_associate_tmp(user_home_dir_t)
+ 	fs_associate_tmpfs(user_home_dir_t)
+@@ -364,6 +364,8 @@
  			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
  			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
@@ -546,9 +567,9 @@
  			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
  		', `
  			selinux_set_enforce_mode(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.18/support/Makefile.devel
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.19/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-16 16:42:39.000000000 -0500
-+++ serefpolicy-2.2.18/support/Makefile.devel	2006-02-21 09:36:37.000000000 -0500
++++ serefpolicy-2.2.19/support/Makefile.devel	2006-02-21 14:42:09.000000000 -0500
 @@ -1,3 +1,6 @@
 +# installation paths
 +SHAREDIR := $(PREFIX)/share/selinux


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- selinux-policy.spec	21 Feb 2006 19:17:26 -0000	1.116
+++ selinux-policy.spec	21 Feb 2006 20:37:13 -0000	1.117
@@ -8,8 +8,8 @@
 %define CHECKPOLICYVER 1.29.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.18
-Release: 2
+Version: 2.2.19
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -289,6 +289,9 @@
 
 %changelog
 
+* Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-1
+- Update from upstream
+
 * Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.18-2
 - allow cron to read apache files
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 20:39:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:39:56 -0500
Subject: rpms/selinux-policy/devel .cvsignore,1.42,1.43 sources,1.46,1.47
Message-ID: <200602212039.k1LKdurS016042@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16027

Modified Files:
	.cvsignore sources 
Log Message:








From fedora-cvs-commits at redhat.com  Tue Feb 21 20:47:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:47:24 -0500
Subject: rpms/kernel/devel linux-2.6-x86_64-smp-on-uphw-cpucount.patch, NONE,
	1.1 patch-2.6.16-rc4-git2.bz2.sign, NONE, 1.1 .cvsignore,
	1.357, 1.358 kernel-2.6.spec, 1.1973,
	1.1974 linux-2.6-radeon-backlight.patch, 1.10, 1.11 sources,
	1.299, 1.300 upstream, 1.274,
	1.275 linux-2.6-audit-allocation-in-atomic.patch, 1.1,
	NONE linux-2.6-procfs-i_nlink-miscalculate.patch, 1.1,
	NONE linux-2.6-vm-oomkiller-debugging.patch, 1.2, NONE
Message-ID: <200602212047.k1LKlOhg028794@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28782

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-radeon-backlight.patch 
	sources upstream 
Added Files:
	linux-2.6-x86_64-smp-on-uphw-cpucount.patch 
	patch-2.6.16-rc4-git2.bz2.sign 
Removed Files:
	linux-2.6-audit-allocation-in-atomic.patch 
	linux-2.6-procfs-i_nlink-miscalculate.patch 
	linux-2.6-vm-oomkiller-debugging.patch 
Log Message:
rc4-git2


linux-2.6-x86_64-smp-on-uphw-cpucount.patch:
 smpboot.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE linux-2.6-x86_64-smp-on-uphw-cpucount.patch ---

--- linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c~	2006-02-20 21:59:56.000000000 -0500
+++ linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c	2006-02-20 22:01:57.000000000 -0500
@@ -975,6 +975,9 @@ __init void prefill_possible_map(void)
 	if (possible > NR_CPUS) 
 		possible = NR_CPUS;
 
+	if (possible == 0)	/* Could be SMP kernel on UP hw with broken BIOS */
+		possible = 1;
+
 	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",
 		possible,
 	        max_t(int, possible - num_processors, 0));


--- NEW FILE patch-2.6.16-rc4-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD+2QjyGugalF9Dw4RAmSxAJ4rZugKqwNCMDgfPZZMMkRsmytzHgCfdFfW
vlEUnvOWIhnhmCwyHKELnvc=
=I5A+
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- .cvsignore	17 Feb 2006 23:06:18 -0000	1.357
+++ .cvsignore	21 Feb 2006 20:47:20 -0000	1.358
@@ -4,3 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
+patch-2.6.16-rc4-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1973
retrieving revision 1.1974
diff -u -r1.1973 -r1.1974
--- kernel-2.6.spec	21 Feb 2006 16:23:38 -0000	1.1973
+++ kernel-2.6.spec	21 Feb 2006 20:47:21 -0000	1.1974
@@ -218,6 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
+Patch2: patch-2.6.16-rc4-git2.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -231,6 +232,7 @@
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch
+Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 
 # 300 - 399   ppc(64)
 Patch301: linux-2.6.15-cell-numa-init.patch
@@ -349,7 +351,6 @@
 Patch1505: linux-2.6-dump_smp_call_function.patch
 
 # Misc bits.
-Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch
 Patch1610: linux-2.6-atkbd-dell-multimedia.patch
 Patch1630: linux-2.6-module_version.patch
 Patch1650: linux-2.6-input-kill-stupid-messages.patch
@@ -374,7 +375,6 @@
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-audit-allocation-in-atomic.patch
 Patch1890: linux-2.6-sched-up-migration-cost.patch
 
 # Warn about usage of various obsolete functionality that may go away.
@@ -385,7 +385,6 @@
 Patch1910: linux-2.6-unexport-symbols.patch
 
 # VM bits.
-Patch2000: linux-2.6-vm-oomkiller-debugging.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
@@ -694,6 +693,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -729,6 +729,8 @@
 %patch205 -p1
 # Microcode driver hotplug cpu issue.
 %patch206 -p1
+# Workaround BIOSes that don't list CPU0
+%patch207 -p1
 
 # 
 # ppc64
@@ -903,8 +905,6 @@
 #
 
 # Misc fixes
-# Fix incorrect n_link in proc
-%patch1600 -p1
 # Make multimedia buttons on Dell Inspiron 8200 work.
 %patch1610 -p1
 # Add missing MODULE_VERSION tags to some modules.
@@ -953,8 +953,6 @@
 %patch1840 -p1
 # Fix compilation for MV643xx Ethernet
 %patch1850 -p1
-# GFP_KERNEL allocations in atomic (auditsc)
-%patch1860 -p1
 # Only print migration info on SMP
 %patch1890 -p1
 
@@ -967,8 +965,6 @@
 #
 # VM related fixes.
 #
-# Extra debugging on OOM Kill.
-%patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
 # VM oom killer tweaks.
@@ -1586,6 +1582,11 @@
 %endif
 
 %changelog
+* Tue Feb 21 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git2
+- Make some more UP x86-64s able to boot an SMP kernel
+  by forcing the number of CPUs to at least 1.
+
 * Tue Feb 21 2006 Rik van Riel <riel at redhat.com>
 - Make it possible to disable xen and kdump builds.
 - Add Xen cpu steal accounting code.

linux-2.6-radeon-backlight.patch:
 radeon_base.c |   11 +
 radeon_pm.c   |  557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 567 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-radeon-backlight.patch	17 Jan 2006 00:58:30 -0000	1.10
+++ linux-2.6-radeon-backlight.patch	21 Feb 2006 20:47:21 -0000	1.11
@@ -560,10 +560,10 @@
  
  	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
  				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in
- #endif
+@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in
  	}
- #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */
+ #endif /* defined(CONFIG_PPC_PMAC) */
+ #endif /* defined(CONFIG_PM) */
 +
 +/* The PM code also works on some PC laptops.
 + * Only a few models are actually tested so Your mileage may vary.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- sources	17 Feb 2006 23:06:18 -0000	1.299
+++ sources	21 Feb 2006 20:47:21 -0000	1.300
@@ -1,3 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
+53f745fae63332afa9528a17e110ed23  patch-2.6.16-rc4-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- upstream	17 Feb 2006 23:06:18 -0000	1.274
+++ upstream	21 Feb 2006 20:47:21 -0000	1.275
@@ -1,2 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
+patch-2.6.16-rc4-git2.bz2


--- linux-2.6-audit-allocation-in-atomic.patch DELETED ---


--- linux-2.6-procfs-i_nlink-miscalculate.patch DELETED ---


--- linux-2.6-vm-oomkiller-debugging.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 21 20:53:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:53:02 -0500
Subject: rpms/kernel/devel linux-2.6-defaults-fat-utf8.patch, NONE,
	1.1 kernel-2.6.spec, 1.1974, 1.1975
Message-ID: <200602212053.k1LKr2Wx028896@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28862

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-defaults-fat-utf8.patch 
Log Message:
Make UTF8 the default for fat filesystems.



linux-2.6-defaults-fat-utf8.patch:
 inode.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-fat-utf8.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963

--- linux-2.6.15.noarch/fs/fat/inode.c~	2006-02-20 23:20:12.000000000 -0500
+++ linux-2.6.15.noarch/fs/fat/inode.c	2006-02-20 23:21:42.000000000 -0500
@@ -952,7 +952,8 @@ static int parse_options(char *options, 
 		opts->shortname = 0;
 	opts->name_check = 'n';
 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
-	opts->utf8 = opts->unicode_xlate = 0;
+	opts->utf8 = 1;
+	opts->unicode_xlate = 0;
 	opts->numtail = 1;
 	opts->nocase = 0;
 	*debug = 0;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1974
retrieving revision 1.1975
diff -u -r1.1974 -r1.1975
--- kernel-2.6.spec	21 Feb 2006 20:47:21 -0000	1.1974
+++ kernel-2.6.spec	21 Feb 2006 20:53:00 -0000	1.1975
@@ -388,6 +388,9 @@
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
+# Changes to upstream defaults.
+Patch2100: linux-2.6-defaults-fat-utf8.patch
+
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
@@ -970,6 +973,9 @@
 # VM oom killer tweaks.
 %patch2002 -p1
 
+# Changes to upstream defaults.
+%patch2100 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1586,6 +1592,7 @@
 - 2.6.16rc4-git2
 - Make some more UP x86-64s able to boot an SMP kernel
   by forcing the number of CPUs to at least 1.
+- default fat filesystems to use UTF-8
 
 * Tue Feb 21 2006 Rik van Riel <riel at redhat.com>
 - Make it possible to disable xen and kdump builds.



From fedora-cvs-commits at redhat.com  Tue Feb 21 20:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 15:55:04 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1975,
	1.1976 linux-2.6-block-reduce-stack.patch, 1.1, NONE
Message-ID: <200602212055.k1LKt4D0004923@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4868

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-block-reduce-stack.patch 
Log Message:
dead patch



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1975
retrieving revision 1.1976
diff -u -r1.1975 -r1.1976
--- kernel-2.6.spec	21 Feb 2006 20:53:00 -0000	1.1975
+++ kernel-2.6.spec	21 Feb 2006 20:55:02 -0000	1.1976
@@ -364,7 +364,6 @@
 Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
 Patch1723: linux-2.6-selinux-selinuxfs-hard-link-count.patch
 Patch1730: linux-2.6-ide-cd-shutup.patch
-Patch1740: linux-2.6-block-reduce-stack.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
 Patch1780: linux-2.6-firmware-loader-timeout.patch
@@ -935,8 +934,6 @@
 
 # Silence noisy CD drive spew
 %patch1730 -p1
-# Reduce stack usage in block layer
-#%patch1740 -p1
 # Enable SATA ATAPI by default.
 %patch1760 -p1
 # 


--- linux-2.6-block-reduce-stack.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 21 22:22:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 17:22:41 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.222, 1.223 anaconda.spec, 1.342,
	1.343 sources, 1.341, 1.342
Message-ID: <200602212222.k1LMMfk0002632@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2590/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.6-1 on branch devel from anaconda-10.92.6-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- .cvsignore	14 Feb 2006 22:11:46 -0000	1.222
+++ .cvsignore	21 Feb 2006 22:22:39 -0000	1.223
@@ -1 +1 @@
-anaconda-10.92.5.tar.bz2
+anaconda-10.92.6.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- anaconda.spec	14 Feb 2006 22:11:46 -0000	1.342
+++ anaconda.spec	21 Feb 2006 22:22:39 -0000	1.343
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.5
+Version: 10.92.6
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,21 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Feb 21 2006 Chris Lumens <clumens at redhat.com> 10.92.6-1
+- Set a default language on text mode CJK installs (dcantrel, #180417)
+- Fix case-sensitive matching of devices (notting, #182231)
+- Be smarter about required media (pnasrat)
+- Set MTU in the loader (katzj)
+- Add dev package to remove blacklist (katzj, #181593)
+- Try to mount device as ext3 in hard drive installs (katzj)
+- Sanity check unknown package & group names (pnasrat)
+- Reboot after writing exception dump (#181745)
+- Confirm in interactive kickstart installs (#181741)
+- Fix showing kickstart package selection again
+- Don't traceback if we find a %%include file that doesn't exist yet (#181760)
+- Skip partitioning if logvol or raid is given in ks (#181806)
+- Initialize UTC checkbox (#181737)
+
 * Tue Feb 14 2006 Jeremy Katz <katzj at redhat.com> - 10.92.5-1
 - Fix traceback in language group selection
 - No remote save traceback button if not network (clumens)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- sources	14 Feb 2006 22:11:46 -0000	1.341
+++ sources	21 Feb 2006 22:22:39 -0000	1.342
@@ -1 +1 @@
-eda159cf73ffd561ebfcafc62d182f23  anaconda-10.92.5.tar.bz2
+cb3a4ecec91ff11fc7ceb2d2e831cca9  anaconda-10.92.6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 21:56:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 16:56:33 -0500
Subject: rpms/cman-kernel/devel .cvsignore, 1.21, 1.22 cman-kernel.spec,
	1.140, 1.141 sources, 1.23, 1.24
Message-ID: <200602212156.k1LLuXhY016257@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16223

Modified Files:
	.cvsignore cman-kernel.spec sources 
Log Message:
Updated kernel sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Feb 2006 19:16:52 -0000	1.21
+++ .cvsignore	21 Feb 2006 21:56:29 -0000	1.22
@@ -1 +1 @@
-cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+cman-kernel-2.6.15-0.tar.gz


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- cman-kernel.spec	15 Feb 2006 23:33:55 -0000	1.140
+++ cman-kernel.spec	21 Feb 2006 21:56:29 -0000	1.141
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
-%define subversion 20051219.162641.FC5
+%define subversion 0.FC5
  
 %ifnarch i686
 %define buildsmp 0
@@ -25,7 +25,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.0
-Release: 20051219.162641.FC5.11.7
+Release: 0.FC5.0
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Feb 2006 19:23:45 -0000	1.23
+++ sources	21 Feb 2006 21:56:29 -0000	1.24
@@ -1 +1 @@
-9339efb0b79d72ce05caac6f61ce9057  cman-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+07b4017407bfdcbb849d55f2f9a7ca4b  cman-kernel-2.6.15-0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 22:07:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 17:07:39 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.142,1.143
Message-ID: <200602212207.k1LM7d5C018502@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18473

Modified Files:
	cman-kernel.spec 
Log Message:
Fixed version.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- cman-kernel.spec	21 Feb 2006 21:59:48 -0000	1.142
+++ cman-kernel.spec	21 Feb 2006 22:07:35 -0000	1.143
@@ -14,6 +14,7 @@
 %define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
 %define subversion 0
+%define tempversion 2.6.15
  
 %ifnarch i686
 %define buildsmp 0
@@ -24,7 +25,7 @@
 %endif
 
 Name: cman-kernel
-Version: 2.6.15
+Version: 2.6.15.1
 Release: 0.FC5.1
 License: GPL
 Group: System Environment/Kernel
@@ -43,7 +44,7 @@
 Provides: cman-kernel-modules = %{version}-%{release}
 #ExclusiveArch: i586 i686 x86_64 ppc ppc64
 ExclusiveArch: i686 x86_64
-Source0: %{name}-%{version}-%{subversion}.tar.gz
+Source0: %{name}-%{tempversion}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description



From fedora-cvs-commits at redhat.com  Tue Feb 21 22:03:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 17:03:38 -0500
Subject: rpms/dlm-kernel/devel .cvsignore, 1.18, 1.19 dlm-kernel.spec, 1.115,
	1.116 sources, 1.19, 1.20
Message-ID: <200602212203.k1LM3crq017891@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17860

Modified Files:
	.cvsignore dlm-kernel.spec sources 
Log Message:
New upstream sources.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	13 Feb 2006 19:29:45 -0000	1.18
+++ .cvsignore	21 Feb 2006 22:03:25 -0000	1.19
@@ -1 +1 @@
-dlm-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+dlm-kernel-2.6.15-0.tar.gz


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- dlm-kernel.spec	16 Feb 2006 00:05:49 -0000	1.115
+++ dlm-kernel.spec	21 Feb 2006 22:03:25 -0000	1.116
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
-%define subversion 20051219.162641.FC5
+%define subversion 0
 
 %ifnarch i686
 %define buildsmp 0
@@ -24,8 +24,8 @@
 %endif
 
 Name: dlm-kernel
-Version: 2.6.15.0
-Release: 20051219.162641.FC5.9.7
+Version: 2.6.15
+Release: 0.FC5.0
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Feb 2006 19:29:46 -0000	1.19
+++ sources	21 Feb 2006 22:03:26 -0000	1.20
@@ -1 +1 @@
-29d3788cee35194f81d70390913530a3  dlm-kernel-2.6.15.0-20051219.162641.FC5.tar.gz
+a8d23dd46661efb745530f65e82350a5  dlm-kernel-2.6.15-0.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 21 21:59:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 16:59:51 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.141,1.142
Message-ID: <200602212159.k1LLxpYj017356@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17330

Modified Files:
	cman-kernel.spec 
Log Message:
Fixed rev.


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- cman-kernel.spec	21 Feb 2006 21:56:29 -0000	1.141
+++ cman-kernel.spec	21 Feb 2006 21:59:48 -0000	1.142
@@ -13,7 +13,7 @@
 %define buildsmp 1
 %define buildxen 0
 %define kernel_version 2.6.15-1.1955_FC5
-%define subversion 0.FC5
+%define subversion 0
  
 %ifnarch i686
 %define buildsmp 0
@@ -24,8 +24,8 @@
 %endif
 
 Name: cman-kernel
-Version: 2.6.15.0
-Release: 0.FC5.0
+Version: 2.6.15
+Release: 0.FC5.1
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Tue Feb 21 22:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 17:26:00 -0500
Subject: rpms/yaboot/devel yaboot.spec,1.34,1.35
Message-ID: <200602212226.k1LMQ0T3003756@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/yaboot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3735

Modified Files:
	yaboot.spec 
Log Message:
 Drop telnet console patch for now (#182180)


Index: yaboot.spec
===================================================================
RCS file: /cvs/dist/rpms/yaboot/devel/yaboot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- yaboot.spec	11 Feb 2006 06:37:03 -0000	1.34
+++ yaboot.spec	21 Feb 2006 22:25:57 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: Linux bootloader for Power Macintosh "New World" computers.
 Name: yaboot
 Version: 1.3.13
-Release: 0.17.1
+Release: 0.18
 License: GPL
 Group: System Environment/Base
 Source: http://yaboot.ozlabs.org/releases/yaboot-%{version}.tar.gz
@@ -70,7 +70,7 @@
 %patch21 -p1 -b .pegasos-serial
 %patch22 -p1 -b .deepmnt
 %patch23 -p1 -b .malloc
-%patch24 -p1 -b .telnet
+#patch24 -p1 -b .telnet
 %patch25 -p1 -b .netboot
 %patch26 -p1 -b .printversion
 %patch27 -p1 -b .ppc64
@@ -108,6 +108,9 @@
 %ghost %config(noreplace) %{_sysconfdir}/yaboot.conf
 
 %changelog
+* Tue Feb 21 2006 Paul Nasrat <pnasrat at redhat.com> - 1.3.13-0.18
+- Drop telnet console patch for now (#182180)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.3.13-0.17.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 21:28:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 16:28:16 -0500
Subject: rpms/util-linux/devel util-linux-2.12p-col-EILSEQ.patch, 1.1,
	1.2 util-linux.spec, 1.106, 1.107
Message-ID: <200602212128.k1LLSGKd027676@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27598

Modified Files:
	util-linux-2.12p-col-EILSEQ.patch util-linux.spec 
Log Message:
fix col-EILSEQ.patch

util-linux-2.12p-col-EILSEQ.patch:
 col.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

Index: util-linux-2.12p-col-EILSEQ.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.12p-col-EILSEQ.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12p-col-EILSEQ.patch	3 Jan 2006 17:50:20 -0000	1.1
+++ util-linux-2.12p-col-EILSEQ.patch	21 Feb 2006 21:28:13 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.12p/text-utils/col.c.EILSEQ	2002-03-09 00:05:12.000000000 +0100
-+++ util-linux-2.12p/text-utils/col.c	2006-01-02 18:00:06.000000000 +0100
+--- util-linux-2.13-pre6/text-utils/col.c.kzak	2002-03-09 00:05:12.000000000 +0100
++++ util-linux-2.13-pre6/text-utils/col.c	2006-02-21 22:25:48.000000000 +0100
 @@ -128,6 +128,7 @@
  	int this_line;			/* line l points to */
  	int nflushd_lines;		/* number of lines that were flushed */
@@ -8,7 +8,7 @@
  
  	setlocale(LC_ALL, "");
  	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -175,8 +176,15 @@
+@@ -175,8 +176,16 @@
  	cur_line = max_line = nflushd_lines = this_line = 0;
  	cur_set = last_set = CS_NORMAL;
  	lines = l = alloc_line();
@@ -18,15 +18,16 @@
 +	while (feof(stdin)==0) {
 +		errno = 0;
 +		if ((ch = getwchar()) == WEOF) {
-+			if (errno==EILSEQ)
++			if (errno==EILSEQ) {
 +				perror("col");
-+			ret = 1;
++				ret = 1;
++			}
 +			break;
 +		}	
  		if (!iswgraph(ch)) {
  			switch (ch) {
  			case BS:		/* can't go back further */
-@@ -332,7 +340,7 @@
+@@ -332,7 +341,7 @@
  	flush_blanks();
  	if (ferror(stdout) || fclose(stdout))
  		return 1;


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- util-linux.spec	11 Feb 2006 05:56:30 -0000	1.106
+++ util-linux.spec	21 Feb 2006 21:28:13 -0000	1.107
@@ -25,7 +25,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.15.1
+Release: 0.16
 License: distributable
 Group: System Environment/Base
 
@@ -627,6 +627,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Feb 21 2006 Karel Zak <kzak at redhat.com> 2.13-0.16
+- fix #180730 - col is exiting with 1 (fix util-linux-2.12p-col-EILSEQ.patch)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 21 21:32:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 16:32:26 -0500
Subject: rpms/util-linux/FC-4 util-linux-2.12p-col-EILSEQ.patch, 1.1,
	1.2 util-linux.spec, 1.89, 1.90
Message-ID: <200602212132.k1LLWQFe028501@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28449

Modified Files:
	util-linux-2.12p-col-EILSEQ.patch util-linux.spec 
Log Message:
fix col-EILSEQ.patch

util-linux-2.12p-col-EILSEQ.patch:
 col.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

Index: util-linux-2.12p-col-EILSEQ.patch
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux-2.12p-col-EILSEQ.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-2.12p-col-EILSEQ.patch	2 Jan 2006 17:02:14 -0000	1.1
+++ util-linux-2.12p-col-EILSEQ.patch	21 Feb 2006 21:32:23 -0000	1.2
@@ -1,5 +1,5 @@
---- util-linux-2.12p/text-utils/col.c.EILSEQ	2002-03-09 00:05:12.000000000 +0100
-+++ util-linux-2.12p/text-utils/col.c	2006-01-02 18:00:06.000000000 +0100
+--- util-linux-2.13-pre6/text-utils/col.c.kzak	2002-03-09 00:05:12.000000000 +0100
++++ util-linux-2.13-pre6/text-utils/col.c	2006-02-21 22:25:48.000000000 +0100
 @@ -128,6 +128,7 @@
  	int this_line;			/* line l points to */
  	int nflushd_lines;		/* number of lines that were flushed */
@@ -8,7 +8,7 @@
  
  	setlocale(LC_ALL, "");
  	bindtextdomain(PACKAGE, LOCALEDIR);
-@@ -175,8 +176,15 @@
+@@ -175,8 +176,16 @@
  	cur_line = max_line = nflushd_lines = this_line = 0;
  	cur_set = last_set = CS_NORMAL;
  	lines = l = alloc_line();
@@ -18,15 +18,16 @@
 +	while (feof(stdin)==0) {
 +		errno = 0;
 +		if ((ch = getwchar()) == WEOF) {
-+			if (errno==EILSEQ)
++			if (errno==EILSEQ) {
 +				perror("col");
-+			ret = 1;
++				ret = 1;
++			}
 +			break;
 +		}	
  		if (!iswgraph(ch)) {
  			switch (ch) {
  			case BS:		/* can't go back further */
-@@ -332,7 +340,7 @@
+@@ -332,7 +341,7 @@
  	flush_blanks();
  	if (ferror(stdout) || fclose(stdout))
  		return 1;


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- util-linux.spec	3 Jan 2006 16:53:25 -0000	1.89
+++ util-linux.spec	21 Feb 2006 21:32:23 -0000	1.90
@@ -27,7 +27,7 @@
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.12p
-Release: 9.13
+Release: 9.14
 License: distributable
 Group: System Environment/Base
 
@@ -692,6 +692,9 @@
 /sbin/losetup
 
 %changelog
+* Tue Feb 21 2006 Karel Zak <kzak at redhat.com> 2.12p-9.14
+- fix #180730 - col is exiting with 1 (fix util-linux-2.12p-col-EILSEQ.patch)
+
 * Tue Jan  3 2006 Karel Zak <kzak at redhat.com> 2.12p-9.13
 - fix #174111 - mount allows loopback devices to be mounted more than once to the same mount point
 - fix #176441: col truncates data



From fedora-cvs-commits at redhat.com  Tue Feb 21 23:04:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 18:04:12 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.223, 1.224 anaconda.spec, 1.343,
	1.344 sources, 1.342, 1.343
Message-ID: <200602212304.k1LN4Cex020090@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20068/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.7-1 on branch devel from anaconda-10.92.7-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- .cvsignore	21 Feb 2006 22:22:39 -0000	1.223
+++ .cvsignore	21 Feb 2006 23:04:07 -0000	1.224
@@ -1 +1 @@
-anaconda-10.92.6.tar.bz2
+anaconda-10.92.7.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- anaconda.spec	21 Feb 2006 22:22:39 -0000	1.343
+++ anaconda.spec	21 Feb 2006 23:04:07 -0000	1.344
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.6
+Version: 10.92.7
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,10 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue Feb 21 2006 Chris Lumens <clumens at redhat.com> 10.92.7-1
+- Give Language a default display_mode (dcantrel)
+- Get languages that need a default from localeInfo (dcantrel)
+
 * Tue Feb 21 2006 Chris Lumens <clumens at redhat.com> 10.92.6-1
 - Set a default language on text mode CJK installs (dcantrel, #180417)
 - Fix case-sensitive matching of devices (notting, #182231)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- sources	21 Feb 2006 22:22:39 -0000	1.342
+++ sources	21 Feb 2006 23:04:07 -0000	1.343
@@ -1 +1 @@
-cb3a4ecec91ff11fc7ceb2d2e831cca9  anaconda-10.92.6.tar.bz2
+7e90ebb31b9995247df97b61e767c356  anaconda-10.92.7.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 21 23:32:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 18:32:20 -0500
Subject: rpms/pirut/devel .cvsignore, 1.10, 1.11 pirut.spec, 1.11,
	1.12 sources, 1.11, 1.12
Message-ID: <200602212332.k1LNWKD0011592@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11537/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.11-1 on branch devel from pirut-0.9.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	4 Feb 2006 05:54:40 -0000	1.10
+++ .cvsignore	21 Feb 2006 23:32:05 -0000	1.11
@@ -1 +1 @@
-pirut-0.9.10.tar.gz
+pirut-0.9.11.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pirut.spec	4 Feb 2006 05:54:40 -0000	1.11
+++ pirut.spec	21 Feb 2006 23:32:05 -0000	1.12
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.10
+Version: 0.9.11
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,15 @@
 
 
 %changelog
+* Tue Feb 21 2006 Jeremy Katz <katzj at redhat.com> - 0.9.11-1
+- Don't try to install source packages (#180048)
+- Fix wrong error name (#181370)
+- Ensure group is selected for select all
+- Log installs from all tools in yum.log (#182126)
+- Don't traceback on servers not telling us the size (#181890)
+- Start of work for search to work
+- Add some details about what's selected for install/remove (#182126)
+
 * Sat Feb  4 2006 Jeremy Katz <katzj at redhat.com> - 0.9.10-1
 - Add a popup menu for selecting all/none of the optional packages in a group
 - Speed up pirut startup and list mode a bit


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Feb 2006 05:54:40 -0000	1.11
+++ sources	21 Feb 2006 23:32:05 -0000	1.12
@@ -1 +1 @@
-cc222957792ac3f5bc1d32d4c5f1b6db  pirut-0.9.10.tar.gz
+043138f3db3ad624f2b0f08115184fff  pirut-0.9.11.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 00:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 19:50:37 -0500
Subject: rpms/lam/devel lam.spec,1.32,1.33
Message-ID: <200602220050.k1M0obLU010543@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/lam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10516

Modified Files:
	lam.spec 
Log Message:
add ld.so.conf.d/mpi.conf integration with openmpi


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/devel/lam.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lam.spec	17 Feb 2006 22:32:02 -0000	1.32
+++ lam.spec	22 Feb 2006 00:50:34 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.1
-Release: 10.FC5
+Release: 11
 License: BSD
 Epoch: 2
 Group: Development/Libraries
@@ -121,9 +121,11 @@
 #    ln -s ./%{name}/$l $RPM_BUILD_ROOT/%{_libdir}/$l;
 #done;
 # 
-# Create the ldconfig file for LAM:
+# Create the ldconfig file for LAM
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+# The default mpi ld.so conf file (managed by openmpi's mpi_alternatives):
+touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/mpi.conf
+echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/ld.conf
 # Create the lam.pc pkgconfig file:
 mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig
 sed 's#@VERSION@#'%{version}'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}.pc;
@@ -142,14 +144,24 @@
 %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 %{_sysconfdir}/ld.so.conf.d/%{name}.conf
+%ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
 %config %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/*
 %{_includedir}/%{name}
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 
+%post
+if [ $1 -ge 1 ]; then
+   if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
+	ln -s %{_datadir}/%{name}/ld.conf  %{_sysconfdir}/ld.so.conf.d/mpi.conf;
+   fi;
+fi;
+
 %changelog
+* 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
+
 * Thu Feb 16 2006 Jason Vas Dias<jvdias at redhat.com> - 2:7.1.1-10.FC5
 - Enable co-existence with OpenMPI
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 00:53:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 19:53:15 -0500
Subject: rpms/selinux-policy/devel Makefile.devel, 1.2,
	1.3 policy-20060207.patch, 1.16, 1.17 selinux-policy.spec,
	1.117, 1.118
Message-ID: <200602220053.k1M0rFQO011799@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11762

Modified Files:
	Makefile.devel policy-20060207.patch selinux-policy.spec 
Log Message:



Index: Makefile.devel
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/Makefile.devel,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.devel	14 Feb 2006 17:11:59 -0000	1.2
+++ Makefile.devel	22 Feb 2006 00:53:12 -0000	1.3
@@ -24,8 +24,6 @@
 # set default build options if missing
 NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
 MLSENABLED := $(shell cat /selinux/mls)
-MODPKGDIR := $(SHAREDIR)/$(NAME)
-
 ifeq ($(MLSENABLED),1)
 MCSFLAG=-mcs
 endif
@@ -35,6 +33,16 @@
 POLY ?= n
 QUIET ?= y
 
+genxml := $(PYTHON) $(HEADERDIR)/support/segenxml.py
+
+docs = doc
+polxml = $(docs)/policy.xml
+xmldtd = $(HEADERDIR)/support/policy.dtd
+layerxml = metadata.xml
+
+globaltun = $(HEADERDIR)/global_tunables.xml
+globalbool = $(HEADERDIR)/global_booleans.xml
+
 # compile strict policy if requested.
 ifneq ($(findstring strict,$(TYPE)),)
 	M4PARAM += -D strict_policy
@@ -73,21 +81,33 @@
 	M4PARAM += -D direct_sysadm_daemon
 endif
 
-ifneq ($(VERBOSE),y)
-	quiet := @
+ifeq ($(QUIET),y)
+	verbose := @
 endif
 
 M4PARAM += -D hide_broken_symptoms
 
 # policy headers
-m4support := $(wildcard $(HEADERDIR)/*.spt)
-all_interfaces := $(wildcard $(HEADERDIR)/*.if)
-rolemap := $(HEADERDIR)/rolemap
-
-detected_mods := $(wildcard *.te)
-detected_ifs := $(detected_mods:.te=.if)
-all_packages := $(detected_mods:.te=.pp)
-install_mods := $(MODPKGDIR)/$(all_packages)
+m4support = $(wildcard $(HEADERDIR)/support/*.spt)
+all_layers = $(filter-out $(HEADERDIR)/support,$(shell find $(wildcard $(HEADERDIR)/*) -maxdepth 0 -type d))
+all_interfaces = $(foreach layer,$(all_layers),$(wildcard $(layer)/*.if))
+rolemap = $(HEADERDIR)/rolemap
+
+detected_layers =  $(filter-out CVS tmp $(docs),$(shell find $(wildcard *) -maxdepth 0 -type d))
+3rd_party_mods = $(wildcard *.te)
+3rd_party_ifs = $(3rd_party_mods:.te=.if)
+detected_mods = $(3rd_party_mods) $(foreach layer,$(detected_layers),$(wildcard $(layer)/*.te))
+detected_ifs = $(3rd_party_ifs) $(foreach layer,$(detected_layers),$(wildcard $(layer)/*.if))
+all_packages = $(notdir $(detected_mods:.te=.pp))
+
+vpath %.te $(detected_layers)
+vpath %.if $(detected_layers)
+vpath %.fc $(detected_layers)
+
+# if there are modules in the current directory, add them into the third party layer
+ifneq "$(3rd_party_ifs)" ""
+        genxml += -3 .
+endif
 
 ########################################
 #
@@ -107,6 +127,10 @@
 	$(verbose) echo "')" >> $2
 endef
 
+.PHONY: clean all xml
+.SUFFIXES:
+.SUFFIXES: .pp
+
 ########################################
 #
 # Main targets
@@ -114,6 +138,8 @@
 
 all: $(all_packages)
 
+xml: $(polxml)
+
 ########################################
 #
 # Build module packages
@@ -136,6 +162,26 @@
 	@test -d tmp || mkdir -p tmp
 	$(verbose) m4 $^ | sed -e s/dollarsstar/\$$\*/g > $@
 
+
+########################################
+#
+# Documentation generation
+#
+
+# minimal dependencies here, because we don't want to rebuild
+# this and its dependents every time the dependencies
+# change.  Also use all .if files here, rather then just the
+# enabled modules.
+$(polxml): $(detected_ifs) $(foreach dir,$(all_layers),$(dir)/$(layerxml))
+	@echo "Creating $@"
+	@mkdir -p doc
+	$(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
+	$(verbose) echo '<!DOCTYPE policy SYSTEM "$(xmldtd)">' >> $@
+	$(verbose) $(genxml) -m $(layerxml) --tunables-xml $(globaltun) --booleans-xml $(globalbool) $(all_layers) $(detected_layers) >> $@
+	$(verbose) if test -x $(XMLLINT) && test -f $(xmldtd); then \
+		$(XMLLINT) --noout --dtdvalid $(xmldtd) $@ ;\
+	fi
+
 ########################################
 #
 # Clean the environment
@@ -144,5 +190,3 @@
 clean:
 	rm -fR tmp
 	rm -f *.pp
-
-.PHONY: clean install all default

policy-20060207.patch:
 admin/logwatch.te     |    2 +
 admin/su.if           |   19 ++++------
 admin/vpn.te          |    4 ++
 apps/java.if          |    8 +---
 apps/slocate.te       |    2 +
 kernel/devices.if     |   39 ++++++++++++++++++++++
 services/.mta.te.swp  |binary
 services/apache.if    |   57 ++++++++++++++++++++++++++++++++
 services/cron.te      |    7 ++++
 services/cups.if      |   19 ++++++++++
 services/ssh.if       |    2 +
 system/authlogin.te   |    2 +
 system/fstools.te     |    2 -
 system/mount.te       |    2 +
 system/selinuxutil.fc |    7 ++++
 system/selinuxutil.if |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 system/selinuxutil.te |   76 ++++++++++++++++++++++++++++++++++++++-----
 system/userdomain.if  |   24 +++++++++++++
 system/userdomain.te  |    4 +-
 19 files changed, 335 insertions(+), 28 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- policy-20060207.patch	21 Feb 2006 20:37:13 -0000	1.16
+++ policy-20060207.patch	22 Feb 2006 00:53:12 -0000	1.17
@@ -1,6 +1,6 @@
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.19/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/logwatch.te	2006-02-21 15:02:45.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/logwatch.te	2006-02-21 17:24:20.000000000 -0500
 @@ -71,6 +71,8 @@
  
  selinux_dontaudit_getattr_dir(logwatch_t)
@@ -12,7 +12,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.19/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/su.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/su.if	2006-02-21 17:24:20.000000000 -0500
 @@ -220,6 +220,14 @@
  		nscd_socket_use($1_su_t)
  	')
@@ -48,7 +48,7 @@
  	allow $1_su_t sshd_tmp_t:file rw_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.19/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/vpn.te	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/admin/vpn.te	2006-02-21 17:24:20.000000000 -0500
 @@ -106,6 +106,10 @@
  
  optional_policy(`dbus',`
@@ -62,7 +62,7 @@
  optional_policy(`mount',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.19/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/apps/java.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/apps/java.if	2006-02-21 17:24:20.000000000 -0500
 @@ -149,13 +149,9 @@
  	userdom_manage_user_home_content_sockets($1,$1_javaplugin_t)
  	userdom_user_home_dir_filetrans_user_home_content($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
@@ -81,7 +81,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.19/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/apps/slocate.te	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/apps/slocate.te	2006-02-21 17:24:20.000000000 -0500
 @@ -36,6 +36,8 @@
  
  files_list_all(locate_t)
@@ -93,7 +93,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.19/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/kernel/devices.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/kernel/devices.if	2006-02-21 17:24:20.000000000 -0500
 @@ -1115,6 +1115,45 @@
  
  ########################################
@@ -142,8 +142,24 @@
  ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.19/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-21 14:42:09.000000000 -0500
-@@ -798,3 +798,58 @@
++++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-21 18:26:10.000000000 -0500
+@@ -94,6 +94,7 @@
+ 
+ 	corecmd_exec_bin(httpd_$1_script_t)
+ 	corecmd_exec_sbin(httpd_$1_script_t)
++	corecmd_shell_entry_type(httpd_$1_script_t)
+ 
+ 	domain_exec_all_entry_files(httpd_$1_script_t)
+ 
+@@ -174,6 +175,7 @@
+ 		dev_read_urand(httpd_$1_script_t)
+ 
+ 		fs_getattr_xattr_fs(httpd_$1_script_t)
++		fs_read_eventpollfs(httpd_$1_script_t)
+ 
+ 		files_read_etc_runtime_files(httpd_$1_script_t)
+ 		files_read_usr_files(httpd_$1_script_t)
+@@ -798,3 +800,58 @@
  
  	allow $1 httpd_sys_script_t:dir search;
  ')
@@ -204,7 +220,7 @@
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.19/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/cron.te	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/cron.te	2006-02-21 17:24:20.000000000 -0500
 @@ -360,6 +360,9 @@
  	optional_policy(`apache',`
  		# Needed	 for certwatch
@@ -228,7 +244,7 @@
  		samba_read_log(system_crond_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.19/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/cups.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/cups.if	2006-02-21 17:24:20.000000000 -0500
 @@ -169,6 +169,25 @@
  
  ########################################
@@ -255,9 +271,10 @@
  ##	Connect to ptal over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
+Binary files nsaserefpolicy/policy/modules/services/.mta.te.swp and serefpolicy-2.2.19/policy/modules/services/.mta.te.swp differ
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.19/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/ssh.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/ssh.if	2006-02-21 17:24:20.000000000 -0500
 @@ -279,6 +279,8 @@
  
  	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
@@ -269,7 +286,7 @@
  	# for ssh-add
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.19/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/authlogin.te	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/authlogin.te	2006-02-21 17:24:20.000000000 -0500
 @@ -153,6 +153,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
@@ -279,9 +296,21 @@
  dev_getattr_framebuffer_dev(pam_console_t)
  dev_setattr_framebuffer_dev(pam_console_t)
  dev_getattr_misc_dev(pam_console_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.19/policy/modules/system/fstools.te
+--- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/fstools.te	2006-02-21 18:41:06.000000000 -0500
+@@ -45,7 +45,7 @@
+ files_tmp_filetrans(fsadm_t, fsadm_tmp_t, { file dir })
+ 
+ # Enable swapping to files
+-allow fsadm_t swapfile_t:file { getattr swapon };
++allow fsadm_t swapfile_t:file { read write getattr swapon };
+ 
+ kernel_read_system_state(fsadm_t)
+ kernel_read_kernel_sysctls(fsadm_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.19/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/mount.te	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/mount.te	2006-02-21 17:24:20.000000000 -0500
 @@ -137,6 +137,8 @@
  	samba_domtrans_smbmount(mount_t)
  ')
@@ -293,7 +322,7 @@
  #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc	2006-02-21 17:24:20.000000000 -0500
 @@ -39,3 +39,10 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
@@ -308,7 +337,7 @@
 \ No newline at end of file
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.19/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.if	2006-02-21 17:24:20.000000000 -0500
 @@ -778,3 +778,90 @@
  	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
@@ -402,7 +431,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.19/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-21 14:49:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-21 17:24:20.000000000 -0500
 @@ -103,6 +103,27 @@
  
  ########################################
@@ -503,7 +532,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.19/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/userdomain.if	2006-02-21 14:42:09.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/userdomain.if	2006-02-21 17:24:20.000000000 -0500
 @@ -145,6 +145,7 @@
  	allow $1_t unpriv_userdomain:fd use;
  
@@ -548,7 +577,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.19/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/userdomain.te	2006-02-21 14:54:57.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/userdomain.te	2006-02-21 17:24:20.000000000 -0500
 @@ -75,7 +75,7 @@
  	files_associate_tmp(user_home_t)
  	fs_associate_tmpfs(user_home_t)
@@ -567,29 +596,3 @@
  			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
  		', `
  			selinux_set_enforce_mode(sysadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.19/support/Makefile.devel
---- nsaserefpolicy/support/Makefile.devel	2006-02-16 16:42:39.000000000 -0500
-+++ serefpolicy-2.2.19/support/Makefile.devel	2006-02-21 14:42:09.000000000 -0500
-@@ -1,3 +1,6 @@
-+# installation paths
-+SHAREDIR := $(PREFIX)/share/selinux
-+HEADERDIR := $(SHAREDIR)/refpolicy/include
- 
- include $(HEADERDIR)/build.conf
- 
-@@ -19,8 +22,13 @@
- PYTHON ?= python
- 
- # set default build options if missing
--TYPE ?= strict
--NAME ?= $(TYPE)
-+NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
-+MLSENABLED := $(shell cat /selinux/mls)
-+ifeq ($(MLSENABLED),1)
-+MCSFLAG=-mcs
-+endif
-+
-+TYPE ?= $(NAME)${MCSFLAG}
- DIRECT_INITRC ?= n
- POLY ?= n
- QUIET ?= y


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- selinux-policy.spec	21 Feb 2006 20:37:13 -0000	1.117
+++ selinux-policy.spec	22 Feb 2006 00:53:12 -0000	1.118
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.19
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -289,6 +289,11 @@
 
 %changelog
 
+* Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-2
+- Fix swapon
+- allow httpd_sys_script_t to be entered via a shell
+- Allow httpd_sys_script_t to read eventpolfs
+
 * Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-1
 - Update from upstream
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 01:29:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 20:29:44 -0500
Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.5,1.6
Message-ID: <200602220129.k1M1TiZX031282@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31251

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added xkbdata-1.0.1-greek-fix-bug181313.patch to fix (#181313,181313)
- Added xkbdata-1.0.1-cz-fix-bug177362.patch to fix (#177362,178892)



Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-xkbdata.spec	9 Feb 2006 19:17:43 -0000	1.5
+++ xorg-x11-xkbdata.spec	22 Feb 2006 01:29:41 -0000	1.6
@@ -3,7 +3,7 @@
 Summary: xkb data files for the X.Org X11 X server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -11,6 +11,7 @@
 
 Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
 Patch0: xkbdata-1.0.1-sysreq-fix-bug175661.patch
+Patch1: xkbdata-1.0.1-greek-fix-bug181313.patch
 
 BuildArch: noarch
 
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .sysreq-fix-bug175661
+%patch1 -p0 -b .greek-fix-bug181313
 
 %build
 %configure
@@ -127,45 +129,10 @@
 %{_datadir}/X11/xkb/keymap/digital/us
 %{_datadir}/X11/xkb/keymap/macintosh
 %dir %{_datadir}/X11/xkb/keymap/sgi
-%{_datadir}/X11/xkb/keymap/sgi/be
-%{_datadir}/X11/xkb/keymap/sgi/bg
-%{_datadir}/X11/xkb/keymap/sgi/ca
-%{_datadir}/X11/xkb/keymap/sgi/cz
-%{_datadir}/X11/xkb/keymap/sgi/cz_qwerty
-%{_datadir}/X11/xkb/keymap/sgi/de
-%{_datadir}/X11/xkb/keymap/sgi/de_CH
-%{_datadir}/X11/xkb/keymap/sgi/dk
-%{_datadir}/X11/xkb/keymap/sgi/dvorak
-%{_datadir}/X11/xkb/keymap/sgi/en_US
-%{_datadir}/X11/xkb/keymap/sgi/es
-%{_datadir}/X11/xkb/keymap/sgi/fi
-%{_datadir}/X11/xkb/keymap/sgi/fr
-%{_datadir}/X11/xkb/keymap/sgi/fr_CH
-%{_datadir}/X11/xkb/keymap/sgi/gb
-%{_datadir}/X11/xkb/keymap/sgi/hu
-%{_datadir}/X11/xkb/keymap/sgi/it
-%{_datadir}/X11/xkb/keymap/sgi/jp
-%{_datadir}/X11/xkb/keymap/sgi/no
-%{_datadir}/X11/xkb/keymap/sgi/pl
-%{_datadir}/X11/xkb/keymap/sgi/pt
-%{_datadir}/X11/xkb/keymap/sgi/ru
-%{_datadir}/X11/xkb/keymap/sgi/se
-%{_datadir}/X11/xkb/keymap/sgi/sk
-%{_datadir}/X11/xkb/keymap/sgi/sk_qwerty
-%{_datadir}/X11/xkb/keymap/sgi/th
-%{_datadir}/X11/xkb/keymap/sgi/us
+%{_datadir}/X11/xkb/keymap/sgi/*
 %{_datadir}/X11/xkb/keymap/sony
 %dir %{_datadir}/X11/xkb/keymap/sun
-%{_datadir}/X11/xkb/keymap/sun/de
-%{_datadir}/X11/xkb/keymap/sun/es
-%{_datadir}/X11/xkb/keymap/sun/fi
-%{_datadir}/X11/xkb/keymap/sun/fr
-%{_datadir}/X11/xkb/keymap/sun/no
-%{_datadir}/X11/xkb/keymap/sun/pl
-%{_datadir}/X11/xkb/keymap/sun/ru
-%{_datadir}/X11/xkb/keymap/sun/se
-%{_datadir}/X11/xkb/keymap/sun/uk
-%{_datadir}/X11/xkb/keymap/sun/us
+%{_datadir}/X11/xkb/keymap/sun/*
 %{_datadir}/X11/xkb/keymap/xfree86
 %{_datadir}/X11/xkb/keymap/xfree98
 %dir %{_datadir}/X11/xkb/rules
@@ -437,6 +404,10 @@
 %{_datadir}/X11/xkb/types/pc
 
 %changelog
+* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added xkbdata-1.0.1-greek-fix-bug181313.patch to fix (#181313,181313)
+- Added xkbdata-1.0.1-cz-fix-bug177362.patch to fix (#177362,178892)
+
 * Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
 - Added xkbdata-1.0.1-sysreq-fix-bug175661.patch to fix (#175661)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 01:30:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 20:30:25 -0500
Subject: rpms/xorg-x11-xkbdata/devel xkbdata-1.0.1-cz-fix-bug177362.patch,
	NONE, 1.1 xkbdata-1.0.1-greek-fix-bug181313.patch, NONE, 1.1
Message-ID: <200602220130.k1M1UPXa031424@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31398

Added Files:
	xkbdata-1.0.1-cz-fix-bug177362.patch 
	xkbdata-1.0.1-greek-fix-bug181313.patch 
Log Message:
Added xkbdata-1.0.1-cz-fix-bug177362.patch xkbdata-1.0.1-greek-fix-bug181313.patch

xkbdata-1.0.1-cz-fix-bug177362.patch:
 cz |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xkbdata-1.0.1-cz-fix-bug177362.patch ---
Patch that fixes cz keyboard layouts:

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177362
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178892

Patch is from bug:
https://bugs.freedesktop.org/show_bug.cgi?id=5077

mharris at redhat.com


--- symbols/pc/cz	2005-08-12 13:08:49.000000000 +0200
+++ symbols/pc/cz	2005-11-17 10:56:50.000000000 +0100
@@ -78,7 +78,7 @@
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "bksl" {
-    include "cz(basic)"
+    include "pc/cz(basic)"
     name[Group1]= "Czechia - With <\|> key";
 
     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
@@ -91,7 +91,7 @@
     // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
     // 2001 by Kamil Toman <ktoman at email.cz>
     
-    include "cz(basic)"
+    include "pc/cz(basic)"
     name[Group1]= "Czechia - qwerty";
 
     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
@@ -100,7 +100,7 @@
 
 // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
 xkb_symbols "qwerty_bksl" {
-    include "cz(qwerty)"
+    include "pc/cz(qwerty)"
 
     name[Group1]= "Czechia - qwerty, extended Backslash";
 

xkbdata-1.0.1-greek-fix-bug181313.patch:
 gr |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE xkbdata-1.0.1-greek-fix-bug181313.patch ---
Patch that fixes greeklitude.

Fixes bugs:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181313
https://bugs.freedesktop.org/show_bug.cgi?id=5012


--- symbols/pc/gr.orig	Tue Jan 31 20:28:22 2006
+++ symbols/pc/gr	Tue Jan 31 20:29:05 2006
@@ -13,7 +13,7 @@
 default partial alphanumeric_keys alternate_group
 xkb_symbols "basic" {
 
-    include "pc/el(bare)"
+    include "pc/gr(bare)"
 
     name[Group1] = "Greece";
 
@@ -83,7 +83,7 @@
 partial alphanumeric_keys alternate_group
 xkb_symbols "extended" {
 
-    include "pc/el(basic)"
+    include "pc/gr(basic)"
     name[Group1] = "Greece - Extended";
 
     key.type = "THREE_LEVEL";
@@ -102,7 +102,7 @@
 partial alphanumeric_keys alternate_group
 xkb_symbols "polytonic" {
 
-    include "pc/el(extended)"
+    include "pc/gr(extended)"
 
     name[Group1] = "Greece - Polytonic";
 
@@ -119,7 +119,7 @@
 partial alphanumeric_keys alternate_group
 xkb_symbols "nodeadkeys" {
 
-    include "pc/el(basic)"
+    include "pc/gr(basic)"
     name[Group1] = "Greece - Eliminate dead keys";
 
     key <AC10> { [	semicolon,		colon		] };



From fedora-cvs-commits at redhat.com  Wed Feb 22 03:47:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 22:47:02 -0500
Subject: rpms/jakarta-commons-digester/devel .cvsignore, 1.5,
	1.6 jakarta-commons-digester.spec, 1.26, 1.27 sources, 1.3, 1.4
Message-ID: <200602220347.k1M3l2Hv032669@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/jakarta-commons-digester/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32221

Modified Files:
	.cvsignore jakarta-commons-digester.spec sources 
Log Message:
updated to version 1.7


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 May 2005 11:39:04 -0000	1.5
+++ .cvsignore	22 Feb 2006 03:47:00 -0000	1.6
@@ -1,4 +1 @@
-commons-digester-1.6-src.tar.gz
-commons-digester-1.6-src
-i386
-*.src.rpm
+commons-digester-1.7-src.tar.gz


Index: jakarta-commons-digester.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jakarta-commons-digester.spec	11 Feb 2006 03:40:29 -0000	1.26
+++ jakarta-commons-digester.spec	22 Feb 2006 03:47:00 -0000	1.27
@@ -1,8 +1,8 @@
 %define base_name       digester
 %define short_name      commons-%{base_name}
 %define name            jakarta-%{short_name}
-%define version         1.6
-%define release 	2jpp_8fc
+%define version         1.7
+%define release 	2jpp_9fc
 %define section         free
 
 Name:           %{name}
@@ -15,12 +15,10 @@
 Source0:        http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz
 URL:            http://jakarta.apache.org/commons/digester/
 BuildRequires:  ant
-BuildRequires:  jakarta-commons-beanutils >= 0:1.3
-BuildRequires:  jakarta-commons-collections >= 0:3.0
+BuildRequires:  jakarta-commons-beanutils >= 0:1.7
 BuildRequires:  jakarta-commons-logging >= 0:1.0
 BuildRequires:  jpackage-utils > 0:1.5
-Requires:       jakarta-commons-beanutils >= 0:1.3
-Requires:       jakarta-commons-collections >= 0:3.0
+Requires:       jakarta-commons-beanutils >= 0:1.7
 Requires:       jakarta-commons-logging >= 0:1.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # RHEL3 and FC2
@@ -48,7 +46,7 @@
 %build
 cp LICENSE.txt ../LICENSE
 
-export CLASSPATH=%(build-classpath commons-collections commons-logging commons-beanutils junit)
+export CLASSPATH=%(build-classpath commons-logging commons-beanutils junit)
 ant dist
 
 # Build rss -- needed by struts
@@ -103,7 +101,7 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt PROPOSAL.html STATUS.html RELEASE-NOTES.txt
+%doc LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
@@ -112,6 +110,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.7-2jpp_9fc
+- Updated to version 1.7.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - sh: line 1: build-classpath: command not found
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Oct 2004 20:10:47 -0000	1.3
+++ sources	22 Feb 2006 03:47:00 -0000	1.4
@@ -1 +1 @@
-1bdc6d353a28c1944a4699c8b1cce065  commons-digester-1.6-src.tar.gz
+718f91f6958da865826bca455f644076  commons-digester-1.7-src.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 04:04:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 23:04:26 -0500
Subject: rpms/jakarta-commons-validator/devel
	jakarta-commons-validator-1.1.4-build.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 jakarta-commons-validator.spec, 1.9,
	1.10 sources, 1.4,
	1.5 jakarta-commons-validator-1.1.3-build.patch, 1.1, NONE
Message-ID: <200602220404.k1M44QrK009550@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/jakarta-commons-validator/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9522

Modified Files:
	.cvsignore jakarta-commons-validator.spec sources 
Added Files:
	jakarta-commons-validator-1.1.4-build.patch 
Removed Files:
	jakarta-commons-validator-1.1.3-build.patch 
Log Message:
Updated to 1.1.4 and aot compiled.

jakarta-commons-validator-1.1.4-build.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jakarta-commons-validator-1.1.4-build.patch ---
--- build.xml.orig	2004-11-26 17:17:14.000000000 -0500
+++ build.xml	2004-11-26 17:17:57.000000000 -0500
@@ -266,7 +266,7 @@
     <mkdir      dir="${dist.home}"/>
     <copy      file="LICENSE.txt"
               todir="${dist.home}"/>
-    <copy      file="RELEASE-NOTES.readme"
+    <copy      file="NOTICE.txt"
               todir="${dist.home}"/>
     <mkdir      dir="${build.home}/classes/META-INF"/>
     <copy      file="LICENSE.txt"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Jun 2005 14:45:40 -0000	1.4
+++ .cvsignore	22 Feb 2006 04:03:51 -0000	1.5
@@ -1,5 +1,2 @@
-commons-validator-1.1.3-src-RHCLEAN.tar.bz2
-commons-validator-1.1.3-conf.tar.gz
-commons-validator-1.1.3
-noarch
-*.src.rpm
+commons-validator-1.1.4-conf.tar.gz
+commons-validator-1.1.4-src.tar.gz


Index: jakarta-commons-validator.spec
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/jakarta-commons-validator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jakarta-commons-validator.spec	22 Dec 2005 08:52:58 -0000	1.9
+++ jakarta-commons-validator.spec	22 Feb 2006 04:03:51 -0000	1.10
@@ -6,12 +6,12 @@
 
 Summary:        Jakarta Commons Validator
 Name:           %{name}
-Version:        1.1.3
-Release: 	1jpp_4fc
+Version:        1.1.4
+Release: 	1jpp_5fc
 Epoch:          0
 License:        Apache Software License
 Group:          Development/Libraries/Java
-Source0:        commons-validator-%{version}-src-RHCLEAN.tar.bz2
+Source0:        http://www.apache.org/dist/jakarta/commons/validator/source/commons-validator-%{version}-src.tar.gz
 Source1:        %{name}.catalog
 # FIXME DTDs are not in the source tarball anymore (conf directory missing)
 Source2:        commons-validator-%{version}-conf.tar.gz
@@ -32,7 +32,9 @@
 Requires:       jakarta-commons-logging >= 0:1.0.2
 Requires:       oro >= 0:2.0.6
 Requires:       xml-commons-apis
-BuildArch:      noarch
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -96,6 +98,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
+aot-compile-rpm
+
 # -----------------------------------------------------------------------------
 
 %clean
@@ -111,6 +115,8 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
+%{_bindir}/rebuild-gcj-db
+
 %postun
 # Note that we're using versioned catalog, so this is always ok.
 if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
@@ -119,6 +125,8 @@
     %{_datadir}/sgml/%{name}/catalog > /dev/null || :
 fi
 
+%{_bindir}/rebuild-gcj-db
+
 # -----------------------------------------------------------------------------
 
 %files
@@ -126,6 +134,7 @@
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/*
 %{_datadir}/sgml/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
@@ -134,6 +143,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.1.4-1jpp_5fc
+- Updated to 1.1.4 and aot compiled.
+
 * Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.1.3-1jpp_4fc
 - rebuilt again
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jakarta-commons-validator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jun 2005 14:45:40 -0000	1.4
+++ sources	22 Feb 2006 04:03:51 -0000	1.5
@@ -1,2 +1,2 @@
-88278f153862b7464d9e575af28d2a76  commons-validator-1.1.3-src-RHCLEAN.tar.bz2
-2c738bfbd840eeda89e2c911bea7a8ad  commons-validator-1.1.3-conf.tar.gz
+2c738bfbd840eeda89e2c911bea7a8ad  commons-validator-1.1.4-conf.tar.gz
+6a4ef07da77dd86223e80870999448e8  commons-validator-1.1.4-src.tar.gz


--- jakarta-commons-validator-1.1.3-build.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 22 04:20:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 23:20:49 -0500
Subject: rpms/cpuspeed/devel cpuspeed.init,1.6,1.7 cpuspeed.spec,1.31,1.32
Message-ID: <200602220420.k1M4Kn2E028054@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27909

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
- Missed another occurance of the same problem I fixed yesterday.




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpuspeed.init	21 Feb 2006 02:07:36 -0000	1.6
+++ cpuspeed.init	22 Feb 2006 04:20:46 -0000	1.7
@@ -19,7 +19,7 @@
 start() {
 	if [ ! -f /var/lock/subsys/cpuspeed ]; then
 		# Attempt to load scaling_driver if not loaded but it is configured
-		if [ ! -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver ]; then
+		if [ ! -f /sys/devices/system/cpu/cpu*/cpufreq/scaling_driver ]; then
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cpuspeed.spec	21 Feb 2006 02:07:36 -0000	1.31
+++ cpuspeed.spec	22 Feb 2006 04:20:46 -0000	1.32
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Tue Feb 21 2006 Dave Jones <davej at redhat.com>
+- Missed another occurance of the same problem I fixed yesterday.
+
 * Mon Feb 20 2006 Dave Jones <davej at redhat.com>
 - Some ACPI BIOSes start counting CPUs at 0, some at 1. *sigh*  (#181673)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 04:21:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 23:21:20 -0500
Subject: rpms/cpuspeed/FC-4 cpuspeed.init,1.4,1.5
Message-ID: <200602220421.k1M4LKa2028334@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28228

Modified Files:
	cpuspeed.init 
Log Message:
duh



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-4/cpuspeed.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpuspeed.init	21 Feb 2006 02:08:39 -0000	1.4
+++ cpuspeed.init	22 Feb 2006 04:21:16 -0000	1.5
@@ -19,7 +19,7 @@
 start() {
 	if [ ! -f /var/lock/subsys/cpuspeed ]; then
 		# Attempt to load scaling_driver if not loaded but it is configured
-		if [ ! -f /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver ]; then
+		if [ ! -f /sys/devices/system/cpu/cpu*/cpufreq/scaling_driver ]; then
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else



From fedora-cvs-commits at redhat.com  Wed Feb 22 04:46:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 23:46:45 -0500
Subject: rpms/struts/devel struts-1.2.8.build.patch, NONE,
	1.1 struts-1.2.8.bz157205.patch, NONE,
	1.1 struts-1.2.8.servlet24.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 sources, 1.5, 1.6 struts.spec, 1.27,
	1.28 struts-1.2.4.build.patch, 1.1,
	NONE struts-1.2.4.bz157205.patch, 1.2,
	NONE struts-1.2.4.servlet24.patch, 1.1, NONE
Message-ID: <200602220446.k1M4kjm1017110@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17081

Modified Files:
	.cvsignore sources struts.spec 
Added Files:
	struts-1.2.8.build.patch struts-1.2.8.bz157205.patch 
	struts-1.2.8.servlet24.patch 
Removed Files:
	struts-1.2.4.build.patch struts-1.2.4.bz157205.patch 
	struts-1.2.4.servlet24.patch 
Log Message:
Updated to 1.2.8

struts-1.2.8.build.patch:
 build-webapp.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE struts-1.2.8.build.patch ---
--- build-webapp.xml	Sun Feb 10 08:38:52 2002
+++ build-webapp.xml.new	Wed Mar 27 01:09:51 2002
@@ -213,6 +213,7 @@
   <mkdir   dir="${webapp.target}" />
   <mkdir   dir="${webapp.target}/WEB-INF" />
   <mkdir   dir="${webapp.target}/WEB-INF/classes" />
+  <mkdir   dir="${webapp.target}/WEB-INF/lib" />
   <mkdir   dir="${webapp.target}" />
 </target>
 
@@ -272,7 +272,7 @@
         The "static" target copies the static web resources portion of your
         web application source into the build target area.
 -->
-<target name="static" depends="prepare,source,libs,struts"
+<target name="static" depends="prepare,source,libs"
         description="Copy static files">
   <echo    message="Processing webapp ${webapp.name}"/>
   <copy  todir="${webapp.target}">
@@ -301,6 +301,10 @@
       <exclude name="**/*.java"/>
     </fileset>
   </copy>
+  <jar jarfile="${webapp.target}/WEB-INF/lib/classes.jar"
+        basedir="${webapp.target}/WEB-INF/classes"/>
+  <delete dir="${webapp.target}/WEB-INF/classes" />
+  <delete dir="${webapp.target}/WEB-INF/src" />
 </target>
 
 

struts-1.2.8.bz157205.patch:
 MessageResourcesFactory.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE struts-1.2.8.bz157205.patch ---
RequestUtils.applicationClass() uses the context classloader to find
the class, but for some reason it sometimes seems to be set to what
looks like the normal system classloader.  Possibly its something to
do with the fact that MessageResourcesFactory.createFactory() is
called from MessageResources.getMessageResources() which is usually
called from <clinit> methods.  Or, it could be because RequestUtils
itself calls getMessageResources(), so createFactory() reenters
itself.

--- jakarta-struts-1.1-src/src/share/org/apache/struts/util/MessageResourcesFactory.java.orig	2003-06-30 05:51:19.000000000 +0100
+++ jakarta-struts-1.1-src/src/share/org/apache/struts/util/MessageResourcesFactory.java	2005-05-09 13:36:32.000000000 +0100
@@ -188,8 +188,16 @@
 
         // Construct a new instance of the specified factory class
         try {
-            if (clazz == null)
-                clazz = RequestUtils.applicationClass(factoryClass);
+            if (clazz == null) {
+                if (System.getProperty("java.vm.name").equals("GNU libgcj")) {
+                    // XXX should use context class loader but it's wrong
+                    ClassLoader classLoader =
+                        MessageResourcesFactory.class.getClassLoader();
+                    clazz = classLoader.loadClass(factoryClass);
+                }
+                else
+                    clazz = RequestUtils.applicationClass(factoryClass);
+            }
             MessageResourcesFactory factory =
                 (MessageResourcesFactory) clazz.newInstance();
             return (factory);

struts-1.2.8.servlet24.patch:
 MultipartRequestWrapper.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+)

--- NEW FILE struts-1.2.8.servlet24.patch ---
--- jakarta-struts-1.1-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java.orig	2003-06-30 05:51:36.000000000 +0100
+++ jakarta-struts-1.1-src/src/share/org/apache/struts/upload/MultipartRequestWrapper.java	2005-01-20 15:57:41.126231975 +0000
@@ -344,6 +344,39 @@
         return false;
     }
     
+    //SERVLET 2.4 EMPTY METHODS
+    /**
+     * This method returns -1.  To use any Servlet 2.4 methods,
+     * call on getRequest() and use that request object.  Once Servlet 2.4
+     * is required to build Struts, this will no longer be an issue.
+     */
+    public int getRemotePort() {
+        return -1;
+    }
+    /**
+     * This method returns null.  To use any Servlet 2.4 methods,
+     * call on getRequest() and use that request object.  Once Servlet 2.4
+     * is required to build Struts, this will no longer be an issue.
+     */
+    public String getLocalName() {
+        return null;
+    }
+    /**
+     * This method returns null.  To use any Servlet 2.4 methods,
+     * call on getRequest() and use that request object.  Once Servlet 2.4
+     * is required to build Struts, this will no longer be an issue.
+     */
+    public String getLocalAddr() {
+        return null;
+    }
+    /**
+     * This method returns -1.  To use any Servlet 2.4 methods,
+     * call on getRequest() and use that request object.  Once Servlet 2.4
+     * is required to build Struts, this will no longer be an issue.
+     */
+    public int getLocalPort() {
+        return -1;
+    }
     
     
         


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Jun 2005 16:22:54 -0000	1.6
+++ .cvsignore	22 Feb 2006 04:46:42 -0000	1.7
@@ -1,4 +1 @@
-jakarta-struts-1.2.4-src-RHCLEAN.tar.bz2
-jakarta-struts-1.2.4-src
-i386
-*.src.rpm
+struts-1.2.8-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Jun 2005 16:22:54 -0000	1.5
+++ sources	22 Feb 2006 04:46:42 -0000	1.6
@@ -1 +1 @@
-08ff76831f60a04df815f8a069ed3cae  jakarta-struts-1.2.4-src-RHCLEAN.tar.bz2
+99b90aed5fd29bb06b2b97f70da4b889  struts-1.2.8-src.tar.gz


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- struts.spec	11 Feb 2006 05:44:37 -0000	1.27
+++ struts.spec	22 Feb 2006 04:46:42 -0000	1.28
@@ -1,7 +1,9 @@
 %define name		struts
 %define full_name	jakarta-%{name}
-%define version		1.2.4
-%define release 	2jpp_7fc
+%define version		1.2.8
+%define release 	2jpp_8fc
+%define tomcat3appsdir  %{_localstatedir}/tomcat3/webapps
+%define tomcat4appsdir  %{_localstatedir}/lib/tomcat4/webapps
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -15,19 +17,18 @@
 Summary:	Web application framework
 License:	Apache License
 Group:          Development/Libraries/Java
-Source0:	%{full_name}-%{version}-src-RHCLEAN.tar.bz2
+Source0:	%{name}-%{version}-src.tar.gz
 Source2:	tomcat4-context-allowlinking.xml
 Source3:	tomcat5-context-allowlinking.xml
 Patch0:		%{name}-%{version}.build.patch
-Patch1:		%{name}-%{version}.servlet24.patch
-Patch2:		%{name}-%{version}.bz157205.patch
+Patch1:         %{name}-%{version}.bz157205.patch
 Url:		http://jakarta.apache.org/%{name}
 Requires:	servletapi5
 Requires:	jdbc-stdext
 Requires:	jakarta-commons-beanutils >= 0:1.7.0
 Requires:	jakarta-commons-digester >= 0:1.6
 Requires:	jakarta-commons-fileupload >= 0:1.0
-Requires:	jakarta-commons-validator >= 0:1.1.3
+Requires:	jakarta-commons-validator >= 0:1.1.4
 Requires:	oro >= 0:2.0.7
 BuildRequires:	jpackage-utils >= 1.5
 BuildRequires:	ant >= 1.6.1
@@ -39,12 +40,10 @@
 BuildRequires:	servletapi5
 BuildRequires:	jdbc-stdext
 BuildRequires:  jakarta-commons-beanutils >= 0:1.7.0
-BuildRequires:  jakarta-commons-collections >= 0:2.1
 BuildRequires:  jakarta-commons-digester >= 0:1.6
 BuildRequires:  jakarta-commons-fileupload >= 0:1.0
-BuildRequires:  jakarta-commons-lang >= 0:1.0.1
 BuildRequires:  jakarta-commons-logging >= 0:1.0.4
-BuildRequires:  jakarta-commons-validator >= 0:1.1.3
+BuildRequires:  jakarta-commons-validator >= 0:1.1.4
 BuildRequires:  oro >= 0:2.0.7
 Group:		Development/Java
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
@@ -89,6 +88,28 @@
 %description javadoc
 Javadoc for %{name}.
 
+%package webapps-tomcat3
+Summary:        Sample %{name} webapps for tomcat3
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Prereq:         tomcat3
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+
+%description webapps-tomcat3
+Sample %{name} webapps for tomcat3.
+
+%package webapps-tomcat4
+Summary:        Sample %{name} webapps for tomcat4
+Group:          Development/Java
+Requires:       %{name} = %{version}-%{release}
+Prereq:         tomcat4
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+
+%description webapps-tomcat4
+Sample %{name} webapps for tomcat4.
+
 %package webapps-tomcat5
 Summary:        Sample %{name} webapps for tomcat5
 Group:          Development/Java
@@ -103,29 +124,32 @@
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-%setup -n %{full_name}-%{version}-src -q
+%setup -n %{name}-%{version}-src -q
 %patch0
 %patch1 -p1
-%patch2 -p1
 # remove all binary libs
 find . -name "*.class" -exec rm -f {} \;
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.war" -exec rm -f {} \;
 
+mkdir lib; pushd lib
+  ln -s $(find-jar jspapi) .
+popd
+
 %build
 
 # build struts
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl \
-jaxp_transform_impl jdbc-stdext servletapi5 jspapi antlr commons-digester-rss)
+export CLASSPATH=
 ant -Djdbc20ext.jar=$(find-jar jdbc-stdext) \
 	-Dcommons-beanutils.jar=$(build-classpath commons-beanutils) \
-	-Dcommons-collections.jar=$(build-classpath commons-collections) \
 	-Dcommons-digester.jar=$(build-classpath commons-digester) \
 	-Dcommons-fileupload.jar=$(build-classpath commons-fileupload) \
-	-Dcommons-lang.jar=$(build-classpath commons-lang) \
 	-Dcommons-logging.jar=$(build-classpath commons-logging) \
 	-Dcommons-validator.jar=$(build-classpath commons-validator) \
 	-Djakarta-oro.jar=$(build-classpath oro) \
+        -Djsp.jar=$(build-classpath jspapi) \
+        -Dservlet.jar=$(build-classpath servletapi5) \
+        -Dantlr.jar=$(build-classpath antlr) \
 	 compile.library compile.webapps compile.javadoc
 
 %install
@@ -142,6 +166,34 @@
 install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+# tomcat 3 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat3appsdir}
+for webapp in %{webapps}; do
+    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp
+    # tomcat3 doesn't support allowLinking, this might not work
+       # XXX: move to %%post/preun
+       for jar in %{webapplibs}; do
+        (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib \
+        && ln -sf ../../../../../..%{_javadir}/$jar.jar .)
+       done
+    (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF \
+    && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+
+# tomcat 4 webapps
+install -d -m 755 $RPM_BUILD_ROOT%{tomcat4appsdir}
+for webapp in %{webapps}; do
+    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp
+    cat %{SOURCE2} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp.xml
+       # XXX: move to %%post/preun
+       for jar in %{webapplibs}; do
+        (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib \
+        && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
+    done
+    (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \
+    && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
+done
+
 # tomcat 5 webapps
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5ctxdir}
@@ -165,13 +217,24 @@
 %postun
 %{_bindir}/rebuild-gcj-db
 
+%post webapps-tomcat3
+%{_bindir}/rebuild-gcj-db
+
+%postun webapps-tomcat3
+%{_bindir}/rebuild-gcj-db
+
+%post webapps-tomcat4
+%{_bindir}/rebuild-gcj-db
+
+%postun webapps-tomcat4
+%{_bindir}/rebuild-gcj-db
+
 %post webapps-tomcat5
 %{_bindir}/rebuild-gcj-db
 
 %postun webapps-tomcat5
 %{_bindir}/rebuild-gcj-db
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -195,6 +258,35 @@
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 
+%files webapps-tomcat3
+%defattr(-,tomcat3,tomcat3)
+%dir %{tomcat3appsdir}/%{name}-blank
+%{tomcat3appsdir}/%{name}-blank/*
+%dir %{tomcat3appsdir}/%{name}-documentation
+%{tomcat3appsdir}/%{name}-documentation/*
+%dir %{tomcat3appsdir}/%{name}-example
+%{tomcat3appsdir}/%{name}-example/*
+%dir %{tomcat3appsdir}/%{name}-examples
+%{tomcat3appsdir}/%{name}-examples/*
+%dir %{tomcat3appsdir}/%{name}-tiles-documentation
+%{tomcat3appsdir}/%{name}-tiles-documentation/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
+
+%files webapps-tomcat4
+%defattr(-,tomcat,tomcat)
+%dir %{tomcat4appsdir}/%{name}-blank
+%{tomcat4appsdir}/%{name}-blank/*
+%dir %{tomcat4appsdir}/%{name}-documentation
+%{tomcat4appsdir}/%{name}-documentation/*
+%dir %{tomcat4appsdir}/%{name}-example
+%{tomcat4appsdir}/%{name}-example/*
+%dir %{tomcat4appsdir}/%{name}-examples
+%{tomcat4appsdir}/%{name}-examples/*
+%dir %{tomcat4appsdir}/%{name}-tiles-documentation
+%{tomcat4appsdir}/%{name}-tiles-documentation/*
+%{tomcat4appsdir}/%{name}-*.xml
+%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
+
 %files webapps-tomcat5
 %defattr(-,tomcat,tomcat)
 %dir %{tomcat5appsdir}/%{name}-blank
@@ -211,6 +303,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_8fc
+- Updated to 1.2.8
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.2.4-2jpp_7fc
 - bump again for double-long bug on ppc(64)
 


--- struts-1.2.4.build.patch DELETED ---


--- struts-1.2.4.bz157205.patch DELETED ---


--- struts-1.2.4.servlet24.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 22 04:50:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 21 Feb 2006 23:50:32 -0500
Subject: rpms/pirut/devel .cvsignore, 1.11, 1.12 pirut.spec, 1.12,
	1.13 sources, 1.12, 1.13
Message-ID: <200602220450.k1M4oWII018906@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18845/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.12-1 on branch devel from pirut-0.9.12-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	21 Feb 2006 23:32:05 -0000	1.11
+++ .cvsignore	22 Feb 2006 04:50:30 -0000	1.12
@@ -1 +1 @@
-pirut-0.9.11.tar.gz
+pirut-0.9.12.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pirut.spec	21 Feb 2006 23:32:05 -0000	1.12
+++ pirut.spec	22 Feb 2006 04:50:30 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.11
+Version: 0.9.12
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Tue Feb 21 2006 Jeremy Katz <katzj at redhat.com> - 0.9.12-1
+- enable search functionality
+
 * Tue Feb 21 2006 Jeremy Katz <katzj at redhat.com> - 0.9.11-1
 - Don't try to install source packages (#180048)
 - Fix wrong error name (#181370)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Feb 2006 23:32:05 -0000	1.12
+++ sources	22 Feb 2006 04:50:30 -0000	1.13
@@ -1 +1 @@
-043138f3db3ad624f2b0f08115184fff  pirut-0.9.11.tar.gz
+41a51fe70f05e820eca21b250af22e1b  pirut-0.9.12.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 05:03:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 00:03:21 -0500
Subject: rpms/pirut/devel .cvsignore, 1.12, 1.13 pirut.spec, 1.13,
	1.14 sources, 1.13, 1.14
Message-ID: <200602220503.k1M53LUa016295@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16272/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.13-1 on branch devel from pirut-0.9.13-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	22 Feb 2006 04:50:30 -0000	1.12
+++ .cvsignore	22 Feb 2006 05:03:19 -0000	1.13
@@ -1 +1 @@
-pirut-0.9.12.tar.gz
+pirut-0.9.13.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pirut.spec	22 Feb 2006 04:50:30 -0000	1.13
+++ pirut.spec	22 Feb 2006 05:03:19 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.12
+Version: 0.9.13
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.13-1
+- add files
+
 * Tue Feb 21 2006 Jeremy Katz <katzj at redhat.com> - 0.9.12-1
 - enable search functionality
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	22 Feb 2006 04:50:30 -0000	1.13
+++ sources	22 Feb 2006 05:03:19 -0000	1.14
@@ -1 +1 @@
-41a51fe70f05e820eca21b250af22e1b  pirut-0.9.12.tar.gz
+97791e921cb42203e3bcbc1073927625  pirut-0.9.13.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 05:58:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 00:58:58 -0500
Subject: rpms/libXvMC/devel
	libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch, NONE,
	1.1 libXvMC.spec, 1.11, 1.12
Message-ID: <200602220558.k1M5wwfq019470@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/libXvMC/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19445

Modified Files:
	libXvMC.spec 
Added Files:
	libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch 
Log Message:
* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch to fix (#180902)


libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch ---
Patch to fix:

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180902

--- src/Makefile.am.libXvMC-XConfigDir-fix	2006-02-22 00:42:52.000000000 -0500
+++ src/Makefile.am	2006-02-22 00:43:20.000000000 -0500
@@ -15,7 +15,7 @@
 libXvMCW_la_LIBADD = @XVMC_LIBS@
 libXvMCW_la_CFLAGS =				\
 	$(AM_CFLAGS)				\
-	-DXVMC_CONFIGDIR=XConfigDir		\
+	-DXVMC_CONFIGDIR=/etc/X11		\
 	-DXVMC_SOVERSION=\".1.0\"		\
 	-DXV_SOVERSION=\".1.0\"
 


Index: libXvMC.spec
===================================================================
RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libXvMC.spec	11 Feb 2006 04:23:19 -0000	1.11
+++ libXvMC.spec	22 Feb 2006 05:58:56 -0000	1.12
@@ -1,18 +1,23 @@
 Summary: X.Org X11 libXvMC runtime library
 Name: libXvMC
 Version: 1.0.1
-Release: 2.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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2
+Patch0: libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch
+
 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
@@ -33,11 +38,14 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .libXvMC-XConfigDir-fix-bug180902
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
+automake-1.7
+autoconf
 
 %configure \
 %if ! %{with_static}
@@ -62,7 +70,6 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXvMC.so.1
 %{_libdir}/libXvMC.so.1.0.0
 %{_libdir}/libXvMCW.so.1
@@ -75,16 +82,16 @@
 %{_includedir}/X11/extensions/XvMClib.h
 %if %{with_static}
 %{_libdir}/libXvMC.a
-%endif
-%{_libdir}/libXvMC.so
-%if %{with_static}
 %{_libdir}/libXvMCW.a
 %endif
+%{_libdir}/libXvMC.so
 %{_libdir}/libXvMCW.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xvmc.pc
 
 %changelog
+* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
+- Added libXvMC-1.0.1-libXvMC-XConfigDir-fix-bug180902.patch to fix (#180902)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-2.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 08:19:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 03:19:09 -0500
Subject: rpms/udev/devel udev-084-pg.patch, NONE, 1.1 udev-rules.patch, 1.2,
	1.3 udev.spec, 1.150, 1.151
Message-ID: <200602220819.k1M8J9FW026665@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26583

Modified Files:
	udev-rules.patch udev.spec 
Added Files:
	udev-084-pg.patch 
Log Message:
- fixed group issue with vol_id (bz #181432)
- fixed dvb permissions (bz #179993)
- added support for scsi media changer (bz #181911)
- fixed pktcdvd device creation (bz #161268)


udev-084-pg.patch:
 extras/volume_id/vol_id.c |    2 +-
 udev_libc_wrapper.c       |   44 +++++++++++++++++++++++++++++++++++++++++---
 udev_libc_wrapper.h       |    1 +
 3 files changed, 43 insertions(+), 4 deletions(-)

--- NEW FILE udev-084-pg.patch ---
If we're looking for a user's primary GID, look up the primary GID instead of
guessing the name of the user's primary group.

--- udev-084/udev_libc_wrapper.h	2006-01-30 02:51:38.000000000 -0500
+++ udev-084/udev_libc_wrapper.h	2006-02-13 17:22:56.000000000 -0500
@@ -139,6 +139,7 @@
 #endif
 
 extern uid_t lookup_user(const char *user);
+extern gid_t lookup_user_primary_group(const char *user);
 extern gid_t lookup_group(const char *group);
 
 extern size_t strlcpy(char *dst, const char *src, size_t size);
--- udev-084/udev_libc_wrapper.c	2006-01-30 02:51:38.000000000 -0500
+++ udev-084/udev_libc_wrapper.c	2006-02-13 17:38:48.000000000 -0500
@@ -106,6 +106,20 @@
 	return uid;
 }
 
+gid_t lookup_user_primary_group(const char *user)
+{
+	struct passwd *pw;
+	gid_t gid = 0;
+
+	pw = getpwnam(user);
+	if (pw == NULL)
+		info("specified user unknown '%s'", user);
+	else
+		gid = pw->pw_gid;
+
+	return gid;
+}
+
 gid_t lookup_group(const char *group)
 {
 	struct group *gr;
@@ -126,7 +140,8 @@
 #define GROUP_FILE		"/etc/group"
 
 /* return the id of a passwd style line, selected by the users name */
-static unsigned long get_id_by_name(const char *uname, const char *dbfile)
+static unsigned long get_id_field_by_name(const char *uname, const char *dbfile,
+					  int field)
 {
 	unsigned long id = 0;
 	char line[LINE_SIZE];
@@ -165,8 +180,14 @@
 		if (name == NULL)
 			continue;
 
-		/* skip pass */
-		if (strsep(&pos, ":") == NULL)
+		/* skip password and n other fields */
+		field -= 2;
+		while (field > 0) {
+			if ((pos == NULL) || (strsep(&pos, ":") == NULL))
+				continue;
+			field--;
+		}
+		if (pos == NULL)
 			continue;
 
 		/* get id */
@@ -189,6 +210,15 @@
 	return id;
 }
 
+static unsigned long get_id_by_name(const char *uname, const char *dbfile)
+{
+	return get_id_field_by_name(uname, dbfile, 3);
+}
+static unsigned long get_second_id_by_name(const char *uname, const char *dbfile)
+{
+	return get_id_field_by_name(uname, dbfile, 4);
+}
+
 uid_t lookup_user(const char *user)
 {
 	unsigned long id;
@@ -197,6 +227,14 @@
 	return (uid_t) id;
 }
 
+gid_t lookup_user_primary_group(const char *user)
+{
+	unsigned long id;
+
+	id = get_second_id_by_name(user, PASSWD_FILE);
+	return (gid_t) id;
+}
+
 gid_t lookup_group(const char *group)
 {
 	unsigned long id;
--- udev-084/extras/volume_id/vol_id.c	2006-01-30 02:51:38.000000000 -0500
+++ udev-084/extras/volume_id/vol_id.c	2006-02-13 17:22:56.000000000 -0500
@@ -151,7 +151,7 @@
 
 	/* drop all privileges */
 	nobody_uid = lookup_user("nobody");
-	nobody_gid = lookup_group("nogroup");
+	nobody_gid = lookup_user_primary_group("nobody");
 	if (nobody_uid > 0 && nobody_gid > 0) {
 		if (setgroups(0, NULL) != 0 ||
 		    setgid(nobody_gid) != 0 ||

udev-rules.patch:
 05-udev-early.rules  |    9 +++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 +++--
 udev.rules           |  129 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 91 insertions(+), 61 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-rules.patch	7 Feb 2006 11:13:42 -0000	1.2
+++ udev-rules.patch	22 Feb 2006 08:19:05 -0000	1.3
@@ -1,11 +1,6 @@
---- /dev/null	2006-02-07 10:47:25.401206250 +0100
-+++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-07 11:30:42.000000000 +0100
-@@ -0,0 +1 @@
-+ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
-
---- udev-084/etc/udev/redhat/hotplug.rules.redhat	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-07 10:58:51.000000000 +0100
-@@ -1,9 +1,16 @@
+--- udev-084/etc/udev/redhat/hotplug.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
++++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-22 09:13:38.000000000 +0100
+@@ -1,8 +1,15 @@
  # do not call hotplug.d and dev.d for "drivers" and "module" events
 -SUBSYSTEM=="drivers",	OPTIONS="last_rule"
 -SUBSYSTEM=="module",	OPTIONS="last_rule"
@@ -24,12 +19,15 @@
  
 +
 +LABEL="hotplug_end"
-
---- /dev/null	2006-02-07 10:47:25.401206250 +0100
-+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-07 11:30:42.000000000 +0100
+--- /dev/null	2006-02-15 18:27:05.942547250 +0100
++++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-22 09:13:38.000000000 +0100
+@@ -0,0 +1 @@
++ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
+--- /dev/null	2006-02-15 18:27:05.942547250 +0100
++++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-22 09:13:38.000000000 +0100
 @@ -0,0 +1,9 @@
 +# sysfs is populated after the event is sent
-+ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
++ACTION=="add", DEVPATH=="/devices/*", DEVPATH!="*usb*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 +
 +# ignore these events until someone needs them
@@ -37,8 +35,8 @@
 +SUBSYSTEM=="module",		OPTIONS="ignore_device"
 +
 +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
---- udev-084/etc/udev/redhat/udev.rules.redhat	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/udev.rules	2006-02-07 11:30:42.000000000 +0100
+--- udev-084/etc/udev/redhat/udev.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
++++ udev-084/etc/udev/redhat/udev.rules	2006-02-22 09:15:39.000000000 +0100
 @@ -3,6 +3,7 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
@@ -138,7 +136,20 @@
  
  # audio devices
  KERNEL=="dsp*",			MODE="0660"
-@@ -209,7 +220,7 @@
+@@ -142,9 +153,10 @@
+ KERNEL=="z90crypt",		MODE="0666"
+ 
+ # DVB
+-KERNEL=="dvb/*",		MODE="0660"
+ KERNEL=="dvb",			MODE="0660"
+-KERNEL=="dvb/adapter*",		MODE="0660"
++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0660"
++
++
+ 
+ # create a symlink named after the device map name
+ # note devmap_name comes with extras/multipath
+@@ -209,7 +221,7 @@
  KERNEL=="fd[0-9]*",		SYMLINK+="floppy%e"
  KERNEL=="nst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
  KERNEL=="nosst[0-9]", BUS=="scsi", 	SYMLINK+="tape%e", MODE="0660"
@@ -147,9 +158,16 @@
  
  KERNEL=="umad*", 		NAME="infiniband/%k"
  KERNEL=="issm*", 		NAME="infiniband/%k"
-@@ -224,24 +235,25 @@
+@@ -221,28 +233,30 @@
+ KERNEL=="zappseudo",  		NAME="zap/pseudo"
+ KERNEL=="zap[0-9]*",  		NAME="zap/%n"
+ 
++KERNEL="pktcdvd", NAME="%k/control"
++
  BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
  
++BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="8", SYMLINK+="changer%e", MODE="0660"
++
  # do not seperate the next 2 lines!!
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
 +KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
@@ -176,17 +194,19 @@
  KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
  
 -KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
-+# dvb
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
- 
+-
  #######################################
  # Persistent block device stuff - begin
-@@ -297,37 +309,31 @@
+ #######################################
+@@ -297,37 +311,36 @@
  # Persistent block device stuff - end
  #####################################
  
 -ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
--
++# workaround for devices which do not report media changes
++BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
++        ENV{ID_MODEL}=="IOMEGA_ZIP*",   NAME="%k", OPTIONS+="all_partitions"
+ 
 +ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
  
  # Perhaps this should just be for all subsystems?
@@ -210,14 +230,15 @@
 +ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
  
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
+-	RUN+="/sbin/modprobe sd_mod"
+-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
 +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \
  	RUN+="/sbin/modprobe sd_mod"
--ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
--	RUN+="/sbin/modprobe sd_mod"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
 +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \
  	RUN+="/sbin/modprobe sr_mod"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \
++
 +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \
  	SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
 -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- udev.spec	21 Feb 2006 19:47:51 -0000	1.150
+++ udev.spec	22 Feb 2006 08:19:05 -0000	1.151
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -22,6 +22,7 @@
 Patch3: udevstart2.patch
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
+Patch6: udev-084-pg.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -46,6 +47,7 @@
 %patch3 -p1 -b .rhudevstart
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
+%patch6 -p1 -b .pg
 
 %build
 
@@ -274,6 +276,12 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Wed Feb 22 2006 Harald Hoyer <harald at redhat.com> - 084-4
+- fixed group issue with vol_id (bz #181432)
+- fixed dvb permissions (bz #179993)
+- added support for scsi media changer (bz #181911)
+- fixed pktcdvd device creation (bz #161268)
+
 * Tue Feb 21 2006 Florian La Roche <laroche at redhat.com> - 084-3
 - also output the additional space char as part of the startup message
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 08:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 03:43:16 -0500
Subject: rpms/ipv6calc/devel .cvsignore, 1.6, 1.7 ipv6calc.spec, 1.17,
	1.18 sources, 1.6, 1.7
Message-ID: <200602220843.k1M8hGA8002652@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/ipv6calc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2539

Modified Files:
	.cvsignore ipv6calc.spec sources 
Log Message:
- upgrade to 0.51



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Sep 2005 06:06:19 -0000	1.6
+++ .cvsignore	22 Feb 2006 08:43:13 -0000	1.7
@@ -1 +1 @@
-ipv6calc-0.50.tar.gz
+ipv6calc-0.51.tar.gz


Index: ipv6calc.spec
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/ipv6calc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ipv6calc.spec	11 Feb 2006 03:38:48 -0000	1.17
+++ ipv6calc.spec	22 Feb 2006 08:43:13 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: 	IPv6 address format change and calculation utility
 Name: 		ipv6calc
-Version: 	0.50
-Release: 1.2.1
+Version: 	0.51
+Release: 	1
 Group:		Applications/Text
 URL: 		http://www.deepspace6.net/projects/%{name}.html
 License: 	GNU GPL version 2
@@ -55,6 +55,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Feb 22 2006 Radek Vok??l <rvokal at redhat.com> 0.51-1
+- upgrade to 0.51
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.50-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ipv6calc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Sep 2005 06:06:19 -0000	1.6
+++ sources	22 Feb 2006 08:43:13 -0000	1.7
@@ -1 +1 @@
-4866bd267dc801e52c36d2f2a4500d53  ipv6calc-0.50.tar.gz
+c08c77712854ef3ba17f129a84d73ee2  ipv6calc-0.51.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 08:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 03:51:16 -0500
Subject: rpms/module-init-tools/FC-4 blacklist-compat, 1.1,
	1.2 module-init-tools.spec, 1.13, 1.14
Message-ID: <200602220851.k1M8pG8n018736@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv18693

Modified Files:
	blacklist-compat module-init-tools.spec 
Log Message:
- added /etc/modprobe.conf.dist with config(missingok)


Index: blacklist-compat
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/blacklist-compat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blacklist-compat	2 Feb 2006 15:26:30 -0000	1.1
+++ blacklist-compat	22 Feb 2006 08:51:14 -0000	1.2
@@ -30,6 +30,7 @@
 blacklist tdfxfb
 blacklist virgefb
 blacklist vga16fb
+blacklist matroxfb_base
 
 # ISDN - see bugs 154799, 159068
 blacklist hisax


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- module-init-tools.spec	2 Feb 2006 15:25:18 -0000	1.13
+++ module-init-tools.spec	22 Feb 2006 08:51:14 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.0.FC4.1
+Release: 0.%{preversion}.0.FC4.2
 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
@@ -65,6 +65,9 @@
 
 install -m 755 insmod-static $RPM_BUILD_ROOT/sbin/insmod.static
 touch $RPM_BUILD_ROOT/etc/modprobe.conf
+cat > $RPM_BUILD_ROOT/etc/modprobe.conf.dist <<EOF
+# empty file, can be removed, if it is not included by /etc/modprobe.conf
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,8 +93,12 @@
 /sbin/*
 %{_mandir}/*/*
 %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf
+%config(missingok) %verify(not md5 size mtime) /etc/modprobe.conf.dist
 
 %changelog
+* Tue Feb 21 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.2
+- added /etc/modprobe.conf.dist with config(missingok)
+
 * Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.1
 - FC4 version with fb modules blacklisted
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 09:02:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 04:02:25 -0500
Subject: rpms/module-init-tools/FC-4 module-init-tools.spec,1.14,1.15
Message-ID: <200602220902.k1M92Pbv022506@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22451

Modified Files:
	module-init-tools.spec 
Log Message:
added missing changelog entry about the matrox_fb blacklisting


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- module-init-tools.spec	22 Feb 2006 08:51:14 -0000	1.14
+++ module-init-tools.spec	22 Feb 2006 09:01:51 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.0.FC4.2
+Release: 0.%{preversion}.0.FC4.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
@@ -96,8 +96,11 @@
 %config(missingok) %verify(not md5 size mtime) /etc/modprobe.conf.dist
 
 %changelog
+* Wed Feb 22 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.3
+- blacklisted matroxfb_base also (bz #180801)   	 
+
 * Tue Feb 21 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.2
-- added /etc/modprobe.conf.dist with config(missingok)
+- added /etc/modprobe.conf.dist with config(missingok) (bz #180391)
 
 * Thu Feb 02 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.1
 - FC4 version with fb modules blacklisted



From fedora-cvs-commits at redhat.com  Wed Feb 22 09:52:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 04:52:43 -0500
Subject: rpms/gettext/devel gettext.spec,1.50,1.51
Message-ID: <200602220952.k1M9qhdU018952@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18933

Modified Files:
	gettext.spec 
Log Message:
--disable-csharp, otherwise it'll build a dll when mono is
  installed in the buildroot.

If mono support is desired, the filelist needs to be expanded with
%{_libdir}/GNU.Gettext.dll




Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gettext.spec	11 Feb 2006 03:04:50 -0000	1.50
+++ gettext.spec	22 Feb 2006 09:52:41 -0000	1.51
@@ -5,7 +5,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.14.5
-Release: 2.2.2
+Release: 3
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -79,7 +79,7 @@
 export JAVAC='gcj -C'
 export JAR='fastjar'
 %configure --without-included-gettext --enable-nls \
-	--enable-shared --with-pic-=yes
+	--enable-shared --with-pic-=yes --disable-csharp
 make
 
 %install
@@ -218,7 +218,11 @@
 %{_libdir}/%{name}/gnu.gettext.*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.2
+* Wed Feb 22 2006 Karsten Hopp <karsten at redhat.de> 0.14.5-3
+- --disable-csharp, otherwise it'll build a dll when mono is 
+  installed in the buildroot.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-3
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.1



From fedora-cvs-commits at redhat.com  Wed Feb 22 10:05:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 05:05:16 -0500
Subject: rpms/libidn/devel libidn.spec,1.28,1.29
Message-ID: <200602221005.k1MA5GTc030170@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/libidn/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30139

Modified Files:
	libidn.spec 
Log Message:
* Wed Feb 22 2006 Joe Orton <jorton at redhat.com> 0.6.2-2
- disable C# support (#182393)



Index: libidn.spec
===================================================================
RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libidn.spec	11 Feb 2006 04:08:51 -0000	1.28
+++ libidn.spec	22 Feb 2006 10:05:03 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.2
-Release: 1.1
+Release: 2
 URL: http://www.gnu.org/software/libidn
 License: LGPL
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
@@ -32,7 +32,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-csharp
 make %{?_smp_mflags}
 
 %check
@@ -85,6 +85,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb 22 2006 Joe Orton <jorton at redhat.com> 0.6.2-2
+- disable C# support (#182393)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.2-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 10:07:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 05:07:52 -0500
Subject: rpms/gettext/devel gettext.spec,1.51,1.52
Message-ID: <200602221007.k1MA7q1Z030806@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30776

Modified Files:
	gettext.spec 
Log Message:
fix changelog


Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gettext.spec	22 Feb 2006 09:52:41 -0000	1.51
+++ gettext.spec	22 Feb 2006 10:07:50 -0000	1.52
@@ -222,7 +222,7 @@
 - --disable-csharp, otherwise it'll build a dll when mono is 
   installed in the buildroot.
 
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-3
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.2
 - bump again for double-long bug on ppc(64)
 
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.14.5-2.2.1



From fedora-cvs-commits at redhat.com  Wed Feb 22 10:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 05:14:49 -0500
Subject: rpms/star/devel .cvsignore, 1.11, 1.12 sources, 1.11,
	1.12 star-1.5-selinux.patch, 1.4, 1.5 star.spec, 1.21,
	1.22 star-1.5-davej.patch, 1.1,
	NONE star-1.5-defineULLONG.patch, 1.1,
	NONE star-1.5-nofsync.patch, 1.1, NONE
Message-ID: <200602221014.k1MAEnLm000767@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/star/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv488

Modified Files:
	.cvsignore sources star-1.5-selinux.patch star.spec 
Removed Files:
	star-1.5-davej.patch star-1.5-defineULLONG.patch 
	star-1.5-nofsync.patch 
Log Message:
upgrade 1.5a71-1




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	8 Nov 2005 15:59:33 -0000	1.11
+++ .cvsignore	22 Feb 2006 10:14:45 -0000	1.12
@@ -1 +1 @@
-star-1.5a69.tar.bz2
+star-1.5a71.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/star/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Nov 2005 15:59:33 -0000	1.11
+++ sources	22 Feb 2006 10:14:45 -0000	1.12
@@ -1 +1 @@
-3d70f46190b902ed252ad48d4bfd1345  star-1.5a69.tar.bz2
+3e9742f364b5aab85c961017dce04957  star-1.5a71.tar.bz2

star-1.5-selinux.patch:
 conf/configure.in |   10 ++++++++++
 conf/rules.cnf.in |    2 ++
 star/Makefile     |    3 ++-
 star/cpio.mk      |    3 ++-
 star/extract.c    |   11 +++++++++++
 star/gnutar.mk    |    3 ++-
 star/pax.mk       |    3 ++-
 star/star.c       |    9 +++++++++
 star/star.mk      |    3 ++-
 star/star_fat.mk  |    3 ++-
 star/starsubs.h   |    5 +++++
 star/suntar.mk    |    3 ++-
 star/xattr.c      |   27 +++++++++++++++++++++++++++
 13 files changed, 78 insertions(+), 7 deletions(-)

Index: star-1.5-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star-1.5-selinux.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- star-1.5-selinux.patch	8 Nov 2005 15:54:26 -0000	1.4
+++ star-1.5-selinux.patch	22 Feb 2006 10:14:45 -0000	1.5
@@ -1,7 +1,7 @@
---- star-1.5/conf/configure.in.selinux	2005-10-11 04:51:05.000000000 -0400
-+++ star-1.5/conf/configure.in	2005-11-08 16:36:57.000000000 -0500
-@@ -314,6 +314,15 @@
-   LIBS="$ac_save_LIBS"
+--- star-1.5/conf/configure.in.selinux	2006-02-07 11:23:13.000000000 -0500
++++ star-1.5/conf/configure.in	2006-02-22 10:11:28.000000000 -0500
+@@ -357,6 +357,15 @@
+ 	echo no
  fi
  
 +AC_CHECK_HEADERS(selinux/selinux.h)
@@ -16,23 +16,23 @@
  dnl Checks for OS madness.
  AC_BROKEN_LINUX_EXT2_FS_H
  AC_BROKEN_SRC_LINUX_EXT2_FS_H
-@@ -329,5 +338,6 @@
- AC_SUBST(lib_acl)
+@@ -373,5 +382,6 @@
  AC_SUBST(lib_acl_test)
  AC_SUBST(lib_attr)
+ AC_SUBST(lib_secdb)
 +AC_SUBST(lib_selinux)
  
  AC_OUTPUT(rules.cnf)
---- star-1.5/conf/rules.cnf.in.selinux	2004-10-07 14:32:26.000000000 -0400
-+++ star-1.5/conf/rules.cnf.in	2005-11-08 16:36:57.000000000 -0500
-@@ -9,3 +9,5 @@
- LIB_ACL= @lib_acl@
+--- star-1.5/conf/rules.cnf.in.selinux	2005-12-20 06:41:02.000000000 -0500
++++ star-1.5/conf/rules.cnf.in	2006-02-22 10:12:56.000000000 -0500
+@@ -10,3 +10,5 @@
  LIB_ACL_TEST= @lib_acl_test@
  LIB_ATTR = @lib_attr@
+ LIB_SECDB = @lib_secdb@
 +LIB_SELINUX = @lib_selinux@
 +
---- star-1.5/star/pax.mk.selinux	2005-02-09 18:31:56.000000000 -0500
-+++ star-1.5/star/pax.mk	2005-11-08 16:36:57.000000000 -0500
+--- star-1.5/star/pax.mk.selinux	2006-02-02 10:00:31.000000000 -0500
++++ star-1.5/star/pax.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -17,6 +17,7 @@
  CPPOPTS +=	-DUSE_LARGEFILES
  CPPOPTS +=	-DUSE_ACL
@@ -51,7 +51,7 @@
  
  ###########################################################################
 --- star-1.5/star/star.mk.selinux	2005-08-28 07:22:30.000000000 -0400
-+++ star-1.5/star/star.mk	2005-11-08 16:36:57.000000000 -0500
++++ star-1.5/star/star.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -19,6 +19,7 @@
  CPPOPTS +=	-DUSE_XATTR
  CPPOPTS +=	-DUSE_FFLAGS
@@ -70,7 +70,7 @@
  
  ###########################################################################
 --- star-1.5/star/star_fat.mk.selinux	2005-11-01 15:53:51.000000000 -0500
-+++ star-1.5/star/star_fat.mk	2005-11-08 16:36:57.000000000 -0500
++++ star-1.5/star/star_fat.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -28,6 +28,7 @@
  CPPOPTS +=	-DUSE_FFLAGS
  CPPOPTS +=	-DCOPY_LINKS_DELAYED
@@ -89,7 +89,7 @@
  		spaxman.mk suntarman.mk Makefile.dfl
  
 --- star-1.5/star/Makefile.selinux	2005-11-01 15:53:51.000000000 -0500
-+++ star-1.5/star/Makefile	2005-11-08 16:36:57.000000000 -0500
++++ star-1.5/star/Makefile	2006-02-22 10:10:09.000000000 -0500
 @@ -25,6 +25,7 @@
  CPPOPTS +=	-DUSE_FIND
  CPPOPTS +=	-DUSE_ACL
@@ -107,9 +107,9 @@
  XMK_FILE=	Makefile.man starformatman.mk scpioman.mk gnutarman.mk \
  		spaxman.mk suntarman.mk Makefile.dfl
  
---- star-1.5/star/star.c.selinux	2005-11-01 17:15:05.000000000 -0500
-+++ star-1.5/star/star.c	2005-11-08 16:36:57.000000000 -0500
-@@ -44,6 +44,10 @@
+--- star-1.5/star/star.c.selinux	2006-02-18 14:09:39.000000000 -0500
++++ star-1.5/star/star.c	2006-02-22 10:10:09.000000000 -0500
+@@ -42,6 +42,10 @@
  #include "starsubs.h"
  #include "checkerr.h"
  
@@ -120,7 +120,7 @@
  EXPORT	int	main		__PR((int ac, char **av));
  LOCAL	void	star_create	__PR((int ac, char *const *av));
  LOCAL	void	checkdumptype	__PR((GINFO *gp));
-@@ -374,6 +378,11 @@
+@@ -375,6 +379,11 @@
  			comerr("Panic cannot set back effective uid.\n");
  	}
  	my_uid = geteuid();
@@ -132,12 +132,13 @@
  	/*
  	 * WARNING: We now are no more able to open a new remote connection
  	 * unless we have been called by root.
---- star-1.5/star/extract.c.selinux	2005-11-08 16:35:01.000000000 -0500
-+++ star-1.5/star/extract.c	2005-11-08 16:41:18.000000000 -0500
-@@ -213,6 +213,16 @@
- 		if (prblockno)
- 			(void) tblocks();		/* set curblockno */
- 
+--- star-1.5/star/extract.c.selinux	2005-11-13 08:57:21.000000000 -0500
++++ star-1.5/star/extract.c	2006-02-22 10:14:45.000000000 -0500
+@@ -224,6 +224,17 @@
+ 			continue;
+ 		}
+ #endif
++
 +#ifdef WITH_SELINUX
 +                if (!to_stdout && selinux_enabled) {
 +                  if (setselinux(&finfo) == FALSE) {
@@ -151,8 +152,8 @@
  		if (finfo.f_flags & F_BAD_META) {
  			if (!void_bad(&finfo))
  				break;
---- star-1.5/star/cpio.mk.selinux	2005-02-09 18:31:56.000000000 -0500
-+++ star-1.5/star/cpio.mk	2005-11-08 16:36:57.000000000 -0500
+--- star-1.5/star/cpio.mk.selinux	2006-02-02 10:01:18.000000000 -0500
++++ star-1.5/star/cpio.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -18,6 +18,7 @@
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
@@ -170,8 +171,8 @@
  XMK_FILE=	scpioman.mk
  
  ###########################################################################
---- star-1.5/star/gnutar.mk.selinux	2005-02-09 18:31:56.000000000 -0500
-+++ star-1.5/star/gnutar.mk	2005-11-08 16:36:57.000000000 -0500
+--- star-1.5/star/gnutar.mk.selinux	2006-02-02 10:00:31.000000000 -0500
++++ star-1.5/star/gnutar.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -18,6 +18,7 @@
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
@@ -189,8 +190,8 @@
  XMK_FILE=	gnutarman.mk
  
  ###########################################################################
---- star-1.5/star/suntar.mk.selinux	2005-02-09 18:31:56.000000000 -0500
-+++ star-1.5/star/suntar.mk	2005-11-08 16:36:57.000000000 -0500
+--- star-1.5/star/suntar.mk.selinux	2006-02-02 10:00:31.000000000 -0500
++++ star-1.5/star/suntar.mk	2006-02-22 10:10:09.000000000 -0500
 @@ -18,6 +18,7 @@
  CPPOPTS +=	-DUSE_ACL
  CPPOPTS +=	-DUSE_XATTR
@@ -209,7 +210,7 @@
  
  ###########################################################################
 --- star-1.5/star/starsubs.h.selinux	2005-11-01 16:32:18.000000000 -0500
-+++ star-1.5/star/starsubs.h	2005-11-08 16:36:57.000000000 -0500
++++ star-1.5/star/starsubs.h	2006-02-22 10:10:09.000000000 -0500
 @@ -301,6 +301,11 @@
  extern	BOOL	get_xattr	__PR((register FINFO *info));
  extern	BOOL	set_xattr	__PR((register FINFO *info));
@@ -222,9 +223,9 @@
  #endif
  
  /*
---- star-1.5/star/xattr.c.selinux	2005-09-02 18:29:35.000000000 -0400
-+++ star-1.5/star/xattr.c	2005-11-08 16:36:57.000000000 -0500
-@@ -169,6 +169,29 @@
+--- star-1.5/star/xattr.c.selinux	2006-02-13 20:00:40.000000000 -0500
++++ star-1.5/star/xattr.c	2006-02-22 10:16:44.000000000 -0500
+@@ -181,6 +181,29 @@
  #endif  /* USE_XATTR */
  }
  
@@ -254,14 +255,14 @@
  /* ARGSUSED */
  EXPORT BOOL
  set_xattr(info)
-@@ -181,6 +204,10 @@
+@@ -194,6 +217,10 @@
  		return (TRUE);
  
  	for (xap = info->f_xattr; xap->name != NULL; xap++) {
 +#ifdef WITH_SELINUX
-+               if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
-+                 continue;
++		if (selinux_enabled && (strcmp(xap->name, "security.selinux") == 0))
++		  continue;
 +#endif
- 		if (setxattr(info->f_name, xap->name, xap->value,
+ 		if (lsetxattr(info->f_name, xap->name, xap->value,
  		    xap->value_len, 0) != 0) {
  			if (!errhidden(E_SETXATTR, info->f_name)) {


Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- star.spec	11 Feb 2006 05:43:55 -0000	1.21
+++ star.spec	22 Feb 2006 10:14:45 -0000	1.22
@@ -3,16 +3,14 @@
 %endif
 Summary:  An archiving tool with ACL support
 Name: star
-Version: 1.5a69
-Release: 1.2.1
+Version: 1.5a71
+Release: 1
+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
-Patch2: star-1.5-nofsync.patch
-Patch3: star-1.5-davej.patch
-Patch4: star-1.5-selinux.patch
-Patch5: star-1.5-defineULLONG.patch
+Patch2: star-1.5-selinux.patch
 
-License: CDDL 1.0
+License: CDDL
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libattr-devel libacl-devel libtool libselinux-devel autoconf213
@@ -24,20 +22,9 @@
 %prep
 %setup -q -n star-1.5
 %patch1 -p1 -b .newMake
-%patch2 -p1 -b .nofsync
-%patch3 -p1 -b .davej
 %if %{WITH_SELINUX}
-%patch4 -p1 -b .selinux
+%patch2 -p1 -b .selinux
 %endif
-%patch5 -p1 -b .defineULLONG
-
-for PLAT in x86_64 ppc64 s390 s390x; do
-	for AFILE in gcc cc; do
-		[ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
-		&& ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
-	done
-done
-cp -f /usr/share/libtool/config.sub conf/config.sub
 
 %build
 export COPTOPT="$RPM_OPT_FLAGS"
@@ -47,7 +34,8 @@
 # Disable fat binary
 (cd star; rm Makefile; cp all.mk Makefile)
 
-make %{?_smp_mflags} PARCH=%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
+#make %{?_smp_mflags} PARCH=%{_target_cpu} CPPOPTX="-DNO_FSYNC" \
+make %{?_smp_mflags} PARCH=%{_target_cpu} \
 	K_ARCH=%{_target_cpu} \
 	CONFFLAGS="%{_target_platform} --prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
@@ -91,7 +79,7 @@
 
 %files
 %defattr(-,root,root)
-%doc README AN* COPYING README.ACL README.crash README.largefiles README.linux
+%doc README AN* COPYING CDDL.Schily.txt README.ACL README.crash README.largefiles README.linux
 %doc README.otherbugs README.pattern README.posix-2001  README.SSPM
 %doc STARvsGNUTAR
 %doc STATUS.alpha TODO
@@ -102,11 +90,8 @@
 %{_mandir}/man1/spax.1*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.5a69-1.2.1
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.5a69-1.2
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Wed Feb 22 2006 Peter Vrabec <pvrabec at redhat.com> 1.5a71-1
+- upgrade
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt


--- star-1.5-davej.patch DELETED ---


--- star-1.5-defineULLONG.patch DELETED ---


--- star-1.5-nofsync.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 22 10:38:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 05:38:59 -0500
Subject: rpms/star/devel star.spec,1.22,1.23
Message-ID: <200602221038.k1MAcx2Y021634@cvs.devel.redhat.com>

Author: pvrabec

Update of /cvs/dist/rpms/star/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21399

Modified Files:
	star.spec 
Log Message:
fix spec for s390x



Index: star.spec
===================================================================
RCS file: /cvs/dist/rpms/star/devel/star.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- star.spec	22 Feb 2006 10:14:45 -0000	1.22
+++ star.spec	22 Feb 2006 10:38:56 -0000	1.23
@@ -26,6 +26,13 @@
 %patch2 -p1 -b .selinux
 %endif
 
+for PLAT in x86_64 ppc64 s390 s390x; do
+        for AFILE in gcc cc; do
+                [ ! -e RULES/${PLAT}-linux-${AFILE}.rul ] \
+                && ln -s i586-linux-${AFILE}.rul RULES/${PLAT}-linux-${AFILE}.rul
+        done
+done
+
 %build
 export COPTOPT="$RPM_OPT_FLAGS"
 export MAKEPROG=gmake



From fedora-cvs-commits at redhat.com  Wed Feb 22 11:26:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 06:26:21 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.11, 1.12
Message-ID: <200602221126.k1MBQLbv031975@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31946

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
more of the langfromlocale stuff

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   15 
 desktop/source/app/langselect.hxx                                    |    2 
 desktop/source/migration/wizard.cxx                                  |   19 
 framework/source/services/substitutepathvars.cxx                     |   93 +++
 framework/util/makefile.mk                                           |    1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs           |    8 
 registry/schema/org/openoffice/Office/Common.xcs                     |    0 
 sfx2/source/appl/sfxhelp.cxx                                         |   66 ++
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  248 +++++-----
 svx/source/dialog/optgdlg.hxx                                        |    4 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 
 tools/source/rc/resmgr.cxx                                           |   19 
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   24 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    8 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    4 
 30 files changed, 350 insertions(+), 189 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Feb 2006 14:47:01 -0000	1.11
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	22 Feb 2006 11:26:17 -0000	1.12
@@ -863,7 +863,7 @@
  IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
  {
  	DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-@@ -1778,7 +1778,9 @@
+@@ -1778,23 +1778,23 @@
      sal_Bool bCheck = pBox->IsChecked();
  	if ( &aAsianSupportCB == pBox )
  	{
@@ -874,7 +874,9 @@
          bCheck = ( bCheck && !bReadonly );
          aAsianLanguageFT.Enable( bCheck );
      	aAsianLanguageLB.Enable( bCheck );
-@@ -1788,7 +1790,9 @@
+         aAsianLanguageFI.Show(bReadonly);
+-        if( pBox->IsEnabled() )
+-            m_bOldAsian = bCheck;
  	}
  	else if ( &aCTLSupportCB == pBox )
  	{
@@ -885,6 +887,12 @@
          bCheck = ( bCheck && !bReadonly  );
          aComplexLanguageFT.Enable( bCheck );
      	aComplexLanguageLB.Enable( bCheck );
+         aComplexLanguageFI.Show(bReadonly);
+-        if( pBox->IsEnabled() )
+-            m_bOldCtl = bCheck;
+ 	}
+ 	else
+ 	{
 Index: optgdlg.hxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/dialog/optgdlg.hxx,v



From fedora-cvs-commits at redhat.com  Wed Feb 22 13:04:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 08:04:07 -0500
Subject: rpms/sane-backends/devel sane-backends.spec,1.52,1.53
Message-ID: <200602221304.k1MD47Q9030038@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29987

Modified Files:
	sane-backends.spec 
Log Message:
split off generated documentation into separate subpackage to avoid conflicts on multilib systems



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sane-backends.spec	11 Feb 2006 05:38:33 -0000	1.52
+++ sane-backends.spec	22 Feb 2006 13:03:33 -0000	1.53
@@ -4,7 +4,7 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 3.2
+Release: 4
 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
@@ -51,6 +51,13 @@
 (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
+
+%description
+Additional documentation for SANE, a universal scanner interface.
+
 %prep
 %setup -q
 
@@ -122,6 +129,12 @@
 %{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
 %{_docdir}/*
+%exclude %{_docdir}/sane-backends.html
+%exclude %{_docdir}/sane-backends-external.html
+%exclude %{_docdir}/sane-mfgs.html
+%exclude %{_docdir}/sane-mfgs-external.html
+%exclude %{_docdir}/sane.dvi
+%exclude %{_docdir}/sane.ps
 
 %files devel
 %defattr(-,root,root)
@@ -132,7 +145,20 @@
 %{_libdir}/sane/*.la
 %{_libdir}/sane/*.so
 
+%files docs
+%defattr(-, root, root)
+%{_docdir}/sane-backends.html
+%{_docdir}/sane-backends-external.html
+%{_docdir}/sane-mfgs.html
+%{_docdir}/sane-mfgs-external.html
+%{_docdir}/sane.dvi
+%{_docdir}/sane.ps
+
 %changelog
+* Thu Feb 22 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.17-4
+- split off generated documentation into separate subpackage to avoid conflicts
+  on multilib systems
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.17-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 13:06:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 08:06:06 -0500
Subject: rpms/sane-backends/devel sane-backends.spec,1.53,1.54
Message-ID: <200602221306.k1MD66Cx030158@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30132

Modified Files:
	sane-backends.spec 
Log Message:
label docs description as such



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sane-backends.spec	22 Feb 2006 13:03:33 -0000	1.53
+++ sane-backends.spec	22 Feb 2006 13:06:02 -0000	1.54
@@ -55,7 +55,7 @@
 Summary: Additional documentation for SANE
 Group: Documentation
 
-%description
+%description docs
 Additional documentation for SANE, a universal scanner interface.
 
 %prep



From fedora-cvs-commits at redhat.com  Wed Feb 22 13:17:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 08:17:06 -0500
Subject: rpms/sane-backends/devel sane-backends.spec,1.54,1.55
Message-ID: <200602221317.k1MDH6jk014519@cvs.devel.redhat.com>

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14407

Modified Files:
	sane-backends.spec 
Log Message:
fix paths in docs subpackage



Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sane-backends.spec	22 Feb 2006 13:06:02 -0000	1.54
+++ sane-backends.spec	22 Feb 2006 13:17:03 -0000	1.55
@@ -129,12 +129,12 @@
 %{_mandir}/*/*
 %{_datadir}/pixmaps/sane.png
 %{_docdir}/*
-%exclude %{_docdir}/sane-backends.html
-%exclude %{_docdir}/sane-backends-external.html
-%exclude %{_docdir}/sane-mfgs.html
-%exclude %{_docdir}/sane-mfgs-external.html
-%exclude %{_docdir}/sane.dvi
-%exclude %{_docdir}/sane.ps
+%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
 
 %files devel
 %defattr(-,root,root)
@@ -147,12 +147,12 @@
 
 %files docs
 %defattr(-, root, root)
-%{_docdir}/sane-backends.html
-%{_docdir}/sane-backends-external.html
-%{_docdir}/sane-mfgs.html
-%{_docdir}/sane-mfgs-external.html
-%{_docdir}/sane.dvi
-%{_docdir}/sane.ps
+%{_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
 
 %changelog
 * Thu Feb 22 2006 Nils Philippsen <nphilipp at redhat.com> - 1.0.17-4



From fedora-cvs-commits at redhat.com  Wed Feb 22 13:58:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 08:58:34 -0500
Subject: rpms/beagle/devel beagle.spec,1.31,1.32
Message-ID: <200602221358.k1MDwYYU003827@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3741

Modified Files:
	beagle.spec 
Log Message:
fix %%post for 64bit arches



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- beagle.spec	21 Feb 2006 20:06:07 -0000	1.31
+++ beagle.spec	22 Feb 2006 13:58:31 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        8
+Release:        9
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -144,7 +144,7 @@
   latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
   cd /usr/lib/firefox-$latest/extensions
   mkdir beagle-extension
-  unzip -q -d beagle-extension /usr/lib/beagle/beagle.xpi
+  unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
   id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
   if [ -e "$id" ]; then
     rm -rf beagle-extension
@@ -159,9 +159,14 @@
 %triggerin -- firefox
 # install the firefox extension
 latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-cd /usr/lib/firefox-$latest/extensions
+if [  -d /usr/lib64  ]; then
+  libdir=/usr/lib64
+else
+  libdir=/usr/lib
+fi
+cd $libdir/firefox-$latest/extensions
 mkdir beagle-extension
-unzip -q -d beagle-extension /usr/lib/beagle/beagle.xpi
+unzip -q -d beagle-extension $libdir/beagle/beagle.xpi
 id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
 if [ -e "$id" ]; then
   rm -rf beagle-extension
@@ -202,6 +207,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-9
+- Fix %%post for 64bit arches
+
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-8
 - Autostart beagled by default
 - Use anacron



From fedora-cvs-commits at redhat.com  Wed Feb 22 14:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 09:17:36 -0500
Subject: rpms/openoffice.org/devel .cvsignore, 1.97, 1.98 openoffice.org.spec,
	1.626, 1.627 sources, 1.155, 1.156 workspace.evo2fixes.patch,
	1.1, 1.2 openoffice.org-2.0.2.ooo62138.extensions.patch, 1.2,
	NONE openoffice.org-2.0.2.ooo62318.extensions.mozab.patch, 1.1, NONE
Message-ID: <200602221417.k1MEHaqQ015652@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15532

Modified Files:
	.cvsignore openoffice.org.spec sources 
	workspace.evo2fixes.patch 
Removed Files:
	openoffice.org-2.0.2.ooo62138.extensions.patch 
	openoffice.org-2.0.2.ooo62318.extensions.mozab.patch 
Log Message:
next version


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	20 Feb 2006 11:43:43 -0000	1.97
+++ .cvsignore	22 Feb 2006 14:17:33 -0000	1.98
@@ -158,3 +158,4 @@
 Tigert-templates.tar.gz
 OOB680_m1.tar.bz2
 OOB680_m2.tar.bz2
+OOB680_m3.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- openoffice.org.spec	21 Feb 2006 14:07:34 -0000	1.626
+++ openoffice.org.spec	22 Feb 2006 14:17:33 -0000	1.627
@@ -1,5 +1,5 @@
 %define oootag OOB680
-%define ooomilestone 2
+%define ooomilestone 3
 %define rh_rpm_release 1
 
 %define build_fc5 1
@@ -175,38 +175,35 @@
 Patch6:  openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
 Patch7:  openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
 Patch8:  openoffice.org-2.0.1.rhXXXXX.extensions.defaulttoevo2.patch
-Patch9:  openoffice.org-2.0.2.ooo62138.extensions.patch
-Patch10: openoffice.org-2.0.2.ooo34909.dbaccess.patch
-Patch11: workspace.evo2fixes.patch
-Patch12: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch13: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch14: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch15: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch16: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch18: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch20: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch21: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch22: workspace.dmake43p01.patch
-Patch23: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch24: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch25: workspace.atkbridge.patch
-Patch26: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
-Patch27: workspace.jaxpapi.patch
-Patch28: workspace.systemjava.patch
-Patch29: workspace.targetedaot.patch
-Patch30: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
-Patch31: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch32: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
-Patch33: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
-Patch34: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
-Patch35: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
-Patch36: openoffice.org-2.0.2.ooo61875.sd.compile.patch
-Patch37: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
-Patch38: openoffice.org-2.0.2.ooo62030.solenv._version.patch
-Patch39: openoffice.org-2.0.2.ooo62318.extensions.mozab.patch
-Patch40: openoffice.org-2.0.2-rhXXXXXX.solenv.gcjproblem.patch
+Patch9:  openoffice.org-2.0.2.ooo34909.dbaccess.patch
+Patch10: workspace.evo2fixes.patch
+Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch14: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch15: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch16: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch17: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch20: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch21: workspace.dmake43p01.patch
+Patch22: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch23: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch24: workspace.atkbridge.patch
+Patch25: openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch
+Patch26: workspace.jaxpapi.patch
+Patch27: workspace.systemjava.patch
+Patch28: workspace.targetedaot.patch
+Patch29: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
+Patch30: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch31: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
+Patch32: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
+Patch33: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
+Patch34: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch35: openoffice.org-2.0.2.ooo61875.sd.compile.patch
+Patch36: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
+Patch37: openoffice.org-2.0.2.ooo62030.solenv._version.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -830,45 +827,42 @@
 %endif
 %patch7  -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
 %patch8  -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch
-%patch9  -p1 -b .ooo62138.extensions.patch
-%patch10 -p1 -b .ooo34909.dbaccess.patch
-%patch11 -p1 -b .workspace.evo2fixes.patch
-%patch12  -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch13 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch14 -p1 -b .ooo54603.fontconfig.patch
-%patch15 -p1 -b .ooo51931.systemxmlsec.patch
-%patch16 -p1 -b .ooo52428.execshield.bridges.patch
+%patch9  -p1 -b .ooo34909.dbaccess.patch
+%patch10 -p1 -b .workspace.evo2fixes.patch
+%patch11  -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch13 -p1 -b .ooo54603.fontconfig.patch
+%patch14 -p1 -b .ooo51931.systemxmlsec.patch
+%patch15 -p1 -b .ooo52428.execshield.bridges.patch
 %if ! %{internaljavabits}
-%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch16 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
 %else
-%patch18 -p1 -b .ooo51718.rpath.patch
+%patch17 -p1 -b .ooo51718.rpath.patch
 %endif
-%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch20 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch21 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch22 -p1 -b .dmake43p01.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch20 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch21 -p1 -b .dmake43p01.patch
 %if ! %{internalicu}
-%patch23 -p1 -b .ooo54479.systemicu.patch
+%patch22 -p1 -b .ooo54479.systemicu.patch
 %endif
-%patch24 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch25 -p0 -b .workspace.atkbridge.patch
-%patch26 -p1 -b .ooo56651.sw.rtfcrash.patch
-%patch27 -p0 -b .workspace.jaxpapi.patch
-%patch28 -p1 -b .workspace.systemjava.patch
-%patch29 -p1 -b .workspace.targetedaot.patch
-%patch30 -p1 -b .ooo58663.vcl.missingglyph.patch
-%patch31 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch23 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch24 -p0 -b .workspace.atkbridge.patch
+%patch25 -p1 -b .ooo56651.sw.rtfcrash.patch
+%patch26 -p0 -b .workspace.jaxpapi.patch
+%patch27 -p1 -b .workspace.systemjava.patch
+%patch28 -p1 -b .workspace.targetedaot.patch
+%patch29 -p1 -b .ooo58663.vcl.missingglyph.patch
+%patch30 -p1 -b .ooo58606.sw.pre-edit.patch
 %if %{build_fc4}
-%patch32 -p1 -b .gcc25199.bitfieldaccess.patch
+%patch31 -p1 -b .gcc25199.bitfieldaccess.patch
 %endif
-%patch33 -p1 -b .ooo59675.sysui.rtfmimetype.patch
-%patch34 -p1 -b .ooo59997.sw.defaultbullets.patch
-%patch35 -p1 -b .ooo19976.framework.nofocussteal.patch
-%patch36 -p1 -b .ooo61875.sd.compile.patch
-%patch37 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
-%patch38 -p1 -b .ooo62030.solenv._version.patch
-%patch39 -p1 -b .ooo62318.extensions.mozab.patch
-%patch40 -p1 -b .rhXXXXXX.solenv.gcjproblem.patch
+%patch32 -p1 -b .ooo59675.sysui.rtfmimetype.patch
+%patch33 -p1 -b .ooo59997.sw.defaultbullets.patch
+%patch34 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch35 -p1 -b .ooo61875.sd.compile.patch
+%patch36 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
+%patch37 -p1 -b .ooo62030.solenv._version.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -963,14 +957,16 @@
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed
 cd transex3/prj
-build --dlv_switch -link --all -P$MAXBUILDS -- -s
+#build --dlv_switch -link --all -P$MAXBUILDS -- -s
+build --dlv_switch -link --all -P$MAXBUILDS
 deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
 cd ../..
 
 cd instsetoo_native/util
-if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
+# if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
+if ! build --dlv_switch -link --all -P$MAXBUILDS; then
     echo parallel build failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
     unset MAXPROCESS
     build --dlv_switch -link --all
@@ -3358,7 +3354,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-2.1
+* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-3.1
 - hunspell replaces myspell
 - Catalan help documentation available
 - add sestatus details to crash_reporter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- sources	20 Feb 2006 11:43:44 -0000	1.155
+++ sources	22 Feb 2006 14:17:33 -0000	1.156
@@ -9,4 +9,4 @@
 fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
 0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh
 0fc9c0b585e2c92a7ac05adebeb4caf2  GSI_ga.sdf
-fe9bcbc54e3b23ba1c28a418c696f2b2  OOB680_m2.tar.bz2
+63c2dea9645122cfdc4532df4edda03f  OOB680_m3.tar.bz2

workspace.evo2fixes.patch:
 extensions/source/abpilot/abpresid.hrc                                   |    0 
 extensions/source/abpilot/abspilot.cxx                                   |    0 
 extensions/source/abpilot/abspilot.src                                   |    0 
 extensions/source/abpilot/addresssettings.hxx                            |    0 
 extensions/source/abpilot/datasourcehandling.cxx                         |    0 
 extensions/source/abpilot/datasourcehandling.hxx                         |    0 
 extensions/source/abpilot/makefile.mk                                    |    4 
 extensions/source/abpilot/typeselectionpage.cxx                          |    0 
 extensions/source/abpilot/typeselectionpage.hxx                          |    0 
 openoffice.org/connectivity/source/drivers/evoab2/EApi.cxx               |   21 -
 openoffice.org/connectivity/source/drivers/evoab2/EApi.h                 |  135 ++----
 openoffice.org/connectivity/source/drivers/evoab2/NCatalog.cxx           |   26 +
 openoffice.org/connectivity/source/drivers/evoab2/NCatalog.hxx           |    5 
 openoffice.org/connectivity/source/drivers/evoab2/NColumns.cxx           |  106 +++++
 openoffice.org/connectivity/source/drivers/evoab2/NColumns.hxx           |   73 +++
 openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx  |   86 +++-
 openoffice.org/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx  |   28 +
 openoffice.org/connectivity/source/drivers/evoab2/NPreparedStatement.cxx |    5 
 openoffice.org/connectivity/source/drivers/evoab2/NResultSet.cxx         |  194 +++++++++-
 openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx |   41 +-
 openoffice.org/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx |   11 
 openoffice.org/connectivity/source/drivers/evoab2/NStatement.cxx         |   33 +
 openoffice.org/connectivity/source/drivers/evoab2/NTable.cxx             |  108 +++++
 openoffice.org/connectivity/source/drivers/evoab2/NTable.hxx             |   84 ++++
 openoffice.org/connectivity/source/drivers/evoab2/NTables.cxx            |   17 
 openoffice.org/connectivity/source/drivers/evoab2/makefile.mk            |    2 
 openoffice.org/extensions/source/abpilot/abpresid.hrc                    |    2 
 openoffice.org/extensions/source/abpilot/abspilot.cxx                    |   15 
 openoffice.org/extensions/source/abpilot/abspilot.src                    |   17 
 openoffice.org/extensions/source/abpilot/addresssettings.hxx             |    2 
 openoffice.org/extensions/source/abpilot/datasourcehandling.cxx          |   12 
 openoffice.org/extensions/source/abpilot/datasourcehandling.hxx          |    8 
 openoffice.org/extensions/source/abpilot/typeselectionpage.cxx           |  173 +++-----
 openoffice.org/extensions/source/abpilot/typeselectionpage.hxx           |   18 
 source/abpilot/makefile.mk                                               |    0 
 35 files changed, 966 insertions(+), 260 deletions(-)

Index: workspace.evo2fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.evo2fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.evo2fixes.patch	16 Feb 2006 14:33:08 -0000	1.1
+++ workspace.evo2fixes.patch	22 Feb 2006 14:17:33 -0000	1.2
@@ -1557,3 +1557,456 @@
  	$(SLO)$/NTables.obj \
  	$(SLO)$/NCatalog.obj \
  	$(SLO)$/NConnection.obj \
+Index: source/abpilot/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- openoffice.org.orig/extensions/source/abpilot/makefile.mk	19 Dec 2005 17:27:56 -0000	1.9
++++ openoffice.org/extensions/source/abpilot/makefile.mk	20 Feb 2006 11:35:26 -0000
+@@ -69,8 +69,10 @@
+ 		$(EXCEPTIONSFILES)
+ 
+ 
+-.IF "WITH_MOZILLA" != ""
++.IF "$(WITH_MOZILLA)" != "NO"
++.IF "$(SYSTEM_MOZILLA)" != "YES"
+ CDEFS+=-DWITH_MOZILLA
++.ENDIF
+ .ENDIF
+ 
+ SRS1NAME=$(TARGET)
+Index: extensions/source/abpilot/abpresid.hrc
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abpresid.hrc,v
+retrieving revision 1.10
+diff -u -p -u -r1.10 abpresid.hrc
+--- openoffice.org/extensions/source/abpilot/abpresid.hrc	19 Dec 2005 17:26:07 -0000	1.10
++++ openoffice.org/extensions/source/abpilot/abpresid.hrc	16 Feb 2006 12:45:37 -0000
+@@ -174,6 +174,8 @@
+ #define RB_OUTLOOK				6
+ #define RB_OUTLOOKEXPRESS		7
+ #define RB_OTHER				8
++#define RB_EVOLUTION_GROUPWISE  9
++#define RB_EVOLUTION_LDAP		10
+ 
+ //........................................................................
+ #define ET_DATASOURCENAME		1
+Index: extensions/source/abpilot/abspilot.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.cxx,v
+retrieving revision 1.13
+diff -u -p -u -r1.13 abspilot.cxx
+--- openoffice.org/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
++++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
+@@ -151,12 +151,9 @@ namespace abp
+ 		m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
+ 
+ 		// some initial settings
+-#ifdef WITH_MOZILLA
+ #ifdef UNX
+-		m_aSettings.eType = AST_MORK;
+-#else
+-		m_aSettings.eType = AST_OE;
+-#endif
++// FIXME: if KDE use KAB instead
++		m_aSettings.eType = AST_EVOLUTION;
+ #else
+ 		m_aSettings.eType = AST_OTHER;
+ #endif
+@@ -410,6 +407,14 @@ namespace abp
+ 				m_aNewDataSource = aContext.createNewEvolution( m_aSettings.sDataSourceName );
+ 				break;
+ 
++			case AST_EVOLUTION_GROUPWISE:
++				m_aNewDataSource = aContext.createNewEvolutionGroupwise( m_aSettings.sDataSourceName );
++				break;
++
++			case AST_EVOLUTION_LDAP:
++				m_aNewDataSource = aContext.createNewEvolutionLdap( m_aSettings.sDataSourceName );
++				break;
++
+ 			case AST_KAB:
+ 				m_aNewDataSource = aContext.createNewKab( m_aSettings.sDataSourceName );
+ 				break;
+Index: extensions/source/abpilot/abspilot.src
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/abspilot.src,v
+retrieving revision 1.54
+diff -u -p -u -r1.54 abspilot.src
+--- openoffice.org/extensions/source/abpilot/abspilot.src	21 Dec 2005 18:07:05 -0000	1.54
++++ openoffice.org/extensions/source/abpilot/abspilot.src	16 Feb 2006 12:45:38 -0000
+@@ -129,6 +129,7 @@ TabPage RID_PAGE_SELECTABTYPE
+ 		Text [ de ] = "Mozilla / Netscape";
+ 		Text [ en-US ] = "Mozilla / Netscape";
+ 	};
++// All position & size/height data below this is not used
+ 	RadioButton RB_THUNDERBIRD
+ 	{
+ 		Pos		= MAP_APPFONT ( 15, 79 ) ;
+@@ -145,6 +146,22 @@ TabPage RID_PAGE_SELECTABTYPE
+ 		Text [ de ] = "Evolution";
+ 		Text [ en-US ] = "Evolution";
+ 	};
++	RadioButton RB_EVOLUTION_GROUPWISE
++ 	{
++ 		Pos		= MAP_APPFONT ( 15, 90 ) ;
++ 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++		Text [ de ] = "Groupwise";
++		Text [ en-US ] = "Groupwise";
++	};
++	RadioButton RB_EVOLUTION_LDAP
++ 	{
++ 		Pos		= MAP_APPFONT ( 15, 90 ) ;
++ 		Size	= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
++
++		Text [ de ] = "Evolution LDAP";
++		Text [ en-US ] = "Evolution LDAP";
++	};
+ 	RadioButton RB_KAB
+  	{
+  		Pos		= MAP_APPFONT ( 15, 101 ) ;
+Index: extensions/source/abpilot/addresssettings.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/addresssettings.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 addresssettings.hxx
+--- openoffice.org/extensions/source/abpilot/addresssettings.hxx	19 Dec 2005 17:27:17 -0000	1.7
++++ openoffice.org/extensions/source/abpilot/addresssettings.hxx	16 Feb 2006 12:45:38 -0000
+@@ -56,6 +56,8 @@ namespace abp
+ 		AST_MORK,
+         AST_THUNDERBIRD,
+ 		AST_EVOLUTION,
++		AST_EVOLUTION_GROUPWISE,
++		AST_EVOLUTION_LDAP,
+ 		AST_KAB,
+ 		AST_LDAP,
+ 		AST_OUTLOOK,
+Index: extensions/source/abpilot/datasourcehandling.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.cxx,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 datasourcehandling.cxx
+--- openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	19 Dec 2005 17:27:30 -0000	1.9
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.cxx	16 Feb 2006 12:45:38 -0000
+@@ -330,9 +330,19 @@ namespace abp
+ 	}
+ 
+ 	//---------------------------------------------------------------------
++	ODataSource	ODataSourceContext::createNewEvolutionLdap( const ::rtl::OUString& _rName) SAL_THROW (( ))
++	{
++		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
++	}
++	//---------------------------------------------------------------------
++	ODataSource	ODataSourceContext::createNewEvolutionGroupwise( const ::rtl::OUString& _rName) SAL_THROW (( ))
++	{
++		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
++	}
++	//---------------------------------------------------------------------
+ 	ODataSource	ODataSourceContext::createNewEvolution( const ::rtl::OUString& _rName) SAL_THROW (( ))
+ 	{
+-		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution" );
++		return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
+ 	}
+ 
+ 	//---------------------------------------------------------------------
+Index: extensions/source/abpilot/datasourcehandling.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/datasourcehandling.hxx,v
+retrieving revision 1.7
+diff -u -p -u -r1.7 datasourcehandling.hxx
+--- openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	19 Dec 2005 17:27:42 -0000	1.7
++++ openoffice.org/extensions/source/abpilot/datasourcehandling.hxx	16 Feb 2006 12:45:38 -0000
+@@ -89,9 +89,15 @@ namespace abp
+ 		/// creates a new Thunderbird data source
+ 		ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ 
+-		/// creates a new Evolution data source
++		/// creates a new Evolution local data source
+ 		ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ 
++		/// creates a new Evolution LDAP data source
++		ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
++
++		/// creates a new Evolution GROUPWISE data source
++		ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
++
+ 		/// creates a new KDE address book data source
+ 		ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+ 
+Index: extensions/source/abpilot/typeselectionpage.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.cxx,v
+retrieving revision 1.9
+diff -u -p -u -r1.9 typeselectionpage.cxx
+--- openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	19 Dec 2005 17:28:09 -0000	1.9
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.cxx	16 Feb 2006 12:45:38 -0000
+@@ -57,43 +57,6 @@ namespace abp
+ 	using namespace ::com::sun::star::uno;
+ 	using namespace ::com::sun::star::sdbc;
+ 
+-    //---------------------------------------------------------------------
+-    namespace
+-    {
+-        void lcl_hideChoice( ::std::vector< RadioButton* >& _allTypes, RadioButton& _typeToHide )
+-        {
+-            for (   ::std::vector< RadioButton* >::iterator loop = _allTypes.begin();
+-                    loop != _allTypes.end();
+-                    ++loop
+-                )
+-            {
+-                if ( *loop == &_typeToHide )
+-                {
+-                    // remove the element from the allTypes array
+-                    ::std::copy( loop + 1, _allTypes.end(), loop );
+-                    _allTypes.resize( _allTypes.size() - 1 );
+-
+-                    // hide the control in question
+-                    _typeToHide.Hide();
+-
+-                    // change position of all subsequent controls
+-                    if ( loop != _allTypes.end() )
+-                    {
+-                        sal_Int32 nMoveUp = (*loop)->GetPosPixel().Y() - _typeToHide.GetPosPixel().Y();
+-                        do
+-                        {
+-                            Point aPos = (*loop)->GetPosPixel();
+-                            aPos.Y() -= nMoveUp;
+-                            (*loop)->SetPosPixel( aPos );
+-                        }
+-                        while ( ++loop != _allTypes.end() );
+-                    }
+-                    break;
+-                }
+-            }
+-        }
+-    }
+-
+ 	//=====================================================================
+ 	//= TypeSelectionPage
+ 	//=====================================================================
+@@ -105,65 +68,73 @@ namespace abp
+ 		,m_aMORK			(this,	ResId(RB_MORK))
+ 		,m_aThunderbird     (this,  ResId(RB_THUNDERBIRD))
+ 		,m_aEvolution		(this,	ResId(RB_EVOLUTION))
++		,m_aEvolutionGroupwise (this,	ResId(RB_EVOLUTION_GROUPWISE))
++		,m_aEvolutionLdap	   (this,	ResId(RB_EVOLUTION_LDAP))
+ 		,m_aKab				(this,	ResId(RB_KAB))
+ 		,m_aLDAP			(this,	ResId(RB_LDAP))
+ 		,m_aOutlook			(this,	ResId(RB_OUTLOOK))
+ 		,m_aOE				(this,	ResId(RB_OUTLOOKEXPRESS))
+ 		,m_aOther			(this,	ResId(RB_OTHER))
+ 	{
++		Point aTopLeft;
++		Size  aItemSize;
++
+ 		FreeResource();
+ 
+-		::std::vector< RadioButton* > allTypes;
+-		    // must be sorted by ascending y-coordinate
+-		allTypes.push_back( &m_aMORK );
+-		allTypes.push_back( &m_aThunderbird );
+-		allTypes.push_back( &m_aEvolution );
+-		allTypes.push_back( &m_aKab );
+-		allTypes.push_back( &m_aLDAP );
+-		allTypes.push_back( &m_aOutlook );
+-		allTypes.push_back( &m_aOE );
+-		allTypes.push_back( &m_aOther );
++		aTopLeft = m_aMORK.GetPosPixel();
++		aItemSize = m_aMORK.GetSizePixel();
++
++		bool bWithMozilla = true, bUnx = true;
++		bool bHaveEvolution = true, bHaveKab = true;
+ 
+ #ifndef WITH_MOZILLA
+-		// the following 5 types are provided by the Mozilla-based database driver. If we're compiled without
+-		// without Mozilla support, then they're not available.
+-		lcl_hideChoice( allTypes, m_aMORK );
+-		lcl_hideChoice( allTypes, m_aThunderbird );
+-		lcl_hideChoice( allTypes, m_aLDAP );
+-		lcl_hideChoice( allTypes, m_aOutlook );
+-		lcl_hideChoice( allTypes, m_aOE );
++		bWithMozilla = false;
+ #endif
+-
+ #ifndef UNX
+-		// no Evolution nor KDE address book on Windows systems
+-		lcl_hideChoice( allTypes, m_aEvolution );
+-		lcl_hideChoice( allTypes, m_aKab );
+-#endif
+-
+-#ifdef UNX
+-		// no Outlook / Outlook Express for ~NIX systems
+-		lcl_hideChoice( allTypes, m_aOutlook );
+-		lcl_hideChoice( allTypes, m_aOE );
+-
++		bUnx = false;
++		bHaveEvolution = false;
++		bHaveKab = false;
++#else
+ 		Reference< XDriverAccess> xManager(_pParent->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.DriverManager"))), UNO_QUERY);
+ 
+ 		// check whether Evolution is available
+-		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution"))) );
++		Reference< XDriver > xDriver( xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:evolution:local"))) );
+ 		if ( !xDriver.is() )
+-		    lcl_hideChoice( allTypes, m_aEvolution );
++			bHaveEvolution = false;
+ 
+ 		// check whether KDE address book is available
+ 		xDriver = xManager->getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:kab")));
+ 		if ( !xDriver.is() )
+-		    lcl_hideChoice( allTypes, m_aKab );
++			bHaveKab = false;
+ #endif
+ 
++		// Items are displayed in list order
++		m_aAllTypes.push_back( ButtonItem( &m_aEvolution, AST_EVOLUTION, bHaveEvolution ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aEvolutionGroupwise, AST_EVOLUTION_GROUPWISE, bHaveEvolution ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aEvolutionLdap, AST_EVOLUTION_LDAP, bHaveEvolution ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aMORK, AST_MORK, bWithMozilla ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aThunderbird, AST_THUNDERBIRD, bWithMozilla ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aKab, AST_KAB, bHaveKab ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aLDAP, AST_LDAP, bWithMozilla ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aOutlook, AST_OUTLOOK, bWithMozilla && !bUnx ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aOE, AST_OE, bWithMozilla && !bUnx ) );
++		m_aAllTypes.push_back( ButtonItem( &m_aOther, AST_OTHER, true ) );
++
+ 		Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+-		for (   ::std::vector< RadioButton* >::const_iterator loop = allTypes.begin();
+-		        loop != allTypes.end();
+-		        ++loop
+-		    )
+-			(*loop)->SetClickHdl( aTypeSelectionHandler );
++		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++			  loop != m_aAllTypes.end(); ++loop )
++		{
++			ButtonItem aItem = *loop;
++			if (!aItem.m_bVisible)
++				aItem.m_pItem->Hide();
++			else
++			{
++				aItem.m_pItem->SetPosPixel( aTopLeft );
++				aTopLeft.Y() += (aItemSize.Height() * 5) / 4;
++				aItem.m_pItem->SetClickHdl( aTypeSelectionHandler );
++				aItem.m_pItem->Show();
++			}
++		}
+ 	}
+ 
+ 	//---------------------------------------------------------------------
+@@ -171,15 +145,16 @@ namespace abp
+ 	{
+ 		AddressBookSourcePage::ActivatePage();
+ 
+-        RadioButton* pOptions[] = {
+-            &m_aMORK, &m_aThunderbird, &m_aEvolution, &m_aKab, &m_aLDAP, &m_aOutlook, &m_aOE, &m_aOther, NULL
+-        };
+-        for ( RadioButton** pCheck = pOptions; *pCheck; ++pCheck )
+-            if ( (*pCheck)->IsChecked() )
+-            {
+-                (*pCheck)->GrabFocus();
++		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++			  loop != m_aAllTypes.end(); ++loop )
++		{
++			ButtonItem aItem = (*loop);
++			if( aItem.m_pItem->IsChecked() && aItem.m_bVisible )
++			{
++				aItem.m_pItem->GrabFocus();
+                 break;
+             }
++		}
+ 
+         getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
+ 	}
+@@ -194,35 +169,24 @@ namespace abp
+ 	//---------------------------------------------------------------------
+ 	void TypeSelectionPage::selectType( AddressSourceType _eType )
+ 	{
+-		m_aMORK.Check(AST_MORK == _eType);
+-		m_aThunderbird.Check(AST_THUNDERBIRD == _eType);
+-		m_aEvolution.Check(AST_EVOLUTION == _eType);
+-		m_aKab.Check(AST_KAB == _eType);
+-		m_aLDAP.Check(AST_LDAP == _eType);
+-		m_aOutlook.Check(AST_OUTLOOK == _eType);
+-		m_aOE.Check(AST_OE == _eType);
+-		m_aOther.Check(AST_OTHER == _eType);
++		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++			  loop != m_aAllTypes.end(); ++loop )
++		{
++			ButtonItem aItem = (*loop);
++			aItem.m_pItem->Check( _eType == aItem.m_eType );
++		}
+ 	}
+ 
+ 	//---------------------------------------------------------------------
+-	AddressSourceType TypeSelectionPage::getSelectedType( )
+-	{
+-		if (m_aMORK.IsChecked())
+-			return AST_MORK;
+-		else if (m_aThunderbird.IsChecked())
+-			return AST_THUNDERBIRD;
+-		else if (m_aEvolution.IsChecked())
+-			return AST_EVOLUTION;
+-		else if (m_aKab.IsChecked())
+-			return AST_KAB;
+-		else if (m_aLDAP.IsChecked())
+-			return AST_LDAP;
+-		else if (m_aOutlook.IsChecked())
+-			return AST_OUTLOOK;
+-		else if (m_aOE.IsChecked())
+-			return AST_OE;
+-		else if (m_aOther.IsChecked())
+-			return AST_OTHER;
++	AddressSourceType TypeSelectionPage::getSelectedType()
++	{
++		for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
++			  loop != m_aAllTypes.end(); ++loop )
++		{
++			ButtonItem aItem = (*loop);
++			if ( aItem.m_pItem->IsChecked() )
++				return aItem.m_eType;
++		}
+ 
+ 		return AST_INVALID;
+ 	}
+Index: extensions/source/abpilot/typeselectionpage.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/abpilot/typeselectionpage.hxx,v
+retrieving revision 1.8
+diff -u -p -u -r1.8 typeselectionpage.hxx
+--- openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	19 Dec 2005 17:28:44 -0000	1.8
++++ openoffice.org/extensions/source/abpilot/typeselectionpage.hxx	16 Feb 2006 12:45:38 -0000
+@@ -61,6 +61,8 @@ namespace abp
+ 		FixedLine		m_aTypeSep;
+ 		RadioButton		m_aMORK;
+ 		RadioButton		m_aThunderbird;
++		RadioButton		m_aEvolutionGroupwise;
++		RadioButton		m_aEvolutionLdap;
+ 		RadioButton		m_aEvolution;
+ 		RadioButton		m_aKab;
+ 		RadioButton		m_aLDAP;
+@@ -68,6 +70,22 @@ namespace abp
+ 		RadioButton		m_aOE;
+ 		RadioButton		m_aOther;
+ 
++		struct ButtonItem {
++			RadioButton *m_pItem;
++			AddressSourceType m_eType;
++			bool         m_bVisible;
++
++			ButtonItem( RadioButton *pItem,
++						AddressSourceType eType,
++						bool         bVisible ) :
++					m_pItem( pItem ),
++					m_eType( eType ),
++					m_bVisible( bVisible )
++			{}
++		};
++
++		::std::vector< ButtonItem > m_aAllTypes;
++
+ 	public:
+ 		TypeSelectionPage( OAddessBookSourcePilot* _pParent );
+ 


--- openoffice.org-2.0.2.ooo62138.extensions.patch DELETED ---


--- openoffice.org-2.0.2.ooo62318.extensions.mozab.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 22 14:29:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 09:29:45 -0500
Subject: rpms/tzdata/devel .cvsignore, 1.20, 1.21 sources, 1.22,
	1.23 tzdata.spec, 1.26, 1.27
Message-ID: <200602221429.k1METjBg025710@cvs.devel.redhat.com>

Author: pmachata

Update of /cvs/dist/rpms/tzdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25656

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
- Upstream 2006b:
  - using tz64code version, as 32 is legacy according to tzdata ML
  - new manual pages for ctime, strftime, tzset
  - some source code reorganizations
  - no timezone/dst rule updates



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	9 Feb 2006 13:19:31 -0000	1.20
+++ .cvsignore	22 Feb 2006 14:29:38 -0000	1.21
@@ -1,3 +1,3 @@
-tzdata2006a-2-base.tar.bz2
-tzdata2006a.tar.gz
-tzcode2006a.tar.gz
+tzdata2006b-1-base.tar.bz2
+tzdata2006b.tar.gz
+tz64code2006b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	9 Feb 2006 13:19:31 -0000	1.22
+++ sources	22 Feb 2006 14:29:41 -0000	1.23
@@ -1,3 +1,3 @@
-906a4c98cc5240f416524a256b039c42  tzdata2006a-2-base.tar.bz2
-69e6b498bf4b8d66568fa9a7816b6321  tzdata2006a.tar.gz
-00c545c57ce1bbfbc550eb21244cf57b  tzcode2006a.tar.gz
+906a4c98cc5240f416524a256b039c42  tzdata2006b-1-base.tar.bz2
+244523d10f93f392d96da4ef11b6cdd7  tzdata2006b.tar.gz
+37524ee1c072a51511a6c220f8faf95f  tz64code2006b.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tzdata.spec	9 Feb 2006 13:19:31 -0000	1.26
+++ tzdata.spec	22 Feb 2006 14:29:41 -0000	1.27
@@ -1,16 +1,16 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006a
-Release: 2
+Version: 2006b
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: tzdata%{version}-%{release}-base.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
-Buildroot: /var/tmp/tzdata-root
+Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
+Buildroot: %{_tmppath}/%{name}-root
 
 %description
 This package contains data files with rules for various timezones around
@@ -46,6 +46,13 @@
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Feb 22 2006 Petr Machata <pmachata at redhat.com> 2006b-1
+- Upstream 2006b:
+  - using tz64code version, as 32 is legacy according to tzdata ML
+  - new manual pages for ctime, strftime, tzset
+  - some source code reorganizations
+  - no timezone/dst rule updates
+
 * Thu Feb 02 2006 Petr Machata <pmachata at redhat.com> 2006a-2
 - Small changes in tst-timezone.c
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 14:37:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 09:37:12 -0500
Subject: rpms/beagle/devel beagle.spec,1.32,1.33
Message-ID: <200602221437.k1MEbCVE027241@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27162

Modified Files:
	beagle.spec 
Log Message:
incomplete fix



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- beagle.spec	22 Feb 2006 13:58:31 -0000	1.32
+++ beagle.spec	22 Feb 2006 14:37:10 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        9
+Release:        10
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -142,7 +142,7 @@
 # install the firefox extension
 # note that this code is duplicated below in a trigger
   latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-  cd /usr/lib/firefox-$latest/extensions
+  cd %{_libdir}/firefox-$latest/extensions
   mkdir beagle-extension
   unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
   id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
@@ -159,7 +159,7 @@
 %triggerin -- firefox
 # install the firefox extension
 latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-if [  -d /usr/lib64  ]; then
+if [ -d /usr/lib64  ]; then
   libdir=/usr/lib64
 else
   libdir=/usr/lib
@@ -207,7 +207,7 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
-* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-9
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-10
 - Fix %%post for 64bit arches
 
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-8



From fedora-cvs-commits at redhat.com  Wed Feb 22 15:23:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 10:23:28 -0500
Subject: rpms/gail/devel .cvsignore, 1.17, 1.18 gail.spec, 1.37, 1.38 sources,
	1.17, 1.18
Message-ID: <200602221523.k1MFNSXg003964@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3899

Modified Files:
	.cvsignore gail.spec sources 
Log Message:
1.8.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	13 Feb 2006 20:10:05 -0000	1.17
+++ .cvsignore	22 Feb 2006 15:23:24 -0000	1.18
@@ -6,3 +6,4 @@
 gail-1.8.5.tar.bz2
 gail-1.8.8.tar.bz2
 gail-1.8.9.tar.bz2
+gail-1.8.10.tar.bz2


Index: gail.spec
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gail.spec	13 Feb 2006 20:32:47 -0000	1.37
+++ gail.spec	22 Feb 2006 15:23:24 -0000	1.38
@@ -4,7 +4,7 @@
 
 Summary: Accessibility implementation for GTK+ and GNOME libraries
 Name: gail
-Version: 1.8.9
+Version: 1.8.10
 Release: 1
 URL: http://developer.gnome.org/projects/gap
 Source0: %{name}-%{version}.tar.bz2
@@ -20,7 +20,6 @@
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-BuildRequires: gtk-doc
 
 Patch0: gail-1.8.8-combobox-name.patch
 
@@ -52,7 +51,7 @@
 automake
 autoconf
 autoheader
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 
 make ##%{?_smp_mflags}
 
@@ -87,6 +86,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.10-1
+- Update to 1.8.10
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 1.8.9-1
 - Update to 1.8.9
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gail/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	13 Feb 2006 20:10:05 -0000	1.17
+++ sources	22 Feb 2006 15:23:24 -0000	1.18
@@ -1 +1 @@
-24c7313ed474806e720adfd7c234ee8d  gail-1.8.9.tar.bz2
+f7dbebcda98a5eb0cc22074b56a62d29  gail-1.8.10.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 22 15:27:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 10:27:39 -0500
Subject: rpms/tftp/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 tftp.spec,
	1.28, 1.29
Message-ID: <200602221527.k1MFRd0F006117@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6068

Modified Files:
	.cvsignore sources tftp.spec 
Log Message:
 upgrade to 0.42


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 Nov 2005 10:26:59 -0000	1.14
+++ .cvsignore	22 Feb 2006 15:27:37 -0000	1.15
@@ -1 +1 @@
-tftp-hpa-0.41.tar.bz2
+tftp-hpa-0.42.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Nov 2005 10:26:59 -0000	1.14
+++ sources	22 Feb 2006 15:27:37 -0000	1.15
@@ -1 +1 @@
-db286f988b040ba3e2e83e5df9f8ef38  tftp-hpa-0.41.tar.bz2
+98ecf77f8558b4f562794f71e29fed86  tftp-hpa-0.42.tar.gz


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tftp.spec	11 Feb 2006 05:51:32 -0000	1.28
+++ tftp.spec	22 Feb 2006 15:27:37 -0000	1.29
@@ -1,9 +1,9 @@
-%define tftp_hpa_version 0.41
+%define tftp_hpa_version 0.42
 
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 1.2.1
+Release: 1
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2
@@ -76,6 +76,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Feb 22 2006 Radek Vok??l <rvokal at redhat.com> 0.42-1
+- upgrade to 0.42
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.41-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 15:43:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 10:43:01 -0500
Subject: rpms/tftp/devel tftp.spec,1.29,1.30
Message-ID: <200602221543.k1MFh1H9002425@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/tftp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2412

Modified Files:
	tftp.spec 
Log Message:
wrong source


Index: tftp.spec
===================================================================
RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tftp.spec	22 Feb 2006 15:27:37 -0000	1.29
+++ tftp.spec	22 Feb 2006 15:42:59 -0000	1.30
@@ -6,7 +6,7 @@
 Release: 1
 License: BSD
 Group: Applications/Internet
-Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2
+Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
 Patch0: tftp-0.40-remap.patch
 BuildPreReq: tcp_wrappers
 BuildRoot: %{_tmppath}/%{name}-root



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:02:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:02:45 -0500
Subject: rpms/pyxf86config/devel .cvsignore, 1.13, 1.14 pyxf86config.spec,
	1.24, 1.25 sources, 1.13, 1.14
Message-ID: <200602221602.k1MG2j31025774@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pyxf86config/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25726

Modified Files:
	.cvsignore pyxf86config.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Jan 2006 06:34:13 -0000	1.13
+++ .cvsignore	22 Feb 2006 16:02:26 -0000	1.14
@@ -1,2 +1,3 @@
 pyxf86config-0.3.22.tar.gz
 pyxf86config-0.3.23.tar.gz
+pyxf86config-0.3.24.tar.gz


Index: pyxf86config.spec
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pyxf86config.spec	11 Feb 2006 05:25:22 -0000	1.24
+++ pyxf86config.spec	22 Feb 2006 16:02:26 -0000	1.25
@@ -2,8 +2,8 @@
 
 Summary: Python wrappers for libxf86config
 Name: pyxf86config
-Version: 0.3.23
-Release: 1.2
+Version: 0.3.24
+Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -12,7 +12,7 @@
 Requires: glib2
 Requires: python-abi = %{pyver}
 BuildRequires: glib2-devel
-BuildRequires: libxf86config-devel >= 1.0.0-2
+BuildRequires: libX11-devel
 BuildRequires: python-devel
 ExcludeArch: s390 s390x ppc64
 
@@ -43,11 +43,8 @@
 
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.23-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.23-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
+* Wed Feb 22 2006 Chris Lumens <clumens at redhat.com> 0.3.24-1
+- Add 1600x1024 and 800x512 to the list of supported resolutions (#115679)
 
 * Tue Jan 17 2006 Christopher Aillon <caillon at redhat.com> 0.3.23-1
 - Use the standard X headers instead of keeping a copy in-tree


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Jan 2006 06:34:13 -0000	1.13
+++ sources	22 Feb 2006 16:02:26 -0000	1.14
@@ -1 +1 @@
-e587ee27ac4bedb9fc60daa1b11e8fd8  pyxf86config-0.3.23.tar.gz
+43488299e096b3fed4f080579f9e7fbb  pyxf86config-0.3.24.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:13:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:13:15 -0500
Subject: rpms/xml-commons/devel .cvsignore, 1.5, 1.6 sources, 1.3,
	1.4 xml-commons.spec, 1.33, 1.34
Message-ID: <200602221613.k1MGDFYR028835@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/xml-commons/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28796

Modified Files:
	.cvsignore sources xml-commons.spec 
Log Message:
Updated to 1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jun 2005 11:08:02 -0000	1.5
+++ .cvsignore	22 Feb 2006 16:13:13 -0000	1.6
@@ -1,4 +1,2 @@
 xml-commons-1.0.b2-RHCLEAN.tar.bz2
-xml-commons-1.0.b2
-i386
-*.src.rpm
+xml-commons-external-1.3.02-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jun 2005 11:08:02 -0000	1.3
+++ sources	22 Feb 2006 16:13:13 -0000	1.4
@@ -1 +1,2 @@
 9f06b920501ba834e6337d7d080c93c9  xml-commons-1.0.b2-RHCLEAN.tar.bz2
+3dfe648c9488d9141a121ee7f42575d6  xml-commons-external-1.3.02-src.tar.gz


Index: xml-commons.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons/devel/xml-commons.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xml-commons.spec	11 Feb 2006 06:12:23 -0000	1.33
+++ xml-commons.spec	22 Feb 2006 16:13:13 -0000	1.34
@@ -1,14 +1,17 @@
 %define section free
+%define whichver 1.0
 
 Summary:        Common code for XML projects
 Name:           xml-commons
-Version:        1.0
-Release: 	0.b2.7jpp_5fc
+Version:        1.3.02
+Release: 	0.b2.7jpp_6fc
 Epoch:          0
 License:        Apache Software License
 URL:            http://xml.apache.org/commons/
 Source0:        xml-commons-1.0.b2-RHCLEAN.tar.bz2
 Source1:        xml-commons.which.script
+Source2:        xml-commons-external-1.3.02-src.tar.gz
+# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_02/java/external/
 Patch0:         xml-commons.build.patch
 Patch1:         xml-commons.manifest.patch
 Requires:       jpackage-utils >= 0:1.5
@@ -73,7 +76,7 @@
 # -----------------------------------------------------------------------------
 
 %prep
-%setup -q -n %{name}-%{version}.b2
+%setup -q -n %{name}-%{whichver}.b2
 %patch0 -p1
 %patch1 -p1
 # remove all prebuilt stuff
@@ -83,9 +86,19 @@
     ! -name README.txt \
     -exec rm -f {} \;
 
+# replace external
+pushd java
+rm -rf external
+gzip -dc %{SOURCE2} | tar xf -
+popd
+# remove all binary libs and prebuilt javadocs
+rm -rf `find . -name "*.jar" -not -name 'xml-apis.jar' -o -name "*.gz"`
+rm -rf java/build java/external/build/docs/javadoc
+
 # -----------------------------------------------------------------------------
 
 %build
+export OPT_JAR_LIST="./java/external/build/xml-apis.jar"
 ant jars
 
 # -----------------------------------------------------------------------------
@@ -101,6 +114,7 @@
   $RPM_BUILD_ROOT%{_javadir}/%{name}-which-%{version}.jar
 
 # Jar versioning
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in %{name}-apis*.jar; do ln -sf ${jar} dom3-${jar}; done)
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
 # Javadocs
@@ -111,6 +125,9 @@
 cp -pr java/build/docs/javadocs/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version}
 
+ln -s %{name}-apis-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis # ghost symlink
+ln -s %{name}-which-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which # ghost symlink
+
 # Scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-which
@@ -142,10 +159,12 @@
 %{_javadir}/%{name}-which*
 %attr(0755,root,root) %{_bindir}/*
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-which-%{version}.jar.*
+%{_javadir}/dom3-%{name}-apis*
 
 %files apis-manual
 %defattr(0644,root,root,0755)
 %doc java/external/build/docs/*
+%ghost %{_javadocdir}/%{name}-apis
 
 %files apis-javadoc
 %defattr(0644,root,root,0755)
@@ -154,6 +173,7 @@
 %files which-javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-which-%{version}
+%ghost %{_javadocdir}/%{name}-which
 
 # -----------------------------------------------------------------------------
 
@@ -184,6 +204,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.3.02-0.b2.7jpp_6fc
+- Updated to 1.3
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0-0.b2.7jpp_5fc
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:16:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:16:50 -0500
Subject: rpms/hwdata/devel .cvsignore, 1.58, 1.59 hwdata.spec, 1.59,
	1.60 sources, 1.61, 1.62
Message-ID: <200602221616.k1MGGoS8008675@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5282

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
- More entries from Dell to MonitorsDB (#181008)
- Added a few more entries to MonitorsDB



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	3 Feb 2006 15:55:04 -0000	1.58
+++ .cvsignore	22 Feb 2006 16:16:47 -0000	1.59
@@ -1 +1 @@
-hwdata-0.174.tar.gz
+hwdata-0.176.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- hwdata.spec	3 Feb 2006 15:55:04 -0000	1.59
+++ hwdata.spec	22 Feb 2006 16:16:47 -0000	1.60
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.174
+Version: 0.176
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,12 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	3 Feb 2006 15:55:04 -0000	1.61
+++ sources	22 Feb 2006 16:16:47 -0000	1.62
@@ -1 +1 @@
-2e79f51fb50bdab3804689dc96e8be0e  hwdata-0.174.tar.gz
+21cff19c147f68c1b21d6c85904cf8b9  hwdata-0.176.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:28:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:28:26 -0500
Subject: rpms/beagle/devel beagle.spec,1.33,1.34
Message-ID: <200602221628.k1MGSQSB015751@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15674

Modified Files:
	beagle.spec 
Log Message:
Silence %post



Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- beagle.spec	22 Feb 2006 14:37:10 -0000	1.33
+++ beagle.spec	22 Feb 2006 16:28:22 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        10
+Release:        11
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -138,7 +138,7 @@
 /usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
 
 %post 
-if rpm -q firefox; then
+if rpm -q firefox > /dev/null; then
 # install the firefox extension
 # note that this code is duplicated below in a trigger
   latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
@@ -207,6 +207,9 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-11
+- Silence %%post 
+
 * Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-10
 - Fix %%post for 64bit arches
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:44:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:44:44 -0500
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.5, 1.6 cryptsetup-luks.spec,
	1.19, 1.20 sources, 1.5, 1.6
Message-ID: <200602221644.k1MGiibU020636@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20585

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Feb 2006 17:25:08 -0000	1.5
+++ .cvsignore	22 Feb 2006 16:44:41 -0000	1.6
@@ -1 +1 @@
-cryptsetup-luks-1.0.2.tar.bz2
+cryptsetup-luks-1.0.3-rc1.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cryptsetup-luks.spec	21 Feb 2006 17:25:08 -0000	1.19
+++ cryptsetup-luks.spec	22 Feb 2006 16:44:41 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
-Version: 1.0.2
-Release: 1
+Version: 1.0.3
+Release: 0.rc1
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
@@ -65,6 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 22 2006 Bill Nottingham <notting at redhat.com> 1.0.3-0.rc1
+- update to 1.0.3rc1, reverts changes to default encryption type
+
 * Tue Feb 21 2006 Bill Nottingham <notting at redhat.com> 1.0.2-1
 - update to 1.0.2, fix incompatiblity with old cryptsetup (#176726)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Feb 2006 17:25:08 -0000	1.5
+++ sources	22 Feb 2006 16:44:41 -0000	1.6
@@ -1 +1 @@
-cd6899ecf517c3414386476bd97f97d3  cryptsetup-luks-1.0.2.tar.bz2
+601572b6e57bb5a56413a9b69c3286a0  cryptsetup-luks-1.0.3-rc1.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:51:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:51:02 -0500
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.20,1.21
Message-ID: <200602221651.k1MGp21i003491@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3386

Modified Files:
	cryptsetup-luks.spec 
Log Message:
fix



Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cryptsetup-luks.spec	22 Feb 2006 16:44:41 -0000	1.20
+++ cryptsetup-luks.spec	22 Feb 2006 16:51:00 -0000	1.21
@@ -5,7 +5,7 @@
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
-Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}.tar.bz2
+Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}-rc1.tar.bz2
 Patch: cryptsetup-luks-1.0.1-proto.patch
 Patch2: cryptsetup-luks-1.0.1-sepol.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root



From fedora-cvs-commits at redhat.com  Wed Feb 22 16:55:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 11:55:33 -0500
Subject: rpms/kdemultimedia/FC-4 kdemultimedia.spec,1.46,1.47
Message-ID: <200602221655.k1MGtXTD005604@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/kdemultimedia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5545

Modified Files:
	kdemultimedia.spec 
Log Message:
- add missing protocol audiocd #176637
- remove useless rpm macro #180009
- add requires on alsa-lib-devel #178734



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/dist/rpms/kdemultimedia/FC-4/kdemultimedia.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdemultimedia.spec	1 Feb 2006 20:28:33 -0000	1.46
+++ kdemultimedia.spec	22 Feb 2006 16:55:29 -0000	1.47
@@ -14,7 +14,6 @@
 %define alsa 1
 %define juk 0
 %define cdparanoia 1
-%define koncd 0
 %define arts 1
 
 %define redhatify 1
@@ -28,7 +27,7 @@
 %endif
 
 Version: 3.5.1
-Release: 0.1.fc4
+Release: 0.2.fc4
 Epoch: 6
 Name: kdemultimedia
 Prefix: /usr
@@ -93,6 +92,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
+Requires: alsa-lib-devel >= 1.0.2
 
 %description devel
 Development files for aRts and noatun plugins.
@@ -140,6 +140,7 @@
    --disable-motif \
    --with-motif-includes=none \
    --with-motif-libraries=none \
+   --with-extra-includes=/usr/include/cdda \
 %if %{debug} == 0
    --disable-debug \
    --without-debug \
@@ -189,18 +190,6 @@
   rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/juk
 %endif
 
-# KOnCD configuration...
-%if %{koncd}
-   mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-   cat >$RPM_BUILD_ROOT%{_datadir}/config/koncdrc <<EOF
-[Program paths]
-cdrdao_path=/usr/bin/cdrdao
-cdrecord_path=/usr/bin/cdrecord
-mkisofs_path=/usr/bin/mkisofs
-readcd_path=/usr/bin/readcd
-EOF
-%endif
-
 # don't make these world-writeable
 chmod go-w $RPM_BUILD_ROOT/%{_datadir}/apps/kscd/*
 
@@ -252,6 +241,11 @@
 %{_includedir}/kde/*
 
 %changelog
+* Wed Feb 22 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.2.fc4
+- add missing protocol audiocd #176637
+- remove useless rpm macro #180009
+- add requires on alsa-lib-devel #178734
+
 * Wed Feb 01 2006 Than Ngo <than at redhat.com> 6:3.5.1-0.1.fc4
 - 3.5.1
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 17:01:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 12:01:52 -0500
Subject: rpms/cryptsetup-luks/devel cryptsetup-luks.spec,1.21,1.22
Message-ID: <200602221701.k1MH1qXM007366@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7224

Modified Files:
	cryptsetup-luks.spec 
Log Message:
fix again



Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cryptsetup-luks.spec	22 Feb 2006 16:51:00 -0000	1.21
+++ cryptsetup-luks.spec	22 Feb 2006 17:01:17 -0000	1.22
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch -p1
 %patch2 -p1
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:09:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:09:52 -0500
Subject: rpms/rhgb/devel .cvsignore, 1.16, 1.17 rhgb.spec, 1.49, 1.50 sources,
	1.17, 1.18
Message-ID: <200602221809.k1MI9qM1016326@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16264

Modified Files:
	.cvsignore rhgb.spec sources 
Log Message:
0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	31 Jan 2005 20:52:21 -0000	1.16
+++ .cvsignore	22 Feb 2006 18:09:49 -0000	1.17
@@ -1 +1,2 @@
 rhgb-0.16.2.tar.gz
+rhgb-0.16.3.tar.gz


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- rhgb.spec	13 Feb 2006 18:45:58 -0000	1.49
+++ rhgb.spec	22 Feb 2006 18:09:49 -0000	1.50
@@ -2,8 +2,8 @@
 
 Summary: Red Hat Graphical Boot
 Name: rhgb
-Version: 0.16.2
-Release: 21.2.1
+Version: 0.16.3
+Release: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -70,6 +70,9 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.16.3-1
+- don't include the (old, unused) Fedora logo 
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.16.2-21.2.1
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Oct 2005 07:45:43 -0000	1.17
+++ sources	22 Feb 2006 18:09:49 -0000	1.18
@@ -1 +1 @@
-21d7e5d3c446c2edc6d4d9f509b44f6f  rhgb-0.16.2.tar.gz
+62f4dc9cf206dd7824a85986ed2e3e24  rhgb-0.16.3.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:17:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:17:13 -0500
Subject: rpms/system-config-display/devel sources, 1.29,
	1.30 system-config-display.spec, 1.31, 1.32
Message-ID: <200602221817.k1MIHD4B032181@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-display/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32077

Modified Files:
	sources system-config-display.spec 
Log Message:
Update for fixed requires.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	27 Jan 2006 22:56:27 -0000	1.29
+++ sources	22 Feb 2006 18:17:11 -0000	1.30
@@ -1 +1 @@
-f84d58d96d8094cd71d3d0d664ef14db  system-config-display-1.0.36.tar.bz2
+54467cbc7faa05685f228fb6cd09c1ea  system-config-display-1.0.36.tar.bz2


Index: system-config-display.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- system-config-display.spec	27 Jan 2006 22:56:10 -0000	1.31
+++ system-config-display.spec	22 Feb 2006 18:17:11 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: A graphical interface for configuring the X Window System display
 Name: system-config-display
 Version: 1.0.36
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -21,6 +21,7 @@
 Requires: kudzu >= 1.2.0
 Requires: pyxf86config >= 0.3.16
 Requires: rhpl >= 0.170-1
+Requires: rhpxl
 Requires: redhat-artwork >= 0.61-1
 Requires: xsri
 Requires: /usr/bin/Xorg
@@ -79,6 +80,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png
 
 %changelog
+* Wed Feb 22 2006 Chris Lumens <clumens at redhat.com> 1.0.36-2
+- Add rhpxl to requires
+
 * Fri Jan 27 2006 Paul Nasrat <pnasrat at redhat.com> - 1.0.36-1
 - Rebuild for translations
 - Fix reconfig mode



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:21:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:21:23 -0500
Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-selinux.patch, NONE,
	1.1 e2fsprogs.spec, 1.47, 1.48
Message-ID: <200602221821.k1MILN8v001627@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1457

Modified Files:
	e2fsprogs.spec 
Added Files:
	e2fsprogs-1.38-blkid-selinux.patch 
Log Message:
- handle selinux contexts on blkid.tab


e2fsprogs-1.38-blkid-selinux.patch:
 configure.in     |   28 ++++++++++++++++++++++++++++
 lib/blkid/save.c |   15 +++++++++++++++
 2 files changed, 43 insertions(+)

--- NEW FILE e2fsprogs-1.38-blkid-selinux.patch ---
--- e2fsprogs-1.38/configure.in.context	2006-02-22 12:51:02.000000000 -0500
+++ e2fsprogs-1.38/configure.in	2006-02-22 13:05:46.000000000 -0500
@@ -480,6 +480,34 @@
 )
 AC_SUBST(E2INITRD_PROG)
 AC_SUBST(E2INITRD_MAN)
+dnl handle --enable-blkid-selinux
+dnl
+AC_ARG_ENABLE([blkid-selinux],
+[  --enable-blkid-selinux  build with selinux support],
+[if test "$enableval" = "no"
+then
+	echo "Disabling selinux support"
+	SELINUX_REQ=''
+	SELINUX_LIBS=''
+	STATIC_SELINUX_LIBS=''
+else
+	AC_DEFINE(HAVE_SELINUX)
+	echo "Enabling selinux support"
+
+	AC_CHECK_LIB(selinux, getfilecon,
+		[SELINUX_LIBS="-lselinux -lsepol";
+		 STATIC_SELINUX_LIBS="-lselinux -lsepol";
+		 SELINUX_REQ="selinux"],
+		[AC_MSG_ERROR([selinux library not found])],
+		[$SELINUX_LIBS])
+fi]
+,
+echo "Disabling selinux support by default"
+)
+AC_SUBST(SELINUX_REQ)
+AC_SUBST(SELINUX_LIBS)
+AC_SUBST(STATIC_SELINUX_LIBS)
+dnl
 dnl handle --enable-blkid-devmapper
 dnl
 AC_ARG_ENABLE([blkid-devmapper],
--- e2fsprogs-1.38/lib/blkid/save.c.context	2006-02-20 15:52:13.000000000 -0500
+++ e2fsprogs-1.38/lib/blkid/save.c	2006-02-20 15:59:02.000000000 -0500
@@ -24,6 +24,9 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
 #include "blkidP.h"
 
 static int save_dev(blkid_dev dev, FILE *file)
@@ -137,6 +140,12 @@
 			    printf("unlinked temp cache %s\n", opened));
 		} else {
 			char *backup;
+#ifdef HAVE_SELINUX
+			security_context_t con = NULL;
+
+			if (getfilecon(filename, &con) < 0)
+				con = NULL;
+#endif
 
 			backup = malloc(strlen(filename) + 5);
 			if (backup) {
@@ -146,6 +155,12 @@
 				free(backup);
 			}
 			rename(opened, filename);
+#ifdef HAVE_SELINUX
+			if (con) {
+				setfilecon(filename, con);
+				freecon(con);
+			}
+#endif
 			DBG(DEBUG_SAVE,
 			    printf("moved temp cache %s\n", opened));
 		}


Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- e2fsprogs.spec	20 Feb 2006 13:54:00 -0000	1.47
+++ e2fsprogs.spec	22 Feb 2006 18:21:20 -0000	1.48
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -27,6 +27,7 @@
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch33: e2fsprogs-1.38-lost+found.patch
 Patch34: e2fsprogs-1.38-blkid-devmapper.patch
+Patch35: e2fsprogs-1.38-blkid-selinux.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -119,11 +120,13 @@
 
 # look at device mapper devices
 %patch34 -p1 -b .dm
+# preserve selinux context on blkid.tab
+%patch35 -p1 -b .selinux
 
 %build
 aclocal
 autoconf
-%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper
+%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper  --enable-blkid-devmapper --enable-blkid-selinux
 # --enable-dynamic-e2fsck
 make -C po update-po
 make
@@ -297,6 +300,9 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 1.36-8
+- handle selinux context on blkid.tab
+
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.38-7
 - BuildRequires: gettext-devel
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:41:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:41:29 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.17,
	1.18 selinux-policy.spec, 1.118, 1.119
Message-ID: <200602221841.k1MIfT88008324@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8283

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 admin/logwatch.te     |    2 +
 admin/su.if           |   19 ++++------
 admin/vpn.te          |    4 ++
 apps/java.if          |    8 +---
 apps/slocate.te       |    2 +
 kernel/devices.if     |   39 ++++++++++++++++++++++
 services/apache.fc    |    2 -
 services/apache.if    |   39 ++++++++++++++++++++++
 services/automount.te |    3 +
 services/cron.if      |   18 ++++++++++
 services/cron.te      |    7 ++++
 services/cups.if      |   19 ++++++++++
 services/postfix.te   |    1 
 services/ssh.if       |    2 +
 system/authlogin.te   |    2 +
 system/fstools.te     |    2 -
 system/mount.te       |    2 +
 system/selinuxutil.fc |    7 ++++
 system/selinuxutil.if |   87 ++++++++++++++++++++++++++++++++++++++++++++++++++
 system/selinuxutil.te |   77 +++++++++++++++++++++++++++++++++++++++-----
 system/userdomain.if  |   24 +++++++++++++
 system/userdomain.te  |    4 +-
 22 files changed, 341 insertions(+), 29 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- policy-20060207.patch	22 Feb 2006 00:53:12 -0000	1.17
+++ policy-20060207.patch	22 Feb 2006 18:41:25 -0000	1.18
@@ -140,9 +140,21 @@
  ##	Read input event devices (/dev/input).
  ## </summary>
  ## <param name="domain">
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.19/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/apache.fc	2006-02-21 19:01:53.000000000 -0500
+@@ -45,7 +45,7 @@
+ /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
+ /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
+ 
+-/var/lib/cacti(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
++/var/lib/cacti/rra(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
+ /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.19/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-21 18:26:10.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-22 08:16:12.000000000 -0500
 @@ -94,6 +94,7 @@
  
  	corecmd_exec_bin(httpd_$1_script_t)
@@ -159,7 +171,7 @@
  
  		files_read_etc_runtime_files(httpd_$1_script_t)
  		files_read_usr_files(httpd_$1_script_t)
-@@ -798,3 +800,58 @@
+@@ -798,3 +800,40 @@
  
  	allow $1 httpd_sys_script_t:dir search;
  ')
@@ -185,7 +197,7 @@
 +
 +########################################
 +## <summary>
-+##	Read apache log files
++##	Read apache system content
 +## </summary>
 +## <param name="domain">
 +##	<summary>
@@ -193,31 +205,54 @@
 +##	</summary>
 +## </param>
 +#
-+interface(`apache_read_log',`
++interface(`apache_read_sys_content',`
 +	gen_require(`
-+		type httpd_log_t;
++		type httpd_sys_content_t;
 +	')
-+
-+	allow $1 httpd_log_t:file { getattr read };
++	allow $1 httpd_sys_content_t:dir r_dir_perms;
++	allow $1 httpd_sys_content_t:file { getattr read };
 +')
-+
-+########################################
-+## <summary>
-+##	Read apache system content
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.19/policy/modules/services/automount.te
+--- nsaserefpolicy/policy/modules/services/automount.te	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/automount.te	2006-02-22 11:39:30.000000000 -0500
+@@ -83,6 +83,9 @@
+ corenet_tcp_connect_portmap_port(automount_t)
+ corenet_tcp_connect_all_ports(automount_t)
+ corenet_dontaudit_tcp_connect_all_reserved_ports(automount_t)
++# Automount execs showmount when you browse /net.  This is required until
++# Someone writes a showmount policy
++corenet_tcp_bind_reserved_port(automount_t)
+ 
+ dev_read_sysfs(automount_t)
+ # for SSP
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.19/policy/modules/services/cron.if
+--- nsaserefpolicy/policy/modules/services/cron.if	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/cron.if	2006-02-22 08:23:34.000000000 -0500
+@@ -434,6 +434,24 @@
+ 
+ ########################################
+ ## <summary>
++##	Read and write a cron daemon system pipe.
 +## </summary>
 +## <param name="domain">
 +##	<summary>
-+##	Domain to not audit.
++##	Domain allowed access.
 +##	</summary>
 +## </param>
 +#
-+interface(`apache_read_sys_content',`
++interface(`cron_rw_system_pipes',`
 +	gen_require(`
-+		type httpd_sys_content_t;
++		type system_crond_t;
 +	')
-+	allow $1 httpd_sys_content_t:dir r_dir_perms;
-+	allow $1 httpd_sys_content_t:file { getattr read };
++
++	allow $1 system_crond_t:fifo_file { getattr read write };
 +')
++
++########################################
++## <summary>
+ ##	Read, and write cron daemon TCP sockets.
+ ## </summary>
+ ## <param name="domain">
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.19/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.19/policy/modules/services/cron.te	2006-02-21 17:24:20.000000000 -0500
@@ -271,7 +306,17 @@
  ##	Connect to ptal over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-Binary files nsaserefpolicy/policy/modules/services/.mta.te.swp and serefpolicy-2.2.19/policy/modules/services/.mta.te.swp differ
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.19/policy/modules/services/postfix.te
+--- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-21 14:40:24.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/services/postfix.te	2006-02-22 08:23:50.000000000 -0500
+@@ -440,6 +440,7 @@
+ optional_policy(`crond',`
+ 	cron_use_fd(postfix_postdrop_t)
+ 	cron_rw_pipes(postfix_postdrop_t)
++	cron_rw_system_pipes(postfix_postdrop_t)
+ 	cron_use_system_job_fds(postfix_postdrop_t)
+ 	cron_rw_system_job_pipes(postfix_postdrop_t)
+ ')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.19/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.19/policy/modules/services/ssh.if	2006-02-21 17:24:20.000000000 -0500
@@ -431,7 +476,7 @@
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.19/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-22 08:12:03.000000000 -0500
 @@ -103,6 +103,27 @@
  
  ########################################
@@ -460,7 +505,15 @@
  # Checkpolicy local policy
  #
  
-@@ -303,10 +324,6 @@
+@@ -183,6 +204,7 @@
+ libs_use_ld_so(load_policy_t)
+ libs_use_shared_libs(load_policy_t)
+ 
++mls_file_read_up(load_policy_t)
+ miscfiles_read_localization(load_policy_t)
+ 
+ userdom_use_all_users_fds(load_policy_t)
+@@ -303,10 +325,6 @@
  	nscd_socket_use(newrole_t)
  ')
  
@@ -471,7 +524,7 @@
  ########################################
  #
  # Restorecon local policy
-@@ -525,12 +542,53 @@
+@@ -525,12 +543,53 @@
  
  miscfiles_read_localization(setfiles_t)
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- selinux-policy.spec	22 Feb 2006 00:53:12 -0000	1.118
+++ selinux-policy.spec	22 Feb 2006 18:41:25 -0000	1.119
@@ -61,6 +61,7 @@
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/selinux \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
@@ -76,6 +77,7 @@
 %{_usr}/share/selinux/%1/*.pp \
 %dir %{_sysconfdir}/selinux \
 %ghost %config(noreplace) %{_sysconfdir}/selinux/config \
+%ghost %{_sysconfdir}/sysconfig/selinux \
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
@@ -158,7 +160,8 @@
 make 
 make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
-ln -sf ./include/Makefile ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
+install -m 755 doc/Makefile.example ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
+
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:45:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:45:20 -0500
Subject: rpms/python-urlgrabber/devel .cvsignore, 1.3,
	1.4 python-urlgrabber.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200602221845.k1MIjKDF010147@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/python-urlgrabber/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10110

Modified Files:
	.cvsignore python-urlgrabber.spec sources 
Log Message:
* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 2.9.8-1
- update to new version fixing progress bars in yum on regets



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-urlgrabber/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Mar 2005 01:55:02 -0000	1.3
+++ .cvsignore	22 Feb 2006 18:45:18 -0000	1.4
@@ -1 +1,2 @@
 urlgrabber-2.9.6.tar.gz
+urlgrabber-2.9.8.tar.gz


Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/dist/rpms/python-urlgrabber/devel/python-urlgrabber.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-urlgrabber.spec	9 Dec 2005 22:42:55 -0000	1.7
+++ python-urlgrabber.spec	22 Feb 2006 18:45:18 -0000	1.8
@@ -2,10 +2,9 @@
 
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
-Version: 2.9.6
-Release: 4.1
+Version: 2.9.8
+Release: 1
 Source0: urlgrabber-%{version}.tar.gz
-Patch0: python-urlgrabber-2.9.6-reget.patch
 License: LGPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -21,7 +20,6 @@
 
 %prep
 %setup -n urlgrabber-%{version}
-%patch0 -p1 -b .reget
 
 %build
 python setup.py build
@@ -41,6 +39,9 @@
 %{_bindir}/urlgrabber
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 2.9.8-1
+- update to new version fixing progress bars in yum on regets
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-urlgrabber/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	9 Mar 2005 01:55:02 -0000	1.3
+++ sources	22 Feb 2006 18:45:18 -0000	1.4
@@ -1 +1,2 @@
 e4afa725cf63b2684019f92cd8255671  urlgrabber-2.9.6.tar.gz
+621abdb5f839e139c7b27802f99bc72f  urlgrabber-2.9.8.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 18:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 13:48:06 -0500
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.119,1.120
Message-ID: <200602221848.k1MIm6eO023903@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23859

Modified Files:
	selinux-policy.spec 
Log Message:



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- selinux-policy.spec	22 Feb 2006 18:41:25 -0000	1.119
+++ selinux-policy.spec	22 Feb 2006 18:48:03 -0000	1.120
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.19
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -292,6 +292,11 @@
 
 %changelog
 
+* Wed Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-3
+- Fix load_policy to work on MLS
+- Fix cron_rw_system_pipes for postfix_postdrop_t
+- Allow audotmount to run showmount
+
 * Tue Feb 21 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-2
 - Fix swapon
 - allow httpd_sys_script_t to be entered via a shell



From fedora-cvs-commits at redhat.com  Wed Feb 22 19:07:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 14:07:22 -0500
Subject: rpms/kudzu/devel .cvsignore,1.109,1.110 sources,1.123,1.124
Message-ID: <200602221907.k1MJ7MmT029540@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29524

Modified Files:
	.cvsignore sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- .cvsignore	21 Feb 2006 19:31:27 -0000	1.109
+++ .cvsignore	22 Feb 2006 19:07:16 -0000	1.110
@@ -1 +1 @@
-kudzu-1.2.31.tar.gz
+kudzu-1.2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources	21 Feb 2006 19:31:27 -0000	1.123
+++ sources	22 Feb 2006 19:07:17 -0000	1.124
@@ -1 +1 @@
-2703e03258a6b4b8ba7a5eeaca366487  kudzu-1.2.31.tar.gz
+9819e403bf469bed21d349afac055c5e  kudzu-1.2.32.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 19:08:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 14:08:09 -0500
Subject: rpms/kudzu/devel kudzu.spec,1.124,1.125
Message-ID: <200602221908.k1MJ89iv029702@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29613

Modified Files:
	kudzu.spec 
Log Message:
update



Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- kudzu.spec	21 Feb 2006 19:31:27 -0000	1.124
+++ kudzu.spec	22 Feb 2006 19:08:06 -0000	1.125
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.31
+Version: 1.2.32
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Wed Feb 22 2006 Bill Nottingham <notting at redhat.com> - 1.2.32-1
+- fix potential segfault with USB network devices (#182006)
+
 * Tue Feb 21 2006 Bill Nottingham <notting at redhat.com> - 1.2.31-1
 - further x86emu-related fixes (#181467)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 19:16:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 14:16:52 -0500
Subject: rpms/xterm/FC-4 xterm-208-bz182382.patch, NONE, 1.1 xterm.spec, 1.18,
	1.19
Message-ID: <200602221916.k1MJGqof007633@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7495

Modified Files:
	xterm.spec 
Added Files:
	xterm-208-bz182382.patch 
Log Message:
fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs

xterm-208-bz182382.patch:
 charproc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xterm-208-bz182382.patch ---
--- xterm-208/charproc.c.bz182382	2006-02-22 13:59:00.000000000 -0500
+++ xterm-208/charproc.c	2006-02-22 14:06:24.000000000 -0500
@@ -7276,7 +7276,7 @@
      * not be set before the widget's realized, so it's tested separately).
      */
     if (screen->colorMode) {
-	if (VWindow(screen) != 0 && (cc != bg) && (cc != fg)) {
+	if ((VWindow(screen) != 0) && (cc != bg)) {
 	    /* we might have a colored foreground/background later */
 	    xgcv.font = screen->fnt_norm->fid;
 	    mask = (GCForeground | GCBackground | GCFont);
@@ -7307,7 +7307,7 @@
 	}
     } else
 #endif
-    if (cc != fg && cc != bg) {
+    if ((VWindow(screen) != 0) && (cc != bg)) {
 	/* we have a colored cursor */
 	xgcv.font = screen->fnt_norm->fid;
 	mask = (GCForeground | GCBackground | GCFont);


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/FC-4/xterm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xterm.spec	13 Feb 2006 16:46:47 -0000	1.18
+++ xterm.spec	22 Feb 2006 19:16:49 -0000	1.19
@@ -4,7 +4,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name: xterm
 Version: 208
-Release: 1.FC4
+Release: 2.FC4
 URL: http://dickey.his.com/xterm
 License: MIT
 Group: User Interface/X
@@ -17,6 +17,7 @@
 Patch4: xterm-appsdir.patch
 Patch5: xterm-208-root-grab-console.patch
 Patch6: xterm-208-bz180450.patch
+Patch7: xterm-208-bz182382.patch
 BuildRequires: xorg-x11-devel >= 6.7.0
 BuildRequires: utempter libtermcap-devel
 
@@ -39,6 +40,7 @@
 %patch4 -p1 -b .appsdir
 %patch5 -p1 -b .root-grab-console
 %patch6 -p1 -b .bz180450
+%patch7 -p1 -b .bz182382
 
 %{?!_with_256_color: %define _with_256_color 1}
 %{?!_with_tek4014: %define _with_tek4014 1}
@@ -92,6 +94,11 @@
 %{_x11bindir}/xterm
 
 %changelog
+* Wed Feb 22 2006 Jason Vas Dias <jvdias at redhat.com> - 208-2.FC4
+- fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs
+- further fix for bug 178302: allow vt100*cursorColor to be same 
+  as foreground 
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 208-1.FC4
 - Upgrade to upstream version 208
 - fix bug 180450: disallow Bell() generation before 



From fedora-cvs-commits at redhat.com  Wed Feb 22 19:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 14:20:32 -0500
Subject: rpms/xterm/devel xterm-209-bz182382.patch, NONE, 1.1 xterm.spec,
	1.37, 1.38
Message-ID: <200602221920.k1MJKWtl015417@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15297

Modified Files:
	xterm.spec 
Added Files:
	xterm-209-bz182382.patch 
Log Message:
- fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs
- further fix for bug 178302: allow *vt100*cursorColor to be same as fg


xterm-209-bz182382.patch:
 charproc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xterm-209-bz182382.patch ---
--- xterm-209/charproc.c.bz182382	2006-02-22 14:02:59.000000000 -0500
+++ xterm-209/charproc.c	2006-02-22 14:10:20.000000000 -0500
@@ -7394,7 +7394,7 @@
      * not be set before the widget's realized, so it's tested separately).
      */
     if (screen->colorMode) {
-	if (VWindow(screen) != 0 && (cc != bg)) {
+	if ((VWindow(screen) != 0) && (cc != bg)) {
 	    /* we might have a colored foreground/background later */
 	    xgcv.font = screen->fnts[fNorm]->fid;
 	    mask = (GCForeground | GCBackground | GCFont);
@@ -7425,7 +7425,7 @@
 	}
     } else
 #endif
-    if (cc != fg && cc != bg) {
+    if ((VWindow(screen) != 0) && (cc != bg)) {
 	/* we have a colored cursor */
 	xgcv.font = screen->fnts[fNorm]->fid;
 	mask = (GCForeground | GCBackground | GCFont);


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xterm.spec	13 Feb 2006 17:11:26 -0000	1.37
+++ xterm.spec	22 Feb 2006 19:20:30 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 209
-Release: 1
+Release: 2
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -19,6 +19,7 @@
 Patch6: xterm-207-eightBitInput_false.patch
 Patch7: xterm-209-redhat-resources.patch
 Patch8: xterm-208-root-grab-console.patch
+Patch9: xterm-209-bz182382.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -60,6 +61,7 @@
 #%patch6 -p1 -b .eightBitInput_false
 %patch7 -p1 -b .redhat-resources
 %patch8 -p1 -b .root-grab-console
+%patch9 -p1 -b .bz182382
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
@@ -105,6 +107,10 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Feb 22 2006 Jason Vas Dias <jvdias at redhat.com> - 209-2
+- fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs
+- further fix for bug 178302: allow *vt100*cursorColor to be same as fg
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 209-1
 - Upgrade to upstream version 209 (fixes bug 180450)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 20:08:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 15:08:43 -0500
Subject: rpms/redhat-artwork/devel .cvsignore, 1.70, 1.71 redhat-artwork.spec,
	1.125, 1.126 sources, 1.72, 1.73
Message-ID: <200602222008.k1MK8hCo004786@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4725

Modified Files:
	.cvsignore redhat-artwork.spec sources 
Log Message:
0.240



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	18 Feb 2006 01:01:19 -0000	1.70
+++ .cvsignore	22 Feb 2006 20:08:39 -0000	1.71
@@ -7,3 +7,4 @@
 redhat-artwork-0.237.tar.gz
 redhat-artwork-0.238.tar.gz
 redhat-artwork-0.239.tar.gz
+redhat-artwork-0.240.tar.gz


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- redhat-artwork.spec	21 Feb 2006 14:34:06 -0000	1.125
+++ redhat-artwork.spec	22 Feb 2006 20:08:39 -0000	1.126
@@ -3,8 +3,8 @@
 
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
-Version: 0.239
-Release: 2
+Version: 0.240
+Release: 1
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
@@ -180,6 +180,9 @@
 %config /root/.gtkrc
 
 %changelog
+* Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> - 0.240-1
+- Include Serbian translations
+
 * Tue Feb 21 2006 Than Ngo <than at redhat.com> 0.239-2
 - link KDE upstream icon names to the redhat ones in bluecurve
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources	18 Feb 2006 01:01:19 -0000	1.72
+++ sources	22 Feb 2006 20:08:39 -0000	1.73
@@ -1,4 +1,4 @@
 d30a30110d8a040f7fd584d7430cf019  post-install-sources.tar.gz
 cd630f83371dd14cf01a3767caa24da0  RHEL-gdm-theme-0.2.tar.gz
 395452caaf476a7145ffccea356a8966  throbbers.tar.bz2
-7d055864ddb0ab7ea4f50844080215c7  redhat-artwork-0.239.tar.gz
+ac58da2e5bffcd2b29bf2d36898afea2  redhat-artwork-0.240.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 20:17:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 15:17:46 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.627,1.628
Message-ID: <200602222017.k1MKHktC010307@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10169

Modified Files:
	openoffice.org.spec 
Log Message:
something is really strangely wrong


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- openoffice.org.spec	22 Feb 2006 14:17:33 -0000	1.627
+++ openoffice.org.spec	22 Feb 2006 20:17:42 -0000	1.628
@@ -916,11 +916,11 @@
 export nodep=true
 export NO_HIDS=true
 #enable parallel build
-export MAXPROCESS=$RPM_BUILD_NCPUS
+#export MAXPROCESS=$RPM_BUILD_NCPUS
 #dmake has limit of 10 processes apparently
-if [ $MAXPROCESS -gt 10 ]; then
-	export MAXPROCESS=10
-fi
+#if [ $MAXPROCESS -gt 10 ]; then
+#	export MAXPROCESS=10
+#fi
 #we'll build with at least build -P2 so we can do something useful while
 #helpcontent2 is wasting our time
 export MAXBUILDS=$[RPM_BUILD_NCPUS*2]



From fedora-cvs-commits at redhat.com  Wed Feb 22 20:59:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 15:59:19 -0500
Subject: rpms/kexec-tools/devel kdump.init, 1.3, 1.4 kexec-tools.spec, 1.10,
	1.11
Message-ID: <200602222059.k1MKxJxD013375@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13328

Modified Files:
	kdump.init kexec-tools.spec 
Log Message:
Remove wrong quotes around --command-line in kdump.init



Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdump.init	17 Feb 2006 23:58:33 -0000	1.3
+++ kdump.init	22 Feb 2006 20:59:15 -0000	1.4
@@ -79,7 +79,7 @@
 	fi
 
 	$KEXEC $KEXEC_ARGS $standard_kexec_args $KEXEC_HEADERS \
-		"--command-line=\"$KDUMP_COMMANDLINE\"" \
+		--command-line="$KDUMP_COMMANDLINE" \
 		--initrd=$kdump_initrd $kdump_kernel
 }
 


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kexec-tools.spec	17 Feb 2006 23:58:33 -0000	1.10
+++ kexec-tools.spec	22 Feb 2006 20:59:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 8
+Release: 9
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -96,6 +96,9 @@
 %doc TODO
 
 %changelog
+* Wed Feb 22 2006 Thomas Graf <tgraf at redhat.com> - 1.101-9
+- Remove wrong quotes around --command-line in kdump.init
+
 * Fri Feb 17 2006 Jeff Moyer <jmoyer at redhat.com> - 1.101-8
 - Fix the service stop case.  It was previously unloading the wrong kernel.
 - Implement the "restart" function.



From fedora-cvs-commits at redhat.com  Wed Feb 22 21:08:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 16:08:41 -0500
Subject: rpms/rhpxl/devel .cvsignore, 1.18, 1.19 rhpxl.spec, 1.20,
	1.21 sources, 1.20, 1.21
Message-ID: <200602222108.k1ML8ftQ014515@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14450

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	15 Feb 2006 21:53:25 -0000	1.18
+++ .cvsignore	22 Feb 2006 21:08:38 -0000	1.19
@@ -1 +1,7 @@
+rhpxl-0.10.tar.gz
+rhpxl-0.11.tar.gz
+rhpxl-0.12.tar.gz
+rhpxl-0.13.tar.gz
+rhpxl-0.14.tar.gz
 rhpxl-0.15.tar.gz
+rhpxl-0.16.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rhpxl.spec	15 Feb 2006 21:53:25 -0000	1.20
+++ rhpxl.spec	22 Feb 2006 21:08:38 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.15
+Version: 0.16
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,10 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Feb 22 2006 Chris Lumens <clumens at redhat.com> 0.16-1
+- Only put one non-vesa card in front of the list (#182016).
+- Provide a fixed list of supported resolutions for the SGI 1600SW (#115679).
+
 * Wed Feb 15 2006 Bill Nottingham <notting at redhat.com> 0.15-1
 - order non-vesa videocards before vesa (#176978)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	15 Feb 2006 21:53:25 -0000	1.20
+++ sources	22 Feb 2006 21:08:38 -0000	1.21
@@ -1 +1 @@
-d363a87c242cd4160017e4ab6fbb0210  rhpxl-0.15.tar.gz
+4fcd1cfcf4d70b849c8b040cb50f4ed0  rhpxl-0.16.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:05:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:05:13 -0500
Subject: rpms/mesa/devel mesa.spec,1.42,1.43
Message-ID: <200602222205.k1MM5DbV014124@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14098

Modified Files:
	mesa.spec 
Log Message:
- rebuilt



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mesa.spec	19 Feb 2006 05:43:00 -0000	1.42
+++ mesa.spec	22 Feb 2006 22:05:08 -0000	1.43
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -438,6 +438,9 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Wed Feb 22 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-4
+- rebuilt
+
 * Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> 6.4.2-3
 - enable texture-from-drawable patch
 - add glut-devel dependency



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:15:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:15:23 -0500
Subject: rpms/anaconda/devel anaconda.spec,1.344,1.345 sources,1.343,1.344
Message-ID: <200602222215.k1MMFNNc014412@cvs.devel.redhat.com>

Author: dcantrel

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14398

Modified Files:
	anaconda.spec sources 
Log Message:
Bump version.



Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- anaconda.spec	21 Feb 2006 23:04:07 -0000	1.344
+++ anaconda.spec	22 Feb 2006 22:15:19 -0000	1.345
@@ -1,11 +1,11 @@
 Name: anaconda
-Version: 10.92.7
+Version: 10.92.8
 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, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, bogl-devel >= 0:0.1.9-17, bogl-bterm >= 0:0.1.9-17, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel, pirut, libXt-devel
+BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel, pirut, libXt-devel
 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.5.1-3, pirut
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
@@ -79,6 +79,15 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Wed Feb 22 2006 David Cantrell <dcantrell at redhat.com> 10.92.8-1
+- Removed obsolete bogl code (katzj)
+- Removed unused code in upgrade.py (pnasrat)
+- Check version and packages to upgrade (pnasrat)
+- Removed old IDE RAID code from isys (katzj)
+- Various traceback fixes
+- Don't use underline in device names for hotkeys in bootloader gui (pjones)
+- Mount /selinux in rescue mode (katzj)
+
 * Tue Feb 21 2006 Chris Lumens <clumens at redhat.com> 10.92.7-1
 - Give Language a default display_mode (dcantrel)
 - Get languages that need a default from localeInfo (dcantrel)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- sources	21 Feb 2006 23:04:07 -0000	1.343
+++ sources	22 Feb 2006 22:15:20 -0000	1.344
@@ -1 +1 @@
-7e90ebb31b9995247df97b61e767c356  anaconda-10.92.7.tar.bz2
+1e2f1bdbe03a1870cadbf34a322f8f80  anaconda-10.92.8.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:38:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:38:54 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.95, 1.96 mkinitrd.spec, 1.106,
	1.107 sources, 1.102, 1.103
Message-ID: <200602222238.k1MMcs9O006630@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6475

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.27-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- .cvsignore	15 Feb 2006 19:58:33 -0000	1.95
+++ .cvsignore	22 Feb 2006 22:38:51 -0000	1.96
@@ -1 +1 @@
-mkinitrd-5.0.26.tar.bz2
+mkinitrd-5.0.27.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- mkinitrd.spec	15 Feb 2006 19:58:33 -0000	1.106
+++ mkinitrd.spec	22 Feb 2006 22:38:51 -0000	1.107
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.26
+Version: 5.0.27
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -11,7 +11,7 @@
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs
-BuildRequires: popt e2fsprogs-devel parted-devel
+BuildRequires: popt-devel e2fsprogs-devel parted-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
@@ -63,6 +63,17 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 5.0.27-1
+- Fix multiboot argument quoting in new-kernel-package (#182243)
+- Fix "netlink" fd error in hotplug initialization.
+- Fix directory creation in smartmknod()
+- Fix find command when it's not run alone (#181874, patch from Mark
+  McLoughlin)
+- Don't use 0-length uuids
+- Update /dev/mapper nodes more often
+- Allow dm partadd not to include the /dev/mapper path
+- Use /etc/fstab, not /fstab, so if you've got /sbin/mount it'll work
+
 * Wed Feb 15 2006 Peter Jones <pjones at redhat.com> - 5.0.26-1
 - fix detection of floppy devices, don't probe them for labels
 - fix grubby to use the same label scanning code as nash


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources	15 Feb 2006 19:58:33 -0000	1.102
+++ sources	22 Feb 2006 22:38:51 -0000	1.103
@@ -1 +1 @@
-8a2ab27eba7186b08a88adfc85e31569  mkinitrd-5.0.26.tar.bz2
+3f4f55244bc1ad38ed1d889f2fe3b462  mkinitrd-5.0.27.tar.bz2



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:46:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:46:06 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.43, 1.44 Makefile.devel, 1.3,
	1.4 policy-20060207.patch, 1.18, 1.19 selinux-policy.spec,
	1.120, 1.121 sources, 1.47, 1.48
Message-ID: <200602222246.k1MMk6AI014733@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14117

Modified Files:
	.cvsignore Makefile.devel policy-20060207.patch 
	selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore	21 Feb 2006 20:39:54 -0000	1.43
+++ .cvsignore	22 Feb 2006 22:46:02 -0000	1.44
@@ -44,3 +44,4 @@
 serefpolicy-2.2.17.tgz
 serefpolicy-2.2.18.tgz
 serefpolicy-2.2.19.tgz
+serefpolicy-2.2.20.tgz


Index: Makefile.devel
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/Makefile.devel,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.devel	22 Feb 2006 00:53:12 -0000	1.3
+++ Makefile.devel	22 Feb 2006 22:46:02 -0000	1.4
@@ -1,192 +1,17 @@
 # installation paths
-SHAREDIR := $(PREFIX)/share/selinux
-HEADERDIR := $(SHAREDIR)/refpolicy/include
+SHAREDIR := /usr/share/selinux
+HEADERDIR := $(SHAREDIR)/devel/include
 
-include $(HEADERDIR)/build.conf
-
-# executables
-PREFIX := /usr
-BINDIR := $(PREFIX)/bin
-SBINDIR := $(PREFIX)/sbin
-CHECKMODULE := $(BINDIR)/checkmodule
-SEMODULE := $(SBINDIR)/semodule
-SEMOD_PKG := $(BINDIR)/semodule_package
-XMLLINT := $(BINDIR)/xmllint
-
-# helper tools
 AWK ?= gawk
-INSTALL ?= install
-M4 ?= m4
-SED ?= sed
-EINFO ?= echo
-PYTHON ?= python
+NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
 
-# set default build options if missing
-NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
 MLSENABLED := $(shell cat /selinux/mls)
 ifeq ($(MLSENABLED),1)
 MCSFLAG=-mcs
 endif
 
 TYPE ?= $(NAME)${MCSFLAG}
-DIRECT_INITRC ?= n
-POLY ?= n
-QUIET ?= y
-
-genxml := $(PYTHON) $(HEADERDIR)/support/segenxml.py
-
-docs = doc
-polxml = $(docs)/policy.xml
-xmldtd = $(HEADERDIR)/support/policy.dtd
-layerxml = metadata.xml
-
-globaltun = $(HEADERDIR)/global_tunables.xml
-globalbool = $(HEADERDIR)/global_booleans.xml
-
-# compile strict policy if requested.
-ifneq ($(findstring strict,$(TYPE)),)
-	M4PARAM += -D strict_policy
-endif
-
-# compile targeted policy if requested.
-ifneq ($(findstring targeted,$(TYPE)),)
-	M4PARAM += -D targeted_policy
-endif
-
-# enable MLS if requested.
-ifneq ($(findstring -mls,$(TYPE)),)
-	M4PARAM += -D enable_mls
-	CHECKPOLICY += -M
-	CHECKMODULE += -M
-endif
-
-# enable MLS if MCS requested.
-ifneq ($(findstring -mcs,$(TYPE)),)
-	M4PARAM += -D enable_mcs
-	CHECKPOLICY += -M
-	CHECKMODULE += -M
-endif
 
-# enable distribution-specific policy
-ifneq ($(DISTRO),)
-	M4PARAM += -D distro_$(DISTRO)
-endif
-
-# enable polyinstantiation
-ifeq ($(POLY),y)
-	M4PARAM += -D enable_polyinstantiation
-endif
-
-ifeq ($(DIRECT_INITRC),y)
-	M4PARAM += -D direct_sysadm_daemon
-endif
+include $(HEADERDIR)/Makefile
 
-ifeq ($(QUIET),y)
-	verbose := @
-endif
-
-M4PARAM += -D hide_broken_symptoms
-
-# policy headers
-m4support = $(wildcard $(HEADERDIR)/support/*.spt)
-all_layers = $(filter-out $(HEADERDIR)/support,$(shell find $(wildcard $(HEADERDIR)/*) -maxdepth 0 -type d))
-all_interfaces = $(foreach layer,$(all_layers),$(wildcard $(layer)/*.if))
-rolemap = $(HEADERDIR)/rolemap
-
-detected_layers =  $(filter-out CVS tmp $(docs),$(shell find $(wildcard *) -maxdepth 0 -type d))
-3rd_party_mods = $(wildcard *.te)
-3rd_party_ifs = $(3rd_party_mods:.te=.if)
-detected_mods = $(3rd_party_mods) $(foreach layer,$(detected_layers),$(wildcard $(layer)/*.te))
-detected_ifs = $(3rd_party_ifs) $(foreach layer,$(detected_layers),$(wildcard $(layer)/*.if))
-all_packages = $(notdir $(detected_mods:.te=.pp))
-
-vpath %.te $(detected_layers)
-vpath %.if $(detected_layers)
-vpath %.fc $(detected_layers)
-
-# if there are modules in the current directory, add them into the third party layer
-ifneq "$(3rd_party_ifs)" ""
-        genxml += -3 .
-endif
 
-########################################
-#
-# Functions
-#
-
-# parse-rolemap modulename,outputfile
-define parse-rolemap
-	$(verbose) $(M4) $(M4PARAM) $(rolemap) | \
-		$(AWK) '/^[[:blank:]]*[A-Za-z]/{ print "gen_require(type " $$3 "; role " $$1 ";)\n$1_per_userdomain_template(" $$2 "," $$3 "," $$1 ")" }' >> $2
-endef
-
-# peruser-expansion modulename,outputfile
-define peruser-expansion
-	$(verbose) echo "ifdef(\`""$1""_per_userdomain_template',\`" > $2
-	$(call parse-rolemap,$1,$2)
-	$(verbose) echo "')" >> $2
-endef
-
-.PHONY: clean all xml
-.SUFFIXES:
-.SUFFIXES: .pp
-
-########################################
-#
-# Main targets
-#
-
-all: $(all_packages)
-
-xml: $(polxml)
-
-########################################
-#
-# Build module packages
-#
-tmp/%.mod: $(m4support) tmp/all_interfaces.conf %.te
-	@$(EINFO) "Compliling $(NAME) $(basename $(@F)) module"
-	@test -d tmp || mkdir -p tmp
-	$(call peruser-expansion,$(basename $(@F)),$@.role)
-	$(verbose) $(M4) $(M4PARAM) -s $^ $@.role > $(@:.mod=.tmp)
-	$(verbose) $(CHECKMODULE) -m $(@:.mod=.tmp) -o $@
-
-tmp/%.mod.fc: $(m4support) %.fc
-	$(verbose) $(M4) $(M4PARAM) $^ > $@
-
-%.pp: tmp/%.mod tmp/%.mod.fc
-	@echo "Creating $(NAME) $(@F) policy package"
-	$(verbose) $(SEMOD_PKG) -o $@ -m $< -f $<.fc
-
-tmp/all_interfaces.conf: $(m4support) $(all_interfaces) $(detected_ifs)
-	@test -d tmp || mkdir -p tmp
-	$(verbose) m4 $^ | sed -e s/dollarsstar/\$$\*/g > $@
-
-
-########################################
-#
-# Documentation generation
-#
-
-# minimal dependencies here, because we don't want to rebuild
-# this and its dependents every time the dependencies
-# change.  Also use all .if files here, rather then just the
-# enabled modules.
-$(polxml): $(detected_ifs) $(foreach dir,$(all_layers),$(dir)/$(layerxml))
-	@echo "Creating $@"
-	@mkdir -p doc
-	$(verbose) echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>' > $@
-	$(verbose) echo '<!DOCTYPE policy SYSTEM "$(xmldtd)">' >> $@
-	$(verbose) $(genxml) -m $(layerxml) --tunables-xml $(globaltun) --booleans-xml $(globalbool) $(all_layers) $(detected_layers) >> $@
-	$(verbose) if test -x $(XMLLINT) && test -f $(xmldtd); then \
-		$(XMLLINT) --noout --dtdvalid $(xmldtd) $@ ;\
-	fi
-
-########################################
-#
-# Clean the environment
-#
-
-clean:
-	rm -fR tmp
-	rm -f *.pp

policy-20060207.patch:
 doc/Makefile.example                 |    2 
 policy/modules/admin/logwatch.te     |    2 
 policy/modules/admin/su.if           |   19 +++----
 policy/modules/admin/vpn.te          |    4 +
 policy/modules/apps/java.if          |    8 ---
 policy/modules/apps/slocate.te       |    2 
 policy/modules/kernel/devices.if     |   39 +++++++++++++++
 policy/modules/kernel/files.if       |    3 -
 policy/modules/kernel/files.te       |    1 
 policy/modules/services/apache.fc    |    2 
 policy/modules/services/apache.if    |   21 ++++++++
 policy/modules/services/automount.te |    3 +
 policy/modules/services/cron.if      |   18 +++++++
 policy/modules/services/cron.te      |    7 ++
 policy/modules/services/cups.if      |   19 +++++++
 policy/modules/services/postfix.te   |    1 
 policy/modules/services/ssh.if       |    2 
 policy/modules/system/authlogin.te   |    2 
 policy/modules/system/fstools.te     |    2 
 policy/modules/system/mount.te       |    2 
 policy/modules/system/selinuxutil.fc |    7 ++
 policy/modules/system/selinuxutil.if |   87 +++++++++++++++++++++++++++++++++++
 policy/modules/system/selinuxutil.te |   77 +++++++++++++++++++++++++++---
 policy/modules/system/userdomain.if  |   24 +++++++++
 policy/modules/system/userdomain.te  |    4 +
 25 files changed, 327 insertions(+), 31 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- policy-20060207.patch	22 Feb 2006 18:41:25 -0000	1.18
+++ policy-20060207.patch	22 Feb 2006 22:46:02 -0000	1.19
@@ -1,6 +1,17 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.19/policy/modules/admin/logwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/Makefile.example serefpolicy-2.2.20/doc/Makefile.example
+--- nsaserefpolicy/doc/Makefile.example	2006-02-22 14:08:56.000000000 -0500
++++ serefpolicy-2.2.20/doc/Makefile.example	2006-02-22 14:29:48.000000000 -0500
+@@ -3,6 +3,6 @@
+ 
+ NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
+ SHAREDIR ?= /usr/share/selinux
+-HEADERDIR := $(SHAREDIR)/$(NAME)/include
++HEADERDIR := $(SHAREDIR)/refpolicy/include
+ 
+ include $(HEADERDIR)/Makefile
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.20/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/logwatch.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/admin/logwatch.te	2006-02-22 14:22:49.000000000 -0500
 @@ -71,6 +71,8 @@
  
  selinux_dontaudit_getattr_dir(logwatch_t)
@@ -10,9 +21,9 @@
  userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
  userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.19/policy/modules/admin/su.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.20/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/su.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/admin/su.if	2006-02-22 14:22:49.000000000 -0500
 @@ -220,6 +220,14 @@
  		nscd_socket_use($1_su_t)
  	')
@@ -46,9 +57,9 @@
  	ifdef(`ssh.te', `
  	# Access sshd cookie files.
  	allow $1_su_t sshd_tmp_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.19/policy/modules/admin/vpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.20/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/admin/vpn.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/admin/vpn.te	2006-02-22 14:22:49.000000000 -0500
 @@ -106,6 +106,10 @@
  
  optional_policy(`dbus',`
@@ -60,9 +71,9 @@
  ')
  
  optional_policy(`mount',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.19/policy/modules/apps/java.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.20/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/apps/java.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/apps/java.if	2006-02-22 14:22:49.000000000 -0500
 @@ -149,13 +149,9 @@
  	userdom_manage_user_home_content_sockets($1,$1_javaplugin_t)
  	userdom_user_home_dir_filetrans_user_home_content($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
@@ -79,9 +90,9 @@
  
  		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.19/policy/modules/apps/slocate.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.20/policy/modules/apps/slocate.te
 --- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/apps/slocate.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/apps/slocate.te	2006-02-22 14:22:49.000000000 -0500
 @@ -36,6 +36,8 @@
  
  files_list_all(locate_t)
@@ -91,9 +102,9 @@
  files_read_etc_runtime_files(locate_t)
  files_read_etc_files(locate_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.19/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.20/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/kernel/devices.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/kernel/devices.if	2006-02-22 14:22:49.000000000 -0500
 @@ -1115,6 +1115,45 @@
  
  ########################################
@@ -140,9 +151,36 @@
  ##	Read input event devices (/dev/input).
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.19/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.20/policy/modules/kernel/files.if
+--- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/kernel/files.if	2006-02-22 17:28:29.000000000 -0500
+@@ -3358,10 +3358,11 @@
+ 	allow $1 self:process setfscreate;
+ 	allow $1 polymember: dir { create setattr };
+ 	allow $1 polydir: dir { write add_name };
+-	allow $1 polyparent:dir { write add_name };
++	allow $1 polyparent:dir { write add_name relabelfrom relabelto };
+ 
+ 	# Default type for mountpoints
+ 	allow $1 poly_t:dir { create mounton };
++	fs_unmount_xattr_fs($1)
+ ')
+ 
+ ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.2.20/policy/modules/kernel/files.te
+--- nsaserefpolicy/policy/modules/kernel/files.te	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/kernel/files.te	2006-02-22 17:01:45.000000000 -0500
+@@ -125,6 +125,7 @@
+ #
+ type tmp_t, mountpoint; #, polydir
+ files_tmp_file(tmp_t)
++files_poly_parent(tmp_t)
+ 
+ #
+ # usr_t is the type for /usr.
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.20/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/apache.fc	2006-02-21 19:01:53.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/apache.fc	2006-02-22 14:22:49.000000000 -0500
 @@ -45,7 +45,7 @@
  /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -152,9 +190,9 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.19/policy/modules/services/apache.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.20/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/apache.if	2006-02-22 08:16:12.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/apache.if	2006-02-22 14:28:46.000000000 -0500
 @@ -94,6 +94,7 @@
  
  	corecmd_exec_bin(httpd_$1_script_t)
@@ -171,7 +209,7 @@
  
  		files_read_etc_runtime_files(httpd_$1_script_t)
  		files_read_usr_files(httpd_$1_script_t)
-@@ -798,3 +800,40 @@
+@@ -798,3 +800,22 @@
  
  	allow $1 httpd_sys_script_t:dir search;
  ')
@@ -179,24 +217,6 @@
 +
 +########################################
 +## <summary>
-+##	Read apache config files
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit.
-+##	</summary>
-+## </param>
-+#
-+interface(`apache_read_config',`
-+	gen_require(`
-+		type httpd_config_t;
-+	')
-+
-+	allow $1 httpd_config_t:file { getattr read };
-+')
-+
-+########################################
-+## <summary>
 +##	Read apache system content
 +## </summary>
 +## <param name="domain">
@@ -212,9 +232,9 @@
 +	allow $1 httpd_sys_content_t:dir r_dir_perms;
 +	allow $1 httpd_sys_content_t:file { getattr read };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.19/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.20/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/automount.te	2006-02-22 11:39:30.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/automount.te	2006-02-22 14:22:49.000000000 -0500
 @@ -83,6 +83,9 @@
  corenet_tcp_connect_portmap_port(automount_t)
  corenet_tcp_connect_all_ports(automount_t)
@@ -225,9 +245,9 @@
  
  dev_read_sysfs(automount_t)
  # for SSP
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.19/policy/modules/services/cron.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.20/policy/modules/services/cron.if
 --- nsaserefpolicy/policy/modules/services/cron.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/cron.if	2006-02-22 08:23:34.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/cron.if	2006-02-22 14:22:49.000000000 -0500
 @@ -434,6 +434,24 @@
  
  ########################################
@@ -253,9 +273,9 @@
  ##	Read, and write cron daemon TCP sockets.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.19/policy/modules/services/cron.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.20/policy/modules/services/cron.te
 --- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/cron.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/cron.te	2006-02-22 14:22:49.000000000 -0500
 @@ -360,6 +360,9 @@
  	optional_policy(`apache',`
  		# Needed	 for certwatch
@@ -277,9 +297,9 @@
  	optional_policy(`samba',`
  		samba_read_config(system_crond_t)
  		samba_read_log(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.19/policy/modules/services/cups.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.20/policy/modules/services/cups.if
 --- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/cups.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/cups.if	2006-02-22 14:22:49.000000000 -0500
 @@ -169,6 +169,25 @@
  
  ########################################
@@ -306,9 +326,9 @@
  ##	Connect to ptal over an unix domain stream socket.
  ## </summary>
  ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.19/policy/modules/services/postfix.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.20/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-21 14:40:24.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/postfix.te	2006-02-22 08:23:50.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/postfix.te	2006-02-22 14:22:49.000000000 -0500
 @@ -440,6 +440,7 @@
  optional_policy(`crond',`
  	cron_use_fd(postfix_postdrop_t)
@@ -317,9 +337,9 @@
  	cron_use_system_job_fds(postfix_postdrop_t)
  	cron_rw_system_job_pipes(postfix_postdrop_t)
  ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.19/policy/modules/services/ssh.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.20/policy/modules/services/ssh.if
 --- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/services/ssh.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/services/ssh.if	2006-02-22 14:22:49.000000000 -0500
 @@ -279,6 +279,8 @@
  
  	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
@@ -329,9 +349,9 @@
  	allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
  
  	# for ssh-add
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.19/policy/modules/system/authlogin.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.20/policy/modules/system/authlogin.te
 --- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/authlogin.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/authlogin.te	2006-02-22 14:22:49.000000000 -0500
 @@ -153,6 +153,8 @@
  dev_read_sysfs(pam_console_t)
  dev_getattr_apm_bios_dev(pam_console_t)
@@ -341,9 +361,9 @@
  dev_getattr_framebuffer_dev(pam_console_t)
  dev_setattr_framebuffer_dev(pam_console_t)
  dev_getattr_misc_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.19/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.20/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/fstools.te	2006-02-21 18:41:06.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/fstools.te	2006-02-22 14:22:49.000000000 -0500
 @@ -45,7 +45,7 @@
  files_tmp_filetrans(fsadm_t, fsadm_tmp_t, { file dir })
  
@@ -353,9 +373,9 @@
  
  kernel_read_system_state(fsadm_t)
  kernel_read_kernel_sysctls(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.19/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.20/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/mount.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/mount.te	2006-02-22 14:22:49.000000000 -0500
 @@ -137,6 +137,8 @@
  	samba_domtrans_smbmount(mount_t)
  ')
@@ -365,9 +385,9 @@
  ifdef(`TODO',`
  # TODO: Need to examine this further. Not sure how to handle this
  #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.20/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.fc	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.fc	2006-02-22 17:10:36.000000000 -0500
 @@ -39,3 +39,10 @@
  ifdef(`distro_debian', `
  /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
@@ -375,14 +395,13 @@
 +
 +/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
 +
-+/etc/selinux([^/]*/)?modules    -d	gen_context(system_u:object_r:selinux_config_t,s0)
-+/etc/selinux([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semodule_store_t,s0)
-+/etc/selinux([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
-+/etc/selinux([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
-\ No newline at end of file
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.19/policy/modules/system/selinuxutil.if
++/etc/selinux/([^/]*/)?modules    -d	gen_context(system_u:object_r:selinux_config_t,s0)
++/etc/selinux/([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semodule_store_t,s0)
++/etc/selinux/([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
++/etc/selinux/([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.20/policy/modules/system/selinuxutil.if
 --- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.if	2006-02-22 14:22:49.000000000 -0500
 @@ -778,3 +778,90 @@
  	allow $1 policy_src_t:dir create_dir_perms;
  	allow $1 policy_src_t:file create_file_perms;
@@ -474,9 +493,9 @@
 +	allow $1 semodule_trans_lock_t:file rw_file_perms;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.19/policy/modules/system/selinuxutil.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.20/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/selinuxutil.te	2006-02-22 08:12:03.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.te	2006-02-22 14:22:49.000000000 -0500
 @@ -103,6 +103,27 @@
  
  ########################################
@@ -583,9 +602,9 @@
 +	selinux_get_enforce_mode(semodule_t)
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.19/policy/modules/system/userdomain.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.20/policy/modules/system/userdomain.if
 --- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/userdomain.if	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/userdomain.if	2006-02-22 14:22:49.000000000 -0500
 @@ -145,6 +145,7 @@
  	allow $1_t unpriv_userdomain:fd use;
  
@@ -628,9 +647,9 @@
 +	allow $1 user_home_type:dir mounton;
 +')
 +
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.19/policy/modules/system/userdomain.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.20/policy/modules/system/userdomain.te
 --- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.19/policy/modules/system/userdomain.te	2006-02-21 17:24:20.000000000 -0500
++++ serefpolicy-2.2.20/policy/modules/system/userdomain.te	2006-02-22 14:22:49.000000000 -0500
 @@ -75,7 +75,7 @@
  	files_associate_tmp(user_home_t)
  	fs_associate_tmpfs(user_home_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- selinux-policy.spec	22 Feb 2006 18:48:03 -0000	1.120
+++ selinux-policy.spec	22 Feb 2006 22:46:02 -0000	1.121
@@ -8,14 +8,15 @@
 %define CHECKPOLICYVER 1.29.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.19
-Release: 3
+Version: 2.2.20
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-20060207.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
+Source3: Makefile.devel
 Source4: setrans-targeted.conf
 Source5: modules-mls.conf
 Source6: booleans-mls.conf	
@@ -37,7 +38,11 @@
 
 %files 
 %{_mandir}/man8/*
-%doc /usr/share/doc/%{name}-%{version}
+%doc %{_usr}/share/doc/%{name}-%{version}
+%dir %{_usr}/share/selinux
+%dir %{_sysconfdir}/selinux
+%ghost %config(noreplace) %{_sysconfdir}/selinux/config
+%ghost %{_sysconfdir}/sysconfig/selinux
 
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
@@ -60,8 +65,6 @@
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
-touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \
-touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/selinux \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/policy/policy.%{POLICYVER} \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
@@ -72,12 +75,8 @@
 
 %define fileList() \
 %defattr(-,root,root) \
-%dir %{_usr}/share/selinux \
 %dir %{_usr}/share/selinux/%1 \
 %{_usr}/share/selinux/%1/*.pp \
-%dir %{_sysconfdir}/selinux \
-%ghost %config(noreplace) %{_sysconfdir}/selinux/config \
-%ghost %{_sysconfdir}/sysconfig/selinux \
 %dir %{_sysconfdir}/selinux/%1 \
 %config(noreplace) %{_sysconfdir}/selinux/%1/setrans.conf \
 %ghost %{_sysconfdir}/selinux/%1/seusers \
@@ -139,6 +138,11 @@
 %{__rm} -fR $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8/
 install -m 644 man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+mkdir -p %{_usr}/share/selinux
+touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config
+touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/selinux
 
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
@@ -157,10 +161,10 @@
 
 # Install devel
 make clean
-make 
-make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
-install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
-install -m 755 doc/Makefile.example ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
+make NAME=devel TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
+install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
+install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile
+install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/doc/%{name}-%{version}/Makefile.example
 
 
 %clean
@@ -284,15 +288,15 @@
 
 %files devel
 %defattr(-,root,root) 
-%dir %{_usr}/share/selinux/refpolicy
-%dir %{_usr}/share/selinux/refpolicy/include
-%{_usr}/share/selinux/refpolicy/include/*
-%{_usr}/share/selinux/refpolicy/Makefile
-%{_usr}/share/selinux/refpolicy/policygentool
+%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
 
 %changelog
 
-* Wed Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.19-3
+* Wed Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.20-1
 - Fix load_policy to work on MLS
 - Fix cron_rw_system_pipes for postfix_postdrop_t
 - Allow audotmount to run showmount


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	21 Feb 2006 20:39:54 -0000	1.47
+++ sources	22 Feb 2006 22:46:02 -0000	1.48
@@ -1 +1 @@
-9799c5001a35b5b3857b3c58931ab515  serefpolicy-2.2.19.tgz
+16bf45c49cbe78b2c977cffc88884de2  serefpolicy-2.2.20.tgz



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:52:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:52:20 -0500
Subject: rpms/yum/devel .cvsignore, 1.31, 1.32 sources, 1.33, 1.34 yum.spec,
	1.79, 1.80 yum-2.5-comps-conditional.patch, 1.1,
	NONE yum-2.5-plugin-groups.patch, 1.1,
	NONE yum-2.5-sortedconstants.patch, 1.1,
	NONE yum-2.5-sortedtransaction.patch, 1.1,
	NONE yum-2.5-tsinfo-factory.patch, 1.1,
	NONE yum-2.5-txmbrhash.patch, 1.1,
	NONE yum-2.5.0-depsolve.patch, 1.2,
	NONE yum-2.5.0-locationbase.patch, 1.1,
	NONE yum-2.5.0-mirror.patch, 1.2,
	NONE yum-2.5.1-grouplists.patch, 1.1,
	NONE yum-2.5.1-remove.patch, 1.2, NONE
Message-ID: <200602222252.k1MMqKI1024887@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24852

Modified Files:
	.cvsignore sources yum.spec 
Removed Files:
	yum-2.5-comps-conditional.patch yum-2.5-plugin-groups.patch 
	yum-2.5-sortedconstants.patch yum-2.5-sortedtransaction.patch 
	yum-2.5-tsinfo-factory.patch yum-2.5-txmbrhash.patch 
	yum-2.5.0-depsolve.patch yum-2.5.0-locationbase.patch 
	yum-2.5.0-mirror.patch yum-2.5.1-grouplists.patch 
	yum-2.5.1-remove.patch 
Log Message:
* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 2.5.3-1
- Update to 2.5.3 with fixes for lots of stuff (and all of our patches applied)
  (#177528, #177737, #179512, others)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	9 Jan 2006 02:06:21 -0000	1.31
+++ .cvsignore	22 Feb 2006 22:52:17 -0000	1.32
@@ -1 +1 @@
-yum-2.5.1.tar.gz
+yum-2.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	9 Jan 2006 02:06:21 -0000	1.33
+++ sources	22 Feb 2006 22:52:17 -0000	1.34
@@ -1 +1 @@
-9bfeea7a520c87f1147bed48820a0ea1  yum-2.5.1.tar.gz
+b4ad9c971a55c62d464431689ffece2d  yum-2.5.3.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- yum.spec	10 Feb 2006 15:22:54 -0000	1.79
+++ yum.spec	22 Feb 2006 22:52:18 -0000	1.80
@@ -2,8 +2,8 @@
 
 Summary: RPM installer/updater
 Name: yum
-Version: 2.5.1
-Release: 5
+Version: 2.5.3
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz
@@ -12,13 +12,6 @@
 Source99: plugin.conf
 # default plugins here
 Source100: installonlyn.py
-Patch0: yum-2.5.1-remove.patch
-Patch1: yum-2.5.1-grouplists.patch
-Patch2: yum-2.5-sortedconstants.patch
-Patch3: yum-2.5-sortedtransaction.patch
-Patch4: yum-2.5-tsinfo-factory.patch
-Patch5: yum-2.5-plugin-groups.patch
-Patch6: yum-2.5-comps-conditional.patch
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -38,13 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .remove
-%patch1 -p1 -b .grouplists
-%patch2 -p0 -b .sortedconstants
-%patch3 -p0 -b .sortedtransaction
-%patch4 -p0 -b .tsinfofactory
-%patch5 -p0 -b .plugingrp
-%patch6 -p0 -b .condcomps
 
 %build
 make
@@ -106,6 +92,10 @@
 /usr/lib/yum-plugins/*
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 2.5.3-1
+- Update to 2.5.3 with fixes for lots of stuff (and all of our patches applied)
+  (#177528, #177737, #179512, others)
+
 * Fri Feb 10 2006 Paul Nasrat <pnasrat at redhat.com> - 2.5.1-5
 - Merge patches from head for group plugin support and conditionals
 


--- yum-2.5-comps-conditional.patch DELETED ---


--- yum-2.5-plugin-groups.patch DELETED ---


--- yum-2.5-sortedconstants.patch DELETED ---


--- yum-2.5-sortedtransaction.patch DELETED ---


--- yum-2.5-tsinfo-factory.patch DELETED ---


--- yum-2.5-txmbrhash.patch DELETED ---


--- yum-2.5.0-depsolve.patch DELETED ---


--- yum-2.5.0-locationbase.patch DELETED ---


--- yum-2.5.0-mirror.patch DELETED ---


--- yum-2.5.1-grouplists.patch DELETED ---


--- yum-2.5.1-remove.patch DELETED ---



From fedora-cvs-commits at redhat.com  Wed Feb 22 22:58:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 17:58:32 -0500
Subject: rpms/rhpxl/devel .cvsignore, 1.19, 1.20 rhpxl.spec, 1.21,
	1.22 sources, 1.21, 1.22
Message-ID: <200602222258.k1MMwW5C027528@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/rhpxl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27489/devel

Modified Files:
	.cvsignore rhpxl.spec sources 
Log Message:
auto-import rhpxl-0.17-1 on branch devel from rhpxl-0.17-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	22 Feb 2006 21:08:38 -0000	1.19
+++ .cvsignore	22 Feb 2006 22:58:29 -0000	1.20
@@ -1,7 +1 @@
-rhpxl-0.10.tar.gz
-rhpxl-0.11.tar.gz
-rhpxl-0.12.tar.gz
-rhpxl-0.13.tar.gz
-rhpxl-0.14.tar.gz
-rhpxl-0.15.tar.gz
-rhpxl-0.16.tar.gz
+rhpxl-0.17.tar.gz


Index: rhpxl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rhpxl.spec	22 Feb 2006 21:08:38 -0000	1.21
+++ rhpxl.spec	22 Feb 2006 22:58:29 -0000	1.22
@@ -2,7 +2,7 @@
 
 Summary: Python library for configuring and running X.
 Name: rhpxl
-Version: 0.16
+Version: 0.17
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -43,6 +43,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.17-1
+- fix braindead i810 (#182300)
+
 * Wed Feb 22 2006 Chris Lumens <clumens at redhat.com> 0.16-1
 - Only put one non-vesa card in front of the list (#182016).
 - Provide a fixed list of supported resolutions for the SGI 1600SW (#115679).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	22 Feb 2006 21:08:38 -0000	1.21
+++ sources	22 Feb 2006 22:58:29 -0000	1.22
@@ -1 +1 @@
-4fcd1cfcf4d70b849c8b040cb50f4ed0  rhpxl-0.16.tar.gz
+110edd1f567d4d68d32fabff07697bfc  rhpxl-0.17.tar.gz



From fedora-cvs-commits at redhat.com  Wed Feb 22 23:24:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 18:24:59 -0500
Subject: rpms/xerces-j2/devel .cvsignore, 1.8, 1.9 sources, 1.6,
	1.7 xerces-j2-build.patch, 1.6, 1.7 xerces-j2.spec, 1.41, 1.42
Message-ID: <200602222324.k1MNOxGF015069@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/xerces-j2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15037

Modified Files:
	.cvsignore sources xerces-j2-build.patch xerces-j2.spec 
Log Message:
Updated to 2.7.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Jun 2005 09:43:46 -0000	1.8
+++ .cvsignore	22 Feb 2006 23:24:56 -0000	1.9
@@ -1,4 +1 @@
-Xerces-J-src.2.6.2.tar.gz
-xerces-2_6_2
-i386
-*.src.rpm
+Xerces-J-src.2.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Jun 2005 09:43:46 -0000	1.6
+++ sources	22 Feb 2006 23:24:57 -0000	1.7
@@ -1 +1 @@
-cfd536b8d72f8ebe3465ae35f5e3775d  Xerces-J-src.2.6.2.tar.gz
+487701cad13bcf87cec21ed2d782ca45  Xerces-J-src.2.7.1.tar.gz

xerces-j2-build.patch:
 build.xml |   45 +++++----------------------------------------
 1 files changed, 5 insertions(+), 40 deletions(-)

Index: xerces-j2-build.patch
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2-build.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xerces-j2-build.patch	14 Jun 2005 09:43:46 -0000	1.6
+++ xerces-j2-build.patch	22 Feb 2006 23:24:57 -0000	1.7
@@ -1,5 +1,5 @@
---- xerces-2_6_2/build.xml.old	2004-06-23 22:51:24.713522228 +0300
-+++ xerces-2_6_2/build.xml	2004-06-23 22:51:30.820838826 +0300
+--- build.xml.orig	2005-06-25 16:25:27.000000000 -0400
++++ build.xml	2005-07-26 19:46:47.000000000 -0400
 @@ -19,7 +19,8 @@
  <project default="usage" basedir=".">
  
@@ -10,7 +10,7 @@
  
    <!-- Allow properties following these statements to be overridden -->
    <!-- Note that all of these don't have to exist.  They've just been defined
-@@ -70,7 +71,7 @@
+@@ -69,7 +70,7 @@
      <property name="packages" value="org.*"/>
  
      <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
@@ -19,35 +19,43 @@
  
      <property name="build.dir" value="./build"/>
      <property name="build.src" value="${build.dir}/src"/>
-@@ -84,7 +85,6 @@
+@@ -83,7 +84,6 @@
      <property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
      <property name="disttools.dir" value="${build.dir}/tools"/>
      <property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
--    <property name='src.apis.zip' value="${tools.dir}/xml-commons-external-1.2.01-src.zip"/>
+-    <property name='src.apis.zip' value="${tools.dir}/xml-commons-external-src.zip"/>
  
      <filter token="year" value="${year}"/>
      <filter token="version" value="${parser.Version}"/>
-@@ -190,19 +190,6 @@
+@@ -195,27 +195,6 @@
+                        javax.xml.parsers.ConvertToURI.java">
          </fileset>
      </copy>
- 
+-
 -    <!-- now deal with API's:  -->
 -    <unzip src="${src.apis.zip}" dest="${build.src}">
 -        <patternset
 -            includes="org/xml/sax/** 
+-    	        javax/xml/**
+-    	        javax/xml/datatype/**
+-    	        javax/xml/namespace/**
 -                javax/xml/parsers/**
+-    	        javax/xml/transform/**
+-    	        javax/xml/validation/**
+-    	        javax/xml/xpath/**
 -                org/w3c/dom/*
 -                org/w3c/dom/events/**
 -                org/w3c/dom/html/**
+-                org/w3c/dom/ls/**
 -                org/w3c/dom/ranges/**
--                org/w3c/dom/traversal/**"
+-                org/w3c/dom/traversal/**
+-        	    org/w3c/dom/xpath/**"
 -        />
 -    </unzip>
--    
+     
      <!-- substitute tokens as needed -->
      <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
-              token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
-@@ -304,7 +291,7 @@
+@@ -311,7 +290,7 @@
      </copy>
      <xjavac srcdir="${build.tests}"
             destdir="${build.dest}"
@@ -56,7 +64,7 @@
             debug="${debug}"
             includeAntRuntime="false"
             includeJavaRuntime="true"/>
-@@ -347,7 +334,7 @@
+@@ -354,7 +333,7 @@
    <target name="docs" depends="prepare, prepare-docs">
      <echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
      <java fork="yes"
@@ -65,9 +73,9 @@
            classname="${doc.generator}"
            failOnError="yes">
        <arg value="targetDirectory=${build.docs}"/>
-@@ -941,20 +928,6 @@
-     <replace file="${build.dir}/src/org/apache/xerces/dom/AttrNSImpl.java" 
-              token="return ((String)type).getNamespace();" value="return null;"/>
+@@ -997,20 +976,6 @@
+     <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
+              token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
   
 -    <!-- now deal with API's:  -->
 -    <unzip src="${src.apis.zip}" dest="${build.src}">
@@ -86,12 +94,3 @@
      <!-- substitute tokens as needed -->
      <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
               token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
-@@ -1282,7 +1255,7 @@
- 
-     <xjavac srcdir="${build.tests}"
-            destdir="${build.dest}"
--           classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:./tools/junit.jar"
-+           classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:${tools.dir}/junit.jar"
-            debug="${debug}"
-            includeAntRuntime="false"
-            includeJavaRuntime="true"/>


Index: xerces-j2.spec
===================================================================
RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xerces-j2.spec	11 Feb 2006 06:08:54 -0000	1.41
+++ xerces-j2.spec	22 Feb 2006 23:24:57 -0000	1.42
@@ -1,7 +1,7 @@
 %define name		xerces-j2
-%define version		2.6.2
-%define cvs_version	2_6_2
-%define release 	6jpp_5fc
+%define version		2.7.1
+%define cvs_version	2_7_1
+%define release 	6jpp_6fc
 %define section		free
 
 Name:		%{name}
@@ -20,13 +20,13 @@
 Patch1:         %{name}-libgcj.patch
 Provides:	jaxp_parser_impl
 Requires:	xml-commons-apis
-Requires:	xml-commons-resolver
+Requires:	xml-commons-resolver >= 1.1
 Requires:	/usr/sbin/update-alternatives
 BuildRequires:	java-devel
 BuildRequires:	ant >= 0:1.5
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	jaxp_parser_impl
-BuildRequires:	xml-commons-resolver
+BuildRequires:	xml-commons-resolver >= 0:1.1
 BuildRequires:	xml-commons-apis
 BuildRequires:  coreutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -71,13 +71,6 @@
 %description    javadoc-apis
 Javadoc for %{name} apis.
 
-%package        javadoc-dom3
-Summary:	Javadoc for %{name} DOM3
-Group:		Development/Documentation
-
-%description    javadoc-dom3
-Javadoc for %{name} DOM3.
-
 %package        javadoc-xni
 Summary:	Javadoc for %{name} xni
 Group:		Development/Documentation
@@ -114,7 +107,7 @@
 
 %prep
 %setup -q -n xerces-%{cvs_version}
-%patch0 -p1 -b .build
+%patch0 -p0 -b .build
 
 mkdir -p tools/org/apache/xerces/util
 cp -a %{SOURCE3} tools/org/apache/xerces/util
@@ -161,11 +154,6 @@
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni-%{version}
 ln -s %{name}-xni-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
-cp -pr build/docs/javadocs/dom3-api/* \
-  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
-ln -s %{name}-dom3-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3
-
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
 cp -pr build/docs/javadocs/other/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
@@ -201,10 +189,6 @@
 rm -f %{_javadocdir}/%{name}-apis
 ln -s %{name}-apis-%{version} %{_javadocdir}/%{name}-apis
 
-%post javadoc-dom3
-rm -f %{_javadocdir}/%{name}-dom3
-ln -s %{name}-dom3-%{version} %{_javadocdir}/%{name}-dom3
-
 %post javadoc-impl
 rm -f %{_javadocdir}/%{name}-impl
 ln -s %{name}-impl-%{version} %{_javadocdir}/%{name}-impl
@@ -255,11 +239,6 @@
 %doc %{_javadocdir}/%{name}-apis-%{version}
 %ghost %doc %{_javadocdir}/%{name}-apis
 
-%files javadoc-dom3
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}-dom3-%{version}
-%ghost %doc %{_javadocdir}/%{name}-dom3
-
 %files javadoc-other
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-other-%{version}
@@ -281,6 +260,9 @@
 
 
 %changelog
+* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:2.7.1-6jpp_6fc
+- Updated to 2.7.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.6.2-6jpp_5fc
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Wed Feb 22 23:38:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 18:38:26 -0500
Subject: rpms/xorg-x11-drv-glint/devel xorg-x11-drv-glint.spec,1.7,1.8
Message-ID: <200602222338.k1MNcPwh018880@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-glint/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18855

Modified Files:
	xorg-x11-drv-glint.spec 
Log Message:
* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-2
- Install glint.xinf, which was inadvertently left out of packaging (#182502)



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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-glint.spec	7 Feb 2006 14:26:07 -0000	1.7
+++ xorg-x11-drv-glint.spec	22 Feb 2006 23:38:23 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
 Version:   1.0.1.3
-Release:   1.1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   glint.xinf
@@ -37,6 +37,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -49,11 +52,15 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/glint_drv.so
+%{_datadir}/hwdata/videoaliases/glint.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/glint.4*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1.3-1.1
+* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.1.3-2
+- Install glint.xinf, which was inadvertently left out of packaging (#182502)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 1.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> 1.0.1.3-1



From fedora-cvs-commits at redhat.com  Wed Feb 22 23:39:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 18:39:01 -0500
Subject: rpms/xorg-x11-drv-i740/devel xorg-x11-drv-i740.spec,1.7,1.8
Message-ID: <200602222339.k1MNd1kv019088@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-i740/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19053

Modified Files:
	xorg-x11-drv-i740.spec 
Log Message:
* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
- Install i740.xinf, which was inadvertently left out of packaging (#182503)



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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-i740.spec	7 Feb 2006 14:26:38 -0000	1.7
+++ xorg-x11-drv-i740.spec	22 Feb 2006 23:38:56 -0000	1.8
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i740 video driver
 Name:      xorg-x11-drv-i740
 Version:   1.0.0.5
-Release:   1.1
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i740.xinf
@@ -37,6 +37,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -49,11 +52,15 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/i740_drv.so
+%{_datadir}/hwdata/videoaliases/i740.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/i740.4*
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1.0.0.5-1.1
+* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1.0.0.5-2
+- Install i740.xinf, which was inadvertently left out of packaging (#182503)
+
+* 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



From fedora-cvs-commits at redhat.com  Wed Feb 22 23:40:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 18:40:15 -0500
Subject: rpms/xorg-x11-drv-s3/devel xorg-x11-drv-s3.spec,1.9,1.10
Message-ID: <200602222340.k1MNeFb1019496@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-s3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19459

Modified Files:
	xorg-x11-drv-s3.spec 
Log Message:
* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-2
- Install s3.xinf, which was inadvertently left out of packaging (#182505)



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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-s3.spec	11 Feb 2006 06:21:42 -0000	1.9
+++ xorg-x11-drv-s3.spec	22 Feb 2006 23:40:02 -0000	1.10
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 s3 video driver
 Name:      xorg-x11-drv-s3
 Version:   0.3.5.5
-Release:   1.2
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
 Source1:   s3.xinf
@@ -37,6 +37,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -49,14 +52,18 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/s3_drv.so
+%{_datadir}/hwdata/videoaliases/s3.xinf
 #%dir %{_mandir}/man4x
 #%{_mandir}/man4/s3.4*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5.5-1.2
+* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-2
+- Install s3.xinf, which was inadvertently left out of packaging (#182505)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 0.3.5.5-1.2
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.3.5.5-1.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.3.5.5-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.3.5.5-1
@@ -69,15 +76,15 @@
 * Wed Nov 16 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.2-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.2 from X11R7 RC2
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 0.3.5.1-1
 - Updated xorg-x11-drv-s3 to version 0.3.5.1 from X11R7 RC1
 - Fix *.la file removal.
 
-* Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-1
+* Tue Oct 04 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86, x86_64, ppc
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 0.3.5-0
 - Initial spec file for s3 video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Wed Feb 22 23:40:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 18:40:47 -0500
Subject: rpms/xorg-x11-drv-via/devel xorg-x11-drv-via.spec,1.10,1.11
Message-ID: <200602222340.k1MNelIH019549@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-via/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19488

Modified Files:
	xorg-x11-drv-via.spec 
Log Message:
* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-2
- Install via.xinf, which was inadvertently left out of packaging (#182506)



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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-via.spec	7 Feb 2006 14:35:15 -0000	1.10
+++ xorg-x11-drv-via.spec	22 Feb 2006 23:40:16 -0000	1.11
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 via video driver
 Name:      xorg-x11-drv-via
 Version:   0.1.33.2
-Release:   1.1
+Release:   2
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -54,6 +54,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -66,7 +69,7 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/via_drv.so
-%dir %{_libdir}
+%{_datadir}/hwdata/videoaliases/via.xinf
 %if %{with_xvmc}
 %{_libdir}/libviaXvMC.so.1
 %{_libdir}/libviaXvMC.so.1.0.0
@@ -79,13 +82,15 @@
 %if %{with_xvmc}
 %files devel
 %defattr(-,root,root,-)
-%dir %{_libdir}
 %{_libdir}/libviaXvMC.so
 %{_libdir}/libviaXvMCPro.so
 %endif
 
 %changelog
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0.1.33.2-1.1
+* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-2
+- Install via.xinf, which was inadvertently left out of packaging (#182506)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> 0.1.33.2-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 0.1.33.2-1
@@ -102,7 +107,7 @@
 - Add rpm macro with_xvmc, and disable it by default, as upstream does not
   build the via XvMC modules in RC2.
 
-* Fri Nov 4 2005 Mike A. Harris <mharris at redhat.com> 0.1.31.1-1
+* Fri Nov 04 2005 Mike A. Harris <mharris at redhat.com> 0.1.31.1-1
 - Updated xorg-x11-drv-via to version 0.1.31.1 from X11R7 RC1
 - Fix *.la file removal.
 - Added "BuildRequires: libXvMC-devel" dependency.
@@ -112,11 +117,11 @@
   to actually build.
 - Added 'devel' subpackage for XvMC .so
 
-* Tue Oct 4 2005 Mike A. Harris <mharris at redhat.com> 0.1.31-1
+* Tue Oct 04 2005 Mike A. Harris <mharris at redhat.com> 0.1.31-1
 - Update BuildRoot to use Fedora Packaging Guidelines.
 - Deglob file manifest.
 - Limit "ExclusiveArch" to x86, x86_64
 
-* Fri Sep 2 2005 Mike A. Harris <mharris at redhat.com> 0.1.31-0
+* Fri Sep 02 2005 Mike A. Harris <mharris at redhat.com> 0.1.31-0
 - Initial spec file for via video driver generated automatically
   by my xorg-driverspecgen script.



From fedora-cvs-commits at redhat.com  Thu Feb 23 00:26:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 19:26:57 -0500
Subject: rpms/tomcat5/devel tomcat5-5.5-catalina.sh.patch, NONE,
 1.1 tomcat5-5.5-gcj-class-init-workaround.patch, NONE,
 1.1 tomcat5-5.5-http11-build.patch, NONE, 1.1 tomcat5-5.5-jasper.sh.patch,
 NONE, 1.1 tomcat5-5.5-javaxssl.patch, NONE,
 1.1 tomcat5-5.5-jdtcompiler.patch, NONE, 1.1 tomcat5-5.5-jk-build.patch,
 NONE, 1.1 tomcat5-5.5-jspc-classpath.patch, NONE,
 1.1 tomcat5-5.5-jspc-debug.patch, NONE, 1.1 tomcat5-5.5-jspc.sh.patch, NONE,
 1.1 tomcat5-5.5-jt5-build.patch, NONE, 1.1 tomcat5-5.5-jtc-build.patch, NONE,
 1.1 tomcat5-5.5-jtj-build.patch, NONE, 1.1 tomcat5-5.5-setclasspath.sh.patch,
 NONE, 1.1 tomcat5-5.5-skip-build-on-install.patch, NONE,
 1.1 tomcat5-5.5-skip-native.patch, NONE, 1.1 tomcat5-5.5-util-build.patch,
 NONE, 1.1 tomcat5-5.5.conf, NONE, 1.1 tomcat5-5.5.init, NONE,
 1.1 tomcat5-5.5.link_admin_jar.patch, NONE, 1.1 tomcat5-5.5.logrotate, NONE,
 1.1 tomcat5-5.5.relink, NONE, 1.1 tomcat5-5.5.wrapper, NONE, 1.1 .cvsignore,
 1.8, 1.9 sources, 1.6, 1.7 tomcat5.spec, 1.58, 1.59 TOMCAT4.README.RPM, 1.1,
 NONE jasper5_command.pa!
 tch, 1.4, NONE struts-config.xml, 1.1, NONE tomcat5-5.0.30-bootstrap.MF.patch,
 1.1, NONE tomcat5-5.0.30-bz163249.patch, 1.1,
 NONE tomcat5-5.0.30-bz164985.patch, 1.1,
 NONE tomcat5-5.0.30-catalina.sh.patch, 1.2,
 NONE tomcat5-5.0.30-cluster-pathelement.patch, 1.1,
 NONE tomcat5-5.0.30-javaxssl.patch, 1.1, NONE tomcat5-5.0.30-no-daemon.patch,
 1.1, NONE tomcat5-5.0.30-precompile.patch, 1.1,
 NONE tomcat5-5.0.30-skip-build-on-install.patch, 1.1,
 NONE tomcat5-5.0.30.patch, 1.2, NONE tomcat5-5.0.conf, 1.4,
 NONE tomcat5-5.0.init, 1.7, NONE tomcat5-5.0.link_admin_jar.patch, 1.1,
 NONE tomcat5-5.0.logrotate, 1.1, NONE tomcat5-5.0.relink, 1.4,
 NONE tomcat5-5.0.wrapper, 1.4, NONE
Message-ID: <200602230026.k1N0Qvo3015580@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15555

Modified Files:
	.cvsignore sources tomcat5.spec 
Added Files:
	tomcat5-5.5-catalina.sh.patch 
	tomcat5-5.5-gcj-class-init-workaround.patch 
	tomcat5-5.5-http11-build.patch tomcat5-5.5-jasper.sh.patch 
	tomcat5-5.5-javaxssl.patch tomcat5-5.5-jdtcompiler.patch 
	tomcat5-5.5-jk-build.patch tomcat5-5.5-jspc-classpath.patch 
	tomcat5-5.5-jspc-debug.patch tomcat5-5.5-jspc.sh.patch 
	tomcat5-5.5-jt5-build.patch tomcat5-5.5-jtc-build.patch 
	tomcat5-5.5-jtj-build.patch tomcat5-5.5-setclasspath.sh.patch 
	tomcat5-5.5-skip-build-on-install.patch 
	tomcat5-5.5-skip-native.patch tomcat5-5.5-util-build.patch 
	tomcat5-5.5.conf tomcat5-5.5.init 
	tomcat5-5.5.link_admin_jar.patch tomcat5-5.5.logrotate 
	tomcat5-5.5.relink tomcat5-5.5.wrapper 
Removed Files:
	TOMCAT4.README.RPM jasper5_command.patch struts-config.xml 
	tomcat5-5.0.30-bootstrap.MF.patch 
	tomcat5-5.0.30-bz163249.patch tomcat5-5.0.30-bz164985.patch 
	tomcat5-5.0.30-catalina.sh.patch 
	tomcat5-5.0.30-cluster-pathelement.patch 
	tomcat5-5.0.30-javaxssl.patch tomcat5-5.0.30-no-daemon.patch 
	tomcat5-5.0.30-precompile.patch 
	tomcat5-5.0.30-skip-build-on-install.patch 
	tomcat5-5.0.30.patch tomcat5-5.0.conf tomcat5-5.0.init 
	tomcat5-5.0.link_admin_jar.patch tomcat5-5.0.logrotate 
	tomcat5-5.0.relink tomcat5-5.0.wrapper 
Log Message:
Updated to 5.5.15

tomcat5-5.5-catalina.sh.patch:
 catalina.sh |   86 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 67 insertions(+), 19 deletions(-)

--- NEW FILE tomcat5-5.5-catalina.sh.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/catalina.sh.sav	2006-01-03 10:15:07.000000000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/catalina.sh	2006-02-21 13:16:25.143371000 -0500
@@ -52,6 +52,9 @@
 Darwin*) darwin=true;;
 esac
 
+TOMCAT_CFG="@@@TCCONF@@@/tomcat5.conf"
+JAVADIR="/usr/share/java"
+
 # resolve links - $0 may be a softlink
 PRG="$0"
 
@@ -97,30 +100,71 @@
   export QIBM_MULTI_THREADED=Y
 fi
 
-# Get standard Java environment variables
-if $os400; then
-  # -r will Only work on the os400 if the files are:
-  # 1. owned by the user
-  # 2. owned by the PRIMARY group of the user
-  # this will not work if the user belongs in secondary groups
-  BASEDIR="$CATALINA_HOME"
-  . "$CATALINA_HOME"/bin/setclasspath.sh 
-else
-  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
-    BASEDIR="$CATALINA_HOME"
-    . "$CATALINA_HOME"/bin/setclasspath.sh
-  else
-    echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
-    echo "This file is needed to run this program"
-    exit 1
-  fi
+[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
+
+### Set up defaults if they were omitted in TOMCAT_CFG
+###  JVM lookup
+if [ -z "$JAVA_HOME" ]; then
+    # Search for java in PATH
+    JAVA=`which java`
+    if [ -z "$JAVA" ] ; then
+        JAVA_BINDIR=`dirname ${JAVA}`
+        JAVA_HOME="${JAVA_BINDIR}/.."
+    fi
+    # Default clean JAVA_HOME
+    [ -z "$JAVA_HOME" -a -d "/usr/lib/java" ] && JAVA_HOME="/usr/lib/java"
+    # Default IBM JAVA_HOME
+    [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-13" ] && \
+        JAVA_HOME="/opt/IBMJava2-13"
+    [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-131" ] && \
+        JAVA_HOME="/opt/IBMJava2-131"
+    [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-14" ] && \
+        JAVA_HOME="/opt/IBMJava2-14"
+    [ -z "$JAVA_HOME" -a -d "/opt/IBMJava2-141" ] && \
+        JAVA_HOME="/opt/IBMJava2-141"
+    # Another solution
+    [ -z "$JAVA_HOME" -a -d "/usr/java/jdk" ] && \
+        JAVA_HOME="/usr/java/jdk"
+    # madeinlinux JAVA_HOME
+    [ -z "$JAVA_HOME" -a -d "/usr/local/jdk1.2.2" ] && \
+        JAVA_HOME="/usr/local/jdk1.2.2"
+    # Kondara JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/usr/lib/java/jdk1.2.2" ] && \
+        JAVA_HOME="/usr/lib/java/jdk1.2.2"
+    # Other commonly found JAVA_HOMEs
+    [ -z "$JAVA_HOME"  -a -d "/usr/jdk1.2" ] && JAVA_HOME="/usr/jdk1.2"
+    # Default Caldera JAVA_HOME
+    [ -z "$JAVA_HOME"  -a -d "/opt/java-1.3" ] && \
+        JAVA_HOME="/opt/java-1.3"
+    # Add other locations here
+    if [ -z "$JAVA_HOME" ]; then
+        echo "No JAVA_HOME specified in ${TOMCAT_CFG} and no java found"
+        exit 1
+    else
+        echo "Found JAVA_HOME: ${JAVA_HOME}"
+        echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
+    fi
 fi
 
+# Set standard commands for invoking Java.
+_RUNJAVA="$JAVA_HOME"/bin/java
+_RUNJAVAC="$JAVA_HOME"/bin/javac
+_RUNJDB="$JAVA_HOME"/bin/jdb
+
+# Set standard CLASSPATH
+CLASSPATH="$JAVA_HOME"/lib/tools.jar
+
 # Add on extra jar files to CLASSPATH
 if [ -n "$JSSE_HOME" ]; then
   CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
 fi
-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
+
+# JPackage JSSE location check
+if [ -r "$JAVADIR/jsse/jcert.jar" ]; then
+  CLASSPATH="$CLASSPATH":"$JAVADIR"/jsse/jcert.jar:"$JAVADIR"/jsse/jnet.jar:"$JAVADIR"/jsse/jsse.jar
+fi
+
+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar:`/usr/bin/build-classpath mx4j/mx4j-impl`:`/usr/bin/build-classpath mx4j/mx4j-jmx`
 
 if [ -z "$CATALINA_BASE" ] ; then
   CATALINA_BASE="$CATALINA_HOME"
@@ -131,6 +175,10 @@
   CATALINA_TMPDIR="$CATALINA_BASE"/temp
 fi
 
+if [ -z "$CATALINA_PID" ] ; then
+    export CATALINA_PID=/var/run/tomcat5.pid
+fi
+
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
@@ -290,7 +338,7 @@
 
 else
 
-  echo "Usage: catalina.sh ( commands ... )"
+  echo "Usage: dtomcat5 ( commands ... )"
   echo "commands:"
   if $os400; then
     echo "  debug             Start Catalina in a debugger (not available on OS400)"

tomcat5-5.5-gcj-class-init-workaround.patch:
 Node.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

--- NEW FILE tomcat5-5.5-gcj-class-init-workaround.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java.sav	2006-01-03 10:15:14.000000000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/share/org/apache/jasper/compiler/Node.java	2006-02-21 13:50:36.460001000 -0500
@@ -1389,18 +1389,31 @@
 	    this.customNestingLevel = makeCustomNestingLevel();
             this.childInfo = new ChildInfo();
 
-	    this.implementsIterationTag = 
-		IterationTag.class.isAssignableFrom(tagHandlerClass);
-	    this.implementsBodyTag =
-		BodyTag.class.isAssignableFrom(tagHandlerClass);
-	    this.implementsTryCatchFinally = 
-		TryCatchFinally.class.isAssignableFrom(tagHandlerClass);
-	    this.implementsSimpleTag = 
-		SimpleTag.class.isAssignableFrom(tagHandlerClass);
-	    this.implementsDynamicAttributes = 
-		DynamicAttributes.class.isAssignableFrom(tagHandlerClass);
+	    this.implementsIterationTag = impls(tagHandlerClass, IterationTag.class);
+	    this.implementsBodyTag = impls(tagHandlerClass, BodyTag.class);
+	    this.implementsTryCatchFinally = impls(tagHandlerClass, TryCatchFinally.class);
+	    this.implementsSimpleTag = impls(tagHandlerClass, SimpleTag.class);
+	    this.implementsDynamicAttributes = impls(tagHandlerClass, DynamicAttributes.class);
 	}
 
+        private static final boolean impls(Class klass, Class iface) {
+            if (klass.equals(iface)) { return true; }
+
+            Class[] implemented = klass.getInterfaces();
+            for (int i = 0; i < implemented.length; i++) {
+                if (impls(implemented[i], iface)) {
+                    return true;
+                }
+            }
+
+            Class sup = klass.getSuperclass();
+            if (sup == null) {
+                return false;
+            } else {
+                return impls(sup, iface);
+            }
+        }
+
 	/*
 	 * Constructor for custom action implemented by tag file.
 	 */

tomcat5-5.5-http11-build.patch:
 build.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE tomcat5-5.5-http11-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/http11/build.xml.sav	2006-02-21 13:40:40.880179000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/http11/build.xml	2006-02-21 13:40:52.563483000 -0500
@@ -167,7 +167,10 @@
              debug="${compile.debug}"
        deprecation="${compile.deprecation}"
           optimize="${compile.optimize}">
-      <classpath refid="compile.classpath"/>
+      <classpath>
+          <path  refid="compile.classpath"/>
+          <pathelement location="${build.home}/../../build/build/classes"/>
+      </classpath>
     </javac>
     <copy    todir="${build.home}/classes" filtering="on">
       <fileset dir="${source.home}" excludes="**/*.java"/>

tomcat5-5.5-jasper.sh.patch:
 jasper.sh |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

--- NEW FILE tomcat5-5.5-jasper.sh.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jasper.sh.sav	2006-01-03 10:15:14.000000000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jasper.sh	2006-02-21 13:21:55.764421000 -0500
@@ -45,34 +45,36 @@
   . "$JASPER_HOME"/bin/setenv.sh
 fi
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$JASPER_HOME" ] && JASPER_HOME=`cygpath --unix "$JASPER_HOME"`
-  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
+# Set standard commands for invoking Java.
+_RUNJAVA="$JAVA_HOME"/bin/java
+_RUNJDB="$JAVA_HOME"/bin/jdb
+_RUNJAVAC="$JAVA_HOME"/bin/javac
 
 # Get standard Java environment variables
-if [ -r "$JASPER_HOME"/bin/setclasspath.sh ]; then
+if [ -r "$JASPER_HOME"/bin/jasper5-setclasspath.sh ]; then
   BASEDIR="$JASPER_HOME"
-  . "$JASPER_HOME"/bin/setclasspath.sh
+  . "$JASPER_HOME"/bin/jasper5-setclasspath.sh
 else
-  echo "Cannot find $JASPER_HOME/bin/setclasspath.sh"
+  echo "Cannot find $JASPER_HOME/bin/jasper5-setclasspath.sh"
   echo "This file is needed to run this program"
   exit 1
 fi
 
 # Add on extra jar files to CLASSPATH
-for i in "$JASPER_HOME"/common/endorsed/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-for i in "$JASPER_HOME"/common/lib/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-for i in "$JASPER_HOME"/shared/lib/*.jar; do
-  CLASSPATH="$CLASSPATH":"$i"
-done
-CLASSPATH="$CLASSPATH":"$JASPER_HOME"/shared/classes
+CLASSPATH=$CLASSPATH:$(build-classpath \
+    ant \
+    commons-collections \
+    commons-el \
+    commons-daemon \
+    commons-logging \
+    jasper-compiler \
+    jasper-runtime \
+    eclipse-ecj.jar \
+    jsp-2.0-api \
+    servlet-2.4-api \
+    xerces-j2 \
+    xml-commons-apis \
+)
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -103,7 +105,7 @@
 
 else
 
-  echo "Usage: jasper.sh ( jspc )"
+  echo "Usage: $0 ( jspc )"
   echo "Commands:"
   echo "  jspc - Run the offline JSP compiler"
   exit 1

tomcat5-5.5-javaxssl.patch:
 jk/java/org/apache/jk/server/JkMain.java                           |    2 
 util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java |   26 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE tomcat5-5.5-javaxssl.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/java/org/apache/jk/server/JkMain.java.sav	2006-02-21 13:03:55.678587000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/java/org/apache/jk/server/JkMain.java	2006-02-21 13:04:09.811441000 -0500
@@ -101,7 +101,7 @@
         return jkMain;
     }
 
-    private static String DEFAULT_HTTPS="com.sun.net.ssl.internal.www.protocol";
+    private static String DEFAULT_HTTPS="javax.net.ssl.internal.www.protocol";
     private void initHTTPSUrls() {
         try {
             // 11657: if only ajp is used, https: redirects need to work ( at least for 1.3+)
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java.sav	2006-02-21 13:06:56.537546000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java	2006-02-21 13:08:32.272715000 -0500
@@ -67,13 +67,13 @@
      */
      void init() throws IOException {
         try {
-            try {
-                Class ssps = Class.forName("sun.security.provider.Sun");
-                Security.addProvider ((Provider)ssps.newInstance());
-            }catch(Exception cnfe) {
+            //try {
+            //    Class ssps = Class.forName("sun.security.provider.Sun");
+            //    Security.addProvider ((Provider)ssps.newInstance());
+            //}catch(Exception cnfe) {
                 //Ignore, since this is a non-Sun JVM
-            }
-            Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
+            //}
+            //Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
 
             String clientAuthStr = (String)attributes.get("clientauth");
             if("true".equalsIgnoreCase(clientAuthStr) || 
@@ -91,8 +91,8 @@
             if (algorithm == null) algorithm = defaultAlgorithm;
 
             // Set up KeyManager, which will extract server key
-            com.sun.net.ssl.KeyManagerFactory kmf = 
-                com.sun.net.ssl.KeyManagerFactory.getInstance(algorithm);
+            javax.net.ssl.KeyManagerFactory kmf = 
+                javax.net.ssl.KeyManagerFactory.getInstance(algorithm);
             String keystoreType = (String)attributes.get("keystoreType");
             if (keystoreType == null) {
                 keystoreType = defaultKeystoreType;
@@ -102,22 +102,22 @@
                      keystorePass.toCharArray());
 
             // Set up TrustManager
-            com.sun.net.ssl.TrustManager[] tm = null;
+            javax.net.ssl.TrustManager[] tm = null;
             String truststoreType = (String)attributes.get("truststoreType");
             if(truststoreType == null) {
                 truststoreType = keystoreType;
             }
             KeyStore trustStore = getTrustStore(truststoreType);
             if (trustStore != null) {
-                com.sun.net.ssl.TrustManagerFactory tmf =
-                    com.sun.net.ssl.TrustManagerFactory.getInstance("SunX509");
+                javax.net.ssl.TrustManagerFactory tmf =
+                    javax.net.ssl.TrustManagerFactory.getInstance("SunX509");
                 tmf.init(trustStore);
                 tm = tmf.getTrustManagers();
             }
 
             // Create and init SSLContext
-            com.sun.net.ssl.SSLContext context = 
-                com.sun.net.ssl.SSLContext.getInstance(protocol); 
+            javax.net.ssl.SSLContext context = 
+                javax.net.ssl.SSLContext.getInstance(protocol); 
             context.init(kmf.getKeyManagers(), tm, new SecureRandom());
 
             // Create proxy

tomcat5-5.5-jdtcompiler.patch:
 JDTCompiler.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tomcat5-5.5-jdtcompiler.patch ---
--- apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java.original	2005-10-21 17:35:31.000000000 -0400
+++ apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java	2005-10-21 17:35:43.000000000 -0400
@@ -177,7 +177,7 @@
                             ICompilationUnit compilationUnit = 
                                 new CompilationUnit(sourceFile, className);
                             return 
-                                new NameEnvironmentAnswer(compilationUnit, null);
+                                new NameEnvironmentAnswer(compilationUnit);
                         }
                         String resourceName = 
                             className.replace('.', '/') + ".class";
@@ -198,7 +198,7 @@
                                 new ClassFileReader(classBytes, fileName, 
                                                     true);
                             return 
-                                new NameEnvironmentAnswer(classFileReader, null);
+                                new NameEnvironmentAnswer(classFileReader);
                         }
                     } catch (IOException exc) {
                         log.error("Compilation error", exc);

tomcat5-5.5-jk-build.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE tomcat5-5.5-jk-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/build.xml.sav	2006-02-21 13:42:53.241685000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/jk/build.xml	2006-02-21 13:42:59.481438000 -0500
@@ -211,6 +211,7 @@
             <exclude name="org/apache/jk/ant/**" />
 	    <classpath>
 	       <pathelement location="${tomcat-apr.jar}" />
+               <pathelement location="${jk.build}/../../build/build/classes"/>
 	       <path refid="xml-apis.classpath"/>
 	       <path refid="build-main.classpath"/>
 	    </classpath>

tomcat5-5.5-jspc-classpath.patch:
 build.xml |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE tomcat5-5.5-jspc-classpath.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav	2006-02-21 13:48:51.743828000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml	2006-02-21 13:48:56.499065000 -0500
@@ -416,6 +416,7 @@
 
     <path id="jspc.classpath">
       <pathelement location="${java.home}/../lib/tools.jar"/>
+      <pathelement location="/usr/lib/jvm/java/jre/lib/rt.jar"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${tomcat.build}/server/classes"/>
       <fileset dir="${tomcat.build}/server/lib">

tomcat5-5.5-jspc-debug.patch:
 JspC.java |   12 ++++++++++++
 1 files changed, 12 insertions(+)

--- NEW FILE tomcat5-5.5-jspc-debug.patch ---
--- tomcat5-5.5.12/apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java.sav	2006-02-15 15:31:49.289831000 -0500
+++ tomcat5-5.5.12/apache-tomcat-5.5.12-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java	2006-02-15 15:32:02.491621000 -0500
@@ -1030,6 +1030,18 @@
     }
 
     public void execute() throws JasperException {
+        try {
+            execute2();
+        } catch (JasperException e) {
+            e.printStackTrace();
+            throw e;
+        } catch (Throwable t) {
+            t.printStackTrace();
+            throw new RuntimeException(t);
+        }
+    }
+
+    public void execute2() throws JasperException {
 
         try {
             if (uriRoot == null) {

tomcat5-5.5-jspc.sh.patch:
 jspc.sh |   27 ++-------------------------
 1 files changed, 2 insertions(+), 25 deletions(-)

--- NEW FILE tomcat5-5.5-jspc.sh.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jspc.sh.sav	2006-01-03 10:15:14.000000000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/src/bin/jspc.sh	2006-02-21 13:27:02.125753000 -0500
@@ -5,32 +5,9 @@
 # $Id: jspc.sh 305555 2003-02-21 18:23:14Z kinman $
 # -----------------------------------------------------------------------------
 
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ] ; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '.*/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
- 
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=jasper.sh
-
-# Check that target executable exists
-if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
-  echo "Cannot find $PRGDIR/$EXECUTABLE"
-  echo "This file is needed to run this program"
-  exit 1
-fi
-
 if [ "$1" = "debug" ]; then
   shift
-  exec "$PRGDIR"/"$EXECUTABLE" debug "$@"
+  exec jasper5.sh debug "$@"
 else
-  exec "$PRGDIR"/"$EXECUTABLE" jspc "$@"
+  exec jasper5.sh jspc "$@"
 fi

tomcat5-5.5-jt5-build.patch:
 build.properties.default |    4 ++--
 build.xml                |   12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

--- NEW FILE tomcat5-5.5-jt5-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav	2006-02-21 12:05:21.945271000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml	2006-02-21 12:09:52.329616000 -0500
@@ -58,12 +58,14 @@
   <property name="tomcat.release"   value="${basedir}/release"/>
   <property name="webapps.build"    value="${catalina.home}/webapps/build"/>
   <property name="webapps.dist"     value="${catalina.home}/webapps/dist"/>
-  <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
+  <property name="tomcat-dbcp.home" value="${base.path}" />
   <property name="tomcat-dbcp.jar"
-       value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
+       value="${tomcat-dbcp.home}/commons-dbcp.jar"/>
+  <!--
   <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
   <property name="jasper-compiler-jdt.jar"
        value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
+  -->
 
   <!-- Some compilers will disable debugging if true. And it doesn't do anything
        in most cases -->
@@ -160,7 +162,11 @@
 
     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
+    <!--
     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
+    -->
+    <!-- these should be links -->
+    <copy todir="${tomcat.build}/common/lib" file="${base.path}/eclipse-ecj.jar"/>
   </target>
 
   <!-- ====================== Build all components =================== -->
@@ -953,7 +959,7 @@
     <copy todir="embed/lib">
       <fileset dir="build/common/lib">
         <include name="jasper-compiler.jar"/>
-        <include name="jasper-compiler-jdt.jar"/>
+        <include name="eclipse-ecj.jar"/>
       </fileset>
     </copy>
 
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.properties.default.sav	2006-02-21 12:10:09.197726000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.properties.default	2006-02-21 12:10:26.608298000 -0500
@@ -12,10 +12,10 @@
 # ----- Vesion Control Flags -----
 version.major=5
 version.minor=5
-version.build=0
+version.build=15
 version.patch=0
 #Set the pretty version name
-version=5.5.0-dev
+version=5.5.15
 
 # ----- Compile Control Flags -----
 compile.debug=on

tomcat5-5.5-jtc-build.patch:
 catalina/build.xml        |    2 +-
 modules/cluster/build.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tomcat5-5.5-jtc-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/build.xml.sav	2006-02-21 12:14:44.437212000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/build.xml	2006-02-21 12:14:59.603032000 -0500
@@ -42,7 +42,7 @@
   <property name="tomcat-http11.jar"
            value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
   <property name="tomcat-dbcp.jar" 
-           value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
+           value="${base.path}/tomcat-deps/commons-dbcp.jar"/>
   <!-- Construct Catalina classpath -->
   <path id="catalina.classpath">
     <pathelement location="${activation.jar}"/>
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/modules/cluster/build.xml.sav	2006-02-21 12:15:15.518099000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/modules/cluster/build.xml	2006-02-21 12:15:49.952629000 -0500
@@ -20,7 +20,7 @@
     <pathelement location="${commons-modeler.jar}"/>
     <pathelement location="${commons-logging.jar}"/>
     <pathelement location="${jmx.jar}"/>
-    <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
+    <pathelement location="${servlet-api.jar}"/>
   </path>
 
     <!-- Source path -->

tomcat5-5.5-jtj-build.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE tomcat5-5.5-jtj-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/build.xml.sav	2006-02-21 13:00:06.484260000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/jasper/jasper2/build.xml	2006-02-21 13:00:38.568893000 -0500
@@ -38,6 +38,7 @@
     <pathelement location="${commons-logging.jar}"/>
     <pathelement location="${commons-daemon-launcher.jar}"/>
     <pathelement location="${jasper.build}/shared/classes"/>
+    <pathelement location="${base.path}/eclipse-ecj.jar"/>
   </path>
 
   <!-- Construct unit tests classpath -->
@@ -54,6 +55,7 @@
     <pathelement location="${commons-launcher.jar}"/>
     <pathelement location="${jasper.build}/shared/classes"/>
     <pathelement location="${jasper.build}/tests"/>
+    <pathelement location="${base.path}/eclipse-ecj.jar"/>
   </path>
 
 

tomcat5-5.5-setclasspath.sh.patch:
 setclasspath.sh |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tomcat5-5.5-setclasspath.sh.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/setclasspath.sh.sav	2006-01-03 10:15:07.000000000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/catalina/src/bin/setclasspath.sh	2006-02-21 13:29:23.285450000 -0500
@@ -50,7 +50,7 @@
   echo "This environment variable is needed to run this program"
   exit 1
 fi
-if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then
+if [ ! -x "$BASEDIR"/bin/jasper5-setclasspath.sh ]; then
   if $os400; then
     # -x will Only work on the os400 if the files are:
     # 1. owned by the user

tomcat5-5.5-skip-build-on-install.patch:
 build.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE tomcat5-5.5-skip-build-on-install.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav	2006-02-21 11:53:11.829543000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml	2006-02-21 11:53:30.700650000 -0500
@@ -759,11 +759,12 @@
     <mkdir dir="${tomcat.build}/webapps" />
     <mkdir dir="${tomcat.build}/server/webapps" />
 
-    <!-- The build files are far too difficult to hack - just build it and copy -->
+    <!--
     <ant dir="${api.home}/jsr154" target="dist">
     </ant>
     <ant dir="${api.home}/jsr152" target="dist">
     </ant>
+    -->
 
     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
     <copy todir="${tomcat.build}/webapps/servlets-examples">

tomcat5-5.5-skip-native.patch:
 build.xml |    6 ++++++
 1 files changed, 6 insertions(+)

--- NEW FILE tomcat5-5.5-skip-native.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml.sav	2006-02-21 13:45:24.220555000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/build/build.xml	2006-02-21 13:45:57.627114000 -0500
@@ -157,8 +157,14 @@
     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
             failonerror="false" />
 
+<!-- tomcat-native.tar.gz was added in 5.5.11
+     see jakarta-tomcat-catalina/webapps/docs/changelog.xml
+     commenting it out for now -\- vadimn at redhat.com
+-->
+<!--
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
             file="${tomcat-native.tar.gz}" />
+-->
 
     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
     <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->

tomcat5-5.5-util-build.patch:
 build.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE tomcat5-5.5-util-build.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/build.xml.sav	2006-02-21 13:32:48.390140000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/connectors/util/build.xml	2006-02-21 13:33:03.280235000 -0500
@@ -73,7 +73,10 @@
 	       optimize="off"
 	       verbose="off"
 	       excludes="**/CVS/**">
-            <classpath refid="compile.classpath"/>
+            <classpath>
+                <path refid="compile.classpath"/>
+                <pathelement location="${tomcat-util.build}/../../build/build/classes"/>
+            </classpath>
             <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
             <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
             <exclude name="**/util/net/puretls/*" unless="puretls.present"/>


--- NEW FILE tomcat5-5.5.conf ---
# tomcat5 service configuration file

# you could also override JAVA_HOME here
# Where your java installation lives
JAVA_HOME="/usr/lib/jvm/java"

# You can pass some parameters to java
# here if you wish to
#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"

# Where your tomcat installation lives
# That change from previous RPM where TOMCAT_HOME 
# used to be /var/tomcat.
# Now /var/tomcat will be the base for webapps only
CATALINA_HOME="@@@TCHOME@@@"
JASPER_HOME="@@@TCHOME@@@"
CATALINA_TMPDIR="@@@TCHOME@@@/temp"
JAVA_ENDORSED_DIRS="@@@TCHOME@@@/common/endorsed"

# What user should run tomcat
TOMCAT_USER="tomcat"

# You can change your tomcat locale here
#LANG=en_US

# Time to wait in seconds, before killing process
SHUTDOWN_WAIT=30

# Set the TOMCAT_PID location
CATALINA_PID=/var/run/tomcat5.pid

# If you wish to further customize your tomcat environment,
# put your own definitions here
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
# Just do not forget to export them :)



--- NEW FILE tomcat5-5.5.init ---
#!/bin/sh
#
# Startup script for Tomcat 5.0, the Apache Servlet Engine
#
# chkconfig: - 80 20
# description: Tomcat 5.0 is the Apache Servlet Engine RI for Servlet 2.4/JSP 2.0
# processname: tomcat
# pidfile: /var/run/tomcat5.pid
# config:  /etc/tomcat5/tomcat5.conf
#
# Gomez Henri <hgomez at users.sourceforge.net>
# Keith Irwin <keith_irwin at non.hp.com>
# Nicolas Mailhot <nicolas.mailhot at one2team.com>
#
# version 1.02 - Removed initlog support
# version 1.03 - Removed config:
# version 1.04 - tomcat will start before httpd and stop after httpd
# version 1.05 - jdk hardcoded to link /usr/java/jdk and tomcat runs as "nobody"
# version 1.06 - split up into script and config file
# version 1.07 - Rework from Nicolas ideas
# version 1.08 - Fix work dir permission at start time, switch to use tomcat4
# version 1.09 - Fix pidfile and config tags
# version 1.10 - Fallback to su direct use on systems without Redhat/Mandrake init.d functions
# version 1.11 - Fix webapps dir permissions
# version 1.12 - remove initial start/stop level for chkconfig (- 80 20)
# version 1.13 - remove chown of logs/work/temp/webapps dir, owned by tomcat4 at install time
# version 1.14 - correct the start/stop ugly hack by waiting all the threads stops
# version 1.15 - ensure we're looking for TOMCAT_USER running catalina
# version 1.16 - Add support for CATALINA_PID env var
# version 1.17 - Remove run files only tomcat started correctl
#                in start area, check that tomcat is not allready running
# version 1.18 - Fix kill typo (thanks Kaj J. Niemi)
# version 1.19 - Add jar relinking
# version 1.20 - Check there is no stalling tomcat4.pid
# version 1.20tc5 - Changed all instances of tomcat4 to tomcat5 except TOMCAT_USER
# version 1.20tc5rh - Changed TOMCAT_USER from tomcat4 to tomcat
#

# Source function library.
if [ -x /etc/rc.d/init.d/functions ]; then
. /etc/rc.d/init.d/functions
fi

# For SELinux we need to use 'runuser' not 'su'
if [ -x /sbin/runuser ]
then
	SU=runuser
else
	SU=su
fi

# Get Tomcat config

TOMCAT_CFG="/etc/tomcat5/tomcat5.conf"

[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"

# Path to the tomcat launch script (direct don't use wrapper)
TOMCAT_SCRIPT=/usr/bin/dtomcat5

# Path to the script that will refresh jar symlinks on startup
TOMCAT_RELINK_SCRIPT="/usr/share/tomcat5/bin/relink"

# Tomcat name :)
TOMCAT_PROG=tomcat5
        
# if TOMCAT_USER is not set, use tomcat5 like Apache HTTP server
if [ -z "$TOMCAT_USER" ]; then
    TOMCAT_USER="tomcat"
fi

# Since the daemon function will sandbox $tomcat
# no environment stuff should be defined here anymore.
# Please use the /etc/tomcat.conf file instead ; it will
# be read by the $tomcat script

RETVAL=0

# See how we were called.
start() {
    echo -n "Starting $TOMCAT_PROG: "

	if [ -f /var/lock/subsys/tomcat5 ] ; then
 		if [ -f /var/run/tomcat5.pid ]; then
   	      		read kpid < /var/run/tomcat5.pid
         		if checkpid $kpid 2>&1; then
             			echo "process allready running"
             			return -1
         		else
             			echo "lock file found but no process running for pid $kpid, continuing"
 			fi
 		fi
 	fi
 
 	export CATALINA_PID=/var/run/tomcat5.pid
 	touch $CATALINA_PID
 	chown $TOMCAT_USER:$TOMCAT_USER $CATALINA_PID

        $TOMCAT_RELINK_SCRIPT

        if [ -x /etc/rc.d/init.d/functions ]; then
        	daemon --user $TOMCAT_USER $TOMCAT_SCRIPT start 
    	else
        	$SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start"
    	fi

    	RETVAL=$?
    	echo
    	[ $RETVAL = 0 ] && touch /var/lock/subsys/tomcat5
    	return $RETVAL
}

stop() {
    echo -n "Stopping $TOMCAT_PROG: "

    if [ -f /var/lock/subsys/tomcat5 ] ; then
      if [ -x /etc/rc.d/init.d/functions ]; then
          daemon --user $TOMCAT_USER $TOMCAT_SCRIPT stop
      else
          $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop"
      fi
      RETVAL=$?

      if [ $RETVAL = 0 ]; then
        count=0;

        if [ -f /var/run/tomcat5.pid ]; then

            read kpid < /var/run/tomcat5.pid
            let kwait=$SHUTDOWN_WAIT

            until [ `ps --pid $kpid | grep -c $kpid` = '0' ] || [ $count -gt $kwait ]
            do
                echo "waiting for processes to exit";
                sleep 1
                let count=$count+1;
            done

            if [ $count -gt $kwait ]; then
                echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
                kill -9 $kpid
            fi
        fi
    
		rm -f /var/lock/subsys/tomcat5 /var/run/tomcat5.pid
    fi

    fi
}


# See how we were called.
case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart)
        stop
        sleep 2	
        start
        ;;
  condrestart)
        if [ -f /var/run/tomcat5.pid ] ; then
                stop
                start
        fi
        ;;
  *)
        echo "Usage: $TOMCAT_PROG {start|stop|restart|condrestart}"
        exit 1
esac

exit $RETVAL

tomcat5-5.5.link_admin_jar.patch:
 admin.xml |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE tomcat5-5.5.link_admin_jar.patch ---
--- tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/webapps/admin/admin.xml.sav	2006-02-21 12:00:06.366407000 -0500
+++ tomcat5-5.5.15/apache-tomcat-5.5.15-src/container/webapps/admin/admin.xml	2006-02-21 12:00:29.877116000 -0500
@@ -17,4 +17,8 @@
     allow="127.0.0.1"/>
   -->
 
+  <!-- Allow linking since JPackage do not install jar as copies -->
+  <Resources className="org.apache.naming.resources.FileDirContext"
+             allowLinking="true"/>
+
 </Context>


--- NEW FILE tomcat5-5.5.logrotate ---
@@@TCLOG@@@/catalina.out {
    copytruncate
    weekly
    rotate 52
    compress
    missingok
}


***** Error reading new file: [Errno 2] No such file or directory: 'tomcat5-5.5.relink'

--- NEW FILE tomcat5-5.5.wrapper ---
#!/bin/sh
#
# Wrapper script for Tomcat 5.0, to be sure it will allways
# be run with correct user profile (tomcat by default)
#
# derived from stuff in tomcat5.init
#
# Gomez Henri <hgomez at slib.fr>
# Keith Irwin <keith_irwin at non.hp.com>
# Nicolas Mailhot <nicolas.mailhot at one2team.com>
#
# version 1.01 - Fix webapps dir permissions
#


# Get Tomcat config

TOMCAT_CFG="@@@TCCONF@@@/tomcat5.conf"

[ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"

# Path to the tomcat launch script
TOMCAT_SCRIPT=/usr/bin/dtomcat5

# Tomcat name :)
TOMCAT_PROG=tomcat5
        
# if TOMCAT_USER is not set, use tomcat
if [ -z "$TOMCAT_USER" ]; then
    TOMCAT_USER="tomcat"
fi

RETVAL=0

su - $TOMCAT_USER -c "$TOMCAT_SCRIPT $@"
RETVAL=$?
exit $RETVAL


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Dec 2005 10:09:37 -0000	1.8
+++ .cvsignore	23 Feb 2006 00:26:54 -0000	1.9
@@ -1,5 +1 @@
-jakarta-tomcat-5.0.30-src-RHCLEAN.tar.bz2
-tomcat5-5.0.30
-i386
-*.src.rpm
-tomcat5-5.0.30-notarget.patch
+apache-tomcat-5.5.15-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2005 10:09:37 -0000	1.6
+++ sources	23 Feb 2006 00:26:54 -0000	1.7
@@ -1,2 +1 @@
-39d08c63eca15c779a0f793f398fb51e  jakarta-tomcat-5.0.30-src-RHCLEAN.tar.bz2
-118e8f5e18793c1736d1c316df330220  tomcat5-5.0.30-notarget.patch
+08c7cf1d42971ef893daa4bf4519a537  apache-tomcat-5.5.15-src.tar.gz


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- tomcat5.spec	11 Feb 2006 05:52:51 -0000	1.58
+++ tomcat5.spec	23 Feb 2006 00:26:54 -0000	1.59
@@ -1,280 +1,370 @@
-%define name		tomcat5
-%define full_name	jakarta-%{name}
-%define version		5.0.30
-%define majversion	5.0
-%define release 	8jpp_11fc
-%define section		free
+%define full_name jakarta-%{name}
+%define full_jname jasper5
+%define jname jasper
+%define majversion 5.5
+%define servletspec 2.4
+%define jspspec 2.0
+%define section devel
 
-%define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
-%define license		Apache Software License
+%define tcuid 91
 
-%define jname		jasper5
-%define tcuid		91
-
-%define packname 	jakarta-tomcat-%{version}
-%define packdname	jakarta-tomcat-%{version}-src
+%define packdname apache-tomcat-%{version}-src
 
 # FHS 2.2 compliant tree structure
 # see http://www.pathname.com/fhs/2.2/
-%define confdir		%{_sysconfdir}/%{name}
-%define logdir		%{_localstatedir}/log/%{name}
-%define homedir		%{_datadir}/%{name}
-%define bindir		%{_datadir}/%{name}/bin
-%define tempdir		%{_localstatedir}/cache/%{name}/temp
-%define workdir		%{_localstatedir}/cache/%{name}/work
-%define appdir		%{_localstatedir}/lib/%{name}/webapps
-%define serverdir	%{_localstatedir}/lib/%{name}/server
-%define commondir	%{_localstatedir}/lib/%{name}/common
-%define shareddir	%{_localstatedir}/lib/%{name}/shared
-
-Summary: 		%{summary}
-Name: 			%{name}
-Version: 		%{version}
-Release: 		%{release}
-Epoch:			0
-License:		%{license}
-Group: 			Networking/Daemons
-URL: 			http://jakarta.apache.org/tomcat/
-Source:			%{packdname}-RHCLEAN.tar.bz2
-Source3:		TOMCAT4.README.RPM
-Source4: 		%{name}-%{majversion}.init
-Source5:		%{name}-%{majversion}.conf
-Source6:		%{name}-%{majversion}.wrapper
-Source8:		%{name}-%{majversion}.logrotate
-Source9:		%{name}-%{majversion}.relink
-# This file shouldn't be required on any other 5.x releases as it's fixed in
-# CVS -- see http://issues.apache.org/bugzilla/show_bug.cgi?id=32445
-Source10:		struts-config.xml
-Patch1:			%{name}-%{version}.patch
-Patch2:                 %{name}-%{majversion}.link_admin_jar.patch
-Patch4:			%{name}-%{version}-cluster-pathelement.patch
-Patch5:			%{name}-%{version}-skip-build-on-install.patch
-Patch6:			%{name}-%{version}-javaxssl.patch
-Patch7:			%{jname}_command.patch
-Patch8:			%{name}-%{version}-bootstrap.MF.patch
-Patch9:			%{name}-%{version}-catalina.sh.patch
-Patch10:		%{name}-%{version}-precompile.patch
-Patch11:		%{name}-%{version}-no-daemon.patch
-Patch12:		%{name}-%{version}-bz163249.patch
-Patch13:		%{name}-%{version}-bz164985.patch
-Patch14:		%{name}-%{version}-notarget.patch
-Patch15:                %{name}-examples-cal-xss.patch
-Patch16:                %{name}-examples-xss.patch
-BuildRoot:		%{_tmppath}/%{name}-root-%{version}
-
-Requires:		jpackage-utils >= 0:1.6.0
-Requires:		ant >= 0:1.6.2
-Requires:		java-sdk >= 1.4
-Requires:		xerces-j2 >= 0:2.6.2
-Requires:		xml-commons-apis
-Requires:		regexp >= 0:1.3
-Requires:		puretls
-# jakarta packages
-Requires:		jakarta-commons-beanutils >= 0:1.7.0
-Requires:		jakarta-commons-collections >= 0:3.1
-Requires:		jakarta-commons-dbcp >= 0:1.2.1
-Requires:		jakarta-commons-digester >= 0:1.3
-Requires:		jakarta-commons-modeler
-Requires:		jakarta-commons-pool >= 0:1.2
-Requires:		jakarta-commons-logging >= 0:1.0.4
-Requires:		jakarta-commons-fileupload >= 0:1.0-1jpp
-Requires:		jakarta-commons-launcher >= 0:0.9
-Requires:		jakarta-commons-el >= 0:1.0
-Requires:		mx4j >= 0:1.1.1
+%define confdir %{_sysconfdir}/%{name}
+%define logdir %{_localstatedir}/log/%{name}
+%define homedir %{_datadir}/%{name}
+%define bindir %{_datadir}/%{name}/bin
+%define tempdir %{_localstatedir}/cache/%{name}/temp
+%define workdir %{_localstatedir}/cache/%{name}/work
+%define appdir %{_localstatedir}/lib/%{name}/webapps
+%define serverdir %{_localstatedir}/lib/%{name}/server
+%define commondir %{_localstatedir}/lib/%{name}/common
+%define shareddir %{_localstatedir}/lib/%{name}/shared
+
+Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
+Name: tomcat5
+Version: 5.5.15
+Release: 1jpp_1fc
+Epoch: 0
+License: Apache Software License
+#Vendor: JPackage Project
+#Distribution: JPackage
+Group: Networking/Daemons
+URL: http://jakarta.apache.org/tomcat/
+Source0: http://jakarta.apache.org/builds/jakarta-tomcat-5.5/release/v%{version}/src/%{packdname}.tar.gz
+Source1: %{name}-%{majversion}.init
+Source2: %{name}-%{majversion}.conf
+Source3: %{name}-%{majversion}.wrapper
+Source4: %{name}-%{majversion}.logrotate
+Source5: %{name}-%{majversion}.relink
+Patch0: %{name}-%{majversion}.link_admin_jar.patch
+Patch1: %{name}-%{majversion}-skip-build-on-install.patch
+Patch2: %{name}-%{majversion}-jt5-build.patch
+Patch3: %{name}-%{majversion}-jtc-build.patch
+Patch4: %{name}-%{majversion}-jtj-build.patch
+Patch5: %{name}-%{majversion}-javaxssl.patch
+#Patch6: %{name}-%{majversion}-bootstrap.MF.patch
+Patch7: %{name}-%{majversion}-catalina.sh.patch
+Patch8: %{name}-%{majversion}-jasper.sh.patch
+Patch9: %{name}-%{majversion}-jspc.sh.patch
+Patch10: %{name}-%{majversion}-setclasspath.sh.patch
+#Patch11: %{name}-%{majversion}-jdtcompiler.patch
+Patch12: %{name}-%{majversion}-util-build.patch
+Patch13: %{name}-%{majversion}-http11-build.patch
+Patch14: %{name}-%{majversion}-jk-build.patch
+Patch15: %{name}-%{majversion}-skip-native.patch
+Patch16: %{name}-%{majversion}-jspc-classpath.patch
+Patch17: %{name}-%{majversion}-gcj-class-init-workaround.patch
+BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+
+Requires: jpackage-utils >= 0:1.6.0
+# xml parsing packages
+Requires: xerces-j2 >= 0:2.7.1
+Requires: xml-commons-apis >= 1.3
+# jakarta-commons packages
+# FIXME Update commons-daemon
+#Requires: jakarta-commons-daemon >= 1.0.1
+Requires: jakarta-commons-daemon >= 1.0
+Requires: jakarta-commons-launcher >= 0:0.9
 # alternatives
-Requires:		jaas
-Requires:		jndi
-Requires:		jndi-ldap
-Requires:		jdbc-stdext
-# non-free stuff
-Requires:		jta
-Requires:		jaf >= 0:1.0.1
-Requires:		javamail >= 0:1.3
-# subpackages
-Requires:		%{name}-servlet-2.4-api = %{epoch}:%{version}-%{release}
-Requires:		%{name}-jasper = %{epoch}:%{version}-%{release}
-
-Buildrequires:		jpackage-utils >= 0:1.6.0
-BuildRequires:		ant >= 0:1.6.2
-BuildRequires:		java-sdk >= 1.4
-BuildRequires:		ant-trax
-BuildRequires:		xalan-j2
-BuildRequires:		jakarta-commons-beanutils >= 0:1.7.0
-BuildRequires:		jakarta-commons-collections >= 0:3.1
-BuildRequires:		jakarta-commons-dbcp >= 0:1.2.1
-BuildRequires:		jakarta-commons-digester >= 0:1.3
-BuildRequires:		jakarta-commons-logging >= 0:1.0.4
-BuildRequires:		jakarta-commons-fileupload >= 0:1.0
-BuildRequires:		jakarta-commons-modeler
-BuildRequires:		jakarta-commons-pool >= 0:1.1
-BuildRequires:		jakarta-commons-launcher >= 0:0.9
-BuildRequires:		jakarta-commons-el >= 0:1.0
-BuildRequires:		jaas
-BuildRequires:		jaf >= 0:1.0.1
-BuildRequires:		javamail >= 0:1.3
-BuildRequires:		jdbc-stdext >= 0:2.0
-BuildRequires:		jndi >= 0:1.2.1
-BuildRequires:		jndi-ldap
-BuildRequires:		jsse
-BuildRequires:		jta
-BuildRequires:		junit >= 0:3.8.1
-BuildRequires:		mx4j >= 0:1.1.1
-BuildRequires:		regexp >= 0:1.3
-BuildRequires:		puretls
-BuildRequires:		struts >= 0:1.2
-BuildRequires:		xerces-j2 >= 0:2.6.2
-BuildRequires:		xml-commons-apis
-BuildRequires:		jakarta-taglibs-standard >= 0:1.1.0
-# RHEL3 and FC2
-Obsoletes:		tomcat tomcat-libs tomcat-devel tomcat-test
+Requires: jndi-ldap
+# And it needs its own API subpackages for running
+# And it needs its own API subpackages before being installed
+PreReq: %{name}-common-lib = %{epoch}:%{version}-%{release}
+PreReq: %{name}-server-lib = %{epoch}:%{version}-%{release}
+
+Buildrequires: jpackage-utils >= 0:1.6.0
+BuildRequires: ant >= 0:1.6.2
+#BuildRequires: java-devel >= 0:1.4.2
+BuildRequires: eclipse-ecj >= 0:3.0.2
+BuildRequires: ant-trax
+BuildRequires: xalan-j2
+BuildRequires: jakarta-commons-beanutils >= 1.7
+BuildRequires: jakarta-commons-collections >= 0:3.1
+#BuildRequires: jakarta-commons-daemon >= 1.0.1
+BuildRequires: jakarta-commons-daemon >= 1.0
+BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
+BuildRequires: jakarta-commons-digester >= 0:1.7
+BuildRequires: jakarta-commons-logging >= 0:1.0.4
+BuildRequires: jakarta-commons-fileupload >= 0:1.0
+BuildRequires: jakarta-commons-modeler >= 1.1
+BuildRequires: jakarta-commons-pool >= 0:1.2
+BuildRequires: jakarta-commons-launcher >= 0:0.9
+BuildRequires: jakarta-commons-el >= 0:1.0
+BuildRequires: jaas
+BuildRequires: jdbc-stdext >= 0:2.0
+BuildRequires: jndi >= 0:1.2.1
+BuildRequires: jndi-ldap
+BuildRequires: jsse >= 0:1.0.3
+BuildRequires: junit >= 0:3.8.1
+BuildRequires: mx4j >= 0:3.0.1
+BuildRequires: regexp >= 0:1.3
+BuildRequires: struts >= 0:1.2.7
+BuildRequires: xerces-j2 >= 0:2.7.1
+# xml-commons-apis is needed by Xerces-J2
+BuildRequires: xml-commons-apis >= 1.3
+# FIXME taglibs-standard is not listed in the Tomcat build.properties.default
+BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
+# formerly non-free stuff
+# geronimo-specs replaces non-free jta
+BuildRequires: jta >= 0:1.0.1
+# jaf can be provided by classpathx-jaf
+#BuildRequires: jaf >= 0:1.0.2
+BuildRequires: jaf >= 0:1.0.1
+# javamail can be provided by classpathx-mail
+#BuildRequires: javamail >= 0:1.3.3
+BuildRequires: javamail >= 0:1.3.1
 # libgcj aot-compiled native libraries
 BuildRequires:    	java-gcj-compat-devel >= 1.0.43
 Requires(post):   	java-gcj-compat >= 1.0.31
 Requires(postun): 	java-gcj-compat >= 1.0.31
 
 %description
-Server that conforms to the Servlet 2.4 and JSP 2.0
-specifications from Java Software.
+Tomcat is the servlet container that is used in the official Reference
+Implementation for the Java Servlet and JavaServer Pages technologies.
+The Java Servlet and JavaServer Pages specifications are developed by
+Sun under the Java Community Process.
+
+Tomcat is developed in an open and participatory environment and
+released under the Apache Software License. Tomcat is intended to be
+a collaboration of the best-of-breed developers from around the world.
+We invite you to participate in this open development project. To
+learn more about getting involved, click here.
+
+%package webapps
+Group: System Environment/Applications
+PreReq: %{name} = %{epoch}:%{version}-%{release}
+Requires: jakarta-taglibs-standard >= 0:1.1.0
+Summary: Web applications for Jakarta Tomcat
+
+%description webapps
+Web applications for Jakarta Tomcat
+
+%package admin-webapps
+Group: System Environment/Applications
+PreReq: %{name} = %{epoch}:%{version}-%{release}
+Requires: struts >= 0:1.1
+Summary: The administrative web applications for Jakarta Tomcat
 
-Develop Web applications in Java.
+%description admin-webapps
+The administrative web applications (admin and manager) for Jakarta Tomcat
 
-%package servlet-2.4-api
-Group:		   	Internet/WWW/Dynamic Content
-Requires:          	/usr/sbin/update-alternatives
-Provides:       	servlet
-Provides:       	servlet5
-Provides:       	servlet24
-Obsoletes:       	servletapi5
-Provides:       	servletapi5
-Summary:		Java servlet and JSP API classes
+%package servlet-%{servletspec}-api
+Group: Internet/WWW/Dynamic Content
+Requires: /usr/sbin/update-alternatives
+Summary: Jakarta Tomcat Servlet implementation classes
+Obsoletes: servletapi5
+Provides: servlet
+Provides: servlet5
+Provides: servlet24
+Provides: servletapi5
+
+%description servlet-%{servletspec}-api
+Contains the implementation classes
+of the Jakarta Tomcat Servlet API (packages javax.servlet).
+
+%package servlet-%{servletspec}-api-javadoc
+Group: Development/Documentation
+Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api
+Obsoletes: servletapi5-javadoc
+Provides: servletapi5-javadoc
 # libgcj aot-compiled native libraries
 Requires(post):   	java-gcj-compat >= 1.0.31
 Requires(postun): 	java-gcj-compat >= 1.0.31
 
-%description servlet-2.4-api
-This subproject contains the source code for the implementation classes
-of the Java Servlet and JSP APIs (packages javax.servlet).
-
-%package servlet-2.4-api-javadoc
-Group:                  Development/Documentation
-Obsoletes:              servletapi5-javadoc
-Provides:               servletapi5-javadoc
-Summary:                Javadoc for %{name}-servlet-2.4-api
-
-%description servlet-2.4-api-javadoc
-Javadoc generated Documentation for %{name}-servlet-2.4-api.
-
-%package jasper
-Group:		   	Development/Compilers
-Requires:	        ant >= 0:1.5.4, jpackage-utils >= 0:1.5.32
-Requires:          	xerces-j2 >= 0:2.6.0
-Requires:          	xml-commons-apis >= 0:1.0
-Requires:          	jakarta-commons-el >= 0:1.0
-Requires:          	jakarta-commons-collections >= 0:2.1
-Requires:          	jakarta-commons-logging >= 0:1.0.3
-Requires:		%{name}-servlet-2.4-api = %{epoch}:%{version}-%{release}
-Obsoletes:       	jasper5
-Provides:       	jasper5
-Summary:		Apache JSP Engine, RI for Servlet JSP 2.0 API
+%description servlet-%{servletspec}-api-javadoc
+Contains the javadoc generated documentation for the implementation classes
+of the Jakarta Tomcat Servlet and JSP APIs (packages javax.servlet).
+
+%package jsp-%{jspspec}-api
+Group: Internet/WWW/Dynamic Content
+Requires: /usr/sbin/update-alternatives
+Requires: servlet24
+# We need this to indirectly get rid of legacy jsp included in old
+# servlet packages (one day we will be able to remove this)
+PreReq: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Summary: Jakarta Tomcat Servlet and JSP implementation classes
+Provides: jsp
 # libgcj aot-compiled native libraries
 Requires(post):   	java-gcj-compat >= 1.0.31
 Requires(postun): 	java-gcj-compat >= 1.0.31
 
-%description jasper
-JSP engine that conforms to the JSP 2.0
-specifications from Java Software.
-
-%package jasper-javadoc
-Group:			Development/Documentation
-Obsoletes:		jasper5-javadoc
-Provides:		jasper5-javadoc
-Summary:		Javadoc for %{name}-jasper
-
-%description jasper-javadoc
-Javadoc generated Documentation for %{name}-jasper.
+%description jsp-%{jspspec}-api
+Contains the implementation classes
+of the Jakarta Tomcat JSP API (packages javax.servlet.jsp).
+
+%package jsp-%{jspspec}-api-javadoc
+Group: Development/Documentation
+Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api
+
+%description jsp-%{jspspec}-api-javadoc
+Contains the javadoc generated documentation for the implementation classes
+of the Jakarta Tomcat JSP API (packages javax.servlet.jsp).
+
+%package common-lib
+Group: Development/Compilers
+Summary: Libraries needed to run the Tomcat Web container (part)
+PreReq: ant >= 0:1.6.2
+PreReq: java >= 0:1.4.2
+PreReq: eclipse-ecj >= 0:3.0.2
+PreReq: jakarta-commons-collections >= 0:3.1
+PreReq: jakarta-commons-dbcp >= 0:1.2.1
+PreReq: jakarta-commons-el >= 0:1.0
+PreReq: jakarta-commons-logging >= 0:1.0.4
+# FIXME commons-pool is not listed in the Tomcat build.properties.default
+PreReq: jakarta-commons-pool >= 0:1.2
+# formerly non-free stuff
+# geronimo-specs replaces non-free jta
+PreReq: jta >= 0:1.0.1
+# jaf can be provided by classpathx-jaf
+PreReq: jaf >= 0:1.0.1
+# javamail can be provided by classpathx-mail
+PreReq: javamail >= 0:1.3.1
+PreReq: jdbc-stdext
+PreReq: jndi
+PreReq: mx4j >= 0:3.0.1
+# Other subpackages must go in first
+PreReq: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+PreReq: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
+PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+# libgcj aot-compiled native libraries
+Requires(post):   	java-gcj-compat >= 1.0.31
+Requires(postun): 	java-gcj-compat >= 1.0.31
 
-%package webapps
-Group:			System Environment/Applications
-Requires:		%{name} = %{epoch}:%{version}-%{release}
-Requires:		jakarta-taglibs-standard >= 0:1.1.0
-Summary:		Web Applications for tomcat
+%description common-lib
+Libraries needed to run the Tomcat Web container (part)
 
-%description webapps
-Web Applications for tomcat
+%package server-lib
+Group: Development/Compilers
+Summary: Libraries needed to run the Tomcat Web container (part)
+PreReq: jakarta-commons-beanutils >= 0:1.7.0
+PreReq: jakarta-commons-digester >= 0:1.6
+PreReq: jakarta-commons-el >= 0:1.0
+PreReq: jakarta-commons-fileupload >= 0:1.0-1jpp
+PreReq: jakarta-commons-logging >= 0:1.0.4
+PreReq: jakarta-commons-modeler >= 1.1
+PreReq: jaas
+PreReq: mx4j >= 0:3.0.1
+PreReq: regexp >= 0:1.3
+# Other subpackages must go in first
+PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release}
+
+%description server-lib
+Libraries needed to run the Tomcat Web container (part)
+
+%package %{jname}
+Group: Development/Compilers
+Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
+Summary: Compiler JARs and associated scripts for %{name}
+Obsoletes: jasper5
+Provides: jasper5
+# libgcj aot-compiled native libraries
+Requires(post):   	java-gcj-compat >= 1.0.31
+Requires(postun): 	java-gcj-compat >= 1.0.31
 
-%package admin-webapps
-Group:			System Environment/Applications
-Requires:		%{name} = %{epoch}:%{version}-%{release}
-Requires:		struts >= 0:1.2
-Summary:		Admin Web Applications for tomcat
+%description %{jname}
+Compiler JARs and associated scripts for %{name}
 
-%description admin-webapps
-Admin Web Applications for tomcat
+%package %{jname}-javadoc
+Group: Development/Documentation
+Summary: Javadoc generated documentation for %{name}-%{jname}
+Obsoletes: jasper5-javadoc
+Provides: jasper5-javadoc
 
+%description %{jname}-javadoc
+Javadoc for generated documentation %{name}-%{jname}
 
 %prep
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
+
 %setup -q -c -T -a 0
 
 cd %{packdname}
-# %patch0
+%patch0 -p2
 %patch1 -p2
 %patch2 -p2
-%patch4 -p2 -b .cluster
-%patch5 -p2 -b .skip
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-%patch9 -p1
-%patch10 -p2 -b .orig
-%patch11 -p2 -b .orig
-%ifarch ia64
-%patch12 -p2 -b .orig
-%endif
-%ifarch s390x ppc64
-%patch13 -p2 -b .orig
-%endif
-%patch14 -p0
+%patch3 -p2
+%patch4 -p2
+%patch5 -p2
+#%patch6 -p1
+%patch7 -p2
+%patch8 -p2
+%patch9 -p2
+%patch10 -p2
+##%patch11 -p1
+%patch12 -p2
+%patch13 -p2
+%patch14 -p2
 %patch15 -p2
 %patch16 -p2
+%patch17 -p2
 
 %build
-
 export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
 
-# Remove pre-build jars
-for dir in %{packdname} ; do
-    find $dir -name "*.jar" -exec rm -f {} \;
+# Remove pre-built jars
+for dir in $RPM_BUILD_DIR/%{name}-%{version}/%{packdname} ; do
+    find $dir -name "*.jar" | xargs -t rm -f
 done
 
-pushd %{packdname}
-cp $RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-5/LICENSE .
-popd 
-
-# build jsp-api, servlet-api as ant dist will later on require them for webapps
-pushd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
-
-pushd jsr154
-ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
+# Remove garbled class files
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}
+    rm -rf connectors/jk/jkstatus/build
 popd
 
-pushd jsr152
-ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
-popd
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}
+    cp build/LICENSE .
+popd 
 
+# build jspapi and servletapi as ant dist will require them later
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi
+    pushd jsr154
+        ant -Dservletapi.build=build \
+            -Dservletapi.dist=dist \
+            -Dbuild.compiler=modern dist
+    popd
+    pushd jsr152
+        ant -Dservletapi.build=build \
+            -Dservletapi.dist=dist \
+            -Dbuild.compiler=modern dist
+    popd
 popd
 
+# build jasper subpackage
+CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
+export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2
+    cat > build.properties <<EOBP
+ant.jar=$(build-classpath ant)
+servlet-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
+tools.jar=%{java.home}/lib/tools.jar
+xerces.jar=$(build-classpath xerces-j2)
+xercesImpl.jar=$(build-classpath jaxp_parser_impl)
+xmlParserAPIs.jar=$(build-classpath xml-commons-apis)
+commons-el.jar=$(build-classpath commons-el)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-daemon.jar=$(build-classpath commons-daemon)
+junit.jar=$(build-classpath junit)
+EOBP
+    # can't use jikes to build tomcat4 (strange)
+    ant -Djava.home=%{java_home} -Dbuild.compiler=modern javadoc
+popd
 
 # build tomcat 5
-pushd %{packdname}/jakarta-tomcat-5
-
-cat >> build.properties <<EOBP
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build
+    cat >> build.properties << EOBP
 ant.jar=%{_javadir}/ant.jar
-ant-launcher.jar=%{_javadir}/ant-launcher.jar
-jtc.home=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-connectors/
-jasper.home=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-jasper/jasper2
+ant-launcher.jar=%{_javadir}/ant.jar
+jtc.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/connectors/
+%{jname}.home=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2
 commons-beanutils.jar=$(build-classpath commons-beanutils)
 commons-fileupload.jar=$(build-classpath commons-fileupload)
 commons-collections.jar=$(build-classpath commons-collections)
+commons-daemon.jar=$(build-classpath commons-daemon)
 commons-dbcp.jar=$(build-classpath commons-dbcp)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-el.jar=$(build-classpath commons-el)
@@ -283,14 +373,15 @@
 commons-logging-api.jar=$(build-classpath commons-logging-api)
 commons-modeler.jar=$(build-classpath commons-modeler)
 commons-pool.jar=$(build-classpath commons-pool)
-jmx.jar=$(build-classpath mx4j/mx4j)
-jmx-tools.jar=$(build-classpath mx4j/mx4j-tools)
-jmxri.jar=$(build-classpath mx4j/mx4j-jmx)
+jmx.jar=$(build-classpath mx4j/mx4j-jmx.jar)
+jmx-remote.jar=$(build-classpath mx4j/mx4j-remote.jar)
+jmx-tools.jar=$(build-classpath mx4j/mx4j-tools.jar)
+jmxri.jar=$(build-classpath mx4j/mx4j-jmx.jar)
 junit.jar=$(build-classpath junit)
 regexp.jar=$(build-classpath regexp)
-servlet-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
-jsp-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar
-servlet.doc=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/docs/api
+servlet-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
+servlet.doc=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/docs/api
 xercesImpl.jar=$(build-classpath jaxp_parser_impl)
 xml-apis.jar=$(build-classpath xml-commons-apis)
 struts.jar=$(build-classpath struts)
@@ -301,35 +392,27 @@
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
-puretls.jar=$(build-classpath puretls)
 jcert.jar=$(build-classpath jsse/jcert)
 jnet.jar=$(build-classpath jsse/jnet)
 jsse.jar=$(build-classpath jsse/jsse)
 servletapi.build.notrequired=true
 jspapi.build.notrequired=true
-taglibs-core.jar=$(build-classpath taglibs-core)
-taglibs-standard.jar=$(build-classpath taglibs-standard)
 EOBP
-
-# can't use jikes to build tomcat5 (strange)
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
-
+# can't use jikes to build tomcat4 (strange)
+    ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd
 
 # build the connectors
-pushd %{packdname}/jakarta-tomcat-connectors
-
-# this is just plain and simply evil but something changed in a major way between 5.0.16 and 5.0.18
-oldclasspath=$CLASSPATH
-export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\
-$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-5/build/server/lib/catalina.jar
-
-cat > build.properties <<EOBP
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/connectors
+# use the JARs created above to build
+    export CLASSPATH=$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build/build/server/lib/catalina.jar
+    cat > build.properties << EOBP
 activation.jar=$(build-classpath jaf)
 ant.jar=%{_javadir}/ant.jar
 junit.jar=$(build-classpath junit)
 commons-beanutils.jar=$(build-classpath commons-beanutils)
 commons-collections.jar=$(build-classpath commons-collections)
+commons-daemon.jar=$(build-classpath commons-daemon)
 commons-digester.jar=$(build-classpath commons-digester)
 commons-fileupload.jar=$(build-classpath commons-fileupload)
 commons-logging.jar=$(build-classpath commons-logging)
@@ -337,79 +420,56 @@
 commons-modeler.jar=$(build-classpath commons-modeler)
 commons-pool.jar=$(build-classpath commons-pool)
 regexp.jar=$(build-classpath regexp)
-jmx.jar=$(build-classpath mx4j/mx4j)
-puretls=$(build-classpath puretls)
+jmx.jar=$(build-classpath mx4j/mx4j-jmx)
 activation.jar=$(build-classpath jaf)
 mail.jar=$(build-classpath javamail/mailapi)
 jta.jar=$(build-classpath jta)
 jaas.jar=$(build-classpath jaas)
 jndi.jar=$(build-classpath jndi)
 jdbc20ext.jar=$(build-classpath jdbc-stdext)
-puretls.jar=$(build-classpath puretls)
 jcert.jar=$(build-classpath jsse/jcert)
 jnet.jar=$(build-classpath jsse/jnet)
 jsse.jar=$(build-classpath jsse/jsse)
 EOBP
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
-export CLASSPATH=$oldclasspath
-popd
-
-# build the webapps and make the tree ready to install
-pushd %{packdname}/jakarta-tomcat-5
-ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+    ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
 popd
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# install RPM README
-cp %{SOURCE3} .
-
+CLASSPATH=%(build-classpath xalan-j2 xml-commons-apis jakarta-taglibs-core jakarta-taglibs-standard)
+export CLASSPATH=$CLASSPATH:$RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
 # build initial path structure
 install -d -m 755 $RPM_BUILD_ROOT/{%{confdir},%{logdir},%{homedir},%{bindir}}
 install -d -m 755 $RPM_BUILD_ROOT/{%{serverdir},%{tempdir},%{workdir}}
 install -d -m 755 $RPM_BUILD_ROOT/{%{appdir},%{commondir},%{shareddir}}
-
-install -d -m 755 $RPM_BUILD_ROOT/{%{_bindir},%{_sysconfdir}/{rc.d/init.d,logrotate.d},%{_javadir}}
-
-install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{bindir}/relink
-
-# servlet-api and jsp-api
-pushd %{packdname}/jakarta-servletapi-5
-# jars
-install -m 644 jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
-install -m 644 jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servletapi5-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-
-# javadoc servlet
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-servlet-2.4-api-%{version}
-cp -pr jsr154/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-servlet-2.4-api-%{version}
-ln -s %{name}-servlet-2.4-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/servletapi5 # ghost symlink
-
-# javadoc jsp
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-2.0-api-%{version}
-cp -pr jsr152/build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-2.0-api-%{version}
-ln -s %{name}-jsp-2.0-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jsp-api # ghost symlink
-popd
-
-# sysv init and logging
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
-install %{SOURCE5} $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
-
-pushd %{packdname}/jakarta-tomcat-5
-pushd dist
-    mv bin/*     ${RPM_BUILD_ROOT}%{bindir}
-    mv common/*  ${RPM_BUILD_ROOT}%{commondir}
-    mv conf/*    ${RPM_BUILD_ROOT}%{confdir}
-    mv server/*  ${RPM_BUILD_ROOT}%{serverdir}
-    mv shared/*  ${RPM_BUILD_ROOT}%{shareddir}
-    mv webapps/* ${RPM_BUILD_ROOT}%{appdir}
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/{init.d,logrotate.d}
+install -d -m 755 $RPM_BUILD_ROOT/{%{_bindir},%{_javadir}}
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/%{bindir}/relink
+# SysV init and configuration
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build
+    export usejikes=false
+    ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+    pushd dist
+        mv bin/* $RPM_BUILD_ROOT%{bindir}
+        mv common/* $RPM_BUILD_ROOT%{commondir}
+        mv conf/* $RPM_BUILD_ROOT%{confdir}
+        mv server/* $RPM_BUILD_ROOT%{serverdir}
+        mv shared/* $RPM_BUILD_ROOT%{shareddir}
+        mv webapps/* $RPM_BUILD_ROOT%{appdir}
+    popd
+    pushd build/conf
+	mv jk2.properties jk2.manifest jkconf.ant.xml jkconfig.manifest \
+           shm.manifest tomcat-jk2.manifest uriworkermap.properties \
+           workers.properties workers.properties.minimal workers2.properties \
+           workers2.properties.minimal \
+             $RPM_BUILD_ROOT%{confdir}
+    popd
 popd
-
-# create reloctomcat5
-cat >> $RPM_BUILD_ROOT%{bindir}/reloctomcat5<<EORLTC
+# create reloctomcat5 (is this really necessary anymore?)
+cat >> $RPM_BUILD_ROOT%{bindir}/reloctomcat5 << EORLTC
 #!/bin/sh
 #
 
@@ -426,34 +486,26 @@
 cp %{confdir}/server.xml.reloc %{confdir}/server.xml
 
 EORLTC
-
-# rename catalina/jasper into dtomcat5/djasper5 to let wrapper take precedence
-install $RPM_BUILD_ROOT%{bindir}/catalina.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
+# rename catalina.sh into dtomcat5 to let wrapper take precedence
+install $RPM_BUILD_ROOT%{bindir}/catalina.sh \
+    $RPM_BUILD_ROOT%{_bindir}/d%{name}
 rm -f $RPM_BUILD_ROOT%{bindir}/catalina.sh.*
-# Remove leftover files ?
+# Remove leftover files
 rm -f $RPM_BUILD_ROOT%{bindir}/*.orig
-
-# install wrapper as tomcat5/jasper5
-install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/%{name}
-
+# install wrapper as tomcat5
+install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
 # install logrotate support
-install %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
-
+install %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 # remove / reorder non-usefull stuff
 rm -rf $RPM_BUILD_ROOT%{homedir}/src/
 rm -f  $RPM_BUILD_ROOT%{bindir}/*.sh $RPM_BUILD_ROOT%{bindir}/*.bat
-rm -rf $RPM_BUILD_ROOT%{bindir}/contrib/
-find $RPM_BUILD_ROOT%{bindir} \
-    -name "*.jar" -not -name "bootstrap.jar" | xargs rm -f
-
 # FHS compliance patches, not easy to track them all boys :)
-
-for i in $RPM_BUILD_ROOT%{confdir}/%{name}.conf $RPM_BUILD_ROOT%{_bindir}/d%{name} \
-         $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} \
-         $RPM_BUILD_ROOT%{_bindir}/d%{jname} $RPM_BUILD_ROOT%{_bindir}/%{jname} \
-         $RPM_BUILD_ROOT%{bindir}/relink $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-    do
-
+for i in $RPM_BUILD_ROOT%{confdir}/%{name}.conf \
+         $RPM_BUILD_ROOT%{_bindir}/d%{name} \
+         $RPM_BUILD_ROOT%{_bindir}/%{name} \
+         $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} \
+         $RPM_BUILD_ROOT%{bindir}/relink \
+         $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}; do
     perl -pi -e "s|\@\@\@TCCONF\@\@\@|%{confdir}|g;" $i
     perl -pi -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g;" $i
     perl -pi -e "s|\@\@\@TCBIN\@\@\@|%{bindir}|g;" $i
@@ -463,266 +515,307 @@
     perl -pi -e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g;" $i
     perl -pi -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g;" $i
 done
-
-### Replace local copies with jpp-compatible links
-# Process server/lib
-pushd   $RPM_BUILD_ROOT/%{serverdir}/lib
+# Remove local JARs (to be replaced with jpp links in post)
+pushd $RPM_BUILD_ROOT/%{serverdir}/lib
     find . -name "*.jar" -not -name "catalina*" \
                          -not -name "servlets-*" \
-                         -not -name "tomcat-*" \
-                         -exec rm -f {} \;
-
+                         -not -name "tomcat-*" | xargs -t rm -f
     # catalina-ant will be installed in a public repository
     mv catalina-ant.jar $RPM_BUILD_ROOT/%{_javadir}/catalina-ant-%{version}.jar
-
     pushd $RPM_BUILD_ROOT/%{_javadir}
         ln -fs catalina-ant-%{version}.jar catalina-ant5.jar
     popd
 popd
-
 # Process admin webapp server/webapps/admin
-# don't remove catalina-admin though
 pushd $RPM_BUILD_ROOT/%{serverdir}/webapps/admin/WEB-INF/lib
-    find . -name "*.jar" -not -name 'catalina-admin*' -exec rm -f {} \;
-    # while we're here we might as well install this
-    install %{SOURCE10} ../struts-config.xml
+    find . -name "*.jar" -not -name 'catalina-admin*' | xargs -t rm -f
 popd
-
 # Process common/lib
 pushd $RPM_BUILD_ROOT/%{commondir}/lib
-    find . -name "*.jar" -not -name "jasper*" \
-                         -not -name "naming*" \
-                         -exec rm -f {} \;
-
+    find . -name "*.jar" -not -name "%{jname}*" \
+                         -not -name "naming*" | xargs -t rm -f
     # jasper's jars will be installed in a public repository
-    for i in jasper-compiler jasper-runtime; do
-	j=`echo $i | sed 's:jasper-:jasper5-:'`
-	mv $i.jar $RPM_BUILD_ROOT%{_javadir}/$j-%{version}.jar
+    for i in %{jname}-compiler %{jname}-runtime; do
+        j=`echo $i | sed 's:%{jname}-:%{jname}5-:'`
+        mv $i.jar $RPM_BUILD_ROOT%{_javadir}/$j-%{version}.jar
         pushd $RPM_BUILD_ROOT%{_javadir}
             ln -sf $j-%{version}.jar $j.jar
         popd
     done
 popd
-
-# Process common/lib
+# Process common/endorsed
 pushd $RPM_BUILD_ROOT/%{commondir}/endorsed
-    find . -name "*.jar" -exec rm -f {} \;
+    find . -name "*.jar" | xargs -t rm -f
 popd
-
 # avoid duplicate servlet.jar
 rm -f $RPM_BUILD_ROOT%{commondir}/lib/servlet.jar
-
 # Perform FHS translation
 # (final links)
 pushd $RPM_BUILD_ROOT%{homedir}
-   [ -d bin ]     || ln -fs %{bindir}    bin
-   [ -d common ]  || ln -fs %{commondir} common
-   [ -d conf ]    || ln -fs %{confdir}   conf
-   [ -d logs ]    || ln -fs %{logdir}    logs
-   [ -d server ]  || ln -fs %{serverdir} server
-   [ -d shared ]  || ln -fs %{shareddir} shared
-   [ -d webapps ] || ln -fs %{appdir}    webapps
-   [ -d work ]    || ln -fs %{workdir}   work
-   [ -d temp ]    || ln -fs %{tempdir}   temp
+    [ -d bin ] || ln -fs %{bindir} bin
+    [ -d common ] || ln -fs %{commondir} common
+    [ -d conf ] || ln -fs %{confdir} conf
+    [ -d logs ] || ln -fs %{logdir} logs
+    [ -d server ] || ln -fs %{serverdir} server
+    [ -d shared ] || ln -fs %{shareddir} shared
+    [ -d webapps ] || ln -fs %{appdir} webapps
+    [ -d work ] || ln -fs %{workdir} work
+    [ -d temp ] || ln -fs %{tempdir} temp
 popd
-
-cd $RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src
-find $RPM_BUILD_ROOT%{homedir} -type l -maxdepth 1 | sed s+$RPM_BUILD_ROOT++g > homelinks
-
+cd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}
+find $RPM_BUILD_ROOT%{homedir} -type l -maxdepth 1 | \
+    sed s+$RPM_BUILD_ROOT++g > homelinks
+# begin servlet api subpackage install
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi
+    install -m 644 jsr154/dist/lib/servlet-api.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-servlet-%{servletspec}-api-%{version}.jar
+    pushd $RPM_BUILD_ROOT%{_javadir}
+        ln -sf %{name}-servlet-%{servletspec}-api-%{version}.jar \
+            %{name}-servlet-%{servletspec}-api.jar
+        # For backward compatibility with old JPP packages
+        ln -sf %{name}-servlet-%{servletspec}-api-%{version}.jar \
+            servletapi5.jar
+    popd
+    # javadoc servlet
+    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
+    cp -pr jsr154/build/docs/api/* \
+        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
+    # ghost symlink
+    ln -s %{name}-servlet-%{servletspec}-api-%{version} \
+        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-servlet-%{servletspec}-api
 popd
-
-# jasper
-pushd %{packdname}/jakarta-tomcat-catalina/catalina
-install -m 644 src/bin/setclasspath.sh \
-    $RPM_BUILD_ROOT%{_bindir}/%{jname}_classpath.sh
+# begin jsp api subpackage install
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/servletapi
+    install -m 644 jsr152/dist/lib/jsp-api.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar
+    pushd $RPM_BUILD_ROOT%{_javadir}
+        ln -sf %{name}-jsp-%{jspspec}-api-%{version}.jar \
+            %{name}-jsp-%{jspspec}-api.jar
+        # For backward compatibility with old JPP packages
+        ln -sf %{name}-jsp-%{jspspec}-api-%{version}.jar \
+            jspapi.jar
+    popd
+    # javadoc jsp
+    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
+    cp -pr jsr152/build/docs/api/* \
+        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
+    # ghost symlink
+    ln -s %{name}-jsp-%{jspspec}-api-%{version} \
+        $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-%{jspspec}-api
 popd
-
-pushd %{packdname}/jakarta-tomcat-jasper/jasper2
-install -m 755 build/bin/jspc.sh $RPM_BUILD_ROOT%{_bindir}/jspc5
-install -m 755 build/bin/jasper.sh $RPM_BUILD_ROOT%{_bindir}/%{jname}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper-%{version}
-cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper-%{version}
-ln -s %{name}-jasper-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper
+# begin jasper subpackage install
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
+    install -m755 jasper2/src/bin/jspc.sh \
+        $RPM_BUILD_ROOT%{_bindir}/jspc5.sh
+    install -m755 jasper2/src/bin/%{jname}.sh \
+        $RPM_BUILD_ROOT%{_bindir}/%{full_jname}.sh
+popd
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/container
+    install -m755 catalina/src/bin/setclasspath.sh \
+        $RPM_BUILD_ROOT%{_bindir}/%{full_jname}-setclasspath.sh
+popd
+# javadoc
+install -d -m755 $RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
+pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}
+    cp -pr jasper2/build/javadoc/* \
+        $RPM_BUILD_ROOT%{_javadocdir}/%{jname}-%{version}
+    # ghost symlink
+    ln -s %{jname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{jname}
 popd
 
-# Compile these jarfiles with -O0 to avoid PR middle-end/21362.
-# aot-compile-rpm will build mapping databases for them.
-gcjflags="`echo $RPM_OPT_FLAGS | sed 's:-O.:-O0:'` -fPIC -findirect-dispatch"
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
-for jar in catalina catalina-optional; do
-    gcj -shared $gcjflags -Wl,-Bsymbolic \
-        $RPM_BUILD_ROOT%{serverdir}/lib/$jar.jar \
-	-o $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/$jar.jar.so
-done
-
-aot-compile-rpm
-
+# sample.war is a malformed zip file
+aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 # install tomcat5 (but don't activate)
 /sbin/chkconfig --add %{name}
-
-### Create automated links
-### Since all needed extensions may not have been installed for this jvm
-### output is muted
-
+# Create automated links - since all needed extensions may not have been
+# installed for this jvm output is muted
 # Try to set a sensible jvm
 unset JAVA_HOME
 [ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
-[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
+[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \
+    . %{_sysconfdir}/java/java.conf
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-
 # Remove old automated symlinks
-# we do not want old links if a jar is removed from tomcat's layout
-for repository in %{serverdir}/lib \
-                  %{commondir}/lib \
-                  %{commondir}/endorsed ; do
-    find $repository -name '\[*\]*.jar' -not -type d -exec rm -f {} \;
+for repository in %{commondir}/endorsed ; do
+    find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
 done
-
-build-jar-repository %{serverdir}/lib commons-beanutils commons-fileupload \
-                                      commons-digester commons-logging \
-                                      commons-modeler commons-el regexp \
-                                      mx4j/mx4j-jmx jaas catalina-ant5 2>&1
-
-build-jar-repository %{commondir}/lib ant ant-launcher commons-collections \
-                                      commons-dbcp commons-pool \
-                                      commons-logging-api commons-el \
-                                      jaf jdbc-stdext jta javamail jndi \
-                                      mx4j/mx4j-jmx jspapi servletapi5 \
-                                      %{jname}-runtime %{jname}-compiler 2>&1
-
 build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
                                            xml-commons-apis 2>&1
-
+build-jar-repository %{bindir} mx4j/mx4j 2>&1
 %{_bindir}/rebuild-gcj-db
 
-
 %postun
 %{_bindir}/rebuild-gcj-db
 
-
-%post jasper
+%post common-lib
+# Create automated links - since all needed extensions may not have been
+# installed for this jvm output is muted
+# Try to set a sensible jvm
+unset JAVA_HOME
+[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
+[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \
+    . %{_sysconfdir}/java/java.conf
+[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
+# Remove old automated symlinks
+for repository in %{commondir}/lib ; do
+    find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
+done
+build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
+                                      commons-el commons-logging-api \
+                                      commons-pool jaf javamail jdbc-stdext \
+                                      jndi jsp jta \
+                                      mx4j/mx4j \
+                                      servlet %{jname}5-compiler \
+                                      eclipse-ecj \
+                                      %{jname}5-runtime 2>&1
 %{_bindir}/rebuild-gcj-db
 
-
-%postun jasper
+%postun common-lib
 %{_bindir}/rebuild-gcj-db
 
-
-%post servlet-2.4-api
+%post server-lib
+# Create automated links - since all needed extensions may not have been
+# installed for this jvm output is muted
+# Try to set a sensible jvm
+unset JAVA_HOME
+[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
+[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \
+    . %{_sysconfdir}/java/java.conf
+[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
+# Remove old automated symlinks
+for repository in %{serverdir}/lib ; do
+    find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
+done
+build-jar-repository %{serverdir}/lib catalina-ant5 commons-beanutils \
+                                      commons-digester commons-el \
+                                      commons-fileupload commons-logging \
+                                      commons-modeler jaas mx4j/mx4j \
+                                      eclipse-ecj \
+                                      regexp 2>&1
 %{_bindir}/rebuild-gcj-db
 
-
-%postun servlet-2.4-api
+%postun server-lib
 %{_bindir}/rebuild-gcj-db
 
-
-%post servlet-2.4-api-javadoc
-rm -f %{_javadocdir}/servletapi5
-rm -f %{_javadocdir}/jsp-api
-ln -s %{name}-servlet-2.4-api-%{version} %{_javadocdir}/servletapi5
-ln -s %{name}-jsp-2.0-api-%{version} %{_javadocdir}/jsp-api
-
-
-%postun servlet-2.4-api-javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/servletapi5
-  rm -f %{_javadocdir}/jsp-api
-fi
-
-
-%post jasper-javadoc
-rm -f %{_javadocdir}/%{name}-jasper
-ln -s %{name}-jasper-%{version} %{_javadocdir}/%{name}-jasper
-
-
-%postun jasper-javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}-jasper
-fi
-
-
 %post webapps 
-                                                                                                                                                                                                  
-### Create automated links
-### Since all needed extensions may not have been installed for this jvm
-### output is muted
-                                                                                                                                                                                                  
+# Create automated links - since all needed extensions may not have been
+# installed for this jvm output is muted
 # Try to set a sensible jvm
 unset JAVA_HOME
 [ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
-[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
+[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \
+    . %{_sysconfdir}/java/java.conf
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-
 build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \
       jakarta-taglibs-core jakarta-taglibs-standard 2>&1
+%{_bindir}/rebuild-gcj-db
 
+%postun webapps
+%{_bindir}/rebuild-gcj-db
 
 %post admin-webapps
-
-### Create automated links
-### Since all needed extensions may not have been installed for this jvm
-### output is muted
-
+# Create automated links - since all needed extensions may not have been
+# installed for this jvm output is muted
 # Try to set a sensible jvm
 unset JAVA_HOME
 [ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
-[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
+[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && \
+    . %{_sysconfdir}/java/java.conf
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
-
 # Remove old automated symlinks
-# we do not want old links if a jar is removed from tomcat's layout
 find %{serverdir}/webapps/admin/WEB-INF/lib -name '\[*\]*.jar' \
-     -not -name 'catalina-admin*' -not -type d -exec rm -f {} \;
-
+     -not -name 'catalina-admin*' -not -type d | xargs rm -f
 build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib struts 2>&1
+%{_bindir}/rebuild-gcj-db
 
+%postun admin-webapps
+%{_bindir}/rebuild-gcj-db
+
+%post servlet-%{servletspec}-api
+update-alternatives --install %{_javadir}/servlet.jar servlet \
+    %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
+%{_bindir}/rebuild-gcj-db
+
+%post servlet-%{servletspec}-api-javadoc
+rm -f %{_javadocdir}/servletapi # legacy symlink
+rm -f %{_javadocdir}/%{name}-servlet-%{servletspec}-api
+ln -s %{name}-servlet-%{servletspec}-api-%{version} \
+    %{_javadocdir}/%{name}-servlet-%{servletspec}-api
+%{_bindir}/rebuild-gcj-db
+
+%postun servlet-%{servletspec}-api
+if [ "$1" = "0" ]; then
+    update-alternatives --remove servlet \
+        %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
+fi
+%{_bindir}/rebuild-gcj-db
+
+%post jsp-%{jspspec}-api
+update-alternatives --install %{_javadir}/jsp.jar jsp \
+    %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
+%{_bindir}/rebuild-gcj-db
+
+%post jsp-%{jspspec}-api-javadoc
+rm -f %{_javadocdir}/jsp-api # legacy symlink
+rm -f %{_javadocdir}/%{name}-jsp-%{jspspec}-api
+ln -s %{name}-jsp-%{jspspec}-api-%{version} \
+    %{_javadocdir}/%{name}-jsp-%{jspspec}-api
+
+%postun jsp-%{jspspec}-api
+if [ "$1" = "0" ]; then
+    update-alternatives --remove jsp \
+        %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
+fi
+%{_bindir}/rebuild-gcj-db
 
 %preun
-# Always clean up wordir and tempdir on upgrade/removal
+# Always clean up workdir and tempdir on upgrade/removal
 rm -fr %{workdir}/* %{tempdir}/*
-
 if [ $1 = 0 ]; then
-    [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop
-    [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name}
-
-#    %{_sbindir}/userdel tomcat >> /dev/null 2>&1 || :
-#    %{_sbindir}/groupdel tomcat >> /dev/null 2>&1 || :
+    [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
+    [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
+    # Remove automated symlinks
+    for repository in %{commondir}/endorsed ; do
+        find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
+    done
+fi
 
+%preun server-lib
+if [ $1 = 0 ]; then
     # Remove automated symlinks
-    for repository in %{serverdir}/lib \
-                      %{commondir}/lib \
-                      %{commondir}/endorsed ; do
-        find $repository -name '\[*\]*.jar' -not -type d -exec rm -f {} \;
+    for repository in %{serverdir}/lib ; do
+        find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
     done
 fi
 
+%preun common-lib
+if [ $1 = 0 ]; then
+    # Remove automated symlinks
+    for repository in %{commondir}/lib ; do
+        find $repository -name '\[*\]*.jar' -not -type d | xargs rm -f
+    done
+fi
 
 %preun admin-webapps
-
 if [ $1 = 0 ]; then
     find %{serverdir}/webapps/admin/WEB-INF/lib  \
          -name '\[*\]*.jar' \
-         -not -name 'catalina-admin*' -not -type d -exec rm -f {} \;
+         -not -name 'catalina-admin*' -not -type d | xargs rm -f
 fi
 
 %preun webapps
-
 if [ $1 = 0 ]; then
     find %{appdir}/jsp-examples/WEB-INF/lib  \
          -name '\[*\]*.jar' \
-         -not -type d -exec rm -f {} \;
+         -not -type d | xargs rm -f
 fi
 
-
-
 %pre
 # Add the "tomcat" user and group
 # we need a shell to be able to use su - later
@@ -730,91 +823,88 @@
 %{_sbindir}/useradd -c "Tomcat" -u %{tcuid} -g tomcat \
     -s /bin/sh -r -d %{homedir} tomcat 2> /dev/null || :
 
-
 %files -f %{packdname}/homelinks
 %defattr(644,root,root,755)
-%doc TOMCAT4.README.RPM %{packdname}/jakarta-tomcat-5/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
+%doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
 # Normal directories
 %dir %{homedir}
 %dir %{bindir}
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_localstatedir}/cache/%{name}
 %dir %{commondir}
-%dir %{serverdir}
+%dir %{commondir}/classes
+%dir %{commondir}/lib
+%dir %{commondir}/endorsed
+%dir %{commondir}/i18n
+%dir %{serverdir}/
 %dir %{serverdir}/classes
 %dir %{serverdir}/lib
 %dir %{shareddir}
 %dir %{shareddir}/classes
 %dir %{shareddir}/lib
-
-%{_javadir}/catalina*.jar
-
 # Directories with special permissions
-%attr(775,root,tomcat)		%dir                  %{appdir}
-%attr(775,root,tomcat)    	%dir                  %{confdir}
-%attr(775,root,tomcat)    	%dir                  %{tempdir}
-%attr(775,root,tomcat)    	%dir                  %{workdir}
-%attr(755,tomcat,tomcat)	%dir                  %{logdir}
-%attr(775,root,tomcat)     %dir                  %{confdir}/Catalina
-%attr(775,root,tomcat)     %dir                  %{confdir}/Catalina/localhost
-
-%attr(755,root,root) 	  	%{_bindir}/*tomcat*
-%attr(755,root,root) 	  	%{bindir}/re*
-%attr(755,root,root)  	  	%{_sysconfdir}/rc.d/init.d/%{name}
-%{bindir}/bootstrap.jar
-
-%attr(644,root,tomcat)    	%config(noreplace)      %{confdir}/catalina.policy
-%attr(644,root,tomcat)    	%config(noreplace)      %{confdir}/catalina.properties
-%attr(660,root,tomcat)    	%config(noreplace)      %{confdir}/jk2.properties
-%attr(660,root,tomcat)    	%config(noreplace)      %{confdir}/tomcat-users.xml
+%attr(775,root,tomcat) %dir %{appdir}
+%attr(775,root,tomcat) %dir %{confdir}
+%attr(775,root,tomcat) %dir %{tempdir}
+%attr(775,root,tomcat) %dir %{workdir}
+%attr(755,tomcat,tomcat) %dir %{logdir}
+%attr(775,root,tomcat) %dir %{confdir}/Catalina
+%attr(775,root,tomcat) %dir %{confdir}/Catalina/localhost
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{bindir}/*
+%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
+%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
+%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
+%attr(660,root,tomcat) %config(noreplace) %{confdir}/jk2.properties
+%attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
+%attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
 %config(noreplace) %{confdir}/tomcat5.conf
 %config(noreplace) %{confdir}/server-minimal.xml
 %config(noreplace) %{confdir}/server.xml
 %config(noreplace) %{confdir}/web.xml
-
-# %{confdir}/server-noexamples.xml.config
+%config(noreplace) %{confdir}/context.xml
+%config(noreplace) %{confdir}/jk2.manifest
+%config(noreplace) %{confdir}/jkconf.ant.xml
+%config(noreplace) %{confdir}/jkconfig.manifest
+%config(noreplace) %{confdir}/shm.manifest
+%config(noreplace) %{confdir}/tomcat-jk2.manifest
+%config(noreplace) %{confdir}/uriworkermap.properties
+%config(noreplace) %{confdir}/workers.properties
+%config(noreplace) %{confdir}/workers.properties.minimal
+%config(noreplace) %{confdir}/workers2.properties
+%config(noreplace) %{confdir}/workers2.properties.minimal
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%{commondir}/*
-%{serverdir}/lib/*
-# %{tempdir}/README.txt
-
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-optional.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/naming*.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-*.*jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-*.jar.*
-
-%files servlet-2.4-api
-%defattr(-,root,root)
-%doc %{packdname}/jakarta-tomcat-5/LICENSE
-%{_javadir}/servletapi5*.jar
-%{_javadir}/jspapi*.jar
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*api*.jar.*
-
-%files servlet-2.4-api-javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-servlet-2.4-api-%{version}
-%doc %{_javadocdir}/%{name}-jsp-2.0-api-%{version}
-%ghost %doc %{_javadocdir}/servletapi5
-%ghost %doc %{_javadocdir}/jsp-api
+%{commondir}/i18n/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
 
-%files jasper
-%defattr(-,root,root)
-%doc %{packdname}/jakarta-tomcat-5/LICENSE
-%doc %{packdname}/jakarta-tomcat-jasper/jasper2/README.txt
-%doc %{packdname}/jakarta-tomcat-jasper/jasper2/doc/*
-%{_javadir}/jasper*.jar
-%{_bindir}/j*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jasper*.jar.*
+%files common-lib
+%defattr(644,root,root,755)
+%{commondir}/lib/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
 
-%files jasper-javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-jasper-%{version}
-%ghost %doc %{_javadocdir}/%{name}-jasper
+%files server-lib
+%defattr(644,root,root,755)
+%{_javadir}/catalina*.jar
+%{serverdir}/lib/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-optional*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-storeconfig*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina.jar*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-cgi*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-default*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-invoker*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-ssi*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-webdav*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-ajp*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-apr*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-coyote*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-http*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-util*
 
 %files webapps
 %defattr(644,root,tomcat,775)
@@ -828,175 +918,168 @@
 %{appdir}/tomcat-docs/*
 %dir %{appdir}/webdav
 %{appdir}/webdav/*
-%ifnarch ia64 s390x ppc64
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root.jar.*
-%endif
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*-examples_classes.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/applet.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/applet*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jsp-examples*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-examples*
 
 %files admin-webapps
 %defattr(640,root,tomcat,750)
 %attr(660,root,tomcat) %{confdir}/Catalina/localhost/manager.xml
-%{confdir}/Catalina/localhost/balancer.xml
+%attr(660,root,tomcat) %{confdir}/Catalina/localhost/host-manager.xml
 %{confdir}/Catalina/localhost/admin.xml
 %dir %{appdir}/balancer
 %{appdir}/balancer/*
-%defattr(644,root,tomcat,750)
 %dir %{serverdir}/webapps
 %{serverdir}/webapps/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-host-manager*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-fileupload*
 
-%changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:5.0.30-8jpp_10fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 0:5.0.30-8jpp_9fc.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Feb  1 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_9fc
-- Fixed XSS vulnerabilities in the example apps.
-
-* Tue Jan  3 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.0.30-8jpp_7fc
-- Fixed typos in the init script.
-
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:5.0.30-8jpp_7fc
-- rebuilt again
+%files %{jname}
+%defattr(644,root,root,755)
+%doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2/doc/jspc.html
+%{_javadir}/%{jname}5-*.jar
+%attr(755,root,root) %{_bindir}/%{jname}*.sh
+%attr(755,root,root) %{_bindir}/jspc*.sh
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
+
+%files %{jname}-javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{jname}-%{version}
+%ghost %doc %{_javadocdir}/%{jname}
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> 0:5.0.30-8jpp_6fc
-- rebuilt
-- patched util's build.xml to not use target=1.1
+%files servlet-%{servletspec}-api
+%defattr(-,root,root)
+%doc %{packdname}/build/LICENSE
+%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
+%{_javadir}/servletapi5.jar
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-servlet-%{servletspec}-api*
 
-* Wed Oct 12 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_4fc
-- Reenable build on ppc64 (#166657).
+%files servlet-%{servletspec}-api-javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
+%ghost %doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api
 
-* Wed Sep 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_3fc
-- Build with more pervasive aot-compile-rpm.
+%files jsp-%{jspspec}-api
+%defattr(-,root,root)
+%doc %{packdname}/build/LICENSE
+%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
+%{_javadir}/jspapi.jar
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsp-%{jspspec}-api*
 
-* Thu Aug 25 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_2fc
-- Disable build on ppc64 (#166657).
-- Disable webapps builds on ia64 (#163249) and s390x (#164985).
+%files jsp-%{jspspec}-api-javadoc
+%defattr(-,root,root)
+%doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
+%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
-* Wed Aug 24 2005 Gary Benson <gbenson at redhat.com>
-- Add a status command to the init script (from Jesus Rodriguez).
-- Silence warnings from recent versions of find (#151749).
-- Silence progress messages on shutdown.
+%changelog
+* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_1fc
+- Updated to 5.5.15
 
-* Fri Jul 22 2005 Gary Benson <gbenson at redhat.com>
-- Remove workarounds for #163689.
+* Thu Dec 02 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_11rh
+- Split preun section among main package and the two new subpackages
 
-* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_1fc
-- Build on ia64, ppc64, s390 and s390x.
+* Tue Nov 29 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_10rh
+- Move catalina-ant*.jar to the server-lib subpackage to avoid circular
+  dependency with the main package
 
-* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp
-- Correct ownership of admin webapps directory.
+* Tue Nov 15 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_9rh
+- Remove leading zero from alternative priorities
 
-* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com>
-- Remove jarfiles from the tarball.
-- Switch to aot-compile-rpm.
+* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_8rh
+- Rebuild with new classpath-mail as javamail alternative
 
-* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-7jpp
-- Remove references to the never used commons-daemon.
-- Remove an unused patch and a couple of comments.
-- Add a runtime dependency on puretls.
-- Build webapps in build not install.
-- Correct ant-launcher path in first set of build.properties.
-- Explicitly specify which mx4j jars to use at all times.
-- Don't include jars from other rpms in %{bindir}.
-- Correct permissions and remove junk from %{bindir}.
-- Add ant-launcher.jar to common classloader.
-- s/tomcat4/tomcat5/ in various comments.
+* Mon Nov 14 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_7rh
+- Update versions of dependencies and move them to library subpackages
 
-* Tue May 31 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-6jpp_1fc
-- Rearrange how BC-compiled stuff is built and installed.
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_6rh
+- Fix typo that caused links to be missing
 
-* Fri May 27 2005 Gary Benson <gbenson at redhat.com>
-- Upgrade to 5.0.30-6jpp.
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_5rh
+- Use only jta from geronimo-specs
 
-* Mon May 23 2005 Gary Benson <gbenson at redhat.com>
-- Add alpha to the list of build architectures (#157522).
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_4rh
+  From Deepak Bhole <dbhole at redhat.com>
+- Fix init script so it works with SELinux
 
-* Tue May 10 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_6fc
-- Precompile webapps (#157205).
+* Fri Nov 11 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_3rh
+- Place jsp in its own subpackage
+- Fix alternative priorities to jsp and servlet
+- Create library subpackages: common-lib and server-lib
 
-* Fri May  6 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_5fc
-- Add ant-launcher.jar to common classloader.
-- Use absolute paths for rebuild-gcj-db.
-- Don't include jars from other rpms in %{bindir}.
-- Correct permissions and remove junk from %{bindir}.
+* Tue Oct 25 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_2rh
+- Fix versions in patch
 
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_4fc
-- Remove references to the never used commons-daemon.
-- Add a runtime dependency on puretls.
+* Sat Oct 22 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.12-1jpp_1rh
+- Merge with upstream
+- Fix alternative links to jsp and servlet
 
-* Thu May  5 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_3fc
-- Add dependencies for %post and %postun scriptlets (#156901).
+* Sat Oct 22 2005 Vadim Nasardinov <vadimn at redhat.com> 0:5.5.12-1jpp
+- Upgrade to 5.5.12
 
-* Wed May  4 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_2fc
-- BC-compile.
+* Wed Jul 06 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_5rh
+- Reinstate ssl code changes so that tomcat can be built with other SDKs
+  and not only with Sun's or BEA's.
 
-* Tue Apr 26 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-5jpp_1fc
-- Upgrade to 5.0.30-5jpp.
+* Fri Jun 24 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_4rh
+- Make sure the main package installs first so user tomcat is created
 
-* Fri Apr 22 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-1jpp_3fc
-- Explicitly specify which mx4j jars to use (#155391).
+* Fri Jun 17 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_3rh
+- Remove spurious dependency on tyrex (only needed for tomcat4)
 
-* Mon Apr 11 2005 Florian La Roche <laroche at redhat.com>
-- /etc/init.d -> /etc/rc.d/init.d.
+* Fri Jun 10 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_2rh
+- Remove spurious links to log4j.jar from common and server/lib
 
-* Mon Mar 14 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-1jpp_2fc
-- Rebuild to pick up mx4j changes.
+* Wed Jun 08 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp_1rh
+- Merge for upgrade
+- Change the user to tomcat from tomcat4
+- Relax permissions on appdir directory so jonas package can build
 
-* Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-1jpp_1fc
-- Build into Fedora.
+* Mon May 09 2005 Fernando Nasser <fnasser at redhat.com> 0:5.5.9-1jpp
+- Upgrade to 5.5.9
+- Add jmx to bindir and lower requirement to java 1.4.2
 
-* Mon Feb 14 2005 Jason Corley <jason.corley at gmail.com> 0:5.0.30-6jpp
-- Migrate to current struts
- 
-* Thu Feb 03 2005 Fernando Nasser <fnasser at redhat.com> 0:5.0.30-1jpp_2rh
-- Change configuration file, init script and tomcat wrapper script to use
-  'tomcat' as the Tomcat userid.
+* Fri Feb 04 2005 Jason Corley 0:5.5.7-2jpp
+- Add provides servletapi5 in addition to obsoletes servletapi5 (Martin Grotzke)
 
-* Tue Feb 01 2005 Jason Corley <jason.corley at gmail.com> 0:5.0.30-5jpp
-- Fix jasper symlinks in /var/lib/tomcat5/common/lib (discovered by Kaj Niemi)
+* Thu Feb 03 2005 Jason Corley 0:5.5.7-1jpp
+- Upgrade to current stable release, 5.5.7
 
-* Fri Jan 21 2005 Jason Corley <jason.corley at gmail.com> 0:5.0.30-4jpp
-- Add patch to remove Manifest from bootstrap.jar
-- Add patch to fix mx4j/mx4j 2 differences
+* Fri Jan 31 2005 Jason Corley 0:5.5.4-17jpp
+- Use new eclipse-ecj package to remove old jasper-compiler-jdt.jar hack
 
-* Mon Jan 10 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-3jpp
-- Create the jasper5 and jasper5-javadoc replacement packages.
+* Thu Jan 27 2005 Jason Corley 0:5.5.4-16jpp
+- Attempt to replace non-free jta with free geronimo-specs
 
-* Wed Jan 05 2005 Gary Benson <gbenson at redhat.com>
-- Add omitted uninstall scriptlet for tomcat5-servlet-2.4-api-javadoc.
+* Thu Jan 27 2005 Jason Corley 0:5.5.4-15jpp
+- Clean rebuild
 
-* Mon Dec 20 2004 Gary Benson <gbenson at redhat.com> 0:5.0.30-2jpp
-- Create the servletapi5 and servletapi5-javadoc replacement packages.
-  Partly from Ralph Apel <R.Apel at t-systems.com>.
+* Thu Dec 16 2004 Jason Corley 0:5.5.4-14jpp
+- First attempt at jasper subpackages
 
-* Thu Dec 09 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.30-1jpp_1rh
-- Merge with upstream for 5.0.30 upgrade
+* Thu Dec 16 2004 Jason Corley 0:5.5.4-13jpp
+- Yet another "servletapi" naming scheme change
 
-* Thu Dec 09 2004 Gary Benson <gbenson at redhat.com> 0:5.0.30-1jpp
-- Update to 5.0.30
+* Tue Dec 14 2004 Jason Corley 0:5.5.4-12jpp
+- Update the servletapi and servletapi-javadoc subpackages to the way proposed
+  by Gary Benson (based on work by Ralph Apel) in the 5.0.30 RPMs
 
-* Wed Dec 08 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.28-2jpp_1rh
-- Merge with upstream for 5.0.28 upgrade
+* Wed Dec 08 2004 Jason Corley 0:5.5.4-10jpp
+- Incorporate Fernando Nasser's javaxssl patch from the tomcat 5.0.28 RPM
+- Replace find ... -exec's with find | xargs
 
-* Wed Dec 08 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.28-2jpp
-- Update dependency to struts11 as this version does not build with
-  the new Struts
-- Remove SDK 1.3-related references to com.sun.* classes so it can
-  build with other Java providers
+* Tue Dec 07 2004 Jason Corley 0:5.5.4-9jpp
+- First attempt at the whole servletapi issue
+- Replace jmxri references with mx4j
+- Build with JDK 1.4 and require a 1.4 JDK to run
+- Remove cruft
+- Clearly lost track of some stuff between changelog entries ;-)
 
-* Tue Nov 23 2004 Jason Corley <jason.corley at gmail.com> 0:5.0.28-1jpp
-- Update to 5.0.28
-- Add JDK build and runtime dependency (1.4 or newer)
-- Update jpackage-utils dependency to 1.6.0 or newer
-- Require jakarta-commons-beanutils 1.7.0 or newer (release notes 5.0.28)
-- Require jakarta-commons-collections 3.1 or newer (release notes 5.0.28)
-- Require jakarta-commons-pool 1.2 or newer (release notes 5.0.27)
+* Fri Dec 03 2004 Jason Corley 0:5.5.4-1jpp
+- First attempt at building 5.5
 
 * Fri Sep 10 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.27-4jpp
 - Rebuild using Tyrex 1.0.1
@@ -1004,12 +1087,6 @@
 * Sat Sep 04 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.27-3jpp
 - Rebuild with Ant 1.6.2
 
-* Tue Aug 03 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.27-2jpp_2rh
-- Add missing build dependency on ant-trax
-
-* Wed Jul 21 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.27-2jpp_1rh
-- Merge with more recent community version
-
 * Fri Jul 16 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:5.0.27-2jpp
 - Oops, don't require mx4j 2.0.1. 1.1.1 or later should be enough.
   jmxri won't work anymore since tc5 needs mx4j-tools.
@@ -1035,20 +1112,6 @@
 - Require xerces-j2 2.6.2 (release notes 5.0.21), also require ant < 1.6
   as tomcat5 doesn't seem to build cleanly with 1.6 yet.
 
-* Wed Apr 08 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.19-2jpp_3rh
-- Fix name of the Tomcat user to 'tomcat' and update other tomcat4 references
-  to tomcat5.
-
-* Wed Apr 08 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.19-2jpp_2rh
-- Allow browsing of webapps directory so that JOnAS can build.
-
-* Wed Apr 08 2004 Fernando Nasser <fnasser at redhat.com> 0:5.0.19-2jpp_1rh
-- Red Hat customizations
-- remove references to sun.com classes
-- user and group are 'tomcat' with no versioning
-- do not remove user and group on uninstall
-- relax some directory and file permissions so that JOnAS can access them
-
 * Fri Mar 19 2004 Kaj J. Niemi <kajtzu at fi.basen.net> 0:5.0.19-2jpp
 - Set JAVA_ENDORSED_DIRS by default in tomcat5.conf, it is otherwise empty
   Suggestion from Aleksander Adamowski <aleksander.adamowski at altkom.pl>  


--- TOMCAT4.README.RPM DELETED ---


--- jasper5_command.patch DELETED ---


--- struts-config.xml DELETED ---


--- tomcat5-5.0.30-bootstrap.MF.patch DELETED ---


--- tomcat5-5.0.30-bz163249.patch DELETED ---


--- tomcat5-5.0.30-bz164985.patch DELETED ---


--- tomcat5-5.0.30-catalina.sh.patch DELETED ---


--- tomcat5-5.0.30-cluster-pathelement.patch DELETED ---


--- tomcat5-5.0.30-javaxssl.patch DELETED ---


--- tomcat5-5.0.30-no-daemon.patch DELETED ---


--- tomcat5-5.0.30-precompile.patch DELETED ---


--- tomcat5-5.0.30-skip-build-on-install.patch DELETED ---


--- tomcat5-5.0.30.patch DELETED ---


--- tomcat5-5.0.conf DELETED ---


--- tomcat5-5.0.init DELETED ---


--- tomcat5-5.0.link_admin_jar.patch DELETED ---


--- tomcat5-5.0.logrotate DELETED ---


--- tomcat5-5.0.relink DELETED ---


--- tomcat5-5.0.wrapper DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 01:32:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 20:32:53 -0500
Subject: rpms/tomcat5/devel tomcat5.spec,1.59,1.60
Message-ID: <200602230132.k1N1WrIN029282@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29256

Modified Files:
	tomcat5.spec 
Log Message:
Exclude ppc64 s390 and s390x


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- tomcat5.spec	23 Feb 2006 00:26:54 -0000	1.59
+++ tomcat5.spec	23 Feb 2006 01:32:42 -0000	1.60
@@ -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_1fc
+Release: 1jpp_2fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -57,6 +57,10 @@
 Patch15: %{name}-%{majversion}-skip-native.patch
 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
@@ -976,6 +980,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_2fc
+- Exclude ppc64 s390 s390x
+
 * Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_1fc
 - Updated to 5.5.15
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:01:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:01:55 -0500
Subject: rpms/parted/devel parted-1.6.25-dm.patch,1.5,1.6
Message-ID: <200602230201.k1N21tY5020170@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20078

Modified Files:
	parted-1.6.25-dm.patch 
Log Message:
- close /proc/devices correctly


parted-1.6.25-dm.patch:
 configure.in            |   12 +
 include/parted/device.h |    3 
 libparted/Makefile.am   |    1 
 libparted/linux.c       |  344 +++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 357 insertions(+), 3 deletions(-)

Index: parted-1.6.25-dm.patch
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted-1.6.25-dm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parted-1.6.25-dm.patch	8 Feb 2006 20:19:05 -0000	1.5
+++ parted-1.6.25-dm.patch	23 Feb 2006 02:01:09 -0000	1.6
@@ -56,7 +56,7 @@
  
  #include "blkpg.h"
  
-@@ -270,6 +272,96 @@
+@@ -270,6 +272,99 @@
  }
  
  static int
@@ -109,8 +109,10 @@
 +	if (fd < 0)
 +		return 0;
 +
-+	if (readFD(fd, &buf) < 0)
-+		return 0; 
++	if (readFD(fd, &buf) < 0) {
++		close(fd);
++		return 0;
++	}
 +	line = buf;
 +	end = strchr(line, '\n');
 +	while (end && *end) {
@@ -121,7 +123,6 @@
 +		*end = '\0';
 +
 +		if (!bd) {
-+
 +			if (!strncmp(line, "Block devices:", 14))
 +				bd = 1;
 +			goto next;
@@ -134,6 +135,7 @@
 +		maj = strtol(line, &name, 10);
 +		if (maj == major) {
 +			free(buf);
++			close(fd);
 +			return 1;
 +		}
 +
@@ -146,6 +148,7 @@
 +			end = line;
 +	}
 +	free(buf);
++	close(fd);
 +	return 0;
 +}
 +
@@ -153,7 +156,7 @@
  _device_stat (PedDevice* dev, struct stat * dev_stat)
  {
  	PED_ASSERT (dev != NULL, return 0);
-@@ -330,6 +422,8 @@
+@@ -330,6 +425,8 @@
  		dev->type = PED_DEVICE_CPQARRAY;
  	} else if (dev_major == UBD_MAJOR && (dev_minor % 0x10 == 0)) {
  		dev->type = PED_DEVICE_UBD;
@@ -162,7 +165,7 @@
  	} else {
  		dev->type = PED_DEVICE_UNKNOWN;
  	}
-@@ -973,6 +1067,11 @@
+@@ -973,6 +1070,11 @@
  			goto error_free_arch_specific;
  		break;
  
@@ -174,7 +177,7 @@
  	case PED_DEVICE_UNKNOWN:
  		if (!init_generic (dev, _("Unknown")))
  			goto error_free_arch_specific;
-@@ -1624,6 +1723,7 @@
+@@ -1624,6 +1726,7 @@
  	} else if (dev->type == PED_DEVICE_DAC960
  			|| dev->type == PED_DEVICE_CPQARRAY
  			|| dev->type == PED_DEVICE_ATARAID
@@ -182,7 +185,7 @@
  			|| isdigit (dev->path[path_len - 1]))
  	        snprintf (result, result_len, "%sp%d", dev->path, num);
  	else
-@@ -1836,6 +1936,243 @@
+@@ -1836,6 +1939,243 @@
  }
  
  static int
@@ -426,7 +429,7 @@
  _kernel_reread_part_table (PedDevice* dev)
  {
  	LinuxSpecific*	arch_specific = LINUX_SPECIFIC (dev);
-@@ -1878,7 +2215,9 @@
+@@ -1878,7 +2218,9 @@
  static int
  linux_disk_commit (PedDisk* disk)
  {



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:02:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:02:49 -0500
Subject: rpms/parted/devel parted.spec,1.63,1.64
Message-ID: <200602230202.k1N22nRx020269@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20236

Modified Files:
	parted.spec 
Log Message:
- bump changelog/release


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- parted.spec	11 Feb 2006 04:56:26 -0000	1.63
+++ parted.spec	23 Feb 2006 02:02:46 -0000	1.64
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.6.25
-Release: 6.1
+Release: 7
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0: parted-1.6.3-fat.c.patch
 Patch3: parted-1.6.25-sx8.patch
@@ -99,6 +99,9 @@
 %{_libdir}/*.a*
 
 %changelog
+* Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 1.6.25-7
+- close /proc/devices correctly
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.25-6.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:09:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:09:22 -0500
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.13,1.14
Message-ID: <200602230209.k1N29ML3021126@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21094

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
* Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
  mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7
  binaries.  This will provide backward compatibilty for Fedora Core 5, however
  3rd party developers and rpm package maintainers should update to using the
  new X11R7 locations immediately, as these compatibility links are temporary,
  and will be removed from a future OS release.
- Remove system directories from file manifest to appease the banshees.



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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-font-utils.spec	18 Feb 2006 00:44:29 -0000	1.13
+++ xorg-x11-font-utils.spec	23 Feb 2006 02:09:20 -0000	1.14
@@ -14,7 +14,7 @@
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -59,7 +59,7 @@
 Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any
 # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this
 # is needed for upgrades to work properly from OS releases that had XFree86
-Obsoletes: XFree86-font-utils, xorg-x11-font-utils
+Obsoletes: XFree86-font-utils
 # NOTE: XFree86 package used to contain bdftopcf, so this is needed for
 # upgrades to work.  It also contained mkfontdir/mkfontscale at one point,
 # so we just Conflict without a version specification.
@@ -153,6 +153,10 @@
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
+- Remove "Obsoletes: xorg-x11-font-util" as the package should not obsolete
+  itself.  Leftover from the original package template it seems.  (#182439)
+
 * Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
   mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:23:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:23:30 -0500
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.107,1.108 sources,1.103,1.104
Message-ID: <200602230223.k1N2NUe8006413@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6330

Modified Files:
	mkinitrd.spec sources 
Log Message:
- update the tarball and changelog



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mkinitrd.spec	22 Feb 2006 22:38:51 -0000	1.107
+++ mkinitrd.spec	23 Feb 2006 02:23:27 -0000	1.108
@@ -73,6 +73,8 @@
 - Update /dev/mapper nodes more often
 - Allow dm partadd not to include the /dev/mapper path
 - Use /etc/fstab, not /fstab, so if you've got /sbin/mount it'll work
+- Bring in sd_mod if libata or scsi_mod is selected (#181983)
+- use -Wl,--wrap,open and __wrap_open() instead of coeOpen()
 
 * Wed Feb 15 2006 Peter Jones <pjones at redhat.com> - 5.0.26-1
 - fix detection of floppy devices, don't probe them for labels


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- sources	22 Feb 2006 22:38:51 -0000	1.103
+++ sources	23 Feb 2006 02:23:27 -0000	1.104
@@ -1 +1 @@
-3f4f55244bc1ad38ed1d889f2fe3b462  mkinitrd-5.0.27.tar.bz2
+baaa3113f551a7ba02a708777e287bd6  mkinitrd-5.0.27.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:26:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:26:16 -0500
Subject: rpms/pirut/devel .cvsignore, 1.13, 1.14 pirut.spec, 1.14,
	1.15 sources, 1.14, 1.15
Message-ID: <200602230226.k1N2QG6Q007778@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7666/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.14-1 on branch devel from pirut-0.9.14-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	22 Feb 2006 05:03:19 -0000	1.13
+++ .cvsignore	23 Feb 2006 02:26:14 -0000	1.14
@@ -1 +1 @@
-pirut-0.9.13.tar.gz
+pirut-0.9.14.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pirut.spec	22 Feb 2006 05:03:19 -0000	1.14
+++ pirut.spec	23 Feb 2006 02:26:14 -0000	1.15
@@ -2,14 +2,14 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.13
+Version: 0.9.14
 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.1
+Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3
 Requires(post): desktop-file-utils >= 0.8
 Requires(postun): desktop-file-utils >= 0.8
 Obsoletes: system-config-packages, redhat-config-packages, pup
@@ -67,6 +67,12 @@
 
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.14-1
+- fix traceback on right click (#182360)
+- add hal and dbus to pup's reboot list
+- new images from dfong
+- allow stopping the search, requires yum 2.5.3
+
 * Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.13-1
 - add files
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Feb 2006 05:03:19 -0000	1.14
+++ sources	23 Feb 2006 02:26:14 -0000	1.15
@@ -1 +1 @@
-97791e921cb42203e3bcbc1073927625  pirut-0.9.13.tar.gz
+3dc6daa78372478d865b29bd4c72aecb  pirut-0.9.14.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:34:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:34:37 -0500
Subject: rpms/mkinitrd/devel mkinitrd.spec,1.108,1.109 sources,1.104,1.105
Message-ID: <200602230234.k1N2YbXA009966@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9952

Modified Files:
	mkinitrd.spec sources 
Log Message:
- specfile fix


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mkinitrd.spec	23 Feb 2006 02:23:27 -0000	1.108
+++ mkinitrd.spec	23 Feb 2006 02:34:27 -0000	1.109
@@ -11,7 +11,7 @@
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs
-BuildRequires: popt-devel e2fsprogs-devel parted-devel
+BuildRequires: popt e2fsprogs-devel parted-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	23 Feb 2006 02:23:27 -0000	1.104
+++ sources	23 Feb 2006 02:34:34 -0000	1.105
@@ -1 +1 @@
-baaa3113f551a7ba02a708777e287bd6  mkinitrd-5.0.27.tar.bz2
+f108123f6d5a97e883fd2ff83bd744b3  mkinitrd-5.0.27.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 02:38:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 21:38:07 -0500
Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.14,1.15
Message-ID: <200602230238.k1N2c7kg004332@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4317

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
* Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
  mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7
  binaries.  This will provide backward compatibilty for Fedora Core 5, however
  3rd party developers and rpm package maintainers should update to using the
  new X11R7 locations immediately, as these compatibility links are temporary,
  and will be removed from a future OS release.
- Remove system directories from file manifest to appease the banshees.



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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-font-utils.spec	23 Feb 2006 02:09:20 -0000	1.14
+++ xorg-x11-font-utils.spec	23 Feb 2006 02:38:03 -0000	1.15
@@ -154,7 +154,7 @@
 
 %changelog
 * Wed Feb 22 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
-- Remove "Obsoletes: xorg-x11-font-util" as the package should not obsolete
+- Remove "Obsoletes: xorg-x11-font-utils" as the package should not obsolete
   itself.  Leftover from the original package template it seems.  (#182439)
 
 * Fri Feb 17 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2



From fedora-cvs-commits at redhat.com  Thu Feb 23 03:10:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 22:10:37 -0500
Subject: rpms/pirut/devel .cvsignore, 1.14, 1.15 pirut.spec, 1.15,
	1.16 sources, 1.15, 1.16
Message-ID: <200602230310.k1N3Ab1n028859@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28810/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.15-1 on branch devel from pirut-0.9.15-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Feb 2006 02:26:14 -0000	1.14
+++ .cvsignore	23 Feb 2006 03:10:35 -0000	1.15
@@ -1 +1 @@
-pirut-0.9.14.tar.gz
+pirut-0.9.15.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pirut.spec	23 Feb 2006 02:26:14 -0000	1.15
+++ pirut.spec	23 Feb 2006 03:10:35 -0000	1.16
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.14
+Version: 0.9.15
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.15-1
+- actually find the images
+
 * Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.14-1
 - fix traceback on right click (#182360)
 - add hal and dbus to pup's reboot list


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Feb 2006 02:26:14 -0000	1.15
+++ sources	23 Feb 2006 03:10:35 -0000	1.16
@@ -1 +1 @@
-3dc6daa78372478d865b29bd4c72aecb  pirut-0.9.14.tar.gz
+eab8ef83b122348e90e623fdbebf5ef0  pirut-0.9.15.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 03:36:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Wed, 22 Feb 2006 22:36:10 -0500
Subject: rpms/python-pyblock/devel .cvsignore, 1.12, 1.13 python-pyblock.spec,
	1.19, 1.20 sources, 1.16, 1.17
Message-ID: <200602230336.k1N3aA5x017636@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/python-pyblock/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17545

Modified Files:
	.cvsignore python-pyblock.spec sources 
Log Message:
- changelog and version



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Feb 2006 23:31:57 -0000	1.12
+++ .cvsignore	23 Feb 2006 03:36:06 -0000	1.13
@@ -1 +1 @@
-pyblock-0.14.tar.bz2
+pyblock-0.15.tar.bz2


Index: python-pyblock.spec
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-pyblock.spec	13 Feb 2006 23:31:57 -0000	1.19
+++ python-pyblock.spec	23 Feb 2006 03:36:06 -0000	1.20
@@ -4,7 +4,7 @@
 
 Summary: Python modules for dealing with block devices
 Name: python-%{realname}
-Version: 0.14
+Version: 0.15
 Release: 1
 Source0: %{realname}-%{version}.tar.bz2
 License: GPL
@@ -38,6 +38,10 @@
 /%{python_sitelib}/block/*
 
 %changelog
+* 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)
+
 * Mon Feb 13 2006 Peter Jones <pjones at redhat.com> - 0.14-1
 - remove member partitions when we activate, rebuild them when we deactivate
 - add another "count_devices(ctx->lc, NATIVE)" in discover_raiddevs.  it


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 Feb 2006 23:31:57 -0000	1.16
+++ sources	23 Feb 2006 03:36:06 -0000	1.17
@@ -1 +1 @@
-d3cee09b63cf1deae5181443738d87f8  pyblock-0.14.tar.bz2
+a201b09eb86a748b0d41bd5671e7ae8f  pyblock-0.15.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 08:36:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 03:36:16 -0500
Subject: rpms/libbtctl/devel libbtctl-0.6.0-libdir.patch, NONE,
	1.1 libbtctl.spec, 1.23, 1.24
Message-ID: <200602230836.k1N8aGMT020115@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20079

Modified Files:
	libbtctl.spec 
Added Files:
	libbtctl-0.6.0-libdir.patch 
Log Message:
added mono components

libbtctl-0.6.0-libdir.patch:
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libbtctl-0.6.0-libdir.patch ---
--- libbtctl-0.6.0/mono/libbtctl/Makefile.am.libdir	2004-05-31 00:04:16.000000000 +0200
+++ libbtctl-0.6.0/mono/libbtctl/Makefile.am	2006-02-23 09:26:26.000000000 +0100
@@ -29,7 +29,7 @@
 CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs btlist.exe btobex.exe
 DISTCLEANFILES = AssemblyInfo.cs
 
-gapidir=$(MONO_INSTDIR)/share/gapi
+gapidir=$(datadir)/gapi
 gapi_DATA = $(API)
 
 all: $(ASSEMBLY) btlist.exe btobex.exe
@@ -64,12 +64,12 @@
 
 install-data-local:
 	if test -n '$(TARGET)'; then \
-		$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(MONO_INSTDIR)/lib || exit 1; \
+		$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \
 	fi
 
 uninstall-local:
 	if test -n '$(TARGET)'; then \
-		$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(MONO_INSTDIR)/lib || exit 1; \
+		$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \
 	fi
 
 


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libbtctl.spec	16 Feb 2006 14:05:26 -0000	1.23
+++ libbtctl.spec	23 Feb 2006 08:36:13 -0000	1.24
@@ -10,8 +10,9 @@
 Requires: python-abi = %{pyver}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.1 python pygtk2-devel gtk2-devel
-BuildRequires: mono-devel
+BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
 ExcludeArch: s390 s390x
+Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
 
 %description
@@ -32,6 +33,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .pydir
 aclocal
 automake -a
@@ -65,6 +67,10 @@
 %doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/lib*.so.*
 %{_libdir}/python?.?/site-packages/*btctl*
+%{_libdir}/mono/gac/btctl/*/btctl.dll
+%{_libdir}/mono/libbtctl/btctl.dll
+%{_datadir}/gapi/btctl-api.xml
+
 
 %files devel
 %defattr(-, root, root)
@@ -73,6 +79,7 @@
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
 %{_datadir}/gtk-doc/html/libbtctl
+%{_libdir}/pkgconfig/libbtctl-sharp.pc
 
 
 %changelog



From fedora-cvs-commits at redhat.com  Thu Feb 23 08:49:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 03:49:07 -0500
Subject: rpms/glibc/FC-4 glibc-20050815-20051104-iconvdata.patch.bz2, NONE,
 1.1 glibc-20050815-20051104.patch, NONE, 1.1 glibc-aio-rh171968.patch, NONE,
 1.1 glibc-bindresvport.patch, NONE, 1.1 glibc-bz1566.patch, NONE,
 1.1 glibc-bz1877.patch, NONE, 1.1 glibc-bz1913.patch, NONE,
 1.1 glibc-bz1920.patch, NONE, 1.1 glibc-bz1952.patch, NONE,
 1.1 glibc-bz1955.patch, NONE, 1.1 glibc-bz1962.patch, NONE,
 1.1 glibc-bz1978.patch, NONE, 1.1 glibc-bz2066.patch, NONE,
 1.1 glibc-bz2080.patch, NONE, 1.1 glibc-bz2126.patch, NONE,
 1.1 glibc-bz2153.patch, NONE, 1.1 glibc-bz2173.patch, NONE,
 1.1 glibc-bz2226.patch, NONE, 1.1 glibc-bz2268.patch, NONE,
 1.1 glibc-check_fds.patch, NONE, 1.1 glibc-ctermid.patch, NONE,
 1.1 glibc-dl-deps.patch, NONE, 1.1 glibc-doc-fixes.patch, NONE,
 1.1 glibc-euidaccess.patch, NONE, 1.1 glibc-gconv-cache-memleak.patch, NONE,
 1.1 glibc-i386-futex-wait-barrier.patch, NONE, 1.1 glibc-i686-memset.patch,
 NONE, 1.1 glibc-ia64-shmatt_t.patch, NONE, 1.1 glibc-iconv-iso11548-1.patch,
 NONE, 1.1 glibc-iconv-iso11548.patch, NONE, 1.1 glib!
 c-localedata-fixes.patch, NONE, 1.1 glibc-nan.patch, NONE,
 1.1 glibc-nis+.patch, NONE, 1.1 glibc-nptl-forcedunwind.patch, NONE,
 1.1 glibc-nptl-static-tls-size.patch, NONE, 1.1 glibc-nptl_db.patch, NONE,
 1.1 glibc-nscd-nischeck.patch, NONE, 1.1 glibc-nscd-readall0.patch, NONE,
 1.1 glibc-ppc-fegetround.patch, NONE, 1.1 glibc-rfc3484.patch, NONE,
 1.1 glibc-rh168266.patch, NONE, 1.1 glibc-rtld-is_static.patch, NONE,
 1.1 glibc-s390-setjmp.patch, NONE, 1.1 glibc-scalb-namespace.patch, NONE,
 1.1 glibc-sysconf-intel-caches.patch, NONE, 1.1 glibc-tls-static-size.patch,
 NONE, 1.1 glibc-tst-initializers1.patch, NONE,
 1.1 glibc-tst-mallocfork.patch, NONE, 1.1 glibc-tst-signal7.patch, NONE,
 1.1 glibc.spec, 1.160, 1.161
Message-ID: <200602230849.k1N8n7ct005903@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5825

Modified Files:
	glibc.spec 
Added Files:
	glibc-20050815-20051104-iconvdata.patch.bz2 
	glibc-20050815-20051104.patch glibc-aio-rh171968.patch 
	glibc-bindresvport.patch glibc-bz1566.patch glibc-bz1877.patch 
	glibc-bz1913.patch glibc-bz1920.patch glibc-bz1952.patch 
	glibc-bz1955.patch glibc-bz1962.patch glibc-bz1978.patch 
	glibc-bz2066.patch glibc-bz2080.patch glibc-bz2126.patch 
	glibc-bz2153.patch glibc-bz2173.patch glibc-bz2226.patch 
	glibc-bz2268.patch glibc-check_fds.patch glibc-ctermid.patch 
	glibc-dl-deps.patch glibc-doc-fixes.patch 
	glibc-euidaccess.patch glibc-gconv-cache-memleak.patch 
	glibc-i386-futex-wait-barrier.patch glibc-i686-memset.patch 
	glibc-ia64-shmatt_t.patch glibc-iconv-iso11548-1.patch 
	glibc-iconv-iso11548.patch glibc-localedata-fixes.patch 
	glibc-nan.patch glibc-nis+.patch glibc-nptl-forcedunwind.patch 
	glibc-nptl-static-tls-size.patch glibc-nptl_db.patch 
	glibc-nscd-nischeck.patch glibc-nscd-readall0.patch 
	glibc-ppc-fegetround.patch glibc-rfc3484.patch 
	glibc-rh168266.patch glibc-rtld-is_static.patch 
	glibc-s390-setjmp.patch glibc-scalb-namespace.patch 
	glibc-sysconf-intel-caches.patch glibc-tls-static-size.patch 
	glibc-tst-initializers1.patch glibc-tst-mallocfork.patch 
	glibc-tst-signal7.patch 
Log Message:
2.3.6-1



--- NEW FILE glibc-20050815-20051104-iconvdata.patch.bz2 ---
BZh91AY&SYT??+_?~0\?????????bc?

Q(??B*
BU
*?R?K

?Y
5?c8?)U
@"?kU?V?$?V?c"P?Q???2-??

)UB?J(@?UH
B?
?I*?
?
?Ps> 
???U??D??
D?#I?@
=?'???0i?/??_???o???V???[m_??????????U?????R??mm?-M??_???.??W????/?9?Z?rZ?Z??????k??????????\???]??^???{???v?_??????????????E????V??r???6????W?????v??????_?m??????o?????????_?Z???[Z???nr??ij?????m??Z?W~k????9?)?????Z?jV?m(Jd%)"4?	? $?H
?4?c@LY(????
?"0m???L?4fY0`??#0????J!$"?eBi??
 T at B"L?c"BeP??H??(f#?e??h+&?F?cQ?#lE? 4b?M?j"MFB??3L?H
??Z(?????1?%??(??Y4d1??????X"?B??????a"%+?*J1???DH&??Q?&?Q%!??F?(???E???2S&?Z$?"??????,b?61?*f1??$?I???4j$B??	??b)1?llB??d????,??K&?Hk%?i"1??Y-?i4b??1	?Q%E?????????h?#d??DX?E1?h??
???b?lh??Z4i1b????E?AAh???F??h?Id???????Q?I?4`???4[DF"?6??Q??h???F?RF??`??(??6K??????Y????5H??????2??4X??ll?4lcb??c4X??cb(?f36
?l?,j? ?i4h?h?j
&!?J?(???5?DS"?lF?+? 61I
5??????,E?? l??"(4lQ?b ?d?
$c????"P?(B
??Ad?4T@?DI34h????&M3Rmm	??[?????Qi,h?#Q??M??e?F?1??cE??6"???f?-?14??lQ$[j(?(??lF??4m?S
0?c6?(???Z5
E?F???0lQ?TIj64Q?c??&?i"-???F???llllm?4h??F?1cF?1?4h??F?X??4h???,X?PQ???"?? ??AcDE?Q?j*?E????Q???D6?b?$???(6*5??h?h"???F?Z
AX#,d?ElZ??$QcRQF??(?*"???Y(?d?[?DZ0QT,?*(?E?Zc???h????(?????b?i5?lU?Pj?1????F?5??i0?EP&?-&
,?BT?????6?55QTZ#Xl?"??"@*"?F????5?66?QPV)*5F?TP?lQ?l?b
P?X????*??**,????&6??m)"???MATb??&e&66?J)??c?K
Ti4Th?I?cE
-?$?J??Qb?"1Z(???X
?j?$PV?b?&,j?&???l?T???$
"1?,TX?"??b??h??5AV1ch?QZ??Z,RZ??4Qc?,&4?1Y)0F???c??4l???)4I?4hC?@b?5*0QllQT6?hF??DmDi6J??E?(??hJ 6(??2cEE?F?5??XK??$h???X??h??DM?Y0Q?Y0F?,j(?X?E?Tb???(,lTQF???*?**4Qh,DE?,j-?QF-?4b??EM?j#h?i-??#$mDX????F??l	Qb?b?? ??&??QQ??Dm?k??5DVF??????lk("??h??Kcb???jIli(?X
Dc??X???EDb??E,QX?#b
c?Tb?4P$j
?&??&51h??(?4Q?Q??d??h?61lQ?b6(?F??Tm"?j6-Q?Y?$????RI??d(?(??????T?????*5?5??l??+5????????&?-?6-???4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h????4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h?h??F?4h??F?4h??F?4h??F?,h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?F?4h??F?4h??F?4h??F?4h????F?4h??F?4h??F?4h??F?4X??F?4h??F?4h??F?4h??F?,h??F?4h??F?4h??F?4h??F?14h??F?4h??!
F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??E?4h??F?4h??F?4h??F?4h??E?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h????4h??F?4h??F?4h??F?4h????4h??F?4h??F?4h??F?4h????4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h?cF?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h?h??F?4h??F?4h??F?4h??F?,h??F?4h??F?4h??EcE??cQ????lJE5?X? b6????h#X????	Q??????l?(???b6?b@??dZ1E???	???F
??????F,j-I?[lh?cDPEQ??E?????Y
?TTTQ?PI???(?m	h???cD?cQF?X?????????TE?*4c?$X???0m?????
??
(??X????F+????4??????E?A??#`5b??cEh??#Q?Q??QlEF?????#RQHb6,j0h?4cDm*1??"?5?Qd?6(??1IX??????AA??4[???J(?A?,F???h????4h?F?(??F?4h??F?
4h??F?664h??F?4h??F?X?1F??h?F?4h?4h??F????F?m??????F4Q4h?h??(?F?4cF???4h??F??4TQ?h?,h?F1?4lh??E4h??F?4h????4h??F?4h??F?4h??F?4X??#F??F?4h??F?4h??4h?h??F?4QF?4h?F4h???4h????4h?4Z4h?4F54Q?AF?4h???A?F?4h??Dh?4h??F?4h??F?4h???F?4h??F?4j4h???????h?????_????????_?9?~]?s???????9D?s??&B3??Fq>?/N????O?|y????>|y???/???????[?6????W?????j??W???tc9s??(??4b?r?]?c?1?c??Q?b?b?Q?Q?X?1?Q?c?1?c??c??A?E?$d?4bc??1?F1?cc?1?c?1?c+?sq?c?1?c?1?c?1?c?1?c1?b1?
??b??FLc?1?c?1?cc???d?1??1F?c1?c?4c?1?b??9?c?1?c?1?c??c?1?c?1??.s?.Y*(?????Id?4X??DX??b),?&?1??hN
?1???4c?c?1?c1?Q?c?1?c??c?1?c?1?c?1?c?1?c??c?1?c?1?c?
#b8.,?DN\?LK????[?9?2k?8F??p?#
0?1A?JK?TFb0h??2AA????FF?Qb??1?2cI&?(?4l??I%3b???Q??X?1&6%"????lT??B#b?%1?4???F? ?A%?M?IQF4c%HQ6#FM&H?1F?2R`???2??,D?lh?@h4h?b?6e?-?(???fX???,l?X????Mc

M?X5??1?(??EmE??cA????blE?I???#I???h?"?L?1DTb2f??
"?`ld?
B1??h??Y?A?&0cR1DF??!??b?&4ID?d
Q??	2?h?cI?&4R

,$cF??L???4H???IE?E&J
?K!b??D?a	d??5?E
((??(???!?4b?,?4?`?%Eh?E??`?Y*6M	T`,Q??b??d?E%?Q???1??h?4"?F?eJ2!4Q?%?b??Q?Q("?-?l?LQ
"I,!Lcb??cEH???DF??K
F?IfRF??Z,?"J"????0?c%?
bQ????E???1?"??$?5"?,?1h??%HQ?
RQ?E???f?"1Ba?L%?2???!??,?????D at TF?BR?F????b$?0???0Q?KX????B),?6i$???c??BTs??4E??
??M????c?cL(?F?I`?,T????,F?2??M ?X$X?A?T???6??QE&??(???
????E ,j2?????Y#X"bPb?!A??
X0?#I?-!E?Bh??cQ?&4d??ccF?Ab??b??F?F?L"???$??TQR??J,Rj1Q???TQ$FM&???`?1DQA i,&"64!"??4????(#"????)???q?4`?F?6f?X?Bh4D%(?*
,j?
4???*J-4???(12???A??h???"h????DQ?#D??E0`?QIc"1?,D??&??!?1?cb?$*Lc#?*LQ??b1b(??ba?h?QcDAbP?h?*#b#&?F4RTlQ??)"1F(

????1)4??h"4??DQb)#Pbf1$RQF1?A2??fT??????(?*4QF
#%M???4cIF-????DT1????1?)(??6
(?Q?6"?B????Td?????I`???1?(?bch?ET&?b?E?????Rc??A??4?li6?E&?M?A?K%??&(?4?h? ?1?(?
??F?EPX(?1

?b,E?"?F)6(?P?F?b6KRQ????TiM%4?F(?"??h?1????DQc???1?c?1?c?1?c?1?c?1?c?1?c1?c?1?c?1?c?1?c?1??1?c?1?h?1?c?1?c?1?c?1?c?1?c?1?cF1?c?1?ns??1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c?4c?1?c?1?c?8??1?c?1?c?1?c??c?1?c?1?c?1?cs??1?c?1?c?4c?1?c?1?c?1?c?1?c?1?c?1??1?c?1?c?1?c?1?c?1?c?1??1?c?1?c?1?c??c?1?c?1?c?4c?1?c?s??c?1?c?1?c?1?c?1??1?c?1?c?1?c?1?c?1?c?1?h?1?c?1?c?1?c?1?c?1?c?1?cF1?c?1?c?1?c?1?c???1?c?1??1?c?1?c?1?s??1?c?1?c?1?c??c?1?c?1?c?1??1?c?1?c?1?cF1?c?1????1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c?4c?1?c?1?c?1?c?1?c?1?c?1??1?c?1?c?1?c?1?c?1?c?1??1?c?1?c?1?c?1?c?1?c?1?h?1?c?1?c?1?c?1?c?1?c?1?cF1?c?1?c?1?c?1?c?1?c?1?c1?c?1?c?1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c??c?1?c?1?c?1?c?1?c?1?c?4c?1?c?1?c?1?c?1?c?1?c?1??1?c?1?c?1?c?1?c?1?c?1??1?c?1?!
c?1?c?1?c?1?c?1?h?1?c?1?c?1?c?1?c?1?c?1?cF1?c?1?c?1?c?1?c&?1???`??#b?E??nf"1?c??1F1?8?1F1??1?\Y?F1?c?1?c?c?1?c?(?1?&1?c?1?c?1?c&1?h?,F?1?c?1???(?#?c???1?b1?cF1?c?1?c?1?c?1?c?9?V??1I??c?(?1?Q?`#?1&K?G	7??c?1?1?c?????j?-??1)4?`
rwlX}?)?????=?jL??D\2-?;?.????????Z/?Q4Gf?M?N???B?U?"?_$?????-???=RiS??=F??@?LdfH???FV~?m????{B?????B?1{2?z??I??x?L?P???z-?Bb?????g??qL????GUJU)??????Z*4=!?3"s.?{L???CT8B??S???????[c6	/?4R]3?T?\m?.?{B"0??)G?Oi??)????v?&O\?=9N??HF\No?j??6????	??Q???h??g??=\z??hVe?U3???v?+?M???vs?:?[<2?S ??d?X?????u?v<,b?yzy)U??8?G??R?-t???D6I,^=!:????HY?MI*????{Dnq??M?S&???DN|=?Z?sSc"??1?:????Da???UO?????eF?w?*yu?^b????Fe??q(??N??Z?\!??X?3????vi)?????|42S??	J??^D-??????1I?@??%'B?L??+kl???
?-?%p??MC!1???"?;b????c??]z??s???3e?Jd?U3?B#=l??6??}???tg?6j<??X:??2??M??????1?(?_?TpCf??(	??+73?,?!???79c??nG?????????F???:??/??&??K???????v?D7B?'y?(C3w{?T???U?|?4Vc??v??I+:zX>?^???C??1Bc??-?????L??B??HRe?????rVj?rM?2j5?Gxn?C?N? ?iu~r?:t?????#2????????)`).ZY%???r???)3?f?I??\?*3?l[6&
?r??i9????#Y???????zCgB?7??\2?B-??14????L???y?.?^???;mu?????+52??P'??%?????%?8?v?U?r??FP??{??Q??	?7O?c,?s?OHEg?z?"7?Rc"???M?,?????*>D??b???)?&?????????????p??%"x????}???&?Df????"?'?K?????fB???x?aT?????'????Ao??R??G?<IJ?
jJpeD??tob|?2SSc??\???C????(2lF?)??U?Cd??p??j?K??|'p???U???C?Z2???????Q??????]TW?(?cl]d???6S?!?'`
q{m
?eH?=???%?BHBCX??E?N?z??z2z?}?&2??kHYU??\???n???????????????eJ??!??no?]?X?????h?PpiaJ#?M??TC?f?-???X||h2;?S??1?lx?n??????wwy?u?f???
??
g???+9a??K????V!4g??????
u?
?k??i??w???n????dYv[mp?fT???kPeg??S|Z??s????K?]!x?M???qp??Ve??MgP?;[u?m?E??R.?????f?g?e?Z?Bc????F?=?V?)1??l??????[???j?????:\??E???~u|?r??2??u,%<.???IL??H6R???Y?L????ML??Dg???????!??#??
@???????PHD???ki?3?!g??6`??E'?S$?;h?????:;9?B????b?:??LD??A???>??z?t???a??;??y??????E???(??.??.??|z???;??[?[???|*?+vm?k?)???7?????bSg?SHM??;?-4H?Lz?????Lx|d+?u??????????V?C?tJ?E?)??e??|???1????E?^???????m??-?%)&!k??Ws]?/i??E>???Qhp???4OI??)??hJ{52??Y?3?QS??q?#7RL??S?	Ap?H????!????]>?h?"?E?"?????`?????L?
?i%8?Ri???????9l??"?? R?bn???4??]??!???}OX?t?e??Bp??mi'?v???H???????K"q0??"????g??Z%B:B?F<???8???[2??h??@?Jl???????????]OS\?h?1	NM?????.??wr???d?@?9[?w?R??????,8?Jz?*=?u?4?w?fN??????F????NS????5?o:|????Y??NJ?ay9K?Xre?????!W?}???%??????????
u???+?c? b??Yj??p?6???i??(???1????a?Ul??j$?('?ch??x??X???????UY521+????V?U>1?-????????M2%??Zs??#m??I??G?????R???$??w?'?%!?????F??!HJ~?o??Ba???.?R?1?????d??Mk?c???M??{B/q,????o!??"m8eJ?xe???)1??????'?D?Q)?,4=9????c*????9p?s:?Fe?$=q??\?,XRs3!? ytk?'?*%?k?????n?a???u-	?????=)?9J??;[h????Gs???_\??'?ypC?Xz.l??-?&?h??<F?
eKW??????@?{??C%?>?N?????df@?l.?m?MR??????yU??????W??????R?x?s???^4?x?d???l?DZ-Us???5{??^???q????zqz?=????\?nW??qWuS?7????M???7?m?E?-????>?U9?"M?D?\x)H?ZOp??x???]Mks5Y???0?K?V???-t<?~=I????{=?Ld^D%=??+??r??????B&?????????Z?1???Q???c(2?7?8'??!????Q?{j[?TM^??uD'?k?????^???? .?V?cyP?I???Q?^??|2??b????!m?L????v???I?9? ??r?s"|????d????%0lq????*V!)??7?sVdDT4??a??2O?F?*
???I??Gy?3?U#52???'?e=???A??%?h??Mr?f?????????????j???*??/Ov?B?-?R?7:)&|?:?J^E:@?Q??ji?C???,?)1???Y?wm?k????w?52????&?z?M9???Z5?,5?Rc(=qYE:??9???!8w?m+????t??fO??~?tu????ml?M????	??-J2?o?FdfVd????|?}??????H4???\n???R??A?]?p?@&?????&#?	????????^??@?)?_$????J?<6?????T?b??%???5???S???/
%??g?|:7=l?O?]R?B??=p?N?wiz??&?n????]]?|???????^C?i?v???????	*fs?'.?K?????????!???x? [?s???.??r????37???U?
?-?]?9????[S2T??3*u?O???9?}?l*??s|???{$E
???????b?.D??#?L	?L???g????????2??F??????qy??&???=??L????
?????b???7q???.	?j$?j?mA????k?L??:??B??"!???)?;??p[??<???N?BU?X??2???!?o?z?????????m??????
#??B???j?????x?
??????orC??/ebm?(??}?Uu83#??!?m
3??'C?m3???	??:?
18nl??&2???Z??q/????f*W???1???e?zfN8?9??U????96???9???j?Wl????????S???U?[??{???B3.?Q???
pe?R???l???"???1O???qK?a?+2s}???'?Q??'Ni???????OZk7vm?$????p?????k2??z?Tv???3??????????????!????s?9?<????t?hZ??z??*?s???)?????????`??5??U?7X????da4U????U<??i?A??????7`|?????????P?po?n???NI?L\x?Y?m???>q|??L0??L;1???!Q?&?L??=??????R?'aS<??? d???q?????N1;???~?1???bk?FD?
Le??ees?chB?3)?!?|?h?u!sa????-??,??jH2?>??
????w	|B??0T:=r;}?a!?(2;]?
?p&?W?NFOJ?V??????q^?}?G??*????q????g???qh????u????,???!??d?KI?j7????9y??8,=Q?=o?Z?2???a???????w???i??\4<????Kx????&???b?]?Y?????E??(U-?'??K?????]?.??
:??B	?g'??j??y?????G?L??N??;????BU??!???z	?`h?d
???x??J??(#,?????(O???????3n???U6<?-?????l/?? P??z3.*42????$E?q?
QY|b?=?o??*?dG;?m*r]??Po;?r?o?]?g|?t?52?"Rh2h???$w<??dLj?m?R?h^??y???T???[6??P?h??^bu?w?N???OBk??8??v?b?P?????\??
????;.Ia?>$R??$?>?uS??n4?kh??T=???n?FZ??.J??????90???w?a??|???p?`"5?k??d?H?-??e??M???+???[?J:n?r?C?????R?gt?I;Y?u????V???~F;3?]t?a?h?s??_=???
?
Pm???#???s????c????;;[j???bm??D?{???r;?r???L???4w=!???Bx???????nT??b2S?n7????d%?Bh???+?g?!o?????Aa6???D(?]?????q5?P?-????N???1?$?<e?7?e??C3N??????S?F]2???!O??????n0?oc????yY?K?|??1??)<w?O??r???<?E????????04Y5??y???2?|Y?B7:?iD?|t2^?,&???D?V9^???%???m?9????~??3??
?!vg?R? 2-^??Wd???gFD/?w?;?
????A
E???T?)K?O at M?I?`???????}?????^T??g???4%???7????T?.?q#????$?i?s?????K?a??6}2CJ?s.??9????'PW:??4%2%0zs?????vP?c?e}.???|82??!t?Vk???J?|???I????%\~????7?|brR???i???L?E?q
Fz?%y?
5??4?0vQ*E??&??s??C+n???E\?????x^R???"??j^<=?[%J?d?ro???\????T?dTh??B????jt??i??F???f3??y??????K?/}???w!iV?p8?M??o??s??Zy????|????^2???6=I??"?'??H????I?PaK?jeV?=#n??0?L?l??;@????_m????,g	?????}I?;>???1??l?[??
o7Qvf??e??I?N???????i???A)~@??G??QJ???e
l??9h?
?.?1???Kv????B???%?a???E???2?%??rK????@??????g?<?,v?U9?(??????????p??/|b???q^D?"?w???K"??B??q??]?o??q??nRj^T?
?^?7w3??0*?M???Q?;Z#??D'=<?kb~Z????? =h	?.?Be>Ls??LxdS?%B?B?"@???l????[???>&?;?)w?0??6w?"? ??_3????]22??.?m? rKa/@ia8???+<	?3.?@??2?y??????Z??)7\7m
Hu??!)?%?f??N'o??JM)??NN???>!ohX??Q????mQ]???
L?.L?HWHV`??-???f??s?N/<?=??
???????L??x?:uv?pFz?B?cS???=[?ms?????=3?????w??L;'?????b??????6?K	x?:B3?Od??C;?????3;??:i?T???E?*?!?????(vn9:???X?v?o	F
H?S??*v?#??Wb???KiO^6<9??t?N}Q&?7Trlk)????]eq????N?w?^??xEUL?S2T??5?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?????r???*??r???*??r???*??r???*??r???*??r???*??r???*??r???????_2??V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?n~|???~n?U?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nT??6??r???*??r???*??r???*??r???*??r???*??r???*??r???*??r???????_2??V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?ncjmF?U?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?4y?v??r???*??r???*??r???*??r???*??r???*??r???*??r???*??*mM?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V????4y??V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?W??Sj??e[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V???y?y??W???U?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[??_??<???r???*??r???*??r???*??r???*??r???*??r???!
*??r???*????~?4n??nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[????|>U?*??nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V??<????[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?Z?G?7m??*??r???*??r???*??r???*??r???*??r???*??r???*??r???>?????W??r???*??r???*??r???*??r???*??r???*??r???*??r???&???nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?4y?v??r???*??r???*??r???*??r???*??r???*??r???*??r???*??*mM?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V???hn?U?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?6?F??V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?C??????e_2???*??r???*??r???*??r???*??r???*??r???*??r???*???G??????*??r???*??r???*??r???*??r???*??r???*??r???*??r??????<??nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?n_s????????W??r???*??r???*??r???*??r???*??r???*??r???*??r???>?????7w*??r???*??r???*??r???*??r???*??r???*??r???*??r???*???<??nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?n_?}||>U?*??nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V?[?nU?V???
???W??r???*?!
?r???*??r???*??r???*??r???*??r???*??r???*??<??nU?V?[?nU?V?[?n!
 U?V?[?nU
?V?[?nU?V?[?nU?V?[?nU?V?[?n_P???>*??|??*??r???*??r???*??r???*??r????????????r???>???x???i;h2?&?2+??C??!D=??j
6?z????ul:?=?jL?e?uO???=&uz?[?zgH?DG?f^=I?6?E?eon??`?~*L??&?$m??TE???C??9???[???W??$?B?Ot??,?(?r???R?u??L??U??A???4??"? ?A?z???e?&???vw?????BRje5=ET???z+T3"????)?O??gB?/Bh%u?R
?]????k??a???x?D[??o???????J?A????P)t??$)????!???'a?Xs?B?L????LIY?b?q???????:?[V???$??^2?C????;?a%??r????Le??7?r=??R?Sg%?-?2?w??'N??=??L4"????<??T??J5*?'???W'?c??k???BN;v??n?????;e???(?r.As???M"a??$???=??=?b??l2?LrJ??????R!	I?
?/???2)2SS/?t?i??O$??JD??W??U??1^?)????e?????Rs?md?
?G??qc?Ex?????^???H	fVz?? -?A??G?
}?^n?nTzuB??VT???e=?G??w)?3???Z?.??zkD??????5<?j?R?>&???hE'q???????#?m9???BS)2$6?R0$?Km?\??????w%???<?
??N??!a?????#?????FVT
??c`??,?4Pd??D?R!i?
???|?jaNU????X?}#"?!{?H?fNxFE|?N"?My??Gwt?I?L?}9???%?|!K?X?8d?????2???Y{??????'f???1??l!?g?N?|?T??)f?w\
???U#?Kh?*q?PpXk(PK}k].!iM/|?L??h???!?CRc#??b??y?U?NQ?)?n:bl??????)<?2t?G?2y???t?d??????ru?????}??>{??'?Q?y|7;*?7O??EZ?A???W???????	????? ?????+NLnS?R?.?Q??^8????<d^???X?7?6<?.]???8J??-?j?$???]?v?z?@~??%?R(59?Q?.?^X]?s?U???
???!q?r~?|???4t(4?wy'??l???Rq??P\?Y8=!???????M???x?M?]m????4C???P????=m????)?????????E???????D?UA????In????
?v???k??:?X?*?'??h??7}??????}???N?bkZO??hB?????&?
??????5??O????TK8>2?\??Z,????hr?RoE???	?2O?w??????_x?&?????}6?M;K?.?Y:?|??u??=?????7?.??}?Qr[M)?:{??x?h`?????????+??FS??|Q??????U?%-??=??BIMY???????Y???5&?BF?????~?0?/??e>???L](???rV3?n~??2}Y?E??????q?>??s??,3??rQ???d:?W?.?S!??'NO??????x??(8?N??????
?M???%N?	?I????P?t?X~^gk???3???=?NLF4??Sh68^I????%?)~??KI???l6N????n?s??];?EJr???O???O?$?(D?v??7]y??v?????z
L???N??t?.:???????I????:YW	????3?4?c
4?B???Y?d??u?RS??V??%?ou?$????????n?z???(#?s?S?^???*<-?Ms????!v??E?FC?B?S??5zm?{?2?N&???h`???&?N}?n?m?????yd?PzzG?E?NT??yu?sjJ??R?NQU??e??m&u=??9|Mw???????/I?<m5]2;\I??8??~??u???Bg????6y?|??V?[?????|??e[U?????????????nU?V?[?nU?V?[?ny??n?U?V?[?nS%L?S????qw[?H?Y????X??*???*??r???*??r???&d?????j?vCEG?5????wr?l???sJ?T????~S?,??qDC?]??UnV?mV??[?nU?V?[?_`ww?3w7S3u)??????ypvNG'??7???%?/????J??M?L??s8"]??MT????j????u;??..^>?"4??]?""??^s??U?w?NY???>)??[?nU?V?[?nU?UUUUUUU3%"s???t?&f?MU}s3)??B?E?a?"??..".?;???D6?????|????}U?|??e[?nU?V?[?nU?V???????wW??/????Vnd????d??*kr???*??r???*??r???*??r???*??r??6??]??n?]|??????z???Li?nJ???r???*??r???*??r?Z????????????{??;???L?3?f_???[??????????*??r??
???*??r?????????g?????2??r?ho?nU?V??;????P??????????????&fI??d??*????Y????!??}????}???>_????4y??nU?V?[?nU????h??6??r???*??_???????|?w????{?7????U?V?[?nU?V?[?nU?V?[?nU?V?[?o??U????W??r?????n?U?V?[?nU?V?[????????fU?ox*?*??^2??q???E?
\??????=?????<????????{?_?mU??_??5?/???k?]?????x???kj????V????[sl??W???_???
?kUj???:i?D$RT?k?/??????H??????~???*?4?0B

!??v??;???3Z
?Uh???{?????jC9?U?L?4UR|?:?{?????<x?=????wOwJ&?????
????????{?DD?s??*??fb?
???u????? -'x???L=i?
????+???????<??????""!????<??
?w!???<G?U
???[?+??X?]???k?H?2??-"*??
???v????9:l?}?q??/{???T?E??,?Nx???0???????U??bVN<v?~??Ps?[Z????]?t??6?(}?
j??t????b??R??n37w???g? w??	?s?Wm?|-*v???7?v??{?n??&??9{???(?zr?|?;?OG?A??m7,??C?*?F??g???y8???????????6????K6??????????z?D??e9????i??M??+?5????D$?o|#~1o?@???G?|\(???Zy9??GpW???z?^?;s?{???|?kR??~g&????7?-?nI???;??#g??????????c??}?\????bf}?'s?,???P???_x?t??{?????T1?a?|?Bw???;/T??f?????U?7]?o??#?`??????????=??
?+{Yd?Q??H!6??[?q/??????qiJ??v&??????I?.?G}???B9?6%?b?Q2??Mx?G????)dcq{? W#????wK0????Xx????v=??????'Y??r}??KZ?J???1??R	z?Tp????6??????????DB??????L????~?4?9`??;,?:NB*'9q6?(O|??lt??|??G????o???????ET????\{?E?????w?????????>???[???????w???)?g??t??????yO??????G????T`F??????}?t?Ur?;?g??HRC?????????fHWC????}????C???X??/V4??,?0u?g?{X`?k?J??y?;??w??u???
""???L?[?{?S??????	?q)????58??1?lv???]?\q???3[?a????9?w????~????s???z????i??????DEdx???N??s?+??\?d1~?B?m?9??n?&1?????l?'N??8?3?J?b3?o??LL?I??C.?:?DJX????ih???}??x?~?;??=?????y???U?5y??.??-?oN?;*?]?DDDK?????[?V?????1??????r????????S1qL?????Umlh
?	?^wu_Z?N??q??:ON?@O?o?'????h???xM?Uh??v?z1?/???5?L??Y?>.??3M???k?b5_a?Q??=??Ym???g?
?m???????_??]?zK?uZ??5?w???C%
??csB???}???f????&v?m?????????`K?9)o??~??$??G
???Y0e?????{t??_??,:???J??y?1??????T?N?{[???xrh?????)k;?T?????m??[C,?L?Q.S/z!!?????3????<??L?mv?????J?x??x?Vu???{?S????Y?y??Ot?\h????;0???'979????b????[?DED??~???
???oi??????N??ks??>1??R?l	???|???a??????1%???C??'{nD?x\9?{?1?.?
??7]???*?K<??&?Z????s?x???J?>???W?n??W??.N??}???x???9?50????<??w??R_????=???O?????$??>?|?g??K?????]?6?q?dmO=S??? ???v??w????!?@???HU????Z5QO?6X?5??1??^g?C????x???}?,?gcs???c?`???
<?}s?{??"?X?aZ4??u???
?????n1??6???????7?????]?SW??a??1??N?.	?=??d?r3?|?g??)?6x?S?~??9?v}A(,????9???p[d{7??._????
){/????t????W??<???i:?o}??[????>Z????n[??=??,v??o8j[?	???R?[F?&8????	??'???y???Nc???W??5??vj?-??????-?XD?5zd?*?-??\?48????{?????m7?>??????z?	???/.?#U???{?n?R??S??{?H?6?=??d|}????r
?GS???Q???,?WO????1????wF?"?8???????iI	f??O
??J??qm?L<o??rD??^?ng&-?y??_1?Sx??W???Y_c?F?:?
}???l?m??'<m?????b?????6sz???n???0fi?`i???n???D???z??lS??n??0K?ws?v??I?>pdM?a?!R?gn?ks??X?S}?a???e??ro???D?Smt?,???e??o???|???????}?G.r??+????yC??????????_v9??$?-???/??rg?U????T?0?n[{Qj??<)??4???????L????????m>?6?E??????U???E??B????o??s
?W<3r\V?;?m?A?_k????g7>H_
?H{-????,??Ye?"?-?&?hf?T?Y?v????s??e??I;o?T?`/?G?71^?m?#|SydnX????y?v*?\?&K???x??A??????6?????Q??g??W?z???g?Z?\TM;ww?^<???*?????J??V?t??ta?~?e?q???lH??m?~w?]8?t=????y!?.%J?<?#??8?S?%8~??????\G<???*?C?
?f?o?L???gp3#I????????1_???<?o?W4?????i???MW???q]???????FQY?I???9????AA??v?????\??
??:?~??X?C????G??.f??J??k?????}?v?F??^?R	????????E??????^i}n??'}??V.Z.{
Y?I0???????%??;??-?1?v????~???=u957?sTz??q8{z??%?n?,n;??wu??L??????K????CO2?oSh????{_???????f????#????ZL???<??]????????67?~N????[_}????wk>??o?"?????????????\?q?`??????-w???H??O??y[??.??`n?D'???j?Zq?k,t??????p?Tw%g?????r? \p??~?Gr?????u?Ta?U{?=???*n[o???v]r???7Z?W?v?y_}?ij?a??e?]??_.??Q??:'b???3?+??g?S5t???r???
????CrV{)???qQ??Z??_w{?g-}?B??????u??????,?%?
o?r	?j?o?????na8???0O?l??{?y]???k??hr?V???"?????m????D????5?f?a??6=??3nCNK?_?????-?Gj/]??"???????y?_??w?7K\|??M??"1???8?k????M????>??????{q??w)$??n?L?-???k?z0???7n7?I?????a?r??[??B??9????a????????5s???/#?????>Z~[%S<6?A????Z??c??E??K????,re?[~????Q;?Y_?$Wn????=?????w??
^???9??r????;g?????x???t?';~}?7?g???u/?1????#lZ???ue??????????6?,K??Q???rC6??w?;????0??27QJ???;?z?V??;_?m?x???????R???6???w)s??5W??m???,??@[??????<??.?O?u??????Y??L}????Tx?????XK??<?9??????????q-????b[?????EJ?.???3?;<l?u^?V???????+W??n?;;?W??o??E???O?]?>?	Zy???????$???Kv9\?l??5?????U\4?S?7??9???Q?K????2?;?i???????-??z???spCR??l???|???^h???_??+?s?????=??{??
??q??????\
r/.?y???`.a?p????|?j?Z?G????|??%?}WO???d5?????u?Le?k?cq?(WIG^?er????/o?????n?F
?[?H???rv??<?7??1n*??e??
u?}m6?b??6?jBv?i??y???b???????u_>?9??{?7??'8W4??S
??????mt??E<??m???9?F?&Yv3?\??????i?	?????r?7u??dq?>???#?a?x??$???}.?1Q???:?&#?mb5?z??????O;K?6????wd#1???q}A???????'m?????)????UF?????57?????n??O?^l???s???\???[?p??(???w?????????????/?6??,94D?????????u?n?????b?f.g~????&+|????d??wU>T?+?1?S[??U4V7<?p????*?{n:?v??????????????Xc=???????gu?t??iZ??> ????j?k???&??&???q???w???|?\??d????s???[??)U?R??M?4o???d;??9C??uB??=??O??B??^??v?>?6?&[???Pu???&lN??le/?ys? J?3?/l?x????7,??|W??ok????n???~?wF??	?F??|??[?{:9b'??i?|?)c?8?F?>??z.??????????yC?2?/q?]??jw?????
??^1?n7????~<?s??x???mbi?????g}??,??s\u?f??8??w??{+CY?P6wz?j????X??X?z???]??????3!??#??;??y[???b?z?<{?e	3|??5??GS???Pg[+?E?r?z????????;????J?s???3?????}?*????5?R0??7dg?R??mv?[u?t???Y??=;???3???y?&*?Y<+???????Vk]??[??gr7K??U??
??T??f??{?K?]????N.?y?????Q?={????????f??q>??y????S?nF?7w;>??O??*?I???5/=\8????y??X?m?)`?_6
???,???y?n?u?
u<????I?N?D?<b3?o9?Z???
??]?#??zf,??????8yq????M~??L?>??=?}??^T??X?/???????>????5i??>h??}?F??g?????v?p;?.`?Eg??!??+????????<???????iV???3??????h?n8??E??N?zk??o2x{?p??;????G??J?D????L??PV?_k?'?53;?./?n????}S??????f????z?97?&???O????g?S?????!?L?L?!z???H?e5\???	??U^????????j?//;3?9~??7????
".?t	??V?>5??e?????v???z?L?f??????5??;Y}?&?V??5-S??V?^?b%bm????3?_??9???|????|m??$???51?69\+6????5???????????DW[??Kk?8;?5??????g???Vlp??F??2?u???w?E?_???N?????|??.?????D???%??????X????*-?q}??q??gf???+?~?K??o^??K????wX??<?2 ?W???????
???b>???Q??8g????{y???j???v?mn?tm??5??????U?9???[m[??????k??*?kt?sn7v?u??|*??U???????|5U??\?????-h??????|
??;?u?3?&HHu)????h???m???K???;-?????w??6s2??,I/p??%D?T???N????????????y???r????wt??)?;???c`??zI?{??y_Wa?27??W??y?????{#??|??'????????oE?~?????)?I
`?????kZ??~????????(? ??:??Z????-~ms^???}{??n?W?????n?F?????_W?oo?s??????W??5W??b????:??_??|??????W???]u?????_???V=?A=Ty?	???`>?G?}???"4??NP?.?????W?H???U\8RuX?J?&(4!:R????_?_???????,?d???7?9???
$?F?/&?12N?*????U?j?12?6E?"?kZ???CB???????????U???R{{??~??k????5?}v???m?Z????????????????s?=?????]????????'????Z.???"c+Z?????lj??-Z????kW?????xV???Z??o?????*??Moe?[??|-zk?????tk????????^??k?nw????W???????Un?yV????????}s?[?V????????.??^??u{6??tcz[?ou??k??^2s32???????????????????????????????????????????????????????Z??
????#2???)??o<??????^?|s[?????u?tu]????WE?Nw[??????????m?+?m???tmuk?oM????DMi?0zWUy???$7?R?????kZ)=?V?-b??f???<??vm?V??xW??o-{+??????????^?j?????????]??j????W??wmn??f???^V?????????Uum???kj????j6??n?n?????{???WV??????Wu?moKm?U???W?[^?U[F?j?{6??zmj???[[t???ytn????q?^?k[??yn?????U??w??????????V6??wmWv??j?kzmEk??{=????EtU????????=-??=??k?^W?????^?{5tU????Z?xj?o
?e??o
xk?W??mW????6?5?6?v??????xmW{?]??\mo-?]^??????m?Z??
???][WU????????xU?m???\!
[]?????W???]????????????W?k??*??????k??[??[{*w??\?G_???S#=?0?\6fX4D"S"???]9???W?q??Z??7?~W????wi?*???v[??o]y??^??ttk?^m?Mn??[???????^?????5??????q?+^?????#????W?W?v?uk???F?/v??t?[??9????Wu?;???^???^?n???;?v?1[??????????/
????[???~^Z????Ez??o-??.???7?W??m???????Tmq?????k]??-???w???????????k?????_n?_????????j?Z?-:?k?????{5?.???n??????\j??????e???7?sW?v????????f??]V????xTW?????k???F??????oJ??Z?5?????^?e?/v?????E??D??c?????b???....???????X?`X?b????X?`X?b????X?`X?b????X?`X?b,X?`X?`X?b????X?`X?b????X?`X?b????X?`X?b???o}???*6?uU?????????yV*?=??f?q???wX?m{7????o]?????]???t?n?/J???u[{???5q??f??^9??5vm?+^??????yzh?5???+????????e^?[?WWe??p???5??5??-??????{?yZ?-?-???5vmyW???????o#{-???????????V?6??{????????f??n?zm?[?q???u?M??]?lz[n?t??Q???nm???Wf?5??~???U?????w??
^|r?ev[??????6?Z???????????/w?????.?J?^?9????{<*???tk?Z????^??k?j????"%2?kEDNnI?XQ??]??E;?]]???Rh`|???Y?E?V?L?????p?(???D???)??B?k{????kn??2*2&Bs??`?^;??_c?????????K?Y#8???y?O?V??J!
???P?M?G?+??\?+r?????
?Q???S??????%v{?F?????Sw|wH?b6*? p!
 ?o??????
?^?!dS??~{M?[??f????)??p?$?K?v??}W?6??GZ????????????UTD*??????]???{???K???
??z???SU
?P?????g
?y?%k???????gYz??y?j?P??????ay>??-??k?F?r"?" T?w
????V???/9? ???-T???????x
?????B?JQ?EL`x?H?????-?*???(??%?a????)
??[q?7lw}???[w~f?{??|?G??}x~?bv????D<?"]?" 
"??1?"#$?????]T?!??f??"?U??"?????rVf?ve?#?57???+????????c???XL>o???<??!???x?wt????O????'?+?3?:????j???
%?ZY???DDA?@??Q????????EUS?21w?wZ?#?h?dET(
D??P
?????~0O?/??1????????i??}??j???????j{??n????

HU
?????H??DV"?????,????????Z~??4}Gu5E??H??V?3??*??????on?L?U
??T?Z"$?"#????{???z}_?IW????Kzn[?xZ?x~???????o?zfb???$????
??	?D
?%???{?????_O??r?G??G?biZ???~v???r"	w?~?]?c?q9?Uz?FV?jQ
(?????????f
~??e??????,(????Dh?U?ffC?
I????????????*?Suf??T??K??zqh?5O?7?????o
??C?3:?9g=????r???Lo??!??7a?7?q??????t;????>3MC?'9?
? ``???"????/Uk???=?r??.?????_".??r?????(?za?#Pj????+????????'~????Ns?a}?+?????\|<?
??[q?	?K??~3zb!V????V
'}?DD`???
??H?j????h??E?Uw?+V?????R?t??????u?????$?$?$?t?W??/}??>z?+Wj??????Fl?2?G??
???????D
OFG??L???????ss?#?Q?????n?????Dz=?EY????Z/?j??D??p?FfFD.ve???e??}?n???`?fS;??7??Z???\???-^?????2??XFFG?(i????h?G????????????Fffsp?YU?W??#?_???o?o?????Y??\?k??
??????t??f?h?&j??
?wb??s?U[-l?r????E$dR?? ??!??h???-3X5TE?h?????o?????3??????w
?I???g[(
??f?[c`??nBn?7$#?a/c?{?&???
??{??????u?q?HT???fffd??????w??
6?U?{?H?
?
????>{?$????7?
?????????0?fffX	
??f?w?">?T+>}????V???h?I???#X??)???7???D???&f?????O???F\??.&;?Y*???L(r???-1?l??H??;Z??\?U??
?`10?\?&?? ?>%W??M???)?F7??m&???'3aYp?$??0eS?????Z?j?4?uyq?*D??3???,%??8?&??????X?FK?A?V15???Q2????,???p?e
+F??????0$???=?{????gI?????<=?&?"
?j??s;)?
5?C??,2???SSlF9kG?fngX???`?R?JU?DY??????
p?1e?gN???i?Q???NE?TRB???????eu???T??VD????gf?3n?a??
???????
?8??z???UrB?(3???M?H?4E??<????N`???????)\??L?|??z?ww??s
??QY/Q???wr,N$????DD]?UUUU?UU??U{?	?G|??????t??0????,?w?????b???y?????y?&{]?s?]??.?`??J??8q???]U??????u?3?Q?=9?5??nM?g6???????{\????m=???=iln?z??h1-???3Z??!EI???????%???
??????0??v??i???54?;?Ui????w??z?6{??me?????|?+??????\??d?!!????'u?"(?jy|??6??-F?	<?0???-?/c?E??Mo|?*w?h/?|??`?)?w?Gs~?ND?1???f[????%3|)?W#??r???^?T????	"?<??km[O???}g?
?L?{3??+?y??t????Ngz?????K?h??{?k??Qm?TY?]?j??Qk??-??h????L?]??:w??=G=?V>??$?o?v8+?t\??6?\????X????LS?????b?.-
?1Xf?34??Zy5/?ce?????"%?
?je?""?N"???bD?kZ??=??W?????7????Y?????-???????Y????????&@????In???4_?~???"&??&fH??W?
8??rDE5U$DHP??????UB?g?&?yr"&????""STDE@?""???
????????????????k????k????`???T?????#?J??n??W????????	???
X??_??????Ma???W????1??5?f??>]SN?7?????????????b?^W?????e*???b&b&Dwew??D??%?0L?*f]b 
????~??U(????=#
???'?K?@?d?A???=]?????l???#f????u????#?????P?????}u???(??7$?W????$+n..????D>???????(U?n????*??????b??U^*?e??z2?4?DC?D2?????X?
?b(w??Fj?#????S?O?c??P???'}s.?s5??l??????h{??????n?=?.?
?f&fa?d	@??3(?H?"fe!?
2???&ff I
?:G???)?d
???IE???;?32???*j?\?'1TC???g????>o:/??(?????5m????<I`
?WTjlsGu4?4??q??w0??$?w?$e?@?????
	;?0??.A?D?F?????^?E?C#????I?k?fgM???u?*'Z???I??UY?fevM,;h??rEW??r:?<r????5O
?K???;5???x?rJ?[Sw70?O?m?I??R?????+Wl??????+-???+[??);c?1)m/vQP??9iG?????f??o1p:?S ??$X??q?]u?8??q?]u?8??q?]u?8??q????q??8????q??8????q??8????q??8????q??8?????u??|q?]u?8??~;???????kFi?9H5'?????*?????f	??^?^??1?U?#K?6IL??.???^Z??\??hT??y??I\????2k+2?g)+-?\3:?<?Y?Rb??wwt"?ffl?3.?*?ffJ&d????????L??????33??,???;?????6e?d?:R?? 4??|???M2????y??UwS?p???G:?5?8?????s6????uo?j??MI8I??i[?????G?3m??nv??F?L??????sS?xy?5?Y???[?I??W??Cf9????3Y\?g??K???|???p???U,??)??????????????W?u????????UY???
?????dD ?o{??L????AuR??hq?#??t?!?.P????		???????r????Mf`??Z"/?gw6W5?8???"??????????
??J?3/?"?3 ???Z??V??*?`??\L??
?2a?H?
??
?d?,wu??w?N??????UUR?{??C? 	7OIm ??<QkE?w??F?_???>ns?wyu)????F????s8M?G?c??;M?|??:???????????
5?8?(??F????7?????????UUK?z{?~:t?/K0*fd?*e?f@?"-k]??????????f.C???
?????????S?e?3?1?????????YL??P?d??X???
???QT??O?XK?H?L?H?v????X???E??b?<F?`*bM^.XRJJ?b?+PU?@d?c
????G-???????q!?b??n?2?G~??????~?32?zn?1?ZC??#??L??2b?-???U_ @%??V
?`,[?kX3)?,????
-i???
??u?11S?/aB??./.?333333
?d?r?98?aAE??uzP?????[FSTc?d??N[>$??k0?-\?Bf?
k????????
????_|???I?X?j??rO?????*U?????>?????6?.2?V?6???????rqzA|?
?G(?r??V\=?o??y7[-?????N??S+3??$??05D?m???|?/?z
F???eQ???Q
?

??Z)"?kV??????o??g?????????sj???=?Q??????v#??u???????p=???????"??XWw????In?*_?????????.?R?'IT?zH?}???O???$?????!Z??Inwr?i?'?%7???_>?*KZ?6y?b????????AL?K???E???????,@??UwU[i???
?;H? >U?UUL????WUi?T?5?x??P? 
?3T??B|[?6?/0?a?(??%??C"???G??EY
r???^mRDR??Y???"?U?#???8?{x???{??I
??
U??
???J?????????*???wJ??????6I"?:N?T??????????x<{/???W??????u?|????^?V;m{H?3K??????n?({??????{???~h??4Z?q
?-C?????w[?V??n?n?z{?U??}{???????k?w?Y??|w?~?n???M2??rU?
"
?M?U???[??JF?*??*?n?N???????3?wR?$?u$pt?J???*??*??????*?~o????:R?,~b<S???w\?????0v??_??S:????$?
JF????z(???s=?v?k]?????\?o??Y??(E????juc?????^33?E??????Tlr?7h?Ph??$j?c??h?
,?????d'?G??1Sr?-???l??HYPq(?????0m2?`D??:7?J??!l??s&Rf%????????-?]AKS1A=$?????x?/Ir???0sO?
]_%UY?Fv?	
sP??PP?k??S??|???O7???+)b???F3?&5?Y5"?R5
HX?G*???,?KX?????C?#?
?S8P?hgO??????	j?
?J???<?T????u??i?????V	?$???b? ,??V??$?ZI????~~??????_??}w????
??
??#?|z??Wnq?{?????5>??x?W?=???tQ??i?^U??w?o???Xi???]`??d?g??????7???z????A??]?
?a???????)?5??N?'q+=???}???V???k?K????d?;?"$?
:??';?d????Q??v?}??$??????6
??}?????????!?Ug?s??-Z??????f?S?C;????Um????~??>???>I*? J
???2=???m???I*?????$?U?????s??????Z???U24El?"G??"???32D4d?333%?D
?l?$??UUT??wU-?>?wU &bfH?b!?D?0"4Z?&fu?S"-k\?w3^????	}?wN???)???^?????"-??tf??u2X
?$L??
3*?32?$???;q?C${????rGrsx;?9??t??
?uQ?:????T{??UH?I|??U????eT????u????????????I?0?????w?????x?u^i????\???E?Kg}kK????3??L
??U
?q??J?
?????S??b?x??????2??'?j?EIX'?w8c*??v?BZ?dF??2??y?#`???+!t?4D??Il?dJ?hhX?m??N?9[???U????C?K1???<B?dFSTTD?X?c?qooR?$?????N?J?J
?????
~???
8}?w?????w?s???dpr?m2???t??????m;??????Vny?~E&
[t????^fa>f?k?g?????Wx?\??XU???OW?P?G?u9???Zc??DD????iwww/3???z?7?????/????v@wwwk9?{????p????????MX?????s??q????{??~U????#???n?????u
# P?K????m??M???gD?[?d?<v???c??W?w??B?T???Vy?+D?=m.S??Y???W?%??{Fj????ob8?|?P???9;?????t???x>?N%{7v????9?D?
???
Un??]n???JK?UUU->{?*cmW?'?"?n?J??$M??T??U[????O????????_?????Wo???B6????r??w;0???q?x?N?*??Q-#????u[?-*???n???CC?II$?m????$s???U(I7
Y?
??k???
I??K?
?/???kU???,????e=??D????u?z?o?g???????[[???*??????
???G*?K7??MDTZ?kOp?~??????H??#??????????>?{%J?????
?#;i?e5??~???????/?S????Wo????mU?K?????<??v
c????rY???#u?r??????"???Z??mh????#J?d??=??u*?{T?	??P??e??????;??????/????????)	?=??????????k???g???
k4s?k?&?
??U,?*?R??UV??I??R3wE??kZ??U???7?_?~?N-?c~K?q???????????X??sk???g?????}?[4=.?8I??{????zRV??j?`????c??f??FFHt6?H???DV???#?????????????|???JL?????&x?o???;?loK,G?}?=??????y??b#??Z'w???j?3kJ?KNdBt?v7IfIc?
I?:????J?qmR?[Ih?????K?'wEK???Z??{v?e?????aoq??$w????j????>?????????????^??KD???Z?a??*?\??*???????Y
??q^?l????Cm??}
R??$???h?S?-3???D?Y???%?NV@?=?<??U?????N;+?Y?[?8$?U?kyX???T??U?????M???fE8kWp?H?1.???,d??)??Me
????r???H?UU?N?K8??fUb?]eb???.?q??"???1%0Y
8?&J???D?)??,?(lwu?u
?????XJ???qg?d?7"?X??(4????*???Os????????~'f??%?5E?B????6?ID?Q??iL??F?ky??gsqR?qvX????
??d?q??j?;?c\IRY
Q?t??.m\[?M?
???????&@qs??2Sm9????G0??aie?????%???T4X?????
?3??U^?U???co?5????-4yp????%???]*5??&>??e?w??f?|?{? ?3<m??Z?a???L???)?x?????$r|vl??v??p?w<?M ???jR7??.???????k?j?????????}?-\[|??n;i??\?g?<?=r:??D#w<??@u????%?7??)B???LZ???&~?[?DG8??{???s?2??U?R??x???,re??`??u:?.??D?fe7??e????;???q??wE???????????W????c???????Dyy?vp??
?y+??p?Y?????*?W[??RXn?M?I)+?#ti,vf?3???????u???&y????]M??d???Ll\;???uN?????????_'??>?|??~???:???JH?? ??Y??H??????JF?R?g
??'wU+?!J?:IUW??UF?J???_??"??_?????j?K???[??~}!??w)??
????$T??????xO???fM???1????h????S??/?????{_?*?????? ??????P???kk?e?
M??g'[^??W??u?@?????}?t?z???p??J
z?J???O?E????\??2?????#???rr?5??c?/y?c?8??x*??\lK???9??????Ww??I}d???f???m/???cJ?`	V?H }:B????^?????=%R`?U??8T?J???G6???-{??{??`DL??<??Q.??h???4
??}'?????s??q??m???c??Wq?
? 
kX?A\iU??
?i!Il????h??5???kW{W?F???WM?2^?????~???????ri?W\?zx?,
J1?? 	+?Ut?????N]$??+C??????_t???~S?~'?????~{???????????6w???}???,
?Q??t??uhu~?9?c????c^nc?g?bh~???N??????o????+?8??	#F?:???/?????}?_/?????G%&?Y?s????h?/??^l?x\?y<,$????-??R;??N??>???/?w?LDMX
????k?3o?v?????????H???5?h?sUD\?y???~???;
?y??????x?D?_?\?????c???????nz?3;??
???'?;????????????'??+????q???u?Z?-????Jw?m?c????cM?}?????k???_?I?6?g8??????|?????}{`???<
??????t??rw??]?B??i????~?]?_ Hu3?n???n???x^M?q3???c???W?5????~?x
#Z+????v????C??<?`
???ZQb??Vr???????B?'Q?Er????k?g1??__3q?I???i?|T?o?L?d???S?????@X
?;n???on????n^????~{?2?4????c??o?/4?w?DE????[???????kk??
??8???u?`?
?-3???1???u?	?E?<N??^?ff<?????Q??`7?<???C?Z-h???????_?'\?L}?W????'??G>ZmJT"^???l
w9??Z?ES??????R??c??^?|?????j?y??9?????y???????]?
?a?&scg?????Yqqrb(?#
|?oS?yg????????????d?O7?*?y.??zwj=?_?UJ?w??>{??????aR????3ps?_?zG}????w?;
?f+?<?`??;?O??????????? }\??~Kr?{??8?l?
??vY?L?7v?}???-L?25v7?]??su??d?Ws1?l$?-;3u){?G??6{?O?s??~?Z?????#>??*?????J???j????i2??????]fi??????P
?go/?9???v???k[????U_>>?=??_w????2?w??Yw???3?D/2??????eY??l?
?W8??7/Q?$?dl)%?h??#,??????1%]???V??
W
??An???p??&???nU?
?V8??kF????.?hIn???w?????u?	x6m?:0?-T????Tou(?IO}@?x?X?ojYj?i??J???%begCE?????a?M??q??????A?-??)???=k?3s	/E?RS????U
i?o"???-/1??p?J?Q?y????|?????
T??P?@\???M???*??2  \??.KE?b?1E??Y?L???l???0??X0Nd]UQ?T?<9?M
????A???t????r?A??Py????J???!s32gw3???2???3333_?????{??M????????D???l??????)7m?&???;??`?
~?Z/79??M?Zm!x?V??LS?h4?????O<?*??}??;??????(?_??Z?????????/|???(??'???E/y???(?F???O?g??s?'?H??6
???v??6u?r:"8???u?f?i??.bj?h????Ys?q???l??OR???5o????<?"$??""
????f???9R?|?Jd=??????????????y??]?x??66k?y?h??UU%UC?d8fvT??4Z-h$Y|iJ<q???/??s??S???v???el??Y?i??s9Yv?!`
?8??:?NH??Q???????!??K1?K?&f[r
?j?? ? 3<???$?!P*"NJ??n??51?
g?????P?????>????z??????z??<??x?????C?.g0!"??????Cm?????m????oE??B3??B???????l?u_??d?zU???7|??y???_w9?{bci???%?Mq??T?????w-??????{?hww??*?
u?l???9?G?>???<?g??!$?3pun6??#???}VE????????&N?Z?%VW???cf?3????<g?Q???o
2?5t??gDi?-??M????vjz??r{(6/?r??a
Rq??????_n"`:????e?d??u??J???v&??x???W|???????????4?DwyI????q????;?k?Fz??{?o??x????E?g??UV?P?5?lH?????U????{?K?/3mo???/1?U?}M?vn?U???u-Nj?p??}?????`?????w?R?{6cp8?x????WX??(%?#???_?T?C??]???o?M4X
?????>?????[?????}?^??E??2U?
?a?C4?6k
?z3[?3u?
Wz8&{8L?9
?$??T?????YpO
??Y.J?X-,%?5?Z??.`Y?U?????+l?????2???H?6u:P?l???O*?Wd?xx??x????`??	T????3??>If)????L???2t%??b?&P?U??N&]??.'
??E5&Fj?e??9?]?cY??;$A!R6I?DT????????????n?q?J??

O?L;?2????$?>\(?s?c,?F??5zI?T??rk??gfa?IUX?8?SD??jRp_b???2?)*]?j!`?Y??8??W?c?p?BA*+??Hz?S?H?4#r?:?DgVL?f??;??]?~????w?>?
???\A?m??'u?[v??U?
?B?F0l7u???????u??a?6`???m??6&k1?????l/t?????
6??????1????k
??
?^?u??6e?e???/[3@
)R??<?ihh???'TL?eMYwXy!?.????????jA??2??h??hy6?f???0???
?
@???0"??]????i	qUL????????(e[}?????K4=*????\????????????A2?
`??#1??Z???*?|H(2TP??TW??H????c???+L&?J??YMOjd???	t.?
l?)?`??h?? 2?E-T=?Ue?:9???D?@)?=?06?+?(+?<???0fI?NNH???q?_?????8??q?]w?8??q?]w?8??q?]w?8??q?]w?8??q?]w?8??q?]w?8??q?]w?8?0`?????0`??0`????I)????L??8?J??BW???,???????? ??IwFt??bU?Ui???]9?????pjp"??lL??+???*Pj%??oN?L???HgxPqp????w?)9KQR*r???332UW333)F??zy??'?*???????gs33?o?(?u
?\??
?C?IU?u?]???{?=????[?mq?@?&?e???`???}?~m?bW'?;??$?G$K#??I?qduw?}?1???????d?	??p.w???K?c????p?=?H#Wcs????s????4Mj????7V???????~k???_}??y?N2c?U?????n?y??|ww?E??? `UW30p?9??fL?oy????s???Gi???\?x"
??????????????c?=?r1?;???r??(<?2<?????g[????????{j???
B???????Q\?#?K;?????]o=1??7?w<?,P???c??<<^{=???-g{???{?{l??^??hkp??????n??q?F??j
???
?l????y}=?z??&#???6???????[???N'???i??U?x?8"}4?s?(\?D????J???h/???\8??[mr??)QQ??T?;
?^3?|?/
Ywi?????&???????{X8j?%?6???g?i?W%????#??h?????????{?????
?W????????????|??_????'????Q?????P??ngu^????C7Z????
??V???2y_??cq??@T??;??????w;?
?3?;???"????$????I,?J????BD???$??RJ?J?m$?	%?If?`?M?i%? $???$?

??????
??
???9??R#SZ???:??
??????Xg?&!?
<???????*eJ???????l?
P?%
\??M?Yd*??=5!+E??h??Z>VK????q
??1???r?B?$?3%K???
k"???j?.LE?LI,???T?fj?3qR????ta??4iOB,?5??h?R3?QwHf?isTe?W??n(??-0r?r7CS?@,?BQ???T????Wwwwwwwwwwwwwwwwn???????????????????????????????????????????????????????????????????????????wwb??????????????????????????????????????????????????????????????????????????????????a???S0)??E??????ieT?7pO3q	n?bQR??"???!?*dE?v????G?xv6?ZG???v???C$??;???wk?y????l??(???5Qb?fn?*??
.Q?!?3?H?ww??C??@D??\??],?[?????!??N?8{??????R?J?\????Gb3??3??'r!???A?yj?|W???
?b??H?TV??4????i?6???N?Ny-??-.?w?>??>7?/?o
???Ds??????~?9????????i3??2???????z???3??P
?????{??*??????????????????pJG
$??$???0??D?1??Ou????I-?
$??H?M?$I,???^fwr"&??
??????-????S8?
??+?n??i/??hv??l
w
????H?$??CZ
$$(H?

??:
[?t
}w`??/???
??B+R ?E?(?0B(????V?*????????9{gB?'g)???l]V?37Z_T?1kJ?y?????9?HR)?G???????
I
F??(?????????????<o?X??+????_^?m?????k?z??wu??as????}????u2??Z?t?/?'???(???????????)??)?K??B??E??EUDIE"A$T?T$
L?h??`??26Fa?E?cIDl$l?$1????H??0,?I?,dCL?J??i4E?a
???kA??	
??Ab,Q
F*??1?F?$?d6*!34????X?KE1?T?6$??&??k0?lj)?????3$??,?-PF?"1b???#IQTY,Z*-	Eb???JC3?Q?1??%?d?M??I?E)
?Q?RX?lcT?ccDI?5 at h?H?%?(h?Rc`??? #d#&664?c`?b?d???A%D?H?cI?KfZM??bLBmEIQAF???ch?65
Dl???(?F5??!??lRm??F??Qh??E?AAh???F??h?Id???????Q?I?4`???4[DF"?6??Q??h???F?RF??`??(??6K?EEEb?1QRj,?aE?%26*eF,h"?i(??2h????"?4h????Qi???*?h?Z4F@??!?JM?#d??*J6???1???T?????*KAF??&?!d??X????,j??X???lb"?F?6"6J0?F1h??h(?%b? ????TH?ED
5?$??5E????????ED??m?TREh?(?b???m?h6?EIY
?@?#??E?PQ!b,?*(??Th???5F?X?X???@h??#h4XLi4b?R`???5E64h?#cPRh?P?E?Pj5
?H?d??E??EPEE?Z??#QQM?h?H?%??
?(????QF+??h-?$???64m*-),Q
?h?LkL???55?U??QE6*(?cL?`???Zm??cQ?i
???F?m??+Kb"??mDX????F??l	Qb?b?? ??&??Q???Dm?k?cEQ??h
QfX?i6+("??h??Kcb?????(??Q???6?5	#b?b???X?Eb??U?Tb?4P$j
?&??&51h??(?4Pj-F?A?F??h??b?c?Eb5h??h??b?E5??IZ4E$?X?6B???,??Q??RX53F?E???%b???ch,m?%??F??E?Dk$h????j1?6B?R(?A??Hb4m?Q?QE????""?5??F?????E?I????"5?dX??F?? ?h?D?b?(?cI?),F"?	EA????X?H??E?5?b??,h??*#Q???Q#?!?bJ???1?	61?b???-???,b(??b??(?k?1???Q????F?`??d?1??
???Q???@????F?b??+???F??#cA#QAcF-FJ4?Q?1?h?h,U???D?(??F-??E	Q?j"?X??Db?,[
?QQ?b1?1lEI???TZ"?$F? ?????PF0cb??6 ??(?F?ccQ??c%???QPZ(?m,E41d?A?b5P?-b*Q?*,F?????lk??F44Z+%F?????%l???BM??[1????
??F0????h?IQX6"*1h??-X??b?F?
h?????!5?????????1?0m???????I?(???!
?h?$?,cQ?lE?T?Ah?#D?6?1?b???H????F???`??-F1b"?E?????m
"~?(????\
#b8\?gtD?????????3????8?.;???.??J??Q??f??A?)c??E?61QQQ??$?fDX???QRi$)#%??c2cI?K?4F?????&?H??,l?E??d4Q?PX
EKI?E?d???"???&?HI64h?4X?
?#d?Rh??(?bM?"??Q??4R?Z?	?CPEI??0b*-$P?,?F??f??,????L??J42?),6#??d?K&??	c???IED`?#?(?$??a1lE)c?&1?T?h??#F??D?S6,Q?(?E?E?cc`?Q?,I?m?I1Qd"6,RQ?CHh(?h?
Q0d??a4?cF1T??b4d?d??$h?%&??S,m2?IF??T?F??*#fQI???!h0b?(?1?Q`?e?j
???`????
?d?0?
?d?ME??Qd???&??Qc
?f?4H
F??h??"?M??? b?3Q?X?"???AI$F??Z4?,&?d4RF(?ILF?K?c`??F?
Q?Q%F"6,d???&?&??h?2????j,iRD?F?EZY4??
M"
??1b2DX((?W7,?
M?X5??1?(??EmE??cA????blE?I???#I???h?"?L?1DTb2f??
"?`ld?
B1??h??Y?A?&0cR1DF??!??b?&4ID?d
Q??	2?h?cI?&4R

,$cF??L???4H???IE?E&J
?K!b??D?a	d??5?E
((??(???!?4b?,?4?`?%Eh?E??`?Y*6M	T`,Q??b??d?E%?Q???1??h?4"?F?eJ2!4Q?%?b??Q?Q("?-?l?LQ
"I,!Lcb??cEH???DF??K
F?IfRF??Z,?"J"????0?c%?
bQ????E???1?"??$?5"?,?1h??%HQ?
RQ?E???f?"1Ba?L%?2???!??,?????D at TF?BR?F????b$?0???0Q?KX????B),?6i$???c??BTwQ?(??PT?X?lh????aE0?jK	b???6??b6(???h,??h????Y"?J
?????@4DA????)6dIF4h?lE%?(?
cQ??T?l?,b???X????

(?h"???M??h)
,R`?E??a1?$FK4P`?4?0E2`?%Q%??????2Qb?Q??`?????"2i6f?1?"?	Ia1??(??	E????????A?$?DIL??2F???F??b?M???%EAE?BX?F?Q%IE???P??"?]??4%??? ?1cbD?F
?"??	4F?1IF?4`???(??D(2b1PX?1AMIFCBcF??4HT??4F2T??&?b?Qc&??d????????d?$TF?F(M&?h????%RDb?P??b,Rh510?Di)*
(???RF???b(
(H???c?e?-2??5?11%1DQTh??FJ,?%Dh???[???EA??h
#"??!?1?`??U#b(?,a*0X??
???
J??????????7??^i?????????o?Z?
??{+?X????w?w?so?S????AH)?T????S?*~??'????????R)???+?G?R?????j??J????6?H?H?H?H?H?H?H?H?H?H?H?H?H??l?l?????)??5????JTl?????%5?+)YM???SQ?-R?J?QiM??S
e+5??VR?????e*6R?e5???+)??b?&??)Q???l??l?l???-{^???????K?`wO?????~?*??????????;SB??)???4a???Ag?)??????R)???&???eO???D$??I	$d????????S*[??T?m{
????~?
r?S??JK????J???|)??y??u??D??j)?T?J)??Z?
???X???????4?Z?%7BA/3??U]j?V
???z??*?41??;?&K?*??$?\???VQz???
??W7?z?
,cU/x???a?I??J?[??????????w?]??????]u???????<????$

???D?
?*@ .? ^*& ?h?{b??7??!??4?
 ??(
D?im?"Rbw
!	?"}iT????}????y????P?G~???????z?u?$=-s????L`???\?w3~yq???wtu?qb???s+-pC??b2y??tw0?aa?Q??1-B'?z.???u???BC???7??????<b??ns\???m?f?w8??7N?G???+;??S8?????
????:2?T???Q?Y>?|?~Kh??CZ??&?t8?????d?E???L????
7[????|?????w??_'~oz???????tvq?+MAds??Q??}?VM?C?;??????Ih???i?{1?s=T???IR???M?K+?W??l??Y?t???$??y|?7??9??o|?????9??5??ZC	??*??iH???`:??????q?????7?b<?:?dXu"??\?T?sZ?	s;????B?v?????????U?+???%_?g??j^??{?????e????L?tUK??}Z?o)H???Z)?j???w??????e???7?F/?r??????,$\\#??-_?]??????}?N???4??in?C?o?P??6-????Kr???sY	???????U???K?F?z?u?????l????m???&?????Su???CrF??:????=S??_t#??l?*P?k????p??$i???p???m<??"?????/O{?????j?y-????kj?7???s???cm??o?o}?-tkU?fq?i???k?????z?*?k\?!M?id?6????~??e?????/bW??m?}??-
?T???I?{o!YX{X???I??W9??b????4???sk?????yE*l?Z??>"?o!?!?P_?d?^G??O)????q??<?n?d????Q`"h?6??v??'???=s????'???|?????sj??mP?5x??)?M?&????)??c?s$3#?7?u?<??_?_?2??bW??7M=.c:????w?0??)??.KZ???#??j?'?	?~u??i???*???r?MN??7e?7??@:>O?z}Qo???s?w??c?(y??g?`l?[??X?????rOo?}?s{?|#????~&[?????S/;??{??wM?,6?
??sM?k
??[??Z?2#_???dT?~?/??e???[?N?o?????t9?9z^?????<????A?f??y']y#?/G???z??iXt??{!
K?C???|??]w?^a?-]j?'?N??oN8#?
????O??o?e???F[Qe~3j??o???????z???????=YY=,z??a?\??R????*??G?N????})????3"7????U?33feZ{?{???K????????z???){328H?k???0b???????d????B?w?R??????@w?? `UU?F??D*?????????I?Ab???????xGSY?T?Q?33r??O??????6p???\rR??GK??!fl?{???????~?m??m?wwm???m?M?Lc????????????b? ????? ?x
s;??%??x(6?????@? ?DS?h(wR??
B?P)
?S??Qz??b??	F?E5
???crS??)?UE?/?|???q1??????u
L?y??)?o?5?+?@?<?FZ??S?%j{?<??7Fsk?p?5?6??N-??q?C????B?7
I?Ua??!?9????>?p=?0?!?MA ?0?
E??	???	????A??
dUN??uS?Q^???R?G??h*y???-??h?ypR??Z???T7j/?$E?????
-?k-
?j%??Of"?-??;?b?'??V?)Q?u!?	??^??6?Ogs0??????f?s
?@?Q?#????P?
bRu??@9?:?????B?^9??????W?S?kt-?:????w???,Z>{C????w???-s?h?????O????3-4??;2 ??K\????i?????kr?oZ,???^???y????uC?jn?S?q+{???8???iY??Rj=c???LP??slO'1?}??s
?&??Y??44???l???nn?Nhz?Ft?S?f?????=Y<??usL??J?N%`s-5?j??i?o???N???B??{?\????qKO?????9?;??W"w????9??m??u?7?w1?I?5<????c?T3=?1FC!?????????????T???????cB?q?Q?n?????]??]?/9??{??+Q?y???ll?l??1???h??=??????y;?c??;???~[??]??r9??$n??Z-???????!????r????|?5*?????s?e?#???~d?2??????1??|?!???^Je???kz?O?o?k?#{H??_}>QU?x?^????o^F?t?{?Y>?zJ??8??,?s???m'???w?????F??F?=?\???9$?e??s??w?:a6?z??^r
g???gp??:?%S??y?}?jSs?y?
?xM?v?FsB?k?/@k???P??;*???6? ???????I???z????{?k?0???????????]?????rG???????+?W?D???yR|?????3x?5?TT?s??"g\??^T??=?hcT??D?/???fnr??Y?n???p=?ET?Q??????9?t-??-?K???
????As?]"nS
????Z?6hC???o?y??{??????:^???Ka(k?BI???G???}?N?????'?O&/???wd???ig???qc?u???????;?u????~l??????4??z?Q?W?H?W}??{????;?<???C?+s?'$6k{?B?5?3???q7Nbq-
?D???}Ig?ihc?W?9???#???E???n???-?}-N?{s?N??m(z???Y?m??1?`???|?&????i[?C??:??n5?y?W??s??V?$??????GQr??^?q?!R????????+???S|^c???L7???*O????????k???J?q?<??4?[??Z??wRBC?[??????we??????#????????&??]H?B????
q??'???=?g=x???@??N?j????k?`d4ZM?????????i???#?????=?U????FO55?Y{y$??y???z?j$;????N3??<???4?N????????,2?H?uU??\?2??m?3i?H?+'"w21.?e?nfN?/?c2?5L?]U???????L??wmuSt.???P???M?k'?????`??\C?]?u??M?}?j7`?`;wy?_??]??X?v?????2M?&*'Ip?*Y???I??m\???Nv?I4
dD?]Q??;?p#|??|??;?|???1162.??.??????GR?|W?ve
???jT???z?TTN????.hh?1??;?????+?dc???|?s??????Fmd?z?	??w7??O@???,N?d??}??%?'??O??V??/???1???S:?o??}??}?d>?7???}??8fA???S?????J?????sO^j?K?c?
?6Wp?7?y????7;D?#'??9?
G??X?d?#f?4?O????}?m??Ol?l?Z???????j<?v?<????2)???G??????C????&?jls?5B??N?M??xCz-?se?????I4??&>T?jK?Ca?i
??<O+?>q???2???K\??|x>?e=>?NEj/:9?U#?k????Qu}?fT?(??9%???c????EK?:o.??ea?,?Kx?
?#?PY?&????v??b	?J\q??m????n!f??[S??????n??zz??c?!???^?????W?O??H??m?W|g?+????1!??r?S?1Y?k?C??S?u9?C1???C?n??I???_b?d?IY????????!????K?f?j
???5??5???w?.????^???7?sW????j?7??|?miEmX?H?lTi?tv???e???7
O??W3??Bw5??9?y?-M????Ou??r?7g;]?o??[????V'?????
9???????C???&y?I^*nS?e???]S?I?$38???:??+8?P???[l6?oS?&??`3??? Z??-?}?????N?d??o~7???/?yk??????c?d??KTd>|???Z?x??K?
L???=?????)?1?[?????+Ayt{}?}Ni????9?a?g??8?4?W?=?u"Y???F?og?J?9?????????|b?????O:????]?pU=W}?&??^?u at r???X??>????????#S??#?E??Iy+%?s{?????r????/h<M.??Q}a?oy??r????Y??lnw???&?;?c??;?oZ=L???8????z?????H//?J???;??????M??(>??U?F? ?C????P?Rd??V?1^?????????U?&?|?k??'?????uOe?p:?#???]-?s!F????c????????z?7^W"??T??W??J2??x?H?N{?????$?/???gr4G???~f;?)?n?????:/?,qIz|??????]?z
?k\???6\???}?t??$??%?y?p??Mq?X??6mT?(??N???????????<?O???:??
?
?y????x???=?????EfN?????.hG1?0?*w????x?[?-?Q	???-????d????&?Ev???mN?[?#?M|??s???m?k??o!<]???L$?vd???bj??+???+??}?z??y??u?????0?i_mg?????%-??[?<??S
f:???t?????????+a????OO?ln?\????9???L;;?u??u?i??or??oL?????3?r+.4???y???wm?Qv*??????_<E?=^^~???u4o%W(???8?7i??X:?m??A??{????l?+?????1???1k3???[???K???+??,?_g??o?U??'?&?|*?jKzd<d??s!su?
??z??????????????'????'w	??
????
??????b???Zq
f?O&??:??q@?{/?Vf???\???@?c?????I?d?w????0wG??z??z]?ZA?cgw?i?/W|&?e5M?#>?3?f???=V?+??'?:??AL?Cb??v??{???\6?Zs?oB/?0?w?\??2?oq???z??? ???s???ZX??f???C9??[?????0?r?W/+????????zm???b??r?3?<?6????\??p?????~H????G??????=j?5?y?h?n??o??{???????Gy?W???o?-?E3?1?X??5BR?g??a????;??C?JsY?"g?????j??]V?%??);?R?7?V???????MF??'??P?Lb????s?ijPq?<??(?fpcU'>??w5?*?j;?M????~>sQ:???x???r?Z???Cn2y#>/???
??war>:z???#z?.?M????3w\J???mde??V?u??rW{rP????CINUU???~6?8
;?	????????\?~	B??8
??q???????Kn?G?uM?u_?=[d?d?c{?%	hd7?0?8X$?&?h???I?z3????en?????[????=g?V?A%??!
V????09???W
y??????g=}?B%zrk\<}m?z???[}?4???No@j?}b??s_Uyj???~?'??5???h?b
m??sg^iv???<??[??d..?+??
?????2?W??{DBR?Y?y??9?w~+?????[?/2??jK>?5O??9??}?Q??Z???8W??ws`??m????9?O??j3%)??x???`???:?
{?v[?-N?z??9?M?R??Z9&r???j????E?s?????/z?mw??9?????r?????nu??<?W????$????`
???g?s?A???3??e???????????7N/5?T??l_???Q???'??<'_??k)???????m??uMwL?1_g??5
???kY??+??f???????2+.???vk?E???8?8?????{??m???G;v???????d?@??5#?v]??/?z;??oQav??f?Z??w?i???N?sI?Y?{???????(?7{??????v?????]???4?Yxy????R? _?=????Jb????w*G9?k??q???6{n????>?y??o?9????n7?/n?8??????c?kT?t?"???7???=G????an?C?s????m#?????????7???G?R)/W????;?B^????4? ]?_c??(?y???????}??X?m??V*??Og?
c???/}<?kd9?PM?~
???gc9??Cb}?????s?^?w?????????C?Z~??uA??OFU?hY???F???s?t?y?????f4#/{???j???r?>??????????"kM`???oZ-??????L>a????;n??????4(???h(???????????Z???????^?l??{???
?o??3w????&?Z(?Z?K??d??:~?M??~i???f[??r??y?k???I???f'?1????w???iw~]zu?=<????hy???
O??;??o?+?????+????????3%eS??]CY???R????T??????t<	?_Y?-????{?i?=?{?????+?*??3???=?????V?_???z>=.-???z???+"G?y?z?+?B????????^?u1??n??=??v?9??5????[???}?*?*J???~sB???????}-??????s&???z??>s??j/?>H7"2O????l?y2??w?Z-5sZm?QN16?r????|?v?S????7r<???????8??3??h??*???9?X?????|K????7?K?4???>???oK??7?R????i?/??[????|????M-]<??}H???pR???$;?i?+7??y?Y78????????a?{}?y???Z?.??>^??2Dk????/??|?~??(?KR?rLA??2?/????j???>??u???<?g9?????[?P??w???u??jvM?&?3???)??-?*???O??k???3???????]??>??[!{d?c???x?????|d?T?????b?k??f?z]??7p?I?o+s?????????????69??4?;???z?o^>?z^?u???????&X?b?????
??<????>?}yC??;????i}?Q@?????????vM?uq?e???<m???;??C?????F??S??Z???-i6[i"[????}??qMO?&??????????????M??*[wM?????6?'??>n?-/?-O????(?>}>??d?~d????J???\??e?V????R??<??ZX??}V???\k?S??????????
???]?Gj?/????1%I????r8e;h??4??l?U?a}?5#<?c?0??sS2L?C???|=?r??oO?v?-?L???.r6????1????Sqo??C?????????J?=?\?P?????Y?l??`??7?8?}c???]?E?W?)?F?=o{?g+9??,O4??k6??O|?I?$??
JG???Y???4?b?l?,???z???>>?U????Q3?\nyM??Q???}??z??\?
0[???n?y|????????D?Q???]?SO'!???7?.
??m|?X?WM?????oW???v??|??????]??~????Bv5?z??5?m??E??9??5d??{%t?s??e??M?I??h?r?????a9??\+?{19??B??'?]l?w0r?g%????{?U??xM(?m?s^S????????%?-j???q??????zV?
??8I???I?^QM?f^n?H??T??t&?w???X?7??'??f?^????.??Z?YX_?]|y?????oYV??V>?z??l??<o????|???????x???N????N???)??^??si?IzqLcu0o??-5?c,?7????C??]???5??3?????M?{o????????????K??7?,?	?U:?????m??~?dX?PM?4?????????q?Z???%P?
8????UB??^?D????U?UYuT*??wwww{????uT.???P??UB??]U??p&f????]U??uT.???P?O""2fg'2?????kl?m9?b??]U??uT.???P??UB??]U??uT	?w?Tb^nR#?????*$??Cr?????.??	?2D?L???????uT.?UU
??T.???P??UB??]U??DD???????????I??Qs"?v???[k???Z?1?@?C??<??+H??!?@?d&fe?]?P?flfff?????????????D????L??ivDDu???0nfrg*?P??UB??]U??uT.??????????P?$K[5?(???]???UU?C????[???W~?z??N???@>???,?@UT?eUU?Ue?dL????UYuU?UB??]U??uT.???P??:??nb?FN?%????SVU??UB??]U??uT.???P??UB??]U??uT.???P??UB??]U??"??UP???<???9S34:?\??&??Re??UB??]U??uT.???P??UB????h%U?L??f?c9???|l*?UNU]??UeP??QWUUGS3??B??]U??????Y????uT.???P?'|?.?UU?????UB??&fB??B??]U??G5????i??375U?UYuB??UU
?uT/.?]??VlL????n????????????j?fD???"`L?	?B??P??UB??]U??UJ&dT???B??]U??uT.???dT??????L??35??[???????uT.???P??UB??]U??uT.???P??UB??]U??UT.?U????UB?EUJL?
?4????-?????^?v??Q'?Xfb""w????DT?dD^????L??uW??^????W??U???}?WN?&8??f??Rn?W???*???=""""2
???p????q?8i??????rR??*v??Q?:?l?4??????f????bg!?[Z4?)
???K?Es???E????- ?|?-??q{2?????Q3??Q[u?I????????s??q?????????3#???V???????J????Ji7\?A
?oP?;????&79?[X?r???:mv?I???T?+?C#f??)Q?"?LM??????OD?p???)?;.??y??0???????0?j?~s???)\?2?L19S???5?d1??????2?v?oao
y??m"3'u[?\??????S$0M?Z:?X?????^Jw??3_
??F3??
SQ?$??A7?W??P-A?aL??v_P}?\??X9%u??T???9d?ov3zF???A???il?????)?u<?^w????;??6?D??????{?uVm??urS???U?O??$m/??trSZ?RL?E??rDq
f??%G????X??u??Z1?F??/??????n*3Dz%[??7w?x?#? ?S???d?9Tt??^M?F?~????????Lt5?Q?????o[?????e?g??b?T?r?????(j[42??l3?Sd!*n?j?W???T??WYN?Q??88?{h?L?{=*????B?o)5d?sX??????Mv??????l???zmw)O??T?]o??????a+???u???(??0???IZ??S^?u?U???ey?m??:??67Q???C?]?9?}???aj???????'fUM??P???Rn?0_:???,??W?C?,?
????5??6???V\:*?#???????)??v7?m?7?%U???u???W???}m?=Y??jV??;??????8$?j???V;?[L??H?>V?r?*?VS??9?yo~?f;D???i??????n????(???]Mm??4[?Egh?y??^??v?O\????????w}?]GV?ak??G??-n?(?]O*y\9?W,?!?t?k?Q2Gs+'?+??????]????5v???d|K?]@W?&?*_t:?T?p??_"???K
?k?<?????&??]?W????	?FO5????5?tI??3?????W???
????Y????_
H?
RA?

qS???PT?EO?D
}M[??:?????????????h(?QD???QP?=??I$???????b?????????k?DDsN??{?????????i?X???7??u:????4h]&9N?it?L????i;?7??nA?m???????;??XI???{????????	???????]??4??2&?i^?k?????/!\?rg?????.????,2j???vy??B???'???EZ?????????????:??wwy??m??????[????\????\}???	?R?m;35?={?"#??o?{fv~????????????3c?V??o}?53?>?UO???D?@?????S593"????}???uuUB?T??
????????|w??333Q B???@?
.???f"?	j?]%?j?????c??Y?(??ks???@?8n?ednb????1{??/=??>??2?QqWS??j??????????g?s?E?5??FL{0?rw???{?????????|???????
??:?T??????)?<?1|Lyvi?i??K??8????b???????=R???62?N\b??&??&?i
?Sv?t?ON:?ay|+N?w????	??oAi??^f?`m?.?*:??SFBw\?R???]?c????2????????yO??Go?H???v{g{X????n?5?{????Yqt??j'YA????:?G???v??!??T?9?f?????#,\'?=m?u?`\?"??5?M_=?Ye?i?z?FeK??s:???????e?B??????? ???q????K`/+??-}??/?????&???????yz:+?!b7?#W???X???Z?k???zJ??{?swq?I???[ ????a?????^??}??=?vz??S??????wf2?k???lk??`&????????[Q?H??9??krD??xf?ux??????
n????S?Hw?}\
H^?O?????1?4T??i??]w? ?q??????!?
Y`????>2???S??uc?&y$\???3?^?eal???R??????j??$????)?_}?w8???????NF?g?A)?/D@	????N????
rz???????Dl?i?9I??hm????6	8???3??)6?f?C]?i????BRh(lz???y????????)'?????e;T????.?*MO ??L
?????'??]q?????o??X???}]????)'??5W?7??&???u3>???y??B'?????#?
?R???WdLU??7X.???U?sL???j{??V?1]??|`???}?????w??Q?/??Mov?,)C?i\?{Pq??c$?j?M?P?i???Q?9;?B?/'"7E
XY??r?O???91':??B%???p???VR*?e?>?????g?I?\??)??hjc??{Y?	>?z?A???fw?K?A??dK?[fwM????/?T???%?S?:&k?\?~?n2????|[??Q???p???~??5??=??n?????RR??g??\??T=??mYv[q%?<]??>[&??%??H-/8????|&D???0??2

?2??#jE7gu????l?*7?E?,?????ro?H?&M?00?2!br?)
?]?{??4^??Ki???r8G?}Q?QX??????gtb9?N5?6?j?????Y???w!X?sOfM?
?????=???O5z?????V??X^??G???????lq
n?N?.?(???m?5?5<c?{qze?K????c?"????`????U????:?3:??Bp^?H?a?
?@G?r?I??2??*????th??nUv;???gqeZ?|i?I(?V.?e??O???-b?N???V???=??0?5??
V??-??J)CKk?w??N?;~6q4o????]CK???o??|?b????5??^?J?r?^U?,?i??$$??:,q?jN???'????????F????????{.?]#N???????????0deC??d?{?Nk??????g?????3??^??g???8??3??????k?]'??X????fE{????]>??	]????c{????S????4?wxem(]?s=?G???{2??I>????v#3{]??L???zl???i?Z?%N
???????h?%??=X_?|?????1?h?Xe???2"?^?a??,???6?U??\???0V?\?e9?????
???:?U6????_o?vPe?`Q}Z[?L????5??0????I{?w?=????l?d?Y?*?{DdT?H??|$%?v???H???LiCO5?????]j?????Z?????_]e??5?;-/O??f?????????6???V?^?CsmR???\$??6??{????MKo~????y????k?|??k(?'&O???`b>??q?i??V???V???}V??N??????;;?m{[8?d
'??kn??t{Zm?l???)h?u?PI7 ???J???:?w??*(????$? J????1a???\?m"3????]8E?[??kG??
?8???jc???v???????w-h?t????{&??9??????M?{???>{Kr??h?6??mv??J|nO?
???s?M???g
4????<n!?dWk??????F?r?Yk?^??;?^n??????.?H??6"?69?V??}K???G1x??2@??$?W/??drC;????????-]5d3p?>nu?p???g???qq????*r??B?????Y?_o??????)??VVU??&,?0?Q]??r???&??? h?	??X??U?r????$-?{??:k8???`?F?(=??$Wo?G???0?I	??4???GeO???U?#9???????????aD?'?h???i?^???'?=?????HZQ.?{L?ic????M?i?gT???I^???^??5??9??Prd??B?dG??-_?????I2???|??e??Q?WN?!???KT?????QGEB?????22?V??7???);??u7?????Rg???w????7?G???U?z0	{M\?.????cO??M_??q?;??os??/M?rx?X#f????
????wo?Kf5R?????w?#R?Q14??w?[W???V??#/%??zzn??H-?????e)???!z????"??n?~???zJX?'2???c{t?{???????C??u?n??8	D??m????pJ?e???E?w?i??????VZ?
?b?^?????6?>?k?W????*?2\u?dF?O]??)r7?U?hv?????
*??9$??6nV
V??M?u???\??
&b??
????R?4;?S\????](??!c??n?T??W??g?Y\]?;ai?Lw~?????????>???V??=?[??z????f???:????L?q??N???
u??I1??|????.?%?{S?g?$?b6???,J?????E?x?H?(jy?,*??a at 9?????W1????	??[{?#}]???c???s$g?II?#E_?{?0?D??%??????????????:??o~???.&?'????????????)w?eo??????x~>?#??OZe???
t?#}?t?[B??Z?ij>?Z??v???N?5?r??4?a?_?????z+"1???s????eg?&?I???{?w??Sw?3?T6??!sM?;R?A?i??????&??2?C??N%??XrcX?f???JpI??]????]?m??????ky?v??????Y[?????????+??0?????S?????@?? ?m\?t{5??.V?&L?_	????N?f?????t??7H??L???'t?q?? ????????s?/?%s"??~lGe??l~??5k????cu-f?y?Kd??????j6?H??p<?m??F/?K?????q??_Wf5?G?/?J?4????Nh???.??%?m?O'Wv?z:E??	??e???h?I?UT?<??????I???U???L????????_jQ?R$]??>s?{?=??V?`m))??????K??i:?{Sk????v???\3?q?V?&????2?n?R[???p?K"8+&Z?%w?uz?,b??a7?j??m?????:m???Y?Z??}?????.???7?J?V???s]??#p?CQI?T\|tb??)????Gi}?$?5_M??t$*7??.?~??[-?s?g\??V?C??#dz??
sJ8	N?`?)l??ue%????W?4??G??????m?_i?>?Q?AE??.?????
??em0K??R??$??!vJ?Ma?r?
?^?*b=??eJQ=Y??v????n8??
????=B?T?h[?Hwt?/N?+2??-zDH?\Ufw??a?l?L8?j?????c/;TuV??\T??.????*]
?YS??Z	b?
?4??+?d?6?0??n??????w?????@?}?;R~???<?_??q?~b?ok6??k?????V??mM?s?7=>5m?oa4???-? ?i?;?/R4??\[???[?E??????"???jB?K4??%?Ym??S;D?aej??H<?FJ??1)Tt????okB[?*?#?%]i??b????????????????
D?N?QT?")???EC?pE5

?
?O?????p??f??x?C-3?{??Z?F3???e?????\???,y??:???~?]z?D?V?*#F????u???{?5??w1?8Z???BU??:??C?@?F}(???R?PjF?/??b???QS????5!?n?cu?????R????o???????J~t????M?_
??>I?}?0?tJ???:N?']!?s??2??)?]9L?=]'It?0`:?:N?&R??r????r?!?z??Z?=}??u?9????`zB?-??]????9???R?f????9?2?????Z?h???=V.???R??????mu????c[??u??a?4N????J???LiS??4????9?vz????^=g?u,?8???????|??/?????]yMe??&????\???7Z??n?]?4?5??
9f??C?9???A????_?Y?l????????8?^
??
?g?B??M????????{?<??????,[?????M'??????~\n????R?N:?

??
? ???((j
?ES??\?-
?W???#?/
?
?x?"?]@??]D?#????P???b??????V#?7+@???(?)?N":??iX??D?
?qd at B??+?X? ? R'PD
?
F?? ?????N"??b?Z2+x??";??? ??j
?9??6??`??j?t?F???4?q?
?N"s?
?
@9????:??Zs
@m
-&??{1e??
??7?Hqv???0)???????%?????x-?@?x????x+x?iPL?y????D)
D7??Z% ?4??9?	?kJ?ZAA)1$
Nc?@m??b??d?J@??	)pS0?s1?
?????j
?
??b??????"?y?'?kqs
?i? ??bf	X?+&???WT??s??@/?!??@bs??s$?5?
???1\@)?E5?D?F?1?9??H&?n???8?-?8??n.?X?????7?N`?`^)??YR??<????????8?*"[??h????j???e?U?S???w{??M??????/???C??????$-_:9????<?^ ??W9?????S??=???*q^?NlR??3??????????G?hK??r??w?5???|?q?<??3??"a*??S???
??w4.????+|A?{??5q??9?}????~??sr???
?[?W?u???n_?Vg?K?n?{%????-???;??b+
?~jQ??`??\?m??ZP????#??????{?w???d?cg??z?	??{?|????????e????q?????;
?U?a???
?u??:????
( %?l?[?	????oZM$TbAF$"E??4?????kM6?h D?????gY?X3?g9?t
??1??y?=?V??u????om?2
T??L??Mfo;??6???*????G???	L?uA6???&@b?F?9?"9O?y??|????*?}*8??????
q??y	3(?
?-U?Ux
?ol
Dd??[?%?_.?l??@=,?
??5?)m?UI.0fa???m??????y?s?j+??o????????V
????l??C,U?l?j???$?5???p?qt???\?U?n?@sH?pT?fbQ{%???Y;Y?i^????7?o1L????????`8MB3?\L?-?
?-??X
??/ ?(?W??????lG?B????E?^?b-??X??R?UAZ*"?VZ0????b-?^???????(?????U?Yh??T?T?
??T?@PEUy??XEh?4z?????U^?z??????^??????TC??UEAYU`=*?YUj???Qb?*?U??j?-??VZ%U??Nh?
+j*??$???V???*?V?h?"???@(t???%,?P?,(T[T??*U???
`??"??V???1U??;??w{?????w]??????t????&lq??Yt?f?,|?+Xw???w??_?|H?c??a?????wQ???z?GU?p'+
Hi+?????B?n?W+????%????Z4o?u??q?????;{?L7?????????N??[??o???1?v,?i?w?R?K?=63/l%$?[y??Xm?w?%?'E3`#h?{?[yY????{?:2??Z|?????B?$]??@???[m????iSJ?E???+4V??Z+Eh?*?Zm??Z+KT???Eh??TU??j???V?QTj??TU??mEh?F?V?Qj-Eh?EQTUF?V?QTmEh??Qj+E???k??iY?l?R?mM-???yI
???{]a?4]?8JQ?S?{Nqks?????^?n?k$t??[j?
?????a?\???Ne??W?;n??RY??W6???|
????$?h*6?????f?X??[??Y?2j?????k??z?l?h?n?x????
?{?????4{c%??e??`??????FW??)??m????]??v?hd?*?????Fg???K???n3)_16r?M?7??;G???????S}_C?7???7???"???Q?^??2(?t???.?733.????^?????3:fJ?9??y??m1?y
?|z????L????=u??5???5?d??C??zfk?????wU?|??????g???-?8??V?[?????Xo*?lho???b?????$?t?N]??Dqm?I]????w?.??U?!r????????&Yy???v????0?z?*&7???DDY?
Q?F?(???J0???7??e)B0?F????n?x"???????
????b[??????@????s??m???????k1???c?>??????#?J???????C?y?O?6Bk??;?a?RR????R??p???*h
k????Km??????[????DV??JIu???????C???>???????m?h|'.??2??A-?DU??n?6?	??????\?V{?Oe??/?????????<??Kj?i?V????t????=?C?O?-??K??k[??3~mk_?y?'?s????Od??v???I-i&?:?????????i???f
?z?????????(jjF,b}??;?{???q?s??=????Q?,???>?~???]s??Zk<?k?r?}??u????A??????-????UU????
w?????s?u_???'Ng???\????
?+AZ=
???XU?2?@
B??P%!N???`6
???@X
(??Qe
??
	S???k&()???K?w?????)????$M???H?jVZ(?$?cl???h???@?G30;?L??Uh????q??qmu?????w7?,/$??]?-<7Y?????-?}?;?X????
???_???V??????=Mw????4?D?Z&?yK1?r?H2?UT?T>???m?k,??m?T?eiU??h????~???x_????Y??????????TO@?.o9??w?
??Q?N?YV?^????9??V?M??Q??????????W???$b4<0?????$???n?\???5?9????~???I???s?a??????2?
?97??0??q????????????s?-?-?z??L8????-???l?C4?c?b3iHn_F2?\??i;u???o??3?^>?????S>?????$????8??
?S??J??O:?X?*????_v?????li??Ya???y???Z?y*c?c\???P????/u?$???ZL?P[C)?????vWN???
??j6-j????e2????3??x
g4?m?J????{?)?????gC???Z?&?j??nU<%???t????N	-???s>?????DF?m?ci?
???????F??:U??v???#?Rw6??W?=????7_??????|???
??P???^^_???????k?}????I?_????h?ZEU???:??/?gRw?e9d0!q???z?????w?????U??????.?????'?]???Vg???????
?mTU??Uh??
?D??(
?URU at eV?R?"?D??PT????PE*??*?X+h?T(?V??[E?^??+TUVAeX?*??+`=Q
DUU???Q??*?UYW?5V???PUATW?0??QU?
??V?Z,??Z???Q?PQETU????TUU[????X?QX?Db???v?R|3????q?s?????????0r>?W?????y???<????M=/?}???????Sn?y?6:(w?|???
X?C????a$M?????????EUtW??9?d?^?Y
?????5??W?2?M1???????????????K?53[?xT+??????v?lm???w,?c+QGoB^??ax??????[????]^J?LKn?H??m?c??q?;7???D?Cu?lT???????:h/;?x????????'
:(?6?????????{?3B???TT????p?!???B?sN_*???Q??]??7#?<8?u?????.f\uMTX?#???	R??z??w/]H?xW*mkS??????<?W?k?<3eVtT????gL]?Y?????M???mitW?s?????x1??]V$?3??w???????6?e?%U9??N??koG??[/w?;\?m?|????????-????U2?4???l??i??Z??qYt9?[??m2K?}b?????N??9U??}x6fgoUUUwq??????????????we?KL?@
????l|?51?{!?~=\Eb?0wqU?fFaWy?
?n?L????p'???W?fl?d??mB?e?y???????DWX<K???????|?E&??j`?????V??Y????????j????N?9??H???l?y:-?P?p????????*?(?eB?,]J?m??x?"??%2RN??????n??o??u?3??"H???
5?2?!???y?
???)?>G?Y=6N?3=P9?~?jI???l?????c???x?#???D
sDX?U?U?QP??)+?D?pS??B???0?I???	?u??~?g3<N??I;o?n????/?w?]O???wVK???????.K6??T?Zba????s?AG?DW??9?
1y??S?}7????;i???m???oxU%???+{?????F??n?]6?n??????]?cf????%b???;??????<9?/}u???s6????g???????Gn?????S???X?x
?W??T??]????y?v?.???g?r?;#????6?Wo(;>y????)???;Y????I#&??(??)J?"I&fM???;??[??jbe??????Qm????y???????mo???RRn?&??m?l?T?*???6I?]??E%?4RR?$)Q5j?S$??3???l.????Pv?y???y???M??yg??y???,?v"???r?^???????}|????~C?a????_>oAn???2tpg-???U%??=???y??'??K??;?{????*t??????]@ZhwwYy?
????6???sEF7??s??13:?{?D?{u?(#QTM???w???fe???l$n???/!M(?????<=??
?m?/???ln??????(?S????vS2M$?gELj0?nB?MD>?Ck?G#2.?????<t??:[/B?-?td?%mK???B)??
?*?O+5t;4??P?????Ot&>?%???(??!?
?BT??>RD?d?p???
<????h?f???5??Oe???'RN??N??3???v?qlf?????3?q?j
???	[?eU?ffj
??wN??Hc?#????v5????V??X~Je*?????}iuw?k<?O??Q??R?j]?]f?oZ??$V??	qr???ywx
???k??cgW}???????mW8[?0s????>?Wc{gh?Fn??*c??????l???:. L?5^\C0?,?c?/Q?7f?Y??3????w????X??&????gb+?.??f????|??w??!???j??[7??o????l???2???P???H?hT!?;`?e?WrP???Zg
??%?`^??N?wLl????S????r?f??$?dfVf
?8??d??hwD#??????????G<???????????n????b?????$????$?H?? @???Jfq{??&?i#?w?5[mv:??P@?_s?]w/??:???W???Q?4???K?????lw3?w?w?
??K???
<???	??hu?{?}?E}??y??Y??#-?t???v???t??RI5????
????????y?ny??fJP????V	??????m?Oo??L??
i???I(P4?6?2??@????`?6?CX?Qh??????
-$?"d??@???
?6.???????????}??n???wz??????????y??y??iLS??)??BP(z?C=	???45??y~hy????b?t?:? Ndm?z????X???N!Hv?a??B?????????3c??+??Nm?;?u?M???+????C?VR?V?.?????w??l??'?ng?????????R?3???l?(?&'(??/
+???)?=??>d??
@JM/LD#??F?+???d????5vI??"" D????? ?H???/t? *(??n
?O?l?Z5E4?-?I?
???sT?-j?Ei???????t???A1IH?p?M?6Up???Q??=??W??	??????f
?1?"2?179vNf`f???DZ??B
?i(
m?
<?????]6??IDT??p"??f1Z?&?m????j
X?0!,K7?? t"v~|????|?????????i???}???h}Wn??Q?u??\??a5??f
????X?K6$?%?p?	??T/"K?n?:???ZD-??m???oDB;s??	k?N7j???????,d?k?????.???H??z?#']?T:7?wwwf??|????jI??????ci????+QcW??&?c?YS?yf?R?J8I??YK?Y3v?-[q?K{[??s???yD???X?E?L9?'?3_???x??;*.????????^a?Ru??[??!?wn??*u?%?{-?wx7??w?Y',x???)7.#r?:?I?o3??r?V?kP????*???y?
??kleI???CI??%?b?jK?dj?y?!?P???????5<?O?F';?|~???]$???V+?JuT/(?
{.??T???E\?5?o???NW??V?=??#???q?y?????T?????5Y??????$???q??~???o????6??\?3??s.??q??#%??%?7/?cUS?n[?T??L??S??"J?I???????;kj?&?Ur?z?????.?w?p?????^
??nSM?wi&??$????j"??V,? `?n?3?3?#?US\k?`%?kZ?7?
;???E,D?\?m????"xg??????h?c!??M:?38????p?~???rX??f?1*?n?s???0??km_???????y??X?D?RQ)????E?#?424x?{?i@
I?$??:??vV???q?
???
J#W??E(=Q?/?@??m??bQ??hb????3???6?2??v?ga??n????b;o%???m??_?r??????kv??s???6?.?????w\;&?+???n?w?x??<?>m???y
?c??T?$??IF??i???(????V?YI	?J7v???I)]$?&?J??J????IjU????$??%)4IU4?WUH?]P?%*6IUvRU$?U?Jj?HH??J?I%SI%?l?J)!4?VM???$?C??;6????q?????/oL?:85???S?}w??TL?????h??????^?"?Y&???c??`?K?m??e?8???
^??}??TG:>?~???{q?:?[u????????y??????}+Q?~:?????????4???;v"?o_??Y&b?[q??H?I?i??+s???:$?U???1???cb??]????L???J???]Y?g???z~Q&?1?*V)a??[???Hn?y|M??JI??*n?:?Q?'[????]T??\?"????w?????z-???e^??v??y???v?/??????<????>@???[??r???????WV??N?;??-;??k???2?Z??,4?X?v':??s*??K?-t?U??<??v?M?Z?N??\?K?\? ???<????I4b?R????e??4?m????????????P?WZ??d3m???4TL???>n?5???gH?????+a?.V?a??9?7`??j?p???j???q!?-]5ge??Z??w???^??????xl?n???*v???K?:?????????9???????????????ww13;31W????????%UV"""9?7??
?????O???}??h<?????Oab?????<???7?????b>??J???3{????????z???aF[X??a?K?c??'Y?p]??dvQ?Ct??GS3f????hg??E?????'L?:&1/sn???Q*
G4??g???]???????G,??dt1????"*?
???????*?C4??Y?sO?+cHr????|C!??.e?G?}#?h^k??Jf?V???w?p?a???6?5??v?s???8???D???4{?
$???t???	h?\?'?n5???d??+?;X?s??????2?E
?-??n?TC5B8U?VX???N??z??8???m?DE?
??/14?FKk32#u<?Z??^4??{??o'?7??^?>??=GB?0???2?~???????
E???M?????kJ?%vIGH????Se$?h????E$(???$???ZE?D?U?kH???%$?KV??2IH??Usi)J?RRIMRIID?f?JtRJ?$???T???$?????)$??II)?E-QE*??U?%$M??????I]]??$?ZD?5h?j?Jf?KV??F?J????RE???RWiJ?R?I??Z?e!ui-U?)U?JtJ*mYH??n?I???J?l??V??i%6Q5h??Sd??Z*??uVoF?IZ)$??J?UVRJ?>x?y????????`v.vGmvv&????v2???]??m???l?]??m?????Jm??ks?v?Sd?;v??"???c;m?]??0r??r??????V?i??U???-v????kv??mV5z?

??Yb)a??Ys?????????Z?)?k???Ga??_ ??Hs	6Z?f1?o9U%?s???j??[??#4?=???O&8??s?{??6????gX??*?"fj??
!????QU.?RY??U-UVk????3333?1??f?BnRL?q?~??sF?W????}?iuJ?w?{?;x??V??4}(?9+?!?g4?(??????????????5??6????1@>`???PK??K2???_n?5Ee???????m??!?????R??R??????*=-?KS????
??&??$k?<q5s???b??????;????W:Q-?.? ???{????eF?s??L?ud?Lm????P???Qtg?}????9?????0??n??0??!???NM]?tD???F^??
)kO"mWw]9???{D??D?\?^???;#oj%???8???+RG?[??`?S??D???
?????JZ??+Z?????????/?B?
??p??x???K??q\S???O;???,?3?
?v}
v???I??$?n?7?
?@??Y?b6n? Q??j??m?-"LD|~?
???????w?%_?"??a5u???k???m????w6?mB,f`
???P????+? g
F??b84:??
uT
aw8.??
????`,7
??t?? R???
?,??`@:?)`u?J@	H?QQQ???P@?d?UUH??j?*??m???+UjX-?e??Z+?Q0????????v?????
?Y*??[m?]???!??s?vM???6?X?????#?3?Wmc??s????m??q???Cm??l?{.???????\??????;+??m???ne]??U?Sm?6??]?m??Wm?nU??+????m?]?????.]??.???Sms???]?????u??;d?fc+?m?G9\;mGl?mj???s???m0?j?h*???P?w
d8*?k???s??????xzm??N?????PUS|??y??7uwb>?E???*?j4
?d?pn?	??f?$#? ???c?{???O??????????Fk%(?[??C?z??j?YV3
]?V?IJ?????J?????6IKM?L???.??v
??H??a???j??h?S?c????q?????5?{b?????;MU??"3'
??S3?K???
?????k?Z?v???3;???*?y???????N??z???8????`x????CQ??CZ?c[?x?4"???XH?Aq3>o?U.+????e?S??T|??MR??)?KS?
O?2???r|=???????????l?~,?PZzq?n????\??
?r:?K????Xk?W?s4?y?|?X???R??2tb+??DC0
?,??&?y?4?FI-%???"??"??@???? Du?7??S???\t?o?~????}?:??W??g?L????G\,
??oZ?W??BZ7&??	??*d@???u?K?????R?????^????f??????????????(??? ???"&\C?s?w?z?>?Z?Ezp?
T,????&j???.j??W5?Q??!?PZ??
v]?@?2?0?$??)Z?D?@?F?]]?@;
?v????"?@????A6?4??????6??-??(?d??k??D?? ?{?f??_?????????Dw
?-???AX
?UZ)U?^(?R?
eW?<QAQPUxW?Uj(+???AYEj?5zEAYUj??Z*UATVEmF??(?????e??n??\Q??]?
??3?v??lgm????GmGe?ev?????m?????;n?????[*JH?JX?P-???
P
w??????U???????7?`o?z??????-?v????c?Z?????7??%D???(n?z?????}???=???1???{?b

????
f]?0??C??kz???_`A???D?2R1J?b?T
S1?]??
U?@???? )??@4R0-]?????k?r?@?}_?
%q=W????U(????x???eA??\?r??.&?
???UP"??@?h
I?UHD?M?????5P??`f?
??H
???yd?`i(????&j?
r?p??u/?????(R?)JR??+?????????????????#[??m???9R?????m???)JR??Z???)JS
\{???????!?M?O???????O??????E ij?R????TF??qu>???)?????S??B)T?k?????zR??L)?)`??|???????K)U-??)u;?j~J??aO?l?*r???!???M??????.aM??.AC??SJ{?XA?(P?
XA:S?(?j}?'??????7?O?L
???H??A?????C
?0?#??*?*??? /??R??Z??4h??F?4h??4h??F?4h??F?4h??E?4h????4h??F?4h??F?2D?(??y???m???F????????i5??o?~?~?????t?X????6????>?N?{??q??o?k?y???U
??5?O???tY??Az?????}3???}hH?}?G;w?????7????U?}????????????????X{?_F?c?x?w??K?s?????{???????????????????{?B?2-??;??<?????]N{?{?X?;]???????5???^k\9??W?qf????Vt???	??Q]?~?k???/u?$????????|{;I~
?"" ?0?9?%u???yWl+]??#	 ??*??N?D?h??9d?8?????f?k?k?<?L}?v???fd??U7??n?~???}?]???[???+??????5?	??????""???-?\??1j>t??????~?????k???????8;???9 R??k?k?<?E??????=V?X????K???}NN????g2?w??5??|???[MO[?k?y??y?m??(gp;??z??6???_??????????x3???????.+I+?5????y???\??V??^????????h?????????/?e
????d??o=?I?p??x5?<??b2L???~?A?1??????*???n??f??g\????-Yk??}{K???^k?<?{??&.??#T+??????O???5o?W+o??zY{????o?BN?=??}?y??h??eQD??[??|?G??v??E?}Y??>?~?EN??Q;v??????D????k?<?MQ????????}????KnMos?)????^?|^B?Ttp?t.?m2w/???o5??y?Ag??=~??=?T???_??o?S???Q7?^z?y]r?'[pfg??k<?^y??%?]g}??_*?G?u???????????i??G?<*??q!?3???{?k?<??AO>x??3E?=/7?gj?
?)u?V???}?????????????q?H?????y??hC6?????k???O???O8u???u???3E???[??G??????????Z??y??k?T567Lr??>&???o?[t?)?h????.
g?u>??m??iN??O????<??Gi?Ne??.???s?4_??4??6????y??{??
ib?j?o]?i?{3?Z	?Z??y??k=??????v??;???????N???E?>?&???6'????Y[LM???{?<??5!?=s4??????m??]$?????iS????v????s??:???u???????y??i=9zg[U?????u:+S?7?????c=>?% 6???;????w?s?^{?y??j52y~????q?_???uM??z?h??kb}???????n???-{>?"s????^y??i+???????o?????Q??S*???{?Gpm?l??r=*-?;)M??k?<??y?x.??z2.\k?????W???6????	B??f??%?????*?W???Z??y?a?[???u>?X<f?~?Wupg~??'2v$S??????VGS????g?y????y??5I?????v.=?#7?eT?:IZ?u?W??5?????YdDPiu^???k?y??y???_xdGE?Ko??j???m?F???U???~?W???????~???XFL?????k?<????z?z???	;?&??4????R????&??g???sV?s??U??%??^{????5???Q?????s????]????V?????'*
m??z?\??????g}????^y????????yo?o{?*
??+)??>??o????????3 62^????/^k?<??&???????????nt"#u??f?a?5??o?0?1???????k?y??r<I?@5?_??`?~;\??W?|uY??T'i=??\??????l?s8?????5?4t???2?g_}?zN???a?>????=?s?????jr???f?rL???_kZD????\?]??????x???}???d????????i??
=N??3]"L???????G_??6?5gID???*??????OLp??n2?h'UfNY?k????u???????C:?Q?u????????????sG|???^??l???y?u???z??{???????R??g??=F???.?&???>?;???B??????}/??????6????m9?)?;?8?????????w??8???p?g?y?9?|{[?e???>*?b?x???y{??m?i?????????}a??=?????$Z?????)?????s?w\??[????u???X?w)%???"?e??%??i)Q?"?_??z??F3???????k|{?xwB????-&R#w?N?"m???????(??HMu???tjm??????????9?x]?????h??,???=?^w??????29????`???#????/#`m5??{<??v??J?Q3?5?????d??b?^?????d??@?+x?
???K?????5??yD?????!??U??g-??`?k5?????3??}SW_F-?f}-&Z????~???iq?y~R??w?Q??{???f?F?{N?c??Q75t?7?Q(?-??#U???
???????\Ok3;-E?c??dth?Q>?t?????w???]As=?	??w?????Oqk??k????w???e:???*?????????????=????~?9??R@?ljB???9??e?"1i?H???lL??k??o1???=_;?l??gBc?w?s?B???TW??.??6h3Oc?h??w???u?z???*??%u??4u????g{????Rq'?? ??UZ???l???-f?u??????k?]?B_Xq+j?-???a???{??S????k??y?>?PV???????dX????e5sz????`?2.C???????O?'?5??/c??5{|'F??=U??'S?I{
/??'xv?|Iu;????EYy???!?;??J=6?k???K?&??k?vms??*??m??????5????7??`Y+??]??????ta??^?p?g?
'?>???#%\k??G?j?I5????????u6???l8??|&?L?}?+?C?|?????J?3??o???c???9|+?~?%?i?=?9?.??yy?F?%?5???9?KC????	H?????>?1?E??Q)?f?-x?????????Qq??????$??k?T??7??????a???
\??t???-%j?xw??F??{/s?D???!??????\4??V?a?N?'~?????Ef$???734??????@??????Q"??????Zt??/{#?z?&}v?OG?Zw}?O???????0j???_K?????}???/M????'??'j??gO??I?\m???
?%&?'????;?]/-'M????????t?Xu;	v^?}???z?>^?IOJ3????X?w]?{Y??$?a?0?J?&B3Y????}??i??>?%z9?????u??i^	?=?(?x??b?1S?e{?N??bR#?????????????9????\????,?@F?[????bg?L???J?ZG?|I\???%??k??????}??u??>??Vy?>?? H??t/?f???"}?$?????}/o?????:qV??????$?h#C??_R??w?l?4T???y??????rH???nu???g??T4?] *??C???U?w???
?UQ??????Sf?gHe?cf???VmOw}|?a}0q???@?b?S???tu>??35}???Q?????/{]!??q???Y?????#???Q?m7#??{???(gT4???u???d??1?[?????a{W?\?????F>\7u: ?=?m?}Ai_y??G?}?T9??? '????76.u??p7n4???h?X$s|z???f"??}??Y????1???
8
w???H????HsQ?}Ru8????9[??????*?_y?>?
??TmG?????GU????+????R?~>????y?AG{y??z??2m>??[??????{C??_??*`?l??Y?u9??;J	?????j{???M?G??gR?d}?N?l??"4?
Q??aKZ?O?rj??
u?>?S??z??zS???t??S??X&???k;|??[??-'?Ix?<?
??????o???z?q3;?2'???W????q?+m?'"XO??I????]?Tt?7Z?f???:q]?????????Sy1??E?9??>????O]?eQ~?=?BEJ/^?UG?????TtIO???/???A?V'??c?j???o??????^
w>?Wef??4<????K?;?zx?t??????{Q8?:w?????(?z5?h?m??>??\??WJLI??c???T???w?p??H?o???g????F????-??p???????,?
?rV;7???8?,????H?????#?LE?t??#?q?3???pD?9<v>?O????F??
U??n#?k h?M???[?*y????d?????l????s~??6I??!Q..#?ke?:(?!?[Q4???J???????gm?QXG?>??ss?=U&z?????????nU???\?x2??H?=?D?z1??y?{F}?N??|z??.g??I??P?y???k?,??rS???>?sKK??q?|My@s?????zz90???i????y?k?Y???D?Bx??I?rs??8E'?
???YU??_??j???
?
?S????
k?5???v???????'~????#yeU6???	e???ocy%?,Af7z?am??????y??kn????o?wfe?\y??R?h??x?4J???oq?&???????(?y??y?kP/?u???]|m;??fd???o?uX-?VSkcO???N?k???U#?O???<??5	h?'?O????_6??4????{U??;??O\?h?&]n?P????????}?f???<?j????>:???;?S??!?	P???	??f??o?u??O??"???????????<???CG??W???wa?d#?4??>b??hk??????J?????????+?k??<??5???9?^>?[?s??G???E??n<?:??[?E?W?h?E_w??uT?^j???y????+
?Z~?????W3?[??????K~?=?T??Q
-??k???y????P?O"q)#??????\??$?{??^,K\O???U???!????!??yz??<?S???????5?-??+?????????9???)?
*???>??g?:?v?^}?<??5g??????????}ce_u??,~O?????=WcZ`?O?DKl???Q???^y??j;???|??_???|&n?OJ??r???t??mp?????SI?:???yz??<?^?????^k|?D??>??i?^???9%j?????'??fH?[<t?`":??yz??<?Sk??????/6q???y;H?F?ECr??O_???#
?-?WL]7?????y??[???F^]???%k?Uk?Z-???u+??'
???%?c?}?????~????y???
??Z????<?\,?<?????DI??JXJ#t?>?_?2?T&ne;?T???iAN?O?k_k?<??w?5-??\???A}x??w?/??NO?^9WCc?S]?qr4l[[N??~?U?<??5Z??eT??,?{???/????????????{?&x?VC?tY?/??zpm'??my??y???B??]??
^}(O??????,???%???9????M ZB?????My??y?_?>?+??c?'m??2
?n?5?????s??????q????????{H?k???y??
?4=U????3??w???7?GZ?????????c]???b{??T?k???<??Cq?OK??????c"???PE?&??/?ozi??8????=z?Kd?^t7>;?J???????fD?#G-?????-??8??k????1??,2????y?<???.>o?
?????]??o???j?6????/M|A?Z???_q??4?k?y???9`??m????z!K?.|??eh??j??5?? /R@??;?A??~?}?Z??x	"??'?]??s'? ????U??????nV}{???V????S?$5????y?k^???????[o?G?n?=?7???=??k??????F?)??~??????k]?`"niS???p|?;?#??k|?-??|S?@??~j?o}??I*1??6-?]????Z????y??????}??-??T???t???hJ??`Q ?????????e'?Q?m??O?w?????_\?y??]?WY??????JW
>?_k?y?}????'?u?}???(?o???\??4???E?E?eq??U~??????k?j{O	??m????\k>?G}?	?????
w????????U?4&?Xg+4;??>e?X???o??y??kZLWv????
 ?l1??;??>???Z??e?V??=???????.T?Z?u.5-????/Vs?Nt???e??=??k?4??Q'?*?~_???(lh??????P?8??I????+???????????L?????L??4??7?IM?'?}??
????(k???{??R??N???Cm???m	6{Ty~??J6|(?WW\??SPG??????
???????n???m?z??/C???? ??<??(?????h??5s?gJ???-??????Rd##z????b??f????
|)???????+{?}??Z?????{N??u?+??<?AP???`??x?p?>??y????}???wy????K|?VJ2?????U?q;?C?;??k????????fL|?
???5?f?;?,?e?l?;???I6???<?W?nd?????os??}>??m???z???"????????g????_j??
S?y?
8??????+"?	??????[?_Y?PwY?l?????Qe???o?>?>U????g?vuq?#?????L????vQy??I?S??5O??Me?{e??v????U??c???O????????KUxu2????-??l?iy?l?
?;?g?j-??Eu?pC$????aW???}??&????_?d?[??2}?g????]>????_?Y?g??????*??y????w%????l}?#|????x|?(<G?EVT>37?F?^nv?NJ??.
?????z?9??w??-t??$???/E????dOu??k
t?V?+??=?
?????N;m}??<m7]???rY}??gx=??rWg??J?
1L???o^???"[??{1???S?_mQ?y??????
?"??J??Q?4{?????U??M???0:0q?FD??f??>??I?s??A4?K&??<??7?_????????O?p?&???=OS???=OS???	??0??=?G??
??=?=????'??C?B4??Q????D?=OS??=OS??:?=Oh??_z??z?????=OS??a?
??????{?x?=?=zP#???7P#???>??ojZ????P???z????=Ca??8x}????||}???^???#?;??>???N?Oy???+?f?d?=M'??i=O??=J??n?????S??=O}C??t?`{?z?>???)kX???^?M???jT?(?[??F???EN?N
2zd?cF??????#?L0`?S'????????Z?M.l??gGGg??vv{?2T???e?????????????BH?x
???@hP????[?
????????m??=??????????k????,h???Q?T/?"?* iG??I?z??????u??/V??^?~F
???.??G$`?u???
}B???l??R*????fc?r^???%B\hZ???s2M???9GCe?v1RaF???Q?j?]n?I?l!?????]??Qj??]:???&??w
??y2?_Ys*????????v?V?jW???;!?j`??n???'1&??r"N?g??l?????WV????#?)????N?h???a6????T??U{K???N???????;u?T3???????%?uJ??DDm?.??\???fz
??r)???-?N?6JD??wd?@d?????`?	-N?y?k?5]]?{u6~?e>T<??bMW?S????k"M#D???Mw??Szm?M3?5????????Y??<?|???hk????=yS?4j??+??]
wLZ????)=
$l??V?>?v??d?j???5?<??W??u???????b??y???!d{?m???r???1???????`
R?u??J8	??R?w?V?T???
????|X????????]{?O|???V7Q??>??5??F???????7-??b??L?P????
;?+????U?wN???d?^
uoLfG\???1??&-?c???ru??qrX?A-w+	cR?r?
????r9???x?""??
@!Iim:
-8
P??:?
m-???IZX???	K)????YN? H?ZqB??([HRJP:??P,?P???J~J?/@)?%
S?,?C?u

Zt??(??XJ@
?im!I@?-!H??,?)@????YK?u	)?	N)aJP%S?8?Z??
??-$???%P??R???R?(qB??@?X

w????????v?X????:N?J?_9.??????? t*??=???
?6??Yi???|????;?????4s???
'do+S&????}s???S?5x??u??b??^?????j????(r?b??B????u???^s,iK???w????6,E?0??{O???6?C.?vbfJ?+;?U=?;)???GO=?K?Q??r??>
??uYZ>?2??????z???6$???;??u??K????Z?=?*???oM???u?(?%???????#????K(????Uw?]?F??I\??[Y
?]?????,???4??E
??2?
?2?_F^???]?[?R???:???\fE?B??U$D?J]?
q???REU?Nr????m?qK?Y??y?{??;m???Ni?6?cD??~2c]d?"?MJ??????????N?n???????-I?;?'???
?????#M? '
s?R?P?5O{?8?b?????.?
?t???L
???B{??ju?^?<??]?};???????U?'[3??iR??0??>B?t?Z??k????7?m?d??????N??F??Cu?????)3?T*??
S?JZ??
??S?? {??????d??????z????oz?????3R;??VN?q*???h
??x????Ls????6???b*?n??&n?
?????l?v;^R;r&",?m?ij???Vj????Z??*?Wy]?;?[rg?}?zH??G???w??Z??6????-s:????YP??f?????w???J?N??:????w]	|?V/f???TVS??gs?kFF?o?gL?7}Z?BWZEf?k:?;.??r??7?Epin?[Y8?WV?E?h?
?y???7|[E???i??:I??3.?3 ??'?gv?????????9?3.n??wU{?N??K?1?mr8
???~m?wV?g???? ?D?z???6?????!?*^?+*S&?,?
;??B???^???u?qe??p?d?!?^of?/Zn??	?-???l?{?????N??7??*??)DMn49GuVA??????",
??m??T%c??????v
?r/W!?3K^?C??&?E=b?X5??ZN??h?o?1	EDdy???7NHH?????i?O9??	???????
??Ln??B_"??0
????E?U?o??????_??{???o??Go?)?>???-?o????~????[.?????????Mj?????????w?????f~?w?~?Bz?bV??????"|???s7w?
?_t??x??t??8;%?a?r}?
U?N??[??0????J?Gz??j?#??"K-|??v????R?qnC-s?ei W8;????f???e
u	)?:?P?IN?
????#SG{??{_????%Amc?+F??
F?p????????k??????23????-???o1??w???yzN?9?x???]?dddK?<??i}&/w??nR??k????uK{]A{?:?iB??ei?b&g??
?jj9???z;????i???Q???
{?b-??/X/?ju????I
???N?????????
???~??B?b?`???9?CS?????w????????????????S&?i????????????
5@
?@??u?_7?????|9????ss
?%w????L?e?j???9??>uD???????????????3????
??I
?I
???
??AU?P??I
R??@?:?
P(??PV"????E??W??)? ?(P--:JB??/@ IN?
 H?ZJ??,?
Q??T???#"4T??R?m?R?b$????YU??U
??0`
*A?7?:?I??vv????V??kYt???9?n?????Gg+z?6?v????:?.K|??;??>R??u?+?????1??????Z???Jy? s8??????S??K?????7s5?7??s?I?Q?^n?'-fI?<?FR??^?3??[????????U??x?$???ff???sV?4??rQj?,xI'??N?3?ikK?s8N????7????s?8??????sZ,???Nj??	????6{hq?f??k?W????z?s?l?i?Y???x????G????d??}qgQ0\??:b?E?jI???w7?\?*????=g_?????W?Dz????Q?a???X??W?6dD??g??IC??????:]Nk'??4Yr??+d??o????*fp??X
&FG ?????emUr??mm?9??X?;?X??%?J^????iK*Nk???.?o?	/??Tt|B?C at 6W8`[2y?6?(????8-&??
?/d?#"&^???jNP?;
H?n??;`??U3???"?-??ZY???2???
??f?V??K??e?q
aM??e???????????????<?d??ff
?- 
??
??????KK?$};>?%?]*,???W?0
?J?$??H?????T?Z`
+Ej,???????J(?? )??(P(???t?)J(???A??/Q`5V?`?FT@[Uj??
?R#mUj???U???????A?W?`????h-
?V+b"+E??????~?~@#??? ????=?q?{??Q'???5?5(??????s??W??m)???????4?K??7?:?,\Hy???X
??b???z?Y*?T??6(>?Yp?i??{?o]?2".???e??? ]?MU?gW#Wh9??^??|g;??ef?x?z=K??E??l??@??y?
?$?
}?0
?S?h????R?E,??)??)??yu??~ws?r?+??.i,RIZ?I???/I+T+hZ??I?Z? RIz???0S_? D????^??B?mD?S?T????????#?????M
?.?B1???O?S??E"?S?H)??T?
?*v?J}?E"?9???G??????? NT?r?)E?(O?R?|2?6?
e"???M)???B?T*uj~?'?`?Z?S
TS??'???)?J?N??
U(????
}Jr)J)??\R)"
r2?)?)QO?? ???
KR)?!?
{????S?>??x?d??UD???~?6?[I ??>?9C?*eOW?
?J!??R?q=h?\?]N??????Q.#??4?/??JtR
t?L?e R?<)
?~??Eh?t??????
??
UOE?j
??P>???????S?8S??YH?R?QH u??|)?)?,,R???~PR?}?AS??C?????(ETU? ?-?if????K-R?VYe?Y??Ye?Y??ie?Y??Ye?Y??Ye?Y??Ye?Y??Ye??f?ie?i?K4??4?M?Yf?,?f?Ye??Yf?Yf?if?Yf?if?Yf?if?K ?Q?RUV$U6?JmZ?-?SM?T??T?kT???,??M+Z?????kT???iU?R??)Z?4?j??j???J[Z???R?mT???ij?,?j?mZ???SJ??ekT?Z?4?j???M+Z?6?R?mT?m?iUe6???ZR??b
D?)?H"?b?Jmm)V????U????-m)?i???5?)mi?[K*?i?i??????U????M?????XR$QH?E"A?R$]i???*?i?????4)(?H??"?D?)-??V?J??m?4??????m4?ZR????4?????????VukJmZR????,??????m4?ZYV?M[M5m)??*$??"?@??*$??"?@? ??*???JkUJV??5?R???M??R??ikj??Z?-?R??????R??iV?4?Z??mSKkT???4?j?U?M-?SM?T???i?j???JV?Jm?SJ??MkT???i?j?kU4???m???(?
"?[M6?M-m?6??KUR??????j?K5Z??
D?(?????
???D?($H??V($	j???4?i???MkM5?,?i?kM6?4??????Z?M?Jj???V?D?
? <r??S?;S?>?]O??ob?S?>??+???1AY&SYJn!
?7\???K????
?e:iJ?%N


?"??????? /A?
!??H@?i?PTkkX?????` ?106?e? X??d?`???,D????c?f6?&f`???
??&f?
	?&???Fm?C3????00?1?24`?@4Y?
??2??d???c???`??5?l??0???fi?l???)?,[
?Z6dc2?3??Q??#li?Ccf0?????lX???3?6??[Af,clh-???#?fa?-??6?X1D????h???#6fm??`?f[?b?????(e?	?fX?3Q`??(???3lX?lm?E???e???b??X??cF?????6?b??,Qb??,X?b??,X?b??(?,lX?cb??5?,flh5?,QF?m?J???c2?#b??,X?c[,X?b??,X+`??,E?,X??X?b??,X????,X?b??,[,X?b??,X?clk?X???X??c&C6ec3ch???DX??4?????
?????+???[0???h?6????6,h??,[??	fi?6-?f?6?cF?????PA?B???b?V(??6????4????-??c??fal[????`???fAk?-???6a??[V&j31???????2?
??3h(?h?a?6"??l(?"?-?Y?`????Y???1???c[
?b1??bf,m?????F?ch??3lX???4?&6?cb,[b?mA?B??fb-?6e?b??6??
lV1??b(?6??????6?6-?E?c3m???QX?1?3lc??c??(??m?,V?`??6E?X??j1????????6e??Se?f0???Tb?cc2????b????L,??L?H???lcc???b??E?b???6????Dj"???E???0?&????X?j-?fl`?[?X?f-&?m?cfZ64b?4?(???m??6,m???[X?X??X????????f?????
lF6?Xf??,?m`?m?b??????l?????#h?b6?c??ml???lX??&??????V+?h1?5??lV+??#fk?V1?-??5?X?(?6&X?E?2?3?(??l?4k??ecDh?DF?1??F(?!
??&??4lh????fX??4a?6+24l-???fV6,Vf?Y?????lF?X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??4X?b??,X?b??,X?b??,X?b??#,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b?b??,X?b??,X?b??,X?b??,X????,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??(?S-?4X?b??,X????4X?b??,X?X?b??,X????4X?b??,X????",X?cE?,X?b??,X?cE?,h?b??2??,h?b??,X????,X?b??,X?b??-??-???cb??6(?1l?lb(??`?fk2???b???"?k?[3Y???,X??(??[?m??,m??-???fX?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,Qb??,X?b??,X?b??,h?b??,X?b??,X?!
b??,X?b?"??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??!
 ,X?b??
,h?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b?,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??4X?b??,X?b??,X?b??,X?cb??,X?b??,X?b?,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??,X?b??,X?b??(?b??,X?b??,X?b??4X?b??,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??4X?b??,X?b??,X?E?,X?b??,X?b??,X????,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X????,X?b??,X?b????,X?b??,X?b??,X????,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X???b??,X?b??,X?b?,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??1,X?b??,X?b??,X?b??,X?b??,X?b??,X?b?,X?b??,X?b??,X?b?,X?b??,X?b??*?
???F?0m?fi?X-?b???????DA?cl???1?b?E?1?c??c???5F(??f?????X??,b???6???mwQ???b?f???-2??????RZ*KEIh?6??h?e?f?RH?	@?#2A??L????fm?????#h??lU
R?D?
B?? PP
DJ?P?)m???{oU?_??~???9???n???U??,?#?????!??
??`CL?a??}?????i????H?0D4?UE?Y?6??lj?2?Z??p?%
???? ?









?? ?????sccnm?????6666????5?m??F????r????scE??"?????6??????snPm??A?6?????6?-??????r?X.\?\?`?r?r????????????r"????".\??r6?6??D^E??9????nk?r61????1y???5??4y\?(4ov??a{??w6??????7a??sv??????39??s3?a??k????????
????7w??????wpn?9?n?????9?n????
1F??E?b?&lkf??fF?1?lE????`?w{?[????1???b&Y1?
??E1?????3A?{?m???fb?,c@[?()?	?????30??????u?a??fQ? ?c?i??!??lZ6w[??E????
?F1c0?X?cc at m???l?`??Y?0h?0
o=?{?????????????????????????????????????????????????????????????????????????{?2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2????L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L?????""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1""1"???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???D???N??"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#!
2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"#2"???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???L???NtDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dDF"dD]???????????????????????????????????????????????????????????????????????????wtDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDb&DDgu??????????????????????????????????????????????????????????????????????z"""""""12"""""""12"""""""12"""""""12"""""""12"""""""1=?""""""""""""&DDDDDDDF"""""""""""""""&DDDDDDDF""""""""""""""!
"&DDDDDDDF"""""""""""""""&DDDDDDDF"""""""""""""""'?os^F5?b4?6!
 1???h?
??F??hf1?"a?a?A? ?b
??1fG=???1?????????|?s?.??bpE?9VT??^??????????!??V??????O??????A?U??5??]?????i??[??V??V?s?;??n?03???
lIla??l?bKc?Md+!YT?>[??v_?U??g??C"???!???!??p~??4??T ??C?Q?L??	?C?
?@<CT6Q??2C42??Hj???mUUUV?p????j???:!???b!???!?*9!??????C????????h~(j?c?H?!????????!!?????d?/????'????/??O??:???#y?2??;?[??G@???z[+????y??W??????????]???????~???????
 ??T%
K???I$??$?I./RI$?\^??I$??I$?Iqz?I$???$?I%??I$?K???I$??$?I./RI$?\^??I$??I$?Iqz?I$???$?Ii/??$?I./RI$?\^??I$??I$?Iqz?I$???$???K???I$??$?I./RI$?\^??I$??I-??Iqz?I$???$?I%??I$?K???I$??$?I./RI$??(????nR>????????du???c??????u?6?????o??o?\i?_u????`{	???????w??A?AN.eD?A|?w??A{?]?T?~?6????????r???B?O???m
?
?!?????/? ?B&???0/?bR??W???OU'??!?0??SY:?Hw?/4?5??
o'3??Z??&?????k0??????dHs??SH??v????rCX??CX??y??5??\A??w???N??|???u?;;??????NRo&S?^Y{?8??? ?cm2|?x9?[???????`u?H???W?`>????qk????07??;??
???{?g?????r??0 ?mq?0N??s)???????8LF?????y?YX?5??a2????gu:?P?-!?9?X?
?
?@y?&R???]a|?r??C9S)=?-?
?B?"HG??
?#??????H{q
????Xw??Si4?G??P?S????k?,`|??}??=?c){?????M????
=??d??Sx;?X:?7?#?8?A1?
?Ic??MgkL??????=g?;???
y}&\???G?g???6???:????????*??:??Nw????L?xQ?U?%2??8???U8??!
a?~?hM?Dx?S?Q?@?G???r??'??????????&????*w-"?
?iH:@?(?A???;??~?~?s<B!??&r:M?R	^A???=K?
?????O??FP?????a=???]eM?N??l;??u?
?\A??OeM?h?y??
?`L???s?
??3????C"r?????????q?oo(?b???p??????~??
???G?xMl??<?G???O|???u?
c(9?{??7?r?????._`LC??y??(??r?NcI
gY?y|???@m?
 ??2?O?`??]?,??2???`8????u? ?<k?^G???1?~?o
??;??s:V?<?=???????????m?:??5?8?S]??@8???e#?w?J? ??
=????@??g
??%{??{?y?n`3??	?!?0m} m?
???3???{?1g
???0??????Mg{?w?M??y? ;?(:???Y?^y7?4v??=????y????>??????N.'Y?>??cy?;??`;`<??&???S?:???0u?u???ZZ?t???c?~???l^e????s?????t??\??J?s?B?!?`????8?h
??H?
????nN??A?=a????m'?6?}ss??1&????2?????)Z?s=??x7??3????'v???????i{[Z?s	?x??q???q?{(?S?p's?Z??N????6??????3??]J??????n%
?}??o9?r??g'W?i??q????
o????z?}v?>???/??5?`?C?Y????O?C8??d7???3?X3????>?gy
?8??u???o?????]$?s?????S??;???luu????mOw\a?3??xx????E1K???<?>?,??ic,c?0?????6?e?$????L?G{?4????
??HG,`M???????F??A??????A?s\??hs??C?6??[??+?}?>??3???<??;???0u
?[a5????z?!??/??VXMp??{9?w??I?9?y#?9?5??>c??0?N?s??w?0?%?W????u?L?? ?E?~?!??0>?]s????n?Z4E??QTP??9"?y??=Ow?`?}??mc8O?3?????709?Z?P?e??r???Ocy??gi????_??4??#????:?Heey???x<????1????o?3????ok9???`7??\
?B?"???3??yu????M?gy??9;?'a?L???K?y`
n?	?sK??X??????uG?????k}???w?q?go
??N??????????>C?????|????e??B?&PF?}
?	?qyg????d<\?c99????2?9?io9s?9?Z???p]I???e?3??0???@i?{?H?4?
<? ?=?w??m??eb??<???m????v??>??v??!?t????????I?e?-0???)v?	??q ??9?}?
??Y?2??????~?[S????rN???_[??{?&?7gt%j{X??5Y?+???^}29??]e?&=??|???~?g??}]'?]?
z??W?????
P???q?$??~?~|_?:?{~}??3o{?9??&??????H??????sf?Hi!???H???
?Kli)i!????6??i!???Hi!???Hi!???QZ:????s?????k??e?){i???d????9???5?i??_7???j?7?????^?g?O?^?_??r?xjs?????3{?%%C??K?;???8P???????*????c?#Yz?T}?zDk??3u??F??F/?????|?1}jT??JRHi"?????i!???9????c?qi?i4??CZ??CI|4?iW?%'??????:?V??|?
6?WU$???r??9?s?
$4??C??H??;?H????m$4??CI
$4??[???d????????Y??D?e%-$4??CI
$4??CIz??hL?????i!???Hi!???Hi!??y?i?
bS+8u?:??x>???l???????X5?x???<??????=?bM"??s????T?????}?'?Y????P???2?'+?=??,???&?{yO,???9?c???4?????i1:??i?x??#?s????i?Z?:?g?^V7@
???*?q?{?u?????G`1??3?'h??X.???????8?b??i?
i!???Hi!???Hi!???Hi!??]??6c??
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
%??\@????Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!??r??s??rRR?R?CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$=??6s??
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
%??+?l?8i!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???HjZK??9??%%-%-$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??C??s?9?l?Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???9????s???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!?????ny??y?IKIKI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4????4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4????6s?4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$44???$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$?vs???s?4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??3?p?CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4???>?????????????CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI
$4??CI?9?l?9?Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!???Kg?9?l?8i!???Hi!???Hi!???Hi!???H!
i!???Hi!???Hi!???HkK?ss?ss?JJZJZHi!???Hi!???Hi!???Hi!???Hi!???Hi!???Hi!????????>?#??A??d??K?4??CI
$4??$4??CI
$5	
$4??CI
%I
$4??CI#???CI
$4????9???!??????Hi!???????Hi!??	!???Hi!?Hi!???Hk?????Hi!??s??s??rRR?R?C???CI
$4??$4??CI
$4?
$4??CI
$8I
$4??CI
BCI
$4??C??s?\
?????????Hi!??	!???Hi!?Hi!???Hi!???Hi!???Hi!???????Hi!?B?6??`?????	?????8k??p?8dLL?? ?????
?v
????A*????????nItT??n?w*U??G1??q???????q???AuAj????r?PJ?F?m?.?????m???]???n?w*U?n6?r?.?.?6?m?%?]PZ?m?m??T?Q??q???????q???AuAj????r?PJ?F?m?.?????m???]????????A*????????nItT??J?A*????????nItT??n?w*U??Q?6?r?.?.?6?m?%?]PZ?m?m??T?Q??q???????q???AuA?????w*U?n6?r?.?.?6?m?%?]PZ?m?m??T?Q??q???????q???AuA??????r?PJ?F?m?.?????m???]????????A*????????nItT?V?v??R?%P?q???auAuQ??m?.?????m?n?J??Y?Sz??]???F???$??Wm?m??*?U
7n9vTUn6???.?>?}????T?	T(?m???]P]Tm??rK????v?v??R?%P?q???auAuQ??m?.????Wxm?n?J??B????]???F???$??Wm?m??*?U
7n9vTUn6???.?-]????T?	T(?m???]P]Tm??rK????v?v??R?%V4s????auAuQ??m?.?????m?n?J??B????]???F???$???]??m??*?U
7n9vTUn6???.?-]????T?	T(?m???]P]Tm??rK???v??,?]P]P?q???auAuQ??m?.?????m?n?J??B????]???F???$??
?v
????A*????????nItT??n?w*U??G1??q???????q???AuAj????r?PJ?F?m?.?????m???]???n?w*U?n6?r?.?.?6?m?%?]PZ?m?m??T?Q??q???????q???AuA|+??????A*????????nItT??n?w*U?n6?r?.?.?6?m?%?]P??,*U?n6?r?.?.?6?m?%?]PZ?m?m??T??UuUV???????m???]????????A*????????nItT
?????T?Q??q???????q???AuAj????r?PJ?F?m?.?????m???]?V??n???T?Q??q???????q???AuAj????r?PJ?F?m?.?????m???]???????T?	T(?m???]P]Tm??rK????v?v??R?%VE;q???auAuQ??m?.?????m?n?J??B????]???F???$????m?m??*?U
7n9vTUn6???.?-]????T?	T(?m???]P]Tm??rK??????v??R?%P?q???auAuQ??m?.?????m?n?J??B????]???F???$??Wm?m??*?U
7n9vTUn6???.?-]????T?	U???????]P]Tm??rK????v?v??R?%P?q???auAuQ??m?.????Wm??n?J??B????]???F???$??Wm?m??*?U
7n9vTUn6???.?-]????T?	T(?m???]P]Tm??rK????v?v??R?%P?q???auAuQ??m?.??????i?r?PJ?F?m?.?????m???]????????A*??Q?6?r?.?.?6?m?%?]PZ?m?m??T?Q??q???????q???AuA?[?
	??????"?xS?<"??"?~???h?+h?c? ??" ??p??6????AxD?
?\???U???
2
???????9???<???o???"1?{?
?????Ys58:??|????{??]?o??<????kJ??t???????W?f??????\~??k%?)??-^??u???G????Z??>????{???v4}?Mk?|???u=QcZ??zg??[?}??L??5?)?g/w4Y?Ue}?=?V????????>????]?S?G?f?3?{rs?/?w??^?N???L??5]??|??[??7?[?
U???w???~g???'?w??}i?4??i??S?5??=?z?}?????????+?6??.,j??.?D?????{C?&8o???????U3??????w????c.?+k??W??P???[(???s?d?=c???u?[?5{??+?4?y???5?????T??<????G??-g??;?~????{?U%?^t}?G????f?G??g??]S??w?yy??k?]???????I????Z??s?w??Z?|????:?W??????y?%i?????k??????????L??>???n??????1?7_/???}???<?k?[9}?Z???W9??\s?]?U5?R?p??_$k???|D????????}???qC????????~??sL??^????Fm??x?G-????s?:?T?:[?c?m?????[??^s?????:?mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH?!
?F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??F??6???d??$mY#j?VH??G1j??????IUUUUT?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$???$?I$???$?I$?I$?I$?:????ew??5????????????_??Qb/?SE????+????C?'???9?????? d|6
???????6?F?2???????B???f?s]?~
O???w?w??_?g??X?x??|?|?u????Xz????????????A?@C?@D?E???????O???^?Q?Z???~?[?`??%_?n?????T????o????S?v?n????Z?n?w?3?Vr?R??o???7??????????????*?
?V{???s???????
????|???????????to???Vq1/_{?H?????^7?c./|k]??l??<?O?b???Z??^??????o?9?v?]n?w?kVu?=???%[?????\?R???[2_7???:X??~-???NGM^??q?b?Z?w/7?T?????%4?5?W?8????????j???u??4??3Z*V9??/oy?,?q????g?????????[C??G??w???t7U????9O??w?3???????s?W???t??o?}{?|?>?????g???s?M??o??????/H{?]???S???_Hk?3?iL????a??w??7z????fu?z}???VQ????<????S=????F?????z?????????C??z?m?????]?????p/O??v??8|U??????????*c??_?7?3???j????4??t9?u?~W????_[C????>?9????u?z???????D<???????O??z??????????k????????+?
?ruz?|5??????????~????S??w????K!?????????tz]u?s??+???Pdt/?f??9?m?<;?g???WU?g??2x?}??h?C~s?;??iG?S{??=o?????0?w?;8?>]???]??y?\????3~?jR????:?&99;^W?q?u?u?5O?8w~b???/????i?r??wj??????????:?{?6A0????5JUE+???i3?w????N??q??4z??IM??{?s3????s????U?a???I?????????!?f??G?????^???[??????9?T?????&?????[?!??S??U???S??{?T????|??????d?u6??q???x?h?j?f)i??/[??7??8??????|??o????Ny?i??x?x?QR??o}?????T?i{?{??{??3Gx???y?Z??_??w?H???_?Vjr?X?brwq?5?sL????????k????=v????????H7???1V?y??????g?????s??!
g???G???????Mo?]??7t?????cS??^???????????m???\??????
Z?(?>?????{}fw??.???9???Vk?c???????{??rW??X?2?O?4??????]bo?L???}????_.??Wn?"???$^w?)????aK??[n3?s??n?[??-??Ni?(?jF????=N?hu????}???????'?>??W?u+???o/????????+z?u?9?x'??q??O7?pP9???;??2?yd?????Gg?v?????b????????U??????J??_?>?????+f?n8?nB???n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q!
??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r!
 ?q???
???n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l0?K??7?
??q??q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r!
?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??J8??Q??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q!
??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??r!
 ?q???
???n7!??m???l,q??r?q??????n7!??m???l,q??r?q??????n7!??m???l,q??ry
 ??^c???F???????q?D????(?"??????(x?<?P????????
?@@??u?K?? ?Jqe?Y
?&7???)?????????V?????(.%?C??jNg?+[{?C?x?|???
iDC(@?QCXS?@?y??^0??
#????
??;???)I?!???"<????(
?
?"?s?"???r
???-*??	H<H?*4??X??
?R?
???	@?9?8??TB?A?D6?\?
P?o(?r+???????B+???	?#???????7?y??
4??A\?r?x???Pu?9A?Pr??SI9] ??1*???D?SXA`X81*P????Bk
???F?>???8[J7&????0??
?AJW??W??X??WI5?!C)???
??
?
??@???J:@??
m(??????L???EC?L?B?9?
??
?@??wui?	??
?*?0??=H?g(g!??XP?C?S?d?l?o#?o&??Bo/R????T05X
(
N5??-?????Xy?^,?x??ww
?????H?1?VEi??1?
?????:?oZ???8?????>s??z??}_wK??I?k??u??????%?-???Cm??{?1??dUP??????
??z???`
?Gw??y???ub?=??uM&??-???w???z??? 
JI$?I$NI?J??I)$?D???$.BJ??$1)#?H???$m?*??$??I?B?$??))#?J?$)rI$??$RI*???M?$?I*I?DIr*JH??I
JD???$$?(?#?H??)$??!%?I?9!IRH?!?H??I$?RII)?B???$rI*??JE$??$M?#m?6?I?.IrG$?I$D?	?B??7$rI?D???)?%$?H??7RH\?U&?IH??'$??!?IT??%$?H??'$??IRUI!IH??7$?I"nI	???I"rH\???b?~?S}??lw????@?g;v?k\?{?,??r)??R?????L}?1???}??}?A??u?u?=WvW?TJ?Uibw5?8??~?????>??ww??k??sy!?!?
	?0???"=??!???z4??Y?[?Y?=???7???D/????????{???U?0{???????z?w?j??
?7??,?5?[?S?Y?<?c?_?}??????g?'???? 6????p??[?^s[$?W??b????j?????	???Z?W???]??i???|??????OkY?????|??5??1??_9??D????;?m]??/u??\=??b??~?????Ot??K3??f??8(??{?????};?p^=??????w[???,???????u3?V=?????h?7 
???<?_??#~Dw?=?7y?:???????}?????)_???\?Y?????mKm????j?????????/c?<??????~?????????o?
?!?k?Kn?????{??s?????)d?jI*????7?	?{???TO????+9Zq??o?;?? 
??????;????}??2
T???????\?o?????/????<???5?j??5w?%??o??vIru?i?hz?5??B?F/?_o{????/~????/;?g???}???cyN???1?i5?>???
??5?
??o????????????w??!????3-}??"??\?????}?^??"z??iN??kS????????=?&??????????|?????K????iIs?Z??i$???????.*?_?????3??~??w3???9??|?????P#???%?$??3?a????????J??r???s??z??U?????7??{?4?%Khm?6?m?????k???????o?~d?3%w???????`?O?M?????s?2}??}|?w??????y?s??j????2z???}??????????????P???%t?*{ 

.??waW??
?
????????9??+3
?????1?????s??9?Y7m???????D???[??l????[z?(%????o<py?9x??u?(?w^{???^?????s?|s??[???G$$?CO????d??k?
?~???K?q??]?????????nI-??TnO?`c???~???????Y??s+?ky??I??M?]>???{??-????????8zYC8
???;j^?w??oR???'4??[????(F]v?H??3??+_?Ues:?s9?y????^s??s9?I&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?&L?&s?9?????2bfp?&dL?v?Ju???????????A??9???-??????<?y???}u?????C??B?s???????t????????????????~
?m?6?m
??q?cZ?/??9?????"5{??X.???8?M??z????m???W~q-O9?t7???{???????"Z???`c?o{KRM????$??y?O09???????c??????_?t??o??
??3???cm?1?[?j???I???I'??3?????c??	???C\?????*}????w?Z??f???jgZ??i???Db}???>?]???`[x?Im????	???K?w??
???$?????m???wv??G$?I*???R'$??#?.??????????Wa?
?Lvy?X
+_?{?\??j??????y???z??????x?1??'?????????6?^?y??~????e?i???i?MN???8?I?RBSy$??y&JIF???"RU5?z??$??m?T?????;???Uof???Q*??w???3w??w???ns???rs:?????U?0??%?k{?UOR8???&0?H??????
	*?#?r7$??)&?5????;??~???????/?kY???c9?m?6?m
??{???????????q??UrY???T??^??Kr7'?	n?)?$??J??d??X??}???y?{"??8??????
?;?y?.o???^?????*?1???+??(???Y???\??~_???[??``0
?T??(U
????
??
D??M???M6L??I$??JY???)%E(S`?IM??M?St?n?d??$?m??)*m?Zm??t?% R?SM??tR??)h@?;??????!???-R1????kZ???{?#[?u??W0?^l??~??i>q?q??k??v???LSu?JV?/ZF???uH?{X????{????C???r??Y?|?{Uo???v?>???9??d??r???N???*I?>}{?I???U?x????/_???-O???????ZUx?,???+s???????0??)??s/?????B???a?$?????uvLNA$?Fd?$??%$????,??K???]????????$???k?U???}?-5???G??o?|?uKR?hm?6?w???|?.????y?
?{?x?O??m?}?+\?????M???????k?w??????h
|o^u??I??]??T???o?g9?s??$??F/????
<??o|?????o.?o:*?E?N?@ ?K?d?y`TH?f
?Y$??2J???*??$???S???+x?9?????2?W?W???I%?
??6/:?b???
??*????,???k??\[
??y????]^qp??Z??{w??`*?30?qU^w???Vt?0
?k?w??fa?????0<?@V
E\?s?^?]?r?3??NU]?? ?????Y?yh??v??s33??
?? ??v?Wa??0?j?@

??????W??+g??V?????j?U??y???????g?T??{?Li?u???g?????_Ix?????^h???"??'??????Y?q???}0??7?\?Z??5??9?k??]?Z??q??b
??@?UQ??3????y?s??C??s???w`??&b.f
??]?p
?*??|????W??
??
?33?
?Z??Z?L
?,.?V?s/33333+?p;???33.?0?v?L??M??$??1).]??rH??$?M?RRI$??$rI????n?6??m?wh?w?]?wuNI??????e
tf`f
?eV=??z???3:?
Z????ZF??kt?Z??9??????%?n??%|???O75??b?W?$?????wfg?\
??5\????oy?zIn??Byo??z???CZsQ?*?<"???w#?3?}uZ???]og<=ka;???q7????2m?M?Wk4?8z???]?h???=???<?}s???'?m??e?:
T???~??y?????L??Z?t.?.?????W55zz?s??Y?O=snj??A????????~?????Yf???5?N22d??F?d??!?&L?4h?L?22d??F?d??!?&L?4h??:2d2d??F???&C&L?4h???2d2d??F???&C&L?4h???2d2d??F???&Fk??2kG?p???p?|7??$?I$?I$??c	$?I$?I$?I$?1?a$?I$?I$?I$??1?$?I$?I$?I$?X?1??I$?I$?I$?K?0?I$?I$?I$?Ic?I$?I$?I$?I,c?I$?I$?I$?I%?cI$?I$?I$?I$??a?{????{?z?Y???z:???c]c?g???}F???'??? ???W???~Ic??m??
?:??'?:_P??k????c+?4;????}T???????~???A?a?????????????????????????????????????????????????????????????????????????????????????????~?~?~????????$?7w`]??]??]?????.??.??1??v??S?A[m+??^?????????W?*??????!%W?u?]^?|p_;?5?????S??ZK????????????u????^}????????*z.????Uy?C?pmar?:????G???+??Y??^??7
??9????z?o???eN=O/R?k??w??_^?#???????????O?'??d??O?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?g?g?s??6??3??3<?=y??=?????:?r7?G????? ?Ei?j^>?9?q???E?????
??? ?^b????
???*?|?v?
?o
????3
?~
J?TR$??$?I	?Y?n?9wvd?'r???%S?YM??$?I$nH??U]??????:`]??
ww1?.fI%?
|??s?5?????`3$?II
?
????T?b?(
"?j?UT
?y?y????fb?*??{`f`
????;wx?????b?b
?
M?1??T|9?????v????g??b??';??m
???C??=???? {???$Q T?`<?xd?h??1N1?	 R??)?H??YQy??\?o?ig?????>???????z?
6?
Ib??m?
?0H?
??I-??f?[??6{??F??"U??i>?8?g??????????????W?}?????|n????"}&????<?d?[o??'
???
??g??????????~?^?W????h/m?????3y????g?\?K?y???k?:<??{??T??u???d?
?lF???g??3???????,??????)}r?Y?5???5??????g?S?d????{????????7??????g??u??>???:?????r??????Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
????'9?s??
?m??
X??xM???
?]?f,?
HH?N:1	?I$?G$9 ?$??CmHd???d?&?
??d??$6?
??v??m$?$6?
??i??N?$??!??m???$.E#l6Im?Ci??l6[-? ???$??d?H!??m???$$??%??m?m???$$??%??m?? ?6$??5D6?
??i??l6?I?a??m?M??a??Q$??tHm??l??
??d???A!l??
??d??M??e??nI"D?q?D?Hd?A#?	?H?R2b"?I?I???????(????qx???U?:?k[>c??????????k??g?s??w???::??e|Nq?W????????)+??%]????????}?s?@V?D?p	8?6?????m?c?~Hb??H??2Tx?????'??<y)+?J?U?^?g???????????$:??z?????|?hy???l
'N
i
l8?-?Z?	[`?'+
fHH
GX???py???|????.Vr??????\N??
?ts?*??j?g=MgZY???`0
?UUB?Mm^????AY?j?V?????[2????z??z?f?????pf?}?e??????}?TB????n?&?????Y???w?o?????z?zw}]sK????yHn?sT?<???`??]rV?????u?y?s????J[?RI?????s??o$??-f?Y??D?????D??h??z???F??{c2J?+??????d??kZ?~?@
a???U?7?|}????Vy5??????qgz???z{
?w\{Z???qMR??]}?^?SW?0?N{??gW?7[??ms???^*?}?]?????M??~p?G?eNw:r?)???ig??D? 
??&0
lm?m??l?UKQ???`Sm?
????%???$
??w$?&????y??h?F??c?????x_}???jD?n????o}?????+W??t???iN??k????|?i???????QQ?{zm?"?%7?,??aD?
????????*?x?%b?l??\??c?<?5????V6?{
??;?{?[EgJ?????????Cm?m?6?no{??1oa-?
Hc`RM?d??
-`??M?,??81@??$??s???).?]?\??$???v.???w|???]?G????wt
??`????
8UW????
???H$r?*?9)R	&A		?		#?	???Be##QQ??d?T?0?lI$$?PP?)RH?I$?I$HI?CDI?$r??A$?	$i(??
2I*I$H?I#?$????$?T?H$???G*I#??$?$?J4d?	$n"u$?	$$?P?d?T?'*H??I?\?D??E ?7$?Ci]?I\?j???$??%????$????A?'*H?mkZ??? ?C?????4?QY??w;tm?)J-??S??yu??X?8????Oq/N?U?8???u?|?=E??o??X???)?UiU?|^w????<-?R???I?9??
???G?E?????re??1?????U????%?Kw??~???B???`????n?????UUP
?~???????6{?????/?K??e?/?o?m?bQ?????

??'{j%?5[7?{q???.????
n??W?~??L?????z
"<?#???+?s????????
?'?1?????S?4?????g?w?;??x?G?1????+???~?}????????x?
??8??;]~??z{?2?????k?y?b??'?????Z7??6l??n8@
??t???]???j??.tn???????????
???-L???w??WY??{?????}??9?K_Z?m????????????\?M???
?y???33?????jc}M,??w????????!????z
???/?i??c??3????}?????3?????
{??{?????????>>2???C7??????w??????Z??@xxxx??????$???g%?&
??o?\x?
??????G??????>? ??eN??????????????????=??l??Y??h??[oy???=t?????7?ui??t??{?7|$?)?
9????(??t??Zqf`??-???#??<???????=?????k?=?????|%?~_?mKm????h??{????W<?gm??l?Qe?MQ?s"??
??????=mKm????hv????5?+?????iOjR?}?????d??
9l
o?5?}?????????a????<?1_??}?r???.??????ZF?????M????:??	 
<m?
$
 ??e?1?@?????????CH?O?	?Tra
U?P?u3C?P?????C??~?8??h???????5???????????Jr?k@???N?d+#?uX???????-9?wUTUQP?`07??|?_?h??V\???:??????a??S9????g?????P?????}gRVF?BM???u?_???5??n?????J??u9????k??X?o??A?{<??u?X?!,?4??????????5I?*?r"\??????$?C#6?????=??4???Z?Z?A??uks???\?sIg8?w?5?}??k\?????`=
--??c|???????????L]??W???>M+?f??k?"[???8$
??Is???$??	|??\??SkC?????s?\?r?Z??aV????O5?}?^R?=)?N,????\??U?;vmh??????L?????6_HNqmw}]o|?????x????<??\?????????	???u?????r?$??_/?S==g?Q?j??^?]?????Z???g]?=?^?&?9??p????????=?-??wR?]???f?J?*T?R?J?*T?R?J?*T?R?B?J?*T?R?f?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?o????x?^/??/t??,???????wv
wv
wvn??;?:*O?s?gf5h?V????.S?h??#????????[s????????HR??Cm??????????/?<?
?
 
)
???~p5?kH???S?e???I 
??
?????mKm??????$??{????
O?
??
????f????4??d?Ww????*?@^x
??|
(?J%R???R)R?IJIR	E$?U???T???T?T??@??T?AP'?>| ?????,u????@????>?I$?/???????y~???9nO?F3?;8???K6???=?8Q???QZ??	A/?J?]/N??q??}??u???@
ZM?I
??????????
C?R??F'|h&@
[????????z/k&s?jO??/oo????x?3Jm?????u???3?|?%???>??<???}???????z?2??Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???????hm?6?m
???Cm????hm?6?m
???Cm????hm?6?m
???A??9??
I
m?
?????U^UW?
?0?jJ??u?????R_?%V?_o??~w??z?R?_s*?-lsK???u???\3???*???
W??
?7v
[m
??K?????{?9??????kDDV???
??
7$
?<?
??
9l
(???
?RX?D?I???}{?s~k????=????^?1??w??w??H?hm?6?mZ????}?II/?Z???l?Ts'?[?
??%?I$??uE?
?3
????}???n????{?I$cu]5??j6IU?????????Z?'2?d??/-?^?1?
u?|p?????????z?7o????%?\?????C??;??<??????????@?J???Hx?$?
4O??Q?)???U#?
????d??l!	??b:??0!?!??????C4=?????????c??.2.???r???o{???u?_:?BH???*t?E?g?u?KM?
???_3?Z???t???V'??????????????%???nX????~\?Oo?/??3????y??O???q????`Lon???Y??J?Y???????%?.}?y??\?i?n??????e;?????5~E?w0?B3Y^???????e?8??jbV???/m??1Z,??_RO?&?>??$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?l?d?$?&?6I?M?3????~O?d???6??3?????kZ???G"1??^>?i?H??iOt??????}????????<???{????1????v????????G???g)q??m
???C??7???W~???JU?
H
??iY+$?iBd??O?*?J????b??}{??Dy}????
?????*|Ewn-bx?I
2S??m??i??m?[?m??m???A5E??uM?%??e??m??d?L??l??M??uM?%??e???m??h????m??m??m?2?L?$?[M??m??SL??m??m??m?$?-??M??l??RL?Im6?m??i6??d??m??-??m?I?[M?-??m??m??Sl?M?$???m???%??m??m????-?6?m??M??m????m??i?`z?A~????????????wng?1?`~?]?'??|?>????NLc?g:0?X????/mS??????]????????[?y??$?U?TSMQ??M???t?Z??4?????K?_???k???w??%[J????y???=?O:?W??y?M+?y??L?4?)????rJ???$????$??TB?uO8???}es?+?????k?????????u6?R?hm?6?????z6?iJF0?W??????*?J6?cY??'7u?Yg??g??Yk?????????~?$?}TQ?;?????q?????????????N\?h
?????????T??jT?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?*T?R?J?W?[????I`w`f????????3wv???U???z?'???_??Z??????#?6?9-er???3~Z????N???????m
?kZ???$??b?????}??2?H???`??)?g7w?y????2D?T?%?.??
_?%:2?1F?m??&Ix?
3??o;??s]?1?;_k>??O/TZ]?????????|{??"I&?%1I$???F?p$?I'?n??)?'I"z?3?q??{v???y????JD?i<u=?Y?{??{?o/?{???y??s???Ns???r?7U??j<??>?IN)????i+?;???????t?l?S??9?
)
?`?]??\?????C?????CU?
?????!????
{C????y?!?:C?TrC~j!?!????Z???6	?C!?G?C??
????(??P???>??ht????X4?`?I!?!??Q??9!????~?C?C?xCQ??B???	??9???/??gK????*??dm??g??6C7@=p?4Ct0?.???t???#??!r???f??0?
??	G!???7?	C??C??Q?
P}?^?d8CpC$$$?rBQ?C?=C?CT3C4?h!??D C??/?_?DP
UQ
?UUPRHIHD	$$?	 ?I ?	 ?I ? ?I ?VH$?H$?H$?H$?H$?H$?H$?I$?Y%I	%D?T!$?	 ?	$?	 ?	$?UH at d?Y%D?	 ?	$?	 ?	$?	 ?Hb?$?hU&U ?%D?bI?F!@?TbD!Q?&U?dQ? ?F?T?H$Q?P ?Fe?IaF?dRER?Fd
0???(+$?k!?B
?J?"RP??$HUQHSl

"?I!5?(	???H???TQ%@??T!"?T?????J?P%T@
??U
??CZ?4????6	??M?UF?-`hiBT
h
?R?
???*m???lH?-?
?
?T?x&??
E??Yf8???ws?a????
???Q??dDcY?c?????Q?cb?6?X??6f??#i,?f&)??F?
F4?d?66(?????m?[b?(???+A?5??F?6?`?fX?b1???6?b?????
?h??????l`?b???&V6#m???65????b????????`??????fV6Q???ch?-? ?5?ICcP#lV66???X?3????h?4V6?U?32?-3cc3c?A?`??-????????cb?
3&?m?i?a??5b?
?Z????[???c[
?h?+`?? ??c`???lcb?lV0l[?i?flE?
??Ql4X??lfE??F&ch????m?2f,Ej?-??h??ec?11?a???E??(??61A?6,X???[?lF???V-?ll1??3Ff?Y??bh?????64lh?Q?kca?k-???43,??6?-cF6,m???h??
?F4?`61b4?F??36??L???@E??)???????m?6f?lclF???b6?c162Q??+,X?b??5?????b????,cE???
3fjf???KL,???fV+b????h?????F?c???X?F?6??b?????,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b???
??#lX???F-F+,h??????????,X??cb,llX??lX??b?X??E??6,m??,X???h?lb#X?b?b,k???(????1b(??,lX????cb?F??(???????F
?#"+X????c[????????[???Q?m1?b????b????b????(??F?????"6???1cclb+c6,X??????64X??b???ccb?????Qc?lX?V?????????F????666"???6-?lF??"??b???b??cb????#F??????E?Dh??lX??4D[ccccb?,lDlF????E???F???,llX?cb???cE????,F?6-?cF???6,lX?6,E?#h?6!
?????cb4lDm`?E?6?E?V"?lD[b??m?m?661llm???b???(???????cb?????b(??+lF??(???b??664Eb6?lm?lA5??F"#b????E4h??6#b?????????4k??b?,[#b?lb1?1X?6(?Q?????????-?1?(???F?+m?(??1??[??E??cc??(????+"??lF?????F????"????#l[cch??lE?F???b??,X?b??,X?b??F?6,lX??[??b?l[b6??5?cc??j-?,lj#F?F#??,m?64b?c`?,h?????b?cb6+F??b????X??66-???,X?j#b?????,lX??66,X?,lX??c`?6(?Dj-??1?b???F?????cb65??cb???,lX??lEF????cE??h61?1?X??m?6#cb??????lF?F???F????-?b????"???V"???X??b???,F-???F??b#lh6"?l????E???cb???,lb
??""?1?lE???F??F???clV4lm??1??-?"??V#b???E?b????cc??F???6,lm??6,k???cm???,L?A?F???#?+?A???ccX???5???b??????,X????,X?lb???#?ccb?X??b?????b??,X??cb??,X???b??,X?b??,X?b??,mb??,X?cb???cclcccb64F???????c
?2?6???61Al??F((?cb??cA?6+3DlX1L?F6???m?l2??????b???ccL?+di??l(?e?2???64cl??6??[??e?5?F1?kb????6(?????
??cch64[m?S1X??6??[??[?Q??F?66??f?lh?????(?V1?e?[5?lL?4Ql???5???m?l64QllX?5?cE?lQY?4[?Al?b64cl?fm??[b(?"????f??4E?E??36?X??fVe?6?f`???"?-D[??"???+2??m??6??`?#l?fZe?X?b????`??m?Y??QE?b?4lli???F??S6???f?????Ze??k3E?[3Y?E?,X??X??fk3X-?llX?b????ce?V6(???X?b????l??"???DQ?`?e?EF5?"???"?[?[??",X?b??,k,X????6?l?`?`?DlP[?m??6-??-?l?1??cfm??,X????lQ?f?[???b???"?[?[??#b?-?????6,X?b?k?,X?2????4E?1?1?V+?+3E?lF??b??,X?cE?,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,h?b??,X?b??,X?b??4X?b??,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??4X?b??,X?b??,X????,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??b??,X?b??,X?b??,h?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?llh???`?DQf[2??&lX??5????(?b??`?e,X?b??,F?b??a??(?????F?,X?b??,X?b?QF?,cY???`?"?????f??b??Al?,X?b??4X?b??fk3X-?lX?"?[?-??(?!
,X??5????,EF-??????fk?l[?[3Y????,lQb?-??6?Q?l?`?
?l?fk2?[?m??6-??-???cb??6(?1l?lb(??`?fk2???b???"?k?[3Y???,X??(??[?m??,m??-???fX?b??,X?E?[?[?[?[F?Fd???2fL??3&d???2fL??3&d???2fL??i??-??-??-??-???DQEDQEDQEDQ6,X?b??66?QEDQEF6?l?f??3&d???2fL?3Y???f?(?"??b??,X"??(?"??(?"???l?l?l?l?lk3Y???f??2fL??3&jm??l?l?l?l?lb??(?"??(?"??(?"??,X?b??,X?cclEDQEDQEF-??-??-??-??-??-??-??-??-??-??-???3&d???2fL??lEDQEDQEDQEDQEb??,lQEDQEDQF?-??-??-??-??-??-??-??-??-??-?????f?5??d???2fL??6?`?`?`?`?`?`?`?`?`?`?
?EDQEDQF?,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??6,X?b??,X?b??,X?b??,X?b??,X?b??,X??b??,X?b??,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??,X????,X?b??5?,X?b??,X?b??66,X?b???,X?b??,X?b??,X?cE?,X?b??,X?b??,X?b??,X????,X?b??,X?b??,X?b??,X?lX?b??,X?b??,lX??X?b??,X????,X?b??,X?b??66,X?b??,h?b???b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??!
,X?cb??,X?b(?ccb??b??,X?b??,X?b??,X?b??,X?b??,X?b??,X!
 ?b??,X?
b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??,X?b??X?b??,X?b??,X??b??,X?b??,X?b??,X??ch???M????i????6?e?e?Y&Y&Y&Y&Y&Z?k#5m?V?eb????4??X?F?$V????d???-????&YL?m?????f???mY??
?`????5F?)??mM-`?b??V????SMh??4?hl?I?' ??{??[O??n9?7?y?????????3~???>???g??????g88?i???I?)9
?d?^j@??P???:M??3?3kV?.???3d??X?6?l?E?????6?!`??f#2#d??L?????dm??l"l<??]?4h??F?4k?\??\?4h?5?5?sF?s\??\??4V???b?s\??k?[??5?r????F??h??k?4k?????E??r??r?cF?????sm??n\????r?cF?\?cF?\??\?X??W,h?+????l[????F??h??k?4k??????F??h?4k?4k?5?^+????b?y??V?5??^5r??j-ck?????????v?nmsr????-?x?[????wpw\5??????:?b?o?p7w???????s3wpn???&s??o/n??mzxp??9?s3wpsv?????????n?
????sv?sr????N?3x??y????8?p7wfs???s???f????#y???????s???r""""""?DDDDDDDDDDG?[??"""""""""""""""""""""""?????????]??DDDDDDDDDDDDDDAw??y??<?1?vn?????m?x???x?????d???y????2""""""""""""""4F???<???[??G????6#3L?X??#??6#3L?X??#?????.E???x?DDDDDDDD???????????????""""""""""""""""""""""" ?????!
?DDDDDDDDDDDDDDDDDDDDDDDADDDDDDDE??DDDDDDDDDDDDDDDDDDDlDDDA6"6"""????????????????????????"""""""""""""""""#b"""" ??????????????????DDDDDDA2""???????????????????????""""""""""""""""""""""" ????????????????????????"""""""""""""""""""""""???"""""""'??DDlDDDDDDDDDDAwtDDDlDDDDDDDDDDDDDDDDDDDDDDDDA""""""""""""" ?????????????\?????????????"""""""""""""6""""""""" ????????????????????????""""""""""""DDlDDDDDDDD??DDA???????????????????""" ????????????????????????"""""""""""#b"""""&lX""66"?""""""""""""""""""""""???????????????????????""""""""""""""""""""""" ????r""""""""""""""dDDDDh""""""""""""""#"""""""6""??????PlF???d???D???f#&???m??????X? ???0F,fl???X ?????F?L?6,(??cn????F?????`???6,F???(???L???b"6#cb,l?bDlDDDL?cF1?clX?,c$?b??#`?c2?b6e?[???12?66?#cb???0lE?6"????D??????b,??"1?dcc!
fD?? ??f2??265?????&b"??X??+g.f??bd??2&X?64F?h????!
 L?f???m?
????c?c0???????lc
6a6,3ccb#a
???4?-??$?`???"2????0b?"#b#b6dDlF??llc??4b""?
#64h??6f??6)?F?-?b?E???????9?$?6&2???????"1cAb?A"?F??F?cb??Y?4??E??????X????2??3,b6#1?cb4F??F?F1b?cc`???2f???????4lDDl`????c?????????????F?lDl?V4lAb??m?X????L??"?bf???r??f366e??F??,,lX?`?fX???"1b?F?0F
????#b?"61???b",DDl???????`??,??`????6#fF?????3`???
??h?4llD????1F?d?E?l?b"(?
1??`?`???bf???lF????cc?nX(??????????cF???L?c6&Y???`?"3,?,?F????""6"?#l?DDA??666,b"#b"6#cfX??6 ?? ?`???????c1?F??f??????0?-?X??X?????????0???E?F??E?lF?"???
?b??#?b?M???6dDb????1?E??1?6,???F?lF??"????,l!????Y????c3b,?`??3d?4lX?4Ab4lX?4L?4?lll???"6""???F??A?
1?F?????E?cb,lPlb"?,L"1?????cbe?l#`??lQr??&1?,lE?,hc???b#DlDX???cb???????X?1a?cc`??h????A?1??f?3 ???b, ????lAfh???lL-?`??lF?X??3`?c0???l??(?fX??cF"6??6
???0??????????`?Y?6,m?2e?3x?61???#cb?lllDlA?f?f?lF??h??A?`?lh??????"?F??,E??ccDl?66"f??????" ?????lX?6""d???????cb""?????dX?(??Xe??c???F??"???l?3cb????$??6f??h?ccb6&lb?????4F??"6scb6,lX???,A6????66??cccc???????h?3`?????6#cb""3?f?DDDDb""???F?6"0F?DDDDDF?X?????????????????????????"""0DDDDb""#bdDDDDDFX?0??E??[1?
,?)eb?Se?m[V2f??c-??0m???he????:?~~_?|???NNi???~	??????I???~k???v???d???I????2|e????:??????????[?????k~???
'??=????^??o'+????????"<W???|I?????MG5????F?k???eP??h}??v????Q???~?uV??g?Z?>??r?A??qf??+?9y????8?s??K????7?m??cx??]>?+z?bo?i????3?????v???-?I?????;???? d??}?*???.??u????7?W?????r??0??5??{?n?H>??;???>???O??}??Ys?>w?????????K~O9u???a???????^v<?s?.FV{???????yU?c??=????dj??>?[???|???!z???kc^??;??P?w?M-?x???-??7?26Sp??1????????+?????????u???????G.3b?S???[?u??L^s????? ???;????%v??5?|7?{Q?????>
w???|?m??m??m???m??m??m??m???m?{???????????g??\v?????h?E?v_?oX?Q=?^???;?n6?k???o}??$?VW>?^?~J???Z?$?????G????????o?Wn????????r?#??b+???W????^g?
??_T?}?k2??=??????y??f#?n?k?????>!??m?ub????g?:???>?3??????o|??w?kp??{O7v??????s?t??mO??????{k???}???_????|S
???J~9????|??Y??q???????
?s]?????u?}{?}???l??Y|_G???q?????m?G?s?????????V?T??????5?????????s??}??/?????s?+^{???^r???q?????|???[n???V*V?8?aU/??????9??GW???K??Z?B?:J?????Q????v?|??T?U??????_??J?*?{??s>??;???x???????O??X???x|;j??u??^??????=???????????UTG???]?Y?a??w????.??????w??k?__/??????n5????4^oF&?#??\Yy???K?z??O{?????kV?U8??Z??]X?y?????5?????V??;T?=?}/??7}??Y??9?cCFW???Z??????r3?}???6?#???uf??T??}????\^}C????Wbc???&??oC>m[w?5??K?u???s?QY?-Y??^Su?|????mx????9??fA????m?]?{?????z????UT?`???-???y??V?N?g???qx???V???????o?i???m?]???>w?5????H[??|??????{???U\~????H??P??N??4??br??K{X?{y??\M5??+S?8j?`?j?4??U?Tf???k??v???s3ij?b9??Vs????b????r?K-?q??	??.n???];????+K^?gm?3??{pF??x?|l??{?h????+???Q???l?7*???Th?qY????~!xnt7}??c`??f+L?-s??Nk?Z????Y3tVR??T??KT???????B????'wx????9?c?H2Pf;????[?@d??????TR*#.??i$???XY????Hww?&h??`???YE?????Ws>??????V?V??/?uT?c???m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c!
???m?>?m??c???m?>?m??c???m?>?m??^??m?>?m??c???m?>?m??c???m?>?m??c???m?>?m??c???W???{??~?c?k?&M???%+?_??Ww-??c??z+??*j?Z??k5?jgg??g9V?>}???i/???s32?a??????^?Z???Y??;;=F#/???u??mV???????"?9?$?????ag%?Sl???????}?J?? ??wx2f?i?	+3?2d??b?1?$?w?&K?????9?s???:9b
.2??y?g??y?g??y]????,??=?3??<?3??u:?
?
?y??????X??<n{-?WV|????Td7??s????????}?g?^?????F??;????-o?c?InE?g??F???????t3????Dmg?f/;Z????????\S??)????:{(??3?1>W1?b
??O?????????????9=W+??y???y^\d???;???#???????.???w??????????K??y?r;?u?&?y*?(??y??Vk2?????^??????66bD??4J?-s??d5+}3:??tOvy|b?w???|???j?7??*???}|??R9?U\??????????=?????>??x?i???De????????W??????+??????3W1???Ho'?w??9\??ohmW}???c?????w??????????w?{?#?L?g?]=???W???7??%?1??V?^?9?/K?Y?6^?y???~??e???O?g;???X??????Ft????!?>????j???{:??hD?????[1;????Q?>g_z?m???y{??y???W]Zz???????=????????uGz.
???jO?????~????zw??wQT??r?Y?n??????|???OKA_y??>_?N????????Z?|o??v??c?s??u?I??=??????v????4????F?_??31}??}>2=?g7nkO?????}?:?&Z??R70?s?U??#-??_GX?v?O5????????????E7?G?/????{{?????T?;?"???????
d?y?s??????????L???U??T?X????b3??f?~3O???????c?3y??=?{?n?T?
??rw?wSg9??|???#}????_y?g????<?_?c.?U?????]?????????muGtl???W?X?????^d??x?5(???}[??|????w?u>s?]???????]??C???????????N?q?6w??=???,?93U?]?#:]??;??~>n??y?O?f???.???*???=???m??(}?-[?????/????W??<??sa?Gv?Y??:?h?u??vz?K?a??+?x???????7???C?9????U??z?v~?3???????>i??3???^~??(??3??^?2???v??4?|W?^]T?x??w???7x??&??????k??????)??}?nlv,V????T?z?}s?_??CFaC?{9?e?????V?=???v3OW?<V?s???k???>??????;c]?ar????????}]??????_.??9????}??E?>\y?N???	??k?|??y?5|???|???{??J???Q?0?S?5?vI??x?B??_??o?{??3?????x????????Td??wwW??????@4=?=??5~???ox?Z?]??w?'Tg?C.??g?9?????>DC}Y???sT??S????4??vS??????%???#9_'s??:????????????o?x??r?????iww?K?&?b??y?{?]f???#???m?1?&}????V???k???yE??;yO???5??=???W5????U????oS????tu??y.y????c~3????[}+oj?^??~??E?^??K7f}P????+/{??m?}s???K???_??w[?????z?m??.???e6??yM???So)????m?6??yM???So)????m?6??yM???So)????m?6??yM???So*
???=?i??G??_9???O???????~Oz????]?C=7???;U?.??_f)/b6???^j???{Z},???_^U?y???}??=????p+???x]?n?o???:^d????}?V?S?o????a??ev
`r?GE?m??(
????????/7~%W`r??{?Wz???????u????|?|???L^???G?=?Ur.s?????wN?Aj*???y???Wo?f?????J?3
?@6]6?u?d?$?x?Iq+)???_\?I.Q????????????^????????F?l???????]?????g[?ALY?2;8???????s3='?????	????^?F?WlY????<q2?Q+?:??y?fqg0?yY?I%e??
T?#70?k??P???^??????9?p?mM`I?
??X?A?&_jWW=)??y???>(L???u??]??D:???
U?:???8????f????-]Y????q????<??V??)?8~?(??t9??"=3
'?$?fk|?P???g??W????:??SJh??5?96>??t???,?7?95Z??????Ks!d%?9??AuE]UYv~??????K?Z???Um??i?}?.n?????l?>???]s??3?<??m??`
?????)???F?\?????????U){?N?sy?????*h<???????????*?~?L?m!B?B??ob".;???}???
{??N}?|?sN???????=?N???D$?{??|?C??????	*?y??????w?????=?tZ??:@UK?J?]?g???'?9?G>5??????Bo?b??(<?
nu?-??Pj??V?~?W??vx??_??????s.?_t??^?H}???3So)????m?6??yM???So+KK32?yM???So>~3fz[?W]?.g2p??K?
??O?|?z??B?I??+?v
???/+q?y??L?????'N?m???????????gw????Y????W????^!??5D??5Z???g?U?=??f??c??~^?:W?????W???????
u?w?l?dY??|yd??????k?U??????
?G%?#????Y=??_???s????k?i}?]??w?j??-?-?m??????s{???+?36?????s?u?*???J?)?uIR[u????k?+???Y?????&
??Y??i%?Gt?z????#?^?[)??????????Cm?j?
;?l?????f?w???????;?D???_
:??w[??_^^_?;??&???3?R?q??n?P??_u???X?N?D??=?~b}O?r?nik??R??-???rqea?R}@??.?t??????????m?z?W5??]??ng/?g?3k]??n?????-{????o{????R????/?????????*????????.???3:??)??c]t???.??J??j?3?R?%?N????????v????3????yW?/n?x???n??;?u#??f{?E???QF{?,:?>p?J?wow??h
??d??????^???&L??k<?1???jj???jj?<d\?`a??d??&???????????????5?&L?&I?$??2``gV?d?i?????C[[j??v?????a?4?2?i[	??d?2jML?``a??&L?2I?&L?2a?L?I?d?2e:i??????ML000?0?$??``ja??&I?&I?d?/smmmv?m??ki??C???
d?&L?2T??&L?2kkkkk?*???kk2L??a??0?0?S
6??yM???So)????m?7X?x?h????7???????So)????m?6??yO??????n?????m?6??yM???So)????m?6??yM???So)??!?
av??o)????m?6??yO??b?????`?m?m?????So)????m?6??yM???So)????m?6??yM???So)????m?6?????wM???So)????m?6??yM???So)????m?6??yM???So)????m?6??yM???So)`
??l[??P????'????>??%??4:????t1?[{??1R1coB??s??V??k\?d??%?5?n	g??k8???g???
?y
}?~?g9?
??9??9?c?2=61????Q?g8?|g????1?^bw?f?&n??4?1???\{?????????p????^??z.?ov??-?zm????9??????l?r?q??]?E???????##??????fL????	?z1???z1???:1?5??????FFp;??5??N-???sU}P?????@{?????
>y???????/o?vl?{|?:=????p??q??n2f?????^k<??e?6?????k)F??}?x"5/?i_<???}?==?o?}???Gq??z?_???n?{?????w???N???A???-z??/?h????y?????d????9????????????k_r???????????{O?????s?:[?????v?jw?y??]v9???]M???????R?????is77?2??k}&D/????/r9}??s??O???rTy?+oO????&n?n?????|?J????j??I$?I?z?$???????)j??^???S?9????m?????W}???}?????;???#<?G??g?<?8????s???|??3m|???-????Tj)???fV?/??rs????y????w???????_????U[??w?{?O?=T??v?S?\??ac?e?{x?????????^+Z?w+?????{????
wvI$?I$?I$?I$?I$?I???I$?I$?I$?I$?I$?L???I$?I$?I$?I$?I$?f???I$?I$?I$?I$?I$?7wd?I$?I$?I$?I?L?I$?g????I$?I$?I$?7wd?I$???$?I$?I$?I$???$?I&n??$?I$?I$?I3wvI$?I???I$?I$?I$?L???I$?f???I$?I$?I$?7wd?I$???$?I$?I$?I$???$?I&n??$?I$?I$?I3wvI$?I???I$?I$?I$?L???I$?f???I$?I$?I$?7wd?I$???$?I$?I$?I$????2?x?D????I.?]??????31I?]?d?I??]4?@?????????1cd\.???r.K??r^?p????????]????^?^??5p5??:???hcuc?hJ???}????p=????????\?-??{?8xC<?????|?4H+?Z?c#??_1???;???????????]??=?<?n????7?|??
?????+?b5?}'????????"2#"~?C?G?? D.ix_j5?.?B?I????}_c?????k???c?h?????Y?b???_?hGyM????'?/?D:?W????@?'8"?x?O?9?]???6???z?}J???c?????????????<}k?d
??u?W????fW?'??{??????U?????<?).????D??\?8????
?????????????$?i???#?}???_????H?t
?'????-F????y?!n????&?|??g?
???}B???{??zyy?#???9???js???h>?(??_`?~?????]b-??w?]?x????~??{??n?W????~???JL1i/???Q???c)??5??n?]?????8D????M?j???*?????8N*????&_???5F/=S?????????)??J???i,?Y?\????????s????X?J?????/?bX?
v?????b{}???]?u?<????dE????1?o?-[???n?????+?}.s????w????????I54W?}???}>a{????}*??????????????????????????????J?~?/?-?w???s?<?'?????????G???s???.5??^%??????????????[?_???L??^?L???|}q??z?5?????{?i?)?XG|??n>??9?h????S????P?v/??%??u?^????<?????????????????M/U?w??K.:?????c?&?
??&ZywO??T(?"????z?[!?5?=??g?|?^?/??kU*? ??????u??????S?X~?$??+,?~&???s?<???????y?`????\:kQ?{*?????Guu3????v-????~???G???????n;?_Z???N????{?|e?,n?7U?Qs????????=:??????Z?U?-?????[Uu:???w]?u?y3U*???m?_y???2?y??????{?Y?"!?????1N~???xy>L??>???]?,??}?iv????>???????:'?75_?y'?X?c?;?a???_ufm?k?Tsw?????[??uv;?yz??c???[W??????/?\DGec????C???????]<o>|?{O??\???.%????/_?::?r???~???:?/J??^??)??;?-??~3??????~c{?>stu>9?V?F??????]????(??G?b???w??&35?????w????fg?????=[ZJ'=R?O?V??0???v??}?)?????+?????????7u?y???Imjg???%I?????9Z????=i]Z?v+;???52?
]???L??MO????G?)Et?g???~j?$??w/?_}????>???'~??K????????(z?y2??RT?
;???(?_??J?R?R?T??X?kB?a???cF1?w??U???n??6j?s.???\???.?u???k?+?n?VHv?+?>_?u????????????2?????n?V??????????1?O8<?K?C?3P?n}?Nm?????4??7i`?bZ????f{9??5????g9vk???9??
?T??e%3:?DE?????^;?????O{?s?G??????Z|?>:??u?<}?>v??:1q???+??+???????,3??Y?%?_1?:??v????????????/?t'?o/??1?????7??????in?A`
?X+5?
???WM????>??S?u?_?S3|?|??at??c? ?????e??tY???q?????????~??8y}??C?????'???????????U??JwK??`?????k2?K?
	)???/3??~[??Tu}?{???E???L?????/.DG?fs? >???????x?????\_w
??~????ni? ?N?????-:?Zu?A?!C???<??D(?P????h?!s;??????#.????ln?X?n??v?o???????????g?Y?.x??	^?9??1?y????m^??+????+???I?O}??D{?w3?%Z???)??}??;??k?????%}2?g??_??R?y?}???k?n????	W?|]?~??????/?4?}???>?g????k????t???~???%d?
?????%*?0
????????	X
?x?????if????-KS??f?=?Mw??UW9S333;???_?
'???&???	?`pc}?~`P???`P???`wt?'T?=3=6;?8????<??????#????xlW?c?~??c?
?+c?cxDg???>/?*????G???_????X?X[?@??G????t|':???<????pc?'3??Qc??<????p5???
?o??03?e??P??!???b??0$c??l0;??M?k<?8?lcC???`k??Fw???????~9?w???f<?????????1?@???}|??>*??eoP????`z0,`????h??:??O?'D?q?l???m;_Z|S???O?????7?O/????}w??4?<?l???/>8??_?>t???^???syr?????xN???=1??O??~??????j?????O????@??yo?^????????????~????????r=3??
|???q??????????|S[?????2?4P????\Eu?{I?5N?????;
r?%)?????o??3s.?CK=?
=??W?P?:??5?c:?????sC?{[d@?a?L???q??B???YI-??vMQ5[??>|????)?N?????9??<UG???P???n??w?_?l???Wp
?	$?I$?IuP??;oC?????{????{?
??l.8Q?zGT??o?_w???#???oo???'????'?H????\{????W=????\S?9??t??6?????wo[e????{}1*'?3?[????#?3????	h?s\??????w??????????A??;???N????s:???Z????m?A3qy??????6?4? ?>+y??g?;??P??*?]^M-????E6$?I$???
???wp*???
fS????????{???????S^W??C??r?????vI#???^????$??g??{?$???^?'??I??:????? [??????????G?s?O<
Zl6m??y??
9????f?3UP?M6?a??K*i)i?e8m???H33-??MKa???a?-???f?$SA ?&?r?U0?t?iLIeA?T?
M?
&?l7-??n??7,??)JR?,?&?l3-?l9??N[?Iu
?UB?*m??j?a??S?-?A"?o9&ZSUA??6?a?M???N54?R.f[n??Ph:??l5M??r?a??Rl:a&?0f?E*IS-???$?a??6u?m??SH$t??%?R??e???l4?m??JiBA?m??????Y???RH*R??[2?$M?IRA????l??.?jZH$4?l:??l9I??d??T???A??H$4?l<?C?60?41???k????N;?^q??kAb(n???????u??????<????????????m-c??????D at sZ???nv?Z?????P
?u?n7|?UN?l?g???W?@W~????????????????h9???]k?
??t?we?G?X????<-?????v???{??Y?j?Vy??\??????)kR
Q\?iSI?3nwow5R?z?r??k# ?{4?????7??8?N?M?.oy????W??=?[?*vd?/:??<?4?-??7?s?oo????1W[?p?y5????n5?kU?????)@)-??\?m?+s?i???u\???????0?F????69w????2t8??{?\??????8???Z???{?7?-i???K?{?]??z???????9?;a?MU,?????^xy??ZZ$B?8???$??'?'?v)/???}???sq????I%?u??/z?y?=????<????:[??nZ?W?=???U?n???|Z~?
?^?T??N[?t?>~N???g?????{>?}????????;???Y??B[(?/?%"x?????G!D?j'??J:KH#?G?/???%	(??????? ? 6 at x?B?	$?D????m?Im??m??m??$??m???m??m?Km??m??m??$????m??m??Z??[???????@?B,!!??????????g??G?AA

(P?B??  ??
&&&bbf&H? ??6l???&D?
????$?(?%S7^?;v?{/#????\?q-s}??>,5X?
?fR6??}?r???<??/??|?y??r?i??a?x????l?xS1?~????G?.??9;?????m???Z?[???
3?Ns???K?_/????T?X??o?}??:?}?G?Oz???7?o{?}??Jk?3Nam?K???{??{????9?cq????*?'???/N?6P???*??Z?7?0?w?/????}V=?61{??????|?????????bn]A3
??{???iqry??w3P?^I"?IM*I%t?o?y?3????w?r?=??y?s??????_}?DU7?I&=?y?L???Q???g?????????<??zu?Pwb???t???U?M?
>??4bU?sUWm???????????w??????????7?c?;3s??X]??E?DD?????T??F???<?????????o`?D??b???0?8??u??y73???D?:???UZ???C????{??3??????faB?
9?e
f???7?N?????????_??????r
M{u?????M?
?i????[wUs????e?+?DV?\?5?v???????????s??c?D?n???3?+w?M7??4?qP?l*j??|????????U??c?????]?????;??????/s???J??$????w???.???Mi???-???)??PE{*??{???????o<6??z??????????}?????^??AV???&yi?o9??
??8X???
l??C?n?
???[?xffA
????fg??ly?ia@ D??X?j?bo{tU?]?5?>*?f?;????K??^,n??;l?ZDb?@??? G-E?2?:????????7????Y]?
?R?,x??'X???????8?b?s|??Km?[/
????7mv??U?M?^#??A7g17????w?6?U??r??u?Qj??
?f??k??
X???m88?fX???????\K0?
[??
?9?????????[m??`zn??No{??u???2???????e?!?j??o?'??m??
?????!UV,L??
???r???s\??7y????Te??E?6?MSB?:M???L?P?nov?g???R??	r????@??)?CZ?J\9??l8L?	????F???b?V,y?? ??????r?
?7m6r?"?c???rs??w??T??cj@??,n????V,N([.e???-?????????.o?
B/?l??/??Z?(\9?\?n???
-?
5??y????e????
"??(????5w.?????;r{??Sv??sTV}=fl$
Z?m??m??USt?I?m6?uR????uUM6?m??aI?wy?????????l??m?n[w?k???_k?\????m??F??<o?????U_X?WwS??????O9??M?'.?$[?.?????[???#?o??2u??M?&M?2??Rj?m&?a??f?I2Jm??????1qwww1?r?Zn???	&??%R???
sC?????????~????%?*???o6????Ek{??9???|?`N??|?j???????????Ny\C9?[???iko?AV?^??i??T?-V???o?\??O???????????Z??x???m??ZJ??IIs?13?o??&????k????Y?6rw??{?s??cX?s?????wz?9?ral8????|????????o:??????_?qq9??RF?6?:?'z??q??s??6???gGjf?*?iEFk????grlgM?d??oT???Q???W??u???Y.V??.?C?\y?kQ??6?V???? ????????o??????_]}?-\??<???-?y?s^{?9?;	
??$@AA
A

A@AA
A@A

??c?w?]G??[??o??n???<<???O?%???????G?Wu?Ww???????????2?5???Z?"w9,?eUW,???;!?????O??>,??9???[???$.s\3z?3|?
gqJf?!K???p??q?S?????{?}8?????30
?f
??
??
???	?
?{??<?/w#??7?W???s??i??u?noO?B?y<?UIs????S??w???8?v?Z???a??	??;??????;??z?^&??/?nDBUE??UIS/>T?=??q?q#?"?""??WvN????=Tv?w\>?^?E??K'???8?3?)/??i2??????~???????????y?4???????sl)?'?#?6?????]????~'??(k???Z?W?~,y??3x:????}u$????????|T?y?o*????c??oUT?5??6?m??}^R?-????A?6???
???i<???h??7?????i?
?=]???nLj??????X??s_X???K???+?g?+?????1?j?k???bI]?
,?%?[m????`TKn??USqDC??????W?????o?s??~m??r????w?[m??9??P?????I[??oCR???-&??I<?&??Q????????c?}?????sq?~??K+????B|????u??	6
m4?-?NZ?-??fZa][??8?}7wB???9??????N?Q=???4?r?Sl:i6RI'??m?2?????????Wz?
??~}DF??9W????&??5?/?k_?0I?
I-???Al?`6#6????U????$?????l???cZ]???)???f???;V??U6??-?U
$?.?r???\???l???6?f???R??JM$??????^k_???:????g_???|???>w??3??^???V??D;?????w?{}Q]?E?????]$?{?=?@DE?.|???s?{?/?i*?Z?????????$?e&????ZYI%p?$??$??:??w?KM??I?I??????t?m$????????I???VI?uv?fr???`|Wyn???{?eSZ?
?a???b@?k???D?yE?*?b???<??a7????????3aM?9???g??]??2r?l???h?Ux?7??7\?"?????@?9?(_??o'(!2?
??H\??9(??
URO-?-6s
%?e????iK?}m?r?
g7?=????????e?*?X?l???h?c?"?c??{??Y??Ej?X???7?X3|A
kZ?
??V,y?U
???Yu?<????B,w?D?(!?
x??Eb?????q???
y;????U?????????????oW?g????1?x?}?l????????R~???|??m??I??????m???n??6?!??????0???{??s{??$??
(P?T%
%
??u?y??$P(Q?y?(??Q?r( ?
:P?B?
 ? ? ?
(P?BP@B?	B??BP?  ?Jg???{9?D?
?s???? ?cy?q33??(8+??*????b?
?r?u^?o^????k3?o+?N?????P?N??x??_??m?]Y?GL?~?j3m??M?nv'1<???s???'2?k|??V????????v???????????+<?^{*9?e?????????PkW??w}:U;????7Y?k??s|??,?Gk??N:????^5:??????x?/???s????????N??0?
xu??`?!1?;???Co?????N%???0???u8?W??]?y?|
?G9??h??a??vws'/?????o&|?&g?0]?,?????g}7?>???????]???7??kuwv?X????s???~x???q
fh?v??????_?XJ??1?aw?x?Ww?v]a?8????$??Up??Z???%??????????????VN`bX[`$??d??7|E??????`????????9?j?am????.?K?b\J??????$?-??|i]?M,U?N$??wU?$?9"??E??fcN?:????3????r??'9x?)I$?%3??38??R?x?ch???bK
???IBIL??3*?????x???m]??????????q??ed??
??u??c?~???j?
NDDID?{?^???7?7?[????X?)??RIa<????\?mx???I%Ao2?34@??????;??U?1v
I>?????k???W????k???i-=k?<?{??T????f??A?.?w??k???]?_?rH39?G?s6??A?o?s?????6?????Y??V??Z???$???&]St???-&?DL?s&]7R?m??V???BI9u5M?i????s?'???1UZ????kZ?]????9~??;[????{??????ff??Y?9??uT????????-?????z??????????%?m??M??JV????U?4?n?Sm??t???????v1?8?Z??Z???V??N???m?IM???w?w??????C?????%??w???^~o???!Yn????`
EUT(c??f??n????????Fm?2????i???nT??Y?T???????www?[?wyU)]?I&?6????Qm????????7???????Z????y_U?>?_????????dH?|?nEx?f{???u??&???c????????~???|?%?fL?^{?
I???Hp
?<?kZ@d??n???'?k????d???N????&??????$??????'????????:??r?s???k? p *?X??U?5yj@????%y??Kc?3??? C=?'m??Z?
p??m??v??*????me??/8?????Z?????Z	????G??K?s"d'wy?W
?YN??
?Jb??r?b?s
?9??l:m??jfe??a??i?bSe?2???M?
???????A??
?.????6?a?m??$???0j?D?A??T?
6?a???e??-?M%L?????[a??h6?M???
??J?V???A.??(B??M?9???l@?}L????Tx?6?,o3J?g5 F?)?C?(?k??8]???6??"??e??#??;??U3y?,X?Z?(???????X???,}h?)?E?kZ?
?s9?????l!?2??7??y?2?????r?=l6??c?9?J?w?????E????Y?i??,X?Zn??s?9B??
>??'
?
[
Z?X?kNeq???1?????fB?\?7l?????4s??!?|?!?-???,X?E??????[x??3?Mf??M?p
??P(+$??K?k@
??$?I
?K	%?????????????????Z
?&??jI????h???$????n?`?}?aBI-?P	????$???
k3??E?MY???q????P?\??&?g????`00On??|L??u???9??".??V???Z?
??si$??o??$?TMW7?O?{???/????}???knv:?WZ??j???.r???
E?}?O??'??\]????#T?[???-]	2x??y???<?*?|???	?????f?sy#59??Oag????????????V??(?L?{6m??????c7U?c???Z???7???:9"?s????????k3hS??FZ
???????,???????????'?@
}6?J?ou?????y?:O?9???w?X???&?s\?????|??????4??[?????nr?7????S?%O?J?<???\??R?????Z?s?????j????zmn??_9??Z?j??e???7<Ja-??j?%M??????s???9???{oN???}R????]?]{??}(G???????%L??;:?????1{?a?s?@??@?n???fO??!??{??lllo+[??Nl+???Y?&=??bbc??iB??A?? ? ???; ?BP?)? ;?  ?(P?a(Q???P?F?
@@$?BP?b`????r8D????~???????!?E???F,b??? ?  ? ?  ?  ?? ?  ? ??
g????????????mkm????zT???I
???K????Ix?1v}???33??5?j.7?p???nO-)??_z?Gy?{??v??J???k?"+~{~???3?????+{?{?Og?y?A^??^;?wP_? 3kY{???e?fp??/????m??=?%J7???Rv}??y??7???z???????????&>?Q?xx?????]?Jx?y?????VI:??h??????r??jH*?????KJ??????UO>&???0?x????f?1?U?????=m?w??~{???]?s???????2
??J?3?K8?uu\1{??o??U	r?Z?n??,`??????YB???v?????V?o??K?????_}????`?.[???????????k?}?????W?)I*?????%?>9?uV???NOo?????????????3??n???m?siQA?2??????????W"P?f???0f?????Z???o{?????''o??v2b:??z<?t?z??YN???6??\V????w??yU???]UUUUQ`
?????f?????od???????oV??{{$?j^???Nh???o|?O<??sa???GV^?^?I/
eS??ws?~??????????{mN?T|????]?{?vI9??a????]??W?d???=?od????/{?$.l??{$?????s?IL?#????Mk;i????<?y??z/^?'??
???8g{?????oz??^??
J????!?`?k????H?7????????P?c??+=o???ov???[???????]?????*?DDs??P
"#???)K??M?3;{??I6^????.????G???%)J?Q?k??i6?"&T?e$??07?O{???
,X?2?9?q5???Zix???C???%???~kJ?[???,y?q?r??????c~???9?????Th???(???_}??1)&k32??Mh????-V,o
X???ur?9?????

? 5Ud??????{}??`

AAAA
?w?????T??j?4???j?????H???]??
??????
$?????I?8?Y$??+$????L?1???]?d?9Q?y$??Z??Iy???$?????&n?+$?????%?-A|?I<4?rn+?L?J'?w?	}9?~?O???}?&???l?	?g.4????>?j?.p???s?????_?x?g3b1?o???z?>i&oud?f-?/?y???I/8???s??I??*?I??????K?j?$??QVy????c?I??Y$?U?No??'>?u?h
?&fb??&???U?N]?$?AU?O<?k@?Iqx??&??E?@Z??'
? 
Kn??r0?.DO?????????????k??^l??RCom??????&?Ii???DB?q???o??????lV??????0???Z??
{??<?????P?.lcC?>???::??9??&``cj~?????1Q?????^y~??7y????????v!???P?B?C?=*???N?
?????zw?%?w??????_3?nU8o????|d?|?
? ?I8P$?4?<?O
ov??M?qE?M?

$?f?$????$?)j?????~?????~?<?????????k??????5??_?|	?8?

?%?8??&?8"?!??VI1??$???I.?[BI7?e
?????^?9?>???D???I??r??r??Fw???{???[???OqT????.???Y????z?7??u????>K??9?7?????CY?9[?$?<eM??nNV??9h?+??fje??@???=??????_/m?H??????????yj????nL6?U2&f?52N?ej?8?fr??;??????>???~???UUk?j??wu???????8.l??_j8????-g?9?Y?)???<???
gj?ms??f?s*T?????o,??[?C????!k??V6??????????#O9Pb%o9?Q???g
?|C?{???9?y;????Tst?<??9??TojF????-ROy?\P?3'Cz
??L??\?nXw?}?x/?K??
??{?6?Q?Hz?9\n?R?h?{??`????????{????:u?~??????????-6???c?|Oz?S?_$j??<?Ni
??s??kCz?^????????B?V??????s?k{?????{??:??s??{???????}%?k??R??G????S?2%???{?6]??Eoo???w?.,?^[t???t?S???#?~???g{y????~U???9?eL??^???? \?< ?
h?$7?y
?
.?&&&`P?L( ??)?r9??p??A?#?
??$@AA
A

f#g7>?:????bv?{7O?;?r??????'??;???^??s??????-?^vkqS??l??=?cO??NNt?^??<?????&?o?|??>%??~+??}????w??2{?=x???H??sP?j?~`????$??u?52?3??v?U???w?`?9?????o???}?*?[
??~????y9??????n????\???????~}????|?s??X??92?|?{\?2???6*????g?u?z?#??%3
g??????sw}???{?:???fi???(,?k31F?I????d?3X??Io7??L?r?2I????d?3??^3?<??????g5
???d?1?{??I?cj?$?op
d?x?E??[v*??og?y<???;??????,?}?j,??*?"i?+$??s?,?}??y????w???????l?{?7??X??yz?I_??E]??UQwE
?+?uWu???it??v??0
Apc??o?x?????????9?V??'??(?I?sj?$?QY$?U?B?2?$??? ???&??U|?y??9???$???I9QUd?Ud?7???'9?]j??
??'?W??$??pd??n(??6?U??g??+Y$?wm^2Is6???M}3???y'??Z??[?
??t???????????6?FUUPg#'J??lK\?&f??r?W?>]???????v?~n???y?y??KoN??$?]???s?Z?$?b???
?%????
?U?O????????|????wZ??D??????w??{????Tqc??;??w;?{?{???v??9????:??Q?g{;?GN,{?}?{???y???g{;?????ve:??w???????wF
??0??????gyt??9??=?z????????{:P:??]w??{????g{;??????|?8?=?;???????pGk??j????l?u?U?6?9? ???W??{s\?;;???pb????w??={???????V,{??????z}m??c???u?g{;?u?{;??\??=99???;?????u? |N?z/^?w???N???gs C???w??{?????w??lH??{;??????w???U??GQ????ZN?????@"?????s?????:C?/{;????Nw?s????C???U?{??sw?N???X?y???<]??????)?iN??YL??b???E?y??X?E JP"?7?m?-v?sS@???????(?b????5???
s?{???QE???yUuo2???????{????U??=??g{?q?{??????U????!???>z?X??u????????s/^?g{?Mu???tvw?
???gnw?X???{?????:w?????k???6w????U????b??G???g{???{;????9????/m	?w?????w?)????????<IB?JR??(K??JR??lC??c{????
?&?UY$?
?4??h
?$??[Ed?9?????cJ+$??
?!????'???%??VO'??}k?Y$?x??HUY$??*?I?b??Is|
?$???j?I?UVI.???I??v??&??-VI.?Y$?m??y<?s?VI9????!UUd??U?Oy?h?IC?wz?0<I}?????????
o???A2??)W???V*?V	u???M??[????N??wWzI:W|???\?t???&???L???oZ??Nl???&m?+$??*??{?*+$?`
???m?$J??Ntn?Y???
'y???3QD-EQ2I?????????<?`0?<?tj?L???b#9???2]:???c9????8?
(P?( !B???????? ???y??6og	? 
?<?}??VL?{?Wo1????b?
h??????w???599???<Y??Q{????1???+Z?X?I??_Ny?7?????<?W';?{?\?L??9?x??4?u??*???,'?/=?_qq??k]??=i???/??????F?^?k??y|7???q?'?=?$??h???y<?????f{????T??9??{????1?
1?

$????$??	$??	??_
@?L????Ml0I37?@?M???
eB?cW|?u?fw???????
Iyp
?n????~????|?^|???u????;??|??W8*
m??'9???ka??|??'?k3-??T?
gozg??9??????^4Y????w????????{S???????t??hv?????gz??/?S???gu?m???o{???u???g?Ug{;?o{???w??????gu?Qjw???????K??+???? e
?????+@??U?O?V)??^$n???Y?sbG?????????c??b:X?_`*37m?$R????Up??P??8Q??x*??|ZR?7?X???Up??^,`?X????JF?(E?}
r?l
??l
m??
?m?
???
4?BZ?z??I%>??????????????UUUUUUU??????????????_?U??????{??X??L?????z?@(P?
??%?A@AA@

A@AA
A@A

????V???O*'?}m??+???+???$??i%w??[???S;????-t???9w????|????+?9\?T?w???q???-??S	>?I}e?3)?????K??Y
?g7PVI=????
???y????{??+??I%?@	$??
????;?;?r???\?P$?F
I?k2?$?39?I&[?
???
???EZ?T @?9?
?????#x??kn
a???^\9???/???@[P?!???9Q????
??? G?4X?r?b???;?9j??5?ckR??p?????@?????5?<??l?????0],n?/;????p38?Yv???75?????m?qc???X?lOW????){??,9?
?????
??R,k5]?0?37??Y?8T?}?1x??i)???T?}\????:	?zqMn?H?57?t?????!???????*?????????????,]?*????}??^?2?\???B9???:?p?X??`q?q??e?
??z?????k???/??/u?z>g??? ?s3#2gc?1?	?????????????8???Y??/?9??o??+~?uR?DG.?????/?Nl???J???o=?{????~t????????
?M??
?m?
??l
m??
?o2??\_2o)W???zw????R
???[7-g7?9kcU?=U????vw???==>>q?M}?s?<??b???,??6???s?[?]??9?????????u??x?o?9w??g?f"????
???s??????????z?{???s{???@???+i8z??E??;??~?;?;????w?????????\{????_\?3;z/?y}??????????{?z?S?????????~???????????????W{?
~???f?w?j'??s????IL?)?fw??"9???????#?F??uA*{???u????i??BP?&&bbN?B?
??{3>k??#?a??
(I%???I@A
	O#??G8D???
(P?n(PAAA
%	@@A

%
?	B   ??
)?sf???	
#=??????^cx
Rf:o??#\?????xiO??w?K??Us?U??????Z?^
?]????&?[?g??cn???S???\???nk?????8?e??????w{9??M??????I???B-?n??q????D?L?
?y??????3????]??*|???Vk=G?E?u?Y?O?+c?????[6]?x?I??O?b???Z?w?9?o?M????St???5??]?5??????K??S???J????I)?*?S?Ym?y?sZ?x?}?kW???}????H9;fnnG?/??????y????x)W3????UL}S???????#=?b?W{.?????P]MLGA?^?d?o?|s6??G/????$?J??????]?
m???????
)Rl`l?q??<_???????9?????|??????????j????<?/???o6?Wc?GH??)'?v?????=?????kZ?>{??
F?M?
j?l
??o}???z?$X??m?S?u!?7?@??Wv??M?
?m6
???
i??1?q??1I????M?
}?k{??E????[??x????X???X?-??9?%?
????????????%?Wk?g?C
k???/3??IB?,6i???Z?X??s?4_???r??\???(??kNo????P6??@?[U??????3?? o??f????? Cx??????????E????^Z?X???6?,X???????cjMs2????X??Yl?r?k???GZ?1Q??????b? *??!??
}?=
?<?X?
b?_}??/???
+;???sll(@?oZ-??o?B?2?:??L!w??71??e?B?!?????b?b?m?
}??????
??6??c?l??X??B,\???}r?\N?????m?m6.???v??I???????@??e???-(}???n????[e???  ?X?z?A?????p?!7,X?hYw??}?
7???
??`?b??"?v?b?e?oZ??M?? C???9m?<?nL??}???{?o?F?T @??b??	
?Qx??????/=?l??-??Ab?Z???No{?;??!?-?Qb??.??\c?kNe3^?|0?w?V,Ne,F???s
??l
?m???M????Q??UK??????????????l???
T?FE?}?uT?
?/7???????w??c??3??U???js??5???b\Dc??"????VJW????????????I$?I]?????ff??V??y????s?????1^w????P??jo?MGg?
LD????O??????w??????8FC??WT?
V???bi?.??_?3???)?M?Dyi?J;k?gq????j???????????
??q{?I??=??????}???/9???jm??e/q?(??BI+????5]
?
M?
???W711????M?68?

?m??k+??????Z????!?)??j??[[?6m???
wT?'?X???????twd?

	?|]??UUUU??7??o???7c?z???????????~???C?5???q?????W?UK?w	o?M.????.P??ml52kd?
????f?????<??????????Wy????,y?|??f;????6????
???O?7??a?@,
Y
mm???u?K?m???,
???67?:???u?'?c??w??EN?????{?
???????~?fo??????{??>?m^o?}????]???7????????W4z?K?W?Q^o???k?????lK=???????jd6????n@-?????"???f6????o?????7?_???~?v?????-???f@
5i=QS??*t???~??%?? ?9?2??F????Sl
?q?m??*2?[??m??E8q???\\fFG????g?????c??g$/G?.???????k?{~?"r?????cS??m=?|??? /g?>Ng?TTq??_E6?m??yQQQ????**?vcl???????????_?zq?*?????I????????>w??Vu?F'z???%?????/y??8???????C?I????????UT????7??|?|?}??}??|
H>?n?C<?*?*=?????[m??
????J??9?g?U?7B?F$?????uUUuU332SSSSU5??X?2I 
??Q?Ufuo1q?"7GU?????.??m?
p??EE?&IDDG??~?x?+??c??????/???6?s????oZ??wFK???.y????@?	??n_????Hu]??T???[[[	?&`?
$?IUW??s?^??d??S??z}???)v??ao~?R^??N????k??IB????B?%??|?|?????3??SRkd???J?????V4??????????{??????U?????l??2????o'g?Mr?*~?}j?q2???G?P?&&*???m??
?w??L?>zo??????)??u?H??
@@$?BP?b`??G9?2BPAB?11110BQ?
LO?13$%A@A

AA@A
A@A
T?l
?n??
V?D.?	K;?n"!k??*?$?rB?C???????????:sUIL???IR?*R?I$f?iT?T??II???0
?U?P???W=????}?S????????-?/2?c?7?+?????????{?YQUX???b????
G???p?32?0}U?>??P3?
?w?6?j?}UM?v????c??yk?!\WJ???l)??M?>?6??:??1p?Z???????Uk???l??3=R:??E????X?
x?}????/??????{?Cf?????UX???='??fjvk?{?e???oW???=}??????~???n??uo5Em?
?????J?$?UT?Y???
6?%U,??K5UIL?$?e$?
??b???+a\SDl??\?K$?|????????N?;????r2b2??(???9w5??SY?k?.!? ?8??$?I%??x??w3>??ds{?|?????????k0???|???????UUm????ru?hLo??O0???l???????DN?????;zR??y?q5?;Qq?by??y???.?g).???)qqj?a\nQ??????????v7???{?,?.!Q???ual??F??r??[???n?o?5?75^??r?W?sY???????????&?l?do?????????u?j?|?[??|?'??????
H?Y|Y??9??lP|??y?BYo9????I?????????{?C8?w?y???^?\?????????*???y????k???o_??g???????_~????}????w?z_U;?????w?l???????+k???????????b?;??7??????????o?{?Z?Em?i]?Z???g;?x5???|{??w???????V?M????;2??{??vw}?{{??|4nYf??<I????G??AD? ?<Q*(??????L????:?; #?$#?D?P?B??
??r ??
( ? ? ? ?
?
(P?

A(P?(J$? !)?s{8p?	??? 
??o?}??Y?81?????i??{??fy?rfg33 ?1U	{?i#????????=?[?????{??-,y?R???????9?'Y?"!f#??w??W?}?????5????;???Y{?{??:?????b5?>s??s4????=}B??F?N?6?l?s]??Uqk?1?????>???y??w{??K??????????>??R?!??c
??6O5??ok??s2?r??>????<?.?
?c
3??y?im?Y?i???37???)?l'U???<m?F	)?3/?q?s337i$?URW3??r??.??????{/VD?j?K????zBOS$<qw???b?DDK??W|*?UR????!L????c?L1??????$?V?w??'?uT9wwWi
?i?R?QUUJ?RJf?$!)K????6{???;???/?o??????>n???.??m???L??Uo?????UW?$?!@C??.??dZ???{f???Y?s?UERY??S3I%2RQ
?,?????%9UI~??i'???????5I,?UH?I?1?	???K???????>V????~???|?W??O)4??}L?VJ????????Io{!{/Z??=MxQ3??i??l???y*?$?)(?I(?SJaUR??Ig32?UT??I/?
???'???*??y????????????H?1v????^?????V?K~?
S???)?????qwU3u^9?KZ?^?{???w?ox??????R?j?4?,??H?fR?5T?``6?l??K9???UT?$???I1?o??o?u7???5q??3U????}?WN?????`-u;?9?????O{??AUT??????????????7??JIQT?1?L?UT???JfURJ?K?
d??|?C??3??P???,)m??-@?Q@?????Ns?U??o???Ms??&oy?&o????Z????UE?????????U?}?*??UX????YpEY??Kl^[j?n?W\X??[r??U???

???I ?SIR?M*?2???T?Q4?	)?b?R??UU
j?(4?QSI???b?T??j?hD?H?5I?K55K&j?(????UB?MP???X]??41??c????F5????=??:??n?<??m???S???????~???w???????O??V?0?K????}????,?????????;????e-Pd" ??pL?~??????=?<oJ?V??gH?T?L?J?R?FR??T??$?Q?????
?????????m?????w??????????y????????st?r?nSm?Qi??sM???l?M??Jm??T???``MZWv???u
??%?pS??i&??``????c'?/?????????z??>UO!s?????DK?u-????UUT?U??{?r?????w@??????>h}_}???I?UI??m?Y??g-$???????tb?n2???01??V????o.Rn2?????q?t?Q????'?'?2?O??	?????|~>W???|~_/??
:??7
? ????????
M????{5?gggy?1?Q?Q?(  ???G#??G
.?@@Ga
??????}??fUUUUUUUw??j?~UUUUUW{?????????????UUUUUUU????????(I$?g^???:??Gj 
??~?&?f)$?2j????R?H?$??????????|?s???B???Ej????N1??????WwwuN??r???	?u??~??o???_\?o??q??+??????D??M*H???$?H??TM$?T??R??MU/???E??&RG%JJ?f?*I)4?O
???UU/???J?o)U$sU4?3*?UU$?*I?09????_q?_???????????r?o?L????????????I?.tQ~???????????????r???1??o?^??3*?T?$?U$fJ?eR???????I$?UUK??00T?IU%????fe)?I$?$?
T??T?
&j?FL??ST?9I(?T??????L??f?
M$????????????B???J?H#
UQ?T???I!??T?????Ad)I)??*??f??7??a?l?-
@?kv????@!???????o?
s???????s?s0am??m??@!??@???|???L?p??a?
?HUMR?????00*?????_??????8?????????n?"{?orO
?a???]w??u(H???? ???t?I^o?ffg??^B^?UUR?I%&J?$?J
I,?RK???e*?B?$?
cz???k??.^?KZ??<?1????;Y:??js??:?5yfw1?u2?y????????~???`0?????|?5u???ts??Zytd?u?r?s[?449???3333>????????oi 
???gU???????p]sT???6??7??5?????????W4b+V?j?Z??o?s??9??9??????\????<3;?????+nw???7/w?_?Z?????????u?4??<??????f/ke?oCR?y?k??????qS??t?\????????o[??>????????????kk?o??(?k??C?[??@
:???{?????|N??;??=??gT(P??s?LL%???PB??
@A? ???????J]?b}-B???/?
<?B??}
6@
(J
????????|{???\~??^w?_S?????-N?z???????ks?s???|?.??H??y9s7\?W?=???j|?-X?Qe??????G6??X??u?Y??5r??,w??.?????X?wXQ??k]W?????152.?-?o\?~??????l?/?,??7|?q???DC??F]????fv?????????/?<?'??~???c?-L?W?.?yQ^?T????U?A1??u?????d?#????
L?5UT?i$?
?`T?6?T??Q?E$??2???)1?
????}>x???c?k?'???$?????x??UUSw?{zp?l%}??6]??=??k?~.?????z?b'Q??????I$U$?d??%)f*?)SI#?T?J??T??01?M$??)(U2?R??D?$j??01??+?:?+???????w??R???1???K??f533???*??AU5????w??]?bJ????????UJJ?RJ??$bUR?*?SI$L%Hd?Jff??0)???T?JT?L?I%IEBI<`x_;???X??{?y??O??z6L???$?j?9e??W??+&m????e??}iX/?
??<?,?#???_US??$??
?D)f&RS2?*?U,?R?????
SJ"??????aM,???T?K?
RJ?$?e$??S*?YT?B?j?????
???s??s??x?Y?wE?????ih????w??,y?1?_3i@??"????????ec???v???1?m?[?e?[???.
?c}b?????1???E????V;????*?c}?4?q?????*s???y? |?i??`?<X???,|?@???0????jC>-?K+??X???????[W1]+?v?X????iZ,V)t,Vk??8UU?*?]}??yu???y?W`^??s/??NP?>?
?9Y?i??l???tg??????o{??U|???"/?<???????T??Tfj??SF*????FL?A555UU?
???Asv[???c??{???v?n??|??x??J????Z?????q?j????=?????????r???$Lm?V]66?h_/???Y~cQ???n???as???Yr?'q??ero???EI?TM?|0w??{wq(]???l?n???9?????9}?:?%N???K?j??cL??&i*?????n?????q????P????V??{?):???????2fKsO??V?&????2W??SWOk??3	??{@?qs9??St??x??mo{?am+?????E?=?z???tO#??????"?@????;??r???=?]'????????^\????]?Js?s??8\??zj???2??????
????????=?o???}???f??x??|??<?BX??s5X?KI>e??$?KNf?VZ{??????????)?;s??>ff?2?l
??l
??g?b??????i+????????*???%??6n??????hUM???7??S?y?????:????
I?
o|?E??W???1]?????y}?6??c?????U
X????c????y??Q??iEb??W??Ab?7@?E?[s?+?33?b?9?vp=
JI?????m'?I%Y??RUU'???7????]?T??x?????7?;?q?u]?9???}?r?y??$?q$?U^???n?|"s??B?
tT???G????t??nf]6???l??l?I?.???CM??SM???o?
??n6??????????-???\??????EY??????o???????????-S?m;=?{q;m???w??gm?W?5s3;?;???u?f?{?~?D?{?????????goC?q??s??????9?,??!?b???{??X?Y???{?5?mT?rI$?I9?$?I$?$?I$???I$?NrMH?i?T??By+?!
%
?
(I%
(P?B?
P?(P?B??BP?B?
J?	B??B??B?
(P?%?????vv1??????vw???????????{???P?;{{{oom?^??????{????{????{???I$?I$?I$?I/&y?w???????????????????w??:1??F#????j???Wg??????w?F&??@????????U?v????`?????b""b;?v9i]?????) 
???_[?W?/????s???q?C???????!??XH?q???(n??w???g???5a'&{\?z!?8???}????O?I??[??{??/FV?b?D?s?E??S3???:???y??k?oF???y?m?^2zN????%8?2????V??:}???????o2?Sk?G]s??sN__vk	?xB????u??wqZ?????>n_+??&??5?[?????yK??4?I)?o?;????T)??_????K?H?k?|?]%v	?	??v???)????,?1qq+??
qfFL??%???5?>??y?????P3???o
{8$??G?????????UKoWuM]?Ui?{??ho??s????????-??y??j9??3Z-	??`r?ht.??002????????5????w??g?y??????W2qb]$???%???h7S$???\\?????Gz??&N?9?^??C
f=????}{?]?TSs-Q?
|???U?+????????%$???];????y?n???i))$r?R???V1UM???UI$?JIfeRU???$$???n?V?UJO>}&?C7?W??}????I]??_???~w?????%??R?Nn????.?wYG^?:}??=???`???UU*I$?fRBT?`$?M$?Le?????`c32?`TU4?Q?RiU&1???l
i%**i???I%?J?$??bZM?U))??JL*IMJ??R?????Ng9?r??]?myi?????[?&p???!qi???????w}???T?<???\???kC?kq??:?????J?0U(??*??S?I#
??????JJ?*?~??UI?U$??$?T??I??<`w?k??S??????????S?u8?g??y???
L?/9?tp;??J?{??9??cm?m???K~?Z?y??'??{?)???-$??j??
??I9?
$???hI&e??y?v???????i??t??Q??ve?Si%I(????7?c?
2?T?	?L?????QdS`M"????(????D?,?`MI5E??j??Z?0&?2?IL	?L??SiI?-E0&)2?)L	?L??#h&Qi#iT??0&*?E??&?2?J??L??X
`L??E?L	?S(???YU0?MVUL??2???JSV??0??	L?Ja?&X)?De???I?)2?I??e?&?5j?????I?d?R5$??M4?5iU?=????|S?<?????>?rI2_?????)??M
#?>????>???????????l?????A???
Q*?[?t?????
x
:
$R?
R?<?9{{?)$??
 ?Y

??@
B??BJ?*R?IJ?)JU*R?*???

??D??
?EJ??
??R*
(EBAQ?D??P???~7vk???z??67h?
?'????4?p????YV?p\?Q????i????>??k??o????H?????t??????s'????w????????????o??X?M??????3kplG??????t???(^??8??g??_?"? B BRRRRRRRR`?IIIIII??IIIIIIIIIIIP?%OE?Q	?W???R"?K???g?S?D?XJ\???J5Y??Z?maa?(?LDB?*?????A????V?O???`??B
 ?b??,X?b??4X?b??,b?,X?b??,P
|?Qb??????????u?>??????/?k???Al?R??;?;
?????!?2\?(??6??p(v(x8?P??
??C??Z
?t?@
??T$?(~T+??	AB??
X?_??????~?nm?A+U*??2IR ?a?h ?$S(????!?DY0???DQ1
(?*"?1(??4F?QB??l?4?QB?BA?$???Di*d??AP$H`????M?0&?D?E??4?E
Rd?4??("$???? KB%?&64E?B)6???1?#X??lPBD?Q??F?)1?l?????b?l??j(?j)4A?PEl?l?+L?1??I`?(?2??#3Ib?T??,???[F???i6,#I????
ARL???E??????b?b?,I%?ME??4b?b,F?&LF??M??X?5F??&0& 1H??3b???????????EF?#??cAI?**f????E?k?FJKDRl?@@B
X?,QEA?(+0???F?c
+%?63lZM?mF?V,Y4c$Q	cE??$??-?????X?U#??*"???`??b???E-?V
dF???$????Q?F(M&?QAQ???E?6?F?E???????"?F??ATAlQBT!?(?I?F)1?,i-m%?"?????$?#b@?4j???M-?E?4h??X??F??I?*4QcE?"?E?-?bB?I?????"???c@m"???X??b?(?,lh??F?4lRh?h??`????F?(?Z@??H ?k%???T???????EF???,QF4RTQ??c`?["??2j5F??j*(?b+?ch?EF?I?m6????2V(????1h??????I???lTl?`?Y(?Z????MBj6+????0ERm"??6??Tm?cE?A?F??E,?"???j4b?F??#c%QF2h"?fh?+(?Q?"??f??h?BX?*6#????1h(??b???-??????????-?F
??$?D"TX??E?A?+?4??QY1??J
L??"????hDX???md1h?V(??X?D??b-?kF?V* ????cZ(?B?(?X???F???ccI?[Z2E??1Qj ?M?h???+ME?b)*+ch??,j1h?0??QF?2jH?*Tm?(64Q??L???,DZ????lIlV0A???b?h??AX??T6"?d???b???
m????i+CDQh0X??V???h?(?@!E???Tj?	?h?Z(?H?b???m????-F?h?&??Y???cQ??F?
?cb?Ti??E????4Qh4cF???6(?F(?????J	,ch??c??`?6Lh?b???????[3E?Z6??(???Di6MDh??EF????X$??????c?d?lj1?QRh1?h??6,I???J??,Z???h???6?65J?5??k1??be?X?h?????????F????j0EF????
?F6??1ITm?? Ph?0?F???QI?
?*Mm????h?6?IF??M?i4RZ6??h?-%?6M?i-????m(????(?"?Z6$?6???
?h?MEch*M??4Ai??h?b??EI???A?ZJ#E?J??F??Ic??Ih??X??E?,b?Dl?F?RT%A?,A?"??X???X?RcF?m(??&1Q??lmDTT&?????cd?4h?F?KDb??Z6??E%?????PZM??P`??h?EKIi-(?5	??j
?,?6?RZ4?m4X?b???6??i-IA?F,??F???i
??h?"?!??&??Qb,??ZM??F?c&?#b??DX??BllQ??mF?i
F?Z6?????A?j
?h??(??h??XK?E??,Qi6?Q??RX?h??L?????Pm?h?V6???m&???L,2j
?h?1?Qb?mX?d???%?V"?hME?h???b?4RX?E?"?h?(?I?jKJjMIh6?Ai2X?( ?-?X????6?jJ?l?F??PQI?E???h???h?X?6?6?	5TQ?h?m X??66??H?mEb?d?mh-X??(?
?h?)-F??E?5%a?RZ
?P&?b?3E&?i-??QcPDh??PmA??B?h?5?h-A?-)*???(?,Q??KF??B???1Pj(??V53h???h?m&?5%?*KF?h?MHZ+ ??h?I??X?h"??ZKj
?cch???c???mQi6???-&???(?mE?-$T??,?E??E?5??jdlb?????Qh???#cc&???#fh?EIQ???d?
	i0h?1?!?%????F?h??65lX??F?6?DTU??C,j(???`?#b1*?"???6(?$cA?
??5F??F???m?
i??Z1?&??5???A????(??h?5A?h5b?*6?55?lTk??R?h????+&??E??lF?C&????Tm?#b6??Q(???b1??(??P??l??b(??PTX?b??65???4F??be??QRX?cAI????	Eb???
5???Q????hMI`???J
h?1???k?F?H?-l?h
M?m#b??X???fF?4X????(??j?QQQ????? ?B1E?A?`?D?DD?i,l?i6??m6ME!Q&??%?I?06?X??E????X? M*4?"5?(??h??1F?4b??Q?b?4Q?F?4h??F?4h??F?4h??m
4F??X?c?(?b??????Q??+?MQ?E?F?E4h??F?4h??F?4h??F?h??E4h?F?(??F?4h??F?4h??E4h??E4h????F?4h?F?4h??F?4h??F?4Q?F?4Q?F?Y1??4h??F?4h?Q???lcc?5????56$???Qcc&??5?b?(4h??EM?h?4h?&???61?&???-&??6?A???*4h??F?4h??F?(?
Ah5???Pj
A?5???Pj
A?5??(???lcc????61?cclcc?ZKIi-&???Pj
A?4h??h???5%?????ZKIi-%??KIi-%?????ZKIi-%?????ZKIi-%???F????"?F?????5??6-&????Qc?ZM?EF?61???lcc???61???lcc???62lcc???61???lcc???61???lcc???61???lcc???61??H?mPj
A?5???Pj
A?5???Pj
A?5???Pj
A?5???Pj
A?5???Pj
A?5???Pj
A?5??(?-&?X??"?cF6-&??(??F???Pm??Qb?lccDTh????-%?????ZKIi-&?Th??F?4h??F?4h??F?4h??F?4h??F?4h????A?5%?4h??F?I????b????,h?????4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4X??F?4h??F?4h??F?4h??F?,h??F?4h??F?4h??F?4h??F?,h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?4h??F?F?4h??F?4h??F?4h??Q&61F?4h??ch???h??F?E???>????'????1!
?x!$?RX?F????TQQc&?+??l????b6?Y6(???-??J6f4T?E?QZ?[l?m????e??j?U*???M?f??F??T??YJ??-?e??5i?h??V???Y??Mb??*?l?m?YjKT?Z???Y??lm?6M-???????R??6V?,??V*??i?M?kSe??V?T??????D?b?j?lF??????X???M?Qe6????6??[)?TI?M?X5??#MiQ?*??
k+VI6m6?????5I????V#X??-??-?kElRU?Z????b??6?d?e?&???i5?6?6?ZE?lh??
$
??/??QQ?HR?F??????#4JL??kh?????W?UwUEQTUEQTUEW???EQU??UEW*?T[E?Ur??*?U??????????\?*???n[\?Ur??h???*??U??*??U??*?h???UEW6??*?W6??*?W6????U?W+E????kF???\?F???\?E\?sZ?????Tm??j?Tm??j??+E????V?EW-\???j????j????*?m??U????X?5???cX???5?c[???5?nksX?5???b???nk??5?nk????h??k?????U????wm\?Q?????RmW.??EE?L?RZ?????Q?,??
?$?Y$??I$?fI$?6??
r?????a;y?c?1?g?????3??0\?7??E??????]1s?1?K????79??K?".WH?r"?so3
?D`?d,XKD???D?cBIY#E?#JCb?IhH?t????d???$??E?d?h???PZ5
??
?
?????&?Db???bME?Dcd?Dfb1?D2j2A?F?51?"?Dh??d?F?b,D??M?6(?1????b)1??Q??L`?c?(?J
???(H??s!?E?,PX?(???I??i??dc????1??0
!bL ?RPl
Fe???m???(?@i*Z
E%??a@??u^HF??
J?2 ??bH?????d??5?\F?K???h??$6 ?H?4FN???,Y?T at Pb???DcL?D?`#?????h??,E??i?4cDi?)???{?$??d?X?1&?(??b??1Rc?v??
(?3I??$1?0D[4A?h????Dj,	H?,??1??A&j(?PQ!EF??R?*?]^i6??SI?Ch"??1)?????Db?eE2#F4Y??Y-??F"?B????AF?6(??F64HQ	F???`KF
4t?Y4?	DE?(???J1?,F?f??J,??W??A?!I??`?T??$??EF(?-??
?2PQQ????Id?fQDb?L$??t???1fT?2h4`??,?H?H??GNQ%I???LIl??IF0F?
?u?PF,Q$?
(#`?4???ch??q-K?b1`?E???2??c?3?w??h?lRf#d?(21?ZLF?(?6e?
K??iM?DFM?5??(?M???1?`?KH?,h??4?cIeQQE? ??HXL??b?d?H?QL ????d???#?%?3F?a-? ???#X?c????6(?%!?&?4Q?D?hMb?];,?X4L?lj4RQ$h
?-$?????t?FH???F(??6)
cb1?I#%??t????`?b???-b??f?F"4F????^% 6MI?)4???
1IA?h?60&?t??1?QF?h&!?
h?cAd??E$mt?LA?1
FD?
?I???ABa4F?	??%	?m3,?Rm$?"?`1DV$d?,??j??6@???DP%?4L?E??#+??*?2???"-0?Ib?(???CF?h?jmF4a4??!????
@1?L?-?)4IDd"?%?9y$L?
&???0X@????l65?I%??$?(??D
J*4A?????	FL?X??0F???(I???*1?61?J?`??#???d#?d??(???Q??c?4?6?+?F$?Qfh"4A`???F4 at Ir??L????\?i?1??cR??b
???Q??????
??P??Q???I?L?"???{?,?0Q?D??0Abw#?
M?E?)#!?t?4?-%?&?cAS*?PY"?6Ju???IX???0lRb?&??*H?5$K??y%i4S-h?lD*,?']nQA?T???E??QIDQ??c???$????6H??i&h?F"3&hf?(???6?%?(?1??v#FJ6J1b?cQ????AEA???Q5?P?F"?AQ?0?$?1??????1?
b53b?K??J1h?????;y?c?1?c??c?1?c?1?c?1?c?(?1?c?1?b?1?c?1?c?1?c?1?cc?1?c?1c?1?c?1?c?1?c?1?1?c?1?c??c?1?c?1?c?1?c??.c?1?c??c?1?c?1?c?1?c??1?c?1?X?1?.c?1?c?1?c?1?b?c?1?c?,c?1?c?1?c?1?c?1F1?c?1?c1?c?1?c?1?c?1?c??1?c?1??1?c?1?c?1?c?1?Q?c?1?c??c?1?c?1?c?1?c?(?1?c?1?b?1?c?1?c?1?c?9s?(?1?c?1?b?1?c?1?c?1?c?1?cc?1?c?1c?1?c?1?c?1?c?1?1?c?1?c??c?1?c?1?c?1?c??1?c?1?X?1?c?1?c?1?c?1?b?c?1?c?,c?1?c?1?c?1?c?1F1?c?1?c???1?c?1?c?1?c?1?Q?c?1?c??c?1?c?1?c?1?c?(?1?c?1?b?1?c?1?c?1?c?1?cc?1?c?1c?1?c?1?c?1?c?1?1?c?1?c??c?1?c?1?c?1?c??1?c?1?X?1?c?1?c?1?\?1?c??1?c?1?X?1?c?1?c?1?c?1?b?c?1?c?,c?1?c?1?c?1?c?1F1?c?1?c1?c?1?c?1?c?1?c??1?c?1??1?c?1?c?1?c?1?Q?!
c?1?c??c?1?c?1?c?1?c?(?1?c?wnc??c?1?c?1?c?1?c??1?c?1?X?1?c?1?c?1?c?1?b?c?1?c?,c?1?c?1?c?1?c?1F1?c?1?c1?c?1?c?1?c?1?c??1?c?1??1?c?1?c?1?c?1?Q?c?1?c??c?1?c?1???1?c?1???w??o???cF?????6?,v?X?c?(?0??##$?
???????0(~?P??CO????X(F?????F???!?(O?_?G????e????
P?? Q??sZ??????W-??5?j???6??????6????mmr?r??W5r???wu??.???????r???+t??wU]?\?r????t?
R1?>s?jVw??]?-?6?j{??j?v?F??o?|????O??k?????8?t????????????C????/???????9C???b'?P??
5??

B
?i??#"4' ?}??`9
????
C??
"TP????P??j?P???? ??fFFu ?P??	CaB??@?

P?1?nP?				C?(`??P?P??U??.??????[R?U????????????Ue?me?me?m%?*?Yj[Yj[Yj[ImJ?VZ??Z??Z??[R?U???????????V?f?mf??E??V???6?kF??j???[?T?ij?SX???A?-??[M?kF??kF???%h?i?????????l???m??mE??m??Y,?K%??d?Y,?K%??d?Y,?K%??d?l????5cm6?lm??lj?????[66??f?ZkF??f?mM?Q??????????*?V[*?V[-???l??f?MZ6m??Y?R??l??l?m??j?P???P??d
???x
????T=?D4
#_?>????-???(T??_???~??

?X??,(T??e at s?(_AB}M,"EC??J
}??T??????M???B?P?B???B??-?M
<O???/??S???i???BW??	aB???P???

?(S?,?(l(~?Cp?~????N((VAC?([F_???-k????
?_j.jG?;((?Pw+?????'?~?1?
34?	????(XP???(@P?J
??T?B???J???<
???????|V??z?pD?8(?Q??
??*??y???e

}TP???
xK??w?_H?
??????O?k???????k{]???3?
5n|?b-?5????x???8?}??4??[R?????_JP???0?????c???(??	????o??7I9???p???dF???&q??
<8?v?F?P????!???af??3N?}?*?Ev??m??Bv??%]?<????oU?)x!?????????l5????
??f??{?>?9l?}?%x??PolTz?j?Z?s?????i?o?????;???.y???{?'?=?w?X???i?lD}S?0????????[;}3??????????????=??2?O?T5???qxU??1??w?'?p?y??
[??????Py??\?5w?6P???C?o[T?
???'??S?????^~???)S"?kmWuM=?'?W?^.Q???!y?C?=?R?fB?/3???s^?
j?V?]?]]?W??S??????t???M?????????y%3?2???NI??p??
? ????5??F?L?????pp??c???]??!=?JTE5????>i??[\?+??t?#???%?F?;FS?dt??o?s
??}????????<?V???/?9??ea
]3>????o?????????[b3??x????K+????w:?o??>??m???syz?WY?U?w??[0*Ew?0?;??!yc???1??????]??_Yy??Q??T???g`F???Cjk???2&?\?????w*'c?M??????"????p?o???I??e???_o#?????f&F?y<??.}1????)???z?????~?F???r!.!_?Q?????(Hn????????k:[????G~????h????????;z2Y??<?g
????N??z?w7??\?]bX? ?y?)??????6??I??~PG?%8N??3????t??=i??
?k???d???????<L?????{????a??z?o?????/????p???e??B{T?????{?O?????:?3??yL?9??=5K????n???-?Yr?G?V???N?[2?y??0)	S?>??n??@w?~*t?????"?L?<?g\aC??????N?y??3?????ZkT>{????????[??O???>/#?}?D?/?(????x[?l<???\$?Fj??M??SL??U?????d=?g???_?|??????Q??$?{??*???^?w????U/???4??V????fm?ffffff?G'?d?s:F??]????y???_??6Z7????/wwu????ffp???
P?!++)??i??VVVs:?K{?
^e?kv?o??Z??(???=3=5:6666666666666????????????F??u??{??Yoj*_'????y5M?
""!??S?*?
h
?0t??	???c?'w???????5?q?i???/=?1&??c??@???F???@??1?<??)??gT?'w?m?+?/?:?C????gp?8?q]`i???q?C3YNJ?????7??-y?T??
??n?q+8?????Iy?w????h:L?1S?kKiM???bW|??V?????w?EGt?B????????????f/M0?L???;?w7??M&?8??y?H??P?8?D?Z i???)Y?y?X?s?????A??HWc?|??"??c?ZW?????????51R#<=???9^,??,??==??!?,~???[?U?L??G??????vj|??J?\[?Ky'??;???:??%[??p?z at t?w???1O?	w=?s?????s????:Z???????`]???y????N??#?!Rru`
/?8?Sn???=#???*?7??s)??$?
/???~?pJ?R????<9	??v?D?~)?}?m/_9??^ ??gY+????{??p??:W?Hi
??:????3?LC???s?P?????T?N?D?6???H???<@?J??`??X
???LG??????
?t?1??m?C??^!???
??a#|Psu?N????6?5?(g=k?8-^??x???J?]b!??. m?
M ?h(w
????q?\??V?gK??Na?4?b9????VZ?d???z?M??t???v??^3K?N!?k?5?????D????Cx_?3Z?v?M-??/P?:T??v?)??z?^hS3
7????U+^ji)??Q?wu?^?w?y??C3?KP?????+SxSNt?T?7???????????U?q?????=??[??o?????{??b??:E4????$-????j???W??????j??}l???:???Cr
b??_m?Bo
??o?5?uCxNh??c??/?}??kq???o???????{?W~R???olz
?]??????%???0_??^??>~Dt????%?? ?~??jG??^??.??Q??????GI9\y?r?V????I
cZ??{_YJ?~8??S\?1?+y?4?":f?4?g?5????5?7???Z??^?|??s??c?+?_?????K?P]?M=">???;????N??????F??R?#???h??w??[?s??S??=?????<?????}>??#\w?"?Z???p?|??
8?*]?pq????~??ZK??8?^*$?/y???r?????(?9?*????K???:?????s??{I?\?7
??]'???bHd????l?s\??<&??o
??W??_H??????e??r_???Q?Mqbu}l?????Pz??;??4?39???:5D]?s???????NL?W?]??3????=?b??????????????J???H\???VN???G?w???L??2?4wc????k????[G???=?oW?
?U????&?R?G??\~,??s?\?????????G+?}|%?g??
???=?K??u????????Yp??9?6?b?I9P?n'?????????d`M????Tc?`???)??@??{?n'??yy?hj]1Dt???$??::??h?;?oi??
?JNv????v?"jmD?/?C@???z????3????;P???U?53??|???????:?%~?????????8???L?o??46??C???????N?5???'????)???^'???S????1t???v?~?%?????w???p??X?]??Vz???????my????????oW?^?zX?90??p?$???x56??$n]???g??8|%???????????I{?j?\n??y?y??lg??=?g9???x??x??q??g?????
h?,{3?~??Q=??x???~??`v???n?{?8XHS??-???'??+?}?Q??????u)zm
??{k?I?s??R6?vR{??0?e?p??S{?h????/??~??;?%???'??z?sx??e)???59C??~~ ??I????I?????B???`?rL????f????6??c???N=*?w?????arS???????'_?Y?????xN??|"???s???s}?4?+9<[+;}???U]A??9??eYy?]Z?????{??92??????<?UP??DDV???n?ne???S33332??k??5UU????d??*fJ??W?????2^iy??'2?Y?u??]?(f`??/?????-?QG??\+??N??q?'???o????N}??"4??????8??;?????wt?????L???????^?9????0?D???<???E<???????EWQ?w?????????wv???l3??>?W??'?x\?Sc?Y?J?[?3?UwU[uU?UX?????????????V?4I??W?w?N
???S??z?W??%n??????i??3???
????????"~?W???a?x?ro?xEfy?y???'d??$??/w?Y?4?s=?I?M??(?c???cy???7??g?????????;?s???Z????X?z??i??B?f$n?&???8????????zD9?Pq???
\&?7	g??,?k???I?Z?R?Lh???~??a:?????;????W??Z?IU?/K]u?'9?o]?d~?	8U???G?g??)?.3????L?m7??????|??G[?????Cw??#z????7K???&???)???;?u??.?-?x??s*_?3Bj??z???s/?:?k?gJ???h^?g}=?Wz??!]???m??/v????|:?'=}?r??-?Yz~??L?78?>|?%L?:N??+a??'????,??H?We
???????|?V?aX?/	??tG?"???r?8??FY??w?:a}p???y????k???9?7J????5cs?O%???????{?W?Y?fJ?Gc?uH??;}Q?|?u8L??"??U???,?p???B5???'cy?z?w;<??.?w?]D?T#?/|}_L??e$?7???????'6r?????-}\?g3???]???#+p??sx8??#?K??,??????x??	xP:?m????>BOz3?T?_VE?3???U????70C????????5??{???O{????????p?z|?????/:?0?x????=8??b\z|?7??gH??6???t??_????i??,?C??y??dz???????7???&??_?#?=???Y????
?K?u?Bu????+7,?:??&???F??L???????u??7??3?u??????s:SY?"?~?3o?^~?BTGRxM???????*?n? ??#??W?n{?o?r??????8LS??C??S?+?{???? ???9?w9?7\?;y?3???=5??],?9?\??i????*?{m?[?~??"<???\?-r]??
????Su??H/N?tZT,?pe????v??;|'??ZW	?L?u>l??????N~m??M+8??????c??F?????ps???=}|?
????GQ{|?or??L???G?d??6????Ht?z?E<??ry\???g?8a%??HS?7??d??S??:????U??MM?w(}??::?q?t??-@?????	??G????q?E??J(%or????a??g?p????t???=?3r????????\Em???s?|???
??V	???#?Z?.p??r????f?+???v?[8????f?E?/"z9?y?z?.K'?????BZ?G^?u=?????/?r?R?"n^?I?}?u??G)x??e?????V!:E???]????s??{?(??p??????G7????p??7?Zf??<?Ns?\????)}??x4?,?d????????o-?j?(U???X?????
%hK?L???%?8??W?K)???	????????'?,?Gk???????)^???'????{=p}????w??>]?$???????????R?Ok?i????/?n>?GQ?=??>'?????o?g?q???R3???(?+M?????>??y}^??{???O???]X??D????7?????????????5? ?w?????S5?
.??H?O???O??????|?.S ?R3q???.??????[??|??Pu????w???[??d?^TOb????~???I?x?~t??k?{
??x^Z????<t?|??;E?5y????????l+???????k?????????3?????	?????~O?=??}???????2e???|+?w??%?y??>
?!???"?t???????x?Eby?U?c???~???k?:?????D??????	GB?VD?\???Al?x???????_????{??O?????:OH?.????@?r??~????Jc??B??9???~"?_??-??r??:?b
py???????=?4?v?UB??I?S?>:?yI????a????????p?;??6#'??h:m?:szVgO`Ge??>O??????????HI?7?{Y?y?????{lL?^??s#??&??o????.(z[???????6?u|???_?"#?????s2??<?7?V???8|tFEa<???Is?;E|?|^??#k?????9????$????c%3?G
?S{? 	??[ ??s?M??L?????m|?NR??g
2_
 ???????+?q????M~#?;??.q|???/??\??W?^?}?nWU?f??
????s?ng	?\?u?;?????+?g???.,?#??m??????z?b???/??E???1??5?6???W????N??/;????4??'.?q?????????HD??w?W=???-??=?~:???u?g?V|

6w??w??mw?.'1q???	??''????8???>?x??9??Op?K?t??]S??P???h{3??%?@?Q?u?w???%?????B>:?????\??j????<?q8g???~m?\Gx?z?B???,???<?~???v?=?4>???B??r??????^z?]?T?y^O#CQl]??????{????\\M?f?????????Z????+?v??-Ud?S+????E??U\?QwS???u?tuv???V??5R?	??h????,?e??e?Z70?).?????7???~nW+?????Am?????????;???s8@]??????u<.Y?A?q?_dY??p???a?m??^?6p?}??_o????t??
l???w??b????2o??;??Z?Z?{???Q,W???o.??}??T????Z????????V???????=V
,?7c?@r???w?gtzXk??zK?o???Zl??/]?seU??#n??Z??;?M>[{?:}?;f/C?
?l?=vp???2???j???z?GW?U??n??7??'Xe`??%??L?-????Z?????1z?LI?w??z????+I??S??V?R????^[Q~k??2??;??b?u?o??Qr?y?Ru?Y_???9?,???2?D{j?]K-?=???n??#<X???)z?i?EAT??>??i????s9???/?&^???z????c;???{???3?????qRh?=gs
;????76??=?|?JL??????e?????%/???5j;?|?/rk?U???R???
?{?dM
M|[?>?b????????y??????v????/???rm?r?????????????Y????[lz??g??????z?????,?w#????V?[17m?=Y?$)r?w?W+?;j@?B?????/????????]<=P^cM?V?Rqy?\?????vKk9??,?z?????b?????UKl4Py?;\??^??g32???vv???[?b?????????M?,?????WO?????W}??w??S??r?oGZ-??}z???+??J|,]???3???b?q?F?.*??`?P????_?n?zm8Y??I?n?E?E?}?Qd?P?????
?:}u?q?u]?*?Uz???.?/JT?{*S??F?????}g?????Z?????^n????E???F?[?Km^;???gszu??/!?:Y	?|3?~??????O???????]Q???tR?]K[?tM?xj?&?JY??=?gwg?|??|??II?'}??????k?b???[L4?]??????<???6?}???TjL?=y?)??^uu?	8oc??x????]???]OW&|??A]^sj???=`?????????18Y[??? !??\????2s9f?W|?m)??MUv???????uw?{?
??_????????N'p?Y}V=?3?]^?????zy??l#l{??,r'?n??w???V-??c??Tu]
u?7??????~??S??-?s?????s????jr???_>^?k????l?La?????s??g^^[?|??? ?x??/??U??G?J?Z??n??r???!goXZV???{????7??????????g#E?4??J????????U?g?s????T?~?m^?????~?wmm??????0?7??p???\???K??????f?????r?3?Wpm?????su?UF?3?/?z??	??;??
????G?Q$?ey<???u?tm?M???)y?P?;?X?O?????xd?}??z?y?zRhhg??????e?7?%s#??"r??H 5??c??)o???O?f?????E|%??a=W?c2?G%?????J??T????)??98?^F???M2?qa?????@?8[?????G???{0??U?G?Ac??????OMG???n???????;z?7<??19?=w;?s?=?{7v?'??????c??????ow??;I????h?y???9<'?H?????*g`??Y?????7+?~g??D]?U?'??!??O???R?B^?F???R??g5:Y?cS^<?j??ocw!}/?7????tV?u???'?3??B'~?E??'?`w??? w??G?kzy%???[???w]???^?%?w-96?F?<??S??p8??}?K^^
???d???32nfI?*fJ????3?I??d??&fff\?????d??*fJ???d??*fJ???d??*fv???vfgffyb????U?UYuU?U[uT3?wj??m?#??W????P:Y?T?DL at T??3%L?S2T??3%L?S2T?????B?P)R?T?BBBl<???2???i?
J?:???M???R?*?T?*?2??o?4?=m4?*T???J??7??M???MqR?KJ??J?*?(?C?;e?(?~?S]'???i??Z?Bi??4?k??x84??k?P??xY??s?!^??????2???B?i?????M6?B B?]?????UZ????*aJ?6?R1?m??4?m4??P?^pB,H#>!
6????@??LB B B B B B"?. Tz]B
B?2??J??*T??B
B
B
B
B
B
B
B
	??i??m??i????????t\@? LM
DBBBB
zMx?[?i????? @?#B?R?S*eJ?2?B F?M4?*ZT?J?(T?J?*R?JU*T??M4&?i??i??m?@!FZi??k)????lX???????k
:Bkt???i??j?*B?*T??J?(T?J?*R?J)R?
??R?JT?B?*W?????qqq5???&?Jj??R??*T?R?*P?J?(T?J?*R?J)R?
?(B?*!J?
?JT?B?*T?R?*P?J?(T?J?*R?J)R?
??R?JT?B?n??!agM?!??
???I??i????o?t)??bgj?R??WW
4?i?]&??????+?R?T?
6??@?BBi?T?J???]B????+s)???.&?j?@?@?@?@?@?@?@?@?@?@?@?@?@?@?@?@?J?2?T?S*eJ B B B B B B B B?i??M??m6? @? @? @? @? @? @? @? @? @? @? @? @? @? @? @? @? @? @??*IS+?????J????U???y?M???????
4?M??M6?M!!!!!!!!!!!!!!!!!!?R?J??*T??B
B
B
B
B
B
B
B
	??i??m??i???????????????kT??f?????[??R?+?*m9R?L??Ow?*q2?????O!??M4??R?UJ?!6?M????????*??Ty?U?J?????O??M??B1?R??M??P??@??????M????Zp?lX]?E?]??k9UJ?)?ZB???HMR?J?)R?
??R?JT?\\Mqqqq5???&?zYt?J???T?F)UR?&?T:?????d??f ??
???d??*fJ???d??*fJ???d??*fJ???d??*fJ???d???s?
???d??*fJ???d??*d??&b	??u3.?d??*fJ???d??*fJ???d??*fJ???d??*fJ????s?|????3%L?S2T??3%L?S2T??L?0IS2T??3%L?S2T??3%L?S2T??3%L?S2T??3%L?S2T???>s?|?2?f]L?S2T??3%L?S2TA3L?L?S2T??3%L?S2T??3%L?S2T??3%L?S2T??3%L?S2?s?9?p?d??*fJ???d??*fJ?&b	??ff]L???*fJ???d??*fJ???d??*fJ???d??*fJ???d??9~>s?|l???d??*fJ???d??*fI?&b	?$??*fJ???d??*fJ???d??*fJ???d??*fJ???d??*e?E??q?????u3%L?S2T??3%L?Q?A33%L?S2T??3%L?S2T??3%L?S2T??3%L?S2T??3%L????9?p?d??*fJ???d??*fJ?&b	??ff]L???*fJ???d??*fJ???d??*fJ???d??*fJ???d??9??s???2T??3%L?S2T??3%L?1?A3?3%L?S2T??3%L?S2T??3%L?S;??%{??36;?fU?????????.?2??n??????*]*Ug<?sY????Ls???s??9?r *fJ???d??(?K???r??k+/?
DD~??T??>c??R?????z?{??
????i??????2D?w??Py?|
e*?	R_??????UH&n??????Q????:????w??
??$?F?m?`??sD???z? @,
??????M??i? Q??^	??o???4?&??3?Y?c?M?????)L@??\*(.w%????~+%?XXT????????8q?m??|A!???6????T??:?????zjH???
??C7?????s
?&_h0/???k8?|?>???k3??7???&!{tqjlS?N5:.?"?uiX?C?6:????,kj?-?6??(??jG,Mg?lE?uy?x????@??5?1?s?!
d??.P?,??#j?l at 5?????Hb????P?@5??BT??l???V/?D?l??@0r:?C``l
?D;??
??.0???S5??Z?;ZW1??x??Y??Q ?&G??Pl%?R?@????S[p-a??????s?_H??J?|l?k???????'3??k??J?#?(;????r%??z?~22??8?C5sn?@1P
Q???????G???????y?i?Z??ZV??a?u?a?K?????:?C??11????'5?D?l???\$*/rw?c)??j??r=?5?rXj%?H?&31?????Lv?&?h?`
Qs;?4h???4;FB???x';??????X_?id????&??n??=??????n{{?X?5???#Yw>???$!Y??^??*??]??h???	???q?sm??ay?????+?
	?%oZp\
wL?*????B??vSK??f?z?Z?JI????5(???$?M?Fv=
"?B#?U??+7)d???????????S??!??93?6????D?d???e5???PqCq??Z%m???????T;J/C4
M?I?e???"?j??N?@??Zk??HHq???S??p??????? [;?\??N??Hc4
c@??hG?
?;?X at z??8`??V?a?????J??;??,P????K??????w?????f??D?K???H??1)
?JF?Hv?V?R??
?d?;b?!E;?!zo??A5??$??q^?5???%???@?KZ?)
mT????2????sa?L?U)F???4k]?k???ey+\?
?R4R?????G??EoK??S?Cgy

?????????~t?AQ"???????????	%??U`?I
??Lyo???^???????=???{?????'???????]???\4:????L???c??r?N?OE??*S?x???Z5,wI?Q????O?[x?m????"??+O??????.??I???9??Kt??A*k???#aWU5??u??k?m??8? [?=w?F??k]??(?M?Q1~??^VL	??g&??p?????O7???3???????8E??d?????fT???9>????.I8SSO???`???4<k????X????W?8?????iN?%a???s????e?HJ^?????LAmG??/
???L~?????Lgx~h??i?'3??j??(???)?g?,?;?wW????3?e??5l,????Q;???fr|?????????????W*?z?^?MS(?LT?+z?????Q?y?r^[???d????.???M?;????-?A????O ???(???
??opyNx\^~???l??FR1?Q???{??t?Ok/????????v??r???I5???Vc???????d??m?w|?}meI????:Gt?~????YNt???J??8F????^???AkjQ?x???|?Q?[?7P????U?fo?Lf~E??C???VA??5??l?Y??K?????????!?^??l?yZ??^{??h[?'9??b????^x??|ya???<?:??d?g?y?<?"9??????(???Y??[b??Rc?????]}]E??Il?	.?b??)?=??A|???[?T???u?b9??kz???S?1?+??M+????]???c:{?k
nhL?v??]???(??!?3?(F?P$W+??s????!?N[YKt????B8?????]5d??;X???uq?SR?-??????e-;?+h^??(????i??k\?^Ovr?z????y?Cu=d?M??v?=9?_?}a5??????????????[?Qk???d?:<qq??r?!{h????V0T|?e??!H???>?V?X?!
?b????s??n??p?Dz|??.???I?!{B?{+???lI???~????\%;???q??Ms?????b:PHSM??+D?^K?d???:???pLg??[?e?DY?O7{P?Lx???f:[??Z?fVoT0s?]?z7??i?????o???8*??_Z????YjM??h?#p?M?o9?e'?N??,j???2#=?a?????w??S?p?T?????~???m?{?v?;?f']?//5?????b?)?8N???\?`{???;6??!?[??U)@.?m?|nU????>?w??:?Hl????]???D{(?k?]???7?????LTw<^???
W,?[:3????j8?&}??)???P?TnQ?????1?@i??fVz??wO???]???????g????_?y?'4???5??X??m????_{????{?????m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m??????m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??o???m??~???m??m??m???!
???m????6?m??m??m???y??m??{???m??m??m?{?m??m???m??m??m??DOk(?!
 ???e??!?
{=f~?????@?
?
?c?:??9??
??!X??Xi
%/J?U?J???x5??M?*???P???(?p??G1)?Q5/Zc{?/xoJV?x???~D?????ku?z=^s?&??+??????9?(???v????y???+?8?#H?}?????N????qr#??i_=V??e???
?w?>??&}73?t>?????9?sv???????|???@
?????W?p???[?????{???????eq?W??=<6t??<????j??s?w?7???????????????J???z?7Q?	??5??_ ?
X???_?$%?>?|I_b?I???+??????????W%e>??mI{???y3?%???w??y??bE3??L???u)???AN?_b?Cs?/?
?8????Nw?Tn??J??}l?6p?????)?<?^??Q?!?f8??????u=??g~?s??r?o??????6~o?m~Z??{??????_Z??????SB???K?U???????i??i??S?[Bz/8??6??z???*?Sc}3r?3???}??D[$?/[g?Z3%??W??????W$P??U?jYW?????[mAx??f1"?+/]???[???j~~??r1????#?D}???tv??&??????Y?;`?%?b???jg?????{??df;?L^?{???#???f????????+?h??L?:|????o?I?O??k?2S?8???????d?Do???r???RL2z/?3??9???s?F??>?}o??????@??e
?3|]??z?f??z8s??w?r0??\9??????Z???????os[??@???6???Rv????????k??????G3??5??4=??"???VZ??b_???z?k?????A^C4??????*\?s??}?#X??n??Nm?????^Cu?=j?d??=??oYV?(i???w?????zx?_/??W1??????- ??_??????U+O?:????+???b?????
?1??????????x?_????????e????*?9,9??n???>O_???O????m???I1?;J???N?9?????????N?????f>?M?????`??[???7?7????X??????M?&???S??_(6????W??&v~?CA???????uK?^W.hM?>x??????Ji??Y????yf??&???w??6g?T???a`l?Z?????(??;{R???h=??;Ye?????5?5????ysN?+??us??9+?zd?UK?0?b`?m8d?F.?f????aSO??<?????B???R};????X??f?z?:?x??i
??cB??|?}??????U????S mL???K????i?????X???(?Q?}SFX???[??%1?~????>?g?-]???1|w$?Y??g?2??z?Z?[?k???\??????????+?n??k?9?y??aY|A?9??
\?b???F??+}$7??v?????????o?Vm??N|\?:??s?s?????J?????s???????????+{?O??|8????x??]t???av??????e?z;???]????????????K??& g_:?G??^????wo???s?y?V9l7=???_?Q??~?r???D??PH?h?*?Gp??k?????}y?Oh?_?8?'?????M?????bMxh?}?Fr0??}?:???;??M?????|&?G?WU?P?}Rq
??i?I??+`??????|?????x????z??X^L???8?I?????x???OJ??-1?gh?NO??B1?/j??|ZqsX?
V?x~???G	?y3??]???Z?zny?>?WU6D?qK??????K?j.?j??J;?7?kT??9?p??L?iZ??8_{??h6???L??3sj`$??Dk?d???_Z??&?y????z?D?????q?W??Ky?cJe?y%x??/????\v^??>
G??R?7'3??@X????u~yV?j^
??]QAk???/??6????Vi+gn?????Or?>??~????w??>??????d?Mp]???{
sPj?)R]??\??y!??????????J?V;y>F>c?????&???b78?
?~?b?w?v	?t?m????3????0*??Y^F?J?6d??g???????9Q?g?X???hO!???L??L??|?r???s????Q?WmF???=??-vf?o2????|?-?????_?]?1??b2>?|????{?f?>?A??ts]???~&8.E<K???-}t???S?_???"G?????qmr{?6><--???3@?z???F?R??|`?????T.k?%??w?*A?*????l??>m??ud?????????1????\?rJT3??!?????~?V[??<q????/?~?}????&?????Q!g??c??4???>??o'4?/??_
????"7?>k2????2el?????J?[??u?_i??+?~~????'??uW?????(Z[?wu?Es????{_R???=?????????;????c???wC?U|?(???3#w??K????'????Z?pf?1?}???\e#88?x??0J??	?h?
?|:???w??ZF?U??/?\D_
??:{?S???"??r^?]E\?_vo]i?>???I!whv?s???e?y??|6???~????~????}s?/PK?]R?w..?x?n~?ajxH'?{c????	?{?D???[????#?~????
?e??n??XI
?5??fw??nw	??3?}???3?u'?Z??????YL?cGN>???G??y???w?q?h|?(???????t;?Jxv??I??B
H???[
Uzg	?o?
[&@??0)???9Q?{??f?U;?g???{o]?e???(???????&?c???5LJ??I?ysI???d??UkD^H/}>8_}?*???g??`?g#.:??r??`??5???j?{???7????????m\k?7??T?G??????4?J??UW???s?{Y?T{??W???u[?D?9?M??????B?0+???U????/f1;? ??0
L}??I?q?????K??\????{jg????}F?z?7????X7??w??E?&sW!?????M??:F?????D??({??7????~Iwn???b;??b
I??fg?%'???y?>?4&??8?q??oZ(??j??j?2??????????\B?-??>??.y^???5f??wg??le?.??*?eL??????N?n_?????i>??k?m??p?
=?Yn??7?2??????}`0O????p-?&K?fKsM??P]4??W???)??~?Ht<W????????M~5???.Zw???c???:?c????<?1?????????5?????uOMM?1.??{b&v?F?.SxH?>S????z?3?????
?|?
???????
?|?
???????
?|?
???????
?|?
???????
?P??;?n&???:??P????e?;N?'?Ex
????A????~??~g?O^?6??'?Ye?C???-S?????{??hX??'??4??a#C????O?.????2d???{:4c?8 P????R??+m?s???J?r??~o?N?2z`??RG?Xq??aa?????v?xd???????u?t?????Eog?N~$?s??"?&??}D?f`??K??C0q?./?u&??f???B?}E??''????
|?????ko??)m3?O}hS???%?-?>^??|?0???g?}??
|
?$"
?@?d4
?S?
???x??b????
Eq???#?-?.wU????_C\?r?6?75??Di3:Pm1m)1$?4?^?	?H?f???? ???IzF?JB???j&?q1-?\E?MiCH&!?)?(bC?I6???h??? ??K?sz9??t??4??
@???? 6?X^Vm
m
?hZ?? ??0`?$?????$?D?I?1?c?I?
m
mD?%?6??Q?(6?f#?*^XAu?:C1?H?$
?1U?T?Qh?I?A???D$K@????R^:A?B??
?iX???1?A?k?hkDklQk?B?Gh?X???M???5?????X??????D?+??
??????@6?j????ch??h9?5????B????VD??T? k?I??HbR8??3
??X?@?&?
#XkA?i3H??"?3A?(^!?R?
`k!HM????
 k??!?17??7??]#?s|???&??M????x??????KA?R??w?.?JnB?y?
??7?? ?r&?7aho?Cy?7?m$7#?7??????w??M???7???7??w??H;????37?????wk????7?7?|Ny????i/?+?t?2Qt??iH?@6??#hka ??d?bL?M"b??m??u?@????6??mB@???6&??6??6?xi!?A5?"GH?i
?M X??P??$C>
4
Q,K?i?m??PL?fE4???)???l?;R?9???Boe/?H=#d??\?"_??????_???|g2w??2?4??????6???3??e?I?~?I?m??P,?.3<????E???{?[???,?")?????*'?a?'??r?RP:}??D?DM???5???????D8S????????+?_???V?????Jz??`Mg:?J??????{}??????b?>?Wgw?9Eg??5????????+=???E$????dJ??l??????M???&9?m2???F??S?6[nK??0???:??\??????8aYr?'??#-?-?t??$k??z???#??a5??sQ?3??,S%\???fYm_Q5=???P?P j?l?A?F??Db]??[???zy[(tT2?????z?Y?????e
%??"????J?5 ?.??6ek??ES%s?K?w?<??a??d??UY??H?l??;l?????l?<????%???6?Gfi]v??$>O?*?5???1???s?g??C
??y??-??????
gs3h
Z?-?V?X
Z????(Wj?????Nca?K?V??m?5-?nn?~?}T????W9Q`
???*
?R?s|?\?U????4P??wm?}?~??b?G?*??3-?4}?mf5;?m?l?t
?
?K?$?!3?*?^???N
?7^
?H
???m??M,?4,??o3m?[??8??-? ?!??`???????????r0?R?kf?l??-?`[H???]/PV?%?P(????MJ
&?"m?Wv@????
O?Q2d@?J?????w^?$????n????Nl???
?
u??P?n
^%?(~??Kg?>?C<q????Ms?????????
?	????j?????wW??????;?[k5{3?4?Y??n??&!?w$????N(?lM?j?\n=?ow_wL??Ks???Y*gZ?k??OQ"???)M?p?So-}.?????U???p??????10/??????U??????????E??Y??%?W$+Z??\?2?9??N5??y?^?c?)k??G3u?suK???r??????Nm????????CXS??????>???o??4~??3??f
???$j????a????[/}?-??~?Ek???4v???3Y5??/<?^????????
????????9??v???????l??]=s???Hc?;9???J?k?!]1N??A???}Y?
<??????z??%!
H
?A
?
???Y?m?????o????????0????}Z?4?V?l1?;????G=???mN????$??H:U6Y????z?S?
?\?????v?Q???8?;?L[??????=W7\??w_CM?6?4?zm?h
6??
?Rm6?m??i??????7???????M????M??$????w???????cqQj?&<?
9???L??e??l????????r???w?
??&
*q?<gm?[[M1??C?????[???`??y??y?vw??_?6k?^g?aT??D*J??U%kD*???T???J??R???h?)@*?????v?\9?|?????GG?q??J??????????M+d?????t????JH?0U;?zIU[??>?s????????D]o?h??k????*E?y??b*???M)?w??lC??L
?o?????m??????=	$?OI???k??c????H}
?Ic????7*?????v?????Y???c????	??3?Km????_??}?}??????^;T??DE<???TT?c???)???k??i??$"L?@*-M5?K`?f?{???h????q??u??????n?K(?|?%???|??y????????%)^?wx??Q1?/??????????=??@?
 ?Ax{?x
?????f*?<?"?3)T?????s?%???_??q?36??nU?-????r^??U??????????%!????>g???????
_?@????????K??????Ty?"x?V???^?L???Yn?U?`??U0.#Z??/n.fm?r".^??]"m?????????$??????????1?3??????????
)<I ???L??$??$?Ik?V?W???}???w????$
$O&?%12BH?$??2IL?2?v?I?%?h$?UM1H?H?B($?2?
jdQ)L$?S???i$?
.?L?()??H?2HIT^??RYm"+??z"??l???9&%?Q?P?$$BF??b???E'4??Qd?$?RA?!$?UK?PIT??SR????$???I;*4?LL?)=R?ROD?J&???( ?????R?IBH???(???!D?)???1)$?AME)Ib???J?
??????Tn?E?[n?^???[KU???Z????Em??????Z??Z?;k???_?o??w????L?FRt?IIeH??Q&e%????=??[E-??,???z?m?w??*???U??X??wE}?E??P?'('?Id?????H?
*??o????;??)_]?????w??[^??-V?Xu??V?A[d4
XUo]??????-E???
,????v???R???A[$R??Umh
????????`C??A?=?	?0??>H??A??#?DA?HtjC?A??Z?K??Q?N8V?
???????`??????m?d??hw??`???z?9??N??C?:T?K;?wd/??????)?V??*??*??
]?Vm????????o??????????i?????[W?1?m????P????f??~???}8??{?5????????/p??(?a:=??h?!?*2"#s?~U
?Z?????/8????I?^?
?>R???I|_???-?????d?+?1-??W?????IE??+d???2?~j?z?)???"?f???*?????
??4?^????????*3"s
???7(??6?9?>Ka?????J	W8pX"?"??]S??p[?I$?I$?I$?I2????w????????d`/?)???*&?I??7?j/2J????[??29?[&????*
?n???Fy?????}M?#-??5????X??fQ?;???'?n?{U??S?4g????m}f??????j?J?V(i??????[????Y???ZevDt9??n;????q??D????#-?n-??????????;?:?x???N?Tw'?
?H??,???IWL?????
3?4??u8???*?a??????
V?K?8?C?%jL<v?xs?g?S?????
?? ^?x??D;?KI?0?
$??

Y?VU??[?o5T6??o5T6??o5T6??o5T6??o5T6??o5T6??o5T6??o:?l?????it?????????????\???????_?'?e??????????|???\L????:?&??,????y?Jvk???6?^?V+?*??qm4{??["??QtTn-?>????T??3p??YP???5??ey?/+l?,??????wg3p?c?>?W??:????2Oh?C???U]
?%??8?)????)?3??q??>???7S=?n?w??He?P??[?G?????????w?????8f
Qcl^? LM?b<??'2s3&????i??hK??t???pK5e"?m5??E?{???N??U??"|?!?rVv ]?3-?DDu !???|?{??????-?????wJ?'??mwN?K?NW2};lv?L=?????
??t?m]?Ld??(ly????????
??????????6????????_?Oz:????E???9?9???}??
??????d???H
I?f?????G???a??Wv?UUT??ca?????o?B7?'?9?}Q??j5??w?[?.??Y?????oc?xg???9?\n"!?m?
?s=?j??o]???????O-U/?`?c?4*???X?06I??+????W?[?<y|????????s??????????,A??|}/?3`U??n??.X*???T??}????>|???~??c??uk?Q???T#WeR?I_s{-/?)
??X??w?m???O?<ZN?M??['????_????_??{?????5|?ff??>uy??	?U?j??kwe]?ie??B??%d??r???C??z:l??????{?
}?wc?.n??F??R??
?!??L? } ???????~?e?>?M?){???I!?d??#3 /?j????????7'?{?????]?UM6rHU???U???????6f]?|g??;?7?/{??>~3?/?HI??v?T??A6 ????.?J??~????O,K?????j?l?3L?"?7?m~?~?~??'v?w??_J+;?????X?\*?ZUU34/ss333>?????O?N?????4Ic?S?%-????\???>????o?+vC??m?-?t??????o???????d??v??u???????!?*l?K?{?S??UU6?
??l?iGK?Z?%*?????
???M &?????!
?Tc'(????:DjDj?\?B?K:?z?m??
??\e???CiHm?YJ?T?>dqC???$;??????r?D6?? f?#??
???f?t? `? B?@]#??t???![???]?ie?N{??????W??\????r[^?v?/t?????
???.}?FwJ????\t?]-??2??IA[]?;	oU[/Z?vR?Y?B?8?????P??!"
??????v?????v????????E??
v?]+ ?W???G?D>?$??"	"?G9_Z???eP????
?B?[U???Wv???a??9??)k^?/zV??oO
?????	$?????s9?x_????DNMr;??????????U?j`???`
QN????x??
?>?cTb?n?Xk??ED?O[6?n???????r?R?~^.??
??j?j??I;???|g?
?;?????K@
7
5u?TnCP?ALK??????0?DDDDDFu?N?v?????o?????
?/0:]?>????&x at h~
?;??????R?7??N?N;??Y[??z.?RY*??kx[?1???|x?g?;p?[x;???.J?y?? eZi?"?????3B;tK?*?R???o???Mo\gR???7?<???#!X?uZ?w??GCv????!q,?P?| ???????????.??;B????9???F???????wN?;T?Gu
?i?????T?(??2?*/L?[Z???Pn??{i4?]h?v???cejk???}?????3.???.?r??
??????0`?u??5??0?^e??p???????????(X?cx2??OJ@
A
?t??????)?V @Yr	?<?
?xTxo?Y??_?61????S???P???m*f?????J???{Hf??????G????Zzt??h?p
e$??b??jl?g??zr?KH?v??????????i?xJ??7????g*??rm:I?H?f????[r!e??S(?Y!??q$??E????????????M&??=???j??7w+???*??H:
y?K???$I.??Y?_??
??H
?l?u????-??y?":]??sm?-l????R????"u???`?Uk????:v??*X???N ???>?Fp?????M??+*?J.??
??>??S	?[_"?Ue?jvYv??	jn??]???V?+???S??&#??k?Cg1E?P??.?U??uW???[???V?????d-%??
+U? ?z??????B???Uk?Z????U?mF?t??z???Ud???)KV??V?4?R???????l?z??F?
??e??n?j????J??T-V??`?u??????j?????m5?1]???]8?Q
?N???{JUS?????C?????j???m???D???$??m6??V??!Y??????Km????e?`?]%`???K?eU?oUl????e??H??-?????????,?????k?
???^????^?V??u2???D
?x??UVR?Um????V?t??:???`+U}BR??????PR?'mUZh+U}%??????T?mNWN.?c/Z?x?????????K9?T.?????[f?m?j?7?U????_JK?????mCD?w???z???
N.?t?-z?
???xq?M?y??N??|??]?L7y?R??????????f??=??tU???fN|b>????_????'?>??=?????????-{??@??q???}ji????k???_???Rd???\F??3n"DLD`????
???h~$??a????Kl#?Y?~~?`?v~?????????Fi????w??z?t???g?k,??
??{&'???	?j?swwvffb"!?D	??
?wz?vI??????????g????z?????C???_?p??K"???m?$????????????/K?r/?].????????????x~}???2?UUL7UT???[???	)????/?,Y?????("??j??"?fJ9?I???g?}??
?{???/{?l~?UGw???????????s9?c{??????[??e?
??v??WUE-Uv?'w?????Pv?????V??.??KYj????R??4,??"]???u???j??Z?|j??.?[?$V?\?Z?)??^????T?????U??m?Q?Z????WzDK#?YB??Z?V??U])e\???.??k?W'[*??]j?-??????????C?????U-?n
??mT?w?jr???????cC4e-f!v:???????5e?Rk?/? ?2?????k&?"^V?????%>?T?W?$????[_%=*W???f???`PFM*$?V??g>vh???33?-'/???<??`?????yy?wxtwma?n???5	?#??S 
JJJJJI?JJI? @?
???8???????????:????(??
?=?N?L?w	??oo?????????r?uX]_e?????Dd"
???3????71q??)o?dE?B?????M??b]?L????????#?[V+?^=q(?/T
??>%$????I????$??Ns?s
P?|?_???gJ?????u?{??o{???q;??f?Y???3?r? (
(?z+R&Y0??_?#???<e?????zV???U]?^UU at W??Www?* ????[1(?y????V?}qb????1Y??[m???}??o??X?m?}??KRY?????????Z??+j?]H?[-?[U??x-?T?mU>{"9hV?D>`??@???Z?????;U??Z?B?j??*?? U??[er??wm????????rEE_(2???????GUW????$k???J??-?????i???
Y?amn??Uc?Z?
?
???k?M????????mUw&?????+?????P?j?????u;`?@@?D9
?[?$d?


I
?rJ#????4? 
D?}?g?{??)$@?mI+@?U,?1^
???????7??2??6??r??JZ?S9?g1???""f??y??????y??_/|UC??n??UA??"#?;??#??{?$P?ZY? ?%?1????wv?
?????<k?y'?Fx!??y????V?{????@??Z?
??7	??????3?SF?YK???????W2?%I??=,?L??E??5?KK?F???????^?e*?D??fF?+]???*??!'Y`i?	????w?L{????m&??<u?Q?gWE???????cd=(?G??T?u??w)us)Y?]?Ov?+?C??d3?
?{}'?v?w?H???-?????w}?|??N1md???V?|l??$?
?c:?"?[p?g?US??X
?w??????'???zC????iJ??.&Z?6(k??w??8	?@$$$$~5??QB:8s?)??P}'????
u??R?-.?RU{3??@o{??I@
???}?
?.y:Yx~L;???k\w????3.???
????/Ej??[?{????j?:??]?"
 ??E??U??*|?{dj ?8\6?z?????+?
???-??U?????U???;??u?	JZ???p2?|&?.J????CA??????h&???p1??|	??x????M???B???cbB???
?#??g????&d?l?????_?>Z??????????b?^?????????????????????r??????W?<??RU????2q????Z??C,?356?_?S??/??
,9???y??
?/t?k{???=???_???????/?????" Dk??JJE4}??s???S
???_????????(??a
??7O????W?u??{??/???m?`
R@ 

W???????
0
?dx\B4??H??$?L?,M?1bY?"Y%???{???"?h?;?I??I????^?|???n??U???TZ!????uP?N??:?FU??????k?w????i]??L?j???????<I?d???????]I\bZZ1,????
D??z1?H_???.????{?????/Q???Y+$??I-	mX??b??m?@J??K?{??K?
b????	)D?yU^J?'??\{?_~}~????????Q~:?}?????v???w&??[?????u8?\??
`
?????????|{??DH+????&??u?5?"?U-U=?R.[_?'Z?C?U??&?????M1l????
*?	-v?"?pq}???????3??a???T?,jbEc???.?.????\Jww7f??????z???!O`??F??|@??.b?"
????	?
{/<?2BK????-r??cnu????3ed<`??????a??
D??K?30
 ?9??D	?r	
??zO??%?? q??#??6P:g???5Suj?\??f?:sC???{;[R?H?????c4,k???????????3f{
????Kw35?9???+?3?6?r???????????????K?	J?????????RR?
AIILC?????((???8p?????????8p?????????8p???????2?1??????xh?\X??6??????v
???]])???r-?Y!Y'?????$??'????zl?{|B??4W{??v=??S]_#?????z???x=B?}???V????/OCO?8?v?v?o?????z????????????k}Md#????H?!:???1\??{?^pq?;1?7'??=?)Mc;???3K???"gsR{?kV??cYw??????!???Ld??\dvV?
??Xk-UP{????fQj8?5?2???@?e}??????,J?]g?h?*?3%V?l?]?
???????$????g??G???}?\j??U}}??G}???:%d?wIx]???~???y?~?w?+m???~??:tf?[n?U2"P?j??f???dm???4??Y{$?#Z??/?G$??F?w?l?X?????B??o!?gl????e17X??p???7?L
?S*???
???-?V2?s??mQV??k6??b?rm??Nv?(I??y?h?)?4=UD?c9?\??????m?i???
??????????*?????/z~??Z??????????CZ?gj?{?o??9?n?`
>???!???nv?????8????N???.?qr??D??:T??{??Rv??"E?:D!?
??E?j?=?"??(??Rg7???E1?????\??qE3cQ??[??;?G?$O?N????6H?s????W4s ?sI???oH?r?Z????.??'7???????9!????N??t]??m?"??
lLZ?DI?-?#QI?l????^??k?;?}????H?=?.r(??S????nn???b?7?????????"???
M6H??????A?l8B7Y;C?]"#??l????el?H??? #??????C?n??Pf?)#??9:)?????9rlQ?S?N(????ICh?H?SzD??Su?#i?["? Cn>?F?=?7?jt??6.?O??y?[?|???-?<m?m?y??????????
*@???w????
@(%?7?c
e?????Q8?@9M9??
?A(?u??T{0MHv???d7b?8???mu???|?V	K???b??????&?????-?m?H{nMy?}5?=];F??z????E??[?7?????=va~i?z?z???x??U?ui??
j??Mz?p?O=9J?N???Y???w??D
??q??`?)Z?????????nu?K??????tC??r?Wu??(G$?q<?$-5[?U%??????Z:????w?D????[`??
 &??ym??????	?ruI?u
???q??T`mu?????-?%????ew?sl??????Q??V?I??GA?????O?:1WR????]$Bm?V???I\???i?????>?C?9H???I?cu=??????%???uM?Lf????Q??bM???+I?N?m?w6r?????/
;?w??G???
kTT)?\c??????)?~D[??i???????E?;?<G?????????,?""?#?/????_?~????s??C??????>?
??5?mf@????$??{?{\?b??9?d?$	\???????*???$ic?J?,?3??I
?7?sjm?v?q???????D0????????(\?F
?V#?o?<w?????=?!I$?????P?(??4???,VY1!?e??j????k&??g?,???wzE?I?X??,??????KV????_
Mj???p??"?????'l??I?G?Y
??y???O???*|hH<|o?ykq1P???!??n6?k#???|#Z????&/{/lb???????Ke?b?B9#?foK11I	 
????8???????/R???????_oV?%?????h??s???3:?5???>??'<?t?b???]@7??C?b???P???QO?&?Mm????S?n??Z????????f???v??????,?w????(@???????
?T?`
???W??)?A?j?>B??O?????J?
*r?~?x??>?O????}_Jk??K?+??Yn~?u?|???????OC?Ny??[???g??_M}o???^??_?	?y??P???1????u???>?t?????c??z?]u???3?I=)I$??*??
????t????OS>????????<???
??~????F?q?&?????CACaB??!
"?"P?D at 4??Q4C
z
E??'
0?????????B?? ???!!#$#0?
C@???"dP?aC?\`??T?C?B???&D*C?P?dP?r@????+{??:",(Z???h?`?_??4|??H?Q??????!??
?P??????????????????
?`GaB???aB
O*?	@?Ph?1?m3?? ???C
?-(~_w???
(?g????s@D?????d?????E??:?

??w5?v{?]?9?5?U&????I~J?????????O?4?????^(??????O?%?B????RQ9s(My?s7h?????G5????x
???(D??
??_??&z????<?W?????5_5??*:?r?Y???#??R??&?!
????q??%.A??W{C???>??????|\???????=?_^g?//? ?"S31?$?Y+YZS???Bs???????W??_???Rbh3?>B?_???x?^u?Of??g????????D>?~???q5	?I?U?m6
U?
?L????/?_?>?:?u????Bc?)?2?o5R\????l?m?;??W?|??
?O?XW|?????{?y?o??^?\S2?
??B???@N???????<?,
?59N??+_????VV?5?????????\??k?w?Wn?;4#
7????5?P??????????XmX at 4$l+?sv???????k??B????};??^?9??\_/????3G?~I/??????}??????~~?8???g?3?`??????????i_???/I??
???N????E??.???knX?V?z?XO??5?Y?????????&????o??`

`Q???=?7?B??j?2?????k+%l??>oTw\?N9??????%%}????v??:&]???7{?????I???????s????`??HR??)
?
m??T???????:.Aa`,'Z??'??K???V]???o??GO?#?_~?w??????h^z2??U???#????V$??k*???:
:?c?<???Y?M6??Ym?
??c??????kYw??g??w??:??=?_H?_??????x/oz???u?QaeIIf???T?7=?D?*
?y??!RmB??/A
SM5?
W?Q4????
?E?E~????n??^????W?Kz?*_O?e7U1????"???????\?g???K?;??????+?I#l??????????u\??r?S$&?
??n?S??[?{?9?R?T?T?
v?B?
R??(BuU?o?Y???N????6???B?6?V?w?q????????2M?????2??????B??&??w??:??X?OS???|!4?W? 
?fy????_???????|??b3?????~??>CM]Q?wb????"???????y??.B?
???????S?u???????(_,/?3.??>4
???}L??|?q.}?????????nyw%}m??%???[?7^*?J`?E??
?????????????T?S??3?d??7????????gI]?????(1?[}W????'?+(?????xKX??????S?V?f?f?W????4????
&???
???^?m?m??$wM??"?Y????+?
??O??~)???/?]??m?
?F?E61%????e??U?3w????9-&]?????????U???{???,??
>??L??*E???-u3G?$?{?U?]y?o?}????~w??:??>?a}w?Gx????s??~?R	"&?????W?K??R%J?!l??
?7b}?s???^??????Q
PY???wecE`?h=?vx'? O??????DZ??]??"n???7=G]]?oW81:?>???!O1?MO??=9?U?&?~???'|?????AJf??L@
??}?|
?Y/?+Z?^k??{??????????"??>awS?-(#j?s?;??z???D??????jT???KB.Q?????????}+?P???????4??k/'9?????s~r?????j??????\??????5?b???X??-?n??=???Y?g??_??v?B?T?????}??}?W?d?$?kYo?e??????"??? ?h???????
????)?IoY??c}??n?P??9Hj\?o?s????D??????_uQ?????k,9??????u(?]??k????????/???p?
S???k???^??Vp?J??W?????k~??B??m?
???S?7????E)B?M5J?Sg?}??}???5
T??????_5?LO:?k????q?????oc?$??????>(?,Y??X
???XK?uv??U9?!??bx?l?R???I???S???????1_?\W?;???
k??????3]?Y???J???????{J???Ms{??o??&???&?J?
x???[?Vo/?B?mt???y?E???i?P?L
?)R?
?????Z|w?P???T4?e8???{B??*??
????sz???HM
%?
D*UU3?|?X????\[?{>nF????U;,??????%zt??????9o??$?]*????!?
??XH?B2?H?D
?K{??J?6?f?
????????EA?9?IFs??w?q???????O?%|?)l?
:??,?M'??-?5???Y????+?Wz?X????6?!J?M
??W??'wi??W?ugB?z????6?N?I?77Y??G??L???:?r??? ???~?\???????G????z???G?k?+??lgw?o?Q??YQn??r?X?Lz???????(B
I??#gw?YwwU<???}?"???T?b#?????????O????D??????i???vLq-????w?????'??UW?o/??s?p?=u	???h^*
?	?7WT???~??E??;?Ww????c??w?B?@i?2Z?;vD??q8????!????7??})????????!T?"i?
v?????
?
??m?duu;5\?v??a??fS?x
?vop?*?
?
?gtC?r?.?*lb??X??????|?O.???A???A??G>CCO??Z???Q??TQ??l.ck??????2???(nqU?^??C???d]???$??wE??????'???P??w.????$?J?????????????u????
s?!???:??&??={????(;+???w?2???}????@
???,?????=?????????	????ed-.=??.'1r????>>8??c\??r?k?.S??^??
??b?????w???.??13??
?X?????a?g.$??{?0????????!???~V???S:????w?M?C?:?oj?/?!???&?P(?????<?#????????k?????n??2?&?*uu
s??O?????????&??y-E??-??v?n?D?6?????rst??&????I??&??b??|??b???????z ?{V???md??_$`z?Gp???
???|M?T?DK??Gv?5????Ufm?x?sXc9?I?????PZt?????&?cR??c?rp??SW??* ?FH^?$?q&I?}]??x 9?Q??"??n????!M?{?lz???????,??j??4h?mBV?ArU??]??h[??????????]??xGV????????j??]?????????????z????W\?{?u?~?H????	???yWqSw=??8?)???q?!?E???????U??i??wc{???|?z:???4???z?????x?uA|????????n"J;??{9?~?G?T?3???U?????



5???G9??CDO??Ca#gHF????$p?q
?
~?E?*??????M?Az??m?????????/;???????X?'?ub???????$??d?F???O??????P???^?
????v^w????Jg?2??N1??D??|?y??9?0???
?
?
X=?1??X???.?)?Im?????F?.???7????#m?2#jE??????!?Qn??RE$?H??H???s?"??k?nN??q:E:EnwE???o9?????
9?@1????3d]?8??"?s???[???t?E??n8??]?D?F?f?B???I]?n??????"nl?d?.mI?E:M?snD??}"mI???'F?
s?F?Il?v?H???
?f????q?n?p)?Dx??42H?R
mwm\T=?cJ??????x~?{??????o=|8?'3?38???$]w??T??K???E??g???????o?????????X"""???WF2??%?T???E?????,???????o??t?=?slmw?fl}????p(0m????9???????????f??????R??????	t???U.fj?m????[K???Gw???<??/?}???'t?1??G?I7a?
???6???????T?~????????+?@BD???(AP??????v?h ??????
(??Er????B?2(p??.??
z"q?C"?A????9??'?(?P????>r|?
??R}?Q_??>??k[???kd?/?n??>?)x7???q???d??E5<??'GoL???`
Bz?vfy? ?	"p????E????0+xo??KO @???<???t? ?g??=)?)?N?y????? A?ybR?Nw??! ?
????????D*X??R?xi?}}|:???????L???????&???G?????w*?????????yS?:???0=?f???w????T??????I?"?k??*??1?jq??{?^?%8|??j??x?1U?{?D{??q??2??a$??[V??j??c??{????;?=??xg????vu?Z?????\N????0?QLc_??-#~?S??*?3UQ???w?i\f+????m??ys???N??qv?%Zu???r?y??????7y[F?%%VFI?:r&?g?R???????3?eV??kz???|C?X\H$Y3:???S????u?v}???v?m???7ex?mqcv??,?(W^??U??*d?0?`j???6e?m?C;?M?]WF?J??D?????p??g??l?????c??+??m`"[??>??w?w????[Y??????*P;??U?wQ??r?M????{???Y?cb?????????W??&3??j?????kh-6a"??C1??*)?,?"=39????[??Eh?6?????^}???m??m?
??
H???????mN??v??4;@?C?[??mV?"-?????????o`??CA
7??t?4?:8N5?)?1????zR???AN??5???DC?t	{kb?/??v???*??jd{????y???????__{a?]G??U?F-???o??????DR?EU??zD??"z?6+Ws??z*]?U*?@???-?]?AmU??j??^??????T?????5???#??E???Z?\??E?U?p?R???_/5.????eW?????]A[*?w?????M;OU?^?)?9
?3??x???Kj>??E???????${?bVc]f?w
??r??iJeb8}?1??????M?:?a??????oggH?gw????o\??srko?I???rt??(5?nV??kj?+O8CMt??/????k#s???
>_??b"????9????-?????????????g?t?~?=?{??3??{?

JJ




	??????? ??
??-\f??G?]m?6??????6s???*?[?{[???;?K?????g??????F?"?{???e??e??$2c???sb(2???m??s??Y
?|??H??Ib??G??O~??"#?????~?k???-E?5??6???Vf}?????????3????k?{y???=z??r~$?%? 7;??$???,???~~}??????b???UA>????????2??W?"?T????|@?)?j??R1~>~(????t???w?q?"m7????%?,|??v?=???,???????X?H????f?*p???m???PU??v???????!U?Gk?M?[Sn?-RVTw+???'	?>???[?W??i(??????^?kB?~4?????<???PE&a?????`UL??? ???P?vUEB??T??TBAJ	D*S,Ma8?&A	?H'B&dA$)??A=@)?? ?P?Q??%$?JN?be1??);??sI)<??R?d???D??S?'?%?T?I??"2f?2S"?L?j?Pd?
?K??Q
R?e%2?$??????KEBI??!:h???S?Y_A?wx???m???R????y????G??eP????z[v?U??????j{????h;j?B![?-]?{????9???T?D??	<??RF?(P?T?r????+<????e???;]????YEc??:?Iv?	j???!]???(??n?uv?????t??l?[?
YlV??m?,.?y???#??Z??n????D[4??a??CKN[B?%??v?J?[n[??-?	k?n???R?hs{?]?????????]%v?
t-v????9v???S?v? ??R???z?itu???k?v9?????C?t?[?[U??-C
?rI{?s????_????
??h?#bSlz??/?o?:v???R???	???N5U?q??????O?4?w?`?|???o}???Jp?w??W???#E?<X??KQo?J??d|????K??{??c???qS?k?x?pC""
?????0?f??~~}?????5???3???????o?}?" ??
?Ul?K????^n2????+?-[z??ib???ZYu??]?h)o]tw?8{
??????l???`+-?????-???.??[-7??+]?*???d??8??c?8
_?!??O??(oqB????qL?P?P?????BaDJF	!?B!?(DJ?
?^E??T-?a?Q5
q?????
]
???
w6qI[?#}
??'?P?QC66
?[P??YM???v[s?CMI~???)o???1_?B??{????9??=?4Jp?A??O????5W1s?C0??j?????<?c?su+]X[Z????U??$????????????F3?36Z8M?znbb?!
?F
R?f2?3#??I$?I$?I$????O	3??p??x3%?dG1CYd4???n?2????2lg?h????pa?0?Q??Xf?`4??}j????cS?????j6?K?O]?=?????{??j2??fH??u????u??yB????R?YeKla??f`?????n??1z?????+Z????$I??M0??s?^?2a0Bf???0Pi?5\P?-(??Cj3T???3??l;L\?]L?j?P?s|?\UHvL??[?512m6hTB@???!:??)??%^I??
0

???fi?77???o?6?!C??TO???P???x??:??n1????s?_???va?U?*2?tL??C?8?0d??
fD??2?????B????
&? 
I$??
???????????Q?????"m{??p8??'?efUv^sW?W?????????????@?	$
$???$?	I?$??$????$?1???%ee?????J??n????????w}?6?[+n`?Q?=???f????>|^.<~n?????
??m??l6???/m?:????z?-??K??????l%?o?o?l??n?e????l?[K??????j????z?V?md??J
?)v????-?KF?,??,/Z?]??????????Qx.???m?Z?????KIt??-V?-??Em??y???Em??kt?????Y???+?????????m??m}?K???(+l????mVW??????6ZK???U???mr????mZ???Z?	v????-??wZ\???Yh?]?mm????U?????Q[zQ[oA^??R???+m?m??????]????p^???2?o@????????"??C??
????gwR?["/[l??v?0?Y(?5??I??Km!U??Z??+???????[o[n???6?Io^?zJ??m???6??e?m???"?Z???]????!?????Fqks???????I?%???????%????q???|z?#X9????G?tJ3g
?lc?[?9??D?s-E???$?????xxG?v????>q???w?????]??$?
o5?f'*?".,?w??}???????T????dD]S?@
	%??Js"IKI??%$?$?H	%m?I+m???????I+ID??H?]KD??!jI~?n~?_???o?Io??E?]???=h???n?N???>?????n?3wwv;?7????Z???$Q$?_{?I/0??%?R@
???k'??????????7?qKf????k^9??<{?????????????`n????dt???bbSUl?%?jk?h?7?????t\????H+??f?0?T????w????U6&g??T?Mn??tdd?Avj?
???l???????
???0?????N???Un?K?????L??;?)??9I	i?e?v????lH???m?b??(???'m??M????????
??X???E?p?????.g2?????"????m.??|?KXo|????o???i?i????.?M??B?????8,B?F{??????Q=K??*??$?!?-^?+P????????ox?S??X?W???7???6
?[?Z???N??U??n??M??Fdm?T??8???@??I?N?b?????or??(^?l?
60???Y?^??e?D?I<5??mc?
??*??????s:$??&#y?7????????u????1?
G?%?1??+oKz??V!Z?`???z?'????Kj??]Z??e???bwDZ????mUZ????GV?*?zmE?[??]V???J????]?9?]6?-?n?WJW???BX??[?p?`W??/u??-N??hV????????????Uu?Ud?q{?T?zC[??z?\?z?????? ?t?[?5???[e??j?gm?I?B?v??C???Em?mUZ?!ZN?E?+e???l????j??K????%|?:?"???Z??V?#?;?;?.???F	?Bh?????????"+b?UV?J??V??W?????$6[A
?)_[e??j?-??[w??mv?z?U?"?4e?????k???;d/UiK?Z???$?k?I/???,8????jM?a??!??hs????3W'??,??f??S???=?#?T????X??o???E??E
S?}??>???Y??~??????35#??"!?.n.f"???????q.?~???K?#????26l?k|??;??&?oG?9?pl?*??/||?????"+??f?HH?_??~eUUV`???O{?ouQ2P?

? (]P??P??J?T???????\?}5T5?@????????b?j P?$Ai
??E"/?*!$?%?*AC??
C??FZ?$?AC9
((XP?P?~?B???
}fG@??	???x
???(v?c?+R0???Bj"n5<??p???
B}B??
r???7Pk?uA?B??q???????g?Vz?????d?6&???H?????B?"! $X(AS??????? ??P?pP??P????A?B??	AC?
P??
v?P????O??????v?!Q??z??AC??P??UD*?h???B@??j

?4@?A????S`Q ?q?u?????}???????P?????B????.A?????Q??Q????,
?.4P-??AB

P?????`? ?P??	 ?@?????W?[W??P???C?*
P??	?P??
?DCS????????B??
???P??4???W??nU??????.??w?????i^?5P???}AU?(m???H?*
????j(X????E??IEb(Q???? ????D??t?t????????u?h?20KQ?A?(v?l	.??J

??T>?
!?M?%??????p???)????(z*:T]SP???????Phn(k???K
???H???(V
???X?4
? Z??S?*Q?2i?2(r{???]
?R?4(?D????????>/??x&??;b
^??????g?!?????a????l?@???g?????? ?mf?6????kk?P??????%>h&?????????,
?\C?Cmh(AB?xqCL???&J
h??"yT??2 ??Z"^??E??sAB?X?pP?????
?V??


\P????? ???<?>?>?????;D?=Z
%n?;????
?AT
"?!PX?mJ??6??Smj?SU?Ab?D?(AR(@???6?SjU-J????6???????6???+MR???????R??????M??mJ???mJ???-M??T??T?ST?MR???mk5J??*?R??+i?U5MR??j?KR??j?SZ?mK[6?Y?-SjV?R???????R?????*????U5J??T???5e?m???KR?jM??SkjM???+V????-V?Z?Sm?3U?????Z??m?2?-L*? *?? ?"#
?
?????AH"?
?
?TH??X?PH??@X??H
??
?TH
?H?
Q`
???D??
?H??QX
?
??H
??$PX
?H
?UX(QH??D?

?(E??E
??@"*H??B?T??A"?DH??Q??Q"?@?)-Uz?YUV[N?jU5mJ???T??5KkR?V??mmJ????*??@T AB+?Q?DB+??T"B
$
&?M[ZU6???kkST??*???SV??kZ??(?
!??D??
?
???@V??,?????)??H}?
ti??S?x??H?
R???B?
R???Z??uu????|?Z????_}????{??????~??=d????UUe?I$????UU?I$?????UVY$?K*???mm?]????????????W???????????o???R?]??6?R??
R?!J
R?!J
R????UUR?A???$?k?i%~;Wj????{???????Ng|}U?I$?????UVY$?K*??UUYd?I,???UUe?I'??Z?_??]k???]?;????????Q?I$?I$?Z?????????  8?f8?
glibc-20050815-20051104.patch:
 BUGS                                                         |   14 
 Makefile                                                     |   54 
 Makerules                                                    |   10 
 abi-tags                                                     |    2 
 argp/argp-eexst.c                                            |    2 
 argp/argp-fmtstream.c                                        |    2 
 argp/argp-fmtstream.h                                        |    4 
 argp/argp-fs-xinl.c                                          |    2 
 argp/argp-xinl.c                                             |    2 
 argp/argp.h                                                  |    2 
 configure                                                    |   18 
 configure.in                                                 |   18 
 crypt/Makefile                                               |    8 
 crypt/md5.h                                                  |    3 
 debug/execinfo.h                                             |    3 
 debug/xtrace.sh                                              |    2 
 dlfcn/Makefile                                               |   19 
 dlfcn/bug-atexit1-lib.c                                      |  375 +
 dlfcn/bug-atexit1.c                                          |   23 
 dlfcn/bug-atexit2-lib.c                                      |   14 
 dlfcn/bug-atexit2.c                                          |   53 
 elf/Makefile                                                 |   13 
 elf/cache.c                                                  |    3 
 elf/dl-addr.c                                                |   15 
 elf/dl-conflict.c                                            |    4 
 elf/dl-load.c                                                |   97 
 elf/dl-tsd.c                                                 |    2 
 elf/elf.h                                                    |   13 
 elf/rtld.c                                                   |    9 
 elf/tst-auditmod1.c                                          |    8 
 hesiod/hesiod.c                                              |    6 
 hurd/intr-msg.c                                              |   19 
 iconv/loop.c                                                 |    4 
 iconv/skeleton.c                                             |   30 
 iconvdata/jis0208.c                                          |   18 
 iconvdata/jis0208.h                                          |    9 
 include/atomic.h                                             |   39 
 include/features.h                                           |   15 
 include/limits.h                                             |   20 
 include/malloc.h                                             |    1 
 include/regex.h                                              |   49 
 include/resolv.h                                             |    2 
 include/string.h                                             |    2 
 include/sys/mman.h                                           |    2 
 include/time.h                                               |    2 
 inet/getnetgrent_r.c                                         |  130 
 intl/localealias.c                                           |    5 
 libio/fileops.c                                              |   14 
 libio/fmemopen.c                                             |    2 
 libio/iofclose.c                                             |    2 
 libio/iofgets.c                                              |    8 
 libio/iofgets_u.c                                            |    8 
 libio/iofgetws.c                                             |    8 
 libio/iofgetws_u.c                                           |    8 
 libio/iofopncook.c                                           |   11 
 libio/iogetdelim.c                                           |    8 
 libio/iogetline.c                                            |   53 
 libio/oldfileops.c                                           |    8 
 libio/oldiofclose.c                                          |    2 
 libio/stdio.h                                                |   20 
 locale/iso-4217.def                                          |    4 
 locale/iso-639.def                                           |  121 
 locale/loadarchive.c                                         |    2 
 locale/programs/ld-address.c                                 |   11 
 localedata/Makefile                                          |    2 
 localedata/SUPPORTED                                         |   17 
 localedata/locales/af_ZA                                     |  246 -
 localedata/locales/ar_AE                                     |    9 
 localedata/locales/ar_BH                                     |    9 
 localedata/locales/ar_DZ                                     |    9 
 localedata/locales/ar_EG                                     |   13 
 localedata/locales/ar_IN                                     |   26 
 localedata/locales/ar_IQ                                     |    9 
 localedata/locales/ar_JO                                     |    9 
 localedata/locales/ar_KW                                     |    9 
 localedata/locales/ar_LB                                     |    9 
 localedata/locales/ar_LY                                     |    9 
 localedata/locales/ar_MA                                     |    9 
 localedata/locales/ar_OM                                     |    9 
 localedata/locales/ar_QA                                     |    9 
 localedata/locales/ar_SA                                     |    9 
 localedata/locales/ar_SD                                     |    9 
 localedata/locales/ar_SY                                     |    9 
 localedata/locales/ar_TN                                     |    9 
 localedata/locales/ar_YE                                     |    9 
 localedata/locales/az_AZ                                     |   47 
 localedata/locales/be_BY at latin                               |  147 
 localedata/locales/bn_BD                                     |  121 
 localedata/locales/bn_IN                                     |   26 
 localedata/locales/bs_BA                                     |   18 
 localedata/locales/ca_ES                                     |    2 
 localedata/locales/de_DE                                     |   13 
 localedata/locales/dz_BT                                     | 1360 ++++++
 localedata/locales/el_GR                                     |   29 
 localedata/locales/en_US                                     |    2 
 localedata/locales/es_AR                                     |    4 
 localedata/locales/es_US                                     |   12 
 localedata/locales/fi_FI                                     |    5 
 localedata/locales/hsb_DE                                    | 2216 +++++++++++
 localedata/locales/hu_HU                                     |   28 
 localedata/locales/km_KH                                     | 1904 +++++++++
 localedata/locales/ku_TR                                     |  215 +
 localedata/locales/kw_GB                                     |    4 
 localedata/locales/ky_KG                                     |  203 +
 localedata/locales/mg_MG                                     |  181 
 localedata/locales/ml_IN                                     |    6 
 localedata/locales/nl_NL                                     |    5 
 localedata/locales/nso_ZA                                    |  281 +
 localedata/locales/oc_FR                                     |    2 
 localedata/locales/ru_RU                                     |   24 
 localedata/locales/rw_RW                                     |  150 
 localedata/locales/si_LK                                     |  216 +
 localedata/locales/sid_ET                                    |    1 
 localedata/locales/sq_AL                                     |  145 
 localedata/locales/ss_ZA                                     |  285 +
 localedata/locales/st_ZA                                     |   71 
 localedata/locales/ta_IN                                     |   16 
 localedata/locales/te_IN                                     |  108 
 localedata/locales/tg_TJ                                     |   15 
 localedata/locales/tn_ZA                                     |  288 +
 localedata/locales/ts_ZA                                     |  282 +
 localedata/locales/ve_ZA                                     |  288 +
 localedata/locales/vi_VN                                     |  146 
 localedata/locales/wa_BE                                     |   32 
 localedata/locales/xh_ZA                                     |   69 
 localedata/locales/yi_US                                     |   55 
 localedata/locales/zh_CN                                     |    6 
 localedata/locales/zu_ZA                                     |   69 
 malloc/Makefile                                              |    4 
 malloc/arena.c                                               |  110 
 malloc/hooks.c                                               |    4 
 malloc/malloc.c                                              |   71 
 malloc/memusage.c                                            |  279 -
 malloc/obstack.h                                             |    2 
 malloc/tst-mallocfork.c                                      |   52 
 malloc/tst-mtrace.sh                                         |    3 
 manual/llio.texi                                             |   12 
 manual/memory.texi                                           |    4 
 manual/pattern.texi                                          |    6 
 manual/signal.texi                                           |    4 
 manual/stdio.texi                                            |    7 
 manual/time.texi                                             |    3 
 math/Makefile                                                |    2 
 math/libm-test.inc                                           |    4 
 math/test-tgmath-int.c                                       |   71 
 math/tgmath.h                                                |   13 
 misc/hsearch_r.c                                             |    2 
 misc/sys/mman.h                                              |    8 
 nis/nss_nis/nis-netgrp.c                                     |   18 
 nis/nss_nis/nis-publickey.c                                  |    2 
 nis/nss_nisplus/nisplus-netgrp.c                             |   13 
 nptl/Makefile                                                |    6 
 nptl/TODO                                                    |    4 
 nptl/allocatestack.c                                         |   93 
 nptl/descr.h                                                 |   14 
 nptl/init.c                                                  |   30 
 nptl/perf.c                                                  |    5 
 nptl/pthread_create.c                                        |   13 
 nptl/sysdeps/pthread/pthread_cond_signal.c                   |    5 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h            |   16 
 nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S |   45 
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h             |   11 
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h          |   15 
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h             |   23 
 nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S               |    4 
 nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h            |   15 
 nptl/sysdeps/unix/sysv/linux/timer_routines.c                |   14 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S    |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S           |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S            |    1 
 nptl/tst-align3.c                                            |   57 
 nscd/aicache.c                                               |    2 
 nscd/cache.c                                                 |   34 
 nscd/connections.c                                           |   36 
 nscd/dbg_log.c                                               |    2 
 nscd/grpcache.c                                              |    3 
 nscd/hstcache.c                                              |    3 
 nscd/initgrcache.c                                           |    3 
 nscd/mem.c                                                   |   18 
 nscd/nscd.c                                                  |   15 
 nscd/nscd.conf                                               |    4 
 nscd/nscd.h                                                  |   17 
 nscd/nscd_conf.c                                             |  161 
 nscd/nscd_getpw_r.c                                          |    2 
 nscd/nscd_stat.c                                             |    6 
 nscd/pwdcache.c                                              |    3 
 nss/getent.c                                                 |   82 
 nss/nss_files/files-netgrp.c                                 |   22 
 posix/Makefile                                               |    2 
 posix/getconf.c                                              |   55 
 posix/regcomp.c                                              |  533 +-
 posix/regex.c                                                |   29 
 posix/regex.h                                                |  161 
 posix/regex_internal.c                                       |  403 --
 posix/regex_internal.h                                       |  178 
 posix/regexec.c                                              |  722 +--
 posix/sys/wait.h                                             |    8 
 posix/tst-rfc3484.c                                          |   98 
 resolv/Versions                                              |    2 
 resolv/res_data.c                                            |    4 
 resolv/res_init.c                                            |   31 
 resolv/res_libc.c                                            |   16 
 resolv/res_send.c                                            |   59 
 rt/mqueue.h                                                  |    6 
 scripts/begin-end-check.pl                                   |   47 
 stdio-common/Makefile                                        |    3 
 stdio-common/tst-fgets.c                                     |   20 
 stdio-common/tst-fwrite.c                                    |   70 
 stdio-common/tst-put-error.c                                 |   33 
 stdlib/Depend                                                |    1 
 stdlib/Makefile                                              |    3 
 stdlib/bug-strtod2.c                                         |   46 
 stdlib/cxa_atexit.c                                          |   59 
 stdlib/stdlib.h                                              |    2 
 stdlib/strtod_l.c                                            |   12 
 stdlib/tst-ucontext-off.c                                    |   35 
 string/strxfrm_l.c                                           |    6 
 sunrpc/svc.c                                                 |    2 
 sysdeps/alpha/divqu.S                                        |    2 
 sysdeps/alpha/ldiv.S                                         |    2 
 sysdeps/alpha/remqu.S                                        |    2 
 sysdeps/generic/bits/byteswap.h                              |   19 
 sysdeps/generic/bits/mman.h                                  |    6 
 sysdeps/generic/dl-sysdep.c                                  |   25 
 sysdeps/generic/glob.c                                       |    2 
 sysdeps/generic/ldsodefs.h                                   |   16 
 sysdeps/generic/memusage.h                                   |   16 
 sysdeps/generic/nfs/nfs.h                                    |   32 
 sysdeps/generic/s_csqrt.c                                    |    4 
 sysdeps/generic/s_csqrtf.c                                   |    4 
 sysdeps/generic/s_csqrtl.c                                   |    4 
 sysdeps/generic/tst-audit.h                                  |   11 
 sysdeps/i386/bits/string.h                                   |  922 ----
 sysdeps/i386/fpu/libm-test-ulps                              |   16 
 sysdeps/i386/i686/memusage.h                                 |   22 
 sysdeps/ia64/fpu/libm-symbols.h                              |    4 
 sysdeps/ia64/fpu/libm_error.c                                |    8 
 sysdeps/ieee754/flt-32/e_hypotf.c                            |   10 
 sysdeps/mach/hurd/dl-sysdep.h                                |    6 
 sysdeps/mach/hurd/getpeername.c                              |   12 
 sysdeps/mach/hurd/i386/init-first.c                          |   22 
 sysdeps/mach/hurd/ioctl.c                                    |    6 
 sysdeps/mach/hurd/profil.c                                   |    2 
 sysdeps/mach/hurd/setitimer.c                                |    9 
 sysdeps/posix/getaddrinfo.c                                  |   59 
 sysdeps/posix/spawni.c                                       |   10 
 sysdeps/powerpc/fpu/libm-test-ulps                           |   18 
 sysdeps/powerpc/powerpc64/Makefile                           |    2 
 sysdeps/powerpc/powerpc64/hp-timing.c                        |   25 
 sysdeps/powerpc/powerpc64/hp-timing.h                        |  136 
 sysdeps/unix/alpha/sysdep.h                                  |   63 
 sysdeps/unix/sh/sysdep.S                                     |    2 
 sysdeps/unix/sockatmark.c                                    |    4 
 sysdeps/unix/sysv/i386/signal.S                              |   31 
 sysdeps/unix/sysv/i386/sigreturn.S                           |   27 
 sysdeps/unix/sysv/linux/i386/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/i386/ucontext_i.h                    |   20 
 sysdeps/unix/sysv/linux/ia64/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/lddlibc4.c                           |    2 
 sysdeps/unix/sysv/linux/mips/brk.c                           |    3 
 sysdeps/unix/sysv/linux/mips/getpagesize.c                   |    1 
 sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S              |    8 
 sysdeps/unix/sysv/linux/mips/mips64/syscall.S                |   29 
 sysdeps/unix/sysv/linux/powerpc/bits/mman.h                  |    1 
 sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c              |  105 
 sysdeps/unix/sysv/linux/powerpc/powerpc32/ucontext_i.h       |   19 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h         |   77 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h       |   15 
 sysdeps/unix/sysv/linux/readonly-area.c                      |   18 
 sysdeps/unix/sysv/linux/s390/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h            |   14 
 sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h            |   13 
 sysdeps/unix/sysv/linux/sh/bits/mman.h                       |    1 
 sysdeps/unix/sysv/linux/sh/makecontext.S                     |  145 
 sysdeps/unix/sysv/linux/sh/sh3/getcontext.S                  |   90 
 sysdeps/unix/sysv/linux/sh/sh3/setcontext.S                  |  101 
 sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S                 |  134 
 sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h                |  102 
 sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h                  |   79 
 sysdeps/unix/sysv/linux/sh/sh4/getcontext.S                  |  133 
 sysdeps/unix/sysv/linux/sh/sh4/setcontext.S                  |  141 
 sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S                 |  216 +
 sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h                |  115 
 sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h                  |  149 
 sysdeps/unix/sysv/linux/sh/socket.S                          |    6 
 sysdeps/unix/sysv/linux/sh/sys/ucontext.h                    |  109 
 sysdeps/unix/sysv/linux/sparc/bits/mman.h                    |    1 
 sysdeps/unix/sysv/linux/syscalls.list                        |    2 
 sysdeps/unix/sysv/linux/x86_64/bits/mman.h                   |    1 
 sysdeps/unix/sysv/linux/x86_64/ucontext_i.h                  |   30 
 time/Makefile                                                |    2 
 time/asctime.c                                               |   63 
 time/bug-asctime.c                                           |   33 
 time/bug-asctime_r.c                                         |   32 
 time/mktime.c                                                |   60 
 timezone/africa                                              |   24 
 timezone/asia                                                |   86 
 timezone/australasia                                         |   55 
 timezone/backward                                            |   25 
 timezone/europe                                              |   93 
 timezone/northamerica                                        |  152 
 timezone/southamerica                                        |   18 
 timezone/test-tz.c                                           |    2 
 timezone/tst-timezone.c                                      |    4 
 timezone/zdump.c                                             |    4 
 timezone/zone.tab                                            |   28 
 wcsmbs/Makefile                                              |    3 
 wcsmbs/tst-mbrtowc2.c                                        |   67 
 wctype/wcfuncs.c                                             |   33 
 wctype/wcfuncs_l.c                                           |   33 
 wctype/wctype.h                                              |    1 
 311 files changed, 15254 insertions(+), 4168 deletions(-)

--- NEW FILE glibc-20050815-20051104.patch ---
2005-11-03  Roland McGrath  <roland at redhat.com>

	[BZ #1548]
	* sunrpc/svc.c (svc_getreqset): Use ffsl instead of ffs on fd_mask.
	From Jay Lan <jlan at engr.sgi.com>.

2005-11-03  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1774]
	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use simple
	gethostbyname2 lookup if AI_V4MAPPED|AI_ALL is set.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Avoid alloca when possible
	while looking for scope delimiter.
	Some pretty printing.

2005-10-31  Steven Munroe  <sjmunroe at us.ibm.com>

	* sysdeps/powerpc/powerpc64/Makefile
	(sysdep_routines, elide-routines.os): Add hp-timing.
	* sysdeps/powerpc/powerpc64/hp-timing.c: New file.
	* sysdeps/powerpc/powerpc64/hp-timing.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c: New file.

2005-10-31  Ulrich Drepper  <drepper at redhat.com>

	* resolv/res_init.c (__res_iclose): New function.  Broken out of
	res_nclose.  Take addition parameter which determines whether
	addresses should be freed.
	(res_nclose): Call __res_iclose.
	(res_thread_freeres): Likewise.
	* resolv/res_data.c (res_close): Call __res_iclose.
	* resolv/res_libc.c (res_init): No need to separately free the
	addresses.
	(__res_maybe_init): Likewise.
	* resolv/res_send.c: Use __res_iclose instead of res_nclose.
	* resolv/Versions [GLIBC_PRIVATE]: Add __res_iclose.
	* include/resolv.h: Declare __res_iclose.
	Add libc_hidden_proto for __res_iclose.
	* hesiod/hesiod.c (__hesiod_res_set): No need to free name server
	addresses here again.

	[BZ #1579]
	* debug/execinfo.h: Change backtrace_symbols_fd comment.

2005-10-24  H.J. Lu  <hongjiu.lu at intel.com>

	* sysdeps/ia64/fpu/libm-symbols.h (WEAK_LIBM_ENTRY): Add "__"
	prefix to LOCAL_LIBM_ENTRY.
	(WEAK_LIBM_END): Add "__" prefix to LOCAL_LIBM_END.

2005-10-26  Jakub Jelinek  <jakub at redhat.com>

	* elf/dl-conflict.c (_dl_resolve_conflicts): Use _dl_debug_printf
	instead of _dl_printf to print conflict processing debug message.
	Reported by John Reiser <jreiser at BitWagon.com>.

2005-10-30  Ulrich Drepper  <drepper at redhat.com>

	* misc/hsearch_r.c (hsearch_r): Remove duplicate test.
	Patch by Chris Caputo <ccaputo at alt.net>.

2005-10-28  Kaz Kojima  <kkojima at rr.iij4u.or.jp>

	* sysdeps/unix/sh/sysdep.S: Remove unnecessary weak_alias.
	* sysdeps/unix/sysv/linux/sh/socket.S: Honor NO_WEAK_ALIAS.

2005-10-28  Thorsten Kukuk  <kukuk at suse.de>

	* nis/nss_nis/nis-publickey.c (_nss_nis_getpublickey): Fix off
	by one error.

2005-10-24  Roland McGrath  <roland at redhat.com>

	[BZ #1534]
	* include/string.h: Use libc_hidden_proto for strnlen,
	not libc_hidden_builtin_proto.

2005-10-23  Ulrich Drepper  <drepper at redhat.com>

	* rt/mqueue.h: Cleanups.

2005-10-22  Roland McGrath  <roland at redhat.com>

	[BZ #1254]
	* sysdeps/mach/hurd/getpeername.c (__getpeername): Fix last change.
	From Samuel Thibault <samuel.thibault at ens-lyon.org>.

2005-10-17  Thomas Schwinge  <tschwinge at gnu.org>

	[BZ #1252]
	* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Don't use ?: as lvalue.
	* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.

2005-08-23  GOTO Masanori  <gotom at debian.or.jp>

	[BZ #1498]
	* sysdeps/alpha/remqu.S: Return the correct result when the same
	dividend and divisor are provided, and they're negative numbers.
	* sysdeps/alpha/divqu.S: Likewise.

2005-10-18  Steven Munroe  <sjmunroe at us.ibm.com>

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/ucontext_i.h (TESTS):
	Define.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h (TESTS):
	Likewise.

2005-10-17  Roland McGrath  <roland at redhat.com>

	* elf/dl-load.c (MAP_COPY): When undefined, define to
	MAP_PRIVATE|MAP_DENYWRITE instead of just MAP_PRIVATE.
	(_dl_map_object_from_fd): Don't use MAP_DENYWRITE explicitly.

2005-10-17  Martin Schwidefsky  <schwidefsky at de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h (SC_STSZ, TESTS):
	Define.
	* sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h (SC_STSZ, TESTS):
	Likewise.

2005-10-17  Ulrich Drepper  <drepper at redhat.com>

	* libio/oldfileops.c (_IO_old_file_xsputn): Fix last patch.
	Return EOF not 0.

	* sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): Also
	allow EACCES errors when opening /proc for now.

	* wctype/wcfuncs.c: Don't use expensive wide char lookups in isw*
	functions if character is in ASCII range.
	* wctype/wcfuncs_l.c: Likewise.

2005-05-03  Robert Millan  <robertmh at gnu.org>

	* abi-tags (.*-.*-knetbsd.*-gnu.*): New match, with ABI value 4.
	* elf/cache.c (print_entry): Match the kNetBSD ABI tag.

2005-10-16  Alfred M. Szmidt  <ams at gnu.org>

	* sysdeps/generic/bits/mman.h
	[__USE_GNU] (MREMAP_MAYMOVE, REMAP_FIXED): New macros.

2005-10-16  Kaz Kojima  <kkojima at rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/makecontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh3/getcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh4/getcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh3/setcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh4/setcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S: New file.
	* sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h: New file.
	* sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h: New file.
	* sysdeps/unix/sysv/linux/sh/sys/ucontext.h: Removed.
	* sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h: New file.
	* sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h: New file.

2005-09-13  Jakub Jelinek  <jakub at redhat.com>

	[BZ #1228]
	* include/limits.h (LLONG_MIN, LLONG_MAX, ULLONG_MAX): Make sure these
	are defined for -D_GNU_SOURCE or -D_ISOC99_SOURCE even when not
	-std=c99.

2005-10-16  Kaz Kojima  <kkojima at rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/bits/mman.h: Define MREMAP_FIXED.

2005-08-05  Alfred M. Szmidt  <ams at gnu.org>

	[BZ #1252]
	* sysdeps/mach/hurd/setitimer.c (restart_itimer): Move static fn
	forward decl out of function body.
	* sysdeps/mach/hurd/profil.c: Likewise.

2005-10-16  Roland McGrath  <roland at frob.com>

	[BZ #1254]
	* sysdeps/mach/hurd/getpeername.c (__getpeername): Respect *LEN
	byte limit when setting ADDR->sa_family.
	Reported by Samuel Thibault <samuel.thibault at ens-lyon.org>.

	[BZ #1253]
	* sysdeps/mach/hurd/dl-sysdep.h
	[SHARED] (DL_ARGV_NOT_RELRO): New macro.

	[BZ #1253]
	* sysdeps/mach/hurd/i386/init-first.c (init): Make cast kosher.
	(_hurd_stack_setup): Don't declare with arguments and ellipsis.
	Use __builtin_frame_address and __builtin_return_address.
	(_dl_init_first): Likewise.

	[BZ #1249]
	* sysdeps/mach/hurd/i386/init-first.c (_cthread_init_routine): Declare
	as weak extern.
	(init): Check for it being undefined.

2005-10-16  Daniel Jacobowitz  <dan at codesourcery.com>
[...29054 lines suppressed...]
-				   + sizeof (mach_msg_type_t) - 1)
-				  &~ (sizeof (mach_msg_type_t) - 1));
+		  ty = (void *) ty + (((((number * size) + 7) >> 3)
+				       + sizeof (mach_msg_type_t) - 1)
+				      &~ (sizeof (mach_msg_type_t) - 1));
 		}
 	      else
 		{
 		  clean_ports (*(void **) ty,
 			       ty->msgtl_header.msgt_deallocate);
-		  ++(void **) ty;
+		  ty = (void *) ty + sizeof (void *);
 		}
 	    }
 #else  /* Untyped Mach IPC flavor. */
--- libc/iconv/skeleton.c.jj	2002-12-02 22:49:35.000000000 +0100
+++ libc/iconv/skeleton.c	2006-02-09 22:35:47.000000000 +0100
@@ -58,13 +58,6 @@
                         of one round through the TO_LOOP.  Defaults
                         to MIN_NEEDED_FROM and MAX_NEEDED_FROM, respectively.
 
-     DEFINE_DIRECTION_OBJECTS
-			two objects will be defined to be used when the
-			`gconv' function must only distinguish two
-			directions.  This is implied by DEFINE_INIT.
-			If this macro is not defined the following
-			macro must be available.
-
      FROM_DIRECTION	this macro is supposed to return a value != 0
 			if we convert from the current character set,
 			otherwise it return 0.
@@ -156,16 +149,15 @@
 #endif
 
 /* The direction objects.  */
-#if DEFINE_DIRECTION_OBJECTS || DEFINE_INIT
-static int from_object;
-static int to_object;
-
+#if DEFINE_INIT
 # ifndef FROM_DIRECTION
-#  define FROM_DIRECTION (step->__data == &from_object)
+#  define FROM_DIRECTION_VAL NULL
+#  define TO_DIRECTION_VAL ((void *) ~((uintptr_t) 0))
+#  define FROM_DIRECTION (step->__data == FROM_DIRECTION_VAL)
 # endif
 #else
 # ifndef FROM_DIRECTION
-#  error "FROM_DIRECTION must be provided if direction objects are not used"
+#  error "FROM_DIRECTION must be provided if non-default init is used"
 # endif
 #endif
 
@@ -329,7 +321,7 @@ gconv_init (struct __gconv_step *step)
   /* Determine which direction.  */
   if (strcmp (step->__from_name, CHARSET_NAME) == 0)
     {
-      step->__data = &from_object;
+      step->__data = FROM_DIRECTION_VAL;
 
       step->__min_needed_from = FROM_LOOP_MIN_NEEDED_FROM;
       step->__max_needed_from = FROM_LOOP_MAX_NEEDED_FROM;
@@ -342,7 +334,7 @@ gconv_init (struct __gconv_step *step)
     }
   else if (__builtin_expect (strcmp (step->__to_name, CHARSET_NAME), 0) == 0)
     {
-      step->__data = &to_object;
+      step->__data = TO_DIRECTION_VAL;
 
       step->__min_needed_from = TO_LOOP_MIN_NEEDED_FROM;
       step->__max_needed_from = TO_LOOP_MAX_NEEDED_FROM;
@@ -681,8 +673,8 @@ FUNCTION_NAME (struct __gconv_step *step
 #ifdef RESET_INPUT_BUFFER
 		      RESET_INPUT_BUFFER;
 #else
-		      /* We have a problem with the in on of the functions
-			 below.  Undo the conversion upto the error point.  */
+		      /* We have a problem in one of the functions below.
+			 Undo the conversion upto the error point.  */
 		      size_t nstatus;
 
 		      /* Reload the pointers.  */
@@ -780,12 +772,11 @@ FUNCTION_NAME (struct __gconv_step *step
 
 	  STORE_REST
 # else
-	  size_t cnt;
-
 	  /* Make sure the remaining bytes fit into the state objects
              buffer.  */
 	  assert (inend - *inptrp < 4);
 
+	  size_t cnt;
 	  for (cnt = 0; *inptrp < inend; ++cnt)
 	    data->__statep->__value.__wchb[cnt] = *(*inptrp)++;
 	  data->__statep->__count &= ~7;
@@ -815,7 +806,6 @@ FUNCTION_NAME (struct __gconv_step *step
 #undef TO_LOOP_MAX_NEEDED_FROM
 #undef TO_LOOP_MIN_NEEDED_TO
 #undef TO_LOOP_MAX_NEEDED_TO
-#undef DEFINE_DIRECTION_OBJECTS
 #undef FROM_DIRECTION
 #undef EMIT_SHIFT_TO_INIT
 #undef FROM_LOOP
--- libc/iconv/loop.c.jj	2003-06-11 23:38:13.000000000 +0200
+++ libc/iconv/loop.c	2006-02-09 22:35:47.000000000 +0100
@@ -450,6 +450,10 @@ SINGLE(LOOPFCT) (struct __gconv_step *st
 #else
       /* We don't have enough input for another complete input
 	 character.  */
+      assert (inend - inptr > (state->__count & ~7));
+      assert (inend - inptr <= 7);
+      state->__count = (state->__count & ~7) | (inend - inptr);
+      inlen = 0;
       while (inptr < inend)
 	state->__value.__wchb[inlen++] = *inptr++;
 #endif
--- libc/configure.jj	2006-02-09 22:34:03.000000000 +0100
+++ libc/configure	2006-02-09 22:35:47.000000000 +0100
@@ -5344,7 +5344,7 @@ if test "${libc_cv_have_sdata_section+se
 else
   echo "int i;" > conftest.c
 		  libc_cv_have_sdata_section=no
-		  if ${CC-cc} $LDFLAGS -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \
+		  if ${CC-cc} $LDFLAGS -fPIC -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \
 		     | grep '\.sdata' >/dev/null; then
 		    libc_cv_have_sdata_section=yes
 		  fi
@@ -5436,7 +5436,7 @@ else
 int _start (void) { return 42; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-		     -shared -o conftest.so conftest.c
+		     -fPIC -shared -o conftest.so conftest.c
 		     -nostartfiles -nostdlib
 		     -Wl,--enable-new-dtags,-z,nodelete 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -5464,7 +5464,7 @@ else
 int _start (void) { return 42; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			-shared -o conftest.so conftest.c
+			-fPIC -shared -o conftest.so conftest.c
 			-nostartfiles -nostdlib
 			-Wl,--enable-new-dtags,-z,nodlopen 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -5492,7 +5492,7 @@ else
 int _start (void) { return 42; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			-shared -o conftest.so conftest.c
+			-fPIC -shared -o conftest.so conftest.c
 			-nostartfiles -nostdlib
 			-Wl,--enable-new-dtags,-z,initfirst 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -5554,7 +5554,7 @@ else
 int _start (void) { return 42; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			      -shared -o conftest.so conftest.c
+			      -fPIC -shared -o conftest.so conftest.c
 			      -Wl,-Bgroup -nostdlib 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
@@ -5581,7 +5581,7 @@ else
 int main (void) { return 0; }
 EOF
   libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-			   -shared -shared-libgcc -o conftest.so \
+			   -fPIC -shared -shared-libgcc -o conftest.so \
 			   conftest.c -v 2>&1 >/dev/null \
 			   | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
   rm -f conftest*
@@ -5599,7 +5599,7 @@ else
 int main (void) { return 0; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			      -shared -o conftest.so conftest.c
+			      -fPIC -shared -o conftest.so conftest.c
 			      -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
 			      -nostdlib 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -5667,7 +5667,7 @@ extern int mumble;
 int foo (void) { return bar (mumble); }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			-shared -o conftest.so conftest.c
+			-fPIC -shared -o conftest.so conftest.c
 			-nostdlib -nostartfiles
 			-Wl,-z,combreloc 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@@ -5705,7 +5705,7 @@ else
 int _start (void) { return 42; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			      -shared -o conftest.so conftest.c
+			      -fPIC -shared -o conftest.so conftest.c
 			      -Wl,-z,execstack -nostdlib
 			      1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

glibc-aio-rh171968.patch:
 nptl/sysdeps/pthread/aio_misc.h                    |   74 ++++++++++++
 nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h   |   24 +++-
 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h |   23 +++
 rt/Makefile                                        |    3 
 rt/tst-aio10.c                                     |  119 ++++++++++++++++++++
 rt/tst-aio9.c                                      |  124 +++++++++++++++++++++
 sysdeps/pthread/aio_misc.h                         |    2 
 sysdeps/pthread/aio_notify.c                       |   16 +-
 sysdeps/pthread/aio_suspend.c                      |   36 +++++-
 sysdeps/pthread/lio_listio.c                       |   12 +-
 10 files changed, 415 insertions(+), 18 deletions(-)

--- NEW FILE glibc-aio-rh171968.patch ---
2006-01-05  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/pthread/aio_misc.h [!DONT_USE_BOOTSTRAP_MAP]
	(struct waitlist): Don't add cond.
	* sysdeps/pthread/aio_notify.c [!DONT_USE_BOOTSTRAP_MAP]
	(__aio_notify): Use AIO_MISC_NOTIFY instead of pthread_cond_signal.
	* sysdeps/pthread/aio_suspend.c [!DONT_USE_BOOTSTRAP_MAP]: Don't
	use condvar, use AIO_MISC_WAIT.
	* sysdeps/pthread/lio_listio.c: Likewise.
	* rt/Makefile (tests): Add tst-aio9 and tst-aio10.
	* rt/tst-aio9.c: New file.
	* rt/tst-aio10.c: New file.

nptl/
2006-01-07  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/pthread/aio_misc.h (AIO_MISC_WAIT): Work around gcc
	being too clever and reloading the futex value where it shouldn't.

2006-01-05  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_futex_wait):
	Return status.
	(lll_futex_timed_wait): Define.
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
	* sysdeps/pthread/aio_misc.h: New file.

--- libc/sysdeps/pthread/aio_misc.h.jj	2003-08-14 02:01:40.000000000 +0200
+++ libc/sysdeps/pthread/aio_misc.h	2006-02-22 19:05:18.000000000 +0100
@@ -46,7 +46,9 @@ struct waitlist
   {
     struct waitlist *next;
 
+#ifndef DONT_NEED_AIO_MISC_COND
     pthread_cond_t *cond;
+#endif
     volatile int *counterp;
     /* The next field is used in asynchronous `lio_listio' operations.  */
     struct sigevent *sigevp;
--- libc/sysdeps/pthread/aio_notify.c.jj	2004-05-26 06:23:43.000000000 +0200
+++ libc/sysdeps/pthread/aio_notify.c	2006-02-22 19:10:15.000000000 +0100
@@ -144,15 +144,21 @@ __aio_notify (struct requestlist *req)
     {
       struct waitlist *next = waitlist->next;
 
-      /* Decrement the counter.  This is used in both cases.  */
-      --*waitlist->counterp;
-
       if (waitlist->sigevp == NULL)
-	pthread_cond_signal (waitlist->cond);
+	{
+#ifdef DONT_NEED_AIO_MISC_COND
+	  AIO_MISC_NOTIFY (waitlist);
+#else
+	  /* Decrement the counter.  */
+	  --*waitlist->counterp;
+
+	  pthread_cond_signal (waitlist->cond);
+#endif
+	}
       else
 	/* This is part of a asynchronous `lio_listio' operation.  If
 	   this request is the last one, send the signal.  */
-	if (*waitlist->counterp == 0)
+	if (--*waitlist->counterp == 0)
 	  {
 #ifdef BROKEN_THREAD_SIGNALS
 	    __aio_notify_only (waitlist->sigevp, waitlist->caller_pid);
--- libc/sysdeps/pthread/aio_suspend.c.jj	2003-08-14 02:04:38.000000000 +0200
+++ libc/sysdeps/pthread/aio_suspend.c	2006-02-22 19:11:54.000000000 +0100
@@ -44,7 +44,9 @@ struct clparam
   const struct aiocb *const *list;
   struct waitlist *waitlist;
   struct requestlist **requestlist;
+#ifndef DONT_NEED_AIO_MISC_COND
   pthread_cond_t *cond;
+#endif
   int nent;
 };
 
@@ -52,6 +54,12 @@ struct clparam
 static void
 cleanup (void *arg)
 {
+#ifdef DONT_NEED_AIO_MISC_COND
+  /* Acquire the mutex.  If pthread_cond_*wait is used this would
+     happen implicitly.  */
+  pthread_mutex_lock (&__aio_requests_mutex);
+#endif
+
   const struct clparam *param = (const struct clparam *) arg;
 
   /* Now remove the entry in the waiting list for all requests
@@ -75,8 +83,10 @@ cleanup (void *arg)
 	  *listp = (*listp)->next;
       }
 
+#ifndef DONT_NEED_AIO_MISC_COND
   /* Release the conditional variable.  */
   (void) pthread_cond_destroy (param->cond);
+#endif
 
   /* Release the mutex.  */
   pthread_mutex_unlock (&__aio_requests_mutex);
@@ -89,13 +99,21 @@ aio_suspend (list, nent, timeout)
      int nent;
      const struct timespec *timeout;
 {
+  if (__builtin_expect (nent < 0, 0))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
   struct waitlist waitlist[nent];
   struct requestlist *requestlist[nent];
+#ifndef DONT_NEED_AIO_MISC_COND
   pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+#endif
   int cnt;
   bool any = false;
   int result = 0;
-  int dummy;
+  int cntr = 1;
 
   /* Request the mutex.  */
   pthread_mutex_lock (&__aio_requests_mutex);
@@ -111,9 +129,11 @@ aio_suspend (list, nent, timeout)
 
 	    if (requestlist[cnt] != NULL)
 	      {
+#ifndef DONT_NEED_AIO_MISC_COND
 		waitlist[cnt].cond = &cond;
+#endif
 		waitlist[cnt].next = requestlist[cnt]->waiting;
-		waitlist[cnt].counterp = &dummy;
+		waitlist[cnt].counterp = &cntr;
 		waitlist[cnt].sigevp = NULL;
 #ifdef BROKEN_THREAD_SIGNALS
 		waitlist[cnt].caller_pid = 0;	/* Not needed.  */
@@ -139,12 +159,17 @@ aio_suspend (list, nent, timeout)
 	  .list = list,
 	  .waitlist = waitlist,
 	  .requestlist = requestlist,
+#ifndef DONT_NEED_AIO_MISC_COND
 	  .cond = &cond,
+#endif
 	  .nent = nent
 	};
 
       pthread_cleanup_push (cleanup, &clparam);
 
+#ifdef DONT_NEED_AIO_MISC_COND
+      AIO_MISC_WAIT (result, cntr, timeout, 1);
+#else
       if (timeout == NULL)
 	result = pthread_cond_wait (&cond, &__aio_requests_mutex);
       else
@@ -166,6 +191,7 @@ aio_suspend (list, nent, timeout)
 	  result = pthread_cond_timedwait (&cond, &__aio_requests_mutex,
 					   &abstime);
 	}
+#endif
 
       pthread_cleanup_pop (0);
     }
@@ -189,19 +215,23 @@ aio_suspend (list, nent, timeout)
 	  *listp = (*listp)->next;
       }
 
+#ifndef DONT_NEED_AIO_MISC_COND
   /* Release the conditional variable.  */
   if (__builtin_expect (pthread_cond_destroy (&cond) != 0, 0))
     /* This must never happen.  */
     abort ();
+#endif
 
   if (result != 0)
     {
-      /* An error occurred.  Possibly it's EINTR.  We have to translate
+#ifndef DONT_NEED_AIO_MISC_COND
+      /* An error occurred.  Possibly it's ETIMEDOUT.  We have to translate
 	 the timeout error report of `pthread_cond_timedwait' to the
 	 form expected from `aio_suspend'.  */
       if (result == ETIMEDOUT)
 	__set_errno (EAGAIN);
       else
+#endif
 	__set_errno (result);
 
       result = -1;
--- libc/sysdeps/pthread/lio_listio.c.jj	2003-08-14 02:06:07.000000000 +0200
+++ libc/sysdeps/pthread/lio_listio.c	2006-02-22 19:29:04.000000000 +0100
@@ -113,9 +113,11 @@ lio_listio (mode, list, nent, sig)
     }
   else if (mode == LIO_WAIT)
     {
+#ifndef DONT_NEED_AIO_MISC_COND
       pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-      struct waitlist waitlist[nent];
       int oldstate;
+#endif
+      struct waitlist waitlist[nent];
 
       total = 0;
       for (cnt = 0; cnt < nent; ++cnt)
@@ -124,7 +126,9 @@ lio_listio (mode, list, nent, sig)
 
 	  if (requests[cnt] != NULL && list[cnt]->aio_lio_opcode != LIO_NOP)
 	    {
+#ifndef DONT_NEED_AIO_MISC_COND
 	      waitlist[cnt].cond = &cond;
+#endif
 	      waitlist[cnt].next = requests[cnt]->waiting;
 	      waitlist[cnt].counterp = &total;
 	      waitlist[cnt].sigevp = NULL;
@@ -136,6 +140,9 @@ lio_listio (mode, list, nent, sig)
 	    }
 	}
 
+#ifdef DONT_NEED_AIO_MISC_COND
+      AIO_MISC_WAIT (result, total, NULL, 0);
+#else
       /* Since `pthread_cond_wait'/`pthread_cond_timedwait' are cancelation
 	 points we must be careful.  We added entries to the waiting lists
 	 which we must remove.  So defer cancelation for now.  */
@@ -151,6 +158,7 @@ lio_listio (mode, list, nent, sig)
       if (pthread_cond_destroy (&cond) != 0)
 	/* This must never happen.  */
 	abort ();
+#endif
     }
   else
     {
@@ -179,7 +187,9 @@ lio_listio (mode, list, nent, sig)
 	      if (requests[cnt] != NULL
 		  && list[cnt]->aio_lio_opcode != LIO_NOP)
 		{
+#ifndef DONT_NEED_AIO_MISC_COND
 		  waitlist->list[cnt].cond = NULL;
+#endif
 		  waitlist->list[cnt].next = requests[cnt]->waiting;
 		  waitlist->list[cnt].counterp = &waitlist->counter;
 		  waitlist->list[cnt].sigevp = &waitlist->sigev;
--- libc/rt/Makefile.jj	2005-04-27 10:01:44.000000000 +0200
+++ libc/rt/Makefile	2006-02-22 19:02:58.000000000 +0100
@@ -43,7 +43,8 @@ librt-routines = $(aio-routines) \
 
 tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
-	 tst-aio7 tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \
+	 tst-aio7 tst-aio9 tst-aio10 \
+	 tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \
 	 tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \
 	 tst-timer3 tst-timer4 tst-timer5 \
 	 tst-cpuclock1 tst-cpuclock2 \
--- libc/rt/tst-aio10.c.jj	2006-02-22 19:02:58.000000000 +0100
+++ libc/rt/tst-aio10.c	2006-02-22 19:02:58.000000000 +0100
@@ -0,0 +1,119 @@
+#include <aio.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+
+static pthread_barrier_t b;
+static pthread_t main_thread;
+static int flag;
+
+
+static void *
+tf (void *arg)
+{
+  int e = pthread_barrier_wait (&b);
+  if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("child: barrier_wait failed");
+      exit (1);
+    }
+
+  /* There is unfortunately no other way to try to make sure the other
+     thread reached the aio_suspend call.  This test could fail on
+     highly loaded machines.  */
+  sleep (2);
+
+  pthread_kill (main_thread, SIGUSR1);
+
+  while (1)
+    sleep (1000);
+
+  return NULL;
+}
+
+
+static void
+sh (int sig)
+{
+  flag = 1;
+}
+
+
+static int
+do_test (void)
+{
+  main_thread = pthread_self ();
+
+  struct sigaction sa;
+
+  sa.sa_handler = sh;
+  sa.sa_flags = 0;
+  sigemptyset (&sa.sa_mask);
+
+  if (sigaction (SIGUSR1, &sa, NULL) != 0)
+    {
+      puts ("sigaction failed");
+      return 1;
+    }
+
+  if (pthread_barrier_init (&b, NULL, 2) != 0)
+    {
+      puts ("barrier_init");
+      return 1;
+    }
+
+  int fds[2];
+  if (pipe (fds) != 0)
+    {
+      puts ("pipe failed");
+      return 1;
+    }
+
+  char buf[42];
+  struct aiocb req;
+  req.aio_fildes = fds[0];
+  req.aio_lio_opcode = LIO_READ;
+  req.aio_reqprio = 0;
+  req.aio_offset = 0;
+  req.aio_buf = buf;
+  req.aio_nbytes = sizeof (buf);
+  req.aio_sigevent.sigev_notify = SIGEV_NONE;
+
+  pthread_t th;
+  if (pthread_create (&th, NULL, tf, NULL) != 0)
+    {
+      puts ("create failed");
+      return 1;
+    }
+
+  int e = pthread_barrier_wait (&b);
+  if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("parent: barrier_wait failed");
+      exit (1);
+    }
+
+  struct aiocb *list[1];
+  list[0] = &req;
+
+  e = lio_listio (LIO_WAIT, list, 1, NULL);
+  if (e != -1)
+    {
+      puts ("lio_listio succeeded");
+      return 1;
+    }
+  if (errno != EINTR)
+    {
+      printf ("lio_listio did not return EINTR: %d (%d = %m)\n", e, errno);
+      return 1;
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 5
+#include "../test-skeleton.c"
--- libc/rt/tst-aio9.c.jj	2006-02-22 19:02:58.000000000 +0100
+++ libc/rt/tst-aio9.c	2006-02-22 19:02:58.000000000 +0100
@@ -0,0 +1,124 @@
+#include <aio.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+
+static pthread_barrier_t b;
+static pthread_t main_thread;
+static int flag;
+
+
+static void *
+tf (void *arg)
+{
+  int e = pthread_barrier_wait (&b);
+  if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("child: barrier_wait failed");
+      exit (1);
+    }
+
+  /* There is unfortunately no other way to try to make sure the other
+     thread reached the aio_suspend call.  This test could fail on
+     highly loaded machines.  */
+  sleep (2);
+
+  pthread_kill (main_thread, SIGUSR1);
+
+  while (1)
+    sleep (1000);
+
+  return NULL;
+}
+
+
+static void
+sh (int sig)
+{
+  flag = 1;
+}
+
+
+static int
+do_test (void)
+{
+  main_thread = pthread_self ();
+
+  struct sigaction sa;
+
+  sa.sa_handler = sh;
+  sa.sa_flags = 0;
+  sigemptyset (&sa.sa_mask);
+
+  if (sigaction (SIGUSR1, &sa, NULL) != 0)
+    {
+      puts ("sigaction failed");
+      return 1;
+    }
+
+  if (pthread_barrier_init (&b, NULL, 2) != 0)
+    {
+      puts ("barrier_init");
+      return 1;
+    }
+
+  int fds[2];
+  if (pipe (fds) != 0)
+    {
+      puts ("pipe failed");
+      return 1;
+    }
+
+  char buf[42];
+  struct aiocb req;
+  req.aio_fildes = fds[0];
+  req.aio_reqprio = 0;
+  req.aio_offset = 0;
+  req.aio_buf = buf;
+  req.aio_nbytes = sizeof (buf);
+  req.aio_sigevent.sigev_notify = SIGEV_NONE;
+
+  if (aio_read (&req) != 0)
+    {
+      puts ("aio_read failed");
+      return 1;
+    }
+
+  pthread_t th;
+  if (pthread_create (&th, NULL, tf, NULL) != 0)
+    {
+      puts ("create failed");
+      return 1;
+    }
+
+  int e = pthread_barrier_wait (&b);
+  if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+    {
+      puts ("parent: barrier_wait failed");
+      exit (1);
+    }
+
+  const struct aiocb *list[1];
+  list[0] = &req;
+
+  e = aio_suspend (list, 1, NULL);
+  if (e != -1)
+    {
+      puts ("aio_suspend succeeded");
+      return 1;
+    }
+  if (errno != EINTR)
+    {
+      puts ("aio_suspend did not return EINTR");
+      return 1;
+    }
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 5
+#include "../test-skeleton.c"
--- libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h.jj	2004-03-24 07:35:18.000000000 +0100
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
@@ -66,17 +66,33 @@
 
 
 #define lll_futex_wait(futex, val) \
-  do {									      \
-    int __ignore;							      \
+  ({									      \
+    int __status;							      \
     register __typeof (val) _val asm ("edx") = (val);			      \
     __asm __volatile (LLL_EBX_LOAD					      \
 		      LLL_ENTER_KERNEL					      \
 		      LLL_EBX_LOAD					      \
-		      : "=a" (__ignore)					      \
+		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (0),	      \
 			"c" (FUTEX_WAIT), "d" (_val),			      \
 			"i" (offsetof (tcbhead_t, sysinfo)));		      \
-  } while (0)
+    __status;								      \
+  })
+
+
+#define lll_futex_timed_wait(futex, val, timeout)			      \
+  ({									      \
+    int __status;							      \
+    register __typeof (val) _val asm ("edx") = (val);			      \
+    __asm __volatile (LLL_EBX_LOAD					      \
+		      LLL_ENTER_KERNEL					      \
+		      LLL_EBX_LOAD					      \
+		      : "=a" (__status)					      \
+		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (timeout),  \
+			"c" (FUTEX_WAIT), "d" (_val),			      \
+			"i" (offsetof (tcbhead_t, sysinfo)));		      \
+    __status;								      \
+  })
 
 
 #define lll_futex_wake(futex, nr) \
--- libc/nptl/sysdeps/pthread/aio_misc.h.jj	2006-02-22 19:02:58.000000000 +0100
+++ libc/nptl/sysdeps/pthread/aio_misc.h	2006-02-22 19:02:58.000000000 +0100
@@ -0,0 +1,74 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* We define a special synchronization primitive for AIO.  POSIX
+   conditional variables would be ideal but the pthread_cond_*wait
+   operations do not return on EINTR.  This is a requirement for
+   correct aio_suspend and lio_listio implementations.  */
+
+#include <assert.h>
+#include <pthreadP.h>
+#include <lowlevellock.h>
+
+#define DONT_NEED_AIO_MISC_COND	1
+
+#define AIO_MISC_NOTIFY(waitlist) \
+  do {									      \
+    if (--*waitlist->counterp == 0)					      \
+      lll_futex_wake (waitlist->counterp, 1);				      \
+  } while (0)
+
+#define AIO_MISC_WAIT(result, futex, timeout, cancel)			      \
+  do {									      \
+    volatile int *futexaddr = &futex;					      \
+    int oldval = futex;							      \
+									      \
+    if (oldval != 0)							      \
+      {									      \
+	pthread_mutex_unlock (&__aio_requests_mutex);			      \
+									      \
+	int oldtype;							      \
+	if (cancel)							      \
+	  oldtype = LIBC_CANCEL_ASYNC ();				      \
+									      \
+	int status;							      \
+	do								      \
+	  {								      \
+	    status = lll_futex_timed_wait (futexaddr, oldval, timeout);	      \
+	    if (status != -EWOULDBLOCK)					      \
+	      break;							      \
+									      \
+	    oldval = *futexaddr;					      \
+	  }								      \
+	while (oldval != 0);						      \
+									      \
+	if (cancel)							      \
+	  LIBC_CANCEL_RESET (oldtype);					      \
+									      \
+	if (status == -EINTR)						      \
+	  result = EINTR;						      \
+	else if (status == -ETIMEDOUT)					      \
+	  result = EAGAIN;						      \
+	else								      \
+	  assert (status == 0 || status == -EWOULDBLOCK);		      \
+									      \
+	pthread_mutex_lock (&__aio_requests_mutex);			      \
+      }									      \
+  } while (0)
+
+#include_next <aio_misc.h>
--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h.jj	2004-07-05 19:29:20.000000000 +0200
+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
@@ -47,16 +47,31 @@
 
 
 #define lll_futex_wait(futex, val) \
-  do {									      \
-    int __ignore;							      \
+  ({									      \
+    int __status;							      \
     register __typeof (val) _val asm ("edx") = (val);			      \
     __asm __volatile ("xorq %%r10, %%r10\n\t"				      \
 		      "syscall"						      \
-		      : "=a" (__ignore)					      \
+		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
 			"d" (_val)					      \
 		      : "memory", "cc", "r10", "r11", "cx");		      \
-  } while (0)
+    __status;								      \
+  })
+
+
+#define lll_futex_timed_wait(futex, val, timeout)			      \
+  ({									      \
+    register const struct timespec *__to __asm__ ("r10") = timeout;	      \
+    int __status;							      \
+    register __typeof (val) _val asm ("edx") = (val);			      \
+    __asm __volatile ("syscall"						      \
+		      : "=a" (__status)					      \
+		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
+		        "d" (_val), "r" (__to)				      \
+		      : "memory", "cc", "r11", "cx");			      \
+    __status;								      \
+  })
 
 
 #define lll_futex_wake(futex, nr) \

glibc-bindresvport.patch:
 bindrsvprt.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

--- NEW FILE glibc-bindresvport.patch ---
2005-11-21  Jakub Jelinek  <jakub at redhat.com>

	* sunrpc/bindrsvprt.c (bindresvport): Wrap around to startport
	in the loop if port is bigger than endport, initially set to
	ENDPORT.  When changing startport, set endport and port
	appropriately.

--- libc/sunrpc/bindrsvprt.c	23 May 2005 19:03:43 -0000	1.11
+++ libc/sunrpc/bindrsvprt.c	22 Nov 2005 04:39:05 -0000	1.12
@@ -74,14 +74,13 @@ bindresvport (int sd, struct sockaddr_in
   int res = -1;
 
   int nports = ENDPORT - startport + 1;
+  int endport = ENDPORT;
  again:
   for (i = 0; i < nports; ++i)
     {
       sin->sin_port = htons (port++);
-      if (port > ENDPORT)
-	{
-	  port = startport;
-	}
+      if (port > endport)
+	port = startport;
       res = __bind (sd, sin, sizeof (struct sockaddr_in));
       if (res >= 0 || errno != EADDRINUSE)
 	break;
@@ -90,7 +89,9 @@ bindresvport (int sd, struct sockaddr_in
   if (i == nports && startport != LOWPORT)
     {
       startport = LOWPORT;
+      endport = STARTPORT - 1;
       nports = STARTPORT - LOWPORT;
+      port = LOWPORT + port % (STARTPORT - LOWPORT);
       goto again;
     }
 

glibc-bz1566.patch:
 i586/memusage.h |    1 +
 memusage.h      |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-bz1566.patch ---
2005-12-23  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1566]
	* sysdeps/i386/i586/memusage.h: New file.
	* sysdeps/i386/memusage.h: Don't define GETTIME.

--- libc/sysdeps/i386/memusage.h	6 Jul 2001 04:55:52 -0000	1.3
+++ libc/sysdeps/i386/memusage.h	23 Dec 2005 15:27:21 -0000	1.4
@@ -17,6 +17,5 @@
    02111-1307 USA.  */
 
 #define GETSP() ({ register uintptr_t stack_ptr asm ("esp"); stack_ptr; })
-#define GETTIME(low,high) asm ("rdtsc" : "=a" (low), "=d" (high))
 
 #include <sysdeps/generic/memusage.h>
--- libc/sysdeps/i386/i586/memusage.h	1 Jan 1970 00:00:00 -0000
+++ libc/sysdeps/i386/i586/memusage.h	23 Dec 2005 15:26:46 -0000	1.1
@@ -0,0 +1 @@
+#include "../i686/memusage.h"

glibc-bz1877.patch:
 string/test-strncmp.c               |   85 ++++++++++++++++++++++++++++++++++--
 sysdeps/powerpc/powerpc32/strncmp.S |   17 ++++---
 sysdeps/powerpc/powerpc64/strncmp.S |   17 ++++---
 3 files changed, 103 insertions(+), 16 deletions(-)

--- NEW FILE glibc-bz1877.patch ---
2005-11-17  Steven Munroe  <sjmunroe at us.ibm.com>

	[BZ #1877]
	* string/test-strncmp.c (do_test_limit): Handle zero length and
	non-zero align values.
	(test_main): Correct do_test_limit tests for 64-bit.

	[BZ #1877]
	* string/test-strncmp.c (do_test_limit): New function.
	(do_test) Add cast to eliminate compiler warnings.
	(do_random_tests) Add cast to eliminate compiler warnings.
	(test_main) Add do_test_limit tests.
	* sysdeps/powerpc/powerpc32/strncmp.S: Test length before unaligned
	load.
	* sysdeps/powerpc/powerpc64/strncmp.S: Likewise.

--- libc/sysdeps/powerpc/powerpc32/strncmp.S	3 Nov 2003 17:38:35 -0000	1.1
+++ libc/sysdeps/powerpc/powerpc32/strncmp.S	17 Nov 2005 21:14:37 -0000	1.2
@@ -47,6 +47,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 	lis	r7F7F, 0x7f7f
 	dcbt	0,rSTR2
 	clrlwi.	rTMP, rTMP, 30
+	cmplwi	cr1, rN, 0
 	lis	rFEFE, -0x101
 	bne	L(unaligned)
 /* We are word alligned so set up for two loops.  first a word
@@ -54,7 +55,8 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 	srwi.	rTMP, rN, 2
 	clrlwi	rN, rN, 30
 	addi	rFEFE, rFEFE, -0x101
-	addi	r7F7F, r7F7F, 0x7f7f	
+	addi	r7F7F, r7F7F, 0x7f7f
+	cmplwi	cr1, rN, 0	
 	beq	L(unaligned)
 
 	mtctr	rTMP	/* Power4 wants mtctr 1st in dispatch group.  */
@@ -122,16 +124,19 @@ L(tail):
 	addi	rSTR1, rSTR1, 4
 	bne-	cr1, L(different)
 	addi	rSTR2, rSTR2, 4
+	cmplwi	cr1, rN, 0
 L(unaligned):
 	mtctr   rN	/* Power4 wants mtctr 1st in dispatch group */
-	cmpwi	rN,0
-	lbz	rWORD1, 0(rSTR1)
-	lbz	rWORD2, 0(rSTR2)
-	bgt	L(u1)
+	bgt	cr1, L(uz)
 L(ux):
 	li	rRTN, 0
 	blr
-
+	.align 4
+L(uz):
+	lbz	rWORD1, 0(rSTR1)
+	lbz	rWORD2, 0(rSTR2)
+	nop
+	b	L(u1)
 L(u0):
 	lbzu	rWORD2, 1(rSTR2)
 L(u1):
--- libc/sysdeps/powerpc/powerpc64/strncmp.S	6 Oct 2004 22:08:54 -0000	1.2
+++ libc/sysdeps/powerpc/powerpc64/strncmp.S	17 Nov 2005 21:14:37 -0000	1.3
@@ -48,6 +48,7 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 	lis	r7F7F, 0x7f7f
 	dcbt	0,rSTR2
 	clrldi.	rTMP, rTMP, 61
+	cmpldi	cr1, rN, 0
 	lis	rFEFE, -0x101
 	bne	L(unaligned)
 /* We are doubleword alligned so set up for two loops.  first a double word
@@ -55,7 +56,8 @@ EALIGN (BP_SYM(strncmp), 4, 0)
 	srdi.	rTMP, rN, 3
 	clrldi	rN, rN, 61
 	addi	rFEFE, rFEFE, -0x101
-	addi	r7F7F, r7F7F, 0x7f7f	
+	addi	r7F7F, r7F7F, 0x7f7f
+	cmpldi	cr1, rN, 0	
 	beq	L(unaligned)
 
 	mtctr	rTMP	/* Power4 wants mtctr 1st in dispatch group.  */
@@ -126,16 +128,19 @@ L(tail):
 	addi	rSTR1, rSTR1, 8
 	bne-	cr1, L(different)
 	addi	rSTR2, rSTR2, 8
+	cmpldi	cr1, rN, 0
 L(unaligned):
 	mtctr   rN	/* Power4 wants mtctr 1st in dispatch group */
-	cmpdi	rN,0
-	lbz	rWORD1, 0(rSTR1)
-	lbz	rWORD2, 0(rSTR2)
-	bgt	L(u1)
+	bgt	cr1, L(uz)
 L(ux):
 	li	rRTN, 0
 	blr
-
+	.align 4
+L(uz):
+	lbz	rWORD1, 0(rSTR1)
+	lbz	rWORD2, 0(rSTR2)
+	nop
+	b	L(u1)
 L(u0):
 	lbzu	rWORD2, 1(rSTR2)
 L(u1):
--- libc/string/test-strncmp.c	17 Apr 2003 17:37:24 -0000	1.5
+++ libc/string/test-strncmp.c	18 Nov 2005 00:11:55 -0000	1.7
@@ -86,6 +86,65 @@ do_one_test (impl_t *impl, const char *s
 }
 
 static void
+do_test_limit (size_t align1, size_t align2, size_t len, size_t n, int max_char,
+	 int exp_result)
+{
+  size_t i, align_n;
+  char *s1, *s2;
+
+  if (n == 0)
+    {
+      s1 = (char*)(buf1 + page_size);
+      s2 = (char*)(buf2 + page_size);
+      if (HP_TIMING_AVAIL)
+	printf ("Length %4zd/%4zd:", len, n);
+	
+      FOR_EACH_IMPL (impl, 0)
+	do_one_test (impl, s1, s2, n, 0);
+
+      if (HP_TIMING_AVAIL)
+	putchar ('\n');
+	
+      return;
+    }
+
+  align1 &= 15;
+  align2 &= 15;
+  align_n = (page_size - n) & 15;
+
+  s1 = (char*)(buf1 + page_size - n);
+  s2 = (char*)(buf2 + page_size - n);
+  
+  if (align1 < align_n)
+    s1 -= (align_n - align1);
+    
+  if (align2 < align_n)
+    s2 -= (align_n - align2);
+    
+  for (i = 0; i < n; i++)
+    s1[i] = s2[i] = 1 + 23 * i % max_char;
+
+  if (len < n)
+    {
+      s1[len] = 0;
+      s2[len] = 0;
+      if (exp_result < 0)
+	s2[len] = 32;
+      else if (exp_result > 0)
+	s1[len] = 64;
+    }
+
+  if (HP_TIMING_AVAIL)
+    printf ("Length %4zd/%4zd, alignment %2zd/%2zd:", len, n, align1, align2);
+
+  FOR_EACH_IMPL (impl, 0)
+    do_one_test (impl, s1, s2, n, exp_result);
+
+  if (HP_TIMING_AVAIL)
+    putchar ('\n');
+}
+
+static void
 do_test (size_t align1, size_t align2, size_t len, size_t n, int max_char,
 	 int exp_result)
 {
@@ -103,8 +162,8 @@ do_test (size_t align1, size_t align2, s
   if (align2 + n + 1 >= page_size)
     return;
 
-  s1 = buf1 + align1;
-  s2 = buf2 + align2;
+  s1 = (char*)(buf1 + align1);
+  s2 = (char*)(buf2 + align2);
 
   for (i = 0; i < n; i++)
     s1[i] = s2[i] = 1 + 23 * i % max_char;
@@ -124,7 +183,7 @@ do_test (size_t align1, size_t align2, s
     printf ("Length %4zd/%4zd, alignment %2zd/%2zd:", len, n, align1, align2);
 
   FOR_EACH_IMPL (impl, 0)
-    do_one_test (impl, s1, s2, n, exp_result);
+    do_one_test (impl, (char*)s1, (char*)s2, n, exp_result);
 
   if (HP_TIMING_AVAIL)
     putchar ('\n');
@@ -208,7 +267,7 @@ do_random_tests (void)
 
       FOR_EACH_IMPL (impl, 1)
 	{
-	  r = CALL (impl, p1 + align1, p2 + align2, size);
+	  r = CALL (impl, (char*)(p1 + align1), (char*)(p2 + align2), size);
 	  /* Test whether on 64-bit architectures where ABI requires
 	     callee to promote has the promotion been done.  */
 	  asm ("" : "=g" (r) : "0" (r));
@@ -271,6 +330,24 @@ test_main (void)
       do_test (2 * i, i, 8 << i, 16 << i, 255, 0);
       do_test (2 * i, i, 8 << i, 16 << i, 255, 1);
     }
+    
+  do_test_limit (0, 0, 0, 0, 127, 0);
+  do_test_limit (4, 0, 21, 20, 127, 0);
+  do_test_limit (0, 4, 21, 20, 127, 0);
+  do_test_limit (8, 0, 25, 24, 127, 0);
+  do_test_limit (0, 8, 25, 24, 127, 0);
+
+  for (i = 0; i < 8; ++i)
+    {
+      do_test_limit (0, 0, 17 - i, 16 - i, 127, 0);
+      do_test_limit (0, 0, 17 - i, 16 - i, 255, 0);
+      do_test_limit (0, 0, 15 - i, 16 - i, 127, 0);
+      do_test_limit (0, 0, 15 - i, 16 - i, 127, 1);
+      do_test_limit (0, 0, 15 - i, 16 - i, 127, -1);
+      do_test_limit (0, 0, 15 - i, 16 - i, 255, 0);
+      do_test_limit (0, 0, 15 - i, 16 - i, 255, 1);
+      do_test_limit (0, 0, 15 - i, 16 - i, 255, -1);
+    }
 
   do_random_tests ();
   return ret;

glibc-bz1913.patch:
 sem_wait.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE glibc-bz1913.patch ---
2005-12-22  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1913]
	* sysdeps/unix/sysv/linux/i386/i486/sem_wait.S (__new_sem_wait):
	Fix unwind info.  Remove useless branch prediction prefix.

--- libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S	26 Jan 2005 19:57:25 -0000	1.6
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S	22 Dec 2005 17:58:29 -0000	1.7
@@ -57,7 +57,7 @@ __new_sem_wait:
 	cfi_offset(6, -12)		/* %esi */
 3:	movl	(%ebx), %eax
 2:	testl	%eax, %eax
-	je,pn	1f
+	je	1f
 
 	leal	-1(%eax), %edx
 	LOCK
@@ -73,7 +73,7 @@ __new_sem_wait:
 	cfi_adjust_cfa_offset(-12)
 	ret
 
-	cfi_adjust_cfa_offset(8)
+	cfi_adjust_cfa_offset(12)
 	cfi_offset(3, -8)		/* %ebx */
 	cfi_offset(6, -12)		/* %esi */
 1:	call	__pthread_enable_asynccancel

glibc-bz1920.patch:
 pthread/pthread.h                          |    4 ++--
 unix/sysv/linux/i386/bits/pthreadtypes.h   |    2 +-
 unix/sysv/linux/x86_64/bits/pthreadtypes.h |    5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE glibc-bz1920.patch ---
2005-11-24  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
	(__cleanup_fct_attribute): Use __regparm__ not regparm.

	* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: When
	compiling 32-bit code we must define __cleanup_fct_attribute.

005-11-24  Jakub Jelinek  <jakub at redhat.com>

	[BZ #1920]
	* sysdeps/pthread/pthread.h (__pthread_unwind_next): Use
	__attribute__ instead of __attribute.
	* sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
	(__cleanup_fct_attribute): Likewise.

--- libc/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h	28 Sep 2004 10:27:49 -0000	1.17
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h	24 Nov 2005 18:27:08 -0000	1.19
@@ -155,6 +155,6 @@ typedef union
 
 
 /* Extra attributes for the cleanup functions.  */
-#define __cleanup_fct_attribute __attribute ((regparm (1)))
+#define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
 
 #endif	/* bits/pthreadtypes.h */
--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h	6 Oct 2004 18:05:42 -0000	1.20
+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h	24 Nov 2005 18:25:32 -0000	1.21
@@ -192,4 +192,9 @@ typedef union
 #endif
 
 
+#if __WORDSIZE == 32
+/* Extra attributes for the cleanup functions.  */
+# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
+#endif
+
 #endif	/* bits/pthreadtypes.h */
--- libc/nptl/sysdeps/pthread/pthread.h	11 Jul 2005 16:38:01 -0000	1.34
+++ libc/nptl/sysdeps/pthread/pthread.h	24 Nov 2005 18:15:53 -0000	1.35
@@ -657,9 +657,9 @@ extern void __pthread_unregister_cancel_
 
 /* Internal interface to initiate cleanup.  */
 extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
-     __cleanup_fct_attribute __attribute ((__noreturn__))
+     __cleanup_fct_attribute __attribute__ ((__noreturn__))
 # ifndef SHARED
-     __attribute ((__weak__))
+     __attribute__ ((__weak__))
 # endif
      ;
 #endif

glibc-bz1952.patch:
 i386/syscalls.list |    1 -
 time.c             |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz1952.patch ---
2005-12-20  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
	use sysdeps/unix/time.c implementation.

2005-12-19  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1952]
	* sysdeps/unix/sysv/linux/time.c: New file.
	* sysdeps/unix/sysv/linux/i386/syscalls.list: Remove time entry.

--- libc/sysdeps/unix/sysv/linux/time.c	1 Jan 1970 00:00:00 -0000
+++ libc/sysdeps/unix/sysv/linux/time.c	20 Dec 2005 14:57:37 -0000	1.2
@@ -0,0 +1,43 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stddef.h>
+#include <time.h>
+
+#include <sysdep.h>
+
+#ifdef __NR_time
+
+time_t
+time (t)
+     time_t *t;
+{
+  INTERNAL_SYSCALL_DECL (err);
+  time_t res = INTERNAL_SYSCALL (time, err, 1, NULL);
+  /* There cannot be any error.  */
+  if (t != NULL)
+    *t = res;
+  return res;
+}
+libc_hidden_def (time)
+
+#else
+
+# include <sysdeps/unix/time.c>
+
+#endif
--- libc/sysdeps/unix/sysv/linux/i386/syscalls.list	10 Mar 2004 08:38:15 -0000	1.19
+++ libc/sysdeps/unix/sysv/linux/i386/syscalls.list	20 Dec 2005 07:52:13 -0000	1.20
@@ -5,5 +5,4 @@ vm86old		EXTRA	vm86old		i:p	__vm86old	vm
 vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2.3.4
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit at GLIBC_2.0
 oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit at GLIBC_2.0
-time		-	time		Ei:p	time
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid

glibc-bz1955.patch:
 zic.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-bz1955.patch ---
2005-12-19  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1955]
	* timezone/zic.c (tofile;): Fix typo in symlink creation.
	Patch by Phil Estes <pestes at us.ibm.com>.

--- libc/timezone/zic.c	6 Aug 2005 05:40:57 -0000	1.20
+++ libc/timezone/zic.c	20 Dec 2005 07:55:45 -0000	1.21
@@ -650,7 +650,7 @@ const char * const	tofile;
 						"../");
 					symlinkcontents =
 						ecatalloc(symlinkcontents,
-						fromfile);
+							  fromname);
 					result = symlink(symlinkcontents,
 						toname);
 					if (result == 0)

glibc-bz1962.patch:
 fts.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE glibc-bz1962.patch ---
2005-12-21  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1962]
	* io/fts.c (fts_open): Change type of len to size_t.
	(fts_build): Remove cast in call to fts_alloc.
	(fts_alloc): Change third parameter's type to size_t.

	[BZ #1960]
	* io/fts.c (fts_open): Avoid function call in MAX macro use.

--- libc/io/fts.c	14 Sep 2004 04:24:44 -0000	1.29
+++ libc/io/fts.c	21 Dec 2005 08:33:31 -0000	1.31
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (B
 #endif
 
 
-static FTSENT	*fts_alloc (FTS *, const char *, int) internal_function;
+static FTSENT	*fts_alloc (FTS *, const char *, size_t) internal_function;
 static FTSENT	*fts_build (FTS *, int) internal_function;
 static void	 fts_lfree (FTSENT *) internal_function;
 static void	 fts_load (FTS *, FTSENT *) internal_function;
@@ -94,7 +94,6 @@ fts_open(argv, options, compar)
 	register FTSENT *p, *root;
 	register int nitems;
 	FTSENT *parent, *tmp;
-	int len;
 
 	/* Options check. */
 	if (options & ~FTS_OPTIONMASK) {
@@ -120,7 +119,8 @@ fts_open(argv, options, compar)
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
 #endif
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
+	size_t maxarglen = fts_maxarglen(argv);
+	if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
 		goto mem1;
 
 	/* Allocate/initialize root's parent. */
@@ -131,7 +131,8 @@ fts_open(argv, options, compar)
 	/* Allocate/initialize root(s). */
 	for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
 		/* Don't allow zero-length paths. */
-		if ((len = strlen(*argv)) == 0) {
+		size_t len = strlen(*argv);
+		if (len == 0) {
 			__set_errno (ENOENT);
 			goto mem3;
 		}
@@ -690,7 +691,7 @@ fts_build(sp, type)
 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
 			continue;
 
-		if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
+		if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL)
 			goto mem1;
 		if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
 			oldaddr = sp->fts_path;
@@ -961,7 +962,7 @@ internal_function
 fts_alloc(sp, name, namelen)
 	FTS *sp;
 	const char *name;
-	register int namelen;
+	size_t namelen;
 {
 	register FTSENT *p;
 	size_t len;

glibc-bz1978.patch:
 internal_statvfs.c |   27 +++++++++++++++++++++++++++
 linux_fsinfo.h     |    3 +++
 2 files changed, 30 insertions(+)

--- NEW FILE glibc-bz1978.patch ---
2005-12-16  Thorsten Kukuk  <kukuk at suse.de>

	[BZ #1978]
	* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
	Map more filesystem types to a string.
	* sysdeps/unix/sysv/linux/linux_fsinfo.h: Add SYSFS_MAGIC.

--- libc/sysdeps/unix/sysv/linux/internal_statvfs.c	3 Apr 2004 17:32:18 -0000	1.13
+++ libc/sysdeps/unix/sysv/linux/internal_statvfs.c	20 Dec 2005 07:20:16 -0000	1.14
@@ -71,6 +71,33 @@ __statvfs_getflags (const char *name, in
     case NFS_SUPER_MAGIC:
       fsname = "nfs";
       break;
+    case SYSFS_MAGIC:
+      fsname = "sysfs";
+      break;
+    case REISERFS_SUPER_MAGIC:
+      fsname = "reiserfs";
+      break;
+    case XFS_SUPER_MAGIC:
+      fsname = "xfs";
+      break;
+    case JFS_SUPER_MAGIC:
+      fsname = "jfs";
+      break;
+    case HPFS_SUPER_MAGIC:
+      fsname = "hpfs";
+      break;
+    case DEVFS_SUPER_MAGIC:
+      fsname = "devfs";
+      break;
+    case ISOFS_SUPER_MAGIC:
+      fsname = "iso9660";
+      break;
+    case MSDOS_SUPER_MAGIC:
+      fsname = "msdos";
+      break;
+    case NTFS_SUPER_MAGIC:
+      fsname = "ntfs";
+      break;
     }
 
   FILE *mtab = __setmntent ("/proc/mounts", "r");
--- libc/sysdeps/unix/sysv/linux/linux_fsinfo.h	17 Sep 2003 00:48:25 -0000	1.14
+++ libc/sysdeps/unix/sysv/linux/linux_fsinfo.h	20 Dec 2005 07:21:14 -0000	1.15
@@ -135,6 +135,9 @@
 /* Constants that identify the `vxfs' filesystem.  */
 #define VXFS_SUPER_MAGIC	0xa501fcf5
 
+/* Constants that identify the `sysfs? filesystem.  */
+#define SYSFS_MAGIC		0x62656572
+
 /* Maximum link counts.  */
 #define COH_LINK_MAX		10000
 #define EXT2_LINK_MAX		32000

glibc-bz2066.patch:
 l10nflist.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz2066.patch ---
2005-12-21  Roland McGrath  <roland at redhat.com>

	[BZ #2066]
	* intl/l10nflist.c (_nl_make_l10nflist): Free ABS_FILENAME when later
	malloc fails.

--- libc/intl/l10nflist.c	26 Sep 2004 05:06:25 -0000	1.32
+++ libc/intl/l10nflist.c	22 Dec 2005 01:03:27 -0000	1.33
@@ -270,7 +270,10 @@ _nl_make_l10nflist (l10nfile_list, dirli
 				* (1 << pop (mask))
 				* sizeof (struct loaded_l10nfile *)));
   if (retval == NULL)
-    return NULL;
+    {
+      free (abs_filename);
+      return NULL;
+    }
 
   retval->filename = abs_filename;
   /* If more than one directory is in the list this is a pseudo-entry

glibc-bz2080.patch:
 iogetwline.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-bz2080.patch ---
2005-12-30  Ulrich Drepper  <drepper at redhat.com>

	[BZ #2080]
	* libio/iogetwline.c (_IO_getwline_info): Move return to correct
	location.

--- libc/libio/iogetwline.c	26 Feb 2002 01:43:50 -0000	1.7
+++ libc/libio/iogetwline.c	30 Dec 2005 18:06:43 -0000	1.8
@@ -87,9 +87,9 @@ _IO_getwline_info (fp, buf, n, delim, ex
 		*ptr++ = wc;
 	      else if (extract_delim < 0)
 		INTUSE(_IO_sputbackc) (fp, wc);
-	      return ptr - buf;
 	      if (extract_delim > 0)
 		++len;
+	      return ptr - buf;
 	    }
 	  *ptr++ = wc;
 	  n--;

glibc-bz2126.patch:
 string/Makefile            |    2 +-
 string/bug-strtok1.c       |   45 +++++++++++++++++++++++++++++++++++++++++++++
 sysdeps/i386/i686/strtok.S |    8 ++++++--
 sysdeps/i386/strtok.S      |    4 ++++
 sysdeps/x86_64/strtok.S    |    2 ++
 5 files changed, 58 insertions(+), 3 deletions(-)

--- NEW FILE glibc-bz2126.patch ---
2006-01-09  Ulrich Drepper  <drepper at redhat.com>

	[BZ #2126]
	* sysdeps/i386/i686/strtok.S: Store pointer to NUL byte if NULL is
	returned.
	* sysdeps/i386/strtok.S: Likewise.
	* sysdeps/x86_64/strtok.S: Likewise.
	* string/Makefile (tests): Add bug-strtok1.
	* string/bug-strtok1.c: New file.

--- libc/sysdeps/i386/strtok.S	4 May 2005 17:52:10 -0000	1.14
+++ libc/sysdeps/i386/strtok.S	10 Jan 2006 00:22:31 -0000	1.15
@@ -385,6 +385,10 @@ L(epilogue):
 
 L(returnNULL):
 	xorl %eax, %eax
+#ifdef USE_AS_STRTOK_R
+	movl SAVE(%esp), %ecx
+#endif
+	movl %edx, SAVE_PTR
 	RETURN_NULL_BOUNDED_POINTER
 	jmp L(epilogue)
 
--- libc/sysdeps/i386/i686/strtok.S	4 May 2005 06:21:50 -0000	1.8
+++ libc/sysdeps/i386/i686/strtok.S	10 Jan 2006 00:23:13 -0000	1.9
@@ -250,9 +250,9 @@ L(8):	cmpl %eax, %edx
 	cmovne %ecx, %edx
 
 	/* Store the pointer to the next character.  */
-# ifdef USE_AS_STRTOK_R
+#ifdef USE_AS_STRTOK_R
 	movl SAVE(%esp), %ecx
-# endif
+#endif
 	movl %edx, SAVE_PTR
 	CHECK_BOUNDS_HIGH (%edx, SAVE_PTR, jb)
 	RETURN_BOUNDED_POINTER (SAVE_PTR)
@@ -271,6 +271,10 @@ L(epilogue):
 
 L(returnNULL):
 	xorl %eax, %eax
+#ifdef USE_AS_STRTOK_R
+	movl SAVE(%esp), %ecx
+#endif
+	movl %edx, SAVE_PTR
 	RETURN_NULL_BOUNDED_POINTER
 	jmp L(epilogue)
 
--- libc/sysdeps/x86_64/strtok.S	31 Mar 2005 10:00:13 -0000	1.3
+++ libc/sysdeps/x86_64/strtok.S	10 Jan 2006 00:12:59 -0000	1.4
@@ -205,6 +205,8 @@ L(epilogue):
 
 L(returnNULL):
 	xorl %eax, %eax
+	/* Store the pointer to the next character.  */
+	movq %rdx, SAVE_PTR
 	jmp L(epilogue)
 
 END (BP_SYM (FUNCTION))
--- libc/string/bug-strtok1.c 1 Jan 1970 00:00:00 -0000
+++ libc/string/bug-strtok1.c	10 Jan 2006 00:12:13 -0000	1.1
@@ -0,0 +1,45 @@
+/* See BZ #2126.  */
+#include <string.h>
+#include <stdio.h>
+
+static int
+do_test (void)
+{
+  const char str[] = "axaaba";
+  char *token;
+  char *cp;
+  char *l;
+  int result = 0;
+
+  puts ("test strtok");
+  cp = strdupa (str);
+  printf ("cp = %p, len = %zu\n", cp, strlen (cp));
+  token = strtok (cp, "ab");
+  result |= token == NULL || strcmp (token, "x");
+  printf ("token: %s (%d)\n", token ? token : "NULL", result);
+  token = strtok(0, "ab");
+  result |= token != NULL;
+  printf ("token: %s (%d)\n", token ? token : "NULL", result);
+  token = strtok(0, "a");
+  result |= token != NULL;
+  printf ("token: %s (%d)\n", token ? token : "NULL", result);
+
+  puts ("test strtok_r");
+  cp = strdupa (str);
+  size_t len = strlen (cp);
+  printf ("cp = %p, len = %zu\n", cp, len);
+  token = strtok_r (cp, "ab", &l);
+  result |= token == NULL || strcmp (token, "x");
+  printf ("token: %s, next = %p (%d)\n", token ? token : "NULL", l, result);
+  token = strtok_r(0, "ab", &l);
+  result |= token != NULL || l != cp + len;
+  printf ("token: %s, next = %p (%d)\n", token ? token : "NULL", l, result);
+  token = strtok_r(0, "a", &l);
+  result |= token != NULL || l != cp + len;
+  printf ("token: %s,  next = %p (%d)\n", token ? token : "NULL", l, result);
+
+  return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
--- libc/string/Makefile	12 Apr 2005 15:27:59 -0000	1.66
+++ libc/string/Makefile	10 Jan 2006 00:11:53 -0000	1.67
@@ -53,7 +53,7 @@ tests		:= tester inl-tester noinl-tester
 		   tst-strlen stratcliff tst-svc tst-inlcall		\
 		   bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap	\
 		   tst-strtok tst-strxfrm bug-strcoll1 tst-strfry	\
-		   $(addprefix test-,$(strop-tests))
+		   bug-strtok1 $(addprefix test-,$(strop-tests))
 distribute	:= memcopy.h pagecopy.h tst-svc.expect test-string.h
 
 

glibc-bz2153.patch:
 math/libm-test.inc                       |    2 +-
 sysdeps/alpha/fpu/libm-test-ulps         |    4 ++--
 sysdeps/generic/s_cacosh.c               |    3 +++
 sysdeps/generic/s_cacoshf.c              |    3 +++
 sysdeps/generic/s_cacoshl.c              |    3 +++
 sysdeps/hppa/fpu/libm-test-ulps          |    4 ++--
 sysdeps/i386/fpu/libm-test-ulps          |    4 ++--
 sysdeps/ia64/fpu/libm-test-ulps          |    4 ++--
 sysdeps/m68k/fpu/libm-test-ulps          |    4 ++--
 sysdeps/mips/fpu/libm-test-ulps          |    4 ++--
 sysdeps/powerpc/fpu/libm-test-ulps       |    4 ++--
 sysdeps/s390/fpu/libm-test-ulps          |    4 ++--
 sysdeps/sh/sh4/fpu/libm-test-ulps        |    4 ++--
 sysdeps/sparc/sparc32/fpu/libm-test-ulps |    4 ++--
 sysdeps/sparc/sparc64/fpu/libm-test-ulps |    4 ++--
 sysdeps/x86_64/fpu/libm-test-ulps        |    4 ++--
 16 files changed, 34 insertions(+), 25 deletions(-)

--- NEW FILE glibc-bz2153.patch ---
2006-01-15  Andreas Jaeger  <aj at suse.de>

	[BZ #2153]
	* sysdeps/generic/s_cacosh.c (__cacosh): Do not return a negative
	value. Patch by Wes Loewer <wjltemp-temp01 at yahoo.com>.
	* sysdeps/generic/s_cacoshl.c (__cacoshl): Likewise.
	* sysdeps/generic/s_cacoshf.c (__cacoshf): Likewise.
	* math/libm-test.inc (cacosh_test): Adjust for change.

	* sysdeps/alpha/fpu/libm-test-ulps: Adopt for cacosh test change.
	* sysdeps/hppa/fpu/libm-test-ulps: Likewise.
	* sysdeps/i386/fpu/libm-test-ulps: Likewise.
	* sysdeps/ia64/fpu/libm-test-ulps: Likewise.
	* sysdeps/m68k/fpu/libm-test-ulps: Likewise.
	* sysdeps/mips/fpu/libm-test-ulps: Likewise.
	* sysdeps/powerpc/fpu/libm-test-ulps: Likewise.
	* sysdeps/s390/fpu/libm-test-ulps: Likewise.
	* sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
	* sysdeps/sh/sh4/fpu/libm-test-ulps: Likewise.
	* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Likewise.
	* sysdeps/sparc/sparc64/fpu/libm-test-ulps: Likewise.

--- libc/sysdeps/generic/s_cacosh.c	14 Dec 2005 10:12:27 -0000	1.1
+++ libc/sysdeps/generic/s_cacosh.c	15 Jan 2006 17:51:31 -0000	1.2
@@ -73,6 +73,9 @@ __cacosh (__complex__ double x)
 
       y = __csqrt (y);
 
+      if (__real__ x < 0.0)
+	y = -y;
+
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
--- libc/sysdeps/generic/s_cacoshf.c	14 Dec 2005 10:12:45 -0000	1.1
+++ libc/sysdeps/generic/s_cacoshf.c	15 Jan 2006 17:51:31 -0000	1.2
@@ -75,6 +75,9 @@ __cacoshf (__complex__ float x)
 
       y = __csqrtf (y);
 
+      if (__real__ x < 0.0)
+	y = -y;
+
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
--- libc/sysdeps/generic/s_cacoshl.c	14 Dec 2005 10:13:05 -0000	1.1
+++ libc/sysdeps/generic/s_cacoshl.c	15 Jan 2006 17:51:31 -0000	1.2
@@ -73,6 +73,9 @@ __cacoshl (__complex__ long double x)
 
       y = __csqrtl (y);
 
+      if (__real__ x < 0.0)
+	y = -y;
+
       __real__ y += __real__ x;
       __imag__ y += __imag__ x;
 
--- libc/sysdeps/alpha/fpu/libm-test-ulps	17 Dec 2004 06:49:58 -0000	1.13
+++ libc/sysdeps/alpha/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.14
@@ -20,12 +20,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/s390/fpu/libm-test-ulps	20 Jul 2005 18:18:56 -0000	1.13
+++ libc/sysdeps/s390/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.14
@@ -17,12 +17,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/powerpc/fpu/libm-test-ulps	22 Dec 2005 00:56:05 -0000	1.15
+++ libc/sysdeps/powerpc/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.16
@@ -17,12 +17,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/sparc/sparc32/fpu/libm-test-ulps	14 Jan 2006 12:09:02 -0000	1.13
+++ libc/sysdeps/sparc/sparc32/fpu/libm-test-ulps	15 Jan 2006 17:59:38 -0000	1.14
@@ -33,10 +33,10 @@ ildouble: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
--- libc/sysdeps/sparc/sparc64/fpu/libm-test-ulps	17 Dec 2004 07:40:44 -0000	1.16
+++ libc/sysdeps/sparc/sparc64/fpu/libm-test-ulps	15 Jan 2006 17:59:38 -0000	1.17
@@ -33,14 +33,14 @@ ildouble: 1
 ldouble: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
 ildouble: 5
 ldouble: 5
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/mips/fpu/libm-test-ulps	23 Mar 2003 00:52:10 -0000	1.7
+++ libc/sysdeps/mips/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.8
@@ -17,12 +17,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/sh/sh4/fpu/libm-test-ulps	23 Mar 2003 00:52:10 -0000	1.5
+++ libc/sysdeps/sh/sh4/fpu/libm-test-ulps	15 Jan 2006 17:59:38 -0000	1.6
@@ -60,12 +60,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/i386/fpu/libm-test-ulps	30 Sep 2005 15:45:00 -0000	1.43
+++ libc/sysdeps/i386/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.44
@@ -35,14 +35,14 @@ ildouble: 2
 ldouble: 2
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 9
 idouble: 1
 ifloat: 9
 ildouble: 6
 ldouble: 6
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 4
 idouble: 1
--- libc/sysdeps/m68k/fpu/libm-test-ulps	24 Jun 2003 11:06:57 -0000	1.13
+++ libc/sysdeps/m68k/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.14
@@ -36,14 +36,14 @@ ildouble: 2
 ldouble: 2
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
 ildouble: 6
 ldouble: 6
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 idouble: 1
 ildouble: 2
--- libc/sysdeps/ia64/fpu/libm-test-ulps	20 Dec 2005 15:17:24 -0000	1.18
+++ libc/sysdeps/ia64/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.19
@@ -8,14 +8,14 @@ ildouble: 2
 ldouble: 2
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
 ildouble: 7
 ldouble: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 idouble: 1
 ildouble: 1
--- libc/sysdeps/hppa/fpu/libm-test-ulps	23 Mar 2003 00:52:10 -0000	1.2
+++ libc/sysdeps/hppa/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.3
@@ -17,12 +17,12 @@ float: 1
 ifloat: 1
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/sysdeps/x86_64/fpu/libm-test-ulps	20 Jul 2005 18:15:21 -0000	1.10
+++ libc/sysdeps/x86_64/fpu/libm-test-ulps	15 Jan 2006 17:59:37 -0000	1.11
@@ -48,14 +48,14 @@ ildouble: 2
 ldouble: 2
 
 # cacosh
-Test "Real part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 7
 idouble: 1
 ifloat: 7
 ildouble: 6
 ldouble: 6
-Test "Imaginary part of: cacosh (-2 - 3 i) == -1.9833870299165354323470769028940395 + 2.1414491111159960199416055713254211 i":
+Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i":
 double: 1
 float: 3
 idouble: 1
--- libc/math/libm-test.inc	13 Oct 2005 19:07:12 -0000	1.66
+++ libc/math/libm-test.inc	15 Jan 2006 17:51:31 -0000	1.67
@@ -1116,7 +1116,7 @@ cacosh_test (void)
   TEST_c_c (cacosh, nan_value, nan_value, nan_value, nan_value);
 
   TEST_c_c (cacosh, 0.75L, 1.25L, 1.13239363160530819522266333696834467L, 1.11752014915610270578240049553777969L);
-  TEST_c_c (cacosh, -2, -3, -1.9833870299165354323470769028940395L, 2.1414491111159960199416055713254211L);
+  TEST_c_c (cacosh, -2, -3, 1.9833870299165354323470769028940395L, -2.1414491111159960199416055713254211L);
 
   END (cacosh, complex);
 }

glibc-bz2173.patch:
 Makefile        |    2 
 fileops.c       |    3 +
 tst-fopenloc2.c |  116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz2173.patch ---
2006-01-18  Ulrich Drepper  <drepper at redhat.com>

	[BZ #2173]
	* libio/fileops.c (_IO_new_file_fopen): If ,ccs= is given, also
	set vtable to the wide vtable.
	* libio/tst-fopenloc2.c: New file.
	* libio/Makefile (tests): Add tst-fopenloc2.

--- libc/libio/Makefile	16 Jan 2006 20:10:26 -0000	1.84
+++ libc/libio/Makefile	19 Jan 2006 01:22:48 -0000	1.85
@@ -54,7 +54,7 @@ tests = tst_swprintf tst_wprintf tst_sws
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
 	tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
 	tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \
-	bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4
+	bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
--- libc/libio/fileops.c	27 Sep 2005 18:49:43 -0000	1.109
+++ libc/libio/fileops.c	19 Jan 2006 00:38:35 -0000	1.110
@@ -399,6 +399,9 @@ _IO_new_file_fopen (fp, filename, mode, 
 	  /* And now the transliteration.  */
 	  cc->__cd_out.__cd.__data[0].__trans = &__libio_translit;
 
+	  /* From now on use the wide character callback functions.  */
+	  ((struct _IO_FILE_plus *) fp)->vtable = fp->_wide_data->_wide_vtable;
+
 	  /* Set the mode now.  */
 	  result->_mode = 1;
 	}
--- libc/libio/tst-fopenloc2.c 1 Jan 1970 00:00:00 -0000
+++ libc/libio/tst-fopenloc2.c	19 Jan 2006 01:22:20 -0000	1.1
@@ -0,0 +1,116 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <wchar.h>
+
+
+static const struct
+{
+  const char *enc;
+  const char *data;
+  size_t datalen;
+  const wchar_t *expected;
+  size_t expectedlen;
+} tests[] =
+  {
+    { "UCS-4LE", "a\0\0\0b\0\0\0", 8, L"ab", 2 },
+    { "UCS-4BE", "\0\0\0a\0\0\0b", 8, L"ab", 2 },
+  };
+#define ntests (sizeof (tests) / sizeof (tests[0]))
+
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+
+static void prepare (void);
+#define PREPARE(argc, argv) prepare ();
+
+#include "../test-skeleton.c"
+
+
+static int fd;
+static char *tmpname;
+
+
+static void
+prepare (void)
+{
+  fd = create_temp_file ("tst-fopenloc2", &tmpname);
+  if (fd == -1)
+    {
+      puts ("cannot open temp file");
+      exit (1);
+    }
+}
+
+
+static int
+do_test (void)
+{
+  for (int i = 0; i < ntests; ++i)
+    {
+      if (ftruncate (fd, 0) != 0)
+	{
+	  printf ("ftruncate in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+      if (TEMP_FAILURE_RETRY (write (fd, tests[i].data, tests[i].datalen))
+	  != tests[i].datalen)
+	{
+	  printf ("write in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+      if (lseek (fd, 0, SEEK_SET) != 0)
+	{
+	  printf ("lseek in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+      char *ccs;
+      if (asprintf (&ccs, "r,ccs=%s", tests[i].enc) == -1)
+	{
+	  printf ("asprintf in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+      FILE *fp = fopen (tmpname, ccs);
+      if (fp == NULL)
+	{
+	  printf ("fopen in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+#define LINELEN 100
+      wchar_t line[LINELEN];
+      if (fgetws (line, LINELEN, fp) != line)
+	{
+	  printf ("fgetws in round %d failed\n", i + 1);
+	  return 1;
+	}
+
+      if (wcslen (line) != tests[i].expectedlen)
+	{
+	  printf ("round %d: expected length %zu, got length %zu\n",
+		  i + 1, tests[i].expectedlen, wcslen (line));
+	  return 1;
+	}
+
+      if (wcscmp (tests[i].expected, line) != 0)
+	{
+	  printf ("round %d: expected L\"%ls\", got L\"%ls\"\n",
+		  i + 1, tests[i].expected, line);
+	  return 1;
+	}
+
+      fclose (fp);
+
+      free (ccs);
+    }
+
+  close (fd);
+
+  return 0;
+}

glibc-bz2226.patch:
 wgenops.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-bz2226.patch ---
2006-02-12  Ulrich Drepper  <drepper at redhat.com>

	[BZ #2226]
	* libio/wgenops.c (_IO_wsetb): Use correct size of wide char
	buffer in FREE_BUF call.

--- libc/libio/wgenops.c	14 Sep 2004 04:24:45 -0000	1.13
+++ libc/libio/wgenops.c	12 Feb 2006 21:20:57 -0000	1.14
@@ -116,7 +116,7 @@ _IO_wsetb (f, b, eb, a)
      int a;
 {
   if (f->_wide_data->_IO_buf_base && !(f->_flags & _IO_USER_BUF))
-    FREE_BUF (f->_wide_data->_IO_buf_base, _IO_wblen (f));
+    FREE_BUF (f->_wide_data->_IO_buf_base, _IO_wblen (f) * sizeof (wchar_t));
   f->_wide_data->_IO_buf_base = b;
   f->_wide_data->_IO_buf_end = eb;
   if (a)

glibc-bz2268.patch:
 profil.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE glibc-bz2268.patch ---
2006-02-03  Roland McGrath  <roland at redhat.com>

	[BZ #2268]
	* sysdeps/posix/profil.c (__profil): Use __profile_frequency to choose
	timer interval, don't assume smallest possible interval is it.

--- libc/sysdeps/posix/profil.c	15 Dec 2005 21:10:10 -0000	1.13
+++ libc/sysdeps/posix/profil.c	3 Feb 2006 22:28:31 -0000	1.14
@@ -22,6 +23,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/time.h>
+#include <libc-internal.h>
 
 #ifndef SIGPROF
 
@@ -110,7 +112,7 @@ __profil (u_short *sample_buffer, size_t
     return -1;
 
   timer.it_value.tv_sec = 0;
-  timer.it_value.tv_usec = 1;
+  timer.it_value.tv_usec = 1000000 / __profile_frequency ();
   timer.it_interval = timer.it_value;
   return __setitimer (ITIMER_PROF, &timer, otimer_ptr);
 }

glibc-check_fds.patch:
 generic/check_fds.c          |   30 +++++++++++++++++++++---------
 unix/sysv/linux/device-nrs.h |    4 ++++
 2 files changed, 25 insertions(+), 9 deletions(-)

--- NEW FILE glibc-check_fds.patch ---
2005-11-09  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/generic/check_fds.c (check_one_fd): For writable
	descriptors, use /dev/full.
	(__libc_check_standard_fds): Reverse modes so that common operations on
	the descriptors fail.
	* sysdeps/unix/sysv/linux/device-nrs.h: Add info for /dev/full.

--- libc/sysdeps/generic/check_fds.c	23 Apr 2003 01:54:03 -0000	1.9
+++ libc/sysdeps/generic/check_fds.c	9 Nov 2005 19:26:07 -0000	1.10
@@ -44,12 +44,26 @@ check_one_fd (int fd, int mode)
   if (__builtin_expect (__libc_fcntl (fd, F_GETFD), 0) == -1
       && errno == EBADF)
     {
-      struct stat64 st;
+      const char *name;
+      dev_t dev;
+
+      /* For writable descriptors we use /dev/full.  */
+      if ((mode & O_ACCMODE) == O_WRONLY)
+	{
+	  name = _PATH_DEV "full";
+	  dev = makedev (DEV_FULL_MAJOR, DEV_FULL_MINOR);
+	}
+      else
+	{
+	  name = _PATH_DEVNULL;
+	  dev = makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR);
+	}
 
       /* Something is wrong with this descriptor, it's probably not
 	 opened.  Open /dev/null so that the SUID program we are
 	 about to start does not accidently use this descriptor.  */
-      int nullfd = open_not_cancel (_PATH_DEVNULL, mode, 0);
+      int nullfd = open_not_cancel (name, mode, 0);
+
       /* We are very paranoid here.  With all means we try to ensure
 	 that we are actually opening the /dev/null device and nothing
 	 else.
@@ -57,13 +71,11 @@ check_one_fd (int fd, int mode)
 	 Note that the following code assumes that STDIN_FILENO,
 	 STDOUT_FILENO, STDERR_FILENO are the three lowest file
 	 decsriptor numbers, in this order.  */
+      struct stat64 st;
       if (__builtin_expect (nullfd != fd, 0)
 	  || __builtin_expect (__fxstat64 (_STAT_VER, fd, &st), 0) != 0
 	  || __builtin_expect (S_ISCHR (st.st_mode), 1) == 0
-#if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
-	  || st.st_rdev != makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR)
-#endif
-	  )
+	  || st.st_rdev != dev)
 	/* We cannot even give an error message here since it would
 	   run into the same problems.  */
 	while (1)
@@ -84,7 +96,7 @@ __libc_check_standard_fds (void)
 # define O_NOFOLLOW	0
 #endif
   /* Check all three standard file descriptors.  */
-  check_one_fd (STDIN_FILENO, O_RDONLY | O_NOFOLLOW);
-  check_one_fd (STDOUT_FILENO, O_RDWR | O_NOFOLLOW);
-  check_one_fd (STDERR_FILENO, O_RDWR | O_NOFOLLOW);
+  check_one_fd (STDIN_FILENO, O_WRONLY | O_NOFOLLOW);
+  check_one_fd (STDOUT_FILENO, O_RDONLY | O_NOFOLLOW);
+  check_one_fd (STDERR_FILENO, O_RDONLY | O_NOFOLLOW);
 }
--- libc/sysdeps/unix/sysv/linux/device-nrs.h	21 Jul 2001 05:13:27 -0000	1.4
+++ libc/sysdeps/unix/sysv/linux/device-nrs.h	9 Nov 2005 23:58:32 -0000	1.5
@@ -26,6 +26,10 @@
 #define DEV_NULL_MAJOR	1
 #define DEV_NULL_MINOR	3
 
+/* /dev/full is (1,7).  */
+#define DEV_FULL_MAJOR	1
+#define DEV_FULL_MINOR	7
+
 /* Pseudo tty slaves.  For Linux we use the Unix98 ttys.  We could
    also include the old BSD-style tty buts they should not be used and
    the extra test would only slow down correctly set up systems.  If a

glibc-ctermid.patch:
 unistd.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-ctermid.patch ---
2006-01-03  Jakub Jelinek  <jakub at redhat.com>

	* posix/unistd.h (ctermid): Remove __nonnull attribute.

--- libc/posix/unistd.h	16 Dec 2005 00:15:19 -0000	1.139
+++ libc/posix/unistd.h	3 Jan 2006 15:57:08 -0000	1.140
@@ -1075,7 +1075,7 @@ extern void swab (__const void *__restri
    It is also found in <stdio.h>.  */
 #ifdef __USE_XOPEN
 /* Return the name of the controlling terminal.  */
-extern char *ctermid (char *__s) __THROW __nonnull ((1));
+extern char *ctermid (char *__s) __THROW;
 #endif
 
 

glibc-dl-deps.patch:
 dl-deps.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE glibc-dl-deps.patch ---
2006-01-18  Jakub Jelinek  <jakub at redhat.com>

	* elf/dl-deps.c (_dl_map_object_deps): In case of failure also make a
	copy of objname string.

--- libc/elf/dl-deps.c	12 Jun 2005 16:28:48 -0000	1.80
+++ libc/elf/dl-deps.c	18 Jan 2006 19:48:53 -0000	1.81
@@ -247,6 +247,7 @@ _dl_map_object_deps (struct link_map *ma
 		if (__builtin_expect (errstring != NULL, 0))
 		  {
 		    char *new_errstring = strdupa (errstring);
+		    objname = strdupa (objname);
 		    if (malloced)
 		      free ((char *) errstring);
 		    errstring = new_errstring;
@@ -337,6 +338,7 @@ _dl_map_object_deps (struct link_map *ma
 		    if (__builtin_expect (errstring != NULL, 0))
 		      {
 			char *new_errstring = strdupa (errstring);
+			objname = strdupa (objname);
 			if (malloced)
 			  free ((char *) errstring);
 			errstring = new_errstring;

glibc-doc-fixes.patch:
 filesys.texi |   10 +++++-----
 memory.texi  |    7 +++++--
 stdio.texi   |    8 +++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

--- NEW FILE glibc-doc-fixes.patch ---
2006-02-03  Jakub Jelinek  <jakub at redhat.com>

	* manual/filesys.texi (futimes): Fix prototype.

2004-08-09  Paul Eggert  <eggert at cs.ucla.edu>

	[BZ #315]
	* manual/memory.texi (Obstacks Data Alignment): The default
	alignment is not 4: it is enough to hold any type of data.
	Problem reported by Benno in
	<http://sources.redhat.com/ml/libc-alpha/2004-08/msg00055.html>.

2006-02-03  Ulrich Drepper  <drepper at redhat.com>

	* manual/stdio.texi (Formatted Output Functions): Fix make_message
	example.  Patch by NIIBE Yutaka <gniibe at m17n.org>.

2005-12-31  Andreas Jaeger  <aj at suse.de>

	[BZ #1395]
	* manual/filesys.texi (Symbolic Links): Fix description of
	canonicalize_file_name based on patch by Oskar Liljeblad
	<oskar at osk.mine.nu>.

2005-12-15  Roland McGrath  <roland at redhat.com>

	[BZ #1997]
	* manual/stdio.texi (String Streams): For open_memstream, elaborate a
	little on malloc reference.

--- libc/manual/filesys.texi	15 Oct 2005 17:37:58 -0000	1.98
+++ libc/manual/filesys.texi	22 Feb 2006 07:17:46 -0000	1.100
@@ -1250,10 +1250,10 @@ result is passed back as the return valu
 memory allocated with @code{malloc}.  If the result is not used anymore
 the memory should be freed with a call to @code{free}.
 
-In any of the path components except the last one is missing the
-function returns a NULL pointer.  This is also what is returned if the
-length of the path reaches or exceeds @code{PATH_MAX} characters.  In
-any case @code{errno} is set accordingly.
+If any of the path components is missing the function returns a NULL
+pointer.  This is also what is returned if the length of the path
+reaches or exceeds @code{PATH_MAX} characters.  In any case
+ at code{errno} is set accordingly.
 
 @table @code
 @item ENAMETOOLONG
@@ -2806,7 +2806,7 @@ function.
 
 @comment sys/time.h
 @comment BSD
- at deftypefun int futimes (int *@var{fd}, struct timeval @var{tvp}@t{[2]})
+ at deftypefun int futimes (int @var{fd}, struct timeval @var{tvp}@t{[2]})
 This function is like @code{utimes}, except that it takes an open file
 descriptor as an argument instead of a file name.  @xref{Low-Level
 I/O}.  This function comes from FreeBSD, and is not available on all
--- libc/manual/memory.texi	13 Sep 2005 17:46:01 -0000	1.80
+++ libc/manual/memory.texi	22 Feb 2006 06:57:59 -0000	1.81
@@ -1968,7 +1968,8 @@ obstack_next_free (@var{obstack-ptr}) - 
 
 Each obstack has an @dfn{alignment boundary}; each object allocated in
 the obstack automatically starts on an address that is a multiple of the
-specified boundary.  By default, this boundary is 4 bytes.
+specified boundary.  By default, this boundary is aligned so that
+the object can hold any type of data.
 
 To access an obstack's alignment boundary, use the macro
 @code{obstack_alignment_mask}, whose function prototype looks like
@@ -1980,7 +1981,9 @@ this:
 The value is a bit mask; a bit that is 1 indicates that the corresponding
 bit in the address of an object should be 0.  The mask value should be one
 less than a power of 2; the effect is that all object addresses are
-multiples of that power of 2.  The default value of the mask is 3, so that
+multiples of that power of 2.  The default value of the mask is a value
+that allows aligned objects to hold any type of data: for example, if
+its value is 3, any type of data can be stored at locations whose
 addresses are multiples of 4.  A mask value of 0 means an object can start
 on any multiple of 1 (that is, no alignment is required).
 
--- libc/manual/stdio.texi	25 Sep 2005 18:24:55 -0000	1.134
+++ libc/manual/stdio.texi	4 Feb 2006 07:12:54 -0000	1.136
@@ -2357,7 +2357,8 @@ make_message (char *name, char *value)
     @{
       /* @r{Reallocate buffer now that we know
          how much space is needed.} */
-      buffer = (char *) xrealloc (buffer, nchars + 1);
+      size = nchars + 1;
+      buffer = (char *) xrealloc (buffer, size);
 
       if (buffer != NULL)
         /* @r{Try again.} */
@@ -4852,8 +4853,9 @@ Got r
 @comment GNU
 @deftypefun {FILE *} open_memstream (char **@var{ptr}, size_t *@var{sizeloc})
 This function opens a stream for writing to a buffer.  The buffer is
-allocated dynamically (as with @code{malloc}; @pxref{Unconstrained
-Allocation}) and grown as necessary.
+allocated dynamically and grown as necessary, using @code{malloc}.
+After you've closed the stream, this buffer is your responsibility to
+clean up using @code{free} or @code{realloc}.  @xref{Unconstrained Allocation}.
 
 When the stream is closed with @code{fclose} or flushed with
 @code{fflush}, the locations @var{ptr} and @var{sizeloc} are updated to

glibc-euidaccess.patch:
 euidaccess.c |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE glibc-euidaccess.patch ---
2005-11-27  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/posix/euidaccess.c [_LIBC] (euidaccess): Don't cache
	euid and egid.

--- libc/sysdeps/posix/euidaccess.c	6 Jul 2001 04:56:01 -0000	1.11
+++ libc/sysdeps/posix/euidaccess.c	27 Nov 2005 17:13:35 -0000	1.12
@@ -93,14 +93,6 @@ static uid_t uid;
 /* The user's real group id. */
 static gid_t gid;
 
-#ifdef HAVE_GETGROUPS
-int group_member ();
-#else
-#define group_member(gid)	0
-#endif
-
-#endif
-
 /* The user's effective user id. */
 static uid_t euid;
 
@@ -110,6 +102,14 @@ static gid_t egid;
 /* Nonzero if UID, GID, EUID, and EGID have valid values. */
 static int have_ids;
 
+# ifdef HAVE_GETGROUPS
+int group_member ();
+# else
+#  define group_member(gid)	0
+# endif
+
+#endif
+
 
 /* Return 0 if the user has permission of type MODE on file PATH;
    otherwise, return -1 and set `errno' to EACCESS.
@@ -126,6 +126,9 @@ euidaccess (path, mode)
   int granted;
 
 #ifdef	_LIBC
+  uid_t euid;
+  gid_t egid;
+
   if (! __libc_enable_secure)
     /* If we are not set-uid or set-gid, access does the same.  */
     return __access (path, mode);
@@ -157,12 +160,8 @@ euidaccess (path, mode)
 
 #ifdef	_LIBC
   /* Now we need the IDs.  */
-  if (have_ids == 0)
-    {
-      have_ids = 1;
-      euid = __geteuid ();
-      egid = __getegid ();
-    }
+  euid = __geteuid ();
+  egid = __getegid ();
 #endif
 
   /* The super-user can read and write any file, and execute any file

glibc-gconv-cache-memleak.patch:
 gconv_cache.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-gconv-cache-memleak.patch ---
2006-01-10  Ulrich Drepper  <drepper at redhat.com>

	* iconv/gconv_cache.c (free_mem): Don't call munmap if gconv_cache
	is NULL.

--- libc/iconv/gconv_cache.c	20 Dec 2005 16:20:35 -0000	1.20
+++ libc/iconv/gconv_cache.c	11 Jan 2006 07:08:29 -0000	1.21
@@ -467,7 +467,7 @@ libc_freeres_fn (free_mem)
   if (cache_malloced)
     free (gconv_cache);
 #ifdef _POSIX_MAPPED_FILES
-  else
+  else if (gconv_cache != NULL)
     __munmap (gconv_cache, cache_size);
 #endif
 }

glibc-i386-futex-wait-barrier.patch:
 lowlevellock.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE glibc-i386-futex-wait-barrier.patch ---
2006-02-08  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_futex_wait,
	lll_futex_timedwait, lll_wait_tid): Add "memory" clobber.

--- libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	6 Jan 2006 03:06:17 -0000	1.26
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	8 Feb 2006 15:32:25 -0000	1.27
@@ -75,7 +75,8 @@
 		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (0),	      \
 			"c" (FUTEX_WAIT), "d" (_val),			      \
-			"i" (offsetof (tcbhead_t, sysinfo)));		      \
+			"i" (offsetof (tcbhead_t, sysinfo))		      \
+		      : "memory");					      \
     __status;								      \
   })
 
@@ -90,7 +91,8 @@
 		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (timeout),  \
 			"c" (FUTEX_WAIT), "d" (_val),			      \
-			"i" (offsetof (tcbhead_t, sysinfo)));		      \
+			"i" (offsetof (tcbhead_t, sysinfo))		      \
+		      : "memory");					      \
     __status;								      \
   })
 
@@ -346,7 +348,8 @@ extern int lll_unlock_wake_cb (int *__fu
 			: "=&a" (__ignore)				      \
 			: "i" (SYS_futex), LLL_EBX_REG (&tid), "S" (0),	      \
 			  "c" (FUTEX_WAIT), "d" (_tid),			      \
-			  "i" (offsetof (tcbhead_t, sysinfo)));		      \
+			  "i" (offsetof (tcbhead_t, sysinfo))		      \
+			: "memory");					      \
   } while (0)
 
 extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)

glibc-i686-memset.patch:
 memset.S |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE glibc-i686-memset.patch ---
2006-02-21  Roland McGrath  <roland at redhat.com>

	* sysdeps/i386/i686/memset.S: Fix treatment of unaligned pointer.
	Reported by John Zulauf <john.zulauf at amd.com>.

--- libc/sysdeps/i386/i686/memset.S	4 May 2005 06:21:50 -0000	1.9
+++ libc/sysdeps/i386/i686/memset.S	22 Feb 2006 02:39:06 -0000	1.10
@@ -64,17 +64,17 @@ ENTRY (BP_SYM (memset))
 	movl	%edx, %edi
 	cfi_rel_offset (edi, 0)
 	andl	$3, %edx
-	jz	2f
-	jnp	3f
-	stosb
+	jz	2f	/* aligned */
+	jp	3f	/* misaligned at 3, store just one byte below */
+	stosb		/* misaligned at 1 or 2, store two bytes */
 	decl	%ecx
 	jz	1f
 3:	stosb
 	decl	%ecx
 	jz	1f
-	xorl	$3, %edx
-	jz	2f
-	stosb
+	xorl	$1, %edx
+	jnz	2f	/* was misaligned at 2 or 3, now aligned */
+	stosb		/* was misaligned at 1, store third byte */
 	decl	%ecx
 2:	movl	%ecx, %edx
 	shrl	$2, %ecx

glibc-ia64-shmatt_t.patch:
 shm.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE glibc-ia64-shmatt_t.patch ---
2005-11-19  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/unix/sysv/linux/ia64/bits/shm.h (shmatt_t): New type.
	(struct shmid_ds): Use it for shm_nattch field.

--- libc/sysdeps/unix/sysv/linux/ia64/bits/shm.h	20 Dec 2002 10:31:09 -0000	1.5
+++ libc/sysdeps/unix/sysv/linux/ia64/bits/shm.h	19 Nov 2005 17:17:15 -0000	1.6
@@ -38,6 +38,8 @@
 /* Segment low boundary address multiple.  */
 #define SHMLBA		(1024 * 1024)
 
+/* Type to count number of attaches.  */
+typedef unsigned long int shmatt_t;
 
 /* Data structure describing a set of semaphores.  */
 struct shmid_ds
@@ -49,7 +51,7 @@ struct shmid_ds
     __time_t shm_ctime;			/* time of last change by shmctl() */
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
-    unsigned long int shm_nattch;	/* number of current attaches */
+    shmatt_t shm_nattch;		/* number of current attaches */
     unsigned long int __unused1;
     unsigned long int __unused2;
   };

glibc-iconv-iso11548-1.patch:
 iconvdata/Makefile                   |    4 
 iconvdata/TESTS                      |    1 
 iconvdata/gconv-modules              |    6 
 iconvdata/iso_11548-1.c              |   73 +++++++++
 iconvdata/testdata/ISO_11548-1       |    2 
 iconvdata/testdata/ISO_11548-1..UTF8 |    1 
 localedata/charmaps/ISO_11548-1      |  269 +++++++++++++++++++++++++++++++++++
 7 files changed, 354 insertions(+), 2 deletions(-)

--- NEW FILE glibc-iconv-iso11548-1.patch ---
2005-11-16  Ulrich Drepper  <drepper at redhat.com>

	* iconvdata/Makefile (modules): Add ISO_11548-1.
	(distribute): Add iso_11548-1.c.
	* iconvdata/gconv-modules: Add entries for ISO 11548-1.
	* iconvdata/TESTS: Add entry for ISO 11548-1.

	[BZ 1872]
	* iconvdata/iso_11548-1.c: New file.
	* iconvdata/testdata/ISO_11548-1: New file.
	* iconvdata/testdata/ISO_11548-1..UTF8: New file.
	Patch by Samuel Thibault <samuel.thibault at ens-lyon.org>.

localedata/
	[BZ 1872]
	* charmaps/ISO_11548-1. New file.
	Patch by Samuel Thibault <samuel.thibault at ens-lyon.org>.

--- libc/iconvdata/Makefile	19 Oct 2005 23:52:20 -0000	1.142
+++ libc/iconvdata/Makefile	16 Nov 2005 08:15:54 -0000	1.143
@@ -58,7 +58,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3
 	   IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 	 \
 	   IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 	 \
 	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399
+	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -195,7 +195,7 @@ distribute := gconv-modules extra-module
 	      ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
 	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
 	      ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h
+	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
--- libc/iconvdata/TESTS	19 Oct 2005 23:52:54 -0000	1.34
+++ libc/iconvdata/TESTS	16 Nov 2005 08:12:20 -0000	1.35
@@ -164,3 +164,4 @@ IBM1371			IBM1371			N	UTF8
 IBM1388			IBM1388			N	UTF8
 IBM1390			IBM1390			N	UTF8
 IBM1399			IBM1399			N	UTF8
+ISO_11548-1		ISO_11548-1		-	UTF8
--- libc/iconvdata/gconv-modules	19 Oct 2005 23:52:54 -0000	1.87
+++ libc/iconvdata/gconv-modules	16 Nov 2005 08:15:06 -0000	1.88
@@ -1897,3 +1897,9 @@ alias	CP1399//		IBM1399//
 alias	CSIBM1399//		IBM1399//
 module	IBM1399//		INTERNAL		IBM1399		1
 module	INTERNAL		IBM1399//		IBM1399		1
+
+#	from			to			module		cost
+alias	ISO/TR_11548-1/		ISO_11548-1//
+alias	ISO11548-1//		ISO_11548-1//
+module	ISO_11548-1//		INTERNAL		ISO_11548-1	1
+module	INTERNAL		ISO_11548-1//		ISO_11548-1	1
--- libc/iconvdata/iso_11548-1.c	1 Jan 1970 00:00:00 -0000
+++ libc/iconvdata/iso_11548-1.c	16 Nov 2005 08:11:58 -0000	1.1
@@ -0,0 +1,73 @@
+/* Conversion to and from ISO 11548-1.
+   Copyright (C) 1997-1999, 2000-2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper at cygnus.com>, 1997,
+	Samuel Thibault <samuel.thibault at ens-lyon.org>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <dlfcn.h>
+#include <stdint.h>
+
+/* Definitions used in the body of the `gconv' function.  */
+#define CHARSET_NAME		"ISO_11548-1//"
+#define FROM_LOOP		from_iso11548_1
+#define TO_LOOP			to_iso11548_1
+#define DEFINE_INIT		1
+#define DEFINE_FINI		1
+#define MIN_NEEDED_FROM		1
+#define MIN_NEEDED_TO		4
+
+#define BRAILLE_UCS_BASE	0x2800
+
+/* First define the conversion function from ISO 11548-1 to UCS4.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
+#define LOOPFCT			FROM_LOOP
+#define BODY \
+  *((uint32_t *) outptr) = BRAILLE_UCS_BASE | (*inptr++);		      \
+  outptr += sizeof (uint32_t);
+#define ONEBYTE_BODY \
+  {									      \
+    return BRAILLE_UCS_BASE | c;					      \
+  }
+#include <iconv/loop.c>
+
+
+/* Next, define the other direction.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
+#define LOOPFCT			TO_LOOP
+#define BODY \
+  {									      \
+    uint32_t ch = *((const uint32_t *) inptr);				      \
+    if (__builtin_expect ((ch & 0xffffff00u) != BRAILLE_UCS_BASE, 0))	      \
+      {									      \
+	UNICODE_TAG_HANDLER (ch, 4);					      \
+									      \
+	/* We have an illegal character.  */				      \
+	STANDARD_TO_LOOP_ERR_HANDLER (4);				      \
+      }									      \
+    else								      \
+      *outptr++ = (unsigned char) (ch & 0xff);				      \
+    inptr += 4;								      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+
+/* Now define the toplevel functions.  */
+#include <iconv/skeleton.c>
--- libc/localedata/charmaps/ISO_11548-1	1 Jan 1970 00:00:00 -0000
+++ libc/localedata/charmaps/ISO_11548-1	16 Nov 2005 08:11:57 -0000	1.1
@@ -0,0 +1,269 @@
+<code_set_name> ISO_11548-1
+<comment_char> %
+<escape_char> /
+% version: 1.0
+%  source: Samuel Thibault <samuel.thibault at ens-lyon.org>
+
+% alias ISO/TR_11548-1
+CHARMAP
+<U2800>     /x00 BRAILLE PATTERN BLANK
+<U2801>     /x01 BRAILLE PATTERN DOTS-1
+<U2802>     /x02 BRAILLE PATTERN DOTS-2
+<U2803>     /x03 BRAILLE PATTERN DOTS-12
+<U2804>     /x04 BRAILLE PATTERN DOTS-3
+<U2805>     /x05 BRAILLE PATTERN DOTS-13
+<U2806>     /x06 BRAILLE PATTERN DOTS-23
+<U2807>     /x07 BRAILLE PATTERN DOTS-123
+<U2808>     /x08 BRAILLE PATTERN DOTS-4
+<U2809>     /x09 BRAILLE PATTERN DOTS-14
+<U280A>     /x0a BRAILLE PATTERN DOTS-24
+<U280B>     /x0b BRAILLE PATTERN DOTS-124
+<U280C>     /x0c BRAILLE PATTERN DOTS-34
+<U280D>     /x0d BRAILLE PATTERN DOTS-134
+<U280E>     /x0e BRAILLE PATTERN DOTS-234
+<U280F>     /x0f BRAILLE PATTERN DOTS-1234
+<U2810>     /x10 BRAILLE PATTERN DOTS-5
+<U2811>     /x11 BRAILLE PATTERN DOTS-15
+<U2812>     /x12 BRAILLE PATTERN DOTS-25
+<U2813>     /x13 BRAILLE PATTERN DOTS-125
+<U2814>     /x14 BRAILLE PATTERN DOTS-35
+<U2815>     /x15 BRAILLE PATTERN DOTS-135
+<U2816>     /x16 BRAILLE PATTERN DOTS-235
+<U2817>     /x17 BRAILLE PATTERN DOTS-1235
+<U2818>     /x18 BRAILLE PATTERN DOTS-45
+<U2819>     /x19 BRAILLE PATTERN DOTS-145
+<U281A>     /x1a BRAILLE PATTERN DOTS-245
+<U281B>     /x1b BRAILLE PATTERN DOTS-1245
+<U281C>     /x1c BRAILLE PATTERN DOTS-345
+<U281D>     /x1d BRAILLE PATTERN DOTS-1345
+<U281E>     /x1e BRAILLE PATTERN DOTS-2345
+<U281F>     /x1f BRAILLE PATTERN DOTS-12345
+<U2820>     /x20 BRAILLE PATTERN DOTS-6
+<U2821>     /x21 BRAILLE PATTERN DOTS-16
+<U2822>     /x22 BRAILLE PATTERN DOTS-26
+<U2823>     /x23 BRAILLE PATTERN DOTS-126
+<U2824>     /x24 BRAILLE PATTERN DOTS-36
+<U2825>     /x25 BRAILLE PATTERN DOTS-136
+<U2826>     /x26 BRAILLE PATTERN DOTS-236
+<U2827>     /x27 BRAILLE PATTERN DOTS-1236
+<U2828>     /x28 BRAILLE PATTERN DOTS-46
+<U2829>     /x29 BRAILLE PATTERN DOTS-146
+<U282A>     /x2a BRAILLE PATTERN DOTS-246
+<U282B>     /x2b BRAILLE PATTERN DOTS-1246
+<U282C>     /x2c BRAILLE PATTERN DOTS-346
+<U282D>     /x2d BRAILLE PATTERN DOTS-1346
+<U282E>     /x2e BRAILLE PATTERN DOTS-2346
+<U282F>     /x2f BRAILLE PATTERN DOTS-12346
+<U2830>     /x30 BRAILLE PATTERN DOTS-56
+<U2831>     /x31 BRAILLE PATTERN DOTS-156
+<U2832>     /x32 BRAILLE PATTERN DOTS-256
+<U2833>     /x33 BRAILLE PATTERN DOTS-1256
+<U2834>     /x34 BRAILLE PATTERN DOTS-356
+<U2835>     /x35 BRAILLE PATTERN DOTS-1356
+<U2836>     /x36 BRAILLE PATTERN DOTS-2356
+<U2837>     /x37 BRAILLE PATTERN DOTS-12356
+<U2838>     /x38 BRAILLE PATTERN DOTS-456
+<U2839>     /x39 BRAILLE PATTERN DOTS-1456
+<U283A>     /x3a BRAILLE PATTERN DOTS-2456
+<U283B>     /x3b BRAILLE PATTERN DOTS-12456
+<U283C>     /x3c BRAILLE PATTERN DOTS-3456
+<U283D>     /x3d BRAILLE PATTERN DOTS-13456
+<U283E>     /x3e BRAILLE PATTERN DOTS-23456
+<U283F>     /x3f BRAILLE PATTERN DOTS-123456
+<U2840>     /x40 BRAILLE PATTERN DOTS-7
+<U2841>     /x41 BRAILLE PATTERN DOTS-17
+<U2842>     /x42 BRAILLE PATTERN DOTS-27
+<U2843>     /x43 BRAILLE PATTERN DOTS-127
+<U2844>     /x44 BRAILLE PATTERN DOTS-37
+<U2845>     /x45 BRAILLE PATTERN DOTS-137
+<U2846>     /x46 BRAILLE PATTERN DOTS-237
+<U2847>     /x47 BRAILLE PATTERN DOTS-1237
+<U2848>     /x48 BRAILLE PATTERN DOTS-47
+<U2849>     /x49 BRAILLE PATTERN DOTS-147
+<U284A>     /x4a BRAILLE PATTERN DOTS-247
+<U284B>     /x4b BRAILLE PATTERN DOTS-1247
+<U284C>     /x4c BRAILLE PATTERN DOTS-347
+<U284D>     /x4d BRAILLE PATTERN DOTS-1347
+<U284E>     /x4e BRAILLE PATTERN DOTS-2347
+<U284F>     /x4f BRAILLE PATTERN DOTS-12347
+<U2850>     /x50 BRAILLE PATTERN DOTS-57
+<U2851>     /x51 BRAILLE PATTERN DOTS-157
+<U2852>     /x52 BRAILLE PATTERN DOTS-257
+<U2853>     /x53 BRAILLE PATTERN DOTS-1257
+<U2854>     /x54 BRAILLE PATTERN DOTS-357
+<U2855>     /x55 BRAILLE PATTERN DOTS-1357
+<U2856>     /x56 BRAILLE PATTERN DOTS-2357
+<U2857>     /x57 BRAILLE PATTERN DOTS-12357
+<U2858>     /x58 BRAILLE PATTERN DOTS-457
+<U2859>     /x59 BRAILLE PATTERN DOTS-1457
+<U285A>     /x5a BRAILLE PATTERN DOTS-2457
+<U285B>     /x5b BRAILLE PATTERN DOTS-12457
+<U285C>     /x5c BRAILLE PATTERN DOTS-3457
+<U285D>     /x5d BRAILLE PATTERN DOTS-13457
+<U285E>     /x5e BRAILLE PATTERN DOTS-23457
+<U285F>     /x5f BRAILLE PATTERN DOTS-123457
+<U2860>     /x60 BRAILLE PATTERN DOTS-67
+<U2861>     /x61 BRAILLE PATTERN DOTS-167
+<U2862>     /x62 BRAILLE PATTERN DOTS-267
+<U2863>     /x63 BRAILLE PATTERN DOTS-1267
+<U2864>     /x64 BRAILLE PATTERN DOTS-367
+<U2865>     /x65 BRAILLE PATTERN DOTS-1367
+<U2866>     /x66 BRAILLE PATTERN DOTS-2367
+<U2867>     /x67 BRAILLE PATTERN DOTS-12367
+<U2868>     /x68 BRAILLE PATTERN DOTS-467
+<U2869>     /x69 BRAILLE PATTERN DOTS-1467
+<U286A>     /x6a BRAILLE PATTERN DOTS-2467
+<U286B>     /x6b BRAILLE PATTERN DOTS-12467
+<U286C>     /x6c BRAILLE PATTERN DOTS-3467
+<U286D>     /x6d BRAILLE PATTERN DOTS-13467
+<U286E>     /x6e BRAILLE PATTERN DOTS-23467
+<U286F>     /x6f BRAILLE PATTERN DOTS-123467
+<U2870>     /x70 BRAILLE PATTERN DOTS-567
+<U2871>     /x71 BRAILLE PATTERN DOTS-1567
+<U2872>     /x72 BRAILLE PATTERN DOTS-2567
+<U2873>     /x73 BRAILLE PATTERN DOTS-12567
+<U2874>     /x74 BRAILLE PATTERN DOTS-3567
+<U2875>     /x75 BRAILLE PATTERN DOTS-13567
+<U2876>     /x76 BRAILLE PATTERN DOTS-23567
+<U2877>     /x77 BRAILLE PATTERN DOTS-123567
+<U2878>     /x78 BRAILLE PATTERN DOTS-4567
+<U2879>     /x79 BRAILLE PATTERN DOTS-14567
+<U287A>     /x7a BRAILLE PATTERN DOTS-24567
+<U287B>     /x7b BRAILLE PATTERN DOTS-124567
+<U287C>     /x7c BRAILLE PATTERN DOTS-34567
+<U287D>     /x7d BRAILLE PATTERN DOTS-134567
+<U287E>     /x7e BRAILLE PATTERN DOTS-234567
+<U287F>     /x7f BRAILLE PATTERN DOTS-1234567
+<U2880>     /x80 BRAILLE PATTERN DOTS-8
+<U2881>     /x81 BRAILLE PATTERN DOTS-18
+<U2882>     /x82 BRAILLE PATTERN DOTS-28
+<U2883>     /x83 BRAILLE PATTERN DOTS-128
+<U2884>     /x84 BRAILLE PATTERN DOTS-38
+<U2885>     /x85 BRAILLE PATTERN DOTS-138
+<U2886>     /x86 BRAILLE PATTERN DOTS-238
+<U2887>     /x87 BRAILLE PATTERN DOTS-1238
+<U2888>     /x88 BRAILLE PATTERN DOTS-48
+<U2889>     /x89 BRAILLE PATTERN DOTS-148
+<U288A>     /x8a BRAILLE PATTERN DOTS-248
+<U288B>     /x8b BRAILLE PATTERN DOTS-1248
+<U288C>     /x8c BRAILLE PATTERN DOTS-348
+<U288D>     /x8d BRAILLE PATTERN DOTS-1348
+<U288E>     /x8e BRAILLE PATTERN DOTS-2348
+<U288F>     /x8f BRAILLE PATTERN DOTS-12348
+<U2890>     /x90 BRAILLE PATTERN DOTS-58
+<U2891>     /x91 BRAILLE PATTERN DOTS-158
+<U2892>     /x92 BRAILLE PATTERN DOTS-258
+<U2893>     /x93 BRAILLE PATTERN DOTS-1258
+<U2894>     /x94 BRAILLE PATTERN DOTS-358
+<U2895>     /x95 BRAILLE PATTERN DOTS-1358
+<U2896>     /x96 BRAILLE PATTERN DOTS-2358
+<U2897>     /x97 BRAILLE PATTERN DOTS-12358
+<U2898>     /x98 BRAILLE PATTERN DOTS-458
+<U2899>     /x99 BRAILLE PATTERN DOTS-1458
+<U289A>     /x9a BRAILLE PATTERN DOTS-2458
+<U289B>     /x9b BRAILLE PATTERN DOTS-12458
+<U289C>     /x9c BRAILLE PATTERN DOTS-3458
+<U289D>     /x9d BRAILLE PATTERN DOTS-13458
+<U289E>     /x9e BRAILLE PATTERN DOTS-23458
+<U289F>     /x9f BRAILLE PATTERN DOTS-123458
+<U28A0>     /xa0 BRAILLE PATTERN DOTS-68
+<U28A1>     /xa1 BRAILLE PATTERN DOTS-168
+<U28A2>     /xa2 BRAILLE PATTERN DOTS-268
+<U28A3>     /xa3 BRAILLE PATTERN DOTS-1268
+<U28A4>     /xa4 BRAILLE PATTERN DOTS-368
+<U28A5>     /xa5 BRAILLE PATTERN DOTS-1368
+<U28A6>     /xa6 BRAILLE PATTERN DOTS-2368
+<U28A7>     /xa7 BRAILLE PATTERN DOTS-12368
+<U28A8>     /xa8 BRAILLE PATTERN DOTS-468
+<U28A9>     /xa9 BRAILLE PATTERN DOTS-1468
+<U28AA>     /xaa BRAILLE PATTERN DOTS-2468
+<U28AB>     /xab BRAILLE PATTERN DOTS-12468
+<U28AC>     /xac BRAILLE PATTERN DOTS-3468
+<U28AD>     /xad BRAILLE PATTERN DOTS-13468
+<U28AE>     /xae BRAILLE PATTERN DOTS-23468
+<U28AF>     /xaf BRAILLE PATTERN DOTS-123468
+<U28B0>     /xb0 BRAILLE PATTERN DOTS-568
+<U28B1>     /xb1 BRAILLE PATTERN DOTS-1568
+<U28B2>     /xb2 BRAILLE PATTERN DOTS-2568
+<U28B3>     /xb3 BRAILLE PATTERN DOTS-12568
+<U28B4>     /xb4 BRAILLE PATTERN DOTS-3568
+<U28B5>     /xb5 BRAILLE PATTERN DOTS-13568
+<U28B6>     /xb6 BRAILLE PATTERN DOTS-23568
+<U28B7>     /xb7 BRAILLE PATTERN DOTS-123568
+<U28B8>     /xb8 BRAILLE PATTERN DOTS-4568
+<U28B9>     /xb9 BRAILLE PATTERN DOTS-14568
+<U28BA>     /xba BRAILLE PATTERN DOTS-24568
+<U28BB>     /xbb BRAILLE PATTERN DOTS-124568
+<U28BC>     /xbc BRAILLE PATTERN DOTS-34568
+<U28BD>     /xbd BRAILLE PATTERN DOTS-134568
+<U28BE>     /xbe BRAILLE PATTERN DOTS-234568
+<U28BF>     /xbf BRAILLE PATTERN DOTS-1234568
+<U28C0>     /xc0 BRAILLE PATTERN DOTS-78
+<U28C1>     /xc1 BRAILLE PATTERN DOTS-178
+<U28C2>     /xc2 BRAILLE PATTERN DOTS-278
+<U28C3>     /xc3 BRAILLE PATTERN DOTS-1278
+<U28C4>     /xc4 BRAILLE PATTERN DOTS-378
+<U28C5>     /xc5 BRAILLE PATTERN DOTS-1378
+<U28C6>     /xc6 BRAILLE PATTERN DOTS-2378
+<U28C7>     /xc7 BRAILLE PATTERN DOTS-12378
+<U28C8>     /xc8 BRAILLE PATTERN DOTS-478
+<U28C9>     /xc9 BRAILLE PATTERN DOTS-1478
+<U28CA>     /xca BRAILLE PATTERN DOTS-2478
+<U28CB>     /xcb BRAILLE PATTERN DOTS-12478
+<U28CC>     /xcc BRAILLE PATTERN DOTS-3478
+<U28CD>     /xcd BRAILLE PATTERN DOTS-13478
+<U28CE>     /xce BRAILLE PATTERN DOTS-23478
+<U28CF>     /xcf BRAILLE PATTERN DOTS-123478
+<U28D0>     /xd0 BRAILLE PATTERN DOTS-578
+<U28D1>     /xd1 BRAILLE PATTERN DOTS-1578
+<U28D2>     /xd2 BRAILLE PATTERN DOTS-2578
+<U28D3>     /xd3 BRAILLE PATTERN DOTS-12578
+<U28D4>     /xd4 BRAILLE PATTERN DOTS-3578
+<U28D5>     /xd5 BRAILLE PATTERN DOTS-13578
+<U28D6>     /xd6 BRAILLE PATTERN DOTS-23578
+<U28D7>     /xd7 BRAILLE PATTERN DOTS-123578
+<U28D8>     /xd8 BRAILLE PATTERN DOTS-4578
+<U28D9>     /xd9 BRAILLE PATTERN DOTS-14578
+<U28DA>     /xda BRAILLE PATTERN DOTS-24578
+<U28DB>     /xdb BRAILLE PATTERN DOTS-124578
+<U28DC>     /xdc BRAILLE PATTERN DOTS-34578
+<U28DD>     /xdd BRAILLE PATTERN DOTS-134578
+<U28DE>     /xde BRAILLE PATTERN DOTS-234578
+<U28DF>     /xdf BRAILLE PATTERN DOTS-1234578
+<U28E0>     /xe0 BRAILLE PATTERN DOTS-678
+<U28E1>     /xe1 BRAILLE PATTERN DOTS-1678
+<U28E2>     /xe2 BRAILLE PATTERN DOTS-2678
+<U28E3>     /xe3 BRAILLE PATTERN DOTS-12678
+<U28E4>     /xe4 BRAILLE PATTERN DOTS-3678
+<U28E5>     /xe5 BRAILLE PATTERN DOTS-13678
+<U28E6>     /xe6 BRAILLE PATTERN DOTS-23678
+<U28E7>     /xe7 BRAILLE PATTERN DOTS-123678
+<U28E8>     /xe8 BRAILLE PATTERN DOTS-4678
+<U28E9>     /xe9 BRAILLE PATTERN DOTS-14678
+<U28EA>     /xea BRAILLE PATTERN DOTS-24678
+<U28EB>     /xeb BRAILLE PATTERN DOTS-124678
+<U28EC>     /xec BRAILLE PATTERN DOTS-34678
+<U28ED>     /xed BRAILLE PATTERN DOTS-134678
+<U28EE>     /xee BRAILLE PATTERN DOTS-234678
+<U28EF>     /xef BRAILLE PATTERN DOTS-1234678
+<U28F0>     /xf0 BRAILLE PATTERN DOTS-5678
+<U28F1>     /xf1 BRAILLE PATTERN DOTS-15678
+<U28F2>     /xf2 BRAILLE PATTERN DOTS-25678
+<U28F3>     /xf3 BRAILLE PATTERN DOTS-125678
+<U28F4>     /xf4 BRAILLE PATTERN DOTS-35678
+<U28F5>     /xf5 BRAILLE PATTERN DOTS-135678
+<U28F6>     /xf6 BRAILLE PATTERN DOTS-235678
+<U28F7>     /xf7 BRAILLE PATTERN DOTS-1235678
+<U28F8>     /xf8 BRAILLE PATTERN DOTS-45678
+<U28F9>     /xf9 BRAILLE PATTERN DOTS-145678
+<U28FA>     /xfa BRAILLE PATTERN DOTS-245678
+<U28FB>     /xfb BRAILLE PATTERN DOTS-1245678
+<U28FC>     /xfc BRAILLE PATTERN DOTS-345678
+<U28FD>     /xfd BRAILLE PATTERN DOTS-1345678
+<U28FE>     /xfe BRAILLE PATTERN DOTS-2345678
+<U28FF>     /xff BRAILLE PATTERN DOTS-12345678
+END CHARMAP
+
+WIDTH
+<U2800>...<U28FF>	1
+END WIDTH
--- libc/iconvdata/testdata/ISO_11548-1	2006-02-09 08:47:30.620726250 +0100
+++ libc/iconvdata/testdata/ISO_11548-1	2005-11-16 09:11:58.000000000 +0100
@@ -0,0 +1,2 @@
+
+
 !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
\ No newline at end of file
--- libc/iconvdata/testdata/ISO_11548-1..UTF8	2006-02-09 08:47:30.620726250 +0100
+++ libc/iconvdata/testdata/ISO_11548-1..UTF8	2005-11-16 09:11:58.000000000 +0100
@@ -0,0 +1 @@
+????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
\ No newline at end of file

glibc-iconv-iso11548.patch:
 iconvdata/Makefile                   |    4 
 iconvdata/TESTS                      |    1 
 iconvdata/gconv-modules              |    6 
 iconvdata/iso_11548-1.c              |   73 +++++++++
 iconvdata/testdata/ISO_11548-1       |    2 
 iconvdata/testdata/ISO_11548-1..UTF8 |    1 
 localedata/charmaps/ISO_11548-1      |  269 +++++++++++++++++++++++++++++++++++
 7 files changed, 354 insertions(+), 2 deletions(-)

--- NEW FILE glibc-iconv-iso11548.patch ---
2005-11-16  Ulrich Drepper  <drepper at redhat.com>

	* iconvdata/Makefile (modules): Add ISO_11548-1.
	(distribute): Add iso_11548-1.c.
	* iconvdata/gconv-modules: Add entries for ISO 11548-1.
	* iconvdata/TESTS: Add entry for ISO 11548-1.

	[BZ 1872]
	* iconvdata/iso_11548-1.c: New file.
	* iconvdata/testdata/ISO_11548-1: New file.
	* iconvdata/testdata/ISO_11548-1..UTF8: New file.
	Patch by Samuel Thibault <samuel.thibault at ens-lyon.org>.

localedata/
	[BZ 1872]
	* charmaps/ISO_11548-1. New file.
	Patch by Samuel Thibault <samuel.thibault at ens-lyon.org>.

--- libc/iconvdata/Makefile	19 Oct 2005 23:52:20 -0000	1.142
+++ libc/iconvdata/Makefile	16 Nov 2005 08:15:54 -0000	1.143
@@ -58,7 +58,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3
 	   IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 	 \
 	   IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 	 \
 	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399
+	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1
 
 modules.so := $(addsuffix .so, $(modules))
 
@@ -195,7 +195,7 @@ distribute := gconv-modules extra-module
 	      ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
 	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
 	      ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h
+	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c
 
 # We build the transformation modules only when we build shared libs.
 ifeq (yes,$(build-shared))
--- libc/iconvdata/TESTS	19 Oct 2005 23:52:54 -0000	1.34
+++ libc/iconvdata/TESTS	16 Nov 2005 08:12:20 -0000	1.35
@@ -164,3 +164,4 @@ IBM1371			IBM1371			N	UTF8
 IBM1388			IBM1388			N	UTF8
 IBM1390			IBM1390			N	UTF8
 IBM1399			IBM1399			N	UTF8
+ISO_11548-1		ISO_11548-1		-	UTF8
--- libc/iconvdata/gconv-modules	19 Oct 2005 23:52:54 -0000	1.87
+++ libc/iconvdata/gconv-modules	16 Nov 2005 08:15:06 -0000	1.88
@@ -1897,3 +1897,9 @@ alias	CP1399//		IBM1399//
 alias	CSIBM1399//		IBM1399//
 module	IBM1399//		INTERNAL		IBM1399		1
 module	INTERNAL		IBM1399//		IBM1399		1
+
+#	from			to			module		cost
+alias	ISO/TR_11548-1/		ISO_11548-1//
+alias	ISO11548-1//		ISO_11548-1//
+module	ISO_11548-1//		INTERNAL		ISO_11548-1	1
+module	INTERNAL		ISO_11548-1//		ISO_11548-1	1
--- libc/iconvdata/iso_11548-1.c	1 Jan 1970 00:00:00 -0000
+++ libc/iconvdata/iso_11548-1.c	16 Nov 2005 08:11:58 -0000	1.1
@@ -0,0 +1,73 @@
+/* Conversion to and from ISO 11548-1.
+   Copyright (C) 1997-1999, 2000-2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper at cygnus.com>, 1997,
+	Samuel Thibault <samuel.thibault at ens-lyon.org>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <dlfcn.h>
+#include <stdint.h>
+
+/* Definitions used in the body of the `gconv' function.  */
+#define CHARSET_NAME		"ISO_11548-1//"
+#define FROM_LOOP		from_iso11548_1
+#define TO_LOOP			to_iso11548_1
+#define DEFINE_INIT		1
+#define DEFINE_FINI		1
+#define MIN_NEEDED_FROM		1
+#define MIN_NEEDED_TO		4
+
+#define BRAILLE_UCS_BASE	0x2800
+
+/* First define the conversion function from ISO 11548-1 to UCS4.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
+#define LOOPFCT			FROM_LOOP
+#define BODY \
+  *((uint32_t *) outptr) = BRAILLE_UCS_BASE | (*inptr++);		      \
+  outptr += sizeof (uint32_t);
+#define ONEBYTE_BODY \
+  {									      \
+    return BRAILLE_UCS_BASE | c;					      \
+  }
+#include <iconv/loop.c>
+
+
+/* Next, define the other direction.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
+#define LOOPFCT			TO_LOOP
+#define BODY \
+  {									      \
+    uint32_t ch = *((const uint32_t *) inptr);				      \
+    if (__builtin_expect ((ch & 0xffffff00u) != BRAILLE_UCS_BASE, 0))	      \
+      {									      \
+	UNICODE_TAG_HANDLER (ch, 4);					      \
+									      \
+	/* We have an illegal character.  */				      \
+	STANDARD_TO_LOOP_ERR_HANDLER (4);				      \
+      }									      \
+    else								      \
+      *outptr++ = (unsigned char) (ch & 0xff);				      \
+    inptr += 4;								      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+
+/* Now define the toplevel functions.  */
+#include <iconv/skeleton.c>
--- libc/localedata/charmaps/ISO_11548-1	1 Jan 1970 00:00:00 -0000
+++ libc/localedata/charmaps/ISO_11548-1	16 Nov 2005 08:11:57 -0000	1.1
@@ -0,0 +1,269 @@
+<code_set_name> ISO_11548-1
+<comment_char> %
+<escape_char> /
+% version: 1.0
+%  source: Samuel Thibault <samuel.thibault at ens-lyon.org>
+
+% alias ISO/TR_11548-1
+CHARMAP
+<U2800>     /x00 BRAILLE PATTERN BLANK
+<U2801>     /x01 BRAILLE PATTERN DOTS-1
+<U2802>     /x02 BRAILLE PATTERN DOTS-2
+<U2803>     /x03 BRAILLE PATTERN DOTS-12
+<U2804>     /x04 BRAILLE PATTERN DOTS-3
+<U2805>     /x05 BRAILLE PATTERN DOTS-13
+<U2806>     /x06 BRAILLE PATTERN DOTS-23
+<U2807>     /x07 BRAILLE PATTERN DOTS-123
+<U2808>     /x08 BRAILLE PATTERN DOTS-4
+<U2809>     /x09 BRAILLE PATTERN DOTS-14
+<U280A>     /x0a BRAILLE PATTERN DOTS-24
+<U280B>     /x0b BRAILLE PATTERN DOTS-124
+<U280C>     /x0c BRAILLE PATTERN DOTS-34
+<U280D>     /x0d BRAILLE PATTERN DOTS-134
+<U280E>     /x0e BRAILLE PATTERN DOTS-234
+<U280F>     /x0f BRAILLE PATTERN DOTS-1234
+<U2810>     /x10 BRAILLE PATTERN DOTS-5
+<U2811>     /x11 BRAILLE PATTERN DOTS-15
+<U2812>     /x12 BRAILLE PATTERN DOTS-25
+<U2813>     /x13 BRAILLE PATTERN DOTS-125
+<U2814>     /x14 BRAILLE PATTERN DOTS-35
+<U2815>     /x15 BRAILLE PATTERN DOTS-135
+<U2816>     /x16 BRAILLE PATTERN DOTS-235
+<U2817>     /x17 BRAILLE PATTERN DOTS-1235
+<U2818>     /x18 BRAILLE PATTERN DOTS-45
+<U2819>     /x19 BRAILLE PATTERN DOTS-145
+<U281A>     /x1a BRAILLE PATTERN DOTS-245
+<U281B>     /x1b BRAILLE PATTERN DOTS-1245
+<U281C>     /x1c BRAILLE PATTERN DOTS-345
+<U281D>     /x1d BRAILLE PATTERN DOTS-1345
+<U281E>     /x1e BRAILLE PATTERN DOTS-2345
+<U281F>     /x1f BRAILLE PATTERN DOTS-12345
+<U2820>     /x20 BRAILLE PATTERN DOTS-6
+<U2821>     /x21 BRAILLE PATTERN DOTS-16
+<U2822>     /x22 BRAILLE PATTERN DOTS-26
+<U2823>     /x23 BRAILLE PATTERN DOTS-126
+<U2824>     /x24 BRAILLE PATTERN DOTS-36
+<U2825>     /x25 BRAILLE PATTERN DOTS-136
+<U2826>     /x26 BRAILLE PATTERN DOTS-236
+<U2827>     /x27 BRAILLE PATTERN DOTS-1236
+<U2828>     /x28 BRAILLE PATTERN DOTS-46
+<U2829>     /x29 BRAILLE PATTERN DOTS-146
+<U282A>     /x2a BRAILLE PATTERN DOTS-246
+<U282B>     /x2b BRAILLE PATTERN DOTS-1246
+<U282C>     /x2c BRAILLE PATTERN DOTS-346
+<U282D>     /x2d BRAILLE PATTERN DOTS-1346
+<U282E>     /x2e BRAILLE PATTERN DOTS-2346
+<U282F>     /x2f BRAILLE PATTERN DOTS-12346
+<U2830>     /x30 BRAILLE PATTERN DOTS-56
+<U2831>     /x31 BRAILLE PATTERN DOTS-156
+<U2832>     /x32 BRAILLE PATTERN DOTS-256
+<U2833>     /x33 BRAILLE PATTERN DOTS-1256
+<U2834>     /x34 BRAILLE PATTERN DOTS-356
+<U2835>     /x35 BRAILLE PATTERN DOTS-1356
+<U2836>     /x36 BRAILLE PATTERN DOTS-2356
+<U2837>     /x37 BRAILLE PATTERN DOTS-12356
+<U2838>     /x38 BRAILLE PATTERN DOTS-456
+<U2839>     /x39 BRAILLE PATTERN DOTS-1456
+<U283A>     /x3a BRAILLE PATTERN DOTS-2456
+<U283B>     /x3b BRAILLE PATTERN DOTS-12456
+<U283C>     /x3c BRAILLE PATTERN DOTS-3456
+<U283D>     /x3d BRAILLE PATTERN DOTS-13456
+<U283E>     /x3e BRAILLE PATTERN DOTS-23456
+<U283F>     /x3f BRAILLE PATTERN DOTS-123456
+<U2840>     /x40 BRAILLE PATTERN DOTS-7
+<U2841>     /x41 BRAILLE PATTERN DOTS-17
+<U2842>     /x42 BRAILLE PATTERN DOTS-27
+<U2843>     /x43 BRAILLE PATTERN DOTS-127
+<U2844>     /x44 BRAILLE PATTERN DOTS-37
+<U2845>     /x45 BRAILLE PATTERN DOTS-137
+<U2846>     /x46 BRAILLE PATTERN DOTS-237
+<U2847>     /x47 BRAILLE PATTERN DOTS-1237
+<U2848>     /x48 BRAILLE PATTERN DOTS-47
+<U2849>     /x49 BRAILLE PATTERN DOTS-147
+<U284A>     /x4a BRAILLE PATTERN DOTS-247
+<U284B>     /x4b BRAILLE PATTERN DOTS-1247
+<U284C>     /x4c BRAILLE PATTERN DOTS-347
+<U284D>     /x4d BRAILLE PATTERN DOTS-1347
+<U284E>     /x4e BRAILLE PATTERN DOTS-2347
+<U284F>     /x4f BRAILLE PATTERN DOTS-12347
+<U2850>     /x50 BRAILLE PATTERN DOTS-57
+<U2851>     /x51 BRAILLE PATTERN DOTS-157
+<U2852>     /x52 BRAILLE PATTERN DOTS-257
+<U2853>     /x53 BRAILLE PATTERN DOTS-1257
+<U2854>     /x54 BRAILLE PATTERN DOTS-357
+<U2855>     /x55 BRAILLE PATTERN DOTS-1357
+<U2856>     /x56 BRAILLE PATTERN DOTS-2357
+<U2857>     /x57 BRAILLE PATTERN DOTS-12357
+<U2858>     /x58 BRAILLE PATTERN DOTS-457
+<U2859>     /x59 BRAILLE PATTERN DOTS-1457
+<U285A>     /x5a BRAILLE PATTERN DOTS-2457
+<U285B>     /x5b BRAILLE PATTERN DOTS-12457
+<U285C>     /x5c BRAILLE PATTERN DOTS-3457
+<U285D>     /x5d BRAILLE PATTERN DOTS-13457
+<U285E>     /x5e BRAILLE PATTERN DOTS-23457
+<U285F>     /x5f BRAILLE PATTERN DOTS-123457
+<U2860>     /x60 BRAILLE PATTERN DOTS-67
+<U2861>     /x61 BRAILLE PATTERN DOTS-167
+<U2862>     /x62 BRAILLE PATTERN DOTS-267
+<U2863>     /x63 BRAILLE PATTERN DOTS-1267
+<U2864>     /x64 BRAILLE PATTERN DOTS-367
+<U2865>     /x65 BRAILLE PATTERN DOTS-1367
+<U2866>     /x66 BRAILLE PATTERN DOTS-2367
+<U2867>     /x67 BRAILLE PATTERN DOTS-12367
+<U2868>     /x68 BRAILLE PATTERN DOTS-467
+<U2869>     /x69 BRAILLE PATTERN DOTS-1467
+<U286A>     /x6a BRAILLE PATTERN DOTS-2467
+<U286B>     /x6b BRAILLE PATTERN DOTS-12467
+<U286C>     /x6c BRAILLE PATTERN DOTS-3467
+<U286D>     /x6d BRAILLE PATTERN DOTS-13467
+<U286E>     /x6e BRAILLE PATTERN DOTS-23467
+<U286F>     /x6f BRAILLE PATTERN DOTS-123467
+<U2870>     /x70 BRAILLE PATTERN DOTS-567
+<U2871>     /x71 BRAILLE PATTERN DOTS-1567
+<U2872>     /x72 BRAILLE PATTERN DOTS-2567
+<U2873>     /x73 BRAILLE PATTERN DOTS-12567
+<U2874>     /x74 BRAILLE PATTERN DOTS-3567
+<U2875>     /x75 BRAILLE PATTERN DOTS-13567
+<U2876>     /x76 BRAILLE PATTERN DOTS-23567
+<U2877>     /x77 BRAILLE PATTERN DOTS-123567
+<U2878>     /x78 BRAILLE PATTERN DOTS-4567
+<U2879>     /x79 BRAILLE PATTERN DOTS-14567
+<U287A>     /x7a BRAILLE PATTERN DOTS-24567
+<U287B>     /x7b BRAILLE PATTERN DOTS-124567
+<U287C>     /x7c BRAILLE PATTERN DOTS-34567
+<U287D>     /x7d BRAILLE PATTERN DOTS-134567
+<U287E>     /x7e BRAILLE PATTERN DOTS-234567
+<U287F>     /x7f BRAILLE PATTERN DOTS-1234567
+<U2880>     /x80 BRAILLE PATTERN DOTS-8
+<U2881>     /x81 BRAILLE PATTERN DOTS-18
+<U2882>     /x82 BRAILLE PATTERN DOTS-28
+<U2883>     /x83 BRAILLE PATTERN DOTS-128
+<U2884>     /x84 BRAILLE PATTERN DOTS-38
+<U2885>     /x85 BRAILLE PATTERN DOTS-138
+<U2886>     /x86 BRAILLE PATTERN DOTS-238
+<U2887>     /x87 BRAILLE PATTERN DOTS-1238
+<U2888>     /x88 BRAILLE PATTERN DOTS-48
+<U2889>     /x89 BRAILLE PATTERN DOTS-148
+<U288A>     /x8a BRAILLE PATTERN DOTS-248
+<U288B>     /x8b BRAILLE PATTERN DOTS-1248
+<U288C>     /x8c BRAILLE PATTERN DOTS-348
+<U288D>     /x8d BRAILLE PATTERN DOTS-1348
+<U288E>     /x8e BRAILLE PATTERN DOTS-2348
+<U288F>     /x8f BRAILLE PATTERN DOTS-12348
+<U2890>     /x90 BRAILLE PATTERN DOTS-58
+<U2891>     /x91 BRAILLE PATTERN DOTS-158
+<U2892>     /x92 BRAILLE PATTERN DOTS-258
+<U2893>     /x93 BRAILLE PATTERN DOTS-1258
+<U2894>     /x94 BRAILLE PATTERN DOTS-358
+<U2895>     /x95 BRAILLE PATTERN DOTS-1358
+<U2896>     /x96 BRAILLE PATTERN DOTS-2358
+<U2897>     /x97 BRAILLE PATTERN DOTS-12358
+<U2898>     /x98 BRAILLE PATTERN DOTS-458
+<U2899>     /x99 BRAILLE PATTERN DOTS-1458
+<U289A>     /x9a BRAILLE PATTERN DOTS-2458
+<U289B>     /x9b BRAILLE PATTERN DOTS-12458
+<U289C>     /x9c BRAILLE PATTERN DOTS-3458
+<U289D>     /x9d BRAILLE PATTERN DOTS-13458
+<U289E>     /x9e BRAILLE PATTERN DOTS-23458
+<U289F>     /x9f BRAILLE PATTERN DOTS-123458
+<U28A0>     /xa0 BRAILLE PATTERN DOTS-68
+<U28A1>     /xa1 BRAILLE PATTERN DOTS-168
+<U28A2>     /xa2 BRAILLE PATTERN DOTS-268
+<U28A3>     /xa3 BRAILLE PATTERN DOTS-1268
+<U28A4>     /xa4 BRAILLE PATTERN DOTS-368
+<U28A5>     /xa5 BRAILLE PATTERN DOTS-1368
+<U28A6>     /xa6 BRAILLE PATTERN DOTS-2368
+<U28A7>     /xa7 BRAILLE PATTERN DOTS-12368
+<U28A8>     /xa8 BRAILLE PATTERN DOTS-468
+<U28A9>     /xa9 BRAILLE PATTERN DOTS-1468
+<U28AA>     /xaa BRAILLE PATTERN DOTS-2468
+<U28AB>     /xab BRAILLE PATTERN DOTS-12468
+<U28AC>     /xac BRAILLE PATTERN DOTS-3468
+<U28AD>     /xad BRAILLE PATTERN DOTS-13468
+<U28AE>     /xae BRAILLE PATTERN DOTS-23468
+<U28AF>     /xaf BRAILLE PATTERN DOTS-123468
+<U28B0>     /xb0 BRAILLE PATTERN DOTS-568
+<U28B1>     /xb1 BRAILLE PATTERN DOTS-1568
+<U28B2>     /xb2 BRAILLE PATTERN DOTS-2568
+<U28B3>     /xb3 BRAILLE PATTERN DOTS-12568
+<U28B4>     /xb4 BRAILLE PATTERN DOTS-3568
+<U28B5>     /xb5 BRAILLE PATTERN DOTS-13568
+<U28B6>     /xb6 BRAILLE PATTERN DOTS-23568
+<U28B7>     /xb7 BRAILLE PATTERN DOTS-123568
+<U28B8>     /xb8 BRAILLE PATTERN DOTS-4568
+<U28B9>     /xb9 BRAILLE PATTERN DOTS-14568
+<U28BA>     /xba BRAILLE PATTERN DOTS-24568
+<U28BB>     /xbb BRAILLE PATTERN DOTS-124568
+<U28BC>     /xbc BRAILLE PATTERN DOTS-34568
+<U28BD>     /xbd BRAILLE PATTERN DOTS-134568
+<U28BE>     /xbe BRAILLE PATTERN DOTS-234568
+<U28BF>     /xbf BRAILLE PATTERN DOTS-1234568
+<U28C0>     /xc0 BRAILLE PATTERN DOTS-78
+<U28C1>     /xc1 BRAILLE PATTERN DOTS-178
+<U28C2>     /xc2 BRAILLE PATTERN DOTS-278
+<U28C3>     /xc3 BRAILLE PATTERN DOTS-1278
+<U28C4>     /xc4 BRAILLE PATTERN DOTS-378
+<U28C5>     /xc5 BRAILLE PATTERN DOTS-1378
+<U28C6>     /xc6 BRAILLE PATTERN DOTS-2378
+<U28C7>     /xc7 BRAILLE PATTERN DOTS-12378
+<U28C8>     /xc8 BRAILLE PATTERN DOTS-478
+<U28C9>     /xc9 BRAILLE PATTERN DOTS-1478
+<U28CA>     /xca BRAILLE PATTERN DOTS-2478
+<U28CB>     /xcb BRAILLE PATTERN DOTS-12478
+<U28CC>     /xcc BRAILLE PATTERN DOTS-3478
+<U28CD>     /xcd BRAILLE PATTERN DOTS-13478
+<U28CE>     /xce BRAILLE PATTERN DOTS-23478
+<U28CF>     /xcf BRAILLE PATTERN DOTS-123478
+<U28D0>     /xd0 BRAILLE PATTERN DOTS-578
+<U28D1>     /xd1 BRAILLE PATTERN DOTS-1578
+<U28D2>     /xd2 BRAILLE PATTERN DOTS-2578
+<U28D3>     /xd3 BRAILLE PATTERN DOTS-12578
+<U28D4>     /xd4 BRAILLE PATTERN DOTS-3578
+<U28D5>     /xd5 BRAILLE PATTERN DOTS-13578
+<U28D6>     /xd6 BRAILLE PATTERN DOTS-23578
+<U28D7>     /xd7 BRAILLE PATTERN DOTS-123578
+<U28D8>     /xd8 BRAILLE PATTERN DOTS-4578
+<U28D9>     /xd9 BRAILLE PATTERN DOTS-14578
+<U28DA>     /xda BRAILLE PATTERN DOTS-24578
+<U28DB>     /xdb BRAILLE PATTERN DOTS-124578
+<U28DC>     /xdc BRAILLE PATTERN DOTS-34578
+<U28DD>     /xdd BRAILLE PATTERN DOTS-134578
+<U28DE>     /xde BRAILLE PATTERN DOTS-234578
+<U28DF>     /xdf BRAILLE PATTERN DOTS-1234578
+<U28E0>     /xe0 BRAILLE PATTERN DOTS-678
+<U28E1>     /xe1 BRAILLE PATTERN DOTS-1678
+<U28E2>     /xe2 BRAILLE PATTERN DOTS-2678
+<U28E3>     /xe3 BRAILLE PATTERN DOTS-12678
+<U28E4>     /xe4 BRAILLE PATTERN DOTS-3678
+<U28E5>     /xe5 BRAILLE PATTERN DOTS-13678
+<U28E6>     /xe6 BRAILLE PATTERN DOTS-23678
+<U28E7>     /xe7 BRAILLE PATTERN DOTS-123678
+<U28E8>     /xe8 BRAILLE PATTERN DOTS-4678
+<U28E9>     /xe9 BRAILLE PATTERN DOTS-14678
+<U28EA>     /xea BRAILLE PATTERN DOTS-24678
+<U28EB>     /xeb BRAILLE PATTERN DOTS-124678
+<U28EC>     /xec BRAILLE PATTERN DOTS-34678
+<U28ED>     /xed BRAILLE PATTERN DOTS-134678
+<U28EE>     /xee BRAILLE PATTERN DOTS-234678
+<U28EF>     /xef BRAILLE PATTERN DOTS-1234678
+<U28F0>     /xf0 BRAILLE PATTERN DOTS-5678
+<U28F1>     /xf1 BRAILLE PATTERN DOTS-15678
+<U28F2>     /xf2 BRAILLE PATTERN DOTS-25678
+<U28F3>     /xf3 BRAILLE PATTERN DOTS-125678
+<U28F4>     /xf4 BRAILLE PATTERN DOTS-35678
+<U28F5>     /xf5 BRAILLE PATTERN DOTS-135678
+<U28F6>     /xf6 BRAILLE PATTERN DOTS-235678
+<U28F7>     /xf7 BRAILLE PATTERN DOTS-1235678
+<U28F8>     /xf8 BRAILLE PATTERN DOTS-45678
+<U28F9>     /xf9 BRAILLE PATTERN DOTS-145678
+<U28FA>     /xfa BRAILLE PATTERN DOTS-245678
+<U28FB>     /xfb BRAILLE PATTERN DOTS-1245678
+<U28FC>     /xfc BRAILLE PATTERN DOTS-345678
+<U28FD>     /xfd BRAILLE PATTERN DOTS-1345678
+<U28FE>     /xfe BRAILLE PATTERN DOTS-2345678
+<U28FF>     /xff BRAILLE PATTERN DOTS-12345678
+END CHARMAP
+
+WIDTH
+<U2800>...<U28FF>	1
+END WIDTH
--- libc/iconvdata/testdata/ISO_11548-1	2006-02-09 08:47:30.620726250 +0100
+++ libc/iconvdata/testdata/ISO_11548-1	2005-11-16 09:11:58.000000000 +0100
@@ -0,0 +1,2 @@
+
+
 !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
\ No newline at end of file
--- libc/iconvdata/testdata/ISO_11548-1..UTF8	2006-02-09 08:47:30.620726250 +0100
+++ libc/iconvdata/testdata/ISO_11548-1..UTF8	2005-11-16 09:11:58.000000000 +0100
@@ -0,0 +1 @@
+????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
\ No newline at end of file

glibc-localedata-fixes.patch:
 SUPPORTED     |    2 +-
 locales/fi_FI |    2 +-
 locales/mn_MN |    6 +++---
 locales/pt_BR |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE glibc-localedata-fixes.patch ---
2006-01-02  Andreas Jaeger  <aj at suse.de>

	* locales/fi_FI: Fix date_fmt.
	* locales/mn_MN: Likewise.

2005-11-11  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1294]
	* locales/pt_BR: Set p_cs_precedes and n_cs_precedes to 1.

2005-11-05  Ulrich Drepper  <drepper at redhat.com>

	* SUPPORTED (SUPPORTED-LOCALES): Fix typo in si_LK line.

--- libc/localedata/SUPPORTED	15 Oct 2005 04:30:28 -0000	1.86
+++ libc/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
@@ -286,7 +286,7 @@ ru_UA.UTF-8/UTF-8 \
 ru_UA/KOI8-U \
 rw_RW/UTF-8 \
 se_NO/UTF-8 \
-si_LK/ITF-8 \
+si_LK/UTF-8 \
 sid_ET/UTF-8 \
 sk_SK.UTF-8/UTF-8 \
 sk_SK/ISO-8859-2 \
--- libc/localedata/locales/fi_FI	15 Oct 2005 04:08:13 -0000	1.19
+++ libc/localedata/locales/fi_FI	2 Jan 2006 20:00:57 -0000	1.20
@@ -2188,7 +2188,7 @@ d_fmt    "<U0025><U0064><U002E><U0025><U
 t_fmt    "<U0025><U0054>"
 am_pm    "";""
 t_fmt_ampm  ""
-date_fmt       "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>\
+date_fmt       "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/
 <U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>"
 first_weekday 2 % Monday
 first_workday 2 % Monday
--- libc/localedata/locales/mn_MN	22 May 2005 16:20:17 -0000	1.5
+++ libc/localedata/locales/mn_MN	2 Jan 2006 20:03:28 -0000	1.6
@@ -102,7 +102,7 @@ include "translit_combining";""
 <U042A> "<U0022>" % "
 <U042B> "<U0059>"
 <U042C> "<U0027>" % '
-<U042D> "<U0045>" 
+<U042D> "<U0045>"
 <U042E> "<U0059><U0075>" % Yu
 <U042F> "<U0059><U0061>" % Ya
 % CYRILLIC SMALL LETTERS IN ALPHABETICAL ORDER.
@@ -218,8 +218,8 @@ am_pm   "";""
 t_fmt_ampm ""
 % Full date and time representation
 % "%Z %Y ony %B %e, %a %H:%M:%S"
-date_fmt  "<U0025><U005A><U0020><U0025><U0059><U0020><U043E><U043D><U044B><U0020><U0025><U0042><U0020>";/
-	  "<U0025><U0065><U002C><U0020><U0025><U0061><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
+date_fmt  "<U0025><U005A><U0020><U0025><U0059><U0020><U043E><U043D><U044B><U0020><U0025><U0042><U0020>/
+<U0025><U0065><U002C><U0020><U0025><U0061><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
 END LC_TIME
 
 LC_MESSAGES
--- libc/localedata/locales/pt_BR	31 Oct 2004 23:42:27 -0000	1.14
+++ libc/localedata/locales/pt_BR	12 Nov 2005 02:10:55 -0000	1.15
@@ -65,9 +65,9 @@ positive_sign             ""
 negative_sign             "<U002D>"
 int_frac_digits           2
 frac_digits               2
-p_cs_precedes             0
+p_cs_precedes             1
 p_sep_by_space            1
-n_cs_precedes             0
+n_cs_precedes             1
 n_sep_by_space            1
 p_sign_posn               1
 n_sign_posn               1

glibc-nan.patch:
 nan.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE glibc-nan.patch ---
2006-01-04  Joseph S. Myers  <joseph at codesourcery.com>

	* sysdeps/ieee754/bits/nan.h: Fix typo.

--- libc/sysdeps/ieee754/bits/nan.h	16 Apr 2004 22:03:35 -0000	1.9
+++ libc/sysdeps/ieee754/bits/nan.h	4 Jan 2006 06:21:57 -0000	1.10
@@ -26,13 +26,13 @@
 
 #if __GNUC_PREREQ(3,3)
 
-# define NAN	(__builtin_nanf(""))
+# define NAN	(__builtin_nanf (""))
 
-#elif defined__GNUC__
+#elif defined __GNUC__
 
 # define NAN \
-  (__extension__                                                            \
-   ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })  \
+  (__extension__							      \
+   ((union { unsigned __l __attribute__ ((__mode__ (__SI__))); float __d; })  \
     { __l: 0x7fc00000UL }).__d)
 
 #else

glibc-nis+.patch:
 nis/nis_call.c                      |   30 +--
 nis/nis_error.c                     |   13 -
 nis/nis_lookup.c                    |   17 +-
 nis/nis_table.c                     |  143 ++++++++++--------
 nis/nss_nisplus/nisplus-alias.c     |  219 ++++++++++++++-------------
 nis/nss_nisplus/nisplus-ethers.c    |  208 +++++++++++++-------------
 nis/nss_nisplus/nisplus-grp.c       |  194 +++++++++++++-----------
 nis/nss_nisplus/nisplus-hosts.c     |  268 +++++++++++++++++-----------------
 nis/nss_nisplus/nisplus-netgrp.c    |    7 
 nis/nss_nisplus/nisplus-network.c   |  241 ++++++++++++++++--------------
 nis/nss_nisplus/nisplus-proto.c     |  243 ++++++++++++++++--------------
 nis/nss_nisplus/nisplus-publickey.c |   19 +-
 nis/nss_nisplus/nisplus-pwd.c       |  237 ++++++++++++++++--------------
 nis/nss_nisplus/nisplus-rpc.c       |  248 +++++++++++++++++--------------
 nis/nss_nisplus/nisplus-service.c   |  259 +++++++++++++++++---------------
 nis/nss_nisplus/nisplus-spwd.c      |  138 +++++++----------
 nis/ypclnt.c                        |  283 +++++++++++++++++++++---------------
 sunrpc/auth_des.c                   |    2 
 18 files changed, 1476 insertions(+), 1293 deletions(-)

--- NEW FILE glibc-nis+.patch ---
2006-02-22  Jakub Jelinek  <jakub at redhat.com>

	* nis/ypclnt.c (yperr_string, ypbinderr_string): Add N_()
	around string literals.

2005-12-08  Ulrich Drepper  <drepper at redhat.com>

	* nis/nis_call.c (inetstr2int): Optimize.

2005-12-08  Jakub Jelinek  <jakub at redhat.com>

	* nis/nis_call.c (__nisbind_create): Remove __nisbind_destroy,
	->clnt cannot be != NULL.
	(__do_niscall): No need to use __nisbind_destroy, __nisbind_next
	did it.
	(__nisbind_connect): use_auth is already TRUE, otherwise we would
	not be here.

	* nis/nis_lookup.c (nis_lookup): Remove unnecessary
	__nisbind_destroy calls.  __nisbind_next does all that.

	* nis/ypclnt.c (yp_update): Before trying default authentication,
	free DES descriptor.

2005-12-07  Jakub Jelinek  <jakub at redhat.com>

	* nis/nis_table.c (nis_list): Fix memory handling in error case.

2005-12-07  Ulrich Drepper  <drepper at redhat.com>

	* nis/nis_table.c (nis_list): Remove have_tablepath, just use the
	pointer value itself.

	* sunrpc/auth_des.c (authdes_pk_create): If conversation key
	cannot be created, free memory.
	Reported by rprasad at vmware.com.

2005-12-03  Ulrich Drepper  <drepper at redhat.com>

	* nis/nis_table.c (nis_list): Optimize freeing and reallocation of
	result record.

	* nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
	Better sized buffers.  Correct error case handling.
	* nis/nis_error.c (nis_sperror_r): Let snprintf determine whether
	there is an overflow.
	* nis/nss_nisplus/nisplus-service.c: Fix locking to use
	_nss_create_tablename.  Avoid unnecessary copying, remove
	unnecessary variables, general cleanup.
	* nis/nss_nisplus/nisplus-rpc.c: Likewise.
	* nis/nss_nisplus/nisplus-proto.c: Likewise..
	* nis/nss_nisplus/nisplus-network.c: Fix locking to use
	_nss_create_tablename.  Avoid unnecessary copying, general cleanup.
	* nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_getipnodebyname_r):
	Removed.
	Fix locking to use _nss_create_tablename.  Avoid unnecessary copying,
	general cleanup.
	* nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r):
	Correctly construct request.
	Fix locking to use _nss_create_tablename.  Avoid unnecessary copying,
	general cleanup.
	* nis/nss_nisplus/nisplus-alias.c: Fix locking to use
	_nss_create_tablename.  Avoid unnecessary copying, general cleanup.
	* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_setnetgrent):
	Rewrite to use snprintf.
	* nis/nss_nisplus/nisplus-publickey.c (_nss_nisplus_netname2user):
	Likewise.

2005-12-02  Ulrich Drepper  <drepper at redhat.com>

	* nis/nss_nisplus/nisplus-pwd.c (_nss_pwd_create_tablename):
	Renamed from _nss_create_tablename.  Export from file (but not DSO).
	(pwd_tablename_val): Renamed from tablename_val, mark hidden.
	(pwd_tablename_len): Renamed from tablename_len, mark hidden.
	Change all users.
	* nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename): Removed.
	Use _nss_pwd_create_tablename now.  Use pwd_tablename_val and
	pwd_tablename_len.  Remove unnecessary variables, general cleanup.

	* nis/nss_nisplus/nisplus-pwd.c: Fix locking to use
	_nss_create_tablename.  Avoid unnecessary copying, remove
	unnecessary variables, general cleanup.
	* nis/nss_nisplus/nisplus-grp.c: Likewise.

2005-11-27  Ulrich Drepper  <drepper at redhat.com>

	* nis/nis_table.c (nis_list): Add more free calls in error cases.

2005-11-26  Ulrich Drepper  <drepper at redhat.com>

	* nis/nis_lookup.c (nis_lookup): Mark RPCTIMEOUT as const.  Pretty
	printing.

	* nis/nis_table.c (__create_ib_request): Use strdupa instead of
	variable size array.
	(RPCTIMEOUT): Mark as const.

	* nis/ypclnt.c (yp_bind_ypbindprog): Initialize clnt_saddr by hand.
	(ypdomainname): Renamed from __ypdomainname.  No need for initializer.
	(ypbindlist): Renamed from __ypbindlist.
	(do_ypcall): Check memory allocation suceeded before calling
	yp_bind_ypbindprog.
	(yperr_string): Reduce size of function by using only one gettext call.
	(ypbinderr_string): Likewise.
	(yp_match): Free response in case memory for return value cannot be
	allocated.
	(yp_first): Likewise.
	(yp_next): Likewise.
	(do_ypcall_tr): New function which translates error codes as well.
	(yp_match, yp_next, yp_master, yp_order, yp_maplist): Use it.
	(yp_all): Correct test for invalid parameter.
	Pretty printing.
	(RPCTIMEOUT, UDPTIMEOUT): Mark as const.

2005-11-25  Ulrich Drepper  <drepper at redhat.com>

	[BZ #1925]
	* nis/ypclnt.c (yp_order): Correct test for invalid parameter.

--- libc/sunrpc/auth_des.c	17 Feb 2005 01:16:50 -0000	1.11
+++ libc/sunrpc/auth_des.c	7 Dec 2005 04:10:51 -0000	1.12
@@ -174,7 +174,7 @@ authdes_pk_create (const char *servernam
       if (key_gendes (&auth->ah_key) < 0)
 	{
 	  debug ("authdes_create: unable to gen conversation key");
-	  return NULL;
+	  goto failed;
 	}
     }
   else
--- libc/nis/nis_call.c	26 Oct 2004 01:14:11 -0000	1.32
+++ libc/nis/nis_call.c	9 Dec 2005 06:47:59 -0000	1.36
@@ -40,25 +40,16 @@ extern u_short __pmap_getnisport (struct
 unsigned long
 inetstr2int (const char *str)
 {
-  char buffer[strlen (str) + 3];
-  size_t buflen;
-  size_t i, j;
-
-  buflen = stpcpy (buffer, str) - buffer;
-
-  j = 0;
-  for (i = 0; i < buflen; ++i)
-    if (buffer[i] == '.')
+  size_t j = 0;
+  for (size_t i = 0; str[i] != '\0'; ++i)
+    if (str[i] == '.' && ++j == 4)
       {
-	++j;
-	if (j == 4)
-	  {
-	    buffer[i] = '\0';
-	    break;
-	  }
+	char buffer[i + 1];
+	buffer[i] = '\0';
+	return inet_addr (memcpy (buffer, str, i));
       }
 
-  return inet_addr (buffer);
+  return inet_addr (str);
 }
 
 void
@@ -179,7 +170,6 @@ __nisbind_connect (dir_binding *dbp)
 	}
       else
 	dbp->clnt->cl_auth = authunix_create_default ();
-      dbp->use_auth = TRUE;
     }
 
   return NIS_SUCCESS;
@@ -215,10 +205,7 @@ __nisbind_create (dir_binding *dbp, cons
 
   dbp->class = -1;
   if (__nis_findfastest (dbp) < 1)
-    {
-      __nisbind_destroy (dbp);
-      return NIS_NAMEUNREACHABLE;
-    }
+    return NIS_NAMEUNREACHABLE;
 
   return NIS_SUCCESS;
 }
@@ -585,7 +572,6 @@ __do_niscall (const_nis_name name, u_lon
 	  if (__nisbind_next (&bptr) != NIS_SUCCESS)
 	    {
 	      nis_free_directory (dir);
-	      __nisbind_destroy (&bptr);
 	      return NIS_NAMEUNREACHABLE;
 	    }
 	}
--- libc/nis/nis_error.c	24 Oct 2004 20:28:28 -0000	1.11
+++ libc/nis/nis_error.c	3 Dec 2005 22:15:00 -0000	1.12
@@ -102,26 +102,21 @@ char *
 nis_sperror_r (const nis_error status, const char *label,
 	       char *buffer, size_t buflen)
 {
[...4206 lines suppressed...]
 
-      p = __stpcpy (buf, "passwd.org_dir.");
-      p = __stpcpy (p, nis_local_directory ());
-      tablename_val = __strdup (buf);
-      if (tablename_val == NULL)
-	{
-	  *errnop = errno;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      tablename_len = strlen (tablename_val);
-    }
-  return NSS_STATUS_SUCCESS;
-}
 
 enum nss_status
 _nss_nisplus_setspent (int stayopen)
@@ -62,12 +45,14 @@ _nss_nisplus_setspent (int stayopen)
 
   __libc_lock_lock (lock);
 
-  if (result)
-    nis_freeresult (result);
-  result = NULL;
+  if (result != NULL)
+    {
+      nis_freeresult (result);
+      result = NULL;
+    }
 
-  if (tablename_val == NULL)
-    status = _nss_create_tablename (&err);
+  if (pwd_tablename_val == NULL)
+    status = _nss_pwd_create_tablename (&err);
 
   __libc_lock_unlock (lock);
 
@@ -79,9 +64,11 @@ _nss_nisplus_endspent (void)
 {
   __libc_lock_lock (lock);
 
-  if (result)
-    nis_freeresult (result);
-  result = NULL;
+  if (result != NULL)
+    {
+      nis_freeresult (result);
+      result = NULL;
+    }
 
   __libc_lock_unlock (lock);
 
@@ -103,25 +90,22 @@ internal_nisplus_getspent_r (struct spwd
 	{
 	  saved_res = NULL;
 
-          if (tablename_val == NULL)
+          if (pwd_tablename_val == NULL)
 	    {
-	      enum nss_status status = _nss_create_tablename (errnop);
+	      enum nss_status status = _nss_pwd_create_tablename (errnop);
 
 	      if (status != NSS_STATUS_SUCCESS)
 		return status;
 	    }
 
-	  result = nis_first_entry (tablename_val);
+	  result = nis_first_entry (pwd_tablename_val);
 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
 	    return niserr2nss (result->status);
 	}
       else
 	{
-	  nis_result *res;
-
 	  saved_res = result;
-	  res = nis_next_entry (tablename_val, &result->cookie);
-	  result = res;
+	  result = nis_next_entry (pwd_tablename_val, &result->cookie);
 	  if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
 	    {
 	      nis_freeresult (saved_res);
@@ -131,19 +115,18 @@ internal_nisplus_getspent_r (struct spwd
 
       parse_res = _nss_nisplus_parse_spent (result, sp, buffer,
 					    buflen, errnop);
-      if (parse_res == -1)
+      if (__builtin_expect (parse_res == -1, 0))
 	{
 	  nis_freeresult (result);
 	  result = saved_res;
 	  *errnop = ERANGE;
 	  return NSS_STATUS_TRYAGAIN;
 	}
-      else
-	{
-	  if (saved_res)
-	    nis_freeresult (saved_res);
-	}
-    } while (!parse_res);
+
+      if (saved_res != NULL)
+	nis_freeresult (saved_res);
+    }
+  while (!parse_res);
 
   return NSS_STATUS_SUCCESS;
 }
@@ -169,9 +152,9 @@ _nss_nisplus_getspnam_r (const char *nam
 {
   int parse_res;
 
-  if (tablename_val == NULL)
+  if (pwd_tablename_val == NULL)
     {
-      enum nss_status status = _nss_create_tablename (errnop);
+      enum nss_status status = _nss_pwd_create_tablename (errnop);
 
       if (status != NSS_STATUS_SUCCESS)
 	return status;
@@ -182,48 +165,47 @@ _nss_nisplus_getspnam_r (const char *nam
       *errnop = EINVAL;
       return NSS_STATUS_NOTFOUND;
     }
-  else
-    {
-      nis_result *result;
-      char buf[strlen (name) + 24 + tablename_len];
-      int olderr = errno;
 
-      sprintf (buf, "[name=%s],%s", name, tablename_val);
+  nis_result *result;
+  char buf[strlen (name) + 9 + pwd_tablename_len];
+  int olderr = errno;
 
-      result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
+  snprintf (buf, sizeof (buf), "[name=%s],%s", name, pwd_tablename_val);
 
-      if (result == NULL)
-	{
-	  *errnop = ENOMEM;
-	  return NSS_STATUS_TRYAGAIN;
-	}
-      if (niserr2nss (result->status) != NSS_STATUS_SUCCESS)
-	{
-	  enum nss_status status = niserr2nss (result->status);
+  result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
 
-	  __set_errno (olderr);
+  if (result == NULL)
+    {
+      *errnop = ENOMEM;
+      return NSS_STATUS_TRYAGAIN;
+    }
 
-	  nis_freeresult (result);
-	  return status;
-	}
+  if (__builtin_expect (niserr2nss (result->status) != NSS_STATUS_SUCCESS, 0))
+    {
+      enum nss_status status = niserr2nss (result->status);
+
+      __set_errno (olderr);
 
-      parse_res = _nss_nisplus_parse_spent (result, sp, buffer, buflen,
-					    errnop);
       nis_freeresult (result);
+      return status;
+    }
 
-      if (parse_res < 1)
+  parse_res = _nss_nisplus_parse_spent (result, sp, buffer, buflen, errnop);
+  nis_freeresult (result);
+
+  if (__builtin_expect (parse_res < 1, 0))
+    {
+      if (parse_res == -1)
 	{
-	  if (parse_res == -1)
-	    {
-	      *errnop = ERANGE;
-	      return NSS_STATUS_TRYAGAIN;
-	    }
-	  else
-	    {
-	      __set_errno (olderr);
-	      return NSS_STATUS_NOTFOUND;
-	    }
+	  *errnop = ERANGE;
+	  return NSS_STATUS_TRYAGAIN;
+	}
+      else
+	{
+	  __set_errno (olderr);
+	  return NSS_STATUS_NOTFOUND;
 	}
-      return NSS_STATUS_SUCCESS;
     }
+
+  return NSS_STATUS_SUCCESS;
 }

glibc-nptl-forcedunwind.patch:
 unwind-forcedunwind.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE glibc-nptl-forcedunwind.patch ---
2005-11-17  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/pthread/unwind-forcedunwind.c (pthread_cancel_init): Put
	a write barrier before writing libgcc_s_getcfa.

--- libc/nptl/sysdeps/pthread/unwind-forcedunwind.c	4 Sep 2003 05:41:57 -0000	1.1
+++ libc/nptl/sysdeps/pthread/unwind-forcedunwind.c	16 Nov 2005 23:31:28 -0000	1.2
@@ -56,6 +56,10 @@ pthread_cancel_init (void)
   libgcc_s_resume = resume;
   libgcc_s_personality = personality;
   libgcc_s_forcedunwind = forcedunwind;
+  /* Make sure libgcc_s_getcfa is written last.  Otherwise,
+     pthread_cancel_init might return early even when the pointer the
+     caller is interested in is not initialized yet.  */
+  atomic_write_barrier ();
   libgcc_s_getcfa = getcfa;
 }
 

glibc-nptl-static-tls-size.patch:
 allocatestack.c |    5 +++--
 init.c          |   25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

--- NEW FILE glibc-nptl-static-tls-size.patch ---
2005-12-12  Roland McGrath  <roland at redhat.com>

	* init.c (__pthread_initialize_minimal_internal): Do __static_tls_size
	adjustments before choosing stack size.  Update minimum stack size
	calculation to match allocate_stack change.

2005-12-12  Ulrich Drepper  <drepper at redhat.com>

	* allocatestack.c (allocate_stack): Don't demand that there is an
	additional full page available on the stack beside guard, TLS, the
	minimum stack.

--- libc/nptl/allocatestack.c	4 Oct 2005 00:40:01 -0000	1.59
+++ libc/nptl/allocatestack.c	13 Dec 2005 06:14:47 -0000	1.60
@@ -407,8 +407,9 @@ allocate_stack (const struct pthread_att
       /* Make sure the size of the stack is enough for the guard and
 	 eventually the thread descriptor.  */
       guardsize = (attr->guardsize + pagesize_m1) & ~pagesize_m1;
-      if (__builtin_expect (size < (guardsize + __static_tls_size
-				    + MINIMAL_REST_STACK + pagesize_m1 + 1),
+      if (__builtin_expect (size < ((guardsize + __static_tls_size
+				     + MINIMAL_REST_STACK + pagesize_m1)
+				    & ~pagesize_m1),
 			    0))
 	/* The stack is too small (or the guard too large).  */
 	return EINVAL;
--- libc/nptl/init.c	16 Oct 2005 11:38:54 -0000	1.54
+++ libc/nptl/init.c	13 Dec 2005 07:32:19 -0000	1.55
@@ -289,6 +289,17 @@ __pthread_initialize_minimal_internal (v
   (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_UNBLOCK, &sa.sa_mask,
 			   NULL, _NSIG / 8);
 
+  /* Get the size of the static and alignment requirements for the TLS
+     block.  */
+  size_t static_tls_align;
+  _dl_get_tls_static_info (&__static_tls_size, &static_tls_align);
+
+  /* Make sure the size takes all the alignments into account.  */
+  if (STACK_ALIGN > static_tls_align)
+    static_tls_align = STACK_ALIGN;
+  __static_tls_align_m1 = static_tls_align - 1;
+
+  __static_tls_size = roundup (__static_tls_size, static_tls_align);
 
   /* Determine the default allowed stack size.  This is the size used
      in case the user does not specify one.  */
@@ -306,7 +317,7 @@ __pthread_initialize_minimal_internal (v
   /* Make sure it meets the minimum size that allocate_stack
      (allocatestack.c) will demand, which depends on the page size.  */
   const uintptr_t pagesz = __sysconf (_SC_PAGESIZE);
-  const size_t minstack = pagesz * 2 + __static_tls_size + MINIMAL_REST_STACK;
+  const size_t minstack = pagesz + __static_tls_size + MINIMAL_REST_STACK;
   if (limit.rlim_cur < minstack)
     limit.rlim_cur = minstack;
 
@@ -314,18 +325,6 @@ __pthread_initialize_minimal_internal (v
   limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz;
   __default_stacksize = limit.rlim_cur;
 
-  /* Get the size of the static and alignment requirements for the TLS
-     block.  */
-  size_t static_tls_align;
-  _dl_get_tls_static_info (&__static_tls_size, &static_tls_align);
-
-  /* Make sure the size takes all the alignments into account.  */
-  if (STACK_ALIGN > static_tls_align)
-    static_tls_align = STACK_ALIGN;
-  __static_tls_align_m1 = static_tls_align - 1;
-
-  __static_tls_size = roundup (__static_tls_size, static_tls_align);
-
 #ifdef SHARED
   /* Transfer the old value from the dynamic linker's internal location.  */
   *__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) ();

glibc-nptl_db.patch:
 structs.def      |    2 ++
 td_thr_tlsbase.c |   11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE glibc-nptl_db.patch ---
2006-02-03  Roland McGrath  <roland at redhat.com>

	* structs.def: Add a descriptor for pointer.val field of dtv_t.
	* td_thr_tlsbase.c (td_thr_tlsbase): Extract pointer.val field from
	DTV slot.

--- libc/nptl_db/structs.def	18 Dec 2003 02:51:04 -0000	1.2
+++ libc/nptl_db/structs.def	4 Feb 2006 00:47:58 -0000	1.3
@@ -74,6 +74,8 @@ DB_STRUCT_FIELD (link_map, l_tls_modid)
 
 #if !defined IS_IN_libpthread || USE_TLS
 DB_STRUCT_ARRAY_FIELD (dtv, dtv)
+# define pointer_val pointer.val /* Field of anonymous struct in dtv_t.  */
+DB_STRUCT_FIELD (dtv_t, pointer_val)
 #endif
 #if !defined IS_IN_libpthread || TLS_TCB_AT_TP
 DB_STRUCT_FIELD (pthread, dtvp)
--- libc/nptl_db/td_thr_tlsbase.c	9 Sep 2003 06:57:51 -0000	1.2
+++ libc/nptl_db/td_thr_tlsbase.c	4 Feb 2006 00:47:58 -0000	1.3
@@ -25,7 +25,7 @@ td_thr_tlsbase (const td_thrhandle_t *th
 		psaddr_t *base)
 {
   td_err_e err;
-  psaddr_t dtv, dtvptr;
+  psaddr_t dtv, dtvslot, dtvptr;
 
   if (modid < 1)
     return TD_NOTLS;
@@ -35,8 +35,13 @@ td_thr_tlsbase (const td_thrhandle_t *th
   if (err != TD_OK)
     return err;
 
-  /* Get the corresponding entry in the DTV.  */
-  err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtv, dtv, dtv, modid);
+  /* Find the corresponding entry in the DTV.  */
+  err = DB_GET_FIELD_ADDRESS (dtvslot, th->th_ta_p, dtv, dtv, dtv, modid);
+  if (err != TD_OK)
+    return err;
+
+  /* Extract the TLS block address from that DTV slot.  */
+  err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtvslot, dtv_t, pointer_val, 0);
   if (err != TD_OK)
     return err;
 

glibc-nscd-nischeck.patch:
 Makefile        |   11 +-----
 nscd_nischeck.c |   96 --------------------------------------------------------
 2 files changed, 3 insertions(+), 104 deletions(-)

--- NEW FILE glibc-nscd-nischeck.patch ---
2005-12-14  Thorsten Kukuk  <kukuk at suse.de>

	* nscd/Makefile: Don't build nscd_nischeck.
	* nscd/nscd_nischeck.c: Removed.

--- libc/nscd/Makefile	22 Jul 2005 05:35:19 -0000	1.47
+++ libc/nscd/Makefile	16 Dec 2005 04:06:11 -0000	1.48
@@ -36,13 +36,12 @@ nscd-modules := nscd connections pwdcach
 
 ifeq ($(have-thread-library),yes)
 
-others := nscd_nischeck
 ifneq (yesyes,$(have-fpie)$(build-shared))
 others += nscd
 endif
-install-sbin := nscd nscd_nischeck
+install-sbin := nscd
 
-extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
+extra-objs := $(nscd-modules:=.o)
 
 endif
 
@@ -73,8 +72,7 @@ $(objpfx)selinux.o: sysincludes = # noth
 
 distribute := nscd.h nscd-client.h dbg_log.h \
 	      $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
-	      nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \
-	      nscd-types.h
+	      nscd.conf nscd.init nscd_proto.h nscd-types.h
 
 include ../Rules
 
@@ -137,14 +135,11 @@ lib := nonlib
 include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
 
 $(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
-$(objpfx)nscd_nischeck: $(objpfx)nscd_nischeck.o
 
 ifeq ($(build-shared),yes)
 $(objpfx)nscd: $(common-objpfx)rt/librt.so $(shared-thread-library) \
 	       $(common-objpfx)nis/libnsl.so
-$(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.so
 else
 $(objpfx)nscd: $(common-objpfx)rt/librt.a $(static-thread-library) \
 	       $(common-objpfx)nis/libnsl.a
-$(objpfx)nscd_nischeck: $(common-objpfx)nis/libnsl.a
 endif
--- libc/nscd/nscd_nischeck.c	12 Jan 2005 23:39:50 -0000	1.7
+++ libc/nscd/nscd_nischeck.c	1 Jan 1970 00:00:00 -0000
@@ -1,96 +0,0 @@
-/* Copyright (c) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Thorsten Kukuk <kukuk at suse.de>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* nscd_nischeck: Check, if everybody has read permissions for NIS+ table.
-   Return value:
-    0: Everybody can read the NIS+ table
-    1: Only authenticated users could read the NIS+ table */
-
-#include <argp.h>
-#include <error.h>
-#include <stdlib.h>
-#include <libintl.h>
-#include <locale.h>
-#include <rpcsvc/nis.h>
-
-/* Get libc version number.  */
-#include <version.h>
-
-#define PACKAGE _libc_intl_domainname
-
-/* Name and version of program.  */
-static void print_version (FILE *stream, struct argp_state *state);
-void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
-
-/* Data structure to communicate with argp functions.  */
-static struct argp argp =
-{
-  NULL, NULL, NULL, NULL,
-};
-
-int
-main (int argc, char **argv)
-{
-  int remaining;
-  nis_result *res;
-  char *tablename, *cp;
-
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-  /* Set the text message domain.  */
-  textdomain (PACKAGE);
-
-  /* Parse and process arguments.  */
-  argp_parse (&argp, argc, argv, 0, &remaining, NULL);
-
-  if (remaining + 1 != argc)
-    {
-      error (0, 0, gettext ("wrong number of arguments"));
-      argp_help (&argp, stdout, ARGP_HELP_SEE, program_invocation_short_name);
-      exit (EXIT_FAILURE);
-    }
-
-  tablename = alloca (strlen (argv[1]) + 10);
-  cp = stpcpy (tablename, argv[1]);
-  strcpy (cp, ".org_dir");
-
-  res = nis_lookup (tablename, EXPAND_NAME|FOLLOW_LINKS);
-
-  if (res == NULL ||
-      (res->status != NIS_SUCCESS && res->status != NIS_S_SUCCESS))
-    return 0;
-
-  if (NIS_NOBODY(NIS_RES_OBJECT(res)->zo_access, NIS_READ_ACC))
-    return 0;
-  else
-    return 1;
-}
-
-/* Print the version information.  */
-static void
-print_version (FILE *stream, struct argp_state *state)
-{
-  fprintf (stream, "nscd_nischeck (GNU %s) %s\n", PACKAGE, VERSION);
-  fprintf (stream, gettext ("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2005");
-  fprintf (stream, gettext ("Written by %s.\n"), "Thorsten Kukuk");
-}

glibc-nscd-readall0.patch:
 nscd_gethst_r.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE glibc-nscd-readall0.patch ---
2005-11-19  Ulrich Drepper  <drepper at redhat.com>

	* nscd/nscd_gethst_r.c (nscd_gethst_r): Avoid unnecesary read call
	if there are no aliases.

--- libc/nscd/nscd_gethst_r.c	22 Feb 2005 22:47:45 -0000	1.32
+++ libc/nscd/nscd_gethst_r.c	19 Nov 2005 17:09:03 -0000	1.33
@@ -328,8 +328,9 @@ nscd_gethst_r (const char *key, size_t k
       /* And finally read the aliases.  */
       if (addr_list == NULL)
 	{
-	  if ((size_t) __readall (sock, resultbuf->h_aliases[0], total_len)
-	      == total_len)
+	  if (total_len == 0
+	      || ((size_t) __readall (sock, resultbuf->h_aliases[0], total_len)
+		  == total_len))
 	    {
 	      retval = 0;
 	      *result = resultbuf;

glibc-ppc-fegetround.patch:
 fenvinline.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE glibc-ppc-fegetround.patch ---
2006-02-03  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/powerpc/fpu/bits/fenvinline.h (fegetround): Make asm
	volatile.

--- libc/sysdeps/powerpc/fpu/bits/fenvinline.h	6 Jul 2001 04:56:02 -0000	1.3
+++ libc/sysdeps/powerpc/fpu/bits/fenvinline.h	3 Feb 2006 22:28:37 -0000	1.4
@@ -22,8 +23,9 @@
 /* Inline definition for fegetround.  */
 # define fegetround() \
   (__extension__  ({ int __fegetround_result;				      \
-		     __asm__ ("mcrfs 7,7 ; mfcr %0"			      \
-			     : "=r"(__fegetround_result) : : "cr7");	      \
+		     __asm__ __volatile__				      \
+		       ("mcrfs 7,7 ; mfcr %0"				      \
+			: "=r"(__fegetround_result) : : "cr7");		      \
 		     __fegetround_result & 3; }))
 
 /* The weird 'i#*X' constraints on the following suppress a gcc

glibc-rfc3484.patch:
 getaddrinfo.c |   96 ++++++++++++++++++++++++----------------------------------
 1 files changed, 40 insertions(+), 56 deletions(-)

--- NEW FILE glibc-rfc3484.patch ---
2005-11-27  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/posix/getaddrinfo.c: Avoid RFC 3484 sorting if there are
	multiple return records but only one address.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Avoid some code duplication.

--- libc/sysdeps/posix/getaddrinfo.c	3 Nov 2005 18:53:55 -0000	1.90
+++ libc/sysdeps/posix/getaddrinfo.c	27 Nov 2005 23:12:15 -0000	1.92
@@ -121,7 +121,8 @@ struct gaih
   {
     int family;
     int (*gaih)(const char *name, const struct gaih_service *service,
-		const struct addrinfo *req, struct addrinfo **pai);
+		const struct addrinfo *req, struct addrinfo **pai,
+		unsigned int *naddrs);
   };
 
 static const struct addrinfo default_hints =
@@ -363,7 +364,8 @@ extern service_user *__nss_hosts_databas
 
 static int
 gaih_inet (const char *name, const struct gaih_service *service,
-	   const struct addrinfo *req, struct addrinfo **pai)
+	   const struct addrinfo *req, struct addrinfo **pai,
+	   unsigned int *naddrs)
 {
   const struct gaih_typeproto *tp = gaih_inet_typeproto;
   struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
@@ -393,6 +395,7 @@ gaih_inet (const char *name, const struc
 	}
     }
 
+  int port = 0;
   if (service != NULL)
     {
       if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
@@ -445,63 +448,41 @@ gaih_inet (const char *name, const struc
 	}
       else
 	{
-	  if (req->ai_socktype || req->ai_protocol)
-	    {
-	      st = __alloca (sizeof (struct gaih_servtuple));
-	      st->next = NULL;
-	      st->socktype = tp->socktype;
-	      st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
-			      ? req->ai_protocol : tp->protocol);
-	      st->port = htons (service->num);
-	    }
-	  else
-	    {
-	      /* Neither socket type nor protocol is set.  Return all
-		 socket types we know about.  */
-	      struct gaih_servtuple **lastp = &st;
-	      for (tp = gaih_inet_typeproto + 1; tp->name[0]; ++tp)
-		if ((tp->protoflag & GAI_PROTO_NOSERVICE) == 0)
-		  {
-		    struct gaih_servtuple *newp;
-
-		    newp = __alloca (sizeof (struct gaih_servtuple));
-		    newp->next = NULL;
-		    newp->socktype = tp->socktype;
-		    newp->protocol = tp->protocol;
-		    newp->port = htons (service->num);
-
-		    *lastp = newp;
-		    lastp = &newp->next;
-		  }
-	    }
+	  port = htons (service->num);
+	  goto got_port;
 	}
     }
-  else if (req->ai_socktype || req->ai_protocol)
-    {
-      st = __alloca (sizeof (struct gaih_servtuple));
-      st->next = NULL;
-      st->socktype = tp->socktype;
-      st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
-		      ? req->ai_protocol : tp->protocol);
-      st->port = 0;
-    }
   else
     {
-      /* Neither socket type nor protocol is set.  Return all socket types
-	 we know about.  */
-      struct gaih_servtuple **lastp = &st;
-      for (++tp; tp->name[0]; ++tp)
-	{
-	  struct gaih_servtuple *newp;
-
-	  newp = __alloca (sizeof (struct gaih_servtuple));
-	  newp->next = NULL;
-	  newp->socktype = tp->socktype;
-	  newp->protocol = tp->protocol;
-	  newp->port = 0;
+    got_port:
 
-	  *lastp = newp;
-	  lastp = &newp->next;
+      if (req->ai_socktype || req->ai_protocol)
+	{
+	  st = __alloca (sizeof (struct gaih_servtuple));
+	  st->next = NULL;
+	  st->socktype = tp->socktype;
+	  st->protocol = ((tp->protoflag & GAI_PROTO_PROTOANY)
+			  ? req->ai_protocol : tp->protocol);
+	  st->port = port;
+	}
+      else
+	{
+	  /* Neither socket type nor protocol is set.  Return all socket types
+	     we know about.  */
+	  struct gaih_servtuple **lastp = &st;
+	  for (++tp; tp->name[0]; ++tp)
+	    {
+	      struct gaih_servtuple *newp;
+
+	      newp = __alloca (sizeof (struct gaih_servtuple));
+	      newp->next = NULL;
+	      newp->socktype = tp->socktype;
+	      newp->protocol = tp->protocol;
+	      newp->port = port;
+
+	      *lastp = newp;
+	      lastp = &newp->next;
+	    }
 	}
     }
 
@@ -1108,6 +1089,8 @@ gaih_inet (const char *name, const struc
 	  }
 	*pai = NULL;
 
+	++*naddrs;
+
       ignore:
 	at2 = at2->next;
       }
@@ -1556,6 +1539,7 @@ getaddrinfo (const char *name, const cha
   else
     end = NULL;
 
+  unsigned int naddrs = 0;
   while (g->gaih)
     {
       if (hints->ai_family == g->family || hints->ai_family == AF_UNSPEC)
@@ -1564,7 +1548,7 @@ getaddrinfo (const char *name, const cha
 	  if (pg == NULL || pg->gaih != g->gaih)
 	    {
 	      pg = g;
-	      i = g->gaih (name, pservice, hints, end);
+	      i = g->gaih (name, pservice, hints, end, &naddrs);
 	      if (i != 0)
 		{
 		  /* EAI_NODATA is a more specific result as it says that
@@ -1596,7 +1580,7 @@ getaddrinfo (const char *name, const cha
   if (j == 0)
     return EAI_FAMILY;
 
-  if (nresults > 1)
+  if (naddrs > 1)
     {
       /* Sort results according to RFC 3484.  */
       struct sort_result results[nresults];

glibc-rh168266.patch:
 genops.c    |   63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 libio.h     |   16 ++++++++++-----
 libioP.h    |    2 -
 memstream.c |    6 ++---
 4 files changed, 75 insertions(+), 12 deletions(-)

--- NEW FILE glibc-rh168266.patch ---
2006-01-14  Jakub Jelinek  <jakub at redhat.com>

	* libio/libio.h (_IO_vfscanf, _IO_vfprintf): Remove __THROW.
	(_IO_vfwscanf, _IO_vfwprintf): Likewise.
	* libio/libioP.h (_IO_vdprintf): Likewise.

2006-01-11  Ulrich Drepper  <drepper at redhat.com>

	* libio/memstream.c (_IO_mem_finish): Fix potential memory leak if
	realloc fails.

	* libio/genops.c (_IO_unbuffer_write): Give concurrently running
	threads the chance to work correctly by trying to lock the stream.
	If this does not work, proceed without locking.

2006-01-10  Ulrich Drepper  <drepper at redhat.com>

	* libio/genops.c (_IO_unbuffer_write): Don't always free the
	buffer.  This is not necessary except in debug mode.  If we don't
	free the buffer but the FILE structure to a list.
	(buffer_free): New function.  Free buffers or tell _IO_unbuffer_write
	to do so.
	* libio/libio.h (struct _IO_FILE): Add new members to keep track
        of which buffers have to be freed.

--- libc/libio/genops.c	14 Sep 2004 04:24:44 -0000	1.66
+++ libc/libio/genops.c	11 Jan 2006 08:09:39 -0000	1.68
@@ -657,6 +658,7 @@ _IO_no_init (fp, flags, orientation, wd,
       fp->_wide_data->_wide_vtable = jmp;
     }
 #endif
+  fp->_freeres_list = NULL;
 }
 
 int
@@ -914,10 +916,27 @@ INTDEF(_IO_flush_all_linebuffered)
 weak_alias (_IO_flush_all_linebuffered, _flushlbf)
 #endif
 
+
+/* The following is a bit tricky.  In general, we want to unbuffer the
+   streams so that all output which follows is seen.  If we are not
+   looking for memory leaks it does not make much sense to free the
+   actual buffer because this will happen anyway once the program
+   terminated.  If we do want to look for memory leaks we have to free
+   the buffers.  Whether something is freed is determined by the
+   function sin the libc_freeres section.  Those are called as part of
+   the atexit routine, just like _IO_cleanup.  The problem is we do
+   not know whether the freeres code is called first or _IO_cleanup.
+   if the former is the case, we set the DEALLOC_BUFFER variable to
+   true and _IO_unbuffer_write will take care of the rest.  If
+   _IO_unbuffer_write is called first we add the streams to a list
+   which the freeres function later can walk through.  */
 static void _IO_unbuffer_write (void);
 
+static bool dealloc_buffers;
+static _IO_FILE *freeres_list;
+
 static void
-_IO_unbuffer_write ()
+_IO_unbuffer_write (void)
 {
   struct _IO_FILE *fp;
   for (fp = (_IO_FILE *) INTUSE(_IO_list_all); fp; fp = fp->_chain)
@@ -927,7 +946,32 @@ _IO_unbuffer_write ()
 	      || (fp->_flags & _IO_IS_APPENDING))
 	  /* Iff stream is un-orientated, it wasn't used. */
 	  && fp->_mode != 0)
-	_IO_SETBUF (fp, NULL, 0);
+	{
+	  int cnt;
+#define MAXTRIES 2
+	  for (cnt = 0; cnt < MAXTRIES; ++cnt)
+	    if (_IO_lock_trylock (*fp->_lock) == 0)
+	      break;
+	    else
+	      /* Give the other thread time to finish up its use of the
+		 stream.  */
+	      __sched_yield ();
+
+	  if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF))
+	    {
+	      fp->_flags |= _IO_USER_BUF;
+
+	      fp->_freeres_list = freeres_list;
+	      freeres_list = fp;
+	      fp->_freeres_buf = fp->_IO_buf_base;
+	      fp->_freeres_size = _IO_blen (fp);
+	    }
+
+	  _IO_SETBUF (fp, NULL, 0);
+
+	  if (cnt < MAXTRIES)
+	    _IO_lock_unlock (*fp->_lock);
+	}
 
       /* Make sure that never again the wide char functions can be
 	 used.  */
@@ -935,11 +979,25 @@ _IO_unbuffer_write ()
     }
 }
 
+
+libc_freeres_fn (buffer_free)
+{
+  dealloc_buffers = true;
+
+  while (freeres_list != NULL)
+    {
+      FREE_BUF (freeres_list->_freeres_buf, freeres_list->_freeres_size);
+
+      freeres_list = freeres_list->_freeres_list;
+    }
+}
+
+
 int
 _IO_cleanup ()
 {
   /* We do *not* want locking.  Some threads might use streams but
-     that is there problem, we flush them underneath them.  */
+     that is their problem, we flush them underneath them.  */
   int result = _IO_flush_all_lockp (0);
 
   /* We currently don't have a reliable mechanism for making sure that
--- libc/libio/libio.h	17 Feb 2005 01:16:15 -0000	1.61
+++ libc/libio/libio.h	11 Jan 2006 07:47:46 -0000	1.63
@@ -317,13 +317,19 @@ struct _IO_FILE_complete
   /* Wide character stream stuff.  */
   struct _IO_codecvt *_codecvt;
   struct _IO_wide_data *_wide_data;
+  struct _IO_FILE *_freeres_list;
+  void *_freeres_buf;
+  size_t _freeres_size;
 # else
   void *__pad1;
   void *__pad2;
+  void *__pad3;
+  void *__pad4;
+  size_t __pad5;
 # endif
   int _mode;
   /* Make sure we don't get into trouble again.  */
-  char _unused2[15 * sizeof (int) - 2 * sizeof (void *)];
+  char _unused2[15 * sizeof (int) - 4 * sizeof (void *) - sizeof (size_t)];
 #endif
 };
 
@@ -472,9 +478,9 @@ extern int _IO_ftrylockfile (_IO_FILE *)
 #endif /* !_IO_MTSAFE_IO */
 
 extern int _IO_vfscanf (_IO_FILE * __restrict, const char * __restrict,
-			_IO_va_list, int *__restrict) __THROW;
+			_IO_va_list, int *__restrict);
 extern int _IO_vfprintf (_IO_FILE *__restrict, const char *__restrict,
-			 _IO_va_list) __THROW;
+			 _IO_va_list);
 extern _IO_ssize_t _IO_padn (_IO_FILE *, int, _IO_ssize_t) __THROW;
 extern _IO_size_t _IO_sgetn (_IO_FILE *, void *, _IO_size_t) __THROW;
 
@@ -521,8 +527,8 @@ weak_extern (_IO_stdin_used);
 # endif
 
 extern int _IO_vfwscanf (_IO_FILE * __restrict, const wchar_t * __restrict,
-			 _IO_va_list, int *__restrict) __THROW;
+			 _IO_va_list, int *__restrict);
 extern int _IO_vfwprintf (_IO_FILE *__restrict, const wchar_t *__restrict,
-			  _IO_va_list) __THROW;
+			  _IO_va_list);
 extern _IO_ssize_t _IO_wpadn (_IO_FILE *, wint_t, _IO_ssize_t) __THROW;
 extern void _IO_free_wbackup_area (_IO_FILE *) __THROW;
 #endif
--- libc/libio/memstream.c	14 Sep 2004 04:24:45 -0000	1.23
+++ libc/libio/memstream.c	11 Jan 2006 17:46:36 -0000	1.24
@@ -140,9 +140,9 @@ _IO_mem_finish (fp, dummy)
     {
       (*mp->bufloc)[fp->_IO_write_ptr - fp->_IO_write_base] = '\0';
       *mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
-    }
 
-  fp->_IO_buf_base = NULL;
+      fp->_IO_buf_base = NULL;
+    }
 
-  INTUSE(_IO_default_finish) (fp, 0);
+  _IO_str_finish (fp, 0);
 }
--- libc/libio/libioP.h	19 Dec 2005 03:32:08 -0000	1.74
+++ libc/libio/libioP.h	14 Jan 2006 12:09:46 -0000	1.75
@@ -649,7 +652,7 @@ extern void _IO_wstr_finish (_IO_FILE *,
 
 extern int _IO_vasprintf (char **result_ptr, __const char *format,
 			  _IO_va_list args) __THROW;
-extern int _IO_vdprintf (int d, __const char *format, _IO_va_list arg) __THROW;
+extern int _IO_vdprintf (int d, __const char *format, _IO_va_list arg);
 extern int _IO_vsnprintf (char *string, _IO_size_t maxlen,
 			  __const char *format, _IO_va_list args) __THROW;
 

glibc-rtld-is_static.patch:
 ldsodefs.h |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE glibc-rtld-is_static.patch ---
2005-11-22  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/generic/ldsodefs.h (struct rtld_global): Remove
	unused is_static field from slotinfo array.

--- libc/sysdeps/generic/ldsodefs.h	5 Oct 2005 18:57:00 -0000	1.122
+++ libc/sysdeps/generic/ldsodefs.h	22 Nov 2005 18:18:19 -0000	1.123
@@ -508,7 +508,6 @@ struct rtld_global
     struct dtv_slotinfo
     {
       size_t gen;
-      bool is_static;
       struct link_map *map;
     } slotinfo[0];
   } *_dl_tls_dtv_slotinfo_list;

glibc-s390-setjmp.patch:
 setjmp.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE glibc-s390-setjmp.patch ---
2006-01-02  Jakub Jelinek  <jakub at redhat.com>

	* sysdeps/s390/bits/setjmp.h (__jmp_buf): Add __s390_jmp_buf
	struct tag to make C++ happy.

--- libc/sysdeps/s390/bits/setjmp.h	28 Dec 2005 05:41:35 -0000	1.7
+++ libc/sysdeps/s390/bits/setjmp.h	2 Jan 2006 20:46:18 -0000	1.8
@@ -40,7 +40,7 @@
 
 #ifndef	_ASM
 
-typedef struct {
+typedef struct __s390_jmp_buf {
     /* We save registers 6-15.  */
     long int __gregs[10];
 

glibc-scalb-namespace.patch:
 mathcalls.h |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

--- NEW FILE glibc-scalb-namespace.patch ---
2006-02-01  Jakub Jelinek  <jakub at redhat.com>

	* math/bits/mathcalls.h: Guard __END_NAMESPACE_C99 with the
	same #if condition as corresponding __BEGIN_NAMESPACE_C99.
	(scalb): Don't define only if __USE_ISOC99.

--- libc/math/bits/mathcalls.h	14 Jan 2006 12:09:23 -0000	1.21
+++ libc/math/bits/mathcalls.h	1 Feb 2006 19:45:21 -0000	1.22
@@ -353,10 +353,13 @@ __MATHDECL_1 (int, __signbit,, (_Mdouble
 
 /* Multiply-add function computed as a ternary operation.  */
 __MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
+#endif /* Use ISO C99.  */
+
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
 __END_NAMESPACE_C99
+#endif
 
-# if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
 /* Return X times (2 to the Nth power).  */
 __MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
-# endif
-#endif /* Use ISO C99.  */
+#endif

glibc-sysconf-intel-caches.patch:
 i386/sysconf.c   |   14 ++++++++++++++
 x86_64/sysconf.c |   14 ++++++++++++++
 2 files changed, 28 insertions(+)

--- NEW FILE glibc-sysconf-intel-caches.patch ---
2006-02-01  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_02_known): Add
	some more entries.
	* sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_02_known): Likewise.

--- libc/sysdeps/unix/sysv/linux/i386/sysconf.c	5 Oct 2004 09:20:50 -0000	1.5
+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c	1 Feb 2006 18:26:19 -0000	1.6
@@ -84,11 +84,24 @@ static const struct intel_02_cache_info
     { 0x29, _SC_LEVEL3_CACHE_SIZE, 4194304, 8, 64 },
     { 0x2c, _SC_LEVEL1_DCACHE_SIZE, 32768, 8, 64 },
     { 0x30, _SC_LEVEL1_ICACHE_SIZE, 32768, 8, 64 },
+    { 0x39, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 64 },
+    { 0x3a, _SC_LEVEL2_CACHE_SIZE, 196608, 6, 64 },
+    { 0x3b, _SC_LEVEL2_CACHE_SIZE, 131072, 2, 64 },
+    { 0x3c, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 64 },
+    { 0x3d, _SC_LEVEL2_CACHE_SIZE, 393216, 6, 64 },
+    { 0x3e, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 64 },
     { 0x41, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 32 },
     { 0x42, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 32 },
     { 0x43, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 32 },
     { 0x44, _SC_LEVEL2_CACHE_SIZE, 1048576, 4, 32 },
     { 0x45, _SC_LEVEL2_CACHE_SIZE, 2097152, 4, 32 },
+    { 0x46, _SC_LEVEL3_CACHE_SIZE, 4194304, 4, 64 },
+    { 0x47, _SC_LEVEL3_CACHE_SIZE, 8388608, 8, 64 },
+    { 0x49, _SC_LEVEL3_CACHE_SIZE, 4194304, 16, 64 },
+    { 0x4a, _SC_LEVEL3_CACHE_SIZE, 6291456, 12, 64 },
+    { 0x4b, _SC_LEVEL3_CACHE_SIZE, 8388608, 16, 64 },
+    { 0x4c, _SC_LEVEL3_CACHE_SIZE, 12582912, 12, 64 },
+    { 0x4d, _SC_LEVEL3_CACHE_SIZE, 16777216, 16, 64 },
     { 0x60, _SC_LEVEL1_DCACHE_SIZE, 16384, 8, 64 },
     { 0x66, _SC_LEVEL1_DCACHE_SIZE, 8192, 4, 64 },
     { 0x67, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 64 },
@@ -99,6 +112,7 @@ static const struct intel_02_cache_info
     { 0x7b, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 64 },
     { 0x7c, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 64 },
     { 0x7d, _SC_LEVEL2_CACHE_SIZE, 2097152, 8, 64 },
+    { 0x7f, _SC_LEVEL2_CACHE_SIZE, 524288, 2, 64 },
     { 0x82, _SC_LEVEL2_CACHE_SIZE, 262144, 8, 32 },
     { 0x83, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 32 },
     { 0x84, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 32 },
--- libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c	5 Oct 2004 09:23:06 -0000	1.3
+++ libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c	2 Feb 2006 05:33:33 -0000	1.4
@@ -45,11 +45,24 @@ static const struct intel_02_cache_info
     { 0x29, _SC_LEVEL3_CACHE_SIZE, 4194304, 8, 64 },
     { 0x2c, _SC_LEVEL1_DCACHE_SIZE, 32768, 8, 64 },
     { 0x30, _SC_LEVEL1_ICACHE_SIZE, 32768, 8, 64 },
+    { 0x39, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 64 },
+    { 0x3a, _SC_LEVEL2_CACHE_SIZE, 196608, 6, 64 },
+    { 0x3b, _SC_LEVEL2_CACHE_SIZE, 131072, 2, 64 },
+    { 0x3c, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 64 },
+    { 0x3d, _SC_LEVEL2_CACHE_SIZE, 393216, 6, 64 },
+    { 0x3e, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 64 },
     { 0x41, _SC_LEVEL2_CACHE_SIZE, 131072, 4, 32 },
     { 0x42, _SC_LEVEL2_CACHE_SIZE, 262144, 4, 32 },
     { 0x43, _SC_LEVEL2_CACHE_SIZE, 524288, 4, 32 },
     { 0x44, _SC_LEVEL2_CACHE_SIZE, 1048576, 4, 32 },
     { 0x45, _SC_LEVEL2_CACHE_SIZE, 2097152, 4, 32 },
+    { 0x46, _SC_LEVEL3_CACHE_SIZE, 4194304, 4, 64 },
+    { 0x47, _SC_LEVEL3_CACHE_SIZE, 8388608, 8, 64 },
+    { 0x49, _SC_LEVEL3_CACHE_SIZE, 4194304, 16, 64 },
+    { 0x4a, _SC_LEVEL3_CACHE_SIZE, 6291456, 12, 64 },
+    { 0x4b, _SC_LEVEL3_CACHE_SIZE, 8388608, 16, 64 },
+    { 0x4c, _SC_LEVEL3_CACHE_SIZE, 12582912, 12, 64 },
+    { 0x4d, _SC_LEVEL3_CACHE_SIZE, 16777216, 16, 64 },
     { 0x60, _SC_LEVEL1_DCACHE_SIZE, 16384, 8, 64 },
     { 0x66, _SC_LEVEL1_DCACHE_SIZE, 8192, 4, 64 },
     { 0x67, _SC_LEVEL1_DCACHE_SIZE, 16384, 4, 64 },
@@ -60,6 +73,7 @@ static const struct intel_02_cache_info
     { 0x7b, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 64 },
     { 0x7c, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 64 },
     { 0x7d, _SC_LEVEL2_CACHE_SIZE, 2097152, 8, 64 },
+    { 0x7f, _SC_LEVEL2_CACHE_SIZE, 524288, 2, 64 },
     { 0x82, _SC_LEVEL2_CACHE_SIZE, 262144, 8, 32 },
     { 0x83, _SC_LEVEL2_CACHE_SIZE, 524288, 8, 32 },
     { 0x84, _SC_LEVEL2_CACHE_SIZE, 1048576, 8, 32 },

glibc-tls-static-size.patch:
 elf/dl-open.c              |    6 ------
 sysdeps/generic/libc-tls.c |    5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE glibc-tls-static-size.patch ---
2005-11-14  Ulrich Drepper  <drepper at redhat.com>

	* elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition.
	* sysdeps/generic/libc-tls.c: Initialize _dl_tls_static_size here.

--- libc/elf/dl-open.c	12 Jun 2005 16:28:48 -0000	1.125
+++ libc/elf/dl-open.c	15 Nov 2005 07:14:59 -0000	1.126
@@ -35,12 +35,6 @@
 #include <dl-dst.h>
 
 
-#ifndef SHARED
-/* Giving this initialized value preallocates some surplus bytes in the
-   static TLS area, see __libc_setup_tls (libc-tls.c).  */
-size_t _dl_tls_static_size = 2048;
-#endif
-
 extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
 				    void (*dl_main) (const ElfW(Phdr) *phdr,
 						     ElfW(Word) phnum,
--- libc/sysdeps/generic/libc-tls.c	26 Jun 2005 18:13:24 -0000	1.26
+++ libc/sysdeps/generic/libc-tls.c	15 Nov 2005 07:15:33 -0000	1.27
@@ -60,8 +60,9 @@ bool _dl_tls_dtv_gaps;
 struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list;
 /* Number of modules in the static TLS block.  */
 size_t _dl_tls_static_nelem;
-/* Size of the static TLS block.  */
-size_t _dl_tls_static_size;
+/* Size of the static TLS block.  Giving this initialized value
+   preallocates some surplus bytes in the static TLS area.  */
+size_t _dl_tls_static_size = 2048;
 /* Size actually allocated in the static TLS block.  */
 size_t _dl_tls_static_used;
 /* Alignment requirement of the static TLS block.  */

glibc-tst-initializers1.patch:
 Makefile                  |   11 +++++++++--
 tst-initializers1-c89.c   |    1 +
 tst-initializers1-c99.c   |    1 +
 tst-initializers1-gnu89.c |    1 +
 tst-initializers1-gnu99.c |    1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE glibc-tst-initializers1.patch ---
2006-01-09  Roland McGrath  <roland at redhat.com>

	* tst-initializers1-c89.c: New file.
	* tst-initializers1-c99.c: New file.
	* tst-initializers1-gnu89.c: New file.
	* tst-initializers1-gnu99.c: New file.
	* Makefile (tests): Add them.
	(CFLAGS-tst-initializers1-c89.c): New variable.
	(CFLAGS-tst-initializers1-c99.c): New variable.
	(CFLAGS-tst-initializers1-gnu89.c): New variable.
	(CFLAGS-tst-initializers1-gnu99.c): New variable.

--- libc/nptl/Makefile	5 Jan 2006 08:16:20 -0000	1.175
+++ libc/nptl/Makefile	9 Jan 2006 23:04:44 -0000	1.176
@@ -246,7 +246,8 @@ tests = tst-typesizes \
 	tst-backtrace1 \
 	tst-oddstacklimit \
 	tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
-	tst-getpid1 tst-getpid2 tst-initializers1
+	tst-getpid1 tst-getpid2 \
+	tst-initializers1 $(patsubst %,tst-initializers1-%,c89 gnu89 c99 gnu99)
 xtests = tst-setuid1 tst-setuid1-static
 
 # Files which must not be linked with libpthread.
@@ -415,7 +416,13 @@ CFLAGS-tst-oncex3.c += -fexceptions
 CFLAGS-tst-oncex4.c += -fexceptions
 CFLAGS-tst-align.c += $(stack-align-test-flags)
 CFLAGS-tst-align3.c += $(stack-align-test-flags)
-CFLAGS-tst-initializers1.c += -W -Wall -Werror
+CFLAGS-tst-initializers1.c = -W -Wall -Werror
+CFLAGS-tst-initializers1-< = $(CFLAGS-tst-initializers1.c) \
+			     $(patsubst tst-initializers1-%.c,-std=%,$<)
+CFLAGS-tst-initializers1-c89.c = $(CFLAGS-tst-initializers1-<)
+CFLAGS-tst-initializers1-c99.c = $(CFLAGS-tst-initializers1-<)
+CFLAGS-tst-initializers1-gnu89.c = $(CFLAGS-tst-initializers1-<)
+CFLAGS-tst-initializers1-gnu99.c = $(CFLAGS-tst-initializers1-<)
 
 tst-cancel7-ARGS = --command "$(built-program-cmd)"
 tst-cancelx7-ARGS = $(tst-cancel7-ARGS)
--- libc/nptl/tst-initializers1-c89.c 1 Jan 1970 00:00:00 -0000
+++ libc/nptl/tst-initializers1-c89.c	9 Jan 2006 23:04:44 -0000	1.1
@@ -0,0 +1 @@
+#include "tst-initializers1.c"
--- libc/nptl/tst-initializers1-c99.c 1 Jan 1970 00:00:00 -0000
+++ libc/nptl/tst-initializers1-c99.c	9 Jan 2006 23:04:44 -0000	1.1
@@ -0,0 +1 @@
+#include "tst-initializers1.c"
--- libc/nptl/tst-initializers1-gnu89.c 1 Jan 1970 00:00:00 -0000
+++ libc/nptl/tst-initializers1-gnu89.c	9 Jan 2006 23:04:44 -0000	1.1
@@ -0,0 +1 @@
+#include "tst-initializers1.c"
--- libc/nptl/tst-initializers1-gnu99.c 1 Jan 1970 00:00:00 -0000
+++ libc/nptl/tst-initializers1-gnu99.c	9 Jan 2006 23:04:44 -0000	1.1
@@ -0,0 +1 @@
+#include "tst-initializers1.c"

glibc-tst-mallocfork.patch:
 tst-mallocfork.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE glibc-tst-mallocfork.patch ---
2005-11-28  Jakub Jelinek  <jakub at redhat.com>

	* malloc/tst-mallocfork.c (do_test): Make sure sa_flags is
	initialized.  Reported by John Reiser <jreiser at BitWagon.com>.

--- libc/malloc/tst-mallocfork.c	27 Sep 2005 05:42:06 -0000	1.1
+++ libc/malloc/tst-mallocfork.c	6 Dec 2005 00:50:04 -0000	1.2
@@ -22,9 +22,8 @@ do_test (void)
 {
   pid_t parent = getpid ();
 
-  struct sigaction action;
+  struct sigaction action = { .sa_handler = sig_handler };
   sigemptyset (&action.sa_mask);
-  action.sa_handler = sig_handler;
 
   malloc (sizeof (int));
 

glibc-tst-signal7.patch:
 Makefile      |    2 -
 tst-signal7.c |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

--- NEW FILE glibc-tst-signal7.patch ---
2005-12-28  Ulrich Drepper  <drepper at redhat.com>

	* Makefile (tests): Add tst-signal7.
	* tst-signal7.c: New file.

--- libc/nptl/Makefile	27 Dec 2005 00:53:17 -0000	1.173
+++ libc/nptl/Makefile	28 Dec 2005 20:48:24 -0000	1.174
@@ -229,7 +229,7 @@ tests = tst-typesizes \
 	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \
 	tst-flock1 tst-flock2 \
 	tst-signal1 tst-signal2 tst-signal3 tst-signal4 tst-signal5 \
-	tst-signal6 \
+	tst-signal6 tst-signal7 \
 	tst-exec1 tst-exec2 tst-exec3 tst-exec4 \
 	tst-exit1 tst-exit2 tst-exit3 \
 	tst-stdio1 tst-stdio2 \
--- libc/nptl/tst-signal7.c 1 Jan 1970 00:00:00 -0000
+++ libc/nptl/tst-signal7.c	28 Dec 2005 20:48:38 -0000	1.1
@@ -0,0 +1,59 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper at redhat.com>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <pthreadP.h>
+#include <signal.h>
+#include <stdio.h>
+
+
+static int
+do_test (void)
+{
+  int result = 0;
+
+  errno = 0;
+  if (sigaction (SIGCANCEL, NULL, NULL) == 0)
+    {
+      puts ("sigaction(SIGCANCEL) did not fail");
+      result = 1;
+    }
+  else if (errno != EINVAL)
+    {
+      puts ("sigaction(SIGCANCEL) did not set errno to EINVAL");
+      result = 1;
+    }
+
+  errno = 0;
+  if (sigaction (SIGSETXID, NULL, NULL) == 0)
+    {
+      puts ("sigaction(SIGSETXID) did not fail");
+      result = 1;
+    }
+  else if (errno != EINVAL)
+    {
+      puts ("sigaction(SIGSETXID) did not set errno to EINVAL");
+      result = 1;
+    }
+
+  return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- glibc.spec	15 Aug 2005 12:13:59 -0000	1.160
+++ glibc.spec	23 Feb 2006 08:49:04 -0000	1.161
@@ -2,8 +2,8 @@
 %define glibcname glibc
 %define glibcsrcdir glibc-20050524T1606
 %define glibc_release_tarballs 0
-%define glibcversion 2.3.5
-%define glibcrelease 10.3
+%define glibcversion 2.3.6
+%define glibcrelease 1
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -39,6 +39,55 @@
 Patch4: glibc-20050524-20050727.patch
 Patch5: glibc-zh_TW.patch
 Patch6: glibc-20050727-20050815.patch
+Patch7: glibc-20050815-20051104.patch
+Patch8: glibc-20050815-20051104-iconvdata.patch.bz2
+Patch9: glibc-bindresvport.patch
+Patch10: glibc-nis+.patch
+Patch11: glibc-check_fds.patch
+Patch12: glibc-tls-static-size.patch
+Patch13: glibc-iconv-iso11548.patch
+Patch14: glibc-iconv-iso11548-1.patch
+Patch15: glibc-bz1877.patch
+Patch16: glibc-nscd-readall0.patch
+Patch17: glibc-ia64-shmatt_t.patch
+Patch18: glibc-rtld-is_static.patch
+Patch19: glibc-euidaccess.patch
+Patch20: glibc-rfc3484.patch
+Patch21: glibc-tst-mallocfork.patch
+Patch22: glibc-doc-fixes.patch
+Patch23: glibc-nscd-nischeck.patch
+Patch24: glibc-bz1978.patch
+Patch25: glibc-bz1952.patch
+Patch26: glibc-bz1955.patch
+Patch27: glibc-bz1962.patch
+Patch28: glibc-bz2066.patch
+Patch29: glibc-bz1566.patch
+Patch30: glibc-bz2080.patch
+Patch31: glibc-s390-setjmp.patch
+Patch32: glibc-ctermid.patch
+Patch33: glibc-nan.patch
+Patch34: glibc-aio-rh171968.patch
+Patch35: glibc-bz2126.patch
+Patch36: glibc-gconv-cache-memleak.patch
+Patch37: glibc-rh168266.patch
+Patch38: glibc-bz2153.patch
+Patch39: glibc-dl-deps.patch
+Patch40: glibc-bz2173.patch
+Patch41: glibc-sysconf-intel-caches.patch
+Patch42: glibc-scalb-namespace.patch
+Patch43: glibc-ppc-fegetround.patch
+Patch44: glibc-bz2268.patch
+Patch45: glibc-bz2226.patch
+Patch46: glibc-nptl_db.patch
+Patch47: glibc-nptl-forcedunwind.patch
+Patch48: glibc-bz1920.patch
+Patch49: glibc-nptl-static-tls-size.patch
+Patch50: glibc-bz1913.patch
+Patch51: glibc-tst-signal7.patch
+Patch52: glibc-tst-initializers1.patch
+Patch53: glibc-i386-futex-wait-barrier.patch
+Patch54: glibc-localedata-fixes.patch
+Patch55: glibc-i686-memset.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -310,6 +359,57 @@
 %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
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+
+sed -i -e 's/2.3.5/2.3.6/' version.h
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
@@ -1354,6 +1454,35 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 Jakub Jelinek <jakub at redhat.com> 2.3.6-1
+- selective update from CVS
+  - fixed glibc BZ numbers:
+    56, 71, 119, 162, 195, 278, 281, 297, 305, 305, 315, 367, 368, 394, 395,
+    428, 448, 451, 484, 486, 488, 491, 493, 495, 516, 520, 524, 525, 527,
+    529, 532, 533, 545, 566, 588, 627, 644, 652, 657, 662, 663, 665, 666,
+    667, 668, 704, 704, 713, 714, 804, 808, 811, 826, 838, 865, 865, 870,
+    933, 968, 980, 981, 982, 1010, 1033, 1035, 1047, 1051, 1053, 1061, 1078,
+    1158, 1188, 1207, 1221, 1224, 1228, 1230, 1231, 1248, 1249, 1252, 1252,
+    1253, 1253, 1254, 1254, 1261, 1294, 1302, 1318, 1331, 1346, 1347, 1358,
+    1361, 1363, 1373, 1384, 1392, 1392, 1395, 1405, 1423, 1429, 1438, 1458,
+    1459, 1460, 1466, 1468, 1498, 1534, 1548, 1566, 1579, 1774, 1877, 1877,
+    1913, 1920, 1925, 1952, 1955, 1960, 1962, 1978, 1997, 2066, 2080, 2126,
+    2153, 2173, 2226, 2268
+  - adjust nptl_db for dtv_t changes from -2.16 (#179165)
+  - fix setuid etc. hangs on i?86 if some thread exits during the call
+    (#167766)
+  - don't cache euid/egid in euidaccess
+  - avoid unnecessary socket read in nscd client code if hostname has
+    no aliases
+  - fix do_ypcall in case of memory allocation failure
+  - fix bindresvport to really try more ports if range 600 .. 1023 is full
+    (#173837)
+  - remove nonnull attribute from ctermid prototype
+  - NIS+ fixes
+  - updated several locales
+  - added various IBM encodings for iconv 
+  - many other fixes, too many to list here
+
 * Mon Aug 15 2005 Jakub Jelinek <jakub at redhat.com> 2.3.5-10.3
 - selective update from CVS
   - nscd persistent database verifier (#164001)



From fedora-cvs-commits at redhat.com  Thu Feb 23 08:52:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 03:52:58 -0500
Subject: rpms/glibc/FC-4 glibc.spec, 1.161, 1.162 glibc-iconv-iso11548.patch,
	1.1, NONE
Message-ID: <200602230852.k1N8qwXQ007946@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7884

Modified Files:
	glibc.spec 
Removed Files:
	glibc-iconv-iso11548.patch 
Log Message:
2.3.6-1



Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- glibc.spec	23 Feb 2006 08:49:04 -0000	1.161
+++ glibc.spec	23 Feb 2006 08:52:55 -0000	1.162
@@ -45,7 +45,6 @@
 Patch10: glibc-nis+.patch
 Patch11: glibc-check_fds.patch
 Patch12: glibc-tls-static-size.patch
-Patch13: glibc-iconv-iso11548.patch
 Patch14: glibc-iconv-iso11548-1.patch
 Patch15: glibc-bz1877.patch
 Patch16: glibc-nscd-readall0.patch
@@ -365,7 +364,6 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1


--- glibc-iconv-iso11548.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 08:56:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 03:56:12 -0500
Subject: rpms/net-tools/devel net-tools-1.60-netstat_inode.patch, NONE,
	1.1 net-tools.spec, 1.57, 1.58
Message-ID: <200602230856.k1N8uCV2009499@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/net-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9446

Modified Files:
	net-tools.spec 
Added Files:
	net-tools-1.60-netstat_inode.patch 
Log Message:
- show inodes in netstat (#180974)

net-tools-1.60-netstat_inode.patch:
 netstat.c |   64 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 34 insertions(+), 30 deletions(-)

--- NEW FILE net-tools-1.60-netstat_inode.patch ---
--- net-tools-1.60/netstat.c.inode	2006-02-23 09:28:23.000000000 +0100
+++ net-tools-1.60/netstat.c	2006-02-23 09:33:57.000000000 +0100
@@ -231,7 +231,7 @@
 
 static struct prg_node {
     struct prg_node *next;
-    int inode;
+    unsigned long inode;
     char name[PROGNAME_WIDTH];
     char scon[SELINUX_WIDTH];
 } *prg_hash[PRG_HASH_SIZE];
@@ -268,7 +268,7 @@
 /* NOT working as of glibc-2.0.7: */
 #undef  DIRENT_HAVE_D_TYPE_WORKS
 
-static void prg_cache_add(int inode, char *name, char *scon)
+static void prg_cache_add(unsigned long inode, char *name, char *scon)
 {
     unsigned hi = PRG_HASHIT(inode);
     struct prg_node **pnp,*pn;
@@ -332,15 +332,16 @@
     prg_cache_loaded=0;
 }
 
-static void extract_type_1_socket_inode(const char lname[], long * inode_p) {
+static void extract_type_1_socket_inode(const char lname[], unsigned long * inode_p, int * status) {
 
     /* If lname is of the form "socket:[12345]", extract the "12345"
-       as *inode_p.  Otherwise, return -1 as *inode_p.
+       as *inode_p.  Otherwise, return -1 as *status.
        */
 
-    if (strlen(lname) < PRG_SOCKET_PFXl+3) *inode_p = -1;
-    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *inode_p = -1;
-    else if (lname[strlen(lname)-1] != ']') *inode_p = -1;
+    *status = 0;
+    if (strlen(lname) < PRG_SOCKET_PFXl+3) *status = -1;
+    else if (memcmp(lname, PRG_SOCKET_PFX, PRG_SOCKET_PFXl)) *status = -1;
+    else if (lname[strlen(lname)-1] != ']') *status = -1;
     else {
         char inode_str[strlen(lname + 1)];  /* e.g. "12345" */
         const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
@@ -348,28 +349,30 @@
 
         strncpy(inode_str, lname+PRG_SOCKET_PFXl, inode_str_len);
         inode_str[inode_str_len] = '\0';
-        *inode_p = strtol(inode_str,&serr,0);
-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-            *inode_p = -1;
+        errno = 0;
+        *inode_p = strtoul(inode_str,&serr,0);
+        if (!serr || *serr || errno) 
+            *status = -1;
     }
 }
 
 
 
-static void extract_type_2_socket_inode(const char lname[], long * inode_p) {
+static void extract_type_2_socket_inode(const char lname[], unsigned long * inode_p, int * status) {
 
     /* If lname is of the form "[0000]:12345", extract the "12345"
-       as *inode_p.  Otherwise, return -1 as *inode_p.
+       as *inode_p.  Otherwise, return -1 as *status.
        */
 
-    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *inode_p = -1;
-    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *inode_p = -1;
+    if (strlen(lname) < PRG_SOCKET_PFX2l+1) *status = -1;
+    else if (memcmp(lname, PRG_SOCKET_PFX2, PRG_SOCKET_PFX2l)) *status = -1;
     else {
         char *serr;
 
-        *inode_p=strtol(lname + PRG_SOCKET_PFX2l,&serr,0);
-        if (!serr || *serr || *inode_p < 0 || *inode_p >= INT_MAX) 
-            *inode_p = -1;
+        errno = 0;
+        *inode_p=strtoul(lname + PRG_SOCKET_PFX2l,&serr,0);
+        if (!serr || *serr || errno) 
+            *status = -1;
     }
 }
 
@@ -380,11 +383,12 @@
     char line[LINE_MAX],eacces=0;
     int procfdlen,fd,cmdllen,lnamelen;
     char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
-    long inode;
+    unsigned long inode;
     const char *cs,*cmdlp;
     DIR *dirproc=NULL,*dirfd=NULL;
     struct dirent *direproc,*direfd;
     security_context_t scon=NULL;
+    int status;
 
     if (prg_cache_loaded || !flag_prg) return;
     prg_cache_loaded=1;
@@ -424,11 +428,11 @@
 	    lnamelen=readlink(line,lname,sizeof(lname)-1);
             lname[lnamelen] = '\0';  /*make it a null-terminated string*/
 
-            extract_type_1_socket_inode(lname, &inode);
+            extract_type_1_socket_inode(lname, &inode, &status);
 
-            if (inode < 0) extract_type_2_socket_inode(lname, &inode);
+            if (status < 0) extract_type_2_socket_inode(lname, &inode, &status);
 
-            if (inode < 0) continue;
+            if (status < 0) continue;
 
 	    if (!cmdlp) {
 		if (procfdlen - PATH_FD_SUFFl + PATH_CMDLINEl >= 
@@ -732,7 +736,7 @@
 	    printf("%-10s ", pw->pw_name);
 	else
 	    printf("%-10d ", uid);
-	printf("%-10ld ",inode);
+	printf("%-10lu ",inode);
     }
     if (flag_prg)
 	printf("%-" PROGNAME_WIDTHs "s",prg_cache_get(inode));
@@ -921,7 +925,7 @@
 	return;
 
     num = sscanf(line,
-    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+    "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
 		 &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
@@ -1064,7 +1068,7 @@
 
     more[0] = '\0';
     num = sscanf(line,
-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
 		 &d, local_addr, &local_port,
 		 rem_addr, &rem_port, &state,
 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
@@ -1206,7 +1210,7 @@
 
     more[0] = '\0';
     num = sscanf(line,
-		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %ld %512s\n",
+		 "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
 		 &d, local_addr, &local_port, rem_addr, &rem_port, &state,
 	  &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
 
@@ -1320,9 +1324,9 @@
     static int has = 0;
     char path[MAXPATHLEN], ss_flags[32];
     char *ss_proto, *ss_state, *ss_type;
-    int num, state, type, inode;
+    int num, state, type;
     void *d;
-    unsigned long refcnt, proto, flags;
+    unsigned long refcnt, proto, flags, inode;
 
     if (nr == 0) {
 	if (strstr(line, "Inode"))
@@ -1330,14 +1334,14 @@
 	return;
     }
     path[0] = '\0';
-    num = sscanf(line, "%p: %lX %lX %lX %X %X %d %s",
+    num = sscanf(line, "%p: %lX %lX %lX %X %X %lu %s",
 		 &d, &refcnt, &proto, &flags, &type, &state, &inode, path);
     if (num < 6) {
 	fprintf(stderr, _("warning, got bogus unix line.\n"));
 	return;
     }
     if (!(has & HAS_INODE))
-	snprintf(path,sizeof(path),"%d",inode);
+	snprintf(path,sizeof(path),"%lu",inode);
 
     if (!flag_all) {
     	if ((state == SS_UNCONNECTED) && (flags & SO_ACCEPTCON)) {
@@ -1429,7 +1433,7 @@
     printf("%-5s %-6ld %-11s %-10s %-13s ",
 	   ss_proto, refcnt, ss_flags, ss_type, ss_state);
     if (has & HAS_INODE)
-	printf("%-6d ",inode);
+	printf("%-6lu ",inode);
     else
 	printf("-      ");
     if (flag_prg)


Index: net-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- net-tools.spec	11 Feb 2006 04:44:51 -0000	1.57
+++ net-tools.spec	23 Feb 2006 08:56:10 -0000	1.58
@@ -3,7 +3,7 @@
 Summary: Basic networking tools.
 Name: net-tools
 Version: 1.60
-Release: 62.1
+Release: 63
 License: GPL
 Group: System Environment/Base
 Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@@ -59,6 +59,7 @@
 Patch45: net-tools-1.60-interface_stack.patch
 Patch46: net-tools-1.60-selinux.patch
 Patch47: net-tools-1.60-netstat_stop_trim.patch
+Patch48: net-tools-1.60-netstat_inode.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires(post,preun): chkconfig
@@ -114,6 +115,7 @@
 %patch45 -p0 -b .stack
 %patch46 -p1 -b .selinux
 %patch47 -p1 -b .trim
+%patch48 -p1 -b .inode
 
 cp %SOURCE2 ./config.h
 cp %SOURCE3 ./config.make
@@ -225,6 +227,9 @@
 %{_sysconfdir}/rc.d/init.d/netplugd
 
 %changelog
+* Thu Feb 23 2006 Radek Vok??l <rvokal at redhat.com> - 1.60-63
+- show inodes in netstat (#180974)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.60-62.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:30:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:30:58 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.24,1.25
Message-ID: <200602230930.k1N9Uw06026957@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26943

Modified Files:
	libbtctl.spec 
Log Message:
added gtk-sharp arch deps


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libbtctl.spec	23 Feb 2006 08:36:13 -0000	1.24
+++ libbtctl.spec	23 Feb 2006 09:30:44 -0000	1.25
@@ -1,3 +1,8 @@
+%ifarch %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+%define with_mono 1
+%else
+%define with_mono 0
+%endif
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
@@ -10,7 +15,11 @@
 Requires: python-abi = %{pyver}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.1 python pygtk2-devel gtk2-devel
+
+%if %{with_mono}
 BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
+%endif
+
 ExcludeArch: s390 s390x
 Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
@@ -40,8 +49,12 @@
 autoconf
 
 %build
-%configure 
-#--disable-mono
+%configure \
+%if %{with_mono}
+	;
+%else
+	--disable-mono
+%endif
 make
 
 %install
@@ -67,10 +80,11 @@
 %doc AUTHORS COPYING ChangeLog NEWS README 
 %{_libdir}/lib*.so.*
 %{_libdir}/python?.?/site-packages/*btctl*
+%if %{with_mono}
 %{_libdir}/mono/gac/btctl/*/btctl.dll
 %{_libdir}/mono/libbtctl/btctl.dll
 %{_datadir}/gapi/btctl-api.xml
-
+%endif
 
 %files devel
 %defattr(-, root, root)
@@ -79,8 +93,9 @@
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
 %{_datadir}/gtk-doc/html/libbtctl
+%if %{with_mono}
 %{_libdir}/pkgconfig/libbtctl-sharp.pc
-
+%endif
 
 %changelog
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 0.6.0-1



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:40:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:40:52 -0500
Subject: rpms/glibc/FC-4 glibc-linuxthreads-atomic_h.patch, NONE,
	1.1 glibc.spec, 1.162, 1.163
Message-ID: <200602230940.k1N9eqvT027137@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27120

Modified Files:
	glibc.spec 
Added Files:
	glibc-linuxthreads-atomic_h.patch 
Log Message:
2.3.6-1


glibc-linuxthreads-atomic_h.patch:
 pthread.c  |   10 +++++-----
 spinlock.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE glibc-linuxthreads-atomic_h.patch ---
2006-02-23  Jakub Jelinek  <jakub at redhat.com>

	* spinlock.h (atomic_increment): Rename to lt_atomic_increment.
	(atomic_decrement): Rename to lt_atomic_decrement.
	* pthread.c (__pthread_restart_old, __pthread_suspend_old,
	__pthread_timedsuspend_old): Adjust callers.

--- linuxthreads/spinlock.h.jj	2003-07-31 21:16:04.000000000 +0200
+++ linuxthreads/spinlock.h	2006-02-23 10:30:04.000000000 +0100
@@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock 
 
 /* Operations on pthread_atomic, which is defined in internals.h */
 
-static inline long atomic_increment(struct pthread_atomic *pa)
+static inline long lt_atomic_increment(struct pthread_atomic *pa)
 {
     long oldval;
 
@@ -184,7 +184,7 @@ static inline long atomic_increment(stru
 }
 
 
-static inline long atomic_decrement(struct pthread_atomic *pa)
+static inline long lt_atomic_decrement(struct pthread_atomic *pa)
 {
     long oldval;
 
--- linuxthreads/pthread.c.jj	2005-01-09 21:02:37.000000000 +0100
+++ linuxthreads/pthread.c	2006-02-23 10:30:04.000000000 +0100
@@ -1231,13 +1231,13 @@ void __pthread_wait_for_restart_signal(p
 
 void __pthread_restart_old(pthread_descr th)
 {
-  if (atomic_increment(&th->p_resume_count) == -1)
+  if (lt_atomic_increment(&th->p_resume_count) == -1)
     kill(th->p_pid, __pthread_sig_restart);
 }
 
 void __pthread_suspend_old(pthread_descr self)
 {
-  if (atomic_decrement(&self->p_resume_count) <= 0)
+  if (lt_atomic_decrement(&self->p_resume_count) <= 0)
     __pthread_wait_for_restart_signal(self);
 }
 
@@ -1248,7 +1248,7 @@ __pthread_timedsuspend_old(pthread_descr
   int was_signalled = 0;
   sigjmp_buf jmpbuf;
 
-  if (atomic_decrement(&self->p_resume_count) == 0) {
+  if (lt_atomic_decrement(&self->p_resume_count) == 0) {
     /* Set up a longjmp handler for the restart signal, unblock
        the signal and sleep. */
 
@@ -1305,9 +1305,9 @@ __pthread_timedsuspend_old(pthread_descr
      being delivered. */
 
   if (!was_signalled) {
-    if (atomic_increment(&self->p_resume_count) != -1) {
+    if (lt_atomic_increment(&self->p_resume_count) != -1) {
       __pthread_wait_for_restart_signal(self);
-      atomic_decrement(&self->p_resume_count); /* should be zero now! */
+      lt_atomic_decrement(&self->p_resume_count); /* should be zero now! */
       /* woke spontaneously and consumed restart signal */
       return 1;
     }


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- glibc.spec	23 Feb 2006 08:52:55 -0000	1.162
+++ glibc.spec	23 Feb 2006 09:40:47 -0000	1.163
@@ -45,6 +45,7 @@
 Patch10: glibc-nis+.patch
 Patch11: glibc-check_fds.patch
 Patch12: glibc-tls-static-size.patch
+Patch13: glibc-linuxthreads-atomic_h.patch
 Patch14: glibc-iconv-iso11548-1.patch
 Patch15: glibc-bz1877.patch
 Patch16: glibc-nscd-readall0.patch
@@ -364,6 +365,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:42:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:42:02 -0500
Subject: rpms/openoffice.org/devel .cvsignore, 1.98, 1.99 openoffice.org.spec,
	1.628, 1.629 sources, 1.156, 1.157
Message-ID: <200602230942.k1N9g2qU027232@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27214

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
next release candidate


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- .cvsignore	22 Feb 2006 14:17:33 -0000	1.98
+++ .cvsignore	23 Feb 2006 09:41:59 -0000	1.99
@@ -159,3 +159,4 @@
 OOB680_m1.tar.bz2
 OOB680_m2.tar.bz2
 OOB680_m3.tar.bz2
+OOB680_m4.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- openoffice.org.spec	22 Feb 2006 20:17:42 -0000	1.628
+++ openoffice.org.spec	23 Feb 2006 09:41:59 -0000	1.629
@@ -1,5 +1,5 @@
 %define oootag OOB680
-%define ooomilestone 3
+%define ooomilestone 4
 %define rh_rpm_release 1
 
 %define build_fc5 1
@@ -3354,7 +3354,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-3.1
+* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-4.1
 - hunspell replaces myspell
 - Catalan help documentation available
 - add sestatus details to crash_reporter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- sources	22 Feb 2006 14:17:33 -0000	1.156
+++ sources	23 Feb 2006 09:41:59 -0000	1.157
@@ -9,4 +9,4 @@
 fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
 0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh
 0fc9c0b585e2c92a7ac05adebeb4caf2  GSI_ga.sdf
-63c2dea9645122cfdc4532df4edda03f  OOB680_m3.tar.bz2
+7d1732efad8c84e2597002d95a26ac0e  OOB680_m4.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:44:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:44:30 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.25,1.26
Message-ID: <200602230944.k1N9iU69027315@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27302

Modified Files:
	libbtctl.spec 
Log Message:
bump


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libbtctl.spec	23 Feb 2006 09:30:44 -0000	1.25
+++ libbtctl.spec	23 Feb 2006 09:44:27 -0000	1.26
@@ -3,10 +3,11 @@
 %else
 %define with_mono 0
 %endif
+ExcludeArch: s390 s390x
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -20,7 +21,6 @@
 BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
 %endif
 
-ExcludeArch: s390 s390x
 Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
 
@@ -98,6 +98,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 0.6.0-2
+- rebuild
+
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> 0.6.0-1
 - version 0.6.0
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:46:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:46:54 -0500
Subject: rpms/glibc/FC-4 glibc-linuxthreads-atomic_h.patch,1.1,1.2
Message-ID: <200602230946.k1N9ksHN007448@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7433

Modified Files:
	glibc-linuxthreads-atomic_h.patch 
Log Message:
2.3.6-1


glibc-linuxthreads-atomic_h.patch:
 pthread.c  |   10 +++++-----
 spinlock.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

Index: glibc-linuxthreads-atomic_h.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-linuxthreads-atomic_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-linuxthreads-atomic_h.patch	23 Feb 2006 09:40:47 -0000	1.1
+++ glibc-linuxthreads-atomic_h.patch	23 Feb 2006 09:46:51 -0000	1.2
@@ -5,8 +5,8 @@
 	* pthread.c (__pthread_restart_old, __pthread_suspend_old,
 	__pthread_timedsuspend_old): Adjust callers.
 
---- linuxthreads/spinlock.h.jj	2003-07-31 21:16:04.000000000 +0200
-+++ linuxthreads/spinlock.h	2006-02-23 10:30:04.000000000 +0100
+--- libc/linuxthreads/spinlock.h.jj	2003-07-31 21:16:04.000000000 +0200
++++ libc/linuxthreads/spinlock.h	2006-02-23 10:30:04.000000000 +0100
 @@ -172,7 +172,7 @@ static inline int __pthread_alt_trylock 
  
  /* Operations on pthread_atomic, which is defined in internals.h */
@@ -25,8 +25,8 @@
  {
      long oldval;
  
---- linuxthreads/pthread.c.jj	2005-01-09 21:02:37.000000000 +0100
-+++ linuxthreads/pthread.c	2006-02-23 10:30:04.000000000 +0100
+--- libc/linuxthreads/pthread.c.jj	2005-01-09 21:02:37.000000000 +0100
++++ libc/linuxthreads/pthread.c	2006-02-23 10:30:04.000000000 +0100
 @@ -1231,13 +1231,13 @@ void __pthread_wait_for_restart_signal(p
  
  void __pthread_restart_old(pthread_descr th)



From fedora-cvs-commits at redhat.com  Thu Feb 23 09:48:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 04:48:53 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.26,1.27
Message-ID: <200602230948.k1N9mrUP007513@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7500

Modified Files:
	libbtctl.spec 
Log Message:
disabled mono, because beehive doesn't understand rpmmacros for BuildRequires


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libbtctl.spec	23 Feb 2006 09:44:27 -0000	1.26
+++ libbtctl.spec	23 Feb 2006 09:48:51 -0000	1.27
@@ -1,5 +1,6 @@
 %ifarch %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
-%define with_mono 1
+# defined to zero, because beehive doesn't do macros for BuildRequires
+%define with_mono 0
 %else
 %define with_mono 0
 %endif
@@ -18,7 +19,7 @@
 BuildRequires: autoconf >= 0:2.57 bluez-libs-devel glib2-devel gtk-doc openobex-devel >= 0:1.1 python pygtk2-devel gtk2-devel
 
 %if %{with_mono}
-BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
+#BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp
 %endif
 
 Patch1: libbtctl-0.6.0-libdir.patch



From fedora-cvs-commits at redhat.com  Thu Feb 23 10:33:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 05:33:40 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch, 1.1, 1.2
Message-ID: <200602231033.k1NAXe2L008742@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8713

Modified Files:
	openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch 
Log Message:
rh#181491# focus is ok, raise is not

openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch:
 framework/source/helper/statusindicatorfactory.cxx |    2 ++
 framework/source/loadenv/loadenv.cxx               |    3 ++-
 source/helper/statusindicatorfactory.cxx           |    0 
 source/loadenv/loadenv.cxx                         |    0 
 4 files changed, 4 insertions(+), 1 deletion(-)

Index: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch	4 Jan 2006 21:51:32 -0000	1.1
+++ openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch	23 Feb 2006 10:33:21 -0000	1.2
@@ -36,26 +36,3 @@
  
  /* #i19976#
      We tried to prevent a toFront() call in case the user putted the
-Index: source/services/frame.cxx
-===================================================================
-RCS file: /cvs/framework/framework/source/services/frame.cxx,v
-retrieving revision 1.88
-diff -u -p -u -r1.88 frame.cxx
---- openoffice.org.orig/framework/source/services/frame.cxx	11 Nov 2005 12:06:59 -0000	1.88
-+++ openoffice.org/framework/source/services/frame.cxx	4 Jan 2006 21:41:09 -0000
-@@ -1563,6 +1563,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
-     if (bIsConnected && !bWasConnected)
-         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED   );
- 
-+#if 0
-     //_____________________________________________________________________________________________________
-     // A new component window doesn't know anything about current active/focus states.
-     // Set this information on it!
-@@ -1573,6 +1574,7 @@ sal_Bool SAL_CALL Frame::setComponent(  
-     {
-         xComponentWindow->setFocus();
-     }
-+#endif
- 
-     // If it was a new component window - we must resize it to fill out
-     // our container window.



From fedora-cvs-commits at redhat.com  Thu Feb 23 10:35:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 05:35:27 -0500
Subject: rpms/openoffice.org/devel openoffice.org.spec,1.629,1.630
Message-ID: <200602231035.k1NAZR5P008972@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8956

Modified Files:
	openoffice.org.spec 
Log Message:
back to silent


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -r1.629 -r1.630
--- openoffice.org.spec	23 Feb 2006 09:41:59 -0000	1.629
+++ openoffice.org.spec	23 Feb 2006 10:35:24 -0000	1.630
@@ -957,16 +957,14 @@
 
 # see tamil translation issue rh#159381#, remove when complete and upstreamed
 cd transex3/prj
-#build --dlv_switch -link --all -P$MAXBUILDS -- -s
-build --dlv_switch -link --all -P$MAXBUILDS
+build --dlv_switch -link --all -P$MAXBUILDS -- -s
 deliver -link
 localize -m -x -l ta-IN -f %{SOURCE2}
 localize -m -x -l ga -f %{SOURCE6}
 cd ../..
 
 cd instsetoo_native/util
-# if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
-if ! build --dlv_switch -link --all -P$MAXBUILDS; then
+ if ! build --dlv_switch -link --all -P$MAXBUILDS -- -s; then
     echo parallel build failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
     unset MAXPROCESS
     build --dlv_switch -link --all



From fedora-cvs-commits at redhat.com  Thu Feb 23 11:30:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 06:30:11 -0500
Subject: rpms/libvirt/devel .cvsignore, 1.3, 1.4 libvirt.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200602231130.k1NBUBQU014820@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14806

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.0.5 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Feb 2006 10:59:16 -0000	1.3
+++ .cvsignore	23 Feb 2006 11:30:08 -0000	1.4
@@ -1,2 +1,3 @@
 libvirt-0.0.3.tar.gz
 libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libvirt.spec	10 Feb 2006 11:14:10 -0000	1.3
+++ libvirt.spec	23 Feb 2006 11:30:08 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.0.4
+Version: 0.0.5
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -42,8 +42,6 @@
 %setup -q
 
 %build
-# 0.0.4 workaround timestamp in the future
-find . -exec touch {} \;
 %configure
 make
 
@@ -51,6 +49,7 @@
 rm -fr %{buildroot}
 
 %makeinstall
+(cd docs/examples ; make clean ; rm -rf .deps)
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -78,8 +77,13 @@
 %{_libdir}/lib*.so
 %{_includedir}/libvirt/*.h
 %{_libdir}/pkgconfig/libvirt.pc
+%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp
+%doc %{_datadir}/gtk-doc/html/libvirt/*.html
+%doc %{_datadir}/gtk-doc/html/libvirt/*.png
+%doc %{_datadir}/gtk-doc/html/libvirt/*.css
 
 %doc docs/*.html docs/html docs/*.gif
+%doc docs/examples
 %doc docs/libvirt-api.xml
 
 %files python
@@ -88,6 +92,7 @@
 %doc AUTHORS NEWS README COPYING.LIB
 %{_libdir}/python*/site-packages/libvirt.py*
 %{_libdir}/python*/site-packages/libvirtmod*
+%doc python/tests/*.py
 %doc python/TODO
 %doc python/libvirtclass.txt
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Feb 2006 10:59:16 -0000	1.3
+++ sources	23 Feb 2006 11:30:08 -0000	1.4
@@ -1 +1 @@
-59b11be5899794a36e8f7f7cabf2fe65  libvirt-0.0.4.tar.gz
+3ba34b4bc0a588cee86e8219a6935e3e  libvirt-0.0.5.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 11:35:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 06:35:04 -0500
Subject: rpms/libvirt/devel libvirt.spec,1.4,1.5
Message-ID: <200602231135.k1NBZ4tk014850@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14836

Modified Files:
	libvirt.spec 
Log Message:
Fixing spec post release oops, Daniel



Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libvirt.spec	23 Feb 2006 11:30:08 -0000	1.4
+++ libvirt.spec	23 Feb 2006 11:35:01 -0000	1.5
@@ -9,6 +9,8 @@
 URL: http://libvir.org/
 BuildRequires: xen python python-devel
 Requires: xen
+Requires: libxml2
+BuildRequires: libxml2-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64
 
@@ -97,6 +99,12 @@
 %doc python/libvirtclass.txt
 
 %changelog
+* Thu Feb 23 2006 Daniel Veillard <veillard at redhat.com> 0.0.5-1
+- new domain creation API
+- new UUID based APIs
+- more tests, documentation, devhelp
+- bug fixes
+
 * Fri Feb 10 2006 Daniel Veillard <veillard at redhat.com> 0.0.4-1
 - fixes some problems in 0.0.3 due to the change of names
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 11:35:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 06:35:49 -0500
Subject: rpms/pciutils/devel pciutils.spec,1.36,1.37
Message-ID: <200602231135.k1NBZnZA014904@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14891

Modified Files:
	pciutils.spec 
Log Message:
- added update-pciids shell script and manpage (bz #178582)


Index: pciutils.spec
===================================================================
RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pciutils.spec	11 Feb 2006 04:57:18 -0000	1.36
+++ pciutils.spec	23 Feb 2006 11:35:44 -0000	1.37
@@ -1,11 +1,12 @@
 Name:		pciutils
 Version:	2.2.1
-Release: 	1.2
+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
 Patch3: 	pciutils-havepread.patch
 Patch5:		pciutils-devicetype.patch
+Patch6: 	pciutils-2.2.1-idpath.patch
 Patch7:		pciutils-2.1.99-gcc4.patch
 License:	GPL
 URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
@@ -35,6 +36,7 @@
 %patch2 -p1 -b .scan
 %patch3 -p1 -b .pread
 %patch5 -p1 -b .devicetype
+%patch6 -p1 -b .idpath
 %patch7 -p1 -b .glibcmacros
 
 %build
@@ -45,8 +47,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/{sbin,%{_mandir}/man8,%{_libdir},%{_includedir}/pci}
 
-install lspci setpci $RPM_BUILD_ROOT/sbin
-install lspci.8 setpci.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install lspci setpci update-pciids $RPM_BUILD_ROOT/sbin
+install lspci.8 setpci.8 update-pciids.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install lib/libpci.a $RPM_BUILD_ROOT%{_libdir}
 install lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci
 install lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci
@@ -68,6 +70,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 2.2.1-2
+- added update-pciids shell script and manpage (bz #178582)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.2.1-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 11:40:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 06:40:53 -0500
Subject: rpms/pciutils/devel pciutils-2.2.1-idpath.patch, NONE,
	1.1 pciutils-update-pciids.patch, NONE, 1.1
Message-ID: <200602231140.k1NBerLB015004@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/pciutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14985

Added Files:
	pciutils-2.2.1-idpath.patch pciutils-update-pciids.patch 
Log Message:
- added update-pciids shell script and manpage (bz #178582)

pciutils-2.2.1-idpath.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pciutils-2.2.1-idpath.patch ---
--- pciutils-2.2.1/Makefile.idpath	2006-02-23 12:24:12.000000000 +0100
+++ pciutils-2.2.1/Makefile	2006-02-23 12:24:18.000000000 +0100
@@ -10,7 +10,7 @@
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
 SHAREDIR=$(PREFIX)/share
-IDSDIR=$(SHAREDIR)
+IDSDIR=$(SHAREDIR)/hwdata
 MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
 INSTALL=install
 DIRINSTALL=install -d

pciutils-update-pciids.patch:
 Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pciutils-update-pciids.patch ---
--- pciutils-2.1.99-test8/Makefile.update-pciids	2006-02-23 12:07:05.000000000 +0100
+++ pciutils-2.1.99-test8/Makefile	2006-02-23 12:07:34.000000000 +0100
@@ -50,7 +50,7 @@
 common.o: common.c pciutils.h $(PCIINC)
 
 update-pciids: update-pciids.sh
-	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/pci.ids@"
+	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/hwdata/pci.ids@"
 
 %.8: %.man
 	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@SHAREDIR@#$(SHAREDIR)#"



From fedora-cvs-commits at redhat.com  Thu Feb 23 11:58:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 06:58:10 -0500
Subject: rpms/curl/devel curl.spec,1.33,1.34
Message-ID: <200602231158.k1NBwA46005001@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4840

Modified Files:
	curl.spec 
Log Message:
- fix multilib problem - #181290 -
  curl-devel.i386 not installable together with curl-devel.x86-64



Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- curl.spec	11 Feb 2006 02:21:41 -0000	1.33
+++ curl.spec	23 Feb 2006 11:58:07 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Name: curl 
 Version: 7.15.1
-Release: 1.2.1
+Release: 2
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -56,6 +56,20 @@
 %makeinstall
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 
+curlcsuffix=`echo %{_libdir} | sed s,/usr/,,`
+mv  $RPM_BUILD_ROOT%{_bindir}/curl-config $RPM_BUILD_ROOT%{_bindir}/curl-config-$curlcsuffix
+cat > $RPM_BUILD_ROOT%{_bindir}/curl-config  <<EOF
+#!/bin/sh
+if [ -e %{_bindir}/curl-config-lib64 ]; then 
+  exec %{_bindir}/curl-config-lib64 "\$@"
+elif [ -e %{_bindir}/curl-config-* ]; then 
+  curlcfile="\`ls %{_bindir}/curl-config-* | head\`"
+  exec \$curlcfile "\$@" 
+fi 
+EOF
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/curl-config
+
+
 # don't need curl's copy of the certs; use openssl's
 find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
 
@@ -82,7 +96,7 @@
 %files devel
 %defattr(-,root,root)
 %doc docs/examples docs/INTERNALS
-%{_bindir}/curl-config
+%{_bindir}/curl-config*
 %{_includedir}/curl
 %{_libdir}/*.a
 %{_libdir}/*.so
@@ -91,6 +105,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb 23 2006 Ivana Varekova <varekova at redhat.com> - 7.15.1-2
+- fix multilib problem - #181290 - 
+  curl-devel.i386 not installable together with curl-devel.x86-64
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 7.15.1-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 12:37:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 07:37:03 -0500
Subject: rpms/glibc/FC-4 glibc-20050815-20051104.patch, 1.1, 1.2 glibc.spec,
	1.163, 1.164
Message-ID: <200602231237.k1NCb357029072@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv28986

Modified Files:
	glibc-20050815-20051104.patch glibc.spec 
Log Message:
2.3.6-1


glibc-20050815-20051104.patch:
 BUGS                                                         |   14 
 Makefile                                                     |   54 
 Makerules                                                    |   10 
 abi-tags                                                     |    2 
 argp/argp-eexst.c                                            |    2 
 argp/argp-fmtstream.c                                        |    2 
 argp/argp-fmtstream.h                                        |    4 
 argp/argp-fs-xinl.c                                          |    2 
 argp/argp-xinl.c                                             |    2 
 argp/argp.h                                                  |    2 
 configure                                                    |   18 
 configure.in                                                 |   18 
 crypt/Makefile                                               |    8 
 crypt/md5.h                                                  |    3 
 debug/execinfo.h                                             |    3 
 debug/xtrace.sh                                              |    2 
 dlfcn/Makefile                                               |   19 
 dlfcn/bug-atexit1-lib.c                                      |  375 +
 dlfcn/bug-atexit1.c                                          |   23 
 dlfcn/bug-atexit2-lib.c                                      |   14 
 dlfcn/bug-atexit2.c                                          |   53 
 elf/Makefile                                                 |   13 
 elf/cache.c                                                  |    3 
 elf/dl-addr.c                                                |   15 
 elf/dl-conflict.c                                            |    4 
 elf/dl-load.c                                                |   97 
 elf/dl-tsd.c                                                 |    2 
 elf/elf.h                                                    |   13 
 elf/rtld.c                                                   |    9 
 elf/tst-auditmod1.c                                          |    8 
 hesiod/hesiod.c                                              |    6 
 hurd/intr-msg.c                                              |   19 
 iconv/loop.c                                                 |    4 
 iconv/skeleton.c                                             |   30 
 iconvdata/jis0208.c                                          |   18 
 iconvdata/jis0208.h                                          |    9 
 include/atomic.h                                             |   39 
 include/features.h                                           |   15 
 include/limits.h                                             |   20 
 include/malloc.h                                             |    1 
 include/regex.h                                              |   49 
 include/resolv.h                                             |    2 
 include/string.h                                             |    2 
 include/sys/mman.h                                           |    2 
 include/time.h                                               |    2 
 inet/getnetgrent_r.c                                         |  130 
 intl/localealias.c                                           |    5 
 libio/fileops.c                                              |   14 
 libio/fmemopen.c                                             |    2 
 libio/iofclose.c                                             |    2 
 libio/iofgets.c                                              |    8 
 libio/iofgets_u.c                                            |    8 
 libio/iofgetws.c                                             |    8 
 libio/iofgetws_u.c                                           |    8 
 libio/iofopncook.c                                           |   11 
 libio/iogetdelim.c                                           |    8 
 libio/iogetline.c                                            |   53 
 libio/oldfileops.c                                           |    8 
 libio/oldiofclose.c                                          |    2 
 libio/stdio.h                                                |   20 
 locale/iso-4217.def                                          |    4 
 locale/iso-639.def                                           |  121 
 locale/loadarchive.c                                         |    2 
 locale/programs/ld-address.c                                 |   11 
 localedata/Makefile                                          |    2 
 localedata/SUPPORTED                                         |   16 
 localedata/locales/af_ZA                                     |  246 -
 localedata/locales/ar_AE                                     |    9 
 localedata/locales/ar_BH                                     |    9 
 localedata/locales/ar_DZ                                     |    9 
 localedata/locales/ar_EG                                     |   13 
 localedata/locales/ar_IN                                     |   26 
 localedata/locales/ar_IQ                                     |    9 
 localedata/locales/ar_JO                                     |    9 
 localedata/locales/ar_KW                                     |    9 
 localedata/locales/ar_LB                                     |    9 
 localedata/locales/ar_LY                                     |    9 
 localedata/locales/ar_MA                                     |    9 
 localedata/locales/ar_OM                                     |    9 
 localedata/locales/ar_QA                                     |    9 
 localedata/locales/ar_SA                                     |    9 
 localedata/locales/ar_SD                                     |    9 
 localedata/locales/ar_SY                                     |    9 
 localedata/locales/ar_TN                                     |    9 
 localedata/locales/ar_YE                                     |    9 
 localedata/locales/az_AZ                                     |   47 
 localedata/locales/be_BY at latin                               |  147 
 localedata/locales/bn_BD                                     |  121 
 localedata/locales/bn_IN                                     |   26 
 localedata/locales/bs_BA                                     |   18 
 localedata/locales/ca_ES                                     |    2 
 localedata/locales/de_DE                                     |   13 
 localedata/locales/el_GR                                     |   29 
 localedata/locales/en_US                                     |    2 
 localedata/locales/es_AR                                     |    4 
 localedata/locales/es_US                                     |   12 
 localedata/locales/fi_FI                                     |    5 
 localedata/locales/hsb_DE                                    | 2216 +++++++++++
 localedata/locales/hu_HU                                     |   28 
 localedata/locales/km_KH                                     | 1904 +++++++++
 localedata/locales/ku_TR                                     |  215 +
 localedata/locales/kw_GB                                     |    4 
 localedata/locales/ky_KG                                     |  203 +
 localedata/locales/mg_MG                                     |  181 
 localedata/locales/ml_IN                                     |    6 
 localedata/locales/nl_NL                                     |    5 
 localedata/locales/nso_ZA                                    |  281 +
 localedata/locales/oc_FR                                     |    2 
 localedata/locales/ru_RU                                     |   24 
 localedata/locales/rw_RW                                     |  150 
 localedata/locales/si_LK                                     |  216 +
 localedata/locales/sid_ET                                    |    1 
 localedata/locales/sq_AL                                     |  145 
 localedata/locales/ss_ZA                                     |  285 +
 localedata/locales/st_ZA                                     |   71 
 localedata/locales/ta_IN                                     |   16 
 localedata/locales/te_IN                                     |  108 
 localedata/locales/tg_TJ                                     |   15 
 localedata/locales/tn_ZA                                     |  288 +
 localedata/locales/ts_ZA                                     |  282 +
 localedata/locales/ve_ZA                                     |  288 +
 localedata/locales/vi_VN                                     |  146 
 localedata/locales/wa_BE                                     |   32 
 localedata/locales/xh_ZA                                     |   69 
 localedata/locales/yi_US                                     |   55 
 localedata/locales/zh_CN                                     |    6 
 localedata/locales/zu_ZA                                     |   69 
 malloc/Makefile                                              |    4 
 malloc/arena.c                                               |  110 
 malloc/hooks.c                                               |    4 
 malloc/malloc.c                                              |   71 
 malloc/memusage.c                                            |  279 -
 malloc/obstack.h                                             |    2 
 malloc/tst-mallocfork.c                                      |   52 
 malloc/tst-mtrace.sh                                         |    3 
 manual/llio.texi                                             |   12 
 manual/memory.texi                                           |    4 
 manual/pattern.texi                                          |    6 
 manual/signal.texi                                           |    4 
 manual/stdio.texi                                            |    7 
 manual/time.texi                                             |    3 
 math/Makefile                                                |    2 
 math/libm-test.inc                                           |    4 
 math/test-tgmath-int.c                                       |   71 
 math/tgmath.h                                                |   13 
 misc/hsearch_r.c                                             |    2 
 misc/sys/mman.h                                              |    8 
 nis/nss_nis/nis-netgrp.c                                     |   18 
 nis/nss_nis/nis-publickey.c                                  |    2 
 nis/nss_nisplus/nisplus-netgrp.c                             |   13 
 nptl/Makefile                                                |    6 
 nptl/TODO                                                    |    4 
 nptl/allocatestack.c                                         |   93 
 nptl/descr.h                                                 |   14 
 nptl/init.c                                                  |   30 
 nptl/perf.c                                                  |    5 
 nptl/pthread_create.c                                        |   13 
 nptl/sysdeps/pthread/pthread_cond_signal.c                   |    5 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h            |   16 
 nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S |   45 
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h             |   11 
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h          |   15 
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h             |   23 
 nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S               |    4 
 nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h            |   15 
 nptl/sysdeps/unix/sysv/linux/timer_routines.c                |   14 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S    |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S           |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S            |    1 
 nptl/tst-align3.c                                            |   57 
 nscd/aicache.c                                               |    2 
 nscd/cache.c                                                 |   34 
 nscd/connections.c                                           |   36 
 nscd/dbg_log.c                                               |    2 
 nscd/grpcache.c                                              |    3 
 nscd/hstcache.c                                              |    3 
 nscd/initgrcache.c                                           |    3 
 nscd/mem.c                                                   |   18 
 nscd/nscd.c                                                  |   15 
 nscd/nscd.conf                                               |    4 
 nscd/nscd.h                                                  |   17 
 nscd/nscd_conf.c                                             |  161 
 nscd/nscd_getpw_r.c                                          |    2 
 nscd/nscd_stat.c                                             |    6 
 nscd/pwdcache.c                                              |    3 
 nss/getent.c                                                 |   82 
 nss/nss_files/files-netgrp.c                                 |   22 
 posix/Makefile                                               |    2 
 posix/getconf.c                                              |   55 
 posix/regcomp.c                                              |  533 +-
 posix/regex.c                                                |   29 
 posix/regex.h                                                |  161 
 posix/regex_internal.c                                       |  403 --
 posix/regex_internal.h                                       |  178 
 posix/regexec.c                                              |  722 +--
 posix/sys/wait.h                                             |    8 
 posix/tst-rfc3484.c                                          |   98 
 resolv/Versions                                              |    2 
 resolv/res_data.c                                            |    4 
 resolv/res_init.c                                            |   31 
 resolv/res_libc.c                                            |   16 
 resolv/res_send.c                                            |   59 
 rt/mqueue.h                                                  |    6 
 scripts/begin-end-check.pl                                   |   47 
 stdio-common/Makefile                                        |    3 
 stdio-common/tst-fgets.c                                     |   20 
 stdio-common/tst-fwrite.c                                    |   70 
 stdio-common/tst-put-error.c                                 |   33 
 stdlib/Depend                                                |    1 
 stdlib/Makefile                                              |    3 
 stdlib/bug-strtod2.c                                         |   46 
 stdlib/cxa_atexit.c                                          |   59 
 stdlib/stdlib.h                                              |    2 
 stdlib/strtod_l.c                                            |   12 
 stdlib/tst-ucontext-off.c                                    |   35 
 string/strxfrm_l.c                                           |    6 
 sunrpc/svc.c                                                 |    2 
 sysdeps/alpha/divqu.S                                        |    2 
 sysdeps/alpha/ldiv.S                                         |    2 
 sysdeps/alpha/remqu.S                                        |    2 
 sysdeps/generic/bits/byteswap.h                              |   19 
 sysdeps/generic/bits/mman.h                                  |    6 
 sysdeps/generic/dl-sysdep.c                                  |   25 
 sysdeps/generic/glob.c                                       |    2 
 sysdeps/generic/ldsodefs.h                                   |   16 
 sysdeps/generic/memusage.h                                   |   16 
 sysdeps/generic/nfs/nfs.h                                    |   32 
 sysdeps/generic/s_csqrt.c                                    |    4 
 sysdeps/generic/s_csqrtf.c                                   |    4 
 sysdeps/generic/s_csqrtl.c                                   |    4 
 sysdeps/generic/tst-audit.h                                  |   11 
 sysdeps/i386/bits/string.h                                   |  922 ----
 sysdeps/i386/fpu/libm-test-ulps                              |   16 
 sysdeps/i386/i686/memusage.h                                 |   22 
 sysdeps/ia64/fpu/libm-symbols.h                              |    4 
 sysdeps/ia64/fpu/libm_error.c                                |    8 
 sysdeps/ieee754/flt-32/e_hypotf.c                            |   10 
 sysdeps/mach/hurd/dl-sysdep.h                                |    6 
 sysdeps/mach/hurd/getpeername.c                              |   12 
 sysdeps/mach/hurd/i386/init-first.c                          |   22 
 sysdeps/mach/hurd/ioctl.c                                    |    6 
 sysdeps/mach/hurd/profil.c                                   |    2 
 sysdeps/mach/hurd/setitimer.c                                |    9 
 sysdeps/posix/getaddrinfo.c                                  |   59 
 sysdeps/posix/spawni.c                                       |   10 
 sysdeps/powerpc/fpu/libm-test-ulps                           |   18 
 sysdeps/powerpc/powerpc64/Makefile                           |    2 
 sysdeps/powerpc/powerpc64/hp-timing.c                        |   25 
 sysdeps/powerpc/powerpc64/hp-timing.h                        |  136 
 sysdeps/unix/alpha/sysdep.h                                  |   63 
 sysdeps/unix/sh/sysdep.S                                     |    2 
 sysdeps/unix/sockatmark.c                                    |    4 
 sysdeps/unix/sysv/i386/signal.S                              |   31 
 sysdeps/unix/sysv/i386/sigreturn.S                           |   27 
 sysdeps/unix/sysv/linux/i386/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/i386/ucontext_i.h                    |   20 
 sysdeps/unix/sysv/linux/ia64/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/lddlibc4.c                           |    2 
 sysdeps/unix/sysv/linux/mips/brk.c                           |    3 
 sysdeps/unix/sysv/linux/mips/getpagesize.c                   |    1 
 sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S              |    8 
 sysdeps/unix/sysv/linux/mips/mips64/syscall.S                |   29 
 sysdeps/unix/sysv/linux/powerpc/bits/mman.h                  |    1 
 sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c              |  105 
 sysdeps/unix/sysv/linux/powerpc/powerpc32/ucontext_i.h       |   19 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h         |   77 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h       |   15 
 sysdeps/unix/sysv/linux/readonly-area.c                      |   18 
 sysdeps/unix/sysv/linux/s390/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h            |   14 
 sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h            |   13 
 sysdeps/unix/sysv/linux/sh/bits/mman.h                       |    1 
 sysdeps/unix/sysv/linux/sh/makecontext.S                     |  145 
 sysdeps/unix/sysv/linux/sh/sh3/getcontext.S                  |   90 
 sysdeps/unix/sysv/linux/sh/sh3/setcontext.S                  |  101 
 sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S                 |  134 
 sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h                |  102 
 sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h                  |   79 
 sysdeps/unix/sysv/linux/sh/sh4/getcontext.S                  |  133 
 sysdeps/unix/sysv/linux/sh/sh4/setcontext.S                  |  141 
 sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S                 |  216 +
 sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h                |  115 
 sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h                  |  149 
 sysdeps/unix/sysv/linux/sh/socket.S                          |    6 
 sysdeps/unix/sysv/linux/sh/sys/ucontext.h                    |  109 
 sysdeps/unix/sysv/linux/sparc/bits/mman.h                    |    1 
 sysdeps/unix/sysv/linux/syscalls.list                        |    2 
 sysdeps/unix/sysv/linux/x86_64/bits/mman.h                   |    1 
 sysdeps/unix/sysv/linux/x86_64/ucontext_i.h                  |   30 
 time/Makefile                                                |    2 
 time/asctime.c                                               |   63 
 time/bug-asctime.c                                           |   33 
 time/bug-asctime_r.c                                         |   32 
 time/mktime.c                                                |   60 
 timezone/africa                                              |   24 
 timezone/asia                                                |   86 
 timezone/australasia                                         |   55 
 timezone/backward                                            |   25 
 timezone/europe                                              |   93 
 timezone/northamerica                                        |  152 
 timezone/southamerica                                        |   18 
 timezone/test-tz.c                                           |    2 
 timezone/tst-timezone.c                                      |    4 
 timezone/zdump.c                                             |    4 
 timezone/zone.tab                                            |   28 
 wcsmbs/Makefile                                              |    3 
 wcsmbs/tst-mbrtowc2.c                                        |   67 
 wctype/wcfuncs.c                                             |   33 
 wctype/wcfuncs_l.c                                           |   33 
 wctype/wctype.h                                              |    1 
 310 files changed, 13893 insertions(+), 4168 deletions(-)

Index: glibc-20050815-20051104.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-20050815-20051104.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-20050815-20051104.patch	23 Feb 2006 08:49:04 -0000	1.1
+++ glibc-20050815-20051104.patch	23 Feb 2006 12:37:01 -0000	1.2
@@ -1258,10 +1258,6 @@
 	* locales/te_IN: Several fixes.
 	Patch by Sunil Mohan Adapa <sunil at atc.tcs.co.in>.
 
-	[BZ #368]
-	* locales/dz_BT: New file.
-	* SUPPORTED (SUPPORTED-LOCALES): Add dz_BT.UTF-8.
-
 	[BZ #195]
 	* locales/hu_HU: Add some transliterations.
 
@@ -14152,14 +14148,6 @@
  bg_BG.UTF-8/UTF-8 \
  bg_BG/CP1251 \
  bn_BD/UTF-8 \
-@@ -83,6 +84,7 @@ de_DE at euro/ISO-8859-15 \
- de_LU.UTF-8/UTF-8 \
- de_LU/ISO-8859-1 \
- de_LU at euro/ISO-8859-15 \
-+dz_BT/UTF-8 \
- el_GR.UTF-8/UTF-8 \
- el_GR/ISO-8859-7 \
- en_AU.UTF-8/UTF-8 \
 @@ -201,6 +203,8 @@ he_IL/ISO-8859-8 \
  hi_IN/UTF-8 \
  hr_HR.UTF-8/UTF-8 \
@@ -21713,1369 +21701,6 @@
 +
 +END LC_ADDRESS
 +
---- libc/localedata/locales/dz_BT.jj	2006-02-09 22:35:48.000000000 +0100
-+++ libc/localedata/locales/dz_BT	2006-02-09 22:35:48.000000000 +0100
-@@ -0,0 +1,1360 @@
-+comment_char %
-+escape_char  /
-+
-+% Bhutanese(Bhutan) locale
-+%
-+% Name:      dz_BT
-+% Author:    Pema Geyleg
-+% Contact:   Sherubtse College, Kanglung Bhutan; Pablo Saratxaga
-+% E-mail:    pema_geyleg at druknet.bt; pablo at mandrakesoft.com
-+% Language:  Dzongkha(dz)
-+% Territory: Bhutan(BT)
-+% Charset:   UTF-8
-+% Revision:  0.3
-+% Date:      2004-09-03
-+%
-+
-+LC_IDENTIFICATION
-+title      "Dzongkha language locale for Bhutan"
-+source     "Sherubtse College"
-+address    "Kanglung, Bhutan"
-+contact    ""
-+email      "bug-glibc at gnu.org"
-+tel        ""
-+fax        ""
-+language   "Dzongkha"
-+territory  "Bhutan"
-+revision   "0.3"
-+date       "2004-09-03"
-+%
-+category  "dz_BT:2004";LC_IDENTIFICATION
-+category  "dz_BT:2004";LC_CTYPE
-+category  "dz_BT:2004";LC_COLLATE
-+category  "dz_BT:2004";LC_NUMERIC
-+category  "dz_BT:2004";LC_MONETARY
-+category  "dz_BT:2004";LC_MESSAGES
-+category  "dz_BT:2004";LC_PAPER
-+category  "dz_BT:2004";LC_NAME
-+category  "dz_BT:2004";LC_ADDRESS
-+category  "dz_BT:2004";LC_TELEPHONE
-+
-+END LC_IDENTIFICATION
-+
-+%%%%%%%%%%%%%%%%
-+% TODO: check LC_MONETARY, LC_NUMERIC, LC_MESSAGES, LC_TIME
-+% 	check time and date formats
-+%%%%%%%%%%%%%%%%
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_COLLATE
-+copy "iso14651_t1"
-+
-+script <TIBETAN>
-+
-+% 30 base letters
-+collating-symbol <TIB-KA>
-+collating-symbol <TIB-KHA> 
-+collating-symbol <TIB-GA>
-+collating-symbol <TIB-NGA>
-+collating-symbol <TIB-CA>
-+collating-symbol <TIB-CHA>
-+collating-symbol <TIB-JA>
-+collating-symbol <TIB-NYA>
-+collating-symbol <TIB-TA>
-+collating-symbol <TIB-THA>
-+collating-symbol <TIB-DA>
-+collating-symbol <TIB-NA>
-+collating-symbol <TIB-PA>
-+collating-symbol <TIB-PHA>
-+collating-symbol <TIB-BA>
-+collating-symbol <TIB-MA>
-+collating-symbol <TIB-TSA>
-+collating-symbol <TIB-TSHA>
-+collating-symbol <TIB-DZA>
-+collating-symbol <TIB-WA>
-+collating-symbol <TIB-ZHA>
-+collating-symbol <TIB-ZA>
-+collating-symbol <TIB--A>
-+collating-symbol <TIB-YA>
-+collating-symbol <TIB-RA>
-+collating-symbol <TIB-LA>
-+collating-symbol <TIB-SHA>
-+collating-symbol <TIB-SA>
-+collating-symbol <TIB-HA>
-+collating-symbol <TIB-A>
-+
-+% 4 explicit vowels
-+collating-symbol <TIB-I>
-+collating-symbol <TIB-U>
-+collating-symbol <TIB-E>
-+collating-symbol <TIB-O>
-+
-+% pre-radicals
-+collating-symbol <R_G>
-+collating-symbol <R_D>
-+collating-symbol <R_B>
-+collating-symbol <R_M>
-+collating-symbol <R_A>
-+collating-symbol <R_R>
-+collating-symbol <R_L>
-+collating-symbol <R_S>
-+collating-symbol <R_BR>
-+collating-symbol <R_BL>
-+collating-symbol <R_BS>
-+
-+% nominal, subjoined or variant forms
-+collating-symbol <NOM>
-+collating-symbol <SUB>
-+collating-symbol <VAR>
-+
-+% ka-radicals
-+collating-symbol <TIB-KA-R_D>
-+collating-symbol <TIB-KA-R_B>
-+collating-symbol <TIB-KA-R_R>
-+collating-symbol <TIB-KA-R_L>
-+collating-symbol <TIB-KA-R_S>
-+collating-symbol <TIB-KA-R_BR>
-+collating-symbol <TIB-KA-R_BS>
-+collating-element <rad-ka-d> from "<U0F51><U0F40>"
-+collating-element <rad-ka-b> from "<U0F56><U0F40>"
-+collating-element <rad-ka-r> from "<U0F62><U0F90>"
-+collating-element <rad-ka-l> from "<U0F63><U0F90>"
-+collating-element <rad-ka-s> from "<U0F66><U0F90>"
-+collating-element <rad-ka-b-r> from "<U0F56><U0F62><U0F90>"
-+collating-element <rad-ka-b-s> from "<U0F56><U0F66><U0F90>"
-+
-+% kha-radicals
-+collating-symbol <TIB-KHA-R_M>
-+collating-symbol <TIB-KHA-R_A>
-+collating-element <rad-kha-m> from "<U0F58><U0F41>"
-+collating-element <rad-kha-a> from "<U0F60><U0F41>"
-+
-+% ga-radicals
-+% 	as there are ambiguous, the next letter has to be added too;
-+%	so the <rad-ga-*> are in fact double elements: the ga-radical
-+%	itself, and the following letter.
-+collating-symbol <TIB-GA-R_D> % ambiguous
-+collating-symbol <TIB-GA-R_B> % ambiguous
-+collating-symbol <TIB-GA-R_M> % ambiguous
-+collating-symbol <TIB-GA-R_A> % ambiguous
-+collating-symbol <TIB-GA-R_R>
-+collating-symbol <TIB-GA-R_L>
-+collating-symbol <TIB-GA-R_S>
-+collating-symbol <TIB-GA-R_BR>
-+collating-symbol <TIB-GA-R_BS>
-+collating-element <rad-ga-d-ga> from "<U0F51><U0F42><U0F42>"
-+collating-element <rad-ga-d-nga> from "<U0F51><U0F42><U0F44>"
-+collating-element <rad-ga-d-da> from "<U0F51><U0F42><U0F51>"
-+collating-element <rad-ga-d-ba> from "<U0F51><U0F42><U0F56>"
-+collating-element <rad-ga-d-wa> from "<U0F51><U0F42><U0F5D>"
-+collating-element <rad-ga-d--a> from "<U0F51><U0F42><U0F60>"
-+collating-element <rad-ga-d-ra> from "<U0F51><U0F42><U0F62>"
-+collating-element <rad-ga-d-la> from "<U0F51><U0F42><U0F63>"
-+collating-element <rad-ga-d-sa> from "<U0F51><U0F42><U0F66>"
-+collating-element <rad-ga-d-u> from "<U0F51><U0F42><U0F74>"
-+collating-element <rad-ga-d-e> from "<U0F51><U0F42><U0F7A>"
-+collating-element <rad-ga-d-_ya> from "<U0F51><U0F42><U0FB1>"
-+collating-element <rad-ga-d-_ra> from "<U0F51><U0F42><U0FB2>"
-+collating-element <rad-ga-b-ga> from "<U0F56><U0F42><U0F42>"
-+collating-element <rad-ga-b-da> from "<U0F56><U0F42><U0F51>"
-+collating-element <rad-ga-b-ma> from "<U0F56><U0F42><U0F58>"
-+collating-element <rad-ga-b-ma2> from "<U0F56><U0F42><U0F7E>"
-+collating-element <rad-ga-b-wa> from "<U0F56><U0F42><U0F5D>"
-+collating-element <rad-ga-b--a> from "<U0F56><U0F42><U0F60>"
-+collating-element <rad-ga-b-ra> from "<U0F56><U0F42><U0F62>"
-+collating-element <rad-ga-b-e> from "<U0F56><U0F42><U0F7A>"
-+collating-element <rad-ga-b-o> from "<U0F56><U0F42><U0F7C>"
-+collating-element <rad-ga-b-_ya> from "<U0F56><U0F42><U0FB1>"
-+collating-element <rad-ga-b-_ra> from "<U0F56><U0F42><U0FB2>"
-+collating-element <rad-ga-b-_la> from "<U0F56><U0F42><U0FB3>"
-+collating-element <rad-ga-m-ra> from "<U0F58><U0F42><U0F62>"
-+collating-element <rad-ga-m-la> from "<U0F58><U0F42><U0F63>"
-+collating-element <rad-ga-m-u> from "<U0F58><U0F42><U0F74>"
-+collating-element <rad-ga-m-e> from "<U0F58><U0F42><U0F7A>"
-+collating-element <rad-ga-m-o> from "<U0F58><U0F42><U0F7C>"
-+collating-element <rad-ga-m-_ya> from "<U0F58><U0F42><U0FB1>"
-+collating-element <rad-ga-m-_ra> from "<U0F58><U0F42><U0FB2>"
-+collating-element <rad-ga-a-ga> from "<U0F60><U0F42><U0F42>"
-+collating-element <rad-ga-a-nga> from "<U0F60><U0F42><U0F44>"
-+collating-element <rad-ga-a-da> from "<U0F60><U0F42><U0F51>"
-+collating-element <rad-ga-a-na> from "<U0F60><U0F42><U0F53>"
-+collating-element <rad-ga-a-ba> from "<U0F60><U0F42><U0F56>"
-+collating-element <rad-ga-a-ma> from "<U0F60><U0F42><U0F58>"
-+collating-element <rad-ga-a-ma2> from "<U0F60><U0F42><U0F7E>"
-+collating-element <rad-ga-a--a> from "<U0F60><U0F42><U0F60>"
-+collating-element <rad-ga-a-ra> from "<U0F60><U0F42><U0F62>"
-+collating-element <rad-ga-a-la> from "<U0F60><U0F42><U0F63>"
-+collating-element <rad-ga-a-sa> from "<U0F60><U0F42><U0F66>"
-+collating-element <rad-ga-a-i> from "<U0F60><U0F42><U0F72>"
-+collating-element <rad-ga-a-u> from "<U0F60><U0F42><U0F74>"
-+collating-element <rad-ga-a-e> from "<U0F60><U0F42><U0F7A>"
-+collating-element <rad-ga-a-o> from "<U0F60><U0F42><U0F7C>"
-+collating-element <rad-ga-a-_ya> from "<U0F60><U0F42><U0FB1>"
-+collating-element <rad-ga-a-_ra> from "<U0F60><U0F42><U0FB2>"
-+collating-element <rad-ga-r> from "<U0F62><U0F92>"
-+collating-element <rad-ga-l> from "<U0F63><U0F92>"
-+collating-element <rad-ga-s> from "<U0F66><U0F92>"
-+collating-element <rad-ga-b-r> from "<U0F56><U0F62><U0F92>"
-+collating-element <rad-ga-b-s> from "<U0F56><U0F66><U0F92>"
-+
-+% nga-radicals
-+% 	as there are ambiguous, the next letter has to be added too;
-+%	so the <rad-nga-*> are in fact double elements: the nga-radical
-+%	itself, and the following letter.
-+collating-symbol <TIB-NGA-R_D> % ambiguous
-+collating-symbol <TIB-NGA-R_M> % ambiguous
-+collating-symbol <TIB-NGA-R_R>
-+collating-symbol <TIB-NGA-R_L>
-+collating-symbol <TIB-NGA-R_S>
-+collating-symbol <TIB-NGA-R_BR>
-+collating-symbol <TIB-NGA-R_BS>
-+collating-element <rad-nga-d-ga> from "<U0F51><U0F44><U0F42>"
-+collating-element <rad-nga-d-nga> from "<U0F51><U0F44><U0F44>"
-+collating-element <rad-nga-d-na> from "<U0F51><U0F44><U0F53>"
-+collating-element <rad-nga-d-ra> from "<U0F51><U0F44><U0F62>"
-+collating-element <rad-nga-d-u> from "<U0F51><U0F44><U0F74>"
-+collating-element <rad-nga-d-o> from "<U0F51><U0F44><U0F7C>"
-+collating-element <rad-nga-r> from "<U0F62><U0F44><U0F94>"
-+collating-element <rad-nga-l> from "<U0F63><U0F44><U0F94>"
-+collating-element <rad-nga-s> from "<U0F66><U0F44><U0F94>"
-+collating-element <rad-nga-b-r> from "<U0F56><U0F62><U0F94>"
-+collating-element <rad-nga-b-s> from "<U0F56><U0F66><U0F94>"
-+
-+% ca-radicals
-+collating-symbol <TIB-CA-R_G>
-+collating-symbol <TIB-CA-R_B>
-+collating-symbol <TIB-CA-R_L>
-+collating-symbol <TIB-CA-R_BL>
-+collating-element <rad-ca-g> from "<U0F42><U0F45>"
-+collating-element <rad-ca-b> from "<U0F56><U0F45>"
-+collating-element <rad-ca-l> from "<U0F63><U0F95>"
-+collating-element <rad-ca-b-l> from "<U0F56><U0F63><U0F95>"
-+
-+% cha-radicals
-+collating-symbol <TIB-CHA-R_M>
-+collating-symbol <TIB-CHA-R_A>
-+collating-element <rad-cha-m> from "<U0F58><U0F46>"
-+collating-element <rad-cha-a> from "<U0F60><U0F46>"
-+
-+% ja-radicals
-+collating-symbol <TIB-JA-R_M>
-+collating-symbol <TIB-JA-R_A>
-+collating-symbol <TIB-JA-R_R>
-+collating-symbol <TIB-JA-R_L>
-+collating-symbol <TIB-JA-R_BR>
-+collating-element <rad-ja-m> from "<U0F58><U0F47>"
-+collating-element <rad-ja-a> from "<U0F60><U0F47>"
-+collating-element <rad-ja-r> from "<U0F62><U0F97>"
-+collating-element <rad-ja-l> from "<U0F63><U0F97>"
-+collating-element <rad-ja-b-r> from "<U0F56><U0F62><U0F97>"
-+
-+% nya-radicals
-+collating-symbol <TIB-NYA-R_G>
-+collating-symbol <TIB-NYA-R_M>
-+collating-symbol <TIB-NYA-R_R>
-+collating-symbol <TIB-NYA-R_S>
-+collating-symbol <TIB-NYA-R_BR>
-+collating-symbol <TIB-NYA-R_BS>
-+collating-element <rad-nya-g> from "<U0F42><U0F49>"
-+collating-element <rad-nya-m> from "<U0F58><U0F49>"
-+collating-element <rad-nya-r> from "<U0F62><U0F99>"
-+collating-element <rad-nya-s> from "<U0F66><U0F99>"
-+collating-element <rad-nya-b-r> from "<U0F56><U0F62><U0F99>"
-+collating-element <rad-nya-b-s> from "<U0F56><U0F66><U0F99>"
-+
-+% ta-radicals
-+collating-symbol <TIB-TA-R_G>
-+collating-symbol <TIB-TA-R_B>
-+collating-symbol <TIB-TA-R_R>
-+collating-symbol <TIB-TA-R_L>
-+collating-symbol <TIB-TA-R_S>
-+collating-symbol <TIB-TA-R_BR>
-+collating-symbol <TIB-TA-R_BL>
-+collating-symbol <TIB-TA-R_BS>
-+collating-element <rad-ta-g> from "<U0F42><U0F4F>"
-+collating-element <rad-ta-b> from "<U0F56><U0F4F>"
-+collating-element <rad-ta-r> from "<U0F62><U0F9F>"
-+collating-element <rad-ta-l> from "<U0F63><U0F9F>"
-+collating-element <rad-ta-s> from "<U0F66><U0F9F>"
-+collating-element <rad-ta-b-r> from "<U0F56><U0F62><U0F9F>"
-+collating-element <rad-ta-b-l> from "<U0F56><U0F63><U0F9F>"
-+collating-element <rad-ta-b-s> from "<U0F56><U0F66><U0F9F>"
-+
-+% tha-radicals
-+collating-symbol <TIB-THA-R_M>
-+collating-symbol <TIB-THA-R_A>
-+collating-element <rad-tha-m> from "<U0F58><U0F50>"
-+collating-element <rad-tha-a> from "<U0F60><U0F50>"
-+
-+% da-radicals
-+% 	as there are ambiguous, the next letter has to be added too;
-+%	so the <rad-da-*> are in fact double elements: the da-radical
-+%	itself, and the following letter.
-+collating-symbol <TIB-DA-R_G> % ambiguous
-+collating-symbol <TIB-DA-R_B> % ambiguous
-+collating-symbol <TIB-DA-R_M> % ambiguous
-+collating-symbol <TIB-DA-R_A> % ambiguous
-+collating-symbol <TIB-DA-R_R>
-+collating-symbol <TIB-DA-R_L>
-+collating-symbol <TIB-DA-R_S>
-+collating-symbol <TIB-DA-R_BR>
-+collating-symbol <TIB-DA-R_BL>
-+collating-symbol <TIB-DA-R_BS>
-+collating-element <rad-da-g-ga> from "<U0F42><U0F51><U0F42>"
-+collating-element <rad-da-g-nga> from "<U0F42><U0F51><U0F44>"
-+collating-element <rad-da-g-na> from "<U0F42><U0F51><U0F53>"
-+collating-element <rad-da-g-ba> from "<U0F42><U0F51><U0F56>"
-+collating-element <rad-da-g-ma> from "<U0F42><U0F51><U0F58>"
-+collating-element <rad-da-g-ma2> from "<U0F42><U0F51><U0F7E>"
-+collating-element <rad-da-g--a> from "<U0F42><U0F51><U0F60>"
-+collating-element <rad-da-g-ra> from "<U0F42><U0F51><U0F62>"
-+collating-element <rad-da-g-la> from "<U0F42><U0F51><U0F63>"
-+collating-element <rad-da-g-sa> from "<U0F42><U0F51><U0F66>"
-+collating-element <rad-da-g-i> from "<U0F42><U0F51><U0F72>"
-+collating-element <rad-da-g-u> from "<U0F42><U0F51><U0F74>"
-+collating-element <rad-da-g-e> from "<U0F42><U0F51><U0F7A>"
-+collating-element <rad-da-g-o> from "<U0F42><U0F51><U0F7C>"
-+collating-element <rad-da-b-ga> from "<U0F56><U0F51><U0F42>"
-+collating-element <rad-da-b-ma> from "<U0F56><U0F51><U0F58>"
-+collating-element <rad-da-b-ma2> from "<U0F56><U0F51><U0F7E>"
-+collating-element <rad-da-b--a> from "<U0F56><U0F51><U0F60>"
-+collating-element <rad-da-b-ra> from "<U0F56><U0F51><U0F62>"
-+collating-element <rad-da-b-la> from "<U0F56><U0F51><U0F63>"
-+collating-element <rad-da-b-sa> from "<U0F56><U0F51><U0F66>"
-+collating-element <rad-da-b-u> from "<U0F56><U0F51><U0F74>"
-+collating-element <rad-da-b-e> from "<U0F56><U0F51><U0F7A>"
-+collating-element <rad-da-b-o> from "<U0F56><U0F51><U0F7C>"
-+collating-element <rad-da-m-ga> from "<U0F58><U0F51><U0F42>"
-+collating-element <rad-da-m-nga> from "<U0F58><U0F51><U0F44>"
-+collating-element <rad-da-m-na> from "<U0F58><U0F51><U0F53>"
-+collating-element <rad-da-m--a> from "<U0F58><U0F51><U0F60>"
-+collating-element <rad-da-m-ra> from "<U0F58><U0F51><U0F62>"
-+collating-element <rad-da-m-u> from "<U0F58><U0F51><U0F74>"
-+collating-element <rad-da-m-e> from "<U0F58><U0F51><U0F7A>"
-+collating-element <rad-da-m-o> from "<U0F58><U0F51><U0F7C>"
-+collating-element <rad-da-a-ga> from "<U0F60><U0F51><U0F42>"
-+collating-element <rad-da-a-nga> from "<U0F60><U0F51><U0F44>"
-+collating-element <rad-da-a-da> from "<U0F60><U0F51><U0F51>"
-+collating-element <rad-da-a-na> from "<U0F60><U0F51><U0F53>"
-+collating-element <rad-da-a-ba> from "<U0F60><U0F51><U0F56>"
-+collating-element <rad-da-a-ma> from "<U0F60><U0F51><U0F58>"
-+collating-element <rad-da-a-ma2> from "<U0F60><U0F51><U0F7E>"
-+collating-element <rad-da-a-wa> from "<U0F60><U0F51><U0F5D>"
-+collating-element <rad-da-a--a> from "<U0F60><U0F51><U0F60>"
-+collating-element <rad-da-a-ra> from "<U0F60><U0F51><U0F62>"
-+collating-element <rad-da-a-la> from "<U0F60><U0F51><U0F63>"
-+collating-element <rad-da-a-sa> from "<U0F60><U0F51><U0F66>"
-+collating-element <rad-da-a-u> from "<U0F60><U0F51><U0F74>"
-+collating-element <rad-da-a-e> from "<U0F60><U0F51><U0F7A>"
-+collating-element <rad-da-a-o> from "<U0F60><U0F51><U0F7C>"
-+collating-element <rad-da-a-_ra> from "<U0F60><U0F51><U0FB2>"
-+collating-element <rad-da-r> from "<U0F62><U0FA1>"
-+collating-element <rad-da-l> from "<U0F63><U0FA1>"
-+collating-element <rad-da-s> from "<U0F66><U0FA1>"
-+collating-element <rad-da-b-r> from "<U0F56><U0F62><U0FA1>"
-+collating-element <rad-da-b-l> from "<U0F56><U0F63><U0FA1>"
-+collating-element <rad-da-b-s> from "<U0F56><U0F66><U0FA1>"
-+
-+% na-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-na-*> are in fact double elements: the na-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-NA-R_G> % ambiguous
-+collating-symbol <TIB-NA-R_M> % ambiguous
-+collating-symbol <TIB-NA-R_R>
-+collating-symbol <TIB-NA-R_S>
-+collating-symbol <TIB-NA-R_BR>
-+collating-symbol <TIB-NA-R_BS>
-+collating-element <rad-na-g-ga> from "<U0F42><U0F53><U0F42>"
-+collating-element <rad-na-g-nga> from "<U0F42><U0F53><U0F44>"
-+collating-element <rad-na-g-da> from "<U0F42><U0F53><U0F51>"
-+collating-element <rad-na-g-na> from "<U0F42><U0F53><U0F53>"
-+collating-element <rad-na-g-ma> from "<U0F42><U0F53><U0F58>"
-+collating-element <rad-na-g-ma2> from "<U0F42><U0F53><U0F7E>"
-+collating-element <rad-na-g-wa> from "<U0F42><U0F53><U0F5D>"
-+collating-element <rad-na-g--a> from "<U0F42><U0F53><U0F60>"
-+collating-element <rad-na-g-sa> from "<U0F42><U0F53><U0F66>"
-+collating-element <rad-na-g-u> from "<U0F42><U0F53><U0F74>"
-+collating-element <rad-na-g-o> from "<U0F42><U0F53><U0F7C>"
-+collating-element <rad-na-m-ga> from "<U0F58><U0F53><U0F42>"
-+collating-element <rad-na-m-nga> from "<U0F58><U0F53><U0F44>"
-+collating-element <rad-na-m-na> from "<U0F58><U0F53><U0F53>"
-+collating-element <rad-na-m-ba> from "<U0F58><U0F53><U0F56>"
-+collating-element <rad-na-m-ma> from "<U0F58><U0F53><U0F58>"
-+collating-element <rad-na-m-ma2> from "<U0F58><U0F53><U0F7E>"
-+collating-element <rad-na-m--a> from "<U0F58><U0F53><U0F60>"
-+collating-element <rad-na-m-ra> from "<U0F58><U0F53><U0F62>"
-+collating-element <rad-na-m-la> from "<U0F58><U0F53><U0F63>"
-+collating-element <rad-na-m-u> from "<U0F58><U0F53><U0F74>"
-+collating-element <rad-na-m-e> from "<U0F58><U0F53><U0F7A>"
-+collating-element <rad-na-m-o> from "<U0F58><U0F53><U0F7C>"
-+collating-element <rad-na-r> from "<U0F62><U0FA3>"
-+collating-element <rad-na-s> from "<U0F66><U0FA3>"
-+collating-element <rad-na-b-r> from "<U0F56><U0F62><U0FA3>"
-+collating-element <rad-na-b-s> from "<U0F56><U0F66><U0FA3>"
-+
-+% pa-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-pa-*> are in fact double elements: the pa-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-PA-R_D> % ambiguous in Dzongkha
-+collating-symbol <TIB-PA-R_L>
-+collating-symbol <TIB-PA-R_S>
-+collating-element <rad-pa-d-ga> from "<U0F51><U0F54><U0F42>"
-+collating-element <rad-pa-d-nga> from "<U0F51><U0F54><U0F44>"
-+collating-element <rad-pa-d-da> from "<U0F51><U0F54><U0F51>"
-+collating-element <rad-pa-d--a> from "<U0F51><U0F54><U0F60>"
-+collating-element <rad-pa-d-ra> from "<U0F51><U0F54><U0F62>"
-+collating-element <rad-pa-d-la> from "<U0F51><U0F54><U0F63>"
-+collating-element <rad-pa-d-sa> from "<U0F51><U0F54><U0F66>"
-+collating-element <rad-pa-d-u> from "<U0F51><U0F54><U0F74>"
-+collating-element <rad-pa-d-e> from "<U0F51><U0F54><U0F7A>"
-+collating-element <rad-pa-d-o-ga> from "<U0F51><U0F54><U0F7C><U0F42>"
-+collating-element <rad-pa-d-o-nga> from "<U0F51><U0F54><U0F7C><U0F44>"
-+collating-element <rad-pa-d-o-da> from "<U0F51><U0F54><U0F7C><U0F51>"
-+collating-element <rad-pa-d-o-na> from "<U0F51><U0F54><U0F7C><U0F53>"
-+collating-element <rad-pa-d-o-ra> from "<U0F51><U0F54><U0F7C><U0F62>"
-+collating-element <rad-pa-d-_ya> from "<U0F51><U0F54><U0FB1>"
-+collating-element <rad-pa-d-_ra> from "<U0F51><U0F54><U0FB2>"
-+collating-element <rad-pa-l> from "<U0F63><U0FA4>"
-+collating-element <rad-pa-s> from "<U0F66><U0FA4>"
-+
-+% pha-radicals
-+collating-symbol <TIB-PHA-R_A>
-+collating-element <rad-pha-a> from "<U0F60><U0F55>"
-+
-+% ba-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-ba-*> are in fact double elements: the ba-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-BA-R_D> % ambiguous
-+collating-symbol <TIB-BA-R_A> % ambiguous
-+collating-symbol <TIB-BA-R_R>
-+collating-symbol <TIB-BA-R_L>
-+collating-symbol <TIB-BA-R_S>
-+collating-element <rad-ba-d-ga> from "<U0F51><U0F56><U0F42>"
-+collating-element <rad-ba-d-nga> from "<U0F51><U0F56><U0F44>"
-+collating-element <rad-ba-d-da> from "<U0F51><U0F56><U0F51>"
-+collating-element <rad-ba-d-na> from "<U0F51><U0F56><U0F53>"
-+collating-element <rad-ba-d-ba> from "<U0F51><U0F56><U0F56>"
-+collating-element <rad-ba-d--a> from "<U0F51><U0F56><U0F60>"
-+collating-element <rad-ba-d-ra> from "<U0F51><U0F56><U0F62>"
-+collating-element <rad-ba-d-la> from "<U0F51><U0F56><U0F63>"
-+collating-element <rad-ba-d-sa> from "<U0F51><U0F56><U0F66>"
-+collating-element <rad-ba-d-u> from "<U0F51><U0F56><U0F74>"
-+collating-element <rad-ba-d-e> from "<U0F51><U0F56><U0F7A>"
-+collating-element <rad-ba-d-o> from "<U0F51><U0F56><U0F7C>"
-+collating-element <rad-ba-d-_ya> from "<U0F51><U0F56><U0FB1>"
-+collating-element <rad-ba-d-_ra> from "<U0F51><U0F56><U0FB2>"
-+collating-element <rad-ba-a-ga> from "<U0F60><U0F56><U0F42>"
-+collating-element <rad-ba-a-nga> from "<U0F60><U0F56><U0F44>"
-+collating-element <rad-ba-a-da> from "<U0F60><U0F56><U0F51>"
-+collating-element <rad-ba-a-na> from "<U0F60><U0F56><U0F53>"
-+collating-element <rad-ba-a-ba> from "<U0F60><U0F56><U0F56>"
-+collating-element <rad-ba-a-ma> from "<U0F60><U0F56><U0F58>"
-+collating-element <rad-ba-a-ma2> from "<U0F60><U0F56><U0F7E>"
-+collating-element <rad-ba-a--a> from "<U0F60><U0F56><U0F60>"
-+collating-element <rad-ba-a-ra> from "<U0F60><U0F56><U0F62>"
-+collating-element <rad-ba-a-la> from "<U0F60><U0F56><U0F63>"
-+collating-element <rad-ba-a-i> from "<U0F60><U0F56><U0F72>"
-+collating-element <rad-ba-a-u> from "<U0F60><U0F56><U0F74>"
-+collating-element <rad-ba-a-e> from "<U0F60><U0F56><U0F7A>"
-+collating-element <rad-ba-a-o> from "<U0F60><U0F56><U0F7C>"
-+collating-element <rad-ba-a-_ya> from "<U0F60><U0F56><U0FB1>"
-+collating-element <rad-ba-a-_ra> from "<U0F60><U0F56><U0FB2>"
-+collating-element <rad-ba-r> from "<U0F62><U0FA6>"
-+collating-element <rad-ba-l> from "<U0F63><U0FA6>"
-+collating-element <rad-ba-s> from "<U0F66><U0FA6>"
-+
-+% ma-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-ma-*> are in fact double elements: the ma-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-MA-R_D> % ambiguous
-+collating-symbol <TIB-MA-R_R>
-+collating-symbol <TIB-MA-R_S>
-+collating-element <rad-ma-d-ga> from "<U0F51><U0F58><U0F42>"
-+collating-element <rad-ma-d-nga> from "<U0F51><U0F58><U0F44>"
-+collating-element <rad-ma-d-na> from "<U0F51><U0F58><U0F53>"
-+collating-element <rad-ma-d-wa> from "<U0F51><U0F58><U0F5D>"
-+collating-element <rad-ma-d--a> from "<U0F51><U0F58><U0F60>"
-+collating-element <rad-ma-d-ra> from "<U0F51><U0F58><U0F62>"
-+collating-element <rad-ma-d-sa> from "<U0F51><U0F58><U0F66>"
-+collating-element <rad-ma-d-i> from "<U0F51><U0F58><U0F72>"
-+collating-element <rad-ma-d-u> from "<U0F51><U0F58><U0F74>"
-+collating-element <rad-ma-d-e> from "<U0F51><U0F58><U0F7A>"
-+collating-element <rad-ma-d-o-da> from "<U0F51><U0F58><U0F7C><U0F51>"
-+collating-element <rad-ma-d-_ya> from "<U0F51><U0F58><U0FB1>"
-+collating-element <rad-ma-r> from "<U0F62><U0FA8>"
-+collating-element <rad-ma-s> from "<U0F66><U0FA8>"
-+
-+% tsa-radicals
-+collating-symbol <TIB-TSA-R_G>
-+collating-symbol <TIB-TSA-R_B>
-+collating-symbol <TIB-TSA-R_R>
-+collating-symbol <TIB-TSA-R_S>
-+collating-symbol <TIB-TSA-R_BR>
-+collating-symbol <TIB-TSA-R_BS>
-+collating-element <rad-tsa-g> from "<U0F42><U0F59>"
-+collating-element <rad-tsa-b> from "<U0F56><U0F59>"
-+collating-element <rad-tsa-r> from "<U0F62><U0FA9>"
-+collating-element <rad-tsa-s> from "<U0F66><U0FA9>"
-+collating-element <rad-tsa-b-r> from "<U0F56><U0F62><U0FA9>"
-+collating-element <rad-tsa-b-s> from "<U0F56><U0F66><U0FA9>"
-+
-+% tsha-radicals
-+collating-symbol <TIB-TSHA-R_M>
-+collating-symbol <TIB-TSHA-R_A>
-+collating-element <rad-tsha-m> from "<U0F58><U0F5A>"
-+collating-element <rad-tsha-a> from "<U0F60><U0F5A>"
-+
-+% dza-radicals
-+collating-symbol <TIB-DZA-R_M>
-+collating-symbol <TIB-DZA-R_A>
-+collating-symbol <TIB-DZA-R_R>
-+collating-symbol <TIB-DZA-R_BR>
-+collating-element <rad-dza-m> from "<U0F58><U0F5B>"
-+collating-element <rad-dza-a> from "<U0F60><U0F5B>"
-+collating-element <rad-dza-r> from "<U0F60><U0FAB>"
-+collating-element <rad-dza-b-r> from "<U0F56><U0F62><U0FAB>"
-+
-+% zha-radicals
-+collating-symbol <TIB-ZHA-R_G>
-+collating-symbol <TIB-ZHA-R_B>
-+collating-element <rad-zha-g> from "<U0F42><U0F5E>"
-+collating-element <rad-zha-b> from "<U0F56><U0F5E>"
-+
-+% za-radicals
-+collating-symbol <TIB-ZA-R_G>
-+collating-symbol <TIB-ZA-R_B>
-+collating-element <rad-za-g> from "<U0F42><U0F5F>"
-+collating-element <rad-za-b> from "<U0F56><U0F5F>"
-+
-+% ya-radicals
-+collating-symbol <TIB-YA-R_G>
-+collating-element <rad-ya-g> from "<U0F42><U0F61>"
-+
-+% ra-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-ra-*> are in fact double elements: the ra-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-RA-R_B> % ambiguous
-+collating-element <rad-ra-b-la> from "<U0F56><U0F62><U0FB3>"
-+
-+% sha-radicals
-+collating-symbol <TIB-SHA-R_G>
-+collating-symbol <TIB-SHA-R_B>
-+collating-element <rad-sha-g> from "<U0F42><U0F64>"
-+collating-element <rad-sha-b> from "<U0F56><U0F64>"
-+
-+% sa-radicals
-+%       as there are ambiguous, the next letter has to be added too;
-+%       so the <rad-sa-*> are in fact double elements: the sa-radical
-+%       itself, and the following letter.
-+collating-symbol <TIB-SA-R_G> % ambiguous
-+collating-symbol <TIB-SA-R_B> % ambiguous
-+collating-element <rad-sa-g-ga> from "<U0F42><U0F66><U0F42>"
-+collating-element <rad-sa-g-nga> from "<U0F42><U0F66><U0F44>"
-+collating-element <rad-sa-g-da> from "<U0F42><U0F66><U0F51>"
-+collating-element <rad-sa-g-na> from "<U0F42><U0F66><U0F53>"
-+collating-element <rad-sa-g-ba> from "<U0F42><U0F66><U0F56>"
-+collating-element <rad-sa-g--a> from "<U0F42><U0F66><U0F60>"
-+collating-element <rad-sa-g-ra> from "<U0F42><U0F66><U0F62>"
-+collating-element <rad-sa-g-la> from "<U0F42><U0F66><U0F63>"
-+collating-element <rad-sa-g-sa> from "<U0F42><U0F66><U0F66>"
-+collating-element <rad-sa-g-i> from "<U0F42><U0F66><U0F72>"
-+collating-element <rad-sa-g-u> from "<U0F42><U0F66><U0F74>"
-+collating-element <rad-sa-g-e> from "<U0F42><U0F66><U0F7A>"
-+collating-element <rad-sa-g-o> from "<U0F42><U0F66><U0F7C>"
-+collating-element <rad-sa-b-ga> from "<U0F56><U0F66><U0F42>"
-+collating-element <rad-sa-b-nga> from "<U0F56><U0F66><U0F44>"
-+collating-element <rad-sa-b-da> from "<U0F56><U0F66><U0F51>"
-+collating-element <rad-sa-b-ba> from "<U0F56><U0F66><U0F56>"
-+collating-element <rad-sa-b-ma> from "<U0F56><U0F66><U0F58>"
-+collating-element <rad-sa-b-ma2> from "<U0F56><U0F66><U0F7E>"
-+collating-element <rad-sa-b-ra> from "<U0F56><U0F66><U0F62>"
-+collating-element <rad-sa-b-la> from "<U0F56><U0F66><U0F63>"
-+collating-element <rad-sa-b-i> from "<U0F56><U0F66><U0F72>"
-+collating-element <rad-sa-b-u> from "<U0F56><U0F66><U0F74>"
-+collating-element <rad-sa-b-e> from "<U0F56><U0F66><U0F7A>"
-+collating-element <rad-sa-b-o> from "<U0F56><U0F66><U0F7C>"
-+collating-element <rad-sa-b-_wa> from "<U0F56><U0F66><U0FAD>"
-+collating-element <rad-sa-b-_ra> from "<U0F56><U0F66><U0FB2>"
-+collating-element <rad-sa-b-_la> from "<U0F56><U0F66><U0FB3>"
-+
-+% ha-radicals
-+collating-symbol <TIB-HA-R_L>
-+collating-element <rad-ha-l> from "<U0F63><U0FB7>"
-+
-+% generic definitions
-+reorder-after <AME>
-+<NOM>
-+<SUB>
-+
-+reorder-after <DTT>
-+<PCT>
-+<MAC>
-+<VAR>
-+<R_G>
-+<R_D>
-+<R_B>
-+<R_M>
-+<R_A>
-+<R_R>
-+<R_L>
-+<R_S>
-+<R_BR>
-+<R_BL>
-+<R_BS>
-+
-+% a better place than after cyrillic ya should be defined
-+reorder-after <CYR-YA>
-+<TIB-KA>
-+<TIB-KA-R_D>
-+<TIB-KA-R_B>
-+<TIB-KA-R_R>
-+<TIB-KA-R_L>
-+<TIB-KA-R_S>
-+<TIB-KA-R_BR>
-+<TIB-KA-R_BS>
-+<TIB-KHA>
-+<TIB-KHA-R_M>
-+<TIB-KHA-R_A>
-+<TIB-GA>
-+<TIB-GA-R_D>
-+<TIB-GA-R_B>
-+<TIB-GA-R_M>
-+<TIB-GA-R_A>
-+<TIB-GA-R_R>
-+<TIB-GA-R_L>
-+<TIB-GA-R_S>
-+<TIB-GA-R_BR>
-+<TIB-GA-R_BS>
-+<TIB-NGA>
-+<TIB-NGA-R_D>
-+<TIB-NGA-R_M>
-+<TIB-NGA-R_R>
-+<TIB-NGA-R_L>
-+<TIB-NGA-R_S>
-+<TIB-NGA-R_BR>
-+<TIB-NGA-R_BS>
-+<TIB-CA>
-+<TIB-CA-R_G>
-+<TIB-CA-R_B>
-+<TIB-CA-R_L>
-+<TIB-CA-R_BL>
-+<TIB-CHA>
-+<TIB-CHA-R_M>
-+<TIB-CHA-R_A>
-+<TIB-JA>
-+<TIB-JA-R_M>
-+<TIB-JA-R_A>
-+<TIB-JA-R_R>
-+<TIB-JA-R_L>
-+<TIB-JA-R_BR>
-+<TIB-NYA>
-+<TIB-NYA-R_G>
-+<TIB-NYA-R_M>
-+<TIB-NYA-R_R>
-+<TIB-NYA-R_S>
-+<TIB-NYA-R_BR>
-+<TIB-NYA-R_BS>
-+<TIB-TA>
-+<TIB-TA-R_G>
-+<TIB-TA-R_B>
-+<TIB-TA-R_R>
-+<TIB-TA-R_L>
-+<TIB-TA-R_S>
-+<TIB-TA-R_BR>
-+<TIB-TA-R_BL>
-+<TIB-TA-R_BS>
-+<TIB-THA>
-+<TIB-THA-R_M>
-+<TIB-THA-R_A>
-+<TIB-DA>
-+<TIB-DA-R_G>
-+<TIB-DA-R_B>
-+<TIB-DA-R_M>
-+<TIB-DA-R_A>
-+<TIB-DA-R_R>
-+<TIB-DA-R_L>
-+<TIB-DA-R_S>
-+<TIB-DA-R_BR>
-+<TIB-DA-R_BL>
-+<TIB-DA-R_BS>
-+<TIB-NA>
-+<TIB-NA-R_G>
-+<TIB-NA-R_M>
-+<TIB-NA-R_R>
-+<TIB-NA-R_S>
-+<TIB-NA-R_BR>
-+<TIB-NA-R_BS>
-+<TIB-PA>
-+<TIB-PA-R_D>
-+<TIB-PA-R_L>
-+<TIB-PA-R_S>
-+<TIB-PHA>
-+<TIB-PHA-R_A>
-+<TIB-BA>
-+<TIB-BA-R_D>
-+<TIB-BA-R_A>
-+<TIB-BA-R_R>
-+<TIB-BA-R_L>
-+<TIB-BA-R_S>
-+<TIB-MA>
-+<TIB-MA-R_D>
-+<TIB-MA-R_R>
-+<TIB-MA-R_S>
-+<TIB-TSA>
-+<TIB-TSA-R_G>
-+<TIB-TSA-R_B>
-+<TIB-TSA-R_R>
-+<TIB-TSA-R_S>
-+<TIB-TSA-R_BR>
-+<TIB-TSA-R_BS>
-+<TIB-TSHA>
-+<TIB-TSHA-R_M>
-+<TIB-TSHA-R_A>
-+<TIB-DZA>
-+<TIB-DZA-R_M>
-+<TIB-DZA-R_A>
-+<TIB-DZA-R_R>
-+<TIB-DZA-R_BR>
-+<TIB-WA>
-+<TIB-ZHA>
-+<TIB-ZHA-R_G>
-+<TIB-ZHA-R_B>
-+<TIB-ZA>
-+<TIB-ZA-R_G>
-+<TIB-ZA-R_B>
-+<TIB--A>
-+<TIB-YA>
-+<TIB-YA-R_G>
-+<TIB-RA>
-+<TIB-RA-R_B>
-+<TIB-LA>
-+<TIB-SHA>
-+<TIB-SHA-R_G>
-+<TIB-SHA-R_B>
-+<TIB-SA>
-+<TIB-SA-R_G>
-+<TIB-SA-R_B>
-+<TIB-HA>
-+<TIB-HA-R_L>
-+<TIB-A>
-+<TIB-I>
-+<TIB-U>
-+<TIB-E>
-+<TIB-O>
-+
-+%order_start <TIBETAN>;forward;forward;forward;forward,position
-+
-+% specific definitions
-+reorder-after <U042F>
-+% digits
-+<U0F20>      <0>;<BAS>;IGNORE;IGNORE
-+<U0F33>      <0>;<VAR>;IGNORE;IGNORE
-+<U0F21>      <1>;<BAS>;IGNORE;IGNORE
-+<U0F2A>      <1>;<VAR>;IGNORE;IGNORE
-+<U0F22>      <2>;<BAS>;IGNORE;IGNORE
-+<U0F2B>      <2>;<VAR>;IGNORE;IGNORE
-+<U0F23>      <3>;<BAS>;IGNORE;IGNORE
-+<U0F2C>      <3>;<VAR>;IGNORE;IGNORE
-+<U0F24>      <4>;<BAS>;IGNORE;IGNORE
-+<U0F2D>      <4>;<VAR>;IGNORE;IGNORE
-+<U0F25>      <5>;<BAS>;IGNORE;IGNORE
-+<U0F2E>      <5>;<VAR>;IGNORE;IGNORE
-+<U0F26>      <6>;<BAS>;IGNORE;IGNORE
-+<U0F2F>      <6>;<VAR>;IGNORE;IGNORE
-+<U0F27>      <7>;<BAS>;IGNORE;IGNORE
-+<U0F30>      <7>;<VAR>;IGNORE;IGNORE
-+<U0F28>      <8>;<BAS>;IGNORE;IGNORE
-+<U0F31>      <8>;<VAR>;IGNORE;IGNORE
-+<U0F29>      <9>;<BAS>;IGNORE;IGNORE
-+<U0F32>      <9>;<VAR>;IGNORE;IGNORE
-+
-+% letters
-+<U0F40>        <TIB-KA>;<BAS>;<NOM>;IGNORE % ka
-+<U0F90>        <TIB-KA>;<BAS>;<SUB>;IGNORE
-+<U0F69>        "<TIB-KA><TIB-SHA>";"<BAS><VAR>";"<NOM><SUB>";IGNORE % kssa
-+<U0FB9>        "<TIB-KA><TIB-SHA>";"<BAS><VAR>";"<SUB><SUB>";IGNORE
-+<rad-ka-d>     <TIB-KA-R_D>;<R_D>;<NOM>;IGNORE
-+<rad-ka-b>     <TIB-KA-R_B>;<R_B>;<NOM>;IGNORE
-+<rad-ka-r>     <TIB-KA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ka-l>     <TIB-KA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ka-s>     <TIB-KA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-ka-b-r>   <TIB-KA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-ka-b-s>   <TIB-KA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F41>        <TIB-KHA>;<BAS>;<NOM>;IGNORE % kha
-+<U0F91>        <TIB-KHA>;<BAS>;<SUB>;IGNORE
-+<rad-kha-m>    <TIB-KHA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-kha-a>    <TIB-KHA-R_A>;<R_A>;<NOM>;IGNORE
-+<U0F42>        <TIB-GA>;<BAS>;<NOM>;IGNORE % ga
-+<U0F92>        <TIB-GA>;<BAS>;<SUB>;IGNORE
-+<U0F43>        "<TIB-GA><TIB-HA>";"<BAS><BAS>";"<NOM><SUB>";IGNORE % gha
-+<U0F93>        "<TIB-GA><TIB-HA>";"<BAS><BAS>";"<SUB><SUB>";IGNORE
-+<rad-ga-d-ga>  "<TIB-GA-R_D><TIB-GA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-nga> "<TIB-GA-R_D><TIB-NGA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-da>  "<TIB-GA-R_D><TIB-DA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-ba>  "<TIB-GA-R_D><TIB-BA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d--a>  "<TIB-GA-R_D><TIB--A>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-wa>  "<TIB-GA-R_D><TIB-WA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-ra>  "<TIB-GA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-la>  "<TIB-GA-R_D><TIB-LA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-sa>  "<TIB-GA-R_D><TIB-SA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-u>   "<TIB-GA-R_D><TIB-U>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-e>   "<TIB-GA-R_D><TIB-E>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-d-_ya> "<TIB-GA-R_D><TIB-YA>";"<R_D><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-d-_ra> "<TIB-GA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-b-ga>  "<TIB-GA-R_B><TIB-GA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-da>  "<TIB-GA-R_B><TIB-DA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-ma>  "<TIB-GA-R_B><TIB-MA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-ma2> "<TIB-GA-R_B><TIB-MA>";"<R_B><VAR>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-wa>  "<TIB-GA-R_B><TIB-WA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b--a>  "<TIB-GA-R_B><TIB--A>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-ra>  "<TIB-GA-R_B><TIB-RA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-e>   "<TIB-GA-R_B><TIB-E>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-o>   "<TIB-GA-R_B><TIB-O>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-b-_ya> "<TIB-GA-R_B><TIB-YA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-b-_ra> "<TIB-GA-R_B><TIB-RA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-b-_la> "<TIB-GA-R_B><TIB-LA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-m-ra>  "<TIB-GA-R_M><TIB-RA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-m-la>  "<TIB-GA-R_M><TIB-LA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-m-u>   "<TIB-GA-R_M><TIB-U>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-m-e>   "<TIB-GA-R_M><TIB-E>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-m-o>   "<TIB-GA-R_M><TIB-O>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-m-_ya> "<TIB-GA-R_M><TIB-YA>";"<R_M><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-m-_ra> "<TIB-GA-R_M><TIB-RA>";"<R_M><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-a-ga>  "<TIB-GA-R_A><TIB-GA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-nga> "<TIB-GA-R_A><TIB-NGA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-da>  "<TIB-GA-R_A><TIB-DA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-na>  "<TIB-GA-R_A><TIB-NA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-ba>  "<TIB-GA-R_A><TIB-BA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-ma>  "<TIB-GA-R_A><TIB-MA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-ma2> "<TIB-GA-R_A><TIB-MA>";"<R_A><VAR>";"<NOM><NOM>";IGNORE
-+<rad-ga-a--a>  "<TIB-GA-R_A><TIB--A>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-ra>  "<TIB-GA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-la>  "<TIB-GA-R_A><TIB-LA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-sa>  "<TIB-GA-R_A><TIB-SA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-i>   "<TIB-GA-R_A><TIB-I>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-u>   "<TIB-GA-R_A><TIB-U>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-e>   "<TIB-GA-R_A><TIB-E>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-o>   "<TIB-GA-R_A><TIB-O>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ga-a-_ya> "<TIB-GA-R_A><TIB-YA>";"<R_A><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-a-_ra> "<TIB-GA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ga-r>     <TIB-GA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ga-l>     <TIB-GA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ga-s>     <TIB-GA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-ga-b-r>   <TIB-GA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-ga-b-s>   <TIB-GA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F44>        <TIB-NGA>;<BAS>;<NOM>;IGNORE % nga
-+<U0F94>        <TIB-NGA>;<BAS>;<SUB>;IGNORE
-+<rad-nga-d-ga> "<TIB-NGA-R_D><TIB-GA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-d-nga> "<TIB-NGA-R_D><TIB-NGA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-d-na> "<TIB-NGA-R_D><TIB-NA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-d-ra> "<TIB-NGA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-d-u>  "<TIB-NGA-R_D><TIB-U>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-d-o>  "<TIB-NGA-R_D><TIB-O>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m-ga> "<TIB-NGA-R_M><TIB-GA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m-na> "<TIB-NGA-R_M><TIB-NA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m--a> "<TIB-NGA-R_M><TIB--A>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m-ra> "<TIB-NGA-R_M><TIB-RA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m-la> "<TIB-NGA-R_M><TIB-LA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-m-o>  "<TIB-NGA-R_M><TIB-O>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-nga-r>     <TIB-NGA-R_R>;<BAS>;<R_R>;IGNORE
-+<rad-nga-l>     <TIB-NGA-R_L>;<BAS>;<R_L>;IGNORE
-+<rad-nga-s>     <TIB-NGA-R_S>;<BAS>;<R_S>;IGNORE
-+<rad-nga-b-r>   <TIB-NGA-R_BR>;<BAS>;<R_BR>;IGNORE
-+<rad-nga-b-s>   <TIB-NGA-R_BS>;<BAS>;<R_BS>;IGNORE
-+<U0F45>        <TIB-CA>;<BAS>;<NOM>;IGNORE % ca
-+<U0F95>        <TIB-CA>;<BAS>;<SUB>;IGNORE
-+<rad-ca-g>     <TIB-CA>;<R_G>;<NOM>;IGNORE
-+<rad-ca-b>     <TIB-CA>;<R_B>;<NOM>;IGNORE
-+<rad-ca-l>     <TIB-CA>;<R_L>;<SUB>;IGNORE
-+<rad-ca-b-l>   <TIB-CA>;<R_BL>;<SUB>;IGNORE
-+<U0F46>        <TIB-CHA>;<BAS>;<NOM>;IGNORE % cha
-+<U0F96>        <TIB-CHA>;<BAS>;<SUB>;IGNORE
-+<rad-cha-m>    <TIB-CHA>;<R_M>;<NOM>;IGNORE
-+<rad-cha-a>    <TIB-CHA>;<R_A>;<NOM>;IGNORE
-+<U0F47>        <TIB-JA>;<BAS>;<NOM>;IGNORE % ja
-+<U0F97>        <TIB-JA>;<BAS>;<SUB>;IGNORE
-+<rad-ja-m>     <TIB-JA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-ja-a>     <TIB-JA-R_A>;<R_A>;<NOM>;IGNORE
-+<rad-ja-r>     <TIB-JA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ja-l>     <TIB-JA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ja-b-r>   <TIB-JA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<U0F49>        <TIB-NYA>;<BAS>;<NOM>;IGNORE % nya
-+<U0F99>        <TIB-NYA>;<BAS>;<SUB>;IGNORE
-+<rad-nya-g>    <TIB-NYA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-nya-m>    <TIB-NYA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-nya-r>    <TIB-NYA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-nya-s>    <TIB-NYA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-nya-b-r>  <TIB-NYA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-nya-b-s>  <TIB-NYA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F4F>        <TIB-TA>;<BAS>;<NOM>;IGNORE % ta
-+<U0F9F>        <TIB-TA>;<BAS>;<SUB>;IGNORE
-+<U0F4A>        <TIB-TA>;<VAR>;<NOM>;IGNORE % tta
-+<U0F9A>        <TIB-TA>;<VAR>;<SUB>;IGNORE
-+<rad-ta-g>     <TIB-TA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-ta-b>     <TIB-TA-R_B>;<R_B>;<NOM>;IGNORE
-+<rad-ta-r>     <TIB-TA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ta-l>     <TIB-TA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ta-s>     <TIB-TA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-ta-b-r>   <TIB-TA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-ta-b-l>   <TIB-TA-R_BL>;<R_BL>;<SUB>;IGNORE
-+<rad-ta-b-s>   <TIB-TA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F50>        <TIB-THA>;<BAS>;<NOM>;IGNORE % tha
-+<U0FA0>        <TIB-THA>;<BAS>;<SUB>;IGNORE
-+<U0F4B>        <TIB-THA>;<VAR>;<NOM>;IGNORE % ttha
-+<U0F9B>        <TIB-THA>;<VAR>;<SUB>;IGNORE
-+<rad-tha-m>    <TIB-THA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-tha-a>    <TIB-THA-R_A>;<R_A>;<NOM>;IGNORE
-+<U0F51>        <TIB-DA>;<BAS>;<NOM>;IGNORE % da
-+<U0FA1>        <TIB-DA>;<BAS>;<SUB>;IGNORE
-+<U0F4C>        <TIB-DA>;<VAR>;<NOM>;IGNORE % dda
-+<U0F9C>        <TIB-DA>;<VAR>;<SUB>;IGNORE
-+<U0F52>        "<TIB-DA><TIB-HA>";"<BAS><BAS>";"<NOM><SUB>";IGNORE % dha
-+<U0FA2>        "<TIB-DA><TIB-HA>";"<BAS><BAS>";"<SUB><SUB>";IGNORE
-+<U0F4D>        "<TIB-DA><TIB-HA>";"<VAR><BAS>";"<NOM><SUB>";IGNORE % ddha
-+<U0F9D>        "<TIB-DA><TIB-HA>";"<VAR><BAS>";"<SUB><SUB>";IGNORE
-+<rad-da-g-ga>  "<TIB-DA-R_G><TIB-GA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-nga> "<TIB-DA-R_G><TIB-NGA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-na>  "<TIB-DA-R_G><TIB-NA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-ba>  "<TIB-DA-R_G><TIB-BA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-ma>  "<TIB-DA-R_G><TIB-MA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-ma2> "<TIB-DA-R_G><TIB-MA>";"<R_G><VAR>";"<NOM><NOM>";IGNORE
-+<rad-da-g--a>  "<TIB-DA-R_G><TIB--A>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-ra>  "<TIB-DA-R_G><TIB-RA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-la>  "<TIB-DA-R_G><TIB-LA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-sa>  "<TIB-DA-R_G><TIB-SA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-i>   "<TIB-DA-R_G><TIB-I>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-u>   "<TIB-DA-R_G><TIB-U>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-e>   "<TIB-DA-R_G><TIB-E>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-g-o>   "<TIB-DA-R_G><TIB-O>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-ga>  "<TIB-DA-R_B><TIB-GA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-ma>  "<TIB-DA-R_B><TIB-MA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-ma2> "<TIB-DA-R_B><TIB-MA>";"<R_B><VAR>";"<NOM><NOM>";IGNORE
-+<rad-da-b--a>  "<TIB-DA-R_B><TIB--A>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-ra>  "<TIB-DA-R_B><TIB-RA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-la>  "<TIB-DA-R_B><TIB-LA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-sa>  "<TIB-DA-R_B><TIB-SA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-u>   "<TIB-DA-R_B><TIB-U>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-e>   "<TIB-DA-R_B><TIB-E>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-b-o>   "<TIB-DA-R_B><TIB-O>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-ga>  "<TIB-DA-R_M><TIB-GA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-nga> "<TIB-DA-R_M><TIB-NGA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-na>  "<TIB-DA-R_M><TIB-NA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m--a>  "<TIB-DA-R_M><TIB--A>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-ra>  "<TIB-DA-R_M><TIB-RA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-u>   "<TIB-DA-R_M><TIB-U>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-e>   "<TIB-DA-R_M><TIB-E>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-m-o>   "<TIB-DA-R_M><TIB-O>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-ga>  "<TIB-DA-R_A><TIB-GA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-nga> "<TIB-DA-R_A><TIB-NGA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-da>  "<TIB-DA-R_A><TIB-DA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-na>  "<TIB-DA-R_A><TIB-NA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-ba>  "<TIB-DA-R_A><TIB-BA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-ma>  "<TIB-DA-R_A><TIB-MA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-ma2> "<TIB-DA-R_A><TIB-MA>";"<R_A><VAR>";"<NOM><NOM>";IGNORE
-+<rad-da-a-wa>  "<TIB-DA-R_A><TIB-WA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a--a>  "<TIB-DA-R_A><TIB--A>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-ra>  "<TIB-DA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-la>  "<TIB-DA-R_A><TIB-LA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-sa>  "<TIB-DA-R_A><TIB-SA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-u>   "<TIB-DA-R_A><TIB-U>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-e>   "<TIB-DA-R_A><TIB-E>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-o>   "<TIB-DA-R_A><TIB-O>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-a-_ra> "<TIB-DA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-da-r>     <TIB-DA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-da-l>     <TIB-DA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-da-s>     <TIB-DA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-da-b-r>   <TIB-DA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-da-b-l>   <TIB-DA-R_BL>;<R_BL>;<SUB>;IGNORE
-+<rad-da-b-s>   <TIB-DA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F53>        <TIB-NA>;<BAS>;<NOM>;IGNORE % na
-+<U0FA3>        <TIB-NA>;<BAS>;<SUB>;IGNORE
-+<U0F4E>        <TIB-NA>;<VAR>;<NOM>;IGNORE % nna
-+<U0F9E>        <TIB-NA>;<VAR>;<SUB>;IGNORE
-+<rad-na-g-ga>  "<TIB-NA-R_G><TIB-GA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-nga> "<TIB-NA-R_G><TIB-NGA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-da>  "<TIB-NA-R_G><TIB-DA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-na>  "<TIB-NA-R_G><TIB-NA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-ma>  "<TIB-NA-R_G><TIB-MA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-ma2> "<TIB-NA-R_G><TIB-MA>";"<R_G><VAR>";"<NOM><NOM>";IGNORE
-+<rad-na-g-wa>  "<TIB-NA-R_G><TIB-WA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g--a>  "<TIB-NA-R_G><TIB--A>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-sa>  "<TIB-NA-R_G><TIB-SA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-u>   "<TIB-NA-R_G><TIB-U>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-g-o>   "<TIB-NA-R_G><TIB-O>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-ga>  "<TIB-NA-R_M><TIB-GA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-nga> "<TIB-NA-R_M><TIB-NGA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-na>  "<TIB-NA-R_M><TIB-NA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-ba>  "<TIB-NA-R_M><TIB-BA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-ma>  "<TIB-NA-R_M><TIB-MA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-ma2>  "<TIB-NA-R_M><TIB-MA>";"<R_M><VAR>";"<NOM><NOM>";IGNORE
-+<rad-na-m--a>  "<TIB-NA-R_M><TIB--A>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-ra>  "<TIB-NA-R_M><TIB-RA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-la>  "<TIB-NA-R_M><TIB-LA>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-u>   "<TIB-NA-R_M><TIB-U>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-e>   "<TIB-NA-R_M><TIB-E>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-m-o>   "<TIB-NA-R_M><TIB-O>";"<R_M><BAS>";"<NOM><NOM>";IGNORE
-+<rad-na-r>     <TIB-NA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-na-s>     <TIB-NA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-na-b-r>   <TIB-NA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-na-b-s>   <TIB-NA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F54>        <TIB-PA>;<BAS>;<NOM>;IGNORE % pa
-+<U0FA4>        <TIB-PA>;<BAS>;<SUB>;IGNORE
-+<rad-pa-d-ga>  "<TIB-PA-R_D><TIB-GA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-nga> "<TIB-PA-R_D><TIB-NGA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-da>  "<TIB-PA-R_D><TIB-DA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d--a>  "<TIB-PA-R_D><TIB--A>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-ra>  "<TIB-PA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-la>  "<TIB-PA-R_D><TIB-LA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-sa>  "<TIB-PA-R_D><TIB-SA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-u>   "<TIB-PA-R_D><TIB-U>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-e>   "<TIB-PA-R_D><TIB-E>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-pa-d-o-ga>  "<TIB-PA-R_D><TIB-O><TIB-GA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-pa-d-o-nga> "<TIB-PA-R_D><TIB-O><TIB-NGA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-pa-d-o-da>  "<TIB-PA-R_D><TIB-O><TIB-DA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-pa-d-o-na>  "<TIB-PA-R_D><TIB-O><TIB-NA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-pa-d-o-ra>  "<TIB-PA-R_D><TIB-O><TIB-RA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-pa-d-_ya> "<TIB-PA-R_D><TIB-YA>";"<R_D><VAR>";"<NOM><SUB>";IGNORE
-+<rad-pa-d-_ra> "<TIB-PA-R_D><TIB-RA>";"<R_D><VAR>";"<NOM><SUB>";IGNORE
-+<rad-ta-l>     <TIB-PA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ta-s>     <TIB-PA-R_S>;<R_S>;<SUB>;IGNORE
-+<U0F55>        <TIB-PHA>;<BAS>;<NOM>;IGNORE % pha
-+<U0FA5>        <TIB-PHA>;<BAS>;<SUB>;IGNORE
-+<rad-pha-a>    <TIB-PHA-R_A>;<R_A>;<NOM>;IGNORE
-+<U0F56>        <TIB-BA>;<BAS>;<NOM>;IGNORE % ba
-+<U0FA6>        <TIB-BA>;<BAS>;<SUB>;IGNORE
-+<U0F57>        "<TIB-BA><TIB-HA>";"<BAS><BAS>";"<NOM><SUB>";IGNORE % bha
-+<U0FA7>        "<TIB-BA><TIB-HA>";"<BAS><BAS>";"<SUB><SUB>";IGNORE
-+<rad-ba-d-ga>  "<TIB-BA-R_D><TIB-GA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-nga> "<TIB-BA-R_D><TIB-NGA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-da>  "<TIB-BA-R_D><TIB-DA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-na>  "<TIB-BA-R_D><TIB-NA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-ba>  "<TIB-BA-R_D><TIB-BA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d--a>  "<TIB-BA-R_D><TIB--A>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-ra>  "<TIB-BA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-la>  "<TIB-BA-R_D><TIB-LA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-sa>  "<TIB-BA-R_D><TIB-SA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-u>   "<TIB-BA-R_D><TIB-U>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-e>   "<TIB-BA-R_D><TIB-E>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-o>   "<TIB-BA-R_D><TIB-O>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-d-_ya> "<TIB-BA-R_D><TIB-YA>";"<R_D><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ba-d-_ra> "<TIB-BA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ba-a-ga>  "<TIB-BA-R_A><TIB-GA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-nga> "<TIB-BA-R_A><TIB-NGA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-da>  "<TIB-BA-R_A><TIB-DA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-na>  "<TIB-BA-R_A><TIB-NA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-ba>  "<TIB-BA-R_A><TIB-BA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-ma>  "<TIB-BA-R_A><TIB-MA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-ma2> "<TIB-BA-R_A><TIB-MA>";"<R_A><VAR>";"<NOM><NOM>";IGNORE
-+<rad-ba-a--a>  "<TIB-BA-R_A><TIB--A>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-ra>  "<TIB-BA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-la>  "<TIB-BA-R_A><TIB-LA>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-i>   "<TIB-BA-R_A><TIB-I>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-u>   "<TIB-BA-R_A><TIB-U>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-e>   "<TIB-BA-R_A><TIB-E>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-o>   "<TIB-BA-R_A><TIB-O>";"<R_A><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ba-a-_ya> "<TIB-BA-R_A><TIB-YA>";"<R_A><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ba-a-_ra> "<TIB-BA-R_A><TIB-RA>";"<R_A><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ba-r>     <TIB-BA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ba-l>     <TIB-BA-R_L>;<R_L>;<SUB>;IGNORE
-+<rad-ba-s>     <TIB-BA-R_S>;<R_S>;<SUB>;IGNORE
-+<U0F58>        <TIB-MA>;<BAS>;<NOM>;IGNORE % ma
-+<U0FA8>        <TIB-MA>;<BAS>;<SUB>;IGNORE
-+<U0F7E>        <TIB-MA>;<VAR>;<NOM>;IGNORE %
-+<U0F82>        <TIB-MA>;<VAR>;<SUB>;IGNORE %
-+<U0F83>        <TIB-MA>;<VAR>;<VAR>;IGNORE %
-+<rad-ma-d-ga>  "<TIB-MA-R_D><TIB-GA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-nga> "<TIB-MA-R_D><TIB-NGA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-na>  "<TIB-MA-R_D><TIB-NA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-wa>  "<TIB-MA-R_D><TIB-WA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d--a>  "<TIB-MA-R_D><TIB--A>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-ra>  "<TIB-MA-R_D><TIB-RA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-sa>  "<TIB-MA-R_D><TIB-SA>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-i>   "<TIB-MA-R_D><TIB-I>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-u>   "<TIB-MA-R_D><TIB-U>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-e>   "<TIB-MA-R_D><TIB-E>";"<R_D><BAS>";"<NOM><NOM>";IGNORE
-+<rad-ma-d-o-da> "<TIB-MA-R_D><TIB-O><TIB-DA>";"<R_D><BAS><BAS>";"<NOM><NOM><NOM>";IGNORE
-+<rad-ma-d-_ya> "<TIB-MA-R_D><TIB-YA>";"<R_D><BAS>";"<NOM><SUB>";IGNORE
-+<rad-ma-r>     <TIB-MA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-ma-s>     <TIB-MA-R_S>;<R_S>;<SUB>;IGNORE
-+<U0F59>        <TIB-TSA>;<BAS>;<NOM>;IGNORE % tsa
-+<U0FA9>        <TIB-TSA>;<BAS>;<SUB>;IGNORE
-+<rad-tsa-g>    <TIB-TSA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-tsa-b>    <TIB-TSA-R_B>;<R_B>;<NOM>;IGNORE
-+<rad-tsa-r>    <TIB-TSA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-tsa-s>    <TIB-TSA-R_S>;<R_S>;<SUB>;IGNORE
-+<rad-tsa-b-r>  <TIB-TSA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<rad-tsa-b-s>  <TIB-TSA-R_BS>;<R_BS>;<SUB>;IGNORE
-+<U0F5A>        <TIB-TSHA>;<BAS>;<NOM>;IGNORE % tsha
-+<U0FAA>        <TIB-TSHA>;<BAS>;<SUB>;IGNORE
-+<rad-tsha-m>   <TIB-TSHA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-tsha-a>   <TIB-TSHA-R_A>;<R_A>;<NOM>;IGNORE
-+<U0F5B>        <TIB-DZA>;<BAS>;<NOM>;IGNORE % dza
-+<U0FAB>        <TIB-DZA>;<BAS>;<SUB>;IGNORE
-+<U0F5C>        "<TIB-DZA><TIB-HA>";"<BAS><BAS>";"<NOM><SUB>";IGNORE % dzha
-+<U0FAC>        "<TIB-DZA><TIB-HA>";"<BAS><BAS>";"<SUB><SUB>";IGNORE
-+<rad-dza-m>    <TIB-DZA-R_M>;<R_M>;<NOM>;IGNORE
-+<rad-dza-a>    <TIB-DZA-R_A>;<R_A>;<NOM>;IGNORE
-+<rad-dza-r>    <TIB-DZA-R_R>;<R_R>;<SUB>;IGNORE
-+<rad-dza-b-r>  <TIB-DZA-R_BR>;<R_BR>;<SUB>;IGNORE
-+<U0F5D>        <TIB-WA>;<BAS>;<NOM>;IGNORE % wa
-+<U0FAD>        <TIB-WA>;<BAS>;<SUB>;IGNORE
-+<U0FBA>        <TIB-WA>;<VAR>;<SUB>;IGNORE % fixed wa
-+<U0F5E>        <TIB-ZHA>;<BAS>;<NOM>;IGNORE % zha
-+<U0FAE>        <TIB-ZHA>;<BAS>;<SUB>;IGNORE
-+<rad-zha-g>    <TIB-ZHA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-zha-b>    <TIB-ZHA-R_B>;<R_B>;<NOM>;IGNORE
-+<U0F5F>        <TIB-ZA>;<BAS>;<NOM>;IGNORE % za
-+<U0FAF>        <TIB-ZA>;<BAS>;<SUB>;IGNORE
-+<rad-za-g>     <TIB-ZA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-za-b>     <TIB-ZA-R_B>;<R_B>;<NOM>;IGNORE
-+<U0F60>        <TIB--A>;<BAS>;<NOM>;IGNORE % -a
-+<U0FB0>        <TIB--A>;<BAS>;<SUB>;IGNORE
-+<U0F61>        <TIB-YA>;<BAS>;<NOM>;IGNORE % ya
-+<U0FB1>        <TIB-YA>;<BAS>;<SUB>;IGNORE
-+<U0FBB>        <TIB-YA>;<VAR>;<SUB>;IGNORE % fixed ya
-+<rad-ya-g>     <TIB-YA-R_G>;<R_G>;<NOM>;IGNORE
-+<U0F62>        <TIB-RA>;<BAS>;<NOM>;IGNORE % ra
-+<U0FB2>        <TIB-RA>;<BAS>;<SUB>;IGNORE
-+<U0F6A>        <TIB-RA>;<VAR>;<NOM>;IGNORE % fixed ra
-+<U0FBC>        <TIB-RA>;<VAR>;<SUB>;IGNORE
-+<U0F76>        <TIB-RA>;<BAS>;<VAR>;IGNORE % vocalic r
-+% FIXME; which of the two?
-+<U0F77>        <TIB-RA>;<MAC>;<NOM>;IGNORE % vocalic rr
-+%<U0F77>        "<TIB-RA><TIB-I>";"<BAS><MAC>;"<SUB><VAR>;IGNORE % vocalic rr
-+<rad-ra-b-la>  "<TIB-RA-R_B><TIB-LA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<U0F63>        <TIB-LA>;<BAS>;<NOM>;IGNORE % la
-+<U0FB3>        <TIB-LA>;<BAS>;<SUB>;IGNORE
-+<U0F78>        <TIB-LA>;<BAS>;<VAR>;IGNORE % vocalic l
-+% FIXME; which of the two?
-+<U0F79>        <TIB-LA>;<MAC>;<NOM>;IGNORE % vocalic ll
-+%<U0F79>        "<TIB-LA><TIB-I>";"<BAS><MAC>;"<SUB><VAR>;IGNORE % vocalic ll
-+<U0F64>        <TIB-SHA>;<BAS>;<NOM>;IGNORE % sha
-+<U0FB4>        <TIB-SHA>;<BAS>;<SUB>;IGNORE
-+<U0F65>        <TIB-SHA>;<VAR>;<NOM>;IGNORE % ssa
-+<U0FB5>        <TIB-SHA>;<VAR>;<SUB>;IGNORE
-+<rad-sha-g>    <TIB-SHA-R_G>;<R_G>;<NOM>;IGNORE
-+<rad-sha-b>    <TIB-SHA-R_B>;<R_B>;<NOM>;IGNORE
-+<U0F66>        <TIB-SA>;<BAS>;<NOM>;IGNORE % sa
-+<U0FB6>        <TIB-SA>;<BAS>;<SUB>;IGNORE
-+<rad-sa-g-ga>  "<TIB-SA-R_G><TIB-GA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-nga> "<TIB-SA-R_G><TIB-NGA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-da>  "<TIB-SA-R_G><TIB-DA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-na>  "<TIB-SA-R_G><TIB-NA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-ba>  "<TIB-SA-R_G><TIB-BA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g--a>  "<TIB-SA-R_G><TIB--A>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-ra>  "<TIB-SA-R_G><TIB-RA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-la>  "<TIB-SA-R_G><TIB-LA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-sa>  "<TIB-SA-R_G><TIB-SA>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-i>   "<TIB-SA-R_G><TIB-I>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-u>   "<TIB-SA-R_G><TIB-U>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-e>   "<TIB-SA-R_G><TIB-E>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-g-o>   "<TIB-SA-R_G><TIB-O>";"<R_G><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-ga>  "<TIB-SA-R_B><TIB-GA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-nga> "<TIB-SA-R_B><TIB-NGA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-da>  "<TIB-SA-R_B><TIB-DA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-ba>  "<TIB-SA-R_B><TIB-BA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-ma>  "<TIB-SA-R_B><TIB-MA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-ma2> "<TIB-SA-R_B><TIB-MA>";"<R_B><VAR>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-ra>  "<TIB-SA-R_B><TIB-RA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-la>  "<TIB-SA-R_B><TIB-LA>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-i>   "<TIB-SA-R_B><TIB-I>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-u>   "<TIB-SA-R_B><TIB-U>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-e>   "<TIB-SA-R_B><TIB-E>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-o>   "<TIB-SA-R_B><TIB-O>";"<R_B><BAS>";"<NOM><NOM>";IGNORE
-+<rad-sa-b-_wa> "<TIB-SA-R_B><TIB-WA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<rad-sa-b-_ra> "<TIB-SA-R_B><TIB-RA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<rad-sa-b-_la> "<TIB-SA-R_B><TIB-LA>";"<R_B><BAS>";"<NOM><SUB>";IGNORE
-+<U0F67>        <TIB-HA>;<BAS>;<NOM>;IGNORE % ha
-+<U0FB7>        <TIB-HA>;<BAS>;<SUB>;IGNORE
-+<rad-ha-l>     <TIB-HA-R_L>;<R_L>;<NOM>;IGNORE
-+<U0F68>        <TIB-A>;<BAS>;<NOM>;IGNORE % a
-+<U0FB8>        <TIB-A>;<BAS>;<SUB>;IGNORE
-+
-+% explicit vowels
-+<U0F71> IGNORE;<MAC>;IGNORE;IGNORE % long vowel mark % FIXME
-+<U0F72> <TIB-I>;<BAS>;<NOM>;IGNORE % i
-+<U0F80> <TIB-I>;<BAS>;<VAR>;IGNORE % reversed i
-+<U0F73> <TIB-I>;<MAC>;<NOM>;IGNORE % ii
-+<U0F81> <TIB-I>;<MAC>;<VAR>;IGNORE % reversed ii
-+<U0F74> <TIB-U>;<BAS>;<NOM>;IGNORE % u
-+<U0F75> <TIB-U>;<MAC>;<NOM>;IGNORE % uu
-+<U0F7A> <TIB-E>;<BAS>;<NOM>;IGNORE % e
-+<U0F7B> <TIB-E>;<MAC>;<NOM>;IGNORE % ee
-+<U0F7C> <TIB-O>;<BAS>;<NOM>;IGNORE % o
-+<U0F7D> <TIB-O>;<MAC>;<NOM>;IGNORE % oo
-+
-+% FIXME: 0F39, 0F7F, 0F84, 0F85, 0F86, 0F87, 
-+
-+% FIXME: 0F88, UF89, UF8A, 0F8B
-+<U0F88> IGNORE;<PCT>;IGNORE;IGNORE
-+<U0F89> IGNORE;<PCT>;IGNORE;IGNORE
-+<U0F8A> IGNORE;<PCT>;IGNORE;IGNORE
-+<U0F8B> IGNORE;<PCT>;IGNORE;IGNORE
-+
-+reorder-end
-+
-+END LC_COLLATE
-+
-+LC_MONETARY
-+
-+int_curr_symbol         "BTN "
-+currency_symbol    "<U0F51><U0F44><U0F74><U0F63><U0F0B><U0F40><U0FB2><U0F58><U0F0B>"
-+mon_decimal_point       "."
-+mon_thousands_sep       ","
-+mon_grouping            3;2;
-+positive_sign           ""
-+negative_sign           "-"
-+int_frac_digits         3
-+frac_digits             3
-+p_cs_precedes           1
-+p_sep_by_space          1
-+n_cs_precedes           1
-+n_sep_by_space          1
-+p_sign_posn             4
-+n_sign_posn             4
-+
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+
-+decimal_point           "."
-+thousands_sep           ","
-+grouping                3;2
-+
-+END LC_NUMERIC
-+
-+LC_TIME
-+abday   "<U0F5F><U0FB3><U0F0B>";/
-+        "<U0F58><U0F72><U0F62><U0F0B>";/
-+        "<U0F63><U0FB7><U0F42><U0F0B>";/
-+        "<U0F54><U0F74><U0F62><U0F0B>";/
-+        "<U0F66><U0F44><U0F66><U0F0B>";/
-+        "<U0F66><U0FA4><U0F7A><U0F53><U0F0B>";/
-+        "<U0F49><U0F72><U0F0B>"
-+
-+day     "<U0F42><U0F5F><U0F60><U0F0B><U0F5F><U0FB3><U0F0B><U0F56><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F58><U0F72><U0F42><U0F0B><U0F51><U0F58><U0F62><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F63><U0FB7><U0F42><U0F0B><U0F55><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F74><U0F62><U0F0B><U0F56><U0F74><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F54><U0F0B><U0F66><U0F44><U0F66><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F66><U0FA4><U0F7A><U0F53><U0F0B><U0F55><U0F0B>";/
-+        "<U0F42><U0F5F><U0F60><U0F0B><U0F49><U0F72><U0F0B><U0F58><U0F0B>"
-+
-+
-+abmon   "<U0F5F><U0FB3><U0F0B><U0F21>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F22>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F23>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F24>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F25>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F26>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F27>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F28>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F29>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F20>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F21>";/
-+	"<U0F5F><U0FB3><U0F0B><U0F21><U0F22>"
-+
-+mon      "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F44><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F42><U0F66><U0F74><U0F58><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F5E><U0F72><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F63><U0F94><U0F0B><U0F55><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0FB2><U0F74><U0F42><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F51><U0F74><U0F53><U0F54><U0F0B>";/
-+    "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F62><U0F92><U0FB1><U0F51><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F51><U0F42><U0F74><U0F0B><U0F54><U0F0B>";/
-+         "<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F54><U0F0B>";/
-+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F45><U0F72><U0F42><U0F0B><U0F54><U0F0B>";/
-+"<U0F5F><U0FB3><U0F0B><U0F56><U0F0B><U0F56><U0F45><U0F74><U0F0B><U0F42><U0F49><U0F72><U0F66><U0F0B><U0F54><U0F0B>"
-+
-+
-+
-+
-+% Appropriate date & time representation  
-+d_t_fmt      "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C>%y<U0F5F><U0F63>%m<U0F5A><U0F7A><U0F66>/
-+%d<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>%H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-+%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S"
-+
-+% Appropriate date representation  
-+d_fmt        "<U0F54><U0F66><U0FB1><U0F72><U0F0B><U0F63><U0F7C>%y<U0F5F>/
-+<U0F63>%m<U0F5A><U0F7A><U0F66>%d"
-+
-+% Appropriate time representation  "%H:%M:%S"
-+t_fmt        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
-+%   H<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-+%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S"
-+
-+% AM/PM signs
-+am_pm   "<U0F44><U0F66><U0F0B><U0F46>";"<U0F55><U0FB1><U0F72><U0F0B><U0F46>"
-+
-+% Appropriate 12-hour clock representation  "%I:%M:%S %p"
-+t_fmt_ampm        "<U0F46><U0F74><U0F0B><U0F5A><U0F7C><U0F51>/
-+%I<U0F40><U0F66><U0F62><U0F0B><U0F58>/
-+%M<U0F40><U0F66><U0F62><U0F0B><U0F46>%S %p"
-+
-+
-+END LC_TIME
-+
-+LC_MESSAGES
-+yesstr  "<U0F68><U0F72><U0F53>"
-+nostr   "<U0F58><U0F7A><U0F53>"
-+yesexpr "<U005E><U005B><U0F68><U0059><U0079><U005D><U002E><U002A>"
-+noexpr  "<U005E><U005B><U0F58><U004E><U006E><U005D><U002E><U002A>"
-+END LC_MESSAGES
-+
-+LC_TELEPHONE
-+ tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025><U006C>"
-+% tel_dom_fmt    "<U0030><U002D><U0025><U0061><U0025><U006C>"
-+% int_select     "<U0030><U0030><U0031>"
-+% int_prefix     "<U0036><U0036>"
-+END LC_TELEPHONE
-+
-+LC_PAPER
-+height   297
-+width    210
-+END LC_PAPER
-+
-+LC_MEASUREMENT
-+% FIXME
-+measurement    1
-+END LC_MEASUREMENT
-+
-+LC_NAME
-+name_fmt    "%p%t%g%t%m%t%f"
-+name_gen    ""
-+name_miss   "<U0F58><U0F7C>"
-+name_mr     "<U0F55><U0F7C>"
-+name_mrs    "<U0F68><U0F58>"
-+END LC_NAME
-+
-+LC_ADDRESS
-+%    "%f%N%a%N%d%N%r%t%e%t%b%N%h%t%s%N%T%N%S%N%z%c%N"
-+postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-+<U0025><U0064><U0025><U004E><U0025><U0072><U0025><U0074><U0025><U0065>/
-+<U0025><U0074><U0025><U0062><U0025><U004E><U0025><U0068><U0025><U0074>/
-+<U0025><U0073><U0025><U004E><U0025><U0054><U0025><U004E><U0025><U0053>/
-+<U0025><U004E><U0025><U007A><U0025><U0063><U0025><U004E>"
-+country_name  "<U0042><U0048><U0055>"
-+%FIXME
-+%country_post  ""
-+country_ab2   "<U0042><U0054>"
-+country_ab3   "<U0042><U0048><U0055>"
-+%country_num   "<U0042><U0048><U0055>"
-+%FIXME
-+%country_car   "<U0042>"
-+%FIXME
-+%country_isbn  ""
-+lang_name     "<U0E44><U0E17><U0E22>"
-+lang_ab       "<U0074><U0068>"
-+lang_term     "<U0074><U0068><U0061>"
-+lang_lib      "<U0074><U0068><U0061>"
-+END LC_ADDRESS
-+
 --- libc/localedata/locales/nso_ZA.jj	2006-02-09 22:35:48.000000000 +0100
 +++ libc/localedata/locales/nso_ZA	2006-02-09 22:35:48.000000000 +0100
 @@ -0,0 +1,281 @@


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- glibc.spec	23 Feb 2006 09:40:47 -0000	1.163
+++ glibc.spec	23 Feb 2006 12:37:01 -0000	1.164
@@ -1457,7 +1457,7 @@
 * Thu Feb 23 2006 Jakub Jelinek <jakub at redhat.com> 2.3.6-1
 - selective update from CVS
   - fixed glibc BZ numbers:
-    56, 71, 119, 162, 195, 278, 281, 297, 305, 305, 315, 367, 368, 394, 395,
+    56, 71, 119, 162, 195, 278, 281, 297, 305, 305, 315, 367, 394, 395,
     428, 448, 451, 484, 486, 488, 491, 493, 495, 516, 520, 524, 525, 527,
     529, 532, 533, 545, 566, 588, 627, 644, 652, 657, 662, 663, 665, 666,
     667, 668, 704, 704, 713, 714, 804, 808, 811, 826, 838, 865, 865, 870,



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:09:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:09:55 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.7,1.8
Message-ID: <200602231409.k1NE9tcb027070@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27035

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Adding echo statement to doc build

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 buildDoc.xml                                                                                       |    1 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.platform.doc.isv/build.xml                                                     |    2 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 20 files changed, 1603 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-ppc64.patch	21 Feb 2006 19:01:10 -0000	1.7
+++ eclipse-ppc64.patch	23 Feb 2006 14:09:53 -0000	1.8
@@ -1774,3 +1774,25 @@
  			<param name="elementName" value="org.eclipse.osgi.util_3.1.1"/>
  		</antcall>
  		<antcall target="jarUp">
+diff -uNr plugins/org.eclipse.platform.doc.isv/build.xml plugins/org.eclipse.platform.doc.isv/build.xml
+--- plugins/org.eclipse.platform.doc.isv/build.xml	2006-01-18 16:09:14.000000000 -0500
++++ plugins/org.eclipse.platform.doc.isv/build.xml	2006-02-22 09:31:12.000000000 -0500
+@@ -66,6 +66,8 @@
+ 				<pathelement path="${build.result.folder}/../org.eclipse.swt/@dot"/>
+ 				<pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64/@dot"/>
++				<pathelement path="../org.eclipse.swt.gtk.linux.ppc64/@dot"/>
++				<pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.ppc64/@dot"/>
+ 				<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
+ 				<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86/@dot"/>
+ 				<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
+--- buildDoc.xml.new	2006-02-23 09:02:02.000000000 -0500
++++ buildDoc.xml	2006-02-23 09:02:35.000000000 -0500
+@@ -14,6 +14,7 @@
+ 
+ 
+ 	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
++		<echo "****build.index****" />
+ 		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+ 	</target>
+ 



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:19:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:19:44 -0500
Subject: rpms/util-linux/devel util-linux-2.13-fdisk-xvd.patch, NONE,
	1.1 util-linux-2.13-login-pam-acct.patch, NONE,
	1.1 util-linux-2.13-mkswap-selinux.patch, NONE,
	1.1 util-linux-2.13-schedutils-man.patch, NONE,
	1.1 util-linux-2.13-umount-sysfs.patch, NONE,
	1.1 util-linux.spec, 1.107, 1.108
Message-ID: <200602231419.k1NEJiBY010810@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10764

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-fdisk-xvd.patch 
	util-linux-2.13-login-pam-acct.patch 
	util-linux-2.13-mkswap-selinux.patch 
	util-linux-2.13-schedutils-man.patch 
	util-linux-2.13-umount-sysfs.patch 
Log Message:
update 2.13-0.16

util-linux-2.13-fdisk-xvd.patch:
 fdisk.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE util-linux-2.13-fdisk-xvd.patch ---
--- util-linux-2.13-pre6/fdisk/fdisk.c.xvd	2006-02-23 14:38:32.000000000 +0100
+++ util-linux-2.13-pre6/fdisk/fdisk.c	2006-02-23 14:47:01.000000000 +0100
@@ -800,13 +800,19 @@
 		i = ioctl(fd, HDIO_GETGEO, &geometry);
 		close(fd);
 	}
-	return (fd >= 0 && i == 0 && geometry.start == 0);
-#else
+	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]);
-#endif
 }
 
 static void

util-linux-2.13-login-pam-acct.patch:
 login.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

--- NEW FILE util-linux-2.13-login-pam-acct.patch ---
--- util-linux-2.13-pre6/login-utils/login.c.acct	2006-02-22 21:43:03.000000000 +0100
+++ util-linux-2.13-pre6/login-utils/login.c	2006-02-22 21:57:55.000000000 +0100
@@ -602,16 +602,22 @@
 	    pam_end(pamh, retcode);
 	    exit(0);
 	}
+    }
 
-	retcode = pam_acct_mgmt(pamh, 0);
-
-	if(retcode == PAM_NEW_AUTHTOK_REQD) {
-	    retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-	}
+    /*
+     * Authentication may be skipped (for example, during krlogin, rlogin, etc...), 
+     * but it doesn't mean that we can skip other account checks. The account 
+     * could be disabled or password expired (althought kerberos ticket is valid).
+     * -- kzak at redhat.com (22-Feb-2006)
+     */
+    retcode = pam_acct_mgmt(pamh, 0);
 
-	PAM_FAIL_CHECK;
+    if(retcode == PAM_NEW_AUTHTOK_REQD) {
+        retcode = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
     }
 
+    PAM_FAIL_CHECK;
+
     /*
      * Grab the user information out of the password file for future usage
      * First get the username that we are actually using, though.

util-linux-2.13-mkswap-selinux.patch:
 Makefile.am |    2 +-
 mkswap.c    |   29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.13-mkswap-selinux.patch ---
--- util-linux-2.13-pre6/disk-utils/mkswap.c.selinux	2006-02-22 14:07:47.000000000 +0100
+++ util-linux-2.13-pre6/disk-utils/mkswap.c	2006-02-22 15:16:05.000000000 +0100
@@ -39,6 +39,8 @@
 #include <sys/ioctl.h>		/* for _IO */
 #include <sys/utsname.h>
 #include <sys/stat.h>
+#include <errno.h>
+#include <selinux/selinux.h>
 #include "swapheader.h"
 #include "xstrncpy.h"
 #include "nls.h"
@@ -76,6 +78,8 @@
 
 #define MAKE_VERSION(p,q,r)	(65536*(p) + 256*(q) + (r))
 
+#define SELINUX_SWAPFILE_LABEL	"swapfile_t"
+
 static int
 linux_version_code(void) {
 	struct utsname my_utsname;
@@ -718,5 +722,30 @@
 	if (fsync(DEV))
 		 die(_("fsync failed"));
 #endif
+
+	if (S_ISREG(statbuf.st_mode)) {
+		char *context = NULL;
+
+		if (fgetfilecon(DEV, &context) < 0) {
+			if (errno == ENODATA) {
+				context = NULL;
+			} else {
+				perror(device_name);
+				die(_("unable to obtain selinux file label"));
+				return 0;
+			}
+		}
+	    	if (context==NULL || strcmp(context, SELINUX_SWAPFILE_LABEL)) {
+			if (fsetfilecon(DEV, SELINUX_SWAPFILE_LABEL)) {
+				fprintf(stderr, "%s: unable to relabel %s to %s: %s\n",
+						program_name, device_name, 
+						SELINUX_SWAPFILE_LABEL,
+						strerror(errno));
+				exit(1);
+			}
+		}
+		if (context)
+			freecon(context);
+	}
 	return 0;
 }
--- util-linux-2.13-pre6/disk-utils/Makefile.am.selinux	2006-02-22 15:23:00.000000000 +0100
+++ util-linux-2.13-pre6/disk-utils/Makefile.am	2006-02-22 15:23:09.000000000 +0100
@@ -31,5 +31,5 @@
 endif
 
 if HAVE_UUID
-mkswap_LDADD = -luuid
+mkswap_LDADD = -luuid -lselinux
 endif

util-linux-2.13-schedutils-man.patch:
 chrt.1    |    2 +-
 taskset.1 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE util-linux-2.13-schedutils-man.patch ---
--- util-linux-2.13-pre6/schedutils/taskset.1.kzak	2006-02-22 16:10:26.000000000 +0100
+++ util-linux-2.13-pre6/schedutils/taskset.1	2006-02-22 16:10:38.000000000 +0100
@@ -82,7 +82,7 @@
 .SH USAGE
 .TP
 The default behavior is to run a new command with a given affinity mask:
-taskset [mask] -- [command] [arguments]
+taskset [mask] [command] [arguments]
 .TP
 You can also retrieve the CPU affinity of an existing task:
 taskset -p [pid]
--- util-linux-2.13-pre6/schedutils/chrt.1.kzak	2006-02-22 16:09:02.000000000 +0100
+++ util-linux-2.13-pre6/schedutils/chrt.1	2006-02-22 16:09:22.000000000 +0100
@@ -72,7 +72,7 @@
 .SH USAGE
 .TP
 The default behavior is to run a new command::
-chrt [prio] -- [command] [arguments]
+chrt [prio] [command] [arguments]
 .TP
 You can also retrieve the real-time attributes of an existing task:
 chrt -p [pid]

util-linux-2.13-umount-sysfs.patch:
 umount.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE util-linux-2.13-umount-sysfs.patch ---
--- util-linux-2.13-pre6/mount/umount.c.sysfs	2006-02-23 10:09:53.000000000 +0100
+++ util-linux-2.13-pre6/mount/umount.c	2006-02-23 10:10:39.000000000 +0100
@@ -734,7 +734,7 @@
 	if (all) {
 		/* nodev stuff: sysfs, usbfs, oprofilefs, ... */
 		if (types == NULL)
-			types = "noproc,nodevfs,nodevpts";
+			types = "noproc,nodevfs,nodevpts,nosysfs";
 		result = umount_all (types, test_opts);
 	} else if (argc < 1) {
 		usage (stderr, 2);


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- util-linux.spec	21 Feb 2006 21:28:13 -0000	1.107
+++ util-linux.spec	23 Feb 2006 14:19:40 -0000	1.108
@@ -169,6 +169,16 @@
 Patch222: util-linux-2.13-mount-twiceloop.patch
 # nobug - add --rmpart N and --rmparts
 Patch223: util-linux-2.13-rmparts.patch
+# 181782 - mkswap should automatically add selinux label to swapfile
+Patch224: util-linux-2.13-mkswap-selinux.patch
+# 181896 - broken example in man pages
+Patch225: util-linux-2.13-schedutils-man.patch
+# 177331 - login omits pam_acct_mgmt & pam_chauthtok when authentication is skipped.
+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
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -244,6 +254,11 @@
 %patch221 -p1
 %patch222 -p1
 %patch223 -p1
+%patch224 -p1
+%patch225 -p1
+%patch226 -p1
+%patch227 -p1
+%patch228 -p1
 
 %build
 unset LINGUAS || :
@@ -627,8 +642,13 @@
 /sbin/losetup
 
 %changelog
-* Tue Feb 21 2006 Karel Zak <kzak at redhat.com> 2.13-0.16
+* Wed Feb 22 2006 Karel Zak <kzak at redhat.com> 2.13-0.16
+- fix #181782 - mkswap should automatically add selinux label to swapfile
 - fix #180730 - col is exiting with 1 (fix util-linux-2.12p-col-EILSEQ.patch)
+- fix #181896 - broken example in schedutils man pages
+- fix #177331 - login omits pam_acct_mgmt & pam_chauthtok when authentication is skipped.
+- fix #177523 - umount -a should not unmount sysfs
+- fix #182553 - fdisk -l inside xen guest shows no disks
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13-0.15.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:21:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:21:45 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.8,1.9
Message-ID: <200602231421.k1NELhYv011435@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11388

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Fixing echo in doc build.

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 buildDoc.xml                                                                                       |    1 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.platform.doc.isv/build.xml                                                     |    2 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 20 files changed, 1603 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-ppc64.patch	23 Feb 2006 14:09:53 -0000	1.8
+++ eclipse-ppc64.patch	23 Feb 2006 14:21:39 -0000	1.9
@@ -1786,13 +1786,13 @@
  				<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
---- buildDoc.xml.new	2006-02-23 09:02:02.000000000 -0500
+--- buildDoc.xml	2006-02-23 09:02:02.000000000 -0500
 +++ buildDoc.xml	2006-02-23 09:02:35.000000000 -0500
 @@ -14,6 +14,7 @@
  
  
  	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
-+		<echo "****build.index****" />
++		<echo >****build.index****</echo>
  		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
  	</target>
  



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:23:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:23:21 -0500
Subject: rpms/module-init-tools/FC-4 module-init-tools.spec,1.15,1.16
Message-ID: <200602231423.k1NENL0O012031@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/module-init-tools/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv11996

Modified Files:
	module-init-tools.spec 
Log Message:
- corrected description


Index: module-init-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/module-init-tools/FC-4/module-init-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- module-init-tools.spec	22 Feb 2006 09:01:51 -0000	1.15
+++ module-init-tools.spec	23 Feb 2006 14:23:18 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: Kernel module management utilities.
 Name: module-init-tools
 Version: 3.2
-Release: 0.%{preversion}.0.FC4.3
+Release: 0.%{preversion}.0.FC4.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
@@ -20,7 +20,7 @@
 
 %description
 The modutils package includes various programs needed for automatic
-loading and unloading of modules under 2.2 and later kernels, as well
+loading and unloading of modules under 2.6 and later kernels, as well
 as other module management programs. Device drivers and filesystems
 are two examples of loaded and unloaded modules.
 
@@ -96,6 +96,9 @@
 %config(missingok) %verify(not md5 size mtime) /etc/modprobe.conf.dist
 
 %changelog
+* Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.4
+- corrected description
+
 * Wed Feb 22 2006 Harald Hoyer <harald at redhat.com> 3.2-0.pre9.0.FC4.3
 - blacklisted matroxfb_base also (bz #180801)   	 
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:27:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:27:47 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.9,1.10
Message-ID: <200602231427.k1NERl9U014101@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14068

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Fixing echo in doc build.

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.platform.doc.isv/build.xml                                                     |    2 
 plugins/org.eclipse.platform.doc.isv/buildDoc.xml                                                  |    1 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 20 files changed, 1603 insertions(+), 6 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-ppc64.patch	23 Feb 2006 14:21:39 -0000	1.9
+++ eclipse-ppc64.patch	23 Feb 2006 14:27:45 -0000	1.10
@@ -1786,8 +1786,8 @@
  				<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
---- buildDoc.xml	2006-02-23 09:02:02.000000000 -0500
-+++ buildDoc.xml	2006-02-23 09:02:35.000000000 -0500
+--- plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 09:02:02.000000000 -0500
++++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 09:02:35.000000000 -0500
 @@ -14,6 +14,7 @@
  
  



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:29:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:29:12 -0500
Subject: rpms/setup/devel .cvsignore, 1.31, 1.32 setup.spec, 1.36,
	1.37 sources, 1.32, 1.33
Message-ID: <200602231429.k1NETCLH014713@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/setup/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14641

Modified Files:
	.cvsignore setup.spec sources 
Log Message:
- Really switch to new /etc/services file
- Added /etc/fstab and /etc/mtab to ownership of setup (#177061)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	31 Jan 2006 13:29:11 -0000	1.31
+++ .cvsignore	23 Feb 2006 14:29:08 -0000	1.32
@@ -1 +1 @@
-setup-2.5.48.tar.bz2
+setup-2.5.49.tar.bz2


Index: setup.spec
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- setup.spec	31 Jan 2006 13:29:11 -0000	1.36
+++ setup.spec	23 Feb 2006 14:29:09 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files.
 Name: setup
-Version: 2.5.48
+Version: 2.5.49
 Release: 1
 License: public domain
 Group: System Environment/Base
@@ -33,6 +33,8 @@
 chmod 0644 %{buildroot}/etc/environment
 chmod 0400 %{buildroot}/etc/{shadow,gshadow}
 chmod 0644 %{buildroot}/var/log/lastlog
+touch %{buildroot}/etc/fstab
+touch %{buildroot}/etc/mtab
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}/etc/Makefile
@@ -70,8 +72,14 @@
 %dir /etc/profile.d
 %config(noreplace) %verify(not md5 size mtime) /etc/shells
 %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Thu Feb 23 2006 Phil Knirsch <pknirsch at redhat.com> 2.4.49-1
+- Really switch to new /etc/services file
+- Added /etc/fstab and /etc/mtab to ownership of setup (#177061)
+
 * Tue Jan 31 2006 Phil Knirsch <pknirsch at redhat.com> 2.4.48-1
 - Switched to the new large /etc/services file which fixes #112298, #133683,
   #166443, #168872, #171228.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setup/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	31 Jan 2006 13:29:11 -0000	1.32
+++ sources	23 Feb 2006 14:29:09 -0000	1.33
@@ -1 +1 @@
-a3277898d9c56ea1dc279a0219ad7c2c  setup-2.5.48.tar.bz2
+fdd4212c96b5c26a71682b17b90aa326  setup-2.5.49.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 14:39:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 09:39:36 -0500
Subject: rpms/glibc/FC-4 glibc-i386-futex-timed-wait.patch, NONE,
	1.1 glibc-20050815-20051104.patch, 1.2,
	1.3 glibc-aio-rh171968.patch, 1.1, 1.2 glibc-rh168266.patch,
	1.1, 1.2 glibc.spec, 1.164, 1.165
Message-ID: <200602231439.k1NEdaFv017212@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17114

Modified Files:
	glibc-20050815-20051104.patch glibc-aio-rh171968.patch 
	glibc-rh168266.patch glibc.spec 
Added Files:
	glibc-i386-futex-timed-wait.patch 
Log Message:
2.3.6-2


glibc-i386-futex-timed-wait.patch:
 i386/lowlevellock.h   |   24 ++++++++++++++++++++----
 x86_64/lowlevellock.h |   23 +++++++++++++++++++----
 2 files changed, 39 insertions(+), 8 deletions(-)

--- NEW FILE glibc-i386-futex-timed-wait.patch ---
2006-01-05  Ulrich Drepper  <drepper at redhat.com>

	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_futex_wait):
	Return status.
	(lll_futex_timed_wait): Define.
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.

--- libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h.jj	2004-03-24 07:35:18.000000000 +0100
+++ libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
@@ -66,17 +66,33 @@
 
 
 #define lll_futex_wait(futex, val) \
-  do {									      \
-    int __ignore;							      \
+  ({									      \
+    int __status;							      \
     register __typeof (val) _val asm ("edx") = (val);			      \
     __asm __volatile (LLL_EBX_LOAD					      \
 		      LLL_ENTER_KERNEL					      \
 		      LLL_EBX_LOAD					      \
-		      : "=a" (__ignore)					      \
+		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (0),	      \
 			"c" (FUTEX_WAIT), "d" (_val),			      \
 			"i" (offsetof (tcbhead_t, sysinfo)));		      \
-  } while (0)
+    __status;								      \
+  })
+
+
+#define lll_futex_timed_wait(futex, val, timeout)			      \
+  ({									      \
+    int __status;							      \
+    register __typeof (val) _val asm ("edx") = (val);			      \
+    __asm __volatile (LLL_EBX_LOAD					      \
+		      LLL_ENTER_KERNEL					      \
+		      LLL_EBX_LOAD					      \
+		      : "=a" (__status)					      \
+		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (timeout),  \
+			"c" (FUTEX_WAIT), "d" (_val),			      \
+			"i" (offsetof (tcbhead_t, sysinfo)));		      \
+    __status;								      \
+  })
 
 
 #define lll_futex_wake(futex, nr) \
--- libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h.jj	2004-07-05 19:29:20.000000000 +0200
+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
@@ -47,16 +47,31 @@
 
 
 #define lll_futex_wait(futex, val) \
-  do {									      \
-    int __ignore;							      \
+  ({									      \
+    int __status;							      \
     register __typeof (val) _val asm ("edx") = (val);			      \
     __asm __volatile ("xorq %%r10, %%r10\n\t"				      \
 		      "syscall"						      \
-		      : "=a" (__ignore)					      \
+		      : "=a" (__status)					      \
 		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
 			"d" (_val)					      \
 		      : "memory", "cc", "r10", "r11", "cx");		      \
-  } while (0)
+    __status;								      \
+  })
+
+
+#define lll_futex_timed_wait(futex, val, timeout)			      \
+  ({									      \
+    register const struct timespec *__to __asm__ ("r10") = timeout;	      \
+    int __status;							      \
+    register __typeof (val) _val asm ("edx") = (val);			      \
+    __asm __volatile ("syscall"						      \
+		      : "=a" (__status)					      \
+		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
+		        "d" (_val), "r" (__to)				      \
+		      : "memory", "cc", "r11", "cx");			      \
+    __status;								      \
+  })
 
 
 #define lll_futex_wake(futex, nr) \

glibc-20050815-20051104.patch:
 BUGS                                                         |   14 
 Makefile                                                     |   54 
 Makerules                                                    |   10 
 abi-tags                                                     |    2 
 argp/argp-eexst.c                                            |    2 
 argp/argp-fmtstream.c                                        |    2 
 argp/argp-fmtstream.h                                        |    4 
 argp/argp-fs-xinl.c                                          |    2 
 argp/argp-xinl.c                                             |    2 
 argp/argp.h                                                  |    2 
 configure                                                    |   18 
 configure.in                                                 |   18 
 crypt/Makefile                                               |    8 
 crypt/md5.h                                                  |    3 
 debug/execinfo.h                                             |    3 
 debug/xtrace.sh                                              |    2 
 dlfcn/Makefile                                               |   19 
 dlfcn/bug-atexit1-lib.c                                      |  375 +
 dlfcn/bug-atexit1.c                                          |   23 
 dlfcn/bug-atexit2-lib.c                                      |   14 
 dlfcn/bug-atexit2.c                                          |   53 
 elf/Makefile                                                 |   13 
 elf/cache.c                                                  |    3 
 elf/dl-addr.c                                                |   15 
 elf/dl-conflict.c                                            |    4 
 elf/dl-load.c                                                |   97 
 elf/dl-tsd.c                                                 |    2 
 elf/elf.h                                                    |   13 
 elf/rtld.c                                                   |    9 
 elf/tst-auditmod1.c                                          |    8 
 hesiod/hesiod.c                                              |    6 
 hurd/intr-msg.c                                              |   19 
 iconv/loop.c                                                 |    4 
 iconv/skeleton.c                                             |   30 
 iconvdata/jis0208.c                                          |   18 
 iconvdata/jis0208.h                                          |    9 
 include/atomic.h                                             |   39 
 include/features.h                                           |   15 
 include/limits.h                                             |   20 
 include/malloc.h                                             |    1 
 include/regex.h                                              |   49 
 include/resolv.h                                             |    2 
 include/string.h                                             |    2 
 include/sys/mman.h                                           |    2 
 include/time.h                                               |    2 
 inet/getnetgrent_r.c                                         |  130 
 intl/localealias.c                                           |    5 
 libio/fileops.c                                              |   14 
 libio/fmemopen.c                                             |    2 
 libio/iofclose.c                                             |    2 
 libio/iofgets.c                                              |    8 
 libio/iofgets_u.c                                            |    8 
 libio/iofgetws.c                                             |    8 
 libio/iofgetws_u.c                                           |    8 
 libio/iofopncook.c                                           |   11 
 libio/iogetdelim.c                                           |    8 
 libio/iogetline.c                                            |   53 
 libio/oldfileops.c                                           |    8 
 libio/oldiofclose.c                                          |    2 
 libio/stdio.h                                                |   20 
 locale/iso-4217.def                                          |    4 
 locale/iso-639.def                                           |  121 
 locale/loadarchive.c                                         |    2 
 locale/programs/ld-address.c                                 |   11 
 localedata/Makefile                                          |    2 
 localedata/SUPPORTED                                         |   16 
 localedata/locales/af_ZA                                     |  246 -
 localedata/locales/ar_AE                                     |    9 
 localedata/locales/ar_BH                                     |    9 
 localedata/locales/ar_DZ                                     |    9 
 localedata/locales/ar_EG                                     |   13 
 localedata/locales/ar_IN                                     |   26 
 localedata/locales/ar_IQ                                     |    9 
 localedata/locales/ar_JO                                     |    9 
 localedata/locales/ar_KW                                     |    9 
 localedata/locales/ar_LB                                     |    9 
 localedata/locales/ar_LY                                     |    9 
 localedata/locales/ar_MA                                     |    9 
 localedata/locales/ar_OM                                     |    9 
 localedata/locales/ar_QA                                     |    9 
 localedata/locales/ar_SA                                     |    9 
 localedata/locales/ar_SD                                     |    9 
 localedata/locales/ar_SY                                     |    9 
 localedata/locales/ar_TN                                     |    9 
 localedata/locales/ar_YE                                     |    9 
 localedata/locales/az_AZ                                     |   47 
 localedata/locales/be_BY at latin                               |  147 
 localedata/locales/bn_BD                                     |  121 
 localedata/locales/bn_IN                                     |   26 
 localedata/locales/bs_BA                                     |   18 
 localedata/locales/ca_ES                                     |    2 
 localedata/locales/de_DE                                     |   13 
 localedata/locales/el_GR                                     |   29 
 localedata/locales/en_US                                     |    2 
 localedata/locales/es_AR                                     |    4 
 localedata/locales/es_US                                     |   12 
 localedata/locales/fi_FI                                     |    5 
 localedata/locales/hsb_DE                                    | 2216 +++++++++++
 localedata/locales/hu_HU                                     |   28 
 localedata/locales/km_KH                                     | 1904 +++++++++
 localedata/locales/ku_TR                                     |  215 +
 localedata/locales/kw_GB                                     |    4 
 localedata/locales/ky_KG                                     |  203 +
 localedata/locales/mg_MG                                     |  181 
 localedata/locales/ml_IN                                     |    6 
 localedata/locales/nl_NL                                     |    5 
 localedata/locales/nso_ZA                                    |  281 +
 localedata/locales/oc_FR                                     |    2 
 localedata/locales/ru_RU                                     |   24 
 localedata/locales/rw_RW                                     |  150 
 localedata/locales/si_LK                                     |  216 +
 localedata/locales/sid_ET                                    |    1 
 localedata/locales/sq_AL                                     |  145 
 localedata/locales/ss_ZA                                     |  285 +
 localedata/locales/st_ZA                                     |   71 
 localedata/locales/ta_IN                                     |   16 
 localedata/locales/te_IN                                     |  108 
 localedata/locales/tg_TJ                                     |   15 
 localedata/locales/tn_ZA                                     |  288 +
 localedata/locales/ts_ZA                                     |  282 +
 localedata/locales/ve_ZA                                     |  288 +
 localedata/locales/vi_VN                                     |  146 
 localedata/locales/wa_BE                                     |   32 
 localedata/locales/xh_ZA                                     |   69 
 localedata/locales/yi_US                                     |   55 
 localedata/locales/zh_CN                                     |    6 
 localedata/locales/zu_ZA                                     |   69 
 malloc/Makefile                                              |    4 
 malloc/arena.c                                               |  110 
 malloc/hooks.c                                               |    4 
 malloc/malloc.c                                              |   71 
 malloc/memusage.c                                            |  279 -
 malloc/obstack.h                                             |    2 
 malloc/tst-mallocfork.c                                      |   52 
 malloc/tst-mtrace.sh                                         |    3 
 manual/llio.texi                                             |   12 
 manual/memory.texi                                           |    4 
 manual/pattern.texi                                          |    6 
 manual/signal.texi                                           |    4 
 manual/stdio.texi                                            |    7 
 manual/time.texi                                             |    3 
 math/Makefile                                                |    2 
 math/libm-test.inc                                           |    4 
 math/test-tgmath-int.c                                       |   71 
 math/tgmath.h                                                |   13 
 misc/hsearch_r.c                                             |    2 
 misc/sys/mman.h                                              |    8 
 nis/nss_nis/nis-netgrp.c                                     |   18 
 nis/nss_nis/nis-publickey.c                                  |    2 
 nis/nss_nisplus/nisplus-netgrp.c                             |   13 
 nptl/Makefile                                                |    6 
 nptl/TODO                                                    |    4 
 nptl/allocatestack.c                                         |   93 
 nptl/descr.h                                                 |   14 
 nptl/init.c                                                  |   30 
 nptl/perf.c                                                  |    5 
 nptl/pthread_create.c                                        |   13 
 nptl/sysdeps/pthread/pthread_cond_signal.c                   |    5 
 nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h            |   16 
 nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S |   45 
 nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h             |   11 
 nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h          |   15 
 nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h             |   23 
 nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S               |    4 
 nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h            |   15 
 nptl/sysdeps/unix/sysv/linux/timer_routines.c                |   14 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S    |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/pthread_once.S           |   27 
 nptl/sysdeps/unix/sysv/linux/x86_64/sem_trywait.S            |    1 
 nptl/tst-align3.c                                            |   57 
 nscd/aicache.c                                               |    2 
 nscd/cache.c                                                 |   34 
 nscd/connections.c                                           |   36 
 nscd/dbg_log.c                                               |    2 
 nscd/grpcache.c                                              |    3 
 nscd/hstcache.c                                              |    3 
 nscd/initgrcache.c                                           |    3 
 nscd/mem.c                                                   |   18 
 nscd/nscd.c                                                  |   15 
 nscd/nscd.conf                                               |    4 
 nscd/nscd.h                                                  |   17 
 nscd/nscd_conf.c                                             |  161 
 nscd/nscd_getpw_r.c                                          |    2 
 nscd/nscd_stat.c                                             |    6 
 nscd/pwdcache.c                                              |    3 
 nss/getent.c                                                 |   82 
 nss/nss_files/files-netgrp.c                                 |   22 
 posix/Makefile                                               |    2 
 posix/getconf.c                                              |   55 
 posix/regcomp.c                                              |  533 +-
 posix/regex.c                                                |   29 
 posix/regex.h                                                |  161 
 posix/regex_internal.c                                       |  403 --
 posix/regex_internal.h                                       |  178 
 posix/regexec.c                                              |  722 +--
 posix/sys/wait.h                                             |    8 
 posix/tst-rfc3484.c                                          |   98 
 resolv/Versions                                              |    2 
 resolv/res_data.c                                            |    4 
 resolv/res_init.c                                            |   31 
 resolv/res_libc.c                                            |   16 
 resolv/res_send.c                                            |   59 
 rt/mqueue.h                                                  |    6 
 scripts/begin-end-check.pl                                   |   47 
 stdio-common/Makefile                                        |    3 
 stdio-common/tst-fgets.c                                     |   20 
 stdio-common/tst-fwrite.c                                    |   70 
 stdio-common/tst-put-error.c                                 |   33 
 stdlib/Depend                                                |    1 
 stdlib/Makefile                                              |    3 
 stdlib/bug-strtod2.c                                         |   46 
 stdlib/cxa_atexit.c                                          |   59 
 stdlib/stdlib.h                                              |    2 
 stdlib/strtod_l.c                                            |   12 
 stdlib/tst-ucontext-off.c                                    |   35 
 string/strxfrm_l.c                                           |    6 
 sunrpc/svc.c                                                 |    2 
 sysdeps/alpha/divqu.S                                        |    2 
 sysdeps/alpha/ldiv.S                                         |    2 
 sysdeps/alpha/remqu.S                                        |    2 
 sysdeps/generic/bits/byteswap.h                              |   19 
 sysdeps/generic/bits/mman.h                                  |    6 
 sysdeps/generic/dl-sysdep.c                                  |   25 
 sysdeps/generic/glob.c                                       |    2 
 sysdeps/generic/ldsodefs.h                                   |   16 
 sysdeps/generic/memusage.h                                   |   16 
 sysdeps/generic/nfs/nfs.h                                    |   32 
 sysdeps/generic/s_csqrt.c                                    |    4 
 sysdeps/generic/s_csqrtf.c                                   |    4 
 sysdeps/generic/s_csqrtl.c                                   |    4 
 sysdeps/generic/tst-audit.h                                  |   11 
 sysdeps/i386/fpu/libm-test-ulps                              |   16 
 sysdeps/i386/i686/memusage.h                                 |   22 
 sysdeps/ia64/fpu/libm-symbols.h                              |    4 
 sysdeps/ia64/fpu/libm_error.c                                |    8 
 sysdeps/ieee754/flt-32/e_hypotf.c                            |   10 
 sysdeps/mach/hurd/dl-sysdep.h                                |    6 
 sysdeps/mach/hurd/getpeername.c                              |   12 
 sysdeps/mach/hurd/i386/init-first.c                          |   22 
 sysdeps/mach/hurd/ioctl.c                                    |    6 
 sysdeps/mach/hurd/profil.c                                   |    2 
 sysdeps/mach/hurd/setitimer.c                                |    9 
 sysdeps/posix/getaddrinfo.c                                  |   59 
 sysdeps/posix/spawni.c                                       |   10 
 sysdeps/powerpc/fpu/libm-test-ulps                           |   18 
 sysdeps/powerpc/powerpc64/Makefile                           |    2 
 sysdeps/powerpc/powerpc64/hp-timing.c                        |   25 
 sysdeps/powerpc/powerpc64/hp-timing.h                        |  136 
 sysdeps/unix/alpha/sysdep.h                                  |   63 
 sysdeps/unix/sh/sysdep.S                                     |    2 
 sysdeps/unix/sockatmark.c                                    |    4 
 sysdeps/unix/sysv/i386/signal.S                              |   31 
 sysdeps/unix/sysv/i386/sigreturn.S                           |   27 
 sysdeps/unix/sysv/linux/i386/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/i386/ucontext_i.h                    |   20 
 sysdeps/unix/sysv/linux/ia64/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/lddlibc4.c                           |    2 
 sysdeps/unix/sysv/linux/mips/brk.c                           |    3 
 sysdeps/unix/sysv/linux/mips/getpagesize.c                   |    1 
 sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S              |    8 
 sysdeps/unix/sysv/linux/mips/mips64/syscall.S                |   29 
 sysdeps/unix/sysv/linux/powerpc/bits/mman.h                  |    1 
 sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c              |  105 
 sysdeps/unix/sysv/linux/powerpc/powerpc32/ucontext_i.h       |   19 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h         |   77 
 sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h       |   15 
 sysdeps/unix/sysv/linux/readonly-area.c                      |   18 
 sysdeps/unix/sysv/linux/s390/bits/mman.h                     |    1 
 sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h            |   14 
 sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h            |   13 
 sysdeps/unix/sysv/linux/sh/bits/mman.h                       |    1 
 sysdeps/unix/sysv/linux/sh/makecontext.S                     |  145 
 sysdeps/unix/sysv/linux/sh/sh3/getcontext.S                  |   90 
 sysdeps/unix/sysv/linux/sh/sh3/setcontext.S                  |  101 
 sysdeps/unix/sysv/linux/sh/sh3/swapcontext.S                 |  134 
 sysdeps/unix/sysv/linux/sh/sh3/sys/ucontext.h                |  102 
 sysdeps/unix/sysv/linux/sh/sh3/ucontext_i.h                  |   79 
 sysdeps/unix/sysv/linux/sh/sh4/getcontext.S                  |  133 
 sysdeps/unix/sysv/linux/sh/sh4/setcontext.S                  |  141 
 sysdeps/unix/sysv/linux/sh/sh4/swapcontext.S                 |  216 +
 sysdeps/unix/sysv/linux/sh/sh4/sys/ucontext.h                |  115 
 sysdeps/unix/sysv/linux/sh/sh4/ucontext_i.h                  |  149 
 sysdeps/unix/sysv/linux/sh/socket.S                          |    6 
 sysdeps/unix/sysv/linux/sh/sys/ucontext.h                    |  109 
 sysdeps/unix/sysv/linux/sparc/bits/mman.h                    |    1 
 sysdeps/unix/sysv/linux/syscalls.list                        |    2 
 sysdeps/unix/sysv/linux/x86_64/bits/mman.h                   |    1 
 sysdeps/unix/sysv/linux/x86_64/ucontext_i.h                  |   30 
 time/Makefile                                                |    2 
 time/asctime.c                                               |   63 
 time/bug-asctime.c                                           |   33 
 time/bug-asctime_r.c                                         |   32 
 time/mktime.c                                                |   60 
 timezone/africa                                              |   24 
 timezone/asia                                                |   86 
 timezone/australasia                                         |   55 
 timezone/backward                                            |   25 
 timezone/europe                                              |   93 
 timezone/northamerica                                        |  152 
 timezone/southamerica                                        |   18 
 timezone/test-tz.c                                           |    2 
 timezone/tst-timezone.c                                      |    4 
 timezone/zdump.c                                             |    4 
 timezone/zone.tab                                            |   28 
 wcsmbs/Makefile                                              |    3 
 wcsmbs/tst-mbrtowc2.c                                        |   67 
 wctype/wcfuncs.c                                             |   33 
 wctype/wcfuncs_l.c                                           |   33 
 wctype/wctype.h                                              |    1 
 309 files changed, 13893 insertions(+), 3246 deletions(-)

Index: glibc-20050815-20051104.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-20050815-20051104.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glibc-20050815-20051104.patch	23 Feb 2006 12:37:01 -0000	1.2
+++ glibc-20050815-20051104.patch	23 Feb 2006 14:39:32 -0000	1.3
@@ -1063,8 +1063,6 @@
 	it wasn't used.  Remove use of from_object and to_object variable,
 	replace with some constants.  Adjust users.
 
-	* sysdeps/i386/bits/string.h: Removed.
-
 	* stdio-common/Makefile (tests): Add tst-put-error.
 	* stdio-common/tst-put-error.c: New file.
 	* libio/fileops.c (_IO_new_file_xsputn): If overflow fails and no more
@@ -12417,931 +12415,6 @@
  ildouble: 1
  
  Function: "tan":
---- libc/sysdeps/i386/bits/string.h.jj	2004-06-15 22:11:53.000000000 +0200
-+++ libc/sysdeps/i386/bits/string.h	2006-02-21 14:52:00.000000000 +0100
-@@ -1,922 +0,0 @@
--/* Optimized, inlined string functions.  i386 version.
--   Copyright (C) 1997,1998,1999,2000,2003 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library 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
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#ifndef _STRING_H
--# error "Never use <bits/string.h> directly; include <string.h> instead."
--#endif
--
--/* The ix86 processors can access unaligned multi-byte variables.  */
--#define _STRING_ARCH_unaligned	1
--
--
--/* We only provide optimizations if the user selects them and if
--   GNU CC is used.  */
--#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
--    && defined __GNUC__ && __GNUC__ >= 2 && !__BOUNDED_POINTERS__
--
--#ifndef __STRING_INLINE
--# ifdef __cplusplus
--#  define __STRING_INLINE inline
--# else
--#  define __STRING_INLINE extern __inline
--# endif
--#endif
--
--
--/* Copy N bytes of SRC to DEST.  */
--#define _HAVE_STRING_ARCH_memcpy 1
--#define memcpy(dest, src, n) \
--  (__extension__ (__builtin_constant_p (n)				      \
--		  ? __memcpy_c ((dest), (src), (n))			      \
--		  : memcpy ((dest), (src), (n))))
--/* This looks horribly ugly, but the compiler can optimize it totally,
--   as the count is constant.  */
--__STRING_INLINE void *__memcpy_c (void *__dest, __const void *__src,
--				  size_t __n);
--
--__STRING_INLINE void *
--__memcpy_c (void *__dest, __const void *__src, size_t __n)
--{
--  register unsigned long int __d0, __d1, __d2;
--  union {
--    unsigned int __ui;
--    unsigned short int __usi;
--    unsigned char __uc;
--  } *__u = __dest;
--  switch (__n)
--    {
--    case 0:
--      return __dest;
--    case 1:
--      __u->__uc = *(const unsigned char *) __src;
--      return __dest;
--    case 2:
--      __u->__usi = *(const unsigned short int *) __src;
--      return __dest;
--    case 3:
--      __u->__usi = *(const unsigned short int *) __src;
--      __u = (void *) __u + 2;
--      __u->__uc = *(2 + (const unsigned char *) __src);
--      return __dest;
--    case 4:
--      __u->__ui = *(const unsigned int *) __src;
--      return __dest;
--    case 6:
--      __u->__ui = *(const unsigned int *) __src;
--      __u = (void *) __u + 4;
--      __u->__usi = *(2 + (const unsigned short int *) __src);
--      return __dest;
--    case 8:
--      __u->__ui = *(const unsigned int *) __src;
--      __u = (void *) __u + 4;
--      __u->__ui = *(1 + (const unsigned int *) __src);
--      return __dest;
--    case 12:
--      __u->__ui = *(const unsigned int *) __src;
--      __u = (void *) __u + 4;
--      __u->__ui = *(1 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(2 + (const unsigned int *) __src);
--      return __dest;
--    case 16:
--      __u->__ui = *(const unsigned int *) __src;
--      __u = (void *) __u + 4;
--      __u->__ui = *(1 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(2 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(3 + (const unsigned int *) __src);
--      return __dest;
--    case 20:
--      __u->__ui = *(const unsigned int *) __src;
--      __u = (void *) __u + 4;
--      __u->__ui = *(1 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(2 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(3 + (const unsigned int *) __src);
--      __u = (void *) __u + 4;
--      __u->__ui = *(4 + (const unsigned int *) __src);
--      return __dest;
--    }
--#define __COMMON_CODE(x) \
--  __asm__ __volatile__							      \
--    ("cld\n\t"								      \
--     "rep; movsl"							      \
--     x									      \
--     : "=&c" (__d0), "=&D" (__d1), "=&S" (__d2)				      \
--     : "0" (__n / 4), "1" (&__u->__uc), "2" (__src)			      \
--     : "memory");
--
--  switch (__n % 4)
--    {
--    case 0:
--      __COMMON_CODE ("");
--      break;
--    case 1:
--      __COMMON_CODE ("\n\tmovsb");
--      break;
--    case 2:
--      __COMMON_CODE ("\n\tmovsw");
--      break;
--    case 3:
--      __COMMON_CODE ("\n\tmovsw\n\tmovsb");
--      break;
--  }
--  return __dest;
--#undef __COMMON_CODE
--}
--
--
--/* Copy N bytes of SRC to DEST, guaranteeing
--   correct behavior for overlapping strings.  */
--#define _HAVE_STRING_ARCH_memmove 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE void *
--memmove (void *__dest, __const void *__src, size_t __n)
--{
--  register unsigned long int __d0, __d1, __d2;
--  if (__dest < __src)
--    __asm__ __volatile__
--      ("cld\n\t"
--       "rep\n\t"
--       "movsb"
--       : "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
--       : "0" (__n), "1" (__src), "2" (__dest)
--       : "memory");
--  else
--    __asm__ __volatile__
--      ("std\n\t"
--       "rep\n\t"
--       "movsb\n\t"
--       "cld"
--       : "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
--       : "0" (__n), "1" (__n - 1 + (const char *) __src),
--	 "2" (__n - 1 + (char *) __dest)
--       : "memory");
--  return __dest;
--}
--#endif
--
--/* Set N bytes of S to C.  */
--#define _HAVE_STRING_ARCH_memset 1
--#define _USE_STRING_ARCH_memset 1
--#define memset(s, c, n) \
--  (__extension__ (__builtin_constant_p (c)				      \
--		  ? (__builtin_constant_p (n)				      \
--		     ? __memset_cc (s, 0x01010101UL * (unsigned char) (c), n) \
--		     : __memset_cg (s, 0x01010101UL * (unsigned char) (c), n))\
--		  : __memset_gg (s, c, n)))
--
--__STRING_INLINE void *__memset_cc (void *__s, unsigned long int __pattern,
--				   size_t __n);
--
--__STRING_INLINE void *
--__memset_cc (void *__s, unsigned long int __pattern, size_t __n)
--{
--  register unsigned long int __d0, __d1;
--  union {
--    unsigned int __ui;
--    unsigned short int __usi;
--    unsigned char __uc;
--  } *__u = __s;
--  switch (__n)
--    {
--    case 0:
--      return __s;
--    case 1:
--      __u->__uc = __pattern;
--      return __s;
--    case 2:
--      __u->__usi = __pattern;
--      return __s;
--    case 3:
--      __u->__usi = __pattern;
--      __u = __extension__ ((void *) __u + 2);
--      __u->__uc = __pattern;
--      return __s;
--    case 4:
--      __u->__ui = __pattern;
--      return __s;
--	}
--#define __COMMON_CODE(x) \
--  __asm__ __volatile__							      \
--    ("cld\n\t"								      \
--     "rep; stosl"							      \
--     x									      \
--     : "=&c" (__d0), "=&D" (__d1)					      \
--     : "a" (__pattern), "0" (__n / 4), "1" (&__u->__uc)			      \
--     : "memory")
--
--  switch (__n % 4)
--    {
--    case 0:
--      __COMMON_CODE ("");
--      break;
--    case 1:
--      __COMMON_CODE ("\n\tstosb");
--      break;
--    case 2:
--      __COMMON_CODE ("\n\tstosw");
--      break;
--    case 3:
--      __COMMON_CODE ("\n\tstosw\n\tstosb");
--      break;
--    }
--  return __s;
--#undef __COMMON_CODE
--}
--
--__STRING_INLINE void *__memset_cg (void *__s, unsigned long __c, size_t __n);
--
--__STRING_INLINE void *
--__memset_cg (void *__s, unsigned long __c, size_t __n)
--{
--  register unsigned long int __d0, __d1;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "rep; stosl\n\t"
--     "testb	$2,%b3\n\t"
--     "je	1f\n\t"
--     "stosw\n"
--     "1:\n\t"
--     "testb	$1,%b3\n\t"
--     "je	2f\n\t"
--     "stosb\n"
--     "2:"
--     : "=&c" (__d0), "=&D" (__d1)
--     : "a" (__c), "q" (__n), "0" (__n / 4), "1" (__s)
--     : "memory");
--  return __s;
--}
--
--__STRING_INLINE void *__memset_gg (void *__s, char __c, size_t __n);
--
--__STRING_INLINE void *
--__memset_gg (void *__s, char __c, size_t __n)
--{
--  register unsigned long int __d0, __d1;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "rep; stosb"
--     : "=&D" (__d0), "=&c" (__d1)
--     : "a" (__c), "0" (__s), "1" (__n)
--     : "memory");
--  return __s;
--}
--
--
--
--
--/* Search N bytes of S for C.  */
--#define _HAVE_STRING_ARCH_memchr 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE void *
--memchr (__const void *__s, int __c, size_t __n)
--{
--  register unsigned long int __d0;
--  register void *__res;
--  if (__n == 0)
--    return NULL;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "repne; scasb\n\t"
--     "je 1f\n\t"
--     "movl $1,%0\n"
--     "1:"
--     : "=D" (__res), "=&c" (__d0)
--     : "a" (__c), "0" (__s), "1" (__n),
--       "m" ( *(struct { __extension__ char __x[__n]; } *)__s)
--     : "cc");
--  return __res - 1;
--}
--#endif
--
--#define _HAVE_STRING_ARCH_memrchr 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE void *
--__memrchr (__const void *__s, int __c, size_t __n)
--{
--  register unsigned long int __d0;
--  register void *__res;
--  if (__n == 0)
--    return NULL;
--  __asm__ __volatile__
--    ("std\n\t"
--     "repne; scasb\n\t"
--     "je 1f\n\t"
--     "orl $-1,%0\n"
--     "1:\tcld\n\t"
--     "incl %0"
--     : "=D" (__res), "=&c" (__d0)
--     : "a" (__c), "0" (__s + __n - 1), "1" (__n),
--       "m" ( *(struct { __extension__ char __x[__n]; } *)__s)
--     : "cc");
--  return __res;
--}
--# ifdef __USE_GNU
--#  define memrchr(s, c, n) __memrchr (s, c, n)
--# endif
--#endif
--
--/* Return the length of S.  */
--#define _HAVE_STRING_ARCH_strlen 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE size_t
--strlen (__const char *__str)
--{
--  register unsigned long int __d0;
--  register size_t __res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "repne; scasb\n\t"
--     "notl %0"
--     : "=c" (__res), "=&D" (__d0)
--     : "1" (__str), "a" (0), "0" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__str)
--     : "cc");
--  return __res - 1;
--}
--#endif
--
--/* Copy SRC to DEST.  */
--#define _HAVE_STRING_ARCH_strcpy 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE char *
--strcpy (char *__dest, __const char *__src)
--{
--  register unsigned long int __d0, __d1;
--  __asm__ __volatile__
--    ("cld\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "stosb\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b"
--     : "=&S" (__d0), "=&D" (__d1)
--     : "0" (__src), "1" (__dest)
--     : "ax", "memory", "cc");
--  return __dest;
--}
--#endif
--
--/* Copy no more than N characters of SRC to DEST.  */
--#define _HAVE_STRING_ARCH_strncpy 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE char *
--strncpy (char *__dest, __const char *__src, size_t __n)
--{
--  register unsigned long int __d0, __d1, __d2;
--  __asm__ __volatile__
--    ("cld\n"
--     "1:\n\t"
--     "decl	%2\n\t"
--     "js	2f\n\t"
--     "lodsb\n\t"
--     "stosb\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "rep; stosb\n"
--     "2:"
--     : "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
--     : "0" (__src), "1" (__dest), "2" (__n)
--     : "ax", "memory", "cc");
--  return __dest;
--}
--#endif
--
--/* Append SRC onto DEST.  */
--#define _HAVE_STRING_ARCH_strcat 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE char *
--strcat (char *__dest, __const char *__src)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "repne; scasb\n\t"
--     "decl	%1\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "stosb\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b"
--     : "=&S" (__d0), "=&D" (__d1), "=&c" (__d2), "=&a" (__d3)
--     : "0" (__src), "1" (__dest), "2" (0xffffffff), "3" (0)
--     : "memory", "cc");
--  return __dest;
--}
--#endif
--
--/* Append no more than N characters from SRC onto DEST.  */
--#define _HAVE_STRING_ARCH_strncat 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE char *
--strncat (char *__dest, __const char *__src, size_t __n)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "repne; scasb\n\t"
--     "decl	%1\n\t"
--     "movl	%4,%2\n"
--     "1:\n\t"
--     "decl	%2\n\t"
--     "js	2f\n\t"
--     "lodsb\n\t"
--     "stosb\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "jmp	3f\n"
--     "2:\n\t"
--     "xorl	%3,%3\n\t"
--     "stosb\n"
--     "3:"
--     : "=&S" (__d0), "=&D" (__d1), "=&c" (__d2), "=&a" (__d3)
--     : "g" (__n), "0" (__src), "1" (__dest), "2" (0xffffffff), "3" (0)
--     : "memory", "cc");
--  return __dest;
--}
--#endif
--
--/* Compare S1 and S2.  */
--#define _HAVE_STRING_ARCH_strcmp 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE int
--strcmp (__const char *__s1, __const char *__s2)
--{
--  register unsigned long int __d0, __d1;
--  register int __res;
--  __asm__ __volatile__
--    ("cld\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "scasb\n\t"
--     "jne	2f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "xorl	%%eax,%%eax\n\t"
--     "jmp	3f\n"
--     "2:\n\t"
--     "sbbl	%%eax,%%eax\n\t"
--     "orb	$1,%%al\n"
--     "3:"
--     : "=a" (__res), "=&S" (__d0), "=&D" (__d1)
--     : "1" (__s1), "2" (__s2),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s1),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s2)
--     : "cc");
--  return __res;
--}
--#endif
--
--/* Compare N characters of S1 and S2.  */
--#define _HAVE_STRING_ARCH_strncmp 1
--#ifndef _FORCE_INLINES
--__STRING_INLINE int
--strncmp (__const char *__s1, __const char *__s2, size_t __n)
--{
--  register unsigned long int __d0, __d1, __d2;
--  register int __res;
--  __asm__ __volatile__
--    ("cld\n"
--     "1:\n\t"
--     "decl	%3\n\t"
--     "js	2f\n\t"
--     "lodsb\n\t"
--     "scasb\n\t"
--     "jne	3f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n"
--     "2:\n\t"
--     "xorl	%%eax,%%eax\n\t"
--     "jmp	4f\n"
--     "3:\n\t"
--     "sbbl	%%eax,%%eax\n\t"
--     "orb	$1,%%al\n"
--     "4:"
--     : "=a" (__res), "=&S" (__d0), "=&D" (__d1), "=&c" (__d2)
--     : "1" (__s1), "2" (__s2), "3" (__n),
--       "m" ( *(struct { __extension__ char __x[__n]; } *)__s1),
--       "m" ( *(struct { __extension__ char __x[__n]; } *)__s2)
--     : "cc");
--  return __res;
--}
--#endif
--
--/* Find the first occurrence of C in S.  */
--#define _HAVE_STRING_ARCH_strchr 1
--#define _USE_STRING_ARCH_strchr 1
--#define strchr(s, c) \
--  (__extension__ (__builtin_constant_p (c)				      \
--		  ? __strchr_c (s, ((c) & 0xff) << 8)			      \
--		  : __strchr_g (s, c)))
--
--__STRING_INLINE char *__strchr_g (__const char *__s, int __c);
--
--__STRING_INLINE char *
--__strchr_g (__const char *__s, int __c)
--{
--  register unsigned long int __d0;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "movb	%%al,%%ah\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "cmpb	%%ah,%%al\n\t"
--     "je	2f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "movl	$1,%1\n"
--     "2:\n\t"
--     "movl	%1,%0"
--     : "=a" (__res), "=&S" (__d0)
--     : "0" (__c), "1" (__s),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res - 1;
--}
--
--__STRING_INLINE char *__strchr_c (__const char *__s, int __c);
--
--__STRING_INLINE char *
--__strchr_c (__const char *__s, int __c)
--{
--  register unsigned long int __d0;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "1:\n\t"
--     "lodsb\n\t"
--     "cmpb	%%ah,%%al\n\t"
--     "je	2f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "movl	$1,%1\n"
--     "2:\n\t"
--     "movl	%1,%0"
--     : "=a" (__res), "=&S" (__d0)
--     : "0" (__c), "1" (__s),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res - 1;
--}
--
--
--/* Find the first occurrence of C in S or the final NUL byte.  */
--#define _HAVE_STRING_ARCH_strchrnul 1
--#define __strchrnul(s, c) \
--  (__extension__ (__builtin_constant_p (c)				      \
--		  ? ((c) == '\0'					      \
--		     ? (char *) __rawmemchr (s, c)			      \
--		     : __strchrnul_c (s, ((c) & 0xff) << 8))		      \
--		  : __strchrnul_g (s, c)))
--
--__STRING_INLINE char *__strchrnul_g (__const char *__s, int __c);
--
--__STRING_INLINE char *
--__strchrnul_g (__const char *__s, int __c)
--{
--  register unsigned long int __d0;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "movb	%%al,%%ah\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "cmpb	%%ah,%%al\n\t"
--     "je	2f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "2:\n\t"
--     "movl	%1,%0"
--     : "=a" (__res), "=&S" (__d0)
--     : "0" (__c), "1" (__s),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res - 1;
--}
--
--__STRING_INLINE char *__strchrnul_c (__const char *__s, int __c);
--
--__STRING_INLINE char *
--__strchrnul_c (__const char *__s, int __c)
--{
--  register unsigned long int __d0;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "1:\n\t"
--     "lodsb\n\t"
--     "cmpb	%%ah,%%al\n\t"
--     "je	2f\n\t"
--     "testb	%%al,%%al\n\t"
--     "jne	1b\n\t"
--     "2:\n\t"
--     "movl	%1,%0"
--     : "=a" (__res), "=&S" (__d0)
--     : "0" (__c), "1" (__s),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res - 1;
--}
--#ifdef __USE_GNU
--# define strchrnul(s, c) __strchrnul (s, c)
--#endif
--
--
--/* Return the length of the initial segment of S which
--   consists entirely of characters not in REJECT.  */
--#define _HAVE_STRING_ARCH_strcspn 1
--#ifndef _FORCE_INLINES
--# ifdef __PIC__
--__STRING_INLINE size_t
--strcspn (__const char *__s, __const char *__reject)
--{
--  register unsigned long int __d0, __d1, __d2;
--  register char *__res;
--  __asm__ __volatile__
--    ("pushl	%%ebx\n\t"
--     "cld\n\t"
--     "movl	%4,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%ebx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%4,%%edi\n\t"
--     "movl	%%ebx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "jne	1b\n"
--     "2:\n\t"
--     "popl	%%ebx"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
--     : "d" (__reject), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return (__res - 1) - __s;
--}
--# else
--__STRING_INLINE size_t
--strcspn (__const char *__s, __const char *__reject)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "movl	%5,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%edx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%5,%%edi\n\t"
--     "movl	%%edx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "jne	1b\n"
--     "2:"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
--     : "g" (__reject), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return (__res - 1) - __s;
--}
--# endif
--#endif
--
--
--/* Return the length of the initial segment of S which
--   consists entirely of characters in ACCEPT.  */
--#define _HAVE_STRING_ARCH_strspn 1
--#ifndef _FORCE_INLINES
--# ifdef __PIC__
--__STRING_INLINE size_t
--strspn (__const char *__s, __const char *__accept)
--{
--  register unsigned long int __d0, __d1, __d2;
--  register char *__res;
--  __asm__ __volatile__
--    ("pushl	%%ebx\n\t"
--     "cld\n\t"
--     "movl	%4,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%ebx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%4,%%edi\n\t"
--     "movl	%%ebx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "je	1b\n"
--     "2:\n\t"
--     "popl	%%ebx"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
--     : "r" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return (__res - 1) - __s;
--}
--# else
--__STRING_INLINE size_t
--strspn (__const char *__s, __const char *__accept)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "movl	%5,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%edx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%5,%%edi\n\t"
--     "movl	%%edx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "je	1b\n"
--     "2:"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
--     : "g" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return (__res - 1) - __s;
--}
--# endif
--#endif
--
--
--/* Find the first occurrence in S of any character in ACCEPT.  */
--#define _HAVE_STRING_ARCH_strpbrk 1
--#ifndef _FORCE_INLINES
--# ifdef __PIC__
--__STRING_INLINE char *
--strpbrk (__const char *__s, __const char *__accept)
--{
--  unsigned long int __d0, __d1, __d2;
--  register char *__res;
--  __asm__ __volatile__
--    ("pushl	%%ebx\n\t"
--     "cld\n\t"
--     "movl	%4,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%ebx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%4,%%edi\n\t"
--     "movl	%%ebx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "jne	1b\n\t"
--     "decl	%0\n\t"
--     "jmp	3f\n"
--     "2:\n\t"
--     "xorl	%0,%0\n"
--     "3:\n\t"
--     "popl	%%ebx"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&D" (__d2)
--     : "r" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res;
--}
--# else
--__STRING_INLINE char *
--strpbrk (__const char *__s, __const char *__accept)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t"
--     "movl	%5,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"
--     "movl	%%ecx,%%edx\n"
--     "1:\n\t"
--     "lodsb\n\t"
--     "testb	%%al,%%al\n\t"
--     "je	2f\n\t"
--     "movl	%5,%%edi\n\t"
--     "movl	%%edx,%%ecx\n\t"
--     "repne; scasb\n\t"
--     "jne	1b\n\t"
--     "decl	%0\n\t"
--     "jmp	3f\n"
--     "2:\n\t"
--     "xorl	%0,%0\n"
--     "3:"
--     : "=&S" (__res), "=&a" (__d0), "=&c" (__d1), "=&d" (__d2), "=&D" (__d3)
--     : "g" (__accept), "0" (__s), "1" (0), "2" (0xffffffff),
--       "m" ( *(struct { char __x[0xfffffff]; } *)__s)
--     : "cc");
--  return __res;
--}
--# endif
--#endif
--
--
--/* Find the first occurrence of NEEDLE in HAYSTACK.  */
--#define _HAVE_STRING_ARCH_strstr 1
--#ifndef _FORCE_INLINES
--# ifdef __PIC__
--__STRING_INLINE char *
--strstr (__const char *__haystack, __const char *__needle)
--{
--  register unsigned long int __d0, __d1, __d2;
--  register char *__res;
--  __asm__ __volatile__
--    ("pushl	%%ebx\n\t"
--     "cld\n\t" \
--     "movl	%4,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
--     "movl	%%ecx,%%ebx\n"
--     "1:\n\t"
--     "movl	%4,%%edi\n\t"
--     "movl	%%esi,%%eax\n\t"
--     "movl	%%ebx,%%ecx\n\t"
--     "repe; cmpsb\n\t"
--     "je	2f\n\t"		/* also works for empty string, see above */
--     "xchgl	%%eax,%%esi\n\t"
--     "incl	%%esi\n\t"
--     "cmpb	$0,-1(%%eax)\n\t"
--     "jne	1b\n\t"
--     "xorl	%%eax,%%eax\n\t"
--     "2:\n\t"
--     "popl	%%ebx"
--     : "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
--     : "r" (__needle), "0" (0), "1" (0xffffffff), "2" (__haystack)
--     : "memory", "cc");
--  return __res;
--}
--# else
--__STRING_INLINE char *
--strstr (__const char *__haystack, __const char *__needle)
--{
--  register unsigned long int __d0, __d1, __d2, __d3;
--  register char *__res;
--  __asm__ __volatile__
--    ("cld\n\t" \
--     "movl	%5,%%edi\n\t"
--     "repne; scasb\n\t"
--     "notl	%%ecx\n\t"
--     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
--     "movl	%%ecx,%%edx\n"
--     "1:\n\t"
--     "movl	%5,%%edi\n\t"
--     "movl	%%esi,%%eax\n\t"
--     "movl	%%edx,%%ecx\n\t"
--     "repe; cmpsb\n\t"
--     "je	2f\n\t"		/* also works for empty string, see above */
--     "xchgl	%%eax,%%esi\n\t"
--     "incl	%%esi\n\t"
--     "cmpb	$0,-1(%%eax)\n\t"
--     "jne	1b\n\t"
--     "xorl	%%eax,%%eax\n\t"
--     "2:"
--     : "=&a" (__res), "=&c" (__d0), "=&S" (__d1), "=&d" (__d2), "=&D" (__d3)
--     : "g" (__needle), "0" (0), "1" (0xffffffff), "2" (__haystack)
--     : "memory", "cc");
--  return __res;
--}
--# endif
--#endif
--
--#ifndef _FORCE_INLINES
--# undef __STRING_INLINE
--#endif
--
--#endif	/* use string inlines && GNU CC */
 --- libc/sysdeps/i386/i686/memusage.h.jj	2006-02-09 22:35:54.000000000 +0100
 +++ libc/sysdeps/i386/i686/memusage.h	2006-02-09 22:35:54.000000000 +0100
 @@ -0,0 +1,22 @@

glibc-aio-rh171968.patch:
 nptl/sysdeps/pthread/aio_misc.h |   74 +++++++++++++++++++++++
 rt/Makefile                     |    3 
 rt/tst-aio10.c                  |  119 ++++++++++++++++++++++++++++++++++++++
 rt/tst-aio9.c                   |  124 ++++++++++++++++++++++++++++++++++++++++
 sysdeps/pthread/aio_misc.h      |    2 
 sysdeps/pthread/aio_notify.c    |   16 +++--
 sysdeps/pthread/aio_suspend.c   |   36 ++++++++++-
 sysdeps/pthread/lio_listio.c    |   12 +++
 8 files changed, 376 insertions(+), 10 deletions(-)

Index: glibc-aio-rh171968.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-aio-rh171968.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-aio-rh171968.patch	23 Feb 2006 08:49:04 -0000	1.1
+++ glibc-aio-rh171968.patch	23 Feb 2006 14:39:32 -0000	1.2
@@ -19,10 +19,6 @@
 
 2006-01-05  Ulrich Drepper  <drepper at redhat.com>
 
-	* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_futex_wait):
-	Return status.
-	(lll_futex_timed_wait): Define.
-	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
 	* sysdeps/pthread/aio_misc.h: New file.
 
 --- libc/sysdeps/pthread/aio_misc.h.jj	2003-08-14 02:01:40.000000000 +0200
@@ -503,46 +499,6 @@
 +#define TEST_FUNCTION do_test ()
 +#define TIMEOUT 5
 +#include "../test-skeleton.c"
---- libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h.jj	2004-03-24 07:35:18.000000000 +0100
-+++ libc/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
-@@ -66,17 +66,33 @@
- 
- 
- #define lll_futex_wait(futex, val) \
--  do {									      \
--    int __ignore;							      \
-+  ({									      \
-+    int __status;							      \
-     register __typeof (val) _val asm ("edx") = (val);			      \
-     __asm __volatile (LLL_EBX_LOAD					      \
- 		      LLL_ENTER_KERNEL					      \
- 		      LLL_EBX_LOAD					      \
--		      : "=a" (__ignore)					      \
-+		      : "=a" (__status)					      \
- 		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (0),	      \
- 			"c" (FUTEX_WAIT), "d" (_val),			      \
- 			"i" (offsetof (tcbhead_t, sysinfo)));		      \
--  } while (0)
-+    __status;								      \
-+  })
-+
-+
-+#define lll_futex_timed_wait(futex, val, timeout)			      \
-+  ({									      \
-+    int __status;							      \
-+    register __typeof (val) _val asm ("edx") = (val);			      \
-+    __asm __volatile (LLL_EBX_LOAD					      \
-+		      LLL_ENTER_KERNEL					      \
-+		      LLL_EBX_LOAD					      \
-+		      : "=a" (__status)					      \
-+		      : "0" (SYS_futex), LLL_EBX_REG (futex), "S" (timeout),  \
-+			"c" (FUTEX_WAIT), "d" (_val),			      \
-+			"i" (offsetof (tcbhead_t, sysinfo)));		      \
-+    __status;								      \
-+  })
- 
- 
- #define lll_futex_wake(futex, nr) \
 --- libc/nptl/sysdeps/pthread/aio_misc.h.jj	2006-02-22 19:02:58.000000000 +0100
 +++ libc/nptl/sysdeps/pthread/aio_misc.h	2006-02-22 19:02:58.000000000 +0100
 @@ -0,0 +1,74 @@
@@ -620,41 +576,3 @@
 +  } while (0)
 +
 +#include_next <aio_misc.h>
---- libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h.jj	2004-07-05 19:29:20.000000000 +0200
-+++ libc/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h	2006-02-22 19:02:58.000000000 +0100
-@@ -47,16 +47,31 @@
- 
- 
- #define lll_futex_wait(futex, val) \
--  do {									      \
--    int __ignore;							      \
-+  ({									      \
-+    int __status;							      \
-     register __typeof (val) _val asm ("edx") = (val);			      \
-     __asm __volatile ("xorq %%r10, %%r10\n\t"				      \
- 		      "syscall"						      \
--		      : "=a" (__ignore)					      \
-+		      : "=a" (__status)					      \
- 		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
- 			"d" (_val)					      \
- 		      : "memory", "cc", "r10", "r11", "cx");		      \
--  } while (0)
-+    __status;								      \
-+  })
-+
-+
-+#define lll_futex_timed_wait(futex, val, timeout)			      \
-+  ({									      \
-+    register const struct timespec *__to __asm__ ("r10") = timeout;	      \
-+    int __status;							      \
-+    register __typeof (val) _val asm ("edx") = (val);			      \
-+    __asm __volatile ("syscall"						      \
-+		      : "=a" (__status)					      \
-+		      : "0" (SYS_futex), "D" (futex), "S" (FUTEX_WAIT),	      \
-+		        "d" (_val), "r" (__to)				      \
-+		      : "memory", "cc", "r11", "cx");			      \
-+    __status;								      \
-+  })
- 
- 
- #define lll_futex_wake(futex, nr) \

glibc-rh168266.patch:
 include/sched.h   |    1 
 libio/genops.c    |   63 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 libio/libio.h     |   16 +++++++++----
 libio/libioP.h    |    2 -
 libio/memstream.c |    6 ++---
 5 files changed, 76 insertions(+), 12 deletions(-)

Index: glibc-rh168266.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-rh168266.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-rh168266.patch	23 Feb 2006 08:49:04 -0000	1.1
+++ glibc-rh168266.patch	23 Feb 2006 14:39:32 -0000	1.2
@@ -9,6 +9,8 @@
 	* libio/memstream.c (_IO_mem_finish): Fix potential memory leak if
 	realloc fails.
 
+	* include/sched.h: Add libc_hidden_proto for __sched_yield.
+
 	* libio/genops.c (_IO_unbuffer_write): Give concurrently running
 	threads the chance to work correctly by trying to lock the stream.
 	If this does not work, proceed without locking.
@@ -196,3 +198,13 @@
  extern int _IO_vsnprintf (char *string, _IO_size_t maxlen,
  			  __const char *format, _IO_va_list args) __THROW;
  
+--- libc/include/sched.h	3 Mar 2003 21:32:45 -0000	1.11
++++ libc/include/sched.h	11 Jan 2006 17:45:18 -0000	1.12
+@@ -10,6 +10,7 @@ extern int __sched_setscheduler (__pid_t
+ libc_hidden_proto (__sched_setscheduler)
+ extern int __sched_getscheduler (__pid_t __pid);
+ extern int __sched_yield (void);
++libc_hidden_proto (__sched_yield)
+ extern int __sched_get_priority_max (int __algorithm);
+ extern int __sched_get_priority_min (int __algorithm);
+ extern int __sched_rr_get_interval (__pid_t __pid, struct timespec *__t);


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- glibc.spec	23 Feb 2006 12:37:01 -0000	1.164
+++ glibc.spec	23 Feb 2006 14:39:32 -0000	1.165
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20050524T1606
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.6
-%define glibcrelease 1
+%define glibcrelease 2
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -66,7 +66,7 @@
 Patch31: glibc-s390-setjmp.patch
 Patch32: glibc-ctermid.patch
 Patch33: glibc-nan.patch
-Patch34: glibc-aio-rh171968.patch
+Patch34: glibc-i386-futex-timed-wait.patch
 Patch35: glibc-bz2126.patch
 Patch36: glibc-gconv-cache-memleak.patch
 Patch37: glibc-rh168266.patch
@@ -88,6 +88,7 @@
 Patch53: glibc-i386-futex-wait-barrier.patch
 Patch54: glibc-localedata-fixes.patch
 Patch55: glibc-i686-memset.patch
+Patch56: glibc-aio-rh171968.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -408,6 +409,7 @@
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
+#%patch56 -p1
 
 sed -i -e 's/2.3.5/2.3.6/' version.h
 
@@ -1454,6 +1456,11 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 Jakub Jelinek <jakub at redhat.com> 2.3.6-2
+- revert removal of i386/bits/string.h
+- avoid __sched_yield PLT slot in libc.so
+- revert interruptible aio_suspend changes
+
 * Thu Feb 23 2006 Jakub Jelinek <jakub at redhat.com> 2.3.6-1
 - selective update from CVS
   - fixed glibc BZ numbers:



From fedora-cvs-commits at redhat.com  Thu Feb 23 15:12:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 10:12:41 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.44,
	1.45 policy-20060207.patch, 1.19, 1.20 selinux-policy.spec,
	1.121, 1.122 sources, 1.48, 1.49
Message-ID: <200602231512.k1NFCf1L008948@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8870

Modified Files:
	.cvsignore policy-20060207.patch selinux-policy.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	22 Feb 2006 22:46:02 -0000	1.44
+++ .cvsignore	23 Feb 2006 15:12:37 -0000	1.45
@@ -45,3 +45,4 @@
 serefpolicy-2.2.18.tgz
 serefpolicy-2.2.19.tgz
 serefpolicy-2.2.20.tgz
+serefpolicy-2.2.21.tgz

policy-20060207.patch:
 admin/logwatch.te     |    2 ++
 admin/vpn.te          |    4 ++++
 apps/java.if          |    8 ++------
 kernel/devices.fc     |    1 +
 kernel/files.if       |    3 ++-
 kernel/files.te       |    1 +
 services/apache.fc    |    2 +-
 services/apache.if    |   21 +++++++++++++++++++++
 services/automount.te |    7 +++++--
 services/cron.te      |    3 +++
 services/hal.te       |    2 +-
 system/fstools.te     |    2 +-
 system/mount.te       |    2 +-
 system/selinuxutil.te |    5 +----
 14 files changed, 46 insertions(+), 17 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- policy-20060207.patch	22 Feb 2006 22:46:02 -0000	1.19
+++ policy-20060207.patch	23 Feb 2006 15:12:37 -0000	1.20
@@ -1,17 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/doc/Makefile.example serefpolicy-2.2.20/doc/Makefile.example
---- nsaserefpolicy/doc/Makefile.example	2006-02-22 14:08:56.000000000 -0500
-+++ serefpolicy-2.2.20/doc/Makefile.example	2006-02-22 14:29:48.000000000 -0500
-@@ -3,6 +3,6 @@
- 
- NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
- SHAREDIR ?= /usr/share/selinux
--HEADERDIR := $(SHAREDIR)/$(NAME)/include
-+HEADERDIR := $(SHAREDIR)/refpolicy/include
- 
- include $(HEADERDIR)/Makefile
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.20/policy/modules/admin/logwatch.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.21/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/admin/logwatch.te	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/logwatch.te	2006-02-23 09:41:46.000000000 -0500
 @@ -71,6 +71,8 @@
  
  selinux_dontaudit_getattr_dir(logwatch_t)
@@ -21,45 +10,9 @@
  userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
  userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.20/policy/modules/admin/su.if
---- nsaserefpolicy/policy/modules/admin/su.if	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/admin/su.if	2006-02-22 14:22:49.000000000 -0500
-@@ -220,6 +220,14 @@
- 		nscd_socket_use($1_su_t)
- 	')
- 
-+	# Modify .Xauthority file (via xauth program).
-+	optional_policy(`xserver',`
-+#		file_type_auto_trans($1_su_t, staff_home_dir_t, staff_xauth_home_t, file)
-+#		file_type_auto_trans($1_su_t, user_home_dir_t, user_xauth_home_t, file)
-+#		file_type_auto_trans($1_su_t, sysadm_home_dir_t, sysadm_xauth_home_t, file)
-+		xserver_domtrans_user_xauth($1, $1_su_t)
-+	')
-+
- 	ifdef(`TODO',`
- 	# Caused by su - init scripts
- 	dontaudit $1_su_t initrc_devpts_t:chr_file { getattr ioctl };
-@@ -235,17 +243,6 @@
- 	dontaudit $1_su_t home_dir_type:dir { search write };
- 	')
- 
--	# Modify .Xauthority file (via xauth program).
--	ifdef(`xauth.te', `
--	file_type_auto_trans($1_su_t, staff_home_dir_t, staff_xauth_home_t, file)
--	file_type_auto_trans($1_su_t, user_home_dir_t, user_xauth_home_t, file)
--	file_type_auto_trans($1_su_t, sysadm_home_dir_t, sysadm_xauth_home_t, file)
--	domain_auto_trans($1_su_t, xauth_exec_t, $1_xauth_t)
--	')
--
--	ifdef(`cyrus.te', `
--	allow $1_su_t cyrus_var_lib_t:dir search;
--	')
- 	ifdef(`ssh.te', `
- 	# Access sshd cookie files.
- 	allow $1_su_t sshd_tmp_t:file rw_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.20/policy/modules/admin/vpn.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.21/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/admin/vpn.te	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 09:41:46.000000000 -0500
 @@ -106,6 +106,10 @@
  
  optional_policy(`dbus',`
@@ -71,9 +24,9 @@
  ')
  
  optional_policy(`mount',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.20/policy/modules/apps/java.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.21/policy/modules/apps/java.if
 --- nsaserefpolicy/policy/modules/apps/java.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/apps/java.if	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/apps/java.if	2006-02-23 09:41:46.000000000 -0500
 @@ -149,13 +149,9 @@
  	userdom_manage_user_home_content_sockets($1,$1_javaplugin_t)
  	userdom_user_home_dir_filetrans_user_home_content($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
@@ -90,70 +43,20 @@
  
  		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.20/policy/modules/apps/slocate.te
---- nsaserefpolicy/policy/modules/apps/slocate.te	2006-01-25 15:58:58.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/apps/slocate.te	2006-02-22 14:22:49.000000000 -0500
-@@ -36,6 +36,8 @@
- 
- files_list_all(locate_t)
- files_getattr_all_files(locate_t)
-+# mls Higher level directories will be refused, so dontaudit
-+files_dontaudit_getattr_all_dirs(locate_t)
- files_read_etc_runtime_files(locate_t)
- files_read_etc_files(locate_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.20/policy/modules/kernel/devices.if
---- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/kernel/devices.if	2006-02-22 14:22:49.000000000 -0500
-@@ -1115,6 +1115,45 @@
- 
- ########################################
- ## <summary>
-+##	Setattr the dri devices.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_setattr_dri_dev',`
-+	gen_require(`
-+		type device_t, dri_device_t;
-+	')
-+
-+	allow $1 device_t:dir r_dir_perms;
-+	allow $1 dri_device_t:chr_file setattr;
-+')
-+
-+########################################
-+## <summary>
-+##	getattr the dri devices.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`dev_getattr_dri_dev',`
-+	gen_require(`
-+		type device_t, dri_device_t;
-+	')
-+
-+	allow $1 device_t:dir r_dir_perms;
-+	allow $1 dri_device_t:chr_file getattr;
-+')
-+
-+
-+########################################
-+## <summary>
- ##	Read input event devices (/dev/input).
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.20/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.21/policy/modules/kernel/devices.fc
+--- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/devices.fc	2006-02-23 10:01:17.000000000 -0500
+@@ -39,6 +39,7 @@
+ /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
+ /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
+ /dev/(misc/)?rtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
++/dev/efirtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
+ /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
+ /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.21/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/kernel/files.if	2006-02-22 17:28:29.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-23 09:41:46.000000000 -0500
 @@ -3358,10 +3358,11 @@
  	allow $1 self:process setfscreate;
  	allow $1 polymember: dir { create setattr };
@@ -167,9 +70,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.2.20/policy/modules/kernel/files.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.2.21/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/kernel/files.te	2006-02-22 17:01:45.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/files.te	2006-02-23 09:41:46.000000000 -0500
 @@ -125,6 +125,7 @@
  #
  type tmp_t, mountpoint; #, polydir
@@ -178,9 +81,9 @@
  
  #
  # usr_t is the type for /usr.
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.20/policy/modules/services/apache.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.21/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/apache.fc	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-23 09:41:46.000000000 -0500
 @@ -45,7 +45,7 @@
  /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -190,9 +93,9 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.20/policy/modules/services/apache.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.21/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/apache.if	2006-02-22 14:28:46.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/apache.if	2006-02-23 09:41:46.000000000 -0500
 @@ -94,6 +94,7 @@
  
  	corecmd_exec_bin(httpd_$1_script_t)
@@ -232,9 +135,18 @@
 +	allow $1 httpd_sys_content_t:dir r_dir_perms;
 +	allow $1 httpd_sys_content_t:file { getattr read };
 +')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.20/policy/modules/services/automount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.21/policy/modules/services/automount.te
 --- nsaserefpolicy/policy/modules/services/automount.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/automount.te	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/automount.te	2006-02-23 10:09:09.000000000 -0500
+@@ -28,7 +28,7 @@
+ # Local policy
+ #
+ 
+-allow automount_t self:capability { net_bind_service sys_nice dac_override };
++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:fifo_file rw_file_perms;
 @@ -83,6 +83,9 @@
  corenet_tcp_connect_portmap_port(automount_t)
  corenet_tcp_connect_all_ports(automount_t)
@@ -245,37 +157,18 @@
  
  dev_read_sysfs(automount_t)
  # for SSP
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.2.20/policy/modules/services/cron.if
---- nsaserefpolicy/policy/modules/services/cron.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/cron.if	2006-02-22 14:22:49.000000000 -0500
-@@ -434,6 +434,24 @@
+@@ -91,7 +94,7 @@
+ domain_use_interactive_fds(automount_t)
  
- ########################################
- ## <summary>
-+##	Read and write a cron daemon system pipe.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`cron_rw_system_pipes',`
-+	gen_require(`
-+		type system_crond_t;
-+	')
-+
-+	allow $1 system_crond_t:fifo_file { getattr read write };
-+')
-+
-+########################################
-+## <summary>
- ##	Read, and write cron daemon TCP sockets.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.20/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/cron.te	2006-02-22 14:22:49.000000000 -0500
+ files_dontaudit_write_var_dirs(automount_t)
+-files_search_var_lib(automount_t)
++files_getattr_all_dirs(automount_t)
+ files_list_mnt(automount_t)
+ files_getattr_home_dir(automount_t)
+ files_read_etc_files(automount_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.21/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-23 09:25:09.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/cron.te	2006-02-23 09:41:46.000000000 -0500
 @@ -360,6 +360,9 @@
  	optional_policy(`apache',`
  		# Needed	 for certwatch
@@ -286,84 +179,21 @@
  	')
  
  	optional_policy(`cyrus',`
-@@ -398,6 +401,10 @@
- 		prelink_delete_cache(system_crond_t)
- 	')
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.21/policy/modules/services/hal.te
+--- nsaserefpolicy/policy/modules/services/hal.te	2006-02-21 14:40:23.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/hal.te	2006-02-23 10:11:00.000000000 -0500
+@@ -93,7 +93,7 @@
+ 
+ fs_getattr_all_fs(hald_t)
+ fs_search_all(hald_t)
+-fs_search_auto_mountpoints(hald_t)
++fs_list_auto_mountpoints(hald_t)
  
-+	optional_policy(`postfix',`
-+		postfix_read_config(system_crond_t)
-+	')	
-+
- 	optional_policy(`samba',`
- 		samba_read_config(system_crond_t)
- 		samba_read_log(system_crond_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.20/policy/modules/services/cups.if
---- nsaserefpolicy/policy/modules/services/cups.if	2006-02-10 21:34:13.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/cups.if	2006-02-22 14:22:49.000000000 -0500
-@@ -169,6 +169,25 @@
+ mls_file_read_up(hald_t)
  
- ########################################
- ## <summary>
-+##	write cups log files.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`cups_write_log',`
-+	gen_require(`
-+		type cupsd_log_t;
-+	')
-+
-+	logging_search_logs($1)
-+	allow $1 cupsd_log_t:file write;
-+')
-+
-+########################################
-+## <summary>
- ##	Connect to ptal over an unix domain stream socket.
- ## </summary>
- ## <param name="domain">
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.20/policy/modules/services/postfix.te
---- nsaserefpolicy/policy/modules/services/postfix.te	2006-02-21 14:40:24.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/postfix.te	2006-02-22 14:22:49.000000000 -0500
-@@ -440,6 +440,7 @@
- optional_policy(`crond',`
- 	cron_use_fd(postfix_postdrop_t)
- 	cron_rw_pipes(postfix_postdrop_t)
-+	cron_rw_system_pipes(postfix_postdrop_t)
- 	cron_use_system_job_fds(postfix_postdrop_t)
- 	cron_rw_system_job_pipes(postfix_postdrop_t)
- ')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.2.20/policy/modules/services/ssh.if
---- nsaserefpolicy/policy/modules/services/ssh.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/services/ssh.if	2006-02-22 14:22:49.000000000 -0500
-@@ -279,6 +279,8 @@
- 
- 	allow $1_ssh_agent_t { $1_ssh_agent_t $2 }:process signull;
- 
-+	allow $1_ssh_agent_t $1_ssh_agent_t:unix_stream_socket { connectto rw_socket_perms };
-+
- 	allow $1_ssh_t $1_ssh_agent_t:unix_stream_socket connectto;
- 
- 	# for ssh-add
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.20/policy/modules/system/authlogin.te
---- nsaserefpolicy/policy/modules/system/authlogin.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/authlogin.te	2006-02-22 14:22:49.000000000 -0500
-@@ -153,6 +153,8 @@
- dev_read_sysfs(pam_console_t)
- dev_getattr_apm_bios_dev(pam_console_t)
- dev_setattr_apm_bios_dev(pam_console_t)
-+dev_getattr_dri_dev(pam_console_t)
-+dev_setattr_dri_dev(pam_console_t)
- dev_getattr_framebuffer_dev(pam_console_t)
- dev_setattr_framebuffer_dev(pam_console_t)
- dev_getattr_misc_dev(pam_console_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.20/policy/modules/system/fstools.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.21/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/fstools.te	2006-02-22 14:22:49.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/fstools.te	2006-02-23 09:41:46.000000000 -0500
 @@ -45,7 +45,7 @@
  files_tmp_filetrans(fsadm_t, fsadm_tmp_t, { file dir })
  
@@ -373,158 +203,22 @@
  
  kernel_read_system_state(fsadm_t)
  kernel_read_kernel_sysctls(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.20/policy/modules/system/mount.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.21/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/mount.te	2006-02-22 14:22:49.000000000 -0500
-@@ -137,6 +137,8 @@
- 	samba_domtrans_smbmount(mount_t)
- ')
- 
-+userdom_mounton_generic_user_home_dir(mount_t)
-+
- ifdef(`TODO',`
- # TODO: Need to examine this further. Not sure how to handle this
- #type sysadm_mount_source_t, file_type, sysadmfile, $1_file_type;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.20/policy/modules/system/selinuxutil.fc
---- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-01-09 11:32:54.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.fc	2006-02-22 17:10:36.000000000 -0500
-@@ -39,3 +39,10 @@
- ifdef(`distro_debian', `
- /usr/share/selinux(/.*)?		gen_context(system_u:object_r:policy_src_t,s0)
- ')
-+
-+/usr/sbin/semodule		--	gen_context(system_u:object_r:semodule_exec_t,s0)
-+
-+/etc/selinux/([^/]*/)?modules    -d	gen_context(system_u:object_r:selinux_config_t,s0)
-+/etc/selinux/([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semodule_store_t,s0)
-+/etc/selinux/([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semodule_read_lock_t,s0)
-+/etc/selinux/([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semodule_trans_lock_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.20/policy/modules/system/selinuxutil.if
---- nsaserefpolicy/policy/modules/system/selinuxutil.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.if	2006-02-22 14:22:49.000000000 -0500
-@@ -778,3 +778,90 @@
- 	allow $1 policy_src_t:dir create_dir_perms;
- 	allow $1 policy_src_t:file create_file_perms;
- ')
-+
-+########################################
-+## <summary>
-+##	Execute a domain transition to run semodule.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed to transition.
-+##	</summary>
-+## </param>
-+#
-+interface(`semodule_domtrans',`
-+	gen_require(`
-+		type semodule_t, semodule_exec_t;
-+	')
-+	files_search_usr($1)
-+	corecmd_search_bin($1)
-+
-+	domain_auto_trans($1,semodule_exec_t,semodule_t)
-+
-+	allow $1 semodule_t:fd use;
-+	allow semodule_t $1:fd use;
-+	allow semodule_t $1:fifo_file rw_file_perms;
-+	allow semodule_t $1:process sigchld;
-+')
-+
-+
-+
-+########################################
-+## <summary>
-+##	Create, read, write, and delete files in
-+##	/etc/selinux/*/modules/*
-+##	such as mtab.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`seutil_manage_module_store_files',`
-+	gen_require(`
-+		type semodule_store_t;
-+	')
-+
-+	allow $1 semodule_store_t:dir rw_dir_perms;
-+	allow $1 semodule_store_t:file create_file_perms;
-+	type_transition $1 selinux_config_t:dir semodule_store_t;
-+')
-+
-+
-+#######################################
-+## <summary>
-+##	Get read lock on module store
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`seutil_module_get_read_lock',`
-+	gen_require(`
-+		type semodule_read_lock_t;
-+	')
-+
-+	allow $1 semodule_read_lock_t:file rw_file_perms;
-+')
-+
-+#######################################
-+## <summary>
-+##	Get trans lock on module store
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	The type of the process performing this action.
-+##	</summary>
-+## </param>
-+#
-+interface(`seutil_module_get_trans_lock',`
-+	gen_require(`
-+		type semodule_trans_lock_t;
-+	')
-+
-+	allow $1 semodule_trans_lock_t:file rw_file_perms;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.20/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/selinuxutil.te	2006-02-22 14:22:49.000000000 -0500
-@@ -103,6 +103,27 @@
- 
- ########################################
- #
-+# semodule Declarations
-+#
-+
-+type semodule_t;
-+domain_type(semodule_t)
-+role system_r types semodule_t;
-+
-+type semodule_exec_t;
-+domain_entry_file(semodule_t, semodule_exec_t)
-+
-+type semodule_store_t;
-+files_type(semodule_store_t)
-+
-+type semodule_read_lock_t;
-+files_type(semodule_read_lock_t)
-+
-+type semodule_trans_lock_t; 
-+files_type(semodule_trans_lock_t)
-+
-+########################################
-+#
- # Checkpolicy local policy
- #
- 
-@@ -183,6 +204,7 @@
++++ serefpolicy-2.2.21/policy/modules/system/mount.te	2006-02-23 10:11:48.000000000 -0500
+@@ -46,7 +46,7 @@
+ fs_unmount_all_fs(mount_t)
+ fs_remount_all_fs(mount_t)
+ fs_relabelfrom_all_fs(mount_t)
+-fs_search_auto_mountpoints(mount_t)
++fs_list_auto_mountpoints(mount_t)
+ fs_rw_tmpfs_chr_files(mount_t)
+ fs_read_tmpfs_symlinks(mount_t)
+ 
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.21/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-23 09:25:09.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.te	2006-02-23 09:41:46.000000000 -0500
+@@ -199,6 +199,7 @@
  libs_use_ld_so(load_policy_t)
  libs_use_shared_libs(load_policy_t)
  
@@ -532,7 +226,7 @@
  miscfiles_read_localization(load_policy_t)
  
  userdom_use_all_users_fds(load_policy_t)
-@@ -303,10 +325,6 @@
+@@ -319,10 +320,6 @@
  	nscd_socket_use(newrole_t)
  ')
  
@@ -543,128 +237,3 @@
  ########################################
  #
  # Restorecon local policy
-@@ -525,12 +543,53 @@
- 
- miscfiles_read_localization(setfiles_t)
- 
-+seutil_module_get_trans_lock(setfiles_t)
-+seutil_module_get_read_lock(setfiles_t)
-+ 
- userdom_use_all_users_fds(setfiles_t)
- # for config files in a home directory
- userdom_read_all_users_home_content_files(setfiles_t)
- 
--ifdef(`TODO',`
--# for upgrading glibc and other shared objects - without this the upgrade
--# scripts will put things in a state such that setfiles can not be run!
--allow setfiles_t lib_t:file { read execute };
--') dnl endif TODO
-+########################################
-+#
-+# semodule local policy
-+#
-+term_use_all_terms(semodule_t)
-+allow semodule_t policy_config_t:file { read write };
-+allow semodule_t self:unix_stream_socket create_stream_socket_perms;
-+
-+corecmd_exec_bin(semodule_t)
-+corecmd_exec_sbin(semodule_t)
-+
-+files_read_etc_files(semodule_t)
-+files_search_etc(semodule_t)
-+files_list_usr(semodule_t)
-+files_list_pids(semodule_t)
-+files_read_usr_files(semodule_t)
-+
-+kernel_read_system_state(semodule_t)
-+kernel_read_kernel_sysctls(semodule_t)
-+
-+libs_use_ld_so(semodule_t)
-+libs_use_shared_libs(semodule_t)
-+libs_use_lib_files(semodule_t)
-+
-+mls_file_write_down(semodule_t)
-+mls_rangetrans_target(semodule_t)
-+
-+seutil_search_default_contexts(semodule_t)
-+seutil_rw_file_contexts(semodule_t)
-+seutil_domtrans_setfiles(semodule_t)
-+seutil_domtrans_loadpolicy(semodule_t)
-+seutil_read_config(semodule_t)
-+seutil_manage_bin_policy(semodule_t)
-+seutil_use_newrole_fds(semodule_t)
-+
-+seutil_manage_module_store_files(semodule_t)
-+seutil_module_get_trans_lock(semodule_t)
-+seutil_module_get_read_lock(semodule_t)
-+
-+optional_policy(`selinux', `
-+	selinux_get_enforce_mode(semodule_t)
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.20/policy/modules/system/userdomain.if
---- nsaserefpolicy/policy/modules/system/userdomain.if	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/userdomain.if	2006-02-22 14:22:49.000000000 -0500
-@@ -145,6 +145,7 @@
- 	allow $1_t unpriv_userdomain:fd use;
- 
- 	kernel_read_kernel_sysctls($1_t)
-+	kernel_read_net_sysctls($1_t)
- 	kernel_dontaudit_list_unlabeled($1_t)
- 	kernel_dontaudit_getattr_unlabeled_files($1_t)
- 	kernel_dontaudit_getattr_unlabeled_symlinks($1_t)
-@@ -414,6 +415,8 @@
- 	optional_policy(`rpm',`
- 		files_getattr_var_lib_dirs($1_t)
- 		files_search_var_lib($1_t)
-+		rpm_read_db($1_t)
-+		rpm_dontaudit_manage_db($1_t)
- 	')
- 
- 	optional_policy(`samba',`
-@@ -4425,3 +4428,24 @@
- 	allow $1 user_home_dir_t:dir create_dir_perms;
- 	files_home_filetrans($1,user_home_dir_t)
- ')
-+
-+
-+########################################
-+## <summary>
-+##	mounton generic user home directories.
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain allowed access.
-+##	</summary>
-+## </param>
-+#
-+interface(`userdom_mounton_generic_user_home_dir',`
-+	gen_require(`
-+		attribute user_home_dir_type, user_home_type;
-+	')
-+
-+	allow $1 user_home_dir_type:dir mounton;
-+	allow $1 user_home_type:dir mounton;
-+')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.20/policy/modules/system/userdomain.te
---- nsaserefpolicy/policy/modules/system/userdomain.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.20/policy/modules/system/userdomain.te	2006-02-22 14:22:49.000000000 -0500
-@@ -75,7 +75,7 @@
- 	files_associate_tmp(user_home_t)
- 	fs_associate_tmpfs(user_home_t)
- 
--	type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, home_dir_type, home_type;
-+	type user_home_dir_t alias { staff_home_dir_t sysadm_home_dir_t }, user_home_dir_type, home_dir_type, home_type;
- 	files_type(user_home_dir_t)
- 	files_associate_tmp(user_home_dir_t)
- 	fs_associate_tmpfs(user_home_dir_t)
-@@ -364,6 +364,8 @@
- 			seutil_run_checkpolicy(secadm_t,secadm_r,admin_terminal)
- 			seutil_run_loadpolicy(secadm_t,secadm_r,admin_terminal)
- 			seutil_run_setfiles(secadm_t,secadm_r,admin_terminal)
-+			semodule_domtrans(secadm_t)
-+			role secadm_r types semodule_t;
- 			seutil_run_restorecon(secadm_t,secadm_r,admin_terminal)
- 		', `
- 			selinux_set_enforce_mode(sysadm_t)


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- selinux-policy.spec	22 Feb 2006 22:46:02 -0000	1.121
+++ selinux-policy.spec	23 Feb 2006 15:12:37 -0000	1.122
@@ -8,7 +8,7 @@
 %define CHECKPOLICYVER 1.29.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.20
+Version: 2.2.21
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -296,6 +296,9 @@
 
 %changelog
 
+* Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-1
+- Update to upstream
+
 * Wed Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.20-1
 - Fix load_policy to work on MLS
 - Fix cron_rw_system_pipes for postfix_postdrop_t


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	22 Feb 2006 22:46:02 -0000	1.48
+++ sources	23 Feb 2006 15:12:37 -0000	1.49
@@ -1 +1 @@
-16bf45c49cbe78b2c977cffc88884de2  serefpolicy-2.2.20.tgz
+fe84e844d9a838bd87d4e80f381141cb  serefpolicy-2.2.21.tgz



From fedora-cvs-commits at redhat.com  Thu Feb 23 15:53:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 10:53:37 -0500
Subject: rpms/gnome-applets/devel gnome-applets-2.13.4-stock-ticker.patch,
	NONE, 1.1 gnome-applets.spec, 1.114, 1.115
Message-ID: <200602231553.k1NFrbBY003449@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3434

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.13.4-stock-ticker.patch 
Log Message:
Make stock ticker work with gcc 4.1


gnome-applets-2.13.4-stock-ticker.patch:
 gtik.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gnome-applets-2.13.4-stock-ticker.patch ---
--- gnome-applets-2.13.4/gtik/gtik.c.vfs	2006-02-23 10:18:52.000000000 -0500
+++ gnome-applets-2.13.4/gtik/gtik.c	2006-02-23 10:16:52.000000000 -0500
@@ -251,6 +251,8 @@
 				       _("Could not retrieve the stock data."));
 		}
 	}
+
+	return 0;
 }
 
 /*-----------------------------------------------------------------*/


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- gnome-applets.spec	18 Feb 2006 05:52:34 -0000	1.114
+++ gnome-applets.spec	23 Feb 2006 15:53:34 -0000	1.115
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.4
-Release:  	3
+Release:  	4
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -29,6 +29,7 @@
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch4:		gnome-applets-2.11.1-cpufreq.patch
 Patch5:	        gnome-applets-2.13.4-warning.patch
+Patch6:	        gnome-applets-2.13.4-stock-ticker.patch
 
 URL:		http://www.gnome.org/
 
@@ -83,6 +84,7 @@
 %patch2 -p1 -b .use-builtin-apm
 %patch4 -p1 -b .cpufreq
 %patch5 -p1 -b .warning
+%patch6 -p1 -b .stock-ticker
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -178,6 +180,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-4
+- Make the stock ticker work with gcc 4.1
+
 * Sat Feb 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-3
 - Remove a warning from the stock ticker applet
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 15:54:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 10:54:41 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.115,1.116
Message-ID: <200602231554.k1NFsfq3011822@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11753

Modified Files:
	gnome-applets.spec 
Log Message:
Add bug ref



Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome-applets.spec	23 Feb 2006 15:53:34 -0000	1.115
+++ gnome-applets.spec	23 Feb 2006 15:54:39 -0000	1.116
@@ -181,7 +181,7 @@
 
 %changelog
 * Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-4
-- Make the stock ticker work with gcc 4.1
+- Make the stock ticker work with gcc 4.1 (#179528)
 
 * Sat Feb 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-3
 - Remove a warning from the stock ticker applet



From fedora-cvs-commits at redhat.com  Thu Feb 23 16:55:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 11:55:20 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.224, 1.225 anaconda.spec, 1.345,
	1.346 sources, 1.344, 1.345
Message-ID: <200602231655.k1NGtKBG026036@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25993/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.9-1 on branch devel from anaconda-10.92.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- .cvsignore	21 Feb 2006 23:04:07 -0000	1.224
+++ .cvsignore	23 Feb 2006 16:55:17 -0000	1.225
@@ -1 +1 @@
-anaconda-10.92.7.tar.bz2
+anaconda-10.92.9.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- anaconda.spec	22 Feb 2006 22:15:19 -0000	1.345
+++ anaconda.spec	23 Feb 2006 16:55:17 -0000	1.346
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.8
+Version: 10.92.9
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb 23 2006 Jeremy Katz <katzj at redhat.com> - 10.92.9-1
+- Fix text mode traceback (dcantrel)
+- Skip a few more things in traceback dumps
+- Attempt to fix pkgorder so that we require less CDs for "normal" installs
+
 * Wed Feb 22 2006 David Cantrell <dcantrell at redhat.com> 10.92.8-1
 - Removed obsolete bogl code (katzj)
 - Removed unused code in upgrade.py (pnasrat)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- sources	22 Feb 2006 22:15:20 -0000	1.344
+++ sources	23 Feb 2006 16:55:17 -0000	1.345
@@ -1 +1 @@
-1e2f1bdbe03a1870cadbf34a322f8f80  anaconda-10.92.8.tar.bz2
+453514968583f222a03aadfdbdab77f6  anaconda-10.92.9.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 17:20:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 12:20:38 -0500
Subject: rpms/avahi/devel avahi.spec,1.41,1.42
Message-ID: <200602231720.k1NHKcdK014136@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14080

Modified Files:
	avahi.spec 
Log Message:
upgrade to 0.6.8; fix bug 182462


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- avahi.spec	17 Feb 2006 17:39:31 -0000	1.41
+++ avahi.spec	23 Feb 2006 17:20:33 -0000	1.42
@@ -3,7 +3,7 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.7
+Version:        0.6.8
 Release: 	1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
@@ -15,6 +15,7 @@
 BuildRequires: mono-devel >= 1.1.13
 %endif
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
+Requires(post): initscripts, chkconfig, ldconfig
 Obsoletes:	howl, howl-libs
 Source0:        %{name}-%{version}.tar.gz
 Patch1:		avahi-0.5.2-fedora.patch
@@ -321,10 +322,14 @@
 %endif
 
 %changelog
-* Fri Feb 17 2006 Jason Vas Dias <jvdias at redhat.com> 0.6.7-1
+* Thu Feb 23 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.8-1
+- Upgrade to upstream version 0.6.8
+- fix bug 182462: +Requires(post): initscripts, chkconfig, ldconfig
+
+* Fri Feb 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.7-1
 - Upgrade to upstream version 0.6.7
 
-* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 0.6.6-4
+* Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> - 0.6.6-4
 - BuildRequires pygtk2
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.6.6-3.1



From fedora-cvs-commits at redhat.com  Thu Feb 23 17:21:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 12:21:16 -0500
Subject: rpms/avahi/devel .cvsignore,1.9,1.10 sources,1.9,1.10
Message-ID: <200602231721.k1NHLGpU014453@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14424

Modified Files:
	.cvsignore sources 
Log Message:
upgrade to 0.6.8; fix bug 182462


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	17 Feb 2006 17:39:31 -0000	1.9
+++ .cvsignore	23 Feb 2006 17:21:13 -0000	1.10
@@ -6,3 +6,4 @@
 avahi-0.6.5.tar.gz
 avahi-0.6.6.tar.gz
 avahi-0.6.7.tar.gz
+avahi-0.6.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	17 Feb 2006 17:39:31 -0000	1.9
+++ sources	23 Feb 2006 17:21:13 -0000	1.10
@@ -1 +1 @@
-4cfb24b5c9063180f9eee2ef30beac53  avahi-0.6.7.tar.gz
+28ef3c1f15d03f0dc73c9289a434d37c  avahi-0.6.8.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 17:46:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 12:46:41 -0500
Subject: rpms/sysklogd/devel sysklogd.spec,1.34,1.35
Message-ID: <200602231746.k1NHkfSF024463@cvs.devel.redhat.com>

Author: jvdias

Update of /cvs/dist/rpms/sysklogd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19366

Modified Files:
	sysklogd.spec 
Log Message:
fix bug 182605


Index: sysklogd.spec
===================================================================
RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sysklogd.spec	11 Feb 2006 05:46:18 -0000	1.34
+++ sysklogd.spec	23 Feb 2006 17:46:26 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons.
 Name: sysklogd
 Version: 1.4.1
-Release: 34.2
+Release: 36
 License: GPL
 Group: System Environment/Daemons
 Source: sysklogd-%{version}rh.tar.gz
@@ -65,13 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for n in /var/log/{messages,secure,maillog,spooler}
-do
-	[ -f $n ] && continue
-	touch $n
-	chmod 600 $n
-done
-/sbin/chkconfig --add syslog
+if [ "$1" -eq 1 ]; then
+   /sbin/chkconfig --add syslog
+fi
 
 %preun
 if [ $1 = 0 ]; then
@@ -81,8 +77,14 @@
 
 %postun
 if [ "$1" -ge "1" ]; then
-	service syslog condrestart > /dev/null 2>&1
-fi	
+   for n in /var/log/{messages,secure,maillog,spooler}
+   do
+	[ -f $n ] && continue
+	touch $n
+	chmod 600 $n
+   done
+   service syslog condrestart > /dev/null 2>&1
+fi
 
 %triggerpostun -- sysklogd < 1.3.31-17
 /sbin/chkconfig --add syslog
@@ -101,6 +103,9 @@
 %{_mandir}/*/*
 
 %changelog
+* 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
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.4.1-34.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 17:50:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 12:50:09 -0500
Subject: rpms/evolution/devel evolution.spec,1.125,1.126
Message-ID: <200602231750.k1NHo9Dt024564@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24549

Modified Files:
	evolution.spec 
Log Message:
bump e-d-s build req



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- evolution.spec	15 Feb 2006 05:27:03 -0000	1.125
+++ evolution.spec	23 Feb 2006 17:50:05 -0000	1.126
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.5.2
+%define eds_version 1.5.91
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -639,6 +639,7 @@
 - updated patch 101 to track upstream changes to calendar printing code
 - remove uptreamed patch 807 (NM multiple initialization assertion)
 - readded the mail-to-task plugin XML UI file
+- bump e-d-s req to 1.5.91
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.5.90-2.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Feb 23 18:56:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 13:56:26 -0500
Subject: rpms/selinux-policy/devel Makefile.devel, 1.4,
	1.5 policy-20060207.patch, 1.20, 1.21 selinux-policy.spec,
	1.122, 1.123
Message-ID: <200602231856.k1NIuQh7015297@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15231

Modified Files:
	Makefile.devel policy-20060207.patch selinux-policy.spec 
Log Message:



Index: Makefile.devel
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/Makefile.devel,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.devel	22 Feb 2006 22:46:02 -0000	1.4
+++ Makefile.devel	23 Feb 2006 18:56:16 -0000	1.5
@@ -1,6 +1,5 @@
 # installation paths
 SHAREDIR := /usr/share/selinux
-HEADERDIR := $(SHAREDIR)/devel/include
 
 AWK ?= gawk
 NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
@@ -11,7 +10,7 @@
 endif
 
 TYPE ?= $(NAME)${MCSFLAG}
-
+HEADERDIR := $(SHAREDIR)/targeted/include
 include $(HEADERDIR)/Makefile
 
 

policy-20060207.patch:
 Makefile                              |   12 ++++++------
 policy/modules/admin/logwatch.te      |    2 ++
 policy/modules/admin/vpn.te           |    6 ++++++
 policy/modules/apps/java.if           |    8 ++------
 policy/modules/kernel/corecommands.fc |    1 +
 policy/modules/kernel/devices.fc      |    1 +
 policy/modules/kernel/files.if        |    3 ++-
 policy/modules/kernel/files.te        |    1 +
 policy/modules/services/apache.fc     |    2 +-
 policy/modules/services/apache.if     |   21 +++++++++++++++++++++
 policy/modules/services/automount.te  |    7 +++++--
 policy/modules/services/cron.te       |    3 +++
 policy/modules/services/hal.te        |    2 +-
 policy/modules/system/fstools.te      |    2 +-
 policy/modules/system/mount.te        |    2 +-
 policy/modules/system/selinuxutil.te  |    5 +----
 support/Makefile.devel                |    5 +----
 17 files changed, 56 insertions(+), 27 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- policy-20060207.patch	23 Feb 2006 15:12:37 -0000	1.20
+++ policy-20060207.patch	23 Feb 2006 18:56:16 -0000	1.21
@@ -1,3 +1,27 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.21/Makefile
+--- nsaserefpolicy/Makefile	2006-02-17 14:46:10.000000000 -0500
++++ serefpolicy-2.2.21/Makefile	2006-02-23 12:35:04.000000000 -0500
+@@ -446,14 +446,14 @@
+ 			$(MODDIR)/$$i/metadata.xml \
+ 			$(HEADERDIR)/$$i ;\
+ 	done
+-	$(verbose) echo "TYPE=$(TYPE)" > $(HEADERDIR)/build.conf
+-	$(verbose) echo "NAME=$(NAME)" >> $(HEADERDIR)/build.conf
++	$(verbose) echo "TYPE ?= $(TYPE)" > $(HEADERDIR)/build.conf
++	$(verbose) echo "NAME ?= $(NAME)" >> $(HEADERDIR)/build.conf
+ ifneq "$(DISTRO)" ""
+-	$(verbose) echo "DISTRO=$(DISTRO)" >> $(HEADERDIR)/build.conf
++	$(verbose) echo "DISTRO ?= $(DISTRO)" >> $(HEADERDIR)/build.conf
+ endif
+-	$(verbose) echo "MONOLITHIC=n" >> $(HEADERDIR)/build.conf
+-	$(verbose) echo "DIRECT_INITRC=$(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
+-	$(verbose) echo "POLY=$(POLY)" >> $(HEADERDIR)/build.conf
++	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
++	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
++	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
+ 	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.21/policy/modules/admin/logwatch.te
 --- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/admin/logwatch.te	2006-02-23 09:41:46.000000000 -0500
@@ -12,8 +36,17 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.21/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 09:41:46.000000000 -0500
-@@ -106,6 +106,10 @@
++++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 12:21:59.000000000 -0500
+@@ -91,6 +91,8 @@
+ libs_use_ld_so(vpnc_t)
+ libs_use_shared_libs(vpnc_t)
+ 
++locallogin_use_fd(vpnc_t)
++
+ logging_send_syslog_msg(vpnc_t)
+ 
+ miscfiles_read_localization(vpnc_t)
+@@ -106,6 +108,10 @@
  
  optional_policy(`dbus',`
  	dbus_system_bus_client_template(vpnc,vpnc_t)
@@ -43,6 +76,17 @@
  
  		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.21/policy/modules/kernel/corecommands.fc
+--- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-01-19 16:02:10.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/corecommands.fc	2006-02-23 13:32:13.000000000 -0500
+@@ -135,6 +135,7 @@
+ 
+ /usr/share/gnucash/finance-quote-check -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/gnucash/finance-quote-helper -- gen_context(system_u:object_r:bin_t,s0)
++/usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
+ /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.21/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-14 07:20:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/kernel/devices.fc	2006-02-23 10:01:17.000000000 -0500
@@ -237,3 +281,18 @@
  ########################################
  #
  # Restorecon local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.21/support/Makefile.devel
+--- nsaserefpolicy/support/Makefile.devel	2006-02-22 14:09:04.000000000 -0500
++++ serefpolicy-2.2.21/support/Makefile.devel	2006-02-23 12:38:25.000000000 -0500
+@@ -6,10 +6,7 @@
+ SED ?= sed
+ EINFO ?= echo
+ PYTHON ?= python
+-
+-NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config)
+-SHAREDIR ?= /usr/share/selinux
+-HEADERDIR ?= $(SHAREDIR)/$(NAME)/include
++HEADERDIR ?= .
+ 
+ include $(HEADERDIR)/build.conf
+ 


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- selinux-policy.spec	23 Feb 2006 15:12:37 -0000	1.122
+++ selinux-policy.spec	23 Feb 2006 18:56:17 -0000	1.123
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -32,6 +32,7 @@
 BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER}
 PreReq: policycoreutils >= %{POLICYCOREUTILSVER}
 Obsoletes: policy 
+Obsoletes: selinux-policy-devel
 
 %description 
 SELinux Base package
@@ -41,8 +42,15 @@
 %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
+%{_usr}/share/selinux/devel/include/*
+%{_usr}/share/selinux/devel/Makefile
+%{_usr}/share/selinux/devel/policygentool
+%{_usr}/share/selinux/devel/example.*
+
 
 %define setupCmds() \
 make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
@@ -71,6 +79,7 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
 install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux/%1/setrans.conf \
+ln -sf ../devel/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/include \
 %nil
 
 %define fileList() \
@@ -100,7 +109,8 @@
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts \
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/homedir_template \
 %ghost %{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \
-%config %{_sysconfdir}/selinux/%1/contexts/files/media
+%config %{_sysconfdir}/selinux/%1/contexts/files/media \
+%{_usr}/share/selinux/%1/include
 
 %define saveFileContext() \
 if [ -s /etc/selinux/config ]; then \
@@ -113,7 +123,7 @@
 
 %define rebuildpolicy() \
 ( cd /usr/share/selinux/%1; \
-x=`ls | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
+x=`ls *.pp | grep -v -e base.pp -e enableaudit.pp | awk '{ print "-i " $1 }'`; \
 semodule -b base.pp $x -s %1; \
 );\
 rm -f %{_sysconfdir}/selinux/%1/policy/policy.*.rpmnew
@@ -144,6 +154,15 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config
 touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/selinux
 
+# Install devel
+make clean
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
+mkdir ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
+mv ${RPM_BUILD_ROOT}%{_usr}/share/selinux/targeted/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include
+install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
+install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile
+install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
+
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
 %setupCmds targeted targeted-mcs y
@@ -159,14 +178,6 @@
 %setupCmds mls strict-mls n
 %installCmds mls strict-mls n
 
-# Install devel
-make clean
-make NAME=devel TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
-install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
-install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile
-install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/doc/%{name}-%{version}/Makefile.example
-
-
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
 
@@ -243,8 +254,9 @@
 %saveFileContext mls
 
 %post mls 
-%rebuildpolicy mls 
+%rebuildpolicy mls
 %relabel mls
+ln -sf ../devel/include /usr/share/selinux/mls/include
 
 %triggerpostun mls -- mls <= 2.0.7
 %{rebuildpolicy} mls 
@@ -268,8 +280,9 @@
 %saveFileContext strict
 
 %post strict 
-%rebuildpolicy strict 
+%rebuildpolicy strict
 %relabel strict
+ln -sf ../devel/include /usr/share/selinux/strict/include
 
 %triggerpostun strict -- strict <= 2.0.7
 %{rebuildpolicy} strict 
@@ -277,25 +290,11 @@
 %files strict
 %fileList strict
 
-%package devel
-Summary: SELinux policy devel sources
-Group: System Environment/Base
-Prereq: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} make
-Prereq: selinux-policy = %{version}-%{release}
-
-%description devel
-SELinux Reference policy development files
-
-%files devel
-%defattr(-,root,root) 
-%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
-
 %changelog
 
+* Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-2
+- Fix policy update model.
+
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-1
 - Update to upstream
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 18:57:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 13:57:09 -0500
Subject: rpms/gnome-games/devel .cvsignore, 1.33, 1.34 gnome-games.spec, 1.67,
	1.68 sources, 1.36, 1.37
Message-ID: <200602231857.k1NIv9JD015715@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15653

Modified Files:
	.cvsignore gnome-games.spec sources 
Log Message:
2.13.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	13 Feb 2006 12:31:26 -0000	1.33
+++ .cvsignore	23 Feb 2006 18:57:06 -0000	1.34
@@ -3,3 +3,4 @@
 gnome-games-2.13.5.tar.bz2
 gnome-games-2.13.6.tar.bz2
 gnome-games-2.13.7.tar.bz2
+gnome-games-2.13.8.tar.bz2


Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- gnome-games.spec	13 Feb 2006 12:36:25 -0000	1.67
+++ gnome-games.spec	23 Feb 2006 18:57:06 -0000	1.68
@@ -10,7 +10,7 @@
 
 Summary: GNOME games.
 Name: gnome-games
-Version: 2.13.7
+Version: 2.13.8
 Release: 1 
 Epoch: 1
 License: LGPL
@@ -177,6 +177,9 @@
 
 
 %changelog
+* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.8-1
+- Update to 2.13.8
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.7-1
 - Update to 2.13.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	13 Feb 2006 12:31:37 -0000	1.36
+++ sources	23 Feb 2006 18:57:06 -0000	1.37
@@ -1,2 +1,2 @@
 19b2d6dbca182fb426a0bd86d322a2ac  gnome-games-extra-data-no-windows-2.12.0.tar.bz2
-5bf973558832c376d43227be44e3c405  gnome-games-2.13.7.tar.bz2
+e77e383131026660609f93c56136e0ca  gnome-games-2.13.8.tar.bz2



From fedora-cvs-commits at redhat.com  Thu Feb 23 19:08:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 14:08:30 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.10,1.11
Message-ID: <200602231908.k1NJ8UNm017467@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17438

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Commenting out index.build in offending plugins to avoid ppc64 index generation bug.

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.jdt.doc.isv/buildDoc.xml                                                       |    2 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.pde.doc.user/buildDoc.xml                                                      |    2 
 plugins/org.eclipse.platform.doc.isv/build.xml                                                     |    2 
 plugins/org.eclipse.platform.doc.isv/buildDoc.xml                                                  |    2 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 22 files changed, 1605 insertions(+), 9 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-ppc64.patch	23 Feb 2006 14:27:45 -0000	1.10
+++ eclipse-ppc64.patch	23 Feb 2006 19:08:26 -0000	1.11
@@ -1786,13 +1786,36 @@
  				<pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86/@dot"/>
  				<pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/>
---- plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 09:02:02.000000000 -0500
-+++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 09:02:35.000000000 -0500
-@@ -14,6 +14,7 @@
+--- plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 13:54:01.000000000 -0500
++++ plugins/org.eclipse.platform.doc.isv/buildDoc.xml	2006-02-23 13:59:38.000000000 -0500
+@@ -8,7 +8,7 @@
+ 		<antcall target="convertSchemaToHtml" />
+ 		<antcall target="examplesDocCopy" />
+ 		<antcall target="generateJavadoc" />
+-		<antcall target="build.index" />
++		<!--<antcall target="build.index" /> -->
+ 		<antcall target="createDocZip" />
+ 	</target>
  
+--- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-02-23 13:54:00.000000000 -0500
++++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml	2006-02-23 14:03:49.000000000 -0500
+@@ -9,7 +9,7 @@
+ 	<antcall target="convertSchemaToHtml" />
+ 	<antcall target="examplesDocCopy" />
+ 	<antcall target="generateJavadoc" />
+-	<antcall target="build.index" />
++	<!--<antcall target="build.index" /> -->
+ 	<antcall target="createDocZip" />
+ </target>
  
- 	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.isv" if="eclipse.running">
-+		<echo >****build.index****</echo>
- 		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}"/>
+--- plugins/org.eclipse.pde.doc.user/buildDoc.xml	2006-02-23 13:54:00.000000000 -0500
++++ plugins/org.eclipse.pde.doc.user/buildDoc.xml	2006-02-23 14:07:08.000000000 -0500
+@@ -7,7 +7,7 @@
+ 	<target name="all" depends="init" unless="doc.zip.present">
+ 		<antcall target="convertSchemaToHtml" />
+ 		<antcall target="generateJavadoc" />
+-		<antcall target="build.index" />
++		<!-- <antcall target="build.index" /> -->
+ 		<antcall target="createDocZip" />
  	</target>
  



From fedora-cvs-commits at redhat.com  Thu Feb 23 19:11:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 14:11:48 -0500
Subject: rpms/kernel/devel linux-2.6-x86_64-smp-on-uphw-cpucount.patch, 1.1,
	1.2
Message-ID: <200602231911.k1NJBmjO018949@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18875

Modified Files:
	linux-2.6-x86_64-smp-on-uphw-cpucount.patch 
Log Message:
be a little more verbose when we hit this


linux-2.6-x86_64-smp-on-uphw-cpucount.patch:
 smpboot.c |    5 +++++
 1 files changed, 5 insertions(+)

Index: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-smp-on-uphw-cpucount.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86_64-smp-on-uphw-cpucount.patch	21 Feb 2006 20:47:21 -0000	1.1
+++ linux-2.6-x86_64-smp-on-uphw-cpucount.patch	23 Feb 2006 19:11:44 -0000	1.2
@@ -1,12 +1,14 @@
 
 --- linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c~	2006-02-20 21:59:56.000000000 -0500
 +++ linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c	2006-02-20 22:01:57.000000000 -0500
-@@ -975,6 +975,9 @@ __init void prefill_possible_map(void)
+@@ -975,6 +975,11 @@ __init void prefill_possible_map(void)
  	if (possible > NR_CPUS) 
  		possible = NR_CPUS;
  
-+	if (possible == 0)	/* Could be SMP kernel on UP hw with broken BIOS */
++	if (possible == 0) {	/* Could be SMP kernel on UP hw with broken BIOS */
 +		possible = 1;
++		printk (KERN_DEBUG "BIOS never enumerated boot CPU.\n");
++	}
 +
  	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",
  		possible,



From fedora-cvs-commits at redhat.com  Thu Feb 23 19:12:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 14:12:36 -0500
Subject: rpms/kernel/devel linux-2.6-x86_64-smp-on-uphw-cpucount.patch, 1.2,
	1.3
Message-ID: <200602231912.k1NJCYNf019377@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19251

Modified Files:
	linux-2.6-x86_64-smp-on-uphw-cpucount.patch 
Log Message:
make it clear we're fixing it up.


linux-2.6-x86_64-smp-on-uphw-cpucount.patch:
 smpboot.c |    5 +++++
 1 files changed, 5 insertions(+)

Index: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-smp-on-uphw-cpucount.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86_64-smp-on-uphw-cpucount.patch	23 Feb 2006 19:11:44 -0000	1.2
+++ linux-2.6-x86_64-smp-on-uphw-cpucount.patch	23 Feb 2006 19:12:32 -0000	1.3
@@ -7,7 +7,7 @@
  
 +	if (possible == 0) {	/* Could be SMP kernel on UP hw with broken BIOS */
 +		possible = 1;
-+		printk (KERN_DEBUG "BIOS never enumerated boot CPU.\n");
++		printk (KERN_DEBUG "BIOS never enumerated boot CPU, fixing.\n");
 +	}
 +
  	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",



From fedora-cvs-commits at redhat.com  Thu Feb 23 19:46:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 14:46:26 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc4-git6.bz2.sign, NONE,
	1.1 .cvsignore, 1.358, 1.359 kernel-2.6.spec, 1.1976,
	1.1977 sources, 1.300, 1.301 upstream, 1.275,
	1.276 patch-2.6.16-rc4-git2.bz2.sign, 1.1, NONE
Message-ID: <200602231946.k1NJkQnE008378@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7350

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc4-git6.bz2.sign 
Removed Files:
	patch-2.6.16-rc4-git2.bz2.sign 
Log Message:
git6



--- NEW FILE patch-2.6.16-rc4-git6.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD/gasyGugalF9Dw4RAmqIAJ9xeqi6B775eASKfdpCPImL7soqRwCfY9Xx
XBjtTkrxADGPPxKsPiSf1ZU=
=i5IB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- .cvsignore	21 Feb 2006 20:47:20 -0000	1.358
+++ .cvsignore	23 Feb 2006 19:46:24 -0000	1.359
@@ -5,3 +5,4 @@
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
 patch-2.6.16-rc4-git2.bz2
+patch-2.6.16-rc4-git6.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1976
retrieving revision 1.1977
diff -u -r1.1976 -r1.1977
--- kernel-2.6.spec	21 Feb 2006 20:55:02 -0000	1.1976
+++ kernel-2.6.spec	23 Feb 2006 19:46:24 -0000	1.1977
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git2.bz2
+Patch2: patch-2.6.16-rc4-git6.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1585,6 +1585,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git6
+
 * Tue Feb 21 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git2
 - Make some more UP x86-64s able to boot an SMP kernel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- sources	21 Feb 2006 20:47:21 -0000	1.300
+++ sources	23 Feb 2006 19:46:24 -0000	1.301
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-53f745fae63332afa9528a17e110ed23  patch-2.6.16-rc4-git2.bz2
+f6db62546c61933115c9055f6ae309e9  patch-2.6.16-rc4-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- upstream	21 Feb 2006 20:47:21 -0000	1.275
+++ upstream	23 Feb 2006 19:46:24 -0000	1.276
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git2.bz2
+patch-2.6.16-rc4-git6.bz2


--- patch-2.6.16-rc4-git2.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:28:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:28:14 -0500
Subject: rpms/firefox/devel firefox-1.5-pango-typo.patch, NONE,
	1.1 firefox.spec, 1.103, 1.104 firefox-1.0-prdtoa.patch, 1.1, NONE
Message-ID: <200602232028.k1NKSELt012904@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12870

Modified Files:
	firefox.spec 
Added Files:
	firefox-1.5-pango-typo.patch 
Removed Files:
	firefox-1.0-prdtoa.patch 
Log Message:
* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-4
- Ensure our wrapper handles URLs with commas/spaces (Ilya Konstantinov)
- Fix a pango typo


firefox-1.5-pango-typo.patch:
 nsFontMetricsPango.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firefox-1.5-pango-typo.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=322928

Index: gfx/src/gtk/nsFontMetricsPango.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp,v
retrieving revision 1.16.2.2
diff -d -u -p -r1.16.2.2 nsFontMetricsPango.cpp
--- gfx/src/gtk/nsFontMetricsPango.cpp	16 Sep 2005 06:16:02 -0000	1.16.2.2
+++ gfx/src/gtk/nsFontMetricsPango.cpp	20 Feb 2006 19:15:19 -0000
@@ -981,7 +981,7 @@ nsFontMetricsPango::GetPosition(const PR
 
     // Jump to the end if it's not found.
     if (!found) {
-        if (inx = 0)
+        if (inx == 0)
             retval = 0;
         else if (trailing)
             retval = aLength;


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- firefox.spec	10 Feb 2006 22:45:22 -0000	1.103
+++ firefox.spec	23 Feb 2006 20:28:12 -0000	1.104
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        3
+Release:        4
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -34,7 +34,6 @@
 Source100:      find-external-requires
 
 # build patches
-Patch1:         firefox-1.0-prdtoa.patch
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         firefox-1.1-visibility.patch
@@ -57,6 +56,7 @@
 Patch81:        firefox-nopangoxft.patch
 
 # patches from upstream (Patch100+)
+Patch100:       firefox-1.5-pango-typo.patch
 
 # ---------------------------------------------------
 
@@ -118,6 +118,8 @@
 %patch42 -p0
 %patch81 -p1
 
+%patch100 -p0
+
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 %if %{official_branding}
@@ -262,6 +264,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-4
+- Ensure our wrapper handles URLs with commas/spaces (Ilya Konstantinov)
+- Fix a pango typo
+
 * Fri Feb 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-3
 - Improve the langpack install stuff
 - Fix up dumpstack.patch to match the finalized change


--- firefox-1.0-prdtoa.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:41:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:41:15 -0500
Subject: rpms/cman-kernel/devel cman-kernel.spec,1.143,1.144
Message-ID: <200602232041.k1NKfFfJ016439@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16408

Modified Files:
	cman-kernel.spec 
Log Message:
Updated Kernel Version


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- cman-kernel.spec	21 Feb 2006 22:07:35 -0000	1.143
+++ cman-kernel.spec	23 Feb 2006 20:41:02 -0000	1.144
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1955_FC5
+%define kernel_version 2.6.15-1.1975_FC5
 %define subversion 0
 %define tempversion 2.6.15
  
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.1
+Release: 0.FC5.2
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:41:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:41:35 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.133,1.134
Message-ID: <200602232041.k1NKfZDZ016743@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16708

Modified Files:
	gnbd-kernel.spec 
Log Message:
Updated Kernel Version


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnbd-kernel.spec	15 Feb 2006 23:33:30 -0000	1.133
+++ gnbd-kernel.spec	23 Feb 2006 20:41:32 -0000	1.134
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1955_FC5
+%define kernel_version 2.6.15-1.1975_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.7
+Release: 5.FC5.8
 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 Feb 23 20:41:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:41:47 -0500
Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.116,1.117
Message-ID: <200602232041.k1NKflT5016878@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/dlm-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16846

Modified Files:
	dlm-kernel.spec 
Log Message:
Updated Kernel Version


Index: dlm-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- dlm-kernel.spec	21 Feb 2006 22:03:25 -0000	1.116
+++ dlm-kernel.spec	23 Feb 2006 20:41:45 -0000	1.117
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1955_FC5
+%define kernel_version 2.6.15-1.1975_FC5
 %define subversion 0
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: dlm-kernel
 Version: 2.6.15
-Release: 0.FC5.0
+Release: 0.FC5.1
 License: GPL
 Group: System Environment/Kernel
 Summary: dlm-kernel - The Distributed Lock Manager kernel modules.



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:41:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:41:57 -0500
Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.136,1.137
Message-ID: <200602232041.k1NKfvgb017000@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16967

Modified Files:
	GFS-kernel.spec 
Log Message:
Updated Kernel Version


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- GFS-kernel.spec	16 Feb 2006 00:19:32 -0000	1.136
+++ GFS-kernel.spec	23 Feb 2006 20:41:55 -0000	1.137
@@ -12,7 +12,7 @@
 %define buildup 1
 %define buildsmp 1
 %define buildxen 0
-%define kernel_version 2.6.15-1.1955_FC5
+%define kernel_version 2.6.15-1.1975_FC5
 %define subversion 2
 
 %ifnarch i686
@@ -25,7 +25,7 @@
 
 Name: GFS-kernel
 Version: 2.6.15
-Release: 5.FC5.4
+Release: 5.FC5.5
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:46:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:46:43 -0500
Subject: rpms/libbtctl/devel libbtctl-0.6.0-crash.patch, NONE,
	1.1 libbtctl.spec, 1.27, 1.28
Message-ID: <200602232046.k1NKkhMV029890@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29043

Modified Files:
	libbtctl.spec 
Added Files:
	libbtctl-0.6.0-crash.patch 
Log Message:
Try a fix


libbtctl-0.6.0-crash.patch:
 btctl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libbtctl-0.6.0-crash.patch ---
--- libbtctl-0.6.0/src/btctl.c.crash	2006-02-23 15:43:57.000000000 -0500
+++ libbtctl-0.6.0/src/btctl.c	2006-02-23 15:44:21.000000000 -0500
@@ -163,7 +163,7 @@
 {
   static GQuark quark = 0;
   if (quark == 0)
-    quark = g_quark_from_static_string ("btctl error");
+    quark = g_quark_from_string ("btctl error");
   return quark;
 }
 


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libbtctl.spec	23 Feb 2006 09:48:51 -0000	1.27
+++ libbtctl.spec	23 Feb 2006 20:46:40 -0000	1.28
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -24,6 +24,7 @@
 
 Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
+Patch3: libbtctl-0.6.0-crash.patch
 
 %description
 Library for the GNOME Bluetooth Subsystem
@@ -45,6 +46,7 @@
 %setup -q
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .pydir
+%patch3 -p1 -b .crash
 aclocal
 automake -a
 autoconf
@@ -99,6 +101,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> 0.6.0-3
+- try a fix for (#179413)
+
 * Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 0.6.0-2
 - rebuild
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:46:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:46:58 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.134,1.135
Message-ID: <200602232046.k1NKkwSF031942@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31908

Modified Files:
	gnbd-kernel.spec 
Log Message:
Build for xen.


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnbd-kernel.spec	23 Feb 2006 20:41:32 -0000	1.134
+++ gnbd-kernel.spec	23 Feb 2006 20:46:55 -0000	1.135
@@ -11,7 +11,7 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1975_FC5
 %define subversion 2
 
@@ -25,7 +25,7 @@
 
 Name: gnbd-kernel
 Version: 2.6.15
-Release: 5.FC5.8
+Release: 5.FC5.9
 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 Feb 23 20:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:47:34 -0500
Subject: rpms/gdb/devel gdb-6.3-prelink-core-20060223.patch, NONE,
	1.1 gdb.spec, 1.172, 1.173
Message-ID: <200602232047.k1NKlYmV032285@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32101/gdb-devel

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-prelink-core-20060223.patch 
Log Message:
* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
- Enable gdb to debug core files and executables with mismatched
prelink base addresses.  Fixes BZ 175075.


gdb-6.3-prelink-core-20060223.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'gdb-6.3-prelink-core-20060223.patch'




From fedora-cvs-commits at redhat.com  Thu Feb 23 20:47:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:47:34 -0500
Subject: rpms/gdb/FC-4 gdb-6.3-prelink-core-20060223.patch, NONE,
	1.1 gdb.spec, 1.169, 1.170
Message-ID: <200602232047.k1NKlYcw032291@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32101/gdb-FC-4

Modified Files:
	gdb.spec 
Added Files:
	gdb-6.3-prelink-core-20060223.patch 
Log Message:
* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
- Enable gdb to debug core files and executables with mismatched
prelink base addresses.  Fixes BZ 175075.


gdb-6.3-prelink-core-20060223.patch:

***** Error reading new file: [Errno 2] No such file or directory: 'gdb-6.3-prelink-core-20060223.patch'




From fedora-cvs-commits at redhat.com  Thu Feb 23 20:48:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:48:54 -0500
Subject: rpms/gdb/devel gdb.spec,1.173,1.174
Message-ID: <200602232048.k1NKmspf000518@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv332/gdb-devel

Modified Files:
	gdb.spec 
Log Message:
Fix date of previous %changelog entry.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gdb.spec	23 Feb 2006 20:47:29 -0000	1.173
+++ gdb.spec	23 Feb 2006 20:48:51 -0000	1.174
@@ -541,10 +541,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.110
+* Thu Feb 23 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.110
 - Bump up release number.
 
-* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
+* Thu Feb 23 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
 - Enable gdb to debug core files and executables with mismatched
 prelink base addresses.  Fixes BZ 175075.
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:48:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:48:54 -0500
Subject: rpms/gdb/FC-4 gdb.spec,1.170,1.171
Message-ID: <200602232048.k1NKmsTd000530@cvs.devel.redhat.com>

Author: aoliva

Update of /cvs/dist/rpms/gdb/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv332/gdb-FC-4

Modified Files:
	gdb.spec 
Log Message:
Fix date of previous %changelog entry.



Index: gdb.spec
===================================================================
RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- gdb.spec	23 Feb 2006 20:47:30 -0000	1.170
+++ gdb.spec	23 Feb 2006 20:48:51 -0000	1.171
@@ -541,10 +541,10 @@
 # don't include the files in include, they are part of binutils
 
 %changelog
-* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.109
+* Thu Feb 23 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.109
 - Bump up release number.
 
-* Thu Feb 24 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
+* Thu Feb 23 2006 Alexandre Oliva <aoliva at redhat.com> - 6.3.0.0-1.107
 - Enable gdb to debug core files and executables with mismatched
 prelink base addresses.  Fixes BZ 175075.
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 20:57:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 15:57:16 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.28,1.29
Message-ID: <200602232057.k1NKvG1j004435@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4257

Modified Files:
	libbtctl.spec 
Log Message:
grr, built against the wrong libopenobex



Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libbtctl.spec	23 Feb 2006 20:46:40 -0000	1.28
+++ libbtctl.spec	23 Feb 2006 20:57:14 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 
@@ -101,7 +101,7 @@
 %endif
 
 %changelog
-* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> 0.6.0-3
+* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> 0.6.0-4
 - try a fix for (#179413)
 
 * Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 0.6.0-2



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:03:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:03:10 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.21,
	1.22 selinux-policy.spec, 1.123, 1.124
Message-ID: <200602232103.k1NL3AgR005505@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5440

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                              |   12 ++++++------
 policy/modules/admin/logwatch.te      |    2 ++
 policy/modules/admin/su.fc            |    1 +
 policy/modules/admin/vpn.te           |    6 ++++++
 policy/modules/apps/java.if           |    8 ++------
 policy/modules/kernel/corecommands.fc |    1 +
 policy/modules/kernel/devices.fc      |    1 +
 policy/modules/kernel/files.if        |    3 ++-
 policy/modules/kernel/files.te        |    1 +
 policy/modules/services/apache.fc     |    2 +-
 policy/modules/services/apache.if     |   21 +++++++++++++++++++++
 policy/modules/services/automount.te  |    7 +++++--
 policy/modules/services/cron.te       |    3 +++
 policy/modules/services/hal.te        |    2 +-
 policy/modules/services/xserver.te    |    2 +-
 policy/modules/system/fstools.te      |    2 +-
 policy/modules/system/mount.te        |    2 +-
 policy/modules/system/selinuxutil.te  |    5 +----
 policy/modules/system/unconfined.te   |    2 +-
 support/Makefile.devel                |    5 +----
 20 files changed, 59 insertions(+), 29 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- policy-20060207.patch	23 Feb 2006 18:56:16 -0000	1.21
+++ policy-20060207.patch	23 Feb 2006 21:02:28 -0000	1.22
@@ -34,6 +34,14 @@
  userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
  userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.21/policy/modules/admin/su.fc
+--- nsaserefpolicy/policy/modules/admin/su.fc	2005-11-14 18:24:06.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/su.fc	2006-02-23 14:49:18.000000000 -0500
+@@ -2,3 +2,4 @@
+ /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
+ 
+ /usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
++/usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.21/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 12:21:59.000000000 -0500
@@ -235,6 +243,18 @@
  
  mls_file_read_up(hald_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.21/policy/modules/services/xserver.te
+--- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/xserver.te	2006-02-23 14:10:50.000000000 -0500
+@@ -425,7 +425,7 @@
+ ifdef(`targeted_policy',`
+ 	allow xdm_xserver_t self:process { execheap execmem };
+ 
+-	unconfined_domain(xdm_xserver_t)
++	unconfined_domain_noaudit(xdm_xserver_t)
+ 	unconfined_domtrans(xdm_xserver_t)
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.21/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/fstools.te	2006-02-23 09:41:46.000000000 -0500
@@ -281,6 +301,18 @@
  ########################################
  #
  # Restorecon local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.21/policy/modules/system/unconfined.te
+--- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-20 14:07:38.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/unconfined.te	2006-02-23 15:44:10.000000000 -0500
+@@ -90,7 +90,7 @@
+ 	')
+ 
+ 	optional_policy(`fstools',`
+-		fstools_domtrans(unconfined_t)
++		fstools_exec(unconfined_t)
+ 	')
+ 
+ 	optional_policy(`java',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.21/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-22 14:09:04.000000000 -0500
 +++ serefpolicy-2.2.21/support/Makefile.devel	2006-02-23 12:38:25.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- selinux-policy.spec	23 Feb 2006 18:56:17 -0000	1.123
+++ selinux-policy.spec	23 Feb 2006 21:02:49 -0000	1.124
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -292,6 +292,9 @@
 
 %changelog
 
+* Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-3
+- Don't transition from uncofined_t to fsadm_t
+
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-2
 - Fix policy update model.
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:13:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:13:05 -0500
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.20,1.21
Message-ID: <200602232113.k1NLD5Z7007371@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7312

Modified Files:
	gnome-speech.spec 
Log Message:
- Get rid of devel package
- .so now available to bonobo




Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-speech.spec	11 Feb 2006 03:17:29 -0000	1.20
+++ gnome-speech.spec	23 Feb 2006 21:13:02 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.3.9
-Release: 1.2.1
+Release: 2 
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -13,6 +13,9 @@
 BuildRequires: libbonobo-devel
 Patch1: gnome-speech-0.3.5-java-configure.patch
 Patch2: gnome-speech-0.3.5-no-gnome-common.patch
+Provides: gnome-speech-devel
+Obsoletes: gnome-speech-devel < 0.3.9-2
+
 %ifarch i386
 Requires: festival
 %endif
@@ -61,9 +64,6 @@
 %{_bindir}/test-speech
 %{_libdir}/bonobo/servers/*
 %{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/gnome-speech-1.0
 %{_libdir}/pkgconfig/*pc
@@ -71,6 +71,10 @@
 
 
 %changelog
+* Thu Feb 23 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.9-2
+- Get rid of devel package 
+- .so now available to bonobo
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9-1.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:13:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:13:46 -0500
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.21,1.22
Message-ID: <200602232113.k1NLDkRq007712@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7564

Modified Files:
	gnome-speech.spec 
Log Message:
- get rid of devel section



Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-speech.spec	23 Feb 2006 21:13:02 -0000	1.21
+++ gnome-speech.spec	23 Feb 2006 21:13:44 -0000	1.22
@@ -23,15 +23,6 @@
 %description
 GNOME Speech
 
-%package devel
-Summary:	The files needed for developing an app using gnome-speech
-Group:		Development/Libraries
-Requires:	%name = %{PACKAGE_VERSION}
-Requires:	libbonobo-devel
-
-%description devel
-GNOME Speech devel
-
 %prep
 %setup -q
 %patch1 -p1 -b .java-configure



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:16:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:16:44 -0500
Subject: rpms/tomcat5/devel tomcat5.spec,1.60,1.61
Message-ID: <200602232116.k1NLGiMV017050@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16332

Modified Files:
	tomcat5.spec 
Log Message:
Added jasper-foo symlinks for jars.


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- tomcat5.spec	23 Feb 2006 01:32:42 -0000	1.60
+++ tomcat5.spec	23 Feb 2006 21:16:41 -0000	1.61
@@ -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_2fc
+Release: 1jpp_3fc
 Epoch: 0
 License: Apache Software License
 #Vendor: JPackage Project
@@ -544,6 +544,7 @@
         mv $i.jar $RPM_BUILD_ROOT%{_javadir}/$j-%{version}.jar
         pushd $RPM_BUILD_ROOT%{_javadir}
             ln -sf $j-%{version}.jar $j.jar
+            ln -sf $j-%{version}.jar $i.jar
         popd
     done
 popd
@@ -946,6 +947,7 @@
 %defattr(644,root,root,755)
 %doc $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/%{jname}/jasper2/doc/jspc.html
 %{_javadir}/%{jname}5-*.jar
+%{_javadir}/%{jname}-*.jar
 %attr(755,root,root) %{_bindir}/%{jname}*.sh
 %attr(755,root,root) %{_bindir}/jspc*.sh
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
@@ -980,6 +982,9 @@
 %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
 %changelog
+* Thu Feb 23 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_3fc
+- Added jasper-foo symlinks for jars.
+
 * Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_2fc
 - Exclude ppc64 s390 s390x
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:19:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:19:49 -0500
Subject: rpms/bluez-hcidump/devel .cvsignore, 1.9, 1.10 bluez-hcidump.spec,
	1.15, 1.16 sources, 1.9, 1.10
Message-ID: <200602232119.k1NLJnOp022967@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-hcidump/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22929

Modified Files:
	.cvsignore bluez-hcidump.spec sources 
Log Message:
bluez-hcidump 1.30


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-hcidump/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	6 Nov 2005 09:47:42 -0000	1.9
+++ .cvsignore	23 Feb 2006 21:19:47 -0000	1.10
@@ -1 +1 @@
-bluez-hcidump-1.27.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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bluez-hcidump.spec	11 Feb 2006 02:09:12 -0000	1.15
+++ bluez-hcidump.spec	23 Feb 2006 21:19:47 -0000	1.16
@@ -1,16 +1,16 @@
 Summary: Bluetooth HCI protocol analyser
 Name: bluez-hcidump
-Version: 1.27
-Release: 1.2.1
+Version: 1.30
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 Requires: glibc >= 2.2.4
-Requires: bluez-libs >= 2.18
+Requires: bluez-libs >= 2.23
 BuildRequires: glibc-devel >= 2.2.4
-BuildRequires: bluez-libs-devel >= 2.18
+BuildRequires: bluez-libs-devel >= 2.23
 ExcludeArch: s390 s390x
 
 %description
@@ -40,6 +40,9 @@
 %{_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
+
 * 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Nov 2005 09:47:42 -0000	1.9
+++ sources	23 Feb 2006 21:19:47 -0000	1.10
@@ -1 +1 @@
-6e73f8f1750879487e4928bc12a0e825  bluez-hcidump-1.27.tar.gz
+46ac502055ccab1fd6f11cab7187e9c7  bluez-hcidump-1.30.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:28:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:28:57 -0500
Subject: rpms/bluez-libs/devel .cvsignore, 1.14, 1.15 bluez-libs.spec, 1.23,
	1.24 sources, 1.14, 1.15
Message-ID: <200602232128.k1NLSvVN027231@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27160

Modified Files:
	.cvsignore bluez-libs.spec sources 
Log Message:
bluez-libs 2.25


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	6 Nov 2005 09:26:48 -0000	1.14
+++ .cvsignore	23 Feb 2006 21:28:53 -0000	1.15
@@ -1 +1 @@
-bluez-libs-2.22.tar.gz
+bluez-libs-2.25.tar.gz


Index: bluez-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bluez-libs.spec	11 Feb 2006 02:09:45 -0000	1.23
+++ bluez-libs.spec	23 Feb 2006 21:28:53 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Bluetooth libraries
 Name: bluez-libs
-Version: 2.22
-Release: 1.2.1
+Version: 2.25
+Release: 1
 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
+* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-1
+- Update to bluez-libs 2.25
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.22-1.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-libs/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	6 Nov 2005 09:26:48 -0000	1.14
+++ sources	23 Feb 2006 21:28:53 -0000	1.15
@@ -1 +1 @@
-725537db36c125e4f07c722b14c0c6aa  bluez-libs-2.22.tar.gz
+ebc8408c9a74c785786a2ef7185fe628  bluez-libs-2.25.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:33:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:33:49 -0500
Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.164,
	1.165 policycoreutils.spec, 1.237, 1.238
Message-ID: <200602232133.k1NLXn45027561@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27532

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-2
- Change audit2allow to use devel instead of refpolicy


policycoreutils-rhat.patch:
 audit2allow/audit2allow   |  180 ++++++++++++++-
 audit2allow/audit2allow.1 |    3 
 semanage/semanage         |   11 
 semanage/semanage.8       |    4 
 semanage/seobject.py      |  528 +++++++++++++++++++++++++++-------------------
 5 files changed, 499 insertions(+), 227 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- policycoreutils-rhat.patch	21 Feb 2006 19:09:17 -0000	1.164
+++ policycoreutils-rhat.patch	23 Feb 2006 21:33:36 -0000	1.165
@@ -29,7 +29,7 @@
 +    def __init__(self):
 +        self.dict={}
 +	try:
-+		fd=open("/usr/share/selinux/refpolicy/include/support/obj_perm_sets.spt")
++		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)
 +        records=fd.read().split("\n")
@@ -53,7 +53,7 @@
 +    def __init__(self):
 +        self.dict={}
 +        trans=accessTrans()
-+	(input, output) = os.popen2("awk -f - /usr/share/selinux/refpolicy/include/*/*.if 2> /dev/null")
++	(input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null")
 +	input.write(awk_script)
 +	input.close()
 +	records=output.read().split("\n")


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- policycoreutils.spec	21 Feb 2006 19:09:17 -0000	1.237
+++ policycoreutils.spec	23 Feb 2006 21:33:37 -0000	1.238
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.29.26
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -98,7 +98,10 @@
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
-* Mon Feb 13 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-1
+* Thu Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-2
+- Change audit2allow to use devel instead of refpolicy
+
+* Mon Feb 20 2006 Dan Walsh <dwalsh at redhat.com> 1.29.26-1
 - Update from upstream
 	* Merged semanage bug fix patch from Ivan Gyurdiev.
 	* Merged improve bindings patch from Ivan Gyurdiev.



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:36:20 -0500
Subject: rpms/kernel/devel/configs config-ia64-generic, 1.20,
	1.20.20.1 config-xen-generic, 1.8, 1.8.12.1 config-xen-xenU,
	1.3, 1.3.12.1 config-xen-xenU-PAE, 1.1, 1.1.20.1
Message-ID: <200602232136.k1NLaKLv028279@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28151/configs

Modified Files:
      Tag: private-xen-rebased-1971-branch
	config-ia64-generic config-xen-generic config-xen-xenU 
	config-xen-xenU-PAE 
Log Message:
Initial merge of xen rebase to xen-unstable


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.20
retrieving revision 1.20.20.1
diff -u -r1.20 -r1.20.20.1
--- config-ia64-generic	9 Feb 2006 21:45:33 -0000	1.20
+++ config-ia64-generic	23 Feb 2006 21:36:18 -0000	1.20.20.1
@@ -7,6 +7,11 @@
 #
 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_XEN_VT is not set
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_TIME_INTERPOLATION=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -u -r1.8 -r1.8.12.1
--- config-xen-generic	13 Feb 2006 21:17:48 -0000	1.8
+++ config-xen-generic	23 Feb 2006 21:36:18 -0000	1.8.12.1
@@ -14,6 +14,10 @@
 # CONFIG_XEN_NETDEV_GRANT_TX is not set
 # CONFIG_XEN_NETDEV_GRANT_RX is not set
 # CONFIG_SMP_ALTERNATIVES 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
 
 #
 # X86 Processor Configuration


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -r1.3 -r1.3.12.1
--- config-xen-xenU	13 Feb 2006 21:17:48 -0000	1.3
+++ config-xen-xenU	23 Feb 2006 21:36:18 -0000	1.3.12.1
@@ -74,7 +74,18 @@
 # 
 # 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
+
+#
+# DVB devices
+#
+# CONFIG_DVB is not set


Index: config-xen-xenU-PAE
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU-PAE,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -r1.1 -r1.1.20.1
--- config-xen-xenU-PAE	10 Feb 2006 04:58:57 -0000	1.1
+++ config-xen-xenU-PAE	23 Feb 2006 21:36:18 -0000	1.1.20.1
@@ -79,6 +79,18 @@
 # 
 # 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
+
+#
+# DVB devices
+#
+# CONFIG_DVB is not set



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:36:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:36:20 -0500
Subject: rpms/kernel/devel linux-2.6-xen-i386-mach-io-check-nmi.patch, NONE,
	1.1.2.1 linux-2.6-xen-net-csum.patch, NONE,
	1.1.2.1 linux-2.6-xen-pmd-shared.patch, NONE,
	1.1.2.1 linux-2.6-xen-smp-alts.patch, NONE,
	1.1.2.1 kernel-2.6.spec, 1.1971,
	1.1971.2.1 linux-2.6-crashdump-common.patch, 1.9,
	1.9.12.1 linux-2.6-execshield-fixes.patch, 1.5,
	1.5.8.1 linux-2.6-execshield-vdso.patch, 1.2,
	1.2.20.1 linux-2.6-execshield-xen.patch, 1.2,
	1.2.12.1 linux-2.6-execshield.patch, 1.10,
	1.10.20.1 linux-2.6-xen-compile-fixes.patch, 1.1,
	1.1.12.1 linux-2.6-xen.patch, 1.1,
	1.1.46.1 linux-2.6-xen-acpi.patch, 1.1,
	NONE linux-2.6-xen-guest-enable-char-devices.patch, 1.1,
	NONE linux-2.6-xen-merge.patch, 1.1,
	NONE linux-2.6-xen-x86_64-fixes.patch, 1.1,
	NONE linux-2.6.15-xen-module-fault.patch, 1.1, NONE
Message-ID: <200602232136.k1NLaKbJ028265@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28151

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec linux-2.6-crashdump-common.patch 
	linux-2.6-execshield-fixes.patch 
	linux-2.6-execshield-vdso.patch linux-2.6-execshield-xen.patch 
	linux-2.6-execshield.patch linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen.patch 
Added Files:
      Tag: private-xen-rebased-1971-branch
	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 
Removed Files:
      Tag: private-xen-rebased-1971-branch
	linux-2.6-xen-acpi.patch 
	linux-2.6-xen-guest-enable-char-devices.patch 
	linux-2.6-xen-merge.patch linux-2.6-xen-x86_64-fixes.patch 
	linux-2.6.15-xen-module-fault.patch 
Log Message:
Initial merge of xen rebase to xen-unstable

linux-2.6-xen-i386-mach-io-check-nmi.patch:
 arch/i386/kernel/traps.c                   |    9 +--------
 include/asm-i386/mach-default/mach_traps.h |   12 ++++++++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-xen-i386-mach-io-check-nmi.patch ---
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c
--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c	2006-02-15 20:38:51.000000000 +0000
+++ ./arch/i386/kernel/traps.c	2006-02-15 20:40:43.000000000 +0000
@@ -567,18 +567,11 @@ static void mem_parity_error(unsigned ch
 
 static void io_check_error(unsigned char reason, struct pt_regs * regs)
 {
-	unsigned long i;
-
 	printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n");
 	show_registers(regs);
 
 	/* Re-enable the IOCK line, wait for a few seconds */
-	reason = (reason & 0xf) | 8;
-	outb(reason, 0x61);
-	i = 2000;
-	while (--i) udelay(1000);
-	reason &= ~8;
-	outb(reason, 0x61);
+	clear_io_check_error(reason);
 }
 
 static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h	2006-01-03 03:21:10.000000000 +0000
+++ ./include/asm-i386/mach-default/mach_traps.h	2006-02-15 20:40:43.000000000 +0000
@@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig
 	outb(reason, 0x61);
 }
 
+static inline void clear_io_check_error(unsigned char reason)
+{
+	unsigned long i;
+
+	reason = (reason & 0xf) | 8;
+	outb(reason, 0x61);
+	i = 2000;
+	while (--i) udelay(1000);
+	reason &= ~8;
+	outb(reason, 0x61);
+}
+
 static inline unsigned char get_nmi_reason(void)
 {
 	return inb(0x61);

linux-2.6-xen-net-csum.patch:
 ip_nat_proto_tcp.c |    6 +++++-
 ip_nat_proto_udp.c |    9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-net-csum.patch ---
diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c
--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-02-02 17:39:51.000000000 +0000
+++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c	2006-02-02 17:44:18.000000000 +0000
@@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb,
 	if (hdrsize < sizeof(*hdr))
 		return 1;
 
-	hdr->check = ip_nat_cheat_check(~oldip, newip,
+	if ((*pskb)->proto_csum_blank) {
+		hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+	} else {
+		hdr->check = ip_nat_cheat_check(~oldip, newip,
 					ip_nat_cheat_check(oldport ^ 0xFFFF,
 							   newport,
 							   hdr->check));
+	}
 	return 1;
 }

diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c
--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c	2006-02-02 17:39:51.000000000 +0000
+++ ./net/ipv4/netfilter/ip_nat_proto_udp.c	2006-02-02 17:44:18.000000000 +0000
@@ -113,11 +113,16 @@ 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 */
+		if ((*pskb)->proto_csum_blank) {
+			hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
+		} else {
+			hdr->check = ip_nat_cheat_check(~oldip, newip,
 					ip_nat_cheat_check(*portptr ^ 0xFFFF,
 							   newport,
 							   hdr->check));
+		}
+	}
 	*portptr = newport;
 	return 1;
 }

linux-2.6-xen-pmd-shared.patch:
 arch/i386/mm/pageattr.c                |    2 -
 arch/i386/mm/pgtable.c                 |   51 +++++++++++++++++++++++++++++----
 include/asm-i386/pgtable-2level-defs.h |    2 +
 include/asm-i386/pgtable-3level-defs.h |    2 +
 4 files changed, 50 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-xen-pmd-shared.patch ---
diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c
--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c	2006-02-02 17:39:29.000000000 +0000
+++ ./arch/i386/mm/pageattr.c	2006-02-02 17:45:14.000000000 +0000
@@ -78,7 +78,7 @@ static void set_pmd_pte(pte_t *kpte, uns
 	unsigned long flags;
 
 	set_pte_atomic(kpte, pte); 	/* change init_mm */
-	if (PTRS_PER_PMD > 1)
+	if (HAVE_SHARED_KERNEL_PMD)
 		return;
 
 	spin_lock_irqsave(&pgd_lock, flags);
diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c
--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c	2006-01-03 03:21:10.000000000 +0000
+++ ./arch/i386/mm/pgtable.c	2006-02-02 17:45:14.000000000 +0000
@@ -215,9 +215,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
 		spin_lock_irqsave(&pgd_lock, flags);
 	}
 
-	clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD,
-			swapper_pg_dir + USER_PTRS_PER_PGD,
-			KERNEL_PGD_PTRS);
+	if (PTRS_PER_PMD == 1 || HAVE_SHARED_KERNEL_PMD)
+		clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD,
+				swapper_pg_dir + USER_PTRS_PER_PGD,
+				KERNEL_PGD_PTRS);
 	if (PTRS_PER_PMD > 1)
 		return;
 
@@ -249,6 +250,30 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
 			goto out_oom;
 		set_pgd(&pgd[i], __pgd(1 + __pa(pmd)));
 	}
+
+	if (!HAVE_SHARED_KERNEL_PMD) {
+		unsigned long flags;
+
+		for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) {
+			pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
+			if (!pmd)
+				goto out_oom;
+			set_pgd(&pgd[USER_PTRS_PER_PGD], __pgd(1 + __pa(pmd)));
+		}
+
+		spin_lock_irqsave(&pgd_lock, flags);
+		for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) {
+			unsigned long v = (unsigned long)i << PGDIR_SHIFT;
+			pgd_t *kpgd = pgd_offset_k(v);
+			pud_t *kpud = pud_offset(kpgd, v);
+			pmd_t *kpmd = pmd_offset(kpud, v);
+			pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
+			memcpy(pmd, kpmd, PAGE_SIZE);
+		}
+		pgd_list_add(pgd);
+		spin_unlock_irqrestore(&pgd_lock, flags);
+	}
+
 	return pgd;
 
 out_oom:
@@ -263,9 +288,23 @@ void pgd_free(pgd_t *pgd)
 	int i;
 
 	/* in the PAE case user pgd entries are overwritten before usage */
-	if (PTRS_PER_PMD > 1)
-		for (i = 0; i < USER_PTRS_PER_PGD; ++i)
-			kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+	if (PTRS_PER_PMD > 1) {
+		for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+			pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
+			kmem_cache_free(pmd_cache, pmd);
+		}
+		if (!HAVE_SHARED_KERNEL_PMD) {
+			unsigned long flags;
+			spin_lock_irqsave(&pgd_lock, flags);
+			pgd_list_del(pgd);
+			spin_unlock_irqrestore(&pgd_lock, flags);
+			for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) {
+				pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
+				memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
+				kmem_cache_free(pmd_cache, pmd);
+			}
+		}
+	}
 	/* in the non-PAE case, free_pgtables() clears user pgd entries */
 	kmem_cache_free(pgd_cache, pgd);
 }
diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h
--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h	2006-01-03 03:21:10.000000000 +0000
+++ ./include/asm-i386/pgtable-2level-defs.h	2006-02-02 17:45:14.000000000 +0000
@@ -1,6 +1,8 @@
 #ifndef _I386_PGTABLE_2LEVEL_DEFS_H
 #define _I386_PGTABLE_2LEVEL_DEFS_H
 
+#define HAVE_SHARED_KERNEL_PMD 0
+
 /*
  * traditional i386 two-level paging structure:
  */
diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h
--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h	2006-01-03 03:21:10.000000000 +0000
+++ ./include/asm-i386/pgtable-3level-defs.h	2006-02-02 17:45:14.000000000 +0000
@@ -1,6 +1,8 @@
 #ifndef _I386_PGTABLE_3LEVEL_DEFS_H
 #define _I386_PGTABLE_3LEVEL_DEFS_H
 
+#define HAVE_SHARED_KERNEL_PMD 1
+
 /*
  * PGDIR_SHIFT determines what a top-level page table entry can map
  */

linux-2.6-xen-smp-alts.patch:
 arch/i386/Kconfig              |   13 ++++++
 arch/i386/kernel/Makefile      |    1 
 arch/i386/kernel/smpalts.c     |   85 +++++++++++++++++++++++++++++++++++++++++
 arch/i386/kernel/smpboot.c     |   10 ++++
 arch/i386/kernel/vmlinux.lds.S |    7 +++
 include/asm-i386/atomic.h      |    7 ---
 include/asm-i386/bitops.h      |   19 +++------
 include/asm-i386/futex.h       |    4 -
 include/asm-i386/rwsem.h       |   17 ++++----
 include/asm-i386/smp_alt.h     |   32 +++++++++++++++
 include/asm-i386/spinlock.h    |   37 +++++++++++++++--
 include/asm-i386/system.h      |   56 ++++++++++++++++++++++++---
 12 files changed, 249 insertions(+), 39 deletions(-)

--- NEW FILE linux-2.6-xen-smp-alts.patch ---
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig ./arch/i386/Kconfig
--- ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig	2006-02-15 20:38:51.000000000 +0000
+++ ./arch/i386/Kconfig	2006-02-15 20:45:57.000000000 +0000
@@ -202,6 +202,19 @@ config SMP
 
 	  If you don't know what to do here, say N.
 
+config SMP_ALTERNATIVES
+	bool "SMP alternatives support (EXPERIMENTAL)"
+	depends on SMP && EXPERIMENTAL
+	help
+	  Try to reduce the overhead of running an SMP kernel on a uniprocessor
+	  host slightly by replacing certain key instruction sequences
+	  according to whether we currently have more than one CPU available.
+	  This should provide a noticeable boost to performance when
+	  running SMP kernels on UP machines, and have negligible impact
+	  when running on an true SMP host.
+
+          If unsure, say N.
+	  
 config NR_CPUS
 	int "Maximum number of CPUs (2-255)"
 	range 2 255
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile
--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile	2006-02-15 20:38:51.000000000 +0000
+++ ./arch/i386/kernel/Makefile	2006-02-15 20:45:57.000000000 +0000
@@ -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_ALTERNATIVES)  += smpalts.o
 
 EXTRA_AFLAGS   := -traditional
 
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c
--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c	1970-01-01 01:00:00.000000000 +0100
+++ ./arch/i386/kernel/smpalts.c	2006-02-15 20:45:57.000000000 +0000
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <asm/system.h>
+#include <asm/smp_alt.h>
+#include <asm/processor.h>
+#include <asm/string.h>
+
+struct smp_replacement_record {
+	unsigned char targ_size;
+	unsigned char smp1_size;
+	unsigned char smp2_size;
+	unsigned char up_size;
+	unsigned char feature;
+	unsigned char data[0];
+};
+
+struct smp_alternative_record {
+	void *targ_start;
+	struct smp_replacement_record *repl;
+};
+
+extern struct smp_alternative_record __start_smp_alternatives_table,
+  __stop_smp_alternatives_table;
+extern unsigned long __init_begin, __init_end;
+
+void prepare_for_smp(void)
+{
+	struct smp_alternative_record *r;
+	printk(KERN_INFO "Enabling SMP...\n");
+	for (r = &__start_smp_alternatives_table;
+	     r != &__stop_smp_alternatives_table;
+	     r++) {
+		BUG_ON(r->repl->targ_size < r->repl->smp1_size);
+		BUG_ON(r->repl->targ_size < r->repl->smp2_size);
+		BUG_ON(r->repl->targ_size < r->repl->up_size);
+               if (system_state == SYSTEM_RUNNING &&
+                   r->targ_start >= (void *)&__init_begin &&
+                   r->targ_start < (void *)&__init_end)
+                       continue;
+		if (r->repl->feature != (unsigned char)-1 &&
+		    boot_cpu_has(r->repl->feature)) {
+			memcpy(r->targ_start,
+			       r->repl->data + r->repl->smp1_size,
+			       r->repl->smp2_size);
+			memset(r->targ_start + r->repl->smp2_size,
+			       0x90,
+			       r->repl->targ_size - r->repl->smp2_size);
+		} else {
+			memcpy(r->targ_start,
+			       r->repl->data,
+			       r->repl->smp1_size);
+			memset(r->targ_start + r->repl->smp1_size,
+			       0x90,
+			       r->repl->targ_size - r->repl->smp1_size);
+		}
+	}
+	/* Paranoia */
+	asm volatile ("jmp 1f\n1:");
+	mb();
+}
+
+void unprepare_for_smp(void)
+{
+	struct smp_alternative_record *r;
+	printk(KERN_INFO "Disabling SMP...\n");
+	for (r = &__start_smp_alternatives_table;
+	     r != &__stop_smp_alternatives_table;
+	     r++) {
+		BUG_ON(r->repl->targ_size < r->repl->smp1_size);
+		BUG_ON(r->repl->targ_size < r->repl->smp2_size);
+		BUG_ON(r->repl->targ_size < r->repl->up_size);
+               if (system_state == SYSTEM_RUNNING &&
+                   r->targ_start >= (void *)&__init_begin &&
+                   r->targ_start < (void *)&__init_end)
+                       continue;
+		memcpy(r->targ_start,
+		       r->repl->data + r->repl->smp1_size + r->repl->smp2_size,
+		       r->repl->up_size);
+		memset(r->targ_start + r->repl->up_size,
+		       0x90,
+		       r->repl->targ_size - r->repl->up_size);
+	}
+	/* Paranoia */
+	asm volatile ("jmp 1f\n1:");
+	mb();
+}
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c
--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c	2006-02-15 20:38:51.000000000 +0000
+++ ./arch/i386/kernel/smpboot.c	2006-02-15 20:45:57.000000000 +0000
@@ -1214,6 +1214,11 @@ static void __init smp_boot_cpus(unsigne
 		if (max_cpus <= cpucount+1)
 			continue;
 
+#ifdef CONFIG_SMP_ALTERNATIVES
+		if (kicked == 1)
+			prepare_for_smp();
+#endif
+
 		if (((cpu = alloc_cpu_id()) <= 0) || do_boot_cpu(apicid, cpu))
 			printk("CPU #%d not responding - cannot use it.\n",
 								apicid);
@@ -1392,6 +1397,11 @@ int __devinit __cpu_up(unsigned int cpu)
 		return -EIO;
 	}
 
+#ifdef CONFIG_SMP_ALTERNATIVES
+	if (num_online_cpus() == 1)
+		prepare_for_smp();
+#endif
+
 	local_irq_enable();
 	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
 	/* Unleash the CPU! */
diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S
--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S	2006-01-03 03:21:10.000000000 +0000
+++ ./arch/i386/kernel/vmlinux.lds.S	2006-02-15 20:45:57.000000000 +0000
@@ -34,6 +34,13 @@ SECTIONS
   __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) }
   __stop___ex_table = .;
 
+  . = ALIGN(16);
+  __start_smp_alternatives_table = .;
+  __smp_alternatives : { *(__smp_alternatives) }
+  __stop_smp_alternatives_table = .;
+
+  __smp_replacements : { *(__smp_replacements) }
+
   RODATA
 
   /* writeable */
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h ./include/asm-i386/atomic.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h	2006-02-15 20:38:57.000000000 +0000
+++ ./include/asm-i386/atomic.h	2006-02-15 20:45:57.000000000 +0000
@@ -4,18 +4,13 @@
 #include <linux/config.h>
 #include <linux/compiler.h>
 #include <asm/processor.h>
+#include <asm/smp_alt.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for
  * resource counting etc..
  */
 
-#ifdef CONFIG_SMP
-#define LOCK "lock ; "
-#else
-#define LOCK ""
-#endif
-
 /*
  * Make sure gcc doesn't try to be clever and move things around
  * on us. We need to use _exactly_ the address the user gave us,
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h ./include/asm-i386/bitops.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h	2006-02-15 20:38:57.000000000 +0000
+++ ./include/asm-i386/bitops.h	2006-02-15 20:45:57.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include <linux/config.h>
 #include <linux/compiler.h>
+#include <asm/smp_alt.h>
 
 /*
  * These have to be done with inline assembly: that way the bit-setting
@@ -16,12 +17,6 @@
  * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
  */
 
-#ifdef CONFIG_SMP
-#define LOCK_PREFIX "lock ; "
-#else
-#define LOCK_PREFIX ""
-#endif
-
 #define ADDR (*(volatile long *) addr)
 
 /**
@@ -41,7 +36,7 @@
  */
 static inline void set_bit(int nr, volatile unsigned long * addr)
 {
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btsl %1,%0"
 		:"+m" (ADDR)
 		:"Ir" (nr));
@@ -76,7 +71,7 @@ static inline void __set_bit(int nr, vol
  */
 static inline void clear_bit(int nr, volatile unsigned long * addr)
 {
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btrl %1,%0"
 		:"+m" (ADDR)
 		:"Ir" (nr));
@@ -121,7 +116,7 @@ static inline void __change_bit(int nr, 
  */
 static inline void change_bit(int nr, volatile unsigned long * addr)
 {
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btcl %1,%0"
 		:"+m" (ADDR)
 		:"Ir" (nr));
@@ -140,7 +135,7 @@ static inline int test_and_set_bit(int n
 {
 	int oldbit;
 
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btsl %2,%1\n\tsbbl %0,%0"
 		:"=r" (oldbit),"+m" (ADDR)
 		:"Ir" (nr) : "memory");
@@ -180,7 +175,7 @@ static inline int test_and_clear_bit(int
 {
 	int oldbit;
 
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btrl %2,%1\n\tsbbl %0,%0"
 		:"=r" (oldbit),"+m" (ADDR)
 		:"Ir" (nr) : "memory");
@@ -231,7 +226,7 @@ static inline int test_and_change_bit(in
 {
 	int oldbit;
 
-	__asm__ __volatile__( LOCK_PREFIX
+	__asm__ __volatile__( LOCK
 		"btcl %2,%1\n\tsbbl %0,%0"
 		:"=r" (oldbit),"+m" (ADDR)
 		:"Ir" (nr) : "memory");
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h ./include/asm-i386/futex.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h	2006-02-15 20:38:57.000000000 +0000
+++ ./include/asm-i386/futex.h	2006-02-15 20:45:57.000000000 +0000
@@ -28,7 +28,7 @@
 "1:	movl	%2, %0\n\
 	movl	%0, %3\n"					\
 	insn "\n"						\
-"2:	" LOCK_PREFIX "cmpxchgl %3, %2\n\
+"2:	" LOCK "cmpxchgl %3, %2\n\
 	jnz	1b\n\
 3:	.section .fixup,\"ax\"\n\
 4:	mov	%5, %1\n\
@@ -68,7 +68,7 @@ futex_atomic_op_inuser (int encoded_op, 
 #endif
 		switch (op) {
 		case FUTEX_OP_ADD:
-			__futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret,
+			__futex_atomic_op1(LOCK "xaddl %0, %2", ret,
 					   oldval, uaddr, oparg);
 			break;
 		case FUTEX_OP_OR:
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h	2006-01-03 03:21:10.000000000 +0000
+++ ./include/asm-i386/rwsem.h	2006-02-15 20:45:57.000000000 +0000
@@ -40,6 +40,7 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <asm/smp_alt.h>
 
 struct rwsem_waiter;
 
@@ -99,7 +100,7 @@ static inline void __down_read(struct rw
 {
 	__asm__ __volatile__(
 		"# beginning down_read\n\t"
-LOCK_PREFIX	"  incl      (%%eax)\n\t" /* adds 0x00000001, returns the old value */
+LOCK	        "  incl      (%%eax)\n\t" /* adds 0x00000001, returns the old value */
 		"  js        2f\n\t" /* jump if we weren't granted the lock */
 		"1:\n\t"
 		LOCK_SECTION_START("")
@@ -130,7 +131,7 @@ static inline int __down_read_trylock(st
 		"  movl	     %1,%2\n\t"
 		"  addl      %3,%2\n\t"
 		"  jle	     2f\n\t"
-LOCK_PREFIX	"  cmpxchgl  %2,%0\n\t"
+LOCK	        "  cmpxchgl  %2,%0\n\t"
 		"  jnz	     1b\n\t"
 		"2:\n\t"
 		"# ending __down_read_trylock\n\t"
@@ -150,7 +151,7 @@ static inline void __down_write(struct r
 	tmp = RWSEM_ACTIVE_WRITE_BIAS;
 	__asm__ __volatile__(
 		"# beginning down_write\n\t"
-LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
+LOCK	        "  xadd      %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
 		"  testl     %%edx,%%edx\n\t" /* was the count 0 before? */
 		"  jnz       2f\n\t" /* jump if we weren't granted the lock */
 		"1:\n\t"
@@ -188,7 +189,7 @@ static inline void __up_read(struct rw_s
 	__s32 tmp = -RWSEM_ACTIVE_READ_BIAS;
 	__asm__ __volatile__(
 		"# beginning __up_read\n\t"
-LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */
+LOCK	        "  xadd      %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */
 		"  js        2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
 		LOCK_SECTION_START("")
@@ -214,7 +215,7 @@ static inline void __up_write(struct rw_
 	__asm__ __volatile__(
 		"# beginning __up_write\n\t"
 		"  movl      %2,%%edx\n\t"
-LOCK_PREFIX	"  xaddl     %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */
+LOCK	        "  xaddl     %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */
 		"  jnz       2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
 		LOCK_SECTION_START("")
@@ -239,7 +240,7 @@ static inline void __downgrade_write(str
 {
 	__asm__ __volatile__(
 		"# beginning __downgrade_write\n\t"
-LOCK_PREFIX	"  addl      %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
+LOCK	        "  addl      %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
 		"  js        2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
 		LOCK_SECTION_START("")
@@ -263,7 +264,7 @@ LOCK_PREFIX	"  addl      %2,(%%eax)\n\t"
 static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem)
 {
 	__asm__ __volatile__(
-LOCK_PREFIX	"addl %1,%0"
+LOCK	          "addl %1,%0"
 		: "=m"(sem->count)
 		: "ir"(delta), "m"(sem->count));
 }
@@ -276,7 +277,7 @@ static inline int rwsem_atomic_update(in
 	int tmp = delta;
 
 	__asm__ __volatile__(
-LOCK_PREFIX	"xadd %0,(%2)"
+LOCK  	          "xadd %0,(%2)"
 		: "+r"(tmp), "=m"(sem->count)
 		: "r"(sem), "m"(sem->count)
 		: "memory");
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h	1970-01-01 01:00:00.000000000 +0100
+++ ./include/asm-i386/smp_alt.h	2006-02-15 20:45:57.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef __ASM_SMP_ALT_H__
+#define __ASM_SMP_ALT_H__
+
+#include <linux/config.h>
+
+#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE)
+#define LOCK \
+        "6677: nop\n" \
+	".section __smp_alternatives,\"a\"\n" \
+	".long 6677b\n" \
+	".long 6678f\n" \
+	".previous\n" \
+	".section __smp_replacements,\"a\"\n" \
+	"6678: .byte 1\n" \
+	".byte 1\n" \
+	".byte 0\n" \
+        ".byte 1\n" \
+	".byte -1\n" \
+	"lock\n" \
+	"nop\n" \
+	".previous\n"
+void prepare_for_smp(void);
+void unprepare_for_smp(void);
+#else
+#define LOCK "lock ; "
+#endif
+#else
+#define LOCK ""
+#endif
+
+#endif /* __ASM_SMP_ALT_H__ */
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h	2006-01-03 03:21:10.000000000 +0000
+++ ./include/asm-i386/spinlock.h	2006-02-15 20:45:57.000000000 +0000
@@ -6,6 +6,7 @@
 #include <asm/page.h>
 #include <linux/config.h>
 #include <linux/compiler.h>
+#include <asm/smp_alt.h>
 
 /*
  * Your basic SMP spinlocks, allowing only a single CPU anywhere
@@ -23,7 +24,8 @@
 
 #define __raw_spin_lock_string \
 	"\n1:\t" \
-	"lock ; decb %0\n\t" \
+	LOCK \
+	"decb %0\n\t" \
 	"jns 3f\n" \
 	"2:\t" \
 	"rep;nop\n\t" \
@@ -34,7 +36,8 @@
 
 #define __raw_spin_lock_string_flags \
 	"\n1:\t" \
-	"lock ; decb %0\n\t" \
+	LOCK \
+	"decb %0\n\t" \
 	"jns 4f\n\t" \
 	"2:\t" \
 	"testl $0x200, %1\n\t" \
@@ -65,10 +68,34 @@ static inline void __raw_spin_lock_flags
 static inline int __raw_spin_trylock(raw_spinlock_t *lock)
 {
 	char oldval;
+#ifdef CONFIG_SMP_ALTERNATIVES
 	__asm__ __volatile__(
-		"xchgb %b0,%1"
+		"1:movb %1,%b0\n"
+		"movb $0,%1\n"
+		"2:"
+		".section __smp_alternatives,\"a\"\n"
+		".long 1b\n"
+		".long 3f\n"
+		".previous\n"
+		".section __smp_replacements,\"a\"\n"
+		"3: .byte 2b - 1b\n"
+		".byte 5f-4f\n"
+		".byte 0\n"
+		".byte 6f-5f\n"
+		".byte -1\n"
+		"4: xchgb %b0,%1\n"
+		"5: movb %1,%b0\n"
+		"movb $0,%1\n"
+		"6:\n"
+		".previous\n"
 		:"=q" (oldval), "=m" (lock->slock)
 		:"0" (0) : "memory");
+#else
+	__asm__ __volatile__(
+		"xchgb %b0,%1\n"
+		:"=q" (oldval), "=m" (lock->slock)
+		:"0" (0) : "memory");
+#endif
 	return oldval > 0;
 }
 
@@ -178,12 +205,12 @@ static inline int __raw_write_trylock(ra
 
 static inline void __raw_read_unlock(raw_rwlock_t *rw)
 {
-	asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory");
+	asm volatile(LOCK "incl %0" :"=m" (rw->lock) : : "memory");
 }
 
 static inline void __raw_write_unlock(raw_rwlock_t *rw)
 {
-	asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ", %0"
+	asm volatile(LOCK "addl $" RW_LOCK_BIAS_STR ", %0"
 				 : "=m" (rw->lock) : : "memory");
 }
 
diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h ./include/asm-i386/system.h
--- ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h	2006-02-15 20:38:57.000000000 +0000
+++ ./include/asm-i386/system.h	2006-02-15 20:45:57.000000000 +0000
@@ -5,7 +5,7 @@
 #include <linux/kernel.h>
 #include <asm/segment.h>
 #include <asm/cpufeature.h>
-#include <linux/bitops.h> /* for LOCK_PREFIX */
+#include <asm/smp_alt.h>
 
 #ifdef __KERNEL__
 
@@ -271,19 +271,19 @@ static inline unsigned long __cmpxchg(vo
 	unsigned long prev;
 	switch (size) {
 	case 1:
-		__asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2"
+		__asm__ __volatile__(LOCK "cmpxchgb %b1,%2"
 				     : "=a"(prev)
 				     : "q"(new), "m"(*__xg(ptr)), "0"(old)
 				     : "memory");
 		return prev;
 	case 2:
-		__asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2"
+		__asm__ __volatile__(LOCK "cmpxchgw %w1,%2"
 				     : "=a"(prev)
 				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
 				     : "memory");
 		return prev;
 	case 4:
-		__asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2"
+		__asm__ __volatile__(LOCK "cmpxchgl %1,%2"
 				     : "=a"(prev)
 				     : "r"(new), "m"(*__xg(ptr)), "0"(old)
 				     : "memory");
@@ -336,7 +336,7 @@ static inline unsigned long long __cmpxc
 				      unsigned long long new)
 {
 	unsigned long long prev;
-	__asm__ __volatile__(LOCK_PREFIX "cmpxchg8b %3"
+	__asm__ __volatile__(LOCK "cmpxchg8b %3"
 			     : "=A"(prev)
 			     : "b"((unsigned long)new),
 			       "c"((unsigned long)(new >> 32)),
@@ -503,11 +503,55 @@ struct alt_instr { 
 #endif
 
 #ifdef CONFIG_SMP
+#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE)
+#define smp_alt_mb(instr)                                           \
+__asm__ __volatile__("6667:\nnop\nnop\nnop\nnop\nnop\nnop\n6668:\n" \
+		     ".section __smp_alternatives,\"a\"\n"          \
+		     ".long 6667b\n"                                \
+                     ".long 6673f\n"                                \
+		     ".previous\n"                                  \
+		     ".section __smp_replacements,\"a\"\n"          \
+		     "6673:.byte 6668b-6667b\n"                     \
+		     ".byte 6670f-6669f\n"                          \
+		     ".byte 6671f-6670f\n"                          \
+                     ".byte 0\n"                                    \
+		     ".byte %c0\n"                                  \
+		     "6669:lock;addl $0,0(%%esp)\n"                 \
+		     "6670:" instr "\n"                             \
+		     "6671:\n"                                      \
+		     ".previous\n"                                  \
+		     :                                              \
+		     : "i" (X86_FEATURE_XMM2)                       \
+		     : "memory")
+#define smp_rmb() smp_alt_mb("lfence")
+#define smp_mb()  smp_alt_mb("mfence")
+#define set_mb(var, value) do {                                     \
+unsigned long __set_mb_temp;                                        \
+__asm__ __volatile__("6667:movl %1, %0\n6668:\n"                    \
+		     ".section __smp_alternatives,\"a\"\n"          \
+		     ".long 6667b\n"                                \
+		     ".long 6673f\n"                                \
+		     ".previous\n"                                  \
+		     ".section __smp_replacements,\"a\"\n"          \
+		     "6673: .byte 6668b-6667b\n"                    \
+		     ".byte 6670f-6669f\n"                          \
+		     ".byte 0\n"                                    \
+		     ".byte 6671f-6670f\n"                          \
+		     ".byte -1\n"                                   \
+		     "6669: xchg %1, %0\n"                          \
+		     "6670:movl %1, %0\n"                           \
+		     "6671:\n"                                      \
+		     ".previous\n"                                  \
+		     : "=m" (var), "=r" (__set_mb_temp)             \
+		     : "1" (value)                                  \
+		     : "memory"); } while (0)
+#else
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
+#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
+#endif
 #define smp_wmb()	wmb()
 #define smp_read_barrier_depends()	read_barrier_depends()
-#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)
 #else
 #define smp_mb()	barrier()
 #define smp_rmb()	barrier()


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971
retrieving revision 1.1971.2.1
diff -u -r1.1971 -r1.1971.2.1
--- kernel-2.6.spec	20 Feb 2006 19:06:58 -0000	1.1971
+++ kernel-2.6.spec	23 Feb 2006 21:36:14 -0000	1.1971.2.1
@@ -243,17 +243,18 @@
 # 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-merge.patch
+Patch700: linux-2.6-xen.patch
 Patch701: linux-2.6-xen-compile-fixes.patch
 Patch702: linux-2.6-xen-no-tls-warn.patch
-Patch704: linux-2.6-xen-guest-enable-char-devices.patch
 Patch705: linux-2.6-xen_net_read_mac_export.patch
 Patch706: linux-2.6-xen_remap_vma_flags.patch
-Patch707: linux-2.6-xen-acpi.patch
-Patch708: linux-2.6-xen-x86_64-fixes.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
-Patch710: linux-2.6.15-xen-module-fault.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -666,10 +667,12 @@
 %prep
 if [ ! -d kernel-%{kversion}/vanilla ]; then
   # Ok, first time we do a make prep.
-%setup -q -n %{name}-%{version} -c -a1
   rm -f pax_global_header
+%setup -q -n %{name}-%{version} -c -a1
   cp %{SOURCE2} .
   mv linux-%{kversion} vanilla
+  mv xen xen-vanilla
+  cp %{SOURCE2} .
 else
   # We already have a vanilla dir.
   cd kernel-%{kversion}
@@ -677,8 +680,13 @@
      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
 
 %if %{buildxen}
 cd xen
@@ -748,16 +756,17 @@
 #
 %if %{includexen}
 # Base Xen patch from linux-2.6-merge.hg
+%patch690 -p1
+# Conflict with non-xen kernels
+#%patch691 -p1
+%patch692 -p1
+%patch693 -p1
 %patch700 -p1
 %patch701 -p1
 %patch702 -p1
-%patch704 -p1
 %patch705 -p1
 %patch706 -p1
-%patch707 -p1
-%patch708 -p2
 %patch709 -p1
-%patch710 -p1
 %endif
 
 #
@@ -1580,7 +1589,10 @@
 %endif
 
 %changelog
-* Sun Feb 20 2006 Dave Jones <davej at redhat.com>
+* Mon Feb 20 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase kernel xen patches to xen-unstable cset 8907
+
+* Mon Feb 20 2006 Dave Jones <davej at redhat.com>
 - Fix incorrect hardlink count in selinuxfs (#182001)
 
 * Sat Feb 18 2006 Dave Jones <davej at redhat.com>

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/i386/mm/pgtable.c          |    3 
 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 
 32 files changed, 952 insertions(+), 14 deletions(-)

Index: linux-2.6-crashdump-common.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v
retrieving revision 1.9
retrieving revision 1.9.12.1
diff -u -r1.9 -r1.9.12.1
--- linux-2.6-crashdump-common.patch	13 Feb 2006 21:17:47 -0000	1.9
+++ linux-2.6-crashdump-common.patch	23 Feb 2006 21:36:14 -0000	1.9.12.1
@@ -239,15 +239,14 @@
 +#endif /* _ASM_X86_64_CRASHDUMP_H */
 --- linux-2.6.12/include/asm-i386/kmap_types.h.orig	2005-06-17 15:48:29.000000000 -0400
 +++ linux-2.6.12/include/asm-i386/kmap_types.h	2005-08-18 14:23:59.000000000 -0400
-@@ -23,8 +23,10 @@
+@@ -23,7 +23,9 @@
  D(10)	KM_IRQ1,
  D(11)	KM_SOFTIRQ0,
  D(12)	KM_SOFTIRQ1,
- D(13)	KM_SWIOTLB,
--D(14)	KM_TYPE_NR
-+D(14)	KM_CRASHDUMP,
-+D(15)	KM_UNUSED,
-+D(16)	KM_TYPE_NR
+-D(13)	KM_TYPE_NR
++D(13)	KM_CRASHDUMP,
++D(14)	KM_UNUSED,
++D(15)	KM_TYPE_NR
  };
  
  #undef D

linux-2.6-execshield-fixes.patch:
 linux-2.6.15.noarch/include/asm-i386/desc.h       |    2 +-
 linux-exec-shield-curr.q/arch/i386/kernel/traps.c |    2 +-
 linux-exec-shield-curr.q/fs/proc/base.c           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-execshield-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -u -r1.5 -r1.5.8.1
--- linux-2.6-execshield-fixes.patch	15 Feb 2006 17:44:53 -0000	1.5
+++ linux-2.6-execshield-fixes.patch	23 Feb 2006 21:36:14 -0000	1.5.8.1
@@ -30,15 +30,15 @@
  #endif
  #ifdef CONFIG_SECURITY
  	E(PROC_TGID_ATTR,      "attr",    S_IFDIR|S_IRUGO|S_IXUGO),
-diff -uNp linux-2.6.15.i686/include/asm-i386/desc.h.orig linux-2.6.15.i686/include/asm-i386/desc.h
---- linux-2.6.15.i686/include/asm-i386/desc.h.orig	2006-01-25 17:57:49.000000000 -0500
-+++ linux-2.6.15.i686/include/asm-i386/desc.h	2006-01-25 18:00:02.000000000 -0500
-@@ -208,7 +208,7 @@ static inline void set_user_cs(struct de
+diff -uNp linux-2.6.15.noarch/include/asm-i386/desc.h.orig linux-2.6.15.noarch/include/asm-i386/desc.h
+--- linux-2.6.15.noarch/include/asm-i386/desc.h.orig	2006-02-22 21:05:44.000000000 +0100
++++ linux-2.6.15.noarch/include/asm-i386/desc.h	2006-02-22 21:09:15.000000000 +0100
+@@ -168,7 +168,7 @@ static inline void set_user_cs(struct de
+ }
  
- #ifndef CONFIG_X86_XEN
  #define load_user_cs_desc(cpu, mm) \
 -    	per_cpu(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
- #else
- #define load_user_cs_desc(cpu, mm) \
- 	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
++    	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);

linux-2.6-execshield-vdso.patch:
 linux-2.6.15.noarch/arch/i386/kernel/sysenter.c    |   66 ++++++++---------
 linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c |    6 +
 linux/fs/binfmt_elf.c                              |   15 +---
 linux/fs/proc/task_mmu.c                           |    9 +-
 linux/include/asm-i386/elf.h                       |    7 +
 linux/include/asm-i386/page.h                      |    5 +
 linux/include/linux/mm.h                           |    5 +
 linux/kernel/sysctl.c                              |   10 ++
 linux/mm/mmap.c                                    |   78 +++++++++++++++++++++
 9 files changed, 152 insertions(+), 49 deletions(-)

Index: linux-2.6-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-vdso.patch,v
retrieving revision 1.2
retrieving revision 1.2.20.1
diff -u -r1.2 -r1.2.20.1
--- linux-2.6-execshield-vdso.patch	9 Jan 2006 19:24:08 -0000	1.2
+++ linux-2.6-execshield-vdso.patch	23 Feb 2006 21:36:14 -0000	1.2.20.1
@@ -8,11 +8,10 @@
  mm/mmap.c                   |   78 ++++++++++++++++++++++++++++++++++++++++++++
  8 files changed, 155 insertions(+), 43 deletions(-)
 
-Index: linux/arch/i386/kernel/sysenter.c
-===================================================================
---- linux.orig/arch/i386/kernel/sysenter.c
-+++ linux/arch/i386/kernel/sysenter.c
-@@ -47,20 +47,13 @@ void enable_sep_cpu(void)
+diff -uNp linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.15.noarch/arch/i386/kernel/sysenter.c
+--- linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig	2006-02-22 20:56:56.000000000 +0100
++++ linux-2.6.15.noarch/arch/i386/kernel/sysenter.c	2006-02-22 21:04:49.000000000 +0100
+@@ -49,20 +49,13 @@ void enable_sep_cpu(void)
  extern const char vsyscall_int80_start, vsyscall_int80_end;
  extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
  
@@ -33,9 +32,9 @@
 -	sysenter_page = virt_to_page(page);
 +	sysenter_pages[0] = virt_to_page(page);
  
- 	if (!boot_cpu_has(X86_FEATURE_SEP)) {
- 		memcpy(page,
-@@ -78,42 +71,58 @@ int __init sysenter_setup(void)
+ #ifdef CONFIG_X86_SYSENTER
+ 	if (boot_cpu_has(X86_FEATURE_SEP)) {
+@@ -82,42 +75,43 @@ int __init sysenter_setup(void)
  
  extern void SYSENTER_RETURN_OFFSET;
  
@@ -57,9 +56,10 @@
 +	int err;
  
 -	if (unlikely(!vdso_enabled)) {
- 		current->mm->context.vdso = NULL;
+-		current->mm->context.vdso = NULL;
 -		return;
 -	}
++	current->mm->context.vdso = NULL;
 +	if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0]))
 +		return 0;
  
@@ -77,13 +77,14 @@
 -			get_page(sysenter_page);
 -			install_page(current->mm, vma, addr,
 -					sysenter_page, vma->vm_page_prot);
+-		}
 +	len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE;
 +	addr = get_unmapped_area_prot(NULL, 0, len, 0,
 +				      MAP_PRIVATE, 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,
@@ -96,25 +97,30 @@
  	up_write(&current->mm->mmap_sem);
 +	return err;
  }
- 
+-
 -static int __init vdso_setup(char *str)
-+int in_gate_area_no_task(unsigned long addr)
- {
+-{
 -        vdso_enabled = simple_strtoul(str, NULL, 0);
 -        return 1;
-+	return 0;
- }
+-}
 -__setup("vdso=", vdso_setup);
- 
-+int in_gate_area(struct task_struct *task, unsigned long addr)
-+{
-+	return 0;
-+}
-+
-+struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-+{
-+	return NULL;
-+}
+-
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c
+--- linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c	2006-02-22 18:26:45.000000000 +0100
+@@ -409,6 +409,12 @@ void __devinit identify_cpu(struct cpuin
+ 	if (disable_pse)
+ 		clear_bit(X86_FEATURE_PSE, c->x86_capability);
+ 
++	if (exec_shield != 0) {
++#ifdef CONFIG_HIGHMEM64G   /* NX implies PAE */
++		if (!test_bit(X86_FEATURE_NX, c->x86_capability))
++#endif
++		clear_bit(X86_FEATURE_SEP, c->x86_capability);
++	}
+ 	/* If the model name is still unset, do table lookup. */
+ 	if ( !c->x86_model_id[0] ) {
+ 		char *p;
 Index: linux/fs/binfmt_elf.c
 ===================================================================
 --- linux.orig/fs/binfmt_elf.c

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                                |   93 +++++++++++-
 arch/i386/mm/init-xen.c                                     |   11 +
 linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h |    2 
 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c        |   23 --
 7 files changed, 167 insertions(+), 30 deletions(-)

Index: linux-2.6-execshield-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -r1.2 -r1.2.12.1
--- linux-2.6-execshield-xen.patch	13 Feb 2006 21:17:47 -0000	1.2
+++ linux-2.6-execshield-xen.patch	23 Feb 2006 21:36:14 -0000	1.2.12.1
@@ -121,9 +121,9 @@
 --- a/arch/i386/kernel/traps-xen.c
 +++ b/arch/i386/kernel/traps-xen.c
 @@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che
- #ifdef CONFIG_X86_MCE
- DO_ERROR(18, SIGBUS, "machine check", machine_check)
- #endif
+ DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
+ DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
+ DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
 -DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
 +
 +
@@ -280,22 +280,6 @@
  
  	pagetable_init();
  
---- linux-2.6.14/include/asm-i386/desc.h~	2006-01-06 17:09:44.000000000 -0500
-+++ linux-2.6.14/include/asm-i386/desc.h	2006-01-06 17:22:41.000000000 -0500
-@@ -210,8 +210,13 @@
- 	desc->b = (limit & 0xf0000) | 0x00c0fb00;
- }
- 
-+#ifndef CONFIG_X86_XEN
- #define load_user_cs_desc(cpu, mm) \
-     	per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-+#else
-+#define load_user_cs_desc(cpu, mm) \
-+	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
-+#endif
- 
- 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);
 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
@@ -337,3 +321,15 @@
  
  /*
   * Great future plan:
+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
+@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas
+ 
+ #define swapper_pg_dir init_level4_pgt
+ 
+-extern void 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);
+ 

linux-2.6-execshield.patch:
 arch/i386/kernel/asm-offsets.c       |    1 
 arch/i386/kernel/cpu/common.c        |    7 +
 arch/i386/kernel/entry.S             |    8 +-
 arch/i386/kernel/process.c           |   59 +++++++++++++++
 arch/i386/kernel/signal.c            |    4 -
 arch/i386/kernel/smp.c               |    3 
 arch/i386/kernel/sysenter.c          |   56 ++++++++++++++-
 arch/i386/kernel/traps.c             |   93 ++++++++++++++++++++++++-
 arch/i386/kernel/vsyscall-sysenter.S |    6 -
 arch/i386/kernel/vsyscall.lds.S      |    4 -
 arch/i386/mm/init.c                  |    6 +
 arch/i386/mm/mmap.c                  |    6 +
 arch/ia64/ia32/binfmt_elf32.c        |    2 
 arch/x86_64/ia32/ia32_binfmt.c       |    4 -
 arch/x86_64/kernel/process.c         |    6 -
 arch/x86_64/kernel/setup64.c         |   23 ------
 arch/x86_64/mm/fault.c               |    2 
 drivers/char/random.c                |    7 +
 fs/binfmt_elf.c                      |  130 ++++++++++++++++++++++++++++-------
 fs/proc/array.c                      |    8 +-
 fs/proc/base.c                       |    4 -
 fs/proc/task_mmu.c                   |   25 +++++-
 include/asm-i386/desc.h              |   14 +++
 include/asm-i386/elf.h               |   42 +++++++----
 include/asm-i386/mmu.h               |    6 +
 include/asm-i386/pgalloc.h           |    1 
 include/asm-i386/processor.h         |    7 +
 include/asm-i386/thread_info.h       |    1 
 include/asm-ia64/pgalloc.h           |    4 +
 include/asm-powerpc/pgalloc.h        |    5 +
 include/asm-ppc/pgalloc.h            |    5 +
 include/asm-s390/pgalloc.h           |    4 +
 include/asm-sparc/pgalloc.h          |    4 +
 include/asm-sparc64/pgalloc.h        |    4 +
 include/asm-x86_64/pgalloc.h         |    7 +
 include/asm-x86_64/pgtable.h         |    2 
 include/asm-x86_64/processor.h       |    2 
 include/linux/mm.h                   |   11 ++
 include/linux/resource.h             |    5 +
 include/linux/sched.h                |    9 ++
 include/linux/sysctl.h               |    3 
 kernel/signal.c                      |   38 ++++++++++
 kernel/sysctl.c                      |   39 ++++++++++
 mm/fremap.c                          |   16 ++--
 mm/mmap.c                            |  105 ++++++++++++++++++++++++++--
 mm/mprotect.c                        |    5 +
 mm/mremap.c                          |    4 -
 47 files changed, 684 insertions(+), 123 deletions(-)

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.10
retrieving revision 1.10.20.1
diff -u -r1.10 -r1.10.20.1
--- linux-2.6-execshield.patch	18 Jan 2006 06:03:01 -0000	1.10
+++ linux-2.6-execshield.patch	23 Feb 2006 21:36:14 -0000	1.10.20.1
@@ -227,12 +227,13 @@
  
  #include <asm/cpufeature.h>
  #include <asm/msr.h>
-@@ -36,7 +37,7 @@ void enable_sep_cpu(void)
+@@ -36,8 +37,8 @@ void enable_sep_cpu(void)
  	wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
  	wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0);
  	wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0);
 -	put_cpu();	
 +	put_cpu();
+ #endif
  }
  
  /*

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.new/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 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 +
 14 files changed, 44 insertions(+), 11 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.1
retrieving revision 1.1.12.1
diff -u -r1.1 -r1.1.12.1
--- linux-2.6-xen-compile-fixes.patch	13 Feb 2006 21:17:47 -0000	1.1
+++ linux-2.6-xen-compile-fixes.patch	23 Feb 2006 21:36:14 -0000	1.1.12.1
@@ -1,22 +1,3 @@
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c
---- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c	2006-02-10 20:25:27.000000000 +0100
-+++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c	2006-02-11 03:11:49.000000000 +0100
-@@ -42,6 +42,15 @@
- int apic_verbosity;
- int disable_apic;
- 
-+/*
-+ * 'what should we do if we get a hw irq event on an illegal vector'.
-+ * each architecture has to answer this themselves.
-+ */
-+void ack_bad_irq(unsigned int irq)
-+{
-+	printk("unexpected IRQ trap at vector %02x\n", irq);
-+}
-+
- void smp_local_timer_interrupt(struct pt_regs *regs)
- {
- 	profile_tick(CPU_PROFILING, regs);
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c
 --- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c	2006-02-11 19:15:39.000000000 +0100
 +++ linux-2.6.15.new/arch/i386/mm/init-xen.c	2006-02-11 16:24:12.000000000 +0100
@@ -28,24 +9,199 @@
  
  /*
   * noexec = on|off
-diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c
---- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig	2006-02-11 20:17:49.000000000 +0100
-+++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c	2006-02-11 20:18:09.000000000 +0100
-@@ -39,6 +39,17 @@ extern struct genapic apic_xen;
- struct genapic *genapic = &apic_xen;
- #endif
+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
+@@ -618,12 +618,6 @@ void set_personality_64bit(void)
+ 
+ 	/* Make sure to be in 64bit mode */
+ 	clear_thread_flag(TIF_IA32); 
+-
+-	/* TBD: overwrites user setup. Should have two bits.
+-	   But 64bit processes have always behaved this way,
+-	   so it's not too bad. The main problem is just that
+-   	   32bit childs are affected again. */
+-	current->personality &= ~READ_IMPLIES_EXEC;
+ }
+ 
+ asmlinkage long sys_fork(struct pt_regs *regs)
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c
+--- linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c	2006-02-22 18:34:19.000000000 +0100
+@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p
+ 	instr = (unsigned char *)convert_rip_to_linear(current, regs);
+ 	max_instr = instr + 15;
+ 
+-	if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE)
++	if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64)
+ 		return 0;
+ 
+ 	while (scan_more && instr < max_instr) { 
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h
+--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h	2006-02-22 18:46:35.000000000 +0100
+@@ -157,6 +157,20 @@ static inline unsigned long get_desc_bas
+ 	return base;
+ }
  
-+#ifndef CONFIG_X86_LOCAL_APIC
-+/*
-+ * 'what should we do if we get a hw irq event on an illegal vector'.
-+ * each architecture has to answer this themselves.
-+ */
-+void ack_bad_irq(unsigned int irq)
++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
 +{
-+        printk("unexpected IRQ trap at vector %02x\n", irq);
++	limit = (limit - 1) / PAGE_SIZE;
++	desc->a = limit & 0xffff;
++	desc->b = (limit & 0xf0000) | 0x00c0fb00;
 +}
-+#endif
 +
++#define load_user_cs_desc(cpu, mm) \
++	HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32);
++
++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);
++extern void arch_flush_exec_range(struct mm_struct *mm);
++
+ #endif /* !__ASSEMBLY__ */
+ 
+ #endif
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h
+--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h	2006-02-22 18:17:34.000000000 +0100
+@@ -7,11 +7,18 @@
+  * 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.
+  */
+ typedef struct { 
+ 	int size;
+ 	struct semaphore sem;
+ 	void *ldt;
++	struct desc_struct user_cs;
++	unsigned long exec_limit;
++	void *vdso;
++
+ } mm_context_t;
+ 
+ /* mm/memory.c:exit_mmap hook */
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h
+--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h	2006-02-22 18:17:59.000000000 +0100
+@@ -3,6 +3,7 @@
+ 
+ #include <linux/config.h>
+ #include <asm/fixmap.h>
++#include <asm/desc.h>
+ #include <linux/threads.h>
+ #include <linux/mm.h>		/* for struct page */
+ #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h
+--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h	2006-02-22 18:42:49.000000000 +0100
+@@ -335,7 +335,9 @@ extern int bootloader_type;
+ /* This decides where the kernel will search for a free chunk of vm
+  * space during mmap's.
+  */
+-#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
++#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE/3)
++
++#define __HAVE_ARCH_ALIGN_STACK
+ 
+ #define HAVE_ARCH_PICK_MMAP_LAYOUT
+ 
+@@ -530,6 +532,9 @@ static inline void __load_esp0(struct ts
+ 	regs->xcs = __USER_CS;					\
+ 	regs->eip = new_eip;					\
+ 	regs->esp = new_esp;					\
++	preempt_disable();					\
++	load_user_cs_desc(smp_processor_id(), current->mm);	\
++	preempt_enable();					\
+ } while (0)
  
  /*
-  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h
+--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h	2006-02-22 19:53:16.000000000 +0100
+@@ -2,6 +2,7 @@
+ #define _ASM_SWIOTLB_H 1
+ 
+ #include <linux/config.h>
++#include <asm/scatterlist.h>
+ 
+ /* SWIOTLB interface */
+ 
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h
+--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h	2006-02-22 18:24:18.000000000 +0100
+@@ -7,6 +7,13 @@
+ #include <linux/mm.h>
+ #include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
+ 
++#define arch_add_exec_range(mm, limit) \
++		do { (void)(mm), (void)(limit); } while (0)
++#define arch_flush_exec_range(mm) \
++		do { (void)(mm); } while (0)
++#define arch_remove_exec_range(mm, limit) \
++		do { (void)(mm), (void)(limit); } while (0)
++
+ #include <xen/features.h>
+ void make_page_readonly(void *va, unsigned int feature);
+ void make_page_writable(void *va, unsigned int feature);
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h
+--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h	2006-02-22 18:24:57.000000000 +0100
+@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas
+ 
+ #define swapper_pg_dir init_level4_pgt
+ 
+-extern int nonx_setup(char *str);
++extern void nonx_setup(char *str);
+ extern void paging_init(void);
+ extern void clear_kernel_mapping(unsigned long addr, unsigned long size);
+ 
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h
+--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h	2006-02-22 15:56:20.000000000 +0100
++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h	2006-02-22 18:25:18.000000000 +0100
+@@ -180,6 +180,8 @@ static inline void clear_in_cr4 (unsigne
+  */
+ #define TASK_SIZE64	(0x800000000000UL - 4096)
+ 
++#define __HAVE_ARCH_ALIGN_STACK
++
+ /* 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
+@@ -23,6 +23,7 @@
+ 
+ #include <asm/mtrr.h>
+ #include <asm/tlbflush.h>
++#include <asm/desc.h>
+ #if 0
+ #include <mach_apic.h>
+ #endif

linux-2.6-xen.patch:
 linux-2.6.15.xen/include/xen/interface/version.h                          |   67 
 linux-2.6.16-rc4-xen0/Makefile                                            |    3 
 linux-2.6.16-rc4-xen0/arch/i386/Kconfig                                   |   98 
 linux-2.6.16-rc4-xen0/arch/i386/Kconfig.cpu                               |    2 
 linux-2.6.16-rc4-xen0/arch/i386/Makefile                                  |   18 
 linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile                         |   21 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/Makefile                           |   33 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/Makefile                      |    4 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/boot-xen.c                    | 1164 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/apic-xen.c                         |  140 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/asm-offsets.c                      |    2 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/Makefile                       |    5 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/common-xen.c                   |  667 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c                |  187 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/early_printk-xen.c                 |    2 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/entry-xen.S                        |  857 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/fixup.c                            |   95 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/head-xen.S                         |  208 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/init_task-xen.c                    |   51 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/io_apic-xen.c                      | 2728 ++++++++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/ioport-xen.c                       |  122 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/irq-xen.c                          |  306 +
 linux-2.6.16-rc4-xen0/arch/i386/kernel/ldt-xen.c                          |  269 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/microcode-xen.c                    |  164 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/mpparse-xen.c                      | 1182 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 linux-2.6.16-rc4-xen0/arch/i386/kernel/process-xen.c                      |  833 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/quirks-xen.c                       |   48 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/setup-xen.c                        | 1888 ++++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/smp-xen.c                          |  617 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/swiotlb.c                          |  674 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/sysenter.c                         |   14 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/time-xen.c                         |  961 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/traps-xen.c                        | 1118 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vm86.c                             |    8 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vmlinux.lds.S                      |    4 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall.S                         |    2 
 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/Makefile                         |    7 
 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/setup.c                          |   37 
 linux-2.6.16-rc4-xen0/arch/i386/mm/Makefile                               |    8 
 linux-2.6.16-rc4-xen0/arch/i386/mm/fault-xen.c                            |  617 ++
 linux-2.6.16-rc4-xen0/arch/i386/mm/highmem-xen.c                          |  123 
 linux-2.6.16-rc4-xen0/arch/i386/mm/hypervisor.c                           |  468 +
 linux-2.6.16-rc4-xen0/arch/i386/mm/init-xen.c                             |  845 +++
 linux-2.6.16-rc4-xen0/arch/i386/mm/ioremap-xen.c                          |  462 +
 linux-2.6.16-rc4-xen0/arch/i386/mm/pgtable-xen.c                          |  630 ++
 linux-2.6.16-rc4-xen0/arch/i386/pci/Makefile                              |    9 
 linux-2.6.16-rc4-xen0/arch/i386/pci/irq-xen.c                             | 1202 ++++
 linux-2.6.16-rc4-xen0/arch/i386/pci/pcifront.c                            |   55 
 linux-2.6.16-rc4-xen0/arch/i386/power/Makefile                            |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/Kconfig                                   |   42 
 linux-2.6.16-rc4-xen0/arch/ia64/Makefile                                  |   10 
 linux-2.6.16-rc4-xen0/arch/ia64/hp/sim/Makefile                           |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/entry.S                            |   32 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/head.S                             |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/pal.S                              |    5 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/sal.c                              |    3 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/setup.c                            |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/xen-mkbuildtree-post                      |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen-mkbuildtree-pre                       |   50 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/Makefile                              |    5 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/Makefile                      |   20 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/README                        |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/coreMakefile                  |   24 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/evtchn_ia64.c                 |  266 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/hypercall.S                           |  323 +
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xen_ksyms.c                           |   12 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenconsole.c                          |   19 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenentry.S                            |  850 +++
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenhpski.c                            |   19 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenivt.S                              | 2044 +++++++
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenminstate.h                         |  367 +
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenpal.S                              |   73 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xensetup.S                            |   33 
 linux-2.6.16-rc4-xen0/arch/um/kernel/physmem.c                            |    4 
 linux-2.6.16-rc4-xen0/arch/x86_64/Kconfig                                 |   62 
 linux-2.6.16-rc4-xen0/arch/x86_64/Makefile                                |   16 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/Makefile                           |   20 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/ia32entry-xen.S                    |  721 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/Makefile                         |   18 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/acpi/Makefile                    |    1 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/apic-xen.c                       |  198 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/asm-offsets.c                    |    2 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/e820-xen.c                       |  744 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/early_printk-xen.c               |  306 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/entry-xen.S                      | 1132 ++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic-xen.c                    |  144 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic_xen.c                    |  162 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head-xen.S                       |  152 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head64-xen.c                     |  140 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/init_task.c                      |    3 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/io_apic-xen.c                    | 2217 ++++++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ioport-xen.c                     |   58 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/irq-xen.c                        |  168 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/mpparse-xen.c                    | 1005 +++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/process-xen.c                    |  810 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup-xen.c                      | 1629 +++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/smp-xen.c                        |  596 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/traps-xen.c                      | 1029 +++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/vsyscall-xen.c                   |  239 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c                |  172 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/xen_entry.S                      |   41 
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/Makefile                             |   10 
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/fault-xen.c                          |  595 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/init-xen.c                           | 1107 ++++
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/pageattr-xen.c                       |  392 +
 linux-2.6.16-rc4-xen0/arch/x86_64/pci/Makefile                            |   12 
 linux-2.6.16-rc4-xen0/drivers/Makefile                                    |    1 
 linux-2.6.16-rc4-xen0/drivers/acpi/Kconfig                                |    2 
 linux-2.6.16-rc4-xen0/drivers/acpi/tables.c                               |    7 
 linux-2.6.16-rc4-xen0/drivers/char/mem.c                                  |    6 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/Kconfig                            |   14 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/Makefile                           |    1 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.c                              |   44 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.h                              |    7 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm_xen.c                          |  536 +
 linux-2.6.16-rc4-xen0/drivers/char/tty_io.c                               |    7 
 linux-2.6.16-rc4-xen0/drivers/firmware/Kconfig                            |    2 
 linux-2.6.16-rc4-xen0/drivers/pci/Kconfig                                 |    1 
 linux-2.6.16-rc4-xen0/drivers/serial/Kconfig                              |    1 
 linux-2.6.16-rc4-xen0/drivers/video/Kconfig                               |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/Kconfig                                 |  192 
 linux-2.6.16-rc4-xen0/drivers/xen/Makefile                                |   22 
 linux-2.6.16-rc4-xen0/drivers/xen/balloon/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/balloon/balloon.c                       |  585 ++
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/blkback.c                       |  590 ++
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/common.h                        |  123 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/interface.c                     |  164 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/vbd.c                           |  102 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/xenbus.c                        |  421 +
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/Makefile                       |    5 
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/blkfront.c                     |  834 +++
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/block.h                        |  162 
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/vbd.c                          |  323 +
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/Makefile                         |    3 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/blktap.c                         |  910 +++
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/common.h                         |  110 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/interface.c                      |  146 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/xenbus.c                         |  234 
 linux-2.6.16-rc4-xen0/drivers/xen/char/Makefile                           |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/char/mem.c                              |  156 
 linux-2.6.16-rc4-xen0/drivers/xen/console/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/console/console.c                       |  647 ++
 linux-2.6.16-rc4-xen0/drivers/xen/console/xencons_ring.c                  |  125 
 linux-2.6.16-rc4-xen0/drivers/xen/core/Makefile                           |    9 
 linux-2.6.16-rc4-xen0/drivers/xen/core/evtchn.c                           |  823 +++
 linux-2.6.16-rc4-xen0/drivers/xen/core/features.c                         |   29 
 linux-2.6.16-rc4-xen0/drivers/xen/core/gnttab.c                           |  432 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/reboot.c                           |  442 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/skbuff.c                           |  143 
 linux-2.6.16-rc4-xen0/drivers/xen/core/smpboot.c                          |  449 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/xen_proc.c                         |   29 
 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/Makefile                         |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/evtchn.c                         |  459 +
 linux-2.6.16-rc4-xen0/drivers/xen/net_driver_util.c                       |   67 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/common.h                        |  110 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/interface.c                     |  320 +
 linux-2.6.16-rc4-xen0/drivers/xen/netback/loopback.c                      |  202 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/netback.c                       |  833 +++
 linux-2.6.16-rc4-xen0/drivers/xen/netback/xenbus.c                        |  327 +
 linux-2.6.16-rc4-xen0/drivers/xen/netfront/Makefile                       |    4 
 linux-2.6.16-rc4-xen0/drivers/xen/netfront/netfront.c                     | 1490 +++++
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/Makefile                        |   10 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.c                    |  324 +
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.h                    |   97 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space_header.c             |  269 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/passthrough.c                   |  116 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pci_stub.c                      |  377 +
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback.h                       |   73 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback_ops.c                   |   84 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/vpci.c                          |  163 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/xenbus.c                        |  439 +
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/Makefile                       |    7 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci.c                          |   44 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci_op.c                       |  245 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pcifront.h                     |   40 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/xenbus.c                       |  295 +
 linux-2.6.16-rc4-xen0/drivers/xen/privcmd/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/privcmd/privcmd.c                       |  302 +
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/Makefile                        |    4 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/common.h                        |   89 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/interface.c                     |  197 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/tpmback.c                       | 1105 ++++
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/xenbus.c                        |  328 +
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/Makefile                       |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.c                     |  713 ++
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.h                     |   40 
 linux-2.6.16-rc4-xen0/drivers/xen/util.c                                  |   80 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/Makefile                         |    8 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_client.c                  |  403 +
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.c                   |  203 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.h                   |   50 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_dev.c                     |  238 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_probe.c                   | 1015 +++
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_xs.c                      |  821 +++
 linux-2.6.16-rc4-xen0/fs/Kconfig                                          |    1 
 linux-2.6.16-rc4-xen0/include/asm-i386/apic.h                             |    2 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/desc.h                |  162 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/fixmap.h              |  165 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypercall.h           |  323 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypervisor.h          |  166 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/io.h                  |  401 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/page.h                |  324 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/param.h               |   24 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   83 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  181 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable.h             |  512 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/processor.h           |  762 ++
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/segment.h             |  113 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/setup.h               |   66 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/smp.h                 |  103 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/spinlock.h            |  217 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/system.h              |  679 ++
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/mach_traps.h              |   33 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_post.h         |   43 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 linux-2.6.16-rc4-xen0/include/asm-i386/spinlock.h                         |    6 
 linux-2.6.16-rc4-xen0/include/asm-i386/system.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-ia64/fixmap.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-ia64/gcc_intrin.h                       |   60 
 linux-2.6.16-rc4-xen0/include/asm-ia64/hypercall.h                        |  500 +
 linux-2.6.16-rc4-xen0/include/asm-ia64/hypervisor.h                       |   70 
 linux-2.6.16-rc4-xen0/include/asm-ia64/intel_intrin.h                     |   68 
 linux-2.6.16-rc4-xen0/include/asm-ia64/pal.h                              |    1 
 linux-2.6.16-rc4-xen0/include/asm-ia64/privop.h                           |   59 
 linux-2.6.16-rc4-xen0/include/asm-ia64/processor.h                        |    1 
 linux-2.6.16-rc4-xen0/include/asm-ia64/synch_bitops.h                     |   61 
 linux-2.6.16-rc4-xen0/include/asm-ia64/system.h                           |    4 
 linux-2.6.16-rc4-xen0/include/asm-ia64/xen/privop.h                       |  272 
 linux-2.6.16-rc4-xen0/include/asm-um/page.h                               |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/apic.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/desc.h              |  263 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h            |  111 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h         |  323 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/io.h                |  359 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pci.h               |  176 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  199 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/processor.h         |  503 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/segment.h           |   44 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/smp.h               |  152 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/system.h            |  434 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_time.h             |  122 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h       |   52 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 linux-2.6.16-rc4-xen0/include/linux/gfp.h                                 |    6 
 linux-2.6.16-rc4-xen0/include/linux/highmem.h                             |    6 
 linux-2.6.16-rc4-xen0/include/linux/irq.h                                 |    3 
 linux-2.6.16-rc4-xen0/include/linux/mm.h                                  |   13 
 linux-2.6.16-rc4-xen0/include/linux/skbuff.h                              |   13 
 linux-2.6.16-rc4-xen0/include/xen/balloon.h                               |   70 
 linux-2.6.16-rc4-xen0/include/xen/driver_util.h                           |   26 
 linux-2.6.16-rc4-xen0/include/xen/evtchn.h                                |  123 
 linux-2.6.16-rc4-xen0/include/xen/features.h                              |   20 
 linux-2.6.16-rc4-xen0/include/xen/foreign_page.h                          |   40 
 linux-2.6.16-rc4-xen0/include/xen/gnttab.h                                |  119 
 linux-2.6.16-rc4-xen0/include/xen/interface/COPYING                       |   28 
 linux-2.6.16-rc4-xen0/include/xen/interface/acm.h                         |  181 
 linux-2.6.16-rc4-xen0/include/xen/interface/acm_ops.h                     |   96 
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-ia64.h                   |  314 +
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_32.h                 |  158 
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_64.h                 |  243 
 linux-2.6.16-rc4-xen0/include/xen/interface/dom0_ops.h                    |  488 +
 linux-2.6.16-rc4-xen0/include/xen/interface/event_channel.h               |  203 
 linux-2.6.16-rc4-xen0/include/xen/interface/grant_table.h                 |  306 +
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/hvm_info_table.h          |   24 
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/ioreq.h                   |   90 
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/vmx_assist.h              |   97 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/blkif.h                    |   85 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/console.h                  |   33 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/netif.h                    |   76 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/pciif.h                    |   55 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/ring.h                     |  270 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/tpmif.h                    |   56 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/xenbus.h                   |   44 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/xs_wire.h                  |   97 
 linux-2.6.16-rc4-xen0/include/xen/interface/memory.h                      |  149 
 linux-2.6.16-rc4-xen0/include/xen/interface/nmi.h                         |   54 
 linux-2.6.16-rc4-xen0/include/xen/interface/physdev.h                     |   70 
 linux-2.6.16-rc4-xen0/include/xen/interface/sched.h                       |   60 
 linux-2.6.16-rc4-xen0/include/xen/interface/sched_ctl.h                   |   68 
 linux-2.6.16-rc4-xen0/include/xen/interface/trace.h                       |   90 
 linux-2.6.16-rc4-xen0/include/xen/interface/vcpu.h                        |   64 
 linux-2.6.16-rc4-xen0/include/xen/interface/xen.h                         |  447 +
 linux-2.6.16-rc4-xen0/include/xen/net_driver_util.h                       |   56 
 linux-2.6.16-rc4-xen0/include/xen/pcifront.h                              |   39 
 linux-2.6.16-rc4-xen0/include/xen/public/evtchn.h                         |   98 
 linux-2.6.16-rc4-xen0/include/xen/public/privcmd.h                        |   91 
 linux-2.6.16-rc4-xen0/include/xen/public/xenstored.h                      |   89 
 linux-2.6.16-rc4-xen0/include/xen/tpmfe.h                                 |   40 
 linux-2.6.16-rc4-xen0/include/xen/xen_proc.h                              |   23 
 linux-2.6.16-rc4-xen0/include/xen/xenbus.h                                |  298 +
 linux-2.6.16-rc4-xen0/include/xen/xencons.h                               |   14 
 linux-2.6.16-rc4-xen0/kernel/Kconfig.preempt                              |    1 
 linux-2.6.16-rc4-xen0/kernel/irq/manage.c                                 |   84 
 linux-2.6.16-rc4-xen0/lib/Kconfig.debug                                   |    2 
 linux-2.6.16-rc4-xen0/lib/Makefile                                        |    3 
 linux-2.6.16-rc4-xen0/mm/Kconfig                                          |    3 
 linux-2.6.16-rc4-xen0/mm/highmem.c                                        |   11 
 linux-2.6.16-rc4-xen0/mm/memory.c                                         |  112 
 linux-2.6.16-rc4-xen0/mm/mmap.c                                           |    4 
 linux-2.6.16-rc4-xen0/mm/page_alloc.c                                     |    6 
 linux-2.6.16-rc4-xen0/net/core/dev.c                                      |   50 
 linux-2.6.16-rc4-xen0/net/core/skbuff.c                                   |   41 
 linux-2.6.16-rc4-xen0/scripts/Makefile.xen                                |   14 
 linux-2.6.16-rc4-xen0/scripts/kconfig/zconf.hash.c                        |  231 
 361 files changed, 77226 insertions(+), 182 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.1.46.1 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.1
retrieving revision 1.1.46.1
diff -u -r1.1 -r1.1.46.1
--- linux-2.6-xen.patch	15 Oct 2005 01:07:29 -0000	1.1
+++ linux-2.6-xen.patch	23 Feb 2006 21:36:14 -0000	1.1.46.1
@@ -1,50566 +1,45662 @@
-diff -Nurp ref-linux-2.6.12/arch/xen/Kconfig tmp-linux-2.6.12-xen.patch/arch/xen/Kconfig
---- ref-linux-2.6.12/arch/xen/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ tmp-linux-2.6.12-xen.patch/arch/xen/Kconfig	2005-08-23 13:12:36.000000000 -0400
-@@ -0,0 +1,203 @@
-+#
-+# For a description of the syntax of this configuration file,
-+# see Documentation/kbuild/kconfig-language.txt.
-+#
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/boot-xen/Makefile linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile
+--- ref-linux-2.6.16-rc4/arch/i386/boot-xen/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile	2006-02-22 13:44:42.000000000 +0100
+@@ -0,0 +1,21 @@
 +
-+mainmenu "Linux Kernel Configuration"
++OBJCOPYFLAGS := -g --strip-unneeded
 +
-+config XEN
-+	bool
-+	default y
-+	help
-+	  This is the Linux Xen port.
++vmlinuz: vmlinux-stripped FORCE
++	$(call if_changed,gzip)
 +
-+config ARCH_XEN
-+	bool
-+	default y
++vmlinux-stripped: vmlinux FORCE
++	$(call if_changed,objcopy)
 +
++INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH))
 +
-+config NO_IDLE_HZ
++XINSTALL_NAME ?= $(KERNELRELEASE)
++install:
++	mkdir -p $(INSTALL_ROOT)/boot
++	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
++	rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
++	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 -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/Kconfig linux-2.6.16-rc4-xen0/arch/i386/Kconfig
+--- ref-linux-2.6.16-rc4/arch/i386/Kconfig	2006-02-22 15:52:49.000000000 +0100
++++ linux-2.6.16-rc4-xen0/arch/i386/Kconfig	2006-02-22 13:44:42.000000000 +0100
+@@ -58,6 +58,15 @@ config X86_PC
+ 	help
+ 	  Choose this option if your computer is a standard PC or compatible.
+ 
++config X86_XEN
++	bool "Xen-compatible"
++	select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST
++	select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST
++	select SWIOTLB
++	help
++	  Choose this option if you plan to run this kernel on top of the
++	  Xen Hypervisor.
++
+ config X86_ELAN
+ 	bool "AMD Elan"
+ 	help
+@@ -159,6 +168,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.
+@@ -231,7 +241,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
+@@ -243,7 +253,7 @@ source "kernel/Kconfig.preempt"
+ 
+ config X86_UP_APIC
+ 	bool "Local APIC support on uniprocessors"
+-	depends on !SMP && !(X86_VISWS || X86_VOYAGER)
++	depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
+ 	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
+ 
+ config X86_LOCAL_APIC
+ 	bool
+-	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER)
++	depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
+ 	default y
+ 
+ config X86_IO_APIC
+ 	bool
+-	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER))
++	depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST))
+ 	default y
+ 
+ config X86_VISWS_APIC
+@@ -281,9 +291,14 @@ config X86_VISWS_APIC
+ 	depends on X86_VISWS
+ 	default y
+ 
++config X86_TSC
 +	bool
++	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN
 +	default y
 +
-+
-+menu "XEN"
-+
-+config XEN_PRIVILEGED_GUEST
-+	bool "Privileged Guest (domain 0)"
+ config X86_MCE
+ 	bool "Machine Check Exception"
+-	depends on !X86_VOYAGER
++	depends on !(X86_VOYAGER || X86_XEN)
+ 	---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
+ 
+ config MICROCODE
+ 	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
++	depends on !XEN_UNPRIVILEGED_GUEST
+ 	---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
+ 
+ config X86_MSR
+ 	tristate "/dev/cpu/*/msr - Model-specific register support"
++	depends on !X86_XEN
+ 	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
+ 	  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
+ 	  /dev/cpu/31/cpuid.
+ 
++config SWIOTLB
++	bool
 +	default n
-+	select XEN_PHYSDEV_ACCESS
-+	help
-+	  Support for privileged operation (domain 0)
 +
-+config XEN_PHYSDEV_ACCESS
-+	bool "Physical device access"
-+	default XEN_PRIVILEGED_GUEST
+ source "drivers/firmware/Kconfig"
+ 
+ choice
+@@ -573,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
+ 
+ config HIGHPTE
+ 	bool "Allocate 3rd-level pagetables from highmem"
+-	depends on HIGHMEM4G || HIGHMEM64G
++	depends on (HIGHMEM4G || HIGHMEM64G) && !X86_XEN
+ 	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
+ 
+ config MATH_EMULATION
+ 	bool "Math emulation"
++	depends on !X86_XEN
+ 	---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
+ 
+ config MTRR
+ 	bool "MTRR (Memory Type Range Register) support"
++	depends on !XEN_UNPRIVILEGED_GUEST
++	default y if X86_XEN
+ 	---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
+ 
+ config EFI
+ 	bool "Boot from EFI support (EXPERIMENTAL)"
+-	depends on ACPI
++	depends on ACPI && !X86_XEN
+ 	default n
+ 	---help---
[...141533 lines suppressed...]
++  };
++static struct kconf_id_strings_t kconf_id_strings_contents =
++  {
++    "if",
++    "int",
++    "help",
++    "endif",
++    "select",
++    "endmenu",
++    "tristate",
++    "endchoice",
++    "range",
++    "string",
++    "default",
++    "def_bool",
++    "menu",
++    "def_boolean",
++    "def_tristate",
++    "mainmenu",
++    "menuconfig",
++    "config",
++    "on",
++    "hex",
++    "source",
++    "depends",
++    "optional",
++    "enable",
++    "comment",
++    "requires",
++    "bool",
++    "boolean",
++    "choice",
++    "prompt"
++  };
++#define kconf_id_strings ((const char *) &kconf_id_strings_contents)
++#ifdef __GNUC__
++__inline
++#endif
++struct kconf_id *
++kconf_id_lookup (register const char *str, register unsigned int len)
++{
++  enum
++    {
++      TOTAL_KEYWORDS = 30,
++      MIN_WORD_LENGTH = 2,
++      MAX_WORD_LENGTH = 12,
++      MIN_HASH_VALUE = 2,
++      MAX_HASH_VALUE = 46
++    };
++
++  static struct kconf_id wordlist[] =
++    {
++      {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2,		T_IF,		TF_COMMAND|TF_PARAM},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3,		T_TYPE,		TF_COMMAND, S_INT},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str4,		T_HELP,		TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5,		T_ENDIF,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6,		T_SELECT,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7,	T_ENDMENU,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8,	T_TYPE,		TF_COMMAND, S_TRISTATE},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9,	T_ENDCHOICE,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10,		T_RANGE,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11,		T_TYPE,		TF_COMMAND, S_STRING},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12,	T_DEFAULT,	TF_COMMAND, S_UNKNOWN},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14,		T_MENU,		TF_COMMAND},
++      {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16,	T_DEFAULT,	TF_COMMAND, S_BOOLEAN},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17,	T_DEFAULT,	TF_COMMAND, S_TRISTATE},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18,	T_MAINMENU,	TF_COMMAND},
++      {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20,	T_MENUCONFIG,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21,		T_CONFIG,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22,		T_ON,		TF_PARAM},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23,		T_TYPE,		TF_COMMAND, S_HEX},
++      {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26,		T_SOURCE,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27,	T_DEPENDS,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28,	T_OPTIONAL,	TF_COMMAND},
++      {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31,		T_SELECT,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32,	T_COMMENT,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33,	T_REQUIRES,	TF_COMMAND},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34,		T_TYPE,		TF_COMMAND, S_BOOLEAN},
++      {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37,	T_TYPE,		TF_COMMAND, S_BOOLEAN},
++      {-1}, {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41,		T_CHOICE,	TF_COMMAND},
++      {-1}, {-1}, {-1}, {-1},
++      {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46,		T_PROMPT,	TF_COMMAND}
++    };
++
++  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
++    {
++      register int key = kconf_id_hash (str, len);
++
++      if (key <= MAX_HASH_VALUE && key >= 0)
++        {
++          register int o = wordlist[key].name;
++          if (o >= 0)
++            {
++              register const char *s = o + kconf_id_strings;
++
++              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
++                return &wordlist[key];
++            }
++        }
++    }
++  return 0;
++}
++
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/scripts/Makefile.xen linux-2.6.16-rc4-xen0/scripts/Makefile.xen
+--- ref-linux-2.6.16-rc4/scripts/Makefile.xen	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.16-rc4-xen0/scripts/Makefile.xen	2006-02-22 13:44:45.000000000 +0100
+@@ -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}; \
++			[ -f $(srctree)/$(src)/$${c} ] || \
++			   [ -f $(srctree)/$(src)/$${s} ] \
++				&& echo $$oxen \
++				|| echo $(var) ) \
++	  )
++# filterxen($1 = allobj, $2 = noobjs)
++filterxen = $(filter-out $(2), $(1))
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/xen/interface/version.h linux-2.6.15.xen/include/xen/interface/version.h
+--- linux-2.6.15.orig/include/xen/interface/version.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.15.xen/include/xen/interface/version.h	2006-02-22 18:08:33.000000000 +0100
+@@ -0,0 +1,67 @@
++/******************************************************************************
++ * version.h
++ * 
++ * Xen version, type, and compile information.
++ * 
++ * Copyright (c) 2005, Nguyen Anh Quynh <aquynh at gmail.com>
++ * Copyright (c) 2005, Keir Fraser <keir at xensource.com>
++ */
++
++#ifndef __XEN_PUBLIC_VERSION_H__
++#define __XEN_PUBLIC_VERSION_H__
++
++/* NB. All ops return zero on success, except XENVER_version. */
++
++/* arg == NULL; returns major:minor (16:16). */
++#define XENVER_version      0
++
++/* arg == xen_extraversion_t. */
++#define XENVER_extraversion 1
++typedef char xen_extraversion_t[16];
++#define XEN_EXTRAVERSION_LEN (sizeof(xen_extraversion_t))
++
++/* arg == xen_compile_info_t. */
++#define XENVER_compile_info 2
++typedef struct xen_compile_info {
++    char compiler[64];
++    char compile_by[16];
++    char compile_domain[32];
++    char compile_date[32];
++} xen_compile_info_t;
++
++#define XENVER_capabilities 3
++typedef char xen_capabilities_info_t[1024];
++#define XEN_CAPABILITIES_INFO_LEN (sizeof(xen_capabilities_info_t))
++
++#define XENVER_changeset 4
++typedef char xen_changeset_info_t[64];
++#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t))
++
++#define XENVER_platform_parameters 5
++typedef struct xen_platform_parameters {
++    unsigned long virt_start;
++} xen_platform_parameters_t;
++
++#define XENVER_get_features 6
++typedef struct xen_feature_info {
++    unsigned int submap_idx;    /* IN: which 32-bit submap to return */
++    uint32_t     submap;        /* OUT: 32-bit submap */
++} xen_feature_info_t;
++
++#define XENFEAT_writable_page_tables       0
++#define XENFEAT_writable_descriptor_tables 1
++#define XENFEAT_auto_translated_physmap    2
++
++#define XENFEAT_NR_SUBMAPS 1
++
++#endif /* __XEN_PUBLIC_VERSION_H__ */
++
++/*
++ * Local variables:
++ * mode: C
++ * c-set-style: "BSD"
++ * c-basic-offset: 4
++ * tab-width: 4
++ * indent-tabs-mode: nil
++ * End:
++ */


--- linux-2.6-xen-acpi.patch DELETED ---


--- linux-2.6-xen-guest-enable-char-devices.patch DELETED ---


--- linux-2.6-xen-merge.patch DELETED ---


--- linux-2.6-xen-x86_64-fixes.patch DELETED ---


--- linux-2.6.15-xen-module-fault.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:38:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:38:14 -0500
Subject: rpms/libbtctl/devel libbtctl-0.6.0-crash.patch, 1.1,
	1.2 libbtctl.spec, 1.29, 1.30
Message-ID: <200602232138.k1NLcEK9013558@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2786

Modified Files:
	libbtctl-0.6.0-crash.patch libbtctl.spec 
Log Message:
Another attempt


libbtctl-0.6.0-crash.patch:
 btctl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: libbtctl-0.6.0-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl-0.6.0-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbtctl-0.6.0-crash.patch	23 Feb 2006 20:46:40 -0000	1.1
+++ libbtctl-0.6.0-crash.patch	23 Feb 2006 21:38:10 -0000	1.2
@@ -1,6 +1,16 @@
 --- libbtctl-0.6.0/src/btctl.c.crash	2006-02-23 15:43:57.000000000 -0500
-+++ libbtctl-0.6.0/src/btctl.c	2006-02-23 15:44:21.000000000 -0500
-@@ -163,7 +163,7 @@
++++ libbtctl-0.6.0/src/btctl.c	2006-02-23 16:36:28.000000000 -0500
+@@ -55,7 +55,9 @@
+ 
+ static gint btctl_controller_signals[LAST_SIGNAL] = { 0 } ;
+ 
++#define g_intern_static_string(s) s
+ G_DEFINE_TYPE(BtctlController, btctl_controller, G_TYPE_OBJECT)
++#undef g_intern_static_string
+ 
+ static void btctl_set_property(GObject      *object,
+ 			       guint         prop_id,
+@@ -163,7 +165,7 @@
  {
    static GQuark quark = 0;
    if (quark == 0)


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libbtctl.spec	23 Feb 2006 20:57:14 -0000	1.29
+++ libbtctl.spec	23 Feb 2006 21:38:10 -0000	1.30
@@ -101,7 +101,7 @@
 %endif
 
 %changelog
-* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> 0.6.0-4
+* Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> 0.6.0-5
 - try a fix for (#179413)
 
 * Thu Feb 23 2006 Harald Hoyer <harald at redhat.com> 0.6.0-2



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:39:02 -0500
Subject: rpms/libbtctl/devel libbtctl.spec,1.30,1.31
Message-ID: <200602232139.k1NLd2MM022786@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22772

Modified Files:
	libbtctl.spec 
Log Message:
bump rev



Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libbtctl.spec	23 Feb 2006 21:38:10 -0000	1.30
+++ libbtctl.spec	23 Feb 2006 21:39:00 -0000	1.31
@@ -8,7 +8,7 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.6.0
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth 



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:45:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:45:48 -0500
Subject: rpms/bluez-utils/devel bluez-utils.spec, 1.33,
	1.34 bluez-utils-2.22-dbus-0.60-api.patch, 1.1, NONE
Message-ID: <200602232145.k1NLjm5N023190@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23006

Modified Files:
	bluez-utils.spec 
Removed Files:
	bluez-utils-2.22-dbus-0.60-api.patch 
Log Message:
update to bluez-utils-2.25


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- bluez-utils.spec	11 Feb 2006 02:10:31 -0000	1.33
+++ bluez-utils.spec	23 Feb 2006 21:45:45 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities 
 Name: bluez-utils
-Version: 2.22
-Release: 2.2.1
+Version: 2.25
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz
@@ -13,8 +13,7 @@
 Source7: dund.conf
 Source8: hidd.conf
 Source9: bluetooth.conf
-Patch1: bluez-utils-2.22-dbus-0.60-api.patch 
-Patch2: bluez-utils-2.3-conf.patch
+Patch1: bluez-utils-2.3-conf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
 BuildRequires: bluez-libs-devel >= %{version}
@@ -51,8 +50,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-%patch1 -p1 -b .dbus
-%patch2 -p1 
+%patch1 -p1
 
 %build
 aclocal
@@ -77,15 +75,19 @@
 
 %post
 /sbin/chkconfig --add bluetooth
+/sbin/chkconfig --add hidd
 if [ "$1" = "1" ]; then
 /sbin/service bluetooth condrestart
+/sbin/service hidd condrestart
 fi
 exit 0
 
 %preun
 /sbin/service bluetooth stop > /dev/null 2>&1
+/sbin/service hidd stop > /dev/null 2>&1
 if [ "$1" = "0" ]; then
 /sbin/chkconfig --del bluetooth
+/sbin/chkconfig --del hidd
 fi
 exit 0
 
@@ -108,6 +110,9 @@
 %{_libdir}/cups/backend/bluetooth
 
 %changelog
+* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-1
+- update to bluez-utils 2.25
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.22-2.2.1
 - bump again for double-long bug on ppc(64)
 


--- bluez-utils-2.22-dbus-0.60-api.patch DELETED ---



From fedora-cvs-commits at redhat.com  Thu Feb 23 21:50:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 16:50:20 -0500
Subject: rpms/bluez-utils/devel bluez-utils.spec,1.34,1.35
Message-ID: <200602232150.k1NLoKZ1003156@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3143

Modified Files:
	bluez-utils.spec 
Log Message:
document hidd init script fix


Index: bluez-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- bluez-utils.spec	23 Feb 2006 21:45:45 -0000	1.34
+++ bluez-utils.spec	23 Feb 2006 21:50:18 -0000	1.35
@@ -111,7 +111,8 @@
 
 %changelog
 * Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com> - 2.25-1
-- update to bluez-utils 2.25
+- Update to bluez-utils 2.25
+- Add hidd init script (#182274)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.22-2.2.1
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Thu Feb 23 22:02:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 17:02:20 -0500
Subject: rpms/libX11/devel libX11-1.0.0-Xcursor.patch, NONE, 1.1 libX11.spec,
	1.15, 1.16
Message-ID: <200602232202.k1NM2Krq013786@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/libX11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13760

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.0.0-Xcursor.patch 
Log Message:
* Thu Feb 23 2006 Christopher Aillon <caillon at redhat.com> - 1.0.0-3
- Look for the versioned libXcursor.so.1 (fixes 179044)


libX11-1.0.0-Xcursor.patch:
 CrGlCur.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libX11-1.0.0-Xcursor.patch ---
--- libX11-1.0.0/src/CrGlCur.c.broken	2006-02-23 16:31:25.000000000 -0500
+++ libX11-1.0.0/src/CrGlCur.c	2006-02-23 16:31:56.000000000 -0500
@@ -53,7 +53,7 @@
 #endif
 
 #ifndef LIBXCURSOR
-#define LIBXCURSOR "libXcursor.so"
+#define LIBXCURSOR "libXcursor.so.1"
 #endif
 
 static char libraryName[] = LIBXCURSOR;


Index: libX11.spec
===================================================================
RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libX11.spec	11 Feb 2006 04:17:11 -0000	1.15
+++ libX11.spec	23 Feb 2006 22:02:02 -0000	1.16
@@ -1,13 +1,14 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.0.0
-Release: 2.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/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
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .datadir-locale-dir-fix
+%patch1 -p1 -b .Xcursor
 
 # Disable static library creation by default.
 %define with_static 0
@@ -239,6 +241,9 @@
 %{_mandir}/man3/*.3x*
 
 %changelog
+* 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
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 22:08:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 17:08:22 -0500
Subject: rpms/firefox/devel firefox.sh.in,1.8,1.9 firefox.spec,1.104,1.105
Message-ID: <200602232208.k1NM8MOR014884@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14855

Modified Files:
	firefox.sh.in firefox.spec 
Log Message:
* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-5
- Rebuild



Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- firefox.sh.in	3 May 2005 20:04:51 -0000	1.8
+++ firefox.sh.in	23 Feb 2006 22:08:19 -0000	1.9
@@ -161,6 +161,7 @@
 esac
 
 if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then
+  opt=`echo -n "$opt" | sed -e 's/,/%2c/g' -e 's/ /%20/g'`
   # check to make sure that the command contains at least a :/ in it.
   echo $opt | grep -e ':/' 2>/dev/null > /dev/null
   RETURN_VAL=$?


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- firefox.spec	23 Feb 2006 20:28:12 -0000	1.104
+++ firefox.spec	23 Feb 2006 22:08:19 -0000	1.105
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        4
+Release:        5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -264,6 +264,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-5
+- Rebuild
+
 * Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-4
 - Ensure our wrapper handles URLs with commas/spaces (Ilya Konstantinov)
 - Fix a pango typo



From fedora-cvs-commits at redhat.com  Thu Feb 23 22:15:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 17:15:17 -0500
Subject: rpms/bluez-utils/devel sources,1.13,1.14 .cvsignore,1.13,1.14
Message-ID: <200602232215.k1NMFHYL018157@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18119

Modified Files:
	sources .cvsignore 
Log Message:
Actually add 2.25 tarball


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Nov 2005 09:27:08 -0000	1.13
+++ sources	23 Feb 2006 22:15:14 -0000	1.14
@@ -1 +1 @@
-cb5d25f79ff4a744a742070617245ce4  bluez-utils-2.22.tar.gz
+ae3729ab5592be06ed01b973d4b3e9fe  bluez-utils-2.25.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Nov 2005 09:27:08 -0000	1.13
+++ .cvsignore	23 Feb 2006 22:15:14 -0000	1.14
@@ -1 +1 @@
-bluez-utils-2.22.tar.gz
+bluez-utils-2.25.tar.gz



From fedora-cvs-commits at redhat.com  Thu Feb 23 22:28:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 17:28:38 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.22,
	1.23 selinux-policy.spec, 1.124, 1.125
Message-ID: <200602232228.k1NMScie004250@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4212

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                              |   12 ++++++------
 policy/modules/admin/logwatch.te      |    2 ++
 policy/modules/admin/su.fc            |    1 +
 policy/modules/admin/su.if            |    6 +++---
 policy/modules/admin/vpn.te           |    6 ++++++
 policy/modules/apps/java.if           |    8 ++------
 policy/modules/kernel/corecommands.fc |    1 +
 policy/modules/kernel/devices.fc      |    1 +
 policy/modules/kernel/files.if        |    5 +++--
 policy/modules/services/apache.fc     |    2 +-
 policy/modules/services/apache.if     |   21 +++++++++++++++++++++
 policy/modules/services/automount.te  |    7 +++++--
 policy/modules/services/cron.te       |    3 +++
 policy/modules/services/hal.te        |    2 +-
 policy/modules/services/xserver.te    |    2 +-
 policy/modules/system/fstools.te      |    2 +-
 policy/modules/system/locallogin.te   |    1 +
 policy/modules/system/mount.te        |    2 +-
 policy/modules/system/selinuxutil.fc  |    6 +++---
 policy/modules/system/selinuxutil.te  |    5 +----
 policy/modules/system/unconfined.te   |    2 +-
 support/Makefile.devel                |    5 +----
 22 files changed, 66 insertions(+), 36 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- policy-20060207.patch	23 Feb 2006 21:02:28 -0000	1.22
+++ policy-20060207.patch	23 Feb 2006 22:28:34 -0000	1.23
@@ -42,6 +42,23 @@
  
  /usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
 +/usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.21/policy/modules/admin/su.if
+--- nsaserefpolicy/policy/modules/admin/su.if	2006-02-23 09:25:07.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/su.if	2006-02-23 17:21:38.000000000 -0500
+@@ -141,10 +141,10 @@
+ 
+ 	# By default, revert to the calling domain when a shell is executed.
+ 	corecmd_shell_domtrans($1_su_t,$2)
+-	allow $2 $1_su_t:fd use;
+ 	allow $1_su_t $2:fd use;
+-	allow $1_su_t $2:fifo_file rw_file_perms;
+-	allow $1_su_t $2:process sigchld;
++	allow $2 $1_su_t:fd use;
++	allow $2 $1_su_t:fifo_file rw_file_perms;
++	allow $2 $1_su_t:process sigchld;
+ 
+ 	kernel_read_system_state($1_su_t)
+ 	kernel_read_kernel_sysctls($1_su_t)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.21/policy/modules/admin/vpn.te
 --- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 12:21:59.000000000 -0500
@@ -108,10 +125,13 @@
  /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.21/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-23 09:41:46.000000000 -0500
-@@ -3358,10 +3358,11 @@
++++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-23 17:28:19.000000000 -0500
+@@ -3356,12 +3356,13 @@
+ 
+ 	# Need to give permission to create directories where applicable
  	allow $1 self:process setfscreate;
- 	allow $1 polymember: dir { create setattr };
+-	allow $1 polymember: dir { create setattr };
++	allow $1 polymember: dir { create setattr relabelto };
  	allow $1 polydir: dir { write add_name };
 -	allow $1 polyparent:dir { write add_name };
 +	allow $1 polyparent:dir { write add_name relabelfrom relabelto };
@@ -122,17 +142,6 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-2.2.21/policy/modules/kernel/files.te
---- nsaserefpolicy/policy/modules/kernel/files.te	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/files.te	2006-02-23 09:41:46.000000000 -0500
-@@ -125,6 +125,7 @@
- #
- type tmp_t, mountpoint; #, polydir
- files_tmp_file(tmp_t)
-+files_poly_parent(tmp_t)
- 
- #
- # usr_t is the type for /usr.
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.21/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-23 09:41:46.000000000 -0500
@@ -267,6 +276,17 @@
  
  kernel_read_system_state(fsadm_t)
  kernel_read_kernel_sysctls(fsadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.21/policy/modules/system/locallogin.te
+--- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/locallogin.te	2006-02-23 17:24:01.000000000 -0500
+@@ -20,6 +20,7 @@
+ 
+ type local_login_tmp_t;
+ files_tmp_file(local_login_tmp_t)
++files_poly_parent(local_login_tmp_t)
+ 
+ type sulogin_t;
+ type sulogin_exec_t;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.21/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/mount.te	2006-02-23 10:11:48.000000000 -0500
@@ -279,6 +299,22 @@
  fs_rw_tmpfs_chr_files(mount_t)
  fs_read_tmpfs_symlinks(mount_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.21/policy/modules/system/selinuxutil.fc
+--- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-02-23 09:25:09.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.fc	2006-02-23 16:56:44.000000000 -0500
+@@ -8,9 +8,9 @@
+ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
+ /etc/selinux/([^/]*/)?policy(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
+ /etc/selinux/([^/]*/)?seusers	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
+-/etc/selinux([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semanage_store_t,s0)
+-/etc/selinux([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semanage_read_lock_t,s0)
+-/etc/selinux([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semanage_trans_lock_t,s0)
++/etc/selinux/([^/]*/)?modules/(active|tmp|previous)(/.*)?     --	gen_context(system_u:object_r:semanage_store_t,s0)
++/etc/selinux/([^/]*/)?modules/semanage.read.LOCK    --	gen_context(system_u:object_r:semanage_read_lock_t,s0)
++/etc/selinux/([^/]*/)?modules/semanage.trans.LOCK   --	gen_context(system_u:object_r:semanage_trans_lock_t,s0)
+ /etc/selinux/([^/]*/)?users(/.*)?	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
+ 
+ #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.21/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-23 09:25:09.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.te	2006-02-23 09:41:46.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- selinux-policy.spec	23 Feb 2006 21:02:49 -0000	1.124
+++ selinux-policy.spec	23 Feb 2006 22:28:34 -0000	1.125
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -53,24 +53,24 @@
 
 
 %define setupCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} bare \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} conf \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 bare \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  conf \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
 %define installCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} modules \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT install \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT install-appconfig \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 modules \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%4 install \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%4 install-appconfig \
 #%{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/policy \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} enableaudit \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  enableaudit \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
@@ -156,7 +156,7 @@
 
 # Install devel
 make clean
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=y install-headers install-docs
 mkdir ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
 mv ${RPM_BUILD_ROOT}%{_usr}/share/selinux/targeted/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
@@ -165,18 +165,18 @@
 
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted targeted-mcs y
-%installCmds targeted targeted-mcs y
+%setupCmds targeted targeted-mcs y y
+%installCmds targeted targeted-mcs y y
 
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} bare 
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} conf
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y bare 
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y conf
 %installCmds strict strict-mcs y
 
 # Build mls policy
-%setupCmds mls strict-mls n
-%installCmds mls strict-mls n
+%setupCmds mls strict-mls n y
+%installCmds mls strict-mls n y
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -292,8 +292,11 @@
 
 %changelog
 
+* Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-4
+- Turn on polyinstatiation
+
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-3
-- Don't transition from uncofined_t to fsadm_t
+- Don't transition from unconfined_t to fsadm_t
 
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-2
 - Fix policy update model.



From fedora-cvs-commits at redhat.com  Thu Feb 23 23:14:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 18:14:18 -0500
Subject: rpms/kernel/devel linux-2.6-powermac-pfunc-noise.patch, NONE,
	1.1 kernel-2.6.spec, 1.1977, 1.1978
Message-ID: <200602232314.k1NNEIvI031506@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31468

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-powermac-pfunc-noise.patch 
Log Message:
fix platform function noise

linux-2.6-powermac-pfunc-noise.patch:
 pfunc_base.c |    2 +-
 pfunc_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-powermac-pfunc-noise.patch ---
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index 4ffd2a9..8f1aa7a 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -9,7 +9,7 @@
 #include <asm/pmac_feature.h>
 #include <asm/pmac_pfunc.h>
 
-#define DBG(fmt...)	printk(fmt)
+#define DBG(fmt...)
 
 static irqreturn_t macio_gpio_irq(int irq, void *data, struct pt_regs *regs)
 {
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 356a739..a7aa884 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -20,7 +20,7 @@
 #define LOG_PARSE(fmt...)
 #define LOG_ERROR(fmt...)	printk(fmt)
 #define LOG_BLOB(t,b,c)
-#define DBG(fmt...)		printk(fmt)
+#define DBG(fmt...)
 
 /* Command numbers */
 #define PMF_CMD_LIST			0


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1977
retrieving revision 1.1978
diff -u -r1.1977 -r1.1978
--- kernel-2.6.spec	23 Feb 2006 19:46:24 -0000	1.1977
+++ kernel-2.6.spec	23 Feb 2006 23:14:16 -0000	1.1978
@@ -235,6 +235,7 @@
 Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
 
 # 300 - 399   ppc(64)
+Patch300: linux-2.6-powermac-pfunc-noise.patch
 Patch301: linux-2.6.15-cell-numa-init.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
@@ -737,6 +738,8 @@
 # 
 # ppc64
 #
+# Shut up the platform function stuff on pmac
+%patch300 -p1
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -1585,6 +1588,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com>
+- Shut up the debugging messages from pmac platform stuff
+
 * Thu Feb 23 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git6
 



From fedora-cvs-commits at redhat.com  Thu Feb 23 23:34:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 18:34:52 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.225, 1.226 anaconda.spec, 1.346,
	1.347 sources, 1.345, 1.346
Message-ID: <200602232334.k1NNYqhQ011533@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11513/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.10-1 on branch devel from anaconda-10.92.10-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- .cvsignore	23 Feb 2006 16:55:17 -0000	1.225
+++ .cvsignore	23 Feb 2006 23:34:40 -0000	1.226
@@ -1 +1 @@
-anaconda-10.92.9.tar.bz2
+anaconda-10.92.10.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- anaconda.spec	23 Feb 2006 16:55:17 -0000	1.346
+++ anaconda.spec	23 Feb 2006 23:34:40 -0000	1.347
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.9
+Version: 10.92.10
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,16 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Thu Feb 23 2006 Jeremy Katz <katzj at redhat.com> - 10.92.10-1
+- more bogl removal (dcantrel)
+- make the exception dumping less braindead about things we don't 
+  want dumped (clumens)
+- add backtrace handler to anaconda (pjones)
+- fix warnings with new yum in pkgorder
+- make conditional packages on deps work (pnasrat)
+- suppress some warnings (dcantrel)
+- text mode language fixes (dcantrel)
+
 * Thu Feb 23 2006 Jeremy Katz <katzj at redhat.com> - 10.92.9-1
 - Fix text mode traceback (dcantrel)
 - Skip a few more things in traceback dumps


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- sources	23 Feb 2006 16:55:17 -0000	1.345
+++ sources	23 Feb 2006 23:34:40 -0000	1.346
@@ -1 +1 @@
-453514968583f222a03aadfdbdab77f6  anaconda-10.92.9.tar.bz2
+4f3bc74eb741f976e1d3bd7e5e8e01da  anaconda-10.92.10.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 00:26:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 19:26:01 -0500
Subject: rpms/gnome-session/devel gnome-session.spec,1.55,1.56
Message-ID: <200602240026.k1O0Q14D023526@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23438

Modified Files:
	gnome-session.spec 
Log Message:
- take ownership of autostart dir (bug 182335)



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-session.spec	13 Feb 2006 19:56:46 -0000	1.55
+++ gnome-session.spec	24 Feb 2006 00:25:58 -0000	1.56
@@ -13,7 +13,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.13.91
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -121,6 +121,8 @@
 
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
 
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+
 #/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper
 
 ## remove splash screen
@@ -150,8 +152,12 @@
 %{_datadir}/man/man*/*
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/xdg/autostart
 
 %changelog
+* Thu Feb 23 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-2
+- take ownership of autostart dir (bug 182335)
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 01:22:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 20:22:59 -0500
Subject: rpms/libxklavier/devel .cvsignore, 1.6, 1.7 libxklavier.spec, 1.16,
	1.17 sources, 1.6, 1.7
Message-ID: <200602240122.k1O1MxZQ002896@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/libxklavier/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2803

Modified Files:
	.cvsignore libxklavier.spec sources 
Log Message:
- upgrade to latest cvs to handle xml comments (bug 178163)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Dec 2005 22:05:51 -0000	1.6
+++ .cvsignore	24 Feb 2006 01:22:55 -0000	1.7
@@ -1,4 +1 @@
-libxklavier-1.02.tar.gz
-libxklavier-1.14.tar.gz
-libxklavier-2.0.tar.gz
-libxklavier-2.1.tar.gz
+libxklavier-2.1.0.2006.02.23.tar.bz2


Index: libxklavier.spec
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libxklavier.spec	11 Feb 2006 04:20:34 -0000	1.16
+++ libxklavier.spec	24 Feb 2006 01:22:55 -0000	1.17
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	2.1
-Release:	3.2
+Version:	2.1.0.2006.02.23
+Release:	1
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -9,12 +9,10 @@
 BuildRequires: libxml2-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
-Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
+Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch0: libxklavier-1.14-werror.patch
-Patch1: libxklavier-2.1-xkb-path.patch
-Patch2: libxklavier-2.1-xkb-path-autogen.patch
 
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
@@ -33,17 +31,16 @@
 %prep
 %setup -q
 %patch0 -p1 -b .werror
-%patch1 -p0 -b .xkb-path
-%patch2 -p0 -b .xkb-path-autogen
+
 %build
 
-%configure --enable-doxygen --with-xkb-base='%{_datadir}/X11/xkb' --with-xkb-bin-base='%{_bindir}'
+%configure --disable-doxygen --with-xkb-base='%{_datadir}/X11/xkb' --with-xkb-bin-base='%{_bindir}'
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -64,13 +61,15 @@
 %files devel
 %defattr(-, root, root)
 
-%doc doc/html/*.html doc/html/*.png doc/html/*.css
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/*
 
 %changelog
+* Thu Feb 23 2006 Ray Strode <rstrode at redhat.com> - 2.1-4
+- upgrade to latest cvs to handle xml comments (bug 178163)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.1-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libxklavier/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Dec 2005 22:05:52 -0000	1.6
+++ sources	24 Feb 2006 01:22:55 -0000	1.7
@@ -1 +1 @@
-6a44ea49f958d7c9ad319edeea338798  libxklavier-2.1.tar.gz
+dd8d58e79c76339008597f58b7ff5b44  libxklavier-2.1.0.2006.02.23.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 03:21:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Thu, 23 Feb 2006 22:21:00 -0500
Subject: rpms/cpuspeed/devel cpuspeed.init,1.7,1.8 cpuspeed.spec,1.32,1.33
Message-ID: <200602240321.k1O3L0it020912@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20732

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
Fix broken init script. (Alexandre Oliva) [#182691]




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpuspeed.init	22 Feb 2006 04:20:46 -0000	1.7
+++ cpuspeed.init	24 Feb 2006 03:20:56 -0000	1.8
@@ -19,7 +19,11 @@
 start() {
 	if [ ! -f /var/lock/subsys/cpuspeed ]; then
 		# Attempt to load scaling_driver if not loaded but it is configured
-		if [ ! -f /sys/devices/system/cpu/cpu*/cpufreq/scaling_driver ]; then
+		for file in /sys/devices/system/cpu/cpu*/cpufreq/scaling_driver; do
+			# We want to run the code below only if the
+			# wildcard above got no matches.
+			[ ! -f "$file" ] || break
+
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else
@@ -32,7 +36,7 @@
 					fi
 				fi
 			fi
-		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


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cpuspeed.spec	22 Feb 2006 04:20:46 -0000	1.32
+++ cpuspeed.spec	24 Feb 2006 03:20:56 -0000	1.33
@@ -72,6 +72,10 @@
 exit 0
 
 %changelog
+* 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.
+
 * Tue Feb 21 2006 Dave Jones <davej at redhat.com>
 - Missed another occurance of the same problem I fixed yesterday.
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 05:24:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 00:24:24 -0500
Subject: rpms/gtk2-engines/devel gtk-engines-2.7.4-fixes.patch, NONE,
	1.1 gtk2-engines.spec, 1.35, 1.36
Message-ID: <200602240524.k1O5OOnX004237@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4104

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.7.4-fixes.patch 
Log Message:
Add important bits from upstream


gtk-engines-2.7.4-fixes.patch:
 clearlooks_draw.c  |   20 +++++-
 clearlooks_style.c |  176 +++++++++++++++++++++++++++--------------------------
 2 files changed, 110 insertions(+), 86 deletions(-)

--- NEW FILE gtk-engines-2.7.4-fixes.patch ---
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_draw.c.fixes	2006-02-24 00:03:24.000000000 -0500
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_draw.c	2006-02-24 00:05:52.000000000 -0500
@@ -290,6 +290,23 @@
 		cairo_pattern_destroy (pattern);
 	}
 	
+
+        /* Drawing the border */
+
+        if (!params->active && params->is_default)
+        {
+                CairoColor *l = &colors->shade[4];
+                CairoColor *d = &colors->shade[4];
+                cairo_set_source_rgb(cr, l->r, l->g, l->b);
+                cairo_rectangle (cr, 2.5, 2.5, width-5, height-5);
+                cairo_stroke (cr);
+
+                cairo_set_source_rgb(cr, d->r, d->g, d->b);
+                cairo_rectangle (cr, 3.5, 3.5, width-7, height-7);
+                cairo_stroke (cr);
+        }
+
+
 	if (params->disabled)
 	{
 		cairo_set_source_rgb (cr, border_disabled->r,
@@ -307,7 +324,8 @@
                                   width-(xoffset*2)-1, height-(yoffset*2)-1,
                                   3.0, params->corners);
 	cairo_stroke (cr);
-	
+
+        /* Draw the "shadow" */	
 	if (!params->active)
 	{
 		cairo_translate (cr, 0.5, 0.5);
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c.fixes	2006-02-23 23:58:50.000000000 -0500
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c	2006-02-24 00:02:28.000000000 -0500
@@ -833,101 +833,107 @@
 	cairo_destroy (cr);
 }
 
-static void
 draw_check (DRAW_ARGS)
 {
-	ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style);
-	CairoColor *border;
-	CairoColor *dot;
-	double trans = 1.0;
-	gboolean draw_bullet = (shadow_type == GTK_SHADOW_IN);
+        ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style);
+        CairoColor *border;
+        CairoColor *dot;
+        double trans = 1.0;
+        gboolean draw_bullet = (shadow_type == GTK_SHADOW_IN || shadow_type == GTK_SHADOW_ETCHED_IN);
 
-	cairo_t *cr = clearlooks_begin_paint (window, area);
-	cairo_pattern_t *pt;
+        cairo_t *cr = clearlooks_begin_paint (window, area);
+        cairo_pattern_t *pt;
 
 #ifdef HAVE_ANIMATION
-	if(clearlooks_style->animation && GTK_IS_CHECK_BUTTON (widget) && !cl_async_animation_lookup((gconstpointer)widget)  && !g_slist_find (signaled_widgets, (gconstpointer)widget))
-	{
-			signaled_widgets = g_slist_append (signaled_widgets, widget);
-			g_signal_connect ((GObject*)widget, "toggled", G_CALLBACK (cl_checkbox_toggle), widget);
-	}
+        if (clearlooks_style->animation)
+                clearlooks_animation_connect_checkbox (widget);
 #endif
-	
-	if (state_type == GTK_STATE_INSENSITIVE)
-	{
-		border = &clearlooks_style->colors.shade[2];
-		dot    = &clearlooks_style->colors.shade[2];
-	}
-	else
-	{
-		border = &clearlooks_style->colors.shade[7];
-		dot    = &clearlooks_style->colors.spot[1];
-	}
 
-	cairo_translate (cr, x, y);
-	cairo_set_line_width (cr, 1);
-	
-	if (style->xthickness > 2 && style->ythickness > 2)
-	{
-		/* Draw a gradient around the box so it appears sunken. */
-		pt = cairo_pattern_create_linear (0, 0, 0, 13);
-		cairo_pattern_add_color_stop_rgba (pt, 0.0, 0, 0, 0, 0.04);
-		cairo_pattern_add_color_stop_rgba (pt, 0.5, 0, 0, 0, 0);
-		cairo_pattern_add_color_stop_rgba (pt, 0.5, 1, 1, 1, 0);
-		cairo_pattern_add_color_stop_rgba (pt, 1.0, 1, 1, 1, 0.4);
-		
-		cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
-		cairo_set_source (cr, pt);
-		cairo_stroke (cr);
-		cairo_pattern_destroy (pt);
-		
-		/* Draw the rectangle for the checkbox itself */
-		cairo_rectangle (cr, 1.5, 1.5, width-3, height-3);
-	}
-	else
-	{
-		cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
-	}
-	
-	if (state_type != GTK_STATE_INSENSITIVE)
-	{
-		CairoColor *bg = &clearlooks_style->colors.base[0];
-		cairo_set_source_rgb (cr, bg->r, bg->g, bg->b);
-		cairo_fill_preserve (cr);
-	}
-	
-	cairo_set_source_rgb (cr, border->r, border->g, border->b);
-	cairo_stroke (cr);
-		
+        if (state_type == GTK_STATE_INSENSITIVE)
+        {
+                border = &clearlooks_style->colors.shade[2];
+                dot    = &clearlooks_style->colors.shade[2];
+        }
+        else
+        {
+                border = &clearlooks_style->colors.shade[7];
+                dot    = &clearlooks_style->colors.spot[1];
+        }
+
+        cairo_translate (cr, x, y);
+        cairo_set_line_width (cr, 1);
+
+        if (style->xthickness > 2 && style->ythickness > 2)
+        {
+                /* Draw a gradient around the box so it appears sunken. */
+                pt = cairo_pattern_create_linear (0, 0, 0, 13);
+                cairo_pattern_add_color_stop_rgba (pt, 0.0, 0, 0, 0, 0.04);
+                cairo_pattern_add_color_stop_rgba (pt, 0.5, 0, 0, 0, 0);
+                cairo_pattern_add_color_stop_rgba (pt, 0.5, 1, 1, 1, 0);
+                cairo_pattern_add_color_stop_rgba (pt, 1.0, 1, 1, 1, 0.4);
+
+                cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
+                cairo_set_source (cr, pt);
+                cairo_stroke (cr);
+                cairo_pattern_destroy (pt);
+
+                /* Draw the rectangle for the checkbox itself */
+                cairo_rectangle (cr, 1.5, 1.5, width-3, height-3);
+        }
+        else
+        {
+                cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
+        }
+
+        if (state_type != GTK_STATE_INSENSITIVE)
+        {
+                CairoColor *bg = &clearlooks_style->colors.base[0];
+                cairo_set_source_rgb (cr, bg->r, bg->g, bg->b);
+                cairo_fill_preserve (cr);
+        }
+
+        cairo_set_source_rgb (cr, border->r, border->g, border->b);
+        cairo_stroke (cr);
+
 #ifdef HAVE_ANIMATION
-	if (clearlooks_style->animation && cl_async_animation_lookup((gconstpointer)widget))
-	{
-		int value = cl_async_animation_getdata((gpointer)widget).frame;
-		
-		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
-			trans = (float)(5-value)/5;
-		else
-			trans = (float)value/5;
-		
-		draw_bullet = TRUE;
-	}
+        if (clearlooks_style->animation && GTK_IS_CHECK_BUTTON (widget) &&
+            clearlooks_animation_is_animated(widget) &&
+            !gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (widget)))
+        {
+                gfloat elapsed = clearlooks_animation_elapsed (widget);
+
+                if (draw_bullet)
+                        trans = sqrt (sqrt (MIN(elapsed / CHECK_ANIMATION_TIME, 1.0)));
+                else
+                        trans = 1.0 - sqrt (sqrt (MIN(elapsed / CHECK_ANIMATION_TIME, 1.0)));
+
+                draw_bullet = TRUE;
+        }
 #endif
 
-	if (draw_bullet)
-	{
-		cairo_set_line_width (cr, 1.7);
-		cairo_move_to (cr, 0.5 + (width*0.2), (height*0.5));
-		cairo_line_to (cr, 0.5 + (width*0.4), (height*0.7));
-		
-		cairo_curve_to (cr, 0.5 + (width*0.4), (height*0.7),
-		                    0.5 + (width*0.5), (height*0.4),
-		                    0.5 + (width*0.70), (height*0.25));
-		
-		
-		cairo_set_source_rgba (cr, dot->r, dot->g, dot->b, trans);
-		cairo_stroke (cr);
-	}
-	cairo_destroy (cr);
+        if (draw_bullet)
+        {
+                if (shadow_type == GTK_SHADOW_ETCHED_IN) /* Inconsistent */
+                {
+                        cairo_set_line_width (cr, 2.0);
+                        cairo_move_to (cr, 3, height*0.5);
+                        cairo_line_to (cr, width-3, height*0.5);
+                }
+                else
+                {
+                        cairo_set_line_width (cr, 1.7);
+                        cairo_move_to (cr, 0.5 + (width*0.2), (height*0.5));
+                        cairo_line_to (cr, 0.5 + (width*0.4), (height*0.7));
+
+                        cairo_curve_to (cr, 0.5 + (width*0.4), (height*0.7),
+                                            0.5 + (width*0.5), (height*0.4),
+                                            0.5 + (width*0.70), (height*0.25));
+                }
+
+                cairo_set_source_rgba (cr, dot->r, dot->g, dot->b, trans);
+                cairo_stroke (cr);
+        }
+        cairo_destroy (cr);
 }
 
 static void


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gtk2-engines.spec	11 Feb 2006 03:22:07 -0000	1.35
+++ gtk2-engines.spec	24 Feb 2006 05:24:20 -0000	1.36
@@ -1,10 +1,12 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	1.2
+Release:	2
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
+# backport of default button and inconsistant state from cvs
+Patch0:		gtk-engines-2.7.4-fixes.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q -n gtk-engines-%{version}
+%patch0 -p1 -b .fixes
 
 %build
 %configure
@@ -60,6 +63,10 @@
 %{_datadir}/themes
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.4-2
+- Backport patches to draw default buttons and
+  inconsistent checkboxes
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.7.4-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 06:34:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 01:34:35 -0500
Subject: rpms/beagle/devel beagle-0.2.1-spew.patch, NONE,
	1.1 beagle-0.2.0-security-fix.patch, 1.1, 1.2 beagle.spec,
	1.34, 1.35
Message-ID: <200602240634.k1O6YYUn031526@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31510

Modified Files:
	beagle-0.2.0-security-fix.patch beagle.spec 
Added Files:
	beagle-0.2.1-spew.patch 
Log Message:
Fix some issues


beagle-0.2.1-spew.patch:
 BeagleDaemon.cs            |    2 +-
 IndexHelper/IndexHelper.cs |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE beagle-0.2.1-spew.patch ---
--- beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs.spew	2006-02-24 01:19:59.000000000 -0500
+++ beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs	2006-02-24 01:20:35.000000000 -0500
@@ -59,15 +59,13 @@
 			bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null);
 			bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null);
 			
-			// FIXME: We always turn on full debugging output!  We are still
-			// debugging this code, after all...
-			//bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
+			bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
 
 			last_activity = DateTime.Now;
 
 			Log.Initialize (PathFinder.LogDir,
 					"IndexHelper",
-					//debug ? LogLevel.Debug : LogLevel.Warn,
+					debug ? LogLevel.Debug : LogLevel.Warn,
 					LogLevel.Debug,
 					run_by_hand || log_in_fg);
 
--- beagle-0.2.1/beagled/BeagleDaemon.cs.spew	2006-02-24 01:26:56.000000000 -0500
+++ beagle-0.2.1/beagled/BeagleDaemon.cs	2006-02-24 01:28:44.000000000 -0500
@@ -377,7 +377,7 @@
 					// FIXME: We always turn on full debugging output!  We are still
 					// debugging this code, after all...
 					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
-					LogLevel.Debug,
+					LogLevel.Warn,
 					arg_fg);
 
 			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);

beagle-0.2.0-security-fix.patch:
 beagled-index-helper.in |   33 ++-------------------------------
 beagled.in              |   25 -------------------------
 2 files changed, 2 insertions(+), 56 deletions(-)

Index: beagle-0.2.0-security-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.0-security-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.0-security-fix.patch	31 Jan 2006 19:46:55 -0000	1.1
+++ beagle-0.2.0-security-fix.patch	24 Feb 2006 06:34:29 -0000	1.2
@@ -1,5 +1,5 @@
---- beagle-0.2.0/beagled/beagled.in.security-fix	2006-01-31 14:42:48.000000000 -0500
-+++ beagle-0.2.0/beagled/beagled.in	2006-01-31 14:44:41.000000000 -0500
+--- beagle-0.2.1/beagled/beagled.in.security-fix	2005-12-06 16:17:29.000000000 -0500
++++ beagle-0.2.1/beagled/beagled.in	2006-02-21 15:00:39.000000000 -0500
 @@ -1,29 +1,5 @@
  #!@bash@
  
@@ -38,3 +38,44 @@
  
  export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX"
  
+--- beagle-0.2.1/beagled/beagled-index-helper.in.security-fix	2006-02-24 01:14:07.000000000 -0500
++++ beagle-0.2.1/beagled/beagled-index-helper.in	2006-02-24 01:15:05.000000000 -0500
+@@ -1,36 +1,7 @@
+ #!@bash@
+ 
+-if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
+-    echo "*** Running uninstalled @target@ ***"
+-    THIS_PATH="../Util:../BeagleClient:."
+-    THIS_EXE="./@target@"
+-
+-    export MONO_PATH="../Util:../BeagleClient:$MONO_PATH"
+-    export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH"
+-
+-    # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path".
+-    if [ -n "$BEAGLE_FILTER_PATH" ]; then
+-	export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH"
+-    else
+-	export BEAGLE_FILTER_PATH="../Filters"
+-    fi
+-
+-else
+-    THIS_PATH="@pkglibdir@"
+-    THIS_EXE="@pkglibdir@/@target@"
+-fi
+-
+-if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then
+-   n=1
+-   while [ -e $BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n ]; do
+-	 n=$(($n+1))
+-   done	
+-   MONO_EXTRA_ARGS="--profile=heap-buddy:$BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n $MONO_EXTRA_ARGS"
+-fi
+-
+-if [ -n "$BEAGLE_DEBUG_FLAG_IS_SET" ]; then
+-   MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS"
+-fi
++THIS_PATH="@pkglibdir@"
++THIS_EXE="@pkglibdir@/@target@"
+ 
+ export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX"
+ export MONO_PATH="$THIS_PATH:$MONO_PATH"


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- beagle.spec	22 Feb 2006 16:28:22 -0000	1.34
+++ beagle.spec	24 Feb 2006 06:34:29 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           beagle
 Version:        0.2.1
-Release:        11
+Release:        12
 Summary:        The Beagle Search Infrastructure
 
 Group:          User Interface/Desktops
@@ -27,6 +27,7 @@
 Patch0: beagle-0.2.0-security-fix.patch
 Patch1: beagle-0.2.1-sqlite3.patch
 Patch2: beagle-0.2.1-crawl.patch
+Patch3: beagle-0.2.1-spew.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -63,6 +64,7 @@
 %patch0 -p1 -b .security-fix
 %patch1 -p1 -b .sqlite3
 %patch2 -p1 -b .crawl
+%patch3 -p1 -b .spew
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -142,39 +144,41 @@
 # install the firefox extension
 # note that this code is duplicated below in a trigger
   latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-  cd %{_libdir}/firefox-$latest/extensions
-  mkdir beagle-extension
-  unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
-  id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
-  if [ -e "$id" ]; then
-    rm -rf beagle-extension
-  else
-    mv beagle-extension "$id"
+  if [ -d %{_libdir}/firefox-$latest/extensions ]; then
+    cd %{_libdir}/firefox-$latest/extensions
+    mkdir beagle-extension
+    unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi
+    id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+    if [ -e "$id" ]; then
+      rm -rf beagle-extension
+    else
+      mv beagle-extension "$id"
+    fi
   fi
 fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %triggerin -- firefox
 # install the firefox extension
 latest=`rpm --query --queryformat "%{VERSION}\n" firefox | head -1 | tr -d "\n\r"`
-if [ -d /usr/lib64  ]; then
+if [ -d /usr/lib64/firefox-$latest/extensions ]; then
   libdir=/usr/lib64
 else
   libdir=/usr/lib
 fi
-cd $libdir/firefox-$latest/extensions
-mkdir beagle-extension
-unzip -q -d beagle-extension $libdir/beagle/beagle.xpi
-id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
-if [ -e "$id" ]; then
-  rm -rf beagle-extension
-else
-  mv beagle-extension "$id"
+if [ -f $libdir/beagle/beagle.xpi ]; then
+  cd $libdir/firefox-$latest/extensions
+  mkdir beagle-extension
+  unzip -q -d beagle-extension $libdir/beagle/beagle.xpi
+  id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"`
+  if [ -e "$id" ]; then
+    rm -rf beagle-extension
+  else
+    mv beagle-extension "$id"
+  fi
 fi
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README
@@ -207,6 +211,11 @@
 %{_prefix}/lib/python*/site-packages/beagle.so
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-12
+- Remove more "run from ." nonsense  (#182709)
+- Don't spew tons of debug output  (#182660)
+- Try to make the trigger more robust  (#182679)
+
 * Wed Feb 22 2006 Matthias Clasen <mclasen at redhat.com> 0.2.1-11
 - Silence %%post 
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 06:44:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 01:44:18 -0500
Subject: rpms/beagle/devel beagle-0.2.1-spew.patch,1.1,1.2
Message-ID: <200602240644.k1O6iI6W031681@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31666

Modified Files:
	beagle-0.2.1-spew.patch 
Log Message:
Fix patch


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.1-spew.patch	24 Feb 2006 06:34:29 -0000	1.1
+++ beagle-0.2.1-spew.patch	24 Feb 2006 06:44:14 -0000	1.2
@@ -1,6 +1,6 @@
 --- beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs.spew	2006-02-24 01:19:59.000000000 -0500
-+++ beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs	2006-02-24 01:20:35.000000000 -0500
-@@ -59,15 +59,13 @@
++++ beagle-0.2.1/beagled/IndexHelper/IndexHelper.cs	2006-02-24 01:43:33.000000000 -0500
+@@ -59,16 +59,13 @@
  			bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null);
  			bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null);
  			
@@ -14,10 +14,11 @@
  			Log.Initialize (PathFinder.LogDir,
  					"IndexHelper",
 -					//debug ? LogLevel.Debug : LogLevel.Warn,
+-					LogLevel.Debug,
 +					debug ? LogLevel.Debug : LogLevel.Warn,
- 					LogLevel.Debug,
  					run_by_hand || log_in_fg);
  
+ 			Application.InitCheck ("IndexHelper", ref args);
 --- beagle-0.2.1/beagled/BeagleDaemon.cs.spew	2006-02-24 01:26:56.000000000 -0500
 +++ beagle-0.2.1/beagled/BeagleDaemon.cs	2006-02-24 01:28:44.000000000 -0500
 @@ -377,7 +377,7 @@



From fedora-cvs-commits at redhat.com  Fri Feb 24 07:37:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 02:37:21 -0500
Subject: rpms/iproute/devel iproute.spec,1.45,1.46
Message-ID: <200602240737.k1O7bLlp011835@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11756

Modified Files:
	iproute.spec 
Log Message:
 - own /usr/lib/tc (#181953)
 - obsoletes shapecfg (#182284)



Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- iproute.spec	11 Feb 2006 03:36:46 -0000	1.45
+++ iproute.spec	24 Feb 2006 07:37:14 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: Advanced IP routing and network device configuration tools.
 Name: iproute
 Version: 2.6.15
-Release: 1.2
+Release: 2
 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
@@ -16,6 +16,7 @@
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
+Obsoletes: /sbin/cbq
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -79,12 +80,17 @@
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) /etc/iproute2/*
 %{_sbindir}/*
+%dir %{_libdir}/tc
 %{_libdir}/tc/*
 /sbin/cbq
 %dir /etc/sysconfig/cbq
 %config(noreplace) /etc/sysconfig/cbq/*
 
 %changelog
+* Wed Feb 22 2006 Radek Vok??l <rvokal at redhat.com> - 2.6.15-2
+- own /usr/lib/tc (#181953)
+- obsoletes shapecfg (#182284)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 08:19:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 03:19:29 -0500
Subject: rpms/iproute/devel iproute.spec,1.46,1.47
Message-ID: <200602240819.k1O8JTFX017193@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iproute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15959

Modified Files:
	iproute.spec 
Log Message:
- fix obsolete tag



Index: iproute.spec
===================================================================
RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- iproute.spec	24 Feb 2006 07:37:14 -0000	1.46
+++ iproute.spec	24 Feb 2006 08:19:14 -0000	1.47
@@ -16,7 +16,7 @@
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison
-Obsoletes: /sbin/cbq
+Obsoletes: shapecfg
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for



From fedora-cvs-commits at redhat.com  Fri Feb 24 10:02:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 05:02:38 -0500
Subject: rpms/gawk/FC-4 gawk-3.1.4-random.patch, NONE, 1.1 gawk.spec, 1.26,
	1.27
Message-ID: <200602241002.k1OA2cBA007272@cvs.devel.redhat.com>

Author: kzak

Update of /cvs/dist/rpms/gawk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7227

Modified Files:
	gawk.spec 
Added Files:
	gawk-3.1.4-random.patch 
Log Message:
fix random stuff

gawk-3.1.4-random.patch:
 random.c |  155 ++++++++++++++++++++++++++++++---------------------------------
 random.h |   27 ++++++++++
 2 files changed, 102 insertions(+), 80 deletions(-)

--- NEW FILE gawk-3.1.4-random.patch ---
--- gawk-3.1.4/random.h.kzak	2006-02-24 09:28:38.000000000 +0100
+++ gawk-3.1.4/random.h	2006-02-24 09:34:31.000000000 +0100
@@ -32,6 +32,33 @@
 #define random gawk_random
 #define srandom gawk_srandom
 
+#include <limits.h>
+
+#if UINT_MAX == 65536
+# define SIZEOF_UNSIGNED_INT 2
+#endif
+
+#if UINT_MAX == 4294967295U
+# define SIZEOF_UNSIGNED_INT 4
+#endif
+
+#if ULONG_MAX == 4294967295UL
+# define SIZEOF_UNSIGNED_LONG 4
+#endif
+
+
+#if SIZEOF_UNSIGNED_INT == 4
+typedef unsigned int gawk_uint32_t;
+typedef          int gawk_int32_t;
+#else
+#if SIZEOF_UNSIGNED_LONG == 4
+typedef unsigned long gawk_uint32_t;
+typedef          long gawk_int32_t;
+#endif
+#endif
+#define uint32_t gawk_uint32_t
+#define int32_t  gawk_int32_t
+
 #ifdef __STDC__
 #undef __P
 #define __P(s) s
--- gawk-3.1.4/random.c.kzak	2006-02-24 09:32:36.000000000 +0100
+++ gawk-3.1.4/random.c	2005-05-11 17:28:17.000000000 +0200
@@ -29,45 +29,43 @@
  * 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.
- *
- * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.13 2000/01/27 23:06:49 jasone Exp $
- *
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
 #endif /* LIBC_SCCS and not lint */
 
-#include "random.h"		/* gawk addition */
-
-/*
- * srandomdev() isn't used by gawk, and it causes numerous
- * compile headaches, so just blow it away.
- */
-#if 0
-#if !defined (_MSC_VER) && !defined (__MINGW32__) && !defined (VMS)
-#include <sys/time.h>          /* for srandomdev() */
-#else
-#include <time.h>              /* for clock() */
-#define ssize_t size_t
-#endif /* !defined (_MSC_VER) && !defined (__MINGW32__) && !defined (VMS) */
+#ifdef HAVE_CONFIG_H		/* gawk addition */
+#include <config.h>
 #endif
 
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
 #include <stdio.h>
-
-/* For gawk, don't this, use the decl of random() in random.h */
-#if 0
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
-/* same thing here: */
-#if 0
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>            /* for srandomdev() */
+#include "random.h"		/* gawk addition */
+
+#ifdef HAVE_SYS_TIME_H		/* gawk addition */
+#include <sys/time.h>
 #endif
-#ifdef HAVE_FCNTL_H
+
+#if 0
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/stdlib/random.c,v 1.24 2004/01/20 03:02:18 das Exp $");
+
+#include "namespace.h"
+#include <sys/time.h>          /* for srandomdev() */
 #include <fcntl.h>             /* for srandomdev() */
-#endif
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>            /* for srandomdev() */
+#include "un-namespace.h"
 #endif
 
 /*
@@ -86,10 +84,10 @@
  * congruential generator.  If the amount of state information is less than
  * 32 bytes, a simple linear congruential R.N.G. is used.
  *
- * Internally, the state information is treated as an array of longs; the
+ * Internally, the state information is treated as an array of uint32_t's; the
  * zeroeth element of the array is the type of R.N.G. being used (small
  * integer); the remainder of the array is the state information for the
- * R.N.G.  Thus, 32 bytes of state information will give 7 longs worth of
+ * R.N.G.  Thus, 32 bytes of state information will give 7 ints worth of
  * state information, which will allow a degree seven polynomial.  (Note:
  * the zeroeth word of state information also has some other information
  * stored in it -- see setstate() for details).
@@ -105,7 +103,7 @@
  * period of the generator is approximately deg*(2**deg - 1); thus doubling
  * the amount of state information has a vast influence on the period of the
  * generator.  Note: the deg*(2**deg - 1) is an approximation only good for
- * large deg, when the period of the shift register is the dominant factor.
+ * large deg, when the period of the shift is the dominant factor.
  * With deg equal to seven, the period is actually much longer than the
  * 7*(2**7 - 1) predicted by this formula.
  *
@@ -167,8 +165,14 @@
  */
 #define	MAX_TYPES	5		/* max number of types above */
 
-static long degrees[MAX_TYPES] =	{ DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
-static long seps [MAX_TYPES] =	{ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
+#ifdef  USE_WEAK_SEEDING
+#define NSHUFF 0
+#else   /* !USE_WEAK_SEEDING */
+#define NSHUFF 50       /* to drop some "seed -> 1st value" linearity */
+#endif  /* !USE_WEAK_SEEDING */
+
+static const int degrees[MAX_TYPES] =	{ DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
+static const int seps [MAX_TYPES] =	{ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
 
 /*
  * Initially, everything is set up as if from:
@@ -184,7 +188,7 @@
  *	MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
  */
 
-static long randtbl[DEG_3 + 1] = {
+static uint32_t randtbl[DEG_3 + 1] = {
 	TYPE_3,
 #ifdef  USE_WEAK_SEEDING
 /* Historic implementation compatibility */
@@ -219,8 +223,8 @@
  * in the initialization of randtbl) because the state table pointer is set
  * to point to randtbl[1] (as explained below).
  */
-static long *fptr = &randtbl[SEP_3 + 1];
-static long *rptr = &randtbl[1];
+static uint32_t *fptr = &randtbl[SEP_3 + 1];
+static uint32_t *rptr = &randtbl[1];
 
 /*
  * The following things are the pointer to the state information table, the
@@ -232,16 +236,16 @@
  * this is more efficient than indexing every time to find the address of
  * the last element to see if the front and rear pointers have wrapped.
  */
-static long *state = &randtbl[1];
-static long rand_type = TYPE_3;
-static long rand_deg = DEG_3;
-static long rand_sep = SEP_3;
-static long *end_ptr = &randtbl[DEG_3 + 1];
+static uint32_t *state = &randtbl[1];
+static int rand_type = TYPE_3;
+static int rand_deg = DEG_3;
+static int rand_sep = SEP_3;
+static uint32_t *end_ptr = &randtbl[DEG_3 + 1];
 
-static long good_rand __P((long));
+static inline uint32_t good_rand(int32_t);
 
-static long good_rand (x)
-	register long x;
+static inline uint32_t good_rand (x)
+	int32_t x;
 {
 #ifdef  USE_WEAK_SEEDING
 /*
@@ -259,12 +263,15 @@
  * Park and Miller, Communications of the ACM, vol. 31, no. 10,
  * October 1988, p. 1195.
  */
-	register long hi, lo;
+	int32_t hi, lo;
 
+	/* Can't be initialized with 0, so use another value. */
+	if (x == 0)
+		x = 123459876;
 	hi = x / 127773;
 	lo = x % 127773;
 	x = 16807 * lo - 2836 * hi;
-	if (x <= 0)
+	if (x < 0)
 		x += 0x7fffffff;
 	return (x);
 #endif  /* !USE_WEAK_SEEDING */
@@ -286,33 +293,34 @@
 srandom(x)
 	unsigned long x;
 {
-	register long i;
+	int i, lim;
 
+	state[0] = (uint32_t)x;
 	if (rand_type == TYPE_0)
-		state[0] = x;
+		lim = NSHUFF;
 	else {
-		state[0] = x;
 		for (i = 1; i < rand_deg; i++)
 			state[i] = good_rand(state[i - 1]);
 		fptr = &state[rand_sep];
 		rptr = &state[0];
-		for (i = 0; i < 10 * rand_deg; i++)
-			(void)random();
+		lim = 10 * rand_deg;
 	}
+	for (i = 0; i < lim; i++)
+		(void)random();
 }
 
+#if 0 /* gawk doesn't use this */
 /*
  * srandomdev:
  *
  * Many programs choose the seed value in a totally predictable manner.
  * This often causes problems.  We seed the generator using the much more
- * secure urandom(4) interface.  Note that this particular seeding
+ * secure random(4) interface.  Note that this particular seeding
  * procedure can generate states which are impossible to reproduce by
  * calling srandom() with any value, since the succeeding terms in the
  * state buffer are no longer derived from the LC algorithm applied to
  * a fixed seed.
  */
-#if 0
 void
 srandomdev()
 {
@@ -325,32 +333,19 @@
 		len = rand_deg * sizeof state[0];
 
 	done = 0;
-#ifdef O_RDONLY
-	fd = open("/dev/urandom", O_RDONLY, 0);
+	fd = open("/dev/random", O_RDONLY, 0);
 	if (fd >= 0) {
 		if (read(fd, (void *) state, len) == (ssize_t) len)
 			done = 1;
 		close(fd);
 	}
-#endif	/*O_RDONLY*/
 
 	if (!done) {
-		unsigned long junk;
-#if !defined (_MSC_VER) && !defined (__MINGW32__)
 		struct timeval tv;
+		unsigned long junk;
 
 		gettimeofday(&tv, NULL);
-		srandom(getpid() ^ tv.tv_sec ^ tv.tv_usec ^ junk);
-#else
-		clock_t ret_clock_t = clock();
-		/*
-		 * I don't like the idea of reading uninitialized memory
-		 * even to generate a random number, but we do it anyway.
-		 * SD.
-		 */
-		srandom(getpid() ^ ret_clock_t ^ junk);
-#endif
-
+		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
 		return;
 	}
 
@@ -380,7 +375,7 @@
  *
  * Returns a pointer to the old state.
  *
- * Note: The Sparc platform requires that arg_state begin on a long
+ * Note: The Sparc platform requires that arg_state begin on an int
  * word boundary; otherwise a bus error will occur. Even so, lint will
  * complain about mis-alignment, but you should disregard these messages.
  */
@@ -390,8 +385,8 @@
 	char *arg_state;		/* pointer to state array */
 	long n;				/* # bytes of state info */
 {
-	register char *ostate = (char *)(&state[-1]);
-	register long *long_arg_state = (long *) arg_state;
+	char *ostate = (char *)(&state[-1]);
+	uint32_t *int_arg_state = (uint32_t *)arg_state;
 
 	if (rand_type == TYPE_0)
 		state[-1] = rand_type;
@@ -423,13 +418,13 @@
 		rand_deg = DEG_4;
 		rand_sep = SEP_4;
 	}
-	state = (long *) (long_arg_state + 1); /* first location */
+	state = int_arg_state + 1; /* first location */
 	end_ptr = &state[rand_deg];	/* must set end_ptr before srandom */
 	srandom(seed);
 	if (rand_type == TYPE_0)
-		long_arg_state[0] = rand_type;
+		int_arg_state[0] = rand_type;
 	else
-		long_arg_state[0] = MAX_TYPES * (rptr - state) + rand_type;
+		int_arg_state[0] = MAX_TYPES * (rptr - state) + rand_type;
 	return(ostate);
 }
 
@@ -448,7 +443,7 @@
  *
  * Returns a pointer to the old state information.
  *
- * Note: The Sparc platform requires that arg_state begin on a long
+ * Note: The Sparc platform requires that arg_state begin on an int
  * word boundary; otherwise a bus error will occur. Even so, lint will
  * complain about mis-alignment, but you should disregard these messages.
  */
@@ -456,9 +451,9 @@
 setstate(arg_state)
 	char *arg_state;		/* pointer to state array */
 {
-	register long *new_state = (long *) arg_state;
-	register long type = new_state[0] % MAX_TYPES;
-	register long rear = new_state[0] / MAX_TYPES;
+	uint32_t *new_state = (uint32_t *)arg_state;
+	uint32_t type = new_state[0] % MAX_TYPES;
+	uint32_t rear = new_state[0] / MAX_TYPES;
 	char *ostate = (char *)(&state[-1]);
 
 	if (rand_type == TYPE_0)
@@ -479,7 +474,7 @@
 		(void)fprintf(stderr,
 		    "random: state info corrupted; not changed.\n");
 	}
-	state = (long *) (new_state + 1);
+	state = new_state + 1;
 	if (rand_type != TYPE_0) {
 		rptr = &state[rear];
 		fptr = &state[(rear + rand_sep) % rand_deg];
@@ -508,8 +503,8 @@
 long
 random()
 {
-	register long i;
-	register long *f, *r;
+	uint32_t i;
+	uint32_t *f, *r;
 
 	if (rand_type == TYPE_0) {
 		i = state[0];
@@ -531,5 +526,5 @@
 
 		fptr = f; rptr = r;
 	}
-	return(i);
+	return((long)i);
 }


Index: gawk.spec
===================================================================
RCS file: /cvs/dist/rpms/gawk/FC-4/gawk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gawk.spec	25 Oct 2005 14:25:29 -0000	1.26
+++ gawk.spec	24 Feb 2006 10:02:35 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: The GNU version of the awk text processing utility.
 Name: gawk
 Version: 3.1.4
-Release: 5.3
+Release: 5.4
 License: GPL
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2
@@ -13,6 +13,8 @@
 Patch5: gawk-3.1.4-uplow.patch
 # 160421 - crash when using non-decimal data in command line parameters
 Patch6: gawk-3.1.4-locale.patch
+# 174551 - Regular expressions fail if srand() is used.
+Patch7: gawk-3.1.4-random.patch
 
 Prereq: /sbin/install-info
 Requires: /bin/mktemp
@@ -34,6 +36,7 @@
 %patch4 -p1 -b .nextc
 %patch5 -p1 -b .uplow
 %patch6 -p1 -b .locale
+%patch7 -p1 -b .random
 
 %build
 %configure
@@ -83,6 +86,10 @@
 %{_datadir}/awk
 
 %changelog
+* Fri Feb 24 2006 Karel Zak <kzak at redhat.com> 3.1.4-5.4
+- fix #174551 - regular expressions fail if srand() is used
+  (backport random.c from 3.1.5)
+
 * Tue Oct 25 2005 Karel Zak <kzak at redhat.com> 3.1.4-5.3
 - fix #167181 - gawk owns /usr/share
 - fix #160634 - should exclude dirs in spec file



From fedora-cvs-commits at redhat.com  Fri Feb 24 10:46:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 05:46:49 -0500
Subject: rpms/pam/devel pam-0.99.3.0-cracklib-try-first-pass.patch, NONE,
	1.1 pam.spec, 1.104, 1.105 system-auth.pamd, 1.3, 1.4
Message-ID: <200602241046.k1OAkn0F014109@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/pam/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14061

Modified Files:
	pam.spec system-auth.pamd 
Added Files:
	pam-0.99.3.0-cracklib-try-first-pass.patch 
Log Message:
* Fri Feb 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-2
- added try_first_pass option to pam_cracklib
- use try_first_pass for pam_unix and pam_cracklib in
  system-auth (#182350)


pam-0.99.3.0-cracklib-try-first-pass.patch:
 pam_cracklib.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE pam-0.99.3.0-cracklib-try-first-pass.patch ---
--- Linux-PAM-0.99.3.0/modules/pam_cracklib/pam_cracklib.c.try-first-pass	2006-01-08 10:49:05.000000000 +0100
+++ Linux-PAM-0.99.3.0/modules/pam_cracklib/pam_cracklib.c	2006-02-24 10:42:53.000000000 +0100
@@ -93,6 +93,7 @@
 	int low_credit;
 	int oth_credit;
 	int use_authtok;
+	int try_first_pass;
 	char prompt_type[BUFSIZ];
         char cracklib_dictpath[PATH_MAX];
 };
@@ -158,6 +159,10 @@
 		 opt->oth_credit = 0;
 	 } else if (!strncmp(*argv,"use_authtok",11)) {
 		 opt->use_authtok = 1;
+	 } else if (!strncmp(*argv,"use_first_pass",14)) {
+		 opt->use_authtok = 1;
+	 } else if (!strncmp(*argv,"try_first_pass",14)) {
+		 opt->try_first_pass = 1;
 	 } else if (!strncmp(*argv,"dictpath=",9)) {
 	     strncpy(opt->cracklib_dictpath, *argv+9,
 		     sizeof(opt->cracklib_dictpath) - 1);
@@ -559,7 +564,7 @@
          * set PAM_AUTHTOK and return
          */
 
-	if (options.use_authtok == 1) {
+	if (options.use_authtok == 1 || options.try_first_pass == 1) {
 	    const void *item = NULL;
 
 	    retval = pam_get_item(pamh, PAM_AUTHTOK, &item);
@@ -570,11 +575,13 @@
 	    } else if (item != NULL) {      /* we have a password! */
 		token1 = x_strdup(item);
 		item = NULL;
+		options.use_authtok = 1;    /* don't ask for the password again */
 	    } else {
 		retval = PAM_AUTHTOK_RECOVERY_ERR;         /* didn't work */
 	    }
-
-	} else {
+	}
+	
+	if (options.use_authtok != 1) {
             /* Prepare to ask the user for the first time */
             resp = NULL;
 	    retval = pam_prompt (pamh, PAM_PROMPT_ECHO_OFF, &resp,


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- pam.spec	11 Feb 2006 04:55:08 -0000	1.104
+++ pam.spec	24 Feb 2006 10:46:47 -0000	1.105
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.99.3.0
-Release: 1.2
+Release: 2
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -31,6 +31,7 @@
 Patch70: pam-0.99.2.1-selinux-nofail.patch
 Patch72: pam-0.99.3.0-pie.patch
 Patch80: pam-0.99.2.1-selinux-drop-multiple.patch
+Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: cracklib, cracklib-dicts >= 2.8
@@ -86,6 +87,7 @@
 %patch70 -p1 -b .nofail
 %patch72 -p1 -b .pie
 %patch80 -p1 -b .drop-multiple
+%patch81 -p1 -b .try-first-pass
 
 for readme in modules/pam_*/README ; do
 	cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
@@ -351,6 +353,11 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Feb 24 2006 Tomas Mraz <tmraz at redhat.com> 0.99.3.0-2
+- added try_first_pass option to pam_cracklib
+- use try_first_pass for pam_unix and pam_cracklib in
+  system-auth (#182350)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99.3.0-1.2
 - bump again for double-long bug on ppc(64)
 


Index: system-auth.pamd
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/system-auth.pamd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- system-auth.pamd	23 Nov 2004 15:32:59 -0000	1.3
+++ system-auth.pamd	24 Feb 2006 10:46:47 -0000	1.4
@@ -2,13 +2,13 @@
 # This file is auto-generated.
 # User changes will be destroyed the next time authconfig is run.
 auth        required      pam_env.so
-auth        sufficient    pam_unix.so likeauth nullok
+auth        sufficient    pam_unix.so try_first_pass nullok
 auth        required      pam_deny.so
 
 account     required      pam_unix.so
 
-password    required      pam_cracklib.so retry=3
-password    sufficient    pam_unix.so nullok use_authtok md5 shadow
+password    required      pam_cracklib.so try_first_pass retry=3
+password    sufficient    pam_unix.so try_first_pass use_authtok nullok md5 shadow
 password    required      pam_deny.so
 
 session     required      pam_limits.so



From fedora-cvs-commits at redhat.com  Fri Feb 24 11:11:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 06:11:06 -0500
Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.6,1.7
Message-ID: <200602241111.k1OBB6sf021711@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21682

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
- Actually apply the xkbdata-1.0.1-cz-fix-bug177362.patch patch this time.



Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-xkbdata.spec	22 Feb 2006 01:29:41 -0000	1.6
+++ xorg-x11-xkbdata.spec	24 Feb 2006 11:11:03 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: xkb data files for the X.Org X11 X server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -12,6 +12,7 @@
 Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
 Patch0: xkbdata-1.0.1-sysreq-fix-bug175661.patch
 Patch1: xkbdata-1.0.1-greek-fix-bug181313.patch
+Patch2: xkbdata-1.0.1-cz-fix-bug177362.patch
 
 BuildArch: noarch
 
@@ -28,6 +29,7 @@
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p0 -b .sysreq-fix-bug175661
 %patch1 -p0 -b .greek-fix-bug181313
+%patch2 -p0 -b .cz-fix-bug177362
 
 %build
 %configure
@@ -261,71 +263,7 @@
 %{_datadir}/X11/xkb/symbols/ogham
 %{_datadir}/X11/xkb/symbols/ori
 %dir %{_datadir}/X11/xkb/symbols/pc
-%{_datadir}/X11/xkb/symbols/pc/al
-%{_datadir}/X11/xkb/symbols/pc/am
-%{_datadir}/X11/xkb/symbols/pc/ara
-%{_datadir}/X11/xkb/symbols/pc/az
-%{_datadir}/X11/xkb/symbols/pc/ba
-%{_datadir}/X11/xkb/symbols/pc/bd
-%{_datadir}/X11/xkb/symbols/pc/be
-%{_datadir}/X11/xkb/symbols/pc/bg
-%{_datadir}/X11/xkb/symbols/pc/br
-%{_datadir}/X11/xkb/symbols/pc/bt
-%{_datadir}/X11/xkb/symbols/pc/by
-%{_datadir}/X11/xkb/symbols/pc/ca
-%{_datadir}/X11/xkb/symbols/pc/ch
-%{_datadir}/X11/xkb/symbols/pc/cz
-%{_datadir}/X11/xkb/symbols/pc/de
-%{_datadir}/X11/xkb/symbols/pc/dk
-%{_datadir}/X11/xkb/symbols/pc/ee
-%{_datadir}/X11/xkb/symbols/pc/es
-%{_datadir}/X11/xkb/symbols/pc/fi
-%{_datadir}/X11/xkb/symbols/pc/fo
-%{_datadir}/X11/xkb/symbols/pc/fr
-%{_datadir}/X11/xkb/symbols/pc/gb
-%{_datadir}/X11/xkb/symbols/pc/ge
-%{_datadir}/X11/xkb/symbols/pc/gr
-%{_datadir}/X11/xkb/symbols/pc/hr
-%{_datadir}/X11/xkb/symbols/pc/hu
-%{_datadir}/X11/xkb/symbols/pc/ie
-%{_datadir}/X11/xkb/symbols/pc/il
-%{_datadir}/X11/xkb/symbols/pc/in
-%{_datadir}/X11/xkb/symbols/pc/ir
-%{_datadir}/X11/xkb/symbols/pc/is
-%{_datadir}/X11/xkb/symbols/pc/it
-%{_datadir}/X11/xkb/symbols/pc/jp
-%{_datadir}/X11/xkb/symbols/pc/kg
-%{_datadir}/X11/xkb/symbols/pc/la
-%{_datadir}/X11/xkb/symbols/pc/latam
-%{_datadir}/X11/xkb/symbols/pc/latin
-%{_datadir}/X11/xkb/symbols/pc/lk
-%{_datadir}/X11/xkb/symbols/pc/lt
-%{_datadir}/X11/xkb/symbols/pc/lv
-%{_datadir}/X11/xkb/symbols/pc/mao
-%{_datadir}/X11/xkb/symbols/pc/mkd
-%{_datadir}/X11/xkb/symbols/pc/mm
-%{_datadir}/X11/xkb/symbols/pc/mn
-%{_datadir}/X11/xkb/symbols/pc/mt
-%{_datadir}/X11/xkb/symbols/pc/nl
-%{_datadir}/X11/xkb/symbols/pc/no
-%{_datadir}/X11/xkb/symbols/pc/pc
-%{_datadir}/X11/xkb/symbols/pc/pk
-%{_datadir}/X11/xkb/symbols/pc/pl
-%{_datadir}/X11/xkb/symbols/pc/pt
-%{_datadir}/X11/xkb/symbols/pc/ro
-%{_datadir}/X11/xkb/symbols/pc/ru
-%{_datadir}/X11/xkb/symbols/pc/se
-%{_datadir}/X11/xkb/symbols/pc/si
-%{_datadir}/X11/xkb/symbols/pc/sk
-%{_datadir}/X11/xkb/symbols/pc/srp
-%{_datadir}/X11/xkb/symbols/pc/sy
-%{_datadir}/X11/xkb/symbols/pc/th
-%{_datadir}/X11/xkb/symbols/pc/tj
-%{_datadir}/X11/xkb/symbols/pc/tr
-%{_datadir}/X11/xkb/symbols/pc/ua
-%{_datadir}/X11/xkb/symbols/pc/us
-%{_datadir}/X11/xkb/symbols/pc/uz
-%{_datadir}/X11/xkb/symbols/pc/vn
+%{_datadir}/X11/xkb/symbols/pc/*
 %{_datadir}/X11/xkb/symbols/pc104
 %{_datadir}/X11/xkb/symbols/pl
 %{_datadir}/X11/xkb/symbols/pl2
@@ -404,6 +342,9 @@
 %{_datadir}/X11/xkb/types/pc
 
 %changelog
+* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4
+- Actually apply the xkbdata-1.0.1-cz-fix-bug177362.patch patch this time.
+
 * Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
 - Added xkbdata-1.0.1-greek-fix-bug181313.patch to fix (#181313,181313)
 - Added xkbdata-1.0.1-cz-fix-bug177362.patch to fix (#177362,178892)



From fedora-cvs-commits at redhat.com  Fri Feb 24 12:14:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 07:14:22 -0500
Subject: rpms/xorg-x11-apps/devel luit-1.0.1-locale.alias-datadir.patch, NONE,
	1.1 xorg-x11-apps.spec, 1.9, 1.10
Message-ID: <200602241214.k1OCEMwc030577@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30544

Modified Files:
	xorg-x11-apps.spec 
Added Files:
	luit-1.0.1-locale.alias-datadir.patch 
Log Message:
* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added luit-1.0.1-locale.alias-datadir.patch to fix bug (#181785)


luit-1.0.1-locale.alias-datadir.patch:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE luit-1.0.1-locale.alias-datadir.patch ---
--- luit-1.0.1/configure.ac.old	2006-02-16 17:00:46.706577376 +0100
+++ luit-1.0.1/configure.ac	2006-02-16 17:02:05.442878408 +0100
@@ -36,9 +36,9 @@
 
 AC_ARG_WITH(localealiasfile,
         AC_HELP_STRING([--with-localealiasfile=<path>],
-                       [The locale alias file (default: ${libdir}/X11/locale/locale.alias)]),
+                       [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]),
         [LOCALEALIASFILE="$withval"],
-        [LOCALEALIASFILE=${libdir}/X11/locale/locale.alias])
+        [LOCALEALIASFILE=${datadir}/X11/locale/locale.alias])
 AC_SUBST([LOCALEALIASFILE])
 
 # Checks for pkg-config packages


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-apps.spec	11 Feb 2006 06:13:39 -0000	1.9
+++ xorg-x11-apps.spec	24 Feb 2006 12:14:19 -0000	1.10
@@ -3,7 +3,7 @@
 Summary: X.Org X11 applications
 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
@@ -31,11 +31,8 @@
 Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2
 
 Patch0: x11perf-1.0.1-x11perf-datadir-cleanups.patch
+Patch1: luit-1.0.1-locale.alias-datadir.patch
 
-# FIXME: Most of the BuildRequires are not figured out yet, so are missing.
-# This will get fixed once someone builds it with mock in a minimal build
-# environment, but it works in beehive for the time being, so we'll move on
-# to bigger problems to solve rather than wasting time right now.
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 # xbiff needs xbitmaps-devel
@@ -56,6 +53,7 @@
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
 %patch0 -p0 -b .x11perf-datadir-cleanups
+%patch1 -p0 -b .locale.alias-datadir
 
 %build
 # Build all apps
@@ -68,6 +66,9 @@
          x11perf*)
             aclocal ; automake ; autoconf
          ;;
+         luit*)
+            autoconf
+         ;;
       esac
 
       %configure --disable-xprint
@@ -173,10 +174,13 @@
 %{_mandir}/man1/xwud.1x*
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-1.2
+* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
+- Added luit-1.0.1-locale.alias-datadir.patch to fix bug (#181785)
+
+* 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
@@ -206,7 +210,7 @@
   - xmessage-0.99.1-xmessage-datadir-cleanups.patch
 - Added luit-0.99.1-luit-locale-dir-fix.patch to fix bug (#173702)
 
-* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> - 0.99.2-3
+* Mon Nov 14 2005 Jeremy Katz <katzj at redhat.com> 0.99.2-3
 - add Requires(pre) on newer filesystem package (#172610)
 
 * Sun Nov 13 2005 Mike A. Harris <mharris at redhat.com> 0.99.2-2



From fedora-cvs-commits at redhat.com  Fri Feb 24 12:53:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 07:53:40 -0500
Subject: rpms/pm-utils/devel .cvsignore, 1.13, 1.14 pm-utils.spec, 1.24,
	1.25 sources, 1.16, 1.17
Message-ID: <200602241253.k1OCremk005909@cvs.devel.redhat.com>

Author: pknirsch

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5842

Modified Files:
	.cvsignore pm-utils.spec sources 
Log Message:
- Added missing pciutils-devel BuildRequires (#182566) 
- Fixed missing vbestata save/restore calls for video suspend/resume (#182167, 
  #169494)
- Renamed hook scripts to allow local pre and post inserts (#179421)
- Added support for blinking led lights on Thinkpad Laptops during suspend
  (#179420)
- Added pm-powersave script for powersaving via HAL (#169054)
- Added symlinks for pm-shutdown and pm-restart (#165953)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	25 Jan 2006 01:05:15 -0000	1.13
+++ .cvsignore	24 Feb 2006 12:53:38 -0000	1.14
@@ -2,3 +2,4 @@
 radeontool-1.5.tar.gz
 pm-utils-0.08.tar.gz
 pm-utils-0.09.tar.gz
+pm-utils-0.10.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- pm-utils.spec	11 Feb 2006 05:11:07 -0000	1.24
+++ pm-utils.spec	24 Feb 2006 12:53:38 -0000	1.25
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.09
-Release: 1.2
+Version: 0.10
+Release: 1
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -16,7 +16,7 @@
 Provides: radeontool
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: hal-devel pkgconfig
+BuildRequires: hal-devel pkgconfig pciutils-devel
 BuildRequires: dbus-devel >= 0.60
 
 Patch10: vbetool-0.3-fix-gcc4bug.patch
@@ -81,6 +81,16 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 24 2006 Phil Knirsch <pknirsch at redhat.com> - 0.10-1
+- Added missing pciutils-devel BuildRequires (#182566) 
+- Fixed missing vbestata save/restore calls for video suspend/resume (#182167, 
+  #169494)
+- Renamed hook scripts to allow local pre and post inserts (#179421)
+- Added support for blinking led lights on Thinkpad Laptops during suspend
+  (#179420)
+- Added pm-powersave script for powersaving via HAL (#169054)
+- Added symlinks for pm-shutdown and pm-restart (#165953)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.09-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	25 Jan 2006 01:05:15 -0000	1.16
+++ sources	24 Feb 2006 12:53:38 -0000	1.17
@@ -1,3 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
-5f071311056e38db20acedf1cfe55fed  pm-utils-0.09.tar.gz
+d3e8aff92ebf53abcb13216f4440a1b0  pm-utils-0.10.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 13:32:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 08:32:55 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch,1.23,1.24
Message-ID: <200602241332.k1ODWtqw024006@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23990

Modified Files:
	policy-20060207.patch 
Log Message:


policy-20060207.patch:
 Makefile                              |   12 ++++++------
 policy/modules/admin/logwatch.te      |    2 ++
 policy/modules/admin/su.fc            |    1 +
 policy/modules/admin/su.if            |    6 +++---
 policy/modules/admin/vpn.te           |    6 ++++++
 policy/modules/apps/java.if           |    8 ++------
 policy/modules/kernel/corecommands.fc |    1 +
 policy/modules/kernel/devices.fc      |    1 +
 policy/modules/kernel/files.fc        |    2 +-
 policy/modules/kernel/files.if        |    5 +++--
 policy/modules/services/apache.fc     |    2 +-
 policy/modules/services/apache.if     |   21 +++++++++++++++++++++
 policy/modules/services/automount.te  |    7 +++++--
 policy/modules/services/cron.te       |    3 +++
 policy/modules/services/hal.te        |    2 +-
 policy/modules/services/xserver.te    |    2 +-
 policy/modules/system/fstools.te      |    2 +-
 policy/modules/system/locallogin.te   |    1 +
 policy/modules/system/mount.te        |    2 +-
 policy/modules/system/selinuxutil.fc  |    6 +++---
 policy/modules/system/selinuxutil.te  |    5 +----
 policy/modules/system/unconfined.te   |    2 +-
 support/Makefile.devel                |    5 +----
 23 files changed, 67 insertions(+), 37 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- policy-20060207.patch	23 Feb 2006 22:28:34 -0000	1.23
+++ policy-20060207.patch	24 Feb 2006 13:32:45 -0000	1.24
@@ -123,6 +123,18 @@
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.21/policy/modules/kernel/files.fc
+--- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-14 07:20:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/files.fc	2006-02-24 08:30:53.000000000 -0500
+@@ -89,7 +89,7 @@
+ # HOME_ROOT
+ # expanded by genhomedircon
+ #
+-HOME_ROOT		-d	gen_context(system_u:object_r:home_root_t,s15:c0.c255)
++HOME_ROOT		-d	gen_context(system_u:object_r:home_root_t,s0-s15:c0.c255)
+ HOME_ROOT/\.journal		<<none>>
+ HOME_ROOT/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
+ HOME_ROOT/lost\+found/.*		<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.21/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-23 17:28:19.000000000 -0500



From fedora-cvs-commits at redhat.com  Fri Feb 24 14:07:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 09:07:45 -0500
Subject: rpms/openssh/devel openssh-3.9p1-log-in-chroot.patch, NONE,
	1.1 openssh-4.3p1-audit.patch, 1.1, 1.2 openssh.spec, 1.88, 1.89
Message-ID: <200602241407.k1OE7jZx015385@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/openssh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15332

Modified Files:
	openssh-4.3p1-audit.patch openssh.spec 
Added Files:
	openssh-3.9p1-log-in-chroot.patch 
Log Message:
* Fri Feb 24 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-3
- enable the subprocess in chroot to send messages to system log
- sshd should prevent login if audit call fails


openssh-3.9p1-log-in-chroot.patch:
 log.c  |   12 ++++++++++++
 log.h  |    2 ++
 sshd.c |    4 ++++
 3 files changed, 18 insertions(+)

--- NEW FILE openssh-3.9p1-log-in-chroot.patch ---
--- openssh-3.9p1/log.h.log-chroot	2006-02-22 10:54:04.000000000 +0100
+++ openssh-3.9p1/log.h	2006-02-22 10:53:29.000000000 +0100
@@ -63,4 +63,6 @@
 
 void	 do_log(LogLevel, const char *, va_list);
 void	 cleanup_exit(int) __dead;
+
+void     open_log(void);
 #endif
--- openssh-3.9p1/log.c.log-chroot	2006-02-22 13:29:48.000000000 +0100
+++ openssh-3.9p1/log.c	2006-02-22 10:56:01.000000000 +0100
@@ -48,6 +48,7 @@
 static int log_on_stderr = 1;
 static int log_facility = LOG_AUTH;
 static char *argv0;
+static int log_fd_keep;
 
 extern char *__progname;
 
@@ -330,9 +331,20 @@
 		syslog_r(pri, &sdata, "%.500s", fmtbuf);
 		closelog_r(&sdata);
 #else
+	    if (!log_fd_keep) {
 		openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
+	    }
 		syslog(pri, "%.500s", fmtbuf);
+	    if (!log_fd_keep) {
 		closelog();
+	    }
 #endif
 	}
 }
+
+void
+open_log(void)
+{
+	openlog(argv0 ? argv0 : __progname, LOG_PID|LOG_NDELAY, log_facility);
+	log_fd_keep = 1;
+}
--- openssh-3.9p1/sshd.c.log-chroot	2006-01-11 13:42:32.000000000 +0100
+++ openssh-3.9p1/sshd.c	2006-02-22 18:58:24.000000000 +0100
@@ -565,6 +565,10 @@
 	memset(pw->pw_passwd, 0, strlen(pw->pw_passwd));
 	endpwent();
 
+	/* Open the syslog permanently so the chrooted process still
+	   can write to syslog. */
+	open_log();
+	
 	/* Change our root directory */
 	if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1)
 		fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR,

openssh-4.3p1-audit.patch:
 Makefile.in  |    3 ++-
 auth.c       |   10 ++++++++++
 config.h.in  |    3 +++
 configure.ac |   15 +++++++++++++++
 loginrec.c   |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 loginrec.h   |    4 ++++
 6 files changed, 90 insertions(+), 1 deletion(-)

Index: openssh-4.3p1-audit.patch
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.3p1-audit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssh-4.3p1-audit.patch	1 Feb 2006 16:19:54 -0000	1.1
+++ openssh-4.3p1-audit.patch	24 Feb 2006 14:07:41 -0000	1.2
@@ -27,7 +27,7 @@
  	login_set_current_time(li);
 +#ifdef HAVE_LINUX_AUDIT
 +	if (linux_audit_write_entry(li) == 0)
-+		return 0;
++		fatal("linux_audit_write_entry failed: %s", strerror(errno));
 +#endif
  #ifdef USE_LOGIN
  	syslogin_write_entry(li);


Index: openssh.spec
===================================================================
RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- openssh.spec	21 Feb 2006 16:00:42 -0000	1.88
+++ openssh.spec	24 Feb 2006 14:07:41 -0000	1.89
@@ -58,7 +58,7 @@
 Summary: The OpenSSH implementation of SSH protocol versions 1 and 2.
 Name: openssh
 Version: 4.3p2
-%define rel 2
+%define rel 3
 %if %{rescue}
 %define %{rel}rescue
 %else
@@ -84,7 +84,8 @@
 Patch23: openssh-3.9p1-no-log-signal.patch
 Patch24: openssh-4.3p1-fromto-remote.patch
 Patch25: openssh-4.3p2-scp-print-err.patch
-Patch27: openssh-4.2p1-pam-no-stack.patch
+Patch26: openssh-4.2p1-pam-no-stack.patch
+Patch27: openssh-3.9p1-log-in-chroot.patch
 Patch30: openssh-4.0p1-exit-deadlock.patch
 Patch31: openssh-3.9p1-skip-used.patch
 Patch35: openssh-4.2p1-askpass-progress.patch
@@ -207,7 +208,8 @@
 %patch23 -p1 -b .signal
 %patch24 -p1 -b .fromto-remote
 %patch25 -p1 -b .print-err
-%patch27 -p1 -b .stack
+%patch26 -p1 -b .stack
+%patch27 -p1 -b .log-chroot
 %patch30 -p1 -b .exit-deadlock
 %patch31 -p1 -b .skip-used
 %patch35 -p1 -b .progress
@@ -452,6 +454,10 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-3
+- enable the subprocess in chroot to send messages to system log
+- sshd should prevent login if audit call fails
+
 * Tue Feb 21 2006 Tomas Mraz <tmraz at redhat.com> - 4.3p2-2
 - print error from scp if not remote (patch by Bjorn Augustsson #178923)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 14:55:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 09:55:38 -0500
Subject: rpms/udev/devel udev-rules.patch,1.3,1.4 udev.spec,1.151,1.152
Message-ID: <200602241455.k1OEtc8D025348@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25301

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- removed WAIT_FOR_SYSFS rule

udev-rules.patch:
 05-udev-early.rules  |    9 +++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 +++--
 udev.rules           |  130 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 92 insertions(+), 61 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- udev-rules.patch	22 Feb 2006 08:19:05 -0000	1.3
+++ udev-rules.patch	24 Feb 2006 14:55:34 -0000	1.4
@@ -1,5 +1,5 @@
 --- udev-084/etc/udev/redhat/hotplug.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-22 09:13:38.000000000 +0100
++++ udev-084/etc/udev/redhat/hotplug.rules	2006-02-24 08:17:39.000000000 +0100
 @@ -1,8 +1,15 @@
  # do not call hotplug.d and dev.d for "drivers" and "module" events
 -SUBSYSTEM=="drivers",	OPTIONS="last_rule"
@@ -20,14 +20,14 @@
 +
 +LABEL="hotplug_end"
 --- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-22 09:13:38.000000000 +0100
++++ udev-084/etc/udev/redhat/95-pam-console.rules	2006-02-24 08:17:39.000000000 +0100
 @@ -0,0 +1 @@
 +ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
 --- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-22 09:13:38.000000000 +0100
++++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-24 15:09:54.000000000 +0100
 @@ -0,0 +1,9 @@
 +# sysfs is populated after the event is sent
-+ACTION=="add", DEVPATH=="/devices/*", DEVPATH!="*usb*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
++
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 +
 +# ignore these events until someone needs them
@@ -36,7 +36,7 @@
 +
 +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule"
 --- udev-084/etc/udev/redhat/udev.rules.rhrules	2006-01-30 08:51:38.000000000 +0100
-+++ udev-084/etc/udev/redhat/udev.rules	2006-02-22 09:15:39.000000000 +0100
++++ udev-084/etc/udev/redhat/udev.rules	2006-02-24 15:35:26.000000000 +0100
 @@ -3,6 +3,7 @@
  #
  # default is OWNER="root" GROUP="root", MODE="0600"
@@ -158,16 +158,17 @@
  
  KERNEL=="umad*", 		NAME="infiniband/%k"
  KERNEL=="issm*", 		NAME="infiniband/%k"
-@@ -221,28 +233,30 @@
+@@ -221,27 +233,30 @@
  KERNEL=="zappseudo",  		NAME="zap/pseudo"
  KERNEL=="zap[0-9]*",  		NAME="zap/%n"
  
+-BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
 +KERNEL="pktcdvd", NAME="%k/control"
 +
- BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
- 
-+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="8", SYMLINK+="changer%e", MODE="0660"
++BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK+="scanner%e", MODE="0660"
 +
++BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="8", SYMLINK+="changer%e", MODE="0660"
+ 
  # do not seperate the next 2 lines!!
 -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
 +KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k"
@@ -194,11 +195,10 @@
  KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
  
 -KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
--
+ 
  #######################################
  # Persistent block device stuff - begin
- #######################################
-@@ -297,37 +311,36 @@
+@@ -297,37 +312,36 @@
  # Persistent block device stuff - end
  #####################################
  


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- udev.spec	22 Feb 2006 08:19:05 -0000	1.151
+++ udev.spec	24 Feb 2006 14:55:34 -0000	1.152
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -276,6 +276,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Fri Feb 24 2006 Harald Hoyer <harald at redhat.com> - 084-5
+- removed WAIT_FOR_SYSFS rule
+
 * Wed Feb 22 2006 Harald Hoyer <harald at redhat.com> - 084-4
 - fixed group issue with vol_id (bz #181432)
 - fixed dvb permissions (bz #179993)



From fedora-cvs-commits at redhat.com  Fri Feb 24 15:09:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 10:09:43 -0500
Subject: rpms/iputils/devel iputils.spec,1.35,1.36
Message-ID: <200602241509.k1OF9h45028412@cvs.devel.redhat.com>

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28374

Modified Files:
	iputils.spec 
Log Message:
- add PreReq: chkconfig (#182799,#182798)


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- iputils.spec	11 Feb 2006 03:38:37 -0000	1.35
+++ iputils.spec	24 Feb 2006 15:09:40 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 34.2
+Release: 35
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -33,6 +33,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
 BuildPreReq: glibc-kernheaders >= 2.4-8.19
+PreReq: chkconfig
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -164,6 +165,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Feb 24 2006 Radek Vok??l <rvokal at redhat.com> - 20020927-35
+- add PreReq: chkconfig (#182799,#182798)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 20020927-34.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 15:10:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 10:10:06 -0500
Subject: rpms/openobex-apps/devel openobex-apps.spec,1.12,1.13
Message-ID: <200602241510.k1OFA6JL028583@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/openobex-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28555

Modified Files:
	openobex-apps.spec 
Log Message:
rebuild


Index: openobex-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/openobex-apps/devel/openobex-apps.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openobex-apps.spec	16 Feb 2006 14:15:52 -0000	1.12
+++ openobex-apps.spec	24 Feb 2006 15:10:04 -0000	1.13
@@ -19,6 +19,9 @@
 Open OBEX Applications
 
 %changelog
+* Fri Feb 24 2006 Harald Hoyer <harald at redhat.com> - 1.0.0-10
+- rebuilt for openobex-1.1
+
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> - 1.0.0-9
 - rebuilt for openobex-1.1
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 15:11:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 10:11:42 -0500
Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.10,1.11
Message-ID: <200602241511.k1OFBg6x029322@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-fonts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29239

Modified Files:
	xorg-x11-fonts.spec 
Log Message:
* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 7.0-2
- Generate encodings.dir files in the encodings dirs with mkfontscale from the
  base fonts package post install script, to work around bug (#173875)



Index: xorg-x11-fonts.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-fonts.spec	27 Jan 2006 04:17:29 -0000	1.10
+++ xorg-x11-fonts.spec	24 Feb 2006 15:11:40 -0000	1.11
@@ -30,7 +30,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.0
-Release:	1
+Release:	2
 License:	Various licenses
 Group:		User Interface/X
 URL:		http://www.x.org
@@ -103,8 +103,8 @@
 %package base
 Summary: Base fonts required by the X Window System.
 Group: User Interface/X
-Requires(post): mkfontdir, fontconfig, chkfontpath
-Requires(postun): mkfontdir, fontconfig
+Requires(post): mkfontdir, mkfontscale, fontconfig, chkfontpath
+Requires(postun): mkfontdir, mkfontscale, fontconfig, chkfontpath
 # Required so upgrades work, since base fonts moved here from main pkg
 Conflicts: XFree86 <= 4.2.0-3.1
 # The fonts.* files from truetype and syriac moved from those pkgs to base
@@ -406,25 +406,29 @@
 %build
 for dir in $(find . -maxdepth 1 -type d -name '[a-z]*-[0-9]*' | sort | sed -e 's#\./##g') ; do
     pushd $dir
-    # FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of
-    # making a patch that patches 35 or so configure.ac files and maintaining
-    # it for an indefinite amount of time.  Hopefully my solution here will
-    # get considered to be included in upstream 7.1 release in which case I'll
-    # turn it into a series of diffs instead and submit it.  For now tho, perl
-    # is my friend.  -- mharris
-    perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
-    autoconf
-#3,4,6,10,11,12,13,16
-    %configure \
-        --disable-iso8859-3 \
-        --disable-iso8859-4 \
-        --disable-iso8859-6 \
-        --disable-iso8859-10 \
-        --disable-iso8859-11 \
-        --disable-iso8859-12 \
-        --disable-iso8859-13 \
-        --disable-iso8859-16
-# --prefix=$RPM_BUILD_ROOT/usr --libdir=$RPM_BUILD_ROOT%{_x11fontdirprefix} --datadir=$RPM_BUILD_ROOT%{_datadir}
+    case $dir in
+        encodings-*)
+            perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
+            autoconf
+            %configure
+        ;;
+
+        *)
+            # FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of
+            # making a patch that patches 35 or so configure.ac files and maintaining
+            # it for an indefinite amount of time.  Hopefully my solution here will
+            # get considered to be included in upstream 7.1 release in which case I'll
+            # turn it into a series of diffs instead and submit it.  For now tho, perl
+            # is my friend.  -- mharris
+            perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
+            autoconf
+            %configure \
+                --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-6 \
+                --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 \
+                --disable-iso8859-13 --disable-iso8859-16
+        ;;
+    esac
+
     make
     popd
 done
@@ -439,7 +443,6 @@
     # specification of the 'fontdir' variable, instead of it being
     # relative to libdir.
     make install DESTDIR=$RPM_BUILD_ROOT
-# libdir=%{_x11fontdirprefix}
     popd
 done
 
@@ -459,7 +462,6 @@
         chmod 0644 $FONTDIR/$subdir/{encodings,fonts}.dir
 
         # Create bogus fonts.cache-* files
-#        touch $FONTDIR/$subdir/fonts.cache
         # Create somewhat future-proofed ghosted fonts.cache-* files so that
         # the font packages own these files.
         for fcver in $(seq 1 9) ; do
@@ -471,24 +473,6 @@
 
 # Remove unwanted fonts
 {
-    # Remove unwanted 100dpi,75dpi ISO8859-{3,4,10,13} fonts
-%if 0
-    {
-        for dir in $RPM_BUILD_ROOT%{_x11fontdir}/{100dpi,75dpi} ; do
-            find $dir -iregex ".*-ISO8859-\(3\|4\|10\|13\)\.pcf.*" | xargs rm --
-        done
-    } 
-    # font-misc-misc (Remove unwanted ISO8859-{3,4,6,10,11,12,13,16} fonts
-    # NOTE: Although we don't ship ISO8859-{5,7,8} encodings of most fonts in
-    # monolithic X, we do ship misc-fixed in ISO8859-{5,7,8}, so we'll keep
-    # them in modular too.
-    {
-        for dir in $RPM_BUILD_ROOT%{_x11fontdir}/misc ; do
-            find $dir -iregex ".*-ISO8859-\(3\|4\|6\|10\|11\|12\|13\|16\)\.pcf.*" | xargs rm --
-        done
-    } 
-%endif
-# || : &> /dev/null
     # font-misc-meltho (syriac fonts)
     {
         # Remove fonts which contain bad codepoints, as documented in bug #97591
@@ -511,6 +495,20 @@
 
 %post base
 {
+  ENCODINGSDIR=%{_datadir}/X11/fonts/encodings
+  # Generate the encodings.dir files in the encodings directories during
+  # install time to work around bugs in upstream Makefiles.  This is more
+  # consistent with how we generate fonts.dir files anyway.  Fixes bugs:
+  # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875
+  # https://bugs.freedesktop.org/show_bug.cgi?id=6028
+  {
+    for each in "${ENCODINGSDIR}" "${ENCODINGSDIR}/large" ; do
+        pushd $each &> /dev/null
+        mkfontscale -n -e "${each}"
+        popd &> /dev/null
+    done 
+  }
+
   FONTDIR=%{_x11fontdir}/misc
   mkfontdir $FONTDIR 
 
@@ -541,7 +539,8 @@
 #  /usr/sbin/chkfontpath -qr %{_x11fontdir}/misc
 
   fc-cache $FONTDIR
-} || :
+}
+# || :
 # &> /dev/null || :
 
 %postun base
@@ -937,10 +936,10 @@
 # encodings
 %dir %{_datadir}/X11/fonts/encodings
 %dir %{_datadir}/X11/fonts/encodings/large
-%{_datadir}/X11/fonts/encodings/*.enc*
-%{_datadir}/X11/fonts/encodings/encodings.dir
-%{_datadir}/X11/fonts/encodings/large/*.enc*
-%{_datadir}/X11/fonts/encodings/large/encodings.dir
+%{_datadir}/X11/fonts/encodings/*.enc.gz
+%ghost %verify(not md5 size mtime) %{_datadir}/X11/fonts/encodings/encodings.dir
+%{_datadir}/X11/fonts/encodings/large/*.enc.gz
+%ghost %verify(not md5 size mtime) %{_datadir}/X11/fonts/encodings/large/encodings.dir
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/encodings.dir
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/misc/fonts.dir
 # NOTE: Xorg supplies this fonts.alias, so it is not ghosted
@@ -1524,6 +1523,10 @@
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 7.0-2
+- Generate encodings.dir files in the encodings dirs with mkfontscale from the
+  base fonts package post install script, to work around bug (#173875)
+
 * Thu Jan 26 2006 Mike A. Harris <mharris at redhat.com> 7.0-1
 - Bumped artificial package version to 7.0, to indicate that the font tarballs
   are all from X11R7.0.



From fedora-cvs-commits at redhat.com  Fri Feb 24 15:50:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 10:50:42 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.24,
	1.25 selinux-policy.spec, 1.125, 1.126
Message-ID: <200602241550.k1OFogYm025234@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25223

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                |   12 ++++++------
 policy/modules/admin/logwatch.te        |    2 ++
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/admin/vpn.te             |    6 ++++++
 policy/modules/apps/java.if             |    8 ++------
 policy/modules/kernel/corecommands.fc   |    1 +
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.fc        |    1 +
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    4 +++-
 policy/modules/services/apache.if       |   21 +++++++++++++++++++++
 policy/modules/services/automount.te    |    7 +++++--
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/hal.te          |    2 +-
 policy/modules/services/ktalk.te        |    3 +++
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/fstools.te        |    2 +-
 policy/modules/system/init.te           |    1 +
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/mount.te          |    2 +-
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    6 ++----
 policy/modules/system/udev.te           |    2 +-
 policy/modules/system/unconfined.te     |    2 +-
 support/Makefile.devel                  |    5 +----
 29 files changed, 93 insertions(+), 40 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- policy-20060207.patch	24 Feb 2006 13:32:45 -0000	1.24
+++ policy-20060207.patch	24 Feb 2006 15:50:38 -0000	1.25
@@ -112,6 +112,18 @@
  /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
  /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
  /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.21/policy/modules/kernel/corenetwork.te.in
+--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-02-20 14:07:36.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/corenetwork.te.in	2006-02-24 10:44:48.000000000 -0500
+@@ -66,7 +66,7 @@
+ network_port(giftd, tcp,1213,s0)
+ network_port(gopher, tcp,70,s0, udp,70,s0)
+ network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy
+-network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0)
++network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp, 9050, s0) # 9050 is for Tor
+ network_port(howl, tcp,5335,s0, udp,5353,s0)
+ network_port(hplip, tcp,50000,s0, tcp,50002,s0)
+ network_port(i18n_input, tcp,9010,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.21/policy/modules/kernel/devices.fc
 --- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-14 07:20:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/kernel/devices.fc	2006-02-23 10:01:17.000000000 -0500
@@ -123,6 +135,18 @@
  /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
  /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.21/policy/modules/kernel/devices.if
+--- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-23 09:25:08.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/kernel/devices.if	2006-02-24 09:51:36.000000000 -0500
+@@ -2384,7 +2384,7 @@
+ 	')
+ 
+ 	allow $1 device_t:dir r_dir_perms;
+-	allow $1 usb_device_t:chr_file { read write };
++	allow $1 usb_device_t:chr_file rw_file_perms;
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.21/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-14 07:20:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/kernel/files.fc	2006-02-24 08:30:53.000000000 -0500
@@ -137,8 +161,30 @@
  HOME_ROOT/lost\+found/.*		<<none>>
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.21/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-23 17:28:19.000000000 -0500
-@@ -3356,12 +3356,13 @@
++++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-24 10:26:21.000000000 -0500
+@@ -1416,6 +1416,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.
+@@ -3356,12 +3371,13 @@
  
  	# Need to give permission to create directories where applicable
  	allow $1 self:process setfscreate;
@@ -156,7 +202,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.21/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-23 09:41:46.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-24 08:46:56.000000000 -0500
 @@ -45,7 +45,7 @@
  /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -166,6 +212,12 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
+@@ -75,3 +75,5 @@
+ /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
+ /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/w3c-markup-validator(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
++/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.21/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/services/apache.if	2006-02-23 09:41:46.000000000 -0500
@@ -264,6 +316,23 @@
  
  mls_file_read_up(hald_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.21/policy/modules/services/ktalk.te
+--- nsaserefpolicy/policy/modules/services/ktalk.te	2006-02-21 14:40:24.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/ktalk.te	2006-02-24 08:42:10.000000000 -0500
+@@ -68,6 +68,8 @@
+ 
+ files_read_etc_files(ktalkd_t)
+ 
++init_read_utmp(ktalkd_t)
++
+ libs_use_ld_so(ktalkd_t)
+ libs_use_shared_libs(ktalkd_t)
+ logging_send_syslog_msg(ktalkd_t)
+@@ -83,3 +85,4 @@
+ optional_policy(`nscd',`
+ 	nscd_socket_use(ktalkd_t)
+ ')
++
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.21/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/services/xserver.te	2006-02-23 14:10:50.000000000 -0500
@@ -288,6 +357,17 @@
  
  kernel_read_system_state(fsadm_t)
  kernel_read_kernel_sysctls(fsadm_t)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.21/policy/modules/system/init.te
+--- nsaserefpolicy/policy/modules/system/init.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/init.te	2006-02-24 10:26:58.000000000 -0500
+@@ -349,6 +349,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/locallogin.te serefpolicy-2.2.21/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/locallogin.te	2006-02-23 17:24:01.000000000 -0500
@@ -299,6 +379,17 @@
  
  type sulogin_t;
  type sulogin_exec_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.21/policy/modules/system/lvm.fc
+--- nsaserefpolicy/policy/modules/system/lvm.fc	2005-11-14 18:24:06.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/lvm.fc	2006-02-24 10:07:31.000000000 -0500
+@@ -25,6 +25,7 @@
+ # /sbin
+ #
+ /sbin/cryptsetup	--	gen_context(system_u:object_r:lvm_exec_t,s0)
++/sbin/dmraid		--	gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/dmsetup		--	gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/dmsetup\.static	--	gen_context(system_u:object_r:lvm_exec_t,s0)
+ /sbin/e2fsadm		--	gen_context(system_u:object_r:lvm_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.21/policy/modules/system/mount.te
 --- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/mount.te	2006-02-23 10:11:48.000000000 -0500
@@ -329,7 +420,7 @@
  #
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.21/policy/modules/system/selinuxutil.te
 --- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.te	2006-02-23 09:41:46.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.te	2006-02-24 10:28:37.000000000 -0500
 @@ -199,6 +199,7 @@
  libs_use_ld_so(load_policy_t)
  libs_use_shared_libs(load_policy_t)
@@ -338,7 +429,15 @@
  miscfiles_read_localization(load_policy_t)
  
  userdom_use_all_users_fds(load_policy_t)
-@@ -319,10 +320,6 @@
+@@ -261,6 +262,7 @@
+ selinux_compute_relabel_context(newrole_t)
+ selinux_compute_user_contexts(newrole_t)
+ 
++term_getattr_unallocated_ttys(newrole_t)
+ term_use_all_user_ttys(newrole_t)
+ term_use_all_user_ptys(newrole_t)
+ term_relabel_all_user_ttys(newrole_t)
+@@ -319,10 +321,6 @@
  	nscd_socket_use(newrole_t)
  ')
  
@@ -349,6 +448,18 @@
  ########################################
  #
  # Restorecon local policy
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.21/policy/modules/system/udev.te
+--- nsaserefpolicy/policy/modules/system/udev.te	2006-02-21 14:40:25.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/udev.te	2006-02-24 10:21:27.000000000 -0500
+@@ -39,7 +39,7 @@
+ # Local policy
+ #
+ 
+-allow udev_t self:capability { chown dac_override dac_read_search fowner fsetid sys_admin mknod net_raw net_admin sys_nice sys_rawio sys_resource sys_nice };
++allow udev_t self:capability { chown dac_override dac_read_search fowner fsetid sys_admin mknod net_raw net_admin sys_nice sys_rawio sys_resource setgid sys_nice };
+ dontaudit udev_t self:capability sys_tty_config;
+ allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
+ allow udev_t self:process { execmem setfscreate };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.21/policy/modules/system/unconfined.te
 --- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-20 14:07:38.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/system/unconfined.te	2006-02-23 15:44:10.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- selinux-policy.spec	23 Feb 2006 22:28:34 -0000	1.125
+++ selinux-policy.spec	24 Feb 2006 15:50:38 -0000	1.126
@@ -9,7 +9,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -292,6 +292,9 @@
 
 %changelog
 
+* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
+- Fix problem with privoxy talking to Tor
+
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-4
 - Turn on polyinstatiation
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 15:59:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 10:59:54 -0500
Subject: rpms/f-spot/devel .cvsignore, 1.5, 1.6 f-spot.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200602241559.k1OFxsK2003703@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3680

Modified Files:
	.cvsignore f-spot.spec sources 
Log Message:
* Fri Feb 24 2006 Christopher Aillon <caillon at redhat.com> 0.1.10-1
- Update to 0.1.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Feb 2006 19:12:56 -0000	1.5
+++ .cvsignore	24 Feb 2006 15:59:50 -0000	1.6
@@ -1,3 +1 @@
-f-spot-0.1.5.tar.bz2
-f-spot-0.1.8.tar.bz2
-f-spot-0.1.9.tar.bz2
+f-spot-0.1.10.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- f-spot.spec	21 Feb 2006 12:55:18 -0000	1.16
+++ f-spot.spec	24 Feb 2006 15:59:50 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           f-spot
-Version:        0.1.9
-Release:        2
+Version:        0.1.10
+Release:        1
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -69,6 +69,9 @@
 %{_prefix}/bin/f-spot
 
 %changelog
+* Fri Feb 24 2006 Christopher Aillon <caillon at redhat.com> 0.1.10-1
+- Update to 0.1.10
+
 * Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 0.1.9-2
 - add BuildRequires  libgnome-devel libgnomeui-devel
   gtk2-devel mono-devel libjpeg-devel sqlite-devel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Feb 2006 19:12:56 -0000	1.5
+++ sources	24 Feb 2006 15:59:50 -0000	1.6
@@ -1 +1 @@
-653928852d4198676e440e3183fd72df  f-spot-0.1.9.tar.bz2
+a49b74f2ac28011d12ce9e2fd5fe4831  f-spot-0.1.10.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:00:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:00:18 -0500
Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.48,1.49
Message-ID: <200602241600.k1OG0IKe003819@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3738

Modified Files:
	e2fsprogs.spec 
Log Message:
- revert selinux context change



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- e2fsprogs.spec	22 Feb 2006 18:21:20 -0000	1.48
+++ e2fsprogs.spec	24 Feb 2006 16:00:15 -0000	1.49
@@ -4,7 +4,7 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
 Version: 1.38
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source:  ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -27,7 +27,6 @@
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch33: e2fsprogs-1.38-lost+found.patch
 Patch34: e2fsprogs-1.38-blkid-devmapper.patch
-Patch35: e2fsprogs-1.38-blkid-selinux.patch
 Url: http://e2fsprogs.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@@ -120,8 +119,6 @@
 
 # look at device mapper devices
 %patch34 -p1 -b .dm
-# preserve selinux context on blkid.tab
-%patch35 -p1 -b .selinux
 
 %build
 aclocal
@@ -300,7 +297,10 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
-* Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 1.36-8
+* Fri Feb 24 2006 Peter Jones <pjones at redhat.com> - 1.38-9
+- _don't_ handle selinux context on blkid.tab, dwalsh says this is a no-no.
+
+* Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 1.38-8
 - handle selinux context on blkid.tab
 
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 1.38-7



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:14:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:14:14 -0500
Subject: rpms/udev/devel udev-rules.patch,1.4,1.5 udev.spec,1.152,1.153
Message-ID: <200602241614.k1OGEEOb007443@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7400

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- put back original WAIT_FOR_SYSFS rule

udev-rules.patch:
 05-udev-early.rules  |    9 +++
 95-pam-console.rules |    1 
 hotplug.rules        |   13 +++--
 udev.rules           |  130 ++++++++++++++++++++++++++++-----------------------
 4 files changed, 92 insertions(+), 61 deletions(-)

Index: udev-rules.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-rules.patch	24 Feb 2006 14:55:34 -0000	1.4
+++ udev-rules.patch	24 Feb 2006 16:14:11 -0000	1.5
@@ -24,10 +24,10 @@
 @@ -0,0 +1 @@
 +ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}"
 --- /dev/null	2006-02-15 18:27:05.942547250 +0100
-+++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-24 15:09:54.000000000 +0100
++++ udev-084/etc/udev/redhat/05-udev-early.rules	2006-02-24 17:11:23.000000000 +0100
 @@ -0,0 +1,9 @@
 +# sysfs is populated after the event is sent
-+
++ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
 +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 +
 +# ignore these events until someone needs them


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- udev.spec	24 Feb 2006 14:55:34 -0000	1.152
+++ udev.spec	24 Feb 2006 16:14:11 -0000	1.153
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -276,6 +276,9 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Fri Feb 24 2006 Harald Hoyer <harald at redhat.com> - 084-6
+- put back original WAIT_FOR_SYSFS rule
+
 * Fri Feb 24 2006 Harald Hoyer <harald at redhat.com> - 084-5
 - removed WAIT_FOR_SYSFS rule
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:18:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:18:47 -0500
Subject: rpms/f-spot/devel f-spot.spec,1.17,1.18
Message-ID: <200602241618.k1OGIlJe021964@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/f-spot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21933

Modified Files:
	f-spot.spec 
Log Message:
add these extra files, too


Index: f-spot.spec
===================================================================
RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- f-spot.spec	24 Feb 2006 15:59:50 -0000	1.17
+++ f-spot.spec	24 Feb 2006 16:18:44 -0000	1.18
@@ -66,7 +66,10 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_libdir}/f-spot/*
-%{_prefix}/bin/f-spot
+%{_bindir}/f-spot
+%{_bindir}/f-spot-import
+%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
+%{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop
 
 %changelog
 * Fri Feb 24 2006 Christopher Aillon <caillon at redhat.com> 0.1.10-1



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:36:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:36:21 -0500
Subject: rpms/xmlrpc/devel xmlrpc.spec,1.9,1.10
Message-ID: <200602241636.k1OGaL6f027301@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27234

Modified Files:
	xmlrpc.spec 
Log Message:
* Fri Feb 24 2006 Igor Foox <ifoox at redhat.com> - 0:2.0.1-1jpp_5fc
- Added post/postun dependency on coreutils.



Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmlrpc.spec	11 Feb 2006 06:12:48 -0000	1.9
+++ xmlrpc.spec	24 Feb 2006 16:36:18 -0000	1.10
@@ -1,6 +1,6 @@
 %define name		xmlrpc
 %define version		2.0.1
-%define release		1jpp_4fc
+%define release		1jpp_5fc
 %define	section		free
 %define gcj_support     1
 
@@ -19,7 +19,9 @@
 Requires:	junit >= 3.8.1
 %if %{gcj_support}
 Requires(post):		java-gcj-compat >= 1.0.33
-Requires(postun):	java-gcj-compat >= 1.0.33
+Requires(post):		java-gcj-compat >= 1.0.33
+Requires(postun):	coreutils
+Requires(postun):	coreutils
 BuildRequires:	java-gcj-compat-devel >= 1.0.33
 %endif
 BuildRequires:	ant
@@ -105,6 +107,9 @@
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Feb 24 2006 Igor Foox <ifoox at redhat.com> - 0:2.0.1-1jpp_5fc
+- Added post/postun dependency on coreutils.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:2.0.1-1jpp_4fc
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:43:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:43:30 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.25,
	1.26 selinux-policy.spec, 1.126, 1.127
Message-ID: <200602241643.k1OGhUMk030609@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30572

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                |   12 ++++++------
 policy/modules/admin/logwatch.te        |    2 ++
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/admin/vpn.te             |    6 ++++++
 policy/modules/apps/java.if             |    8 ++------
 policy/modules/kernel/corecommands.fc   |    1 +
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.fc        |    1 +
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    4 +++-
 policy/modules/services/apache.if       |   21 +++++++++++++++++++++
 policy/modules/services/automount.te    |    7 +++++--
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/hal.te          |    2 +-
 policy/modules/services/ktalk.te        |    3 +++
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/fstools.te        |    2 +-
 policy/modules/system/init.te           |    1 +
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/mount.te          |    2 +-
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    6 ++----
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 28 files changed, 92 insertions(+), 39 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- policy-20060207.patch	24 Feb 2006 15:50:38 -0000	1.25
+++ policy-20060207.patch	24 Feb 2006 16:43:26 -0000	1.26
@@ -460,18 +460,6 @@
  dontaudit udev_t self:capability sys_tty_config;
  allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow udev_t self:process { execmem setfscreate };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.21/policy/modules/system/unconfined.te
---- nsaserefpolicy/policy/modules/system/unconfined.te	2006-02-20 14:07:38.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/unconfined.te	2006-02-23 15:44:10.000000000 -0500
-@@ -90,7 +90,7 @@
- 	')
- 
- 	optional_policy(`fstools',`
--		fstools_domtrans(unconfined_t)
-+		fstools_exec(unconfined_t)
- 	')
- 
- 	optional_policy(`java',`
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.21/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-22 14:09:04.000000000 -0500
 +++ serefpolicy-2.2.21/support/Makefile.devel	2006-02-23 12:38:25.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- selinux-policy.spec	24 Feb 2006 15:50:38 -0000	1.126
+++ selinux-policy.spec	24 Feb 2006 16:43:26 -0000	1.127
@@ -1,4 +1,5 @@
 %define distro redhat
+%define polyinstatiate n
 %define monolithic n
 %define BUILD_STRICT 0
 %define BUILD_TARGETED 0
@@ -53,24 +54,24 @@
 
 
 %define setupCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 bare \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  conf \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} bare \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate}  conf \
 cp -f ${RPM_SOURCE_DIR}/modules-%1.conf  ./policy/modules.conf \
 cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \
 
 %define installCmds() \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 base.pp \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4 modules \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%4 install \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%4 install-appconfig \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} modules \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%{polyinstatiate} install \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%{polyinstatiate} install-appconfig \
 #%{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/policy \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \
 %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  enableaudit \
-make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%4  base.pp \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate}  enableaudit \
+make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate}  base.pp \
 install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \
 touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \
@@ -156,7 +157,7 @@
 
 # Install devel
 make clean
-make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=y install-headers install-docs
+make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=%{polyinstatiate} install-headers install-docs
 mkdir ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
 mv ${RPM_BUILD_ROOT}%{_usr}/share/selinux/targeted/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
@@ -165,18 +166,18 @@
 
 # Build targeted policy
 # Commented out because only targeted ref policy currently builds
-%setupCmds targeted targeted-mcs y y
-%installCmds targeted targeted-mcs y y
+%setupCmds targeted targeted-mcs y 
+%installCmds targeted targeted-mcs y 
 
 # Build strict policy
 # Commented out because only targeted ref policy currently builds
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y bare 
-make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y conf
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} bare 
+make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} conf
 %installCmds strict strict-mcs y
 
 # Build mls policy
-%setupCmds mls strict-mls n y
-%installCmds mls strict-mls n y
+%setupCmds mls strict-mls n 
+%installCmds mls strict-mls n 
 
 %clean
 %{__rm} -fR $RPM_BUILD_ROOT
@@ -293,6 +294,9 @@
 %changelog
 
 * Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
+- Turn off polyinstatiate util after FC5
+
+* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
 - Fix problem with privoxy talking to Tor
 
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-4



From fedora-cvs-commits at redhat.com  Fri Feb 24 16:45:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 11:45:04 -0500
Subject: rpms/selinux-policy/devel selinux-policy.spec,1.127,1.128
Message-ID: <200602241645.k1OGj42O031363@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31332

Modified Files:
	selinux-policy.spec 
Log Message:



Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- selinux-policy.spec	24 Feb 2006 16:43:26 -0000	1.127
+++ selinux-policy.spec	24 Feb 2006 16:45:01 -0000	1.128
@@ -10,7 +10,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 5
+Release: 6
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,7 +293,7 @@
 
 %changelog
 
-* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
+* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-6
 - Turn off polyinstatiate util after FC5
 
 * Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5



From fedora-cvs-commits at redhat.com  Fri Feb 24 17:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 12:17:36 -0500
Subject: rpms/hal/devel hal-0.5.7-fix-fedora-power-save.patch, NONE,
	1.1 .cvsignore, 1.38, 1.39 hal.spec, 1.84, 1.85 sources, 1.39, 1.40
Message-ID: <200602241717.k1OHHasw003060@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31269

Modified Files:
	.cvsignore hal.spec sources 
Added Files:
	hal-0.5.7-fix-fedora-power-save.patch 
Log Message:
* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-1
- New upstream version 0.5.7 with several bug fixes
- Don't restart hald on package upgrade
- Pull in dmidecode on x86-ish and x86_64 architectures
- Don't let HAL's Mount() method circumvent system policy (#182352)
- Patch to use new pm-utils's new pm-powersave util properly



hal-0.5.7-fix-fedora-power-save.patch:
 hal-system-power-set-power-save |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE hal-0.5.7-fix-fedora-power-save.patch ---
Index: tools/hal-system-power-set-power-save
===================================================================
RCS file: /cvs/hal/hal/tools/hal-system-power-set-power-save,v
retrieving revision 1.4
diff -u -p -r1.4 hal-system-power-set-power-save
--- tools/hal-system-power-set-power-save	29 Nov 2005 17:47:54 -0000	1.4
+++ tools/hal-system-power-set-power-save	24 Feb 2006 16:45:15 -0000
@@ -25,10 +25,10 @@ if [ -f /etc/altlinux-release ] || [ -f 
 elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] ; then
 	if [ -x "/usr/sbin/pm-powersave" ] ; then
 		if [ $value = "true" ]; then
-			/usr/sbin/pm-powersave on
+			/usr/sbin/pm-powersave true
 			RET=$?
 		elif [ $value = "false" ]; then
-			/usr/sbin/pm-powersave off
+			/usr/sbin/pm-powersave false
 			RET=$?
 		fi
 	else


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	13 Feb 2006 16:42:12 -0000	1.38
+++ .cvsignore	24 Feb 2006 17:17:34 -0000	1.39
@@ -26,3 +26,4 @@
 hal-0.5.6.tar.gz
 hal-0.5.5.1.cvs20060111.tar.gz
 hal-0.5.7-0.cvs20060213.tar.gz
+hal-0.5.7.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- hal.spec	16 Feb 2006 05:47:54 -0000	1.84
+++ hal.spec	24 Feb 2006 17:17:34 -0000	1.85
@@ -11,6 +11,7 @@
 %define kernel_version          2.6.11
 %define gettext_version	        0.14.1-14
 %define libusb_version          0.1.10a-1
+%define dmidecode_version       2.7
 %define cryptsetup_luks_version 1.0.1-2
 
 %define hal_user_uid           68
@@ -18,10 +19,11 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.7
-Release: 0.cvs20060213.2
+Release: 1
 URL: http://www.freedesktop.org/Software/hal
-Source0: %{name}-%{version}-0.cvs20060213.tar.gz
+Source0: %{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
+Patch0: hal-0.5.7-fix-fedora-power-save.patch
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -49,6 +51,9 @@
 %ifnarch s390 s390x
 Requires: libusb >= %{libusb_version}
 %endif
+%ifarch %{ix86} x86_64
+Requires: dmidecode >= %{dmidecode_version}
+%endif
 
 %description
 
@@ -80,6 +85,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .fix-fedora-powersave
 
 %build
 
@@ -113,9 +119,9 @@
 
 %postun
 /sbin/ldconfig
-if [ "$1" -ge "1" ]; then
-  service haldaemon condrestart > /dev/null 2>&1
-fi
+#if [ "$1" -ge "1" ]; then
+#  service haldaemon condrestart > /dev/null 2>&1
+#fi
 
 %files
 %defattr(-,root,root)
@@ -154,7 +160,6 @@
 %{_datadir}/doc/hal-%{version}/conf/*
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
-%{_bindir}/hal-system-power-pmu
 
 %files devel
 %defattr(-,root,root)
@@ -176,6 +181,13 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 0.5.7-1
+- New upstream version 0.5.7 with several bug fixes
+- Don't restart hald on package upgrade
+- Pull in dmidecode on x86-ish and x86_64 architectures
+- Don't let HAL's Mount() method circumvent system policy (#182352)
+- Patch to use new pm-utils's new pm-powersave util properly
+
 * Thu Feb 16 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-0.cvs20060213.2
 - fix directory ownership
 - don't ship static libraries


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	13 Feb 2006 16:42:12 -0000	1.39
+++ sources	24 Feb 2006 17:17:34 -0000	1.40
@@ -1 +1 @@
-d112d5ae66aacfb3d600581f3dd8b78f  hal-0.5.7-0.cvs20060213.tar.gz
+4163afb8285db64e00e7b1392b401d92  hal-0.5.7.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 17:37:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 12:37:11 -0500
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.90,1.91
Message-ID: <200602241737.k1OHbBY3002311@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2288

Modified Files:
	NetworkManager.spec 
Log Message:
* Fri Feb 24 2006 Dan Williams <dcbw at redhat.coM> 0.5.1-14.cvs20060221
- Move libnotify requires to NetworkManager-gnome, not core NM package




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- NetworkManager.spec	21 Feb 2006 08:10:41 -0000	1.90
+++ NetworkManager.spec	24 Feb 2006 17:37:07 -0000	1.91
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 13%{?nm_cvs_version}
+Release: 14%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -35,7 +35,6 @@
 Requires: dhclient >= 3.0.2-12
 Requires: bind >= %{bind_version}
 Requires: wpa_supplicant
-Requires: libnotify >= 0.3
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: hal-devel >= %{hal_version}
@@ -71,6 +70,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: hal >= %{hal_version}
+Requires: libnotify >= 0.3
 PreReq:  gtk2 >= %{gtk2_version}
 
 %description gnome
@@ -212,6 +212,9 @@
 
 
 %changelog
+* Fri Feb 24 2006 Dan Williams <dcbw at redhat.coM> 0.5.1-14.cvs20060221
+- Move libnotify requires to NetworkManager-gnome, not core NM package
+
 * Tue Feb 21 2006 Dan Williams <dcbw at redhat.com> 0.5.1-13.cvs20060221
 - Add BuildRequires: libnl-devel (#rh179438#)
 - Fix libnm_glib to not clobber an application's existing dbus connection



From fedora-cvs-commits at redhat.com  Fri Feb 24 17:43:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 12:43:49 -0500
Subject: rpms/gnome-mount/devel .cvsignore, 1.5, 1.6 gnome-mount.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200602241743.k1OHhnWJ002436@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2421

Modified Files:
	.cvsignore gnome-mount.spec sources 
Log Message:
* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-1
- Update to upstream version 0.4




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Feb 2006 16:26:42 -0000	1.5
+++ .cvsignore	24 Feb 2006 17:43:47 -0000	1.6
@@ -2,3 +2,4 @@
 gnome-mount-0.3.tar.gz
 gnome-mount-0.4-0.cvs20060117.tar.gz
 gnome-mount-0.4-0.cvs20060213.tar.gz
+gnome-mount-0.4.tar.gz


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-mount.spec	13 Feb 2006 18:40:27 -0000	1.9
+++ gnome-mount.spec	24 Feb 2006 17:43:47 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 0.cvs20060213.1.1
+Release: 1
 License: GPL
 Group: Applications/System
-Source: %{name}-%{version}-0.cvs20060213.tar.gz
+Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: hal >= 0.5.0
+Requires: hal >= 0.5.7
 Requires: dbus >= 0.60
 
 %description
@@ -50,7 +50,6 @@
 %{_datadir}/locale/*
 %{_bindir}/gnome-eject
 %{_bindir}/gnome-mount
-%{_bindir}/gnome-mount-properties
 %{_bindir}/gnome-umount
 %{_datadir}/gnome-mount/gnome-mount-properties.glade
 
@@ -59,6 +58,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-1
+- Update to upstream version 0.4
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 0.4-0.cvs20060213.1.1
 - rebump for build order issues during double-long bump
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Feb 2006 16:26:42 -0000	1.5
+++ sources	24 Feb 2006 17:43:47 -0000	1.6
@@ -1 +1 @@
-a2d266e2ea88bc54eb22550354ea7789  gnome-mount-0.4-0.cvs20060213.tar.gz
+75f260ea6b0ec3c5e0af3c722fbd9568  gnome-mount-0.4.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 18:14:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 13:14:32 -0500
Subject: rpms/gnome-volume-manager/devel
	gvm-1.5.13-support-encrypted-fs.patch, NONE, 1.1 .cvsignore,
	1.17, 1.18 gnome-volume-manager.spec, 1.34, 1.35 sources, 1.17, 1.18
Message-ID: <200602241814.k1OIEWZP028843@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28623

Modified Files:
	.cvsignore gnome-volume-manager.spec sources 
Added Files:
	gvm-1.5.13-support-encrypted-fs.patch 
Log Message:
* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-1
- Update to upstream release 1.5.13
- Require gnome-mount
- Include patch for handling encrypted file systems



gvm-1.5.13-support-encrypted-fs.patch:
 manager.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE gvm-1.5.13-support-encrypted-fs.patch ---
Index: src/manager.c
===================================================================
RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
retrieving revision 1.128
diff -u -p -r1.128 manager.c
--- src/manager.c	10 Feb 2006 22:08:25 -0000	1.128
+++ src/manager.c	19 Feb 2006 15:10:50 -0000
@@ -2050,9 +2050,12 @@ block_device_added (const char *udi, con
 	char *fsusage = NULL, *device = NULL, *storage_device = NULL;
 	DBusError error;
 	int mountable;
+	int crypto;
 	
 	dbus_error_init (&error);
-	
+
+	crypto = FALSE;
+
 	/* is this a mountable volume? */
 	if (!(mountable = libhal_device_get_property_bool (hal_ctx, udi, "block.is_volume", NULL))) {
 		dbg ("not a mountable volume: %s\n", udi);
@@ -2065,6 +2068,7 @@ block_device_added (const char *udi, con
 		goto out;
 	}
 	
+
 	if (mountable) {
 		/* only mount if the block device has a sensible filesystem */
 		if (!(fsusage = libhal_device_get_property_string (hal_ctx, udi, "volume.fsusage", &error))) {
@@ -2074,6 +2078,7 @@ block_device_added (const char *udi, con
 			dbg ("encrypted volume found: %s\n", udi);
 			/* TODO: handle encrypted volumes */
 			mountable = FALSE;
+			crypto = TRUE;
 		} else if (strcmp (fsusage, "filesystem") != 0) {
 			dbg ("no sensible filesystem for %s\n", udi);
 			mountable = FALSE;
@@ -2097,7 +2102,7 @@ block_device_added (const char *udi, con
 			goto out;
 	}
 	
-	if (config.automount_drives && mountable) {
+	if (config.automount_drives && (mountable || crypto)) {
 		if (!gvm_udi_is_subfs_mount (udi)) {
 			if (gvm_automount_enabled (udi)) {
 				gvm_device_mount (udi, TRUE);
@@ -2106,7 +2111,7 @@ block_device_added (const char *udi, con
 			}
 		}
 	}
-	
+
  out:
 	
 	if (dbus_error_is_set (&error))
@@ -2666,7 +2671,7 @@ mount_all (LibHalContext *ctx)
 		if (!libhal_device_property_exists (ctx, udi, "volume.fsusage", NULL))
 			continue;
 		prop = libhal_device_get_property_string (ctx, udi, "volume.fsusage", NULL);
-		if (!prop || strcmp (prop, "filesystem") != 0) {
+		if (!prop || ((strcmp (prop, "filesystem") != 0) && (strcmp (prop, "crypto") != 0))) {
 			libhal_free_string (prop);
 			continue;
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	27 Jan 2006 03:58:49 -0000	1.17
+++ .cvsignore	24 Feb 2006 18:14:30 -0000	1.18
@@ -12,3 +12,4 @@
 gnome-volume-manager-1.5.7.tar.bz2
 gnome-volume-manager-1.5.9.tar.bz2
 gnome-volume-manager-1.5.11.tar.bz2
+gnome-volume-manager-1.5.13.tar.bz2


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-volume-manager.spec	13 Feb 2006 16:17:03 -0000	1.34
+++ gnome-volume-manager.spec	24 Feb 2006 18:14:30 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
-Version: 1.5.11
-Release: 2
+Version: 1.5.13
+Release: 1
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 Patch1: gnome-volume-manager-1.5.11-rh-defaults.patch
 Patch2: gvm-no-mount-ui-on-startup.patch 
 Patch3: gnome-volume-manager-1.5.9-goption.patch 
+Patch4: gvm-1.5.13-support-encrypted-fs.patch
 BuildRoot: /var/tmp/%{name}-root
 BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60
 BuildPrereq: hal-devel >= 0.5.0
@@ -20,6 +21,7 @@
 Requires: dbus >= 0.60
 Requires: gthumb
 Requires: gnome-media
+Requires: gnome-mount >= 0.4
 Obsoletes: magicdev
 Provides: magicdev
 ExcludeArch: s390
@@ -41,6 +43,7 @@
 %setup -q
 %patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
+%patch4 -p1 -b .crypto
 
 %build
 %configure
@@ -78,6 +81,11 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-1
+- Update to upstream release 1.5.13
+- Require gnome-mount
+- Include patch for handling encrypted file systems
+
 * Mon Feb 13 2006 Ray Strode <rstrode at redhat.com> - 1.5.11-2
 - get rid of gnome-printer-add
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	27 Jan 2006 03:58:49 -0000	1.17
+++ sources	24 Feb 2006 18:14:30 -0000	1.18
@@ -1 +1 @@
-5c0352da03ae2bc60cf1f3bf1a04c1a6  gnome-volume-manager-1.5.11.tar.bz2
+ece6b04291de03e22861a220f5ed1417  gnome-volume-manager-1.5.13.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 18:15:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 13:15:43 -0500
Subject: rpms/hwdata/devel .cvsignore, 1.59, 1.60 hwdata.spec, 1.60,
	1.61 sources, 1.62, 1.63
Message-ID: <200602241815.k1OIFhiq029442@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/hwdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29405

Modified Files:
	.cvsignore hwdata.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	22 Feb 2006 16:16:47 -0000	1.59
+++ .cvsignore	24 Feb 2006 18:15:40 -0000	1.60
@@ -1 +1 @@
-hwdata-0.176.tar.gz
+hwdata-0.177.tar.gz


Index: hwdata.spec
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- hwdata.spec	22 Feb 2006 16:16:47 -0000	1.60
+++ hwdata.spec	24 Feb 2006 18:15:40 -0000	1.61
@@ -1,6 +1,6 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.176
+Version: 0.177
 Release: 1
 License: GPL/MIT
 Group: System Environment/Base
@@ -33,6 +33,10 @@
 %config /usr/share/hwdata/*
 
 %changelog
+* 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)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hwdata/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	22 Feb 2006 16:16:47 -0000	1.62
+++ sources	24 Feb 2006 18:15:40 -0000	1.63
@@ -1 +1 @@
-21cff19c147f68c1b21d6c85904cf8b9  hwdata-0.176.tar.gz
+daa4c324ec57a56ff802fe01010bf849  hwdata-0.177.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 18:21:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 13:21:15 -0500
Subject: rpms/system-config-kickstart/devel sources, 1.30,
	1.31 system-config-kickstart.spec, 1.34, 1.35
Message-ID: <200602241821.k1OILFMd011913@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-kickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11771

Modified Files:
	sources system-config-kickstart.spec 
Log Message:
Bump version.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	9 Feb 2006 15:09:26 -0000	1.30
+++ sources	24 Feb 2006 18:21:11 -0000	1.31
@@ -1 +1 @@
-e8cb25a720a8c40581056c6e6b1cccc3  system-config-kickstart-2.6.6.tar.bz2
+02bbbb3158a7db72685081b20d442812  system-config-kickstart-2.6.6.tar.bz2


Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- system-config-kickstart.spec	9 Feb 2006 15:09:26 -0000	1.34
+++ system-config-kickstart.spec	24 Feb 2006 18:21:11 -0000	1.35
@@ -1,7 +1,7 @@
 Summary: A graphical interface for making kickstart files.
 Name: system-config-kickstart
 Version: 2.6.6
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -22,6 +22,7 @@
 Requires: pykickstart
 Requires: yum
 Requires: pirut
+Requires: hicolor-icon-theme
 Prereq: gtk2 >= 2.6
 
 %description
@@ -77,6 +78,9 @@
 %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
 
 %changelog
+* Fri Feb 24 2006 Chris Lumens <clumens at redhat.com> 2.6.6-2
+- Add requirement for scriptlets (#182865, #182866).
+
 * Thu Feb 09 2006 Chris Lumens <clumens at redhat.com> 2.6.6-1
 - Fix .desktop file, other references to /usr/sbin.
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 18:39:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 13:39:13 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.26,
	1.27 selinux-policy.spec, 1.128, 1.129
Message-ID: <200602241839.k1OIdDEl017703@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17673

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                |   12 ++++++------
 policy/modules/admin/logwatch.te        |    2 ++
 policy/modules/admin/netutils.te        |    2 ++
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/admin/vpn.te             |    6 ++++++
 policy/modules/apps/java.if             |    8 ++------
 policy/modules/kernel/corecommands.fc   |    1 +
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.fc        |    1 +
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    4 +++-
 policy/modules/services/apache.if       |   21 +++++++++++++++++++++
 policy/modules/services/automount.te    |    7 +++++--
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/cups.fc         |    2 +-
 policy/modules/services/cups.te         |    2 +-
 policy/modules/services/hal.te          |    2 +-
 policy/modules/services/ktalk.te        |    3 +++
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/fstools.te        |    2 +-
 policy/modules/system/init.te           |    1 +
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/mount.te          |    2 +-
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    6 ++----
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 32 files changed, 97 insertions(+), 42 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- policy-20060207.patch	24 Feb 2006 16:43:26 -0000	1.26
+++ policy-20060207.patch	24 Feb 2006 18:39:09 -0000	1.27
@@ -34,6 +34,37 @@
  userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
  userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
  
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.21/policy/modules/admin/netutils.te
+--- nsaserefpolicy/policy/modules/admin/netutils.te	2006-02-21 14:40:22.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/netutils.te	2006-02-24 11:25:33.000000000 -0500
+@@ -139,6 +139,7 @@
+ 	term_use_generic_ptys(ping_t)
+ 	term_use_all_user_ttys(ping_t)
+ 	term_use_all_user_ptys(ping_t)
++	userdom_manage_generic_user_home_content_files(ping_t)
+ ',`
+ 	tunable_policy(`user_ping',`
+ 		term_use_all_user_ttys(ping_t)
+@@ -221,6 +222,7 @@
+ ifdef(`targeted_policy',`
+ 	term_use_unallocated_ttys(traceroute_t)
+ 	term_use_generic_ptys(traceroute_t)
++	userdom_manage_generic_user_home_content_files(traceroute_t)
+ ')
+ 
+ tunable_policy(`user_ping',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.21/policy/modules/admin/readahead.te
+--- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-21 14:40:22.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/admin/readahead.te	2006-02-24 13:07:55.000000000 -0500
+@@ -18,7 +18,7 @@
+ # Local policy
+ #
+ 
+-dontaudit readahead_t self:capability sys_tty_config;
++dontaudit readahead_t self:capability { dac_override dac_read_search sys_tty_config };
+ allow readahead_t self:process signal_perms;
+ 
+ allow readahead_t readahead_var_run_t:file create_file_perms;
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.21/policy/modules/admin/su.fc
 --- nsaserefpolicy/policy/modules/admin/su.fc	2005-11-14 18:24:06.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/admin/su.fc	2006-02-23 14:49:18.000000000 -0500
@@ -304,6 +335,30 @@
  	')
  
  	optional_policy(`cyrus',`
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.21/policy/modules/services/cups.fc
+--- nsaserefpolicy/policy/modules/services/cups.fc	2005-11-14 18:24:08.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/cups.fc	2006-02-24 13:37:07.000000000 -0500
+@@ -43,7 +43,7 @@
+ /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
+ /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0)
+ 
+-/var/run/cups/printcap	--	gen_context(system_u:object_r:cupsd_var_run_t,s0)
++/var/run/cups(/.*)?		gen_context(system_u:object_r:cupsd_var_run_t,s0)
+ /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
+ /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
+ /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.21/policy/modules/services/cups.te
+--- nsaserefpolicy/policy/modules/services/cups.te	2006-02-23 09:25:09.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/cups.te	2006-02-24 13:38:07.000000000 -0500
+@@ -77,7 +77,7 @@
+ 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_socket_perms;
++allow cupsd_t self:unix_stream_socket create_stream_socket_perms;
+ 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 };
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.21/policy/modules/services/hal.te
 --- nsaserefpolicy/policy/modules/services/hal.te	2006-02-21 14:40:23.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/services/hal.te	2006-02-23 10:11:00.000000000 -0500
@@ -347,7 +402,7 @@
  
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.21/policy/modules/system/fstools.te
 --- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/fstools.te	2006-02-23 09:41:46.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/system/fstools.te	2006-02-24 11:24:37.000000000 -0500
 @@ -45,7 +45,7 @@
  files_tmp_filetrans(fsadm_t, fsadm_tmp_t, { file dir })
  


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- selinux-policy.spec	24 Feb 2006 16:45:01 -0000	1.128
+++ selinux-policy.spec	24 Feb 2006 18:39:09 -0000	1.129
@@ -10,7 +10,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,6 +293,9 @@
 
 %changelog
 
+* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-7
+- Fixes for new version of cups
+
 * Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-6
 - Turn off polyinstatiate util after FC5
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 18:46:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 13:46:09 -0500
Subject: rpms/xorg-x11-drv-vga/devel vga.xinf, NONE,
	1.1 xorg-x11-drv-vga.spec, 1.8, 1.9
Message-ID: <200602241846.k1OIk9no026071@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-drv-vga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25929

Modified Files:
	xorg-x11-drv-vga.spec 
Added Files:
	vga.xinf 
Log Message:
* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 4.0.0.5-2
- Added vga.xinf videoaliases file for ancient hardware (#182953)



--- NEW FILE vga.xinf ---
alias pcivideo:v0000100Ed00009000sv*sd*bc*sc*i* vga
alias pcivideo:v0000100Ed00009001sv*sd*bc*sc*i* vga
alias pcivideo:v0000100Ed00009002sv*sd*bc*sc*i* vga
alias pcivideo:v0000100Ed00009100sv*sd*bc*sc*i* vga
alias pcivideo:v00001011d00000004sv*sd*bc*sc*i* tga
alias pcivideo:v00001013d00000038sv*sd*bc*sc*i* vga
alias pcivideo:v00001013d00001200sv*sd*bc*sc*i* vga
alias pcivideo:v00001013d00001202sv*sd*bc*sc*i* vga
alias pcivideo:v00001013d00001204sv*sd*bc*sc*i* vga
alias pcivideo:v000010DEd00000008sv*sd*bc*sc*i* vga
alias pcivideo:v000010DEd00000009sv*sd*bc*sc*i* vga
alias pcivideo:v00001142d00006422sv*sd*bc*sc*i* vga
alias pcivideo:v00001163d00000001sv*sd*bc*sc*i* vga
alias pcivideo:v00001163d00002000sv*sd*bc*sc*i* vga
alias pcivideo:v00004005d00002301sv*sd*bc*sc*i* vga
alias pcivideo:v00004005d00002302sv*sd*bc*sc*i* vga
alias pcivideo:v00004005d00002303sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d00008880sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d00008881sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d00008882sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d00008883sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088B0sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088B1sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088B2sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088B3sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088C0sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088C1sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088C2sv*sd*bc*sc*i* vga
alias pcivideo:v00005333d000088C3sv*sd*bc*sc*i* vga
alias pcivideo:v0000EDD8d0000A091sv*sd*bc*sc*i* vga
alias pcivideo:v0000EDD8d0000A099sv*sd*bc*sc*i* vga
alias pcivideo:v0000EDD8d0000A0A1sv*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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-vga.spec	11 Feb 2006 06:23:56 -0000	1.8
+++ xorg-x11-drv-vga.spec	24 Feb 2006 18:46:05 -0000	1.9
@@ -7,9 +7,10 @@
 Summary:   Xorg X11 vga video driver
 Name:      xorg-x11-drv-vga
 Version:   4.0.0.5
-Release:   1.2
+Release:   2
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/X11R7.0/src/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)
@@ -36,6 +37,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
+
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -48,10 +52,14 @@
 %dir %{moduledir}
 %dir %{driverdir}
 %{driverdir}/vga_drv.so
+%{_datadir}/hwdata/videoaliases/vga.xinf
 #%dir %{_mandir}/man4x
 %{_mandir}/man4/vga.4*
 
 %changelog
+* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 4.0.0.5-2
+- Added vga.xinf videoaliases file for ancient hardware (#182953)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.0.0.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:07:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:07:32 -0500
Subject: rpms/gdm/devel gdm.spec,1.133,1.134
Message-ID: <200602241907.k1OJ7WKh007447@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6915

Modified Files:
	gdm.spec 
Log Message:
- change some /etc/X11 bits in the spec file to /etc



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gdm.spec	19 Feb 2006 07:17:10 -0000	1.133
+++ gdm.spec	24 Feb 2006 19:07:30 -0000	1.134
@@ -151,8 +151,8 @@
 mkdir -p $RPM_BUILD_ROOT/var/log/gdm
 
 # remove the gdm Xsession as we're using the xdm one
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .)
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Xsession
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/gdm; ln -sf ../xinit/Xsession .)
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
@@ -224,6 +224,7 @@
     sed -i -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_sysconfdir}/gdm/custom.conf
     sed -i -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_sysconfdir}/gdm/custom.conf
     sed -i -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_sysconfdir}/gdm/custom.conf
+    sed -i -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' %{_sysconfdir}/gdm/custom.conf
     sed -i -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_sysconfdir}/gdm/custom.conf
     sed -i -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_sysconfdir}/gdm/custom.conf
     sed -i -e 's@^GraphicalTheme=Bluecurve@#&@' %{_sysconfdir}/gdm/custom.conf
@@ -306,6 +307,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-4
+- change some /etc/X11 bits in the spec file to /etc
+
 * Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-3
 - add server entry for accel-indirect branch of xorg
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:08:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:08:36 -0500
Subject: rpms/gdm/devel gdm.spec,1.134,1.135
Message-ID: <200602241908.k1OJ8a9t007949@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7865

Modified Files:
	gdm.spec 
Log Message:
- change some /etc/X11 bits in the spec file to /etc



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gdm.spec	24 Feb 2006 19:07:30 -0000	1.134
+++ gdm.spec	24 Feb 2006 19:08:32 -0000	1.135
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.8
-Release: 4
+Release: 5
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -307,7 +307,7 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
-* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-4
+* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-5
 - change some /etc/X11 bits in the spec file to /etc
 
 * Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-3



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:13:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:13:40 -0500
Subject: rpms/kernel/devel linux-2.6.15-ipw2200-monitor.patch, NONE,
	1.1 kernel-2.6.spec, 1.1978, 1.1979
Message-ID: <200602241913.k1OJDedT010448@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10410

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.15-ipw2200-monitor.patch 
Log Message:
add/enable IPW2200_MONITOR config option for i686 and x86_64

linux-2.6.15-ipw2200-monitor.patch:
 Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6.15-ipw2200-monitor.patch ---
--- linux-2.6.15.i686/drivers/net/wireless/Kconfig.BAD	2006-02-18 09:57:26.000000000 -0600
+++ linux-2.6.15.i686/drivers/net/wireless/Kconfig	2006-02-18 09:58:07.000000000 -0600
@@ -237,6 +237,15 @@
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config IPW2200_MONITOR
+	bool "Enable promiscuous mode"
+	depends on IPW2200
+	---help---
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
 	depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1978
retrieving revision 1.1979
diff -u -r1.1978 -r1.1979
--- kernel-2.6.spec	23 Feb 2006 23:14:16 -0000	1.1978
+++ kernel-2.6.spec	24 Feb 2006 19:13:38 -0000	1.1979
@@ -339,6 +339,7 @@
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
 Patch1303: linux-2.6-ipw2200-hwcrypto.patch
+Patch1304: linux-2.6.15-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -893,6 +894,8 @@
 %patch1302 -p1
 # ipw2200 hwcrypto=0 by default to avoid firmware restarts
 %patch1303 -p1
+# add IPW2200_MONITOR config option
+%patch1304 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -1588,6 +1591,9 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 John W. Linville <linville at redhat.com>
+- Add/enable IPW2200_MONITOR config option for i686 and x86_64
+
 * Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com>
 - Shut up the debugging messages from pmac platform stuff
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:13:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:13:41 -0500
Subject: rpms/kernel/devel/configs config-x86-generic, 1.35,
	1.36 config-x86_64-generic, 1.31, 1.32
Message-ID: <200602241913.k1OJDfxS010454@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv10410/configs

Modified Files:
	config-x86-generic config-x86_64-generic 
Log Message:
add/enable IPW2200_MONITOR config option for i686 and x86_64


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- config-x86-generic	13 Feb 2006 21:17:48 -0000	1.35
+++ config-x86-generic	24 Feb 2006 19:13:38 -0000	1.36
@@ -239,6 +239,7 @@
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- config-x86_64-generic	13 Feb 2006 21:17:48 -0000	1.31
+++ config-x86_64-generic	24 Feb 2006 19:13:38 -0000	1.32
@@ -106,6 +106,7 @@
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:27:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:27:54 -0500
Subject: rpms/gnome-volume-manager/devel
	gnome-volume-manager-0.9.10.add-to-base.patch, 1.1,
	1.2 gnome-volume-manager.spec, 1.35, 1.36
Message-ID: <200602241927.k1OJRswf019410@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7889

Modified Files:
	gnome-volume-manager-0.9.10.add-to-base.patch 
	gnome-volume-manager.spec 
Log Message:
* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-2
- Shuffle some patches around to actually build this thing



gnome-volume-manager-0.9.10.add-to-base.patch:
 gnome-volume-properties.desktop.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: gnome-volume-manager-0.9.10.add-to-base.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager-0.9.10.add-to-base.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-volume-manager-0.9.10.add-to-base.patch	9 Sep 2004 05:40:23 -0000	1.1
+++ gnome-volume-manager-0.9.10.add-to-base.patch	24 Feb 2006 19:27:50 -0000	1.2
@@ -1,11 +1,11 @@
---- gnome-volume-manager-0.9.10/gnome-volume-properties.desktop.in.addtobase	2004-08-31 13:30:04.591853000 -0400
-+++ gnome-volume-manager-0.9.10/gnome-volume-properties.desktop.in	2004-08-31 13:31:07.369012000 -0400
+--- gnome-volume-manager/gnome-volume-properties.desktop.in.orig	2006-02-24 14:24:34.000000000 -0500
++++ gnome-volume-manager/gnome-volume-properties.desktop.in	2006-02-24 14:24:58.000000000 -0500
 @@ -6,7 +6,7 @@
  Exec=gnome-volume-properties
  Terminal=false
  Type=Application
--Categories=Application;Settings;
-+Categories=Application;Settings;X-Red-Hat-Base
+-Categories=Application;Settings;GNOME;
++Categories=Application;Settings;GNOME;X-Red-Hat-Base;
  OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-volume-manager


Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-volume-manager.spec	24 Feb 2006 18:14:30 -0000	1.35
+++ gnome-volume-manager.spec	24 Feb 2006 19:27:50 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.13
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -43,7 +43,7 @@
 %setup -q
 %patch0 -p1 -b .add-to-base
 %patch1 -p1 -b .rh-defaults
-%patch4 -p1 -b .crypto
+%patch4 -p0 -b .crypto
 
 %build
 %configure
@@ -81,6 +81,9 @@
 %{_libexecdir}/gnome-cdda-handler
 
 %changelog
+* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-2
+- Shuffle some patches around to actually build this thing
+
 * Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-1
 - Update to upstream release 1.5.13
 - Require gnome-mount



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:42:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:42:22 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.1,
	1.1971.2.2 linux-2.6-xen-compile-fixes.patch, 1.1.12.1, 1.1.12.2
Message-ID: <200602241942.k1OJgMYN023786@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23772

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
Log Message:
Fix config confusion on ia64


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.1
retrieving revision 1.1971.2.2
diff -u -r1.1971.2.1 -r1.1971.2.2
--- kernel-2.6.spec	23 Feb 2006 21:36:14 -0000	1.1971.2.1
+++ kernel-2.6.spec	24 Feb 2006 19:42:19 -0000	1.1971.2.2
@@ -1589,6 +1589,9 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 Stephen Tweedie <sct at redhat.com>
+- Fix config confusion on ia64
+
 * Mon Feb 20 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase kernel xen patches to xen-unstable cset 8907
 

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.new/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 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 +
 15 files changed, 44 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.1.12.1
retrieving revision 1.1.12.2
diff -u -r1.1.12.1 -r1.1.12.2
--- linux-2.6-xen-compile-fixes.patch	23 Feb 2006 21:36:14 -0000	1.1.12.1
+++ linux-2.6-xen-compile-fixes.patch	24 Feb 2006 19:42:19 -0000	1.1.12.2
@@ -205,3 +205,13 @@
  #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



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:43:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:43:27 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.122,1.123
Message-ID: <200602241943.k1OJhRto023823@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23810

Modified Files:
	gtk2.spec 
Log Message:
- add dependency on hicolor



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- gtk2.spec	11 Feb 2006 20:32:23 -0000	1.122
+++ gtk2.spec	24 Feb 2006 19:43:25 -0000	1.123
@@ -51,6 +51,9 @@
 # and these for gdk-pixbuf-query-loaders
 Prereq: libtiff >= 3.6.1
 
+# required for icon themes apis to work
+Prereq: hicolor-icon-theme
+
 %define _unpackaged_files_terminate_build      1
 %define _missing_doc_files_terminate_build     1
 
@@ -259,6 +262,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 2.8.12-2
+- add dependency on hicolor
+
 * Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.12-1
 - Update to 2.8.12
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:51:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:51:49 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.123,1.124
Message-ID: <200602241951.k1OJpnwO004106@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4092

Modified Files:
	gtk2.spec 
Log Message:
- add dependency on hicolor



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- gtk2.spec	24 Feb 2006 19:43:25 -0000	1.123
+++ gtk2.spec	24 Feb 2006 19:51:46 -0000	1.124
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 7.1
+Release: 8
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -262,10 +262,10 @@
 %doc tmpdocs/examples
 
 %changelog
-* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 2.8.12-2
+* Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 2.8.12-8
 - add dependency on hicolor
 
-* Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.12-1
+* Sat Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.12-7.1
 - Update to 2.8.12
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.8.11-7.1



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:54:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:54:41 -0500
Subject: rpms/pykickstart/devel .cvsignore, 1.22, 1.23 pykickstart.spec, 1.22,
	1.23 sources, 1.23, 1.24
Message-ID: <200602241954.k1OJsfRr012492@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/pykickstart/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12442

Modified Files:
	.cvsignore pykickstart.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	17 Feb 2006 20:48:02 -0000	1.22
+++ .cvsignore	24 Feb 2006 19:54:38 -0000	1.23
@@ -11,3 +11,4 @@
 pykickstart-0.19.tar.gz
 pykickstart-0.20.tar.gz
 pykickstart-0.21.tar.gz
+pykickstart-0.22.tar.gz


Index: pykickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pykickstart.spec	17 Feb 2006 20:48:02 -0000	1.22
+++ pykickstart.spec	24 Feb 2006 19:54:38 -0000	1.23
@@ -2,7 +2,7 @@
 
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
-Version: 0.21
+Version: 0.22
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -36,6 +36,9 @@
 /usr/bin/ksvalidator
 
 %changelog
+* Fri Feb 24 2006 Chris Lumens <clumens at redhat.com> 0.22-1
+- Get ignoredisk working again (#182934).
+
 * Fri Feb 17 2006 Chris Lumens <clumens at redhat.com> 0.21-1
 - Provide an option to not traceback on missing include files (#181760).
 - Update programming documentation.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	17 Feb 2006 20:48:02 -0000	1.23
+++ sources	24 Feb 2006 19:54:38 -0000	1.24
@@ -1 +1 @@
-237fd29ebd783e34f875d79cc2da495e  pykickstart-0.21.tar.gz
+24e273d7a3543dd952af4a3a736be02a  pykickstart-0.22.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 19:56:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 14:56:50 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1971.2.2,1.1971.2.3
Message-ID: <200602241956.k1OJuoh0013522@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13494

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec 
Log Message:
Disable ia64 until we work out the Xen interactions


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.2
retrieving revision 1.1971.2.3
diff -u -r1.1971.2.2 -r1.1971.2.3
--- kernel-2.6.spec	24 Feb 2006 19:42:19 -0000	1.1971.2.2
+++ kernel-2.6.spec	24 Feb 2006 19:56:47 -0000	1.1971.2.3
@@ -160,7 +160,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1590,6 +1591,7 @@
 
 %changelog
 * Fri Feb 24 2006 Stephen Tweedie <sct at redhat.com>
+- Disable ia64 until we work out the Xen interactions
 - Fix config confusion on ia64
 
 * Mon Feb 20 2006 Stephen Tweedie <sct at redhat.com>



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:03:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:03:15 -0500
Subject: rpms/gnome-speech/devel gnome-speech.spec,1.22,1.23
Message-ID: <200602242003.k1OK3Fk5014855@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/gnome-speech/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14792

Modified Files:
	gnome-speech.spec 
Log Message:
- Revert back to devel package and enable the bonobo build



Index: gnome-speech.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-speech.spec	23 Feb 2006 21:13:44 -0000	1.22
+++ gnome-speech.spec	24 Feb 2006 20:02:56 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: GNOME Text to Speech
 Name: gnome-speech
 Version: 0.3.9
-Release: 2 
+Release: 3 
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -13,9 +13,6 @@
 BuildRequires: libbonobo-devel
 Patch1: gnome-speech-0.3.5-java-configure.patch
 Patch2: gnome-speech-0.3.5-no-gnome-common.patch
-Provides: gnome-speech-devel
-Obsoletes: gnome-speech-devel < 0.3.9-2
-
 %ifarch i386
 Requires: festival
 %endif
@@ -23,6 +20,15 @@
 %description
 GNOME Speech
 
+%package devel
+Summary:	The files needed for developing an app using gnome-speech
+Group:		Development/Libraries
+Requires:	%name = %{PACKAGE_VERSION}
+Requires:	libbonobo-devel
+
+%description devel
+GNOME Speech devel
+
 %prep
 %setup -q
 %patch1 -p1 -b .java-configure
@@ -39,7 +45,6 @@
 
 find $RPM_BUILD_ROOT -name '*.la' |xargs /bin/rm
 # Remove this as it does not build correctly right now.
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/orbit-2.0/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +60,10 @@
 %{_bindir}/test-speech
 %{_libdir}/bonobo/servers/*
 %{_libdir}/lib*.so.*
+%{_libdir}/orbit-2.0/*.so
+
+%files devel
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so
 %{_includedir}/gnome-speech-1.0
 %{_libdir}/pkgconfig/*pc
@@ -62,8 +71,11 @@
 
 
 %changelog
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.9-3
+- Revert back to devel package and enable the bonobo build
+
 * Thu Feb 23 2006 John (J5) Palmieri <johnp at redhat.com> - 0.3.9-2
-- Get rid of devel package 
+- Get rid of devel package
 - .so now available to bonobo
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.9-1.2.1



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:06:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:06:28 -0500
Subject: rpms/gnome-volume-manager/devel gnome-volume-manager.spec, 1.36,
	1.37
Message-ID: <200602242006.k1OK6SKa015129@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-volume-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15094

Modified Files:
	gnome-volume-manager.spec 
Log Message:
* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-3
- Make sure autostart desktop file gets installed in /etc/xdg/autostart




Index: gnome-volume-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnome-volume-manager.spec	24 Feb 2006 19:27:50 -0000	1.36
+++ gnome-volume-manager.spec	24 Feb 2006 20:06:23 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: The GNOME Volume Manager
 Name: gnome-volume-manager
 Version: 1.5.13
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source0: gnome-volume-manager-%{version}.tar.bz2
@@ -53,6 +53,9 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+mv $RPM_BUILD_ROOT%{_datadir}/autostart/gnome-volume-manager.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/magicdev
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/gthumb-import
 install -d $RPM_BUILD_ROOT%{_libexecdir}/
@@ -79,8 +82,12 @@
 %{_datadir}/gnome-volume-manager
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_libexecdir}/gnome-cdda-handler
+%{_sysconfdir}/xdg/autostart/gnome-volume-manager.desktop
 
 %changelog
+* Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-3
+- Make sure autostart desktop file gets installed in /etc/xdg/autostart
+
 * Fri Feb 24 2006 David Zeuthen <davidz at redhat.com> - 1.5.13-2
 - Shuffle some patches around to actually build this thing
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:08:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:08:15 -0500
Subject: rpms/glib2/devel .cvsignore, 1.46, 1.47 glib2.spec, 1.79,
	1.80 sources, 1.46, 1.47
Message-ID: <200602242008.k1OK8FHL015506@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15473

Modified Files:
	.cvsignore glib2.spec sources 
Log Message:
2.10.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	11 Feb 2006 15:48:45 -0000	1.46
+++ .cvsignore	24 Feb 2006 20:08:09 -0000	1.47
@@ -31,3 +31,4 @@
 glib-2.9.4.tar.bz2
 glib-2.9.5.tar.bz2
 glib-2.9.6.tar.bz2
+glib-2.10.0.tar.bz2


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- glib2.spec	11 Feb 2006 15:49:50 -0000	1.79
+++ glib2.spec	24 Feb 2006 20:08:09 -0000	1.80
@@ -1,6 +1,6 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.9.6
+Version: 2.10.0
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -96,6 +96,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.0-1
+- Update to 2.10.0
+
 * Sat Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.9.6-1
 - Update to 2.9.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	11 Feb 2006 15:48:45 -0000	1.46
+++ sources	24 Feb 2006 20:08:09 -0000	1.47
@@ -1 +1 @@
-2ba1146e767454e14ac0788187c35892  glib-2.9.6.tar.bz2
+60c9f62979415bcb82f0b87d6785dc3b  glib-2.10.0.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:22:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:22:47 -0500
Subject: rpms/eclipse/devel eclipse-ppc64.patch,1.11,1.12
Message-ID: <200602242022.k1OKMlHR002339@cvs.devel.redhat.com>

Author: ifoox

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2308

Modified Files:
	eclipse-ppc64.patch 
Log Message:
Commented out build of help indices for org.eclipse.platform.doc.user and org.eclipse.jdt.doc.user

eclipse-ppc64.patch:
 assemble.org.eclipse.sdk.linux.gtk.ppc64.xml                                                       |   16 
 build                                                                                              |    4 
 features/org.eclipse.platform.launchers/build.xml                                                  |    4 
 features/org.eclipse.platform.launchers/feature.xml                                                |    2 
 features/org.eclipse.rcp.source/build.xml                                                          |    7 
 features/org.eclipse.rcp.source/feature.xml                                                        |    1 
 features/org.eclipse.sdk/build.xml                                                                 |    4 
 plugins/org.eclipse.jdt.doc.isv/buildDoc.xml                                                       |    2 
 plugins/org.eclipse.jdt.doc.user/build.xml                                                         |    2 
 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java    |    6 
 plugins/org.eclipse.pde.doc.user/buildDoc.xml                                                      |    2 
 plugins/org.eclipse.platform.doc.isv/build.xml                                                     |    2 
 plugins/org.eclipse.platform.doc.isv/buildDoc.xml                                                  |    2 
 plugins/org.eclipse.platform.doc.user/build.xml                                                    |    2 
 plugins/org.eclipse.rcp.source.linux.gtk.ppc64/build.xml                                           |  105 ++
 plugins/org.eclipse.swt.gtk.linux.ppc64/.project                                                   |   22 
 plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF                                       |   17 
 plugins/org.eclipse.swt.gtk.linux.ppc64/about.html                                                 |   96 +
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt                                   |  506 ++++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt                                    |  470 +++++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties                                           |   11 
 plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml                                                  |  321 ++++++
 plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties                                        |   12 
 24 files changed, 1607 insertions(+), 11 deletions(-)

Index: eclipse-ppc64.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ppc64.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-ppc64.patch	23 Feb 2006 19:08:26 -0000	1.11
+++ eclipse-ppc64.patch	24 Feb 2006 20:22:43 -0000	1.12
@@ -1819,3 +1819,25 @@
  		<antcall target="createDocZip" />
  	</target>
  
+--- plugins/org.eclipse.jdt.doc.user/build.xml	2006-01-18 16:09:14.000000000 -0500
++++ plugins/org.eclipse.jdt.doc.user/build.xml	2006-02-24 15:12:21.000000000 -0500
+@@ -43,7 +43,7 @@
+ 	</target>
+ 
+ 	<target name="build.doc.zip" depends="init" unless="doc.zip.present">
+-		<antcall target="build.index"/>		
++		<!-- <antcall target="build.index"/> -->
+ 		<zip zipfile="${plugin.destination}/doc.zip"
+ 			basedir="${plugin.destination}"
+ 			includes="*.css, cpy.png, notices.html, about.html, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"
+--- plugins/org.eclipse.platform.doc.user/build.xml	2006-01-18 16:09:15.000000000 -0500
++++ plugins/org.eclipse.platform.doc.user/build.xml	2006-02-24 15:20:58.000000000 -0500
+@@ -43,7 +43,7 @@
+ 	</target>
+ 
+ 	<target name="build.doc.zip" depends="init" unless="doc.zip.present">
+-		<antcall target="build.index"/>		
++		<!-- <antcall target="build.index"/> -->
+ 		<zip zipfile="${plugin.destination}/doc.zip"
+ 			basedir="${plugin.destination}"
+ 			includes="book.css, about.html, notices.html, no_help_exists.htm, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**"



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:33:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:33:54 -0500
Subject: rpms/fontconfig/devel .cvsignore, 1.20, 1.21 fontconfig.spec, 1.71,
	1.72 sources, 1.21, 1.22
Message-ID: <200602242033.k1OKXsYv005391@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/fontconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5315

Modified Files:
	.cvsignore fontconfig.spec sources 
Log Message:
2.3.94



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	11 Feb 2006 22:16:10 -0000	1.20
+++ .cvsignore	24 Feb 2006 20:33:50 -0000	1.21
@@ -5,3 +5,4 @@
 fontconfig-2.3.93.cvs20060207.tar.gz
 fontconfig-2.3.93.cvs20060208.tar.gz
 fontconfig-2.3.93.cvs20060211.tar.gz
+fontconfig-2.3.94.tar.gz


Index: fontconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- fontconfig.spec	11 Feb 2006 22:35:48 -0000	1.71
+++ fontconfig.spec	24 Feb 2006 20:33:50 -0000	1.72
@@ -2,7 +2,7 @@
 
 Summary: Font configuration and customization library
 Name: fontconfig
-Version: 2.3.93.cvs20060211
+Version: 2.3.94
 Release: 1
 License: MIT
 Group: System Environment/Libraries
@@ -135,6 +135,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.94-1
+- Update to 2.3.94
+
 * Wed Feb 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.3.93.cvs20060211-1
 - Newer cvs snapshot
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 Feb 2006 22:16:10 -0000	1.21
+++ sources	24 Feb 2006 20:33:50 -0000	1.22
@@ -1 +1 @@
-e1729d312e6ea35434b5cb92f5a5163d  fontconfig-2.3.93.cvs20060211.tar.gz
+362ca8b2168b20d30838700238015811  fontconfig-2.3.94.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:36:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:36:54 -0500
Subject: rpms/dbus/devel dbus-0.61-selinux-avc-audit.patch, NONE,
	1.1 .cvsignore, 1.17, 1.18 dbus.spec, 1.70, 1.71 sources, 1.17,
	1.18 dbus-0.60-selinux-avc-audit.patch, 1.1,
	NONE dbus-python-fix-callchain.patch, 1.1, NONE
Message-ID: <200602242036.k1OKasRW005838@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5777

Modified Files:
	.cvsignore dbus.spec sources 
Added Files:
	dbus-0.61-selinux-avc-audit.patch 
Removed Files:
	dbus-0.60-selinux-avc-audit.patch 
	dbus-python-fix-callchain.patch 
Log Message:
- Upgrade to upstream version 0.61
- remove python callchain patch
- update avc patch



dbus-0.61-selinux-avc-audit.patch:
 bus/selinux.c            |   38 ++++++++++++++++++++++++++++++++++++++
 configure.in             |   22 ++++++++++++++++++++++
 dbus/dbus-sysdeps-util.c |   30 ++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)

--- NEW FILE dbus-0.61-selinux-avc-audit.patch ---
--- dbus-0.61/dbus/dbus-sysdeps-util.c.selinux-avc-audit	2006-02-24 10:46:45.000000000 -0500
+++ dbus-0.61/dbus/dbus-sysdeps-util.c	2006-02-24 14:41:15.000000000 -0500
@@ -42,6 +42,10 @@
 #include <sys/socket.h>
 #include <dirent.h>
 #include <sys/un.h>
+#ifdef HAVE_LIBAUDIT
+#include <sys/prctl.h>
+#include <sys/capability.h>
+#endif /* HAVE_LIBAUDIT */
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -247,6 +251,12 @@
                         dbus_gid_t     gid,
                         DBusError     *error)
 {
+#ifdef HAVE_LIBAUDIT
+  int priv = !getuid();
+  if (priv)
+    prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);
+#endif /* HAVE_LIBAUDIT */
+
   /* setgroups() only works if we are a privileged process,
    * so we don't return error on failure; the only possible
    * failure is that we don't have perms to do it.
@@ -265,6 +275,10 @@
       dbus_set_error (error, _dbus_error_from_errno (errno),
                       "Failed to set GID to %lu: %s", gid,
                       _dbus_strerror (errno));
+#ifdef HAVE_LIBAUDIT
+      if (priv)
+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
+#endif /* HAVE_LIBAUDIT */
       return FALSE;
     }
   
@@ -273,9 +287,25 @@
       dbus_set_error (error, _dbus_error_from_errno (errno),
                       "Failed to set UID to %lu: %s", uid,
                       _dbus_strerror (errno));
+#ifdef HAVE_LIBAUDIT
+      if (priv)
+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
+#endif /* HAVE_LIBAUDIT */
       return FALSE;
     }
   
+#ifdef HAVE_LIBAUDIT
+    if (priv) {
+        cap_t new_caps;
+        cap_value_t cap_list[] = { CAP_AUDIT_WRITE };
+
+        prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0);
+        new_caps = cap_init();
+        cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET);
+        cap_set_flag(new_caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET);
+        cap_set_proc(new_caps);
+    }
+#endif /* HAVE_LIBAUDIT */
   return TRUE;
 }
 
--- dbus-0.61/bus/selinux.c.selinux-avc-audit	2006-02-24 14:41:15.000000000 -0500
+++ dbus-0.61/bus/selinux.c	2006-02-24 14:41:15.000000000 -0500
@@ -38,6 +38,9 @@
 #include <selinux/flask.h>
 #include <signal.h>
 #include <stdarg.h>
+#ifdef HAVE_LIBAUDIT
+#include <libaudit.h>
+#endif /* HAVE_LIBAUDIT */
 #endif /* HAVE_SELINUX */
 
 #define BUS_SID_FROM_SELINUX(sid)  ((BusSELinuxID*) (sid))
@@ -100,12 +103,40 @@
  * @param variable argument list
  */
 #ifdef HAVE_SELINUX
+#ifdef HAVE_LIBAUDIT
+static int audit_fd = -1;
+static void audit_init(void)
+{
+  audit_fd = audit_open();
+  if (audit_fd < 0) {
+    /* If kernel doesn't support audit, bail out */
+    if (errno == EINVAL || errno == EPROTONOSUPPORT || errno == EAFNOSUPPORT)
+      return;
+    /* If user bus, bail out */
+    if (errno == EPERM && getuid() != 0)
+      return;
+    _dbus_warn ("Failed opening connection to the audit subsystem");
+  }
+}
+#endif /* HAVE_LIBAUDIT */
+
 static void 
 log_callback (const char *fmt, ...) 
 {
   va_list ap;
   va_start(ap, fmt);
+#ifdef HAVE_LIBAUDIT
+  {
+     char buf[PATH_MAX*2];
+
+	/* FIXME: need to change this to show real user */
+     vsnprintf(buf, sizeof(buf), fmt, ap);
+     audit_log_user_avc_message(audit_fd, AUDIT_USER_AVC, buf, NULL, NULL,
+                                NULL, getuid());
+  }
+#else
   vsyslog (LOG_INFO, fmt, ap);
+#endif /* HAVE_LIBAUDIT */
   va_end(ap);
 }
 
@@ -313,6 +344,10 @@
 
   freecon (bus_context);
   
+#ifdef HAVE_LIBAUDIT
+  audit_init ();
+#endif /* HAVE_LIBAUDIT */
+
   return TRUE;
 #else
   return TRUE;
@@ -937,6 +972,9 @@
 #endif /* DBUS_ENABLE_VERBOSE_MODE */
 
       avc_destroy ();
+#ifdef HAVE_LIBAUDIT
+      audit_close (audit_fd);
+#endif /* HAVE_LIBAUDIT */
     }
 #endif /* HAVE_SELINUX */
 }
--- dbus-0.61/configure.in.selinux-avc-audit	2006-02-24 11:36:29.000000000 -0500
+++ dbus-0.61/configure.in	2006-02-24 14:55:17.000000000 -0500
@@ -67,6 +67,7 @@
 AC_ARG_ENABLE(mono_docs, AS_HELP_STRING([--enable-mono-docs],[build mono docs]),enable_mono_docs=$enableval,enable_mono_docs=no)
 AC_ARG_ENABLE(python, AS_HELP_STRING([--enable-python],[build python bindings]),enable_python=$enableval,enable_python=auto)
 AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux],[build with SELinux support]),enable_selinux=$enableval,enable_selinux=auto)
+AC_ARG_ENABLE(libaudit,          [  --enable-libaudit    build audit daemon support for SELinux],enable_libaudit=$enableval,enable_libaudit=auto)
 AC_ARG_ENABLE(dnotify, AS_HELP_STRING([--enable-dnotify],[build with dnotify support (linux only)]),enable_dnotify=$enableval,enable_dnotify=auto)
 
 AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
@@ -851,6 +852,27 @@
    AC_DEFINE(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX,1,[Use dnotify on Linux])
 fi
 
+# libaudit detection
+if test x$enable_libaudit = xno ; then
+    have_libaudit=no;
+else
+    # See if we have audit daemon & capabilities library
+    AC_CHECK_LIB(audit, audit_log_user_avc_message, 
+                 have_libaudit=yes, have_libaudit=no)
+    if test x$have_libaudit = xyes ; then
+        AC_CHECK_LIB(cap, cap_set_proc, 
+                 have_libaudit=yes, have_libaudit=no)
+    fi
+fi
+
+AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
+
+if test x$have_libaudit = xyes ; then
+    SELINUX_LIBS="$SELINUX_LIBS -laudit"
+    LIBS="-lcap $LIBS"
+    AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support])
+fi
+
 #### Set up final flags
 DBUS_CLIENT_CFLAGS=
 DBUS_CLIENT_LIBS=


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	1 Dec 2005 19:44:52 -0000	1.17
+++ .cvsignore	24 Feb 2006 20:36:51 -0000	1.18
@@ -10,3 +10,4 @@
 dbus-0.36.2.tar.gz
 dbus-0.50.tar.gz
 dbus-0.60.tar.gz
+dbus-0.61.tar.gz


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- dbus.spec	11 Feb 2006 02:23:43 -0000	1.70
+++ dbus.spec	24 Feb 2006 20:36:51 -0000	1.71
@@ -18,8 +18,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 0.60
-Release: 7.2 
+Version: 0.61
+Release: 1 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -46,9 +46,8 @@
 Conflicts: cups < 1:1.1.20-4
 
 Patch1: dbus-0.32-selinux_chroot_workaround.patch
-Patch2: dbus-0.60-selinux-avc-audit.patch
+Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
-Patch4: dbus-python-fix-callchain.patch 
 
 %description
 
@@ -135,7 +134,6 @@
 %patch1 -p1 -b .selinux_chroot_workaround
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
-%patch4 -p0 -b .python-callchain
 
 autoreconf -f -i
 
@@ -144,7 +142,7 @@
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 MONO_ARGS="--enable-mono"
 %endif
-COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-selinux=yes --disable-gtk --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} $MONO_ARGS"
+COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-selinux=yes --disable-gtk --disable-qt --disable-qt3 --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} $MONO_ARGS"
 
 if test -d %{_libdir}/qt-%{qt_basever} ; then
    export QTDIR=%{_libdir}/qt-%{qt_basever}
@@ -336,6 +334,11 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-1
+- Upgrade to upstream version 0.61
+- remove python callchain patch
+- update avc patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.60-7.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	1 Dec 2005 19:44:52 -0000	1.17
+++ sources	24 Feb 2006 20:36:51 -0000	1.18
@@ -1 +1 @@
-da9561b5e579cedddc34f53427e99a93  dbus-0.60.tar.gz
+cfd4f26004e4304e0dace4d82894e50b  dbus-0.61.tar.gz


--- dbus-0.60-selinux-avc-audit.patch DELETED ---


--- dbus-python-fix-callchain.patch DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 24 20:50:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 15:50:52 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.27,
	1.28 selinux-policy.spec, 1.129, 1.130
Message-ID: <200602242050.k1OKoqef024722@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24689

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                |   12 ++++++------
 policy/modules/admin/logwatch.te        |    2 ++
 policy/modules/admin/netutils.te        |    2 ++
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/admin/vpn.te             |    6 ++++++
 policy/modules/apps/java.if             |    8 ++------
 policy/modules/kernel/corecommands.fc   |    1 +
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.fc        |    1 +
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    2 +-
 policy/modules/services/apache.if       |   26 ++++++++++++++++++++++++++
 policy/modules/services/automount.te    |    7 +++++--
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/cups.fc         |    2 +-
 policy/modules/services/cups.te         |    2 +-
 policy/modules/services/hal.te          |    2 +-
 policy/modules/services/ktalk.te        |    3 +++
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/fstools.te        |    2 +-
 policy/modules/system/init.te           |    1 +
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/mount.te          |    2 +-
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    6 ++----
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 32 files changed, 100 insertions(+), 42 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- policy-20060207.patch	24 Feb 2006 18:39:09 -0000	1.27
+++ policy-20060207.patch	24 Feb 2006 20:50:49 -0000	1.28
@@ -233,7 +233,7 @@
  ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.21/policy/modules/services/apache.fc
 --- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-24 08:46:56.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-24 15:21:06.000000000 -0500
 @@ -45,7 +45,7 @@
  /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
  /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
@@ -243,16 +243,22 @@
  /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
  /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
  /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-@@ -75,3 +75,5 @@
- /var/www/cgi-bin(/.*)?			gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
- /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/w3c-markup-validator(/.*)?	gen_context(system_u:object_r:httpd_sys_content_t,s0)
-+/usr/share/w3c-markup-validator/cgi-bin(/.*)?	gen_context(system_u:object_r:httpd_sys_script_exec_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.21/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/apache.if	2006-02-23 09:41:46.000000000 -0500
-@@ -94,6 +94,7 @@
++++ serefpolicy-2.2.21/policy/modules/services/apache.if	2006-02-24 15:29:56.000000000 -0500
+@@ -12,6 +12,11 @@
+ ## </param>
+ #
+ template(`apache_content_template',`
++	gen_require(`
++		attribute httpdcontent;
++		attribute httpd_exec_scripts;
++		type httpd_t, httpd_suexec_t, httpd_log_t;
++	')
+ 	# allow write access to public file transfer
+ 	# services files.
+ 	gen_tunable(allow_httpd_$1_script_anon_write,false)
+@@ -94,6 +99,7 @@
  
  	corecmd_exec_bin(httpd_$1_script_t)
  	corecmd_exec_sbin(httpd_$1_script_t)
@@ -260,7 +266,7 @@
  
  	domain_exec_all_entry_files(httpd_$1_script_t)
  
-@@ -174,6 +175,7 @@
+@@ -174,6 +180,7 @@
  		dev_read_urand(httpd_$1_script_t)
  
  		fs_getattr_xattr_fs(httpd_$1_script_t)
@@ -268,7 +274,7 @@
  
  		files_read_etc_runtime_files(httpd_$1_script_t)
  		files_read_usr_files(httpd_$1_script_t)
-@@ -798,3 +800,22 @@
+@@ -798,3 +805,22 @@
  
  	allow $1 httpd_sys_script_t:dir search;
  ')


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- selinux-policy.spec	24 Feb 2006 18:39:09 -0000	1.129
+++ selinux-policy.spec	24 Feb 2006 20:50:49 -0000	1.130
@@ -10,7 +10,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,6 +293,9 @@
 
 %changelog
 
+* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-8
+- Fixes Apache interface file
+
 * Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-7
 - Fixes for new version of cups
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:35:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:35:50 -0500
Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.7,1.8
Message-ID: <200602242135.k1OLZoJO019411@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19381

Modified Files:
	xorg-x11-xkbdata.spec 
Log Message:
disable debuginfo


Index: xorg-x11-xkbdata.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-xkbdata.spec	24 Feb 2006 11:11:03 -0000	1.7
+++ xorg-x11-xkbdata.spec	24 Feb 2006 21:35:37 -0000	1.8
@@ -1,5 +1,8 @@
 %define pkgname xkbdata
 
+# INFO: Package contains data-only, no binaries, so no debuginfo is needed
+%define debug_package %{nil}
+
 Summary: xkb data files for the X.Org X11 X server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:41:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:41:14 -0500
Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec, 1.49,
	1.50 patch-tarball.sh, 1.7, 1.8
Message-ID: <200602242141.k1OLfEg3014057@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13956

Modified Files:
	gstreamer-plugins.spec patch-tarball.sh 
Log Message:
- Removed libgstspc from sources; NASM requirement currently makes 
  patching fo execshield impossible
 



Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gstreamer-plugins.spec	20 Feb 2006 20:28:05 -0000	1.49
+++ gstreamer-plugins.spec	24 Feb 2006 21:41:11 -0000	1.50
@@ -175,9 +175,6 @@
 %ifarch %{ix86} ia64 ppc ppc64 x86_64
 %{_libdir}/gstreamer-%{majmin}/libgst1394.*
 %endif
-%ifarch %{ix86} 
-%{_libdir}/gstreamer-%{majmin}/libgstspc.*
-%endif
 %{_libdir}/gstreamer-%{majmin}/libgstac3parse.*
 %{_libdir}/gstreamer-%{majmin}/libgstadder.*
 %{_libdir}/gstreamer-%{majmin}/libgstalpha.*
@@ -325,7 +322,8 @@
 - Removed execshield patch
 - Added libgstdvdsubdec.so, libgstfreeze.so, libgstimagemixer.so, 
   libgstvideo4linuxradio.so
-- Added libgstspc.so to x86
+- Removed libgstspc from sources; NASM requirement makes patching with 
+  execshield impossible
  
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and


Index: patch-tarball.sh
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/patch-tarball.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- patch-tarball.sh	27 Oct 2004 18:56:52 -0000	1.7
+++ patch-tarball.sh	24 Feb 2006 21:41:11 -0000	1.8
@@ -19,8 +19,8 @@
 echo "Extracting original tarball"
 tar -xjf $ORIGBALL
 
-MPEG_INFIXES="mpeg mpg mp3 mp2 mad"
-MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame"
+MPEG_INFIXES="mpeg mpg mp3 mp2 mad spc"
+MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame gst/spc"
 
 for mod in $MPEG_PATHS; do 
     echo rm -rf -- "$PKG/${mod}"



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:42:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:42:42 -0500
Subject: rpms/gstreamer-plugins/FC-4 removed-sources.txt,1.23,1.24
Message-ID: <200602242142.k1OLgghm014125@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv14112

Modified Files:
	removed-sources.txt 
Log Message:
- Removed libgstspc from sources; NASM requirement currently makes
  patching for execshield impossible
 



Index: removed-sources.txt
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/removed-sources.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- removed-sources.txt	14 Feb 2006 22:58:35 -0000	1.23
+++ removed-sources.txt	24 Feb 2006 21:42:39 -0000	1.24
@@ -1,5 +1,5 @@
---- origfiles.txt	2006-02-14 16:40:02.000000000 -0500
-+++ newfiles.txt	2006-02-14 16:40:14.000000000 -0500
+--- origfiles.txt	2006-02-23 16:13:42.000000000 -0500
++++ newfiles.txt	2006-02-23 16:13:54.000000000 -0500
 @@ -325,12 +325,6 @@
  gst-plugins-0.8.12/ext/ladspa/Makefile.in
  gst-plugins-0.8.12/ext/ladspa/search.c



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:48:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:48:06 -0500
Subject: rpms/xorg-x11-xkbdata/devel xkeyboard-config.spec, NONE,
	1.1.2.1 .cvsignore, 1.4, 1.4.2.1 sources, 1.4, 1.4.2.1
Message-ID: <200602242148.k1OLm6E5026860@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26845

Modified Files:
      Tag: private-xkeyboard-config
	.cvsignore sources 
Added Files:
      Tag: private-xkeyboard-config
	xkeyboard-config.spec 
Log Message:
xkeyboard-config branch fork


--- NEW FILE xkeyboard-config.spec ---
%define tarname xkeyboard-config
%define tarver  0.7
# 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
#Release: 1
Name: xorg-x11-xkbdata
Version: 1.0.1
# When rebuilding, bump the final digit only
Release: 4.%{tarver}.xkbcfg.1
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

BuildArch: noarch

BuildRequires: pkgconfig
BuildRequires: xorg-x11-util-macros
BuildRequires: xkbcomp

Provides: xkbdata
Provides: xkeyboard-config

%description
xkeyboard-config alternative xkb data files

%prep
%setup -q -n %{tarname}-%{tarver}

%build
%configure \
    --enable-compat-rules \
    --with-xkb-base=%{_datadir}/X11/xkb \
    --disable-xkbcomp-symlink

make

%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT
# Remove unnecessary symlink
rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled

# Create filelist
{
   FILESLIST=${PWD}/files.list
   pushd $RPM_BUILD_ROOT
   find ./usr/share/X11 -type d | sed -e "s/^\./%dir /g" > $FILESLIST
   find ./usr/share/X11 -type f | sed -e "s/^\.//g" >> $FILESLIST
   popd
}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f files.list
%defattr(-,root,root,-)

%changelog
* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-4.0.7.xkbcfg.1
- Package renamed to xorg-x11-xkbdata and version/release tweaked since it
  is too late to add new package names to Fedora Core 5 development.
- Added "Provides: xkeyboard-config" virtual provide.

* Fri Feb 24 2006 Mike A. Harris <mharris at redhat.com> 0.7-1
- Initial package created with xkeyboard-config-0.7.

* Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-3
- Added xkbdata-1.0.1-greek-fix-bug181313.patch to fix (#181313,181313)
- Added xkbdata-1.0.1-cz-fix-bug177362.patch to fix (#177362,178892)

* Thu Feb 09 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-2
- Added xkbdata-1.0.1-sysreq-fix-bug175661.patch to fix (#175661)

* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
- Updated to xbitmaps 1.0.1 from X11R7.0

* Sat Dec 17 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
- Updated to xbitmaps 1.0.0 from X11R7 RC4.

* Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-2
- Add a few missing rpm 'dir' directives to file manifest.
- Bump release, and build as a 'noarch' package.

* Fri Nov 11 2005 Mike A. Harris <mharris at redhat.com> 0.99.1-1
- Updated to xkbdata 0.99.1 from X11R7 RC2.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- .cvsignore	31 Jan 2006 15:36:32 -0000	1.4
+++ .cvsignore	24 Feb 2006 21:48:04 -0000	1.4.2.1
@@ -1 +1,2 @@
 xkbdata-1.0.1.tar.bz2
+xkeyboard-config-0.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/sources,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- sources	31 Jan 2006 15:36:32 -0000	1.4
+++ sources	24 Feb 2006 21:48:04 -0000	1.4.2.1
@@ -1 +1 @@
-9bf179be9a195953dc5f4c15e23ab7f0  xkbdata-1.0.1.tar.bz2
+a99e9aa576b34a03606118b96e858731  xkeyboard-config-0.7.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:51:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:51:13 -0500
Subject: rpms/xorg-x11-xkbdata/devel xkbdata-1.0.1-cz-fix-bug177362.patch,
	1.1, NONE xkbdata-1.0.1-greek-fix-bug181313.patch, 1.1,
	NONE xkbdata-1.0.1-sysreq-fix-bug175661.patch, 1.1,
	NONE xorg-x11-xkbdata.spec, 1.8, NONE
Message-ID: <200602242151.k1OLpDCS027046@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27034

Removed Files:
      Tag: private-xkeyboard-config
	xkbdata-1.0.1-cz-fix-bug177362.patch 
	xkbdata-1.0.1-greek-fix-bug181313.patch 
	xkbdata-1.0.1-sysreq-fix-bug175661.patch xorg-x11-xkbdata.spec 
Log Message:
removed dead files


--- xkbdata-1.0.1-cz-fix-bug177362.patch DELETED ---


--- xkbdata-1.0.1-greek-fix-bug181313.patch DELETED ---


--- xkbdata-1.0.1-sysreq-fix-bug175661.patch DELETED ---


--- xorg-x11-xkbdata.spec DELETED ---



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:52:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:52:18 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.3,
	1.1971.2.4 linux-2.6-execshield-vdso.patch, 1.2.20.1, 1.2.20.2
Message-ID: <200602242152.k1OLqIpc027097@cvs.devel.redhat.com>

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27084

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec linux-2.6-execshield-vdso.patch 
Log Message:
Execshield/vdso fixes (quintela at redhat.com)


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.3
retrieving revision 1.1971.2.4
diff -u -r1.1971.2.3 -r1.1971.2.4
--- kernel-2.6.spec	24 Feb 2006 19:56:47 -0000	1.1971.2.3
+++ kernel-2.6.spec	24 Feb 2006 21:52:14 -0000	1.1971.2.4
@@ -1593,6 +1593,7 @@
 * Fri Feb 24 2006 Stephen Tweedie <sct at redhat.com>
 - Disable ia64 until we work out the Xen interactions
 - Fix config confusion on ia64
+- Execshield/vdso fixes (quintela at redhat.com)
 
 * Mon Feb 20 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase kernel xen patches to xen-unstable cset 8907

linux-2.6-execshield-vdso.patch:
 linux-2.6.15.noarch/arch/i386/kernel/sysenter.c    |   71 +++++++++++--------
 linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c |    6 +
 linux/fs/binfmt_elf.c                              |   15 +---
 linux/fs/proc/task_mmu.c                           |    9 +-
 linux/include/asm-i386/elf.h                       |    7 +
 linux/include/asm-i386/page.h                      |    5 +
 linux/include/linux/mm.h                           |    5 +
 linux/kernel/sysctl.c                              |   10 ++
 linux/mm/mmap.c                                    |   78 +++++++++++++++++++++
 9 files changed, 163 insertions(+), 43 deletions(-)

Index: linux-2.6-execshield-vdso.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-vdso.patch,v
retrieving revision 1.2.20.1
retrieving revision 1.2.20.2
diff -u -r1.2.20.1 -r1.2.20.2
--- linux-2.6-execshield-vdso.patch	23 Feb 2006 21:36:14 -0000	1.2.20.1
+++ linux-2.6-execshield-vdso.patch	24 Feb 2006 21:52:15 -0000	1.2.20.2
@@ -34,7 +34,7 @@
  
  #ifdef CONFIG_X86_SYSENTER
  	if (boot_cpu_has(X86_FEATURE_SEP)) {
-@@ -82,42 +75,43 @@ int __init sysenter_setup(void)
+@@ -78,42 +71,60 @@ int __init sysenter_setup(void)
  
  extern void SYSENTER_RETURN_OFFSET;
  
@@ -56,10 +56,9 @@
 +	int err;
  
 -	if (unlikely(!vdso_enabled)) {
--		current->mm->context.vdso = NULL;
+ 		current->mm->context.vdso = NULL;
 -		return;
 -	}
-+	current->mm->context.vdso = NULL;
 +	if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0]))
 +		return 0;
  
@@ -77,14 +76,13 @@
 -			get_page(sysenter_page);
 -			install_page(current->mm, vma, addr,
 -					sysenter_page, vma->vm_page_prot);
--		}
 +	len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE;
 +	addr = get_unmapped_area_prot(NULL, 0, len, 0,
 +				      MAP_PRIVATE, 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,
@@ -97,14 +95,27 @@
  	up_write(&current->mm->mmap_sem);
 +	return err;
  }
--
+ 
 -static int __init vdso_setup(char *str)
--{
++#ifndef CONFIG_XEN
++int in_gate_area_no_task(unsigned long addr)
+ {
 -        vdso_enabled = simple_strtoul(str, NULL, 0);
 -        return 1;
--}
++	return 0;
+ }
 -__setup("vdso=", vdso_setup);
--
+ 
++int in_gate_area(struct task_struct *task, unsigned long addr)
++{
++	return 0;
++}
++
++struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
++{
++	return NULL;
++}
++#endif
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c
 --- linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c	2006-02-22 15:56:20.000000000 +0100
 +++ linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c	2006-02-22 18:26:45.000000000 +0100



From fedora-cvs-commits at redhat.com  Fri Feb 24 21:53:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 16:53:20 -0500
Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec,1.50,1.51
Message-ID: <200602242153.k1OLrK0X027144@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv27127

Modified Files:
	gstreamer-plugins.spec 
Log Message:
Bump release number to try build fix 



Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gstreamer-plugins.spec	24 Feb 2006 21:41:11 -0000	1.50
+++ gstreamer-plugins.spec	24 Feb 2006 21:53:17 -0000	1.51
@@ -6,7 +6,7 @@
 Version: 0.8.12
 %define majmin 0.8
 %define po_package gst-plugins-%{majmin}
-Release: 1
+Release: 2
 License: LGPL
 Group: Applications/Multimedia
 Source: gst-plugins-%{version}.patched.tar.bz2
@@ -315,6 +315,10 @@
 %{_libdir}/*so
 
 %changelog
+* Fri Feb 24 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-2
+- Removed libgstspc from sources; NASM requirement makes patching with 
+  execshield impossible
+
 * Tue Feb 15 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-1
 - Updated to upstream version
 - Removed unknown_file_type patch
@@ -322,8 +326,6 @@
 - Removed execshield patch
 - Added libgstdvdsubdec.so, libgstfreeze.so, libgstimagemixer.so, 
   libgstvideo4linuxradio.so
-- Removed libgstspc from sources; NASM requirement makes patching with 
-  execshield impossible
  
 * Wed Aug 11 2005 John (J5) Palmieri <johnp at redhat.com> - 0.8.8-9
 - Remove prelink requirement since we don't have it on x86_64 and



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:03:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:03:45 -0500
Subject: rpms/chkconfig/devel .cvsignore, 1.29, 1.30 chkconfig.spec, 1.36,
	1.37 sources, 1.30, 1.31
Message-ID: <200602242203.k1OM3jBA005364@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5302

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Feb 2006 16:15:36 -0000	1.29
+++ .cvsignore	24 Feb 2006 22:03:28 -0000	1.30
@@ -1 +1 @@
-chkconfig-1.3.27.tar.gz
+chkconfig-1.3.28.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- chkconfig.spec	13 Feb 2006 16:15:36 -0000	1.36
+++ chkconfig.spec	24 Feb 2006 22:03:28 -0000	1.37
@@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
-Version: 1.3.27
+Version: 1.3.28
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -75,6 +75,9 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
+* Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> 1.3.28-1
+- fix accidental enabling of services on --add (#182729)
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 1.3.27-1
 - translation updates
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Feb 2006 16:15:36 -0000	1.30
+++ sources	24 Feb 2006 22:03:28 -0000	1.31
@@ -1 +1 @@
-7ef65db5ebc9ec36d947af6bdb48682c  chkconfig-1.3.27.tar.gz
+6c3e01bfacdbe896974605a6b0665a21  chkconfig-1.3.28.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:04:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:04:52 -0500
Subject: rpms/dbus/devel dbus.spec,1.71,1.72
Message-ID: <200602242204.k1OM4q6K005502@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5445

Modified Files:
	dbus.spec 
Log Message:
- Add a Provides line to the mono package to get around an auto dep
  the buildsystem puts in
- Make sure chkconfig rests the priorities so we can start earlier




Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- dbus.spec	24 Feb 2006 20:36:51 -0000	1.71
+++ dbus.spec	24 Feb 2006 22:04:42 -0000	1.72
@@ -19,13 +19,14 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 1 
+Release: 2 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
-PreReq: chkconfig /usr/sbin/useradd
+PreReq: /usr/sbin/useradd
+Requires: chkconfig >= 1.3.26
 BuildPreReq: libtool
 #BuildRequires: redhat-release 
 BuildRequires: expat-devel >= %{expat_version}
@@ -123,7 +124,8 @@
 Summary: mono bindings for D-BUS
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
-                                                                                
+Provides: mono(dbus-sharp) = 0.60.0.0
+
 %description sharp
 D-BUS mono bindings for use with mono programs.   
 %endif
@@ -251,7 +253,8 @@
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add messagebus
+/sbin/chkconfig --add messagebus 
+/sbin/chkconfig messagebus resetpriorities
 
 %preun
 if [ $1 = 0 ]; then
@@ -334,6 +337,11 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
+- Add a Provides line to the mono package to get around an auto dep
+  the buildsystem puts in
+- Make sure chkconfig rests the priorities so we can start earlier
+
 * Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-1
 - Upgrade to upstream version 0.61
 - remove python callchain patch



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:06:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:06:56 -0500
Subject: rpms/dbus/devel dbus.spec,1.72,1.73
Message-ID: <200602242206.k1OM6u4a005825@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5754

Modified Files:
	dbus.spec 
Log Message:
- Remove provides as the Mono package requires the exact version



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- dbus.spec	24 Feb 2006 22:04:42 -0000	1.72
+++ dbus.spec	24 Feb 2006 22:06:53 -0000	1.73
@@ -124,7 +124,6 @@
 Summary: mono bindings for D-BUS
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
-Provides: mono(dbus-sharp) = 0.60.0.0
 
 %description sharp
 D-BUS mono bindings for use with mono programs.   
@@ -338,8 +337,6 @@
 
 %changelog
 * Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
-- Add a Provides line to the mono package to get around an auto dep
-  the buildsystem puts in
 - Make sure chkconfig rests the priorities so we can start earlier
 
 * Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-1



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:13:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:13:29 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc4-git7.bz2.sign, NONE,
	1.1 .cvsignore, 1.359, 1.360 kernel-2.6.spec, 1.1979,
	1.1980 sources, 1.301, 1.302 upstream, 1.276, 1.277
Message-ID: <200602242213.k1OMDTZY008605@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8547

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc4-git7.bz2.sign 
Log Message:
git7



--- NEW FILE patch-2.6.16-rc4-git7.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBD/q9ryGugalF9Dw4RAkmHAJ9Ce6p3Fx8d41v6lpTvvEwO/nioSwCgipL/
+Ya2TO561peiNnBH5TtvN+s=
=QAI6
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- .cvsignore	23 Feb 2006 19:46:24 -0000	1.359
+++ .cvsignore	24 Feb 2006 22:13:27 -0000	1.360
@@ -4,5 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git2.bz2
-patch-2.6.16-rc4-git6.bz2
+patch-2.6.16-rc4-git7.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1979
retrieving revision 1.1980
diff -u -r1.1979 -r1.1980
--- kernel-2.6.spec	24 Feb 2006 19:13:38 -0000	1.1979
+++ kernel-2.6.spec	24 Feb 2006 22:13:27 -0000	1.1980
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git6.bz2
+Patch2: patch-2.6.16-rc4-git7.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1591,6 +1591,9 @@
 %endif
 
 %changelog
+* Fri Feb 24 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git7
+
 * Fri Feb 24 2006 John W. Linville <linville at redhat.com>
 - Add/enable IPW2200_MONITOR config option for i686 and x86_64
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- sources	23 Feb 2006 19:46:24 -0000	1.301
+++ sources	24 Feb 2006 22:13:27 -0000	1.302
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-f6db62546c61933115c9055f6ae309e9  patch-2.6.16-rc4-git6.bz2
+379cd0b0aa8a507640636c09d949fc3f  patch-2.6.16-rc4-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- upstream	23 Feb 2006 19:46:24 -0000	1.276
+++ upstream	24 Feb 2006 22:13:27 -0000	1.277
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git6.bz2
+patch-2.6.16-rc4-git7.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:16:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:16:54 -0500
Subject: rpms/struts/devel struts.spec,1.28,1.29
Message-ID: <200602242216.k1OMGs1V018429@cvs.devel.redhat.com>

Author: rafaels

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18186

Modified Files:
	struts.spec 
Log Message:
Removed webapps-tomcat{3,4} subpackages.


Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- struts.spec	22 Feb 2006 04:46:42 -0000	1.28
+++ struts.spec	24 Feb 2006 22:16:51 -0000	1.29
@@ -1,9 +1,7 @@
 %define name		struts
 %define full_name	jakarta-%{name}
 %define version		1.2.8
-%define release 	2jpp_8fc
-%define tomcat3appsdir  %{_localstatedir}/tomcat3/webapps
-%define tomcat4appsdir  %{_localstatedir}/lib/tomcat4/webapps
+%define release 	2jpp_9fc
 %define tomcat5appsdir  %{_localstatedir}/lib/tomcat5/webapps
 %define tomcat5ctxdir   %{_sysconfdir}/tomcat5/Catalina/localhost
 %define section		free
@@ -88,28 +86,6 @@
 %description javadoc
 Javadoc for %{name}.
 
-%package webapps-tomcat3
-Summary:        Sample %{name} webapps for tomcat3
-Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Prereq:         tomcat3
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description webapps-tomcat3
-Sample %{name} webapps for tomcat3.
-
-%package webapps-tomcat4
-Summary:        Sample %{name} webapps for tomcat4
-Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Prereq:         tomcat4
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description webapps-tomcat4
-Sample %{name} webapps for tomcat4.
-
 %package webapps-tomcat5
 Summary:        Sample %{name} webapps for tomcat5
 Group:          Development/Java
@@ -166,34 +142,6 @@
 install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# tomcat 3 webapps
-install -d -m 755 $RPM_BUILD_ROOT%{tomcat3appsdir}
-for webapp in %{webapps}; do
-    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp
-    # tomcat3 doesn't support allowLinking, this might not work
-       # XXX: move to %%post/preun
-       for jar in %{webapplibs}; do
-        (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib \
-        && ln -sf ../../../../../..%{_javadir}/$jar.jar .)
-       done
-    (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF \
-    && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
-done
-
-# tomcat 4 webapps
-install -d -m 755 $RPM_BUILD_ROOT%{tomcat4appsdir}
-for webapp in %{webapps}; do
-    cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp
-    cat %{SOURCE2} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp.xml
-       # XXX: move to %%post/preun
-       for jar in %{webapplibs}; do
-        (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib \
-        && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
-    done
-    (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \
-    && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
-done
-
 # tomcat 5 webapps
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
 install -d -m 755 $RPM_BUILD_ROOT%{tomcat5ctxdir}
@@ -217,18 +165,6 @@
 %postun
 %{_bindir}/rebuild-gcj-db
 
-%post webapps-tomcat3
-%{_bindir}/rebuild-gcj-db
-
-%postun webapps-tomcat3
-%{_bindir}/rebuild-gcj-db
-
-%post webapps-tomcat4
-%{_bindir}/rebuild-gcj-db
-
-%postun webapps-tomcat4
-%{_bindir}/rebuild-gcj-db
-
 %post webapps-tomcat5
 %{_bindir}/rebuild-gcj-db
 
@@ -258,35 +194,6 @@
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 
-%files webapps-tomcat3
-%defattr(-,tomcat3,tomcat3)
-%dir %{tomcat3appsdir}/%{name}-blank
-%{tomcat3appsdir}/%{name}-blank/*
-%dir %{tomcat3appsdir}/%{name}-documentation
-%{tomcat3appsdir}/%{name}-documentation/*
-%dir %{tomcat3appsdir}/%{name}-example
-%{tomcat3appsdir}/%{name}-example/*
-%dir %{tomcat3appsdir}/%{name}-examples
-%{tomcat3appsdir}/%{name}-examples/*
-%dir %{tomcat3appsdir}/%{name}-tiles-documentation
-%{tomcat3appsdir}/%{name}-tiles-documentation/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
-
-%files webapps-tomcat4
-%defattr(-,tomcat,tomcat)
-%dir %{tomcat4appsdir}/%{name}-blank
-%{tomcat4appsdir}/%{name}-blank/*
-%dir %{tomcat4appsdir}/%{name}-documentation
-%{tomcat4appsdir}/%{name}-documentation/*
-%dir %{tomcat4appsdir}/%{name}-example
-%{tomcat4appsdir}/%{name}-example/*
-%dir %{tomcat4appsdir}/%{name}-examples
-%{tomcat4appsdir}/%{name}-examples/*
-%dir %{tomcat4appsdir}/%{name}-tiles-documentation
-%{tomcat4appsdir}/%{name}-tiles-documentation/*
-%{tomcat4appsdir}/%{name}-*.xml
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
-
 %files webapps-tomcat5
 %defattr(-,tomcat,tomcat)
 %dir %{tomcat5appsdir}/%{name}-blank
@@ -303,6 +210,9 @@
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
 
 %changelog
+* Fri Feb 24 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_9fc
+- Removed the webapps-tomcat{3,4} subpackages.
+
 * Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_8fc
 - Updated to 1.2.8
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:22:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:22:47 -0500
Subject: rpms/chkconfig/devel .cvsignore, 1.30, 1.31 chkconfig.spec, 1.37,
	1.38 sources, 1.31, 1.32
Message-ID: <200602242222.k1OMMlp0025354@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/chkconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25313

Modified Files:
	.cvsignore chkconfig.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	24 Feb 2006 22:03:28 -0000	1.30
+++ .cvsignore	24 Feb 2006 22:22:45 -0000	1.31
@@ -1 +1 @@
-chkconfig-1.3.28.tar.gz
+chkconfig-1.3.29.tar.gz


Index: chkconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/chkconfig.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- chkconfig.spec	24 Feb 2006 22:03:28 -0000	1.37
+++ chkconfig.spec	24 Feb 2006 22:22:45 -0000	1.38
@@ -1,6 +1,6 @@
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Name: chkconfig
-Version: 1.3.28
+Version: 1.3.29
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -75,7 +75,7 @@
 %{_mandir}/*/ntsysv.8*
 
 %changelog
-* Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> 1.3.28-1
+* Fri Feb 24 2006 Bill Nottingham <notting at redhat.com> 1.3.29-1
 - fix accidental enabling of services on --add (#182729)
 
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> 1.3.27-1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/chkconfig/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	24 Feb 2006 22:03:28 -0000	1.31
+++ sources	24 Feb 2006 22:22:45 -0000	1.32
@@ -1 +1 @@
-6c3e01bfacdbe896974605a6b0665a21  chkconfig-1.3.28.tar.gz
+2c23c361a0fd53d93203a47626eacd5e  chkconfig-1.3.29.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:25:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:25:19 -0500
Subject: rpms/gstreamer-plugins/FC-4 sources,1.25,1.26
Message-ID: <200602242225.k1OMPJb7026644@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26515

Modified Files:
	sources 
Log Message:
modified patched tarball



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	14 Feb 2006 22:58:35 -0000	1.25
+++ sources	24 Feb 2006 22:25:17 -0000	1.26
@@ -1,2 +1,2 @@
 1b99f623169cf62b70f3de081a633d14  Hermes-1.3.3.tar.bz2
-24f2f6b220cfc7afaa08a1d4fafeda62  gst-plugins-0.8.12.patched.tar.bz2
+f2add38adc16d2073e08f50f9d3671cd  gst-plugins-0.8.12.patched.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:42:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:42:53 -0500
Subject: rpms/gstreamer-plugins/FC-4 patch-tarball.sh,1.8,1.9
Message-ID: <200602242242.k1OMgrZn032197@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31967

Modified Files:
	patch-tarball.sh 
Log Message:
Correct path error in libspc




Index: patch-tarball.sh
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/patch-tarball.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- patch-tarball.sh	24 Feb 2006 21:41:11 -0000	1.8
+++ patch-tarball.sh	24 Feb 2006 22:42:50 -0000	1.9
@@ -20,7 +20,7 @@
 tar -xjf $ORIGBALL
 
 MPEG_INFIXES="mpeg mpg mp3 mp2 mad spc"
-MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame gst/spc"
+MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame ext/spc"
 
 for mod in $MPEG_PATHS; do 
     echo rm -rf -- "$PKG/${mod}"



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:44:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:44:50 -0500
Subject: rpms/gstreamer-plugins/FC-4 removed-sources.txt,1.24,1.25
Message-ID: <200602242244.k1OMiom7000523@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv404

Modified Files:
	removed-sources.txt 
Log Message:
Continue propogating path fix forward....




Index: removed-sources.txt
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/removed-sources.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- removed-sources.txt	24 Feb 2006 21:42:39 -0000	1.24
+++ removed-sources.txt	24 Feb 2006 22:44:46 -0000	1.25
@@ -1,5 +1,5 @@
---- origfiles.txt	2006-02-23 16:13:42.000000000 -0500
-+++ newfiles.txt	2006-02-23 16:13:54.000000000 -0500
+--- origfiles.txt	2006-02-24 17:43:18.000000000 -0500
++++ newfiles.txt	2006-02-24 17:43:30.000000000 -0500
 @@ -325,12 +325,6 @@
  gst-plugins-0.8.12/ext/ladspa/Makefile.in
  gst-plugins-0.8.12/ext/ladspa/search.c
@@ -63,7 +63,33 @@
  gst-plugins-0.8.12/ext/musepack/
  gst-plugins-0.8.12/ext/musepack/gstmusepackdec.c
  gst-plugins-0.8.12/ext/musepack/gstmusepackdec.h
-@@ -1097,72 +1055,6 @@
+@@ -504,25 +462,6 @@
+ gst-plugins-0.8.12/ext/sndfile/gstsf.h
+ gst-plugins-0.8.12/ext/sndfile/Makefile.am
+ gst-plugins-0.8.12/ext/sndfile/Makefile.in
+-gst-plugins-0.8.12/ext/spc/
+-gst-plugins-0.8.12/ext/spc/APU.Asm
+-gst-plugins-0.8.12/ext/spc/APU.h
+-gst-plugins-0.8.12/ext/spc/APU.Inc
+-gst-plugins-0.8.12/ext/spc/DSP.Asm
+-gst-plugins-0.8.12/ext/spc/DSP.h
+-gst-plugins-0.8.12/ext/spc/DSP.Inc
+-gst-plugins-0.8.12/ext/spc/gstspc.c
+-gst-plugins-0.8.12/ext/spc/gstspc.h
+-gst-plugins-0.8.12/ext/spc/Macro.Inc
+-gst-plugins-0.8.12/ext/spc/Makefile.am
+-gst-plugins-0.8.12/ext/spc/Makefile.in
+-gst-plugins-0.8.12/ext/spc/nasmnopic.sh
+-gst-plugins-0.8.12/ext/spc/SNESAPU.h
+-gst-plugins-0.8.12/ext/spc/SPC700.Asm
+-gst-plugins-0.8.12/ext/spc/SPC700.h
+-gst-plugins-0.8.12/ext/spc/SPC700.Inc
+-gst-plugins-0.8.12/ext/spc/spc.h
+-gst-plugins-0.8.12/ext/spc/Types.h
+ gst-plugins-0.8.12/ext/speex/
+ gst-plugins-0.8.12/ext/speex/gstspeex.c
+ gst-plugins-0.8.12/ext/speex/gstspeexdec.c
+@@ -1097,72 +1036,6 @@
  gst-plugins-0.8.12/gst/monoscope/monoscope.c
  gst-plugins-0.8.12/gst/monoscope/monoscope.h
  gst-plugins-0.8.12/gst/monoscope/README



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:46:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:46:25 -0500
Subject: rpms/gstreamer-plugins/FC-4 sources,1.26,1.27
Message-ID: <200602242246.k1OMkPQT008156@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv6156

Modified Files:
	sources 
Log Message:
Correct error in new patched tarball




Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	24 Feb 2006 22:25:17 -0000	1.26
+++ sources	24 Feb 2006 22:46:22 -0000	1.27
@@ -1,2 +1,2 @@
 1b99f623169cf62b70f3de081a633d14  Hermes-1.3.3.tar.bz2
-f2add38adc16d2073e08f50f9d3671cd  gst-plugins-0.8.12.patched.tar.bz2
+6f278bb3a380dda3154a21e3d6d3af9e  gst-plugins-0.8.12.patched.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 22:47:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 17:47:06 -0500
Subject: rpms/rhpl/devel .cvsignore, 1.56, 1.57 rhpl.spec, 1.68, 1.69 sources,
	1.61, 1.62
Message-ID: <200602242247.k1OMl6HH012925@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/rhpl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12181

Modified Files:
	.cvsignore rhpl.spec sources 
Log Message:
Bump version.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	15 Feb 2006 19:17:36 -0000	1.56
+++ .cvsignore	24 Feb 2006 22:47:03 -0000	1.57
@@ -4,3 +4,4 @@
 rhpl-0.180.tar.gz
 rhpl-0.181.tar.gz
 rhpl-0.182.tar.gz
+rhpl-0.183.tar.gz


Index: rhpl.spec
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- rhpl.spec	15 Feb 2006 19:17:36 -0000	1.68
+++ rhpl.spec	24 Feb 2006 22:47:03 -0000	1.69
@@ -1,6 +1,6 @@
 Summary: Library of python code used by programs in Red Hat Linux
 Name: rhpl
-Version: 0.182
+Version: 0.183
 Release: 1
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,6 +39,9 @@
 %{_libdir}/python?.?/site-packages/rhpl
 
 %changelog
+* Fri Feb 24 2006 Chris Lumens <clumens at redhat.com> 0.183-1
+- Fix keyboard layout switching (#173267).
+
 * Wed Feb 15 2006 David Cantrell <dcantrell at redhat.com> - 0.182-1
 - setxkbmap corrections for loading X keymaps (#179845)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rhpl/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	15 Feb 2006 19:17:36 -0000	1.61
+++ sources	24 Feb 2006 22:47:03 -0000	1.62
@@ -1 +1 @@
-80d2de9f42bb24007bfe1b9e537b4dbf  rhpl-0.182.tar.gz
+e93c6096585c1ab92c639734eeaf6533  rhpl-0.183.tar.gz



From fedora-cvs-commits at redhat.com  Fri Feb 24 23:10:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 18:10:54 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.96, 1.97 mkinitrd.spec, 1.109,
	1.110 sources, 1.105, 1.106
Message-ID: <200602242310.k1ONAsK6021033@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20981

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.28-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- .cvsignore	22 Feb 2006 22:38:51 -0000	1.96
+++ .cvsignore	24 Feb 2006 23:10:51 -0000	1.97
@@ -1 +1 @@
-mkinitrd-5.0.27.tar.bz2
+mkinitrd-5.0.28.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mkinitrd.spec	23 Feb 2006 02:34:27 -0000	1.109
+++ mkinitrd.spec	24 Feb 2006 23:10:52 -0000	1.110
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.27
+Version: 5.0.28
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -63,6 +63,15 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Fri Feb 24 2006 Peter Jones <pjones at redhat.com> - 5.0.28-1
+- Make /dev/efirtc on ia64 boxes (#182598)
+- Handle selinux contexts on /etc/blkid.tab* since we can't do it in
+  libblkid.
+- Make building from the "nash" subdir work again
+- Make getpathbyspec() allocate on the caller's stack, eliminating
+  several memory leaks in callers.
+- Don't strip nash
+
 * Wed Feb 22 2006 Peter Jones <pjones at redhat.com> - 5.0.27-1
 - Fix multiboot argument quoting in new-kernel-package (#182243)
 - Fix "netlink" fd error in hotplug initialization.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- sources	23 Feb 2006 02:34:34 -0000	1.105
+++ sources	24 Feb 2006 23:10:52 -0000	1.106
@@ -1 +1 @@
-f108123f6d5a97e883fd2ff83bd744b3  mkinitrd-5.0.27.tar.bz2
+16b842c2ac03adf52c184a138df75446  mkinitrd-5.0.28.tar.bz2



From fedora-cvs-commits at redhat.com  Fri Feb 24 23:11:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 18:11:10 -0500
Subject: rpms/dbus/devel dbus-0.61-mono-no-abi-version-change.patch, NONE,
	1.1 dbus.spec, 1.73, 1.74
Message-ID: <200602242311.k1ONBAk1021060@cvs.devel.redhat.com>

Author: johnp

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20958

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.61-mono-no-abi-version-change.patch 
Log Message:
- ABI hasn't changed so add patch that makes dbus-sharp think
  it is still 0.60 (mono uses hard version names so any change
  means apps need to recompile)


dbus-0.61-mono-no-abi-version-change.patch:
 AssemblyInfo.cs.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dbus-0.61-mono-no-abi-version-change.patch ---
--- dbus-0.61/mono/AssemblyInfo.cs.in.old-version	2006-02-24 18:04:34.000000000 -0500
+++ dbus-0.61/mono/AssemblyInfo.cs.in	2006-02-24 18:04:47.000000000 -0500
@@ -1,6 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
  
-[assembly:AssemblyVersion("@VERSION@")]
+[assembly:AssemblyVersion("0.60")]
 [assembly:AssemblyDelaySign(false)]
 [assembly:AssemblyKeyFile("@srcdir@/dbus-sharp.snk")]


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- dbus.spec	24 Feb 2006 22:06:53 -0000	1.73
+++ dbus.spec	24 Feb 2006 23:10:54 -0000	1.74
@@ -19,7 +19,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.61
-Release: 2 
+Release: 3
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -50,6 +50,9 @@
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
 
+#make sure we take this out if ABI changes
+Patch4: dbus-0.61-mono-no-abi-version-change.patch 
+
 %description
 
 D-BUS is a system for sending messages between applications. It is
@@ -136,6 +139,9 @@
 %patch2 -p1 -b .selinux-avc-audit
 %patch3 -p1 -b .start-early
 
+#make sure we take this out if ABI changes
+%patch4 -p1 -b .mono-no-abi-version-change
+
 autoreconf -f -i
 
 %build
@@ -337,6 +343,11 @@
 
 %changelog
 * Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
+- ABI hasn't changed so add patch that makes dbus-sharp think
+  it is still 0.60 (mono uses hard version names so any change
+  means apps need to recompile)
+
+* Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-2
 - Make sure chkconfig rests the priorities so we can start earlier
 
 * Fri Feb 24 2006 John (J5) Palmieri <johnp at redhat.com> 0.61-1



From fedora-cvs-commits at redhat.com  Fri Feb 24 23:23:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 18:23:12 -0500
Subject: rpms/udev/devel udev.spec,1.153,1.154
Message-ID: <200602242323.k1ONNCZ8005797@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5587

Modified Files:
	udev.spec 
Log Message:
- don't start udev in %post unless it's already running
- turn udev off in %preun before chkconfig --del
- changelog + release



Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- udev.spec	24 Feb 2006 16:14:11 -0000	1.153
+++ udev.spec	24 Feb 2006 23:23:09 -0000	1.154
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 084
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = 0:%{version}-%{release}
@@ -181,15 +181,23 @@
 
 %preun
 if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
+	if [ -x /sbin/pidof ]; then
+		pid=$(/sbin/pidof -x udevd)
+		if [ -n "$pid" ]; then
+			kill $pid
+		fi
+	fi
 	/sbin/chkconfig --del udev
 fi
 exit 0
 
 %post
-if [ "$1" -ge "1" -a  -x /sbin/pidof ]; then
-	pid=`/sbin/pidof -x udevd`
-	[ -n "$pid" ] && kill $pid
-	/sbin/udevd -d
+if [ "$1" -ge "1" -a -x /sbin/pidof ]; then
+	pid=$(/sbin/pidof -x udevd)
+	if [ -n "$pid" ]; then
+		kill $pid
+		/sbin/udevd -d
+	fi
 fi
 exit 0
 
@@ -276,6 +284,10 @@
 %attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
 
 %changelog
+* Fri Feb 24 2006 Peter Jones <pjones at redhat.com> - 084-7
+- Don't start udevd in %%post unless it's already running
+- Stop udevd before chkconfig --del in %%preun
+
 * Fri Feb 24 2006 Harald Hoyer <harald at redhat.com> - 084-6
 - put back original WAIT_FOR_SYSFS rule
 



From fedora-cvs-commits at redhat.com  Fri Feb 24 23:40:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 18:40:54 -0500
Subject: rpms/udev/devel udev.spec,1.154,1.155
Message-ID: <200602242340.k1ONesBU004081@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4065

Modified Files:
	udev.spec 
Log Message:
- input from notting WRT pidof arguments



Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- udev.spec	24 Feb 2006 23:23:09 -0000	1.154
+++ udev.spec	24 Feb 2006 23:40:51 -0000	1.155
@@ -182,7 +182,7 @@
 %preun
 if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
 	if [ -x /sbin/pidof ]; then
-		pid=$(/sbin/pidof -x udevd)
+		pid=$(/sbin/pidof -c udevd)
 		if [ -n "$pid" ]; then
 			kill $pid
 		fi
@@ -193,7 +193,7 @@
 
 %post
 if [ "$1" -ge "1" -a -x /sbin/pidof ]; then
-	pid=$(/sbin/pidof -x udevd)
+	pid=$(/sbin/pidof -c udevd)
 	if [ -n "$pid" ]; then
 		kill $pid
 		/sbin/udevd -d



From fedora-cvs-commits at redhat.com  Sat Feb 25 00:05:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 19:05:49 -0500
Subject: rpms/gnome-mount/devel gnome-mount-0.4-drive-mount.patch, NONE,
	1.1 gnome-mount.spec, 1.10, 1.11
Message-ID: <200602250005.k1P05n1a028137@cvs.devel.redhat.com>

Author: davidz

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28028

Modified Files:
	gnome-mount.spec 
Added Files:
	gnome-mount-0.4-drive-mount.patch 
Log Message:
* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-2
- Fix mounting of drives that HAL cannot poll



gnome-mount-0.4-drive-mount.patch:
 gnome-mount.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnome-mount-0.4-drive-mount.patch ---
Index: src/gnome-mount.c
===================================================================
RCS file: /cvs/gnome/gnome-mount/src/gnome-mount.c,v
retrieving revision 1.16
diff -u -r1.16 gnome-mount.c
--- src/gnome-mount.c	24 Feb 2006 05:22:47 -0000	1.16
+++ src/gnome-mount.c	25 Feb 2006 00:01:42 -0000
@@ -1689,7 +1689,8 @@
 			
 			goto out;
 
-		} else if (fsusage == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM) {
+		} else if (fsusage == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM ||
+			   fsusage == LIBHAL_VOLUME_USAGE_UNKNOWN) {
 			if (volume_mount (udi, volume, drive))
 				rc = 0;
 		}


Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-mount.spec	24 Feb 2006 17:43:47 -0000	1.10
+++ gnome-mount.spec	25 Feb 2006 00:05:45 -0000	1.11
@@ -1,10 +1,11 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
+Patch0: gnome-mount-0.4-drive-mount.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.60
@@ -24,6 +25,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q 
+%patch0 -p0 -b .drive-mount
 
 %build
 
@@ -58,6 +60,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-2
+- Fix mounting of drives that HAL cannot poll
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-1
 - Update to upstream version 0.4
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 01:06:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 20:06:31 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.226, 1.227 anaconda.spec, 1.347,
	1.348 sources, 1.346, 1.347
Message-ID: <200602250106.k1P16VGD009068@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9035/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.11-1 on branch devel from anaconda-10.92.11-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- .cvsignore	23 Feb 2006 23:34:40 -0000	1.226
+++ .cvsignore	25 Feb 2006 01:06:28 -0000	1.227
@@ -1 +1 @@
-anaconda-10.92.10.tar.bz2
+anaconda-10.92.11.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- anaconda.spec	23 Feb 2006 23:34:40 -0000	1.347
+++ anaconda.spec	25 Feb 2006 01:06:28 -0000	1.348
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.10
+Version: 10.92.11
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,11 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Fri Feb 24 2006 Jeremy Katz <katzj at redhat.com> - 10.92.11-1
+- fix traceback with segv handler (pjones)
+- various language fixes (dcantrel)
+- be clearer about askmethod (#182535)
+
 * Thu Feb 23 2006 Jeremy Katz <katzj at redhat.com> - 10.92.10-1
 - more bogl removal (dcantrel)
 - make the exception dumping less braindead about things we don't 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- sources	23 Feb 2006 23:34:40 -0000	1.346
+++ sources	25 Feb 2006 01:06:28 -0000	1.347
@@ -1 +1 @@
-4f3bc74eb741f976e1d3bd7e5e8e01da  anaconda-10.92.10.tar.bz2
+88fa377d281cb30f9c3dbbd71bd9d0d9  anaconda-10.92.11.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 25 01:47:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 20:47:08 -0500
Subject: rpms/glib2/devel glib-2.10.0-test.patch, NONE, 1.1 glib2.spec, 1.80,
	1.81
Message-ID: <200602250147.k1P1l8oo004651@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4636

Modified Files:
	glib2.spec 
Added Files:
	glib-2.10.0-test.patch 
Log Message:
fix threadpool test


glib-2.10.0-test.patch:
 threadpool-test.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE glib-2.10.0-test.patch ---
Index: tests/threadpool-test.c
===================================================================
RCS file: /cvs/gnome/glib/tests/threadpool-test.c,v
retrieving revision 1.9
diff -u -r1.9 threadpool-test.c
--- tests/threadpool-test.c	17 Jan 2006 20:06:27 -0000	1.9
+++ tests/threadpool-test.c	25 Feb 2006 01:44:39 -0000
@@ -162,12 +162,15 @@
 				     GUINT_TO_POINTER (69));
   }
   
+
+  g_thread_pool_set_max_threads (pool, 0, NULL);
   for (i = 0; i < limit; i++) {
     guint id;
 
     id = g_random_int_range (1, limit*2);
     g_thread_pool_push (pool, GUINT_TO_POINTER (id + 1), NULL);
   }
+  g_thread_pool_set_max_threads (pool, MAX_THREADS, NULL);
 
   g_assert (g_thread_pool_get_num_threads (pool) == g_thread_pool_get_max_threads (pool));
 }


Index: glib2.spec
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- glib2.spec	24 Feb 2006 20:08:09 -0000	1.80
+++ glib2.spec	25 Feb 2006 01:47:06 -0000	1.81
@@ -14,6 +14,8 @@
 Obsoletes: glib-gtkbeta
 URL: http://www.gtk.org
 
+Patch0: glib-2.10.0-test.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -37,6 +39,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p0 -b .test
 
 %build
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 03:01:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 22:01:45 -0500
Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner-2.13.91-iso.patch,
	NONE, 1.1 nautilus-cd-burner.spec, 1.48, 1.49
Message-ID: <200602250301.k1P31jDd027696@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27618

Modified Files:
	nautilus-cd-burner.spec 
Added Files:
	nautilus-cd-burner-2.13.91-iso.patch 
Log Message:
fix a problem with writing iso files


nautilus-cd-burner-2.13.91-iso.patch:
 nautilus-cd-burner.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

--- NEW FILE nautilus-cd-burner-2.13.91-iso.patch ---
diff -u -r1.180 -r1.181
--- nautilus-cd-burner.c	2006/02/10 17:11:15	1.180
+++ nautilus-cd-burner.c	2006/02/24 16:01:46	1.181
@@ -763,6 +763,34 @@
 	return TRUE;
 }
 
+static char *
+get_backing_file (const char *virtual_path)
+{
+	GnomeVFSHandle *handle;
+	GnomeVFSResult  res;
+	char           *escaped_path, *uri;
+	char           *mapping;
+
+	escaped_path = gnome_vfs_escape_path_string (virtual_path);
+	uri = g_strconcat ("burn:///", escaped_path, NULL);
+	g_free (escaped_path);
+	/* warning, this can hang on fifos etc */
+	res = gnome_vfs_open (&handle,
+			      uri,
+			      GNOME_VFS_OPEN_READ);
+	g_free (uri);
+	if (res == GNOME_VFS_OK) {
+		res =  gnome_vfs_file_control (handle,
+					       "mapping:get_mapping",
+					       &mapping);
+		gnome_vfs_close	(handle);
+		if (res == GNOME_VFS_OK) {
+			return mapping;
+		}
+	}
+	return NULL;
+}
+
 static gboolean
 estimate_size_callback (const char       *rel_path,
 			GnomeVFSFileInfo *info,
@@ -773,7 +801,7 @@
 	EstimateSizeCallbackData *cb_data = data;
 
 	if (file_info_is_image (info)) {
-		cb_data->image_paths = g_list_append (cb_data->image_paths, g_strdup (rel_path));
+		cb_data->image_paths = g_list_append (cb_data->image_paths, get_backing_file (rel_path));
 	} else {
 		cb_data->only_images = FALSE;
 	}
@@ -829,8 +857,9 @@
 		if (unreadable_paths) {
 			GList *l;
 			*unreadable_paths = NULL;
-			for (l = data->unreadable_paths; l; l = l->next)
+			for (l = data->unreadable_paths; l; l = l->next) {
 				*unreadable_paths = g_list_append (*unreadable_paths, g_strdup ((char *)l->data));
+			}
 		}
 
 		g_list_foreach (data->unreadable_paths, (GFunc)g_free, NULL);
@@ -841,8 +870,9 @@
 		if (image_paths) {
 			GList *l;
 			*image_paths = NULL;
-			for (l = data->image_paths; l; l = l->next)
+			for (l = data->image_paths; l; l = l->next) {
 				*image_paths = g_list_append (*image_paths, g_strdup ((char *)l->data));
+			}
 		}
 
 		g_list_foreach (data->image_paths, (GFunc)g_free, NULL);



Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nautilus-cd-burner.spec	15 Feb 2006 06:16:50 -0000	1.48
+++ nautilus-cd-burner.spec	25 Feb 2006 03:01:01 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
 Version: 2.13.91
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -25,6 +25,7 @@
 ExcludeArch: s390 s390x
 
 Patch0: nautilus-cd-burner-2.11.4-c++.patch
+Patch1: nautilus-cd-burner-2.13.91-iso.patch
 
 %description
 An easy to use CD burning package, well integrated with
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .c++
+%patch1 -p0 -b .iso
 
 %build
 ## all the autofoo crap is necessary since there is a broken
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
+- Fix a problem with writing iso images (#182358)
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 04:37:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 23:37:00 -0500
Subject: rpms/dasher/devel dasher.spec,1.32,1.33
Message-ID: <200602250437.k1P4b0mJ025560@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25460

Modified Files:
	dasher.spec 
Log Message:
Prereq scrollkeeper



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dasher.spec	20 Feb 2006 12:02:37 -0000	1.32
+++ dasher.spec	25 Feb 2006 04:36:56 -0000	1.33
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
 Version: 3.99.4
-Release: 2
+Release: 3
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -17,6 +17,7 @@
 BuildRequires: libwnck-devel >= 2.9.92
 BuildRequires: libXtst-devel
 
+Prereq:   scrollkeeper >= 0.1.4
 Requires: gnome-speech
 
 #Patch0: dasher-3.99.2-make-compile.patch
@@ -81,6 +82,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> 3.99.4-3
+- Prereq: scrollkeeper
+
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 3.99.4-2
 - BuildRequires: libXtst-devel
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 04:39:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Fri, 24 Feb 2006 23:39:46 -0500
Subject: rpms/GConf/devel GConf.spec,1.14,1.15
Message-ID: <200602250439.k1P4dklC026917@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26852

Modified Files:
	GConf.spec 
Log Message:
Prereq coreutils



Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GConf.spec	16 Feb 2006 03:44:53 -0000	1.14
+++ GConf.spec	25 Feb 2006 04:39:44 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: The Gnome Config System.
 Name: GConf
 Version: 1.0.9
-Release: 18.2.1
+Release: 19
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.gz
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org/projects/gconf/
 Prereq: /sbin/install-info
+Prereq: coreutils
 Prefix: /usr
 Requires: glib >= 1:1.2.0
 Requires: oaf >= 0.3.0
@@ -110,6 +111,9 @@
 %{_bindir}/gconf-config-1
 
 %changelog
+* Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.9-19
+- Prereq: coreutils
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1.0.9-18.2.1
 - rebump for build order issues during double-long bump
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 05:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 00:42:36 -0500
Subject: rpms/gtk2/devel .cvsignore, 1.45, 1.46 gtk2.spec, 1.124,
	1.125 sources, 1.48, 1.49
Message-ID: <200602250542.k1P5galB004088@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4019

Modified Files:
	.cvsignore gtk2.spec sources 
Log Message:
2.8.13



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	11 Feb 2006 20:32:23 -0000	1.45
+++ .cvsignore	25 Feb 2006 05:42:33 -0000	1.46
@@ -28,3 +28,4 @@
 gtk+-2.8.10.tar.bz2
 gtk+-2.8.11.tar.bz2
 gtk+-2.8.12.tar.bz2
+gtk+-2.8.13.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- gtk2.spec	24 Feb 2006 19:51:46 -0000	1.124
+++ gtk2.spec	25 Feb 2006 05:42:33 -0000	1.125
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.8.12
+%define base_version 2.8.13
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.
 Name: gtk2
 Version: %{base_version}
-Release: 8
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -26,6 +26,7 @@
 Patch0: gtk+-2.4.1-lib64.patch
 # Backported from 2.10
 Patch1: gtk+-2.8.6-inputmethod.patch
+# Fedora patch
 Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch
 
 BuildPrereq: atk-devel >= %{atk_version}
@@ -262,6 +263,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.13-1
+- Update to 2.8.13
+
 * Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 2.8.12-8
 - add dependency on hicolor
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	11 Feb 2006 20:32:23 -0000	1.48
+++ sources	25 Feb 2006 05:42:33 -0000	1.49
@@ -1,2 +1,2 @@
 d8c012f67a8f23fa9aa495fca5331784  update-scripts.tar.gz
-bdd3b950e4a3c65d61bceed9149888a9  gtk+-2.8.12.tar.bz2
+3b395d0b091d916d52cc1c2430407d35  gtk+-2.8.13.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 25 08:03:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 03:03:44 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc4-git8.bz2.sign, NONE,
	1.1 .cvsignore, 1.360, 1.361 kernel-2.6.spec, 1.1980,
	1.1981 sources, 1.302, 1.303 upstream, 1.277,
	1.278 patch-2.6.16-rc4-git7.bz2.sign, 1.1, NONE
Message-ID: <200602250803.k1P83ito032159@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32147

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc4-git8.bz2.sign 
Removed Files:
	patch-2.6.16-rc4-git7.bz2.sign 
Log Message:
2.6.16rc4-git8


--- NEW FILE patch-2.6.16-rc4-git8.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEAADryGugalF9Dw4RAp6cAJ9xPGEs8e65JlflMldYoXM+430vdQCgiIXo
Hpb8qxh77wj6nVF8wxPGL9k=
=MCg/
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- .cvsignore	24 Feb 2006 22:13:27 -0000	1.360
+++ .cvsignore	25 Feb 2006 08:03:13 -0000	1.361
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git7.bz2
+patch-2.6.16-rc4-git8.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -r1.1980 -r1.1981
--- kernel-2.6.spec	24 Feb 2006 22:13:27 -0000	1.1980
+++ kernel-2.6.spec	25 Feb 2006 08:03:28 -0000	1.1981
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git7.bz2
+Patch2: patch-2.6.16-rc4-git8.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1591,6 +1591,9 @@
 %endif
 
 %changelog
+* Sat Feb 25 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git8
+
 * Fri Feb 24 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- sources	24 Feb 2006 22:13:27 -0000	1.302
+++ sources	25 Feb 2006 08:03:30 -0000	1.303
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-379cd0b0aa8a507640636c09d949fc3f  patch-2.6.16-rc4-git7.bz2
+6e504160b675a6bf2153bd7276d0d219  patch-2.6.16-rc4-git8.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- upstream	24 Feb 2006 22:13:27 -0000	1.277
+++ upstream	25 Feb 2006 08:03:30 -0000	1.278
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git7.bz2
+patch-2.6.16-rc4-git8.bz2


--- patch-2.6.16-rc4-git7.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sat Feb 25 08:30:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 03:30:21 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1981,
	1.1982 linux-2.6-compile-fixes.patch, 1.53, 1.54
Message-ID: <200602250830.k1P8ULI6022577@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22539

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
build fix



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1981
retrieving revision 1.1982
diff -u -r1.1981 -r1.1982
--- kernel-2.6.spec	25 Feb 2006 08:03:28 -0000	1.1981
+++ kernel-2.6.spec	25 Feb 2006 08:30:16 -0000	1.1982
@@ -998,7 +998,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:
 Makefile |    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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linux-2.6-compile-fixes.patch	11 Feb 2006 21:07:24 -0000	1.53
+++ linux-2.6-compile-fixes.patch	25 Feb 2006 08:30:17 -0000	1.54
@@ -0,0 +1,11 @@
+--- linux-2.6.15.noarch/arch/x86_64/kernel/Makefile~	2006-02-25 03:29:04.000000000 -0500
++++ linux-2.6.15.noarch/arch/x86_64/kernel/Makefile	2006-02-25 03:29:35.000000000 -0500
+@@ -45,7 +45,7 @@ CFLAGS_vsyscall.o		:= $(PROFILING) -g0
+ 
+ bootflag-y			+= ../../i386/kernel/bootflag.o
+ cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
+-topology-y                     += ../../i386/mach-default/topology.o
++topology-y                     += ../../i386/kernel/topology.o
+ microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
+ intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
+ quirks-y			+= ../../i386/kernel/quirks.o



From fedora-cvs-commits at redhat.com  Sat Feb 25 09:05:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 04:05:46 -0500
Subject: rpms/kernel/devel linux-2.6-xen-merge.patch, 1.1,
	1.2 linux-2.6-xen.patch, 1.1, 1.2
Message-ID: <200602250905.k1P95ktc014296@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14247

Modified Files:
	linux-2.6-xen-merge.patch linux-2.6-xen.patch 
Log Message:
Gar!


linux-2.6-xen-merge.patch:
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   43 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 linux-2.6.15.i686/arch/i386/Kconfig              |   79 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61908 insertions(+), 818 deletions(-)

Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-merge.patch	13 Feb 2006 21:17:47 -0000	1.1
+++ linux-2.6-xen-merge.patch	25 Feb 2006 09:05:33 -0000	1.2
@@ -21505,7 +21505,7 @@
 +
 +obj-y				:= setup.o topology.o
 +  
-+topology-y			:= ../mach-default/topology.o
++topology-y			:= ../kernel/topology.o
 diff -r 52f446a807c8 -r 2905f31ca453 arch/i386/mach-xen/setup.c
 --- /dev/null	Thu Jan  1 00:00:00 1970 +0000
 +++ b/arch/i386/mach-xen/setup.c	Wed Feb  1 20:21:42 2006 -0500

linux-2.6-xen.patch:
 arch/xen/Kconfig                                      |  203 +
 arch/xen/Kconfig.debug                                |  129 
 arch/xen/Kconfig.drivers                              |   94 
 arch/xen/Makefile                                     |   91 
 arch/xen/boot/Makefile                                |    8 
 arch/xen/configs/xen0_defconfig_x86_32                | 1278 +++++++
 arch/xen/configs/xen0_defconfig_x86_64                | 1183 +++++++
 arch/xen/configs/xenU_defconfig_x86_32                |  564 +++
 arch/xen/configs/xenU_defconfig_x86_64                |  939 +++++
 arch/xen/configs/xen_defconfig_x86_32                 | 2998 ++++++++++++++++++
 arch/xen/configs/xen_defconfig_x86_64                 | 2425 ++++++++++++++
 arch/xen/i386/Kconfig                                 |  960 +++++
 arch/xen/i386/Makefile                                |  108 
 arch/xen/i386/kernel/Makefile                         |  102 
 arch/xen/i386/kernel/acpi/Makefile                    |   13 
 arch/xen/i386/kernel/acpi/boot.c                      |  912 +++++
 arch/xen/i386/kernel/apic.c                           |   83 
 arch/xen/i386/kernel/cpu/Makefile                     |   31 
 arch/xen/i386/kernel/cpu/common.c                     |  650 +++
 arch/xen/i386/kernel/cpu/mtrr/Makefile                |   16 
 arch/xen/i386/kernel/cpu/mtrr/main.c                  |  165 
 arch/xen/i386/kernel/entry.S                          |  753 ++++
 arch/xen/i386/kernel/head.S                           |  198 +
 arch/xen/i386/kernel/i386_ksyms.c                     |  190 +
 arch/xen/i386/kernel/init_task.c                      |   49 
 arch/xen/i386/kernel/io_apic.c                        | 2609 +++++++++++++++
 arch/xen/i386/kernel/ioport.c                         |  125 
 arch/xen/i386/kernel/irq.c                            |  299 +
 arch/xen/i386/kernel/ldt.c                            |  276 +
 arch/xen/i386/kernel/microcode.c                      |  163 
 arch/xen/i386/kernel/mpparse.c                        | 1126 ++++++
 arch/xen/i386/kernel/pci-dma.c                        |  315 +
 arch/xen/i386/kernel/process.c                        |  798 ++++
 arch/xen/i386/kernel/quirks.c                         |   49 
 arch/xen/i386/kernel/setup.c                          | 1712 ++++++++++
 arch/xen/i386/kernel/signal.c                         |  665 +++
 arch/xen/i386/kernel/smp.c                            |  624 +++
 arch/xen/i386/kernel/smpboot.c                        | 1640 +++++++++
 arch/xen/i386/kernel/swiotlb.c                        |  660 +++
 arch/xen/i386/kernel/time.c                           |  928 +++++
 arch/xen/i386/kernel/traps.c                          | 1026 ++++++
 arch/xen/i386/kernel/vsyscall.S                       |   15 
 arch/xen/i386/mach-default/Makefile                   |   12 
 arch/xen/i386/mm/Makefile                             |   24 
 arch/xen/i386/mm/fault.c                              |  598 +++
 arch/xen/i386/mm/highmem.c                            |   99 
 arch/xen/i386/mm/hypervisor.c                         |  416 ++
 arch/xen/i386/mm/init.c                               |  766 ++++
 arch/xen/i386/mm/ioremap.c                            |  424 ++
 arch/xen/i386/mm/pgtable.c                            |  558 +++
 arch/xen/i386/pci/Makefile                            |   33 
 arch/xen/i386/pci/irq.c                               | 1120 ++++++
 arch/xen/kernel/Makefile                              |   18 
 arch/xen/kernel/ctrl_if.c                             |  569 +++
 arch/xen/kernel/devmem.c                              |  158 
 arch/xen/kernel/evtchn.c                              |  803 ++++
 arch/xen/kernel/fixup.c                               |   87 
 arch/xen/kernel/gnttab.c                              |  396 ++
 arch/xen/kernel/reboot.c                              |  491 ++
 arch/xen/kernel/skbuff.c                              |   97 
 arch/xen/kernel/smp.c                                 |   16 
 arch/xen/kernel/xen_proc.c                            |   18 
 arch/xen/x86_64/Kconfig                               |  480 ++
 arch/xen/x86_64/Makefile                              |   93 
 arch/xen/x86_64/ia32/Makefile                         |   60 
 arch/xen/x86_64/ia32/ia32entry.S                      |  629 +++
 arch/xen/x86_64/ia32/syscall32.c                      |  149 
 arch/xen/x86_64/ia32/vsyscall-int80.S                 |   57 
 arch/xen/x86_64/kernel/Makefile                       |   71 
 arch/xen/x86_64/kernel/acpi/Makefile                  |   20 
 arch/xen/x86_64/kernel/apic.c                         |  201 +
 arch/xen/x86_64/kernel/e820.c                         |  609 +++
 arch/xen/x86_64/kernel/early_printk.c                 |  242 +
 arch/xen/x86_64/kernel/entry.S                        | 1060 ++++++
 arch/xen/x86_64/kernel/genapic.c                      |  123 
 arch/xen/x86_64/kernel/genapic_xen.c                  |  167 +
 arch/xen/x86_64/kernel/head.S                         |  272 +
 arch/xen/x86_64/kernel/head64.c                       |  127 
 arch/xen/x86_64/kernel/io_apic.c                      | 1991 +++++++++++
 arch/xen/x86_64/kernel/ioport.c                       |   57 
 arch/xen/x86_64/kernel/irq.c                          |  110 
 arch/xen/x86_64/kernel/ldt.c                          |  263 +
 arch/xen/x86_64/kernel/mpparse.c                      |  963 +++++
 arch/xen/x86_64/kernel/pci-nommu.c                    |   98 
 arch/xen/x86_64/kernel/process.c                      |  751 ++++
 arch/xen/x86_64/kernel/setup.c                        | 1467 ++++++++
 arch/xen/x86_64/kernel/setup64.c                      |  356 ++
 arch/xen/x86_64/kernel/signal.c                       |  493 ++
 arch/xen/x86_64/kernel/smp.c                          |  498 ++
 arch/xen/x86_64/kernel/smpboot.c                      | 1295 +++++++
 arch/xen/x86_64/kernel/traps.c                        |  982 +++++
 arch/xen/x86_64/kernel/vsyscall.c                     |  241 +
 arch/xen/x86_64/kernel/x8664_ksyms.c                  |  211 +
 arch/xen/x86_64/kernel/xen_entry.S                    |   41 
 arch/xen/x86_64/mm/Makefile                           |   31 
 arch/xen/x86_64/mm/fault.c                            |  589 +++
 arch/xen/x86_64/mm/init.c                             | 1026 ++++++
 arch/xen/x86_64/mm/pageattr.c                         |  254 +
 arch/xen/x86_64/pci/Makefile                          |   39 
 arch/xen/x86_64/pci/Makefile-BUS                      |   22 
 drivers/Makefile                                      |    1 
 drivers/acpi/tables.c                                 |    8 
 drivers/char/mem.c                                    |   12 
 drivers/char/tty_io.c                                 |    4 
 drivers/xen/Makefile                                  |   14 
 drivers/xen/balloon/Makefile                          |    2 
 drivers/xen/balloon/balloon.c                         |  499 ++
 drivers/xen/blkback/Makefile                          |    2 
 drivers/xen/blkback/blkback.c                         |  615 +++
 drivers/xen/blkback/common.h                          |  122 
 drivers/xen/blkback/interface.c                       |  162 
 drivers/xen/blkback/vbd.c                             |  224 +
 drivers/xen/blkback/xenbus.c                          |  303 +
 drivers/xen/blkfront/Kconfig                          |    6 
 drivers/xen/blkfront/Makefile                         |    3 
 drivers/xen/blkfront/blkfront.c                       | 1396 ++++++++
 drivers/xen/blkfront/block.h                          |  129 
 drivers/xen/blkfront/vbd.c                            |  367 ++
 drivers/xen/blktap/Makefile                           |    3 
 drivers/xen/blktap/blktap.c                           |   90 
 drivers/xen/blktap/blktap.h                           |  230 +
 drivers/xen/blktap/blktap_controlmsg.c                |  573 +++
 drivers/xen/blktap/blktap_datapath.c                  |  449 ++
 drivers/xen/blktap/blktap_userdev.c                   |  801 ++++
 drivers/xen/console/Makefile                          |    2 
 drivers/xen/console/console.c                         |  811 ++++
 drivers/xen/evtchn/Makefile                           |    2 
 drivers/xen/evtchn/evtchn.c                           |  430 ++
 drivers/xen/netback/Makefile                          |    2 
 drivers/xen/netback/common.h                          |  123 
 drivers/xen/netback/control.c                         |   58 
 drivers/xen/netback/interface.c                       |  465 ++
 drivers/xen/netback/loopback.c                        |  164 
 drivers/xen/netback/netback.c                         | 1005 ++++++
 drivers/xen/netfront/Kconfig                          |    6 
 drivers/xen/netfront/Makefile                         |    2 
 drivers/xen/netfront/netfront.c                       | 1658 +++++++++
 drivers/xen/privcmd/Makefile                          |    2 
 drivers/xen/privcmd/privcmd.c                         |  262 +
 drivers/xen/usbback/common.h                          |   84 
 drivers/xen/usbback/control.c                         |   61 
 drivers/xen/usbback/interface.c                       |  242 +
 drivers/xen/usbback/usbback.c                         | 1068 ++++++
 drivers/xen/usbfront/usbfront.c                       | 1736 ++++++++++
 drivers/xen/usbfront/xhci.h                           |  182 +
 drivers/xen/xenbus/Makefile                           |    6 
 drivers/xen/xenbus/xenbus_comms.c                     |  233 +
 drivers/xen/xenbus/xenbus_comms.h                     |   41 
 drivers/xen/xenbus/xenbus_probe.c                     |  648 +++
 drivers/xen/xenbus/xenbus_xs.c                        |  563 +++
 drivers/xen/xenbus/xenstored.h                        |   89 
 include/asm-generic/pgtable.h                         |   10 
 include/asm-xen/asm-i386/agp.h                        |   37 
 include/asm-xen/asm-i386/bug.h                        |   16 
 include/asm-xen/asm-i386/desc.h                       |  146 
 include/asm-xen/asm-i386/dma-mapping.h                |  156 
 include/asm-xen/asm-i386/fixmap.h                     |  168 +
 include/asm-xen/asm-i386/floppy.h                     |  147 
 include/asm-xen/asm-i386/highmem.h                    |   80 
 include/asm-xen/asm-i386/hw_irq.h                     |   71 
 include/asm-xen/asm-i386/hypercall.h                  |  579 +++
 include/asm-xen/asm-i386/io.h                         |  436 ++
 include/asm-xen/asm-i386/kmap_types.h                 |   32 
 include/asm-xen/asm-i386/mach-xen/irq_vectors.h       |  127 
 include/asm-xen/asm-i386/mach-xen/setup_arch_post.h   |   51 
 include/asm-xen/asm-i386/mach-xen/setup_arch_pre.h    |    5 
 include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h     |   55 
 include/asm-xen/asm-i386/mmu.h                        |   26 
 include/asm-xen/asm-i386/mmu_context.h                |  108 
 include/asm-xen/asm-i386/page.h                       |  252 +
 include/asm-xen/asm-i386/param.h                      |   23 
 include/asm-xen/asm-i386/pci.h                        |  114 
 include/asm-xen/asm-i386/pgalloc.h                    |   61 
 include/asm-xen/asm-i386/pgtable-2level-defs.h        |   21 
 include/asm-xen/asm-i386/pgtable-2level.h             |  126 
 include/asm-xen/asm-i386/pgtable-3level-defs.h        |   25 
 include/asm-xen/asm-i386/pgtable-3level.h             |  207 +
 include/asm-xen/asm-i386/pgtable.h                    |  493 ++
 include/asm-xen/asm-i386/processor.h                  |  703 ++++
 include/asm-xen/asm-i386/ptrace.h                     |   69 
 include/asm-xen/asm-i386/scatterlist.h                |   22 
 include/asm-xen/asm-i386/segment.h                    |   99 
 include/asm-xen/asm-i386/setup.h                      |   66 
 include/asm-xen/asm-i386/spinlock.h                   |  250 +
 include/asm-xen/asm-i386/swiotlb.h                    |   42 
 include/asm-xen/asm-i386/synch_bitops.h               |  140 
 include/asm-xen/asm-i386/system.h                     |  579 +++
 include/asm-xen/asm-i386/tlbflush.h                   |  102 
 include/asm-xen/asm-i386/vga.h                        |   20 
 include/asm-xen/asm-x86_64/arch_hooks.h               |   27 
 include/asm-xen/asm-x86_64/bootsetup.h                |   42 
 include/asm-xen/asm-x86_64/desc.h                     |  240 +
 include/asm-xen/asm-x86_64/dma-mapping.h              |    1 
 include/asm-xen/asm-x86_64/fixmap.h                   |  114 
 include/asm-xen/asm-x86_64/floppy.h                   |  204 +
 include/asm-xen/asm-x86_64/hw_irq.h                   |  138 
 include/asm-xen/asm-x86_64/hypercall.h                |  522 +++
 include/asm-xen/asm-x86_64/io.h                       |  374 ++
 include/asm-xen/asm-x86_64/irq.h                      |   36 
 include/asm-xen/asm-x86_64/mach-xen/io_ports.h        |   30 
 include/asm-xen/asm-x86_64/mach-xen/irq_vectors.h     |  125 
 include/asm-xen/asm-x86_64/mach-xen/mach_time.h       |  122 
 include/asm-xen/asm-x86_64/mach-xen/mach_timer.h      |   48 
 include/asm-xen/asm-x86_64/mach-xen/setup_arch_post.h |   47 
 include/asm-xen/asm-x86_64/mach-xen/setup_arch_pre.h  |    5 
 include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h   |   55 
 include/asm-xen/asm-x86_64/mmu_context.h              |  126 
 include/asm-xen/asm-x86_64/page.h                     |  236 +
 include/asm-xen/asm-x86_64/param.h                    |   22 
 include/asm-xen/asm-x86_64/pci.h                      |  150 
 include/asm-xen/asm-x86_64/pgalloc.h                  |  172 +
 include/asm-xen/asm-x86_64/pgtable.h                  |  576 +++
 include/asm-xen/asm-x86_64/processor.h                |  486 ++
 include/asm-xen/asm-x86_64/ptrace.h                   |  124 
 include/asm-xen/asm-x86_64/segment.h                  |   46 
 include/asm-xen/asm-x86_64/smp.h                      |  139 
 include/asm-xen/asm-x86_64/system.h                   |  405 ++
 include/asm-xen/asm-x86_64/timer.h                    |   64 
 include/asm-xen/asm-x86_64/tlbflush.h                 |   97 
 include/asm-xen/asm-x86_64/vga.h                      |   20 
 include/asm-xen/asm-x86_64/xor.h                      |  328 +
 include/asm-xen/balloon.h                             |   60 
 include/asm-xen/ctrl_if.h                             |  160 
 include/asm-xen/evtchn.h                              |  135 
 include/asm-xen/foreign_page.h                        |   30 
 include/asm-xen/gnttab.h                              |   72 
 include/asm-xen/hypervisor.h                          |  195 +
 include/asm-xen/linux-public/privcmd.h                |   90 
 include/asm-xen/linux-public/suspend.h                |   43 
 include/asm-xen/queues.h                              |   81 
 include/asm-xen/synch_bitops.h                        |    2 
 include/asm-xen/xen-public/COPYING                    |   28 
 include/asm-xen/xen-public/acm.h                      |  172 +
 include/asm-xen/xen-public/acm_ops.h                  |   66 
 include/asm-xen/xen-public/arch-ia64.h                |  299 +
 include/asm-xen/xen-public/arch-x86_32.h              |  137 
 include/asm-xen/xen-public/arch-x86_64.h              |  195 +
 include/asm-xen/xen-public/dom0_ops.h                 |  414 ++
 include/asm-xen/xen-public/event_channel.h            |  191 +
 include/asm-xen/xen-public/grant_table.h              |  284 +
 include/asm-xen/xen-public/io/blkif.h                 |   71 
 include/asm-xen/xen-public/io/domain_controller.h     |  787 ++++
 include/asm-xen/xen-public/io/ioreq.h                 |   70 
 include/asm-xen/xen-public/io/netif.h                 |  108 
 include/asm-xen/xen-public/io/ring.h                  |  199 +
 include/asm-xen/xen-public/io/usbif.h                 |   66 
 include/asm-xen/xen-public/io/vmx_vlapic.h            |   57 
 include/asm-xen/xen-public/physdev.h                  |   70 
 include/asm-xen/xen-public/sched_ctl.h                |   58 
 include/asm-xen/xen-public/trace.h                    |   73 
 include/asm-xen/xen-public/version.h                  |   31 
 include/asm-xen/xen-public/vmx_assist.h               |  101 
 include/asm-xen/xen-public/xen.h                      |  469 ++
 include/asm-xen/xen_proc.h                            |   13 
 include/asm-xen/xenbus.h                              |  141 
 include/linux/gfp.h                                   |    6 
 include/linux/highmem.h                               |    2 
 include/linux/irq.h                                   |    1 
 include/linux/mm.h                                    |    7 
 include/linux/skbuff.h                                |    2 
 kernel/irq/manage.c                                   |   83 
 mm/highmem.c                                          |    9 
 mm/memory.c                                           |  118 
 mm/mmap.c                                             |    4 
 mm/page_alloc.c                                       |    6 
 net/core/dev.c                                        |   35 
 net/core/skbuff.c                                     |    2 
 267 files changed, 81974 insertions(+), 27 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen.patch	15 Oct 2005 01:07:29 -0000	1.1
+++ linux-2.6-xen.patch	25 Feb 2006 09:05:34 -0000	1.2
@@ -35668,7 +35668,7 @@
 +
 +bootflag-y			+= ../../../i386/kernel/bootflag.o
 +cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../../i386/kernel/cpuid.o
-+topology-y                     += ../../../i386/mach-default/topology.o
++topology-y                     += ../../../i386/kernel/topology.o
 +#swiotlb-$(CONFIG_SWIOTLB)      += ../../../ia64/lib/swiotlb.o
 +microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../../i386/kernel/microcode.o
 +intel_cacheinfo-y		+= ../../../i386/kernel/cpu/intel_cacheinfo.o



From fedora-cvs-commits at redhat.com  Sat Feb 25 09:29:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 04:29:32 -0500
Subject: rpms/texi2html/devel texi2html.spec,1.6,1.7
Message-ID: <200602250929.k1P9TWst003797@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/texi2html/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3725

Modified Files:
	texi2html.spec 
Log Message:
* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 1.76-3
- PreReq info (#182888)



Index: texi2html.spec
===================================================================
RCS file: /cvs/dist/rpms/texi2html/devel/texi2html.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- texi2html.spec	9 Dec 2005 22:43:35 -0000	1.6
+++ texi2html.spec	25 Feb 2006 09:29:28 -0000	1.7
@@ -1,6 +1,6 @@
 Name: texi2html
 Version: 1.76
-Release: 2.1
+Release: 3
 License: GPL
 Group: Applications/Text
 Summary: A highly customizable texinfo to HTML and other formats translator
@@ -9,6 +9,7 @@
 Patch0: texi2html-1.74-Makefile.am.patch
 Patch1: texi2html-1.74-UTF-8.patch
 URL: http://texi2html.cvshome.org/
+PreReq: info
 Requires: perl >= 5.004
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArch: noarch
@@ -77,6 +78,9 @@
 %{_datadir}/%{name}/images/*
 
 %changelog
+* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 1.76-3
+- PreReq info (#182888)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 09:49:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 04:49:07 -0500
Subject: rpms/tetex/devel tetex.spec,1.84,1.85
Message-ID: <200602250949.k1P9n7pP022623@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/tetex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22523

Modified Files:
	tetex.spec 
Log Message:
* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 3.0-17
- PreReq: info (#182886, #182887)



Index: tetex.spec
===================================================================
RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- tetex.spec	11 Feb 2006 05:49:38 -0000	1.84
+++ tetex.spec	25 Feb 2006 09:49:04 -0000	1.85
@@ -11,7 +11,7 @@
 Summary: The TeX text formatting system.
 Name: tetex
 Version: 3.0
-Release: 16.2
+Release: 17
 License: distributable
 Group: Applications/Publishing
 Requires: tmpwatch, dialog, ed
@@ -171,6 +171,7 @@
 %package dvips
 Summary: A DVI to PostScript converter for the TeX text formatting system.
 Group: Applications/Publishing
+PreReq: info
 Requires: tetex-fonts = %{version}
 Requires: psutils
 
@@ -211,6 +212,7 @@
 %package fonts
 Summary: The font files for the TeX text formatting system.
 Group: Applications/Publishing
+PreReq: info
 %if %{enable_japanese}
 Obsoletes: pTeX-jtfms, pTeX-tfms
 %endif
@@ -789,6 +791,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 3.0-17
+- PreReq: info (#182886, #182887)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.0-16.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 11:35:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 06:35:10 -0500
Subject: rpms/mc/devel mc-etcmc.patch, NONE, 1.1 mc-utf8.patch, 1.18,
	1.19 mc.spec, 1.80, 1.81
Message-ID: <200602251135.k1PBZAb0024298@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24148

Modified Files:
	mc-utf8.patch mc.spec 
Added Files:
	mc-etcmc.patch 
Log Message:
* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-8
- make mc FHS compliant: store config files in /etc/mc and
  extfs/*.ini files in /etc/mc/extfs instead of /usr/share/mc
  (#2188) - the oldest open Red Hat bug is now gone ;)
- fix warnings


mc-etcmc.patch:
 edit/editcmd.c  |   17 ++++++++++-------
 edit/syntax.c   |    8 +++++++-
 src/Makefile.am |    6 ++++--
 src/Makefile.in |    5 +++--
 src/charsets.c  |    7 ++++++-
 src/cmd.c       |   18 ++++++++++++++++--
 src/ext.c       |    4 ++++
 src/main.c      |   11 ++++++++---
 src/main.h      |    2 +-
 src/setup.c     |   14 +++++++++++++-
 src/user.c      |    5 +++++
 src/util.c      |   25 +++++++++++++++++--------
 vfs/extfs.c     |    6 +++---
 13 files changed, 97 insertions(+), 31 deletions(-)

--- NEW FILE mc-etcmc.patch ---
--- mc-4.6.1a/src/charsets.c.etcmc	2005-05-27 05:35:15.000000000 +0200
+++ mc-4.6.1a/src/charsets.c	2006-02-24 15:17:05.000000000 +0100
@@ -45,12 +45,17 @@ load_codepages_list (void)
     char *fname;
     char buf[256];
     extern char *mc_home;
+    extern char *mc_home_alt;
     extern int display_codepage;
     char *default_codepage = NULL;
 
     fname = concat_dir_and_file (mc_home, CHARSETS_INDEX);
     if (!(f = fopen (fname, "r"))) {
-	fprintf (stderr, _("Warning: file %s not found\n"), fname);
+        g_free (fname);
+        fname = concat_dir_and_file (mc_home_alt, CHARSETS_INDEX);
+        if (!(f = fopen (fname, "r"))) {
+	    fprintf (stderr, _("Warning: file %s not found\n"), fname);
+        }
 	g_free (fname);
 	return -1;
     }
--- mc-4.6.1a/src/main.h.etcmc	2006-02-24 15:17:05.000000000 +0100
+++ mc-4.6.1a/src/main.h	2006-02-24 15:17:05.000000000 +0100
@@ -112,7 +112,7 @@ void print_vfs_message(const char *msg, 
 
 extern const char *prompt;
 extern const char *edit_one_file;
-extern char *mc_home;
+extern char *mc_home, *mc_home_alt;
 char *get_mc_lib_dir (void);
 
 int maybe_cd (int move_up_dir);
--- mc-4.6.1a/src/ext.c.etcmc	2005-07-31 22:29:35.000000000 +0200
+++ mc-4.6.1a/src/ext.c	2006-02-24 15:17:05.000000000 +0100
@@ -444,6 +444,10 @@ regex_command (const char *filename, con
 	    g_free (extension_file);
 	  check_stock_mc_ext:
 	    extension_file = concat_dir_and_file (mc_home, MC_LIB_EXT);
+	    if (!exist_file (extension_file)) {
+	    	g_free (extension_file);
+	    	extension_file = concat_dir_and_file (mc_home_alt, MC_LIB_EXT);
+	    }
 	    mc_user_ext = 0;
 	}
 	data = load_file (extension_file);
--- mc-4.6.1a/src/setup.c.etcmc	2006-01-29 21:26:05.000000000 +0100
+++ mc-4.6.1a/src/setup.c	2006-02-24 15:17:05.000000000 +0100
@@ -481,8 +481,15 @@ setup_init (void)
 	if (exist_file (inifile)){
 	    g_free (profile);
 	    profile = inifile;
-	} else
+	} else {
 	    g_free (inifile);
+	    inifile = concat_dir_and_file (mc_home_alt, "mc.ini");
+	    if (exist_file (inifile)) {
+	        g_free (profile);
+	        profile = inifile;
+	    } else 
+	        g_free (inifile);
+	}
     }
 
     profile_name = profile;
@@ -501,6 +508,11 @@ load_setup (void)
     /* mc.lib is common for all users, but has priority lower than
        ~/.mc/ini.  FIXME: it's only used for keys and treestore now */
     global_profile_name = concat_dir_and_file (mc_home, "mc.lib");
+    
+    if (!exist_file(global_profile_name)) {
+    	g_free (global_profile_name);
+    	global_profile_name = concat_dir_and_file (mc_home_alt, "mc.lib");
+    }
 
     /* Load integer boolean options */
     for (i = 0; int_options[i].opt_name; i++)
--- mc-4.6.1a/src/Makefile.am.etcmc	2006-02-04 12:13:30.000000000 +0100
+++ mc-4.6.1a/src/Makefile.am	2006-02-24 15:17:05.000000000 +0100
@@ -8,9 +8,11 @@ bin_PROGRAMS = mc mcmfmt
 if CONS_SAVER
 pkglibexec_PROGRAMS = cons.saver
 AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
-	-DSAVERDIR=\""$(pkglibexecdir)"\"
+	-DSAVERDIR=\""$(pkglibexecdir)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
 else
-AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
+AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
 endif
 
 noinst_PROGRAMS = man2hlp
--- mc-4.6.1a/src/util.c.etcmc	2006-02-24 15:17:05.000000000 +0100
+++ mc-4.6.1a/src/util.c	2006-02-24 15:17:05.000000000 +0100
@@ -40,7 +40,7 @@
 #include "tty.h"
 #include "global.h"
 #include "profile.h"
-#include "main.h"		/* mc_home */
+#include "main.h"		/* mc_home, mc_home_alt */
 #include "cmd.h"		/* guess_message_value */
 #include "mountlist.h"
 #include "win.h"		/* xterm_flag */
@@ -950,16 +950,25 @@ load_mc_home_file (const char *filename,
 
     if (!data) {
 	g_free (hintfile);
-	/* Fall back to the two-letter language code */
-	if (lang[0] && lang[1])
-	    lang[2] = 0;
+	g_free (hintfile_base);
+
+	hintfile_base = concat_dir_and_file (mc_home_alt, filename);
+
 	hintfile = g_strconcat (hintfile_base, ".", lang, (char *) NULL);
 	data = load_file (hintfile);
-
+	
 	if (!data) {
-	    g_free (hintfile);
-	    hintfile = hintfile_base;
-	    data = load_file (hintfile_base);
+	    /* Fall back to the two-letter language code */
+	    if (lang[0] && lang[1])
+	        lang[2] = 0;
+	    hintfile = g_strconcat (hintfile_base, ".", lang, (char *) NULL);
+	    data = load_file (hintfile);
+
+	    if (!data) {
+	        g_free (hintfile);
+	        hintfile = hintfile_base;
+	        data = load_file (hintfile_base);
+	    }
 	}
     }
 
--- mc-4.6.1a/src/cmd.c.etcmc	2006-02-04 12:12:28.000000000 +0100
+++ mc-4.6.1a/src/cmd.c	2006-02-24 15:17:05.000000000 +0100
@@ -570,8 +570,13 @@ void ext_cmd (void)
 	check_for_default (extdir, buffer);
 	do_edit (buffer);
 	g_free (buffer);
-    } else if (dir == 1)
+    } else if (dir == 1) {
+    	if (!exist_file(extdir)) {
+	    g_free (extdir);
+	    extdir = concat_dir_and_file (mc_home_alt, MC_LIB_EXT);
+	}
 	do_edit (extdir);
+    }
 
    g_free (extdir);
    flush_extension_file ();
@@ -594,6 +599,11 @@ menu_edit_cmd (int where)
     );
 
     menufile = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+    
+    if (!exist_file(menufile)) {
+    	g_free (menufile);
+    	menufile = concat_dir_and_file (mc_home_alt, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+    }
 
     switch (dir) {
 	case 0:
@@ -608,6 +618,10 @@ menu_edit_cmd (int where)
 	
 	case 2:
 	    buffer = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+	    if (!exist_file(buffer)) {
+	        g_free (buffer);
+	        buffer = concat_dir_and_file (mc_home_alt, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+	    }
 	    break;
 
 	default:
@@ -666,7 +680,7 @@ edit_syntax_cmd (void)
 			  _(" Which syntax file you want to edit? "), 0, 2,
 			  _("&User"), _("&System Wide"));
     }
-    extdir = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax");
+    extdir = concat_dir_and_file (mc_home_alt, "syntax" PATH_SEP_STR "Syntax");
 
     if (dir == 0) {
 	buffer = concat_dir_and_file (home_dir, SYNTAX_FILE);
--- mc-4.6.1a/src/main.c.etcmc	2006-02-24 15:17:05.000000000 +0100
+++ mc-4.6.1a/src/main.c	2006-02-24 15:17:05.000000000 +0100
@@ -282,9 +282,12 @@ gboolean is_utf8 = FALSE;
 /* The xterm title */
 char *xterm_title_str = NULL;
 
-/* mc_home: The home of MC */
+/* mc_home: The home of MC - /etc/mc or defined by MC_DATADIR */
 char *mc_home = NULL;
 
+/* mc_home_alt: Alternative home of MC - deprecated /usr/share/mc */
+char *mc_home_alt = NULL;
+
 char cmd_buf[512];
 
 static void
@@ -1817,8 +1820,9 @@ OS_Setup (void)
     if ((mc_libdir = getenv ("MC_DATADIR")) != NULL) {
 	mc_home = g_strdup (mc_libdir);
     } else {
-	mc_home = g_strdup (DATADIR);
+	mc_home = g_strdup (SYSCONFDIR);
     }
+    mc_home_alt = mc_libdir != NULL ? g_strdup (SYSCONFDIR) : g_strdup (DATADIR);
 }
 
 static void
@@ -1948,7 +1952,7 @@ process_args (poptContext ctx, int c, co
 	break;
 
     case 'f':
-	printf ("%s\n", mc_home);
+	printf ("%s (%s)\n", mc_home, mc_home_alt);
 	exit (0);
 	break;
 
@@ -2326,6 +2330,7 @@ main (int argc, char *argv[])
     }
     g_free (last_wd_string);
 
+    g_free (mc_home_alt);
     g_free (mc_home);
     done_key ();
 #ifdef HAVE_CHARSET
--- mc-4.6.1a/src/Makefile.in.etcmc	2006-02-15 21:12:44.000000000 +0100
+++ mc-4.6.1a/src/Makefile.in	2006-02-24 15:17:05.000000000 +0100
@@ -314,9 +314,10 @@ target_alias = @target_alias@
 AM_CFLAGS = $(GLIB_CFLAGS)
 localedir = $(datadir)/locale
 pkglibexecdir = $(libexecdir)/@PACKAGE@
- at CONS_SAVER_FALSE@AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
+ at CONS_SAVER_FALSE@AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
+ at CONS_SAVER_FALSE@	-DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
 @CONS_SAVER_TRUE at AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
- at CONS_SAVER_TRUE@	-DSAVERDIR=\""$(pkglibexecdir)"\"
+ at CONS_SAVER_TRUE@	-DSAVERDIR=\""$(pkglibexecdir)"\" -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\"
 
 man2hlp_LDADD = $(GLIB_LIBS)
 mcmfmt_SOURCES = mfmt.c
--- mc-4.6.1a/src/user.c.etcmc	2006-02-04 15:41:42.000000000 +0100
+++ mc-4.6.1a/src/user.c	2006-02-24 15:17:05.000000000 +0100
@@ -726,6 +726,11 @@ user_menu_cmd (struct WEdit *edit_widget
 	    g_free (menu);
 	    menu = concat_dir_and_file \
                         (mc_home, edit_widget ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+	    if (!exist_file (menu)) {
+	        g_free (menu);
+	        menu = concat_dir_and_file \
+                        (mc_home_alt, edit_widget ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU);
+	    }
 	}
     }
 
--- mc-4.6.1a/edit/editcmd.c.etcmc	2006-02-24 15:17:05.000000000 +0100
+++ mc-4.6.1a/edit/editcmd.c	2006-02-24 15:17:05.000000000 +0100
@@ -49,7 +49,7 @@
 #include "../src/tty.h"		/* LINES */
 #include "../src/widget.h"	/* listbox_new() */
 #include "../src/layout.h"	/* clr_scr() */
-#include "../src/main.h"	/* mc_home */
+#include "../src/main.h"	/* mc_home, mc_home_alt */
 #include "../src/help.h"	/* interactive_display() */
 #include "../src/key.h"		/* XCTRL */
 #include "../src/dialog.h"	/* do_refresh() */
@@ -2790,12 +2790,15 @@ edit_block_process_cmd (WEdit *edit, con
 	    return;
 	}
 	if (!(script_src = fopen (o, "r"))) {
-	    fclose (script_home);
-	    unlink (h);
-	    edit_error_dialog ("", get_sys_error (catstrs
-						  (_("Error reading script:"),
-						   o, (char *) NULL)));
-	    return;
+	    o = catstrs (mc_home_alt, shell_cmd, (char *) NULL);
+	    if (!(script_src = fopen (o, "r"))) {
+	        fclose (script_home);
+	        unlink (h);
+	        edit_error_dialog ("", get_sys_error (catstrs
+						      (_("Error reading script:"),
+						      o, (char *) NULL)));
+	        return;
+	    }
 	}
 	while (fgets (buf, sizeof (buf), script_src))
 	    fputs (buf, script_home);
--- mc-4.6.1a/edit/syntax.c.etcmc	2006-02-04 15:41:42.000000000 +0100
+++ mc-4.6.1a/edit/syntax.c	2006-02-24 15:17:05.000000000 +0100
@@ -37,7 +37,7 @@
 #include "edit.h"
 #include "edit-widget.h"
 #include "../src/color.h"	/* use_colors */
-#include "../src/main.h"	/* mc_home */
+#include "../src/main.h"	/* mc_home, mc_home_alt */
 #include "../src/wtools.h"	/* message() */
 
 /* bytes */
@@ -680,6 +680,12 @@ static FILE *open_include_file (const ch
     g_free (error_file_name);
     error_file_name = g_strconcat (mc_home, PATH_SEP_STR "syntax" PATH_SEP_STR,
 				   filename, (char *) NULL);
+    if (!(f = fopen (error_file_name, "r"))) {
+        g_free (error_file_name);
+        error_file_name = g_strconcat (mc_home_alt, PATH_SEP_STR "syntax" PATH_SEP_STR,
+				       filename, (char *) NULL);
+    } else return f;
+    
     return fopen (error_file_name, "r");
 }
 
--- mc-4.6.1a/vfs/extfs.c.etcmc	2005-09-05 02:52:57.000000000 +0200
+++ mc-4.6.1a/vfs/extfs.c	2006-02-24 15:22:16.000000000 +0100
@@ -242,7 +242,7 @@ extfs_open_archive (int fstype, const ch
 	tmp = name_quote (name, 0);
     }
 
-    mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
+    mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR);
     cmd =
 	g_strconcat (mc_extfsdir, extfs_prefixes[fstype], " list ",
 		     local_name ? local_name : tmp, (char *) NULL);
@@ -617,7 +617,7 @@ extfs_cmd (const char *extfs_cmd, struct
     archive_name = name_quote (extfs_get_archive_name (archive), 0);
     quoted_localname = name_quote (localname, 0);
 
-    mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
+    mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR);
     cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype],
 		       extfs_cmd, archive_name, " ", quoted_file, " ",
 		       quoted_localname, (char *) NULL);
@@ -646,7 +646,7 @@ extfs_run (struct vfs_class *me, const c
     g_free (p);
 
     archive_name = name_quote (extfs_get_archive_name (archive), 0);
-    mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR);
+    mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR);
     cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype],
 		       " run ", archive_name, " ", q, (char *) NULL);
     g_free (mc_extfsdir);

mc-utf8.patch:
 acinclude.m4       |   16 -
 edit/edit-widget.h |   16 +
 edit/edit.c        |  267 +++++++++++++++++++--------
 edit/edit.h        |   39 +++
 edit/editcmd.c     |  523 +++++++++++++++++++++++++++++++++++++++++++++--------
 edit/editdraw.c    |  113 +++++++----
 edit/editkeys.c    |   29 ++
 edit/editwidget.c  |    3 
 edit/wordproc.c    |   79 ++++++--
 src/achown.c       |    6 
 src/boxes.c        |   50 ++---
 src/dialog.c       |    2 
 src/file.c         |    9 
 src/filegui.c      |   47 ++--
 src/find.c         |   12 -
 src/help.c         |   24 ++
 src/hotlist.c      |   14 -
 src/layout.c       |   26 +-
 src/learn.c        |    2 
 src/main.c         |    6 
 src/menu.c         |  122 +++++++++++-
 src/menu.h         |    2 
 src/myslang.h      |   10 +
 src/option.c       |   20 +-
 src/panelize.c     |    8 
 src/screen.c       |  269 ++++++++++++++++++++-------
 src/slint.c        |    4 
 src/tty.c          |   10 -
 src/tty.h          |    2 
 src/util.c         |  331 ++++++++++++++++++++++++++++++---
 src/util.h         |    7 
 src/view.c         |   50 ++++-
 src/widget.c       |  371 ++++++++++++++++++++++++++++++-------
 src/widget.h       |   16 +
 src/wtools.c       |   14 -
 35 files changed, 2024 insertions(+), 495 deletions(-)

Index: mc-utf8.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mc-utf8.patch	1 Feb 2006 15:10:24 -0000	1.18
+++ mc-utf8.patch	25 Feb 2006 11:34:56 -0000	1.19
@@ -810,7 +810,7 @@
 +#else
 +    char     buffer[BUF_MEDIUM];
 +#endif
-+    int txtwidth;
++    int txtwidth = 0;
  
      length     = 0;
      empty_line = (file_index >= panel->count);
@@ -2462,7 +2462,7 @@
  {
      size_t j, k, l, len;
 -    const char *fnsource = x_basename (source);
-+    const char *fnsource = g_strdup (x_basename (source));
++    char *fnsource = g_strdup (x_basename (source));
      int next_reg;
      enum CaseConvs case_conv = NO_CONV;
      static char fntarget[MC_MAXPATHLEN];


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mc.spec	11 Feb 2006 04:28:33 -0000	1.80
+++ mc.spec	25 Feb 2006 11:34:56 -0000	1.81
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	7.2
+Release:	8
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -23,6 +23,7 @@
 Patch9:		mc-showfree.patch
 Patch10:	mc-cedit.patch
 Patch11:	mc-delcheck.patch
+Patch12:	mc-etcmc.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -46,6 +47,7 @@
 %patch9 -p1 -b .showfree
 %patch10 -p1 -b .cedit
 %patch11 -p1 -b .delcheck
+%patch12 -p1 -b .etcmc
 
 # convert files in /lib to UTF-8
 pushd lib
@@ -133,14 +135,18 @@
 
 %install 
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
 
 %{makeinstall} sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
 
 install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
-# install charsets, bug #76486
-install -m 644 lib/mc.charsets $RPM_BUILD_ROOT%{_datadir}/mc
+# move configuration files to /etc/mc to make it FHS compliant (#2188)
+mv -f $RPM_BUILD_ROOT%{_datadir}/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,\
+mc.ext,mc.lib,mc.menu,mc.charsets} $RPM_BUILD_ROOT%{_sysconfdir}/mc
+mv -f $RPM_BUILD_ROOT%{_datadir}/mc/extfs/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
 
 # install man pages in various languages
 for l in es hu it pl ru sr; do
@@ -179,9 +185,17 @@
 %lang(ru) %{_mandir}/ru/man1/mc.1.gz
 %lang(sr) %{_mandir}/sr/man1/mc.1.gz
 %config %{_sysconfdir}/profile.d/*
+%config %{_sysconfdir}/mc/*
 %dir %{_datadir}/mc
+%dir %{_sysconfdir}/mc
 
 %changelog
+* Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-8
+- make mc FHS compliant: store config files in /etc/mc and
+  extfs/*.ini files in /etc/mc/extfs instead of /usr/share/mc
+  (#2188) - the oldest open Red Hat bug is now gone ;)
+- fix warnings
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:4.6.1a-7.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 13:49:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 08:49:19 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch, NONE,
	1.1 .cvsignore, 1.99, 1.100 openoffice.org.spec, 1.630,
	1.631 sources, 1.157, 1.158
Message-ID: <200602251349.k1PDnJY3029721@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29690

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch 
Log Message:
m5

openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch:
 configure.in |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

--- NEW FILE openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch ---
--- OOB680_m5.orig/config_office/configure.in	2006-02-25 08:12:21.000000000 -0500
+++ OOB680_m5/config_office/configure.in	2006-02-25 08:16:18.000000000 -0500
@@ -4168,10 +4168,8 @@
 fi
 AC_SUBST(WITH_FONTS)
 
-AC_SUBST(SCPDEFS)
-
 AC_MSG_CHECKING([whether to include PPDs])
-if test "$without_ppds" = "yes"; then
+if test "$with_ppds" != "no"; then
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
@@ -4179,10 +4177,9 @@
   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
 fi
 AC_SUBST(WITHOUT_PPDS)
-AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether to include AFMs])
-if test "$without_afms" = "yes"; then
+if test "$with_afms" != "no"; then
   AC_MSG_RESULT([yes])
 else
   AC_MSG_RESULT([no])
@@ -4190,8 +4187,8 @@
   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
 fi
 AC_SUBST(WITHOUT_AFMS)
-AC_SUBST(SCPDEFS)
 
+AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
 if test "$_os" = "Darwin"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- .cvsignore	23 Feb 2006 09:41:59 -0000	1.99
+++ .cvsignore	25 Feb 2006 13:49:16 -0000	1.100
@@ -160,3 +160,4 @@
 OOB680_m2.tar.bz2
 OOB680_m3.tar.bz2
 OOB680_m4.tar.bz2
+OOB680_m5.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.630
retrieving revision 1.631
diff -u -r1.630 -r1.631
--- openoffice.org.spec	23 Feb 2006 10:35:24 -0000	1.630
+++ openoffice.org.spec	25 Feb 2006 13:49:16 -0000	1.631
@@ -1,5 +1,5 @@
 %define oootag OOB680
-%define ooomilestone 4
+%define ooomilestone 5
 %define rh_rpm_release 1
 
 %define build_fc5 1
@@ -204,6 +204,7 @@
 Patch35: openoffice.org-2.0.2.ooo61875.sd.compile.patch
 Patch36: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch
 Patch37: openoffice.org-2.0.2.ooo62030.solenv._version.patch
+Patch38: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -863,6 +864,7 @@
 %patch35 -p1 -b .ooo61875.sd.compile.patch
 %patch36 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch
 %patch37 -p1 -b .ooo62030.solenv._version.patch
+%patch38 -p1 -b .oooXXXXX.config_office.noppds.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3352,7 +3354,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Feb 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-4.1
+* Sat Feb 25 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.1
 - hunspell replaces myspell
 - Catalan help documentation available
 - add sestatus details to crash_reporter


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- sources	23 Feb 2006 09:41:59 -0000	1.157
+++ sources	25 Feb 2006 13:49:16 -0000	1.158
@@ -9,4 +9,4 @@
 fae552b2b9d556920b930a97a2e3e9ab  openoffice.org-myspell-contrib.tar.gz
 0c5e6d8ded4e9489ac1870f56e324f36  openoffice.org-simple-crash_report.sh
 0fc9c0b585e2c92a7ac05adebeb4caf2  GSI_ga.sdf
-7d1732efad8c84e2597002d95a26ac0e  OOB680_m4.tar.bz2
+20789fc643e2b857291e1973075fccb0  OOB680_m5.tar.bz2



From fedora-cvs-commits at redhat.com  Sat Feb 25 17:23:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 12:23:06 -0500
Subject: rpms/xorg-x11-xfs/devel xfs.init, 1.6, 1.7 xorg-x11-xfs.spec, 1.17,
	1.18
Message-ID: <200602251723.k1PHN6iB015023@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14992

Modified Files:
	xfs.init xorg-x11-xfs.spec 
Log Message:
* Sat Feb 25 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
- Redirect output of "rm -rf fonts.dir" to /dev/null in xfs.init



Index: xfs.init
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xfs.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfs.init	9 Feb 2006 11:12:08 -0000	1.6
+++ xfs.init	25 Feb 2006 17:23:03 -0000	1.7
@@ -35,7 +35,7 @@
          # directory with a newer change time, regenerate fonts.dir, etc.
          # Using "-cnewer" here fixes bug #53737
          if [ ! -e fonts.dir ] || [ -n "$(find . -maxdepth 1 -type f -cnewer fonts.dir -not -name 'fonts.cache*' 2>/dev/null)" ]; then
-            rm -f fonts.dir
+            rm -f fonts.dir &>/dev/null
             if ls | grep -iqs '\.ot[cf]$' ; then
                # Opentype fonts found, generate fonts.scale and fonts.dir
                mkfontscale . && mkfontdir . &>/dev/null


Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xorg-x11-xfs.spec	11 Feb 2006 06:27:28 -0000	1.17
+++ xorg-x11-xfs.spec	25 Feb 2006 17:23:03 -0000	1.18
@@ -8,7 +8,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.1
-Release: 2.1
+Release: 3
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -282,6 +282,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Sat Feb 25 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
+- Redirect output of "rm -rf fonts.dir" to /dev/null in xfs.init
+
 * 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)
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 18:47:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 13:47:39 -0500
Subject: rpms/mesa/devel mesa.spec, 1.43, 1.44 redhat-mesa-driver-install,
	1.4, 1.5
Message-ID: <200602251847.k1PIldtN008867@cvs.devel.redhat.com>

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8840

Modified Files:
	mesa.spec redhat-mesa-driver-install 
Log Message:
* Sat Feb 25 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-5
- Disable the expeimental r300 DRI driver, as it has turned out to cause
  instability and system hangs for many users.



Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mesa.spec	22 Feb 2006 22:05:08 -0000	1.43
+++ mesa.spec	25 Feb 2006 18:47:36 -0000	1.44
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.4.2
-Release: 4
+Release: 5
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -438,6 +438,10 @@
 %{_bindir}/glxinfo
 
 %changelog
+* Sat Feb 25 2006 Mike A. Harris <mharris at redhat.com> 6.4.2-5
+- Disable the expeimental r300 DRI driver, as it has turned out to cause
+  instability and system hangs for many users.
+
 * Wed Feb 22 2006 Adam Jackson <ajackson at redhat.com> 6.4.2-4
 - rebuilt
 


Index: redhat-mesa-driver-install
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/redhat-mesa-driver-install,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- redhat-mesa-driver-install	7 Feb 2006 10:53:01 -0000	1.4
+++ redhat-mesa-driver-install	25 Feb 2006 18:47:36 -0000	1.5
@@ -40,9 +40,9 @@
 
 # Define per arch list of DRI drivers we wish to build and ship for DRI
 # enabled builds on particular platforms.
-DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
-DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 r300 radeon savage sis unichrome"
-DRI_DRIVERS_ppc="mga r128 r200 r300 radeon"
+DRI_DRIVERS_x86="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
+DRI_DRIVERS_x86_64="i810 i830 i915 mga r128 r200 radeon savage sis unichrome"
+DRI_DRIVERS_ppc="mga r128 r200 radeon"
 DRI_DRIVERS_ia64="i810 i830 i915 mga r128 r200 radeon"
 DRI_DRIVERS_alpha="mga r128 r200 radeon"
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 20:14:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 15:14:49 -0500
Subject: rpms/gdm/devel gdm.spec,1.135,1.136
Message-ID: <200602252014.k1PKEn6h019805@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19792

Modified Files:
	gdm.spec 
Log Message:
- fix a broken link



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gdm.spec	24 Feb 2006 19:08:32 -0000	1.135
+++ gdm.spec	25 Feb 2006 20:14:46 -0000	1.136
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.8
-Release: 5
+Release: 6
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -152,7 +152,7 @@
 
 # remove the gdm Xsession as we're using the xdm one
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Xsession
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/gdm; ln -sf ../xinit/Xsession .)
+(cd $RPM_BUILD_ROOT%{_sysconfdir}/gdm; ln -sf ../X11/xinit/Xsession .)
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
@@ -307,6 +307,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sat Feb 25 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-6
+- fix a broken link
+
 * Fri Feb 24 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-5
 - change some /etc/X11 bits in the spec file to /etc
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 20:50:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 15:50:56 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.28,
	1.29 selinux-policy.spec, 1.130, 1.131
Message-ID: <200602252050.k1PKougU029893@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29851

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:


policy-20060207.patch:
 Makefile                                |   12 ++++++------
 policy/modules/admin/logwatch.te        |    2 ++
 policy/modules/admin/netutils.te        |    2 ++
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/admin/vpn.te             |    6 ++++++
 policy/modules/apps/java.if             |    8 ++------
 policy/modules/kernel/corecommands.fc   |    1 +
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.fc        |    1 +
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    2 +-
 policy/modules/services/apache.if       |   26 ++++++++++++++++++++++++++
 policy/modules/services/automount.te    |    7 +++++--
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/cups.fc         |    2 +-
 policy/modules/services/cups.te         |    2 +-
 policy/modules/services/hal.te          |    2 +-
 policy/modules/services/ktalk.te        |    3 +++
 policy/modules/services/nscd.if         |    2 +-
 policy/modules/services/xserver.te      |    2 +-
 policy/modules/system/fstools.te        |    2 +-
 policy/modules/system/init.te           |    1 +
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/mount.te          |    2 +-
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    6 ++----
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 33 files changed, 101 insertions(+), 43 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- policy-20060207.patch	24 Feb 2006 20:50:49 -0000	1.28
+++ policy-20060207.patch	25 Feb 2006 20:50:53 -0000	1.29
@@ -394,6 +394,19 @@
  	nscd_socket_use(ktalkd_t)
  ')
 +
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.21/policy/modules/services/nscd.if
+--- nsaserefpolicy/policy/modules/services/nscd.if	2006-02-10 21:34:14.000000000 -0500
++++ serefpolicy-2.2.21/policy/modules/services/nscd.if	2006-02-25 15:37:25.000000000 -0500
+@@ -49,8 +49,8 @@
+ 	dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost };
+ 
+ 	files_search_pids($1)
++	allow $1 nscd_var_run_t:dir r_dir_perms;
+ 	allow $1 nscd_var_run_t:sock_file rw_file_perms;
+-	dontaudit $1 nscd_var_run_t:dir { search getattr };
+ 	dontaudit $1 nscd_var_run_t:file { getattr read };
+ ')
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.21/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.21/policy/modules/services/xserver.te	2006-02-23 14:10:50.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- selinux-policy.spec	24 Feb 2006 20:50:49 -0000	1.130
+++ selinux-policy.spec	25 Feb 2006 20:50:53 -0000	1.131
@@ -10,7 +10,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.21
-Release: 8
+Release: 9
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -160,6 +160,7 @@
 make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=%{polyinstatiate} install-headers install-docs
 mkdir ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
 mv ${RPM_BUILD_ROOT}%{_usr}/share/selinux/targeted/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include
+rm -f ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include/include
 install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
 install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile
 install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/
@@ -293,6 +294,9 @@
 
 %changelog
 
+* Sat Feb 26 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-9
+- NSCD socket is in nscd_var_run_t needs to be able to search dir
+
 * Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-8
 - Fixes Apache interface file
 



From fedora-cvs-commits at redhat.com  Sat Feb 25 22:53:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 17:53:46 -0500
Subject: rpms/vte/devel .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 vte.spec,
	1.61, 1.62
Message-ID: <200602252253.k1PMrkSq018218@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18158

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.11.19



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	11 Feb 2006 20:54:01 -0000	1.32
+++ .cvsignore	25 Feb 2006 22:53:44 -0000	1.33
@@ -4,3 +4,4 @@
 vte-0.11.16.tar.bz2
 vte-0.11.17.tar.bz2
 vte-0.11.18.tar.bz2
+vte-0.11.19.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	11 Feb 2006 20:54:01 -0000	1.32
+++ sources	25 Feb 2006 22:53:44 -0000	1.33
@@ -1 +1 @@
-e808006c365fddca611960b2efaef6a5  vte-0.11.18.tar.bz2
+e03e1ed6bd7367a827c1b2e70beb8bcb  vte-0.11.19.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- vte.spec	17 Feb 2006 14:05:08 -0000	1.61
+++ vte.spec	25 Feb 2006 22:53:44 -0000	1.62
@@ -1,6 +1,6 @@
 Name: vte
-Version: 0.11.18
-Release: 1.fc5.2
+Version: 0.11.19
+Release: 1.fc5.1
 Summary: An experimental terminal emulator.
 License: LGPL
 Group: User Interface/X
@@ -12,9 +12,6 @@
 # initscripts creates the utmp group
 Prereq: initscripts 
 
-# already in upstream cvs
-Patch0: vte-0.11.18-paste.patch
-
 %description
 VTE is an experimental terminal emulator widget for use with GTK+ 2.0.
 
@@ -29,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .paste
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -102,6 +98,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> 0.11.19-1
+- Update to 0.11.19
+- Drop upstreamed patch
+
 * Fri Feb 17 2006 Matthias Clasen <mclasen at redhat.com> 0.11.18-2
 - Change Shift-Insert back to insert PRIMARY 
 



From fedora-cvs-commits at redhat.com  Sun Feb 26 01:53:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 20:53:44 -0500
Subject: rpms/gnome-utils/devel .cvsignore, 1.39, 1.40 gnome-utils.spec, 1.96,
	1.97 sources, 1.42, 1.43
Message-ID: <200602260153.k1Q1riG9008153@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8010

Modified Files:
	.cvsignore gnome-utils.spec sources 
Log Message:
gnome-utils 2.13.93, gucharmap 1.5.3



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Feb 2006 05:46:42 -0000	1.39
+++ .cvsignore	26 Feb 2006 01:53:42 -0000	1.40
@@ -9,3 +9,5 @@
 gnome-utils-2.13.92.tar.bz2
 gcalctool-5.7.29.tar.bz2
 gucharmap-1.5.2.tar.bz2
+gucharmap-1.5.3.tar.bz2
+gnome-utils-2.13.93.tar.bz2


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-utils.spec	21 Feb 2006 03:59:16 -0000	1.96
+++ gnome-utils.spec	26 Feb 2006 01:53:42 -0000	1.97
@@ -12,15 +12,15 @@
 %define po_package gnome-utils-2.0
 
 %define gcalctool_version 5.7.29
-%define gucharmap_version 1.5.2
+%define gucharmap_version 1.5.3
 %define zenity_version 2.13.90
 
 %define dbus_version 0.60
 
 Summary: GNOME utility programs.
 Name: gnome-utils
-Version: 2.13.92
-Release: 4
+Version: 2.13.93
+Release: 1
 Epoch: 1
 License: GPL
 Group: Applications/System
@@ -225,6 +225,10 @@
 %{_sysconfdir}/pam.d/gnome-system-log
 
 %changelog
+* Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.93-1
+- Update to gnome-utils-2.13.93
+- Update to gucharmap 1.5.3
+
 * Mon Feb 20 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-4
 - Fix a crash in gnome-system-log when closing logs
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	15 Feb 2006 05:46:42 -0000	1.42
+++ sources	26 Feb 2006 01:53:42 -0000	1.43
@@ -1,4 +1,4 @@
 a5f7d3d6524f7f2da0978541c74aa40b  zenity-2.13.90.tar.bz2
-c2d1a341a5722d7fc4f8ed56248c5123  gnome-utils-2.13.92.tar.bz2
 f9d4cb8177abfbd17e53908bad65404e  gcalctool-5.7.29.tar.bz2
-a6b7578e887676aacee5cd48d84456d1  gucharmap-1.5.2.tar.bz2
+7eb9026fce8db2e8e82ee4a5be27eea9  gucharmap-1.5.3.tar.bz2
+d4b821cd0fff8b161d6d834ded220daf  gnome-utils-2.13.93.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 26 02:03:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 21:03:31 -0500
Subject: rpms/librsvg2/devel .cvsignore, 1.21, 1.22 librsvg2.spec, 1.39,
	1.40 sources, 1.21, 1.22
Message-ID: <200602260203.k1Q23VvV010827@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/librsvg2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10782

Modified Files:
	.cvsignore librsvg2.spec sources 
Log Message:
2.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	11 Feb 2006 20:40:54 -0000	1.21
+++ .cvsignore	26 Feb 2006 02:03:00 -0000	1.22
@@ -10,3 +10,4 @@
 librsvg-2.13.5.tar.bz2
 librsvg-2.13.92.tar.bz2
 librsvg-2.13.93.tar.bz2
+librsvg-2.14.0.tar.bz2


Index: librsvg2.spec
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- librsvg2.spec	11 Feb 2006 20:40:54 -0000	1.39
+++ librsvg2.spec	26 Feb 2006 02:03:01 -0000	1.40
@@ -12,7 +12,7 @@
 
 Name: 	 librsvg2
 Summary: An SVG library based on cairo.
-Version: 2.13.93
+Version: 2.14.0
 Release: 1
 
 License: 	LGPL
@@ -121,6 +121,9 @@
 ##%doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-1
+- Update to 2.14.0
+
 * Mon Feb 11 2006 Matthias Clasen <mclasen at redhat.com> 2.13.93-1
 - Update to 2.13.93
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	11 Feb 2006 20:40:54 -0000	1.21
+++ sources	26 Feb 2006 02:03:01 -0000	1.22
@@ -1 +1 @@
-e1e83ee7b54be27a2e2acb6a73398a48  librsvg-2.13.93.tar.bz2
+3080f9a9cfc9ad7505f869df6cd917f8  librsvg-2.14.0.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 26 02:22:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sat, 25 Feb 2006 21:22:58 -0500
Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.26,
	1.27 gnome-icon-theme.spec, 1.40, 1.41 sources, 1.28, 1.29
Message-ID: <200602260222.k1Q2MvnZ029320@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29251

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
2.14.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	15 Feb 2006 06:53:39 -0000	1.26
+++ .cvsignore	26 Feb 2006 02:22:54 -0000	1.27
@@ -1,2 +1,3 @@
 gnome-icon-theme-2.14.0.tar.bz2
 web-browser.png
+gnome-icon-theme-2.14.1.tar.bz2


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnome-icon-theme.spec	15 Feb 2006 06:53:40 -0000	1.40
+++ gnome-icon-theme.spec	26 Feb 2006 02:22:54 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
-Version: 2.14.0
-Release: 2
+Version: 2.14.1
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 # missing 24x24 version of epiphany icon
 Source1: web-browser.png
@@ -70,6 +70,9 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> 2.14.1-1
+- Update to 2.14.1
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> 2.14.0-2
 - Add small epiphany icon (again!!)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	15 Feb 2006 06:53:40 -0000	1.28
+++ sources	26 Feb 2006 02:22:54 -0000	1.29
@@ -1,2 +1,2 @@
-4eb273a0d51acc0340fcfc59a9214553  gnome-icon-theme-2.14.0.tar.bz2
 88a5d07c629eaaa366d2a19ec07df4d4  web-browser.png
+a1ca3a558f2da862dcb8c23237986c94  gnome-icon-theme-2.14.1.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 26 05:24:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 00:24:09 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1982,
	1.1983 linux-2.6-atkbd-dell-multimedia.patch, 1.1, NONE
Message-ID: <200602260524.k1Q5O9rZ018496@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17941

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-atkbd-dell-multimedia.patch 
Log Message:
drop bogon



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1982
retrieving revision 1.1983
diff -u -r1.1982 -r1.1983
--- kernel-2.6.spec	25 Feb 2006 08:30:16 -0000	1.1982
+++ kernel-2.6.spec	26 Feb 2006 05:23:55 -0000	1.1983
@@ -353,7 +353,6 @@
 Patch1505: linux-2.6-dump_smp_call_function.patch
 
 # Misc bits.
-Patch1610: linux-2.6-atkbd-dell-multimedia.patch
 Patch1630: linux-2.6-module_version.patch
 Patch1650: linux-2.6-input-kill-stupid-messages.patch
 Patch1660: linux-2.6-input-usblegacy.patch
@@ -913,8 +912,6 @@
 #
 
 # Misc fixes
-# Make multimedia buttons on Dell Inspiron 8200 work.
-%patch1610 -p1
 # Add missing MODULE_VERSION tags to some modules.
 %patch1630 -p1
 # The input layer spews crap no-one cares about.


--- linux-2.6-atkbd-dell-multimedia.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 05:57:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 00:57:08 -0500
Subject: rpms/kernel/devel linux-2.6-defaults-enable-sata-atapi.patch, NONE,
	1.1 linux-2.6-defaults-firmware-loader-timeout.patch, NONE,
	1.1 linux-2.6-defaults-max-symlinks.patch, NONE,
	1.1 kernel-2.6.spec, 1.1983,
	1.1984 linux-2.6-compile-fixes.patch, 1.54,
	1.55 linux-2.6-firmware-loader-timeout.patch, 1.2,
	NONE linux-2.6-input-usblegacy.patch, 1.2,
	NONE linux-2.6-max-symlinks.patch, 1.1,
	NONE linux-2.6-mv643xx-compile-fix.patch, 1.1,
	NONE linux-2.6-sata-enable-atapi-by-default.patch, 1.1, NONE
Message-ID: <200602260557.k1Q5v845011231@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11153

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Added Files:
	linux-2.6-defaults-enable-sata-atapi.patch 
	linux-2.6-defaults-firmware-loader-timeout.patch 
	linux-2.6-defaults-max-symlinks.patch 
Removed Files:
	linux-2.6-firmware-loader-timeout.patch 
	linux-2.6-input-usblegacy.patch linux-2.6-max-symlinks.patch 
	linux-2.6-mv643xx-compile-fix.patch 
	linux-2.6-sata-enable-atapi-by-default.patch 
Log Message:
spec file cleanup


linux-2.6-defaults-enable-sata-atapi.patch:
 libata-core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-enable-sata-atapi.patch ---
--- linux-2.6.14/drivers/scsi/libata-core.c~	2005-11-22 11:33:25.000000000 -0500
+++ linux-2.6.14/drivers/scsi/libata-core.c	2005-11-22 11:33:37.000000000 -0500
@@ -78,7 +78,7 @@ static void __ata_qc_complete(struct ata
 static unsigned int ata_unique_id = 1;
 static struct workqueue_struct *ata_wq;
 
-int atapi_enabled = 0;
+int atapi_enabled = 1;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 

linux-2.6-defaults-firmware-loader-timeout.patch:
 firmware_class.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-firmware-loader-timeout.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174589

The ipw driver sometimes takes a long time to load its firmware.
Whilst the ipw driver should be using the async interface of
the firmware loader to make this a non-issue, this is a minimal fix.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.14/drivers/base/firmware_class.c~	2005-12-01 16:56:29.000000000 -0500
+++ linux-2.6.14/drivers/base/firmware_class.c	2005-12-01 16:56:35.000000000 -0500
@@ -31,7 +31,7 @@ enum {
 	FW_STATUS_READY_NOHOTPLUG,
 };
 
-static int loading_timeout = 10;	/* In seconds */
+static int loading_timeout = 60;	/* In seconds */
 
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just
  * guarding for corner cases a global lock should be OK */

linux-2.6-defaults-max-symlinks.patch:
 namei.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-max-symlinks.patch ---
Bump up the maximum nested amount of symlinks.

diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/namei.h linux-10000/include/linux/namei.h
--- linux-3022/include/linux/namei.h
+++ linux-10000/include/linux/namei.h
@@ -10,7 +10,7 @@ struct open_intent {
 	int	create_mode;
 };
 
-enum { MAX_NESTED_LINKS = 5 };
+enum { MAX_NESTED_LINKS = 8 };
 
 struct nameidata {
 	struct dentry	*dentry;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1983
retrieving revision 1.1984
diff -u -r1.1983 -r1.1984
--- kernel-2.6.spec	26 Feb 2006 05:23:55 -0000	1.1983
+++ kernel-2.6.spec	26 Feb 2006 05:57:05 -0000	1.1984
@@ -233,6 +233,7 @@
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch
 Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
+Patch208: linux-2.6-x86-hp-reboot.patch
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
@@ -323,9 +324,6 @@
 
 Patch1070: linux-2.6-sleepon.patch
 
-# Tweak some defaults.
-Patch1081: linux-2.6-max-symlinks.patch
-
 # SCSI bits.
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
@@ -353,29 +351,26 @@
 Patch1505: linux-2.6-dump_smp_call_function.patch
 
 # Misc bits.
-Patch1630: linux-2.6-module_version.patch
-Patch1650: linux-2.6-input-kill-stupid-messages.patch
-Patch1660: linux-2.6-input-usblegacy.patch
-Patch1670: linux-2.6-serial-tickle-nmi.patch
-Patch1690: linux-2.6-radeon-backlight.patch
-Patch1700: linux-2.6-ide-tune-locking.patch
-Patch1710: linux-2.6-autofs-pathlookup.patch
-Patch1720: linux-2.6-selinux-hush.patch
-Patch1721: linux-2.6-selinux-mprotect-checks.patch
-Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
-Patch1723: linux-2.6-selinux-selinuxfs-hard-link-count.patch
-Patch1730: linux-2.6-ide-cd-shutup.patch
-Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
-Patch1770: linux-2.6-valid-ether-addr.patch
-Patch1780: linux-2.6-firmware-loader-timeout.patch
-Patch1790: linux-2.6-softcursor-persistent-alloc.patch
-Patch1800: linux-2.6-pwc-powerup-by-default.patch
-Patch1810: linux-2.6-smsc-ircc2-pnp.patch
-Patch1820: linux-2.6-audit-new-msg-types.patch
-Patch1830: linux-2.6-w1-hush-debug.patch
-Patch1840: linux-2.6-x86-hp-reboot.patch
-Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1890: linux-2.6-sched-up-migration-cost.patch
+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
+Patch1700: linux-2.6-w1-hush-debug.patch
+Patch1710: linux-2.6-sched-up-migration-cost.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
@@ -388,8 +383,11 @@
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
-# Changes to upstream defaults.
-Patch2100: linux-2.6-defaults-fat-utf8.patch
+# 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
 
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
@@ -734,6 +732,8 @@
 %patch206 -p1
 # Workaround BIOSes that don't list CPU0
 %patch207 -p1
+# Reboot through BIOS on HP systems,.
+%patch208 -p1
 
 # 
 # ppc64
@@ -865,10 +865,6 @@
 #
 %patch1070 -p1
 
-# Adjust some defaults.
-# Bump up the number of recursive symlinks.
-%patch1081 -p1
-
 #
 # SCSI Bits.
 #
@@ -913,51 +909,42 @@
 
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.
-%patch1630 -p1
+%patch1600 -p1
 # The input layer spews crap no-one cares about.
-%patch1650 -p1
-# usb legacy workaround.
-%patch1660 -p1
+%patch1610 -p1
 # Tickle the NMI whilst doing serial writes.
-%patch1670 -p1
+%patch1620 -p1
 # Radeon on thinkpad backlight power-management goodness.
-%patch1690 -p1
+%patch1630 -p1
 # Fix IDE locking bug.
-%patch1700 -p1
-# autofs4 looks up wrong path element when ghosting is enabled
-%patch1710 -p1
-# Silence some selinux messages.
-%patch1720 -p1
-# Fix the SELinux mprotect checks on executable mappings
-%patch1721 -p1
-# Disable setting of security attributes on new inodes when no policy is loaded
-%patch1722 -p1
-# Fix incorrect hardlink count in selinuxfs
-%patch1723 -p1
-
+%patch1640 -p1
 # Silence noisy CD drive spew
-%patch1730 -p1
-# Enable SATA ATAPI by default.
-%patch1760 -p1
+%patch1641 -p1
+# autofs4 looks up wrong path element when ghosting is enabled
+%patch1650 -p1
 # 
-%patch1770 -p1
-# Increase timeout on firmware loader.
-%patch1780 -p1
+%patch1660 -p1
 # Use persistent allocation in softcursor
-%patch1790 -p1
+%patch1670 -p1
 # Power up PWC driver by default.
-%patch1800 -p1
+%patch1680 -p1
 # PNP support for smsc-ircc2
-%patch1810 -p1
-%patch1820 -p1
+%patch1690 -p1
 # Silence debug messages in w1
-%patch1830 -p1
-# Reboot through BIOS on HP laptops.
-%patch1840 -p1
-# Fix compilation for MV643xx Ethernet
-%patch1850 -p1
+%patch1700 -p1
 # Only print migration info on SMP
-%patch1890 -p1
+%patch1710 -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
@@ -974,7 +961,14 @@
 %patch2002 -p1
 
 # Changes to upstream defaults.
+# Bump up the number of recursive symlinks.
 %patch2100 -p1
+# Use UTF-8 by default on VFAT.
+%patch2101 -p1
+# Enable SATA ATAPI by default.
+%patch2102 -p1
+# Increase timeout on firmware loader.
+%patch2103 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to

linux-2.6-compile-fixes.patch:
 linux-2.6.15.noarch/arch/x86_64/kernel/Makefile |    2 +-
 linux-2.6.15/drivers/net/mv643xx_eth.c          |    1 +
 2 files changed, 2 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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- linux-2.6-compile-fixes.patch	25 Feb 2006 08:30:17 -0000	1.54
+++ linux-2.6-compile-fixes.patch	26 Feb 2006 05:57:05 -0000	1.55
@@ -9,3 +9,13 @@
  microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
  intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
  quirks-y			+= ../../i386/kernel/quirks.o
+--- linux-2.6.15/drivers/net/mv643xx_eth.c~	2006-01-06 13:13:34.000000000 +0000
++++ linux-2.6.15/drivers/net/mv643xx_eth.c	2006-01-06 13:41:03.000000000 +0000
+@@ -40,6 +40,7 @@
+ #include <linux/delay.h>
+ #include <linux/ethtool.h>
+ #include <linux/platform_device.h>
++#include <net/ip.h>
+ 
+ #include <asm/io.h>
+ #include <asm/types.h>


--- linux-2.6-firmware-loader-timeout.patch DELETED ---


--- linux-2.6-input-usblegacy.patch DELETED ---


--- linux-2.6-max-symlinks.patch DELETED ---


--- linux-2.6-mv643xx-compile-fix.patch DELETED ---


--- linux-2.6-sata-enable-atapi-by-default.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 06:01:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 01:01:51 -0500
Subject: rpms/kernel/devel linux-2.6-xen-compile.patch, 1.1,
	NONE linux-2.6-xen.patch, 1.2, NONE
Message-ID: <200602260601.k1Q61pA0012308@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12212

Removed Files:
	linux-2.6-xen-compile.patch linux-2.6-xen.patch 
Log Message:
remove unused xen cruft



--- linux-2.6-xen-compile.patch DELETED ---


--- linux-2.6-xen.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 06:15:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 01:15:23 -0500
Subject: rpms/kernel/devel linux-2.6-cell-numa-init.patch, NONE,
	1.1 linux-2.6-net-ipw2200-monitor.patch, NONE,
	1.1 linux-2.6-xen-module-fault.patch, NONE,
	1.1 kernel-2.6.spec, 1.1984,
	1.1985 linux-2.6.15-cell-numa-init.patch, 1.1,
	NONE linux-2.6.15-ipw2200-monitor.patch, 1.1,
	NONE linux-2.6.15-xen-module-fault.patch, 1.1, NONE
Message-ID: <200602260615.k1Q6FNVN016184@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16081

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-cell-numa-init.patch 
	linux-2.6-net-ipw2200-monitor.patch 
	linux-2.6-xen-module-fault.patch 
Removed Files:
	linux-2.6.15-cell-numa-init.patch 
	linux-2.6.15-ipw2200-monitor.patch 
	linux-2.6.15-xen-module-fault.patch 
Log Message:
follow patch naming scheme.



linux-2.6-cell-numa-init.patch:
 setup.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-cell-numa-init.patch ---
--- linux-2.6.15/arch/powerpc/platforms/cell/setup.c~	2006-01-12 20:23:46.000000000 +0000
+++ linux-2.6.15/arch/powerpc/platforms/cell/setup.c	2006-01-13 00:17:51.000000000 +0000
@@ -126,6 +126,7 @@ static void __init cell_spuprop_present(
 static void __init cell_spumem_init(int early)
 {
 	struct device_node *node;
+	return;
 	for (node = of_find_node_by_type(NULL, "spe");
 			node; node = of_find_node_by_type(node, "spe")) {
 		cell_spuprop_present(node, "local-store", early);

linux-2.6-net-ipw2200-monitor.patch:
 Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6-net-ipw2200-monitor.patch ---
--- linux-2.6.15.i686/drivers/net/wireless/Kconfig.BAD	2006-02-18 09:57:26.000000000 -0600
+++ linux-2.6.15.i686/drivers/net/wireless/Kconfig	2006-02-18 09:58:07.000000000 -0600
@@ -237,6 +237,15 @@
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config IPW2200_MONITOR
+	bool "Enable promiscuous mode"
+	depends on IPW2200
+	---help---
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
 	depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN)

linux-2.6-xen-module-fault.patch:
 fault-xen.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-module-fault.patch ---
We need to handle spurious page faults in the kernel's module VA range
in order to avoid OOPSing on modular x86_64 SMP builds.

Signed-off-by: Stephen Tweedie <sct at redhat.com>

--- linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c~	2006-02-14 11:12:11.000000000 -0500
+++ linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c	2006-02-15 14:45:53.000000000 -0500
@@ -367,12 +367,14 @@
 	 */
 	if (unlikely(address >= TASK_SIZE64)) {
 		/*
-		 * Don't check for the module range here: its PML4
+		 * Even the module range needs checked here: its PML4
 		 * is always initialized because it's shared with the main
-		 * kernel text. Only vmalloc may need PML4 syncups.
+		 * kernel text, but the writable pagetable code can still
+		 * result in spurious faults.
 		 */
 		if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
-		      ((address >= VMALLOC_START && address < VMALLOC_END))) {
+		    ((address >= VMALLOC_START && address < VMALLOC_END) ||
+		     (address >= MODULES_VADDR && address < MODULES_END))) {
 			if (vmalloc_fault(address) < 0)
 				goto bad_area_nosemaphore;
 			return;


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -r1.1984 -r1.1985
--- kernel-2.6.spec	26 Feb 2006 05:57:05 -0000	1.1984
+++ kernel-2.6.spec	26 Feb 2006 06:15:20 -0000	1.1985
@@ -237,7 +237,7 @@
 
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
-Patch301: linux-2.6.15-cell-numa-init.patch
+Patch301: linux-2.6-cell-numa-init.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
@@ -259,7 +259,7 @@
 Patch707: linux-2.6-xen-acpi.patch
 Patch708: linux-2.6-xen-x86_64-fixes.patch
 Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch
-Patch710: linux-2.6.15-xen-module-fault.patch
+Patch710: linux-2.6-xen-module-fault.patch
 Patch711: linux-2.6-xen-cpusteal-kernel.patch
 
 #
@@ -337,7 +337,7 @@
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
 Patch1303: linux-2.6-ipw2200-hwcrypto.patch
-Patch1304: linux-2.6.15-ipw2200-monitor.patch
+Patch1304: linux-2.6-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch


--- linux-2.6.15-cell-numa-init.patch DELETED ---


--- linux-2.6.15-ipw2200-monitor.patch DELETED ---


--- linux-2.6.15-xen-module-fault.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 14:51:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 09:51:55 -0500
Subject: rpms/gdm/devel gdm.spec,1.136,1.137
Message-ID: <200602261451.k1QEptMh021863@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21754

Modified Files:
	gdm.spec 
Log Message:
- Use new %%post section, written by 
  Michal Jaegermann <michal at harddata.com> (bug 183082)



Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gdm.spec	25 Feb 2006 20:14:46 -0000	1.136
+++ gdm.spec	26 Feb 2006 14:51:50 -0000	1.137
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.13.0.8
-Release: 6
+Release: 7
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -209,54 +209,58 @@
 /sbin/ldconfig
 scrollkeeper-update
 
-touch --no-create %{_datadir}/icons/hicolor
+touch --no-create /usr/share/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+  gtk-update-icon-cache -q /usr/share/icons/hicolor
 fi
 
-# if the user already has a config file, then 
-# migrate it to the new location 
-if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then
-    cp -a %{_sysconfdir}/X11/gdm/gdm.conf %{_sysconfdir}/gdm/custom.conf
-
-    # Comment out some entries from the custom config file that may have changed
-    # locations in the update
-    sed -i -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^GraphicalTheme=Bluecurve@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^BackgroundColor=#20305a@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^LogDir=/var/log/gdm@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_sysconfdir}/gdm/custom.conf 
-    sed -i -e 's@^ServAuthDir=/var/gdm@#&@' %{_sysconfdir}/gdm/custom.conf 
-
-    # Someone might be trying to use different greeters for the local/remote cases
-    # so migrate them to their new locations.
-    sed -i -e 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_sysconfdir}/gdm/custom.conf
-    sed -i -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_sysconfdir}/gdm/custom.conf
-fi
+# if the user already has a config file, then migrate it to the new
+# location; rpm will ensure that old file will be renamed
 
-if [ $1 -ge 2 ] && [ -f %{_datadir}/gdm/config/gdm.conf-custom ]; then
-    cp -a %{_datadir}/gdm/config/gdm.conf-custom %{_sysconfdir}/gdm/custom.conf
+custom=/etc/gdm/custom.conf
+
+if [ $1 -ge 2 ] ; then
+    if [ -f /usr/share/gdm/config/gdm.conf-custom ]; then
+	oldconffile=/usr/share/gdm/config/gdm.conf-custom
+    elif [ -f /etc/X11/gdm/gdm.conf ]; then
+	oldconffile=/etc/X11/gdm/gdm.conf
+    fi
+
+    # Comment out some entries from the custom config file that may
+    # have changed locations in the update.  Also move various
+    # elements to their new locations.
+
+    [ -n "$oldconffile" ] && sed \
+    -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' \
+    -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' \
+    -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' \
+    -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' \
+    -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' \
+    -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' \
+    -e 's@^GraphicalTheme=Bluecurve@#&@' \
+    -e 's@^BackgroundColor=#20305a@#&@' \
+    -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' \
+    -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' \
+    -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' \
+    -e 's@^LogDir=/var/log/gdm@#&@' \
+    -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' \
+    -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' \
+    -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' \
+    -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' \
+    -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' \
+    -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' \
+    -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' \
+    -e 's@^ServAuthDir=/var/gdm@#&@' \
+    -e 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' \
+    -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' \
+    $oldconffile > $custom
 fi
 
-if [ $1 -ge 2 ]; then
-   sed -i -e 's@/etc/X11/gdm@/etc/gdm at g' %{_sysconfdir}/gdm/custom.conf
+if [ $1 -ge 2 -a -f $custom ] && grep -q /etc/X11/gdm $custom ; then
+   sed -i -e 's@/etc/X11/gdm@/etc/gdm at g' $custom
 fi
 
-%{_sbindir}/gdm-safe-restart >/dev/null 2>&1 || :
+/usr/sbin/gdm-safe-restart >/dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
@@ -307,6 +311,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Sun Feb 26 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-7
+- Use new %%post section, written by 
+  Michal Jaegermann <michal at harddata.com> (bug 183082)
+
 * Sat Feb 25 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-6
 - fix a broken link
 



From fedora-cvs-commits at redhat.com  Sun Feb 26 15:45:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 10:45:01 -0500
Subject: rpms/gnome-power-manager/devel .cvsignore, 1.12,
	1.13 gnome-power-manager.spec, 1.25, 1.26 sources, 1.12, 1.13
Message-ID: <200602261545.k1QFj1nF008938@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8917

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
- Update to 2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	21 Feb 2006 06:08:11 -0000	1.12
+++ .cvsignore	26 Feb 2006 15:44:59 -0000	1.13
@@ -1,3 +1 @@
-gnome-power-manager-2.13.5.0.20060207.tar.bz2
-gnome-power-manager-2.13.90.tar.bz2
-gnome-power-manager-2.13.91.tar.bz2
+gnome-power-manager-2.13.92.tar.bz2


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gnome-power-manager.spec	21 Feb 2006 06:08:11 -0000	1.25
+++ gnome-power-manager.spec	26 Feb 2006 15:44:59 -0000	1.26
@@ -4,7 +4,7 @@
 
 Summary: GNOME Power Manager
 Name: gnome-power-manager
-Version: 2.13.91
+Version: 2.13.92
 Release: 1
 License: GPL
 Group: Applications/System
@@ -79,6 +79,9 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Sun Feb 26 2006 Ray Strode <rstrode at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 - Drop upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Feb 2006 06:08:11 -0000	1.12
+++ sources	26 Feb 2006 15:44:59 -0000	1.13
@@ -1 +1 @@
-41f4e3f5cf11f8444ba37e7469d8680a  gnome-power-manager-2.13.91.tar.bz2
+2fe426848b901006cb3bda7859b03f1d  gnome-power-manager-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Sun Feb 26 19:00:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 14:00:14 -0500
Subject: rpms/kernel/devel linux-2.6-net-ipw2200-hwcrypto.patch, NONE,
	1.1 .cvsignore, 1.361, 1.362 kernel-2.6.spec, 1.1985,
	1.1986 linux-2.6-compile-fixes.patch, 1.55, 1.56 sources,
	1.303, 1.304 upstream, 1.278,
	1.279 linux-2.6-ipw2200-hwcrypto.patch, 1.1, NONE
Message-ID: <200602261900.k1QJ0Eh2032224@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32159

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch 
	sources upstream 
Added Files:
	linux-2.6-net-ipw2200-hwcrypto.patch 
Removed Files:
	linux-2.6-ipw2200-hwcrypto.patch 
Log Message:
git9


linux-2.6-net-ipw2200-hwcrypto.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-ipw2200-hwcrypto.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,


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- .cvsignore	25 Feb 2006 08:03:13 -0000	1.361
+++ .cvsignore	26 Feb 2006 18:59:40 -0000	1.362
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git8.bz2
+patch-2.6.16-rc4-git9.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1985
retrieving revision 1.1986
diff -u -r1.1985 -r1.1986
--- kernel-2.6.spec	26 Feb 2006 06:15:20 -0000	1.1985
+++ kernel-2.6.spec	26 Feb 2006 18:59:40 -0000	1.1986
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git8.bz2
+Patch2: patch-2.6.16-rc4-git9.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -336,8 +336,8 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
-Patch1303: linux-2.6-ipw2200-hwcrypto.patch
-Patch1304: linux-2.6-ipw2200-monitor.patch
+Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
+Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -989,7 +989,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
@@ -1582,6 +1582,9 @@
 %endif
 
 %changelog
+* Sun Feb 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git9
+
 * Sat Feb 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git8
 

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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- linux-2.6-compile-fixes.patch	26 Feb 2006 05:57:05 -0000	1.55
+++ linux-2.6-compile-fixes.patch	26 Feb 2006 18:59:58 -0000	1.56
@@ -1,21 +0,0 @@
---- linux-2.6.15.noarch/arch/x86_64/kernel/Makefile~	2006-02-25 03:29:04.000000000 -0500
-+++ linux-2.6.15.noarch/arch/x86_64/kernel/Makefile	2006-02-25 03:29:35.000000000 -0500
-@@ -45,7 +45,7 @@ CFLAGS_vsyscall.o		:= $(PROFILING) -g0
- 
- bootflag-y			+= ../../i386/kernel/bootflag.o
- cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
--topology-y                     += ../../i386/mach-default/topology.o
-+topology-y                     += ../../i386/kernel/topology.o
- microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
- intel_cacheinfo-y		+= ../../i386/kernel/cpu/intel_cacheinfo.o
- quirks-y			+= ../../i386/kernel/quirks.o
---- linux-2.6.15/drivers/net/mv643xx_eth.c~	2006-01-06 13:13:34.000000000 +0000
-+++ linux-2.6.15/drivers/net/mv643xx_eth.c	2006-01-06 13:41:03.000000000 +0000
-@@ -40,6 +40,7 @@
- #include <linux/delay.h>
- #include <linux/ethtool.h>
- #include <linux/platform_device.h>
-+#include <net/ip.h>
- 
- #include <asm/io.h>
- #include <asm/types.h>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- sources	25 Feb 2006 08:03:30 -0000	1.303
+++ sources	26 Feb 2006 18:59:58 -0000	1.304
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-6e504160b675a6bf2153bd7276d0d219  patch-2.6.16-rc4-git8.bz2
+7ad3a838fb88917b735856352d3a6573  patch-2.6.16-rc4-git9.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- upstream	25 Feb 2006 08:03:30 -0000	1.278
+++ upstream	26 Feb 2006 18:59:58 -0000	1.279
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git8.bz2
+patch-2.6.16-rc4-git9.bz2


--- linux-2.6-ipw2200-hwcrypto.patch DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 19:46:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 14:46:25 -0500
Subject: rpms/openoffice.org/devel
	openoffice.org-2.0.2.ooo62030.solenv._version.patch, 1.1,
	1.2 openoffice.org.spec, 1.631, 1.632
Message-ID: <200602261946.k1QJkP2B024403@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23911

Modified Files:
	openoffice.org-2.0.2.ooo62030.solenv._version.patch 
	openoffice.org.spec 
Log Message:
use final upstream fix

openoffice.org-2.0.2.ooo62030.solenv._version.patch:
 tg_shl.mk |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Index: openoffice.org-2.0.2.ooo62030.solenv._version.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo62030.solenv._version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.ooo62030.solenv._version.patch	15 Feb 2006 08:30:43 -0000	1.1
+++ openoffice.org-2.0.2.ooo62030.solenv._version.patch	26 Feb 2006 19:46:21 -0000	1.2
@@ -1,10 +1,27 @@
---- OOB680_m1.orig/solenv/inc/target.mk	2005-12-14 15:37:20.000000000 +0000
-+++ OOB680_m1/solenv/inc/target.mk	2006-02-14 09:35:12.000000000 +0000
-@@ -2649,7 +2655,6 @@
- 	@+echo $(EMQ)#define _LAST_MINOR $(EMQ)"$(LAST_MINOR)$(EMQ)"   >> $(VERSIONTMP)
- 	@+echo $(EMQ)#define _RSCREVISION $(EMQ)"$(USQ)$(RSCREVISION)$(USQ)$(EMQ)" >> $(VERSIONTMP)
- 	@+echo $(EMQ)#define _INPATH $(EMQ)"$(INPATH)$(EMQ)"           >> $(VERSIONTMP)
--	@+-$(RM) $@ >& $(NULLDEV)
- 	@+-$(RENAME) $(VERSIONTMP) $@
+Index: tg_shl.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/tg_shl.mk,v
+retrieving revision 1.93
+retrieving revision 1.93.104.1
+diff -u -r1.93 -r1.93.104.1
+--- OOB680_m1.orig/solenv/inc/tg_shl.mk	14 Dec 2005 15:37:49 -0000	1.93
++++ OOB680_m1/solenv/inc/tg_shl.mk	16 Feb 2006 15:35:16 -0000	1.93.104.1
+@@ -126,14 +126,15 @@
  
- .IF "$(MAKEFILERC)"==""
+ .IF "$(VERSIONOBJ)"!=""
+ SHL$(TNR)VERSIONOBJ:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
+-USE_VERSIONH:=$(INCCOM)$/_version.h
++USE_VERSIONH:=$(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h
+ .IF "$(GUI)" == "UNX"
+ SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f:s/.o/.obj/)
+ .ELSE           # "$(GUI)" == "UNX"
+ SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}$(VERSIONOBJ:f)
+ .ENDIF          # "$(GUI)" == "UNX"
+-$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/_version.h
+-    +$(COPY) $(SOLARENV)$/src$/version.c $@
++$(MISC)$/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)$/src$/version.c $(INCCOM)$/$(SHL$(TNR)VERSIONOBJ:b).h
++#    +$(COPY) $(SOLARENV)$/src$/version.c $@
++	+$(TYPE) $(SOLARENV)$/src$/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
+ 
+ .INIT : $(SHL$(TNR)VERSIONOBJDEP)
+ .ENDIF			# "$(VERSIONOBJ)"!=""


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- openoffice.org.spec	25 Feb 2006 13:49:16 -0000	1.631
+++ openoffice.org.spec	26 Feb 2006 19:46:21 -0000	1.632
@@ -138,29 +138,30 @@
 Source9:	Tigert-templates.tar.gz
 Source10:	documentation.openoffice.org-templates.tar.gz
 Source11:	redhat-templates.tar.gz
-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
-BuildRequires:  %{gccjava} >= 4.0.2, %{libgcjdevel} >= 4.0.2
-BuildRequires: 	java-1.4.2-gcj-compat-devel, zlib-devel, freetype-devel
-BuildRequires: 	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
-BuildRequires: 	boost-devel >= 1.31.0, python-devel, mozilla-devel >= 1.7.5
-BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
-BuildRequires: 	libidn-devel, libwpd-devel >= 0.8.0, sane-backends-devel
-BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
-BuildRequires:	evolution-data-server-devel, libxslt-devel, unixODBC-devel
-BuildRequires:	db4-devel, libXaw-devel, libXt-devel, libICE-devel
+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
+BuildRequires:	%{gccjava} >= 4.0.2, %{libgcjdevel} >= 4.0.2
+BuildRequires:	java-1.4.2-gcj-compat-devel, zlib-devel, freetype-devel
+BuildRequires:	gtk2-devel >= 2.4.8, gnome-vfs2-devel, cups-devel, curl-devel
+BuildRequires:	boost-devel >= 1.31.0, python-devel, expat-devel, libxml2-devel
+BuildRequires:	openldap-devel, neon-devel >= 0.24, libidn-devel, pam-devel
+BuildRequires:	libwpd-devel >= 0.8.0, sane-backends-devel, libjpeg-devel
+BuildRequires:	desktop-file-utils >= 0.9, evolution-data-server-devel
+BuildRequires:	libxslt-devel, unixODBC-devel, db4-devel, libICE-devel
+BuildRequires:	libXaw-devel, libXt-devel, mozilla-devel
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
 %endif
 %if ! %{internaljavabits}
-BuildRequires:  db4-java >= 4.3.28-3, hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
+BuildRequires:	db4-java >= 4.3.28-3, hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2
+BuildRequires:	xerces-j2
 %endif
 %if ! %{internalicu}
 BuildRequires:  icu >= 3.4, libicu-devel >= 3.4
 %endif
 %if ! %{internalagg}
-BuildRequires:  agg-devel
+BuildRequires:	agg-devel
 %endif
 %if %{gnomeprintui}
 BuildRequires:	libgnomeprintui22-devel



From fedora-cvs-commits at redhat.com  Sun Feb 26 22:37:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 17:37:25 -0500
Subject: rpms/kernel/devel linux-2.6-audit-by-context-sup.patch, NONE,
	1.1.2.1 linux-2.6-audit-by-context.patch, NONE,
	1.1.2.1 linux-2.6-audit-context-leak.patch, NONE,
	1.1.2.1 linux-2.6-audit-fix-operators.patch, NONE,
	1.1.4.1 linux-2.6-audit-git.patch, NONE,
	1.1.12.1 linux-2.6-audit-inotify-api.patch, NONE,
	1.1.6.1 linux-2.6-audit-ipc-leak.patch, NONE,
	1.1.2.1 linux-2.6-audit-promisc.patch, NONE,
	1.1.8.1 linux-2.6-audit-rule-log.patch, NONE,
	1.1.8.1 linux-2.6-audit-string-1.patch, NONE,
	1.1.8.1 linux-2.6-audit-string-2.patch, NONE,
	1.1.8.1 linux-2.6-audit-tty.patch, NONE,
	1.1.8.1 linux-2.6-vm86-audit_syscall_exit.patch, NONE,
	1.1.6.1 kernel-2.6.spec, 1.1986, 1.1986.2.1
Message-ID: <200602262237.k1QMbPKP016944@cvs.devel.redhat.com>

Author: sgrubb

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16432

Modified Files:
      Tag: private-lspp-10-branch
	kernel-2.6.spec 
Added Files:
      Tag: private-lspp-10-branch
	linux-2.6-audit-by-context-sup.patch 
	linux-2.6-audit-by-context.patch 
	linux-2.6-audit-context-leak.patch 
	linux-2.6-audit-fix-operators.patch linux-2.6-audit-git.patch 
	linux-2.6-audit-inotify-api.patch 
	linux-2.6-audit-ipc-leak.patch linux-2.6-audit-promisc.patch 
	linux-2.6-audit-rule-log.patch linux-2.6-audit-string-1.patch 
	linux-2.6-audit-string-2.patch linux-2.6-audit-tty.patch 
	linux-2.6-vm86-audit_syscall_exit.patch 
Log Message:
lspp.10 test kernel



linux-2.6-audit-by-context-sup.patch:
 include/linux/audit.h          |    5 
 include/linux/selinux.h        |  112 +++++++++++++++++++
 security/selinux/Makefile      |    2 
 security/selinux/avc.c         |   13 +-
 security/selinux/exports.c     |   28 ++++
 security/selinux/ss/mls.c      |   30 +++++
 security/selinux/ss/mls.h      |    4 
 security/selinux/ss/services.c |  235 ++++++++++++++++++++++++++++++++++++++++-
 8 files changed, 419 insertions(+), 10 deletions(-)

--- NEW FILE linux-2.6-audit-by-context-sup.patch ---
>From dgoeddel at trustedcs.com Fri Feb 24 16:44:05 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; Fri, 24 Feb 2006 16:44:41 -0500
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 k1OLifG2001945;
	Fri, 24 Feb 2006 16:44:41 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1OLic129056;
	Fri, 24 Feb 2006 16:44:38 -0500
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 k1OLiW0I024089;
	Fri, 24 Feb 2006 16:44:32 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 8DBC872E9A; Fri, 24 Feb 2006 16:44:32 -0500 (EST)
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
	k1OLiUDt005313 for <linux-audit at listman.util.phx.redhat.com>;
	Fri, 24 Feb 2006 16:44:30 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1OLiU128992
	for <linux-audit at redhat.com>; Fri, 24 Feb 2006 16:44:30 -0500
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [67.100.190.245])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k1OLiStA007278
	for <linux-audit at redhat.com>; Fri, 24 Feb 2006 16:44:28 -0500
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k1OLiLJx009510;
	Fri, 24 Feb 2006 16:44:21 -0500 (EST)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap
	(V1.3) id (null); Fri Feb 24 16:44:07 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 <B43ff7e270000>; Fri, 24 Feb 2006 16:44:07 -0500
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 D34QS2PX; Fri, 24 Feb 2006 16:44:06 -0500
Message-ID: <43FF7E25.5040002 at trustedcs.com>
Date: Fri, 24 Feb 2006 15:44:05 -0600
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Stephen Smalley <sds at tycho.nsa.gov>
References: <43F49805.2000109 at trustedcs.com>	 <43FB86DD.2020708 at trustedcs.com>	
	<1140619592.31467.218.camel at moss-spartans.epoch.ncsc.mil>	
	<43FDF3EC.7000303 at trustedcs.com>
	<1140787657.21179.143.camel at moss-spartans.epoch.ncsc.mil>
In-Reply-To: <1140787657.21179.143.camel at moss-spartans.epoch.ncsc.mil>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-loop: linux-audit at redhat.com
Cc: Linux Audit Discussion <linux-audit at redhat.com>,
 James Morris <jmorris at namei.org>,
 "'SELinux List'" <SELinux at tycho.nsa.gov>
Subject: [PATCH] support for context based audit filtering
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-UID: 51494
X-Length: 21794

Stephen Smalley wrote:
> On Thu, 2006-02-23 at 11:42 -0600, Darrel Goeddel wrote:
> 
>>diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
>>index 640d0bf..df358be 100644
>>--- a/security/selinux/ss/mls.c
>>+++ b/security/selinux/ss/mls.c
>>@@ -385,6 +385,31 @@ out:
>> }
>> 
>> /*
>>+ * Set the MLS fields in the security context structure
>>+ * `context' based on the string representation in
>>+ * the string `str'.  This function will allocate temporary memory with the
>>+ * given constraints of gfp_mask.
>>+ */
>>+int mls_from_string(char *str, struct context *context, gfp_t gfp_mask)
>>+{
>>+	char *tmpstr, *freestr;
>>+	int rc;
> 
> 
> Likely should be checking selinux_mls_enabled on entry and returning an
> error in that case (mls_context_to_sid will just return 0 in that case).
> 
> 
>>diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
>>index d877cd1..a2ad2cd 100644
>>--- a/security/selinux/ss/services.c
>>+++ b/security/selinux/ss/services.c
> 
> 
> Need to #include <linux/selinux.h> now to pick up the function
> prototypes for the selinux_audit_ functions to ensure that they are
> checked against the real functions.
> 
> 
>>+	default:
>>+		/* only the above fileds are valid */
> 
> 
> Nit:  Typo in comment.
> 
> Otherwise, looks good.

Fixed up those two issues.  I also fixed a compilation problem when selinux
support is not compiled in, and a possible oops when selinux is compiled in
but not initialized (including being disabled at runtime).  The final
version is below.

--

The following patch provides selinux interfaces that will allow the audit
system to perform filtering based on the process context (user, role, type,
sensitivity, and clearance).  These interfaces will allow the selinux
module to perform efficient matches based on lower level selinux constructs,
rather than relying on context retrievals and string comparisons within
the audit module.  It also allows for dominance checks on the mls portion
of the contexts that are impossible with only string comparisons.


Signed-off-by: Darrel Goeddel <dgoeddel at trustedcs.com>


diff --git a/include/linux/audit.h b/include/linux/audit.h
index 4bb4b9f..dd4f759 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -140,6 +140,11 @@
 #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 */
 
 				/* These are ONLY useful when checking
 				 * at syscall exit time (AUDIT_AT_EXIT). */
diff --git a/include/linux/selinux.h b/include/linux/selinux.h
new file mode 100644
index 0000000..9d684b1
--- /dev/null
+++ b/include/linux/selinux.h
@@ -0,0 +1,112 @@
+/*
+ * SELinux services exported to the rest of the kernel.
+ *
+ * Author: James Morris <jmorris at redhat.com>
+ *
+ * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris at redhat.com>
+ * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel at trustedcs.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,
+ * as published by the Free Software Foundation.
+ */
+#ifndef _LINUX_SELINUX_H
+#define _LINUX_SELINUX_H
+
+struct selinux_audit_rule;
+struct audit_context;
+
+#ifdef CONFIG_SECURITY_SELINUX
+
+/**
+ *	selinux_audit_rule_init - alloc/init an selinux audit rule structure.
+ *	@field: the field this rule refers to
+ *	@op: the operater the rule uses
+ *	@rulestr: the text "target" of the rule
+ *	@rule: pointer to the new rule structure returned via this
+ *
+ *	Returns 0 if successful, -errno if not.  On success, the rule structure
+ *	will be allocated internally.  The caller must free this structure with
+ *	selinux_audit_rule_free() after use.
+ */
+int selinux_audit_rule_init(u32 field, u32 op, char *rulestr,
+                            struct selinux_audit_rule **rule);
+
+/**
+ *	selinux_audit_rule_free - free an selinux audit rule structure.
+ *	@rule: pointer to the audit rule to be freed
+ *
+ *	This will free all memory associated with the given rule.
+ *	If @rule is NULL, no operation is performed.
+ */
+void selinux_audit_rule_free(struct selinux_audit_rule *rule);
+
+/**
+ *	selinux_audit_rule_match - determine if a context ID matches a rule.
+ *	@ctxid: the context ID to check
+ *	@field: the field this rule refers to
+ *	@op: the operater the rule uses
+ *	@rule: pointer to the audit rule to check against
+ *	@actx: the audit context (can be NULL) associated with the check
+ *
+ *	Returns 1 if the context id matches the rule, 0 if it does not, and
+ *	-errno on failure.
+ */
+int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+                             struct selinux_audit_rule *rule,
+                             struct audit_context *actx);
+
+/**
+ *	selinux_audit_set_callback - set the callback for policy reloads.
+ *	@callback: the function to call when the policy is reloaded
+ *
+ *	This sets the function callback function that will update the rules
+ *	upon policy reloads.  This callback should rebuild all existing rules
+ *	using selinux_audit_rule_init().
+ */
+void selinux_audit_set_callback(int (*callback)(void));
+
+/**
+ *	selinux_task_ctxid - determine a context ID for a process.
+ *	@tsk: the task object
+ *	@ctxid: ID value returned via this
+ *
+ *	On return, ctxid will contain an ID for the context.  This value
+ *	should only be used opaquely.
+ */
+void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid);
+
+#else
+
+static inline int selinux_audit_rule_init(u32 field, u32 op,
+                                          char *rulestr,
+                                          struct selinux_audit_rule **rule)
+{
+	return -ENOTSUPP;
+}
+
+static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule)
+{
+	return;
+}
+
+static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+                                           struct selinux_audit_rule *rule,
+                                           struct audit_context *actx)
+{
+	return 0;
+}
+
+static inline void selinux_audit_set_callback(int (*callback)(void))
+{
+	return;
+}
+
+static inline void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid)
+{
+	*ctxid = 0;
+}
+
+#endif	/* CONFIG_SECURITY_SELINUX */
+
+#endif /* _LINUX_SELINUX_H */
diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index 688c0a2..faf2e02 100644
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/
 
-selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o
+selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o exports.o
 
 selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
 
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index ac5d69b..a300702 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -800,7 +800,7 @@ out:
 int avc_ss_reset(u32 seqno)
 {
 	struct avc_callback_node *c;
-	int i, rc = 0;
+	int i, rc = 0, tmprc;
 	unsigned long flag;
 	struct avc_node *node;
 
@@ -813,15 +813,16 @@ int avc_ss_reset(u32 seqno)
 
 	for (c = avc_callbacks; c; c = c->next) {
 		if (c->events & AVC_CALLBACK_RESET) {
-			rc = c->callback(AVC_CALLBACK_RESET,
-					 0, 0, 0, 0, NULL);
-			if (rc)
-				goto out;
+			tmprc = c->callback(AVC_CALLBACK_RESET,
+			                    0, 0, 0, 0, NULL);
+			/* save the first error encountered for the return
+			   value and continue processing the callbacks */
+			if (!rc)
+				rc = tmprc;
 		}
 	}
 
 	avc_latest_notif_update(seqno, 0);
-out:
 	return rc;
 }
 
diff --git a/security/selinux/exports.c b/security/selinux/exports.c
new file mode 100644
index 0000000..333c4c7
--- /dev/null
+++ b/security/selinux/exports.c
@@ -0,0 +1,28 @@
+/*
+ * SELinux services exported to the rest of the kernel.
+ *
+ * Author: James Morris <jmorris at redhat.com>
+ *
+ * Copyright (C) 2005 Red Hat, Inc., James Morris <jmorris at redhat.com>
+ * Copyright (C) 2006 Trusted Computer Solutions, Inc. <dgoeddel at trustedcs.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,
+ * as published by the Free Software Foundation.
+ */
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/selinux.h>
+
+#include "security.h"
+#include "objsec.h"
+
+void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid)
+{
+	struct task_security_struct *tsec = tsk->security;
+	if (selinux_enabled)
+		*ctxid = tsec->sid;
+	else
+		*ctxid = 0;
+}
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index 640d0bf..fc34f87 100644
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -8,7 +8,7 @@
  *
  *	Support for enhanced MLS infrastructure.
  *
- * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
+ * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
 
 #include <linux/kernel.h>
@@ -385,6 +385,34 @@ out:
 }
 
 /*
+ * Set the MLS fields in the security context structure
+ * `context' based on the string representation in
+ * the string `str'.  This function will allocate temporary memory with the
+ * given constraints of gfp_mask.
+ */
+int mls_from_string(char *str, struct context *context, gfp_t gfp_mask)
+{
+	char *tmpstr, *freestr;
+	int rc;
+
+	if (!selinux_mls_enabled)
+		return -EINVAL;
+
+	/* we need freestr because mls_context_to_sid will change
+	   the value of tmpstr */
+	tmpstr = freestr = kstrdup(str, gfp_mask);
+	if (!tmpstr) {
+		rc = -ENOMEM;
+	} else {
+		rc = mls_context_to_sid(':', &tmpstr, context,
+		                        NULL, SECSID_NULL);
+		kfree(freestr);
+	}
+
+	return rc;
+}
+
+/*
  * Copies the effective MLS range from `src' into `dst'.
  */
 static inline int mls_scopy_context(struct context *dst,
diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h
index 03de697..fbb42f0 100644
--- a/security/selinux/ss/mls.h
+++ b/security/selinux/ss/mls.h
@@ -8,7 +8,7 @@
  *
  *	Support for enhanced MLS infrastructure.
  *
- * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
+ * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc.
  */
 
 #ifndef _SS_MLS_H_
@@ -27,6 +27,8 @@ int mls_context_to_sid(char oldc,
 		       struct sidtab *s,
 		       u32 def_sid);
 
+int mls_from_string(char *str, struct context *context, gfp_t gfp_mask);
+
 int mls_convert_context(struct policydb *oldp,
 			struct policydb *newp,
 			struct context *context);
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index d877cd1..ce9378e 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -7,12 +7,13 @@
  * Updated: Trusted Computer Solutions, Inc. <dgoeddel at trustedcs.com>
  *
  *	Support for enhanced MLS infrastructure.
+ *	Support for context based audit filters.
  *
  * Updated: Frank Mayer <mayerf at tresys.com> and Karl MacMillan <kmacmillan at tresys.com>
  *
  * 	Added conditional policy language extensions
  *
- * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc.
+ * 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>
  *	This program is free software; you can redistribute it and/or modify
@@ -1810,3 +1811,235 @@ out:
 	POLICY_RDUNLOCK;
 	return rc;
 }
+
+struct selinux_audit_rule {
+	u32 au_seqno;
+	struct context au_ctxt;
+};
+
+void selinux_audit_rule_free(struct selinux_audit_rule *rule)
+{
+	if (rule) {
+		context_destroy(&rule->au_ctxt);
+		kfree(rule);
+	}
+}
+
+int selinux_audit_rule_init(u32 field, u32 op, char *rulestr,
+                            struct selinux_audit_rule **rule)
+{
+	struct selinux_audit_rule *tmprule;
+	struct role_datum *roledatum;
+	struct type_datum *typedatum;
+	struct user_datum *userdatum;
+	int rc = 0;
+
+	*rule = NULL;
+
+	if (!ss_initialized)
+		return -ENOTSUPP;
+
+	switch (field) {
+	case AUDIT_SE_USER:
+	case AUDIT_SE_ROLE:
+	case AUDIT_SE_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:
+		/* we do not allow a range, indicated by the presense of '-' */
+		if (strchr(rulestr, '-'))
+			return -EINVAL;
+		break;
+	default:
+		/* only the above fields are valid */
+		return -EINVAL;
+	}
+
+	tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL);
+	if (!tmprule)
+		return -ENOMEM;
+
+	context_init(&tmprule->au_ctxt);
+
+	POLICY_RDLOCK;
+
+	tmprule->au_seqno = latest_granting;
+
+	switch (field) {
+	case AUDIT_SE_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:
+		roledatum = hashtab_search(policydb.p_roles.table, rulestr);
+		if (!roledatum)
+			rc = -EINVAL;
+		else
+			tmprule->au_ctxt.role = roledatum->value;
+		break;
+	case AUDIT_SE_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:
+		rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC);
+		break;
+	}
+
+	POLICY_RDUNLOCK;
+
+	if (rc) {
+		selinux_audit_rule_free(tmprule);
+		tmprule = NULL;
+	}
+
+	*rule = tmprule;
+
+	return rc;
+}
+
+int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op,
+                             struct selinux_audit_rule *rule,
+                             struct audit_context *actx)
+{
+	struct context *ctxt;
+	struct mls_level *level;
+	int match = 0;
+
+	if (!rule) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: missing rule\n");
+		return -ENOENT;
+	}
+
+	POLICY_RDLOCK;
+
+	if (rule->au_seqno < latest_granting) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: stale rule\n");
+		match = -ESTALE;
+		goto out;
+	}
+
+	ctxt = sidtab_search(&sidtab, ctxid);
+	if (!ctxt) {
+		audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR,
+		          "selinux_audit_rule_match: unrecognized SID %d\n",
+		          ctxid);
+		match = -ENOENT;
+		goto out;
+	}
+
+	/* a field/op pair that is not caught here will simply fall through
+	   without a match */
+	switch (field) {
+	case AUDIT_SE_USER:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->user == rule->au_ctxt.user);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->user != rule->au_ctxt.user);
+			break;
+		}
+		break;
+	case AUDIT_SE_ROLE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->role == rule->au_ctxt.role);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->role != rule->au_ctxt.role);
+			break;
+		}
+		break;
+	case AUDIT_SE_TYPE:
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = (ctxt->type == rule->au_ctxt.type);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = (ctxt->type != rule->au_ctxt.type);
+			break;
+		}
+		break;
+	case AUDIT_SE_SEN:
+	case AUDIT_SE_CLR:
+		level = (op == AUDIT_SE_SEN ?
+		         &ctxt->range.level[0] : &ctxt->range.level[1]);
+		switch (op) {
+		case AUDIT_EQUAL:
+			match = mls_level_eq(&rule->au_ctxt.range.level[0],
+			                     level);
+			break;
+		case AUDIT_NOT_EQUAL:
+			match = !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_LESS_THAN:
+			match = (mls_level_dom(&rule->au_ctxt.range.level[0],
+			                       level) &&
+			         !mls_level_eq(&rule->au_ctxt.range.level[0],
+			                       level));
+			break;
+		case AUDIT_LESS_THAN_OR_EQUAL:
+			match = mls_level_dom(&rule->au_ctxt.range.level[0],
+			                      level);
+			break;
+		case AUDIT_GREATER_THAN:
+			match = (mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]) &&
+			         !mls_level_eq(level,
+			                       &rule->au_ctxt.range.level[0]));
+			break;
+		case AUDIT_GREATER_THAN_OR_EQUAL:
+			match = mls_level_dom(level,
+			                      &rule->au_ctxt.range.level[0]);
+			break;
+		}
+	}
+
+out:
+	POLICY_RDUNLOCK;
+	return match;
+}
+
+static int (*aurule_callback)(void) = NULL;
+
+static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid,
+                               u16 class, u32 perms, u32 *retained)
+{
+	int err = 0;
+
+	if (event == AVC_CALLBACK_RESET && aurule_callback)
+		err = aurule_callback();
+	return err;
+}
+
+static int __init aurule_init(void)
+{
+	int err;
+
+	err = avc_add_callback(aurule_avc_callback, AVC_CALLBACK_RESET,
+	                       SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+	if (err)
+		panic("avc_add_callback() failed, error %d\n", err);
+
+	return err;
+}
+__initcall(aurule_init);
+
+void selinux_audit_set_callback(int (*callback)(void))
+{
+	aurule_callback = callback;
+}


-- 

Darrel

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-by-context.patch:
 audit.h       |    8 +-
 auditfilter.c |  210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 auditsc.c     |   20 +++++
 3 files changed, 229 insertions(+), 9 deletions(-)

--- NEW FILE linux-2.6-audit-by-context.patch ---
>From dgoeddel at trustedcs.com Fri Feb 24 17:26:13 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, 24 Feb 2006 17:26:26 -0500
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 k1OMQPG2005753
	for <sgrubb at boston.redhat.com>; Fri, 24 Feb 2006 17:26:26 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1OMQP109089;
	Fri, 24 Feb 2006 17:26:25 -0500
Received: from tcsfw4.tcs-sec.com (tcsfw4.tcs-sec.com [67.100.190.245])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k1OMQO6Q024168;
	Fri, 24 Feb 2006 17:26:24 -0500
Received: (from smmsp at localhost)
	by tcsfw4.tcs-sec.com (8.12.2/8.12.2) id k1OMQG0R026133;
	Fri, 24 Feb 2006 17:26:16 -0500 (EST)
Received: from trauma.tcs-sec.com(192.168.1.16) by tcsfw4.tcs-sec.com via smap (V1.3)
	id (null); Fri Feb 24 17:26:15 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 <B43ff88070000>; Fri, 24 Feb 2006 17:26:15 -0500
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 D34QS2RJ; Fri, 24 Feb 2006 17:26:14 -0500
Message-ID: <43FF8805.2050606 at trustedcs.com>
Date: Fri, 24 Feb 2006 16:26:13 -0600
From: Darrel Goeddel <dgoeddel at trustedcs.com>
User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Darrel Goeddel <dgoeddel at trustedcs.com>
CC: Dustin Kirkland <dustin.kirkland at us.ibm.com>,
 Amy Griffis <amy.griffis at hp.com>,
 Steve Grubb <sgrubb at redhat.com>,
 Stephen Smalley <sds at tycho.nsa.gov>,
 "selinux at tycho.nsa.gov" <selinux at tycho.nsa.gov>,
 Linux Audit Discussion <linux-audit at redhat.com>
Subject: Re: [PATCH] support for context based audit filtering
References: <43F49805.2000109 at trustedcs.com>	 <43FB86DD.2020708 at trustedcs.com>		<1140619592.31467.218.camel at moss-spartans.epoch.ncsc.mil>		<43FDF3EC.7000303 at trustedcs.com>	<1140787657.21179.143.camel at moss-spartans.epoch.ncsc.mil> <43FF7E25.5040002 at trustedcs.com>
In-Reply-To: <43FF7E25.5040002 at trustedcs.com>
Content-Type: text/plain;
  charset=ISO-8859-1;
  format=flowed
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-UID: 51502
X-Length: 13682

Darrel Goeddel wrote:
<snip>
> The following patch provides selinux interfaces that will allow the audit
> system to perform filtering based on the process context (user, role, type,
> sensitivity, and clearance).  These interfaces will allow the selinux
> module to perform efficient matches based on lower level selinux 
> constructs,
> rather than relying on context retrievals and string comparisons within
> the audit module.  It also allows for dominance checks on the mls portion
> of the contexts that are impossible with only string comparisons.
> 

I have updated the audit portion of the patch to match up with this latest selinux
patch.

The last update to that patch was here:
http://marc.theaimsgroup.com/?l=selinux&m=114056729028852&w=2

I have also reworked the update procedure of the se_rule fields to hopefully be
in line with the requirement of RCU.  Consider this portion of the patch for
*testing only*.  The other portions of the patch seem good to me so far.

--

diff --git a/kernel/audit.h b/kernel/audit.h
index eb33354..3ffc70a 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -59,9 +59,11 @@ struct audit_watch {
 };
 
 struct audit_field {
-	u32			type;
-	u32			val;
-	u32			op;
+	u32				type;
+	u32				val;
+	u32				op;
+	char				*se_str;
+	struct selinux_audit_rule	*se_rule;
 };
 
 struct audit_krule {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 3712295..752e2bb 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -25,6 +25,7 @@
 #include <linux/fs.h>
 #include <linux/namei.h>
 #include <linux/netlink.h>
+#include <linux/selinux.h>
 #include "audit.h"
 
 /* There are three lists of rules -- one to search at task creation
@@ -50,6 +51,13 @@ static inline void audit_free_watch(stru
 
 static inline void audit_free_rule(struct audit_entry *e)
 {
+	int i;
+	if (e->rule.fields)
+		for (i = 0; i < e->rule.field_count; i++) {
+			struct audit_field *f = &e->rule.fields[i];
+			kfree(f->se_str);
+			selinux_audit_rule_free(f->se_rule);
+		}
 	kfree(e->rule.fields);
 	kfree(e);
 }
@@ -192,7 +200,12 @@ static struct audit_entry *audit_rule_to
 		f->val = rule->values[i];
 
 		if (f->type & AUDIT_UNUSED_BITS ||
-		    f->type == AUDIT_WATCH) {
+		    f->type == AUDIT_WATCH ||
+		    f->type == AUDIT_SE_USER ||
+		    f->type == AUDIT_SE_ROLE ||
+		    f->type == AUDIT_SE_TYPE ||
+		    f->type == AUDIT_SE_SEN ||
+		    f->type == AUDIT_SE_CLR) {
 			err = -EINVAL;
 			goto exit_free;
 		}
@@ -222,7 +235,7 @@ static struct audit_entry *audit_data_to
 	void *bufp;
 	size_t remain = datasz - sizeof(struct audit_rule_data);
 	int i;
-	char *path;
+	char *str;
 
 	entry = audit_to_entry_common((struct audit_rule *)data);
 	if (IS_ERR(entry))
@@ -241,16 +254,42 @@ static struct audit_entry *audit_data_to
 		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
 		f->type = data->fields[i];
 		f->val = data->values[i];
+		f->se_str = NULL;
+		f->se_rule = NULL;
 		switch(f->type) {
+		case AUDIT_SE_USER:
+		case AUDIT_SE_ROLE:
+		case AUDIT_SE_TYPE:
+		case AUDIT_SE_SEN:
+		case AUDIT_SE_CLR:
+			str = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(str))
+				goto exit_free;
+			entry->rule.buflen += f->val;
+
+			err = selinux_audit_rule_init(f->type, f->op, str,
+			                              &f->se_rule);
+			/* Keep currently invalid fields around in case they
+			   become valid after a policy reload. */
+			if (err == -EINVAL) {
+				printk(KERN_WARNING "selinux audit rule for item %s is invalid\n", str);
+				err = 0;
+			}
+			if (err) {
+				kfree(str);
+				goto exit_free;
+			} else
+				f->se_str = str;
+			break;
 		case AUDIT_WATCH:
-			path = audit_unpack_string(&bufp, &remain, f->val);
-			if (IS_ERR(path))
+			str = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(str))
 				goto exit_free;
 			entry->rule.buflen += f->val;
 
-			err = audit_to_watch(path, &entry->rule, i);
+			err = audit_to_watch(str, &entry->rule, i);
 			if (err) {
-				kfree(path);
+				kfree(str);
 				goto exit_free;
 			}
 			break;
@@ -333,6 +372,14 @@ static struct audit_rule_data *audit_kru
 			data->buflen += data->values[i] =
 				audit_pack_string(&bufp, krule->watch->path);
 			break;
+		case AUDIT_SE_USER:
+		case AUDIT_SE_ROLE:
+		case AUDIT_SE_TYPE:
+		case AUDIT_SE_SEN:
+		case AUDIT_SE_CLR:
+			data->buflen += data->values[i] =
+				audit_pack_string(&bufp, f->se_str);
+			break;
 		default:
 			data->values[i] = f->val;
 		}
@@ -370,6 +417,14 @@ static int audit_compare_rule(struct aud
 			if (audit_compare_watch(a->watch, b->watch))
 				return 1;
 			break;
+		case AUDIT_SE_USER:
+		case AUDIT_SE_ROLE:
+		case AUDIT_SE_TYPE:
+		case AUDIT_SE_SEN:
+		case AUDIT_SE_CLR:
+			if (strcmp(a->fields[i].se_str, b->fields[i].se_str))
+				return 1;
+			break;
 		default:
 			if (a->fields[i].val != b->fields[i].val)
 				return 1;
@@ -640,6 +695,9 @@ int audit_comparator(const u32 left, con
 	default:
 		return -EINVAL;
 	}
+	/* should NEVER get here */
+	BUG();
+	return 0;
 }
 
 
@@ -726,3 +784,143 @@ unlock_and_return:
 	rcu_read_unlock();
 	return result;
 }
+
+/* Check to see if the rule contains any selinux fields.  Returns 1 if there
+   are selinux fields specified in the rule, 0 otherwise. */
+static inline int audit_rule_has_selinux(struct audit_krule *rule)
+{
+	int i;
+
+	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:
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/* Make a copy of src in dest.  This will be a deep copy with the exception
+   of the watch - that pointer is carried over.  The selinux specific fields
+   will be updated in the copy.  The point is to be able to replace the src
+   rule with the dest rule in the list, then free the dest rule. */
+static inline int selinux_audit_rule_update_helper(struct audit_krule *dest,
+                                                   struct audit_krule *src)
+{
+	int i, err = 0;
+
+	dest->vers_ops = src->vers_ops;
+	dest->flags = src->flags;
+	dest->listnr = src->listnr;
+	dest->action = src->action;
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
+		dest->mask[i] = src->mask[i];
+	dest->buflen = src->buflen;
+	dest->field_count = src->field_count;
+
+	/* deep copy this information, updating the se_rule fields, because
+	   the originals will all be freed when the old rule is freed. */
+	dest->fields = kzalloc(sizeof(struct audit_field) * dest->field_count,
+	                       GFP_ATOMIC);
+	if (!dest->fields)
+		return -ENOMEM;
+	memcpy(dest->fields, src->fields,
+	       sizeof(struct audit_field) * dest->field_count);
+	for (i = 0; i < dest->field_count; i++) {
+		struct audit_field *df = &dest->fields[i];
+		struct audit_field *sf = &src->fields[i];
+		switch (df->type) {
+		case AUDIT_SE_USER:
+		case AUDIT_SE_ROLE:
+		case AUDIT_SE_TYPE:
+		case AUDIT_SE_SEN:
+		case AUDIT_SE_CLR:
+			/* our own copy of se_str */
+			df->se_str = kstrdup(sf->se_str, GFP_ATOMIC);
+			/* our own (refreshed) copy of se_rule */
+			err = selinux_audit_rule_init(df->type, df->op,
+			                              df->se_str, &df->se_rule);
+			/* Keep currently invalid fields around in case they
+			   become valid after a policy reload. */
+			if (err == -EINVAL) {
+				printk(KERN_WARNING "selinux audit rule for item %s is invalid\n", df->se_str);
+				err = 0;
+			}
+			if (err)
+				return err;
+		}
+	}
+
+	/* we can shallow copy the watch because we will not be freeing it via
+	   selinux_audit_rule_update (and we do nto modify it) */
+	dest->watch = src->watch;
+	dest->rlist = src->rlist;
+
+	return 0;
+}
+
+/* This function will re-initialize the se_rule field of all applicable rules.
+   It will traverse the filter lists serarching for rules that contain selinux
+   specific filter fields.  When such a rule is found, it is copied, the
+   selinux field is re-initialized, and the old rule is replaced with the
+   updated rule. */
+/* XXX: is the error handling below appropriate */
+static int selinux_audit_rule_update(void)
+{
+	struct audit_entry *entry, *nentry;
+	int i, err = 0, tmperr;
+
+	/* audit_netlink_sem synchronizes the writers */
+	down(&audit_netlink_sem);
+
+	for (i = 0; i < AUDIT_NR_FILTERS; i++) {
+		list_for_each_entry(entry, &audit_filter_list[i], list) {
+			if (!audit_rule_has_selinux(&entry->rule))
+				continue;
+
+			nentry = kmalloc(sizeof(*entry), GFP_ATOMIC);
+			if (!nentry) {
+				/* save the first error encountered for the
+				   return value */
+				if (!err)
+					err = -ENOMEM;
+				audit_panic("error updating selinux filters");
+				continue;
+			}
+
+			tmperr = selinux_audit_rule_update_helper(&nentry->rule,
+			                                          &entry->rule);
+			if (!nentry) {
+				/* save the first error encountered for the
+				   return value */
+				if (!err)
+					err = -ENOMEM;
+				audit_free_rule(nentry);
+				audit_panic("error updating selinux filters");
+				continue;
+			}
+			list_replace_rcu(&entry->list, &nentry->list);
+			call_rcu(&entry->rcu, audit_free_rule_rcu);
+		}
+	}
+
+	up(&audit_netlink_sem);
+
+	return err;
+}
+
+/* Register the callback with selinux.  This callback will be invoked when a
+   new policy is loaded. */
+static int __init register_selinux_update_callback(void)
+{
+	selinux_audit_set_callback(&selinux_audit_rule_update);
+	return 0;
+}
+__initcall(register_selinux_update_callback);
+
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index cd83289..f117563 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -58,6 +58,7 @@
 #include <linux/security.h>
 #include <linux/list.h>
 #include <linux/tty.h>
+#include <linux/selinux.h>
 
 #include "audit.h"
 
@@ -168,6 +169,9 @@ static int audit_filter_rules(struct tas
 			      enum audit_state *state)
 {
 	int i, j;
+	u32 sid;
+
+	selinux_task_ctxid(tsk, &sid);
 
 	for (i = 0; i < rule->field_count; i++) {
 		struct audit_field *f = &rule->fields[i];
@@ -258,6 +262,22 @@ 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:
+			/* NOTE: this may return negative values indicating
+			   a temporary error.  We simply treat this as a
+			   match for now to avoid losing information that
+			   may be wanted.   An error message will also be
+			   logged upon error */
+			if (f->se_rule)
+				result = selinux_audit_rule_match(sid, f->type,
+				                                  f->op,
+				                                  f->se_rule,
+				                                  ctx);
+			break;
 		case AUDIT_ARG0:
 		case AUDIT_ARG1:
 		case AUDIT_ARG2:


-- 

Darrel


linux-2.6-audit-context-leak.patch:
 auditsc.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-context-leak.patch ---
>From dustin.kirkland at us.ibm.com Fri Feb 24 15:33:19 2006
Return-Path: <dustin.kirkland at us.ibm.com>
Received: from mail.boston.redhat.com ([unix socket])
	by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Fri, 24 Feb 2006 15:33:38 -0500
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 k1OKXbG2027393
	for <sgrubb at boston.redhat.com>; Fri, 24 Feb 2006 15:33:37 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1OKXa107677;
	Fri, 24 Feb 2006 15:33:36 -0500
Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k1OKXZoh010158;
	Fri, 24 Feb 2006 15:33:35 -0500
Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11])
	by e36.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id k1OKXShu026976;
	Fri, 24 Feb 2006 15:33:28 -0500
Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167])
	by westrelay02.boulder.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k1OKV1vW167962;
	Fri, 24 Feb 2006 13:31:01 -0700
Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1])
	by d03av01.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id k1OKXNeB027618;
	Fri, 24 Feb 2006 13:33:23 -0700
Received: from kirkland1.austin.ibm.com (kirkland1.austin.ibm.com [9.53.40.52])
	by d03av01.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id k1OKXNHs027471;
	Fri, 24 Feb 2006 13:33:23 -0700
Subject: Re: audit-related slab memory leak in recent -mm kernels?
From: Dustin Kirkland <dustin.kirkland at us.ibm.com>
Reply-To: dustin.kirkland at us.ibm.com
To: Alexander Viro <aviro at redhat.com>,
 Valdis.Kletnieks at vt.edu,
 Steve Grubb <sgrubb at redhat.com>
Cc: linux-audit at redhat.com
In-Reply-To: <200602241518.05938.sgrubb at redhat.com>
References: <200602241841.k1OIfPbQ004840 at turing-police.cc.vt.edu>
	 <20060224194025.GA8082 at zk3.dec.com>
	 <200602242011.k1OKBiDl002981 at turing-police.cc.vt.edu>
	 <200602241518.05938.sgrubb at redhat.com>
Content-Type: text/plain
Date: Fri, 24 Feb 2006 14:33:19 -0600
Message-Id: <1140813199.13570.11.camel at kirkland1.austin.ibm.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0 
X-UID: 51475
X-Length: 3253

Updated patch for Al's sake.  Assuming no other arguments, would you
please apply, Al?


:-Dustin

--- a/kernel/auditsc.c	2006-02-24 14:28:39.000000000 -0600
+++ b/kernel/auditsc.c	2006-02-24 14:30:25.000000000 -0600
@@ -380,7 +380,6 @@ static inline void audit_free_names(stru
 			printk(KERN_ERR "names[%d] = %p = %s\n", i,
 			       context->names[i].name,
 			       context->names[i].name ?: "(null)");
-			kfree(context->names[i].ctx);
 		}
 		dump_stack();
 		return;
@@ -391,9 +390,13 @@ static inline void audit_free_names(stru
 	context->ino_count  = 0;
 #endif
 
-	for (i = 0; i < context->name_count; i++)
+	for (i = 0; i < context->name_count; i++) {
+		char *p = context->names[i].ctx;
+		context->names[i].ctx = NULL;
+		kfree(p);
 		if (context->names[i].name)
 			__putname(context->names[i].name);
+	}
 	context->name_count = 0;
 	if (context->pwd)
 		dput(context->pwd);




linux-2.6-audit-fix-operators.patch:
 auditfilter.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-audit-fix-operators.patch ---
>From dustin.kirkland at us.ibm.com Thu Feb 16 14:40:01 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, 16 Feb 2006 14:40:31 -0500
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 k1GJeVi7015183;
	Thu, 16 Feb 2006 14:40:31 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1GJeN124283;
	Thu, 16 Feb 2006 14:40:23 -0500
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 k1GJeISC009512;
	Thu, 16 Feb 2006 14:40:18 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 5FA4A73083; Thu, 16 Feb 2006 14:40:18 -0500 (EST)
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
	k1GJeGRW016720 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 16 Feb 2006 14:40:16 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k1GJeF124129
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:15 -0500
Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k1GJeFU3032558
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:15 -0500
Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com
	[9.17.195.106])
	by e33.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id k1GJe5Ls030154
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 14:40:05 -0500
Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170])
	by d03relay04.boulder.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id
	k1GJgbM7180628
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:42:39 -0700
Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1])
	by d03av04.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id
	k1GJe3Uo012219
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:40:03 -0700
Received: from kirkland1.austin.ibm.com (kirkland1.austin.ibm.com [9.53.40.52])
	by d03av04.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id
	k1GJe2mY012185
	for <linux-audit at redhat.com>; Thu, 16 Feb 2006 12:40:02 -0700
From: Dustin Kirkland <dustin.kirkland at us.ibm.com>
To: Linux Audit Discussion <linux-audit at redhat.com>
Content-Type: text/plain
Date: Thu, 16 Feb 2006 13:40:01 -0600
Message-Id: <1140118802.3083.97.camel at kirkland1.austin.ibm.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) 
Content-Transfer-Encoding: 7bit
X-RedHat-Spam-Score: 0.261 
X-loop: linux-audit at redhat.com
Subject: [PATCH] Fix audit operators
X-BeenThere: linux-audit at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: dustin.kirkland at us.ibm.com
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: 6684
X-UID: 49954

Darrel Goeddel initiated a discussion on IRC regarding the possibility
of audit_comparator() returning -EINVAL signaling an invalid operator.

It is possible when creating the rule to assure that the operator is one
of the 6 sane values.  Here's a snip from include/linux/audit.h  Note
that 0 (nonsense) and 7 (all operators) are not valid values for an
operator.

...
#define AUDIT_NEGATE                    0x80000000

/* These are the supported operators.
 *      4  2  1
 *      =  >  <
 *      -------
 *      0  0  0         0       nonsense
 *      0  0  1         1       <
 *      0  1  0         2       >
 *      0  1  1         3       !=
 *      1  0  0         4       =
 *      1  0  1         5       <=
 *      1  1  0         6       >=
 *      1  1  1         7       all operators
 */
#define AUDIT_LESS_THAN                 0x10000000
#define AUDIT_GREATER_THAN              0x20000000
#define AUDIT_NOT_EQUAL                 0x30000000
#define AUDIT_EQUAL                     0x40000000
#define AUDIT_LESS_THAN_OR_EQUAL        (AUDIT_LESS_THAN|AUDIT_EQUAL)
#define AUDIT_GREATER_THAN_OR_EQUAL     (AUDIT_GREATER_THAN|AUDIT_EQUAL)
#define AUDIT_OPERATORS                 (AUDIT_EQUAL|AUDIT_NOT_EQUAL)
...

Furthermore, prior to adding these extended operators, flagging the
AUDIT_NEGATE bit implied !=, and otherwise == was assumed.

The following code forces the operator to be != if the AUDIT_NEGATE bit
was flipped on.  And if no operator was specified, == is assumed.  The
only invalid condition is if the AUDIT_NEGATE bit is off and all of the
AUDIT_EQUAL, AUDIT_LESS_THAN, and AUDIT_GREATER_THAN bits are
on--clearly a nonsensical operator.

Now that this is handled at rule insertion time, the default -EINVAL
return of audit_comparator() is eliminated such that the function can
only return 1 or 0.

If this is acceptable, let's get this applied to the current tree.

:-Dustin

--

diff -urpN a/kernel/auditfilter.c b/kernel/auditfilter.c
--- a/kernel/auditfilter.c	2006-02-16 11:57:17.000000000 -0600
+++ b/kernel/auditfilter.c	2006-02-16 13:30:33.000000000 -0600
@@ -139,11 +139,17 @@ static struct audit_entry *audit_rule_to
 		f->val = rule->values[i];
 
 		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
+
+		/* Support for legacy operators where
+		 * AUDIT_NEGATE bit signifies != and otherwise assumes == */
 		if (f->op & AUDIT_NEGATE)
-			f->op |= AUDIT_NOT_EQUAL;
-		else if (!(f->op & AUDIT_OPERATORS))
-			f->op |= AUDIT_EQUAL;
-		f->op &= ~AUDIT_NEGATE;
+			f->op = AUDIT_NOT_EQUAL;
+		else if (!f->op)
+			f->op = AUDIT_EQUAL;
+		else if (f->op == AUDIT_OPERATORS) {
+			err = -EINVAL;
+			goto exit_free;
+		}
 	}
 
 exit_nofree:
@@ -537,8 +543,6 @@ int audit_comparator(const u32 left, con
 		return (left > right);
 	case AUDIT_GREATER_THAN_OR_EQUAL:
 		return (left >= right);
-	default:
-		return -EINVAL;
 	}
 }
 


--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-git.patch:
 arch/ia64/kernel/ptrace.c      |   10 
 fs/namei.c                     |   14 
 fs/open.c                      |    8 
 fs/xattr.c                     |   11 
 include/linux/audit.h          |   98 ++++-
 include/linux/fsnotify.h       |   14 
 include/linux/security.h       |   33 +
 ipc/msg.c                      |    5 
 ipc/sem.c                      |    5 
 ipc/shm.c                      |    4 
 ipc/util.c                     |    2 
 kernel/Makefile                |    2 
 kernel/audit.c                 |  142 +++++--
 kernel/audit.h                 |   70 +++
 kernel/auditfilter.c           |  375 +++++++++++++++++++
 kernel/auditsc.c               |  786 +++++++++++++++++++++--------------------
 security/dummy.c               |   14 
 security/selinux/hooks.c       |   98 ++---
 security/selinux/nlmsgtab.c    |    6 
 security/selinux/selinuxfs.c   |   11 
 security/selinux/ss/services.c |   15 
 21 files changed, 1204 insertions(+), 519 deletions(-)

--- NEW FILE linux-2.6-audit-git.patch ---
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 4b19d04..49fd3f6 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1663,8 +1663,14 @@ syscall_trace_leave (long arg0, long arg
 		     long arg4, long arg5, long arg6, long arg7,
 		     struct pt_regs regs)
 {
-	if (unlikely(current->audit_context))
-		audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8);
+	if (unlikely(current->audit_context)) {
+		int success = AUDITSC_RESULT(regs.r10);
+		long result = regs.r8;
+
+		if (success != AUDITSC_SUCCESS)
+			result = -result;
+		audit_syscall_exit(current, success, result);
+	}
 
 	if (test_thread_flag(TIF_SYSCALL_TRACE)
 	    && (current->ptrace & PT_PTRACED))
diff --git a/fs/namei.c b/fs/namei.c
index 6dbbd42..55798c3 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1126,8 +1126,7 @@ int fastcall path_lookup(const char *nam
 	retval = link_path_walk(name, nd);
 out:
	if (likely(retval == 0)) {
-		if (unlikely(current->audit_context && nd && nd->dentry &&
-				nd->dentry->d_inode))
+		if (nd && nd->dentry && nd->dentry->d_inode)
 		audit_inode(name, nd->dentry->d_inode, flags);
	}
 	return retval;
@@ -1301,6 +1300,7 @@ static inline int may_delete(struct inod
 		return -ENOENT;
 
 	BUG_ON(victim->d_parent->d_inode != dir);
+	audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino);
 
 	error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
 	if (error)
@@ -1420,7 +1420,7 @@ int vfs_create(struct inode *dir, struct
 	DQUOT_INIT(dir);
 	error = dir->i_op->create(dir, dentry, mode, nd);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1739,7 +1739,7 @@ int vfs_mknod(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mknod(dir, dentry, mode, dev);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -1810,7 +1810,7 @@ int vfs_mkdir(struct inode *dir, struct 
 	DQUOT_INIT(dir);
 	error = dir->i_op->mkdir(dir, dentry, mode);
 	if (!error)
-		fsnotify_mkdir(dir, dentry->d_name.name);
+		fsnotify_mkdir(dir, dentry);
 	return error;
 }
 
@@ -2047,7 +2047,7 @@ int vfs_symlink(struct inode *dir, struc
 	DQUOT_INIT(dir);
 	error = dir->i_op->symlink(dir, dentry, oldname);
 	if (!error)
-		fsnotify_create(dir, dentry->d_name.name);
+		fsnotify_create(dir, dentry);
 	return error;
 }
 
@@ -2118,7 +2118,7 @@ int vfs_link(struct dentry *old_dentry, 
 	error = dir->i_op->link(old_dentry, dir, new_dentry);
 	up(&old_dentry->d_inode->i_sem);
 	if (!error)
-		fsnotify_create(dir, new_dentry->d_name.name);
+		fsnotify_create(dir, new_dentry);
 	return error;
 }
 
diff --git a/fs/open.c b/fs/open.c
index f53a5b9..3231a67 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -25,6 +25,7 @@
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
+#include <linux/audit.h>
 
 #include <asm/unistd.h>
 
@@ -613,6 +614,8 @@ asmlinkage long sys_fchmod(unsigned int 
 	dentry = file->f_dentry;
 	inode = dentry->d_inode;
 
+	audit_inode(NULL, inode, 0);
+
 	err = -EROFS;
 	if (IS_RDONLY(inode))
 		goto out_putf;
@@ -736,7 +739,10 @@ asmlinkage long sys_fchown(unsigned int 
 
 	file = fget(fd);
 	if (file) {
-		error = chown_common(file->f_dentry, user, group);
+		struct dentry * dentry;
+		dentry = file->f_dentry;
+		audit_inode(NULL, dentry->d_inode, 0);
+		error = chown_common(dentry, user, group);
 		fput(file);
 	}
 	return error;
diff --git a/fs/xattr.c b/fs/xattr.c
index bcc2156..8f40edf 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -17,6 +17,7 @@
 #include <linux/syscalls.h>
 #include <linux/module.h>
 #include <linux/fsnotify.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 
 /*
@@ -113,12 +114,15 @@ sys_fsetxattr(int fd, char __user *name,
 	      size_t size, int flags)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = setxattr(f->f_dentry, name, value, size, flags);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = setxattr(dentry, name, value, size, flags);
 	fput(f);
 	return error;
 }
@@ -365,12 +369,15 @@ asmlinkage long
 sys_fremovexattr(int fd, char __user *name)
 {
 	struct file *f;
+	struct dentry *dentry;
 	int error = -EBADF;
 
 	f = fget(fd);
 	if (!f)
 		return error;
-	error = removexattr(f->f_dentry, name);
+	dentry = f->f_dentry;
+	audit_inode(NULL, dentry->d_inode, 0);
+	error = removexattr(dentry, name);
 	fput(f);
 	return error;
 }
diff --git a/include/linux/audit.h b/include/linux/audit.h
index da3c019..a485639 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -33,11 +33,20 @@
  * 1200 - 1299 messages internal to the audit daemon
  * 1300 - 1399 audit event messages
  * 1400 - 1499 SE Linux use
- * 1500 - 1999 future use
- * 2000 is for otherwise unclassified kernel audit messages
+ * 1500 - 1599 kernel LSPP events
+ * 1600 - 1699 kernel crypto events
+ * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 2000 is for otherwise unclassified kernel audit messages (legacy)
+ * 2001 - 2099 unused (kernel)
+ * 2100 - 2199 user space anomaly records
+ * 2200 - 2299 user space actions taken in response to anomalies
+ * 2300 - 2399 user space generated LSPP events
+ * 2400 - 2499 user space crypto events
+ * 2500 - 2999 future user space (maybe integrity labels and related events)
  *
- * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user
- * space. Anything over that is kernel --> user space communication.
+ * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are
+ * exclusively user space. 1300-2099 is kernel --> user space 
+ * communication.
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
@@ -54,6 +63,8 @@
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
[...2439 lines suppressed...]
-		rc = -EOPNOTSUPP;
-		goto out;
-	}
-
-	rc = security_sid_to_context(isec->sid, &context, &len);
-	if (rc)
-		goto out;
-
-	/* Probe for required buffer size */
-	if (!buffer || !size) {
-		rc = len;
-		goto out_free;
-	}
 
-	if (size < len) {
-		rc = -ERANGE;
-		goto out_free;
-	}
+	if (strcmp(name, XATTR_SELINUX_SUFFIX))
+		return -EOPNOTSUPP;
 
-	if (err > 0) {
-		if ((len == err) && !(memcmp(context, buffer, len))) {
-			/* Don't need to canonicalize value */
-			rc = err;
-			goto out_free;
-		}
-		memset(buffer, 0, size);
-	}
-	memcpy(buffer, context, len);
-	rc = len;
-out_free:
-	kfree(context);
-out:
-	return rc;
+	return selinux_getsecurity(isec->sid, buffer, size);
 }
 
 static int selinux_inode_setsecurity(struct inode *inode, const char *name,
@@ -4054,6 +4052,13 @@ static int selinux_ipc_permission(struct
 	return ipc_has_perm(ipcp, av);
 }
 
+static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size)
+{
+	struct ipc_security_struct *isec = ipcp->security;
+
+	return selinux_getsecurity(isec->sid, buffer, size);
+}
+
 /* module stacking operations */
 static int selinux_register_security (const char *name, struct security_operations *ops)
 {
@@ -4095,8 +4100,7 @@ static int selinux_getprocattr(struct ta
 			       char *name, void *value, size_t size)
 {
 	struct task_security_struct *tsec;
-	u32 sid, len;
-	char *context;
+	u32 sid;
 	int error;
 
 	if (current != p) {
@@ -4105,9 +4109,6 @@ static int selinux_getprocattr(struct ta
 			return error;
 	}
 
-	if (!size)
-		return -ERANGE;
-
 	tsec = p->security;
 
 	if (!strcmp(name, "current"))
@@ -4124,16 +4125,7 @@ static int selinux_getprocattr(struct ta
 	if (!sid)
 		return 0;
 
-	error = security_sid_to_context(sid, &context, &len);
-	if (error)
-		return error;
-	if (len > size) {
-		kfree(context);
-		return -ERANGE;
-	}
-	memcpy(value, context, len);
-	kfree(context);
-	return len;
+	return selinux_getsecurity(sid, value, size);
 }
 
 static int selinux_setprocattr(struct task_struct *p,
@@ -4291,6 +4283,7 @@ static struct security_operations selinu
 	.inode_getxattr =		selinux_inode_getxattr,
 	.inode_listxattr =		selinux_inode_listxattr,
 	.inode_removexattr =		selinux_inode_removexattr,
+	.inode_xattr_getsuffix =        selinux_inode_xattr_getsuffix,
 	.inode_getsecurity =            selinux_inode_getsecurity,
 	.inode_setsecurity =            selinux_inode_setsecurity,
 	.inode_listsecurity =           selinux_inode_listsecurity,
@@ -4328,6 +4321,7 @@ static struct security_operations selinu
 	.task_to_inode =                selinux_task_to_inode,
 
 	.ipc_permission =		selinux_ipc_permission,
+	.ipc_getsecurity =		selinux_ipc_getsecurity,
 
 	.msg_msg_alloc_security =	selinux_msg_msg_alloc_security,
 	.msg_msg_free_security =	selinux_msg_msg_free_security,
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index 69b9329..d7c0e91 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -148,8 +148,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16
 		break;
 
 	case SECCLASS_NETLINK_AUDIT_SOCKET:
-		if (nlmsg_type >= AUDIT_FIRST_USER_MSG &&
-		    nlmsg_type <= AUDIT_LAST_USER_MSG) {
+		if ((nlmsg_type >= AUDIT_FIRST_USER_MSG &&
+		     nlmsg_type <= AUDIT_LAST_USER_MSG) ||
+		    (nlmsg_type >= AUDIT_FIRST_USER_MSG2 &&
+                     nlmsg_type <= AUDIT_LAST_USER_MSG2)) {
 			*perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY;
 		} else {
 			err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms,
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 0e1352a..e64923b 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -21,6 +21,7 @@
 #include <linux/major.h>
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
@@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct 
 		length = task_has_security(current, SECURITY__SETENFORCE);
 		if (length)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"enforcing=%d old_enforcing=%d auid=%u", new_value, 
+			selinux_enforcing,
+			audit_get_loginuid(current->audit_context));
 		selinux_enforcing = new_value;
 		if (selinux_enforcing)
 			avc_ss_reset(0);
@@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct 
 		length = selinux_disable();
 		if (length < 0)
 			goto out;
+		audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+			"selinux=0 auid=%u",
+			audit_get_loginuid(current->audit_context));
 	}
 
 	length = count;
@@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil
 		length = ret;
 	else
 		length = count;
+	audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
+		"policy loaded auid=%u",
+		audit_get_loginuid(current->audit_context));
 out:
 	up(&sel_sem);
 	vfree(data);
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 44eb4d7..2311255 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val
 		goto out;
 	}
 
-	printk(KERN_INFO "security: committed booleans { ");
 	for (i = 0; i < len; i++) {
+		if (!!values[i] != policydb.bool_val_to_struct[i]->state) {
+			audit_log(current->audit_context, GFP_ATOMIC,
+				AUDIT_MAC_CONFIG_CHANGE,
+				"bool=%s val=%d old_val=%d auid=%u",
+				policydb.p_bool_val_to_name[i],
+				!!values[i],
+				policydb.bool_val_to_struct[i]->state,
+				audit_get_loginuid(current->audit_context));
+		}
 		if (values[i]) {
 			policydb.bool_val_to_struct[i]->state = 1;
 		} else {
 			policydb.bool_val_to_struct[i]->state = 0;
 		}
-		if (i != 0)
-			printk(", ");
-		printk("%s:%d", policydb.p_bool_val_to_name[i],
-		       policydb.bool_val_to_struct[i]->state);
 	}
-	printk(" }\n");
 
 	for (cur = policydb.cond_list; cur != NULL; cur = cur->next) {
 		rc = evaluate_cond_node(&policydb, cur);

linux-2.6-audit-inotify-api.patch:
 fs/inotify.c             |  395 +++++++++++++++++++++++++++++------------------
 include/linux/fsnotify.h |   29 +--
 include/linux/inotify.h  |   17 +-
 3 files changed, 279 insertions(+), 162 deletions(-)

--- NEW FILE linux-2.6-audit-inotify-api.patch ---
>From amy.griffis at hp.com Thu Feb  9 14:07:59 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, 09 Feb 2006 14:08:27 -0500
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 k19J8QQo003353;
	Thu, 9 Feb 2006 14:08:27 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8N110283;
	Thu, 9 Feb 2006 14:08:23 -0500
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 k19J8Imo011143;
	Thu, 9 Feb 2006 14:08:18 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 67C5573351; Thu,  9 Feb 2006 14:08:18 -0500 (EST)
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
	k19J8GKS020511 for <linux-audit at listman.util.phx.redhat.com>;
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k19J8G110252; 
	Thu, 9 Feb 2006 14:08:16 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k19J85qE016990;
	Thu, 9 Feb 2006 14:08:05 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id CA77434016;
	Thu,  9 Feb 2006 14:08:01 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id 5E6F03405E;
	Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 44F1C38448A3; Thu,  9 Feb 2006 14:07:59 -0500 (EST)
Date: Thu, 9 Feb 2006 14:07:59 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060209190759.GB9652 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com, aviro at redhat.com
References: <200602091009.16523.sgrubb at redhat.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200602091009.16523.sgrubb at redhat.com>
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
Cc: aviro at redhat.com
Subject: Re: git tree
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: 25658
X-UID: 48537
Status: RO
X-Status: ORC
X-KMail-EncryptionState: N
X-KMail-SignatureState: N
X-KMail-MDN-Sent:  

Hi Al,

Steve Grubb wrote:     [Thu Feb 09 2006, 10:09:16AM EST]
> >From Al:
> 
>        OK...  Untangling the mess around ppoll/unshare for backport to
> 2.6.15-based tree turns out to be just too messy.  Therefore,
> git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git/
> contains the tree based on Linus' current.  Branches:
>         * origin = mainline
>         * audit = ported stuff, that's where everything got to settle
> 
> Amy, I've moved 3 of 4 patches to current tree; please see if they
> are OK (the 3rd might be worth a look)

Looks good, except in 3rd patch fs/inotify.c should have:

#@@ -628,7 +628,7 @@ s32 inotify_add_watch(struct inotify_dev
# 		mask_add = 1;
# 
# 	/* don't let user-space set invalid bits: we don't want flags set */
#-	mask &= IN_ALL_EVENTS;
#+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
# 	if (unlikely(!mask)) {
# 		ret = -EINVAL;
# 		goto out;

Here's the full diff with this change:

diff --git a/fs/inotify.c b/fs/inotify.c
index 3041503..ab57df6 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -85,14 +85,18 @@ struct inotify_device {
 	wait_queue_head_t 	wq;		/* wait queue for i/o */
 	struct idr		idr;		/* idr mapping wd -> watch */
 	struct semaphore	sem;		/* protects this bad boy */
-	struct list_head 	events;		/* list of queued events */
 	struct list_head	watches;	/* list of watches */
 	atomic_t		count;		/* reference count */
+	u32			last_wd;	/* the last wd allocated */
+	/* userland consumer API */
+	struct list_head 	events;		/* list of queued events */
 	struct user_struct	*user;		/* user who opened this dev */
 	unsigned int		queue_size;	/* size of the queue (bytes) */
 	unsigned int		event_count;	/* number of pending events */
 	unsigned int		max_events;	/* maximum number of events */
-	u32			last_wd;	/* the last wd allocated */
+	/* kernel consumer API */
+	void (*callback)(struct inotify_event *, const char *, struct inode *,
+			 void *);		/* event callback */
 };
 
 /*
@@ -124,6 +128,7 @@ struct inotify_watch {
 	struct inode		*inode;	/* associated inode */
 	s32 			wd;	/* watch descriptor */
 	u32			mask;	/* event mask for this watch */
+	void		*callback_arg;	/* callback argument - kernel API */
 };
 
 #ifdef CONFIG_SYSCTL
@@ -175,8 +180,10 @@ static inline void get_inotify_dev(struc
 static inline void put_inotify_dev(struct inotify_device *dev)
 {
 	if (atomic_dec_and_test(&dev->count)) {
-		atomic_dec(&dev->user->inotify_devs);
-		free_uid(dev->user);
+		if (dev->user) {
+			atomic_dec(&dev->user->inotify_devs);
+			free_uid(dev->user);
+		}
 		idr_destroy(&dev->idr);
 		kfree(dev);
 	}
@@ -344,6 +351,24 @@ static void inotify_dev_event_dequeue(st
 }
 
 /*
+ * inotify_callback_event - notify kernel consumers of events
+ */
+static void inotify_callback_event(struct inotify_device *dev,
+				   struct inotify_watch *watch,
+				   u32 mask, u32 cookie, const char *name,
+				   struct inode *inode)
+{
+	struct inotify_event event;
+
+	event.wd = watch->wd;
+	event.mask = mask;
+	event.cookie = cookie;
+	event.len = 0; /* kernel consumers don't need length */
+
+	dev->callback(&event, name, inode, watch->callback_arg);
+}
+
+/*
  * inotify_dev_get_wd - returns the next WD for use by the given dev
  *
  * Callers must hold dev->sem.  This function can sleep.
@@ -387,12 +412,13 @@ static int find_inode(const char __user 
  * Both 'dev' and 'inode' (by way of nameidata) need to be pinned.
  */
 static struct inotify_watch *create_watch(struct inotify_device *dev,
-					  u32 mask, struct inode *inode)
+					  u32 mask, struct inode *inode,
+					  void *callback_arg)
 {
 	struct inotify_watch *watch;
 	int ret;
 
-	if (atomic_read(&dev->user->inotify_watches) >=
+	if (dev->user && atomic_read(&dev->user->inotify_watches) >=
 			inotify_max_user_watches)
 		return ERR_PTR(-ENOSPC);
 
@@ -408,6 +434,7 @@ static struct inotify_watch *create_watc
 
 	dev->last_wd = watch->wd;
 	watch->mask = mask;
+	watch->callback_arg = callback_arg;
 	atomic_set(&watch->count, 0);
 	INIT_LIST_HEAD(&watch->d_list);
 	INIT_LIST_HEAD(&watch->i_list);
@@ -425,7 +452,8 @@ static struct inotify_watch *create_watc
 	/* bump our own count, corresponding to our entry in dev->watches */
 	get_inotify_watch(watch);
 
-	atomic_inc(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_inc(&dev->user->inotify_watches);
 	atomic_inc(&inotify_watches);
 
 	return watch;
@@ -458,7 +486,8 @@ static void remove_watch_no_event(struct
 	list_del(&watch->i_list);
 	list_del(&watch->d_list);
 
-	atomic_dec(&dev->user->inotify_watches);
+	if (dev->user)
+		atomic_dec(&dev->user->inotify_watches);
 	atomic_dec(&inotify_watches);
 	idr_remove(&dev->idr, watch->wd);
 	put_inotify_watch(watch);
@@ -477,7 +506,10 @@ static void remove_watch_no_event(struct
  */
 static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev)
 {
-	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
+	if (dev->callback)
+		inotify_callback_event(dev, watch, IN_IGNORED, 0, NULL, NULL);
+	else
+		inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
 	remove_watch_no_event(watch, dev);
 }
 
@@ -490,7 +522,190 @@ static inline int inotify_inode_watched(
 	return !list_empty(&inode->inotify_watches);
 }
 
-/* Kernel API */
+/* Kernel consumer API */
+
+/**
+ * inotify_init - allocates and initializes an inotify device
+ * @callback: kernel consumer's event callback
+ */
+struct inotify_device *inotify_init(void (*callback)(struct inotify_event *,
+						     const char *,
+						     struct inode *, void *))
+{
+	struct inotify_device *dev;
+
+	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	if (unlikely(!dev))
+		return NULL;
+
+	idr_init(&dev->idr);
+	INIT_LIST_HEAD(&dev->events);
+	INIT_LIST_HEAD(&dev->watches);
+	init_waitqueue_head(&dev->wq);
+	sema_init(&dev->sem, 1);
+	dev->event_count = 0;
+	dev->queue_size = 0;
+	dev->max_events = inotify_max_queued_events;
+	dev->user = NULL;	/* set in sys_inotify_init */
+	dev->last_wd = 0;
+	dev->callback = callback;
+	atomic_set(&dev->count, 0);
+	get_inotify_dev(dev);
+
+	return dev;
+}
+EXPORT_SYMBOL_GPL(inotify_init);
+
+/**
+ * inotify_free - clean up and free an inotify device
+ * @dev: inotify device to free
+ */
+int inotify_free(struct inotify_device *dev)
+{
+	/*
+	 * Destroy all of the watches on this device.  Unfortunately, not very
+	 * pretty.  We cannot do a simple iteration over the list, because we
+	 * do not know the inode until we iterate to the watch.  But we need to
+	 * hold inode->inotify_sem before dev->sem.  The following works.
+	 */
+	while (1) {
+		struct inotify_watch *watch;
+		struct list_head *watches;
+		struct inode *inode;
+
+		down(&dev->sem);
+		watches = &dev->watches;
+		if (list_empty(watches)) {
+			up(&dev->sem);
+			break;
+		}
+		watch = list_entry(watches->next, struct inotify_watch, d_list);
+		get_inotify_watch(watch);
+		up(&dev->sem);
+
+		inode = watch->inode;
+		down(&inode->inotify_sem);
+		down(&dev->sem);
+		remove_watch_no_event(watch, dev);
+		up(&dev->sem);
+		up(&inode->inotify_sem);
+		put_inotify_watch(watch);
+	}
+
+	/* destroy all of the events on this device */
+	down(&dev->sem);
+	while (!list_empty(&dev->events))
+		inotify_dev_event_dequeue(dev);
+	up(&dev->sem);
+
+	/* free this device: the put matching the get in inotify_init() */
+	put_inotify_dev(dev);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(inotify_free);
+
+/**
+ * inotify_inotify_add_watch - add a watch to this inotify device
+ * @dev: inotify device
+ * @inode: inode to watch for events
+ * @mask: filesystem event mask
+ * @callback_arg - ptr to data that kernel consumer associates with this watch
+ *
+ * Caller must pin the inode in question, e.g. by calling path_lookup.
+ */
+s32 inotify_add_watch(struct inotify_device *dev, struct inode *inode,
+		      u32 mask, void *callback_arg)
+{
+	int mask_add = 0;
+	struct inotify_watch *watch, *old;
+	int ret;
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	if (mask & IN_MASK_ADD)
+		mask_add = 1;
+
+	/* don't let user-space set invalid bits: we don't want flags set */
+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
+	if (unlikely(!mask)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/*
+	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
+	 * are already watching.  We just update the mask and callback_arg and
+	 * return its wd.
+	 */
+	old = inode_find_dev(inode, dev);
+	if (unlikely(old)) {
+		if (mask_add)
+			old->mask |= mask;
+		else
+			old->mask = mask;
+		old->callback_arg = callback_arg;
+		ret = old->wd;
+		goto out;
+	}
+
+	watch = create_watch(dev, mask, inode, callback_arg);
+	if (unlikely(IS_ERR(watch))) {
+		ret = PTR_ERR(watch);
+		goto out;
+	}
+
+	/* Add the watch to the device's and the inode's list */
+	list_add(&watch->d_list, &dev->watches);
+	list_add(&watch->i_list, &inode->inotify_watches);
+	ret = watch->wd;
+
+out:
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(inotify_add_watch);
+
+/**
+ * inotify_ignore - remove a given wd from this inotify device
+ * @dev: inotify device
+ * @wd: watch descriptor to remove
+ */
+int inotify_ignore(struct inotify_device *dev, s32 wd)
+{
+	struct inotify_watch *watch;
+	struct inode *inode;
+
+	down(&dev->sem);
+	watch = idr_find(&dev->idr, wd);
+	if (unlikely(!watch)) {
+		up(&dev->sem);
+		return -EINVAL;
+	}
+	get_inotify_watch(watch);
+	inode = watch->inode;
+	up(&dev->sem);
+
+	down(&inode->inotify_sem);
+	down(&dev->sem);
+
+	/* make sure that we did not race */
+	watch = idr_find(&dev->idr, wd);
+	if (likely(watch))
+		remove_watch(watch, dev);
+
+	up(&dev->sem);
+	up(&inode->inotify_sem);
+	put_inotify_watch(watch);
+
+	return 0;
+
+}
+EXPORT_SYMBOL_GPL(inotify_ignore);
+
+/* Kernel producer API */
 
 /**
  * inotify_inode_queue_event - queue an event to all watches on this inode
@@ -498,9 +713,10 @@ static inline int inotify_inode_watched(
  * @mask: event mask describing this event
  * @cookie: cookie for synchronization, or zero
  * @name: filename, if any
+ * @cinode: child inode, used for events on directories
  */
 void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,
-			       const char *name)
+			       const char *name, struct inode *cinode)
 {
 	struct inotify_watch *watch, *next;
 
@@ -514,7 +730,12 @@ void inotify_inode_queue_event(struct in
 			struct inotify_device *dev = watch->dev;
 			get_inotify_watch(watch);
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, mask, cookie, name);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, mask,
+						       cookie, name, cinode);
+			else
+				inotify_dev_queue_event(dev, watch, mask,
+							cookie, name);
 			if (watch_mask & IN_ONESHOT)
 				remove_watch_no_event(watch, dev);
 			up(&dev->sem);
@@ -548,7 +769,8 @@ void inotify_dentry_parent_queue_event(s
 	if (inotify_inode_watched(inode)) {
 		dget(parent);
 		spin_unlock(&dentry->d_lock);
-		inotify_inode_queue_event(inode, mask, cookie, name);
+		inotify_inode_queue_event(inode, mask, cookie, name,
+					  dentry->d_inode);
 		dput(parent);
 	} else
 		spin_unlock(&dentry->d_lock);
@@ -631,7 +853,12 @@ void inotify_unmount_inodes(struct list_
 		list_for_each_entry_safe(watch, next_w, watches, i_list) {
 			struct inotify_device *dev = watch->dev;
 			down(&dev->sem);
-			inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL);
+			if (dev->callback)
+				inotify_callback_event(dev, watch, IN_UNMOUNT,
+						       0, NULL, NULL);
+			else
+				inotify_dev_queue_event(dev, watch, IN_UNMOUNT,
+							0, NULL);
 			remove_watch(watch, dev);
 			up(&dev->sem);
 		}
@@ -757,83 +984,7 @@ static ssize_t inotify_read(struct file 
 
 static int inotify_release(struct inode *ignored, struct file *file)
 {
-	struct inotify_device *dev = file->private_data;
-
-	/*
-	 * Destroy all of the watches on this device.  Unfortunately, not very
-	 * pretty.  We cannot do a simple iteration over the list, because we
-	 * do not know the inode until we iterate to the watch.  But we need to
-	 * hold inode->inotify_sem before dev->sem.  The following works.
-	 */
-	while (1) {
-		struct inotify_watch *watch;
-		struct list_head *watches;
-		struct inode *inode;
-
-		down(&dev->sem);
-		watches = &dev->watches;
-		if (list_empty(watches)) {
-			up(&dev->sem);
-			break;
-		}
-		watch = list_entry(watches->next, struct inotify_watch, d_list);
-		get_inotify_watch(watch);
-		up(&dev->sem);
-
-		inode = watch->inode;
-		down(&inode->inotify_sem);
-		down(&dev->sem);
-		remove_watch_no_event(watch, dev);
-		up(&dev->sem);
-		up(&inode->inotify_sem);
-		put_inotify_watch(watch);
-	}
-
-	/* destroy all of the events on this device */
-	down(&dev->sem);
-	while (!list_empty(&dev->events))
-		inotify_dev_event_dequeue(dev);
-	up(&dev->sem);
-
-	/* free this device: the put matching the get in inotify_init() */
-	put_inotify_dev(dev);
-
-	return 0;
-}
-
-/*
- * inotify_ignore - remove a given wd from this inotify instance.
- *
- * Can sleep.
- */
-static int inotify_ignore(struct inotify_device *dev, s32 wd)
-{
-	struct inotify_watch *watch;
-	struct inode *inode;
-
-	down(&dev->sem);
-	watch = idr_find(&dev->idr, wd);
-	if (unlikely(!watch)) {
-		up(&dev->sem);
-		return -EINVAL;
-	}
-	get_inotify_watch(watch);
-	inode = watch->inode;
-	up(&dev->sem);
-
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	/* make sure that we did not race */
-	watch = idr_find(&dev->idr, wd);
-	if (likely(watch))
-		remove_watch(watch, dev);
-
-	up(&dev->sem);
-	up(&inode->inotify_sem);
-	put_inotify_watch(watch);
-
-	return 0;
+	return inotify_free(file->private_data);
 }
 
 static long inotify_ioctl(struct file *file, unsigned int cmd,
@@ -887,12 +1038,15 @@ asmlinkage long sys_inotify_init(void)
 		goto out_free_uid;
 	}
 
-	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
+	dev = inotify_init(NULL);
 	if (unlikely(!dev)) {
 		ret = -ENOMEM;
 		goto out_free_uid;
 	}
 
+	dev->user = user;
+	atomic_inc(&user->inotify_devs);
+
 	filp->f_op = &inotify_fops;
 	filp->f_vfsmnt = mntget(inotify_mnt);
 	filp->f_dentry = dget(inotify_mnt->mnt_root);
@@ -901,20 +1055,6 @@ asmlinkage long sys_inotify_init(void)
 	filp->f_flags = O_RDONLY;
 	filp->private_data = dev;
 
-	idr_init(&dev->idr);
-	INIT_LIST_HEAD(&dev->events);
-	INIT_LIST_HEAD(&dev->watches);
-	init_waitqueue_head(&dev->wq);
-	sema_init(&dev->sem, 1);
-	dev->event_count = 0;
-	dev->queue_size = 0;
-	dev->max_events = inotify_max_queued_events;
-	dev->user = user;
-	dev->last_wd = 0;
-	atomic_set(&dev->count, 0);
-
-	get_inotify_dev(dev);
-	atomic_inc(&user->inotify_devs);
 	fd_install(fd, filp);
 
 	return fd;
@@ -928,13 +1068,11 @@ out_put_fd:
 
 asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
 {
-	struct inotify_watch *watch, *old;
 	struct inode *inode;
 	struct inotify_device *dev;
 	struct nameidata nd;
 	struct file *filp;
 	int ret, fput_needed;
-	int mask_add = 0;
 	unsigned flags = 0;
 
 	filp = fget_light(fd, &fput_needed);
@@ -960,46 +1098,7 @@ asmlinkage long sys_inotify_add_watch(in
 	inode = nd.dentry->d_inode;
 	dev = filp->private_data;
 
-	down(&inode->inotify_sem);
-	down(&dev->sem);
-
-	if (mask & IN_MASK_ADD)
-		mask_add = 1;
-
-	/* don't let user-space set invalid bits: we don't want flags set */
-	mask &= IN_ALL_EVENTS | IN_ONESHOT;
-	if (unlikely(!mask)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	/*
-	 * Handle the case of re-adding a watch on an (inode,dev) pair that we
-	 * are already watching.  We just update the mask and return its wd.
-	 */
-	old = inode_find_dev(inode, dev);
-	if (unlikely(old)) {
-		if (mask_add)
-			old->mask |= mask;
-		else
-			old->mask = mask;
-		ret = old->wd;
-		goto out;
-	}
-
-	watch = create_watch(dev, mask, inode);
-	if (unlikely(IS_ERR(watch))) {
-		ret = PTR_ERR(watch);
-		goto out;
-	}
-
-	/* Add the watch to the device's and the inode's list */
-	list_add(&watch->d_list, &dev->watches);
-	list_add(&watch->i_list, &inode->inotify_watches);
-	ret = watch->wd;
-out:
-	up(&dev->sem);
-	up(&inode->inotify_sem);
+	ret = inotify_add_watch(dev, inode, mask, NULL);
 	path_release(&nd);
 fput_and_out:
 	fput_light(filp, fput_needed);
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 94919c3..606b875 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -35,16 +35,18 @@ static inline void fsnotify_move(struct 
 
 	if (isdir)
 		isdir = IN_ISDIR;
-	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name);
-	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name);
+	inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, cookie,
+				  old_name, NULL);
+	inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie,
+				  new_name, source);
 
 	if (target) {
-		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL);
+		inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL,NULL);
 		inotify_inode_is_dead(target);
 	}
 
 	if (source) {
-		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
+		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);
@@ -66,7 +68,7 @@ static inline void fsnotify_nameremove(s
  */
 static inline void fsnotify_inoderemove(struct inode *inode)
 {
-	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL);
+	inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL);
 	inotify_inode_is_dead(inode);
 }
 
@@ -76,7 +78,8 @@ static inline void fsnotify_inoderemove(
 static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 {
 	inode_dir_notify(inode, DN_CREATE);
-	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name);
+	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
+				  dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -87,7 +90,7 @@ static inline void fsnotify_mkdir(struct
 {
 	inode_dir_notify(inode, DN_CREATE);
 	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, 
-				  dentry->d_name.name);
+				  dentry->d_name.name, dentry->d_inode);
 	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
 }
 
@@ -104,7 +107,7 @@ static inline void fsnotify_access(struc
 
 	dnotify_parent(dentry, DN_ACCESS);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -120,7 +123,7 @@ static inline void fsnotify_modify(struc
 
 	dnotify_parent(dentry, DN_MODIFY);
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -135,7 +138,7 @@ static inline void fsnotify_open(struct 
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);	
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -153,7 +156,7 @@ static inline void fsnotify_close(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -168,7 +171,7 @@ static inline void fsnotify_xattr(struct
 		mask |= IN_ISDIR;
 
 	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
-	inotify_inode_queue_event(inode, mask, 0, NULL);
+	inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
 }
 
 /*
@@ -215,7 +218,7 @@ static inline void fsnotify_change(struc
 	if (in_mask) {
 		if (S_ISDIR(inode->i_mode))
 			in_mask |= IN_ISDIR;
-		inotify_inode_queue_event(inode, in_mask, 0, NULL);
+		inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL);
 		inotify_dentry_parent_queue_event(dentry, in_mask, 0,
 						  dentry->d_name.name);
 	}
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index 267c88b..2a8d1bd 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -14,6 +14,9 @@
  *
  * When you are watching a directory, you will receive the filename for events
  * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd.
+ *
+ * When using inotify from the kernel, len will always be zero.  Instead you
+ * should check the path for non-NULL in your callback.
  */
 struct inotify_event {
 	__s32		wd;		/* watch descriptor */
@@ -71,8 +74,19 @@ struct inotify_event {
 
 #ifdef CONFIG_INOTIFY
 
+/* Kernel consumer API */
+
+extern struct inotify_device *inotify_init(void (*)(struct inotify_event *,
+						    const char *,
+						    struct inode *, void *));
+extern int inotify_free(struct inotify_device *);
+extern __s32 inotify_add_watch(struct inotify_device *, struct inode *, __u32,
+			       void *);
+extern int inotify_ignore(struct inotify_device *, __s32);
+
+/* Kernel producer API */
 extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
-				      const char *);
+				      const char *, struct inode *);
 extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
 					      const char *);
 extern void inotify_unmount_inodes(struct list_head *);
@@ -81,6 +95,7 @@ extern u32 inotify_get_cookie(void);
 
 #else
 
+/* Kernel producer API stubs */
 static inline void inotify_inode_queue_event(struct inode *inode,
 					     __u32 mask, __u32 cookie,
 					     const char *filename)

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-ipc-leak.patch:
 include/linux/audit.h |    2 -
 ipc/util.c            |    2 -
 kernel/auditsc.c      |   64 +++++++++++++++++++++++++-------------------------
 3 files changed, 32 insertions(+), 36 deletions(-)

--- NEW FILE linux-2.6-audit-ipc-leak.patch ---
diff -urp linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-02-25 16:39:08.000000000 -0500
+++ linux-2.6.15.x86_64/include/linux/audit.h	2006-02-25 16:36:38.000000000 -0500
@@ -320,7 +320,6 @@ extern int audit_socketcall(int nargs, u
 extern int audit_sockaddr(int len, void *addr);
 extern int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt);
 extern void audit_signal_info(int sig, struct task_struct *t);
-extern char *audit_ipc_context(struct kern_ipc_perm *ipcp);
 extern int audit_set_macxattr(const char *name);
 #else
 #define audit_alloc(t) ({ 0; })
@@ -340,7 +339,6 @@ extern int audit_set_macxattr(const char
 #define audit_sockaddr(len, addr) ({ 0; })
 #define audit_avc_path(dentry, mnt) ({ 0; })
 #define audit_signal_info(s,t) do { ; } while (0)
-#define audit_ipc_context(i) do { ; } while (0)
 #define audit_set_macxattr(n) do { ; } while (0)
 #endif
 
diff -urp linux-2.6.15.x86_64.orig/ipc/util.c linux-2.6.15.x86_64/ipc/util.c
--- linux-2.6.15.x86_64.orig/ipc/util.c	2006-02-25 16:39:18.000000000 -0500
+++ linux-2.6.15.x86_64/ipc/util.c	2006-02-25 16:36:13.000000000 -0500
@@ -27,7 +27,6 @@
 #include <linux/workqueue.h>
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
-#include <linux/audit.h>
 
 #include <asm/unistd.h>
 
@@ -469,7 +468,6 @@ int ipcperms (struct kern_ipc_perm *ipcp
 {	/* flag will most probably be 0 or S_...UGO from <linux/stat.h> */
 	int requested_mode, granted_mode;
 
-	audit_ipc_context(ipcp);
 	requested_mode = (flag >> 6) | (flag >> 3) | flag;
 	granted_mode = ipcp->mode;
 	if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
diff -urp linux-2.6.15.x86_64.orig/kernel/auditsc.c linux-2.6.15.x86_64/kernel/auditsc.c
--- linux-2.6.15.x86_64.orig/kernel/auditsc.c	2006-02-25 16:39:18.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditsc.c	2006-02-25 16:38:12.000000000 -0500
@@ -1146,6 +1146,38 @@ uid_t audit_get_loginuid(struct audit_co
 	return ctx ? ctx->loginuid : -1;
 }
 
+static char *audit_ipc_context(struct kern_ipc_perm *ipcp)
+{
+	struct audit_context *context = current->audit_context;
+	char *ctx = NULL;
+	int len = 0;
+
+	if (likely(!context))
+		return NULL;
+
+	len = security_ipc_getsecurity(ipcp, NULL, 0);
+	if (len == -EOPNOTSUPP)
+		goto ret;
+	if (len < 0)
+		goto error_path;
+
+	ctx = kmalloc(len, GFP_ATOMIC);
+	if (!ctx)
+		goto error_path;
+
+	len = security_ipc_getsecurity(ipcp, ctx, len);
+	if (len < 0)
+		goto error_path;
+
+	return ctx;
+
+error_path:
+	kfree(ctx);
+	audit_panic("error in audit_ipc_context");
+ret:
+	return NULL;
+}
+
 /**
  * audit_ipc_perms - record audit data for ipc
  * @qbytes: msgq bytes
@@ -1179,38 +1211,6 @@ int audit_ipc_perms(unsigned long qbytes
 	return 0;
 }
 
-char *audit_ipc_context(struct kern_ipc_perm *ipcp)
-{
-	struct audit_context *context = current->audit_context;
-	char *ctx = NULL;
-	int len = 0;
-
-	if (likely(!context))
-		return NULL;
-
-	len = security_ipc_getsecurity(ipcp, NULL, 0);
-	if (len == -EOPNOTSUPP)
-		goto ret;
-	if (len < 0)
-		goto error_path;
-
-	ctx = kmalloc(len, GFP_ATOMIC);
-	if (!ctx)
-		goto error_path;
-
-	len = security_ipc_getsecurity(ipcp, ctx, len);
-	if (len < 0)
-		goto error_path;
-
-	return ctx;
-
-error_path:
-	kfree(ctx);
-	audit_panic("error in audit_ipc_context");
-ret:
-	return NULL;
-}
-
 /**
  * audit_socketcall - record audit data for sys_socketcall
  * @nargs: number of args

linux-2.6-audit-promisc.patch:
 include/linux/audit.h |    7 ++++++-
 net/core/dev.c        |    7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-audit-promisc.patch ---
>From linux-audit-bounces at redhat.com Sat Dec  3 13:39:07 2005
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 03 Dec 2005 13:39:07 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbW-0003Ra-S4 for dwmw2 at baythorne.infradead.org; Sat, 03 Dec 2005
	13:39:07 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1EiXbU-0006dw-2W for dwmw2 at infradead.org; Sat, 03 Dec 2005 13:39:06 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 18B39732FF; Sat,
	 3 Dec 2005 08:39:03 -0500 (EST)
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 jB3Dd1du018704; Sat, 3 Dec 2005 08:39:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	jB3Dd1V16833; Sat, 3 Dec 2005 08:39:01 -0500
Received: from vpn83-123.boston.redhat.com (vpn83-123.boston.redhat.com
	[172.16.83.123]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	jB3Dd0EW010094;  Sat, 3 Dec 2005 08:39:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
To: Linux Audit Discussion <linux-audit at redhat.com>
Date: Sat, 3 Dec 2005 08:39:35 -0500
User-Agent: KMail/1.7.2
MIME-Version: 1.0
Content-Type: Multipart/Mixed; boundary="Boundary-00=_XAakD2Qt0krjnKY"
Message-Id: <200512030839.35344.sgrubb at redhat.com>
X-loop: linux-audit at redhat.com
Cc: lspp-list <redhat-lspp at redhat.com>
Subject: [PATCH] promiscuous mode
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Hi,

When a network interface goes into promiscuous mode, its an important security 
issue. The attached patch is intended to capture that action and send an 
event to the audit system.

The patch carves out a new block of numbers for kernel detected anomalies. 
These are events that may indicate suspicious activity. Other examples of 
potential kernel anomalies would be: exceeding disk quota, rlimit violations, 
changes to syscall entry table.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>


--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/x-diff; charset="us-ascii"; name="linux-2.6.14-audit-promiscuous.patch"
Content-Disposition: attachment; filename="linux-2.6.14-audit-promiscuous.patch"
Content-Transfer-Encoding: 8bit

diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h
--- linux-2.6.14.orig/include/linux/audit.h	2005-12-02 15:28:34.000000000 -0500
+++ linux-2.6.14/include/linux/audit.h	2005-12-02 15:28:22.000000000 -0500
@@ -35,7 +35,8 @@
  * 1400 - 1499 SE Linux use
  * 1500 - 1599 kernel LSPP events
  * 1600 - 1699 kernel crypto events
- * 1700 - 1999 future kernel use (maybe integrity labels and related events)
+ * 1700 - 1799 kernel anomaly records
+ * 1800 - 1999 future kernel use (maybe integrity labels and related events)
  * 2000 is for otherwise unclassified kernel audit messages (legacy)
  * 2001 - 2099 unused (kernel)
  * 2100 - 2199 user space anomaly records
@@ -87,6 +88,10 @@
 #define AUDIT_MAC_STATUS	1404	/* Changed enforcing,permissive,off */
 #define AUDIT_MAC_CONFIG_CHANGE	1405	/* Changes to booleans */
 
+#define AUDIT_FIRST_KERN_ANOM_MSG   1700
+#define AUDIT_LAST_KERN_ANOM_MSG    1799
+#define AUDIT_ANOM_PROMISCUOUS      1700 /* Device changed promiscuous mode */
+
 #define AUDIT_KERNEL		2000	/* Asynchronous audit record. NOT A REQUEST. */
 
 /* Rule flags */
diff -urp linux-2.6.14.orig/net/core/dev.c linux-2.6.14/net/core/dev.c
--- linux-2.6.14.orig/net/core/dev.c	2005-12-02 14:22:10.000000000 -0500
+++ linux-2.6.14/net/core/dev.c	2005-12-02 15:23:27.000000000 -0500
@@ -114,6 +114,7 @@
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
 #include <asm/current.h>
+#include <linux/audit.h>
 
 /*
  *	The list of packet types we will receive (as opposed to discard)
@@ -2121,6 +2122,12 @@ void dev_set_promiscuity(struct net_devi
 		printk(KERN_INFO "device %s %s promiscuous mode\n",
 		       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
 		       					       "left");
+		audit_log(current->audit_context, GFP_ATOMIC,
+			AUDIT_ANOM_PROMISCUOUS,
+			"dev=%s prom=%d old_prom=%d auid=%u",
+			dev->name, (dev->flags & IFF_PROMISC),
+			(old_flags & IFF_PROMISC),
+			audit_get_loginuid(current->audit_context)); 
 	}
 }
 

--Boundary-00=_XAakD2Qt0krjnKY
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
--Boundary-00=_XAakD2Qt0krjnKY--

linux-2.6-audit-rule-log.patch:
 include/linux/audit.h |    2 +-
 kernel/auditfilter.c  |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-audit-rule-log.patch ---
diff -ur linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-02-14 10:50:56.000000000 -0500
+++ linux-2.6.15.x86_64/include/linux/audit.h	2006-02-14 10:51:41.000000000 -0500
@@ -246,7 +246,7 @@
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
 	__u32		field_count;
-	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */
 	__u32		fields[AUDIT_MAX_FIELDS];
 	__u32		values[AUDIT_MAX_FIELDS];
 	__u32		fieldflags[AUDIT_MAX_FIELDS];
diff -ur linux-2.6.15.x86_64.orig/kernel/auditfilter.c linux-2.6.15.x86_64/kernel/auditfilter.c
--- linux-2.6.15.x86_64.orig/kernel/auditfilter.c	2006-02-14 10:51:25.000000000 -0500
+++ linux-2.6.15.x86_64/kernel/auditfilter.c	2006-02-14 10:52:54.000000000 -0500
@@ -586,10 +586,11 @@
 
 		err = audit_add_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u added an audit rule\n", loginuid);
-		else {
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u add rule to list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
+		if (err) {
 			if (entry->rule.watch)
 				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
@@ -606,9 +607,10 @@
 
 		err = audit_del_rule(entry,
 				     &audit_filter_list[entry->rule.listnr]);
-		if (!err)
-			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
-				  "auid=%u removed an audit rule\n", loginuid);
+		audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
+			"auid=%u remove rule from list=%d res=%d\n",
+			loginuid, entry->rule.listnr, !err);
+
 		if (entry->rule.watch)
 			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);

linux-2.6-audit-string-1.patch:
 include/linux/audit.h       |   31 ++
 kernel/audit.c              |   19 +
 kernel/audit.h              |   23 +-
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++-----------
 kernel/auditsc.c            |   50 ++--
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

--- NEW FILE linux-2.6-audit-string-1.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:05:27 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; Tue, 07 Feb 2006 12:05:54 -0500
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 k17H5rQo013224;
	Tue, 7 Feb 2006 12:05:53 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5o125027;
	Tue, 7 Feb 2006 12:05:50 -0500
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 k17H5jmt006474;
	Tue, 7 Feb 2006 12:05:45 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 4C2D472F6F; Tue,  7 Feb 2006 12:05:45 -0500 (EST)
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
	k17H5hnh005461 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:05:43 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H5g124983
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:42 -0500
Received: from ccerelbas04.cce.hp.com (ccerelbas04.cce.hp.com [161.114.21.107])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H5fMr025186
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:05:41 -0500
Received: from ccerelint01.cce.cpqcorp.net (ccerelint01.cce.cpqcorp.net
	[16.110.74.103])
	by ccerelbas04.cce.hp.com (Postfix) with ESMTP id 0523834129
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by ccerelint01.cce.cpqcorp.net (Postfix) with ESMTP id A3CB134021
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 11:05:27 -0600 (CST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id 4289738448A2; Tue,  7 Feb 2006 12:05:27 -0500 (EST)
Date: Tue, 7 Feb 2006 12:05:27 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170527.GB2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190231.GB24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190231.GB24489 at zk3.dec.com>
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: Re: [PATCH 1/2] audit string fields interface + consumer
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: 32646
X-UID: 48007

Updated patch to dynamically allocate audit rule fields in kernel's
internal representation.  Added unlikely() calls for testing memory
allocation result.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:02:31PM EST]
> Modify audit's kernel-userspace interface to allow the specification
> of string fields in audit rules.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h       |   31 +++
 kernel/audit.c              |   19 ++
 kernel/audit.h              |   23 ++
 kernel/auditfilter.c        |  463 +++++++++++++++++++++++++++++++++----------
 kernel/auditsc.c            |   50 ++---
 security/selinux/nlmsgtab.c |    3 
 6 files changed, 446 insertions(+), 143 deletions(-)

b5d36f87ed2ce86a306e3ae709805e892211f870
diff --git a/include/linux/audit.h b/include/linux/audit.h
index a485639..c208554 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -50,15 +50,18 @@
  */
 #define AUDIT_GET		1000	/* Get status */
 #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
-#define AUDIT_LIST		1002	/* List syscall filtering rules */
-#define AUDIT_ADD		1003	/* Add syscall filtering rule */
-#define AUDIT_DEL		1004	/* Delete syscall filtering rule */
+#define AUDIT_LIST		1002	/* List syscall rules -- deprecated */
+#define AUDIT_ADD		1003	/* Add syscall rule -- deprecated */
+#define AUDIT_DEL		1004	/* Delete syscall rule -- deprecated */
 #define AUDIT_USER		1005	/* Message from userspace -- deprecated */
 #define AUDIT_LOGIN		1006	/* Define the login id and information */
 #define AUDIT_WATCH_INS		1007	/* Insert file/dir watch entry */
 #define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
 #define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
 #define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
+#define AUDIT_ADD_RULE		1011	/* Add syscall filtering rule */
+#define AUDIT_DEL_RULE		1012	/* Delete syscall filtering rule */
+#define AUDIT_LIST_RULES	1013	/* List syscall filtering rules */
 
 #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
 #define AUDIT_USER_AVC		1107	/* We filter this differently */
@@ -229,6 +232,26 @@ struct audit_status {
 	__u32		backlog;	/* messages waiting in queue */
 };
 
+/* audit_rule_data supports filter rules with both integer and string
+ * fields.  It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and
+ * AUDIT_LIST_RULES requests.
+ */
+struct audit_rule_data {
+	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
+	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
+	__u32		field_count;
+	__u32		mask[AUDIT_BITMASK_SIZE];
+	__u32		fields[AUDIT_MAX_FIELDS];
+	__u32		values[AUDIT_MAX_FIELDS];
+	__u32		fieldflags[AUDIT_MAX_FIELDS];
+	__u32		buflen;	/* total length of string fields */
+	char		buf[0];	/* string fields buffer */
+};
+
+/* audit_rule is supported to maintain backward compatibility with
+ * userspace.  It supports integer fields only and corresponds to
+ * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests.
+ */
 struct audit_rule {		/* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */
 	__u32		flags;	/* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */
 	__u32		action;	/* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */
@@ -340,7 +363,7 @@ extern void		    audit_log_d_path(struct
 extern int audit_filter_user(struct netlink_skb_parms *cb, int type);
 extern int audit_filter_type(int type);
 extern int  audit_receive_filter(int type, int pid, int uid, int seq,
-				 void *data, uid_t loginuid);
+				 void *data, size_t datasz, uid_t loginuid);
 #else
 #define audit_log(c,g,t,f,...) do { ; } while (0)
 #define audit_log_start(c,g,t) ({ NULL; })
diff --git a/kernel/audit.c b/kernel/audit.c
index d95efd6..bdda766 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -52,6 +52,7 @@
 #include <linux/audit.h>
 
 #include <net/sock.h>
+#include <net/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 
@@ -361,9 +362,12 @@ static int audit_netlink_ok(kernel_cap_t
 	switch (msg_type) {
 	case AUDIT_GET:
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 	case AUDIT_SET:
 	case AUDIT_ADD:
+	case AUDIT_ADD_RULE:
 	case AUDIT_DEL:
+	case AUDIT_DEL_RULE:
 	case AUDIT_SIGNAL_INFO:
 		if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL))
 			err = -EPERM;
@@ -470,12 +474,23 @@ static int audit_receive_msg(struct sk_b
 		break;
 	case AUDIT_ADD:
 	case AUDIT_DEL:
-		if (nlh->nlmsg_len < sizeof(struct audit_rule))
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule))
 			return -EINVAL;
 		/* fallthrough */
 	case AUDIT_LIST:
 		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
-					   uid, seq, data, loginuid);
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
+		break;
+	case AUDIT_ADD_RULE:
+	case AUDIT_DEL_RULE:
+		if (nlmsg_len(nlh) < sizeof(struct audit_rule_data))
+			return -EINVAL;
+		/* fallthrough */
+	case AUDIT_LIST_RULES:
+		err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid,
+					   uid, seq, data, nlmsg_len(nlh),
+					   loginuid);
 		break;
 	case AUDIT_SIGNAL_INFO:
 		sig_data.uid = audit_sig_uid;
diff --git a/kernel/audit.h b/kernel/audit.h
index 7643e46..4b602cd 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,10 +52,27 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_field {
+	u32			type;
+	u32			val;
+	u32			op;
+};
+
+struct audit_krule {
+	int			vers_ops;
+	u32			flags;
+	u32			listnr;
+	u32			action;
+	u32			mask[AUDIT_BITMASK_SIZE];
+	u32			buflen; /* for data alloc on list rules */
+	u32			field_count;
+	struct audit_field	*fields;
+};
+
 struct audit_entry {
-	struct list_head  list;
-	struct rcu_head   rcu;
-	struct audit_rule rule;
+	struct list_head	list;
+	struct rcu_head		rcu;
+	struct audit_krule	rule;
 };
 
 
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index a3a3275..5735acd 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -40,52 +40,279 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
-/* Copy rule from user-space to kernel-space.  Called from 
- * audit_add_rule during AUDIT_ADD. */
-static inline int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
+static inline void audit_free_rule(struct audit_entry *e)
 {
+	kfree(e->rule.fields);
+	kfree(e);
+}
+
+static inline void audit_free_rule_rcu(struct rcu_head *head)
+{
+	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
+	audit_free_rule(e);
+}
+
+/* Unpack a filter field's string representation from user-space
+ * buffer. */
+static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
+{
+	char *str;
+
+	if (!*bufp || (len == 0) || (len > *remain))
+		return ERR_PTR(-EINVAL);
+
+	/* Of the currently implemented string fields, PATH_MAX
+	 * defines the longest valid length.
+	 */
+	if (len > PATH_MAX)
+		return ERR_PTR(-ENAMETOOLONG);
+
+	str = kmalloc(len + 1, GFP_KERNEL);
+	if (unlikely(!str))
+		return ERR_PTR(-ENOMEM);
+
+	memcpy(str, *bufp, len);
+	str[len] = 0;
+	*bufp += len;
+	*remain -= len;
+
+	return str;
+}
+
+/* Common user-space to kernel rule translation. */
+static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
+{
+	unsigned listnr;
+	struct audit_entry *entry;
+	struct audit_field *fields;
+	int i, err;
+
+	err = -EINVAL;
+	listnr = rule->flags & ~AUDIT_FILTER_PREPEND;
+	switch(listnr) {
+	default:
+		goto exit_err;
+	case AUDIT_FILTER_USER:
+	case AUDIT_FILTER_TYPE:
+#ifdef CONFIG_AUDITSYSCALL
+	case AUDIT_FILTER_ENTRY:
+	case AUDIT_FILTER_EXIT:
+	case AUDIT_FILTER_TASK:
+#endif
+		;
+	}
+	if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE &&
+	    rule->action != AUDIT_ALWAYS)
+		goto exit_err;
+	if (rule->field_count > AUDIT_MAX_FIELDS)
+		goto exit_err;
+
+	err = -ENOMEM;
+	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+	if (unlikely(!entry))
+		goto exit_err;
+	fields = kmalloc(sizeof(*fields) * rule->field_count, GFP_KERNEL);
+	if (unlikely(!fields)) {
+		kfree(entry);
+		goto exit_err;
+	}
+
+	memset(&entry->rule, 0, sizeof(struct audit_krule));
+	memset(fields, 0, sizeof(struct audit_field));
+
+	entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND;
+	entry->rule.listnr = listnr;
+	entry->rule.action = rule->action;
+	entry->rule.field_count = rule->field_count;
+	entry->rule.fields = fields;
+
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
+		entry->rule.mask[i] = rule->mask[i];
+
+	return entry;
+
+exit_err:
+	return ERR_PTR(err);
+}
+
+/* Translate struct audit_rule to kernel's rule respresentation.
+ * Exists for backward compatibility with userspace. */
+static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule)
+{
+	struct audit_entry *entry;
+	int err = 0;
 	int i;
 
-	if (s->action != AUDIT_NEVER
-	    && s->action != AUDIT_POSSIBLE
-	    && s->action != AUDIT_ALWAYS)
-		return -1;
-	if (s->field_count < 0 || s->field_count > AUDIT_MAX_FIELDS)
-		return -1;
-	if ((s->flags & ~AUDIT_FILTER_PREPEND) >= AUDIT_NR_FILTERS)
-		return -1;
-
-	d->flags	= s->flags;
-	d->action	= s->action;
-	d->field_count	= s->field_count;
-	for (i = 0; i < d->field_count; i++) {
-		d->fields[i] = s->fields[i];
-		d->values[i] = s->values[i];
+	entry = audit_to_entry_common(rule);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	for (i = 0; i < rule->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
+		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
+		f->val = rule->values[i];
+
+		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
+		if (f->op & AUDIT_NEGATE)
+			f->op |= AUDIT_NOT_EQUAL;
+		else if (!(f->op & AUDIT_OPERATORS))
+			f->op |= AUDIT_EQUAL;
+		f->op &= ~AUDIT_NEGATE;
 	}
-	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) d->mask[i] = s->mask[i];
-	return 0;
+
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
 }
 
-/* Check to see if two rules are identical.  It is called from
- * audit_add_rule during AUDIT_ADD and 
- * audit_del_rule during AUDIT_DEL. */
-static int audit_compare_rule(struct audit_rule *a, struct audit_rule *b)
+/* Translate struct audit_rule_data to kernel's rule respresentation. */
+static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
+					       size_t datasz)
 {
+	int err = 0;
+	struct audit_entry *entry;
+	void *bufp;
+	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
 	int i;
 
-	if (a->flags != b->flags)
-		return 1;
+	entry = audit_to_entry_common((struct audit_rule *)data);
+	if (IS_ERR(entry))
+		goto exit_nofree;
+
+	bufp = data->buf;
+	entry->rule.vers_ops = 2;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &entry->rule.fields[i];
+
+		err = -EINVAL;
+		if (!(data->fieldflags[i] & AUDIT_OPERATORS) ||
+		    data->fieldflags[i] & ~AUDIT_OPERATORS)
+			goto exit_free;
+
+		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
+		f->type = data->fields[i];
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			f->val = data->values[i];
+		}
+	}
 
-	if (a->action != b->action)
-		return 1;
+exit_nofree:
+	return entry;
+
+exit_free:
+	audit_free_rule(entry);
+	return ERR_PTR(err);
+}
+
+/* Pack a filter field's string representation into data block. */
+static inline size_t audit_pack_string(void **bufp, char *str)
+{
+	size_t len = strlen(str);
+
+	memcpy(*bufp, str, len);
+	*bufp += len;
+
+	return len;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule.
+ * Exists for backward compatibility with userspace. */
+static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule)
+{
+	struct audit_rule *rule;
+	int i;
+
+	rule = kmalloc(sizeof(*rule), GFP_KERNEL);
+	if (unlikely(!rule))
+		return ERR_PTR(-ENOMEM);
+	memset(rule, 0, sizeof(*rule));
+
+	rule->flags = krule->flags | krule->listnr;
+	rule->action = krule->action;
+	rule->field_count = krule->field_count;
+	for (i = 0; i < rule->field_count; i++) {
+		rule->values[i] = krule->fields[i].val;
+		rule->fields[i] = krule->fields[i].type;
+
+		if (krule->vers_ops == 1) {
+			if (krule->fields[i].op & AUDIT_NOT_EQUAL)
+				rule->fields[i] |= AUDIT_NEGATE;
+		} else {
+			rule->fields[i] |= krule->fields[i].op;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) rule->mask[i] = krule->mask[i];
 
-	if (a->field_count != b->field_count)
+	return rule;
+}
+
+/* Translate kernel rule respresentation to struct audit_rule_data. */
+static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule)
+{
+	struct audit_rule_data *data;
+	void *bufp;
+	int i;
+
+	data = kmalloc(sizeof(*data) + krule->buflen, GFP_KERNEL);
+	if (unlikely(!data))
+		return ERR_PTR(-ENOMEM);
+	memset(data, 0, sizeof(*data));
+
+	data->flags = krule->flags | krule->listnr;
+	data->action = krule->action;
+	data->field_count = krule->field_count;
+	bufp = data->buf;
+	for (i = 0; i < data->field_count; i++) {
+		struct audit_field *f = &krule->fields[i];
+
+		data->fields[i] = f->type;
+		data->fieldflags[i] = f->op;
+		switch(f->type) {
+		/* call type-specific conversion routines here */
+		default:
+			data->values[i] = f->val;
+		}
+	}
+	for (i = 0; i < AUDIT_BITMASK_SIZE; i++) data->mask[i] = krule->mask[i];
+
+	return data;
+}
+
+/* Compare two rules in kernel format.  Considered success if rules
+ * don't match. */
+static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
+{
+	int i;
+
+	if (a->flags != b->flags ||
+	    a->listnr != b->listnr ||
+	    a->action != b->action ||
+	    a->field_count != b->field_count)
 		return 1;
 
 	for (i = 0; i < a->field_count; i++) {
-		if (a->fields[i] != b->fields[i]
-		    || a->values[i] != b->values[i])
+		if (a->fields[i].type != b->fields[i].type ||
+		    a->fields[i].op != b->fields[i].op)
 			return 1;
+
+		switch(a->fields[i].type) {
+		/* call type-specific comparison routines here */
+		default:
+			if (a->fields[i].val != b->fields[i].val)
+				return 1;
+		}
 	}
 
 	for (i = 0; i < AUDIT_BITMASK_SIZE; i++)
@@ -95,41 +322,21 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
-static inline int audit_add_rule(struct audit_rule *rule,
+static inline int audit_add_rule(struct audit_entry *entry,
 				  struct list_head *list)
 {
-	struct audit_entry  *entry;
-	int i;
+	struct audit_entry *e;
 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * addition routine. */
-	list_for_each_entry(entry, list, list) {
-		if (!audit_compare_rule(rule, &entry->rule))
+	list_for_each_entry(e, list, list) {
+		if (!audit_compare_rule(&entry->rule, &e->rule))
 			return -EEXIST;
 	}
 
-	for (i = 0; i < rule->field_count; i++) {
-		if (rule->fields[i] & AUDIT_UNUSED_BITS)
-			return -EINVAL;
-		if ( rule->fields[i] & AUDIT_NEGATE)
-			rule->fields[i] |= AUDIT_NOT_EQUAL;
-		else if ( (rule->fields[i] & AUDIT_OPERATORS) == 0 )
-			rule->fields[i] |= AUDIT_EQUAL;
-		rule->fields[i] &= ~AUDIT_NEGATE;
-	}
-
-	if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL)))
-		return -ENOMEM;
-	if (audit_copy_rule(&entry->rule, rule)) {
-		kfree(entry);
-		return -EINVAL;
-	}
-
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
-		entry->rule.flags &= ~AUDIT_FILTER_PREPEND;
 		list_add_rcu(&entry->list, list);
 	} else {
 		list_add_tail_rcu(&entry->list, list);
@@ -138,16 +345,9 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
-static inline void audit_free_rule(struct rcu_head *head)
-{
-	struct audit_entry *e = container_of(head, struct audit_entry, rcu);
-	kfree(e);
-}
-
-/* Note that audit_add_rule and audit_del_rule are called via
- * audit_receive() in audit.c, and are protected by
+/* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
-static inline int audit_del_rule(struct audit_rule *rule,
+static inline int audit_del_rule(struct audit_entry *entry,
 				 struct list_head *list)
 {
 	struct audit_entry  *e;
@@ -155,16 +355,18 @@ static inline int audit_del_rule(struct 
 	/* Do not use the _rcu iterator here, since this is the only
 	 * deletion routine. */
 	list_for_each_entry(e, list, list) {
-		if (!audit_compare_rule(rule, &e->rule)) {
+		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
-			call_rcu(&e->rcu, audit_free_rule);
+			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
 	}
 	return -ENOENT;		/* No matching rule */
 }
 
-static int audit_list_rules(void *_dest)
+/* List rules using struct audit_rule.  Exists for backward
+ * compatibility with userspace. */
+static int audit_list(void *_dest)
 {
 	int pid, seq;
 	int *dest = _dest;
@@ -180,9 +382,16 @@ static int audit_list_rules(void *_dest)
 	/* The *_rcu iterators not needed here because we are
 	   always called with audit_netlink_sem held. */
 	for (i=0; i<AUDIT_NR_FILTERS; i++) {
-		list_for_each_entry(entry, &audit_filter_list[i], list)
+		list_for_each_entry(entry, &audit_filter_list[i], list) {
+			struct audit_rule *rule;
+
+			rule = audit_krule_to_rule(&entry->rule);
+			if (unlikely(!rule))
+				break;
 			audit_send_reply(pid, seq, AUDIT_LIST, 0, 1,
-					 &entry->rule, sizeof(entry->rule));
+					 rule, sizeof(*rule));
+			kfree(rule);
+		}
 	}
 	audit_send_reply(pid, seq, AUDIT_LIST, 1, 1, NULL, 0);
 	
@@ -190,6 +399,40 @@ static int audit_list_rules(void *_dest)
 	return 0;
 }
 
+/* List rules using struct audit_rule_data. */
+static int audit_list_rules(void *_dest)
+{
+	int pid, seq;
+	int *dest = _dest;
+	struct audit_entry *e;
+	int i;
+
+	pid = dest[0];
+	seq = dest[1];
+	kfree(dest);
+
+	down(&audit_netlink_sem);
+
+	/* The *_rcu iterators not needed here because we are
+	   always called with audit_netlink_sem held. */
+	for (i=0; i<AUDIT_NR_FILTERS; i++) {
+		list_for_each_entry(e, &audit_filter_list[i], list) {
+			struct audit_rule_data *data;
+
+			data = audit_krule_to_data(&e->rule);
+			if (unlikely(!data))
+				break;
+			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
+					 data, sizeof(*data));
+			kfree(data);
+		}
+	}
+	audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0);
+
+	up(&audit_netlink_sem);
+	return 0;
+}
+
 /**
  * audit_receive_filter - apply all rules to the specified message type
  * @type: audit message type
@@ -197,18 +440,20 @@ static int audit_list_rules(void *_dest)
  * @uid: target uid for netlink audit messages
  * @seq: netlink audit message sequence (serial) number
  * @data: payload data
+ * @datasz: size of payload data
  * @loginuid: loginuid of sender
  */
 int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
-							uid_t loginuid)
+			 size_t datasz, uid_t loginuid)
 {
 	struct task_struct *tsk;
 	int *dest;
-	int		   err = 0;
-	unsigned listnr;
+	int err = 0;
+	struct audit_entry *entry;
 
 	switch (type) {
 	case AUDIT_LIST:
+	case AUDIT_LIST_RULES:
 		/* We can't just spew out the rules here because we might fill
 		 * the available socket buffer space and deadlock waiting for
 		 * auditctl to read from it... which isn't ever going to
@@ -221,41 +466,48 @@ int audit_receive_filter(int type, int p
 		dest[0] = pid;
 		dest[1] = seq;
 
-		tsk = kthread_run(audit_list_rules, dest, "audit_list_rules");
+		if (type == AUDIT_LIST)
+			tsk = kthread_run(audit_list, dest, "audit_list");
+		else
+			tsk = kthread_run(audit_list_rules, dest,
+					  "audit_list_rules");
 		if (IS_ERR(tsk)) {
 			kfree(dest);
 			err = PTR_ERR(tsk);
 		}
 		break;
 	case AUDIT_ADD:
-		listnr = ((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		switch(listnr) {
-		default:
-			return -EINVAL;
+	case AUDIT_ADD_RULE:
+		if (type == AUDIT_ADD)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		case AUDIT_FILTER_USER:
-		case AUDIT_FILTER_TYPE:
-#ifdef CONFIG_AUDITSYSCALL
-		case AUDIT_FILTER_ENTRY:
-		case AUDIT_FILTER_EXIT:
-		case AUDIT_FILTER_TASK:
-#endif
-			;
-		}
-		err = audit_add_rule(data, &audit_filter_list[listnr]);
+		err = audit_add_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
+		else
+			audit_free_rule(entry);
 		break;
 	case AUDIT_DEL:
-		listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND;
-		if (listnr >= AUDIT_NR_FILTERS)
-			return -EINVAL;
+	case AUDIT_DEL_RULE:
+		if (type == AUDIT_DEL)
+			entry = audit_rule_to_entry(data);
+		else
+			entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 
-		err = audit_del_rule(data, &audit_filter_list[listnr]);
+		err = audit_del_rule(entry,
+				     &audit_filter_list[entry->rule.listnr]);
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		audit_free_rule(entry);
 		break;
 	default:
 		return -EINVAL;
@@ -287,29 +539,27 @@ int audit_comparator(const u32 left, con
 
 
 static int audit_filter_user_rules(struct netlink_skb_parms *cb,
-				   struct audit_rule *rule,
+				   struct audit_krule *rule,
 				   enum audit_state *state)
 {
 	int i;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(cb->creds.pid, op, value);
+			result = audit_comparator(cb->creds.pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(cb->creds.uid, op, value);
+			result = audit_comparator(cb->creds.uid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(cb->creds.gid, op, value);
+			result = audit_comparator(cb->creds.gid, f->op, f->val);
 			break;
 		case AUDIT_LOGINUID:
-			result = audit_comparator(cb->loginuid, op, value);
+			result = audit_comparator(cb->loginuid, f->op, f->val);
 			break;
 		}
 
@@ -354,14 +604,11 @@ int audit_filter_type(int type)
 
 	list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TYPE],
 				list) {
-		struct audit_rule *rule = &e->rule;
 		int i;
-		for (i = 0; i < rule->field_count; i++) {
-			u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-			u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-			u32 value  = rule->values[i];
-			if ( field == AUDIT_MSGTYPE ) {
-				result = audit_comparator(type, op, value); 
+		for (i = 0; i < e->rule.field_count; i++) {
+			struct audit_field *f = &e->rule.fields[i];
+			if (f->type == AUDIT_MSGTYPE) {
+				result = audit_comparator(type, f->op, f->val);
 				if (!result)
 					break;
 			}
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8f0a61c..e4f7096 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -161,70 +161,68 @@ struct audit_context {
 /* Compare a task_struct with an audit_rule.  Return 1 on match, 0
  * otherwise. */
 static int audit_filter_rules(struct task_struct *tsk,
-			      struct audit_rule *rule,
+			      struct audit_krule *rule,
 			      struct audit_context *ctx,
 			      enum audit_state *state)
 {
 	int i, j;
 
 	for (i = 0; i < rule->field_count; i++) {
-		u32 field  = rule->fields[i] & ~AUDIT_OPERATORS;
-		u32 op  = rule->fields[i] & AUDIT_OPERATORS;
-		u32 value  = rule->values[i];
+		struct audit_field *f = &rule->fields[i];
 		int result = 0;
 
-		switch (field) {
+		switch (f->type) {
 		case AUDIT_PID:
-			result = audit_comparator(tsk->pid, op, value);
+			result = audit_comparator(tsk->pid, f->op, f->val);
 			break;
 		case AUDIT_UID:
-			result = audit_comparator(tsk->uid, op, value);
+			result = audit_comparator(tsk->uid, f->op, f->val);
 			break;
 		case AUDIT_EUID:
-			result = audit_comparator(tsk->euid, op, value);
+			result = audit_comparator(tsk->euid, f->op, f->val);
 			break;
 		case AUDIT_SUID:
-			result = audit_comparator(tsk->suid, op, value);
+			result = audit_comparator(tsk->suid, f->op, f->val);
 			break;
 		case AUDIT_FSUID:
-			result = audit_comparator(tsk->fsuid, op, value);
+			result = audit_comparator(tsk->fsuid, f->op, f->val);
 			break;
 		case AUDIT_GID:
-			result = audit_comparator(tsk->gid, op, value);
+			result = audit_comparator(tsk->gid, f->op, f->val);
 			break;
 		case AUDIT_EGID:
-			result = audit_comparator(tsk->egid, op, value);
+			result = audit_comparator(tsk->egid, f->op, f->val);
 			break;
 		case AUDIT_SGID:
-			result = audit_comparator(tsk->sgid, op, value);
+			result = audit_comparator(tsk->sgid, f->op, f->val);
 			break;
 		case AUDIT_FSGID:
-			result = audit_comparator(tsk->fsgid, op, value);
+			result = audit_comparator(tsk->fsgid, f->op, f->val);
 			break;
 		case AUDIT_PERS:
-			result = audit_comparator(tsk->personality, op, value);
+			result = audit_comparator(tsk->personality, f->op, f->val);
 			break;
 		case AUDIT_ARCH:
  			if (ctx)
-				result = audit_comparator(ctx->arch, op, value);
+				result = audit_comparator(ctx->arch, f->op, f->val);
 			break;
 
 		case AUDIT_EXIT:
 			if (ctx && ctx->return_valid)
-				result = audit_comparator(ctx->return_code, op, value);
+				result = audit_comparator(ctx->return_code, f->op, f->val);
 			break;
 		case AUDIT_SUCCESS:
 			if (ctx && ctx->return_valid) {
-				if (value)
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_SUCCESS);
+				if (f->val)
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_SUCCESS);
 				else
-					result = audit_comparator(ctx->return_valid, op, AUDITSC_FAILURE);
+					result = audit_comparator(ctx->return_valid, f->op, AUDITSC_FAILURE);
 			}
 			break;
 		case AUDIT_DEVMAJOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MAJOR(ctx->names[j].dev),	op, value)) {
+					if (audit_comparator(MAJOR(ctx->names[j].dev),	f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -234,7 +232,7 @@ static int audit_filter_rules(struct tas
 		case AUDIT_DEVMINOR:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(MINOR(ctx->names[j].dev), op, value)) {
+					if (audit_comparator(MINOR(ctx->names[j].dev), f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -244,8 +242,8 @@ static int audit_filter_rules(struct tas
 		case AUDIT_INODE:
 			if (ctx) {
 				for (j = 0; j < ctx->name_count; j++) {
-					if (audit_comparator(ctx->names[j].ino, op, value) ||
-					    audit_comparator(ctx->names[j].pino, op, value)) {
+					if (audit_comparator(ctx->names[j].ino, f->op, f->val) ||
+					    audit_comparator(ctx->names[j].pino, f->op, f->val)) {
 						++result;
 						break;
 					}
@@ -255,14 +253,14 @@ static int audit_filter_rules(struct tas
 		case AUDIT_LOGINUID:
 			result = 0;
 			if (ctx)
-				result = audit_comparator(ctx->loginuid, op, value);
+				result = audit_comparator(ctx->loginuid, f->op, f->val);
 			break;
 		case AUDIT_ARG0:
 		case AUDIT_ARG1:
 		case AUDIT_ARG2:
 		case AUDIT_ARG3:
 			if (ctx)
-				result = audit_comparator(ctx->argv[field-AUDIT_ARG0], op, value);
+				result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val);
 			break;
 		}
 
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index d7c0e91..7315824 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per
 	{ AUDIT_LIST,		NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
 	{ AUDIT_ADD,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_DEL,		NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_LIST_RULES,	NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
+	{ AUDIT_ADD_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+	{ AUDIT_DEL_RULE,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
 	{ AUDIT_USER,		NETLINK_AUDIT_SOCKET__NLMSG_RELAY    },
 	{ AUDIT_SIGNAL_INFO,	NETLINK_AUDIT_SOCKET__NLMSG_READ     },
 };
-- 
0.99.9n

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-string-2.patch:
 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 +++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 -
 4 files changed, 128 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-audit-string-2.patch ---
>From amy.griffis at hp.com Tue Feb  7 12:06:57 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; Tue, 07 Feb 2006 12:07:15 -0500
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 k17H7FQo013463;
	Tue, 7 Feb 2006 12:07:15 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H7C125794;
	Tue, 7 Feb 2006 12:07:12 -0500
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 k17H7635006635;
	Tue, 7 Feb 2006 12:07:06 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id B388872F9D; Tue,  7 Feb 2006 12:07:06 -0500 (EST)
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
	k17H74IH005569 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 7 Feb 2006 12:07:04 -0500
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k17H74125739
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:04 -0500
Received: from tayrelbas01.tay.hp.com (tayrelbas01.tay.hp.com [161.114.80.244])
	by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k17H732a025911
	for <linux-audit at redhat.com>; Tue, 7 Feb 2006 12:07:03 -0500
Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net
	[16.47.5.6])
	by tayrelbas01.tay.hp.com (Postfix) with ESMTP id E699034111
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:07:00 -0500 (EST)
Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.96.242])
	by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id DE9C63401D
	for <linux-audit at redhat.com>; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Received: by dill.zko.hp.com (Postfix, from userid 10412)
	id CC89C38448A2; Tue,  7 Feb 2006 12:06:57 -0500 (EST)
Date: Tue, 7 Feb 2006 12:06:57 -0500
From: Amy Griffis <amy.griffis at hp.com>
To: linux-audit at redhat.com
Message-ID: <20060207170657.GC2664 at zk3.dec.com>
Mail-Followup-To: linux-audit at redhat.com
References: <20060111185921.GA24489 at zk3.dec.com>
	<20060111190453.GC24489 at zk3.dec.com>
Mime-Version: 1.0
Content-Type: text/plain;
  charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060111190453.GC24489 at zk3.dec.com>
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: Re: [PATCH 2/2] audit string fields interface + consumer
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: 13244
X-UID: 48008

Merge updates to patch 1/2 of this set.

Amy Griffis wrote:     [Wed Jan 11 2006, 02:04:53PM EST]
> Add AUDIT_WATCH field type and associated helpers.
> 
> Signed-off-by: Amy Griffis <amy.griffis at hp.com>

---

 include/linux/audit.h |    1 
 kernel/audit.h        |    8 +++
 kernel/auditfilter.c  |  130 ++++++++++++++++++++++++++++++++++++++++++++-----
 kernel/auditsc.c      |    3 +
 4 files changed, 128 insertions(+), 14 deletions(-)

237afe663373e4f908cb1d0a188fd8b5216069e9
diff --git a/include/linux/audit.h b/include/linux/audit.h
index c208554..d76fa58 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -148,6 +148,7 @@
 #define AUDIT_INODE	102
 #define AUDIT_EXIT	103
 #define AUDIT_SUCCESS   104	/* exit >= 0; value ignored */
+#define AUDIT_WATCH	105
 
 #define AUDIT_ARG0      200
 #define AUDIT_ARG1      (AUDIT_ARG0+1)
diff --git a/kernel/audit.h b/kernel/audit.h
index 4b602cd..eb33354 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -52,6 +52,12 @@ enum audit_state {
 };
 
 /* Rule lists */
+struct audit_watch {
+	char			*path;	 /* watch insertion path */
+	struct list_head	mlist;	 /* entry in master_watchlist */
+	struct list_head	rules;	 /* associated rules */
+};
+
 struct audit_field {
 	u32			type;
 	u32			val;
@@ -67,6 +73,8 @@ struct audit_krule {
 	u32			buflen; /* for data alloc on list rules */
 	u32			field_count;
 	struct audit_field	*fields;
+	struct audit_watch	*watch;	 /* associated watch */
+	struct list_head	rlist;	 /* entry in audit_watch.rules list */
 };
 
 struct audit_entry {
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 5735acd..5e9f650 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/audit.h>
 #include <linux/kthread.h>
+#include <linux/fs.h>
+#include <linux/namei.h>
 #include <linux/netlink.h>
 #include "audit.h"
 
@@ -40,6 +42,12 @@ struct list_head audit_filter_list[AUDIT
 #endif
 };
 
+static inline void audit_free_watch(struct audit_watch *watch)
+{
+	kfree(watch->path);
+	kfree(watch);
+}
+
 static inline void audit_free_rule(struct audit_entry *e)
 {
 	kfree(e->rule.fields);
@@ -52,6 +60,8 @@ static inline void audit_free_rule_rcu(s
 	audit_free_rule(e);
 }
 
+static LIST_HEAD(master_watchlist);
+
 /* Unpack a filter field's string representation from user-space
  * buffer. */
 static char *audit_unpack_string(void **bufp, size_t *remain, size_t len)
@@ -79,6 +89,33 @@ static char *audit_unpack_string(void **
 	return str;
 }
 
+/* Translate a watch string to kernel respresentation. */
+static int audit_to_watch(char *path, struct audit_krule *krule, int fidx)
+{
+	struct audit_field *f = &krule->fields[fidx];
+	struct nameidata nd;
+	struct audit_watch *watch;
+
+	if (path[0] != '/' || path[f->val-1] == '/' ||
+	    krule->listnr != AUDIT_FILTER_EXIT ||
+	    f->op & ~AUDIT_EQUAL)
+		return -EINVAL;
+
+	if (path_lookup(path, 0, &nd) == 0)
+		f->val = nd.dentry->d_inode->i_ino;
+	else
+		f->val = (unsigned int)-1;
+	path_release(&nd);
+
+	watch = kmalloc(sizeof(*watch), GFP_KERNEL);
+	if (unlikely(!watch))
+		return -ENOMEM;
+	watch->path = path;
+	krule->watch = watch;
+
+	return 0;
+}
+
 /* Common user-space to kernel rule translation. */
 static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule)
 {
@@ -150,15 +187,16 @@ static struct audit_entry *audit_rule_to
 	for (i = 0; i < rule->field_count; i++) {
 		struct audit_field *f = &entry->rule.fields[i];
 
-		if (rule->fields[i] & AUDIT_UNUSED_BITS) {
-			err = -EINVAL;
-			goto exit_free;
-		}
-
 		f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS);
 		f->val = rule->values[i];
 
+		if (f->type & AUDIT_UNUSED_BITS ||
+		    f->type == AUDIT_WATCH) {
+			err = -EINVAL;
+			goto exit_free;
+		}
+
 		entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1;
 		if (f->op & AUDIT_NEGATE)
 			f->op |= AUDIT_NOT_EQUAL;
@@ -182,8 +220,9 @@ static struct audit_entry *audit_data_to
 	int err = 0;
 	struct audit_entry *entry;
 	void *bufp;
-	/* size_t remain = datasz - sizeof(struct audit_rule_data); */
+	size_t remain = datasz - sizeof(struct audit_rule_data);
 	int i;
+	char *path;
 
 	entry = audit_to_entry_common((struct audit_rule *)data);
 	if (IS_ERR(entry))
@@ -201,10 +240,20 @@ static struct audit_entry *audit_data_to
 
 		f->op = data->fieldflags[i] & AUDIT_OPERATORS;
 		f->type = data->fields[i];
+		f->val = data->values[i];
 		switch(f->type) {
-		/* call type-specific conversion routines here */
-		default:
-			f->val = data->values[i];
+		case AUDIT_WATCH:
+			path = audit_unpack_string(&bufp, &remain, f->val);
+			if (IS_ERR(path))
+				goto exit_free;
+			entry->rule.buflen += f->val;
+
+			err = audit_to_watch(path, &entry->rule, i);
+			if (err) {
+				kfree(path);
+				goto exit_free;
+			}
+			break;
 		}
 	}
 
@@ -280,7 +329,10 @@ static struct audit_rule_data *audit_kru
 		data->fields[i] = f->type;
 		data->fieldflags[i] = f->op;
 		switch(f->type) {
-		/* call type-specific conversion routines here */
+		case AUDIT_WATCH:
+			data->buflen += data->values[i] =
+				audit_pack_string(&bufp, krule->watch->path);
+			break;
 		default:
 			data->values[i] = f->val;
 		}
@@ -290,6 +342,12 @@ static struct audit_rule_data *audit_kru
 	return data;
 }
 
+/* Compare two watches.  Considered success if rules don't match. */
+static inline int audit_compare_watch(struct audit_watch *a, struct audit_watch *b)
+{
+	return strcmp(a->path, b->path);
+}
+
 /* Compare two rules in kernel format.  Considered success if rules
  * don't match. */
 static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b)
@@ -308,7 +366,10 @@ static int audit_compare_rule(struct aud
 			return 1;
 
 		switch(a->fields[i].type) {
-		/* call type-specific comparison routines here */
+		case AUDIT_WATCH:
+			if (audit_compare_watch(a->watch, b->watch))
+				return 1;
+			break;
 		default:
 			if (a->fields[i].val != b->fields[i].val)
 				return 1;
@@ -322,6 +383,26 @@ static int audit_compare_rule(struct aud
 	return 0;
 }
 
+/* Attach krule's watch to master_watchlist, using existing watches
+ * when possible. */
+static inline void audit_add_watch(struct audit_krule *krule)
+{
+	struct audit_watch *w;
+
+	list_for_each_entry(w, &master_watchlist, mlist) {
+		if (audit_compare_watch(w, krule->watch))
+			continue;
+
+		audit_free_watch(krule->watch);
+		krule->watch = w;
+		list_add(&krule->rlist, &w->rules);
+		return;
+	}
+	INIT_LIST_HEAD(&krule->watch->rules);
+	list_add(&krule->rlist, &krule->watch->rules);
+	list_add(&krule->watch->mlist, &master_watchlist);
+}
+
 /* Add rule to given filterlist if not a duplicate.  Protected by
  * audit_netlink_sem. */
 static inline int audit_add_rule(struct audit_entry *entry,
@@ -336,6 +417,8 @@ static inline int audit_add_rule(struct 
 			return -EEXIST;
 	}
 
+	if (entry->rule.watch)
+		audit_add_watch(&entry->rule);
 	if (entry->rule.flags & AUDIT_FILTER_PREPEND) {
 		list_add_rcu(&entry->list, list);
 	} else {
@@ -345,6 +428,20 @@ static inline int audit_add_rule(struct 
 	return 0;
 }
 
+/* Detach watch from krule, freeing if it has no associated rules. */
+static inline void audit_detach_watch(struct audit_krule *krule)
+{
+	struct audit_watch *watch = krule->watch;
+
+	list_del(&krule->rlist);
+	krule->watch = NULL;
+
+	if (list_empty(&watch->rules)) {
+		list_del(&watch->mlist);
+		audit_free_watch(watch);
+	}
+}
+
 /* Remove an existing rule from filterlist.  Protected by
  * audit_netlink_sem. */
 static inline int audit_del_rule(struct audit_entry *entry,
@@ -357,6 +454,8 @@ static inline int audit_del_rule(struct 
 	list_for_each_entry(e, list, list) {
 		if (!audit_compare_rule(&entry->rule, &e->rule)) {
 			list_del_rcu(&e->list);
+			if (e->rule.watch)
+				audit_detach_watch(&e->rule);
 			call_rcu(&e->rcu, audit_free_rule_rcu);
 			return 0;
 		}
@@ -423,7 +522,7 @@ static int audit_list_rules(void *_dest)
 			if (unlikely(!data))
 				break;
 			audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1,
-					 data, sizeof(*data));
+					 data, sizeof(*data) + data->buflen);
 			kfree(data);
 		}
 	}
@@ -490,8 +589,11 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u added an audit rule\n", loginuid);
-		else
+		else {
+			if (entry->rule.watch)
+				audit_free_watch(entry->rule.watch);
 			audit_free_rule(entry);
+		}
 		break;
 	case AUDIT_DEL:
 	case AUDIT_DEL_RULE:
@@ -507,6 +609,8 @@ int audit_receive_filter(int type, int p
 		if (!err)
 			audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE,
 				  "auid=%u removed an audit rule\n", loginuid);
+		if (entry->rule.watch)
+			audit_free_watch(entry->rule.watch);
 		audit_free_rule(entry);
 		break;
 	default:
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index e4f7096..8e98b65 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -240,7 +240,8 @@ static int audit_filter_rules(struct tas
 			}
 			break;
 		case AUDIT_INODE:
-			if (ctx) {
+		case AUDIT_WATCH:
+			if (ctx && f->val != (unsigned int)-1) {
 				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)) {
-- 
0.99.9n

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


linux-2.6-audit-tty.patch:
 auditsc.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-audit-tty.patch ---
>From linux-audit-bounces at redhat.com Sun Jan  1 19:07:06 2006
Return-path: <linux-audit-bounces at redhat.com>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sun, 01 Jan 2006 19:07:06 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xq-0006yT-4F for dwmw2 at baythorne.infradead.org; Sun, 01 Jan 2006
	19:07:06 +0000
Received: from hormel.redhat.com ([209.132.177.30]) by
	pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id
	1Et8Xo-0000N4-CS for dwmw2 at infradead.org; Sun, 01 Jan 2006 19:07:05 +0000
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 2C86D72EB7; Sun,
	 1 Jan 2006 14:07:02 -0500 (EST)
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 k01J71MX011720 for <linux-audit at listman.util.phx.redhat.com>; Sun, 1 Jan
	2006 14:07:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com
	[172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id
	k01J70127937 for <linux-audit at int-mx1.corp.redhat.com>; Sun, 1 Jan 2006
	14:07:00 -0500
Received: from vpn50-34.rdu.redhat.com (vpn50-34.rdu.redhat.com
	[172.16.50.34]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id
	k01J6xa3016921 for <linux-audit at redhat.com>; Sun, 1 Jan 2006 14:07:00 -0500
From: Steve Grubb <sgrubb at redhat.com>
Organization: Red Hat
To: linux-audit at redhat.com
Date: Sun, 1 Jan 2006 14:07:00 -0500
User-Agent: KMail/1.9
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
Message-Id: <200601011407.00175.sgrubb at redhat.com>
X-MIME-Autoconverted: from quoted-printable to 8bit by
	listman.util.phx.redhat.com id k01J71MX011720
X-loop: linux-audit at redhat.com
Subject: Add tty to syscall audit records
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-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

Hi,

>From the RBAC specs:

FAU_SAR.1.1 The TSF shall provide the set of authorized 
RBAC administrators with the capability to read the following
audit information from the audit records:

<snip>
(e) The User Session Identifier or Terminal Type 

A patch adding the tty for all syscalls is included in this email.
Please apply.

Signed-off-by: Steve Grubb <sgrubb at redhat.com>



diff -urp linux-2.6.14.orig/kernel/auditsc.c linux-2.6.14/kernel/auditsc.c
--- linux-2.6.14.orig/kernel/auditsc.c	2005-12-28 10:39:04.000000000 -0500
+++ linux-2.6.14/kernel/auditsc.c	2005-12-28 10:40:28.000000000 -0500
@@ -56,6 +56,7 @@
 #include <asm/unistd.h>
 #include <linux/security.h>
 #include <linux/list.h>
+#include <linux/tty.h>
 
 #include "audit.h"
 
@@ -567,6 +568,7 @@ static void audit_log_exit(struct audit_
 	int i;
 	struct audit_buffer *ab;
 	struct audit_aux_data *aux;
+	const char *tty;
 
 	ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL);
 	if (!ab)
@@ -579,11 +581,15 @@ static void audit_log_exit(struct audit_
 		audit_log_format(ab, " success=%s exit=%ld", 
 				 (context->return_valid==AUDITSC_SUCCESS)?"yes":"no",
 				 context->return_code);
+	if (current->signal->tty && current->signal->tty->name)
+		tty = current->signal->tty->name;
+	else
+		tty = "(none)";
 	audit_log_format(ab,
 		  " a0=%lx a1=%lx a2=%lx a3=%lx items=%d"
 		  " pid=%d auid=%u uid=%u gid=%u"
 		  " euid=%u suid=%u fsuid=%u"
-		  " egid=%u sgid=%u fsgid=%u",
+		  " egid=%u sgid=%u fsgid=%u tty=%s",
 		  context->argv[0],
 		  context->argv[1],
 		  context->argv[2],
@@ -594,7 +600,7 @@ static void audit_log_exit(struct audit_
 		  context->uid,
 		  context->gid,
 		  context->euid, context->suid, context->fsuid,
-		  context->egid, context->sgid, context->fsgid);
+		  context->egid, context->sgid, context->fsgid, tty);
 	audit_log_task_info(ab);
 	audit_log_end(ab);
 

--
Linux-audit mailing list
Linux-audit at redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit

linux-2.6-vm86-audit_syscall_exit.patch:
 arch/i386/kernel/vm86.c |   12 ++++++++++--
 kernel/auditsc.c        |    5 -----
 2 files changed, 10 insertions(+), 7 deletions(-)

--- NEW FILE linux-2.6-vm86-audit_syscall_exit.patch ---
>From jbaron at redhat.com Tue Jan 31 16:56:28 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; Tue, 31 Jan 2006 16:59:43 -0500
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 k0VLxhVB011796;
	Tue, 31 Jan 2006 16:59:43 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLxe113090;
	Tue, 31 Jan 2006 16:59:40 -0500
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 k0VLxYad021818;
	Tue, 31 Jan 2006 16:59:34 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id DB408734FD; Tue, 31 Jan 2006 16:59:34 -0500 (EST)
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
	k0VLm1KO030358 for <linux-audit at listman.util.phx.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0VLm1108246
	for <linux-audit at int-mx1.corp.redhat.com>;
	Tue, 31 Jan 2006 16:48:01 -0500
Received: from dhcp83-105.boston.redhat.com
	(IDENT:U2FsdGVkX1/BG9Gb/rarNGoKwgdY7GXxe/iR5tDmvQU at dhcp83-105.boston.redhat.com
	[172.16.83.105])
	by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k0VLm0VC010704; 
	Tue, 31 Jan 2006 16:48:00 -0500
Date: Tue, 31 Jan 2006 16:56:28 -0500 (EST)
From: Jason Baron <jbaron at redhat.com>
X-X-Sender: jbaron at dhcp83-105.boston.redhat.com
To: linux-audit at redhat.com
Message-ID: <Pine.LNX.4.61.0601311642220.14617 at dhcp83-105.boston.redhat.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN;
  charset=US-ASCII
X-loop: linux-audit at redhat.com
X-Mailman-Approved-At: Tue, 31 Jan 2006 16:59:33 -0500
Cc: dwmw2 at infradead.org,
 viro at zeniv.linux.org.uk
Subject: make vm86 call audit_syscall_exit
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: 6338
X-UID: 46889


hi,

The motivation behind the patch below was to address messages in 
/var/log/messages such as:

Jan 31 10:54:15 mets kernel: audit(:0): major=252 name_count=0: freeing 
multiple contexts (1)
Jan 31 10:54:15 mets kernel: audit(:0): major=113 name_count=0: freeing 
multiple contexts (2)

I can reproduce by running 'get-edid' from:
http://john.fremlin.de/programs/linux/read-edid/. 

These messages come about in the log b/c the vm86 calls do not exit via 
the normal system call exit paths and thus do not call 
'audit_syscall_exit'. The next system call will then free the context for 
itself and for the vm86 context, thus generating the above messages. This 
patch addresses the issue by simply adding a call to 'audit_syscall_exit' 
from the vm86 code.

Besides fixing the above error messages the patch also now allows vm86 
system calls to become auditable. This is useful since strace does not 
appear to properly record the return values from sys_vm86.

I think this patch is also a step in the right direction in terms of 
cleaning up some core auditing code. If we can correct any other paths 
that do not properly call the audit exit and entries points, then we can 
also eliminate the notion of context chaining.

I've tested this patch by verifying that the log messages no longer 
appear, and that the audit records for sys_vm86 appear to be correct. 
Also, 'read_edid' produces itentical output.

thanks,

Jason

Signed-off-by: Jason Baron <jbaron at redhat.com>


--- linux-2.6/kernel/auditsc.c.bak
+++ linux-2.6/kernel/auditsc.c
@@ -981,11 +981,6 @@ void audit_syscall_entry(struct task_str
 	if (context && context->in_syscall) {
 		struct audit_context *newctx;
 
-#if defined(__NR_vm86) && defined(__NR_vm86old)
-		/* vm86 mode should only be entered once */
-		if (major == __NR_vm86 || major == __NR_vm86old)
-			return;
-#endif
 #if AUDIT_DEBUG
 		printk(KERN_ERR
 		       "audit(:%d) pid=%d in syscall=%d;"
--- linux-2.6/arch/i386/kernel/vm86.c.bak	2006-01-31 12:19:56.000000000 -0500
+++ linux-2.6/arch/i386/kernel/vm86.c	2006-01-31 12:24:52.000000000 -0500
@@ -42,6 +42,7 @@
 #include <linux/smp_lock.h>
 #include <linux/highmem.h>
 #include <linux/ptrace.h>
+#include <linux/audit.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -251,6 +252,7 @@ out:
 static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
 {
 	struct tss_struct *tss;
+	long eax;
 /*
  * make sure the vm86() system call doesn't try to do anything silly
  */
@@ -304,13 +306,19 @@ static void do_sys_vm86(struct kernel_vm
 	tsk->thread.screen_bitmap = info->screen_bitmap;
 	if (info->flags & VM86_SCREEN_BITMAP)
 		mark_screen_rdonly(tsk->mm);
+	__asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t");
+	__asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax));
+	
+	/*call audit_syscall_exit since we do not exit via the normal paths */
+	if (unlikely(current->audit_context))
+		audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+
 	__asm__ __volatile__(
-		"xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
 		"movl %0,%%esp\n\t"
 		"movl %1,%%ebp\n\t"
 		"jmp resume_userspace"
 		: /* no outputs */
-		:"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
+		:"r" (&info->regs), "r" (task_thread_info(tsk)));
 	/* we never return here */
 }
 

--
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.1986
retrieving revision 1.1986.2.1
diff -u -r1.1986 -r1.1986.2.1
--- kernel-2.6.spec	26 Feb 2006 18:59:40 -0000	1.1986
+++ kernel-2.6.spec	26 Feb 2006 22:37:22 -0000	1.1986.2.1
@@ -8,10 +8,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
 
 # Versions of various parts
 
@@ -24,7 +24,7 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys  .lspp.10
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 %define signmodules 0
 %define make_target bzImage
@@ -370,7 +370,7 @@
 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
+#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
@@ -409,6 +409,21 @@
 Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch
 Patch20010: linux-2.6-xen-cpusteal-hv.patch
 
+# Audit patches
+Patch20110: linux-2.6-audit-git.patch
+Patch20111: linux-2.6-audit-promisc.patch
+Patch20112: linux-2.6-audit-tty.patch
+Patch20113: linux-2.6-vm86-audit_syscall_exit.patch
+Patch20114: linux-2.6-audit-string-1.patch
+Patch20115: linux-2.6-audit-string-2.patch
+Patch20116: linux-2.6-audit-inotify-api.patch
+Patch20117: linux-2.6-audit-rule-log.patch
+Patch20118: linux-2.6-audit-fix-operators.patch
+Patch20119: linux-2.6-audit-context-leak.patch
+Patch20120: linux-2.6-audit-ipc-leak.patch
+Patch20121: linux-2.6-audit-by-context-sup.patch
+Patch20122: linux-2.6-audit-by-context.patch
+
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -944,7 +959,7 @@
 # Fix incorrect hardlink count in selinuxfs
 %patch1803 -p1
 # Add some more audit message types.
-%patch1804 -p1
+#%patch1804 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -994,6 +1009,21 @@
 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly.
 %patch10001 -p1
 
+# audit patches
+%patch20110 -p1
+%patch20111 -p1
+%patch20112 -p1
+%patch20113 -p1
+%patch20114 -p1
+%patch20115 -p1
+%patch20116 -p1
+%patch20117 -p1
+%patch20118 -p1
+%patch20119 -p1
+%patch20120 -p1
+%patch20121 -p1
+%patch20122 -p1
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1582,6 +1612,9 @@
 %endif
 
 %changelog
+* Sun Feb 26 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.10 kernel
+
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git9
 



From fedora-cvs-commits at redhat.com  Sun Feb 26 23:41:11 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 18:41:11 -0500
Subject: rpms/irqbalance/devel irqbalance-norebalance-zeroints.patch, NONE,
	1.1 irqbalance.spec, 1.24, 1.25
Message-ID: <200602262341.k1QNfBZ2022230@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/irqbalance/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22215

Modified Files:
	irqbalance.spec 
Added Files:
	irqbalance-norebalance-zeroints.patch 
Log Message:
Don't rebalance IRQs where no interrupts have occured.


irqbalance-norebalance-zeroints.patch:
 procinterrupts.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE irqbalance-norebalance-zeroints.patch ---
--- irqbalance-1.12/irqbalance/procinterrupts.c~	2006-02-26 18:38:18.000000000 -0500
+++ irqbalance-1.12/irqbalance/procinterrupts.c	2006-02-26 18:39:13.000000000 -0500
@@ -134,6 +134,9 @@ void activate_irqtable(void)
 			continue;
 		if (interrupts[i].type == IRQ_INACTIVE)
 			continue;
+		if (interrupts[i].count == interrupts[i].oldcount)
+			continue;
+		interrupts[i].oldcount = interrupts[i].count;
 		snprintf(filename,255,"/proc/irq/%i/smp_affinity",i);
 		file = fopen(filename, "w");
 		if (file==NULL)


Index: irqbalance.spec
===================================================================
RCS file: /cvs/dist/rpms/irqbalance/devel/irqbalance.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- irqbalance.spec	12 Feb 2006 20:13:52 -0000	1.24
+++ irqbalance.spec	26 Feb 2006 23:41:09 -0000	1.25
@@ -11,6 +11,7 @@
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 Prereq:		/sbin/chkconfig /sbin/service
 Patch1: irqbalance-pie.patch
+Patch2: irqbalance-norebalance-zeroints.patch
 ExclusiveArch:	i386 x86_64 ia64 ppc ppc64
 Obsoletes:	kernel-utils
 
@@ -21,6 +22,7 @@
 %prep
 %setup -q -c -a 0
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Sun Feb 26 2006 Dave Jones <davej at redhat.com>
+- Don't rebalance IRQs where no interrupts have occured.
+
 * Sun Feb 12 2006 Dave Jones <davej at redhat.com>
 - Build for ppc[64] too.
 



From fedora-cvs-commits at redhat.com  Sun Feb 26 23:51:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 18:51:33 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc4-git10.bz2.sign, NONE,
	1.1 .cvsignore, 1.362, 1.363 kernel-2.6.spec, 1.1986,
	1.1987 linux-2.6-xen-merge.patch, 1.2, 1.3 sources, 1.304,
	1.305 upstream, 1.279, 1.280 patch-2.6.16-rc4-git6.bz2.sign,
	1.1, NONE patch-2.6.16-rc4-git8.bz2.sign, 1.1, NONE
Message-ID: <200602262351.k1QNpXHX002470@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2456

Modified Files:
	.cvsignore kernel-2.6.spec linux-2.6-xen-merge.patch sources 
	upstream 
Added Files:
	patch-2.6.16-rc4-git10.bz2.sign 
Removed Files:
	patch-2.6.16-rc4-git6.bz2.sign patch-2.6.16-rc4-git8.bz2.sign 
Log Message:
git10



--- NEW FILE patch-2.6.16-rc4-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEAfsryGugalF9Dw4RAqJJAJ4vXv/WYAIrHtcOV57PLkWWtRuuygCaAszJ
kGz8ysghEkirnxEDYYWXBMg=
=2ivs
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- .cvsignore	26 Feb 2006 18:59:40 -0000	1.362
+++ .cvsignore	26 Feb 2006 23:51:29 -0000	1.363
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git9.bz2
+patch-2.6.16-rc4-git10.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1986
retrieving revision 1.1987
diff -u -r1.1986 -r1.1987
--- kernel-2.6.spec	26 Feb 2006 18:59:40 -0000	1.1986
+++ kernel-2.6.spec	26 Feb 2006 23:51:29 -0000	1.1987
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git9.bz2
+Patch2: patch-2.6.16-rc4-git10.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -1583,7 +1583,7 @@
 
 %changelog
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc4-git9
+- 2.6.16rc4-git9 & -git10
 
 * Sat Feb 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git8

linux-2.6-xen-merge.patch:
 arch/i386/Makefile                               |   18 
 arch/i386/kernel/Makefile                        |   26 
 arch/i386/kernel/acpi/Makefile                   |    4 
 arch/i386/kernel/cpu/Makefile                    |    5 
 arch/i386/kernel/cpu/cpufreq/Kconfig             |    2 
 arch/i386/kernel/cpu/mtrr/Makefile               |    7 
 arch/i386/kernel/smpboot.c                       |   10 
 arch/i386/kernel/traps.c                         |    9 
 arch/i386/kernel/vmlinux.lds.S                   |    7 
 arch/i386/mm/Makefile                            |    8 
 arch/i386/pci/Makefile                           |    5 
 arch/i386/power/Makefile                         |    4 
 arch/um/kernel/physmem.c                         |    4 
 arch/x86_64/Kconfig                              |   41 
 arch/x86_64/Makefile                             |   15 
 arch/x86_64/ia32/Makefile                        |   18 
 arch/x86_64/ia32/vsyscall-sigreturn.S            |    2 
 arch/x86_64/kernel/Makefile                      |   20 
 arch/x86_64/kernel/acpi/Makefile                 |    2 
 arch/x86_64/kernel/i387.c                        |    5 
 arch/x86_64/kernel/pci-gart.c                    |    8 
 arch/x86_64/kernel/setup64.c                     |    2 
 arch/x86_64/mm/Makefile                          |   10 
 arch/x86_64/pci/Makefile                         |    8 
 b/arch/i386/boot-xen/Makefile                    |   21 
 b/arch/i386/kernel/acpi/boot-xen.c               | 1157 +++++++++
 b/arch/i386/kernel/apic-xen.c                    |  143 +
 b/arch/i386/kernel/cpu/common-xen.c              |  660 +++++
 b/arch/i386/kernel/cpu/mtrr/main-xen.c           |  187 +
 b/arch/i386/kernel/early_printk-xen.c            |    2 
 b/arch/i386/kernel/entry-xen.S                   |  851 +++++++
 b/arch/i386/kernel/fixup.c                       |   95 
 b/arch/i386/kernel/head-xen.S                    |  174 +
 b/arch/i386/kernel/init_task-xen.c               |   49 
 b/arch/i386/kernel/io_apic-xen.c                 | 2725 +++++++++++++++++++++++
 b/arch/i386/kernel/ioport-xen.c                  |  122 +
 b/arch/i386/kernel/irq-xen.c                     |  306 ++
 b/arch/i386/kernel/ldt-xen.c                     |  269 ++
 b/arch/i386/kernel/microcode-xen.c               |  164 +
 b/arch/i386/kernel/mpparse-xen.c                 | 1177 +++++++++
 b/arch/i386/kernel/pci-dma-xen.c                 |  326 ++
 b/arch/i386/kernel/process-xen.c                 |  821 ++++++
 b/arch/i386/kernel/quirks-xen.c                  |   48 
 b/arch/i386/kernel/setup-xen.c                   | 1883 +++++++++++++++
 b/arch/i386/kernel/smp-xen.c                     |  617 +++++
 b/arch/i386/kernel/smpalts.c                     |   85 
 b/arch/i386/kernel/swiotlb.c                     |  677 +++++
 b/arch/i386/kernel/time-xen.c                    | 1016 ++++++++
 b/arch/i386/kernel/traps-xen.c                   | 1104 +++++++++
 b/arch/i386/kernel/vsyscall-note-xen.S           |   32 
 b/arch/i386/mach-xen/Makefile                    |    7 
 b/arch/i386/mach-xen/setup.c                     |   37 
 b/arch/i386/mm/fault-xen.c                       |  617 +++++
 b/arch/i386/mm/highmem-xen.c                     |  123 +
 b/arch/i386/mm/hypervisor.c                      |  459 +++
 b/arch/i386/mm/init-xen.c                        |  849 +++++++
 b/arch/i386/mm/ioremap-xen.c                     |  495 ++++
 b/arch/i386/mm/pgtable-xen.c                     |  630 +++++
 b/arch/i386/pci/irq-xen.c                        | 1197 ++++++++++
 b/arch/x86_64/ia32/ia32entry-xen.S               |  718 ++++++
 b/arch/x86_64/ia32/syscall32-xen.c               |  128 +
 b/arch/x86_64/ia32/syscall32_syscall-xen.S       |   28 
 b/arch/x86_64/ia32/vsyscall-int80.S              |   58 
 b/arch/x86_64/kernel/apic-xen.c                  |  187 +
 b/arch/x86_64/kernel/e820-xen.c                  |  744 ++++++
 b/arch/x86_64/kernel/early_printk-xen.c          |  306 ++
 b/arch/x86_64/kernel/entry-xen.S                 | 1155 +++++++++
 b/arch/x86_64/kernel/genapic-xen.c               |  135 +
 b/arch/x86_64/kernel/genapic_xen.c               |  162 +
 b/arch/x86_64/kernel/head-xen.S                  |  255 ++
 b/arch/x86_64/kernel/head64-xen.c                |  137 +
 b/arch/x86_64/kernel/io_apic-xen.c               | 2191 ++++++++++++++++++
 b/arch/x86_64/kernel/ioport-xen.c                |   58 
 b/arch/x86_64/kernel/irq-xen.c                   |  157 +
 b/arch/x86_64/kernel/ldt-xen.c                   |  282 ++
 b/arch/x86_64/kernel/mpparse-xen.c               | 1000 ++++++++
 b/arch/x86_64/kernel/pci-nommu-xen.c             |   99 
 b/arch/x86_64/kernel/process-xen.c               |  798 ++++++
 b/arch/x86_64/kernel/setup-xen.c                 | 1619 +++++++++++++
 b/arch/x86_64/kernel/setup64-xen.c               |  354 ++
 b/arch/x86_64/kernel/smp-xen.c                   |  592 ++++
 b/arch/x86_64/kernel/traps-xen.c                 | 1010 ++++++++
 b/arch/x86_64/kernel/vsyscall-xen.c              |  239 ++
 b/arch/x86_64/kernel/x8664_ksyms-xen.c           |  181 +
 b/arch/x86_64/kernel/xen_entry.S                 |   41 
 b/arch/x86_64/mm/fault-xen.c                     |  601 +++++
 b/arch/x86_64/mm/init-xen.c                      | 1116 +++++++++
 b/arch/x86_64/mm/pageattr-xen.c                  |  375 +++
 b/drivers/char/tpm/tpm_xen.c                     |  525 ++++
 b/drivers/xen/Kconfig                            |  175 +
 b/drivers/xen/Makefile                           |   20 
 b/drivers/xen/balloon/Makefile                   |    2 
 b/drivers/xen/balloon/balloon.c                  |  585 ++++
 b/drivers/xen/blkback/Makefile                   |    2 
 b/drivers/xen/blkback/blkback.c                  |  590 ++++
 b/drivers/xen/blkback/common.h                   |  123 +
 b/drivers/xen/blkback/interface.c                |  164 +
 b/drivers/xen/blkback/vbd.c                      |  102 
 b/drivers/xen/blkback/xenbus.c                   |  421 +++
 b/drivers/xen/blkfront/Kconfig                   |    6 
 b/drivers/xen/blkfront/Makefile                  |    5 
 b/drivers/xen/blkfront/blkfront.c                |  835 +++++++
 b/drivers/xen/blkfront/block.h                   |  162 +
 b/drivers/xen/blkfront/vbd.c                     |  323 ++
 b/drivers/xen/blktap/Makefile                    |    3 
 b/drivers/xen/blktap/blktap.c                    |  910 +++++++
 b/drivers/xen/blktap/common.h                    |  110 
 b/drivers/xen/blktap/interface.c                 |  146 +
 b/drivers/xen/blktap/xenbus.c                    |  234 +
 b/drivers/xen/char/Makefile                      |    2 
 b/drivers/xen/char/mem.c                         |  159 +
 b/drivers/xen/console/Makefile                   |    2 
 b/drivers/xen/console/console.c                  |  688 +++++
 b/drivers/xen/console/xencons_ring.c             |  125 +
 b/drivers/xen/core/Makefile                      |    9 
 b/drivers/xen/core/evtchn.c                      |  820 ++++++
 b/drivers/xen/core/features.c                    |   28 
 b/drivers/xen/core/gnttab.c                      |  404 +++
 b/drivers/xen/core/reboot.c                      |  436 +++
 b/drivers/xen/core/skbuff.c                      |  143 +
 b/drivers/xen/core/smpboot.c                     |  441 +++
 b/drivers/xen/core/xen_proc.c                    |   29 
 b/drivers/xen/evtchn/Makefile                    |    2 
 b/drivers/xen/evtchn/evtchn.c                    |  459 +++
 b/drivers/xen/net_driver_util.c                  |   67 
 b/drivers/xen/netback/Makefile                   |    2 
 b/drivers/xen/netback/common.h                   |  110 
 b/drivers/xen/netback/interface.c                |  320 ++
 b/drivers/xen/netback/loopback.c                 |  198 +
 b/drivers/xen/netback/netback.c                  |  828 ++++++
 b/drivers/xen/netback/xenbus.c                   |  327 ++
 b/drivers/xen/netfront/Kconfig                   |    6 
 b/drivers/xen/netfront/Makefile                  |    4 
 b/drivers/xen/netfront/netfront.c                | 1487 ++++++++++++
 b/drivers/xen/privcmd/Makefile                   |    2 
 b/drivers/xen/privcmd/privcmd.c                  |  279 ++
 b/drivers/xen/tpmback/Makefile                   |    4 
 b/drivers/xen/tpmback/common.h                   |   89 
 b/drivers/xen/tpmback/interface.c                |  200 +
 b/drivers/xen/tpmback/tpmback.c                  | 1109 +++++++++
 b/drivers/xen/tpmback/xenbus.c                   |  328 ++
 b/drivers/xen/tpmfront/Makefile                  |    2 
 b/drivers/xen/tpmfront/tpmfront.c                |  703 +++++
 b/drivers/xen/tpmfront/tpmfront.h                |   43 
 b/drivers/xen/util.c                             |   80 
 b/drivers/xen/xenbus/Makefile                    |    8 
 b/drivers/xen/xenbus/xenbus_client.c             |  238 ++
 b/drivers/xen/xenbus/xenbus_comms.c              |  203 +
 b/drivers/xen/xenbus/xenbus_comms.h              |   50 
 b/drivers/xen/xenbus/xenbus_dev.c                |  238 ++
 b/drivers/xen/xenbus/xenbus_probe.c              | 1015 ++++++++
 b/drivers/xen/xenbus/xenbus_xs.c                 |  821 ++++++
 b/include/asm-i386/hypercall.h                   |  329 ++
 b/include/asm-i386/hypervisor.h                  |  180 +
 b/include/asm-i386/mach-default/mach_dma_map.h   |   85 
 b/include/asm-i386/mach-default/mach_fixmap.h    |   15 
 b/include/asm-i386/mach-default/mach_io.h        |   35 
 b/include/asm-i386/mach-default/mach_mmu.h       |   18 
 b/include/asm-i386/mach-default/mach_mode.h      |    7 
 b/include/asm-i386/mach-default/mach_page.h      |   28 
 b/include/asm-i386/mach-default/mach_pgtable.h   |   45 
 b/include/asm-i386/mach-default/mach_processor.h |   53 
 b/include/asm-i386/mach-default/mach_seg.h       |   39 
 b/include/asm-i386/mach-default/mach_setup.h     |   50 
 b/include/asm-i386/mach-default/mach_system.h    |   87 
 b/include/asm-i386/mach-default/mach_tlbflush.h  |   59 
 b/include/asm-i386/mach-xen/irq_vectors.h        |  125 +
 b/include/asm-i386/mach-xen/mach_dma_map.h       |   47 
 b/include/asm-i386/mach-xen/mach_fixmap.h        |   15 
 b/include/asm-i386/mach-xen/mach_io.h            |   50 
 b/include/asm-i386/mach-xen/mach_mmu.h           |   47 
 b/include/asm-i386/mach-xen/mach_mode.h          |    7 
 b/include/asm-i386/mach-xen/mach_page.h          |  154 +
 b/include/asm-i386/mach-xen/mach_pgtable.h       |  146 +
 b/include/asm-i386/mach-xen/mach_processor.h     |   59 
 b/include/asm-i386/mach-xen/mach_seg.h           |    9 
 b/include/asm-i386/mach-xen/mach_setup.h         |   11 
 b/include/asm-i386/mach-xen/mach_system.h        |  157 +
 b/include/asm-i386/mach-xen/mach_tlbflush.h      |   10 
 b/include/asm-i386/mach-xen/mach_traps.h         |   33 
 b/include/asm-i386/mach-xen/setup_arch_post.h    |   43 
 b/include/asm-i386/mach-xen/setup_arch_pre.h     |    5 
 b/include/asm-i386/smp_alt.h                     |   32 
 b/include/asm-i386/swiotlb.h                     |   59 
 b/include/asm-i386/synch_bitops.h                |  143 +
 b/include/asm-x86_64/arch_hooks.h                |   31 
 b/include/asm-x86_64/hypercall.h                 |  323 ++
 b/include/asm-x86_64/hypervisor.h                |    2 
 b/include/asm-x86_64/mach-xen/asm/nmi.h          |   75 
 b/include/asm-x86_64/synch_bitops.h              |    1 
 b/include/xen/balloon.h                          |   70 
 b/include/xen/driver_util.h                      |   26 
 b/include/xen/evtchn.h                           |  123 +
 b/include/xen/features.h                         |   20 
 b/include/xen/foreign_page.h                     |   40 
 b/include/xen/gnttab.h                           |   98 
 b/include/xen/interface/acm.h                    |  181 +
 b/include/xen/interface/acm_ops.h                |   96 
 b/include/xen/interface/arch-ia64.h              |  279 ++
 b/include/xen/interface/arch-x86_32.h            |  158 +
 b/include/xen/interface/arch-x86_64.h            |  243 ++
 b/include/xen/interface/dom0_ops.h               |  488 ++++
 b/include/xen/interface/event_channel.h          |  203 +
 b/include/xen/interface/grant_table.h            |  306 ++
 b/include/xen/interface/hvm/hvm_info_table.h     |   24 
 b/include/xen/interface/hvm/ioreq.h              |   90 
 b/include/xen/interface/hvm/vmx_assist.h         |   97 
 b/include/xen/interface/io/blkif.h               |   85 
 b/include/xen/interface/io/console.h             |   33 
 b/include/xen/interface/io/netif.h               |   76 
 b/include/xen/interface/io/ring.h                |  270 ++
 b/include/xen/interface/io/tpmif.h               |   56 
 b/include/xen/interface/io/vmx_vlapic.h          |   58 
 b/include/xen/interface/io/vmx_vpic.h            |   85 
 b/include/xen/interface/io/xenbus.h              |   44 
 b/include/xen/interface/io/xs_wire.h             |   97 
 b/include/xen/interface/memory.h                 |  127 +
 b/include/xen/interface/nmi.h                    |   54 
 b/include/xen/interface/physdev.h                |   70 
 b/include/xen/interface/sched.h                  |   60 
 b/include/xen/interface/sched_ctl.h              |   68 
 b/include/xen/interface/trace.h                  |   90 
 b/include/xen/interface/vcpu.h                   |   64 
 b/include/xen/interface/version.h                |   63 
 b/include/xen/interface/xen.h                    |  447 +++
 b/include/xen/net_driver_util.h                  |   56 
 b/include/xen/public/evtchn.h                    |   98 
 b/include/xen/public/privcmd.h                   |   91 
 b/include/xen/public/xenstored.h                 |   89 
 b/include/xen/tpmfe.h                            |   33 
 b/include/xen/xen_proc.h                         |   23 
 b/include/xen/xenbus.h                           |  254 ++
 b/include/xen/xencons.h                          |   14 
 b/scripts/Makefile.xen                           |   14 
 drivers/Kconfig                                  |   11 
 drivers/Makefile                                 |    1 
 drivers/acpi/Kconfig                             |    2 
 drivers/acpi/tables.c                            |    7 
 drivers/char/mem.c                               |    6 
 drivers/char/tpm/Kconfig                         |   14 
 drivers/char/tpm/Makefile                        |    1 
 drivers/char/tpm/tpm.c                           |   47 
 drivers/char/tpm/tpm.h                           |   13 
 drivers/char/tpm/tpm_atmel.c                     |  110 
 drivers/char/tpm/tpm_nsc.c                       |  155 -
 drivers/char/tty_io.c                            |    7 
 drivers/firmware/Kconfig                         |    2 
 drivers/ide/legacy/hd.c                          |    2 
 drivers/pci/Kconfig                              |    1 
 drivers/serial/Kconfig                           |    1 
 drivers/video/fbmon.c                            |    2 
 fs/Kconfig                                       |    1 
 include/asm-i386/agp.h                           |   15 
 include/asm-i386/atomic.h                        |    7 
 include/asm-i386/bitops.h                        |   19 
 include/asm-i386/desc.h                          |   47 
 include/asm-i386/dma-mapping.h                   |  102 
 include/asm-i386/fixmap.h                        |   20 
 include/asm-i386/floppy.h                        |   43 
 include/asm-i386/futex.h                         |    4 
 include/asm-i386/highmem.h                       |    5 
 include/asm-i386/hw_irq.h                        |    4 
 include/asm-i386/io.h                            |   41 
 include/asm-i386/kmap_types.h                    |    3 
 include/asm-i386/mach-default/mach_traps.h       |   12 
 include/asm-i386/mmu.h                           |    6 
 include/asm-i386/mmu_context.h                   |   17 
 include/asm-i386/page.h                          |   14 
 include/asm-i386/pci.h                           |   31 
 include/asm-i386/pgalloc.h                       |   31 
 include/asm-i386/pgtable-2level.h                |   12 
 include/asm-i386/pgtable-3level.h                |   35 
 include/asm-i386/pgtable.h                       |   22 
 include/asm-i386/processor.h                     |   48 
 include/asm-i386/ptrace.h                        |    5 
 include/asm-i386/rwsem.h                         |   17 
 include/asm-i386/scatterlist.h                   |    9 
 include/asm-i386/segment.h                       |   41 
 include/asm-i386/setup.h                         |   45 
 include/asm-i386/smp.h                           |    5 
 include/asm-i386/spinlock.h                      |   43 
 include/asm-i386/system.h                        |  138 -
 include/asm-i386/tlbflush.h                      |   55 
 include/asm-i386/vga.h                           |    2 
 include/asm-um/page.h                            |    2 
 include/asm-x86_64/bootsetup.h                   |   10 
 include/asm-x86_64/desc.h                        |   36 
 include/asm-x86_64/dma-mapping.h                 |  102 
 include/asm-x86_64/fixmap.h                      |   21 
 include/asm-x86_64/floppy.h                      |   45 
 include/asm-x86_64/hw_irq.h                      |   14 
 include/asm-x86_64/i387.h                        |    7 
 include/asm-x86_64/io.h                          |   49 
 include/asm-x86_64/ipi.h                         |    8 
 include/asm-x86_64/irq.h                         |   39 
 include/asm-x86_64/mmu.h                         |   13 
 include/asm-x86_64/mmu_context.h                 |  102 
 include/asm-x86_64/page.h                        |  155 +
 include/asm-x86_64/pci.h                         |   26 
 include/asm-x86_64/pda.h                         |    5 
 include/asm-x86_64/pgalloc.h                     |  157 +
 include/asm-x86_64/pgtable.h                     |  253 +-
 include/asm-x86_64/processor.h                   |   38 
 include/asm-x86_64/segment.h                     |    9 
 include/asm-x86_64/smp.h                         |   10 
 include/asm-x86_64/swiotlb.h                     |   18 
 include/asm-x86_64/system.h                      |  114 
 include/asm-x86_64/tlbflush.h                    |   14 
 include/asm-x86_64/vga.h                         |    2 
 include/asm-x86_64/xor.h                         |   23 
 include/linux/gfp.h                              |    6 
 include/linux/highmem.h                          |    6 
 include/linux/irq.h                              |    3 
 include/linux/mm.h                               |   13 
 include/linux/skbuff.h                           |   13 
 init/Kconfig                                     |    2 
 kernel/Kconfig.preempt                           |    1 
 kernel/irq/manage.c                              |   92 
 lib/Kconfig.debug                                |    2 
 lib/Makefile                                     |    2 
 linux-2.6.15.i686/arch/i386/Kconfig              |   79 
 mm/Kconfig                                       |    3 
 mm/highmem.c                                     |   11 
 mm/memory.c                                      |  118 
 mm/mmap.c                                        |    4 
 mm/page_alloc.c                                  |    6 
 net/core/dev.c                                   |   50 
 net/core/skbuff.c                                |   43 
 328 files changed, 61907 insertions(+), 817 deletions(-)

Index: linux-2.6-xen-merge.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-merge.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-merge.patch	25 Feb 2006 09:05:33 -0000	1.2
+++ linux-2.6-xen-merge.patch	26 Feb 2006 23:51:29 -0000	1.3
@@ -652,15 +652,6 @@
  	default y
  	help
  	  Use the IA-PC HPET (High Precision Event Timer) to manage
-@@ -356,7 +373,7 @@ config HPET_TIMER
- 
- config X86_PM_TIMER
- 	bool "PM timer" if EMBEDDED
--	depends on ACPI
-+	depends on ACPI && !X86_64_XEN
- 	default y
- 	help
- 	  Support the ACPI PM timer for time keeping. This is slow,
 @@ -377,7 +394,7 @@ config GART_IOMMU
  	bool "K8 GART IOMMU support"
  	default y


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- sources	26 Feb 2006 18:59:58 -0000	1.304
+++ sources	26 Feb 2006 23:51:29 -0000	1.305
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-7ad3a838fb88917b735856352d3a6573  patch-2.6.16-rc4-git9.bz2
+9910b14e310a4a7736e81e93cccc8f66  patch-2.6.16-rc4-git10.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- upstream	26 Feb 2006 18:59:58 -0000	1.279
+++ upstream	26 Feb 2006 23:51:29 -0000	1.280
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git9.bz2
+patch-2.6.16-rc4-git10.bz2


--- patch-2.6.16-rc4-git6.bz2.sign DELETED ---


--- patch-2.6.16-rc4-git8.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Sun Feb 26 23:52:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 18:52:52 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1987,1.1988
Message-ID: <200602262352.k1QNqqqQ002506@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2493

Modified Files:
	kernel-2.6.spec 
Log Message:
temporarily disable Xen due to build breakage



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1987
retrieving revision 1.1988
diff -u -r1.1987 -r1.1988
--- kernel-2.6.spec	26 Feb 2006 23:51:29 -0000	1.1987
+++ kernel-2.6.spec	26 Feb 2006 23:52:50 -0000	1.1988
@@ -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
@@ -1584,6 +1584,7 @@
 %changelog
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git9 & -git10
+- Temporarily disable xen due to build breakage.
 
 * Sat Feb 25 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git8



From fedora-cvs-commits at redhat.com  Mon Feb 27 02:58:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 21:58:21 -0500
Subject: rpms/gtk2-engines/devel gtk-engines-2.7.4-leaks.patch, NONE,
	1.1 gtk2-engines.spec, 1.36, 1.37
Message-ID: <200602270258.k1R2wLfR011815@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gtk2-engines/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11755

Modified Files:
	gtk2-engines.spec 
Added Files:
	gtk-engines-2.7.4-leaks.patch 
Log Message:
Fix memory leaks


gtk-engines-2.7.4-leaks.patch:
 clearlooks_style.c |   20 +++++++++++++-------
 support.c          |    6 ++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

--- NEW FILE gtk-engines-2.7.4-leaks.patch ---
--- gtk-engines-2.7.4/engines/clearlooks/src/support.c.leaks	2006-02-26 21:12:29.000000000 -0500
+++ gtk-engines-2.7.4/engines/clearlooks/src/support.c	2006-02-26 21:25:48.000000000 -0500
@@ -201,9 +201,9 @@
                                     gint *column_index, gint *columns,
                                     gboolean *resizable)
 {
-	GList *list;
+	GList *head, *list;
 	*column_index = *columns = 0;
-	list = gtk_tree_view_get_columns (tv);
+	head = list = gtk_tree_view_get_columns (tv);
 
 	do
 	{
@@ -216,6 +216,8 @@
 		if ( column->visible )
 			(*columns)++;
 	} while ((list = g_list_next(list)));
+
+  	g_list_free (head);
 }
 
 void gtk_clist_get_header_index (GtkCList *clist, GtkWidget *button,
--- gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c.leaks	2006-02-26 21:30:24.000000000 -0500
+++ gtk-engines-2.7.4/engines/clearlooks/src/clearlooks_style.c	2006-02-26 21:47:40.000000000 -0500
@@ -328,15 +328,19 @@
 static int
 combo_box_get_seperator_pos (GtkWidget *widget)
 {
-	GList *children;
+	GtkWidget *child;
+	GList *head, *children;
 	int pos = 0;
 	
 	if (widget && GTK_IS_COMBO_BOX (widget->parent))
 	{
-		children = gtk_container_get_children (GTK_CONTAINER (widget));
+		head = children = gtk_container_get_children (GTK_CONTAINER (widget));
 		
-		if (children && GTK_IS_HBOX (children->data))
-			children = gtk_container_get_children (GTK_CONTAINER (children->data));
+		if (children && GTK_IS_HBOX (children->data)) {
+			child = children->data;
+			g_list_free (children);	
+			head = children = gtk_container_get_children (GTK_CONTAINER (child));
+		}
 
 		if (children)
 		{
@@ -346,6 +350,8 @@
 					pos += GTK_WIDGET (children->data)->allocation.width;
 				
 			} while ((children = g_list_next (children)));
+
+			g_list_free (head);
 		}
 	}
 	
@@ -1066,7 +1072,7 @@
 	ClearlooksStyle *clearlooks_style = CLEARLOOKS_STYLE (style);
 	ClearlooksColors *colors = &clearlooks_style->colors;
 
-	cairo_t *cr = clearlooks_begin_paint (window, area);
+	cairo_t *cr; 
 
 	WidgetParameters params;
 	ResizeGripParameters grip;
@@ -1079,14 +1085,14 @@
 	if (edge != GDK_WINDOW_EDGE_SOUTH_EAST)
 		return; // sorry... need to work on this :P
 
+	cr = clearlooks_begin_paint (window, area);
+
 	clearlooks_set_widget_parameters (widget, style, state_type, &params);	
 
 	clearlooks_draw_resize_grip (cr, colors, &params, &grip,
 	                             x, y, width, height);
 
 	cairo_destroy (cr);
-
-	return;
 }
 
 static void


Index: gtk2-engines.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gtk2-engines.spec	24 Feb 2006 05:24:20 -0000	1.36
+++ gtk2-engines.spec	27 Feb 2006 02:58:18 -0000	1.37
@@ -1,12 +1,14 @@
 Summary:        Theme engines for GTK+ 2.0
 Name:           gtk2-engines
 Version:        2.7.4
-Release:	2
+Release:	3
 License:        GPL
 Group:          System Environment/Libraries
 Source:         gtk-engines-%{version}.tar.bz2
 # backport of default button and inconsistant state from cvs
 Patch0:		gtk-engines-2.7.4-fixes.patch
+# fix some memory leaks in the Clearlooks engine
+Patch1:		gtk-engines-2.7.4-leaks.patch
 
 Requires:       gtk2 >= 2.2.0
 Conflicts:  	gnome-themes < 2.9.0
@@ -26,6 +28,7 @@
 %prep
 %setup -q -n gtk-engines-%{version}
 %patch0 -p1 -b .fixes
+%patch1 -p1 -b .leaks
 
 %build
 %configure
@@ -63,6 +66,9 @@
 %{_datadir}/themes
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.4-3
+- Fix memory leaks in the Clearlooks engine
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.7.4-2
 - Backport patches to draw default buttons and
   inconsistent checkboxes



From fedora-cvs-commits at redhat.com  Mon Feb 27 03:09:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 22:09:26 -0500
Subject: rpms/dasher/devel .cvsignore, 1.9, 1.10 dasher.spec, 1.33,
	1.34 sources, 1.9, 1.10
Message-ID: <200602270309.k1R39Qtu013475@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13398

Modified Files:
	.cvsignore dasher.spec sources 
Log Message:
3.99.5



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	12 Feb 2006 19:58:06 -0000	1.9
+++ .cvsignore	27 Feb 2006 03:09:23 -0000	1.10
@@ -6,3 +6,4 @@
 dasher-3.99.1.tar.bz2
 dasher-3.99.2.tar.bz2
 dasher-3.99.4.tar.bz2
+dasher-3.99.5.tar.bz2


Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dasher.spec	25 Feb 2006 04:36:56 -0000	1.33
+++ dasher.spec	27 Feb 2006 03:09:23 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 3.99.4
-Release: 3
+Version: 3.99.5
+Release: 1
 License: GPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -82,6 +82,9 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 3.99.5-1
+- Update to 3.99.5
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> 3.99.4-3
 - Prereq: scrollkeeper
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	12 Feb 2006 19:58:06 -0000	1.9
+++ sources	27 Feb 2006 03:09:23 -0000	1.10
@@ -1 +1 @@
-6e89a93a94c681cad892bd8e204e1887  dasher-3.99.4.tar.bz2
+dc930a11b796aeb664f7a8fde7e77d61  dasher-3.99.5.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 03:13:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 22:13:23 -0500
Subject: rpms/vte/devel .cvsignore, 1.33, 1.34 sources, 1.33, 1.34 vte.spec,
	1.62, 1.63
Message-ID: <200602270313.k1R3DNF7015308@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/vte/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15255

Modified Files:
	.cvsignore sources vte.spec 
Log Message:
0.11.20



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	25 Feb 2006 22:53:44 -0000	1.33
+++ .cvsignore	27 Feb 2006 03:13:21 -0000	1.34
@@ -5,3 +5,4 @@
 vte-0.11.17.tar.bz2
 vte-0.11.18.tar.bz2
 vte-0.11.19.tar.bz2
+vte-0.11.20.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	25 Feb 2006 22:53:44 -0000	1.33
+++ sources	27 Feb 2006 03:13:21 -0000	1.34
@@ -1 +1 @@
-e03e1ed6bd7367a827c1b2e70beb8bcb  vte-0.11.19.tar.bz2
+913983275f47e235287c83e46a80535c  vte-0.11.20.tar.bz2


Index: vte.spec
===================================================================
RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- vte.spec	25 Feb 2006 22:53:44 -0000	1.62
+++ vte.spec	27 Feb 2006 03:13:21 -0000	1.63
@@ -1,5 +1,5 @@
 Name: vte
-Version: 0.11.19
+Version: 0.11.20
 Release: 1.fc5.1
 Summary: An experimental terminal emulator.
 License: LGPL
@@ -98,6 +98,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> 0.11.20-1
+- Update to 0.11.20
+
 * Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> 0.11.19-1
 - Update to 0.11.19
 - Drop upstreamed patch



From fedora-cvs-commits at redhat.com  Mon Feb 27 03:21:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 22:21:31 -0500
Subject: rpms/dasher/devel dasher.spec,1.34,1.35
Message-ID: <200602270321.k1R3LVVk031286@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/dasher/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31230

Modified Files:
	dasher.spec 
Log Message:
Fix file lists



Index: dasher.spec
===================================================================
RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- dasher.spec	27 Feb 2006 03:09:23 -0000	1.34
+++ dasher.spec	27 Feb 2006 03:21:29 -0000	1.35
@@ -54,6 +54,7 @@
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %post
 /usr/bin/scrollkeeper-update
@@ -62,9 +63,18 @@
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
+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
 /usr/bin/scrollkeeper-update
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,6 +85,7 @@
 %{_datadir}/dasher/
 %{_datadir}/gnome/help/dasher
 %{_datadir}/icons/hicolor/48x48/apps
+%{_datadir}/icons/hicolor/scalable/apps
 %{_datadir}/omf/dasher/*
 %{_datadir}/applications/gnome-dasher.desktop
 %{_bindir}/dasher



From fedora-cvs-commits at redhat.com  Mon Feb 27 03:31:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 22:31:54 -0500
Subject: rpms/gnome-applets/devel .cvsignore, 1.35, 1.36 gnome-applets.spec,
	1.116, 1.117 sources, 1.36, 1.37
Message-ID: <200602270331.k1R3VsAL002483@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2458

Modified Files:
	.cvsignore gnome-applets.spec sources 
Log Message:
2.13.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	12 Feb 2006 19:40:33 -0000	1.35
+++ .cvsignore	27 Feb 2006 03:31:36 -0000	1.36
@@ -7,3 +7,4 @@
 gnome-applets-2.13.2.tar.bz2
 gnome-applets-2.13.3.tar.bz2
 gnome-applets-2.13.4.tar.bz2
+gnome-applets-2.13.90.tar.bz2


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-applets.spec	23 Feb 2006 15:54:39 -0000	1.116
+++ gnome-applets.spec	27 Feb 2006 03:31:38 -0000	1.117
@@ -17,8 +17,8 @@
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.13.4
-Release:  	4
+Version: 	2.13.90
+Release:  	1
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -180,6 +180,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
+- Update to 2.13.90
+
 * Thu Feb 23 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.4-4
 - Make the stock ticker work with gcc 4.1 (#179528)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	12 Feb 2006 19:40:33 -0000	1.36
+++ sources	27 Feb 2006 03:31:38 -0000	1.37
@@ -1,2 +1,2 @@
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
-d45875668fd4e30d0863bf71ead44caa  gnome-applets-2.13.4.tar.bz2
+9aac02f11ad626b2e92767f083762f8f  gnome-applets-2.13.90.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 04:12:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 23:12:01 -0500
Subject: rpms/pango/devel .cvsignore, 1.29, 1.30 pango.spec, 1.62,
	1.63 sources, 1.29, 1.30
Message-ID: <200602270412.k1R4C1Us021972@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21915

Modified Files:
	.cvsignore pango.spec sources 
Log Message:
1.11.99



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	21 Feb 2006 14:36:27 -0000	1.29
+++ .cvsignore	27 Feb 2006 04:11:58 -0000	1.30
@@ -13,3 +13,4 @@
 pango-1.11.4.tar.bz2
 pango-1.11.5.tar.bz2
 pango-1.11.6.tar.bz2
+pango-1.11.99.tar.bz2


Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- pango.spec	21 Feb 2006 14:36:27 -0000	1.62
+++ pango.spec	27 Feb 2006 04:11:58 -0000	1.63
@@ -7,7 +7,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.11.6
+Version: 1.11.99
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.99-1
+- Update to 1.11.99
+
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.11.6-1
 - Upate to 1.11.6
 - Drop upstreamed patches


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	21 Feb 2006 14:36:27 -0000	1.29
+++ sources	27 Feb 2006 04:11:58 -0000	1.30
@@ -1 +1 @@
-ade68b98792417cf4295d86c80054864  pango-1.11.6.tar.bz2
+129e55c31e1d76a722ae05b3469d0f30  pango-1.11.99.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 04:14:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Sun, 26 Feb 2006 23:14:17 -0500
Subject: rpms/gedit/devel .cvsignore, 1.35, 1.36 gedit.spec, 1.74,
	1.75 sources, 1.37, 1.38
Message-ID: <200602270414.k1R4EHFQ023044@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22994

Modified Files:
	.cvsignore gedit.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	15 Feb 2006 05:29:35 -0000	1.35
+++ .cvsignore	27 Feb 2006 04:14:14 -0000	1.36
@@ -10,3 +10,4 @@
 gedit-2.13.4.tar.bz2
 gedit-2.13.90.tar.bz2
 gedit-2.13.91.tar.bz2
+gedit-2.13.92.tar.bz2


Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gedit.spec	15 Feb 2006 05:29:35 -0000	1.74
+++ gedit.spec	27 Feb 2006 04:14:14 -0000	1.75
@@ -15,7 +15,7 @@
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
-Version: 	2.13.91
+Version: 	2.13.92
 Release: 	1	
 Epoch:		1
 License:	GPL
@@ -156,6 +156,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources	15 Feb 2006 05:29:35 -0000	1.37
+++ sources	27 Feb 2006 04:14:14 -0000	1.38
@@ -1 +1 @@
-34a6a189eab50e61f56daded62d691b0  gedit-2.13.91.tar.bz2
+43caa6b6463fe0cfb91319a8284de595  gedit-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 06:52:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 01:52:47 -0500
Subject: rpms/kernel/devel patch-2.6.16-rc5.bz2.sign, NONE, 1.1 .cvsignore,
	1.363, 1.364 kernel-2.6.spec, 1.1988, 1.1989 sources, 1.305,
	1.306 upstream, 1.280, 1.281 patch-2.6.16-rc4-git10.bz2.sign,
	1.1, NONE patch-2.6.16-rc4.bz2.sign, 1.1, NONE
Message-ID: <200602270652.k1R6qloK008580@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8518

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.16-rc5.bz2.sign 
Removed Files:
	patch-2.6.16-rc4-git10.bz2.sign patch-2.6.16-rc4.bz2.sign 
Log Message:
rc5



--- NEW FILE patch-2.6.16-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEAo8DyGugalF9Dw4RAjHmAJ91iAD8pSWyZFCxjTjzPZdpakirHQCfcGB+
qy7dv6iu8M1d+bQn3BCfMdk=
=7VrN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- .cvsignore	26 Feb 2006 23:51:29 -0000	1.363
+++ .cvsignore	27 Feb 2006 06:52:45 -0000	1.364
@@ -3,5 +3,4 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git10.bz2
+patch-2.6.16-rc5.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -r1.1988 -r1.1989
--- kernel-2.6.spec	26 Feb 2006 23:52:50 -0000	1.1988
+++ kernel-2.6.spec	27 Feb 2006 06:52:45 -0000	1.1989
@@ -217,8 +217,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc4.bz2
-Patch2: patch-2.6.16-rc4-git10.bz2
+Patch1: patch-2.6.16-rc5.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -694,7 +693,6 @@
 
 # Update to latest upstream.
 %patch1 -p1
-%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1582,6 +1580,9 @@
 %endif
 
 %changelog
+* Mon Feb 27 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc5
+
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git9 & -git10
 - Temporarily disable xen due to build breakage.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- sources	26 Feb 2006 23:51:29 -0000	1.305
+++ sources	27 Feb 2006 06:52:45 -0000	1.306
@@ -1,4 +1,3 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2
-9910b14e310a4a7736e81e93cccc8f66  patch-2.6.16-rc4-git10.bz2
+1740ae34807f687a93adf2469ea5c4fc  patch-2.6.16-rc5.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- upstream	26 Feb 2006 23:51:29 -0000	1.280
+++ upstream	27 Feb 2006 06:52:45 -0000	1.281
@@ -1,3 +1,2 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc4.bz2
-patch-2.6.16-rc4-git10.bz2
+patch-2.6.16-rc5.bz2


--- patch-2.6.16-rc4-git10.bz2.sign DELETED ---


--- patch-2.6.16-rc4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 27 07:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 02:44:23 -0500
Subject: rpms/kernel/devel/configs config-generic,1.152,1.153
Message-ID: <200602270744.k1R7iNdu006543@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv6417/configs

Modified Files:
	config-generic 
Log Message:
enable kobject debugging



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- config-generic	18 Feb 2006 05:57:25 -0000	1.152
+++ config-generic	27 Feb 2006 07:44:20 -0000	1.153
@@ -68,7 +68,7 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_HOTPLUG=y
-# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_KOBJECT=y
 
 #
 # PCMCIA/CardBus support



From fedora-cvs-commits at redhat.com  Mon Feb 27 07:44:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 02:44:23 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1989,1.1990
Message-ID: <200602270744.k1R7iN0Y006536@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6417

Modified Files:
	kernel-2.6.spec 
Log Message:
enable kobject debugging



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -r1.1989 -r1.1990
--- kernel-2.6.spec	27 Feb 2006 06:52:45 -0000	1.1989
+++ kernel-2.6.spec	27 Feb 2006 07:44:19 -0000	1.1990
@@ -1582,6 +1582,7 @@
 %changelog
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5
+- Enable kobject debugging for a few builds to track something down.
 
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git9 & -git10



From fedora-cvs-commits at redhat.com  Mon Feb 27 07:46:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 02:46:53 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant-auth-fallback-v4.patch,
	NONE, 1.1 wpa_supplicant-ctrl-iface-ap-scan.patch, 1.2,
	1.3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wpa_supplicant.spec,
	1.7, 1.8 wpa_supplicant-auth-fallback-v3.patch, 1.1, NONE
Message-ID: <200602270746.k1R7krPP019144@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17191

Modified Files:
	.cvsignore sources wpa_supplicant.spec 
Added Files:
	wpa_supplicant-auth-fallback-v4.patch 
	wpa_supplicant-ctrl-iface-ap-scan.patch 
Removed Files:
	wpa_supplicant-auth-fallback-v3.patch 
Log Message:
* Fri Feb 24 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-1
- Downgrade to 0.4.8 stable release rather than a dev release



wpa_supplicant-auth-fallback-v4.patch:
 driver_wext.c |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 4 deletions(-)

--- NEW FILE wpa_supplicant-auth-fallback-v4.patch ---
Index: driver_wext.c
===================================================================
RCS file: /home/jm/cvsroot/hostap/wpa_supplicant/driver_wext.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 driver_wext.c
--- driver_wext.c	30 Jan 2006 04:11:48 -0000	1.52
+++ driver_wext.c	21 Feb 2006 04:15:48 -0000
@@ -47,6 +47,10 @@ struct wpa_driver_wext_data {
 	struct wpa_driver_capa capa;
 	int has_capability;
 	int we_version_compiled;
+
+	/* for set_auth_alg fallback */
+	int use_crypt;
+	int auth_alg_fallback;
 };
 
 
@@ -69,7 +73,7 @@ static int wpa_driver_wext_set_auth_para
 		perror("ioctl[SIOCSIWAUTH]");
 		fprintf(stderr, "WEXT auth param %d value 0x%x - ",
 			idx, value);
-		ret = -1;
+		ret = errno == EOPNOTSUPP ? -2 : -1;
 	}
 
 	return ret;
@@ -1455,6 +1459,7 @@ static int wpa_driver_wext_set_drop_unen
 {
 	struct wpa_driver_wext_data *drv = priv;
 	wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
+	drv->use_crypt = enabled;
 	return wpa_driver_wext_set_auth_param(drv, IW_AUTH_DROP_UNENCRYPTED,
 					      enabled);
 }
@@ -1559,6 +1564,50 @@ static int wpa_driver_wext_keymgmt2wext(
 
 
 static int
+wpa_driver_wext_auth_alg_fallback(struct wpa_driver_wext_data *drv,
+				  struct wpa_driver_associate_params *params)
+{
+	struct iwreq iwr;
+	int ret = 0;
+
+	wpa_printf(MSG_DEBUG, "WEXT: Driver did not support "
+		   "SIOCSIWAUTH for AUTH_ALG, trying SIOCSIWENCODE");
+
+	memset(&iwr, 0, sizeof(iwr));
+	strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
+	/* Just changing mode, not actual keys */
+	iwr.u.encoding.flags = 0;
+	iwr.u.encoding.pointer = (caddr_t) NULL;
+	iwr.u.encoding.length = 0;
+
+	/*
+	 * Note: IW_ENCODE_{OPEN,RESTRICTED} can be interpreted to mean two
+	 * different things. Here they are used to indicate Open System vs.
+	 * Shared Key authentication algorithm. However, some drivers may use
+	 * them to select between open/restricted WEP encrypted (open = allow
+	 * both unencrypted and encrypted frames; restricted = only allow
+	 * encrypted frames).
+	 */
+
+	if (!drv->use_crypt) {
+		iwr.u.encoding.flags |= IW_ENCODE_DISABLED;
+	} else {
+		if (params->auth_alg & AUTH_ALG_OPEN_SYSTEM)
+			iwr.u.encoding.flags |= IW_ENCODE_OPEN;
+		if (params->auth_alg & AUTH_ALG_SHARED_KEY)
+			iwr.u.encoding.flags |= IW_ENCODE_RESTRICTED;
+	}
+
+	if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) {
+		perror("ioctl[SIOCSIWENCODE]");
+		ret = -1;
+	}
+
+	return ret;
+}
+
+
+static int
 wpa_driver_wext_associate(void *priv,
 			  struct wpa_driver_associate_params *params)
 {
@@ -1569,6 +1618,14 @@ wpa_driver_wext_associate(void *priv,
 
 	wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
 
+	/*
+	 * If the driver did not support SIOCSIWAUTH, fallback to
+	 * SIOCSIWENCODE here.
+	 */
+	if (drv->auth_alg_fallback &&
+	    wpa_driver_wext_auth_alg_fallback(drv, params) < 0)
+		ret = -1;
+
 	if (!params->bssid &&
 	    wpa_driver_wext_set_bssid(drv, NULL) < 0)
 		ret = -1;
@@ -1635,7 +1692,7 @@ wpa_driver_wext_associate(void *priv,
 static int wpa_driver_wext_set_auth_alg(void *priv, int auth_alg)
 {
 	struct wpa_driver_wext_data *drv = priv;
-	int algs = 0;
+	int algs = 0, res;
 
 	if (auth_alg & AUTH_ALG_OPEN_SYSTEM)
 		algs |= IW_AUTH_ALG_OPEN_SYSTEM;
@@ -1648,8 +1705,10 @@ static int wpa_driver_wext_set_auth_alg(
 		algs = IW_AUTH_ALG_OPEN_SYSTEM;
 	}
 
-	return wpa_driver_wext_set_auth_param(drv,
-					      IW_AUTH_80211_AUTH_ALG, algs);
+	res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG,
+					     algs);
+	drv->auth_alg_fallback = res == -2;
+	return res;
 }
 
 

wpa_supplicant-ctrl-iface-ap-scan.patch:
 ctrl_iface.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

Index: wpa_supplicant-ctrl-iface-ap-scan.patch
===================================================================
RCS file: wpa_supplicant-ctrl-iface-ap-scan.patch
diff -N wpa_supplicant-ctrl-iface-ap-scan.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wpa_supplicant-ctrl-iface-ap-scan.patch	27 Feb 2006 07:46:47 -0000	1.3
@@ -0,0 +1,31 @@
+--- wpa_supplicant-0.4.8/ctrl_iface.c.ap_scan	2006-02-24 18:31:21.000000000 -0500
++++ wpa_supplicant-0.4.8/ctrl_iface.c	2006-02-24 18:32:29.000000000 -0500
+@@ -930,6 +930,18 @@
+ }
+ 
+ 
++static int wpa_supplicant_ctrl_iface_ap_scan(
++	struct wpa_supplicant *wpa_s, char *cmd)
++{
++	int ap_scan = atoi (cmd);
++
++	if (ap_scan < 0 || ap_scan > 2)
++		return -1;
++	wpa_s->conf->ap_scan = ap_scan;
++	return 0;
++}
++
++
+ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
+ 					      void *sock_ctx)
+ {
+@@ -1064,6 +1076,9 @@
+ 	} else if (strncmp(buf, "GET_CAPABILITY ", 15) == 0) {
+ 		reply_len = wpa_supplicant_ctrl_iface_get_capability(
+ 			wpa_s, buf + 15, reply, reply_size);
++	} else if (strncmp(buf, "AP_SCAN ", 8) == 0) {
++		if (wpa_supplicant_ctrl_iface_ap_scan(wpa_s, buf + 8))
++			reply_len = -1;
+ 	} else {
+ 		memcpy(reply, "UNKNOWN COMMAND\n", 16);
+ 		reply_len = 16;


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Feb 2006 00:07:16 -0000	1.3
+++ .cvsignore	27 Feb 2006 07:46:47 -0000	1.4
@@ -1,3 +1,4 @@
 madwifi-headers.tar.bz2
 wpa_supplicant-0.4.7.tar.gz
 wpa_supplicant-0.5.1.tar.gz
+wpa_supplicant-0.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Feb 2006 00:07:16 -0000	1.3
+++ sources	27 Feb 2006 07:46:47 -0000	1.4
@@ -1,2 +1,2 @@
 3be286e0d0f5ab5223ccfdecd3b74546  madwifi-headers.tar.bz2
-d99349503945c4534c6f46d21dfe0ca3  wpa_supplicant-0.5.1.tar.gz
+765d6c70d75e88cd4dc010fa6b52c45f  wpa_supplicant-0.4.8.tar.gz


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wpa_supplicant.spec	12 Feb 2006 22:51:54 -0000	1.7
+++ wpa_supplicant.spec	27 Feb 2006 07:46:47 -0000	1.8
@@ -1,7 +1,8 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
-Version: 0.5.1
-Release: 3
+Epoch: 1
+Version: 0.4.8
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -10,7 +11,8 @@
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers.tar.bz2
-Patch0: wpa_supplicant-auth-fallback-v3.patch
+Patch0: wpa_supplicant-auth-fallback-v4.patch
+Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,6 +35,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .we-auth-fallback
+%patch1 -p1 -b .ap_scan
 
 %build
 cp %{SOURCE1} ./.config
@@ -107,6 +110,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Fri Feb 24 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-1
+- Downgrade to 0.4.8 stable release rather than a dev release
+
 * Sun Feb 12 2006 Dan Williams <dcbw at redhat.com> - 0.5.1-3
 - Documentation cleanup (Terje Rosten <terje.rosten at ntnu.no>)
 


--- wpa_supplicant-auth-fallback-v3.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 27 09:10:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 04:10:16 -0500
Subject: rpms/psacct/devel psacct.spec,1.21,1.22
Message-ID: <200602270910.k1R9AGEm002349@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2149

Modified Files:
	psacct.spec 
Log Message:
- add chkconfig to prereq - bug 182848



Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- psacct.spec	20 Feb 2006 10:04:22 -0000	1.21
+++ psacct.spec	27 Feb 2006 09:10:09 -0000	1.22
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 39
+Release: 40
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -30,7 +30,7 @@
 Patch7: psacct-6.3.2-LargeFile.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/install-info
+Prereq: /sbin/install-info, /sbin/chkconfig
 BuildRequires: autoconf
 
 # This conflict is to avoid psacct being forced on by old initscripts now that
@@ -164,6 +164,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Mon Feb 27 2006 Ivana Varekova <varekova at redhat.com> - 6.3.2-40
+- add chkconfig to prereq - bug 182848
+
 * Mon Feb 20 2006 Ivana Varekova <varekova at redhat.com> - 6.3.2-39
 - add Large File Support 
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 09:19:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 04:19:06 -0500
Subject: rpms/kexec-tools/devel kdump.init, 1.4, 1.5 kdump.sysconfig, 1.2,
	1.3 kexec-tools-1.101-kdump.patch, 1.3, 1.4 kexec-tools.spec,
	1.11, 1.12
Message-ID: <200602270919.k1R9J6dV018356@cvs.devel.redhat.com>

Author: tgraf

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18120

Modified Files:
	kdump.init kdump.sysconfig kexec-tools-1.101-kdump.patch 
	kexec-tools.spec 
Log Message:
- kdump7.patch
   o Remove elf32 core headers support for x86_64
   o Fix x86 prepare elf core header routine
   o Fix ppc64 kexec -p failure for gcc 4.10
   o Fix few warnings for gcc 4.10
   o Add the missing --initrd option for ppc64
   o Fix ppc64 persistent root device bug
- Remove --elf32-core-headers from default configuration, users
  may re-add it via KEXEC_ARGS.
- Remove obsolete KEXEC_HEADERS



Index: kdump.init
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdump.init	22 Feb 2006 20:59:15 -0000	1.4
+++ kdump.init	27 Feb 2006 09:19:03 -0000	1.5
@@ -25,8 +25,6 @@
 
 KDUMP_KERNELVER=""
 KDUMP_COMMANDLINE=""
-# KEXEC_HEADERS will not be in the sysconfig file by default
-KEXEC_HEADERS="--elf32-core-headers"
 KEXEC_ARGS=""
 
 standard_kexec_args="-p --args-linux"
@@ -78,7 +76,7 @@
 		KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} irqpoll"
 	fi
 
-	$KEXEC $KEXEC_ARGS $standard_kexec_args $KEXEC_HEADERS \
+	$KEXEC $KEXEC_ARGS $standard_kexec_args \
 		--command-line="$KDUMP_COMMANDLINE" \
 		--initrd=$kdump_initrd $kdump_kernel
 }


Index: kdump.sysconfig
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdump.sysconfig	17 Feb 2006 23:58:33 -0000	1.2
+++ kdump.sysconfig	27 Feb 2006 09:19:03 -0000	1.3
@@ -13,4 +13,7 @@
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty
+#
+# Example:
+#   KEXEC_ARGS="--elf32-core-headers"
 KEXEC_ARGS=""

kexec-tools-1.101-kdump.patch:
 configure                                |   15 
 configure.ac                             |   15 
 kdump/kdump.c                            |    2 
 kexec/Makefile                           |    1 
 kexec/arch/i386/Makefile                 |    1 
 kexec/arch/i386/crashdump-x86.c          |  728 +++++++++++++++++++++++++++++++
 kexec/arch/i386/crashdump-x86.h          |   21 
 kexec/arch/i386/include/arch/options.h   |    6 
 kexec/arch/i386/kexec-bzImage.c          |    2 
 kexec/arch/i386/kexec-elf-x86.c          |   48 +-
 kexec/arch/i386/kexec-multiboot-x86.c    |    3 
 kexec/arch/i386/kexec-x86.c              |   52 +-
 kexec/arch/i386/kexec-x86.h              |   13 
 kexec/arch/i386/x86-linux-setup.c        |    7 
 kexec/arch/i386/x86-linux-setup.h        |    3 
 kexec/arch/ia64/kexec-ia64.c             |   12 
 kexec/arch/ppc/kexec-ppc.c               |    8 
 kexec/arch/ppc64/Makefile                |    6 
 kexec/arch/ppc64/crashdump-ppc64.c       |  511 +++++++++++++++++++++
 kexec/arch/ppc64/crashdump-ppc64.h       |   35 +
 kexec/arch/ppc64/fs2dt.c                 |  462 +++++++++++++++++++
 kexec/arch/ppc64/include/arch/options.h  |    2 
 kexec/arch/ppc64/kexec-elf-ppc64.c       |  295 ++++++++++--
 kexec/arch/ppc64/kexec-elf-rel-ppc64.c   |   44 +
 kexec/arch/ppc64/kexec-ppc64.c           |  640 +++++++++++++++++++++++++++
 kexec/arch/ppc64/kexec-ppc64.h           |   37 +
 kexec/arch/ppc64/kexec-zImage-ppc64.c    |    5 
 kexec/arch/s390/Makefile                 |    6 
 kexec/arch/s390/include/arch/options.h   |   11 
 kexec/arch/s390/kexec-elf-rel-s390.c     |   23 
 kexec/arch/s390/kexec-image.c            |  137 +++++
 kexec/arch/s390/kexec-s390.c             |  104 ++++
 kexec/arch/s390/kexec-s390.h             |   25 +
 kexec/arch/x86_64/Makefile               |    1 
 kexec/arch/x86_64/crashdump-x86_64.c     |  655 +++++++++++++++++++++++++++
 kexec/arch/x86_64/crashdump-x86_64.h     |   24 +
 kexec/arch/x86_64/kexec-elf-x86_64.c     |   37 +
 kexec/arch/x86_64/kexec-x86_64.c         |   37 +
 kexec/crashdump.c                        |   65 ++
 kexec/crashdump.h                        |    9 
 kexec/kexec-elf-rel.c                    |   43 +
 kexec/kexec-elf.c                        |   94 ++--
 kexec/kexec-syscall.h                    |    9 
 kexec/kexec.c                            |   24 -
 kexec/kexec.h                            |   10 
 purgatory/Makefile                       |    9 
 purgatory/arch/i386/Makefile             |    1 
 purgatory/arch/i386/crashdump_backup.c   |   46 +
 purgatory/arch/i386/purgatory-x86.c      |    7 
 purgatory/arch/i386/purgatory-x86.h      |    1 
 purgatory/arch/ia64/purgatory-ia64.c     |    6 
 purgatory/arch/ppc/purgatory-ppc.c       |    6 
 purgatory/arch/ppc64/Makefile            |    7 
 purgatory/arch/ppc64/console-ppc64.c     |   27 +
 purgatory/arch/ppc64/crashdump_backup.c  |   41 +
 purgatory/arch/ppc64/purgatory-ppc64.c   |   41 +
 purgatory/arch/ppc64/purgatory-ppc64.h   |    6 
 purgatory/arch/ppc64/v2wrap.S            |  128 +++++
 purgatory/arch/s390/Makefile             |    7 
 purgatory/arch/s390/include/limits.h     |   54 ++
 purgatory/arch/s390/include/stdint.h     |   24 +
 purgatory/arch/x86_64/Makefile           |    1 
 purgatory/arch/x86_64/purgatory-x86_64.c |    7 
 purgatory/include/purgatory.h            |    1 
 purgatory/purgatory.c                    |    1 
 65 files changed, 4529 insertions(+), 180 deletions(-)

Index: kexec-tools-1.101-kdump.patch
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-kdump.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kexec-tools-1.101-kdump.patch	2 Feb 2006 10:13:27 -0000	1.3
+++ kexec-tools-1.101-kdump.patch	27 Feb 2006 09:19:03 -0000	1.4
@@ -1,6 +1,6 @@
 diff -urNp -X dontdiff kexec-tools-1.101/configure kexec-tools-1.101-kdump/configure
 --- kexec-tools-1.101/configure	2005-02-16 18:07:44.000000000 +0530
-+++ kexec-tools-1.101-kdump/configure	2006-02-01 14:28:15.497259392 +0530
++++ kexec-tools-1.101-kdump/configure	2006-02-22 11:30:09.912285648 +0530
 @@ -1384,12 +1384,18 @@ case $host_cpu in
  	powerpc )
  		host_cpu="ppc"
@@ -21,19 +21,20 @@
  		;;
  	* )
  		{ { echo "$as_me:$LINENO: error:  unsupported architecture $host_cpu" >&5
-@@ -1406,6 +1412,11 @@ if test "${host_alias}" ; then
+@@ -1406,6 +1412,12 @@ if test "${host_alias}" ; then
  fi
  EXTRA_CFLAGS=""
  
 +# Check whether ppc64. Add -m64 for building 64-bit binary
++# Add -mcall-aixdesc to generate dot-symbols as in gcc 3.3.3
 +if test "$ARCH" = ppc64; then
-+  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
++  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64 -mcall-aixdesc"
 +fi;
 +
  # Check whether --with-objdir or --without-objdir was given.
  if test "${with_objdir+set}" = set; then
    withval="$with_objdir"
-@@ -1421,7 +1432,6 @@ if test "${with_gamecube+set}" = set; th
+@@ -1421,7 +1433,6 @@ if test "${with_gamecube+set}" = set; th
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1"
  fi;
  
@@ -43,7 +44,7 @@
    withval="$with_zlib"
 diff -urNp -X dontdiff kexec-tools-1.101/configure.ac kexec-tools-1.101-kdump/configure.ac
 --- kexec-tools-1.101/configure.ac	2005-01-09 07:06:57.000000000 +0530
-+++ kexec-tools-1.101-kdump/configure.ac	2006-02-01 14:28:15.498259240 +0530
++++ kexec-tools-1.101-kdump/configure.ac	2006-02-22 11:30:08.809453304 +0530
 @@ -25,12 +25,18 @@ case $host_cpu in 
  	powerpc )
  		host_cpu="ppc"
@@ -64,23 +65,36 @@
  		;;
  	* )
  		AC_MSG_ERROR([ unsupported architecture $host_cpu])
-@@ -45,6 +51,12 @@ if test "${host_alias}" ; then
+@@ -45,6 +51,13 @@ if test "${host_alias}" ; then
  	OBJDIR="$OBJDIR-${host_alias}"
  fi 
  EXTRA_CFLAGS=""
 +
 +# Check whether ppc64. Add -m64 for building 64-bit binary
++# Add -mcall-aixdesc to generate dot-symbols as in gcc 3.3.3
 +if test "$ARCH" = ppc64; then
-+  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64"
++  EXTRA_CFLAGS="$EXTRA_CFLAGS -m64 -mcall-aixdesc"
 +fi;
 +
  AC_ARG_WITH([objdir], AC_HELP_STRING([--with-objdir=<dir>],[select directory for object files]),
  	[ OBJDIR="$withval" ], [ OBJDIR="$OBJDIR" ])
  
+diff -urNp -X dontdiff kexec-tools-1.101/kdump/kdump.c kexec-tools-1.101-kdump/kdump/kdump.c
+--- kexec-tools-1.101/kdump/kdump.c	2005-02-06 07:28:15.000000000 +0530
++++ kexec-tools-1.101-kdump/kdump/kdump.c	2006-02-22 11:30:11.080108112 +0530
+@@ -54,7 +54,7 @@ static void *xmalloc(size_t size)
+ 	result = malloc(size);
+ 	if (result == NULL) {
+ 		fprintf(stderr, "malloc of %u bytes failed: %s\n",
+-			size, strerror(errno));
++			(unsigned int)size, strerror(errno));
+ 		exit(7);
+ 	}
+ 	return result;
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c
 --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c	2006-01-19 18:19:07.000000000 +0530
-@@ -0,0 +1,724 @@
++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c	2006-02-22 11:30:01.525560624 +0530
+@@ -0,0 +1,728 @@
 +/*
 + * kexec: Linux boots Linux
 + *
@@ -608,10 +622,12 @@
 +	 * A seprate program header for Backup Region*/
 +	for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) {
 +		unsigned long long mstart, mend;
++		if (crash_memory_range[i].type != RANGE_RAM)
++			continue;
 +		mstart = crash_memory_range[i].start;
 +		mend = crash_memory_range[i].end;
 +		if (!mstart && !mend)
-+			break;
++			continue;
 +		phdr = (Elf64_Phdr *) bufp;
 +		bufp += sizeof(Elf64_Phdr);
 +		phdr->p_type	= PT_LOAD;
@@ -703,10 +719,12 @@
 +	 * A seprate program header for Backup Region*/
 +	for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) {
 +		unsigned long long mstart, mend;
++		if (crash_memory_range[i].type != RANGE_RAM)
++			continue;
 +		mstart = crash_memory_range[i].start;
 +		mend = crash_memory_range[i].end;
 +		if (!mstart && !mend)
-+			break;
++			continue;
 +		phdr = (Elf32_Phdr *) bufp;
 +		bufp += sizeof(Elf32_Phdr);
 +		phdr->p_type	= PT_LOAD;
@@ -1152,7 +1170,7 @@
 +KEXEC_C_SRCS+= kexec/arch/i386/crashdump-x86.c
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c
 --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c	2005-01-13 18:40:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c	2006-02-01 14:41:09.489594672 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/i386/x86-linux-setup.c	2006-02-01 14:41:09.000000000 +0530
 @@ -94,7 +94,8 @@ void setup_linux_bootloader_parameters(
  	cmdline_ptr[cmdline_len - 1] = '\0';
  }
@@ -1799,8 +1817,8 @@
 +
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h kexec-tools-1.101-kdump/kexec/arch/ppc64/crashdump-ppc64.h
 --- kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.h	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ppc64/crashdump-ppc64.h	2006-01-19 18:20:04.000000000 +0530
-@@ -0,0 +1,33 @@
++++ kexec-tools-1.101-kdump/kexec/arch/ppc64/crashdump-ppc64.h	2006-02-22 11:30:11.080108112 +0530
+@@ -0,0 +1,35 @@
 +#ifndef CRASHDUMP_PPC64_H
 +#define CRASHDUMP_PPC64_H
 +
@@ -1828,7 +1846,9 @@
 +#define KDUMP_BACKUP_LIMIT      0x8000
 +#define _ALIGN_UP(addr,size)     (((addr)+((size)-1))&(~((size)-1)))
 +#define _ALIGN_DOWN(addr,size)   ((addr)&(~((size)-1)))
++#ifndef PAGE_SIZE
 +#define PAGE_SIZE      4096
++#endif
 +
 +extern unsigned long long crash_base;
 +extern unsigned long long crash_size;
@@ -1836,8 +1856,8 @@
 +#endif /* CRASHDUMP_PPC64_H */
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c kexec-tools-1.101-kdump/kexec/arch/ppc64/fs2dt.c
 --- kexec-tools-1.101/kexec/arch/ppc64/fs2dt.c	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ppc64/fs2dt.c	2006-01-19 18:20:08.000000000 +0530
-@@ -0,0 +1,435 @@
++++ kexec-tools-1.101-kdump/kexec/arch/ppc64/fs2dt.c	2006-02-22 11:41:54.993097072 +0530
+@@ -0,0 +1,462 @@
 +/*
 + * fs2dt: creates a flattened device-tree
 + *
@@ -2032,13 +2052,18 @@
 +}
 +
 +/* put all properties (files) in the property structure */
-+void putprops(char *fn, DIR *dir)
++void putprops(char *fn, struct dirent **nlist, int numlist)
 +{
 +	struct dirent *dp;
++	int i = 0;
 +
-+	while ((dp = readdir(dir)) != NULL) {
++	for (i = 0; i < numlist; i++) {
++		dp = nlist[i];
 +		strcpy(fn, dp->d_name);
 +
++		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
++                        continue;
++
 +		if (lstat(pathname, statbuf))
 +			err(pathname, ERR_STAT);
 +
@@ -2079,6 +2104,7 @@
 +			fd = open(pathname, O_RDONLY);
 +			if (fd == -1)
 +				err(pathname, ERR_OPEN);
++
 +			if (read(fd, dt, len) != len)
 +				err(pathname, ERR_READ);
 +
@@ -2095,7 +2121,6 @@
 +							"crashkernel=");
 +					if (param)
 +						crash_param = 1;
-+					param = NULL;
 +					param = strstr(local_cmdline, "root=");
 +				}
 +				if (!param) {
@@ -2131,15 +2156,38 @@
 +}
 +
 +/*
++ * Compare function used to sort the device-tree directories
++ * This function will be passed to scandir.
++ */
++int comparefunc(const void *dentry1, const void *dentry2)
++{
++	char *str1 = (*(struct dirent **)dentry1)->d_name;
++	char *str2 = (*(struct dirent **)dentry2)->d_name;
++
++	/*
++	 * strcmp scans from left to right and fails to idetify for some
++	 * strings such as memory at 10000000 and memory at f000000.
++	 * Therefore, we get the wrong sorted order like memory at 10000000 and
++	 * memory at f000000.
++	 */
++	if (strchr(str1, '@') && strchr(str2, '@') &&
++		(strlen(str1) > strlen(str2)))
++		return 1;
++
++	return strcmp(str1, str2);
++}
++
++/*
 + * put a node (directory) in the property structure.  first properties
 + * then children.
 + */
 +void putnode(void)
 +{
-+	DIR *dir;
 +	char *dn;
 +	struct dirent *dp;
 +	char *basename;
++	struct dirent **namelist;
++	int numlist, i;
 +
 +	*dt++ = 1;
 +	strcpy((void *)dt, *pathstart ? pathstart : "/");
@@ -2148,9 +2196,8 @@
 +	if (dt[-1] & 0xff)
 +		dt++;
 +
-+	dir = opendir(pathname);
-+
-+	if (!dir)
++	numlist = scandir(pathname, &namelist, 0, comparefunc);
++	if (numlist == 0)
 +		err(pathname, ERR_OPENDIR);
 +
 +	basename = strrchr(pathname,'/');
@@ -2158,7 +2205,7 @@
 +	strcat(pathname, "/");
 +	dn = pathname + strlen(pathname);
 +
-+	putprops(dn, dir);
++	putprops(dn, namelist, numlist);
 +
 +	/* Add initrd entries to the second kernel if first kernel does not
 +	 * have and second kernel needs.
@@ -2191,10 +2238,10 @@
 +		reserve(initrd_base, initrd_size);
 +	}
 +
-+	rewinddir(dir);
-+
-+	while ((dp = readdir(dir)) != NULL) {
++	for (i=0; i < numlist; i++) {
++		dp = namelist[i];
 +		strcpy(dn, dp->d_name);
++		free(namelist[i]);
 +
 +		if (!strcmp(dn, ".") || !strcmp(dn, ".."))
 +			continue;
@@ -2209,8 +2256,8 @@
 +		err(pathname, ERR_READDIR);
 +
 +	*dt++ = 2;
-+	closedir(dir);
 +	dn[-1] = '\0';
++	free(namelist);
 +}
 +
 +int create_flatten_tree(struct kexec_info *info, unsigned char **bufp,
@@ -2290,7 +2337,7 @@
  
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-ppc64.c
 --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c	2004-12-17 15:02:04.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-ppc64.c	2006-01-19 18:20:08.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-ppc64.c	2006-02-22 11:38:31.003108264 +0530
 @@ -3,6 +3,8 @@
   *
   * Copyright (C) 2004  Adam Litke (agl at us.ibm.com)
@@ -2355,7 +2402,7 @@
  
  int elf_ppc64_probe(const char *buf, off_t len)
  {
-@@ -94,12 +69,91 @@ int elf_ppc64_probe(const char *buf, off
+@@ -94,12 +69,94 @@ int elf_ppc64_probe(const char *buf, off
  	return result;
  }
  
@@ -2391,6 +2438,7 @@
 +		{ "command-line",       1, NULL, OPT_APPEND },
 +		{ "append",             1, NULL, OPT_APPEND },
 +		{ "ramdisk",            1, NULL, OPT_RAMDISK },
++		{ "initrd",             1, NULL, OPT_RAMDISK },
 +		{ "devicetreeblob",     1, NULL, OPT_DEVICETREEBLOB },
 +		{ 0,                    0, NULL, 0 },
 +	};
@@ -2431,6 +2479,8 @@
 +	cmdline_len = 0;
 +	if (cmdline)
 +		cmdline_len = strlen(cmdline) + 1;
++	else
++		fprintf(stdout, "Warning: append= option is not passed. Using the first kernel root partition\n");
 +
 +	setup_memory_ranges(info->kexec_flags);
 +
@@ -2449,7 +2499,7 @@
  
  	/* Parse the Elf file */
  	result = build_elf_exec_info(buf, len, &ehdr);
-@@ -108,13 +162,171 @@ int elf_ppc64_load(int argc, char **argv
+@@ -108,13 +165,173 @@ int elf_ppc64_load(int argc, char **argv
  		return result;
  	}
  
@@ -2491,15 +2541,15 @@
 +	seg_buf = NULL;
 +	seg_size = 0;
 +
-+	seg_buf = (char *) malloc(purgatory_size);
++	seg_buf = (unsigned char *) malloc(purgatory_size);
 +	if (seg_buf == NULL) {
 +		free_elf_info(&ehdr);
 +		return -1;
 +	}
 +	memcpy(seg_buf, purgatory, purgatory_size);
 +	seg_size = purgatory_size;
-+	elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size,
-+				0, max_addr, 1);
++	elf_rel_build_load(info, &info->rhdr, (const char *)purgatory,
++				purgatory_size, 0, max_addr, 1);
 +
 +	/* Add a ram-disk to the current image
 +	 * Note: Add the ramdisk after elf_rel_build_load
@@ -2510,7 +2560,7 @@
 +			"Can't use ramdisk with device tree blob input\n");
 +			return -1;
 +		}
-+		seg_buf = slurp_file(ramdisk, &seg_size);
++		seg_buf = (unsigned char *)slurp_file(ramdisk, &seg_size);
 +		add_buffer(info, seg_buf, seg_size, seg_size, 0, 0, max_addr, 1);
 +		hole_addr = (unsigned long long)
 +			info->segment[info->nr_segments-1].mem;
@@ -2524,7 +2574,8 @@
 +		off_t blob_size = 0;
 +
 +		/* Grab device tree from buffer */
-+		blob_buf = slurp_file(devicetreeblob, &blob_size);
++		blob_buf =
++			(unsigned char *)slurp_file(devicetreeblob, &blob_size);
 +		add_buffer(info, blob_buf, blob_size, blob_size, 0, 0,
 +				max_addr, -1);
 +
@@ -2532,7 +2583,8 @@
 +		/* create from fs2dt */
 +		seg_buf = NULL;
 +		seg_size = 0;
-+		create_flatten_tree(info, &seg_buf, &seg_size, cmdline);
++		create_flatten_tree(info, (unsigned char **)&seg_buf,
++				(unsigned long *)&seg_size,cmdline);
 +		add_buffer(info, seg_buf, seg_size, seg_size,
 +				0, 0, max_addr, -1);
 +	}
@@ -2543,7 +2595,7 @@
 +	 */
 +	bb_ptr = (struct bootblock *)(
 +		(unsigned char *)info->segment[(info->nr_segments)-1].buf);
-+	rsvmap_ptr = (long long *)(
++	rsvmap_ptr = (unsigned long long *)(
 +		(unsigned char *)info->segment[(info->nr_segments)-1].buf +
 +		bb_ptr->off_mem_rsvmap);
 +	while (*rsvmap_ptr || *(rsvmap_ptr+1))
@@ -2625,7 +2677,7 @@
  void elf_ppc64_usage(void)
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-rel-ppc64.c
 --- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2004-12-20 07:36:04.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2006-01-19 18:20:08.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-elf-rel-ppc64.c	2006-02-22 11:30:11.082107808 +0530
 @@ -1,5 +1,6 @@
  #include <stdio.h>
  #include <elf.h>
@@ -2633,7 +2685,7 @@
  #include "../../kexec.h"
  #include "../../kexec-elf.h"
  
-@@ -21,20 +22,19 @@ static struct mem_shdr *toc_section(cons
+@@ -21,20 +22,20 @@ static struct mem_shdr *toc_section(cons
  {
  	struct mem_shdr *shdr, *shdr_end;
  	unsigned char *strtab;
@@ -2645,7 +2697,8 @@
 +	shdr_end = &ehdr->e_shdr[ehdr->e_shnum];
 +	for(shdr = ehdr->e_shdr; shdr != shdr_end; shdr++)
 +		if ( shdr->sh_size &&
-+			strcmp(&strtab[shdr->sh_name], ".toc") == 0)
++			strcmp((char *)&strtab[shdr->sh_name],
++						".toc") == 0)
  			return shdr;
 -		}
 -	}
@@ -2660,7 +2713,7 @@
  {
  	struct mem_shdr *shdr;
  	shdr = toc_section(ehdr);
-@@ -53,7 +53,7 @@ void machine_apply_elf_rel(struct mem_eh
+@@ -53,7 +54,7 @@ void machine_apply_elf_rel(struct mem_eh
  		/* Simply set it */
  		*(uint32_t *)location = value;
  		break;
@@ -2669,7 +2722,7 @@
  	case R_PPC64_ADDR64:
  		/* Simply set it */
  		*(uint64_t *)location = value;
-@@ -78,15 +78,34 @@ void machine_apply_elf_rel(struct mem_eh
+@@ -78,15 +79,34 @@ void machine_apply_elf_rel(struct mem_eh
  		/* Convert value to relative */
  		value -= address;
  		if (value + 0x2000000 > 0x3ffffff || (value & 3) != 0){
@@ -3403,7 +3456,7 @@
 +#endif /* KEXEC_PPC64_H */
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/kexec-zImage-ppc64.c kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-zImage-ppc64.c
 --- kexec-tools-1.101/kexec/arch/ppc64/kexec-zImage-ppc64.c	2004-12-16 17:47:51.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-zImage-ppc64.c	2006-01-19 18:20:08.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/ppc64/kexec-zImage-ppc64.c	2006-02-22 11:30:11.082107808 +0530
 @@ -153,7 +153,8 @@ int zImage_ppc64_load(FILE *file, int ar
  			return -1;
  		}
@@ -3414,6 +3467,15 @@
  			perror("read error: ");
  			return -1;
  		}
+@@ -161,7 +162,7 @@ int zImage_ppc64_load(FILE *file, int ar
+ 	segment->mem = (void *) load_loc;
+ 	segment->memsz = memsize;
+ 	segment->bufsz = filesize;
+-	*ret_entry = elf.e_entry;
++	*ret_entry = (void *)((uint64_t)elf.e_entry);
+ 	*ret_nr_segments = i - 1;
+ 	free(ph);
+ 	return 0;
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/ppc64/Makefile kexec-tools-1.101-kdump/kexec/arch/ppc64/Makefile
 --- kexec-tools-1.101/kexec/arch/ppc64/Makefile	2004-12-17 12:05:30.000000000 +0530
 +++ kexec-tools-1.101-kdump/kexec/arch/ppc64/Makefile	2006-01-19 18:20:06.000000000 +0530
@@ -3761,8 +3823,8 @@
 +KEXEC_C_SRCS+= kexec/arch/s390/kexec-elf-rel-s390.c
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c kexec-tools-1.101-kdump/kexec/arch/x86_64/crashdump-x86_64.c
 --- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c	1970-01-01 05:30:00.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/x86_64/crashdump-x86_64.c	2006-02-01 14:33:42.949479088 +0530
-@@ -0,0 +1,770 @@
++++ kexec-tools-1.101-kdump/kexec/arch/x86_64/crashdump-x86_64.c	2006-02-19 11:13:06.000000000 +0530
+@@ -0,0 +1,655 @@
 +/*
 + * kexec: Linux boots Linux
 + *
@@ -4303,12 +4365,12 @@
 +	 * A seprate program header for Backup Region*/
 +	for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) {
 +		unsigned long long mstart, mend;
++		if (crash_memory_range[i].type != RANGE_RAM)
++			continue;
 +		mstart = crash_memory_range[i].start;
 +		mend = crash_memory_range[i].end;
 +		if (!mstart && !mend)
-+			break;
-+		if (crash_memory_range[i].type != RANGE_RAM)
-+			break;
++			continue;
 +		phdr = (Elf64_Phdr *) bufp;
 +		bufp += sizeof(Elf64_Phdr);
 +		phdr->p_type	= PT_LOAD;
@@ -4343,111 +4405,6 @@
 +	return 0;
 +}
 +
-+/* Prepares the crash memory elf32 headers and stores in supplied buffer. */
-+static int prepare_crash_memory_elf32_headers(struct kexec_info *info,
-+						void *buf, unsigned long size)
-+{
-+	Elf32_Ehdr *elf;
-+	Elf32_Phdr *phdr;
-+	int i;
-+	char *bufp;
-+	long int nr_cpus = 0;
-+	uint64_t notes_addr;
-+
-+	bufp = (char*) buf;
-+
-+	/* Setup ELF Header*/
-+	elf = (Elf32_Ehdr *) bufp;
-+	bufp += sizeof(Elf32_Ehdr);
-+	memcpy(elf->e_ident, ELFMAG, SELFMAG);
-+	elf->e_ident[EI_CLASS]  = ELFCLASS32;
-+	elf->e_ident[EI_DATA]   = ELFDATA2LSB;
-+	elf->e_ident[EI_VERSION]= EV_CURRENT;
-+	elf->e_ident[EI_OSABI] = ELFOSABI_NONE;
-+	memset(elf->e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD);
-+	elf->e_type	= ET_CORE;
-+	elf->e_machine	= EM_X86_64;
-+	elf->e_version	= EV_CURRENT;
-+	elf->e_entry	= 0;
-+	elf->e_phoff	= sizeof(Elf32_Ehdr);
-+	elf->e_shoff	= 0;
-+	elf->e_flags	= 0;
-+	elf->e_ehsize   = sizeof(Elf32_Ehdr);
-+	elf->e_phentsize= sizeof(Elf32_Phdr);
-+	elf->e_phnum    = 0;
-+	elf->e_shentsize= 0;
-+	elf->e_shnum    = 0;
-+	elf->e_shstrndx = 0;
-+
-+	/* PT_NOTE program headers. One per cpu*/
-+	nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
-+	if (nr_cpus < 0) {
-+		return -1;
-+	}
-+
-+	/* Need to find a better way to determine per cpu notes section size. */
-+#define MAX_NOTE_BYTES	1024
-+	for (i = 0; i < nr_cpus; i++) {
-+		if (get_crash_notes_per_cpu(i, &notes_addr) < 0) {
-+			/* This cpu is not present. Skip it. */
-+			return -1;
-+		}
-+		phdr = (Elf32_Phdr *) bufp;
-+		bufp += sizeof(Elf32_Phdr);
-+		phdr->p_type	= PT_NOTE;
-+		phdr->p_flags	= 0;
-+		phdr->p_offset  = phdr->p_paddr = notes_addr;
-+		phdr->p_vaddr   = 0;
-+		phdr->p_filesz	= phdr->p_memsz	= MAX_NOTE_BYTES;
-+		/* Do we need any alignment of segments? */
-+		phdr->p_align	= 0;
-+
-+		/* Increment number of program headers. */
-+		(elf->e_phnum)++;
-+	}
-+
-+	/* Setup PT_LOAD type program header for every system RAM chunk.
-+	 * A seprate program header for Backup Region*/
-+	for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) {
-+		unsigned long long mstart, mend;
-+		mstart = crash_memory_range[i].start;
-+		mend = crash_memory_range[i].end;
-+		if (!mstart && !mend)
-+			break;
-+		if (crash_memory_range[i].type != RANGE_RAM)
-+			break;
-+		phdr = (Elf32_Phdr *) bufp;
-+		bufp += sizeof(Elf32_Phdr);
-+		phdr->p_type	= PT_LOAD;
-+		phdr->p_flags	= PF_R|PF_W|PF_X;
-+		if (mstart == BACKUP_START && mend == BACKUP_END)
-+			phdr->p_offset	= info->backup_start;
-+		else
-+			phdr->p_offset	= mstart;
-+		/* Handle linearly mapped region.*/
-+
-+		/* Filling the vaddr conditionally as we have two linearly
-+		 * mapped regions here. One is __START_KERNEL_map 0 to 40 MB
-+		 * other one is PAGE_OFFSET */
-+
-+		if (mend <= (MAXMEM - 1) && mstart < KERNEL_TEXT_SIZE)
-+			phdr->p_vaddr = mstart + __START_KERNEL_map;
-+		else {
-+			if (mend <= (MAXMEM - 1))
-+				phdr->p_vaddr = mstart + PAGE_OFFSET;
-+			else
-+				phdr->p_vaddr = UINT_MAX;
-+		}
-+		phdr->p_paddr = mstart;
-+		phdr->p_filesz	= phdr->p_memsz	= mend - mstart + 1;
-+		/* Do we need any alignment of segments? */
-+		phdr->p_align	= 0;
-+		/* Increment number of program headers. */
-+		(elf->e_phnum)++;
-+	}
-+	return 0;
-+}
-+
 +/* Loads additional segments in case of a panic kernel is being loaded.
 + * One segment for backup region, another segment for storing elf headers
 + * for crash memory image.
@@ -4488,25 +4445,15 @@
 +			" failed: %s\n", strerror(errno));
 +		return -1;
 +	}
-+	if (arch_options.core_header_type == CORE_TYPE_ELF64) {
-+		sz = 	sizeof(Elf64_Ehdr) +
-+			nr_cpus * sizeof(Elf64_Phdr) +
++	sz = 	sizeof(Elf64_Ehdr) + nr_cpus * sizeof(Elf64_Phdr) +
 +			nr_ranges * sizeof(Elf64_Phdr);
-+	} else {
-+		sz = 	sizeof(Elf32_Ehdr) +
-+			nr_cpus * sizeof(Elf32_Phdr) +
-+			nr_ranges * sizeof(Elf32_Phdr);
-+	}
 +	sz = (sz + align - 1) & ~(align -1);
 +	tmp = xmalloc(sz);
 +	memset(tmp, 0, sz);
-+	if (arch_options.core_header_type == CORE_TYPE_ELF64) {
-+		if (prepare_crash_memory_elf64_headers(info, tmp, sz) < 0)
-+			return -1;
-+	} else {
-+		if (prepare_crash_memory_elf32_headers(info, tmp, sz) < 0)
-+			return -1;
-+	}
++
++	/* Prepare ELF64 core heaers. */
++	if (prepare_crash_memory_elf64_headers(info, tmp, sz) < 0)
++		return -1;
 +
 +	/* Hack: With some ld versions (GNU ld version 2.14.90.0.4 20030523),
 +	 * vmlinux program headers show a gap of two pages between bss segment
@@ -4561,29 +4508,6 @@
 +#define BACKUP_SIZE	(BACKUP_END - BACKUP_START + 1)
 +
 +#endif /* CRASHDUMP_X86_64_H */
-diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/x86_64/include/arch/options.h kexec-tools-1.101-kdump/kexec/arch/x86_64/include/arch/options.h
---- kexec-tools-1.101/kexec/arch/x86_64/include/arch/options.h	2004-12-22 02:24:02.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/x86_64/include/arch/options.h	2006-01-19 11:41:40.000000000 +0530
-@@ -6,7 +6,9 @@
- #define OPT_SERIAL_BAUD    (OPT_MAX+2)
- #define OPT_CONSOLE_VGA    (OPT_MAX+3)
- #define OPT_CONSOLE_SERIAL (OPT_MAX+4)
--#define OPT_ARCH_MAX       (OPT_MAX+5)
-+#define OPT_ELF32_CORE     (OPT_MAX+5)
-+#define OPT_ELF64_CORE     (OPT_MAX+6)
-+#define OPT_ARCH_MAX       (OPT_MAX+7)
- 
- #define KEXEC_ARCH_OPTIONS \
- 	KEXEC_OPTIONS \
-@@ -15,6 +17,8 @@
- 	{ "serial-baud",    1, 0, OPT_SERIAL_BAUD }, \
- 	{ "console-vga",    0, 0, OPT_CONSOLE_VGA }, \
- 	{ "console-serial", 0, 0, OPT_CONSOLE_SERIAL }, \
-+	{ "elf32-core-headers", 0, 0, OPT_ELF32_CORE }, \
-+	{ "elf64-core-headers", 0, 0, OPT_ELF64_CORE }, \
- 
- #define KEXEC_ARCH_OPT_STR KEXEC_OPT_STR ""
- 
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c kexec-tools-1.101-kdump/kexec/arch/x86_64/kexec-elf-x86_64.c
 --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c	2005-01-13 18:40:54.000000000 +0530
 +++ kexec-tools-1.101-kdump/kexec/arch/x86_64/kexec-elf-x86_64.c	2006-01-19 11:41:42.000000000 +0530
@@ -4681,7 +4605,7 @@
  		elf_rel_get_symbol(&info->rhdr, "entry64_regs", &regs, sizeof(regs));
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c kexec-tools-1.101-kdump/kexec/arch/x86_64/kexec-x86_64.c
 --- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c	2005-02-06 04:55:01.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/arch/x86_64/kexec-x86_64.c	2006-01-19 18:19:07.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/arch/x86_64/kexec-x86_64.c	2006-02-19 11:11:37.000000000 +0530
 @@ -30,14 +30,15 @@
  #include "../../kexec-elf.h"
  #include "../../kexec-syscall.h"
@@ -4721,12 +4645,7 @@
  		else {
  			continue;
  		}
-@@ -121,21 +136,25 @@ void arch_usage(void)
- 		"     --serial-baud=<buad_rate> Specify the serial port baud rate\n"
- 		"     --console-vga             Enable the vga console\n"
- 		"     --console-serial          Enable the serial console\n"
-+		"     --elf32-core-headers      Prepare core headers in ELF32 format\n"
-+		"     --elf64-core-headers      Prepare core headers in ELF64 format\n"
+@@ -124,18 +139,20 @@ void arch_usage(void)
  		);
  }
  
@@ -4748,20 +4667,7 @@
  };
  
  int arch_process_options(int argc, char **argv)
-@@ -199,6 +218,12 @@ int arch_process_options(int argc, char 
- 			}
- 			arch_options.serial_baud = value;
- 			break;
-+			case OPT_ELF32_CORE:
-+				arch_options.core_header_type = CORE_TYPE_ELF32;
-+				break;
-+			case OPT_ELF64_CORE:
-+				arch_options.core_header_type = CORE_TYPE_ELF64;
-+				break;
- 		}
- 	}
- 	/* Reset getopt for the next pass; called in other source modules */
-@@ -207,7 +232,7 @@ int arch_process_options(int argc, char 
+@@ -207,7 +224,7 @@ int arch_process_options(int argc, char 
  	return 0;
  }
  
@@ -4770,7 +4676,7 @@
  {
  	int result;
  	struct utsname utsname;
-@@ -222,7 +247,7 @@ int arch_compat_trampoline(struct kexec_
+@@ -222,7 +239,7 @@ int arch_compat_trampoline(struct kexec_
  		/* For compatibility with older patches 
  		 * use KEXEC_ARCH_DEFAULT instead of KEXEC_ARCH_X86_64 here.
  		 */
@@ -4779,7 +4685,7 @@
  	}
  	else {
  		fprintf(stderr, "Unsupported machine type: %s\n",
-@@ -234,6 +259,8 @@ int arch_compat_trampoline(struct kexec_
+@@ -234,6 +251,8 @@ int arch_compat_trampoline(struct kexec_
  
  void arch_update_purgatory(struct kexec_info *info)
  {
@@ -4788,7 +4694,7 @@
  	elf_rel_set_symbol(&info->rhdr, "reset_vga",
  		&arch_options.reset_vga, sizeof(arch_options.reset_vga));
  	elf_rel_set_symbol(&info->rhdr, "serial_base", 
-@@ -244,4 +271,12 @@ void arch_update_purgatory(struct kexec_
+@@ -244,4 +263,12 @@ void arch_update_purgatory(struct kexec_
  		&arch_options.console_vga, sizeof(arch_options.console_vga));
  	elf_rel_set_symbol(&info->rhdr, "console_serial", 
  		&arch_options.console_serial, sizeof(arch_options.console_serial));
@@ -4896,7 +4802,7 @@
 +#endif /* CRASHDUMP_H */
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/kexec.c kexec-tools-1.101-kdump/kexec/kexec.c
 --- kexec-tools-1.101/kexec/kexec.c	2005-01-13 18:54:29.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/kexec.c	2006-02-01 14:41:52.281089376 +0530
++++ kexec-tools-1.101-kdump/kexec/kexec.c	2006-02-01 14:41:52.000000000 +0530
 @@ -38,8 +38,8 @@
  #include "kexec-elf.h"
  #include "kexec-sha256.h"
@@ -4986,7 +4892,7 @@
  	return result;
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/kexec-elf.c kexec-tools-1.101-kdump/kexec/kexec-elf.c
 --- kexec-tools-1.101/kexec/kexec-elf.c	2004-12-20 14:58:30.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/kexec-elf.c	2006-01-19 18:20:08.000000000 +0530
++++ kexec-tools-1.101-kdump/kexec/kexec-elf.c	2006-02-22 11:30:11.084107504 +0530
 @@ -113,21 +113,21 @@ static int build_mem_elf32_ehdr(const ch
  		}
  		return -1;
@@ -5194,7 +5100,13 @@
  					i);
  			}
  			return -1;
-@@ -653,14 +653,14 @@ static int build_mem_shdrs(const char *b
+@@ -648,19 +648,19 @@ static int build_mem_shdrs(const char *b
+ 			return -1;
+ 		}
+ 		/* Remember where the section lives in the buffer */
+-		shdr->sh_data = buf + shdr->sh_offset;
++		shdr->sh_data = (unsigned char *)(buf + shdr->sh_offset);
+ 	}
  	return 0;
  }
  
@@ -5211,6 +5123,15 @@
  }
  static int build_mem_notes(const char *buf, off_t len, struct mem_ehdr *ehdr)
  {
+@@ -672,7 +672,7 @@ static int build_mem_notes(const char *b
+ 	for(i = 0; !note_start && (i < ehdr->e_phnum); i++) {
+ 		struct mem_phdr *phdr = &ehdr->e_phdr[i];
+ 		if (phdr->p_type == PT_NOTE) {
+-			note_start = phdr->p_data;
++			note_start = (unsigned char *)phdr->p_data;
+ 			note_end = note_start + phdr->p_filesz;
+ 		}
+ 	}
 @@ -686,7 +686,7 @@ static int build_mem_notes(const char *b
  	if (!note_start) {
  		return 0;
@@ -5220,7 +5141,7 @@
  	/* Walk through and count the notes */
  	ehdr->e_notenum = 0;
  	for(note = note_start; note < note_end; note+= note_size) {
-@@ -708,7 +708,7 @@ static int build_mem_notes(const char *b
+@@ -708,15 +708,15 @@ static int build_mem_notes(const char *b
  		note_size += (hdr.n_namesz + 3) & ~3;
  		desc       = note + note_size;
  		note_size += (hdr.n_descsz + 3) & ~3;
@@ -5229,8 +5150,9 @@
  		if ((hdr.n_namesz != 0) && (name[hdr.n_namesz -1] != '\0')) {
  			die("Note name is not null termiated");
  		}
-@@ -716,7 +716,7 @@ static int build_mem_notes(const char *b
- 		ehdr->e_note[i].n_name = name;
+ 		ehdr->e_note[i].n_type = hdr.n_type;
+-		ehdr->e_note[i].n_name = name;
++		ehdr->e_note[i].n_name = (char *)name;
  		ehdr->e_note[i].n_desc = desc;
  		ehdr->e_note[i].n_descsz = hdr.n_descsz;
 -		
@@ -5240,7 +5162,7 @@
  }
 diff -urNp -X dontdiff kexec-tools-1.101/kexec/kexec-elf-rel.c kexec-tools-1.101-kdump/kexec/kexec-elf-rel.c
 --- kexec-tools-1.101/kexec/kexec-elf-rel.c	2005-01-13 18:34:21.000000000 +0530
-+++ kexec-tools-1.101-kdump/kexec/kexec-elf-rel.c	2006-02-01 16:41:33.288410328 +0530
++++ kexec-tools-1.101-kdump/kexec/kexec-elf-rel.c	2006-02-22 11:30:11.085107352 +0530
 @@ -155,7 +155,7 @@ int build_elf_rel_info(const char *buf, 
  		if (probe_debug) {
  			fprintf(stderr, "No ELF section headers\n");
@@ -5331,7 +5253,7 @@
  				(void *)location, address, value);
  		}
  	}
-@@ -399,7 +410,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, 
+@@ -399,14 +410,14 @@ int elf_rel_load(struct mem_ehdr *ehdr, 
  	return result;
  }
  
@@ -5340,6 +5262,23 @@
  	const char *buf, off_t len, unsigned long min, unsigned long max,
  	int end)
  {
+ 	int result;
+ 
+ 	/* Parse the Elf file */
+-	result = build_elf_rel_info(purgatory, purgatory_size, ehdr);
++	result = build_elf_rel_info((char *)purgatory, purgatory_size, ehdr);
+ 	if (result < 0) {
+ 		die("ELF rel parse failed\n");
+ 	}
+@@ -439,7 +450,7 @@ int elf_rel_find_symbol(struct mem_ehdr 
+ 			/* Invalid strtab section number? */
+ 			continue;
+ 		}
+-		strtab = ehdr->e_shdr[shdr->sh_link].sh_data;
++		strtab = (char *)ehdr->e_shdr[shdr->sh_link].sh_data;
+ 		/* Walk through the symbol table and find the symbol */
+ 		sym_size = elf_sym_size(ehdr);
+ 		sym_end = shdr->sh_data + shdr->sh_size;
 @@ -452,8 +463,8 @@ int elf_rel_find_symbol(struct mem_ehdr 
  			if (strcmp(strtab + sym.st_name, name) != 0) {
  				continue;


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kexec-tools.spec	22 Feb 2006 20:59:15 -0000	1.11
+++ kexec-tools.spec	27 Feb 2006 09:19:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 9
+Release: 10
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -96,6 +96,17 @@
 %doc TODO
 
 %changelog
+* Mon Feb 27 2006 Thomas Graf <tgraf at redhat.com> - 1.101-10
+- kdump7.patch
+   o Remove elf32 core headers support for x86_64
+   o Fix x86 prepare elf core header routine
+   o Fix ppc64 kexec -p failure for gcc 4.10
+   o Fix few warnings for gcc 4.10
+   o Add the missing --initrd option for ppc64
+   o Fix ppc64 persistent root device bug
+- Remove --elf32-core-headers from default configuration, users
+  may re-add it via KEXEC_ARGS.
+- Remove obsolete KEXEC_HEADERS
 * Wed Feb 22 2006 Thomas Graf <tgraf at redhat.com> - 1.101-9
 - Remove wrong quotes around --command-line in kdump.init
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:05:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:05:12 -0500
Subject: rpms/neon/devel neon.spec,1.23,1.24
Message-ID: <200602271205.k1RC5CYa023684@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/neon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23663

Modified Files:
	neon.spec 
Log Message:
* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 0.25.5-1.2
- don't trim exported libraries (#182997)



Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- neon.spec	11 Feb 2006 04:43:38 -0000	1.23
+++ neon.spec	27 Feb 2006 12:04:47 -0000	1.24
@@ -39,12 +39,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-# Trim exports.
-sed -i "s/dependency_libs='.*'/dependency_libs=''/g" \
-       $RPM_BUILD_ROOT%{_libdir}/libneon.la
-sed -i 's/LIBS=".*"/LIBS="-lneon"/' \
-       $RPM_BUILD_ROOT%{_bindir}/neon-config
-
 # test suite uses port 7777
 %ifnarch ppc s390
 %check
@@ -74,6 +68,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 0.25.5-1.2
+- don't trim exported libraries (#182997)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:06:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:06:17 -0500
Subject: rpms/neon/devel neon.spec,1.24,1.25
Message-ID: <200602271206.k1RC6Huq023801@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/neon/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23761

Modified Files:
	neon.spec 
Log Message:
- bump release



Index: neon.spec
===================================================================
RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- neon.spec	27 Feb 2006 12:04:47 -0000	1.24
+++ neon.spec	27 Feb 2006 12:06:15 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 1.2
+Release: 2
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
@@ -68,7 +68,7 @@
 %{_libdir}/*.so
 
 %changelog
-* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 0.25.5-1.2
+* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 0.25.5-2
 - don't trim exported libraries (#182997)
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.25.5-1.2



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:23:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:23:02 -0500
Subject: rpms/ksh/devel ksh.spec,1.23,1.24
Message-ID: <200602271223.k1RCN2SI010786@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ksh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10748

Modified Files:
	ksh.spec 
Log Message:
PreReq grep, coreutils (#182835)


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ksh.spec	15 Feb 2006 14:03:31 -0000	1.23
+++ ksh.spec	27 Feb 2006 12:23:00 -0000	1.24
@@ -24,6 +24,7 @@
 Provides:     ksh93
 Obsoletes:    ksh93
 Conflicts:    pdksh
+PreReq:       grep, coreutils
 
 %description
 KSH-93 is the most recent version of the KornShell by David Korn of 
@@ -99,6 +100,9 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 20060124-2
+- PreReq grep, coreutils (#182835)
+
 * Tue Feb 14 2006 Karsten Hopp <karsten at redhat.de> 20060124-2
 - make it build in chroots (#180561)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:24:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:24:04 -0500
Subject: rpms/ksh/devel ksh.spec,1.24,1.25
Message-ID: <200602271224.k1RCO4lA011304@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ksh/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11276

Modified Files:
	ksh.spec 
Log Message:
bump release


Index: ksh.spec
===================================================================
RCS file: /cvs/dist/rpms/ksh/devel/ksh.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ksh.spec	27 Feb 2006 12:23:00 -0000	1.24
+++ ksh.spec	27 Feb 2006 12:24:02 -0000	1.25
@@ -8,7 +8,7 @@
 Group:        Applications/Shells
 License:      Common Public License Version 1.0
 Version:      20060124
-Release:      2
+Release:      3
 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,7 +100,7 @@
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 20060124-2
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 20060124-3
 - PreReq grep, coreutils (#182835)
 
 * Tue Feb 14 2006 Karsten Hopp <karsten at redhat.de> 20060124-2



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:27:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:27:14 -0500
Subject: rpms/autoconf213/devel autoconf213.spec,1.8,1.9
Message-ID: <200602271227.k1RCREaZ029185@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf213/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25570

Modified Files:
	autoconf213.spec 
Log Message:
- BuildRequire m4 (#181959)


Index: autoconf213.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf213/devel/autoconf213.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autoconf213.spec	9 Dec 2005 22:39:42 -0000	1.8
+++ autoconf213.spec	27 Feb 2006 12:27:11 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf213
 Version:	2.13
-Release: 10.1
+Release:    11
 License:	GPL
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/autoconf/
@@ -17,7 +17,7 @@
 Patch8:		autoconf-2.13-make-defs-62361.patch
 Patch9:		autoconf-2.13-versioning.patch
 Requires:	gawk, m4, mktemp, perl, textutils
-Buildrequires:	texinfo
+Buildrequires:	texinfo, m4
 BuildArchitectures: noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -77,6 +77,9 @@
 %doc AUTHORS COPYING NEWS README TODO
 
 %changelog
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 2.13-11
+- BuildRequire m4 (#181959)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 12:33:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 07:33:17 -0500
Subject: rpms/autoconf213/devel autoconf213.spec,1.9,1.10
Message-ID: <200602271233.k1RCXHSo007051@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/autoconf213/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7041

Modified Files:
	autoconf213.spec 
Log Message:
require m4  >= 1.1


Index: autoconf213.spec
===================================================================
RCS file: /cvs/dist/rpms/autoconf213/devel/autoconf213.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- autoconf213.spec	27 Feb 2006 12:27:11 -0000	1.9
+++ autoconf213.spec	27 Feb 2006 12:33:02 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:	A GNU tool for automatically configuring source code.
 Name:		autoconf213
 Version:	2.13
-Release:    11
+Release:    12
 License:	GPL
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/autoconf/
@@ -16,8 +16,8 @@
 Patch7:		autoconf-2.13-wait3test.patch
 Patch8:		autoconf-2.13-make-defs-62361.patch
 Patch9:		autoconf-2.13-versioning.patch
-Requires:	gawk, m4, mktemp, perl, textutils
-Buildrequires:	texinfo, m4
+Requires:	gawk, m4 >= 1.1, mktemp, perl, textutils
+Buildrequires:	texinfo, m4 >= 1.1
 BuildArchitectures: noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -77,6 +77,9 @@
 %doc AUTHORS COPYING NEWS README TODO
 
 %changelog
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 2.13-12
+- require m4 >= 1.1
+
 * Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 2.13-11
 - BuildRequire m4 (#181959)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:12:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:12:14 -0500
Subject: rpms/jpilot/devel jpilot-0.99.8-sf.patch, NONE, 1.1 jpilot.spec,
	1.31, 1.32
Message-ID: <200602271312.k1RDCEUw032643@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/jpilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32514

Modified Files:
	jpilot.spec 
Added Files:
	jpilot-0.99.8-sf.patch 
Log Message:
- fix b183014 - jpilot startup problem


jpilot-0.99.8-sf.patch:
 jpilot.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jpilot-0.99.8-sf.patch ---
--- jpilot-0.99.8/jpilot.c.sf	2005-10-24 21:15:41.000000000 +0200
+++ jpilot-0.99.8/jpilot.c	2006-02-27 13:29:08.935910856 +0100
@@ -1371,7 +1371,7 @@
    gdk_pixdata_from_pixbuf(pixdata, pixbuf, FALSE);
    data = gdk_pixdata_serialize(pixdata, &len);
 
-   g_free(pixbuf);
+/*   g_free(pixbuf); */
    g_free(pixdata);
 
    return data;


Index: jpilot.spec
===================================================================
RCS file: /cvs/dist/rpms/jpilot/devel/jpilot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jpilot.spec	11 Feb 2006 03:42:37 -0000	1.31
+++ jpilot.spec	27 Feb 2006 13:12:11 -0000	1.32
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 0.99.8
-Release: 2.2.1
+Release: 3
 License: GPL
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -14,6 +14,7 @@
 Patch1: jpilot-0.99.8-misc.patch
 Patch2: jpilot-0.99.8-curday.patch
 Patch3: jpilot-0.99.8-overfl.patch
+Patch4: jpilot-0.99.8-sf.patch
 
 BuildPrereq: gtk2-devel >= 2.0.3
 BuildPrereq: pilot-link-devel
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .curday
 %patch3 -p1 -b .overfl
+%patch4 -p1 -b .sf
 
 %build
 %configure \
@@ -79,6 +81,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Feb 27 2006 Ivana Varekova <varekova at redhat.com> - 0.99.8-3
+- fix b183014 - jpilot startup problem
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.99.8-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:37:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:37:40 -0500
Subject: rpms/mod_python/devel mod_python-3.2.8.tgz.asc, NONE, 1.1 .cvsignore,
	1.9, 1.10 mod_python-3.1.4-apr1x.patch, 1.1,
	1.2 mod_python.spec, 1.28, 1.29 sources, 1.11, 1.12 upstream,
	1.1, 1.2 upstream-key.gpg, 1.1, 1.2
Message-ID: <200602271337.k1RDbets021566@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21528

Modified Files:
	.cvsignore mod_python-3.1.4-apr1x.patch mod_python.spec 
	sources upstream upstream-key.gpg 
Added Files:
	mod_python-3.2.8.tgz.asc 
Log Message:
* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-2
- update to 3.2.8



--- NEW FILE mod_python-3.2.8.tgz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQBD+hlQoB28nqh5/PURAi0uAJ9RZBMhecnnNibKpuJqptUes6ln+wCcDi5X
D5RNY8nL1izBF+T/uN5zpQA=
=gU8I
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Feb 2005 16:05:43 -0000	1.9
+++ .cvsignore	27 Feb 2006 13:37:35 -0000	1.10
@@ -1 +1 @@
-mod_python-3.1.4.tgz
+mod_python-3.2.8.tgz

mod_python-3.1.4-apr1x.patch:
 connobject.c   |    2 +-
 filterobject.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: mod_python-3.1.4-apr1x.patch
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python-3.1.4-apr1x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_python-3.1.4-apr1x.patch	2 Dec 2005 11:49:30 -0000	1.1
+++ mod_python-3.1.4-apr1x.patch	27 Feb 2006 13:37:35 -0000	1.2
@@ -1,16 +1,16 @@
---- mod_python-3.1.4/src/connobject.c.apr1x
-+++ mod_python-3.1.4/src/connobject.c
-@@ -78,7 +78,7 @@
-     rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize);
-     Py_END_ALLOW_THREADS;
+--- mod_python-3.2.8/src/connobject.c.apr1x
++++ mod_python-3.2.8/src/connobject.c
+@@ -79,7 +79,7 @@
+         rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize);
+         Py_END_ALLOW_THREADS;
  
--    if (! APR_STATUS_IS_SUCCESS(rc)) {
-+    if (rc != APR_SUCCESS) {
-         PyErr_SetObject(PyExc_IOError, 
-                         PyString_FromString("Connection read error"));
-         return NULL;
---- mod_python-3.1.4/src/filterobject.c.apr1x
-+++ mod_python-3.1.4/src/filterobject.c
+-        if (! APR_STATUS_IS_SUCCESS(rc)) {
++        if (rc != APR_SUCCESS) {
+             PyErr_SetObject(PyExc_IOError, 
+                             PyString_FromString("Connection read error"));
+             return NULL;
+--- mod_python-3.2.8/src/filterobject.c.apr1x
++++ mod_python-3.2.8/src/filterobject.c
 @@ -178,7 +178,7 @@
                                    APR_BLOCK_READ, self->readbytes);
          Py_END_ALLOW_THREADS;


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_python.spec	13 Feb 2006 14:58:06 -0000	1.28
+++ mod_python.spec	27 Feb 2006 13:37:35 -0000	1.29
@@ -3,14 +3,12 @@
 
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
-Version: 3.1.4
-Release: 4
+Version: 3.2.8
+Release: 2
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
-Patch1: mod_python-3.1.3-maxlocks.patch
 Patch2: mod_python-3.1.4-config.patch
 Patch7: mod_python-20020610-gsr.patch
-Patch10: mod_python-20020722-lib64.patch
 Patch11: mod_python-3.1.3-ldflags.patch
 Patch12: mod_python-3.1.4-cflags.patch
 Patch13: mod_python-3.1.4-apr1x.patch
@@ -19,7 +17,7 @@
 Group: System Environment/Daemons
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: httpd >= 2.0.40
-BuildPrereq: httpd-devel >= 2.0.40-6, python, python-devel
+BuildPrereq: httpd-devel >= 2.0.40-6, python, python-devel, autoconf
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 Requires: python-abi = %{pyver}
 
@@ -33,17 +31,15 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .maxlocks
 %patch2 -p1 -b .config
 %patch7 -p0 -b .gsr
-%patch10 -p1 -b .lib64
 %patch11 -p1 -b .ldflags
 %patch12 -p1 -b .cflags
 %patch13 -p1 -b .apr1x
 
 %build
 autoconf
-%configure --with-apxs=%{_sbindir}/apxs
+%configure --with-apxs=%{_sbindir}/apxs --with-max-locks=4
 make %{?_smp_mflags} APXS_CFLAGS="-Wc,-fno-strict-aliasing"
 
 %install
@@ -72,6 +68,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-2
+- update to 3.2.8
+
 * Mon Feb 13 2006 Joe Orton <jorton at redhat.com> 3.1.4-4
 - fix configure syntax error with bash 3.1 (#180731)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Feb 2005 16:05:43 -0000	1.11
+++ sources	27 Feb 2006 13:37:35 -0000	1.12
@@ -1 +1 @@
-607175958137b06bcda91110414c82a1  mod_python-3.1.4.tgz
+d03452979a6a334f73cc2b95b39db331  mod_python-3.2.8.tgz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/upstream,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstream	10 Feb 2005 16:03:28 -0000	1.1
+++ upstream	27 Feb 2006 13:37:35 -0000	1.2
@@ -1 +1 @@
-mod_python-3.1.4.tgz
+mod_python-3.2.8.tgz


Index: upstream-key.gpg
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/upstream-key.gpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstream-key.gpg	10 Feb 2005 16:04:28 -0000	1.1
+++ upstream-key.gpg	27 Feb 2006 13:37:35 -0000	1.2
@@ -1957,7 +1957,7 @@
 uid                            Roy T. Fielding <fielding at cox.net>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (Darwin)
+Version: GnuPG v1.4.1 (Darwin)
 
 mQGiBDrKHnYRBADjqUE4qp5WS3rI51oKVZOMLPyYI8lNwf8NwJ6LwfquU/DfiCf3
 K4CWKej721VMgT3zkd+PK/hGl8XpKGZIZIsPyZnvUOfPW9k+bxn3WtUiprwwVvBi
@@ -1970,87 +1970,323 @@
 nmFAFRD9FUjRJfllnQ627YivQvBda2/RSRUEyr+nPkUfxE4q3bQmUm95IFQuIEZp
 ZWxkaW5nIDxyb3kuZmllbGRpbmdAZGF5LmNvbT6IXwQTEQIAHwUCQY74bgIbAwcL
 CQgHAwIBAxUCAwMWAgECHgECF4AACgkQW5aAEOBPmokqrgCcC0KoXTZwGMuUEv9b
-c2ddPD2Ggd8Anj0JI6lG+iLuXusECs0Ipr1XQLxLtCVSb3kgVC4gRmllbGRpbmcg
-PGZpZWxkaW5nQGFwYWNoZS5vcmc+iFcEExECABcFCwcKAwQDFQMCAxYCAQIXgAUC
-QY75RQAKCRBbloAQ4E+aidLAAJ0bK66qzhQiErheJkbpRHhl3JUY1gCfSMRP3RLk
-eeGkY5hCx9k8VBYP092JAJUDBRA6ymy3GwgMRScZrzUBAb3QA/9Kb8ry/2QtBhaa
-nbQKSV/Xi8mkemw5HzYfzq5xWLtLOxH29o+ijBXn/X8fdICd4EUiY+p4F+XmOLno
-1Bi6Fce2kKiWXj2XncMu+7sRMiPkgZVSVPAK7C/GY0djP+E6km8Ovnyf2NimRApq
-Fac+7U4Bb3ljWcVyg2zZAFS8EUE/jokBHAQQAQEABgUCOsp2aQAKCRD3E6h5EP3g
-dfoCB/9OeYTQ+MTmaiaP/uQIJC8eX/jNeuG1+/1mVWkiA2W2BdwMAno2L3cYenvc
-CfGT92ciA4zbQBMGQwrQ1jT1KHeXIDtm1bUJsWyEV4uwdVqPyGiVUm3Zm1nxOHsV
-4jrpjEuJ+qA2BjsValA+DZD23NkcS/XSqRdtqPPlVDMBTqwpbG/V9CjmuhaR3rQg
-skJ8bMkm5MLE9wEwmtZaZGqFjgmgCAIuZR9XmsVr3+D2woR/xOTZJ0u8tmvnbgGb
-WUiis4+jCDKXYgJPLQBfMJb3WfGjewRhZl/dHrxXMPlP6Bzg5RaIOshjWSFMe9Ez
-1Udc3YYMcGglJqeEUu72QNLSPGgUiD8DBRBAX1NczLLrRuds9tARAs0YAJ4mgHK7
-VWp1TtkK5dLOfQtRcfrptQCfWgeuGGjc+gGGYCnxfobCJXYKemeJAhwEEAECAAYF
-Aj3ZRsAACgkQJA5m/MWcMnD3ORAAs0cleL1Cq0bVyseZnZ0NCB8fHd8f6nCAUNWP
-9kDNy1OA0c3mFe31fEyL94gX8XdetuQTsdiwG0PBJQ5ezyw+BP9vXQezMIbWCY6r
-q0ecjofup51nLyaM/KMEeoUtgyf4tN/gPXc5/WKUEb5jDpwAla6S+yGWdlfiqpOE
-zdxuCxkn3SzP76WLG9hoaq+TEN/xfPS8biWZ++JtXQrwsAQKCX9kUJTXrCG/4qzL
-H1O2ORbNIeRxzjTXYsExiDu1RB8lryZUOKzEjqf6wMPJObgHYByukjJ9dKIBI/qi
-lDnJx0nqoIV5xQaK4R3W90JqnNrN9G/2LSLZORCMl7AEVepna+ecLZ9Iad8F/Hd3
-LdM3DLGLJSJTbgF6kFAh9jTu2I89ixdytAN3Ac/j3Fxo5Fw/21D7GRtQ4Ww8KMYf
-GHihl2dJODCnm+++RBeY4DE/nAKx6ovzi6rNTnCTY2Mt+fqZUEjEjNATwnZOz/m3
-H+GDhkQ3ogLpC5wPg5JdQgMwQ4RUvctt9bS36G+8PQjKAF1xfhPJgBtELi6VTLWv
-yYDIjsdzu8bObeSVjjCHb9xQPLUjXYr4gNwyK9Z4aYaC7tJsxpQ+FtXcnM4eTAcf
-JAmIEvp0twEnfDUfTkmLnpTrEZ9MpMk4W1WnsJ2PFa8FLJqeSTglwD1o9kjk+ykD
-ZkWvhj2JAhwEEAECAAYFAj6kWHIACgkQzWPR3YT5Jk/6Ng/+Ns4OUMMu+zr0t+6h
-Dt+9XbCbFSFEkotZW/bPPhpcM8rnxnZRZIYEOu6uLyNHrJd9g63V8AOGlX7sKfh1
-49Z07ltJfqLTp77bdlFrWYBx5VZeiy3xsTDPhM9QGl8pvd+GnU0cKCe+46njTvxt
-bfxb4fAsLPGzOZyDr3BWFRRBfuuwxbDYIhIys7SAsv9JzUljhNO71ljl17EGnC3p
-j0bBv80VXeOQTYm+awQi0BS6gOQ+hVzuDy1wjW9ZbbCRDbP5jfjLHoobUPNodhDQ
-CzhIgwrjon9w/G1/GWPgcC20J/YkTs2pWo+ziSCYrQBnzha3bw9mOnGfKbmpE2Ds
-5gQCz5ks0pFYhDK451EKE8UivX7vQwkP1H1KQy7nnPawj67CZdnEMVvq2fVJ3MWh
-KurKGvXHGZ4jtsvtEeW+ISDiMTvarmZ2MB8HRPWyHhH4wMwDd7wsEIdlRJGi+Oaq
-RiXXp8HHNMomspYomFb7dDwOtxdR4O36Yqy3HiTbVlt7vE4Ys+UXLA8dD8U0RIos
-Y4Uz7QnNV06790D0fUIBgaeVuGXd8WAy6wEvPtnXZSyKG1iu2BLK/LO2jXHtuhV8
-CUZ5z3mS+S1JAl14iCfi2QL8lp1RDktajbRPeR0k1WZIZFGMQ3/AR3IbkSBb5SFW
-oys9Qrj/cZr7u1o7FfQ+MHhHCWaIRgQQEQIABgUCPXt0FwAKCRAJIhKW8YkEiyV8
-AKCdMxX2ItZgFIa1sb2VvnaF3rg78QCbB3W8pKH3k5ELbw/QsoztF3RdsKmIRgQQ
-EQIABgUCPqRXDQAKCRAxhs0ETwnwVVpDAJ4qFHXEx9T7oqD6VaI7pDgHlB/gLwCf
-RF131iILGrYMwkw2jxbNZcxanvqIRgQQEQIABgUCP8IXaAAKCRCJ2EyvRrJixk8g
-AKCFbrbwJ3NJ49u0aqfhGG8emLG7GgCeKe8P/n2YxGtMLH+R8ta/NlMR1oOIRgQQ
-EQIABgUCQCO1pAAKCRDbXScIEdWJPV5kAJ9KyxGqF+CKV2w21TNWMX+9b74FWQCf
-VzHT3VbZNS6QzuKr/N68y8FsKP2ImQQSAQIABgUCP8pvmgAKCRA+j7fy+INB2UKe
-A+dILLsYw9aNGZUvLDcTYWR4GsaIcwU4GrxCGNpbZzVMbIUXTLaATMfbVb5mUBSO
-A4pee5uFgfXxNHjCOckElHFWXf1o+ersq2+McHGX1sVN5PbgoX/3sqqRLR/1edAy
-3StVlIBlVJ3XFkjQD8SoAnd0W1MQBGcewfczX9CORohGBBIRAgAGBQI94lEVAAoJ
-EIjXzb30PC+SHS0AoIR92CogCUZgOb0lT6nA6xmNv45oAJ4wbsyZWbX6bu0PLcJh
-aV39hXG79oicBBMBAgAGBQI/woGKAAoJEDfj9F/uZeMh1tgD/jaWA+eIDY/S5feq
-Sl3hB+/g5VzZnmcEEsmORfVeJbkGjtkLdeTvmCvXhzjJ299lNm8DqPy6w7q2gtC+
-txDhWpZDVE5ER1y67ebmXOvic/SoaMTXL+a7aCCrItKfWtOnessd6aZH2R8KiMXQ
-AvGEQL8oXlnmSGYt6YW9ZXre8txeiEYEExECAAYFAj2kRtEACgkQi9gubzC5S1yb
-cgCfTf51jdnQr/vdmevewf0kicr6C70An2iO7KKSy2MPmlT3Y+L8pE2SHcCSiEYE
-ExECAAYFAj3YheYACgkQZjW2wN6IXdPj+wCfeyEeq8owXoRcrrdBG6CoXVTeJrYA
-oK8J6s4PzH//teNi+2k903imCnygiEYEExECAAYFAj+6aYMACgkQyzKhB4jDpaU0
-1wCfRsQp6Pd+3PRKWLXpOnPkZK4XljcAnilishWAIxZJTpOydtyiCNfFzateiEYE
-ExECAAYFAj+6kl4ACgkQXP03+sx4yJPU/gCcCG3twhvkmRMs+iJYrkUwLN0d1dQA
-oLKZ+d56BbmASmsELyOe9fA4vgaViEYEExECAAYFAj/BxcEACgkQNhUi14Kre9FP
-SwCgqBi1Rd6AanpjRwf1TLy9PKZkU+MAniq9cAq/rzN8Iw64h3+V8ehRKCSriEYE
-ExECAAYFAj/CGmQACgkQidhMr0ayYsZCJwCghebrqjzQj9Rfpu8/X0f5yCW96ngA
-n0XCYSZl2JTTS6J5xMXkE9IYzmGGiEYEExECAAYFAkAV1EoACgkQFT+gzXWmdpJ3
-YgCfXk2n6DThrTw7I0EAfyxKV/DaoPgAnihKjLfAoDSggakBNg7sY1DmP3I8iEYE
-ExECAAYFAkFlbckACgkQOyltUcwYWjt1zQCgsiNkYbSdSBSIyXfEk6aQKxcS40gA
-oJC/NPbbeIHY8NKHKc1v/Ts2PkEKiEYEExECAAYFAkFlbnYACgkQNjq/MJ/D1X4/
-RACeJbZB38zq49Sw/NwK5WlDz+ksvXkAoKiGODbJ632/IdydbYEFDw8YkB+viEYE
-ExECAAYFAkFwOhAACgkQD5GW3m5Swp40ZwCg5Qn27HU0fpWumG6TX9AKtPgx98UA
-n1bisz/VrNLEl91JJbxiQGDJmGzdiEkEMBECAAkFAj4NN8kCHQAACgkQi9gubzC5
-S1zzvQCaAv8iM9sQxK8k8t+zNuykyAIXrsAAnRLJIC10wbc9vEKxZjxcdjlYP5U/
-tCJSb3kgVC4gRmllbGRpbmcgPGZpZWxkaW5nQGNveC5uZXQ+iF8EExECAB8FAkGO
-+BcCGwMHCwkIBwMCAQMVAgMDFgIBAh4BAheAAAoJEFuWgBDgT5qJ2EcAoJSLYWn7
-2IB73WHL5UONpJIdesavAJ9ihL3kMF2P68cyH1XUDp12jxDGy7QjUm95IFQuIEZp
-ZWxkaW5nIDxmaWVsZGluZ0BnYml2LmNvbT6IYgQTEQIAIgIbAwcLCQgHAwIBAxUC
-AwMWAgECHgECF4AFAkGO/hoCGQEACgkQW5aAEOBPmokY1gCeM7o0IFR5SdsJ+kuv
-9NP5XTkCLc0An3D1T7HB0mqs1uWhvFNmh/D9lvf3uQENBDrKHoIQBAD0LtmKeekw
-1walkGK8OAvKJpBT4Wm4AhPmnHNh3MFRjCAit8ULZEW0XDHs/5IHOFRpxyKKpSyn
-zRNGGM2Yi9DvW5acn5H4Us1Vc8CBx1THK+zC7AU7yS9TCR51VDPEONIp2mcd0eay
-B2R9iGiu9KV/Rj8+H//YGF2sCvAqXwOKHwAECwQAs+bNP78S1L78v4mj57xptLLW
-lsTxXkZd1JCiosXitNmGLYsLtBldAtluXFllS2IjDZPV9Kp74ofgaO4wh01Qprk4
-Gn5SrSI7Oj6YH8DA/gggw7v//hEBLimN75okfqfzBhNTXNIxH6zhuo80RcfX0J/r
-ZQ4Adu/aXeYpR7E36CqIRgQYEQIABgUCOsoeggAKCRBbloAQ4E+aicVhAJ4oVY04
-egiOWbZj8DoBLuPjiwiGpACfZTuOsSKBxkA8JT6eXcJrBJhGbcY=
-=tNiR
+c2ddPD2Ggd8Anj0JI6lG+iLuXusECs0Ipr1XQLxLiEYEExECAAYFAkGiWWkACgkQ
+BJfVkRK/55pyngCePS7ilC3pXrOMzwUCI/DQeCMoga4An3cgD0t6j2/T8nuB5h67
+Ze/LyaC1iEYEExECAAYFAkGaiCkACgkQMJF5cimLx9CgmwCgk3QCimNqLIcic0CR
++wNgBgp+gFgAnRixBUNQ9GLqJJWKbeMZ7b4i6TwfiEYEExECAAYFAkGalNAACgkQ
+yX6cq3d1tHkmjwCgrSID1cu/xLIAA2ehOm8NMYWkG5oAoJzSZh1lT/kRwzHLwd+/
+IO316iobiEYEEhECAAYFAkGjAgMACgkQB2FzsZKExFKnPwCdEQRk8+Z8n8IFnhQn
+1T6jXM7GLLoAoIP0sSWpQIs4z7zhRPjCqcAoKFnjiEYEExECAAYFAkGalnIACgkQ
+XP03+sx4yJOmCQCfTixepfWLoiTqs1GTz6u737iP80MAoM0TnDk54Q8CbWYJ/9zY
+6PCBwr6tiEYEExECAAYFAkGajQ4ACgkQF2rZyNGqiWJE7ACdHH2D5KlwbLgUFKzp
+zng9JRU6hKsAnitj4Shya0KoWQPiNkFHgB0CX8ZHiEYEExECAAYFAkGbzpMACgkQ
+XUFK4eAFyct6RQCfWQcbqL74JP946GValnxfJhhsQmEAnjm4jWAWWL3KtfXeOCgV
+MbBhL/a/iJwEEwECAAYFAkGZgZgACgkQMaY9luwUC4FfOQP+K20bh55JEs49DkMM
+gScH6P9DsCvZee+MNhjzLijzyWrdnMCRMEb4ye+cdPQxD+M+Wl0iaO61AMMqUCno
+D6DDo20hhzU8kn5LneOJ93pcz1hjkpzof02FG+2sf6B5x/BdQshgL1ySiXrPb74q
+s7gKuybtDtkobLRnKPuSESE/Lk+IRQQTEQIABgUCQZqKSwAKCRD8D4WJ+JS+Enqi
+AJ0XZi3M3rfMuqe7tIagqiIeIlrm/wCXcrzjI78YE4XEeThe9a2kIIdIOohGBBMR
+AgAGBQJBsRgPAAoJEN6ihzgyivIERxcAoIuSWSOTjocSQyedzgDeTDEs9r4AAKCo
+F4H183O7HWf0pomjCRQh/4f3RYhGBBMRAgAGBQJBq3mCAAoJEM4BpH4cQ9hQk9UA
+oJmXaSH3C0f9RfNUWtbM8TPBLoB+AJ4qqFgkYYfkDg9Cij28yyMa82tQE4hGBBIR
+AgAGBQJBujwZAAoJEAEFZrzkE2OSx9UAni1LSdTKkDgpDcGEiAlZ1WpKQmAaAJ9W
+Um5hl+2qSn/AVaMvGsp0XtgYVYhGBBARAgAGBQJBsBhLAAoJELK+vEAVKSSvVOsA
+nAgKhSKJKOI3uBTfP1/blI/04BwzAJwPuS+s8QgwTUkxQWicyrq9pg2XjYhGBBIR
+AgAGBQJB4viIAAoJEEzETQAR34fpsTMAn3DvE1Esp8Wc5JH8uaVjndouHtSeAJ9N
+c+wBHb+a5/RIZAJy1Jt2Nfl0tYhGBBMRAgAGBQJBzkgcAAoJEME58VMjy3oqokQA
+n0doBXF9FSeMRZV7u/ERU0n3qrVWAJ9ddFnxQU6Kra2eQpuBx57oPqoHAYhGBBMR
+AgAGBQJCLiKFAAoJEALjkFHlgLNjWywAn08xy+7kZwLdHaFi16sdKm5oxsKuAKCm
+r+MA/c7dvOb7f4Fh2vu/l1ITdIhGBBARAgAGBQJC3OR1AAoJEOyrDnuD5q4NFxIA
+ni0tkRV7SDBFmZ7BhbqSsdpmLxo4AKCu3nRFWT+6MAY4v4JeTm8MrV7moIhGBBAR
+AgAGBQJC4NkeAAoJEIzjdrgc1IYfkMQAn0t4Kh6txi12LJSkr4mc0P+AhQ75AJ9k
+OjklBQCS7C1hlluI+oGhlLwKTYhGBBMRAgAGBQJC3rBQAAoJEP1viMYh0KcbHu0A
+njNACpi5qo516Ohk4EiYmKFsNO+OAKDsu7NVsPst/s25q4qGT1H2p49kGYhGBBMR
+AgAGBQJC3rqPAAoJEDLJ5M42QstLJsAAoLbRG9j6wci/e/oLkYTbJpaRWlVjAKCl
+cvH1xY7KUnFRU063pqmJufzpsohGBBMRAgAGBQJC32zmAAoJEFCOrsUwLaVoI3IA
+oL13PvN9g6/ApleNvcrGWJXlWqn3AJ0RbsVM6fCpYgsdsjE8kyjU/S2JsIhGBBMR
+AgAGBQJC32zpAAoJEN26ZLosMS0vRMwAoIV8hheV4kG8fp2jVYr47RzWFvxbAKCv
+8O9RmTGmEd1BJ4NPJZfcU195WIicBBMBAgAGBQJC3seiAAoJEDfj9F/uZeMhyKYE
+AMoJv8QYRTXgpoUnT/IG34i4/sxCvL6yUmaMJPUN4zE/VvVpSb4gMHwVCKg5+fcg
+7OdyA2OG405nmkvCCZSZFdWslifh+smzbYLSTKWMaEIupFFntKH9ynOLXjewoSux
+lY4EreMrxqRhTdXXaIpzLw86hcz3rLptfvhyezFtIOPGiJwEEwECAAYFAkLfbOMA
+CgkQms08wKmfdd3jiAP/RHxhO/f4LLOaSPnVENjNK7st8D0MXHDXbDQYerEmJwuz
+7DT+uup9Sn/3NRA27vtDXJ9UgwVUYuuO2MJ4Ij6U+RbTcGwh9WElnACOaXKhv4Xs
+pdt8/7TA5BNcHL72RYzY58oj4hHN5WfyIO6kKa1TE+Ta+T/QHZOV1Hk5jQfIXTKI
+RgQTEQIABgUCQuDsuAAKCRDJtabs4td03wPaAJ95/ud8yHueG8HminBF4JB8BdYb
+lgCeNp3z89IspuW5AXQ85pIMeJF3U2y0JVJveSBULiBGaWVsZGluZyA8ZmllbGRp
+bmdAYXBhY2hlLm9yZz6IVwQTEQIAFwULBwoDBAMVAwIDFgIBAheABQJBjvlFAAoJ
+EFuWgBDgT5qJ0sAAnRsrrqrOFCISuF4mRulEeGXclRjWAJ9IxE/dEuR54aRjmELH
+2TxUFg/T3YkAlQMFEDrKbLcbCAxFJxmvNQEBvdAD/0pvyvL/ZC0GFpqdtApJX9eL
+yaR6bDkfNh/OrnFYu0s7Efb2j6KMFef9fx90gJ3gRSJj6ngX5eY4uejUGLoVx7aQ
+qJZePZedwy77uxEyI+SBlVJU8ArsL8ZjR2M/4TqSbw6+fJ/Y2KZECmoVpz7tTgFv
+eWNZxXKDbNkAVLwRQT+OiQEcBBABAQAGBQI6ynZpAAoJEPcTqHkQ/eB1+gIH/055
+hND4xOZqJo/+5AgkLx5f+M164bX7/WZVaSIDZbYF3AwCejYvdxh6e9wJ8ZP3ZyID
+jNtAEwZDCtDWNPUod5cgO2bVtQmxbIRXi7B1Wo/IaJVSbdmbWfE4exXiOumMS4n6
+oDYGOxVqUD4NkPbc2RxL9dKpF22o8+VUMwFOrClsb9X0KOa6FpHetCCyQnxsySbk
+wsT3ATCa1lpkaoWOCaAIAi5lH1eaxWvf4PbChH/E5NknS7y2a+duAZtZSKKzj6MI
+MpdiAk8tAF8wlvdZ8aN7BGFmX90evFcw+U/oHODlFog6yGNZIUx70TPVR1zdhgxw
+aCUmp4RS7vZA0tI8aBSIPwMFEEBfU1zMsutG52z20BECzRgAniaAcrtVanVO2Qrl
+0s59C1Fx+um1AJ9aB64YaNz6AYZgKfF+hsIldgp6Z4kCHAQQAQIABgUCPdlGwAAK
+CRAkDmb8xZwycPc5EACzRyV4vUKrRtXKx5mdnQ0IHx8d3x/qcIBQ1Y/2QM3LU4DR
+zeYV7fV8TIv3iBfxd1625BOx2LAbQ8ElDl7PLD4E/29dB7MwhtYJjqurR5yOh+6n
+nWcvJoz8owR6hS2DJ/i03+A9dzn9YpQRvmMOnACVrpL7IZZ2V+Kqk4TN3G4LGSfd
+LM/vpYsb2Ghqr5MQ3/F89LxuJZn74m1dCvCwBAoJf2RQlNesIb/irMsfU7Y5Fs0h
+5HHONNdiwTGIO7VEHyWvJlQ4rMSOp/rAw8k5uAdgHK6SMn10ogEj+qKUOcnHSeqg
+hXnFBorhHdb3Qmqc2s30b/YtItk5EIyXsARV6mdr55wtn0hp3wX8d3ct0zcMsYsl
+IlNuAXqQUCH2NO7Yjz2LF3K0A3cBz+PcXGjkXD/bUPsZG1DhbDwoxh8YeKGXZ0k4
+MKeb775EF5jgMT+cArHqi/OLqs1OcJNjYy35+plQSMSM0BPCdk7P+bcf4YOGRDei
+AukLnA+Dkl1CAzBDhFS9y231tLfob7w9CMoAXXF+E8mAG0QuLpVMta/JgMiOx3O7
+xs5t5JWOMIdv3FA8tSNdiviA3DIr1nhphoLu0mzGlD4W1dyczh5MBx8kCYgS+nS3
+ASd8NR9OSYuelOsRn0ykyThbVaewnY8VrwUsmp5JOCXAPWj2SOT7KQNmRa+GPYkC
+HAQQAQIABgUCPqRYcgAKCRDNY9HdhPkmT/o2D/42zg5Qwy77OvS37qEO371dsJsV
+IUSSi1lb9s8+GlwzyufGdlFkhgQ67q4vI0esl32DrdXwA4aVfuwp+HXj1nTuW0l+
+otOnvtt2UWtZgHHlVl6LLfGxMM+Ez1AaXym934adTRwoJ77jqeNO/G1t/Fvh8Cws
+8bM5nIOvcFYVFEF+67DFsNgiEjKztICy/0nNSWOE07vWWOXXsQacLemPRsG/zRVd
+45BNib5rBCLQFLqA5D6FXO4PLXCNb1ltsJENs/mN+MseihtQ82h2ENALOEiDCuOi
+f3D8bX8ZY+BwLbQn9iROzalaj7OJIJitAGfOFrdvD2Y6cZ8puakTYOzmBALPmSzS
+kViEMrjnUQoTxSK9fu9DCQ/UfUpDLuec9rCPrsJl2cQxW+rZ9UncxaEq6soa9ccZ
+niO2y+0R5b4hIOIxO9quZnYwHwdE9bIeEfjAzAN3vCwQh2VEkaL45qpGJdenwcc0
+yiayliiYVvt0PA63F1Hg7fpirLceJNtWW3u8Thiz5RcsDx0PxTREiixjhTPtCc1X
+Trv3QPR9QgGBp5W4Zd3xYDLrAS8+2ddlLIobWK7YEsr8s7aNce26FXwJRnnPeZL5
+LUkCXXiIJ+LZAvyWnVEOS1qNtE95HSTVZkhkUYxDf8BHchuRIFvlIVajKz1CuP9x
+mvu7WjsV9D4weEcJZohGBBARAgAGBQI9e3QXAAoJEAkiEpbxiQSLJXwAoJ0zFfYi
+1mAUhrWxvZW+doXeuDvxAJsHdbykofeTkQtvD9CyjO0XdF2wqYhGBBARAgAGBQI+
+pFcNAAoJEDGGzQRPCfBVWkMAnioUdcTH1PuioPpVojukOAeUH+AvAJ9EXXfWIgsa
+tgzCTDaPFs1lzFqe+ohGBBARAgAGBQI/whdoAAoJEInYTK9GsmLGTyAAoIVutvAn
+c0nj27Rqp+EYbx6YsbsaAJ4p7w/+fZjEa0wsf5Hy1r82UxHWg4hGBBARAgAGBQJA
+I7WkAAoJENtdJwgR1Yk9XmQAn0rLEaoX4IpXbDbVM1Yxf71vvgVZAJ9XMdPdVtk1
+LpDO4qv83rzLwWwo/YiZBBIBAgAGBQI/ym+aAAoJED6Pt/L4g0HZQp4D50gsuxjD
+1o0ZlS8sNxNhZHgaxohzBTgavEIY2ltnNUxshRdMtoBMx9tVvmZQFI4Dil57m4WB
+9fE0eMI5yQSUcVZd/Wj56uyrb4xwcZfWxU3k9uChf/eyqpEtH/V50DLdK1WUgGVU
+ndcWSNAPxKgCd3RbUxAEZx7B9zNf0I5GiEYEEhECAAYFAj3iURUACgkQiNfNvfQ8
+L5IdLQCghH3YKiAJRmA5vSVPqcDrGY2/jmgAnjBuzJlZtfpu7Q8twmFpXf2Fcbv2
+iJwEEwECAAYFAj/CgYoACgkQN+P0X+5l4yHW2AP+NpYD54gNj9Ll96pKXeEH7+Dl
+XNmeZwQSyY5F9V4luQaO2Qt15O+YK9eHOMnb32U2bwOo/LrDuraC0L63EOFalkNU
+TkRHXLrt5uZc6+Jz9KhoxNcv5rtoIKsi0p9a06d6yx3ppkfZHwqIxdAC8YRAvyhe
+WeZIZi3phb1let7y3F6IRgQTEQIABgUCPaRG0QAKCRCL2C5vMLlLXJtyAJ9N/nWN
+2dCv+92Z697B/SSJyvoLvQCfaI7sopLLYw+aVPdj4vykTZIdwJKIRgQTEQIABgUC
+PdiF5gAKCRBmNbbA3ohd0+P7AJ97IR6ryjBehFyut0EboKhdVN4mtgCgrwnqzg/M
+f/+142L7aT3TeKYKfKCIRgQTEQIABgUCP7ppgwAKCRDLMqEHiMOlpTTXAJ9GxCno
+937c9EpYtek6c+RkrheWNwCeKWKyFYAjFklOk7J23KII18XNq16IRgQTEQIABgUC
+P7qSXgAKCRBc/Tf6zHjIk9T+AJwIbe3CG+SZEyz6IliuRTAs3R3V1ACgspn53noF
+uYBKawQvI5718Di+BpWIRgQTEQIABgUCP8HFwQAKCRA2FSLXgqt70U9LAKCoGLVF
+3oBqemNHB/VMvL08pmRT4wCeKr1wCr+vM3wjDriHf5Xx6FEoJKuIRgQTEQIABgUC
+P8IaZAAKCRCJ2EyvRrJixkInAKCF5uuqPNCP1F+m7z9fR/nIJb3qeACfRcJhJmXY
+lNNLonnExeQT0hjOYYaIRgQTEQIABgUCQBXUSgAKCRAVP6DNdaZ2kndiAJ9eTafo
+NOGtPDsjQQB/LEpX8Nqg+ACeKEqMt8CgNKCBqQE2DuxjUOY/cjyIRgQTEQIABgUC
+QWVtyQAKCRA7KW1RzBhaO3XNAKCyI2RhtJ1IFIjJd8STppArFxLjSACgkL809tt4
+gdjw0ocpzW/9OzY+QQqIRgQTEQIABgUCQWVudgAKCRA2Or8wn8PVfj9EAJ4ltkHf
+zOrj1LD83ArlaUPP6Sy9eQCgqIY4Nsnrfb8h3J1tgQUPDxiQH6+IRgQTEQIABgUC
+QXA6EAAKCRAPkZbeblLCnjRnAKDlCfbsdTR+la6YbpNf0Aq0+DH3xQCfVuKzP9Ws
+0sSX3UklvGJAYMmYbN2ISQQwEQIACQUCPg03yQIdAAAKCRCL2C5vMLlLXPO9AJoC
+/yIz2xDEryTy37M27KTIAheuwACdEskgLXTBtz28QrFmPFx2OVg/lT+IRgQTEQIA
+BgUCQZomGgAKCRCLOmAfCMl15W/YAKCtdn5CG/LaBJ7DjRV8N5XjK8JxggCgnq7S
+lDL+JQGB6LRBL5TdcXas/teIRgQTEQIABgUCQaJZaQAKCRAEl9WREr/nmpBNAKCl
+/IZ+aETlq3NzYHkF0KSdmIrvKgCfSjDLzQWgoUDTLX0gxfXh1+0X3PaIRgQTEQIA
+BgUCQZqIKQAKCRAwkXlyKYvH0LwOAKC2lY8Ulzv7vv91eORNdJr4GRNAkgCfZJgR
+MWXhcilBCSKpKbQhNWbNBdWIRgQQEQIABgUCQZlVcQAKCRDJfFCWXBw61y6gAKD2
+jC8aqDOejUjA3krguJUQcdTvawCfT20bNihqtriktT6pjZcSLRJAW+OJARwEEwEC
+AAYFAj+/wGsACgkQBurPqnbYPMYnvQf+Mgvva9ljDjZXI+kLdEnPA86EHnANzh1P
+4VnC0a0Eq4o218U6C+9oUekhwz4wD2jAZUdoC4qwDtrFtHh76hDycfxciw7QgTbi
+LNKBD82a0P+ZuMFL6omfBzoeBlvswvvg/G+1LBSSPJTHV9nOpgoSDFZcKfrcX819
+KrKxeKGJXUIbYsOhX+PVNSGzPkNGjk+8jxWM6SiueIpQUJTQqa+9eKcR8/YuLmyG
+RhJMQrmJO8/wRFqblkOwASta18bdgYNHDpQuvRWgLhqHLM1P99AKaP+qGmyXP2qq
+DMh5Zy9TjRo06O0CiGPcioQ5PDDxrqnhqxEYQuwrvXJDFSvuj7BCqYhGBBMRAgAG
+BQJBmpTQAAoJEMl+nKt3dbR5MbgAn0YbFWKhffr32B6yuApTBZdXEkHRAJ4qqFjW
+qgYqBJx8XS5AdAY9dY65n4hGBBIRAgAGBQJBowIDAAoJEAdhc7GShMRSdakAn1TS
+35CiLVymIbX8h9mP0a/6nog8AJ0eibyHC9WX/n0FRiGrjvlvL0eHP4hGBBIRAgAG
+BQJAMBtjAAoJEC6L0IDMac7t4y4AoJhqI3bieTdIsLXoAkHPNQRljxaUAKCEgjL7
+xBbbcAXM8x4RiRmWZY2uy4hGBBMRAgAGBQJBmo0OAAoJEBdq2cjRqolikOwAoJbo
+SnWnLET+R/tlHslqWcek7VMIAJ4rrxd46qybfMYQHrrV6OtCS1v4w4hGBBMRAgAG
+BQJBm86KAAoJEF1BSuHgBcnLJdAAnjCisIbl9GuHD9qyQC5L9w1575xLAJ44OKIf
+WenBu2WzkBW32n5EnJ6pgohXBBMRAgAXBQI6yh52BQsHCgMEAxUDAgMWAgECF4AA
+CgkQW5aAEOBPmomWqACeNI36SXKcu0TyZGCk2E9qSU6Op1kAni0/pV25oQZXiEzk
+pFjt0Zvk6AXiiJwEEwECAAYFAkGZgZgACgkQMaY9luwUC4GhxgP/czUSd2of63/G
+3ldibnJrhUDxV3tHkkGkmi0CfwNf2LxE2VNwmw+ZZpptz0G2j87f/jBv+EBaPSRV
+yIbXe0kBwRwQ+kiTiIWyATPNN7yppPWSkyyQA9UrnzMzGa4fKMVYN8iNi0xG1fRP
+2WdVgGsz+rcOmpNo8hW6jo/ryNSXTD6IRgQTEQIABgUCP73P3wAKCRC+uiuH9fxL
+Qh6hAJkB/2nKwGgFeFEtt1cLtGBb1bsEAgCcCtguj2Eeqt0zMkT/ZBFXrwZryx2I
+RgQTEQIABgUCQZqKSwAKCRD8D4WJ+JS+EmvcAJ9N3mAC14G6QJaPYb70PnxkHjoc
+dgCfWC3ka9sEtarAymMa7MVdUocN0gyIRgQTEQIABgUCQaF9VAAKCRDLuVBj4NR3
+ba8IAJ9ixzfPZAwD5mSqmXtlW6tmYWEpGACglCCsKNik7J+wNiD1kxsRsgqQmaWI
+RgQTEQIABgUCQaVY/QAKCRCXZ4pyLS2qUrsmAKCwtWTP7YGz/T0P2IsUNByypl6Q
+2gCg+heYYJOVlGCLVfd/hXOncYKduNKIRgQTEQIABgUCQbEYDwAKCRDeooc4Mory
+BKMZAJ9q2Qrztrh7kZm1g2YhZVSHnVRALwCg3e4qeKmDQDPC6A+MEjyRzP7Sp0eI
+RgQTEQIABgUCQat5ggAKCRDOAaR+HEPYUGjcAJ9l7+VtHy+N1GPZXlcycSecdVCD
+YwCfUUytcVT9mzlkKW5SYDFh4rG23bOIRgQSEQIABgUCQbo8GQAKCRABBWa85BNj
+kuruAJwO+zspSq1zjUsQR2raH4pZ756xSQCeKX/+pYQYxPjDmxcWHcNbUb36PHyI
+RgQQEQIABgUCP7+tlQAKCRCyvrxAFSkkr9upAJ9NykpPMb6dRQ9FqwvweU/JXWDl
+GACg5zIfIAa9xAbqnCGziPwyKHF80PiIRgQQEQIABgUCP7+txAAKCRDBHntHlk8x
+2YmVAJwPRpDo/Nd3G3x/H+PjEOpq1QTFbgCfZ3O8gup1FVTtBlVEm+A1bQ1UqQqI
+RgQSEQIABgUCQeL4iwAKCRBMxE0AEd+H6YdpAJ0fVSCcrYcHXNGL65AsRr+6q197
+/gCfcKJFL6ZjOQ9jTju4XZ8HBoOQdDuIRgQTEQIABgUCQc5IFwAKCRDBOfFTI8t6
+Kuk0AJ0W/8WdV3g5G04/q6KODnQeuRBjiQCdHIGVdz3D096jg4ecVFkbiyVbS02I
+RgQTEQIABgUCQi4igwAKCRAC45BR5YCzY+t+AKDq8sy+taTxZ/Xlixt2U1A9jJF0
+lgCgnKQ4szOAerQOkkUH9KtVH0IBWDuIRgQQEQIABgUCQtzkdQAKCRDsqw57g+au
+DRMTAKDMYhafsynKXcWd/TMpNLLFTYSoywCgva6DByBZUrSmHQ0RQsrREUXhrAeI
+RgQQEQIABgUCQuDZHgAKCRCM43a4HNSGH6IVAKCqzk+V4RY4iKcXd+q4gDEU77F7
+7QCgpsK7JxEBCcZLAwSu78+v1Sd1LnGIRgQTEQIABgUCQt6wTwAKCRD9b4jGIdCn
+G9d2AKCOg8hb2mcwgTrwmdw3r/AlCD4kDgCcC/tJ/L3m8qxXeWPnqSOfYV2wuR6I
+RgQTEQIABgUCQt66jwAKCRAyyeTONkLLS3tNAKC3fajKlLewGgI19nqLS2gCpUZ1
+KwCfQBZ6gQ2fBSyH0GM6FUwQMpC1+wCIRgQTEQIABgUCQt9s5gAKCRBQjq7FMC2l
+aF77AKCugNqDPjHcOQMT+SXb0mOgUIVinACgg3m8nB/umwcl0rCjj4dTJldECuSI
+RgQTEQIABgUCQt9s6QAKCRDdumS6LDEtL16AAJwOEHZyEsnlLhZ8EPaDR2l+DrTD
+WQCeOUP6WWydX0oScKgxvrxQelD7mXaInAQTAQIABgUCQt9s4wAKCRCazTzAqZ91
+3YNEBACGZdqQctLIW89il1EOTdaETEFiBOZIgrTuMtbaLKCWjVLEZhRXwP7YOmG1
+VQ0/oareK36O0J+0dXQ/datCWbq7nKg8ah6v7OgsoSaL4SDbkXJRomJouE5+Le9p
+weASnNSnzXDI3iT4/VLNziNS+Px7MvprZfWqW7EtrWcZFNH8u4kBIgQQAQIADAUC
+QtEVQAUDABJ1AAAKCRCXELibyletfP5lB/9hCdsNGnB1hEFuC2MKOAxXyii4WUSh
+SZnAGU1KFmgPR1VT7ansRcfr1M7kAWadgbvZMKpiMfw/YUoDk70S+HV33klqYaBo
+G/ys8tlpB06wXLBgOG/ZXsgXVcfV+gKhBUHJ22yFyUGpwUE6841Z30P6QPEnGlnl
+OaYkj2Bzsu8oJ+v1zPjQMQzbWXflg/9qVm6GSmvkHi71uExVd9mmyXriK7AzgEkg
+fRjIsHgaHRANQgEHXpQIYb74jigpaZ58/iPsBuaJvtkU3D7K/pJh8ykVl4iogY2Q
+v1L4iFpwzJ8moXFZNl6/8WQKyclu4hvetUjqVhdv+TDnloY9IfBYzYSviQEiBBAB
+AgAMBQJC0br5BQMAEnUAAAoJEJcQuJvKV618RZsH/04shIbSOSb/oGQBKp5o/jZf
++y22LiOcvYuTFNmW7sC881yyWOAOXzvNSiqpLVBv+nPbNX2Zhu4JFKAcx+iD0E27
+8LuQwHt+mzYHg9jIacDF3gMPVMNUcWkdDcjilU8F01VuLe+EbtzPAv3wzH71njl3
+vp8hRhtJQ2Ljxd8rwtVmY+wj82+itO62bBI0R4jbPREA9FQUzqqlU9e37F5xyHeE
+GGFQGUaNNnU29bvZNhooF3Bp5n7nRbub9NH4NgoDSf4LIUhcJv5iExG2FgnnY1Ge
+1zEs2hjLlF2XEDaRZzuABDZkL4Cb8GB62YQIp+1sr0j1V+0phAKhuU//CfBZKp2I
+RgQTEQIABgUCQuDsuAAKCRDJtabs4td032/bAKC4/52AK7s02dRiB9TEyU1BTtIy
+jACgj0K7oUN3EdbRpvq4JztHnOGYNKyIRgQTEQIABgUCQuDtLQAKCRA39o/1AVr8
+ihrzAKDtlkrBk5yLVlFmB8cR9kXRdjw4CACeKxN8s4YBIhSi+dogdt4aBUz8j2q0
+IlJveSBULiBGaWVsZGluZyA8ZmllbGRpbmdAY294Lm5ldD6IXwQTEQIAHwUCQY74
+FwIbAwcLCQgHAwIBAxUCAwMWAgECHgECF4AACgkQW5aAEOBPmonYRwCglIthafvY
+gHvdYcvlQ42kkh16xq8An2KEveQwXY/rxzIfVdQOnXaPEMbLiEYEExECAAYFAkGa
+JhoACgkQizpgHwjJdeXLRACglVV7g4bLAU4cGCtVk4tAmZXpJo0AoJB13hnyxZ8L
+YaDz34DLslck+NjuiEYEExECAAYFAkGiWWkACgkQBJfVkRK/55rWlgCgop+hFNtg
+2mgo4QwbNpekeoF9+W8An1NNDP5O4HefD+V29AI1bPBkFo/AiEYEExECAAYFAkGa
+iCkACgkQMJF5cimLx9AyBACeLg3ys33NRvTcf5syppUh+9QDM6kAn18oB7U//NvK
+C0UzaU41suy0Gp7oiEYEEBECAAYFAkGZVXEACgkQyXxQllwcOtfSwQCcDlcuiPiR
+wtT7AQhYbMqqQt7cP9IAoKvtg9RBPm2C9ONLi1ZE5mPU2Wr6iQEcBBMBAgAGBQJB
+mUkOAAoJEAbqz6p22DzGAIkH/RANUKVj/mKV5ymNYV+2TLQdgRLLwf2Ilhh4x42+
+S9ugvOt9r010E7othLiRK266VfwhL4Mf1xT9tJolQtnP2VlGc+38URqYzr5aiwEO
+i5DKVPwZLf45Ih/+QYYaqetVCqR9QgxA00bNcVX520l2dp5nPmidMlb7SiQfLcsK
+/wUf9HV904GYzLPdNLMAo4AlPcC0ercNNAmJ7u5eR04RvZH3vonsvbLYAdv6HMew
+Gu87apHbMysxYNEFmpOTLqlo5L13DUrrcqUxA5kcu5h6j8GLRd1ClrB9JiJy+i/+
+UMGHIpPML/F8Crn/q4uN0hO4ZctuXKbMcRRqbQuPbYdiupWIRgQTEQIABgUCQZqU
+0AAKCRDJfpyrd3W0eQJEAJ4nI4H5yMJfhWdyRRY3Mk52n78ItgCfRNwz3MAo300v
+Y+akLcBAfwZVAdGIRgQSEQIABgUCQaMCAwAKCRAHYXOxkoTEUsX5AKCJwjAIDWv7
+x9NihTSYNb3ADNoPAQCeKHIXbSwKUmElwqVOJjybOSkc2GyIRgQTEQIABgUCQZqW
+cgAKCRBc/Tf6zHjIk8EJAJ4y9C4RTKgDIEfQEOLy8o8t1YL8WgCfRRLfkgc80b5C
+6bQwqgsPqVv0Q9eIRgQTEQIABgUCQZqNDwAKCRAXatnI0aqJYgsEAJ96xxxx1KYZ
+wWqu2ipWRgWGfFBnXwCeLHiXZwaFmQxyPjF0Y6/tMghg2kKIRgQTEQIABgUCQZvO
+kwAKCRBdQUrh4AXJy2jEAKCRhGu5f92Ih9S5+dwJ8LXiVc2IXACeP4/RMeJOqVP4
+2X8tru8WO/zYVdmInAQTAQIABgUCQZmBmAAKCRAxpj2W7BQLgcpiA/wMi9uNybWt
+sUkqMP51apjy7TAzY1DeR79xYyGy6E9+SWUJrUdpNQEvnCe65nMTFMZZkcuAkgGf
+aUpdxXsElt9N/cJmPyrstjRPsCINx3smRXLZfSAJdBxqfYjjxBO9VP4fc0CVsDXK
+oT9IYhO/0SmnP9g7P8SbEDIrtngZW7x/MohGBBMRAgAGBQJBmopLAAoJEPwPhYn4
+lL4S+IUAn3+70bfqGU/TxmjBV6y+UHaDr/htAJ9kS3gum+7tNmdJAqe1Ciavd6tj
+y4hGBBMRAgAGBQJBpVj4AAoJEJdninItLapSQyYAnRpjXaBU/YFfE/wzp6vo1A70
+zc4RAJ9KTuhI7QrSpjw1JCHeTxlR7lWxrYhGBBIRAgAGBQJBqolAAAoJEL66K4f1
+/EtC8QoAn3BJOW5EsHdCiTn471tOOK14QAsjAKDvJapbKzFtqjqGnYw2PWFEgBM/
+cYhGBBMRAgAGBQJBsRgPAAoJEN6ihzgyivIElLsAoJBsB4geBs+0jWI68y7B++HO
+4191AKD/MBrOIS3Is3BQieJvW4VsmPnaGohGBBMRAgAGBQJBq3mCAAoJEM4BpH4c
+Q9hQLtAAn3QUB+AdMyrhrH9Q0oxH4SXMN0VFAKCJHawjZ8I/DEOBjFPk6/VvCCjY
+OIhGBBIRAgAGBQJBujwZAAoJEAEFZrzkE2OS0AUAniHEQ3sRR6jR/7pXvLA9+sEb
+sEEfAJ4mckbMJYjC25GEYY/mshzavDq4NYhGBBARAgAGBQJBsBhUAAoJELK+vEAV
+KSSvDRQAn0Il+opfKW9MXiBtmmkGw1AooD+YAJ9JA6Y1a10IpgDiaf8PT8eNeJkr
+vYhGBBIRAgAGBQJB4viLAAoJEEzETQAR34fpN/gAniYfvgliN9PVsZHLE6lrxhMR
+IFQuAJ0QGzJtLUn2Wc4BiXb3kIFqGBQ374hGBBMRAgAGBQJBzkgcAAoJEME58VMj
+y3oqex0AnjOW+na6KMKM1oi/K9HSXCwyeTHfAJ4hSZuvs97N+Y5m7iPkr5fbXWyv
+2ohGBBARAgAGBQJC3OR1AAoJEOyrDnuD5q4N8wkAn2aRsbRUXZE4YxcWU1ShUJ6J
+/8pWAJ9oQvyzkiqk93vNJMw1hXOC3oX1b4hGBBARAgAGBQJC4NkeAAoJEIzjdrgc
+1IYfzPcAmwdnttRdoFx7LLzvKsx8gEdKKoeJAKCNiWCu71cp5Q5MGONEAmHiw91+
+FYhGBBMRAgAGBQJC3rBQAAoJEP1viMYh0KcbvPwAn082hYWUPqOUZVSVZDcWbvzj
+szKWAKCqVYxFZlWxP3ocJS1FTg8nwkAVs4hGBBMRAgAGBQJC3rqPAAoJEDLJ5M42
+QstLgrIAoIHjFAfBlsvQZCiBzEetlYL5iBOHAJ9iQfuFs/AIsuRAka4YjVgCb7ox
+DohGBBMRAgAGBQJC32zmAAoJEFCOrsUwLaVoATsAn3L1nGKnz1jIiUfZZDSQfGRJ
+sjL2AJsH7D/rc/ovbhHGoDFdHfP9WllqA4hGBBMRAgAGBQJC32zpAAoJEN26ZLos
+MS0v6cIAoP5oa2V+9TXOB+qXe4eTAiMUk3+gAKDgXYJs8iV6udwIYaq2d5KUY18Q
+bYicBBMBAgAGBQJC3seiAAoJEDfj9F/uZeMhmxcEAJCbwGZVbVmw8D7+nbiYAWdL
+4QUTm2y25Mest45jxpHj4XvNv80oLhh8UrQGMZFy4ydmi3lfQVerHl7QZ7In2hGh
+9ZDF6jAMDfR7pC54J55USf3s+PiMadqzTiIThdLD/yTeRVUn6KUv3RlCGqpfLh9X
+k/paB1V26Wpny6/A3MxbiJwEEwECAAYFAkLfbOMACgkQms08wKmfdd2KogP/aKPu
+QivvCNOg0smXso+p7RyP4imM2fnYfZKyIdztxfBCYPP02qClRBspmHmhLvNgZ+Ih
+PUm5lGodC9wYbcSurkpfRXDX8ImDBCZRJJxOmsD3qV5xQcmIJt35QiylBRrf/hBU
+yh+yeFGhebmplE9bAfo1S+B7azzdVtTCZlITCOuIRgQTEQIABgUCQuDsuAAKCRDJ
+tabs4td030I8AJ4tY6o5CNXMg85r9sn/T1XgxCf+JACgm3VUQb3crIBldo4E7ELs
+OlWKTCO0I1JveSBULiBGaWVsZGluZyA8ZmllbGRpbmdAZ2Jpdi5jb20+iGIEExEC
+ACICGwMHCwkIBwMCAQMVAgMDFgIBAh4BAheABQJBjv4aAhkBAAoJEFuWgBDgT5qJ
+GNYAnjO6NCBUeUnbCfpLr/TT+V05Ai3NAJ9w9U+xwdJqrNblobxTZofw/Zb394hG
+BBMRAgAGBQJBmiYYAAoJEIs6YB8IyXXlQO4An2CCetfVTn21dtjauCtRmqbMATLP
+AKDZtmMzLFJGQtbGUuhU1bcb+GY1IIhGBBMRAgAGBQJBollmAAoJEASX1ZESv+ea
++KIAoKGdYYE6onP/naeAMIc9Ik9FlW3MAKDDJB5Yv9rdMUGhVbqtYf4zQuBvRIhG
+BBMRAgAGBQJBmogoAAoJEDCReXIpi8fQa+4AoKaD1nsE4UgDubabko3KGfJFoedY
+AKCEF53SoAmE6PbASnDJ9Ik+fT8t5IhGBBARAgAGBQJBmVVrAAoJEMl8UJZcHDrX
+mOEAoMS0ZWF6F70fDvqFOieN6OPLnxTOAJ9aHvFmaoVTreA5jh6uh6zi8lljvIkB
+HAQTAQIABgUCQZlJCQAKCRAG6s+qdtg8xoZGB/9TcMq82G3eLnFDST6aPeoTCI/P
+DXnjg0INoWDyDXWrogLTGH4Euy/A6Az2qjWNBIE4iDT+OgeWFgGm5WHMxsAYAjzQ
+Oo0myVPJqxTGpRO319NI0Z4yyNDuIpsIz0wGWrN5OnOykZvOBRyMTR13bS8Bbsez
+gUdloa0MrFknJ/4oFquLFmoAHPeR7uulzaU2zyXvZ+k30DlA+6XfvOw7zOQaiAog
+RXfTrqEORmMpJqm6CHYtE2agnVHWnjnbCnOk4k46JTakGxag+yRwrpvsvdb/W4v6
+U55Q3fUdANOjHBmav3i8Wtf4K46sbYmEmqjexMYMsmhlONt8xxRPGsTbnFNkiEYE
+ExECAAYFAkGalM4ACgkQyX6cq3d1tHn40gCfadmQp3jfm8qAHtMF95jAGL69z9wA
+mwd65tfWocFWyOsx5WmfWDwRkKY5iEYEEBECAAYFAkGeEXoACgkQJ0aiJIc88a0m
+zACg6RISZOTkaIKTsTXGdO9Ief+1ixEAoKQ/B2tXzDwr03+cZ4mUHM8ZgoEriEYE
+EhECAAYFAkGjAgMACgkQB2FzsZKExFKhwACfVcYhM+6DVpb9ezMdt/D7suT+ui8A
+njQLpOz/O8xZJ+YfrXiigwkhJHp4iEYEExECAAYFAkGalm8ACgkQXP03+sx4yJNy
+YwCeOrQVc1LgdZsBzwBf+e7x/0/atbsAnjPuftS2naF3js1ZJa2Zg4mH3xM3iEYE
+ExECAAYFAkGajQkACgkQF2rZyNGqiWKSyACgun9gfZ2906QTXzwVKCyc7gCe8LYA
+nA1OD8ycF/voOHhnIUTUeD9gDOE3iEYEExECAAYFAkGbzpMACgkQXUFK4eAFycsY
+8wCfbkSGlU/uTfFCixTZw5T8/qHz2bQAoIFN04VyQbl3eTwZrndB6RGIpwhRiJwE
+EwECAAYFAkGZgZYACgkQMaY9luwUC4Gk1gP9E0ctfYyBxSYLf4BCzZHrf3LTfErN
+57cT4xJlZgoPhu+QiypAGvBd+HzJIypfk2xtMBmh4eVC4h6xEfayKZYiUQcXM5um
+qWPoejwypfiEirKMzyyBhhiRrhX101ZsKU3H1WT/hoDW1Fj5QyQHdU2Cy3H/N9kJ
+ffPvDYtwbBgc+2eIRgQTEQIABgUCQZqKPQAKCRD8D4WJ+JS+EsitAJ9WzgasMNX+
+VbNkCFzu0PKB3kRGvQCfTvBTqsCiJ7nSMjyQ9PS6LQO5MIOIRgQTEQIABgUCQaVY
+8gAKCRCXZ4pyLS2qUlpMAJ916tBgim3Jn+/NwDv3xp+MyEJe4wCgwawHk24C8hMG
+lid7m6TeifMHe2CIRgQSEQIABgUCQaqJPQAKCRC+uiuH9fxLQtFRAKCTwt7TpFr2
+QzGZ7zd65bMxqU+GPQCfXtbuVrNOb0pOW2FHfCsZnQ5Mj8KIRgQTEQIABgUCQbEY
+DAAKCRDeooc4MoryBBQ8AKD8Vak3rfHFjimL5Q9pR2lLGY6cAwCg2n4JgEHjlfOF
+r3hUjkpETcG4xdyIRgQTEQIABgUCQat5eQAKCRDOAaR+HEPYUKVsAKDCmpZ8fmUN
+EuXCyoL4Jprk1k2rpwCgkh5iH7bQc+nrct6qg9rTRZXJRI+IRgQSEQIABgUCQbo8
+GAAKCRABBWa85BNjklhbAJ9k0oKaUQPE/2wpEw4filsdii+qxACfVHxThFduOA0h
+sytzvRmUPOeNrJCIRgQQEQIABgUCQbAYXgAKCRCyvrxAFSkkryVJAKD7GQrehzhO
+noT8K/ifs0dSiBU1QACfTufX2kmNV6g9+2fBny01e75IFHaIRgQTEQIABgUCQb40
+2gAKCRDoMBhIFqjTqysKAJ96Ou8DkmXiL2ouHaawKxsXTeH3zwCfZBKeJm4oIEF5
+3QuB+WPr/tEnaeWIRgQSEQIABgUCQeL4iwAKCRBMxE0AEd+H6VTIAJ9DqsVxJS4m
+kADD5Uml2cjK2lk+QACfU7Ggp2szss9E8mY/uIH9NEvifDaIRgQTEQIABgUCQc5I
+HAAKCRDBOfFTI8t6Kh0kAJ0Uky1vHTiKQehy0Q0VYDtE7DQ+rwCcCLaE4hsCzmk0
+P7Xes3JpFuMnDx6JAhwEEwECAAYFAkGa7kEACgkQJPjfwmx8T11ZCw/+MqiwBNEF
+tGJOeXbMN88hfLeomTcRmnewd2QFtPDvE3zUyCOr+O3qVweOHH5uSsc7L/Xv/in5
+kPOU8QgGh5m7ChfKyB8t0MTmYZtQ69Dd68FWZOW8lMmrwu+NUyQ/FAcM7CHidkaf
+sVHx2EE6in9W8tzlZWQBPQFTQfKGth9s/x+UHZntwsKXfQE9KZQUu1XW+LeKmCP8
+wfCKSCoSe2wVTecLSBNSUfgLm3lU7W8JuY42PsjOnDWrhH6nA1HJKVWL3EnE48LY
+nU5fwyfUvOjvK0B3ieq1U0wzQJfp3Qs/5YwOyZj5OCn4+mzuDELH9ewvngIm4JkC
+Pg/rPp59v4Ew4wQRQPdy0COEJhUoXhobNDcqsBBh5MO4IDNK1Wr6UMG5LiRZy+hd
+bmVhzudlgSFMozp46Ah0B0jF4SpQAbaQCkVGiR22SGhl9pIRPeiv4rX1mZHx8x0x
+yNweDl/xTgj52jalscmkvg9DjHY4KTebFP0fnJQ3mm5kBo0HVb724+dR1I8hcigu
+42SiLDvXY6dhO05N98jceSHEvqDdXjVcAXMjqA8LCYqaWbd75xc060Con0qK0ynP
+q5hqSWk6IRIAVZF1ODWqxWt+SihMT3s61sGfQopxcSjAV34gnECrX5FWD7l09Q/v
+nIULGIi2+e+kS/CuU1putPH2D5/kE8774/mIRgQQEQIABgUCQtzkcQAKCRDsqw57
+g+auDYfFAJ9hZL3fmrXrLx5NpEn8bBgW1JQ1LgCgu2Mspu0TEQEx/Ni/1P1uDGsp
+rHqIRgQQEQIABgUCQuDZGwAKCRCM43a4HNSGH3onAJ0fP3lBAFOp84iaeXIsTOnF
+NKH9UQCeM91DA4FnM23QPM+EDOC7aScpOyCIRgQTEQIABgUCQt6wTAAKCRD9b4jG
+IdCnG0kvAKC3AAF56eR0KVFsfup1sw5WR/T8lgCg3+I89dms6CEBF0Dhkt8AeN7w
+VCmIRgQTEQIABgUCQt66hQAKCRAyyeTONkLLS70vAKC3ZI1p4QABXJpmj6mpX69W
+2qjGagCfe+x+Gz86TWXrA4Tx4O9oh/6vqFmIRgQTEQIABgUCQt9s5AAKCRBQjq7F
+MC2laKc2AJ9OgaYLbOtoPPbCFLW0SV4U703ApACgqqiljnK1G4dStQ0Vk7hfRZw0
+rQaIRgQTEQIABgUCQt9s5wAKCRDdumS6LDEtL/bgAJ4jgI9x/ZPMhfH/EFL36fVg
+e3RvxgCfdXMaJx1Z6H1tu1YPDpFk0Op8OseInAQTAQIABgUCQt7HmgAKCRA34/Rf
+7mXjIfGOBADRGrzCutbk7Ls/BeqmEq2y7VnGaOHiukp4p7Giaj9tNnTZspkU3+kX
+vNkA8jjzoTYpU6Mv41KQuW7/7DfPhRRSgupJgQVlxqAM7b/aSzXBu6our6kdksH0
+m8ZIq7efF4cHsRb/12sAn5NRi3VDXGnnYFudNdYQ59XVeZFgNHAkwoicBBMBAgAG
+BQJC32zhAAoJEJrNPMCpn3XdS7QD/22wUAgq5s8YyWq3yjJC2fFQTPoc8mrf7puL
+8KK9W259YBUY5NtuAjkfQ9L9hNx90HIMsa5Tsp/StbKbaU+v80NQ5pXgd2z209Tr
+mPwgt5CHOnEEo7hp6hmhFeQMgwCLsMYmaWp7YYE/W0MGO+HjijHc5ynffubt4Vrw
+YOFwxaDqiEYEExECAAYFAkLg7LcACgkQybWm7OLXdN/sxACfaPr1gyfLBqufCBnN
+EiktSb7quooAnip19UPZQ/DF9PerM7WW0YE2X8xCiEYEExECAAYFAkLg7SsACgkQ
+N/aP9QFa/IpZbQCg2Uf6sa8Ls4uMwhd/gDJDefB/i4QAn1XFkAGlZKp6NT0cXwHl
+5g0gg3fVuQENBDrKHoIQBAD0LtmKeekw1walkGK8OAvKJpBT4Wm4AhPmnHNh3MFR
+jCAit8ULZEW0XDHs/5IHOFRpxyKKpSynzRNGGM2Yi9DvW5acn5H4Us1Vc8CBx1TH
+K+zC7AU7yS9TCR51VDPEONIp2mcd0eayB2R9iGiu9KV/Rj8+H//YGF2sCvAqXwOK
+HwAECwQAs+bNP78S1L78v4mj57xptLLWlsTxXkZd1JCiosXitNmGLYsLtBldAtlu
+XFllS2IjDZPV9Kp74ofgaO4wh01Qprk4Gn5SrSI7Oj6YH8DA/gggw7v//hEBLimN
+75okfqfzBhNTXNIxH6zhuo80RcfX0J/rZQ4Adu/aXeYpR7E36CqIRgQYEQIABgUC
+OsoeggAKCRBbloAQ4E+aicVhAJ4oVY04egiOWbZj8DoBLuPjiwiGpACfZTuOsSKB
+xkA8JT6eXcJrBJhGbcY=
+=KQRI
 -----END PGP PUBLIC KEY BLOCK-----
 
 pub  1024/E2226795 1999/09/19 Justin R. Erenkrantz <justin at erenkrantz.com>
@@ -2691,14 +2927,20 @@
 d6rncSGIlA==
 =SNQD
 -----END PGP PUBLIC KEY BLOCK-----
-pub  1024D/208F5064 2003-06-13 Joe Schaefer <joe at sunstarsys.com>
-     Key fingerprint = 984F B335 0C1D 5C7A 3282  255B B31B 213D 208F 5064
-uid                            Joe Schaefer <joes at apache.org>
-sub  1024g/ED4260B6 2003-06-13
-sub  1024D/F8B0462F 2003-06-13 [expires: 2005-06-12]
+
+pub   1024D/208F5064 2003-06-13
+      Key fingerprint = 984F B335 0C1D 5C7A 3282  255B B31B 213D 208F 5064
+uid                  Joe Schaefer <joe at sunstarsys.com>
+sig 3        208F5064 2003-06-13  Joe Schaefer <joe at sunstarsys.com>
+uid                  Joe Schaefer <joes at apache.org>
+sig 3        208F5064 2003-06-13  Joe Schaefer <joe at sunstarsys.com>
+sub   1024g/ED4260B6 2003-06-13
+sig          208F5064 2003-06-13  Joe Schaefer <joe at sunstarsys.com>
+sub   1024D/F8B0462F 2003-06-13 [expires: 2007-07-19]
+sig          208F5064 2005-07-19  Joe Schaefer <joe at sunstarsys.com>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
 mQGiBD7qX7gRBACxF9D8+GYaiLC/c7eyNwuxQJtbkm6myjuhUoZsG6o0Z4SPNqP7
 dlQn3uYIQeRrT3pZjXCpcxYAq10c2QpDNR/Ip3w20FXF/QDGZZ/B+DRAY0Te7jv5
@@ -2730,9 +2972,9 @@
 16TqlebaFcc9U6ObObw/A/4go6icBzpStu6wZzS/A7RzBfaRhn5wUjaVRkI4NyMJ
 TWBrCkVTwtnNxGawMZyxdwwCHido2SuGgp3vze/Nw0PX0V/QdJPvOA230dNstAeo
 KfMTki2MmCnFOZGSvznjb5XIOeVoUWYW5KeZd1JvFZbxbAdyqfKZV4M1LPZG/aI/
-U4hMBBgRAgAMBQI+6mHPBQkDwmcAAAoJELMbIT0gj1BkGigAnjaoxfjMqfG1EH3c
-7JDHKkJmLFKQAJ4/oORquEdlf3G5KxtLSYuyGEqemg==
-=4lbY
+U4hMBBgRAgAMBQJC3OzXBQkHtPIIAAoJELMbIT0gj1Bkma8AnjfgRtuon/0wgMZn
+GA2FZPS3vn7uAJ4xC/LsaX+zc3ON5nLs7sNBpV07tw==
+=8SJS
 -----END PGP PUBLIC KEY BLOCK-----
 
 Type Bits/KeyID    Date       User ID
@@ -2827,3 +3069,542 @@
 =oamg
 -----END PGP PUBLIC KEY BLOCK-----
 
+
+
+pub  1024D/42721F00 2004-01-17 Paul Querna <chip at force-elite.com>
+     Key fingerprint = 39F6 691A 0ECF 0C50 E8BB  849C F788 75F6 4272 1F00
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.4 (Darwin)
+
+mQGiBEAJtaERBACrYSun+13XY5xobkfAojSZXeYiLCGrqpRQJiRbSQCQEFIhCqTp
+5Q3q5wcHFqx9da3EpF9Dl9yw7BP/R1nvWw68/eGKMusjyvjF9vVKFFCnaB0YwWuh
+tViq/+OVnVrkPKNtpkBcg4Rl14tEKqOVRAMX+GaPLZTb0J4/rSfqWMitVwCg0ZfQ
+pHJRuYqQDMUlWlg5kdMAxl0EAIGHa1q5fx81qd4jOd39C9ujkSak0GTlTWQptvMM
+LrUbbC0YCYKydKK00QG5sW/oSZd0emdn/0ITaM3v7Pe/JqinaUitIBeyIrLIYKFC
+TIArG7mqCJWHmGXhG0wkI53T/yE0ErkgDMN4U3jTD2ZcbV+UXqygHAtR3qM+uIsJ
+H/hYA/wMj3cOKwMBWfac3i/mrnJVdOXMaXzLrB6EjISWRhQrrlKVBsgqkPEdKwYb
+S1hieaoeZ0UIt2T72Un/KUZinBYYGZAzXSFQNNqiyvy1v5WeVMjaEHOHHWLbqzX5
+3ycf4o9B802MIBS6F0UGpCAEnakZzT+2GG0B/z8RTF6eHpRBv7QbUGF1bCBRdWVy
+bmEgPGNoaXBAY3lhbi5jb20+iF4EExECAB4FAkDwYsgCGwMGCwkIBwMCAxUCAwMW
+AgECHgECF4AACgkQ94h19kJyHwA1pwCfYThV8T/7hCKtGOBUgVABymqtER8An1Dq
+UrHIVDhb8JkD/pXxjf1g5pVWiEYEEhECAAYFAkGjAIEACgkQB2FzsZKExFLdCwCf
+bxMTetsoC3REjFbIGddDZQOICUkAoIY9m2AOUZmx21CniAK4ihNq1As8iEYEEhEC
+AAYFAkG6O+IACgkQAQVmvOQTY5JrygCgiW8vzmmKQ3lbIRUpHyQ1D9vubdYAniuO
+5P3M5v2glVmplF2kma3lu9SriEYEExECAAYFAkGaiAcACgkQMJF5cimLx9ADZwCf
+WWqyc5FAe+exeZeuOzL+F2Zj4bMAoLVY32mEOzifj3gRU84v7Wm2HxAMiEYEExEC
+AAYFAkGaug8ACgkQW5aAEOBPmomgLwCghP2fgryoG0IqPtp9NHWIuecwhqYAn1M+
+VmigV5yC/PXqZXhxCUX8YTZUiEYEExECAAYFAkGiWNwACgkQBJfVkRK/55qYPACf
+SReNPV+c0HhjCPgRT9/oZLw/E0UAn3uz9WHSWqxBrmvpoAXUFlBGqYZeiEYEExEC
+AAYFAkGjS4kACgkQ3bpkuiwxLS+jzwCfeziDXPZWK2KIhNEYW9XnBxfRzPsAoNXw
+LWYxPgO35kBQ8KTvoJbta0HTiEYEExECAAYFAkGjS5IACgkQUI6uxTAtpWj2PgCf
+buJ0M+q0RjVJFZ9FsttqXzCYr8EAn0/J280RJzAAvGARJkRztdZmkC+XiEYEExEC
+AAYFAkGkL9MACgkQF2rZyNGqiWKJtgCgkf0628uDGiANtRsnVqTC2T0ZXbkAoIVp
+cBe1RZIrVZ3I/d1ZM07u8Rm1iEYEExECAAYFAkGrePsACgkQzgGkfhxD2FBqPgCg
+mtjV6A54A0n+cWj5QNXhNoUKLGwAn3FXjBUNPsEDliW9cWBYS6ceRF1FiJwEEwEB
+AAYFAkGjTT0ACgkQms08wKmfdd2zFgQAwloFiGEZ4n+WrOMzzT9eued90SSVW42c
+6JyJA+nChSaGtT50XBxXDHxWtr3rtleQn/MqnFpFdi+LMCREJzc3Og3V86M+ndj/
+6xftMyig0VW0lC8FvDu9WSso4ny3MZt2vUmOqUBH7ConCFIhjEdjS4dCuq1+RhmH
+o+R7TDImU9eInAQTAQIABgUCQZmBbgAKCRAxpj2W7BQLgafeBACXLa0nkaexTqjG
+EhG/kksIC3TXR6IiH4i+VcTzuMEuv+T7uDrdhZjc7jroeLWWl5XyLCASyhI6LP/3
+lrK+UdO3AnNA+PDuzVYqaC4dDMj9kdDbEzKYcrVPbKymuTVzR4l+XSgWz5kOyoDW
+Nsqk6VxuK+/KdnuXdZ8K938HVBuIZYhGBBIRAgAGBQJB4sieAAoJEEzETQAR34fp
+yXIAnj1YBCHiGmdN6GjkM4oTyvVRWhluAJ9yWdPGw5wrlsRtAl9WHVqnZ3iPMIhG
+BBMRAgAGBQJBzqlGAAoJEME58VMjy3oqkFIAnRXkYqT6dfMckUaBZNCi+V9zi4kr
+AJ9qKT38Kfs36TFRt/WxmFZLysz7D7QiUGF1bCBRdWVybmEgPGNoaXBAZm9yY2Ut
+ZWxpdGUuY29tPohgBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJA8Gcf
+AhkBAAoJEPeIdfZCch8Au7UAlRmVWI3GpMbVSxFf1w/jj5I3S6MAnRfzZ8URA5C6
+pzb5X+WecPVrON+TiEYEEBECAAYFAkGeEXoACgkQJ0aiJIc88a3YbACgmixFO0rw
+BdROgUtYIUlYBLxucQUAoOb2Ki8PKEQlMl+gpaP4qwy+3E5kiEYEEhECAAYFAkGj
+AIEACgkQB2FzsZKExFI/XQCfViYZu5AcqGa3aZynBgUAd9A8ekUAn2skGwDzd3Jl
+y14qCWF+qCNyyej/iEYEEhECAAYFAkG6O+EACgkQAQVmvOQTY5KaCwCfUwLt98Pq
+aVgks/658RVhhlUNqLoAn2RyNQ9njp0HEc0cjeowpU5s4BumiEYEExECAAYFAkGa
+iAYACgkQMJF5cimLx9AjeQCfSWiedjEzebbt7il5PXHgvJx40pwAn1bbP6iVk7yv
+3nM3xKTtD1mHWzr+iEYEExECAAYFAkGaugsACgkQW5aAEOBPmomvzACfY2Jx3c5a
+GKEdKJBazjboun4g97cAn3RbDFtb8MDJe5bQVQ3X/vysdAQ8iEYEExECAAYFAkGi
+WNkACgkQBJfVkRK/55qh1gCfYVBinwZQBDLLWdOhFf9wYWcqEU0An0k9HWExIUFF
+3uItQ+K9Z7C3NGuqiEYEExECAAYFAkGjS48ACgkQ3bpkuiwxLS9JqACgrZy8c176
+z1zxMnKVgiLZ1xjjaI4AoLeLarplmadavnMPcGhF+TXH4Q2GiEYEExECAAYFAkGj
+S5gACgkQUI6uxTAtpWhjFQCeMEJH780DFHpbXWSyOvs29cYuPFgAoLmUNcUQbx0c
+iinkYFD8VdeReHodiEYEExECAAYFAkGkL9IACgkQF2rZyNGqiWJ1UQCgs3YJAx0P
+6pinCMhzunuIJTVBbRsAoLfF0lN2LW6Cy6mHBMIG0YB9Y0zSiEYEExECAAYFAkGr
+ePUACgkQzgGkfhxD2FBueACfdLtQ1wegmW1s934n4tDQH0dfpnAAoJbdfKwLrDNC
+agh6BwGF+Kd5hJKDiEYEExECAAYFAkG+MhkACgkQ6DAYSBao06uOFQCeNpMgvhNE
+MqsT3UWkDBjau2vTYcgAnRp3f65Wls0+Af794qZa9TtJFnqliF4EExECAB4FAkAJ
+taECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ94h19kJyHwD4kQCeO13BXjGC
+MLvj7PxuXmav149yFccAoMb8DRP1u4pTz2aE38nKCHtO4kwGiJwEEwEBAAYFAkGj
+TUIACgkQms08wKmfdd2aBgP7Bs3M4QnfAXFNf3pnWEIPhlS9JVsShwZEBe7U3saH
+6vLdGUTOqxU7fT7nohhGV+XDCAHpWLBI/odavlQguZiTYQf/RHaSxdtoXUuwSpvt
+NlFgYdp6ex/B2llg5Qof18LMHy1R5A9lm7M2Av+DDhi1ErYV59S59SryCU0PeREN
+KoKInAQTAQIABgUCQZmBbAAKCRAxpj2W7BQLgS6bA/9Ds417wgIpgS6frkCtyKAu
+otIL7JQ1Lqsbv4+CZeqi52ERxzGqryxBWx9YY58bwv+px9dOOnm33zesf4hx/IVr
+nD82bnrmdA1qWqXPPfLAwYdKh98gWPnYkhH9RCrYnudCTFjNezS5+xRENQyYX1qT
+UlAE+x2nffKxnLJ2845gTYhGBBIRAgAGBQJB4sihAAoJEEzETQAR34fp/cYAniEX
+EYhEkx0osaS407/sVzK1CAd/AJwJW0ZL0nAyjjsqpgOM0ba3IpKxg4hGBBMRAgAG
+BQJBzqlKAAoJEME58VMjy3oqDZkAn0Dulg3UtHdiI5EaABr9C5rN9lsnAJwIkeGz
+T+S6kfIkuSH9/Nafyd6r97QgUGF1bCBRdWVybmEgPHBxdWVybmFAYXBhY2hlLm9y
+Zz6IXgQTEQIAHgUCQPBidAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRD3iHX2
+QnIfAFiFAKCVt9mEsKqCe4o1K1HmOAT4OmdiOgCgnCr58C1CTeBYMjzgiLteqSl4
+Bx+IRgQSEQIABgUCQaMAgQAKCRAHYXOxkoTEUit6AJ9sVkHFsNXow160c1h70DYF
+nMduxQCcDdNa8lNoauvnKBq6Jv7B9JBaKEWIRgQSEQIABgUCQbo74gAKCRABBWa8
+5BNjkiZQAJ45YgPe6LiBIyGPI3LFsLPPaHp62QCfc6UHkdWCgsvHg8GhjSD5wwHX
+UHuIRgQTEQIABgUCQZqIBwAKCRAwkXlyKYvH0NHwAJ946lD+sO4+bWSWVG7fGtgN
+f3B32wCfRTezxng6aLluB/QWspObQEpvfXiIRgQTEQIABgUCQZq6DwAKCRBbloAQ
+4E+aiVMeAJ9o25E+6sOTxI4KxYfPLfHgip/QEwCeMTzPbYVlryWT2px1syjvjXkd
+tEWIRgQTEQIABgUCQaJY3AAKCRAEl9WREr/nmrG8AKDGq14Su7iLDYm5Z7/4LJSU
+8/MF1gCePdaPGg0vmnWonKZJApyEEuwvDJOIRgQTEQIABgUCQaNLjwAKCRDdumS6
+LDEtLzrTAJ9aq2KOnzSclCF1BBuF9tE6Ykwi7wCfWOrw/mBKr0tolIcQ5esUinIB
+RkSIRgQTEQIABgUCQaNLmAAKCRBQjq7FMC2laG3NAKCkzGOfXP+ONhWD0oAvIhjN
+AccyVwCeKlQjucbMdl7uEkWrf1Gya8pThu6IRgQTEQIABgUCQaQv0wAKCRAXatnI
+0aqJYpemAJ9GdLeZi96/h6Jg68z2ZDeSc53g3wCeJo7A6QuCXXM/rcmfJqCEbB5A
+0G2IRgQTEQIABgUCQat4+wAKCRDOAaR+HEPYUPLQAKDAMgt9qlL55JIRygMXhdiw
+kJD0TQCfQlGUyCYz4I3IYVbgpWtf4uq4KDyInAQTAQEABgUCQaNNQgAKCRCazTzA
+qZ913fUWA/49r5W+Y5V4RRWGWgaXd8JLAQ2yu88qZsIam35F997tRS1uqZOoEWds
+6r6F9XVXwOUt2xsZSe34+jRfKWAXZdcmTyMIMTInhCcmukPCzEcRRLd3PBgIBPDM
+vMgGGLKjDjjh5QZ/IpYdiVKaiY1IN92OLm6sKXh3SeXAjWlt1fK1d4icBBMBAgAG
+BQJBmYFuAAoJEDGmPZbsFAuBxiQD/R9audVADYECPnTSp+YZJeB+LSDh84FGrWRm
+61yKp2qGIorhhzf1zZ77QMS45Zy3hEct4Bx6/YSpieL2PPzMKhag+6LNY2W46QYN
+k+d9v+ru3MMSHYoNfIqo70GOV6zad4fUMYywtYhDEalyMyPB3pP8jrmHt8m5ahws
+sfJKn3fQiEYEEhECAAYFAkHiyKIACgkQTMRNABHfh+k6TQCeJk1afbGzsIN/doC0
+0HvYiHCmk7oAnRd4SefB12lqKxB7+rOETvWu5pqRiEYEExECAAYFAkHOqUoACgkQ
+wTnxUyPLeirbGQCbBQL/YdNEhAR+QojUCsGLg46B89QAmQF109O9TS5Eqrn9+C5f
+3bck6qbEtCBQYXVsIFF1ZXJuYSA8Y2hpcEBjb3JlbGFuZHMuY29tPoheBBMRAgAe
+BQJA8GKZAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEPeIdfZCch8Ak0UAnjpl
+plE4Mw3PM3j9nSHOoXrzzglPAJ42khRlgk6TMfnUTU41h1FXA51bCohGBBIRAgAG
+BQJBowCBAAoJEAdhc7GShMRSXd4Anivb6tq25jFqiaoFJmqkNoi3/vdCAJ40ZK68
+cP0Q6ib2yiOWdjlmftGXXYhGBBIRAgAGBQJBujviAAoJEAEFZrzkE2OSFoAAn3Wb
+daZJ0raIS5NIOQcrca8sELZdAJ9y3+9st6AXjDXSRsghu59Zg3zfQYhGBBMRAgAG
+BQJBmogHAAoJEDCReXIpi8fQl3IAn24VtuU4CYAkDfSJhPRPbdwXC9oYAJ9KSvz3
+7QG2mZnimcoopCQy2g1z9YhGBBMRAgAGBQJBmroPAAoJEFuWgBDgT5qJhogAnRL0
+IF9/2Exe712BeoVWPK5eBSi2AJoDzWCbp7wr1nALbPllkqApkll2S4hGBBMRAgAG
+BQJBoljcAAoJEASX1ZESv+eashwAoIwuyzeeGal/ZWkKIxBbordqIl6bAKCj4iFg
+Kya4SFt/bd5ZKBzWWv16AohGBBMRAgAGBQJBo0uPAAoJEN26ZLosMS0vJroAnjeL
+RzjPkxFDmABQPshdkftFzAoXAKD7qaB4eHmYqZyDZ4n4dLpukmer44hGBBMRAgAG
+BQJBo0uYAAoJEFCOrsUwLaVoLuIAn2deIMzEBk9KTdIITM5cBUiPccGBAJ9PguKy
+15iLmZE1EduTLoY750KnTYhGBBMRAgAGBQJBpC/TAAoJEBdq2cjRqoliyFIAn0Ar
+xe90GYJrXOPsan0RbBWfrIzYAKCku4aJi4Fy9OweqRet0wzeyYzEE4hGBBMRAgAG
+BQJBq3j7AAoJEM4BpH4cQ9hQD4wAoLgEBvKXRJbdgpHKAynebPFc7+xTAKDCie3Y
+g9nTInyAkBR+woMlo8IP4oicBBMBAQAGBQJBo01CAAoJEJrNPMCpn3XdiXwD/1O4
+ya08P1YxIYn7owU2DFVj65++T97WO+yOvkZnPuT88anrx2lci915sXAQYZh1o4Qx
+HIsterJrJB31p3iokJzQxMt6K6HMzITDdNh4mvGoNAaSNurqhIeqmk2UpuLuDe1f
+gART4fCmgMxglgIlMBI6UyhP0RhzHx+qePRHxf4hiJwEEwECAAYFAkGZgW4ACgkQ
+MaY9luwUC4HNuQP/cQUltjk6iJq10+NLv97/vw7+eij/z8kBwfe7przIchSoApFa
+ADyVDuIMmZcSU/PbwlPRebESQrQ84q6jHqpG3ZMhvIT0EEOWmS+8Ga1FhwqXjNrY
+AsNlAFa/tfUPAPTj2M7kTt3Dq4UD2xXywY9Rja3Q+khSttGqQGEq+qB6a4eIRgQS
+EQIABgUCQeLIogAKCRBMxE0AEd+H6ZS7AJ94jbsCZKDncSb/JktR+O3R6XjmLQCf
+W8zLP/1780h7U+SeGZRx1K2uNDqIRgQTEQIABgUCQc6pSgAKCRDBOfFTI8t6KlUH
+AJwOQx8xEJeGwce+D3DtawU+uf/JdQCeIIL5AT7+oEK1IzZDN7klXB/4zii5Ag0E
+QAm1shAIALfqB4jeQyzKfybVkA8PksS9yD4hmjaYIo6XaQ6GAJsgYOVcWINPzcHt
+2rjQNxScSjkNApTxttpgRRVP2s8RCR9Vkn8S2t76SKm85mgmuTT3iVNjyIbtQEqQ
+cpN7LDJAq2LbGIDt1fdvmhkI2gNNqnbWMsAxsJkws3r0JHsCxD8jraXKvBQ83tFT
+Kqi9ZeQ1nW4dc5s1/p40OLrsq3ww23CfnP9Oxp+8rvggWyE1Rr4xb6hnYN7mSLNe
+u6xlycRopG12Rkvh5QLrKNr7D/GV1j6IGTqh4aRm+z9o/1Wwxz0WkaEyN7uFbQg5
+hscBBHJBKT1Q8evrJpTEUyzA8mrBO6sAAwYH/i2ygbxLRdqgRcjgqaWCkIDwUTJ+
+c6kIQmpPH9RMMpwnbU9kcGENCjhmFVIvbcUk9xBqQgUqSq9a8zZUrwuBauNCOmVX
+wruGyIXAYjlUXvxMOpTgEku6PlpKiDhmcv1Wb21dTz020ID5gpAa7s0T82VC3ciG
+JmYTiQut/Dz6W1X/vKkPtQ8UEQ7LTkNOyg7ys16FpktXYq/MxAhgQ5rRLqEwIPe1
+sjClgK4Lnzh5o6ue6pa6VAd+Bwpfy9i4yh3+CEgjWjq9DyciR6x6j2de+k0hQW6k
+V01gLPtduJnaPo+XWlHMonhKSlsPK10RMuVC901oLZYZSKOwMgpG5EGx2OSISQQY
+EQIACQUCQAm1sgIbDAAKCRD3iHX2QnIfAJZLAKCuvcDan/KMsSsAjM/rHTf8G0AK
+nQCfbbvCK0fwZcra7ofd1z1Up1+ID94=
+=xYye
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   1024D/F39B3750 2005-07-14
+      Key fingerprint = 29A2 BA84 8177 B738 7827  7FA4 75CA A2A3 F39B 3750
+uid                  Colm MacCarthaigh <colm at apache.org>
+uid                  Colm MacCarthaigh <colm at stdlib.net>
+uid                  Colm MacCarthaigh <colm.maccarthaigh at heanet.ie>
+sub   2048g/2C7157D3 2005-07-14
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+mQGiBELW4V8RBACRZw1GIal1EKcPqtPyTAEtvtSQqv/ZLj3l9ne9kNHFgp52TyRp
+vV1JRwrlptNhClkBFD2/o6OAOvR2YcDvWXkoNGIlbgrsRaU9H9l7ZVFU5titPj+s
+69hHn2aGox8mpWay0jfRLpNiA+hxHpo9Txh30Yzsian0+vCm2cr6H/IkswCg68o5
+MB/AahASaRJBBDS0kFOjWssEAIFEq0yBFbRljS4Ia43IKiIYCsMTesNAvpaoHLMI
+ARvgEkLxXYQr9ZPjIxTPVXzKIuM7sE7Q0JkOa1ACkI3UM61dRaZ8CTHCt4zIOGMN
+WP8FCUgFyu1/DMIcgFo86x1jM5YNdz09wezqvhpYwf0rAdTCyk3Jz57Wx9iJyX8L
+JYAeBACRXYr7D6/xwE6nnVHebuUI20uM3UqAVfELKfEju0A5iiqFu42qXTHYpvds
+AdA7bC8YEWQLK35q9v5Kyrp6IrMVJJlo3701Kjpoqn+Wqo0dKsG3devB4jIN53lJ
+Bglx3Woxo7pPAoeHyPMxxZbPpeox+0cfj4SAh+sECdUgTq0nQ7QjQ29sbSBNYWND
+YXJ0aGFpZ2ggPGNvbG1AYXBhY2hlLm9yZz6IXgQTEQIAHgUCQyCIgwIbAwYLCQgH
+AwIDFQIDAxYCAQIeAQIXgAAKCRB1yqKj85s3UNOyAKCOR2bfAWqBqP9AlRb3VXvU
+9CJcQACg34GFUHLb79GWPAq1eq2Q/rkWWbyIRgQQEQIABgUCQyCPUQAKCRDAyIND
+MMiiiOhAAKCXDn/0uoJ8kEbOzf5biPYnU8qKWwCglSSuY/6TfRfuVpBK+v5U+/F/
+pOqIRgQTEQIABgUCQyCXyAAKCRBc/Tf6zHjIk37oAKDs8rL+BAWNpg1AH8H7QCPE
+Z71AvgCfUZFeA6Lny8eSTLHp8xfCeKR+lz+IRgQTEQIABgUCQyTKEwAKCRCKB01M
+P37h8sjtAJ9oNlVkhM8eC1iZ63mOWk88RWp0fgCfVZJxv4U951SfwAN5JNUEJndZ
+wUWIRgQTEQIABgUCQyTeJAAKCRDYa/eUZKL/ajBFAJ0W2Lwg8NrYpeaatsOlPM+k
+P47JpwCgoDoETU6/KOltBn1aEkN0B5jMzdmIRgQTEQIABgUCQyVXBQAKCRA9ckWS
+wp73hyhwAKDYGgg4PwdoozFscPHWpL0Bqd5K8gCeK0+3GoMoyLmdVX/JVRpFLZSP
+dW60I0NvbG0gTWFjQ2FydGhhaWdoIDxjb2xtQHN0ZGxpYi5uZXQ+iF4EExECAB4F
+AkLW4V8CGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQdcqio/ObN1BDlACdHWGv
+tR1w9KrHSUpmQNVx9REVHNUAnA31s2SibQsdJ216/538PMYZgPLuiEYEEBECAAYF
+AkLe3ewACgkQymk5dIEDo34hrgCfXMyiE43e4tc7cH16VbWwzdniE/8AoIPKexDT
+a4m8vyiDa1GceK4GUyAjiEYEEBECAAYFAkLfTJQACgkQQeoJoFeTSY+H4wCfa7rE
+7djok2b+s95HBeF/NwZNPt0AmwZCMbG29o/bofeRUDs2CGGPvbh3iEYEEBECAAYF
+AkLfkvAACgkQAQVmvOQTY5I2rACfTY/W7cCeTUU281TxYgQQeNWrYRUAoI8NOyQx
+KEQ7kijRdscRjhSR4ui+iEYEEBECAAYFAkLkdwwACgkQjON2uBzUhh+VugCeL6uG
+G78nPzFwsP5WhksIYtv/RZwAnjmoEOofv0VZeXlQoSoFUuc/TgVViEYEEBECAAYF
+AkLkkh8ACgkQBJE0Quobo42bRgCggRA4xgADvjofITsuFd58PoORq0MAn3CGP0Tf
+6tgw4aYDwcc01Ha1JSQDiEYEEBECAAYFAkLlyfMACgkQYRlqLjM+ToS0AwCglahs
+pxQ6jze8IEAsweOfPLy28jgAn0vbj101OnrjEsIsuryv440kWY7eiEYEEBECAAYF
+AkLqZfMACgkQsr68QBUpJK/9nwCfYeo2Hyjboyba2vC93cAi0VKePnsAnREn2lG1
+4sz6s+O+q3Uwy7is8V7ZiEYEEBECAAYFAkMgj1MACgkQwMiDQzDIoogUXACgkCQV
+93N8bGlp/8Pctql/loQU0LEAoJ2sAiDDyPTfmcSYp0eI6tGl03XViEYEEhECAAYF
+AkLetSkACgkQi5YpQ/wkPzzHzQCeNsAOFJDT/bJpCEkL91yOyynw4JkAn0ctxG0M
+oevrTNSIgAIy0fmWmErKiEYEEhECAAYFAkLhNrAACgkQohFa4V9ri3IFfQCcCr4X
+XeFigTwF2F2WhBNIslhVY4EAnRF6/HIFGofC/wvrl72tQnwUIo7PiJwEEwECAAYF
+AkLerMUACgkQMaY9luwUC4EqDgP+MSHyBB9UmfjFQtrveCJJg8fxhUiiuX6f3/jP
+/TeeI9RHRVFLTR2j2ZK/OOjtUAZo9WC0XYNd/Uh/aVhqrxfFI/J9M90Iarsi1zAj
+Vj4sqjDIPW4ucvP5E21mscTKP+Jdcn3OBU46OXHppbRZhhqgWVN6DcPudgozQ71T
+hyZ/noqInAQTAQIABgUCQt7IeQAKCRA34/Rf7mXjIcqqBADerPaJID4FtbTgR3WB
+fsGV9TPMCLl3GBI+u+G0dJghrS3HsYzysBI9ZSTfsaxhK/5BtlbiHelv7xReyzZB
+R3LppWQuwILQWYI+PHbnVfQu8VbBS5th2V/JTdEwU5Udj4e4yUSEIEJJDyVMWVu4
+TuWCxfdGxyzvyrZC1UaqFhWunIicBBMBAgAGBQJC320vAAoJEJrNPMCpn3XdX8sD
+/2eBp9JWolVXYnm55sQXrwkin0jr7mDWa5ms755RGXJHjIaEpBHt9KDKknFpRv4v
+5lWQhsJQ3XjVhGGnwI360Zut0W+8Jtx9WS4UOLeWQwSbLa2miyNlbY1Dl0Lc7mri
+PTfp/aIk6PQrwlR9KR3X44eRphk2lX0pCalvNefEVXg9iEYEExECAAYFAkLesT0A
+CgkQ/W+IxiHQpxsbfQCfSBKiIFQAZ3ms+jdifoew4LjuRE4An3FqSIfHdjT7QS/G
+SteEDyEi/+35iEYEExECAAYFAkLeu4IACgkQMsnkzjZCy0vSuwCcDdk8GhXVselq
+w1P6KfIGB46paI8AoNODV1J8WOivefexZF132lBYbGc9iEYEExECAAYFAkLe2eIA
+CgkQ7tHqOSJh0HOcxACfQIaSKmPV6ul9JL7Tw6bZV6LoZ1IAnR/1dq5qI6L/XY5w
+3/hy8rNzLjNGiEYEExECAAYFAkLfbTAACgkQUI6uxTAtpWiQkgCglhRN4h56a2NX
+4PubTaTpt4s+cFEAn2zOK6T9rlGYd5QFynZj0k1GuO9aiEYEExECAAYFAkLfbTIA
+CgkQ3bpkuiwxLS/10QCg+3rbZys4iQ4vW4qS6R2yJNlrh3IAnj2tyMmRrsEtW+bN
+OvUrJY4gL1bRiEYEExECAAYFAkLg7QYACgkQybWm7OLXdN+EdACgrgKHTCgj307w
+0FOioXe9uPEbU+4AnjM4lBi94Nm84BgE6esZDvXbVOfSiEYEExECAAYFAkLg7aQA
+CgkQN/aP9QFa/IpM0QCgowfVv1Z98utS0tXToJL6zS1KYiQAnAqdbSAtRxK8xpnr
+vc9LnpsukMF0iEYEExECAAYFAkLg78MACgkQW5aAEOBPmolTvACfWWiuidASBspI
+UeoZysIMfcXSDKEAn2gdALzsW+uvVT4LKNeKzsbzIs/TiEYEExECAAYFAkLiYsYA
+CgkQbZiNF4cxXDEgIQCghR7mWPIoOJv5sZn2YB+iKKKQUPkAoPLQlPiDgZM0L66w
+7KFMcPuSlj2IiEYEExECAAYFAkLjWt4ACgkQEy5J1OQe3H7SgQCgg+1G28fkCt2K
+Npsdcv3hKRY9wkkAoKMdsQHQQl9LeSQtxmnVoWgtSWXliEYEExECAAYFAkLjuE4A
+CgkQbQvHOkBYGDcQmgCfcaUPfWx3tzbMhgPIaxnC+2+4GGgAn3UmWcL4y6CuafGo
+TVEJ3pnbaHCBiEYEExECAAYFAkLj7ckACgkQMoZOQZyFIisAbwCfR8Gv59/k1CNl
+ThPvjfqOA9v7zpIAoIlyWt6VamIUF6V1DJkUsLdMUiFliEYEExECAAYFAkLlEN0A
+CgkQUnkvr5l4r4aw2ACg4PcNmqWg0tmU78SCYb5sft9arAUAoKlzLyVwbgx8o+sV
+xooCVLbq5Pn1iEYEExECAAYFAkLlEcoACgkQa3OhBipiP3LtPACeNNzQK6+M7+iW
+GRoa/3x91WTXupMAnjppF3NKvRFM1bPBuPHkMQrlZ3L5iEYEExECAAYFAkLmmagA
+CgkQaOuMdvjqKWeCIQCePj1/DGvnWdsE8vVH6LYIIBCmQDIAoI9KyCTP31ETSRBO
++dkitssPvMO1iEYEExECAAYFAkLnYYsACgkQbpR1lMFSQxqbcACfS19GZMulB7qB
+5QvGKpFncsHE4i8AnAgs0jgBO4sWj987Wkm9xKb+6lF8iEYEExECAAYFAkMgl8gA
+CgkQXP03+sx4yJMg6QCgsjBgLZbMkacGPnXJQmR9OxPtUU4AoNusKhziIkJWlHWa
+uz8H9NuNp51riEYEExECAAYFAkMkyhMACgkQigdNTD9+4fIOkQCfSerkxohvKdRG
+uBh6/BbhoRyYY8oAoIdSEiSASDsllD6ABxpmFaLD0VjXiEYEExECAAYFAkMk3iQA
+CgkQ2Gv3lGSi/2r8rwCePvkHpYFFVmwaoyxDiWyAJIuO/ZkAoIfEGl2o1seOiM8Y
+pNIwqANE8Gt6iEYEExECAAYFAkMlVwUACgkQPXJFksKe94fKugCfSGLdAfgTPYNP
+JIddiYbExRj4tusAoNsqjlS7j0FiwuLxn2KhU0XdNR9otC9Db2xtIE1hY0NhcnRo
+YWlnaCA8Y29sbS5tYWNjYXJ0aGFpZ2hAaGVhbmV0LmllPoheBBMRAgAeBQJDIJFV
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEHXKoqPzmzdQdvoAnRX9Td7jsxuJ
+tPtZTUuSzFP8ayWOAKDPnEXHSMWf83yGbYmYbjd1k6AVGYhGBBMRAgAGBQJDIJfB
+AAoJEFz9N/rMeMiTMNQAoO26cgCXNIHA1BXzt1Gc1YMx//urAJ4p9quyQ/0qhf5t
+A9FGXGX4nqYbc4hGBBMRAgAGBQJDJMoPAAoJEIoHTUw/fuHySjQAoIby3eTBkcvq
+Cvl2NWPrQJxPubd/AJ0QlXBRAJBycD6Hgf2Y1bcneLGKE4hGBBMRAgAGBQJDJN4h
+AAoJENhr95Rkov9qAwAAoNVYqqIIF2uvZSD4eKScYFb6u7n1AKDKFRSOjSeRHVXz
+GUd3UbUB+xny1IhGBBMRAgAGBQJDJVb6AAoJED1yRZLCnveHWC8AniAJhbJpdSR6
+lIzSkPbvJLRwdH5TAKDQ4aoyMe7914J9MgnkcVBraBhJj7kCDQRC1uF9EAgAgaod
+PcwlIct4wWAHDxe413Bgw6/v/kNp4Q0nbnLwQ++gsN3sCkK0O6qASsed+Ffsjhn2
+VEjAF03RT2T8Ir7AuA++EuWuAphBDTZLF/ARszSnYWEz3cELsuuqj1yXl4Gc3mj6
+1vDmST7g3iPxNbWGZNf0jinD1ycRYd+ZSs+5yQzOt6g2VtAE8DneL4M0o+tXZXlv
+Rl67PlrYbRIE81VYTm2C+k3eF0PWsdDyL8lPmV6ryIjvDK/EKLGynIQN2yWASzqZ
+Ql9mJGdwHKXMNxG5R0AQc0auJjk47sCj8ktP8+k6MPy2y2ZGv0PtSNSogROwMvJp
+MpqWoMtZdmrkXuGn9wADBQf/QAbCM0qCv6ogLmfsyyBubl42DkB8vMgRYoY0/kQW
+3qKBnIsCHhuQfYRX9oV+LVtq7vNd1NQe0HFMW3ZxOLA7e0lVPf2vJUWGG2wBWHOs
+2BxnS/691KUeB7NUA3MeiqaiPW5IM1+pWT5+/Ps9mJXnSHYYqaJdDHSiKeAvEYRz
+qGlwn1KpopIhtLZRMwio1ez5aNAQ6otD0vHFit3X+SCkl6+1+tvEfPTupUpbjBsG
+3geL3D1csPC45KsMCE7zwqAnXiVTYCGXumFEBS6b4bfh2uM8fZP2Sy0xEP0nxzmD
+mK5ERs8R3rshRHFZiil/qtqlMfucZER4XxWZidEoath1xYhJBBgRAgAJBQJC1uF9
+AhsMAAoJEHXKoqPzmzdQTTsAnRwKwOe+n2LgPgqAReIqMvbIHUxEAKDbuZIzxAtk
+Wq8UfA31IsLnxfIOGQ==
+=95yW
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub  1024D/311A3DE5 2005-10-02 Ruediger Pluem <rpluem at apache.org>
+     Key fingerprint = 120A 8667 241A EDD4 A78B  4610 4C04 2818 311A 3DE5
+sig 3       311A3DE5 2005-10-02   Ruediger Pluem <rpluem at apache.org>
+sub  2048g/A21CD598 2005-10-02
+sig         311A3DE5 2005-10-02   Ruediger Pluem <rpluem at apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+mQGiBEM/yAsRBACVZVt6oK9fpc9B/7vPny00aHnuhDQ0MsM5rbEGZ57aBnmHYyX0
+gTKLWGBXhlkos0hxBBIc9UUbOmaVBp4VFu0rz8IQ2OUZ93J7lR/khRG3wlmYx25Z
+CcN0tOFmiZuyV+J9zNP/dBdBfUqDwcJD8zmA7u8NLeUWljJJdKv8wcZ2/wCgwN+/
+PWz58JCvsvphQT1QjzP8a6UD/3DsCYMq0m2dOi3YXxtHpeF2Kn+k4BXnFt5dkPsd
+O2MN5m66Ky3MndeIPj81Bw9ssc9zZGcP2PHej9mZPjKDQaJn0GkHem2sVQ5uDcbG
+JCy7UKjgLqBl/AAJs3+0KdArvWVxsxBUl6wViAxUytwdsgK1KUA3Qyfj7oAM3p4S
+iAWlBACVIZO0u3LzAN5halnEcsjWrCdNpvOLB7aopNMYQRm0X2OXgFWRuLa6X4/g
+yA/aDZg5xbSBVzC9VwMS3Os1hqwuFW0DuP0PAal1KIRL2dzD/1XIuRBz7N1WgeSq
+MqNqjFL8RuTh9jHlWOnHKd7GOitJazv2TNgP0KQgRoPKklas97QiUnVlZGlnZXIg
+UGx1ZW0gPHJwbHVlbUBhcGFjaGUub3JnPohZBBMRAgAZBQJDP8gLBAsHAwIDFQID
+AxYCAQIeAQIXgAAKCRBMBCgYMRo95X5YAJ4vjiI3FoXwZwWklyP4CnlhODshDQCf
+XDn0eSGXJnnYZAYcunTQWQ24HIm5Ag0EQz/IGBAIALdVGzJqGf7qC0rRAtEn3IGy
+1Rt8kxusRR+ai+be8OxxG6Ab2PTpF2KhyDJJQtzByVL/gZUX4Xr6PUdw3XjmN+gL
+mBOccKdi1zs5gxbZqmeWmA+9uvY14+b9FXONTyt15EIJbcykFk7x3kQ/a/Q5ujF0
+P9p/v03w356YFaVvq171Pkl1K7uNft5GURINzXljHz3CO3mq7/FYfZhMxxbRePUG
+rhWuBOHL70J5eWA//x6cbm3u6htyQ6e7UOB2KfsV+RyLlPnOeOVKdDRlkqZth58J
+zM4bejRLFYqVpe53M9hElCd6B7eIA4toNzg82T53a0MK+1O6i7iwip+sBUxjHLcA
+BA0H/iI6JX6Ua4oy66zFbbWvTzuiljRWYEKJTkzeRPjW7fnrxRglMzTXA1ZcqM5t
+5bPTWhzlBlCrcFIYDeKhg8rgdA5FrajTExBecc4thS8s2KkmSY8f4pBSOuA9oY9U
+3JZIM+enCbZ46EulNzpEO6EtZhw446NC1y2NF+528scKhOF3S3mDhYpa7xyKiV9C
+gU62U5eRx6/WYUfh6OsoHCPoqdtoMYb6lVzVkxcyfOCf2at2CS6mVng7otRMxf8R
+TiCXnJZtR19uBV+lSLGYJIWz8dIxv0L2CQzJ05qGTHj88/hGXTr4OsnKAoILYmYv
+IOiSyYyXQFrXH0lRIyC/FkdxuaqIRgQYEQIABgUCQz/IGAAKCRBMBCgYMRo95c0z
+AKCh4iGas+UlRksCX7cx52RHgYSGQgCgiGBe3aIUIBBqQRpjlDaPNEJgBdo=
+=8v2D
+-----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   1024D/83E6AE0D 2003-05-08 [expires: 2008-08-18]
+      Key fingerprint = D694 DAB9 8F4E 68A8 4C17  F011 ECAB 0E7B 83E6 AE0D
+uid                  Maxime Petazzoni (Bulix.org) <maxime.petazzoni at bulix.org>
+uid                  Maxime Petazzoni (Bulix.org) <sam at bulix.org>
+uid                  Maxime Petazzoni (Apache Software Foundation) <maxime at apache.org>
+sub   1024g/EA644EE9 2003-05-08
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+mQGiBD66FGARBACW/hHKwrc3NIMstpxwopJI2h7KMr70Ecmn5i6NFOPr8I8smABx
+dIBNE0E07oCWKlS5mT47mio6wY46j5Q3EUmxbfZDlox7IO+R+1+s6OpLDz6QyLpW
+BtcaGkHNHaZPB4ouyd4T640ni1mp0b1G4awlgLxJRVcP/AtJCWVJTcNc4wCg4I8r
+v3+yQ+oW3QDExgGN23AQxIUD/0N4aLkdzJNv7DmDto7cwqQ1+hmPVHsyG+M1oKxl
+isx7NpCbicumMyvaIrFekUbpX2jtdP4zK3F/l4BvlR8YfgDrk7QmDT4eCUMNLviu
+d23aEehFtfP83O/IjXt1CjVW5n8IWNY0jwEygY/9bOQNI5XX3LcJvyMwqZorUSts
+n/EuA/4zRkE3Y+p/gRNv1f8F1exV3Cn2pb5ROi6tmMbpvB8Lmx41hZylsbZQdNty
+s5roYdGJGAL100x/KplV72zigDlpSAFZzKP9ArcO8w5SiJiyqYQWuB6UKB3fH9eE
+inL+caa8CQY/Tr2NGIR45t03h2i3zD1MrKulZz47kCZYbztSOrQ5TWF4aW1lIFBl
+dGF6em9uaSAoQnVsaXgub3JnKSA8bWF4aW1lLnBldGF6em9uaUBidWxpeC5vcmc+
+iGcEExECACcCGwMGCwkIBwMCAxUCAwMWAgECHgECF4ACGQEFAkGOAVMFCQnvQvMA
+CgkQ7KsOe4Pmrg03XACePWqWwPgqWx07CfmVr/vHodYJI7YAoLIJanI8VZV4dHIB
+VXZf0Kgf3VlgiEYEExECAAYFAkGFmWsACgkQCbw14+5QZGFbKQCfUVJPpvg9taHb
+i3fopt+oStAtJ/0AoNrjNX3IQZVGW0A2BrcELzHWA1GSiGEEExECACECGwMGCwkI
+BwMCAxUCAwMWAgECHgECF4AFAkCWj6YCGQEACgkQ7KsOe4Pmrg0dwQCZAUZX8G4U
+6MBxPaN6SDXmV7AB8lwAnjjlVWgagBa+sGW//R/jNYlozb4FiEwEExECAAwFAkGT
+EiQFgwcWRS8ACgkQzTD+AjVP2VIqFgCfSMoeN3UXC6tGlnDJfrJJJJ9hb8EAnRwz
+xS785bagDzRQTrD72+kuukB4iEwEEhECAAwFAkG7qckFgwbtrYoACgkQlF9N1bY0
+ib0UuACgsjxfNyZkqZmfyLyLmeLaBIiR35kAn1EP8g8JnpQaatFUiWXzETr1u2EX
+iEYEEhECAAYFAkJC8CQACgkQv04Nz8dVki/mbACgx35U9znQ49Mw7gEEb/PkM9SN
+OXYAoL/OYqIQUqnnxjNUWdQHHqua+dDgiEwEExECAAwFAkKE3+kFgwYkd2oACgkQ
+9lPLMJjT96f6ogCfXfb7Jn7PWfeT5xqOFd5jahaL/aAAoLQdE/nmBOVqvAKXNKn8
+KlwFQeKDiEYEExECAAYFAkLb2vAACgkQW5aAEOBPmoncOACdE4Sqz035hyYWfqqx
+JYw+wKrB0MsAniUauUXnaedm5baA3MpLmKE14vmkiEwEEBECAAwFAkLc4GMFgwXM
+dvAACgkQ94h19kJyHwBIDQCgnIhgESJ8p6OUuEqLZonnGozpJZAAnjbKeqeHuRaK
+Lqtd/PSQKpjcsoLpiEYEExECAAYFAkLdBIEACgkQXP03+sx4yJPdPgCg6uOAE+5N
+EK/x+AoyXSi8Y8m/v6EAn3m1F0kFeAQOQOFWz+XCXFmp49GniEwEEBECAAwFAkLj
+kskFgwXFxIoACgkQhUnvgY6MdEhTDACgjLv4eCSEm68dlStlK/Ii3jrgKcoAn0lq
+qZdlIaK9LA2KRIM7p3JjpdHliEwEEBECAAwFAkLkElYFgwXFRP0ACgkQbQvHOkBY
+GDfyZQCeM7mtFt4c3RA2bVPmd9mxnY6k1bMAoIQbVZ1G3d7YP6oLATygKPx+689v
+iEwEExECAAwFAkMOxUgFgwWakgsACgkQf7o9T+sfU2R2fACgiz19Npntlekc7KXo
+eqIqfQW2EwMAoJVfMZjd5HSu+WX/DJLDGG/P38iTiEwEEBECAAwFAkMOvUcFgwWa
+mgwACgkQS3OlVpbZQYk52gCfXD1k4WEozb+oDW4g8w8mPnyD43kAn1es9XXb/sOP
+s2QSQpSuPQgKVjduiEYEEBECAAYFAkNM5uwACgkQF4qBnPu4WxVB8gCeMcL7DkgF
+9m1IwvS5vlNJ+ZZTtrUAn3BqUvaxgXS6PrbhzqV4ca6h5xRYtCxNYXhpbWUgUGV0
+YXp6b25pIChCdWxpeC5vcmcpIDxzYW1AYnVsaXgub3JnPohkBBMRAgAkAhsDBgsJ
+CAcDAgMVAgMDFgIBAh4BAheABQJBjgFXBQkJ70LzAAoJEOyrDnuD5q4NJPcAn3Ii
+MneIS7QSFFqbBuWXg1CtKmfbAJwPdXZaz8/XeNwl1IRqHcuF26sVU4hGBBMRAgAG
+BQJBhZluAAoJEAm8NePuUGRhVgEAnjECm7Za8pLWh986UN0dALCf6fPcAKC9JwmR
+xhk4Z/Jttho6m15LqYotSIhMBBMRAgAMBQJBkxIkBYMHFkUvAAoJEM0w/gI1T9lS
+pMoAnjMWb7SCcrNZWJ3eSdlSFk8ZPXcaAJ47na71eks2kL8yXB3fp2HWNOx2Rohe
+BBMRAgAeBQJBhZkfAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEOyrDnuD5q4N
+PA4An3CRhtEOJ6sJvjTCzSv9vCuSeCCPAJ974rjwU4SCJ/gco7XMM1SZIgvIEYhM
+BBIRAgAMBQJBu6nJBYMG7a2KAAoJEJRfTdW2NIm98LcAoINh9Pw9fhCMf4tbGhKs
+cS1HVNacAJ4obCxEt7Z88ptYUtrlSru9aZNO/IhGBBIRAgAGBQJCQvApAAoJEL9O
+Dc/HVZIvr4oAoJWNbuFkt7K2hxNLSu8b2r80z7jpAJ9+6/MOCJ2Msvdy2y2XF8xE
+9L8jZ4hMBBMRAgAMBQJChN/pBYMGJHdqAAoJEPZTyzCY0/enS0UAnREbV//LESUt
+zmMSxefuLEHtk+rZAKChzgpgSVLEsKVQQh30GfQgRVWcj4hGBBMRAgAGBQJC29r0
+AAoJEFuWgBDgT5qJZIoAn3Ly8SL/FjA00L0l0gY+sjVR4oLvAKCPEw2fPgMDIRJw
+mPeV+Co+W07GnohMBBARAgAMBQJC3OBjBYMFzHbwAAoJEPeIdfZCch8AFNkAn1Vt
+31nqcgesRmOtfQnjQBFx5hC4AJ951q/b1oUn47FvyyJtfp+PUWuLX4hGBBMRAgAG
+BQJC3QSFAAoJEFz9N/rMeMiTVA8AnAlVBaQjW+twEAbgbWqFaF6dEsGLAKDbwimF
+XXTU9ZWQsDzpO8/r1fXW3ohMBBARAgAMBQJC45LJBYMFxcSKAAoJEIVJ74GOjHRI
+uHAAn1+BUjTwapsuQ5xy6mOhQVR3uhuzAJ4kz7GyZTQXveowgl3wuLr+zHW3C4hM
+BBARAgAMBQJC5BJWBYMFxUT9AAoJEG0LxzpAWBg3+z4AmwbyGsGW5goY5n1Y7n8l
+XvRNbek6AJ0eftBgNzQ8Wyliw2zrqrCx79ZS7IhMBBMRAgAMBQJDDsVIBYMFmpIL
+AAoJEH+6PU/rH1NkS6IAn30i+PkmC8Y1lrEVxZpSD/iJzcKKAJoCUkHRy6T0KJ1b
+TvFORa9yOD1wrYhMBBARAgAMBQJDDr1HBYMFmpoMAAoJEEtzpVaW2UGJUOcAoKyG
+1VXvxK830zLq3hnNP4DGCBc7AJ9JDp7sE9EjcgxsBlA7yYxKCHTPdIhGBBARAgAG
+BQJDTObxAAoJEBeKgZz7uFsVv2MAn0jeoqWUiSYQ7HULy/30CQNOFwa0AJ0bWNrM
+bnyLVOPsg2rDq1bGMGyMsrQ/TWF4aW1lIFBldGF6em9uaSAoTm92YS1tYWcub3Jn
+KSA8bWF4aW1lLnBldGF6em9uaUBub3ZhLW1hZy5vcmc+iGQEMBECACQFAkHkYDAd
+HSBUaGlzIGVtYWlsIG5vIGxvbmdlciBleGlzdHMACgkQ7KsOe4Pmrg2UrwCgqr4T
+NWfG6S1eplFbu9rXumEgezcAnjyz2jhtfVGCCsj2Z3AgAyDl8wCJiEwEEhECAAwF
+AkG7qckFgwbtrYoACgkQlF9N1bY0ib1QKQCgotl+L/SfrQrnD76obkGPzNuFqaQA
+n1Mj8Wk9FNf/hAsSZzCAbV3tgbI3iF4EExECAB4FAj+NhncCGwMGCwkIBwMCAxUC
+AwMWAgECHgECF4AACgkQ7KsOe4Pmrg0zuwCfSIJWxDK4Gkx7BsvaO0AZOCgapFwA
+nA+oKOaDt6GlxoqAhxuUiPo0xKZwiEYEExECAAYFAkGFmW4ACgkQCbw14+5QZGER
+zgCeIe3ZGHUjzz/UyQW25Yf7s9/8VBcAn2J2p0ZUHEdntWqlOTi6v3jxiVe/iEwE
+ExECAAwFAkGTEiQFgwcWRS8ACgkQzTD+AjVP2VKubgCgkVieHF2C0HYExlUCR8e+
+hkJjrQUAniPb3LEwUfj3OofUfREw/I8DGLbCiGQEExECACQCGwMGCwkIBwMCAxUC
+AwMWAgECHgECF4AFAkGOAVcFCQnvQvMACgkQ7KsOe4Pmrg2kHACgqrNFxaQR3e2r
+jyZ9yt9HThYvbc8An1yP6cOovt1AZ5p6OdU9R8AXBf+PtDJNYXhpbWUgUGV0YXp6
+b25pIChOb3ZhLW1hZy5vcmcpIDxzYW1Abm92YS1tYWcub3JnPohkBDARAgAkBQJB
+5GA/HR0gVGhpcyBlbWFpbCBubyBsb25nZXIgZXhpc3RzAAoJEOyrDnuD5q4NGJYA
+niQNlo383vzVTSeUdbLew6yRsGzFAJ47Jeh7vghc8e/gdRzqYcAoQuEyaohGBBAR
+AgAGBQI/k77UAAoJEO6QdfU5abv28oIAoMexl17WRE9fGmCPjeS5oCEy+gAyAKCH
+hRHg53SWgJUPQ6VuDL6cwUNUzYhZBBMRAgAZBQI+uhRgBAsHAwIDFQIDAxYCAQIe
+AQIXgAAKCRDsqw57g+auDVyAAJ9V0z5uUuipuRG/5YlUD91mFGonLgCdHKSWkg7d
+LmcA0I2fecVd3tyCD6KIRgQTEQIABgUCQFDzaQAKCRAw/hG7Ima1Z1NmAJ9vkgu5
+88uiz+IK/Vrz7bl4/j3T6QCfR+sEvZJIK4+BF3twAOgeqj+torOIRgQTEQIABgUC
+P7+2ngAKCRAXioGc+7hbFVSeAJ978TzTftJwzHQik2uipMjBC/BDjgCgh/VdE2kq
+A7uycb0AmqOFEG9nzz6IRgQTEQIABgUCP325YQAKCRBfSAZpCvvNYNaTAKCAApn8
+SL3+AeBH8jT/5U1zuhf6ZQCfXAFBAuFRtlf+iml+MOFccjDUlcOIRgQTEQIABgUC
+PwSSpAAKCRCrz3ACPcJ28S1jAJ9NMBTPc/16nQWrC9k8+ZL9l23zkgCgxbM23/yQ
+xAZwLzxFY4M3F1OKptKITAQSEQIADAUCQbupyQWDBu2tigAKCRCUX03VtjSJvSIn
+AJ9zZMfRjjsaG+mrQAT4RAZkOVqICACfc2FH/vtiAsoHPUnQDoq9f3ohgB6IRgQT
+EQIABgUCQYWZbgAKCRAJvDXj7lBkYa1nAJ9NgL+MQmis6wQ69+TTXYI0tJaG7gCg
+3ghKMJfGtbzNi4RxTZnqviTr49qITAQTEQIADAUCQZMSJAWDBxZFLwAKCRDNMP4C
+NU/ZUucTAJ9hGzCVYM3PvY5ci+L9OkJeg3JZ9ACdHk9ajnEBXBXQiHxPrSvEkYpG
+dX2IXwQTEQIAHwQLBwMCAxUCAwMWAgECHgECF4AFAkGOAVcFCQnvQvMACgkQ7KsO
+e4Pmrg2KmQCfThDO0PQglZ/QyjLq8a+t2nT+p78AoJtiOntKvb3zitjuIf/9l5i/
+to9otEFNYXhpbWUgUGV0YXp6b25pIChBcGFjaGUgU29mdHdhcmUgRm91bmRhdGlv
+bikgPG1heGltZUBhcGFjaGUub3JnPohkBBMRAgAkBQJC84EGAhsDBQkJ70LzBgsJ
+CAcDAgMVAgMDFgIBAh4BAheAAAoJEOyrDnuD5q4N1ZQAn3JZ4otgS3ogdgCGKFeQ
+hhT0PDaPAKDFBgOlH8LdGitENSoZOWVEXSw3ZYhMBBMRAgAMBQJDDsVIBYMFmpIL
+AAoJEH+6PU/rH1NkU58An3zcPhOI4SgSr/I7cGuHH4NrqKDnAJ4k2IaWtkxtYV1s
+S8VcANTKSEZJDYhMBBARAgAMBQJDDr1HBYMFmpoMAAoJEEtzpVaW2UGJ3usAn2kN
+ttPGuLGa65+6LJdavi9inG9LAJ4uTToi+StbM2uYMStiL/iOKyuoA7kBDQQ+uhRh
+EAQA0gQ6m2hdo3t55hByLXkQTf2zficxXaW9S8gA9mePQwyqpQcDD5wCXMCmhhnb
+XGdFtqs9GlRLK/VcGwkP9L8FedS/u/jtwtbE8aTI9BBE2QVGkRvEb0y38j23pCbQ
+EwRdv9RrGNxAFhCDlJiHFxBAE+dabJt9YCLEUXPmqXh6FocAAwUD/1rAGpdLLsez
+qBxeXYZPzefwNtxhbpEXs71sBC9+ijZnYoGFa1Acnqh3vJH1DXvLC0RDTnqWma/3
+QsHJJtH9Bfbo0M3zKWs5aaV+yu/2XPDGMiOLm1F47EfGFfb4lCWGasq1onD8zIME
+W7kB+6jaDOq+qsu77eWL2kbD/FyC1aNJiEYEGBECAAYFAj66FGEACgkQ7KsOe4Pm
+rg1PfwCeKe4JSyAC0hmnPn9sBOQIgsG2s28AoJ7gJ9zLdb4SquLE0vvfZeKQtLYh
+=DmIO
+-----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/40581837 2000-10-23
+      Key fingerprint = 4535 10BD A6C5 8556 24E0  0923 6D0B C73A 4058 1837
+uid                  Nick Kew <nick at webthing.com>
+sub   1024g/6A4AF32A 2000-10-23
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+mQGiBDnzkd4RBADgCTgS7k/tgx1KaZ+yI5PdpA9slDq9FNGOaP9U6GXhQPDz+Vwp
++DRn62/+k5Er8dN05ioycjNe2oaKRCHW29d+yXC5GeeAhovHYr+uwp1C1wkV8M2L
+m/3LcKizSja1UYsvqucYzBCKYtcK5ttEQmQAa24p9ZhE59Yl3fqpiilffwCglnu6
+eoXfGPxl9/hEitpc7lObQGcEAJSloC5SClhhqS3F2bw46AhrJ73BZ9kOcDe6dlJo
+J29SHt8rE9U2mN5WdLJpSyuwpHOK+xCjnW2JrVxn0xGVAsQ9g5T3FNTDbf1X+a37
+2pO6wAyvtsIH9ZC0JU5lfg/a1+2rGEl37T6tlPW6l3RVUkCPpiyYoaft3SNxslOd
+xJDcBADBtiNxviA3H+x6GXc978PvyjypsESU2JNZRaCI86yyT/dj8VRwVwUPzurm
+0vDqJNfeXbBEGQwp+Wj0C0ZiG30U0/R3rltEdz4Tn/CKH2WXAUkQAdevgOVB1rkU
+eoqjkGnvhwntq6WuHPYaT5pASpiC2wU4HDu7RJcRF1uj0PnVe7QcTmljayBLZXcg
+PG5pY2tAd2VidGhpbmcuY29tPohXBBMRAgAXBQI585HeBQsHCgMEAxUDAgMWAgEC
+F4AACgkQbQvHOkBYGDdpugCfco5ZqB5qIKHYOgfIA05mgc2WXqgAoI2SRD4E9UHY
+Tdx2EaqMfC9teG9TiJwEEwECAAYFAj/CgIoACgkQN+P0X+5l4yGyPgQA3psQD8uA
+j2QoX2bhCLG8rLwYyJfN4eqMvHwQK3iTUDKAF6qEcfnVyXQi8Tu5OY37maq/QOpw
+rHi+/50eiBVtStsqXbsHLKO2xxQGEaCSSehYMp5mQSiJmfKvyLTjlCb0BnesBWvD
+kRMbiEc3F9zzOIcUTt/pPV/YEXmrICM0HPeIRgQTEQIABgUCP7ppdQAKCRDLMqEH
+iMOlpYI+AJ9X3J4vcPGJrZqSMToGS5pzNYRPUACdHyrJ+Rt/ShkqVnJtaM+ONsQj
+H8GIRgQTEQIABgUCP7qPYQAKCRBc/Tf6zHjIk18PAKD1JRdPczkSbx75iHqEfooy
+O7FlBACeKkMmIs03OfCAOB5VW4YsF0x79E6IRgQTEQIABgUCP8exJwAKCRCkdA85
+0Ue3djCnAJ93/9aXFWDyqq4n9SjR2RW/Rcp1jgCff/eiV+vtiZwn1k324Cgqpjjc
+ITOIRgQTEQIABgUCP8OH/gAKCRD6PI0mFCtQm5CrAJ4yOwyw0kjJ23CVpL/AQ5so
+5f41JQCcDrDu5DPpL6sTJrUlnWB78S+14V2IRgQSEQIABgUCP7xo0QAKCRDsmT1j
+Zf3N7klmAJ4t4NE/syVP1xqfN7f9c9yc0IjTagCgmOv08ypx//V3x3/2sH/Qzr4q
+m66IRgQQEQIABgUCP8BknQAKCRAaCdGD/Qk8QbpcAKCZjXmmLt+vFPChYsA2VafU
+TJFCzQCfYPRG2bFBd3iZntiHAqLKpTRy8DiIRgQQEQIABgUCP7+tkwAKCRCyvrxA
+FSkkrwFsAJwKLTY7SnbEi4m0VLR6/JrjzBRZxQCguYUsuBvze88BDVIRX0epyK21
+RhaIRgQQEQIABgUCP7+twgAKCRDBHntHlk8x2fzLAKDgadjCownEBcSPk5zbg/Jh
+/HqFPQCgok3nbkTIvD3ottYB3+RjkQaDD1+JARwEEgECAAYFAj+/xR0ACgkQBurP
+qnbYPMbsLgf/foiuojq63JT4kDNAGSiBnk7NShOC9MRc4odQifQI6stCp1b0nn4h
+d1o/OlBZ1TZfXW/dyW+dMxYlkiaaV/WdbHY4r/ImynGR88aLgG6YVwl1oVUbHY+w
+ImAZLH/rJp4uafWtzX7/p21hVCeS9DckmR9Px23l5UPQyYZLHuI+iZdP0hhPkM0m
+rwC/km8UTuJ4o7+Y0+Zwl75TcTuBe5WodeRkbnIv46cnd6WyJjlgRfz+R2e6gJlG
+ysBkit62Qsl4qIKry+/F/jvy6nOJjJWNjtHTFQs5ijNHGhIagJUvytTFuNcNg3db
+MBEA88D2Js2n0qwLLh1a2aq2T++sj3Jae4hGBBMRAgAGBQI/uaNIAAoJEBD6TIil
+TaLfK7sAoNPyR6W2qBRLEn1usNwpKJcH9nMrAKCeLD1bpWkVXrbCJNsbRLZQcUVg
+MohGBBMRAgAGBQI/uasYAAoJEKge5knOGdXGnXgAoMMltbfOC8a0jhMzzLS0c2s5
+VoGGAKC1UMyYcatFXUT4m+Of45z/+xUL1IhGBBMRAgAGBQI/vc+wAAoJEL66K4f1
+/EtC25QAoNvrYI4Gz40AHHWuSNU3GcuC98GoAJ4w9jfiVYWDftQ020FEKMzDFFdk
+VohGBBIRAgAGBQI/udRNAAoJELkkUqxMkWW22kwAn2XBo4h4t1jxReXckDKhy+7r
+AgqeAJ9uvifvKci3nnfkcKvy/rsGmJC+44hGBBIRAgAGBQI/wVDVAAoJEMwhMCCh
+1pdZMdkAn2kkyMexCUuKCEHPoc2luhU1cuprAJ4peVxHFvyur9mBN0UQ5v2VGVnX
+sohGBBMRAgAGBQI/yuaJAAoJEGhad8ruVlUOIaQAoIX9Au+wI+URjTKwADRf2uHv
+EtDzAJ43TC/BwVHYDpsBu/+7Fjv4wqOY5YhGBBMRAgAGBQI/zd4FAAoJEBMuSdTk
+Htx+ZCoAoKJyCqZuCf0tN/z3NBNWaPgqU4C9AJwPztLCMNJ7J9skWbndk74IdiJX
+M4hGBBMRAgAGBQI/y4vVAAoJEAlaRdyhHVb7g7wAoLvvB/TarlHX/a2jm+BXFPdw
+V9e7AJ9AcySdlGowiXXtEW1cCPyQ+teqnohGBBMRAgAGBQI/0M5fAAoJEGQHhtmt
+v54amD0AoKdcXerf53vHCRVVjeJIdPugbM9OAJ4x8qs74w+PfZ9a+jwK7Mw9EYOt
+XIiZBBIBAgAGBQI/ym90AAoJED6Pt/L4g0HZEXAD50Gfce2rIDHB4DSf5BZyL2Qt
+NhbM3Qr61TlmlduTsyHWTruY1mB95nX/KPGaTiCWBqo95yrf1pcUn4rVH7Im7gyD
+XF82j/QYLSH1rN9CN9ESsFBjaGzi0BoRAAlqgaAELJAoQLsl53vAAaYQiWtaybd9
+u5UNIX7xy/pmYHNpiEYEEBECAAYFAkBVneAACgkQGFXfHI9FVgaXgACgonzAibvO
+s/UHFomOC1R94nKM9HcAnjmjgDH4Q/XOtpJX1Av6ZqTsJo7liEYEEhECAAYFAkAw
+G0cACgkQLovQgMxpzu1GygCfYyI+cF1P8qZvscDQJwwscBktk40AnRnz6qzzAfOS
+LZ9xYJ0s1IQnMGGViEYEExECAAYFAkAV0+kACgkQFT+gzXWmdpJuYwCfYxbaEOfR
+JQXdRj2BlYA0rbUaQ0YAn1MIZa+mkXo2LBwJgufuNVHKfFMuiD8DBRBAX1NazLLr
+Ruds9tARAn2XAJ9/ozPEegLNIXDRFHil+yEe/wz/2gCfXYXgwLrwoyeID7RIrwdc
+hIORke6IRgQTEQIABgUCQY7oHgAKCRBbloAQ4E+aiTqZAJ9SiogzAQfXUoeV12aT
+7PmwkqiulgCeJp8F5t6kEaBrA5yurTKX+6e5uV2IRgQQEQIABgUCP8IXWQAKCRCJ
+2EyvRrJixs9uAKCHjl+/UO32mu6ikEU6gmYFMLqB3QCdH+3pfTEDcGAvStQpZzE7
+ys/vZmCIRgQQEQIABgUCQt7ToAAKCRDKaTl0gQOjfpfQAKCkkLYJL5/0yrhd045h
+bIcgTN+9YQCfS64ZOAN1lh3l/SjlXLHWDzXmjlWIRgQQEQIABgUCQt9FqAAKCRBB
+6gmgV5NJj7p8AKCcfGPPWrDaq3SodTopRts4Kmo8EACgjJRLCg2DHKAzise70OVN
+THGYLm2IRgQQEQIABgUCQt+G2QAKCRAEYzpXfCAJQexCAJ97xbwzZhMOOXiM4aj5
+Ulzrja9nVwCdFZsZgtozofpvmZaHeEtKucxGG3qIRgQQEQIABgUCQt+SVwAKCRAB
+BWa85BNjkr5mAJ9qlkrrGciNUdkcGGjfAb444/G9rgCfTVtutNz831bCqDowpSqZ
+M5bAuUOIRgQQEQIABgUCQuAc7gAKCRCM43a4HNSGH39EAJ98iw5WB5CZOXHbhEPw
+dUnTSVKwkwCfcWJD5Yr0bSriF9aVLChmAzi9jjCIRgQQEQIABgUCQuOlhgAKCRAE
+kTRC6hujjbJoAJ9Mw8UfCDIttO0SGqaodq932IIUngCgj+E2QuHkF0TyMApSaEIO
+w8NOPsKIRgQQEQIABgUCQuSFYgAKCRBhGWouMz5OhB7XAKC4J7nTmBWA6cn67C0B
+vja2bxzRrwCeMAWS6xn1tBZ1vm6vP2A6WtNRWlmIRgQSEQIABgUCQt6mVwAKCRCL
+lilD/CQ/PGZGAJ0RRqxeZpOhWoM2ADUfrkqTkTXk+wCfWiWHJ64H7Ubs7z58fBsi
+M69wpeuIRgQTEQIABgUCQoptEwAKCRDI4/o2Nmo3W05JAJ9arsg7sN3ft5siNuGB
+pnd3Q01ToQCdHjxosGdQalkXeymtXD8SjACn1x6IRgQTEQIABgUCQt6v4QAKCRD9
+b4jGIdCnG4UIAKCJOOihLbPfW+c2CrkE6nEPxQ29SQCgkBCbx+h8aMEyqJqjPWpd
+QvfQofuIRgQTEQIABgUCQt66EwAKCRAyyeTONkLLSyDiAJ94yVjfasZoGZodSR/2
+kYqF4ZQEdQCgvOrzez4RP1JCHWsFTn15tUQgNh2IRgQTEQIABgUCQt7UjgAKCRDu
+0eo5ImHQc6jEAJ921c05ZPfI+9uWI97wsopfW+PDFACfQ/PxEyEzeCXbYFoEUe7B
+tOgp1AyIRgQTEQIABgUCQt9sXgAKCRBQjq7FMC2laOH/AKCwImpjMHoE9H7sQx7L
+I+9m1PmOeQCdH4x9T3vUF4gHL8BypAse/UuLQbmIRgQTEQIABgUCQt9sYAAKCRDd
+umS6LDEtLxjpAKDoV9vn0QheFsQLYuUeDF/5m20TkgCgwkSVcCDP/7m6aZ8blA/h
+cAeKrJCIRgQTEQIABgUCQuDsmAAKCRDJtabs4td03wkIAKCmhOt1jrHnnknNr623
+OtngC3yhkwCeMH2xnonwIboYmyo3hzC84VHzr1SIRgQTEQIABgUCQuDs5gAKCRA3
+9o/1AVr8ilTiAKCLvPNLPVjXY8epjHhSxkRY6+HU2wCfZnVkzoW+c7NQ0G7Db5/G
+rMjEgdyIRgQTEQIABgUCQuJhxQAKCRBtmI0XhzFcMY0AAJwKmpwnqrX8aDV2+t+E
+uTrM4i+42wCcDiK/v3y0jmXbylU5eZ93mrealSKIRgQTEQIABgUCQuNVMwAKCRAT
+LknU5B7cflj2AJ9ZTTFhGTJALO2/xVX8eVGucVbO5QCfe3mRMPaSx5nKne3TQWIR
+2Pck102IRgQTEQIABgUCQuNkkgAKCRB1yqKj85s3UN2KAKCH9B6mMup+BSkf/qog
+WTp+wkzt8ACfdLzMTdNnt15YpS0TEmSNrq0waweIRgQTEQIABgUCQuPrZQAKCRDy
+AsuClhyUYN+TAKCQGVfmlOhNu/L67ZmneL1KA7iMXACePs6DOTSlIh0LKzGvZh0H
+8jAwtR2IRgQTEQIABgUCQuPs9AAKCRAyhk5BnIUiKxpRAKCHGnESODZlUhkrPZ9G
+bKZj/WKMgACfY7HDgvOuK7N9evmNB1+8dUTZnuyIRgQTEQIABgUCQuUQeAAKCRBS
+eS+vmXivhsKnAJ9a1Pp8ZyZWTtryRgeRyIZ6CaG9DACeJtY83ZL2LatOpgfcLCt5
+U/F2okmIRgQTEQIABgUCQuURcgAKCRBrc6EGKmI/cllgAJ9LOwF1qeUlQplpr+mn
+mlLB9JyV+gCg8d75X/XaHWMYCqBs8dh0E/0zf6GIRgQTEQIABgUCQudgyQAKCRBu
+lHWUwVJDGoW3AKCvlrR3dxaHHPAa3Gxae3NTu9/j+ACdG66gH2TAfa9qSx/E+9Df
+H0pdIseInAQTAQIABgUCQt6sNQAKCRAxpj2W7BQLgUYIBACQv85g415QDF40KBaq
+b+3GMOtrHq0gbhG/xq8EfVq2NN+W4jRBgpDIdj17zgTgDy1Xby/04UK+7CMNhAFA
+li5QXPQgO+iKgmV3Dvdzml9P+IGGb7CjU7/oANNfJoCwFUeZanizFzZepTkyci9x
+H5OHcfe4Lhiq18wCmlb4nkG7wYicBBMBAgAGBQJC32xcAAoJEJrNPMCpn3XdRfoD
+/i0tYfOTUwa3OQ8hj9RUx9KTYJe/M0vGuyuNxEWdRB5R6AUolIeboIunb5auAbRb
+ubrVbXjRkvJS5wCqOO7WyL49w9G4BVAO0Uw+QptION+UdpV9ZfXHd+nsgDuiRkVM
+yhX0336SoD57RyiT5rglKpKOCb7l4e12S0dVr15PXc7IiQEcBBMBAgAGBQJC/ToO
+AAoJEFwyh8czExtlBa4H/jj+/4NJgM7ciC0A45ySTdJZY+DYFJyRCu5bCPkcYS6A
+3PKInXc8RgFykWfz0X57UtobvH+s0O+Gyg6ArSErEHXsCZGYlHPpcACgFLiLS7yE
+gEpzDLClmSIMmb7kRGr9LX5RyQhAPAjszlIk9jPdcn3jkTtvr+oHrVLmTy8tcW3u
+d9G8oD7PCZAeD2P8XA2eHiY+9/oPu5y/cJKLYl3J+gL6Ptk7jngft3hwr/6X/dAc
+bE9h09ZS9ZRmf28NiCEBJ6meswMA8C2ocJLmW+7X2Cctfo2LIPpvI0uKzvAeh+Hl
+/97HmmyArknk8qEFYHNh5sI7yT8okbuZ5daI0Ibp1NKIRgQTEQIABgUCQv04lgAK
+CRB+iDZMgoRJhB28AJ4wWlHXGXU73JYV3b/A5l0gdVF+qwCeKkLJspvZ+BF2cV3u
+4FKwIeq4FaqIRQQSEQIABgUCQuE1ugAKCRCiEVrhX2uLchEGAJUSSguS2p3XVs6l
+3ssMx/Cm11RoAJ4hazOLz9zi9bkkZe4Jsnj8t8dkPIhGBBARAgAGBQJDJH2xAAoJ
+EPwPhYn4lL4SDsgAniHK2LhZ+mFApRlM1EHt1XwuZic7AJ9DK42czJ0hWYRJuUge
+gH1hRJM3l7kBDQQ585IFEAQAqsJfRx6LMF9sBtHmNf83j1V2SCVv4NK8OoPcKWBg
+MKQxnDkpWD7DdV69p6azP6N/ENfmK8qsSiXHUUEwOS2UMct7T3Tqi5f/EAVSgw4T
+rTC9dgpafTUpU5A8MW7h+Psm0XDwmwlqREUvyK2gqnpVaMXhZIVU71yTeXxy/3Vs
+7ysAAwUD/iJg+Bc0iZ7LNnW1xZuvc4/6LOEGelQpmM5SPr+gG6DHXhR+TrUMDt7R
+e+WkPGS8yqqxZ/4JefF5X6KgQwDadfQAYldFwW0XakOBCP17yK3aJsYtdaxTyx5e
+R0LuGbxVdMz3u/UtY1Txn72wlEEqnPhNokbvAI50jyc71TTXWKaviEYEGBECAAYF
+AjnzkgUACgkQbQvHOkBYGDcHiwCeNV4G2NP0SvG75RaqmYvnvbyC1xUAn1qF30A0
+W/Kdk2iuwPLJw9rN5PFA
+=WPl7
+-----END PGP PUBLIC KEY BLOCK-----



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:41:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:41:49 -0500
Subject: rpms/gnome-bluetooth/devel gnome-bluetooth-0.7.0-pydir.patch, 1.1,
	1.2 gnome-bluetooth.spec, 1.29, 1.30
Message-ID: <200602271341.k1RDfnsR023559@cvs.devel.redhat.com>

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23515

Modified Files:
	gnome-bluetooth-0.7.0-pydir.patch gnome-bluetooth.spec 
Log Message:
pydir fixes for lib64

gnome-bluetooth-0.7.0-pydir.patch:
 acinclude.m4                      |  126 --------------------------------------
 python/Makefile.am                |    2 
 python/gnome-bluetooth-manager.in |    7 +-
 src/Makefile.am                   |    2 
 4 files changed, 9 insertions(+), 128 deletions(-)

Index: gnome-bluetooth-0.7.0-pydir.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth-0.7.0-pydir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-bluetooth-0.7.0-pydir.patch	16 Feb 2006 14:22:08 -0000	1.1
+++ gnome-bluetooth-0.7.0-pydir.patch	27 Feb 2006 13:41:44 -0000	1.2
@@ -1,5 +1,16 @@
+--- gnome-bluetooth-0.7.0/src/Makefile.am.pydir	2006-02-27 14:37:05.000000000 +0100
++++ gnome-bluetooth-0.7.0/src/Makefile.am	2006-02-27 14:37:52.000000000 +0100
+@@ -118,7 +118,7 @@
+ 		--override $(srcdir)/gnomebt-chooser.override \
+ 		$(srcdir)/gnomebt-chooser.defs > $@
+ 
+-pydir = @pythondir@/gnomebt/
++pydir = @pyexecdir@/gnomebt/
+ 
+ controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
+ controller_la_LIBADD =  libgnomebt.la
 --- gnome-bluetooth-0.7.0/acinclude.m4.pydir	2005-11-21 23:13:25.000000000 +0100
-+++ gnome-bluetooth-0.7.0/acinclude.m4	2006-02-16 11:26:49.000000000 +0100
++++ gnome-bluetooth-0.7.0/acinclude.m4	2006-02-27 14:31:40.000000000 +0100
 @@ -27,108 +27,6 @@
  # doesn't meet the requirement.  MINIMUM-VERSION should consist of
  # numbers and dots only.
@@ -147,8 +158,17 @@
  dnl Configure paths for libsdp
  dnl Edd Dumbill <edd at usefulinc.com>
  dnl Shamelessly stolen from Jack Moffitt, who stole
+--- gnome-bluetooth-0.7.0/python/Makefile.am.pydir	2006-02-27 14:37:13.000000000 +0100
++++ gnome-bluetooth-0.7.0/python/Makefile.am	2006-02-27 14:37:30.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-pythondir = @pythondir@/gnomebt
++pythondir = @pyexecdir@/gnomebt
+ pkgpythondir = $(pythondir)
+ libdir = $(pkgpythondir)
+ 
 --- gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in.pydir	2005-11-19 20:02:14.000000000 +0100
-+++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-02-16 11:40:39.000000000 +0100
++++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-02-27 14:31:40.000000000 +0100
 @@ -1,4 +1,7 @@
  #!/bin/sh
 -PYTHONPATH=@pythondir@:$PYTHONPATH


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-bluetooth.spec	16 Feb 2006 18:07:53 -0000	1.29
+++ gnome-bluetooth.spec	27 Feb 2006 13:41:44 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -107,6 +107,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Mon Feb 27 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-2
+- pydir fixes for lib64
+
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-1
 - version 0.7.0
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:42:10 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:42:10 -0500
Subject: rpms/system-config-soundcard/devel system-config-soundcard.spec,
	1.28, 1.29
Message-ID: <200602271342.k1RDgA4S023774@cvs.devel.redhat.com>

Author: stransky

Update of /cvs/dist/rpms/system-config-soundcard/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23739

Modified Files:
	system-config-soundcard.spec 
Log Message:
added hicolor-icon-theme to PreReq, (#182880, #182881)


Index: system-config-soundcard.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- system-config-soundcard.spec	7 Feb 2006 12:47:07 -0000	1.28
+++ system-config-soundcard.spec	27 Feb 2006 13:42:06 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A graphical interface for detecting and configuring soundcards
 Name: system-config-soundcard
 Version: 1.2.16
-Release: 1
+Release: 2
 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html
 License: GPL
 ExclusiveOS: Linux
@@ -21,6 +21,7 @@
 Requires: kudzu
 Requires: alsa-utils >= 1.0.11
 Requires: alsa-lib
+PreReq: hicolor-icon-theme
 
 %description
 system-config-soundcard is a graphical user interface that 
@@ -81,6 +82,9 @@
 %ghost /root/scsound.log
 
 %changelog
+* Mon Feb 27 2006 Martin Stransky <stransky at redhat.com> 1.2.16-2
+- added hicolor-icon-theme to PreReq, (#182880, #182881)
+
 * Wed Feb 01 2006 Martin Stransky <stransky at redhat.com> 1.2.16-1
 - volume control, new look, music (#178124)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:46:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:46:08 -0500
Subject: rpms/man/devel man-1.6b-i18n_nroff.patch, 1.1, 1.2 man.spec, 1.45,
	1.46
Message-ID: <200602271346.k1RDk8oS031619@cvs.devel.redhat.com>

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30353

Modified Files:
	man-1.6b-i18n_nroff.patch man.spec 
Log Message:
- fix the encoding of the Bulgarian translation


man-1.6b-i18n_nroff.patch:
 configure       |   19 +++------
 src/man.c       |  112 ++++++++++++++++++++++++++++++++++++++++----------------
 src/man.conf.in |    4 --
 src/paths.h.in  |    2 -
 4 files changed, 88 insertions(+), 49 deletions(-)

Index: man-1.6b-i18n_nroff.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.6b-i18n_nroff.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6b-i18n_nroff.patch	10 Nov 2005 10:34:16 -0000	1.1
+++ man-1.6b-i18n_nroff.patch	27 Feb 2006 13:46:03 -0000	1.2
@@ -125,7 +125,7 @@
 +    { "ro",    "ISO-8859-2" },
 +    { "sk",    "ISO-8859-2" },
 +    { "sl",    "ISO-8859-2" },
-+    { "bg",    "KOI8-R"     },
++    { "bg",    "CP1251"     },
 +    { "be",    "KOI8-R"     },
 +    { "mk",    "KOI8-R"     },
 +    { "ru",    "KOI8-R"     },


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- man.spec	11 Feb 2006 04:28:22 -0000	1.45
+++ man.spec	27 Feb 2006 13:46:03 -0000	1.46
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.6c
-Release: 1.2
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -85,7 +85,7 @@
    elif [ ${lang} = pl ]; then charset=iso-8859-2
    elif [ ${lang} = ro ]; then charset=iso-8859-2
    elif [ ${lang} = sl ]; then charset=iso-8859-2
-   elif [ ${lang} = bg ]; then charset=iso-8859-5
+   elif [ ${lang} = bg ]; then charset=cp1251
    elif [ ${lang} = el ]; then charset=iso-8859-7
    else
       echo === LANGUAGE ${lang}: MUST SPECIFY CHARSET/ENCODING
@@ -143,7 +143,7 @@
    elif [ ${lang} = pl ]; then charset=iso-8859-2
    elif [ ${lang} = ro ]; then charset=iso-8859-2
    elif [ ${lang} = sl ]; then charset=iso-8859-2
-   elif [ ${lang} = bg ]; then charset=iso-8859-5
+   elif [ ${lang} = bg ]; then charset=cp1251
    elif [ ${lang} = el ]; then charset=iso-8859-7
    else
       echo === LANGUAGE ${lang}: MUST SPECIFY CHARSET/ENCODING
@@ -320,6 +320,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Mon Feb 27 2006 Ivana Varekova <varekova at redhat.com> - 1.6c-2
+- fix the encoding of the Bulgarian translation  
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6c-1.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:47:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:47:20 -0500
Subject: rpms/emacs/devel sort-columns-posix-key-182282.patch, NONE,
	1.1 dotemacs.el, 1.7, 1.8 emacs.spec, 1.64, 1.65
Message-ID: <200602271347.k1RDlKJt006127@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3417

Modified Files:
	dotemacs.el emacs.spec 
Added Files:
	sort-columns-posix-key-182282.patch 
Log Message:
- buildrequire libXaw-devel for menus and scrollbar
- pass -R to setarch to disable address randomization during dumping
  (Sam Peterson, #174736)
- install cc-mode.info correctly (Sam Peterson, #182084)
- fix sort-columns not to use deprecated non-posix sort key syntax
  with sort-columns-posix-key-182282.patch (Richard Ryniker, #182282)
- use system-name function not variable when setting frame-title-format in
  /etc/skel/.emacs for XEmacs users hitting .emacs



sort-columns-posix-key-182282.patch:
 sort.el |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE sort-columns-posix-key-182282.patch ---
--- emacs-21.4/lisp/sort.el.orig	2001-07-15 12:15:34.000000000 -0400
+++ emacs-21.4/lisp/sort.el	2006-02-20 00:21:17.000000000 -0500
@@ -493,9 +493,13 @@
 	  ;; Use the sort utility if we can; it is 4 times as fast.
 	  ;; Do not use it if there are any properties in the region,
 	  ;; since the sort utility would lose the properties.
+	  ;; POSIX does not allow older sort programs' zero-origin,
+	  ;;  "+...-" key specification; use one-origin "-k" argument instead.
 	  (let ((sort-args (list (if reverse "-rt\n" "-t\n")
-				 (concat "+0." (int-to-string col-start))
-				 (concat "-0." (int-to-string col-end)))))
+				 (concat "-k 1."
+					 (int-to-string (1+ col-start))
+					 ",1."
+					 (int-to-string (1+ col-end)) ) )))
 	    (when sort-fold-case
 	      (push "-f" sort-args))
 	    (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))


Index: dotemacs.el
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/dotemacs.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dotemacs.el	30 May 2005 08:49:09 -0000	1.7
+++ dotemacs.el	27 Feb 2006 13:47:17 -0000	1.8
@@ -12,7 +12,7 @@
 
 ;; default to better frame titles
 (setq frame-title-format
-      (concat  "%b - emacs@" system-name))
+      (concat  "%b - emacs@" (system-name)))
 
 ;; default to unified diffs
 (setq diff-switches "-u")


Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- emacs.spec	11 Feb 2006 02:37:16 -0000	1.64
+++ emacs.spec	27 Feb 2006 13:47:17 -0000	1.65
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 12.2
+Release: 13
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -55,7 +55,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, texinfo
 %if %{emacs21}
-Buildrequires: autoconf213, Xaw3d-devel
+Buildrequires: autoconf213, libXaw-devel, Xaw3d-devel
 %else
 Buildrequires: autoconf, gtk2-devel
 %endif
@@ -126,6 +126,7 @@
 Patch123: smtpmail-cvs-update.patch
 %endif
 Patch124: mule-cmd.el-X11-locale.alias-173781.patch
+Patch125: sort-columns-posix-key-182282.patch
 
 %description
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -264,6 +265,8 @@
 %endif
 # locale.alias path
 %patch124 -p1
+# sort-columns posix key defs
+%patch125 -p1
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -282,7 +285,6 @@
 
 # install newer cc-mode
 cp -p cc-mode-%{cc_mode_ver}/*.el lisp/progmodes
-cp -p cc-mode-%{cc_mode_ver}/cc-mode.texi man
 
 %build
 export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
@@ -334,8 +336,7 @@
 rm -f info/cc-mode*
 %endif
 ( cd cc-mode-%{cc_mode_ver}
-  makeinfo cc-mode.texi
-  cp -p cc-mode.info* ../info )
+  makeinfo cc-mode.texi )
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -343,7 +344,7 @@
 # workaround #101818 (vm/break dumper problem)
 %makeinstall \
 %ifarch %{ix86}
-  SETARCH="setarch i386"
+  SETARCH="setarch i386 -R"
 %endif
 
 # suffix binaries with -x
@@ -359,7 +360,7 @@
 %configure --without-x
 %__make %{?_smp_mflags} \
 %ifarch %{ix86}
-  SETARCH="setarch i386"
+  SETARCH="setarch i386 -R"
 %endif
 
 # install the emacs without X
@@ -416,6 +417,9 @@
   install -m 644 elisp elisp-* $RPM_BUILD_ROOT%{_infodir} )
 %endif
 
+# cc-mode manual
+install -m 644 cc-mode-%{cc_mode_ver}/cc-mode.info* $RPM_BUILD_ROOT%{_infodir}
+
 # after everything is installed, remove info dir
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -456,7 +460,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
    
-%define info_files ada-mode autotype cc-mode cl dired-x ebrowse ediff efaq elisp emacs eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman
+%define info_files ada-mode autotype cc-mode.info cl dired-x ebrowse ediff efaq elisp emacs eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman
 
 %post common
 for f in %{info_files}; do
@@ -538,6 +542,16 @@
 %endif
 
 %changelog
+* Mon Feb 27 2006 Jens Petersen <petersen at redhat.com> - 21.4-13
+- buildrequire libXaw-devel for menus and scrollbar
+- pass -R to setarch to disable address randomization during dumping
+  (Sam Peterson, #174736)
+- install cc-mode.info correctly (Sam Peterson, #182084)
+- fix sort-columns not to use deprecated non-posix sort key syntax
+  with sort-columns-posix-key-182282.patch (Richard Ryniker, #182282)
+- use system-name function not variable when setting frame-title-format in
+  /etc/skel/.emacs for XEmacs users hitting .emacs
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 21.4-12.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:47:44 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:47:44 -0500
Subject: rpms/yelp/devel .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 yelp.spec,
	1.53, 1.54
Message-ID: <200602271347.k1RDliP6006384@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6331

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.13.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	13 Feb 2006 01:26:39 -0000	1.23
+++ .cvsignore	27 Feb 2006 13:47:41 -0000	1.24
@@ -12,3 +12,4 @@
 yelp-2.13.3.tar.bz2
 yelp-2.13.4.tar.bz2
 yelp-2.13.5.tar.bz2
+yelp-2.13.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	13 Feb 2006 01:26:39 -0000	1.23
+++ sources	27 Feb 2006 13:47:41 -0000	1.24
@@ -1 +1 @@
-8db22c647577c6c3b5249ecc3cc9987a  yelp-2.13.5.tar.bz2
+a60684fad5f33f65cb4738f4743c9d92  yelp-2.13.6.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- yelp.spec	13 Feb 2006 02:01:58 -0000	1.53
+++ yelp.spec	27 Feb 2006 13:47:41 -0000	1.54
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.13.5
-Release: 2
+Version: 2.13.6
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -117,6 +117,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.6-1
+- Update to 2.13.6
+
 * Sun Feb 12 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-2
 - Turn on info and man support for test3
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 13:57:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 08:57:06 -0500
Subject: rpms/gnome-vfs2/devel .cvsignore, 1.28, 1.29 gnome-vfs2.spec, 1.96,
	1.97 sources, 1.28, 1.29
Message-ID: <200602271357.k1RDv60c010725@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10672

Modified Files:
	.cvsignore gnome-vfs2.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	13 Feb 2006 12:49:55 -0000	1.28
+++ .cvsignore	27 Feb 2006 13:57:04 -0000	1.29
@@ -15,3 +15,4 @@
 gnome-vfs-2.13.3.tar.bz2
 gnome-vfs-2.13.4.tar.bz2
 gnome-vfs-2.13.91.tar.bz2
+gnome-vfs-2.13.92.tar.bz2


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- gnome-vfs2.spec	13 Feb 2006 12:49:55 -0000	1.96
+++ gnome-vfs2.spec	27 Feb 2006 13:57:04 -0000	1.97
@@ -10,7 +10,7 @@
 
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
-Version: 2.13.91
+Version: 2.13.92
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -182,6 +182,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	13 Feb 2006 12:49:55 -0000	1.28
+++ sources	27 Feb 2006 13:57:04 -0000	1.29
@@ -1 +1 @@
-a4e5e5acc6d5ce030c22106b4e5be8ea  gnome-vfs-2.13.91.tar.bz2
+faff1305378d5aa1ac37c13c0788866f  gnome-vfs-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 14:01:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 09:01:06 -0500
Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.15,
	1.16 gnome-doc-utils.spec, 1.18, 1.19 sources, 1.15, 1.16
Message-ID: <200602271401.k1RE16cL011774@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-doc-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11718

Modified Files:
	.cvsignore gnome-doc-utils.spec sources 
Log Message:
0.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	21 Feb 2006 04:40:27 -0000	1.15
+++ .cvsignore	27 Feb 2006 14:00:15 -0000	1.16
@@ -12,3 +12,4 @@
 gnome-doc-utils-0.5.4.tar.bz2
 gnome-doc-utils-0.5.5.tar.bz2
 gnome-doc-utils-0.5.6.tar.bz2
+gnome-doc-utils-0.5.7.tar.bz2


Index: gnome-doc-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-doc-utils.spec	21 Feb 2006 04:40:27 -0000	1.18
+++ gnome-doc-utils.spec	27 Feb 2006 14:00:30 -0000	1.19
@@ -1,6 +1,6 @@
 Summary: Documentation utilities for the GNOME project
 Name: gnome-doc-utils
-Version: 0.5.6
+Version: 0.5.7
 Release: 1
 License: LGPL
 Group: Development/Tools
@@ -53,6 +53,9 @@
 %{_datadir}/gnome-doc-utils
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.7-1
+- Update to 0.5.7
+
 * Mon Feb 20 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.6-1
 - Update to 0.5.6
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	21 Feb 2006 04:40:27 -0000	1.15
+++ sources	27 Feb 2006 14:00:30 -0000	1.16
@@ -1 +1 @@
-fb59fdb7874593f8ed6f5a248b149236  gnome-doc-utils-0.5.6.tar.bz2
+113bf83ba2c09f5baff6e3c8e748abf6  gnome-doc-utils-0.5.7.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 14:42:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 09:42:55 -0500
Subject: rpms/tvtime/devel tvtime.spec,1.25,1.26
Message-ID: <200602271442.k1REgtbx027666@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/tvtime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27652

Modified Files:
	tvtime.spec 
Log Message:
fix post install script error #182895



Index: tvtime.spec
===================================================================
RCS file: /cvs/dist/rpms/tvtime/devel/tvtime.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tvtime.spec	11 Feb 2006 05:54:24 -0000	1.25
+++ tvtime.spec	27 Feb 2006 14:42:53 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: A high quality TV viewer.
 Name: tvtime
 Version: 1.0.1
-Release: 3.2
+Release: 4
 License: GPL
 Group: Applications/Multimedia
 URL: http://tvtime.sourceforge.net
@@ -13,6 +13,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires: gtk2 >= 2.6
+PreReq: hicolor-icon-theme
 
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: zlib-devel
@@ -92,6 +93,9 @@
 %{_bindir}/tvtime
 
 %changelog
+* Mon Feb 27 2006 Than Ngo <than at redhat.com> 1.0.1-4
+- fix post install script error #182895
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.0.1-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 14:44:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 09:44:17 -0500
Subject: rpms/gal/devel gal.spec,1.19,1.20
Message-ID: <200602271444.k1REiHd6027727@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27713

Modified Files:
	gal.spec 
Log Message:
- BuildRequires: libSM-devel


Index: gal.spec
===================================================================
RCS file: /cvs/dist/rpms/gal/devel/gal.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gal.spec	11 Feb 2006 02:47:37 -0000	1.19
+++ gal.spec	27 Feb 2006 14:44:15 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name: gal
 Version: 0.24
-Release: 6.2.1
+Release: 7
 Summary: The GNOME Application Library
 Group: System Environment/Libraries
 Epoch: 1
@@ -18,6 +18,7 @@
 BuildRequires: gnome-print-devel >= 0.22
 BuildRequires: gtk+-devel >= 1.2.7
 BuildRequires: gdk-pixbuf-devel 
+BuildRequires: libSM-devel
 
 %description
 A collection of GNOME widgets and utility functions.
@@ -82,6 +83,9 @@
 %{_libdir}/libgal.so.*.*
 
 %changelog
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 0.24-7
+- BuildRequires: libSM-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.24-6.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 14:48:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 09:48:01 -0500
Subject: rpms/GConf/devel GConf.spec,1.15,1.16
Message-ID: <200602271448.k1REm1bp007861@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/GConf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7848

Modified Files:
	GConf.spec 
Log Message:
- BuildRequires zlib-devel

error:
gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -DG_DISABLE_CHECKS=1 -DG_DISABLE_ASSERT=1 -o .libs/gconftool-1 gconftool.o -rdynamic  -L/usr/lib64 -lORBit -lIIOP -lORBitutil -lglib -lm -lglib -lORBit -lIIOP -lORBitutil -lglib -lm -lpopt /usr/lib64/libxml.so -lz -lz -lz ./.libs/libgconf-1.so -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lm -lgmodule -lglib -ldl -Wl,--rpath -Wl,/usr/lib64
/usr/bin/ld: cannot find -lz
collect2: ld returned 1 exit status



Index: GConf.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf/devel/GConf.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- GConf.spec	25 Feb 2006 04:39:44 -0000	1.15
+++ GConf.spec	27 Feb 2006 14:47:58 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: The Gnome Config System.
 Name: GConf
 Version: 1.0.9
-Release: 19
+Release: 20
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.gz
@@ -17,6 +17,7 @@
 Requires: ORBit >= 1:0.5.0
 Requires: libxml >= 1:1.8.0
 BuildRequires: libxml-devel ORBit-devel gtk+-devel oaf-devel glib-devel
+BuildRequires: zlib-devel
 BuildRequires: /usr/bin/autoconf-2.13
 Patch: GConf-1.0.9-exit-timeout.patch
 Patch2: GConf-1.0.9-errormessage.patch
@@ -111,6 +112,9 @@
 %{_bindir}/gconf-config-1
 
 %changelog
+* Mon Feb 27 2006 Karsten Hopp <karsten at redhat.de> 1.0.9-20
+- BuildRequires zlib-devel
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.0.9-19
 - Prereq: coreutils
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 14:51:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 09:51:16 -0500
Subject: rpms/authconfig/devel .cvsignore, 1.41, 1.42 authconfig.spec, 1.55,
	1.56 sources, 1.48, 1.49
Message-ID: <200602271451.k1REpF2t008008@cvs.devel.redhat.com>

Author: tmraz

Update of /cvs/dist/rpms/authconfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7993

Modified Files:
	.cvsignore authconfig.spec sources 
Log Message:
* Mon Feb 27 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.2-1
- add try_first_pass option to pam_unix for better integration
  with individual service configurations (#182350)
- updated translations



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	20 Feb 2006 21:03:14 -0000	1.41
+++ .cvsignore	27 Feb 2006 14:51:13 -0000	1.42
@@ -1 +1 @@
-authconfig-5.2.1.tar.bz2
+authconfig-5.2.2.tar.bz2


Index: authconfig.spec
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- authconfig.spec	20 Feb 2006 21:03:31 -0000	1.55
+++ authconfig.spec	27 Feb 2006 14:51:13 -0000	1.56
@@ -1,6 +1,6 @@
 Summary: Text-mode tool for setting up NIS and shadow passwords.
 Name: authconfig
-Version: 5.2.1
+Version: 5.2.2
 # Don't change release in elvis CVS, up version after merging all patches
 # from dist CVS instead.
 Release: 1
@@ -94,6 +94,11 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Feb 27 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.2-1
+- add try_first_pass option to pam_unix for better integration
+  with individual service configurations (#182350)
+- updated translations
+
 * Mon Feb 20 2006 Tomas Mraz <tmraz at redhat.com> - 5.2.1-1
 - don't crash in TUI when some options aren't set (#182151)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/authconfig/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	20 Feb 2006 21:03:31 -0000	1.48
+++ sources	27 Feb 2006 14:51:13 -0000	1.49
@@ -1 +1 @@
-025322138bc856ee42464a238f410cb0  authconfig-5.2.1.tar.bz2
+ff97e6d82b1baa5196efd943c33dc0ab  authconfig-5.2.2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 15:55:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 10:55:21 -0500
Subject: rpms/mod_python/devel mod_python-3.1.4-apr1x.patch, 1.2,
	1.3 mod_python.spec, 1.29, 1.30
Message-ID: <200602271555.k1RFtLgg029747@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29714

Modified Files:
	mod_python-3.1.4-apr1x.patch mod_python.spec 
Log Message:
* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-3
- remove use of apr_sockaddr_port_get


mod_python-3.1.4-apr1x.patch:
 connobject.c   |   10 ++--------
 filterobject.c |    2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

Index: mod_python-3.1.4-apr1x.patch
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python-3.1.4-apr1x.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_python-3.1.4-apr1x.patch	27 Feb 2006 13:37:35 -0000	1.2
+++ mod_python-3.1.4-apr1x.patch	27 Feb 2006 15:55:17 -0000	1.3
@@ -9,6 +9,21 @@
              PyErr_SetObject(PyExc_IOError, 
                              PyString_FromString("Connection read error"));
              return NULL;
+@@ -320,13 +320,7 @@
+     PyObject *addrobj = makeipaddr(addr);
+     PyObject *ret = NULL;
+     if (addrobj) {
+-        apr_port_t port;
+-        if(apr_sockaddr_port_get(&port, addr)==APR_SUCCESS) {
+-            ret = Py_BuildValue("Oi", addrobj, port );
+-        }
+-        else {
+-            PyErr_SetString(PyExc_SystemError,"apr_sockaddr_port_get failure");
+-        }
++        ret = Py_BuildValue("Oi", addrobj, addr->port );
+         Py_DECREF(addrobj);
+     }
+     return ret;
 --- mod_python-3.2.8/src/filterobject.c.apr1x
 +++ mod_python-3.2.8/src/filterobject.c
 @@ -178,7 +178,7 @@


Index: mod_python.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_python/devel/mod_python.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- mod_python.spec	27 Feb 2006 13:37:35 -0000	1.29
+++ mod_python.spec	27 Feb 2006 15:55:17 -0000	1.30
@@ -4,7 +4,7 @@
 Summary: An embedded Python interpreter for the Apache Web server.
 Name: mod_python
 Version: 3.2.8
-Release: 2
+Release: 3
 Source: http://www.apache.org/dist/httpd/modpython/%{name}-%{version}.tgz
 Source1: python.conf
 Patch2: mod_python-3.1.4-config.patch
@@ -68,6 +68,9 @@
 %{_libdir}/python*/site-packages/mod_python
 
 %changelog
+* Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-3
+- remove use of apr_sockaddr_port_get
+
 * Mon Feb 27 2006 Joe Orton <jorton at redhat.com> 3.2.8-2
 - update to 3.2.8
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 15:58:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 10:58:54 -0500
Subject: rpms/hplip/devel hplip-0.9.8-4.patch, NONE, 1.1 hplip.spec, 1.47,
	1.48 hplip-0.9.8-3.patch, 1.1, NONE
Message-ID: <200602271558.k1RFwsPL031365@cvs.devel.redhat.com>

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31304

Modified Files:
	hplip.spec 
Added Files:
	hplip-0.9.8-4.patch 
Removed Files:
	hplip-0.9.8-3.patch 
Log Message:
* Mon Feb 27 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-5
- Patchlevel 4.


hplip-0.9.8-4.patch:
 ChangeLog                    |   19 +++
 Makefile.am                  |   13 +-
 base/device.py               |  248 +++++++++++++++++++++----------------------
 base/status.py               |  113 +++++++++----------
 data/xml/HPLIP-02-2006.xml   |   83 --------------
 hplip_readme.html            |   15 --
 prnt/hpijs/Makefile.am       |    4 
 prnt/hpijs/hpijs_readme.html |    3 
 prnt/hpijs/ljfastraster.cpp  |    5 
 9 files changed, 217 insertions(+), 286 deletions(-)

--- NEW FILE hplip-0.9.8-4.patch ---
diff -uNr hplip-0.9.8.old/base/device.py hplip-0.9.8.new/base/device.py
--- hplip-0.9.8.old/base/device.py	2006-01-27 14:14:45.000000000 -0800
+++ hplip-0.9.8.new/base/device.py	2006-02-06 13:49:33.000000000 -0800
@@ -438,8 +438,6 @@
         self.panel_check = True
         self.io_state = IO_STATE_HP_READY
         self.is_local = isLocal(self.bus)
-        self.dev_file = ''
-        self.serial = ''
 
         self.supported = False
 
@@ -829,11 +827,12 @@
                 log.error("Error getting 3-bit status.")
                 raise Error(ERROR_DEVICE_IO_ERROR)
 
-            try:
-                self.getDeviceID()
-            except Error, e:
-                log.error("Error getting device ID.")
-                raise Error(ERROR_DEVICE_IO_ERROR)
+            if self.tech_type in (TECH_TYPE_MONO_INK, TECH_TYPE_COLOR_INK):
+                try:
+                    self.getDeviceID()
+                except Error, e:
+                    log.error("Error getting device ID.")
+                    raise Error(ERROR_DEVICE_IO_ERROR)
 
             try:
                 self.getDevFile()
@@ -868,102 +867,101 @@
 
             status_block = {}
 
+            if status_type == STATUS_TYPE_NONE:
+                log.warn("No status available for device.")
+                status_block = {'status-code' : STATUS_PRINTER_IDLE}
+
+            elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
+                log.debug("Type 1/2 (S: or VSTATUS:) status")
+                status_block = status.parseStatus(self.deviceID)
+
+            elif status_type == STATUS_TYPE_LJ:
+                log.debug("Type 3 LaserJet status")
+                status_block = status.StatusType3(self, self.deviceID)
+
+            elif status_type == STATUS_TYPE_S_W_BATTERY:
+                log.debug("Type 4 S: status with battery check")
+                status_block = status.parseStatus(self.deviceID)
+                status.BatteryCheck(self, status_block)
+
+            else:
+                log.error("Unimplemented status type: %d" % status_type)
+
+            if status_block:
+                log.debug(status_block)
+                self.dq.update(status_block)
+                try:
+                    status_block['agents']
+                except KeyError:
+                    pass
+                else:
+                    agents = status_block['agents']
+                    del self.dq['agents']
+
+            
+            status_code = self.dq.get('status-code', STATUS_UNKNOWN)
+            
+            if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
+                tx_active, rx_active = status.getFaxStatus(self)
+                
+                if tx_active:
+                    status_code = STATUS_FAX_TX_ACTIVE
+                elif rx_active:
+                    status_code = STATUS_FAX_RX_ACTIVE
+                    
+    
             try:
-                if status_type == STATUS_TYPE_NONE:
-                    log.warn("No status available for device.")
-                    status_block = {'status-code' : STATUS_PRINTER_IDLE}
-    
-                elif status_type in (STATUS_TYPE_VSTATUS, STATUS_TYPE_S, STATUS_TYPE_S_SNMP):
-                    log.debug("Type 1/2 (S: or VSTATUS:) status")
-                    status_block = status.parseStatus(self.deviceID)
-    
-                elif status_type == STATUS_TYPE_LJ:
-                    log.debug("Type 3 LaserJet status")
-                    status_block = status.StatusType3(self, self.deviceID)
-    
-                elif status_type == STATUS_TYPE_S_W_BATTERY:
-                    log.debug("Type 4 S: status with battery check")
-                    status_block = status.parseStatus(self.deviceID)
-                    status.BatteryCheck(self, status_block)
+                self.dq.update({'status-desc' : self.queryString(status_code),
+                                'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
+                                })
+
+            except (KeyError, Error):
+                self.dq.update({'status-desc' : '',
+                                'error-state' : ERROR_STATE_CLEAR,
+                                })
     
-                else:
-                    log.error("Unimplemented status type: %d" % status_type)
+            self.sendEvent(status_code)
+
+            if not quick:
+                r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
     
-                if status_block:
-                    log.debug(status_block)
-                    self.dq.update(status_block)
-                    try:
-                        status_block['agents']
-                    except KeyError:
-                        pass
-                    else:
-                        agents = status_block['agents']
-                        del self.dq['agents']
+                if status_type != STATUS_TYPE_NONE:
     
-                
-                status_code = self.dq.get('status-code', STATUS_UNKNOWN)
-                
-                if self.mq.get('fax-type', 0) and status_code == STATUS_PRINTER_IDLE:
-                    tx_active, rx_active = status.getFaxStatus(self)
-                    
-                    if tx_active:
-                        status_code = STATUS_FAX_TX_ACTIVE
-                    elif rx_active:
-                        status_code = STATUS_FAX_RX_ACTIVE
-                        
-        
-                try:
-                    self.dq.update({'status-desc' : self.queryString(status_code),
-                                    'error-state' : STATUS_TO_ERROR_STATE_MAP.get(status_code, ERROR_STATE_CLEAR),
-                                    })
-    
-                except (KeyError, Error):
-                    self.dq.update({'status-desc' : '',
-                                    'error-state' : ERROR_STATE_CLEAR,
-                                    })
-        
-                self.sendEvent(status_code)
+                    if self.panel_check:
+                        self.panel_check = bool(self.mq.get('panel-check-type', 0))
     
-                if not quick:
-                    r_value, rg, rr, r_value_str = 0, '000', '000000', '000000000'
-        
-                    if status_type != STATUS_TYPE_NONE:
-        
-                        if self.panel_check:
-                            self.panel_check = bool(self.mq.get('panel-check-type', 0))
-        
-                        if self.panel_check and status_type != STATUS_TYPE_NONE:
-                            #try:
+                    if self.panel_check and status_type != STATUS_TYPE_NONE:
+                        try:
                             self.panel_check, line1, line2 = status.PanelCheck(self)
-                            #finally:
-                            #    self.closePML()
-        
-                            self.dq.update({'panel': int(self.panel_check),
-                                              'panel-line1': line1,
-                                              'panel-line2': line2,})
-        
-        
-                        if r_type > 0:
+                        finally:
+                            self.closePML()
+    
+                        self.dq.update({'panel': int(self.panel_check),
+                                          'panel-line1': line1,
+                                          'panel-line2': line2,})
+    
+    
+                    if r_type > 0:
+                        if self.r_values is None:
+                            fields, data, result_code = \
+                                self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
+                            
+                            if result_code == ERROR_SUCCESS and data:
+                                try:
+                                    r_value = int(data.strip())
+                                except:
+                                    pass
+                                else:
+                                    log.debug("r_value=%d" % r_value)
+                                    r_value_str = str(r_value)
+                                    r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                    rg, rr = r_value_str[:3], r_value_str[3:]
+                                    r_value = int(rr)
+                                    self.r_values = r_value, r_value_str, rg, rr
+                                    
                             if self.r_values is None:
-                                fields, data, result_code = \
-                                    self.xmitHpssdMessage('GetValue', {'device-uri': self.device_uri, 'key': 'r_value'})
-                                
-                                if result_code == ERROR_SUCCESS and data:
+                                if status_type ==  STATUS_TYPE_S and self.is_local:
                                     try:
-                                        r_value = int(data.strip())
-                                    except:
-                                        pass
-                                    else:
-                                        log.debug("r_value=%d" % r_value)
-                                        r_value_str = str(r_value)
-                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                        rg, rr = r_value_str[:3], r_value_str[3:]
-                                        r_value = int(rr)
-                                        self.r_values = r_value, r_value_str, rg, rr
-                                        
-                                if self.r_values is None:
-                                    if status_type ==  STATUS_TYPE_S:
-                                        #try:
                                         try:
                                             r_value = self.getDynamicCounter(140)
             
@@ -984,42 +982,40 @@
                                         except Error:
                                             log.error("Error attempting to read r-value (1).")
                                             r_value = 0
-                
-                                        #finally:
-                                        #    self.closePrint()
-                                    
-                                    elif status_type == STATUS_TYPE_S_SNMP:
+            
+                                    finally:
+                                        self.closePrint()
+                                
+                                elif status_type == STATUS_TYPE_S_SNMP:
+                                    try:
                                         result_code, r_value = self.getPML(pml.OID_R_SETTING)
-                                        #self.closePML()
+                                    finally:
+                                        self.closePML()
+                                    
+                                    if r_value is not None:
+                                        log.debug("r_value=%d" % r_value)
+                                        r_value_str = str(r_value)
+                                        r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
+                                        rg, rr = r_value_str[:3], r_value_str[3:]
+                                        r_value = int(rr)
+                                        self.r_values = r_value, r_value_str, rg, rr
                                         
-                                        if r_value is not None:
-                                            log.debug("r_value=%d" % r_value)
-                                            r_value_str = str(r_value)
-                                            r_value_str = ''.join(['0'*(9 - len(r_value_str)), r_value_str])
-                                            rg, rr = r_value_str[:3], r_value_str[3:]
-                                            r_value = int(rr)
-                                            self.r_values = r_value, r_value_str, rg, rr
-                                            
-                                            fields, data, result_code = \
-                                                self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
-                                        else:
-                                            r_value = 0
-                                            
+                                        fields, data, result_code = \
+                                            self.xmitHpssdMessage('SetValue', {'device-uri': self.device_uri, 'key': 'r_value', 'value': r_value})
+                                    else:
+                                        r_value = 0
                                         
-                            else:
-                                r_value, r_value_str, rg, rr = self.r_values
-        
-                    self.dq.update({'r'  : r_value,
-                                    'rs' : r_value_str,
-                                    'rg' : rg,
-                                    'rr' : rr,
-                                  })
-            finally:
-                self.closePML()
-                self.closePrint()
+                                    
+                        else:
+                            r_value, r_value_str, rg, rr = self.r_values
+    
+                self.dq.update({'r'  : r_value,
+                                'rs' : r_value_str,
+                                'rg' : rg,
+                                'rr' : rr,
+                              })
             
             if not quick:
-                
                 a = 1
                 while True:
                     mq_agent_kind = self.mq.get('r%d-agent%d-kind' % (r_value, a), 0)
diff -uNr hplip-0.9.8.old/base/status.py hplip-0.9.8.new/base/status.py
--- hplip-0.9.8.old/base/status.py	2006-01-24 10:35:53.000000000 -0800
+++ hplip-0.9.8.new/base/status.py	2006-02-06 13:49:35.000000000 -0800
@@ -668,64 +668,64 @@
     # Assumes dev is already open (i.e., dev.io_state==IO_STATE_HP_OPEN)
     try_dynamic_counters = False
     try:
-        #channel = dev.openChannel( 'HP-MESSAGE' )
-        dev.openPML()
-    except Error:
-        log.error("PML channel open failed.")
-        try_dynamic_counters = True
-    else:
-        result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
-        result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
-
-        if battery_level is not None and \
-            power_mode is not None:
-
-            if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
-                battery_level >= 0:
-
-                for x in BATTERY_PML_TRIGGER_MAP:
-                    if x[0] >= battery_level > x[1]:
-                        battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
-                        break
-
-                if power_mode & pml.POWER_MODE_CHARGING:
-                    agent_health = AGENT_HEALTH_CHARGING
-
-                elif power_mode & pml.POWER_MODE_DISCHARGING:
-                    agent_health = AGENT_HEALTH_DISCHARGING
-
+        try:
+            dev.openPML()
+        except Error:
+            log.error("PML channel open failed.")
+            try_dynamic_counters = True
+        else:
+            result, battery_level = dev.getPML(pml.OID_BATTERY_LEVEL)
+            result, power_mode =  dev.getPML(pml.OID_POWER_MODE)
+    
+            if battery_level is not None and \
+                power_mode is not None:
+    
+                if power_mode & pml.POWER_MODE_BATTERY_LEVEL_KNOWN and \
+                    battery_level >= 0:
+    
+                    for x in BATTERY_PML_TRIGGER_MAP:
+                        if x[0] >= battery_level > x[1]:
+                            battery_trigger_level = BATTERY_PML_TRIGGER_MAP[x]
+                            break
+    
+                    if power_mode & pml.POWER_MODE_CHARGING:
+                        agent_health = AGENT_HEALTH_CHARGING
+    
+                    elif power_mode & pml.POWER_MODE_DISCHARGING:
+                        agent_health = AGENT_HEALTH_DISCHARGING
+    
+                    else:
+                        agent_health = AGENT_HEALTH_OK
+    
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : agent_health,
+                                                    'level'  : battery_level,
+                                                    'level-trigger' : battery_trigger_level,
+                                                    })
                 else:
-                    agent_health = AGENT_HEALTH_OK
-
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : agent_health,
-                                                'level'  : battery_level,
-                                                'level-trigger' : battery_trigger_level,
-                                                })
+                    status_block['agents'].append({
+                                                    'kind'   : AGENT_KIND_INT_BATTERY,
+                                                    'type'   : AGENT_TYPE_UNSPECIFIED,
+                                                    'health' : AGENT_HEALTH_UNKNOWN,
+                                                    'level'  : 0,
+                                                    'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
+                                                    })
+    
             else:
-                status_block['agents'].append({
-                                                'kind'   : AGENT_KIND_INT_BATTERY,
-                                                'type'   : AGENT_TYPE_UNSPECIFIED,
-                                                'health' : AGENT_HEALTH_UNKNOWN,
-                                                'level'  : 0,
-                                                'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
-                                                })
-
-        else:
-            try_dynamic_counters = True
-
-        #dev.closeChannel( 'HP-MESSAGE' )
-        #dev.closePML()
-
-        if try_dynamic_counters:
+                try_dynamic_counters = True
+    
+    finally:
+        dev.closePML()
 
+    if try_dynamic_counters:
+        try:
             try:
                 battery_health = dev.getDynamicCounter(200)
                 battery_trigger_level = dev.getDynamicCounter(201)
                 battery_level = dev.getDynamicCounter(202)
-
+    
                 status_block['agents'].append({
                                                 'kind'   : AGENT_KIND_INT_BATTERY,
                                                 'type'   : AGENT_TYPE_UNSPECIFIED,
@@ -741,7 +741,8 @@
                                                 'level'  : 0,
                                                 'level-trigger' : AGENT_LEVEL_TRIGGER_SUFFICIENT_0,
                                                 })
-
+        finally:
+            dev.closePrint()
 
 # this works for 2 pen products that allow 1 or 2 pens inserted
 # from: k, kcm, cmy, ggk
@@ -785,8 +786,8 @@
             
 def getFaxStatus(dev):
     tx_active, rx_active = False, False
-    #try:
-    if 1:
+
+    try:
         dev.openPML()
     
         result_code, tx_state = dev.getPML(pml.OID_FAXJOB_TX_STATUS)
@@ -801,7 +802,7 @@
             if rx_state not in (pml.FAXJOB_RX_STATUS_IDLE, pml.FAXJOB_RX_STATUS_DONE):
                 rx_active = True
     
-    #finally:
-    #    dev.closePML()
+    finally:
+        dev.closePML()
         
     return tx_active, rx_active
diff -uNr hplip-0.9.8.old/ChangeLog hplip-0.9.8.new/ChangeLog
--- hplip-0.9.8.old/ChangeLog	2006-01-31 12:00:08.000000000 -0800
+++ hplip-0.9.8.new/ChangeLog	2006-02-23 10:51:00.000000000 -0800
@@ -1,3 +1,22 @@
+2006-02-23 dsuffield
+    * Created hplip-0.9.8-4.patch
+
+2006-02-23 rcauligi
+    * Fixed an array index underflow in ljfastraster.cpp
+
+2006-02-06 dsuffield
+    * Created hplip-0.9.8-3.patch
+	
+2006-02-06 syie
+    * Remove Jedi from models.xml
+
+2006-02-06 dwelch
+    * Fixed defect 832 (An r-value (1) error occurs while launching toolbox.) [aka, the RAW mode defect as reported by Henrique de Moraes Holschuh (Debian)]
+
+2006-02-06 dsuffield
+    * Applied hplip-0.9.8-2.patch.
+    * Removed Jedi for readme files.
+
 2006-01-30 dsuffield
     * Release 0.9.8.22 (public release 0.9.8)
 	
diff -uNr hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml
--- hplip-0.9.8.old/data/xml/HPLIP-02-2006.xml	2006-01-31 11:57:04.000000000 -0800
+++ hplip-0.9.8.new/data/xml/HPLIP-02-2006.xml	2006-02-06 13:07:03.000000000 -0800
@@ -24,7 +24,7 @@
 This file automatically generated by model_editor.py.
 Please do not hand edit this file.
 
-Last written on Tue, 31 Jan 2006 12:02:06 by syie
+Last written on Mon, 06 Feb 2006 13:07:03 by dsuffiel
 using model_editor version 6.2.
 -->
 
@@ -168,87 +168,6 @@
     <r type="1"/>
 </model>
 
-<model name="HP_Color_LaserJet_2605">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
-<model name="HP_Color_LaserJet_2605dtn">
-    <id></id>
-    <icon>hp_color_LaserJet_2550.png</icon>
-    <support type="2"/>
-    <io support="6" mode="1" control="0" mfp-mode="4" scan-port="1"/>
-    <align type="0"/>
-    <clean type="0"/>
-    <color-cal type="0"/>
-    <status type="0"/>
-    <scan type="0"/>
-    <fax type="0"/>
-    <pcard type="0"/>
-    <copy type="0"/>
-    <tech class="Postscript" type="4"/>
-    <embedded-server type="1"/>
-    <panel-check type="1"/>
-    <linefeed-cal type="0"/>
-    <pq-diag type="0"/>
-    <r0>
-        <agent1 kind="4" type="1" sku="60 (Q3960A)"/>
-        <agent2 kind="4" type="4" sku="61/71 (Q3961/71A)"/>
-        <agent3 kind="4" type="6" sku="62/72 (Q3962/72A)"/>
-        <agent4 kind="4" type="5" sku="63/73 (Q3963/73A)"/>
-        <agent5 kind="7" type="62" sku="64 (Q3964A)"/>
-    </r0>
-</model>
-
 <model name="HP_LaserJet_3050">
     <id></id>
     <icon>hp_LaserJet_3015.png</icon>
diff -uNr hplip-0.9.8.old/hplip_readme.html hplip-0.9.8.new/hplip_readme.html
--- hplip-0.9.8.old/hplip_readme.html	2006-01-31 12:02:53.000000000 -0800
+++ hplip-0.9.8.new/hplip_readme.html	2006-02-23 10:53:35.000000000 -0800
@@ -890,18 +890,6 @@
 <td class=xl19 width=144 style='width:108pt'><b>Services/Status</b></td>
 </tr>
 <tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
-<td height=17 style='height:12.75pt'>Color_LaserJet_2605dtn</td>
-<td>No</td><td>Yes</td><td>Yes</td><td>Postscript</td>
-<td>No</td><td>No</td><td>No</td>
-<td class='xl19'>No</td></tr><tr height=17 style='height:12.75pt'>
 <td height=17 style='height:12.75pt'>Color_LaserJet_3000</td>
 <td>No</td><td>Yes</td><td>Yes</td><td>LJColor</td>
 <td>No</td><td>No</td><td>No</td>
@@ -1793,7 +1781,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -2563,7 +2550,7 @@
 &#169 2004-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPLIP 0.9.8, last updated January 27, 2006
+HPLIP 0.9.8, last updated February 6, 2006
 </font>
 </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/Makefile.am hplip-0.9.8.new/Makefile.am
--- hplip-0.9.8.old/Makefile.am	2006-01-09 12:20:27.000000000 -0800
+++ hplip-0.9.8.new/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -20,8 +20,10 @@
 dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py photo.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
     sendfax.py setup.py
 
-# hp backend.
 cupsdir = $(CUPS_BACKEND_PATH)
+cupsppddir = $(CUPS_PPD_PATH)
+
+# hp backend.
 cups_PROGRAMS = hp
 hp_SOURCES = backend/hp/hp.c 
 hp_LDADD = libhplip-api.la
@@ -232,7 +234,7 @@
 #
 #       Edit hpiod.conf in destdir.
 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(CUPS_PPD_PATH)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\ncups=$(cupsppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
 #
 #       Edit hpiod.sh in destdir.
 	sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
@@ -260,12 +262,15 @@
 	   cp -f data/xml/unreleased/*.xml $(DESTDIR)$(hplipdir)/data/xml/; \
 	fi
 #
-#       Install fax support, let hpijs install ppd for now.
+#       Install fax support.
 	mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax 
 	if [ "$(rpm_install)" = "no" ]; then \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsdir); \
 	   $(INSTALL_SCRIPT) $(DESTDIR)$(hpfaxdir)/hpfax $(DESTDIR)$(cupsdir); \
+	   $(mkinstalldirs) $(DESTDIR)$(cupsppddir)/model; \
+	   $(INSTALL_SCRIPT) $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd $(DESTDIR)$(cupsppddir)/model; \
+	   gzip -f $(DESTDIR)$(cupsppddir)/model/HP-Fax-hplip.ppd; \
 	fi
-	cp fax/ppd/HP-Fax-hplip.ppd prnt/hpijs/ppd/
 
 #
 # Add prerequisites for testing (or building?) "make install DESTDIR=/build".
diff -uNr hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html
--- hplip-0.9.8.old/prnt/hpijs/hpijs_readme.html	2006-01-27 16:19:10.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/hpijs_readme.html	2006-02-06 13:45:38.000000000 -0800
@@ -3279,7 +3279,6 @@
  3. Moved OfficeJet 6100 and 6150 to DJ55xx.h; margins on these devices are same as those on DJ5550.
  4. Added support for the following new printers.
 
-    HP Color LaserJet 2605 (PS)
     HP LaserJet 3050 (LJMono/PS)
     HP LaserJet 3060/3062 (LJMono/PS)
     HP LaserJet 3390/3392 (LJMono/PS)
@@ -4141,7 +4140,7 @@
 &#169 2001-2006 Hewlett-Packard Company<br>
 This document is provided "AS IS" without warranties of any kind including warranties of merchantability, fitness for a particular purpose, or non-infringement of intellectual property.
 <br>
-HPIJS 2.1.8, last updated January 27, 2006
+HPIJS 2.1.8, last updated February 6, 2006
 </font>
  </BODY>
 </HTML>
diff -uNr hplip-0.9.8.old/prnt/hpijs/ljfastraster.cpp hplip-0.9.8.new/prnt/hpijs/ljfastraster.cpp
--- hplip-0.9.8.old/prnt/hpijs/ljfastraster.cpp	2006-01-30 12:48:09.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/ljfastraster.cpp	2006-02-23 10:46:25.000000000 -0800
@@ -1078,6 +1078,7 @@
                                &&
                                (
                                  /* seedrow and run */
+                                 ((col + 2) >= horz_ht_dist) &&
                                  (cur_row[col+2-horz_ht_dist] == cur_row[col+2])
                                  ||
                                  /* seedrow and northeast predict */
@@ -1091,6 +1092,8 @@
                          (
                            (cur_row[col] != seedrow[col])
                            &&
+                           ((col + 1) >= horz_ht_dist)
+                           &&
                            (cur_row[col+1-horz_ht_dist] == cur_row[col+1])
                            &&
                            (
@@ -1098,6 +1101,8 @@
                              (
                                ((col+2) < row_width)
                                &&
+                               ((col + 2) >= horz_ht_dist)
+                               &&
                                (cur_row[col+2-horz_ht_dist] == cur_row[col+2])
                              )
                              ||
diff -uNr hplip-0.9.8.old/prnt/hpijs/Makefile.am hplip-0.9.8.new/prnt/hpijs/Makefile.am
--- hplip-0.9.8.old/prnt/hpijs/Makefile.am	2006-01-24 12:19:06.000000000 -0800
+++ hplip-0.9.8.new/prnt/hpijs/Makefile.am	2006-02-06 11:41:17.000000000 -0800
@@ -80,8 +80,8 @@
 	rm -f $(DESTDIR)$(ppddir)/hp*.ppd*
 
 install-cups:
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
-	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/HP*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/HP*.ppd*
+#	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/hp*.ppd* $(DESTDIR)$(CUPS_PPD_PATH)/foomatic/HP/hp*.ppd*
 	rm -f $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds
 	$(mkinstalldirs) $(DESTDIR)$(CUPS_PPD_PATH)
 	ln -s $(datadir)/ppd $(DESTDIR)$(CUPS_PPD_PATH)/foomatic-ppds


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- hplip.spec	14 Feb 2006 16:18:28 -0000	1.47
+++ hplip.spec	27 Feb 2006 15:58:51 -0000	1.48
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.8
-Release: 4
+Release: 5
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,7 +13,7 @@
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-0.9.8-3.patch
+Patch4: hplip-0.9.8-4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -67,8 +67,8 @@
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Apply patch 0.9.8-2
-%patch4 -p1 -b .0.9.8-3
+# Apply patch 0.9.8-4
+%patch4 -p1 -b .0.9.8-4
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -159,6 +159,9 @@
 fi
 
 %changelog
+* Mon Feb 27 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-5
+- Patchlevel 4.
+
 * Tue Feb 14 2006 Tim Waugh <twaugh at redhat.com> 0.9.8-4
 - Added Obsoletes: hpoj tags back in (bug #181476).
 


--- hplip-0.9.8-3.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 27 16:57:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 11:57:35 -0500
Subject: rpms/gcc/devel gcc41-fortran-matmul.patch, NONE,
	1.1 gcc41-fortran-where-opt.patch, NONE, 1.1 gcc41-mni.patch,
	NONE, 1.1 gcc41-x86_64-sse3.patch, NONE, 1.1 .cvsignore, 1.136,
	1.137 gcc41.spec, 1.39, 1.40 sources, 1.138,
	1.139 gcc41-c++-parser.patch, 1.1,
	NONE gcc41-expr_nonzero_p.patch, 1.1,
	NONE gcc41-fortran-where.patch, 1.1,
	NONE gcc41-libstdc++-bitset.patch, 1.1,
	NONE gcc41-mmintrin.patch, 1.1, NONE gcc41-pr25626.patch, 1.1,
	NONE gcc41-sparc64-g7.patch, 1.1, NONE gcc41-vrp.patch, 1.1, NONE
Message-ID: <200602271657.k1RGvZpJ005409@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5254

Modified Files:
	.cvsignore gcc41.spec sources 
Added Files:
	gcc41-fortran-matmul.patch gcc41-fortran-where-opt.patch 
	gcc41-mni.patch gcc41-x86_64-sse3.patch 
Removed Files:
	gcc41-c++-parser.patch gcc41-expr_nonzero_p.patch 
	gcc41-fortran-where.patch gcc41-libstdc++-bitset.patch 
	gcc41-mmintrin.patch gcc41-pr25626.patch 
	gcc41-sparc64-g7.patch gcc41-vrp.patch 
Log Message:
4.1.0-0.30


gcc41-fortran-matmul.patch:
 0 files changed

--- NEW FILE gcc41-fortran-matmul.patch ---
2005-12-13  Richard Sandiford  <richard at codesourcery.com>

	* Make-lang.in (fortran/trans-resolve.o): Depend on
	fortran/dependency.h.
	* gfortran.h (gfc_expr): Add an "inline_noncopying_intrinsic" flag.
	* dependency.h (gfc_get_noncopying_intrinsic_argument): Declare.
	(gfc_check_fncall_dependency): Change prototype.
	* dependency.c (gfc_get_noncopying_intrinsic_argument): New function.
	(gfc_check_argument_var_dependency): New function, split from
	gfc_check_fncall_dependency.
	(gfc_check_argument_dependency): New function.
	(gfc_check_fncall_dependency): Replace the expression parameter with
	separate symbol and argument list parameters.  Generalize the function
	to handle dependencies for any type of expression, not just variables.
	Accept a further argument giving the intent of the expression being
	tested.  Ignore	intent(in) arguments if that expression is also
	intent(in).
	* resolve.c: Include dependency.h.
	(find_noncopying_intrinsics): New function.
	(resolve_function, resolve_call): Call it on success.
	* trans-array.h (gfc_conv_array_transpose): Declare.
	(gfc_check_fncall_dependency): Remove prototype.
	* trans-array.c (gfc_conv_array_transpose): New function.
	* trans-intrinsic.c (gfc_conv_intrinsic_function): Don't use the
	libcall handling if the expression is to be evaluated inline.
	Add a case for handling inline transpose()s.
	* trans-expr.c (gfc_trans_arrayfunc_assign): Adjust for the new
	interface provided by gfc_check_fncall_dependency.

2005-12-13  Richard Sandiford  <richard at codesourcery.com>
	    Victor Leikehman  <LEI at il.ibm.com>

	* m4/matmul.m4: Use a different order in the special case of a
	transposed first argument.
	* generated/matmul_c4.c, generated/matmul_c8.c, generated/matmul_c10.c,
	* generated/matmul_c16.c, generated/matmul_i4.c, generated/matmul_i8.c,
	* generated/matmul_i10.c, generated/matmul_r4.c, generated/matmul_r8.c
	* generated/matmul_r10.c, generated/matmul_r16.c: Regenerated.

--- gcc/fortran/trans-expr.c	(revision 111475)
+++ gcc/fortran/trans-expr.c	(working copy)
@@ -2934,7 +2934,9 @@ gfc_trans_arrayfunc_assign (gfc_expr * e
     }
 
   /* Check for a dependency.  */
-  if (gfc_check_fncall_dependency (expr1, expr2))
+  if (gfc_check_fncall_dependency (expr1, INTENT_OUT,
+				   expr2->value.function.esym,
+				   expr2->value.function.actual))
     return NULL;
 
   /* The frontend doesn't seem to bother filling in expr->symtree for intrinsic
--- gcc/fortran/trans-array.c	(revision 111475)
+++ gcc/fortran/trans-array.c	(working copy)
@@ -675,6 +675,95 @@ gfc_trans_allocate_temp_array (stmtblock
 }
 
 
+/* Generate code to tranpose array EXPR by creating a new descriptor
+   in which the dimension specifications have been reversed.  */
+
+void
+gfc_conv_array_transpose (gfc_se * se, gfc_expr * expr)
+{
+  tree dest, src, dest_index, src_index;
+  gfc_loopinfo *loop;
+  gfc_ss_info *dest_info, *src_info;
+  gfc_ss *dest_ss, *src_ss;
+  gfc_se src_se;
+  int n;
+
+  loop = se->loop;
+
+  src_ss = gfc_walk_expr (expr);
+  dest_ss = se->ss;
+
+  src_info = &src_ss->data.info;
+  dest_info = &dest_ss->data.info;
+
+  /* Get a descriptor for EXPR.  */
+  gfc_init_se (&src_se, NULL);
+  gfc_conv_expr_descriptor (&src_se, expr, src_ss);
+  gfc_add_block_to_block (&se->pre, &src_se.pre);
+  gfc_add_block_to_block (&se->post, &src_se.post);
+  src = src_se.expr;
+
+  /* Allocate a new descriptor for the return value.  */
+  dest = gfc_create_var (TREE_TYPE (src), "atmp");
+  dest_info->descriptor = dest;
+  se->expr = dest;
+
+  /* Copy across the dtype field.  */
+  gfc_add_modify_expr (&se->pre,
+		       gfc_conv_descriptor_dtype (dest),
+		       gfc_conv_descriptor_dtype (src));
+
+  /* Copy the dimension information, renumbering dimension 1 to 0 and
+     0 to 1.  */
+  gcc_assert (dest_info->dimen == 2);
+  gcc_assert (src_info->dimen == 2);
+  for (n = 0; n < 2; n++)
+    {
+      dest_info->delta[n] = integer_zero_node;
+      dest_info->start[n] = integer_zero_node;
+      dest_info->stride[n] = integer_one_node;
+      dest_info->dim[n] = n;
+
+      dest_index = gfc_rank_cst[n];
+      src_index = gfc_rank_cst[1 - n];
+
+      gfc_add_modify_expr (&se->pre,
+			   gfc_conv_descriptor_stride (dest, dest_index),
+			   gfc_conv_descriptor_stride (src, src_index));
+
+      gfc_add_modify_expr (&se->pre,
+			   gfc_conv_descriptor_lbound (dest, dest_index),
+			   gfc_conv_descriptor_lbound (src, src_index));
+
+      gfc_add_modify_expr (&se->pre,
+			   gfc_conv_descriptor_ubound (dest, dest_index),
+			   gfc_conv_descriptor_ubound (src, src_index));
+
+      if (!loop->to[n])
+        {
+	  gcc_assert (integer_zerop (loop->from[n]));
+	  loop->to[n] = build2 (MINUS_EXPR, gfc_array_index_type,
+				gfc_conv_descriptor_ubound (dest, dest_index),
+				gfc_conv_descriptor_lbound (dest, dest_index));
+        }
+    }
+
+  /* Copy the data pointer.  */
+  dest_info->data = gfc_conv_descriptor_data_get (src);
+  gfc_conv_descriptor_data_set (&se->pre, dest, dest_info->data);
+
+  /* Copy the offset.  This is not changed by transposition: the top-left
+     element is still at the same offset as before.  */
+  dest_info->offset = gfc_conv_descriptor_offset (src);
+  gfc_add_modify_expr (&se->pre,
+		       gfc_conv_descriptor_offset (dest),
+		       dest_info->offset);
+
+  if (dest_info->dimen > loop->temp_dim)
+    loop->temp_dim = dest_info->dimen;
+}
+
+
 /* Return the number of iterations in a loop that starts at START,
    ends at END, and has step STEP.  */
 
--- gcc/fortran/trans-array.h	(revision 111475)
+++ gcc/fortran/trans-array.h	(working copy)
@@ -95,6 +95,8 @@ void gfc_conv_tmp_ref (gfc_se *);
 void gfc_conv_expr_descriptor (gfc_se *, gfc_expr *, gfc_ss *);
 /* Convert an array for passing as an actual function parameter.  */
 void gfc_conv_array_parameter (gfc_se *, gfc_expr *, gfc_ss *, int);
+/* Evaluate and transpose a matrix expression.  */
+void gfc_conv_array_transpose (gfc_se *, gfc_expr *);
 
 /* These work with both descriptors and descriptorless arrays.  */
 tree gfc_conv_array_data (tree);
@@ -116,8 +118,6 @@ tree gfc_conv_descriptor_ubound (tree, t
 
 /* Dependency checking for WHERE and FORALL.  */
 int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
-/* Dependency checking for function calls.  */
-int gfc_check_fncall_dependency (gfc_expr *, gfc_expr *);
 
 /* Add pre-loop scalarization code for intrinsic functions which require
    special handling.  */
--- gcc/fortran/Make-lang.in	(revision 111475)
+++ gcc/fortran/Make-lang.in	(working copy)
@@ -304,4 +304,5 @@ fortran/trans-intrinsic.o: $(GFORTRAN_TR
   gt-fortran-trans-intrinsic.h
 fortran/dependency.o: $(GFORTRAN_TRANS_DEPS) fortran/dependency.h
 fortran/trans-common.o: $(GFORTRAN_TRANS_DEPS) $(TARGET_H) $(RTL_H)
+fortran/resolve.o: fortran/dependency.h
 
--- gcc/fortran/gfortran.h	(revision 111475)
+++ gcc/fortran/gfortran.h	(working copy)
@@ -1213,6 +1213,9 @@ typedef struct gfc_expr
 
   /* True if it is converted from Hollerith constant.  */
   unsigned int from_H : 1;
+  /* True if the expression is a call to a function that returns an array,
+     and if we have decided not to allocate temporary data for that array.  */
+  unsigned int inline_noncopying_intrinsic : 1;
 
   union
   {
--- gcc/fortran/resolve.c	(revision 111475)
+++ gcc/fortran/resolve.c	(working copy)
@@ -25,6 +25,7 @@ Software Foundation, 51 Franklin Street,
 #include "system.h"
 #include "gfortran.h"
 #include "arith.h"  /* For gfc_compare_expr().  */
+#include "dependency.h"
 
 /* Types used in equivalence statements.  */
 
@@ -879,6 +880,24 @@ resolve_actual_arglist (gfc_actual_argli
   return SUCCESS;
 }
 
+
+/* Go through each actual argument in ACTUAL and see if it can be
+   implemented as an inlined, non-copying intrinsic.  FNSYM is the
+   function being called, or NULL if not known.  */
+
+static void
+find_noncopying_intrinsics (gfc_symbol * fnsym, gfc_actual_arglist * actual)
+{
+  gfc_actual_arglist *ap;
+  gfc_expr *expr;
+
+  for (ap = actual; ap; ap = ap->next)
+    if (ap->expr
+	&& (expr = gfc_get_noncopying_intrinsic_argument (ap->expr))
+	&& !gfc_check_fncall_dependency (expr, INTENT_IN, fnsym, actual))
+      ap->expr->inline_noncopying_intrinsic = 1;
+}
+
 /* This function does the checking of references to global procedures
    as defined in sections 18.1 and 14.1, respectively, of the Fortran
    77 and 95 standards.  It checks for a gsymbol for the name, making
@@ -1362,6 +1381,9 @@ resolve_function (gfc_expr * expr)
       gfc_expr_set_symbols_referenced (expr->ts.cl->length);
     }
 
+  if (t == SUCCESS)
+    find_noncopying_intrinsics (expr->value.function.esym,
+				expr->value.function.actual);
   return t;
 }
 
@@ -1608,26 +1630,26 @@ resolve_call (gfc_code * c)
   /* Resume assumed_size checking. */
   need_full_assumed_size--;
 
-  if (c->resolved_sym != NULL)
-    return SUCCESS;
 
-  switch (procedure_kind (c->symtree->n.sym))
-    {
-    case PTYPE_GENERIC:
-      t = resolve_generic_s (c);
-      break;
+  t = SUCCESS;
+  if (c->resolved_sym == NULL)
+    switch (procedure_kind (c->symtree->n.sym))
+      {
+      case PTYPE_GENERIC:
+	t = resolve_generic_s (c);
+	break;
 
-    case PTYPE_SPECIFIC:
-      t = resolve_specific_s (c);
-      break;
+      case PTYPE_SPECIFIC:
+	t = resolve_specific_s (c);
+	break;
 
-    case PTYPE_UNKNOWN:
-      t = resolve_unknown_s (c);
-      break;
+      case PTYPE_UNKNOWN:
+	t = resolve_unknown_s (c);
+	break;
 
-    default:
-      gfc_internal_error ("resolve_subroutine(): bad function type");
-    }
+      default:
+	gfc_internal_error ("resolve_subroutine(): bad function type");
+      }
 
   if (c->ext.actual != NULL
       && c->symtree->n.sym->attr.elemental)
@@ -1644,6 +1666,8 @@ resolve_call (gfc_code * c)
 	}
     }
 
+  if (t == SUCCESS)
+    find_noncopying_intrinsics (c->resolved_sym, c->ext.actual);
   return t;
 }
 
--- gcc/fortran/dependency.c	(revision 111475)
+++ gcc/fortran/dependency.c	(working copy)
@@ -175,6 +175,32 @@ gfc_is_same_range (gfc_array_ref * ar1, 
 }
 
 
+/* Some array-returning intrinsics can be implemented by reusing the
+   data from one of the array arguments.  For example, TRANPOSE does
+   not necessarily need to allocate new data: it can be implemented
+   by copying the original array's descriptor and simply swapping the
+   two dimension specifications.
+
+   If EXPR is a call to such an intrinsic, return the argument
+   whose data can be reused, otherwise return NULL.  */
+
+gfc_expr *
+gfc_get_noncopying_intrinsic_argument (gfc_expr * expr)
+{
+  if (expr->expr_type != EXPR_FUNCTION || !expr->value.function.isym)
+    return NULL;
+
+  switch (expr->value.function.isym->generic_id)
+    {
+    case GFC_ISYM_TRANSPOSE:
+      return expr->value.function.actual->expr;
+
+    default:
+      return NULL;
+    }
+}
+
+
 /* Return true if the result of reference REF can only be constructed
    using a temporary array.  */
 
@@ -214,23 +240,82 @@ gfc_ref_needs_temporary_p (gfc_ref *ref)
 }
 
 
-/* Dependency checking for direct function return by reference.
-   Returns true if the arguments of the function depend on the
-   destination.  This is considerably less conservative than other
-   dependencies because many function arguments will already be
-   copied into a temporary.  */
+/* Return true if array variable VAR could be passed to the same function
+   as argument EXPR without interfering with EXPR.  INTENT is the intent
+   of VAR.
+
+   This is considerably less conservative than other dependencies
+   because many function arguments will already be copied into a
+   temporary.  */
+
+static int
+gfc_check_argument_var_dependency (gfc_expr * var, sym_intent intent,
+				   gfc_expr * expr)
+{
+  gcc_assert (var->expr_type == EXPR_VARIABLE);
+  gcc_assert (var->rank > 0);
+
+  switch (expr->expr_type)
+    {
+    case EXPR_VARIABLE:
+      return (gfc_ref_needs_temporary_p (expr->ref)
+	      || gfc_check_dependency (var, expr, NULL, 0));
+
+    case EXPR_ARRAY:
+      return gfc_check_dependency (var, expr, NULL, 0);
+
+    case EXPR_FUNCTION:
+      if (intent != INTENT_IN && expr->inline_noncopying_intrinsic)
+	{
+	  expr = gfc_get_noncopying_intrinsic_argument (expr);
+	  return gfc_check_argument_var_dependency (var, intent, expr);
+	}
+      return 0;
+
+    default:
+      return 0;
+    }
+}
+  
+  
+/* Like gfc_check_argument_var_dependency, but extended to any
+   array expression OTHER, not just variables.  */
+
+static int
+gfc_check_argument_dependency (gfc_expr * other, sym_intent intent,
+			       gfc_expr * expr)
+{
+  switch (other->expr_type)
+    {
+    case EXPR_VARIABLE:
+      return gfc_check_argument_var_dependency (other, intent, expr);
+
+    case EXPR_FUNCTION:
+      if (other->inline_noncopying_intrinsic)
+	{
+	  other = gfc_get_noncopying_intrinsic_argument (other);
+	  return gfc_check_argument_dependency (other, INTENT_IN, expr);
+	}
+      return 0;
+
+    default:
+      return 0;
+    }
+}
+
+
+/* Like gfc_check_argument_dependency, but check all the arguments in ACTUAL.
+   FNSYM is the function being called, or NULL if not known.  */
 
 int
-gfc_check_fncall_dependency (gfc_expr * dest, gfc_expr * fncall)
+gfc_check_fncall_dependency (gfc_expr * other, sym_intent intent,
+			     gfc_symbol * fnsym, gfc_actual_arglist * actual)
 {
-  gfc_actual_arglist *actual;
+  gfc_formal_arglist *formal;
   gfc_expr *expr;
 
-  gcc_assert (dest->expr_type == EXPR_VARIABLE
-	  && fncall->expr_type == EXPR_FUNCTION);
-  gcc_assert (fncall->rank > 0);
-
-  for (actual = fncall->value.function.actual; actual; actual = actual->next)
+  formal = fnsym ? fnsym->formal : NULL;
+  for (; actual; actual = actual->next, formal = formal ? formal->next : NULL)
     {
       expr = actual->expr;
 
@@ -238,23 +323,14 @@ gfc_check_fncall_dependency (gfc_expr * 
       if (!expr)
 	continue;
 
-      /* Non-variable expressions will be allocated temporaries anyway.  */
-      switch (expr->expr_type)
-	{
-	case EXPR_VARIABLE:
-	  if (!gfc_ref_needs_temporary_p (expr->ref)
-	      && gfc_check_dependency (dest, expr, NULL, 0))
-	    return 1;
-	  break;
-
-	case EXPR_ARRAY:
-	  if (gfc_check_dependency (dest, expr, NULL, 0))
-	    return 1;
-	  break;
+      /* Skip intent(in) arguments if OTHER itself is intent(in).  */
+      if (formal
+	  && intent == INTENT_IN
+	  && formal->sym->attr.intent == INTENT_IN)
+	continue;
 
-	default:
-	  break;
-	}
+      if (gfc_check_argument_dependency (other, intent, expr))
+	return 1;
     }
 
   return 0;
--- gcc/fortran/dependency.h	(revision 111475)
+++ gcc/fortran/dependency.h	(working copy)
@@ -22,7 +22,9 @@ Software Foundation, 51 Franklin Street,
 
 
 bool gfc_ref_needs_temporary_p (gfc_ref *);
-int gfc_check_fncall_dependency (gfc_expr *, gfc_expr *);
+gfc_expr *gfc_get_noncopying_intrinsic_argument (gfc_expr *);
+int gfc_check_fncall_dependency (gfc_expr *, sym_intent, gfc_symbol *,
+				 gfc_actual_arglist *);
 int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
 int gfc_is_same_range (gfc_array_ref *, gfc_array_ref *, int, int);
 int gfc_expr_is_one (gfc_expr *, int);
--- gcc/fortran/trans-intrinsic.c	(revision 111475)
+++ gcc/fortran/trans-intrinsic.c	(working copy)
@@ -2898,7 +2898,7 @@ gfc_conv_intrinsic_function (gfc_se * se
 
   name = &expr->value.function.name[2];
 
-  if (expr->rank > 0)
+  if (expr->rank > 0 && !expr->inline_noncopying_intrinsic)
     {
       lib = gfc_is_intrinsic_libcall (expr);
       if (lib != 0)
@@ -3123,6 +3123,16 @@ gfc_conv_intrinsic_function (gfc_se * se
       gfc_conv_intrinsic_bound (se, expr, 0);
       break;
 
+    case GFC_ISYM_TRANSPOSE:
+      if (se->ss && se->ss->useflags)
+	{
+	  gfc_conv_tmp_array_ref (se);
+	  gfc_advance_se_ss_chain (se);
+	}
+      else
+	gfc_conv_array_transpose (se, expr->value.function.actual->expr);
+      break;
+
     case GFC_ISYM_LEN:
       gfc_conv_intrinsic_len (se, expr);
       break;
--- libgfortran/m4/matmul.m4	(revision 111475)
+++ libgfortran/m4/matmul.m4	(working copy)
@@ -37,16 +37,29 @@ include(iparm.m4)dnl
 
 `#if defined (HAVE_'rtype_name`)'
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_`'rtype_code (rtype * const restrict retarray, 
@@ -206,7 +219,28 @@ sinclude(`matmul_asm_'rtype_code`.m4')dn
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const rtype_name *restrict abase_x;
+      const rtype_name *restrict bbase_y;
+      rtype_name *restrict dest_y;
+      rtype_name s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (rtype_name) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -218,6 +252,27 @@ sinclude(`matmul_asm_'rtype_code`.m4')dn
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const rtype_name *restrict abase_x;
+      const rtype_name *restrict bbase_y;
+      rtype_name *restrict dest_y;
+      rtype_name s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (rtype_name) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_r8.c	(revision 111475)
+++ libgfortran/generated/matmul_r8.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_REAL_8)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_r8 (gfc_array_r8 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_r8 (gfc_array_r8 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_REAL_8 *restrict abase_x;
+      const GFC_REAL_8 *restrict bbase_y;
+      GFC_REAL_8 *restrict dest_y;
+      GFC_REAL_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_r8 (gfc_array_r8 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_REAL_8 *restrict abase_x;
+      const GFC_REAL_8 *restrict bbase_y;
+      GFC_REAL_8 *restrict dest_y;
+      GFC_REAL_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_r16.c	(revision 111475)
+++ libgfortran/generated/matmul_r16.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_REAL_16)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_r16 (gfc_array_r16 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_r16 (gfc_array_r16 * const restri
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_REAL_16 *restrict abase_x;
+      const GFC_REAL_16 *restrict bbase_y;
+      GFC_REAL_16 *restrict dest_y;
+      GFC_REAL_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_r16 (gfc_array_r16 * const restri
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_REAL_16 *restrict abase_x;
+      const GFC_REAL_16 *restrict bbase_y;
+      GFC_REAL_16 *restrict dest_y;
+      GFC_REAL_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_c8.c	(revision 111475)
+++ libgfortran/generated/matmul_c8.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_8)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_c8 (gfc_array_c8 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_c8 (gfc_array_c8 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_COMPLEX_8 *restrict abase_x;
+      const GFC_COMPLEX_8 *restrict bbase_y;
+      GFC_COMPLEX_8 *restrict dest_y;
+      GFC_COMPLEX_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_c8 (gfc_array_c8 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_COMPLEX_8 *restrict abase_x;
+      const GFC_COMPLEX_8 *restrict bbase_y;
+      GFC_COMPLEX_8 *restrict dest_y;
+      GFC_COMPLEX_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_i8.c	(revision 111475)
+++ libgfortran/generated/matmul_i8.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_8)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_i8 (gfc_array_i8 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_i8 (gfc_array_i8 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_INTEGER_8 *restrict abase_x;
+      const GFC_INTEGER_8 *restrict bbase_y;
+      GFC_INTEGER_8 *restrict dest_y;
+      GFC_INTEGER_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_i8 (gfc_array_i8 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_INTEGER_8 *restrict abase_x;
+      const GFC_INTEGER_8 *restrict bbase_y;
+      GFC_INTEGER_8 *restrict dest_y;
+      GFC_INTEGER_8 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_8) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_c16.c	(revision 111475)
+++ libgfortran/generated/matmul_c16.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_16)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_c16 (gfc_array_c16 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_c16 (gfc_array_c16 * const restri
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_COMPLEX_16 *restrict abase_x;
+      const GFC_COMPLEX_16 *restrict bbase_y;
+      GFC_COMPLEX_16 *restrict dest_y;
+      GFC_COMPLEX_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_c16 (gfc_array_c16 * const restri
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_COMPLEX_16 *restrict abase_x;
+      const GFC_COMPLEX_16 *restrict bbase_y;
+      GFC_COMPLEX_16 *restrict dest_y;
+      GFC_COMPLEX_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_r10.c	(revision 111475)
+++ libgfortran/generated/matmul_r10.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_REAL_10)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_r10 (gfc_array_r10 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_r10 (gfc_array_r10 * const restri
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_REAL_10 *restrict abase_x;
+      const GFC_REAL_10 *restrict bbase_y;
+      GFC_REAL_10 *restrict dest_y;
+      GFC_REAL_10 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_10) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_r10 (gfc_array_r10 * const restri
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_REAL_10 *restrict abase_x;
+      const GFC_REAL_10 *restrict bbase_y;
+      GFC_REAL_10 *restrict dest_y;
+      GFC_REAL_10 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_10) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_r4.c	(revision 111475)
+++ libgfortran/generated/matmul_r4.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_REAL_4)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_r4 (gfc_array_r4 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_r4 (gfc_array_r4 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_REAL_4 *restrict abase_x;
+      const GFC_REAL_4 *restrict bbase_y;
+      GFC_REAL_4 *restrict dest_y;
+      GFC_REAL_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_r4 (gfc_array_r4 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_REAL_4 *restrict abase_x;
+      const GFC_REAL_4 *restrict bbase_y;
+      GFC_REAL_4 *restrict dest_y;
+      GFC_REAL_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_REAL_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_c10.c	(revision 111475)
+++ libgfortran/generated/matmul_c10.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_10)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_c10 (gfc_array_c10 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_c10 (gfc_array_c10 * const restri
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_COMPLEX_10 *restrict abase_x;
+      const GFC_COMPLEX_10 *restrict bbase_y;
+      GFC_COMPLEX_10 *restrict dest_y;
+      GFC_COMPLEX_10 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_10) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_c10 (gfc_array_c10 * const restri
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_COMPLEX_10 *restrict abase_x;
+      const GFC_COMPLEX_10 *restrict bbase_y;
+      GFC_COMPLEX_10 *restrict dest_y;
+      GFC_COMPLEX_10 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_10) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_c4.c	(revision 111475)
+++ libgfortran/generated/matmul_c4.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_COMPLEX_4)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_c4 (gfc_array_c4 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_c4 (gfc_array_c4 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_COMPLEX_4 *restrict abase_x;
+      const GFC_COMPLEX_4 *restrict bbase_y;
+      GFC_COMPLEX_4 *restrict dest_y;
+      GFC_COMPLEX_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_c4 (gfc_array_c4 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_COMPLEX_4 *restrict abase_x;
+      const GFC_COMPLEX_4 *restrict bbase_y;
+      GFC_COMPLEX_4 *restrict dest_y;
+      GFC_COMPLEX_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_COMPLEX_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_i4.c	(revision 111475)
+++ libgfortran/generated/matmul_i4.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_4)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_i4 (gfc_array_i4 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_i4 (gfc_array_i4 * const restrict
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_INTEGER_4 *restrict abase_x;
+      const GFC_INTEGER_4 *restrict bbase_y;
+      GFC_INTEGER_4 *restrict dest_y;
+      GFC_INTEGER_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_i4 (gfc_array_i4 * const restrict
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_INTEGER_4 *restrict abase_x;
+      const GFC_INTEGER_4 *restrict bbase_y;
+      GFC_INTEGER_4 *restrict dest_y;
+      GFC_INTEGER_4 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_4) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif
--- libgfortran/generated/matmul_i16.c	(revision 111475)
+++ libgfortran/generated/matmul_i16.c	(working copy)
@@ -36,16 +36,29 @@ Boston, MA 02110-1301, USA.  */
 
 #if defined (HAVE_GFC_INTEGER_16)
 
-/* This is a C version of the following fortran pseudo-code. The key
-   point is the loop order -- we access all arrays column-first, which
-   improves the performance enough to boost galgel spec score by 50%.
+/* The order of loops is different in the case of plain matrix
+   multiplication C=MATMUL(A,B), and in the frequent special case where
+   the argument A is the temporary result of a TRANSPOSE intrinsic:
+   C=MATMUL(TRANSPOSE(A),B).  Transposed temporaries are detected by
+   looking at their strides.
+
+   The equivalent Fortran pseudo-code is:
 
    DIMENSION A(M,COUNT), B(COUNT,N), C(M,N)
-   C = 0
-   DO J=1,N
-     DO K=1,COUNT
+   IF (.NOT.IS_TRANSPOSED(A)) THEN
+     C = 0
+     DO J=1,N
+       DO K=1,COUNT
+         DO I=1,M
+           C(I,J) = C(I,J)+A(I,K)*B(K,J)
+   ELSE
+     DO J=1,N
        DO I=1,M
-         C(I,J) = C(I,J)+A(I,K)*B(K,J)
+         S = 0
+         DO K=1,COUNT
+           S = S+A(I,K)+B(K,J)
+         C(I,J) = S
+   ENDIF
 */
 
 extern void matmul_i16 (gfc_array_i16 * const restrict retarray, 
@@ -204,7 +217,28 @@ matmul_i16 (gfc_array_i16 * const restri
 	    }
 	}
     }
-  else
+  else if (rxstride == 1 && aystride == 1 && bxstride == 1)
+    {
+      const GFC_INTEGER_16 *restrict abase_x;
+      const GFC_INTEGER_16 *restrict bbase_y;
+      GFC_INTEGER_16 *restrict dest_y;
+      GFC_INTEGER_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n] * bbase_y[n];
+	      dest_y[x] = s;
+	    }
+	}
+    }
+  else if (axstride < aystride)
     {
       for (y = 0; y < ycount; y++)
 	for (x = 0; x < xcount; x++)
@@ -216,6 +250,27 @@ matmul_i16 (gfc_array_i16 * const restri
 	    /* dest[x,y] += a[x,n] * b[n,y] */
 	    dest[x*rxstride + y*rystride] += abase[x*axstride + n*aystride] * bbase[n*bxstride + y*bystride];
     }
+  else
+    {
+      const GFC_INTEGER_16 *restrict abase_x;
+      const GFC_INTEGER_16 *restrict bbase_y;
+      GFC_INTEGER_16 *restrict dest_y;
+      GFC_INTEGER_16 s;
+
+      for (y = 0; y < ycount; y++)
+	{
+	  bbase_y = &bbase[y*bystride];
+	  dest_y = &dest[y*rystride];
+	  for (x = 0; x < xcount; x++)
+	    {
+	      abase_x = &abase[x*axstride];
+	      s = (GFC_INTEGER_16) 0;
+	      for (n = 0; n < count; n++)
+		s += abase_x[n*aystride] * bbase_y[n*bxstride];
+	      dest_y[x*rxstride] = s;
+	    }
+	}
+    }
 }
 
 #endif

gcc41-fortran-where-opt.patch:
 fortran/Make-lang.in                               |    2 
 fortran/dependency.c                               |   41 -
 fortran/dependency.h                               |    2 
 fortran/trans-array.h                              |    3 
 fortran/trans-stmt.c                               |  532 +++++++++++++--------
 testsuite/gcc.fortran-torture/execute/where_10.f90 |   23 
 testsuite/gcc.fortran-torture/execute/where_11.f90 |   23 
 testsuite/gcc.fortran-torture/execute/where_12.f90 |    9 
 testsuite/gcc.fortran-torture/execute/where_13.f90 |   10 
 testsuite/gcc.fortran-torture/execute/where_14.f90 |   15 
 testsuite/gcc.fortran-torture/execute/where_15.f90 |   15 
 testsuite/gcc.fortran-torture/execute/where_16.f90 |   39 +
 12 files changed, 493 insertions(+), 221 deletions(-)

--- NEW FILE gcc41-fortran-where-opt.patch ---
2006-02-20  Roger Sayle  <roger at eyesopen.com>

	* trans-stmt.c (gfc_trans_where_2): Avoid updating unused current
	execution mask for empty WHERE/ELSEWHERE clauses.  Don't allocate
	temporary mask arrays if they won't be used.

2006-02-20  Roger Sayle  <roger at eyesopen.com>

	* trans-stmt.c (gfc_trans_where_assign): Remove code to handle
	traversing a linked list of MASKs.  The MASK is now always a
	single element requiring no ANDing during the assignment.

2006-02-18  Roger Sayle  <roger at eyesopen.com>

	* trans-stmt.c (struct temporary_list): Delete.
	(gfc_trans_where_2): Major reorganization.  Remove no longer needed
	TEMP argument.  Allocate and deallocate the control mask and
	pending control mask locally.
	(gfc_trans_forall_1): Delete TEMP local variable, and update
	call to gfc_trans_where_2.  No need to deallocate arrays after.
	(gfc_evaluate_where_mask): Major reorganization.  Change return
	type to void.  Pass in parent execution mask, MASK, and two
	already allocated mask arrays CMASK and PMASK.  On return
	CMASK := MASK & COND, PMASK := MASK & !COND.  MASK, CMASK and
	CMASK may all be NULL, or refer to the same temporary arrays.
	(gfc_trans_where): Update call to gfc_trans_where_2.  We no
	longer need a TEMP variable or to deallocate temporary arrays
	allocated by gfc_trans_where_2.

2006-02-06  Roger Sayle  <roger at eyesopen.com>

	* trans-stmt.c (gfc_evaluate_where_mask): Allow the NMASK argument
	to be NULL to indicate that the not mask isn't required.
	(gfc_trans_where_2): Remove PMASK argument.  Avoid calculating the
	pending mask for the last clause of a WHERE chain.  Update recursive
	call.
	(gfc_trans_forall_1): Update call to gfc_trans_where_2.
	(gfc_trans_where): Likewise.

2006-02-04  Roger Sayle  <roger at eyesopen.com>

	* dependency.c (gfc_check_dependency): Remove unused vars and nvars
	arguments.  Replace with an "identical" argument.  A full array
	reference to the same symbol is a dependency if identical is true.
	* dependency.h (gfc_check_dependency): Update prototype.
	* trans-array.h (gfc_check_dependency): Delete duplicate prototype.
	* trans-stmt.c: #include dependency.h for gfc_check_dependency.
	(gfc_trans_forall_1): Update calls to gfc_check_dependency.
	(gfc_trans_where_2): Likewise.  Remove unneeded variables.
	(gfc_trans_where_3): New function for simple non-dependent WHEREs.
	(gfc_trans_where): Call gfc_trans_where_3 to translate simple
	F90-style WHERE statements without internal dependencies.
	* Make-lang.in (trans-stmt.o): Depend upon dependency.h.

gcc/testsuite/
2006-02-16  Roger Sayle  <roger at eyesopen.com>

	* gfortran.fortran-torture/execute/where_10.f90: New test case.
	* gfortran.fortran-torture/execute/where_11.f90: Likewise.
	* gfortran.fortran-torture/execute/where_12.f90: Likewise.
	* gfortran.fortran-torture/execute/where_13.f90: Likewise.
	* gfortran.fortran-torture/execute/where_14.f90: Likewise.
	* gfortran.fortran-torture/execute/where_15.f90: Likewise.
	* gfortran.fortran-torture/execute/where_16.f90: Likewise.

--- gcc/fortran/dependency.c	2006-02-27 16:04:05.000000000 +0100
+++ gcc/fortran/dependency.c	2006-02-27 16:05:06.000000000 +0100
@@ -259,10 +259,10 @@ gfc_check_argument_var_dependency (gfc_e
     {
     case EXPR_VARIABLE:
       return (gfc_ref_needs_temporary_p (expr->ref)
-	      || gfc_check_dependency (var, expr, NULL, 0));
+	      || gfc_check_dependency (var, expr, 1));
 
     case EXPR_ARRAY:
-      return gfc_check_dependency (var, expr, NULL, 0);
+      return gfc_check_dependency (var, expr, 1);
 
     case EXPR_FUNCTION:
       if (intent != INTENT_IN && expr->inline_noncopying_intrinsic)
@@ -339,15 +339,14 @@ gfc_check_fncall_dependency (gfc_expr * 
 
 /* Return true if the statement body redefines the condition.  Returns
    true if expr2 depends on expr1.  expr1 should be a single term
-   suitable for the lhs of an assignment.  The symbols listed in VARS
-   must be considered to have all possible values. All other scalar
-   variables may be considered constant.  Used for forall and where
+   suitable for the lhs of an assignment.  The IDENTICAL flag indicates
+   whether array references to the same symbol with identical range
+   references count as a dependency or not.  Used for forall and where
    statements.  Also used with functions returning arrays without a
    temporary.  */
 
 int
-gfc_check_dependency (gfc_expr * expr1, gfc_expr * expr2, gfc_expr ** vars,
-		      int nvars)
+gfc_check_dependency (gfc_expr * expr1, gfc_expr * expr2, bool identical)
 {
   gfc_ref *ref;
   int n;
@@ -367,11 +366,11 @@ gfc_check_dependency (gfc_expr * expr1, 
   switch (expr2->expr_type)
     {
     case EXPR_OP:
-      n = gfc_check_dependency (expr1, expr2->value.op.op1, vars, nvars);
+      n = gfc_check_dependency (expr1, expr2->value.op.op1, identical);
       if (n)
 	return n;
       if (expr2->value.op.op2)
-	return gfc_check_dependency (expr1, expr2->value.op.op2, vars, nvars);
+	return gfc_check_dependency (expr1, expr2->value.op.op2, identical);
       return 0;
 
     case EXPR_VARIABLE:
@@ -387,15 +386,25 @@ gfc_check_dependency (gfc_expr * expr1, 
       if (expr1->symtree->n.sym != expr2->symtree->n.sym)
 	return 0;
 
-      for (ref = expr2->ref; ref; ref = ref->next)
-	{
-	  /* Identical ranges return 0, overlapping ranges return 1.  */
-	  if (ref->type == REF_ARRAY)
-	    return 1;
-	}
+      if (identical)
+	return 1;
+
+      /* Identical ranges return 0, overlapping ranges return 1.  */
+
+      /* Return zero if we refer to the same full arrays.  */
+      if (expr1->ref->type == REF_ARRAY
+	  && expr2->ref->type == REF_ARRAY
+	  && expr1->ref->u.ar.type == AR_FULL
+	  && expr2->ref->u.ar.type == AR_FULL
+	  && !expr1->ref->next
+	  && !expr2->ref->next)
+	return 0;
+
       return 1;
 
     case EXPR_FUNCTION:
+      if (expr2->inline_noncopying_intrinsic)
+	identical = 1;
       /* Remember possible differences between elemental and
          transformational functions.  All functions inside a FORALL
          will be pure.  */
@@ -404,7 +413,7 @@ gfc_check_dependency (gfc_expr * expr1, 
 	{
 	  if (!actual->expr)
 	    continue;
-	  n = gfc_check_dependency (expr1, actual->expr, vars, nvars);
+	  n = gfc_check_dependency (expr1, actual->expr, identical);
 	  if (n)
 	    return n;
 	}
--- gcc/fortran/dependency.h	2006-02-27 16:04:05.000000000 +0100
+++ gcc/fortran/dependency.h	2006-02-27 16:05:06.000000000 +0100
@@ -25,7 +25,7 @@ bool gfc_ref_needs_temporary_p (gfc_ref 
 gfc_expr *gfc_get_noncopying_intrinsic_argument (gfc_expr *);
 int gfc_check_fncall_dependency (gfc_expr *, sym_intent, gfc_symbol *,
 				 gfc_actual_arglist *);
-int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
+int gfc_check_dependency (gfc_expr *, gfc_expr *, bool);
 int gfc_is_same_range (gfc_array_ref *, gfc_array_ref *, int, int);
 int gfc_expr_is_one (gfc_expr *, int);
 
--- gcc/fortran/Make-lang.in	2006-02-27 16:04:05.000000000 +0100
+++ gcc/fortran/Make-lang.in	2006-02-27 16:05:04.000000000 +0100
@@ -295,7 +295,7 @@ fortran/trans-types.o: $(GFORTRAN_TRANS_
   real.h toplev.h $(TARGET_H)
 fortran/trans-const.o: $(GFORTRAN_TRANS_DEPS)
 fortran/trans-expr.o: $(GFORTRAN_TRANS_DEPS) fortran/dependency.h
-fortran/trans-stmt.o: $(GFORTRAN_TRANS_DEPS)
+fortran/trans-stmt.o: $(GFORTRAN_TRANS_DEPS) fortran/dependency.h
 fortran/trans-openmp.o: $(GFORTRAN_TRANS_DEPS)
 fortran/trans-io.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-io.h \
   fortran/ioparm.def
--- gcc/fortran/trans-array.h	2006-02-27 16:04:05.000000000 +0100
+++ gcc/fortran/trans-array.h	2006-02-27 16:05:04.000000000 +0100
@@ -116,9 +116,6 @@ tree gfc_conv_descriptor_stride (tree, t
 tree gfc_conv_descriptor_lbound (tree, tree);
 tree gfc_conv_descriptor_ubound (tree, tree);
 
-/* Dependency checking for WHERE and FORALL.  */
-int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
-
 /* Add pre-loop scalarization code for intrinsic functions which require
    special handling.  */
 void gfc_add_intrinsic_ss_code (gfc_loopinfo *, gfc_ss *);
--- gcc/fortran/trans-stmt.c	2006-02-27 16:03:54.000000000 +0100
+++ gcc/fortran/trans-stmt.c	2006-02-27 16:16:17.000000000 +0100
@@ -36,6 +36,7 @@ Software Foundation, 51 Franklin Street,
 #include "trans-array.h"
 #include "trans-const.h"
 #include "arith.h"
+#include "dependency.h"
 
 typedef struct iter_info
 {
@@ -47,13 +48,6 @@ typedef struct iter_info
 }
 iter_info;
 
-typedef  struct temporary_list
-{
-  tree temporary;
-  struct temporary_list *next;
-}
-temporary_list;
-
 typedef struct forall_info
 {
   iter_info *this_loop;
@@ -67,8 +61,7 @@ typedef struct forall_info
 }
 forall_info;
 
-static void gfc_trans_where_2 (gfc_code *, tree, tree, forall_info *,
-                               stmtblock_t *, temporary_list **temp);
+static void gfc_trans_where_2 (gfc_code *, tree, forall_info *, stmtblock_t *);
 
 /* Translate a F95 label number to a LABEL_EXPR.  */
 
@@ -2305,7 +2298,6 @@ gfc_trans_forall_1 (gfc_code * code, for
   gfc_saved_var *saved_vars;
   iter_info *this_forall, *iter_tmp;
   forall_info *info, *forall_tmp;
-  temporary_list *temp;
 
   gfc_start_block (&block);
 
@@ -2492,7 +2484,7 @@ gfc_trans_forall_1 (gfc_code * code, for
 	{
 	case EXEC_ASSIGN:
           /* A scalar or array assignment.  */
-	  need_temp = gfc_check_dependency (c->expr, c->expr2, varexpr, nvar);
+	  need_temp = gfc_check_dependency (c->expr, c->expr2, 0);
           /* Temporaries due to array assignment data dependencies introduce
              no end of problems.  */
 	  if (need_temp)
@@ -2511,31 +2503,13 @@ gfc_trans_forall_1 (gfc_code * code, for
 	  break;
 
         case EXEC_WHERE:
-
 	  /* Translate WHERE or WHERE construct nested in FORALL.  */
-          temp = NULL;
-	  gfc_trans_where_2 (c, NULL, NULL, nested_forall_info, &block, &temp);
-
-          while (temp)
-            {
-              tree args;
-              temporary_list *p;
-
-              /* Free the temporary.  */
-              args = gfc_chainon_list (NULL_TREE, temp->temporary);
-              tmp = gfc_build_function_call (gfor_fndecl_internal_free, args);
-              gfc_add_expr_to_block (&block, tmp);
-
-              p = temp;
-              temp = temp->next;
-              gfc_free (p);
-            }
-
-          break;
+	  gfc_trans_where_2 (c, NULL, nested_forall_info, &block);
+	  break;
 
         /* Pointer assignment inside FORALL.  */
 	case EXEC_POINTER_ASSIGN:
-          need_temp = gfc_check_dependency (c->expr, c->expr2, varexpr, nvar);
+          need_temp = gfc_check_dependency (c->expr, c->expr2, 0);
           if (need_temp)
             gfc_trans_pointer_assign_need_temp (c->expr, c->expr2,
                                                 nested_forall_info, &block);
@@ -2610,66 +2584,27 @@ tree gfc_trans_forall (gfc_code * code)
    needed by the WHERE mask expression multiplied by the iterator number of
    the nested forall.
    ME is the WHERE mask expression.
-   MASK is the temporary which value is mask's value.
-   NMASK is another temporary which value is !mask.
-   TEMP records the temporary's address allocated in this function in order to
-   free them outside this function.
-   MASK, NMASK and TEMP are all OUT arguments.  */
+   MASK is the current execution mask upon input.
+   CMASK is the updated execution mask on output, or NULL if not required.
+   PMASK is the pending execution mask on output, or NULL if not required.
+   BLOCK is the block in which to place the condition evaluation loops.  */
 
-static tree
+static void
 gfc_evaluate_where_mask (gfc_expr * me, forall_info * nested_forall_info,
-                         tree * mask, tree * nmask, temporary_list ** temp,
-                         stmtblock_t * block)
+                         tree mask, tree cmask, tree pmask,
+                         tree mask_type, stmtblock_t * block)
 {
   tree tmp, tmp1;
   gfc_ss *lss, *rss;
   gfc_loopinfo loop;
-  tree ptemp1, ntmp, ptemp2;
-  tree inner_size, size;
-  stmtblock_t body, body1, inner_size_body;
+  stmtblock_t body, body1;
+  tree count, cond, mtmp;
   gfc_se lse, rse;
-  tree mask_type;
-  tree count;
-  tree tmpexpr;
 
   gfc_init_loopinfo (&loop);
 
-  /* Calculate the size of temporary needed by the mask-expr.  */
-  gfc_init_block (&inner_size_body);
-  inner_size = compute_inner_temp_size (me, me, &inner_size_body, &lss, &rss);
-
-  /* Calculate the total size of temporary needed.  */
-  size = compute_overall_iter_number (nested_forall_info, inner_size,
-				      &inner_size_body, block);
-
-  /* As the mask array can be very big, prefer compact boolean types.  */
-  mask_type = gfc_get_logical_type (gfc_logical_kinds[0].kind);
-
-  /* Allocate temporary for where mask.  */
-  tmp = allocate_temp_for_forall_nest_1 (mask_type, size, block, &ptemp1);
-
-  /* Record the temporary address in order to free it later.  */
-  if (ptemp1)
-    {
-      temporary_list *tempo;
-      tempo = (temporary_list *) gfc_getmem (sizeof (temporary_list));
-      tempo->temporary = ptemp1;
-      tempo->next = *temp;
-      *temp = tempo;
-    }
-
-  /* Allocate temporary for !mask.  */
-  ntmp = allocate_temp_for_forall_nest_1 (mask_type, size, block, &ptemp2);
-
-  /* Record the temporary  in order to free it later.  */
-  if (ptemp2)
-    {
-      temporary_list *tempo;
-      tempo = (temporary_list *) gfc_getmem (sizeof (temporary_list));
-      tempo->temporary = ptemp2;
-      tempo->next = *temp;
-      *temp = tempo;
-    }
+  lss = gfc_walk_expr (me);
+  rss = gfc_walk_expr (me);
 
   /* Variable to index the temporary.  */
   count = gfc_create_var (gfc_array_index_type, "count");
@@ -2706,19 +2641,46 @@ gfc_evaluate_where_mask (gfc_expr * me, 
       rse.ss = rss;
       gfc_conv_expr (&rse, me);
     }
-  /* Form the expression of the temporary.  */
-  lse.expr = gfc_build_array_ref (tmp, count);
-  tmpexpr = gfc_build_array_ref (ntmp, count);
-
-  /* Use the scalar assignment to fill temporary TMP.  */
-  tmp1 = gfc_trans_scalar_assign (&lse, &rse, me->ts.type);
-  gfc_add_expr_to_block (&body1, tmp1);
-
-  /* Fill temporary NTMP.  */
-  tmp1 = build1 (TRUTH_NOT_EXPR, TREE_TYPE (lse.expr), lse.expr);
-  gfc_add_modify_expr (&body1, tmpexpr, tmp1);
 
- if (lss == gfc_ss_terminator)
+  /* Variable to evalate mask condition.  */
+  cond = gfc_create_var (mask_type, "cond");
+  if (mask && (cmask || pmask))
+    mtmp = gfc_create_var (mask_type, "mask");
+  else mtmp = NULL_TREE;
+
+  gfc_add_block_to_block (&body1, &lse.pre);
+  gfc_add_block_to_block (&body1, &rse.pre);
+
+  gfc_add_modify_expr (&body1, cond, fold_convert (mask_type, rse.expr));
+
+  if (mask && (cmask || pmask))
+    {
+      tmp = gfc_build_array_ref (mask, count);
+      gfc_add_modify_expr (&body1, mtmp, tmp);
+    }
+
+  if (cmask)
+    {
+      tmp1 = gfc_build_array_ref (cmask, count);
+      tmp = cond;
+      if (mask)
+	tmp = build2 (TRUTH_AND_EXPR, mask_type, mtmp, tmp);
+      gfc_add_modify_expr (&body1, tmp1, tmp);
+    }
+
+  if (pmask)
+    {
+      tmp1 = gfc_build_array_ref (pmask, count);
+      tmp = build1 (TRUTH_NOT_EXPR, mask_type, cond);
+      if (mask)
+	tmp = build2 (TRUTH_AND_EXPR, mask_type, mtmp, tmp);
+      gfc_add_modify_expr (&body1, tmp1, tmp);
+    }
+
+  gfc_add_block_to_block (&body1, &lse.post);
+  gfc_add_block_to_block (&body1, &rse.post);
+
+  if (lss == gfc_ss_terminator)
     {
       gfc_add_block_to_block (&body, &body1);
     }
@@ -2746,11 +2708,6 @@ gfc_evaluate_where_mask (gfc_expr * me, 
     tmp1 = gfc_trans_nested_forall_loop (nested_forall_info, tmp1, 1, 1);
 
   gfc_add_expr_to_block (block, tmp1);
-
-  *mask = tmp;
-  *nmask = ntmp;
-
-  return tmp1;
 }
 
 
@@ -2772,7 +2729,7 @@ gfc_trans_where_assign (gfc_expr *expr1,
   tree tmp;
   stmtblock_t block;
   stmtblock_t body;
-  tree index, maskexpr, tmp1;
+  tree index, maskexpr;
 
 #if 0
   /* TODO: handle this special case.
@@ -2867,21 +2824,10 @@ gfc_trans_where_assign (gfc_expr *expr1,
   else
     gfc_conv_expr (&lse, expr1);
 
-  /* Form the mask expression according to the mask tree list.  */
+  /* Form the mask expression according to the mask.  */
   index = count1;
-  tmp = mask;
-  if (tmp != NULL)
-    maskexpr = gfc_build_array_ref (tmp, index);
-  else
-    maskexpr = NULL;
-
-  tmp = TREE_CHAIN (tmp);
-  while (tmp)
-    {
-      tmp1 = gfc_build_array_ref (tmp, index);
-      maskexpr = build2 (TRUTH_AND_EXPR, TREE_TYPE (tmp1), maskexpr, tmp1);
-      tmp = TREE_CHAIN (tmp);
-    }
+  maskexpr = gfc_build_array_ref (mask, index);
+
   /* Use the scalar assignment as is.  */
   tmp = gfc_trans_scalar_assign (&lse, &rse, expr1->ts.type);
   tmp = build3_v (COND_EXPR, maskexpr, tmp, build_empty_stmt ());
@@ -2930,20 +2876,8 @@ gfc_trans_where_assign (gfc_expr *expr1,
 
           /* Form the mask expression according to the mask tree list.  */
           index = count2;
-          tmp = mask;
-          if (tmp != NULL)
-            maskexpr = gfc_build_array_ref (tmp, index);
-          else
-            maskexpr = NULL;
+          maskexpr = gfc_build_array_ref (mask, index);
 
-          tmp = TREE_CHAIN (tmp);
-          while (tmp)
-            {
-              tmp1 = gfc_build_array_ref (tmp, index);
-              maskexpr = build2 (TRUTH_AND_EXPR, TREE_TYPE (tmp1),
-				 maskexpr, tmp1);
-              tmp = TREE_CHAIN (tmp);
-            }
           /* Use the scalar assignment as is.  */
           tmp = gfc_trans_scalar_assign (&lse, &rse, expr1->ts.type);
           tmp = build3_v (COND_EXPR, maskexpr, tmp, build_empty_stmt ());
@@ -2978,65 +2912,93 @@ gfc_trans_where_assign (gfc_expr *expr1,
 /* Translate the WHERE construct or statement.
    This function can be called iteratively to translate the nested WHERE
    construct or statement.
-   MASK is the control mask, and PMASK is the pending control mask.
-   TEMP records the temporary address which must be freed later.  */
+   MASK is the control mask.  */
 
 static void
-gfc_trans_where_2 (gfc_code * code, tree mask, tree pmask,
-                   forall_info * nested_forall_info, stmtblock_t * block,
-                   temporary_list ** temp)
+gfc_trans_where_2 (gfc_code * code, tree mask,
+		   forall_info * nested_forall_info, stmtblock_t * block)
 {
+  stmtblock_t inner_size_body;
+  tree inner_size, size;
+  gfc_ss *lss, *rss;
+  tree mask_type;
   gfc_expr *expr1;
   gfc_expr *expr2;
   gfc_code *cblock;
   gfc_code *cnext;
-  tree tmp, tmp1, tmp2;
+  tree tmp;
   tree count1, count2;
-  tree mask_copy;
   int need_temp;
+  tree pcmask = NULL_TREE;
+  tree ppmask = NULL_TREE;
+  tree cmask = NULL_TREE;
+  tree pmask = NULL_TREE;
 
   /* the WHERE statement or the WHERE construct statement.  */
   cblock = code->block;
+
+  /* Calculate the size of temporary needed by the mask-expr.  */
+  gfc_init_block (&inner_size_body);
+  inner_size = compute_inner_temp_size (cblock->expr, cblock->expr,
+					&inner_size_body, &lss, &rss);
+
+  /* Calculate the total size of temporary needed.  */
+  size = compute_overall_iter_number (nested_forall_info, inner_size,
+				      &inner_size_body, block);
+
+  /* As the mask array can be very big, prefer compact boolean types.  */
+  mask_type = gfc_get_logical_type (gfc_logical_kinds[0].kind);
+
+  /* Allocate temporary for WHERE mask.  We only need a "cmask" if
+     there are statements to be executed.  The following test only
+     checks the first ELSEWHERE to catch the F90 cases.  */
+  if (cblock->next
+      || (cblock->block && cblock->block->next && cblock->block->expr)
+      || (cblock->block && cblock->block->block))
+    {
+      cmask = allocate_temp_for_forall_nest_1 (mask_type, size, block,
+					       &pcmask);
+    }
+  else
+    {
+      pcmask = NULL_TREE;
+      cmask = NULL_TREE;
+    }
+
+  /* Allocate temporary for !mask.  We only need a "pmask" if there 
+     is an ELSEWHERE clause containing executable statements.  Again
+     we only lookahead a single ELSEWHERE to catch the F90 cases.  */
+  if ((cblock->block && cblock->block->next)
+      || (cblock->block && cblock->block->block))
+    {
+      pmask = allocate_temp_for_forall_nest_1 (mask_type, size, block,
+					       &ppmask);
+    }
+  else
+    {
+      ppmask = NULL_TREE;
+      pmask = NULL_TREE;
+    }
+
   while (cblock)
     {
       /* Has mask-expr.  */
       if (cblock->expr)
         {
-          /* Ensure that the WHERE mask be evaluated only once.  */
-          tmp2 = gfc_evaluate_where_mask (cblock->expr, nested_forall_info,
-                                          &tmp, &tmp1, temp, block);
-
-          /* Set the control mask and the pending control mask.  */
-          /* It's a where-stmt.  */
-          if (mask == NULL)
-            {
-              mask = tmp;
-              pmask = tmp1;
-            }
-          /* It's a nested where-stmt.  */
-          else if (mask && pmask == NULL)
-            {
-              tree tmp2;
-              /* Use the TREE_CHAIN to list the masks.  */
-              tmp2 = copy_list (mask);
-              pmask = chainon (mask, tmp1);
-              mask = chainon (tmp2, tmp);
-            }
-          /* It's a masked-elsewhere-stmt.  */
-          else if (mask && cblock->expr)
-            {
-              tree tmp2;
-              tmp2 = copy_list (pmask);
+          /* Ensure that the WHERE mask will be evaluated exactly once.
+	     If there are no statements in this WHERE/ELSEWHERE clause,
+	     then we don't need to update the control mask (cmask).
+	     If this is the last clause of the WHERE construct, then
+	     we don't need to update the pending control mask (pmask).  */
+          gfc_evaluate_where_mask (cblock->expr, nested_forall_info, mask,
+				   cblock->next ? cmask : NULL_TREE,
+				   cblock->block ? pmask : NULL_TREE,
+				   mask_type, block);
 
-              mask = pmask;
-              tmp2 = chainon (tmp2, tmp);
-              pmask = chainon (mask, tmp1);
-              mask = tmp2;
-            }
         }
-      /* It's a elsewhere-stmt. No mask-expr is present.  */
+      /* It's a final elsewhere-stmt. No mask-expr is present.  */
       else
-        mask = pmask;
+        cmask = mask;
 
       /* Get the assignment statement of a WHERE statement, or the first
          statement in where-body-construct of a WHERE construct.  */
@@ -3051,16 +3013,9 @@ gfc_trans_where_2 (gfc_code * code, tree
               expr2 = cnext->expr2;
               if (nested_forall_info != NULL)
                 {
-                  int nvar;
-                  gfc_expr **varexpr;
-
-                  nvar = nested_forall_info->nvar;
-                  varexpr = (gfc_expr **)
-                            gfc_getmem (nvar * sizeof (gfc_expr *));
-                  need_temp = gfc_check_dependency (expr1, expr2, varexpr,
-                                                    nvar);
+                  need_temp = gfc_check_dependency (expr1, expr2, 0);
                   if (need_temp)
-                    gfc_trans_assign_need_temp (expr1, expr2, mask,
+                    gfc_trans_assign_need_temp (expr1, expr2, cmask,
                                                 nested_forall_info, block);
                   else
                     {
@@ -3070,8 +3025,8 @@ gfc_trans_where_2 (gfc_code * code, tree
                       gfc_add_modify_expr (block, count1, gfc_index_zero_node);
                       gfc_add_modify_expr (block, count2, gfc_index_zero_node);
 
-                      tmp = gfc_trans_where_assign (expr1, expr2, mask, count1,
-                                                    count2);
+                      tmp = gfc_trans_where_assign (expr1, expr2, cmask,
+						    count1, count2);
 
                       tmp = gfc_trans_nested_forall_loop (nested_forall_info,
                                                           tmp, 1, 1);
@@ -3086,8 +3041,8 @@ gfc_trans_where_2 (gfc_code * code, tree
                   gfc_add_modify_expr (block, count1, gfc_index_zero_node);
                   gfc_add_modify_expr (block, count2, gfc_index_zero_node);
 
-                  tmp = gfc_trans_where_assign (expr1, expr2, mask, count1,
-                                                count2);
+                  tmp = gfc_trans_where_assign (expr1, expr2, cmask,
+						count1, count2);
                   gfc_add_expr_to_block (block, tmp);
 
                 }
@@ -3095,11 +3050,9 @@ gfc_trans_where_2 (gfc_code * code, tree
 
             /* WHERE or WHERE construct is part of a where-body-construct.  */
             case EXEC_WHERE:
-              /* Ensure that MASK is not modified by next gfc_trans_where_2.  */
-              mask_copy = copy_list (mask);
-              gfc_trans_where_2 (cnext, mask_copy, NULL, nested_forall_info,
-                                 block, temp);
-              break;
+	      /* Ensure that MASK is not modified by next gfc_trans_where_2.  */
+	      gfc_trans_where_2 (cnext, cmask, nested_forall_info, block);
+	      break;
 
             default:
               gcc_unreachable ();
@@ -3110,9 +3063,157 @@ gfc_trans_where_2 (gfc_code * code, tree
        }
     /* The next masked-elsewhere-stmt, elsewhere-stmt, or end-where-stmt.  */
     cblock = cblock->block;
+    mask = pmask;
   }
+
+  /* If we allocated a pending mask array, deallocate it now.  */
+  if (ppmask)
+    {
+      tree args = gfc_chainon_list (NULL_TREE, ppmask);
+      tmp = build_function_call_expr (gfor_fndecl_internal_free, args);
+      gfc_add_expr_to_block (block, tmp);
+    }
+
+  /* If we allocated a current mask array, deallocate it now.  */
+  if (pcmask)
+    {
+      tree args = gfc_chainon_list (NULL_TREE, pcmask);
+      tmp = build_function_call_expr (gfor_fndecl_internal_free, args);
+      gfc_add_expr_to_block (block, tmp);
+    }
 }
 
+/* Translate a simple WHERE construct or statement without dependencies.
+   CBLOCK is the "then" clause of the WHERE statement, where CBLOCK->EXPR
+   is the mask condition, and EBLOCK if non-NULL is the "else" clause.
+   Currently both CBLOCK and EBLOCK are restricted to single assignments.  */
+
+static tree
+gfc_trans_where_3 (gfc_code * cblock, gfc_code * eblock)
+{
+  stmtblock_t block, body;
+  gfc_expr *cond, *tdst, *tsrc, *edst, *esrc;
+  tree tmp, cexpr, tstmt, estmt;
+  gfc_ss *css, *tdss, *tsss;
+  gfc_se cse, tdse, tsse, edse, esse;
+  gfc_loopinfo loop;
+  gfc_ss *edss = 0;
+  gfc_ss *esss = 0;
+
+  cond = cblock->expr;
+  tdst = cblock->next->expr;
+  tsrc = cblock->next->expr2;
+  edst = eblock ? eblock->next->expr : NULL;
+  esrc = eblock ? eblock->next->expr2 : NULL;
+
+  gfc_start_block (&block);
+  gfc_init_loopinfo (&loop);
+
+  /* Handle the condition.  */
+  gfc_init_se (&cse, NULL);
+  css = gfc_walk_expr (cond);
+  gfc_add_ss_to_loop (&loop, css);
+
+  /* Handle the then-clause.  */
+  gfc_init_se (&tdse, NULL);
+  gfc_init_se (&tsse, NULL);
+  tdss = gfc_walk_expr (tdst);
+  tsss = gfc_walk_expr (tsrc);
+  if (tsss == gfc_ss_terminator)
+    {
+      tsss = gfc_get_ss ();
+      tsss->next = gfc_ss_terminator;
+      tsss->type = GFC_SS_SCALAR;
+      tsss->expr = tsrc;
+    }
+  gfc_add_ss_to_loop (&loop, tdss);
+  gfc_add_ss_to_loop (&loop, tsss);
+
+  if (eblock)
+    {
+      /* Handle the else clause.  */
+      gfc_init_se (&edse, NULL);
+      gfc_init_se (&esse, NULL);
+      edss = gfc_walk_expr (edst);
+      esss = gfc_walk_expr (esrc);
+      if (esss == gfc_ss_terminator)
+	{
+	  esss = gfc_get_ss ();
+	  esss->next = gfc_ss_terminator;
+	  esss->type = GFC_SS_SCALAR;
+	  esss->expr = esrc;
+	}
+      gfc_add_ss_to_loop (&loop, edss);
+      gfc_add_ss_to_loop (&loop, esss);
+    }
+
+  gfc_conv_ss_startstride (&loop);
+  gfc_conv_loop_setup (&loop);
+
+  gfc_mark_ss_chain_used (css, 1);
+  gfc_mark_ss_chain_used (tdss, 1);
+  gfc_mark_ss_chain_used (tsss, 1);
+  if (eblock)
+    {
+      gfc_mark_ss_chain_used (edss, 1);
+      gfc_mark_ss_chain_used (esss, 1);
+    }
+
+  gfc_start_scalarized_body (&loop, &body);
+
+  gfc_copy_loopinfo_to_se (&cse, &loop);
+  gfc_copy_loopinfo_to_se (&tdse, &loop);
+  gfc_copy_loopinfo_to_se (&tsse, &loop);
+  cse.ss = css;
+  tdse.ss = tdss;
+  tsse.ss = tsss;
+  if (eblock)
+    {
+      gfc_copy_loopinfo_to_se (&edse, &loop);
+      gfc_copy_loopinfo_to_se (&esse, &loop);
+      edse.ss = edss;
+      esse.ss = esss;
+    }
+
+  gfc_conv_expr (&cse, cond);
+  gfc_add_block_to_block (&body, &cse.pre);
+  cexpr = cse.expr;
+
+  gfc_conv_expr (&tsse, tsrc);
+  if (tdss != gfc_ss_terminator && loop.temp_ss != NULL)
+    {
+      gfc_conv_tmp_array_ref (&tdse);
+      gfc_advance_se_ss_chain (&tdse);
+    }
+  else
+    gfc_conv_expr (&tdse, tdst);
+
+  if (eblock)
+    {
+      gfc_conv_expr (&esse, esrc);
+      if (edss != gfc_ss_terminator && loop.temp_ss != NULL)
+        {
+          gfc_conv_tmp_array_ref (&edse);
+          gfc_advance_se_ss_chain (&edse);
+        }
+      else
+        gfc_conv_expr (&edse, edst);
+    }
+
+  tstmt = gfc_trans_scalar_assign (&tdse, &tsse, tdst->ts.type);
+  estmt = eblock ? gfc_trans_scalar_assign (&edse, &esse, edst->ts.type)
+		 : build_empty_stmt ();
+  tmp = build3_v (COND_EXPR, cexpr, tstmt, estmt);
+  gfc_add_expr_to_block (&body, tmp);
+  gfc_add_block_to_block (&body, &cse.post);
+
+  gfc_trans_scalarizing_loops (&loop, &body);
+  gfc_add_block_to_block (&block, &loop.pre);
+  gfc_add_block_to_block (&block, &loop.post);
+  gfc_cleanup_loop (&loop);
+
+  return gfc_finish_block (&block);
+}
 
 /* As the WHERE or WHERE construct statement can be nested, we call
    gfc_trans_where_2 to do the translation, and pass the initial
@@ -3122,26 +3223,57 @@ tree
 gfc_trans_where (gfc_code * code)
 {
   stmtblock_t block;
-  temporary_list *temp, *p;
-  tree args;
-  tree tmp;
+  gfc_code *cblock;
+  gfc_code *eblock;
 
-  gfc_start_block (&block);
-  temp = NULL;
+  cblock = code->block;
+  if (cblock->next
+      && cblock->next->op == EXEC_ASSIGN
+      && !cblock->next->next)
+    {
+      eblock = cblock->block;
+      if (!eblock)
+	{
+          /* A simple "WHERE (cond) x = y" statement or block is
+	     dependence free if cond is not dependent upon writing x,
+	     and the source y is unaffected by the destination x.  */
+	  if (!gfc_check_dependency (cblock->next->expr,
+				     cblock->expr, 0)
+	      && !gfc_check_dependency (cblock->next->expr,
+					cblock->next->expr2, 0))
+	    return gfc_trans_where_3 (cblock, NULL);
+	}
+      else if (!eblock->expr
+	       && !eblock->block
+	       && eblock->next
+	       && eblock->next->op == EXEC_ASSIGN
+	       && !eblock->next->next)
+	{
+          /* A simple "WHERE (cond) x1 = y1 ELSEWHERE x2 = y2 ENDWHERE"
+	     block is dependence free if cond is not dependent on writes
+	     to x1 and x2, y1 is not dependent on writes to x2, and y2
+	     is not dependent on writes to x1, and both y's are not
+	     dependent upon their own x's.  */
+	  if (!gfc_check_dependency(cblock->next->expr,
+				    cblock->expr, 0)
+	      && !gfc_check_dependency(eblock->next->expr,
+				       cblock->expr, 0)
+	      && !gfc_check_dependency(cblock->next->expr,
+				       eblock->next->expr2, 0)
+	      && !gfc_check_dependency(eblock->next->expr,
+				       cblock->next->expr2, 0)
+	      && !gfc_check_dependency(cblock->next->expr,
+				       cblock->next->expr2, 0)
+	      && !gfc_check_dependency(eblock->next->expr,
+				       eblock->next->expr2, 0))
+	    return gfc_trans_where_3 (cblock, eblock);
+	}
+    }
 
-  gfc_trans_where_2 (code, NULL, NULL, NULL, &block, &temp);
+  gfc_start_block (&block);
 
-  /* Add calls to free temporaries which were dynamically allocated.  */
-  while (temp)
-    {
-      args = gfc_chainon_list (NULL_TREE, temp->temporary);
-      tmp = gfc_build_function_call (gfor_fndecl_internal_free, args);
-      gfc_add_expr_to_block (&block, tmp);
+  gfc_trans_where_2 (code, NULL, NULL, &block);
 
-      p = temp;
-      temp = temp->next;
-      gfc_free (p);
-    }
   return gfc_finish_block (&block);
 }
 
--- gcc/testsuite/gcc.fortran-torture/execute/where_10.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_10.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,23 @@
+! Check whether conditional ELSEWHEREs work
+! (with final unconditional ELSEWHERE)
+program where_10
+   integer :: a(5)
+   integer :: b(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   b = (/0, 0, 0, 0, 0/)
+   where (a .eq. 1)
+     b = 3
+   elsewhere (a .eq. 2)
+     b = 1
+   elsewhere (a .eq. 3)
+     b = 4
+   elsewhere (a .eq. 4)
+     b = 1
+   elsewhere
+     b = 5
+   endwhere
+   if (any (b .ne. (/3, 1, 4, 1, 5/))) &
+     call abort
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_11.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_11.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,23 @@
+! Check whether conditional ELSEWHEREs work
+! (without unconditional ELSEWHERE)
+program where_11
+   integer :: a(5)
+   integer :: b(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   b = (/0, 0, 0, 0, 0/)
+   where (a .eq. 1)
+     b = 3
+   elsewhere (a .eq. 2)
+     b = 1
+   elsewhere (a .eq. 3)
+     b = 4
+   elsewhere (a .eq. 4)
+     b = 1
+   elsewhere (a .eq. 5)
+     b = 5
+   endwhere
+   if (any (b .ne. (/3, 1, 4, 1, 5/))) &
+     call abort
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_12.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_12.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,9 @@
+! Check empty WHEREs work
+program where_12
+   integer :: a(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   where (a .eq. 1)
+   endwhere
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_13.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_13.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,10 @@
+! Check empty WHERE and empty ELSEWHERE works
+program where_13
+   integer :: a(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   where (a .eq. 2)
+   elsewhere
+   endwhere
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_14.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_14.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,15 @@
+! Check whether an empty ELSEWHERE works
+program where_14
+   integer :: a(5)
+   integer :: b(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   b = (/0, 0, 0, 0, 0/)
+   where (a .eq. 1)
+     b = 3
+   elsewhere
+   endwhere
+   if (any (b .ne. (/3, 0, 0, 0, 0/))) &
+     call abort
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_15.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_15.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,15 @@
+! Check whether an empty WHERE works
+program where_15
+   integer :: a(5)
+   integer :: b(5)
+
+   a = (/1, 2, 3, 4, 5/)
+   b = (/0, 0, 0, 0, 0/)
+   where (a .eq. 1)
+   elsewhere
+     b = 2
+   endwhere
+   if (any (b .ne. (/0, 2, 2, 2, 2/))) &
+     call abort
+end program
+
--- gcc/testsuite/gcc.fortran-torture/execute/where_16.f90	2006-02-27 12:20:08.692793250 +0100
+++ gcc/testsuite/gcc.fortran-torture/execute/where_16.f90	2006-02-27 16:11:51.000000000 +0100
@@ -0,0 +1,39 @@
+! Check whether nested WHEREs work
+program where_16
+   integer :: a(9)
+   integer :: b(9)
+   integer :: c(9)
+
+   a = (/0, 0, 0, 1, 1, 1, 2, 2, 2/)
+   b = (/0, 1, 2, 0, 1, 2, 0, 1, 2/)
+   c = (/0, 0, 0, 0, 0, 0, 0, 0, 0/)
+
+   where (a .eq. 0)
+     where (b .eq. 0)
+       c = 1
+     else where (b .eq. 1)
+       c = 2
+     else where
+       c = 3
+     endwhere
+   elsewhere (a .eq. 1)
+     where (b .eq. 0)
+       c = 4
+     else where (b .eq. 1)
+       c = 5
+     else where
+       c = 6
+     endwhere
+   elsewhere
+     where (b .eq. 0)
+       c = 7
+     else where (b .eq. 1)
+       c = 8
+     else where
+       c = 9
+     endwhere
+   endwhere
+   if (any (c .ne. (/1, 2, 3, 4, 5, 6, 7, 8, 9/))) &
+     call abort
+end program
+

gcc41-mni.patch:
 config.gcc              |    6 
 config/i386/i386.c      |  216 ++++++++++++++++-
 config/i386/i386.h      |    2 
 config/i386/i386.md     |    9 
 config/i386/i386.opt    |    4 
 config/i386/sse.md      |  577 +++++++++++++++++++++++++++++++++++++++++++++++-
 config/i386/tmmintrin.h |  224 ++++++++++++++++++
 doc/extend.texi         |   46 +++
 doc/invoke.texi         |    3 
 9 files changed, 1067 insertions(+), 20 deletions(-)

--- NEW FILE gcc41-mni.patch ---
2006-02-24  H.J. Lu  <hongjiu.lu at intel.com>

	* config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers.
	(x86_64-*-*): Likewise.

	* config/i386/i386.c (pta_flags): Add PTA_MNI.
	(override_options): Check MNI.
	(ix86_builtins): Add IX86_BUILTIN_PHADDW, IX86_BUILTIN_PHADDD,
	IX86_BUILTIN_PHADDSW, IX86_BUILTIN_PHSUBW, IX86_BUILTIN_PHSUBD,
	IX86_BUILTIN_PHSUBSW, IX86_BUILTIN_PMADDUBSW,
	IX86_BUILTIN_PMULHRSW, IX86_BUILTIN_PSHUFB,
	IX86_BUILTIN_PSIGNB, IX86_BUILTIN_PSIGNW, IX86_BUILTIN_PSIGND,
	IX86_BUILTIN_PALIGNR, IX86_BUILTIN_PABSB, IX86_BUILTIN_PABSW,
	IX86_BUILTIN_PABSD, IX86_BUILTIN_PHADDW128,
	IX86_BUILTIN_PHADDD128, IX86_BUILTIN_PHADDSW128,
	IX86_BUILTIN_PHSUBW128, IX86_BUILTIN_PHSUBD128,
	IX86_BUILTIN_PHSUBSW128, IX86_BUILTIN_PMADDUBSW128,
	IX86_BUILTIN_PMULHRSW128, IX86_BUILTIN_PSHUFB128,
	IX86_BUILTIN_PSIGNB128, IX86_BUILTIN_PSIGNW128,
	IX86_BUILTIN_PSIGND128, IX86_BUILTIN_PALIGNR128,
	IX86_BUILTIN_PABSB128, IX86_BUILTIN_PABSW128 and
	IX86_BUILTIN_PABSD128.
	(bdesc_2arg): Add MNI.
	(bdesc_1arg): Likewise.
	(ix86_init_mmx_sse_builtins): Support MNI.
	(ix86_expand_builtin): Likewise.
	* config/i386/i386.h (TARGET_CPU_CPP_BUILTINS): Likewise.

	* config/i386/i386.md (UNSPEC_LDQQU): Renamed to ...
	(UNSPEC_LDDQU): This.
	(UNSPEC_PSHUFB): New.
	(UNSPEC_PSIGN): Likewise.
	(UNSPEC_PALIGNR): Likewise.
	Include mmx.md before sse.md.

	* config/i386/i386.opt: Add -mmni.

	* config/i386/sse.md (sse3_lddqu): Updated.
	(mni_phaddwv8hi3): New pattern for MNI.
	(mni_phaddwv4hi3): Likewise.
	(mni_phadddv4si3): Likewise.
	(mni_phadddv2si3): Likewise.
	(mni_phaddswv8hi3): Likewise.
	(mni_phaddswv4hi3): Likewise.
	(mni_phsubwv8hi3): Likewise.
	(mni_phsubwv4hi3): Likewise.
	(mni_phsubdv4si3): Likewise.
	(mni_phsubdv2si3): Likewise.
	(mni_phsubswv8hi3): Likewise.
	(mni_phsubswv4hi3): Likewise.
	(mni_pmaddubswv8hi3): Likewise.
	(mni_pmaddubswv4hi3): Likewise.
	(mni_pmulhrswv8hi3): Likewise.
	(mni_pmulhrswv4hi3): Likewise.
	(mni_pshufbv16qi3): Likewise.
	(mni_pshufbv8qi3): Likewise.
	(mni_psign<mode>3): Likewise.
	(mni_psign<mode>3): Likewise.
	(mni_palignrti): Likewise.
	(mni_palignrdi): Likewise.
	(mni_pabs<mode>2): Likewise.
	(mni_pabs<mode>2): Likewise.

	* config/i386/tmmintrin.h: New file.

	* doc/extend.texi: Document MNI built-in functions.

	* doc/invoke.texi: Document -mmni/-mno-mni switches.

--- gcc/config.gcc.mni	2006-02-14 13:18:08.000000000 -0800
+++ gcc/config.gcc	2006-02-24 13:39:19.000000000 -0800
@@ -263,11 +263,13 @@ xscale-*-*)
 	;;
 i[34567]86-*-*)
 	cpu_type=i386
-	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
+	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+		       pmmintrin.h tmmintrin.h"
 	;;
 x86_64-*-*)
 	cpu_type=i386
-	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
+	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+		       pmmintrin.h tmmintrin.h"
 	need_64bit_hwint=yes
 	;;
 ia64-*-*)
--- gcc/config/i386/i386.c.mni	2006-02-24 13:39:19.000000000 -0800
+++ gcc/config/i386/i386.c	2006-02-24 13:39:19.000000000 -0800
@@ -1446,11 +1446,12 @@ override_options (void)
 	  PTA_SSE = 1,
 	  PTA_SSE2 = 2,
 	  PTA_SSE3 = 4,
-	  PTA_MMX = 8,
-	  PTA_PREFETCH_SSE = 16,
-	  PTA_3DNOW = 32,
-	  PTA_3DNOW_A = 64,
-	  PTA_64BIT = 128
+	  PTA_MNI = 8,
+	  PTA_MMX = 16,
+	  PTA_PREFETCH_SSE = 32,
+	  PTA_3DNOW = 64,
+	  PTA_3DNOW_A = 128,
+	  PTA_64BIT = 256
 	} flags;
     }
   const processor_alias_table[] =
@@ -1645,6 +1646,9 @@ override_options (void)
 	if (processor_alias_table[i].flags & PTA_SSE3
 	    && !(target_flags_explicit & MASK_SSE3))
 	  target_flags |= MASK_SSE3;
+	if (processor_alias_table[i].flags & PTA_MNI
+	    && !(target_flags_explicit & MASK_MNI))
+	  target_flags |= MASK_MNI;
 	if (processor_alias_table[i].flags & PTA_PREFETCH_SSE)
 	  x86_prefetch_sse = true;
 	if (TARGET_64BIT && !(processor_alias_table[i].flags & PTA_64BIT))
@@ -1836,6 +1840,10 @@ override_options (void)
   if (!TARGET_80387)
     target_flags |= MASK_NO_FANCY_MATH_387;
 
+  /* Turn on SSE3 builtins for -mmni.  */
+  if (TARGET_MNI)
+    target_flags |= MASK_SSE3;
+
   /* Turn on SSE2 builtins for -msse3.  */
   if (TARGET_SSE3)
     target_flags |= MASK_SSE2;
@@ -14147,6 +14155,41 @@ enum ix86_builtins
   IX86_BUILTIN_MONITOR,
   IX86_BUILTIN_MWAIT,
 
+  /* Merom New Instructions.  */
+  IX86_BUILTIN_PHADDW,
+  IX86_BUILTIN_PHADDD,
+  IX86_BUILTIN_PHADDSW,
+  IX86_BUILTIN_PHSUBW,
+  IX86_BUILTIN_PHSUBD,
+  IX86_BUILTIN_PHSUBSW,
+  IX86_BUILTIN_PMADDUBSW,
+  IX86_BUILTIN_PMULHRSW,
+  IX86_BUILTIN_PSHUFB,
+  IX86_BUILTIN_PSIGNB,
+  IX86_BUILTIN_PSIGNW,
+  IX86_BUILTIN_PSIGND,
+  IX86_BUILTIN_PALIGNR,
+  IX86_BUILTIN_PABSB,
+  IX86_BUILTIN_PABSW,
+  IX86_BUILTIN_PABSD,
+
+  IX86_BUILTIN_PHADDW128,
+  IX86_BUILTIN_PHADDD128,
+  IX86_BUILTIN_PHADDSW128,
+  IX86_BUILTIN_PHSUBW128,
+  IX86_BUILTIN_PHSUBD128,
+  IX86_BUILTIN_PHSUBSW128,
+  IX86_BUILTIN_PMADDUBSW128,
+  IX86_BUILTIN_PMULHRSW128,
+  IX86_BUILTIN_PSHUFB128,
+  IX86_BUILTIN_PSIGNB128,
+  IX86_BUILTIN_PSIGNW128,
+  IX86_BUILTIN_PSIGND128,
+  IX86_BUILTIN_PALIGNR128,
+  IX86_BUILTIN_PABSB128,
+  IX86_BUILTIN_PABSW128,
+  IX86_BUILTIN_PABSD128,
+
   IX86_BUILTIN_VEC_INIT_V2SI,
   IX86_BUILTIN_VEC_INIT_V4HI,
   IX86_BUILTIN_VEC_INIT_V8QI,
@@ -14487,7 +14530,33 @@ static const struct builtin_description 
   { MASK_SSE3, CODE_FOR_sse3_haddv4sf3, "__builtin_ia32_haddps", IX86_BUILTIN_HADDPS, 0, 0 },
   { MASK_SSE3, CODE_FOR_sse3_haddv2df3, "__builtin_ia32_haddpd", IX86_BUILTIN_HADDPD, 0, 0 },
   { MASK_SSE3, CODE_FOR_sse3_hsubv4sf3, "__builtin_ia32_hsubps", IX86_BUILTIN_HSUBPS, 0, 0 },
-  { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 }
+  { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 },
+
+  /* MNI MMX */
+  { MASK_MNI, CODE_FOR_mni_phaddwv8hi3, "__builtin_ia32_phaddw128", IX86_BUILTIN_PHADDW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phaddwv4hi3, "__builtin_ia32_phaddw", IX86_BUILTIN_PHADDW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phadddv4si3, "__builtin_ia32_phaddd128", IX86_BUILTIN_PHADDD128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phadddv2si3, "__builtin_ia32_phaddd", IX86_BUILTIN_PHADDD, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phaddswv8hi3, "__builtin_ia32_phaddsw128", IX86_BUILTIN_PHADDSW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phaddswv4hi3, "__builtin_ia32_phaddsw", IX86_BUILTIN_PHADDSW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubwv8hi3, "__builtin_ia32_phsubw128", IX86_BUILTIN_PHSUBW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubwv4hi3, "__builtin_ia32_phsubw", IX86_BUILTIN_PHSUBW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubdv4si3, "__builtin_ia32_phsubd128", IX86_BUILTIN_PHSUBD128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubdv2si3, "__builtin_ia32_phsubd", IX86_BUILTIN_PHSUBD, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubswv8hi3, "__builtin_ia32_phsubsw128", IX86_BUILTIN_PHSUBSW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_phsubswv4hi3, "__builtin_ia32_phsubsw", IX86_BUILTIN_PHSUBSW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pmaddubswv8hi3, "__builtin_ia32_pmaddubsw128", IX86_BUILTIN_PMADDUBSW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pmaddubswv4hi3, "__builtin_ia32_pmaddubsw", IX86_BUILTIN_PMADDUBSW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pmulhrswv8hi3, "__builtin_ia32_pmulhrsw128", IX86_BUILTIN_PMULHRSW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pmulhrswv4hi3, "__builtin_ia32_pmulhrsw", IX86_BUILTIN_PMULHRSW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pshufbv16qi3, "__builtin_ia32_pshufb128", IX86_BUILTIN_PSHUFB128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pshufbv8qi3, "__builtin_ia32_pshufb", IX86_BUILTIN_PSHUFB, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv16qi3, "__builtin_ia32_psignb128", IX86_BUILTIN_PSIGNB128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv8qi3, "__builtin_ia32_psignb", IX86_BUILTIN_PSIGNB, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv8hi3, "__builtin_ia32_psignw128", IX86_BUILTIN_PSIGNW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv4hi3, "__builtin_ia32_psignw", IX86_BUILTIN_PSIGNW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv4si3, "__builtin_ia32_psignd128", IX86_BUILTIN_PSIGND128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_psignv2si3, "__builtin_ia32_psignd", IX86_BUILTIN_PSIGND, 0, 0 }
 };
 
 static const struct builtin_description bdesc_1arg[] =
@@ -14532,8 +14601,16 @@ static const struct builtin_description 
   { MASK_SSE2, CODE_FOR_sse2_cvttps2dq, 0, IX86_BUILTIN_CVTTPS2DQ, 0, 0 },
 
   /* SSE3 */
-  { MASK_SSE3, CODE_FOR_sse3_movshdup, 0, IX86_BUILTIN_MOVSHDUP, 0, 0 },
-  { MASK_SSE3, CODE_FOR_sse3_movsldup, 0, IX86_BUILTIN_MOVSLDUP, 0, 0 },
+  { MASK_SSE3, CODE_FOR_sse3_movshdup, "__builtin_ia32_movshdup", IX86_BUILTIN_MOVSHDUP, 0, 0 },
+  { MASK_SSE3, CODE_FOR_sse3_movsldup, "__builtin_ia32_movsldup", IX86_BUILTIN_MOVSLDUP, 0, 0 },
+
+  /* MNI */
+  { MASK_MNI, CODE_FOR_mni_pabsv16qi2, "__builtin_ia32_pabsb128", IX86_BUILTIN_PABSB128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pabsv8qi2, "__builtin_ia32_pabsb", IX86_BUILTIN_PABSB, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pabsv8hi2, "__builtin_ia32_pabsw128", IX86_BUILTIN_PABSW128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pabsv4hi2, "__builtin_ia32_pabsw", IX86_BUILTIN_PABSW, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pabsv4si2, "__builtin_ia32_pabsd128", IX86_BUILTIN_PABSD128, 0, 0 },
+  { MASK_MNI, CODE_FOR_mni_pabsv2si2, "__builtin_ia32_pabsd", IX86_BUILTIN_PABSD, 0, 0 }
 };
 
 static void
@@ -14678,6 +14755,16 @@ ix86_init_mmx_sse_builtins (void)
   /* Normal vector unops.  */
   tree v4sf_ftype_v4sf
     = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE);
+  tree v16qi_ftype_v16qi
+    = build_function_type_list (V16QI_type_node, V16QI_type_node, NULL_TREE);
+  tree v8hi_ftype_v8hi
+    = build_function_type_list (V8HI_type_node, V8HI_type_node, NULL_TREE);
+  tree v4si_ftype_v4si
+    = build_function_type_list (V4SI_type_node, V4SI_type_node, NULL_TREE);
+  tree v8qi_ftype_v8qi
+    = build_function_type_list (V8QI_type_node, V8QI_type_node, NULL_TREE);
+  tree v4hi_ftype_v4hi
+    = build_function_type_list (V4HI_type_node, V4HI_type_node, NULL_TREE);
 
   /* Normal vector binops.  */
   tree v4sf_ftype_v4sf_v4sf
@@ -14697,6 +14784,12 @@ ix86_init_mmx_sse_builtins (void)
 				long_long_unsigned_type_node,
 				long_long_unsigned_type_node, NULL_TREE);
 
+  tree di_ftype_di_di_int
+    = build_function_type_list (long_long_unsigned_type_node,
+				long_long_unsigned_type_node,
+				long_long_unsigned_type_node,
+				integer_type_node, NULL_TREE);
+
   tree v2si_ftype_v2sf
     = build_function_type_list (V2SI_type_node, V2SF_type_node, NULL_TREE);
   tree v2sf_ftype_v2si
@@ -14801,6 +14894,9 @@ ix86_init_mmx_sse_builtins (void)
   tree v2di_ftype_v2di_int
     = build_function_type_list (V2DI_type_node,
 				V2DI_type_node, integer_type_node, NULL_TREE);
+  tree v2di_ftype_v2di_v2di_int
+    = build_function_type_list (V2DI_type_node, V2DI_type_node,
+				V2DI_type_node, integer_type_node, NULL_TREE);
   tree v4si_ftype_v4si_int
     = build_function_type_list (V4SI_type_node,
 				V4SI_type_node, integer_type_node, NULL_TREE);
@@ -14926,6 +15022,50 @@ ix86_init_mmx_sse_builtins (void)
       def_builtin (d->mask, d->name, type, d->code);
     }
 
+  /* Add all builtins that are more or less simple operations on 1 operand.  */
+  for (i = 0, d = bdesc_1arg; i < ARRAY_SIZE (bdesc_1arg); i++, d++)
+    {
+      enum machine_mode mode;
+      tree type;
+
+      if (d->name == 0)
+	continue;
+      mode = insn_data[d->icode].operand[1].mode;
+
+      switch (mode)
+	{
+	case V16QImode:
+	  type = v16qi_ftype_v16qi;
+	  break;
+	case V8HImode:
+	  type = v8hi_ftype_v8hi;
+	  break;
+	case V4SImode:
+	  type = v4si_ftype_v4si;
+	  break;
+	case V2DFmode:
+	  type = v2df_ftype_v2df;
+	  break;
+	case V4SFmode:
+	  type = v4sf_ftype_v4sf;
+	  break;
+	case V8QImode:
+	  type = v8qi_ftype_v8qi;
+	  break;
+	case V4HImode:
+	  type = v4hi_ftype_v4hi;
+	  break;
+	case V2SImode:
+	  type = v2si_ftype_v2si;
+	  break;
+
+	default:
+	  abort ();
+	}
+
+      def_builtin (d->mask, d->name, type, d->code);
+    }
+
   /* Add the remaining MMX insns with somewhat more complicated types.  */
   def_builtin (MASK_MMX, "__builtin_ia32_emms", void_ftype_void, IX86_BUILTIN_EMMS);
   def_builtin (MASK_MMX, "__builtin_ia32_psllw", v4hi_ftype_v4hi_di, IX86_BUILTIN_PSLLW);
@@ -15128,15 +15268,15 @@ ix86_init_mmx_sse_builtins (void)
 		   void_ftype_unsigned_unsigned,
 		   IX86_BUILTIN_MWAIT);
     }
-  def_builtin (MASK_SSE3, "__builtin_ia32_movshdup",
-	       v4sf_ftype_v4sf,
-	       IX86_BUILTIN_MOVSHDUP);
-  def_builtin (MASK_SSE3, "__builtin_ia32_movsldup",
-	       v4sf_ftype_v4sf,
-	       IX86_BUILTIN_MOVSLDUP);
   def_builtin (MASK_SSE3, "__builtin_ia32_lddqu",
 	       v16qi_ftype_pcchar, IX86_BUILTIN_LDDQU);
 
+  /* Merom New Instructions.  */
+  def_builtin (MASK_MNI, "__builtin_ia32_palignr128",
+	       v2di_ftype_v2di_v2di_int, IX86_BUILTIN_PALIGNR128);
+  def_builtin (MASK_MNI, "__builtin_ia32_palignr", di_ftype_di_di_int,
+	       IX86_BUILTIN_PALIGNR);
+
   /* Access to the vec_init patterns.  */
   ftype = build_function_type_list (V2SI_type_node, integer_type_node,
 				    integer_type_node, NULL_TREE);
@@ -15627,7 +15767,7 @@ ix86_expand_builtin (tree exp, rtx targe
   tree arglist = TREE_OPERAND (exp, 1);
   tree arg0, arg1, arg2;
   rtx op0, op1, op2, pat;
-  enum machine_mode tmode, mode0, mode1, mode2;
+  enum machine_mode tmode, mode0, mode1, mode2, mode3;
   unsigned int fcode = DECL_FUNCTION_CODE (fndecl);
 
   switch (fcode)
@@ -16004,6 +16144,52 @@ ix86_expand_builtin (tree exp, rtx targe
       return ix86_expand_unop_builtin (CODE_FOR_sse3_lddqu, arglist,
 				       target, 1);
 
+    case IX86_BUILTIN_PALIGNR:
+    case IX86_BUILTIN_PALIGNR128:
+      if (fcode == IX86_BUILTIN_PALIGNR)
+	{
+	  icode = CODE_FOR_mni_palignrdi;
+	  mode = DImode;
+	}
+      else
+	{
+	  icode = CODE_FOR_mni_palignrti;
+	  mode = V2DImode;
+	}
+      arg0 = TREE_VALUE (arglist);
+      arg1 = TREE_VALUE (TREE_CHAIN (arglist));
+      arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
+      op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
+      op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
+      op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
+      tmode = insn_data[icode].operand[0].mode;
+      mode1 = insn_data[icode].operand[1].mode;
+      mode2 = insn_data[icode].operand[2].mode;
+      mode3 = insn_data[icode].operand[3].mode;
+
+      if (! (*insn_data[icode].operand[1].predicate) (op0, mode1))
+	{
+	  op0 = copy_to_reg (op0);
+	  op0 = simplify_gen_subreg (mode1, op0, GET_MODE (op0), 0);
+	}
+      if (! (*insn_data[icode].operand[2].predicate) (op1, mode2))
+	{
+	  op1 = copy_to_reg (op1);
+	  op1 = simplify_gen_subreg (mode2, op1, GET_MODE (op1), 0);
+	}
+      if (! (*insn_data[icode].operand[3].predicate) (op2, mode3))
+	{
+	  error ("shift must be an immediate");
+	  return const0_rtx;
+	}
+      target = gen_reg_rtx (mode);
+      pat = GEN_FCN (icode) (simplify_gen_subreg (tmode, target, mode, 0),
+			     op0, op1, op2);
+      if (! pat)
+	return 0;
+      emit_insn (pat);
+      return target;
+
     case IX86_BUILTIN_VEC_INIT_V2SI:
     case IX86_BUILTIN_VEC_INIT_V4HI:
     case IX86_BUILTIN_VEC_INIT_V8QI:
--- gcc/config/i386/i386.h.mni	2006-02-04 06:59:11.000000000 -0800
+++ gcc/config/i386/i386.h	2006-02-24 13:39:19.000000000 -0800
@@ -385,6 +385,8 @@ extern int x86_prefetch_sse;
 	builtin_define ("__SSE2__");				\
       if (TARGET_SSE3)						\
 	builtin_define ("__SSE3__");				\
+      if (TARGET_MNI)						\
+	builtin_define ("__MNI__");				\
       if (TARGET_SSE_MATH && TARGET_SSE)			\
 	builtin_define ("__SSE_MATH__");			\
       if (TARGET_SSE_MATH && TARGET_SSE2)			\
--- gcc/config/i386/i386.md.mni	2006-02-24 13:39:19.000000000 -0800
+++ gcc/config/i386/i386.md	2006-02-24 13:39:19.000000000 -0800
@@ -102,7 +102,7 @@
    (UNSPEC_MFENCE		44)
    (UNSPEC_LFENCE		45)
    (UNSPEC_PSADBW		46)
-   (UNSPEC_LDQQU		47)
+   (UNSPEC_LDDQU		47)
 
    ; Generic math support
    (UNSPEC_COPYSIGN		50)
@@ -146,6 +146,11 @@
    (UNSPEC_SP_TEST		101)
    (UNSPEC_SP_TLS_SET		102)
    (UNSPEC_SP_TLS_TEST		103)
+
+   ; MNI
+   (UNSPEC_PSHUFB		120)
+   (UNSPEC_PSIGN		121)
+   (UNSPEC_PALIGNR		122)
   ])
 
 (define_constants
@@ -20262,6 +20267,6 @@
   "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%fs:%P2, %3|%3, QWORD PTR %%fs:%P2}"
   [(set_attr "type" "multi")])
 
-(include "sse.md")
 (include "mmx.md")
+(include "sse.md")
 (include "sync.md")
--- gcc/config/i386/i386.opt.mni	2006-02-24 13:39:19.000000000 -0800
+++ gcc/config/i386/i386.opt	2006-02-24 13:39:19.000000000 -0800
@@ -197,6 +197,10 @@ msse3
 Target Report Mask(SSE3)
 Support MMX, SSE, SSE2 and SSE3 built-in functions and code generation
 
+mmni
+Target Report Mask(MNI)
+Support MMX, SSE, SSE2, SSE3 and MNI built-in functions and code generation
+
 msseregparm
 Target RejectNegative Mask(SSEREGPARM)
 Use SSE register passing conventions for SF and DF mode
--- gcc/config/i386/sse.md.mni	2006-02-24 13:39:19.000000000 -0800
+++ gcc/config/i386/sse.md	2006-02-24 13:39:19.000000000 -0800
@@ -278,7 +278,7 @@
 (define_insn "sse3_lddqu"
   [(set (match_operand:V16QI 0 "register_operand" "=x")
 	(unspec:V16QI [(match_operand:V16QI 1 "memory_operand" "m")]
-		      UNSPEC_LDQQU))]
+		      UNSPEC_LDDQU))]
   "TARGET_SSE3"
   "lddqu\t{%1, %0|%0, %1}"
   [(set_attr "type" "ssecvt")
@@ -3923,3 +3923,578 @@
 ;;  "monitor\t%0, %1, %2"
   "monitor"
   [(set_attr "length" "3")])
+
+;; MNI
+(define_insn "mni_phaddwv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(vec_concat:V8HI
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (plus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 1 "register_operand" "0")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	      (plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 5)])))
+	      (plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 7)])))))
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (plus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 2 "nonimmediate_operand" "xm")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	      (plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 5)])))
+	      (plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))]
+  "TARGET_MNI"
+  "phaddw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phaddwv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(vec_concat:V4HI
+	  (vec_concat:V2HI
+	    (plus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	    (plus:HI
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2HI
+	    (plus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 2 "nonimmediate_operand" "ym")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	    (plus:HI
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phaddw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_phadddv4si3"
+  [(set (match_operand:V4SI 0 "register_operand" "=x")
+	(vec_concat:V4SI
+	  (vec_concat:V2SI
+	    (plus:SI
+	      (vec_select:SI
+		(match_operand:V4SI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 1)])))
+	    (plus:SI
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2SI
+	    (plus:SI
+	      (vec_select:SI
+		(match_operand:V4SI 2 "nonimmediate_operand" "xm")
+		(parallel [(const_int 0)]))
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))
+	    (plus:SI
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phaddd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phadddv2si3"
+  [(set (match_operand:V2SI 0 "register_operand" "=y")
+	(vec_concat:V2SI
+	  (plus:SI
+	    (vec_select:SI
+	      (match_operand:V2SI 1 "register_operand" "0")
+	      (parallel [(const_int 0)]))
+	    (vec_select:SI (match_dup 1) (parallel [(const_int 1)])))
+	  (plus:SI
+	    (vec_select:SI
+	      (match_operand:V2SI 2 "nonimmediate_operand" "ym")
+	      (parallel [(const_int 0)]))
+	    (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))]
+  "TARGET_MNI"
+  "phaddd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_phaddswv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(vec_concat:V8HI
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (ss_plus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 1 "register_operand" "0")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 5)])))
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 7)])))))
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (ss_plus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 2 "nonimmediate_operand" "xm")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 5)])))
+	      (ss_plus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))]
+  "TARGET_MNI"
+  "phaddsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phaddswv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(vec_concat:V4HI
+	  (vec_concat:V2HI
+	    (ss_plus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	    (ss_plus:HI
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2HI
+	    (ss_plus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 2 "nonimmediate_operand" "ym")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	    (ss_plus:HI
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phaddsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_phsubwv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(vec_concat:V8HI
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (minus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 1 "register_operand" "0")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	      (minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 5)])))
+	      (minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 7)])))))
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (minus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 2 "nonimmediate_operand" "xm")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	      (minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 5)])))
+	      (minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))]
+  "TARGET_MNI"
+  "phsubw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phsubwv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(vec_concat:V4HI
+	  (vec_concat:V2HI
+	    (minus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	    (minus:HI
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2HI
+	    (minus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 2 "nonimmediate_operand" "ym")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	    (minus:HI
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phsubw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_phsubdv4si3"
+  [(set (match_operand:V4SI 0 "register_operand" "=x")
+	(vec_concat:V4SI
+	  (vec_concat:V2SI
+	    (minus:SI
+	      (vec_select:SI
+		(match_operand:V4SI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 1)])))
+	    (minus:SI
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:SI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2SI
+	    (minus:SI
+	      (vec_select:SI
+		(match_operand:V4SI 2 "nonimmediate_operand" "xm")
+		(parallel [(const_int 0)]))
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))
+	    (minus:SI
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phsubd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phsubdv2si3"
+  [(set (match_operand:V2SI 0 "register_operand" "=y")
+	(vec_concat:V2SI
+	  (minus:SI
+	    (vec_select:SI
+	      (match_operand:V2SI 1 "register_operand" "0")
+	      (parallel [(const_int 0)]))
+	    (vec_select:SI (match_dup 1) (parallel [(const_int 1)])))
+	  (minus:SI
+	    (vec_select:SI
+	      (match_operand:V2SI 2 "nonimmediate_operand" "ym")
+	      (parallel [(const_int 0)]))
+	    (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))]
+  "TARGET_MNI"
+  "phsubd\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_phsubswv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(vec_concat:V8HI
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (ss_minus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 1 "register_operand" "0")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 5)])))
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 1) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 1) (parallel [(const_int 7)])))))
+	  (vec_concat:V4HI
+	    (vec_concat:V2HI
+	      (ss_minus:HI
+		(vec_select:HI
+		  (match_operand:V8HI 2 "nonimmediate_operand" "xm")
+		  (parallel [(const_int 0)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))
+	    (vec_concat:V2HI
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 4)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 5)])))
+	      (ss_minus:HI
+		(vec_select:HI (match_dup 2) (parallel [(const_int 6)]))
+		(vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))]
+  "TARGET_MNI"
+  "phsubsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_phsubswv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(vec_concat:V4HI
+	  (vec_concat:V2HI
+	    (ss_minus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 1 "register_operand" "0")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 1)])))
+	    (ss_minus:HI
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 1) (parallel [(const_int 3)]))))
+	  (vec_concat:V2HI
+	    (ss_minus:HI
+	      (vec_select:HI
+		(match_operand:V4HI 2 "nonimmediate_operand" "ym")
+		(parallel [(const_int 0)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 1)])))
+	    (ss_minus:HI
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 2)]))
+	      (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))]
+  "TARGET_MNI"
+  "phsubsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_pmaddubswv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(ss_plus:V8HI
+	  (mult:V8HI
+	    (zero_extend:V8HI
+	      (vec_select:V4QI
+		(match_operand:V16QI 1 "nonimmediate_operand" "%0")
+		(parallel [(const_int 0)
+			   (const_int 2)
+			   (const_int 4)
+			   (const_int 6)
+			   (const_int 8)
+			   (const_int 10)
+			   (const_int 12)
+			   (const_int 14)])))
+	    (sign_extend:V8HI
+	      (vec_select:V8QI
+		(match_operand:V16QI 2 "nonimmediate_operand" "xm")
+		(parallel [(const_int 0)
+			   (const_int 2)
+			   (const_int 4)
+			   (const_int 6)
+			   (const_int 8)
+			   (const_int 10)
+			   (const_int 12)
+			   (const_int 14)]))))
+	  (mult:V8HI
+	    (zero_extend:V8HI
+	      (vec_select:V16QI (match_dup 1)
+		(parallel [(const_int 1)
+			   (const_int 3)
+			   (const_int 5)
+			   (const_int 7)
+			   (const_int 9)
+			   (const_int 11)
+			   (const_int 13)
+			   (const_int 15)])))
+	    (sign_extend:V8HI
+	      (vec_select:V16QI (match_dup 2)
+		(parallel [(const_int 1)
+			   (const_int 3)
+			   (const_int 5)
+			   (const_int 7)
+			   (const_int 9)
+			   (const_int 11)
+			   (const_int 13)
+			   (const_int 15)]))))))]
+  "TARGET_MNI"
+  "pmaddubsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_pmaddubswv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(ss_plus:V4HI
+	  (mult:V4HI
+	    (zero_extend:V4HI
+	      (vec_select:V4QI
+		(match_operand:V8QI 1 "nonimmediate_operand" "%0")
+		(parallel [(const_int 0)
+			   (const_int 2)
+			   (const_int 4)
+			   (const_int 6)])))
+	    (sign_extend:V4HI
+	      (vec_select:V4QI
+		(match_operand:V8QI 2 "nonimmediate_operand" "ym")
+		(parallel [(const_int 0)
+			   (const_int 2)
+			   (const_int 4)
+			   (const_int 6)]))))
+	  (mult:V4HI
+	    (zero_extend:V4HI
+	      (vec_select:V8QI (match_dup 1)
+		(parallel [(const_int 1)
+			   (const_int 3)
+			   (const_int 5)
+			   (const_int 7)])))
+	    (sign_extend:V4HI
+	      (vec_select:V8QI (match_dup 2)
+		(parallel [(const_int 1)
+			   (const_int 3)
+			   (const_int 5)
+			   (const_int 7)]))))))]
+  "TARGET_MNI"
+  "pmaddubsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseiadd")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_pmulhrswv8hi3"
+  [(set (match_operand:V8HI 0 "register_operand" "=x")
+	(truncate:V8HI
+	  (lshiftrt:V8SI
+	    (plus:V8SI
+	      (lshiftrt:V8SI
+		(mult:V8SI
+		  (sign_extend:V8SI
+		    (match_operand:V8HI 1 "nonimmediate_operand" "%0"))
+		  (sign_extend:V8SI
+		    (match_operand:V8HI 2 "nonimmediate_operand" "xm")))
+		(const_int 14))
+	      (const_vector:V8HI [(const_int 1) (const_int 1)
+				  (const_int 1) (const_int 1)
+				  (const_int 1) (const_int 1)
+				  (const_int 1) (const_int 1)]))
+	    (const_int 1))))]
+  "TARGET_MNI && ix86_binary_operator_ok (MULT, V8HImode, operands)"
+  "pmulhrsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseimul")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_pmulhrswv4hi3"
+  [(set (match_operand:V4HI 0 "register_operand" "=y")
+	(truncate:V4HI
+	  (lshiftrt:V4SI
+	    (plus:V4SI
+	      (lshiftrt:V4SI
+		(mult:V4SI
+		  (sign_extend:V4SI
+		    (match_operand:V4HI 1 "nonimmediate_operand" "%0"))
+		  (sign_extend:V4SI
+		    (match_operand:V4HI 2 "nonimmediate_operand" "ym")))
+		(const_int 14))
+	      (const_vector:V4HI [(const_int 1) (const_int 1)
+				  (const_int 1) (const_int 1)]))
+	    (const_int 1))))]
+  "TARGET_MNI && ix86_binary_operator_ok (MULT, V4HImode, operands)"
+  "pmulhrsw\t{%2, %0|%0, %2}"
+  [(set_attr "type" "sseimul")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_pshufbv16qi3"
+  [(set (match_operand:V16QI 0 "register_operand" "=x")
+	(unspec:V16QI [(match_operand:V16QI 1 "register_operand" "0")
+		       (match_operand:V16QI 2 "nonimmediate_operand" "xm")]
+		       UNSPEC_PSHUFB))]
+  "TARGET_MNI"
+  "pshufb\t{%2, %0|%0, %2}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_pshufbv8qi3"
+  [(set (match_operand:V8QI 0 "register_operand" "=y")
+	(unspec:V8QI [(match_operand:V8QI 1 "register_operand" "0")
+		      (match_operand:V8QI 2 "nonimmediate_operand" "ym")]
+		      UNSPEC_PSHUFB))]
+  "TARGET_MNI"
+  "pshufb\t{%2, %0|%0, %2}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_psign<mode>3"
+  [(set (match_operand:SSEMODE124 0 "register_operand" "=x")
+	(unspec:SSEMODE124 [(match_operand:SSEMODE124 1 "register_operand" "0")
+			    (match_operand:SSEMODE124 2 "nonimmediate_operand" "xm")]
+			    UNSPEC_PSIGN))]
+  "TARGET_MNI"
+  "psign<ssevecsize>\t{%2, %0|%0, %2}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_psign<mode>3"
+  [(set (match_operand:MMXMODEI 0 "register_operand" "=y")
+	(unspec:MMXMODEI [(match_operand:MMXMODEI 1 "register_operand" "0")
+			  (match_operand:MMXMODEI 2 "nonimmediate_operand" "ym")]
+			  UNSPEC_PSIGN))]
+  "TARGET_MNI"
+  "psign<mmxvecsize>\t{%2, %0|%0, %2}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_palignrti"
+  [(set (match_operand:TI 0 "register_operand" "=x")
+	(unspec:TI [(match_operand:TI 1 "register_operand" "0")
+		    (match_operand:TI 2 "nonimmediate_operand" "xm")
+		    (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")]
+		    UNSPEC_PALIGNR))]
+  "TARGET_MNI"
+{
+  operands[3] = GEN_INT (INTVAL (operands[3]) / 8);
+  return "palignr\t{%3, %2, %0|%0, %2, %3}";
+}
+  [(set_attr "type" "sseishft")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_palignrdi"
+  [(set (match_operand:DI 0 "register_operand" "=y")
+	(unspec:DI [(match_operand:DI 1 "register_operand" "0")
+		    (match_operand:DI 2 "nonimmediate_operand" "ym")
+		    (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")]
+		    UNSPEC_PALIGNR))]
+  "TARGET_MNI"
+{
+  operands[3] = GEN_INT (INTVAL (operands[3]) / 8);
+  return "palignr\t{%3, %2, %0|%0, %2, %3}";
+}
+  [(set_attr "type" "sseishft")
+   (set_attr "mode" "DI")])
+
+(define_insn "mni_pabs<mode>2"
+  [(set (match_operand:SSEMODE124 0 "register_operand" "=x")
+	(abs:SSEMODE124 (match_operand:SSEMODE124 1 "nonimmediate_operand" "xm")))]
+  "TARGET_MNI"
+  "pabs<ssevecsize>\t{%1, %0|%0, %1}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "TI")])
+
+(define_insn "mni_pabs<mode>2"
+  [(set (match_operand:MMXMODEI 0 "register_operand" "=y")
+	(abs:MMXMODEI (match_operand:MMXMODEI 1 "nonimmediate_operand" "ym")))]
+  "TARGET_MNI"
+  "pabs<mmxvecsize>\t{%1, %0|%0, %1}";
+  [(set_attr "type" "sselog1")
+   (set_attr "mode" "DI")])
--- gcc/config/i386/tmmintrin.h.mni	2006-02-24 13:39:19.000000000 -0800
+++ gcc/config/i386/tmmintrin.h	2006-02-24 13:39:19.000000000 -0800
@@ -0,0 +1,224 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+
+   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.  */
+
+/* As a special exception, if you include this header file into source
+   files compiled by GCC, this header file does not by itself cause
+   the resulting executable to be covered by the GNU General Public
+   License.  This exception does not however invalidate any other
+   reasons why the executable file might be covered by the GNU General
+   Public License.  */
+
+/* Implemented from the specification included in the Intel C++ Compiler
+   User Guide and Reference, version 9.1.  */
+
+#ifndef _TMMINTRIN_H_INCLUDED
+#define _TMMINTRIN_H_INCLUDED
+
+#ifdef __MNI__
+#include <pmmintrin.h>
+
+static __inline __m128i
+_mm_hadd_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phaddw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m128i
+_mm_hadd_epi32 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phaddd128 ((__v4si)__X, (__v4si)__Y);
+}
+
+static __inline __m128i
+_mm_hadds_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phaddsw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m64
+_mm_hadd_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phaddw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m64
+_mm_hadd_pi32 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phaddd ((__v2si)__X, (__v2si)__Y);
+}
+
+static __inline __m64
+_mm_hadds_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phaddsw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m128i
+_mm_hsub_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phsubw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m128i
+_mm_hsub_epi32 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phsubd128 ((__v4si)__X, (__v4si)__Y);
+}
+
+static __inline __m128i
+_mm_hsubs_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_phsubsw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m64
+_mm_hsub_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phsubw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m64
+_mm_hsub_pi32 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phsubd ((__v2si)__X, (__v2si)__Y);
+}
+
+static __inline __m64
+_mm_hsubs_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_phsubsw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m128i
+_mm_maddubs_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_pmaddubsw128 ((__v16qi)__X, (__v16qi)__Y);
+}
+
+static __inline __m64
+_mm_maddubs_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_pmaddubsw ((__v8qi)__X, (__v8qi)__Y);
+}
+
+static __inline __m128i
+_mm_mulhrs_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_pmulhrsw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m64
+_mm_mulhrs_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_pmulhrsw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m128i
+_mm_shuffle_epi8 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_pshufb128 ((__v16qi)__X, (__v16qi)__Y);
+}
+
+static __inline __m64
+_mm_shuffle_pi8 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_pshufb ((__v8qi)__X, (__v8qi)__Y);
+}
+
+static __inline __m128i
+_mm_sign_epi8 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_psignb128 ((__v16qi)__X, (__v16qi)__Y);
+}
+
+static __inline __m128i
+_mm_sign_epi16 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_psignw128 ((__v8hi)__X, (__v8hi)__Y);
+}
+
+static __inline __m128i
+_mm_sign_epi32 (__m128i __X, __m128i __Y)
+{
+  return (__m128i) __builtin_ia32_psignd128 ((__v4si)__X, (__v4si)__Y);
+}
+
+static __inline __m64
+_mm_sign_pi8 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_psignb ((__v8qi)__X, (__v8qi)__Y);
+}
+
+static __inline __m64
+_mm_sign_pi16 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_psignw ((__v4hi)__X, (__v4hi)__Y);
+}
+
+static __inline __m64
+_mm_sign_pi32 (__m64 __X, __m64 __Y)
+{
+  return (__m64) __builtin_ia32_psignd ((__v2si)__X, (__v2si)__Y);
+}
+
+#define _mm_alignr_epi8(__X, __Y, __N) \
+  ((__m128i)__builtin_ia32_palignr128 ((__v2di) __X, (__v2di) __Y, (__N) * 8))
+
+#define _mm_alignr_pi8(__X, __Y, __N) \
+  ((__m64)__builtin_ia32_palignr ((long long) (__X), (long long) (__Y), (__N) * 8))
+
+static __inline __m128i
+_mm_abs_epi8 (__m128i __X)
+{
+  return (__m128i) __builtin_ia32_pabsb128 ((__v16qi)__X);
+}
+
+static __inline __m128i
+_mm_abs_epi16 (__m128i __X)
+{
+  return (__m128i) __builtin_ia32_pabsw128 ((__v8hi)__X);
+}
+
+static __inline __m128i
+_mm_abs_epi32 (__m128i __X)
+{
+  return (__m128i) __builtin_ia32_pabsd128 ((__v4si)__X);
+}
+
+static __inline __m64
+_mm_abs_pi8 (__m64 __X)
+{
+  return (__m64) __builtin_ia32_pabsb ((__v8qi)__X);
+}
+
+static __inline __m64
+_mm_abs_pi16 (__m64 __X)
+{
+  return (__m64) __builtin_ia32_pabsw ((__v4hi)__X);
+}
+
+static __inline __m64
+_mm_abs_pi32 (__m64 __X)
+{
+  return (__m64) __builtin_ia32_pabsd ((__v2si)__X);
+}
+
+#endif /* __MNI__ */
+
+#endif /* _TMMINTRIN_H_INCLUDED */
--- gcc/doc/extend.texi.mni	2006-02-21 22:42:04.000000000 -0800
+++ gcc/doc/extend.texi	2006-02-24 13:39:19.000000000 -0800
@@ -6701,6 +6701,52 @@ The following built-in functions are ava
 Generates the @code{movddup} machine instruction as a load from memory.
 @end table
 
+The following built-in functions are available when @option{-mmni} is used.
+All of them generate the machine instruction that is part of the name
+with MMX registers.
+
+ at smallexample
+v2si __builtin_ia32_phaddd (v2si, v2si)
+v4hi __builtin_ia32_phaddw (v4hi, v4hi)
+v4hi __builtin_ia32_phaddsw (v4hi, v4hi)
+v2si __builtin_ia32_phsubd (v2si, v2si)
+v4hi __builtin_ia32_phsubw (v4hi, v4hi)
+v4hi __builtin_ia32_phsubsw (v4hi, v4hi)
+v8qi __builtin_ia32_pmaddubsw (v8qi, v8qi)
+v4hi __builtin_ia32_pmulhrsw (v4hi, v4hi)
+v8qi __builtin_ia32_pshufb (v8qi, v8qi)
+v8qi __builtin_ia32_psignb (v8qi, v8qi)
+v2si __builtin_ia32_psignd (v2si, v2si)
+v4hi __builtin_ia32_psignw (v4hi, v4hi)
+long long __builtin_ia32_palignr (long long, long long, int)
+v8qi __builtin_ia32_pabsb (v8qi)
+v2si __builtin_ia32_pabsd (v2si)
+v4hi __builtin_ia32_pabsw (v4hi)
+ at end smallexample
+
+The following built-in functions are available when @option{-mmni} is used.
+All of them generate the machine instruction that is part of the name
+with SSE registers.
+
+ at smallexample
+v4si __builtin_ia32_phaddd128 (v4si, v4si)
+v8hi __builtin_ia32_phaddw128 (v8hi, v8hi)
+v8hi __builtin_ia32_phaddsw128 (v8hi, v8hi)
+v4si __builtin_ia32_phsubd128 (v4si, v4si)
+v8hi __builtin_ia32_phsubw128 (v8hi, v8hi)
+v8hi __builtin_ia32_phsubsw128 (v8hi, v8hi)
+v16qi __builtin_ia32_pmaddubsw128 (v16qi, v16qi)
+v8hi __builtin_ia32_pmulhrsw128 (v8hi, v8hi)
+v16qi __builtin_ia32_pshufb128 (v16qi, v16qi)
+v16qi __builtin_ia32_psignb128 (v16qi, v16qi)
+v4si __builtin_ia32_psignd128 (v4si, v4si)
+v8hi __builtin_ia32_psignw128 (v8hi, v8hi)
+v2di __builtin_ia32_palignr (v2di, v2di, int)
+v16qi __builtin_ia32_pabsb128 (v16qi)
+v4si __builtin_ia32_pabsd128 (v4si)
+v8hi __builtin_ia32_pabsw128 (v8hi)
+ at end smallexample
+
 The following built-in functions are available when @option{-m3dnow} is used.
 All of them generate the machine instruction that is part of the name.
 
--- gcc/doc/invoke.texi.mni	2006-02-14 13:17:58.000000000 -0800
+++ gcc/doc/invoke.texi	2006-02-24 13:42:50.000000000 -0800
@@ -522,7 +522,7 @@ Objective-C and Objective-C++ Dialects}.
 -mno-fp-ret-in-387  -msoft-float  -msvr3-shlib @gol
 -mno-wide-multiply  -mrtd  -malign-double @gol
 -mpreferred-stack-boundary=@var{num} @gol
--mmmx  -msse  -msse2 -msse3 -m3dnow @gol
+-mmmx  -msse  -msse2 -msse3 -mmni -m3dnow @gol
 -mthreads  -mno-align-stringops  -minline-all-stringops @gol
 -mpush-args  -maccumulate-outgoing-args  -m128bit-long-double @gol
 -m96bit-long-double  -mregparm=@var{num}  -msseregparm @gol
@@ -9343,6 +9343,8 @@ preferred alignment to @option{-mpreferr
 @itemx -mno-sse2
 @item -msse3
 @itemx -mno-sse3
+ at item -mmni
+ at itemx -mno-mni
 @item -m3dnow
 @itemx -mno-3dnow
 @opindex mmmx

gcc41-x86_64-sse3.patch:
 config/i386/i386.c                  |   56 +++++++++++++++++++++++++++---------
 config/i386/pmmintrin.h             |    5 ---
 config/i386/sse.md                  |   25 ++++++++++++++--
 testsuite/gcc.target/i386/monitor.c |   27 +++++++++++++++++
 4 files changed, 93 insertions(+), 20 deletions(-)

--- NEW FILE gcc41-x86_64-sse3.patch ---
2005-11-17  H.J. Lu  <hongjiu.lu at intel.com>

	PR target/24879
	* config/i386/i386.c (ix86_init_mmx_sse_builtins): Add
	void_ftype_di_di and void_ftype_pcvoid_di_di. Use void_ftype_di_di
	on __builtin_ia32_mwait and void_ftype_pcvoid_di_di on
	__builtin_ia32_monitor for 64bit.
	(ix86_expand_builtin): Support 64bit monitor and mwait.

	* config/i386/pmmintrin.h (_mm_monitor): Remove macro. Use
	inline function.
	(_mm_mwait): Likewise.

	* config/i386/sse.md (sse3_mwait): Make it 32bit only.
	(sse3_mwait64): New. 64bit mwait.
	(sse3_monitor): Make it 32bit only.
	(sse3_monitor64): New. 64bit monitor.

gcc/testsuite/

2005-11-17  H.J. Lu  <hongjiu.lu at intel.com>

	PR target/24879
	* gcc.target/i386/monitor.c: New file.

--- gcc/config/i386/i386.c.sse3	2005-11-15 17:33:02.000000000 -0800
+++ gcc/config/i386/i386.c	2005-11-17 09:44:47.000000000 -0800
@@ -14347,10 +14347,20 @@ ix86_init_mmx_sse_builtins (void)
   tree void_ftype_unsigned_unsigned
     = build_function_type_list (void_type_node, unsigned_type_node,
 				unsigned_type_node, NULL_TREE);
+  tree void_ftype_di_di
+    = build_function_type_list (void_type_node,
+				long_long_unsigned_type_node,
+				long_long_unsigned_type_node,
+				NULL_TREE);
   tree void_ftype_pcvoid_unsigned_unsigned
     = build_function_type_list (void_type_node, const_ptr_type_node,
 				unsigned_type_node, unsigned_type_node,
 				NULL_TREE);
+  tree void_ftype_pcvoid_di_di
+    = build_function_type_list (void_type_node, const_ptr_type_node,
+				long_long_unsigned_type_node,
+				long_long_unsigned_type_node,
+				NULL_TREE);
   tree unsigned_ftype_void
     = build_function_type (unsigned_type_node, void_list_node);
   tree v2si_ftype_v4sf
@@ -14811,12 +14821,24 @@ ix86_init_mmx_sse_builtins (void)
   def_builtin (MASK_SSE2, "__builtin_ia32_pmaddwd128", v4si_ftype_v8hi_v8hi, IX86_BUILTIN_PMADDWD128);
 
   /* Prescott New Instructions.  */
-  def_builtin (MASK_SSE3, "__builtin_ia32_monitor",
-	       void_ftype_pcvoid_unsigned_unsigned,
-	       IX86_BUILTIN_MONITOR);
-  def_builtin (MASK_SSE3, "__builtin_ia32_mwait",
-	       void_ftype_unsigned_unsigned,
-	       IX86_BUILTIN_MWAIT);
+  if (TARGET_64BIT)
+    {
+      def_builtin (MASK_SSE3, "__builtin_ia32_monitor",
+		   void_ftype_pcvoid_di_di,
+		   IX86_BUILTIN_MONITOR);
+      def_builtin (MASK_SSE3, "__builtin_ia32_mwait",
+		   void_ftype_di_di,
+		   IX86_BUILTIN_MWAIT);
+    }
+  else
+    {
+      def_builtin (MASK_SSE3, "__builtin_ia32_monitor",
+		   void_ftype_pcvoid_unsigned_unsigned,
+		   IX86_BUILTIN_MONITOR);
+      def_builtin (MASK_SSE3, "__builtin_ia32_mwait",
+		   void_ftype_unsigned_unsigned,
+		   IX86_BUILTIN_MWAIT);
+    }
   def_builtin (MASK_SSE3, "__builtin_ia32_movshdup",
 	       v4sf_ftype_v4sf,
 	       IX86_BUILTIN_MOVSHDUP);
@@ -15660,13 +15682,17 @@ ix86_expand_builtin (tree exp, rtx targe
       op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
       op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
       op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0);
+      mode = TARGET_64BIT ? DImode : SImode;
       if (!REG_P (op0))
-	op0 = copy_to_mode_reg (SImode, op0);
+	op0 = copy_to_mode_reg (mode, op0);
       if (!REG_P (op1))
-	op1 = copy_to_mode_reg (SImode, op1);
+	op1 = copy_to_mode_reg (mode, op1);
       if (!REG_P (op2))
-	op2 = copy_to_mode_reg (SImode, op2);
-      emit_insn (gen_sse3_monitor (op0, op1, op2));
+	op2 = copy_to_mode_reg (mode, op2);
+      if (TARGET_64BIT)
+	emit_insn (gen_sse3_monitor64 (op0, op1, op2));
+      else
+	emit_insn (gen_sse3_monitor (op0, op1, op2));
       return 0;
 
     case IX86_BUILTIN_MWAIT:
@@ -15674,11 +15700,15 @@ ix86_expand_builtin (tree exp, rtx targe
       arg1 = TREE_VALUE (TREE_CHAIN (arglist));
       op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0);
       op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0);
+      mode = TARGET_64BIT ? DImode : SImode;
       if (!REG_P (op0))
-	op0 = copy_to_mode_reg (SImode, op0);
+	op0 = copy_to_mode_reg (mode, op0);
       if (!REG_P (op1))
-	op1 = copy_to_mode_reg (SImode, op1);
-      emit_insn (gen_sse3_mwait (op0, op1));
+	op1 = copy_to_mode_reg (mode, op1);
+      if (TARGET_64BIT)
+	emit_insn (gen_sse3_mwait64 (op0, op1));
+      else
+	emit_insn (gen_sse3_mwait (op0, op1));
       return 0;
 
     case IX86_BUILTIN_LDDQU:
--- gcc/config/i386/pmmintrin.h.sse3	2005-11-04 14:13:48.000000000 -0800
+++ gcc/config/i386/pmmintrin.h	2005-11-15 22:44:02.000000000 -0800
@@ -110,7 +110,6 @@ _mm_lddqu_si128 (__m128i const *__P)
   return (__m128i) __builtin_ia32_lddqu ((char const *)__P);
 }
 
-#if 0
 static __inline void __attribute__((__always_inline__))
 _mm_monitor (void const * __P, unsigned int __E, unsigned int __H)
 {
@@ -122,10 +121,6 @@ _mm_mwait (unsigned int __E, unsigned in
 {
   __builtin_ia32_mwait (__E, __H);
 }
-#else
-#define _mm_monitor(P, E, H)	__builtin_ia32_monitor ((P), (E), (H))
-#define _mm_mwait(E, H)		__builtin_ia32_mwait ((E), (H))
-#endif
 
 #endif /* __SSE3__ */
 
--- gcc/config/i386/sse.md.sse3	2005-11-04 14:13:48.000000000 -0800
+++ gcc/config/i386/sse.md	2005-11-17 09:25:31.000000000 -0800
@@ -3890,15 +3890,36 @@
   [(unspec_volatile [(match_operand:SI 0 "register_operand" "a")
 		     (match_operand:SI 1 "register_operand" "c")]
 		    UNSPECV_MWAIT)]
-  "TARGET_SSE3"
+  "TARGET_SSE3 && !TARGET_64BIT"
   "mwait\t%0, %1"
   [(set_attr "length" "3")])
 
+(define_insn "sse3_mwait64"
+  [(unspec_volatile [(match_operand:DI 0 "register_operand" "a")
+		     (match_operand:DI 1 "register_operand" "c")]
+		    UNSPECV_MWAIT)]
+  "TARGET_SSE3 && TARGET_64BIT"
+;; Older assembler doesn't support "mwait %rax,%rcx".
+;;  "mwait\t%0, %1"
+  "mwait"
+  [(set_attr "length" "3")])
+
 (define_insn "sse3_monitor"
   [(unspec_volatile [(match_operand:SI 0 "register_operand" "a")
 		     (match_operand:SI 1 "register_operand" "c")
 		     (match_operand:SI 2 "register_operand" "d")]
 		    UNSPECV_MONITOR)]
-  "TARGET_SSE3"
+  "TARGET_SSE3 && !TARGET_64BIT"
   "monitor\t%0, %1, %2"
   [(set_attr "length" "3")])
+
+(define_insn "sse3_monitor64"
+  [(unspec_volatile [(match_operand:DI 0 "register_operand" "a")
+		     (match_operand:DI 1 "register_operand" "c")
+		     (match_operand:DI 2 "register_operand" "d")]
+		    UNSPECV_MONITOR)]
+  "TARGET_SSE3 && TARGET_64BIT"
+;; Older assembler doesn't support "monitor %rax,%rcx,%rdx".
+;;  "monitor\t%0, %1, %2"
+  "monitor"
+  [(set_attr "length" "3")])
--- gcc/testsuite/gcc.target/i386/monitor.c.sse3	2005-11-15 22:59:54.000000000 -0800
+++ gcc/testsuite/gcc.target/i386/monitor.c	2005-11-15 23:25:23.000000000 -0800
@@ -0,0 +1,27 @@
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O2 -msse3" } */
+
+/* Verify that they work in both 32bit and 64bit.  */
+
+#include <pmmintrin.h>
+
+void
+foo (char *p, int x, int y, int z)
+{
+   _mm_monitor (p, y, x);
+   _mm_mwait (z, y);
+}
+
+void
+bar (char *p, long x, long y, long z)
+{
+   _mm_monitor (p, y, x);
+   _mm_mwait (z, y);
+}
+
+void
+foo1 (char *p)
+{
+   _mm_monitor (p, 0, 0);
+   _mm_mwait (0, 0);
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- .cvsignore	19 Feb 2006 22:48:01 -0000	1.136
+++ .cvsignore	27 Feb 2006 16:57:32 -0000	1.137
@@ -1 +1 @@
-gcc-4.1.0-20060219.tar.bz2
+gcc-4.1.0-20060227.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gcc41.spec	19 Feb 2006 23:18:28 -0000	1.39
+++ gcc41.spec	27 Feb 2006 16:57:32 -0000	1.40
@@ -1,6 +1,6 @@
-%define DATE 20060219
+%define DATE 20060227
 %define gcc_version 4.1.0
-%define gcc_release 0.29
+%define gcc_release 0.30
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -104,14 +104,10 @@
 Patch7: gcc41-ada-tweaks.patch
 Patch8: gcc41-java-slow_pthread_self.patch
 Patch9: gcc41-ppc32-retaddr.patch
-Patch10: gcc41-sparc64-g7.patch
-Patch11: gcc41-fortran-where.patch
-Patch12: gcc41-expr_nonzero_p.patch
-Patch13: gcc41-libstdc++-bitset.patch
-Patch14: gcc41-mmintrin.patch
-Patch15: gcc41-pr25626.patch
-Patch16: gcc41-vrp.patch
-Patch17: gcc41-c++-parser.patch
+Patch10: gcc41-fortran-matmul.patch
+Patch11: gcc41-fortran-where-opt.patch
+Patch12: gcc41-x86_64-sse3.patch
+Patch13: gcc41-mni.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -400,14 +396,10 @@
 %patch7 -p0 -b .ada-tweaks~
 %patch8 -p0 -b .java-slow_pthread_self~
 %patch9 -p0 -b .ppc32-retaddr~
-%patch10 -p0 -b .sparc64-g7~
-%patch11 -p0 -b .fortran-where~
-%patch12 -p0 -b .expr_nonzero_p~
-%patch13 -p0 -b .libstdc++-bitset~
-%patch14 -p0 -b .mmintrin~
-%patch15 -p0 -b .pr25626~
-%patch16 -p0 -b .vrp~
-%patch17 -p0 -b .c++-parser~
+%patch10 -p0 -b .fortran-matmul~
+%patch11 -p0 -b .fortran-where-opt~
+%patch12 -p0 -b .x86_64-sse3~
+%patch13 -p0 -b .mni~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1063,6 +1055,7 @@
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xmmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/emmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pmmintrin.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/tmmintrin.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
 %endif
@@ -1424,6 +1417,20 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Feb 27 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.30
+- update from gcc-4_1-branch (-r111278:111466)
+  - GCC 4.1.0 RC2
+  - PRs fortran/26201, libobjc/26309, rtl-optimization/25603, target/25603
+  - fix nested vector shifts (#182047, PR middle-end/26379)
+- merge gomp changes from trunk (-r111390:111391, -r111428:111429 and
+  -r111440:111441)
+  - PR middle-end/26412
+- fortran MATMUL optimization (Richard Sandiford)
+- fortran WHERE optimizations (Roger Sayle)
+- x86_64 _mm_monitor fixes (H.J. Lu, PR target/24879)
+- add MNI support on i?86/x86_64, -mmni option and <tmmintrin.h> header
+  (H.J Lu)
+
 * Sun Feb 19 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.29
 - update from gcc-4_1-branch (-r111179:111278)
   - PRs ada/13408, c++/26266, target/22209, target/26189


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- sources	19 Feb 2006 22:48:02 -0000	1.138
+++ sources	27 Feb 2006 16:57:32 -0000	1.139
@@ -1 +1 @@
-a2796ec8b629416c40b1ac08b0ca5960  gcc-4.1.0-20060219.tar.bz2
+0f8de572c90319bec3096555acab7f0c  gcc-4.1.0-20060227.tar.bz2


--- gcc41-c++-parser.patch DELETED ---


--- gcc41-expr_nonzero_p.patch DELETED ---


--- gcc41-fortran-where.patch DELETED ---


--- gcc41-libstdc++-bitset.patch DELETED ---


--- gcc41-mmintrin.patch DELETED ---


--- gcc41-pr25626.patch DELETED ---


--- gcc41-sparc64-g7.patch DELETED ---


--- gcc41-vrp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:07:06 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:07:06 -0500
Subject: rpms/mkinitrd/devel .cvsignore, 1.97, 1.98 mkinitrd.spec, 1.110,
	1.111 sources, 1.106, 1.107
Message-ID: <200602271707.k1RH76ts006905@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/mkinitrd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6879

Modified Files:
	.cvsignore mkinitrd.spec sources 
Log Message:
- update to 5.0.29-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- .cvsignore	24 Feb 2006 23:10:51 -0000	1.97
+++ .cvsignore	27 Feb 2006 17:06:59 -0000	1.98
@@ -1 +1 @@
-mkinitrd-5.0.28.tar.bz2
+mkinitrd-5.0.29.tar.bz2


Index: mkinitrd.spec
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mkinitrd.spec	24 Feb 2006 23:10:52 -0000	1.110
+++ mkinitrd.spec	27 Feb 2006 17:07:03 -0000	1.111
@@ -1,6 +1,6 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
-Version: 5.0.28
+Version: 5.0.29
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -11,7 +11,7 @@
 Requires: fileutils, grep, mount, gzip, tar, mktemp >= 1.5-5, findutils, lvm2
 Requires: filesystem >= 2.1.0, cpio, device-mapper, initscripts >= 8.22-1
 Requires: e2fsprogs
-BuildRequires: popt e2fsprogs-devel parted-devel
+BuildRequires: popt e2fsprogs-devel parted-devel pump-devel
 BuildRequires: device-mapper libselinux-devel libsepol-devel
 %ifnarch s390 s390x
 Requires: dmraid
@@ -63,6 +63,16 @@
 %attr(644,root,root) %{_mandir}/man8/grubby.8*
 
 %changelog
+* Mon Feb 27 2006 Peter Jones <pjones at redhat.com> - 5.0.29-1
+- Fix pump-devel buildrequires
+- Fix grubby's getpathbyspec() usage (#183010)
+- Fix grubby's makefile
+- Make readlink command work with super scary huge sysfs paths (#183091)
+- Make readlink handle directories better (#166666)
+- Don't create ramdisk blockdevs, mkblkdevs does it (#181873)
+- Don't use showlabels to resolve labels, use resolveDevice so we don't
+  need messy awk (#180372)
+
 * Fri Feb 24 2006 Peter Jones <pjones at redhat.com> - 5.0.28-1
 - Make /dev/efirtc on ia64 boxes (#182598)
 - Handle selinux contexts on /etc/blkid.tab* since we can't do it in


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	24 Feb 2006 23:10:52 -0000	1.106
+++ sources	27 Feb 2006 17:07:03 -0000	1.107
@@ -1 +1 @@
-16b842c2ac03adf52c184a138df75446  mkinitrd-5.0.28.tar.bz2
+414b702dba718341cc79d52d6267e742  mkinitrd-5.0.29.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:11:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:11:53 -0500
Subject: rpms/gnome-panel/devel
	gnome-panel-2.13.91-ignore-unknown-options.patch, NONE,
	1.1 gnome-panel.spec, 1.115, 1.116
Message-ID: <200602271711.k1RHBrFS008404@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8214

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.13.91-ignore-unknown-options.patch 
Log Message:
- ignore unknown options (bug 182734)


gnome-panel-2.13.91-ignore-unknown-options.patch:
 main.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gnome-panel-2.13.91-ignore-unknown-options.patch ---
--- gnome-panel-2.13.91/gnome-panel/main.c.ignore-unknown-options	2006-02-27 11:41:51.000000000 -0500
+++ gnome-panel-2.13.91/gnome-panel/main.c	2006-02-27 11:42:18.000000000 -0500
@@ -49,6 +49,8 @@
 
 	context = g_option_context_new ("");
 
+        g_option_context_set_ignore_unknown_options (context, TRUE);
+
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
 	gnome_program_init ("gnome-panel", VERSION,


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- gnome-panel.spec	19 Feb 2006 23:52:11 -0000	1.115
+++ gnome-panel.spec	27 Feb 2006 17:11:50 -0000	1.116
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.91
-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
@@ -61,6 +61,7 @@
 Patch6: gnome-panel-2.13.5-switch-user.patch
 Patch7: gnome-panel-2.13.91-gpm-integration.patch
 Patch8: gnome-panel-2.13.90-use-beagle.patch
+Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
 
 Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
 
@@ -90,6 +91,7 @@
 %patch6 -p1 -b .switch-user
 %patch7 -p1 -b .gpm-integration
 %patch8 -p1 -b .use-beagle
+%patch9 -p1 -b .ignore-unknown-options
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE2} m4
@@ -206,6 +208,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-4
+- ignore unknown options (bug 182734)
+
 * Sun Feb 19 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-3
 - bring back shutdown menu item
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:14:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:14:30 -0500
Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.85,
	1.85.2.1
Message-ID: <200602271714.k1RHEUdh009680@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9643

Modified Files:
      Tag: private-check-only-active-folders-branch
	evolution-data-server.spec 
Log Message:
private build to check for mail only in active folders


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.85
retrieving revision 1.85.2.1
diff -u -r1.85 -r1.85.2.1
--- evolution-data-server.spec	15 Feb 2006 04:13:53 -0000	1.85
+++ evolution-data-server.spec	27 Feb 2006 17:14:27 -0000	1.85.2.1
@@ -25,7 +25,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.91
-Release: 1
+Release: 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
@@ -49,6 +49,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}
@@ -125,6 +128,10 @@
 %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  Mon Feb 27 17:15:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:15:55 -0500
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.5.91-check-only-active-folders.patch,
	NONE, 1.1.2.1
Message-ID: <200602271715.k1RHFtXi012458@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12185

Added Files:
      Tag: private-check-only-active-folders-branch
	evolution-data-server-1.5.91-check-only-active-folders.patch 
Log Message:
patch to add check_subscribed option

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;	



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:17:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:17:02 -0500
Subject: rpms/evolution-data-server/devel
	evolution-data-server-1.2.0-vcrap.patch, NONE, 1.1.2.1
Message-ID: <200602271717.k1RHH28l021974@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19860

Added Files:
      Tag: private-check-only-active-folders-branch
	evolution-data-server-1.2.0-vcrap.patch 
Log Message:
Fix namespace pollution

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);



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:17:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:17:32 -0500
Subject: rpms/evolution/devel
	evolution-2.5.91-check-only-active-folders.patch, NONE,
	1.1.2.1 evolution.spec, 1.126, 1.126.2.1
Message-ID: <200602271717.k1RHHWEF023583@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23551

Modified Files:
      Tag: private-check-only-active-folders-branch
	evolution.spec 
Added Files:
      Tag: private-check-only-active-folders-branch
	evolution-2.5.91-check-only-active-folders.patch 
Log Message:
private build to check for mail only in active folders

evolution-2.5.91-check-only-active-folders.patch:
 mail-send-recv.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- 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,10 +762,13 @@ 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)
-		    || (info->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX)
+		    || ((info->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX)
+		    || (camel_url_get_param(
 			g_ptr_array_add(folders, g_strdup(info->uri));
 		get_folders(store, folders, info->child);
 		info = info->next;


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.126
retrieving revision 1.126.2.1
diff -u -r1.126 -r1.126.2.1
--- evolution.spec	23 Feb 2006 17:50:05 -0000	1.126
+++ evolution.spec	27 Feb 2006 17:17:30 -0000	1.126.2.1
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.5.91
-Release: 1
+Release: 1.dwmw2.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -101,6 +101,8 @@
 Patch806: evolution-2.5.5.1-notification-cleanups.patch
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 
+Patch1000: evolution-2.5.91-check-only-active-folders.patch
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -245,6 +247,8 @@
 %patch806 -p1 -b .notification-cleanups
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 
+%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  Mon Feb 27 17:34:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:34:38 -0500
Subject: rpms/evolution/devel
	evolution-2.5.91-check-only-active-folders.patch, 1.1.2.1, 1.1.2.2
Message-ID: <200602271734.k1RHYcHl029110@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29083

Modified Files:
      Tag: private-check-only-active-folders-branch
	evolution-2.5.91-check-only-active-folders.patch 
Log Message:
fix patch

evolution-2.5.91-check-only-active-folders.patch:
 mail-send-recv.c |    2 ++
 1 files changed, 2 insertions(+)

Index: evolution-2.5.91-check-only-active-folders.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/Attic/evolution-2.5.91-check-only-active-folders.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- evolution-2.5.91-check-only-active-folders.patch	27 Feb 2006 17:17:30 -0000	1.1.2.1
+++ evolution-2.5.91-check-only-active-folders.patch	27 Feb 2006 17:34:18 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 --- 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,10 +762,13 @@ get_folders(CamelStore *store, GPtrArray
+@@ -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
@@ -9,9 +9,3 @@
  		    || (strcmp(((CamelService *)store)->url->protocol, "imap") != 0
  			&& strcmp(((CamelService *)store)->url->protocol, "groupwise") != 0
  			&& strcmp(((CamelService *)store)->url->protocol, "scalix") != 0)
--		    || (info->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX)
-+		    || ((info->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_INBOX)
-+		    || (camel_url_get_param(
- 			g_ptr_array_add(folders, g_strdup(info->uri));
- 		get_folders(store, folders, info->child);
- 		info = info->next;



From fedora-cvs-commits at redhat.com  Mon Feb 27 17:41:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 12:41:38 -0500
Subject: rpms/mono/devel mono-1.1.13.2-work-with-selinux.patch, NONE,
	1.1 mono.spec, 1.27, 1.28
Message-ID: <200602271741.k1RHfcXq031961@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31887

Modified Files:
	mono.spec 
Added Files:
	mono-1.1.13.2-work-with-selinux.patch 
Log Message:
- Patch from Jakub to make work with SELinux better


mono-1.1.13.2-work-with-selinux.patch:
 mono-compiler.h |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

--- NEW FILE mono-1.1.13.2-work-with-selinux.patch ---
--- mono-1.1.13.2/mono/utils/mono-compiler.h.work-with-selinux	2006-02-27 12:38:30.000000000 -0500
+++ mono-1.1.13.2/mono/utils/mono-compiler.h	2006-02-27 12:38:46.000000000 -0500
@@ -9,10 +9,10 @@
 #ifdef HAVE_KW_THREAD
 #if HAVE_TLS_MODEL_ATTR
 
-#if defined(PIC) && defined(__x86_64__)
-#define MONO_TLS_FAST 
-#elif defined (__powerpc__)
+#if defined (__powerpc__)
 #define MONO_TLS_FAST
+#elif defined(PIC)
+#define MONO_TLS_FAST __attribute__((tls_model("initial-exec")))
 #else
 #define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
 #endif
@@ -22,15 +22,20 @@
 #endif
 
 #if defined(__GNUC__) && defined(__i386__)
-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("jmp 1f; .section writetext, \"awx\"; 1: movl $" #var "@ntpoff, %0; jmp 2f; .previous; 2:" : "=r" (offset));
+#if defined(PIC)
+#define MONO_THREAD_VAR_OFFSET(var,offset) do { int tmp; __asm ("call 1f; 1: popl %0; addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %0; movl " #var "@gotntpoff(%0), %1" : "=r" (tmp), "=r" (offset)); } while (0)
+#else
+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("movl $" #var "@ntpoff, %0" : "=r" (offset))
+#endif
 #elif defined(__x86_64__)
 #if defined(PIC)
-#define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq $" #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset
+= foo; } while (0)
 #else
-#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("jmp 1f; .section writetext, \"awx\"; 1: movq $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=a" (foo)); offset = foo; } while (0);
+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq $" #var "@TPOFF, %0" : "=r" (foo)); offset = foo; } while (0)
 #endif
 #elif defined(__ia64__) && !defined(__INTEL_COMPILER)
-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset));
+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset))
 #else
 #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
 #endif


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mono.spec	12 Feb 2006 15:55:29 -0000	1.27
+++ mono.spec	27 Feb 2006 17:41:24 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.1.13.2
-Release:        2
+Release:        3
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 # JIT only availible on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 s390 s390x armv4l sparc
 
+Patch0: mono-1.1.13.2-work-with-selinux.patch
+
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
 virtual machine (as well as a byte code interpreter, the
@@ -217,6 +219,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .work-with-selinux
 
 %build
 %ifarch ia64 s390
@@ -490,6 +493,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 1.1.13.2-3
+- Patch from Jakub to make work with SELinux better
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 1.1.13.2-2
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:05:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:05:25 -0500
Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec,
	1.22, 1.23
Message-ID: <200602271805.k1RI5Peh020283@cvs.devel.redhat.com>

Author: bmarzins

Update of /cvs/dist/rpms/device-mapper-multipath/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20236

Modified Files:
	device-mapper-multipath.spec 
Log Message:
Prereq: chkconfig



Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- device-mapper-multipath.spec	20 Feb 2006 12:05:35 -0000	1.22
+++ device-mapper-multipath.spec	27 Feb 2006 18:05:22 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper.
 Name: device-mapper-multipath
 Version: 0.4.5
-Release: 12.1
+Release: 12.2
 License: GPL
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -9,6 +9,7 @@
 Patch0: fedora.patch
 Obsoletes: kpartx = 0.4.4-2.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Prereq: chkconfig
 BuildRequires: sysfsutils-devel, device-mapper >= 1.02.02-2
 BuildRequires: libselinux-devel
 
@@ -63,6 +64,9 @@
 /var/cache/multipath
 
 %changelog
+* Mon Feb 27 2006 Benjamin Marzinski <bmarzins at redhat.com> 0.4.5-12.2
+- Prereq: chkconfig
+
 * Mon Feb 20 2006 Karsten Hopp <karsten at redhat.de> 0.4.5-12.1
 - BuildRequires: libselinux-devel
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:11:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:11:26 -0500
Subject: rpms/eel2/devel .cvsignore, 1.30, 1.31 eel2.spec, 1.38, 1.39 sources,
	1.30, 1.31
Message-ID: <200602271811.k1RIBQwZ022644@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22567

Modified Files:
	.cvsignore eel2.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Feb 2006 12:40:40 -0000	1.30
+++ .cvsignore	27 Feb 2006 18:11:23 -0000	1.31
@@ -14,3 +14,4 @@
 eel-2.13.4.tar.bz2
 eel-2.13.90.tar.bz2
 eel-2.13.91.tar.bz2
+eel-2.13.92.tar.bz2


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- eel2.spec	13 Feb 2006 12:40:40 -0000	1.38
+++ eel2.spec	27 Feb 2006 18:11:23 -0000	1.39
@@ -15,7 +15,7 @@
 
 Name:		eel2
 Summary:        Eazel Extensions Library.
-Version: 	2.13.91
+Version: 	2.13.92
 Release: 1
 License: 	LGPL
 Group: System Environment/Libraries
@@ -105,6 +105,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	13 Feb 2006 12:40:40 -0000	1.30
+++ sources	27 Feb 2006 18:11:23 -0000	1.31
@@ -1 +1 @@
-57336cef15e19000c7021075cfda9098  eel-2.13.91.tar.bz2
+acc9c928504923a2163bdeb68ea2b181  eel-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:14:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:14:36 -0500
Subject: rpms/qt/devel fix-im-crash-on-exit.diff, NONE,
	1.1 fix-key-release-event-with-imm.diff, NONE,
	1.1 qt-x11-immodule-fix-inputcontext-crash.diff, NONE,
	1.1 qt.spec, 1.100, 1.101 qt-x11-free-3.3.4-imm-key.patch, 1.1, NONE
Message-ID: <200602271814.k1RIEaqg024197@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24065

Modified Files:
	qt.spec 
Added Files:
	fix-im-crash-on-exit.diff fix-key-release-event-with-imm.diff 
	qt-x11-immodule-fix-inputcontext-crash.diff 
Removed Files:
	qt-x11-free-3.3.4-imm-key.patch 
Log Message:
- add set of fixes for the immodule patch, thanks to Dirk M??ller


fix-im-crash-on-exit.diff:
 qwidget_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-im-crash-on-exit.diff ---
--- src/kernel/qwidget_x11.cpp
+++ src/kernel/qwidget_x11.cpp
@@ -2751,7 +2751,7 @@
 */
 void QWidget::createInputContext()
 {
-    if( !isInputMethodEnabled() )
+    if( !isInputMethodEnabled() || QApplication::closingDown() )
       return;
 
     QWidget *icWidget = icHolderWidget();

fix-key-release-event-with-imm.diff:
 qapplication_x11.cpp |    9 +++------
 qwidget_x11.cpp      |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE fix-key-release-event-with-imm.diff ---
--- src/kernel/qapplication_x11.cpp
+++ src/kernel/qapplication_x11.cpp	2005/01/27 09:41:16
@@ -3289,11 +3289,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;
--- src/kernel/qwidget_x11.cpp
+++ src/kernel/qwidget_x11.cpp	2005/01/27 09:43:28
@@ -2692,11 +2692,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;
@@ -2747,10 +2746,8 @@
 */
 void QWidget::createInputContext()
 {
-#if !defined(QT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() )
       return;
-#endif
 
     QWidget *icWidget = icHolderWidget();
 #ifndef QT_NO_IM
--- src/kernel/qapplication_x11.cpp.sav	2005-06-15 15:43:02.000000000 +0200
+++ src/kernel/qapplication_x11.cpp	2005-06-15 16:26:36.000000000 +0200
@@ -5209,11 +5209,12 @@ bool QETWidget::translateKeyEventInterna
     } 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-immodule-fix-inputcontext-crash.diff:
 qinputcontextfactory.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE qt-x11-immodule-fix-inputcontext-crash.diff ---
--- src/inputmethod/qinputcontextfactory.cpp
+++ src/inputmethod/qinputcontextfactory.cpp
@@ -102,7 +102,8 @@
     if ( iface ) {
 	ret = iface->create( inputcontext );
 #ifdef Q_WS_X11
-	ret->setHolderWidget( widget );
+        if ( ret ) 
+	    ret->setHolderWidget( widget );
 #endif
     }
 #endif


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- qt.spec	11 Feb 2006 05:26:03 -0000	1.100
+++ qt.spec	27 Feb 2006 18:14:34 -0000	1.101
@@ -85,7 +85,7 @@
 Summary: The shared library for the Qt GUI toolkit.
 Name: qt
 Version: %{ver}
-Release: 12.2
+Release: 13
 Epoch: 1
 License: GPL/QPL
 Group: System Environment/Libraries
@@ -111,8 +111,10 @@
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
+Patch51: fix-im-crash-on-exit.diff
+Patch52: fix-key-release-event-with-imm.diff
+Patch53: qt-x11-immodule-fix-inputcontext-crash.diff
 Patch54: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-Patch57: qt-x11-free-3.3.4-imm-key.patch
 
 # qt-copy patches
 Patch100: 0038-dragobject-dont-prefer-unknown.patch
@@ -350,8 +352,10 @@
 
 %if %{immodule}
 %patch50 -p1
+%patch51 -p0 -b .im-crash-on-exit
+%patch52 -p0 -b .key-release-event
+%patch53 -p0 -b .inputcontext-crash
 %patch54 -p1 -b .quiet
-%patch57 -p1 -b .key
 %endif
 
 %patch100 -p0 -b .0038-dragobject-dont-prefer-unknown
@@ -740,6 +744,9 @@
 
 
 %changelog
+* 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
+
 * 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)
 


--- qt-x11-free-3.3.4-imm-key.patch DELETED ---



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:26:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:26:49 -0500
Subject: rpms/nautilus/devel .cvsignore, 1.35, 1.36 nautilus.spec, 1.93,
	1.94 sources, 1.38, 1.39
Message-ID: <200602271826.k1RIQnW0009924@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9863

Modified Files:
	.cvsignore nautilus.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Feb 2006 12:43:17 -0000	1.35
+++ .cvsignore	27 Feb 2006 18:26:46 -0000	1.36
@@ -14,3 +14,4 @@
 nautilus-2.13.4.tar.bz2
 nautilus-2.13.90.tar.bz2
 nautilus-2.13.91.tar.bz2
+nautilus-2.13.92.tar.bz2


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- nautilus.spec	13 Feb 2006 12:43:17 -0000	1.93
+++ nautilus.spec	27 Feb 2006 18:26:46 -0000	1.94
@@ -11,13 +11,13 @@
 %define gnome_desktop_version 2.9.91
 %define redhat_menus_version 0.25
 %define redhat_artwork_version 0.41
-%define gnome_vfs2_version 2.13.2
+%define gnome_vfs2_version 2.13.92
 %define startup_notification_version 0.5
 %define libexif_version 0.5.12
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
-Version: 	2.13.91
+Version: 	2.13.92
 Release:	1
 License: 	GPL
 Group:          User Interface/Desktops
@@ -175,6 +175,9 @@
 %{_includedir}/nautilus
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	13 Feb 2006 12:43:17 -0000	1.38
+++ sources	27 Feb 2006 18:26:46 -0000	1.39
@@ -1 +1 @@
-65910e2e146117899bb437630750505d  nautilus-2.13.91.tar.bz2
+14c861733dc9667b43893c9afc432c9e  nautilus-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:33:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:33:35 -0500
Subject: rpms/gnome-keyring/devel .cvsignore, 1.14, 1.15 gnome-keyring.spec,
	1.20, 1.21 sources, 1.14, 1.15
Message-ID: <200602271833.k1RIXZ9a004557@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-keyring/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4510

Modified Files:
	.cvsignore gnome-keyring.spec sources 
Log Message:
0.4.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	13 Feb 2006 12:38:47 -0000	1.14
+++ .cvsignore	27 Feb 2006 18:33:31 -0000	1.15
@@ -7,3 +7,4 @@
 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


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome-keyring.spec	13 Feb 2006 12:38:47 -0000	1.20
+++ gnome-keyring.spec	27 Feb 2006 18:33:31 -0000	1.21
@@ -2,7 +2,7 @@
 
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
-Version: 0.4.7
+Version: 0.4.8
 Release: 1
 License: GPL/LGPL
 Group: System Environment/Libraries
@@ -65,6 +65,9 @@
 %{_includedir}/*
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.8-1
+- Update to 0.4.8
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 0.4.7-1
 - Update to 0.4.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Feb 2006 12:38:47 -0000	1.14
+++ sources	27 Feb 2006 18:33:31 -0000	1.15
@@ -1 +1 @@
-6c760ec2783ce02152ac9d8ef4471a41  gnome-keyring-0.4.7.tar.bz2
+501a4f4b58ba0d1c119854861d43ef17  gnome-keyring-0.4.8.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:49:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:49:57 -0500
Subject: rpms/nautilus/devel nautilus-2.13-format.patch, 1.2,
	1.3 nautilus.spec, 1.94, 1.95
Message-ID: <200602271849.k1RInv2x017391@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17368

Modified Files:
	nautilus-2.13-format.patch nautilus.spec 
Log Message:
update patches


nautilus-2.13-format.patch:
 0 files changed

Index: nautilus-2.13-format.patch
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus-2.13-format.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-2.13-format.patch	13 Dec 2005 17:11:12 -0000	1.2
+++ nautilus-2.13-format.patch	27 Feb 2006 18:49:53 -0000	1.3
@@ -1,57 +0,0 @@
-Index: src/file-manager/fm-directory-view.c
-===================================================================
-RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
-retrieving revision 1.727
-diff -u -p -r1.727 fm-directory-view.c
---- src/file-manager/fm-directory-view.c	12 Dec 2005 16:59:11 -0000	1.727
-+++ src/file-manager/fm-directory-view.c	13 Dec 2005 17:10:16 -0000
-@@ -6192,6 +6192,8 @@ action_format_volume_callback (GtkAction
- 	GList *selection, *l;
- 	GnomeVFSDrive *drive;
- 	FMDirectoryView *view;
-+        char *device_path;
-+        char *cmdline;
- 
-         view = FM_DIRECTORY_VIEW (data);
- 	
-@@ -6201,9 +6203,16 @@ action_format_volume_callback (GtkAction
- 
- 		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);
-@@ -6944,15 +6953,17 @@ file_should_show_foreach (NautilusFile *
- 	} 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 &&
--		    g_find_program_in_path ("gfloppy")) {
--			*show_format = TRUE;
- 		}
- 	} else if (nautilus_file_is_nautilus_link (file)) {
- 		uri = nautilus_file_get_activation_uri (file);


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- nautilus.spec	27 Feb 2006 18:26:46 -0000	1.94
+++ nautilus.spec	27 Feb 2006 18:49:53 -0000	1.95
@@ -95,7 +95,7 @@
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .rhconfig
-%patch2 -p0 -b .format
+%patch2 -p1 -b .format
 %patch3 -p1 -b .no-delay
 
 %build



From fedora-cvs-commits at redhat.com  Mon Feb 27 18:52:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 13:52:26 -0500
Subject: rpms/qt/devel fix-im-crash-on-exit.diff, 1.1,
	1.2 fix-key-release-event-with-imm.diff, 1.1, 1.2 qt.spec,
	1.101, 1.102
Message-ID: <200602271852.k1RIqQCf017456@cvs.devel.redhat.com>

Author: than

Update of /cvs/dist/rpms/qt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17441

Modified Files:
	fix-im-crash-on-exit.diff fix-key-release-event-with-imm.diff 
	qt.spec 
Log Message:
cleanup patches


fix-im-crash-on-exit.diff:
 qwidget_x11.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: fix-im-crash-on-exit.diff
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/fix-im-crash-on-exit.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-im-crash-on-exit.diff	27 Feb 2006 18:14:33 -0000	1.1
+++ fix-im-crash-on-exit.diff	27 Feb 2006 18:52:21 -0000	1.2
@@ -1,11 +1,11 @@
---- src/kernel/qwidget_x11.cpp
-+++ src/kernel/qwidget_x11.cpp
-@@ -2751,7 +2751,7 @@
+--- src/kernel/qwidget_x11.cpp.im-crash-on-exit	2006-02-27 19:48:48.000000000 +0100
++++ src/kernel/qwidget_x11.cpp	2006-02-27 19:49:20.000000000 +0100
+@@ -2752,7 +2752,7 @@
  */
  void QWidget::createInputContext()
  {
 -    if( !isInputMethodEnabled() )
 +    if( !isInputMethodEnabled() || QApplication::closingDown() )
-       return;
+ 	return;
  
      QWidget *icWidget = icHolderWidget();

fix-key-release-event-with-imm.diff:
 qapplication_x11.cpp |    9 +++------
 qwidget_x11.cpp      |    5 +----
 2 files changed, 4 insertions(+), 10 deletions(-)

Index: fix-key-release-event-with-imm.diff
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/fix-key-release-event-with-imm.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fix-key-release-event-with-imm.diff	27 Feb 2006 18:14:33 -0000	1.1
+++ fix-key-release-event-with-imm.diff	27 Feb 2006 18:52:21 -0000	1.2
@@ -1,46 +1,44 @@
---- src/kernel/qapplication_x11.cpp
-+++ src/kernel/qapplication_x11.cpp	2005/01/27 09:41:16
-@@ -3289,11 +3289,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;
---- src/kernel/qwidget_x11.cpp
-+++ src/kernel/qwidget_x11.cpp	2005/01/27 09:43:28
-@@ -2692,11 +2692,10 @@
+--- src/kernel/qwidget_x11.cpp.key-release-event	2006-02-27 19:46:07.000000000 +0100
++++ src/kernel/qwidget_x11.cpp	2006-02-27 19:46:07.000000000 +0100
+@@ -2698,11 +2698,10 @@
  {
      QInputContext *qic = 0;
  
 -#if !defined(QT_NO_IM_EXTENSIONS)
      if ( isInputMethodEnabled() ) {
 +#if !defined(QT_NO_IM_EXTENSIONS)
-       qic = icHolderWidget()->ic;
+ 	qic = icHolderWidget()->ic;
  #else
 -    {
-       // icHolderWidget is always topLevelWidget
-       QTLWExtra *topdata = icHolderWidget()->topData();
-       qic = (QInputContext *)topdata->xic;
-@@ -2747,10 +2746,8 @@
+ 	// icHolderWidget is always topLevelWidget
+ 	QTLWExtra *topdata = icHolderWidget()->topData();
+ 	qic = (QInputContext *)topdata->xic;
+@@ -2753,10 +2752,8 @@
  */
  void QWidget::createInputContext()
  {
 -#if !defined(QT_NO_IM_EXTENSIONS)
      if( !isInputMethodEnabled() )
-       return;
+ 	return;
 -#endif
  
      QWidget *icWidget = icHolderWidget();
  #ifndef QT_NO_IM
---- src/kernel/qapplication_x11.cpp.sav	2005-06-15 15:43:02.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp	2005-06-15 16:26:36.000000000 +0200
-@@ -5209,11 +5209,12 @@ bool QETWidget::translateKeyEventInterna
+--- src/kernel/qapplication_x11.cpp.key-release-event	2006-02-27 19:46:07.000000000 +0100
++++ src/kernel/qapplication_x11.cpp	2006-02-27 19:47:13.000000000 +0100
+@@ -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 )


Index: qt.spec
===================================================================
RCS file: /cvs/dist/rpms/qt/devel/qt.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- qt.spec	27 Feb 2006 18:14:34 -0000	1.101
+++ qt.spec	27 Feb 2006 18:52:21 -0000	1.102
@@ -111,8 +111,8 @@
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
-Patch51: fix-im-crash-on-exit.diff
-Patch52: fix-key-release-event-with-imm.diff
+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
 
@@ -352,8 +352,8 @@
 
 %if %{immodule}
 %patch50 -p1
-%patch51 -p0 -b .im-crash-on-exit
-%patch52 -p0 -b .key-release-event
+%patch51 -p0 -b .key-release-event
+%patch52 -p0 -b .im-crash-on-exit
 %patch53 -p0 -b .inputcontext-crash
 %patch54 -p1 -b .quiet
 %endif



From fedora-cvs-commits at redhat.com  Mon Feb 27 19:23:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 14:23:50 -0500
Subject: rpms/cryptsetup-luks/devel .cvsignore, 1.6, 1.7 cryptsetup-luks.spec,
	1.22, 1.23 sources, 1.6, 1.7
Message-ID: <200602271923.k1RJNoBF016020@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/cryptsetup-luks/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15977

Modified Files:
	.cvsignore cryptsetup-luks.spec sources 
Log Message:
update



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 16:44:41 -0000	1.6
+++ .cvsignore	27 Feb 2006 19:23:48 -0000	1.7
@@ -1 +1 @@
-cryptsetup-luks-1.0.3-rc1.tar.bz2
+cryptsetup-luks-1.0.3-rc2.tar.bz2


Index: cryptsetup-luks.spec
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/cryptsetup-luks.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cryptsetup-luks.spec	22 Feb 2006 17:01:17 -0000	1.22
+++ cryptsetup-luks.spec	27 Feb 2006 19:23:48 -0000	1.23
@@ -1,11 +1,11 @@
 Summary: A utility for setting up encrypted filesystems
 Name: cryptsetup-luks
 Version: 1.0.3
-Release: 0.rc1
+Release: 0.rc2
 License: GPL
 Group: Applications/System
 URL: http://clemens.endorphin.org/LUKS
-Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}-rc1.tar.bz2
+Source: http://clemens.endorphin.org/cryptsetup-luks-%{version}-rc2.tar.bz2
 Patch: cryptsetup-luks-1.0.1-proto.patch
 Patch2: cryptsetup-luks-1.0.1-sepol.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -31,7 +31,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 %patch -p1
 %patch2 -p1
 
@@ -65,6 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Feb 27 2006 Bill Nottingham <notting at redhat.com> 1.0.3-0.rc2
+- update to 1.0.3rc2, fixes bug with HAL & encrypted devices (#182658)
+
 * Wed Feb 22 2006 Bill Nottingham <notting at redhat.com> 1.0.3-0.rc1
 - update to 1.0.3rc1, reverts changes to default encryption type
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cryptsetup-luks/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 16:44:41 -0000	1.6
+++ sources	27 Feb 2006 19:23:48 -0000	1.7
@@ -1 +1 @@
-601572b6e57bb5a56413a9b69c3286a0  cryptsetup-luks-1.0.3-rc1.tar.bz2
+13aeff28bbf5883e1312733eb65fd53f  cryptsetup-luks-1.0.3-rc2.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 20:45:24 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 15:45:24 -0500
Subject: rpms/evolution-data-server/devel .cvsignore, 1.39,
	1.40 evolution-data-server.spec, 1.85, 1.86 sources, 1.39, 1.40
Message-ID: <200602272045.k1RKjOVf026064@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26037

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Log Message:
- 1.5.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	15 Feb 2006 04:13:53 -0000	1.39
+++ .cvsignore	27 Feb 2006 20:45:21 -0000	1.40
@@ -1 +1 @@
-evolution-data-server-1.5.91.tar.bz2
+evolution-data-server-1.5.92.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- evolution-data-server.spec	15 Feb 2006 04:13:53 -0000	1.85
+++ evolution-data-server.spec	27 Feb 2006 20:45:21 -0000	1.86
@@ -24,7 +24,7 @@
 
 Summary: Backend data server for evolution
 Name: evolution-data-server
-Version: 1.5.91
+Version: 1.5.92
 Release: 1
 License: LGPL
 Group: System Environment/Libraries
@@ -321,6 +321,9 @@
 
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 1.5.92-1
+- 1.5.92
+
 * Tue Feb 14 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.91-1
 - 1.5.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	15 Feb 2006 04:13:53 -0000	1.39
+++ sources	27 Feb 2006 20:45:21 -0000	1.40
@@ -1 +1 @@
-3d0e82dbb888aabae05e160f4c502fb5  evolution-data-server-1.5.91.tar.bz2
+7c3887b0315a75d149bc06cd5f80a4ca  evolution-data-server-1.5.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 20:55:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 15:55:40 -0500
Subject: rpms/gtk2/devel gtk2.spec,1.125,1.126
Message-ID: <200602272055.k1RKtene015353@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15262

Modified Files:
	gtk2.spec 
Log Message:
- s/Prereq/Requires/ for hicolor dep



Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- gtk2.spec	25 Feb 2006 05:42:33 -0000	1.125
+++ gtk2.spec	27 Feb 2006 20:55:38 -0000	1.126
@@ -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
@@ -45,6 +45,9 @@
 
 URL: http://www.gtk.org
 
+# required for icon themes apis to work
+Requires: hicolor-icon-theme
+
 # We need to prereq these so we can run gtk-query-immodules-2.0
 Prereq: glib2 >= %{glib2_version}
 Prereq: atk >= %{atk_version}
@@ -52,9 +55,6 @@
 # and these for gdk-pixbuf-query-loaders
 Prereq: libtiff >= 3.6.1
 
-# required for icon themes apis to work
-Prereq: hicolor-icon-theme
-
 %define _unpackaged_files_terminate_build      1
 %define _missing_doc_files_terminate_build     1
 
@@ -263,6 +263,9 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 2.8.13-2
+- s/Prereq/Requires/ for hicolor dep
+
 * Sat Feb 25 2006 Matthias Clasen <mclasen at redhat.com> - 2.8.13-1
 - Update to 2.8.13
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 20:59:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 15:59:53 -0500
Subject: rpms/psacct/devel psacct.spec,1.22,1.23
Message-ID: <200602272059.k1RKxrRK017054@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/psacct/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16921

Modified Files:
	psacct.spec 
Log Message:
- add touch to prereq



Index: psacct.spec
===================================================================
RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- psacct.spec	27 Feb 2006 09:10:09 -0000	1.22
+++ psacct.spec	27 Feb 2006 20:59:50 -0000	1.23
@@ -12,7 +12,7 @@
 Summary: Utilities for monitoring process activities.
 Name: psacct
 Version: 6.3.2
-Release: 40
+Release: 41
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz
@@ -30,7 +30,7 @@
 Patch7: psacct-6.3.2-LargeFile.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/install-info, /sbin/chkconfig
+Prereq: /sbin/install-info, /sbin/chkconfig, /bin/touch
 BuildRequires: autoconf
 
 # This conflict is to avoid psacct being forced on by old initscripts now that
@@ -164,6 +164,9 @@
 %{_infodir}/accounting.info.gz
 
 %changelog
+* Mon Feb 27 2006 Peter Jones <pjones at redhat.com> - 6.3.2-41
+- add touch to prereq
+
 * Mon Feb 27 2006 Ivana Varekova <varekova at redhat.com> - 6.3.2-40
 - add chkconfig to prereq - bug 182848
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 21:00:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 16:00:12 -0500
Subject: rpms/NetworkManager/devel .cvsignore, 1.30, 1.31 NetworkManager.spec,
	1.91, 1.92 sources, 1.46, 1.47
Message-ID: <200602272100.k1RL0Cga017148@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17064

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-15.cvs20060227
- Update snapshot, which fixes up the libnotify stuff.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	21 Feb 2006 08:10:40 -0000	1.30
+++ .cvsignore	27 Feb 2006 21:00:10 -0000	1.31
@@ -1,11 +1 @@
-NetworkManager-0.4.1.cvs20050912.tar.gz
-NetworkManager-0.4.1.cvs20050922.tar.gz
-NetworkManager-0.4.1.cvs20051009.tar.gz
-NetworkManager-0.4.1.cvs20051010.tar.gz
-NetworkManager-0.5.0.tar.gz
-NetworkManager-0.5.1.tar.gz
-NetworkManager-0.5.1.cvs20060127.tar.gz
-NetworkManager-0.5.1.cvs20060131.tar.gz
-NetworkManager-0.5.1.cvs20060205.tar.gz
-NetworkManager-0.5.1.cvs20060213.tar.gz
-NetworkManager-0.5.1.cvs20060221.tar.gz
+NetworkManager-0.5.1.cvs20060227.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- NetworkManager.spec	24 Feb 2006 17:37:07 -0000	1.91
+++ NetworkManager.spec	27 Feb 2006 21:00:10 -0000	1.92
@@ -9,13 +9,13 @@
 %define bind_version 24:9.3.1-20
 
 %if %{cvs_snapshot}
-%define nm_cvs_version	.cvs20060221
+%define nm_cvs_version	.cvs20060227
 %endif
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 14%{?nm_cvs_version}
+Release: 15%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -184,6 +184,8 @@
 %{_mandir}/man1/NetworkManagerDispatcher.1.gz
 %{_mandir}/man1/nm-tool.1.gz
 %{_localstatedir}/run/%{name}
+%{_prefix}/libexec/nm-crash-logger
+%{_datadir}/NetworkManager/gdb-cmd
 
 %files gnome
 %defattr(-,root,root,0755)
@@ -212,6 +214,9 @@
 
 
 %changelog
+* Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-15.cvs20060227
+- Update snapshot, which fixes up the libnotify stuff.
+
 * Fri Feb 24 2006 Dan Williams <dcbw at redhat.coM> 0.5.1-14.cvs20060221
 - Move libnotify requires to NetworkManager-gnome, not core NM package
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	21 Feb 2006 08:10:41 -0000	1.46
+++ sources	27 Feb 2006 21:00:10 -0000	1.47
@@ -1 +1 @@
-3d86df735e4396bfa59a36bab4a5cc56  NetworkManager-0.5.1.cvs20060221.tar.gz
+1ec085cf5956fd4d8aad70e2d2b86cc2  NetworkManager-0.5.1.cvs20060227.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 27 21:02:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 16:02:00 -0500
Subject: rpms/hicolor-icon-theme/devel hicolor-icon-theme.spec,1.15,1.16
Message-ID: <200602272102.k1RL204M017354@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/hicolor-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17324

Modified Files:
	hicolor-icon-theme.spec 
Log Message:
- Remove Prereq on gtk.  Prereq's complicate things,
  and the gtk-update-icon-cache is already protected by
  [ -x  ... ]



Index: hicolor-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/hicolor-icon-theme/devel/hicolor-icon-theme.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hicolor-icon-theme.spec	12 Jan 2006 15:24:44 -0000	1.15
+++ hicolor-icon-theme.spec	27 Feb 2006 21:01:57 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: Basic requirement for icon themes
 Name: hicolor-icon-theme
 Version: 0.9
-Release: 1
+Release: 2
 License: GPL
 Group: User Interface/Desktops
 URL: http://freedesktop.org/Software/icon-theme
@@ -10,7 +10,6 @@
 BuildArch: noarch
 Prereq(post): coreutils
 Prereq(postun): coreutils
-Prereq: gtk2 >= 2.6.0
 
 %description
 Contains the basic directories and files needed for icon theme support.
@@ -48,6 +47,11 @@
 %{_datadir}/icons/hicolor
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> 0.9-2
+- Remove Prereq on gtk.  Prereq's complicate things,
+  and the gtk-update-icon-cache is already protected by
+  [ -x  ... ]
+
 * Thu Jan 12 2006 Alexander Larsson <alexl at redhat.com> 0.9-1
 - Update to 0.9, fixes scalable icons picked before bitmap icons
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 21:42:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 16:42:36 -0500
Subject: rpms/kernel/devel/configs config-generic,1.153,1.154
Message-ID: <200602272142.k1RLgaQi010279@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv10202/configs

Modified Files:
	config-generic 
Log Message:
git1



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- config-generic	27 Feb 2006 07:44:20 -0000	1.153
+++ config-generic	27 Feb 2006 21:42:33 -0000	1.154
@@ -68,7 +68,7 @@
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_HOTPLUG=y
-CONFIG_DEBUG_KOBJECT=y
+# CONFIG_DEBUG_KOBJECT is not set
 
 #
 # PCMCIA/CardBus support



From fedora-cvs-commits at redhat.com  Mon Feb 27 21:42:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 16:42:35 -0500
Subject: rpms/kernel/devel .cvsignore, 1.364, 1.365 kernel-2.6.spec, 1.1990,
	1.1991 sources, 1.306, 1.307 upstream, 1.281, 1.282
Message-ID: <200602272142.k1RLgZFf010259@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10202

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Log Message:
git1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- .cvsignore	27 Feb 2006 06:52:45 -0000	1.364
+++ .cvsignore	27 Feb 2006 21:42:33 -0000	1.365
@@ -4,3 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc5.bz2
+patch-2.6.16-rc5-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1990
retrieving revision 1.1991
diff -u -r1.1990 -r1.1991
--- kernel-2.6.spec	27 Feb 2006 07:44:19 -0000	1.1990
+++ kernel-2.6.spec	27 Feb 2006 21:42:33 -0000	1.1991
@@ -218,6 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc5.bz2
+Patch2: patch-2.6.16-rc5-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -693,6 +694,7 @@
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -1581,8 +1583,7 @@
 
 %changelog
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
-- 2.6.16rc5
-- Enable kobject debugging for a few builds to track something down.
+- 2.6.16rc5 & rc5-git1
 
 * Sun Feb 26 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc4-git9 & -git10


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- sources	27 Feb 2006 06:52:45 -0000	1.306
+++ sources	27 Feb 2006 21:42:33 -0000	1.307
@@ -1,3 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 1740ae34807f687a93adf2469ea5c4fc  patch-2.6.16-rc5.bz2
+45d08cf9db21b2be6d13b4a27bb65196  patch-2.6.16-rc5-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- upstream	27 Feb 2006 06:52:45 -0000	1.281
+++ upstream	27 Feb 2006 21:42:33 -0000	1.282
@@ -1,2 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc5.bz2
+patch-2.6.16-rc5-git1.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 22:20:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 17:20:32 -0500
Subject: rpms/libnotify/devel .cvsignore, 1.3, 1.4 libnotify.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200602272220.k1RMKW5m014819@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/libnotify/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13721

Modified Files:
	.cvsignore libnotify.spec sources 
Log Message:
- update to 0.3.2-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Nov 2005 18:46:06 -0000	1.3
+++ .cvsignore	27 Feb 2006 22:20:28 -0000	1.4
@@ -1,2 +1 @@
-libnotify-0.0.2.tar.gz
-libnotify-0.3.0.tar.gz
+libnotify-0.3.2.tar.gz


Index: libnotify.spec
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libnotify.spec	11 Feb 2006 04:10:22 -0000	1.7
+++ libnotify.spec	27 Feb 2006 22:20:28 -0000	1.8
@@ -2,8 +2,8 @@
 
 Summary: libnotify notification library 
 Name: libnotify 
-Version: 0.3.0
-Release: 4.2
+Version: 0.3.2
+Release: 1
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: %{name}-%{version}.tar.gz
 License: LGPL
@@ -36,18 +36,18 @@
 %build
 
 %configure
-%{__make}
+make
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT 
 
 %post
 /sbin/ldconfig
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 0.3.2-1
+- update to 0.3.2-1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.3.0-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libnotify/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Dec 2005 00:12:47 -0000	1.4
+++ sources	27 Feb 2006 22:20:28 -0000	1.5
@@ -1 +1 @@
-98f723508b318f0c32578f5bca6c91d7  libnotify-0.3.0.tar.gz
+12bcb4949e4be783a2db388e9155afac  libnotify-0.3.2.tar.gz



From fedora-cvs-commits at redhat.com  Mon Feb 27 22:27:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 17:27:35 -0500
Subject: rpms/gtkhtml3/devel .cvsignore, 1.31, 1.32 gtkhtml3.spec, 1.56,
	1.57 sources, 1.31, 1.32
Message-ID: <200602272227.k1RMRZJ9017327@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17254

Modified Files:
	.cvsignore gtkhtml3.spec sources 
Log Message:
- Update to 3.9.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	13 Feb 2006 19:00:55 -0000	1.31
+++ .cvsignore	27 Feb 2006 22:27:31 -0000	1.32
@@ -1,2 +1 @@
-gtkhtml-3.9.90.tar.bz2
-gtkhtml-3.9.91.tar.bz2
+gtkhtml-3.9.92.tar.bz2


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gtkhtml3.spec	13 Feb 2006 19:00:55 -0000	1.56
+++ gtkhtml3.spec	27 Feb 2006 22:27:31 -0000	1.57
@@ -4,7 +4,7 @@
 
 Summary: gtkhtml library
 Name: gtkhtml3
-Version: 3.9.91
+Version: 3.9.92
 Release: 1
 License: LGPL/GPL
 Group: System Environment/Libraries
@@ -96,6 +96,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 3.9.92-1
+- Update to 3.9.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 3.9.91-1
 - Update to 3.9.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	13 Feb 2006 19:00:55 -0000	1.31
+++ sources	27 Feb 2006 22:27:31 -0000	1.32
@@ -1 +1 @@
-f91f480fa8db18a2b2dae69144285369  gtkhtml-3.9.91.tar.bz2
+ac1ff0fd9a0dd0adf5bde482739dd5b6  gtkhtml-3.9.92.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 22:27:49 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 17:27:49 -0500
Subject: rpms/libtermcap/devel libtermcap.spec,1.19,1.20
Message-ID: <200602272227.k1RMRnC0017442@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/libtermcap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17371

Modified Files:
	libtermcap.spec 
Log Message:
* Mon Feb 27 2006 Miloslav Trmac <mitr at redhat.com> - 2.0.8-45
- Add Requires(postun): /sbin/install-info to libtermcap-devel (#182836)



Index: libtermcap.spec
===================================================================
RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libtermcap.spec	11 Feb 2006 04:14:12 -0000	1.19
+++ libtermcap.spec	27 Feb 2006 22:27:46 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A basic system library for accessing the termcap database.
 Name: libtermcap
 Version: 2.0.8
-Release: 44.2
+Release: 45
 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2
 Url: ftp://metalab.unc.edu/pub/Linux/GCC/
 License: LGPL
@@ -38,6 +38,7 @@
 Summary: Development tools for programs which will access the termcap database.
 Group: Development/Libraries
 Requires: libtermcap = %{version}
+Requires(postun): /sbin/install-info
 
 %description devel
 This package includes the libraries and header files necessary for
@@ -125,6 +126,9 @@
 %{_infodir}/termcap.info*
 
 %changelog
+* Mon Feb 27 2006 Miloslav Trmac <mitr at redhat.com> - 2.0.8-45
+- Add Requires(postun): /sbin/install-info to libtermcap-devel (#182836)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.8-44.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Mon Feb 27 22:41:21 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 17:41:21 -0500
Subject: rpms/gcc/devel gcc41-floatunXiYf.patch, NONE,
	1.1 gcc41-pr26208.patch, NONE, 1.1 gcc41.spec, 1.40, 1.41
Message-ID: <200602272241.k1RMfLZ4020765@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20633

Modified Files:
	gcc41.spec 
Added Files:
	gcc41-floatunXiYf.patch gcc41-pr26208.patch 
Log Message:
4.1.0-0.31


gcc41-floatunXiYf.patch:
 0 files changed

--- NEW FILE gcc41-floatunXiYf.patch ---
2005-11-22  Joseph S. Myers  <joseph at codesourcery.com>

	* libgcc-std.ver (GCC_4.2.0): New version.
	* libgcc2.c (__floatundixf, __floatunditf, __floatundidf,
	__floatundisf): New functions.
	* libgcc2.h (__floatundixf, __floatunditf, __floatundidf,
	__floatundisf): Declare.
	* mklibgcc.in (lib2funcs): Add _floatundidf, _floatundisf,
	_floatundixf, and _floatunditf.

--- gcc/libgcc2.c	(revision 107344)
+++ gcc/libgcc2.c	(revision 107345)
@@ -1323,6 +1323,17 @@ __floatdixf (DWtype u)
 }
 #endif
 
+#if defined(L_floatundixf) && LIBGCC2_HAS_XF_MODE
+XFtype
+__floatundixf (UDWtype u)
+{
+  XFtype d = (UWtype) (u >> W_TYPE_SIZE);
+  d *= Wtype_MAXp1_F;
+  d += (UWtype)u;
+  return d;
+}
+#endif
+
 #if defined(L_floatditf) && LIBGCC2_HAS_TF_MODE
 TFtype
 __floatditf (DWtype u)
@@ -1334,6 +1345,17 @@ __floatditf (DWtype u)
 }
 #endif
 
+#if defined(L_floatunditf) && LIBGCC2_HAS_TF_MODE
+TFtype
+__floatunditf (UDWtype u)
+{
+  TFtype d = (UWtype) (u >> W_TYPE_SIZE);
+  d *= Wtype_MAXp1_F;
+  d += (UWtype)u;
+  return d;
+}
+#endif
+
 #if defined(L_floatdidf) && LIBGCC2_HAS_DF_MODE
 DFtype
 __floatdidf (DWtype u)
@@ -1345,6 +1367,17 @@ __floatdidf (DWtype u)
 }
 #endif
 
+#if defined(L_floatundidf) && LIBGCC2_HAS_DF_MODE
+DFtype
+__floatundidf (UDWtype u)
+{
+  DFtype d = (UWtype) (u >> W_TYPE_SIZE);
+  d *= Wtype_MAXp1_F;
+  d += (UWtype)u;
+  return d;
+}
+#endif
+
 #if defined(L_floatdisf) && LIBGCC2_HAS_SF_MODE
 #define DI_SIZE (W_TYPE_SIZE * 2)
 #define SF_SIZE FLT_MANT_DIG
@@ -1433,6 +1466,87 @@ __floatdisf (DWtype u)
 }
 #endif
 
+#if defined(L_floatundisf) && LIBGCC2_HAS_SF_MODE
+#define DI_SIZE (W_TYPE_SIZE * 2)
+#define SF_SIZE FLT_MANT_DIG
+
+SFtype
+__floatundisf (UDWtype u)
+{
+#if SF_SIZE >= W_TYPE_SIZE
+  /* When the word size is small, we never get any rounding error.  */
+  SFtype f = (UWtype) (u >> W_TYPE_SIZE);
+  f *= Wtype_MAXp1_F;
+  f += (UWtype)u;
+  return f;
+#elif LIBGCC2_HAS_DF_MODE
+
+#if LIBGCC2_DOUBLE_TYPE_SIZE == 64
+#define DF_SIZE DBL_MANT_DIG
+#elif LIBGCC2_LONG_DOUBLE_TYPE_SIZE == 64
+#define DF_SIZE LDBL_MANT_DIG
+#else
+# error
+#endif
+
+#define REP_BIT ((UDWtype) 1 << (DI_SIZE - DF_SIZE))
+
+  /* Protect against double-rounding error.
+     Represent any low-order bits, that might be truncated by a bit that
+     won't be lost.  The bit can go in anywhere below the rounding position
+     of the SFmode.  A fixed mask and bit position handles all usual
+     configurations.  It doesn't handle the case of 128-bit DImode, however.  */
+  if (DF_SIZE < DI_SIZE
+      && DF_SIZE > (DI_SIZE - DF_SIZE + SF_SIZE))
+    {
+      if (u >= ((UDWtype) 1 << DF_SIZE))
+	{
+	  if ((UDWtype) u & (REP_BIT - 1))
+	    {
+	      u &= ~ (REP_BIT - 1);
+	      u |= REP_BIT;
+	    }
+	}
+    }
+
+  /* Do the calculation in DFmode so that we don't lose any of the
+     precision of the high word while multiplying it.  */
+  DFtype f = (UWtype) (u >> W_TYPE_SIZE);
+  f *= Wtype_MAXp1_F;
+  f += (UWtype)u;
+  return (SFtype) f;
+#else
+  /* Finally, the word size is larger than the number of bits in SFmode,
+     and we've got no DFmode.  The only way to avoid double rounding is
+     to special case the extraction.  */
+
+  /* If there are no high bits set, fall back to one conversion.  */
+  if ((UWtype)u == u)
+    return (SFtype)(UWtype)u;
+
+  /* Otherwise, find the power of two.  */
+  UWtype hi = u >> W_TYPE_SIZE;
+
+  UWtype count, shift;
+  count_leading_zeros (count, hi);
+
+  shift = W_TYPE_SIZE - count;
+
+  /* Shift down the most significant bits.  */
+  hi = u >> shift;
+
+  /* If we lost any nonzero bits, set the lsb to ensure correct rounding.  */
+  if (u & ((1 << shift) - 1))
+    hi |= 1;
+
+  /* Convert the one word of data, and rescale.  */
+  SFtype f = hi;
+  f *= (UWtype)1 << shift;
+  return f;
+#endif
+}
+#endif
+
 #if defined(L_fixunsxfsi) && LIBGCC2_HAS_XF_MODE
 /* Reenable the normal types, in case limits.h needs them.  */
 #undef char
--- gcc/libgcc2.h	(revision 107344)
+++ gcc/libgcc2.h	(revision 107345)
@@ -238,6 +238,10 @@ typedef int word_type __attribute__ ((mo
 #define __floatditf	__NDW(float,tf)
 #define __floatdidf	__NDW(float,df)
 #define __floatdisf	__NDW(float,sf)
+#define __floatundixf	__NDW(floatun,xf)
+#define __floatunditf	__NDW(floatun,tf)
+#define __floatundidf	__NDW(floatun,df)
+#define __floatundisf	__NDW(floatun,sf)
 #define __fixunsxfSI	__NW(fixunsxf,)
 #define __fixunstfSI	__NW(fixunstf,)
 #define __fixunsdfSI	__NW(fixunsdf,)
@@ -318,6 +322,7 @@ extern SItype __negvsi2 (SItype);
 #if LIBGCC2_HAS_SF_MODE
 extern DWtype __fixsfdi (SFtype);
 extern SFtype __floatdisf (DWtype);
+extern SFtype __floatundisf (UDWtype);
 extern UWtype __fixunssfSI (SFtype);
 extern DWtype __fixunssfDI (SFtype);
 extern SFtype __powisf2 (SFtype, int);
@@ -327,6 +332,7 @@ extern SCtype __mulsc3 (SFtype, SFtype, 
 #if LIBGCC2_HAS_DF_MODE
 extern DWtype __fixdfdi (DFtype);
 extern DFtype __floatdidf (DWtype);
+extern DFtype __floatundidf (UDWtype);
 extern UWtype __fixunsdfSI (DFtype);
 extern DWtype __fixunsdfDI (DFtype);
 extern DFtype __powidf2 (DFtype, int);
@@ -338,6 +344,7 @@ extern DCtype __muldc3 (DFtype, DFtype, 
 extern DWtype __fixxfdi (XFtype);
 extern DWtype __fixunsxfDI (XFtype);
 extern XFtype __floatdixf (DWtype);
+extern XFtype __floatundixf (UDWtype);
 extern UWtype __fixunsxfSI (XFtype);
 extern XFtype __powixf2 (XFtype, int);
 extern XCtype __divxc3 (XFtype, XFtype, XFtype, XFtype);
@@ -348,6 +355,7 @@ extern XCtype __mulxc3 (XFtype, XFtype, 
 extern DWtype __fixunstfDI (TFtype);
 extern DWtype __fixtfdi (TFtype);
 extern TFtype __floatditf (DWtype);
+extern TFtype __floatunditf (UDWtype);
 extern TFtype __powitf2 (TFtype, int);
 extern TCtype __divtc3 (TFtype, TFtype, TFtype, TFtype);
 extern TCtype __multc3 (TFtype, TFtype, TFtype, TFtype);
--- gcc/mklibgcc.in	(revision 107344)
+++ gcc/mklibgcc.in	(revision 107345)
@@ -63,7 +63,7 @@ lib2funcs='_muldi3 _negdi2 _lshrdi3 _ash
 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab
 	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2
 	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3
-	_divxc3 _divtc3'
+	_divxc3 _divtc3 _floatundidf _floatundisf _floatundixf _floatunditf'
 
 # Disable SHLIB_LINK if shared libgcc not enabled.
 if [ "@enable_shared@" = "no" ]; then
--- gcc/libgcc-std.ver	(revision 107344)
+++ gcc/libgcc-std.ver	(revision 107345)
@@ -256,3 +256,20 @@ GCC_4.0.0 {
 %inherit GCC_4.1.0 GCC_4.0.0
 GCC_4.1.0 {
 }
+
+%inherit GCC_4.2.0 GCC_4.1.0
+GCC_4.2.0 {
+  # unsigned-to-floating conversions
+  __floatunsisf
+  __floatunsidf
+  __floatunsixf
+  __floatunsitf
+  __floatundidf
+  __floatundisf
+  __floatundixf
+  __floatunditf
+  __floatuntidf
+  __floatuntisf
+  __floatuntixf
+  __floatuntitf
+}

gcc41-pr26208.patch:
 gcc/config/arm/unwind-arm.h              |    5 +-
 gcc/config/i386/linux-unwind.h           |    4 +
 gcc/config/ia64/unwind-ia64.c            |    7 +++
 gcc/config/rs6000/linux-unwind.h         |   66 +++++++++++++++++++++----------
 gcc/config/s390/linux-unwind.h           |   28 ++-----------
 gcc/libgcc-std.ver                       |    1 
 gcc/unwind-c.c                           |    5 +-
 gcc/unwind-compat.c                      |    9 +++-
 gcc/unwind-dw2.c                         |   31 ++++++++++++--
 gcc/unwind-dw2.h                         |    1 
 gcc/unwind-generic.h                     |    3 -
 gcc/unwind-sjlj.c                        |    7 +++
 libjava/exception.cc                     |   11 +++--
 libjava/include/i386-signal.h            |   24 -----------
 libjava/include/powerpc-signal.h         |   18 ++------
 libjava/include/x86_64-signal.h          |   14 ------
 libstdc++-v3/libsupc++/eh_personality.cc |    5 +-
 17 files changed, 136 insertions(+), 103 deletions(-)

--- NEW FILE gcc41-pr26208.patch ---
2006-02-27  Jakub Jelinek  <jakub at redhat.com>

	PR other/26208
	* unwind-dw2.c (struct _Unwind_Context): Add signal_frame field.
	(extract_cie_info): Handle S flag in augmentation string.
	(execute_cfa_program): If context->signal_frame, execute also
	fs->pc == context->ra instructions.
	(uw_frame_state_for): If context->signal_frame, don't subtract one
	from context->ra to find FDE.
	(uw_update_context_1): Set context->signal_frame to
	fs->signal_frame.
	(_Unwind_GetIPInfo): New function.
	* unwind-dw2.h (_Unwind_FrameState): Add signal_frame field.
	* unwind-c.c (PERSONALITY_FUNCTION): Use _Unwind_GetIPInfo instead
	of _Unwind_GetIP.
	* unwind-sjlj.c (_Unwind_GetIPInfo): New function.
	* unwind-generic.h (_Unwind_GetIPInfo): New prototype.
	* unwind-compat.c (_Unwind_GetIPInfo): New function.
	* libgcc-std.ver (_Unwind_GetIPInfo): Export @@GCC_4.2.0.
	* config/ia64/unwind-ia64.c (_Unwind_GetIPInfo): New function.
	* config/arm/unwind-arm.h (_Unwind_GetIPInfo): Define.
	* config/i386/linux-unwind.h (x86_fallback_frame_state,
	x86_64_fallback_frame_state): Set fs->signal_frame.
	* config/rs6000/linux-unwind.h (ppc_fallback_frame_state): Likewise.
	(MD_FROB_UPDATE_CONTEXT): Define unconditionally.
	(frob_update_context): Likewise.  Workaround missing S flag in
	Linux 2.6.12 - 2.6.16 kernel vDSOs.
	* config/s390/linux-unwind.h (s390_fallback_frame_state): Likewise.
	Remove the psw_addr + 1 hack.
libjava/
	* exception.cc (PERSONALITY_FUNCTION): Use _Unwind_GetIPInfo instead
	of _Unwind_GetIP.
	* include/i386-signal.h (MAKE_THROW_FRAME): Change into empty macro.
	(HANDLE_DIVIDE_OVERFLOW): Don't adjust _res->eip if falling through
	to throw.
	* include/x86_64-signal.h (MAKE_THROW_FRAME): Change into empty
	macro.
	* include/powerpc-signal.h (MAKE_THROW_FRAME): Change into empty
	macro.
libstdc++-v3/
	* libsupc++/eh_personality.cc (PERSONALITY_FUNCTION): Use
	_Unwind_GetIPInfo instead of _Unwind_GetIP.

--- libjava/exception.cc.jj	2006-02-27 23:04:43.000000000 +0100
+++ libjava/exception.cc	2006-02-27 23:08:09.000000000 +0100
@@ -1,6 +1,6 @@
 // Functions for Exception Support for Java.
 
-/* Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -197,6 +197,7 @@ PERSONALITY_FUNCTION (int version,
   int handler_switch_value;
   bool saw_cleanup;
   bool saw_handler;
+  int ip_before_insn = 0;
 
 
   // Interface version check.
@@ -212,10 +213,10 @@ PERSONALITY_FUNCTION (int version,
       goto install_context;
     }
 
-  // FIXME: In Phase 1, record _Unwind_GetIP in xh->obj as a part of
+  // FIXME: In Phase 1, record _Unwind_GetIPInfo in xh->obj as a part of
   // the stack trace for this exception.  This will only collect Java
   // frames, but perhaps that is acceptable.
-  // FIXME2: _Unwind_GetIP is nonsensical for SJLJ, being a call-site
+  // FIXME2: _Unwind_GetIPInfo is nonsensical for SJLJ, being a call-site
   // index instead of a PC value.  We could perhaps arrange for
   // _Unwind_GetRegionStart to return context->fc->jbuf[1], which
   // is the address of the handler label for __builtin_longjmp, but
@@ -230,7 +231,9 @@ PERSONALITY_FUNCTION (int version,
 
   // Parse the LSDA header.
   p = parse_lsda_header (context, language_specific_data, &info);
-  ip = _Unwind_GetIP (context) - 1;
+  ip = _Unwind_GetIPInfo (context, &ip_before_insn);
+  if (! ip_before_insn)
+    --ip;
   landing_pad = 0;
   action_record = 0;
   handler_switch_value = 0;
--- libjava/include/i386-signal.h.jj	2006-02-27 23:04:43.000000000 +0100
+++ libjava/include/i386-signal.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,7 +1,7 @@
 // i386-signal.h - Catch runtime signals and turn them into exceptions
 // on an i386 based Linux system.
 
-/* Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2002, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -22,19 +22,7 @@ details.  */
 #define SIGNAL_HANDLER(_name)	\
 static void _name (int _dummy __attribute__ ((__unused__)))
 
-#define MAKE_THROW_FRAME(_exception)					\
-do									\
-{									\
-  void **_p = (void **)&_dummy;						\
-  volatile struct sigcontext_struct *_regs = (struct sigcontext_struct *)++_p;	\
-									\
-  /* Advance the program counter so that it is after the start of the	\
-     instruction:  the x86 exception handler expects			\
-     the PC to point to the instruction after a call. */		\
-  _regs->eip += 2;							\
-									\
-}									\
-while (0)
+#define MAKE_THROW_FRAME(_exception)
 
 #define HANDLE_DIVIDE_OVERFLOW						\
 do									\
@@ -91,14 +79,6 @@ do									\
 	  _regs->eip = (unsigned long)_eip;				\
 	  return;							\
 	}								\
-      else								\
-	{								\
-	  /* Advance the program counter so that it is after the start	\
-	     of the instruction: this is because the x86 exception	\
-	     handler expects the PC to point to the instruction after a	\
-	     call. */							\
-	  _regs->eip += 2;						\
-	}								\
     }									\
 }									\
 while (0)
--- libjava/include/x86_64-signal.h.jj	2006-02-27 23:04:43.000000000 +0100
+++ libjava/include/x86_64-signal.h	2006-02-27 23:14:37.000000000 +0100
@@ -1,7 +1,7 @@
 // x86_64-signal.h - Catch runtime signals and turn them into exceptions
 // on an x86_64 based GNU/Linux system.
 
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -34,17 +34,7 @@ extern "C" 
   };
 }
 
-#define MAKE_THROW_FRAME(_exception)					     \
-do									     \
-{									     \
-  /* Advance the program counter so that it is after the start of the	     \
-     instruction:  the x86_64 exception handler expects			     \
-     the PC to point to the instruction after a call. */		     \
-  struct ucontext *_uc = (struct ucontext *)_p;				     \
-  volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \
-  _sc->rip += 2;							     \
-}									     \
-while (0)
+#define MAKE_THROW_FRAME(_exception)
 
 #define RESTORE(name, syscall) RESTORE2 (name, syscall)
 #define RESTORE2(name, syscall)			\
--- libjava/include/powerpc-signal.h.jj	2006-02-27 23:04:43.000000000 +0100
+++ libjava/include/powerpc-signal.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,7 +1,7 @@
 // powerpc-signal.h - Catch runtime signals and turn them into exceptions
 // on a powerpc based Linux system.
 
-/* Copyright (C) 2003  Free Software Foundation
+/* Copyright (C) 2003, 2006  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -22,18 +22,12 @@ details.  */
 #define SIGNAL_HANDLER(_name)						\
   static void _name (int /* _signal */, struct sigcontext *_sc)
 
-/* PPC either leaves PC pointing at a faulting instruction or the
-   following instruction, depending on the signal.  SEGV always does
-   the former, so we adjust the saved PC to point to the following
-   instruction. This is what the handler in libgcc expects.  */
+/* MD_FALBACK_FRAME_STATE_FOR takes care of special casing PC
+   before the faulting instruction, so we don't need to do anything
+   here.  */
+
+#define MAKE_THROW_FRAME(_exception)
 
-#define MAKE_THROW_FRAME(_exception)					\
-do									\
-  {									\
-    _sc->regs->nip += 4;						\
-  }									\
-while (0)
-  
 /* For an explanation why we cannot simply use sigaction to
    install the handlers, see i386-signal.h.  */
 
--- libstdc++-v3/libsupc++/eh_personality.cc.jj	2006-02-27 23:04:45.000000000 +0100
+++ libstdc++-v3/libsupc++/eh_personality.cc	2006-02-27 23:08:09.000000000 +0100
@@ -365,6 +365,7 @@ PERSONALITY_FUNCTION (int version,
   int handler_switch_value;
   void* thrown_ptr = ue_header + 1;
   bool foreign_exception;
+  int ip_before_insn = 0;
 
 #ifdef __ARM_EABI_UNWINDER__
   _Unwind_Action actions;
@@ -431,7 +432,9 @@ PERSONALITY_FUNCTION (int version,
   // Parse the LSDA header.
   p = parse_lsda_header (context, language_specific_data, &info);
   info.ttype_base = base_of_encoded_value (info.ttype_encoding, context);
-  ip = _Unwind_GetIP (context) - 1;
+  ip = _Unwind_GetIPInfo (context, &ip_before_insn);
+  if (! ip_before_insn)
+    --ip;
   landing_pad = 0;
   action_record = 0;
   handler_switch_value = 0;
--- gcc/libgcc-std.ver.jj	2006-02-27 23:05:54.000000000 +0100
+++ gcc/libgcc-std.ver	2006-02-27 23:10:30.000000000 +0100
@@ -272,4 +272,5 @@ GCC_4.2.0 {
   __floatuntisf
   __floatuntixf
   __floatuntitf
+  _Unwind_GetIPInfo
 }
--- gcc/unwind-c.c.jj	2006-02-27 23:05:36.000000000 +0100
+++ gcc/unwind-c.c	2006-02-27 23:08:09.000000000 +0100
@@ -127,6 +127,7 @@ PERSONALITY_FUNCTION (int version,
   lsda_header_info info;
   const unsigned char *language_specific_data, *p, *action_record;
   _Unwind_Ptr landing_pad, ip;
+  int ip_before_insn = 0;
 
 #ifdef __ARM_EABI_UNWINDER__
   if ((state & _US_ACTION_MASK) != _US_UNWIND_FRAME_STARTING)
@@ -156,7 +157,9 @@ PERSONALITY_FUNCTION (int version,
 
   /* Parse the LSDA header.  */
   p = parse_lsda_header (context, language_specific_data, &info);
-  ip = _Unwind_GetIP (context) - 1;
+  ip = _Unwind_GetIPInfo (context, &ip_before_insn);
+  if (! ip_before_insn)
+    --ip;
   landing_pad = 0;
 
 #ifdef __USING_SJLJ_EXCEPTIONS__
--- gcc/unwind-generic.h.jj	2006-02-27 23:06:02.000000000 +0100
+++ gcc/unwind-generic.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* Exception handling and frame unwind runtime interface routines.
-   Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -155,6 +155,7 @@ extern _Unwind_Word _Unwind_GetGR (struc
 extern void _Unwind_SetGR (struct _Unwind_Context *, int, _Unwind_Word);
 
 extern _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
 extern void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
 
 /* @@@ Retrieve the CFA of the given context.  */
--- gcc/config/rs6000/linux-unwind.h.jj	2006-02-27 23:05:44.000000000 +0100
+++ gcc/config/rs6000/linux-unwind.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* DWARF2 EH unwinding support for PowerPC and PowerPC64 Linux.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -89,26 +89,6 @@ struct gcc_ucontext
 
 enum { SIGNAL_FRAMESIZE = 128 };
 
-/* If the current unwind info (FS) does not contain explicit info
-   saving R2, then we have to do a minor amount of code reading to
-   figure out if it was saved.  The big problem here is that the
-   code that does the save/restore is generated by the linker, so
-   we have no good way to determine at compile time what to do.  */
-
-#define MD_FROB_UPDATE_CONTEXT frob_update_context
-
-static void
-frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs)
-{
-  if (fs->regs.reg[2].how == REG_UNSAVED)
-    {
-      unsigned int *insn
-	= (unsigned int *) _Unwind_GetGR (context, LINK_REGISTER_REGNUM);
-      if (*insn == 0xE8410028)
-	_Unwind_SetGRPtr (context, 2, context->cfa + 40);
-    }
-}
-
 /* If PC is at a sigreturn trampoline, return a pointer to the
    regs.  Otherwise return NULL.  */
 
@@ -272,6 +252,7 @@ ppc_fallback_frame_state (struct _Unwind
   fs->regs.reg[ARG_POINTER_REGNUM].how = REG_SAVED_OFFSET;
   fs->regs.reg[ARG_POINTER_REGNUM].loc.offset = (long) &regs->nip - new_cfa;
   fs->retaddr_column = ARG_POINTER_REGNUM;
+  fs->signal_frame = 1;
 
   if (hwcap == 0)
     {
@@ -322,3 +303,46 @@ ppc_fallback_frame_state (struct _Unwind
 
   return _URC_NO_REASON;
 }
+
+#define MD_FROB_UPDATE_CONTEXT frob_update_context
+
+static void
+frob_update_context (struct _Unwind_Context *context, _Unwind_FrameState *fs)
+{
+  const unsigned int *pc = (const unsigned int *) context->ra;
+
+  /* Fix up for 2.6.12 - 2.6.16 Linux kernels that have vDSO, but don't
+     have S flag in it.  */
+#ifdef __powerpc64__
+  /* addi r1, r1, 128; li r0, 0x0077; sc  (sigreturn) */
+  /* addi r1, r1, 128; li r0, 0x00AC; sc  (rt_sigreturn) */
+  if (pc[0] == 0x38210000 + SIGNAL_FRAMESIZE
+      && (pc[1] == 0x38000077 || pc[1] == 0x380000AC)
+      && pc[2] == 0x44000002)
+    context->signal_frame = 1;
+#else
+  /* li r0, 0x7777; sc  (sigreturn old)  */
+  /* li r0, 0x0077; sc  (sigreturn new)  */
+  /* li r0, 0x6666; sc  (rt_sigreturn old)  */
+  /* li r0, 0x00AC; sc  (rt_sigreturn new)  */
+  if ((pc[0] == 0x38007777 || pc[0] == 0x38000077
+       || pc[0] == 0x38006666 || pc[0] == 0x380000AC)
+      && pc[1] == 0x44000002)
+    context->signal_frame = 1;
+#endif
+
+#ifdef __powerpc64__
+  if (fs->regs.reg[2].how == REG_UNSAVED)
+    {
+      /* If the current unwind info (FS) does not contain explicit info
+	 saving R2, then we have to do a minor amount of code reading to
+	 figure out if it was saved.  The big problem here is that the
+	 code that does the save/restore is generated by the linker, so
+	 we have no good way to determine at compile time what to do.  */
+      unsigned int *insn
+	= (unsigned int *) _Unwind_GetGR (context, LINK_REGISTER_REGNUM);
+      if (*insn == 0xE8410028)
+	_Unwind_SetGRPtr (context, 2, context->cfa + 40);
+    }
+#endif
+}
--- gcc/config/s390/linux-unwind.h.jj	2006-02-27 23:05:45.000000000 +0100
+++ gcc/config/s390/linux-unwind.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* DWARF2 EH unwinding support for S/390 Linux.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -113,27 +113,11 @@ s390_fallback_frame_state (struct _Unwin
   fs->regs.reg[32].how = REG_SAVED_OFFSET;
   fs->regs.reg[32].loc.offset = (long)&regs->psw_addr - new_cfa;
   fs->retaddr_column = 32;
-
-  /* If we got a SIGSEGV or a SIGBUS, the PSW address points *to*
-     the faulting instruction, not after it.  This causes the logic
-     in unwind-dw2.c that decrements the RA to determine the correct
-     CFI region to get confused.  To fix that, we *increment* the RA
-     here in that case.  Note that we cannot modify the RA in place,
-     and the frame state wants a *pointer*, not a value; thus we put
-     the modified RA value into the unused register 33 slot of FS and
-     have the register 32 save address point to that slot.
-
-     Unfortunately, for regular signals on old kernels, we don't know
-     the signal number.  We default to not fiddling with the RA;
-     that can fail in rare cases.  Upgrade your kernel.  */
-
-  if (signo && (*signo == 11 || *signo == 7))
-    {
-      fs->regs.reg[33].loc.exp =
-	(unsigned char *)regs->psw_addr + 1;
-      fs->regs.reg[32].loc.offset =
-	(long)&fs->regs.reg[33].loc.exp - new_cfa;
-    }
+  /* SIGILL, SIGFPE and SIGTRAP are delivered with psw_addr
+     after the faulting instruction rather than before it.
+     Don't set FS->signal_frame in that case.  */
+  if (!signo || (*signo != 4 && *signo != 5 && *signo != 8))
+    fs->signal_frame = 1;
 
   return _URC_NO_REASON;
 }
--- gcc/config/i386/linux-unwind.h.jj	2006-02-27 23:05:48.000000000 +0100
+++ gcc/config/i386/linux-unwind.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* DWARF2 EH unwinding support for AMD x86-64 and x86.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -100,6 +100,7 @@ x86_64_fallback_frame_state (struct _Unw
   fs->regs.reg[16].how = REG_SAVED_OFFSET;
   fs->regs.reg[16].loc.offset = (long)&sc->rip - new_cfa;
   fs->retaddr_column = 16;
+  fs->signal_frame = 1;
   return _URC_NO_REASON;
 }
 
@@ -172,6 +173,7 @@ x86_fallback_frame_state (struct _Unwind
   fs->regs.reg[8].how = REG_SAVED_OFFSET;
   fs->regs.reg[8].loc.offset = (long)&sc->REG_NAME(eip) - new_cfa;
   fs->retaddr_column = 8;
+  fs->signal_frame = 1;
   return _URC_NO_REASON;
 }
 #endif /* not glibc 2.0 */
--- gcc/config/ia64/unwind-ia64.c.jj	2006-02-27 23:05:48.000000000 +0100
+++ gcc/config/ia64/unwind-ia64.c	2006-02-27 23:08:09.000000000 +0100
@@ -1704,6 +1704,13 @@ _Unwind_GetIP (struct _Unwind_Context *c
   return context->rp;
 }
 
+inline _Unwind_Ptr
+_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn)
+{
+  *ip_before_insn = 0;
+  return context->rp;
+}
+
 /* Overwrite the return address for CONTEXT with VAL.  */
 
 inline void
--- gcc/config/arm/unwind-arm.h.jj	2006-02-27 23:05:49.000000000 +0100
+++ gcc/config/arm/unwind-arm.h	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* Header file for the ARM EABI unwinder
-   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
    Contributed by Paul Brook
 
    This file is free software; you can redistribute it and/or modify it
@@ -250,6 +250,9 @@ extern "C" {
 #define _Unwind_GetIP(context) \
   (_Unwind_GetGR (context, 15) & ~(_Unwind_Word)1)
 
+#define _Unwind_GetIP(context, ip_before_insn) \
+  (*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1)
+
   static inline void
   _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val)
     {
--- gcc/unwind-compat.c.jj	2006-02-27 23:05:36.000000000 +0100
+++ gcc/unwind-compat.c	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* Backward compatibility unwind routines.
-   Copyright (C) 2004, 2005
+   Copyright (C) 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of GCC.
@@ -136,6 +136,13 @@ _Unwind_GetIP (struct _Unwind_Context *c
 }
 symver (_Unwind_GetIP, GCC_3.0);
 
+_Unwind_Ptr
+_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn)
+{
+  *ip_before_insn = 0;
+  return __libunwind_Unwind_GetIP (context);
+}
+
 extern void *__libunwind_Unwind_GetLanguageSpecificData
   (struct _Unwind_Context *);
 
--- gcc/unwind-dw2.h.jj	2006-02-27 23:05:52.000000000 +0100
+++ gcc/unwind-dw2.h	2006-02-27 23:08:09.000000000 +0100
@@ -83,6 +83,7 @@ typedef struct
   unsigned char fde_encoding;
   unsigned char lsda_encoding;
   unsigned char saw_z;
+  unsigned char signal_frame;
   void *eh_ptr;
 } _Unwind_FrameState;
 
--- gcc/unwind-sjlj.c.jj	2006-02-27 23:05:36.000000000 +0100
+++ gcc/unwind-sjlj.c	2006-02-27 23:08:09.000000000 +0100
@@ -214,6 +214,13 @@ _Unwind_GetIP (struct _Unwind_Context *c
   return context->fc->call_site + 1;
 }
 
+_Unwind_Ptr
+_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn)
+{
+  *ip_before_insn = 0;
+  return context->fc->call_site + 1;
+}
+
 /* Set the return landing pad index in CONTEXT.  */
 
 void
--- gcc/unwind-dw2.c.jj	2006-02-27 23:05:36.000000000 +0100
+++ gcc/unwind-dw2.c	2006-02-27 23:08:09.000000000 +0100
@@ -1,5 +1,5 @@
 /* DWARF2 exception handling and frame unwind runtime interface routines.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
    This file is part of GCC.
@@ -71,6 +71,7 @@ struct _Unwind_Context
   void *lsda;
   struct dwarf_eh_bases bases;
   _Unwind_Word args_size;
+  char signal_frame;
 };
 
 /* Byte size of every register managed by these routines.  */
@@ -207,6 +208,16 @@ _Unwind_GetIP (struct _Unwind_Context *c
   return (_Unwind_Ptr) context->ra;
 }
 
+/* Retrieve the return address and flag whether that IP is before
+   or after first not yet fully executed instruction.  */
+
+inline _Unwind_Ptr
+_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn)
+{
+  *ip_before_insn = context->signal_frame != 0;
+  return (_Unwind_Ptr) context->ra;
+}
+
 /* Overwrite the return address for CONTEXT with VAL.  */
 
 inline void
@@ -327,6 +338,13 @@ extract_cie_info (const struct dwarf_cie
 	  aug += 1;
 	}
 
+      /* "S" indicates a signal frame.  */
+      else if (aug[0] == 'S')
+	{
+	  fs->signal_frame = 1;
+	  aug += 1;
+	}
+
       /* Otherwise we have an unknown augmentation string.
 	 Bail unless we saw a 'z' prefix.  */
       else
@@ -761,8 +779,10 @@ execute_cfa_program (const unsigned char
      a different stack configuration that we are not interested in.  We
      assume that the call itself is unwind info-neutral; if not, or if
      there are delay instructions that adjust the stack, these must be
-     reflected at the point immediately before the call insn.  */
-  while (insn_ptr < insn_end && fs->pc < context->ra)
+     reflected at the point immediately before the call insn.
+     In signal frames, return address is after last completed instruction,
+     so we add 1 to return address to make the comparison <=.  */
+  while (insn_ptr < insn_end && fs->pc < context->ra + context->signal_frame)
     {
       unsigned char insn = *insn_ptr++;
       _Unwind_Word reg, utmp;
@@ -974,7 +994,8 @@ uw_frame_state_for (struct _Unwind_Conte
   if (context->ra == 0)
     return _URC_END_OF_STACK;
 
-  fde = _Unwind_Find_FDE (context->ra - 1, &context->bases);
+  fde = _Unwind_Find_FDE (context->ra + context->signal_frame - 1,
+			  &context->bases);
   if (fde == NULL)
     {
 #ifdef MD_FALLBACK_FRAME_STATE_FOR
@@ -1192,6 +1213,8 @@ uw_update_context_1 (struct _Unwind_Cont
 	break;
       }
 
+  context->signal_frame = fs->signal_frame;
+
 #ifdef MD_FROB_UPDATE_CONTEXT
   MD_FROB_UPDATE_CONTEXT (context, fs);
 #endif


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gcc41.spec	27 Feb 2006 16:57:32 -0000	1.40
+++ gcc41.spec	27 Feb 2006 22:41:17 -0000	1.41
@@ -1,6 +1,6 @@
 %define DATE 20060227
 %define gcc_version 4.1.0
-%define gcc_release 0.30
+%define gcc_release 0.31
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -108,6 +108,8 @@
 Patch11: gcc41-fortran-where-opt.patch
 Patch12: gcc41-x86_64-sse3.patch
 Patch13: gcc41-mni.patch
+Patch14: gcc41-floatunXiYf.patch
+Patch15: gcc41-pr26208.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -400,6 +402,8 @@
 %patch11 -p0 -b .fortran-where-opt~
 %patch12 -p0 -b .x86_64-sse3~
 %patch13 -p0 -b .mni~
+%patch14 -p0 -b .floatunXiYf~
+%patch15 -p0 -b .pr26208~
 
 sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1417,6 +1421,10 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Mon Feb 27 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.31
+- add __floatuns[sdt]i[sdxt]f exports to libgcc_s.so.1 (Joseph S. Myers)
+- fix unwinding through signal frames (#175951, PR other/26208, glibc BZ#300)
+
 * Mon Feb 27 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.30
 - update from gcc-4_1-branch (-r111278:111466)
   - GCC 4.1.0 RC2



From fedora-cvs-commits at redhat.com  Mon Feb 27 23:00:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 18:00:42 -0500
Subject: rpms/selinux-policy/devel .cvsignore, 1.45,
	1.46 policy-20060207.patch, 1.29, 1.30 policygentool, 1.3,
	1.4 selinux-policy.spec, 1.131, 1.132 sources, 1.49, 1.50
Message-ID: <200602272300.k1RN0gKs028734@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28719

Modified Files:
	.cvsignore policy-20060207.patch policygentool 
	selinux-policy.spec sources 
Log Message:
* Mon Feb 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.22-1
- Update to upstream
- Merged my latest fixes
- Fix cups policy to handle unix domain sockets



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	23 Feb 2006 15:12:37 -0000	1.45
+++ .cvsignore	27 Feb 2006 23:00:38 -0000	1.46
@@ -46,3 +46,4 @@
 serefpolicy-2.2.19.tgz
 serefpolicy-2.2.20.tgz
 serefpolicy-2.2.21.tgz
+serefpolicy-2.2.22.tgz

policy-20060207.patch:
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.if       |    5 +++++
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/cups.fc         |    2 +-
 policy/modules/services/cups.te         |    4 +++-
 policy/modules/services/ktalk.te        |    2 ++
 policy/modules/services/nscd.if         |    2 +-
 policy/modules/system/init.te           |    5 +++++
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    1 +
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 20 files changed, 54 insertions(+), 20 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- policy-20060207.patch	25 Feb 2006 20:50:53 -0000	1.29
+++ policy-20060207.patch	27 Feb 2006 23:00:38 -0000	1.30
@@ -1,61 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.21/Makefile
---- nsaserefpolicy/Makefile	2006-02-17 14:46:10.000000000 -0500
-+++ serefpolicy-2.2.21/Makefile	2006-02-23 12:35:04.000000000 -0500
-@@ -446,14 +446,14 @@
- 			$(MODDIR)/$$i/metadata.xml \
- 			$(HEADERDIR)/$$i ;\
- 	done
--	$(verbose) echo "TYPE=$(TYPE)" > $(HEADERDIR)/build.conf
--	$(verbose) echo "NAME=$(NAME)" >> $(HEADERDIR)/build.conf
-+	$(verbose) echo "TYPE ?= $(TYPE)" > $(HEADERDIR)/build.conf
-+	$(verbose) echo "NAME ?= $(NAME)" >> $(HEADERDIR)/build.conf
- ifneq "$(DISTRO)" ""
--	$(verbose) echo "DISTRO=$(DISTRO)" >> $(HEADERDIR)/build.conf
-+	$(verbose) echo "DISTRO ?= $(DISTRO)" >> $(HEADERDIR)/build.conf
- endif
--	$(verbose) echo "MONOLITHIC=n" >> $(HEADERDIR)/build.conf
--	$(verbose) echo "DIRECT_INITRC=$(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
--	$(verbose) echo "POLY=$(POLY)" >> $(HEADERDIR)/build.conf
-+	$(verbose) echo "MONOLITHIC ?= n" >> $(HEADERDIR)/build.conf
-+	$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(HEADERDIR)/build.conf
-+	$(verbose) echo "POLY ?= $(POLY)" >> $(HEADERDIR)/build.conf
- 	$(verbose) install -m 644 $(SUPPORT)/Makefile.devel $(HEADERDIR)/Makefile
- 
- ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.21/policy/modules/admin/logwatch.te
---- nsaserefpolicy/policy/modules/admin/logwatch.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/logwatch.te	2006-02-23 09:41:46.000000000 -0500
-@@ -71,6 +71,8 @@
- 
- selinux_dontaudit_getattr_dir(logwatch_t)
- 
-+sysnet_dns_name_resolve(logwatch_t)
-+
- userdom_dontaudit_search_sysadm_home_dirs(logwatch_t)
- userdom_dontaudit_getattr_sysadm_home_dirs(logwatch_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.2.21/policy/modules/admin/netutils.te
---- nsaserefpolicy/policy/modules/admin/netutils.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/netutils.te	2006-02-24 11:25:33.000000000 -0500
-@@ -139,6 +139,7 @@
- 	term_use_generic_ptys(ping_t)
- 	term_use_all_user_ttys(ping_t)
- 	term_use_all_user_ptys(ping_t)
-+	userdom_manage_generic_user_home_content_files(ping_t)
- ',`
- 	tunable_policy(`user_ping',`
- 		term_use_all_user_ttys(ping_t)
-@@ -221,6 +222,7 @@
- ifdef(`targeted_policy',`
- 	term_use_unallocated_ttys(traceroute_t)
- 	term_use_generic_ptys(traceroute_t)
-+	userdom_manage_generic_user_home_content_files(traceroute_t)
- ')
- 
- tunable_policy(`user_ping',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.21/policy/modules/admin/readahead.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.22/policy/modules/admin/readahead.te
 --- nsaserefpolicy/policy/modules/admin/readahead.te	2006-02-21 14:40:22.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/readahead.te	2006-02-24 13:07:55.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/admin/readahead.te	2006-02-27 17:33:49.000000000 -0500
 @@ -18,7 +18,7 @@
  # Local policy
  #
@@ -65,17 +10,17 @@
  allow readahead_t self:process signal_perms;
  
  allow readahead_t readahead_var_run_t:file create_file_perms;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.21/policy/modules/admin/su.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.22/policy/modules/admin/su.fc
 --- nsaserefpolicy/policy/modules/admin/su.fc	2005-11-14 18:24:06.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/su.fc	2006-02-23 14:49:18.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/admin/su.fc	2006-02-27 17:33:49.000000000 -0500
 @@ -2,3 +2,4 @@
  /bin/su			--	gen_context(system_u:object_r:su_exec_t,s0)
  
  /usr(/local)?/bin/ksu	--	gen_context(system_u:object_r:su_exec_t,s0)
 +/usr/bin/kdesu		--	gen_context(system_u:object_r:su_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.21/policy/modules/admin/su.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.22/policy/modules/admin/su.if
 --- nsaserefpolicy/policy/modules/admin/su.if	2006-02-23 09:25:07.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/su.if	2006-02-23 17:21:38.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/admin/su.if	2006-02-27 17:33:49.000000000 -0500
 @@ -141,10 +141,10 @@
  
  	# By default, revert to the calling domain when a shell is executed.
@@ -90,62 +35,9 @@
  
  	kernel_read_system_state($1_su_t)
  	kernel_read_kernel_sysctls($1_su_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.2.21/policy/modules/admin/vpn.te
---- nsaserefpolicy/policy/modules/admin/vpn.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/admin/vpn.te	2006-02-23 12:21:59.000000000 -0500
-@@ -91,6 +91,8 @@
- libs_use_ld_so(vpnc_t)
- libs_use_shared_libs(vpnc_t)
- 
-+locallogin_use_fd(vpnc_t)
-+
- logging_send_syslog_msg(vpnc_t)
- 
- miscfiles_read_localization(vpnc_t)
-@@ -106,6 +108,10 @@
- 
- optional_policy(`dbus',`
- 	dbus_system_bus_client_template(vpnc,vpnc_t)
-+	dbus_send_system_bus(vpnc_t)
-+	optional_policy(`networkmanager',`
-+		networkmanager_dbus_chat(vpnc_t)
-+	')
- ')
- 
- optional_policy(`mount',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.2.21/policy/modules/apps/java.if
---- nsaserefpolicy/policy/modules/apps/java.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/apps/java.if	2006-02-23 09:41:46.000000000 -0500
-@@ -149,13 +149,9 @@
- 	userdom_manage_user_home_content_sockets($1,$1_javaplugin_t)
- 	userdom_user_home_dir_filetrans_user_home_content($1,$1_javaplugin_t,{ file lnk_file sock_file fifo_file })
- 
--	# libdeploy.so legacy
--	tunable_policy(`allow_execmem',`
--		allow $1_javaplugin_t self:process execmem;
--	')
--	
-+	allow $1_javaplugin_t self:process execmem;
- 	tunable_policy(`allow_java_execstack',`
--		allow $1_javaplugin_t self:process { execmem execstack };
-+		allow $1_javaplugin_t self:process execstack;
- 
- 		allow $1_javaplugin_t $1_javaplugin_tmp_t:file execute;
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.2.21/policy/modules/kernel/corecommands.fc
---- nsaserefpolicy/policy/modules/kernel/corecommands.fc	2006-01-19 16:02:10.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/corecommands.fc	2006-02-23 13:32:13.000000000 -0500
-@@ -135,6 +135,7 @@
- 
- /usr/share/gnucash/finance-quote-check -- gen_context(system_u:object_r:bin_t,s0)
- /usr/share/gnucash/finance-quote-helper -- gen_context(system_u:object_r:bin_t,s0)
-+/usr/share/selinux/devel/policygentool -- gen_context(system_u:object_r:bin_t,s0)
- /usr/share/hal/scripts(/.*)?		gen_context(system_u:object_r:bin_t,s0)
- /usr/share/mc/extfs/.*		--	gen_context(system_u:object_r:bin_t,s0)
- /usr/share/printconf/util/print\.py --	gen_context(system_u:object_r:bin_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.21/policy/modules/kernel/corenetwork.te.in
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.22/policy/modules/kernel/corenetwork.te.in
 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in	2006-02-20 14:07:36.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/corenetwork.te.in	2006-02-24 10:44:48.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/kernel/corenetwork.te.in	2006-02-27 17:33:49.000000000 -0500
 @@ -66,7 +66,7 @@
  network_port(giftd, tcp,1213,s0)
  network_port(gopher, tcp,70,s0, udp,70,s0)
@@ -155,20 +47,9 @@
  network_port(howl, tcp,5335,s0, udp,5353,s0)
  network_port(hplip, tcp,50000,s0, tcp,50002,s0)
  network_port(i18n_input, tcp,9010,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.21/policy/modules/kernel/devices.fc
---- nsaserefpolicy/policy/modules/kernel/devices.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/devices.fc	2006-02-23 10:01:17.000000000 -0500
-@@ -39,6 +39,7 @@
- /dev/radio.*		-c	gen_context(system_u:object_r:v4l_device_t,s0)
- /dev/random		-c	gen_context(system_u:object_r:random_device_t,s0)
- /dev/(misc/)?rtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
-+/dev/efirtc		-c	gen_context(system_u:object_r:clock_device_t,s0)
- /dev/sequencer		-c	gen_context(system_u:object_r:sound_device_t,s0)
- /dev/sequencer2		-c	gen_context(system_u:object_r:sound_device_t,s0)
- /dev/smpte.*		-c	gen_context(system_u:object_r:sound_device_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.21/policy/modules/kernel/devices.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.22/policy/modules/kernel/devices.if
 --- nsaserefpolicy/policy/modules/kernel/devices.if	2006-02-23 09:25:08.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/devices.if	2006-02-24 09:51:36.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/kernel/devices.if	2006-02-27 17:33:49.000000000 -0500
 @@ -2384,7 +2384,7 @@
  	')
  
@@ -178,9 +59,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.21/policy/modules/kernel/files.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.22/policy/modules/kernel/files.fc
 --- nsaserefpolicy/policy/modules/kernel/files.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/files.fc	2006-02-24 08:30:53.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/kernel/files.fc	2006-02-27 17:33:49.000000000 -0500
 @@ -89,7 +89,7 @@
  # HOME_ROOT
  # expanded by genhomedircon
@@ -190,9 +71,9 @@
  HOME_ROOT/\.journal		<<none>>
  HOME_ROOT/lost\+found	-d	gen_context(system_u:object_r:lost_found_t,s15:c0.c255)
  HOME_ROOT/lost\+found/.*		<<none>>
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.21/policy/modules/kernel/files.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.22/policy/modules/kernel/files.if
 --- nsaserefpolicy/policy/modules/kernel/files.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/kernel/files.if	2006-02-24 10:26:21.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/kernel/files.if	2006-02-27 17:33:49.000000000 -0500
 @@ -1416,6 +1416,21 @@
  ')
  
@@ -231,21 +112,9 @@
  ')
  
  ########################################
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.21/policy/modules/services/apache.fc
---- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-14 07:20:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/apache.fc	2006-02-24 15:21:06.000000000 -0500
-@@ -45,7 +45,7 @@
- /var/cache/rt3(/.*)?			gen_context(system_u:object_r:httpd_cache_t,s0)
- /var/cache/ssl.*\.sem		--	gen_context(system_u:object_r:httpd_cache_t,s0)
- 
--/var/lib/cacti(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-+/var/lib/cacti/rra(/.*)?		gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/lib/dav(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
- /var/lib/htdig(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
- /var/lib/httpd(/.*)?			gen_context(system_u:object_r:httpd_var_lib_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.21/policy/modules/services/apache.if
---- nsaserefpolicy/policy/modules/services/apache.if	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/apache.if	2006-02-24 15:29:56.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.22/policy/modules/services/apache.if
+--- nsaserefpolicy/policy/modules/services/apache.if	2006-02-27 17:17:23.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/apache.if	2006-02-27 17:33:49.000000000 -0500
 @@ -12,6 +12,11 @@
  ## </param>
  #
@@ -258,92 +127,22 @@
  	# allow write access to public file transfer
  	# services files.
  	gen_tunable(allow_httpd_$1_script_anon_write,false)
-@@ -94,6 +99,7 @@
- 
- 	corecmd_exec_bin(httpd_$1_script_t)
- 	corecmd_exec_sbin(httpd_$1_script_t)
-+	corecmd_shell_entry_type(httpd_$1_script_t)
- 
- 	domain_exec_all_entry_files(httpd_$1_script_t)
- 
-@@ -174,6 +180,7 @@
- 		dev_read_urand(httpd_$1_script_t)
- 
- 		fs_getattr_xattr_fs(httpd_$1_script_t)
-+		fs_read_eventpollfs(httpd_$1_script_t)
- 
- 		files_read_etc_runtime_files(httpd_$1_script_t)
- 		files_read_usr_files(httpd_$1_script_t)
-@@ -798,3 +805,22 @@
- 
- 	allow $1 httpd_sys_script_t:dir search;
- ')
-+
-+
-+########################################
-+## <summary>
-+##	Read apache system content
-+## </summary>
-+## <param name="domain">
-+##	<summary>
-+##	Domain to not audit.
-+##	</summary>
-+## </param>
-+#
-+interface(`apache_read_sys_content',`
-+	gen_require(`
-+		type httpd_sys_content_t;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.22/policy/modules/services/cron.te
+--- nsaserefpolicy/policy/modules/services/cron.te	2006-02-27 17:17:24.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/cron.te	2006-02-27 17:33:49.000000000 -0500
+@@ -166,6 +166,9 @@
+ 
+ 	allow crond_t unconfined_t:dbus send_msg;
+ 	allow crond_t initrc_t:dbus send_msg;
++	optional_policy(`mono',`
++		mono_domtrans(crond_t)
 +	')
-+	allow $1 httpd_sys_content_t:dir r_dir_perms;
-+	allow $1 httpd_sys_content_t:file { getattr read };
-+')
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.21/policy/modules/services/automount.te
---- nsaserefpolicy/policy/modules/services/automount.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/automount.te	2006-02-23 10:09:09.000000000 -0500
-@@ -28,7 +28,7 @@
- # Local policy
- #
- 
--allow automount_t self:capability { net_bind_service sys_nice dac_override };
-+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:fifo_file rw_file_perms;
-@@ -83,6 +83,9 @@
- corenet_tcp_connect_portmap_port(automount_t)
- corenet_tcp_connect_all_ports(automount_t)
- corenet_dontaudit_tcp_connect_all_reserved_ports(automount_t)
-+# Automount execs showmount when you browse /net.  This is required until
-+# Someone writes a showmount policy
-+corenet_tcp_bind_reserved_port(automount_t)
- 
- dev_read_sysfs(automount_t)
- # for SSP
-@@ -91,7 +94,7 @@
- domain_use_interactive_fds(automount_t)
- 
- files_dontaudit_write_var_dirs(automount_t)
--files_search_var_lib(automount_t)
-+files_getattr_all_dirs(automount_t)
- files_list_mnt(automount_t)
- files_getattr_home_dir(automount_t)
- files_read_etc_files(automount_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.21/policy/modules/services/cron.te
---- nsaserefpolicy/policy/modules/services/cron.te	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/cron.te	2006-02-23 09:41:46.000000000 -0500
-@@ -360,6 +360,9 @@
- 	optional_policy(`apache',`
- 		# Needed	 for certwatch
- 		apache_exec_modules(system_crond_t)
-+		apache_read_config(system_crond_t)
-+		apache_read_log(system_crond_t)
-+		apache_read_sys_content(system_crond_t)
- 	')
- 
- 	optional_policy(`cyrus',`
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.21/policy/modules/services/cups.fc
+ ',`
+ 	allow crond_t crond_tmp_t:dir create_dir_perms;
+ 	allow crond_t crond_tmp_t:file create_file_perms;
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.22/policy/modules/services/cups.fc
 --- nsaserefpolicy/policy/modules/services/cups.fc	2005-11-14 18:24:08.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/cups.fc	2006-02-24 13:37:07.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/cups.fc	2006-02-27 17:33:49.000000000 -0500
 @@ -43,7 +43,7 @@
  /var/log/cups(/.*)?		gen_context(system_u:object_r:cupsd_log_t,s0)
  /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0)
@@ -353,9 +152,9 @@
  /var/run/hp.*\.pid	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/hp.*\.port	--	gen_context(system_u:object_r:hplip_var_run_t,s0)
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.21/policy/modules/services/cups.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.22/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/cups.te	2006-02-24 13:38:07.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/cups.te	2006-02-27 17:35:43.000000000 -0500
 @@ -77,7 +77,7 @@
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
  allow cupsd_t self:process { setsched signal_perms };
@@ -365,21 +164,25 @@
  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 };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.21/policy/modules/services/hal.te
---- nsaserefpolicy/policy/modules/services/hal.te	2006-02-21 14:40:23.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/hal.te	2006-02-23 10:11:00.000000000 -0500
-@@ -93,7 +93,7 @@
- 
- fs_getattr_all_fs(hald_t)
- fs_search_all(hald_t)
--fs_search_auto_mountpoints(hald_t)
-+fs_list_auto_mountpoints(hald_t)
+@@ -110,6 +110,7 @@
  
- mls_file_read_up(hald_t)
+ allow cupsd_t cupsd_var_run_t:file create_file_perms;
+ allow cupsd_t cupsd_var_run_t:dir rw_dir_perms;
++allow cupsd_t cupsd_var_run_t:sock_file create_file_perms;
+ files_pid_filetrans(cupsd_t,cupsd_var_run_t)
+ 
+ allow cupsd_t hplip_var_run_t:file { read getattr };
+@@ -119,6 +120,7 @@
+ allow cupsd_t ptal_t:unix_stream_socket connectto;
+ 
+ kernel_read_system_state(cupsd_t)
++kernel_read_network_state(cupsd_t)
+ kernel_read_all_sysctls(cupsd_t)
+ kernel_tcp_recvfrom(cupsd_t)
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.21/policy/modules/services/ktalk.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.22/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2006-02-21 14:40:24.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/ktalk.te	2006-02-24 08:42:10.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/ktalk.te	2006-02-27 17:33:49.000000000 -0500
 @@ -68,6 +68,8 @@
  
  files_read_etc_files(ktalkd_t)
@@ -389,14 +192,9 @@
  libs_use_ld_so(ktalkd_t)
  libs_use_shared_libs(ktalkd_t)
  logging_send_syslog_msg(ktalkd_t)
-@@ -83,3 +85,4 @@
- optional_policy(`nscd',`
- 	nscd_socket_use(ktalkd_t)
- ')
-+
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.21/policy/modules/services/nscd.if
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.22/policy/modules/services/nscd.if
 --- nsaserefpolicy/policy/modules/services/nscd.if	2006-02-10 21:34:14.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/nscd.if	2006-02-25 15:37:25.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/nscd.if	2006-02-27 17:33:49.000000000 -0500
 @@ -49,8 +49,8 @@
  	dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost };
  
@@ -407,33 +205,9 @@
  	dontaudit $1 nscd_var_run_t:file { getattr read };
  ')
  
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.21/policy/modules/services/xserver.te
---- nsaserefpolicy/policy/modules/services/xserver.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/services/xserver.te	2006-02-23 14:10:50.000000000 -0500
-@@ -425,7 +425,7 @@
- ifdef(`targeted_policy',`
- 	allow xdm_xserver_t self:process { execheap execmem };
- 
--	unconfined_domain(xdm_xserver_t)
-+	unconfined_domain_noaudit(xdm_xserver_t)
- 	unconfined_domtrans(xdm_xserver_t)
- ')
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.21/policy/modules/system/fstools.te
---- nsaserefpolicy/policy/modules/system/fstools.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/fstools.te	2006-02-24 11:24:37.000000000 -0500
-@@ -45,7 +45,7 @@
- files_tmp_filetrans(fsadm_t, fsadm_tmp_t, { file dir })
- 
- # Enable swapping to files
--allow fsadm_t swapfile_t:file { getattr swapon };
-+allow fsadm_t swapfile_t:file { read write getattr swapon };
- 
- kernel_read_system_state(fsadm_t)
- kernel_read_kernel_sysctls(fsadm_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.21/policy/modules/system/init.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.22/policy/modules/system/init.te
 --- nsaserefpolicy/policy/modules/system/init.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/init.te	2006-02-24 10:26:58.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/init.te	2006-02-27 17:33:49.000000000 -0500
 @@ -349,6 +349,7 @@
  files_mounton_isid_type_dirs(initrc_t)
  files_list_default(initrc_t)
@@ -442,9 +216,20 @@
  
  libs_rw_ld_so_cache(initrc_t)
  libs_use_ld_so(initrc_t)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.21/policy/modules/system/locallogin.te
+@@ -480,6 +481,10 @@
+ ifdef(`targeted_policy',`
+ 	domain_subj_id_change_exemption(initrc_t)
+ 	unconfined_domain(initrc_t)
++	optional_policy(`mono',`
++		mono_domtrans(initrc_t)
++	')
++
+ ',`
+ 	# cjp: require doesnt work in optionals :\
+ 	# this also would result in a type transition
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.22/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/locallogin.te	2006-02-23 17:24:01.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/locallogin.te	2006-02-27 17:33:49.000000000 -0500
 @@ -20,6 +20,7 @@
  
  type local_login_tmp_t;
@@ -453,9 +238,9 @@
  
  type sulogin_t;
  type sulogin_exec_t;
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.21/policy/modules/system/lvm.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.22/policy/modules/system/lvm.fc
 --- nsaserefpolicy/policy/modules/system/lvm.fc	2005-11-14 18:24:06.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/lvm.fc	2006-02-24 10:07:31.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/lvm.fc	2006-02-27 17:33:49.000000000 -0500
 @@ -25,6 +25,7 @@
  # /sbin
  #
@@ -464,21 +249,9 @@
  /sbin/dmsetup		--	gen_context(system_u:object_r:lvm_exec_t,s0)
  /sbin/dmsetup\.static	--	gen_context(system_u:object_r:lvm_exec_t,s0)
  /sbin/e2fsadm		--	gen_context(system_u:object_r:lvm_exec_t,s0)
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.21/policy/modules/system/mount.te
---- nsaserefpolicy/policy/modules/system/mount.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/mount.te	2006-02-23 10:11:48.000000000 -0500
-@@ -46,7 +46,7 @@
- fs_unmount_all_fs(mount_t)
- fs_remount_all_fs(mount_t)
- fs_relabelfrom_all_fs(mount_t)
--fs_search_auto_mountpoints(mount_t)
-+fs_list_auto_mountpoints(mount_t)
- fs_rw_tmpfs_chr_files(mount_t)
- fs_read_tmpfs_symlinks(mount_t)
- 
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.21/policy/modules/system/selinuxutil.fc
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.22/policy/modules/system/selinuxutil.fc
 --- nsaserefpolicy/policy/modules/system/selinuxutil.fc	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.fc	2006-02-23 16:56:44.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/selinuxutil.fc	2006-02-27 17:33:49.000000000 -0500
 @@ -8,9 +8,9 @@
  /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0)
  /etc/selinux/([^/]*/)?policy(/.*)?	gen_context(system_u:object_r:policy_config_t,s15:c0.c255)
@@ -492,18 +265,10 @@
  /etc/selinux/([^/]*/)?users(/.*)?	--	gen_context(system_u:object_r:selinux_config_t,s15:c0.c255)
  
  #
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.21/policy/modules/system/selinuxutil.te
---- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/selinuxutil.te	2006-02-24 10:28:37.000000000 -0500
-@@ -199,6 +199,7 @@
- libs_use_ld_so(load_policy_t)
- libs_use_shared_libs(load_policy_t)
- 
-+mls_file_read_up(load_policy_t)
- miscfiles_read_localization(load_policy_t)
- 
- userdom_use_all_users_fds(load_policy_t)
-@@ -261,6 +262,7 @@
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.22/policy/modules/system/selinuxutil.te
+--- nsaserefpolicy/policy/modules/system/selinuxutil.te	2006-02-27 17:17:27.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/selinuxutil.te	2006-02-27 17:33:49.000000000 -0500
+@@ -263,6 +263,7 @@
  selinux_compute_relabel_context(newrole_t)
  selinux_compute_user_contexts(newrole_t)
  
@@ -511,20 +276,9 @@
  term_use_all_user_ttys(newrole_t)
  term_use_all_user_ptys(newrole_t)
  term_relabel_all_user_ttys(newrole_t)
-@@ -319,10 +321,6 @@
- 	nscd_socket_use(newrole_t)
- ')
- 
--ifdef(`TODO',`
--ifdef(`gnome-pty-helper.te', `allow newrole_t gphdomain:fd use;')
--') dnl ifdef TODO
--
- ########################################
- #
- # Restorecon local policy
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.21/policy/modules/system/udev.te
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.22/policy/modules/system/udev.te
 --- nsaserefpolicy/policy/modules/system/udev.te	2006-02-21 14:40:25.000000000 -0500
-+++ serefpolicy-2.2.21/policy/modules/system/udev.te	2006-02-24 10:21:27.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/udev.te	2006-02-27 17:33:49.000000000 -0500
 @@ -39,7 +39,7 @@
  # Local policy
  #
@@ -534,9 +288,9 @@
  dontaudit udev_t self:capability sys_tty_config;
  allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap };
  allow udev_t self:process { execmem setfscreate };
-diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.21/support/Makefile.devel
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.22/support/Makefile.devel
 --- nsaserefpolicy/support/Makefile.devel	2006-02-22 14:09:04.000000000 -0500
-+++ serefpolicy-2.2.21/support/Makefile.devel	2006-02-23 12:38:25.000000000 -0500
++++ serefpolicy-2.2.22/support/Makefile.devel	2006-02-27 17:33:49.000000000 -0500
 @@ -6,10 +6,7 @@
  SED ?= sed
  EINFO ?= echo


Index: policygentool
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- policygentool	11 Feb 2006 02:41:50 -0000	1.3
+++ policygentool	27 Feb 2006 23:00:40 -0000	1.4
@@ -21,64 +21,140 @@
 #
 #  
 import os, sys, getopt
-import seobject
 import re
 
 ########################### Interface File #############################
-interface="\n\
-## <summary>policy for TEMPLATETYPE</summary>\n\
-\n\
-########################################\n\
-## <summary>\n\
-##	Execute a domain transition to run TEMPLATETYPE.\n\
-## </summary>\n\
-## <param name=\"domain\">\n\
-##	Domain allowed to transition.\n\
-## </param>\n\
-#\n\
-interface(`TEMPLATETYPE_domtrans',`\n\
-	gen_requires(`\n\
-		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;\n\
-	')\n\
-\n\
-	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)\n\
-\n\
-	allow $1 TEMPLATETYPE_t:fd use;\n\
-	allow TEMPLATETYPE_t $1:fd use;\n\
-	allow TEMPLATETYPE_t:$1:fifo_file rw_file_perms;\n\
-	allow TEMPLATETYPE_t $1:process sigchld;\n\
-')\n\
-"
+interface="""\
+## <summary>policy for TEMPLATETYPE</summary>
+
+########################################
+## <summary>
+##	Execute a domain transition to run TEMPLATETYPE.
+## </summary>
+## <param name=\"domain\">
+##	Domain allowed to transition.
+## </param>
+#
+interface(`TEMPLATETYPE_domtrans',`
+	gen_requires(`
+		type TEMPLATETYPE_t, TEMPLATETYPE_exec_t;
+	')
+
+	domain_auto_trans($1,TEMPLATETYPE_exec_t,TEMPLATETYPE_t)
+
+	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:process sigchld;
+')
+"""
 
 ########################### Type Enforcement File #############################
-te="\n\
-policy_module(TEMPLATETYPE,1.0.0)\n\
-\n\
-########################################\n\
-#\n\
-# Declarations\n\
-#\n\
-\n\
-type TEMPLATETYPE_t;\n\
-type TEMPLATETYPE_exec_t;\n\
-domain_type(TEMPLATETYPE_t)\n\
-init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)\n\
-\n\
-########################################\n\
-#\n\
-# TEMPLATETYPE local policy\n\
-#\n\
-# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules.\n"
+te="""\
+policy_module(TEMPLATETYPE,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type TEMPLATETYPE_t;
+type TEMPLATETYPE_exec_t;
+domain_type(TEMPLATETYPE_t)
+init_daemon_domain(TEMPLATETYPE_t, TEMPLATETYPE_exec_t)
+"""
+te_pidfile="""
+# pid files
+type TEMPLATETYPE_var_run_t;
+files_pid_file(TEMPLATETYPE_var_run_t)
+"""
+te_logfile="""
+# log files
+type TEMPLATETYPE_var_log_t;
+logging_log_file(TEMPLATETYPE_var_log_t)
+"""
+te_libfile="""
+# var/lib files
+type TEMPLATETYPE_var_lib_t;
+files_type(TEMPLATETYPE_var_lib_t)
+"""
+te_sep="""
+########################################
+#
+# TEMPLATETYPE 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(TEMPLATETYPE_t)
+libs_use_ld_so(TEMPLATETYPE_t)
+libs_use_shared_libs(TEMPLATETYPE_t)
+miscfiles_read_localization(TEMPLATETYPE_t)
+## internal communication is often done using fifo and unix sockets.
+allow TEMPLATETYPE_t self:fifo_file { read write };
+allow TEMPLATETYPE_t self:unix_stream_socket create_stream_socket_perms;
+"""
+te_pidfile2="""
+# pid file
+allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:file manage_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:sock_file manage_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_run_t, { file sock_file })
+"""
+te_logfile2="""
+# log files
+allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:file create_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:sock_file create_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_log_t:dir { rw_dir_perms setattr };
+logging_log_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_log_t,{ sock_file file dir })
+"""
+te_libfile2="""
+# var/lib files for TEMPLATETYPE
+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:file create_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:sock_file create_file_perms;
+allow TEMPLATETYPE_t TEMPLATETYPE_var_lib_t:dir create_dir_perms;
+files_var_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t,{ file dir sock_file })
+files_var_lib_filetrans(TEMPLATETYPE_t,TEMPLATETYPE_var_lib_t)
+"""
+te_network2="""
+## Networking basics (adjust to your needs!)
+sysnet_dns_name_resolve(TEMPLATETYPE_t)
+corenet_tcp_sendrecv_all_if(TEMPLATETYPE_t)
+corenet_tcp_sendrecv_all_nodes(TEMPLATETYPE_t)
+corenet_tcp_sendrecv_all_ports(TEMPLATETYPE_t)
+corenet_non_ipsec_sendrecv(TEMPLATETYPE_t)
+corenet_tcp_connect_http_port(TEMPLATETYPE_t)
+#corenet_tcp_connect_all_ports(TEMPLATETYPE_t)
+## if it is a network daemon, consider these:
+#corenet_tcp_bind_all_ports(TEMPLATETYPE_t)
+#corenet_tcp_bind_all_nodes(TEMPLATETYPE_t)
+allow TEMPLATETYPE_t self:tcp_socket { listen accept };
+"""
+te_initsc2="""
+# Init script handling
+init_use_fd(TEMPLATETYPE_t)
+init_use_script_ptys(TEMPLATETYPE_t)
+domain_use_interactive_fds(TEMPLATETYPE_t)
+"""
 
 ########################### File Context ##################################
-fc="\n\
-# TEMPLATETYPE executable will have:\n\
-# label: system_u:object_r:TEMPLATETYPE_exec_t\n\
-# MLS sensitivity: s0\n\
-# MCS categories: <none>\n\
-\n\
-EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)\n\
-"
+fc="""\
+# TEMPLATETYPE executable will have:
+# label: system_u:object_r:TEMPLATETYPE_exec_t
+# MLS sensitivity: s0
+# MCS categories: <none>
+
+EXECUTABLE		--	gen_context(system_u:object_r:TEMPLATETYPE_exec_t,s0)
+"""
+fc_pidfile="""\
+FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_run_t,s0)
+"""
+fc_logfile="""\
+FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_log_t,s0)
+"""
+fc_libfile="""\
+FILENAME			gen_context(system_u:object_r:TEMPLATETYPE_var_lib_t,s0)
+"""
 def errorExit(error):
 	sys.stderr.write("%s: " % sys.argv[0])
 	sys.stderr.write("%s\n" % error)
@@ -86,9 +162,26 @@
 	sys.exit(1)
 
 
-def write_te_file(module):
+def write_te_file(module, pidfile, logfile, libfile, network, initsc):
 	file="%s.te" % module
 	newte=re.sub("TEMPLATETYPE", module, te)
+	if pidfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile)
+	if logfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile)
+	if libfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile)
+	newte= newte + re.sub("TEMPLATETYPE", module, te_sep)
+	if pidfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_pidfile2)
+	if logfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_logfile2)
+	if libfile:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_libfile2)
+	if network:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_network2)
+	if initsc:
+		newte= newte + re.sub("TEMPLATETYPE", module, te_initsc2)
 	if os.path.exists(file):
 		errorExit("%s already exists" % file)
 	fd = open(file, 'w')
@@ -104,20 +197,29 @@
 	fd.write(newif)
 	fd.close()
 
-def write_fc_file(module, executable):
+def write_fc_file(module, executable, pidfile, logfile, libfile):
 	file="%s.fc" % module
-	newfc=re.sub("TEMPLATETYPE", module, fc)
-	newfc=re.sub("EXECUTABLE", executable, newfc)
+	temp=re.sub("TEMPLATETYPE", module, fc)
+	newfc=re.sub("EXECUTABLE", executable, temp)
+	if pidfile:
+		temp=re.sub("TEMPLATETYPE", module, fc_pidfile)
+		newfc=newfc + re.sub("FILENAME", pidfile, temp)
+	if logfile:
+		temp=re.sub("TEMPLATETYPE", module, fc_logfile)
+		newfc=newfc + re.sub("FILENAME", logfile, temp)
+	if libfile:
+		temp=re.sub("TEMPLATETYPE", module, fc_libfile)
+		newfc=newfc + re.sub("FILENAME", libfile, temp)
 	if os.path.exists(file):
 		errorExit("%s already exists" % file)
 	fd = open(file, 'w')
 	fd.write(newfc)
 	fd.close()
 
-def gen_policy(module, executable):
-	write_te_file(module)
+def gen_policy(module, executable, pidfile, logfile, libfile, initsc, network):
+	write_te_file(module, pidfile, logfile, libfile, initsc, network)
 	write_if_file(module)
-	write_fc_file(module, executable)
+	write_fc_file(module, executable, pidfile, logfile, libfile)
 	
 if __name__ == '__main__':
 	def usage(message = ""):
@@ -127,6 +229,69 @@
 	if len(sys.argv) != 3:
 		usage()
 
-	gen_policy(sys.argv[1], sys.argv[2])
+	print """\n
+This tool generate three files for policy development, A Type Enforcement (te)
+file, a File Context (fc), and a Interface File(if).  Most of the policy rules
+will be written in the te file.  Use the File Context file to associate file
+paths with security context.  Use the interface rules to allow other protected
+domains to interact with the newly defined domains.
+
+After generating these files use the /usr/share/selinux/devel/Makefile to
+compile your policy package.  Then use the semodule tool to load it.
+
+# /usr/share/selinux/devel/policygentool myapp /usr/bin/myapp
+# make -f /usr/share/selinux/devel/Makefile
+# semodule -l myapp.pp
+# restorecon -R -v /usr/bin/myapp "all files defined in myapp.fc"
+
+Now you can turn on permissive mode, start your application and avc messages
+will be generated.  You can use audit2allow to help translate the avc messages
+into policy.
+
+# setenforce 0
+# service myapp start
+# audit2allow -R -i /var/log/audit/audit.log
+
+Return to continue:"""
+        sys.stdin.readline().rstrip()
+
+	print 'If the module uses pidfiles, what is the pidfile called?'
+	pidfile = sys.stdin.readline().rstrip()
+	if pidfile == "":
+		pidfile = None
+	print 'If the module uses logfiles, where are they stored?'
+	logfile = sys.stdin.readline().rstrip()
+	if logfile == "":
+		logfile = None
+	print 'If the module has var/lib files, where are they stored?'
+	libfile = sys.stdin.readline().rstrip()
+	if libfile == "":
+		libfile = None
+	print 'Does the module have a init script? [yN]'
+	initsc = sys.stdin.readline().rstrip()
+	if initsc == "" or initsc == "n" or initsc == "N":
+		initsc = False
+	elif initsc == "y" or initsc == "Y":
+		initsc = True
+	else:
+		raise "Please answer with 'y' or 'n'!"
+	print 'Does the module use the network? [yN]'
+	network = sys.stdin.readline().rstrip()
+	if network == "" or network == "n" or network == "N":
+		network = False
+	elif network == "y" or network == "Y":
+		network = True
+	else:
+		raise "Please answer with 'y' or 'n'!"
+
+	gen_policy(
+		module=sys.argv[1],
+		executable=sys.argv[2],
+		pidfile=pidfile,
+		logfile=logfile,
+		libfile=libfile,
+		initsc=initsc,
+		network=network
+	)
 
 	


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- selinux-policy.spec	25 Feb 2006 20:50:53 -0000	1.131
+++ selinux-policy.spec	27 Feb 2006 23:00:40 -0000	1.132
@@ -9,8 +9,8 @@
 %define CHECKPOLICYVER 1.29.4-1
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.2.21
-Release: 9
+Version: 2.2.22
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,20 +293,24 @@
 %fileList strict
 
 %changelog
+* Mon Feb 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.22-1
+- Update to upstream
+- Merged my latest fixes
+- Fix cups policy to handle unix domain sockets
 
-* Sat Feb 26 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-9
+* Sat Feb 25 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-9
 - NSCD socket is in nscd_var_run_t needs to be able to search dir
 
-* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-8
+* Fri Feb 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-8
 - Fixes Apache interface file
 
-* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-7
+* Fri Feb 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-7
 - Fixes for new version of cups
 
-* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-6
+* Fri Feb 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-6
 - Turn off polyinstatiate util after FC5
 
-* Fri Feb 23 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
+* Fri Feb 24 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-5
 - Fix problem with privoxy talking to Tor
 
 * Thu Feb 22 2006 Dan Walsh <dwalsh at redhat.com> 2.2.21-4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	23 Feb 2006 15:12:37 -0000	1.49
+++ sources	27 Feb 2006 23:00:40 -0000	1.50
@@ -1 +1 @@
-fe84e844d9a838bd87d4e80f381141cb  serefpolicy-2.2.21.tgz
+298e1f669a1a0203eeffcc1a82b1a794  serefpolicy-2.2.22.tgz



From fedora-cvs-commits at redhat.com  Mon Feb 27 23:23:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 18:23:08 -0500
Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.30,
	1.31 selinux-policy.spec, 1.132, 1.133
Message-ID: <200602272323.k1RNN8FP009060@cvs.devel.redhat.com>

Author: dwalsh

Update of /cvs/dist/rpms/selinux-policy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9044

Modified Files:
	policy-20060207.patch selinux-policy.spec 
Log Message:
* Mon Feb 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.22-2
- Additional fixes for nvidia and cups


policy-20060207.patch:
 policy/modules/admin/readahead.te       |    2 +-
 policy/modules/admin/su.fc              |    1 +
 policy/modules/admin/su.if              |    6 +++---
 policy/modules/kernel/corenetwork.te.in |    2 +-
 policy/modules/kernel/devices.if        |    2 +-
 policy/modules/kernel/files.fc          |    2 +-
 policy/modules/kernel/files.if          |   20 ++++++++++++++++++--
 policy/modules/services/apache.fc       |    1 +
 policy/modules/services/apache.if       |    5 +++++
 policy/modules/services/cron.te         |    3 +++
 policy/modules/services/cups.fc         |    2 +-
 policy/modules/services/cups.te         |    6 ++++--
 policy/modules/services/ktalk.te        |    2 ++
 policy/modules/services/nscd.if         |    2 +-
 policy/modules/system/init.te           |    5 +++++
 policy/modules/system/libraries.fc      |    2 ++
 policy/modules/system/locallogin.te     |    1 +
 policy/modules/system/lvm.fc            |    1 +
 policy/modules/system/selinuxutil.fc    |    6 +++---
 policy/modules/system/selinuxutil.te    |    1 +
 policy/modules/system/udev.te           |    2 +-
 support/Makefile.devel                  |    5 +----
 22 files changed, 58 insertions(+), 21 deletions(-)

Index: policy-20060207.patch
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- policy-20060207.patch	27 Feb 2006 23:00:38 -0000	1.30
+++ policy-20060207.patch	27 Feb 2006 23:23:06 -0000	1.31
@@ -112,6 +112,17 @@
  ')
  
  ########################################
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.22/policy/modules/services/apache.fc
+--- nsaserefpolicy/policy/modules/services/apache.fc	2006-02-27 17:17:23.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/apache.fc	2006-02-27 17:46:08.000000000 -0500
+@@ -15,6 +15,7 @@
+ /etc/vhosts			--	gen_context(system_u:object_r:httpd_config_t,s0)
+ 
+ /srv/([^/]*/)?www(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
++/srv/gallery2(/.*)?			gen_context(system_u:object_r:httpd_sys_content_t,s0)
+ 
+ /usr/bin/htsslpass 		--	gen_context(system_u:object_r:httpd_helper_exec_t,s0)
+ 
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.22/policy/modules/services/apache.if
 --- nsaserefpolicy/policy/modules/services/apache.if	2006-02-27 17:17:23.000000000 -0500
 +++ serefpolicy-2.2.22/policy/modules/services/apache.if	2006-02-27 17:33:49.000000000 -0500
@@ -154,7 +165,7 @@
  /var/run/ptal-printd(/.*)?	gen_context(system_u:object_r:ptal_var_run_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.22/policy/modules/services/cups.te
 --- nsaserefpolicy/policy/modules/services/cups.te	2006-02-23 09:25:09.000000000 -0500
-+++ serefpolicy-2.2.22/policy/modules/services/cups.te	2006-02-27 17:35:43.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/services/cups.te	2006-02-27 18:19:19.000000000 -0500
 @@ -77,7 +77,7 @@
  dontaudit cupsd_t self:capability { sys_tty_config net_admin };
  allow cupsd_t self:process { setsched signal_perms };
@@ -180,6 +191,15 @@
  kernel_read_all_sysctls(cupsd_t)
  kernel_tcp_recvfrom(cupsd_t)
  
+@@ -649,7 +651,7 @@
+ ifdef(`targeted_policy',`
+ 	term_use_generic_ptys(cupsd_config_t)
+ 
+-	unconfined_read_pipes(cupsd_config_t)
++	unconfined_rw_pipes(cupsd_config_t)
+ ')
+ 
+ ########################################
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.22/policy/modules/services/ktalk.te
 --- nsaserefpolicy/policy/modules/services/ktalk.te	2006-02-21 14:40:24.000000000 -0500
 +++ serefpolicy-2.2.22/policy/modules/services/ktalk.te	2006-02-27 17:33:49.000000000 -0500
@@ -227,6 +247,25 @@
  ',`
  	# cjp: require doesnt work in optionals :\
  	# this also would result in a type transition
+diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.22/policy/modules/system/libraries.fc
+--- nsaserefpolicy/policy/modules/system/libraries.fc	2006-02-20 14:07:38.000000000 -0500
++++ serefpolicy-2.2.22/policy/modules/system/libraries.fc	2006-02-27 18:10:56.000000000 -0500
+@@ -65,6 +65,7 @@
+ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* --	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?/libGLU\.so(\.[^/]*)*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
++/usr/lib(64)?(/.*)?/nvidia_drv.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /usr/(local/)?lib/wine/.*\.so  		--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ /usr/(local/)?lib/libfame-.*\.so.*	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+@@ -74,6 +75,7 @@
+ /usr/X11R6/lib/libXvMCNVIDIA\.so.* 	--	gen_context(system_u:object_r:textrel_shlib_t,s0)
+ 
+ /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)
+ 
+ ifdef(`distro_redhat',`
+ /usr/lib(64)?/.*/program/.*\.so.*		gen_context(system_u:object_r:shlib_t,s0)
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.22/policy/modules/system/locallogin.te
 --- nsaserefpolicy/policy/modules/system/locallogin.te	2006-02-21 14:40:25.000000000 -0500
 +++ serefpolicy-2.2.22/policy/modules/system/locallogin.te	2006-02-27 17:33:49.000000000 -0500


Index: selinux-policy.spec
===================================================================
RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- selinux-policy.spec	27 Feb 2006 23:00:40 -0000	1.132
+++ selinux-policy.spec	27 Feb 2006 23:23:06 -0000	1.133
@@ -10,7 +10,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 2.2.22
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -293,6 +293,9 @@
 %fileList strict
 
 %changelog
+* Mon Feb 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.22-2
+- Additional fixes for nvidia and cups
+
 * Mon Feb 27 2006 Dan Walsh <dwalsh at redhat.com> 2.2.22-1
 - Update to upstream
 - Merged my latest fixes



From fedora-cvs-commits at redhat.com  Mon Feb 27 23:26:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 18:26:00 -0500
Subject: rpms/booty/devel .cvsignore, 1.38, 1.39 booty.spec, 1.42,
	1.43 sources, 1.41, 1.42
Message-ID: <200602272326.k1RNQ0u5017925@cvs.devel.redhat.com>

Author: pjones

Update of /cvs/dist/rpms/booty/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17895

Modified Files:
	.cvsignore booty.spec sources 
Log Message:
- update to 0.68-1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	7 Feb 2006 14:56:09 -0000	1.38
+++ .cvsignore	27 Feb 2006 23:25:57 -0000	1.39
@@ -1,2 +1 @@
-booty-0.66.tar.bz2
-booty-0.67.tar.bz2
+booty-0.68.tar.bz2


Index: booty.spec
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- booty.spec	11 Feb 2006 02:12:03 -0000	1.42
+++ booty.spec	27 Feb 2006 23:25:57 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: simple python bootloader config lib
 Name: booty
-Version: 0.67
-Release: 1.1
+Version: 0.68
+Release: 1
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
@@ -34,6 +34,10 @@
 
 
 %changelog
+* Mon Feb 27 2006 Peter Jones <pjones at redhat.com> - 0.68-1
+- sync between invocations of grub on smp
+- default to "mbr", not "partition" for grub installation on md
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.67-1.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/booty/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	7 Feb 2006 14:56:09 -0000	1.41
+++ sources	27 Feb 2006 23:25:57 -0000	1.42
@@ -1 +1 @@
-f85304d2a1d2f3a3a95c8a02a663ad8c  booty-0.67.tar.bz2
+0399f7351e71ced1e74a18c3c0d08dec  booty-0.68.tar.bz2



From fedora-cvs-commits at redhat.com  Mon Feb 27 23:28:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 18:28:41 -0500
Subject: rpms/binutils/devel binutils-2.16.91.0.6-mni.patch, NONE,
	1.1 binutils-2.16.91.0.6-pr26208.patch, NONE,
	1.1 binutils.spec, 1.75, 1.76
Message-ID: <200602272328.k1RNSfRV019178@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19103

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.16.91.0.6-mni.patch 
	binutils-2.16.91.0.6-pr26208.patch 
Log Message:
2.16.91.0.6-2


binutils-2.16.91.0.6-mni.patch:
 gas/config/tc-i386.c                  |   32 ++++++++---
 gas/config/tc-i386.h                  |    3 -
 gas/testsuite/gas/i386/i386.exp       |    2 
 gas/testsuite/gas/i386/merom.d        |   73 ++++++++++++++++++++++++++
 gas/testsuite/gas/i386/merom.s        |   70 +++++++++++++++++++++++++
 gas/testsuite/gas/i386/x86-64-merom.d |   73 ++++++++++++++++++++++++++
 gas/testsuite/gas/i386/x86-64-merom.s |   70 +++++++++++++++++++++++++
 include/opcode/i386.h                 |   35 ++++++++++++
 opcodes/i386-dis.c                    |   95 ++++++++++++++++++++++++++++++++--
 9 files changed, 438 insertions(+), 15 deletions(-)

--- NEW FILE binutils-2.16.91.0.6-mni.patch ---
2006-02-27  H.J. Lu <hongjiu.lu at intel.com>

gas/
	* config/tc-i386.c (output_insn): Support Intel Merom New
	Instructions.

	* config/tc-i386.h (CpuMNI): New.
	(CpuUnknownFlags): Add CpuMNI.
gas/testsuite/
	* gas/i386/i386.exp: Add merom and x86-64-merom.

	* gas/i386/merom.d: New file.
	* gas/i386/merom.s: Likewise.
	* gas/i386/x86-64-merom.d: Likewise.
	* gas/i386/x86-64-merom.s: Likewise.
include/
	* i386.h (i386_optab): Support Intel Merom New Instructions.
opcodes/
	* i386-dis.c (IS_3BYTE_OPCODE): New for 3-byte opcodes used by
	Intel Merom New Instructions.
	(THREE_BYTE_0): Likewise.
	(THREE_BYTE_1): Likewise.
	(three_byte_table): Likewise.
	(dis386_twobyte): Use THREE_BYTE_0 for entry 0x38. Use
	THREE_BYTE_1 for entry 0x3a.
	(twobyte_has_modrm): Updated.
	(twobyte_uses_SSE_prefix): Likewise.
	(print_insn): Handle 3-byte opcodes used by Intel Merom New
	Instructions.

--- gas/config/tc-i386.c	18 Jan 2006 21:07:49 -0000	1.206
+++ gas/config/tc-i386.c	27 Feb 2006 15:35:37 -0000	1.207
@@ -3474,23 +3474,31 @@ output_insn ()
       /* Output normal instructions here.  */
       char *p;
       unsigned char *q;
+      unsigned int prefix;
 
-      /* All opcodes on i386 have either 1 or 2 bytes.  We may use one
-	 more higher byte to specify a prefix the instruction
-	 requires.  */
-      if ((i.tm.base_opcode & 0xff0000) != 0)
+      /* All opcodes on i386 have either 1 or 2 bytes.  Merom New
+	 Instructions have 3 bytes.  We may use one more higher byte
+	 to specify a prefix the instruction requires.  */
+      if ((i.tm.cpu_flags & CpuMNI) != 0)
 	{
+	  if (i.tm.base_opcode & 0xff000000)
+	    {
+	      prefix = (i.tm.base_opcode >> 24) & 0xff;
+	      goto check_prefix;
+	    }
+	}
+      else if ((i.tm.base_opcode & 0xff0000) != 0)
+	{
+	  prefix = (i.tm.base_opcode >> 16) & 0xff;
 	  if ((i.tm.cpu_flags & CpuPadLock) != 0)
 	    {
-	      unsigned int prefix;
-	      prefix = (i.tm.base_opcode >> 16) & 0xff;
-
+check_prefix:
 	      if (prefix != REPE_PREFIX_OPCODE
 		  || i.prefix[LOCKREP_PREFIX] != REPE_PREFIX_OPCODE)
 		add_prefix (prefix);
 	    }
 	  else
-	    add_prefix ((i.tm.base_opcode >> 16) & 0xff);
+	    add_prefix (prefix);
 	}
 
       /* The prefix bytes.  */
@@ -3512,7 +3520,13 @@ output_insn ()
 	}
       else
 	{
-	  p = frag_more (2);
+	  if ((i.tm.cpu_flags & CpuMNI) != 0)
+	    {
+	      p = frag_more (3);
+	      *p++ = (i.tm.base_opcode >> 16) & 0xff;
+	    }
+	  else
+	    p = frag_more (2);
 
 	  /* Put out high byte first: can't use md_number_to_chars!  */
 	  *p++ = (i.tm.base_opcode >> 8) & 0xff;
--- gas/config/tc-i386.h	7 Nov 2005 06:01:18 -0000	1.65
+++ gas/config/tc-i386.h	27 Feb 2006 15:35:37 -0000	1.66
@@ -184,6 +184,7 @@ typedef struct
 #define CpuPadLock    0x40000	/* VIA PadLock required */
 #define CpuSVME	      0x80000	/* AMD Secure Virtual Machine Ext-s required */
 #define CpuVMX	     0x100000	/* VMX Instructions required */
+#define CpuMNI	     0x200000	/* Merom New Instructions required */
 
   /* These flags are set by gas depending on the flag_code.  */
 #define Cpu64	     0x4000000   /* 64bit support required  */
@@ -192,7 +193,7 @@ typedef struct
   /* The default value for unknown CPUs - enable all features to avoid problems.  */
 #define CpuUnknownFlags (Cpu086|Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \
 	|CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuPNI|CpuVMX \
-	|Cpu3dnow|Cpu3dnowA|CpuK6|CpuAthlon|CpuPadLock|CpuSVME)
+	|Cpu3dnow|Cpu3dnowA|CpuK6|CpuAthlon|CpuPadLock|CpuSVME|CpuMNI)
 
   /* the bits in opcode_modifier are used to generate the final opcode from
      the base_opcode.  These bits also are used to detect alternate forms of
--- gas/testsuite/gas/i386/i386.exp	11 Feb 2006 18:08:35 -0000	1.48
+++ gas/testsuite/gas/i386/i386.exp	27 Feb 2006 15:35:37 -0000	1.49
@@ -68,6 +68,7 @@ if [expr ([istarget "i*86-*-*"] ||  [ist
     run_dump_test "crx"
     run_list_test "cr-err" ""
     run_dump_test "svme"
+    run_dump_test "merom"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
@@ -136,6 +137,7 @@ if [expr ([istarget "i*86-*-*"] || [ista
     run_dump_test "x86-64-crx-suffix"
     run_dump_test "x86-64-drx"
     run_dump_test "x86-64-drx-suffix"
+    run_dump_test "x86-64-merom"
 
     if { ![istarget "*-*-aix*"]
       && ![istarget "*-*-beos*"]
--- gas/testsuite/gas/i386/merom.d	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/merom.d	27 Feb 2006 15:35:37 -0000	1.1
@@ -0,0 +1,73 @@
+#objdump: -dw
+#name: i386 merom
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	0f 38 01 01[ 	]+phaddw \(%ecx\),%mm0
+   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
+   8:	66 0f 38 01 01[ 	]+phaddw \(%ecx\),%xmm0
+   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
+  12:	0f 38 02 01[ 	]+phaddd \(%ecx\),%mm0
+  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
+  1a:	66 0f 38 02 01[ 	]+phaddd \(%ecx\),%xmm0
+  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
+  24:	0f 38 03 01[ 	]+phaddsw \(%ecx\),%mm0
+  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
+  2c:	66 0f 38 03 01[ 	]+phaddsw \(%ecx\),%xmm0
+  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
+  36:	0f 38 05 01[ 	]+phsubw \(%ecx\),%mm0
+  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
+  3e:	66 0f 38 05 01[ 	]+phsubw \(%ecx\),%xmm0
+  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
+  48:	0f 38 06 01[ 	]+phsubd \(%ecx\),%mm0
+  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
+  50:	66 0f 38 06 01[ 	]+phsubd \(%ecx\),%xmm0
+  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
+  5a:	0f 38 07 01[ 	]+phsubsw \(%ecx\),%mm0
+  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
+  62:	66 0f 38 07 01[ 	]+phsubsw \(%ecx\),%xmm0
+  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
+  6c:	0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%mm0
+  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
+  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%ecx\),%xmm0
+  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
+  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%mm0
+  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
+  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%ecx\),%xmm0
+  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
+  90:	0f 38 00 01[ 	]+pshufb \(%ecx\),%mm0
+  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
+  98:	66 0f 38 00 01[ 	]+pshufb \(%ecx\),%xmm0
+  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
+  a2:	0f 38 08 01[ 	]+psignb \(%ecx\),%mm0
+  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
+  aa:	66 0f 38 08 01[ 	]+psignb \(%ecx\),%xmm0
+  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
+  b4:	0f 38 09 01[ 	]+psignw \(%ecx\),%mm0
+  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
+  bc:	66 0f 38 09 01[ 	]+psignw \(%ecx\),%xmm0
+  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
+  c6:	0f 38 0a 01[ 	]+psignd \(%ecx\),%mm0
+  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
+  ce:	66 0f 38 0a 01[ 	]+psignd \(%ecx\),%xmm0
+  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
+  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%mm0
+  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
+  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%ecx\),%xmm0
+  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
+  ee:	0f 38 1c 01[ 	]+pabsb  \(%ecx\),%mm0
+  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
+  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%ecx\),%xmm0
+  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
+ 100:	0f 38 1d 01[ 	]+pabsw  \(%ecx\),%mm0
+ 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
+ 108:	66 0f 38 1d 01[ 	]+pabsw  \(%ecx\),%xmm0
+ 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
+ 112:	0f 38 1e 01[ 	]+pabsd  \(%ecx\),%mm0
+ 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
+ 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%ecx\),%xmm0
+ 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
+	...
--- gas/testsuite/gas/i386/merom.s	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/merom.s	27 Feb 2006 15:35:37 -0000	1.1
@@ -0,0 +1,70 @@
+#Merom New Instructions
+
+	.text
+foo:
+	phaddw		(%ecx),%mm0
+	phaddw		%mm1,%mm0
+	phaddw		(%ecx),%xmm0
+	phaddw		%xmm1,%xmm0
+	phaddd		(%ecx),%mm0
+	phaddd		%mm1,%mm0
+	phaddd		(%ecx),%xmm0
+	phaddd		%xmm1,%xmm0
+	phaddsw		(%ecx),%mm0
+	phaddsw		%mm1,%mm0
+	phaddsw		(%ecx),%xmm0
+	phaddsw		%xmm1,%xmm0
+	phsubw		(%ecx),%mm0
+	phsubw		%mm1,%mm0
+	phsubw		(%ecx),%xmm0
+	phsubw		%xmm1,%xmm0
+	phsubd		(%ecx),%mm0
+	phsubd		%mm1,%mm0
+	phsubd		(%ecx),%xmm0
+	phsubd		%xmm1,%xmm0
+	phsubsw		(%ecx),%mm0
+	phsubsw		%mm1,%mm0
+	phsubsw		(%ecx),%xmm0
+	phsubsw		%xmm1,%xmm0
+	pmaddubsw	(%ecx),%mm0
+	pmaddubsw	%mm1,%mm0
+	pmaddubsw	(%ecx),%xmm0
+	pmaddubsw	%xmm1,%xmm0
+	pmulhrsw	(%ecx),%mm0
+	pmulhrsw	%mm1,%mm0
+	pmulhrsw	(%ecx),%xmm0
+	pmulhrsw	%xmm1,%xmm0
+	pshufb		(%ecx),%mm0
+	pshufb		%mm1,%mm0
+	pshufb		(%ecx),%xmm0
+	pshufb		%xmm1,%xmm0
+	psignb		(%ecx),%mm0
+	psignb		%mm1,%mm0
+	psignb		(%ecx),%xmm0
+	psignb		%xmm1,%xmm0
+	psignw		(%ecx),%mm0
+	psignw		%mm1,%mm0
+	psignw		(%ecx),%xmm0
+	psignw		%xmm1,%xmm0
+	psignd		(%ecx),%mm0
+	psignd		%mm1,%mm0
+	psignd		(%ecx),%xmm0
+	psignd		%xmm1,%xmm0
+	palignr		$0x2,(%ecx),%mm0
+	palignr		$0x2,%mm1,%mm0
+	palignr		$0x2,(%ecx),%xmm0
+	palignr		$0x2,%xmm1,%xmm0
+	pabsb		(%ecx),%mm0
+	pabsb		%mm1,%mm0
+	pabsb		(%ecx),%xmm0
+	pabsb		%xmm1,%xmm0
+	pabsw		(%ecx),%mm0
+	pabsw		%mm1,%mm0
+	pabsw		(%ecx),%xmm0
+	pabsw		%xmm1,%xmm0
+	pabsd		(%ecx),%mm0
+	pabsd		%mm1,%mm0
+	pabsd		(%ecx),%xmm0
+	pabsd		%xmm1,%xmm0
+
+	.p2align	4,0
--- gas/testsuite/gas/i386/x86-64-merom.d	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/x86-64-merom.d	27 Feb 2006 15:35:37 -0000	1.1
@@ -0,0 +1,73 @@
+#objdump: -dw
+#name: x86-64 merom
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+0+000 <foo>:
+   0:	0f 38 01 01[ 	]+phaddw \(%rcx\),%mm0
+   4:	0f 38 01 c1[ 	]+phaddw %mm1,%mm0
+   8:	66 0f 38 01 01[ 	]+phaddw \(%rcx\),%xmm0
+   d:	66 0f 38 01 c1[ 	]+phaddw %xmm1,%xmm0
+  12:	0f 38 02 01[ 	]+phaddd \(%rcx\),%mm0
+  16:	0f 38 02 c1[ 	]+phaddd %mm1,%mm0
+  1a:	66 0f 38 02 01[ 	]+phaddd \(%rcx\),%xmm0
+  1f:	66 0f 38 02 c1[ 	]+phaddd %xmm1,%xmm0
+  24:	0f 38 03 01[ 	]+phaddsw \(%rcx\),%mm0
+  28:	0f 38 03 c1[ 	]+phaddsw %mm1,%mm0
+  2c:	66 0f 38 03 01[ 	]+phaddsw \(%rcx\),%xmm0
+  31:	66 0f 38 03 c1[ 	]+phaddsw %xmm1,%xmm0
+  36:	0f 38 05 01[ 	]+phsubw \(%rcx\),%mm0
+  3a:	0f 38 05 c1[ 	]+phsubw %mm1,%mm0
+  3e:	66 0f 38 05 01[ 	]+phsubw \(%rcx\),%xmm0
+  43:	66 0f 38 05 c1[ 	]+phsubw %xmm1,%xmm0
+  48:	0f 38 06 01[ 	]+phsubd \(%rcx\),%mm0
+  4c:	0f 38 06 c1[ 	]+phsubd %mm1,%mm0
+  50:	66 0f 38 06 01[ 	]+phsubd \(%rcx\),%xmm0
+  55:	66 0f 38 06 c1[ 	]+phsubd %xmm1,%xmm0
+  5a:	0f 38 07 01[ 	]+phsubsw \(%rcx\),%mm0
+  5e:	0f 38 07 c1[ 	]+phsubsw %mm1,%mm0
+  62:	66 0f 38 07 01[ 	]+phsubsw \(%rcx\),%xmm0
+  67:	66 0f 38 07 c1[ 	]+phsubsw %xmm1,%xmm0
+  6c:	0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%mm0
+  70:	0f 38 04 c1[ 	]+pmaddubsw %mm1,%mm0
+  74:	66 0f 38 04 01[ 	]+pmaddubsw \(%rcx\),%xmm0
+  79:	66 0f 38 04 c1[ 	]+pmaddubsw %xmm1,%xmm0
+  7e:	0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%mm0
+  82:	0f 38 0b c1[ 	]+pmulhrsw %mm1,%mm0
+  86:	66 0f 38 0b 01[ 	]+pmulhrsw \(%rcx\),%xmm0
+  8b:	66 0f 38 0b c1[ 	]+pmulhrsw %xmm1,%xmm0
+  90:	0f 38 00 01[ 	]+pshufb \(%rcx\),%mm0
+  94:	0f 38 00 c1[ 	]+pshufb %mm1,%mm0
+  98:	66 0f 38 00 01[ 	]+pshufb \(%rcx\),%xmm0
+  9d:	66 0f 38 00 c1[ 	]+pshufb %xmm1,%xmm0
+  a2:	0f 38 08 01[ 	]+psignb \(%rcx\),%mm0
+  a6:	0f 38 08 c1[ 	]+psignb %mm1,%mm0
+  aa:	66 0f 38 08 01[ 	]+psignb \(%rcx\),%xmm0
+  af:	66 0f 38 08 c1[ 	]+psignb %xmm1,%xmm0
+  b4:	0f 38 09 01[ 	]+psignw \(%rcx\),%mm0
+  b8:	0f 38 09 c1[ 	]+psignw %mm1,%mm0
+  bc:	66 0f 38 09 01[ 	]+psignw \(%rcx\),%xmm0
+  c1:	66 0f 38 09 c1[ 	]+psignw %xmm1,%xmm0
+  c6:	0f 38 0a 01[ 	]+psignd \(%rcx\),%mm0
+  ca:	0f 38 0a c1[ 	]+psignd %mm1,%mm0
+  ce:	66 0f 38 0a 01[ 	]+psignd \(%rcx\),%xmm0
+  d3:	66 0f 38 0a c1[ 	]+psignd %xmm1,%xmm0
+  d8:	0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%mm0
+  dd:	0f 3a 0f c1 02[ 	]+palignr \$0x2,%mm1,%mm0
+  e2:	66 0f 3a 0f 01 02[ 	]+palignr \$0x2,\(%rcx\),%xmm0
+  e8:	66 0f 3a 0f c1 02[ 	]+palignr \$0x2,%xmm1,%xmm0
+  ee:	0f 38 1c 01[ 	]+pabsb  \(%rcx\),%mm0
+  f2:	0f 38 1c c1[ 	]+pabsb  %mm1,%mm0
+  f6:	66 0f 38 1c 01[ 	]+pabsb  \(%rcx\),%xmm0
+  fb:	66 0f 38 1c c1[ 	]+pabsb  %xmm1,%xmm0
+ 100:	0f 38 1d 01[ 	]+pabsw  \(%rcx\),%mm0
+ 104:	0f 38 1d c1[ 	]+pabsw  %mm1,%mm0
+ 108:	66 0f 38 1d 01[ 	]+pabsw  \(%rcx\),%xmm0
+ 10d:	66 0f 38 1d c1[ 	]+pabsw  %xmm1,%xmm0
+ 112:	0f 38 1e 01[ 	]+pabsd  \(%rcx\),%mm0
+ 116:	0f 38 1e c1[ 	]+pabsd  %mm1,%mm0
+ 11a:	66 0f 38 1e 01[ 	]+pabsd  \(%rcx\),%xmm0
+ 11f:	66 0f 38 1e c1[ 	]+pabsd  %xmm1,%xmm0
+	...
--- gas/testsuite/gas/i386/x86-64-merom.s	1 Jan 1970 00:00:00 -0000
+++ gas/testsuite/gas/i386/x86-64-merom.s	27 Feb 2006 15:35:37 -0000	1.1
@@ -0,0 +1,70 @@
+#Merom New Instructions
+
+	.text
+foo:
+	phaddw		(%rcx),%mm0
+	phaddw		%mm1,%mm0
+	phaddw		(%rcx),%xmm0
+	phaddw		%xmm1,%xmm0
+	phaddd		(%rcx),%mm0
+	phaddd		%mm1,%mm0
+	phaddd		(%rcx),%xmm0
+	phaddd		%xmm1,%xmm0
+	phaddsw		(%rcx),%mm0
+	phaddsw		%mm1,%mm0
+	phaddsw		(%rcx),%xmm0
+	phaddsw		%xmm1,%xmm0
+	phsubw		(%rcx),%mm0
+	phsubw		%mm1,%mm0
+	phsubw		(%rcx),%xmm0
+	phsubw		%xmm1,%xmm0
+	phsubd		(%rcx),%mm0
+	phsubd		%mm1,%mm0
+	phsubd		(%rcx),%xmm0
+	phsubd		%xmm1,%xmm0
+	phsubsw		(%rcx),%mm0
+	phsubsw		%mm1,%mm0
+	phsubsw		(%rcx),%xmm0
+	phsubsw		%xmm1,%xmm0
+	pmaddubsw	(%rcx),%mm0
+	pmaddubsw	%mm1,%mm0
+	pmaddubsw	(%rcx),%xmm0
+	pmaddubsw	%xmm1,%xmm0
+	pmulhrsw	(%rcx),%mm0
+	pmulhrsw	%mm1,%mm0
+	pmulhrsw	(%rcx),%xmm0
+	pmulhrsw	%xmm1,%xmm0
+	pshufb		(%rcx),%mm0
+	pshufb		%mm1,%mm0
+	pshufb		(%rcx),%xmm0
+	pshufb		%xmm1,%xmm0
+	psignb		(%rcx),%mm0
+	psignb		%mm1,%mm0
+	psignb		(%rcx),%xmm0
+	psignb		%xmm1,%xmm0
+	psignw		(%rcx),%mm0
+	psignw		%mm1,%mm0
+	psignw		(%rcx),%xmm0
+	psignw		%xmm1,%xmm0
+	psignd		(%rcx),%mm0
+	psignd		%mm1,%mm0
+	psignd		(%rcx),%xmm0
+	psignd		%xmm1,%xmm0
+	palignr		$0x2,(%rcx),%mm0
+	palignr		$0x2,%mm1,%mm0
+	palignr		$0x2,(%rcx),%xmm0
+	palignr		$0x2,%xmm1,%xmm0
+	pabsb		(%rcx),%mm0
+	pabsb		%mm1,%mm0
+	pabsb		(%rcx),%xmm0
+	pabsb		%xmm1,%xmm0
+	pabsw		(%rcx),%mm0
+	pabsw		%mm1,%mm0
+	pabsw		(%rcx),%xmm0
+	pabsw		%xmm1,%xmm0
+	pabsd		(%rcx),%mm0
+	pabsd		%mm1,%mm0
+	pabsd		(%rcx),%xmm0
+	pabsd		%xmm1,%xmm0
+
+	.p2align	4,0
--- include/opcode/i386.h	6 Dec 2005 12:40:57 -0000	1.65
+++ include/opcode/i386.h	27 Feb 2006 15:35:37 -0000	1.66
@@ -1379,6 +1379,41 @@ static const template i386_optab[] =
 {"vmxoff",    0, 0x0f01, 0xc4, CpuVMX, NoSuf|ImmExt,	{ 0, 0, 0} },
 {"vmxon",     1, 0xf30fc7,  6, CpuVMX, NoSuf|IgnoreSize|Modrm|NoRex64,	{ LLongMem, 0, 0} },
 
+/* Merom New Instructions.  */
+
+{"phaddw",    2,   0x0f3801,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phaddw",    2, 0x660f3801,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"phaddd",    2,   0x0f3802,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phaddd",    2, 0x660f3802,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"phaddsw",   2,   0x0f3803,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phaddsw",   2, 0x660f3803,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"phsubw",    2,   0x0f3805,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phsubw",    2, 0x660f3805,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"phsubd",    2,   0x0f3806,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phsubd",    2, 0x660f3806,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"phsubsw",   2,   0x0f3807,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"phsubsw",   2, 0x660f3807,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"pmaddubsw", 2,   0x0f3804,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pmaddubsw", 2, 0x660f3804,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"pmulhrsw", 2,    0x0f380b,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pmulhrsw", 2,  0x660f380b,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"pshufb",   2,    0x0f3800,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pshufb",   2,  0x660f3800,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"psignb",   2,    0x0f3808,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"psignb",   2,  0x660f3808,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"psignw",   2,    0x0f3809,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"psignw",   2,  0x660f3809,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"psignd",   2,    0x0f380a,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"psignd",   2,  0x660f380a,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"palignr",  3,    0x0f3a0f,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ Imm8, RegMMX|LongMem, RegMMX } },
+{"palignr",  3,  0x660f3a0f,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ Imm8, RegXMM|LLongMem, RegXMM } },
+{"pabsb",    2,    0x0f381c,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pabsb",    2,  0x660f381c,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"pabsw",    2,    0x0f381d,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pabsw",    2,  0x660f381d,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+{"pabsd",    2,    0x0f381e,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegMMX|LongMem, RegMMX, 0 } },
+{"pabsd",    2,  0x660f381e,X, CpuMNI, NoSuf|IgnoreSize|Modrm,	{ RegXMM|LLongMem, RegXMM, 0 } },
+
 /* AMD 3DNow! instructions.  */
 
 {"prefetch", 1, 0x0f0d,	   0, Cpu3dnow, NoSuf|IgnoreSize|Modrm,	{ ByteMem, 0, 0 } },
--- opcodes/i386-dis.c	11 Feb 2006 18:08:34 -0000	1.75
+++ opcodes/i386-dis.c	27 Feb 2006 15:35:37 -0000	1.76
@@ -388,6 +388,7 @@ fetch_data (struct disassemble_info *inf
 #define USE_GROUPS 2
 #define USE_PREFIX_USER_TABLE 3
 #define X86_64_SPECIAL 4
+#define IS_3BYTE_OPCODE 5
 
 #define FLOAT	  NULL, NULL, FLOATCODE, NULL, 0, NULL, 0
 
@@ -453,6 +454,9 @@ fetch_data (struct disassemble_info *inf
 
 #define X86_64_0  NULL, NULL, X86_64_SPECIAL, NULL,  0, NULL, 0
 
+#define THREE_BYTE_0 NULL, NULL, IS_3BYTE_OPCODE, NULL, 0, NULL, 0
+#define THREE_BYTE_1 NULL, NULL, IS_3BYTE_OPCODE, NULL, 1, NULL, 0
+
 typedef void (*op_rtn) (int bytemode, int sizeflag);
 
 struct dis386 {
@@ -858,9 +862,9 @@ static const struct dis386 dis386_twobyt
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   /* 38 */
+  { THREE_BYTE_0 },
   { "(bad)",		XX, XX, XX },
-  { "(bad)",		XX, XX, XX },
-  { "(bad)",		XX, XX, XX },
+  { THREE_BYTE_1 },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
   { "(bad)",		XX, XX, XX },
@@ -1113,7 +1117,7 @@ static const unsigned char twobyte_has_m
   /* 00 */ 1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,1, /* 0f */
   /* 10 */ 1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0, /* 1f */
   /* 20 */ 1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1, /* 2f */
-  /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */
+  /* 30 */ 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 3f */
   /* 40 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 4f */
   /* 50 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 5f */
   /* 60 */ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* 6f */
@@ -1136,7 +1140,7 @@ static const unsigned char twobyte_uses_
   /* 00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0f */
   /* 10 */ 1,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0, /* 1f */
   /* 20 */ 0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0, /* 2f */
-  /* 30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 3f */
+  /* 30 */ 0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0, /* 3f */
   /* 40 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 4f */
   /* 50 */ 0,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1, /* 5f */
   /* 60 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1, /* 6f */
@@ -1749,6 +1753,79 @@ static const struct dis386 x86_64_table[
   },
 };
 
+static const struct dis386 three_byte_table[][32] = {
+  /* THREE_BYTE_0 */
+  {
+    { "pshufb",		MX, EM, XX },
+    { "phaddw",		MX, EM, XX },
+    { "phaddd",		MX, EM, XX },
+    { "phaddsw",	MX, EM, XX },
+    { "pmaddubsw",	MX, EM, XX },
+    { "phsubw",		MX, EM, XX },
+    { "phsubd",		MX, EM, XX },
+    { "phsubsw",	MX, EM, XX },
+    { "psignb",		MX, EM, XX },
+    { "psignw",		MX, EM, XX },
+    { "psignd",		MX, EM, XX },
+    { "pmulhrsw",	MX, EM, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "pabsb",		MX, EM, XX },
+    { "pabsw",		MX, EM, XX },
+    { "pabsd",		MX, EM, XX },
+    { "(bad)",		XX, XX, XX }
+  },
+  /* THREE_BYTE_1 */
+  {
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "palignr",	MX, EM, Ib },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX },
+    { "(bad)",		XX, XX, XX }
+  },
+};
+
 #define INTERNAL_DISASSEMBLER_ERROR _("<internal disassembler error>")
 
 static void
@@ -2206,7 +2283,15 @@ print_insn (bfd_vma pc, disassemble_info
 	}
     }
 
-  if (need_modrm)
+  if (dp->name == NULL && dp->bytemode1 == IS_3BYTE_OPCODE)
+    {
+      FETCH_DATA (info, codep + 2);
+      dp = &three_byte_table[dp->bytemode2][*codep++];
+      mod = (*codep >> 6) & 3;
+      reg = (*codep >> 3) & 7;
+      rm = *codep & 7;
+    }
+  else if (need_modrm)
     {
       FETCH_DATA (info, codep + 1);
       mod = (*codep >> 6) & 3;

binutils-2.16.91.0.6-pr26208.patch:
 bfd/elf-eh-frame.c |    6 +++++-
 gas/doc/as.texinfo |    3 +++
 gas/dw2gencfi.c    |   16 ++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE binutils-2.16.91.0.6-pr26208.patch ---
2006-02-27  Jakub Jelinek  <jakub at redhat.com>

bfd/
	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Handle S flag.
	(_bfd_elf_write_section_eh_frame): Likewise.
gas/
	* dw2gencfi.c (struct fde_entry, struct cie_entry): Add signal_frame
	field.
	(CFI_signal_frame): Define.
	(cfi_pseudo_table): Add .cfi_signal_frame.
	(dot_cfi): Handle CFI_signal_frame.
	(output_cie): Handle cie->signal_frame.
	(select_cie_for_fde): Don't share CIE if signal_frame flag is
	different.  Copy signal_frame from FDE to newly created CIE.
	* doc/as.texinfo: Document .cfi_signal_frame.

--- gas/dw2gencfi.c.jj	2005-12-14 13:50:34.000000000 +0100
+++ gas/dw2gencfi.c	2006-02-24 18:59:30.000000000 +0100
@@ -1,5 +1,5 @@
 /* dw2gencfi.c - Support for generating Dwarf2 CFI information.
-   Copyright 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Michal Ludvig <mludvig at suse.cz>
 
    This file is part of GAS, the GNU Assembler.
@@ -88,6 +88,7 @@ struct fde_entry
   struct cfi_insn_data *data;
   struct cfi_insn_data **last;
   unsigned int return_column;
+  unsigned int signal_frame;
 };
 
 struct cie_entry
@@ -95,6 +96,7 @@ struct cie_entry
   struct cie_entry *next;
   symbolS *start_address;
   unsigned int return_column;
+  unsigned int signal_frame;
   struct cfi_insn_data *first, *last;
 };
 
@@ -354,6 +356,7 @@ static void dot_cfi_endproc (int);
 #define CFI_return_column	0x101
 #define CFI_rel_offset		0x102
 #define CFI_escape		0x103
+#define CFI_signal_frame	0x104
 
 const pseudo_typeS cfi_pseudo_table[] =
   {
@@ -374,6 +377,7 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_restore_state", dot_cfi, DW_CFA_restore_state },
     { "cfi_window_save", dot_cfi, DW_CFA_GNU_window_save },
     { "cfi_escape", dot_cfi_escape, 0 },
+    { "cfi_signal_frame", dot_cfi, CFI_signal_frame },
     { NULL, NULL, 0 }
   };
 
@@ -547,6 +551,10 @@ dot_cfi (int arg)
       cfi_add_CFA_insn (DW_CFA_GNU_window_save);
       break;
 
+    case CFI_signal_frame:
+      cur_fde_data->signal_frame = 1;
+      break;
+
     default:
       abort ();
     }
@@ -864,6 +872,8 @@ output_cie (struct cie_entry *cie)
   out_one (DW_CIE_VERSION);			/* Version.  */
   out_one ('z');				/* Augmentation.  */
   out_one ('R');
+  if (cie->signal_frame)
+    out_one ('S');
   out_one (0);
   out_uleb128 (DWARF2_LINE_MIN_INSN_LENGTH);	/* Code alignment.  */
   out_sleb128 (DWARF2_CIE_DATA_ALIGNMENT);	/* Data alignment.  */
@@ -944,7 +954,8 @@ select_cie_for_fde (struct fde_entry *fd
 
   for (cie = cie_root; cie; cie = cie->next)
     {
-      if (cie->return_column != fde->return_column)
+      if (cie->return_column != fde->return_column
+	  || cie->signal_frame != fde->signal_frame)
 	continue;
       for (i = cie->first, j = fde->data;
 	   i != cie->last && j != NULL;
@@ -1017,6 +1028,7 @@ select_cie_for_fde (struct fde_entry *fd
   cie->next = cie_root;
   cie_root = cie;
   cie->return_column = fde->return_column;
+  cie->signal_frame = fde->signal_frame;
   cie->first = fde->data;
 
   for (i = cie->first; i ; i = i->next)
--- gas/doc/as.texinfo.jj	2005-12-14 13:50:35.000000000 +0100
+++ gas/doc/as.texinfo	2006-02-24 19:04:58.000000000 +0100
@@ -4102,6 +4102,9 @@ using the known displacement of the CFA 
 This is often easier to use, because the number will match the
 code it's annotating.
 
+ at section @code{.cfi_signal_frame}
+Mark current function as signal trampoline.
+
 @section @code{.cfi_window_save}
 SPARC register window has been saved.
 
--- bfd/elf-eh-frame.c.jj	2005-05-13 23:44:07.000000000 +0200
+++ bfd/elf-eh-frame.c	2006-02-21 11:34:50.000000000 +0100
@@ -1,5 +1,5 @@
 /* .eh_frame section optimization.
-   Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    Written by Jakub Jelinek <jakub at redhat.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -613,6 +613,8 @@ _bfd_elf_discard_section_eh_frame
 		    ENSURE_NO_RELOCS (buf);
 		    REQUIRE (get_DW_EH_PE_width (cie.fde_encoding, ptr_size));
 		    break;
+		  case 'S':
+		    break;
 		  case 'P':
 		    {
 		      int per_width;
@@ -1178,6 +1180,8 @@ _bfd_elf_write_section_eh_frame (bfd *ab
 		      }
 		    buf++;
 		    break;
+		  case 'S':
+		    break;
 		  default:
 		    BFD_FAIL ();
 		  }


Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- binutils.spec	14 Feb 2006 09:24:23 -0000	1.75
+++ binutils.spec	27 Feb 2006 23:28:39 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: A GNU collection of binary utilities.
 Name: binutils
 Version: 2.16.91.0.6
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -13,6 +13,8 @@
 Patch5: binutils-2.16.91.0.6-elfvsb-test.patch
 Patch6: binutils-2.16.91.0.6-standards.patch
 Patch7: binutils-2.16.91.0.6-build-fixes.patch
+Patch8: binutils-2.16.91.0.6-pr26208.patch
+Patch9: binutils-2.16.91.0.6-mni.patch
 
 Buildroot: %{_tmppath}/binutils-root
 BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison
@@ -49,6 +51,8 @@
 %patch5 -p0 -b .elfvsb-test~
 %patch6 -p0 -b .standards~
 %patch7 -p0 -b .build-fixes~
+%patch8 -p0 -b .pr26208~
+%patch9 -p0 -b .mni~
 # libtool sucks
 perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in}
 # LTP sucks
@@ -159,6 +163,11 @@
 %{_infodir}/*info*
 
 %changelog
+* Tue Feb 28 2006 Jakub Jelinek <jakub at redhat.com> 2.16.91.0.6-2
+- add MNI support on i?86/x86_64 (#183080)
+- support S signal frame augmentation flag in .eh_frame,
+  add .cfi_signal_frame support (#175951, PR other/26208, BZ#300)
+
 * Tue Feb 14 2006 Jakub Jelinek <jakub at redhat.com> 2.16.91.0.6-1
 - update to 2.16.91.0.6
   - fix ppc64 --gc-sections



From fedora-cvs-commits at redhat.com  Tue Feb 28 01:51:38 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 20:51:38 -0500
Subject: rpms/NetworkManager/devel NetworkManager.spec,1.92,1.93
Message-ID: <200602280151.k1S1pcM6027064@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27017

Modified Files:
	NetworkManager.spec 
Log Message:
* Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-16.cvs20060227
- Don't prune networks until they've gone MIA for three scans, not one.



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- NetworkManager.spec	27 Feb 2006 21:00:10 -0000	1.92
+++ NetworkManager.spec	28 Feb 2006 01:51:36 -0000	1.93
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 15%{?nm_cvs_version}
+Release: 16%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -23,6 +23,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch0: special-case-madwifi.patch
+Patch1: three-scan-prune.patch
 
 PreReq:   chkconfig
 Requires: wireless-tools >= %{wireless_tools_version}
@@ -117,6 +118,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .madwifi
+%patch1 -p0 -b .three-scan-prune
 
 %build
 %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes
@@ -214,6 +216,9 @@
 
 
 %changelog
+* Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-16.cvs20060227
+- Don't prune networks until they've gone MIA for three scans, not one.
+
 * Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-15.cvs20060227
 - Update snapshot, which fixes up the libnotify stuff.
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 01:51:48 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 20:51:48 -0500
Subject: rpms/NetworkManager/devel three-scan-prune.patch,NONE,1.1
Message-ID: <200602280151.k1S1pm07027160@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27119

Added Files:
	three-scan-prune.patch 
Log Message:
* Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-16.cvs20060227
- Don't prune networks until they've gone MIA for three scans, not one.


three-scan-prune.patch:
 nm-device-802-11-wireless.c |   50 +++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 19 deletions(-)

--- NEW FILE three-scan-prune.patch ---
Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -d -u -p -r1.51 -r1.52
--- src/nm-device-802-11-wireless.c	15 Feb 2006 21:46:42 -0000	1.51
+++ src/nm-device-802-11-wireless.c	28 Feb 2006 00:07:51 -0000	1.52
@@ -128,6 +128,29 @@ static void		nm_device_802_11_wireless_s
                                            const char *key,
                                            int auth_method);
 
+static guint nm_wireless_scan_interval_to_seconds (NMWirelessScanInterval interval)
+{
+	guint seconds;
+
+	switch (interval)
+	{
+		case NM_WIRELESS_SCAN_INTERVAL_INIT:
+			seconds = 15;
+			break;
+
+		case NM_WIRELESS_SCAN_INTERVAL_INACTIVE:
+			seconds = 120;
+			break;
+
+		case NM_WIRELESS_SCAN_INTERVAL_ACTIVE:
+		default:
+			seconds = 20;
+			break;
+	}
+
+	return seconds;
+}
+
 
 static guint32
 real_get_generic_capabilities (NMDevice *dev)
@@ -837,23 +860,7 @@ nm_device_802_11_wireless_set_scan_inter
 
 		if (d && nm_device_is_802_11_wireless (d))
 		{
-			guint seconds;
-
-			switch (interval)
-			{
-				case NM_WIRELESS_SCAN_INTERVAL_INIT:
-					seconds = 15;
-					break;
-
-				case NM_WIRELESS_SCAN_INTERVAL_INACTIVE:
-					seconds = 120;
-					break;
-
-				case NM_WIRELESS_SCAN_INTERVAL_ACTIVE:
-				default:
-					seconds = 20;
-					break;
-			}
+			guint seconds = nm_wireless_scan_interval_to_seconds (interval);
 
 			NM_DEVICE_802_11_WIRELESS (d)->priv->scan_interval = seconds;
 		}
@@ -1667,7 +1674,7 @@ handle_scan_results (gpointer user_data)
 		nm_ap_list_copy_properties (nm_device_802_11_wireless_ap_list_get (self), app_data->allowed_ap_list);
 	}
 
-	/* Walk the access point list and remove any access points older than 180s */
+	/* Walk the access point list and remove any access points older than thrice the active scan interval */
 	g_get_current_time (&cur_time);
 	ap_list = nm_device_802_11_wireless_ap_list_get (self);
 	if (ap_list && (iter = nm_ap_list_iter_new (ap_list)))
@@ -1688,13 +1695,18 @@ handle_scan_results (gpointer user_data)
 		{
 			const GTimeVal	*ap_time = nm_ap_get_last_seen (outdated_ap);
 			gboolean		 keep_around = FALSE;
+			guint active_interval_s;
+			guint prune_interval_s;
 
 			/* Don't ever prune the AP we're currently associated with */
 			if (	    nm_ap_get_essid (outdated_ap)
 				&&  (cur_ap && (nm_null_safe_strcmp (nm_ap_get_essid (cur_ap), nm_ap_get_essid (outdated_ap))) == 0))
 				keep_around = TRUE;
 
-			if (!keep_around && (ap_time->tv_sec + 180 < cur_time.tv_sec))
+			active_interval_s = nm_wireless_scan_interval_to_seconds (NM_WIRELESS_SCAN_INTERVAL_ACTIVE);
+			prune_interval_s = active_interval_s * 3;
+
+			if (!keep_around && (ap_time->tv_sec + prune_interval_s < cur_time.tv_sec))
 				outdated_list = g_slist_append (outdated_list, outdated_ap);
 		}
 		nm_ap_list_iter_free (iter);



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:08:53 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:08:53 -0500
Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.27,
	1.28 nautilus-cd-burner.spec, 1.49, 1.50 sources, 1.27, 1.28
Message-ID: <200602280208.k1S28r1c031777@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/nautilus-cd-burner/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31722

Modified Files:
	.cvsignore nautilus-cd-burner.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	15 Feb 2006 06:16:50 -0000	1.27
+++ .cvsignore	28 Feb 2006 02:08:50 -0000	1.28
@@ -18,3 +18,4 @@
 nautilus-cd-burner-2.13.5.tar.bz2
 nautilus-cd-burner-2.13.90.tar.bz2
 nautilus-cd-burner-2.13.91.tar.bz2
+nautilus-cd-burner-2.13.92.tar.bz2


Index: nautilus-cd-burner.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nautilus-cd-burner.spec	25 Feb 2006 03:01:01 -0000	1.49
+++ nautilus-cd-burner.spec	28 Feb 2006 02:08:50 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: Easy to use CD burning for Gnome
 Name: nautilus-cd-burner
-Version: 2.13.91
-Release: 2
+Version: 2.13.92
+Release: 1
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL/GPL
 Group: User Interface/Desktops
@@ -22,10 +22,10 @@
 BuildRequires: dbus-devel >= 0.60
 # need nautilus-extensions
 BuildRequires: nautilus >= 2.5.4
+BuildRequires: gnome-mount >= 0.4
 ExcludeArch: s390 s390x
 
 Patch0: nautilus-cd-burner-2.11.4-c++.patch
-Patch1: nautilus-cd-burner-2.13.91-iso.patch
 
 %description
 An easy to use CD burning package, well integrated with
@@ -45,7 +45,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .c++
-%patch1 -p0 -b .iso
 
 %build
 ## all the autofoo crap is necessary since there is a broken
@@ -54,7 +53,7 @@
 aclocal
 intltoolize --force --copy
 automake
-%configure --enable-hal
+%configure --enable-hal --enable-gnome-mount
 make
 
 %install
@@ -102,6 +101,11 @@
 
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+- Drop upstreamed patch
+- Add BuildReq for gnome-mount
+
 * Fri Feb 24 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-2
 - Fix a problem with writing iso images (#182358)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	15 Feb 2006 06:16:50 -0000	1.27
+++ sources	28 Feb 2006 02:08:50 -0000	1.28
@@ -1 +1,2 @@
 ce3a04bee9dc21730bc03c7c7359b322  nautilus-cd-burner-2.13.91.tar.bz2
+64645b858f9cd0ca792b2f24eb24870c  nautilus-cd-burner-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:09:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:09:46 -0500
Subject: rpms/emacs/devel emacs.spec,1.65,1.66
Message-ID: <200602280209.k1S29k7O032265@cvs.devel.redhat.com>

Author: petersen

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31894

Modified Files:
	emacs.spec 
Log Message:
re-enable building on ppc64



Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- emacs.spec	27 Feb 2006 13:47:17 -0000	1.65
+++ emacs.spec	28 Feb 2006 02:09:44 -0000	1.66
@@ -1,6 +1,4 @@
 # This file is encoded in UTF-8.  -*- coding: utf-8 -*-
-# FIXME: doesn't currently build on ppc64
-ExcludeArch: ppc64
 
 %define emacs21 1
 %define muleucs_ver current
@@ -11,7 +9,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 13
+Release: 14
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -542,6 +540,9 @@
 %endif
 
 %changelog
+* Tue Feb 28 2006 Jens Petersen <petersen at redhat.com> - 21.4-14
+- re-enable building on ppc64
+
 * Mon Feb 27 2006 Jens Petersen <petersen at redhat.com> - 21.4-13
 - buildrequire libXaw-devel for menus and scrollbar
 - pass -R to setarch to disable address randomization during dumping



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:12:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:12:22 -0500
Subject: rpms/gnome-screensaver/devel .cvsignore, 1.15,
	1.16 gnome-screensaver.spec, 1.58, 1.59 sources, 1.17, 1.18
Message-ID: <200602280212.k1S2CMXV000980@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv896

Modified Files:
	.cvsignore gnome-screensaver.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Feb 2006 06:40:04 -0000	1.15
+++ .cvsignore	28 Feb 2006 02:12:19 -0000	1.16
@@ -6,3 +6,4 @@
 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


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-screensaver.spec	15 Feb 2006 06:44:47 -0000	1.58
+++ gnome-screensaver.spec	28 Feb 2006 02:12:19 -0000	1.59
@@ -13,7 +13,7 @@
 
 Summary: GNOME Sreensaver
 Name: gnome-screensaver
-Version: 2.13.91
+Version: 2.13.92
 Release: 1
 License: GPL
 Group: Amusement/Graphics
@@ -161,6 +161,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	15 Feb 2006 06:40:04 -0000	1.17
+++ sources	28 Feb 2006 02:12:19 -0000	1.18
@@ -1,2 +1,2 @@
 661b1551a16e6aa948248b2443bad117  fedoralogo-floaters-lock-dialog.tar.gz
-8e0658fb0a5d6aa443ffb3713d05b7a9  gnome-screensaver-2.13.91.tar.bz2
+3454a3f84c0b7a36d435e75582d53900  gnome-screensaver-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:19:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:19:26 -0500
Subject: rpms/gnome-media/devel .cvsignore, 1.26, 1.27 gnome-media.spec, 1.60,
	1.61 sources, 1.26, 1.27
Message-ID: <200602280219.k1S2JQhG015969@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-media/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15920

Modified Files:
	.cvsignore gnome-media.spec sources 
Log Message:
2.13.93



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	15 Feb 2006 06:24:54 -0000	1.26
+++ .cvsignore	28 Feb 2006 02:19:23 -0000	1.27
@@ -4,3 +4,4 @@
 gnome-media-2.13.7.tar.bz2
 gnome-media-2.13.91.tar.bz2
 gnome-media-2.13.92.tar.bz2
+gnome-media-2.13.93.tar.bz2


Index: gnome-media.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- gnome-media.spec	15 Feb 2006 06:24:54 -0000	1.60
+++ gnome-media.spec	28 Feb 2006 02:19:23 -0000	1.61
@@ -10,7 +10,7 @@
 
 Summary:        GNOME media programs.
 Name:           gnome-media
-Version:        2.13.92
+Version:        2.13.93
 Release:        1
 License:        GPL
 Group:          Applications/Multimedia
@@ -153,6 +153,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.93-1
+- Update to 2.13.93
+
 * Wed Feb 15 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	15 Feb 2006 06:24:54 -0000	1.26
+++ sources	28 Feb 2006 02:19:23 -0000	1.27
@@ -1 +1 @@
-faa1f6e68b49b37e2b8b075bd74f03c7  gnome-media-2.13.92.tar.bz2
+a2c0e332c5e99c9498a19e26fe0bd764  gnome-media-2.13.93.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:22:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:22:13 -0500
Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.59,1.60
Message-ID: <200602280222.k1S2MDrT016777@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-screensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16715

Modified Files:
	gnome-screensaver.spec 
Log Message:
 fix file lists



Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gnome-screensaver.spec	28 Feb 2006 02:12:19 -0000	1.59
+++ gnome-screensaver.spec	28 Feb 2006 02:22:09 -0000	1.60
@@ -150,6 +150,7 @@
 %doc AUTHORS ChangeLog NEWS README
 %{_bindir}/*
 %{_libexecdir}/*
+%{_libdir}/pkgconfig/*
 %{_datadir}/applications/gnome-screensaver-preferences.desktop
 %{_datadir}/gnome-screensaver/*
 %{_datadir}/pixmaps/backgrounds/*



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:25:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:25:58 -0500
Subject: rpms/file-roller/devel .cvsignore, 1.32, 1.33 file-roller.spec, 1.50,
	1.51 sources, 1.33, 1.34
Message-ID: <200602280225.k1S2PwZs018489@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18413

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.13.92




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	15 Feb 2006 05:52:08 -0000	1.32
+++ .cvsignore	28 Feb 2006 02:25:55 -0000	1.33
@@ -18,3 +18,4 @@
 file-roller-2.13.4.tar.bz2
 file-roller-2.13.90.tar.bz2
 file-roller-2.13.91.tar.bz2
+file-roller-2.13.92.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- file-roller.spec	21 Feb 2006 10:55:33 -0000	1.50
+++ file-roller.spec	28 Feb 2006 02:25:55 -0000	1.51
@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives.
 Name:		file-roller
-Version:	2.13.91
-Release: 	2
+Version:	2.13.92
+Release: 	1
 
 License:	GPL
 Group:		Applications/Archiving
@@ -107,6 +107,9 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Tue Feb 21 2006 Karsten Hopp <karsten at redhat.de> 2.13.91-2
 - BuildRequire: gnome-doc-utils
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	15 Feb 2006 05:52:08 -0000	1.33
+++ sources	28 Feb 2006 02:25:55 -0000	1.34
@@ -1 +1 @@
-272802ba8186129f170e97f9b44061ae  file-roller-2.13.91.tar.bz2
+e6db26370b9014a564b43c3d908e2da8  file-roller-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:33:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:33:18 -0500
Subject: rpms/at-spi/devel .cvsignore, 1.20, 1.21 at-spi.spec, 1.29,
	1.30 sources, 1.20, 1.21
Message-ID: <200602280233.k1S2XIqX020601@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20485

Modified Files:
	.cvsignore at-spi.spec sources 
Log Message:
1.7.6



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	21 Feb 2006 05:46:48 -0000	1.20
+++ .cvsignore	28 Feb 2006 02:33:12 -0000	1.21
@@ -10,3 +10,4 @@
 at-spi-1.7.3.tar.bz2
 at-spi-1.7.4.tar.bz2
 at-spi-1.7.5.tar.bz2
+at-spi-1.7.6.tar.bz2


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- at-spi.spec	21 Feb 2006 05:46:48 -0000	1.29
+++ at-spi.spec	28 Feb 2006 02:33:12 -0000	1.30
@@ -6,7 +6,7 @@
 
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
-Version: 1.7.5
+Version: 1.7.6
 Release: 1
 URL: http://developer.gnome.org/projects/gap/
 Source0: %{name}-%{version}.tar.bz2
@@ -89,6 +89,9 @@
 %{_includedir}/* 
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.6-1
+- Update to 1.7.6 
+
 * Tue Feb 21 2006 Matthias Clasen <mclasen at redhat.com> - 1.7.5-1
 - Update to 1.7.5 
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Feb 2006 05:46:48 -0000	1.20
+++ sources	28 Feb 2006 02:33:12 -0000	1.21
@@ -1 +1 @@
-571faa3a1766047b0faae607ab883e89  at-spi-1.7.5.tar.bz2
+9515f730ea7e9d00690d4181b20990a0  at-spi-1.7.6.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:35:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:35:50 -0500
Subject: rpms/epiphany/devel .cvsignore, 1.35, 1.36 epiphany.spec, 1.89,
	1.90 sources, 1.35, 1.36
Message-ID: <200602280235.k1S2ZokD021151@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21101

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
1.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	13 Feb 2006 23:45:27 -0000	1.35
+++ .cvsignore	28 Feb 2006 02:35:47 -0000	1.36
@@ -1 +1,2 @@
 epiphany-1.9.7.tar.bz2
+epiphany-1.9.8.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- epiphany.spec	13 Feb 2006 23:45:27 -0000	1.89
+++ epiphany.spec	28 Feb 2006 02:35:47 -0000	1.90
@@ -10,7 +10,7 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 1.9.7
+Version: 1.9.8
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 1.9.8-1
+- Update to 1.9.8
+
 * Mon Feb 13 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
 - Update to 1.9.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources	13 Feb 2006 23:45:27 -0000	1.35
+++ sources	28 Feb 2006 02:35:48 -0000	1.36
@@ -1 +1 @@
-0539ab861985aeec962b546245788612  epiphany-1.9.7.tar.bz2
+6fbbe70693b00c743d70888c05e1fee4  epiphany-1.9.8.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:39:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:39:46 -0500
Subject: rpms/libgtop2/devel .cvsignore, 1.22, 1.23 libgtop2.spec, 1.30,
	1.31 sources, 1.22, 1.23
Message-ID: <200602280239.k1S2dkHI022379@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgtop2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22302

Modified Files:
	.cvsignore libgtop2.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	27 Jan 2006 03:29:10 -0000	1.22
+++ .cvsignore	28 Feb 2006 02:39:43 -0000	1.23
@@ -14,3 +14,4 @@
 libgtop-2.13.1.tar.bz2
 libgtop-2.13.2.tar.bz2
 libgtop-2.13.3.tar.bz2
+libgtop-2.13.92.tar.bz2


Index: libgtop2.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- libgtop2.spec	11 Feb 2006 04:07:30 -0000	1.30
+++ libgtop2.spec	28 Feb 2006 02:39:43 -0000	1.31
@@ -6,8 +6,8 @@
 
 Name:		libgtop2
 Summary:        libgtop library (version 2)
-Version: 	2.13.3
-Release: 	1.2
+Version: 	2.13.92
+Release: 	1
 License: 	GPL
 URL:            ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0
 Group:          System Environment/Libraries
@@ -83,6 +83,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	27 Jan 2006 03:29:10 -0000	1.22
+++ sources	28 Feb 2006 02:39:43 -0000	1.23
@@ -1 +1 @@
-33781e3a3fef7fb2343f7328efdcaef7  libgtop-2.13.3.tar.bz2
+2cf0bd82fa92381403408e0155d05fca  libgtop-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:42:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:42:37 -0500
Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.24,
	1.25 gnome-system-monitor.spec, 1.42, 1.43 sources, 1.24, 1.25
Message-ID: <200602280242.k1S2gbKe023682@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-system-monitor/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23620

Modified Files:
	.cvsignore gnome-system-monitor.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	31 Jan 2006 18:18:12 -0000	1.24
+++ .cvsignore	28 Feb 2006 02:42:34 -0000	1.25
@@ -6,3 +6,4 @@
 gnome-system-monitor-2.13.4.tar.bz2
 gnome-system-monitor-2.13.5.tar.bz2
 gnome-system-monitor-2.13.90.tar.bz2
+gnome-system-monitor-2.13.92.tar.bz2


Index: gnome-system-monitor.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnome-system-monitor.spec	11 Feb 2006 03:17:44 -0000	1.42
+++ gnome-system-monitor.spec	28 Feb 2006 02:42:34 -0000	1.43
@@ -10,8 +10,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-Version: 2.13.90
-Release: 1.2
+Version: 2.13.92
+Release: 1
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2
@@ -80,6 +80,9 @@
 %{_datadir}/omf
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> 2.13.92-1
+- Update to 2.13.92
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.90-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	31 Jan 2006 18:18:12 -0000	1.24
+++ sources	28 Feb 2006 02:42:34 -0000	1.25
@@ -1 +1 @@
-a29da44f9c43e7a79698af371c7d82f6  gnome-system-monitor-2.13.90.tar.bz2
+778106b4e7d5f78e8a40f21f3e88b2b9  gnome-system-monitor-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:43:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:43:16 -0500
Subject: rpms/tcsh/FC-4 tcsh.spec,1.28,1.29
Message-ID: <200602280243.k1S2hGjU024040@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23973

Modified Files:
	tcsh.spec 
Log Message:
* Tue Feb 28 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.2
- Fix a crash when reading scripts with multibyte characters (#183267)



Index: tcsh.spec
===================================================================
RCS file: /cvs/dist/rpms/tcsh/FC-4/tcsh.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tcsh.spec	19 Feb 2006 04:58:34 -0000	1.28
+++ tcsh.spec	28 Feb 2006 02:43:14 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
 Version: 6.14
-Release: 1.fc4.1
+Release: 1.fc4.2
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
@@ -11,6 +11,7 @@
 Patch1: tcsh-6.14.00-closem.patch
 Patch2: tcsh-6.14.00-iconv.patch
 Patch3: tcsh-6.14.00-sigint.patch
+Patch4: tcsh-6.14.00-wide-crash.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -31,6 +32,7 @@
 %patch1 -p1 -b .closem
 %patch2 -p1 -b .iconv
 %patch3 -p1 -b .sigint
+%patch4 -p1 -b .wide-crash
 
 nroff -me eight-bit.me > eight-bit.txt
 
@@ -98,6 +100,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 28 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.2
+- Fix a crash when reading scripts with multibyte characters (#183267)
+
 * Sun Feb 19 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.1
 - Block SIGINT while waiting for children (#177366)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:43:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:43:35 -0500
Subject: rpms/tcsh/FC-4 tcsh-6.14.00-wide-crash.patch,NONE,1.1
Message-ID: <200602280243.k1S2hZ3c024199@cvs.devel.redhat.com>

Author: mitr

Update of /cvs/dist/rpms/tcsh/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv24148

Added Files:
	tcsh-6.14.00-wide-crash.patch 
Log Message:
* Tue Feb 28 2006 Miloslav Trmac <mitr at redhat.com> - 6.14-1.fc4.2
- Fix a crash when reading scripts with multibyte characters (#183267)


tcsh-6.14.00-wide-crash.patch:
 sh.lex.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE tcsh-6.14.00-wide-crash.patch ---
--- tcsh-6.14.00/sh.lex.c.wide-crash	2006-02-28 03:34:58.000000000 +0100
+++ tcsh-6.14.00/sh.lex.c	2006-02-28 03:35:31.000000000 +0100
@@ -1710,13 +1710,13 @@
 	    break;
 	partial += r;
 	i = 0;
-	while (i < partial) {
+	while (i < partial && nchars != 0) {
 	    int len;
 
 	    len = normal_mbtowc(buf + res, cbuf + i, partial - i);
 	    if (len == -1) {
 	        reset_mbtowc();
-		if (partial < MB_LEN_MAX && r > 0)
+		if (partial - i < MB_LEN_MAX && r > 0)
 		    /* Maybe a partial character and there is still a chance
 		       to read more */
 		    break;
@@ -1735,7 +1735,7 @@
 	if (i != partial)
 	    memmove(cbuf, cbuf + i, partial - i);
 	partial -= i;
-    } while (partial != 0);
+    } while (partial != 0 && nchars != 0);
     /* Throwing away possible partial multibyte characters on error */
     return res != 0 ? res : r;
 }



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:45:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:45:35 -0500
Subject: rpms/evince/devel .cvsignore, 1.20, 1.21 evince.spec, 1.41,
	1.42 sources, 1.20, 1.21
Message-ID: <200602280245.k1S2jZDh026181@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25322

Modified Files:
	.cvsignore evince.spec sources 
Log Message:
0.5.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	20 Jan 2006 15:42:19 -0000	1.20
+++ .cvsignore	28 Feb 2006 02:45:33 -0000	1.21
@@ -1 +1,2 @@
 evince-0.5.0.tar.bz2
+evince-0.5.1.tar.bz2


Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- evince.spec	11 Feb 2006 02:40:45 -0000	1.41
+++ evince.spec	28 Feb 2006 02:45:33 -0000	1.42
@@ -3,8 +3,8 @@
 %define dbus_version 0.60
 
 Name:		evince
-Version:	0.5.0
-Release:	3.2
+Version:	0.5.1
+Release:	1
 Summary:	Document viewer
 
 License: 	GPL
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.1-1
+- Update to 0.5.1
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-3.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	20 Jan 2006 15:42:19 -0000	1.20
+++ sources	28 Feb 2006 02:45:33 -0000	1.21
@@ -1 +1 @@
-9d4507c9370eec37fa96cabf80926f15  evince-0.5.0.tar.bz2
+055b54877914de0ac9e895e38287395d  evince-0.5.1.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:47:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:47:15 -0500
Subject: rpms/evince/devel evince.spec,1.42,1.43
Message-ID: <200602280247.k1S2lFHu005913@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/evince/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5796

Modified Files:
	evince.spec 
Log Message:
drop upstreamed patch



Index: evince.spec
===================================================================
RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- evince.spec	28 Feb 2006 02:45:33 -0000	1.42
+++ evince.spec	28 Feb 2006 02:47:13 -0000	1.43
@@ -34,15 +34,12 @@
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils
 
-Patch1: evince-0.5-invisible-char.patch
-
 %description
 evince is a GNOME-based document viewer.
 
 
 %prep
 %setup -q
-%patch1 -p1 -b .invisible-char
 
 %build
 %configure --disable-scrollkeeper
@@ -124,6 +121,7 @@
 %changelog
 * Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 0.5.1-1
 - Update to 0.5.1
+- Drop upstreamed patch
 
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-3.2
 - bump again for double-long bug on ppc(64)



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:56:35 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:56:35 -0500
Subject: rpms/gnome-desktop/devel .cvsignore, 1.26, 1.27 gnome-desktop.spec,
	1.49, 1.50 sources, 1.26, 1.27
Message-ID: <200602280256.k1S2uZqJ010243@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/gnome-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10052

Modified Files:
	.cvsignore gnome-desktop.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	13 Feb 2006 18:43:01 -0000	1.26
+++ .cvsignore	28 Feb 2006 02:56:33 -0000	1.27
@@ -14,3 +14,4 @@
 gnome-desktop-2.13.5.tar.bz2
 gnome-desktop-2.13.90.tar.bz2
 gnome-desktop-2.13.91.tar.bz2
+gnome-desktop-2.13.92.tar.bz2


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-desktop.spec	13 Feb 2006 18:43:01 -0000	1.49
+++ gnome-desktop.spec	28 Feb 2006 02:56:33 -0000	1.50
@@ -10,7 +10,7 @@
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
-Version: 2.13.91
+Version: 2.13.92
 Release: 1
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
@@ -132,6 +132,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Feb 2006 18:43:01 -0000	1.26
+++ sources	28 Feb 2006 02:56:33 -0000	1.27
@@ -1 +1 @@
-c7941026d569c6d9e9fe5eceaf2ac74b  gnome-desktop-2.13.91.tar.bz2
+0e3fb44bc5f2ee40862e85fa5fee816a  gnome-desktop-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 02:59:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 21:59:39 -0500
Subject: rpms/libwnck/devel .cvsignore, 1.29, 1.30 libwnck.spec, 1.42,
	1.43 sources, 1.29, 1.30
Message-ID: <200602280259.k1S2xdBg005233@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5217

Modified Files:
	.cvsignore libwnck.spec sources 
Log Message:
2.13.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	13 Feb 2006 18:56:53 -0000	1.29
+++ .cvsignore	28 Feb 2006 02:59:37 -0000	1.30
@@ -7,3 +7,4 @@
 libwnck-2.13.5.tar.bz2
 libwnck-2.13.90.tar.bz2
 libwnck-2.13.91.tar.bz2
+libwnck-2.13.92.tar.bz2


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libwnck.spec	13 Feb 2006 18:56:53 -0000	1.42
+++ libwnck.spec	28 Feb 2006 02:59:37 -0000	1.43
@@ -5,7 +5,7 @@
 
 Summary: Window Navigator Construction Kit
 Name: libwnck
-Version: 2.13.91
+Version: 2.13.92
 Release: 1
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+
 * Mon Feb 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.91-1
 - Update to 2.13.91
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	13 Feb 2006 18:56:53 -0000	1.29
+++ sources	28 Feb 2006 02:59:37 -0000	1.30
@@ -1 +1 @@
-74eeda1e0e0a7a0c53d3e2376c6428e1  libwnck-2.13.91.tar.bz2
+3ea5e4bf2a06ff64de2eeb02e7a3dd34  libwnck-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:07:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:07:02 -0500
Subject: rpms/libgnomeui/devel .cvsignore, 1.21, 1.22 libgnomeui.spec, 1.36,
	1.37 sources, 1.21, 1.22
Message-ID: <200602280307.k1S372dI005425@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnomeui/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5409

Modified Files:
	.cvsignore libgnomeui.spec sources 
Log Message:
2.13.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	27 Jan 2006 03:35:16 -0000	1.21
+++ .cvsignore	28 Feb 2006 03:07:00 -0000	1.22
@@ -3,3 +3,4 @@
 libgnomeui-2.13.0.tar.bz2
 libgnomeui-2.13.2.tar.bz2
 libgnomeui-2.13.3.tar.bz2
+libgnomeui-2.13.90.tar.bz2


Index: libgnomeui.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libgnomeui.spec	11 Feb 2006 04:00:00 -0000	1.36
+++ libgnomeui.spec	28 Feb 2006 03:07:00 -0000	1.37
@@ -17,8 +17,8 @@
 
 Summary: GNOME base GUI library
 Name: libgnomeui
-Version: 2.13.3
-Release: 1.2
+Version: 2.13.90
+Release: 1
 URL: ftp://ftp.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -160,6 +160,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
+- Update to 2.13.90
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	27 Jan 2006 03:35:16 -0000	1.21
+++ sources	28 Feb 2006 03:07:00 -0000	1.22
@@ -1 +1 @@
-b23459770a68a9f829bd407f5ff961a0  libgnomeui-2.13.3.tar.bz2
+1a8fb5848e35030b2a90afcf627723da  libgnomeui-2.13.90.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:10:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:10:18 -0500
Subject: rpms/g-wrap/devel g-wrap-ffiexecstack.patch, NONE, 1.1 g-wrap.spec,
	1.22, 1.23
Message-ID: <200602280310.k1S3AIPR005631@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5569

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-ffiexecstack.patch 
Log Message:
don't use exec stack (#183287)


g-wrap-ffiexecstack.patch:
 alpha/osf.S               |    3 +++
 arm/sysv.S                |    3 +++
 ia64/unix.S               |    4 ++++
 m68k/sysv.S               |    4 ++++
 powerpc/linux64.S         |    4 ++++
 powerpc/linux64_closure.S |    4 ++++
 powerpc/ppc_closure.S     |    4 ++++
 powerpc/sysv.S            |    4 ++++
 s390/sysv.S               |    3 +++
 sparc/v8.S                |    4 ++++
 sparc/v9.S                |    4 ++++
 x86/sysv.S                |    4 ++++
 x86/unix64.S              |    4 ++++
 13 files changed, 49 insertions(+)

--- NEW FILE g-wrap-ffiexecstack.patch ---
diff -ru g-wrap-1.9.6/libffi/src/alpha/osf.S g-wrap-1.9.6-fixed/libffi/src/alpha/osf.S
--- g-wrap-1.9.6/libffi/src/alpha/osf.S	2004-09-27 10:56:15.000000000 -0400
+++ g-wrap-1.9.6-fixed/libffi/src/alpha/osf.S	2006-02-27 21:12:43.000000000 -0500
@@ -352,4 +352,7 @@
 	.byte	0x12	 # uleb128 0x12
 	.align 3
 $LEFDE3:
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
 #endif
diff -ru g-wrap-1.9.6/libffi/src/arm/sysv.S g-wrap-1.9.6-fixed/libffi/src/arm/sysv.S
--- g-wrap-1.9.6/libffi/src/arm/sysv.S	2005-03-03 09:23:23.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/arm/sysv.S	2006-02-27 21:13:11.000000000 -0500
@@ -207,3 +207,6 @@
 .ffi_call_SYSV_end:
         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
 
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/ia64/unix.S g-wrap-1.9.6-fixed/libffi/src/ia64/unix.S
--- g-wrap-1.9.6/libffi/src/ia64/unix.S	2006-02-20 14:06:10.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/ia64/unix.S	2006-02-27 21:14:04.000000000 -0500
@@ -553,3 +553,7 @@
 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/m68k/sysv.S g-wrap-1.9.6-fixed/libffi/src/m68k/sysv.S
--- g-wrap-1.9.6/libffi/src/m68k/sysv.S	2004-09-27 10:56:15.000000000 -0400
+++ g-wrap-1.9.6-fixed/libffi/src/m68k/sysv.S	2006-02-27 21:14:26.000000000 -0500
@@ -95,3 +95,7 @@
 	unlk	%a6
 	rts
 	.size	ffi_call_SYSV,.-ffi_call_SYSV
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/powerpc/linux64_closure.S g-wrap-1.9.6-fixed/libffi/src/powerpc/linux64_closure.S
--- g-wrap-1.9.6/libffi/src/powerpc/linux64_closure.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/powerpc/linux64_closure.S	2006-02-27 21:15:53.000000000 -0500
@@ -203,3 +203,7 @@
 	.align 3
 .LEFDE1:
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/powerpc/linux64.S g-wrap-1.9.6-fixed/libffi/src/powerpc/linux64.S
--- g-wrap-1.9.6/libffi/src/powerpc/linux64.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/powerpc/linux64.S	2006-02-27 21:16:15.000000000 -0500
@@ -174,3 +174,7 @@
 	.align 3
 .LEFDE1:
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/powerpc/ppc_closure.S g-wrap-1.9.6-fixed/libffi/src/powerpc/ppc_closure.S
--- g-wrap-1.9.6/libffi/src/powerpc/ppc_closure.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/powerpc/ppc_closure.S	2006-02-27 21:16:33.000000000 -0500
@@ -248,3 +248,7 @@
 .LEFDE1:
 
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/powerpc/sysv.S g-wrap-1.9.6-fixed/libffi/src/powerpc/sysv.S
--- g-wrap-1.9.6/libffi/src/powerpc/sysv.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/powerpc/sysv.S	2006-02-27 21:16:49.000000000 -0500
@@ -187,3 +187,7 @@
       .align 2
 .LEFDE1:
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/s390/sysv.S g-wrap-1.9.6-fixed/libffi/src/s390/sysv.S
--- g-wrap-1.9.6/libffi/src/s390/sysv.S	2004-09-27 10:56:15.000000000 -0400
+++ g-wrap-1.9.6-fixed/libffi/src/s390/sysv.S	2006-02-27 21:17:03.000000000 -0500
@@ -427,3 +427,6 @@
 
 #endif
 
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/sparc/v8.S g-wrap-1.9.6-fixed/libffi/src/sparc/v8.S
--- g-wrap-1.9.6/libffi/src/sparc/v8.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/sparc/v8.S	2006-02-27 21:17:22.000000000 -0500
@@ -265,3 +265,7 @@
 	.byte	0x1f	! uleb128 0x1f
 	.align	WS
 .LLEFDE2:
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/sparc/v9.S g-wrap-1.9.6-fixed/libffi/src/sparc/v9.S
--- g-wrap-1.9.6/libffi/src/sparc/v9.S	2004-09-27 10:56:15.000000000 -0400
+++ g-wrap-1.9.6-fixed/libffi/src/sparc/v9.S	2006-02-27 21:17:30.000000000 -0500
@@ -300,3 +300,7 @@
 	.align 8
 .LLEFDE2:
 #endif
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/x86/sysv.S g-wrap-1.9.6-fixed/libffi/src/x86/sysv.S
--- g-wrap-1.9.6/libffi/src/x86/sysv.S	2004-09-27 10:56:15.000000000 -0400
+++ g-wrap-1.9.6-fixed/libffi/src/x86/sysv.S	2006-02-27 21:18:22.000000000 -0500
@@ -182,3 +182,7 @@
 .LEFDE1:
 
 #endif /* ifndef __x86_64__ */
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif
diff -ru g-wrap-1.9.6/libffi/src/x86/unix64.S g-wrap-1.9.6-fixed/libffi/src/x86/unix64.S
--- g-wrap-1.9.6/libffi/src/x86/unix64.S	2005-03-03 09:23:24.000000000 -0500
+++ g-wrap-1.9.6-fixed/libffi/src/x86/unix64.S	2006-02-27 21:18:33.000000000 -0500
@@ -373,3 +373,7 @@
 .LEFDE3:
 
 #endif /* __x86_64__ */
+
+#ifdef __linux__
+	.section	.note.GNU-stack,"", at progbits
+#endif


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- g-wrap.spec	20 Feb 2006 19:41:43 -0000	1.22
+++ g-wrap.spec	28 Feb 2006 03:10:16 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: A tool for creating Scheme interfaces to C libraries
 Name: g-wrap
 Version: 1.9.6
-Release: 1
+Release: 2
 Group: Development/Libraries
 License: GPL
 Requires: guile
@@ -12,6 +12,7 @@
 Patch0: g-wrap-info.patch
 Patch1: g-wrap-glib2.patch
 Patch2: g-wrap-staticffi.patch
+Patch3: g-wrap-ffiexecstack.patch
 BuildPrereq: guile-devel slib glib-devel pkgconfig
 
 %description
@@ -41,6 +42,7 @@
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %build
 
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -95,6 +97,9 @@
 %doc %{_infodir}/g-wrap.info*
 
 %changelog
+* Mon Feb 27 2006 Bill Nottingham <notting at redhat.com> 1.9.6-2
+- don't use an executable stack (#183287)
+
 * Sat Feb 18 2006 Bill Nottingham <notting at redhat.com> 1.9.6-1
 - update to 1.9.6, to fix incompatiblity with gcc-4.x
 - disable static libs



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:18:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:18:27 -0500
Subject: rpms/libgnome/devel .cvsignore, 1.21, 1.22 libgnome.spec, 1.51,
	1.52 sources, 1.21, 1.22
Message-ID: <200602280318.k1S3IREo018391@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18376

Modified Files:
	.cvsignore libgnome.spec sources 
Log Message:
2.13.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	17 Jan 2006 03:09:49 -0000	1.21
+++ .cvsignore	28 Feb 2006 03:18:25 -0000	1.22
@@ -4,3 +4,4 @@
 libgnome-2.13.2.tar.bz2
 libgnome-2.13.4.tar.bz2
 libgnome-2.13.7.tar.bz2
+libgnome-2.13.90.tar.bz2


Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- libgnome.spec	11 Feb 2006 03:57:36 -0000	1.51
+++ libgnome.spec	28 Feb 2006 03:18:25 -0000	1.52
@@ -11,8 +11,8 @@
 
 Summary: GNOME base library
 Name: libgnome
-Version: 2.13.7
-Release: 5.1
+Version: 2.13.90
+Release: 1
 URL: ftp://ftp.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -100,7 +100,6 @@
 %patch4 -p1 -b .default-cursor
 %patch5 -p1 -b .default-browser
 %patch6 -p1 -b .stat-homedir
-%patch7 -p1 -b .popt
 
 %build
 %configure --enable-gtk-doc
@@ -156,6 +155,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
+- Update to 2.13.90
+- Drop obsolete patch
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.7-5.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	17 Jan 2006 03:09:49 -0000	1.21
+++ sources	28 Feb 2006 03:18:25 -0000	1.22
@@ -1 +1 @@
-63cbfa0fe44c478c99ce4cb5f6889c39  libgnome-2.13.7.tar.bz2
+f0b6d23cc4242d80b5443f67b792972b  libgnome-2.13.90.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:33:09 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:33:09 -0500
Subject: rpms/g-wrap/devel g-wrap-consistent.patch, NONE, 1.1 g-wrap.spec,
	1.23, 1.24
Message-ID: <200602280333.k1S3X9ex018839@cvs.devel.redhat.com>

Author: notting

Update of /cvs/dist/rpms/g-wrap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18673

Modified Files:
	g-wrap.spec 
Added Files:
	g-wrap-consistent.patch 
Log Message:
g-wrap checks for srfi-{34,35}, and will build them if it's not found.

Which means, of course, that the filelist will change depending on
whether or not previously-built g-wrap is installed.

So, force it to check for something that it shouldn't find.


g-wrap-consistent.patch:
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE g-wrap-consistent.patch ---
--- g-wrap-1.9.6/configure.ac.foo	2006-02-27 22:23:25.000000000 -0500
+++ g-wrap-1.9.6/configure.ac	2006-02-27 22:28:41.000000000 -0500
@@ -88,8 +88,8 @@
 dnl Guile
 GUILE_FLAGS
 
-GUILE_MODULE_AVAILABLE(HAVE_SRFI_34, [(srfi srfi-34)])
-GUILE_MODULE_AVAILABLE(HAVE_SRFI_35, [(srfi srfi-35)])
+GUILE_MODULE_AVAILABLE(HAVE_SRFI_34, [(srfi srfi-sdfdsfdsfsf34)])
+GUILE_MODULE_AVAILABLE(HAVE_SRFI_35, [(srfi srfi-sdfdsfsfdsf35)])
 
 AM_CONDITIONAL(HAVE_SRFI_34, test "$HAVE_SRFI_34" = yes)
 AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes)


Index: g-wrap.spec
===================================================================
RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- g-wrap.spec	28 Feb 2006 03:10:16 -0000	1.23
+++ g-wrap.spec	28 Feb 2006 03:33:04 -0000	1.24
@@ -13,7 +13,8 @@
 Patch1: g-wrap-glib2.patch
 Patch2: g-wrap-staticffi.patch
 Patch3: g-wrap-ffiexecstack.patch
-BuildPrereq: guile-devel slib glib-devel pkgconfig
+Patch4: g-wrap-consistent.patch
+BuildPrereq: guile-devel slib glib-devel pkgconfig autoconf
 
 %description
 This is a tool for specifying types, functions, and constants to
@@ -43,8 +44,10 @@
 #%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %build
 
+autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %configure --disable-static
 make



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:36:59 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:36:59 -0500
Subject: rpms/pirut/devel .cvsignore, 1.15, 1.16 pirut.spec, 1.16,
	1.17 sources, 1.16, 1.17
Message-ID: <200602280336.k1S3axdZ019068@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19043/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.16-1 on branch devel from pirut-0.9.16-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Feb 2006 03:10:35 -0000	1.15
+++ .cvsignore	28 Feb 2006 03:36:57 -0000	1.16
@@ -1 +1 @@
-pirut-0.9.15.tar.gz
+pirut-0.9.16.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pirut.spec	23 Feb 2006 03:10:35 -0000	1.16
+++ pirut.spec	28 Feb 2006 03:36:57 -0000	1.17
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.15
+Version: 0.9.16
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,12 @@
 
 
 %changelog
+* Mon Feb 27 2006 Jeremy Katz <katzj at redhat.com> - 0.9.16-1
+- Fix optional package searching (#182555)
+- Catch errors when downloading metadata (#178641)
+- Some UI changes from Simon Lanzmich (#182644)
+- More UI changes from jrb 
+
 * Wed Feb 22 2006 Jeremy Katz <katzj at redhat.com> - 0.9.15-1
 - actually find the images
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	23 Feb 2006 03:10:35 -0000	1.16
+++ sources	28 Feb 2006 03:36:57 -0000	1.17
@@ -1 +1 @@
-eab8ef83b122348e90e623fdbebf5ef0  pirut-0.9.15.tar.gz
+743b36bd836929a50976818fc754b18c  pirut-0.9.16.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:39:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:39:02 -0500
Subject: rpms/anaconda/devel .cvsignore, 1.227, 1.228 anaconda.spec, 1.348,
	1.349 sources, 1.347, 1.348
Message-ID: <200602280339.k1S3d2te019163@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/anaconda/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19138/devel

Modified Files:
	.cvsignore anaconda.spec sources 
Log Message:
auto-import anaconda-10.92.12-1 on branch devel from anaconda-10.92.12-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- .cvsignore	25 Feb 2006 01:06:28 -0000	1.227
+++ .cvsignore	28 Feb 2006 03:38:59 -0000	1.228
@@ -1 +1 @@
-anaconda-10.92.11.tar.bz2
+anaconda-10.92.12.tar.bz2


Index: anaconda.spec
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- anaconda.spec	25 Feb 2006 01:06:28 -0000	1.348
+++ anaconda.spec	28 Feb 2006 03:38:59 -0000	1.349
@@ -1,5 +1,5 @@
 Name: anaconda
-Version: 10.92.11
+Version: 10.92.12
 Release: 1
 License: GPL
 Summary: Graphical system installer
@@ -79,6 +79,12 @@
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Mon Feb 27 2006 Jeremy Katz <katzj at redhat.com> - 10.92.12-1
+- Dependency whiteout to fix ordering (clumens)
+- Fix swap on RAID in kickstart (#176537)
+- Add keymap overrides
+- Fix segfault with USB CD/DVD drives (#182589)
+
 * Fri Feb 24 2006 Jeremy Katz <katzj at redhat.com> - 10.92.11-1
 - fix traceback with segv handler (pjones)
 - various language fixes (dcantrel)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/anaconda/devel/sources,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- sources	25 Feb 2006 01:06:28 -0000	1.347
+++ sources	28 Feb 2006 03:38:59 -0000	1.348
@@ -1 +1 @@
-88fa377d281cb30f9c3dbbd71bd9d0d9  anaconda-10.92.11.tar.bz2
+26a69ad8bb11915eb80b21223e79adb7  anaconda-10.92.12.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 03:48:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 22:48:03 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.52,1.53
Message-ID: <200602280348.k1S3m3hq031764@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31751

Modified Files:
	libgnome.spec 
Log Message:
no need to rebuild the docs



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libgnome.spec	28 Feb 2006 03:18:25 -0000	1.52
+++ libgnome.spec	28 Feb 2006 03:48:01 -0000	1.53
@@ -40,7 +40,6 @@
 BuildRequires:  ORBit2-devel >= %{orbit2_version}
 BuildRequires:  libxslt-devel >= %{libxslt_version}
 BuildRequires:  intltool
-BuildRequires: gtk-doc
 
 Patch1: libgnome-2.7.2-default-background.patch
 Patch2: libgnome-2.11.1-scoreloc.patch
@@ -48,7 +47,6 @@
 Patch4: libgnome-2.7.2-default-cursor.patch
 Patch5: libgnome-2.8.0-default-browser.patch
 Patch6: libgnome-2.8.0-stat-homedir.patch
-Patch7: libgnome-2.9.1-popt.patch
 
 # Added to avoid the warning messages about utmp group, bug #24171
 # fixme, just libzvt?
@@ -102,7 +100,7 @@
 %patch6 -p1 -b .stat-homedir
 
 %build
-%configure --enable-gtk-doc
+%configure --disable-gtk-doc
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 04:09:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 23:09:41 -0500
Subject: rpms/bug-buddy/devel .cvsignore, 1.25, 1.26 bug-buddy.spec, 1.47,
	1.48 sources, 1.25, 1.26
Message-ID: <200602280409.k1S49esV010975@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10915

Modified Files:
	.cvsignore bug-buddy.spec sources 
Log Message:
2.13.90



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	17 Jan 2006 17:22:26 -0000	1.25
+++ .cvsignore	28 Feb 2006 04:09:38 -0000	1.26
@@ -2,3 +2,4 @@
 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


Index: bug-buddy.spec
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- bug-buddy.spec	17 Feb 2006 18:58:35 -0000	1.47
+++ bug-buddy.spec	28 Feb 2006 04:09:38 -0000	1.48
@@ -4,8 +4,8 @@
 %define gnome_doc_utils_version 0.2.0
 
 Name: bug-buddy
-Version: 2.13.0
-Release: 2
+Version: 2.13.90
+Release: 1
 Epoch: 1
 Summary: A bug reporting utility for GNOME.
 License: GPL
@@ -108,6 +108,9 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
+- Update to 2.13.90
+
 * Fri Feb 17 2006 Karsten Hopp <karsten at redhat.de> 2.13.0-2
 - BuildRequires: which
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	17 Jan 2006 17:22:28 -0000	1.25
+++ sources	28 Feb 2006 04:09:38 -0000	1.26
@@ -1 +1 @@
-297c24f6afa33e5c776a68396e96b7c4  bug-buddy-2.13.0.tar.bz2
+f19de1b6c8ca2d2834d36c28f1afc848  bug-buddy-2.13.90.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 04:17:29 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Mon, 27 Feb 2006 23:17:29 -0500
Subject: rpms/libgnome/devel libgnome.spec,1.53,1.54
Message-ID: <200602280417.k1S4HTnw026907@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/libgnome/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26834

Modified Files:
	libgnome.spec 
Log Message:
fix a build problem



Index: libgnome.spec
===================================================================
RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libgnome.spec	28 Feb 2006 03:48:01 -0000	1.53
+++ libgnome.spec	28 Feb 2006 04:17:26 -0000	1.54
@@ -101,6 +101,9 @@
 
 %build
 %configure --disable-gtk-doc
+# for some reason, I have to rerun config.status 
+# to get CATALOGS in po/Makefile
+./config.status
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 05:03:50 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 00:03:50 -0500
Subject: rpms/wpa_supplicant/devel wpa_supplicant-ctrl-iface-hide-keys.patch,
	NONE, 1.1 wpa_supplicant.spec, 1.8, 1.9
Message-ID: <200602280503.k1S53oFK023136@cvs.devel.redhat.com>

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23087

Modified Files:
	wpa_supplicant.spec 
Added Files:
	wpa_supplicant-ctrl-iface-hide-keys.patch 
Log Message:
* Mon Feb 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-2
- Don't expose private data on the control interface unless requested



wpa_supplicant-ctrl-iface-hide-keys.patch:
 ctrl_iface.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE wpa_supplicant-ctrl-iface-hide-keys.patch ---
--- wpa_supplicant-0.4.8/ctrl_iface.c.hidekeys	2006-02-27 19:07:10.000000000 -0500
+++ wpa_supplicant-0.4.8/ctrl_iface.c	2006-02-27 23:49:40.000000000 -0500
@@ -681,6 +681,8 @@
 	int id;
 	struct wpa_ssid *ssid;
 	char *name, *value;
+	int show_value = 1;
+	const char *nokey = "[REMOVED]";
 
 	/* cmd: "<network id> <variable name> <value>" */
 	name = strchr(cmd, ' ');
@@ -688,6 +690,12 @@
 		return -1;
 	*name++ = '\0';
 
+	/* Only show passwords and keys if requested */
+	if (!strncmp (name, "wep_key", 7) || !strcmp (name, "psk")
+		|| !strcmp (name, "password") || !strcmp (name, "pin")) {
+		show_value = wpa_s->global->params.wpa_debug_show_keys;
+	}
+
 	value = strchr(name, ' ');
 	if (value == NULL)
 		return -1;
@@ -695,7 +703,7 @@
 
 	id = atoi(cmd);
 	wpa_printf(MSG_DEBUG, "CTRL_IFACE: SET_NETWORK id=%d name='%s' "
-		   "value='%s'", id, name, value);
+		   "value='%s'", id, name, show_value ? value : nokey);
 
 	ssid = wpa_config_get_network(wpa_s->conf, id);
 	if (ssid == NULL) {
@@ -706,7 +714,7 @@
 
 	if (wpa_config_set(ssid, name, value, 0) < 0) {
 		wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to set network "
-			   "variable '%s' to '%s'", name, value);
+			   "variable '%s' to '%s'", name, show_value ? value : nokey);
 		return -1;
 	}
 
@@ -965,6 +973,15 @@
 	if (strncmp(buf, WPA_CTRL_RSP, strlen(WPA_CTRL_RSP)) == 0) {
 		wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
 				      (u8 *) buf, res);
+	} else if (strncmp(buf, "SET_NETWORK ", 12) == 0) {
+		/* Check for forbidden material here too */
+		if (strstr (buf, " wep_key") || strstr (buf, " psk ")
+				|| strstr (buf, " password ") || strstr (buf, " pin ")) {
+			wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
+				      (u8 *) buf, res);
+		} else {
+			wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface", (u8 *) buf, res);
+		}
 	} else {
 		wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface", (u8 *) buf, res);
 	}


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wpa_supplicant.spec	27 Feb 2006 07:46:47 -0000	1.8
+++ wpa_supplicant.spec	28 Feb 2006 05:03:44 -0000	1.9
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 Source5: madwifi-headers.tar.bz2
 Patch0: wpa_supplicant-auth-fallback-v4.patch
 Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
+Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,7 +36,8 @@
 %prep
 %setup -q
 %patch0 -p0 -b .we-auth-fallback
-%patch1 -p1 -b .ap_scan
+%patch1 -p1 -b .ap-scan
+%patch2 -p1 -b .ctrl-iface-hide-keys
 
 %build
 cp %{SOURCE1} ./.config
@@ -110,6 +112,9 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Mon Feb 27 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-2
+- Don't expose private data on the control interface unless requested
+
 * Fri Feb 24 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-1
 - Downgrade to 0.4.8 stable release rather than a dev release
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 09:03:13 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 04:03:13 -0500
Subject: rpms/mod_auth_mysql/devel auth_mysql.conf, 1.3,
	1.4 mod_auth_mysql.spec, 1.22, 1.23
Message-ID: <200602280903.k1S93DwK021382@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21288

Modified Files:
	auth_mysql.conf mod_auth_mysql.spec 
Log Message:
* Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 1:3.0.0-3
- fix to disable auth by default again (regression since FC4)



Index: auth_mysql.conf
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_mysql/devel/auth_mysql.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- auth_mysql.conf	9 Sep 2004 08:37:34 -0000	1.3
+++ auth_mysql.conf	28 Feb 2006 09:02:42 -0000	1.4
@@ -27,6 +27,7 @@
 #    AuthName "MySQL authenticated zone"
 #    AuthType Basic
 #
+#    AuthMYSQLEnable on
 #    AuthMySQLUser authuser
 #    AuthMySQLPassword PaSsW0Rd
 #    AuthMySQLDB auth
@@ -61,6 +62,7 @@
 #    AuthName "MySQL group authenticated zone"
 #    AuthType Basic
 #
+#    AuthMYSQLEnable on
 #    AuthMySQLUser authuser
 #    AuthMySQLPassword PaSsW0Rd
 #    AuthMySQLDB auth
@@ -108,6 +110,7 @@
 #    AuthName "MySQL group authenticated zone"
 #    AuthType Basic
 #
+#    AuthMYSQLEnable on
 #    AuthMySQLUser authuser
 #    AuthMySQLPassword PaSsW0Rd
 #    AuthMySQLDB auth


Index: mod_auth_mysql.spec
===================================================================
RCS file: /cvs/dist/rpms/mod_auth_mysql/devel/mod_auth_mysql.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_auth_mysql.spec	11 Feb 2006 04:37:11 -0000	1.22
+++ mod_auth_mysql.spec	28 Feb 2006 09:02:55 -0000	1.23
@@ -1,13 +1,14 @@
 Summary: Basic authentication for the Apache web server using a MySQL database.
 Name: mod_auth_mysql
 Version: 3.0.0
-Release: 2.2.1
+Release: 3
 Epoch: 1
 Group: System Environment/Daemons
 URL: http://modauthmysql.sourceforge.net/
 Source: mod_auth_mysql-%{version}.tar.gz
 Source2: auth_mysql.conf
 Patch0: mod_auth_mysql-3.0.0-apr1x.patch
+Patch1: mod_auth_mysql-3.0.0-disable.patch
 License: Apache Software License
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: httpd-devel, mysql-devel
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .apr1x
+%patch1 -p1 -b .disable
 
 %build
 %{_sbindir}/apxs -I%{_includedir}/mysql -Wc,-Wall -Wc,-Werror \
@@ -40,11 +42,14 @@
 
 %files
 %defattr(-,root,root)
-%doc README
+%doc README CONFIGURE CHANGES
 %{_libdir}/httpd/modules/*.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf
 
 %changelog
+* Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 1:3.0.0-3
+- fix to disable auth by default again (regression since FC4)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.0-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 09:08:39 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 04:08:39 -0500
Subject: rpms/kernel/devel linux-2.6.15-powerpc-gettimeofday.patch, NONE,
	1.1 kernel-2.6.spec, 1.1991, 1.1992
Message-ID: <200602280908.k1S98cnm022114@cvs.devel.redhat.com>

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22069

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.15-powerpc-gettimeofday.patch 
Log Message:
fix ppc64 gettimeofday()

linux-2.6.15-powerpc-gettimeofday.patch:
 gettimeofday.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.15-powerpc-gettimeofday.patch ---
>From benh at kernel.crashing.org Sat Feb 25 21:11:28 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 25 Feb 2006 21:11:28 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hM-0006Jj-Lv for dwmw2 at baythorne.infradead.org; Sat, 25 Feb 2006
	21:11:28 +0000
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hJ-0008Dl-05 for dwmw2 at infradead.org; Sat, 25 Feb 2006 21:11:28 +0000
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k1PKxQWG030049; Sat, 25 Feb
	2006 14:59:27 -0600
Subject: [PATCH] powerpc: vdso 64bits gettimeofday bug
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
Cc: Paul Mackerras <paulus at samba.org>, Olaf Hering <olh at suse.de>, linuxppc-dev list <linuxppc-dev at ozlabs.org>, linuxppc64-dev <linuxppc64-dev at ozlabs.org>, Greg KH <greg at kroah.com>, David Woodhouse <dwmw2 at infradead.org>, Sven Luther <sven.luther at wanadoo.fr>
Content-Type: text/plain
Date: Sun, 26 Feb 2006 08:09:00 +1100
Message-Id: <1140901740.24957.29.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.5.91 
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

A bug in the assembly code of the vdso can cause gettimeofday() to hang
or to return incorrect results. The wrong register was used to test for
pending updates of the calibration variables and to create a dependency
for subsequent loads. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---

Might be worth applying to the stable series too and/or distro kernels
2.6.15 and later

--- linux-work.orig/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:02:57.000000000 +1100
+++ linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:04:23.000000000 +1100
@@ -225,9 +225,9 @@
   .cfi_startproc
 	/* check for update count & load values */
 1:	ld	r8,CFG_TB_UPDATE_COUNT(r3)
-	andi.	r0,r4,1			/* pending update ? loop */
+	andi.	r0,r8,1			/* pending update ? loop */
 	bne-	1b
-	xor	r0,r4,r4		/* create dependency */
+	xor	r0,r8,r8		/* create dependency */
 	add	r3,r3,r0
 
 	/* Get TB & offset it */




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1991
retrieving revision 1.1992
diff -u -r1.1991 -r1.1992
--- kernel-2.6.spec	27 Feb 2006 21:42:33 -0000	1.1991
+++ kernel-2.6.spec	28 Feb 2006 09:08:12 -0000	1.1992
@@ -238,6 +238,7 @@
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
 Patch301: linux-2.6-cell-numa-init.patch
+Patch302: linux-2.6.15-powerpc-gettimeofday.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
@@ -742,6 +743,8 @@
 %patch300 -p1
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
+# Fix gettimeofday in the 64bit vDSO.
+%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.
@@ -1582,6 +1585,9 @@
 %endif
 
 %changelog
+* Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix gettimeofday() in the 64-bit PowerPC vDSO
+
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5 & rc5-git1
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 09:09:05 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 04:09:05 -0500
Subject: rpms/mod_auth_mysql/devel mod_auth_mysql-3.0.0-disable.patch, NONE,
	1.1
Message-ID: <200602280909.k1S995lk022237@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/mod_auth_mysql/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22190

Added Files:
	mod_auth_mysql-3.0.0-disable.patch 
Log Message:
- and add the patch


mod_auth_mysql-3.0.0-disable.patch:
 mod_auth_mysql.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mod_auth_mysql-3.0.0-disable.patch ---
--- mod_auth_mysql-3.0.0/mod_auth_mysql.c.disable
+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
@@ -186,7 +186,7 @@
 #ifdef ENABLE				/* If we are to be enabled */
   #define _ENABLE ENABLE
 #else
-  #define _ENABLE 1			/* Assume we are */
+  #define _ENABLE 0			/* Assume we are not */
 #endif
 
 #ifdef CHARACTERSET



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:08:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:08:25 -0500
Subject: rpms/firefox/devel firefox.spec,1.105,1.106
Message-ID: <200602281008.k1SA8P2s004951@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1218

Modified Files:
	firefox.spec 
Log Message:
- add buildrequires libXt-devel for X11/Intrinsic.h, X11/Shell.h:

gcc -o gtk2xtbin.o -c .. -DMOZILLA_CLIENT -Wp,-MD,.deps/gtk2xtbin.pp gtk2xtbin.c
In file included from gtk2xtbin.c:46:
gtk2xtbin.h:44:27: error: X11/Intrinsic.h: No such file or directory
...
gtk2xtbin.c:61:23: error: X11/Shell.h: No such file or directory
gtk2xtbin.c:63:28: error: X11/StringDefs.h: No such file or directory



Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- firefox.spec	23 Feb 2006 22:08:19 -0000	1.105
+++ firefox.spec	28 Feb 2006 10:08:15 -0000	1.106
@@ -75,6 +75,7 @@
 BuildRequires:  krb5-devel
 BuildRequires:  pango-devel
 BuildRequires:  freetype-devel >= 2.1.9
+BuildRequires:  libXt-devel
 
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
@@ -264,6 +265,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de>
+- add buildrequires libXt-devel for X11/Intrinsic.h, X11/Shell.h
+
 * Mon Feb 20 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:14:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:14:01 -0500
Subject: rpms/gecko-sharp2/devel gecko-sharp2.spec,1.11,1.12
Message-ID: <200602281014.k1SAE1mw028048@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gecko-sharp2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28005

Modified Files:
	gecko-sharp2.spec 
Log Message:
- add BuildRequires: gtk2-devel
No package 'gtk+-2.0' found
checking for gtk+-2.0 >= 2.0.0 gmodule-2.0 >= 2.0.0... 
Package gtk+-2.0 was not found in the pkg-config search path.
configure: error: Library requirements (gtk+-2.0 >= 2.0.0 gmodule-2.0 >= 2.0.0) not met;
error: Bad exit status from /var/tmp/rpm-tmp.84653 (%build)



Index: gecko-sharp2.spec
===================================================================
RCS file: /cvs/dist/rpms/gecko-sharp2/devel/gecko-sharp2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gecko-sharp2.spec	13 Feb 2006 03:36:48 -0000	1.11
+++ gecko-sharp2.spec	28 Feb 2006 10:13:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gecko-sharp2
 Version:        0.11
-Release:        5
+Release:        6
 Summary:        Gecko bindings for Mono
 
 Group:          System Environment/Libraries
@@ -9,7 +9,7 @@
 Source0:        gecko-sharp-2.0-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk-sharp2 mozilla-devel
+BuildRequires:  gtk-sharp2 mozilla-devel gtk2-devel
 Requires:       mozilla 
 
 # Mono only availible on these: (s390x disabled for now)
@@ -47,6 +47,9 @@
 %{_datadir}/pkgconfig/*-sharp-2.0.pc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.11-6
+- BuildRequires: gtk2-devel
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> 0.11-5
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:17:36 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:17:36 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.13.92-permisssions-fix.patch, NONE,
	1.1 gnome-vfs2.spec, 1.97, 1.98
Message-ID: <200602281017.k1SAHaXE008198@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8183

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.13.92-permisssions-fix.patch 
Log Message:
* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-2
- Add patch (from cvs) that fixes permission reading



gnome-vfs-2.13.92-permisssions-fix.patch:
 file-method.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE gnome-vfs-2.13.92-permisssions-fix.patch ---
Index: modules/file-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/file-method.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- modules/file-method.c	27 Feb 2006 08:54:52 -0000	1.154
+++ modules/file-method.c	28 Feb 2006 10:08:18 -0000	1.155
@@ -729,7 +729,6 @@ get_access_info (GnomeVFSFileInfo *file_
       * of the access calls
       */
 #ifdef G_OS_WIN32
-	file_info->permissions = 0;
 	if (g_access (full_name, R_OK) == 0) {
 		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE;
 	}
@@ -745,17 +744,16 @@ get_access_info (GnomeVFSFileInfo *file_
 	 * calls needed
 	 */
 	if (g_access (full_name, R_OK|W_OK) == 0) {
-		file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_WRITABLE;
+		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_WRITABLE;
 		if (g_access (full_name, X_OK) == 0) {
 			file_info->permissions |= GNOME_VFS_PERM_ACCESS_EXECUTABLE;
 		}
 	} else if (g_access (full_name, R_OK|X_OK) == 0) {
-		file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_EXECUTABLE;
+		file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE | GNOME_VFS_PERM_ACCESS_EXECUTABLE;
 	} else {
 		if (g_access (full_name, R_OK) == 0) {
-			file_info->permissions = GNOME_VFS_PERM_ACCESS_READABLE;
+			file_info->permissions |= GNOME_VFS_PERM_ACCESS_READABLE;
 		} else {
-			file_info->permissions = 0;
 			if (g_access (full_name, W_OK) == 0) {
 				file_info->permissions |= GNOME_VFS_PERM_ACCESS_WRITABLE;
 			}


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- gnome-vfs2.spec	27 Feb 2006 13:57:04 -0000	1.97
+++ gnome-vfs2.spec	28 Feb 2006 10:17:34 -0000	1.98
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.92
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -41,6 +41,9 @@
 
 Patch3: gnome-vfs-2.9.90-modules-conf.patch
 
+# Backport from cvs to fix permission reading
+Patch4: gnome-vfs-2.13.92-permisssions-fix.patch
+
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
 
@@ -86,6 +89,7 @@
 %setup -q -n gnome-vfs-%{version} 
 
 %patch3 -p1 -b .modules-conf
+%patch4 -p0 -b .permissions-fix
 
 # send to upstream
 %patch101 -p1 -b .schema_about
@@ -182,6 +186,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-2
+- Add patch (from cvs) that fixes permission reading
+
 * Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:17:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:17:45 -0500
Subject: rpms/gdk-pixbuf/devel gdk-pixbuf.spec,1.37,1.38
Message-ID: <200602281017.k1SAHjTa008221@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gdk-pixbuf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8178

Modified Files:
	gdk-pixbuf.spec 
Log Message:
- BuildRequires: libXt-devel

gdk-pixbuf-xlibrgb.h:61:27: error: X11/Intrinsic.h: No such file or directory
make[3]: *** [gdk-pixbuf-xlib.lo] Error 1



Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/dist/rpms/gdk-pixbuf/devel/gdk-pixbuf.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gdk-pixbuf.spec	11 Feb 2006 02:50:51 -0000	1.37
+++ gdk-pixbuf.spec	28 Feb 2006 10:17:40 -0000	1.38
@@ -1,6 +1,6 @@
 Name: gdk-pixbuf
 Version: 0.22.0
-Release: 21.2.1
+Release: 22
 Epoch: 1
 Summary: An image loading library used with GNOME.
 License: LGPL
@@ -63,6 +63,7 @@
 %define old_automake 0
 BuildPrereq: /usr/bin/automake-1.4
 BuildRequires: libpng-devel >= 1.2.2
+BuildRequires: libXt-devel
 
 %description
 The gdk-pixbuf package contains an image loading library used with the
@@ -197,6 +198,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.22.0-22
+- BuildRequires: libXt-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.22.0-21.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:53:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:53:12 -0500
Subject: rpms/gedit/devel gedit.spec,1.75,1.76
Message-ID: <200602281053.k1SArCXq021113@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gedit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21100

Modified Files:
	gedit.spec 
Log Message:
- BuildRequire: gnome-doc-utils

checking for GDU_MODULE_VERSION_CHECK... configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met.
error: Bad exit status from /var/tmp/rpm-tmp.95763 (%build)



Index: gedit.spec
===================================================================
RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- gedit.spec	27 Feb 2006 04:14:14 -0000	1.75
+++ gedit.spec	28 Feb 2006 10:53:09 -0000	1.76
@@ -10,13 +10,14 @@
 %define gtksourceview_version 1.1.91
 %define pygtk_version 2.7.1
 %define gnome_python_desktop_version 2.13.3
+%define gnome_doc_utils_version 0.3.2
 
 %define po_package gedit
 
 Summary:	gEdit is a small but powerful text editor for GNOME.
 Name:		gedit
 Version: 	2.13.92
-Release: 	1	
+Release: 	2	
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -49,7 +50,8 @@
 BuildRequires: pygtk2-devel >= %{pygtk_version}
 BuildRequires: python-devel
 BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
-BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop_version}
+BuildRequires: gnome-python2-gtksourceview >= %{gnome_python_desktop_version}
+BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libgnomeprintui22 >= %{libgnomeprintui_version}
@@ -156,6 +158,9 @@
 %{_libdir}/pkgconfig/gedit-2.14.pc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.92-2	
+- BuildRequire: gnome-doc-utils
+
 * Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 10:56:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 05:56:28 -0500
Subject: rpms/gmime/devel gmime.spec,1.9,1.10
Message-ID: <200602281056.k1SAuSpU030173@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30010

Modified Files:
	gmime.spec 
Log Message:
- BuildRequires: gtk-sharp2

checking for GTK_SHARP... configure: error: Package requirements (gtk-sharp-2.0 >= 2.4.0) were not met.



Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gmime.spec	13 Feb 2006 03:43:01 -0000	1.9
+++ gmime.spec	28 Feb 2006 10:56:25 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gmime
 Version:        2.1.19
-Release:        3
+Release:        4
 Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@
 
 BuildRequires:  glib2-devel >= 2.0.0
 BuildRequires:  zlib-devel >= 1.2.1.1
+BuildRequires:  gtk-sharp2 >= 2.4.0
 
 # Mono only availible on these:
 %define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
@@ -109,6 +110,9 @@
 %endif
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.1.19-4
+- BuildRequires: gtk-sharp2
+
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-3
 - Rebuild
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 11:13:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 06:13:27 -0500
Subject: rpms/php/devel php.spec,1.106,1.107
Message-ID: <200602281113.k1SBDRie002038@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2007

Modified Files:
	php.spec 
Log Message:
* 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)



Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- php.spec	11 Feb 2006 06:54:03 -0000	1.106
+++ php.spec	28 Feb 2006 11:13:24 -0000	1.107
@@ -1,9 +1,10 @@
 %define contentdir /var/www
+%define apiver 20041225
 
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.1.2
-Release: 4.3
+Release: 5
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
@@ -42,6 +43,14 @@
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
 Requires: file >= 4.0, php-pear
+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-pcntl, php-pcre, 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
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -57,6 +66,7 @@
 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
@@ -98,6 +108,7 @@
 Summary: A database access abstraction module for PHP applications
 Group: Development/Languages
 Requires: php = %{version}-%{release}
+Obsoletes: php-pecl-pdo-sqlite, php-pecl-pdo
 
 %description pdo
 The php-pdo package contains a dynamic shared object that will add
@@ -280,6 +291,14 @@
 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
+
 %build
 # Force use of system libtool:
 libtoolize --force --copy
@@ -440,6 +459,9 @@
 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
 
@@ -506,6 +528,7 @@
 %{_mandir}/man?/*
 %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
@@ -537,6 +560,12 @@
 %files pdo -f files.pdo
 
 %changelog
+* 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)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 11:13:45 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 06:13:45 -0500
Subject: rpms/libwmf/devel libwmf-0.2.8.4-deps.patch, NONE, 1.1 libwmf.spec,
	1.18, 1.19
Message-ID: <200602281113.k1SBDjGN002201@cvs.devel.redhat.com>

Author: caolanm

Update of /cvs/dist/rpms/libwmf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2168

Modified Files:
	libwmf.spec 
Added Files:
	libwmf-0.2.8.4-deps.patch 
Log Message:
rh#143096# extra deps according to libwmf-devel

libwmf-0.2.8.4-deps.patch:
 libwmf-config.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libwmf-0.2.8.4-deps.patch ---
--- libwmf-0.2.8.3/libwmf-config.in.noextras-2	2004-02-10 06:41:26.000000000 -0600
+++ libwmf-0.2.8.3/libwmf-config.in	2005-07-06 15:18:26.000000000 -0500
@@ -105,7 +105,7 @@
 
 libwmf_buildstyle=@LIBWMF_BUILDSTYLE@
 if test $libwmf_buildstyle = heavy; then
-	wmf_libs="-lwmf -lwmflite $wmf_liblflags"
+	wmf_libs="-lwmf -lwmflite"
 else
 	wmf_libs="-lwmflite"
 fi
@@ -116,7 +116,7 @@
 		includes="$includes -I at includedir@/libwmf/gd"
 	fi
 	if test "$lib_wmf" = "yes"; then
-		includes="$includes -I at includedir@"
+		includes="$includes"
 	fi
 	echo $includes
 fi
@@ -134,5 +134,5 @@
 		fi
 	done
 
-	echo $libdirs $my_wmf_libs
+	echo $my_wmf_libs
 fi      


Index: libwmf.spec
===================================================================
RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libwmf.spec	11 Feb 2006 04:16:11 -0000	1.18
+++ libwmf.spec	28 Feb 2006 11:13:42 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 4.2
+Release: 5
 Group: System Environment/Libraries
 License: LGPL
 Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
@@ -9,6 +9,7 @@
 Patch0: libwmf-0.2.8.3-nodocs.patch
 Patch1: libwmf-0.2.8.3-relocatablefonts.patch
 Patch2: libwmf-0.2.8.4-fallbackfont.patch
+Patch3: libwmf-0.2.8.4-deps.patch
 Requires: gtk2 >= 2.4.1-2
 Requires: libxml2 >= 2.6.8
 Requires: gd >= 2.0.21
@@ -42,6 +43,7 @@
 %patch0 -p1 -b .nodocs
 %patch1 -p1 -b .relocatablefonts
 %patch2 -p1 -b .fallbackfont
+%patch3 -p1 -b .deps
 
 %build
 rm configure.ac
@@ -98,6 +100,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 28 2006 Caolan McNamara <caolanm at redhat.com> 0.2.8.4-5
+- rh#143096# extra deps according to libwmf-config
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.2.8.4-4.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 11:14:14 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 06:14:14 -0500
Subject: rpms/mc/devel mc-extensions.patch, 1.6, 1.7 mc-showfree.patch, 1.4,
	1.5 mc.spec, 1.81, 1.82
Message-ID: <200602281114.k1SBEEEJ002474@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2329

Modified Files:
	mc-extensions.patch mc-showfree.patch mc.spec 
Log Message:
* Tue Feb 28 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-9
- fix hotkey conflict in Layout options (#183282)
- move syntax configuration file from /usr/share/mc to /etc/mc
- save layout settings pernamently for showing free space, not
  only for current session (#182127)
- fix audio bindings, make firefox default html binding


mc-extensions.patch:
 configure     |    2 +-
 configure.ac  |    2 +-
 lib/mc.ext.in |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 45 insertions(+), 11 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-extensions.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mc-extensions.patch	1 Feb 2006 15:10:24 -0000	1.6
+++ mc-extensions.patch	28 Feb 2006 11:14:11 -0000	1.7
@@ -1,3 +1,25 @@
+--- mc-4.6.1a/configure.ac.extensions	2005-11-11 03:03:55.000000000 +0100
++++ mc-4.6.1a/configure.ac	2006-02-28 11:54:30.000000000 +0100
+@@ -83,7 +83,7 @@ AC_PROG_LN_S
+ AC_CHECK_TOOL(AR, ar, ar)
+ 
+ dnl Only list browsers here that can be run in background (i.e. with `&')
+-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
++AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
+ 
+ dnl
+ dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
+--- mc-4.6.1a/configure.extensions	2006-02-15 21:12:35.000000000 +0100
++++ mc-4.6.1a/configure	2006-02-28 12:03:54.000000000 +0100
+@@ -5791,7 +5791,7 @@ else
+ fi
+ 
+ 
+-for ac_prog in gnome-moz-remote mozilla konqueror opera netscape
++for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
 --- mc-4.6.1a/lib/mc.ext.in.extensions	2005-09-06 11:20:01.000000000 +0200
 +++ mc-4.6.1a/lib/mc.ext.in	2005-12-06 09:22:37.000000000 +0100
 @@ -216,14 +221,25 @@ shell/.7z
@@ -81,7 +103,7 @@
  	Open=mplayer -vo null %f
  	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
  
-+Include/audio
++include/audio
 +	Open=mplayer %f
 +	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
  

mc-showfree.patch:
 layout.c |   49 ++++++++++++++++++++++++++++---------------------
 layout.h |    1 +
 screen.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 setup.c  |    1 +
 4 files changed, 75 insertions(+), 21 deletions(-)

Index: mc-showfree.patch
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc-showfree.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mc-showfree.patch	1 Feb 2006 15:10:24 -0000	1.4
+++ mc-showfree.patch	28 Feb 2006 11:14:11 -0000	1.5
@@ -1,5 +1,15 @@
---- mc-4.6.1a/src/screen.c.showfree	2006-02-01 15:47:58.000000000 +0100
-+++ mc-4.6.1a/src/screen.c	2006-02-01 15:47:58.000000000 +0100
+--- mc-4.6.1a/src/setup.c.showfree	2006-01-29 21:26:05.000000000 +0100
++++ mc-4.6.1a/src/setup.c	2006-02-28 11:43:49.000000000 +0100
+@@ -133,6 +133,7 @@ static const struct {
+     { "show_mini_info", &show_mini_info },
+     { "permission_mode", &permission_mode },
+     { "filetype_mode", &filetype_mode },
++    { "free_space", &free_space },
+     { 0, 0 }
+ };
+ 
+--- mc-4.6.1a/src/screen.c.showfree	2006-02-28 11:42:47.000000000 +0100
++++ mc-4.6.1a/src/screen.c	2006-02-28 11:42:48.000000000 +0100
 @@ -49,6 +49,7 @@
  #define WANT_WIDGETS
  #include "main.h"		/* the_menubar */
@@ -80,8 +90,8 @@
      if (panel->active)
  	standend ();
  }
---- mc-4.6.1a/src/layout.c.showfree	2006-02-01 15:47:58.000000000 +0100
-+++ mc-4.6.1a/src/layout.c	2006-02-01 15:48:27.000000000 +0100
+--- mc-4.6.1a/src/layout.c.showfree	2006-02-28 11:42:47.000000000 +0100
++++ mc-4.6.1a/src/layout.c	2006-02-28 11:42:48.000000000 +0100
 @@ -99,6 +99,9 @@ int message_visible = 1;
  /* Set to show current working dir in xterm window title */
  int xterm_title = 1;
@@ -104,7 +114,7 @@
      int    *variable;
      WCheck *widget;
  } check_options [] = {
-+    { N_("show free &Space"),  &free_space,      0 },
++    { N_("show free sp&Ace"),  &free_space,      0 },
      { N_("&Xterm window title"), &xterm_title,   0 },
      { N_("h&Intbar visible"),  &message_visible, 0 },
      { N_("&Keybar visible"),   &keybar_visible,  0 },
@@ -218,7 +228,7 @@
      add_widget (layout_dlg, radio_widget);
      radio_widget->sel = horizontal_split;
 --- mc-4.6.1a/src/layout.h.showfree	2004-12-03 20:17:47.000000000 +0100
-+++ mc-4.6.1a/src/layout.h	2006-02-01 15:47:58.000000000 +0100
++++ mc-4.6.1a/src/layout.h	2006-02-28 11:42:48.000000000 +0100
 @@ -39,6 +39,7 @@ extern int keybar_visible;
  extern int output_start_y;
  extern int message_visible;


Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mc.spec	25 Feb 2006 11:34:56 -0000	1.81
+++ mc.spec	28 Feb 2006 11:14:11 -0000	1.82
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell.
 Name:		mc
 Version:	4.6.1a
-Release:	8
+Release:	9
 Epoch:		1
 License:	GPL
 Group:		System Environment/Shells
@@ -109,6 +109,7 @@
 popd
 
 %build
+export CC="ccache gcc"
 export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
 	     --host=%{_host} --build=%{_build} \
@@ -138,6 +139,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
 %{makeinstall} sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -147,6 +149,7 @@
 mv -f $RPM_BUILD_ROOT%{_datadir}/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,\
 mc.ext,mc.lib,mc.menu,mc.charsets} $RPM_BUILD_ROOT%{_sysconfdir}/mc
 mv -f $RPM_BUILD_ROOT%{_datadir}/mc/extfs/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
+mv -f $RPM_BUILD_ROOT%{_datadir}/mc/syntax/Syntax $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
 # install man pages in various languages
 for l in es hu it pl ru sr; do
@@ -190,6 +193,13 @@
 %dir %{_sysconfdir}/mc
 
 %changelog
+* Tue Feb 28 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-9
+- fix hotkey conflict in Layout options (#183282)
+- move syntax configuration file from /usr/share/mc to /etc/mc
+- save layout settings pernamently for showing free space, not
+  only for current session (#182127)
+- fix audio bindings, make firefox default html binding
+
 * Sat Feb 25 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-8
 - make mc FHS compliant: store config files in /etc/mc and
   extfs/*.ini files in /etc/mc/extfs instead of /usr/share/mc



From fedora-cvs-commits at redhat.com  Tue Feb 28 11:14:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 06:14:57 -0500
Subject: rpms/mc/devel mc.spec,1.82,1.83
Message-ID: <200602281114.k1SBEvbn002827@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/mc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2639

Modified Files:
	mc.spec 
Log Message:
- spec cleanup



Index: mc.spec
===================================================================
RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mc.spec	28 Feb 2006 11:14:11 -0000	1.82
+++ mc.spec	28 Feb 2006 11:14:54 -0000	1.83
@@ -109,7 +109,6 @@
 popd
 
 %build
-export CC="ccache gcc"
 export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
 	     --host=%{_host} --build=%{_build} \



From fedora-cvs-commits at redhat.com  Tue Feb 28 11:34:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 06:34:41 -0500
Subject: rpms/gkrellm/devel gkrellm.spec,1.30,1.31
Message-ID: <200602281134.k1SBYfMi022375@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22312

Modified Files:
	gkrellm.spec 
Log Message:
- BuildRequires: libSM-devel

winops-x11.c:35:26: error: X11/SM/SMlib.h: No such file or directory



Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gkrellm.spec	15 Feb 2006 15:44:38 -0000	1.30
+++ gkrellm.spec	28 Feb 2006 11:34:32 -0000	1.31
@@ -2,7 +2,7 @@
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
 Version:	2.2.7
-Release:    6
+Release:    7
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -16,7 +16,7 @@
 Patch3:		gkrellm-2.2.4-sansfont.patch
 Patch4:		gkrellm-2.2.7-width.patch
 Conflicts:	kernel < 2.6.2
-BuildRequires:	gtk2-devel, gettext, ImageMagick, openssl-devel
+BuildRequires:	gtk2-devel, gettext, ImageMagick, openssl-devel, libSM-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %define desktop_file_utils_version 0.3-9
@@ -184,6 +184,9 @@
 %endif
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.2.7-7
+- BuildRequires: libSM-devel
+
 * Wed Feb 15 2006 Karsten Hopp <karsten at redhat.de> 2.2.7-6
 - fix chkconfig requires
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 12:59:08 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 07:59:08 -0500
Subject: rpms/netpbm/devel netpbm-10.19-message.patch, 1.1,
	1.2 netpbm-10.23-security.patch, 1.12,
	1.13 netpbm-10.27-bmptopnm.patch, 1.2,
	1.3 netpbm-10.29-pnmtopng.patch, 1.3, 1.4 netpbm.spec, 1.55,
	1.56 netpbm-10.31-msbmp.patch, 1.1, NONE
Message-ID: <200602281259.k1SCx8dw018943@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18852

Modified Files:
	netpbm-10.19-message.patch netpbm-10.23-security.patch 
	netpbm-10.27-bmptopnm.patch netpbm-10.29-pnmtopng.patch 
	netpbm.spec 
Removed Files:
	netpbm-10.31-msbmp.patch 
Log Message:
* Tue Feb 28 2006 Jindrich Novy <jnovy at redhat.com> 10.32-1
- update to 10.32
- drop .msbmp patch, aplied upstream
- sync the rest of the patches
- regenerate man pages


netpbm-10.19-message.patch:
 giftopnm.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: netpbm-10.19-message.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.19-message.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.19-message.patch	9 Sep 2004 09:16:45 -0000	1.1
+++ netpbm-10.19-message.patch	28 Feb 2006 12:59:02 -0000	1.2
@@ -1,11 +1,10 @@
---- netpbm-10.19/converter/other/giftopnm.c.message	2003-10-30 02:46:12.000000000 +0100
-+++ netpbm-10.19/converter/other/giftopnm.c	2004-02-09 17:02:56.964219996 +0100
-@@ -1255,7 +1255,8 @@
-                          requestedImageSeq+1,
+--- netpbm-10.32/converter/other/giftopnm.c.message	2006-02-15 23:53:45.000000000 +0100
++++ netpbm-10.32/converter/other/giftopnm.c	2006-02-27 14:47:32.000000000 +0100
+@@ -1401,7 +1401,7 @@ convertImages(FILE * const ifP, 
                           imageSeq, imageSeq>1?"s":"" );
          } else {
--            pm_message("Reading Image Sequence %d", imageSeq);
-+            if (verbose)
+             if (verbose)
+-                pm_message("Reading Image Sequence %d", imageSeq);
 +                pm_message("Reading Image Sequence %d", imageSeq+1);
              convertImage(ifP, !allImages && (imageSeq != requestedImageSeq), 
                           imageout_file, alphafile, gifScreen, gif89);

netpbm-10.23-security.patch:
 OPENLICENSE                        |  163 +++++++++++++++++++++++++++++++++++++
 analyzer/pgmhist.c                 |    1 
 analyzer/pgmtexture.c              |    9 ++
 converter/other/gemtopnm.c         |    1 
 converter/other/jpegtopnm.c        |    1 
 converter/other/pbmtopgm.c         |    1 
 converter/other/pngtopnm.c         |   19 ++--
 converter/other/pnmtoddif.c        |    2 
 converter/other/pnmtojpeg.c        |    9 +-
 converter/other/pnmtops.c          |   12 +-
 converter/other/pnmtorle.c         |    2 
 converter/other/pnmtosgi.c         |   19 ++++
 converter/other/rletopnm.c         |    2 
 converter/other/sgitopnm.c         |    6 +
 converter/other/sirtopnm.c         |    1 
 converter/other/tifftopnm.c        |    3 
 converter/other/xwdtopnm.c         |    8 +
 converter/pbm/icontopbm.c          |    6 +
 converter/pbm/mdatopbm.c           |    5 -
 converter/pbm/mgrtopbm.c           |    2 
 converter/pbm/pbmto10x.c           |    2 
 converter/pbm/pbmto4425.c          |    3 
 converter/pbm/pbmtoascii.c         |    2 
 converter/pbm/pbmtocmuwm.c         |    1 
 converter/pbm/pbmtogem.c           |    1 
 converter/pbm/pbmtogo.c            |    1 
 converter/pbm/pbmtoicon.c          |    1 
 converter/pbm/pbmtolj.c            |    4 
 converter/pbm/pbmtomacp.c          |    3 
 converter/pbm/pbmtomda.c           |    1 
 converter/pbm/pbmtomgr.c           |    1 
 converter/pbm/pbmtoppa/pbm.c       |    4 
 converter/pbm/pbmtoppa/pbmtoppa.c  |    1 
 converter/pbm/pbmtox10bm.c         |    1 
 converter/pbm/pbmtoxbm.c           |    1 
 converter/pbm/pbmtoybm.c           |    1 
 converter/pbm/pbmtozinc.c          |    1 
 converter/pbm/pktopbm.c            |    1 
 converter/pbm/thinkjettopbm.l      |    4 
 converter/pbm/ybmtopbm.c           |    1 
 converter/pgm/lispmtopgm.c         |    5 -
 converter/pgm/psidtopgm.c          |    1 
 converter/ppm/Makefile             |    2 
 converter/ppm/ilbmtoppm.c          |   28 ++++++
 converter/ppm/imgtoppm.c           |    2 
 converter/ppm/pcxtoppm.c           |    3 
 converter/ppm/picttoppm.c          |    2 
 converter/ppm/pjtoppm.c            |   21 ++--
 converter/ppm/ppmtoeyuv.c          |    1 
 converter/ppm/ppmtoicr.c           |    2 
 converter/ppm/ppmtoilbm.c          |    9 +-
 converter/ppm/ppmtolj.c            |    3 
 converter/ppm/ppmtomitsu.c         |    2 
 converter/ppm/ppmtompeg/iframe.c   |   20 ++--
 converter/ppm/ppmtompeg/parallel.c |    4 
 converter/ppm/ppmtompeg/psearch.c  |   18 +++-
 converter/ppm/ppmtompeg/rgbtoycc.c |    2 
 converter/ppm/ppmtopcx.c           |    2 
 converter/ppm/ppmtopict.c          |    2 
 converter/ppm/ppmtopj.c            |    1 
 converter/ppm/ppmtopjxl.c          |    8 +
 converter/ppm/ppmtowinicon.c       |    8 +
 converter/ppm/ppmtoxpm.c           |    2 
 converter/ppm/qrttoppm.c           |    2 
 converter/ppm/sldtoppm.c           |    4 
 converter/ppm/ximtoppm.c           |    4 
 converter/ppm/xpmtoppm.c           |    1 
 converter/ppm/yuvtoppm.c           |    1 
 doc/COPYRIGHT.PATENT               |    5 +
 editor/pamcut.c                    |    2 
 editor/pamoil.c                    |    1 
 editor/pbmclean.c                  |    2 
 editor/pbmlife.c                   |    2 
 editor/pbmpscale.c                 |    1 
 editor/pbmreduce.c                 |    1 
 editor/pnmcut.c                    |    1 
 editor/pnmgamma.c                  |    1 
 editor/pnmhisteq.c                 |    1 
 editor/pnmindex.csh                |    3 
 editor/pnmpad.c                    |    2 
 editor/pnmpaste.c                  |    5 +
 editor/pnmremap.c                  |    2 
 editor/pnmscalefixed.c             |    7 +
 editor/pnmshear.c                  |    6 +
 editor/ppmdither.c                 |    6 +
 generator/pbmpage.c                |    3 
 generator/pbmtext.c                |   15 +++
 generator/pgmcrater.c              |    2 
 generator/pgmkernel.c              |    2 
 generator/ppmrainbow               |    2 
 lib/libpam.c                       |    3 
 lib/libpammap.c                    |    2 
 lib/libpbm1.c                      |    1 
 lib/libpbmvms.c                    |    2 
 lib/libpm.c                        |   54 +++++++++++-
 lib/pm.h                           |    6 +
 other/pnmcolormap.c                |    1 
 urt/README                         |    5 +
 urt/Runput.c                       |   10 +-
 urt/rle.h                          |   13 ++
 urt/rle_addhist.c                  |   15 ++-
 urt/rle_getrow.c                   |    3 
 urt/rle_hdr.c                      |   19 +++-
 urt/rle_open_f.c                   |    8 +
 urt/rle_putcom.c                   |    6 +
 urt/scanargs.c                     |    6 -
 106 files changed, 627 insertions(+), 66 deletions(-)

Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.23-security.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- netpbm-10.23-security.patch	30 Dec 2005 14:10:17 -0000	1.12
+++ netpbm-10.23-security.patch	28 Feb 2006 12:59:02 -0000	1.13
@@ -1,5 +1,5 @@
---- /dev/null	2005-12-28 07:55:55.980549750 +0100
-+++ netpbm-10.31/OPENLICENSE	2005-12-30 10:44:51.000000000 +0100
+--- /dev/null	2006-02-27 10:00:27.892419250 +0100
++++ netpbm-10.32/OPENLICENSE	2006-02-27 14:48:10.000000000 +0100
 @@ -0,0 +1,163 @@
 +			The Open Software License
 +			v. 1.1
@@ -164,8 +164,8 @@
 +Permission is hereby granted to copy and distribute this license without 
 +modification. This license may not be modified without the express written 
 +permission of its copyright owner.
---- netpbm-10.31/generator/pbmtext.c.security	2005-07-18 03:14:10.000000000 +0200
-+++ netpbm-10.31/generator/pbmtext.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/generator/pbmtext.c.security	2005-07-18 03:14:10.000000000 +0200
++++ netpbm-10.32/generator/pbmtext.c	2006-02-27 14:48:10.000000000 +0100
 @@ -89,12 +89,14 @@ parse_command_line(int argc, char ** arg
          
          for (i = 1; i < argc; i++) {
@@ -230,8 +230,8 @@
      cols = 2 * hmargin + maxwidth;
      bits = pbm_allocarray(cols, rows);
  
---- netpbm-10.31/generator/pgmkernel.c.security	2003-07-06 22:03:29.000000000 +0200
-+++ netpbm-10.31/generator/pgmkernel.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/generator/pgmkernel.c.security	2003-07-06 22:03:29.000000000 +0200
++++ netpbm-10.32/generator/pgmkernel.c	2006-02-27 14:48:10.000000000 +0100
 @@ -68,7 +68,7 @@ main ( argc, argv )
      kycenter = (fysize - 1) / 2.0;
      ixsize = fxsize + 0.999;
@@ -241,8 +241,8 @@
      for (i = 0; i < iysize; i++) 
          for (j = 0; j < ixsize; j++) {
              fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
---- netpbm-10.31/generator/pgmcrater.c.security	2005-12-22 10:28:49.000000000 +0100
-+++ netpbm-10.31/generator/pgmcrater.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/generator/pgmcrater.c.security	2005-12-22 10:28:49.000000000 +0100
++++ netpbm-10.32/generator/pgmcrater.c	2006-02-27 14:48:10.000000000 +0100
 @@ -131,7 +131,7 @@ static void gencraters()
      /* Acquire the elevation array and initialize it to mean
         surface elevation. */
@@ -252,8 +252,8 @@
      if (aux == NULL) 
          pm_error("out of memory allocating elevation array");
  
---- netpbm-10.31/generator/pbmpage.c.security	2005-08-27 19:27:19.000000000 +0200
-+++ netpbm-10.31/generator/pbmpage.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/generator/pbmpage.c.security	2005-08-27 19:27:19.000000000 +0200
++++ netpbm-10.32/generator/pbmpage.c	2006-02-27 14:48:10.000000000 +0100
 @@ -170,6 +170,9 @@ outputPbm(FILE *        const file,
      /* We round the allocated row space up to a multiple of 8 so the ugly
         fast code below can work.
@@ -264,8 +264,8 @@
      pbmrow = pbm_allocrow(((bitmap.Width+7)/8)*8);
      
      bitmap_cursor = 0;
---- netpbm-10.31/generator/ppmrainbow.security	2003-01-04 01:40:56.000000000 +0100
-+++ netpbm-10.31/generator/ppmrainbow	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/generator/ppmrainbow.security	2003-01-04 01:40:56.000000000 +0100
++++ netpbm-10.32/generator/ppmrainbow	2006-02-27 14:48:10.000000000 +0100
 @@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v
  # set defaults
  $Twid = 600;
@@ -275,8 +275,8 @@
  $norepeat = $FALSE;
  $verbose = $FALSE;
  
---- netpbm-10.31/other/pnmcolormap.c.security	2005-12-21 05:35:06.000000000 +0100
-+++ netpbm-10.31/other/pnmcolormap.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/other/pnmcolormap.c.security	2005-12-21 05:35:06.000000000 +0100
++++ netpbm-10.32/other/pnmcolormap.c	2006-02-27 14:48:10.000000000 +0100
 @@ -836,6 +836,7 @@ colormapToSquare(struct pam * const pamP
              pamP->width = intsqrt;
          else 
@@ -285,8 +285,8 @@
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
---- netpbm-10.31/doc/COPYRIGHT.PATENT.security	2004-05-01 01:54:22.000000000 +0200
-+++ netpbm-10.31/doc/COPYRIGHT.PATENT	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/doc/COPYRIGHT.PATENT.security	2004-05-01 01:54:22.000000000 +0200
++++ netpbm-10.32/doc/COPYRIGHT.PATENT	2006-02-27 14:48:10.000000000 +0100
 @@ -33,6 +33,11 @@ no warranties regarding any of the code 
  all the above to be modified by "to the best of the Netpbm
  maintainer's knowledge."
@@ -299,8 +299,8 @@
  
  
  PATENTS
---- netpbm-10.31/converter/pgm/psidtopgm.c.security	2005-08-27 20:38:40.000000000 +0200
-+++ netpbm-10.31/converter/pgm/psidtopgm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pgm/psidtopgm.c.security	2005-08-27 20:38:40.000000000 +0200
++++ netpbm-10.32/converter/pgm/psidtopgm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -78,6 +78,7 @@ main(int     argc,
          pm_error("bits/sample (%d) is too large.", bitspersample);
  
@@ -309,8 +309,8 @@
      grayrow = pgm_allocrow((cols + 7) / 8 * 8);
      for (row = 0; row < rows; ++row) {
          unsigned int col;
---- netpbm-10.31/converter/pgm/lispmtopgm.c.security	2005-10-07 09:03:29.000000000 +0200
-+++ netpbm-10.31/converter/pgm/lispmtopgm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pgm/lispmtopgm.c.security	2005-10-07 09:03:29.000000000 +0200
++++ netpbm-10.32/converter/pgm/lispmtopgm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -58,6 +58,7 @@ main( argc, argv )
          pm_error( "depth (%d bits) is too large", depth);
  
@@ -330,8 +330,8 @@
      *padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
      
      if ( *colsP != (cols_32 - *padrightP) ) {
---- netpbm-10.31/converter/ppm/pjtoppm.c.security	2003-07-06 23:45:36.000000000 +0200
-+++ netpbm-10.31/converter/ppm/pjtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/pjtoppm.c.security	2003-07-06 23:45:36.000000000 +0200
++++ netpbm-10.32/converter/ppm/pjtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -127,19 +127,21 @@ main(argc, argv)
                  case 'V':   /* send plane */
                  case 'W':   /* send last plane */
@@ -381,8 +381,8 @@
          cols *= 8;
      }
              
---- netpbm-10.31/converter/ppm/ppmtoicr.c.security	2003-02-22 23:05:03.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtoicr.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtoicr.c.security	2003-02-22 23:05:03.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtoicr.c	2006-02-27 14:48:10.000000000 +0100
 @@ -169,7 +169,7 @@ char* argv[];
  
  	if (rleflag) {	
@@ -392,8 +392,8 @@
  		p = testimage;
  		for (i=0; i<rows; i++)
  			for (j=0; j<cols; j++) 
---- netpbm-10.31/converter/ppm/qrttoppm.c.security	1993-10-04 10:12:56.000000000 +0100
-+++ netpbm-10.31/converter/ppm/qrttoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/qrttoppm.c.security	1993-10-04 10:12:56.000000000 +0100
++++ netpbm-10.32/converter/ppm/qrttoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -46,7 +46,7 @@ main( argc, argv )
  
      ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@@ -403,8 +403,8 @@
      if ( buf == (unsigned char *) 0 )
  	pm_error( "out of memory" );
  
---- netpbm-10.31/converter/ppm/ppmtompeg/parallel.c.security	2005-07-14 22:11:06.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtompeg/parallel.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtompeg/parallel.c.security	2005-07-14 22:11:06.000000000 +0200
++++ netpbm-10.32/converter/ppm/ppmtompeg/parallel.c	2006-02-27 14:48:10.000000000 +0100
 @@ -2097,7 +2097,9 @@ DecodeServer(int          const numInput
      const char * error;
  
@@ -416,8 +416,8 @@
      ready = (boolean *) calloc(numInputFiles, sizeof(boolean));
      waitMachine = (int *) calloc(numInputFiles, sizeof(int));
      waitPort = (int *) malloc(numMachines*sizeof(int));
---- netpbm-10.31/converter/ppm/ppmtompeg/rgbtoycc.c.security	2004-11-13 23:13:03.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtompeg/rgbtoycc.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtompeg/rgbtoycc.c.security	2004-11-13 23:13:03.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtompeg/rgbtoycc.c	2006-02-27 14:48:10.000000000 +0100
 @@ -72,6 +72,8 @@ compute_mult_tables(const pixval maxval)
          } 
          table_maxval = maxval;
@@ -427,9 +427,9 @@
          mult299   = malloc((table_maxval+1)*sizeof(float));
          mult587   = malloc((table_maxval+1)*sizeof(float));
          mult114   = malloc((table_maxval+1)*sizeof(float));
---- netpbm-10.31/converter/ppm/ppmtompeg/psearch.c.security	2005-10-16 19:10:02.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtompeg/psearch.c	2005-12-30 10:44:51.000000000 +0100
-@@ -219,7 +219,14 @@ SetSearchRange(int const pixelsP, int co
+--- netpbm-10.32/converter/ppm/ppmtompeg/psearch.c.security	2006-01-24 05:33:37.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtompeg/psearch.c	2006-02-27 14:48:10.000000000 +0100
+@@ -214,7 +214,14 @@ SetSearchRange(int const pixelsP, int co
          int const max_search = max(searchRangeP, searchRangeB);
  
          int index;
@@ -445,7 +445,7 @@
          pmvHistogram = (int **) malloc((2*searchRangeP+3)*sizeof(int *));
          bbmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
          bfmvHistogram = (int **) malloc((2*searchRangeB+3)*sizeof(int *));
-@@ -845,6 +852,9 @@ ShowPMVHistogram(fpointer)
+@@ -798,6 +805,9 @@ ShowPMVHistogram(fpointer)
      int *columnTotals;
      int rowTotal;
  
@@ -455,7 +455,7 @@
      columnTotals = (int *) calloc(2*searchRangeP+3, sizeof(int));
  
  #ifdef COMPLETE_DISPLAY
-@@ -892,6 +902,9 @@ ShowBBMVHistogram(fpointer)
+@@ -845,6 +855,9 @@ ShowBBMVHistogram(fpointer)
  
      fprintf(fpointer, "B-frame Backwards:\n");
  
@@ -465,7 +465,7 @@
      columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
  
  #ifdef COMPLETE_DISPLAY
-@@ -939,6 +952,9 @@ ShowBFMVHistogram(fpointer)
+@@ -892,6 +905,9 @@ ShowBFMVHistogram(fpointer)
  
      fprintf(fpointer, "B-frame Forwards:\n");
  
@@ -475,205 +475,9 @@
      columnTotals = (int *) calloc(2*searchRangeB+3, sizeof(int));
  
  #ifdef COMPLETE_DISPLAY
---- netpbm-10.31/converter/ppm/ppmtompeg/frame.c.security	2005-09-17 23:43:35.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtompeg/frame.c	2005-12-30 10:44:51.000000000 +0100
-@@ -144,24 +144,24 @@ Resize_Width(MpegFrame * const omfrw,
-     Fsize_x = out_x;
- 
-     /* Allocate new frame memory */
--    omfrw->orig_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y);
-+    omfrw->orig_y = (uint8 **) malloc2(sizeof(uint8 *), Fsize_y);
-     ERRCHK(omfrw->orig_y, "malloc");
-     for (y = 0; y < Fsize_y; ++y) {
--        omfrw->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * out_x);
-+        omfrw->orig_y[y] = (uint8 *) malloc2(sizeof(uint8), out_x);
-         ERRCHK(omfrw->orig_y[y], "malloc");
-     }
- 
--    omfrw->orig_cr = (uint8 **) malloc(sizeof(int8 *) * Fsize_y / 2);
-+    omfrw->orig_cr = (uint8 **) malloc2(sizeof(int8 *), Fsize_y / 2);
-     ERRCHK(omfrw->orig_cr, "malloc");
-     for (y = 0; y < Fsize_y / 2; ++y) {
--        omfrw->orig_cr[y] = (uint8 *) malloc(sizeof(int8) * out_x / 2);
-+        omfrw->orig_cr[y] = (uint8 *) malloc2(sizeof(int8), out_x / 2);
-         ERRCHK(omfrw->orig_cr[y], "malloc");
-     }
- 
--    omfrw->orig_cb = (uint8 **) malloc(sizeof(int8 *) * Fsize_y / 2);
-+    omfrw->orig_cb = (uint8 **) malloc2(sizeof(int8 *), Fsize_y / 2);
-     ERRCHK(omfrw->orig_cb, "malloc");
-     for (y = 0; y < Fsize_y / 2; ++y) {
--        omfrw->orig_cb[y] = (uint8 *) malloc(sizeof(int8) * out_x / 2);
-+        omfrw->orig_cb[y] = (uint8 *) malloc2(sizeof(int8), out_x / 2);
-         ERRCHK(omfrw->orig_cb[y], "malloc");
-     }
- 
-@@ -217,24 +217,24 @@ Resize_Height(MpegFrame * const omfrh,
-     Fsize_y = out_y;
- 
-     /* Allocate new frame memory */
--    omfrh->orig_y = (uint8 **) malloc(sizeof(uint8 *) * out_y);
-+    omfrh->orig_y = (uint8 **) malloc2(sizeof(uint8 *), out_y);
-     ERRCHK(omfrh->orig_y, "malloc");
-     for (y = 0; y < out_y; ++y) {
--        omfrh->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x);
-+        omfrh->orig_y[y] = (uint8 *) malloc2(sizeof(uint8), Fsize_x);
-         ERRCHK(omfrh->orig_y[y], "malloc");
-     }
- 
--    omfrh->orig_cr = (uint8 **) malloc(sizeof(int8 *) * out_y / 2);
-+    omfrh->orig_cr = (uint8 **) malloc2(sizeof(int8 *), out_y / 2);
-     ERRCHK(omfrh->orig_cr, "malloc");
-     for (y = 0; y < out_y / 2; ++y) {
--        omfrh->orig_cr[y] = (uint8 *) malloc(sizeof(int8) * Fsize_x / 2);
-+        omfrh->orig_cr[y] = (uint8 *) malloc2(sizeof(int8), Fsize_x / 2);
-         ERRCHK(omfrh->orig_cr[y], "malloc");
-     }
- 
--    omfrh->orig_cb = (uint8 **) malloc(sizeof(int8 *) * out_y / 2);
-+    omfrh->orig_cb = (uint8 **) malloc2(sizeof(int8 *), out_y / 2);
-     ERRCHK(omfrh->orig_cb, "malloc");
-     for (y = 0; y < out_y / 2; ++y) {
--        omfrh->orig_cb[y] = (uint8 *) malloc(sizeof(int8) * Fsize_x / 2);
-+        omfrh->orig_cb[y] = (uint8 *) malloc2(sizeof(int8), Fsize_x / 2);
-         ERRCHK(omfrh->orig_cb[y], "malloc");
-     }
- 
-@@ -441,6 +441,7 @@ Frame_Init(unsigned int numOfFramesReque
- 
-     for (idx = 0; idx < numOfFrames; ++idx) {
-         frameMemory[idx] = (MpegFrame *) malloc(sizeof(MpegFrame));
-+	ERRCHK(frameMemory[idx], "malloc");
-         frameMemory[idx]->inUse = FALSE;
-         frameMemory[idx]->orig_y = NULL;    
-         frameMemory[idx]->y_blocks = NULL; 
-@@ -615,22 +616,22 @@ Frame_AllocBlocks(MpegFrame * const fram
- 
-         unsigned int i;
- 
--        frame->y_blocks = (Block **) malloc(sizeof(Block *) * dcty);
-+        frame->y_blocks = (Block **) malloc2(sizeof(Block *), dcty);
-         ERRCHK(frame->y_blocks, "malloc");
-         for (i = 0; i < dcty; ++i) {
--            frame->y_blocks[i] = (Block *) malloc(sizeof(Block) * dctx);
-+            frame->y_blocks[i] = (Block *) malloc2(sizeof(Block), dctx);
-             ERRCHK(frame->y_blocks[i], "malloc");
-         }
-     
--        frame->cr_blocks = (Block **) malloc(sizeof(Block *) * (dcty >> 1));
--        frame->cb_blocks = (Block **) malloc(sizeof(Block *) * (dcty >> 1));
-+        frame->cr_blocks = (Block **) malloc2(sizeof(Block *), (dcty >> 1));
-+        frame->cb_blocks = (Block **) malloc2(sizeof(Block *), (dcty >> 1));
-         ERRCHK(frame->cr_blocks, "malloc");
-         ERRCHK(frame->cb_blocks, "malloc");
-         for (i = 0; i < (dcty >> 1); ++i) {
-             frame->cr_blocks[i] = (Block *)
--                malloc(sizeof(Block) * (dctx >> 1));
-+                malloc2(sizeof(Block), (dctx >> 1));
-             frame->cb_blocks[i] = (Block *)
--                malloc(sizeof(Block) * (dctx >> 1));
-+                malloc2(sizeof(Block), (dctx >> 1));
-             ERRCHK(frame->cr_blocks[i], "malloc");
-             ERRCHK(frame->cb_blocks[i], "malloc");
-         }
-@@ -662,26 +663,26 @@ Frame_AllocYCC(MpegFrame * const frame) 
-         /*
-          * first, allocate tons of memory
-          */
--        frame->orig_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y);
-+        frame->orig_y = (uint8 **) malloc2(sizeof(uint8 *), Fsize_y);
-         ERRCHK(frame->orig_y, "malloc");
-         for (y = 0; y < Fsize_y; ++y) {
--            frame->orig_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x);
-+            frame->orig_y[y] = (uint8 *) malloc2(sizeof(uint8), Fsize_x);
-             ERRCHK(frame->orig_y[y], "malloc");
-         }
- 
--        frame->orig_cr = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1));
-+        frame->orig_cr = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1));
-         ERRCHK(frame->orig_cr, "malloc");
-         for (y = 0; y < (Fsize_y >> 1); ++y) {
-             frame->orig_cr[y] = (uint8 *)
--                malloc(sizeof(int8) * (Fsize_x >> 1));
-+                malloc2(sizeof(int8), (Fsize_x >> 1));
-             ERRCHK(frame->orig_cr[y], "malloc");
-         }
- 
--        frame->orig_cb = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1));
-+        frame->orig_cb = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1));
-         ERRCHK(frame->orig_cb, "malloc");
-         for (y = 0; y < (Fsize_y >> 1); ++y) {
-             frame->orig_cb[y] = (uint8 *)
--                malloc(sizeof(int8) * (Fsize_x >> 1));
-+                malloc2(sizeof(int8), (Fsize_x >> 1));
-             ERRCHK(frame->orig_cb[y], "malloc");
-         }
- 
-@@ -713,22 +714,22 @@ Frame_AllocHalf(MpegFrame * const frame)
-     } else {
-         unsigned int y;
- 
--        frame->halfX = (uint8 **) malloc(Fsize_y*sizeof(uint8 *));
-+        frame->halfX = (uint8 **) malloc2(Fsize_y, sizeof(uint8 *));
-         ERRCHK(frame->halfX, "malloc");
--        frame->halfY = (uint8 **) malloc((Fsize_y-1)*sizeof(uint8 *));
-+        frame->halfY = (uint8 **) malloc2((Fsize_y-1), sizeof(uint8 *));
-         ERRCHK(frame->halfY, "malloc");
--        frame->halfBoth = (uint8 **) malloc((Fsize_y-1)*sizeof(uint8 *));
-+        frame->halfBoth = (uint8 **) malloc2((Fsize_y-1), sizeof(uint8 *));
-         ERRCHK(frame->halfBoth, "malloc");
-         for (y = 0; y < Fsize_y; ++y) {
--            frame->halfX[y] = (uint8 *) malloc((Fsize_x-1)*sizeof(uint8));
-+            frame->halfX[y] = (uint8 *) malloc2((Fsize_x-1), sizeof(uint8));
-             ERRCHK(frame->halfX[y], "malloc");
-         }
-         for (y = 0; y < Fsize_y-1; ++y) {
--            frame->halfY[y] = (uint8 *) malloc(Fsize_x*sizeof(uint8));
-+            frame->halfY[y] = (uint8 *) malloc2(Fsize_x, sizeof(uint8));
-             ERRCHK(frame->halfY[y], "malloc");
-         }
-         for (y = 0; y < Fsize_y-1; ++y) {
--            frame->halfBoth[y] = (uint8 *) malloc((Fsize_x-1)*sizeof(uint8));
-+            frame->halfBoth[y] = (uint8 *) malloc2((Fsize_x-1), sizeof(uint8));
-             ERRCHK(frame->halfBoth[y], "malloc");
-         }
-     }
-@@ -762,26 +763,26 @@ Frame_AllocDecoded(MpegFrame * const fra
-            it for some reason, so do it this way at least for now -- more
-            flexible
-         */
--        frame->decoded_y = (uint8 **) malloc(sizeof(uint8 *) * Fsize_y);
-+        frame->decoded_y = (uint8 **) malloc2(sizeof(uint8 *), Fsize_y);
-         ERRCHK(frame->decoded_y, "malloc");
-         for (y = 0; y < Fsize_y; ++y) {
--            frame->decoded_y[y] = (uint8 *) malloc(sizeof(uint8) * Fsize_x);
-+            frame->decoded_y[y] = (uint8 *) malloc2(sizeof(uint8), Fsize_x);
-             ERRCHK(frame->decoded_y[y], "malloc");
-         }
- 
--        frame->decoded_cr = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1));
-+        frame->decoded_cr = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1));
-         ERRCHK(frame->decoded_cr, "malloc");
-         for (y = 0; y < (Fsize_y >> 1); ++y) {
-             frame->decoded_cr[y] = (uint8 *)
--                malloc(sizeof(uint8) * (Fsize_x >> 1));
-+                malloc2(sizeof(uint8), (Fsize_x >> 1));
-             ERRCHK(frame->decoded_cr[y], "malloc");
-         }
- 
--        frame->decoded_cb = (uint8 **) malloc(sizeof(int8 *) * (Fsize_y >> 1));
-+        frame->decoded_cb = (uint8 **) malloc2(sizeof(int8 *), (Fsize_y >> 1));
-         ERRCHK(frame->decoded_cb, "malloc");
-         for (y = 0; y < (Fsize_y >> 1); ++y) {
-             frame->decoded_cb[y] = (uint8 *)
--                malloc(sizeof(uint8) * (Fsize_x >> 1));
-+                malloc2(sizeof(uint8), (Fsize_x >> 1));
-             ERRCHK(frame->decoded_cb[y], "malloc");
-         }
- 
---- netpbm-10.31/converter/ppm/ppmtompeg/iframe.c.security	2005-12-22 09:57:48.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtompeg/iframe.c	2005-12-30 14:32:29.000000000 +0100
-@@ -767,7 +767,8 @@ BlockComputeSNR(MpegFrame * const curren
+--- netpbm-10.32/converter/ppm/ppmtompeg/iframe.c.security	2006-01-22 18:38:01.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtompeg/iframe.c	2006-02-27 14:48:10.000000000 +0100
+@@ -768,7 +768,8 @@ BlockComputeSNR(MpegFrame * const curren
      if (needs_init) {
          int ysz = (Fsize_y>>3) * sizeof(int32 *);
          int xsz = (Fsize_x>>3);
@@ -683,7 +487,7 @@
          needs_init = FALSE;
          for (y=0; y<3; y++) {
              varDiff[y] = ratio[y] = total[y] = 0.0;
-@@ -786,6 +787,7 @@ BlockComputeSNR(MpegFrame * const curren
+@@ -787,6 +788,7 @@ BlockComputeSNR(MpegFrame * const curren
              fprintf(stderr, "Out of memory in BlockComputeSNR\n");
              exit(-1);
          }
@@ -691,7 +495,7 @@
          for (y = 0; y < ySize[0]>>3; y++) {
              SignalY[y]  = (int32 *) calloc(xsz,4);
              SignalCr[y]  = (int32 *) calloc(xsz,4);
-@@ -944,27 +946,27 @@ AllocDctBlocks(void) {
+@@ -945,27 +947,27 @@ AllocDctBlocks(void) {
      dctx = Fsize_x / DCTSIZE;
      dcty = Fsize_y / DCTSIZE;
  
@@ -727,8 +531,8 @@
          ERRCHK(dctr[i], "malloc");
          ERRCHK(dctb[i], "malloc");
      }
---- netpbm-10.31/converter/ppm/ppmtopj.c.security	2005-10-07 09:01:27.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtopj.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtopj.c.security	2005-10-07 09:01:27.000000000 +0200
++++ netpbm-10.32/converter/ppm/ppmtopj.c	2006-02-27 14:48:10.000000000 +0100
 @@ -179,6 +179,7 @@ char *argv[];
  	pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
  
@@ -737,8 +541,8 @@
  	obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
  	cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
  
---- netpbm-10.31/converter/ppm/imgtoppm.c.security	2002-09-06 18:30:03.000000000 +0200
-+++ netpbm-10.31/converter/ppm/imgtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/imgtoppm.c.security	2002-09-06 18:30:03.000000000 +0200
++++ netpbm-10.32/converter/ppm/imgtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -84,6 +84,7 @@ main(int argc, char ** argv) {
              len = atoi((char*) buf );
              if ( fread( buf, len, 1, ifp ) != 1 )
@@ -755,8 +559,8 @@
              if ( len != cols * rows )
                  pm_message(
                      "pixel data length (%d) does not match image size (%d)",
---- netpbm-10.31/converter/ppm/ximtoppm.c.security	2005-10-07 08:59:40.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ximtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ximtoppm.c.security	2005-10-07 08:59:40.000000000 +0200
++++ netpbm-10.32/converter/ppm/ximtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -111,6 +111,7 @@ ReadXimHeader(FILE *     const in_fp,
      header->bits_channel = atoi(a_head.bits_per_channel);
      header->alpha_flag = atoi(a_head.alpha_channel);
@@ -789,8 +593,8 @@
          header->colors = (Color *)calloc((unsigned int)header->ncolors,
                  sizeof(Color));
          if (header->colors == NULL) {
---- netpbm-10.31/converter/ppm/pcxtoppm.c.security	2005-09-17 23:47:04.000000000 +0200
-+++ netpbm-10.31/converter/ppm/pcxtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/pcxtoppm.c.security	2005-09-17 23:47:04.000000000 +0200
++++ netpbm-10.32/converter/ppm/pcxtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -407,6 +407,7 @@ pcx_planes_to_pixels(pixels, bitplanes, 
      /*
       * clear the pixel buffer
@@ -815,8 +619,8 @@
      pcxrow = (unsigned char *)
          pm_allocrow(Planes * BytesPerLine, sizeof(unsigned char));
      rawrow = (unsigned char *)pm_allocrow(rawcols, sizeof(unsigned char));
---- netpbm-10.31/converter/ppm/ppmtopict.c.security	2003-02-22 23:04:40.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtopict.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtopict.c.security	2003-02-22 23:04:40.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtopict.c	2006-02-27 14:48:10.000000000 +0100
 @@ -245,6 +245,8 @@ char *argv[];
  	putShort(stdout, 0);			/* mode */
  
@@ -826,8 +630,8 @@
  	packed = (char*) malloc((unsigned)(cols+cols/MAX_COUNT+1));
  	oc = 0;
  	for (row = 0; row < rows; row++)
---- netpbm-10.31/converter/ppm/ppmtomitsu.c.security	2005-12-22 09:54:51.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtomitsu.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtomitsu.c.security	2005-12-22 09:54:51.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtomitsu.c	2006-02-27 14:48:10.000000000 +0100
 @@ -166,6 +166,8 @@ int main( argc, argv )
          medias = MSize_User;
  
@@ -837,9 +641,9 @@
                  medias.maxcols *= 2;
                  medias.maxrows *= 2;
          }
---- netpbm-10.31/converter/ppm/ppmtoilbm.c.security	2005-12-22 09:54:38.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtoilbm.c	2005-12-30 10:44:51.000000000 +0100
-@@ -812,11 +812,15 @@ main(argc, argv)
+--- netpbm-10.32/converter/ppm/ppmtoilbm.c.security	2005-12-26 21:26:11.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtoilbm.c	2006-02-27 14:48:10.000000000 +0100
+@@ -709,11 +709,15 @@ main(argc, argv)
  
      if( mode != MODE_CMAP ) {
          register int i;
@@ -856,7 +660,7 @@
      }
  
      switch( mode ) {
-@@ -1907,6 +1911,7 @@ ppm_to_rgb8(ifp, cols, rows, maxval)
+@@ -1812,6 +1816,7 @@ ppm_to_rgb8(ifp, cols, rows, maxval)
  
      maskmethod = 0;     /* no masking - RGB8 uses genlock bits */
      compmethod = 4;     /* RGB8 files are always compressed */
@@ -864,7 +668,7 @@
      MALLOCARRAY_NOFAIL(compr_row, cols * 4);
  
      if( maxval != 255 ) {
-@@ -1995,6 +2000,7 @@ ppm_to_rgbn(ifp, cols, rows, maxval)
+@@ -1900,6 +1905,7 @@ ppm_to_rgbn(ifp, cols, rows, maxval)
  
      maskmethod = 0;     /* no masking - RGBN uses genlock bits */
      compmethod = 4;     /* RGBN files are always compressed */
@@ -872,7 +676,7 @@
      MALLOCARRAY_NOFAIL(compr_row, cols * 2);
  
      if( maxval != 15 ) {
-@@ -2477,6 +2483,7 @@ make_val_table(oldmaxval, newmaxval)
+@@ -2382,6 +2388,7 @@ make_val_table(oldmaxval, newmaxval)
      int i;
      int *table;
  
@@ -880,8 +684,8 @@
      MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
      for(i = 0; i <= oldmaxval; i++ )
          table[i] = (i * newmaxval + oldmaxval/2) / oldmaxval;
---- netpbm-10.31/converter/ppm/ilbmtoppm.c.security	2005-12-22 09:51:05.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ilbmtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ilbmtoppm.c.security	2005-12-22 09:51:05.000000000 +0100
++++ netpbm-10.32/converter/ppm/ilbmtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -595,6 +595,7 @@ decode_row(FILE *          const ifP,
      rawtype *chp;
  
@@ -960,8 +764,8 @@
          MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
          *viewportmodesP |= fakeviewport;      /* -isham/-isehb */
  
---- netpbm-10.31/converter/ppm/sldtoppm.c.security	2005-10-07 09:00:51.000000000 +0200
-+++ netpbm-10.31/converter/ppm/sldtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/sldtoppm.c.security	2005-10-07 09:00:51.000000000 +0200
++++ netpbm-10.32/converter/ppm/sldtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -306,7 +306,9 @@ static void slider(slvec, slflood)
      }
  
@@ -973,8 +777,8 @@
      pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
      PPM_ASSIGN(rgbcolor, 0, 0, 0);
      ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
---- netpbm-10.31/converter/ppm/ppmtolj.c.security	2005-11-27 07:59:21.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtolj.c	2005-12-30 10:54:29.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtolj.c.security	2005-11-27 07:59:21.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtolj.c	2006-02-27 14:48:10.000000000 +0100
 @@ -181,7 +181,8 @@ int main(int argc, char *argv[]) {
  
      ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
@@ -985,8 +789,8 @@
      obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
      cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
      if (mode == C_TRANS_MODE_DELTA)
---- netpbm-10.31/converter/ppm/ppmtopcx.c.security	2005-08-27 20:25:49.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtopcx.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtopcx.c.security	2005-08-27 20:25:49.000000000 +0200
++++ netpbm-10.32/converter/ppm/ppmtopcx.c	2006-02-27 14:48:10.000000000 +0100
 @@ -418,6 +418,8 @@ ppmTo16ColorPcx(pixel **            cons
              else                   Planes = 1;
          }
@@ -996,8 +800,8 @@
      BytesPerLine = ((cols * BitsPerPixel) + 7) / 8;
      MALLOCARRAY_NOFAIL(indexRow, cols);
      MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
---- netpbm-10.31/converter/ppm/Makefile.security	2005-12-30 10:44:51.000000000 +0100
-+++ netpbm-10.31/converter/ppm/Makefile	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/Makefile.security	2006-02-27 14:48:10.000000000 +0100
++++ netpbm-10.32/converter/ppm/Makefile	2006-02-27 14:48:10.000000000 +0100
 @@ -11,7 +11,7 @@ SUBDIRS = ppmtompeg
  
  PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
@@ -1007,8 +811,8 @@
  		ppmtoacad ppmtoarbtxt \
  		ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
  		ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
---- netpbm-10.31/converter/ppm/ppmtoxpm.c.security	2005-12-21 17:50:01.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtoxpm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtoxpm.c.security	2005-12-21 17:50:01.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtoxpm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -195,6 +195,7 @@ genNumstr(unsigned int const input, int 
      unsigned int i;
  
@@ -1025,8 +829,8 @@
      MALLOCARRAY(cmap, cmapSize);
      if (cmapP == NULL)
          pm_error("Out of memory allocating %u bytes for a color map.",
---- netpbm-10.31/converter/ppm/ppmtopjxl.c.security	2005-12-22 09:54:12.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtopjxl.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtopjxl.c.security	2005-12-22 09:54:12.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtopjxl.c	2006-02-27 14:48:10.000000000 +0100
 @@ -274,6 +274,8 @@ main(argc, argv)
        pm_error("image too large; reduce with ppmscale");
     if (maxval > PCL_MAXVAL)
@@ -1059,8 +863,8 @@
     if ((inrow = (char *)malloc((unsigned)bpp)) == NULL ||
         (outrow = (char *)malloc((unsigned)bpp*2)) == NULL ||
         (runcnt = (signed char *)malloc((unsigned)bpp)) == NULL)
---- netpbm-10.31/converter/ppm/yuvtoppm.c.security	2003-07-06 22:32:09.000000000 +0200
-+++ netpbm-10.31/converter/ppm/yuvtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/yuvtoppm.c.security	2003-07-06 22:32:09.000000000 +0200
++++ netpbm-10.32/converter/ppm/yuvtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -72,6 +72,7 @@ main(argc, argv)
  
  	ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0);
@@ -1069,16 +873,16 @@
      MALLOCARRAY(yuvbuf, (cols+1)/2);
      if (yuvbuf == NULL)
          pm_error("Unable to allocate YUV buffer for %d columns.", cols);
---- netpbm-10.31/converter/ppm/picttoppm.c.security	2005-12-22 09:51:46.000000000 +0100
-+++ netpbm-10.31/converter/ppm/picttoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/picttoppm.c.security	2005-12-22 09:51:46.000000000 +0100
++++ netpbm-10.32/converter/ppm/picttoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -1,3 +1,5 @@
 +#error "Unfixable. Don't ship me"
 +
  /*
   * picttoppm.c -- convert a MacIntosh PICT file to PPM format.
   *
---- netpbm-10.31/converter/ppm/ppmtowinicon.c.security	2005-10-07 08:14:24.000000000 +0200
-+++ netpbm-10.31/converter/ppm/ppmtowinicon.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtowinicon.c.security	2005-10-07 08:14:24.000000000 +0200
++++ netpbm-10.32/converter/ppm/ppmtowinicon.c	2006-02-27 14:48:10.000000000 +0100
 @@ -12,6 +12,7 @@
  
  #include <math.h>
@@ -1122,8 +926,8 @@
      entry->size_in_bytes = 
          xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
      if (verbose) 
---- netpbm-10.31/converter/ppm/xpmtoppm.c.security	2005-10-07 08:59:22.000000000 +0200
-+++ netpbm-10.31/converter/ppm/xpmtoppm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/xpmtoppm.c.security	2005-10-07 08:59:22.000000000 +0200
++++ netpbm-10.32/converter/ppm/xpmtoppm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -700,6 +700,7 @@ ReadXPMFile(FILE * const stream, int * c
                         &ncolors, colorsP, &ptab);
          *transparentP = -1;  /* No transparency in version 1 */
@@ -1132,8 +936,8 @@
      totalpixels = *widthP * *heightP;
      MALLOCARRAY(*dataP, totalpixels);
      if (*dataP == NULL)
---- netpbm-10.31/converter/ppm/ppmtoeyuv.c.security	2005-12-22 09:53:14.000000000 +0100
-+++ netpbm-10.31/converter/ppm/ppmtoeyuv.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/ppm/ppmtoeyuv.c.security	2005-12-22 09:53:14.000000000 +0100
++++ netpbm-10.32/converter/ppm/ppmtoeyuv.c	2006-02-27 14:48:10.000000000 +0100
 @@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
  
      int index;
@@ -1142,8 +946,8 @@
      MALLOCARRAY_NOFAIL(mult299   , maxval+1);
      MALLOCARRAY_NOFAIL(mult587   , maxval+1);
      MALLOCARRAY_NOFAIL(mult114   , maxval+1);
---- netpbm-10.31/converter/pbm/mgrtopbm.c.security	2005-02-20 20:58:25.000000000 +0100
-+++ netpbm-10.31/converter/pbm/mgrtopbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/mgrtopbm.c.security	2005-02-20 20:58:25.000000000 +0100
++++ netpbm-10.32/converter/pbm/mgrtopbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -68,6 +68,8 @@ getinit(FILE * const file, 
      if (head.h_high < ' ' || head.l_high < ' ')
          pm_error("Invalid width field in MGR header");
@@ -1153,8 +957,8 @@
      *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
      *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
      *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
---- netpbm-10.31/converter/pbm/pbmtoascii.c.security	2002-07-30 17:42:53.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtoascii.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoascii.c.security	2002-07-30 17:42:53.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtoascii.c	2006-02-27 14:48:10.000000000 +0100
 @@ -115,9 +115,11 @@ char* argv[];
          pm_usage( usage );
  
@@ -1167,8 +971,8 @@
      line = (char*) pm_allocrow( ccols + 1, sizeof(char) );
  
      for ( row = 0; row < rows; row += gridy )
---- netpbm-10.31/converter/pbm/pbmtox10bm.c.security	2005-10-07 09:10:10.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtox10bm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtox10bm.c.security	2005-10-07 09:10:10.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtox10bm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -57,6 +57,7 @@ main(int argc, char * argv[]) {
      bitrow = pbm_allocrow( cols );
  
@@ -1177,8 +981,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      printf( "#define %s_width %d\n", name, cols );
---- netpbm-10.31/converter/pbm/pbmtoppa/pbmtoppa.c.security	2005-04-30 18:45:07.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtoppa/pbmtoppa.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoppa/pbmtoppa.c.security	2005-04-30 18:45:07.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtoppa/pbmtoppa.c	2006-02-27 14:48:10.000000000 +0100
 @@ -441,6 +441,7 @@ main(int argc, char *argv[]) {
              pm_error("main(): unrecognized parameter '%s'", argv[argn]);
      }
@@ -1187,8 +991,8 @@
      Pwidth=(Width+7)/8;
      printer.fptr=out;
  
---- netpbm-10.31/converter/pbm/pbmtoppa/pbm.c.security	2000-06-01 19:20:30.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtoppa/pbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoppa/pbm.c.security	2000-06-01 19:20:30.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtoppa/pbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -105,6 +105,7 @@ int pbm_readline(pbm_stat* pbm,unsigned 
      return 0;
  
@@ -1207,8 +1011,8 @@
    memcpy (pbm->revdata, data, (pbm->width+7)/8);
    pbm->current_line--;
  }
---- netpbm-10.31/converter/pbm/ybmtopbm.c.security	1993-10-04 10:10:35.000000000 +0100
-+++ netpbm-10.31/converter/pbm/ybmtopbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/ybmtopbm.c.security	1993-10-04 10:10:35.000000000 +0100
++++ netpbm-10.32/converter/pbm/ybmtopbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -88,6 +88,7 @@ getinit( file, colsP, rowsP, depthP, pad
  	pm_error( "EOF / read error" );
  
@@ -1217,8 +1021,8 @@
      *padrightP = ( ( *colsP + 15 ) / 16 ) * 16 - *colsP;
      bitsperitem = 0;
      }
---- netpbm-10.31/converter/pbm/pbmtolj.c.security	2005-07-21 18:04:48.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtolj.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtolj.c.security	2005-07-21 18:04:48.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtolj.c	2006-02-27 14:48:10.000000000 +0100
 @@ -119,7 +119,11 @@ parseCommandLine(int argc, char ** argv,
  static void
  allocateBuffers(unsigned int const cols) {
@@ -1231,8 +1035,8 @@
      packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
      deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
  
---- netpbm-10.31/converter/pbm/pbmto4425.c.security	2005-10-07 09:13:08.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmto4425.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmto4425.c.security	2005-10-07 09:13:08.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmto4425.c	2006-02-27 14:48:10.000000000 +0100
 @@ -2,6 +2,7 @@
  
  #include "nstring.h"
@@ -1250,8 +1054,8 @@
      if(vmap == NULL)
  	{
          pm_error( "Cannot allocate memory" );
---- netpbm-10.31/converter/pbm/icontopbm.c.security	2005-10-07 09:14:45.000000000 +0200
-+++ netpbm-10.31/converter/pbm/icontopbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/icontopbm.c.security	2005-10-07 09:14:45.000000000 +0200
++++ netpbm-10.32/converter/pbm/icontopbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -11,6 +11,7 @@
  */
  
@@ -1272,8 +1076,8 @@
      data_length = BitmapSize( *widthP, *heightP );
      *dataP = (short unsigned int *) malloc( data_length );
      if ( *dataP == NULL )
---- netpbm-10.31/converter/pbm/pbmtogem.c.security	2000-06-09 09:07:05.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtogem.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtogem.c.security	2000-06-09 09:07:05.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtogem.c	2006-02-27 14:48:10.000000000 +0100
 @@ -123,6 +123,7 @@ putinit (rows, cols)
    bitsperitem = 0;
    bitshift = 7;
@@ -1282,8 +1086,8 @@
    outmax = (cols + 7) / 8;
    outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
    lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
---- netpbm-10.31/converter/pbm/pbmtogo.c.security	2005-12-22 09:45:07.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pbmtogo.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtogo.c.security	2005-12-22 09:45:07.000000000 +0100
++++ netpbm-10.32/converter/pbm/pbmtogo.c	2006-02-27 14:48:10.000000000 +0100
 @@ -91,6 +91,7 @@ main( argc, argv )
      bitrow = pbm_allocrow(cols);
  
@@ -1292,8 +1096,8 @@
      rucols = ( cols + 7 ) / 8;
      bytesperrow = rucols;       /* GraphOn uses bytes */
      rucols = rucols * 8;
---- netpbm-10.31/converter/pbm/thinkjettopbm.l.security	2005-01-02 23:39:18.000000000 +0100
-+++ netpbm-10.31/converter/pbm/thinkjettopbm.l	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/thinkjettopbm.l.security	2005-01-02 23:39:18.000000000 +0100
++++ netpbm-10.32/converter/pbm/thinkjettopbm.l	2006-02-27 14:48:10.000000000 +0100
 @@ -94,7 +94,9 @@ DIG             [0-9]
  <RASTERMODE>\033\*b{DIG}+W  {
                              int l;
@@ -1313,8 +1117,8 @@
      pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
  
      packed_bitrow = malloc(maxRowLength);
---- netpbm-10.31/converter/pbm/pbmtoxbm.c.security	2005-10-07 09:08:17.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtoxbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoxbm.c.security	2005-10-07 09:08:17.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtoxbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -100,6 +100,7 @@ main(int argc, char * argv[]) {
      bitrow = pbm_allocrow(cols);
      
@@ -1323,8 +1127,8 @@
      padright = ((cols + 7)/8) * 8 - cols;
  
      printf("#define %s_width %d\n", name, cols);
---- netpbm-10.31/converter/pbm/mdatopbm.c.security	2005-08-15 09:01:25.000000000 +0200
-+++ netpbm-10.31/converter/pbm/mdatopbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/mdatopbm.c.security	2005-08-15 09:01:25.000000000 +0200
++++ netpbm-10.32/converter/pbm/mdatopbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -245,10 +245,13 @@ main(int argc, char **argv) {
          pm_readlittleshort(infile, &yy); nInCols = yy;
      }
@@ -1340,8 +1144,8 @@
  
      data = pbm_allocarray(nOutCols, nOutRows);
      
---- netpbm-10.31/converter/pbm/pbmtocmuwm.c.security	1993-10-04 10:10:46.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pbmtocmuwm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtocmuwm.c.security	1993-10-04 10:10:46.000000000 +0100
++++ netpbm-10.32/converter/pbm/pbmtocmuwm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -43,6 +43,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1350,8 +1154,8 @@
      padright = ( ( cols + 7 ) / 8 ) * 8 - cols;
  
      putinit( rows, cols );
---- netpbm-10.31/converter/pbm/pbmtomda.c.security	2005-08-15 09:01:50.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtomda.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtomda.c.security	2005-08-15 09:01:50.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtomda.c	2006-02-27 14:48:10.000000000 +0100
 @@ -179,6 +179,7 @@ int main(int argc, char **argv)
      
      nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@@ -1360,8 +1164,8 @@
      nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
          /* MDA wants rows a multiple of 4 */   
      nOutCols = nInCols / 8;
---- netpbm-10.31/converter/pbm/pbmtozinc.c.security	2005-10-07 09:08:07.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtozinc.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtozinc.c.security	2005-10-07 09:08:07.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtozinc.c	2006-02-27 14:48:10.000000000 +0100
 @@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
      bitrow = pbm_allocrow( cols );
  
@@ -1370,8 +1174,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      printf( "USHORT %s[] = {\n",name);
---- netpbm-10.31/converter/pbm/pbmtoicon.c.security	2002-07-30 17:47:48.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtoicon.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoicon.c.security	2002-07-30 17:47:48.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtoicon.c	2006-02-27 14:48:10.000000000 +0100
 @@ -42,6 +42,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1380,8 +1184,8 @@
      pad = ( ( cols + 15 ) / 16 ) * 16 - cols;
      padleft = pad / 2;
      padright = pad - padleft;
---- netpbm-10.31/converter/pbm/pbmtomacp.c.security	2002-09-06 18:04:22.000000000 +0200
-+++ netpbm-10.31/converter/pbm/pbmtomacp.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtomacp.c.security	2002-09-06 18:04:22.000000000 +0200
++++ netpbm-10.32/converter/pbm/pbmtomacp.c	2006-02-27 14:48:10.000000000 +0100
 @@ -104,6 +104,7 @@ char *argv[];
    if( !lflg )
      left = 0;
@@ -1399,8 +1203,8 @@
    if( bflg )
    { if( bottom - top >= MAX_LINES )
        bottom = top + MAX_LINES - 1;
---- netpbm-10.31/converter/pbm/pbmtomgr.c.security	1993-10-04 10:10:50.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pbmtomgr.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtomgr.c.security	1993-10-04 10:10:50.000000000 +0100
++++ netpbm-10.32/converter/pbm/pbmtomgr.c	2006-02-27 14:48:10.000000000 +0100
 @@ -43,6 +43,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1409,8 +1213,8 @@
      padright = ( ( cols + 7 ) / 8 ) * 8 - cols;
  
      putinit( rows, cols );
---- netpbm-10.31/converter/pbm/pbmto10x.c.security	2004-03-20 05:23:36.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pbmto10x.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmto10x.c.security	2004-03-20 05:23:36.000000000 +0100
++++ netpbm-10.32/converter/pbm/pbmto10x.c	2006-02-27 14:48:10.000000000 +0100
 @@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
          res_60x72();
  
@@ -1420,8 +1224,8 @@
  }
  
  
---- netpbm-10.31/converter/pbm/pbmtoybm.c.security	1993-10-04 10:10:43.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pbmtoybm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pbmtoybm.c.security	1993-10-04 10:10:43.000000000 +0100
++++ netpbm-10.32/converter/pbm/pbmtoybm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -45,6 +45,7 @@ main( argc, argv )
      bitrow = pbm_allocrow( cols );
      
@@ -1430,8 +1234,8 @@
      padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
  
      putinit( cols, rows );
---- netpbm-10.31/converter/pbm/pktopbm.c.security	2005-12-22 09:48:08.000000000 +0100
-+++ netpbm-10.31/converter/pbm/pktopbm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/pbm/pktopbm.c.security	2005-12-22 09:48:08.000000000 +0100
++++ netpbm-10.32/converter/pbm/pktopbm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -277,6 +277,7 @@ main(int argc, char *argv[]) {
          if (flagbyte == 7) {            /* long form preamble */
              integer packetlength = get32() ;    /* character packet length */
@@ -1440,8 +1244,8 @@
              endofpacket = packetlength + pktopbm_pkloc;
                  /* calculate end of packet */
              if ((car >= MAXPKCHAR) || !filename[car]) {
---- netpbm-10.31/converter/other/pngtopnm.c.security	2005-10-29 19:40:03.000000000 +0200
-+++ netpbm-10.31/converter/other/pngtopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pngtopnm.c.security	2005-10-29 19:40:03.000000000 +0200
++++ netpbm-10.32/converter/other/pngtopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -985,19 +985,24 @@ convertpng(FILE *             const ifp,
          pm_error ("couldn't allocate space for image");
      }
@@ -1474,9 +1278,9 @@
  
      for (y = 0 ; y < info_ptr->height ; y++) {
          png_image[y] = malloc (linesize);
---- netpbm-10.31/converter/other/tifftopnm.c.security	2005-10-29 19:59:42.000000000 +0200
-+++ netpbm-10.31/converter/other/tifftopnm.c	2005-12-30 10:44:51.000000000 +0100
-@@ -747,7 +747,8 @@ convertRasterByRows(FILE *         const
+--- netpbm-10.32/converter/other/tifftopnm.c.security	2006-01-05 18:05:31.000000000 +0100
++++ netpbm-10.32/converter/other/tifftopnm.c	2006-02-27 14:48:10.000000000 +0100
+@@ -748,7 +748,8 @@ convertRasterByRows(FILE *         const
      if (scanbuf == NULL)
          pm_error("can't allocate memory for scanline buffer");
  
@@ -1486,8 +1290,8 @@
      if (samplebuf == NULL)
          pm_error ("can't allocate memory for row buffer");
  
---- netpbm-10.31/converter/other/pnmtoddif.c.security	2002-07-30 19:09:13.000000000 +0200
-+++ netpbm-10.31/converter/other/pnmtoddif.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pnmtoddif.c.security	2002-07-30 19:09:13.000000000 +0200
++++ netpbm-10.32/converter/other/pnmtoddif.c	2006-02-27 14:48:10.000000000 +0100
 @@ -484,6 +484,7 @@ int main(int argc, char *argv[])
      switch (PNM_FORMAT_TYPE(format)) {
      case PBM_TYPE:
@@ -1504,9 +1308,9 @@
          ip.bytes_per_line = 3 * cols;
          ip.bits_per_pixel = 24;
          ip.spectral = 5;
---- netpbm-10.31/converter/other/xwdtopnm.c.security	2005-12-15 04:45:59.000000000 +0100
-+++ netpbm-10.31/converter/other/xwdtopnm.c	2005-12-30 10:44:51.000000000 +0100
-@@ -253,6 +253,9 @@ processX10Header(X10WDFileHeader *  cons
+--- netpbm-10.32/converter/other/xwdtopnm.c.security	2006-02-22 01:28:19.000000000 +0100
++++ netpbm-10.32/converter/other/xwdtopnm.c	2006-02-27 14:48:10.000000000 +0100
+@@ -214,6 +214,9 @@ processX10Header(X10WDFileHeader *  cons
          *colorsP = pnm_allocrow( 2 );
          PNM_ASSIGN1( (*colorsP)[0], 0 );
          PNM_ASSIGN1( (*colorsP)[1], *maxvalP );
@@ -1516,7 +1320,7 @@
          *padrightP =
              ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
          *bits_per_itemP = 16;
-@@ -262,9 +265,13 @@ processX10Header(X10WDFileHeader *  cons
+@@ -223,9 +226,13 @@ processX10Header(X10WDFileHeader *  cons
          *formatP = PGM_TYPE;
          *visualclassP = StaticGray;
          *maxvalP = ( 1 << h10P->display_planes ) - 1;
@@ -1530,7 +1334,7 @@
          *padrightP =
              ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
          *bits_per_itemP = 16;
-@@ -583,6 +590,7 @@ processX11Header(X11WDFileHeader *  cons
+@@ -544,6 +551,7 @@ processX11Header(X11WDFileHeader *  cons
  
      *colsP = h11FixedP->pixmap_width;
      *rowsP = h11FixedP->pixmap_height;
@@ -1538,8 +1342,8 @@
      *padrightP =
          h11FixedP->bytes_per_line * 8 / h11FixedP->bits_per_pixel -
          h11FixedP->pixmap_width;
---- netpbm-10.31/converter/other/pnmtorle.c.security	2005-05-22 19:01:43.000000000 +0200
-+++ netpbm-10.31/converter/other/pnmtorle.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pnmtorle.c.security	2005-05-22 19:01:43.000000000 +0200
++++ netpbm-10.32/converter/other/pnmtorle.c	2006-02-27 14:48:10.000000000 +0100
 @@ -19,6 +19,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -1549,35 +1353,35 @@
   */
  /*
   * pnmtorle - A program which will convert pbmplus (ppm or pgm) images
---- netpbm-10.31/converter/other/pnmtops.c.security	2005-11-10 17:27:14.000000000 +0100
-+++ netpbm-10.31/converter/other/pnmtops.c	2005-12-30 10:44:51.000000000 +0100
-@@ -184,16 +184,21 @@ parseCommandLine(int argc, char ** argv,
+--- netpbm-10.32/converter/other/pnmtops.c.security	2006-02-25 18:37:25.000000000 +0100
++++ netpbm-10.32/converter/other/pnmtops.c	2006-02-27 14:58:11.000000000 +0100
+@@ -184,16 +184,20 @@ parseCommandLine(int argc, char ** argv,
      cmdlineP->canturn =  !noturn;
      cmdlineP->showpage = !noshowpage;
      
 +    overflow2(width, 72);
      cmdlineP->width  = width * 72;
-+    overflow2(width, 72);
++    overflow2(height, 72);
      cmdlineP->height = height * 72;
  
--    if (imagewidth_spec)
-+    if (imagewidth_spec) {
+-    if (imagewidthSpec)
++    if (imagewidthSpec) {
 +        overflow2(imagewidth, 72);
          cmdlineP->imagewidth = imagewidth * 72;
-+    }
-     else
+-    else
++    } else
          cmdlineP->imagewidth = 0;
--    if (imageheight_spec)
-+    if (imageheight_spec) {
-+        overflow2(imagewidth, 72);
+-    if (imageheightSpec)
++    if (imageheightSpec) {
++        overflow2(imageheight, 72);
          cmdlineP->imageheight = imageheight * 72;
 -    else
 +    } else
          cmdlineP->imageheight = 0;
  
      if (!cmdlineP->psfilter &&
---- netpbm-10.31/converter/other/pnmtojpeg.c.security	2005-10-07 08:46:56.000000000 +0200
-+++ netpbm-10.31/converter/other/pnmtojpeg.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pnmtojpeg.c.security	2005-10-07 08:46:56.000000000 +0200
++++ netpbm-10.32/converter/other/pnmtojpeg.c	2006-02-27 14:48:10.000000000 +0100
 @@ -587,6 +587,8 @@ compute_rescaling_array(JSAMPLE ** const
    const long half_maxval = maxval / 2;
    long val;
@@ -1608,8 +1412,8 @@
              (jpeg_scan_info *)
              (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                          scan_info_size);
---- netpbm-10.31/converter/other/jpegtopnm.c.security	2005-10-07 08:57:11.000000000 +0200
-+++ netpbm-10.31/converter/other/jpegtopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/jpegtopnm.c.security	2005-10-07 08:57:11.000000000 +0200
++++ netpbm-10.32/converter/other/jpegtopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -828,6 +828,7 @@ convertImage(FILE *                     
      /* Calculate output image dimensions so we can allocate space */
      jpeg_calc_output_dimensions(cinfoP);
@@ -1618,8 +1422,8 @@
      jpegbuffer = ((*cinfoP->mem->alloc_sarray)
                    ((j_common_ptr) cinfoP, JPOOL_IMAGE,
                     cinfoP->output_width * cinfoP->output_components, 
---- netpbm-10.31/converter/other/pbmtopgm.c.security	2005-12-03 18:42:41.000000000 +0100
-+++ netpbm-10.31/converter/other/pbmtopgm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pbmtopgm.c.security	2005-12-03 18:42:41.000000000 +0100
++++ netpbm-10.32/converter/other/pbmtopgm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -47,6 +47,7 @@ main(int argc, char *argv[]) {
                   "than the image height (%u rows)", height, rows);
  
@@ -1628,8 +1432,8 @@
      maxval = MIN(PGM_OVERALLMAXVAL, width*height);
      pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
  
---- netpbm-10.31/converter/other/pnmtosgi.c.security	2003-07-10 06:04:07.000000000 +0200
-+++ netpbm-10.31/converter/other/pnmtosgi.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/pnmtosgi.c.security	2003-07-10 06:04:07.000000000 +0200
++++ netpbm-10.32/converter/other/pnmtosgi.c	2006-02-27 14:48:10.000000000 +0100
 @@ -213,6 +213,22 @@ write_channels(cols, rows, channels, put
      }
  }
@@ -1670,8 +1474,8 @@
              len = rle_compress(temp, cols);    /* writes result into rletemp */
              channel[chan_no][row].length = len;
              MALLOCARRAY(p, len);
---- netpbm-10.31/converter/other/rletopnm.c.security	2005-11-13 22:40:02.000000000 +0100
-+++ netpbm-10.31/converter/other/rletopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/rletopnm.c.security	2005-11-13 22:40:02.000000000 +0100
++++ netpbm-10.32/converter/other/rletopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -19,6 +19,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -1681,8 +1485,8 @@
   */
  /*
   * rletopnm - A conversion program to convert from Utah's "rle" image format
---- netpbm-10.31/converter/other/sirtopnm.c.security	2002-01-04 18:22:45.000000000 +0100
-+++ netpbm-10.31/converter/other/sirtopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/sirtopnm.c.security	2002-01-04 18:22:45.000000000 +0100
++++ netpbm-10.32/converter/other/sirtopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -69,6 +69,7 @@ char* argv[];
  	    }
  	    break;
@@ -1691,8 +1495,8 @@
  	    picsize = cols * rows * 3;
  	    planesize = cols * rows;
              if ( !( sirarray = (unsigned char*) malloc( picsize ) ) ) 
---- netpbm-10.31/converter/other/gemtopnm.c.security	2005-08-27 19:30:45.000000000 +0200
-+++ netpbm-10.31/converter/other/gemtopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/gemtopnm.c.security	2005-08-27 19:30:45.000000000 +0200
++++ netpbm-10.32/converter/other/gemtopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -106,6 +106,7 @@ main(argc, argv)
  
  	pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
@@ -1701,8 +1505,8 @@
      { 
          /* allocate input row data structure */
          int plane;
---- netpbm-10.31/converter/other/sgitopnm.c.security	2005-08-27 19:33:09.000000000 +0200
-+++ netpbm-10.31/converter/other/sgitopnm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/converter/other/sgitopnm.c.security	2005-08-27 19:33:09.000000000 +0200
++++ netpbm-10.32/converter/other/sgitopnm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -252,13 +252,17 @@ read_channels(ifp, head, table, func, oc
  
      if (ochan < 0) {
@@ -1722,8 +1526,8 @@
  
      for( channel = 0; channel < maxchannel;  channel++ ) {
  #ifdef DEBUG
---- netpbm-10.31/analyzer/pgmhist.c.security	2003-07-06 21:23:19.000000000 +0200
-+++ netpbm-10.31/analyzer/pgmhist.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/analyzer/pgmhist.c.security	2003-07-06 21:23:19.000000000 +0200
++++ netpbm-10.32/analyzer/pgmhist.c	2006-02-27 14:48:10.000000000 +0100
 @@ -45,6 +45,7 @@ main( argc, argv )
      grayrow = pgm_allocrow( cols );
  
@@ -1732,8 +1536,8 @@
      MALLOCARRAY(hist, maxval + 1);
      MALLOCARRAY(rcount, maxval + 1);
      if ( hist == NULL || rcount == NULL )
---- netpbm-10.31/analyzer/pgmtexture.c.security	2005-12-22 10:17:08.000000000 +0100
-+++ netpbm-10.31/analyzer/pgmtexture.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/analyzer/pgmtexture.c.security	2005-12-22 10:17:08.000000000 +0100
++++ netpbm-10.32/analyzer/pgmtexture.c	2006-02-27 14:48:10.000000000 +0100
 @@ -79,6 +79,9 @@ vector (int nl, int nh)
  {
      float *v;
@@ -1764,8 +1568,8 @@
      for (i = nrl; i <= nrh; i++)
      {
          MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
---- netpbm-10.31/lib/libpbm1.c.security	2005-02-05 19:41:54.000000000 +0100
-+++ netpbm-10.31/lib/libpbm1.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/lib/libpbm1.c.security	2005-02-05 19:41:54.000000000 +0100
++++ netpbm-10.32/lib/libpbm1.c	2006-02-27 14:48:10.000000000 +0100
 @@ -56,6 +56,7 @@ pbm_check(FILE * file, const enum pm_che
          pm_message("pm_filepos passed to pm_check() is %u bytes",
                     sizeof(pm_filepos));
@@ -1774,9 +1578,9 @@
          pm_check(file, check_type, need_raster_size, retval_p);
      }
  }
---- netpbm-10.31/lib/pm.h.security	2005-12-03 17:20:19.000000000 +0100
-+++ netpbm-10.31/lib/pm.h	2005-12-30 10:44:51.000000000 +0100
-@@ -325,4 +325,10 @@ pm_arg0toprogname(const char arg0[]);
+--- netpbm-10.32/lib/pm.h.security	2006-01-08 03:49:08.000000000 +0100
++++ netpbm-10.32/lib/pm.h	2006-02-27 14:48:10.000000000 +0100
+@@ -331,4 +331,10 @@ pm_arg0toprogname(const char arg0[]);
  #endif
  
  
@@ -1787,8 +1591,8 @@
 +void overflow_add(int, int);
 +
  #endif
---- netpbm-10.31/lib/libpammap.c.security	2005-12-03 18:01:03.000000000 +0100
-+++ netpbm-10.31/lib/libpammap.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/lib/libpammap.c.security	2005-12-03 18:01:03.000000000 +0100
++++ netpbm-10.32/lib/libpammap.c	2006-02-27 14:48:10.000000000 +0100
 @@ -102,6 +102,8 @@ allocTupleIntListItem(struct pam * const
      */
      struct tupleint_list_item * retval;
@@ -1798,9 +1602,9 @@
      unsigned int const size = 
          sizeof(*retval) - sizeof(retval->tupleint.tuple) 
          + pamP->depth * sizeof(sample);
---- netpbm-10.31/lib/libpam.c.security	2005-12-03 17:59:50.000000000 +0100
-+++ netpbm-10.31/lib/libpam.c	2005-12-30 10:44:51.000000000 +0100
-@@ -274,7 +274,8 @@ allocPamRow(const struct pam * const pam
+--- netpbm-10.32/lib/libpam.c.security	2006-01-25 17:50:14.000000000 +0100
++++ netpbm-10.32/lib/libpam.c	2006-02-27 14:48:10.000000000 +0100
+@@ -221,7 +221,8 @@ allocPamRow(const struct pam * const pam
      int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
      tuple * tuplerow;
  
@@ -1810,8 +1614,8 @@
                        
      if (tuplerow != NULL) {
          /* Now we initialize the pointers to the individual tuples
---- netpbm-10.31/lib/libpm.c.security	2005-12-03 17:52:40.000000000 +0100
-+++ netpbm-10.31/lib/libpm.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/lib/libpm.c.security	2006-01-25 01:31:23.000000000 +0100
++++ netpbm-10.32/lib/libpm.c	2006-02-27 14:48:10.000000000 +0100
 @@ -36,6 +36,7 @@
      /* This makes the the x64() functions available on AIX */
  
@@ -1838,7 +1642,7 @@
      if (rowheap == NULL) {
          /* We couldn't get the whole heap in one block, so try fragmented
             format.
-@@ -1342,4 +1343,53 @@ pm_check(FILE *               const file
+@@ -1400,4 +1401,53 @@ pm_check(FILE *               const file
  }
  
  
@@ -1892,16 +1696,16 @@
 +	return realloc(a, b*c);
 +}
  
---- netpbm-10.31/lib/libpbmvms.c.security	2005-08-27 19:24:54.000000000 +0200
-+++ netpbm-10.31/lib/libpbmvms.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/lib/libpbmvms.c.security	2005-08-27 19:24:54.000000000 +0200
++++ netpbm-10.32/lib/libpbmvms.c	2006-02-27 14:48:10.000000000 +0100
 @@ -1,3 +1,5 @@
 +#warning "NOT AUDITED"
 +
  /***************************************************************************
    This file contains library routines needed to build Netpbm for VMS.
    However, as of 2000.05.26, when these were split out of libpbm1.c
---- netpbm-10.31/editor/pbmreduce.c.security	2003-07-06 21:41:49.000000000 +0200
-+++ netpbm-10.31/editor/pbmreduce.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pbmreduce.c.security	2003-07-06 21:41:49.000000000 +0200
++++ netpbm-10.32/editor/pbmreduce.c	2006-02-27 14:48:10.000000000 +0100
 @@ -93,6 +93,7 @@ main( argc, argv )
  
      if ( halftone == QT_FS ) {
@@ -1910,8 +1714,8 @@
          MALLOCARRAY(thiserr, newcols + 2);
          MALLOCARRAY(nexterr, newcols + 2);
          if ( thiserr == NULL || nexterr == NULL )
---- netpbm-10.31/editor/pnmindex.csh.security	2000-09-14 07:37:35.000000000 +0200
-+++ netpbm-10.31/editor/pnmindex.csh	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmindex.csh.security	2000-09-14 07:37:35.000000000 +0200
++++ netpbm-10.32/editor/pnmindex.csh	2006-02-27 14:48:10.000000000 +0100
 @@ -1,5 +1,8 @@
  #!/bin/csh -f
  #
@@ -1921,8 +1725,8 @@
  # pnmindex - build a visual index of a bunch of anymaps
  #
  # Copyright (C) 1991 by Jef Poskanzer.
---- netpbm-10.31/editor/pnmscalefixed.c.security	2002-07-30 19:52:49.000000000 +0200
-+++ netpbm-10.31/editor/pnmscalefixed.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmscalefixed.c.security	2002-07-30 19:52:49.000000000 +0200
++++ netpbm-10.32/editor/pnmscalefixed.c	2006-02-27 14:48:10.000000000 +0100
 @@ -209,6 +209,8 @@ compute_output_dimensions(const struct c
                            const int rows, const int cols,
                            int * newrowsP, int * newcolsP) {
@@ -1951,8 +1755,8 @@
      sxscale = SCALE * newcols / cols;
      syscale = SCALE * newrows / rows;
  
---- netpbm-10.31/editor/pnmcut.c.security	2002-07-30 19:47:37.000000000 +0200
-+++ netpbm-10.31/editor/pnmcut.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmcut.c.security	2002-07-30 19:47:37.000000000 +0200
++++ netpbm-10.32/editor/pnmcut.c	2006-02-27 14:48:10.000000000 +0100
 @@ -373,6 +373,7 @@ main(int argc, char *argv[]) {
                     toprow, leftcol, bottomrow, rightcol);
      }
@@ -1961,8 +1765,8 @@
      output_cols = rightcol-leftcol+1;
      output_row = pnm_allocrow(output_cols);
      
---- netpbm-10.31/editor/pamoil.c.security	2005-08-15 09:05:44.000000000 +0200
-+++ netpbm-10.31/editor/pamoil.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pamoil.c.security	2005-08-15 09:05:44.000000000 +0200
++++ netpbm-10.32/editor/pamoil.c	2006-02-27 14:48:10.000000000 +0100
 @@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
      tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
      pm_close(ifp);
@@ -1971,9 +1775,9 @@
      MALLOCARRAY(hist, inpam.maxval + 1);
      if (hist == NULL)
          pm_error("Unable to allocate memory for histogram.");
---- netpbm-10.31/editor/pnmremap.c.security	2005-11-19 18:46:29.000000000 +0100
-+++ netpbm-10.31/editor/pnmremap.c	2005-12-30 10:44:51.000000000 +0100
-@@ -281,6 +281,7 @@ initFserr(struct pam *   const pamP,
+--- netpbm-10.32/editor/pnmremap.c.security	2006-02-25 19:18:47.000000000 +0100
++++ netpbm-10.32/editor/pnmremap.c	2006-02-27 14:48:10.000000000 +0100
+@@ -284,6 +284,7 @@ initFserr(struct pam *   const pamP,
  
      unsigned int const fserrSize = pamP->width + 2;
  
@@ -1981,7 +1785,7 @@
      MALLOCARRAY(fserrP->thiserr, pamP->depth);
      if (fserrP->thiserr == NULL)
          pm_error("Out of memory allocating Floyd-Steinberg structures "
-@@ -324,6 +325,7 @@ floydInitRow(struct pam * const pamP, st
+@@ -327,6 +328,7 @@ floydInitRow(struct pam * const pamP, st
  
      int col;
      
@@ -1989,8 +1793,8 @@
      for (col = 0; col < pamP->width + 2; ++col) {
          unsigned int plane;
          for (plane = 0; plane < pamP->depth; ++plane) 
---- netpbm-10.31/editor/pnmpad.c.security	2005-05-22 20:30:30.000000000 +0200
-+++ netpbm-10.31/editor/pnmpad.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmpad.c.security	2005-05-22 20:30:30.000000000 +0200
++++ netpbm-10.32/editor/pnmpad.c	2006-02-27 14:48:10.000000000 +0100
 @@ -358,6 +358,8 @@ main(int argc, char ** argv) {
  
      computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@@ -2000,9 +1804,9 @@
      newcols = cols + lpad + rpad;
      xelrow = pnm_allocrow(newcols);
      bgrow = pnm_allocrow(newcols);
---- netpbm-10.31/editor/pamcut.c.security	2005-08-15 00:35:26.000000000 +0200
-+++ netpbm-10.31/editor/pamcut.c	2005-12-30 10:44:51.000000000 +0100
-@@ -510,6 +510,8 @@ main(int argc, char *argv[]) {
+--- netpbm-10.32/editor/pamcut.c.security	2006-01-30 18:22:43.000000000 +0100
++++ netpbm-10.32/editor/pamcut.c	2006-02-27 14:48:10.000000000 +0100
+@@ -514,6 +514,8 @@ cutOneImage(FILE *             const ifP
      outpam.width  = rightcol-leftcol+1;
      outpam.height = bottomrow-toprow+1;
  
@@ -2011,8 +1815,8 @@
      pnm_writepaminit(&outpam);
  
      /* Write out top padding */
---- netpbm-10.31/editor/pbmlife.c.security	1993-10-04 10:10:37.000000000 +0100
-+++ netpbm-10.31/editor/pbmlife.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pbmlife.c.security	1993-10-04 10:10:37.000000000 +0100
++++ netpbm-10.32/editor/pbmlife.c	2006-02-27 14:48:10.000000000 +0100
 @@ -54,7 +54,7 @@ char* argv[];
  	prevrow = thisrow;
  	thisrow = nextrow;
@@ -2022,37 +1826,8 @@
  	    pbm_readpbmrow( ifp, nextrow, cols, format );
  
          for ( col = 0; col < cols; ++col )
---- netpbm-10.31/editor/pnmrotate.c.security	2005-12-20 00:14:33.000000000 +0100
-+++ netpbm-10.31/editor/pnmrotate.c	2005-12-30 10:44:51.000000000 +0100
-@@ -13,6 +13,7 @@
- #define _XOPEN_SOURCE   /* get M_PI in math.h */
- 
- #include <math.h>
-+#include <limits.h>
- 
- #include "pnm.h"
- #include "shhopt.h"
-@@ -570,11 +571,18 @@ main(int argc, char *argv[]) { 
-     yshearfac = sin(cmdline.angle);
-     if (yshearfac < 0.0)
-         yshearfac = -yshearfac;
-+    overflow2(rows, xshearfac);
-+    overflow_add(cols, 1);
-+    overflow_add(rows * xshearfac, cols);
-     tempcols = rows * xshearfac + cols + 0.999999;
-     yshearjunk = (tempcols - cols) * yshearfac;
-     newrows = tempcols * yshearfac + rows + 0.999999;
-     x2shearjunk = (newrows - rows - yshearjunk) * xshearfac;
-     newrows -= 2 * yshearjunk;
-+
-+    if(newrows * xshearfac + tempcols + 0.999999 - 2 * x2shearjunk > INT_MAX)
-+        pm_error("image too large");
-+
-     newcols = newrows * xshearfac + tempcols + 0.999999 - 2 * x2shearjunk;
-     direction = cmdline.angle > 0 ? COUNTERCLOCKWISE : CLOCKWISE;
- 
---- netpbm-10.31/editor/pnmpaste.c.security	2005-12-22 10:24:24.000000000 +0100
-+++ netpbm-10.31/editor/pnmpaste.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmpaste.c.security	2005-12-22 10:24:24.000000000 +0100
++++ netpbm-10.32/editor/pnmpaste.c	2006-02-27 14:48:10.000000000 +0100
 @@ -101,11 +101,16 @@ main( argc, argv )
  	    "y is too large -- the second anymap has only %d rows",
  	    rows2 );
@@ -2070,19 +1845,19 @@
      if ( x + cols1 > cols2 )
  	pm_error( "x + width is too large by %d pixels", x + cols1 - cols2 );
      if ( y + rows1 > rows2 )
---- netpbm-10.31/editor/pbmclean.c.security	2005-02-27 17:33:57.000000000 +0100
-+++ netpbm-10.31/editor/pbmclean.c	2005-12-30 10:44:51.000000000 +0100
-@@ -147,7 +147,7 @@ nextrow(FILE * const ifd, int const row,
+--- netpbm-10.32/editor/pbmclean.c.security	2006-02-02 01:13:33.000000000 +0100
++++ netpbm-10.32/editor/pbmclean.c	2006-02-27 14:54:46.000000000 +0100
+@@ -150,7 +150,7 @@ nextrow(FILE * const ifd,
      inrow[0] = inrow[1];
      inrow[1] = inrow[2];
      inrow[2] = shuffle ;
 -    if (row+1 < rows) {
 +    if (row <= rows) {
-         /* Read the "next" row in from the file.  Allocate buffer if neeeded */
+         /* Read the "next" row in from the file.  Allocate buffer if needed */
          if (inrow[2] == NULL)
              inrow[2] = pbm_allocrow(cols);
---- netpbm-10.31/editor/ppmdither.c.security	2003-07-06 21:54:02.000000000 +0200
-+++ netpbm-10.31/editor/ppmdither.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/ppmdither.c.security	2003-07-06 21:54:02.000000000 +0200
++++ netpbm-10.32/editor/ppmdither.c	2006-02-27 14:48:10.000000000 +0100
 @@ -111,6 +111,9 @@ dith_matrix(unsigned int const dith_dim)
              (dith_dim * sizeof(int *)) + /* pointers */
              (dith_dim * dith_dim * sizeof(int)); /* data */
@@ -2103,18 +1878,18 @@
      if (*colormapP == NULL) 
          pm_error("Unable to allocate space for the color lookup table "
                   "(%d by %d by %d pixels).", dith_nr, dith_ng, dith_nb);
---- netpbm-10.31/editor/pnmgamma.c.security	2005-04-25 01:05:48.000000000 +0200
-+++ netpbm-10.31/editor/pnmgamma.c	2005-12-30 10:44:51.000000000 +0100
-@@ -282,6 +282,7 @@ createGammaTables(bool const ungamma, 
-                   xelval **rtableP, xelval **gtableP, xelval **btableP) {
+--- netpbm-10.32/editor/pnmgamma.c.security	2006-02-18 23:34:16.000000000 +0100
++++ netpbm-10.32/editor/pnmgamma.c	2006-02-27 14:48:10.000000000 +0100
+@@ -586,6 +586,7 @@ createGammaTables(enum transferFunction 
+                   xelval **             const btableP) {
  
      /* Allocate space for the tables. */
 +    overflow_add(maxval, 1);
      MALLOCARRAY(*rtableP, maxval+1);
      MALLOCARRAY(*gtableP, maxval+1);
      MALLOCARRAY(*btableP, maxval+1);
---- netpbm-10.31/editor/pnmhisteq.c.security	2005-09-11 00:59:13.000000000 +0200
-+++ netpbm-10.31/editor/pnmhisteq.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmhisteq.c.security	2005-09-11 00:59:13.000000000 +0200
++++ netpbm-10.32/editor/pnmhisteq.c	2006-02-27 14:48:10.000000000 +0100
 @@ -102,6 +102,7 @@ computeLuminosityHistogram(xel * const *
      unsigned int pixelCount;
      unsigned int * lumahist;
@@ -2123,8 +1898,8 @@
      MALLOCARRAY(lumahist, maxval + 1);
      if (lumahist == NULL)
          pm_error("Out of storage allocating array for %u histogram elements",
---- netpbm-10.31/editor/pnmshear.c.security	2005-08-15 08:17:16.000000000 +0200
-+++ netpbm-10.31/editor/pnmshear.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pnmshear.c.security	2005-08-15 08:17:16.000000000 +0200
++++ netpbm-10.32/editor/pnmshear.c	2006-02-27 14:48:10.000000000 +0100
 @@ -14,6 +14,7 @@
  
  #include <math.h>
@@ -2145,8 +1920,8 @@
      newcols = rows * shearfac + cols + 0.999999;
  
      pnm_writepnminit( stdout, newcols, rows, newmaxval, newformat, 0 );
---- netpbm-10.31/editor/pbmpscale.c.security	2005-08-15 09:06:55.000000000 +0200
-+++ netpbm-10.31/editor/pbmpscale.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/editor/pbmpscale.c.security	2005-08-15 09:06:55.000000000 +0200
++++ netpbm-10.32/editor/pbmpscale.c	2006-02-27 14:48:10.000000000 +0100
 @@ -109,6 +109,7 @@ main(argc, argv)
     inrow[0] = inrow[1] = inrow[2] = NULL;
     pbm_readpbminit(ifd, &columns, &rows, &format) ;
@@ -2155,8 +1930,8 @@
     outrow = pbm_allocrow(columns*scale) ;
     MALLOCARRAY(flags, columns);
     if (flags == NULL) 
---- netpbm-10.31/urt/scanargs.c.security	2003-01-08 20:38:25.000000000 +0100
-+++ netpbm-10.31/urt/scanargs.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/scanargs.c.security	2003-01-08 20:38:25.000000000 +0100
++++ netpbm-10.32/urt/scanargs.c	2006-02-27 14:48:10.000000000 +0100
 @@ -38,6 +38,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2177,8 +1952,8 @@
  
  #if defined(c_plusplus) && !defined(USE_PROTOTYPES)
  #define USE_PROTOTYPES
---- netpbm-10.31/urt/rle.h.security	2005-10-16 23:44:55.000000000 +0200
-+++ netpbm-10.31/urt/rle.h	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle.h.security	2005-12-24 05:46:05.000000000 +0100
++++ netpbm-10.32/urt/rle.h	2006-02-27 14:48:10.000000000 +0100
 @@ -14,6 +14,9 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2206,8 +1981,8 @@
  
  /* Declare RLE library routines. */
  
---- netpbm-10.31/urt/rle_open_f.c.security	2005-10-17 00:16:48.000000000 +0200
-+++ netpbm-10.31/urt/rle_open_f.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle_open_f.c.security	2005-10-17 00:16:48.000000000 +0200
++++ netpbm-10.32/urt/rle_open_f.c	2006-02-27 14:48:10.000000000 +0100
 @@ -6,6 +6,9 @@
   * 		University of Michigan
   * Date:	11/14/89
@@ -2239,8 +2014,8 @@
              combuf = (char *)malloc( 20 + strlen( file_name ) );
              if ( combuf == NULL )
              {
---- netpbm-10.31/urt/rle_addhist.c.security	2005-10-17 00:15:58.000000000 +0200
-+++ netpbm-10.31/urt/rle_addhist.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle_addhist.c.security	2005-10-17 00:15:58.000000000 +0200
++++ netpbm-10.32/urt/rle_addhist.c	2006-02-27 14:48:10.000000000 +0100
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2285,8 +2060,8 @@
      ++length;                               /*Cater for the null. */
  
      MALLOCARRAY(newc, length);
---- netpbm-10.31/urt/rle_hdr.c.security	2005-10-17 00:16:33.000000000 +0200
-+++ netpbm-10.31/urt/rle_hdr.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle_hdr.c.security	2005-10-17 00:16:33.000000000 +0200
++++ netpbm-10.32/urt/rle_hdr.c	2006-02-27 14:48:10.000000000 +0100
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,
@@ -2353,8 +2128,8 @@
  	    size *= sizeof(char *);
  	    to_hdr->comments = (CONST_DECL char **)malloc( size );
  	    RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
---- netpbm-10.31/urt/README.security	2000-06-02 22:53:04.000000000 +0200
-+++ netpbm-10.31/urt/README	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/README.security	2000-06-02 22:53:04.000000000 +0200
++++ netpbm-10.32/urt/README	2006-02-27 14:48:10.000000000 +0100
 @@ -18,3 +18,8 @@ in its initializer in the original.  But
  defines stdout as a variable, so that wouldn't compile.  So I changed
  it to NULL and added a line to rle_hdr_init to set that field to
@@ -2364,8 +2139,8 @@
 +Removed pipe through and compress support (unsafe)
 +
 +Alan Cox <alan at redhat.com>
---- netpbm-10.31/urt/Runput.c.security	2005-10-16 23:36:29.000000000 +0200
-+++ netpbm-10.31/urt/Runput.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/Runput.c.security	2005-10-16 23:36:29.000000000 +0200
++++ netpbm-10.32/urt/Runput.c	2006-02-27 14:48:10.000000000 +0100
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2398,8 +2173,8 @@
  	if ( h_cmap == NULL )
  	{
  	    fprintf( stderr,
---- netpbm-10.31/urt/rle_getrow.c.security	2005-10-16 23:47:53.000000000 +0200
-+++ netpbm-10.31/urt/rle_getrow.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle_getrow.c.security	2005-10-16 23:47:53.000000000 +0200
++++ netpbm-10.32/urt/rle_getrow.c	2006-02-27 14:48:10.000000000 +0100
 @@ -17,6 +17,8 @@
   *
   *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@@ -2417,8 +2192,8 @@
          evenlen = (comlen + 1) & ~1;    /* make it even */
          if ( evenlen )
          {
---- netpbm-10.31/urt/rle_putcom.c.security	2005-10-07 18:01:42.000000000 +0200
-+++ netpbm-10.31/urt/rle_putcom.c	2005-12-30 10:44:51.000000000 +0100
+--- netpbm-10.32/urt/rle_putcom.c.security	2005-10-07 18:01:42.000000000 +0200
++++ netpbm-10.32/urt/rle_putcom.c	2006-02-27 14:48:10.000000000 +0100
 @@ -14,6 +14,8 @@
   * If you modify this software, you should include a notice giving the
   * name of the person performing the modification, the date of modification,

netpbm-10.27-bmptopnm.patch:
 bmptopnm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- netpbm-10.27-bmptopnm.patch	21 Oct 2005 12:52:58 -0000	1.2
+++ netpbm-10.27-bmptopnm.patch	28 Feb 2006 12:59:04 -0000	1.3
@@ -1,20 +1,20 @@
---- netpbm-10.27/converter/other/bmptopnm.c.bmptopnm	2005-05-09 10:06:05.707795976 +0200
-+++ netpbm-10.27/converter/other/bmptopnm.c	2005-05-09 10:29:30.498235368 +0200
-@@ -932,7 +932,7 @@ readBmp(FILE *               const ifP, 
+--- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm	2006-02-27 15:02:02.000000000 +0100
++++ netpbm-10.32/converter/other/bmptopnm.c	2006-02-27 15:07:31.000000000 +0100
+@@ -1248,7 +1248,7 @@ readBmp(FILE *               const ifP, 
          xel **               const colormapP,
          bool                 const verbose) {
  
 -    xel * colormap;  /* malloc'ed */
 +    xel * colormap = NULL;  /* malloc'ed */
      unsigned int pos;
+         /* Current byte position in the BMP file */
  
-     /* The following are all information from the BMP headers */
-@@ -1106,7 +1106,7 @@ main(int argc, char ** argv) {
-     writeRaster(BMPraster, cols, rows, outputType, cBitCount, pixelformat,
-                 colormap);
- 
+@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) {
+         writeRasterGen(BMPraster, cols, rows, outputType, cBitCount,
+                        pixelformat, colormap); 
+     }
 -    free(colormap);
 +    if (colormap) free(colormap);
      free(BMPraster);
  
-     exit(0);
+     return 0;

netpbm-10.29-pnmtopng.patch:
 pnmtopng.c |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

Index: netpbm-10.29-pnmtopng.patch
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.29-pnmtopng.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- netpbm-10.29-pnmtopng.patch	10 Feb 2006 13:06:26 -0000	1.3
+++ netpbm-10.29-pnmtopng.patch	28 Feb 2006 12:59:04 -0000	1.4
@@ -1,5 +1,5 @@
---- netpbm-10.31/converter/other/pnmtopng.c.pnmtopng	2005-10-16 21:36:43.000000000 +0200
-+++ netpbm-10.31/converter/other/pnmtopng.c	2006-02-10 13:32:55.000000000 +0100
+--- netpbm-10.32/converter/other/pnmtopng.c.pnmtopng	2005-12-31 01:52:59.000000000 +0100
++++ netpbm-10.32/converter/other/pnmtopng.c	2006-02-27 15:10:00.000000000 +0100
 @@ -215,15 +215,12 @@ static void
  parseModtimeOpt(const char * const modtimeOpt,
                  time_t *     const modtimeP) {
@@ -39,15 +39,6 @@
      brokenTime.tm_mon = month - 1;
      if (year >= 1900)
          brokenTime.tm_year = year - 1900;
-@@ -296,7 +307,7 @@ parseCommandLine (int argc, char ** argv
-     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
-             &ztxtSpec,             0);
-     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
--            &modtimeSpec,          0);
-+            &cmdlineP->modtimeSpec,0);
-     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
-             &paletteSpec,          0);
-     OPTENT3(0, "compression",      OPT_UINT,
 @@ -1973,7 +1984,7 @@ makePngLine(png_byte *           const l
              *pp++ = PNM_GET1(p_png) & 0xff;
          } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {


Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- netpbm.spec	20 Feb 2006 11:05:18 -0000	1.55
+++ netpbm.spec	28 Feb 2006 12:59:04 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats.
 Name: netpbm
-Version: 10.31
-Release: 5
+Version: 10.32
+Release: 1
 License: freeware
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
@@ -21,7 +21,6 @@
 Patch11: netpbm-10.29-pnmtopng.patch
 Patch12: netpbm-10.30-rgbtxt.patch
 Patch13: netpbm-10.31-xwdfix.patch
-Patch14: netpbm-10.31-msbmp.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex
 Obsoletes: libgr
@@ -79,7 +78,6 @@
 %patch11 -p1 -b .pnmtopng
 %patch12 -p1 -b .rgbtxt
 %patch13 -p1 -b .xwdfix
-%patch14 -p1 -b .msbmp
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -178,6 +176,12 @@
 %{_mandir}/man5/*
 
 %changelog
+* Tue Feb 28 2006 Jindrich Novy <jnovy at redhat.com> 10.32-1
+- update to 10.32
+- drop .msbmp patch, aplied upstream
+- sync the rest of the patches
+- regenerate man pages
+
 * Mon Feb 20 2006 Jindrich Novy <jnovy at redhat.com> 10.31-5
 - add missing flex BuildRequires
 - fix anytopnm to recognize ms-bmp files (#182060)


--- netpbm-10.31-msbmp.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:01:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:01:31 -0500
Subject: rpms/gimp-print/devel gimp-print.spec,1.34,1.35
Message-ID: <200602281301.k1SD1V79019305@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gimp-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19237

Modified Files:
	gimp-print.spec 
Log Message:
- BuildRequires: libjpeg-devel

/usr/bin/ld: cannot find -ljpeg
collect2: ld returned 1 exit status



Index: gimp-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gimp-print.spec	11 Feb 2006 03:08:34 -0000	1.34
+++ gimp-print.spec	28 Feb 2006 13:01:12 -0000	1.35
@@ -7,7 +7,7 @@
 Summary: A collection of high-quality printer drivers.
 Name: gimp-print
 Version: 4.2.7
-Release: 15.2
+Release: 16
 License: GPL
 Group: System Environment/Libraries
 URL: http://gimp-print.sourceforge.net/
@@ -28,7 +28,7 @@
 %endif
 BuildRequires: gimp-devel >= 1:2.0, cups-devel, autoconf >= 2.59, libtool
 BuildRequires: gettext-devel, hardlink
-BuildRequires: libtiff-devel
+BuildRequires: libtiff-devel, libjpeg-devel
 
 %description
 These drivers provide printing quality for UNIX/Linux in many cases equal
@@ -193,6 +193,9 @@
 exit 0
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 4.2.7-16
+- BuildRequires: libjpeg-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.2.7-15.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:14:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:14:15 -0500
Subject: rpms/gmime/devel gmime.spec,1.10,1.11
Message-ID: <200602281314.k1SDEF9A022737@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22706

Modified Files:
	gmime.spec 
Log Message:
- BuildRequires: gtk-sharp2 on mono archs only


Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gmime.spec	28 Feb 2006 10:56:25 -0000	1.10
+++ gmime.spec	28 Feb 2006 13:14:12 -0000	1.11
@@ -11,13 +11,13 @@
 
 BuildRequires:  glib2-devel >= 2.0.0
 BuildRequires:  zlib-devel >= 1.2.1.1
-BuildRequires:  gtk-sharp2 >= 2.4.0
 
 # Mono only availible on these:
 %define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
 
 %ifarch %mono_archs
 BuildRequires:  mono-devel gtk-sharp2-gapi
+BuildRequires:  gtk-sharp2 >= 2.4.0
 %endif
 
 %description
@@ -111,7 +111,7 @@
 
 %changelog
 * Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.1.19-4
-- BuildRequires: gtk-sharp2
+- BuildRequires: gtk-sharp2 on mono archs only
 
 * Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-3
 - Rebuild



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:16:15 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:16:15 -0500
Subject: rpms/gnome-vfs2/devel gnome-vfs-2.13.92-smb.patch, NONE,
	1.1 gnome-vfs2.spec, 1.98, 1.99
Message-ID: <200602281316.k1SDGFjX029108@cvs.devel.redhat.com>

Author: alexl

Update of /cvs/dist/rpms/gnome-vfs2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26824

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.13.92-smb.patch 
Log Message:
* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-3
- Fix smb browsing (#170922)



gnome-vfs-2.13.92-smb.patch:
 smb-method.c |  102 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 37 deletions(-)

--- NEW FILE gnome-vfs-2.13.92-smb.patch ---
Index: modules/smb-method.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/modules/smb-method.c,v
retrieving revision 1.35
diff -u -p -r1.35 smb-method.c
--- modules/smb-method.c	20 Oct 2005 16:03:59 -0000	1.35
+++ modules/smb-method.c	28 Feb 2006 12:27:10 -0000
@@ -102,6 +102,9 @@ static guint cache_reap_timeout = 0;
 /* The magic "default workgroup" hostname */
 #define DEFAULT_WORKGROUP_NAME "X-GNOME-DEFAULT-WORKGROUP"
 
+/* Guest logins use: */
+#define GUEST_LOGIN "guest"
+
 /* 5 minutes before we re-read the workgroup cache again */
 #define WORKGROUP_CACHE_TIMEOUT (5*60)
 
@@ -111,7 +114,8 @@ static time_t workgroups_timestamp = 0;
 /* Authentication ----------------------------------------------------------- */
 
 #define SMB_AUTH_STATE_PREFILLED	0x00000010 	/* Have asked gnome-auth for prefilled auth */
-#define SMB_AUTH_STATE_PROMPTED		0x00000020 	/* Have asked gnome-auth for to prompt user */
+#define SMB_AUTH_STATE_GUEST		0x00000020 	/* Have tried 'guest' authentication */
+#define SMB_AUTH_STATE_PROMPTED		0x00000040 	/* Have asked gnome-auth for to prompt user */
 
 typedef struct _SmbAuthContext {
 	
@@ -128,6 +132,7 @@ typedef struct _SmbAuthContext {
 	
 	/* Used in chat between perform_authentication and auth_callback */
 	gboolean auth_called;		/* Set by auth_callback */
+	gboolean preset_user;		/* Set when we have a preset user from the URI */
 	gchar *for_server;		/* Set by auth_callback */
 	gchar *for_share;		/* Set by auth_callback */
 	gchar *use_user;		/* Set by perform_authentication */
@@ -774,7 +779,6 @@ initial_authentication (SmbAuthContext *
 	SmbServerCacheEntry server_lookup;
 	SmbServerCacheEntry *server;
         gboolean found_user = FALSE;
-        gboolean preset_user = FALSE;
 	char *tmp;
 
 	DEBUG_SMB(("[auth] Initial authentication lookups\n"));
@@ -794,31 +798,29 @@ initial_authentication (SmbAuthContext *
 					    	  	      tmp - toplevel_uri->user_name);
 			g_free (actx->use_user);
 			actx->use_user = string_dup_nzero (tmp + 1);
-
-			if (actx->use_domain != NULL)
-				actx->prompt_flags &= ~GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_DOMAIN;
-			if (actx->use_user != NULL)
-				actx->prompt_flags &= ~GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME;
-
 			DEBUG_SMB(("[auth] User from URI: %s@%s\n", actx->use_user, actx->use_domain));
 		} else {
 			g_free (actx->use_user);
 			actx->use_user = string_dup_nzero (toplevel_uri->user_name);
 			g_free (actx->use_domain);
 			actx->use_domain = NULL;
-
-			if (actx->use_user != NULL)
-				actx->prompt_flags &= ~GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME;
 			DEBUG_SMB(("[auth] User from URI: %s\n", actx->use_user));
 		}
-                preset_user = TRUE;
+		
+		if (actx->use_user != NULL) {
+			actx->preset_user = TRUE;
+			actx->prompt_flags &= ~GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME;
+		}
+		if (actx->use_domain != NULL) {
+			actx->prompt_flags &= ~GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_DOMAIN;
+		}
 	} 
 
         if (lookup_user_cache (actx, TRUE) ||
             lookup_user_cache (actx, FALSE))
                 found_user = TRUE;
 
-        if (found_user || preset_user) {
+        if (found_user || actx->preset_user) {
         	/* Lookup the server in our internal cache */
         	server_lookup.server_name = (char*)actx->for_server;
         	server_lookup.share_name = (char*)actx->for_share;
@@ -828,9 +830,9 @@ initial_authentication (SmbAuthContext *
         	server = g_hash_table_lookup (server_cache, &server_lookup);
         	if (server == NULL) {
                  
-                        /* If a blank user, try 'guest' */
+                        /* If a blank user, try looking up 'guest' */
                         if (!actx->use_user) {
-                                server_lookup.username = "guest";
+                                server_lookup.username = GUEST_LOGIN;
                                 server_lookup.domain = NULL;
                                 server = g_hash_table_lookup (server_cache, &server_lookup);
                         }
@@ -854,6 +856,7 @@ prefill_authentication (SmbAuthContext *
 	GnomeVFSModuleCallbackFillAuthenticationIn in_args;
 	GnomeVFSModuleCallbackFillAuthenticationOut out_args;
 	gboolean invoked;
+	gboolean filled = FALSE;
 
 	g_return_val_if_fail (actx != NULL, FALSE);
 	g_return_val_if_fail (actx->for_server != NULL, FALSE);	
@@ -901,24 +904,30 @@ prefill_authentication (SmbAuthContext *
                 invoked = gnome_vfs_module_callback_invoke
                                         (GNOME_VFS_MODULE_CALLBACK_FILL_AUTHENTICATION,
                                         &in_args, sizeof (in_args),
-                                        &out_args, sizeof (out_args));                               
+                                        &out_args, sizeof (out_args));                              
         }
         
 	if (invoked && out_args.valid) {
-		g_free (actx->use_user);
-		actx->use_user = string_dup_nzero (out_args.username);
-		g_free (actx->use_domain);
-		actx->use_domain = string_dup_nzero (out_args.domain);
-		g_free (actx->use_password);
-		actx->use_password = g_strdup (out_args.password);
-		DEBUG_SMB(("[auth] Prefilled credentials: %s@%s:%s\n", actx->use_user, actx->use_domain, actx->use_password));
+		/* When a preset user make sure we stick to this login */
+		if (!actx->preset_user || string_compare (actx->use_user, out_args.username)) {
+			
+			g_free (actx->use_user);
+			actx->use_user = string_dup_nzero (out_args.username);
+			g_free (actx->use_domain);
+			actx->use_domain = string_dup_nzero (out_args.domain);
+			g_free (actx->use_password);
+			actx->use_password = g_strdup (out_args.password);
+			
+			filled = TRUE;
+			DEBUG_SMB(("[auth] Prefilled credentials: %s@%s:%s\n", actx->use_user, actx->use_domain, actx->use_password));
+		}
 	} 
 	
 	g_free (out_args.username);
 	g_free (out_args.domain);
 	g_free (out_args.password);
 
-	return invoked && out_args.valid;
+	return filled;
 }
 
 static gboolean
@@ -949,7 +958,12 @@ prompt_authentication (SmbAuthContext *a
 	in_args.domain = (char*)actx->use_domain;
 	in_args.port = actx->uri ? ((GnomeVFSToplevelURI*)actx->uri)->host_port : 0;
 
-	in_args.default_user = actx->use_user ? actx->use_user : (char*)g_get_user_name ();
+	in_args.default_user = actx->use_user;
+	if (string_compare (in_args.default_user, GUEST_LOGIN))
+		in_args.default_user = NULL;
+	if (!in_args.default_user)
+		in_args.default_user = (char*)g_get_user_name ();
+	
 	in_args.default_domain = actx->use_domain ? actx->use_domain : smb_context->workgroup;
 	
 	memset (&out_args, 0, sizeof (out_args));
@@ -1198,12 +1212,26 @@ perform_authentication (SmbAuthContext *
 			cont = FALSE;
 			
 			UNLOCK_SMB();
-
+			
+				/* Do we have gnome-keyring credentials for this? */
 				if (!(actx->state & SMB_AUTH_STATE_PREFILLED)) {
 					actx->state |= SMB_AUTH_STATE_PREFILLED;
 					cont = prefill_authentication (actx);
 				}
-				
+
+				/* Then we try a guest credentials... */
+				if (!cont && !actx->preset_user && !(actx->state & SMB_AUTH_STATE_GUEST)) {
+					g_free (actx->use_user);
+					actx->use_user = strdup(GUEST_LOGIN);
+					g_free (actx->use_domain);
+					actx->use_domain = NULL;
+					g_free (actx->use_password);
+					actx->use_password = strdup("");
+					actx->state |= SMB_AUTH_STATE_GUEST;
+					cont = TRUE;
+				}
+
+				/* And as a last step, prompt */
 				if (!cont)
 					cont = prompt_authentication (actx, &auth_cancelled);
 				
@@ -1279,19 +1307,19 @@ auth_callback (const char *server_name, 
                 strncpy (password_out, actx->use_password ? actx->use_password : "", pwmaxlen);
 		if (actx->use_domain)
 			strncpy (domain_out, actx->use_domain, domainmaxlen);
-                DEBUG_SMB(("[auth] Using credentials: %s:%s@%s\n", username_out, password_out, domain_out));
-
-        /* On first login try a guest login */
-        } else if (actx->passes == 1) {
-                strncpy (username_out, "guest", unmaxlen);
-                strncpy (password_out, "", pwmaxlen);
-                DEBUG_SMB(("[auth] No credentials, trying 'guest' user login\n"));
-
-	/* We have no credentials ... */			
+		DEBUG_SMB(("[auth] Using credentials: %s:%s@%s\n", username_out, password_out, domain_out));
+	
+	/* We have no credentials ... */
 	} else {
+		g_assert (!actx->preset_user);
+		
+		if (actx->passes == 1)
+			DEBUG_SMB(("[auth] No credentials, trying anonymous user login\n"));
+		else
+			DEBUG_SMB(("[auth] No credentials, returning null values\n"));
+		
 		strncpy (username_out, "", unmaxlen);
 		strncpy (password_out, "", pwmaxlen);
-                DEBUG_SMB(("[auth] No credentials, returning null values\n"));
 	}
 
 	/* Put in the default workgroup if none specified */


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome-vfs2.spec	28 Feb 2006 10:17:34 -0000	1.98
+++ gnome-vfs2.spec	28 Feb 2006 13:16:12 -0000	1.99
@@ -11,7 +11,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-vfs2
 Version: 2.13.92
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -32,7 +32,7 @@
 BuildRequires: gtk-doc >= %{gtkdoc_version}
 BuildRequires: perl-XML-Parser >= %{perl_XML_Parser_version}
 BuildRequires: samba-common >= %{samba_version}
-BuildRequires: openssl-devel fam-devel
+BuildRequires: openssl-devel gamin-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-glib-devel >= 0.6
 BuildRequires: hal-devel >= 0.5.0
@@ -43,6 +43,8 @@
 
 # Backport from cvs to fix permission reading
 Patch4: gnome-vfs-2.13.92-permisssions-fix.patch
+# Backport from cvs to fix smb browsing
+Patch5: gnome-vfs-2.13.92-smb.patch
 
 # send to upstream
 Patch101:	gnome-vfs-2.8.2-schema_about_for_upstream.patch
@@ -90,6 +92,7 @@
 
 %patch3 -p1 -b .modules-conf
 %patch4 -p0 -b .permissions-fix
+%patch5 -p0 -b .smb
 
 # send to upstream
 %patch101 -p1 -b .schema_about
@@ -186,6 +189,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-3
+- Fix smb browsing (#170922)
+
 * Tue Feb 28 2006 Alexander Larsson <alexl at redhat.com> - 2.13.92-2
 - Add patch (from cvs) that fixes permission reading
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:29:55 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:29:55 -0500
Subject: rpms/ghostscript/devel ghostscript.spec,1.100,1.101
Message-ID: <200602281329.k1SDTtU2009760@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9570

Modified Files:
	ghostscript.spec 
Log Message:
- BuildRequires: libXt-devel

In file included from ./src/gdevxalt.c:22:
./src/x_.h:139:29: error: X11/Intrinsic.h: No such file or directory
./src/x_.h:140:30: error: X11/StringDefs.h: No such file or directory
./src/x_.h:141:25: error: X11/Shell.h: No such file or directory
make: *** [obj/gdevxalt.o] Error 1



Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ghostscript.spec	11 Feb 2006 03:06:53 -0000	1.100
+++ ghostscript.spec	28 Feb 2006 13:29:52 -0000	1.101
@@ -4,9 +4,8 @@
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
-BuildRequires: libjpeg-devel
 
-Release: 5.2
+Release: 6
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -30,6 +29,7 @@
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
+BuildRequires: libjpeg-devel, libXt-devel
 BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk2-devel
 BuildRequires: glib2-devel
 # Omni requires libxml
@@ -263,6 +263,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 8.15.1-6
+- BuildRequires: libXt-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 8.15.1-5.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:42:01 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:42:01 -0500
Subject: rpms/gnome-mount/devel gnome-mount.spec,1.11,1.12
Message-ID: <200602281342.k1SDg1Ue012925@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-mount/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12737

Modified Files:
	gnome-mount.spec 
Log Message:
- add some buildrequires

checking for GNOME_MOUNT... configure: error: Package requirements (dbus-glib-1 >= 0.31 hal-storage >= 0.5.5 gtk+-2.0 >= 2.8.0) were not met:

No package 'dbus-glib-1' found
No package 'hal-storage' found
No package 'gtk+-2.0' found



Index: gnome-mount.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-mount.spec	25 Feb 2006 00:05:45 -0000	1.11
+++ gnome-mount.spec	28 Feb 2006 13:41:58 -0000	1.12
@@ -1,12 +1,13 @@
 Summary: Mount replacement which uses HAL to do the mounting 
 Name: gnome-mount
 Version: 0.4
-Release: 2
+Release: 3
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 Patch0: gnome-mount-0.4-drive-mount.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.31
 Requires: hal >= 0.5.7
 Requires: dbus >= 0.60
 
@@ -60,6 +61,9 @@
 %{_libdir}/pkgconfig/gnome-mount.pc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.4-3
+- add some buildrequires
+
 * Mon Feb 13 2006 David Zeuthen <davidz at redhat.com> - 0.4-2
 - Fix mounting of drives that HAL cannot poll
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:45:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:45:58 -0500
Subject: rpms/gnome-applets/devel gnome-applets.spec,1.117,1.118
Message-ID: <200602281345.k1SDjwha019207@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14423

Modified Files:
	gnome-applets.spec 
Log Message:
- BuildRequires: which

if [ -f "C/accessx-status.xml" ]; then d="../"; else d="$sd/"; fi; \
(cd es/ && \
  `which xml2po` -e -p \
    "${d}es/es.po" \
    "${d}C/accessx-status.xml" > accessx-status.xml.tmp && \
    cp accessx-status.xml.tmp accessx-status.xml && rm -f accessx-status.xml.tmp)
/bin/sh: which: command not found
/bin/sh: -e: command not found
make[3]: *** [es/accessx-status.xml] Error 127





Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- gnome-applets.spec	27 Feb 2006 03:31:38 -0000	1.117
+++ gnome-applets.spec	28 Feb 2006 13:45:55 -0000	1.118
@@ -18,7 +18,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.13.90
-Release:  	1
+Release:  	2
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -54,6 +54,7 @@
 BuildRequires:  gnome-utils >= %{gnome_utils_version}
 BuildRequires:  dbus-devel >= %{dbus_version}
 BuildRequires:  gnome-doc-utils
+BuildRequires:  which
 
 Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	libxklavier >= %{libxklavier_version}
@@ -180,6 +181,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.90-2
+- BuildRequires: which
+
 * Sun Feb 26 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.90-1
 - Update to 2.13.90
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 13:46:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 08:46:16 -0500
Subject: rpms/php-pear/devel php-pear.spec,1.8,1.9
Message-ID: <200602281346.k1SDkGN4020856@cvs.devel.redhat.com>

Author: jorton

Update of /cvs/dist/rpms/php-pear/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20686

Modified Files:
	php-pear.spec 
Log Message:
* Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 1:1.4.6-2
- set cache_dir directory, own /var/cache/php-pear



Index: php-pear.spec
===================================================================
RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-pear.spec	30 Jan 2006 15:47:59 -0000	1.8
+++ php-pear.spec	28 Feb 2006 13:46:12 -0000	1.9
@@ -6,7 +6,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.4.6
-Release: 1
+Release: 2
 Epoch: 1
 License: PHP
 Group: System
@@ -43,6 +43,7 @@
 
 export PHP_PEAR_SYSCONF_DIR=`pwd`
 export PHP_PEAR_SIG_KEYDIR=/etc/pearkeys
+export PHP_PEAR_CACHE_DIR=%{_localstatedir}/cache/php-pear
 
 %{_bindir}/php -n -dshort_open_tag=0 -dsafe_mode=0 \
          -derror_reporting=E_ALL -ddetect_unicode=0 \
@@ -62,7 +63,8 @@
    install -m 755 $RPM_SOURCE_DIR/${f}.sh $RPM_BUILD_ROOT%{_bindir}/${f}
 done
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir} \
+           $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear
 
 # Relocate everything:
 sed -si "s,$RPM_BUILD_ROOT,,g" \
@@ -83,6 +85,7 @@
 # Check that no buildroot-relative or arch-specific paths are left in the pear.conf
 grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
 grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
+grep /tmp $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,8 +96,12 @@
 %{peardir}
 %{_bindir}/*
 %config %{_sysconfdir}/pear.conf
+%dir %{_localstatedir}/cache/php-pear
 
 %changelog
+* Tue Feb 28 2006 Joe Orton <jorton at redhat.com> 1:1.4.6-2
+- set cache_dir directory, own /var/cache/php-pear
+
 * Mon Jan 30 2006 Joe Orton <jorton at redhat.com> 1:1.4.6-1
 - update to 1.4.6
 - require php >= 5.1.0 (#178821)



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:06:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:06:41 -0500
Subject: rpms/gnome-keyring-manager/devel gnome-keyring-manager.spec, 1.13,
	1.14
Message-ID: <200602281406.k1SE6fYc001274@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-keyring-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1226

Modified Files:
	gnome-keyring-manager.spec 
Log Message:
BuildRequires: gnome-doc-utils

checking for gnome-doc-utils >= 0.3.2... Package gnome-doc-utils was not found in the pkg-config search path.
error: Bad exit status from /var/tmp/rpm-tmp.51831 (%build)



Index: gnome-keyring-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-keyring-manager/devel/gnome-keyring-manager.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-keyring-manager.spec	11 Feb 2006 03:14:04 -0000	1.13
+++ gnome-keyring-manager.spec	28 Feb 2006 14:06:30 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: The GNOME virtual file-system libraries.
 Name: gnome-keyring-manager
 Version: 2.12.0
-Release: 2.2.1
+Release: 3
 License: GPL
 Group: User Interface/Desktops
 Source: gnome-keyring-manager-%{version}.tar.bz2
@@ -13,6 +13,7 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: pkgconfig
+BuildRequires: gnome-doc-utils >= 0.3.2
 
 %description
 gnome-keyring-manager is an application that lets you manage the
@@ -58,6 +59,9 @@
 %{_datadir}/man/man1/*
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.12.0-3
+- BuildRequires: gnome-doc-utils
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.12.0-2.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:08:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:08:52 -0500
Subject: rpms/netpbm/devel netpbm.spec,1.56,1.57
Message-ID: <200602281408.k1SE8qnX001850@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1747

Modified Files:
	netpbm.spec 
Log Message:
- fix typo in changelog



Index: netpbm.spec
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- netpbm.spec	28 Feb 2006 12:59:04 -0000	1.56
+++ netpbm.spec	28 Feb 2006 14:08:50 -0000	1.57
@@ -178,7 +178,7 @@
 %changelog
 * Tue Feb 28 2006 Jindrich Novy <jnovy at redhat.com> 10.32-1
 - update to 10.32
-- drop .msbmp patch, aplied upstream
+- drop .msbmp patch, applied upstream
 - sync the rest of the patches
 - regenerate man pages
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:22:22 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:22:22 -0500
Subject: rpms/netpbm/devel .cvsignore,1.19,1.20 sources,1.20,1.21
Message-ID: <200602281422.k1SEMMnw019129@cvs.devel.redhat.com>

Author: jnovy

Update of /cvs/dist/rpms/netpbm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19028

Modified Files:
	.cvsignore sources 
Log Message:
- upload new source tarballs



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	30 Dec 2005 14:10:17 -0000	1.19
+++ .cvsignore	28 Feb 2006 14:22:19 -0000	1.20
@@ -16,3 +16,5 @@
 netpbm-10.30.tar.bz2
 netpbmdoc-10.31.tar.bz2
 netpbm-10.31.tar.bz2
+netpbm-10.32.tar.bz2
+netpbmdoc-10.32.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/netpbm/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	30 Dec 2005 14:10:19 -0000	1.20
+++ sources	28 Feb 2006 14:22:19 -0000	1.21
@@ -1,2 +1,2 @@
-0399e7b78da0291369004f9c19761075  netpbmdoc-10.31.tar.bz2
-34910af6b21f0de0142876455f27ad88  netpbm-10.31.tar.bz2
+f5e96eb9e3692c24b56dd011c2ca2948  netpbm-10.32.tar.bz2
+a36f6786359883186369d61a84b25ae6  netpbmdoc-10.32.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:25:03 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:25:03 -0500
Subject: rpms/gnome-mag/devel gnome-mag.spec,1.27,1.28
Message-ID: <200602281425.k1SEP3ON020345@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-mag/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19927

Modified Files:
	gnome-mag.spec 
Log Message:
- BuildRequires: libXt-devel

conftest.c:32:27: error: X11/Intrinsic.h: No such file or directory
configure:23474: error: X development libraries not found



Index: gnome-mag.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnome-mag.spec	11 Feb 2006 03:14:23 -0000	1.27
+++ gnome-mag.spec	28 Feb 2006 14:25:00 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: GNOME Magnifier
 Name: gnome-mag
 Version: 0.12.3
-Release: 2.1
+Release: 3
 License: LGPL
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
@@ -12,7 +12,7 @@
 BuildRequires: automake14
 BuildRequires: intltool
 BuildRequires: libX11-devel, libXtst-devel, libXdamage-devel
-BuildRequires: libXfixes-devel
+BuildRequires: libXfixes-devel, libXt-devel
 BuildRequires: libbonobo-devel
 BuildRequires: gtk2-devel
 BuildRequires: at-spi-devel
@@ -70,6 +70,9 @@
 %{_datadir}/doc/gnome-mag*
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.12.3-3
+- BuildRequires: libXt-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.12.3-2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:25:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:25:57 -0500
Subject: rpms/libvirt/devel .cvsignore, 1.4, 1.5 libvirt.spec, 1.5,
	1.6 sources, 1.4, 1.5
Message-ID: <200602281425.k1SEPv2N020830@cvs.devel.redhat.com>

Author: veillard

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20797

Modified Files:
	.cvsignore libvirt.spec sources 
Log Message:
Upstream release 0.0.6 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Feb 2006 11:30:08 -0000	1.4
+++ .cvsignore	28 Feb 2006 14:25:55 -0000	1.5
@@ -1,3 +1,4 @@
 libvirt-0.0.3.tar.gz
 libvirt-0.0.4.tar.gz
 libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libvirt.spec	23 Feb 2006 11:35:01 -0000	1.5
+++ libvirt.spec	28 Feb 2006 14:25:55 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
-Version: 0.0.5
+Version: 0.0.6
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -99,6 +99,12 @@
 %doc python/libvirtclass.txt
 
 %changelog
+* Tue Feb 28 2006 Daniel Veillard <veillard at redhat.com> 0.0.6-1
+- added error handling APIs
+- small bug fixes
+- improve python bindings
+- augment documentation and regression tests
+
 * Thu Feb 23 2006 Daniel Veillard <veillard at redhat.com> 0.0.5-1
 - new domain creation API
 - new UUID based APIs


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Feb 2006 11:30:08 -0000	1.4
+++ sources	28 Feb 2006 14:25:55 -0000	1.5
@@ -1 +1 @@
-3ba34b4bc0a588cee86e8219a6935e3e  libvirt-0.0.5.tar.gz
+51c4cd8255d8a639437959b934a2a5ac  libvirt-0.0.6.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:33:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:33:07 -0500
Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.50,1.51
Message-ID: <200602281433.k1SEX7WJ022717@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22703

Modified Files:
	gnome-desktop.spec 
Log Message:
- BuildRequires: gnome-doc-utils

checking for GDU_MODULE_VERSION_CHECK... configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met.



Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnome-desktop.spec	28 Feb 2006 02:56:33 -0000	1.50
+++ gnome-desktop.spec	28 Feb 2006 14:33:05 -0000	1.51
@@ -7,11 +7,12 @@
 %define libgnome_version 2.2.0
 %define startup_notification_version 0.5
 %define po_package gnome-desktop-2.0
+%define gnome_doc_utils_version 0.3.2
 
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc.
 Name: gnome-desktop
 Version: 2.13.92
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2
 Source1: %{name}-2.8.0-extrapo.tar.bz2
@@ -40,6 +41,7 @@
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: startup-notification-devel >= %{startup_notification_version}
+BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 
 BuildRequires: scrollkeeper gettext
 
@@ -132,6 +134,9 @@
 #%{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.92-2
+- BuildRequires: gnome-doc-utils
+
 * Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 14:36:58 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 09:36:58 -0500
Subject: rpms/gnome-libs/devel gnome-libs.spec,1.44,1.45
Message-ID: <200602281436.k1SEawMt017064@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-libs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17047

Modified Files:
	gnome-libs.spec 
Log Message:
- Buildrequires: libXt-devel

../gtk-xmhtml/toolkit.h:35:27: error: X11/Intrinsic.h: No such file or directory



Index: gnome-libs.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnome-libs.spec	13 Feb 2006 22:52:16 -0000	1.44
+++ gnome-libs.spec	28 Feb 2006 14:36:56 -0000	1.45
@@ -11,7 +11,7 @@
 
 Name:		gnome-libs
 Version: 	1.4.1.2.90
-Release: 	48.3
+Release: 	49
 Epoch:		1
 Summary: The main GNOME libraries.
 License:	LGPL
@@ -35,6 +35,7 @@
 BuildRequires:  libpng10-devel >= 1.0.13
 BuildRequires:  libtool
 BuildRequires:  gettext
+BuildRequires:  libXt-devel
 
 ## from db1
 %ifnarch ia64
@@ -350,6 +351,9 @@
 
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 1.4.1.2.90-49
+- Buildrequires: libXt-devel
+
 * Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.4.1.2.90-48.3
 - need to rebuild a 3rd time for long-double fixes.
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 15:08:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 10:08:40 -0500
Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.34,1.35
Message-ID: <200602281508.k1SF8e2H008761@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-pilot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8648

Modified Files:
	gnome-pilot.spec 
Log Message:
- Buildrequires: gob2

checking for gob2... no
./configure: line 21851: syntax error near unexpected token `2.0.3'
./configure: line 21851: `  GOB2_CHECK(2.0.3)'



Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnome-pilot.spec	11 Feb 2006 03:15:35 -0000	1.34
+++ gnome-pilot.spec	28 Feb 2006 15:08:36 -0000	1.35
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 7.fc5.2.1
+Release: 7.fc5.3
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -35,6 +35,7 @@
 BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gnome-panel-devel >= 2.0.6
 BuildRequires: GConf2-devel >= 2.0
+BuildRequires: gob2 >= 2.0.3
 BuildRequires: pilot-link-devel >= %{pilot-link-version}
 ExcludeArch: s390 s390x
 
@@ -148,6 +149,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.0.13-7.fc5.3
+- Buildrequires: gob2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.0.13-7.fc5.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 15:20:31 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 10:20:31 -0500
Subject: rpms/gnome-print/devel gnome-print.spec,1.23,1.24
Message-ID: <200602281520.k1SFKVRc026103@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-print/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25937

Modified Files:
	gnome-print.spec 
Log Message:
- BuildRequires: freetype-devel for freetype-config


Index: gnome-print.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-print/devel/gnome-print.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gnome-print.spec	11 Feb 2006 03:16:10 -0000	1.23
+++ gnome-print.spec	28 Feb 2006 15:20:17 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Printing libraries for GNOME.
 Name: gnome-print
 Version: 0.37
-Release: 12.2.1
+Release: 13
 Epoch: 1
 License: LGPL
 Group: System Environment/Base
@@ -24,6 +24,7 @@
 BuildPrereq: libxml-devel >= 1.8.8 
 BuildPrereq: automake14
 BuildRequires: autoconf
+BuildRequires: freetype-devel
 
 # Bug fix patches
 # Make gnome-font-install handle mangled options more cleanly
@@ -177,6 +178,9 @@
 %{_includedir}/*/*
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 0.37-13
+- BuildRequires: freetype-devel for freetype-config
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:0.37-12.2.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 15:31:00 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 10:31:00 -0500
Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec,1.2,1.3
Message-ID: <200602281531.k1SFV07M030193@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-python2-desktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30162

Modified Files:
	gnome-python-desktop.spec 
Log Message:
- BuildRequires: python-devel

checking for headers required to compile python extensions... not found
configure: error: could not find Python headers



Index: gnome-python-desktop.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-python-desktop.spec	11 Feb 2006 03:16:45 -0000	1.2
+++ gnome-python-desktop.spec	28 Feb 2006 15:30:56 -0000	1.3
@@ -14,7 +14,7 @@
 Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop.
 Name: gnome-python2-desktop
 Version: 2.13.3
-Release: 1.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
@@ -33,6 +33,7 @@
 BuildRequires: libgtop2-devel >= %{libgtop_version}
 BuildRequires: totem-devel
 BuildRequires: gnome-media-devel >= %{gnome_media_version}
+Buildrequires: python-devel
 %ifnarch s390 s390x
 BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version}
 %endif
@@ -211,6 +212,9 @@
 
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.3-2
+- Buildrequires: python-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 15:38:47 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 10:38:47 -0500
Subject: rpms/gdm/devel .cvsignore, 1.22, 1.23 gdm.spec, 1.137, 1.138 sources,
	1.24, 1.25 gdm-2.13.0.4-add-locale-header.patch, 1.1,
	NONE gdm-2.6.0.0-session-errors-in-tmp.patch, 1.1,
	NONE gdm-2.6.0.5-check-selection.patch, 1.1,
	NONE gdm-2.6.0.5-fix-norwegian.patch, 1.1,
	NONE gdm-2.6.0.7-desktop.patch, 1.1,
	NONE gdm-2.6.0.8-compensate-for-broken-dpi.patch, 1.2,
	NONE gdm-2.6.0.8-dont-use-aa-canvas.patch, 1.1,
	NONE gdm-2.6.0.8-fix-halt-command.patch, 1.1,
	NONE gdm-2.6.0.8-merge-resources.patch, 1.1,
	NONE gdm-2.6.0.8-process-all-messages.patch, 1.6,
	NONE gdm-2.8.0.4-modularx.patch, 1.3, NONE
Message-ID: <200602281538.k1SFclSo031420@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31308

Modified Files:
	.cvsignore gdm.spec sources 
Removed Files:
	gdm-2.13.0.4-add-locale-header.patch 
	gdm-2.6.0.0-session-errors-in-tmp.patch 
	gdm-2.6.0.5-check-selection.patch 
	gdm-2.6.0.5-fix-norwegian.patch gdm-2.6.0.7-desktop.patch 
	gdm-2.6.0.8-compensate-for-broken-dpi.patch 
	gdm-2.6.0.8-dont-use-aa-canvas.patch 
	gdm-2.6.0.8-fix-halt-command.patch 
	gdm-2.6.0.8-merge-resources.patch 
	gdm-2.6.0.8-process-all-messages.patch 
	gdm-2.8.0.4-modularx.patch 
Log Message:
- Update to 2.13.0.9
- Use new %%post section, written by 
  Michal Jaegermann <michal at harddata.com> (bug 183082)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	13 Feb 2006 23:07:12 -0000	1.22
+++ .cvsignore	28 Feb 2006 15:38:45 -0000	1.23
@@ -1 +1 @@
-gdm-2.13.0.8.tar.gz
+gdm-2.13.0.9.tar.bz2


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gdm.spec	26 Feb 2006 14:51:50 -0000	1.137
+++ gdm.spec	28 Feb 2006 15:38:45 -0000	1.138
@@ -14,13 +14,13 @@
 
 Summary: The GNOME Display Manager.
 Name: gdm
-Version: 2.13.0.8
-Release: 7
+Version: 2.13.0.9
+Release: 1
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
 URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm
-Source: gdm-%{PACKAGE_VERSION}.tar.gz
+Source: gdm-%{PACKAGE_VERSION}.tar.bz2
 Source1: gdm-allow-login.init
 Source2: gdm-early-login.init
 Source3: zzz-bootup-complete.init
@@ -42,9 +42,7 @@
 Patch17: gdm-2.8.0.4-call-dbus-launch.patch
 Patch18: gdm-2.8.0.4-dont-call-xsm.patch
 Patch19: gdm-2.13.0.4-add-gnome-cflags.patch
-Patch20: gdm-2.13.0.4-add-locale-header.patch
 Patch22: gdm-2.13.0.7-pam_stack.patch
-Patch23: gdm-2.13.0.8-malloc-freed-memory.patch
 
 BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root
 
@@ -115,9 +113,7 @@
 %patch17 -p1 -b .call-dbus-launch
 %patch18 -p1 -b .dont-call-xsm
 %patch19 -p1 -b .add-gnome-cflags
-%patch20 -p1 -b .add-locale-header
 %patch22 -p1 -b .pam_stack
-%patch23 -p1 -b .malloc-freed-memory
 
 # 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
@@ -311,7 +307,8 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
-* Sun Feb 26 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.8-7
+* Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 1:2.13.0.9-1
+- Update to 2.13.0.9
 - Use new %%post section, written by 
   Michal Jaegermann <michal at harddata.com> (bug 183082)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	13 Feb 2006 23:07:13 -0000	1.24
+++ sources	28 Feb 2006 15:38:45 -0000	1.25
@@ -1 +1 @@
-a0988b6ef167aaf4b11c85c0db6795cd  gdm-2.13.0.8.tar.gz
+ba35c31baeccdb65774b0fcec26d85ce  gdm-2.13.0.9.tar.bz2


--- gdm-2.13.0.4-add-locale-header.patch DELETED ---


--- gdm-2.6.0.0-session-errors-in-tmp.patch DELETED ---


--- gdm-2.6.0.5-check-selection.patch DELETED ---


--- gdm-2.6.0.5-fix-norwegian.patch DELETED ---


--- gdm-2.6.0.7-desktop.patch DELETED ---


--- gdm-2.6.0.8-compensate-for-broken-dpi.patch DELETED ---


--- gdm-2.6.0.8-dont-use-aa-canvas.patch DELETED ---


--- gdm-2.6.0.8-fix-halt-command.patch DELETED ---


--- gdm-2.6.0.8-merge-resources.patch DELETED ---


--- gdm-2.6.0.8-process-all-messages.patch DELETED ---


--- gdm-2.8.0.4-modularx.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 15:55:04 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 10:55:04 -0500
Subject: rpms/mono/devel mono-1.1.13.2-work-with-selinux.patch, 1.1,
	1.2 mono.spec, 1.28, 1.29
Message-ID: <200602281555.k1SFt4q1018716@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18613

Modified Files:
	mono-1.1.13.2-work-with-selinux.patch mono.spec 
Log Message:
- Updated patch from Paolo Molaro <lupus at ximian.com>


mono-1.1.13.2-work-with-selinux.patch:
 mono-compiler.h |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

Index: mono-1.1.13.2-work-with-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono-1.1.13.2-work-with-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-1.1.13.2-work-with-selinux.patch	27 Feb 2006 17:41:24 -0000	1.1
+++ mono-1.1.13.2-work-with-selinux.patch	28 Feb 2006 15:55:00 -0000	1.2
@@ -1,5 +1,5 @@
 --- mono-1.1.13.2/mono/utils/mono-compiler.h.work-with-selinux	2006-02-27 12:38:30.000000000 -0500
-+++ mono-1.1.13.2/mono/utils/mono-compiler.h	2006-02-27 12:38:46.000000000 -0500
++++ mono-1.1.13.2/mono/utils/mono-compiler.h	2006-02-28 10:53:01.000000000 -0500
 @@ -9,10 +9,10 @@
  #ifdef HAVE_KW_THREAD
  #if HAVE_TLS_MODEL_ATTR
@@ -14,7 +14,7 @@
  #else
  #define MONO_TLS_FAST __attribute__((tls_model("local-exec")))
  #endif
-@@ -22,15 +22,20 @@
+@@ -22,15 +22,19 @@
  #endif
  
  #if defined(__GNUC__) && defined(__i386__)
@@ -27,8 +27,7 @@
  #elif defined(__x86_64__)
  #if defined(PIC)
 -#define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
-+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq $" #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset
-+= foo; } while (0)
++#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq " #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset = foo; } while (0)
  #else
 -#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("jmp 1f; .section writetext, \"awx\"; 1: movq $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=a" (foo)); offset = foo; } while (0);
 +#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("movq $" #var "@TPOFF, %0" : "=r" (foo)); offset = foo; } while (0)


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mono.spec	27 Feb 2006 17:41:24 -0000	1.28
+++ mono.spec	28 Feb 2006 15:55:00 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.1.13.2
-Release:        3
+Release:        4
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -493,6 +493,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 1.1.13.2-4
+- Updated patch from Paolo Molaro <lupus at ximian.com>
+
 * Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 1.1.13.2-3
 - Patch from Jakub to make work with SELinux better
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 16:10:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 11:10:30 -0500
Subject: rpms/gnome-panel/devel gnome-panel.spec,1.116,1.117
Message-ID: <200602281610.k1SGAUph021978@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21541

Modified Files:
	gnome-panel.spec 
Log Message:
Add quite a few buildrequires to make it build with mock/plague



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- gnome-panel.spec	27 Feb 2006 17:11:50 -0000	1.116
+++ gnome-panel.spec	28 Feb 2006 16:10:17 -0000	1.117
@@ -10,13 +10,17 @@
 %define gnome_vfs2_version 2.9.1
 %define gnome_menus_version 2.11.1
 %define evolution_data_server_version 1.1.4
+%define orbit_version 2.4.0
+%define gtk2_version 2.7.1
+%define dbus_version 0.60
+%define gnome_doc_utils_version 0.3.2
 
 %define use_evolution_data_server 1
 
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.91
-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
@@ -38,9 +42,13 @@
 Prereq: scrollkeeper
 Prereq: gtk2 >= %{gtk2_version}
 
+BuildRequires: which
+BuildRequires: libxml2-python
 BuildRequires: intltool
 BuildRequires: scrollkeeper
 BuildRequires: libxslt
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libglade2-devel >= %{libglade2_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -50,8 +58,11 @@
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
+BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 %if %{use_evolution_data_server}
 BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
+BuildRequires: ORBit2-devel >= %{orbit_version}
+BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 
 Patch0: gnome-panel-2.12.1-vendor.patch
@@ -208,6 +219,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.91-5
+- Buildrequires: ORBit2-devel, which, libxml2-python, libX11-devel,
+  libXt-devel, gnome-doc-utils, dbus-devel
+
 * Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-4
 - ignore unknown options (bug 182734)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 16:13:51 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 11:13:51 -0500
Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.26,1.27
Message-ID: <200602281613.k1SGDpBv023531@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-power-manager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23378

Modified Files:
	gnome-power-manager.spec 
Log Message:
- Buildrequires: gnome-doc-utils

checking for GDU_MODULE_VERSION_CHECK... configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met:
No package 'gnome-doc-utils' found



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gnome-power-manager.spec	26 Feb 2006 15:44:59 -0000	1.26
+++ gnome-power-manager.spec	28 Feb 2006 16:13:48 -0000	1.27
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.13.92
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/System
 Source: gnome-power-manager-%{version}.tar.bz2
@@ -18,6 +18,7 @@
 BuildPrereq: dbus-devel >= %{dbus_version}
 BuildPrereq: libnotify-devel
 BuildRequires: scrollkeeper
+BuildRequires: gnome-doc-utils >= 0.3.2
 Requires: gnome-mime-data
 Requires: gnome-icon-theme
 Requires: hal >= %{hal_version}
@@ -79,6 +80,9 @@
 %{_datadir}/applications/gnome-power-preferences.desktop
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.92-2
+- Buildrequires: gnome-doc-utils
+
 * Sun Feb 26 2006 Ray Strode <rstrode at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 16:16:41 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 11:16:41 -0500
Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.43,1.44
Message-ID: <200602281616.k1SGGf5P032759@cvs.devel.redhat.com>

Author: karsten

Update of /cvs/dist/rpms/gnome-python2-extras/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30385

Modified Files:
	gnome-python-extras.spec 
Log Message:
- Buildrequires: python-devel

checking for headers required to compile python extensions... not found
configure: error: could not find Python headers



Index: gnome-python-extras.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-python-extras.spec	11 Feb 2006 03:17:01 -0000	1.43
+++ gnome-python-extras.spec	28 Feb 2006 16:16:31 -0000	1.44
@@ -11,7 +11,7 @@
 Summary: The sources for additional. PyGNOME Python extension modules.
 Name: gnome-python2-extras
 Version: 2.13.3
-Release: 3.2 
+Release: 4
 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
@@ -28,6 +28,7 @@
 BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version}
 BuildRequires: gtkspell-devel >= %{gtkspell_version}
 BuildRequires: mozilla-devel >= %{mozilla_version}
+BuildRequires: python-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.
@@ -124,6 +125,9 @@
 %{_datadir}/gtk-doc/html/pygtkmozembed
 
 %changelog
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.13.3-4
+- Buildrequires: python-devel
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.13.3-3.2
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 16:28:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 11:28:19 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1992,
	1.1993 linux-2.6-xen-cpusteal-hv.patch, 1.1,
	1.2 linux-2.6-xen-cpusteal-kernel.patch, 1.1, 1.2
Message-ID: <200602281628.k1SGSJZn010623@cvs.devel.redhat.com>

Author: riel

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10463

Modified Files:
	kernel-2.6.spec linux-2.6-xen-cpusteal-hv.patch 
	linux-2.6-xen-cpusteal-kernel.patch 
Log Message:
pull in the upstream cpu steal time bits - incompatible with what was there before


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1992
retrieving revision 1.1993
diff -u -r1.1992 -r1.1993
--- kernel-2.6.spec	28 Feb 2006 09:08:12 -0000	1.1992
+++ kernel-2.6.spec	28 Feb 2006 16:28:16 -0000	1.1993
@@ -688,7 +688,7 @@
 %if %{buildxen}
 cd xen
 %patch20000 -p1
-%patch20010 -p1
+%patch20010 -p2
 cd ..
 %endif
 cd linux-%{kversion}.%{_target_cpu}
@@ -773,7 +773,7 @@
 %patch708 -p2
 %patch709 -p1
 %patch710 -p1
-%patch711 -p1
+%patch711 -p2
 %endif
 
 #

linux-2.6-xen-cpusteal-hv.patch:
 common/dom0_ops.c      |    9 ++
 common/domain.c        |   13 ++++
 common/keyhandler.c    |    6 -
 common/sched_bvt.c     |   13 +---
 common/sched_sedf.c    |    8 --
 common/schedule.c      |  152 +++++++++++++++++++++----------------------------
 include/public/vcpu.h  |   34 ++++++++++
 include/xen/sched-if.h |    6 -
 include/xen/sched.h    |   12 +--
 9 files changed, 134 insertions(+), 119 deletions(-)

Index: linux-2.6-xen-cpusteal-hv.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-hv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-cpusteal-hv.patch	21 Feb 2006 16:23:38 -0000	1.1
+++ linux-2.6-xen-cpusteal-hv.patch	28 Feb 2006 16:28:16 -0000	1.2
@@ -1,50 +1,511 @@
-Allow guest domains to get information from the hypervisor on how much
-cpu time their virtual cpus have used.  This is needed to estimate the
-cpu steal time.
+From patchbot-unstable at lists.xensource.com Sat Feb 25 17:49:47 2006
+Date: Sat, 25 Feb 2006 22:48:07 +0000
+From: Xen patchbot -unstable <patchbot-unstable at lists.xensource.com>
+Reply-To: xen-devel at lists.xensource.com
+To: xen-changelog at lists.xensource.com
+Subject: [Xen-changelog] New VCPUOP_get_runstate_info hypercall. Returns information about the current
 
-Signed-off-by: Rik van Riel <riel at redhat.com>
+# HG changeset patch
+# User kaf24 at firebug.cl.cam.ac.uk
+# Node ID 2303fb4682e7cd4feb330fd2aec69672facb4ec6
+# Parent  a9f3abcc41499b7be971412d66c08d0e9740ff66
+New VCPUOP_get_runstate_info hypercall. Returns information about the current
+run state of a VCPU (running, runnable, blocked, etc.) and the total time
+spent in each state since the VCPU was created.
 
---- xen/include/public/vcpu.h.steal	2006-02-07 18:01:41.000000000 -0500
-+++ xen/include/public/vcpu.h	2006-02-17 13:51:45.000000000 -0500
-@@ -51,6 +51,14 @@
+Signed-off-by: Keir Fraser <keir at xensource.com>
+
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/dom0_ops.c
+--- a/xen/common/dom0_ops.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/dom0_ops.c	Sat Feb 25 16:58:37 2006
+@@ -46,6 +46,7 @@
+     struct vcpu   *v;
+     u64 cpu_time = 0;
+     int flags = DOMFLAGS_BLOCKED;
++    struct vcpu_runstate_info runstate;
+     
+     info->domain = d->domain_id;
+     info->nr_online_vcpus = 0;
+@@ -55,7 +56,8 @@
+      * - domain is marked as running if any of its vcpus is running
+      */
+     for_each_vcpu ( d, v ) {
+-        cpu_time += v->cpu_time;
++        vcpu_runstate_get(v, &runstate);
++        cpu_time += runstate.time[RUNSTATE_running];
+         info->max_vcpu_id = v->vcpu_id;
+         if ( !test_bit(_VCPUF_down, &v->vcpu_flags) )
+         {
+@@ -497,6 +499,7 @@
+     { 
+         struct domain *d;
+         struct vcpu   *v;
++        struct vcpu_runstate_info runstate;
+ 
+         ret = -ESRCH;
+         if ( (d = find_domain_by_id(op->u.getvcpuinfo.domain)) == NULL )
+@@ -510,10 +513,12 @@
+         if ( (v = d->vcpu[op->u.getvcpuinfo.vcpu]) == NULL )
+             goto getvcpuinfo_out;
+ 
++        vcpu_runstate_get(v, &runstate);
++
+         op->u.getvcpuinfo.online   = !test_bit(_VCPUF_down, &v->vcpu_flags);
+         op->u.getvcpuinfo.blocked  = test_bit(_VCPUF_blocked, &v->vcpu_flags);
+         op->u.getvcpuinfo.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
+-        op->u.getvcpuinfo.cpu_time = v->cpu_time;
++        op->u.getvcpuinfo.cpu_time = runstate.time[RUNSTATE_running];
+         op->u.getvcpuinfo.cpu      = v->processor;
+         op->u.getvcpuinfo.cpumap   = 0;
+         memcpy(&op->u.getvcpuinfo.cpumap,
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/domain.c
+--- a/xen/common/domain.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/domain.c	Sat Feb 25 16:58:37 2006
+@@ -451,6 +451,19 @@
+     case VCPUOP_is_up:
+         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
+         break;
++
++    case VCPUOP_get_runstate_info:
++    {
++        struct vcpu_runstate_info runstate;
++        vcpu_runstate_get(v, &runstate);
++        if ( copy_to_user(arg, &runstate, sizeof(runstate)) )
++            rc = -EFAULT;
++        break;
++    }
++
++    default:
++        rc = -ENOSYS;
++        break;
+     }
+ 
+     return rc;
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/keyhandler.c
+--- a/xen/common/keyhandler.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/keyhandler.c	Sat Feb 25 16:58:37 2006
+@@ -169,8 +169,6 @@
+ }
+ 
+ extern void dump_runq(unsigned char key);
+-extern void print_sched_histo(unsigned char key);
+-extern void reset_sched_histo(unsigned char key);
+ #ifndef NDEBUG
+ extern void audit_domains_key(unsigned char key);
+ #endif
+@@ -206,10 +204,6 @@
+         'd', dump_registers, "dump registers"); 
+     register_keyhandler(
+         'h', show_handlers, "show this message");
+-    register_keyhandler(
+-        'l', print_sched_histo, "print sched latency histogram");
+-    register_keyhandler(
+-        'L', reset_sched_histo, "reset sched latency histogram");
+     register_keyhandler(
+         'q', dump_domains, "dump domain (and guest debug) info");
+     register_keyhandler(
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/sched_bvt.c
+--- a/xen/common/sched_bvt.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/sched_bvt.c	Sat Feb 25 16:58:37 2006
+@@ -132,13 +132,13 @@
+     vcpu_schedule_unlock_irq(v);
+ }
+ 
+-static inline u32 calc_avt(struct vcpu *d, s_time_t now)
++static inline u32 calc_avt(struct vcpu *v, s_time_t now)
+ {
+     u32 ranfor, mcus;
+-    struct bvt_dom_info *inf = BVT_INFO(d->domain);
+-    struct bvt_vcpu_info *einf = EBVT_INFO(d);
+-    
+-    ranfor = (u32)(now - d->lastschd);
++    struct bvt_dom_info *inf = BVT_INFO(v->domain);
++    struct bvt_vcpu_info *einf = EBVT_INFO(v);
++    
++    ranfor = (u32)(now - v->runstate.state_entry_time);
+     mcus = (ranfor + MCU - 1)/MCU;
+ 
+     return einf->avt + mcus * inf->mcu_advance;
+@@ -262,7 +262,7 @@
+     curr_evt = calc_evt(curr, calc_avt(curr, now));
+     /* Calculate the time the current domain would run assuming
+        the second smallest evt is of the newly woken domain */
+-    r_time = curr->lastschd +
++    r_time = curr->runstate.state_entry_time +
+         ((einf->evt - curr_evt) / BVT_INFO(curr->domain)->mcu_advance) +
+         ctx_allow;
+ 
+@@ -558,7 +558,6 @@
+         printk("%3d: %u has=%c ", loop++, v->domain->domain_id,
+                test_bit(_VCPUF_running, &v->vcpu_flags) ? 'T':'F');
+         bvt_dump_runq_el(v);
+-        printk("c=0x%X%08X\n", (u32)(v->cpu_time>>32), (u32)v->cpu_time);
+         printk("         l: %p n: %p  p: %p\n",
+                &vcpu_inf->run_list, vcpu_inf->run_list.next,
+                vcpu_inf->run_list.prev);
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/sched_sedf.c
+--- a/xen/common/sched_sedf.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/sched_sedf.c	Sat Feb 25 16:58:37 2006
+@@ -1408,18 +1408,14 @@
+ {
+     printk("%i.%i has=%c ", d->domain->domain_id, d->vcpu_id,
+            test_bit(_VCPUF_running, &d->vcpu_flags) ? 'T':'F');
+-    printk("p=%"PRIu64" sl=%"PRIu64" ddl=%"PRIu64" w=%hu c=%"PRIu64
++    printk("p=%"PRIu64" sl=%"PRIu64" ddl=%"PRIu64" w=%hu"
+            " sc=%i xtr(%s)=%"PRIu64" ew=%hu",
+            EDOM_INFO(d)->period, EDOM_INFO(d)->slice, EDOM_INFO(d)->deadl_abs,
+-           EDOM_INFO(d)->weight, d->cpu_time,
++           EDOM_INFO(d)->weight,
+            EDOM_INFO(d)->score[EXTRA_UTIL_Q],
+            (EDOM_INFO(d)->status & EXTRA_AWARE) ? "yes" : "no",
+            EDOM_INFO(d)->extra_time_tot, EDOM_INFO(d)->extraweight);
+     
+-    if ( d->cpu_time != 0 )
+-        printf(" (%"PRIu64"%%)", (EDOM_INFO(d)->extra_time_tot * 100)
+-               / d->cpu_time);
+-
+ #ifdef SEDF_STATS
+     if ( EDOM_INFO(d)->block_time_tot != 0 )
+         printf(" pen=%"PRIu64"%%", (EDOM_INFO(d)->penalty_time_tot * 100) /
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/schedule.c
+--- a/xen/common/schedule.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/schedule.c	Sat Feb 25 16:58:37 2006
+@@ -36,14 +36,6 @@
+ static char opt_sched[10] = "sedf";
+ string_param("sched", opt_sched);
+ 
+-/*#define WAKE_HISTO*/
+-/*#define BLOCKTIME_HISTO*/
+-#if defined(WAKE_HISTO)
+-#define BUCKETS 31
+-#elif defined(BLOCKTIME_HISTO)
+-#define BUCKETS 200
+-#endif
+-
+ #define TIME_SLOP      (s32)MICROSECS(50)     /* allow time to slip a bit */
+ 
+ /* Various timer handlers. */
+@@ -73,6 +65,36 @@
+ /* Per-CPU periodic timer sends an event to the currently-executing domain. */
+ static struct timer t_timer[NR_CPUS]; 
+ 
++static inline void vcpu_runstate_change(
++    struct vcpu *v, int new_state, s_time_t new_entry_time)
++{
++    ASSERT(v->runstate.state != new_state);
++    ASSERT(spin_is_locked(&schedule_data[v->processor].schedule_lock));
++
++    v->runstate.time[v->runstate.state] +=
++        new_entry_time - v->runstate.state_entry_time;
++    v->runstate.state_entry_time = new_entry_time;
++    v->runstate.state = new_state;
++}
++
++void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate)
++{
++    if ( likely(v == current) )
++    {
++        /* Fast lock-free path. */
++        memcpy(runstate, &v->runstate, sizeof(*runstate));
++        ASSERT(runstate->state = RUNSTATE_running);
++        runstate->time[RUNSTATE_running] += NOW() - runstate->state_entry_time;
++    }
++    else
++    {
++        vcpu_schedule_lock_irq(v);
++        memcpy(runstate, &v->runstate, sizeof(*runstate));
++        runstate->time[runstate->state] += NOW() - runstate->state_entry_time;
++        vcpu_schedule_unlock_irq(v);
++    }
++}
++
+ struct domain *alloc_domain(void)
+ {
+     struct domain *d;
+@@ -119,6 +141,9 @@
+     v->cpu_affinity = is_idle_domain(d) ?
+         cpumask_of_cpu(cpu_id) : CPU_MASK_ALL;
+ 
++    v->runstate.state = is_idle_vcpu(v) ? RUNSTATE_running : RUNSTATE_offline;
++    v->runstate.state_entry_time = NOW();
++
+     if ( (vcpu_id != 0) && !is_idle_domain(d) )
+         set_bit(_VCPUF_down, &v->vcpu_flags);
+ 
+@@ -165,8 +190,15 @@
+     unsigned long flags;
+ 
+     vcpu_schedule_lock_irqsave(v, flags);
++
+     if ( likely(!vcpu_runnable(v)) )
++    {
++        if ( v->runstate.state == RUNSTATE_runnable )
++            vcpu_runstate_change(v, RUNSTATE_offline, NOW());
++
+         SCHED_OP(sleep, v);
++    }
++
+     vcpu_schedule_unlock_irqrestore(v, flags);
+ 
+     TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id);
+@@ -187,11 +219,19 @@
+     unsigned long flags;
+ 
+     vcpu_schedule_lock_irqsave(v, flags);
++
+     if ( likely(vcpu_runnable(v)) )
+     {
++        if ( v->runstate.state >= RUNSTATE_blocked )
++            vcpu_runstate_change(v, RUNSTATE_runnable, NOW());
+         SCHED_OP(wake, v);
+-        v->wokenup = NOW();
+-    }
++    }
++    else if ( !test_bit(_VCPUF_blocked, &v->vcpu_flags) )
++    {
++        if ( v->runstate.state == RUNSTATE_blocked )
++            vcpu_runstate_change(v, RUNSTATE_offline, NOW());
++    }
++
+     vcpu_schedule_unlock_irqrestore(v, flags);
+ 
+     TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id);
+@@ -376,8 +416,6 @@
+ 
+     stop_timer(&schedule_data[cpu].s_timer);
+     
+-    prev->cpu_time += now - prev->lastschd;
+-
+     /* get policy-specific decision on scheduling... */
+     next_slice = ops.do_schedule(now);
+ 
+@@ -386,8 +424,6 @@
+ 
+     schedule_data[cpu].curr = next;
+     
+-    next->lastschd = now;
+-
+     set_timer(&schedule_data[cpu].s_timer, now + r_time);
+ 
+     if ( unlikely(prev == next) )
+@@ -397,38 +433,23 @@
+     }
+ 
+     TRACE_2D(TRC_SCHED_SWITCH_INFPREV,
+-             prev->domain->domain_id, now - prev->lastschd);
++             prev->domain->domain_id,
++             now - prev->runstate.state_entry_time);
+     TRACE_3D(TRC_SCHED_SWITCH_INFNEXT,
+-             next->domain->domain_id, now - next->wokenup, r_time);
+-
+-    /*
+-     * Logic of wokenup field in domain struct:
+-     * Used to calculate "waiting time", which is the time that a domain
+-     * spends being "runnable", but not actually running. wokenup is set
+-     * set whenever a domain wakes from sleeping. However, if wokenup is not
+-     * also set here then a preempted runnable domain will get a screwed up
+-     * "waiting time" value next time it is scheduled.
+-     */
+-    prev->wokenup = now;
+-
+-#if defined(WAKE_HISTO)
+-    if ( !is_idle_vcpu(next) && next->wokenup )
+-    {
+-        ulong diff = (ulong)(now - next->wokenup);
+-        diff /= (ulong)MILLISECS(1);
+-        if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;
+-        else                    schedule_data[cpu].hist[BUCKETS-1]++;
+-    }
+-    next->wokenup = (s_time_t)0;
+-#elif defined(BLOCKTIME_HISTO)
+-    prev->lastdeschd = now;
+-    if ( !is_idle_vcpu(next) )
+-    {
+-        ulong diff = (ulong)((now - next->lastdeschd) / MILLISECS(10));
+-        if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;
+-        else                    schedule_data[cpu].hist[BUCKETS-1]++;
+-    }
+-#endif
++             next->domain->domain_id,
++             (next->runstate.state == RUNSTATE_runnable) ?
++             (now - next->runstate.state_entry_time) : 0,
++             r_time);
++
++    ASSERT(prev->runstate.state == RUNSTATE_running);
++    vcpu_runstate_change(
++        prev,
++        (test_bit(_VCPUF_blocked, &prev->vcpu_flags) ? RUNSTATE_blocked :
++         (vcpu_runnable(prev) ? RUNSTATE_runnable : RUNSTATE_offline)),
++        now);
++
++    ASSERT(next->runstate.state != RUNSTATE_running);
++    vcpu_runstate_change(next, RUNSTATE_running, now);
+ 
+     ASSERT(!test_bit(_VCPUF_running, &next->vcpu_flags));
+     set_bit(_VCPUF_running, &next->vcpu_flags);
+@@ -567,47 +588,6 @@
+ 
+     local_irq_restore(flags);
+ }
+-
+-#if defined(WAKE_HISTO) || defined(BLOCKTIME_HISTO)
+-
+-void print_sched_histo(unsigned char key)
+-{
+-    int i, j, k;
+-    for_each_online_cpu ( k )
+-    {
+-        j = 0;
+-        printf ("CPU[%02d]: scheduler latency histogram (ms:[count])\n", k);
+-        for ( i = 0; i < BUCKETS; i++ )
+-        {
+-            if ( schedule_data[k].hist[i] != 0 )
+-            {
+-                if ( i < BUCKETS-1 )
+-                    printk("%2d:[%7u]    ", i, schedule_data[k].hist[i]);
+-                else
+-                    printk(" >:[%7u]    ", schedule_data[k].hist[i]);
+-                if ( !(++j % 5) )
+-                    printk("\n");
+-            }
+-        }
+-        printk("\n");
+-    }
+-      
+-}
+-
+-void reset_sched_histo(unsigned char key)
+-{
+-    int i, j;
+-    for ( j = 0; j < NR_CPUS; j++ )
+-        for ( i=0; i < BUCKETS; i++ ) 
+-            schedule_data[j].hist[i] = 0;
+-}
+-
+-#else
+-
+-void print_sched_histo(unsigned char key) { }
+-void reset_sched_histo(unsigned char key) { }
+-
+-#endif
+ 
+ /*
+  * Local variables:
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/public/vcpu.h
+--- a/xen/include/public/vcpu.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/public/vcpu.h	Sat Feb 25 16:58:37 2006
+@@ -51,6 +51,40 @@
  /* Returns 1 if the given VCPU is up. */
  #define VCPUOP_is_up                3
  
 +/*
-+ * Get information on how much CPU time this VCPU has used, etc...
-+ *
-+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
-+ *               of which filled in with scheduler info.
++ * Return information about the state and running time of a VCPU.
++ * @extra_arg == pointer to xen_vcpu_info structure.
++ */
++#define VCPUOP_get_runstate_info    4
++typedef struct vcpu_runstate_info {
++    /* VCPU's current state (RUNSTATE_*). */
++    int      state;
++    /* When was current state entered (system time, ns)? */
++    uint64_t state_entry_time;
++    /*
++     * Time spent in each RUNSTATE_* (ns). The sum of these times is
++     * guaranteed not to drift from system time.
++     */
++    uint64_t time[4];
++} vcpu_runstate_info_t;
++
++/* VCPU is currently running on a physical CPU. */
++#define RUNSTATE_running  0
++
++/* VCPU is runnable, but not currently scheduled on any physical CPU. */
++#define RUNSTATE_runnable 1
++
++/* VCPU is blocked (a.k.a. idle). It is therefore not runnable. */
++#define RUNSTATE_blocked  2
++
++/*
++ * VCPU is not runnable, but it is not blocked.
++ * This is a 'catch all' state for things like hotplug and pauses by the
++ * system administrator (or for critical sections in the hypervisor).
++ * RUNSTATE_blocked dominates this state (it is the preferred state).
 + */
-+#define VCPUOP_cpu_info             4
++#define RUNSTATE_offline  3
 +
  #endif /* __XEN_PUBLIC_VCPU_H__ */
  
  /*
---- xen/common/domain.c.steal	2006-02-07 18:01:40.000000000 -0500
-+++ xen/common/domain.c	2006-02-17 13:52:44.000000000 -0500
-@@ -451,8 +451,24 @@
-     case VCPUOP_is_up:
-         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
-         break;
-+
-+    case VCPUOP_cpu_info:
-+	{
-+	    struct dom0_getvcpuinfo vi = { 0, };
-+	    vi.online = !test_bit(_VCPUF_down, &v->vcpu_flags);
-+	    vi.blocked = test_bit(_VCPUF_blocked, &v->vcpu_flags);
-+	    vi.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
-+	    vi.cpu_time = v->cpu_time;
-+	    vi.cpu = v->processor;
-+	    rc = 0;
-+
-+	    if ( copy_to_user(arg, &vi, sizeof(dom0_getvcpuinfo_t)) )
-+		rc = -EFAULT;
-+	    break;
-+	}
-     }
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/xen/sched-if.h
+--- a/xen/include/xen/sched-if.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/xen/sched-if.h	Sat Feb 25 16:58:37 2006
+@@ -8,9 +8,6 @@
+ #ifndef __XEN_SCHED_IF_H__
+ #define __XEN_SCHED_IF_H__
+ 
+-#define BUCKETS  10
+-/*300*/
+-
+ struct schedule_data {
+     spinlock_t          schedule_lock;  /* spinlock protecting curr        */
+     struct vcpu        *curr;           /* current task                    */
+@@ -18,9 +15,6 @@
+     void               *sched_priv;
+     struct timer        s_timer;        /* scheduling timer                */
+     unsigned long       tick;           /* current periodic 'tick'         */
+-#ifdef BUCKETS
+-    u32                 hist[BUCKETS];  /* for scheduler latency histogram */
+-#endif
+ } __cacheline_aligned;
+ 
+ extern struct schedule_data schedule_data[];
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/xen/sched.h
+--- a/xen/include/xen/sched.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/xen/sched.h	Sat Feb 25 16:58:37 2006
+@@ -8,6 +8,7 @@
+ #include <xen/smp.h>
+ #include <public/xen.h>
+ #include <public/dom0_ops.h>
++#include <public/vcpu.h>
+ #include <xen/time.h>
+ #include <xen/timer.h>
+ #include <xen/grant_table.h>
+@@ -63,14 +64,12 @@
+ 
+     struct vcpu     *next_in_list;
  
+-    struct timer  timer;         /* one-shot timer for timeout values */
++    struct timer     timer;         /* one-shot timer for timeout values */
+     unsigned long    sleep_tick;    /* tick at which this vcpu started sleep */
+ 
+-    s_time_t         lastschd;      /* time this domain was last scheduled */
+-    s_time_t         lastdeschd;    /* time this domain was last descheduled */
+-    s_time_t         cpu_time;      /* total CPU time received till now */
+-    s_time_t         wokenup;       /* time domain got woken up */
+     void            *sched_priv;    /* scheduler-specific data */
 +
-     return rc;
- }
++    struct vcpu_runstate_info runstate;
+ 
+     unsigned long    vcpu_flags;
+ 
+@@ -397,7 +396,6 @@
+ #define _DOMF_debugging        4
+ #define DOMF_debugging         (1UL<<_DOMF_debugging)
  
+-
+ static inline int vcpu_runnable(struct vcpu *v)
+ {
+     return ( (atomic_read(&v->pausecnt) == 0) &&
+@@ -415,6 +413,8 @@
+ 
+ int vcpu_set_affinity(struct vcpu *v, cpumask_t *affinity);
+ 
++void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate);
++
+ static inline void vcpu_unblock(struct vcpu *v)
+ {
+     if ( test_and_clear_bit(_VCPUF_blocked, &v->vcpu_flags) )
+
+_______________________________________________
+Xen-changelog mailing list
+Xen-changelog at lists.xensource.com
+http://lists.xensource.com/xen-changelog

linux-2.6-xen-cpusteal-kernel.patch:
 b/linux/include/xen/interface/vcpu.h             |   34 ++++++++
 linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c |   95 ++++++++++++++++++++---
 2 files changed, 117 insertions(+), 12 deletions(-)

Index: linux-2.6-xen-cpusteal-kernel.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-kernel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen-cpusteal-kernel.patch	21 Feb 2006 16:23:38 -0000	1.1
+++ linux-2.6-xen-cpusteal-kernel.patch	28 Feb 2006 16:28:16 -0000	1.2
@@ -1,24 +1,42 @@
-Estimate and account for the CPU steal time.  That is, the time during
-which we wanted to run, but the hypervisor scheduled in another
-process instead.  This can be used to help administrators in capacity
-planning, by clearly being able to distinguish whether the system is
-too slow or this guest is simply not getting enough CPU time.
+From patchbot-unstable at lists.xensource.com Sat Feb 25 17:49:47 2006
+Date: Sat, 25 Feb 2006 22:48:07 +0000
+From: Xen patchbot -unstable <patchbot-unstable at lists.xensource.com>
+Reply-To: xen-devel at lists.xensource.com
+To: xen-changelog at lists.xensource.com
+Subject: [Xen-changelog] Update Linux time IRQ handler to understand the new stolen/blocked cycle counts
 
-This is the i386 version, I'll send the implementation for x86_64 soon.
+# HG changeset patch
+# User kaf24 at firebug.cl.cam.ac.uk
+# Node ID c375c210945282c2c5fd6cb86f51422e211ed8a2
+# Parent  2303fb4682e7cd4feb330fd2aec69672facb4ec6
+Update Linux time IRQ handler to understand the new stolen/blocked cycle counts
+exported by Xen. This is based heavily on a patch from Rik van Riel, but
+extended to distinguish between idle/blocked cycles and stolen cycles.
+
+There is still stuff todo:
+ 1. Xen should export the time values in shared memory, to save a hypercall
+    on every time interrupt (even though that is only every 10ms, worst case).
+ 2. As in s390, Xen's cputime_t should be measured at finer granularity than
+    jiffies. Nanoseconds would be a better unit.
+ 3. Break out the internals of the account_steal_time() interface so that we don't
+    need to abuse it so wretchedly.
 
 Signed-off-by: Rik van Riel <riel at redhat.com>
+Signed-off-by: Keir Fraser <keir at xensource.com>
 
---- linux-2.6.15.i686/arch/i386/kernel/time-xen.c.steal	2006-02-17 16:44:40.000000000 -0500
-+++ linux-2.6.15.i686/arch/i386/kernel/time-xen.c	2006-02-20 18:31:26.000000000 -0500
-@@ -48,6 +48,7 @@
+diff -r 2303fb4682e7 -r c375c2109452 linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
+--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Sat Feb 25 16:58:37 2006
++++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Sat Feb 25 19:07:28 2006
+@@ -48,6 +48,8 @@
  #include <linux/mca.h>
  #include <linux/sysctl.h>
  #include <linux/percpu.h>
 +#include <linux/kernel_stat.h>
++#include <linux/posix-timers.h>
  
  #include <asm/io.h>
  #include <asm/smp.h>
-@@ -77,6 +78,7 @@
+@@ -70,6 +72,7 @@
  #include <asm/arch_hooks.h>
  
  #include <xen/evtchn.h>
@@ -26,63 +44,192 @@
  
  #if defined (__i386__)
  #include <asm/i8259.h>
-@@ -624,7 +626,43 @@ irqreturn_t timer_interrupt(int irq, voi
-          * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
-          * if there is risk of deadlock if we do (since update_process_times
-          * may do scheduler rebalancing work and thus acquire runqueue locks).
-+	 *
-+	 * If we have not run for a while, chances are this vcpu got scheduled
-+	 * away.  Try to estimate how much time was stolen.
-          */
-+	if (delta_cpu > (s64)(2 * NS_PER_TICK)) {
-+		dom0_getvcpuinfo_t vcpu = { 0, };
-+		cputime64_t total;	/* In jiffies, not nanoseconds. */
-+		s64 cputicks, deltaticks, steal;
-+
-+		if (HYPERVISOR_vcpu_op(VCPUOP_cpu_info, cpu, &vcpu) == 0) {
-+			total = kstat_cpu(cpu).cpustat.user +
-+				kstat_cpu(cpu).cpustat.nice +
-+				kstat_cpu(cpu).cpustat.system +
-+				kstat_cpu(cpu).cpustat.softirq +
-+				kstat_cpu(cpu).cpustat.irq;
-+
-+			/* do_div modifies the variable in place. YUCK */
-+			deltaticks = delta_cpu;
-+			cputicks = vcpu.cpu_time;
-+			do_div(cputicks, NS_PER_TICK);
-+			do_div(deltaticks, NS_PER_TICK);
-+
-+			steal = total + deltaticks - cputicks;
-+			if (unlikely(steal < 0))
-+				steal = 0;
-+			else if (unlikely(steal > deltaticks))
-+				steal = deltaticks;
-+
-+			if (steal > 0) {
-+				delta_cpu -= steal * NS_PER_TICK;
-+				per_cpu(processed_system_time, cpu) +=
-+							steal * NS_PER_TICK;
-+				account_steal_time(current, (cputime_t)steal);
-+			}
+@@ -122,6 +125,10 @@
+ /* Keep track of last time we did processing/updating of jiffies and xtime. */
+ static u64 processed_system_time;   /* System time (ns) at last processing. */
+ static DEFINE_PER_CPU(u64, processed_system_time);
++
++/* How much CPU time was spent blocked and how much was 'stolen'? */
++static DEFINE_PER_CPU(u64, processed_stolen_time);
++static DEFINE_PER_CPU(u64, processed_blocked_time);
+ 
+ /* Must be signed, as it's compared with s64 quantities which can be -ve. */
+ #define NS_PER_TICK (1000000000LL/HZ)
+@@ -567,9 +574,10 @@
+ 
+ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-	s64 delta, delta_cpu;
++	s64 delta, delta_cpu, stolen, blocked;
+ 	int i, cpu = smp_processor_id();
+ 	struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
++	struct vcpu_runstate_info runstate;
+ 
+ 	write_seqlock(&xtime_lock);
+ 
+@@ -611,19 +619,79 @@
+ 
+ 	write_sequnlock(&xtime_lock);
+ 
+-	/*
+-         * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
+-         * if there is risk of deadlock if we do (since update_process_times
+-         * may do scheduler rebalancing work and thus acquire runqueue locks).
+-         */
+-	while (delta_cpu >= NS_PER_TICK) {
+-		delta_cpu -= NS_PER_TICK;
+-		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
+-		update_process_times(user_mode(regs));
+-		profile_tick(CPU_PROFILING, regs);
+-	}
++	/* Obtain stolen/blocked cycles, if the hypervisor supports it. */
++	if (HYPERVISOR_vcpu_op(VCPUOP_get_runstate_info,
++			       cpu, &runstate) == 0) {
++		/*
++		 * Account stolen ticks.
++		 * HACK: Passing NULL to account_steal_time()
++		 * ensures that the ticks are accounted as stolen.
++		 */
++		stolen = runstate.time[RUNSTATE_runnable] +
++			runstate.time[RUNSTATE_offline] -
++			per_cpu(processed_stolen_time, cpu);
++		if (unlikely(stolen < 0)) /* clock jitter */
++			stolen = 0;
++		delta_cpu -= stolen;
++		if (unlikely(delta_cpu < 0)) {
++			stolen += delta_cpu;
++			delta_cpu = 0;
++		}
++		do_div(stolen, NS_PER_TICK);
++		per_cpu(processed_stolen_time, cpu) += stolen * NS_PER_TICK;
++		account_steal_time(NULL, (cputime_t)stolen);
++
++		/*
++		 * Account blocked ticks.
++		 * HACK: Passing idle_task to account_steal_time()
++		 * ensures that the ticks are accounted as idle/wait.
++		 */
++		blocked = runstate.time[RUNSTATE_blocked] -
++			per_cpu(processed_blocked_time, cpu);
++		if (unlikely(blocked < 0)) /* clock jitter */
++			blocked = 0;
++		delta_cpu -= blocked;
++		if (unlikely(delta_cpu < 0)) {
++			blocked += delta_cpu;
++			delta_cpu = 0;
 +		}
++		do_div(blocked, NS_PER_TICK);
++		per_cpu(processed_blocked_time, cpu) += blocked * NS_PER_TICK;
++		account_steal_time(idle_task(cpu), (cputime_t)blocked);
++
++		per_cpu(processed_system_time, cpu) +=
++			(stolen + blocked) * NS_PER_TICK;
++	}
++
++	if (delta_cpu > 0) {
++		do_div(delta_cpu, NS_PER_TICK);
++		if (user_mode(regs))
++			account_user_time(current, (cputime_t)delta_cpu);
++		else
++			account_system_time(current, HARDIRQ_OFFSET,
++					    (cputime_t)delta_cpu);
++		per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
 +	}
 +
- 	while (delta_cpu >= NS_PER_TICK) {
- 		delta_cpu -= NS_PER_TICK;
- 		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
---- linux-2.6.15.i686/include/xen/interface/vcpu.h.steal	2006-02-17 16:14:17.000000000 -0500
-+++ linux-2.6.15.i686/include/xen/interface/vcpu.h	2006-02-17 16:14:52.000000000 -0500
-@@ -51,6 +51,14 @@
++	run_local_timers();
++	if (rcu_pending(cpu))
++		rcu_check_callbacks(cpu, user_mode(regs));
++	scheduler_tick();
++	run_posix_cpu_timers(current);
+ 
+ 	return IRQ_HANDLED;
++}
++
++static void init_missing_ticks_accounting(int cpu)
++{
++	struct vcpu_runstate_info runstate = { 0 };
++
++	HYPERVISOR_vcpu_op(VCPUOP_get_runstate_info, cpu, &runstate);
++
++	per_cpu(processed_blocked_time, cpu) = runstate.time[RUNSTATE_blocked];
++	per_cpu(processed_stolen_time, cpu) =
++		runstate.time[RUNSTATE_runnable] +
++		runstate.time[RUNSTATE_offline];
+ }
+ 
+ /* not static: needed by APM */
+@@ -814,6 +882,7 @@
+ 
+ 	processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+ 	per_cpu(processed_system_time, 0) = processed_system_time;
++	init_missing_ticks_accounting(0);
+ 
+ 	update_wallclock();
+ 
+@@ -891,6 +960,7 @@
+ 
+ 	processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+ 	per_cpu(processed_system_time, 0) = processed_system_time;
++	init_missing_ticks_accounting(0);
+ 
+ 	update_wallclock();
+ }
+@@ -909,6 +979,7 @@
+ 		/* Use cpu0 timestamp: cpu's shadow is not initialised yet. */
+ 		per_cpu(processed_system_time, cpu) = 
+ 			per_cpu(shadow_time, 0).system_timestamp;
++		init_missing_ticks_accounting(cpu);
+ 	} while (read_seqretry(&xtime_lock, seq));
+ 
+ 	sprintf(timer_name[cpu], "timer%d", cpu);
+
+_______________________________________________
+Xen-changelog mailing list
+Xen-changelog at lists.xensource.com
+http://lists.xensource.com/xen-changelog
+
+
+
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/public/vcpu.h
+--- a/linux/include/xen/interface/vcpu.h	Sat Feb 25 11:27:53 2006
++++ b/linux/include/xen/interface/vcpu.h	Sat Feb 25 16:58:37 2006
+@@ -51,6 +51,40 @@
  /* Returns 1 if the given VCPU is up. */
  #define VCPUOP_is_up                3
  
 +/*
-+ * Get information on how much CPU time this VCPU has used, etc...
-+ *
-+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
-+ *               of which filled in with scheduler info.
++ * Return information about the state and running time of a VCPU.
++ * @extra_arg == pointer to xen_vcpu_info structure.
++ */
++#define VCPUOP_get_runstate_info    4
++typedef struct vcpu_runstate_info {
++    /* VCPU's current state (RUNSTATE_*). */
++    int      state;
++    /* When was current state entered (system time, ns)? */
++    uint64_t state_entry_time;
++    /*
++     * Time spent in each RUNSTATE_* (ns). The sum of these times is
++     * guaranteed not to drift from system time.
++     */
++    uint64_t time[4];
++} vcpu_runstate_info_t;
++
++/* VCPU is currently running on a physical CPU. */
++#define RUNSTATE_running  0
++
++/* VCPU is runnable, but not currently scheduled on any physical CPU. */
++#define RUNSTATE_runnable 1
++
++/* VCPU is blocked (a.k.a. idle). It is therefore not runnable. */
++#define RUNSTATE_blocked  2
++
++/*
++ * VCPU is not runnable, but it is not blocked.
++ * This is a 'catch all' state for things like hotplug and pauses by the
++ * system administrator (or for critical sections in the hypervisor).
++ * RUNSTATE_blocked dominates this state (it is the preferred state).
 + */
-+#define VCPUOP_cpu_info             4
++#define RUNSTATE_offline  3
 +
  #endif /* __XEN_PUBLIC_VCPU_H__ */
  



From fedora-cvs-commits at redhat.com  Tue Feb 28 17:44:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 12:44:42 -0500
Subject: rpms/htmlview/devel htmlview.spec,1.22,1.23
Message-ID: <200602281744.k1SHigBh017049@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/htmlview/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16963

Modified Files:
	htmlview.spec 
Log Message:
Create absolute symlinks



Index: htmlview.spec
===================================================================
RCS file: /cvs/dist/rpms/htmlview/devel/htmlview.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- htmlview.spec	9 Dec 2005 22:40:56 -0000	1.22
+++ htmlview.spec	28 Feb 2006 17:44:39 -0000	1.23
@@ -1,6 +1,6 @@
 Name: htmlview
 Version: 3.0.0
-Release: 13.1
+Release: 14
 Summary: Tools for launching Preferred Applications
 License: Public Domain
 Source0: htmlview
@@ -23,9 +23,9 @@
 install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-ln -sf ../desktop-menu-patches/redhat-web.desktop \
+ln -sf %{_datadir}/desktop-menu-patches/redhat-web.desktop \
   $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-web.desktop
-ln -sf ../desktop-menu-patches/redhat-email.desktop \
+ln -sf %{_datadir}/desktop-menu-patches/redhat-email.desktop \
   $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-email.desktop
 
 %clean
@@ -39,6 +39,9 @@
 %{_datadir}/applications/redhat-email.desktop
 
 %changelog
+* Tue Feb 28 2006 Matthias Clasen <mclasen at redhat.com>> 3.0.0-14
+- Create absolute symlinks to desktop files (#176104)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:13:25 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:13:25 -0500
Subject: rpms/evolution/devel .cvsignore, 1.44, 1.45 evolution.spec, 1.126,
	1.127 sources, 1.44, 1.45
Message-ID: <200602281813.k1SIDP4g006499@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6398

Modified Files:
	.cvsignore evolution.spec sources 
Log Message:
- 2.5.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	15 Feb 2006 05:27:03 -0000	1.44
+++ .cvsignore	28 Feb 2006 18:13:23 -0000	1.45
@@ -1 +1 @@
-evolution-2.5.91.tar.bz2
+evolution-2.5.92.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- evolution.spec	23 Feb 2006 17:50:05 -0000	1.126
+++ evolution.spec	28 Feb 2006 18:13:23 -0000	1.127
@@ -1,6 +1,6 @@
 %define gtkhtml_version 3.9.2
 %define soup_version 2.2.2
-%define eds_version 1.5.91
+%define eds_version 1.5.92
 %define use_mozilla_nss 1
 %define evo_major 2.6
 %define libbonoboui_version 2.4.2
@@ -38,7 +38,7 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.91
+Version: 2.5.92
 Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -219,7 +219,7 @@
 %patch98 -p1 -b .ldaphack
 
 # patches sent upstream
-%patch100 -p0 -b .addressbook-print-with-pango
+#%patch100 -p0 -b .addressbook-print-with-pango
 %patch101 -p1 -b .calendar-print-with-pango
 
 %patch106 -p1 -b .commit-enter-on-calendar
@@ -634,6 +634,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Feb 27 2006 Ray Strode <rstrode at redhat.com> - 2.5.92-1
+- 2.5.92
+
 * Tue Feb 14 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
 - 2.5.91
 - updated patch 101 to track upstream changes to calendar printing code


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	15 Feb 2006 05:27:04 -0000	1.44
+++ sources	28 Feb 2006 18:13:23 -0000	1.45
@@ -1 +1 @@
-cea13421ea95707e89c0311100714573  evolution-2.5.91.tar.bz2
+1dd17db843eeb66740b40ebb9024261f  evolution-2.5.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:45:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:45:02 -0500
Subject: rpms/gnome-session/devel gnome-session-2.13.92-user-share.patch,
	NONE, 1.1 gnome-session.spec, 1.56,
	1.57 gnome-session-user-share.patch, 1.1, NONE
Message-ID: <200602281845.k1SIj2hA030599@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30445

Modified Files:
	gnome-session.spec 
Added Files:
	gnome-session-2.13.92-user-share.patch 
Removed Files:
	gnome-session-user-share.patch 
Log Message:
- Update to 2.13.92
- Add patch from CVS HEAD to maintain compatibility with
  version 2.13.91


gnome-session-2.13.92-user-share.patch:
 Makefile.am      |    3 +++
 gsm-user-share.c |   38 ++++++++++++++++++++++++++++++++++++++
 gsm-user-share.h |    6 ++++++
 main.c           |    3 +++
 4 files changed, 50 insertions(+)

--- NEW FILE gnome-session-2.13.92-user-share.patch ---
--- gnome-session-2.13.92/gnome-session/main.c.user-share	2006-02-22 11:31:10.000000000 -0500
+++ gnome-session-2.13.92/gnome-session/main.c	2006-02-28 13:42:42.000000000 -0500
@@ -46,6 +46,7 @@
 #include "gsm-sound.h"
 #include "gsm-gsd.h"
 #include "gsm-keyring.h"
+#include "gsm-user-share.h"
 #include "gsm-xrandr.h"
 #include "gsm-at-startup.h"
 #include "gsm-remote-desktop.h"
@@ -485,6 +486,8 @@
 
   gsm_sound_login ();
 
+  gdm_user_share_start ();
+
   gsm_remote_desktop_start ();
 
   if (splashing)
--- /dev/null	2006-02-28 12:23:07.427962250 -0500
+++ gnome-session-2.13.92/gnome-session/gsm-user-share.c	2006-02-28 13:40:38.000000000 -0500
@@ -0,0 +1,38 @@
+#include <config.h>
+
+#include <glib.h>
+#include <gconf/gconf-client.h>
+
+#include "gsm-user-share.h"
+
+#define FILE_SHARING_ENABLED "/desktop/gnome/file_sharing/enabled"
+
+void
+gsm_user_share_start (void)
+{
+    GConfClient *client;
+    gboolean enabled;
+    char *argv[2];
+    int i;
+
+    client = gconf_client_get_default ();
+    enabled = gconf_client_get_bool (client,
+				     FILE_SHARING_ENABLED,
+				     NULL);
+    g_object_unref (client);
+    
+    if (enabled) {
+        i = 0;
+	argv[i++] = LIBEXECDIR"/gnome-user-share";
+	argv[i++] = NULL;
+	
+	g_spawn_async (NULL,
+		       argv,
+		       NULL,
+		       G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+		       NULL,
+		       NULL,
+		       NULL,
+		       NULL);
+    }
+}
--- /dev/null	2006-02-28 12:23:07.427962250 -0500
+++ gnome-session-2.13.92/gnome-session/gsm-user-share.h	2006-02-28 13:40:38.000000000 -0500
@@ -0,0 +1,6 @@
+#ifndef GSM_USER_SHARE_H
+#define GSM_USER_SHARE_H
+
+void gsm_user_share_start (void);
+
+#endif /* GSM_USER_SHARE_H */
--- gnome-session-2.13.92/gnome-session/Makefile.am.user-share	2005-01-10 11:36:40.000000000 -0500
+++ gnome-session-2.13.92/gnome-session/Makefile.am	2006-02-28 13:40:38.000000000 -0500
@@ -23,6 +23,7 @@
 	-DPREFIX=\""$(prefix)"\"                                \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"                        \
 	-DLIBDIR=\""$(libdir)"\"                                \
+	-DLIBEXECDIR=\""$(libexecdir)"\"                        \
 	-DDATADIR=\""$(datadir)"\"                              \
 	$(NULL)
 
@@ -93,6 +94,8 @@
 	gsm-xrandr.h		\
 	gsm-keyring.c		\
 	gsm-keyring.h		\
+	gsm-user-share.c	\
+	gsm-user-share.h	\
 	gsm-gsd.c		\
 	gsm-gsd.h		\
 	gsm-protocol.c		\


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnome-session.spec	24 Feb 2006 00:25:58 -0000	1.56
+++ gnome-session.spec	28 Feb 2006 18:44:59 -0000	1.57
@@ -12,8 +12,8 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.13.91
-Release: 2
+Version: 2.13.92
+Release: 1
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -45,11 +45,12 @@
 ## http://bugzilla.gnome.org/show_bug.cgi?id=106450
 Patch6: gnome-session-2.9.4-gnome-common.patch
 # Launch gnome-user-share on login if enabled
-Patch7: gnome-session-user-share.patch
+Patch7: gnome-session-2.13.92-user-share.patch
 # do shaped window for splash screen
 Patch8: gnome-session-2.12.0-shaped.patch
 # too much crashing
 Patch9: gnome-session-2.13.4-no-crashes.patch
+Patch10: gnome-session-2.13.92-preserve-backward-compat.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -80,7 +81,7 @@
 %patch7 -p0 -b .user-share
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
-
+%patch10 -p1 -b .preserve-backward-compat
 %build
 
 #workaround broken perl-XML-Parser on 64bit arches
@@ -155,6 +156,11 @@
 %{_sysconfdir}/xdg/autostart
 
 %changelog
+* Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 2.13.92-1
+- Update to 2.13.92
+- Add patch from CVS HEAD to maintain compatibility with
+  version 2.13.91
+
 * Thu Feb 23 2006 Ray Strode <rstrode at redhat.com> - 2.13.91-2
 - take ownership of autostart dir (bug 182335)
 


--- gnome-session-user-share.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:46:52 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:46:52 -0500
Subject: rpms/gnome-session/devel .cvsignore,1.19,1.20 sources,1.19,1.20
Message-ID: <200602281846.k1SIkq2k011394@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10211

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	13 Feb 2006 19:56:46 -0000	1.19
+++ .cvsignore	28 Feb 2006 18:46:50 -0000	1.20
@@ -1,6 +1 @@
-gnome-session-2.11.91.tar.bz2
-gnome-session-2.12.0.tar.bz2
-gnome-session-2.13.4.tar.bz2
-gnome-session-2.13.5.tar.bz2
-gnome-session-2.13.90.tar.bz2
-gnome-session-2.13.91.tar.bz2
+gnome-session-2.13.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	13 Feb 2006 19:56:46 -0000	1.19
+++ sources	28 Feb 2006 18:46:50 -0000	1.20
@@ -1 +1 @@
-3c580ad3870a70348b8c20d060833ce8  gnome-session-2.13.91.tar.bz2
+71b9c1e96f28b4fc8674e06fc57bbdd4  gnome-session-2.13.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:48:28 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:48:28 -0500
Subject: rpms/gnome-session/devel
	gnome-session-2.13.92-preserve-backward-compat.patch, NONE, 1.1
Message-ID: <200602281848.k1SImSen012166@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12052

Added Files:
	gnome-session-2.13.92-preserve-backward-compat.patch 
Log Message:
- add patch for backward compat


gnome-session-2.13.92-preserve-backward-compat.patch:
 ChangeLog          |    8 ++++++++
 save.c             |   17 +++++++++++++----
 startup-programs.c |   17 +++++++++++++----
 3 files changed, 34 insertions(+), 8 deletions(-)

--- NEW FILE gnome-session-2.13.92-preserve-backward-compat.patch ---
--- ChangeLog	27 Feb 2006 15:43:20 -0000	1.475
+++ ChangeLog	28 Feb 2006 16:21:56 -0000	1.477
@@ -1,3 +1,11 @@
+2006-02-28  Rodrigo Moya <rodrigo at novell.com>
+
+	* save.c (read_autostart_dirs):
+	* startup-programs.c (startup_list_read): support also the old
+	directory, to not break applications.
+
+==================== 2.13.92 ====================
+
 2006-02-27  Rodrigo Moya <rodrigo at novell.com>
 
 	Fixes #330397
--- save.c	27 Feb 2006 15:43:20 -0000	1.76
+++ save.c	28 Feb 2006 16:21:56 -0000	1.77
@@ -540,7 +540,7 @@ hash_table_remove_cb (gpointer key, gpoi
 static GSList *
 read_autostart_dirs (void)
 {
-  const char * const * system_data_dirs;
+  const char * const * system_dirs;
   char *path;
   gint i;
   GHashTable *clients;
@@ -549,10 +549,19 @@ read_autostart_dirs (void)
   clients = g_hash_table_new (g_str_hash, g_str_equal);
 
   /* read directories */
-  system_data_dirs = g_get_system_data_dirs ();
-  for (i = 0; system_data_dirs[i] != NULL; i++)
+  system_dirs = g_get_system_data_dirs ();
+  for (i = 0; system_dirs[i] != NULL; i++)
     {
-      path = g_build_filename (system_data_dirs[i], "gnome", "autostart", NULL);
+      path = g_build_filename (system_dirs[i], "gnome", "autostart", NULL);
+      read_desktop_entries_in_dir (clients, path);
+      g_free (path);
+    }
+
+  /* support old place (/etc/xdg/autostart) */
+  system_dirs = g_get_system_config_dirs ();
+  for (i = 0; system_dirs[i] != NULL; i++)
+    {
+      path = g_build_filename (system_dirs[i], "autostart", NULL);
       read_desktop_entries_in_dir (clients, path);
       g_free (path);
     }
--- startup-programs.c	27 Feb 2006 15:43:20 -0000	1.20
+++ startup-programs.c	28 Feb 2006 16:21:56 -0000	1.21
@@ -211,7 +211,7 @@ GSList *
 startup_list_read (gchar *name)
 {
   GHashTable *clients;
-  const char * const * system_data_dirs;
+  const char * const * system_dirs;
   char *path;
   int i;
   GSList *result = NULL;
@@ -220,10 +220,19 @@ startup_list_read (gchar *name)
   clients = g_hash_table_new (g_str_hash, g_str_equal);
 
   /* read directories */
-  system_data_dirs = g_get_system_data_dirs ();
-  for (i = 0; system_data_dirs[i] != NULL; i++)
+  system_dirs = g_get_system_data_dirs ();
+  for (i = 0; system_dirs[i] != NULL; i++)
     {
-      path = g_build_filename (system_data_dirs[i], "gnome", "autostart", NULL);
+      path = g_build_filename (system_dirs[i], "gnome", "autostart", NULL);
+      search_desktop_entries_in_dir (clients, path);
+      g_free (path);
+    }
+
+  /* support old place (/etc/xdg/autostart) */
+  system_dirs = g_get_system_config_dirs ();
+  for (i = 0; system_dirs[i] != NULL; i++)
+    {
+      path = g_build_filename (system_dirs[i], "autostart", NULL);
       search_desktop_entries_in_dir (clients, path);
       g_free (path);
     }



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:53:07 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:53:07 -0500
Subject: rpms/gnome-session/devel
	gnome-session-2.13.92-preserve-backward-compat.patch, 1.1,
	1.2 gnome-session.spec, 1.57, 1.58
Message-ID: <200602281853.k1SIr7iY014337@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14195

Modified Files:
	gnome-session-2.13.92-preserve-backward-compat.patch 
	gnome-session.spec 
Log Message:
make backward-compat patch apply with -p1


gnome-session-2.13.92-preserve-backward-compat.patch:
 ChangeLog          |    8 ++++++++
 save.c             |   17 +++++++++++++----
 startup-programs.c |   17 +++++++++++++----
 3 files changed, 34 insertions(+), 8 deletions(-)

Index: gnome-session-2.13.92-preserve-backward-compat.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.13.92-preserve-backward-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-session-2.13.92-preserve-backward-compat.patch	28 Feb 2006 18:48:25 -0000	1.1
+++ gnome-session-2.13.92-preserve-backward-compat.patch	28 Feb 2006 18:53:03 -0000	1.2
@@ -1,5 +1,5 @@
---- ChangeLog	27 Feb 2006 15:43:20 -0000	1.475
-+++ ChangeLog	28 Feb 2006 16:21:56 -0000	1.477
+--- gnome-session-2.13.92/gnome-session/ChangeLog	27 Feb 2006 15:43:20 -0000	1.475
++++ gnome-session-2.13.92/gnome-session/ChangeLog	28 Feb 2006 16:21:56 -0000	1.477
 @@ -1,3 +1,11 @@
 +2006-02-28  Rodrigo Moya <rodrigo at novell.com>
 +
@@ -12,8 +12,8 @@
  2006-02-27  Rodrigo Moya <rodrigo at novell.com>
  
  	Fixes #330397
---- save.c	27 Feb 2006 15:43:20 -0000	1.76
-+++ save.c	28 Feb 2006 16:21:56 -0000	1.77
+--- gnome-session-2.13.92/gnome-session/save.c	27 Feb 2006 15:43:20 -0000	1.76
++++ gnome-session-2.13.92/gnome-session/save.c	28 Feb 2006 16:21:56 -0000	1.77
 @@ -540,7 +540,7 @@ hash_table_remove_cb (gpointer key, gpoi
  static GSList *
  read_autostart_dirs (void)
@@ -46,8 +46,8 @@
        read_desktop_entries_in_dir (clients, path);
        g_free (path);
      }
---- startup-programs.c	27 Feb 2006 15:43:20 -0000	1.20
-+++ startup-programs.c	28 Feb 2006 16:21:56 -0000	1.21
+--- gnome-session-2.13.92/gnome-session/startup-programs.c	27 Feb 2006 15:43:20 -0000	1.20
++++ gnome-session-2.13.92/gnome-session/startup-programs.c	28 Feb 2006 16:21:56 -0000	1.21
 @@ -211,7 +211,7 @@ GSList *
  startup_list_read (gchar *name)
  {


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gnome-session.spec	28 Feb 2006 18:44:59 -0000	1.57
+++ gnome-session.spec	28 Feb 2006 18:53:03 -0000	1.58
@@ -78,7 +78,7 @@
 %patch2 -p1 -b .login
 %patch3 -p1 -b .dithering
 %patch6 -p1 -b .gnome-common
-%patch7 -p0 -b .user-share
+%patch7 -p1 -b .user-share
 %patch8 -p1 -b .shaped
 %patch9 -p1 -b .no-crashes
 %patch10 -p1 -b .preserve-backward-compat



From fedora-cvs-commits at redhat.com  Tue Feb 28 18:58:57 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 13:58:57 -0500
Subject: rpms/gnome-session/devel gnome-session-2.13.92-user-share.patch, 1.1,
	1.2
Message-ID: <200602281858.k1SIwvMr010241@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10226

Modified Files:
	gnome-session-2.13.92-user-share.patch 
Log Message:
s/d/s/


gnome-session-2.13.92-user-share.patch:
 Makefile.am      |    3 +++
 gsm-user-share.c |   38 ++++++++++++++++++++++++++++++++++++++
 gsm-user-share.h |    6 ++++++
 main.c           |    3 +++
 4 files changed, 50 insertions(+)

Index: gnome-session-2.13.92-user-share.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.13.92-user-share.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-session-2.13.92-user-share.patch	28 Feb 2006 18:44:59 -0000	1.1
+++ gnome-session-2.13.92-user-share.patch	28 Feb 2006 18:58:53 -0000	1.2
@@ -12,7 +12,7 @@
  
    gsm_sound_login ();
  
-+  gdm_user_share_start ();
++  gsm_user_share_start ();
 +
    gsm_remote_desktop_start ();
  



From fedora-cvs-commits at redhat.com  Tue Feb 28 19:08:16 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 14:08:16 -0500
Subject: rpms/gnome-session/devel gnome-session.spec,1.58,1.59
Message-ID: <200602281908.k1SJ8GTU010547@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10534

Modified Files:
	gnome-session.spec 
Log Message:
create autostart dirs and leading paths



Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- gnome-session.spec	28 Feb 2006 18:53:03 -0000	1.58
+++ gnome-session.spec	28 Feb 2006 19:08:03 -0000	1.59
@@ -122,7 +122,8 @@
 
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
 
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 
 #/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -154,6 +155,7 @@
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/xdg/autostart
+%{_datadir}/gnome/autostart
 
 %changelog
 * Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 2.13.92-1



From fedora-cvs-commits at redhat.com  Tue Feb 28 19:09:02 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 14:09:02 -0500
Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.51,
	1.52 sources, 1.63, 1.64 system-config-securitylevel.spec,
	1.74, 1.75
Message-ID: <200602281909.k1SJ928d010617@cvs.devel.redhat.com>

Author: clumens

Update of /cvs/dist/rpms/system-config-securitylevel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10603

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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	8 Feb 2006 20:04:38 -0000	1.51
+++ .cvsignore	28 Feb 2006 19:09:00 -0000	1.52
@@ -39,3 +39,4 @@
 system-config-securitylevel-1.6.13.tar.bz2
 system-config-securitylevel-1.6.14.tar.bz2
 system-config-securitylevel-1.6.15.tar.bz2
+system-config-securitylevel-1.6.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	8 Feb 2006 20:04:39 -0000	1.63
+++ sources	28 Feb 2006 19:09:00 -0000	1.64
@@ -1 +1 @@
-4438dc3db0910fe0cadff8d90efbcfde  system-config-securitylevel-1.6.15.tar.bz2
+04e626651001ac7fd4cbdb07947c8739  system-config-securitylevel-1.6.16.tar.bz2


Index: system-config-securitylevel.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- system-config-securitylevel.spec	11 Feb 2006 05:46:48 -0000	1.74
+++ system-config-securitylevel.spec	28 Feb 2006 19:09:00 -0000	1.75
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system security level
 Name: system-config-securitylevel
-Version: 1.6.15
-Release: 1.1
+Version: 1.6.16
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -19,6 +19,7 @@
 Requires: rhpl
 Requires: libselinux >= 1.19.1
 Requires: system-config-securitylevel-tui
+Requires: hicolor-icon-theme
 Prereq: gtk2 >= 2.6
 
 %description
@@ -96,6 +97,11 @@
 /usr/bin/system-config-securitylevel-tui
 
 %changelog
+* Tue Feb 28 2006 Chris Lumens <clumens at redhat.com> 1.6.16-1
+- Add requirement for scriptlets (#182876, #182877).
+- Add glade UI strings to translations (#182181).
+- Reorder service checkboxes to make the screen fit for Italian (#182447).
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.6.15-1.1
 - bump again for double-long bug on ppc(64)
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 19:55:23 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 14:55:23 -0500
Subject: rpms/kernel/FC-4/configs config-generic, 1.53,
	1.53.10.1 config-x86-generic, 1.19,
	1.19.10.1 config-x86_64-generic, 1.16, 1.16.10.1
Message-ID: <200602281955.k1SJtNKd022848@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22647/configs

Modified Files:
      Tag: private-linville-netdev-fc4-11-branch
	config-generic config-x86-generic config-x86_64-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v
retrieving revision 1.53
retrieving revision 1.53.10.1
diff -u -r1.53 -r1.53.10.1
--- config-generic	27 Jan 2006 03:24:32 -0000	1.53
+++ config-generic	28 Feb 2006 19:55:18 -0000	1.53.10.1
@@ -588,6 +588,7 @@
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=m
+CONFIG_NETDEBUG=y
 CONFIG_INET=y
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_DIAG=m
@@ -645,6 +646,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
@@ -655,6 +658,7 @@
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_XTABLES=m
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
 
@@ -693,6 +697,7 @@
 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_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -754,6 +759,7 @@
 CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_PHYSDEV=m
+CONFIG_IP6_NF_MATCH_POLICY=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
@@ -789,6 +795,37 @@
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
 
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=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_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
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+CONFIG_TIPC=m
+CONFIG_TIPC_ADVANCED=n
+CONFIG_TIPC_DEBUG=y
+
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
@@ -820,6 +857,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
 
@@ -1040,6 +1078,7 @@
 CONFIG_R8169_VLAN=y
 CONFIG_SK98LIN=m
 CONFIG_SKGE=m
+CONFIG_SKY2=m
 CONFIG_TIGON3=m
 
 #
@@ -1098,11 +1137,16 @@
 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_IPW_DEBUG is not set
+# CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100_PROMISC is not set
 # CONFIG_IPW2100_LEGACY_FW_LOAD is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1112,6 +1156,11 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
+CONFIG_BCM43XX=m
+CONFIG_BCM43XX_DEBUG=y
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1127,6 +1176,7 @@
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
 
 #
@@ -2526,6 +2576,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.19.10.1
diff -u -r1.19 -r1.19.10.1
--- config-x86-generic	26 Jan 2006 01:39:55 -0000	1.19
+++ config-x86-generic	28 Feb 2006 19:55:19 -0000	1.19.10.1
@@ -241,12 +241,16 @@
 CONFIG_IEEE80211_WPA=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 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_IPW2200_DEBUG=y
 
 CONFIG_BLK_DEV_AMD74XX=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v
retrieving revision 1.16
retrieving revision 1.16.10.1
diff -u -r1.16 -r1.16.10.1
--- config-x86_64-generic	6 Jan 2006 23:35:07 -0000	1.16
+++ config-x86_64-generic	28 Feb 2006 19:55:19 -0000	1.16.10.1
@@ -103,10 +103,14 @@
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2100_DEBUG=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW_QOS=y
+CONFIG_IPW2200_DEBUG=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Tue Feb 28 19:57:40 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 14:57:40 -0500
Subject: rpms/kudzu/devel .cvsignore, 1.110, 1.111 kudzu.spec, 1.125,
	1.126 sources, 1.124, 1.125
Message-ID: <200602281957.k1SJveDd023927@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/kudzu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23881/devel

Modified Files:
	.cvsignore kudzu.spec sources 
Log Message:
auto-import kudzu-1.2.33-1 on branch devel from kudzu-1.2.33-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- .cvsignore	22 Feb 2006 19:07:16 -0000	1.110
+++ .cvsignore	28 Feb 2006 19:57:38 -0000	1.111
@@ -1 +1 @@
-kudzu-1.2.32.tar.gz
+kudzu-1.2.33.tar.gz


Index: kudzu.spec
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- kudzu.spec	22 Feb 2006 19:08:06 -0000	1.125
+++ kudzu.spec	28 Feb 2006 19:57:38 -0000	1.126
@@ -1,5 +1,5 @@
 Name: kudzu
-Version: 1.2.32
+Version: 1.2.33
 Release: 1
 License: GPL
 Summary: The Red Hat Linux hardware probing tool.
@@ -79,6 +79,9 @@
 %{_includedir}/kudzu
 
 %changelog
+* Tue Feb 28 2006 Jeremy Katz <katzj at redhat.com> - 1.2.33-1
+- fix i2o again (#182522)
+
 * Wed Feb 22 2006 Bill Nottingham <notting at redhat.com> - 1.2.32-1
 - fix potential segfault with USB network devices (#182006)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kudzu/devel/sources,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- sources	22 Feb 2006 19:07:17 -0000	1.124
+++ sources	28 Feb 2006 19:57:38 -0000	1.125
@@ -1 +1 @@
-9819e403bf469bed21d349afac055c5e  kudzu-1.2.32.tar.gz
+cd55171cf82925592f2293fbcf0128d3  kudzu-1.2.33.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:12:56 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:12:56 -0500
Subject: rpms/evolution-connector/devel .cvsignore, 1.27,
	1.28 evolution-connector.spec, 1.53, 1.54 sources, 1.27, 1.28
Message-ID: <200602282012.k1SKCuAC027593@cvs.devel.redhat.com>

Author: rstrode

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27379

Modified Files:
	.cvsignore evolution-connector.spec sources 
Log Message:
- 2.5.92



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	15 Feb 2006 05:38:45 -0000	1.27
+++ .cvsignore	28 Feb 2006 20:12:51 -0000	1.28
@@ -1 +1 @@
-evolution-exchange-2.5.91.tar.bz2
+evolution-exchange-2.5.92.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- evolution-connector.spec	15 Feb 2006 05:38:45 -0000	1.53
+++ evolution-connector.spec	28 Feb 2006 20:12:52 -0000	1.54
@@ -6,7 +6,7 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.5.91
+Version: 2.5.92
 Release: 1
 License: GPL
 Group: Applications/Productivity
@@ -96,6 +96,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Tue Feb 28 2006 Ray Strode <rstrode at redhat.com> - 2.5.92-1
+- 2.5.92
+
 * Wed Feb 15 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.91-1
 - 2.5.91
 - fix missing declarations (patch 301)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	15 Feb 2006 05:38:45 -0000	1.27
+++ sources	28 Feb 2006 20:12:53 -0000	1.28
@@ -1 +1 @@
-7a4ce9e2fd0db863258d30b0463e7414  evolution-exchange-2.5.91.tar.bz2
+91bf7edcad265c391b3bd9832d087414  evolution-exchange-2.5.92.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:14:42 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:14:42 -0500
Subject: rpms/NetworkManager/devel NetworkManager.spec, 1.93,
	1.94 three-scan-prune.patch, 1.1, 1.2
Message-ID: <200602282014.k1SKEgwY028384@cvs.devel.redhat.com>

Author: caillon

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28347

Modified Files:
	NetworkManager.spec three-scan-prune.patch 
Log Message:
* Tue Feb 28 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-17.cvs20060228
- Tweak three-scan-prune.patch



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- NetworkManager.spec	28 Feb 2006 01:51:36 -0000	1.93
+++ NetworkManager.spec	28 Feb 2006 20:14:40 -0000	1.94
@@ -15,7 +15,7 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.5.1
-Release: 16%{?nm_cvs_version}
+Release: 17%{?nm_cvs_version}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -216,6 +216,9 @@
 
 
 %changelog
+* Tue Feb 28 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-17.cvs20060228
+- Tweak three-scan-prune.patch
+
 * Mon Feb 27 2006 Christopher Aillon <caillon at redhat.com> 0.5.1-16.cvs20060227
 - Don't prune networks until they've gone MIA for three scans, not one.
 

three-scan-prune.patch:
 nm-device-802-11-wireless.c |   50 +++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 19 deletions(-)

Index: three-scan-prune.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/three-scan-prune.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- three-scan-prune.patch	28 Feb 2006 01:51:45 -0000	1.1
+++ three-scan-prune.patch	28 Feb 2006 20:14:40 -0000	1.2
@@ -74,7 +74,7 @@
  		{
  			const GTimeVal	*ap_time = nm_ap_get_last_seen (outdated_ap);
  			gboolean		 keep_around = FALSE;
-+			guint active_interval_s;
++			guint inactive_interval_s;
 +			guint prune_interval_s;
  
  			/* Don't ever prune the AP we're currently associated with */
@@ -83,8 +83,8 @@
  				keep_around = TRUE;
  
 -			if (!keep_around && (ap_time->tv_sec + 180 < cur_time.tv_sec))
-+			active_interval_s = nm_wireless_scan_interval_to_seconds (NM_WIRELESS_SCAN_INTERVAL_ACTIVE);
-+			prune_interval_s = active_interval_s * 3;
++			inactive_interval_s = nm_wireless_scan_interval_to_seconds (NM_WIRELESS_SCAN_INTERVAL_INACTIVE);
++			prune_interval_s = inactive_interval_s * 3;
 +
 +			if (!keep_around && (ap_time->tv_sec + prune_interval_s < cur_time.tv_sec))
  				outdated_list = g_slist_append (outdated_list, outdated_ap);



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:16:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:16:33 -0500
Subject: rpms/kernel/devel/configs config-ia64-generic, 1.20,
	1.21 config-xen-generic, 1.8, 1.9 config-xen-xenU, 1.3,
	1.4 config-xen-xenU-PAE, 1.1, 1.2
Message-ID: <200602282016.k1SKGXxZ031780@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv28514/configs

Modified Files:
	config-ia64-generic config-xen-generic config-xen-xenU 
	config-xen-xenU-PAE 
Log Message:
rebase 8922 xen-unstable & rawhide 1.1991


Index: config-ia64-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- config-ia64-generic	9 Feb 2006 21:45:33 -0000	1.20
+++ config-ia64-generic	28 Feb 2006 20:16:29 -0000	1.21
@@ -7,6 +7,11 @@
 #
 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_XEN_VT is not set
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_TIME_INTERPOLATION=y


Index: config-xen-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-xen-generic	13 Feb 2006 21:17:48 -0000	1.8
+++ config-xen-generic	28 Feb 2006 20:16:29 -0000	1.9
@@ -14,6 +14,10 @@
 # CONFIG_XEN_NETDEV_GRANT_TX is not set
 # CONFIG_XEN_NETDEV_GRANT_RX is not set
 # CONFIG_SMP_ALTERNATIVES 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
 
 #
 # X86 Processor Configuration


Index: config-xen-xenU
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config-xen-xenU	13 Feb 2006 21:17:48 -0000	1.3
+++ config-xen-xenU	28 Feb 2006 20:16:29 -0000	1.4
@@ -74,7 +74,18 @@
 # 
 # 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
+
+#
+# DVB devices
+#
+# CONFIG_DVB is not set


Index: config-xen-xenU-PAE
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU-PAE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-xen-xenU-PAE	10 Feb 2006 04:58:57 -0000	1.1
+++ config-xen-xenU-PAE	28 Feb 2006 20:16:29 -0000	1.2
@@ -79,6 +79,18 @@
 # 
 # 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
+
+#
+# DVB devices
+#
+# CONFIG_DVB is not set



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:16:32 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:16:32 -0500
Subject: rpms/kernel/devel linux-2.6-cell-numa-init.patch, NONE,
 1.1.4.1 linux-2.6-defaults-enable-sata-atapi.patch, NONE,
 1.1.4.1 linux-2.6-defaults-fat-utf8.patch, NONE,
 1.1.4.1 linux-2.6-defaults-firmware-loader-timeout.patch, NONE,
 1.1.4.1 linux-2.6-defaults-max-symlinks.patch, NONE,
 1.1.4.1 linux-2.6-net-ipw2200-hwcrypto.patch, NONE,
 1.1.4.1 linux-2.6-net-ipw2200-monitor.patch, NONE,
 1.1.4.1 linux-2.6-powermac-pfunc-noise.patch, NONE,
 1.1.4.1 linux-2.6-x86_64-smp-on-uphw-cpucount.patch, NONE,
 1.3.4.1 linux-2.6-xen-cpusteal-hv.patch, NONE,
 1.2.2.1 linux-2.6-xen-cpusteal-kernel.patch, NONE,
 1.2.2.1 linux-2.6-xen-module-fault.patch, NONE,
 1.1.4.1 linux-2.6.15-ipw2200-monitor.patch, NONE,
 1.2.2.1 linux-2.6.15-powerpc-gettimeofday.patch, NONE,
 1.1.2.1 patch-2.6.16-rc5-git1.bz2.sign, NONE,
 1.1.2.1 patch-2.6.16-rc5.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.357,
 1.357.2.1 kernel-2.6.spec, 1.1971.2.4,
 1.1971.2.5 linux-2.6-radeon-backlight.patch, 1.10,
 1.10.20.1 linux-2.6-xen.patch, 1.1.46.1, 1.1.46.2 sources, 1.299, 1.299.2!
 .1 upstream, 1.274, 1.274.2.1 linux-2.6-atkbd-dell-multimedia.patch, 1.1,
 NONE linux-2.6-audit-allocation-in-atomic.patch, 1.1,
 NONE linux-2.6-block-reduce-stack.patch, 1.1,
 NONE linux-2.6-firmware-loader-timeout.patch, 1.2,
 NONE linux-2.6-input-usblegacy.patch, 1.2,
 NONE linux-2.6-ipw2200-hwcrypto.patch, 1.1,
 NONE linux-2.6-max-symlinks.patch, 1.1,
 NONE linux-2.6-mv643xx-compile-fix.patch, 1.1,
 NONE linux-2.6-procfs-i_nlink-miscalculate.patch, 1.1,
 NONE linux-2.6-sata-enable-atapi-by-default.patch, 1.1,
 NONE linux-2.6-vm-oomkiller-debugging.patch, 1.2,
 NONE linux-2.6-xen-compile.patch, 1.1, NONE patch-2.6.16-rc4.bz2.sign, 1.1,
 NONE
Message-ID: <200602282016.k1SKGWa4031703@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28514

Modified Files:
      Tag: private-xen-rebased-1971-branch
	.cvsignore kernel-2.6.spec linux-2.6-radeon-backlight.patch 
	linux-2.6-xen.patch sources upstream 
Added Files:
      Tag: private-xen-rebased-1971-branch
	linux-2.6-cell-numa-init.patch 
	linux-2.6-defaults-enable-sata-atapi.patch 
	linux-2.6-defaults-fat-utf8.patch 
	linux-2.6-defaults-firmware-loader-timeout.patch 
	linux-2.6-defaults-max-symlinks.patch 
	linux-2.6-net-ipw2200-hwcrypto.patch 
	linux-2.6-net-ipw2200-monitor.patch 
	linux-2.6-powermac-pfunc-noise.patch 
	linux-2.6-x86_64-smp-on-uphw-cpucount.patch 
	linux-2.6-xen-cpusteal-hv.patch 
	linux-2.6-xen-cpusteal-kernel.patch 
	linux-2.6-xen-module-fault.patch 
	linux-2.6.15-ipw2200-monitor.patch 
	linux-2.6.15-powerpc-gettimeofday.patch 
	patch-2.6.16-rc5-git1.bz2.sign patch-2.6.16-rc5.bz2.sign 
Removed Files:
      Tag: private-xen-rebased-1971-branch
	linux-2.6-atkbd-dell-multimedia.patch 
	linux-2.6-audit-allocation-in-atomic.patch 
	linux-2.6-block-reduce-stack.patch 
	linux-2.6-firmware-loader-timeout.patch 
	linux-2.6-input-usblegacy.patch 
	linux-2.6-ipw2200-hwcrypto.patch linux-2.6-max-symlinks.patch 
	linux-2.6-mv643xx-compile-fix.patch 
	linux-2.6-procfs-i_nlink-miscalculate.patch 
	linux-2.6-sata-enable-atapi-by-default.patch 
	linux-2.6-vm-oomkiller-debugging.patch 
	linux-2.6-xen-compile.patch patch-2.6.16-rc4.bz2.sign 
Log Message:
rebase 8922 xen-unstable & rawhide 1.1991

linux-2.6-cell-numa-init.patch:
 setup.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-cell-numa-init.patch ---
--- linux-2.6.15/arch/powerpc/platforms/cell/setup.c~	2006-01-12 20:23:46.000000000 +0000
+++ linux-2.6.15/arch/powerpc/platforms/cell/setup.c	2006-01-13 00:17:51.000000000 +0000
@@ -126,6 +126,7 @@ static void __init cell_spuprop_present(
 static void __init cell_spumem_init(int early)
 {
 	struct device_node *node;
+	return;
 	for (node = of_find_node_by_type(NULL, "spe");
 			node; node = of_find_node_by_type(node, "spe")) {
 		cell_spuprop_present(node, "local-store", early);

linux-2.6-defaults-enable-sata-atapi.patch:
 libata-core.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-enable-sata-atapi.patch ---
--- linux-2.6.14/drivers/scsi/libata-core.c~	2005-11-22 11:33:25.000000000 -0500
+++ linux-2.6.14/drivers/scsi/libata-core.c	2005-11-22 11:33:37.000000000 -0500
@@ -78,7 +78,7 @@ static void __ata_qc_complete(struct ata
 static unsigned int ata_unique_id = 1;
 static struct workqueue_struct *ata_wq;
 
-int atapi_enabled = 0;
+int atapi_enabled = 1;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 

linux-2.6-defaults-fat-utf8.patch:
 inode.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-fat-utf8.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963

--- linux-2.6.15.noarch/fs/fat/inode.c~	2006-02-20 23:20:12.000000000 -0500
+++ linux-2.6.15.noarch/fs/fat/inode.c	2006-02-20 23:21:42.000000000 -0500
@@ -952,7 +952,8 @@ static int parse_options(char *options, 
 		opts->shortname = 0;
 	opts->name_check = 'n';
 	opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK =  0;
-	opts->utf8 = opts->unicode_xlate = 0;
+	opts->utf8 = 1;
+	opts->unicode_xlate = 0;
 	opts->numtail = 1;
 	opts->nocase = 0;
 	*debug = 0;

linux-2.6-defaults-firmware-loader-timeout.patch:
 firmware_class.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-firmware-loader-timeout.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174589

The ipw driver sometimes takes a long time to load its firmware.
Whilst the ipw driver should be using the async interface of
the firmware loader to make this a non-issue, this is a minimal fix.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.14/drivers/base/firmware_class.c~	2005-12-01 16:56:29.000000000 -0500
+++ linux-2.6.14/drivers/base/firmware_class.c	2005-12-01 16:56:35.000000000 -0500
@@ -31,7 +31,7 @@ enum {
 	FW_STATUS_READY_NOHOTPLUG,
 };
 
-static int loading_timeout = 10;	/* In seconds */
+static int loading_timeout = 60;	/* In seconds */
 
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just
  * guarding for corner cases a global lock should be OK */

linux-2.6-defaults-max-symlinks.patch:
 namei.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-defaults-max-symlinks.patch ---
Bump up the maximum nested amount of symlinks.

diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/namei.h linux-10000/include/linux/namei.h
--- linux-3022/include/linux/namei.h
+++ linux-10000/include/linux/namei.h
@@ -10,7 +10,7 @@ struct open_intent {
 	int	create_mode;
 };
 
-enum { MAX_NESTED_LINKS = 5 };
+enum { MAX_NESTED_LINKS = 8 };
 
 struct nameidata {
 	struct dentry	*dentry;

linux-2.6-net-ipw2200-hwcrypto.patch:
 ipw2200.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-net-ipw2200-hwcrypto.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,

linux-2.6-net-ipw2200-monitor.patch:
 Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6-net-ipw2200-monitor.patch ---
--- linux-2.6.15.i686/drivers/net/wireless/Kconfig.BAD	2006-02-18 09:57:26.000000000 -0600
+++ linux-2.6.15.i686/drivers/net/wireless/Kconfig	2006-02-18 09:58:07.000000000 -0600
@@ -237,6 +237,15 @@
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config IPW2200_MONITOR
+	bool "Enable promiscuous mode"
+	depends on IPW2200
+	---help---
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
 	depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN)

linux-2.6-powermac-pfunc-noise.patch:
 pfunc_base.c |    2 +-
 pfunc_core.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-powermac-pfunc-noise.patch ---
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c
index 4ffd2a9..8f1aa7a 100644
--- a/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -9,7 +9,7 @@
 #include <asm/pmac_feature.h>
 #include <asm/pmac_pfunc.h>
 
-#define DBG(fmt...)	printk(fmt)
+#define DBG(fmt...)
 
 static irqreturn_t macio_gpio_irq(int irq, void *data, struct pt_regs *regs)
 {
diff --git a/arch/powerpc/platforms/powermac/pfunc_core.c b/arch/powerpc/platforms/powermac/pfunc_core.c
index 356a739..a7aa884 100644
--- a/arch/powerpc/platforms/powermac/pfunc_core.c
+++ b/arch/powerpc/platforms/powermac/pfunc_core.c
@@ -20,7 +20,7 @@
 #define LOG_PARSE(fmt...)
 #define LOG_ERROR(fmt...)	printk(fmt)
 #define LOG_BLOB(t,b,c)
-#define DBG(fmt...)		printk(fmt)
+#define DBG(fmt...)
 
 /* Command numbers */
 #define PMF_CMD_LIST			0

linux-2.6-x86_64-smp-on-uphw-cpucount.patch:
 smpboot.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE linux-2.6-x86_64-smp-on-uphw-cpucount.patch ---

--- linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c~	2006-02-20 21:59:56.000000000 -0500
+++ linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c	2006-02-20 22:01:57.000000000 -0500
@@ -975,6 +975,11 @@ __init void prefill_possible_map(void)
 	if (possible > NR_CPUS) 
 		possible = NR_CPUS;
 
+	if (possible == 0) {	/* Could be SMP kernel on UP hw with broken BIOS */
+		possible = 1;
+		printk (KERN_DEBUG "BIOS never enumerated boot CPU, fixing.\n");
+	}
+
 	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",
 		possible,
 	        max_t(int, possible - num_processors, 0));

linux-2.6-xen-cpusteal-hv.patch:
 common/domain.c       |   16 ++++++++++++++++
 include/public/vcpu.h |    8 ++++++++
 2 files changed, 24 insertions(+)

--- NEW FILE linux-2.6-xen-cpusteal-hv.patch ---
Allow guest domains to get information from the hypervisor on how much
cpu time their virtual cpus have used.  This is needed to estimate the
cpu steal time.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- xen/include/public/vcpu.h.steal	2006-02-07 18:01:41.000000000 -0500
+++ xen/include/public/vcpu.h	2006-02-17 13:51:45.000000000 -0500
@@ -51,6 +51,14 @@
 /* Returns 1 if the given VCPU is up. */
 #define VCPUOP_is_up                3
 
+/*
+ * Get information on how much CPU time this VCPU has used, etc...
+ *
+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
+ *               of which filled in with scheduler info.
+ */
+#define VCPUOP_cpu_info             4
+
 #endif /* __XEN_PUBLIC_VCPU_H__ */
 
 /*
--- xen/common/domain.c.steal	2006-02-07 18:01:40.000000000 -0500
+++ xen/common/domain.c	2006-02-17 13:52:44.000000000 -0500
@@ -451,8 +451,24 @@
     case VCPUOP_is_up:
         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
         break;
+
+    case VCPUOP_cpu_info:
+	{
+	    struct dom0_getvcpuinfo vi = { 0, };
+	    vi.online = !test_bit(_VCPUF_down, &v->vcpu_flags);
+	    vi.blocked = test_bit(_VCPUF_blocked, &v->vcpu_flags);
+	    vi.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
+	    vi.cpu_time = v->cpu_time;
+	    vi.cpu = v->processor;
+	    rc = 0;
+
+	    if ( copy_to_user(arg, &vi, sizeof(dom0_getvcpuinfo_t)) )
+		rc = -EFAULT;
+	    break;
+	}
     }
 
+
     return rc;
 }
 

linux-2.6-xen-cpusteal-kernel.patch:
 arch/i386/kernel/time-xen.c  |   38 ++++++++++++++++++++++++++++++++++++++
 include/xen/interface/vcpu.h |    8 ++++++++
 2 files changed, 46 insertions(+)

--- NEW FILE linux-2.6-xen-cpusteal-kernel.patch ---
Estimate and account for the CPU steal time.  That is, the time during
which we wanted to run, but the hypervisor scheduled in another
process instead.  This can be used to help administrators in capacity
planning, by clearly being able to distinguish whether the system is
too slow or this guest is simply not getting enough CPU time.

This is the i386 version, I'll send the implementation for x86_64 soon.

Signed-off-by: Rik van Riel <riel at redhat.com>

--- linux-2.6.15.i686/arch/i386/kernel/time-xen.c.steal	2006-02-17 16:44:40.000000000 -0500
+++ linux-2.6.15.i686/arch/i386/kernel/time-xen.c	2006-02-20 18:31:26.000000000 -0500
@@ -48,6 +48,7 @@
 #include <linux/mca.h>
 #include <linux/sysctl.h>
 #include <linux/percpu.h>
+#include <linux/kernel_stat.h>
 
 #include <asm/io.h>
 #include <asm/smp.h>
@@ -77,6 +78,7 @@
 #include <asm/arch_hooks.h>
 
 #include <xen/evtchn.h>
+#include <xen/interface/vcpu.h>
 
 #if defined (__i386__)
 #include <asm/i8259.h>
@@ -624,7 +626,43 @@ irqreturn_t timer_interrupt(int irq, voi
          * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
          * if there is risk of deadlock if we do (since update_process_times
          * may do scheduler rebalancing work and thus acquire runqueue locks).
+	 *
+	 * If we have not run for a while, chances are this vcpu got scheduled
+	 * away.  Try to estimate how much time was stolen.
          */
+	if (delta_cpu > (s64)(2 * NS_PER_TICK)) {
+		dom0_getvcpuinfo_t vcpu = { 0, };
+		cputime64_t total;	/* In jiffies, not nanoseconds. */
+		s64 cputicks, deltaticks, steal;
+
+		if (HYPERVISOR_vcpu_op(VCPUOP_cpu_info, cpu, &vcpu) == 0) {
+			total = kstat_cpu(cpu).cpustat.user +
+				kstat_cpu(cpu).cpustat.nice +
+				kstat_cpu(cpu).cpustat.system +
+				kstat_cpu(cpu).cpustat.softirq +
+				kstat_cpu(cpu).cpustat.irq;
+
+			/* do_div modifies the variable in place. YUCK */
+			deltaticks = delta_cpu;
+			cputicks = vcpu.cpu_time;
+			do_div(cputicks, NS_PER_TICK);
+			do_div(deltaticks, NS_PER_TICK);
+
+			steal = total + deltaticks - cputicks;
+			if (unlikely(steal < 0))
+				steal = 0;
+			else if (unlikely(steal > deltaticks))
+				steal = deltaticks;
+
+			if (steal > 0) {
+				delta_cpu -= steal * NS_PER_TICK;
+				per_cpu(processed_system_time, cpu) +=
+							steal * NS_PER_TICK;
+				account_steal_time(current, (cputime_t)steal);
+			}
+		}
+	}
+
 	while (delta_cpu >= NS_PER_TICK) {
 		delta_cpu -= NS_PER_TICK;
 		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
--- linux-2.6.15.i686/include/xen/interface/vcpu.h.steal	2006-02-17 16:14:17.000000000 -0500
+++ linux-2.6.15.i686/include/xen/interface/vcpu.h	2006-02-17 16:14:52.000000000 -0500
@@ -51,6 +51,14 @@
 /* Returns 1 if the given VCPU is up. */
 #define VCPUOP_is_up                3
 
+/*
+ * Get information on how much CPU time this VCPU has used, etc...
+ *
+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
+ *               of which filled in with scheduler info.
+ */
+#define VCPUOP_cpu_info             4
+
 #endif /* __XEN_PUBLIC_VCPU_H__ */
 
 /*

linux-2.6-xen-module-fault.patch:
 fault-xen.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-xen-module-fault.patch ---
We need to handle spurious page faults in the kernel's module VA range
in order to avoid OOPSing on modular x86_64 SMP builds.

Signed-off-by: Stephen Tweedie <sct at redhat.com>

--- linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c~	2006-02-14 11:12:11.000000000 -0500
+++ linux-2.6.15.x86_64/arch/x86_64/mm/fault-xen.c	2006-02-15 14:45:53.000000000 -0500
@@ -367,12 +367,14 @@
 	 */
 	if (unlikely(address >= TASK_SIZE64)) {
 		/*
-		 * Don't check for the module range here: its PML4
+		 * Even the module range needs checked here: its PML4
 		 * is always initialized because it's shared with the main
-		 * kernel text. Only vmalloc may need PML4 syncups.
+		 * kernel text, but the writable pagetable code can still
+		 * result in spurious faults.
 		 */
 		if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) &&
-		      ((address >= VMALLOC_START && address < VMALLOC_END))) {
+		    ((address >= VMALLOC_START && address < VMALLOC_END) ||
+		     (address >= MODULES_VADDR && address < MODULES_END))) {
 			if (vmalloc_fault(address) < 0)
 				goto bad_area_nosemaphore;
 			return;

linux-2.6.15-ipw2200-monitor.patch:
 Kconfig |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE linux-2.6.15-ipw2200-monitor.patch ---
--- linux-2.6.15.i686/drivers/net/wireless/Kconfig.BAD	2006-02-18 09:57:26.000000000 -0600
+++ linux-2.6.15.i686/drivers/net/wireless/Kconfig	2006-02-18 09:58:07.000000000 -0600
@@ -237,6 +237,15 @@
 	  If you are not trying to debug or develop the IPW2200 driver, you 
 	  most likely want to say N here.
 
+config IPW2200_MONITOR
+	bool "Enable promiscuous mode"
+	depends on IPW2200
+	---help---
+	  Enables promiscuous/monitor mode support for the ipw2200 driver.
+	  With this feature compiled into the driver, you can switch to
+	  promiscuous mode via the Wireless Tool's Monitor mode.  While in this
+	  mode, no packets can be sent.
+
 config AIRO
 	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
 	depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN)

linux-2.6.15-powerpc-gettimeofday.patch:
 gettimeofday.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.15-powerpc-gettimeofday.patch ---
>From benh at kernel.crashing.org Sat Feb 25 21:11:28 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 25 Feb 2006 21:11:28 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hM-0006Jj-Lv for dwmw2 at baythorne.infradead.org; Sat, 25 Feb 2006
	21:11:28 +0000
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hJ-0008Dl-05 for dwmw2 at infradead.org; Sat, 25 Feb 2006 21:11:28 +0000
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k1PKxQWG030049; Sat, 25 Feb
	2006 14:59:27 -0600
Subject: [PATCH] powerpc: vdso 64bits gettimeofday bug
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
Cc: Paul Mackerras <paulus at samba.org>, Olaf Hering <olh at suse.de>, linuxppc-dev list <linuxppc-dev at ozlabs.org>, linuxppc64-dev <linuxppc64-dev at ozlabs.org>, Greg KH <greg at kroah.com>, David Woodhouse <dwmw2 at infradead.org>, Sven Luther <sven.luther at wanadoo.fr>
Content-Type: text/plain
Date: Sun, 26 Feb 2006 08:09:00 +1100
Message-Id: <1140901740.24957.29.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.5.91 
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

A bug in the assembly code of the vdso can cause gettimeofday() to hang
or to return incorrect results. The wrong register was used to test for
pending updates of the calibration variables and to create a dependency
for subsequent loads. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---

Might be worth applying to the stable series too and/or distro kernels
2.6.15 and later

--- linux-work.orig/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:02:57.000000000 +1100
+++ linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:04:23.000000000 +1100
@@ -225,9 +225,9 @@
   .cfi_startproc
 	/* check for update count & load values */
 1:	ld	r8,CFG_TB_UPDATE_COUNT(r3)
-	andi.	r0,r4,1			/* pending update ? loop */
+	andi.	r0,r8,1			/* pending update ? loop */
 	bne-	1b
-	xor	r0,r4,r4		/* create dependency */
+	xor	r0,r8,r8		/* create dependency */
 	add	r3,r3,r0
 
 	/* Get TB & offset it */




--- NEW FILE patch-2.6.16-rc5-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEA0yryGugalF9Dw4RAkzIAJ9fq7KYYpJ5iqcPqvxKMyzpfpLWfQCffGEU
v4lqNEf2lnEUrO7v7zDosqo=
=zCAc
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.16-rc5.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEAo8DyGugalF9Dw4RAjHmAJ91iAD8pSWyZFCxjTjzPZdpakirHQCfcGB+
qy7dv6iu8M1d+bQn3BCfMdk=
=7VrN
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.357
retrieving revision 1.357.2.1
diff -u -r1.357 -r1.357.2.1
--- .cvsignore	17 Feb 2006 23:06:18 -0000	1.357
+++ .cvsignore	28 Feb 2006 20:16:09 -0000	1.357.2.1
@@ -3,4 +3,5 @@
 kernel-2.6.15
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
-patch-2.6.16-rc4.bz2
+patch-2.6.16-rc5.bz2
+patch-2.6.16-rc5-git1.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.4
retrieving revision 1.1971.2.5
diff -u -r1.1971.2.4 -r1.1971.2.5
--- kernel-2.6.spec	24 Feb 2006 21:52:14 -0000	1.1971.2.4
+++ kernel-2.6.spec	28 Feb 2006 20:16:09 -0000	1.1971.2.5
@@ -5,11 +5,13 @@
 
 %define buildup 1
 %define buildsmp 1
+# Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
-# includexenPAE requieres includexen enabled
-%define includexenPAE 0
+# Whether to build the Xen kernels, disable if you want.
+%define buildxen 0
+%define buildxenPAE 0
 %define builddoc 0
-%define buildkdump 0
+%define buildkdump 1
 
 # Versions of various parts
 
@@ -42,21 +44,23 @@
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
+# Xen and kdump only build on i686 and x86_64 ...
+%ifnarch i686 x86_64
+%define buildxen 0
+%define buildkdump 0
+%endif
+
+# ... and XenPAE only on i686
+%ifnarch i686
+%define buildxenPAE 0
+%endif
+
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch i586
 %define buildsmp 0
 %endif
 
-%ifarch i686
-%define buildxen %{includexen}
-%define buildxenPAE %{includexenPAE}
-%define buildkdump 1
-%else
-%define buildxen 0
-%define buildxenPAE 0
-%endif
-
 %ifarch %{all_x86}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
 %define image_install_path boot
@@ -65,8 +69,6 @@
 
 %ifarch x86_64
 %define buildsmp 0
-%define buildkdump 1
-%define buildxen %{includexen}
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define signmodules 1
@@ -216,7 +218,8 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-Patch1: patch-2.6.16-rc4.bz2
+Patch1: patch-2.6.16-rc5.bz2
+Patch2: patch-2.6.16-rc5-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -230,9 +233,13 @@
 Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch205: linux-2.6-edid-check.patch
 Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch
+Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
+Patch208: linux-2.6-x86-hp-reboot.patch
 
 # 300 - 399   ppc(64)
-Patch301: linux-2.6.15-cell-numa-init.patch
+Patch300: linux-2.6-powermac-pfunc-noise.patch
+Patch301: linux-2.6-cell-numa-init.patch
+Patch302: linux-2.6.15-powerpc-gettimeofday.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
@@ -256,6 +263,8 @@
 Patch705: linux-2.6-xen_net_read_mac_export.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-module-fault.patch
+Patch711: linux-2.6-xen-cpusteal-kernel.patch
 
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
@@ -319,9 +328,6 @@
 
 Patch1070: linux-2.6-sleepon.patch
 
-# Tweak some defaults.
-Patch1081: linux-2.6-max-symlinks.patch
-
 # SCSI bits.
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
@@ -334,7 +340,8 @@
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
 Patch1302: linux-2.6-net-wireless-features.patch
-Patch1303: linux-2.6-ipw2200-hwcrypto.patch
+Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
+Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
 Patch1400: linux-2.6-squashfs.patch
@@ -348,33 +355,26 @@
 Patch1505: linux-2.6-dump_smp_call_function.patch
 
 # Misc bits.
-Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch
-Patch1610: linux-2.6-atkbd-dell-multimedia.patch
-Patch1630: linux-2.6-module_version.patch
-Patch1650: linux-2.6-input-kill-stupid-messages.patch
-Patch1660: linux-2.6-input-usblegacy.patch
-Patch1670: linux-2.6-serial-tickle-nmi.patch
-Patch1690: linux-2.6-radeon-backlight.patch
-Patch1700: linux-2.6-ide-tune-locking.patch
-Patch1710: linux-2.6-autofs-pathlookup.patch
-Patch1720: linux-2.6-selinux-hush.patch
-Patch1721: linux-2.6-selinux-mprotect-checks.patch
-Patch1722: linux-2.6-selinux-disable-attributes-no-policy.patch
-Patch1723: linux-2.6-selinux-selinuxfs-hard-link-count.patch
-Patch1730: linux-2.6-ide-cd-shutup.patch
-Patch1740: linux-2.6-block-reduce-stack.patch
-Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
-Patch1770: linux-2.6-valid-ether-addr.patch
-Patch1780: linux-2.6-firmware-loader-timeout.patch
-Patch1790: linux-2.6-softcursor-persistent-alloc.patch
-Patch1800: linux-2.6-pwc-powerup-by-default.patch
-Patch1810: linux-2.6-smsc-ircc2-pnp.patch
-Patch1820: linux-2.6-audit-new-msg-types.patch
-Patch1830: linux-2.6-w1-hush-debug.patch
-Patch1840: linux-2.6-x86-hp-reboot.patch
-Patch1850: linux-2.6-mv643xx-compile-fix.patch
-Patch1860: linux-2.6-audit-allocation-in-atomic.patch
-Patch1890: linux-2.6-sched-up-migration-cost.patch
+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
+Patch1700: linux-2.6-w1-hush-debug.patch
+Patch1710: linux-2.6-sched-up-migration-cost.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
@@ -384,10 +384,15 @@
 Patch1910: linux-2.6-unexport-symbols.patch
 
 # VM bits.
-Patch2000: linux-2.6-vm-oomkiller-debugging.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-vm-clear-unreclaimable.patch
 
+# 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
+
 # Broadcom wireless driver
 Patch5000: linux-2.6-softmac-git.patch
 Patch5001: linux-2.6-bcm43xx-git.patch
@@ -406,6 +411,7 @@
 Patch10001: linux-2.6-random-patches.patch
 
 Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch
+Patch20010: linux-2.6-xen-cpusteal-hv.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -692,12 +698,14 @@
 %if %{buildxen}
 cd xen
 %patch20000 -p1
+%patch20010 -p1
 cd ..
 %endif
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
 %patch1 -p1
+%patch2 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -733,12 +741,20 @@
 %patch205 -p1
 # Microcode driver hotplug cpu issue.
 %patch206 -p1
+# Workaround BIOSes that don't list CPU0
+%patch207 -p1
+# Reboot through BIOS on HP systems,.
+%patch208 -p1
 
 # 
 # ppc64
 #
+# Shut up the platform function stuff on pmac
+%patch300 -p1
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
+# Fix gettimeofday in the 64bit vDSO.
+%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.
@@ -768,6 +784,8 @@
 %patch705 -p1
 %patch706 -p1
 %patch709 -p1
+#%patch710 -p1
+%patch711 -p1
 %endif
 
 #
@@ -862,10 +880,6 @@
 #
 %patch1070 -p1
 
-# Adjust some defaults.
-# Bump up the number of recursive symlinks.
-%patch1081 -p1
-
 #
 # SCSI Bits.
 #
@@ -890,6 +904,8 @@
 %patch1302 -p1
 # ipw2200 hwcrypto=0 by default to avoid firmware restarts
 %patch1303 -p1
+# add IPW2200_MONITOR config option
+%patch1304 -p1
 
 # Squashfs
 %patch1400 -p1
@@ -907,60 +923,43 @@
 #
 
 # Misc fixes
-# Fix incorrect n_link in proc
+# Add missing MODULE_VERSION tags to some modules.
 %patch1600 -p1
-# Make multimedia buttons on Dell Inspiron 8200 work.
+# The input layer spews crap no-one cares about.
 %patch1610 -p1
-# Add missing MODULE_VERSION tags to some modules.
+# Tickle the NMI whilst doing serial writes.
+%patch1620 -p1
+# Radeon on thinkpad backlight power-management goodness.
 %patch1630 -p1
-# The input layer spews crap no-one cares about.
+# 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
-# usb legacy workaround.
+# 
 %patch1660 -p1
-# Tickle the NMI whilst doing serial writes.
+# Use persistent allocation in softcursor
 %patch1670 -p1
-# Radeon on thinkpad backlight power-management goodness.
+# Power up PWC driver by default.
+%patch1680 -p1
+# PNP support for smsc-ircc2
 %patch1690 -p1
-# Fix IDE locking bug.
+# Silence debug messages in w1
 %patch1700 -p1
-# autofs4 looks up wrong path element when ghosting is enabled
+# Only print migration info on SMP
 %patch1710 -p1
+
 # Silence some selinux messages.
-%patch1720 -p1
+%patch1800 -p1
 # Fix the SELinux mprotect checks on executable mappings
-%patch1721 -p1
+%patch1801 -p1
 # Disable setting of security attributes on new inodes when no policy is loaded
-%patch1722 -p1
+%patch1802 -p1
 # Fix incorrect hardlink count in selinuxfs
-%patch1723 -p1
-
-# Silence noisy CD drive spew
-%patch1730 -p1
-# Reduce stack usage in block layer
-#%patch1740 -p1
-# Enable SATA ATAPI by default.
-%patch1760 -p1
-# 
-%patch1770 -p1
-# Increase timeout on firmware loader.
-%patch1780 -p1
-# Use persistent allocation in softcursor
-%patch1790 -p1
-# Power up PWC driver by default.
-%patch1800 -p1
-# PNP support for smsc-ircc2
-%patch1810 -p1
-%patch1820 -p1
-# Silence debug messages in w1
-%patch1830 -p1
-# Reboot through BIOS on HP laptops.
-%patch1840 -p1
-# Fix compilation for MV643xx Ethernet
-%patch1850 -p1
-# GFP_KERNEL allocations in atomic (auditsc)
-%patch1860 -p1
-# Only print migration info on SMP
-%patch1890 -p1
+%patch1803 -p1
+# Add some more audit message types.
+%patch1804 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -971,13 +970,21 @@
 #
 # VM related fixes.
 #
-# Extra debugging on OOM Kill.
-%patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
 # VM oom killer tweaks.
 %patch2002 -p1
 
+# Changes to upstream defaults.
+# Bump up the number of recursive symlinks.
+%patch2100 -p1
+# Use UTF-8 by default on VFAT.
+%patch2101 -p1
+# Enable SATA ATAPI by default.
+%patch2102 -p1
+# Increase timeout on firmware loader.
+%patch2103 -p1
+
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
 # be merged upstream
@@ -1590,15 +1597,53 @@
 %endif
 
 %changelog
+* Tue Feb 28 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+- rebase with rawhide 1.1993.
+
+* Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
+- Fix gettimeofday() in the 64-bit PowerPC vDSO
+
+* Mon Feb 27 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc5 & rc5-git1
+
+* Sun Feb 26 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git9 & -git10
+- Temporarily disable xen due to build breakage.
+
+* Sat Feb 25 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git8
+
 * Fri Feb 24 2006 Stephen Tweedie <sct at redhat.com>
 - Disable ia64 until we work out the Xen interactions
 - Fix config confusion on ia64
 - Execshield/vdso fixes (quintela at redhat.com)
 
+* Fri Feb 24 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git7
+
+* Fri Feb 24 2006 John W. Linville <linville at redhat.com>
+- Add/enable IPW2200_MONITOR config option for i686 and x86_64
+
+* Thu Feb 23 2006 David Woodhouse <dwmw2 at redhat.com>
+- Shut up the debugging messages from pmac platform stuff
+
+* Thu Feb 23 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git6
+
+* Tue Feb 21 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc4-git2
+- Make some more UP x86-64s able to boot an SMP kernel
+  by forcing the number of CPUs to at least 1.
+- default fat filesystems to use UTF-8
+
+* Tue Feb 21 2006 Rik van Riel <riel at redhat.com>
+- Make it possible to disable xen and kdump builds.
+- Add Xen cpu steal accounting code.
+
 * Mon Feb 20 2006 Stephen Tweedie <sct at redhat.com>
 - Rebase kernel xen patches to xen-unstable cset 8907
 
-* Mon Feb 20 2006 Dave Jones <davej at redhat.com>
+* Sun Feb 20 2006 Dave Jones <davej at redhat.com>
 - Fix incorrect hardlink count in selinuxfs (#182001)
 
 * Sat Feb 18 2006 Dave Jones <davej at redhat.com>

linux-2.6-radeon-backlight.patch:
 radeon_base.c |   11 +
 radeon_pm.c   |  557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 567 insertions(+), 1 deletion(-)

Index: linux-2.6-radeon-backlight.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v
retrieving revision 1.10
retrieving revision 1.10.20.1
diff -u -r1.10 -r1.10.20.1
--- linux-2.6-radeon-backlight.patch	17 Jan 2006 00:58:30 -0000	1.10
+++ linux-2.6-radeon-backlight.patch	28 Feb 2006 20:16:10 -0000	1.10.20.1
@@ -560,10 +560,10 @@
  
  	OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL)
  				  & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN));
-@@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in
- #endif
+@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in
  	}
- #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */
+ #endif /* defined(CONFIG_PPC_PMAC) */
+ #endif /* defined(CONFIG_PM) */
 +
 +/* The PM code also works on some PC laptops.
 + * Only a few models are actually tested so Your mileage may vary.

linux-2.6-xen.patch:
 linux-2.6.15.xen/include/xen/interface/version.h                          |   67 
 linux-2.6.16-rc4-xen0/arch/i386/Kconfig                                   |   98 
 linux-2.6.16-rc4-xen0/arch/i386/Kconfig.cpu                               |    2 
 linux-2.6.16-rc4-xen0/arch/i386/Makefile                                  |   18 
 linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile                         |   21 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/Makefile                           |   33 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/Makefile                      |    4 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/boot-xen.c                    | 1164 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/apic-xen.c                         |  140 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/asm-offsets.c                      |    2 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/Makefile                       |    5 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/common-xen.c                   |  667 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c                |  187 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/early_printk-xen.c                 |    2 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/entry-xen.S                        |  857 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/fixup.c                            |   95 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/head-xen.S                         |  208 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/init_task-xen.c                    |   51 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/io_apic-xen.c                      | 2728 ++++++++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/ioport-xen.c                       |  122 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/irq-xen.c                          |  306 +
 linux-2.6.16-rc4-xen0/arch/i386/kernel/ldt-xen.c                          |  269 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/microcode-xen.c                    |  164 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/mpparse-xen.c                      | 1182 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/pci-dma-xen.c                      |  344 +
 linux-2.6.16-rc4-xen0/arch/i386/kernel/process-xen.c                      |  833 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/quirks-xen.c                       |   48 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/setup-xen.c                        | 1888 ++++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/smp-xen.c                          |  617 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/swiotlb.c                          |  674 ++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/sysenter.c                         |   14 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/time-xen.c                         |  961 +++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/traps-xen.c                        | 1118 ++++
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vm86.c                             |    8 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vmlinux.lds.S                      |    4 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall-note-xen.S                |   32 
 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall.S                         |    2 
 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/Makefile                         |    7 
 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/setup.c                          |   37 
 linux-2.6.16-rc4-xen0/arch/i386/mm/Makefile                               |    8 
 linux-2.6.16-rc4-xen0/arch/i386/mm/fault-xen.c                            |  617 ++
 linux-2.6.16-rc4-xen0/arch/i386/mm/highmem-xen.c                          |  123 
 linux-2.6.16-rc4-xen0/arch/i386/mm/hypervisor.c                           |  468 +
 linux-2.6.16-rc4-xen0/arch/i386/mm/init-xen.c                             |  845 +++
 linux-2.6.16-rc4-xen0/arch/i386/mm/ioremap-xen.c                          |  462 +
 linux-2.6.16-rc4-xen0/arch/i386/mm/pgtable-xen.c                          |  630 ++
 linux-2.6.16-rc4-xen0/arch/i386/pci/Makefile                              |    9 
 linux-2.6.16-rc4-xen0/arch/i386/pci/irq-xen.c                             | 1202 ++++
 linux-2.6.16-rc4-xen0/arch/i386/pci/pcifront.c                            |   55 
 linux-2.6.16-rc4-xen0/arch/i386/power/Makefile                            |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/Kconfig                                   |   42 
 linux-2.6.16-rc4-xen0/arch/ia64/Makefile                                  |   10 
 linux-2.6.16-rc4-xen0/arch/ia64/hp/sim/Makefile                           |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/entry.S                            |   32 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/head.S                             |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/pal.S                              |    5 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/sal.c                              |    3 
 linux-2.6.16-rc4-xen0/arch/ia64/kernel/setup.c                            |    4 
 linux-2.6.16-rc4-xen0/arch/ia64/xen-mkbuildtree-post                      |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen-mkbuildtree-pre                       |   50 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/Makefile                              |    5 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/Makefile                      |   20 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/README                        |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/coreMakefile                  |   24 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/evtchn_ia64.c                 |  266 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch       |   33 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/console.c.patch       |   11 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch        |    2 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch        |   33 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch       |   30 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/drivers/xenia64_init.c                |   55 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/hypercall.S                           |  323 +
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xen_ksyms.c                           |   12 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenconsole.c                          |   19 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenentry.S                            |  850 +++
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenhpski.c                            |   19 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenivt.S                              | 2044 +++++++
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenminstate.h                         |  367 +
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xenpal.S                              |   73 
 linux-2.6.16-rc4-xen0/arch/ia64/xen/xensetup.S                            |   33 
 linux-2.6.16-rc4-xen0/arch/um/kernel/physmem.c                            |    4 
 linux-2.6.16-rc4-xen0/arch/x86_64/Kconfig                                 |   60 
 linux-2.6.16-rc4-xen0/arch/x86_64/Makefile                                |   16 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/Makefile                           |   20 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/ia32entry-xen.S                    |  721 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32-xen.c                    |  128 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/Makefile                         |   18 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/acpi/Makefile                    |    1 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/apic-xen.c                       |  198 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/asm-offsets.c                    |    2 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/e820-xen.c                       |  744 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/early_printk-xen.c               |  306 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/entry-xen.S                      | 1132 ++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic-xen.c                    |  144 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic_xen.c                    |  162 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head-xen.S                       |  152 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head64-xen.c                     |  140 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/init_task.c                      |    3 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/io_apic-xen.c                    | 2217 ++++++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ioport-xen.c                     |   58 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/irq-xen.c                        |  168 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ldt-xen.c                        |  282 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/mpparse-xen.c                    | 1005 +++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c                |   54 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/process-xen.c                    |  810 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup-xen.c                      | 1629 +++++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup64-xen.c                    |  360 +
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/smp-xen.c                        |  596 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/traps-xen.c                      | 1029 +++
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/vsyscall-xen.c                   |  239 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c                |  172 
 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/xen_entry.S                      |   41 
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/Makefile                             |   10 
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/fault-xen.c                          |  595 ++
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/init-xen.c                           | 1107 ++++
 linux-2.6.16-rc4-xen0/arch/x86_64/mm/pageattr-xen.c                       |  392 +
 linux-2.6.16-rc4-xen0/arch/x86_64/pci/Makefile                            |   12 
 linux-2.6.16-rc4-xen0/drivers/Makefile                                    |    1 
 linux-2.6.16-rc4-xen0/drivers/acpi/Kconfig                                |    2 
 linux-2.6.16-rc4-xen0/drivers/acpi/tables.c                               |    7 
 linux-2.6.16-rc4-xen0/drivers/char/mem.c                                  |    6 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/Kconfig                            |   14 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/Makefile                           |    1 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.c                              |   44 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.h                              |    7 
 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm_xen.c                          |  536 +
 linux-2.6.16-rc4-xen0/drivers/char/tty_io.c                               |    7 
 linux-2.6.16-rc4-xen0/drivers/firmware/Kconfig                            |    2 
 linux-2.6.16-rc4-xen0/drivers/pci/Kconfig                                 |    1 
 linux-2.6.16-rc4-xen0/drivers/serial/Kconfig                              |    1 
 linux-2.6.16-rc4-xen0/drivers/video/Kconfig                               |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/Kconfig                                 |  192 
 linux-2.6.16-rc4-xen0/drivers/xen/Makefile                                |   22 
 linux-2.6.16-rc4-xen0/drivers/xen/balloon/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/balloon/balloon.c                       |  585 ++
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/blkback.c                       |  590 ++
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/common.h                        |  123 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/interface.c                     |  164 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/vbd.c                           |  102 
 linux-2.6.16-rc4-xen0/drivers/xen/blkback/xenbus.c                        |  421 +
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/Makefile                       |    5 
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/blkfront.c                     |  834 +++
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/block.h                        |  162 
 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/vbd.c                          |  323 +
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/Makefile                         |    3 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/blktap.c                         |  910 +++
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/common.h                         |  110 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/interface.c                      |  146 
 linux-2.6.16-rc4-xen0/drivers/xen/blktap/xenbus.c                         |  234 
 linux-2.6.16-rc4-xen0/drivers/xen/char/Makefile                           |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/char/mem.c                              |  156 
 linux-2.6.16-rc4-xen0/drivers/xen/console/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/console/console.c                       |  647 ++
 linux-2.6.16-rc4-xen0/drivers/xen/console/xencons_ring.c                  |  125 
 linux-2.6.16-rc4-xen0/drivers/xen/core/Makefile                           |    9 
 linux-2.6.16-rc4-xen0/drivers/xen/core/evtchn.c                           |  823 +++
 linux-2.6.16-rc4-xen0/drivers/xen/core/features.c                         |   29 
 linux-2.6.16-rc4-xen0/drivers/xen/core/gnttab.c                           |  432 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/reboot.c                           |  442 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/skbuff.c                           |  143 
 linux-2.6.16-rc4-xen0/drivers/xen/core/smpboot.c                          |  449 +
 linux-2.6.16-rc4-xen0/drivers/xen/core/xen_proc.c                         |   29 
 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/Makefile                         |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/evtchn.c                         |  459 +
 linux-2.6.16-rc4-xen0/drivers/xen/net_driver_util.c                       |   67 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/common.h                        |  110 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/interface.c                     |  320 +
 linux-2.6.16-rc4-xen0/drivers/xen/netback/loopback.c                      |  202 
 linux-2.6.16-rc4-xen0/drivers/xen/netback/netback.c                       |  833 +++
 linux-2.6.16-rc4-xen0/drivers/xen/netback/xenbus.c                        |  327 +
 linux-2.6.16-rc4-xen0/drivers/xen/netfront/Makefile                       |    4 
 linux-2.6.16-rc4-xen0/drivers/xen/netfront/netfront.c                     | 1490 +++++
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/Makefile                        |   10 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.c                    |  324 +
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.h                    |   97 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space_header.c             |  269 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/passthrough.c                   |  116 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pci_stub.c                      |  377 +
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback.h                       |   73 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback_ops.c                   |   84 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/vpci.c                          |  163 
 linux-2.6.16-rc4-xen0/drivers/xen/pciback/xenbus.c                        |  439 +
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/Makefile                       |    7 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci.c                          |   44 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci_op.c                       |  245 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pcifront.h                     |   40 
 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/xenbus.c                       |  295 +
 linux-2.6.16-rc4-xen0/drivers/xen/privcmd/Makefile                        |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/privcmd/privcmd.c                       |  302 +
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/Makefile                        |    4 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/common.h                        |   89 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/interface.c                     |  197 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/tpmback.c                       | 1105 ++++
 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/xenbus.c                        |  328 +
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/Makefile                       |    2 
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.c                     |  713 ++
 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.h                     |   40 
 linux-2.6.16-rc4-xen0/drivers/xen/util.c                                  |   80 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/Makefile                         |    8 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_client.c                  |  403 +
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.c                   |  203 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.h                   |   50 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_dev.c                     |  238 
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_probe.c                   | 1015 +++
 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_xs.c                      |  821 +++
 linux-2.6.16-rc4-xen0/fs/Kconfig                                          |    1 
 linux-2.6.16-rc4-xen0/include/asm-i386/apic.h                             |    2 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/agp.h                 |   37 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/desc.h                |  162 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h         |  156 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/fixmap.h              |  165 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/floppy.h              |  147 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/highmem.h             |   81 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hw_irq.h              |   73 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypercall.h           |  323 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypervisor.h          |  166 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/io.h                  |  401 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/kmap_types.h          |   32 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu.h                 |   21 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu_context.h         |  105 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/page.h                |  324 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/param.h               |   24 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pci.h                 |  154 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgalloc.h             |   64 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h |   21 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h      |   83 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   25 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h      |  181 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable.h             |  512 +
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/processor.h           |  762 ++
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/ptrace.h              |   90 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/segment.h             |  113 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/setup.h               |   66 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/smp.h                 |  103 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/spinlock.h            |  217 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h        |  141 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/system.h              |  679 ++
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/tlbflush.h            |  102 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/vga.h                 |   20 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/irq_vectors.h             |  125 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/mach_traps.h              |   33 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_post.h         |   43 
 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_pre.h          |    5 
 linux-2.6.16-rc4-xen0/include/asm-i386/spinlock.h                         |    6 
 linux-2.6.16-rc4-xen0/include/asm-i386/system.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-ia64/fixmap.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-ia64/gcc_intrin.h                       |   60 
 linux-2.6.16-rc4-xen0/include/asm-ia64/hypercall.h                        |  500 +
 linux-2.6.16-rc4-xen0/include/asm-ia64/hypervisor.h                       |   70 
 linux-2.6.16-rc4-xen0/include/asm-ia64/intel_intrin.h                     |   68 
 linux-2.6.16-rc4-xen0/include/asm-ia64/pal.h                              |    1 
 linux-2.6.16-rc4-xen0/include/asm-ia64/privop.h                           |   59 
 linux-2.6.16-rc4-xen0/include/asm-ia64/processor.h                        |    1 
 linux-2.6.16-rc4-xen0/include/asm-ia64/synch_bitops.h                     |   61 
 linux-2.6.16-rc4-xen0/include/asm-ia64/system.h                           |    4 
 linux-2.6.16-rc4-xen0/include/asm-ia64/xen/privop.h                       |  272 
 linux-2.6.16-rc4-xen0/include/asm-um/page.h                               |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/apic.h                           |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h         |   42 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/desc.h              |  263 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  191 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h            |  111 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/floppy.h            |  206 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h            |  141 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h         |  323 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/io.h                |  359 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/irq.h               |   39 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu.h               |   33 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h       |  134 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/nmi.h               |   75 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/page.h              |  317 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pci.h               |  176 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h           |  199 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h           |  560 ++
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/processor.h         |  503 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h            |  125 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/segment.h           |   44 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/smp.h               |  152 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/system.h            |  434 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h          |  104 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/xor.h               |  328 +
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_time.h             |  122 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h       |   52 
 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 linux-2.6.16-rc4-xen0/include/linux/gfp.h                                 |    6 
 linux-2.6.16-rc4-xen0/include/linux/highmem.h                             |    6 
 linux-2.6.16-rc4-xen0/include/linux/irq.h                                 |    3 
 linux-2.6.16-rc4-xen0/include/linux/mm.h                                  |   13 
 linux-2.6.16-rc4-xen0/include/linux/skbuff.h                              |   13 
 linux-2.6.16-rc4-xen0/include/xen/balloon.h                               |   70 
 linux-2.6.16-rc4-xen0/include/xen/driver_util.h                           |   26 
 linux-2.6.16-rc4-xen0/include/xen/evtchn.h                                |  123 
 linux-2.6.16-rc4-xen0/include/xen/features.h                              |   20 
 linux-2.6.16-rc4-xen0/include/xen/foreign_page.h                          |   40 
 linux-2.6.16-rc4-xen0/include/xen/gnttab.h                                |  119 
 linux-2.6.16-rc4-xen0/include/xen/interface/COPYING                       |   28 
 linux-2.6.16-rc4-xen0/include/xen/interface/acm.h                         |  181 
 linux-2.6.16-rc4-xen0/include/xen/interface/acm_ops.h                     |   96 
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-ia64.h                   |  314 +
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_32.h                 |  158 
 linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_64.h                 |  243 
 linux-2.6.16-rc4-xen0/include/xen/interface/dom0_ops.h                    |  488 +
 linux-2.6.16-rc4-xen0/include/xen/interface/event_channel.h               |  203 
 linux-2.6.16-rc4-xen0/include/xen/interface/grant_table.h                 |  306 +
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/hvm_info_table.h          |   24 
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/ioreq.h                   |   90 
 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/vmx_assist.h              |   97 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/blkif.h                    |   85 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/console.h                  |   33 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/netif.h                    |   76 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/pciif.h                    |   55 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/ring.h                     |  270 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/tpmif.h                    |   56 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/xenbus.h                   |   44 
 linux-2.6.16-rc4-xen0/include/xen/interface/io/xs_wire.h                  |   97 
 linux-2.6.16-rc4-xen0/include/xen/interface/memory.h                      |  149 
 linux-2.6.16-rc4-xen0/include/xen/interface/nmi.h                         |   54 
 linux-2.6.16-rc4-xen0/include/xen/interface/physdev.h                     |   70 
 linux-2.6.16-rc4-xen0/include/xen/interface/sched.h                       |   60 
 linux-2.6.16-rc4-xen0/include/xen/interface/sched_ctl.h                   |   68 
 linux-2.6.16-rc4-xen0/include/xen/interface/trace.h                       |   90 
 linux-2.6.16-rc4-xen0/include/xen/interface/vcpu.h                        |   64 
 linux-2.6.16-rc4-xen0/include/xen/interface/xen.h                         |  447 +
 linux-2.6.16-rc4-xen0/include/xen/net_driver_util.h                       |   56 
 linux-2.6.16-rc4-xen0/include/xen/pcifront.h                              |   39 
 linux-2.6.16-rc4-xen0/include/xen/public/evtchn.h                         |   98 
 linux-2.6.16-rc4-xen0/include/xen/public/privcmd.h                        |   91 
 linux-2.6.16-rc4-xen0/include/xen/public/xenstored.h                      |   89 
 linux-2.6.16-rc4-xen0/include/xen/tpmfe.h                                 |   40 
 linux-2.6.16-rc4-xen0/include/xen/xen_proc.h                              |   23 
 linux-2.6.16-rc4-xen0/include/xen/xenbus.h                                |  298 +
 linux-2.6.16-rc4-xen0/include/xen/xencons.h                               |   14 
 linux-2.6.16-rc4-xen0/kernel/Kconfig.preempt                              |    1 
 linux-2.6.16-rc4-xen0/kernel/irq/manage.c                                 |   84 
 linux-2.6.16-rc4-xen0/lib/Kconfig.debug                                   |    2 
 linux-2.6.16-rc4-xen0/lib/Makefile                                        |    3 
 linux-2.6.16-rc4-xen0/mm/Kconfig                                          |    3 
 linux-2.6.16-rc4-xen0/mm/highmem.c                                        |   11 
 linux-2.6.16-rc4-xen0/mm/memory.c                                         |  112 
 linux-2.6.16-rc4-xen0/mm/mmap.c                                           |    4 
 linux-2.6.16-rc4-xen0/mm/page_alloc.c                                     |    6 
 linux-2.6.16-rc4-xen0/net/core/dev.c                                      |   50 
 linux-2.6.16-rc4-xen0/net/core/skbuff.c                                   |   41 
 linux-2.6.16-rc4-xen0/scripts/Makefile.xen                                |   14 
 linux-2.6.16-rc4-xen0/scripts/kconfig/zconf.hash.c                        |  231 
 360 files changed, 77223 insertions(+), 180 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-xen.patch,v
retrieving revision 1.1.46.1
retrieving revision 1.1.46.2
diff -u -r1.1.46.1 -r1.1.46.2
--- linux-2.6-xen.patch	23 Feb 2006 21:36:14 -0000	1.1.46.1
+++ linux-2.6-xen.patch	28 Feb 2006 20:16:10 -0000	1.1.46.2
@@ -25723,15 +25723,6 @@
  	default y
  	help
  	  Use the IA-PC HPET (High Precision Event Timer) to manage
-@@ -356,7 +383,7 @@ config HPET_TIMER
- 
- config X86_PM_TIMER
- 	bool "PM timer" if EMBEDDED
--	depends on ACPI
-+	depends on ACPI && !X86_64_XEN
- 	default y
- 	help
- 	  Support the ACPI PM timer for time keeping. This is slow,
 @@ -377,7 +404,7 @@ config GART_IOMMU
  	bool "K8 GART IOMMU support"
  	default y
@@ -79657,19 +79648,6 @@
  
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/Makefile linux-2.6.16-rc4-xen0/Makefile
---- ref-linux-2.6.16-rc4/Makefile	2006-02-22 15:51:43.000000000 +0100
-+++ linux-2.6.16-rc4-xen0/Makefile	2006-02-22 15:52:53.000000000 +0100
-@@ -1,7 +1,8 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 16
--EXTRAVERSION =-rc4
-+EXTRAVERSION =-rc4$(XENGUEST)
-+XENGUEST = -xen0
- NAME=Sliding Snow Leopard
- 
- # *DOCUMENTATION*
 diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/mm/highmem.c linux-2.6.16-rc4-xen0/mm/highmem.c
 --- ref-linux-2.6.16-rc4/mm/highmem.c	2006-01-03 04:21:10.000000000 +0100
 +++ linux-2.6.16-rc4-xen0/mm/highmem.c	2006-02-22 13:44:45.000000000 +0100


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.299
retrieving revision 1.299.2.1
diff -u -r1.299 -r1.299.2.1
--- sources	17 Feb 2006 23:06:18 -0000	1.299
+++ sources	28 Feb 2006 20:16:28 -0000	1.299.2.1
@@ -1,3 +1,2 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
-732ab210ad0c7df8d944766a50b691c8  patch-2.6.16-rc4.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.274
retrieving revision 1.274.2.1
diff -u -r1.274 -r1.274.2.1
--- upstream	17 Feb 2006 23:06:18 -0000	1.274
+++ upstream	28 Feb 2006 20:16:28 -0000	1.274.2.1
@@ -1,2 +1 @@
 linux-2.6.15.tar.bz2
-patch-2.6.16-rc4.bz2


--- linux-2.6-atkbd-dell-multimedia.patch DELETED ---


--- linux-2.6-audit-allocation-in-atomic.patch DELETED ---


--- linux-2.6-block-reduce-stack.patch DELETED ---


--- linux-2.6-firmware-loader-timeout.patch DELETED ---


--- linux-2.6-input-usblegacy.patch DELETED ---


--- linux-2.6-ipw2200-hwcrypto.patch DELETED ---


--- linux-2.6-max-symlinks.patch DELETED ---


--- linux-2.6-mv643xx-compile-fix.patch DELETED ---


--- linux-2.6-procfs-i_nlink-miscalculate.patch DELETED ---


--- linux-2.6-sata-enable-atapi-by-default.patch DELETED ---


--- linux-2.6-vm-oomkiller-debugging.patch DELETED ---


--- linux-2.6-xen-compile.patch DELETED ---


--- patch-2.6.16-rc4.bz2.sign DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:18:12 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:18:12 -0500
Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1595.2.1,1.1595.2.2
Message-ID: <200602282018.k1SKICQl002066@cvs.devel.redhat.com>

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1933

Modified Files:
      Tag: private-linville-netdev-fc4-11-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1595.2.1
retrieving revision 1.1595.2.2
diff -u -r1.1595.2.1 -r1.1595.2.2
--- kernel-2.6.spec	28 Feb 2006 19:55:09 -0000	1.1595.2.1
+++ kernel-2.6.spec	28 Feb 2006 20:18:07 -0000	1.1595.2.2
@@ -19,7 +19,8 @@
 %define sublevel 15
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .netdev.11
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys}
 %define signmodules 0
 %define make_target bzImage



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:23:54 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:23:54 -0500
Subject: rpms/gnbd-kernel/devel kmodtool, NONE, 1.1 gnbd-kernel.spec, 1.135,
	1.136
Message-ID: <200602282023.k1SKNsog012413@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12352

Modified Files:
	gnbd-kernel.spec 
Added Files:
	kmodtool 
Log Message:
- Convert to the new kmod-scheme from Extras
  (using Thorsten Leemhuis' cman-kernel diff)




--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

myprog="kmodtool"
myver="0.10.4"
knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
}

print_verrel ()
{
  get_verrel $@ || return $?
  echo "${verrel}"
}

get_variant ()
{
  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
}

print_variant ()
{
  get_variant $@ || return $?
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    case "$verrel" in
        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
    esac
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-module = ${verrel}${variant}
Provides:         kmod-${kmod_name} = %{version}-%{release}
Requires:         ${kdep}
Requires:         ${kmod_name}-kmod-common = %{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- gnbd-kernel.spec	23 Feb 2006 20:46:55 -0000	1.135
+++ gnbd-kernel.spec	28 Feb 2006 20:23:51 -0000	1.136
@@ -11,39 +11,43 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 1
+%define buildxen 0
 %define kernel_version 2.6.15-1.1975_FC5
+%define kversion %{kernel_version}
 %define subversion 2
+%define tempversion 2.6.15
+%define tempname gnbd-kernel
 
 %ifnarch i686
 %define buildsmp 0
 %endif 
 
-%ifnarch i686
-%define buildxen 0
+%ifnarch i686 x86_64
+%define buildxen 1
 %endif
 
-Name: gnbd-kernel
-Version: 2.6.15
-Release: 5.FC5.9
+%define kvariants %{?buildup:""} %{?buildsmp:smp}
+
+Source10: kmodtool
+%define   kmodtool sh %{SOURCE10}
+# end stuff to be ...
+
+%define kmod_name gnbd
+%define kverrel   %(%{kmodtool} verrel  %{?kversion} 2>/dev/null)
+%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kversion} 2>/dev/null)}
+
+
+
+Name: %{kmod_name}-kmod
+Version: 1.0.0
+Release: 0.1.%(echo %{kverrel} | tr - _)
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
-BuildRequires: kernel = %{kernel_version}
-BuildRequires: kernel-smp = %{kernel_version}
-BuildRequires: kernel-devel = %{kernel_version}
-BuildRequires: kernel-smp-devel = %{kernel_version}
-BuildRequires: kernel-xen-guest = %{kernel_version}
-BuildRequires: kernel-xen-hypervisor = %{kernel_version}
 Conflicts: GFS <= 6.0
-Conflicts: GFS-modules
-Requires: kernel = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}
-Provides: gnbd-kernel-modules = %{version}-%{release}
-Provides: kernel-modules
-#ExclusiveArch: i586 i686 x86_64 ppc 
+Conflicts: GFS-modules GFS-modules-smp GFS-modules-hugemem
 ExclusiveArch: i686 x86_64
-Source0: %{name}-%{version}-%{subversion}.tar.gz
+Source0: %{tempname}-%{tempversion}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -56,167 +60,60 @@
 %description -n gnbd-kernheaders
 The gnbd kernel headers are used to compile the gnbd userland tools.
 
-%if %{buildsmp}
-%package -n gnbd-kernel-smp
-Group: System Environment/Kernel
-Summary: gnbd-kernel-smp - The kernel module for GFS's Network Block Device
-Requires: kernel-smp = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}smp
-Provides: gnbd-kernel-modules = %{version}-%{release}
-Provides: kernel-modules
-
-%description -n gnbd-kernel-smp
-gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
-%endif
+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
 
-%if %{buildxen}
-%package -n gnbd-kernel-xen-guest
-Group: System Environment/Kernel
-Summary: gnbd-kernel-xen-guest - The kernel module for GFS's Network Block Device
-Requires: kernel-xen-guest = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}guest
-Provides: gnbd-kernel-modules = %{version}-%{release}
-Provides: kernel-modules
-
-%description -n gnbd-kernel-xen-guest
-gnbd-kernel-xen-guest - The xen-guest kernel module for GFS's Network Block Device
-
-%package -n gnbd-kernel-xen-hypervisor
-Group: System Environment/Kernel
-Summary: gnbd-kernel-xen-hypservisor - The kernel module for GFS's Network Block Device
-Requires: kernel-xen-hypservisor = %{kernel_version}
-Requires: /lib/modules/%{kernel_version}hypervisor
-Provides: kernel-modules
-Provides: gnbd-kernel-modules = %{version}-%{release}
-
-%description -n gnbd-kernel-xen-hypervisor
-gnbd-kernel-xen-hypervisor - The xen-hypervisor kernel module for GFS's Network Block Device
-
-%endif
-################################################################################
-##  THE PREP SECTION
-################################################################################
 %prep
-%setup -q -n %{name}-%{version}-%{subversion}
+# to understand the magic better or to debug it, uncomment this:
+#{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null ; sleep 5
+%setup -q -c -T -a 0
+for kvariant in %{kvariants} ; do
+    cp -a %{kmod_name}-kernel-%{tempversion}-%{subversion}/  _kmod_build_$kvariant
+done
 
-################################################################################
-##  THE BUILD SECTION
-################################################################################
 %build
-BUILD_TOPDIR=`pwd`
-
-cp -r `pwd` ../smp
-cp -r `pwd` ../guest
-cp -r `pwd` ../hypervisor
-
-Build_gnbd(){
-	cpu_type=$1
-	flavor=$2
-	kernel_src=/lib/modules/%{kernel_version}$flavor/build
-	# Kernel tree setup
-	if [ -d $kernel_src/. ]; then
-		echo "Kernel %{kernel_version} found."
-		echo $kernel_src
-	else
-		echo "Kernel %{kernel_version} not found."
-		echo $kernel_src
-		ls /lib/modules/*
-		exit 1
-	fi
-        ./configure --kernel_src=$kernel_src --incdir=%{_includedir}
-        if [ "$flavor" == "xen-guest" -o "$flavor" == "xen-hypervisor" ]; then
-                make ARCH=xen %{?_smp_mflags}
-        else
-                make %{?_smp_mflags}
-        fi
-}
-
-%if %{buildup}
-Build_gnbd %{_target_cpu}
-%endif
-
-%if %{buildsmp}
-cd ../smp
-Build_gnbd %{_target_cpu} smp
-%endif
+for kvariant in %{kvariants}
+do
+    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
+    pushd _kmod_build_$kvariant
+    ./configure --kernel_src=${ksrc} --incdir=%{_includedir}
+    if [ "${kvariant}" == "xenU" -o "${kvariant}" == "xen0" ]; then
+        make %{?_smp_mflags} KMODTARGET=/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name} ARCH=xen 
+    else
+        make %{?_smp_mflags} KMODTARGET=/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
+    fi
+    ${ksrc}/scripts/mod/modpost -m -i ${ksrc}/Module.symvers src/cman.o -o cman.symvers
+    popd
+done
 
-%if %{buildxen}
-cd ../guest
-Build_gnbd %{_target_cpu} guest
-
-cd ../hypervisor
-Build_gnbd %{_target_cpu} hypervisor
-%endif
-
-################################################################################
-##  THE INSTALL SECTION
-################################################################################
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{buildup}
-make install DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%if %{buildsmp}
-cd ../smp
-make install DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%if %{buildxen}
-cd ../guest
-make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
-cd ../hypervisor
-make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
-%endif
+for kvariant in %{kvariants}
+do
+    pushd _kmod_build_${kvariant}
+    if [ "${kvariant}" == "xenU" -o "${kvariant}" == "xen0" ]; then
+        make install DESTDIR=${RPM_BUILD_ROOT} KMODTARGET=${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name} ARCH=xen 
+    else
+        make install DESTDIR=${RPM_BUILD_ROOT} KMODTARGET=${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
+    fi
+    install -p cman.symvers ${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
+    popd
+done
+chmod 0755 $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*
 
 
-################################################################################
-##  THE CLEAN SECTION
-################################################################################
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/depmod -e %{kernel_version}
-
-%if %{buildsmp}
-%post smp
-/sbin/depmod -e %{kernel_version}smp
-%endif
-
-%if %{buildxen}
-%post xen-guest
-/sbin/depmod -e %{kernel_version}guest
-%post xen-hypervisor
-/sbin/depmod -a %{kernel_version}hypervisor
-%endif
-
-%files
-%defattr(-,root,root,-)
-/lib/modules/%{kernel_version}/kernel/drivers/block/gnbd/gnbd.ko
-
-%if %{buildsmp}
-%files -n gnbd-kernel-smp
-%defattr(-,root,root,-)
-/lib/modules/%{kernel_version}smp/kernel/drivers/block/gnbd/gnbd.ko
-%endif
-
-%if %{buildxen}
-%files -n gnbd-kernel-xen-guest
-%defattr(-,root,root,-)
-/lib/modules/%{kernel_version}guest/kernel/drivers/block/gnbd/gnbd.ko
-
-%files -n gnbd-kernel-xen-hypervisor
-%defattr(-,root,root,-)
-/lib/modules/%{kernel_version}hypervisor/kernel/drivers/block/gnbd/gnbd.ko
-%endif
-
 %files -n gnbd-kernheaders
 %defattr(-,root,root,-)
 %{_includedir}/linux/gnbd.h
 
 %changelog
+* Tue Feb 28 2006 Chris Feist <cfeist at Redhat.com>
+- Convert to the new kmod-scheme from Extras
+  (using Thorsten Leemhuis' cman-kernel diff)
+
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051108.134753.FC5.18.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:48:19 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:48:19 -0500
Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec, 1.136, 1.137 kmodtool, 1.1,
	NONE
Message-ID: <200602282048.k1SKmJ3G027258@cvs.devel.redhat.com>

Author: cfeist

Update of /cvs/dist/rpms/gnbd-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27113

Modified Files:
	gnbd-kernel.spec 
Removed Files:
	kmodtool 
Log Message:
Reverted from new kmod setup


Index: gnbd-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- gnbd-kernel.spec	28 Feb 2006 20:23:51 -0000	1.136
+++ gnbd-kernel.spec	28 Feb 2006 20:48:14 -0000	1.137
@@ -11,43 +11,39 @@
 ###############################################################################
 %define buildup 1
 %define buildsmp 1
-%define buildxen 0
+%define buildxen 1
 %define kernel_version 2.6.15-1.1975_FC5
-%define kversion %{kernel_version}
 %define subversion 2
-%define tempversion 2.6.15
-%define tempname gnbd-kernel
 
 %ifnarch i686
 %define buildsmp 0
 %endif 
 
-%ifnarch i686 x86_64
-%define buildxen 1
+%ifnarch i686
+%define buildxen 0
 %endif
 
-%define kvariants %{?buildup:""} %{?buildsmp:smp}
-
-Source10: kmodtool
-%define   kmodtool sh %{SOURCE10}
-# end stuff to be ...
-
-%define kmod_name gnbd
-%define kverrel   %(%{kmodtool} verrel  %{?kversion} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kversion} 2>/dev/null)}
-
-
-
-Name: %{kmod_name}-kmod
-Version: 1.0.0
-Release: 0.1.%(echo %{kverrel} | tr - _)
+Name: gnbd-kernel
+Version: 2.6.15
+Release: 5.FC5.9
 License: GPL
 Group: System Environment/Kernel
 Summary: gnbd-kernel - The kernel module for GFS's Network Block Device
+BuildRequires: kernel = %{kernel_version}
+BuildRequires: kernel-smp = %{kernel_version}
+BuildRequires: kernel-devel = %{kernel_version}
+BuildRequires: kernel-smp-devel = %{kernel_version}
+BuildRequires: kernel-xen-guest = %{kernel_version}
+BuildRequires: kernel-xen-hypervisor = %{kernel_version}
 Conflicts: GFS <= 6.0
-Conflicts: GFS-modules GFS-modules-smp GFS-modules-hugemem
+Conflicts: GFS-modules
+Requires: kernel = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}
+Provides: gnbd-kernel-modules = %{version}-%{release}
+Provides: kernel-modules
+#ExclusiveArch: i586 i686 x86_64 ppc 
 ExclusiveArch: i686 x86_64
-Source0: %{tempname}-%{tempversion}-%{subversion}.tar.gz
+Source0: %{name}-%{version}-%{subversion}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -60,60 +56,167 @@
 %description -n gnbd-kernheaders
 The gnbd kernel headers are used to compile the gnbd userland tools.
 
-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
+%if %{buildsmp}
+%package -n gnbd-kernel-smp
+Group: System Environment/Kernel
+Summary: gnbd-kernel-smp - The kernel module for GFS's Network Block Device
+Requires: kernel-smp = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}smp
+Provides: gnbd-kernel-modules = %{version}-%{release}
+Provides: kernel-modules
+
+%description -n gnbd-kernel-smp
+gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device
+%endif
 
+%if %{buildxen}
+%package -n gnbd-kernel-xen-guest
+Group: System Environment/Kernel
+Summary: gnbd-kernel-xen-guest - The kernel module for GFS's Network Block Device
+Requires: kernel-xen-guest = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}guest
+Provides: gnbd-kernel-modules = %{version}-%{release}
+Provides: kernel-modules
+
+%description -n gnbd-kernel-xen-guest
+gnbd-kernel-xen-guest - The xen-guest kernel module for GFS's Network Block Device
+
+%package -n gnbd-kernel-xen-hypervisor
+Group: System Environment/Kernel
+Summary: gnbd-kernel-xen-hypservisor - The kernel module for GFS's Network Block Device
+Requires: kernel-xen-hypservisor = %{kernel_version}
+Requires: /lib/modules/%{kernel_version}hypervisor
+Provides: kernel-modules
+Provides: gnbd-kernel-modules = %{version}-%{release}
+
+%description -n gnbd-kernel-xen-hypervisor
+gnbd-kernel-xen-hypervisor - The xen-hypervisor kernel module for GFS's Network Block Device
+
+%endif
+################################################################################
+##  THE PREP SECTION
+################################################################################
 %prep
-# to understand the magic better or to debug it, uncomment this:
-#{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null ; sleep 5
-%setup -q -c -T -a 0
-for kvariant in %{kvariants} ; do
-    cp -a %{kmod_name}-kernel-%{tempversion}-%{subversion}/  _kmod_build_$kvariant
-done
+%setup -q -n %{name}-%{version}-%{subversion}
 
+################################################################################
+##  THE BUILD SECTION
+################################################################################
 %build
-for kvariant in %{kvariants}
-do
-    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
-    pushd _kmod_build_$kvariant
-    ./configure --kernel_src=${ksrc} --incdir=%{_includedir}
-    if [ "${kvariant}" == "xenU" -o "${kvariant}" == "xen0" ]; then
-        make %{?_smp_mflags} KMODTARGET=/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name} ARCH=xen 
-    else
-        make %{?_smp_mflags} KMODTARGET=/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
-    fi
-    ${ksrc}/scripts/mod/modpost -m -i ${ksrc}/Module.symvers src/cman.o -o cman.symvers
-    popd
-done
+BUILD_TOPDIR=`pwd`
+
+cp -r `pwd` ../smp
+cp -r `pwd` ../guest
+cp -r `pwd` ../hypervisor
+
+Build_gnbd(){
+	cpu_type=$1
+	flavor=$2
+	kernel_src=/lib/modules/%{kernel_version}$flavor/build
+	# Kernel tree setup
+	if [ -d $kernel_src/. ]; then
+		echo "Kernel %{kernel_version} found."
+		echo $kernel_src
+	else
+		echo "Kernel %{kernel_version} not found."
+		echo $kernel_src
+		ls /lib/modules/*
+		exit 1
+	fi
+        ./configure --kernel_src=$kernel_src --incdir=%{_includedir}
+        if [ "$flavor" == "xen-guest" -o "$flavor" == "xen-hypervisor" ]; then
+                make ARCH=xen %{?_smp_mflags}
+        else
+                make %{?_smp_mflags}
+        fi
+}
+
+%if %{buildup}
+Build_gnbd %{_target_cpu}
+%endif
+
+%if %{buildsmp}
+cd ../smp
+Build_gnbd %{_target_cpu} smp
+%endif
 
+%if %{buildxen}
+cd ../guest
+Build_gnbd %{_target_cpu} guest
+
+cd ../hypervisor
+Build_gnbd %{_target_cpu} hypervisor
+%endif
+
+################################################################################
+##  THE INSTALL SECTION
+################################################################################
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for kvariant in %{kvariants}
-do
-    pushd _kmod_build_${kvariant}
-    if [ "${kvariant}" == "xenU" -o "${kvariant}" == "xen0" ]; then
-        make install DESTDIR=${RPM_BUILD_ROOT} KMODTARGET=${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name} ARCH=xen 
-    else
-        make install DESTDIR=${RPM_BUILD_ROOT} KMODTARGET=${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
-    fi
-    install -p cman.symvers ${RPM_BUILD_ROOT}/lib/modules/%{kverrel}${kvariant:+$kvariant}/extra/%{kmod_name}
-    popd
-done
-chmod 0755 $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*
+%if %{buildup}
+make install DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%if %{buildsmp}
+cd ../smp
+make install DESTDIR=$RPM_BUILD_ROOT
+%endif
+
+%if %{buildxen}
+cd ../guest
+make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
+cd ../hypervisor
+make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen
+%endif
 
 
+################################################################################
+##  THE CLEAN SECTION
+################################################################################
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/depmod -e %{kernel_version}
+
+%if %{buildsmp}
+%post smp
+/sbin/depmod -e %{kernel_version}smp
+%endif
+
+%if %{buildxen}
+%post xen-guest
+/sbin/depmod -e %{kernel_version}guest
+%post xen-hypervisor
+/sbin/depmod -a %{kernel_version}hypervisor
+%endif
+
+%files
+%defattr(-,root,root,-)
+/lib/modules/%{kernel_version}/kernel/drivers/block/gnbd/gnbd.ko
+
+%if %{buildsmp}
+%files -n gnbd-kernel-smp
+%defattr(-,root,root,-)
+/lib/modules/%{kernel_version}smp/kernel/drivers/block/gnbd/gnbd.ko
+%endif
+
+%if %{buildxen}
+%files -n gnbd-kernel-xen-guest
+%defattr(-,root,root,-)
+/lib/modules/%{kernel_version}guest/kernel/drivers/block/gnbd/gnbd.ko
+
+%files -n gnbd-kernel-xen-hypervisor
+%defattr(-,root,root,-)
+/lib/modules/%{kernel_version}hypervisor/kernel/drivers/block/gnbd/gnbd.ko
+%endif
+
 %files -n gnbd-kernheaders
 %defattr(-,root,root,-)
 %{_includedir}/linux/gnbd.h
 
 %changelog
-* Tue Feb 28 2006 Chris Feist <cfeist at Redhat.com>
-- Convert to the new kmod-scheme from Extras
-  (using Thorsten Leemhuis' cman-kernel diff)
-
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2.6.15.0-20051108.134753.FC5.18.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


--- kmodtool DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:48:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:48:20 -0500
Subject: rpms/kernel/devel linux-2.6-powerpc-gettimeofday.patch, NONE,
	1.1 patch-2.6.16-rc5-git3.bz2.sign, NONE, 1.1 .cvsignore,
	1.365, 1.366 kernel-2.6.spec, 1.1993, 1.1994 sources, 1.307,
	1.308 upstream, 1.282,
	1.283 linux-2.6.15-powerpc-gettimeofday.patch, 1.1, NONE
Message-ID: <200602282048.k1SKmKba027323@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26935

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-powerpc-gettimeofday.patch 
	patch-2.6.16-rc5-git3.bz2.sign 
Removed Files:
	linux-2.6.15-powerpc-gettimeofday.patch 
Log Message:
git3


linux-2.6-powerpc-gettimeofday.patch:
 gettimeofday.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-powerpc-gettimeofday.patch ---
>From benh at kernel.crashing.org Sat Feb 25 21:11:28 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 25 Feb 2006 21:11:28 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hM-0006Jj-Lv for dwmw2 at baythorne.infradead.org; Sat, 25 Feb 2006
	21:11:28 +0000
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hJ-0008Dl-05 for dwmw2 at infradead.org; Sat, 25 Feb 2006 21:11:28 +0000
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k1PKxQWG030049; Sat, 25 Feb
	2006 14:59:27 -0600
Subject: [PATCH] powerpc: vdso 64bits gettimeofday bug
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
Cc: Paul Mackerras <paulus at samba.org>, Olaf Hering <olh at suse.de>, linuxppc-dev list <linuxppc-dev at ozlabs.org>, linuxppc64-dev <linuxppc64-dev at ozlabs.org>, Greg KH <greg at kroah.com>, David Woodhouse <dwmw2 at infradead.org>, Sven Luther <sven.luther at wanadoo.fr>
Content-Type: text/plain
Date: Sun, 26 Feb 2006 08:09:00 +1100
Message-Id: <1140901740.24957.29.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.5.91 
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

A bug in the assembly code of the vdso can cause gettimeofday() to hang
or to return incorrect results. The wrong register was used to test for
pending updates of the calibration variables and to create a dependency
for subsequent loads. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---

Might be worth applying to the stable series too and/or distro kernels
2.6.15 and later

--- linux-work.orig/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:02:57.000000000 +1100
+++ linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:04:23.000000000 +1100
@@ -225,9 +225,9 @@
   .cfi_startproc
 	/* check for update count & load values */
 1:	ld	r8,CFG_TB_UPDATE_COUNT(r3)
-	andi.	r0,r4,1			/* pending update ? loop */
+	andi.	r0,r8,1			/* pending update ? loop */
 	bne-	1b
-	xor	r0,r4,r4		/* create dependency */
+	xor	r0,r8,r8		/* create dependency */
 	add	r3,r3,r0
 
 	/* Get TB & offset it */




--- NEW FILE patch-2.6.16-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEBJ5myGugalF9Dw4RAleFAJ9dmng5HquMqmnJX02okApb2M9oswCfVnSK
UXog9AcSsuoTLplt3oDZXbo=
=jsjS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- .cvsignore	27 Feb 2006 21:42:33 -0000	1.365
+++ .cvsignore	28 Feb 2006 20:48:17 -0000	1.366
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc5.bz2
-patch-2.6.16-rc5-git1.bz2
+patch-2.6.16-rc5-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- kernel-2.6.spec	28 Feb 2006 16:28:16 -0000	1.1993
+++ kernel-2.6.spec	28 Feb 2006 20:48:17 -0000	1.1994
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc5.bz2
-Patch2: patch-2.6.16-rc5-git1.bz2
+Patch2: patch-2.6.16-rc5-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -238,7 +238,7 @@
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
 Patch301: linux-2.6-cell-numa-init.patch
-Patch302: linux-2.6.15-powerpc-gettimeofday.patch
+Patch302: linux-2.6-powerpc-gettimeofday.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
@@ -1585,9 +1585,15 @@
 %endif
 
 %changelog
+<<<<<<< kernel-2.6.spec
+* Tue Feb 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc5-git3
+
+=======
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO
 
+>>>>>>> 1.1993
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5 & rc5-git1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- sources	27 Feb 2006 21:42:33 -0000	1.307
+++ sources	28 Feb 2006 20:48:17 -0000	1.308
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 1740ae34807f687a93adf2469ea5c4fc  patch-2.6.16-rc5.bz2
-45d08cf9db21b2be6d13b4a27bb65196  patch-2.6.16-rc5-git1.bz2
+a1b2a5ce9754f7f778490eaf47ef0e92  patch-2.6.16-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- upstream	27 Feb 2006 21:42:33 -0000	1.282
+++ upstream	28 Feb 2006 20:48:17 -0000	1.283
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc5.bz2
-patch-2.6.16-rc5-git1.bz2
+patch-2.6.16-rc5-git3.bz2


--- linux-2.6.15-powerpc-gettimeofday.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:49:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:49:18 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1994,1.1995
Message-ID: <200602282049.k1SKnItN030508@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30321

Modified Files:
	kernel-2.6.spec 
Log Message:
duhh



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -r1.1994 -r1.1995
--- kernel-2.6.spec	28 Feb 2006 20:48:17 -0000	1.1994
+++ kernel-2.6.spec	28 Feb 2006 20:49:16 -0000	1.1995
@@ -1585,15 +1585,12 @@
 %endif
 
 %changelog
-<<<<<<< kernel-2.6.spec
 * Tue Feb 28 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git3
 
-=======
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO
 
->>>>>>> 1.1993
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5 & rc5-git1
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 20:57:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 15:57:20 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1995,
	1.1996 linux-2.6-powerpc-gettimeofday.patch, 1.1, NONE
Message-ID: <200602282057.k1SKvK7H002612@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2515

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-powerpc-gettimeofday.patch 
Log Message:
merged upstream



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1995
retrieving revision 1.1996
diff -u -r1.1995 -r1.1996
--- kernel-2.6.spec	28 Feb 2006 20:49:16 -0000	1.1995
+++ kernel-2.6.spec	28 Feb 2006 20:57:17 -0000	1.1996
@@ -238,7 +238,6 @@
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
 Patch301: linux-2.6-cell-numa-init.patch
-Patch302: linux-2.6-powerpc-gettimeofday.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
@@ -743,8 +742,6 @@
 %patch300 -p1
 # Arnd says don't call cell_spumem_init() till he fixes it.
 %patch301 -p1
-# Fix gettimeofday in the 64bit vDSO.
-%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.


--- linux-2.6-powerpc-gettimeofday.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 21:25:30 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 16:25:30 -0500
Subject: rpms/system-config-language/devel .cvsignore, 1.7, 1.8 sources, 1.10,
	1.11 system-config-language.spec, 1.15, 1.16
Message-ID: <200602282125.k1SLPUQF012645@cvs.devel.redhat.com>

Author: pnasrat

Update of /cvs/dist/rpms/system-config-language/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12633

Modified Files:
	.cvsignore sources system-config-language.spec 
Log Message:
Update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-language/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2005 14:31:30 -0000	1.7
+++ .cvsignore	28 Feb 2006 21:25:26 -0000	1.8
@@ -3,3 +3,4 @@
 system-config-language-1.1.8.tar.bz2
 system-config-language-1.1.9.tar.bz2
 system-config-language-1.1.10.tar.bz2
+system-config-language-1.1.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-language/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Oct 2005 14:31:30 -0000	1.10
+++ sources	28 Feb 2006 21:25:26 -0000	1.11
@@ -1,2 +1,3 @@
 15846962f75274a29e14b2fa4af3cd7f  system-config-language-1.1.9.tar.bz2
 952c434965fd95522cd1049b9495c170  system-config-language-1.1.10.tar.bz2
+7fe71853334cad0480098f31c1f5d3d3  system-config-language-1.1.11.tar.bz2


Index: system-config-language.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- system-config-language.spec	9 Dec 2005 22:43:26 -0000	1.15
+++ system-config-language.spec	28 Feb 2006 21:25:26 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
-Version: 1.1.10
-Release: 1.1
+Version: 1.1.11
+Release: 1
 URL: http://fedora.redhat.com/projects/config-tools/
 License: GPL
 ExclusiveOS: Linux
@@ -77,6 +77,10 @@
 %attr(0644,root,root) %config /etc/pam.d/system-config-language
 
 %changelog
+* Tue Feb 28 2006 Paul Nasrat <pnasrat at redhat.com> - 1.1.11-1
+- Update translations
+- Serbian locales (#172600)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 21:35:18 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 16:35:18 -0500
Subject: rpms/gstreamer-plugins/FC-4
	gstreamer-plugins-0.8.12-execshield.patch, NONE, 1.1 sources,
	1.27, 1.28 gstreamer-plugins.spec, 1.51,
	1.52 removed-sources.txt, 1.25, 1.26 patch-tarball.sh, 1.9, 1.10
Message-ID: <200602282135.k1SLZIAL012828@cvs.devel.redhat.com>

Author: cmontgom

Update of /cvs/dist/rpms/gstreamer-plugins/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12788

Modified Files:
	sources gstreamer-plugins.spec removed-sources.txt 
	patch-tarball.sh 
Added Files:
	gstreamer-plugins-0.8.12-execshield.patch 
Log Message:
re-added libspc, now that I've been given the details needed to make
execshield work with nasm



gstreamer-plugins-0.8.12-execshield.patch:
 APU.Asm    |    2 ++
 DSP.Asm    |    2 ++
 SPC700.Asm |    2 ++
 3 files changed, 6 insertions(+)

--- NEW FILE gstreamer-plugins-0.8.12-execshield.patch ---
*** gst-plugins-0.8.12/ext/spc/DSP.Asm~	2005-03-26 10:18:02.000000000 -0500
--- gst-plugins-0.8.12/ext/spc/DSP.Asm	2006-02-27 15:25:34.000000000 -0500
***************
*** 8138,8140 ****
--- 8138,8142 ----
  	FStP	ST
  
  ENDP VMax2dB
+ 
+ section .note.GNU-stack progbits noalloc noexec nowrite align=1
*** gst-plugins-0.8.12/ext/spc/APU.Asm~	2006-02-20 17:51:34.000000000 -0500
--- gst-plugins-0.8.12/ext/spc/APU.Asm	2006-02-27 15:32:24.000000000 -0500
***************
*** 421,423 ****
--- 421,425 ----
  PROC ShutAPU
  
  ENDP
+ 
+ section .note.GNU-stack progbits noalloc noexec nowrite align=1
*** gst-plugins-0.8.12/ext/spc/SPC700.Asm~	2005-03-26 10:18:02.000000000 -0500
--- gst-plugins-0.8.12/ext/spc/SPC700.Asm	2006-02-27 15:32:19.000000000 -0500
***************
*** 4434,4436 ****
--- 4434,4438 ----
  	Mov	[EDX+RAM+0F0h],DH							;Reset counter
  %endif
  	Jmp	EBP
+ 
+ section .note.GNU-stack progbits noalloc noexec nowrite align=1


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	24 Feb 2006 22:46:22 -0000	1.27
+++ sources	28 Feb 2006 21:35:10 -0000	1.28
@@ -1,2 +1,2 @@
 1b99f623169cf62b70f3de081a633d14  Hermes-1.3.3.tar.bz2
-6f278bb3a380dda3154a21e3d6d3af9e  gst-plugins-0.8.12.patched.tar.bz2
+6bcb5bcc35e42af29370fea20e78bdd1  gst-plugins-0.8.12.patched.tar.bz2


Index: gstreamer-plugins.spec
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gstreamer-plugins.spec	24 Feb 2006 21:53:17 -0000	1.51
+++ gstreamer-plugins.spec	28 Feb 2006 21:35:10 -0000	1.52
@@ -6,7 +6,7 @@
 Version: 0.8.12
 %define majmin 0.8
 %define po_package gst-plugins-%{majmin}
-Release: 2
+Release: 3
 License: LGPL
 Group: Applications/Multimedia
 Source: gst-plugins-%{version}.patched.tar.bz2
@@ -17,6 +17,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Patch1: gstreamer-plugins-0.8.7-alsa.patch
+Patch2: gstreamer-plugins-0.8.12-execsheild.patch
 
 Requires: glib2 >= %_glib2
 Requires: gstreamer >= %{version}
@@ -86,6 +87,7 @@
 %prep
 %setup -q -n gst-plugins-%{version} -a 4
 %patch1 -p1 -b .alsa
+%patch2 -p1 -b .execshield
 
 mkdir gst-libs/ext/ffmpeg
 
@@ -315,6 +317,11 @@
 %{_libdir}/*so
 
 %changelog
+* Mon Feb 27 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-3
+- Re-added libgstspc to sources; drepper provided NASM magic to make 
+  execshield work 
+- Added gstreamer-plugins-0.8.12-execshield.patch to effect this.
+
 * Fri Feb 24 2006 Monty (xiphmont) <cmontgom at redhat.com> - 0.8.12-2
 - Removed libgstspc from sources; NASM requirement makes patching with 
   execshield impossible


Index: removed-sources.txt
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/removed-sources.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- removed-sources.txt	24 Feb 2006 22:44:46 -0000	1.25
+++ removed-sources.txt	28 Feb 2006 21:35:11 -0000	1.26
@@ -1,5 +1,5 @@
---- origfiles.txt	2006-02-24 17:43:18.000000000 -0500
-+++ newfiles.txt	2006-02-24 17:43:30.000000000 -0500
+--- origfiles.txt	2006-02-27 15:19:18.000000000 -0500
++++ newfiles.txt	2006-02-27 15:19:29.000000000 -0500
 @@ -325,12 +325,6 @@
  gst-plugins-0.8.12/ext/ladspa/Makefile.in
  gst-plugins-0.8.12/ext/ladspa/search.c
@@ -63,33 +63,7 @@
  gst-plugins-0.8.12/ext/musepack/
  gst-plugins-0.8.12/ext/musepack/gstmusepackdec.c
  gst-plugins-0.8.12/ext/musepack/gstmusepackdec.h
-@@ -504,25 +462,6 @@
- gst-plugins-0.8.12/ext/sndfile/gstsf.h
- gst-plugins-0.8.12/ext/sndfile/Makefile.am
- gst-plugins-0.8.12/ext/sndfile/Makefile.in
--gst-plugins-0.8.12/ext/spc/
--gst-plugins-0.8.12/ext/spc/APU.Asm
--gst-plugins-0.8.12/ext/spc/APU.h
--gst-plugins-0.8.12/ext/spc/APU.Inc
--gst-plugins-0.8.12/ext/spc/DSP.Asm
--gst-plugins-0.8.12/ext/spc/DSP.h
--gst-plugins-0.8.12/ext/spc/DSP.Inc
--gst-plugins-0.8.12/ext/spc/gstspc.c
--gst-plugins-0.8.12/ext/spc/gstspc.h
--gst-plugins-0.8.12/ext/spc/Macro.Inc
--gst-plugins-0.8.12/ext/spc/Makefile.am
--gst-plugins-0.8.12/ext/spc/Makefile.in
--gst-plugins-0.8.12/ext/spc/nasmnopic.sh
--gst-plugins-0.8.12/ext/spc/SNESAPU.h
--gst-plugins-0.8.12/ext/spc/SPC700.Asm
--gst-plugins-0.8.12/ext/spc/SPC700.h
--gst-plugins-0.8.12/ext/spc/SPC700.Inc
--gst-plugins-0.8.12/ext/spc/spc.h
--gst-plugins-0.8.12/ext/spc/Types.h
- gst-plugins-0.8.12/ext/speex/
- gst-plugins-0.8.12/ext/speex/gstspeex.c
- gst-plugins-0.8.12/ext/speex/gstspeexdec.c
-@@ -1097,72 +1036,6 @@
+@@ -1097,72 +1055,6 @@
  gst-plugins-0.8.12/gst/monoscope/monoscope.c
  gst-plugins-0.8.12/gst/monoscope/monoscope.h
  gst-plugins-0.8.12/gst/monoscope/README


Index: patch-tarball.sh
===================================================================
RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/patch-tarball.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- patch-tarball.sh	24 Feb 2006 22:42:50 -0000	1.9
+++ patch-tarball.sh	28 Feb 2006 21:35:15 -0000	1.10
@@ -19,8 +19,8 @@
 echo "Extracting original tarball"
 tar -xjf $ORIGBALL
 
-MPEG_INFIXES="mpeg mpg mp3 mp2 mad spc"
-MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame ext/spc"
+MPEG_INFIXES="mpeg mpg mp3 mp2 mad"
+MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame"
 
 for mod in $MPEG_PATHS; do 
     echo rm -rf -- "$PKG/${mod}"



From fedora-cvs-commits at redhat.com  Tue Feb 28 21:39:46 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 16:39:46 -0500
Subject: rpms/kernel/devel/configs config-x86-generic, 1.35,
	1.35.12.1 config-x86_64-generic, 1.31, 1.31.12.1
Message-ID: <200602282139.k1SLdk2M012909@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv12895/configs

Modified Files:
      Tag: private-xen-rebased-1971-branch
	config-x86-generic config-x86_64-generic 
Log Message:
missing config files from 1.1991 rebase


Index: config-x86-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v
retrieving revision 1.35
retrieving revision 1.35.12.1
diff -u -r1.35 -r1.35.12.1
--- config-x86-generic	13 Feb 2006 21:17:48 -0000	1.35
+++ config-x86-generic	28 Feb 2006 21:39:41 -0000	1.35.12.1
@@ -239,6 +239,7 @@
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=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.31
retrieving revision 1.31.12.1
diff -u -r1.31 -r1.31.12.1
--- config-x86_64-generic	13 Feb 2006 21:17:48 -0000	1.31
+++ config-x86_64-generic	28 Feb 2006 21:39:41 -0000	1.31.12.1
@@ -106,6 +106,7 @@
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
 CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
 
 CONFIG_PNP=y
 CONFIG_PNPACPI=y



From fedora-cvs-commits at redhat.com  Tue Feb 28 21:45:33 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 16:45:33 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.5,
	1.1971.2.6 linux-2.6-xen-compile-fixes.patch, 1.1.12.2,
	1.1.12.3 linux-2.6-xen-cpusteal-hv.patch, 1.2.2.1,
	1.2.2.2 linux-2.6-xen-cpusteal-kernel.patch, 1.2.2.1, 1.2.2.2
Message-ID: <200602282145.k1SLjX4k012989@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12970

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
	linux-2.6-xen-cpusteal-hv.patch 
	linux-2.6-xen-cpusteal-kernel.patch 
Log Message:
fix x86 xen compilation && rebase on 1.1993


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.5
retrieving revision 1.1971.2.6
diff -u -r1.1971.2.5 -r1.1971.2.6
--- kernel-2.6.spec	28 Feb 2006 20:16:09 -0000	1.1971.2.5
+++ kernel-2.6.spec	28 Feb 2006 21:45:27 -0000	1.1971.2.6
@@ -698,7 +698,7 @@
 %if %{buildxen}
 cd xen
 %patch20000 -p1
-%patch20010 -p1
+%patch20010 -p2
 cd ..
 %endif
 cd linux-%{kversion}.%{_target_cpu}
@@ -785,7 +785,7 @@
 %patch706 -p1
 %patch709 -p1
 #%patch710 -p1
-%patch711 -p1
+%patch711 -p2
 %endif
 
 #
@@ -1599,6 +1599,7 @@
 %changelog
 * Tue Feb 28 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
 - rebase with rawhide 1.1993.
+- rebase with rawhide 1.1993
 
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.i686/arch/i386/mach-xen/Makefile                |    2 -
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.new/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 --
 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c                  |    1 
 linux-2.6.15.xen/arch/i386/mm/init-xen.c                     |    1 
 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 +
 16 files changed, 44 insertions(+), 14 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.1.12.2
retrieving revision 1.1.12.3
diff -u -r1.1.12.2 -r1.1.12.3
--- linux-2.6-xen-compile-fixes.patch	24 Feb 2006 19:42:19 -0000	1.1.12.2
+++ linux-2.6-xen-compile-fixes.patch	28 Feb 2006 21:45:29 -0000	1.1.12.3
@@ -215,3 +215,12 @@
  
  config HUGETLB_PAGE
  	def_bool HUGETLBFS
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mach-xen/Makefile linux-2.6.15.i686/arch/i386/mach-xen/Makefile
+--- linux-2.6.15.orig/arch/i386/mach-xen/Makefile	2006-02-28 18:47:02.000000000 +0100
++++ linux-2.6.15.i686/arch/i386/mach-xen/Makefile	2006-02-28 19:38:41.000000000 +0100
+@@ -3,5 +3,3 @@
+ #
+ 
+ obj-y				:= setup.o topology.o
+-  
+-topology-y			:= ../mach-default/topology.o

linux-2.6-xen-cpusteal-hv.patch:
 common/dom0_ops.c      |    9 ++
 common/domain.c        |   13 ++++
 common/keyhandler.c    |    6 -
 common/sched_bvt.c     |   13 +---
 common/sched_sedf.c    |    8 --
 common/schedule.c      |  152 +++++++++++++++++++++----------------------------
 include/public/vcpu.h  |   34 ++++++++++
 include/xen/sched-if.h |    6 -
 include/xen/sched.h    |   12 +--
 9 files changed, 134 insertions(+), 119 deletions(-)

Index: linux-2.6-xen-cpusteal-hv.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-hv.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- linux-2.6-xen-cpusteal-hv.patch	28 Feb 2006 20:16:10 -0000	1.2.2.1
+++ linux-2.6-xen-cpusteal-hv.patch	28 Feb 2006 21:45:29 -0000	1.2.2.2
@@ -1,50 +1,511 @@
-Allow guest domains to get information from the hypervisor on how much
-cpu time their virtual cpus have used.  This is needed to estimate the
-cpu steal time.
+From patchbot-unstable at lists.xensource.com Sat Feb 25 17:49:47 2006
+Date: Sat, 25 Feb 2006 22:48:07 +0000
+From: Xen patchbot -unstable <patchbot-unstable at lists.xensource.com>
+Reply-To: xen-devel at lists.xensource.com
+To: xen-changelog at lists.xensource.com
+Subject: [Xen-changelog] New VCPUOP_get_runstate_info hypercall. Returns information about the current
 
-Signed-off-by: Rik van Riel <riel at redhat.com>
+# HG changeset patch
+# User kaf24 at firebug.cl.cam.ac.uk
+# Node ID 2303fb4682e7cd4feb330fd2aec69672facb4ec6
+# Parent  a9f3abcc41499b7be971412d66c08d0e9740ff66
+New VCPUOP_get_runstate_info hypercall. Returns information about the current
+run state of a VCPU (running, runnable, blocked, etc.) and the total time
+spent in each state since the VCPU was created.
 
---- xen/include/public/vcpu.h.steal	2006-02-07 18:01:41.000000000 -0500
-+++ xen/include/public/vcpu.h	2006-02-17 13:51:45.000000000 -0500
-@@ -51,6 +51,14 @@
+Signed-off-by: Keir Fraser <keir at xensource.com>
+
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/dom0_ops.c
+--- a/xen/common/dom0_ops.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/dom0_ops.c	Sat Feb 25 16:58:37 2006
+@@ -46,6 +46,7 @@
+     struct vcpu   *v;
+     u64 cpu_time = 0;
+     int flags = DOMFLAGS_BLOCKED;
++    struct vcpu_runstate_info runstate;
+     
+     info->domain = d->domain_id;
+     info->nr_online_vcpus = 0;
+@@ -55,7 +56,8 @@
+      * - domain is marked as running if any of its vcpus is running
+      */
+     for_each_vcpu ( d, v ) {
+-        cpu_time += v->cpu_time;
++        vcpu_runstate_get(v, &runstate);
++        cpu_time += runstate.time[RUNSTATE_running];
+         info->max_vcpu_id = v->vcpu_id;
+         if ( !test_bit(_VCPUF_down, &v->vcpu_flags) )
+         {
+@@ -497,6 +499,7 @@
+     { 
+         struct domain *d;
+         struct vcpu   *v;
++        struct vcpu_runstate_info runstate;
+ 
+         ret = -ESRCH;
+         if ( (d = find_domain_by_id(op->u.getvcpuinfo.domain)) == NULL )
+@@ -510,10 +513,12 @@
+         if ( (v = d->vcpu[op->u.getvcpuinfo.vcpu]) == NULL )
+             goto getvcpuinfo_out;
+ 
++        vcpu_runstate_get(v, &runstate);
++
+         op->u.getvcpuinfo.online   = !test_bit(_VCPUF_down, &v->vcpu_flags);
+         op->u.getvcpuinfo.blocked  = test_bit(_VCPUF_blocked, &v->vcpu_flags);
+         op->u.getvcpuinfo.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
+-        op->u.getvcpuinfo.cpu_time = v->cpu_time;
++        op->u.getvcpuinfo.cpu_time = runstate.time[RUNSTATE_running];
+         op->u.getvcpuinfo.cpu      = v->processor;
+         op->u.getvcpuinfo.cpumap   = 0;
+         memcpy(&op->u.getvcpuinfo.cpumap,
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/domain.c
+--- a/xen/common/domain.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/domain.c	Sat Feb 25 16:58:37 2006
+@@ -451,6 +451,19 @@
+     case VCPUOP_is_up:
+         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
+         break;
++
++    case VCPUOP_get_runstate_info:
++    {
++        struct vcpu_runstate_info runstate;
++        vcpu_runstate_get(v, &runstate);
++        if ( copy_to_user(arg, &runstate, sizeof(runstate)) )
++            rc = -EFAULT;
++        break;
++    }
++
++    default:
++        rc = -ENOSYS;
++        break;
+     }
+ 
+     return rc;
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/keyhandler.c
+--- a/xen/common/keyhandler.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/keyhandler.c	Sat Feb 25 16:58:37 2006
+@@ -169,8 +169,6 @@
+ }
+ 
+ extern void dump_runq(unsigned char key);
+-extern void print_sched_histo(unsigned char key);
+-extern void reset_sched_histo(unsigned char key);
+ #ifndef NDEBUG
+ extern void audit_domains_key(unsigned char key);
+ #endif
+@@ -206,10 +204,6 @@
+         'd', dump_registers, "dump registers"); 
+     register_keyhandler(
+         'h', show_handlers, "show this message");
+-    register_keyhandler(
+-        'l', print_sched_histo, "print sched latency histogram");
+-    register_keyhandler(
+-        'L', reset_sched_histo, "reset sched latency histogram");
+     register_keyhandler(
+         'q', dump_domains, "dump domain (and guest debug) info");
+     register_keyhandler(
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/sched_bvt.c
+--- a/xen/common/sched_bvt.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/sched_bvt.c	Sat Feb 25 16:58:37 2006
+@@ -132,13 +132,13 @@
+     vcpu_schedule_unlock_irq(v);
+ }
+ 
+-static inline u32 calc_avt(struct vcpu *d, s_time_t now)
++static inline u32 calc_avt(struct vcpu *v, s_time_t now)
+ {
+     u32 ranfor, mcus;
+-    struct bvt_dom_info *inf = BVT_INFO(d->domain);
+-    struct bvt_vcpu_info *einf = EBVT_INFO(d);
+-    
+-    ranfor = (u32)(now - d->lastschd);
++    struct bvt_dom_info *inf = BVT_INFO(v->domain);
++    struct bvt_vcpu_info *einf = EBVT_INFO(v);
++    
++    ranfor = (u32)(now - v->runstate.state_entry_time);
+     mcus = (ranfor + MCU - 1)/MCU;
+ 
+     return einf->avt + mcus * inf->mcu_advance;
+@@ -262,7 +262,7 @@
+     curr_evt = calc_evt(curr, calc_avt(curr, now));
+     /* Calculate the time the current domain would run assuming
+        the second smallest evt is of the newly woken domain */
+-    r_time = curr->lastschd +
++    r_time = curr->runstate.state_entry_time +
+         ((einf->evt - curr_evt) / BVT_INFO(curr->domain)->mcu_advance) +
+         ctx_allow;
+ 
+@@ -558,7 +558,6 @@
+         printk("%3d: %u has=%c ", loop++, v->domain->domain_id,
+                test_bit(_VCPUF_running, &v->vcpu_flags) ? 'T':'F');
+         bvt_dump_runq_el(v);
+-        printk("c=0x%X%08X\n", (u32)(v->cpu_time>>32), (u32)v->cpu_time);
+         printk("         l: %p n: %p  p: %p\n",
+                &vcpu_inf->run_list, vcpu_inf->run_list.next,
+                vcpu_inf->run_list.prev);
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/sched_sedf.c
+--- a/xen/common/sched_sedf.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/sched_sedf.c	Sat Feb 25 16:58:37 2006
+@@ -1408,18 +1408,14 @@
+ {
+     printk("%i.%i has=%c ", d->domain->domain_id, d->vcpu_id,
+            test_bit(_VCPUF_running, &d->vcpu_flags) ? 'T':'F');
+-    printk("p=%"PRIu64" sl=%"PRIu64" ddl=%"PRIu64" w=%hu c=%"PRIu64
++    printk("p=%"PRIu64" sl=%"PRIu64" ddl=%"PRIu64" w=%hu"
+            " sc=%i xtr(%s)=%"PRIu64" ew=%hu",
+            EDOM_INFO(d)->period, EDOM_INFO(d)->slice, EDOM_INFO(d)->deadl_abs,
+-           EDOM_INFO(d)->weight, d->cpu_time,
++           EDOM_INFO(d)->weight,
+            EDOM_INFO(d)->score[EXTRA_UTIL_Q],
+            (EDOM_INFO(d)->status & EXTRA_AWARE) ? "yes" : "no",
+            EDOM_INFO(d)->extra_time_tot, EDOM_INFO(d)->extraweight);
+     
+-    if ( d->cpu_time != 0 )
+-        printf(" (%"PRIu64"%%)", (EDOM_INFO(d)->extra_time_tot * 100)
+-               / d->cpu_time);
+-
+ #ifdef SEDF_STATS
+     if ( EDOM_INFO(d)->block_time_tot != 0 )
+         printf(" pen=%"PRIu64"%%", (EDOM_INFO(d)->penalty_time_tot * 100) /
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/common/schedule.c
+--- a/xen/common/schedule.c	Sat Feb 25 11:27:53 2006
++++ b/xen/common/schedule.c	Sat Feb 25 16:58:37 2006
+@@ -36,14 +36,6 @@
+ static char opt_sched[10] = "sedf";
+ string_param("sched", opt_sched);
+ 
+-/*#define WAKE_HISTO*/
+-/*#define BLOCKTIME_HISTO*/
+-#if defined(WAKE_HISTO)
+-#define BUCKETS 31
+-#elif defined(BLOCKTIME_HISTO)
+-#define BUCKETS 200
+-#endif
+-
+ #define TIME_SLOP      (s32)MICROSECS(50)     /* allow time to slip a bit */
+ 
+ /* Various timer handlers. */
+@@ -73,6 +65,36 @@
+ /* Per-CPU periodic timer sends an event to the currently-executing domain. */
+ static struct timer t_timer[NR_CPUS]; 
+ 
++static inline void vcpu_runstate_change(
++    struct vcpu *v, int new_state, s_time_t new_entry_time)
++{
++    ASSERT(v->runstate.state != new_state);
++    ASSERT(spin_is_locked(&schedule_data[v->processor].schedule_lock));
++
++    v->runstate.time[v->runstate.state] +=
++        new_entry_time - v->runstate.state_entry_time;
++    v->runstate.state_entry_time = new_entry_time;
++    v->runstate.state = new_state;
++}
++
++void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate)
++{
++    if ( likely(v == current) )
++    {
++        /* Fast lock-free path. */
++        memcpy(runstate, &v->runstate, sizeof(*runstate));
++        ASSERT(runstate->state = RUNSTATE_running);
++        runstate->time[RUNSTATE_running] += NOW() - runstate->state_entry_time;
++    }
++    else
++    {
++        vcpu_schedule_lock_irq(v);
++        memcpy(runstate, &v->runstate, sizeof(*runstate));
++        runstate->time[runstate->state] += NOW() - runstate->state_entry_time;
++        vcpu_schedule_unlock_irq(v);
++    }
++}
++
+ struct domain *alloc_domain(void)
+ {
+     struct domain *d;
+@@ -119,6 +141,9 @@
+     v->cpu_affinity = is_idle_domain(d) ?
+         cpumask_of_cpu(cpu_id) : CPU_MASK_ALL;
+ 
++    v->runstate.state = is_idle_vcpu(v) ? RUNSTATE_running : RUNSTATE_offline;
++    v->runstate.state_entry_time = NOW();
++
+     if ( (vcpu_id != 0) && !is_idle_domain(d) )
+         set_bit(_VCPUF_down, &v->vcpu_flags);
+ 
+@@ -165,8 +190,15 @@
+     unsigned long flags;
+ 
+     vcpu_schedule_lock_irqsave(v, flags);
++
+     if ( likely(!vcpu_runnable(v)) )
++    {
++        if ( v->runstate.state == RUNSTATE_runnable )
++            vcpu_runstate_change(v, RUNSTATE_offline, NOW());
++
+         SCHED_OP(sleep, v);
++    }
++
+     vcpu_schedule_unlock_irqrestore(v, flags);
+ 
+     TRACE_2D(TRC_SCHED_SLEEP, v->domain->domain_id, v->vcpu_id);
+@@ -187,11 +219,19 @@
+     unsigned long flags;
+ 
+     vcpu_schedule_lock_irqsave(v, flags);
++
+     if ( likely(vcpu_runnable(v)) )
+     {
++        if ( v->runstate.state >= RUNSTATE_blocked )
++            vcpu_runstate_change(v, RUNSTATE_runnable, NOW());
+         SCHED_OP(wake, v);
+-        v->wokenup = NOW();
+-    }
++    }
++    else if ( !test_bit(_VCPUF_blocked, &v->vcpu_flags) )
++    {
++        if ( v->runstate.state == RUNSTATE_blocked )
++            vcpu_runstate_change(v, RUNSTATE_offline, NOW());
++    }
++
+     vcpu_schedule_unlock_irqrestore(v, flags);
+ 
+     TRACE_2D(TRC_SCHED_WAKE, v->domain->domain_id, v->vcpu_id);
+@@ -376,8 +416,6 @@
+ 
+     stop_timer(&schedule_data[cpu].s_timer);
+     
+-    prev->cpu_time += now - prev->lastschd;
+-
+     /* get policy-specific decision on scheduling... */
+     next_slice = ops.do_schedule(now);
+ 
+@@ -386,8 +424,6 @@
+ 
+     schedule_data[cpu].curr = next;
+     
+-    next->lastschd = now;
+-
+     set_timer(&schedule_data[cpu].s_timer, now + r_time);
+ 
+     if ( unlikely(prev == next) )
+@@ -397,38 +433,23 @@
+     }
+ 
+     TRACE_2D(TRC_SCHED_SWITCH_INFPREV,
+-             prev->domain->domain_id, now - prev->lastschd);
++             prev->domain->domain_id,
++             now - prev->runstate.state_entry_time);
+     TRACE_3D(TRC_SCHED_SWITCH_INFNEXT,
+-             next->domain->domain_id, now - next->wokenup, r_time);
+-
+-    /*
+-     * Logic of wokenup field in domain struct:
+-     * Used to calculate "waiting time", which is the time that a domain
+-     * spends being "runnable", but not actually running. wokenup is set
+-     * set whenever a domain wakes from sleeping. However, if wokenup is not
+-     * also set here then a preempted runnable domain will get a screwed up
+-     * "waiting time" value next time it is scheduled.
+-     */
+-    prev->wokenup = now;
+-
+-#if defined(WAKE_HISTO)
+-    if ( !is_idle_vcpu(next) && next->wokenup )
+-    {
+-        ulong diff = (ulong)(now - next->wokenup);
+-        diff /= (ulong)MILLISECS(1);
+-        if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;
+-        else                    schedule_data[cpu].hist[BUCKETS-1]++;
+-    }
+-    next->wokenup = (s_time_t)0;
+-#elif defined(BLOCKTIME_HISTO)
+-    prev->lastdeschd = now;
+-    if ( !is_idle_vcpu(next) )
+-    {
+-        ulong diff = (ulong)((now - next->lastdeschd) / MILLISECS(10));
+-        if (diff <= BUCKETS-2)  schedule_data[cpu].hist[diff]++;
+-        else                    schedule_data[cpu].hist[BUCKETS-1]++;
+-    }
+-#endif
++             next->domain->domain_id,
++             (next->runstate.state == RUNSTATE_runnable) ?
++             (now - next->runstate.state_entry_time) : 0,
++             r_time);
++
++    ASSERT(prev->runstate.state == RUNSTATE_running);
++    vcpu_runstate_change(
++        prev,
++        (test_bit(_VCPUF_blocked, &prev->vcpu_flags) ? RUNSTATE_blocked :
++         (vcpu_runnable(prev) ? RUNSTATE_runnable : RUNSTATE_offline)),
++        now);
++
++    ASSERT(next->runstate.state != RUNSTATE_running);
++    vcpu_runstate_change(next, RUNSTATE_running, now);
+ 
+     ASSERT(!test_bit(_VCPUF_running, &next->vcpu_flags));
+     set_bit(_VCPUF_running, &next->vcpu_flags);
+@@ -567,47 +588,6 @@
+ 
+     local_irq_restore(flags);
+ }
+-
+-#if defined(WAKE_HISTO) || defined(BLOCKTIME_HISTO)
+-
+-void print_sched_histo(unsigned char key)
+-{
+-    int i, j, k;
+-    for_each_online_cpu ( k )
+-    {
+-        j = 0;
+-        printf ("CPU[%02d]: scheduler latency histogram (ms:[count])\n", k);
+-        for ( i = 0; i < BUCKETS; i++ )
+-        {
+-            if ( schedule_data[k].hist[i] != 0 )
+-            {
+-                if ( i < BUCKETS-1 )
+-                    printk("%2d:[%7u]    ", i, schedule_data[k].hist[i]);
+-                else
+-                    printk(" >:[%7u]    ", schedule_data[k].hist[i]);
+-                if ( !(++j % 5) )
+-                    printk("\n");
+-            }
+-        }
+-        printk("\n");
+-    }
+-      
+-}
+-
+-void reset_sched_histo(unsigned char key)
+-{
+-    int i, j;
+-    for ( j = 0; j < NR_CPUS; j++ )
+-        for ( i=0; i < BUCKETS; i++ ) 
+-            schedule_data[j].hist[i] = 0;
+-}
+-
+-#else
+-
+-void print_sched_histo(unsigned char key) { }
+-void reset_sched_histo(unsigned char key) { }
+-
+-#endif
+ 
+ /*
+  * Local variables:
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/public/vcpu.h
+--- a/xen/include/public/vcpu.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/public/vcpu.h	Sat Feb 25 16:58:37 2006
+@@ -51,6 +51,40 @@
  /* Returns 1 if the given VCPU is up. */
  #define VCPUOP_is_up                3
  
 +/*
-+ * Get information on how much CPU time this VCPU has used, etc...
-+ *
-+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
-+ *               of which filled in with scheduler info.
++ * Return information about the state and running time of a VCPU.
++ * @extra_arg == pointer to xen_vcpu_info structure.
++ */
++#define VCPUOP_get_runstate_info    4
++typedef struct vcpu_runstate_info {
++    /* VCPU's current state (RUNSTATE_*). */
++    int      state;
++    /* When was current state entered (system time, ns)? */
++    uint64_t state_entry_time;
++    /*
++     * Time spent in each RUNSTATE_* (ns). The sum of these times is
++     * guaranteed not to drift from system time.
++     */
++    uint64_t time[4];
++} vcpu_runstate_info_t;
++
++/* VCPU is currently running on a physical CPU. */
++#define RUNSTATE_running  0
++
++/* VCPU is runnable, but not currently scheduled on any physical CPU. */
++#define RUNSTATE_runnable 1
++
++/* VCPU is blocked (a.k.a. idle). It is therefore not runnable. */
++#define RUNSTATE_blocked  2
++
++/*
++ * VCPU is not runnable, but it is not blocked.
++ * This is a 'catch all' state for things like hotplug and pauses by the
++ * system administrator (or for critical sections in the hypervisor).
++ * RUNSTATE_blocked dominates this state (it is the preferred state).
 + */
-+#define VCPUOP_cpu_info             4
++#define RUNSTATE_offline  3
 +
  #endif /* __XEN_PUBLIC_VCPU_H__ */
  
  /*
---- xen/common/domain.c.steal	2006-02-07 18:01:40.000000000 -0500
-+++ xen/common/domain.c	2006-02-17 13:52:44.000000000 -0500
-@@ -451,8 +451,24 @@
-     case VCPUOP_is_up:
-         rc = !test_bit(_VCPUF_down, &v->vcpu_flags);
-         break;
-+
-+    case VCPUOP_cpu_info:
-+	{
-+	    struct dom0_getvcpuinfo vi = { 0, };
-+	    vi.online = !test_bit(_VCPUF_down, &v->vcpu_flags);
-+	    vi.blocked = test_bit(_VCPUF_blocked, &v->vcpu_flags);
-+	    vi.running  = test_bit(_VCPUF_running, &v->vcpu_flags);
-+	    vi.cpu_time = v->cpu_time;
-+	    vi.cpu = v->processor;
-+	    rc = 0;
-+
-+	    if ( copy_to_user(arg, &vi, sizeof(dom0_getvcpuinfo_t)) )
-+		rc = -EFAULT;
-+	    break;
-+	}
-     }
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/xen/sched-if.h
+--- a/xen/include/xen/sched-if.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/xen/sched-if.h	Sat Feb 25 16:58:37 2006
+@@ -8,9 +8,6 @@
+ #ifndef __XEN_SCHED_IF_H__
+ #define __XEN_SCHED_IF_H__
+ 
+-#define BUCKETS  10
+-/*300*/
+-
+ struct schedule_data {
+     spinlock_t          schedule_lock;  /* spinlock protecting curr        */
+     struct vcpu        *curr;           /* current task                    */
+@@ -18,9 +15,6 @@
+     void               *sched_priv;
+     struct timer        s_timer;        /* scheduling timer                */
+     unsigned long       tick;           /* current periodic 'tick'         */
+-#ifdef BUCKETS
+-    u32                 hist[BUCKETS];  /* for scheduler latency histogram */
+-#endif
+ } __cacheline_aligned;
+ 
+ extern struct schedule_data schedule_data[];
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/xen/sched.h
+--- a/xen/include/xen/sched.h	Sat Feb 25 11:27:53 2006
++++ b/xen/include/xen/sched.h	Sat Feb 25 16:58:37 2006
+@@ -8,6 +8,7 @@
+ #include <xen/smp.h>
+ #include <public/xen.h>
+ #include <public/dom0_ops.h>
++#include <public/vcpu.h>
+ #include <xen/time.h>
+ #include <xen/timer.h>
+ #include <xen/grant_table.h>
+@@ -63,14 +64,12 @@
+ 
+     struct vcpu     *next_in_list;
  
+-    struct timer  timer;         /* one-shot timer for timeout values */
++    struct timer     timer;         /* one-shot timer for timeout values */
+     unsigned long    sleep_tick;    /* tick at which this vcpu started sleep */
+ 
+-    s_time_t         lastschd;      /* time this domain was last scheduled */
+-    s_time_t         lastdeschd;    /* time this domain was last descheduled */
+-    s_time_t         cpu_time;      /* total CPU time received till now */
+-    s_time_t         wokenup;       /* time domain got woken up */
+     void            *sched_priv;    /* scheduler-specific data */
 +
-     return rc;
- }
++    struct vcpu_runstate_info runstate;
+ 
+     unsigned long    vcpu_flags;
+ 
+@@ -397,7 +396,6 @@
+ #define _DOMF_debugging        4
+ #define DOMF_debugging         (1UL<<_DOMF_debugging)
  
+-
+ static inline int vcpu_runnable(struct vcpu *v)
+ {
+     return ( (atomic_read(&v->pausecnt) == 0) &&
+@@ -415,6 +413,8 @@
+ 
+ int vcpu_set_affinity(struct vcpu *v, cpumask_t *affinity);
+ 
++void vcpu_runstate_get(struct vcpu *v, struct vcpu_runstate_info *runstate);
++
+ static inline void vcpu_unblock(struct vcpu *v)
+ {
+     if ( test_and_clear_bit(_VCPUF_blocked, &v->vcpu_flags) )
+
+_______________________________________________
+Xen-changelog mailing list
+Xen-changelog at lists.xensource.com
+http://lists.xensource.com/xen-changelog

linux-2.6-xen-cpusteal-kernel.patch:
 b/linux/include/xen/interface/vcpu.h             |   34 ++++++++
 linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c |   95 ++++++++++++++++++++---
 2 files changed, 117 insertions(+), 12 deletions(-)

Index: linux-2.6-xen-cpusteal-kernel.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-kernel.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- linux-2.6-xen-cpusteal-kernel.patch	28 Feb 2006 20:16:10 -0000	1.2.2.1
+++ linux-2.6-xen-cpusteal-kernel.patch	28 Feb 2006 21:45:29 -0000	1.2.2.2
@@ -1,24 +1,42 @@
-Estimate and account for the CPU steal time.  That is, the time during
-which we wanted to run, but the hypervisor scheduled in another
-process instead.  This can be used to help administrators in capacity
-planning, by clearly being able to distinguish whether the system is
-too slow or this guest is simply not getting enough CPU time.
+From patchbot-unstable at lists.xensource.com Sat Feb 25 17:49:47 2006
+Date: Sat, 25 Feb 2006 22:48:07 +0000
+From: Xen patchbot -unstable <patchbot-unstable at lists.xensource.com>
+Reply-To: xen-devel at lists.xensource.com
+To: xen-changelog at lists.xensource.com
+Subject: [Xen-changelog] Update Linux time IRQ handler to understand the new stolen/blocked cycle counts
 
-This is the i386 version, I'll send the implementation for x86_64 soon.
+# HG changeset patch
+# User kaf24 at firebug.cl.cam.ac.uk
+# Node ID c375c210945282c2c5fd6cb86f51422e211ed8a2
+# Parent  2303fb4682e7cd4feb330fd2aec69672facb4ec6
+Update Linux time IRQ handler to understand the new stolen/blocked cycle counts
+exported by Xen. This is based heavily on a patch from Rik van Riel, but
+extended to distinguish between idle/blocked cycles and stolen cycles.
+
+There is still stuff todo:
+ 1. Xen should export the time values in shared memory, to save a hypercall
+    on every time interrupt (even though that is only every 10ms, worst case).
+ 2. As in s390, Xen's cputime_t should be measured at finer granularity than
+    jiffies. Nanoseconds would be a better unit.
+ 3. Break out the internals of the account_steal_time() interface so that we don't
+    need to abuse it so wretchedly.
 
 Signed-off-by: Rik van Riel <riel at redhat.com>
+Signed-off-by: Keir Fraser <keir at xensource.com>
 
---- linux-2.6.15.i686/arch/i386/kernel/time-xen.c.steal	2006-02-17 16:44:40.000000000 -0500
-+++ linux-2.6.15.i686/arch/i386/kernel/time-xen.c	2006-02-20 18:31:26.000000000 -0500
-@@ -48,6 +48,7 @@
+diff -r 2303fb4682e7 -r c375c2109452 linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c
+--- a/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Sat Feb 25 16:58:37 2006
++++ b/linux-2.6-xen-sparse/arch/i386/kernel/time-xen.c	Sat Feb 25 19:07:28 2006
+@@ -48,6 +48,8 @@
  #include <linux/mca.h>
  #include <linux/sysctl.h>
  #include <linux/percpu.h>
 +#include <linux/kernel_stat.h>
++#include <linux/posix-timers.h>
  
  #include <asm/io.h>
  #include <asm/smp.h>
-@@ -77,6 +78,7 @@
+@@ -70,6 +72,7 @@
  #include <asm/arch_hooks.h>
  
  #include <xen/evtchn.h>
@@ -26,63 +44,192 @@
  
  #if defined (__i386__)
  #include <asm/i8259.h>
-@@ -624,7 +626,43 @@ irqreturn_t timer_interrupt(int irq, voi
-          * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
-          * if there is risk of deadlock if we do (since update_process_times
-          * may do scheduler rebalancing work and thus acquire runqueue locks).
-+	 *
-+	 * If we have not run for a while, chances are this vcpu got scheduled
-+	 * away.  Try to estimate how much time was stolen.
-          */
-+	if (delta_cpu > (s64)(2 * NS_PER_TICK)) {
-+		dom0_getvcpuinfo_t vcpu = { 0, };
-+		cputime64_t total;	/* In jiffies, not nanoseconds. */
-+		s64 cputicks, deltaticks, steal;
-+
-+		if (HYPERVISOR_vcpu_op(VCPUOP_cpu_info, cpu, &vcpu) == 0) {
-+			total = kstat_cpu(cpu).cpustat.user +
-+				kstat_cpu(cpu).cpustat.nice +
-+				kstat_cpu(cpu).cpustat.system +
-+				kstat_cpu(cpu).cpustat.softirq +
-+				kstat_cpu(cpu).cpustat.irq;
-+
-+			/* do_div modifies the variable in place. YUCK */
-+			deltaticks = delta_cpu;
-+			cputicks = vcpu.cpu_time;
-+			do_div(cputicks, NS_PER_TICK);
-+			do_div(deltaticks, NS_PER_TICK);
-+
-+			steal = total + deltaticks - cputicks;
-+			if (unlikely(steal < 0))
-+				steal = 0;
-+			else if (unlikely(steal > deltaticks))
-+				steal = deltaticks;
-+
-+			if (steal > 0) {
-+				delta_cpu -= steal * NS_PER_TICK;
-+				per_cpu(processed_system_time, cpu) +=
-+							steal * NS_PER_TICK;
-+				account_steal_time(current, (cputime_t)steal);
-+			}
+@@ -122,6 +125,10 @@
+ /* Keep track of last time we did processing/updating of jiffies and xtime. */
+ static u64 processed_system_time;   /* System time (ns) at last processing. */
+ static DEFINE_PER_CPU(u64, processed_system_time);
++
++/* How much CPU time was spent blocked and how much was 'stolen'? */
++static DEFINE_PER_CPU(u64, processed_stolen_time);
++static DEFINE_PER_CPU(u64, processed_blocked_time);
+ 
+ /* Must be signed, as it's compared with s64 quantities which can be -ve. */
+ #define NS_PER_TICK (1000000000LL/HZ)
+@@ -567,9 +574,10 @@
+ 
+ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-	s64 delta, delta_cpu;
++	s64 delta, delta_cpu, stolen, blocked;
+ 	int i, cpu = smp_processor_id();
+ 	struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
++	struct vcpu_runstate_info runstate;
+ 
+ 	write_seqlock(&xtime_lock);
+ 
+@@ -611,19 +619,79 @@
+ 
+ 	write_sequnlock(&xtime_lock);
+ 
+-	/*
+-         * Local CPU jiffy work. No need to hold xtime_lock, and I'm not sure
+-         * if there is risk of deadlock if we do (since update_process_times
+-         * may do scheduler rebalancing work and thus acquire runqueue locks).
+-         */
+-	while (delta_cpu >= NS_PER_TICK) {
+-		delta_cpu -= NS_PER_TICK;
+-		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
+-		update_process_times(user_mode(regs));
+-		profile_tick(CPU_PROFILING, regs);
+-	}
++	/* Obtain stolen/blocked cycles, if the hypervisor supports it. */
++	if (HYPERVISOR_vcpu_op(VCPUOP_get_runstate_info,
++			       cpu, &runstate) == 0) {
++		/*
++		 * Account stolen ticks.
++		 * HACK: Passing NULL to account_steal_time()
++		 * ensures that the ticks are accounted as stolen.
++		 */
++		stolen = runstate.time[RUNSTATE_runnable] +
++			runstate.time[RUNSTATE_offline] -
++			per_cpu(processed_stolen_time, cpu);
++		if (unlikely(stolen < 0)) /* clock jitter */
++			stolen = 0;
++		delta_cpu -= stolen;
++		if (unlikely(delta_cpu < 0)) {
++			stolen += delta_cpu;
++			delta_cpu = 0;
++		}
++		do_div(stolen, NS_PER_TICK);
++		per_cpu(processed_stolen_time, cpu) += stolen * NS_PER_TICK;
++		account_steal_time(NULL, (cputime_t)stolen);
++
++		/*
++		 * Account blocked ticks.
++		 * HACK: Passing idle_task to account_steal_time()
++		 * ensures that the ticks are accounted as idle/wait.
++		 */
++		blocked = runstate.time[RUNSTATE_blocked] -
++			per_cpu(processed_blocked_time, cpu);
++		if (unlikely(blocked < 0)) /* clock jitter */
++			blocked = 0;
++		delta_cpu -= blocked;
++		if (unlikely(delta_cpu < 0)) {
++			blocked += delta_cpu;
++			delta_cpu = 0;
 +		}
++		do_div(blocked, NS_PER_TICK);
++		per_cpu(processed_blocked_time, cpu) += blocked * NS_PER_TICK;
++		account_steal_time(idle_task(cpu), (cputime_t)blocked);
++
++		per_cpu(processed_system_time, cpu) +=
++			(stolen + blocked) * NS_PER_TICK;
++	}
++
++	if (delta_cpu > 0) {
++		do_div(delta_cpu, NS_PER_TICK);
++		if (user_mode(regs))
++			account_user_time(current, (cputime_t)delta_cpu);
++		else
++			account_system_time(current, HARDIRQ_OFFSET,
++					    (cputime_t)delta_cpu);
++		per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK;
 +	}
 +
- 	while (delta_cpu >= NS_PER_TICK) {
- 		delta_cpu -= NS_PER_TICK;
- 		per_cpu(processed_system_time, cpu) += NS_PER_TICK;
---- linux-2.6.15.i686/include/xen/interface/vcpu.h.steal	2006-02-17 16:14:17.000000000 -0500
-+++ linux-2.6.15.i686/include/xen/interface/vcpu.h	2006-02-17 16:14:52.000000000 -0500
-@@ -51,6 +51,14 @@
++	run_local_timers();
++	if (rcu_pending(cpu))
++		rcu_check_callbacks(cpu, user_mode(regs));
++	scheduler_tick();
++	run_posix_cpu_timers(current);
+ 
+ 	return IRQ_HANDLED;
++}
++
++static void init_missing_ticks_accounting(int cpu)
++{
++	struct vcpu_runstate_info runstate = { 0 };
++
++	HYPERVISOR_vcpu_op(VCPUOP_get_runstate_info, cpu, &runstate);
++
++	per_cpu(processed_blocked_time, cpu) = runstate.time[RUNSTATE_blocked];
++	per_cpu(processed_stolen_time, cpu) =
++		runstate.time[RUNSTATE_runnable] +
++		runstate.time[RUNSTATE_offline];
+ }
+ 
+ /* not static: needed by APM */
+@@ -814,6 +882,7 @@
+ 
+ 	processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+ 	per_cpu(processed_system_time, 0) = processed_system_time;
++	init_missing_ticks_accounting(0);
+ 
+ 	update_wallclock();
+ 
+@@ -891,6 +960,7 @@
+ 
+ 	processed_system_time = per_cpu(shadow_time, 0).system_timestamp;
+ 	per_cpu(processed_system_time, 0) = processed_system_time;
++	init_missing_ticks_accounting(0);
+ 
+ 	update_wallclock();
+ }
+@@ -909,6 +979,7 @@
+ 		/* Use cpu0 timestamp: cpu's shadow is not initialised yet. */
+ 		per_cpu(processed_system_time, cpu) = 
+ 			per_cpu(shadow_time, 0).system_timestamp;
++		init_missing_ticks_accounting(cpu);
+ 	} while (read_seqretry(&xtime_lock, seq));
+ 
+ 	sprintf(timer_name[cpu], "timer%d", cpu);
+
+_______________________________________________
+Xen-changelog mailing list
+Xen-changelog at lists.xensource.com
+http://lists.xensource.com/xen-changelog
+
+
+
+diff -r a9f3abcc4149 -r 2303fb4682e7 xen/include/public/vcpu.h
+--- a/linux/include/xen/interface/vcpu.h	Sat Feb 25 11:27:53 2006
++++ b/linux/include/xen/interface/vcpu.h	Sat Feb 25 16:58:37 2006
+@@ -51,6 +51,40 @@
  /* Returns 1 if the given VCPU is up. */
  #define VCPUOP_is_up                3
  
 +/*
-+ * Get information on how much CPU time this VCPU has used, etc...
-+ *
-+ * @extra_arg == pointer to an empty dom0_getvcpuinfo_t, the "OUT" variables
-+ *               of which filled in with scheduler info.
++ * Return information about the state and running time of a VCPU.
++ * @extra_arg == pointer to xen_vcpu_info structure.
++ */
++#define VCPUOP_get_runstate_info    4
++typedef struct vcpu_runstate_info {
++    /* VCPU's current state (RUNSTATE_*). */
++    int      state;
++    /* When was current state entered (system time, ns)? */
++    uint64_t state_entry_time;
++    /*
++     * Time spent in each RUNSTATE_* (ns). The sum of these times is
++     * guaranteed not to drift from system time.
++     */
++    uint64_t time[4];
++} vcpu_runstate_info_t;
++
++/* VCPU is currently running on a physical CPU. */
++#define RUNSTATE_running  0
++
++/* VCPU is runnable, but not currently scheduled on any physical CPU. */
++#define RUNSTATE_runnable 1
++
++/* VCPU is blocked (a.k.a. idle). It is therefore not runnable. */
++#define RUNSTATE_blocked  2
++
++/*
++ * VCPU is not runnable, but it is not blocked.
++ * This is a 'catch all' state for things like hotplug and pauses by the
++ * system administrator (or for critical sections in the hypervisor).
++ * RUNSTATE_blocked dominates this state (it is the preferred state).
 + */
-+#define VCPUOP_cpu_info             4
++#define RUNSTATE_offline  3
 +
  #endif /* __XEN_PUBLIC_VCPU_H__ */
  



From fedora-cvs-commits at redhat.com  Tue Feb 28 22:22:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 17:22:27 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.6, 1.1971.2.7 sources,
	1.299.2.1, 1.299.2.2
Message-ID: <200602282222.k1SMMROq022875@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22579

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec sources 
Log Message:
upload files & enable ia64


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.6
retrieving revision 1.1971.2.7
diff -u -r1.1971.2.6 -r1.1971.2.7
--- kernel-2.6.spec	28 Feb 2006 21:45:27 -0000	1.1971.2.6
+++ kernel-2.6.spec	28 Feb 2006 22:22:24 -0000	1.1971.2.7
@@ -162,8 +162,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 sparc sparc64 ppc64iseries s390 s390x
+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
@@ -1597,9 +1596,10 @@
 %endif
 
 %changelog
-* Tue Feb 28 2006 Juan Quintela <quintela at redhat.com> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
+* Tue Feb 28 2006 Juan Quintela <quintela at redhat.com>
 - rebase with rawhide 1.1993.
-- rebase with rawhide 1.1993
+- enable ia64 again.
+- rebase with rawhide 1.1991
 
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.299.2.1
retrieving revision 1.299.2.2
diff -u -r1.299.2.1 -r1.299.2.2
--- sources	28 Feb 2006 20:16:28 -0000	1.299.2.1
+++ sources	28 Feb 2006 22:22:24 -0000	1.299.2.2
@@ -1,2 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
+1740ae34807f687a93adf2469ea5c4fc  patch-2.6.16-rc5.bz2
+45d08cf9db21b2be6d13b4a27bb65196  patch-2.6.16-rc5-git1.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 22:53:17 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 17:53:17 -0500
Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.7,
	1.1971.2.8 linux-2.6-xen-compile-fixes.patch, 1.1.12.3, 1.1.12.4
Message-ID: <200602282253.k1SMrH7P013931@cvs.devel.redhat.com>

Author: quintela

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13887

Modified Files:
      Tag: private-xen-rebased-1971-branch
	kernel-2.6.spec linux-2.6-xen-compile-fixes.patch 
Log Message:
fix x86_64 xen build


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1971.2.7
retrieving revision 1.1971.2.8
diff -u -r1.1971.2.7 -r1.1971.2.8
--- kernel-2.6.spec	28 Feb 2006 22:22:24 -0000	1.1971.2.7
+++ kernel-2.6.spec	28 Feb 2006 22:53:14 -0000	1.1971.2.8
@@ -8,8 +8,8 @@
 # Whether to apply the Xen patches, leave this enabled.
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
-%define buildxen 0
-%define buildxenPAE 0
+%define buildxen 1
+%define buildxenPAE 1
 %define builddoc 0
 %define buildkdump 1
 
@@ -162,7 +162,8 @@
 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 s390 s390x
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -1597,9 +1598,12 @@
 
 %changelog
 * Tue Feb 28 2006 Juan Quintela <quintela at redhat.com>
+- fix x86_64 xen build.
+
+* Tue Feb 28 2006 Juan Quintela <quintela at redhat.com>
 - rebase with rawhide 1.1993.
 - enable ia64 again.
-- rebase with rawhide 1.1991
+- rebase with rawhide 1.1991.
 
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO

linux-2.6-xen-compile-fixes.patch:
 linux-2.6.15.i686/arch/i386/mach-xen/Makefile                |    2 -
 linux-2.6.15.ia64/fs/Kconfig                                 |    1 
 linux-2.6.15.new/arch/i386/mm/init-xen.c                     |    1 
 linux-2.6.15.xen/arch/i386/kernel/Makefile                   |    3 --
 linux-2.6.15.xen/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/i386/mm/init-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/acpi.h                   |    2 +
 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 +
 19 files changed, 48 insertions(+), 17 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.1.12.3
retrieving revision 1.1.12.4
diff -u -r1.1.12.3 -r1.1.12.4
--- linux-2.6-xen-compile-fixes.patch	28 Feb 2006 21:45:29 -0000	1.1.12.3
+++ linux-2.6-xen-compile-fixes.patch	28 Feb 2006 22:53:14 -0000	1.1.12.4
@@ -224,3 +224,48 @@
  obj-y				:= setup.o topology.o
 -  
 -topology-y			:= ../mach-default/topology.o
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c
+--- kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c	2006-02-28 22:47:30.000000000 +0100
++++ linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c	2006-02-28 20:26:00.000000000 +0100
+@@ -44,9 +44,6 @@ extern void __init clustered_apic_check(
+ extern int gsi_irq_sharing(int gsi);
+ #include <asm/proto.h>
+ 
+-static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; }
+-
+-
+ #else				/* X86 */
+ 
+ #ifdef	CONFIG_X86_LOCAL_APIC
+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
+@@ -60,7 +60,9 @@ int pmtimer_mark_offset(void)
+ 	delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK);
+ 
+ 	last_pmtmr_tick = tick;
++#ifndef CONFIG_XEN
+ 	monotonic_base += delta * NSEC_PER_USEC;
++#endif
+ 
+ 	delta += offset_delay;
+ 
+diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/include/asm-x86_64/acpi.h linux-2.6.15.xen/include/asm-x86_64/acpi.h
+--- kernel-2.6.15/linux-2.6.15.noarch/include/asm-x86_64/acpi.h	2006-02-28 22:47:25.000000000 +0100
++++ linux-2.6.15.xen/include/asm-x86_64/acpi.h	2006-02-28 21:24:34.000000000 +0100
+@@ -168,6 +168,7 @@ extern int unsync_tsc_on_multicluster;
+ 
+ static inline int acpi_madt_oem_check(char *oem, char *productid) 
+ { 
++#ifndef CONFIG_XEN
+ 	/* Copied from i386. Probably has too many entries. */
+ 	if (!strncmp(oem, "IBM ENSW", 8) && 
+         	(!strncmp(productid, "VIGIL SMP", 9) 
+@@ -175,6 +176,7 @@ static inline int acpi_madt_oem_check(ch
+ 			|| !strncmp(productid, "RUTHLESS SMP", 12))) {
+ 		unsync_tsc_on_multicluster = 1;
+         }
++#endif
+         return 0;
+ }
+ 



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:05:26 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:05:26 -0500
Subject: rpms/eclipse/devel eclipse-tomcat55-build.2.patch, NONE,
	1.1 eclipse-tomcat55-build.3.patch, NONE,
	1.1 eclipse-tomcat55-build.patch, NONE,
	1.1 eclipse-tomcat55.patch, NONE, 1.1 eclipse.spec, 1.248,
	1.249 eclipse-tomcat5-build.2.patch, 1.5,
	NONE eclipse-tomcat5-build.3.patch, 1.1,
	NONE eclipse-tomcat5-build.patch, 1.1,
	NONE eclipse-tomcat5.patch, 1.1,
	NONE eclipse-webapp-jasperclasspath.patch, 1.1, NONE
Message-ID: <200602282305.k1SN5Q7K016886@cvs.devel.redhat.com>

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16857

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-tomcat55-build.2.patch eclipse-tomcat55-build.3.patch 
	eclipse-tomcat55-build.patch eclipse-tomcat55.patch 
Removed Files:
	eclipse-tomcat5-build.2.patch eclipse-tomcat5-build.3.patch 
	eclipse-tomcat5-build.patch eclipse-tomcat5.patch 
	eclipse-webapp-jasperclasspath.patch 
Log Message:
* Tue Feb 28 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_11fc
- Update to tomcat 5.5 (e.o#98371).


eclipse-tomcat55-build.2.patch:
 assemble.org.eclipse.sdk.aix.motif.ppc.xml       |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml  |    2 +-
 assemble.org.eclipse.sdk.hpux.motif.ia64.xml     |    2 +-
 assemble.org.eclipse.sdk.solaris.gtk.sparc.xml   |    2 +-
 assemble.org.eclipse.sdk.solaris.motif.sparc.xml |    2 +-
 assemble.org.eclipse.sdk.win32.win32.x86.xml     |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE eclipse-tomcat55-build.2.patch ---
diff -uNr assemble.org.eclipse.sdk.aix.motif.ppc.xml assemble.org.eclipse.sdk.aix.motif.ppc.xml
--- assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.aix.motif.ppc.xml	2006-01-31 13:29:08.000000000 -0500
@@ -608,7 +608,7 @@
 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.ia64.xml assemble.org.eclipse.sdk.hpux.motif.ia64.xml
--- assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.hpux.motif.ia64.xml	2006-01-31 13:30:34.000000000 -0500
@@ -597,7 +597,7 @@
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.expressions_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.expressions_3.1.0.jar"			/>
 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.pde.doc.user_3.1.2" prefix="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"			/>
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"			/>
-			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_4.1.30.1" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
+			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.tomcat_5.5.15" prefix="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"			/>
 			<zipfileset file="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar" fullpath="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"			/>
 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.jdt.debug_3.1.1" prefix="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"			/>
 			<zipfileset dir="${eclipse.base}/plugins/org.eclipse.team.cvs.ssh2_3.1.0" prefix="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"			/>
diff -uNr assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml
--- assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.hpux.motif.PA_RISC.xml	2006-01-31 13:31:47.000000000 -0500
@@ -618,7 +618,7 @@
 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.solaris.gtk.sparc.xml assemble.org.eclipse.sdk.solaris.gtk.sparc.xml
--- assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.solaris.gtk.sparc.xml	2006-01-31 13:32:20.000000000 -0500
@@ -607,7 +607,7 @@
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} '${archiveFullPath}'"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.solaris.motif.sparc.xml assemble.org.eclipse.sdk.solaris.motif.sparc.xml
--- assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.solaris.motif.sparc.xml	2006-01-31 13:32:38.000000000 -0500
@@ -609,7 +609,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.motif.sparc_3.1.2"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>
diff -uNr assemble.org.eclipse.sdk.win32.win32.x86.xml assemble.org.eclipse.sdk.win32.win32.x86.xml
--- assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:25:28.000000000 -0500
+++ assemble.org.eclipse.sdk.win32.win32.x86.xml	2006-01-31 13:32:52.000000000 -0500
@@ -634,7 +634,7 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.win32.win32.x86_3.1.2"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.1.2"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources.compatibility_3.1.0.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_4.1.30.1"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.tomcat_5.5.15"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh_3.1.0.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.debug_3.1.1"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ssh2_3.1.0"/>

eclipse-tomcat55-build.3.patch:
 build.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-tomcat55-build.3.patch ---
diff -ru eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml eclipse-3.1.2/features/org.eclipse.platform/build.xml
--- eclipse-3.1.2.orig/features/org.eclipse.platform/build.xml	2006-02-10 01:01:11.000000000 -0500
+++ eclipse-3.1.2/features/org.eclipse.platform/build.xml	2006-02-10 01:07:56.000000000 -0500
@@ -346,7 +346,7 @@
 		<copy todir="${feature.base}/features/org.eclipse.platform_3.1.2" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclip!
se.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,5.5.15,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="copybuiltlauncher" if="libsconfig">

eclipse-tomcat55-build.patch:
 build.xml |   88 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 54 insertions(+), 34 deletions(-)

--- NEW FILE eclipse-tomcat55-build.patch ---
--- build.xml.orig	2005-05-13 14:34:52.000000000 -0400
+++ build.xml	2005-06-14 15:56:51.000000000 -0400
@@ -45,7 +45,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.30.1" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -115,44 +115,64 @@
 				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
 				<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
 				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
-				<pathelement path="catalina.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
 				<pathelement path="bootstrap.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
-				<pathelement path="commons-beanutils.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
-				<pathelement path="commons-collections.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
-				<pathelement path="commons-digester.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
-				<pathelement path="commons-logging-api.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
-				<pathelement path="commons-modeler.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
-				<pathelement path="jakarta-regexp-1.3.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
-				<pathelement path="jasper-compiler.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
-				<pathelement path="jasper-runtime.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
+				<pathelement path="catalina.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
+				<pathelement path="catalina-optional.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina-optional.jar"/>
+				<pathelement path="jakarta-commons-beanutils.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-beanutils.jar"/>
+				<pathelement path="jakarta-commons-collections.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-collections.jar"/>
+				<pathelement path="jakarta-commons-dbcp.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-dbcp.jar"/>
+				<pathelement path="jakarta-commons-digester.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-digester.jar"/>
+				<pathelement path="jakarta-commons-digester-rss.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-digester-rss.jar"/>
+				<pathelement path="jakarta-commons-el.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-el.jar"/>
+				<pathelement path="jakarta-commons-fileupload.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-fileupload.jar"/>
+				<pathelement path="jakarta-commons-launcher.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-launcher.jar"/>
+				<pathelement path="jakarta-commons-logging.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-logging.jar"/>
+				<pathelement path="jakarta-commons-modeler.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-modeler.jar"/>
+				<pathelement path="jakarta-commons-pool.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-commons-pool.jar"/>
+				<pathelement path="jasper5-compiler.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-compiler.jar"/>
+				<pathelement path="jasper5-runtime.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-runtime.jar"/>
+				<pathelement path="jspapi.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jspapi.jar"/>
+				<pathelement path="mx4j.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j.jar"/>
+				<pathelement path="mx4j-impl.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-impl.jar"/>
 				<pathelement path="mx4j-jmx.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
 				<pathelement path="naming-common.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
 				<pathelement path="naming-factory.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
+				<pathelement path="naming-java.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-java.jar"/>
 				<pathelement path="naming-resources.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
-				<pathelement path="servlet.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
+				<pathelement path="regexp.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp.jar"/>
+				<pathelement path="servletapi5.jar"/>
+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servletapi5.jar"/>
 				<pathelement path="servlets-common.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
 				<pathelement path="servlets-default.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
 				<pathelement path="servlets-invoker.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
-				<pathelement path="servlets-manager.jar"/>
-				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
 				<pathelement path="tomcat-coyote.jar"/>
 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
 				<pathelement path="tomcat-http11.jar"/>
@@ -189,11 +209,11 @@
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,*.license,META-INF/"			/>
 		</copy>
 	</target>
@@ -202,23 +222,23 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false">
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false">
 			<fileset dir="${basedir}" includes="about.html,*.license"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
-		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
+		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/tomcatwrapper.jar"/>
 		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar"/>
+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -241,7 +261,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>

eclipse-tomcat55.patch:
 .classpath                                                   |   51 -
 META-INF/MANIFEST.MF                                         |   30 
 about.html                                                   |   45 -
 src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java |   62 -
 src/org/eclipse/tomcat/internal/TomcatAppServer.java         |  398 ++++++-----
 src/org/eclipse/tomcat/internal/TomcatPlugin.java            |    3 
 6 files changed, 332 insertions(+), 257 deletions(-)

--- NEW FILE eclipse-tomcat55.patch ---
Index: .classpath
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/.classpath,v
retrieving revision 1.20
diff -u -r1.20 .classpath
--- .classpath	21 Apr 2005 23:31:58 -0000	1.20
+++ .classpath	28 Feb 2006 22:56:26 -0000
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="catalina.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="bootstrap.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-beanutils.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-collections.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-digester.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-logging-api.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-modeler.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jakarta-regexp-1.3.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-compiler.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-runtime.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="mx4j-jmx.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-common.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-factory.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-resources.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlet.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-common.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-default.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-invoker.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-manager.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-coyote.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-http11.jar"/>
-	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-util.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="catalina.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="bootstrap.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="commons-beanutils.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="commons-collections.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="commons-digester.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="commons-modeler.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="jakarta-regexp-1.3.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="jasper-compiler.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="jasper-runtime.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="mx4j-jmx.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="naming-factory.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="naming-resources.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="servlets-default.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="servlets-invoker.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="tomcat-coyote.jar"/>
+	<classpathentry kind="lib" exported="true" sourcepath="D:/tomcat4.1.30src" path="tomcat-util.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="commons-dbcp.jar"/>
+	<classpathentry kind="lib" path="commons-digester-rss.jar"/>
+	<classpathentry kind="lib" path="commons-el.jar"/>
+	<classpathentry kind="lib" path="commons-fileupload.jar"/>
+	<classpathentry kind="lib" path="commons-launcher.jar"/>
+	<classpathentry kind="lib" path="commons-logging.jar"/>
+	<classpathentry kind="lib" path="commons-pool.jar"/>
+	<classpathentry kind="lib" path="mx4j-impl.jar"/>
+	<classpathentry kind="lib" path="mx4j.jar"/>
+	<classpathentry kind="lib" path="jspapi.jar"/>
+	<classpathentry kind="lib" path="catalina-optional.jar"/>
+	<classpathentry kind="lib" path="tomcat-http.jar"/>
+	<classpathentry kind="lib" path="servletapi5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: about.html
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/about.html,v
retrieving revision 1.24
diff -u -r1.24 about.html
--- about.html	21 Jun 2005 00:52:06 -0000	1.24
+++ about.html	28 Feb 2006 22:56:26 -0000
@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
 
-<p>February 24, 2005</p>	
+<p>February 24, 2005 (modified June 14, 2005 with update to Tomcat 5.0.30)</p>
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
@@ -23,7 +23,7 @@
 
 <p>The Content includes items that have been sourced from third parties as follows:</p>
 
-<p><b>Tomcat 4.1.30</b></p>
+<p><b>Tomcat 5.0.30</b></p>
 <p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project.  Therefore:</p>
 
 <blockquote>
@@ -35,24 +35,31 @@
 <ul type="disc">
 	<li>bootstrap.jar</li>
 	<li>catalina.jar</li>
-	<li>commons-beanutils.jar</li>
-	<li>commons-collections.jar</li>
-	<li>commons-digester.jar</li>
-	<li>commons-logging.jar</li>
-	<li>commons-logging-api.jar</li>
-	<li>commons-modeler.jar</li>
-	<li>jakarta-regexp-1.3.jar</li>
-	<li>jasper-compiler.jar</li>
-	<li>jasper-runtime.jar</li>
+	<li>catalina-optional.jar</li>
+	<li>jakarta-commons-beanutils.jar</li>
+	<li>jakarta-commons-collections.jar</li>
+	<li>jakarta-commons-dbcp.jar</li>
+	<li>jakarta-commons-digester.jar</li>
+	<li>jakarta-commons-digester-rss.jar</li>
+	<li>jakarta-commons-el.jar</li>
+	<li>jakarta-commons-fileupload.jar</li>
+	<li>jakarta-commons-launcher.jar</li>
+	<li>jakarta-commons-logging.jar</li>
+	<li>jakarta-commons-modeler.jar</li>
+	<li>jakarta-commons-pool.jar</li>
+	<li>jasper5-compiler.jar</li>
+	<li>jasper5-runtime.jar</li>
+	<li>mx4j.jar</li>
+	<li>mx4j-impl.jar</li>
 	<li>mx4j-jmx.jar</li>
 	<li>naming-common.jar</li>
 	<li>naming-factory.jar</li>
 	<li>naming-resources.jar</li>
-	<li>servlet.jar</li>
+	<li>regexp.jar</li>
+	<li>servletapi5.jar</li>
 	<li>servlets-common.jar</li>
 	<li>servlets-default.jar</li>
 	<li>servlets-invoker.jar</li>
-	<li>servlets-manager.jar</li>
 	<li>tomcat-coyote.jar</li>
 	<li>tomcat-http11.jar</li>
 	<li>tomcat-util.jar</li>
@@ -66,10 +73,10 @@
 
 <p>Tomcat is:</p>
 
-<blockquote>Copyright (c) 1999, 2000 The Apache Software Foundation. All rights reserved.</blockquote>
+<blockquote>Copyright (c) 1999-2003 The Apache Software Foundation. All rights reserved.</blockquote>
 
-<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
-<a href="http://www.apache.org/licenses/LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a>.  More specifically:</p>
+<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 2.0 which is available at
+<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.  More specifically:</p>
 <blockquote>
 	1. Redistributions of source code must retain the above copyright notice, this list of<br>
 	conditions and the following disclaimer.<br>
@@ -107,11 +114,11 @@
 
 <p>Source code for Tomcat is available at <a href="http://jakarta.apache.org/tomcat/">http://jakarta.apache.org/tomcat/</a>.</p>
 
-<strong>MX4J 1.1.1</strong>
+<strong>MX4J 2.1.0</strong>
 
-<p></p>Tomcat 4.1.30 includes mx4j-jmx.jar from MX4J 1.1.1.  MX4J is:</p>
+<p></p>Tomcat 5.0.30 includes mx4j.jar, mx4j-jmx.jar and mx4j-impl.jar from MX4J 2.1.0.  MX4J is:</p>
 
-<blockquote>Copyright (c) 2001 MX4J.  All rights reserved.</blockquote>
+<blockquote>Copyright (c) 2001-2004 MX4J contributors.  All rights reserved.</blockquote>
 
 <p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
 with the Content in the file <a href="mx4j.license">mx4j.license</a>.  More specifically: </p>
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
retrieving revision 1.14
diff -u -r1.14 MANIFEST.MF
--- META-INF/MANIFEST.MF	19 May 2005 04:05:11 -0000	1.14
+++ META-INF/MANIFEST.MF	28 Feb 2006 22:56:42 -0000
@@ -2,29 +2,34 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
-Bundle-Version: 4.1.30.1
-Bundle-ClassPath: tomcatwrapper.jar,
+Bundle-Version: 5.5.15
+Bundle-ClassPath: bootstrap.jar,
+ catalina-optional.jar,
  catalina.jar,
- bootstrap.jar,
  commons-beanutils.jar,
  commons-collections.jar,
+ commons-dbcp.jar,
+ commons-digester-rss.jar,
  commons-digester.jar,
- commons-logging-api.jar,
+ commons-el.jar,
+ commons-fileupload.jar,
+ commons-launcher.jar,
+ commons-logging.jar,
  commons-modeler.jar,
+ commons-pool.jar,
  jakarta-regexp-1.3.jar,
  jasper-compiler.jar,
  jasper-runtime.jar,
+ jspapi.jar,
+ mx4j-impl.jar,
  mx4j-jmx.jar,
- naming-common.jar,
+ mx4j.jar,
  naming-factory.jar,
  naming-resources.jar,
- servlet.jar,
- servlets-common.jar,
  servlets-default.jar,
  servlets-invoker.jar,
- servlets-manager.jar,
  tomcat-coyote.jar,
- tomcat-http11.jar,
+ tomcat-http.jar,
  tomcat-util.jar
 Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
 Bundle-Vendor: %providerName
@@ -54,8 +59,6 @@
  mx4j.util;x-internal:=true,
  org.apache.catalina;x-internal:=true,
  org.apache.catalina.connector;x-internal:=true,
- org.apache.catalina.connector.http;x-internal:=true,
- org.apache.catalina.connector.http10;x-internal:=true,
  org.apache.catalina.realm;x-internal:=true,
  org.apache.catalina.servlets;x-internal:=true,
  org.apache.commons.beanutils;x-internal:=true,
@@ -82,10 +85,9 @@
  org.apache.coyote.tomcat4;x-internal:=true,
  org.apache.jasper;x-internal:=true,
  org.apache.jasper.compiler;x-internal:=true,
- org.apache.jasper.logging;x-internal:=true,
  org.apache.jasper.runtime;x-internal:=true,
  org.apache.jasper.servlet;x-internal:=true,
- org.apache.jasper.util;x-internal:=true,
+ org.apache.jasper.util,
  org.apache.jasper.xmlparser;x-internal:=true,
  org.apache.naming;x-internal:=true,
  org.apache.naming.factory;x-internal:=true,
@@ -96,11 +98,9 @@
  org.apache.tomcat.util.buf;x-internal:=true,
  org.apache.tomcat.util.collections;x-internal:=true,
  org.apache.tomcat.util.compat;x-internal:=true,
- org.apache.tomcat.util.handler;x-internal:=true,
  org.apache.tomcat.util.http;x-internal:=true,
  org.apache.tomcat.util.http.mapper;x-internal:=true,
  org.apache.tomcat.util.log;x-internal:=true,
- org.apache.tomcat.util.mx;x-internal:=true,
  org.apache.tomcat.util.net;x-internal:=true,
  org.apache.tomcat.util.net.jsse;x-internal:=true,
  org.apache.tomcat.util.res;x-internal:=true,
Index: src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java,v
retrieving revision 1.8
diff -u -r1.8 EclipseErrorReportValve.java
--- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	23 May 2005 03:58:04 -0000	1.8
+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	28 Feb 2006 22:56:42 -0000
@@ -69,15 +69,27 @@
 package org.eclipse.tomcat.internal;
 
 
-import java.io.*;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import org.apache.catalina.*;
-import org.apache.catalina.util.*;
-import org.apache.catalina.valves.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Locale;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import mx4j.log.Logger;
+
+import org.apache.catalina.Globals;
+import org.apache.catalina.Valve;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.util.RequestUtil;
+import org.apache.catalina.util.StringManager;
+import org.apache.catalina.valves.Constants;
+import org.apache.catalina.valves.ValveBase;
 import org.eclipse.core.runtime.Platform;
 
 
@@ -145,18 +157,18 @@
      * @exception IOException if an input/output error occurs
      * @exception ServletException if a servlet error occurs
      */
-    public void invoke(Request request, Response response,
-                       ValveContext context)
+    public void invoke(Request request, Response response)
         throws IOException, ServletException {
 
         // Perform the request
-        context.invokeNext(request, response);
+        Valve nextValve = getNext();
+        nextValve.invoke(request, response);
 
-        ServletRequest sreq = (ServletRequest) request;
+        ServletRequest sreq = request;
         Throwable throwable = 
             (Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);
 
-        ServletResponse sresp = (ServletResponse) response;
+        ServletResponse sresp = response;
         if (sresp.isCommitted()) {
             return;
         }
@@ -173,7 +185,7 @@
                 ;
             }
 
-            ServletResponse sresponse = (ServletResponse) response;
+            ServletResponse sresponse = response;
             if (sresponse instanceof HttpServletResponse)
                 ((HttpServletResponse) sresponse).sendError
                     (HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -219,15 +231,9 @@
                           Throwable throwable)
         throws IOException {
 
-        // Do nothing on non-HTTP responses
-        if (!(response instanceof HttpResponse))
-            return;
-        HttpResponse hresponse = (HttpResponse) response;
-        if (!(response instanceof HttpServletResponse))
-            return;
-        HttpServletResponse hres = (HttpServletResponse) response;
-        int statusCode = hresponse.getStatus();
-        String message = RequestUtil.filter(hresponse.getMessage());
+        HttpServletResponse hres = response;
+        int statusCode = response.getStatus();
+        String message = RequestUtil.filter(response.getMessage());
         if (message == null)
             message = "";
 
@@ -373,9 +379,9 @@
      */
     protected void log(String message) {
 
-        Logger logger = container.getLogger();
+        Logger logger = (Logger) container.getLogger();
         if (logger != null)
-            logger.log(this.toString() + ": " + message);
+            logger.info(this.toString() + ": " + message);
         else
             System.out.println(this.toString() + ": " + message);
 
@@ -390,9 +396,9 @@
      */
     protected void log(String message, Throwable throwable) {
 
-        Logger logger = container.getLogger();
+        Logger logger = (Logger) container.getLogger();
         if (logger != null)
-            logger.log(this.toString() + ": " + message, throwable);
+            logger.info(this.toString() + ": " + message, throwable);
         else {
             System.out.println(this.toString() + ": " + message);
             throwable.printStackTrace(System.out);
Index: src/org/eclipse/tomcat/internal/TomcatAppServer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java,v
retrieving revision 1.43
diff -u -r1.43 TomcatAppServer.java
--- src/org/eclipse/tomcat/internal/TomcatAppServer.java	22 Jun 2005 15:29:56 -0000	1.43
+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java	28 Feb 2006 22:56:42 -0000
@@ -17,21 +17,21 @@
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 
-import org.apache.catalina.Connector;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Realm;
+import org.apache.catalina.connector.Connector;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.logger.FileLogger;
 import org.apache.catalina.realm.MemoryRealm;
 import org.apache.catalina.startup.Embedded;
-import org.apache.coyote.tomcat4.CoyoteConnector;
-import org.apache.coyote.tomcat4.CoyoteServerSocketFactory;
+import org.apache.coyote.http11.Http11Protocol;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -91,27 +91,39 @@
      *      java.lang.String)
      */
     public synchronized void start(int port, String hostAddress) throws CoreException {
-        this.hostAddress = hostAddress;
+    	// if null passed for hostAddress, use local host
+    	if (hostAddress == null) {
+    		this.hostAddress = "127.0.0.1";
+    	} else {
+    		this.hostAddress = hostAddress;
+    	}
+    	
+    	InetAddress iAddress = null;
+        
+    	// Defaults to LOCALHOST
+    	try {
+    		iAddress = InetAddress.getByName(this.hostAddress);
+    	} catch (UnknownHostException uhe) {
+    		// will default to all interfaces
+    	}
+    	
+    	String hostname = iAddress.getHostName();
+    	
         this.port = port;
 
         if (isStarted) {
-            return;
+        	return;
         }
         isStarted = true;
         try {
-            FileLogger logger = new FileLogger();
-            logger.setDirectory(TomcatPlugin.getDefault().getStateLocation()
-                    .toOSString());
-            embedded = new Embedded(logger, new MemoryRealm());
-            embedded.setDebug(0);
-            embedded.setLogger(logger);
-            URL installURL = TomcatPlugin.getDefault().getBundle()
-                    .getEntry("/"); //$NON-NLS-1$
-            URL resolvedURL = Platform.resolve(installURL);
-            String home = Platform.asLocalURL(resolvedURL).getFile();
-            System.setProperty("catalina.home", home); //$NON-NLS-1$
-            String base = home;
-            System.setProperty("catalina.base", base); //$NON-NLS-1$
+        	embedded = new Embedded(new MemoryRealm());
+        	URL installURL = TomcatPlugin.getDefault().getBundle()
+					.getEntry("/"); //$NON-NLS-1$
+			URL resolvedURL = Platform.resolve(installURL);
+			String home = Platform.asLocalURL(resolvedURL).getFile();
+			System.setProperty("catalina.home", home); //$NON-NLS-1$
+			String base = home;
+			System.setProperty("catalina.base", base); //$NON-NLS-1$
 
             // Set up realm if one found
             if (TomcatPlugin.getDefault().getPluginPreferences().getInt(
@@ -119,14 +131,22 @@
                 Realm realm = getRealm();
                 embedded.setRealm(realm);
             }
+            
+            //the embedded application is now started by using embedded.start()
+            embedded.addLifecycleListener(new LifecycleListener(){
+                        public void lifecycleEvent(LifecycleEvent event) {
+                            if (Lifecycle.START_EVENT.equals(event.getType()))
+                                running = true;
+                        }
 
+            });
             // start now, and then add all the contexts..
             embedded.start();
-
+            
             // Create a very basic container hierarchy
             engine = embedded.createEngine();
 
-            host = embedded.createHost("localhost", home + "/webapps"); //$NON-NLS-1$ //$NON-NLS-2$
+            host = embedded.createHost(hostname, home + "/webapps"); //$NON-NLS-1$ //$NON-NLS-2$
 
             // all request go to our only host
             engine.setDefaultHost(host.getName());
@@ -136,7 +156,7 @@
                         .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$
             }
             engine.addChild(host);
-
+            
             // Install the assembled container hierarchy
             PrintStream sysOut = System.out;
             // reassign standard output to prevent Tomcat from writing
@@ -146,8 +166,8 @@
                 embedded.addEngine(engine);
             } finally {
                 System.setOut(sysOut);
-            }
-
+            }           
+            
             // Root context
             Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$
             // this line should be replaced once tomcat provides support
@@ -156,103 +176,97 @@
                 ((StandardContext) root)
                         .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
             }
+            
             root.setLoader(embedded.createLoader(this.getClass()
                     .getClassLoader()));
-            contexts.add(root);
-            host.addChild(root);
 
-            InetAddress iAddress = null;
-            if (this.hostAddress != null) {
-                try {
-                    iAddress = InetAddress.getByName(this.hostAddress);
-                } catch (UnknownHostException uhe) {
-                    // will default to all interfaces
-                }
-            }
+            host.addChild(root);
+            contexts.add(root);
+            
             updateSslPort(iAddress);
             if (this.port == 0) {
-                this.port = SocketUtil.findUnusedLocalPort(iAddress); //$NON-NLS-1$
+                this.port = SocketUtil.findUnusedLocalPort(iAddress);
                 if (this.port == -1) {
                     throw new CoreException(
                             new Status(
                                     IStatus.ERROR,
                                     TomcatPlugin.PLUGIN_ID,
                                     IStatus.OK,
-                                    TomcatResources.TomcatAppServer_start_CannotObtainPort, //$NON-NLS-1$
+                                    TomcatResources.TomcatAppServer_start_CannotObtainPort,
                                     null));
                 }
             }
 
             // Create Connector
-            Connector connector = embedded.createConnector(null, this.port,
-                    false);
-            // Override defaults on CoyoteConnector
-            if (connector instanceof CoyoteConnector) {
-                CoyoteConnector connectorImpl = (CoyoteConnector) connector;
-                if (iAddress != null) {
-                    // bug in Embedded that incorrectly sets host on connector.
-                    // pass null when creating connector, and set host here if
-                    // it is specified
-                    connectorImpl.setAddress(iAddress.getHostAddress());
-                }
-                Preferences pref = TomcatPlugin.getDefault()
-                        .getPluginPreferences();
-                int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
-                if (acceptCount > 0) {
-                    connectorImpl.setAcceptCount(acceptCount);
-                }
-                int maxProcessors = pref
-                        .getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
-                if (maxProcessors > 0) {
-                    connectorImpl.setMaxProcessors(maxProcessors);
-                }
-                int minProcessors = pref
-                        .getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
-                if (minProcessors > 0) {
-                    connectorImpl.setMinProcessors(minProcessors);
-                }
-                if (this.sslPort > 0) {
-                    connectorImpl.setRedirectPort(this.sslPort);
-                    connectorImpl.setEnableLookups(true);
-                    connectorImpl.setConnectionTimeout(20000);
-                    connectorImpl.setUseURIValidationHack(false);
-                    connectorImpl.setDisableUploadTimeout(true);
-                }
-                // connectorImpl.setDebug(0);
-                // If there is problem in embedded.addConnector()
-                // there is no exception, so add a listener
-                connectorImpl.addLifecycleListener(new LifecycleListener() {
-                    public void lifecycleEvent(LifecycleEvent event) {
-                        if ("start".equals(event.getType())) //$NON-NLS-1$
-                            running = true;
-                    }
-                });
+            Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false);;
+
+            Preferences pref = TomcatPlugin.getDefault()
+                    .getPluginPreferences();
+            /**
+             * To extend additional properties, make use of org.apache.tomcat.util.IntrospectionUtils
+             * A Connector will initialize a protocolhandler defaults to org.apache.coyote.http11.Http11Protocol
+             * format : connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE");
+             *
+             */
+
+            int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
+            if (acceptCount > 0) {
+                connector.setProperty("backlog",""+acceptCount);
             }
 
+            int maxProcessors = pref
+            .getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
+            if (maxProcessors > 0) {
+            	connector.setProperty("maxThreads",""+maxProcessors);
+            }
+            
+            int minProcessors = pref
+            .getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
+            if (minProcessors > 0) {
+            	connector.setProperty("minSpareThreads",""+minProcessors);
+            }
+            
+            if (this.sslPort > 0) {
+            	connector.setRedirectPort(this.sslPort);
+            	connector.setEnableLookups(true);
+            	connector.setProperty("soTimeout",""+20000);
+            	// connector.setUseURIValidationHack(false); no longer available
+            	connector.setUseBodyEncodingForURI(false);
+            	String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT);
+            	if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$
+            		connector.setProperty("disableUploadTimeout", disableUploadTimeout);
+            	}
+            }
+            
+            // connectorImpl.setDebug(0);
+            // If there is problem in embedded.addConnector()
+            // there is no exception, so add a listener
+//            connector.addLifecycleListener(new LifecycleListener() {
+//                public void lifecycleEvent(LifecycleEvent event) {
+//                    if (Lifecycle.START_EVENT.equals(event.getType()))
+//                        hasConnection = true;
+//                }
+//            });
+
             // add Connector to Tomcat
             PrintStream sysErr = System.err;
             // reassign standard error to prevent Coyote from writing
             // its version message there.
             System.setErr(new PrintStream(new ByteArrayOutputStream()));
             try {
-                embedded.addConnector(connector);
-                httpConnector = connector;
+                this.httpConnector = connector;
+                embedded.addConnector(this.httpConnector);
+                httpConnector.start();
             } finally {
                 System.setErr(sysErr);
             }
-
             if (this.sslPort > 0) {
                 createSSLConnector(iAddress, this.sslPort);
             }
 
-            // if null passed for hostAddress, use local host
-            if (this.hostAddress == null) {
-                this.hostAddress = "127.0.0.1"; //$NON-NLS-1$
-            }
-
             // running = true;
             TomcatPlugin.getDefault().setAppserver(this);
-
+            
         } catch (Exception exc) {
             TomcatPlugin
                     .logError(
@@ -306,91 +320,129 @@
      * @throws CoreException
      */
     private void createSSLConnector(InetAddress iAddress, int sslport)
-            throws CoreException {
-        // Create Connector
-        this.sslConnector = embedded.createConnector(null, sslport, false);
-        // Override defaults on CoyoteConnector
-        if (this.sslConnector instanceof CoyoteConnector) {
-            CoyoteConnector connectorImpl = (CoyoteConnector) this.sslConnector;
-            if (iAddress != null) {
-                // bug in Embedded that incorrectly sets host on connector.
-                // pass null when creating connector, and set host here if
-                // it is specified
-                connectorImpl.setAddress(iAddress.getHostAddress());
-            }
-            Preferences pref = TomcatPlugin.getDefault().getPluginPreferences();
-            int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
-            if (acceptCount > 0) {
-                connectorImpl.setAcceptCount(acceptCount);
-            }
-            int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
-            if (maxProcessors > 0) {
-                connectorImpl.setMaxProcessors(maxProcessors);
-            }
-            int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
-            if (minProcessors > 0) {
-                connectorImpl.setMinProcessors(minProcessors);
-            }
-            connectorImpl.setUseURIValidationHack(false);
-            connectorImpl.setDisableUploadTimeout(true);
-            connectorImpl.setSecure(true);
-            String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME);
-            if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$
-                connectorImpl.setScheme(scheme);
-            }
-            connectorImpl.setEnableLookups(true);
-            CoyoteServerSocketFactory factory = new CoyoteServerSocketFactory();
-            factory.setClientAuth(false);
-            String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL);
-            if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$
-                factory.setProtocol(protocol);
-            }
-            String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM);
-            if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$
-                factory.setAlgorithm(algorithm);
-            }
-            String keyStoreFile = pref
-                    .getString(TomcatPlugin.PREF_KEY_STORE_FILE);
-            if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$
-                factory.setKeystoreFile(keyStoreFile);
-            }
-            String keyStorePassword = pref
-                    .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD);
-            if ((keyStorePassword != null)
-                    && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$
-                factory.setKeystorePass(keyStorePassword);
-            }
-            connectorImpl.setFactory(factory);
-            connectorImpl.setDebug(0);
-            // If there is problem in embedded.addConnector()
-            // there is no exception, so add a listener
-            connectorImpl.addLifecycleListener(new LifecycleListener() {
-                public void lifecycleEvent(LifecycleEvent event) {
-                    if ("start".equals(event.getType())) //$NON-NLS-1$
-                        running = true;
-                }
-            });
-        }
-
-        // add Connector to Tomcat
-        PrintStream sysErr = System.err;
-        // reassign standard error to prevent Coyote from writing
-        // its version message there.
-        System.setErr(new PrintStream(new ByteArrayOutputStream()));
-        try {
-            embedded.addConnector(this.sslConnector);
-        } finally {
-            System.setErr(sysErr);
-        }
-    }
-
-    /**
-     * Creates a {@link Realm}object using the information contained in
-     * extensions of the type org.eclipse.tomcat.realmfactory in the plugin
-     * registry.
-     * 
-     * @return the {@link Realm}object created
-     */
+			throws CoreException {
+		// Create Connector
+		// Defaults to local if iAddress is null
+		Connector connector = embedded.createConnector(iAddress
+				.getHostAddress(), this.port, false);
+
+		// --------------------create the Protocol-----------------------//
+		Preferences pref = TomcatPlugin.getDefault().getPluginPreferences();
+		/**
+		 * To extend additional properties, make use of
+		 * org.apache.tomcat.util.IntrospectionUtils A Connector will initialize
+		 * a protocolhandler which initialize a SSLImplementation which
+		 * initialize a ServerSocketFactory format :
+		 * connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE");
+		 * 
+		 */
+		// ----------------configure connector -------------------------------//
+		// by looking at the code, it seems like the protocol go in first
+		String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL);
+		if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$
+			connector.setProperty("protocol", protocol);
+		}
+		String protocols = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOLS);
+		if ((protocols != null) && (!("".equals(protocols.trim())))) { //$NON-NLS-1$
+			connector.setProperty("protocols", protocols);
+		}
+		String protocolClassName = Http11Protocol.class.getName();
+		connector.setProtocol(protocolClassName);
+
+		String JSSEImplementationName = JSSEImplementation.class.getName();
+		connector.setProperty("sslImplementation", JSSEImplementationName);
+
+		String disableUploadTimeout = pref
+				.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT);
+		if ((disableUploadTimeout != null)
+				&& (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$
+			connector.setProperty("disableUploadTimeout", disableUploadTimeout);
+		}
+
+		String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM);
+		if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$
+			connector.setProperty("algorithm", algorithm);
+		}
+		int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
+		if (maxProcessors > 0) {
+			// connector.setMaxProcessors(maxProcessors);
+			connector.setProperty("maxThreads", "" + maxProcessors);
+		}
+		int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
+		if (minProcessors > 0) {
+			// connector.setMinProcessors(minProcessors);
+			connector.setProperty("minSpareThreads", "" + minProcessors);
+		}
+		// this is making use of org.apache.tomcat.util.IntrospectionUtils
+		connector.setProperty("disableUploadTimeout", "" + true);
+		String clientauth = pref
+				.getString(TomcatPlugin.PREF_CLIENT_AUTHENTICATION);
+		if ((clientauth != null) && (!("".equals(clientauth.trim())))) { //$NON-NLS-1$
+			connector.setProperty("clientauth", clientauth);
+		}
+
+		int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
+		if (acceptCount > 0) {
+			connector.setProperty("backlog", "" + acceptCount);
+		}
+
+		String keyStoreFile = pref.getString(TomcatPlugin.PREF_KEY_STORE_FILE);
+		if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$
+			connector.setProperty("keystore", keyStoreFile);
+		}
+		String keyStorePassword = pref
+				.getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD);
+		if ((keyStorePassword != null)
+				&& (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$
+			connector.setProperty("keypass", keyStorePassword);
+		}
+		// connector.setUseURIValidationHack(false); --no longer avaliable, hope
+		// they fixed the bug
+		connector.setUseBodyEncodingForURI(false);
+		// connector.setSecure(true); ---setting ssLImplementation set secure to
+		// true
+		String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME);
+		if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$
+			connector.setScheme(scheme);
+		}
+		connector.setEnableLookups(true);
+
+		// connector.setFactory(factory); --no longer needed, now handled by
+		// SSLImplemenatation
+		// If there is problem in embedded.addConnector()
+		// there is no exception, so add a listener
+//		connector.addLifecycleListener(new LifecycleListener() {
+//			public void lifecycleEvent(LifecycleEvent event) {
+//				if (Lifecycle.START_EVENT.equals(event.getType())
+//						|| Lifecycle.PERIODIC_EVENT.equals(event.getType()))
+//					hasSSLConnection = true;
+//			}
+//		});
+		// add Connector to Tomcat
+		PrintStream sysErr = System.err;
+		// reassign standard error to prevent Coyote from writing
+		// its version message there.
+		System.setErr(new PrintStream(new ByteArrayOutputStream()));
+		try {
+			sslConnector = connector;
+			embedded.addConnector(this.sslConnector);
+			sslConnector.start();
+		} catch (LifecycleException e) {
+			TomcatPlugin.logError(
+					"Exception occurred while establishing secure connection.", //$NON-NLS-1$
+					e);
+		} finally {
+			System.setErr(sysErr);
+		}
+	}
+
+    /**
+	 * Creates a {@link Realm}object using the information contained in
+	 * extensions of the type org.eclipse.tomcat.realmfactory in the plugin
+	 * registry.
+	 * 
+	 * @return the {@link Realm}object created
+	 */
     private Realm getRealm() {
         IExtensionRegistry registry = Platform.getExtensionRegistry();
         IExtensionPoint extensionPoint = registry.getExtensionPoint(
Index: src/org/eclipse/tomcat/internal/TomcatPlugin.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java,v
retrieving revision 1.24
diff -u -r1.24 TomcatPlugin.java
--- src/org/eclipse/tomcat/internal/TomcatPlugin.java	23 May 2005 03:58:20 -0000	1.24
+++ src/org/eclipse/tomcat/internal/TomcatPlugin.java	28 Feb 2006 22:56:42 -0000
@@ -24,13 +24,16 @@
 	public final static String PREF_ACCEPT_COUNT = "acceptCount"; //$NON-NLS-1$
 	public final static String PREF_MAX_PROCESSORS = "maxProcessors"; //$NON-NLS-1$
 	public final static String PREF_MIN_PROCESSORS = "minProcessors"; //$NON-NLS-1$
+	public final static String DISABLE_UPLOAD_TIMEOUT = "disableUploadTimeout"; //$NON-NLS-1$
 
 	public final static String PREF_SSL_PORT = "sslPort"; //$NON-NLS-1$
 	public final static String PREF_SSL_PROTOCOL = "sslProtocol"; //$NON-NLS-1$
+	public final static String PREF_SSL_PROTOCOLS = "sslProtocols"; //$NON-NLS-1$
 	public final static String PREF_SSL_SCHEME = "sslScheme"; //$NON-NLS-1$
 	public final static String PREF_SSL_ALGORITHM = "sslAlgorithm"; //$NON-NLS-1$
 	public final static String PREF_KEY_STORE_FILE = "keyStoreFile"; //$NON-NLS-1$
 	public final static String PREF_KEY_STORE_PASSWORD = "keyStorePassword"; //$NON-NLS-1$
+	public final static String PREF_CLIENT_AUTHENTICATION = "clientauth"; //$NON-NLS-1$
 	
 	private static TomcatPlugin plugin;
 //	private static BundleContext bundleContext;


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- eclipse.spec	17 Feb 2006 22:05:00 -0000	1.248
+++ eclipse.spec	28 Feb 2006 23:05:11 -0000	1.249
@@ -22,7 +22,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_10fc
+Release:        1jpp_11fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -58,9 +58,9 @@
 # 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
+#Patch13:	%{name}-s390ands390x.patch
 # Stupid spaces in directories ...
-Patch14:	%{name}-s390ands390x2.patch
+#Patch14:	%{name}-s390ands390x2.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
@@ -78,13 +78,15 @@
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
 Patch24: 	%{name}-fileinitializer.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
-Patch28: 	%{name}-tomcat5.patch
-Patch29: 	%{name}-tomcat5-build.patch
-Patch30: 	%{name}-tomcat5-build.2.patch
-Patch50:        %{name}-tomcat5-build.3.patch
-Patch31: 	%{name}-webapp-tomcat5.patch
+Patch28: 	%{name}-tomcat55.patch
+Patch29: 	%{name}-tomcat55-build.patch
+Patch30: 	%{name}-tomcat55-build.2.patch
+Patch50:        %{name}-tomcat55-build.3.patch
+Patch31: 	%{name}-webapp-tomcat55.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
 Patch33:        %{name}-compare-create-api.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
@@ -102,7 +104,6 @@
 Patch42:	%{name}-libswt-cairo1.0-2.patch
 Patch43:	%{name}-libswt-cairo1.0-3.patch
 Patch44:	%{name}-libswt-cairo1.0-4.patch
-Patch45:	%{name}-webapp-jasperclasspath.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
@@ -206,7 +207,8 @@
 Requires:       /usr/bin/mozilla
 Requires:       java-javadoc
 
-PreReq:         gtk2 >= 2.6
+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
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
@@ -402,9 +404,6 @@
 pushd plugins/org.eclipse.swt.tools/JNI\ Generation/
 %patch44
 popd
-pushd plugins/org.eclipse.help.webapp
-%patch45
-popd
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
 %patch46
 popd
@@ -495,44 +494,36 @@
 # END LUCENE ##
 ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
-rm -f plugins/org.eclipse.tomcat/commons-beanutils.jar
-rm -f plugins/org.eclipse.tomcat/commons-collections.jar
-rm -f plugins/org.eclipse.tomcat/commons-digester.jar
-rm -f plugins/org.eclipse.tomcat/commons-logging-api.jar
-rm -f plugins/org.eclipse.tomcat/commons-modeler.jar
-rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
 rm -f plugins/org.eclipse.tomcat/servlet.jar
 rm -f plugins/org.eclipse.tomcat/servlets-manager.jar
 ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
 ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
 ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
-ln -sf %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat/jakarta-commons-beanutils.jar
-ln -sf %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar
-ln -sf %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat/jakarta-commons-dbcp.jar
-ln -sf %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat/jakarta-commons-digester.jar
-ln -sf %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat/jakarta-commons-digester-rss.jar
-ln -sf %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat/jakarta-commons-el.jar
-ln -sf %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat/jakarta-commons-fileupload.jar
-ln -sf %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat/jakarta-commons-launcher.jar
-ln -sf %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat/jakarta-commons-logging.jar
-ln -sf %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat/jakarta-commons-modeler.jar
-ln -sf %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat/jakarta-commons-pool.jar
-ln -sf %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat/jasper-compiler.jar
-ln -sf %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
+ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat/commons-beanutils.jar
+ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar
+ln -sf %{_javadir}/commons-dbcp.jar plugins/org.eclipse.tomcat/commons-dbcp.jar
+ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat/commons-digester.jar
+ln -sf %{_javadir}/commons-digester-rss.jar plugins/org.eclipse.tomcat/commons-digester-rss.jar
+ln -sf %{_javadir}/commons-el.jar plugins/org.eclipse.tomcat/commons-el.jar
+ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat/commons-fileupload.jar
+ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat/commons-launcher.jar
+ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat/commons-logging.jar
+ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat/commons-modeler.jar
+ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat/commons-pool.jar
+ln -sf %{_javadir}/jasper-compiler.jar  plugins/org.eclipse.tomcat/jasper-compiler.jar
+ln -sf %{_javadir}/jasper-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
 ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.jar
 ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
 ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
 ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
 ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
 ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
-ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/regexp.jar
+ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
 ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
+ln -sf %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat/tomcat-http.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
 ## END TOMCAT ##
 ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar
@@ -866,44 +857,36 @@
 # END LUCENE ##
 ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
-rm -f plugins/org.eclipse.tomcat_*/commons-beanutils.jar
-rm -f plugins/org.eclipse.tomcat_*/commons-collections.jar
-rm -f plugins/org.eclipse.tomcat_*/commons-digester.jar
-rm -f plugins/org.eclipse.tomcat_*/commons-logging-api.jar
-rm -f plugins/org.eclipse.tomcat_*/commons-modeler.jar
-rm -f plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
 rm -f plugins/org.eclipse.tomcat_*/servlet.jar
 rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar
 ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
 ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
 ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
-ln -sf %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat_*/jakarta-commons-beanutils.jar
-ln -sf %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat_*/jakarta-commons-collections.jar
-ln -sf %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat_*/jakarta-commons-dbcp.jar
-ln -sf %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester.jar
-ln -sf %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester-rss.jar
-ln -sf %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat_*/jakarta-commons-el.jar
-ln -sf %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat_*/jakarta-commons-fileupload.jar
-ln -sf %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat_*/jakarta-commons-launcher.jar
-ln -sf %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat_*/jakarta-commons-logging.jar
-ln -sf %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat_*/jakarta-commons-modeler.jar
-ln -sf %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat_*/jakarta-commons-pool.jar
-ln -sf %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat_*/jasper-compiler.jar
-ln -sf %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
+ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat_*/commons-beanutils.jar
+ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat_*/commons-collections.jar
+ln -sf %{_javadir}/commons-dbcp.jar plugins/org.eclipse.tomcat_*/commons-dbcp.jar
+ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat_*/commons-digester.jar
+ln -sf %{_javadir}/commons-digester-rss.jar plugins/org.eclipse.tomcat_*/commons-digester-rss.jar
+ln -sf %{_javadir}/commons-el.jar plugins/org.eclipse.tomcat_*/commons-el.jar
+ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat_*/commons-fileupload.jar
+ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat_*/commons-launcher.jar
+ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat_*/commons-logging.jar
+ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat_*/commons-modeler.jar
+ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat_*/commons-pool.jar
+ln -sf %{_javadir}/jasper-compiler.jar  plugins/org.eclipse.tomcat_*/jasper-compiler.jar
+ln -sf %{_javadir}/jasper-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
 ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.jar
 ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
 ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
 ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
 ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
 ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
-ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/regexp.jar
+ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat_*/regexp-1.3.jar
 ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
 ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar
 ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
 ## END TOMCAT ##
 ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
@@ -1284,6 +1267,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
 
 %changelog
+* Tue Feb 28 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_11fc
+- Update to tomcat 5.5 (e.o#98371).
+
 * Fri Feb 17 2006 Igor Foox <ifoox at redhat.com> - 1:3.1.2-1jpp_10fc
 - Added patch for ppc64.
 


--- eclipse-tomcat5-build.2.patch DELETED ---


--- eclipse-tomcat5-build.3.patch DELETED ---


--- eclipse-tomcat5-build.patch DELETED ---


--- eclipse-tomcat5.patch DELETED ---


--- eclipse-webapp-jasperclasspath.patch DELETED ---



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:06:34 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:06:34 -0500
Subject: rpms/gcc/devel .cvsignore, 1.137, 1.138 gcc41.spec, 1.41,
	1.42 sources, 1.139, 1.140
Message-ID: <200602282306.k1SN6Y14017047@cvs.devel.redhat.com>

Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16920

Modified Files:
	.cvsignore gcc41.spec sources 
Log Message:
4.1.0-1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- .cvsignore	27 Feb 2006 16:57:32 -0000	1.137
+++ .cvsignore	28 Feb 2006 23:06:23 -0000	1.138
@@ -1 +1 @@
-gcc-4.1.0-20060227.tar.bz2
+gcc-4.1.0-20060228.tar.bz2


Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gcc41.spec	27 Feb 2006 22:41:17 -0000	1.41
+++ gcc41.spec	28 Feb 2006 23:06:24 -0000	1.42
@@ -1,6 +1,6 @@
-%define DATE 20060227
+%define DATE 20060228
 %define gcc_version 4.1.0
-%define gcc_release 0.31
+%define gcc_release 1
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64
@@ -104,12 +104,8 @@
 Patch7: gcc41-ada-tweaks.patch
 Patch8: gcc41-java-slow_pthread_self.patch
 Patch9: gcc41-ppc32-retaddr.patch
-Patch10: gcc41-fortran-matmul.patch
-Patch11: gcc41-fortran-where-opt.patch
-Patch12: gcc41-x86_64-sse3.patch
-Patch13: gcc41-mni.patch
-Patch14: gcc41-floatunXiYf.patch
-Patch15: gcc41-pr26208.patch
+Patch10: gcc41-x86_64-sse3.patch
+Patch11: gcc41-mni.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -398,14 +394,10 @@
 %patch7 -p0 -b .ada-tweaks~
 %patch8 -p0 -b .java-slow_pthread_self~
 %patch9 -p0 -b .ppc32-retaddr~
-%patch10 -p0 -b .fortran-matmul~
-%patch11 -p0 -b .fortran-where-opt~
-%patch12 -p0 -b .x86_64-sse3~
-%patch13 -p0 -b .mni~
-%patch14 -p0 -b .floatunXiYf~
-%patch15 -p0 -b .pr26208~
+%patch10 -p0 -b .x86_64-sse3~
+%patch11 -p0 -b .mni~
 
-sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
+sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c
 sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
 
 sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in}
@@ -1421,6 +1413,11 @@
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Tue Feb 28 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-1
+- update from gcc-4_1-branch (-r111466:111570)
+  - GCC 4.1.0 release
+  - PR other/26473
+
 * Mon Feb 27 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.31
 - add __floatuns[sdt]i[sdxt]f exports to libgcc_s.so.1 (Joseph S. Myers)
 - fix unwinding through signal frames (#175951, PR other/26208, glibc BZ#300)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- sources	27 Feb 2006 16:57:32 -0000	1.139
+++ sources	28 Feb 2006 23:06:24 -0000	1.140
@@ -1 +1 @@
-0f8de572c90319bec3096555acab7f0c  gcc-4.1.0-20060227.tar.bz2
+a561810585dda4f9990a0dc8e8355f01  gcc-4.1.0-20060228.tar.bz2



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:23:27 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:23:27 -0500
Subject: rpms/kernel/devel kernel-2.6.spec,1.1996,1.1997
Message-ID: <200602282323.k1SNNRN0004187@cvs.devel.redhat.com>

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4094

Modified Files:
	kernel-2.6.spec 
Log Message:
Make non-xen kernels rpmbuild again




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -r1.1996 -r1.1997
--- kernel-2.6.spec	28 Feb 2006 20:57:17 -0000	1.1996
+++ kernel-2.6.spec	28 Feb 2006 23:23:24 -0000	1.1997
@@ -684,7 +684,7 @@
 fi
 cp -rl vanilla linux-%{kversion}.%{_target_cpu}
 
-%if %{buildxen}
+%if %{includexen}
 cd xen
 %patch20000 -p1
 %patch20010 -p2



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:49:20 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:49:20 -0500
Subject: rpms/eel2/devel eel-2.13.92-crash.patch, NONE, 1.1 eel2.spec, 1.39,
	1.40
Message-ID: <200602282349.k1SNnKAJ013656@cvs.devel.redhat.com>

Author: mclasen

Update of /cvs/dist/rpms/eel2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13641

Modified Files:
	eel2.spec 
Added Files:
	eel-2.13.92-crash.patch 
Log Message:
fix a nautilus crash


eel-2.13.92-crash.patch:
 0 files changed

--- NEW FILE eel-2.13.92-crash.patch ---


Index: eel2.spec
===================================================================
RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- eel2.spec	27 Feb 2006 18:11:23 -0000	1.39
+++ eel2.spec	28 Feb 2006 23:49:18 -0000	1.40
@@ -16,13 +16,15 @@
 Name:		eel2
 Summary:        Eazel Extensions Library.
 Version: 	2.13.92
-Release: 1
+Release: 	2
 License: 	LGPL
 Group: System Environment/Libraries
 Source: 	eel-%{version}.tar.bz2
 URL: 		http://www.gnome.org/projects/nautilus/
 BuildRoot:	/var/tmp/%{name}-%{version}-root
 
+Patch0: eel-2.13.92-crash.patch
+
 Requires: pango >= %{pango_version}
 Requires: gtk2 >= %{gtk2_version}
 Requires: libgnomeui >= %{libgnomeui_version}
@@ -70,6 +72,7 @@
 
 %prep
 %setup -q -n eel-%{version}
+%patch0 -p1 -b .crash
 
 %build
 %configure
@@ -105,6 +108,9 @@
 %{_includedir}/eel-2
 
 %changelog
+* Tue Feb 28 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-2
+-Fix a nautilus crash  (#183368)
+
 * Mon Feb 27 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.92-1
 - Update to 2.13.92
 



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:50:37 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:50:37 -0500
Subject: rpms/poppler/devel .cvsignore, 1.12, 1.13 poppler.spec, 1.23,
	1.24 sources, 1.12, 1.13
Message-ID: <200602282350.k1SNobDE013726@cvs.devel.redhat.com>

Author: krh

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13679

Modified Files:
	.cvsignore poppler.spec sources 
Log Message:
Update to 0.5.1


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Jan 2006 19:37:03 -0000	1.12
+++ .cvsignore	28 Feb 2006 23:50:34 -0000	1.13
@@ -1 +1 @@
-poppler-0.5.0.tar.gz
+poppler-0.5.1.tar.gz


Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- poppler.spec	11 Feb 2006 05:12:46 -0000	1.23
+++ poppler.spec	28 Feb 2006 23:50:34 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Pdf rendering library
 Name: poppler
-Version: 0.5.0
-Release: 4.2
+Version: 0.5.1
+Release: 1
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 28 2006 Kristian H??gsberg <krh at redhat.com> 0.5.1-1
+- Update to version 0.5.1.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.5.0-4.2
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Jan 2006 19:37:03 -0000	1.12
+++ sources	28 Feb 2006 23:50:34 -0000	1.13
@@ -1 +1 @@
-c84c1be19f43e4a84872ff08234c1960  poppler-0.5.0.tar.gz
+a136cd731892f4570933034ba97c8704  poppler-0.5.1.tar.gz



From fedora-cvs-commits at redhat.com  Tue Feb 28 23:58:43 2006
From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com)
Date: Tue, 28 Feb 2006 18:58:43 -0500
Subject: rpms/pirut/devel .cvsignore, 1.16, 1.17 pirut.spec, 1.17,
	1.18 sources, 1.17, 1.18
Message-ID: <200602282358.k1SNwhTP023916@cvs.devel.redhat.com>

Author: katzj

Update of /cvs/dist/rpms/pirut/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23877/devel

Modified Files:
	.cvsignore pirut.spec sources 
Log Message:
auto-import pirut-0.9.17-1 on branch devel from pirut-0.9.17-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	28 Feb 2006 03:36:57 -0000	1.16
+++ .cvsignore	28 Feb 2006 23:58:41 -0000	1.17
@@ -1 +1 @@
-pirut-0.9.16.tar.gz
+pirut-0.9.17.tar.gz


Index: pirut.spec
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pirut.spec	28 Feb 2006 03:36:57 -0000	1.17
+++ pirut.spec	28 Feb 2006 23:58:41 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary: Package Installation, Removal and Update Tools
 Name: pirut
-Version: 0.9.16
+Version: 0.9.17
 Release: 1
 License: GPL
 Group: Applications/System
@@ -67,6 +67,12 @@
 
 
 %changelog
+* Tue Feb 28 2006 Jeremy Katz <katzj at redhat.com> - 0.9.17-1
+- Fix package selection traceback (#183310)
+- Lock the yum pid file when pirut tools are running (#183311)
+- Give feedback during group selection (#183307)
+- Fix display of urllib2 encoded strings (#183111)
+
 * Mon Feb 27 2006 Jeremy Katz <katzj at redhat.com> - 0.9.16-1
 - Fix optional package searching (#182555)
 - Catch errors when downloading metadata (#178641)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pirut/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	28 Feb 2006 03:36:57 -0000	1.17
+++ sources	28 Feb 2006 23:58:41 -0000	1.18
@@ -1 +1 @@
-743b36bd836929a50976818fc754b18c  pirut-0.9.16.tar.gz
+598d6bb306871413b9139919b1d6b415  pirut-0.9.17.tar.gz